From e79235371f883a3ae3d703d26d084e5cb375ee9d Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 26 Oct 2026 19:55:37 -0700
Subject: [PATCH] fix: restore main typecheck after concurrent merges (#34202)

---
 config/vitest.config.ts                                        | 2 +-
 .../doc-preview-external-link-confirmation.test.ts             | 3 +++
 src/renderer/src/lib/agent-account-restart-startup.ts          | 2 +-
 tests/e2e/native-chat-transcript-file-order.unit.test.ts       | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/vitest.config.ts b/config/vitest.config.ts
index 5a83d1df802..b5c3dc6d508 100644
--- a/config/vitest.config.ts
+++ b/config/vitest.config.ts
@@ -20,7 +20,7 @@ const paletteMeasurementFile =
   'src/renderer/src/lib/palette-match/palette-match-performance.test.ts'
 const measurementFiles = [measurementFile, paletteMeasurementFile]
 const phoneContractModules = [
-  'mobile/src/session/mobile-native-chat-stream-frame.ts',
+  'mobile/src/session/native-chat/mobile-native-chat-stream-frame.ts',
   'mobile/src/session/mobile-native-chat-render-data.ts'
 ].map((file) => normalizePath(resolve(file)))
 const phoneContractPattern = new RegExp(
diff --git a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.test.ts b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.test.ts
index 6a6cf392d34..6c596ed3108 100644
--- a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.test.ts
+++ b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.test.ts
@@ -20,6 +20,9 @@ import { subscribeDocPreviewExternalLinkConfirmation } from './doc-preview-exter
 const openUrl = vi.fn()
 const openBrowser = vi.fn(async () => 'opened-page')
 const state = {
+  repos: [],
+  endpointProjects: [],
+  endpointProjectHostSetups: [],
   activeWorktreeId: 'unrelated-workspace',
   settings: { openLinksInApp: true, openLinksInAppModifierInverts: false },
   setActiveWorktree: vi.fn(),
diff --git a/src/renderer/src/lib/agent-account-restart-startup.ts b/src/renderer/src/lib/agent-account-restart-startup.ts
index 769b2d50b83..b51bd66f2ff 100644
--- a/src/renderer/src/lib/agent-account-restart-startup.ts
+++ b/src/renderer/src/lib/agent-account-restart-startup.ts
@@ -103,7 +103,7 @@ export function resolveAgentAccountRestartResumeStartup(
     // Both restart executors spawn in the tab's start folder.
     launchCwd:
       state.tabsByWorktree[args.worktreeId]?.find((tab) => tab.id === args.tabId)?.startupCwd ??
-      worktree?.path
+      state.getKnownWorktreeById(args.worktreeId)?.path
   })
   if (!startupPlan) {
     return null
diff --git a/tests/e2e/native-chat-transcript-file-order.unit.test.ts b/tests/e2e/native-chat-transcript-file-order.unit.test.ts
index 5bb4786f57d..192d7c11d57 100644
--- a/tests/e2e/native-chat-transcript-file-order.unit.test.ts
+++ b/tests/e2e/native-chat-transcript-file-order.unit.test.ts
@@ -170,7 +170,7 @@ describe('canonical source positions', () => {
 
   it('retains reader-produced tied image pages through prepend, append and reconnect into bubbles', async () => {
     const { applyMobileNativeChatStreamFrame } =
-      await import('../../mobile/src/session/mobile-native-chat-stream-frame')
+      await import('../../mobile/src/session/native-chat/mobile-native-chat-stream-frame')
     const { foldMobileNativeChatMessages } =
       await import('../../mobile/src/session/mobile-native-chat-render-data')
     const filePath = await transcriptFile(