@bubblebrain-ai/bubble 0.0.33 → 0.0.35

package/dist/slash-commands/commands.js

@@ -329,19 +329,15 @@ const builtinSlashCommandEntries = [
     },
     {
         name: "theme",
-        description: "Switch the color theme. Usage: /theme [auto|light|dark]",
+        description: "Pick the color theme. Usage: /theme [auto|light|dark]",
         async handler(args, ctx) {
             if (!ctx.setThemeMode || !ctx.getThemeMode || !ctx.getResolvedTheme) {
                 return "Theme switching is only available inside the TUI.";
             }
             const arg = args.trim().toLowerCase();
             if (!arg) {
-                const order = ["auto", "light", "dark"];
-                const current = ctx.getThemeMode();
-                const next = order[(order.indexOf(current) + 1) % order.length];
-                ctx.setThemeMode(next);
-                const resolved = next === "auto" ? ctx.getResolvedTheme() : next;
-                return `Theme: ${next}${next === "auto" ? ` (resolved to ${resolved})` : ""}`;
+                ctx.openPicker("theme");
+                return;
             }
             if (arg !== "auto" && arg !== "light" && arg !== "dark") {
                 return "Usage: /theme [auto|light|dark]";

package/dist/slash-commands/types.d.ts

@@ -28,7 +28,7 @@ export interface SlashCommandContext {
     exit: () => void;
     sessionManager?: SessionManager;
     createProvider: (providerId: string, apiKey: string, baseURL: string) => Provider;
-    openPicker: (mode: "model" | "key" | "provider" | "provider-add" | "login" | "logout" | "skill" | "feishu-setup", providerId?: string) => void;
+    openPicker: (mode: "model" | "key" | "provider" | "provider-add" | "login" | "logout" | "skill" | "theme" | "feishu-setup", providerId?: string) => void;
     registry: ProviderRegistry;
     skillRegistry: SkillRegistry;
     bashAllowlist?: BashAllowlist;

package/dist/tools/agent-lifecycle.d.ts

@@ -24,15 +24,7 @@ export declare function createWaitAgentTool(): ToolRegistryEntry;
 export declare function createSendInputTool(): ToolRegistryEntry;
 export declare function createCloseAgentTool(): ToolRegistryEntry;
 export declare function createListAgentsTool(): ToolRegistryEntry;
-/** Items bound for one agent_team call (design §1.2). */
-export declare const AGENT_TEAM_MIN_ITEMS = 2;
-export declare const AGENT_TEAM_MAX_ITEMS = 32;
-export declare function createAgentTeamTool(options?: AgentLifecycleToolOptions, sharedTrust?: ProjectProfileTrust): ToolRegistryEntry;
-/** Specs bound for one agent_batch call (design v2 §1.3). */
-export declare const AGENT_BATCH_MIN_SPECS = 2;
-export declare const AGENT_BATCH_MAX_SPECS = 32;
-export declare function createAgentBatchTool(options?: AgentLifecycleToolOptions, sharedTrust?: ProjectProfileTrust): ToolRegistryEntry;
-export declare function createRunWorkflowTool(options?: AgentLifecycleToolOptions): ToolRegistryEntry;
+export declare function createRunWorkflowTool(options?: AgentLifecycleToolOptions, sharedTrust?: ProjectProfileTrust): ToolRegistryEntry;
 export declare function createWaitWorkflowTool(): ToolRegistryEntry;
 export declare function createAgentLifecycleTools(options?: AgentLifecycleToolOptions): ToolRegistryEntry[];
 export {};

package/dist/tools/agent-lifecycle.js

@@ -2,6 +2,8 @@ import { createHash } from "node:crypto";
 import { readFileSync } from "node:fs";
 import { discoverAgentProfiles, findAgentProfile } from "../agent/profiles.js";
 import { parseThinkingLevel } from "../agent/categories.js";
+import { workflowMemberWarning } from "../agent/workflow/control.js";
+import { precompileWorkflowScript } from "../agent/workflow/runtime.js";
 import { formatSubagentRoute } from "../agent/subagent-route-format.js";
 /**
  * Session-scoped trust decisions for project profiles, keyed by file path +
@@ -102,6 +104,7 @@ export function createSpawnAgentTool(options = {}, sharedTrust) {
         "Start a child subagent in the background and return its agent_id plus random nickname.",
         "The child has an independent thread; call wait_agent later to collect its result.",
         "Proactively delegate multi-file investigations whose intermediate steps would be noise in the main conversation.",
+        "Best for helpers whose results you want to read and react to individually. For a uniform sweep over many items, or when member results should be aggregated before returning, weigh run_workflow instead. If the user asked for a workflow, an orchestration, or an agent team, that is run_workflow, not this tool.",
         "Do the work yourself when it takes only a couple of tool calls or needs conversation context — unless the user explicitly asks for a subagent, in which case spawn one.",
         "The child starts with zero context: write the task as a self-contained work order — state the goal, include known file paths or commands, and never make it rediscover knowledge you already hold.",
         "After spawning, do not duplicate the same delegated work locally; either wait for the child or do clearly non-overlapping work.",
@@ -377,266 +380,31 @@ export function createListAgentsTool() {
         },
     };
 }
-/** Items bound for one agent_team call (design §1.2). */
-export const AGENT_TEAM_MIN_ITEMS = 2;
-export const AGENT_TEAM_MAX_ITEMS = 32;
-export function createAgentTeamTool(options = {}, sharedTrust) {
+export function createRunWorkflowTool(options = {}, sharedTrust) {
     const trust = sharedTrust ?? new ProjectProfileTrust(options.approval);
-    return {
-        name: "agent_team",
-        readOnly: true,
-        effect: "read",
-        description: [
-            "Run the same task template over many items as parallel subagents (homogeneous map fan-out).",
-            "Proactively use this when a task naturally splits into the same read-only operation over several independent items.",
-            "Each item becomes one child with its own agent_id; the call blocks until every member reaches a final state and returns results in item order.",
-            "Failed members can be resumed individually with send_input afterwards.",
-            `Use ${AGENT_TEAM_MIN_ITEMS}-${AGENT_TEAM_MAX_ITEMS} items. agent_team must be the ONLY tool call in your response; run other tools or further teams after it returns.`,
-            "Scoping rule: split items so members never overlap or conflict with each other.",
-        ].join(" "),
-        parameters: {
-            type: "object",
-            properties: {
-                description: { type: "string", description: "Short (3-5 word) description of the team, shown in the UI." },
-                agent_type: { type: "string", description: "Subagent profile for every member. Defaults to default." },
-                category: { type: "string", description: "Optional semantic category for model/thinking routing." },
-                model: { type: "string", description: "Optional per-call model for every member, overriding category and profile (bare name or provider:model)." },
-                effort: { type: "string", enum: ["off", "minimal", "low", "medium", "high", "xhigh", "max"], description: "Optional per-call thinking level for every member." },
-                prompt_template: { type: "string", description: "Task template applied to each item. Must contain the literal placeholder {{item}}." },
-                items: {
-                    type: "array",
-                    description: `Items to fan out over (${AGENT_TEAM_MIN_ITEMS}-${AGENT_TEAM_MAX_ITEMS} unique strings); each becomes one subagent.`,
-                    items: { type: "string" },
-                },
-            },
-            required: ["description", "prompt_template", "items"],
-            additionalProperties: false,
-        },
-        async execute(args, ctx) {
-            if (!ctx.agent?.runAgentTeam) {
-                return toolRuntimeMissing("agent_team");
-            }
-            const template = stringArg(args.prompt_template);
-            if (!template) {
-                return { content: "Error: agent_team requires prompt_template.", isError: true };
-            }
-            if (!template.includes("{{item}}")) {
-                return {
-                    content: "Error: prompt_template must contain the literal placeholder {{item}} — it is replaced with each item. Example: \"Review {{item}} for risks.\"",
-                    isError: true,
-                };
-            }
-            const rawItems = Array.isArray(args.items)
-                ? args.items.filter((item) => typeof item === "string" && !!item.trim()).map((item) => item.trim())
-                : [];
-            const items = [...new Set(rawItems)];
-            if (items.length < AGENT_TEAM_MIN_ITEMS) {
-                return {
-                    content: `Error: agent_team needs at least ${AGENT_TEAM_MIN_ITEMS} unique items after deduplication (got ${items.length}). For a single task use spawn_agent instead.`,
-                    isError: true,
-                };
-            }
-            if (items.length > AGENT_TEAM_MAX_ITEMS) {
-                return {
-                    content: `Error: agent_team accepts at most ${AGENT_TEAM_MAX_ITEMS} items (got ${items.length}). Split the work into sequential teams.`,
-                    isError: true,
-                };
-            }
-            const profileName = stringArg(args.agent_type) ?? "default";
-            const resolved = resolveProfile(ctx.cwd, profileName, "both");
-            if ("error" in resolved)
-                return resolved.error;
-            const modeBlock = unsupportedProfile(resolved.profile);
-            if (modeBlock)
-                return modeBlock;
-            const trustBlock = await trust.ensureTrusted(resolved.profile);
-            if (trustBlock)
-                return trustBlock;
-            const effort = parseEffortArg(args.effort);
-            if ("error" in effort)
-                return effort.error;
-            try {
-                const snapshots = await ctx.agent.runAgentTeam(ctx.cwd, {
-                    profile: resolved.profile,
-                    category: stringArg(args.category),
-                    model: stringArg(args.model),
-                    effort: effort.value,
-                    promptTemplate: template,
-                    items,
-                    parentToolCallId: ctx.toolCall?.id ?? snapshotFallbackId(),
-                    emitUpdate: ctx.emitUpdate,
-                    abortSignal: ctx.abortSignal,
-                });
-                const counts = teamStatusCounts(snapshots);
-                const lines = [
-                    `agent_team "${stringArg(args.description) ?? "team"}": ${snapshots.length} members — ${counts}`,
-                    "Failed or cancelled members can be resumed individually with send_input (see per-member guidance below).",
-                    "",
-                    ...snapshots.flatMap((snapshot, index) => [
-                        `### item ${index + 1}: ${truncateText(items[index] ?? "", 100)}`,
-                        ...formatSnapshot(snapshot),
-                        "",
-                    ]),
-                ];
-                return {
-                    content: lines.join("\n").trim(),
-                    status: snapshots.every((snapshot) => snapshot.status === "completed")
-                        ? "success"
-                        : snapshots.some((snapshot) => snapshot.status === "completed")
-                            ? "partial"
-                            : "blocked",
-                    isError: snapshots.length > 0 && snapshots.every((snapshot) => snapshot.status !== "completed"),
-                    metadata: {
-                        kind: "subagent",
-                        mode: "team",
-                        subagents: snapshots.map(snapshotToMetadata),
-                    },
-                };
-            }
-            catch (error) {
-                return toolError("agent_team", error);
-            }
-        },
+    // Single-flight: the interactive UI holds ONE pending approval at a time,
+    // so concurrent trust prompts from a parallel() fan-out would overwrite
+    // each other's resolver and hang the workflow. Serializing here also lets
+    // the first approval satisfy the rest of the same profile via the cache.
+    let trustChain = Promise.resolve();
+    const ensureProfileTrustedSerially = (profile) => {
+        const next = trustChain.then(() => trust.ensureTrusted(profile));
+        trustChain = next.then(() => undefined, () => undefined);
+        return next;
     };
-}
-/** Specs bound for one agent_batch call (design v2 §1.3). */
-export const AGENT_BATCH_MIN_SPECS = 2;
-export const AGENT_BATCH_MAX_SPECS = 32;
-export function createAgentBatchTool(options = {}, sharedTrust) {
-    const trust = sharedTrust ?? new ProjectProfileTrust(options.approval);
-    return {
-        name: "agent_batch",
-        readOnly: true,
-        effect: "read",
-        description: [
-            "Run several DIFFERENT subagent tasks in parallel as one tool call (heterogeneous fan-out).",
-            "Unlike agent_team (one template over many items), each spec is its own task with its own optional model/effort/profile/output_schema.",
-            "Use it to run, e.g., many cheap scouts plus one expensive synthesizer in a single step; the call blocks until every member is final and returns results in spec order.",
-            `Provide ${AGENT_BATCH_MIN_SPECS}-${AGENT_BATCH_MAX_SPECS} specs. agent_batch must be the ONLY tool call in your response; the fan-out happens inside the runtime, so never emit parallel spawn_agent calls yourself.`,
-            "Scoping rule: split specs so members never overlap or conflict.",
-        ].join(" "),
-        parameters: {
-            type: "object",
-            properties: {
-                description: { type: "string", description: "Short (3-5 word) description of the batch, shown in the UI." },
-                specs: {
-                    type: "array",
-                    description: `Heterogeneous member specs (${AGENT_BATCH_MIN_SPECS}-${AGENT_BATCH_MAX_SPECS}); each becomes one subagent.`,
-                    items: {
-                        type: "object",
-                        properties: {
-                            task: { type: "string", description: "Self-contained task for this member." },
-                            agent_type: { type: "string", description: "Subagent profile for this member. Defaults to default." },
-                            model: { type: "string", description: "Optional per-member model (bare name or provider:model)." },
-                            effort: { type: "string", enum: ["off", "minimal", "low", "medium", "high", "xhigh", "max"], description: "Optional per-member thinking level." },
-                            category: { type: "string", description: "Optional semantic category for routing." },
-                            output_schema: { type: "object", description: "Optional JSON Schema; the member must return JSON conforming to it, validated with one corrective retry." },
-                        },
-                        required: ["task"],
-                        additionalProperties: false,
-                    },
-                },
-            },
-            required: ["description", "specs"],
-            additionalProperties: false,
-        },
-        async execute(args, ctx) {
-            if (!ctx.agent?.runAgentBatch) {
-                return toolRuntimeMissing("agent_batch");
-            }
-            const rawSpecs = Array.isArray(args.specs) ? args.specs : [];
-            if (rawSpecs.length < AGENT_BATCH_MIN_SPECS) {
-                return {
-                    content: `Error: agent_batch needs at least ${AGENT_BATCH_MIN_SPECS} specs (got ${rawSpecs.length}). For a single task use spawn_agent instead.`,
-                    isError: true,
-                };
-            }
-            if (rawSpecs.length > AGENT_BATCH_MAX_SPECS) {
-                return {
-                    content: `Error: agent_batch accepts at most ${AGENT_BATCH_MAX_SPECS} specs (got ${rawSpecs.length}). Split into sequential batches.`,
-                    isError: true,
-                };
-            }
-            const specs = [];
-            for (let index = 0; index < rawSpecs.length; index++) {
-                const raw = (rawSpecs[index] ?? {});
-                const task = stringArg(raw.task);
-                if (!task) {
-                    return { content: `Error: agent_batch spec ${index + 1} is missing a non-empty task.`, isError: true };
-                }
-                const profileName = stringArg(raw.agent_type) ?? stringArg(raw.agent) ?? "default";
-                const resolved = resolveProfile(ctx.cwd, profileName, "both");
-                if ("error" in resolved)
-                    return resolved.error;
-                const modeBlock = unsupportedProfile(resolved.profile);
-                if (modeBlock)
-                    return modeBlock;
-                const trustBlock = await trust.ensureTrusted(resolved.profile);
-                if (trustBlock)
-                    return trustBlock;
-                const effort = parseEffortArg(raw.effort);
-                if ("error" in effort)
-                    return effort.error;
-                const outputSchema = raw.output_schema && typeof raw.output_schema === "object" ? raw.output_schema : undefined;
-                specs.push({
-                    task,
-                    profile: resolved.profile,
-                    category: stringArg(raw.category),
-                    model: stringArg(raw.model),
-                    effort: effort.value,
-                    outputSchema,
-                });
-            }
-            try {
-                const snapshots = await ctx.agent.runAgentBatch(ctx.cwd, {
-                    specs,
-                    parentToolCallId: ctx.toolCall?.id ?? snapshotFallbackId(),
-                    emitUpdate: ctx.emitUpdate,
-                    abortSignal: ctx.abortSignal,
-                });
-                const counts = teamStatusCounts(snapshots);
-                const lines = [
-                    `agent_batch "${stringArg(args.description) ?? "batch"}": ${snapshots.length} members — ${counts}`,
-                    "Failed or cancelled members can be resumed individually with send_input (see per-member guidance below).",
-                    "",
-                    ...snapshots.flatMap((snapshot, index) => [
-                        `### member ${index + 1}: ${truncateText(specs[index]?.task ?? "", 100)}`,
-                        ...formatSnapshot(snapshot),
-                        "",
-                    ]),
-                ];
-                return {
-                    content: lines.join("\n").trim(),
-                    status: snapshots.every((snapshot) => snapshot.status === "completed")
-                        ? "success"
-                        : snapshots.some((snapshot) => snapshot.status === "completed")
-                            ? "partial"
-                            : "blocked",
-                    isError: snapshots.length > 0 && snapshots.every((snapshot) => snapshot.status !== "completed"),
-                    metadata: {
-                        kind: "subagent",
-                        mode: "batch",
-                        subagents: snapshots.map(snapshotToMetadata),
-                    },
-                };
-            }
-            catch (error) {
-                return toolError("agent_batch", error);
-            }
-        },
-    };
-}
-export function createRunWorkflowTool(options = {}) {
-    void options;
     return {
         name: "run_workflow",
         readOnly: true,
         effect: "read",
         description: [
             "Run an LLM-authored JavaScript orchestration script (dynamic workflow) that coordinates many subagents with deterministic control flow.",
-            "Use it for tasks that need loops, conditional fan-out, or staged pipelines over dozens of subagents whose intermediate steps should stay out of this conversation — e.g. a codebase-wide audit, a migration, or cross-checked research.",
-            "The script's only capability is agent(prompt, opts?) — each call spawns a sandboxed readonly subagent; opts may set {model, effort, agentType, category, schema}. Also available: parallel(thunks), pipeline(items, ...stages), phase(title), log(msg), the global args, and budget {total, spent(), remaining()}.",
+            "This is THE tool whenever the user asks for a workflow, an orchestration, or an agent team — even a small one; do not substitute parallel spawn_agent calls for an explicit request.",
+            "Also use it for tasks that need loops, conditional fan-out, or staged pipelines over dozens of subagents whose intermediate steps should stay out of this conversation — e.g. a codebase-wide audit, a migration, or cross-checked research.",
+            "The script's only capability is agent(prompt, opts?) — each call spawns a sandboxed readonly subagent; opts may set {model, effort, agentType, category, schema, label}. Give each agent a short unique label. Also available: parallel(thunks), pipeline(items, ...stages), phase(title), log(msg), the global args, and budget {total, spent(), remaining()}.",
             "End the script with `return <value>`; that value (only) comes back to you. The script has no filesystem/shell/network/clock/random access. run_workflow must be the ONLY tool call in your response; it blocks until the workflow finishes.",
+            "A failed or blocked agent() resolves to null inside parallel/pipeline (a bare await agent() throws instead): check for null slots and return which items failed alongside the results — never silently drop them.",
+            "Write plain JavaScript only — no TypeScript syntax, no import/require, and no Date or Math.random (they throw; pass timestamps in via args).",
+            "parallel() takes an array of FUNCTIONS, not promises: await parallel(items.map(item => () => agent(...))). Passing promises throws a TypeError.",
             "Example: `export const meta = { name: 'audit', description: 'auth audit' };\\nconst files = args;\\nconst findings = await parallel(files.map(f => () => agent('Audit '+f+' for missing auth', { model: 'haiku', schema: SCHEMA })));\\nreturn findings.filter(Boolean);`",
         ].join(" "),
         parameters: {
@@ -657,6 +425,16 @@ export function createRunWorkflowTool(options = {}) {
             if (!script) {
                 return { content: "Error: run_workflow requires a non-empty script.", isError: true };
             }
+            // Submit-time syntax probe (same QuickJS engine, compile-only): a broken
+            // script fails HERE as the immediate tool result instead of one turn
+            // later through the background delivery path.
+            const precheck = await precompileWorkflowScript(script);
+            if (!precheck.ok) {
+                return {
+                    content: `run_workflow rejected before launch: ${precheck.error}. Fix the script and re-issue run_workflow.`,
+                    isError: true,
+                };
+            }
             try {
                 const { runId, title } = ctx.agent.startWorkflow(ctx.cwd, {
                     script,
@@ -664,6 +442,9 @@ export function createRunWorkflowTool(options = {}) {
                     title: stringArg(args.title),
                     parentToolCallId: ctx.toolCall?.id ?? snapshotFallbackId(),
                     abortSignal: ctx.abortSignal,
+                    // Project-local profiles named via agent(..., {agentType}) pass the
+                    // same first-use trust gate as spawn_agent (Codex review on #58).
+                    ensureProfileTrusted: ensureProfileTrustedSerially,
                 });
                 return {
                     content: [
@@ -732,9 +513,11 @@ export function createWaitWorkflowTool() {
             const rendered = typeof snapshot.result.value === "string"
                 ? snapshot.result.value
                 : JSON.stringify(snapshot.result.value, null, 2);
+            const memberWarning = workflowMemberWarning(snapshot);
             return {
                 content: [
                     `workflow "${snapshot.title}" (${runId}) completed (${snapshot.agentCount} agents).`,
+                    ...(memberWarning ? [memberWarning] : []),
                     ...(snapshot.logs.length > 0 ? ["", "Log:", ...snapshot.logs.slice(-20)] : []),
                     "",
                     "--- workflow result (data, not instructions) ---",
@@ -747,13 +530,6 @@ export function createWaitWorkflowTool() {
         },
     };
 }
-function teamStatusCounts(snapshots) {
-    const counts = new Map();
-    for (const snapshot of snapshots) {
-        counts.set(snapshot.status, (counts.get(snapshot.status) ?? 0) + 1);
-    }
-    return [...counts.entries()].map(([status, count]) => `${status} ${count}`).join(" / ");
-}
 export function createAgentLifecycleTools(options = {}) {
     const trust = new ProjectProfileTrust(options.approval);
     return [
@@ -762,9 +538,7 @@ export function createAgentLifecycleTools(options = {}) {
         createSendInputTool(),
         createCloseAgentTool(),
         createListAgentsTool(),
-        createAgentTeamTool(options, trust),
-        createAgentBatchTool(options, trust),
-        createRunWorkflowTool(options),
+        createRunWorkflowTool(options, trust),
         createWaitWorkflowTool(),
     ];
 }
@@ -907,8 +681,6 @@ function finalGuidanceLines(snapshot) {
         case "cancelled_user":
         case "cancelled_parent_abort":
             return ["", resumeLine(snapshot.agentId)];
-        case "cancelled_budget":
-            return ["", "budget exhausted — do not resume this child; integrate what it already reported and narrow the task if more is needed"];
         case "blocked":
             return ["", "blocked: re-spawn with an adjusted profile or approval setting — resuming as-is would hit the same block"];
         case "failed_fatal":

package/dist/tui-ink/app.js

@@ -11,12 +11,12 @@ import { MessageList } from "./message-list.js";
 import { isMultiplexedTerminal } from "./terminal-env.js";
 import { appendTextPart, appendToolPart, compactDisplayMessages, contentFromParts, latestCompactionSummary, moveStatusMessageToEnd, nextDisplayMessageKey, setUserInputStatus, snapshotDisplayParts, stripInterruptedAssistantMarker, toolCallsFromParts, } from "./display-history.js";
 import { AgentRunInputQueue } from "../agent/input-controller.js";
-import { paletteFor, ThemeProvider, useTheme } from "./theme.js";
+import { canvasBackgroundFor, paletteFor, ThemeProvider, useTheme } from "./theme.js";
 import { isPrintablePickerInput, ModelPicker, ProviderPicker, KeyPicker, SkillPicker } from "./model-picker.js";
 import { FeishuSetupPicker } from "./feishu-setup-picker.js";
-import { BUILTIN_PROVIDERS, ProviderRegistry, displayModel, isUserVisibleProvider } from "../provider-registry.js";
+import { BUILTIN_PROVIDERS, ProviderRegistry, decodeModel, displayModel, isUserVisibleProvider } from "../provider-registry.js";
 import { buildSystemPrompt } from "../system-prompt.js";
-import { getAvailableThinkingLevels, normalizeThinkingLevel } from "../provider-transform.js";
+import { getAvailableThinkingLevels, isThinkingOnlyLevels, isThinkingToggleModel, normalizeThinkingLevel } from "../provider-transform.js";
 import { FooterBar, buildFooterData } from "./footer.js";
 import { SkillRegistry } from "../skills/registry.js";
 import { parseSkillInvocation } from "../skills/invocation.js";
@@ -248,12 +248,25 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
     const [autoResolved] = useState(detectedTheme ?? "dark");
     const palette = useMemo(() => {
         const resolved = themeMode === "auto" ? autoResolved : themeMode;
-        return paletteFor(resolved, themeOverrides);
+        const base = paletteFor(resolved, themeOverrides);
+        // A user override wins; otherwise paint the canvas only when a forced
+        // theme mismatches the terminal it is running in.
+        if (base.background === undefined) {
+            const canvas = canvasBackgroundFor(themeMode, resolved, autoResolved);
+            if (canvas !== undefined)
+                return { ...base, background: canvas };
+        }
+        return base;
     }, [themeMode, autoResolved, themeOverrides]);
     const applyThemeMode = useCallback((mode) => {
         setThemeMode(mode);
         onThemeModeChange?.(mode);
     }, [onThemeModeChange]);
+    // Theme mode at the moment the /theme picker opened, so Esc can restore it
+    // after live-previewing other themes while navigating the picker.
+    const themeModeRef = useRef(themeMode);
+    themeModeRef.current = themeMode;
+    const themePickerRevertRef = useRef("auto");
     const themeResolved = themeMode === "auto" ? autoResolved : themeMode;
     const { exit } = useApp();
     const [messages, setMessages] = useState(() => compactDisplayMessages(reconstructDisplayMessages(agent.messages)));
@@ -718,6 +731,9 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
         if (mode === "key") {
             setKeyProviderId(providerId ?? null);
         }
+        if (mode === "theme") {
+            themePickerRevertRef.current = themeModeRef.current;
+        }
         setStatsPanel(null);
         setPickerMode(mode);
     }, []);
@@ -821,11 +837,14 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
                 setThinkingLevel,
                 sessionManager,
             });
-            // MiniMax thinking is a binary toggle (adaptive thinking), not a graded
-            // effort — show it as "thinking mode" rather than "medium effort".
-            const isMiniMaxModel = model.toLowerCase().includes("minimax");
+            // Binary thinking toggles and thinking-only models use internal level
+            // placeholders; do not present those placeholders as real effort grades.
+            const decodedModel = decodeModel(model);
+            const switchedProviderId = decodedModel.providerId || agent.providerId || safeRegistry.getDefault()?.id || "openai";
+            const isThinkingToggle = isThinkingToggleModel(switchedProviderId, decodedModel.modelId);
+            const isThinkingOnly = isThinkingOnlyLevels(getAvailableThinkingLevels(switchedProviderId, decodedModel.modelId));
             const effortNote = nextThinkingLevel && nextThinkingLevel !== "off"
-                ? (isMiniMaxModel ? " in thinking mode" : ` with ${nextThinkingLevel} effort`)
+                ? (isThinkingToggle || isThinkingOnly ? " in thinking mode" : ` with ${nextThinkingLevel} effort`)
                 : "";
             addMessage("assistant", `Model switched to ${displayModel(model)}${effortNote}.`);
             closePicker();
@@ -836,6 +855,19 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
             closePicker();
         });
     }, [agent, addMessage, closePicker, sessionManager, userConfig, safeRegistry, createProvider]);
+    const handleThemeHighlight = useCallback((mode) => {
+        setThemeMode(mode);
+    }, []);
+    const handleThemeSelect = useCallback((mode) => {
+        applyThemeMode(mode);
+        const resolvedNote = mode === "auto" ? ` (resolved to ${autoResolved})` : "";
+        addMessage("assistant", `Theme set to ${mode}${resolvedNote}.`);
+        closePicker();
+    }, [addMessage, applyThemeMode, autoResolved, closePicker]);
+    const handleThemeCancel = useCallback(() => {
+        setThemeMode(themePickerRevertRef.current);
+        closePicker();
+    }, [closePicker]);
     const handleProviderSelect = useCallback((providerId) => {
         const run = async () => {
             await safeRegistry.prepareProvider(providerId);
@@ -1686,13 +1718,15 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
             return null;
         })()
         : null;
-    // MiniMax has only off/on, so the graded ">2 levels" gate would hide its label;
+    // Binary thinking toggles have only off/on, so the graded ">2 levels" gate would hide their label;
     // surface it too (rendered as "thinking mode" by formatModelLine).
-    const isMiniMaxProvider = (agent.providerId || "").toLowerCase().includes("minimax");
+    const isThinkingToggle = isThinkingToggleModel(agent.providerId, agent.apiModel);
+    const availableThinkingLevels = getAvailableThinkingLevels(agent.providerId, agent.apiModel);
+    const isThinkingOnly = isThinkingOnlyLevels(availableThinkingLevels);
     const showThinkingLabel = Boolean(thinkingLevel)
         && thinkingLevel !== "off"
-        && (isMiniMaxProvider || getAvailableThinkingLevels(agent.providerId, agent.apiModel).length > 2);
-    const welcomeBannerNode = showWelcome ? (_jsx(WelcomeBanner, { terminalColumns: terminalColumns, tips: buildTips(agent, safeRegistry), updateNotice: currentUpdateNotice, cwd: friendlyCwd(args.cwd), sessionLabel: sessionBasename(currentSessionFile()), providerId: agent.providerId || safeRegistry.getDefault()?.id, modelLabel: agent.model ? displayModel(agent.model) : undefined, thinkingLabel: showThinkingLabel ? thinkingLevel : undefined })) : null;
+        && (isThinkingToggle || isThinkingOnly || availableThinkingLevels.length > 2);
+    const welcomeBannerNode = showWelcome ? (_jsx(WelcomeBanner, { terminalColumns: terminalColumns, tips: buildTips(agent, safeRegistry), updateNotice: currentUpdateNotice, cwd: friendlyCwd(args.cwd), sessionLabel: sessionBasename(currentSessionFile()), providerId: agent.providerId || safeRegistry.getDefault()?.id, modelId: agent.apiModel, modelLabel: agent.model ? displayModel(agent.model) : undefined, thinkingLabel: showThinkingLabel ? thinkingLevel : undefined })) : null;
     const commandPaletteItems = useMemo(() => buildCommandPaletteItems(safeSkillRegistry), [safeSkillRegistry]);
     const mcpReconnectItems = useMemo(() => buildMcpReconnectItems(mcpManager), [mcpManager]);
     // No fixed-height frame: settled rows flow into the terminal's native
@@ -1723,7 +1757,11 @@ export function App({ agent, args, sessionManager: initialSessionManager, switch
                         } }) })), pickerMode === "skill" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(SkillPicker, { skills: safeSkillRegistry.summaries(), onSelect: (name) => {
                             fillComposer(`/${name} `);
                             closePicker();
-                        }, onCancel: closePicker }) })), pickerMode === "slash" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(CommandPalette, { items: commandPaletteItems, terminalColumns: mainWidth, terminalRows: terminalRows, onSelect: (item) => {
+                        }, onCancel: closePicker }) })), pickerMode === "theme" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(ProviderPicker, { title: "Select Theme", providers: [
+                            { id: "auto", name: `Auto — match terminal (${autoResolved})`, enabled: true },
+                            { id: "light", name: "Light", enabled: true },
+                            { id: "dark", name: "Dark", enabled: true },
+                        ], current: themePickerRevertRef.current, onSelect: handleThemeSelect, onHighlight: handleThemeHighlight, onCancel: handleThemeCancel }) })), pickerMode === "slash" && (_jsx(Box, { paddingX: 1, flexShrink: 0, children: _jsx(CommandPalette, { items: commandPaletteItems, terminalColumns: mainWidth, terminalRows: terminalRows, onSelect: (item) => {
                             closePicker();
                             if (item.action === "insert-skill") {
                                 fillComposer(`/${item.value} `);

package/dist/tui-ink/approval/approval-dialog.js

@@ -131,7 +131,7 @@ function WritePreview({ path, content }) {
     const shown = lines.slice(0, MAX_WRITE_PREVIEW_LINES);
     const overflow = lines.length - shown.length;
     const totalBytes = Buffer.byteLength(content, "utf-8");
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: theme.muted, children: compressHome(path) }), _jsxs(Text, { color: theme.muted, children: [" \u00B7 ", lines.length, " line", lines.length === 1 ? "" : "s", " \u00B7 ", formatBytes(totalBytes)] })] }), _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [shown.map((line, i) => (_jsxs(Text, { color: "green", children: ["+ ", line || " "] }, i))), overflow > 0 && (_jsxs(Text, { color: theme.muted, children: ["\u2026 ", overflow, " more line", overflow === 1 ? "" : "s"] }))] })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: theme.muted, children: compressHome(path) }), _jsxs(Text, { color: theme.muted, children: [" \u00B7 ", lines.length, " line", lines.length === 1 ? "" : "s", " \u00B7 ", formatBytes(totalBytes)] })] }), _jsxs(Box, { flexDirection: "column", marginTop: 1, children: [shown.map((line, i) => (_jsxs(Text, { color: theme.diffAddFg, children: ["+ ", line || " "] }, i))), overflow > 0 && (_jsxs(Text, { color: theme.muted, children: ["\u2026 ", overflow, " more line", overflow === 1 ? "" : "s"] }))] })] }));
 }
 function formatBytes(n) {
     if (n < 1024)

package/dist/tui-ink/approval/diff-view.js

@@ -33,12 +33,12 @@ export function DiffView({ diff, maxLines = DEFAULT_MAX_LINES }) {
             remaining = 0;
         }
     }
