@agentdeck/bridge 1.0.18 → 1.0.20

package/dist/claude-turn-watchdog.js

@@ -0,0 +1,147 @@
+/**
+ * Claude turn watchdog — closes a managed turn whose Stop hook was dropped.
+ *
+ * The Stop hook is the sole authority that closes a Claude turn (state → IDLE,
+ * timeline chat_response/chat_end, APME turn response), but its delivery is
+ * not guaranteed: the hook curl is fire-and-forget with a tight budget, and
+ * historically it has been observed to drop at a meaningful rate. Since the
+ * PTY spinner/ring-buffer fallbacks were removed (1.0.19), a dropped Stop left
+ * the session stuck PROCESSING for STUCK_TIMEOUT_MS and the timeline/APME turn
+ * open until the next prompt.
+ *
+ * Doctrine: recovery reads the durable log, not the screen. While a turn is
+ * open and the hook channel has been quiet, the watchdog probes the
+ * transcript JSONL tail (the same authority the Stop branch itself reads).
+ * A tail whose last message-bearing record is `assistant` + `end_turn`,
+ * stamped after this turn opened, proves the turn finished — the watchdog
+ * then injects a synthetic Stop through the normal adapter event pipe so
+ * state machine, timeline, and APME all close through their existing paths.
+ *
+ * False-positive guards:
+ *  - `stop_reason: "tool_use"` (permission prompt / AskUserQuestion open,
+ *    tools running) never matches, so a genuine wait is never force-closed.
+ *  - The end_turn record must be newer than this turn's open time, so the
+ *    previous turn's end_turn cannot close a freshly opened turn.
+ *  - A transcript mtime older than the last probe skips the read entirely,
+ *    so an idle prompt does not re-read 512 KB every poll.
+ *  - If a real Stop (or SessionEnd) arrives first, the watchdog disarms; a
+ *    synthetic Stop after a real one is deduped downstream
+ *    (ccPendingCompletion / transition-table guards).
+ */
+import { statSync } from 'fs';
+import { readTurnEndProbe } from './apme/claude-transcript-reader.js';
+import { debug } from './logger.js';
+/** Hook-channel silence required before the transcript is consulted. */
+export const WATCHDOG_QUIET_MS = 10_000;
+/** Poll cadence while a turn is open. */
+export const WATCHDOG_POLL_MS = 5_000;
+/** Clock slack when comparing a record timestamp to the turn-open time. */
+const TURN_OPEN_SLACK_MS = 2_000;
+export class ClaudeTurnWatchdog {
+    onMissedStop;
+    quietMs;
+    pollMs;
+    now;
+    probe;
+    mtimeMs;
+    timer = null;
+    turnOpenedAt = null;
+    lastHookAt = 0;
+    transcriptPath = '';
+    lastProbedMtimeMs = -1;
+    stopped = false;
+    constructor(opts) {
+        this.onMissedStop = opts.onMissedStop;
+        this.quietMs = opts.quietMs ?? WATCHDOG_QUIET_MS;
+        this.pollMs = opts.pollMs ?? WATCHDOG_POLL_MS;
+        this.now = opts.now ?? Date.now;
+        this.probe = opts.probe ?? readTurnEndProbe;
+        this.mtimeMs = opts.mtimeMs ?? defaultMtimeMs;
+    }
+    /** Feed every hook-sourced adapter event through here (synthetic ones too —
+     *  the synthetic Stop closes the turn like a real one). */
+    noteHookEvent(eventName, data) {
+        if (this.stopped)
+            return;
+        this.lastHookAt = this.now();
+        const tp = data?.transcript_path;
+        if (typeof tp === 'string' && tp)
+            this.transcriptPath = tp;
+        switch (eventName) {
+            case 'UserPromptSubmit':
+                this.turnOpenedAt = this.now();
+                this.lastProbedMtimeMs = -1;
+                this.arm();
+                break;
+            case 'Stop':
+                this.turnOpenedAt = null;
+                this.disarm();
+                break;
+            case 'SessionEnd':
+                // Disarm, but do NOT latch `stopped`: Claude Code fires SessionEnd on
+                // /clear too (paired with a SessionStart), and the bridge session
+                // lives on. A permanent latch here would disable missed-Stop recovery
+                // for the rest of the session after the first /clear. Permanent stop
+                // is the bridge shutdown path (core.onShutdown → stop()).
+                this.turnOpenedAt = null;
+                this.disarm();
+                break;
+            default:
+                break;
+        }
+    }
+    stop() {
+        this.stopped = true;
+        this.turnOpenedAt = null;
+        this.disarm();
+    }
+    arm() {
+        if (this.timer)
+            return;
+        this.timer = setInterval(() => this.check(), this.pollMs);
+        // Never hold the process open for the watchdog alone.
+        this.timer.unref?.();
+    }
+    disarm() {
+        if (this.timer) {
+            clearInterval(this.timer);
+            this.timer = null;
+        }
+    }
+    check() {
+        if (this.stopped || this.turnOpenedAt == null || !this.transcriptPath)
+            return;
+        if (this.now() - this.lastHookAt < this.quietMs)
+            return;
+        // Cheap gate: nothing appended since the last probe means the verdict
+        // cannot have changed (a genuinely-awaiting prompt writes nothing).
+        const mtime = this.mtimeMs(this.transcriptPath);
+        if (mtime != null && mtime === this.lastProbedMtimeMs)
+            return;
+        if (mtime != null)
+            this.lastProbedMtimeMs = mtime;
+        const probe = this.probe(this.transcriptPath);
+        if (!probe)
+            return;
+        if (probe.role !== 'assistant' || probe.stopReason !== 'end_turn')
+            return;
+        if (probe.timestampMs == null)
+            return;
+        if (probe.timestampMs < this.turnOpenedAt - TURN_OPEN_SLACK_MS)
+            return;
+        debug('watchdog', `missed Stop recovered from transcript (end_turn @ ${probe.timestampMs})`);
+        const transcriptPath = this.transcriptPath;
+        this.turnOpenedAt = null;
+        this.disarm();
+        this.onMissedStop({ transcript_path: transcriptPath });
+    }
+}
+function defaultMtimeMs(transcriptPath) {
+    try {
+        return statSync(transcriptPath).mtimeMs;
+    }
+    catch {
+        return null;
+    }
+}
+//# sourceMappingURL=claude-turn-watchdog.js.map

