@kelceyp/caw-server 1.0.215 → 1.0.217

package/dist/pty-deferred-teardown.mjs

@@ -0,0 +1,17 @@
+import { readFileSync } from 'fs';
+
+export const readSentinelPayload = (sentinelPath) => {
+    try {
+        return JSON.parse(readFileSync(sentinelPath, 'utf-8'));
+    } catch {
+        return null;
+    }
+};
+
+export const hasPendingWork = (payload) => {
+    const tasks = payload?.background_tasks;
+    if (Array.isArray(tasks) && tasks.length > 0) return true;
+    const crons = payload?.session_crons;
+    if (Array.isArray(crons) && crons.length > 0) return true;
+    return false;
+};

package/dist/pty-wrapper.mjs

@@ -10,6 +10,7 @@
  *   --session-id <uuid>   Session ID (first run)
  *   --resume <uuid>       Resume session (continuation)
  *   --model <model>       Model override
+ *   --effort <level>      Effort level override
  *   --skip-permissions    Enable --dangerously-skip-permissions
  *
  * Stdin:  The prompt text (piped by JobRunner before spawn)
@@ -22,6 +23,7 @@ import { mkdtempSync, readFileSync, existsSync, writeFileSync, rmSync, realpathS
 import { join } from 'path';
 import { tmpdir, homedir } from 'os';
 import { execSync } from 'child_process';
+import { readSentinelPayload, hasPendingWork } from './pty-deferred-teardown.mjs';
 
 // --- Arg parsing ---
 
@@ -35,6 +37,7 @@ const hasFlag = (name) => args.includes(name);
 const sessionId = getArg('--session-id');
 const resumeId = getArg('--resume');
 const model = getArg('--model');
+const effortLevel = getArg('--effort');
 const skipPermissions = hasFlag('--skip-permissions');
 
 if (!sessionId && !resumeId) {
@@ -79,17 +82,16 @@ const sentinelPath = join(tempDir, 'result.json');
 const hookScriptPath = join(tempDir, 'stop-hook.sh');
 const settingsPath = join(tempDir, 'settings.json');
 const claudePidPath = join(tempDir, 'claude.pid');
+const wrapperPidPath = join(tempDir, 'wrapper.pid');
 
 // --- Write Stop hook script ---
 // The hook: (1) cats Stop hook JSON (on stdin) to sentinel file, then
-// (2) SIGINTs the specific claude PID recorded in claude.pid.
-// Using a PID file avoids a fuzzy *claude* tree walk that could accidentally
-// SIGINT the calling agent process (e.g. when running under a Claude agent).
+// (2) sends SIGUSR1 to the wrapper PID so it can check whether teardown is safe.
 
 const hookScript = [
     '#!/bin/bash',
     `cat > '${sentinelPath}'`,
-    `kill -INT $(cat '${claudePidPath}') 2>/dev/null`,
+    `kill -USR1 $(cat '${wrapperPidPath}') 2>/dev/null`,
     ''
 ].join('\n');
 writeFileSync(hookScriptPath, hookScript, { mode: 0o755 });
@@ -152,6 +154,59 @@ const ensureNonInteractiveSetup = (cwd) => {
 
 ensureNonInteractiveSetup(process.cwd());
 
+// --- Deferred teardown state ---
+
+const WATCHDOG_TIMEOUT_MS = 30 * 60 * 1000; // 30 minutes
+
+let watchdogTimer = null;
+let teardownInitiated = false;
+
+// Forward declarations (assigned after ptyProcess is created)
+let ptyProcess = null;
+
+const startOrResetWatchdog = () => {
+    if (watchdogTimer) clearTimeout(watchdogTimer);
+    log(`Watchdog ${watchdogTimer ? 'reset' : 'armed'}: ${WATCHDOG_TIMEOUT_MS / 60000}m timeout`);
+    watchdogTimer = setTimeout(() => {
+        log(`Watchdog expired after ${WATCHDOG_TIMEOUT_MS / 60000}m with no progress, force-killing claude`);
+        teardown();
+    }, WATCHDOG_TIMEOUT_MS);
+};
+
+const teardown = () => {
+    if (teardownInitiated) return;
+    teardownInitiated = true;
+    log('Teardown: stop received, no pending work, killing claude');
+    if (watchdogTimer) { clearTimeout(watchdogTimer); watchdogTimer = null; }
+    stopPolling();
+    if (ptyProcess) ptyProcess.kill('SIGINT');
+};
+
+// --- Register SIGUSR1 handler and write wrapper PID ---
+// Must happen BEFORE spawning claude so the handler is ready when the first Stop fires.
+
+process.on('SIGUSR1', () => {
+    log('Received SIGUSR1 (stop signal)');
+    tailTranscript();
+    const payload = readSentinelPayload(sentinelPath);
+    if (!payload) {
+        log(`Warning: failed to read sentinel, proceeding with teardown`);
+        teardown();
+        return;
+    }
+    const bgCount = Array.isArray(payload.background_tasks) ? payload.background_tasks.length : 0;
+    const cronCount = Array.isArray(payload.session_crons) ? payload.session_crons.length : 0;
+    log(`Sentinel: background_tasks=${bgCount}, session_crons=${cronCount}`);
+    if (hasPendingWork(payload)) {
+        log('Deferring teardown: pending background work');
+        startOrResetWatchdog();
+        return;
+    }
+    teardown();
+});
+
+writeFileSync(wrapperPidPath, String(process.pid));
+
 // --- Build claude args ---
 
 const claudeArgs = [];
@@ -166,6 +221,9 @@ if (skipPermissions) {
 if (model) {
     claudeArgs.push('--model', model);
 }
+if (effortLevel) {
+    claudeArgs.push('--effort', effortLevel);
+}
 claudeArgs.push('--settings', settingsPath);
 claudeArgs.push(prompt);
 
@@ -174,7 +232,7 @@ log(`Prompt length: ${prompt.length} chars`);
 
 // --- Spawn claude via PTY ---
 
-const ptyProcess = pty.spawn(claudePath, claudeArgs, {
+ptyProcess = pty.spawn(claudePath, claudeArgs, {
     name: 'xterm-256color',
     cols: 120,
     rows: 40,
@@ -252,7 +310,6 @@ const tailTranscript = () => {
         for (let i = transcriptLinesRead; i < lines.length; i++) {
             try {
                 const entry = JSON.parse(lines[i]);
-                // Skip hook progress notifications (internal noise)
                 if (entry.type === 'progress' && entry.data?.type === 'hook_progress') continue;
                 process.stdout.write(JSON.stringify({ type: 'transcript', entry }) + '\n');
                 newLines++;
@@ -327,7 +384,8 @@ ptyProcess.onExit(({ exitCode }) => {
     if (exited) return;
     exited = true;
 
-    // Stop polling (sentinelPath still exists on disk at this point)
+    // Clear watchdog and stop polling (sentinelPath still exists on disk at this point)
+    if (watchdogTimer) { clearTimeout(watchdogTimer); watchdogTimer = null; }
     stopPolling();
 
     // Do a final transcript tail to capture any last entries