codeam-cli 2.23.31 → 2.23.33

package/CHANGELOG.md

@@ -4,6 +4,19 @@ All notable changes to `codeam-cli` are documented here.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.23.32] — 2026-05-31
+
+### Added
+
+- **shared:** Add CommitEntry + BlameLine wire types for git enrichment
+- **cli:** Capture git log + blame per changed file at turn end
+
+## [2.23.31] — 2026-05-30
+
+### Fixed
+
+- **cli:** TurnFileAggregator captures pre-pair baseline silently
+
 ## [2.23.30] — 2026-05-30
 
 ### Chore

package/dist/index.js

@@ -441,7 +441,7 @@ var import_qrcode_terminal = __toESM(require("qrcode-terminal"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.23.31",
+  version: "2.23.33",
   description: "Workflow-continuity bridge for AI coding agents. Wrap Claude Code or Codex in a PTY and supervise, approve, and redirect the session from any device \u2014 async. The terminal companion for CodeAgent Mobile.",
   type: "commonjs",
   main: "dist/index.js",
@@ -5774,7 +5774,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.23.31" : "0.0.0-dev",
+    cliVersion: true ? "2.23.33" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -12825,8 +12825,12 @@ function _post2(url, headers, payload) {
 // src/services/file-watcher.service.ts
 var API_BASE5 = resolveApiBaseUrl();
 var DEBOUNCE_MS = 250;
+var COALESCE_WINDOW_MS = 250;
+var COALESCE_MAX_HOLD_MS = 2e3;
 var MAX_RETRIES = 2;
 var RETRY_BACKOFF_MS = 300;
+var HISTORY_MAX_COMMITS = 50;
+var BLAME_MAX_LINES = 500;
 var WINDOWS_LEGACY_JUNCTIONS = [
   /[\\/]Application Data([\\/]|$)/i,
   /[\\/]Cookies([\\/]|$)/i,
@@ -12906,6 +12910,17 @@ var FileWatcherService = class {
    */
   gitRootByDir = /* @__PURE__ */ new Map();
   stopped = false;
+  /**
+   * Cross-file coalescing buffer. Keyed by absPath so multiple
+   * scheduled emits for the same file collapse to the latest
+   * `changeType`. The buffer drains via `coalesceTimer` after
+   * `COALESCE_WINDOW_MS` of quiescence, or forcibly after
+   * `COALESCE_MAX_HOLD_MS` so the UI never starves during a long
+   * continuous edit.
+   */
+  coalesceBuffer = /* @__PURE__ */ new Map();
+  coalesceTimer = null;
+  coalesceMaxHoldTimer = null;
   /**
    * Start watching `opts.workingDir`. Idempotent (second call is a
    * no-op). Resolves once chokidar's initial scan completes; that
@@ -13007,6 +13022,15 @@ var FileWatcherService = class {
       clearTimeout(entry.timer);
     }
     this.pending.clear();
+    if (this.coalesceTimer) {
+      clearTimeout(this.coalesceTimer);
+      this.coalesceTimer = null;
+    }
+    if (this.coalesceMaxHoldTimer) {
+      clearTimeout(this.coalesceMaxHoldTimer);
+      this.coalesceMaxHoldTimer = null;
+    }
+    this.coalesceBuffer.clear();
     if (this.watcher) {
       try {
         await this.watcher.close();
@@ -13034,7 +13058,7 @@ var FileWatcherService = class {
     if (existing) clearTimeout(existing.timer);
     const timer = setTimeout(() => {
       this.pending.delete(absPath);
-      void this.emitForFile(absPath, changeType);
+      this.enqueueForCoalesce(absPath, changeType);
     }, DEBOUNCE_MS);
     this.pending.set(absPath, {
       lastEventAt: Date.now(),
@@ -13042,6 +13066,49 @@ var FileWatcherService = class {
       changeType
     });
   }
+  /**
+   * Drop the file into the cross-file coalescing buffer. The buffer
+   * flushes after `COALESCE_WINDOW_MS` of quiescence (resets on each
+   * new enqueue) or after `COALESCE_MAX_HOLD_MS` regardless. Same
+   * file enqueued twice in a row keeps only the latest `changeType`
+   * (typically the most recent FS event wins).
+   */
+  enqueueForCoalesce(absPath, changeType) {
+    if (this.stopped) return;
+    this.coalesceBuffer.set(absPath, { absPath, changeType });
+    if (this.coalesceTimer) clearTimeout(this.coalesceTimer);
+    this.coalesceTimer = setTimeout(() => {
+      void this.flushCoalesceBuffer();
+    }, COALESCE_WINDOW_MS);
+    if (!this.coalesceMaxHoldTimer) {
+      this.coalesceMaxHoldTimer = setTimeout(() => {
+        void this.flushCoalesceBuffer();
+      }, COALESCE_MAX_HOLD_MS);
+    }
+  }
+  /**
+   * Drain the coalesce buffer. Snapshots the entries up-front so any
+   * emissions that arrive mid-flush (chokidar fires again, agent
+   * keeps writing) land in a fresh buffer rather than competing with
+   * the in-flight one.
+   */
+  async flushCoalesceBuffer() {
+    if (this.coalesceTimer) {
+      clearTimeout(this.coalesceTimer);
+      this.coalesceTimer = null;
+    }
+    if (this.coalesceMaxHoldTimer) {
+      clearTimeout(this.coalesceMaxHoldTimer);
+      this.coalesceMaxHoldTimer = null;
+    }
+    if (this.coalesceBuffer.size === 0) return;
+    const entries = Array.from(this.coalesceBuffer.values());
+    this.coalesceBuffer.clear();
+    for (const entry of entries) {
+      if (this.stopped) return;
+      await this.emitForFile(entry.absPath, entry.changeType);
+    }
+  }
   /**
    * Visible for tests — lets vitest pump a synthetic file event
    * through the debounce + diff + emit pipeline without spinning up
@@ -13137,6 +13204,31 @@ var FileWatcherService = class {
         linesRemoved: hunk.linesRemoved
       });
     }
+    await this.emitGitEnrichment(gitRoot, relPathInRepo, repoPath, repoName, fileStatus);
+  }
+  async emitGitEnrichment(gitRoot, relPathInRepo, repoPath, repoName, fileStatus) {
+    if (this.stopped) return;
+    const commits = await captureHistory(gitRoot, relPathInRepo, HISTORY_MAX_COMMITS);
+    if (this.stopped) return;
+    await this.postReviewHistory({
+      sessionId: this.opts.sessionId,
+      pluginId: this.opts.pluginId,
+      filePath: relPathInRepo,
+      repoPath,
+      repoName,
+      commits
+    });
+    if (this.stopped || fileStatus === "deleted") return;
+    const blameLines = await captureBlame(gitRoot, relPathInRepo, BLAME_MAX_LINES);
+    if (this.stopped) return;
+    await this.postReviewBlame({
+      sessionId: this.opts.sessionId,
+      pluginId: this.opts.pluginId,
+      filePath: relPathInRepo,
+      repoPath,
+      repoName,
+      lines: blameLines
+    });
   }
   /**
    * Compute the unified diff for a single path relative to the
@@ -13173,6 +13265,12 @@ var FileWatcherService = class {
   async postReviewHunk(body) {
     await this.postWithRetries(`${this.apiBase}/api/review/hunks`, body);
   }
+  async postReviewHistory(body) {
+    await this.postWithRetries(`${this.apiBase}/api/review/history`, body);
+  }
+  async postReviewBlame(body) {
+    await this.postWithRetries(`${this.apiBase}/api/review/blame`, body);
+  }
   async postWithRetries(url, body) {
     const payload = JSON.stringify(body);
     const headers = {
@@ -13223,6 +13321,78 @@ var FileWatcherService = class {
 function sleep(ms) {
   return new Promise((r) => setTimeout(r, ms));
 }
+async function captureHistory(repoRoot, relPath, maxCommits) {
+  const out2 = await runGit(repoRoot, [
+    "log",
+    `--max-count=${maxCommits}`,
+    "--no-color",
+    "--format=%H%x09%an%x09%ae%x09%aI%x09%s",
+    "--",
+    relPath
+  ]);
+  if (!out2) return [];
+  const commits = [];
+  for (const line of out2.split("\n")) {
+    if (!line) continue;
+    const cols = line.split("	");
+    if (cols.length < 5) continue;
+    const [sha, authorName, authorEmail, committedAt, ...subjectParts] = cols;
+    commits.push({
+      sha,
+      authorName: authorName ?? "",
+      authorEmail: authorEmail ?? "",
+      committedAt: committedAt ?? "",
+      subject: subjectParts.join("	")
+    });
+  }
+  return commits;
+}
+async function captureBlame(repoRoot, relPath, maxLines) {
+  const out2 = await runGit(repoRoot, [
+    "blame",
+    "--line-porcelain",
+    "--no-progress",
+    "-L",
+    `1,${maxLines}`,
+    "--",
+    relPath
+  ]);
+  if (!out2) return [];
+  const lines = [];
+  const blocks = out2.split(/(?=^[0-9a-f]{40} )/m);
+  for (const block of blocks) {
+    if (!block) continue;
+    const blockLines = block.split("\n");
+    const headerMatch = blockLines[0].match(/^([0-9a-f]{40}) \d+ (\d+)/);
+    if (!headerMatch) continue;
+    const sha = headerMatch[1];
+    const lineNumber = parseInt(headerMatch[2], 10);
+    let authorName = "";
+    let authorTime = null;
+    let text = "";
+    for (let i = 1; i < blockLines.length; i += 1) {
+      const bl = blockLines[i];
+      if (bl.startsWith("author ")) {
+        authorName = bl.slice(7);
+      } else if (bl.startsWith("author-time ")) {
+        const parsed = parseInt(bl.slice(12), 10);
+        if (!Number.isNaN(parsed)) authorTime = parsed;
+      } else if (bl.startsWith("	")) {
+        text = bl.slice(1);
+        break;
+      }
+    }
+    const committedAt = authorTime !== null ? new Date(authorTime * 1e3).toISOString() : "";
+    lines.push({
+      lineNumber,
+      sha,
+      authorName,
+      committedAt,
+      text
+    });
+  }
+  return lines;
+}
 async function runGit(cwd, args2, opts = {}) {
   return _runGit(cwd, args2, opts);
 }
@@ -19001,7 +19171,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.23.31" : "0.0.0-dev";
+  const cliVersion = true ? "2.23.33" : "0.0.0-dev";
   const apiBase = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto6.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -19200,7 +19370,7 @@ async function completion(args2) {
 // src/commands/version.ts
 var import_picocolors13 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.23.31" : "unknown";
+  const v = true ? "2.23.33" : "unknown";
   console.log(`${import_picocolors13.default.bold("codeam-cli")} ${import_picocolors13.default.cyan(v)}`);
 }
 
@@ -19428,7 +19598,7 @@ function checkForUpdates() {
   if (process.env.CODEAM_DISABLE_UPDATE_CHECK === "1") return;
   if (process.env.CI) return;
   if (!process.stdout.isTTY) return;
-  const current = true ? "2.23.31" : null;
+  const current = true ? "2.23.33" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeam-cli",
-  "version": "2.23.31",
+  "version": "2.23.33",
   "description": "Workflow-continuity bridge for AI coding agents. Wrap Claude Code or Codex in a PTY and supervise, approve, and redirect the session from any device — async. The terminal companion for CodeAgent Mobile.",
   "type": "commonjs",
   "main": "dist/index.js",