Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(ghost): 新装失败清理仅在 lstat ENOENT 时执行,并补更新路径重试/回滚回归(#5028 review)
ficowang029c5283b2ae
diff --git a/apps/desktop/src/main/cindy-brain/GhostManager.ts b/apps/desktop/src/main/cindy-brain/GhostManager.tsindex dcd1590514..c0e20d1a7b 100644--- a/apps/desktop/src/main/cindy-brain/GhostManager.ts+++ b/apps/desktop/src/main/cindy-brain/GhostManager.ts@@ -2757,9 +2757,14 @@ export class GhostManager {} catch (error) {// rename 没成功就没有发布任何字节(#5026):此时若留下 install journal 与内存// 隔离标记,之后每次审批检查都会判 invalid、插件停在停用态,且用户手工放入- // 目录也没有正常入口恢复。只有确认 finalDir 确实不存在才能清;万一目录已- // 出现(rename 半途成功),保留 journal 交给启动恢复,与更新路径的口径一致。- if (!fs.existsSync(finalDir)) {+ // 目录也没有正常入口恢复。只有 lstat 明确 ENOENT 才能清;目录已出现(rename+ // 半途成功)或 lstat 本身报权限/IO 错误时都保留 journal 交给启动恢复——journal+ // 正是用来阻止无 receipt 的目录被迁移当作存量批准,不能凭"看不见"就清。+ const finalDirAbsent = await fs.promises+ .lstat(finalDir)+ .then(() => false)+ .catch((statError) => (statError as NodeJS.ErrnoException).code === 'ENOENT');+ if (finalDirAbsent) {try {await this.receiptStore.clearPendingMutation(manifest.id);this.untrustedApprovals.delete(this.isolationKey(manifest.id));diff --git a/apps/desktop/src/main/cindy-brain/__tests__/GhostManager.test.ts b/apps/desktop/src/main/cindy-brain/__tests__/GhostManager.test.tsindex 8e1811cd12..872ca02959 100644--- a/apps/desktop/src/main/cindy-brain/__tests__/GhostManager.test.ts+++ b/apps/desktop/src/main/cindy-brain/__tests__/GhostManager.test.ts@@ -1616,6 +1616,105 @@ describe('GhostManager · 安装事务目录 rename 失败(#5026)', () => {expect(fs.existsSync(pendingMarkerPath())).toBe(false);});+ it('新装 rename 失败后目录状态查不清(lstat 非 ENOENT)时保留 journal,不误清隔离标记', async () => {+ const local = managerWithRenameRetry({ enabled: false });+ const finalDir = path.join(rootDir, 'hello');+ const realRename = fs.promises.rename;+ const realLstat = fs.promises.lstat;+ const renameSpy = vi.spyOn(fs.promises, 'rename').mockImplementation(async (from, to) => {+ if (path.resolve(String(to)) === path.resolve(finalDir)) {+ throw Object.assign(new Error('EPERM: operation not permitted, rename'), { code: 'EPERM' });+ }+ return realRename(from as never, to as never);+ });+ const lstatSpy = vi.spyOn(fs.promises, 'lstat').mockImplementation(async (target, ...rest) => {+ if (path.resolve(String(target)) === path.resolve(finalDir)) {+ throw Object.assign(new Error('EACCES: permission denied, lstat'), { code: 'EACCES' });+ }+ return (realLstat as (...a: unknown[]) => Promise<fs.Stats>)(target, ...rest);+ });+ try {+ await expectRejection(await local.install(await makeCindy('a.cindy', goodManifest())), 'io');+ } finally {+ renameSpy.mockRestore();+ lstatSpy.mockRestore();+ }+ // 看不清 finalDir 是否已出现:journal 必须留给启动恢复,不能当作"没发布"清掉。+ expect(fs.existsSync(pendingMarkerPath())).toBe(true);+ });++ it('更新放置 rename 吃到瞬时 EPERM 时重试成功,新版本就位且备份已回收', async () => {+ const local = managerWithRenameRetry({ enabled: true, delaysMs: [1, 1, 1] });+ await local.install(await makeCindy('a.cindy', goodManifest()));+ const finalDir = path.join(rootDir, 'hello');+ const realRename = fs.promises.rename;+ let placementAttempts = 0;+ const spy = vi.spyOn(fs.promises, 'rename').mockImplementation(async (from, to) => {+ if (+ path.resolve(String(to)) === path.resolve(finalDir) &&+ path.basename(String(from)).startsWith('.cindy-installing-')+ ) {+ placementAttempts += 1;+ if (placementAttempts <= 2) {+ throw Object.assign(new Error('EPERM: operation not permitted, rename'), { code: 'EPERM' });+ }+ }+ return realRename(from as never, to as never);+ });+ try {+ const bumped = await makeCindy('b.cindy', { ...goodManifest(), version: '1.0.1' });+ const result = await local.update(bumped, {+ expectedInstalledApproval: ghostInstallApprovalToken(local.list()[0]?.approval),+ });+ expect('rejection' in result).toBe(false);+ } finally {+ spy.mockRestore();+ }+ expect(placementAttempts).toBe(3);+ expect(local.list()[0]).toMatchObject({+ manifest: { version: '1.0.1' },+ approval: { state: 'approved' },+ });+ expect(fs.existsSync(pendingMarkerPath())).toBe(false);+ expect(fs.readdirSync(rootDir).filter((name) => name.startsWith('.cindy-'))).toEqual([]);+ });++ it('更新放置 rename 重试耗尽后回滚到旧版本,journal 清空且不报 rollbackFailed', async () => {+ const local = managerWithRenameRetry({ enabled: true, delaysMs: [1, 1] });+ await local.install(await makeCindy('a.cindy', goodManifest()));+ const finalDir = path.join(rootDir, 'hello');+ const realRename = fs.promises.rename;+ let placementAttempts = 0;+ const spy = vi.spyOn(fs.promises, 'rename').mockImplementation(async (from, to) => {+ if (+ path.resolve(String(to)) === path.resolve(finalDir) &&+ path.basename(String(from)).startsWith('.cindy-installing-')+ ) {+ placementAttempts += 1;+ throw Object.assign(new Error('EBUSY: resource busy'), { code: 'EBUSY' });+ }+ return realRename(from as never, to as never);+ });+ try {+ const bumped = await makeCindy('b.cindy', { ...goodManifest(), version: '1.0.1' });+ const result = await local.update(bumped, {+ expectedInstalledApproval: ghostInstallApprovalToken(local.list()[0]?.approval),+ });+ await expectRejection(result, 'io');+ expect((result as { rejection: { rollbackFailed?: boolean } }).rejection.rollbackFailed).toBeUndefined();+ } finally {+ spy.mockRestore();+ }+ expect(placementAttempts).toBe(3);+ // 旧版本从备份位滚回,事务标记清空,没有遗留 staging/backup 目录。+ expect(local.list()[0]).toMatchObject({+ manifest: { version: '1.0.0' },+ approval: { state: 'approved' },+ });+ expect(fs.existsSync(pendingMarkerPath())).toBe(false);+ expect(fs.readdirSync(rootDir).filter((name) => name.startsWith('.cindy-'))).toEqual([]);+ });+it('非瞬时错误码不重试,重试耗尽后仍如实返回 io 拒绝', async () => {const local = managerWithRenameRetry({ enabled: true, delaysMs: [1, 1] });const finalDir = path.join(rootDir, 'hello');