fix: post-merge breakage (Gemini, idle timeout, sharp cache) (#1138)
* fix: add gemini-3-flash to validModels array The model was defined in the type union and RPM limits but missing from the runtime validModels array, causing silent fallback to gemini-2.5-flash. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: skip processing when Gemini returns empty observation response Empty responses were silently consuming messages from the queue via processAgentResponse. Now skips processing on empty content, leaving the message in processing status for stale recovery. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: prevent idle timeout from triggering infinite restart loop When a session hits the 3-minute idle timeout, the finally block was seeing stale processing messages and restarting the generator endlessly. Now tracks idle timeout as a distinct exit reason via session flag, resets stale messages, and skips restart. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: clear stale Bun native module cache on update Bun's global cache retains sharp/libvips native binaries with broken dylib references after version upgrades. Clear ~/.bun/install/cache/@img/ before install in both the end-user (smart-install) and dev (sync-marketplace) paths to prevent ERR_DLOPEN_FAILED errors in Chroma sync. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: address PR review feedback (empty summary response, session-scoped reset, shell injection) - Apply same empty-response guard to summary path as observation path in GeminiAgent - Add optional sessionDbId param to resetStaleProcessingMessages for session-scoped resets - Use JSON.stringify for gitignore pattern escaping, filter negation patterns Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -133,16 +133,27 @@ export class PendingMessageStore {
|
||||
* @param thresholdMs Messages processing longer than this are considered stale (default: 5 minutes)
|
||||
* @returns Number of messages reset
|
||||
*/
|
||||
resetStaleProcessingMessages(thresholdMs: number = 5 * 60 * 1000): number {
|
||||
resetStaleProcessingMessages(thresholdMs: number = 5 * 60 * 1000, sessionDbId?: number): number {
|
||||
const cutoff = Date.now() - thresholdMs;
|
||||
const stmt = this.db.prepare(`
|
||||
UPDATE pending_messages
|
||||
SET status = 'pending', started_processing_at_epoch = NULL
|
||||
WHERE status = 'processing' AND started_processing_at_epoch < ?
|
||||
`);
|
||||
const result = stmt.run(cutoff);
|
||||
let stmt;
|
||||
let result;
|
||||
if (sessionDbId !== undefined) {
|
||||
stmt = this.db.prepare(`
|
||||
UPDATE pending_messages
|
||||
SET status = 'pending', started_processing_at_epoch = NULL
|
||||
WHERE status = 'processing' AND started_processing_at_epoch < ? AND session_db_id = ?
|
||||
`);
|
||||
result = stmt.run(cutoff, sessionDbId);
|
||||
} else {
|
||||
stmt = this.db.prepare(`
|
||||
UPDATE pending_messages
|
||||
SET status = 'pending', started_processing_at_epoch = NULL
|
||||
WHERE status = 'processing' AND started_processing_at_epoch < ?
|
||||
`);
|
||||
result = stmt.run(cutoff);
|
||||
}
|
||||
if (result.changes > 0) {
|
||||
logger.info('QUEUE', `RESET_STALE | count=${result.changes} | thresholdMs=${thresholdMs}`);
|
||||
logger.info('QUEUE', `RESET_STALE | count=${result.changes} | thresholdMs=${thresholdMs}${sessionDbId !== undefined ? ` | sessionDbId=${sessionDbId}` : ''}`);
|
||||
}
|
||||
return result.changes;
|
||||
}
|
||||
|
||||
@@ -604,6 +604,20 @@ export class WorkerService {
|
||||
return;
|
||||
}
|
||||
|
||||
// Idle timeout means no new work arrived for 3 minutes - don't restart
|
||||
if (session.idleTimedOut) {
|
||||
logger.info('SYSTEM', 'Generator exited due to idle timeout, not restarting', {
|
||||
sessionId: session.sessionDbId
|
||||
});
|
||||
// Reset stale processing messages so they can be picked up later
|
||||
const { PendingMessageStore: PendingMsgStore } = require('./sqlite/PendingMessageStore.js');
|
||||
const idlePendingStore = new PendingMsgStore(this.dbManager.getSessionStore().db, 3);
|
||||
idlePendingStore.resetStaleProcessingMessages(0, session.sessionDbId); // Reset this session's messages only
|
||||
session.idleTimedOut = false; // Reset flag
|
||||
this.broadcastProcessingStatus();
|
||||
return;
|
||||
}
|
||||
|
||||
// Check if there's pending work that needs processing with a fresh AbortController
|
||||
const { PendingMessageStore } = require('./sqlite/PendingMessageStore.js');
|
||||
const pendingStore = new PendingMessageStore(this.dbManager.getSessionStore().db, 3);
|
||||
|
||||
@@ -35,6 +35,7 @@ export interface ActiveSession {
|
||||
currentProvider: 'claude' | 'gemini' | 'openrouter' | null; // Track which provider is currently running
|
||||
consecutiveRestarts: number; // Track consecutive restart attempts to prevent infinite loops
|
||||
forceInit?: boolean; // Force fresh SDK session (skip resume)
|
||||
idleTimedOut?: boolean; // Set when session exits due to idle timeout (prevents restart loop)
|
||||
// CLAIM-CONFIRM FIX: Track IDs of messages currently being processed
|
||||
// These IDs will be confirmed (deleted) after successful storage
|
||||
processingMessageIds: number[];
|
||||
|
||||
@@ -238,17 +238,25 @@ export class GeminiAgent {
|
||||
}
|
||||
|
||||
// Process response using shared ResponseProcessor
|
||||
await processAgentResponse(
|
||||
obsResponse.content || '',
|
||||
session,
|
||||
this.dbManager,
|
||||
this.sessionManager,
|
||||
worker,
|
||||
tokensUsed,
|
||||
originalTimestamp,
|
||||
'Gemini',
|
||||
lastCwd
|
||||
);
|
||||
if (obsResponse.content) {
|
||||
await processAgentResponse(
|
||||
obsResponse.content,
|
||||
session,
|
||||
this.dbManager,
|
||||
this.sessionManager,
|
||||
worker,
|
||||
tokensUsed,
|
||||
originalTimestamp,
|
||||
'Gemini',
|
||||
lastCwd
|
||||
);
|
||||
} else {
|
||||
logger.warn('SDK', 'Empty Gemini observation response, skipping processing to preserve message', {
|
||||
sessionId: session.sessionDbId,
|
||||
messageId: session.processingMessageIds[session.processingMessageIds.length - 1]
|
||||
});
|
||||
// Don't confirm - leave message for stale recovery
|
||||
}
|
||||
|
||||
} else if (message.type === 'summarize') {
|
||||
// CRITICAL: Check memorySessionId BEFORE making expensive LLM call
|
||||
@@ -280,17 +288,25 @@ export class GeminiAgent {
|
||||
}
|
||||
|
||||
// Process response using shared ResponseProcessor
|
||||
await processAgentResponse(
|
||||
summaryResponse.content || '',
|
||||
session,
|
||||
this.dbManager,
|
||||
this.sessionManager,
|
||||
worker,
|
||||
tokensUsed,
|
||||
originalTimestamp,
|
||||
'Gemini',
|
||||
lastCwd
|
||||
);
|
||||
if (summaryResponse.content) {
|
||||
await processAgentResponse(
|
||||
summaryResponse.content,
|
||||
session,
|
||||
this.dbManager,
|
||||
this.sessionManager,
|
||||
worker,
|
||||
tokensUsed,
|
||||
originalTimestamp,
|
||||
'Gemini',
|
||||
lastCwd
|
||||
);
|
||||
} else {
|
||||
logger.warn('SDK', 'Empty Gemini summary response, skipping processing to preserve message', {
|
||||
sessionId: session.sessionDbId,
|
||||
messageId: session.processingMessageIds[session.processingMessageIds.length - 1]
|
||||
});
|
||||
// Don't confirm - leave message for stale recovery
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -413,6 +429,7 @@ export class GeminiAgent {
|
||||
'gemini-2.5-pro',
|
||||
'gemini-2.0-flash',
|
||||
'gemini-2.0-flash-lite',
|
||||
'gemini-3-flash',
|
||||
'gemini-3-flash-preview',
|
||||
];
|
||||
|
||||
|
||||
@@ -423,6 +423,7 @@ export class SessionManager {
|
||||
signal: session.abortController.signal,
|
||||
onIdleTimeout: () => {
|
||||
logger.info('SESSION', 'Triggering abort due to idle timeout to kill subprocess', { sessionDbId });
|
||||
session.idleTimedOut = true;
|
||||
session.abortController.abort();
|
||||
}
|
||||
})) {
|
||||
|
||||
Reference in New Issue
Block a user