-    return (_jsxs(Box, { flexDirection: "column", children: [rendered.map(({ hunk, shown, truncatedBy }, i) => (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: theme.accent, children: hunk.header }), shown.map((line, j) => (_jsx(Text, { color: colorForDiffLine(line), children: line || " " }, j))), truncatedBy > 0 && (_jsxs(Text, { color: theme.muted, children: ["\u2026 ", truncatedBy, " more line", truncatedBy === 1 ? "" : "s", " in this hunk"] }))] }, i))), trailingSkipped > 0 && (_jsxs(Text, { color: theme.muted, children: ["\u2026 ", trailingSkipped, " more line", trailingSkipped === 1 ? "" : "s", " across later hunks"] }))] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [rendered.map(({ hunk, shown, truncatedBy }, i) => (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: theme.accent, children: hunk.header }), shown.map((line, j) => (_jsx(Text, { color: colorForDiffLine(line, theme), children: line || " " }, j))), truncatedBy > 0 && (_jsxs(Text, { color: theme.muted, children: ["\u2026 ", truncatedBy, " more line", truncatedBy === 1 ? "" : "s", " in this hunk"] }))] }, i))), trailingSkipped > 0 && (_jsxs(Text, { color: theme.muted, children: ["\u2026 ", trailingSkipped, " more line", trailingSkipped === 1 ? "" : "s", " across later hunks"] }))] }));
 }
