@4pm/cli 1.20.0 → 1.21.0

package/dist/index.js

@@ -42819,12 +42819,13 @@ function authedUrl2(url, token) {
   if (url.startsWith("https://")) return url.replace("https://", `https://x-access-token:${token}@`);
   return url;
 }
-function buildPrompt4(tickets) {
+function buildPrompt4(tickets, customPrompt) {
   const transcript = tickets.map((t2) => {
     const thread = t2.messages.map((m2) => `  [${m2.author}] ${m2.body}`).join("\n");
     return `### Ticket ${t2.id} \u2014 ${t2.subject} (${t2.category})
 ${thread}`;
   }).join("\n\n");
+  const ids = tickets.map((t2) => t2.id);
   return [
     "You are maintaining the 4PM product FAQ, stored as markdown in THIS git repository (your CWD).",
     "From the resolved support tickets below, distil reusable, product-general FAQ entries and add or",
@@ -42839,11 +42840,45 @@ ${thread}`;
     "- Only edit markdown documentation files; do not touch code, CI, or unrelated files.",
     "- Do NOT run git commit/push or open a PR yourself \u2014 just leave the edited files in the working",
     "  tree; the surrounding tooling handles commit + PR.",
+    ...customPrompt?.trim() ? ["", "Additional instruction from the operator (follow it too):", customPrompt.trim()] : [],
     "",
     "===== RESOLVED TICKETS =====",
-    transcript
+    transcript,
+    "",
+    "===== REQUIRED FINAL OUTPUT =====",
+    "After finishing all file edits, output \u2014 as the LAST thing, on its own \u2014 a single fenced JSON",
+    "block summarizing what you did PER TICKET (created/updated which FAQ entry, or skipped + why):",
+    "```json",
+    `{"perTicket":[${ids.map((id) => `{"ticketId":"${id}","summary":"..."}`).join(",")}]}`,
+    "```",
+    "Include exactly one entry per ticket id above; keep each summary to one or two sentences."
   ].join("\n");
 }
+function parsePerTicket(text) {
+  const idx = text.lastIndexOf('"perTicket"');
+  if (idx === -1) return [];
+  const open = text.lastIndexOf("{", idx);
+  if (open === -1) return [];
+  let depth = 0;
+  for (let i = open; i < text.length; i++) {
+    if (text[i] === "{") depth++;
+    else if (text[i] === "}") {
+      depth--;
+      if (depth === 0) {
+        try {
+          const obj = JSON.parse(text.slice(open, i + 1));
+          if (Array.isArray(obj.perTicket)) {
+            return obj.perTicket.filter((e) => !!e && typeof e.ticketId === "string").map((e) => ({ ticketId: e.ticketId, summary: String(e.summary ?? "") }));
+          }
+        } catch {
+          return [];
+        }
+        return [];
+      }
+    }
+  }
+  return [];
+}
 function runClaudeOnce2(cmd, profile, prompt, cwd2, extraEnv) {
   return new Promise((resolve10, reject) => {
     const isClaude = cmd.includes("claude");
@@ -42889,12 +42924,13 @@ async function runClaudeWithFailover2(prompt, cwd2, ai2) {
   let lastReason = "no attempt";
   for (let i = 0; i < attempts.length; i++) {
     const { code, out, err, usage } = await runClaudeOnce2(ai2.cmd, attempts[i], prompt, cwd2, ai2.env);
-    if (code === 0) return usage;
+    if (code === 0) return { usage, text: out.trim() };
     lastReason = `exited ${code}: ${(err || out).slice(0, 500)}`;
     if (i === attempts.length - 1) break;
   }
   throw new Error(`claude ${lastReason}`);
 }
+var MAX_OUTPUT_CHARS = 8e3;
 async function runFaqCompose(req, ai2) {
   if (!req.repo.token) return { prUrl: "", error: "no write token" };
   const workDir = join24(tmpdir3(), "4pm-faq-sync", randomUUID3());
@@ -42906,10 +42942,14 @@ async function runFaqCompose(req, ai2) {
     await execFileAsync2("git", ["-C", workDir, "config", "user.name", "4PM FAQ Bot"], { env: gitEnv });
     await execFileAsync2("git", ["-C", workDir, "config", "user.email", "faq-bot@4pm.app"], { env: gitEnv });
     await execFileAsync2("git", ["-C", workDir, "checkout", "-b", req.headBranch], { env: gitEnv });
-    const usage = await runClaudeWithFailover2(buildPrompt4(req.tickets), workDir, ai2);
+    const { usage, text } = await runClaudeWithFailover2(buildPrompt4(req.tickets, req.customPrompt), workDir, ai2);
+    const output = text.slice(0, MAX_OUTPUT_CHARS);
+    const perTicket = parsePerTicket(text);
     await execFileAsync2("git", ["-C", workDir, "add", "-A"], { env: gitEnv });
     const staged = await execFileAsync2("git", ["-C", workDir, "diff", "--cached", "--name-only"], { env: gitEnv });
-    if (!staged.stdout.trim()) return { prUrl: "", tokens: usage.tokens || estimateTokens2(""), finishedAt: (/* @__PURE__ */ new Date()).toISOString() };
+    if (!staged.stdout.trim()) {
+      return { prUrl: "", output, perTicket, tokens: usage.tokens || estimateTokens2(text), finishedAt: (/* @__PURE__ */ new Date()).toISOString() };
+    }
     await execFileAsync2("git", ["-C", workDir, "commit", "-m", "docs(faq): synthesize from support tickets (4PM)"], { env: gitEnv });
     await execFileAsync2("git", ["-C", workDir, "push", "-u", "origin", req.headBranch], { env: gitEnv });
     let prUrl = "";
@@ -42927,6 +42967,8 @@ async function runFaqCompose(req, ai2) {
     return {
       prUrl,
       branch: req.headBranch,
+      output,
+      perTicket,
       tokens: u2.tokens,
       ...usage.tokens > 0 ? { tokensBreakdown: { input: usage.input, output: usage.output, cacheRead: usage.cacheRead, cacheCreation: usage.cacheCreation } } : {},
       finishedAt: (/* @__PURE__ */ new Date()).toISOString()

package/package.json

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