@livx.cc/agentx 0.99.122 → 0.99.123

package/README.md

@@ -87,7 +87,7 @@ Beyond file tools, the runtime ships the higher-altitude pieces too — each an
 - **Skills + memory** — VFS-backed (`skillsDir`/`memoryDir`); persistence is just the backend choice.
 - **Subagents** (`subagents`; **typed agents** via `agentsDir` — `<dir>/<name>.md` defines a persona + model + scoped tools, selected with the `Task` `agentType`), **hooks** (`hooks`: preToolUse/postToolUse/onStop — block or audit any tool call), **slash-commands** (`commandsDir`), **TodoWrite**, **MCP** (`mcpToolsToAgentTools`).
 - **A delegated child is a full agent**: it inherits the parent's **tools** (incl. host-injected/MCP ones), **system prompt**, and **providerOptions** (only when it stays on the same provider — cursor's `cwd`/`cursorSession` never leak onto an anthropic child; override with `providerOptionsFor(model)`). `Task({ model })` (and a `TaskBatch` task's `model`) runs one sub-task on another model — alias or full id, precedence **explicit `model` > `agentType` def's `model` > parent's**. A def's frontmatter `tools:` allowlist narrows the inherited set and may name a host-injected tool by name; its body still overrides the persona. The host's `preToolUse` gate is inherited too, so delegation is not a way around it (the observer/lifecycle hooks stay parent-only). Inherited tools that escape the VFS are re-bound per child (`AgentTool.withCwd`): a `isolation:"worktree"` child's real `Shell` runs in the WORKTREE, keeping any host rename (`Shell` -> `Bash`) (background shell jobs are off there, and the parent-bound `ShellOutput`/`ShellStatus`/`ShellKill` are dropped rather than pointed at the parent's jobs); an overlay child's shell writes straight to the working tree — an overlay isolates the VFS, not a process.
-- **Two-model modes** (`src/modes.ts`) — **delegate** (`delegate: { worker }`): the agent's model PLANS and may not write (Write/Edit/MultiEdit/ApplyEdits/bash/Shell are refused at execution, keyed on `ToolContext.model`), `Task`/`TaskBatch` go on (depth 1, children default to the worker, and get the host's `postToolUse` so their writes are observed). **advisor** (`advisor: { model, limit?, snapshot? }`): the agent's model does the work and an `Advise` tool asks the stronger model (≤3 calls; it sees only the request, the host's optional `snapshot()` and the question); the first write waits for one consult. Both are off when the models are equal or either is `cursor/*`; the second model's usage comes back as `RunResult.workerUsage` / `workerModel` (not in `usage`). Prompt directives switch them: `[opus->haiku] task` (delegate), `[haiku<-opus] task` (advisor), `[off]`; keyed forms `delegate:x`, `advisor:x`, `mode:off`. A host passing its own `keys` to `parseDirectives` must list `delegate` / `advisor` / `mode`.
+- **Two-model modes** (`src/modes.ts`) — **delegate** (`delegate: { worker }`): the agent's model PLANS and may not write (Write/Edit/MultiEdit/ApplyEdits/bash/Shell are refused at execution, keyed on `ToolContext.model`), `Task`/`TaskBatch` go on (depth 1, children default to the worker, and get the host's `postToolUse` so their writes are observed). **advisor** (`advisor: { model, limit?, snapshot? }`): the agent's model does the work and an `Advise` tool asks the stronger model (≤3 calls; it sees only the request, the host's optional `snapshot()` and the question); the first write waits for one consult. A `claude-code/*` agent gets the same modes as SDK options (`ccModeOptions`): a planner's native Write/Edit/MultiEdit/NotebookEdit/Bash/Task/Agent are `disallowedTools` and agentx's Task/TaskBatch reach it over the in-process bridge; an advised worker gets `Advise` bridged and a PreToolUse hook that denies native writes until one consult. Mixed pairs (anthropic ↔ claude-code) work. Both are off when the models are equal or either is `cursor/*`; the second model's usage comes back as `RunResult.workerUsage` / `workerModel` (not in `usage`). Prompt directives switch them: `[opus->haiku] task` (delegate), `[haiku<-opus] task` (advisor), `[off]`; keyed forms `delegate:x`, `advisor:x`, `mode:off`. A host passing its own `keys` to `parseDirectives` must list `delegate` / `advisor` / `mode`.
 - **Streaming** (`stream: true` → `text_delta` via `HostBridge.notify`) and **context compaction** (`compaction: { maxMessages }` → edge-safe summarize-and-boundary). Defaults preserve the original non-stream, drop-oldest behavior.
 - **Multi-turn + project context** — `Agent.send()` continues a conversation across turns (vs `run()`, which starts fresh); **project instructions** (`instructionFiles`: `AGENTS.md`/`CLAUDE.md` at the FS root) inject into the system prompt.
 - **DuplexAgent** (`src/duplex.ts`) — voice-optimized three-tier engine (reflex/act/think): a fast reflex agent streams instant replies and self-selects escalation — `Act` for standard tool work (Sonnet-class), `Think` for deep reasoning (Opus-class, configurable, default on). Results are pushed back and re-voiced by the reflex (turn mutex, coalesced completions, `TaskStatus`/`CancelTask`). See [`mind/10`](./mind/10-duplex.md).

