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。

test(desktop): isolate local rewind SQL fixture from device-link startup

xuzini-xzn71db2ca17f3a
diff --git a/apps/desktop/src/main/__tests__/rewindNativeBoundarySqlite.test.ts b/apps/desktop/src/main/__tests__/rewindNativeBoundarySqlite.test.ts
index 6a3c3e1214..e3eb637658 100644
--- a/apps/desktop/src/main/__tests__/rewindNativeBoundarySqlite.test.ts
+++ b/apps/desktop/src/main/__tests__/rewindNativeBoundarySqlite.test.ts
@@ -14,13 +14,27 @@ import { getTableConfig } from 'drizzle-orm/sqlite-core';
import type { DbClient } from '../localDb/client/DbClient';
import { clearCurrentDbClient, setCurrentDbClient } from '../localDb/client/current';
import { messages, sessions } from '../localDb/schema';
+import { commitRewindAtMessage } from '../maker-orchestration/rewind';
+
+// Keep the real local rewind SQL and history helpers without starting the
+// unrelated device-link host (same boundary as rewind.test.ts, #6563).
+vi.mock('../device-link/index.js', () => ({
+ remoteBackgroundInvoke: () => { throw new Error('unexpected remote invocation in local rewind'); },
+}));
const commitRewindFilesMock = vi.fn();
const isTurnRunningMock = vi.fn(() => false);
-const recomputePrRefsForSessionMock = vi.fn();
-const executeCodexFileRewindPlanWithThreadRollbackMock = vi.fn();
-const executeCodexFileRestorePlanWithThreadRollbackMock = vi.fn();
-const detectCwdMock = vi.fn();
+const {
+ recomputePrRefsForSessionMock,
+ executeCodexFileRewindPlanWithThreadRollbackMock,
+ executeCodexFileRestorePlanWithThreadRollbackMock,
+ detectCwdMock,
+} = vi.hoisted(() => ({
+ recomputePrRefsForSessionMock: vi.fn(),
+ executeCodexFileRewindPlanWithThreadRollbackMock: vi.fn(),
+ executeCodexFileRestorePlanWithThreadRollbackMock: vi.fn(),
+ detectCwdMock: vi.fn(),
+}));
type FakeSession = {
agentKind: 'codex';
@@ -71,7 +85,6 @@ const txMock = vi.fn(async () => ({}));
let sqlite: Database.Database;
let client: DbClient;
-let commitRewindAtMessage: typeof import('../maker-orchestration/rewind').commitRewindAtMessage;
function insertSession(over: { clearedAt?: number | null } = {}): void {
client.drizzle
@@ -123,7 +136,7 @@ const oldAnchorMeta = JSON.stringify({
},
});
-beforeEach(async () => {
+beforeEach(() => {
sqlite = new Database(':memory:');
for (const table of [sessions, messages]) {
const { name, columns } = getTableConfig(table);
@@ -172,9 +185,6 @@ beforeEach(async () => {
isGitRepo: false,
isInsideWorktree: false,
});
- if (!commitRewindAtMessage) {
- ({ commitRewindAtMessage } = await import('../maker-orchestration/rewind'));
- }
});
afterEach(() => {