@cjhyy/code-shell 0.1.0-alpha.1 → 0.1.0-alpha.3

package/dist/settings/schema.d.ts

@@ -30,18 +30,18 @@ export declare const SettingsSchema: z.ZodObject<{
         temperature: z.ZodDefault<z.ZodNumber>;
         maxTokens: z.ZodDefault<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
+        provider: string;
         name: string;
         maxTokens: number;
         baseUrl: string;
-        provider: string;
         temperature: number;
         apiKey?: string | undefined;
     }, {
+        provider?: string | undefined;
         name?: string | undefined;
         maxTokens?: number | undefined;
-        baseUrl?: string | undefined;
-        provider?: string | undefined;
         apiKey?: string | undefined;
+        baseUrl?: string | undefined;
         temperature?: number | undefined;
     }>>;
     models: z.ZodDefault<z.ZodArray<z.ZodObject<{
@@ -52,22 +52,25 @@ export declare const SettingsSchema: z.ZodObject<{
         baseUrl: z.ZodOptional<z.ZodString>;
         apiKey: z.ZodOptional<z.ZodString>;
         maxOutputTokens: z.ZodOptional<z.ZodNumber>;
+        maxContextTokens: z.ZodOptional<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
+        provider: string;
         model: string;
         key: string;
-        provider: string;
-        baseUrl?: string | undefined;
         apiKey?: string | undefined;
+        baseUrl?: string | undefined;
         label?: string | undefined;
         maxOutputTokens?: number | undefined;
+        maxContextTokens?: number | undefined;
     }, {
+        provider: string;
         model: string;
         key: string;
-        provider: string;
-        baseUrl?: string | undefined;
         apiKey?: string | undefined;
+        baseUrl?: string | undefined;
         label?: string | undefined;
         maxOutputTokens?: number | undefined;
+        maxContextTokens?: number | undefined;
     }>, "many">>;
     permissions: z.ZodDefault<z.ZodObject<{
         defaultMode: z.ZodDefault<z.ZodEnum<["default", "acceptEdits", "dontAsk", "bypassPermissions", "auto", "plan"]>>;
@@ -178,31 +181,31 @@ export declare const SettingsSchema: z.ZodObject<{
         }, "strip", z.ZodTypeAny, {
             model: string;
             name: string;
-            baseUrl?: string | undefined;
             provider?: string | undefined;
             apiKey?: string | undefined;
+            baseUrl?: string | undefined;
         }, {
             model: string;
             name: string;
-            baseUrl?: string | undefined;
             provider?: string | undefined;
             apiKey?: string | undefined;
+            baseUrl?: string | undefined;
         }>]>, "many">>;
     }, "strip", z.ZodTypeAny, {
         participants: (string | {
             model: string;
             name: string;
-            baseUrl?: string | undefined;
             provider?: string | undefined;
             apiKey?: string | undefined;
+            baseUrl?: string | undefined;
         })[];
     }, {
         participants?: (string | {
             model: string;
             name: string;
-            baseUrl?: string | undefined;
             provider?: string | undefined;
             apiKey?: string | undefined;
+            baseUrl?: string | undefined;
         })[] | undefined;
     }>>;
     search: z.ZodDefault<z.ZodObject<{
@@ -211,12 +214,12 @@ export declare const SettingsSchema: z.ZodObject<{
         baseUrl: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         provider: "serper" | "tavily" | "searxng";
-        baseUrl?: string | undefined;
         apiKey?: string | undefined;
-    }, {
         baseUrl?: string | undefined;
+    }, {
         provider?: "serper" | "tavily" | "searxng" | undefined;
         apiKey?: string | undefined;
+        baseUrl?: string | undefined;
     }>>;
     output: z.ZodDefault<z.ZodObject<{
         format: z.ZodDefault<z.ZodEnum<["text", "json", "jsonl", "stream-json"]>>;
@@ -253,18 +256,18 @@ export declare const SettingsSchema: z.ZodObject<{
         temperature: z.ZodDefault<z.ZodNumber>;
         maxTokens: z.ZodDefault<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
+        provider: string;
         name: string;
         maxTokens: number;
         baseUrl: string;
-        provider: string;
         temperature: number;
         apiKey?: string | undefined;
     }, {
+        provider?: string | undefined;
         name?: string | undefined;
         maxTokens?: number | undefined;
-        baseUrl?: string | undefined;
-        provider?: string | undefined;
         apiKey?: string | undefined;
+        baseUrl?: string | undefined;
         temperature?: number | undefined;
     }>>;
     models: z.ZodDefault<z.ZodArray<z.ZodObject<{
@@ -275,22 +278,25 @@ export declare const SettingsSchema: z.ZodObject<{
         baseUrl: z.ZodOptional<z.ZodString>;
         apiKey: z.ZodOptional<z.ZodString>;
         maxOutputTokens: z.ZodOptional<z.ZodNumber>;
+        maxContextTokens: z.ZodOptional<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
+        provider: string;
         model: string;
         key: string;
-        provider: string;
-        baseUrl?: string | undefined;
         apiKey?: string | undefined;
+        baseUrl?: string | undefined;
         label?: string | undefined;
         maxOutputTokens?: number | undefined;
+        maxContextTokens?: number | undefined;
     }, {
+        provider: string;
         model: string;
         key: string;
-        provider: string;
-        baseUrl?: string | undefined;
         apiKey?: string | undefined;
+        baseUrl?: string | undefined;
         label?: string | undefined;
         maxOutputTokens?: number | undefined;
+        maxContextTokens?: number | undefined;
     }>, "many">>;
     permissions: z.ZodDefault<z.ZodObject<{
         defaultMode: z.ZodDefault<z.ZodEnum<["default", "acceptEdits", "dontAsk", "bypassPermissions", "auto", "plan"]>>;
@@ -401,31 +407,31 @@ export declare const SettingsSchema: z.ZodObject<{
         }, "strip", z.ZodTypeAny, {
             model: string;
             name: string;
-            baseUrl?: string | undefined;
             provider?: string | undefined;
             apiKey?: string | undefined;
+            baseUrl?: string | undefined;
         }, {
             model: string;
             name: string;
-            baseUrl?: string | undefined;
             provider?: string | undefined;
             apiKey?: string | undefined;
+            baseUrl?: string | undefined;
         }>]>, "many">>;
     }, "strip", z.ZodTypeAny, {
         participants: (string | {
             model: string;
             name: string;
-            baseUrl?: string | undefined;
             provider?: string | undefined;
             apiKey?: string | undefined;
+            baseUrl?: string | undefined;
         })[];
     }, {
         participants?: (string | {
             model: string;
             name: string;
-            baseUrl?: string | undefined;
             provider?: string | undefined;
             apiKey?: string | undefined;
+            baseUrl?: string | undefined;
         })[] | undefined;
     }>>;
     search: z.ZodDefault<z.ZodObject<{
@@ -434,12 +440,12 @@ export declare const SettingsSchema: z.ZodObject<{
         baseUrl: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         provider: "serper" | "tavily" | "searxng";
-        baseUrl?: string | undefined;
         apiKey?: string | undefined;
-    }, {
         baseUrl?: string | undefined;
+    }, {
         provider?: "serper" | "tavily" | "searxng" | undefined;
         apiKey?: string | undefined;
+        baseUrl?: string | undefined;
     }>>;
     output: z.ZodDefault<z.ZodObject<{
         format: z.ZodDefault<z.ZodEnum<["text", "json", "jsonl", "stream-json"]>>;
@@ -476,18 +482,18 @@ export declare const SettingsSchema: z.ZodObject<{
         temperature: z.ZodDefault<z.ZodNumber>;
         maxTokens: z.ZodDefault<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
+        provider: string;
         name: string;
         maxTokens: number;
         baseUrl: string;
-        provider: string;
         temperature: number;
         apiKey?: string | undefined;
     }, {
+        provider?: string | undefined;
         name?: string | undefined;
         maxTokens?: number | undefined;
-        baseUrl?: string | undefined;
-        provider?: string | undefined;
         apiKey?: string | undefined;
+        baseUrl?: string | undefined;
         temperature?: number | undefined;
     }>>;
     models: z.ZodDefault<z.ZodArray<z.ZodObject<{
@@ -498,22 +504,25 @@ export declare const SettingsSchema: z.ZodObject<{
         baseUrl: z.ZodOptional<z.ZodString>;
         apiKey: z.ZodOptional<z.ZodString>;
         maxOutputTokens: z.ZodOptional<z.ZodNumber>;
+        maxContextTokens: z.ZodOptional<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
+        provider: string;
         model: string;
         key: string;
-        provider: string;
-        baseUrl?: string | undefined;
         apiKey?: string | undefined;
+        baseUrl?: string | undefined;
         label?: string | undefined;
         maxOutputTokens?: number | undefined;
+        maxContextTokens?: number | undefined;
     }, {
+        provider: string;
         model: string;
         key: string;
-        provider: string;
-        baseUrl?: string | undefined;
         apiKey?: string | undefined;
+        baseUrl?: string | undefined;
         label?: string | undefined;
         maxOutputTokens?: number | undefined;
+        maxContextTokens?: number | undefined;
     }>, "many">>;
     permissions: z.ZodDefault<z.ZodObject<{
         defaultMode: z.ZodDefault<z.ZodEnum<["default", "acceptEdits", "dontAsk", "bypassPermissions", "auto", "plan"]>>;
@@ -624,31 +633,31 @@ export declare const SettingsSchema: z.ZodObject<{
         }, "strip", z.ZodTypeAny, {
             model: string;
             name: string;
-            baseUrl?: string | undefined;
             provider?: string | undefined;
             apiKey?: string | undefined;
+            baseUrl?: string | undefined;
         }, {
             model: string;
             name: string;
-            baseUrl?: string | undefined;
             provider?: string | undefined;
             apiKey?: string | undefined;
+            baseUrl?: string | undefined;
         }>]>, "many">>;
     }, "strip", z.ZodTypeAny, {
         participants: (string | {
             model: string;
             name: string;
-            baseUrl?: string | undefined;
             provider?: string | undefined;
             apiKey?: string | undefined;
+            baseUrl?: string | undefined;
         })[];
     }, {
         participants?: (string | {
             model: string;
             name: string;
-            baseUrl?: string | undefined;
             provider?: string | undefined;
             apiKey?: string | undefined;
+            baseUrl?: string | undefined;
         })[] | undefined;
     }>>;
     search: z.ZodDefault<z.ZodObject<{
@@ -657,12 +666,12 @@ export declare const SettingsSchema: z.ZodObject<{
         baseUrl: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         provider: "serper" | "tavily" | "searxng";
-        baseUrl?: string | undefined;
         apiKey?: string | undefined;
-    }, {
         baseUrl?: string | undefined;
+    }, {
         provider?: "serper" | "tavily" | "searxng" | undefined;
         apiKey?: string | undefined;
+        baseUrl?: string | undefined;
     }>>;
     output: z.ZodDefault<z.ZodObject<{
         format: z.ZodDefault<z.ZodEnum<["text", "json", "jsonl", "stream-json"]>>;

package/dist/{tool-summary-J2ICNMWP.js → tool-summary-2RUFL5QK.js}

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-X4HAERTQ.js";
+} from "./chunk-ZRVPCXI7.js";
 import {
   init_esm_shims
 } from "./chunk-DI7RDLOS.js";

package/dist/{tool-summary-5P2GKRA4.cjs → tool-summary-RYNR4DDB.cjs}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
-var _chunkIMMTBZ33cjs = require('./chunk-IMMTBZ33.cjs');
+var _chunkJHNCK7JPcjs = require('./chunk-JHNCK7JP.cjs');
 
 
 var _chunkIJSHQGMPcjs = require('./chunk-IJSHQGMP.cjs');
@@ -22,7 +22,7 @@ async function generateToolUseSummary(toolCalls, results, summarize) {
     const summary = await summarize(SUMMARY_SYSTEM_PROMPT, parts.join("\n"));
     return _optionalChain([summary, 'optionalAccess', _3 => _3.trim, 'call', _4 => _4()]) || null;
   } catch (err) {
-    _chunkIMMTBZ33cjs.logger.warn("tool_summary.failed", { error: err.message });
+    _chunkJHNCK7JPcjs.logger.warn("tool_summary.failed", { error: err.message });
     return null;
   }
 }

package/dist/tool-system/builtin/agent.d.ts

@@ -6,33 +6,10 @@
  * Supports AbortSignal for cascading cancellation.
  * Supports onStream for real-time output passthrough.
  */
-import type { ToolDefinition, StreamCallback } from "../../types.js";
-import type { AgentPresetName } from "../../preset/index.js";
+import type { ToolDefinition } from "../../types.js";
+import type { ToolContext } from "../context.js";
 export declare const agentToolDef: ToolDefinition;
-export interface SubAgentConfig {
-    llm: import("../../types.js").LLMConfig;
-    cwd: string;
-    permissionMode: string;
-    preset?: AgentPresetName;
-    enabledBuiltinTools?: string[];
-    disabledBuiltinTools?: string[];
-    customSystemPrompt?: string;
-    appendSystemPrompt?: string;
-    maxContextTokens: number;
-    sessionStorageDir?: string;
-    onStream?: StreamCallback;
-    createEngine: (config: Record<string, unknown>) => {
-        run(task: string, options?: {
-            signal?: AbortSignal;
-            onStream?: StreamCallback;
-        }): Promise<{
-            text: string;
-            reason: string;
-        }>;
-    };
-}
-export declare function setSubAgentConfig(config: SubAgentConfig | undefined): void;
-export declare function agentTool(args: Record<string, unknown>): Promise<string>;
+export declare function agentTool(args: Record<string, unknown>, ctx?: ToolContext): Promise<string>;
 export declare const agentStatusToolDef: ToolDefinition;
 export declare function agentStatusTool(args: Record<string, unknown>): Promise<string>;
 export declare const agentCancelToolDef: ToolDefinition;

package/dist/tool-system/builtin/apply-patch/applier.d.ts

@@ -0,0 +1,26 @@
+import { Hunk } from "./types.js";
+export interface ApplyPatchOptions {
+    /** Working directory for resolving relative paths in the patch. */
+    cwd: string;
+    /**
+     * If true, skip the snapshot/rollback safety net and apply each planned
+     * change one at a time, leaving partial work on disk if a later write
+     * fails. Mostly useful for codex-parity testing. Default: false.
+     */
+    allowPartialOnCommit?: boolean;
+}
+export interface ApplyPatchResult {
+    added: string[];
+    modified: string[];
+    deleted: string[];
+}
+/**
+ * Plan and commit the patch atomically.
+ *
+ * Phase 1 (plan): walk every hunk, compute the resulting file content in
+ * memory. Throws if any hunk cannot be applied; nothing is written.
+ *
+ * Phase 2 (commit): write all planned changes. If any write fails, restore
+ * from the in-memory snapshot captured in phase 1 and rethrow.
+ */
+export declare function applyPatch(hunks: Hunk[], options: ApplyPatchOptions): Promise<ApplyPatchResult>;

package/dist/tool-system/builtin/apply-patch/index.d.ts

@@ -0,0 +1,19 @@
+/**
+ * ApplyPatch tool — atomic, multi-file V4A patch application.
+ *
+ * Adapted from openai/codex codex-rs/apply-patch (Apache-2.0). See LICENSE-codex.
+ *
+ * Compared to Codex's reference implementation:
+ *   - We dry-run all hunks first; nothing is written until every hunk
+ *     successfully resolves.
+ *   - On commit we snapshot every target file, so a write failure rolls back
+ *     to the pre-patch state instead of leaving partial changes.
+ *
+ * Compared to CodeShell's existing Edit:
+ *   - Multi-file in one call (cuts LLM round-trips for large changes).
+ *   - Supports create / update / delete / rename in one transaction.
+ *   - Context-anchor matching tolerates whitespace and Unicode quirks.
+ */
+import type { ToolDefinition } from "../../../types.js";
+export declare const applyPatchToolDef: ToolDefinition;
+export declare function applyPatchTool(args: Record<string, unknown>): Promise<string>;

package/dist/tool-system/builtin/apply-patch/parser.d.ts

@@ -0,0 +1,17 @@
+import { Hunk } from "./types.js";
+export declare const BEGIN_PATCH_MARKER = "*** Begin Patch";
+export declare const END_PATCH_MARKER = "*** End Patch";
+export declare const ADD_FILE_MARKER = "*** Add File: ";
+export declare const DELETE_FILE_MARKER = "*** Delete File: ";
+export declare const UPDATE_FILE_MARKER = "*** Update File: ";
+export declare const MOVE_TO_MARKER = "*** Move to: ";
+export declare const EOF_MARKER = "*** End of File";
+export declare const CHANGE_CONTEXT_MARKER = "@@ ";
+export declare const EMPTY_CHANGE_CONTEXT_MARKER = "@@";
+export interface ParsedPatch {
+    hunks: Hunk[];
+    /** The patch body with any heredoc wrapper stripped. */
+    patch: string;
+}
+export type ParseMode = "strict" | "lenient";
+export declare function parsePatch(text: string, mode?: ParseMode): ParsedPatch;

package/dist/tool-system/builtin/apply-patch/seek-sequence.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Locate `pattern` within `lines` starting at or after `start`.
+ *
+ * Tries four passes with decreasing strictness:
+ *   1. exact equality
+ *   2. trailing whitespace ignored
+ *   3. leading + trailing whitespace ignored
+ *   4. Unicode punctuation normalized to ASCII (smart quotes, em-dashes, NBSP, …)
+ *
+ * When `eof` is true, search begins at the position that would let `pattern`
+ * end exactly at the end of `lines` — useful for chunks marked
+ * `*** End of File`. Falls back to `start` if that position is out of range.
+ *
+ * Defensive cases:
+ *   - Empty pattern returns `start` (no-op match).
+ *   - Pattern longer than input returns `null`.
+ */
+export declare function seekSequence(lines: string[], pattern: string[], start: number, eof: boolean): number | null;

package/dist/tool-system/builtin/apply-patch/types.d.ts

@@ -0,0 +1,49 @@
+/**
+ * V4A patch AST. A parsed patch is a list of Hunks; each Hunk targets one file.
+ *
+ * Three variants:
+ *   - AddFile:    create a new file with the given contents
+ *   - DeleteFile: remove an existing file
+ *   - UpdateFile: in-place edit (optionally with a rename via movePath),
+ *                 expressed as one or more UpdateFileChunks.
+ */
+export type Hunk = {
+    kind: "add";
+    path: string;
+    contents: string;
+} | {
+    kind: "delete";
+    path: string;
+} | {
+    kind: "update";
+    path: string;
+    movePath?: string;
+    chunks: UpdateFileChunk[];
+};
+export interface UpdateFileChunk {
+    /** Optional `@@ <context>` anchor that narrows where this chunk applies. */
+    changeContext?: string;
+    /** Lines that must match in the existing file (` ` and `-` markers). */
+    oldLines: string[];
+    /** Lines that should appear after the edit (` ` and `+` markers). */
+    newLines: string[];
+    /** True if this chunk ended with `*** End of File`; matches only at EOF. */
+    isEndOfFile: boolean;
+}
+export declare class PatchParseError extends Error {
+    readonly kind: "InvalidPatch" | "InvalidHunk";
+    readonly lineNumber?: number;
+    constructor(kind: "InvalidPatch" | "InvalidHunk", message: string, lineNumber?: number);
+}
+/**
+ * Result of staging (dry-run) a single file's planned change.
+ *
+ * A rename is represented as two PlannedFileChange entries: one for the
+ * source path with `newContent: null` (delete) and one for the destination
+ * path with the new content.
+ */
+export interface PlannedFileChange {
+    path: string;
+    /** null = delete; string = create-or-overwrite with this content. */
+    newContent: string | null;
+}

package/dist/tool-system/builtin/arena.d.ts

@@ -8,11 +8,24 @@
  * setArenaLLMConfig(), following the same pattern as setAskUserFn() and
  * setSubAgentConfig().
  */
-import type { ToolDefinition, LLMConfig } from "../../types.js";
+import type { ToolDefinition } from "../../types.js";
+import type { ToolContext } from "../context.js";
 export declare const arenaToolDef: ToolDefinition;
 /**
- * Inject the engine's LLM config so Arena participants inherit baseUrl/apiKey.
- * Called by Engine.run() alongside setAskUserFn(), setSubAgentConfig(), etc.
+ * Snapshot of what Arena would do right now if invoked. Used by the
+ * `/arena` REPL command (via the protocol `arena_status` query) so
+ * users can see participants/endpoint before launching a run.
  */
-export declare function setArenaLLMConfig(config: LLMConfig | undefined): void;
-export declare function arenaTool(args: Record<string, unknown>): Promise<string>;
+export interface ArenaStatus {
+    endpoint?: string;
+    defaultParticipants: Array<{
+        name: string;
+        model: string;
+        source: "pool" | "preset" | "raw";
+        compatible: boolean;
+        reason?: string;
+    }>;
+    poolSize: number;
+}
+export declare function getArenaStatus(): ArenaStatus;
+export declare function arenaTool(args: Record<string, unknown>, ctx?: ToolContext): Promise<string>;

package/dist/tool-system/builtin/ask-user.d.ts

@@ -1,12 +1,12 @@
 /**
  * Built-in AskUserQuestion tool — ask the user a question during execution.
+ *
+ * The actual prompt-the-user implementation is provided per-Engine via
+ * ToolContext.askUser. Headless mode (no UI wired up) leaves askUser
+ * undefined and the tool reports back asking the LLM to assume.
  */
 import type { ToolDefinition } from "../../types.js";
+import type { ToolContext } from "../context.js";
 export declare const askUserToolDef: ToolDefinition;
-/**
- * Factory: the actual executor is injected at runtime by the Engine,
- * because it depends on the CLI/UI layer to collect user input.
- */
 export type AskUserFn = (question: string) => Promise<string>;
-export declare function setAskUserFn(fn: AskUserFn | undefined): void;
-export declare function askUserTool(args: Record<string, unknown>): Promise<string>;
+export declare function askUserTool(args: Record<string, unknown>, ctx?: ToolContext): Promise<string>;

package/dist/tool-system/builtin/index.d.ts

@@ -2,7 +2,17 @@
  * Built-in tool registration.
  */
 import type { RegisteredTool } from "../../types.js";
-export type BuiltinToolFn = (args: Record<string, unknown>) => Promise<string>;
+/**
+ * Tool executor signature.
+ *
+ * Tools may inspect ctx for runtime services (askUser, llmConfig, modelPool,
+ * toolRegistry, subAgentSpawner). Tools that don't need any of these — Read,
+ * Write, Bash, Edit, Glob, Grep, etc. — may simply ignore the second arg.
+ *
+ * ctx is optional in the signature so legacy call sites (and tests) that
+ * pass only args still type-check; ToolRegistry always passes ctx at runtime.
+ */
+export type BuiltinToolFn = (args: Record<string, unknown>, ctx?: import("../context.js").ToolContext) => Promise<string>;
 export interface BuiltinTool {
     definition: RegisteredTool;
     execute: BuiltinToolFn;

package/dist/tool-system/builtin/tool-search.d.ts

@@ -6,7 +6,6 @@
  * saving context by not loading all MCP tool schemas upfront.
  */
 import type { ToolDefinition } from "../../types.js";
-import type { ToolRegistry } from "../registry.js";
+import type { ToolContext } from "../context.js";
 export declare const toolSearchToolDef: ToolDefinition;
-export declare function setToolSearchRegistry(registry: ToolRegistry): void;
-export declare function toolSearchTool(args: Record<string, unknown>): Promise<string>;
+export declare function toolSearchTool(args: Record<string, unknown>, ctx?: ToolContext): Promise<string>;

package/dist/tool-system/context.d.ts

@@ -0,0 +1,74 @@
+/**
+ * ToolContext — runtime services injected into every tool execution.
+ *
+ * Replaces the legacy module-level singletons (`setAskUserFn`,
+ * `setArenaLLMConfig`, `setSubAgentConfig`, `setToolSearchRegistry`).
+ *
+ * Each Engine instance builds its own ToolContext when run() starts and
+ * passes it through ToolExecutor → ToolRegistry → executor function.
+ * That makes concurrent Engine instances safe: tools never see another
+ * Engine's askUser handler or LLM credentials.
+ *
+ * Tools that don't need any context (Read/Write/Bash/...) just ignore
+ * the second argument; the type is purely additive.
+ */
+import type { LLMConfig, StreamCallback } from "../types.js";
+import type { ModelPool } from "../llm/model-pool.js";
+import type { ToolRegistry } from "./registry.js";
+import type { AgentPresetName } from "../preset/index.js";
+/** Function the host UI / server uses to ask the user a question. */
+export type AskUserFn = (question: string) => Promise<string>;
+/** Spawn a sub-agent. Returns the produced text or throws. */
+export interface SubAgentSpawnRequest {
+    agentId: string;
+    description: string;
+    prompt: string;
+    maxTurns: number;
+    signal: AbortSignal;
+}
+export interface SubAgentSpawner {
+    /** Run a sub-agent synchronously and return its text output. */
+    spawn(req: SubAgentSpawnRequest): Promise<string>;
+    /** Stream callback to forward sub-agent events back to the parent UI. */
+    parentStream?: StreamCallback;
+    /** Static config used to describe what the spawned engine looks like. */
+    describe(): {
+        cwd: string;
+        preset?: AgentPresetName;
+        permissionMode: string;
+    };
+}
+/**
+ * The full context object handed to every tool invocation.
+ *
+ * Optional fields are filled in by Engine.run(); some headless paths may
+ * leave them undefined (e.g. running without UI → no askUser).
+ */
+export interface ToolContext {
+    /** Active working directory for this Engine. */
+    cwd: string;
+    /** LLM credentials/endpoint for tools that need to make their own calls. */
+    llmConfig: LLMConfig;
+    /** Active model pool (Arena reads this to pick participants). */
+    modelPool?: ModelPool;
+    /** Tool registry (ToolSearch reads this to enumerate available tools). */
+    toolRegistry: ToolRegistry;
+    /** UI-backed AskUserQuestion handler. Undefined → headless mode. */
+    askUser?: AskUserFn;
+    /** Sub-agent spawner (Agent tool). Undefined → Agent tool unavailable. */
+    subAgentSpawner?: SubAgentSpawner;
+    /** Optional cancellation signal for the whole turn. */
+    signal?: AbortSignal;
+}
+/**
+ * Per-Engine container that produces a fresh ToolContext on demand.
+ * Engine creates one of these in run() and passes it to ToolExecutor.
+ */
+export declare class ServiceContainer {
+    private readonly base;
+    constructor(base: ToolContext);
+    /** Snapshot of the context at this moment. */
+    get(): ToolContext;
+    /** Create a derived context with overridden fields (e.g. per-call signal). */
+    withSignal(signal: AbortSignal): ToolContext;
+}