package/dist/cli.d.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
-import { u as RouterState, H as Hooks, c as AgentOptions, v as RunResult, e as ChatUsage, R as ReasoningEffort, C as ChannelMode, b as Agent } from './secondChannel-BddfVzTp.js';
+import { v as RouterState, H as Hooks, c as AgentOptions, w as RunResult, f as ChatUsage, R as ReasoningEffort, d as ChannelMode, b as Agent } from './secondChannel-DES_VIeN.js';
 import { IFilesystem } from '@livx.cc/wcli/core';
-import { M as Message, U as UserQuestion, H as HostBridge, c as ContentPart, o as MessageContent } from './tools-DZHZIyxh.js';
+import { M as Message, U as UserQuestion, H as HostBridge, c as ContentPart, o as MessageContent } from './tools-DwfeF8VQ.js';
 
 /**
  * On-disk session store for the CLI: each conversation is one JSON file at

package/dist/cli.js

@@ -825,6 +825,7 @@ var init_tools_structured = __esm({
     };
     writeTool = {
       name: "Write",
+      writes: true,
       description: "Create or overwrite a file with the given contents, creating parent directories as needed. Use for new files instead of `bash echo >`. To replace an EXISTING file you must Read it first \u2014 overwriting an un-Read file is refused (it would destroy unseen content).",
       parameters: {
         type: "object",
@@ -850,6 +851,7 @@ var init_tools_structured = __esm({
     };
     multiEditTool = {
       name: "MultiEdit",
+      writes: true,
       description: "Apply several exact-substring replacements to one file in order, in a single call. Requires a prior Read. Each `old_string` must be unique at the time it is applied. All-or-nothing: if any edit fails, none are written.",
       parameters: {
         type: "object",
@@ -891,6 +893,7 @@ var init_tools_structured = __esm({
     };
     applyEditsTool = {
       name: "ApplyEdits",
+      writes: true,
       description: "Apply edits across one or MORE files in a single call \u2014 for cross-file refactors (rename/extract/move). edits=[{path, old_string?, new_string}]. WITH old_string: replace that exact substring (must be UNIQUE in the file \u2014 add surrounding context; read fresh + verified, no prior Read needed). WITHOUT old_string: write new_string as the whole file (creates it + parent dirs; but to OVERWRITE a file that already exists you must Read it first, else use old_string to edit part of it). Locate sites first with Grep (its output shows the exact text). Atomic: validated across all files before any write.",
       parameters: {
         type: "object",
@@ -1584,6 +1587,7 @@ var init_tools = __esm({
     };
     bashTool = {
       name: "bash",
+      writes: true,
       description: "Run a shell command. Supports ls, cat, grep, find, head, tail, echo, mkdir, rm, mv, cp, wc, pipes (|), redirects (>, >>), and chaining (&&, ||, ;). Best for: running tests/builds, file operations (mkdir/mv/rm), and piped workflows. For searching file contents, prefer `Grep` (structured results, no re-parse). For finding files by name, prefer `Glob`.",
       parameters: {
         type: "object",
@@ -1661,6 +1665,7 @@ var init_tools = __esm({
     };
     editTool = {
       name: "Edit",
+      writes: true,
       description: "Replace an exact substring in a file. Requires a prior Read of the same file. `old_string` must occur exactly once \u2014 include surrounding context to disambiguate.",
       parameters: {
         type: "object",
@@ -2992,6 +2997,7 @@ function makeRealShellTool(options) {
   };
   return {
     name: "Shell",
+    writes: true,
     // Rebind for an isolated child agent (git worktree): same policy/env/timeouts, new cwd. The
     // `registry` is deliberately dropped — it is bound to the PARENT's cwd (and, in hosts like
     // shraga-ee, to the parent's session), so a background job started from the child would run
@@ -3967,8 +3973,8 @@ function memorySearchTool(fs, dirs) {
           return `Error: invalid regex: ${e}`;
         }
       } else {
-        const lower = q2.toLowerCase();
-        matcher = (l) => l.toLowerCase().includes(lower);
+        const lower2 = q2.toLowerCase();
+        matcher = (l) => l.toLowerCase().includes(lower2);
       }
       const loaded = [];
       for (const slug2 of slugs) {
@@ -4618,6 +4624,11 @@ init_logging();
 var log8 = forComponent("modes");
 var WRITE_TOOLS = /* @__PURE__ */ new Set(["Write", "Edit", "MultiEdit", "ApplyEdits"]);
 var PLANNER_BLOCKED = /* @__PURE__ */ new Set([...WRITE_TOOLS, "bash", "Shell"]);
