@jhizzard/termdeck 0.12.0 → 0.14.0

package/packages/server/src/session.js

@@ -15,6 +15,8 @@ const os = require('os');
 const path = require('path');
 const { resolveTheme } = require('./theme-resolver');
 const flashbackDiag = require('./flashback-diag');
+const geminiAdapter = require('./agent-adapters/gemini');
+const { detectAdapter, getAdapterForSessionType } = require('./agent-adapters');
 
 // Strip ANSI escape codes for pattern matching
 function stripAnsi(str) {
@@ -25,18 +27,33 @@ function stripAnsi(str) {
     .replace(/\x1b[>=<]/g, '');                      // Keypad/cursor modes
 }
 
-// Pattern matchers for detecting terminal type and status
+// Pattern matchers for detecting terminal type and status.
+//
+// Sprint 45 T4 removed the Sprint 44 T3 Claude shim (`PATTERNS.claudeCode.*`
+// and `PATTERNS.errorLineStart`). Claude-specific regexes now live exclusively
+// at ./agent-adapters/claude.js — read via `claudeAdapter.patterns.*`. The
+// `_detectErrors` and `_updateStatus` paths route through `getAdapterForSessionType`
+// for any registered adapter.
+//
+// Sprint 45 T2 retains `PATTERNS.geminiCli` as a shim into the Gemini adapter
+// for the one-release deprecation horizon — same pattern Sprint 44 T3 used.
+// What stays in this file:
+//   • geminiCli       — Sprint 45 T2 shim into ./agent-adapters/gemini.js
+//   • pythonServer    — server SUBTYPE detection (no adapter; status-badge only)
+//   • shell           — default fallback (no adapter)
+//   • error           — cross-agent prose-shape primary error fallback (used
+//                       by `_detectErrors` when the active adapter has no
+//                       `patterns.error`, and exported for tests)
+//   • shellError      — cross-agent Unix shell-error shapes (always tried as
+//                       the secondary fallback in `_detectErrors`)
 const PATTERNS = {
-  claudeCode: {
-    prompt: /^[>❯]\s/m,
-    thinking: /\b(thinking|Thinking)\b/,
-    editing: /^(Edit|Create|Update|Delete)\s/m,
-    tool: /^⏺\s/m,
-    idle: /^>\s*$/m
-  },
+  // Sprint 45 T2: geminiCli patterns are owned by the Gemini adapter at
+  // ./agent-adapters/gemini.js. Shim preserves the legacy
+  // `PATTERNS.geminiCli.{prompt,thinking}` shape — same regex objects, so
+  // any external reference equality holds.
   geminiCli: {
-    prompt: /^gemini>\s/m,
-    thinking: /\b(Generating|Working)\b/,
+    prompt: geminiAdapter.patterns.prompt,
+    thinking: geminiAdapter.patterns.thinking,
   },
   pythonServer: {
     uvicorn: /Uvicorn running on/,
@@ -80,13 +97,12 @@ const PATTERNS = {
   // child-process error reporting fire without depending on the line ALSO
   // containing the `No such file or directory` prose phrase.
   error: /(?:^|\n)\s*(?:Error:\s+\S|error:\s+\S|ERROR:\s+\S|Traceback \(most recent call last\):|npm ERR!|error\[E\d+\]:|Uncaught Exception|Fatal:|ENOENT:\s+\S|EACCES:\s+\S|ECONNREFUSED:\s+\S)/m,
-  // Stricter line-anchored variant for Claude Code, whose tool output (grep
-  // results, test logs, file contents) routinely mentions "Error" mid-line
-  // without representing an actual failure of the agent itself.
-  // Sprint 40 T2: added mixed-case `Fatal` (mirrors `fatal` / `FATAL`) and
-  // the `npm ERR!` shape (special-cased outside the alternation because
-  // `!` is not a word character so `\b` after `npm ERR!` doesn't match).
-  errorLineStart: /^\s*(?:(?:error|Error|ERROR|exception|Exception|Traceback|fatal|Fatal|FATAL|segmentation fault|panic|EACCES|ECONNREFUSED|ENOENT|command not found|undefined reference|cannot find module|failed with exit code|No such file or directory|Permission denied)\b|npm ERR!)/m,
+  // Sprint 45 T4: the Claude-specific line-anchored variant
+  // (formerly `PATTERNS.errorLineStart`) is owned by the Claude adapter at
+  // ./agent-adapters/claude.js — read via `claudeAdapter.patterns.error`.
+  // _detectErrors below routes through `getAdapterForSessionType` for
+  // claude-code sessions and falls through to PATTERNS.error / shellError
+  // for non-adapter sessions.
   // Sprint 33: PATTERNS.error misses the most common Unix shell errors —
   // `cat: /foo: No such file or directory`, `bash: foo: command not found`,
   // `rm: cannot remove ...: Permission denied`. These have a colon-prefix
@@ -241,11 +257,17 @@ class Session {
   }
 
   _detectType(data) {
-    if (PATTERNS.claudeCode.prompt.test(data) || /claude/i.test(this.meta.command)) {
-      this.meta.type = 'claude-code';
-    } else if (PATTERNS.geminiCli.prompt.test(data) || /gemini/i.test(this.meta.command)) {
-      this.meta.type = 'gemini';
-    } else if (
+    // Sprint 44 T3 + Sprint 45: registry-aware detection. detectAdapter()
+    // iterates AGENT_ADAPTERS in declaration order and returns the first
+    // hit by prompt regex OR command-string match. Claude / Codex /
+    // Gemini / Grok all live in the registry now; only python-server
+    // (a non-CLI-agent type) stays here as in-file fall-through.
+    const adapter = detectAdapter(data, this.meta.command);
+    if (adapter) {
+      this.meta.type = adapter.sessionType;
+      return;
+    }
+    if (
       PATTERNS.pythonServer.uvicorn.test(data) ||
       PATTERNS.pythonServer.flask.test(data) ||
       PATTERNS.pythonServer.django.test(data) ||
@@ -259,34 +281,20 @@ class Session {
     const p = PATTERNS;
     const oldStatus = this.meta.status;
 
-    switch (this.meta.type) {
-      case 'claude-code':
-        if (p.claudeCode.thinking.test(data)) {
-          this.meta.status = 'thinking';
-          this.meta.statusDetail = 'Claude is reasoning...';
-        } else if (p.claudeCode.editing.test(data)) {
-          this.meta.status = 'editing';
-          const match = data.match(/^(Edit|Create|Update|Delete)\s+(.+)$/m);
-          this.meta.statusDetail = match ? `${match[1]} ${match[2]}` : 'Editing files';
-        } else if (p.claudeCode.tool.test(data)) {
-          this.meta.status = 'active';
-          this.meta.statusDetail = 'Using tools';
-        } else if (p.claudeCode.idle.test(data)) {
-          this.meta.status = 'idle';
-          this.meta.statusDetail = 'Waiting for input';
-        }
-        break;
-
-      case 'gemini':
-        if (p.geminiCli.thinking.test(data)) {
-          this.meta.status = 'thinking';
-          this.meta.statusDetail = 'Gemini is generating...';
-        } else if (p.geminiCli.prompt.test(data)) {
-          this.meta.status = 'idle';
-          this.meta.statusDetail = 'Waiting for input';
-        }
-        break;
-
+    // Sprint 44 T3 + Sprint 45: per-agent status detection lives in each
+    // adapter's `statusFor(data)` method. Returns { status, statusDetail }
+    // on a match, null on no-change — preserves the original switch's
+    // "leave status untouched if no pattern fires" semantics. Only
+    // non-CLI-agent types (python-server + default shell) stay in-file.
+    const adapter = getAdapterForSessionType(this.meta.type);
+    if (adapter && typeof adapter.statusFor === 'function') {
+      const result = adapter.statusFor(data);
+      if (result && result.status) {
+        this.meta.status = result.status;
+        this.meta.statusDetail = result.statusDetail || '';
+      }
+    } else {
+      switch (this.meta.type) {
       case 'python-server':
         if (p.pythonServer.request.test(data)) {
           this.meta.status = 'active';
@@ -309,6 +317,7 @@ class Session {
         } else {
           this.meta.status = 'active';
         }
+      }
     }
 
     // Debounce status change events (3s) to avoid flooding RAG with active↔idle flaps
@@ -387,10 +396,20 @@ class Session {
     // Claude Code's tool output frequently contains "error"/"Error" mid-line
     // (grep matches, test results, log dumps). Use a line-anchored pattern
     // for that session type so we don't flag content as failure.
-    const primaryPattern = this.meta.type === 'claude-code'
-      ? PATTERNS.errorLineStart
+    //
+    // Sprint 44 T3 / Sprint 45 T4: per-agent primary error pattern is read
+    // off the adapter (`patterns.error` + `patternNames.error`). Falls back
+    // to the generic prose-shape PATTERNS.error when no adapter has claimed
+    // the session type. (Sprint 44 retained a `PATTERNS.errorLineStart` shim
+    // that pointed at the Claude adapter's regex; Sprint 45 T4 removed the
+    // shim — read `claudeAdapter.patterns.error` directly when needed.)
+    const adapter = getAdapterForSessionType(this.meta.type);
+    const primaryPattern = adapter && adapter.patterns && adapter.patterns.error
+      ? adapter.patterns.error
       : PATTERNS.error;
-    const primaryName = this.meta.type === 'claude-code' ? 'errorLineStart' : 'error';
+    const primaryName = adapter && adapter.patternNames && adapter.patternNames.error
+      ? adapter.patternNames.error
+      : 'error';
     // Sprint 33 fix: the structured patterns above miss `cat: /foo: No such
     // file or directory` and friends — the most common Unix shell error
     // shapes Josh hits day-to-day. Fall through to PATTERNS.shellError so