@phenx-inc/ctlsurf 0.4.0 → 0.5.1

package/out/main/index.js

@@ -6040,6 +6040,248 @@ function trimToLogLimit(str) {
   return `[truncated]
 ${str.slice(str.length - MAX_LOG_CHARS)}`;
 }
+function supportsTranscriptLogging(agentId) {
+  return agentId === "claude" || agentId === "codex";
+}
+const POLL_INTERVAL_MS = 1e3;
+const DISCOVERY_SLACK_MS = 1e4;
+const READ_CHUNK_BYTES = 64 * 1024;
+const MAX_ENTRY_CHARS = 2e4;
+class TranscriptTailer {
+  agentId;
+  cwd;
+  sink;
+  claudeProjectsDir;
+  codexSessionsDir;
+  files = /* @__PURE__ */ new Map();
+  pollTimer = null;
+  sinceMs = 0;
+  constructor(options) {
+    this.agentId = options.agentId;
+    this.cwd = stripTrailingSep(options.cwd);
+    this.sink = options.sink;
+    this.claudeProjectsDir = options.claudeProjectsDir || path.join(os.homedir(), ".claude", "projects");
+    this.codexSessionsDir = options.codexSessionsDir || path.join(os.homedir(), ".codex", "sessions");
+  }
+  start() {
+    if (this.pollTimer) return;
+    this.sinceMs = Date.now();
+    this.files.clear();
+    this.pollTimer = setInterval(() => this.poll(), POLL_INTERVAL_MS);
+    console.log(`[transcripts] Tailing ${this.agentId} transcripts for ${this.cwd}`);
+  }
+  stop() {
+    if (!this.pollTimer) return;
+    clearInterval(this.pollTimer);
+    this.pollTimer = null;
+    this.poll();
+    this.files.clear();
+    console.log("[transcripts] Stopped");
+  }
+  poll() {
+    try {
+      this.discover();
+      for (const [filePath, tail] of this.files) {
+        if (!tail.excluded) this.drainFile(filePath, tail);
+      }
+    } catch (err) {
+      console.error("[transcripts] Poll error:", err);
+    }
+  }
+  // ─── Discovery ──────────────────────────────────
+  /**
+   * Track every transcript file with recent activity, not just the first
+   * match: /clear (Claude) or /new (Codex) starts a new session file in the
+   * middle of one PTY run, and tailing all active candidates handles the
+   * switch without special cases. Old idle files never match (stale mtime).
+   */
+  discover() {
+    const dirs = this.agentId === "claude" ? [this.claudeProjectsDirForCwd()] : this.codexDateDirs();
+    for (const dir of dirs) {
+      let names;
+      try {
+        names = fs.readdirSync(dir);
+      } catch {
+        continue;
+      }
+      for (const name of names) {
+        if (!name.endsWith(".jsonl")) continue;
+        if (this.agentId === "codex" && !name.startsWith("rollout-")) continue;
+        const filePath = path.join(dir, name);
+        if (this.files.has(filePath)) continue;
+        try {
+          const stat = fs.statSync(filePath);
+          if (stat.mtimeMs >= this.sinceMs - DISCOVERY_SLACK_MS) {
+            this.files.set(filePath, { offset: 0, remainder: "", excluded: false });
+          }
+        } catch {
+        }
+      }
+    }
+  }
+  claudeProjectsDirForCwd() {
+    const slug = this.cwd.replace(/[^a-zA-Z0-9]/g, "-");
+    return path.join(this.claudeProjectsDir, slug);
+  }
+  codexDateDirs() {
+    const dirs = /* @__PURE__ */ new Set();
+    for (const ms of [this.sinceMs, Date.now()]) {
+      const d = new Date(ms);
+      const yyyy = String(d.getFullYear());
+      const mm = String(d.getMonth() + 1).padStart(2, "0");
+      const dd = String(d.getDate()).padStart(2, "0");
+      dirs.add(path.join(this.codexSessionsDir, yyyy, mm, dd));
+    }
+    return [...dirs];
+  }
+  // ─── Tailing ────────────────────────────────────
+  drainFile(filePath, tail) {
+    let size;
+    try {
+      size = fs.statSync(filePath).size;
+    } catch {
+      return;
+    }
+    if (size <= tail.offset) return;
+    let fd;
+    try {
+      fd = fs.openSync(filePath, "r");
+    } catch {
+      return;
+    }
+    try {
+      const buf = Buffer.alloc(READ_CHUNK_BYTES);
+      while (tail.offset < size && !tail.excluded) {
+        const bytesRead = fs.readSync(fd, buf, 0, READ_CHUNK_BYTES, tail.offset);
+        if (bytesRead <= 0) break;
+        tail.offset += bytesRead;
+        tail.remainder += buf.toString("utf-8", 0, bytesRead);
+        const lines = tail.remainder.split("\n");
+        tail.remainder = lines.pop() || "";
+        for (const line of lines) {
+          this.handleLine(line, tail);
+          if (tail.excluded) break;
+        }
+      }
+    } catch (err) {
+      console.error(`[transcripts] Read error for ${filePath}:`, err);
+    } finally {
+      try {
+        fs.closeSync(fd);
+      } catch {
+      }
+    }
+  }
+  handleLine(line, tail) {
+    const trimmed = line.trim();
+    if (!trimmed) return;
+    let obj;
+    try {
+      obj = JSON.parse(trimmed);
+    } catch {
+      return;
+    }
+    const entry = this.agentId === "claude" ? this.parseClaudeLine(obj) : this.parseCodexLine(obj, tail);
+    if (!entry) return;
+    const ms = Date.parse(entry.ts);
+    if (Number.isFinite(ms) && ms < this.sinceMs - DISCOVERY_SLACK_MS) return;
+    this.sink({ ...entry, content: capLength(entry.content) });
+  }
+  // ─── Claude Code format ─────────────────────────
+  parseClaudeLine(obj) {
+    if (!obj || typeof obj !== "object") return null;
+    if (obj.isMeta) return null;
+    if (obj.type !== "user" && obj.type !== "assistant") return null;
+    if (typeof obj.cwd === "string" && stripTrailingSep(obj.cwd) !== this.cwd) return null;
+    if (obj.isSidechain) return null;
+    const message = obj.message;
+    if (!message) return null;
+    const text = extractClaudeText(message.content, obj.type === "user");
+    if (!text) return null;
+    return {
+      ts: typeof obj.timestamp === "string" ? obj.timestamp : (/* @__PURE__ */ new Date()).toISOString(),
+      type: obj.type === "user" ? "user_input" : "terminal_output",
+      content: text
+    };
+  }
+  // ─── Codex CLI format ───────────────────────────
+  parseCodexLine(obj, tail) {
+    if (!obj || typeof obj !== "object") return null;
+    const payload = obj.payload;
+    if (obj.type === "session_meta") {
+      const metaCwd = payload?.cwd;
+      if (typeof metaCwd === "string" && stripTrailingSep(metaCwd) !== this.cwd) {
+        tail.excluded = true;
+      }
+      return null;
+    }
+    if (obj.type !== "event_msg" || !payload || typeof payload !== "object") return null;
+    let type;
+    if (payload.type === "user_message") {
+      type = "user_input";
+    } else if (payload.type === "agent_message") {
+      type = "terminal_output";
+    } else {
+      return null;
+    }
+    const text = typeof payload.message === "string" ? payload.message.trim() : "";
+    if (!text || isCodexNoise(text)) return null;
+    return {
+      ts: typeof obj.timestamp === "string" ? obj.timestamp : (/* @__PURE__ */ new Date()).toISOString(),
+      type,
+      content: text
+    };
+  }
+}
+const CLAUDE_NOISE_PREFIXES = [
+  "<local-command-caveat>",
+  "<command-name>",
+  "<command-message>",
+  "<local-command-stdout>",
+  "<bash-input>",
+  "<bash-stdout>",
+  "<bash-stderr>",
+  "<system-reminder>",
+  "<task-notification>",
+  "caveat: the messages below",
+  "[request interrupted"
+];
+const CODEX_NOISE_PREFIXES = [
+  "<environment_context>",
+  "<user_instructions>",
+  "<permissions instructions>",
+  "<turn_aborted>"
+];
+function isClaudeNoise(text) {
+  const lower = text.trimStart().toLowerCase();
+  return CLAUDE_NOISE_PREFIXES.some((p2) => lower.startsWith(p2));
+}
+function isCodexNoise(text) {
+  const lower = text.trimStart().toLowerCase();
+  return CODEX_NOISE_PREFIXES.some((p2) => lower.startsWith(p2));
+}
+function extractClaudeText(content, isUser) {
+  if (typeof content === "string") {
+    const text = content.trim();
+    return text && !isClaudeNoise(text) ? text : "";
+  }
+  if (!Array.isArray(content)) return "";
+  if (isUser && content.some((b2) => b2?.type === "tool_result")) return "";
+  const parts = [];
+  for (const block of content) {
+    if (block?.type !== "text" || typeof block.text !== "string") continue;
+    const text = block.text.trim();
+    if (text && !isClaudeNoise(text)) parts.push(text);
+  }
+  return parts.join("\n\n");
+}
+function stripTrailingSep(p2) {
+  return p2.length > 1 ? p2.replace(/[/\\]+$/, "") : p2;
+}
+function capLength(str) {
+  if (str.length <= MAX_ENTRY_CHARS) return str;
+  return str.slice(0, MAX_ENTRY_CHARS) + `… [truncated, ${str.length} total chars]`;
+}
 var bufferUtil = { exports: {} };
 var constants;
 var hasRequiredConstants;
