@llmist/cli 15.15.0 → 15.16.0

package/dist/cli.js

@@ -19,6 +19,7 @@ var DEFAULT_MODEL = "openai:gpt-5-nano";
 var OPTION_FLAGS = {
   model: "-m, --model <identifier>",
   systemPrompt: "-s, --system <prompt>",
+  systemPromptFile: "--system-file <path>",
   temperature: "-t, --temperature <value>",
   maxTokens: "--max-tokens <count>",
   maxIterations: "-i, --max-iterations <count>",
@@ -60,6 +61,7 @@ var OPTION_FLAGS = {
 var OPTION_DESCRIPTIONS = {
   model: "Model identifier, e.g. openai:gpt-5-nano or anthropic:claude-sonnet-4-5.",
   systemPrompt: "Optional system prompt prepended to the conversation.",
+  systemPromptFile: "Path to file containing system prompt (alternative to --system).",
   temperature: "Sampling temperature between 0 and 2.",
   maxTokens: "Maximum number of output tokens requested from the model.",
   maxIterations: "Maximum number of agent loop iterations before exiting.",
@@ -106,7 +108,7 @@ import { Command, InvalidArgumentError as InvalidArgumentError2 } from "commande
 // package.json
 var package_default = {
   name: "@llmist/cli",
-  version: "15.15.0",
+  version: "15.16.0",
   description: "CLI for llmist - run LLM agents from the command line",
   type: "module",
   main: "dist/cli.js",
@@ -162,7 +164,7 @@ var package_default = {
     node: ">=22.0.0"
   },
   dependencies: {
-    llmist: "^15.15.0",
+    llmist: "^15.16.0",
     "@unblessed/node": "^1.0.0-alpha.23",
     chalk: "^5.6.2",
     commander: "^12.1.0",
@@ -176,7 +178,7 @@ var package_default = {
     zod: "^4.1.12"
   },
   devDependencies: {
-    "@llmist/testing": "^15.15.0",
+    "@llmist/testing": "^15.16.0",
     "@types/diff": "^8.0.0",
     "@types/js-yaml": "^4.0.9",
     "@types/marked-terminal": "^6.1.1",
@@ -1443,6 +1445,17 @@ async function checkFileSize(absolutePath, filePath, maxSize) {
     );
   }
 }
+async function readSystemPromptFile(filePath, options = {}) {
+  const absolutePath = resolve2(filePath);
+  const maxFileSize = options.maxFileSize ?? DEFAULT_MAX_FILE_SIZE;
+  try {
+    await checkFileSize(absolutePath, filePath, maxFileSize);
+    return await readFile(absolutePath, "utf-8");
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(`Failed to read system prompt file "${filePath}": ${message}`);
+  }
+}
 async function readImageFile(filePath, options = {}) {
   const absolutePath = resolve2(filePath);
   const maxFileSize = options.maxFileSize ?? DEFAULT_MAX_FILE_SIZE;
@@ -3961,7 +3974,7 @@ async function executeAction(action, env) {
 
 // src/option-helpers.ts
 function addCompleteOptions(cmd, defaults) {
-  return cmd.option(OPTION_FLAGS.model, OPTION_DESCRIPTIONS.model, defaults?.model ?? DEFAULT_MODEL).option(OPTION_FLAGS.systemPrompt, OPTION_DESCRIPTIONS.systemPrompt, defaults?.system).option(
+  return cmd.option(OPTION_FLAGS.model, OPTION_DESCRIPTIONS.model, defaults?.model ?? DEFAULT_MODEL).option(OPTION_FLAGS.systemPrompt, OPTION_DESCRIPTIONS.systemPrompt, defaults?.system).option(OPTION_FLAGS.systemPromptFile, OPTION_DESCRIPTIONS.systemPromptFile).option(
     OPTION_FLAGS.temperature,
     OPTION_DESCRIPTIONS.temperature,
     createNumericParser({ label: "Temperature", min: 0, max: 2 }),
@@ -4022,7 +4035,7 @@ function addAgentOptions(cmd, defaults) {
     value
   ];
   const defaultGadgets = defaults?.gadgets ?? defaults?.gadget ?? [];
-  return cmd.option(OPTION_FLAGS.model, OPTION_DESCRIPTIONS.model, defaults?.model ?? DEFAULT_MODEL).option(OPTION_FLAGS.systemPrompt, OPTION_DESCRIPTIONS.systemPrompt, defaults?.system).option(
+  return cmd.option(OPTION_FLAGS.model, OPTION_DESCRIPTIONS.model, defaults?.model ?? DEFAULT_MODEL).option(OPTION_FLAGS.systemPrompt, OPTION_DESCRIPTIONS.systemPrompt, defaults?.system).option(OPTION_FLAGS.systemPromptFile, OPTION_DESCRIPTIONS.systemPromptFile).option(
     OPTION_FLAGS.temperature,
     OPTION_DESCRIPTIONS.temperature,
     createNumericParser({ label: "Temperature", min: 0, max: 2 }),
@@ -8874,8 +8887,15 @@ ${ctx.gadgetName} requires interactive approval. Run in a terminal to approve.`
   if (retryConfig) {
     builder.withRetry(retryConfig);
   }
-  if (options.system) {
-    builder.withSystem(options.system);
+  let systemPrompt = options.system;
+  if (options.systemFile) {
+    if (options.system) {
+      throw new Error("Cannot use both --system and --system-file options");
+    }
+    systemPrompt = await readSystemPromptFile(options.systemFile);
+  }
+  if (systemPrompt) {
+    builder.withSystem(systemPrompt);
   }
   if (options.maxIterations !== void 0) {
     builder.withMaxIterations(options.maxIterations);
@@ -9097,8 +9117,15 @@ async function executeComplete(promptArg, options, env) {
   const client = env.createClient();
   const model = resolveModel2(options.model);
   const builder = new LLMMessageBuilder();
-  if (options.system) {
-    builder.addSystem(options.system);
+  let systemPrompt = options.system;
+  if (options.systemFile) {
+    if (options.system) {
+      throw new Error("Cannot use both --system and --system-file options");
+    }
+    systemPrompt = await readSystemPromptFile(options.systemFile);
+  }
+  if (systemPrompt) {
+    builder.addSystem(systemPrompt);
   }
   if (options.image || options.audio) {
     const parts = [text2(prompt)];
@@ -9152,39 +9179,54 @@ async function executeComplete(promptArg, options, env) {
   const printer = new StreamPrinter(env.stdout);
   const stderrTTY = env.stderr.isTTY === true;
   const progress = new StreamProgress(env.stderr, stderrTTY, client.modelRegistry);
-  const estimatedInputTokens = Math.round(prompt.length / FALLBACK_CHARS_PER_TOKEN2);
+  let estimatedInputTokens = 0;
+  for (const msg of messages) {
+    if (typeof msg.content === "string") {
+      estimatedInputTokens += msg.content.length;
+    } else if (Array.isArray(msg.content)) {
+      for (const part of msg.content) {
+        if (part.type === "text") {
+          estimatedInputTokens += part.text.length;
+        }
+      }
+    }
+  }
+  estimatedInputTokens = Math.round(estimatedInputTokens / FALLBACK_CHARS_PER_TOKEN2);
   progress.startCall(model, estimatedInputTokens);
   let finishReason;
   let usage;
   let accumulatedResponse = "";
-  for await (const chunk of stream) {
-    if (chunk.usage) {
-      usage = chunk.usage;
-      if (chunk.usage.inputTokens) {
-        progress.setInputTokens(chunk.usage.inputTokens, false);
+  try {
+    for await (const chunk of stream) {
+      if (chunk.usage) {
+        usage = chunk.usage;
+        if (chunk.usage.inputTokens) {
+          progress.setInputTokens(chunk.usage.inputTokens, false);
+        }
+        if (chunk.usage.outputTokens) {
+          progress.setOutputTokens(chunk.usage.outputTokens, false);
+        }
       }
-      if (chunk.usage.outputTokens) {
-        progress.setOutputTokens(chunk.usage.outputTokens, false);
+      if (chunk.thinking?.content) {
+        if (stderrTTY && !options.quiet) {
+          progress.pause();
+          env.stderr.write(`\x1B[2m${chunk.thinking.content}\x1B[0m`);
+        }
       }
-    }
-    if (chunk.thinking?.content) {
-      if (stderrTTY && !options.quiet) {
+      if (chunk.text) {
         progress.pause();
-        env.stderr.write(`\x1B[2m${chunk.thinking.content}\x1B[0m`);
+        accumulatedResponse += chunk.text;
+        progress.update(accumulatedResponse.length);
+        printer.write(chunk.text);
+      }
+      if (chunk.finishReason !== void 0) {
+        finishReason = chunk.finishReason;
       }
     }
-    if (chunk.text) {
-      progress.pause();
-      accumulatedResponse += chunk.text;
-      progress.update(accumulatedResponse.length);
-      printer.write(chunk.text);
-    }
-    if (chunk.finishReason !== void 0) {
-      finishReason = chunk.finishReason;
-    }
+    progress.endCall(usage);
+  } finally {
+    progress.complete();
   }
-  progress.endCall(usage);
-  progress.complete();
   printer.ensureNewline();
   if (llmLogDir) {
     const filename = "0001.response";