@selesai/code 0.9.9 → 0.9.11

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to `@selesai/code` will be documented in this file.
 
+## [0.9.11] - 2026-08-25
+
+### Fixed
+- **Pi-compatible automatic skill discovery.** Skills under `~/.agents/skills/` and project/ancestor `.agents/skills/` directories, plus automatic skills from `.pi/skills/` and the Selesai agent skill directory, are now enabled by default — matching the Pi coding agent. Explicit `skills` patterns still control overrides and exclusions.
+
+## [0.9.10] - 2026-08-25
+
+### Fixed
+- **Handoff from RPC hosts.** `/handoff-new` now generates and starts a child session in RPC/non-TUI hosts such as VS Code instead of requiring the terminal loader.
+- **Terminal copy markers.** The `copy-turn` extension now adds its `/cp` markers only in the TUI, preventing terminal-only transcript rows from leaking into RPC host conversations and handoffs.
+
 ## [0.9.9] - 2026-08-25
 
 ### Fixed

package/dist/cli/args.js

@@ -16,7 +16,18 @@ export function parseArgs(args) {
     };
     for (let i = 0; i < args.length; i++) {
         const arg = args[i];
-        if (arg === "--help" || arg === "-h") {
+        if (arg === "--") {
+            for (const positionalArg of args.slice(i + 1)) {
+                if (positionalArg.startsWith("@")) {
+                    result.fileArgs.push(positionalArg.slice(1));
+                }
+                else {
+                    result.messages.push(positionalArg);
+                }
+            }
+            break;
+        }
+        else if (arg === "--help" || arg === "-h") {
             result.help = true;
         }
         else if (arg === "--version" || arg === "-v") {
@@ -269,7 +280,7 @@ ${chalk.bold("Options:")}
   --models <patterns>            Comma-separated model patterns for Ctrl+P cycling
                                  Supports globs (anthropic/*, *sonnet*) and fuzzy matching
   --no-tools, -nt                Disable all tools by default (built-in and extension)
-  --no-builtin-tools, -nbt       Disable built-in tools by default but keep extension/custom tools enabled
+  --no-builtin-tools, -nbt       Disable built-in tools and enable extension/custom tools
   --tools, -t <tools>            Comma-separated allowlist of tool names to enable
                                  Applies to built-in, extension, and custom tools
   --exclude-tools, -xt <tools>   Comma-separated denylist of tool names to disable

package/dist/cli/args.test.js

@@ -1,5 +1,13 @@
 import { describe, expect, test } from "vitest";
 import { parseArgs } from "./args.js";
+describe("parseArgs end-of-options delimiter", () => {
+    test("treats remaining arguments as messages and @files", () => {
+        const result = parseArgs(["--no-session", "--", "--provider", "openai", "-c", "@prompt.md"]);
+        expect(result.noSession).toBe(true);
+        expect(result.messages).toEqual(["--provider", "openai", "-c"]);
+        expect(result.fileArgs).toEqual(["prompt.md"]);
+    });
+});
 describe("parseArgs --use-theme", () => {
     test("parses --use-theme with a theme name", () => {
         const result = parseArgs(["--use-theme", "nord-border", "hello"]);

package/dist/cli/credential-print.js

@@ -7,10 +7,10 @@ export function isCredentialPrintHelp(args) {
     return (args[0] === "auth" && (args[1] === undefined || args[1] === "help" || args[1] === "--help" || args[1] === "-h"));
 }
 export function printCredentialPrintHelp() {
-    console.log(`Usage:
-  ${APP_NAME} auth print-api-key --model <model> [--provider <provider>]
-  ${APP_NAME} auth print-bearer-token --model <model> [--provider <provider>] [--min-expiry <duration>]
-
+    console.log(`Usage:
+  ${APP_NAME} auth print-api-key --model <model> [--provider <provider>]
+  ${APP_NAME} auth print-bearer-token --model <model> [--provider <provider>] [--min-expiry <duration>]
+
 Prints the configured credential alone on stdout. Provider inference uses configured credentials; specify --provider to select explicitly. Bearer tokens have a 30-minute minimum expiry by default. --min-expiry accepts ms, s, m, or h (for example, 30m).`);
 }
 /** Parse the auth command surface before normal startup. */

package/dist/core/agent-session-auto-handoff.test.js

@@ -1,7 +1,8 @@
 import { describe, expect, it, vi } from "vitest";
+import { Type } from "typebox";
 import { AgentSession } from "./agent-session.js";
 import { SettingsManager } from "./settings-manager.js";
-function createMockSession({ enabled, threshold = 128_000, tokens, mode = "tui", command, }) {
+function createMockSession({ enabled, threshold = 128_000, tokens, mode = "tui", command, customTools, allowedToolNames, }) {
     const settings = SettingsManager.inMemory({
         autoHandoff: { enabled, thresholdTokens: threshold },
     });
@@ -45,13 +46,35 @@ function createMockSession({ enabled, threshold = 128_000, tokens, mode = "tui",
         settingsManager: settings,
         cwd: "/tmp",
         resourceLoader: resourceLoader,
+        customTools,
         modelRuntime: modelRegistry,
+        allowedToolNames,
     });
     session._extensionRunner = extensionRunner;
     session._extensionMode = mode;
     session.getContextUsage = () => tokens === null ? null : { tokens, contextWindow: 200_000, percent: tokens / 200_000 };
     return { session, getCommand, createCommandContext, handler, emitError, settings };
 }
+describe("AgentSession tools", () => {
+    const customTool = {
+        name: "custom",
+        label: "Custom",
+        description: "A custom tool",
+        parameters: Type.Object({}),
+        execute: async () => ({ content: [{ type: "text", text: "ok" }], details: undefined }),
+    };
+    it("keeps custom tools inactive by default but activates explicitly allowed ones", () => {
+        const defaults = createMockSession({ enabled: false, tokens: null, customTools: [customTool] });
+        expect(defaults.session.getActiveToolNames()).not.toContain("custom");
+        const allowed = createMockSession({
+            enabled: false,
+            tokens: null,
+            customTools: [customTool],
+            allowedToolNames: ["custom"],
+        });
+        expect(allowed.session.getActiveToolNames()).toEqual(["custom"]);
+    });
+});
 describe("AgentSession auto handoff", () => {
     it("invokes handoff-new once when enabled and threshold reached in tui mode", async () => {
         const command = { handler: vi.fn() };

package/dist/core/agent-session.d.ts

@@ -172,6 +172,11 @@ export interface PromptOptions {
     preflightResult?: (success: boolean) => void;
 }
 /** Result from cycleModel() */
+/** Options for model and thinking mutations. */
+export interface ModelMutationOptions {
+    /** Persist the value to global defaults. Defaults to session-only. */
+    persist?: boolean;
+}
 export interface ModelCycleResult {
     model: Model<any>;
     thinkingLevel: ThinkingLevel;
@@ -265,6 +270,7 @@ export declare class AgentSession {
     /** Emit an event to all listeners */
     private _emit;
     private _emitQueueUpdate;
+    private _emitSessionCompactFailed;
     private _getIdleWaitPromise;
     private _resolveIdleWaitIfIdle;
     private _emitAgentSettled;
@@ -478,14 +484,14 @@ export declare class AgentSession {
      * Validates that auth is configured, saves to session and settings.
      * @throws Error if no auth is configured for the model
      */
-    setModel(model: Model<any>): Promise<void>;
+    setModel(model: Model<any>, options?: ModelMutationOptions): Promise<void>;
     /**
      * Cycle to next/previous model.
      * Uses scoped models (from --models flag) if available, otherwise all available models.
      * @param direction - "forward" (default) or "backward"
      * @returns The new model info, or undefined if only one model available
      */
-    cycleModel(direction?: "forward" | "backward"): Promise<ModelCycleResult | undefined>;
+    cycleModel(direction?: "forward" | "backward", options?: ModelMutationOptions): Promise<ModelCycleResult | undefined>;
     private _cycleScopedModel;
     private _cycleAvailableModel;
     /**
@@ -493,12 +499,12 @@ export declare class AgentSession {
      * Clamps to model capabilities based on available thinking levels.
      * Saves to session and settings only if the level actually changes.
      */
-    setThinkingLevel(level: ThinkingLevel): void;
+    setThinkingLevel(level: ThinkingLevel, options?: ModelMutationOptions): void;
     /**
      * Cycle to next thinking level.
      * @returns New level, or undefined if model doesn't support thinking
      */
-    cycleThinkingLevel(): ThinkingLevel | undefined;
+    cycleThinkingLevel(options?: ModelMutationOptions): ThinkingLevel | undefined;
     /**
      * Get available thinking levels for current model.
      * The provider will clamp to what the specific model supports internally.
@@ -552,6 +558,7 @@ export declare class AgentSession {
     private _applyExtensionBindings;
     private _refreshCurrentModelFromRegistry;
     private _bindExtensionCore;
+    private _createToolCatalogDefinition;
     private _refreshToolRegistry;
     private _buildRuntime;
     reload(options?: {

package/dist/core/agent-session.js

@@ -14,6 +14,7 @@
  */
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname } from "node:path";
+import { Type } from "typebox";
 import { contentText } from "@earendil-works/pi-ai";
 import { clampThinkingLevel, cleanupSessionResources, getSupportedThinkingLevels, isContextOverflow, isRetryableAssistantError, modelsAreEqual, resetApiProviders, streamSimple, } from "@earendil-works/pi-ai/compat";
 import { getThemeByName, theme } from "../modes/interactive/theme/theme.js";
@@ -24,7 +25,7 @@ import { normalizeAssistantThinkingTags } from "../utils/thinking-tags.js";
 import { formatNoApiKeyFoundMessage, formatNoModelSelectedMessage } from "./auth-guidance.js";
 import { executeBashWithOperations } from "./bash-executor.js";
 import { calculateContextTokens, collectEntriesForBranchSummary, compact, estimateContextTokens, estimateTokens, generateBranchSummary, prepareCompaction, shouldCompact, } from "./compaction/index.js";
-import { DEFAULT_THINKING_LEVEL } from "./defaults.js";
+import { DEFAULT_THINKING_LEVEL, THINKING_LEVEL_OPTIONS } from "./defaults.js";
 import { exportSessionToHtml } from "./export-html/index.js";
 import { createToolHtmlRenderer } from "./export-html/tool-renderer.js";
 import { ExtensionRunner, wrapRegisteredTools, } from "./extensions/index.js";
@@ -82,8 +83,6 @@ function estimateMessagesTokens(messages) {
 // ============================================================================
 // Constants
 // ============================================================================
-/** Standard thinking levels */
-const THINKING_LEVELS = ["off", "minimal", "low", "medium", "high"];
 // ============================================================================
 // AgentSession Class
 // ============================================================================
@@ -168,7 +167,6 @@ export class AgentSession {
         this._installAgentNextTurnRefresh();
         this._buildRuntime({
             activeToolNames: this._initialActiveToolNames,
-            includeAllExtensionTools: true,
         });
     }
     get modelRuntime() {
@@ -307,6 +305,11 @@ export class AgentSession {
             followUp: [...this._followUpMessages],
         });
     }
+    async _emitSessionCompactFailed(event) {
+        if (this._extensionRunner.hasHandlers("session_compact_failed")) {
+            await this._extensionRunner.emit({ type: "session_compact_failed", ...event });
+        }
+    }
     _getIdleWaitPromise() {
         if (!this._idleWaitPromise) {
             this._idleWaitPromise = new Promise((resolve) => {
@@ -350,10 +353,9 @@ export class AgentSession {
         if (this._autoHandoffTriggered)
             return;
         this._autoHandoffTriggered = true;
-        // handoff-new requires interactive mode (uses editor/dialog UI).
-        // ponytail: _extensionMode is set to "tui" by InteractiveMode.bindCurrentSessionExtensions()
-        // before the first prompt runs, so by the time _emitAgentSettled() calls this the mode is
-        // reliable. Default "print" only applies before extensions are bound.
+        // Auto-handoff is TUI-only: it runs at agent_settled, and headless/print
+        // modes should not churn sessions on their own. The handoff-new command
+        // itself now also works in non-TUI modes (direct generation, no loader).
         if (this._extensionMode !== "tui")
             return;
         const command = this._extensionRunner.getCommand("handoff-new");
@@ -1436,16 +1438,17 @@ export class AgentSession {
      * Validates that auth is configured, saves to session and settings.
      * @throws Error if no auth is configured for the model
      */
-    async setModel(model) {
+    async setModel(model, options = {}) {
         if (!(await this._modelRuntime.checkAuth(model.provider))) {
             throw new Error(`No API key for ${model.provider}/${model.id}`);
         }
         const previousModel = this.model;
-        const thinkingLevel = this._getThinkingLevelForModelSwitch();
+        const thinkingLevel = this._getThinkingLevelForModelSwitch(model);
         this.agent.state.model = model;
         this.sessionManager.appendModelChange(model.provider, model.id);
-        this.settingsManager.setDefaultModelAndProvider(model.provider, model.id);
-        // Re-clamp thinking level for new model's capabilities
+        if (options.persist) {
+            this.settingsManager.setDefaultModelAndProvider(model.provider, model.id);
+        }
         this.setThinkingLevel(thinkingLevel);
         await this._emitModelSelect(model, previousModel, "set");
     }
@@ -1455,13 +1458,13 @@ export class AgentSession {
      * @param direction - "forward" (default) or "backward"
      * @returns The new model info, or undefined if only one model available
      */
-    async cycleModel(direction = "forward") {
+    async cycleModel(direction = "forward", options = {}) {
         if (this._scopedModels.length > 0) {
-            return this._cycleScopedModel(direction);
+            return this._cycleScopedModel(direction, options);
         }
-        return this._cycleAvailableModel(direction);
+        return this._cycleAvailableModel(direction, options);
     }
-    async _cycleScopedModel(direction) {
+    async _cycleScopedModel(direction, options) {
         const checks = await Promise.all(this._scopedModels.map(async (scoped) => ({
             scoped,
             auth: await this._modelRuntime.checkAuth(scoped.model.provider),
@@ -1476,11 +1479,13 @@ export class AgentSession {
         const len = scopedModels.length;
         const nextIndex = direction === "forward" ? (currentIndex + 1) % len : (currentIndex - 1 + len) % len;
         const next = scopedModels[nextIndex];
-        const thinkingLevel = this._getThinkingLevelForModelSwitch(next.thinkingLevel);
+        const thinkingLevel = this._getThinkingLevelForModelSwitch(next.model, next.thinkingLevel);
         // Apply model
         this.agent.state.model = next.model;
         this.sessionManager.appendModelChange(next.model.provider, next.model.id);
-        this.settingsManager.setDefaultModelAndProvider(next.model.provider, next.model.id);
+        if (options.persist) {
+            this.settingsManager.setDefaultModelAndProvider(next.model.provider, next.model.id);
+        }
         // Apply thinking level.
         // - Explicit scoped model thinking level overrides current session level
         // - Undefined scoped model thinking level inherits the current session preference
@@ -1489,7 +1494,7 @@ export class AgentSession {
         await this._emitModelSelect(next.model, currentModel, "cycle");
         return { model: next.model, thinkingLevel: this.thinkingLevel, isScoped: true };
     }
-    async _cycleAvailableModel(direction) {
+    async _cycleAvailableModel(direction, options) {
         const availableModels = await this._modelRuntime.getAvailable();
         if (availableModels.length <= 1)
             return undefined;
@@ -1500,10 +1505,12 @@ export class AgentSession {
         const len = availableModels.length;
         const nextIndex = direction === "forward" ? (currentIndex + 1) % len : (currentIndex - 1 + len) % len;
         const nextModel = availableModels[nextIndex];
-        const thinkingLevel = this._getThinkingLevelForModelSwitch();
+        const thinkingLevel = this._getThinkingLevelForModelSwitch(nextModel);
         this.agent.state.model = nextModel;
         this.sessionManager.appendModelChange(nextModel.provider, nextModel.id);
-        this.settingsManager.setDefaultModelAndProvider(nextModel.provider, nextModel.id);
+        if (options.persist) {
+            this.settingsManager.setDefaultModelAndProvider(nextModel.provider, nextModel.id);
+        }
         // Re-clamp thinking level for new model's capabilities
         this.setThinkingLevel(thinkingLevel);
         await this._emitModelSelect(nextModel, currentModel, "cycle");
@@ -1517,18 +1524,18 @@ export class AgentSession {
      * Clamps to model capabilities based on available thinking levels.
      * Saves to session and settings only if the level actually changes.
      */
-    setThinkingLevel(level) {
+    setThinkingLevel(level, options = {}) {
         const availableLevels = this.getAvailableThinkingLevels();
         const effectiveLevel = availableLevels.includes(level) ? level : this._clampThinkingLevel(level, availableLevels);
         // Only persist if actually changing
         const previousLevel = this.agent.state.thinkingLevel;
         const isChanging = effectiveLevel !== previousLevel;
         this.agent.state.thinkingLevel = effectiveLevel;
+        if (options.persist) {
+            this.settingsManager.setDefaultThinkingLevel(level);
+        }
         if (isChanging) {
             this.sessionManager.appendThinkingLevelChange(effectiveLevel);
-            if (this.supportsThinking() || effectiveLevel !== "off") {
-                this.settingsManager.setDefaultThinkingLevel(effectiveLevel);
-            }
             this._emit({ type: "thinking_level_changed", level: effectiveLevel });
             void this._extensionRunner.emit({
                 type: "thinking_level_select",
@@ -1541,14 +1548,14 @@ export class AgentSession {
      * Cycle to next thinking level.
      * @returns New level, or undefined if model doesn't support thinking
      */
-    cycleThinkingLevel() {
+    cycleThinkingLevel(options = {}) {
         if (!this.supportsThinking())
             return undefined;
         const levels = this.getAvailableThinkingLevels();
         const currentIndex = levels.indexOf(this.thinkingLevel);
         const nextIndex = (currentIndex + 1) % levels.length;
         const nextLevel = levels[nextIndex];
-        this.setThinkingLevel(nextLevel);
+        this.setThinkingLevel(nextLevel, options);
         return nextLevel;
     }
     /**
@@ -1557,7 +1564,7 @@ export class AgentSession {
      */
     getAvailableThinkingLevels() {
         if (!this.model)
-            return THINKING_LEVELS;
+            return [...THINKING_LEVEL_OPTIONS];
         return getSupportedThinkingLevels(this.model);
     }
     /**
@@ -1566,14 +1573,16 @@ export class AgentSession {
     supportsThinking() {
         return !!this.model?.reasoning;
     }
-    _getThinkingLevelForModelSwitch(explicitLevel) {
+    _getThinkingLevelForModelSwitch(targetModel, explicitLevel) {
         if (explicitLevel !== undefined) {
             return explicitLevel;
         }
-        if (!this.supportsThinking()) {
-            return this.settingsManager.getDefaultThinkingLevel() ?? DEFAULT_THINKING_LEVEL;
+        if (targetModel) {
+            const perModel = this.settingsManager.getModelThinkingLevel(targetModel.provider, targetModel.id);
+            if (perModel !== undefined)
+                return perModel;
         }
-        return this.thinkingLevel;
+        return this.settingsManager.getDefaultThinkingLevel() ?? this.thinkingLevel ?? DEFAULT_THINKING_LEVEL;
     }
     _clampThinkingLevel(level, _availableLevels) {
         return this.model ? clampThinkingLevel(this.model, level) : "off";
@@ -1711,13 +1720,21 @@ export class AgentSession {
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
             const aborted = message === "Compaction cancelled" || (error instanceof Error && error.name === "AbortError");
+            const errorMessage = aborted ? undefined : `Compaction failed: ${message}`;
             this._emit({
                 type: "compaction_end",
                 reason: "manual",
                 result: undefined,
                 aborted,
                 willRetry: false,
-                errorMessage: aborted ? undefined : `Compaction failed: ${message}`,
+                errorMessage,
+            });
+            await this._emitSessionCompactFailed({
+                reason: "manual",
+                errorMessage,
+                aborted,
+                willRetry: false,
+                fromExtension: false,
             });
             throw error;
         }
@@ -1836,6 +1853,7 @@ export class AgentSession {
     async _runAutoCompaction(reason, willRetry) {
         const settings = this.settingsManager.getCompactionSettings();
         let started = false;
+        let fromExtension = false;
         try {
             if (!this.model) {
                 return false;
@@ -1858,7 +1876,6 @@ export class AgentSession {
             this._autoCompactionAbortController = new AbortController();
             started = true;
             let extensionCompaction;
-            let fromExtension = false;
             if (this._extensionRunner.hasHandlers("session_before_compact")) {
                 const extensionResult = (await this._extensionRunner.emit({
                     type: "session_before_compact",
@@ -1877,6 +1894,7 @@ export class AgentSession {
                         aborted: true,
                         willRetry: false,
                     });
+                    await this._emitSessionCompactFailed({ reason, aborted: true, willRetry: false, fromExtension: false });
                     return false;
                 }
                 if (extensionResult?.compaction) {
@@ -1914,6 +1932,7 @@ export class AgentSession {
                     aborted: true,
                     willRetry: false,
                 });
+                await this._emitSessionCompactFailed({ reason, aborted: true, willRetry: false, fromExtension });
                 return false;
             }
             this.sessionManager.appendCompaction(summary, firstKeptEntryId, tokensBefore, details, fromExtension, usage);
@@ -1956,15 +1975,23 @@ export class AgentSession {
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : "compaction failed";
             if (started) {
+                const formattedErrorMessage = reason === "overflow"
+                    ? `Context overflow recovery failed: ${errorMessage}`
+                    : `Auto-compaction failed: ${errorMessage}`;
                 this._emit({
                     type: "compaction_end",
                     reason,
                     result: undefined,
                     aborted: false,
                     willRetry: false,
-                    errorMessage: reason === "overflow"
-                        ? `Context overflow recovery failed: ${errorMessage}`
-                        : `Auto-compaction failed: ${errorMessage}`,
+                    errorMessage: formattedErrorMessage,
+                });
+                await this._emitSessionCompactFailed({
+                    reason,
+                    errorMessage: formattedErrorMessage,
+                    aborted: false,
+                    willRetry: false,
+                    fromExtension,
                 });
             }
             return false;
@@ -2188,6 +2215,39 @@ export class AgentSession {
             },
         });
     }
+    _createToolCatalogDefinition() {
+        return {
+            name: "tool_catalog",
+            label: "Tool catalog",
+            description: "Discover inactive tools by capability or activate named tools. Activated tools are available on the next turn.",
+            parameters: Type.Object({
+                query: Type.Optional(Type.String({ description: "Capability or tool name to search for" })),
+                activate: Type.Optional(Type.Array(Type.String({ minLength: 1 }), { description: "Exact inactive tool names to activate" })),
+            }),
+            execute: async (_toolCallId, params) => {
+                const query = params.query?.trim().toLowerCase();
+                const active = new Set(this.getActiveToolNames());
+                const requested = Array.isArray(params.activate)
+                    ? Array.from(new Set(params.activate.filter((name) => typeof name === "string")))
+                    : [];
+                const available = Array.from(this._toolDefinitions.values()).filter(({ definition }) => definition.name !== "tool_catalog");
+                const known = new Set(available.map(({ definition }) => definition.name));
+                const unknown = requested.filter((name) => !known.has(name));
+                const activate = requested.filter((name) => known.has(name));
+                if (activate.length > 0)
+                    this.setActiveToolsByName([...active, ...activate]);
+                const matches = available
+                    .filter(({ definition }) => !query || `${definition.name} ${definition.description}`.toLowerCase().includes(query))
+                    .map(({ definition }) => `- ${definition.name}: ${definition.description}`);
+                const result = [
+                    activate.length > 0 ? `Activated: ${activate.join(", ")}. They are available on the next turn.` : undefined,
+                    unknown.length > 0 ? `Unknown or unavailable: ${unknown.join(", ")}.` : undefined,
+                    matches.length > 0 ? `Available tools:\n${matches.join("\n")}` : query ? "No matching tools." : "No additional tools available.",
+                ].filter(Boolean).join("\n\n");
+                return { content: [{ type: "text", text: result }], details: { activated: activate, unknown } };
+            },
+        };
+    }
     _refreshToolRegistry(options) {
         const previousRegistryNames = new Set(this._toolRegistry.keys());
         const previousActiveToolNames = this.getActiveToolNames();
@@ -2292,6 +2352,7 @@ export class AgentSession {
                 bash: { commandPrefix: shellCommandPrefix, shellPath },
             });
         this._baseToolDefinitions = new Map(Object.entries(baseToolDefinitions).map(([name, tool]) => [name, tool]));
+        this._baseToolDefinitions.set("tool_catalog", this._createToolCatalogDefinition());
         const extensionsResult = this._resourceLoader.getExtensions();
         if (options.flagValues) {
             for (const [name, value] of options.flagValues) {
@@ -2306,7 +2367,7 @@ export class AgentSession {
         this._applyExtensionBindings(this._extensionRunner);
         const defaultActiveToolNames = this._baseToolsOverride
             ? Object.keys(this._baseToolsOverride)
-            : ["read", "bash", "edit", "write"];
+            : ["read", "bash", "edit", "write", "tool_catalog"];
         const baseActiveToolNames = options.activeToolNames ?? defaultActiveToolNames;
         this._refreshToolRegistry({
             activeToolNames: baseActiveToolNames,
@@ -2323,7 +2384,6 @@ export class AgentSession {
         this._buildRuntime({
             activeToolNames: this.getActiveToolNames(),
             flagValues: previousFlagValues,
-            includeAllExtensionTools: true,
         });
         const hasBindings = this._extensionUIContext ||
             this._extensionCommandContextActions ||

package/dist/core/compaction/branch-summarization.js

@@ -146,37 +146,37 @@ export function prepareBranchEntries(entries, tokenBudget = 0) {
 // ============================================================================
 // Summary Generation
 // ============================================================================
-const BRANCH_SUMMARY_PREAMBLE = `The user explored a different conversation branch before returning here.
-Summary of that exploration:
-
+const BRANCH_SUMMARY_PREAMBLE = `The user explored a different conversation branch before returning here.
+Summary of that exploration:
+
 `;
-const BRANCH_SUMMARY_PROMPT = `Create a structured summary of this conversation branch for context when returning later.
-
-Use this EXACT format:
-
-## Goal
-[What was the user trying to accomplish in this branch?]
-
-## Constraints & Preferences
-- [Any constraints, preferences, or requirements mentioned]
-- [Or "(none)" if none were mentioned]
-
-## Progress
-### Done
-- [x] [Completed tasks/changes]
-
-### In Progress
-- [ ] [Work that was started but not finished]
-
-### Blocked
-- [Issues preventing progress, if any]
-
-## Key Decisions
-- **[Decision]**: [Brief rationale]
-
-## Next Steps
-1. [What should happen next to continue this work]
-
+const BRANCH_SUMMARY_PROMPT = `Create a structured summary of this conversation branch for context when returning later.
+
+Use this EXACT format:
+
+## Goal
+[What was the user trying to accomplish in this branch?]
+
+## Constraints & Preferences
+- [Any constraints, preferences, or requirements mentioned]
+- [Or "(none)" if none were mentioned]
+
+## Progress
+### Done
+- [x] [Completed tasks/changes]
+
+### In Progress
+- [ ] [Work that was started but not finished]
+
+### Blocked
+- [Issues preventing progress, if any]
+
+## Key Decisions
+- **[Decision]**: [Brief rationale]
+
+## Next Steps
+1. [What should happen next to continue this work]
+
 Keep each section concise. Preserve exact file paths, function names, and error messages.`;
 /**
  * Generate a summary of abandoned branch entries.