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。

fix(codex): ignore activity timestamps during writer transfer

Chrisb2670eeb5fc0
diff --git a/apps/desktop/src/main/maker-host/__tests__/codexPickerHarness.ts b/apps/desktop/src/main/maker-host/__tests__/codexPickerHarness.ts
index d0f44a0494..15aa3ec690 100644
--- a/apps/desktop/src/main/maker-host/__tests__/codexPickerHarness.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/codexPickerHarness.ts
@@ -17,7 +17,7 @@ import * as overflow from '../../maker-ipc/contextOverflowRollover.js';
import { applyRuntimeSetModelChange } from '../../maker-ipc/runtimeSetModel.js';
import { normalizeDeviceLinkSetModelWireArgs } from '../../maker-ipc/setModelWireArgs.js';
import { CredentialModeSwitchBusyError } from '../codex-credential-switch.js';
-import { createPendingAgentSwitchRegistry, applyPendingAgentSwitchIfIdle, projectPendingAgentSwitchIntent, type MakerSessionAgentSwitchHandlerDeps } from '../../maker-ipc/sessionAgentSwitchHandler.js';
+import { createPendingAgentSwitchRegistry, isUserPendingAgentSwitchIntent, applyPendingAgentSwitchIfIdle, projectPendingAgentSwitchIntent, type MakerSessionAgentSwitchHandlerDeps } from '../../maker-ipc/sessionAgentSwitchHandler.js';
import { registerSessionSetModelHandler } from '../../maker-ipc/sessionSetModelHandler.js';
import { registerMakerSessionSendHandler } from '../../maker-ipc/sessionSendHandler.js';
import { createMakerSendTransaction, type MakerSendTransactionDeps } from '../../maker-ipc/makerSendTransaction.js';
@@ -64,6 +64,12 @@ export function createCodexPickerHarness(input: {
const env: Record<string, unknown> = {
...providers, ...efforts, ...routeGuard, ...control, ...axes, ...relink, ...windowGate, ...overflow,
maker, sessions, eq, log, agentSwitchPending: pending,
+ // Active local fixture: no scheduled model override or pending window budget.
+ scheduledModelScope: { restore: asyncNoop },
+ updateScheduledPreference: asyncNoop,
+ isUserPendingAgentSwitchIntent, restoreArchivedSessionForSend: asyncNoop,
+ replayPendingSessionContextWindowBudgetUnderLock: asyncNoop,
+ readStoredSessionContextWindowBudget: async () => null,
// Ordinary local picker has no shared-task invocation context.
captureSharedTaskSettingGuard: (id: string) => createSharedTaskSettingGuard(undefined, id, { admitted: false }),
normalizeDeviceLinkSetModelWireArgs, applyRuntimeSetModelChange, CredentialModeSwitchBusyError,
diff --git a/apps/desktop/src/main/maker-host/__tests__/codexRouteTransaction.integration.test.ts b/apps/desktop/src/main/maker-host/__tests__/codexRouteTransaction.integration.test.ts
index 1d3a458499..0c5b744653 100644
--- a/apps/desktop/src/main/maker-host/__tests__/codexRouteTransaction.integration.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/codexRouteTransaction.integration.test.ts
@@ -31,7 +31,7 @@ const logger: Logger = {
};
describe.skipIf(!binaryPath)('Desktop route transactions with real Codex app-server', () => {
- it.each([...['A', 'B', 'C', 'initialize', 'capability', 'resume', 'transfer'].flatMap((window) => [false, true].map((reviewMode) => ({ window, reviewMode }))), ...['skills', 'config'].map((window) => ({ window, reviewMode: true })), ...['restricted', 'bot', 'local-skill', 'transfer-fork-failure', 'transfer-cas-failure', 'transfer-resume-failure', 'transfer-busy', 'transfer-retire-resolve-success', 'transfer-retire-resolve-failure', 'transfer-retire-list-success', 'transfer-retire-list-failure', 'transfer-picker', 'transfer-picker-shared', 'transfer-picker-resume-failure', 'transfer-picker-shared-resume-failure', 'transfer-picker-cold-task', 'transfer-picker-cold-control', 'transfer-picker-shared-cold-task', 'transfer-picker-shared-cold-control'].map((window) => ({ window, reviewMode: false }))])('waits for Desktop window $window with Review=$reviewMode before start and switch', async ({ window, reviewMode }) => {
+ it.each([...['A', 'B', 'C', 'initialize', 'capability', 'resume', 'transfer'].flatMap((window) => [false, true].map((reviewMode) => ({ window, reviewMode }))), ...['skills', 'config'].map((window) => ({ window, reviewMode: true })), ...['restricted', 'bot', 'local-skill', 'transfer-fork-failure', 'transfer-cas-failure', 'transfer-resume-failure', 'transfer-busy', 'transfer-retire-resolve-success', 'transfer-retire-resolve-failure', 'transfer-retire-list-success', 'transfer-retire-list-failure', 'transfer-picker', 'transfer-picker-shared', 'transfer-picker-shared-activity', 'transfer-picker-resume-failure', 'transfer-picker-shared-resume-failure', 'transfer-picker-cold-task', 'transfer-picker-cold-control', 'transfer-picker-shared-cold-task', 'transfer-picker-shared-cold-control'].map((window) => ({ window, reviewMode: false }))])('waits for Desktop window $window with Review=$reviewMode before start and switch', async ({ window, reviewMode }) => {
const releases: Array<() => void> = [];
const beginMutation = () => { const finish = beginProviderRouteMutation('cprov-fixture'); releases.push(finish); return finish; };
const lateWindow = ['initialize', 'capability', 'resume', 'skills', 'config', 'restricted', 'bot', 'local-skill'].includes(window);
@@ -136,7 +136,7 @@ describe.skipIf(!binaryPath)('Desktop route transactions with real Codex app-ser
try {
if (window.startsWith('transfer')) {
const sqlite = new Database(':memory:');
- sqlite.exec('CREATE TABLE sessions (id TEXT PRIMARY KEY, status TEXT, agent_kind TEXT, remote_host_id TEXT, sdk_session_id TEXT, model TEXT, provider_id TEXT, effort TEXT, fast_mode INTEGER, updated_at INTEGER)');
+ sqlite.exec('CREATE TABLE sessions (id TEXT PRIMARY KEY, status TEXT, agent_kind TEXT, remote_host_id TEXT, sdk_session_id TEXT, model TEXT, provider_id TEXT, effort TEXT, fast_mode INTEGER, updated_at INTEGER, working_dir TEXT)');
if (window.includes('picker')) {
const existing = new Set((sqlite.prepare('PRAGMA table_info(sessions)').all() as Array<{ name: string }>).map(column => column.name));
for (const column of Object.values(getTableColumns(sessions))) {
@@ -201,6 +201,22 @@ describe.skipIf(!binaryPath)('Desktop route transactions with real Codex app-ser
const siblingHost = hostMap.get(sibling.codexHostKey ?? (retirementWindow ? 'local:external-auth' : 'local'))!;
const connection = siblingHost.getConnectionId();
if (window.includes('picker')) {
+ // Regression: ordinary activity can land after the route snapshot and
+ // again while the native fork awaits. Exercise the production picker
+ // closures and real Codex writer, then check one accepted send per ID.
+ if (window.endsWith('-activity')) {
+ const requiresTransfer = maker.requiresCodexThreadHostTransfer.bind(maker);
+ spies.push(vi.spyOn(maker, 'requiresCodexThreadHostTransfer').mockImplementation(async (input) => {
+ sqlite.prepare('UPDATE sessions SET updated_at = updated_at + 1 WHERE id = ?').run(input.sessionId);
+ return requiresTransfer(input);
+ }));
+ const fork = maker.forkSdkSession.bind(maker);
+ spies.push(vi.spyOn(maker, 'forkSdkSession').mockImplementation(async (...args) => {
+ const result = await fork(...args);
+ sqlite.prepare('UPDATE sessions SET updated_at = updated_at + 1 WHERE id = ?').run('source');
+ return result;
+ }));
+ }
const picker = createCodexPickerHarness({ maker, db, workingDir, createMessage: async (id, message) => {
sqlite.prepare('INSERT INTO picker_messages VALUES (?, ?, ?)').run(message.clientId, id, JSON.stringify(message.content));
} });
@@ -265,7 +281,7 @@ describe.skipIf(!binaryPath)('Desktop route transactions with real Codex app-ser
}
if (retirementWindow) {
await maker.closeSession('source');
- const sourceRow = (await db.drizzle.select({ id: sessions.id, sdkSessionId: sessions.sdkSessionId, model: sessions.model, providerId: sessions.providerId, effort: sessions.effort, fastMode: sessions.fastMode, updatedAt: sessions.updatedAt }).from(sessions)).find((row) => row.id === 'source')!;
+ const sourceRow = (await db.drizzle.select({ id: sessions.id, sdkSessionId: sessions.sdkSessionId, model: sessions.model, providerId: sessions.providerId, effort: sessions.effort, fastMode: sessions.fastMode, workingDir: sessions.workingDir }).from(sessions)).find((row) => row.id === 'source')!;
const sourceHost = hostMap.get('local')!;
const internals = agent as unknown as {
resolveLocalAuthSelection(providerId: string | null | undefined, model: string): Promise<{ policy: 'isolated' | 'legacy-shared'; isCurrent(): boolean }>;
@@ -350,7 +366,7 @@ describe.skipIf(!binaryPath)('Desktop route transactions with real Codex app-ser
return;
}
for (const providerId of ['cprov-fixture', 'openai']) {
- const sourceRow = (await db.drizzle.select({ id: sessions.id, sdkSessionId: sessions.sdkSessionId, model: sessions.model, providerId: sessions.providerId, effort: sessions.effort, fastMode: sessions.fastMode, updatedAt: sessions.updatedAt }).from(sessions)).find((row) => row.id === 'source')!;
+ const sourceRow = (await db.drizzle.select({ id: sessions.id, sdkSessionId: sessions.sdkSessionId, model: sessions.model, providerId: sessions.providerId, effort: sessions.effort, fastMode: sessions.fastMode, workingDir: sessions.workingDir }).from(sessions)).find((row) => row.id === 'source')!;
const original = sourceRow.sdkSessionId!;
const rolloutPath = await (agent as unknown as { findRolloutPath(id: string): Promise<string> }).findRolloutPath(original);
const history = await readFile(rolloutPath, 'utf8');
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/codexProviderThreadRelink.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/codexProviderThreadRelink.test.ts
index 839a44cba3..7cbc152e8e 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/codexProviderThreadRelink.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/codexProviderThreadRelink.test.ts
@@ -2,12 +2,14 @@ import { describe, expect, it, vi } from 'vitest';
import Database from 'better-sqlite3';
import { drizzle } from 'drizzle-orm/better-sqlite3';
import type { DbClient } from '../../localDb/client/DbClient.js';
+import { sessions } from '../../localDb/schema.js';
import {
decideCodexProviderThreadRelink,
isXdOpenAiCodexProviderTransition,
relinkCodexProviderThread,
commitCodexThreadTransfer,
+ codexThreadTransferSourcePredicate,
} from '../codexProviderThreadRelink.js';
const source = {
@@ -48,26 +50,36 @@ describe('isXdOpenAiCodexProviderTransition', () => {
});
describe('Codex writer transfer SQLite commit', () => {
- it.each(['unchanged', 'sdk', 'model', 'provider', 'archived', 'revision'])('preserves task identity and rejects stale %s snapshots', async (change) => {
+ // Regression: list activity advanced updatedAt during a model switch and was
+ // mistaken for a different writer. Check both the read gate and the final CAS;
+ // the former revision test incorrectly required this harmless update to fail.
+ it.each(['unchanged', 'activity', 'sdk', 'model', 'provider', 'archived', 'deleted', 'agent', 'remote', 'effort', 'fast', 'directory'])('preserves task identity across %s updates', async (change) => {
const sqlite = new Database(':memory:');
- sqlite.exec(`CREATE TABLE sessions (id TEXT PRIMARY KEY, status TEXT, agent_kind TEXT, remote_host_id TEXT, sdk_session_id TEXT, model TEXT, provider_id TEXT, effort TEXT, fast_mode INTEGER, updated_at INTEGER);
- INSERT INTO sessions VALUES ('S', 'active', 'codex', NULL, 'old', 'model', 'openai', 'high', 0, 1);
- INSERT INTO sessions VALUES ('U', 'active', 'codex', NULL, 'unrelated', 'model', 'openai', 'high', 0, 1);
+ sqlite.exec(`CREATE TABLE sessions (id TEXT PRIMARY KEY, status TEXT, agent_kind TEXT, remote_host_id TEXT, sdk_session_id TEXT, model TEXT, provider_id TEXT, effort TEXT, fast_mode INTEGER, updated_at INTEGER, working_dir TEXT);
+ INSERT INTO sessions VALUES ('S', 'active', 'codex', NULL, 'old', 'model', 'openai', 'high', 0, 1, NULL);
+ INSERT INTO sessions VALUES ('U', 'active', 'codex', NULL, 'unrelated', 'model', 'openai', 'high', 0, 1, NULL);
CREATE TABLE messages (session_id TEXT, content TEXT);
INSERT INTO messages VALUES ('S', 'retained history');`);
const db = { drizzle: drizzle(sqlite) } as unknown as Pick<DbClient, 'drizzle'>;
- const snapshot = { id: 'S', sdkSessionId: 'old', model: 'model', providerId: 'openai', effort: 'high' as const, fastMode: false, updatedAt: 1 };
+ const snapshot = { id: 'S', sdkSessionId: 'old', model: 'model', providerId: 'openai', effort: 'high' as const, fastMode: false, updatedAt: 1, workingDir: null };
+ const compatible = change === 'unchanged' || change === 'activity';
try {
const updates: Record<string, string> = {
sdk: "sdk_session_id = 'newer'", model: "model = 'newer'", provider: "provider_id = 'newer'",
- archived: "status = 'archived'", revision: 'updated_at = 2',
+ archived: "status = 'archived'", deleted: "status = 'deleted'", activity: 'updated_at = 2',
+ agent: "agent_kind = 'pi'", remote: "remote_host_id = 'other'", effort: "effort = 'low'",
+ fast: 'fast_mode = 1', directory: "working_dir = '/different', updated_at = 2",
};
if (updates[change]) sqlite.exec(`UPDATE sessions SET ${updates[change]} WHERE id = 'S'`);
const before = sqlite.prepare('SELECT * FROM sessions ORDER BY id').all();
- expect(await commitCodexThreadTransfer(db, snapshot, { sdkSessionId: 'child', model: 'target', providerId: 'cprov-fixture', fastMode: true })).toBe(change === 'unchanged');
+ const matched = await db.drizzle.select({ id: sessions.id }).from(sessions).where(codexThreadTransferSourcePredicate(snapshot));
+ expect(matched).toEqual(compatible ? [{ id: 'S' }] : []);
+ // Activity may also arrive after readSource, while the native fork awaits.
+ if (change === 'activity') sqlite.exec("UPDATE sessions SET updated_at = 3 WHERE id = 'S'");
+ expect(await commitCodexThreadTransfer(db, snapshot, { sdkSessionId: 'child', model: 'target', providerId: 'cprov-fixture', fastMode: true })).toBe(compatible);
const after = sqlite.prepare('SELECT * FROM sessions ORDER BY id').all();
expect(after[1]).toEqual(before[1]);
- if (change !== 'unchanged') expect(after).toEqual(before);
+ if (!compatible) expect(after).toEqual(before);
else expect(after[0]).toMatchObject({ id: 'S', sdk_session_id: 'child', model: 'target', provider_id: 'cprov-fixture', effort: 'high', fast_mode: 1 });
expect(sqlite.prepare('SELECT * FROM messages').all()).toEqual([{ session_id: 'S', content: 'retained history' }]);
} finally { sqlite.close(); }
diff --git a/apps/desktop/src/main/maker-ipc/codexProviderThreadRelink.ts b/apps/desktop/src/main/maker-ipc/codexProviderThreadRelink.ts
index 6885cc2dfb..835ee643c8 100644
--- a/apps/desktop/src/main/maker-ipc/codexProviderThreadRelink.ts
+++ b/apps/desktop/src/main/maker-ipc/codexProviderThreadRelink.ts
@@ -11,7 +11,7 @@ import type { DbClient } from '../localDb/client/DbClient.js';
import { sessions } from '../localDb/schema.js';
export type CodexThreadTransferSnapshot = Pick<typeof sessions.$inferSelect,
- 'id' | 'sdkSessionId' | 'model' | 'providerId' | 'effort' | 'fastMode' | 'updatedAt'>;
+ 'id' | 'sdkSessionId' | 'model' | 'providerId' | 'effort' | 'fastMode' | 'workingDir'>;
export function codexThreadTransferSourcePredicate(source: CodexThreadTransferSnapshot) {
return and(
@@ -21,7 +21,10 @@ export function codexThreadTransferSourcePredicate(source: CodexThreadTransferSn
source.model === null ? isNull(sessions.model) : eq(sessions.model, source.model),
source.providerId === null ? isNull(sessions.providerId) : eq(sessions.providerId, source.providerId),
eq(sessions.effort, source.effort), eq(sessions.fastMode, source.fastMode),
- eq(sessions.updatedAt, source.updatedAt),
+ // List activity, message persistence and title edits also advance updatedAt.
+ // They do not replace the writer. Fence the native source and its route/cwd;
+ // the caller retains the session selection lock and owner/revision guards.
+ source.workingDir === null ? isNull(sessions.workingDir) : eq(sessions.workingDir, source.workingDir),
);
}