agent.libx.js 0.94.17 → 0.94.19

package/dist/{Agent-COa80xYy.d.ts → Agent-DmsB5hzp.d.ts}

@@ -1,5 +1,5 @@
 import { IFilesystem } from '@livx.cc/wcli/core';
-import { M as Message, H as HostBridge, A as AgentTool, C as ChatLike, e as MessageContent } from './tools-GPWp7oXq.js';
+import { M as Message, H as HostBridge, A as AgentTool, C as ChatLike, e as MessageContent } from './tools-9AUK6SG2.js';
 
 /**
  * Hooks — deterministic interception points around tool execution, run by the
@@ -209,7 +209,8 @@ declare class AgentOptions {
     systemPrompt: string;
     tools: AgentTool[];
     maxSteps: number;
-    /** Hard ceiling on accumulated tokens (prompt+completion) across the run. 0 = unbounded. */
+    /** Hard ceiling on accumulated tokens (prompt+completion) across the run; cache READS count at 0.1×
+     *  (their real price) so a fat cached context doesn't trip the guard on healthy turns. 0 = unbounded. */
     maxTokens: number;
     /** Wall-clock ceiling in ms for the whole run. 0 = unbounded. */
     timeoutMs: number;
@@ -317,6 +318,10 @@ declare class Agent {
     private prepared;
     private systemPromptCache;
     private started;
+    private parkedMs;
+    /** Time a human-blocking await (a permission/plan prompt) and bank it in `parkedMs` so idle prompt
+     *  time never trips the wall-clock kill-switch. The agent did no work while parked on the user. */
+    private park;
     /** Force the next `send()`/`run()` to rebuild the system prompt, tools, plan-mode and permission hooks
      *  from `options` — apply mid-conversation changes to `planMode`/`permissions`/`model` etc. (prepare()
      *  is otherwise memoized per conversation). */

package/dist/cli.d.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
-import { h as RunResult, R as ReasoningEffort } from './Agent-COa80xYy.js';
+import { h as RunResult, R as ReasoningEffort } from './Agent-DmsB5hzp.js';
 import { IFilesystem } from '@livx.cc/wcli/core';
-import { M as Message, c as ContentPart } from './tools-GPWp7oXq.js';
+import { M as Message, c as ContentPart } from './tools-9AUK6SG2.js';
 
 /**
  * On-disk session store for the CLI: each conversation is one JSON file at

package/dist/cli.js

@@ -2590,9 +2590,10 @@ function planMode(opts) {
     parameters: { type: "object", required: ["plan"], properties: { plan: { type: "string", description: "the concrete steps you will take" } } },
     async run({ plan }, _ctx) {
       if (opts?.host?.confirm) {
-        const ok = await opts.host.confirm(`Approve this plan?
+        const confirm = opts.host.confirm(`Approve this plan?
 
 ${String(plan ?? "")}`);
+        const ok = await (_ctx?.parkHuman ? _ctx.parkHuman(confirm) : confirm);
         if (!ok) return "Plan not approved. Revise it and call ExitPlanMode again.";
       }
       approved = true;
@@ -2748,7 +2749,8 @@ var AgentOptions = class {
   tools = defaultTools();
   maxSteps = 25;
   // --- automatic kill-switches (always on; protect the API budget against runaway loops/abuse) ---
-  /** Hard ceiling on accumulated tokens (prompt+completion) across the run. 0 = unbounded. */
+  /** Hard ceiling on accumulated tokens (prompt+completion) across the run; cache READS count at 0.1×
+   *  (their real price) so a fat cached context doesn't trip the guard on healthy turns. 0 = unbounded. */
   maxTokens = 2e5;
   /** Wall-clock ceiling in ms for the whole run. 0 = unbounded. */
   timeoutMs = 12e4;
@@ -2850,6 +2852,18 @@ var Agent = class _Agent {
   // the assembled system prompt from the last prepare()
   started = false;
   // session-start lifecycle hook fires once per conversation
+  parkedMs = 0;
+  // cumulative time blocked on the HUMAN (permission/plan prompts) — excluded from the timeout
+  /** Time a human-blocking await (a permission/plan prompt) and bank it in `parkedMs` so idle prompt
+   *  time never trips the wall-clock kill-switch. The agent did no work while parked on the user. */
+  async park(p) {
+    const t = Date.now();
+    try {
+      return await p;
+    } finally {
+      this.parkedMs += Date.now() - t;
+    }
+  }
   /** Force the next `send()`/`run()` to rebuild the system prompt, tools, plan-mode and permission hooks
    *  from `options` — apply mid-conversation changes to `planMode`/`permissions`/`model` etc. (prepare()
    *  is otherwise memoized per conversation). */
@@ -2878,6 +2892,7 @@ var Agent = class _Agent {
     if (this.options.lintOnWrite) this.ctx.lint = checkSyntax;
     this.ctx.ai = this.options.ai;
     this.ctx.model = this.options.model;
+    this.ctx.parkHuman = (p) => this.park(p);
     if (this.options.backgroundJobs) this.ctx.jobs = new SandboxJobRegistry();
   }
   /**
@@ -3023,19 +3038,21 @@ var Agent = class _Agent {
     const usage = { promptTokens: 0, completionTokens: 0, totalTokens: 0, cacheCreationTokens: 0, cacheReadTokens: 0 };
     let usageEstimated = false;
     const start = Date.now();
+    this.parkedMs = 0;
     let toolCallsTotal = 0;
     let lastFp = "";
     let repeats = 0;
     const kill = (finishReason) => {
-      log3.warn(`kill-switch: ${finishReason} (steps=${steps}, tokens=${usage.totalTokens}, ms=${Date.now() - start})`);
+      log3.warn(`kill-switch: ${finishReason} (steps=${steps}, tokens=${usage.totalTokens}, budgetTokens=${Math.round(usage.totalTokens - 0.9 * usage.cacheReadTokens)}, ms=${Date.now() - start - this.parkedMs}${this.parkedMs ? ` +${this.parkedMs} parked` : ""})`);
       this.ctx.jobs?.killAll();
       return { text: lastAssistantText(this.transcript), steps, finishReason, messages: this.transcript, usage, usageEstimated };
     };
     while (true) {
       if (o.signal?.aborted) return kill("aborted");
       if (steps >= o.maxSteps) return kill("max_steps");
-      if (o.timeoutMs && Date.now() - start >= o.timeoutMs) return kill("timeout");
-      if (o.maxTokens && usage.totalTokens >= o.maxTokens) return kill("budget");
+      if (o.timeoutMs && Date.now() - start - this.parkedMs >= o.timeoutMs) return kill("timeout");
+      const budgetTokens = usage.totalTokens - 0.9 * usage.cacheReadTokens;
+      if (o.maxTokens && budgetTokens >= o.maxTokens) return kill("budget");
       steps++;
       this.options.host?.notify?.({ kind: "turn_start", message: `step ${steps}` });
       let res;
@@ -3170,7 +3187,7 @@ var Agent = class _Agent {
     const hooks = this.activeHooks;
     const call = { name: tc.function.name, args };
     const meta = { id: tc.id };
-    const decision = await hooks?.preToolUse?.(call, meta);
+    const decision = await this.park(Promise.resolve(hooks?.preToolUse?.(call, meta)));
     if (decision?.block) {
       const blocked = `Blocked by hook: ${decision.reason ?? "no reason given"}`;
       log3.debug(`${tc.function.name} -> ${blocked}`);
@@ -3212,6 +3229,7 @@ var Agent = class _Agent {
       this.ctx.emit = void 0;
     }
     if (!threw) result = await this.maybeAutoTest(tc.function.name, result);
+    if (images?.length && !result) result = `[${images.length} image${images.length > 1 ? "s" : ""} attached]`;
     const cap = this.options.maxToolResultBytes ?? 0;
     if (!threw && cap > 0 && result.length > cap) {
       const info = { tool: tc.function.name, args };
@@ -7457,6 +7475,12 @@ var EditorState = class _EditorState {
   pasteChar(c) {
     this.pasteBuf += c;
   }
+  /** Actively grab a clipboard image and attach it (Ctrl-V; same hook as the empty-paste path). */
+  grabClipboard() {
+    const att = this.onEmptyPaste?.();
+    if (att) this.attach(att.display, att.ref);
+    return !!att;
+  }
   endPaste() {
     this.pasting = false;
     const text = this.pasteBuf;
@@ -7887,6 +7911,10 @@ function applyKey(s, key, str) {
   if (key?.ctrl && k === "u") return s.killToStart(), "none";
   if (key?.ctrl && k === "k") return s.killToEnd(), "none";
   if (key?.ctrl && k === "y") return s.yank(), "none";
+  if (key?.ctrl && k === "v") {
+    s.grabClipboard();
+    return "none";
+  }
   if (str === "") return s.undo(), "none";
   if (key?.meta && k === "b") return s.wordLeft(), "none";
   if (key?.meta && k === "f") return s.wordRight(), "none";
@@ -8774,7 +8802,7 @@ REPL multi-line: Option/Alt+Enter inserts a newline, or end a line with \\ to co
 REPL shortcuts: Shift+Tab cycles permission posture (ask \u2192 accept-edits \u2192 plan) \xB7 Alt+T toggles reasoning \xB7 Alt+P switches model \xB7 Ctrl+O toggles verbose tool output \xB7 \u2192 or Tab accepts the dim history ghost-suggestion \xB7 Alt+S/Ctrl+S stash/unstash.
 REPL stash: type while a turn is running \u2192 Enter queues it (auto-submits when the turn finishes). Alt+S (or Ctrl+S) with text stashes it; on an empty prompt pops the next entry for editing.
 REPL editing (emacs/readline): Ctrl-A/E line start/end \xB7 Ctrl-B/F char \xB7 Alt-B/F or Alt/Ctrl-\u2190/\u2192 word \xB7 Ctrl-W kill word \xB7 Ctrl-U/K kill to start/end \xB7 Ctrl-Y yank \xB7 Ctrl-_ undo \xB7 Alt-D kill word fwd \xB7 Ctrl-L clear screen. Set editorMode:'vim' (or /config) for modal vim editing.
-REPL paste: large/multi-line pastes collapse to a [Pasted text +N lines] preview (expands on send); a pasted image/file path attaches as [Image]/[File]; /paste grabs a clipboard image (macOS).`;
+REPL paste: large/multi-line pastes collapse to a [Pasted text +N lines] preview (expands on send); a pasted image/file path attaches as [Image]/[File]; Ctrl-V or /paste grabs a clipboard image (macOS).`;
 function newestModel() {
   return listModels().slice().sort((a, b) => (getModelInfo(b)?.releaseDate ?? "").localeCompare(getModelInfo(a)?.releaseDate ?? ""))[0] ?? "";
 }
@@ -10949,7 +10977,7 @@ ${extra}` : body);
     },
     init: { desc: "scaffold ./AGENTS.md project instructions", run: () => initInstructions(cwd) },
     paste: {
-      desc: "attach an image from the clipboard (macOS) \u2014 /paste [message] sends now, /paste alone attaches to your next message",
+      desc: "attach an image from the clipboard (macOS, = Ctrl-V) \u2014 /paste [message] sends now, /paste alone attaches to your next message",
       run: async (a) => {
         const att = grabClipboardAttachment();
         if (!att) {