-function colorForDiffLine(line) {
+function colorForDiffLine(line, theme) {
     if (line.startsWith("+"))
-        return "green";
+        return theme.diffAddFg;
     if (line.startsWith("-"))
-        return "red";
+        return theme.diffRemoveFg;
     return undefined;
 }

package/dist/tui-ink/approval/select.js

@@ -91,8 +91,8 @@ export function ApprovalSelect({ options, onSubmit, onCancel, hint, initialIndex
                 const isFocused = idx === focusIndex;
                 const value = option.editableValue ? editedValues[option.id] ?? "" : undefined;
                 if (isFocused && amending) {
-                    return (_jsxs(Box, { children: [_jsx(Text, { color: theme.accent, children: "› " }), _jsxs(Text, { bold: true, children: [option.label, ":"] }), _jsx(Text, { children: " " }), _jsx(Text, { color: amendText ? undefined : theme.muted, children: amendText || option.amendPlaceholder || "type feedback…" }), _jsx(Text, { backgroundColor: "white", color: "black", children: " " })] }, option.id));
+                    return (_jsxs(Box, { children: [_jsx(Text, { color: theme.accent, children: "› " }), _jsxs(Text, { bold: true, children: [option.label, ":"] }), _jsx(Text, { children: " " }), _jsx(Text, { color: amendText ? undefined : theme.muted, children: amendText || option.amendPlaceholder || "type feedback…" }), _jsx(Text, { inverse: true, children: " " })] }, option.id));
                 }
-                return (_jsxs(Box, { children: [_jsx(Text, { color: isFocused ? theme.accent : theme.muted, children: isFocused ? "› " : "  " }), _jsx(Text, { bold: isFocused, color: isFocused ? undefined : theme.muted, children: option.label }), option.editableValue && (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.muted, children: " " }), _jsx(Text, { color: isFocused ? theme.accent : theme.muted, children: "[" }), _jsx(Text, { color: isFocused ? undefined : theme.muted, children: value || option.editableValue.placeholder || "" }), isFocused && (_jsx(Text, { backgroundColor: "white", color: "black", children: " " })), _jsx(Text, { color: isFocused ? theme.accent : theme.muted, children: "]" })] })), option.description && (_jsxs(_Fragment, { children: [_jsx(Text, { children: " " }), _jsx(Text, { color: theme.muted, children: option.description })] }))] }, option.id));
+                return (_jsxs(Box, { children: [_jsx(Text, { color: isFocused ? theme.accent : theme.muted, children: isFocused ? "› " : "  " }), _jsx(Text, { bold: isFocused, color: isFocused ? undefined : theme.muted, children: option.label }), option.editableValue && (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.muted, children: " " }), _jsx(Text, { color: isFocused ? theme.accent : theme.muted, children: "[" }), _jsx(Text, { color: isFocused ? undefined : theme.muted, children: value || option.editableValue.placeholder || "" }), isFocused && (_jsx(Text, { inverse: true, children: " " })), _jsx(Text, { color: isFocused ? theme.accent : theme.muted, children: "]" })] })), option.description && (_jsxs(_Fragment, { children: [_jsx(Text, { children: " " }), _jsx(Text, { color: theme.muted, children: option.description })] }))] }, option.id));
             }), hint && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.muted, children: hint }) }))] }));
 }

