@cubicj/codex-watch 0.2.1 → 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

@@ -75,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();
@@ -183,7 +186,8 @@ function findNewestJob() {
       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
+      write: typeof meta.write === "boolean" ? meta.write : false,
+      request: meta.request && typeof meta.request === "object" ? meta.request : null
     });
   }
 
@@ -235,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);
   }
@@ -262,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);
@@ -301,6 +306,7 @@ function printSessionInfo(job) {
 
   const payload = turnContext && turnContext.payload;
   if (!payload || typeof payload.model !== "string" || !payload.model) {
+    printRequestedSessionInfo(job);
     return;
   }
 
@@ -316,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 })
@@ -377,7 +419,7 @@ function formatElapsed(createdAt, updatedAt) {
 
 function renderWholeLog(job) {
   const text = readFileText(job.logPath);
-  renderText(text);
+  renderText(text, false, job);
 }
 
 function readAvailableLog() {
@@ -398,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);
       }
     }
   }
@@ -407,10 +449,6 @@ function readAvailableLog() {
 }
 
 function checkJobCompletion() {
-  if (completionBannerPrinted) {
-    return;
-  }
-
   let meta = null;
   try {
     meta = JSON.parse(fs.readFileSync(currentJob.jsonPath, "utf8"));
@@ -422,7 +460,11 @@ function checkJobCompletion() {
   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;
   }
@@ -475,7 +517,7 @@ function readFileChunk(file, start, length) {
   }
 }
 
-function renderText(text, keepPartial) {
+function renderText(text, keepPartial, job) {
   if (!text) {
     return;
   }
@@ -492,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 {
@@ -507,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;
@@ -520,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;
@@ -541,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;
   }
@@ -554,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.1",
+  "version": "0.3.0",
   "description": "Live-tail the newest Codex plugin background job log for the current git repo.",
   "license": "MIT",
   "repository": {