@cryer/star-cli 0.3.13 → 0.3.14

package/dist/main.js

@@ -15,8 +15,9 @@ import {
   readImageInput,
   resolveMentions,
   resolveSessionId,
-  summarizeArgs
-} from "./chunk-NMB3TNQU.js";
+  summarizeArgs,
+  toTerminalSafe
+} from "./chunk-NRLGGA7L.js";
 import {
   ConfigSchema,
   HookConfigSchema,
@@ -25,7 +26,7 @@ import {
   ProviderConfigSchema,
   contextWindowTokens,
   reconcileStarMessages
-} from "./chunk-RD4S5LKM.js";
+} from "./chunk-CECMCDZG.js";
 import {
   resolveModelConfig,
   resolveStartupModel
@@ -41,48 +42,57 @@ import {
   registerSensitivePatterns,
   setTodoSession,
   setWebFetchAllowPrivateHosts
-} from "./chunk-6PLZ3FLG.js";
+} from "./chunk-2ISBRSBA.js";
 
 // src/main.tsx
 import { Command } from "commander";
 
 // src/cli/print-human.ts
-function printEventLine(event) {
+function printEventLine(event, tty = {}) {
+  let line;
   switch (event.type) {
     case "text-delta":
-      return { stream: "stdout", text: event.text };
+      line = { stream: "stdout", text: event.text };
+      break;
     case "tool-call":
-      return { stream: "stderr", text: `
+      line = { stream: "stderr", text: `
 [tool] ${event.name} ${summarizeArgs(event.args)}
 ` };
+      break;
     case "tool-result": {
       const preview = event.content.length > 500 ? `${event.content.slice(0, 500)}... (truncated)` : event.content;
-      return {
+      line = {
         stream: "stderr",
         text: `[result] ${event.isError ? "ERROR: " : ""}${preview}
 `
       };
+      break;
     }
     case "retry": {
       const wait = event.delayMs !== void 0 && event.delayMs >= 1e3 ? ` in ${Math.round(event.delayMs / 1e3)}s` : "";
-      return {
+      line = {
         stream: "stderr",
         text: `
 [retry ${event.attempt}/${event.maxAttempts}${wait}] ${event.reason}
 `
       };
+      break;
     }
     case "notice":
-      return { stream: "stderr", text: `
+      line = { stream: "stderr", text: `
 [notice] ${event.message}
 ` };
+      break;
     case "error":
-      return { stream: "stderr", text: `
+      line = { stream: "stderr", text: `
 [error] ${formatStreamError(event.error)}
 ` };
+      break;
     default:
       return null;
   }
+  const isTTY = line.stream === "stdout" ? tty.stdoutIsTTY ?? Boolean(process.stdout.isTTY) : tty.stderrIsTTY ?? Boolean(process.stderr.isTTY);
+  return isTTY ? { ...line, text: toTerminalSafe(line.text) } : line;
 }
 
 // src/cli/print-json.ts
@@ -91,7 +101,7 @@ function eventToJsonLine(event) {
     case "finish":
       return null;
     case "error":
-      return JSON.stringify({ type: "error", error: { message: event.error.message } });
+      return JSON.stringify(event);
     default:
       return JSON.stringify(event);
   }
@@ -101,33 +111,154 @@ var UsageTracker = class {
   promptTokens = 0;
   completionTokens = 0;
   totalTokens = 0;
+  cachedPromptTokens;
+  cacheReadInputTokens;
   add(usage) {
     if (!usage) return;
     this.requests += 1;
     this.promptTokens += usage.promptTokens;
     this.completionTokens += usage.completionTokens;
     this.totalTokens += usage.totalTokens;
+    if (usage.cachedPromptTokens !== void 0) {
+      this.cachedPromptTokens = (this.cachedPromptTokens ?? 0) + usage.cachedPromptTokens;
+    }
+    if (usage.cacheReadInputTokens !== void 0) {
+      this.cacheReadInputTokens = (this.cacheReadInputTokens ?? 0) + usage.cacheReadInputTokens;
+    }
   }
   get totals() {
     return {
       requests: this.requests,
       promptTokens: this.promptTokens,
       completionTokens: this.completionTokens,
-      totalTokens: this.totalTokens
+      totalTokens: this.totalTokens,
+      ...this.cachedPromptTokens !== void 0 ? { cachedPromptTokens: this.cachedPromptTokens } : {},
+      ...this.cacheReadInputTokens !== void 0 ? { cacheReadInputTokens: this.cacheReadInputTokens } : {}
     };
   }
   toJsonLine() {
     if (this.requests === 0) return null;
-    return JSON.stringify({
-      type: "usage",
-      requests: this.requests,
-      promptTokens: this.promptTokens,
-      completionTokens: this.completionTokens,
-      totalTokens: this.totalTokens
-    });
+    return JSON.stringify({ type: "usage", ...this.totals });
   }
 };
 
+// src/cli/print-mode.ts
+async function printMode(loop, prompt, cwd, json, imagePaths, sessionStore) {
+  const flagImages = [];
+  for (const imagePath of imagePaths) {
+    if (!imageMimeType(imagePath)) {
+      process.stderr.write(
+        `[error] unsupported image type: ${imagePath} (supported: png, jpg, jpeg, gif, webp)
+`
+      );
+      return 1;
+    }
+    const image = await readImageInput(imagePath, cwd);
+    if (!image) {
+      process.stderr.write(
+        `[error] cannot read image: ${imagePath} (missing, unreadable, or larger than ${MAX_IMAGE_BYTES / (1024 * 1024)}MB)
+`
+      );
+      return 1;
+    }
+    flagImages.push(image);
+  }
+  const controller = new AbortController();
+  let interrupted = false;
+  const onSigint = () => {
+    interrupted = true;
+    controller.abort();
+  };
+  process.on("SIGINT", onSigint);
+  loop.onHookWarning = (message) => {
+    process.stderr.write(`[hook] ${message}
+`);
+  };
+  const usage = new UsageTracker();
+  loop.onUsage = (delta) => usage.add(delta);
+  let exitCode = 0;
+  let pending = [];
+  const emit = (event) => {
+    if (json) {
+      const line2 = eventToJsonLine(event);
+      if (line2) process.stdout.write(`${line2}
+`);
+      return;
+    }
+    const line = printEventLine(event);
+    if (line) (line.stream === "stdout" ? process.stdout : process.stderr).write(line.text);
+  };
+  const flushPending = () => {
+    for (const event of pending) emit(event);
+    pending = [];
+  };
+  try {
+    const resolved = await resolveMentions(prompt, cwd);
+    if (resolved.attached.length > 0) {
+      process.stderr.write(`[attached] ${resolved.attached.join(", ")}
+`);
+    }
+    for (const skip of resolved.skipped) {
+      process.stderr.write(`[skipped] @${skip.path}: ${skip.reason}
+`);
+    }
+    const images = [...flagImages, ...resolved.images];
+    const input = images.length > 0 ? { text: resolved.input, images } : resolved.input;
+    for await (const event of loop.stream(input, controller.signal, { persistAs: prompt })) {
+      if (event.type === "retry") {
+        pending = [];
+        emit(event);
+      } else if (event.type === "finish" || event.type === "error") {
+        flushPending();
+        if (event.type === "error") {
+          emit(event);
+          exitCode = 1;
+        }
+      } else if (event.type === "notice") {
+        emit(event);
+      } else {
+        pending.push(event);
+      }
+      if (exitCode !== 0) break;
+    }
+  } catch (error) {
+    if (!(error instanceof DOMException && error.name === "AbortError")) {
+      const message = error instanceof Error ? formatStreamError(error) : String(error);
+      process.stderr.write(`
+[error] ${message}
+`);
+      exitCode = 1;
+    }
+  } finally {
+    flushPending();
+    if (interrupted) exitCode = 130;
+    const usageLine = usage.toJsonLine();
+    if (usageLine) {
+      if (json) {
+        process.stdout.write(`${usageLine}
+`);
+      } else {
+        const t = usage.totals;
+        process.stderr.write(
+          `[usage] ${t.requests} requests, ${formatTokens(t.promptTokens)} prompt + ${formatTokens(t.completionTokens)} completion = ${formatTokens(t.totalTokens)} tokens
+`
+        );
+      }
+    }
+    if (!json) process.stdout.write("\n");
+    process.off("SIGINT", onSigint);
+    const stopped = defaultTaskManager.cleanup().length + defaultAgentTasks.cleanup().length;
+    if (stopped > 0) {
+      process.stderr.write(
+        `[info] ${stopped} background task(s) were still running and have been stopped.
+`
+      );
+    }
+    await sessionStore?.close();
+  }
+  return exitCode;
+}
+
 // src/cli/startup.ts
 function imageRequiresPrintError(print, images) {
   if (print !== void 0) return null;
@@ -136,9 +267,9 @@ function imageRequiresPrintError(print, images) {
 function interactiveRequiresTtyError(streams) {
   return streams.stdinTTY && streams.stdoutTTY ? null : "interactive mode requires a TTY; use -p/--print";
 }
-function installStdoutEpipeGuard(stdout = process.stdout) {
+function installStdoutEpipeGuard(stdout = process.stdout, onEpipe = () => process.exit(0)) {
   stdout.on("error", (error) => {
-    if (error?.code === "EPIPE") process.exit(0);
+    if (error?.code === "EPIPE") onEpipe();
     else throw error;
   });
 }
@@ -405,7 +536,7 @@ function wireRuntimeSettings(config) {
 
 // src/main.tsx
 async function createLoop(config, modelName, cwd, sessionStore) {
-  const [{ AgentLoop }, { createModel, reasoningEffortMetadata }, { createDefaultRegistry }] = await Promise.all([import("./loop-DWQ5WTPD.js"), import("./provider-EWMUPBLH.js"), import("./tools-4OLADVDR.js")]);
+  const [{ AgentLoop }, { createModel, reasoningEffortMetadata }, { createDefaultRegistry }] = await Promise.all([import("./loop-M64D5YII.js"), import("./provider-3Z4B7RMF.js"), import("./tools-5RKM7ZI3.js")]);
   const model = createModel(config, modelName);
   const registry = createDefaultRegistry();
   const modelConfig = resolveModelConfig(config, modelName);
@@ -418,6 +549,7 @@ async function createLoop(config, modelName, cwd, sessionStore) {
     sessionStore,
     modelName,
     contextMaxTokens: contextWindowTokens(config, modelName),
+    maxTokens: modelConfig.maxTokens,
     providerMetadata: reasoningEffortMetadata(config, modelName),
     temperature: modelConfig.temperature,
     streamIdleTimeoutSec: modelConfig.streamIdleTimeoutSec,
@@ -425,107 +557,6 @@ async function createLoop(config, modelName, cwd, sessionStore) {
     vision: modelConfig.vision
   });
 }
-async function printMode(loop, prompt, cwd, json, imagePaths, sessionStore) {
-  const flagImages = [];
-  for (const imagePath of imagePaths) {
-    if (!imageMimeType(imagePath)) {
-      process.stderr.write(
-        `[error] unsupported image type: ${imagePath} (supported: png, jpg, jpeg, gif, webp)
-`
-      );
-      return 1;
-    }
-    const image = await readImageInput(imagePath, cwd);
-    if (!image) {
-      process.stderr.write(
-        `[error] cannot read image: ${imagePath} (missing, unreadable, or larger than ${MAX_IMAGE_BYTES / (1024 * 1024)}MB)
-`
-      );
-      return 1;
-    }
-    flagImages.push(image);
-  }
-  const controller = new AbortController();
-  process.on("SIGINT", () => controller.abort());
-  loop.onHookWarning = (message) => {
-    process.stderr.write(`[hook] ${message}
-`);
-  };
-  const resolved = await resolveMentions(prompt, cwd);
-  if (resolved.attached.length > 0) {
-    process.stderr.write(`[attached] ${resolved.attached.join(", ")}
-`);
-  }
-  for (const skip of resolved.skipped) {
-    process.stderr.write(`[skipped] @${skip.path}: ${skip.reason}
-`);
-  }
-  const images = [...flagImages, ...resolved.images];
-  const input = images.length > 0 ? { text: resolved.input, images } : resolved.input;
-  const usage = new UsageTracker();
-  let exitCode = 0;
-  try {
-    for await (const event of loop.stream(input, controller.signal, {
-      persistAs: prompt
-    })) {
-      if (json) {
-        const line = eventToJsonLine(event);
-        if (line) process.stdout.write(`${line}
-`);
-      } else {
-        const line = printEventLine(event);
-        if (line) {
-          (line.stream === "stdout" ? process.stdout : process.stderr).write(line.text);
-        }
-      }
-      switch (event.type) {
-        case "finish":
-          usage.add(event.usage);
-          if (event.usage) {
-            sessionStore?.addUsage(event.usage).catch(() => {
-            });
-          }
-          break;
-        case "error":
-          exitCode = 1;
-          break;
-      }
-      if (exitCode !== 0) break;
-    }
-  } catch (error) {
-    if (!(error instanceof DOMException && error.name === "AbortError")) {
-      const message = error instanceof Error ? formatStreamError(error) : String(error);
-      process.stderr.write(`
-[error] ${message}
-`);
-      exitCode = 1;
-    }
-  }
-  const usageLine = usage.toJsonLine();
-  if (usageLine) {
-    if (json) {
-      process.stdout.write(`${usageLine}
-`);
-    } else {
-      const t = usage.totals;
-      process.stderr.write(
-        `[usage] ${t.requests} requests, ${formatTokens(t.promptTokens)} prompt + ${formatTokens(t.completionTokens)} completion = ${formatTokens(t.totalTokens)} tokens
-`
-      );
-    }
-  }
-  if (!json) process.stdout.write("\n");
-  const killedShells = defaultTaskManager.cleanup();
-  const killedAgents = defaultAgentTasks.cleanup();
-  const stopped = killedShells.length + killedAgents.length;
-  if (stopped > 0) {
-    process.stderr.write(
-      `[info] ${stopped} background task(s) were still running and have been stopped.
-`
-    );
-  }
-  return exitCode;
-}
 var program = new Command();
 program.name("star").description("Star CLI \u2014 an AI agent command-line interface").version(VERSION).option("-m, --model <model>", "model to use").option("--permission-mode <mode>", "permission mode: ask | auto | readonly | yolo | plan").option("-p, --print <prompt>", "non-interactive print mode").option("--json", "output NDJSON events on stdout (print mode only)").option(
   "--image <path>",
@@ -536,7 +567,6 @@ program.name("star").description("Star CLI \u2014 an AI agent command-line inter
   "--clear-sessions [scope]",
   "delete stored sessions for the current directory ('all' deletes every session) and exit"
 ).action(async (opts) => {
-  installStdoutEpipeGuard();
   const cwd = process.cwd();
   if (opts.json && opts.print === void 0) {
     console.error(
@@ -577,6 +607,17 @@ program.name("star").description("Star CLI \u2014 an AI agent command-line inter
     process.exit(1);
   }
   let sessionStore = null;
+  let shuttingDown = false;
+  installStdoutEpipeGuard(process.stdout, () => {
+    if (shuttingDown) return;
+    shuttingDown = true;
+    void (async () => {
+      defaultTaskManager.cleanup();
+      defaultAgentTasks.cleanup();
+      await sessionStore?.close();
+      process.exit(0);
+    })();
+  });
   let resumed = null;
   let resumeId = null;
   if (typeof opts.resume === "string") {
@@ -601,8 +642,8 @@ program.name("star").description("Star CLI \u2014 an AI agent command-line inter
     }
     const [meta, loaded] = await Promise.all([sessionStore.meta(), sessionStore.starMessages()]);
     const messages = reconcileStarMessages(loaded);
-    if (messages.length !== loaded.length) {
-      await sessionStore.replaceMessages(messages);
+    if (messages.length !== loaded.length && !await sessionStore.replaceMessages(messages)) {
+      throw new Error(`Could not repair persisted history for session ${resumeId}`);
     }
     resumed = { meta, messages };
     setTodoSession(resumeId);
@@ -621,7 +662,7 @@ program.name("star").description("Star CLI \u2014 an AI agent command-line inter
     );
     process.exit(1);
   }
-  if (!resumeId && !opts.print) {
+  if (!resumeId && opts.print === void 0) {
     sessionStore = await SessionStore.create(cwd, modelName);
     setTodoSession(sessionStore.id);
   }
@@ -639,7 +680,7 @@ program.name("star").description("Star CLI \u2014 an AI agent command-line inter
       hydrateSnapshots(await loadSessionSnapshots(sessionStore.dir));
     }
   }
-  if (opts.print) {
+  if (opts.print !== void 0) {
     process.exitCode = await printMode(
       loop,
       opts.print,
@@ -658,7 +699,7 @@ program.name("star").description("Star CLI \u2014 an AI agent command-line inter
     console.error(ttyError);
     process.exit(1);
   }
-  const { renderRepl } = await import("./repl-ZABBT33D.js");
+  const { renderRepl } = await import("./repl-N2H7JDSH.js");
   renderRepl(loop, {
     model: modelName,
     permissionMode: config.permissionMode,
@@ -669,5 +710,10 @@ program.name("star").description("Star CLI \u2014 an AI agent command-line inter
     initialUsage: resumed?.meta.usage
   });
 });
-program.parse(process.argv);
+try {
+  await program.parseAsync(process.argv);
+} catch (error) {
+  console.error(error instanceof Error ? error.message : String(error));
+  process.exitCode = 1;
+}
 //# sourceMappingURL=main.js.map