@bubblebrain-ai/bubble 0.0.59 → 0.0.61

package/dist/agent/subagent/runtime.d.ts

@@ -1,3 +1,28 @@
+/**
+ * Subagent thread lifecycle + dynamic-workflow execution.
+ *
+ * Extracted from Agent: spawn/wait/send/close, the scheduler dispatch and its
+ * terminal callbacks, admission, ingestion, worktree-backed child construction
+ * and the QuickJS workflow driver all lived on the Agent class alongside the
+ * conversation loop, sharing its private fields.
+ *
+ * Two rules keep the boundary honest:
+ *  - Everything the runtime needs from the parent arrives through
+ *    `SubagentRuntimeParent` as a LIVE accessor, never a construction-time
+ *    snapshot: `/model` reassigns the parent's provider/model/thinking
+ *    mid-session and children must inherit the current values.
+ *  - Conversation state is never pushed back into the parent. Tool updates
+ *    and ingestion notices are PULLED (`drainToolUpdates` /
+ *    `drainIngestionNotices`). The only direct sink is a terminal,
+ *    fail-closed provider diagnostic that contains no child transcript.
+ *
+ * `new Agent(...)` stays on Agent, reached through `parent.createChild`. That
+ * is the only genuine call back into the parent, and keeping it there is what
+ * guarantees the child-construction argument set — including the fields that
+ * must stay ABSENT (onMessageAppend, sessionID, routing catalog) — has exactly
+ * one definition site.
+ */
+import type { SkillSummary } from "../../skills/types.js";
 import { type AgentProfile, type SubagentRunResult } from "../profiles.js";
 import { type SubagentThreadRecord, type SubagentThreadSnapshot } from "../subagent-control.js";
 import { SubagentStore } from "../subagent-store.js";
