pi-ui-extend 1.0.39 → 1.0.41

package/external/pi-tools-suite/src/dcp/ui.ts

@@ -14,6 +14,7 @@ export interface DcpCompressionVisualDetails {
 	contextPercent?: number | null
 	skippedMessages?: number
 	skippedMessageIssues?: string[]
+	idempotentReplay?: boolean
 }
 
 export interface DcpContextUsage {

package/external/pi-tools-suite/src/default-pi-tools-suite-config.ts

@@ -1,3 +1,8 @@
+import { readFileSync } from "node:fs";
+
+// Reuse the shipped sample instead of copying role descriptions/model defaults.
+const subagentDefaults = readFileSync(new URL("./async-subagents/async-subagents.sample.jsonc", import.meta.url), "utf8").trim();
+
 // Default user config written when pi-tools-suite.jsonc is missing.
 export const DEFAULT_PI_TOOLS_SUITE_CONFIG_JSONC = String.raw`{
   "$schema": "https://unpkg.com/pi-ui-extend/schemas/pi-tools-suite.json",
@@ -7,11 +12,34 @@ export const DEFAULT_PI_TOOLS_SUITE_CONFIG_JSONC = String.raw`{
   ],
   // Secret firewall is deliberately opt-in for now. Flip this to true to enable
   // high-confidence outbound redaction plus session-history hygiene.
-  "modules": { "credential-firewall": false },
+  "modules": {
+    "credential-firewall": false,
+    // Optional non-store cleanup: removes only SDK truncation metadata text
+    // proven to duplicate the already-visible result. Context Gateway observe
+    // remains passive because this module is separate and disabled by default.
+    "truncation-metadata-normalizer": false
+  },
   "secretFirewall": {
     "sessionHygiene": true,
     "notify": true
   },
+  // Context Gateway is passive/off by default. P01 supports off/observe only;
+  // enforce is explicitly refused until capture/store/reader integration lands.
+  "contextGateway": {
+    "mode": "off",
+    "budgets": {
+      "maxInlineBytes": 8192,
+      "maxResultBytes": 8192,
+      "maxExactReadBytes": 32768,
+      "maxSearchBytes": 8192,
+      "maxSearchMatches": 12
+    }
+  },
+  // Baseline preserves the historical repo_* argv/defaults. Native Compact is
+  // an explicit experimental arm with bounded native flags/cursors/output.
+  "repoDiscovery": {
+    "profile": "baseline"
+  },
   // When true, todo items may carry a per-task thinking level and the todo
   // module will switch/restore Pi's thinking level as in-progress tasks change.
   "todoThinking": true,
@@ -24,12 +52,6 @@ export const DEFAULT_PI_TOOLS_SUITE_CONFIG_JSONC = String.raw`{
   // Vision-capable model used by the coding-discipline lookup tool for blind-model
   // screenshot/image questions. Remove or set to null to disable lookup.
   "lookupModel": "zai/glm-5.3-flash",
-  // coding-discipline working-state strictness.
-  //   "lenient" (default): batch independent read-only tool calls; brief reasoning
-  //     text is acceptable when thinking is off. Text only counts as chatter when a
-  //     thinking/reasoning block already captured the reasoning.
-  //   "strict": one tool call per turn, no assistant text at all (Opus-like).
-  "codingDisciplineStrictness": "lenient",
   "terminalBell": { "sound": true },
   // comment-checker: nudges the agent to remove AI-slop code comments it just
   // added via write/edit/apply_patch. Net-new comments are classified and a
@@ -51,7 +73,7 @@ export const DEFAULT_PI_TOOLS_SUITE_CONFIG_JSONC = String.raw`{
     // dropping the oldest past debugLog.maxBackups (default 3).
     "debug": false,
     "debugLog": { "maxBytes": 5242880, "maxBackups": 3 },
-    "manualMode": { "enabled": false, "automaticStrategies": true },
+    "manualMode": { "enabled": false },
     "strategies": {
       "emergencyCurrentTurnPruning": {
         // Disabling this turns off same-turn candidates and lossy pruning;
@@ -141,222 +163,12 @@ export const DEFAULT_PI_TOOLS_SUITE_CONFIG_JSONC = String.raw`{
       "autoCompress": {
         "enabled": false,
         "patience": 2,
-        "summarizerModel": ["zai/glm-5.3", "zai/glm-4.5-air"],
+        "summarizerModel": ["zai/glm-5.3", "zai/glm-5-turbo"],
         "timeoutMs": 20000
       }
     }
   },
-  "asyncSubagents": {
-    "defaultType": "quick",
-    "routing": { "enabled": true, "model": "zai/glm-4.5-air", "fallbackModels": ["openai-codex/gpt-5.6-luna"], "maxTaskChars": 1200, "maxTokens": 512, "maxRetries": 1, "timeoutMs": 12000, "debug": false },
-    "presets": {
-      "cheap": {
-        "description": "Use GLM models by role, including GLM-5.3 Flash for multimodal work.",
-        "types": {
-          "quick": { "model": "zai/glm-4.5-air", "thinking": "off" },
-          "scan": { "model": "zai/glm-4.5-air", "thinking": "off" },
-          "research": { "model": "zai/glm-5-turbo", "thinking": "low" },
-          "docs": { "model": "zai/glm-4.5-air", "thinking": "low" },
-          "frontend": {
-            "model": "zai/glm-5.3-flash",
-            "thinking": "medium"
-          },
-          "browser-qa": { "model": "zai/glm-5.3-flash", "fallbackModels": ["openai-codex/gpt-5.6-luna"], "thinking": "low" },
-          "tests": { "model": "zai/glm-5-turbo", "thinking": "medium" },
-          "review": { "model": "zai/glm-5.3", "thinking": "high" },
-          "implement": { "model": "zai/glm-5.3", "thinking": "high" },
-          "deep": { "model": "zai/glm-5.3", "thinking": "high" }
-        }
-      },
-      "gpt": {
-        "description": "Use the GPT-5.6 family by role: luna for fast tasks, terra for balanced work, and sol for heavy reasoning; fallback cross-provider on quota.",
-        "types": {
-          "quick": {
-            "model": "openai-codex/gpt-5.6-luna",
-            "fallbackModels": ["zai/glm-4.5-air"],
-            "thinking": "off"
-          },
-          "scan": {
-            "model": "openai-codex/gpt-5.6-luna",
-            "fallbackModels": ["zai/glm-4.5-air"],
-            "thinking": "off"
-          },
-          "research": {
-            "model": "openai-codex/gpt-5.6-terra",
-            "fallbackModels": ["zai/glm-5-turbo"],
-            "thinking": "low"
-          },
-          "docs": {
-            "model": "openai-codex/gpt-5.6-luna",
-            "fallbackModels": ["zai/glm-4.5-air"],
-            "thinking": "low"
-          },
-          "frontend": {
-            "model": "openai-codex/gpt-5.6-terra",
-            "fallbackModels": ["antigravity/gemini-3-flash-preview", "zai/glm-5.3"],
-            "thinking": "medium"
-          },
-          "tests": {
-            "model": "openai-codex/gpt-5.6-terra",
-            "fallbackModels": ["zai/glm-5-turbo"],
-            "thinking": "medium"
-          },
-          "review": {
-            "model": "openai-codex/gpt-5.6-sol",
-            "fallbackModels": ["zai/glm-5.3"],
-            "thinking": "high"
-          },
-          "implement": {
-            "model": "openai-codex/gpt-5.6-sol",
-            "fallbackModels": ["zai/glm-5.3"],
-            "thinking": "high"
-          },
-          "deep": {
-            "model": "openai-codex/gpt-5.6-sol",
-            "fallbackModels": ["zai/glm-5.3"],
-            "thinking": "high"
-          }
-        }
-      },
-      "deep": {
-        "description": "Use only enabled strong models, mixing GPT, Claude, and Gemini by role.",
-        "types": {
-          "quick": {
-            "model": "openai-codex/gpt-5.6-luna",
-            "fallbackModels": ["zai/glm-4.5-air"],
-            "thinking": "low"
-          },
-          "scan": {
-            "model": "antigravity/gemini-3-flash-preview",
-            "fallbackModels": ["openai-codex/gpt-5.6-luna", "zai/glm-4.5-air"],
-            "thinking": "off"
-          },
-          "research": {
-            "model": "antigravity/gemini-3.1-pro-preview",
-            "fallbackModels": ["openai-codex/gpt-5.6-luna", "zai/glm-5-turbo"],
-            "thinking": "medium"
-          },
-          "docs": {
-            "model": "antigravity/gemini-2.5-flash",
-            "fallbackModels": ["openai-codex/gpt-5.6-luna", "zai/glm-4.5-air"],
-            "thinking": "medium"
-          },
-          "frontend": {
-            "model": "antigravity/gemini-3.1-pro-preview-customtools",
-            "fallbackModels": ["openai-codex/gpt-5.6-luna", "zai/glm-5.3"],
-            "thinking": "low"
-          },
-          "tests": {
-            "model": "antigravity/antigravity-claude-sonnet-4-6",
-            "fallbackModels": ["openai-codex/gpt-5.6-luna", "zai/glm-5-turbo"],
-            "thinking": "high"
-          },
-          "review": {
-            "model": "antigravity/antigravity-claude-sonnet-4-6",
-            "fallbackModels": ["openai-codex/gpt-5.6-sol", "zai/glm-5.3"],
-            "thinking": "high"
-          },
-          "implement": {
-            "model": "openai-codex/gpt-5.6-sol",
-            "fallbackModels": ["zai/glm-5.3"],
-            "thinking": "high"
-          },
-          "deep": {
-            "model": "antigravity/antigravity-claude-opus-4-6-thinking",
-            "fallbackModels": ["openai-codex/gpt-5.6-sol", "zai/glm-5.3"],
-            "thinking": "high"
-          }
-        }
-      }
-    },
-    "types": {
-      "quick": {
-        "description": "Use for tiny cheap tasks: answer a simple question, inspect one known file, or verify one fact. Not for broad repo search.",
-        "model": "openai-codex/gpt-5.6-luna",
-        "fallbackModels": ["zai/glm-4.5-air"],
-        "thinking": "off"
-      },
-      "scan": {
-        "description": "Use for finding files, symbols, text, or inventory across a repo. Return paths/facts; do not judge code quality.",
-        "model": "openai-codex/gpt-5.6-luna",
-        "fallbackModels": ["zai/glm-4.5-air"],
-        "thinking": "off",
-        "tools": ["read", "grep"]
-      },
-      "research": {
-        "description": "Use for multi-file codebase research: read several files and explain how something works. No edits.",
-        "model": "openai-codex/gpt-5.6-terra",
-        "fallbackModels": ["zai/glm-5-turbo"],
-        "thinking": "low",
-        "tools": ["read", "grep"]
-      },
-      "docs": { "description": "Use for documentation work: README/API docs review, docs gaps, changelog, migration notes, examples.", "model": "openai-codex/gpt-5.6-luna", "fallbackModels": ["zai/glm-4.5-air"], "thinking": "low" },
-      "frontend": {
-        "description": "Use for frontend UI/UX visual work: styling, layout, typography, animation, responsive states, component polish, accessibility. Avoid backend/business logic unless needed for UI behavior.",
-        "model": "antigravity/gemini-3-flash-preview",
-        "fallbackModels": ["openai-codex/gpt-5.6-luna", "zai/glm-5.3"],
-        "thinking": "medium",
-        "promptAppend": [
-          "Act as a frontend UI/UX engineer for visual and product-facing work.",
-          "Prioritize layout, typography, spacing, color, motion, responsive states, accessibility, and consistency with the existing design system.",
-          "Before editing, inspect nearby components/styles and infer the project's design language. Avoid backend/business-logic changes unless required for UI behavior.",
-          "When no mockup exists, choose a clear aesthetic direction and explain it briefly. Verify with targeted build/lint/tests or screenshot-relevant checks when possible."
-        ]
-      },
-      "browser-qa": {
-        "description": "Use for browser-based visual QA: reproduce UI bugs and verify fixes with deterministic assertions, screenshots, video, and traces.",
-        "model": "zai/glm-5.3-flash",
-        "fallbackModels": ["openai-codex/gpt-5.6-luna"],
-        "thinking": "low",
-        "timeoutMs": 120000,
-        "tools": ["read", "grep", "bash"]
-      },
-      "tests": {
-        "description": "Use for tests: locate coverage, find gaps, run/check targeted test commands, diagnose failing tests.",
-        "model": "openai-codex/gpt-5.6-terra",
-        "fallbackModels": ["zai/glm-5-turbo"],
-        "thinking": "medium",
-        "tools": ["read", "grep", "bash"]
-      },
-      "review": {
-        "description": "Use for review/audit of existing code or changes: correctness, security, performance, maintainability, API risks, quality. Do not implement new code.",
-        "model": "openai-codex/gpt-5.6-sol",
-        "fallbackModels": ["zai/glm-5.3"],
-        "thinking": "high",
-        "tools": ["read", "grep"]
-      },
-      "implement": {
-        "description": "Use when the sub-agent should make or plan code changes for a feature, bug fix, or refactor.",
-        "model": "openai-codex/gpt-5.6-sol",
-        "fallbackModels": ["zai/glm-5.3"],
-        "modelByParent": {
-          "openai-codex/gpt-5.6-luna*": { "model": "openai-codex/gpt-5.6-terra", "fallbackModels": ["zai/glm-5.3"] },
-          "openai-codex/gpt-5.6-sol*": { "model": "openai-codex/gpt-5.6-terra", "fallbackModels": ["zai/glm-5.3"] }
-        },
-        "thinking": "high"
-      },
-      "deep": {
-        "description": "Use for broad hard reasoning: architecture, system design, cross-module impact, complex tradeoffs.",
-        "model": "openai-codex/gpt-5.6-sol",
-        "fallbackModels": ["zai/glm-5.3"],
-        "thinking": "high"
-      },
-      "oracle": {
-        "description": "Oracle: cross-provider flagship second opinion for hard or high-stakes uncertainty. Use sparingly to pressure-test architecture, plans, root-cause hypotheses, risk/security calls, or final recommendations when independent disagreement is valuable. Read-only; advise, do not edit.",
-        "model": "openai-codex/gpt-5.6-sol",
-        "fallbackModels": ["zai/glm-5.3"],
-        "thinking": "max",
-        "tools": ["read", "grep", "bash"],
-        "modelByParent": {
-          "zai/*": { "model": "openai-codex/gpt-5.6-sol", "fallbackModels": ["zai/glm-5.3"] },
-          "openai-codex/*": { "model": "zai/glm-5.3", "fallbackModels": ["openai-codex/gpt-5.6-sol"] },
-          "antigravity/*": { "model": "zai/glm-5.3", "fallbackModels": ["openai-codex/gpt-5.6-sol"] },
-          "anthropic/*": { "model": "openai-codex/gpt-5.6-sol", "fallbackModels": ["zai/glm-5.3"] }
-        },
-        "promptAppend": "You are an oracle: a flagship model from a different provider giving a second opinion to the parent agent. Give a concise, decisive recommendation with key tradeoffs and risks. Disagree when warranted; do not rubber-stamp. Do not edit unless explicitly asked."
-      }
-    }
-  },
+  "asyncSubagents": ${subagentDefaults},
   "toolRenderer": {},
   "promptCommands": {
     "commands": {
@@ -398,6 +210,29 @@ export const DEFAULT_PI_TOOLS_SUITE_CONFIG_JSONC = String.raw`{
       }
       // ,
       // {
+      //   "id": "svelte",
+      //   "include": [
+      //     "**/*.svelte"
+      //   ],
+      //   "exclude": [
+      //     "**/node_modules/**"
+      //   ],
+      //   "rootMarkers": [
+      //     "svelte.config.js",
+      //     "package.json"
+      //   ],
+      //   "bin": "svelteserver",
+      //   "args": [
+      //     "--stdio"
+      //   ],
+      //   "startupTimeoutMs": 30000,
+      //   "diagnosticsWaitMs": 8000,
+      //   "languageIdByExtension": {
+      //     ".svelte": "svelte"
+      //   }
+      // }
+      // ,
+      // {
       //   "id": "python",
       //   "include": [
       //     "**/*.py",

package/external/pi-tools-suite/src/index.ts

@@ -24,6 +24,15 @@ export const MODULES: Array<{ name: string; load: () => Promise<ExtensionModule>
 	{ name: "model-tools", load: () => import("./model-tools/index") },
 	{ name: "usage", load: () => import("./usage/index") },
 	{ name: "web-search", load: () => import("./web-search/index") },
+	// Observe-only Context Gateway currently runs after result enrichers. P01-R
+	// keeps this independent result chain; a coordinator is conditional future
+	// enforce work only if a concrete ordering conflict is proven.
+	{ name: "context-gateway", load: () => import("./context-gateway/index") },
+	// Explicit opt-in, non-store cleanup. Keep after Gateway observe so passive
+	// telemetry measures the original boundary, and before downstream result
+	// observers. This ordering does not depend on any particular DCP persistence
+	// design; DCP is scheduled for a separate redesign.
+	{ name: "truncation-metadata-normalizer", load: () => import("./truncation-metadata-normalizer/index") },
 	{ name: "dcp", load: () => import("./dcp/index") },
 	{ name: "prompt-commands", load: () => import("./prompt-commands/index") },
 	{ name: "skill-installer", load: () => import("./skill-installer/index") },

package/external/pi-tools-suite/src/model-tools/index.ts

@@ -61,6 +61,19 @@ type ShellAliasInput = {
 type BashToolDefinition = ReturnType<typeof createBashToolDefinition>;
 type AnyToolDefinition = ToolDefinition<any, any, any>;
 type BuiltinToolName = (typeof BUILTIN_TOOLS)[number];
+export interface ModelToolsDependencies {
+  createReadToolDefinition: (cwd: string, options?: any) => AnyToolDefinition;
+  createEditToolDefinition: (cwd: string, options?: any) => AnyToolDefinition;
+  createWriteToolDefinition: (cwd: string, options?: any) => AnyToolDefinition;
+  createBashToolDefinition: (cwd: string, options?: any) => AnyToolDefinition;
+  createGrepToolDefinition: (cwd: string, options?: any) => AnyToolDefinition;
+  createFindToolDefinition: (cwd: string, options?: any) => AnyToolDefinition;
+  createLsToolDefinition: (cwd: string, options?: any) => AnyToolDefinition;
+}
+type ModelToolsRuntime = {
+  dependencies: ModelToolsDependencies;
+  builtinDefinitions: Map<string, AnyToolDefinition>;
+};
 type RenderContext = {
   args: any;
   cwd: string;
@@ -68,7 +81,22 @@ type RenderContext = {
 };
 type RenderTheme = Parameters<NonNullable<BashToolDefinition["renderCall"]>>[1];
 
-const builtinDefinitions = new Map<string, AnyToolDefinition>();
+const DEFAULT_MODEL_TOOLS_DEPENDENCIES: ModelToolsDependencies = {
+  createReadToolDefinition,
+  createEditToolDefinition,
+  createWriteToolDefinition,
+  createBashToolDefinition,
+  createGrepToolDefinition,
+  createFindToolDefinition,
+  createLsToolDefinition,
+};
+
+function createModelToolsRuntime(overrides: Partial<ModelToolsDependencies> = {}): ModelToolsRuntime {
+  return {
+    dependencies: { ...DEFAULT_MODEL_TOOLS_DEPENDENCIES, ...overrides },
+    builtinDefinitions: new Map(),
+  };
+}
 
 function timeoutSeconds(input: { timeout?: number; timeout_ms?: number }): number | undefined {
   if (typeof input.timeout === "number") return input.timeout;
@@ -76,39 +104,40 @@ function timeoutSeconds(input: { timeout?: number; timeout_ms?: number }): numbe
   return undefined;
 }
 
-function createBuiltinDefinition(name: BuiltinToolName, cwd: string): AnyToolDefinition {
+function createBuiltinDefinition(runtime: ModelToolsRuntime, name: BuiltinToolName, cwd: string): AnyToolDefinition {
+  const dependencies = runtime.dependencies;
   switch (name) {
     case "read":
-      return createReadToolDefinition(cwd);
+      return dependencies.createReadToolDefinition(cwd);
     case "edit":
-      return createEditToolDefinition(cwd);
+      return dependencies.createEditToolDefinition(cwd);
     case "write":
-      return createWriteToolDefinition(cwd);
+      return dependencies.createWriteToolDefinition(cwd);
     case "bash":
-      return createBashToolDefinition(cwd);
+      return dependencies.createBashToolDefinition(cwd);
     case "grep":
-      return createGrepToolDefinition(cwd);
+      return dependencies.createGrepToolDefinition(cwd);
     case "find":
-      return createFindToolDefinition(cwd);
+      return dependencies.createFindToolDefinition(cwd);
     case "ls":
-      return createLsToolDefinition(cwd);
+      return dependencies.createLsToolDefinition(cwd);
   }
 }
 
-function getRenderDefinition(name: BuiltinToolName, cwd: string): AnyToolDefinition {
+function getRenderDefinition(runtime: ModelToolsRuntime, name: BuiltinToolName, cwd: string): AnyToolDefinition {
   const key = `${name}:${cwd}`;
-  const existing = builtinDefinitions.get(key);
+  const existing = runtime.builtinDefinitions.get(key);
   if (existing) {
-    builtinDefinitions.delete(key);
-    builtinDefinitions.set(key, existing);
+    runtime.builtinDefinitions.delete(key);
+    runtime.builtinDefinitions.set(key, existing);
     return existing;
   }
-  const definition = createBuiltinDefinition(name, cwd);
-  if (builtinDefinitions.size >= MAX_BUILTIN_DEFINITIONS) {
-    const oldestKey = builtinDefinitions.keys().next().value;
-    if (oldestKey) builtinDefinitions.delete(oldestKey);
+  const definition = createBuiltinDefinition(runtime, name, cwd);
+  if (runtime.builtinDefinitions.size >= MAX_BUILTIN_DEFINITIONS) {
+    const oldestKey = runtime.builtinDefinitions.keys().next().value;
+    if (oldestKey) runtime.builtinDefinitions.delete(oldestKey);
   }
-  builtinDefinitions.set(key, definition);
+  runtime.builtinDefinitions.set(key, definition);
   return definition;
 }
 
@@ -143,6 +172,7 @@ function applyAliasToolTitle(component: unknown, builtinName: BuiltinToolName, a
 }
 
 function renderAliasCall(
+  runtime: ModelToolsRuntime,
   name: BuiltinToolName,
   args: unknown,
   theme: RenderTheme,
@@ -150,7 +180,7 @@ function renderAliasCall(
   aliasLabel: string = name,
 ) {
   const renderContext = context as RenderContext;
-  const renderCall = getRenderDefinition(name, renderContext.cwd).renderCall;
+  const renderCall = getRenderDefinition(runtime, name, renderContext.cwd).renderCall;
   if (!renderCall) throw new Error(`${name} renderer is unavailable`);
   const component = renderCall(args, theme, withRenderArgs(renderContext, args) as any);
   applyAliasToolTitle(component, name, aliasLabel);
@@ -158,6 +188,7 @@ function renderAliasCall(
 }
 
 function renderAliasResult(
+  runtime: ModelToolsRuntime,
   name: BuiltinToolName,
   args: unknown,
   result: unknown,
@@ -167,7 +198,7 @@ function renderAliasResult(
   aliasLabel: string = name,
 ) {
   const renderContext = context as RenderContext;
-  const renderResult = getRenderDefinition(name, renderContext.cwd).renderResult;
+  const renderResult = getRenderDefinition(runtime, name, renderContext.cwd).renderResult;
   if (!renderResult) throw new Error(`${name} renderer is unavailable`);
   const component = renderResult(
     result as Parameters<NonNullable<AnyToolDefinition["renderResult"]>>[0],
@@ -180,13 +211,13 @@ function renderAliasResult(
   return component;
 }
 
-function renderShellAliasCall(args: ShellAliasInput, theme: RenderTheme, context: unknown) {
-  return renderAliasCall("bash", toBashRenderArgs(args), theme, context, "shell");
+function renderShellAliasCall(runtime: ModelToolsRuntime, args: ShellAliasInput, theme: RenderTheme, context: unknown) {
+  return renderAliasCall(runtime, "bash", toBashRenderArgs(args), theme, context, "shell");
 }
 
-function renderShellAliasResult(result: unknown, options: ToolRenderResultOptions, theme: RenderTheme, context: unknown) {
+function renderShellAliasResult(runtime: ModelToolsRuntime, result: unknown, options: ToolRenderResultOptions, theme: RenderTheme, context: unknown) {
   const args = toBashRenderArgs((context as RenderContext).args as ShellAliasInput);
-  return renderAliasResult("bash", args, result, options, theme, context, "shell");
+  return renderAliasResult(runtime, "bash", args, result, options, theme, context, "shell");
 }
 
 async function resolveWorkdir(ctx: ExtensionContext, workdir: string | undefined): Promise<string | undefined> {
@@ -209,7 +240,7 @@ type BuiltinAliasOptions<Input> = {
   validate?: (params: Input) => void;
 };
 
-function registerBuiltinAlias<Input>(pi: ExtensionAPI, options: BuiltinAliasOptions<Input>): void {
+function registerBuiltinAlias<Input>(runtime: ModelToolsRuntime, pi: ExtensionAPI, options: BuiltinAliasOptions<Input>): void {
   pi.registerTool(
     defineTool({
       name: options.name,
@@ -218,9 +249,10 @@ function registerBuiltinAlias<Input>(pi: ExtensionAPI, options: BuiltinAliasOpti
       parameters: options.parameters,
       renderShell: options.renderShell,
       renderCall: (params, theme, context) =>
-        renderAliasCall(options.builtinName, options.toArgs(params as Input), theme, context, options.label),
+        renderAliasCall(runtime, options.builtinName, options.toArgs(params as Input), theme, context, options.label),
       renderResult: (result, renderOptions, theme, context) =>
         renderAliasResult(
+          runtime,
           options.builtinName,
           options.toArgs((context as RenderContext).args as Input),
           result,
@@ -232,7 +264,7 @@ function registerBuiltinAlias<Input>(pi: ExtensionAPI, options: BuiltinAliasOpti
       async execute(id, params, signal, onUpdate, ctx) {
         const input = params as Input;
         options.validate?.(input);
-        return createBuiltinDefinition(options.builtinName, ctx.cwd).execute(
+        return createBuiltinDefinition(runtime, options.builtinName, ctx.cwd).execute(
           id,
           options.toArgs(input),
           signal,
@@ -244,10 +276,10 @@ function registerBuiltinAlias<Input>(pi: ExtensionAPI, options: BuiltinAliasOpti
   );
 }
 
-function registerClaudeAliases(pi: ExtensionAPI, repoDiscovery: boolean): void {
+function registerClaudeAliases(runtime: ModelToolsRuntime, pi: ExtensionAPI, repoDiscovery: boolean): void {
   const descriptions = claudeAliasToolDescriptions(repoDiscovery);
 
-  registerBuiltinAlias(pi, {
+  registerBuiltinAlias(runtime, pi, {
     ...descriptions.Read,
     builtinName: "read",
     parameters: Type.Object({
@@ -258,7 +290,7 @@ function registerClaudeAliases(pi: ExtensionAPI, repoDiscovery: boolean): void {
     toArgs: toReadArgs,
   });
 
-  registerBuiltinAlias(pi, {
+  registerBuiltinAlias(runtime, pi, {
     ...descriptions.Edit,
     builtinName: "edit",
     parameters: Type.Object({
@@ -274,7 +306,7 @@ function registerClaudeAliases(pi: ExtensionAPI, repoDiscovery: boolean): void {
     },
   });
 
-  registerBuiltinAlias(pi, {
+  registerBuiltinAlias(runtime, pi, {
     ...descriptions.Write,
     builtinName: "write",
     parameters: Type.Object({
@@ -284,7 +316,7 @@ function registerClaudeAliases(pi: ExtensionAPI, repoDiscovery: boolean): void {
     toArgs: toWriteArgs,
   });
 
-  registerBuiltinAlias(pi, {
+  registerBuiltinAlias(runtime, pi, {
     ...descriptions.Bash,
     builtinName: "bash",
     parameters: Type.Object({
@@ -299,7 +331,7 @@ function registerClaudeAliases(pi: ExtensionAPI, repoDiscovery: boolean): void {
     },
   });
 
-  registerBuiltinAlias(pi, {
+  registerBuiltinAlias(runtime, pi, {
     ...descriptions.Grep,
     builtinName: "grep",
     parameters: Type.Object({
@@ -317,7 +349,7 @@ function registerClaudeAliases(pi: ExtensionAPI, repoDiscovery: boolean): void {
     toArgs: toGrepArgs,
   });
 
-  registerBuiltinAlias(pi, {
+  registerBuiltinAlias(runtime, pi, {
     ...descriptions.Glob,
     builtinName: "find",
     parameters: Type.Object({
@@ -330,6 +362,7 @@ function registerClaudeAliases(pi: ExtensionAPI, repoDiscovery: boolean): void {
 }
 
 async function runShellAlias(
+  runtime: ModelToolsRuntime,
   id: string,
   input: ShellAliasInput,
   signal: AbortSignal | undefined,
@@ -339,14 +372,14 @@ async function runShellAlias(
   const command = toShellCommand(input);
   if (!command) throw new Error("Missing shell command");
   const workdir = await resolveWorkdir(ctx, input.cwd ?? input.workdir);
-  const tool = createBashToolDefinition(
+  const tool = runtime.dependencies.createBashToolDefinition(
     ctx.cwd,
     workdir ? { spawnHook: (spawnContext) => ({ ...spawnContext, cwd: workdir }) } : undefined,
   );
   return tool.execute(id, { command, timeout: timeoutSeconds(input) }, signal, onUpdate, ctx);
 }
 
-function registerCodexAliases(pi: ExtensionAPI): void {
+function registerCodexAliases(runtime: ModelToolsRuntime, pi: ExtensionAPI): void {
   const shellParameters = Type.Object({
     command: Type.String({ description: "The shell script to execute in the user's default shell" }),
     workdir: Type.Optional(Type.String({ description: "Working directory" })),
@@ -359,10 +392,10 @@ function registerCodexAliases(pi: ExtensionAPI): void {
     defineTool({
       ...CODEX_ALIAS_TOOL_DESCRIPTIONS.shellCommand,
       parameters: shellParameters,
-      renderCall: renderShellAliasCall,
-      renderResult: renderShellAliasResult,
+      renderCall: (args, theme, context) => renderShellAliasCall(runtime, args, theme, context),
+      renderResult: (result, options, theme, context) => renderShellAliasResult(runtime, result, options, theme, context),
       async execute(id, params, signal, onUpdate, ctx) {
-        return runShellAlias(id, params, signal, onUpdate, ctx);
+        return runShellAlias(runtime, id, params, signal, onUpdate, ctx);
       },
     }),
   );
@@ -422,9 +455,10 @@ function shouldPreserveSelection(env: NodeJS.ProcessEnv = process.env): boolean
 		.some((value) => typeof value === "string" && /^(1|true|yes|on)$/i.test(value.trim()));
 }
 
-export default function modelTools(pi: ExtensionAPI): void {
-  registerClaudeAliases(pi, hasIndexedProjectRoot());
-  registerCodexAliases(pi);
+export default function modelTools(pi: ExtensionAPI, dependencies: Partial<ModelToolsDependencies> = {}): void {
+  const runtime = createModelToolsRuntime(dependencies);
+  registerClaudeAliases(runtime, pi, hasIndexedProjectRoot());
+  registerCodexAliases(runtime, pi);
 
   let baseTools: string[] = [];