@agentdeck/bridge 1.0.18 → 1.0.19

package/dist/codex-rate-limits.js

@@ -67,10 +67,17 @@ function candidateRolloutFiles(root, maxDays = 3, maxFiles = 6) {
     files.sort((a, b) => b.mtime - a.mtime);
     return files.slice(0, maxFiles);
 }
-/** Scan candidates newest-first and return the first that yields a usable
- *  rate-limits snapshot. Falls through past a newer file that carries no
- *  `rate_limits` line (e.g. a just-started session) to an older active one. */
+/** Scan every candidate and return the usable rate-limits snapshot with the
+ *  newest CAPTURE timestamp.
+ *
+ * File mtime only identifies which rollouts are active enough to inspect. It
+ * cannot decide which ACCOUNT snapshot is newest when several Codex sessions
+ * append concurrently: a reasoning/tool line can make one file newest while
+ * its last rate_limits line is older than a snapshot in another file. Choosing
+ * the first usable file made usage move backwards or appear frozen. */
 function parseFirstUsable(candidates) {
+    let newest = null;
+    let newestCapturedAtMs = -Infinity;
     for (const { full, mtime } of candidates) {
         const tail = readTail(full);
         const parsed = tail ? parseCodexRateLimitsFromText(tail) : null;
@@ -81,10 +88,14 @@ function parseFirstUsable(candidates) {
             // reading stays put — that would under-report the age of exactly the frozen
             // snapshot this anchor exists to expose. mtime is the fallback.
             parsed.capturedAt = parsed.capturedAt ?? new Date(mtime).toISOString();
-            return parsed;
+            const capturedAtMs = new Date(parsed.capturedAt).getTime();
+            if (!newest || capturedAtMs > newestCapturedAtMs) {
+                newest = parsed;
+                newestCapturedAtMs = capturedAtMs;
+            }
         }
     }
-    return null;
+    return newest;
 }
 /**
  * Read the newest usable Codex rate-limits snapshot from a sessions tree.
@@ -115,7 +126,9 @@ function readTail(file, maxBytes = 262144) {
             try {
                 fs.closeSync(fd);
             }
-            catch { /* ignore */ }
+            catch {
+                /* ignore */
+            }
     }
 }
 function toCredits(raw) {
@@ -140,9 +153,7 @@ function toWindow(raw) {
     if (!raw || typeof raw.used_percent !== 'number' || typeof raw.window_minutes !== 'number') {
         return undefined;
     }
-    const resetsAt = typeof raw.resets_at === 'number' && raw.resets_at > 0
-        ? new Date(raw.resets_at * 1000).toISOString()
-        : undefined;
+    const resetsAt = typeof raw.resets_at === 'number' && raw.resets_at > 0 ? new Date(raw.resets_at * 1000).toISOString() : undefined;
     return {
         usedPercent: Math.min(100, Math.max(0, raw.used_percent)),
         windowMinutes: raw.window_minutes,
@@ -189,16 +200,15 @@ export function parseCodexRateLimitsFromText(text) {
     }
     return null;
 }
-// Cache keyed on the newest candidate rollout's path + mtime so repeated usage
-// polls don't re-scan unchanged files. Keying on the newest candidate (not the
-// one that yielded the snapshot) means any fresh write to the active session
-// invalidates the cache and re-scans.
+// Cache keyed on EVERY candidate rollout's path + mtime. Multiple Codex
+// sessions append concurrently, and the freshest rate_limits snapshot may live
+// outside candidates[0]. Keying on only that first file let a newer snapshot in
+// another candidate remain invisible until the first file changed again.
 let cacheKey = '';
 let cacheValue = null;
-export function readCodexRateLimits() {
-    const candidates = candidateRolloutFiles(defaultSessionsRoot());
-    const newest = candidates[0];
-    const key = newest ? `${newest.full}:${newest.mtime}` : '';
+export function readCodexRateLimits(root = defaultSessionsRoot()) {
+    const candidates = candidateRolloutFiles(root);
+    const key = candidates.map(({ full, mtime }) => `${full}:${mtime}`).join('|');
     if (key && key === cacheKey)
         return cacheValue;
     const parsed = parseFirstUsable(candidates);

package/dist/codex-rate-limits.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-rate-limits.js","sourceRoot":"","sources":["../src/codex-rate-limits.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codex-rate-limits.js","sourceRoot":"","sources":["../src/codex-rate-limits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AA6CxB,MAAM,mBAAmB,GAAG,GAAW,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;AAOxF;oDACoD;AACpD,SAAS,aAAa,CAAC,GAAW;IAChC,IAAI,CAAC;QACH,OAAO,EAAE;aACN,WAAW,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;aACzC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;aAC9B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;aAClB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED;;;2EAG2E;AAC3E,SAAS,aAAa,CAAC,IAAY,EAAE,OAAe;IAClD,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,KAAK,MAAM,IAAI,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACtC,KAAK,MAAM,KAAK,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC3C,KAAK,MAAM,GAAG,IAAI,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC1C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;gBACnC,IAAI,GAAG,CAAC,MAAM,IAAI,OAAO;oBAAE,OAAO,GAAG,CAAC;YACxC,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;4CAI4C;AAC5C,SAAS,qBAAqB,CAAC,IAAY,EAAE,OAAO,GAAG,CAAC,EAAE,QAAQ,GAAG,CAAC;IACpE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IACpC,MAAM,KAAK,GAAuB,EAAE,CAAC;IACrC,KAAK,MAAM,MAAM,IAAI,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;QAClD,IAAI,OAAiB,CAAC;QACtB,IAAI,CAAC;YACH,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAAE,SAAS;YACjE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAClC,IAAI,CAAC;gBACH,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YACzD,CAAC;YAAC,MAAM,CAAC;gBACP,6BAA6B;YAC/B,CAAC;QACH,CAAC;IACH,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IACxC,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;AAClC,CAAC;AAED;;;;;;;uEAOuE;AACvE,SAAS,gBAAgB,CAAC,UAA8B;IACtD,IAAI,MAAM,GAA2B,IAAI,CAAC;IAC1C,IAAI,kBAAkB,GAAG,CAAC,QAAQ,CAAC;IACnC,KAAK,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,UAAU,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAChE,IAAI,MAAM,EAAE,CAAC;YACX,2EAA2E;YAC3E,wEAAwE;YACxE,2EAA2E;YAC3E,4EAA4E;YAC5E,gEAAgE;YAChE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YACvE,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC;YAC3D,IAAI,CAAC,MAAM,IAAI,YAAY,GAAG,kBAAkB,EAAE,CAAC;gBACjD,MAAM,GAAG,MAAM,CAAC;gBAChB,kBAAkB,GAAG,YAAY,CAAC;YACpC,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAe,mBAAmB,EAAE;IACtE,OAAO,gBAAgB,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC;AACvD,CAAC;AAED;kFACkF;AAClF,SAAS,QAAQ,CAAC,IAAY,EAAE,QAAQ,GAAG,MAAM;IAC/C,IAAI,EAAE,GAAkB,IAAI,CAAC;IAC7B,IAAI,CAAC;QACH,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC5B,MAAM,IAAI,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,GAAG,QAAQ,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,IAAI,GAAG,KAAK,CAAC;QACzB,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9B,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;QACpC,OAAO,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;YAAS,CAAC;QACT,IAAI,EAAE,KAAK,IAAI;YACb,IAAI,CAAC;gBACH,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YACnB,CAAC;YAAC,MAAM,CAAC;gBACP,YAAY;YACd,CAAC;IACL,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,GAAgB;IACjC,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,GAAG,CAAC,WAAW,KAAK,SAAS,IAAI,OAAO,GAAG,CAAC,SAAS,KAAK,SAAS,IAAI,GAAG,CAAC,OAAO,IAAI,IAAI,CAAC,EAAE,CAAC;QAChH,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO;QACL,UAAU,EAAE,GAAG,CAAC,WAAW,KAAK,IAAI;QACpC,SAAS,EAAE,GAAG,CAAC,SAAS,KAAK,IAAI;QACjC,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;KAC/D,CAAC;AACJ,CAAC;AAED;sEACsE;AACtE,SAAS,qBAAqB,CAAC,EAAW;IACxC,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,CAAC,EAAE;QAAE,OAAO,SAAS,CAAC;IACpD,MAAM,EAAE,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAClC,OAAO,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;AAC5D,CAAC;AAED,SAAS,QAAQ,CAAC,GAAe;IAC/B,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,CAAC,YAAY,KAAK,QAAQ,IAAI,OAAO,GAAG,CAAC,cAAc,KAAK,QAAQ,EAAE,CAAC;QAC3F,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,QAAQ,GACZ,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ,IAAI,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACpH,OAAO;QACL,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;QACzD,aAAa,EAAE,GAAG,CAAC,cAAc;QACjC,QAAQ;KACT,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,4BAA4B,CAAC,IAAY;IACvD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7B,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;YAAE,SAAS;QACrD,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAG1B,CAAC;YACF,MAAM,EAAE,GAAG,GAAG,EAAE,OAAO,EAAE,WAAW,CAAC;YACrC,IAAI,CAAC,EAAE;gBAAE,SAAS;YAClB,MAAM,OAAO,GAAG,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;YACrC,MAAM,SAAS,GAAG,QAAQ,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;YACzC,MAAM,OAAO,GAAG,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;YACtC,MAAM,OAAO,GAAG,OAAO,EAAE,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1E,uEAAuE;YACvE,yEAAyE;YACzE,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO;gBAAE,SAAS;YAC7D,OAAO;gBACL,OAAO;gBACP,SAAS;gBACT,QAAQ,EAAE,OAAO,EAAE,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;gBACrE,OAAO;gBACP,OAAO;gBACP,UAAU,EAAE,qBAAqB,CAAC,GAAG,CAAC,SAAS,CAAC;aACjD,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,uEAAuE;QACzE,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,wEAAwE;AACxE,+EAA+E;AAC/E,gFAAgF;AAChF,yEAAyE;AACzE,IAAI,QAAQ,GAAG,EAAE,CAAC;AAClB,IAAI,UAAU,GAA2B,IAAI,CAAC;AAE9C,MAAM,UAAU,mBAAmB,CAAC,OAAe,mBAAmB,EAAE;IACtE,MAAM,UAAU,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9E,IAAI,GAAG,IAAI,GAAG,KAAK,QAAQ;QAAE,OAAO,UAAU,CAAC;IAE/C,MAAM,MAAM,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAC5C,QAAQ,GAAG,GAAG,CAAC;IACf,UAAU,GAAG,MAAM,CAAC;IACpB,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/daemon.js

@@ -17,7 +17,7 @@ const program = new Command();
 program
     .name('agentdeck')
     .description('AgentDeck daemon (legacy entry point — use `agentdeck daemon` instead)')
-    .version('1.0.18');
+    .version('1.0.19');
 program
     .command('start', { isDefault: true })
     .description('Start monitoring daemon')

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA4DH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAUxD,OAAO,EAOL,KAAK,SAAS,EAQf,MAAM,YAAY,CAAC;AAwDpB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,wEAAwE;IACxE,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,+EAA+E;IAC/E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;kFAC8E;IAC9E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;0EACsE;IACtE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAID,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAisCtE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA2DH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAUxD,OAAO,EAOL,KAAK,SAAS,EAQf,MAAM,YAAY,CAAC;AAwDpB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,wEAAwE;IACxE,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,+EAA+E;IAC/E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;kFAC8E;IAC9E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;0EACsE;IACtE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAID,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA8nCtE"}

package/dist/index.js

@@ -14,7 +14,6 @@ import { readLastTurn as readClaudeTranscriptLastTurn } from './apme/claude-tran
 import { claudeHookToSpans } from './apme/adapters/claude-hook.js';
 import { codexHookToSpans } from './apme/adapters/codex-hook.js';
 import { CodexTurnManager } from './apme/adapters/codex-turn-manager.js';
-import { claudePtyParserEventToSpans, claudePtyResponseToSpan } from './apme/adapters/claude-pty.js';
 import { timelineEntryToSpans } from './apme/adapters/timeline.js';
 import { classifyAndEnqueueTurn } from './apme/classify-turn.js';
 import { VoiceManager } from './voice.js';
@@ -106,6 +105,13 @@ export async function startSession(opts) {
             process.exit(1);
         for (const w of deps.warnings)
             log(`WARNING: ${w}`);
+        if (agentType === 'codex-cli' && deps.agentVersion) {
+            const { satisfiesRange } = await import('./version-check.js');
+            if (!satisfiesRange(deps.agentVersion, '>=0.141.0')) {
+                log(`WARNING: Codex ${deps.agentVersion} predates the lifecycle-hook baseline (>=0.141.0). ` +
+                    'The terminal can start, but AgentDeck lifecycle monitoring requires a newer Codex CLI.');
+            }
+        }
         // Version compatibility check (Claude Code only — uses npm registry + compatibleClaudeCode range)
         if (agentType === 'claude-code' && !opts.noUpdateCheck) {
             const { checkVersionCompatibility } = await import('./version-check.js');
@@ -443,20 +449,13 @@ export async function startSession(opts) {
     });
     // Claude Code hook events → timeline entries
     if (agentType === 'claude-code') {
-        wireClaudeCodeTimeline(adapter, core, journal, ptyRingBuffer);
+        wireClaudeCodeTimeline(adapter, core);
     }
     // APME wiring for non-Claude-Code agents (OpenCode, Codex, OpenClaw)
     if (apme && agentType !== 'claude-code' && agentType !== 'monitor') {
-        wireAgentApme(adapter, agentType, apme, core, ptyRingBuffer);
+        wireAgentApme(adapter, agentType, apme, core);
     }
     // ===== Wire adapter events → StateMachine + journal =====
-    // APME: PTY response fallback — captures response from terminal output when
-    // the Stop hook doesn't fire (unreliable in Claude Code v2.1+).
-    // Three capture paths handle the hook/PTY race condition:
-    //   Path A: idle fires, turn exists → apply directly
-    //   Path B: idle fires before hook (fast responses) → buffer, apply on hook arrival
-    //   Path C: UserPromptSubmit closes prev turn → apply PTY text to closed turn
-    let pendingPtyResponse = null;
     adapter.on('event', (evt) => {
         switch (evt.source) {
             case 'hook':
@@ -479,28 +478,6 @@ export async function startSession(opts) {
                         apme.collector.ingestSpan(core.sessionId, span);
                     }
                 }
-                if (evt.event === 'UserPromptSubmit' && apme) {
-                    // Path B: apply buffered response to the NEW turn (idle fired before hook)
-                    if (pendingPtyResponse) {
-                        debug('APME', `hook:UPS Path B: applying pending (${pendingPtyResponse.length} chars)`);
-                        const ctx = makeApmeAdapterCtx(apme, core.sessionId, agentType);
-                        const span = claudePtyResponseToSpan(ctx, pendingPtyResponse);
-                        if (span)
-                            apme.collector.ingestSpan(core.sessionId, span);
-                        pendingPtyResponse = null;
-                    }
-                    // Path C: prev turn was just closed by ingestHook — apply pending response
-                    if (pendingPtyResponse) {
-                        debug('APME', `hook:UPS Path C: applying pending to closed turn (${pendingPtyResponse.length} chars)`);
-                        const ctx = makeApmeAdapterCtx(apme, core.sessionId, agentType);
-                        const span = claudePtyResponseToSpan(ctx, pendingPtyResponse, { fallbackToLastClosed: true });
-                        if (span)
-                            apme.collector.ingestSpan(core.sessionId, span);
-                        pendingPtyResponse = null;
-                    }
-                }
-                if (evt.event === 'Stop')
-                    pendingPtyResponse = null; // Stop has cleaner response
                 // APME-off fallback: task rows from boundary hooks alone.
                 if (fallbackTasks)
                     fallbackTasks.ingestHook(core.sessionId, evt.event, evt.data ?? {});
@@ -511,67 +488,14 @@ export async function startSession(opts) {
                 core.stateMachine.handleHookEvent(evt.event, evt.data);
                 break;
             case 'parser':
-                journal.write('parser_emit', 'pty', { event: evt.event, ...evt.data });
+                // Structured adapters (OpenCode SSE / OpenClaw Gateway) normalize
+                // their native event streams into the legacy state vocabulary.
+                journal.write('adapter_signal', agentType, { event: evt.event, ...evt.data });
                 core.stateMachine.handleParserEvent(evt.event, evt.data);
-                // APME ingestion fallback: PTY parser sees tool use + state changes
-                // even when Claude Code hooks are flaky (memory: feedback_apme_stop_hook).
-                if (apme && evt.event) {
-                    const ctx = makeApmeAdapterCtx(apme, core.sessionId, agentType);
-                    for (const span of claudePtyParserEventToSpans(ctx, evt.event, evt.data ?? {})) {
-                        apme.collector.ingestSpan(core.sessionId, span);
-                    }
-                }
-                // APME: Path A — spinner_stop fires when Claude finishes responding.
-                // Delay 500ms to let response render in PTY, then extract text after ⏺ marker.
-                if (apme && evt.event === 'spinner_stop') {
-                    const sid = core.sessionId;
-                    setTimeout(async () => {
-                        if (!apme)
-                            return;
-                        const tail = ptyRingBuffer.getTail(5000);
-                        // Claude's response starts with ⏺ — extract content after last ⏺ marker.
-                        // Take only meaningful lines (stop at spinner chars ✢✻⏸, prompt ❯, or separator ──).
-                        const marker = tail.lastIndexOf('⏺');
-                        let response = '';
-                        if (marker >= 0) {
-                            const afterMarker = tail.slice(marker + 1).trim();
-                            const lines = afterMarker.split('\n');
-                            const clean = [];
-                            for (const line of lines) {
-                                const trimmed = line.trim();
-                                if (!trimmed)
-                                    continue;
-                                // Stop at UI artifacts: spinner chars (✢✳✶✻✽), plan mode (⏸), prompt (❯), separator (─)
-                                if (/^[✢✳✶✻✽⏸⏵❯─>]/.test(trimmed))
-                                    break;
-                                if (/planmode|plan\s*mode|shift\+tab|accept\s*edits/i.test(trimmed))
-                                    break;
-                                // Status text: "Whirring…", "Finagling…", token count, shortcuts hint
-                                if (/^\S+…(\s|$)/.test(trimmed) && /tokens|shortcuts|\d+[ms]\s/i.test(trimmed))
-                                    break;
-                                if (/\?\s*for\s*shortcuts/.test(trimmed))
-                                    break;
-                                clean.push(trimmed);
-                            }
-                            response = clean.join('\n').trim();
-                        }
-                        debug('APME', `spinner_stop+500ms: tailLen=${tail.length} marker=${marker} respLen=${response.length}`);
-                        if (response.length > 2) {
-                            const turnId = apme.collector.getActiveTurnId(sid);
-                            if (turnId) {
-                                const ctx = makeApmeAdapterCtx(apme, sid, agentType);
-                                const span = claudePtyResponseToSpan(ctx, response);
-                                if (span)
-                                    apme.collector.ingestSpan(sid, span);
-                                pendingPtyResponse = null;
-                                await classifyAndEnqueueTurn(apme, sid);
-                            }
-                            else {
-                                pendingPtyResponse = response;
-                            }
-                        }
-                    }, 500);
-                }
+                break;
+            case 'terminal_ui':
+                journal.write('terminal_ui', 'pty', { event: evt.event, ...evt.data });
+                core.stateMachine.handleTerminalUiEvent(evt.event, evt.data);
                 break;
             case 'metadata':
                 switch (evt.event) {
@@ -587,11 +511,6 @@ export async function startSession(opts) {
                         const text = evt.data?.text;
                         if (text)
                             core.broadcast({ type: 'user_prompt', text });
-                        // APME: user_prompt is the PTY-detected prompt — use it to open a turn
-                        // and capture the prompt text (fallback for when hooks don't fire).
-                        if (apme && text) {
-                            apme.collector.ingestHook(core.sessionId, 'UserPromptSubmit', { message: { content: text } });
-                        }
                         break;
                     }
                     case 'model_catalog': {
@@ -1266,14 +1185,12 @@ export async function startSession(opts) {
 // ===== Non-Claude agent APME wiring =====
 // For OpenCode, Codex, OpenClaw: intercepts adapter timeline events to create
 // APME turns with prompts and responses. Claude Code uses hooks instead.
-function wireAgentApme(adapter, agentType, apme, core, ptyRingBuffer) {
+function wireAgentApme(adapter, agentType, apme, core) {
     const sid = core.sessionId;
-    // Codex turn boundaries (hook-primary, PTY-fallback) live in their own
-    // module. The class encapsulates the seven-state-variable PTY-only
-    // machine plus the hook-fresh shortcut so non-codex sessions allocate
-    // nothing here.
+    // Codex turn boundaries and rollout response capture live in their own
+    // hook-owned module so non-Codex sessions allocate nothing here.
     const codexManager = agentType === 'codex-cli'
-        ? new CodexTurnManager(core, apme, ptyRingBuffer, sid, agentType)
+        ? new CodexTurnManager(core, apme, sid, agentType)
         : null;
     adapter.on('event', (evt) => {
         if (evt.source === 'hook' && isSubagentOnlyHook(evt.event, evt.data ?? {})) {
@@ -1309,12 +1226,10 @@ function wireAgentApme(adapter, agentType, apme, core, ptyRingBuffer) {
                 void classifyAndEnqueueTurn(apme, sid);
             }
         }
-        // ── Codex: hook (primary) + PTY-parser fallback ──
+        // ── Codex: lifecycle hooks + notify turn-complete fallback ──
         if (codexManager) {
             if (evt.source === 'hook')
                 codexManager.onHookEvent(evt);
-            else if (evt.source === 'parser')
-                codexManager.onParserEvent(evt);
         }
     });
     if (codexManager) {
@@ -1338,14 +1253,12 @@ function isClaudeTaskNotificationPrompt(text) {
     return text.trim().toLowerCase().startsWith('<task-notification>');
 }
 // ===== Claude Code timeline wiring =====
-function wireClaudeCodeTimeline(adapter, core, journal, ptyRingBuffer) {
+function wireClaudeCodeTimeline(adapter, core) {
     let ccChatStart = null;
     let ccPendingChatStart = false;
     let ccPendingChatStartTimer = null;
     let ccLastPromptText = null;
-    let ccLastHookToolTs = 0; // Change 1: track last hook-based tool_request
-    let ccPendingCompletion = false; // Change 2: track pending chat_end for PTY fallback
-    let ccPendingCompletionTimer = null;
+    let ccPendingCompletion = false;
     const emitChatStart = (text) => {
         if (ccPendingChatStartTimer) {
             clearTimeout(ccPendingChatStartTimer);
@@ -1376,33 +1289,8 @@ function wireClaudeCodeTimeline(adapter, core, journal, ptyRingBuffer) {
             startedAt: ccChatStart ?? Date.now(),
         });
     };
-    /** Extract response text from PTY ringbuffer after ⏺ marker (same pattern as APME) */
-    const extractPtyResponse = () => {
-        const tail = ptyRingBuffer.getTail(5000);
-        const marker = tail.lastIndexOf('⏺');
-        if (marker < 0)
-            return '';
-        const afterMarker = tail.slice(marker + 1).trim();
-        const lines = afterMarker.split('\n');
-        const clean = [];
-        for (const line of lines) {
-            const trimmed = line.trim();
-            if (!trimmed)
-                continue;
-            if (/^[✢✳✶✻✽⏸⏵❯─>]/.test(trimmed))
-                break;
-            if (/planmode|plan\s*mode|shift\+tab|accept\s*edits/i.test(trimmed))
-                break;
-            if (/^\S+…(\s|$)/.test(trimmed) && /tokens|shortcuts|\d+[ms]\s/i.test(trimmed))
-                break;
-            if (/\?\s*for\s*shortcuts/.test(trimmed))
-                break;
-            clean.push(trimmed);
-        }
-        return clean.join('\n').trim();
-    };
     /**
-     * Emit a single Claude turn-close row (shared by Stop hook and PTY fallback):
+     * Emit a single Claude turn-close row from the authoritative Stop hook:
      * a `chat_response` when there is meaningful response text, otherwise a
      * `chat_end`. The two are mutually exclusive so a turn never produces both —
      * the paired dimmed `chat_end` used to fragment every turn into three rows on
@@ -1501,48 +1389,6 @@ function wireClaudeCodeTimeline(adapter, core, journal, ptyRingBuffer) {
             }
         }
     });
-    // Change 1: PTY tool_action → tool_exec timeline entry (fills gap when hooks don't fire)
-    adapter.on('event', (evt) => {
-        if (evt.source !== 'parser' || evt.event !== 'tool_action')
-            return;
-        const now = Date.now();
-        // Skip if hook already emitted tool_request within 2s (avoid duplicates)
-        if (now - ccLastHookToolTs < 2000)
-            return;
-        const toolName = evt.data?.toolName || 'tool';
-        const toolArgs = evt.data?.toolArgs || '';
-        const raw = toolArgs ? `${toolName} ${toolArgs}` : toolName;
-        core.bridgeTimeline.addEntry({
-            ts: now, type: 'tool_exec',
-            raw: raw.length > 500 ? raw.slice(0, 497) + '...' : raw,
-            agentType: 'claude-code',
-        });
-    });
-    // Change 2: PTY fallback chat_end from spinner_stop/idle (when Stop hook doesn't fire)
-    adapter.on('event', (evt) => {
-        if (evt.source !== 'parser')
-            return;
-        if ((evt.event === 'spinner_stop' || evt.event === 'idle') && ccPendingCompletion) {
-            // Wait 1.5s — Stop hook may still arrive
-            if (ccPendingCompletionTimer)
-                clearTimeout(ccPendingCompletionTimer);
-            ccPendingCompletionTimer = setTimeout(() => {
-                ccPendingCompletionTimer = null;
-                if (!ccPendingCompletion)
-                    return; // Stop hook already handled it
-                ccPendingCompletion = false;
-                if (ccPendingChatStart)
-                    emitChatStart('');
-                const now = Date.now();
-                const duration = ccChatStart ? Math.round((now - ccChatStart) / 1000) : null;
-                const toolSummary = core.usageTracker.getToolSummary();
-                // Extract response from PTY ringbuffer
-                const responseText = extractPtyResponse();
-                debug('timeline', `CC PTY fallback chat_end: respLen=${responseText.length} duration=${duration}`);
-                emitCompletion(responseText, duration, toolSummary);
-            }, 1500);
-        }
-    });
     adapter.on('event', (evt) => {
         if (evt.source !== 'hook')
             return;
@@ -1554,7 +1400,7 @@ function wireClaudeCodeTimeline(adapter, core, journal, ptyRingBuffer) {
                 ccChatStart = now;
                 core.usageTracker.resetToolCounts();
                 ccPendingChatStart = true;
-                ccPendingCompletion = true; // Change 2: arm PTY fallback
+                ccPendingCompletion = true;
                 // Claude Code v2.1+ sends { message: { content: "..." } }, not { prompt: "..." }
                 const msg = evt.data?.message;
                 const hookText = evt.data?.prompt
@@ -1569,7 +1415,6 @@ function wireClaudeCodeTimeline(adapter, core, journal, ptyRingBuffer) {
                 break;
             }
             case 'PreToolUse': {
-                ccLastHookToolTs = now; // Change 1: mark hook tool time for dedup
                 const toolName = evt.data?.tool_name || 'tool';
                 const formatted = formatToolInputForTimeline(toolName, evt.data?.tool_input);
                 core.bridgeTimeline.addEntry({
@@ -1586,18 +1431,10 @@ function wireClaudeCodeTimeline(adapter, core, journal, ptyRingBuffer) {
                 break;
             }
             case 'Stop': {
-                // Race guard: if ccPendingCompletion is already false, the PTY fallback
-                // timer fired first (Stop hook arrived >1.5s after spinner_stop) and
-                // already emitted chat_response/chat_end. Skipping here prevents the
-                // duplicate-line bug visible on the dashboard timeline.
                 const wasPending = ccPendingCompletion;
-                ccPendingCompletion = false; // Change 2: disarm PTY fallback — hook handled it
-                if (ccPendingCompletionTimer) {
-                    clearTimeout(ccPendingCompletionTimer);
-                    ccPendingCompletionTimer = null;
-                }
+                ccPendingCompletion = false;
                 if (!wasPending) {
-                    debug('timeline', 'CC Stop hook arrived after PTY fallback emit — skipping duplicate');
+                    debug('timeline', 'duplicate Claude Stop hook ignored');
                     break;
                 }
                 if (ccPendingChatStart)
@@ -1612,8 +1449,6 @@ function wireClaudeCodeTimeline(adapter, core, journal, ptyRingBuffer) {
                 //      payload points at it.
                 //   2. last_assistant_message — ~18% reliable field on the hook
                 //      payload; honoured when the transcript isn't reachable.
-                //   3. PTY ringbuffer — last-resort fallback already handled by
-                //      the existing spinner_stop pathway.
                 const transcriptPath = evt.data?.transcript_path || '';
                 let lastAssistantMsg = evt.data?.last_assistant_message || '';
                 if (transcriptPath) {