@kelceyp/caw-server 1.0.278 → 1.0.279

package/dist/pty-emit-result.mjs

@@ -41,6 +41,7 @@ export function emitResult({
     effectiveSessionId = null,
     startedAt = null,
     endedAt = null,
+    teardownReason = null,
     alreadyEmitted = false,
     suppressFallback = false,
     write = defaultWrite,
@@ -67,6 +68,14 @@ export function emitResult({
         if (startedAt !== null && endedAt !== null) {
             metadata.durationMs = endedAt - startedAt;
         }
+        // As1033 Task 6: append teardownReason ('stop' | 'watchdog') so the
+        // downstream stream handler (Task 5 landed the capture) and the
+        // JobRunner classifier gate (Task 7) can distinguish a clean Stop
+        // finish from a watchdog force-kill. Field order of the four
+        // pre-existing fields is preserved byte-for-byte.
+        if (teardownReason !== null) {
+            metadata.teardownReason = teardownReason;
+        }
         // D11 test-only override: when the wrapper's CAW_PTY_SUPPRESS_STOP_FALLBACK
         // gate is set, blank the `result` field on the success branch only. The
         // wire is deliberately identical to a real empty-message turn — that IS

package/dist/pty-wrapper.mjs

@@ -370,6 +370,11 @@ const SUPPRESS_STOP_FALLBACK = process.env.CAW_PTY_SUPPRESS_STOP_FALLBACK === '1
 
 let watchdogTimer = null;
 let teardownInitiated = false;
+// Captured at the top of teardown() on both paths (clean-Stop passes 'stop',
+// watchdog callback passes 'watchdog'). Read by emitResult() on the success
+// branch and written to metadata.teardownReason so the downstream
+// stream-handler and classifier (Task 7) can distinguish the two paths.
+let teardownReason = null;
 
 // Duration capture: wall clock from `pty.spawn` to top of `teardown()`.
 // `endedAt` is set by whichever teardown path fires first (normal SIGUSR1
@@ -388,16 +393,17 @@ 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();
+        log(`Watchdog expired: ${WATCHDOG_TIMEOUT_MS / 60000}m elapsed since last deferred Stop, force-killing claude`);
+        teardown('watchdog');
     }, WATCHDOG_TIMEOUT_MS);
 };
 
-const teardown = () => {
+const teardown = (reason = 'stop') => {
     if (teardownInitiated) return;
     teardownInitiated = true;
     endedAt = Date.now();
-    log('Teardown: stop received, no pending work, killing claude');
+    teardownReason = reason;
+    log(`Teardown (reason=${reason}): killing claude`);
     log(`Duration: ${startedAt !== null ? (endedAt - startedAt) : 'unknown'} ms (startedAt=${startedAt}, endedAt=${endedAt})`);
     if (watchdogTimer) { clearTimeout(watchdogTimer); watchdogTimer = null; }
     stopPolling();
@@ -654,6 +660,7 @@ const emitResult = (hookData) => {
         effectiveSessionId,
         startedAt,
         endedAt,
+        teardownReason,
         alreadyEmitted: resultEmitted || failureEmitted,
         suppressFallback: SUPPRESS_STOP_FALLBACK,
         log