Skip to content

chore: sync upstream commits (v0.0.11 catchup)#22

Merged
gabrielMalonso merged 24 commits intomainfrom
upstream-sync
Mar 14, 2026
Merged

chore: sync upstream commits (v0.0.11 catchup)#22
gabrielMalonso merged 24 commits intomainfrom
upstream-sync

Conversation

@gabrielMalonso
Copy link
Copy Markdown
Owner

Summary

  • Cherry-picked 22 upstream commits into the fork, covering all pending changes up to upstream/main
  • Resolved all merge conflicts preserving fork-specific features (skills UI, Claude thinking, worktree sync, Claude Code adapter)
  • All 452 tests passing, build verified, locally installed and tested

Upstream features integrated

  • Codex tool-call icons — compact inline icons in the chat timeline
  • Timestamp format override — user-configurable timestamp display in settings
  • Default thread env mode — new setting for default environment mode
  • mod+N new thread + terminal fixes — shortcut handling when terminal is focused
  • Composer @file autocomplete fixes — cursor positioning and spacing bugs
  • Preferred editor + useLocalStorage — editor resolution from available editors
  • Defer diff worker startup — lazy-load diff workers for performance
  • Clipboard hook + media queries — reusable useCopyToClipboard hook
  • Vite plugin-react 6.0, oxfmt/oxlint upgrade, Astro 6
  • Antigravity editor support, issue templates, CI updates

Test plan

  • Build passes (turbo run build)
  • All 452 unit/integration tests pass (turbo run test)
  • Local DMG install + manual smoke test on macOS

🤖 Generated with Claude Code

juliusmarminge and others added 22 commits March 14, 2026 05:28
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…d Linux) (pingdotgg#841)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#1006)

Co-authored-by: macroscopeapp[bot] <170038800+macroscopeapp[bot]@users.noreply.github.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <juliusmarminge@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: cursor[bot] <206951365+cursor[bot]@users.noreply.github.com>
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
- ensure `chat.new` creates a fresh draft after a promoted draft thread
- enforce terminal cap per split group (4) while allowing additional terminal groups
- refine sidebar row selected/active styling via shared class-name logic and tests
- move chat-wide key handling into `_chat` route-level shortcut handler
- extract reusable `useHandleNewThread` hook and `isTerminalFocused` helper
- update browser WS fixture to support `terminalOpen` RPC shape
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
… `useLocalStorage` helper (pingdotgg#662)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@chatgpt-codex-connector
Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.
To continue using code reviews, you can upgrade your account or add credits to your account and enable them for code reviews in your settings.

@github-actions github-actions bot added the size:XXL 1,000+ changed lines (additions + deletions). label Mar 14, 2026

export function isToolLifecycleItemType(value: string): value is ToolLifecycleItemType {
return TOOL_LIFECYCLE_ITEM_TYPES.includes(value as ToolLifecycleItemType);
}
Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AGENTS.md violation: Runtime logic function isToolLifecycleItemType was added to packages/contracts. This package is restricted to schemas and TypeScript types only.

Keep this package schema-only — no runtime logic.
AGENTS.md L30

This type-guard function should be moved to packages/shared or kept in the server layer where it's consumed.

# Conflicts:
#	apps/web/src/components/ChatView.tsx
#	apps/web/src/composer-logic.test.ts
@gabrielMalonso gabrielMalonso merged commit 31ffd77 into main Mar 14, 2026
@gabrielMalonso gabrielMalonso deleted the upstream-sync branch March 14, 2026 09:38
@github-actions github-actions bot added the vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. label Mar 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XXL 1,000+ changed lines (additions + deletions). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.