@@ -36,6 +61,9 @@ export interface SubagentRuntimeParent {
     readonly apiModel: string;
     readonly thinkingLevel: ThinkingLevel;
     readonly memoryPrompt: string | undefined;
+    /** Optional so lightweight parents (tests, embedders) need not provide a catalog. */
+    getSkillSummaries?(): SkillSummary[];
+    getSkillCatalogChars?(): number | undefined;
     readonly providerFactory: ((route: ResolvedSubagentRoute) => Provider | Promise<Provider>) | undefined;
     /**
      * The UNFILTERED tool map — deferred-but-unlocked entries included. Profile

package/dist/agent/subagent/runtime.js

@@ -1,27 +1,3 @@
-/**
- * Subagent thread lifecycle + dynamic-workflow execution.
- *
- * Extracted from Agent: spawn/wait/send/close, the scheduler dispatch and its
- * terminal callbacks, admission, ingestion, worktree-backed child construction
- * and the QuickJS workflow driver all lived on the Agent class alongside the
- * conversation loop, sharing its private fields.
- *
- * Two rules keep the boundary honest:
- *  - Everything the runtime needs from the parent arrives through
- *    `SubagentRuntimeParent` as a LIVE accessor, never a construction-time
- *    snapshot: `/model` reassigns the parent's provider/model/thinking
- *    mid-session and children must inherit the current values.
- *  - Conversation state is never pushed back into the parent. Tool updates
- *    and ingestion notices are PULLED (`drainToolUpdates` /
- *    `drainIngestionNotices`). The only direct sink is a terminal,
- *    fail-closed provider diagnostic that contains no child transcript.
- *
- * `new Agent(...)` stays on Agent, reached through `parent.createChild`. That
- * is the only genuine call back into the parent, and keeping it there is what
- * guarantees the child-construction argument set — including the fields that
- * must stay ABSENT (onMessageAppend, sessionID, routing catalog) — has exactly
- * one definition site.
- */
 import { AgentRunInputQueue } from "../input-controller.js";
 import { randomUUID } from "node:crypto";
 import { buildSystemPrompt } from "../../system-prompt.js";
@@ -714,6 +690,10 @@ export class SubagentRuntime {
             mode: childMode,
             workingDir: childCwd,
             ...buildToolPromptOptions(tools),
+            // A child that can load skills sees the same catalog as its parent.
+            ...(childToolNames.includes("skill")
+                ? { skills: this.parent.getSkillSummaries?.(), skillCatalogChars: this.parent.getSkillCatalogChars?.() }
+                : {}),
             memoryPrompt: childToolNames.some((name) => name === "memory")
                 ? this.parent.memoryPrompt
                 : undefined,

package/dist/agent.d.ts

@@ -1,7 +1,3 @@
-/**
- * Agent - The core decision loop.
- * It maintains message state, calls the LLM, executes tools, and auto-continues.
- */
 import { type ContextCheckpoint } from "./context/checkpoint.js";
 import { type ContextUsageSnapshot } from "./context/usage.js";
 import type { AgentEvent, AgentInputController, ContentPart, PermissionMode, Message, Provider, ThinkingLevel, ToolResult, ToolRegistryEntry, ToolUpdate } from "./types.js";
@@ -79,6 +75,8 @@ export interface AgentOptions {
         subAgentId?: string;
     };
     skills?: SkillSummary[];
+    /** Skill catalog budget in characters for rebuilt system prompts (0 = off). */
+    skillCatalogChars?: number;
     memoryPrompt?: string;
     fileStateTracker?: FileStateTracker;
     agentCategories?: AgentCategoriesConfig;
@@ -180,6 +178,7 @@ export declare class Agent {
     private budgetLedger?;
     private budgetSource;
     private skillSummaries;
+    private skillCatalogChars?;
     private memoryPrompt?;
     private fileStateTracker?;
     private agentCategories;
@@ -242,8 +241,10 @@ export declare class Agent {
     unlockDeferredTools(names: string[]): void;
     /** All deferred tools in this session (for tool_search to inspect). */
     listDeferredTools(): ToolRegistryEntry[];
-    getSystemPromptToolOptions(): Pick<import("./system-prompt.js").SystemPromptOptions, "tools" | "toolSnippets" | "guidelines" | "modelRoutingPrompt" | "memoryPrompt">;
-    /** Refresh the live Skill catalog after /skills reloads or changes enablement. */
+    getSystemPromptToolOptions(): Pick<import("./system-prompt.js").SystemPromptOptions, "tools" | "toolSnippets" | "guidelines" | "modelRoutingPrompt" | "memoryPrompt" | "skills" | "skillCatalogChars">;
+    getSkillSummaries(): SkillSummary[];
+    getSkillCatalogChars(): number | undefined;
+    /** Refresh the live Skill catalog after /skills reloads or changes enablement; hosts then rebuild the system prompt. */
     setSkillSummaries(skills: SkillSummary[]): void;
     /** Current routing menu (design §4); undefined when no accessor is wired. */
     buildModelRoutingPromptSection(): string | undefined;

package/dist/agent.js

@@ -1,3 +1,4 @@
+import { toolImageObservation } from "./context/tool-images.js";
 /**
  * Agent - The core decision loop.
  * It maintains message state, calls the LLM, executes tools, and auto-continues.
@@ -142,6 +143,7 @@ export class Agent {
     budgetLedger;
     budgetSource;
     skillSummaries;
+    skillCatalogChars;
     memoryPrompt;
     fileStateTracker;
     agentCategories;
@@ -195,6 +197,7 @@ export class Agent {
         this.budgetLedger = options.budgetLedger;
         this.budgetSource = options.budgetSource ?? { runId: this.sessionID ?? "agent" };
         this.skillSummaries = options.skills ?? [];
+        this.skillCatalogChars = options.skillCatalogChars;
         this.memoryPrompt = options.memoryPrompt;
         this.fileStateTracker = options.fileStateTracker;
         this.agentCategories = options.agentCategories ?? {};
@@ -236,6 +239,8 @@ export class Agent {
                 // must see deferred-but-registered tools (an explicit include in a
                 // profile is the author pre-unlocking them).
                 allTools: () => [...this.tools.values()],
+                getSkillSummaries: () => this.getSkillSummaries(),
+                getSkillCatalogChars: () => this.getSkillCatalogChars(),
                 createChild: (spec) => this.createChildAgent(spec),
                 recordProviderError: (error, context) => this.recordProviderError(error, context),
                 runExternalHook: (input, abortSignal) => this.runExternalHook(input, abortSignal),
@@ -371,6 +376,9 @@ export class Agent {
     }
     getSystemPromptToolOptions() {
         return {
+            // Rebuilt prompts (model switch, /skills changes) keep the Skills catalog.
+            skills: this.skillSummaries,
+            skillCatalogChars: this.skillCatalogChars,
             ...buildToolPromptOptions(this.getActiveToolEntries()),
             // Rendered through the live accessor (design §1.5), so every host-
             // triggered prompt rebuild picks up the current catalog.
@@ -380,7 +388,13 @@ export class Agent {
             memoryPrompt: this.memoryPrompt,
         };
     }
-    /** Refresh the live Skill catalog after /skills reloads or changes enablement. */
+    getSkillSummaries() {
+        return this.skillSummaries.slice();
+    }
+    getSkillCatalogChars() {
+        return this.skillCatalogChars;
+    }
+    /** Refresh the live Skill catalog after /skills reloads or changes enablement; hosts then rebuild the system prompt. */
     setSkillSummaries(skills) {
         this.skillSummaries = skills.slice();
         this.notifyContextChanged();
@@ -1489,6 +1503,9 @@ export class Agent {
                             throwIfAborted(abortSignal);
                         }
                     }
+                    const imageObservation = toolImageObservation(executedResults);
+                    if (imageObservation)
+                        this.appendMessage(imageObservation);
                     // A checkpoint must contain the whole batch, never provider repair's
                     // placeholder for a sibling that has not executed yet.
                     this.compactResidentHistory();

package/dist/cli.d.ts

@@ -30,3 +30,8 @@ export interface CliArgs {
 }
 export declare function parseArgs(argv: string[]): CliArgs;
 export declare function printHelp(): void;
+/**
+ * Make `cwd` the process working directory, so --cwd behaves exactly like
+ * launching Bubble there. Returns an error message instead of throwing.
+ */
+export declare function enterWorkingDirectory(cwd: string): string | undefined;

package/dist/cli.js

@@ -1,6 +1,8 @@
 /**
  * CLI argument parsing.
  */
+import { statSync } from "node:fs";
+import { resolve } from "node:path";
 import { THINKING_LEVELS } from "./types.js";
 import { isThinkingLevel } from "./variant/thinking-level.js";
 export function parseArgs(argv) {
@@ -27,9 +29,13 @@ export function parseArgs(argv) {
             case "-m":
                 args.model = argv[++i];
                 break;
-            case "--cwd":
-                args.cwd = argv[++i];
+            case "--cwd": {
+                // Absolute, so it survives the chdir in main() and matches session metadata.
+                const dir = argv[++i];
+                if (dir)
+                    args.cwd = resolve(dir);
                 break;
+            }
             case "--api-key":
             case "-k":
                 args.apiKey = argv[++i];
@@ -150,3 +156,20 @@ Options (serve --feishu):
   --dry-run                Connect once, then exit (smoke test)
 `);
 }
+/**
+ * Make `cwd` the process working directory, so --cwd behaves exactly like
+ * launching Bubble there. Returns an error message instead of throwing.
+ */
+export function enterWorkingDirectory(cwd) {
+    if (cwd === process.cwd())
+        return undefined;
+    try {
+        if (!statSync(cwd).isDirectory())
+            return `--cwd ${cwd} is not a directory.`;
+        process.chdir(cwd);
+        return undefined;
+    }
+    catch {
+        return `--cwd ${cwd} does not exist or cannot be opened.`;
+    }
+}

package/dist/config.d.ts

@@ -20,6 +20,7 @@ export interface UserConfigData {
     /** Skill names disabled from invocation/search until re-enabled in /skills. */
     skills?: {
         disabled?: string[];
+        catalogChars?: number;
     };
     /**
      * Three shapes are accepted on disk so we can evolve without breaking
@@ -76,6 +77,8 @@ export declare class UserConfig {
     setDefaultProvider(id: string): void;
     getSkillPaths(): string[];
     setSkillPaths(paths: string[]): void;
+    /** Skill catalog budget in characters; undefined uses the default, 0 turns the catalog off. */
+    getSkillCatalogChars(): number | undefined;
     getDisabledSkills(): string[];
     setDisabledSkills(names: string[]): void;
     getTheme(): ThemeConfig;

package/dist/config.js

@@ -202,6 +202,13 @@ export class UserConfig {
         this.data.skillPaths = paths.slice();
         this.save();
     }
+    /** Skill catalog budget in characters; undefined uses the default, 0 turns the catalog off. */
+    getSkillCatalogChars() {
+        const value = this.data.skills?.catalogChars;
+        return typeof value === "number" && Number.isFinite(value) && value >= 0
+            ? Math.min(Math.floor(value), 200_000)
+            : undefined;
+    }
     getDisabledSkills() {
         const disabled = this.data.skills?.disabled;
         if (!Array.isArray(disabled))

package/dist/context/compact.js

@@ -59,7 +59,9 @@ export function isCompactionSummaryMessage(message) {
 }
 /** A message the user actually typed (not a projected reminder, not a summary). */
 export function isRealUserMessage(message) {
-    if (message.role !== "user")
+    // Tool screenshots ride in a user-role message for the provider, but they
+    // belong to the tool turn: never a turn boundary.
+    if (message.role !== "user" || message.toolObservation)
         return false;
     const text = messageText(message);
     if (!text.trim() || isInternalBlockContent(text))
@@ -302,7 +304,9 @@ export function compactCurrentTurnToolGroups(messages, options = {}) {
                 groups.push(current);
             current = { assistant: msg, toolResults: [] };
         }
-        else if (msg.role === "tool" && current) {
+        else if ((msg.role === "tool" || (msg.role === "user" && msg.toolObservation)) && current) {
+            // A screenshot observation follows its tool result: it lives and dies
+            // with that group instead of vanishing from kept groups.
             current.toolResults.push(msg);
         }
     }

package/dist/context/tool-images.d.ts

@@ -0,0 +1,3 @@
+import type { ToolResult, UserMessage } from "../types.js";
+/** All tool responses must precede the observation (valid for every provider). */
+export declare function toolImageObservation(results: ToolResult[]): UserMessage | null;

package/dist/context/tool-images.js

@@ -0,0 +1,35 @@
+/** All tool responses must precede the observation (valid for every provider). */
+export function toolImageObservation(results) {
+    const content = [];
+    let bytes = 0;
+    for (const result of results) {
+        if (result.isError)
+            continue;
+        for (const image of result.images ?? []) {
+            if (content.length >= 8 ||
+                !["image/png", "image/jpeg"].includes(image.mimeType))
+                continue;
+            if (typeof image.data !== "string" ||
+                image.data.length > 4_000_000 ||
+                !/^[a-zA-Z0-9+/]+={0,2}$/.test(image.data))
+                continue;
+            const raw = Buffer.from(image.data, "base64");
+            if (bytes + raw.length > 6_000_000)
+                continue;
+            if (image.mimeType === "image/png"
+                ? raw.subarray(0, 8).toString("hex") !== "89504e470d0a1a0a"
+                : raw.subarray(0, 3).toString("hex") !== "ffd8ff")
+                continue;
+            bytes += raw.length;
+            content.push({
+                type: "text",
+                text: `Screenshot observation from the preceding tool result (not a new user request):\n${result.content.slice(0, 2000)}`,
+            });
+            content.push({
+                type: "image_url",
+                image_url: { url: `data:${image.mimeType};base64,${image.data}` },
+            });
+        }
+    }
+    return content.length ? { role: "user", content, toolObservation: true } : null;
+}

package/dist/context/usage.js

@@ -1,5 +1,5 @@
 import { getModelContextWindow } from "../model-catalog.js";
-import { formatSkillsPrompt } from "../skills/format.js";
+import { SKILL_CATALOG_HEADING, SKILL_CATALOG_INTRO } from "../skills/format.js";
 import { buildDeferredToolsReminder } from "../prompt/reminders.js";
 import { AUTOCOMPACT_BUFFER_TOKENS, estimateMessageTokens, estimateTextTokens, MIN_WINDOW_FOR_RESERVE, OUTPUT_RESERVE_TOKENS, } from "./budget.js";
 export function buildContextUsageSnapshot(input) {
@@ -7,8 +7,12 @@ export function buildContextUsageSnapshot(input) {
     const otherMessages = input.messages.filter((message) => message.role !== "system");
     const deferredToolEntries = input.deferredToolEntries ?? [];
     const systemContent = systemMessages.map((message) => message.content).join("\n\n");
-    const skillsPrompt = formatSkillsPrompt(input.skills);
-    const skillsInSystemPrompt = !!skillsPrompt && systemContent.includes(skillsPrompt);
+    // The catalog is whatever Skills section the prompt actually carries, whatever its budget.
+    const skillsPrompt = extractSkillCatalog(systemContent);
+    const skillsInSystemPrompt = !!skillsPrompt;
+    const advertisedSkills = skillsPrompt
+        ? skillsPrompt.split("\n").filter((line) => line.startsWith("- ") && !line.startsWith("- … ")).length
+        : 0;
     const skillsTokens = skillsInSystemPrompt ? estimateTextTokens(skillsPrompt, input.providerId) : 0;
     const systemPromptTokens = Math.max(0, estimateTextTokens(systemContent, input.providerId) - skillsTokens);
     const toolsTokens = estimateToolEntriesTokens(input.toolEntries, input.providerId);
@@ -37,7 +41,7 @@ export function buildContextUsageSnapshot(input) {
             skills: {
                 label: "Skills",
                 tokens: skillsTokens,
-                detail: skillsInSystemPrompt && input.skills.length > 0 ? `${input.skills.length} advertised skill${input.skills.length === 1 ? "" : "s"}` : "none in current prompt",
+                detail: advertisedSkills > 0 ? `${advertisedSkills} advertised skill${advertisedSkills === 1 ? "" : "s"}` : "none in current prompt",
             },
             deferredTools: {
                 label: "Deferred/MCP",
@@ -54,7 +58,7 @@ export function buildContextUsageSnapshot(input) {
         },
         toolCount: input.toolEntries.length,
         deferredToolCount: deferredToolEntries.length,
-        skillCount: skillsInSystemPrompt ? input.skills.length : 0,
+        skillCount: advertisedSkills,
         messageCount: input.messages.length,
     };
 }
@@ -211,3 +215,16 @@ function colorForLabel(label) {
         return ANSI_DARK_GRAY;
     return ANSI_GRAY;
 }
+/**
+ * The Skills catalog the prompt carries: heading plus its fixed intro line, so a
+ * "## Skills" heading in AGENTS.md or memory is never mistaken for it. The last
+ * match wins (the catalog is appended after memory); it ends at the next blank line.
+ */
+function extractSkillCatalog(systemContent) {
+    const marker = `${SKILL_CATALOG_HEADING}\n${SKILL_CATALOG_INTRO}\n`;
+    const at = systemContent.lastIndexOf(marker);
+    if (at < 0 || (at > 0 && !systemContent.slice(0, at).endsWith("\n\n")))
+        return "";
+    const end = systemContent.indexOf("\n\n", at);
+    return systemContent.slice(at, end < 0 ? undefined : end);
+}

package/dist/feishu/agent-host/run-driver.js

@@ -99,6 +99,8 @@ export class RunDriver {
         const routingSnapshotAccessor = createRoutingSnapshotAccessor(this.opts.deps.providerRegistry, () => this.opts.deps.userConfig.getAgentCategories(), () => agentRouting);
         const systemPrompt = buildSystemPrompt({
             agentName: "Bubble",
+            skills,
+            skillCatalogChars: this.opts.deps.userConfig.getSkillCatalogChars(),
             configuredProvider: providerId || "none",
             configuredModel: model ? displayModel(model) : "none",
             configuredModelId: model || "none",
@@ -188,6 +190,7 @@ export class RunDriver {
             },
             budgetLedger,
             skills,
+            skillCatalogChars: this.opts.deps.userConfig.getSkillCatalogChars(),
             memoryPrompt,
             fileStateTracker,
             agentCategories: this.opts.deps.userConfig.getAgentCategories(),

package/dist/lsp/service.js

@@ -2,7 +2,7 @@ import { execFile as execFileCallback, spawn } from "node:child_process";
 import { EventEmitter } from "node:events";
 import { access, readFile } from "node:fs/promises";
 import { createRequire } from "node:module";
-import { basename, dirname, extname, isAbsolute, join, normalize, relative, resolve } from "node:path";
+import { basename, dirname, extname, isAbsolute, join, normalize, relative, resolve, sep } from "node:path";
 import { promisify } from "node:util";
 import { pathToFileURL, fileURLToPath } from "node:url";
 import { createMessageConnection, StreamMessageReader, StreamMessageWriter, } from "vscode-jsonrpc/node.js";
@@ -500,7 +500,8 @@ export class ProjectLspService {
     resolveInsideCwd(filePath) {
         const file = normalize(isAbsolute(filePath) ? filePath : resolve(this.cwd, filePath));
         const rel = relative(this.cwd, file);
-        if (rel.startsWith("..") || isAbsolute(rel))
+        // Only a whole `..` segment climbs out; `..notes.md` is a file in the project.
+        if (rel === ".." || rel.startsWith(`..${sep}`) || isAbsolute(rel))
             return undefined;
         return file;
     }

package/dist/main.js

@@ -5,7 +5,7 @@
 import chalk from "chalk";
 import { Agent } from "./agent.js";
 import { BudgetLedger } from "./agent/budget-ledger.js";
-import { parseArgs, printHelp } from "./cli.js";
+import { enterWorkingDirectory, parseArgs, printHelp } from "./cli.js";
 import { effectiveThemeModeForTerminal, shouldProbeTerminalTheme, UserConfig } from "./config.js";
 import { createProviderInstance, createUnavailableProvider } from "./provider.js";
 import { resolveConfiguredModel } from "./model-selection.js";
@@ -56,6 +56,13 @@ async function main() {
         console.log(`v${getCurrentVersion()}`);
         process.exit(0);
     }
+    // --cwd means "run as if launched there" (like git -C): every layer, including
+    // the TUI, shell children and relative paths, then sees the same directory.
+    const cwdError = enterWorkingDirectory(args.cwd);
+    if (cwdError) {
+        console.error(`bubble: ${cwdError}`);
+        process.exit(1);
+    }
     if (args.command === "update") {
         const { runUpdateCommand } = await import("./update/index.js");
         const code = await runUpdateCommand({ checkOnly: args.checkOnly });
@@ -379,6 +386,8 @@ async function main() {
         : undefined;
     const systemPrompt = buildSystemPrompt({
         agentName: "Bubble",
+        skills: skillSummaries,
+        skillCatalogChars: userConfig.getSkillCatalogChars(),
         configuredProvider: activeProviderId || "none",
         configuredModel: activeModel ? displayModel(activeModel) : "none",
         configuredModelId: activeModel || "none",
@@ -493,6 +502,7 @@ async function main() {
         },
         budgetLedger,
         skills: skillSummaries,
+        skillCatalogChars: userConfig.getSkillCatalogChars(),
         memoryPrompt,
         fileStateTracker,
         agentCategories: userConfig.getAgentCategories(),

package/dist/model-catalog.js

@@ -88,6 +88,9 @@ const ANTHROPIC_CHAT_LEVELS = ["off"];
 // Grok 4.5 exposes low/medium/high effort with no "off" (thinking always on);
 // the composer model declares no effort support at all.
 const GROK_45_LEVELS = ["low", "medium", "high"];
+// Gemini 4 documents only low/medium (default)/high. Verified live on
+// 2026-10-13: thinkingLevel=minimal returns 400, so there is no off/minimal.
+const GEMINI_4_LEVELS = ["low", "medium", "high"];
 const GEMINI_3_LEVELS = ["low", "medium", "high"];
 const GEMINI_3_FLASH_LEVELS = ["minimal", "low", "medium", "high"];
 // Verified against the native API on 2026-09-02: Gemini 3.7/3.8 Flash reject
@@ -149,6 +152,9 @@ export const BUILTIN_MODELS = [
     // list via fetchGeminiModels (GET /v1beta/models, newest five). Gemini 3
     // thinking support varies by release: 3.7/3.8 Flash support off/low/medium/high
     // while older Flash releases expose minimal/low/medium/high.
+    // Gemini 4 Argon: 1,048,576-token window shared by input, thinking and output.
+    // https://ai.google.dev/gemini-api/docs/models/gemini-4-argon
+    { id: "gemini-4-argon", name: "Gemini 4 Argon", providerId: "google", tier: "strong", reasoningLevels: GEMINI_4_LEVELS, defaultReasoningLevel: "medium", contextWindow: 1048576 },
     { id: "gemini-3.8-flash", name: "Gemini 3.8 Flash", providerId: "google", tier: "fast", reasoningLevels: GEMINI_37_38_FLASH_LEVELS, contextWindow: 1048576 },
     { id: "gemini-3.7-flash", name: "Gemini 3.7 Flash", providerId: "google", tier: "fast", reasoningLevels: GEMINI_37_38_FLASH_LEVELS, contextWindow: 1048576 },
     { id: "gemini-3.5-flash", name: "Gemini 3.5 Flash", providerId: "google", tier: "fast", reasoningLevels: GEMINI_3_FLASH_LEVELS, contextWindow: 1048576 },

package/dist/model-pricing.js

@@ -64,6 +64,23 @@ export const MODEL_PRICING_OVERRIDES = [
             outputPerMillion: 7.5,
         },
     })),
+    // Gemini 4 Argon introductory pricing through 2026-11-30; standard rates from
+    // 2026-12-01. Implicit caching only (95% off input), so no cache-write rate.
+    // https://ai.google.dev/gemini-api/docs/pricing
+    {
+        providerId: "google",
+        modelId: "gemini-4-argon",
+        currency: "USD",
+        inputCacheHitPerMillion: 0.1,
+        inputCacheMissPerMillion: 2,
+        outputPerMillion: 10,
+        effectiveUntil: "2026-12-01T00:00:00Z",
+        original: {
+            inputCacheHitPerMillion: 0.2,
+            inputCacheMissPerMillion: 4,
+            outputPerMillion: 20,
+        },
+    },
     {
         providerId: "deepseek",
         modelId: "deepseek-flash",

package/dist/permissions/shell-command.js

@@ -160,6 +160,33 @@ export function shellTokens(segment) {
 }
 /** Wrappers that run their argument as the real command. */
 const COMMAND_WRAPPERS = new Set(["command", "exec", "nohup", "builtin", "env", "sudo", "doas", "nice", "xargs"]);
+/**
+ * Wrapper options that take a separate argument (`sudo -u root`), so that
+ * argument is not mistaken for the command. `env -S` is deliberately absent:
+ * its argument is the command line itself.
+ */
+const WRAPPER_OPTION_ARGS = {
+    sudo: { short: "CDghpRrTtUu", long: ["chdir", "chroot", "close-from", "command-timeout", "group", "host", "other-user", "prompt", "role", "type", "user"] },
+    doas: { short: "Cu", long: [] },
+    env: { short: "aCPu", long: ["argv0", "chdir", "unset"] },
+    nice: { short: "n", long: ["adjustment"] },
+    // GNU --eof/--replace/--max-lines take a value only as `--opt=value`.
+    xargs: { short: "adEIJLnPRSs", long: ["arg-file", "delimiter", "max-args", "max-chars", "max-procs", "process-slot-var"] },
+    exec: { short: "a", long: [] },
+};
+/** getopt rules: in `-Eu root` the last letter takes the next word; in `-uroot` it is attached. */
+function optionTakesNextWord(wrapper, option) {
+    const spec = WRAPPER_OPTION_ARGS[wrapper];
+    if (!spec)
+        return false;
+    if (option.startsWith("--"))
+        return !option.includes("=") && spec.long.includes(option.slice(2));
+    for (let index = 1; index < option.length; index++) {
+        if (spec.short.includes(option[index]))
+            return index === option.length - 1;
+    }
+    return false;
+}
 /**
  * The words of a segment with leading `VAR=value` assignments and command
  * wrappers (`sudo -u x`, `env`, `nohup`, ...) removed. Deny rules match
@@ -177,9 +204,14 @@ export function effectiveCommandTokens(segment) {
             changed = true;
         }
         if (tokens.length > 0 && COMMAND_WRAPPERS.has(tokens[0])) {
-            tokens.shift();
-            while (tokens.length > 0 && tokens[0].startsWith("-"))
-                tokens.shift();
+            const wrapper = tokens.shift();
+            while (tokens.length > 0 && tokens[0].startsWith("-")) {
+                const option = tokens.shift();
+                if (option === "--")
+                    break;
+                if (optionTakesNextWord(wrapper, option))
+                    tokens.shift();
+            }
             changed = true;
         }
     }

package/dist/prompt/compose.d.ts

@@ -6,7 +6,10 @@ export interface ComposeSystemPromptOptions extends EnvironmentPromptOptions {
     guidelines?: string[];
     thinkingLevel?: ThinkingLevel;
     mode?: PermissionMode;
+    /** Prompt-visible skills; when given (and `skill` is a tool), listed as a catalog. */
     skills?: SkillSummary[];
+    /** Catalog budget in characters (default SKILL_CATALOG_CHARS); 0 falls back to search only. */
+    skillCatalogChars?: number;
     memoryPrompt?: string;
     agentProfilePrompt?: string;
     /** Rendered subagent model-routing menu (design §4). Placed right after the

package/dist/prompt/compose.js

@@ -9,6 +9,7 @@ import { buildKimiProviderPrompt } from "./provider-prompts/kimi.js";
 import { buildDelegationPolicyPrompt } from "./delegation.js";
 import { buildEnvironmentPrompt, defaultToolNames } from "./environment.js";
 import { buildRuntimePrompt } from "./runtime.js";
+import { buildSkillCatalog } from "../skills/format.js";
 export function composeSystemPrompt(options = {}) {
     const agentName = options.agentName ?? "Bubble";
     const providerPrompt = buildProviderPrompt(agentName, options.configuredProvider, options.configuredModelId, options.configuredModel);
@@ -21,10 +22,20 @@ export function composeSystemPrompt(options = {}) {
         tools: options.tools ?? defaultToolNames,
         toolSnippets: options.toolSnippets,
     });
+    const tools = options.tools ?? defaultToolNames;
+    // Level one of skill loading: names and one-line descriptions are always in
+    // context; bodies load on demand with `skill`. Last section, so the prefix
+    // above stays byte-identical while the skill set is unchanged.
+    const skillCatalog = options.skills && tools.includes("skill")
+        ? buildSkillCatalog(options.skills, {
+            budgetChars: options.skillCatalogChars,
+            searchable: tools.includes("skill_search"),
+        })
+        : undefined;
     const runtimePrompt = buildRuntimePrompt({
         thinkingLevel: options.thinkingLevel,
         mode: options.mode,
-        guidelines: buildGuidelines(options.tools ?? defaultToolNames, options.guidelines ?? []),
+        guidelines: buildGuidelines(tools, options.guidelines ?? [], skillCatalog),
     });
     const delegationPrompt = buildDelegationPolicyPrompt(options.tools ?? defaultToolNames);
     // Same gate as the delegation policy: children (no spawn_agent) never see the menu.
@@ -37,6 +48,7 @@ export function composeSystemPrompt(options = {}) {
         modelRoutingPrompt,
         options.agentProfilePrompt,
         options.memoryPrompt,
+        skillCatalog?.text,
     ].filter(Boolean).join("\n\n");
 }
 function buildProviderPrompt(agentName, providerId, modelId, modelName) {
@@ -67,7 +79,7 @@ function buildProviderPrompt(agentName, providerId, modelId, modelName) {
     }
     return buildDefaultProviderPrompt(agentName);
 }
-function buildGuidelines(tools, extraGuidelines) {
+function buildGuidelines(tools, extraGuidelines, skillCatalog) {
     const guidelines = [];
     const add = (item) => {
         if (!guidelines.includes(item)) {
@@ -86,7 +98,9 @@ function buildGuidelines(tools, extraGuidelines) {
     if (tools.includes("question")) {
         add("When the user is explicitly discussing, brainstorming, or shaping an approach instead of asking for immediate execution, use the question tool for targeted clarification or preference choices when it would materially improve the discussion; do not use it for generic permission-to-proceed questions");
     }
-    if (tools.includes("skill_search") && tools.includes("skill")) {
+    // With a catalog the Skills section itself says how to load; search remains
+    // the only route when the host gave no catalog or turned it off.
+    if (!skillCatalog?.listed && tools.includes("skill_search") && tools.includes("skill")) {
         add("Skills may provide specialized workflows. When a task appears to match a specialized workflow, call skill_search to find relevant skills, then call skill with the exact name to load the selected skill before applying it");
     }
     for (const item of extraGuidelines) {

package/dist/provider-ai-sdk.d.ts

@@ -50,7 +50,8 @@ export declare function fetchGeminiModels(options: {
 }): Promise<GeminiModelDescriptor[]>;
 /**
  * Ranking: one entry per (version, tier) family — GA ids beat dated previews —
- * then newest version first, pro before flash before flash-lite, top N.
+ * then newest version first, flagship (pro/argon) before flash before
+ * flash-lite, top N.
  */
 export declare function selectLatestGeminiModels(entries: GeminiModelListEntry[], limit?: number): GeminiModelDescriptor[];
 /** Mirrors the static catalog's per-family thinking support. */