fix: restore main typecheck after concurrent merges (#34202)

This commit is contained in:
Brennan Benson
2026-10-27 02:55:37 +00:00
committed by GitHub
parent 01db1c6326
commit e79235371f
4 changed files with 6 additions and 3 deletions
+1 -1
View File
@@ -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(
@@ -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(),
@@ -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
@@ -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(