Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
Merge upstream/main into fix/session-move-worktree-bound
Zhang Yunjin10a7e9cc3317
diff --cc apps/desktop/src/main/maker-ipc/makerSendTransaction.tsindex 518c8eddc7,5581aa7443..6d7ff34afa--- a/apps/desktop/src/main/maker-ipc/makerSendTransaction.ts+++ b/apps/desktop/src/main/maker-ipc/makerSendTransaction.ts@@@ -12,8 -13,8 +13,9 @@@ import} from '@cindy/maker-core';import { CODEX_RESUME_NOT_READY_WIRE_MESSAGE } from '@cindy/maker-shared/agent-input-projection';import type { AgentInputQueuedMessage } from '../../shared/agentInputQueue.js';-import { normalizeWorkingDirForStorage } from '../../shared/workingDir.js';+import { getManagedWorktreeBasePath } from '../../shared/managedWorktreePaths.js';+import { normalizeWorkingDirForStorage, workingDirEquals } from '../../shared/workingDir.js';+ import { workdirDiagnosticContext, workdirDiagnosticErrorCode, workdirDiagnosticId, type WorkdirDiagnosticLogger } from '../workdirDiagnostics.js';import {createHostSendFailure,@@@ -669,42 -652,20 +677,53 @@@ export function createMakerSendTransactasync function ensureWorkDirWithDbFallback(sessionId: string,createOpts: CreateOpts,+ opts?: { preferDbWorkingDir?: boolean },): Promise<boolean> {- const dbDir = await deps.readSessionWorkingDirFromDb(sessionId).catch(() => null);+ const dbDir = await deps.readSessionWorkingDirFromDb(sessionId).catch((error) => {+ deps.workdirDiagnostics?.warn('workdir DB lookup failed', {+ ...workdirDiagnosticContext(sessionId, createOpts.workingDir), source: 'bootstrap',+ code: workdirDiagnosticErrorCode(error),+ });+ return null;+ });+ if (+ opts?.preferDbWorkingDir &&+ !dbDir &&+ !createOpts.remoteHostId &&+ createOpts.workingDir &&+ deps.readSessionWorkingDirState+ ) {+ // DB 行存在但 working_dir 已被清空:DB 明确说这个会话没有目录,排队/重试快照+ // 里的旧目录不能把它复活 —— 否则又是「库里没有目录、runtime 却在旧项目里跑」。+ // 行不存在(首次 lazy-create)时才沿用 caller 快照。+ const state = await deps.readSessionWorkingDirState(sessionId).catch(() => null);+ if (state?.exists) {+ deps.log.warn('send: lazy-create dropped stale caller workingDir because DB row has none', {+ sessionId,+ staleWorkingDir: createOpts.workingDir,+ });+ return false;+ }+ }+ if (opts?.preferDbWorkingDir && dbDir && dbDir !== createOpts.workingDir) {+ const adopted = createOpts.remoteHostId+ ? dbDir+ : deps.resolveRecoveredWorkingDir?.(sessionId, dbDir) ?? dbDir;+ if (adopted !== createOpts.workingDir) {+ deps.log.info('send: lazy-create adopted DB working_dir over stale caller snapshot', {+ sessionId,+ staleWorkingDir: createOpts.workingDir,+ workingDir: adopted,+ });+ createOpts.workingDir = adopted;+ }+ }const fallbackDir = dbDir && dbDir !== createOpts.workingDir ? dbDir : null;+ if (fallbackDir) deps.workdirDiagnostics?.info('workdir DB fallback candidate', {+ ...workdirDiagnosticContext(sessionId, createOpts.workingDir), source: 'bootstrap',+ dbDirectoryRef: workdirDiagnosticId(fallbackDir),+ sameNormalizedDirectory: normalizeWorkingDirForStorage(fallbackDir) === normalizeWorkingDirForStorage(createOpts.workingDir),+ });const ok = fallbackDir? await deps.checkWorkDirExists(sessionId,@@@ -992,16 -921,24 +1011,27 @@@await deps.ensureRemoteReadyForSessionStart({ session: sess, createOpts });if (sess) {- // Startup migration or a directory relocation may repair SQLite while a- // live SDK still owns the old cwd. Only use that persisted replacement;- // recreating an arbitrary project as an empty folder would lose its context.+ // SQLite 里的 working_dir 才是持久真源(启动迁移 / 目录重定位 / 用户移动+ // 会话都会改写它),而活 SDK 可能仍占着旧 cwd。漂移时按下面的规则切到持久+ // 目录:普通目录必须**真实存在**(纯 stat,绝不为它 mkdir 空文件夹 —— 那会丢+ // 掉活 runtime 的上下文);托管 worktree 必须**就绪**(走 send 侧的 restore /+ // liveness 判定,可能补齐/恢复 worktree,但不会丢已有代码与快照)。被+ // workingDirectoryRecovery 的 fallback 接管的目录一律不迁移。const dbDir = !sess.remoteHostId- ? await deps.readSessionWorkingDirFromDb(sessionId).catch(() => null)+ ? await deps.readSessionWorkingDirFromDb(sessionId).catch((error) => {+ deps.workdirDiagnostics?.warn('workdir DB lookup failed', {+ ...workdirDiagnosticContext(sessionId, sess!.workDir), source: 'live',+ code: workdirDiagnosticErrorCode(error),+ });+ return null;+ }): null;const fallbackDir = dbDir && dbDir !== sess.workDir ? dbDir : null;+ if (fallbackDir) deps.workdirDiagnostics?.info('workdir DB fallback candidate', {+ ...workdirDiagnosticContext(sessionId, sess.workDir), source: 'live',+ dbDirectoryRef: workdirDiagnosticId(fallbackDir),+ sameNormalizedDirectory: normalizeWorkingDirForStorage(fallbackDir) === normalizeWorkingDirForStorage(sess.workDir),+ });const ok = await deps.checkWorkDirExists(sessionId,sess.workDir,@@@ -1020,34 -951,16 +1050,39 @@@const recoveredDir = !sess.remoteHostId? deps.resolveRecoveredWorkingDir?.(sessionId, sess.workDir) ?? sess.workDir: sess.workDir;- const needsCwdRefresh = ok && !sess.remoteHostId && (+ // recovery 语义优先:live 目录已被 fallback 接管(或带 note)时按 fallback+ // 重建,不做 DB 迁移 —— 那批文件在 fallback 里,不能把 session 拉回 DB 路径。+ // 此时也不探测 DB 目录:结果用不上,而托管 worktree 的就绪探测可能触发一次+ // 真实的 worktree restore。+ const liveDirNeedsRecovery =recoveredDir !== sess.workDir ||((sess.agentKind === 'claude-code' || sess.agentKind === 'pi') &&- !!deps.peekWorkingDirectoryRecoveryNote?.(sessionId, sess.workDir)));+ !!deps.peekWorkingDirectoryRecoveryNote?.(sessionId, sess.workDir));+ // 判漂移比的是「会话现在到底在哪个目录」:DB 值被 workingDirectoryRecovery+ // 接管时文件在 fallback 里,resolve 出来的才是它,而 live 已经就在 fallback+ // 里就不算漂移 —— 否则恢复中的会话会被下面的「目录不可用」判成不能发消息。+ const persistedDir = fallbackDir && !sess.remoteHostId+ ? deps.resolveRecoveredWorkingDir?.(sessionId, fallbackDir) ?? fallbackDir+ : null;+ const persistedDirDrifted =+ !!persistedDir && !workingDirEquals(persistedDir, sess.workDir);+ const persistedDirReady =+ ok && !liveDirNeedsRecovery && persistedDirDrifted+ ? await isUsablePersistedWorkingDir(+ sessionId,+ fallbackDir!,+ sess.agentKind,+ sess.remoteHostId,+ )+ : false;+ const needsCwdRefresh = ok && !sess.remoteHostId &&+ (liveDirNeedsRecovery || persistedDirReady);if ((!ok && fallbackDir) || needsCwdRefresh) {+ deps.workdirDiagnostics?.info('workdir runtime refresh requested', {+ ...workdirDiagnosticContext(sessionId, sess.workDir),+ reason: needsCwdRefresh ? 'recovered-directory' : 'db-fallback',+ targetDirectoryRef: workdirDiagnosticId(needsCwdRefresh ? recoveredDir : fallbackDir!),+ });const supplied = (createOpts as CreateOpts | undefined) ??await deps.readWorkingDirectoryRecoveryCreateOpts(sessionId);const startupPreferences = sess.hostStartupPreferences ?? {};@@@ -1078,23 -992,6 +1116,28 @@@`working directory is missing for session ${sessionId}`,),);+ } else if (persistedDirDrifted) {+ // 会话已经被移到别的目录(DB 是权威),但那个目录当前不可用,而旧 runtime 还活+ // 着:绝不能在旧 cwd 里执行 —— UI 显示新项目、消息却改旧项目,正是本 PR 要消灭的+ // 半移动(2026-09-13 实报的同一类问题)。明确失败,由用户把目录找回来、或再移动+ // 一次会话后重发;这条分支也覆盖「托管 worktree 尚未就绪」与「DB 目录已被+ // recovery 接管但 live 不在 fallback」——两者都不能拿旧目录顶替。+ deps.log.warn('send: persisted working dir unavailable, refusing to send in the live cwd', {+ sessionId,+ liveWorkingDir: sess.workDir,+ persistedWorkingDir: fallbackDir,+ });++ deps.workdirDiagnostics?.warn('workdir send refused: persisted directory unavailable', {++ ...workdirDiagnosticContext(sessionId, fallbackDir!),++ source: 'live',++ liveDirectoryRef: workdirDiagnosticId(sess.workDir),++ });+ return toCompatibleMakerSendResult(+ createHostSendFailure(+ 'WORKDIR_MISSING',+ `working directory is missing for session ${sessionId}`,+ ),+ );}if (!deps.isOrcaMcpHydrated(sessionId) && createOpts) {const co = deps.buildCreateOptsWithStderr({