@llmist/cli 15.11.0 → 15.12.0

package/dist/cli.js

@@ -98,7 +98,7 @@ import { Command, InvalidArgumentError as InvalidArgumentError2 } from "commande
 // package.json
 var package_default = {
   name: "@llmist/cli",
-  version: "15.11.0",
+  version: "15.12.0",
   description: "CLI for llmist - run LLM agents from the command line",
   type: "module",
   main: "dist/cli.js",
@@ -154,7 +154,7 @@ var package_default = {
     node: ">=22.0.0"
   },
   dependencies: {
-    llmist: "^15.11.0",
+    llmist: "^15.12.0",
     "@unblessed/node": "^1.0.0-alpha.23",
     chalk: "^5.6.2",
     commander: "^12.1.0",
@@ -168,7 +168,7 @@ var package_default = {
     zod: "^4.1.12"
   },
   devDependencies: {
-    "@llmist/testing": "^15.11.0",
+    "@llmist/testing": "^15.12.0",
     "@types/diff": "^8.0.0",
     "@types/js-yaml": "^4.0.9",
     "@types/marked-terminal": "^6.1.1",
@@ -180,7 +180,7 @@ var package_default = {
 };
 
 // src/agent-command.ts
-import { AgentBuilder, GadgetRegistry, isAbortError, text } from "llmist";
+import { AgentBuilder, GadgetRegistry, HookPresets, isAbortError, text } from "llmist";
 
 // src/builtin-gadgets.ts
 import { createGadget, HumanInputRequiredException, TaskCompletionSignal } from "llmist";
@@ -2800,27 +2800,6 @@ async function loadGadgets(specifiers, cwd, importer = createTypeScriptImporter(
   return gadgets;
 }
 
-// src/llm-logging.ts
-import { mkdir, writeFile as writeFile2 } from "fs/promises";
-import { join as join2 } from "path";
-import { extractMessageText } from "llmist";
-function formatLlmRequest(messages) {
-  const lines = [];
-  for (const msg of messages) {
-    lines.push(`=== ${msg.role.toUpperCase()} ===`);
-    lines.push(msg.content ? extractMessageText(msg.content) : "");
-    lines.push("");
-  }
-  return lines.join("\n");
-}
-async function writeLogFile(dir, filename, content) {
-  await mkdir(dir, { recursive: true });
-  await writeFile2(join2(dir, filename), content, "utf-8");
-}
-function formatCallNumber(n) {
-  return n.toString().padStart(4, "0");
-}
-
 // src/utils.ts
 import chalk2 from "chalk";
 import { InvalidArgumentError } from "commander";
@@ -6154,10 +6133,10 @@ var HintsBar = class {
 import { spawnSync as spawnSync2 } from "child_process";
 import { readFileSync as readFileSync4, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
 import { tmpdir } from "os";
-import { join as join3 } from "path";
+import { join as join2 } from "path";
 function openEditorSync(initialContent = "") {
   const editor = process.env.VISUAL || process.env.EDITOR || "vi";
-  const tmpFile = join3(tmpdir(), `llmist-input-${Date.now()}.txt`);
+  const tmpFile = join2(tmpdir(), `llmist-input-${Date.now()}.txt`);
   writeFileSync2(tmpFile, initialContent, "utf-8");
   try {
     const parts = editor.split(/\s+/);
@@ -8561,40 +8540,20 @@ async function executeAgent(promptArg, options, env, commandName) {
   let iterations = 0;
   const llmLogsEnabled = options.logLlmRequests === true;
   const llmLogDir = llmLogsEnabled ? env.session?.logDir : void 0;
-  let llmCallCounter = 0;
-  const _countGadgetOutputTokens = async (output) => {
-    if (!output) return void 0;
-    try {
-      const messages = [{ role: "assistant", content: output }];
-      return await client.countTokens(options.model, messages);
-    } catch {
-      return void 0;
-    }
-  };
   const resolvedSubagentConfig = buildSubagentConfigMap(
     options.model,
     options.subagents,
     options.globalSubagents
   );
-  const builder = new AgentBuilder(client).withModel(options.model).withSubagentConfig(resolvedSubagentConfig).withLogger(env.createLogger("llmist:cli:agent")).withHooks({
+  const tuiHooks = {
     observers: {
       // onLLMCallStart: Track iteration for status bar label formatting
       onLLMCallStart: async (context) => {
         if (context.subagentContext) return;
-        llmCallCounter++;
         if (tui) {
           tui.showLLMCallStart(iterations + 1);
         }
       },
-      // onLLMCallReady: Log the exact request being sent to the LLM
-      onLLMCallReady: async (context) => {
-        if (context.subagentContext) return;
-        if (llmLogDir) {
-          const filename = `${formatCallNumber(llmCallCounter)}.request`;
-          const content = formatLlmRequest(context.options.messages);
-          await writeLogFile(llmLogDir, filename, content);
-        }
-      },
       // onStreamChunk: Update status bar with real-time output token estimate
       onStreamChunk: async (context) => {
         if (context.subagentContext) return;
@@ -8602,15 +8561,11 @@ async function executeAgent(promptArg, options, env, commandName) {
         const estimatedOutputTokens = StatusBar.estimateTokens(context.accumulatedText);
         tui.updateStreamingTokens(estimatedOutputTokens);
       },
-      // onLLMCallComplete: Capture metadata for final summary and file logging
+      // onLLMCallComplete: Capture metadata for final summary
       onLLMCallComplete: async (context) => {
         if (context.subagentContext) return;
         _usage = context.usage;
         iterations = Math.max(iterations, context.iteration + 1);
-        if (llmLogDir) {
-          const filename = `${formatCallNumber(llmCallCounter)}.response`;
-          await writeLogFile(llmLogDir, filename, context.rawResponse);
-        }
         if (tui) {
           tui.clearRetry();
         }
@@ -8718,7 +8673,9 @@ ${ctx.gadgetName} requires interactive approval. Run in a terminal to approve.`
         };
       }
     }
-  });
+  };
+  const finalHooks = llmLogDir ? HookPresets.merge(HookPresets.fileLogging({ directory: llmLogDir }), tuiHooks) : tuiHooks;
+  const builder = new AgentBuilder(client).withModel(options.model).withSubagentConfig(resolvedSubagentConfig).withLogger(env.createLogger("llmist:cli:agent")).withHooks(finalHooks);
   const rateLimitConfig = resolveRateLimitConfig(
     options,
     options.globalRateLimits,
@@ -8905,7 +8862,24 @@ function registerAgentCommand(program, env, config, globalSubagents, globalRateL
 }
 
 // src/complete-command.ts
-import { FALLBACK_CHARS_PER_TOKEN as FALLBACK_CHARS_PER_TOKEN2, LLMMessageBuilder, resolveModel as resolveModel2, text as text2 } from "llmist";
+import {
+  FALLBACK_CHARS_PER_TOKEN as FALLBACK_CHARS_PER_TOKEN2,
+  formatLlmRequest as formatLlmRequest2,
+  LLMMessageBuilder,
+  resolveModel as resolveModel2,
+  text as text2
+} from "llmist";
+
+// src/llm-logging.ts
+import { mkdir, writeFile as writeFile2 } from "fs/promises";
+import { join as join3 } from "path";
+import { formatCallNumber, formatLlmRequest } from "llmist";
+async function writeLogFile(dir, filename, content) {
+  await mkdir(dir, { recursive: true });
+  await writeFile2(join3(dir, filename), content, "utf-8");
+}
+
+// src/complete-command.ts
 async function executeComplete(promptArg, options, env) {
   const prompt = await resolvePrompt(promptArg, env);
   const client = env.createClient();
@@ -8931,7 +8905,7 @@ async function executeComplete(promptArg, options, env) {
   const llmLogDir = llmLogsEnabled ? env.session?.logDir : void 0;
   if (llmLogDir) {
     const filename = "0001.request";
-    const content = formatLlmRequest(messages);
+    const content = formatLlmRequest2(messages);
     await writeLogFile(llmLogDir, filename, content);
   }
   const stream = client.stream({