wushenghua/hapi
1
0
Fork 0
mirror of https://github.com/wu736139669/hapi.git synced 2026-08-05 06:24:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: prevent auto-resume of old Codex sessions from before startup

Browse Source 
CODEX_SESSION_SCANNER was incorrectly auto-resuming old sessions because
session files persist after Codex exits. Fixed by:

1. Only matching sessions created AFTER hapi startup (reject if
   sessionTimestamp < referenceTimestampMs)
2. Snapshot resumeSessionId at startup so scanner callbacks don't
   affect codexLocal's launch parameters
3. Updated session timestamp test to verify boundary conditions
This commit is contained in:
weishu
2026-01-13 11:59:34 +08:00
parent 251b04ec2d
commit b5e90f1f50
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/src/codex/codexLocalLauncher.ts
+3 -2
View File
@@ -11,6 +11,7 @@ export async function codexLocalLauncher(session: CodexSession): Promise<'switch
let exitReason: 'switch' | 'exit' | null = null;
const processAbortController = new AbortController();
const exitFuture = new Future<void>();
const resumeSessionId = session.sessionId;
// Start hapi server for MCP bridge (same as remote mode)
const { server: happyServer, mcpServers } = await buildHapiMcpBridge(session.client);
@@ -28,7 +29,7 @@ export async function codexLocalLauncher(session: CodexSession): Promise<'switch
};
const scanner = await createCodexSessionScanner({
sessionId: session.sessionId,
sessionId: resumeSessionId,
cwd: session.path,
startupTimestampMs: Date.now(),
onSessionMatchFailed: handleSessionMatchFailed,
@@ -102,7 +103,7 @@ export async function codexLocalLauncher(session: CodexSession): Promise<'switch
try {
await codexLocal({
path: session.path,
sessionId: session.sessionId,
sessionId: resumeSessionId,
onSessionFound: handleSessionFound,
abort: processAbortController.signal,
codexArgs: session.codexArgs,
cli/src/codex/utils/codexSessionScanner.test.ts
+2 -2
View File
@@ -75,7 +75,7 @@ describe('codexSessionScanner', () => {
});
it('limits session scan to dates within the start window', async () => {
const referenceTimestampMs = Date.parse('2025-12-22T00:00:30.000Z');
const referenceTimestampMs = Date.parse('2025-12-22T00:00:00.000Z');
const windowMs = 2 * 60 * 1000;
const matchingSessionId = 'session-222';
const outsideSessionId = 'session-999';
@@ -85,7 +85,7 @@ describe('codexSessionScanner', () => {
await mkdir(outsideDir, { recursive: true });
const baseLines = [
JSON.stringify({ type: 'session_meta', payload: { id: matchingSessionId, cwd: '/data/github/happy/hapi', timestamp: '2025-12-22T00:00:00.000Z' } }),
JSON.stringify({ type: 'session_meta', payload: { id: matchingSessionId, cwd: '/data/github/happy/hapi', timestamp: '2025-12-22T00:00:30.000Z' } }),
JSON.stringify({ type: 'event_msg', payload: { type: 'agent_message', message: 'hello' } })
];
await writeFile(matchingFile, baseLines.join('\n') + '\n');
cli/src/codex/utils/codexSessionScanner.ts
+5 -1
View File
@@ -336,7 +336,11 @@ class CodexSessionScannerImpl extends BaseSessionScanner<CodexSessionEvent> {
return null;
}
const diff = Math.abs(sessionTimestamp - this.referenceTimestampMs);
if (sessionTimestamp < this.referenceTimestampMs) {
return null;
}
const diff = sessionTimestamp - this.referenceTimestampMs;
if (diff > this.sessionStartWindowMs) {
return null;
}