@selesai/code 0.13.40 → 0.14.3

package/dist/core/export-html/template.js

@@ -357,6 +357,9 @@
           case 'thinking_level_change':
             parts.push('thinking', entry.thinkingLevel);
             break;
+          case 'context_edit':
+            parts.push('context edit', entry.replacement === null ? 'omit' : 'replace', entry.targetId);
+            break;
         }
 
         return parts.join(' ').toLowerCase();
@@ -385,7 +388,7 @@
           }
 
           // Apply filter mode
-          const isSettingsEntry = ['label', 'custom', 'model_change', 'thinking_level_change'].includes(entry.type);
+          const isSettingsEntry = ['label', 'custom', 'context_edit', 'model_change', 'thinking_level_change'].includes(entry.type);
           let passesFilter = true;
 
           switch (filterMode) {
@@ -696,6 +699,8 @@
             return labelHtml + `<span class="tree-muted">[model: ${escapeHtml(entry.modelId)}]</span>`;
           case 'thinking_level_change':
             return labelHtml + `<span class="tree-muted">[thinking: ${escapeHtml(entry.thinkingLevel)}]</span>`;
+          case 'context_edit':
+            return labelHtml + `<span class="tree-muted">[context ${entry.replacement === null ? 'omit' : 'replace'}: ${escapeHtml(entry.targetId)}]</span>`;
           default:
             return labelHtml + `<span class="tree-muted">[${escapeHtml(entry.type)}]</span>`;
         }
@@ -925,6 +930,21 @@
             '</div>';
         };
 
+        // Calls this tool made to other tools (for example from a codemode script), recorded without results.
+        const renderNestedCalls = () => {
+          const nested = result?.nestedCalls;
+          if (!nested || !Array.isArray(nested.calls) || nested.calls.length === 0) return '';
+          const icons = { ok: '✓', error: '✗', unfinished: '…' };
+          const lines = nested.calls.map(c => {
+            const args = c.arguments ? JSON.stringify(c.arguments) : `[arguments omitted, ${c.argumentsBytes} bytes]`;
+            const duration = c.durationMs !== undefined ? ` ${c.durationMs}ms` : '';
+            const error = c.error ? `\n    ${c.error.split('\n').join('\n    ')}` : '';
+            return `${icons[c.status] || '?'} ${c.name} ${args}${duration}${error}`;
+          });
+          const title = `Nested calls: ${nested.calls.length}${nested.complete ? '' : ' (incomplete record)'}`;
+          return formatExpandableOutput([title, ...lines].join('\n'), 1);
+        };
+
         const toolDomId = `tool-call-${escapeHtml(call.id)}`;
         let html = `<div class="tool-execution ${statusClass}" id="${toolDomId}">`;
         const args = call.arguments || {};
@@ -1058,6 +1078,7 @@
           }
         }
 
+        html += renderNestedCalls();
         html += '</div>';
         return html;
       }
@@ -1306,9 +1327,10 @@
           </div>`;
         }
 
-        if (entry.type === 'custom_message' && entry.display) {
-          return `<div class="hook-message" id="${entryDomId}">${tsHtml}
-            <div class="hook-type">[${escapeHtml(entry.customType)}]</div>
+        if (entry.type === 'custom_message') {
+          const hidden = entry.display === false;
+          return `<div class="hook-message${hidden ? ' hook-message-hidden' : ''}" id="${entryDomId}">${tsHtml}
+            <div class="hook-type">[${escapeHtml(entry.customType)}]${hidden ? ' · Hidden in terminal' : ''}</div>
             <div class="markdown-content">${safeMarkedParse(typeof entry.content === 'string' ? entry.content : JSON.stringify(entry.content))}</div>
           </div>`;
         }
@@ -1384,10 +1406,11 @@
           <div class="header">
             <h1>Session: ${escapeHtml(header?.id || 'unknown')}</h1>
             <div class="help-bar">
-              <span class="help-hint">T toggle thinking · O toggle tools</span>
+              <span class="help-hint">T toggle thinking · O toggle tools · H toggle hidden messages</span>
               <div class="help-actions">
-                <button type="button" class="header-toggle-btn" data-action="toggle-thinking" title="Toggle thinking (T)">Toggle thinking</button>
-                <button type="button" class="header-toggle-btn" data-action="toggle-tools" title="Toggle tools (O)">Toggle tools</button>
+                <button type="button" class="header-toggle-btn" data-action="toggle-thinking" aria-pressed="${thinkingExpanded}" title="Toggle thinking (T)">Toggle thinking</button>
+                <button type="button" class="header-toggle-btn" data-action="toggle-tools" aria-pressed="${toolOutputsExpanded}" title="Toggle tools (O)">Toggle tools</button>
+                <button type="button" class="header-toggle-btn" data-action="toggle-hidden-messages" aria-pressed="${showHiddenMessages}" title="Show custom messages marked as hidden in the terminal (H).">${showHiddenMessages ? 'Hide hidden messages' : 'Show hidden messages'}</button>
                 <button type="button" class="download-json-btn" onclick="downloadSessionJson()" title="Download session as JSONL">↓ JSONL</button>
               </div>
             </div>
