@bubblebrain-ai/bubble 0.0.35 → 0.0.36

package/dist/tools/memory.js

@@ -1,9 +1,17 @@
 import { readMemorySummary, searchMemory } from "../memory/index.js";
 const MEMORY_SCOPE_ENUM = ["project", "global", "all"];
-export function createMemorySearchTool(cwd) {
+/**
+ * Single entry point to persistent memory: without a query it reads the
+ * concise memory summary, with a query it searches memory. One schema in the
+ * per-turn tool list instead of two (the read/search split cost context on
+ * every turn while both modes share this file's backing code).
+ */
+export function createMemoryTool(cwd) {
     return {
-        name: "memory_search",
-        description: "Search persistent Bubble memory for prior project facts, user preferences, workflows, decisions, and gotchas.",
+        name: "memory",
+        description: "Read or search persistent Bubble memory (prior project facts, user preferences, workflows, decisions, gotchas). " +
+            "Without query, returns the concise memory summary (scope defaults to project). " +
+            "With query, searches memory entries (scope defaults to all, project memory first).",
         readOnly: true,
         effect: "read",
         parameters: {
@@ -11,25 +19,37 @@ export function createMemorySearchTool(cwd) {
             properties: {
                 query: {
                     type: "string",
-                    description: "Search query. Use concrete terms such as file names, feature names, commands, or error text.",
+                    description: "Search query. Use concrete terms such as file names, feature names, commands, or error text. Omit to read the memory summary instead.",
                 },
                 scope: {
                     type: "string",
                     enum: MEMORY_SCOPE_ENUM,
-                    description: "Memory scope to search. Defaults to all, with project memory first.",
+                    description: "Memory scope. Defaults to project when reading the summary, all when searching.",
                 },
                 limit: {
                     type: "number",
-                    description: "Maximum number of results to return. Defaults to 12.",
+                    description: "Maximum number of search results to return. Defaults to 12. Ignored for summary reads.",
                 },
             },
-            required: ["query"],
             additionalProperties: false,
         },
         async execute(args) {
             const query = typeof args.query === "string" ? args.query.trim() : "";
             if (!query) {
-                return { content: "query is required", isError: true, status: "no_match" };
+                const scope = parseScope(args.scope, "project");
+                const summaries = readMemorySummary(cwd, scope);
+                if (summaries.length === 0) {
+                    return { content: `No ${scope} memory summary is available.`, status: "no_match" };
+                }
+                return {
+                    content: summaries.map((summary) => [
+                        `# ${summary.scope} memory summary`,
+                        `Path: ${summary.path}`,
+                        "",
+                        summary.content,
+                    ].join("\n")).join("\n\n---\n\n"),
+                    metadata: { kind: "read", matches: summaries.length },
+                };
             }
             const scope = parseScope(args.scope);
             const limit = typeof args.limit === "number" && Number.isFinite(args.limit)
@@ -52,41 +72,6 @@ export function createMemorySearchTool(cwd) {
         },
     };
 }
-export function createMemoryReadSummaryTool(cwd) {
-    return {
-        name: "memory_read_summary",
-        description: "Read the concise persistent memory summary for the current project, global scope, or both.",
-        readOnly: true,
-        effect: "read",
-        parameters: {
-            type: "object",
-            properties: {
-                scope: {
-                    type: "string",
-                    enum: MEMORY_SCOPE_ENUM,
-                    description: "Memory scope to read. Defaults to project.",
-                },
-            },
-            additionalProperties: false,
-        },
-        async execute(args) {
-            const scope = parseScope(args.scope, "project");
-            const summaries = readMemorySummary(cwd, scope);
-            if (summaries.length === 0) {
-                return { content: `No ${scope} memory summary is available.`, status: "no_match" };
-            }
-            return {
-                content: summaries.map((summary) => [
-                    `# ${summary.scope} memory summary`,
-                    `Path: ${summary.path}`,
-                    "",
-                    summary.content,
-                ].join("\n")).join("\n\n---\n\n"),
-                metadata: { kind: "read", matches: summaries.length },
-            };
-        },
-    };
-}
 function parseScope(value, fallback = "all") {
     return value === "project" || value === "global" || value === "all" ? value : fallback;
 }

package/dist/tools/server.js

@@ -7,6 +7,7 @@ export function createManagedServerTools(cwd, approval) {
     return [
         {
             name: "start_server",
+            deferred: true,
             effect: "unknown",
             requiresApproval: true,
             description: "Start a long-running development server as a managed service. Use this instead of bash for npm run dev, next dev, vite, webpack --watch, or similar commands. Pass a foreground server command without a trailing '&'. The tool waits for readiness and then returns a server_id; use server_status, server_logs, and stop_server to manage it.",
@@ -84,6 +85,7 @@ export function createManagedServerTools(cwd, approval) {
         },
         {
             name: "server_status",
+            deferred: true,
             readOnly: true,
             effect: "read",
             description: "Show managed development server status. Pass serverId for one server, or omit it to list all managed servers.",
@@ -123,6 +125,7 @@ export function createManagedServerTools(cwd, approval) {
         },
         {
             name: "server_logs",
+            deferred: true,
             readOnly: true,
             effect: "read",
             description: "Return recent logs for a managed development server.",
@@ -154,6 +157,7 @@ export function createManagedServerTools(cwd, approval) {
         },
         {
             name: "stop_server",
+            deferred: true,
             effect: "unknown",
             description: "Stop a managed development server by serverId.",
             parameters: {

package/dist/tools/tool-search.d.ts

@@ -20,4 +20,4 @@ export interface ToolSearchController {
     /** Mark a set of deferred tool names as unlocked. */
     unlock: (names: string[]) => void;
 }
-export declare function createToolSearchTool(controller: ToolSearchController): ToolRegistryEntry;
+export declare function createToolSearchTool(controller?: ToolSearchController): ToolRegistryEntry;

package/dist/tools/tool-search.js

@@ -13,6 +13,22 @@
  * tools are also unlocked on the agent so subsequent turns include them in
  * the real tool list.
  */
+/**
+ * Without an injected controller, back the tool with the executing agent from
+ * the tool context. This keeps tool_search available in EVERY host — a host
+ * that forgets to wire a controller must not strand deferred tools behind an
+ * unreachable unlock path (Feishu and the desktop bridge hit exactly that
+ * with deferred MCP tools).
+ */
+function contextController(ctx) {
+    const agent = ctx.agent;
+    if (!agent?.listDeferredTools || !agent.unlockDeferredTools)
+        return undefined;
+    return {
+        listDeferred: () => agent.listDeferredTools(),
+        unlock: (names) => agent.unlockDeferredTools(names),
+    };
+}
 export function createToolSearchTool(controller) {
     return {
         name: "tool_search",
@@ -36,12 +52,16 @@ export function createToolSearchTool(controller) {
             },
             required: ["query"],
         },
-        async execute(args) {
+        async execute(args, ctx) {
+            const resolved = controller ?? contextController(ctx);
+            if (!resolved) {
+                return { content: "Error: tool_search requires an agent runtime.", isError: true };
+            }
             const query = typeof args.query === "string" ? args.query : "";
             const maxResults = typeof args.max_results === "number" && args.max_results > 0
                 ? Math.min(Math.floor(args.max_results), 25)
                 : 5;
-            const deferred = controller.listDeferred();
+            const deferred = resolved.listDeferred();
             if (deferred.length === 0) {
                 return { content: "No deferred tools are registered in this session." };
             }
@@ -70,7 +90,7 @@ export function createToolSearchTool(controller) {
                     };
                 }
             }
-            controller.unlock(matches.map((t) => t.name));
+            resolved.unlock(matches.map((t) => t.name));
             const lines = ["<functions>"];
             for (const tool of matches) {
                 const schema = {

package/dist/tui/model-switch.d.ts

@@ -7,6 +7,11 @@ export interface ModelSwitchAgent {
     thinking: ThinkingLevel;
     setProvider(provider: Provider): void;
     setSystemPrompt(prompt: string): void;
+    /** Routing menu for the NEXT parent route (model-routing design §1.5). */
+    renderModelRoutingPromptFor?(parent: {
+        providerId: string;
+        model: string;
+    }): string | undefined;
 }
 export interface ModelSwitchRegistry {
     prepareProvider(providerId: string): Promise<void>;
@@ -26,6 +31,8 @@ export interface SwitchAgentModelOptions {
     agent: ModelSwitchAgent;
     registry: ModelSwitchRegistry;
     createProvider: ((providerId: string, apiKey: string, baseURL: string) => Provider) | undefined;
+    /** A side-effect-free provider instance prepared before an atomic session transition. */
+    preparedProvider?: Provider;
     workingDir: string;
     systemPromptOptions: Omit<SystemPromptOptions, "agentName" | "configuredProvider" | "configuredModel" | "configuredModelId" | "thinkingLevel" | "workingDir">;
     thinkingLevel?: ThinkingLevel;

package/dist/tui/model-switch.js

@@ -1,6 +1,7 @@
 import { decodeModel, displayModel } from "../provider-registry.js";
 import { buildSystemPrompt } from "../system-prompt.js";
-import { getAvailableThinkingLevels, getDefaultThinkingLevel, normalizeThinkingLevel } from "../provider-transform.js";
+import { getAvailableThinkingLevels, normalizeThinkingLevel } from "../provider-transform.js";
+import { normalizeInheritedThinkingLevel } from "../variant/variant-resolver.js";
 export function modelSwitchTarget(model, fallbackProviderId) {
     const decoded = decodeModel(model);
     return {
@@ -22,13 +23,18 @@ export function formatModelSwitchError(model, error) {
 }
 export async function switchAgentModel(options) {
     const { providerId, modelId } = modelSwitchTarget(options.model, options.agent.providerId || options.registry.getDefault()?.id);
-    await options.registry.prepareProvider(providerId);
+    if (!options.preparedProvider) {
+        await options.registry.prepareProvider(providerId);
+    }
     const provider = options.registry.getConfigured().find((item) => item.id === providerId);
-    if (!provider?.apiKey || !options.createProvider) {
+    if (!provider?.apiKey || (!options.createProvider && !options.preparedProvider)) {
         throw new Error(`Provider ${providerId} is not configured or has no active credentials.`);
     }
-    const nextThinkingLevel = normalizeThinkingLevel((options.thinkingLevel ?? options.agent.thinking) || getDefaultThinkingLevel(providerId, modelId), getAvailableThinkingLevels(providerId, modelId));
-    const nextProvider = options.createProvider(providerId, provider.apiKey, provider.baseURL);
+    const nextThinkingLevel = options.thinkingLevel !== undefined
+        ? normalizeThinkingLevel(options.thinkingLevel, getAvailableThinkingLevels(providerId, modelId))
+        : normalizeInheritedThinkingLevel(providerId, modelId, options.agent.thinking);
+    const nextProvider = options.preparedProvider
+        ?? options.createProvider(providerId, provider.apiKey, provider.baseURL);
     const nextSystemPrompt = buildSystemPrompt({
         agentName: "Bubble",
         configuredProvider: providerId,
@@ -37,6 +43,10 @@ export async function switchAgentModel(options) {
         thinkingLevel: nextThinkingLevel,
         workingDir: options.workingDir,
         ...options.systemPromptOptions,
+        // The spread carries the menu for the OLD parent; re-render for the model
+        // being switched to, before any agent state is mutated (design §1.5).
+        modelRoutingPrompt: options.agent.renderModelRoutingPromptFor?.({ providerId, model: modelId })
+            ?? options.systemPromptOptions.modelRoutingPrompt,
     });
     options.agent.model = options.model;
     options.agent.thinking = nextThinkingLevel;

package/dist/tui-ink/app.d.ts

@@ -14,6 +14,7 @@ import type { QuestionController } from "../question/index.js";
 import type { MemoryScope } from "../memory/index.js";
 import type { ExternalHookController } from "../hooks/controller.js";
 import type { GoalStore } from "../goal/store.js";
+import type { ExternalRuntimeManager } from "../external-runtime/types.js";
 export interface PlanHandlerRef {
     current?: (plan: string) => Promise<PlanDecision>;
 }
@@ -53,6 +54,7 @@ interface AppProps {
     updateNotice?: string;
     updateNoticeRefresh?: Promise<string | null>;
     hookController?: ExternalHookController;
+    externalRuntime?: ExternalRuntimeManager;
     onExit?: (summary: ExitSummary) => void;
 }
 export interface ExitSummary {
@@ -63,5 +65,5 @@ export declare const INK_LOCAL_SLASH_COMMANDS: readonly [{
     readonly name: "goal";
     readonly description: "Set/manage an autonomous goal (/goal <objective>|clear|pause|resume|edit)";
 }];
-export declare function App({ agent, args, sessionManager: initialSessionManager, switchSession, createProvider, registry, skillRegistry, planHandlerRef, approvalHandlerRef, questionController, bashAllowlist, settingsManager, lspService, mcpManager, themeMode: initialThemeMode, themeOverrides, detectedTheme, onThemeModeChange, flushMemory, runMemoryCompaction, runMemorySummary, runMemoryRefresh, goalStore, bypassEnabled, updateNotice, updateNoticeRefresh, hookController, onExit }: AppProps): import("react/jsx-runtime").JSX.Element;
+export declare function App({ agent, args, sessionManager: initialSessionManager, switchSession, createProvider, registry, skillRegistry, planHandlerRef, approvalHandlerRef, questionController, bashAllowlist, settingsManager, lspService, mcpManager, themeMode: initialThemeMode, themeOverrides, detectedTheme, onThemeModeChange, flushMemory, runMemoryCompaction, runMemorySummary, runMemoryRefresh, goalStore, bypassEnabled, updateNotice, updateNoticeRefresh, hookController, externalRuntime, onExit }: AppProps): import("react/jsx-runtime").JSX.Element;
 export {};