@4pm/cli 1.4.4 → 1.4.5

package/dist/index.js

@@ -34906,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;
@@ -34992,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(() => {
@@ -35006,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);
@@ -35014,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();
@@ -35024,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;
@@ -35037,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) };

package/package.json

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