Skip to content

chore(sync): merge Yarden-zamir/t3code main - #40

Merged
TomCohenDev merged 48 commits into
mainfrom
fork-sync/2026-11-18-1152
Nov 18, 2026
Merged

TomCohenDev merged 48 commits into
mainfrom
fork-sync/2026-11-18-1152

Conversation

@TomCohenDev

Copy link
Copy Markdown
Owner

Fork Sync run 44298423274 hit merge conflicts while it merged Yarden-zamir/t3code main. Most of the incoming changes are Yarden's i18n work (gt-react strings).

Conflicts and how they were resolved:

  • apps/mobile/src/features/threads/thread-list-v2-items.tsx: kept the fork's handleContinueMenu dependency and added upstream's gt and m.
  • apps/mobile/src/features/updates/app-updates.ts: kept the fork's APK updater import and added upstream's m import.
  • apps/web/src/components/Sidebar.tsx: kept the continue-thread-elsewhere import and added upstream's i18n imports.
  • packages/client-runtime/src/state/orchestration.ts: kept the fork's loadThreadContinuation, which falls back to an offline thread backup, and moved upstream's translatable "not connected" message into its live-fetch helper.

Follow-up for the new settings API:

  • InkwireSettingsRows.tsx and ThreadBackupMachineRow.tsx now use useSearchableSetting().
  • Their reset buttons now take ariaLabel instead of label.

Machine map: the portal at map.tomcohen.dev is no longer built from this repo. Machines now join with kitshn join <code> --server <address>.

Checks run locally:

  • vp i passed.
  • vp run typecheck passed (42/42).
  • Fork tests passed: 12 files and 210 tests, plus 3 apps/web files and 19 tests.

🤖 Generated with Claude Code (Claude Opus 5.5)

juliusmarminge and others added 30 commits November 17, 2026 15:37
…nger freezes the thread (pingdotgg#38368)

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

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…dotgg#38387)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…18-0123

chore(sync): merge pingdotgg/t3code main
…tgg#38393)

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…eading (pingdotgg#38397)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
- Wrap fork copy in upstream files with `<T>`, `gt()` and `msg()` so
  `t3code/no-untranslated-copy` passes.
- Fork-only files that predate the rule warn instead, like the existing
  `no-unreasoned-state-sync` override in vite.config.ts.
- Settings rows use `useSearchableSetting()`; `SettingResetButton` takes `ariaLabel`.
- Clipboard calls pass a `ClipboardTarget`; terminal labels come from
  `terminalLabelsCopy`; fork mobile settings titles move to `ROUTE_TITLES`.
…tgg#38431)

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…18-0323

chore(sync): merge pingdotgg/t3code main
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…failed (pingdotgg#38423)

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… renders (pingdotgg#38458)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…poser (pingdotgg#38443)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
amv146 and others added 18 commits November 17, 2026 23:17
…ingdotgg#38451)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#38476)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…18-0523

chore(sync): merge pingdotgg/t3code main
…pingdotgg#29861)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…rkup (pingdotgg#33403)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…18-0924

chore(sync): merge pingdotgg/t3code main
# Conflicts:
#	apps/mobile/src/features/threads/thread-list-v2-items.tsx
#	apps/mobile/src/features/updates/app-updates.ts
#	apps/web/src/components/Sidebar.tsx
#	packages/client-runtime/src/state/orchestration.ts
…copy rule

Upstream's i18n work makes untranslated copy a lint error. Wrap the fork's
continue-elsewhere, APK updater, Inkwire and thread backup strings, keep the
agent prompt text English, and regenerate the web and mobile catalogs.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@TomCohenDev
TomCohenDev merged commit 5427007 into main Nov 18, 2026
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.