@@ -10719,6 +10961,7 @@ class Orchestrator {
   noProjectPollTimer = null;
   noProjectPollCwd = null;
   currentProjectName = null;
+  transcriptTailer = null;
   constructor(settingsDir, events) {
     this.settingsDir = settingsDir;
     this.events = events;
@@ -10770,11 +11013,36 @@ class Orchestrator {
     this.saveSettings();
     this.bridge.setLoggingEnabled(enabled);
     if (!enabled) {
-      this.bridge.endSession();
+      this.stopChatLogging();
     } else if (this.activeTabId) {
+      const tab = this.tabs.get(this.activeTabId);
+      if (tab) this.startChatLogging(tab.agent, tab.cwd);
+    }
+  }
+  // Agents with native session transcripts (Claude Code, Codex) get exact
+  // chat text tailed from their JSONL logs; everything else falls back to
+  // the terminal screen-scraper bridge.
+  startChatLogging(agent, cwd) {
+    this.stopChatLogging();
+    if (!this.settings.logChat) return;
+    if (supportsTranscriptLogging(agent.id)) {
+      this.transcriptTailer = new TranscriptTailer({
+        agentId: agent.id,
+        cwd,
+        sink: (entry) => this.workerWs.sendChatLog(entry)
+      });
+      this.transcriptTailer.start();
+    } else {
       this.bridge.startSession();
     }
   }
+  stopChatLogging() {
+    if (this.transcriptTailer) {
+      this.transcriptTailer.stop();
+      this.transcriptTailer = null;
+    }
+    this.bridge.endSession();
+  }
   // ─── Settings ───────────────────────────────────
   getActiveProfile() {
     return this.settings.profiles[this.settings.activeProfile] || this.settings.profiles.production || DEFAULT_PROFILES.production;
@@ -10986,7 +11254,7 @@ class Orchestrator {
       this.events.onPtyExit(tabId, exitCode);
       await this.timeTracker.endSession(tabId);
       if (tabId === this.activeTabId) {
-        this.bridge.endSession();
+        this.stopChatLogging();
         if (this.currentAgent && isCodingAgent(this.currentAgent)) {
           this.workerWs.disconnect();
         }
@@ -10994,9 +11262,7 @@ class Orchestrator {
       const t = this.tabs.get(tabId);
       if (t?.termStreamTimer) clearTimeout(t.termStreamTimer);
     });
-    if (this.settings.logChat) {
-      this.bridge.startSession();
-    }
+    this.startChatLogging(agent, cwd);
     const profile = this.getActiveProfile();
     const shouldTrack = opts?.trackTime !== void 0 ? opts.trackTime : profile.trackTime !== false;
     if (shouldTrack) {
@@ -11036,7 +11302,7 @@ class Orchestrator {
     tab.ptyManager.kill();
     this.tabs.delete(tabId);
     if (tabId === this.activeTabId) {
-      this.bridge.endSession();
+      this.stopChatLogging();
       if (isCodingAgent(tab.agent)) {
         this.workerWs.disconnect();
       }
@@ -11187,7 +11453,7 @@ class Orchestrator {
   // ─── Shutdown ───────────────────────────────────
   async shutdown() {
     this.stopNoProjectPolling();
-    this.bridge.endSession();
+    this.stopChatLogging();
     await this.timeTracker.endAll();
     for (const [, tab] of this.tabs) {
       if (tab.termStreamTimer) clearTimeout(tab.termStreamTimer);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phenx-inc/ctlsurf",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "Agent-agnostic terminal and desktop app for ctlsurf — run Claude Code, Codex, or any coding agent with live session logging and remote control",
   "main": "out/main/index.js",
   "bin": {

package/src/main/orchestrator.ts

@@ -6,6 +6,7 @@ import { PtyManager } from './pty'
 import { AgentConfig, isCodingAgent } from './agents'
 import { CtlsurfApi } from './ctlsurfApi'
 import { ConversationBridge } from './bridge'
+import { TranscriptTailer, supportsTranscriptLogging } from './transcripts'
 import { WorkerWsClient, type WorkerWsStatus, type IncomingMessage } from './workerWs'
 import { TimeTracker } from './timeTracker'
 import { TicketStore, type TicketInput } from './ticketStore'
@@ -93,6 +94,7 @@ export class Orchestrator {
   private noProjectPollTimer: ReturnType<typeof setInterval> | null = null
   private noProjectPollCwd: string | null = null
   private currentProjectName: string | null = null
+  private transcriptTailer: TranscriptTailer | null = null
 
   constructor(settingsDir: string, events: OrchestratorEvents) {
     this.settingsDir = settingsDir
@@ -151,12 +153,40 @@ export class Orchestrator {
     this.saveSettings()
     this.bridge.setLoggingEnabled(enabled)
     if (!enabled) {
-      this.bridge.endSession()
+      this.stopChatLogging()
     } else if (this.activeTabId) {
+      const tab = this.tabs.get(this.activeTabId)
+      if (tab) this.startChatLogging(tab.agent, tab.cwd)
+    }
+  }
+
+  // Agents with native session transcripts (Claude Code, Codex) get exact
+  // chat text tailed from their JSONL logs; everything else falls back to
+  // the terminal screen-scraper bridge.
+  private startChatLogging(agent: AgentConfig, cwd: string): void {
+    this.stopChatLogging()
+    if (!this.settings.logChat) return
+
+    if (supportsTranscriptLogging(agent.id)) {
+      this.transcriptTailer = new TranscriptTailer({
+        agentId: agent.id,
+        cwd,
+        sink: (entry) => this.workerWs.sendChatLog(entry),
+      })
+      this.transcriptTailer.start()
+    } else {
       this.bridge.startSession()
     }
   }
 
+  private stopChatLogging(): void {
+    if (this.transcriptTailer) {
+      this.transcriptTailer.stop()
+      this.transcriptTailer = null
+    }
+    this.bridge.endSession()
+  }
+
   // ─── Settings ───────────────────────────────────
 
   getActiveProfile(): Profile {
@@ -406,7 +436,7 @@ export class Orchestrator {
       this.events.onPtyExit(tabId, exitCode)
       await this.timeTracker.endSession(tabId)
       if (tabId === this.activeTabId) {
-        this.bridge.endSession()
+        this.stopChatLogging()
         if (this.currentAgent && isCodingAgent(this.currentAgent)) {
           this.workerWs.disconnect()
         }
@@ -416,9 +446,7 @@ export class Orchestrator {
       if (t?.termStreamTimer) clearTimeout(t.termStreamTimer)
     })
 
-    if (this.settings.logChat) {
-      this.bridge.startSession()
-    }
+    this.startChatLogging(agent, cwd)
 
     const profile = this.getActiveProfile()
     const shouldTrack = opts?.trackTime !== undefined ? opts.trackTime : (profile.trackTime !== false)
@@ -463,7 +491,7 @@ export class Orchestrator {
     tab.ptyManager.kill()
     this.tabs.delete(tabId)
     if (tabId === this.activeTabId) {
-      this.bridge.endSession()
+      this.stopChatLogging()
       if (isCodingAgent(tab.agent)) {
         this.workerWs.disconnect()
       }
@@ -632,7 +660,7 @@ export class Orchestrator {
 
   async shutdown(): Promise<void> {
     this.stopNoProjectPolling()
-    this.bridge.endSession()
+    this.stopChatLogging()
     await this.timeTracker.endAll()
     for (const [, tab] of this.tabs) {
       if (tab.termStreamTimer) clearTimeout(tab.termStreamTimer)