Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

Merge remote-tracking branch 'upstream/main' (3e238a8fa) into fix/session-move-worktree-bound

Zhang Yunjinc2bfdff12099
diff --cc apps/desktop/src/main/maker-ipc/register.ts
index fd55d73ef4,20c72b6146..16d8501e33
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@@ -12181,9 -12200,8 +12201,9 @@@ export function registerMakerIpc(maker
},
checkWorkDirExists,
resolveRecoveredWorkingDir: (sessionId, dir) => workingDirectoryRecovery.resolve(sessionId, dir),
+ statDirectory: (dir) => statWorkingDirectory(dir),
- isPersistedWorktreeFallback: (dir) => path.dirname(path.resolve(dir)) ===
- path.join(dialogueWorkspaceRootDir(), 'worktree-recovery'),
+ isPersistedWorktreeFallback: (dir) => dialogueWorkspaceRoots().some((root) =>
+ path.dirname(path.resolve(dir)) === path.join(root, 'worktree-recovery')),
preflightBotRuntimeResources: async (opts) => { await preflightBotRuntimeResources(opts); },
readWorkingDirectoryRecoveryCreateOpts: async (sessionId) => {
const [row] = await getDbClient().drizzle.select().from(sessions)