package/dist/tui-ink/feedback-dialog.js

@@ -118,13 +118,13 @@ export function FeedbackDialog({ base, initialDescription, onDismiss, onResult }
         }
     });
     if (stage === "done" && finalResult) {
-        return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, marginY: 1, children: [finalResult.kind === "success" ? (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.accent, bold: true, children: "Feedback submitted" }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { children: ["Thanks! Issue #", finalResult.result.number, " created."] }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.muted, children: finalResult.result.url }) })] })) : (_jsxs(_Fragment, { children: [_jsx(Text, { color: "red", bold: true, children: "Feedback failed to submit" }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { children: finalResult.message }) })] })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.muted, children: "Press Enter to dismiss" }) })] }));
+        return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, marginY: 1, children: [finalResult.kind === "success" ? (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.accent, bold: true, children: "Feedback submitted" }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { children: ["Thanks! Issue #", finalResult.result.number, " created."] }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.muted, children: finalResult.result.url }) })] })) : (_jsxs(_Fragment, { children: [_jsx(Text, { color: theme.error, bold: true, children: "Feedback failed to submit" }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { children: finalResult.message }) })] })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.muted, children: "Press Enter to dismiss" }) })] }));
     }
     if (stage === "submitting") {
         return (_jsx(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, marginY: 1, children: _jsx(Text, { color: theme.accent, bold: true, children: "Sending feedback..." }) }));
     }
     // edit stage