+var lower = (xs) => new Set([...xs].map((x) => x.toLowerCase()));
+var PLANNER_BLOCKED_LC = lower(PLANNER_BLOCKED);
+var WRITE_TOOLS_LC = lower(WRITE_TOOLS);
+var plannerBlocks = (t) => !!t.writes || PLANNER_BLOCKED_LC.has(t.name.toLowerCase());
+var isFileWrite = (t) => WRITE_TOOLS_LC.has(t.name.toLowerCase());
 var PLANNER_REFUSAL = "Refused: you are the planner and do not write files. Delegate the change with Task/TaskBatch (model set to the worker) and give the worker a full spec.";
 var PLAN_FIRST = "Refused: check your plan with `Advise` before the first write (files, data shape, the hard parts). Then write.";
 var ADVISE_LIMIT = 3;
@@ -4640,7 +4651,7 @@ function advisorFor(worker, advisor) {
   return advisor && pairOk("advisor", worker, advisor) ? advisor : void 0;
 }
 function delegateTools(tools, planner) {
-  return tools.map((t) => !PLANNER_BLOCKED.has(t.name) ? t : {
+  return tools.map((t) => !plannerBlocks(t) ? t : {
     ...t,
     run: async (...a) => a[1]?.model === planner ? PLANNER_REFUSAL : t.run(...a)
   });
@@ -4710,7 +4721,7 @@ ${question}` }
       }
     }
   };
-  const gate = (tools) => tools.map((t) => !WRITE_TOOLS.has(t.name) ? t : { ...t, run: async (...a) => used ? t.run(...a) : PLAN_FIRST });
+  const gate = (tools) => tools.map((t) => !isFileWrite(t) ? t : { ...t, run: async (...a) => used ? t.run(...a) : PLAN_FIRST });
   return { tool, gate, used: () => used };
 }
 function meterWorkers(ai, main2) {
@@ -4753,6 +4764,13 @@ function meterWorkers(ai, main2) {
     resolved = void 0;
   } };
 }
+var CC_WRITE_TOOLS = ["Write", "Edit", "MultiEdit", "NotebookEdit"];
+function ccModeOptions(kind, hostHooks, used) {
+  if (kind === "delegate") return { bridge: /* @__PURE__ */ new Set(["Task", "TaskBatch"]), disallow: [...CC_WRITE_TOOLS, "Bash", "Task", "Agent"] };
+  if (kind !== "advisor") return { bridge: /* @__PURE__ */ new Set(), disallow: [] };
+  const gate = { matcher: CC_WRITE_TOOLS.join("|"), hooks: [async () => used() ? {} : { hookSpecificOutput: { hookEventName: "PreToolUse", permissionDecision: "deny", permissionDecisionReason: PLAN_FIRST.replace("`Advise`", "`mcp__agentx__Advise`") } }] };
+  return { bridge: /* @__PURE__ */ new Set(["Advise"]), disallow: [], hooks: { ...hostHooks, PreToolUse: [...hostHooks?.PreToolUse ?? [], gate] } };
+}
 
 // src/lint.ts
 var CODE_RE = /\.(ts|tsx|js|jsx|mjs|cjs)$/;
@@ -5080,6 +5098,8 @@ var Agent = class _Agent {
   meter;
   // delegate/advisor: meters the second model's calls
   modeModel;
+  modeKind;
+  adv;
   lastTask = "";
   // the current turn's text — what the advisor reads as the request
   /** claude-code bridge for agentx-only tools (ccBridge.ts) + the current step's executor it calls. */
@@ -5184,12 +5204,15 @@ var Agent = class _Agent {
     const o = this.options;
     if (!o.model.startsWith("claude-code/")) return void 0;
     const po = { steer: () => this.drainPendingSteers() };
-    const bridged = (t) => o.ccBridge === "all" || CC_BRIDGED.has(t.name);
+    const mode = ccModeOptions(this.modeKind, o.providerOptions?.hooks, () => this.adv?.used() ?? 0);
+    const bridged = (t) => o.ccBridge === "all" || CC_BRIDGED.has(t.name) || mode.bridge.has(t.name);
     if (o.providerOptions?.claudeCodeSession && this.activeTools.some(bridged)) {
       this.ccServer ??= ccToolServer("agentx", () => this.activeTools.filter(bridged), (n, a) => this.ccExec(n, a));
       po.mcpServers = { ...o.providerOptions?.mcpServers, agentx: this.ccServer };
     }
-    const denyTools = claudeCodeDisallowedTools(o.permissions);
+    const denyTools = [...claudeCodeDisallowedTools(o.permissions), ...mode.disallow];
+    if (mode.hooks) po.hooks = mode.hooks;
+    if (this.modeKind && o.providerOptions?.claudeCodeSession) po.claudeCodeSession = `${o.providerOptions.claudeCodeSession}:${this.modeKind}`;
     if (denyTools.length) {
       const prior = o.providerOptions?.disallowedTools ?? [];
       po.disallowedTools = [.../* @__PURE__ */ new Set([...prior, ...denyTools])];
@@ -5287,7 +5310,8 @@ var Agent = class _Agent {
     const advisor = !worker && o.advisor ? advisorFor(o.model, o.advisor.model) : void 0;
     this.meter = worker || advisor ? meterWorkers(o.ai, o.model) : void 0;
     const ai = this.meter?.ai ?? o.ai;
-    const adv = advisor ? makeAdvisor({ ai, advisor, request: () => this.lastTask, snapshot: o.advisor.snapshot, limit: o.advisor.limit }) : void 0;
+    this.modeKind = worker ? "delegate" : advisor ? "advisor" : void 0;
+    const adv = this.adv = advisor ? makeAdvisor({ ai, advisor, request: () => this.lastTask, snapshot: o.advisor.snapshot, limit: o.advisor.limit }) : void 0;
     if (o.instructionFiles !== false) {
       const names = Array.isArray(o.instructionFiles) ? o.instructionFiles : void 0;
       const ins = await loadInstructions(fs, names);
@@ -7389,8 +7413,8 @@ function isTranscriptComplete(text) {
   const lastWord = words4[words4.length - 1];
   if (COMPLETE_ENDINGS.has(lastWord)) return true;
   if (INCOMPLETE_ENDINGS.has(lastWord)) return false;
-  const lower = trimmed.toLowerCase();
-  for (const marker of CONTINUATION_MARKERS) if (lower.endsWith(marker)) return false;
+  const lower2 = trimmed.toLowerCase();
+  for (const marker of CONTINUATION_MARKERS) if (lower2.endsWith(marker)) return false;
   if (words4.length <= 2) return false;
   return true;
 }
@@ -14986,6 +15010,7 @@ function readJsonFile(path, fallback) {
 }
 
 // cli/core.ts
+init_models();
 init_hostPath();
 init_platform();
 var DEFAULT_TOOLS = ["bash", "Read", "Edit", "Write", "Grep", "Glob", "MultiEdit", "ApplyEdits", "RepoMap", "TodoWrite"];
@@ -15182,6 +15207,14 @@ Reference files in them by their mount path (the left side).`;
       const po = providerOptionsFor(o.model, cwd, o.mcpServers, o.hostMcpServers);
       return po ? { providerOptions: o.lean && isClaudeCode ? { ...po, settingSources: [] } : po } : {};
     })(),
+    // A child on ANOTHER provider (delegate mode's anthropic planner → claude-code/* worker, or back) gets that
+    // runtime's own options (cwd, env, MCP) — the Agent default inherits only same-provider options, so a claude-code
+    // worker under an anthropic planner ran with none. Same provider: the Agent default (parent's, minus its resume).
+    providerOptionsFor: (m) => {
+      const a = agentRef.agent, po = a?.options.providerOptions;
+      if (modelProvider(m) === modelProvider(a?.options.model ?? "")) return po ? { ...po, resume: void 0, onClaudeCodeSession: void 0 } : void 0;
+      return providerOptionsFor(m, cwd, o.mcpServers, o.hostMcpServers);
+    },
     ...(() => {
       const now4 = /* @__PURE__ */ new Date();
       const platformNames = { darwin: "macOS", linux: "Linux", win32: "Windows" };