@cubicj/codex-watch 0.2.0 → 0.3.0

package/README.md

@@ -4,13 +4,17 @@ Live-tail the newest Codex plugin background job log for the current git repo.
 
 `codex-watch` is a zero-dependency terminal companion for the [`openai/codex-plugin-cc`](https://github.com/openai/codex-plugin-cc) Claude Code plugin. When Claude Code delegates work to a background Codex job, run `codex-watch` in that repo's terminal to follow the job's log live — and it keeps following across `--resume`.
 
+![codex-watch following a background Codex job: a cancelled job, automatic switch to the new job, session info, colored command results, and the completion banner](https://raw.githubusercontent.com/cubicj/codex-watch/main/assets/screenshot.png)
+
 ## What It Does
 
 - Resolves the git repo from the terminal's current working directory.
 - Follows the newest job log written by the `openai/codex-plugin-cc` Claude Code plugin.
 - Auto-switches when a `--resume` starts a newer job id, so a resumed run is picked up without restarting.
 - Shows the job's model, reasoning effort, sandbox mode, and write access under the header (resolved from the Codex CLI session files in `$CODEX_HOME`, default `~/.codex`).
+- Shows a dim `Thinking...` indicator for each reasoning stretch.
 - Colorizes assistant messages, command status, file changes, and job events.
+- Lists each applied file with its change type and a workspace-relative path when available.
 - Prints a completion banner such as `✓ completed · <duration>` or `✗ <status> · <duration>`.
 - Drops duplicate captured lines.
 

package/bin/codex-watch

@@ -3,6 +3,7 @@ const fs = require("fs");
 const path = require("path");
 const os = require("os");
 const childProcess = require("child_process");
+const crypto = require("node:crypto");
 const { StringDecoder } = require("node:string_decoder");
 
 process.stdout.on("error", (error) => {
@@ -58,11 +59,11 @@ if (args.includes("--help") || args.includes("-h")) {
 const once = args.includes("--once");
 const repoRoot = resolveRepoRoot();
 const slug = makeSlug(repoRoot);
+const stateDirName = makeStateDirName(repoRoot, slug);
 const stateRoot = process.env.CLAUDE_PLUGIN_DATA
   ? path.join(process.env.CLAUDE_PLUGIN_DATA, "state")
   : path.join(os.homedir(), ".claude/plugins/data/codex-openai-codex/state");
 const codexHome = process.env.CODEX_HOME || path.join(os.homedir(), ".codex");
-const stateDirPattern = new RegExp("^" + escapeRegExp(slug) + "-[0-9a-f]{6,}$");
 
 let currentJob = null;
 let logOffset = 0;
@@ -74,8 +75,11 @@ let scanTimer = null;
 let waitingPrinted = false;
 let completionBannerPrinted = false;
 let sessionInfoPrinted = false;
+let requestedSessionInfoPrinted = false;
+let thinkingIndicatorPrinted = false;
 let sessionRolloutPath = "";
 let lastRolloutSearchAt = null;
+let consumedPatchApplyEvents = new Set();
 
 process.on("SIGINT", () => {
   clearTimers();
@@ -92,6 +96,9 @@ if (once) {
   printHeader(job);
   printSessionInfo(job);
   renderWholeLog(job);
+  if (isTerminalStatus(job.status)) {
+    printCompletionBanner(job, job.displayedCreatedAt);
+  }
   process.exit(0);
 }
 
@@ -115,8 +122,13 @@ function makeSlug(root) {
   return path.basename(root).replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "") || "workspace";
 }
 
-function escapeRegExp(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+function makeStateDirName(root, rootSlug) {
+  let canonical = root;
+  try {
+    canonical = fs.realpathSync.native(root);
+  } catch (_error) {}
+  const hash = crypto.createHash("sha256").update(canonical).digest("hex").slice(0, 16);
+  return rootSlug + "-" + hash;
 }
 
 function safeReadDir(dir, options) {
@@ -144,49 +156,44 @@ function readJson(file) {
 }
 
 function findNewestJob() {
-  const stateEntries = safeReadDir(stateRoot, { withFileTypes: true });
+  const jobsDir = path.join(stateRoot, stateDirName, "jobs");
+  const jobEntries = safeReadDir(jobsDir, { withFileTypes: true });
   const candidates = [];
 
-  for (const entry of stateEntries) {
-    if (!entry.isDirectory() || !stateDirPattern.test(entry.name)) {
+  for (const jobEntry of jobEntries) {
+    if (!jobEntry.isFile() || !jobEntry.name.endsWith(".json")) {
       continue;
     }
 
-    const jobsDir = path.join(stateRoot, entry.name, "jobs");
-    const jobEntries = safeReadDir(jobsDir, { withFileTypes: true });
-
-    for (const jobEntry of jobEntries) {
-      if (!jobEntry.isFile() || !jobEntry.name.endsWith(".json")) {
-        continue;
-      }
-
-      const id = path.basename(jobEntry.name, ".json");
-      const jsonPath = path.join(jobsDir, jobEntry.name);
-      const logPath = path.join(jobsDir, id + ".log");
-      const meta = readJson(jsonPath);
-      const stat = safeStat(jsonPath);
-      const fallbackCreatedAt = stat ? stat.mtime.toISOString() : "";
-      const createdAt = typeof meta.createdAt === "string" && meta.createdAt ? meta.createdAt : fallbackCreatedAt;
-
-      candidates.push({
-        id,
-        jsonPath,
-        logPath,
-        createdAt,
-        displayedCreatedAt: typeof meta.createdAt === "string" && meta.createdAt ? meta.createdAt : createdAt,
-        startedAt: typeof meta.startedAt === "string" ? meta.startedAt : "",
-        status: typeof meta.status === "string" ? meta.status : "unknown",
-        phase: typeof meta.phase === "string" ? meta.phase : "unknown",
-        summary: typeof meta.summary === "string" ? meta.summary : "",
-        threadId: typeof meta.threadId === "string" ? meta.threadId : "",
-        write: typeof meta.write === "boolean" ? meta.write : false
-      });
-    }
+    const id = path.basename(jobEntry.name, ".json");
+    const jsonPath = path.join(jobsDir, jobEntry.name);
+    const logPath = path.join(jobsDir, id + ".log");
+    const meta = readJson(jsonPath);
+    const stat = safeStat(jsonPath);
+    const fallbackCreatedAt = stat ? stat.mtime.toISOString() : "";
+    const createdAt = typeof meta.createdAt === "string" && meta.createdAt ? meta.createdAt : fallbackCreatedAt;
+
+    candidates.push({
+      id,
+      jsonPath,
+      logPath,
+      createdAt,
+      displayedCreatedAt: typeof meta.createdAt === "string" && meta.createdAt ? meta.createdAt : createdAt,
+      startedAt: typeof meta.startedAt === "string" ? meta.startedAt : "",
+      updatedAt: typeof meta.updatedAt === "string" ? meta.updatedAt : "",
+      completedAt: typeof meta.completedAt === "string" ? meta.completedAt : "",
+      status: typeof meta.status === "string" ? meta.status : "unknown",
+      phase: typeof meta.phase === "string" ? meta.phase : "unknown",
+      summary: typeof meta.summary === "string" ? meta.summary : "",
+      threadId: typeof meta.threadId === "string" ? meta.threadId : "",
+      write: typeof meta.write === "boolean" ? meta.write : false,
+      request: meta.request && typeof meta.request === "object" ? meta.request : null
+    });
   }
 
   candidates.sort((a, b) => {
     if (a.createdAt === b.createdAt) {
-      return a.id.localeCompare(b.id);
+      return b.id.localeCompare(a.id);
     }
     return a.createdAt < b.createdAt ? 1 : -1;
   });
@@ -214,7 +221,10 @@ function scanForNewJob() {
     return;
   }
 
-  if (newest.createdAt > currentJob.createdAt) {
+  if (
+    newest.createdAt > currentJob.createdAt ||
+    (newest.createdAt === currentJob.createdAt && newest.id.localeCompare(currentJob.id) > 0)
+  ) {
     console.log(color("dim", "──────── switched to " + newest.id + " ────────"));
     switchToJob(newest);
   }
@@ -229,8 +239,11 @@ function switchToJob(job) {
   waitingPrinted = false;
   completionBannerPrinted = false;
   sessionInfoPrinted = false;
+  requestedSessionInfoPrinted = false;
+  thinkingIndicatorPrinted = false;
   sessionRolloutPath = "";
   lastRolloutSearchAt = null;
+  consumedPatchApplyEvents = new Set();
   if (tailTimer) {
     clearInterval(tailTimer);
   }
@@ -256,20 +269,18 @@ function printHeader(job) {
 }
 
 function printSessionInfo(job) {
-  if (sessionInfoPrinted || !job.threadId) {
+  if (sessionInfoPrinted) {
     return;
   }
 
-  if (!sessionRolloutPath) {
-    const now = Date.now();
-    if (lastRolloutSearchAt !== null && now - lastRolloutSearchAt < 5000) {
-      return;
-    }
-    lastRolloutSearchAt = now;
-    sessionRolloutPath = findRolloutFile(job.threadId);
-    if (!sessionRolloutPath) {
-      return;
-    }
+  if (!job.threadId) {
+    printRequestedSessionInfo(job);
+    return;
+  }
+
+  if (!resolveSessionRolloutPath(job)) {
+    printRequestedSessionInfo(job);
+    return;
   }
 
   const text = readFileText(sessionRolloutPath);
@@ -295,6 +306,7 @@ function printSessionInfo(job) {
 
   const payload = turnContext && turnContext.payload;
   if (!payload || typeof payload.model !== "string" || !payload.model) {
+    printRequestedSessionInfo(job);
     return;
   }
 
@@ -310,6 +322,42 @@ function printSessionInfo(job) {
   sessionInfoPrinted = true;
 }
 
+function printRequestedSessionInfo(job) {
+  const request = job.request;
+  if (
+    requestedSessionInfoPrinted ||
+    !request ||
+    typeof request.model !== "string" ||
+    !request.model
+  ) {
+    return;
+  }
+
+  const segments = ["model " + request.model + " (requested)"];
+  if (typeof request.effort === "string" && request.effort) {
+    segments.push("effort " + request.effort + " (requested)");
+  }
+  console.log(color("dim", segments.join(" · ")));
+  requestedSessionInfoPrinted = true;
+}
+
+function resolveSessionRolloutPath(job) {
+  if (sessionRolloutPath) {
+    return sessionRolloutPath;
+  }
+  if (!job || !job.threadId) {
+    return "";
+  }
+
+  const now = Date.now();
+  if (lastRolloutSearchAt !== null && now - lastRolloutSearchAt < 5000) {
+    return "";
+  }
+  lastRolloutSearchAt = now;
+  sessionRolloutPath = findRolloutFile(job.threadId);
+  return sessionRolloutPath;
+}
+
 function findRolloutFile(threadId) {
   const sessionsRoot = path.join(codexHome, "sessions");
   const years = safeReadDir(sessionsRoot, { withFileTypes: true })
@@ -371,7 +419,7 @@ function formatElapsed(createdAt, updatedAt) {
 
 function renderWholeLog(job) {
   const text = readFileText(job.logPath);
-  renderText(text);
+  renderText(text, false, job);
 }
 
 function readAvailableLog() {
@@ -392,7 +440,7 @@ function readAvailableLog() {
       const chunk = readFileChunk(currentJob.logPath, logOffset, stat.size - logOffset);
       if (chunk !== null) {
         logOffset += chunk.length;
-        renderText(logDecoder.write(chunk), true);
+        renderText(logDecoder.write(chunk), true, currentJob);
       }
     }
   }
@@ -401,38 +449,42 @@ function readAvailableLog() {
 }
 
 function checkJobCompletion() {
-  if (completionBannerPrinted) {
-    return true;
-  }
-
   let meta = null;
   try {
     meta = JSON.parse(fs.readFileSync(currentJob.jsonPath, "utf8"));
   } catch (_error) {
-    return false;
+    return;
   }
 
   const status = typeof meta.status === "string" ? meta.status : "unknown";
   currentJob.threadId = typeof meta.threadId === "string" ? meta.threadId : "";
   currentJob.write = typeof meta.write === "boolean" ? meta.write : false;
   currentJob.startedAt = typeof meta.startedAt === "string" ? meta.startedAt : "";
+  currentJob.request = meta.request && typeof meta.request === "object" ? meta.request : null;
   printSessionInfo(currentJob);
+  if (completionBannerPrinted) {
+    return;
+  }
   if (!isTerminalStatus(status)) {
-    return true;
+    return;
   }
 
-  const createdAt = typeof meta.createdAt === "string" && meta.createdAt ? meta.createdAt : currentJob.displayedCreatedAt;
-  const startedAt = typeof meta.startedAt === "string" && meta.startedAt ? meta.startedAt : createdAt;
-  const updatedAt = typeof meta.updatedAt === "string" && meta.updatedAt ? meta.updatedAt : "";
-  const completedAt = typeof meta.completedAt === "string" && meta.completedAt ? meta.completedAt : updatedAt;
+  printCompletionBanner(meta, currentJob.displayedCreatedAt);
+  completionBannerPrinted = true;
+}
+
+function printCompletionBanner(job, fallbackCreatedAt) {
+  const status = typeof job.status === "string" ? job.status : "unknown";
+  const createdAt = typeof job.createdAt === "string" && job.createdAt ? job.createdAt : fallbackCreatedAt;
+  const startedAt = typeof job.startedAt === "string" && job.startedAt ? job.startedAt : createdAt;
+  const updatedAt = typeof job.updatedAt === "string" && job.updatedAt ? job.updatedAt : "";
+  const completedAt = typeof job.completedAt === "string" && job.completedAt ? job.completedAt : updatedAt;
   const elapsed = formatElapsed(startedAt, completedAt);
   if (status === "completed") {
     console.log(color("green", "✓ completed · " + elapsed));
   } else {
     console.log(color("red", "✗ " + status + " · " + elapsed));
   }
-  completionBannerPrinted = true;
-  return true;
 }
 
 function isTerminalStatus(status) {
@@ -465,7 +517,7 @@ function readFileChunk(file, start, length) {
   }
 }
 
-function renderText(text, keepPartial) {
+function renderText(text, keepPartial, job) {
   if (!text) {
     return;
   }
@@ -482,13 +534,14 @@ function renderText(text, keepPartial) {
   }
 
   for (const line of lines) {
-    renderLine(line);
+    renderLine(line, job);
   }
 }
 
-function renderLine(line) {
-  const match = line.match(/^\[\d{4}-\d{2}-\d{2}T[^\]]*\]\s+(.*)$/);
+function renderLine(line, job) {
+  const match = line.match(/^\[(\d{4}-\d{2}-\d{2}T[^\]]*)\]\s+(.*)$/);
   if (!match) {
+    thinkingIndicatorPrinted = false;
     if (assistantBlock) {
       console.log(assistantText(line));
     } else {
@@ -497,7 +550,8 @@ function renderLine(line) {
     return;
   }
 
-  const event = match[1];
+  const eventTimestamp = match[1];
+  const event = match[2];
 
   if (event === "Assistant message") {
     assistantBlock = true;
@@ -510,6 +564,16 @@ function renderLine(line) {
     return;
   }
 
+  if (event === "Thinking.") {
+    if (!thinkingIndicatorPrinted) {
+      console.log(color("dim", "Thinking..."));
+      thinkingIndicatorPrinted = true;
+    }
+    return;
+  }
+
+  thinkingIndicatorPrinted = false;
+
   if (event.startsWith("Running command: ")) {
     console.log(color("dim", color("blue", "Running command: " + truncate(event.slice("Running command: ".length)))));
     return;
@@ -531,7 +595,13 @@ function renderLine(line) {
     return;
   }
 
-  if (event.startsWith("File changes") || /^Applying [0-9]+ file change\(s\)\.$/.test(event) || event === "File changes completed.") {
+  if (/^Applying [0-9]+ file change\(s\)\.$/.test(event)) {
+    console.log(color("yellow", event));
+    renderAppliedFiles(eventTimestamp, job);
+    return;
+  }
+
+  if (event.startsWith("File changes") || event === "File changes completed.") {
     console.log(color("yellow", event));
     return;
   }
@@ -544,6 +614,81 @@ function renderLine(line) {
   console.log(event);
 }
 
+function renderAppliedFiles(eventTimestamp, job) {
+  const rolloutPath = resolveSessionRolloutPath(job);
+  if (!rolloutPath) {
+    return;
+  }
+
+  const targetTime = Date.parse(eventTimestamp);
+  if (!Number.isFinite(targetTime)) {
+    return;
+  }
+
+  const text = readFileText(rolloutPath);
+  let sessionCwd = process.cwd();
+  let nearest = null;
+
+  for (const [index, line] of text.split(/\r?\n/).entries()) {
+    try {
+      const entry = JSON.parse(line);
+      if (
+        entry &&
+        entry.type === "session_meta" &&
+        entry.payload &&
+        typeof entry.payload.cwd === "string" &&
+        entry.payload.cwd
+      ) {
+        sessionCwd = entry.payload.cwd;
+      }
+      if (
+        consumedPatchApplyEvents.has(index) ||
+        !entry ||
+        entry.type !== "event_msg" ||
+        !entry.payload ||
+        entry.payload.type !== "patch_apply_end"
+      ) {
+        continue;
+      }
+
+      const patchTime = Date.parse(entry.timestamp);
+      const difference = Math.abs(patchTime - targetTime);
+      if (!Number.isFinite(difference) || difference > 2000) {
+        continue;
+      }
+      if (!nearest || difference < nearest.difference) {
+        nearest = { index, difference, changes: entry.payload.changes };
+      }
+    } catch (_error) {}
+  }
+
+  if (!nearest) {
+    return;
+  }
+  consumedPatchApplyEvents.add(nearest.index);
+  if (!nearest.changes || typeof nearest.changes !== "object" || Array.isArray(nearest.changes)) {
+    return;
+  }
+
+  for (const [file, change] of Object.entries(nearest.changes)) {
+    const type = change && change.type;
+    const marker = type === "update" ? "M" : type === "add" ? "A" : type === "delete" ? "D" : String(type);
+    console.log(color("dim", "  " + marker + " " + renderChangedPath(file, sessionCwd)));
+  }
+}
+
+function renderChangedPath(file, sessionCwd) {
+  if (!path.isAbsolute(file)) {
+    return file;
+  }
+
+  const relative = path.relative(sessionCwd, file);
+  if (relative !== ".." && !relative.startsWith(".." + path.sep) && !path.isAbsolute(relative)) {
+    return relative || ".";
+  }
+  return file;
+}
+
 function truncate(value) {
   const maxLength = 140;
   const codePoints = Array.from(value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubicj/codex-watch",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Live-tail the newest Codex plugin background job log for the current git repo.",
   "license": "MIT",
   "repository": {