agent.libx.js 0.94.18 → 0.94.20

package/dist/index.d.ts

@@ -1,11 +1,11 @@
-import { a as AgentOptions, H as Hooks, h as RunResult, A as Agent } from './Agent-COa80xYy.js';
-export { C as ChatFragment, D as DEFAULT_MUTATING, b as Decision, P as PermissionOptions, c as PermissionPolicy, d as PermissionRule, e as PreToolUseDecision, R as ReasoningEffort, f as RecordingHooks, g as RecordingLifecycle, T as ToolUse, i as ToolUseMeta, j as composeHooks, p as planMode, r as reasoningToChatFragment } from './Agent-COa80xYy.js';
+import { a as AgentOptions, H as Hooks, h as RunResult, A as Agent } from './Agent-DmsB5hzp.js';
+export { C as ChatFragment, D as DEFAULT_MUTATING, b as Decision, P as PermissionOptions, c as PermissionPolicy, d as PermissionRule, e as PreToolUseDecision, R as ReasoningEffort, f as RecordingHooks, g as RecordingLifecycle, T as ToolUse, i as ToolUseMeta, j as composeHooks, p as planMode, r as reasoningToChatFragment } from './Agent-DmsB5hzp.js';
 import { IFilesystem, FileMetadata } from '@livx.cc/wcli/core';
 export { CommandExecutor, FileMetadata, IFilesystem, IndexedDbFilesystem, MemFilesystem, registerHeadlessCommands } from '@livx.cc/wcli/core';
 import { BodDB } from '@bod.ee/db';
-import { A as AgentTool, C as ChatLike, a as ChatOptions, b as ChatResponse, h as ToolCall, H as HostBridge, U as UserQuestion, e as MessageContent } from './tools-GPWp7oXq.js';
-export { c as ContentPart, d as HostEvent, M as Message, R as Role, S as SandboxJobRegistry, f as StreamChunk, T as TodoItem, g as Tool, i as ToolContext, j as bashTool, k as contentText, l as defaultTools, m as editTool, n as exitSessionTool, o as imagePart, p as makeContext, q as makeJobTools, r as readTool, t as toWireTools, s as todoWriteTool, u as toolRegistry, v as toolsByName } from './tools-GPWp7oXq.js';
-export { M as McpCall, a as McpImage, b as McpRoute, c as McpRouteResolver, d as McpToolResult, e as McpToolSearchOptions, f as McpToolSpec, g as MountedMcpLike, h as buildMcpCatalog, m as makeLazyMcpToolSearch, i as makeMcpToolSearch, j as makeMcpToolSearchFromMounted, k as mcpToolToAgentTool, l as mcpToolsToAgentTools } from './mcp-C5GuDinb.js';
+import { A as AgentTool, C as ChatLike, a as ChatOptions, b as ChatResponse, h as ToolCall, H as HostBridge, U as UserQuestion, e as MessageContent } from './tools-9AUK6SG2.js';
+export { c as ContentPart, d as HostEvent, M as Message, R as Role, S as SandboxJobRegistry, f as StreamChunk, T as TodoItem, g as Tool, i as ToolContext, j as bashTool, k as contentText, l as defaultTools, m as editTool, n as exitSessionTool, o as imagePart, p as makeContext, q as makeJobTools, r as readTool, t as toWireTools, s as todoWriteTool, u as toolRegistry, v as toolsByName } from './tools-9AUK6SG2.js';
+export { M as McpCall, a as McpImage, b as McpRoute, c as McpRouteResolver, d as McpToolResult, e as McpToolSearchOptions, f as McpToolSpec, g as MountedMcpLike, h as buildMcpCatalog, m as makeLazyMcpToolSearch, i as makeMcpToolSearch, j as makeMcpToolSearchFromMounted, k as mcpToolToAgentTool, l as mcpToolsToAgentTools } from './mcp-D00OuccC.js';
 import * as libx_js_src_modules_log from 'libx.js/src/modules/log';
 export { log } from 'libx.js/src/modules/log';
 
