[kylebegeman]

Merges upstream T3 Code v0.1.1-nightly.20261019.3348. It also contains 20261018.3302, so it supersedes #32. Every conflict is resolved. The seam manifest, fork tests, Omarchy pack checks, web build and all seven typechecks pass. Fork lint still fails for the reason #32 is still a draft, so this stays a draft too.

What fails

scripts/fork/loom.sh integrate --continue --pr stops at "Linting fork code" with the same 219 t3code(no-manual-memo) errors in apps/web/src/fork/ as #32. Upstream's lint config bans useMemo/useCallback in apps/web/src/**. Mobile gets a ratchet (allowMemoHooks: true); web does not.

What I tried

• Fixed everything else (second commit, fork-owned files and seam lines only), including the one new no-hookless-use-function error (EnclosureTab's useCase handler is now applyCase).
• Left the memo errors alone, as chore(fork): integrate upstream v0.1.1-nightly.20261018.3302 (needs Kyle) #32 did. Clearing them means either rewriting 219 hook sites in 62 fork files that the runner can't verify in a browser, or adding a lint exemption to upstream's vite.config.ts. Both are your call.

Recommendation

Same as #32: add a marked fork: ext-lint seam to the root vite.config.ts giving apps/web/src/fork/** the mobile ratchet ("t3code/no-manual-memo": ["error", { allowMemoHooks: true }]) plus a seams.tsv row. Then migrate fork code off manual memoization package by package. Once the ratchet is in, scripts/fork/loom.sh integrate --continue --pr (or land) finishes this.

Needs your decision: setup in the main checkout

Upstream pingdotgg#18891 ("setup actions no longer run for threads in the main checkout") reverses the fork's 631cfcc ("wait for initialization in every workspace"), which docs/user/project-settings.md documents as "Setup runs for new launches in an existing checkout as well as for new worktrees". Those fork lines are unmarked, so following the seam rules I took upstream's behavior in ThreadLaunchService.ts. One fork case is kept: a root checkout with a .t3-setup-pending marker still runs its setup. That marker means a restored managed checkout whose setup never finished, and only a successful run removes it.

As a result, 5 fork tests in ThreadLaunchService.test.ts fail (initialization exits … in root workspaces, cancelling root initialization …, destination preparation waits for async setup …). They aren't in the fork check. Pick one:

1. Keep Loom's behavior: mark the setup call as a fork: project-lifecycle seam that runs setup at worktreePath ?? project.workspaceRoot, and adjust upstream's new test starts a thread in the main checkout without running the setup action.
2. Accept upstream: move those 5 tests to worktree workspaces (or the pending-marker case) and drop the "existing checkout" sentence from docs/user/project-settings.md.

Conflict resolution (merge commit)

Upstream's code wins; each fork seam is reapplied with its marker. I started from #32's resolutions and merged upstream's 3302→3348 changes into them, then resolved the rest by hand:

• Mobile React Compiler migration (HomeScreen, ThreadNavigationSidebar, AddProjectScreen, AttachmentFileScreen, SettingsAuthRouteScreen, new-task-flow-provider, ConnectionsNewRouteScreen, ThreadComposer, attachmentDocument): took upstream's hook-free code and rewrote the fork's seams the same way. The project library uses upstream's new now clock state instead of a useMemo keyed on the minute. Seam rows lose only the markers that sat on deleted dependency arrays: HomeScreen project-navigation 24→21 and library 11→8, AttachmentFileScreen library 6→5.
• ClaudeProvider/ClaudeDriver: upstream's probe now fails instead of returning undefined, and the cache reuses the last good account. The Switchboard probe path is reapplied on top. Routed failures still report the Switchboard message.
• ServerBrowser: kept the fork's tab creation (late desktop attachment, timeout recovery) and added upstream's PDF navigation, file-chooser interception and PDF reload for desktop and popup tabs.
• Compaction labels: upstream split out contextCompactionTokenCounts. The compaction-recovery seam now also keeps failed, cancelled or in-progress compactions from showing token counts in the new timeline row.
• CodexHomeLayout: generated_images stays alongside upstream's new .DS_Store.
• ThreadSettlementService: upstream's new pull request link helpers; threadHasQueuedTurnStart stays in the fork's queuedTurnStart.ts.
• CommandPalette: a palette that closed into a dialog still leaves focus there, before upstream's no-composer fallback.
• T3LayoutMetricsView.swift: upstream gated the hinge APIs on the UIKit SDK version, which fixes what the fork's T3_HAS_UIKIT_HINGE_LAYOUT flag did. Took upstream's. The podspec flag is now unused.
• apps/web dependencies: upstream moved web to React 19.3 from the catalog, so the fork's react-test-renderer is now 19.3.0. jsdom and @types/react-test-renderer 19.1.0 are unchanged. seams.tsv and FORK.md record both, plus chore(fork): integrate upstream v0.1.1-nightly.20261018.3302 (needs Kyle) #32's browser-test renames. The lockfile is upstream's plus the fork's dependencies only (164 lines added, none removed).
• Unmarked fork edits from earlier commits were reapplied rather than dropped, as in chore(fork): integrate upstream v0.1.1-nightly.20261018.3302 (needs Kyle) #32: "Library" route, "Workspace setup" title, canReviewChanges, createWorkspaceRootIfMissing, the publish-permission recheck, the loadCaptured attachment path and "Turn changes".

Fork adaptations (second commit)

• chore(fork): integrate upstream v0.1.1-nightly.20261018.3302 (needs Kyle) #32's adaptation commit (providers atom, batched atoms, KnownWorkspaces, --git-dir for Scratch, PullRequestGlyph) and chore(fork): integrate upstream v0.1.1-nightly.20261018.3302 (needs Kyle) #32's keybinding test fix.
• NativeHeaderToolbar moved to its own module upstream.
• Test updates for the failing probe, the PDF viewer probe on tab setup, the iOS xmark close button and filterKeybindingRows.
• The AddProjectScreen preparation-receipt seam no longer throws inside try, so the React Compiler compiles that upstream screen again.

Also not clean (not part of the fork check)

Upstream's apps/mobile/src/reactCompilerCoverage.test.ts, new since 3302, fails for 17 fork-only mobile files (src/fork/**, WorkspaceHandoffScreen, GitHubHostSetupSettings). They use try/finally or throw inside try, so the compiler skips them. They still ship, just unmemoized. This needs the same decision as the web lint.

Browser tests (Chromium) and native mobile builds were not run on the runner.

Claude Opus 5.5 in Claude Code (automated upstream repair).

🤖 Generated with Claude Code

[kylebegeman]

Repair summary: I resolved all 57 conflicts by starting from #32's resolutions, merging upstream's 3302→3348 changes into them, and reapplying each fork seam onto upstream's new code by hand where they still conflicted. Most were mobile screens moving to the React Compiler, the Claude probe now failing instead of returning undefined, ServerBrowser's PDF and file-chooser changes, and React 19.3 for web. seams.tsv and FORK.md follow the markers that sat on deleted dependency arrays, #32's browser-test renames, and the web test dependencies. A second commit carries #32's fork adaptations forward and fixes what this nightly changed under fork code. Seams, fork tests, Omarchy checks, the web build and all seven typechecks pass. Fork lint still fails with #32's 219 no-manual-memo errors, which is your call, so this stays a draft. Separately, upstream pingdotgg#18891 stops setup actions in the main checkout, which reverses Loom's 'initialization in every workspace'. I followed upstream (keeping setup for restored checkouts with a pending marker), so 5 fork tests in ThreadLaunchService.test.ts fail. The description lays out both options.

[kylebegeman]

Settled the open decisions in 9d5ecb1 and landed after the fork gate (run_checks) passed locally.

• Mobile file preview, pull request opener and web useOpenLink: kept upstream's new handler shapes and re-applied the preview-link entry swap on top.
• ThreadLaunchService: Loom still runs setup in the main checkout, so the launch shows its setup phase there too. Upstream's test now asserts that.
• React Compiler: fork mobile files the compiler skips are listed in apps/mobile/src/fork/reactCompilerBailouts.ts (a list that only shrinks). PreviewLinksScreen now compiles.
• Lint: fork web code keeps mobile's memo-hook ratchet until it moves to the compiler.

🤖 Generated with Claude Code