package/dist/claude-turn-watchdog.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"claude-turn-watchdog.js","sourceRoot":"","sources":["../src/claude-turn-watchdog.ts"],"names":[],"mappings":"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"}

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAwB,MAAM,WAAW,CAAC;AAyP1D,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAM,CAAC;AAOtF;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAElE;AA+BD,gFAAgF;AAChF,QAAA,MAAM,cAAc,EAAE,MAAM,CAAC,aAAa,GAAG,WAAW,GAAG,UAAU,EAAE,MAAM,CAI5E,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,EAAE,CAsBjE;AAKD;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,EAAE,CAyBV;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,OAAO,cAAc,EACtC,OAAO,EAAE,MAAM,EACf,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,CAIR;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,OAAO,cAAc,EACtC,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,OAAO,EACvB,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,CAER;AAID,QAAA,MAAM,OAAO,SAAgB,CAAC;AAs2E9B,wBAAsB,MAAM,CAAC,IAAI,GAAE,MAAM,EAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAMzE;AAED,OAAO,EAAE,OAAO,EAAE,CAAC"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAwB,MAAM,WAAW,CAAC;AAsQ1D,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAM,CAAC;AAOtF;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAElE;AA+BD,gFAAgF;AAChF,QAAA,MAAM,cAAc,EAAE,MAAM,CAAC,aAAa,GAAG,WAAW,GAAG,UAAU,EAAE,MAAM,CAI5E,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,EAAE,CAsBjE;AAKD;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,EAAE,CAyBV;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,OAAO,cAAc,EACtC,OAAO,EAAE,MAAM,EACf,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,CAIR;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,OAAO,cAAc,EACtC,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,OAAO,EACvB,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,CAER;AAID,QAAA,MAAM,OAAO,SAAgB,CAAC;AA02E9B,wBAAsB,MAAM,CAAC,IAAI,GAAE,MAAM,EAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAMzE;AAED,OAAO,EAAE,OAAO,EAAE,CAAC"}

