fix: move summary wait + session-complete into Stop hook to prevent lost summaries

SessionEnd has a 1.5s hardcoded cap from Claude Code (CLAUDE_CODE_SESSIONEND_HOOKS_TIMEOUT_MS),
making it unsuitable for waiting on async work. Previously, the Stop hook would fire-and-forget
the summarize request, then SessionEnd would immediately call deleteSession — aborting the SDK
agent mid-summary.

Now the Stop hook (120s timeout, no cap) owns the full lifecycle:
1. Queue summarize request
2. Poll new GET /api/sessions/status endpoint until queue drains
3. Call /api/sessions/complete after summary finishes

SessionEnd is now a true fire-and-forget fallback (process.exit(0) immediately).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Alex Newman
2026-04-03 14:05:53 -07:00
parent 8265fc7aa1
commit a2ac116aac
4 changed files with 162 additions and 79 deletions
@@ -321,6 +321,7 @@ export class SessionRoutes extends BaseRouteHandler {
app.post('/api/sessions/observations', this.handleObservationsByClaudeId.bind(this));
app.post('/api/sessions/summarize', this.handleSummarizeByClaudeId.bind(this));
app.post('/api/sessions/complete', this.handleCompleteByClaudeId.bind(this));
app.get('/api/sessions/status', this.handleStatusByClaudeId.bind(this));
}
/**
@@ -631,6 +632,39 @@ export class SessionRoutes extends BaseRouteHandler {
res.json({ status: 'queued' });
});
/**
* Get session status by contentSessionId (summarize handler polls this)
* GET /api/sessions/status?contentSessionId=...
*
* Returns queue depth so the Stop hook can wait for summary completion.
*/
private handleStatusByClaudeId = this.wrapHandler((req: Request, res: Response): void => {
const contentSessionId = req.query.contentSessionId as string;
if (!contentSessionId) {
return this.badRequest(res, 'Missing contentSessionId query parameter');
}
const store = this.dbManager.getSessionStore();
const sessionDbId = store.createSDKSession(contentSessionId, '', '');
const session = this.sessionManager.getSession(sessionDbId);
if (!session) {
res.json({ status: 'not_found', queueLength: 0 });
return;
}
const pendingStore = this.sessionManager.getPendingMessageStore();
const queueLength = pendingStore.getPendingCount(sessionDbId);
res.json({
status: 'active',
sessionDbId,
queueLength,
uptime: Date.now() - session.startTime
});
});
/**
* Complete session by contentSessionId (session-complete hook uses this)
* POST /api/sessions/complete
@@ -669,6 +703,8 @@ export class SessionRoutes extends BaseRouteHandler {
}
// Complete the session (removes from active sessions map)
// Note: The Stop hook (summarize handler) waits for pending work before calling
// this endpoint. No polling here — that's the hook's responsibility.
await this.completionHandler.completeByDbId(sessionDbId);
logger.info('SESSION', 'Session completed via API', {