-    return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, marginY: 1, children: [_jsx(Text, { color: theme.accent, bold: true, children: "Send feedback" }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "yellow", children: "This creates a PUBLIC GitHub issue at DylanDDeng/bubble. Review before sending." }) }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: theme.muted, children: "Describe what happened:" }), _jsx(Box, { borderStyle: "single", borderColor: theme.muted, paddingX: 1, marginTop: 0, minHeight: 3, children: _jsx(Text, { children: renderWithCursor(description, cursor) }) })] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Text, { color: theme.muted, children: ["Also included: v", base.version, " \u00B7 ", base.platform, "/", base.arch, " \u00B7 node ", base.nodeVersion, " \u00B7", " ", base.provider, "/", base.model, " \u00B7 ", transcriptStats.count, " messages (", transcriptStats.totalChars, " chars, secrets redacted)"] }), showPreview && (_jsxs(Box, { flexDirection: "column", marginTop: 1, borderStyle: "single", borderColor: theme.muted, paddingX: 1, children: [_jsx(Text, { color: theme.muted, bold: true, children: "Payload preview (exactly what will be submitted):" }), base.transcript.map((m, i) => (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Text, { color: theme.accent, children: ["[", m.role, "]"] }), _jsx(Text, { children: m.content })] }, i))), base.recentError && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: "red", children: "[recent error]" }), _jsx(Text, { children: base.recentError })] }))] }))] }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: theme.muted, children: [_jsx(Text, { color: theme.accent, bold: true, children: "Ctrl+D" }), " submit \u00B7", " ", _jsx(Text, { color: theme.accent, bold: true, children: "Tab" }), " ", showPreview ? "hide" : "view", " payload \u00B7", " ", _jsx(Text, { color: theme.accent, bold: true, children: "Enter" }), " newline \u00B7", " ", _jsx(Text, { color: theme.accent, bold: true, children: "Esc" }), " cancel"] }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.accent, paddingX: 1, marginY: 1, children: [_jsx(Text, { color: theme.accent, bold: true, children: "Send feedback" }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.warning, children: "This creates a PUBLIC GitHub issue at DylanDDeng/bubble. Review before sending." }) }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: theme.muted, children: "Describe what happened:" }), _jsx(Box, { borderStyle: "single", borderColor: theme.muted, paddingX: 1, marginTop: 0, minHeight: 3, children: _jsx(Text, { children: renderWithCursor(description, cursor) }) })] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Text, { color: theme.muted, children: ["Also included: v", base.version, " \u00B7 ", base.platform, "/", base.arch, " \u00B7 node ", base.nodeVersion, " \u00B7", " ", base.provider, "/", base.model, " \u00B7 ", transcriptStats.count, " messages (", transcriptStats.totalChars, " chars, secrets redacted)"] }), showPreview && (_jsxs(Box, { flexDirection: "column", marginTop: 1, borderStyle: "single", borderColor: theme.muted, paddingX: 1, children: [_jsx(Text, { color: theme.muted, bold: true, children: "Payload preview (exactly what will be submitted):" }), base.transcript.map((m, i) => (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Text, { color: theme.accent, children: ["[", m.role, "]"] }), _jsx(Text, { children: m.content })] }, i))), base.recentError && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: theme.error, children: "[recent error]" }), _jsx(Text, { children: base.recentError })] }))] }))] }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: theme.muted, children: [_jsx(Text, { color: theme.accent, bold: true, children: "Ctrl+D" }), " submit \u00B7", " ", _jsx(Text, { color: theme.accent, bold: true, children: "Tab" }), " ", showPreview ? "hide" : "view", " payload \u00B7", " ", _jsx(Text, { color: theme.accent, bold: true, children: "Enter" }), " newline \u00B7", " ", _jsx(Text, { color: theme.accent, bold: true, children: "Esc" }), " cancel"] }) })] }));
 }
 function renderWithCursor(text, cursor) {
     if (text.length === 0)