package/dist/cli.js

@@ -28,6 +28,19 @@ function warnIfDaemonHostIgnored(opts) {
 function log(msg) {
     process.stderr.write(msg + '\n');
 }
+/** `daemon install` is the canonical observation setup entry point. Keep
+ * Claude alongside the Codex/OpenCode installers below so normal `claude`
+ * sessions never depend on having launched `agentdeck claude` first. */
+async function refreshClaudeHooks() {
+    try {
+        const { installHooks } = await import('@agentdeck/hooks');
+        installHooks();
+        log('Claude lifecycle hooks installed/refreshed in ~/.claude/settings.json');
+    }
+    catch (err) {
+        log(`Claude hooks unavailable: ${String(err)}`);
+    }
+}
 /**
  * Parse a `--weight <n>` value into an integer sort override. Rejects
  * non-integers so a typo (`--weight foo`) fails loudly instead of silently
@@ -401,7 +414,7 @@ program
     .option('--local', 'Disable all device modules (WS only)')
     .option('--no-adb', 'Disable ADB reverse setup')
     .option('--no-postit', 'Disable terminal tab title updates')
-    .option('--no-codex-hooks', 'Skip ~/.codex/config.toml hook install')
+    .option('--no-codex-hooks', 'Skip ~/.codex/config.toml hook install (terminal UI only; lifecycle monitoring is unavailable)')
     .option('--remote-daemon', 'Opt in to attaching this session to a daemon on another machine (gates --daemon-host and mDNS discovery)')
     .option('--daemon-host <host>', 'Explicit remote daemon endpoint (host or host:port); requires --remote-daemon')
     .option('--daemon-token <token>', 'Pairing token of the remote hub (~/.agentdeck/auth-token there); or set AGENTDECK_DAEMON_TOKEN')
@@ -427,11 +440,11 @@ program
         }
         catch (err) {
             log(`Codex hooks unavailable: ${String(err)}`);
-            // PTY parser fallback still works without lifecycle hooks.
+            log('Codex lifecycle monitoring is unavailable; the managed terminal still works.');
         }
     }
     else {
-        log('Codex hooks skipped: --no-codex-hooks');
+        log('Codex hooks skipped: --no-codex-hooks (terminal UI only; no lifecycle timeline)');
     }
     const { startSession } = await import('./index.js');
     await startSession({
@@ -444,6 +457,7 @@ program
         daemonHost: opts.daemonHost,
         daemonToken: opts.daemonToken,
         weight: opts.weight,
+        codexHooksExpected: opts.codexHooks !== false,
         modules: opts.local ? { mdns: false, adb: false, serial: false, pixoo: false, timebox: false } : {
             mdns: false, // daemon-only
             adb: opts.adb !== false ? 'auto' : false,
@@ -805,6 +819,7 @@ daemon
         catch {
             log('Task registered; immediate start failed — it will start on next logon.');
         }
+        await refreshClaudeHooks();
         // Install Codex lifecycle hooks for parity with the macOS install path.
         try {
             const { installCodexHooksIfNeeded } = await import('@agentdeck/hooks');
@@ -863,6 +878,7 @@ daemon
                 process.exit(1);
             }
         }
+        await refreshClaudeHooks();
         // Install Codex + OpenCode hooks for parity with the macOS/Windows paths.
         try {
             const { installCodexHooksIfNeeded } = await import('@agentdeck/hooks');
@@ -903,6 +919,7 @@ daemon
     catch { }
     execSync(`launchctl load "${PLIST_PATH}"`);
     log('LaunchAgent loaded. Daemon will auto-start on login.');
+    await refreshClaudeHooks();
     // Install Codex lifecycle hooks parallel to the LaunchAgent install
     // so the daemon hub gets codex_* events as soon as Codex CLI runs.
     try {