@@ -590,6 +590,8 @@ interface SkillInfo {
  * adds the catalog + a convenience tool. (Executable skills can be `bash`-exec'd: wcli
  * runs JS files from the VFS as commands.)
  */
+/** Scan `dir`(s) for `<dir>/<id>/SKILL.md` entries (first dir wins on duplicate ids). */
+declare function scanSkills(fs: IFilesystem, dir: string | string[]): Promise<SkillInfo[]>;
 declare function loadSkills(fs: IFilesystem, dir: string | string[], opts?: {
     relevanceHint?: string;
     max?: number;
@@ -644,6 +646,8 @@ declare function expandCommand(fs: IFilesystem, cmd: CommandInfo, args: string):
  * VFS files. The template body is returned (user args appended, and `$ARGUMENTS`
  * substituted if present) so the model can act on it. Mirrors loadSkills.
  */
+/** Scan `dir`(s) for `<dir>/<name>.md` command templates (first dir wins on duplicate names). */
+declare function scanCommands(fs: IFilesystem, dir: string | string[]): Promise<CommandInfo[]>;
 declare function loadCommands(fs: IFilesystem, dir: string | string[], opts?: {
     relevanceHint?: string;
     max?: number;
@@ -1261,4 +1265,4 @@ declare class CartesiaTTS {
     close(): void;
 }
 
-export { Agent, type AgentDef, AgentOptions, AgentTool, type AskOptions, type Attempt, type AudioSink, type AudioSource, type AuthProvider, BodDbFilesystem, CartesiaTTS, CartesiaTTSOptions, ChatLike, ChatOptions, ChatResponse, type CommandInfo, ConsoleHostBridge, DEFAULT_DENY, DuplexAgent, DuplexAgentOptions, type DuplexTaskStatus, FakeAIClient, Hooks, HostBridge, JailOptions, JailedFilesystem, type LessonOptions, LessonOptionsDefaults, type LoadMemoryOpts, MEMORY_PROMPT, MessageContent, type Mount, MountFilesystem, NodeDiskFilesystem, OverlayFilesystem, type ReflectOptions, RunResult, SCRATCH_DIR, STT_SAMPLE_RATE, type ScheduledJob, type ScheduledJobSnapshot, Scheduler, type SchedulerOptions, Scratch, type ScratchOptions, ScriptedHostBridge, type SkillInfo, SonioxSTT, SonioxSTTOptions, type SttLike, TTS_SAMPLE_RATE, type TaskRecord, type TaskToolOptions, ToolCall, type ToolSpec, type Trigger, type TriggerCron, type TriggerInterval, type TriggerOneOff, type TtsLike, UserQuestion, VOICE_MEMORY_PROMPT, VOICE_SYSTEM_PROMPT, VoiceEngine, VoiceEngineOptions, type VoiceState, type WebFetchOptions, type WebSearchOptions, type WorkerTier, applyEditsTool, askUserQuestionTool, checkpointTool, checkpointTools, compileSynthesizedTool, cronMatches, decodeDdgUrl, diskAgentOptions, expandCommand, expandTemplate, forComponent, fullAgentOptions, globTool, grepTool, htmlToText, idfWeights, lessonCapture, loadAgents, loadCommands, loadInstructions, loadMemory, loadSkills, makeAskTool, makeScheduleTools, makeTaskBatchTool, makeTaskTool, makeWebFetchTool, makeWebSearchTool, mkdirp, multiEditTool, nextCronAfter, parseCron, parseDdgHtml, raceAttempts, reflectOnRun, relevanceScore, repoIndex, repoMapTool, resolveAuth, rollbackTool, sandboxAgentOptions, slugify, tokenize, toolCall, topByRelevance, validateToolCode, webFetchTool, webSearchTool, writeFact, writeTool };
+export { Agent, type AgentDef, AgentOptions, AgentTool, type AskOptions, type Attempt, type AudioSink, type AudioSource, type AuthProvider, BodDbFilesystem, CartesiaTTS, CartesiaTTSOptions, ChatLike, ChatOptions, ChatResponse, type CommandInfo, ConsoleHostBridge, DEFAULT_DENY, DuplexAgent, DuplexAgentOptions, type DuplexTaskStatus, FakeAIClient, Hooks, HostBridge, JailOptions, JailedFilesystem, type LessonOptions, LessonOptionsDefaults, type LoadMemoryOpts, MEMORY_PROMPT, MessageContent, type Mount, MountFilesystem, NodeDiskFilesystem, OverlayFilesystem, type ReflectOptions, RunResult, SCRATCH_DIR, STT_SAMPLE_RATE, type ScheduledJob, type ScheduledJobSnapshot, Scheduler, type SchedulerOptions, Scratch, type ScratchOptions, ScriptedHostBridge, type SkillInfo, SonioxSTT, SonioxSTTOptions, type SttLike, TTS_SAMPLE_RATE, type TaskRecord, type TaskToolOptions, ToolCall, type ToolSpec, type Trigger, type TriggerCron, type TriggerInterval, type TriggerOneOff, type TtsLike, UserQuestion, VOICE_MEMORY_PROMPT, VOICE_SYSTEM_PROMPT, VoiceEngine, VoiceEngineOptions, type VoiceState, type WebFetchOptions, type WebSearchOptions, type WorkerTier, applyEditsTool, askUserQuestionTool, checkpointTool, checkpointTools, compileSynthesizedTool, cronMatches, decodeDdgUrl, diskAgentOptions, expandCommand, expandTemplate, forComponent, fullAgentOptions, globTool, grepTool, htmlToText, idfWeights, lessonCapture, loadAgents, loadCommands, loadInstructions, loadMemory, loadSkills, makeAskTool, makeScheduleTools, makeTaskBatchTool, makeTaskTool, makeWebFetchTool, makeWebSearchTool, mkdirp, multiEditTool, nextCronAfter, parseCron, parseDdgHtml, raceAttempts, reflectOnRun, relevanceScore, repoIndex, repoMapTool, resolveAuth, rollbackTool, sandboxAgentOptions, scanCommands, scanSkills, slugify, tokenize, toolCall, topByRelevance, validateToolCode, webFetchTool, webSearchTool, writeFact, writeTool };

package/dist/index.js

@@ -1980,7 +1980,7 @@ function parseFrontmatter(md) {
   const b = block || md.slice(0, 600);
   return { name: grabField(b, "name"), description: grabField(b, "description") };
 }
-async function loadSkills(fs, dir, opts = {}) {
+async function scanSkills(fs, dir) {
   const skills = [];
   const seen = /* @__PURE__ */ new Set();
   for (const d of Array.isArray(dir) ? dir : [dir]) {
@@ -1995,6 +1995,10 @@ async function loadSkills(fs, dir, opts = {}) {
       }
     }
   }
+  return skills;
+}
+async function loadSkills(fs, dir, opts = {}) {
+  const skills = await scanSkills(fs, dir);
   if (skills.length === 0) return { skills, catalog: "" };
   const { kept, rest } = topByRelevance(skills, opts.relevanceHint ?? "", (s) => `${s.name} ${s.description}`, opts.max ?? MAX_CATALOG);
   const catalog = "## Skills (load one before acting on a matching task)\n" + kept.map((s) => `- **${s.name}** \u2014 ${s.description} (\`${s.path}\`)`).join("\n") + (rest.length ? `
@@ -2004,8 +2008,13 @@ async function loadSkills(fs, dir, opts = {}) {
     description: "Load a skill by name \u2014 returns its full instructions (SKILL.md). Use when a task matches a listed skill.",
     parameters: { type: "object", required: ["name"], properties: { name: { type: "string" } } },
     async run({ name }, ctx) {
-      const s = skills.find((x) => x.name === name);
-      if (!s) return `Error: no skill named '${name}'. Available: ${skills.map((x) => x.name).join(", ")}`;
+      let s = skills.find((x) => x.name === name);
+      if (!s) {
+        const fresh = await scanSkills(ctx.fs, dir);
+        s = fresh.find((x) => x.name === name);
+        if (!s) return `Error: no skill named '${name}'. Available: ${fresh.map((x) => x.name).join(", ")}`;
+        skills.push(s);
+      }
       return ctx.fs.readFile(s.path);
     }
   };
@@ -2046,7 +2055,7 @@ async function expandCommand(fs, cmd, args) {
   const { body } = parseFrontmatter2(await fs.readFile(cmd.path));
   return embedFiles(expandTemplate(body, args), fs);
 }
-async function loadCommands(fs, dir, opts = {}) {
+async function scanCommands(fs, dir) {
   const commands = [];
   const seen = /* @__PURE__ */ new Set();
   for (const d of Array.isArray(dir) ? dir : [dir]) {
@@ -2061,6 +2070,10 @@ async function loadCommands(fs, dir, opts = {}) {
       commands.push({ name, description: fm.description || "", path });
     }
   }
+  return commands;
+}
+async function loadCommands(fs, dir, opts = {}) {
+  const commands = await scanCommands(fs, dir);
   if (commands.length === 0) return { commands, catalog: "" };
   const { kept, rest } = topByRelevance(commands, opts.relevanceHint ?? "", (c) => `${c.name} ${c.description}`, opts.max ?? MAX_CATALOG2);
   const catalog = "## Slash commands (reusable prompt templates)\n" + kept.map((c) => `- **/${c.name}** \u2014 ${c.description} (\`${c.path}\`)`).join("\n") + (rest.length ? `
@@ -2075,8 +2088,13 @@ async function loadCommands(fs, dir, opts = {}) {
     },
     async run({ name, args }, ctx) {
       const slug2 = String(name ?? "").replace(/^\//, "");
-      const c = commands.find((x) => x.name === slug2);
-      if (!c) return `Error: no command named '${slug2}'. Available: ${commands.map((x) => x.name).join(", ")}`;
+      let c = commands.find((x) => x.name === slug2);
+      if (!c) {
+        const fresh = await scanCommands(ctx.fs, dir);
+        c = fresh.find((x) => x.name === slug2);
+        if (!c) return `Error: no command named '${slug2}'. Available: ${fresh.map((x) => x.name).join(", ")}`;
+        commands.push(c);
+      }
       return expandCommand(ctx.fs, c, String(args ?? ""));
     }
   };
@@ -2586,9 +2604,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;
@@ -2744,7 +2763,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;
@@ -2846,6 +2866,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). */
@@ -2874,6 +2906,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();
   }
   /**
@@ -3019,19 +3052,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;
@@ -3166,7 +3201,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}`);
@@ -3208,6 +3243,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 };
@@ -5822,6 +5858,8 @@ export {
   resolveAuth,
   rollbackTool,
   sandboxAgentOptions,
+  scanCommands,
+  scanSkills,
   slugify,
   toWireTools,
   todoWriteTool,