@@ -1495,6 +1518,10 @@
       function navigateTo(targetId, scrollMode = 'target', scrollToEntryId = null) {
         currentLeafId = targetId;
         currentTargetId = scrollToEntryId || targetId;
+        const targetEntry = byId.get(currentTargetId);
+        if (scrollMode === 'target' && targetEntry?.type === 'custom_message' && targetEntry.display === false) {
+          setHiddenMessagesVisible(true);
+        }
         const path = getPath(targetId);
 
         renderTree();
@@ -1516,6 +1543,10 @@
         messagesEl.innerHTML = '';
         messagesEl.appendChild(fragment);
 
+        // Cached nodes contain their initial presentation; reapply the viewer's toggle states.
+        setThinkingExpanded(thinkingExpanded);
+        setToolOutputsExpanded(toolOutputsExpanded);
+
         // Attach click handlers for copy-link buttons
         messagesEl.querySelectorAll('.copy-link-btn').forEach(btn => {
           btn.addEventListener('click', (e) => {
@@ -1788,19 +1819,32 @@
       // Toggle states
       let thinkingExpanded = true;
       let toolOutputsExpanded = false;
+      let showHiddenMessages = false;
+
+      function setHiddenMessagesVisible(visible) {
+        showHiddenMessages = visible;
+        document.body.classList.toggle('show-hidden-messages', visible);
+        const button = document.querySelector('[data-action="toggle-hidden-messages"]');
+        if (button) {
+          button.setAttribute('aria-pressed', String(visible));
+          button.textContent = visible ? 'Hide hidden messages' : 'Show hidden messages';
+        }
+      }
 
-      const toggleThinking = () => {
-        thinkingExpanded = !thinkingExpanded;
+      function setThinkingExpanded(expanded) {
+        thinkingExpanded = expanded;
+        document.querySelector('[data-action="toggle-thinking"]')?.setAttribute('aria-pressed', String(expanded));
         document.querySelectorAll('.thinking-text').forEach(el => {
           el.style.display = thinkingExpanded ? '' : 'none';
         });
         document.querySelectorAll('.thinking-collapsed').forEach(el => {
           el.style.display = thinkingExpanded ? 'none' : 'block';
         });
-      };
+      }
 
-      const toggleToolOutputs = () => {
-        toolOutputsExpanded = !toolOutputsExpanded;
+      function setToolOutputsExpanded(expanded) {
+        toolOutputsExpanded = expanded;
+        document.querySelector('[data-action="toggle-tools"]')?.setAttribute('aria-pressed', String(expanded));
         document.querySelectorAll('.tool-output.expandable').forEach(el => {
           el.classList.toggle('expanded', toolOutputsExpanded);
         });
@@ -1810,11 +1854,18 @@
         document.querySelectorAll('.skill-invocation').forEach(el => {
           el.classList.toggle('expanded', toolOutputsExpanded);
         });
-      };
+      }
 
       const attachHeaderHandlers = () => {
-        document.querySelector('[data-action="toggle-thinking"]')?.addEventListener('click', toggleThinking);
-        document.querySelector('[data-action="toggle-tools"]')?.addEventListener('click', toggleToolOutputs);
+        document.querySelector('[data-action="toggle-thinking"]')?.addEventListener('click', () => {
+          setThinkingExpanded(!thinkingExpanded);
+        });
+        document.querySelector('[data-action="toggle-tools"]')?.addEventListener('click', () => {
+          setToolOutputsExpanded(!toolOutputsExpanded);
+        });
+        document.querySelector('[data-action="toggle-hidden-messages"]')?.addEventListener('click', () => {
+          setHiddenMessagesVisible(!showHiddenMessages);
+        });
       };
 
       const isEditableTarget = (element) => {
@@ -1834,17 +1885,20 @@
           navigateTo(leafId, 'bottom');
         }
 
-        if (isEditableTarget(document.activeElement)) {
+        if (e.ctrlKey || e.metaKey || e.altKey || isEditableTarget(document.activeElement)) {
           return;
         }
 
         const key = e.key.toLowerCase();
         if (key === 't') {
           e.preventDefault();
-          toggleThinking();
+          setThinkingExpanded(!thinkingExpanded);
         } else if (key === 'o') {
           e.preventDefault();
-          toggleToolOutputs();
+          setToolOutputsExpanded(!toolOutputsExpanded);
+        } else if (key === 'h') {
+          e.preventDefault();
+          setHiddenMessagesVisible(!showHiddenMessages);
         }
       });
 

package/dist/core/export-html/tool-renderer.d.ts

@@ -5,10 +5,10 @@
  * and converting the ANSI output to HTML.
  */
 import type { Theme } from "../../modes/interactive/theme/theme.ts";
-import type { ToolDefinition } from "../extensions/types.ts";
+import type { ToolRenderers } from "../extensions/types.ts";
 export interface ToolHtmlRendererDeps {
-    /** Function to look up tool definition by name */
-    getToolDefinition: (name: string) => ToolDefinition | undefined;
+    /** Renderers of calls to a tool, as resolved by extensions and the registered tool */
+    getToolRenderers: (name: string) => ToolRenderers | undefined;
     /** Theme for styling */
     theme: Theme;
     /** Working directory for render context */

package/dist/core/export-html/tool-renderer.js

@@ -25,7 +25,7 @@ function trimRenderedResultLines(lines) {
     return lines.slice(start, end);
 }
 export function createToolHtmlRenderer(deps) {
-    const { getToolDefinition, theme, cwd, width = 100 } = deps;
+    const { getToolRenderers, theme, cwd, width = 100 } = deps;
     const renderedCallComponents = new Map();
     const renderedResultComponents = new Map();
     const renderedStates = new Map();
@@ -52,13 +52,15 @@ export function createToolHtmlRenderer(deps) {
             expanded,
             showImages: false,
             isError,
+            durationMs: undefined,
+            outputPad: 1,
         };
     };
     return {
         renderCall(toolCallId, toolName, args) {
             try {
                 renderedArgs.set(toolCallId, args);
-                const toolDef = getToolDefinition(toolName);
+                const toolDef = getToolRenderers(toolName);
                 if (!toolDef?.renderCall) {
                     return undefined;
                 }
@@ -74,7 +76,7 @@ export function createToolHtmlRenderer(deps) {
         },
         renderResult(toolCallId, toolName, result, details, isError) {
             try {
-                const toolDef = getToolDefinition(toolName);
+                const toolDef = getToolRenderers(toolName);
                 if (!toolDef?.renderResult) {
                     return undefined;
                 }

package/dist/core/extensions/index.d.ts

@@ -6,6 +6,6 @@ export type { SourceInfo } from "../source-info.ts";
 export { createExtensionRuntime, discoverAndLoadExtensions, loadExtensionFromFactory, loadExtensions, } from "./loader.ts";
 export type { ExtensionErrorListener, ForkHandler, NavigateTreeHandler, NewSessionHandler, ShutdownHandler, SwitchSessionHandler, } from "./runner.ts";
 export { ExtensionRunner } from "./runner.ts";
-export type { AfterProviderResponseEvent, AgentEndEvent, AgentSettledEvent, AgentStartEvent, AgentToolResult, AgentToolUpdateCallback, AppendEntryHandler, AppKeybinding, AutocompleteProviderFactory, BashToolCallEvent, BashToolResultEvent, BeforeAgentStartEvent, BeforeAgentStartEventResult, BeforeProviderHeadersEvent, BeforeProviderRequestEvent, BeforeProviderRequestEventResult, BuildSystemPromptOptions, CacheWarmingDecisionEvent, CacheWarmingDecisionEventResult, CompactOptions, ContextEvent, ContextEventResult, ContextUsage, CustomToolCallEvent, CustomToolResultEvent, EditorFactory, EditToolCallEvent, EditToolResultEvent, EntryRenderer, EntryRenderOptions, ExecOptions, ExecResult, Extension, ExtensionActions, ExtensionAPI, ExtensionCommandContext, ExtensionCommandContextActions, ExtensionContext, ExtensionContextActions, ExtensionError, ExtensionEvent, ExtensionFactory, ExtensionFlag, ExtensionHandler, ExtensionMode, ExtensionRuntime, ExtensionShortcut, ExtensionUIContext, ExtensionUIDialogOptions, ExtensionWidgetOptions, FindToolCallEvent, FindToolResultEvent, GetActiveToolsHandler, GetAllToolsHandler, GetCommandsHandler, GetThinkingLevelHandler, GrepToolCallEvent, GrepToolResultEvent, InlineExtension, InputEvent, InputEventResult, InputSource, KeybindingsManager, LoadExtensionsResult, LsToolCallEvent, LsToolResultEvent, MessageEndEvent, MessageEndEventResult, MessageRenderer, MessageRenderOptions, MessageStartEvent, MessageUpdateEvent, ModelSelectEvent, ModelSelectSource, MarkdownTransformContext, MarkdownTransformer, NormalizedBuildSystemPromptOptions, ProjectTrustContext, ProjectTrustEvent, ProjectTrustEventDecision, ProjectTrustEventResult, ProjectTrustHandler, ProviderConfig, ProviderModelConfig, ReadToolCallEvent, ReadToolResultEvent, RegisteredCommand, RegisteredTool, ReplacedSessionContext, ResolvedCommand, ResolvedSkillInfo, ResourcesDiscoverEvent, ResourcesDiscoverResult, SendMessageHandler, SendUserMessageHandler, SessionBeforeCompactEvent, SessionBeforeCompactResult, SessionBeforeForkEvent, SessionBeforeForkResult, SessionBeforeSwitchEvent, SessionBeforeSwitchResult, SessionBeforeTreeEvent, SessionBeforeTreeResult, SessionCompactEvent, SessionCompactFailedEvent, SessionEvent, SessionInfoChangedEvent, SessionShutdownEvent, SessionStartEvent, SessionTreeEvent, SetActiveToolsHandler, SetLabelHandler, SetModelHandler, SetThinkingLevelHandler, TerminalInputHandler, ThinkingLevelSelectEvent, ToolCallEvent, ToolCallEventResult, ToolDefinition, ToolExecutionEndEvent, ToolExecutionMode, ToolExecutionStartEvent, ToolExecutionUpdateEvent, ToolInfo, ToolRenderResultOptions, ToolResultEvent, ToolResultEventResult, TreePreparation, TurnEndEvent, TurnStartEvent, UIPromptEndEvent, UIPromptKind, UIPromptStartEvent, UserBashEvent, UserBashEventResult, WidgetPlacement, WorkingIndicatorOptions, WriteToolCallEvent, WriteToolResultEvent, } from "./types.ts";
-export { defineTool, isBashToolResult, isEditToolResult, isFindToolResult, isGrepToolResult, isLsToolResult, isReadToolResult, isToolCallEventType, isWriteToolResult, } from "./types.ts";
+export type { AfterProviderResponseEvent, AgentActivityOutcome, AgentBeforeSettleEvent, AgentBeforeSettleEventResult, AgentEndEvent, AgentSettledEvent, AgentStartEvent, AgentToolResult, AgentToolUpdateCallback, AppendEntryHandler, AppKeybinding, AutocompleteProviderFactory, BashToolCallEvent, BashToolResultEvent, BeforeAgentStartEvent, BeforeAgentStartEventResult, BeforeProviderHeadersEvent, BeforeProviderRequestEvent, BeforeProviderRequestEventResult, BoundaryContextPreview, BoundaryResult, BoundaryState, BuildSystemPromptOptions, CacheWarmingDecisionEvent, CacheWarmingDecisionEventResult, CompactionEntryDraft, CompactOptions, ContextEditEntryDraft, ContextEvent, ContextEventResult, ContextUsage, ContextWithSystemEvent, CustomEntryDraft, CustomMessageEntryDraft, CustomToolCallEvent, CustomToolResultEvent, EditorFactory, EditToolCallEvent, EditToolResultEvent, EntryRenderer, EntryRenderOptions, ExecOptions, ExecResult, ExecuteToolOptions, Extension, ExtensionActions, ExtensionAPI, ExtensionCommandContext, ExtensionCommandContextActions, ExtensionContext, ExtensionContextActions, ExtensionError, ExtensionEvent, ExtensionFactory, ExtensionFlag, ExtensionHandler, ExtensionMode, ExtensionRuntime, ExtensionShortcut, ExtensionToolContext, ExtensionUIContext, ExtensionUIDialogOptions, ExtensionVirtualModel, ExtensionWidgetOptions, FindToolCallEvent, FindToolResultEvent, GetActiveToolsHandler, GetAllToolsHandler, GetCommandsHandler, GetThinkingLevelHandler, GrepToolCallEvent, GrepToolResultEvent, InlineExtension, InputEvent, InputEventResult, InputSource, KeybindingsManager, LoadExtensionsResult, LsToolCallEvent, LsToolResultEvent, MarkdownTransformContext, MarkdownTransformer, McpServersChangeEvent, MessageEndEvent, MessageEndEventResult, MessageRenderer, MessageRenderOptions, MessageStartEvent, MessageUpdateEvent, ModelSelectEvent, ModelSelectSource, NormalizedBuildSystemPromptOptions, PowerShellToolCallEvent, PowerShellToolResultEvent, ProjectTrustContext, ProjectTrustEvent, ProjectTrustEventDecision, ProjectTrustEventResult, ProjectTrustHandler, ProviderConfig, ProviderModelConfig, ProviderStreamEvent, ReadToolCallEvent, ReadToolResultEvent, RegisteredCommand, RegisteredTool, ReplacedSessionContext, ResolvedCommand, ResolvedSkillInfo, ResourcesDiscoverEvent, ResourcesDiscoverResult, SendMessageHandler, SendUserMessageHandler, SessionBeforeCompactEvent, SessionBeforeCompactResult, SessionBeforeForkEvent, SessionBeforeForkResult, SessionBeforeSwitchEvent, SessionBeforeSwitchResult, SessionBeforeTreeEvent, SessionBeforeTreeResult, SessionBoundaryDraft, SessionCompactEvent, SessionCompactFailedEvent, SessionEvent, SessionInfoChangedEvent, SessionShutdownEvent, SessionStartEvent, SessionTreeEvent, SetActiveToolsHandler, SetLabelHandler, SetModelHandler, SetThinkingLevelHandler, TerminalInputHandler, ThinkingLevelSelectEvent, ToolAnnotations, ToolCallEvent, ToolCallEventResult, ToolDefinition, ToolExecutionEndEvent, ToolExecutionMode, ToolExecutionStartEvent, ToolExecutionUpdateEvent, ToolExposure, ToolInfo, ToolLoadout, ToolLoadoutChanges, ToolNamespace, ToolRendererResolver, ToolRenderers, ToolRenderResultOptions, ToolResultEvent, ToolResultEventResult, TreePreparation, TurnEndEvent, TurnEndEventResult, TurnStartEvent, UIPromptEndEvent, UIPromptKind, UIPromptStartEvent, UserBashEvent, UserBashEventResult, WidgetPlacement, WorkingIndicatorOptions, WriteToolCallEvent, WriteToolResultEvent, } from "./types.ts";
+export { defineTool, isBashToolResult, isEditToolResult, isFindToolResult, isGrepToolResult, isLsToolResult, isPowerShellToolResult, isReadToolResult, isToolCallEventType, isWriteToolResult, } from "./types.ts";
 export { wrapRegisteredTool, wrapRegisteredTools } from "./wrapper.ts";

package/dist/core/extensions/index.js

@@ -4,5 +4,5 @@
 export { createExtensionRuntime, discoverAndLoadExtensions, loadExtensionFromFactory, loadExtensions, } from "./loader.js";
 export { ExtensionRunner } from "./runner.js";
 // Type guards
-export { defineTool, isBashToolResult, isEditToolResult, isFindToolResult, isGrepToolResult, isLsToolResult, isReadToolResult, isToolCallEventType, isWriteToolResult, } from "./types.js";
+export { defineTool, isBashToolResult, isEditToolResult, isFindToolResult, isGrepToolResult, isLsToolResult, isPowerShellToolResult, isReadToolResult, isToolCallEventType, isWriteToolResult, } from "./types.js";
 export { wrapRegisteredTool, wrapRegisteredTools } from "./wrapper.js";

package/dist/core/extensions/loader.js

@@ -10,7 +10,9 @@ import { CONFIG_DIR_NAME, getAgentDir, isBunBinary, isBundledNode } from "../../
 import { resolvePath } from "../../utils/paths.js";
 import { createEventBus } from "../event-bus.js";
 import { execCommand } from "../exec.js";
-import { createSyntheticSourceInfo } from "../source-info.js";
+import { McpServerRegistry, mcpNamespace, validateMcpServerConfig } from "../mcp-servers.js";
+import { readPiManifest } from "../pi-manifest.js";
+import { createSyntheticSourceInfo, getSyntheticPathSource, isSyntheticPath } from "../source-info.js";
 import { time } from "../timings.js";
 const require = createRequire(import.meta.url);
 const isNodeSeaBinary = ("sea" in process.features && process.features.sea === true) ||
@@ -28,8 +30,8 @@ function getVirtualModules() {
     return virtualModulesPromise;
 }
 /**
- * Get aliases for jiti (used in Node.js/development mode).
- * In Bun binary mode, virtualModules is used instead.
+ * Get aliases for jiti (used in built Node.js mode).
+ * In compiled binary mode, virtualModules is used instead.
  */
 let _aliases = null;
 function getAliases() {
@@ -56,12 +58,17 @@ function getAliases() {
     // global API keep working at runtime until compat is removed.
     const piAiCompatEntry = resolveWorkspaceOrImport("ai/dist/compat.js", "@earendil-works/pi-ai/compat");
     const piAiOauthEntry = resolveWorkspaceOrImport("ai/dist/oauth.js", "@earendil-works/pi-ai/oauth");
+    const piAiTranscriptEntry = resolveWorkspaceOrImport("ai/dist/utils/transcript.js", "@earendil-works/pi-ai/utils/transcript");
+    const piAiClassifierEntry = resolveWorkspaceOrImport("ai/dist/api/typesafe-system-one.js", "@earendil-works/pi-ai/api/typesafe-system-one");
     const piAiProvidersEntry = resolveWorkspaceOrImport("ai/dist/providers/all.js", "@earendil-works/pi-ai/providers/all");
     _aliases = {
         "@earendil-works/pi-coding-agent": piCodingAgentEntry,
         "@selesai/code": piCodingAgentEntry,
         "@earendil-works/pi-agent-core": piAgentCoreEntry,
         "@earendil-works/pi-tui": piTuiEntry,
+        // Exact subpaths must precede the root compat-file alias in prefix resolvers.
+        "@earendil-works/pi-ai/utils/transcript": piAiTranscriptEntry,
+        "@earendil-works/pi-ai/api/typesafe-system-one": piAiClassifierEntry,
         "@earendil-works/pi-ai/providers/all": piAiProvidersEntry,
         "@earendil-works/pi-ai/compat": piAiCompatEntry,
         "@earendil-works/pi-ai/oauth": piAiOauthEntry,
@@ -69,6 +76,8 @@ function getAliases() {
         "@mariozechner/pi-coding-agent": piCodingAgentEntry,
         "@mariozechner/pi-agent-core": piAgentCoreEntry,
         "@mariozechner/pi-tui": piTuiEntry,
+        "@mariozechner/pi-ai/utils/transcript": piAiTranscriptEntry,
+        "@mariozechner/pi-ai/api/typesafe-system-one": piAiClassifierEntry,
         "@mariozechner/pi-ai/providers/all": piAiProvidersEntry,
         "@mariozechner/pi-ai/compat": piAiCompatEntry,
         "@mariozechner/pi-ai/oauth": piAiOauthEntry,
@@ -107,6 +116,7 @@ export function createExtensionRuntime() {
         throw new Error("Extension runtime not initialized. Action methods cannot be called during extension loading.");
     };
     const state = {};
+    const eventBusUnsubscribers = new Set();
     const assertActive = () => {
         if (state.staleMessage) {
             throw new Error(state.staleMessage);
@@ -121,6 +131,7 @@ export function createExtensionRuntime() {
         setLabel: notInitialized,
         getActiveTools: notInitialized,
         getAllTools: notInitialized,
+        getSettings: notInitialized,
         setActiveTools: notInitialized,
         getResolvedSkills: notInitialized,
         setSkillsIndexFilter: notInitialized,
@@ -133,11 +144,31 @@ export function createExtensionRuntime() {
         flagValues: new Map(),
         pendingProviderRegistrations: [],
         pendingNativeProviderRegistrations: [],
+        mcpServers: new McpServerRegistry(),
+        pendingVirtualModelRegistrations: [],
+        createContext: notInitialized,
         assertActive,
         invalidate: (message) => {
-            state.staleMessage ??=
+            if (state.staleMessage)
+                return;
+            state.staleMessage =
                 message ??
                     "This extension ctx is stale after session replacement or reload. Do not use a captured pi or command ctx after ctx.newSession(), ctx.fork(), ctx.switchSession(), or ctx.reload(). For newSession, fork, and switchSession, move post-replacement work into withSession and use the ctx passed to withSession. For reload, do not use the old ctx after await ctx.reload().";
+            for (const unsubscribe of eventBusUnsubscribers)
+                unsubscribe();
+            eventBusUnsubscribers.clear();
+        },
+        trackEventBusSubscription: (unsubscribe) => {
+            let active = true;
+            const trackedUnsubscribe = () => {
+                if (!active)
+                    return;
+                active = false;
+                eventBusUnsubscribers.delete(trackedUnsubscribe);
+                unsubscribe();
+            };
+            eventBusUnsubscribers.add(trackedUnsubscribe);
+            return trackedUnsubscribe;
         },
         // Pre-bind: queue registrations so bindCore() can flush them once the
         // model registry is available. bindCore() replaces both with direct calls.
@@ -151,6 +182,12 @@ export function createExtensionRuntime() {
             runtime.pendingProviderRegistrations = runtime.pendingProviderRegistrations.filter((r) => r.name !== name);
             runtime.pendingNativeProviderRegistrations = runtime.pendingNativeProviderRegistrations.filter((r) => r.provider.id !== name);
         },
+        registerVirtualModel: (definition, extensionPath = "<unknown>") => {
+            runtime.pendingVirtualModelRegistrations.push({ definition, extensionPath });
+        },
+        unregisterVirtualModel: (provider, id) => {
+            runtime.pendingVirtualModelRegistrations = runtime.pendingVirtualModelRegistrations.filter(({ definition }) => definition.provider !== provider || definition.id !== id);
+        },
     };
     return runtime;
 }
@@ -165,8 +202,9 @@ function createExtensionAPI(extension, runtime, cwd, eventBus) {
     const loadingUnsubscribers = [];
     let state = "loading";
     const assertActive = () => {
-        if (state === "failed")
+        if (state === "failed") {
             throw new Error(`Extension "${extension.path}" failed to load and its API is no longer active.`);
+        }
         runtime.assertActive();
     };
     const applyRuntimeChange = (change) => {
@@ -175,6 +213,11 @@ function createExtensionAPI(extension, runtime, cwd, eventBus) {
         else
             change();
     };
+    const clearPending = () => {
+        pendingFlagValues.clear();
+        pendingRuntimeChanges.length = 0;
+        loadingUnsubscribers.length = 0;
+    };
     const api = {
         // Registration methods - write to extension
         on(event, handler) {
@@ -208,6 +251,12 @@ function createExtensionAPI(extension, runtime, cwd, eventBus) {
         },
         registerCommand(name, options) {
             assertActive();
+            if (typeof name !== "string" || name.length === 0) {
+                throw new Error(`Command registered by extension "${extension.path}" must have a non-empty string name. Use pi.registerCommand("name", { description, handler }).`);
+            }
+            if (typeof options?.handler !== "function") {
+                throw new Error(`Command "/${name}" registered by extension "${extension.path}" must define handler().`);
+            }
             extension.commands.set(name, {
                 name,
                 sourceInfo: extension.sourceInfo,
@@ -225,21 +274,33 @@ function createExtensionAPI(extension, runtime, cwd, eventBus) {
             }
             extension.flags.set(name, { name, extensionPath: extension.path, ...options });
             if (options.default !== undefined && !runtime.flagValues.has(name)) {
-                if (state === "loading")
-                    pendingFlagValues.set(name, options.default);
-                else
+                if (state === "loading") {
+                    if (!pendingFlagValues.has(name))
+                        pendingFlagValues.set(name, options.default);
+                }
+                else {
                     runtime.flagValues.set(name, options.default);
+                }
             }
         },
         registerMessageRenderer(customType, renderer) {
             assertActive();
             extension.messageRenderers.set(customType, renderer);
         },
+        registerMarkdownTransformer(transformer) {
+            assertActive();
+            extension.markdownTransformer = transformer;
+        },
         registerEntryRenderer(customType, renderer) {
             assertActive();
             extension.entryRenderers ??= new Map();
             extension.entryRenderers.set(customType, renderer);
         },
+        registerToolRenderer(resolver) {
+            assertActive();
+            extension.toolRenderers ??= [];
+            extension.toolRenderers.push(resolver);
+        },
         // Flag access - checks extension registered it, reads from runtime
         getFlag(name) {
             assertActive();
@@ -292,6 +353,10 @@ function createExtensionAPI(extension, runtime, cwd, eventBus) {
             assertActive();
             return runtime.getAllTools();
         },
+        getSettings() {
+            assertActive();
+            return runtime.getSettings();
+        },
         setActiveTools(toolNames) {
             assertActive();
             runtime.setActiveTools(toolNames);
@@ -326,6 +391,47 @@ function createExtensionAPI(extension, runtime, cwd, eventBus) {
             assertActive();
             applyRuntimeChange(() => runtime.unregisterProvider(name, extension.path));
         },
+        registerMcpServer(name, config) {
+            assertActive();
+            const validated = validateMcpServerConfig(name, config);
+            if (typeof validated === "string") {
+                throw new Error(`Invalid MCP server registered by extension "${extension.path}": ${validated}`);
+            }
+            const owner = runtime.mcpServers.get(name)?.extensionPath;
+            if (owner !== undefined && owner !== extension.path) {
+                throw new Error(`MCP server "${name}" is already registered by extension "${owner}"`);
+            }
+            // Names that differ only in `-` and `_` would share a namespace.
+            const clash = runtime.mcpServers
+                .list()
+                .find((server) => server.name !== name && mcpNamespace(server.name) === mcpNamespace(name));
+            if (clash)
+                throw new Error(`MCP server "${name}" conflicts with registered server "${clash.name}"`);
+            const server = { name, config: structuredClone(validated), extensionPath: extension.path };
+            applyRuntimeChange(() => runtime.mcpServers.register(server));
+        },
+        unregisterMcpServer(name) {
+            assertActive();
+            applyRuntimeChange(() => runtime.mcpServers.unregister(name, extension.path));
+        },
+        getMcpServers() {
+            assertActive();
+            return runtime.mcpServers.list();
+        },
+        registerVirtualModel(model) {
+            assertActive();
+            // Routing runs after the runner binds, so the context is created per request. The state
+            // comes from the session branch that this router wrote.
+            const definition = {
+                ...model,
+                route: (request) => model.route(request, runtime.createContext()),
+            };
+            applyRuntimeChange(() => runtime.registerVirtualModel(definition, extension.path));
+        },
+        unregisterVirtualModel(provider, id) {
+            assertActive();
+            applyRuntimeChange(() => runtime.unregisterVirtualModel(provider, id));
+        },
         events: {
             emit(channel, data) {
                 assertActive();
@@ -333,7 +439,7 @@ function createExtensionAPI(extension, runtime, cwd, eventBus) {
             },
             on(channel, handler) {
                 assertActive();
-                const unsubscribe = eventBus.on(channel, handler);
+                const unsubscribe = runtime.trackEventBusSubscription(eventBus.on(channel, handler));
                 if (state === "loading")
                     loadingUnsubscribers.push(unsubscribe);
                 return unsubscribe;
@@ -345,6 +451,7 @@ function createExtensionAPI(extension, runtime, cwd, eventBus) {
         commit: () => {
             if (state !== "loading")
                 return;
+            runtime.assertActive();
             for (const [name, value] of pendingFlagValues) {
                 if (!runtime.flagValues.has(name))
                     runtime.flagValues.set(name, value);
@@ -352,9 +459,7 @@ function createExtensionAPI(extension, runtime, cwd, eventBus) {
             for (const apply of pendingRuntimeChanges)
                 apply();
             state = "active";
-            pendingFlagValues.clear();
-            pendingRuntimeChanges.length = 0;
-            loadingUnsubscribers.length = 0;
+            clearPending();
         },
         discard: () => {
             if (state !== "loading")
@@ -362,9 +467,7 @@ function createExtensionAPI(extension, runtime, cwd, eventBus) {
             state = "failed";
             for (const unsubscribe of loadingUnsubscribers)
                 unsubscribe();
-            pendingFlagValues.clear();
-            pendingRuntimeChanges.length = 0;
-            loadingUnsubscribers.length = 0;
+            clearPending();
         },
     };
 }
@@ -407,10 +510,8 @@ async function loadExtensionModule(extensionPath, cacheToken) {
  * Create an Extension object with empty collections.
  */
 function createExtension(extensionPath, resolvedPath) {
-    const source = extensionPath.startsWith("<") && extensionPath.endsWith(">")
-        ? extensionPath.slice(1, -1).split(":")[0] || "temporary"
-        : "local";
-    const baseDir = extensionPath.startsWith("<") ? undefined : path.dirname(resolvedPath);
+    const source = getSyntheticPathSource(extensionPath) ?? "local";
+    const baseDir = isSyntheticPath(extensionPath) ? undefined : path.dirname(resolvedPath);
     return {
         path: extensionPath,
         resolvedPath,
@@ -424,6 +525,20 @@ function createExtension(extensionPath, resolvedPath) {
         shortcuts: new Map(),
     };
 }
+async function initializeExtension(factory, extensionPath, resolvedPath, cwd, eventBus, runtime) {
+    const extension = createExtension(extensionPath, resolvedPath);
+    const load = createExtensionAPI(extension, runtime, cwd, eventBus);
+    try {
+        await factory(load.api);
+        load.commit();
+    }
+    catch (error) {
+        load.discard();
+        throw error;
+    }
+    time(`${extensionPath} factory`, "extensions");
+    return extension;
+}
 async function loadExtension(extensionPath, cwd, eventBus, runtime, cacheToken) {
     const resolvedPath = resolvePath(extensionPath, cwd, { normalizeUnicodeSpaces: true });
     try {
@@ -432,17 +547,7 @@ async function loadExtension(extensionPath, cwd, eventBus, runtime, cacheToken)
         if (!factory) {
             return { extension: null, error: `Extension does not export a valid factory function: ${extensionPath}` };
         }
-        const extension = createExtension(extensionPath, resolvedPath);
-        const load = createExtensionAPI(extension, runtime, cwd, eventBus);
-        try {
-            await factory(load.api);
-            load.commit();
-        }
-        catch (error) {
-            load.discard();
-            throw error;
-        }
-        time(`${extensionPath} factory`, "extensions");
+        const extension = await initializeExtension(factory, extensionPath, resolvedPath, cwd, eventBus, runtime);
         return { extension, error: null };
     }
     catch (err) {
@@ -454,19 +559,8 @@ async function loadExtension(extensionPath, cwd, eventBus, runtime, cacheToken)
  * Create an Extension from an inline factory function.
  */
 export async function loadExtensionFromFactory(factory, cwd, eventBus, runtime, extensionPath = "<inline>") {
-    const extension = createExtension(extensionPath, extensionPath);
     const resolvedCwd = resolvePath(cwd);
-    const load = createExtensionAPI(extension, runtime, resolvedCwd, eventBus);
-    try {
-        await factory(load.api);
-        load.commit();
-    }
-    catch (error) {
-        load.discard();
-        throw error;
-    }
-    time(`${extensionPath} factory`, "extensions");
-    return extension;
+    return initializeExtension(factory, extensionPath, extensionPath, resolvedCwd, eventBus, runtime);
 }
 /**
  * Load extensions from paths.
@@ -474,6 +568,7 @@ export async function loadExtensionFromFactory(factory, cwd, eventBus, runtime,
 async function loadExtensionsInternal(paths, cwd, eventBus, runtime, useCache = false) {
     const extensions = [];
     const errors = [];
+    const warnings = [];
     const cacheToken = useCache ? useExtensionCacheCwd(cwd) : undefined;
     const resolvedCwd = cacheToken?.cwd ?? resolvePath(cwd);
     const resolvedEventBus = eventBus ?? createEventBus();
@@ -491,6 +586,7 @@ async function loadExtensionsInternal(paths, cwd, eventBus, runtime, useCache =
     return {
         extensions,
         errors,
+        warnings,
         runtime: resolvedRuntime,
     };
 }
@@ -500,19 +596,6 @@ export async function loadExtensions(paths, cwd, eventBus, runtime) {
 export async function loadExtensionsCached(paths, cwd, eventBus, runtime) {
     return loadExtensionsInternal(paths, cwd, eventBus, runtime, true);
 }
-function readPiManifest(packageJsonPath) {
-    try {
-        const content = fs.readFileSync(packageJsonPath, "utf-8");
-        const pkg = JSON.parse(content);
-        if (pkg.pi && typeof pkg.pi === "object") {
-            return pkg.pi;
-        }
-        return null;
-    }
-    catch {
-        return null;
-    }
-}
 function isExtensionFile(name) {
     return name.endsWith(".ts") || name.endsWith(".js");
 }