@4pm/cli 1.4.3 → 1.4.5

package/dist/index.js

@@ -33663,6 +33663,10 @@ var WsChannels = {
   USAGE_REPORT: "usage.report",
   // cli → server: Claude subscription usage snapshot (5h / weekly — ADR-0072)
   MACHINE_USAGE: "machine.usage",
+  // cli → server: last-run result of an external tool (claude/codex/gh/glab/git — ADR-0223).
+  // One-way, sent immediately after each direct tool invocation (last-wins per tool); the
+  // server merges it into `MachineLink.usageSnapshot.toolHealth` for the admin pool lists.
+  TOOL_HEALTH: "tool.health",
   // cli → server: durable per-command history record on finish (ADR-0072)
   COMMAND_HISTORY: "command.history",
   // cli → server: periodic upload of the cli's own JSONL log file (ADR-0122) — stored
@@ -34011,6 +34015,24 @@ async function runCommand(dispatch, emit) {
   });
 }
 
+// src/core/tool-health.ts
+var sink = null;
+function setToolHealthSink(fn) {
+  sink = fn;
+}
+function reportToolResult(tool, ok, message) {
+  try {
+    const reason = (message ?? "").trim().slice(0, 200);
+    sink?.({
+      tool,
+      ok,
+      message: ok ? null : reason || "failed",
+      at: (/* @__PURE__ */ new Date()).toISOString()
+    });
+  } catch {
+  }
+}
+
 // src/core/ai-stream.ts
 function assistantText(ev) {
   const parts = ev.message?.content ?? [];
@@ -34117,8 +34139,11 @@ function runAttempt(commandId, cmd, args, cwd2, env3, onChunk) {
 async function runAiFailover(plan, commandId, cwd2, handlers) {
   const total = plan.attempts.length;
   let finalExit = -1;
+  let lastCmd = plan.attempts[0]?.cmd ?? "claude";
+  let lastCaptured = "";
   for (let i = 0; i < total; i++) {
     const attempt = plan.attempts[i];
+    lastCmd = attempt.cmd;
     if (total > 1) handlers.onAttemptStart(attempt.label, i, total, attempt.cmd);
     const parser = createAiStreamParser(attempt.cmd);
     let captured = "";
@@ -34135,17 +34160,26 @@ async function runAiFailover(plan, commandId, cwd2, handlers) {
       captured += tail;
       handlers.onChunk(tail);
     }
+    lastCaptured = captured;
     if (finalExit === 0) {
       const usage = parser.usage();
       if (usage.tokens === 0) usage.tokens = estimateTokens(captured);
+      reportToolResult(attempt.cmd, true);
       return { exitCode: 0, workedDir: attempt.dir, workedKey: attempt.key, workedCmd: attempt.cmd, usage };
     }
     const reason = isAuthFailure(captured) ? "auth" : isSessionLimit(captured) ? "limit" : null;
     if (!reason || i === total - 1) break;
     handlers.onAttemptFail(attempt.label, reason);
   }
+  reportToolResult(lastCmd, false, summarizeAiFailure(lastCaptured, finalExit));
   return { exitCode: finalExit, workedDir: null, workedKey: null, workedCmd: null, usage: { tokens: 0, input: 0, output: 0, cacheRead: 0, cacheCreation: 0 } };
 }
+function summarizeAiFailure(captured, exitCode) {
+  if (isAuthFailure(captured)) return "Not logged in";
+  if (isSessionLimit(captured)) return "Usage limit reached";
+  const firstLine = captured.split("\n").map((l) => l.trim()).find((l) => l.length > 0);
+  return firstLine || `exited ${exitCode}`;
+}
 
 // src/core/ai-profile-state.ts
 import { existsSync as existsSync5, readFileSync as readFileSync7, writeFileSync as writeFileSync4 } from "fs";
@@ -34872,6 +34906,7 @@ import { createHash as createHash3 } from "crypto";
 import { existsSync as existsSync8, mkdirSync as mkdirSync4, readdirSync as readdirSync4, readFileSync as readFileSync12, statSync as statSync3 } from "fs";
 import { join as join12 } from "path";
 import { promisify as promisify2 } from "util";
+var NO_USAGE = { tokens: 0, input: 0, output: 0, cacheRead: 0, cacheCreation: 0 };
 var execFileAsync = promisify2(execFile2);
 var MAX_CONTEXT_CHARS = 12e4;
 var ANSWER_TIMEOUT_MS = 12e4;
@@ -34958,13 +34993,19 @@ function buildPrompt(docs, question, askerRole) {
 }
 function runClaudeOnce(cmd, profile, prompt, extraEnv) {
   return new Promise((resolve8, reject) => {
-    const args = ["-p", ...profile?.model ? ["--model", profile.model] : []];
+    const isClaude = cmd.includes("claude");
+    const args = [
+      "-p",
+      ...profile?.model ? ["--model", profile.model] : [],
+      ...isClaude ? ["--output-format", "stream-json", "--verbose"] : []
+    ];
     const env3 = {
       ...process.env,
       ...extraEnv,
       ...profile ? { CLAUDE_CONFIG_DIR: profile.dir } : {}
     };
     const child = spawn4(cmd, args, { stdio: ["pipe", "pipe", "pipe"], env: env3 });
+    const parser = createAiStreamParser(cmd);
     let out = "";
     let err = "";
     const timer = setTimeout(() => {
@@ -34972,7 +35013,7 @@ function runClaudeOnce(cmd, profile, prompt, extraEnv) {
       reject(new Error("claude answer timed out"));
     }, ANSWER_TIMEOUT_MS);
     timer.unref();
-    child.stdout.on("data", (d) => out += d.toString());
+    child.stdout.on("data", (d) => out += parser.push(d.toString()));
     child.stderr.on("data", (d) => err += d.toString());
     child.on("error", (e) => {
       clearTimeout(timer);
@@ -34980,7 +35021,8 @@ function runClaudeOnce(cmd, profile, prompt, extraEnv) {
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve8({ code: code ?? -1, out, err });
+      out += parser.flush();
+      resolve8({ code: code ?? -1, out, err, usage: parser.usage() });
     });
     child.stdin.write(prompt);
     child.stdin.end();
@@ -34990,8 +35032,8 @@ async function runClaudeWithFailover(prompt, ai) {
   const attempts = ai.profiles.length > 0 ? ai.profiles : [null];
   let lastReason = "no attempt";
   for (let i = 0; i < attempts.length; i++) {
-    const { code, out, err } = await runClaudeOnce(ai.cmd, attempts[i], prompt, ai.env);
-    if (code === 0 && out.trim()) return out.trim();
+    const { code, out, err, usage } = await runClaudeOnce(ai.cmd, attempts[i], prompt, ai.env);
+    if (code === 0 && out.trim()) return { text: out.trim(), usage };
     const combined = err || out;
     lastReason = `exited ${code}: ${combined.slice(0, 500)}`;
     if (!isAuthFailure(combined) && !isSessionLimit(combined) || i === attempts.length - 1) break;
@@ -35003,9 +35045,25 @@ async function runSupportAnswer(req, ai, profileDir2) {
     const dir2 = await ensureRepo(profileDir2, req.repo);
     const docs = collectDocs(dir2);
     if (!docs.trim()) return { body: "", error: "KB repo has no documentation" };
-    const body = await runClaudeWithFailover(buildPrompt(docs, req.question, req.askerRole), ai);
-    if (!body) return { body: "", error: "empty answer" };
-    return { body };
+    const { text, usage } = await runClaudeWithFailover(
+      buildPrompt(docs, req.question, req.askerRole),
+      ai
+    );
+    if (!text) return { body: "", error: "empty answer" };
+    const u = usage.tokens > 0 ? usage : { ...NO_USAGE, tokens: estimateTokens(text) };
+    return {
+      body: text,
+      tokens: u.tokens,
+      ...usage.tokens > 0 ? {
+        tokensBreakdown: {
+          input: usage.input,
+          output: usage.output,
+          cacheRead: usage.cacheRead,
+          cacheCreation: usage.cacheCreation
+        }
+      } : {},
+      finishedAt: (/* @__PURE__ */ new Date()).toISOString()
+    };
   } catch (err) {
     logger.warn("support.answer.failed", { error: String(err) });
     return { body: "", error: String(err) };
@@ -35068,7 +35126,10 @@ async function runKnowledgeCompose(req, ai, physicRoot) {
   for (let i = 0; i < attempts.length; i++) {
     try {
       const { code, out, err } = await runOnce(ai.cmd, attempts[i], prompt, physicRoot, ai.env);
-      if (code === 0 && out.trim()) return { bodyMarkdown: out.trim() };
+      if (code === 0 && out.trim()) {
+        reportToolResult(ai.cmd, true);
+        return { bodyMarkdown: out.trim() };
+      }
       const combined = err || out;
       lastReason = `exited ${code}: ${combined.slice(0, 500)}`;
       if (!isAuthFailure(combined) && !isSessionLimit(combined) || i === attempts.length - 1) break;
@@ -35077,6 +35138,7 @@ async function runKnowledgeCompose(req, ai, physicRoot) {
       break;
     }
   }
+  reportToolResult(ai.cmd, false, lastReason);
   return { bodyMarkdown: "", error: lastReason };
 }
 
@@ -36961,6 +37023,7 @@ var WsClient = class {
         socket.on("close", (code) => {
           this.clearHeartbeat();
           this.sessionKey = null;
+          setToolHealthSink(null);
           logger.debug("ws.close", { code });
           if (code === CLOSE_DRAINING) {
             this.bus.log("Server draining \u2014 will reconnect (backoff + jitter).");
@@ -37002,6 +37065,7 @@ var WsClient = class {
         this.startUsagePolling();
         this.startLogUpload();
         this.startKbRefresh();
+        setToolHealthSink((report) => this.send(WsChannels.TOOL_HEALTH, report));
         this.connectWaiters.splice(0).forEach((fn) => fn());
         return;
       }
@@ -37174,6 +37238,7 @@ var WsClient = class {
             this.bus.push({ source: "server", kind: "aires", text: `${supportCmd} \u203A` });
             this.bus.push({ source: "server", kind: "out", text: reply.body });
           }
+          reportToolResult(supportCmd, !reply.error, reply.error);
           this.send(WsChannels.SUPPORT_ANSWER, reply, message.id);
         }).finally(() => this.bus.endBusy("support-answer"));
         break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4pm/cli",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "private": false,
   "description": "4PM CLI — drives Claude/Codex CLIs on AI worker machines (Node + TypeScript)",
   "license": "LicenseRef-4PM-Source-Available",