chatroom-cli 1.23.8 → 1.25.0

package/dist/index.js

@@ -52767,7 +52767,7 @@ async function viewStep(chatroomId, options, deps) {
       }
       if (spec.skills) {
         console.log("");
-        console.log("Skills:");
+        console.log("Skills (activate before starting):");
         console.log(spec.skills);
       }
       if (spec.requirements) {
@@ -54411,6 +54411,45 @@ async function getAllPRs(cwd) {
     return [];
   }
 }
+async function getPRCommits(cwd, prNumber) {
+  const repoSlug = await getOriginRepoSlug(cwd);
+  const repoFlag = repoSlug ? ` --repo ${JSON.stringify(repoSlug)}` : "";
+  const result = await runCommand(`gh pr view ${prNumber} --json commits${repoFlag}`, cwd);
+  if ("error" in result) {
+    return [];
+  }
+  const output = result.stdout.trim();
+  if (!output)
+    return [];
+  try {
+    const parsed = JSON.parse(output);
+    if (typeof parsed !== "object" || parsed === null || !("commits" in parsed))
+      return [];
+    const commits = parsed.commits;
+    if (!Array.isArray(commits))
+      return [];
+    return commits.map((c) => {
+      const commit = c;
+      const oid = typeof commit.oid === "string" ? commit.oid : "";
+      const headline = typeof commit.messageHeadline === "string" ? commit.messageHeadline : "";
+      const date = typeof commit.committedDate === "string" ? commit.committedDate : "";
+      let authorLogin = "";
+      if (Array.isArray(commit.authors) && commit.authors.length > 0) {
+        const first = commit.authors[0];
+        authorLogin = typeof first.login === "string" ? first.login : typeof first.name === "string" ? first.name : "";
+      }
+      return {
+        sha: oid,
+        shortSha: oid.slice(0, 7),
+        message: headline,
+        author: authorLogin,
+        date
+      };
+    });
+  } catch {
+    return [];
+  }
+}
 async function getRemotes(cwd) {
   const result = await runGit("remote -v", cwd);
   if ("error" in result)
@@ -54442,6 +54481,43 @@ async function getCommitsAhead(workingDir) {
   const count = parseInt(result.stdout.trim(), 10);
   return Number.isNaN(count) ? 0 : count;
 }
+async function getCommitStatusChecks(cwd, ref) {
+  const repoSlug = await getOriginRepoSlug(cwd);
+  if (!repoSlug)
+    return null;
+  try {
+    const [checkRunsResult, statusResult] = await Promise.all([
+      runCommand(`gh api repos/${repoSlug}/commits/${encodeURIComponent(ref)}/check-runs --jq '{check_runs: [.check_runs[] | {name: .name, status: .status, conclusion: .conclusion}], total_count: .total_count}'`, cwd),
+      runCommand(`gh api repos/${repoSlug}/commits/${encodeURIComponent(ref)}/status --jq '.state'`, cwd)
+    ]);
+    if ("error" in checkRunsResult || "error" in statusResult)
+      return null;
+    const checkRunsData = JSON.parse(checkRunsResult.stdout.trim());
+    const combinedState = statusResult.stdout.trim() || "pending";
+    let state = combinedState;
+    if (checkRunsData.total_count > 0) {
+      const conclusions = checkRunsData.check_runs.map((cr) => cr.conclusion);
+      if (conclusions.some((c) => c === "failure" || c === "timed_out")) {
+        state = "failure";
+      } else if (conclusions.every((c) => c === "success" || c === "skipped" || c === "neutral")) {
+        state = "success";
+      } else if (checkRunsData.check_runs.some((cr) => cr.status !== "completed")) {
+        state = "pending";
+      }
+    }
+    return {
+      state,
+      checkRuns: checkRunsData.check_runs.map((cr) => ({
+        name: cr.name,
+        status: cr.status,
+        conclusion: cr.conclusion
+      })),
+      totalCount: checkRunsData.total_count
+    };
+  } catch {
+    return null;
+  }
+}
 var execAsync2;
 var init_git_reader = __esm(() => {
   execAsync2 = promisify2(exec2);
@@ -54597,6 +54673,21 @@ async function processPRAction(ctx, req) {
     console.warn(`[${formatTimestamp()}] ⚠️  Failed to refresh git state after PR action: ${getErrorMessage(err)}`);
   });
 }
+async function processPRCommits(ctx, req) {
+  const prNumber = req.prNumber;
+  if (!prNumber) {
+    throw new Error("pr_commits request missing prNumber");
+  }
+  const commits = await getPRCommits(req.workingDir, prNumber);
+  await ctx.deps.backend.mutation(api.workspaces.upsertPRCommits, {
+    sessionId: ctx.sessionId,
+    machineId: ctx.machineId,
+    workingDir: req.workingDir,
+    prNumber,
+    commits
+  });
+  console.log(`[${formatTimestamp()}] \uD83D\uDCCB PR commits pushed: ${req.workingDir} (#${prNumber}, ${commits.length} commits)`);
+}
 async function processCommitDetail(ctx, req) {
   if (!req.sha) {
     throw new Error("commit_detail request missing sha");
@@ -54694,6 +54785,9 @@ async function processRequests(ctx, requests, processedRequestIds, dedupTtlMs) {
         case "pr_action":
           await processPRAction(ctx, req);
           break;
+        case "pr_commits":
+          await processPRCommits(ctx, req);
+          break;
       }
       await ctx.deps.backend.mutation(api.workspaces.updateRequestStatus, {
         sessionId: ctx.sessionId,
@@ -54784,11 +54878,12 @@ async function pushSingleWorkspaceGitState(ctx, workingDir) {
   }
   const openPRs = await getOpenPRsForBranch(workingDir, branchResult.branch);
   const allPRs = await getAllPRs(workingDir);
+  const headCommitStatus = await getCommitStatusChecks(workingDir, branchResult.branch);
   const branch = branchResult.branch;
   const isDirty2 = dirtyResult;
   const diffStat = diffStatResult.status === "available" ? diffStatResult.diffStat : { filesChanged: 0, insertions: 0, deletions: 0 };
   const hasMoreCommits = commits.length >= COMMITS_PER_PAGE;
-  const stateHash = createHash3("md5").update(JSON.stringify({ branch, isDirty: isDirty2, diffStat, commitsAhead, shas: commits.map((c) => c.sha), prs: openPRs.map((pr) => pr.number), allPrs: allPRs.map((pr) => `${pr.number}:${pr.state}`), remotes: remotes.map((r) => `${r.name}:${r.url}`) })).digest("hex");
+  const stateHash = createHash3("md5").update(JSON.stringify({ branch, isDirty: isDirty2, diffStat, commitsAhead, shas: commits.map((c) => c.sha), prs: openPRs.map((pr) => pr.number), allPrs: allPRs.map((pr) => `${pr.number}:${pr.state}`), remotes: remotes.map((r) => `${r.name}:${r.url}`), headCommitStatus })).digest("hex");
   if (ctx.lastPushedGitState.get(stateKey) === stateHash) {
     return;
   }
@@ -54805,7 +54900,8 @@ async function pushSingleWorkspaceGitState(ctx, workingDir) {
     openPullRequests: openPRs,
     allPullRequests: allPRs,
     remotes,
-    commitsAhead
+    commitsAhead,
+    headCommitStatus
   });
   ctx.lastPushedGitState.set(stateKey, stateHash);
   console.log(`[${formatTimestamp()}] \uD83D\uDD00 Git state pushed: ${workingDir} (${branch}${isDirty2 ? ", dirty" : ", clean"})`);
@@ -54887,142 +54983,6 @@ var init_git_heartbeat = __esm(() => {
   init_convex_error();
 });
 
-// src/infrastructure/services/workspace/file-tree-scanner.ts
-import { exec as exec4 } from "node:child_process";
-import { promisify as promisify4 } from "node:util";
-async function scanFileTree(rootDir, options) {
-  const maxEntries = options?.maxEntries ?? DEFAULT_MAX_ENTRIES;
-  const scannedAt = Date.now();
-  const filePaths = await getGitFiles(rootDir);
-  const filteredPaths = filePaths.filter((p) => !isExcluded(p));
-  const entries = buildEntries(filteredPaths, rootDir, maxEntries);
-  return {
-    entries,
-    scannedAt,
-    rootDir
-  };
-}
-async function getGitFiles(rootDir) {
-  const env2 = {
-    ...process.env,
-    GIT_TERMINAL_PROMPT: "0",
-    GIT_PAGER: "cat",
-    NO_COLOR: "1"
-  };
-  try {
-    const tracked = await execAsync3("git ls-files", {
-      cwd: rootDir,
-      env: env2,
-      maxBuffer: 10 * 1024 * 1024
-    });
-    const untracked = await execAsync3("git ls-files --others --exclude-standard", {
-      cwd: rootDir,
-      env: env2,
-      maxBuffer: 10 * 1024 * 1024
-    });
-    const trackedFiles = parseLines(tracked.stdout);
-    const untrackedFiles = parseLines(untracked.stdout);
-    const allFiles = new Set([...trackedFiles, ...untrackedFiles]);
-    return Array.from(allFiles);
-  } catch {
-    return [];
-  }
-}
-function parseLines(output) {
-  return output.split(`
-`).map((line) => line.trim()).filter((line) => line.length > 0);
-}
-function isExcluded(filePath) {
-  const segments = filePath.split("/");
-  return segments.some((segment) => ALWAYS_EXCLUDE.has(segment));
-}
-function buildEntries(filePaths, rootDir, maxEntries) {
-  const directories = new Set;
-  for (const filePath of filePaths) {
-    const parts = filePath.split("/");
-    for (let i2 = 1;i2 < parts.length; i2++) {
-      directories.add(parts.slice(0, i2).join("/"));
-    }
-  }
-  const entries = [];
-  const sortedDirs = Array.from(directories).sort();
-  for (const dir of sortedDirs) {
-    if (entries.length >= maxEntries)
-      break;
-    entries.push({ path: dir, type: "directory" });
-  }
-  const sortedFiles = filePaths.slice().sort();
-  for (const file of sortedFiles) {
-    if (entries.length >= maxEntries)
-      break;
-    entries.push({ path: file, type: "file" });
-  }
-  return entries;
-}
-var execAsync3, DEFAULT_MAX_ENTRIES = 1e4, ALWAYS_EXCLUDE;
-var init_file_tree_scanner = __esm(() => {
-  execAsync3 = promisify4(exec4);
-  ALWAYS_EXCLUDE = new Set([
-    "node_modules",
-    ".git",
-    "dist",
-    "build",
-    ".next",
-    "coverage",
-    "__pycache__",
-    ".turbo"
-  ]);
-});
-
-// src/commands/machine/daemon-start/file-tree-heartbeat.ts
-import { createHash as createHash4 } from "node:crypto";
-async function pushFileTree(ctx) {
-  let workspaces;
-  try {
-    workspaces = await ctx.deps.backend.query(api.workspaces.listWorkspacesForMachine, {
-      sessionId: ctx.sessionId,
-      machineId: ctx.machineId
-    });
-  } catch (err) {
-    console.warn(`[${formatTimestamp()}] ⚠️ Failed to query workspaces for file tree sync: ${getErrorMessage(err)}`);
-    return;
-  }
-  const uniqueWorkingDirs = new Set(workspaces.map((ws) => ws.workingDir));
-  if (uniqueWorkingDirs.size === 0)
-    return;
-  for (const workingDir of uniqueWorkingDirs) {
-    try {
-      await pushSingleWorkspaceFileTree(ctx, workingDir);
-    } catch (err) {
-      console.warn(`[${formatTimestamp()}] ⚠️  File tree push failed for ${workingDir}: ${getErrorMessage(err)}`);
-    }
-  }
-}
-async function pushSingleWorkspaceFileTree(ctx, workingDir) {
-  const tree = await scanFileTree(workingDir);
-  const treeJson = JSON.stringify(tree);
-  const stateKey = `filetree:${ctx.machineId}::${workingDir}`;
-  const treeHash = createHash4("md5").update(treeJson).digest("hex");
-  if (ctx.lastPushedGitState.get(stateKey) === treeHash) {
-    return;
-  }
-  await ctx.deps.backend.mutation(api.workspaceFiles.syncFileTree, {
-    sessionId: ctx.sessionId,
-    machineId: ctx.machineId,
-    workingDir,
-    treeJson,
-    treeHash,
-    scannedAt: tree.scannedAt
-  });
-  ctx.lastPushedGitState.set(stateKey, treeHash);
-  console.log(`[${formatTimestamp()}] \uD83D\uDCC1 File tree pushed: ${workingDir} (${tree.entries.length} entries)`);
-}
-var init_file_tree_heartbeat = __esm(() => {
-  init_api3();
-  init_file_tree_scanner();
-  init_convex_error();
-});
-
 // src/infrastructure/services/workspace/workspace-resolver.ts
 import { readFile as readFile2, readdir, stat } from "node:fs/promises";
 import { join as join8, basename, resolve as resolve3 } from "node:path";
@@ -55278,7 +55238,7 @@ var init_command_discovery = __esm(() => {
 });
 
 // src/commands/machine/daemon-start/command-sync-heartbeat.ts
-import { createHash as createHash5 } from "node:crypto";
+import { createHash as createHash4 } from "node:crypto";
 async function pushCommands(ctx) {
   let workspaces;
   try {
@@ -55304,7 +55264,7 @@ async function pushCommands(ctx) {
 async function pushSingleWorkspaceCommands(ctx, workingDir) {
   const commands = await discoverCommands(workingDir);
   const stateKey = `commands:${ctx.machineId}::${workingDir}`;
-  const commandsHash = createHash5("md5").update(JSON.stringify(commands)).digest("hex");
+  const commandsHash = createHash4("md5").update(JSON.stringify(commands)).digest("hex");
   if (ctx.lastPushedGitState.get(stateKey) === commandsHash) {
     return;
   }
@@ -55486,6 +55446,153 @@ var init_file_content_subscription = __esm(() => {
   init_convex_error();
 });
 
+// src/infrastructure/services/workspace/file-tree-scanner.ts
+import { exec as exec4 } from "node:child_process";
+import { promisify as promisify4 } from "node:util";
+async function scanFileTree(rootDir, options) {
+  const maxEntries = options?.maxEntries ?? DEFAULT_MAX_ENTRIES;
+  const scannedAt = Date.now();
+  const filePaths = await getGitFiles(rootDir);
+  const filteredPaths = filePaths.filter((p) => !isExcluded(p));
+  const entries = buildEntries(filteredPaths, rootDir, maxEntries);
+  return {
+    entries,
+    scannedAt,
+    rootDir
+  };
+}
+async function getGitFiles(rootDir) {
+  const env2 = {
+    ...process.env,
+    GIT_TERMINAL_PROMPT: "0",
+    GIT_PAGER: "cat",
+    NO_COLOR: "1"
+  };
+  try {
+    const tracked = await execAsync3("git ls-files", {
+      cwd: rootDir,
+      env: env2,
+      maxBuffer: 10 * 1024 * 1024
+    });
+    const untracked = await execAsync3("git ls-files --others --exclude-standard", {
+      cwd: rootDir,
+      env: env2,
+      maxBuffer: 10 * 1024 * 1024
+    });
+    const trackedFiles = parseLines(tracked.stdout);
+    const untrackedFiles = parseLines(untracked.stdout);
+    const allFiles = new Set([...trackedFiles, ...untrackedFiles]);
+    return Array.from(allFiles);
+  } catch {
+    return [];
+  }
+}
+function parseLines(output) {
+  return output.split(`
+`).map((line) => line.trim()).filter((line) => line.length > 0);
+}
+function isExcluded(filePath) {
+  const segments = filePath.split("/");
+  return segments.some((segment) => ALWAYS_EXCLUDE.has(segment));
+}
+function buildEntries(filePaths, rootDir, maxEntries) {
+  const directories = new Set;
+  for (const filePath of filePaths) {
+    const parts = filePath.split("/");
+    for (let i2 = 1;i2 < parts.length; i2++) {
+      directories.add(parts.slice(0, i2).join("/"));
+    }
+  }
+  const entries = [];
+  const sortedDirs = Array.from(directories).sort();
+  for (const dir of sortedDirs) {
+    if (entries.length >= maxEntries)
+      break;
+    entries.push({ path: dir, type: "directory" });
+  }
+  const sortedFiles = filePaths.slice().sort();
+  for (const file of sortedFiles) {
+    if (entries.length >= maxEntries)
+      break;
+    entries.push({ path: file, type: "file" });
+  }
+  return entries;
+}
+var execAsync3, DEFAULT_MAX_ENTRIES = 1e4, ALWAYS_EXCLUDE;
+var init_file_tree_scanner = __esm(() => {
+  execAsync3 = promisify4(exec4);
+  ALWAYS_EXCLUDE = new Set([
+    "node_modules",
+    ".git",
+    "dist",
+    "build",
+    ".next",
+    "coverage",
+    "__pycache__",
+    ".turbo"
+  ]);
+});
+
+// src/commands/machine/daemon-start/file-tree-subscription.ts
+import { createHash as createHash5 } from "node:crypto";
+function startFileTreeSubscription(ctx, wsClient2) {
+  let processing = false;
+  const unsubscribe = wsClient2.onUpdate(api.workspaceFiles.getPendingFileTreeRequests, {
+    sessionId: ctx.sessionId,
+    machineId: ctx.machineId
+  }, (requests) => {
+    if (!requests || requests.length === 0)
+      return;
+    if (processing)
+      return;
+    processing = true;
+    fulfillFileTreeRequests(ctx, requests).catch((err) => {
+      console.warn(`[${formatTimestamp()}] ⚠️  File tree subscription processing failed: ${getErrorMessage(err)}`);
+    }).finally(() => {
+      processing = false;
+    });
+  }, (err) => {
+    console.warn(`[${formatTimestamp()}] ⚠️  File tree subscription error: ${getErrorMessage(err)}`);
+  });
+  console.log(`[${formatTimestamp()}] \uD83C\uDF33 File tree subscription started (reactive)`);
+  return {
+    stop: () => {
+      unsubscribe();
+      console.log(`[${formatTimestamp()}] \uD83C\uDF33 File tree subscription stopped`);
+    }
+  };
+}
+async function fulfillFileTreeRequests(ctx, requests) {
+  for (const request of requests) {
+    try {
+      const tree = await scanFileTree(request.workingDir);
+      const treeJson = JSON.stringify(tree);
+      const treeHash = createHash5("md5").update(treeJson).digest("hex");
+      await ctx.deps.backend.mutation(api.workspaceFiles.syncFileTree, {
+        sessionId: ctx.sessionId,
+        machineId: ctx.machineId,
+        workingDir: request.workingDir,
+        treeJson,
+        treeHash,
+        scannedAt: tree.scannedAt
+      });
+      await ctx.deps.backend.mutation(api.workspaceFiles.fulfillFileTreeRequest, {
+        sessionId: ctx.sessionId,
+        machineId: ctx.machineId,
+        workingDir: request.workingDir
+      });
+      console.log(`[${formatTimestamp()}] \uD83C\uDF33 File tree fulfilled: ${request.workingDir} (${tree.entries.length} entries)`);
+    } catch (err) {
+      console.warn(`[${formatTimestamp()}] ⚠️  File tree fulfillment failed for ${request.workingDir}: ${getErrorMessage(err)}`);
+    }
+  }
+}
+var init_file_tree_subscription = __esm(() => {
+  init_api3();
+  init_file_tree_scanner();
+  init_convex_error();
+});
+
 // src/commands/machine/daemon-start/handlers/ping.ts
 function handlePing() {
   console.log(`   ↪ Responding: pong`);
@@ -57110,9 +57217,6 @@ async function startCommandLoop(ctx) {
       pushGitState(ctx).catch((err) => {
         console.warn(`[${formatTimestamp()}] ⚠️  Git state push failed: ${getErrorMessage(err)}`);
       });
-      pushFileTree(ctx).catch((err) => {
-        console.warn(`[${formatTimestamp()}] ⚠️  File tree push failed: ${getErrorMessage(err)}`);
-      });
       pushCommands(ctx).catch((err) => {
         console.warn(`[${formatTimestamp()}] ⚠️  Command sync failed: ${getErrorMessage(err)}`);
       });
@@ -57123,8 +57227,8 @@ async function startCommandLoop(ctx) {
   heartbeatTimer.unref();
   let gitSubscriptionHandle = null;
   let fileContentSubscriptionHandle = null;
+  let fileTreeSubscriptionHandle = null;
   pushGitState(ctx).catch(() => {});
-  pushFileTree(ctx).catch(() => {});
   pushCommands(ctx).catch(() => {});
   const shutdown = async () => {
     console.log(`
@@ -57134,6 +57238,8 @@ async function startCommandLoop(ctx) {
       gitSubscriptionHandle.stop();
     if (fileContentSubscriptionHandle)
       fileContentSubscriptionHandle.stop();
+    if (fileTreeSubscriptionHandle)
+      fileTreeSubscriptionHandle.stop();
     await onDaemonShutdown(ctx);
     if (ctx.stopLocalApi) {
       await ctx.stopLocalApi().catch(() => {});
@@ -57147,6 +57253,7 @@ async function startCommandLoop(ctx) {
   const wsClient2 = await getConvexWsClient();
   gitSubscriptionHandle = startGitRequestSubscription(ctx, wsClient2);
   fileContentSubscriptionHandle = startFileContentSubscription(ctx, wsClient2);
+  fileTreeSubscriptionHandle = startFileTreeSubscription(ctx, wsClient2);
   console.log(`
 Listening for commands...`);
   console.log(`Press Ctrl+C to stop
@@ -57189,9 +57296,9 @@ var init_command_loop = __esm(() => {
   init_on_request_stop_agent();
   init_pid();
   init_git_heartbeat();
-  init_file_tree_heartbeat();
   init_command_sync_heartbeat();
   init_file_content_subscription();
+  init_file_tree_subscription();
   init_git_subscription();
   init_command_runner();
   init_init2();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatroom-cli",
-  "version": "1.23.8",
+  "version": "1.25.0",
   "description": "CLI for multi-agent chatroom collaboration",
   "type": "module",
   "bin": {