jinzd-ai-cli 0.4.114 → 0.4.116

package/dist/index.js

@@ -14,6 +14,7 @@ import {
   buildWriteRoundReminder,
   clearDevState,
   computeCost,
+  detectMetaNarration,
   detectPseudoToolCalls,
   detectsHallucinatedFileOp,
   extractWrittenFilePaths,
@@ -31,10 +32,10 @@ import {
   setupProxy,
   stripPseudoToolCalls,
   stripToolCallReminder
-} from "./chunk-E24HT62E.js";
+} from "./chunk-QMT4T4PH.js";
 import {
   ConfigManager
-} from "./chunk-CP6PALA4.js";
+} from "./chunk-KRTQDZMY.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -53,10 +54,10 @@ import {
   spawnAgentContext,
   theme,
   undoStack
-} from "./chunk-XXKWSBRC.js";
+} from "./chunk-YTP26DOV.js";
 import "./chunk-3BICTI5M.js";
 import "./chunk-2DXY7UGF.js";
-import "./chunk-2WAF7FOX.js";
+import "./chunk-VJE5V4H2.js";
 import "./chunk-2ZD3YTVM.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
@@ -79,7 +80,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-UF62SHR7.js";
+} from "./chunk-H3F2E4MD.js";
 import {
   formatGitContextForPrompt,
   getGitContext,
@@ -411,6 +412,7 @@ var Renderer = class {
       buf = "";
     };
     let interrupted = false;
+    let streamErr = null;
     try {
       for await (const chunk of stream) {
         if (options?.signal?.aborted) {
@@ -435,41 +437,51 @@ var Renderer = class {
         interrupted = true;
         if (!inThinking) flushBuf();
       } else {
-        throw err;
+        streamErr = err;
       }
     }
     if (interrupted) {
       process.stdout.write(theme.dim(" [interrupted]\n"));
     }
     let tokensShown = false;
-    if (options?.showTokens) {
-      process.stdout.write("\n");
-      if (usage) {
-        const sessionTotal = options.sessionTotal;
-        const updatedTotal = sessionTotal ? { inputTokens: sessionTotal.inputTokens + usage.inputTokens, outputTokens: sessionTotal.outputTokens + usage.outputTokens } : void 0;
-        this.renderUsage(usage, updatedTotal);
-        tokensShown = true;
-      } else if (fullContent.length > 0) {
-        const est = Math.ceil(fullContent.length / 2.5);
-        process.stdout.write(theme.dim(`\u{1F4CA} ~${est.toLocaleString()} output tokens (estimated)
+    if (!streamErr) {
+      if (options?.showTokens) {
+        process.stdout.write("\n");
+        if (usage) {
+          const sessionTotal = options.sessionTotal;
+          const updatedTotal = sessionTotal ? { inputTokens: sessionTotal.inputTokens + usage.inputTokens, outputTokens: sessionTotal.outputTokens + usage.outputTokens } : void 0;
+          this.renderUsage(usage, updatedTotal);
+          tokensShown = true;
+        } else if (fullContent.length > 0) {
+          const est = Math.ceil(fullContent.length / 2.5);
+          process.stdout.write(theme.dim(`\u{1F4CA} ~${est.toLocaleString()} output tokens (estimated)
 
 `));
-        tokensShown = true;
+          tokensShown = true;
+        } else {
+          process.stdout.write("\n");
+        }
       } else {
-        process.stdout.write("\n");
+        process.stdout.write("\n\n");
       }
     } else {
-      process.stdout.write("\n\n");
+      process.stdout.write("\n");
     }
     if (fileStream) {
-      await new Promise((resolve3, reject) => {
-        fileStream.end((err) => err ? reject(err) : resolve3());
-      });
-      const kb = (Buffer.byteLength(fullContent, "utf-8") / 1024).toFixed(1);
-      process.stdout.write(theme.success(`  \u2705 Saved: ${options.saveToFile} (${kb} KB)
+      try {
+        await new Promise((resolve3) => {
+          fileStream.end(() => resolve3());
+        });
+      } catch {
+      }
+      if (!streamErr) {
+        const kb = (Buffer.byteLength(fullContent, "utf-8") / 1024).toFixed(1);
+        process.stdout.write(theme.success(`  \u2705 Saved: ${options.saveToFile} (${kb} KB)
 
 `));
+      }
     }
+    if (streamErr) throw streamErr;
     return { content: fullContent, usage, tokensShown };
   }
   renderResponse(content) {
@@ -964,6 +976,42 @@ var CommandRegistry = class {
     return [...this.commands.values()];
   }
 };
+async function promptSkillHistoryAction(ctx, fromLabel, toLabel) {
+  const session = ctx.sessions.current;
+  const msgCount = session?.messages.length ?? 0;
+  if (msgCount === 0 || !session) return true;
+  const choice = await ctx.select(
+    `Switching skill: ${fromLabel} \u2192 ${toLabel}  (${msgCount} message(s) in context)`,
+    [
+      { value: "clear", label: "Clear history", hint: "recommended \u2014 fresh start under new skill" },
+      { value: "fork", label: "Fork to new branch", hint: "preserve old branch, start fresh on new one" },
+      { value: "keep", label: "Keep history", hint: "old skill actions may bias new skill" },
+      { value: "cancel", label: "Cancel", hint: "do not switch skill" }
+    ],
+    0
+  );
+  if (!choice || choice === "cancel") return false;
+  if (choice === "clear") {
+    session.clear();
+    ctx.resetSessionTokenUsage();
+    ctx.clearDevState();
+    ctx.renderer.printInfo(`  History cleared (${msgCount} message(s) removed).`);
+  } else if (choice === "fork") {
+    try {
+      const branchTitle = toLabel === "(none)" ? `pre-deactivate-${fromLabel}` : `skill-${toLabel}`;
+      const newId = session.createBranch(0, branchTitle);
+      await ctx.sessions.save();
+      ctx.renderer.printInfo(`  Forked to fresh branch "${newId}" (old branch preserved).`);
+    } catch (err) {
+      ctx.renderer.renderError(`Fork failed: ${err.message}`);
+      return false;
+    }
+  }
+  if (choice === "keep") {
+    ctx.renderer.printInfo("  Keeping history. Use /clear later if the new skill misbehaves.");
+  }
+  return true;
+}
 function createDefaultCommands() {
   return [
     {
@@ -1600,7 +1648,7 @@ ${text}
           const { join: join6 } = await import("path");
           const { existsSync: existsSync6 } = await import("fs");
           const { getGitRoot: getGitRoot2 } = await import("./git-context-7KIP4X2V.js");
-          const { MCP_PROJECT_CONFIG_NAME: MCP_PROJECT_CONFIG_NAME2 } = await import("./constants-YEBRZDBP.js");
+          const { MCP_PROJECT_CONFIG_NAME: MCP_PROJECT_CONFIG_NAME2 } = await import("./constants-NWATGC4A.js");
           const { approveProject, hashMcpFile } = await import("./project-trust-IFM7FXEV.js");
           const cwd = process.cwd();
           const projectRoot = getGitRoot2(cwd) ?? cwd;
@@ -1863,7 +1911,7 @@ ${text}
       name: "skill",
       description: "Manage agent skills (reusable prompt packs)",
       usage: "/skill [name|off|list|reload]",
-      execute(args, ctx) {
+      async execute(args, ctx) {
         const sub = args[0]?.toLowerCase();
         const manager = ctx.getSkillManager();
         if (!manager) {
@@ -1896,10 +1944,13 @@ ${text}
           return;
         }
         if (sub === "off" || sub === "none" || sub === "deactivate") {
-          if (!manager.getActive()) {
+          const prev2 = manager.getActive();
+          if (!prev2) {
             ctx.renderer.printInfo("No skill is currently active.");
             return;
           }
+          const proceed2 = await promptSkillHistoryAction(ctx, prev2.meta.name, "(none)");
+          if (!proceed2) return;
           manager.deactivate();
           ctx.refreshPrompt();
           ctx.renderer.printSuccess("Skill deactivated.");
@@ -1910,11 +1961,19 @@ ${text}
           ctx.renderer.printSuccess(`Reloaded: ${count} skill(s) found.`);
           return;
         }
-        const skill = manager.activate(sub);
-        if (!skill) {
+        const target = manager.listSkills().find((s) => s.meta.name === sub);
+        if (!target) {
           ctx.renderer.renderError(`Skill '${sub}' not found. Use /skill list to see available skills.`);
           return;
         }
+        const prev = manager.getActive();
+        if (prev?.meta.name === sub) {
+          ctx.renderer.printInfo(`Skill '${sub}' is already active.`);
+          return;
+        }
+        const proceed = await promptSkillHistoryAction(ctx, prev?.meta.name ?? "(none)", sub);
+        if (!proceed) return;
+        const skill = manager.activate(sub);
         ctx.refreshPrompt();
         ctx.renderer.printSuccess(`Skill activated: ${skill.meta.name} \u2014 ${skill.meta.description}`);
         if (skill.meta.tools) {
@@ -2650,7 +2709,7 @@ ${hint}` : "")
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-7WN5Q7YV.js");
+          const { executeTests } = await import("./run-tests-QOZZHW4L.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -6260,10 +6319,71 @@ ${mcpBudgetNote}` : "");
                 _extraMessages: teeExtraMessages
               });
               const teeShowTokens = this.shouldShowTokens();
-              const { content: genContent, usage: genUsage, tokensShown: teeTokShown } = await this.renderer.renderStream(
-                genStream,
-                { saveToFile, showTokens: teeShowTokens, sessionTotal: teeShowTokens ? { ...this.sessionTokenUsage } : void 0, signal: teeAc.signal }
-              );
+              let genContent;
+              let genUsage;
+              let teeTokShown = false;
+              try {
+                const teeResult = await this.renderer.renderStream(
+                  genStream,
+                  { saveToFile, showTokens: teeShowTokens, sessionTotal: teeShowTokens ? { ...this.sessionTokenUsage } : void 0, signal: teeAc.signal }
+                );
+                genContent = teeResult.content;
+                genUsage = teeResult.usage;
+                teeTokShown = teeResult.tokensShown;
+              } catch (teeErr) {
+                try {
+                  unlinkSync2(saveToFile);
+                } catch {
+                }
+                const errMsg = teeErr instanceof Error ? teeErr.message : String(teeErr);
+                process.stdout.write(theme.error(
+                  `
+  \u2717 tee stream failed: ${errMsg}
+  ${saveToFile} (partial) was deleted. Asking model to retry.
+
+`
+                ));
+                const errorResults = result.toolCalls.map((tc) => ({
+                  callId: tc.id,
+                  content: tc.name === "save_last_response" ? `[save_last_response failed] streaming was interrupted: ${errMsg}. ${saveToFile} was NOT saved. Retry \u2014 and consider producing a more compact output (split very large reports across multiple save_last_response calls if the previous attempt timed out).` : `[skipped: save_last_response failed]`,
+                  isError: tc.name === "save_last_response"
+                }));
+                const reasoningContent3 = "reasoningContent" in result ? result.reasoningContent : void 0;
+                const newMsgs3 = provider.buildToolResultMessages(result.toolCalls, errorResults, reasoningContent3);
+                extraMessages.push(...newMsgs3);
+                continue;
+              }
+              const metaMatch = detectMetaNarration(genContent);
+              if (metaMatch) {
+                try {
+                  unlinkSync2(saveToFile);
+                } catch {
+                }
+                process.stdout.write(theme.error(
+                  `
+  \u2717 Rejected save: response was meta-narration / leaked reasoning, not document body (matched: ${metaMatch})
+  ${saveToFile} was deleted; asking model to retry.
+
+`
+                ));
+                const errorResults = result.toolCalls.map((tc) => ({
+                  callId: tc.id,
+                  content: tc.name === "save_last_response" ? `[save_last_response REJECTED] Your output was internal reasoning / meta-narration about the task (e.g. "Let me re-read\u2026", "the user is asking me to\u2026") instead of the requested document body. ${saveToFile} was NOT saved.
+
+This fresh stream has NO tools. Produce ONLY the document body: start with a markdown heading like "# \u5BA1\u8BA1\u62A5\u544A" / "# Audit Report" and write the full content. Do NOT narrate that you will produce the document \u2014 produce it.` : `[skipped: save_last_response was rejected and other parallel calls are abandoned]`,
+                  isError: tc.name === "save_last_response"
+                }));
+                const reasoningContent3 = "reasoningContent" in result ? result.reasoningContent : void 0;
+                const newMsgs3 = provider.buildToolResultMessages(result.toolCalls, errorResults, reasoningContent3);
+                extraMessages.push(...newMsgs3);
+                if (genUsage) {
+                  roundUsage.inputTokens += genUsage.inputTokens;
+                  roundUsage.outputTokens += genUsage.outputTokens;
+                  roundUsage.cacheCreationTokens += genUsage.cacheCreationTokens ?? 0;
+                  roundUsage.cacheReadTokens += genUsage.cacheReadTokens ?? 0;
+                }
+                continue;
+              }
               const pseudoMatch = detectPseudoToolCalls(genContent);
               if (pseudoMatch) {
                 const cleaned = stripPseudoToolCalls(genContent);
@@ -6882,11 +7002,11 @@ program.command("web").description("Start Web UI server with browser-based chat
     console.error("Error: Invalid port number. Must be between 1 and 65535.");
     process.exit(1);
   }
-  const { startWebServer } = await import("./server-AKG7HG36.js");
+  const { startWebServer } = await import("./server-IX6L4W2L.js");
   await startWebServer({ port, host: options.host });
 });
 program.command("user [action] [username]").description("Manage Web UI users (list | create <name> | delete <name> | reset-password <name> | logout-all <name> | migrate <name>)").action(async (action, username) => {
-  const { AuthManager } = await import("./auth-VBV7HTLQ.js");
+  const { AuthManager } = await import("./auth-7KK5BOCA.js");
   const config = new ConfigManager();
   const auth = new AuthManager(config.getConfigDir());
   if (!action || action === "list") {
@@ -7018,7 +7138,7 @@ program.command("sessions").description("List recent conversation sessions").act
 });
 program.command("batch <action> [arg] [arg2]").description("Anthropic Message Batches: submit | list | status <id> | results <id> [out] | cancel <id>").option("--dry-run", "Parse and validate input without submitting (submit only)").action(async (action, arg, arg2, options) => {
   try {
-    const batch = await import("./batch-Q5NQCXKN.js");
+    const batch = await import("./batch-GRHEH3JF.js");
     switch (action) {
       case "submit":
         if (!arg) {
@@ -7061,7 +7181,7 @@ program.command("batch <action> [arg] [arg2]").description("Anthropic Message Ba
   }
 });
 program.command("mcp-serve").description("Start an MCP server over STDIO, exposing aicli's built-in tools to Claude Desktop / Cursor / other MCP clients").option("--allow-destructive", "Allow bash / run_interactive / task_create (always destructive in MCP mode)").option("--allow-outside-cwd", "Allow tool path arguments to escape the sandbox root \u2014 disabled by default").option("--tools <list>", "Comma-separated whitelist of tools to expose (default: all eligible tools)").option("--cwd <path>", "Working directory AND sandbox root (default: current directory)").action(async (options) => {
-  const { startMcpServer } = await import("./server-NQ5J6FAL.js");
+  const { startMcpServer } = await import("./server-HI6GVBD3.js");
   await startMcpServer({
     allowDestructive: !!options.allowDestructive,
     allowOutsideCwd: !!options.allowOutsideCwd,
@@ -7188,7 +7308,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     }),
     config.get("customProviders")
   );
-  const { startHub } = await import("./hub-DGJC2RRF.js");
+  const { startHub } = await import("./hub-YNP5HCTT.js");
   await startHub(
     {
       topic: topic ?? "",

package/dist/{run-tests-OB4CWKKX.js → run-tests-OKQEMYZK.js}

@@ -1,7 +1,7 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-W45U3KQE.js";
+} from "./chunk-BXDHW7JO.js";
 import "./chunk-3RG5ZIWI.js";
 export {
   executeTests,

package/dist/{run-tests-7WN5Q7YV.js → run-tests-QOZZHW4L.js}

@@ -2,8 +2,8 @@
 import {
   executeTests,
   runTestsTool
-} from "./chunk-2WAF7FOX.js";
-import "./chunk-UF62SHR7.js";
+} from "./chunk-VJE5V4H2.js";
+import "./chunk-H3F2E4MD.js";
 import "./chunk-PDX44BCA.js";
 export {
   executeTests,

package/dist/{server-NQ5J6FAL.js → server-HI6GVBD3.js}

@@ -3,14 +3,14 @@ import {
   ToolRegistry,
   getDangerLevel,
   schemaToJsonSchema
-} from "./chunk-XXKWSBRC.js";
+} from "./chunk-YTP26DOV.js";
 import "./chunk-3BICTI5M.js";
 import "./chunk-2DXY7UGF.js";
-import "./chunk-2WAF7FOX.js";
+import "./chunk-VJE5V4H2.js";
 import "./chunk-2ZD3YTVM.js";
 import {
   VERSION
-} from "./chunk-UF62SHR7.js";
+} from "./chunk-H3F2E4MD.js";
 import "./chunk-4BKXL7SM.js";
 import "./chunk-7ZJN4KLV.js";
 import "./chunk-KHYD3WXE.js";

package/dist/{server-AKG7HG36.js → server-IX6L4W2L.js}

@@ -1,7 +1,8 @@
 #!/usr/bin/env node
 import {
-  AuthManager
-} from "./chunk-5UPFMM2A.js";
+  AuthManager,
+  TOKEN_EXPIRY_MS
+} from "./chunk-O7NM4WTS.js";
 import {
   CONTENT_ONLY_STREAM_REMINDER,
   HALLUCINATION_CORRECTION_MESSAGE,
@@ -13,6 +14,7 @@ import {
   TOOL_CALL_REMINDER,
   autoTrimSessionIfNeeded,
   computeCost,
+  detectMetaNarration,
   detectPseudoToolCalls,
   detectsHallucinatedFileOp,
   formatCost,
@@ -24,10 +26,10 @@ import {
   setupProxy,
   stripPseudoToolCalls,
   stripToolCallReminder
-} from "./chunk-E24HT62E.js";
+} from "./chunk-QMT4T4PH.js";
 import {
   ConfigManager
-} from "./chunk-CP6PALA4.js";
+} from "./chunk-KRTQDZMY.js";
 import {
   ToolExecutor,
   ToolRegistry,
@@ -45,10 +47,10 @@ import {
   spawnAgentContext,
   truncateOutput,
   undoStack
-} from "./chunk-XXKWSBRC.js";
+} from "./chunk-YTP26DOV.js";
 import "./chunk-3BICTI5M.js";
 import "./chunk-2DXY7UGF.js";
-import "./chunk-2WAF7FOX.js";
+import "./chunk-VJE5V4H2.js";
 import "./chunk-2ZD3YTVM.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
@@ -68,7 +70,7 @@ import {
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-UF62SHR7.js";
+} from "./chunk-H3F2E4MD.js";
 import {
   formatGitContextForPrompt,
   getGitContext,
@@ -1294,6 +1296,31 @@ ${summaryResult.content}`,
       await new Promise((resolve3, reject) => {
         fileStream.end((err) => err ? reject(err) : resolve3());
       });
+      const metaMatch = detectMetaNarration(fullContent);
+      if (metaMatch) {
+        try {
+          unlinkSync(saveToFile);
+        } catch {
+        }
+        isError = true;
+        summary = `[save_last_response REJECTED] Your output was internal reasoning / meta-narration (e.g. "Let me re-read\u2026", "the user is asking me to\u2026") instead of the requested document body (matched: ${metaMatch}). ${saveToFile} was NOT saved.
+
+This fresh stream has NO tools. Produce ONLY the document body: start with a markdown heading and write the full content. Do NOT narrate that you will produce the document \u2014 produce it.`;
+        if (teeUsage) {
+          roundUsage.inputTokens += teeUsage.inputTokens;
+          roundUsage.outputTokens += teeUsage.outputTokens;
+          roundUsage.cacheCreationTokens += teeUsage.cacheCreationTokens ?? 0;
+          roundUsage.cacheReadTokens += teeUsage.cacheReadTokens ?? 0;
+        }
+        this.send({
+          type: "tool_call_result",
+          callId: call.id,
+          result: summary,
+          isError: true,
+          endTime: Date.now()
+        });
+        return { content: "", summary, isError: true };
+      }
       const pseudoMatch = detectPseudoToolCalls(fullContent);
       if (pseudoMatch) {
         const cleaned = stripPseudoToolCalls(fullContent);
@@ -1331,9 +1358,13 @@ ${summaryResult.content}`,
         } catch {
         }
       }
+      try {
+        unlinkSync(saveToFile);
+      } catch {
+      }
       isError = true;
       const msg = err instanceof Error ? err.message : String(err);
-      summary = `[save_last_response failed] ${msg}`;
+      summary = `[save_last_response failed] streaming was interrupted: ${msg}. ${saveToFile} (partial) was deleted. Retry \u2014 and consider producing a more compact output (split very large reports across multiple save_last_response calls if the previous attempt timed out).`;
     }
     this.send({
       type: "tool_call_result",
@@ -2412,7 +2443,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
       case "test": {
         this.send({ type: "info", message: "\u{1F9EA} Running tests..." });
         try {
-          const { executeTests } = await import("./run-tests-7WN5Q7YV.js");
+          const { executeTests } = await import("./run-tests-QOZZHW4L.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -3573,7 +3604,7 @@ async function startWebServer(options = {}) {
     }
     const token = authManager.login(username, password);
     console.log(`   \u2713 User registered via API: ${username}${firstRun ? " (first-run)" : ""}`);
-    res.cookie("aicli_token", token, { httpOnly: true, sameSite: "strict", maxAge: 7 * 24 * 3600 * 1e3 });
+    res.cookie("aicli_token", token, { httpOnly: true, sameSite: "strict", maxAge: TOKEN_EXPIRY_MS });
     res.json({ success: true, username });
   });
   app.post("/api/auth/login", (req, res) => {
@@ -3587,7 +3618,7 @@ async function startWebServer(options = {}) {
       res.status(401).json({ error: "Invalid username or password" });
       return;
     }
-    res.cookie("aicli_token", token, { httpOnly: true, sameSite: "strict", maxAge: 7 * 24 * 3600 * 1e3 });
+    res.cookie("aicli_token", token, { httpOnly: true, sameSite: "strict", maxAge: TOKEN_EXPIRY_MS });
     res.json({ success: true, username });
   });
   app.post("/api/auth/logout", (_req, res) => {

package/dist/{task-orchestrator-32YQ6HB2.js → task-orchestrator-SCH3JUKT.js}

@@ -4,14 +4,14 @@ import {
   getDangerLevel,
   googleSearchContext,
   truncateOutput
-} from "./chunk-XXKWSBRC.js";
+} from "./chunk-YTP26DOV.js";
 import "./chunk-3BICTI5M.js";
 import "./chunk-2DXY7UGF.js";
-import "./chunk-2WAF7FOX.js";
+import "./chunk-VJE5V4H2.js";
 import "./chunk-2ZD3YTVM.js";
 import {
   SUBAGENT_ALLOWED_TOOLS
-} from "./chunk-UF62SHR7.js";
+} from "./chunk-H3F2E4MD.js";
 import "./chunk-4BKXL7SM.js";
 import "./chunk-7ZJN4KLV.js";
 import "./chunk-KHYD3WXE.js";