@teamvibe/poller 0.1.28 → 0.1.30

package/dist/claude-spawner.d.ts

@@ -11,3 +11,4 @@ export declare function spawnClaudeCode(msg: TeamVibeQueueMessage, sessionLog: S
 }>;
 export declare function getActiveProcessCount(): number;
 export declare function isAtCapacity(): boolean;
+export declare function killAllActiveProcesses(): Promise<void>;

package/dist/claude-spawner.js

@@ -243,8 +243,11 @@ async function runClaudeCode(msg, sessionLog, cwd, sessionId, isFirstMessage = t
             stderr += chunk;
             sessionLog.claude('stderr', chunk.trimEnd());
         });
+        let timedOut = false;
+        const timeoutMinutes = Math.round(config.CLAUDE_TIMEOUT_MS / 60000);
         const timeout = setTimeout(() => {
-            logger.error(`Claude Code process timed out after ${config.CLAUDE_TIMEOUT_MS}ms`);
+            timedOut = true;
+            logger.error(`Claude Code process timed out after ${timeoutMinutes} minutes`);
             proc.kill('SIGTERM');
             setTimeout(() => proc.kill('SIGKILL'), 5000);
         }, config.CLAUDE_TIMEOUT_MS);
@@ -256,7 +259,10 @@ async function runClaudeCode(msg, sessionLog, cwd, sessionId, isFirstMessage = t
                 output: stdout,
                 exitCode: code,
             };
-            if (code !== 0) {
+            if (timedOut) {
+                result.error = `Session timed out after ${timeoutMinutes} minutes. The task was still running when the time limit was reached. Consider breaking complex tasks into smaller steps.`;
+            }
+            else if (code !== 0) {
                 result.error = stderr || `Process exited with code ${code}`;
             }
             resolve(result);
@@ -298,3 +304,26 @@ export function getActiveProcessCount() {
 export function isAtCapacity() {
     return activeProcesses.size >= config.MAX_CONCURRENT_SESSIONS;
 }
+export function killAllActiveProcesses() {
+    if (activeProcesses.size === 0)
+        return Promise.resolve();
+    logger.info(`Killing ${activeProcesses.size} active Claude process(es)...`);
+    const killPromises = Array.from(activeProcesses.entries()).map(([id, proc]) => new Promise((resolve) => {
+        if (proc.exitCode !== null) {
+            resolve();
+            return;
+        }
+        const forceKillTimer = setTimeout(() => {
+            logger.warn(`Process ${id} did not exit after SIGTERM, sending SIGKILL`);
+            proc.kill('SIGKILL');
+        }, 5000);
+        proc.once('close', () => {
+            clearTimeout(forceKillTimer);
+            resolve();
+        });
+        proc.kill('SIGTERM');
+    }));
+    return Promise.all(killPromises).then(() => {
+        logger.info('All active processes terminated');
+    });
+}

package/dist/config.js

@@ -19,8 +19,8 @@ const configSchema = z.object({
     POLL_WAIT_TIME_SECONDS: z.coerce.number().default(20),
     VISIBILITY_TIMEOUT_SECONDS: z.coerce.number().default(60),
     HEARTBEAT_INTERVAL_MS: z.coerce.number().default(40000), // 40 seconds
-    CLAUDE_TIMEOUT_MS: z.coerce.number().default(1800000), // 30 minutes
-    STALE_LOCK_TIMEOUT_MS: z.coerce.number().default(2100000), // 35 minutes
+    CLAUDE_TIMEOUT_MS: z.coerce.number().default(3600000), // 60 minutes
+    STALE_LOCK_TIMEOUT_MS: z.coerce.number().default(3900000), // 65 minutes
     // Paths
     TEAMVIBE_DATA_DIR: z.string().default(DEFAULT_DATA_DIR),
     BRAINS_PATH: z.string().default(''),

package/dist/poller.js

@@ -1,7 +1,7 @@
 import { config } from './config.js';
 import { logger } from './logger.js';
 import { pollMessages, deleteMessage, extendVisibility, } from './sqs-poller.js';
-import { spawnClaudeCode, isAtCapacity, getActiveProcessCount } from './claude-spawner.js';
+import { spawnClaudeCode, isAtCapacity, getActiveProcessCount, killAllActiveProcesses } from './claude-spawner.js';
 import { sendSlackError, addReaction, getUserInfo, startTypingIndicator } from './slack-client.js';
 import { acquireSessionLock, releaseSessionLock, updateSessionId } from './session-store.js';
 import { getBrainPath, ensureDirectories, ensureBaseBrain, pushBrainChanges } from './brain-manager.js';
@@ -151,8 +151,10 @@ async function processMessage(received) {
         else {
             sessionLog.error(`Claude Code failed: ${result.error}`);
             if (hasSlackContext) {
-                await sendSlackError(queueMessage, result.error || `Process exited with code ${result.exitCode}`);
-                await addReaction(queueMessage, 'x');
+                const errorMessage = result.error || `Process exited with code ${result.exitCode}`;
+                const isTimeout = errorMessage.includes('timed out');
+                await sendSlackError(queueMessage, errorMessage);
+                await addReaction(queueMessage, isTimeout ? 'hourglass' : 'x');
             }
             if (lockToken) {
                 await releaseSessionLock(threadId, lockToken, 'idle');
@@ -191,7 +193,7 @@ async function processMessage(received) {
 }
 async function pollLoop() {
     logger.info('Poll loop started');
-    while (true) {
+    while (!shuttingDown) {
         try {
             if (isAtCapacity()) {
                 logger.debug(`At capacity (${getActiveProcessCount()}/${config.MAX_CONCURRENT_SESSIONS}), waiting...`);
@@ -229,6 +231,16 @@ async function shutdown(signal) {
     shuttingDown = true;
     logger.info(`${signal} received, shutting down gracefully...`);
     stopRefresh();
+    // Unblock all messages waiting on thread completion so they can exit
+    for (const [threadId, signals] of threadCompletionSignals.entries()) {
+        logger.info(`Unblocking ${signals.length} waiting message(s) on thread ${threadId}`);
+        signals.forEach((resolve) => resolve());
+    }
+    threadCompletionSignals.clear();
+    waitingCountByThread.clear();
+    // Kill all active Claude child processes
+    await killAllActiveProcesses();
+    // Wait for processingMessages to drain (with timeout)
     const shutdownTimeout = 30000;
     const startTime = Date.now();
     while (processingMessages.size > 0) {

package/dist/slack-client.js

@@ -60,10 +60,14 @@ export async function sendSlackError(msg, error) {
         return;
     const { channel, thread_ts } = msg.response_context.slack;
     const slack = getSlackClient(msg.teamvibe.botToken);
+    const isTimeout = error.includes('timed out');
+    const text = isTimeout
+        ? `:warning: ${error}`
+        : `Error processing your request:\n\`\`\`\n${error}\n\`\`\``;
     await slack.chat.postMessage({
         channel,
         thread_ts,
-        text: `Error processing your request:\n\`\`\`\n${error}\n\`\`\``,
+        text,
     });
 }
 export async function addReaction(msg, emoji) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamvibe/poller",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "type": "module",
   "main": "./dist/index.js",
   "bin": {