@mindstudio-ai/remy 0.1.255 → 0.1.257

package/dist/index.js

@@ -266,7 +266,7 @@ function isRetryableError(error) {
   return /Network error/i.test(error) || /HTTP 5\d\d/i.test(error) || /Stream stalled/i.test(error) || /overloaded/i.test(error) || /terminated/i.test(error);
 }
 function sleep(ms) {
-  return new Promise((resolve2) => setTimeout(resolve2, ms));
+  return new Promise((resolve3) => setTimeout(resolve3, ms));
 }
 async function* streamChatWithRetry(params, options) {
   for (let attempt = 0; attempt < MAX_RETRIES; attempt++) {
@@ -402,8 +402,8 @@ var init_readSpec = __esm({
     init_helpers();
     DEFAULT_MAX_LINES = 500;
     readSpecTool = {
-      clearable: true,
       definition: {
+        clearable: true,
         name: "readSpec",
         description: "Read a spec file from src/ with line numbers. Always read a spec file before editing it. Paths are relative to the project root and must start with src/ (e.g., src/app.md, src/interfaces/web.md).",
         inputSchema: {
@@ -535,8 +535,8 @@ var init_writeSpec = __esm({
     init_diff();
     init_fileLock();
     writeSpecTool = {
-      clearable: true,
       definition: {
+        clearable: true,
         name: "writeSpec",
         description: "Create a new spec file or completely overwrite an existing one in src/. Parent directories are created automatically. Use this for new spec files or full rewrites. For targeted changes to existing specs, use editSpec instead.",
         inputSchema: {
@@ -686,8 +686,8 @@ var init_editSpec = __esm({
     init_diff();
     init_fileLock();
     editSpecTool = {
-      clearable: true,
       definition: {
+        clearable: true,
         name: "editSpec",
         description: "Make a targeted find/replace edit to a spec file (src/*.md). old_string must appear exactly once (minor indentation differences are handled automatically); set replace_all to true to replace every occurrence. Read the file with readSpec first so you match the exact text, and include the full enclosing structure rather than an inner fragment. The file's YAML frontmatter (the leading --- \u2026 --- block, which holds required fields like name) is protected \u2014 an edit that would remove or malform it is refused. For a full rewrite, use writeSpec.",
         inputSchema: {
@@ -820,8 +820,8 @@ var init_listSpecFiles = __esm({
   "src/tools/spec/listSpecFiles.ts"() {
     "use strict";
     listSpecFilesTool = {
-      clearable: false,
       definition: {
+        clearable: false,
         name: "listSpecFiles",
         description: "List all files in the src/ directory (spec files, brand guidelines, interface specs, references). Use this to understand what spec files exist before reading or editing them.",
         inputSchema: {
@@ -854,8 +854,8 @@ var init_presentPublishPlan = __esm({
   "src/tools/spec/presentPublishPlan.ts"() {
     "use strict";
     presentPublishPlanTool = {
-      clearable: false,
       definition: {
+        clearable: false,
         name: "presentPublishPlan",
         description: "Present a publish changelog to the user for approval. Write a clear markdown summary of what changed since the last deploy. The user will see this in a full-screen view and can approve or dismiss. Call this BEFORE committing or pushing.",
         inputSchema: {
@@ -885,8 +885,8 @@ var init_writePlan = __esm({
     "use strict";
     PLAN_FILE = ".remy-plan.md";
     writePlanTool = {
-      clearable: false,
       definition: {
+        clearable: false,
         name: "writePlan",
         description: "Write an implementation plan for user approval before making changes. Use this only for large, multi-step changes like new features, new interface types, or when the user explicitly asks to see a plan. Most work should be done autonomously without a plan. Write a clear markdown summary of what you intend to do in plain language \u2014 describe the changes from the user's perspective, not as a list of files and code paths. The plan is displayed standalone in the UI with approve/reject buttons attached. The plan body ends with its last substantive section \u2014 do not write any closing line addressed to the reader. No 'If this lands, I'll start building,' no 'Let me know what to adjust,' no 'Approve when ready,' no trailing horizontal rule with a sign-off. Wrap-up text belongs in your chat message alongside the plan, not in the plan file. If the user asks for revisions, call this tool again with updated content to overwrite the plan.",
         inputSchema: {
@@ -922,8 +922,8 @@ var init_updatePlanStatus = __esm({
     "use strict";
     PLAN_FILE2 = ".remy-plan.md";
     updatePlanStatusTool = {
-      clearable: false,
       definition: {
+        clearable: false,
         name: "updatePlanStatus",
         description: 'Update the status of the current implementation plan. Use when the user approves or rejects the plan via chat (e.g. "looks good, go ahead" or "scrap it"). Approving sets the plan to active so you can begin implementation. Rejecting deletes the plan.',
         inputSchema: {
@@ -970,8 +970,8 @@ var init_setProjectOnboardingState = __esm({
   "src/tools/common/setProjectOnboardingState.ts"() {
     "use strict";
     setProjectOnboardingStateTool = {
-      clearable: false,
       definition: {
+        clearable: false,
         name: "setProjectOnboardingState",
         description: "Advance the project onboarding state. Forward-only: building \u2192 buildComplete \u2192 onboardingFinished. Normally driven by automated actions \u2014 don't call this out of order during a normal build, or you'll skip stages the user hasn't experienced. Exception: if the project has been in `building` for a while, the build is clearly done (the user is iterating on a working app, deploying, etc.), and the user reports the editor seems stuck \u2014 disabled Preview/Spec/Code tabs, no reveal, etc. \u2014 call `setProjectOnboardingState({ state: 'buildComplete' })` to unstick them. `onboardingFinished` is always set by the frontend after the user dismisses the reveal; never call it yourself.",
         inputSchema: {
@@ -999,8 +999,8 @@ var init_promptUser = __esm({
   "src/tools/common/promptUser.ts"() {
     "use strict";
     promptUserTool = {
-      clearable: false,
       definition: {
+        clearable: false,
         name: "promptUser",
         description: 'Ask the user structured questions. Choose type first: "form" for structured intake (5+ questions, takes over screen), "inline" for quick clarifications or confirmations. Blocks until the user responds. Result contains `_dismissed: true` if the user dismisses without answering.',
         inputSchema: {
@@ -1137,8 +1137,8 @@ var init_confirmDestructiveAction = __esm({
   "src/tools/common/confirmDestructiveAction.ts"() {
     "use strict";
     confirmDestructiveActionTool = {
-      clearable: false,
       definition: {
+        clearable: false,
         name: "confirmDestructiveAction",
         description: "Confirm a destructive or irreversible action with the user. Use for things like deleting data, resetting the database, or discarding draft work. Do not use after presentPublishPlan or writePlan (those already include approval). Do not use before onboarding state transitions.",
         inputSchema: {
@@ -1176,7 +1176,7 @@ function formatCliResult(r) {
   return logBlock + body + truncNote;
 }
 function runCli(command, args2, options) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     const timeout = options?.timeout ?? 6e4;
     const maxBuffer = options?.maxBuffer ?? 1024 * 1024;
     let finalArgs = args2;
@@ -1205,7 +1205,7 @@ function runCli(command, args2, options) {
       if (killTimer) {
         clearTimeout(killTimer);
       }
-      resolve2(result);
+      resolve3(result);
     };
     const child = spawn(command, finalArgs, {
       stdio: [options?.stdin ? "pipe" : "ignore", "pipe", "pipe"]
@@ -1324,8 +1324,8 @@ var init_sdkConsultant = __esm({
     "use strict";
     init_runCli();
     askMindStudioSdkTool = {
-      clearable: false,
       definition: {
+        clearable: false,
         name: "askMindStudioSdk",
         description: "@mindstudio-ai/agent backend SDK expert. Knows every backend action, AI model, connector, and configuration option. Returns architectural guidance and working code. Only covers the backend SDK (@mindstudio-ai/agent) \u2014 do NOT use for frontend/interface SDK questions (@mindstudio-ai/interface) like file uploads, auth, or client-side APIs. Describe what you want to build, not just what API method you need. Batch related questions into a single query.",
         inputSchema: {
@@ -1486,8 +1486,8 @@ var init_searchGoogle = __esm({
     init_runMindstudioCli();
     init_runCli();
     searchGoogleTool = {
-      clearable: false,
       definition: {
+        clearable: false,
         name: "searchGoogle",
         description: "Search Google and return results. Use for research, finding documentation, looking up APIs, or any task where web search would help.",
         inputSchema: {
@@ -1523,8 +1523,8 @@ var init_setProjectMetadata = __esm({
   "src/tools/common/setProjectMetadata.ts"() {
     "use strict";
     setProjectMetadataTool = {
-      clearable: false,
       definition: {
+        clearable: false,
         name: "setProjectMetadata",
         description: "Set project metadata. Can update any combination of: display name, short description, app icon, and Open Graph share image. Provide only the fields you want to change.",
         inputSchema: {
@@ -1559,16 +1559,6 @@ var init_setProjectMetadata = __esm({
 // src/assets.ts
 import fs9 from "fs";
 import path3 from "path";
-function findRoot(start) {
-  let dir = start;
-  while (dir !== path3.dirname(dir)) {
-    if (fs9.existsSync(path3.join(dir, "package.json"))) {
-      return dir;
-    }
-    dir = path3.dirname(dir);
-  }
-  return start;
-}
 function assetPath(...segments) {
   return path3.join(ASSETS_BASE, ...segments);
 }
@@ -1588,14 +1578,11 @@ function readJsonAsset(fallback, ...segments) {
     return fallback;
   }
 }
-var ROOT, ASSETS_BASE;
+var ASSETS_BASE;
 var init_assets = __esm({
   "src/assets.ts"() {
     "use strict";
-    ROOT = findRoot(
-      import.meta.dirname ?? path3.dirname(new URL(import.meta.url).pathname)
-    );
-    ASSETS_BASE = fs9.existsSync(path3.join(ROOT, "dist", "prompt")) ? path3.join(ROOT, "dist") : path3.join(ROOT, "src");
+    ASSETS_BASE = import.meta.dirname ?? path3.dirname(new URL(import.meta.url).pathname);
   }
 });
 
@@ -2238,6 +2225,9 @@ function findLastSummaryCheckpoint(messages, name) {
   }
   return -1;
 }
+function portableToolCallId(id) {
+  return id.replace(/[^a-zA-Z0-9_-]/g, "_");
+}
 function fixOrphanedToolCalls(messages) {
   const toolResultIds = /* @__PURE__ */ new Set();
   for (const msg of messages) {
@@ -2329,14 +2319,30 @@ ${summaryBlock.text}
 
 ${content}` : attachmentHeader;
       }
-      return { ...rest, content };
+      return {
+        ...rest,
+        content,
+        ...msg.toolCallId && {
+          toolCallId: portableToolCallId(msg.toolCallId)
+        }
+      };
     }
     if (!Array.isArray(msg.content)) {
       return msg;
     }
     const blocks = msg.content;
     const text = blocks.filter((b) => b.type === "text").map((b) => b.text).join("");
-    const toolCalls = blocks.filter((b) => b.type === "tool").map((b) => ({ id: b.id, name: b.name, input: b.input }));
+    const toolBlocks = blocks.filter(
+      (b) => b.type === "tool"
+    );
+    const toolCalls = toolBlocks.map((b) => ({
+      id: portableToolCallId(b.id),
+      name: b.name,
+      input: b.input
+    }));
+    const rewroteToolIds = toolBlocks.some(
+      (b) => portableToolCallId(b.id) !== b.id
+    );
     const cleaned2 = {
       role: msg.role,
       content: text
@@ -2344,7 +2350,7 @@ ${content}` : attachmentHeader;
     if (toolCalls.length > 0) {
       cleaned2.toolCalls = toolCalls;
     }
-    if (msg.providerMetadata) {
+    if (msg.providerMetadata && !rewroteToolIds) {
       cleaned2.providerMetadata = msg.providerMetadata;
     }
     if (msg.hidden) {
@@ -2800,8 +2806,8 @@ var init_compactConversation = __esm({
     "use strict";
     init_trigger();
     compactConversationTool = {
-      clearable: false,
       definition: {
+        clearable: false,
         name: "compactConversation",
         description: "Compact the conversation history by summarizing older messages into a checkpoint. The summary preserves key decisions, what was built, and the current state of the project, but drops the verbose tool results, diffs, and intermediate steps that are no longer useful. Runs in the background.",
         inputSchema: {
@@ -2825,8 +2831,136 @@ var init_compactConversation = __esm({
   }
 });
 
+// src/prompt/skills/catalog.ts
+import fs11 from "fs";
+import path5 from "path";
+function parseFrontmatter(content) {
+  const match = content.match(/^---\n([\s\S]*?)\n---/);
+  if (!match) {
+    return {};
+  }
+  const fields = {};
+  for (const line of match[1].split("\n")) {
+    const sep = line.indexOf(":");
+    if (sep > 0) {
+      fields[line.slice(0, sep).trim()] = line.slice(sep + 1).trim();
+    }
+  }
+  return fields;
+}
+function loadCatalog() {
+  let files;
+  try {
+    files = fs11.readdirSync(SKILLS_DIR).filter((f) => f.endsWith(".md"));
+  } catch {
+    return [];
+  }
+  const skills = [];
+  for (const file of files.sort()) {
+    const full = path5.join(SKILLS_DIR, file);
+    const id = file.replace(/\.md$/, "");
+    const fields = parseFrontmatter(fs11.readFileSync(full, "utf-8"));
+    if (!fields.name || !fields.what || !fields.when) {
+      continue;
+    }
+    skills.push({
+      id,
+      name: fields.name,
+      what: fields.what,
+      when: fields.when,
+      path: full
+    });
+  }
+  return skills;
+}
+function getSkill(id) {
+  return SKILLS.find((s) => s.id === id);
+}
+function readSkillBody(skill) {
+  return fs11.readFileSync(skill.path, "utf-8").replace(/^---[\s\S]*?---\s*/, "").trim();
+}
+function loadSkillsCatalog() {
+  if (SKILLS.length === 0) {
+    return "";
+  }
+  const entries = SKILLS.map(
+    (s) => [
+      `### ${s.name} (\`${s.id}\`)`,
+      s.what,
+      "",
+      `When to load: ${s.when}`,
+      `Reference: ${s.path}`
+    ].join("\n")
+  );
+  return `<available_skills>
+Platform capabilities most apps don't use, so their references are kept out of this prompt rather than competing for your attention on every task \u2014 not because they're marginal.
+
+Read what follows as part of what the platform can do, not as a lookup table. Recognising that one of these fits a feature is your job, and proposing one is fair game \u2014 several of them are the difference between an app that works and an app worth showing off. When a trigger fires, load the reference with loadSkill before writing the code rather than after. Loading is cheap and expected; guessing at one of these APIs is not.
+
+A loaded reference drops out of the conversation once it ages out. Re-read it at the path listed with readFile whenever you need it again.
+
+${entries.join("\n\n")}
+</available_skills>`;
+}
+var SKILLS_DIR, SKILLS, SKILL_IDS;
+var init_catalog = __esm({
+  "src/prompt/skills/catalog.ts"() {
+    "use strict";
+    init_assets();
+    SKILLS_DIR = assetPath("prompt", "skills");
+    SKILLS = loadCatalog();
+    SKILL_IDS = SKILLS.map((s) => s.id);
+  }
+});
+
+// src/tools/common/loadSkill.ts
+var loadSkillTool;
+var init_loadSkill = __esm({
+  "src/tools/common/loadSkill.ts"() {
+    "use strict";
+    init_catalog();
+    loadSkillTool = {
+      definition: {
+        clearable: true,
+        name: "loadSkill",
+        description: "Load the full reference for a platform capability that isn't in your system prompt \u2014 task agents, agent interfaces, MCP interfaces, data sources. The available skills and the trigger for each are listed in <available_skills>. Load one before writing code in its area, not after: these are APIs where a plausible-looking guess is usually wrong. Calling this is cheap and expected \u2014 if you're unsure whether you need it, load it. Only covers the capabilities listed in the catalog; for backend SDK actions and model IDs use askMindStudioSdk.",
+        inputSchema: {
+          type: "object",
+          properties: {
+            skill: {
+              type: "string",
+              // Omitted when the catalog is empty: an empty enum is a schema no
+              // provider accepts, and failing one tool call beats failing every
+              // request if the docs ever go missing from a build.
+              ...SKILL_IDS.length > 0 ? { enum: SKILL_IDS } : {},
+              description: "The skill id, as listed in <available_skills>."
+            }
+          },
+          required: ["skill"]
+        }
+      },
+      async execute(input) {
+        const id = String(input.skill ?? "");
+        const skill = getSkill(id);
+        if (!skill) {
+          return `Error: unknown skill "${id}". Available: ${SKILL_IDS.join(", ") || "(none)"}`;
+        }
+        try {
+          const body = readSkillBody(skill);
+          return `${body}
+
+---
+This reference lives at ${skill.path}. Re-read it with readFile if you need it again later \u2014 it won't stay in the conversation.`;
+        } catch (err) {
+          return `Error loading skill "${id}": ${err.message}`;
+        }
+      }
+    };
+  }
+});
+
 // src/tools/code/readFile.ts
-import fs11 from "fs/promises";
+import fs12 from "fs/promises";
 function isBinary(buffer) {
   const sample = buffer.subarray(0, 8192);
   for (let i = 0; i < sample.length; i++) {
@@ -2843,8 +2977,8 @@ var init_readFile = __esm({
     DEFAULT_WINDOW = 500;
     MAX_BYTES = 64 * 1024;
     readFileTool = {
-      clearable: true,
       definition: {
+        clearable: true,
         name: "readFile",
         description: "Read a file's contents with line numbers. Always read a file before editing it \u2014 never guess at contents. By default returns the first 500 lines, and at most 64KB \u2014 a file with very wide lines (a CSV, a minified bundle) comes back short of 500 lines, so read a narrower range or grep rather than paging through it. To read a specific range, pass startLine and endLine (1-indexed, inclusive) \u2014 e.g. to read lines 253\u2013343, pass startLine: 253, endLine: 343. To read the end of a file or log, pass tail (the number of lines from the end). Line numbers in the output correspond to what editFile expects. For a large file, locate the relevant section first (symbols or grep), then read just that range.",
         inputSchema: {
@@ -2852,7 +2986,7 @@ var init_readFile = __esm({
           properties: {
             path: {
               type: "string",
-              description: "The file path to read, relative to the project root."
+              description: "The file path to read. Relative paths resolve from the project root; an absolute path is also accepted, which is how you re-read a reference doc from the path a loadSkill result gave you."
             },
             startLine: {
               type: "number",
@@ -2872,7 +3006,7 @@ var init_readFile = __esm({
       },
       async execute(input) {
         try {
-          const buffer = await fs11.readFile(input.path);
+          const buffer = await fs12.readFile(input.path);
           if (isBinary(buffer)) {
             const size = buffer.length;
             const unit = size > 1024 * 1024 ? `${(size / (1024 * 1024)).toFixed(1)}MB` : `${(size / 1024).toFixed(1)}KB`;
@@ -2946,8 +3080,8 @@ var init_readFile = __esm({
 });
 
 // src/tools/code/writeFile.ts
-import fs12 from "fs/promises";
-import path5 from "path";
+import fs13 from "fs/promises";
+import path6 from "path";
 var writeFileTool;
 var init_writeFile = __esm({
   "src/tools/code/writeFile.ts"() {
@@ -2955,8 +3089,8 @@ var init_writeFile = __esm({
     init_diff();
     init_fileLock();
     writeFileTool = {
-      clearable: true,
       definition: {
+        clearable: true,
         name: "writeFile",
         description: "Create a new file or completely overwrite an existing one. Parent directories are created automatically. Use this for new files or full rewrites. For targeted changes to existing files, use editFile instead \u2014 it preserves the parts you don't want to change and avoids errors from forgetting to include unchanged code.",
         inputSchema: {
@@ -2990,7 +3124,7 @@ var init_writeFile = __esm({
             lastNewlineCount = newlineCount;
             const lastNewline = partial.content.lastIndexOf("\n");
             const completeContent = partial.content.substring(0, lastNewline + 1);
-            const oldContent = await fs12.readFile(partial.path, "utf-8").catch(() => "");
+            const oldContent = await fs13.readFile(partial.path, "utf-8").catch(() => "");
             return `Writing ${partial.path} (${newlineCount} lines)
 ${unifiedDiff(partial.path, oldContent, completeContent)}`;
           }
@@ -2999,13 +3133,13 @@ ${unifiedDiff(partial.path, oldContent, completeContent)}`;
       async execute(input) {
         const release = await acquireFileLock(input.path);
         try {
-          await fs12.mkdir(path5.dirname(input.path), { recursive: true });
+          await fs13.mkdir(path6.dirname(input.path), { recursive: true });
           let oldContent = null;
           try {
-            oldContent = await fs12.readFile(input.path, "utf-8");
+            oldContent = await fs13.readFile(input.path, "utf-8");
           } catch {
           }
-          await fs12.writeFile(input.path, input.content, "utf-8");
+          await fs13.writeFile(input.path, input.content, "utf-8");
           const lineCount = input.content.split("\n").length;
           const label = oldContent !== null ? "Wrote" : "Created";
           return `${label} ${input.path} (${lineCount} lines)
@@ -3021,7 +3155,7 @@ ${unifiedDiff(input.path, oldContent ?? "", input.content)}`;
 });
 
 // src/tools/code/editFile/index.ts
-import fs13 from "fs/promises";
+import fs14 from "fs/promises";
 var editFileTool;
 var init_editFile = __esm({
   "src/tools/code/editFile/index.ts"() {
@@ -3030,8 +3164,8 @@ var init_editFile = __esm({
     init_fileLock();
     init_helpers2();
     editFileTool = {
-      clearable: true,
       definition: {
+        clearable: true,
         name: "editFile",
         description: "Replace a string in a file. old_string must appear exactly once (minor indentation differences are handled automatically). Set replace_all to true to replace every occurrence at once. For bulk mechanical substitutions (renaming a variable, swapping colors), prefer replace_all. Always read the file first so you know the exact text to match. When editing nested structures (objects, function bodies, arrays, template literals), always include the full enclosing structure in old_string rather than just an inner fragment. Replacing a partial slice from the middle of nested code is the most common source of syntax errors.",
         inputSchema: {
@@ -3060,7 +3194,7 @@ var init_editFile = __esm({
       async execute(input) {
         const release = await acquireFileLock(input.path);
         try {
-          const content = await fs13.readFile(input.path, "utf-8");
+          const content = await fs14.readFile(input.path, "utf-8");
           const { old_string, new_string, replace_all } = input;
           const occurrences = findOccurrences(content, old_string);
           if (replace_all) {
@@ -3076,7 +3210,7 @@ var init_editFile = __esm({
                 new_string
               );
             }
-            await fs13.writeFile(input.path, updated, "utf-8");
+            await fs14.writeFile(input.path, updated, "utf-8");
             return `Replaced ${occurrences.length} occurrence${occurrences.length > 1 ? "s" : ""} in ${input.path}
 ${unifiedDiff(input.path, content, updated)}`;
           }
@@ -3087,7 +3221,7 @@ ${unifiedDiff(input.path, content, updated)}`;
               old_string.length,
               new_string
             );
-            await fs13.writeFile(input.path, updated, "utf-8");
+            await fs14.writeFile(input.path, updated, "utf-8");
             return `Updated ${input.path}
 ${unifiedDiff(input.path, content, updated)}`;
           }
@@ -3103,7 +3237,7 @@ ${unifiedDiff(input.path, content, updated)}`;
               flex.matchedText.length,
               new_string
             );
-            await fs13.writeFile(input.path, updated, "utf-8");
+            await fs14.writeFile(input.path, updated, "utf-8");
             return `Updated ${input.path} (matched with flexible whitespace at line ${flex.line})
 ${unifiedDiff(input.path, content, updated)}`;
           }
@@ -3129,7 +3263,7 @@ var init_projectRoot = __esm({
 
 // src/tools/code/bash.ts
 import { spawn as spawn2 } from "child_process";
-import path6 from "path";
+import path7 from "path";
 var DEFAULT_TIMEOUT_MS, DEFAULT_MAX_LINES2, MAX_OUTPUT_BYTES, bashTool;
 var init_bash = __esm({
   "src/tools/code/bash.ts"() {
@@ -3139,8 +3273,8 @@ var init_bash = __esm({
     DEFAULT_MAX_LINES2 = 500;
     MAX_OUTPUT_BYTES = 3e4;
     bashTool = {
-      clearable: true,
       definition: {
+        clearable: true,
         name: "bash",
         description: "Run a shell command and return stdout + stderr. 120-second timeout by default (configurable). Use for: npm install/build/test, git operations, tsc --noEmit, or any CLI tool. Prefer dedicated tools over bash when available (use grep instead of bash + rg, readFile instead of bash + cat). Output is truncated to 500 lines or 30KB, whichever comes first. If a command would emit a lot of data, narrow it down (grep, head/tail, --short flags) rather than reading everything.",
         inputSchema: {
@@ -3169,11 +3303,11 @@ var init_bash = __esm({
       async execute(input, context) {
         const maxLines = input.maxLines === 0 ? Infinity : input.maxLines || DEFAULT_MAX_LINES2;
         const timeoutMs = input.timeout ? input.timeout * 1e3 : DEFAULT_TIMEOUT_MS;
-        return new Promise((resolve2) => {
+        return new Promise((resolve3) => {
           const child = spawn2("sh", ["-c", input.command], {
             // Pinned rather than inherited. `undefined` here means "wherever the
             // process happens to be", which is the project root only by luck.
-            cwd: input.cwd ? path6.resolve(PROJECT_ROOT, input.cwd) : PROJECT_ROOT,
+            cwd: input.cwd ? path7.resolve(PROJECT_ROOT, input.cwd) : PROJECT_ROOT,
             env: { ...process.env, FORCE_COLOR: "1" }
           });
           let output = "";
@@ -3194,9 +3328,9 @@ var init_bash = __esm({
             clearTimeout(timer);
             if (!output) {
               if (code && code !== 0) {
-                resolve2(`Error: process exited with code ${code}`);
+                resolve3(`Error: process exited with code ${code}`);
               } else {
-                resolve2("(no output)");
+                resolve3("(no output)");
               }
               return;
             }
@@ -3222,18 +3356,18 @@ var init_bash = __esm({
                   `${(MAX_OUTPUT_BYTES / 1024).toFixed(0)}KB of ${(totalBytes / 1024).toFixed(0)}KB`
                 );
               }
-              resolve2(
+              resolve3(
                 truncated + `
 
 (truncated at ${reasons.join(" / ")} \u2014 narrow the command (grep, head/tail, smaller paths) instead of increasing limits)`
               );
             } else {
-              resolve2(output);
+              resolve3(output);
             }
           });
           child.on("error", (err) => {
             clearTimeout(timer);
-            resolve2(`Error: ${err.message}`);
+            resolve3(`Error: ${err.message}`);
           });
         });
       }
@@ -3267,8 +3401,8 @@ var init_grep = __esm({
     "use strict";
     DEFAULT_MAX = 50;
     grepTool = {
-      clearable: true,
       definition: {
+        clearable: true,
         name: "grep",
         description: "Search file contents for a regex pattern. Returns matching lines with file paths and line numbers (default 50 results). Use this to find where something is used, locate function definitions, or search for patterns across the codebase. Set outputMode to 'count' for per-file match counts (like grep -c) or 'filesWithMatches' for just the file paths (like grep -l). Add context (like grep -C), or contextBefore/contextAfter (like grep -B/-A), to include surrounding lines. Set caseInsensitive (like grep -i) for a case-insensitive search. For finding a symbol's definition precisely, prefer the definition tool if LSP is available. Automatically excludes node_modules and .git.",
         inputSchema: {
@@ -3357,17 +3491,17 @@ var init_grep = __esm({
         }
         const rgCmd = `rg ${rgFlags}${globFlag} '${escaped}' ${searchPath}`;
         const grepCmd = `grep ${grepFlags} '${escaped}' ${searchPath} --include='*.ts' --include='*.tsx' --include='*.js' --include='*.json' --include='*.md'`;
-        return new Promise((resolve2) => {
+        return new Promise((resolve3) => {
           exec(rgCmd, { maxBuffer: 512 * 1024 }, (err, stdout) => {
             if (stdout?.trim()) {
-              resolve2(formatResults(stdout, max, mode));
+              resolve3(formatResults(stdout, max, mode));
               return;
             }
             exec(grepCmd, { maxBuffer: 512 * 1024 }, (_err, grepStdout) => {
               if (grepStdout?.trim()) {
-                resolve2(formatResults(grepStdout, max, mode));
+                resolve3(formatResults(grepStdout, max, mode));
               } else {
-                resolve2("No matches found.");
+                resolve3("No matches found.");
               }
             });
           });
@@ -3385,8 +3519,8 @@ var init_glob = __esm({
     "use strict";
     DEFAULT_MAX2 = 200;
     globTool = {
-      clearable: true,
       definition: {
+        clearable: true,
         name: "glob",
         description: 'Find files matching a glob pattern. Returns matching file paths sorted alphabetically (default 200 results). Use this to discover project structure, find files by name or extension, or check if a file exists. Common patterns: "**/*.ts" (all TypeScript files), "src/**/*.tsx" (React components in src), "*.json" (root-level JSON files). Automatically excludes node_modules and .git.',
         inputSchema: {
@@ -3432,10 +3566,10 @@ var init_glob = __esm({
 });
 
 // src/tools/code/listDir.ts
-import fs14 from "fs/promises";
-import path7 from "path";
+import fs15 from "fs/promises";
+import path8 from "path";
 async function readAndSort(dirPath) {
-  const entries = await fs14.readdir(dirPath, { withFileTypes: true });
+  const entries = await fs15.readdir(dirPath, { withFileTypes: true });
   return entries.filter((e) => !EXCLUDE.has(e.name)).sort((a, b) => {
     if (a.isDirectory() && !b.isDirectory()) {
       return -1;
@@ -3448,7 +3582,7 @@ async function readAndSort(dirPath) {
 }
 async function collapsePath(basePath, name) {
   let display = name;
-  let current = path7.join(basePath, name);
+  let current = path8.join(basePath, name);
   for (; ; ) {
     let children;
     try {
@@ -3458,7 +3592,7 @@ async function collapsePath(basePath, name) {
     }
     if (children.length === 1 && children[0].isDirectory()) {
       display += "/" + children[0].name;
-      current = path7.join(current, children[0].name);
+      current = path8.join(current, children[0].name);
     } else {
       break;
     }
@@ -3476,8 +3610,8 @@ function formatSize(bytes) {
 }
 async function formatFile(dirPath, name, indent) {
   try {
-    const stat = await fs14.stat(path7.join(dirPath, name));
-    return `${indent}${name}${" ".repeat(Math.max(1, 30 - indent.length - name.length))}${formatSize(stat.size)}`;
+    const stat2 = await fs15.stat(path8.join(dirPath, name));
+    return `${indent}${name}${" ".repeat(Math.max(1, 30 - indent.length - name.length))}${formatSize(stat2.size)}`;
   } catch {
     return `${indent}${name}`;
   }
@@ -3489,8 +3623,8 @@ var init_listDir = __esm({
     EXCLUDE = /* @__PURE__ */ new Set([".git", "node_modules"]);
     MAX_CHILDREN = 15;
     listDirTool = {
-      clearable: true,
       definition: {
+        clearable: true,
         name: "listDir",
         description: "List the contents of a directory with one level of subdirectory expansion. Shows file sizes and collapses single-child directory chains (a/b/c/ shown as one entry). Use this for a quick overview of a directory's structure. For finding files across the whole project, use glob instead.",
         inputSchema: {
@@ -3572,8 +3706,8 @@ var init_editsFinished = __esm({
   "src/tools/code/editsFinished.ts"() {
     "use strict";
     editsFinishedTool = {
-      clearable: false,
       definition: {
+        clearable: false,
         name: "editsFinished",
         description: "Signal that file edits are complete. Call this after you finish writing/editing files so the live preview updates cleanly. The preview is paused while you edit to avoid showing broken intermediate states \u2014 this unpauses it. If you forget to call this, the preview updates when your turn ends.",
         inputSchema: {
@@ -3599,6 +3733,7 @@ async function sidecarRequest(endpoint, body = {}, options) {
     throw new Error("Sidecar not available");
   }
   const url = `${baseUrl}${endpoint}`;
+  let data;
   try {
     const res = await fetch(url, {
       method: "POST",
@@ -3610,12 +3745,7 @@ async function sidecarRequest(endpoint, body = {}, options) {
       log5.error("Sidecar error", { endpoint, status: res.status });
       throw new Error(`Sidecar error: ${res.status}`);
     }
-    const data = await res.json();
-    if (data?.success === false) {
-      const code = data.errorCode ? ` [${data.errorCode}]` : "";
-      throw new Error(`${data.error || "Unknown error"}${code}`);
-    }
-    return data;
+    data = await res.json();
   } catch (err) {
     if (err.message.startsWith("Sidecar error")) {
       throw err;
@@ -3623,6 +3753,16 @@ async function sidecarRequest(endpoint, body = {}, options) {
     log5.error("Sidecar connection error", { endpoint, error: err.message });
     throw new Error(`Sidecar connection error: ${err.message}`);
   }
+  if (data?.success === false) {
+    const code = data.errorCode ? ` [${data.errorCode}]` : "";
+    log5.error("Sidecar command failed", {
+      endpoint,
+      error: data.error,
+      errorCode: data.errorCode
+    });
+    throw new Error(`${data.error || "Unknown error"}${code}`);
+  }
+  return data;
 }
 var log5, baseUrl;
 var init_sidecar = __esm({
@@ -3654,8 +3794,8 @@ var init_lspDiagnostics = __esm({
     "use strict";
     init_lsp();
     lspDiagnosticsTool = {
-      clearable: true,
       definition: {
+        clearable: true,
         name: "lspDiagnostics",
         description: "Get TypeScript diagnostics (type errors, warnings) for a file, with suggested fixes when available. Use this after editing a file to check for errors.",
         inputSchema: {
@@ -3710,8 +3850,8 @@ var init_restartProcess = __esm({
     "use strict";
     init_lsp();
     restartProcessTool = {
-      clearable: false,
       definition: {
+        clearable: false,
         name: "restartProcess",
         description: "Restart a managed sandbox process. Use this after running npm install or changing package.json to restart the dev server so it picks up new dependencies.",
         inputSchema: {
@@ -3728,7 +3868,7 @@ var init_restartProcess = __esm({
       async execute(input) {
         const data = await lspRequest("/restart-process", { name: input.name });
         if (data.ok) {
-          await new Promise((resolve2) => setTimeout(resolve2, 5e3));
+          await new Promise((resolve3) => setTimeout(resolve3, 5e3));
           return `Restarted ${input.name}.`;
         }
         return `Error: unexpected response: ${JSON.stringify(data)}`;
@@ -3743,8 +3883,8 @@ var init_runScenario = __esm({
   "src/tools/code/runScenario.ts"() {
     "use strict";
     runScenarioTool = {
-      clearable: true,
       definition: {
+        clearable: true,
         name: "runScenario",
         description: "Run a scenario to seed the dev database with test data. By default truncates all tables first, then executes the seed function and impersonates the scenario roles. Use skipTruncate to run the seed function against existing data without resetting. Blocks until complete. Scenario IDs are defined in mindstudio.json. If it fails, check .logs/tunnel.log or .logs/requests.ndjson for details. Return synchronously - no need to sleep before checking results.",
         inputSchema: {
@@ -3775,8 +3915,8 @@ var init_runMethod = __esm({
   "src/tools/code/runMethod.ts"() {
     "use strict";
     runMethodTool = {
-      clearable: true,
       definition: {
+        clearable: true,
         name: "runMethod",
         description: 'Run a method in the dev environment and return the result. Use for testing methods after writing or modifying them. Returns output, captured console output, errors with stack traces, and duration. If it fails, check .logs/tunnel.log or .logs/requests.ndjson for more details. Returns synchronously \u2014 no need to sleep before checking results.\n\nBy default methods run unauthenticated. If the method is auth-gated (calls `auth.requireRole()`, filters on `auth.userId`, etc.), pass `userId: "testUser"` to run as the default test user \u2014 no scenario setup required, no userId lookup.',
         inputSchema: {
@@ -3816,8 +3956,8 @@ var init_queryDatabase = __esm({
   "src/tools/code/queryDatabase.ts"() {
     "use strict";
     queryDatabaseTool = {
-      clearable: true,
       definition: {
+        clearable: true,
         name: "queryDatabase",
         description: "Execute a raw SQL query against the dev database and return the results. Use for inspecting data and debugging issues.",
         inputSchema: {
@@ -3838,26 +3978,136 @@ var init_queryDatabase = __esm({
   }
 });
 
+// src/tools/_helpers/uploadImage.ts
+import { readFile, stat } from "fs/promises";
+import { basename, extname, resolve } from "path";
+function isFetchableUrl(ref) {
+  return /^(?:https?:|data:)/i.test(ref);
+}
+async function resolveImageRef(ref, apiConfig) {
+  const trimmed = ref.trim();
+  return isFetchableUrl(trimmed) ? trimmed : uploadLocalImage(trimmed, apiConfig);
+}
+function resolveImageRefs(refs, apiConfig) {
+  return Promise.all(refs.map((ref) => resolveImageRef(ref, apiConfig)));
+}
+async function uploadLocalImage(localPath, apiConfig) {
+  const absolute = resolve(PROJECT_ROOT, localPath);
+  const ext = extname(absolute).toLowerCase();
+  const contentType = CONTENT_TYPES[ext];
+  if (!contentType) {
+    throw new Error(
+      `Cannot use "${localPath}" as an image \u2014 vision models read ${Object.keys(
+        CONTENT_TYPES
+      ).join(", ")}. Convert it first, or pass an image URL.`
+    );
+  }
+  let stats;
+  try {
+    stats = await stat(absolute);
+  } catch {
+    throw new Error(
+      `No file at "${localPath}". Paths resolve from the project root; list the directory to check the name, or pass an image URL.`
+    );
+  }
+  const cacheKey = `${absolute}:${stats.mtimeMs}:${stats.size}`;
+  const cached3 = hosted.get(cacheKey);
+  if (cached3) {
+    return cached3;
+  }
+  if (!apiConfig?.appId) {
+    throw new Error(
+      `Cannot host "${localPath}" for analysis \u2014 this session has no app id. Pass an image URL instead.`
+    );
+  }
+  const bytes = await readFile(absolute);
+  const target = await requestUploadTarget(apiConfig, ext.slice(1));
+  const form = new FormData();
+  for (const [field, value] of Object.entries(target.uploadFields)) {
+    form.append(field, value);
+  }
+  form.append(
+    "file",
+    new Blob([bytes], { type: contentType }),
+    basename(absolute)
+  );
+  const res = await fetch(target.uploadUrl, {
+    method: "POST",
+    body: form,
+    signal: AbortSignal.timeout(UPLOAD_TIMEOUT_MS)
+  });
+  if (!res.ok) {
+    throw new Error(`Upload of "${localPath}" failed: HTTP ${res.status}`);
+  }
+  log6.info("Local image hosted", {
+    path: localPath,
+    bytes: stats.size,
+    url: target.publicUrl
+  });
+  hosted.set(cacheKey, target.publicUrl);
+  return target.publicUrl;
+}
+async function requestUploadTarget(apiConfig, extension) {
+  const url = `${apiConfig.baseUrl}/_internal/v2/apps/${apiConfig.appId}/dev/manage/upload`;
+  const res = await fetch(url, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${apiConfig.apiKey}`
+    },
+    body: JSON.stringify({ extension }),
+    signal: AbortSignal.timeout(UPLOAD_TIMEOUT_MS)
+  });
+  if (!res.ok) {
+    throw new Error(`Could not get an upload URL: HTTP ${res.status}`);
+  }
+  return await res.json();
+}
+var log6, UPLOAD_TIMEOUT_MS, CONTENT_TYPES, hosted;
+var init_uploadImage = __esm({
+  "src/tools/_helpers/uploadImage.ts"() {
+    "use strict";
+    init_projectRoot();
+    init_logger();
+    log6 = createLogger("uploadImage");
+    UPLOAD_TIMEOUT_MS = 6e4;
+    CONTENT_TYPES = {
+      ".png": "image/png",
+      ".jpg": "image/jpeg",
+      ".jpeg": "image/jpeg",
+      ".gif": "image/gif",
+      ".webp": "image/webp"
+    };
+    hosted = /* @__PURE__ */ new Map();
+  }
+});
+
 // src/subagents/common/analyzeImage.ts
 async function analyzeImage(params) {
-  const { prompt, imageUrl, model, timeout = 2e5, onLog } = params;
-  return runMindstudioCli(
+  const { prompt, image, apiConfig, model, timeout = 2e5, onLog } = params;
+  const url = await resolveImageRef(image, apiConfig);
+  const result = await runMindstudioCliResult(
     [
       "analyze-image",
       "--prompt",
       prompt,
       "--image-url",
-      imageUrl,
+      url,
       "--vision-model-override",
       JSON.stringify({ model })
     ],
     { outputKey: "analysis", timeout, onLog }
   );
+  if (!result.ok) {
+    throw new Error(`Could not analyze ${url}: ${result.value}`);
+  }
+  return { url, analysis: result.value };
 }
 var init_analyzeImage = __esm({
   "src/subagents/common/analyzeImage.ts"() {
     "use strict";
     init_runMindstudioCli();
+    init_uploadImage();
   }
 });
 
@@ -3879,13 +4129,14 @@ ${ANALYSIS_RESPONSE_FORMAT}`;
   return p;
 }
 async function streamScreenshotAnalysis(opts) {
-  const { url, prompt, styleMap, onLog, model } = opts;
+  const { image, prompt, styleMap, onLog, model, apiConfig } = opts;
+  const url = await resolveImageRef(image, apiConfig);
   onLog?.(JSON.stringify({ url, analysis: null }));
   const analysisPrompt = buildScreenshotAnalysisPrompt({ prompt, styleMap });
   let accumulated = "";
-  const analysis = await analyzeImage({
+  const { analysis } = await analyzeImage({
     prompt: analysisPrompt,
-    imageUrl: url,
+    image: url,
     model,
     onLog: (chunk) => {
       accumulated += chunk;
@@ -3896,18 +4147,19 @@ async function streamScreenshotAnalysis(opts) {
 }
 async function captureAndAnalyzeScreenshot(promptOrOptions) {
   let prompt;
-  let existingUrl;
+  let existingImage;
   let onLog;
   let model;
-  let path14;
+  let apiConfig;
+  let path15;
   let fullPage = true;
   let width;
   let height;
   let format;
   if (typeof promptOrOptions === "object" && promptOrOptions !== null) {
     prompt = promptOrOptions.prompt;
-    existingUrl = promptOrOptions.imageUrl;
-    path14 = promptOrOptions.path;
+    existingImage = promptOrOptions.image;
+    path15 = promptOrOptions.path;
     if (promptOrOptions.fullPage !== void 0) {
       fullPage = promptOrOptions.fullPage;
     }
@@ -3916,6 +4168,7 @@ async function captureAndAnalyzeScreenshot(promptOrOptions) {
     format = promptOrOptions.format;
     onLog = promptOrOptions.onLog;
     model = promptOrOptions.model;
+    apiConfig = promptOrOptions.apiConfig;
   } else {
     prompt = promptOrOptions;
   }
@@ -3924,18 +4177,20 @@ async function captureAndAnalyzeScreenshot(promptOrOptions) {
   }
   let url;
   let styleMap;
-  if (existingUrl) {
-    url = existingUrl;
+  if (existingImage) {
+    url = existingImage;
   } else {
     const ssResult = await sidecarRequest(
       fullPage ? "/screenshot-full-page" : "/screenshot-viewport",
       {
-        ...path14 ? { path: path14 } : {},
+        ...path15 ? { path: path15 } : {},
         ...width != null ? { width } : {},
         ...height != null ? { height } : {},
         ...format ? { format } : {}
       },
-      { timeout: fullPage ? 12e4 : 3e4 }
+      {
+        timeout: fullPage ? FULLPAGE_CAPTURE_TIMEOUT_MS : VIEWPORT_CAPTURE_TIMEOUT_MS
+      }
     );
     url = ssResult?.url || ssResult?.screenshotUrl;
     if (!url) {
@@ -3946,7 +4201,7 @@ async function captureAndAnalyzeScreenshot(promptOrOptions) {
     styleMap = ssResult?.styleMap;
   }
   if (prompt === false) {
-    return url;
+    return resolveImageRef(url, apiConfig);
   }
   if (!model) {
     throw new Error(
@@ -3954,19 +4209,23 @@ async function captureAndAnalyzeScreenshot(promptOrOptions) {
     );
   }
   return streamScreenshotAnalysis({
-    url,
+    image: url,
+    apiConfig,
     prompt: prompt || void 0,
     styleMap,
     onLog,
     model
   });
 }
-var SCREENSHOT_ANALYSIS_PROMPT, ANALYSIS_RESPONSE_FORMAT;
+var VIEWPORT_CAPTURE_TIMEOUT_MS, FULLPAGE_CAPTURE_TIMEOUT_MS, SCREENSHOT_ANALYSIS_PROMPT, ANALYSIS_RESPONSE_FORMAT;
 var init_screenshot = __esm({
   "src/tools/_helpers/screenshot.ts"() {
     "use strict";
     init_sidecar();
     init_analyzeImage();
+    init_uploadImage();
+    VIEWPORT_CAPTURE_TIMEOUT_MS = 45e3;
+    FULLPAGE_CAPTURE_TIMEOUT_MS = 135e3;
     SCREENSHOT_ANALYSIS_PROMPT = `Describe everything visible on screen from top to bottom \u2014 every element, its position, its size relative to the viewport, its colors, its content. Be comprehensive, thorough, and spatial. After the inventory, note anything that looks visually broken (overlapping elements, clipped text, misaligned components).`;
     ANALYSIS_RESPONSE_FORMAT = `Respond only with your analysis as Markdown and absolutely no other text. Do not use emojis - use unicode if you need symbols.`;
   }
@@ -3991,12 +4250,12 @@ var init_browserLock = __esm({
 });
 
 // src/toolRegistry.ts
-var log6, USER_CANCELLED_RESULT, ToolRegistry;
+var log7, USER_CANCELLED_RESULT, ToolRegistry;
 var init_toolRegistry = __esm({
   "src/toolRegistry.ts"() {
     "use strict";
     init_logger();
-    log6 = createLogger("tool-registry");
+    log7 = createLogger("tool-registry");
     USER_CANCELLED_RESULT = "[USER CANCELLED] The user manually cancelled this tool. Do not retry it automatically \u2014 wait for the user\u2019s next message for direction.";
     ToolRegistry = class {
       entries = /* @__PURE__ */ new Map();
@@ -4023,7 +4282,7 @@ var init_toolRegistry = __esm({
         if (!entry) {
           return false;
         }
-        log6.info("Tool stopped", { toolCallId: id, name: entry.name, mode });
+        log7.info("Tool stopped", { toolCallId: id, name: entry.name, mode });
         entry.abortController.abort(mode);
         if (mode === "graceful") {
           const partial = entry.getPartialResult?.() ?? "";
@@ -4056,7 +4315,7 @@ ${partial}` : "[INTERRUPTED] Tool execution was stopped.";
         if (!entry) {
           return false;
         }
-        log6.info("Tool restarted", { toolCallId: id, name: entry.name });
+        log7.info("Tool restarted", { toolCallId: id, name: entry.name });
         entry.abortController.abort("restart");
         const newInput = patchedInput ? { ...entry.input, ...patchedInput } : entry.input;
         this.onEvent?.({
@@ -4165,7 +4424,7 @@ async function runSubAgent(config) {
   const signal = background ? bgAbort.signal : parentSignal;
   const agentName = subAgentId || "sub-agent";
   const runStart = Date.now();
-  log7.info("Sub-agent started", { requestId, parentToolId, agentName });
+  log8.info("Sub-agent started", { requestId, parentToolId, agentName });
   const emit = (e) => {
     onEvent({ ...e, parentToolId });
   };
@@ -4177,7 +4436,6 @@ async function runSubAgent(config) {
   const fullSystem = `${system}
 
 Current date: ${dateStr}`;
-  const excludeToolsFromClearing = tools2.filter((t) => t.clearable === false).map((t) => t.name);
   let turns = 0;
   const run = async () => {
     const historyLen = (history ?? []).length;
@@ -4249,7 +4507,6 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
             system: fullSystem,
             messages: cleanMessagesForApi(messages),
             tools: tools2,
-            excludeToolsFromClearing,
             signal
           },
           {
@@ -4385,7 +4642,7 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
           ...hasArtifacts ? { artifacts } : {}
         };
       }
-      log7.info("Tools executing", {
+      log8.info("Tools executing", {
         requestId,
         parentToolId,
         count: toolCalls.length,
@@ -4462,7 +4719,7 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
           run2(tc.input);
           const r = await resultPromise;
           toolRegistry?.unregister(tc.id);
-          log7.info("Tool completed", {
+          log8.info("Tool completed", {
             requestId,
             parentToolId,
             toolCallId: tc.id,
@@ -4513,7 +4770,7 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
   const wrapRun = async () => {
     try {
       const result = await run();
-      log7.info("Sub-agent complete", {
+      log8.info("Sub-agent complete", {
         requestId,
         parentToolId,
         agentName,
@@ -4522,7 +4779,7 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
       });
       return result;
     } catch (err) {
-      log7.warn("Sub-agent error", {
+      log8.warn("Sub-agent error", {
         requestId,
         parentToolId,
         agentName,
@@ -4534,7 +4791,7 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
   if (!background) {
     return wrapRun();
   }
-  log7.info("Sub-agent backgrounded", { requestId, parentToolId, agentName });
+  log8.info("Sub-agent backgrounded", { requestId, parentToolId, agentName });
   toolRegistry?.register({
     id: parentToolId,
     name: agentName,
@@ -4569,7 +4826,7 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
   });
   return { text: ack, messages: [], backgrounded: true };
 }
-var log7;
+var log8;
 var init_runner = __esm({
   "src/subagents/runner.ts"() {
     "use strict";
@@ -4580,7 +4837,7 @@ var init_runner = __esm({
     init_toolResultCap();
     init_statusWatcher();
     init_cleanMessages();
-    log7 = createLogger("sub-agent");
+    log8 = createLogger("sub-agent");
   }
 });
 
@@ -4673,7 +4930,7 @@ var init_tools2 = __esm({
                       "screenshotViewport",
                       "setViewport"
                     ],
-                    description: 'snapshot: accessibility tree of the page (waits for network to settle). click: click an element (animated cursor, full event sequence). type: type text into input (one char at a time, works with React/Vue/Svelte). select: select a dropdown option by text. wait: wait for an element to appear (polls 100ms, waits for network). navigate: navigate to a URL within the app (waits for load, subsequent steps run on new page). evaluate: run JS in the page. styles: read computed CSS styles from elements (pass properties array with camelCase names, or omit for defaults). screenshotFullPage: full-page viewport-stitched screenshot (returns CDN url with dimensions). screenshotViewport: screenshot of just the visible viewport \u2014 pass `scrollToSelector` (or `scrollY`) on this step to scroll a section into view and capture it in one atomic step (no separate scroll needed). setViewport: switch the browser between desktop and mobile rendering (pass `mode`: "desktop" or "mobile"). Reloads the page so responsive layouts, media queries, and matchMedia re-evaluate \u2014 use it to QA mobile/responsive views.'
+                    description: 'snapshot: accessibility tree of the page (waits for network to settle). click: click an element (animated cursor, full event sequence). type: type text into input (one char at a time, works with React/Vue/Svelte). select: select a dropdown option by text. wait: wait for an element to appear (polls 100ms, waits for network). navigate: navigate to a URL within the app (waits for load, subsequent steps run on new page). evaluate: run JS in the page. styles: read computed CSS styles from elements (pass properties array with camelCase names, or omit for defaults). screenshotFullPage: screenshot of the whole page top-to-bottom (returns a CDN url with dimensions and a written analysis). screenshotViewport: screenshot of just the visible viewport \u2014 pass `scrollToSelector` (or `scrollY`) on this step to scroll a section into view and capture it in one atomic step (no separate scroll needed). setViewport: switch the browser between desktop and mobile rendering (pass `mode`: "desktop" or "mobile"). Reloads the page so responsive layouts, media queries, and matchMedia re-evaluate \u2014 use it to QA mobile/responsive views.'
                   },
                   ref: {
                     type: "string",
@@ -4741,20 +4998,11 @@ var init_tools2 = __esm({
           required: ["steps"]
         }
       },
-      {
-        clearable: true,
-        name: "screenshotFullPage",
-        description: "Capture a full-height screenshot of the current page. Returns a CDN URL with full text analysis and description.",
-        inputSchema: {
-          type: "object",
-          properties: {
-            path: {
-              type: "string",
-              description: 'Navigate to this path before capturing (e.g. "/settings"). If omitted, screenshots the current page.'
-            }
-          }
-        }
-      },
+      // Captures are `browserCommand` steps only — there is deliberately no
+      // standalone screenshot tool here. Both used to exist for full-page, with
+      // different budgets, different result plumbing, and analysis on only one of
+      // them, so which door you picked changed what you got back.
+      //
       // Read tools so the QA agent can pull full spec detail on demand — the spec
       // context in its prompt is a lightweight index (see prompt.ts) that points
       // here. Routed to the global executeTool in index.ts, mirroring specSync.
@@ -4766,13 +5014,13 @@ var init_tools2 = __esm({
 });
 
 // src/subagents/common/context.ts
-import fs15 from "fs";
-import path8 from "path";
+import fs16 from "fs";
+import path9 from "path";
 function walkMdFiles(dir, skip) {
   const files = [];
   try {
-    for (const entry of fs15.readdirSync(dir, { withFileTypes: true })) {
-      const full = path8.join(dir, entry.name);
+    for (const entry of fs16.readdirSync(dir, { withFileTypes: true })) {
+      const full = path9.join(dir, entry.name);
       if (entry.isDirectory()) {
         if (!skip?.has(entry.name)) {
           files.push(...walkMdFiles(full, skip));
@@ -4785,9 +5033,9 @@ function walkMdFiles(dir, skip) {
   }
   return files.sort();
 }
-function parseFrontmatter(filePath) {
+function parseFrontmatter2(filePath) {
   try {
-    const content = fs15.readFileSync(filePath, "utf-8");
+    const content = fs16.readFileSync(filePath, "utf-8");
     const match = content.match(/^---\n([\s\S]*?)\n---/);
     if (!match) {
       return {};
@@ -4812,7 +5060,7 @@ function loadSpecIndex() {
     return "";
   }
   const lines = files.map((f) => {
-    const fm = parseFrontmatter(f);
+    const fm = parseFrontmatter2(f);
     let line = `- ${f}`;
     if (fm.name) {
       line += ` \u2014 "${fm.name}"`;
@@ -4833,7 +5081,7 @@ function loadRoadmapIndex() {
   const parts = [];
   try {
     const indexJson = JSON.parse(
-      fs15.readFileSync("src/roadmap/index.json", "utf-8")
+      fs16.readFileSync("src/roadmap/index.json", "utf-8")
     );
     if (indexJson.lanes?.length > 0) {
       const laneLines = indexJson.lanes.map(
@@ -4853,7 +5101,7 @@ ${indexJson.standalone.map((s) => `- ${s}`).join("\n")}`
   const files = walkMdFiles("src/roadmap");
   if (files.length > 0) {
     const lines = files.map((f) => {
-      const fm = parseFrontmatter(f);
+      const fm = parseFrontmatter2(f);
       let line = `- ${f}`;
       if (fm.name) {
         line += ` \u2014 "${fm.name}"`;
@@ -4973,7 +5221,7 @@ async function runBrowserAutomation(task, context, opts) {
       );
     } catch {
     }
-    let lastBrowserCommandViewport;
+    let lastCapture = {};
     const result = await runSubAgent({
       system: getBrowserAutomationPrompt(),
       task,
@@ -4995,22 +5243,6 @@ async function runBrowserAutomation(task, context, opts) {
             return `Error setting up browser: ${err.message}`;
           }
         }
-        if (name === "screenshotFullPage") {
-          try {
-            return await captureAndAnalyzeScreenshot({
-              path: _input.path,
-              fullPage: true,
-              onLog,
-              model: resolveModel(
-                "imageAnalysis",
-                context.models,
-                context.model
-              )
-            });
-          } catch (err) {
-            return `Error taking screenshot: ${err.message}`;
-          }
-        }
         if (COMMON_READ_TOOL_NAMES.has(name) || name === readSpecTool.definition.name) {
           return executeTool(name, _input, context);
         }
@@ -5032,14 +5264,16 @@ async function runBrowserAutomation(task, context, opts) {
           try {
             const parsed = JSON.parse(result2);
             const screenshotSteps = (parsed.steps || []).filter(
-              (s) => s.command === "screenshotViewport" && s.result?.url
+              (s) => CAPTURE_COMMANDS.has(s.command) && s.result?.url
             );
             if (screenshotSteps.length > 0) {
-              const lastStep = screenshotSteps[screenshotSteps.length - 1];
-              lastBrowserCommandViewport = {
-                url: lastStep.result.url,
-                styleMap: lastStep.result.styleMap
-              };
+              for (const step of screenshotSteps) {
+                const kind = step.command === "screenshotFullPage" ? "fullPage" : "viewport";
+                lastCapture[kind] = {
+                  url: step.result.url,
+                  styleMap: step.result.styleMap
+                };
+              }
               const visionOverride = {
                 model: resolveModel(
                   "imageAnalysis",
@@ -5063,15 +5297,14 @@ async function runBrowserAutomation(task, context, opts) {
               );
               try {
                 const analyses = JSON.parse(batchResult);
-                let ai = 0;
-                for (const step of parsed.steps) {
-                  if (step.command === "screenshotViewport" && step.result?.url && ai < analyses.length) {
-                    step.result.analysis = analyses[ai]?.output?.analysis || analyses[ai]?.output || "";
-                    ai++;
+                screenshotSteps.forEach((step, i) => {
+                  if (i >= analyses.length) {
+                    return;
                   }
-                }
+                  step.result.analysis = analyses[i]?.output?.analysis || analyses[i]?.output || "";
+                });
               } catch {
-                log8.debug("Failed to parse batch analysis result", {
+                log9.debug("Failed to parse batch analysis result", {
                   batchResult
                 });
               }
@@ -5082,13 +5315,10 @@ async function runBrowserAutomation(task, context, opts) {
         }
         return result2;
       },
-      toolRegistry: context.toolRegistry,
-      captureArtifacts: ["screenshotFullPage"]
+      toolRegistry: context.toolRegistry
     });
     context.subAgentMessages?.set(context.toolCallId, result.messages);
-    const fullPage = result.artifacts?.screenshotFullPage;
-    const viewport = lastBrowserCommandViewport;
-    const preferred = opts?.capture === "viewport" ? viewport ?? fullPage : fullPage ?? viewport;
+    const preferred = opts?.capture === "viewport" ? lastCapture.viewport ?? lastCapture.fullPage : lastCapture.fullPage ?? lastCapture.viewport;
     return {
       text: result.text,
       ...preferred?.url ? { screenshot: { url: preferred.url, styleMap: preferred.styleMap } } : {}
@@ -5097,7 +5327,7 @@ async function runBrowserAutomation(task, context, opts) {
     release();
   }
 }
-var log8, browserAutomationTool;
+var log9, CAPTURE_COMMANDS, browserAutomationTool;
 var init_browserAutomation = __esm({
   "src/subagents/browserAutomation/index.ts"() {
     "use strict";
@@ -5113,10 +5343,11 @@ var init_browserAutomation = __esm({
     init_runMindstudioCli();
     init_surfaces();
     init_logger();
-    log8 = createLogger("browser-automation");
+    log9 = createLogger("browser-automation");
+    CAPTURE_COMMANDS = /* @__PURE__ */ new Set(["screenshotViewport", "screenshotFullPage"]);
     browserAutomationTool = {
-      clearable: true,
       definition: {
+        clearable: true,
         name: "runAutomatedBrowserTest",
         description: "Run an automated browser test against the live preview. Describe what to test \u2014 the agent figures out how. Use after meaningful changes to frontend code, to reproduce user-reported issues, or to test end-to-end flows. Never give it explicit values to use when filling out forms or creating accounts \u2014 it will use its own judgement (often it needs specific values to trigger dev-mode bypasses of things like login verification codes).",
         inputSchema: {
@@ -5147,7 +5378,58 @@ var init_browserAutomation = __esm({
 });
 
 // src/tools/code/screenshot.ts
-var screenshotTool;
+async function executeScreenshot(input, onLog, context) {
+  const fullPage = input.fullPage === true;
+  const model = resolveModel("imageAnalysis", context?.models, context?.model);
+  try {
+    if (input.imageUrl) {
+      return await captureAndAnalyzeScreenshot({
+        prompt: input.prompt,
+        image: input.imageUrl,
+        onLog,
+        model,
+        apiConfig: context?.apiConfig
+      });
+    }
+    if (input.instructions && context) {
+      const shotKind = fullPage ? "full-page" : "viewport";
+      const task = input.path ? `Navigate to "${input.path}", then: ${input.instructions}. After completing these steps, take a ${shotKind} screenshot.` : `${input.instructions}. After completing these steps, take a ${shotKind} screenshot.`;
+      const result = await runBrowserAutomation(task, context, {
+        capture: fullPage ? "fullPage" : "viewport"
+      });
+      if (!result.screenshot) {
+        return result.text;
+      }
+      return await streamScreenshotAnalysis({
+        image: result.screenshot.url,
+        prompt: input.prompt,
+        styleMap: result.screenshot.styleMap,
+        onLog,
+        model,
+        apiConfig: context?.apiConfig
+      });
+    }
+    const release = await acquireBrowserLock();
+    try {
+      return await captureAndAnalyzeScreenshot({
+        prompt: input.prompt,
+        path: input.path,
+        fullPage,
+        width: input.width,
+        height: input.height,
+        format: input.format,
+        onLog,
+        model,
+        apiConfig: context?.apiConfig
+      });
+    } finally {
+      release();
+    }
+  } catch (err) {
+    return `Error taking screenshot: ${err.message}`;
+  }
+}
+var screenshotDefinition, screenshotTool;
 var init_screenshot2 = __esm({
   "src/tools/code/screenshot.ts"() {
     "use strict";
@@ -5155,99 +5437,54 @@ var init_screenshot2 = __esm({
     init_browserLock();
     init_browserAutomation();
     init_surfaces();
-    screenshotTool = {
+    screenshotDefinition = {
       clearable: true,
-      definition: {
-        name: "screenshot",
-        description: "Capture a screenshot of the app preview and get a description of what's on screen. Choose `fullPage`: `false` captures just the visible viewport (fast \u2014 for a specific section the page is scrolled to), `true` captures the entire page top-to-bottom (slower \u2014 for overall composition or content past the fold). Captures the settled page state \u2014 it cannot catch animations, transitions, or transient state. Optionally provide specific questions about what you're looking for. Use a bulleted list to ask many questions at once. To ask additional questions about a screenshot you have already captured, pass its URL as imageUrl to skip recapture. If the screenshot requires interaction first (logging in, clicking a tab, dismissing a modal, scrolling to a section), use the instructions param to describe the steps. To render a fixed-size image such as an Open Graph share card, set `width` and `height` (e.g. 1200 \xD7 630) and `format: 'png'`: the tool navigates to `path`, clips to exactly those pixel dimensions, and returns the image URL.",
-        inputSchema: {
-          type: "object",
-          properties: {
-            fullPage: {
-              type: "boolean",
-              description: "true = full-height capture of the entire page; false = just the visible viewport. Pick based on whether you need the whole page or a specific section."
-            },
-            prompt: {
-              type: "string",
-              description: "Optional question about the screenshot. If omitted, returns a general description of what's visible."
-            },
-            imageUrl: {
-              type: "string",
-              description: "URL of an existing screenshot to analyze instead of capturing a new one. Use this for additional questions about a previous screenshot."
-            },
-            path: {
-              type: "string",
-              description: 'Navigate to this path before capturing (e.g. "/settings", "/dashboard"). If omitted, screenshots the current page.'
-            },
-            width: {
-              type: "number",
-              description: "Exact capture width in pixels. Set together with `height` to render a fixed-size image; clips to exactly this viewport instead of the default preview size."
-            },
-            height: {
-              type: "number",
-              description: "Exact capture height in pixels. Set together with `width`."
-            },
-            format: {
-              type: "string",
-              enum: ["png", "jpeg"],
-              description: "Output image format. Defaults to 'jpeg'. Use 'png' for crisp flat graphics like share cards, where JPEG artifacts show on sharp type and edges."
-            },
-            instructions: {
-              type: "string",
-              description: "If the screenshot you need requires interaction first (dismissing a modal, clicking a tab, filling out a form, navigating a flow, scrolling to a section, getting through a login/auth checkpoint), describe the steps to get there. A browser automation agent will follow these instructions, then capture per your `fullPage` choice \u2014 so with `fullPage: false` you can scroll to a section and capture just that viewport. It can bypass auth and get right to where it needs to be if you tell it to authenticate as a test user and give it the path/screen to start its test at. Never describe what names or values to use when applying the instructions - the browser automation agent must use its own values for it to work properly. If a specific auth role is required to access the content, be sure to note that - it can automatically assume it for the purpose of testing. Use only when interaction is required to *reach* the state you want to capture \u2014 log in, dismiss a modal, switch a tab, follow a route, scroll to a section. If your steps are exercising the app's functionality across multiple states (running flows, asserting behavior under interaction, multi-step QA), use `runAutomatedBrowserTest` instead."
-            }
+      name: "screenshot",
+      description: "Capture a screenshot of the app preview and get a description of what's on screen. Choose `fullPage`: `false` captures just the visible viewport (fast \u2014 for a specific section the page is scrolled to), `true` captures the entire page top-to-bottom (slower \u2014 for overall composition or content past the fold). Captures the settled page state \u2014 it cannot catch animations, transitions, or transient state. The analysis is not precise about every detail \u2014 for example it cannot reliably identify specific fonts by name, only describe what the letterforms look like. Optionally provide specific questions about what you're looking for. Use a bulleted list to ask many questions at once. To ask additional questions about a screenshot you have already captured, pass its URL as `imageUrl` to skip recapture; `imageUrl` also accepts the disk path of an image file (a user upload, a saved asset) to analyze that instead of the preview. If the screenshot requires interaction first (logging in, clicking a tab, dismissing a modal, scrolling to a section), use the instructions param to describe the steps. To render a fixed-size image such as an Open Graph share card, set `width` and `height` (e.g. 1200 \xD7 630) and `format: 'png'`: the tool navigates to `path`, clips to exactly those pixel dimensions, and returns the image URL.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          fullPage: {
+            type: "boolean",
+            description: "true = full-height capture of the entire page; false = just the visible viewport. Pick based on whether you need the whole page or a specific section."
           },
-          required: ["fullPage"]
-        }
-      },
-      async execute(input, context) {
-        const fullPage = input.fullPage === true;
-        const shotKind = fullPage ? "full-page" : "viewport";
-        try {
-          if (input.imageUrl) {
-            return await captureAndAnalyzeScreenshot({
-              prompt: input.prompt,
-              imageUrl: input.imageUrl,
-              onLog: context?.onLog,
-              model: resolveModel("imageAnalysis", context?.models, context?.model)
-            });
-          }
-          if (input.instructions && context) {
-            const task = input.path ? `Navigate to "${input.path}", then: ${input.instructions}. After completing these steps, take a ${shotKind} screenshot.` : `${input.instructions}. After completing these steps, take a ${shotKind} screenshot.`;
-            const result = await runBrowserAutomation(task, context, {
-              capture: fullPage ? "fullPage" : "viewport"
-            });
-            if (!result.screenshot) {
-              return result.text;
-            }
-            return await streamScreenshotAnalysis({
-              url: result.screenshot.url,
-              prompt: input.prompt,
-              styleMap: result.screenshot.styleMap,
-              onLog: context?.onLog,
-              model: resolveModel("imageAnalysis", context?.models, context?.model)
-            });
-          }
-          const release = await acquireBrowserLock();
-          try {
-            return await captureAndAnalyzeScreenshot({
-              prompt: input.prompt,
-              path: input.path,
-              fullPage,
-              width: input.width,
-              height: input.height,
-              format: input.format,
-              onLog: context?.onLog,
-              model: resolveModel("imageAnalysis", context?.models, context?.model)
-            });
-          } finally {
-            release();
+          prompt: {
+            type: "string",
+            description: "Optional question about the screenshot. If omitted, returns a general description of what's visible."
+          },
+          imageUrl: {
+            type: "string",
+            description: "An existing image to analyze instead of capturing a new one \u2014 the URL of a previous screenshot (for follow-up questions about it), or the path of an image file on disk such as a user upload. Local files are hosted automatically and the returned URL can be reused."
+          },
+          path: {
+            type: "string",
+            description: 'Navigate to this path before capturing (e.g. "/settings", "/dashboard"). If omitted, screenshots the current page.'
+          },
+          width: {
+            type: "number",
+            description: "Exact capture width in pixels. Set together with `height` to render a fixed-size image; clips to exactly this viewport instead of the default preview size."
+          },
+          height: {
+            type: "number",
+            description: "Exact capture height in pixels. Set together with `width`."
+          },
+          format: {
+            type: "string",
+            enum: ["png", "jpeg"],
+            description: "Output image format. Defaults to 'jpeg'. Use 'png' for crisp flat graphics like share cards, where JPEG artifacts show on sharp type and edges."
+          },
+          instructions: {
+            type: "string",
+            description: "If the screenshot you need requires interaction first (dismissing a modal, clicking a tab, filling out a form, navigating a flow, scrolling to a section, getting through a login/auth checkpoint), describe the steps to get there. A browser automation agent will follow these instructions, then capture per your `fullPage` choice \u2014 so with `fullPage: false` you can scroll to a section and capture just that viewport. It can bypass auth and get right to where it needs to be if you tell it to authenticate as a test user and give it the path/screen to start its test at. Never describe what names or values to use when applying the instructions - the browser automation agent must use its own values for it to work properly. If a specific auth role is required to access the content, be sure to note that - it can automatically assume it for the purpose of testing. Use only when interaction is required to *reach* the state you want to capture \u2014 log in, dismiss a modal, switch a tab, follow a route, scroll to a section. If your steps are exercising the app's functionality across multiple states (running flows, asserting behavior under interaction, multi-step QA), use `runAutomatedBrowserTest` instead."
           }
-        } catch (err) {
-          return `Error taking screenshot: ${err.message}`;
-        }
+        },
+        required: ["fullPage"]
       }
     };
+    screenshotTool = {
+      definition: screenshotDefinition,
+      execute: (input, context) => executeScreenshot(input, context?.onLog, context)
+    };
   }
 });
 
@@ -5344,9 +5581,9 @@ __export(analyzeDesign_exports, {
 async function execute3(input, onLog, context) {
   const url = input.url;
   const analysisPrompt = input.prompt || DESIGN_REFERENCE_PROMPT;
-  const isImageUrl = /\.(png|jpe?g|webp|gif|svg|avif)(\?|$)/i.test(url);
-  let imageUrl = url;
-  if (!isImageUrl) {
+  const isImage = /\.(png|jpe?g|webp|gif|svg|avif)(\?|$)/i.test(url);
+  let image = url;
+  if (!isImage) {
     const ss = await runMindstudioCliResult(
       [
         "screenshot-url",
@@ -5369,15 +5606,16 @@ async function execute3(input, onLog, context) {
     if (!ss.ok) {
       return `Could not screenshot ${url}: ${ss.value}`;
     }
-    imageUrl = ss.value;
+    image = ss.value;
   }
-  const analysis = await analyzeImage({
+  const analyzed = await analyzeImage({
     prompt: analysisPrompt,
-    imageUrl,
+    image,
+    apiConfig: context?.apiConfig,
     onLog,
     model: resolveModel("imageAnalysis", context?.models, context?.model)
   });
-  return JSON.stringify({ url: imageUrl, analysis });
+  return JSON.stringify({ url: analyzed.url, analysis: analyzed.analysis });
 }
 var DESIGN_REFERENCE_PROMPT, definition3;
 var init_analyzeDesign = __esm({
@@ -5412,13 +5650,13 @@ Respond only with your analysis as Markdown and absolutely no other text. Do not
     definition3 = {
       clearable: false,
       name: "analyzeDesign",
-      description: "Analyze the visual design of a website or image URL. Websites are automatically screenshotted first. Provides static image analysis only, will not capture animations or video. If no prompt is provided, performs a full design reference analysis (mood, color, typography, layout, distinctiveness). Provide a custom prompt to ask a specific design question instead. Use a bulleted list to ask many questions at once.",
+      description: "Analyze the visual design of a website, an image URL, or an image file on disk. Websites are automatically screenshotted first. Provides static image analysis only, will not capture animations or video. If no prompt is provided, performs a full design reference analysis (mood, color, typography, layout, distinctiveness). Provide a custom prompt to ask a specific design question instead. Use a bulleted list to ask many questions at once.",
       inputSchema: {
         type: "object",
         properties: {
           url: {
             type: "string",
-            description: "URL to analyze. Can be an image URL or a website URL (will be screenshotted)."
+            description: "What to analyze: a website URL (will be screenshotted), an image URL, or the path of an image file on disk (e.g. a reference the user uploaded, under src/.user-uploads/). Local files are hosted automatically and their URL comes back in the result."
           },
           prompt: {
             type: "string",
@@ -5438,17 +5676,17 @@ __export(analyzeImage_exports, {
   execute: () => execute4
 });
 async function execute4(input, onLog, context) {
-  const imageUrl = input.imageUrl;
   const prompt = buildScreenshotAnalysisPrompt({
     prompt: input.prompt
   });
-  const analysis = await analyzeImage({
+  const { url, analysis } = await analyzeImage({
     prompt,
-    imageUrl,
+    image: input.imageUrl,
+    apiConfig: context?.apiConfig,
     onLog,
     model: resolveModel("imageAnalysis", context?.models, context?.model)
   });
-  return JSON.stringify({ url: imageUrl, analysis });
+  return JSON.stringify({ url, analysis });
 }
 var definition4;
 var init_analyzeImage2 = __esm({
@@ -5460,13 +5698,16 @@ var init_analyzeImage2 = __esm({
     definition4 = {
       clearable: true,
       name: "analyzeImage",
-      description: "Analyze an image by URL using a vision model. Provides static image analysis only, will not capture animations or video. Returns an objective description of what is visible \u2014 shapes, colors, layout, text, artifacts. Use for factual inventory of image contents, not for subjective design judgment - the vision model providing the analysis has no sense of design. You are the design expert - use the analysis tool for factual inventory, then apply your own expertise for quality and suitability assessments. Optionally provide specific questions about what you're looking for. Use a bulleted list to ask many questions at once. If you are analyzing a screenshot of the app preview, you can reuse the same screenshot URL multiple times to ask multiple questions.",
+      description: "Analyze an image using a vision model. Provides static image analysis only, will not capture animations or video. Returns an objective description of what is visible \u2014 shapes, colors, layout, text, artifacts. Use for factual inventory of image contents, not for subjective design judgment - the vision model providing the analysis has no sense of design. You are the design expert - use the analysis tool for factual inventory, then apply your own expertise for quality and suitability assessments. Optionally provide specific questions about what you're looking for. Use a bulleted list to ask many questions at once. If you are analyzing a screenshot of the app preview, you can reuse the same screenshot URL multiple times to ask multiple questions.",
       inputSchema: {
         type: "object",
         properties: {
+          // Still `imageUrl` even though a path works: the builder renders this
+          // tool's thumbnail from `input.imageUrl` and deploys separately, so
+          // renaming the property would blank the view under version skew.
           imageUrl: {
             type: "string",
-            description: "The image URL to analyze."
+            description: "The image to analyze: either a URL, or the path of an image file on disk (e.g. a reference screenshot the user uploaded, under src/.user-uploads/). Local files are hosted automatically; the URL comes back in the result and can be reused for follow-up questions or embedded in a spec."
           },
           prompt: {
             type: "string",
@@ -5479,88 +5720,6 @@ var init_analyzeImage2 = __esm({
   }
 });
 
-// src/subagents/designExpert/tools/screenshot.ts
-var screenshot_exports = {};
-__export(screenshot_exports, {
-  definition: () => definition5,
-  execute: () => execute5
-});
-async function execute5(input, onLog, context) {
-  const fullPage = input.fullPage === true;
-  const shotKind = fullPage ? "full-page" : "viewport";
-  if (input.instructions && context) {
-    try {
-      const task = input.path ? `Navigate to "${input.path}", then: ${input.instructions}. After completing these steps, take a ${shotKind} screenshot.` : `${input.instructions}. After completing these steps, take a ${shotKind} screenshot.`;
-      const result = await runBrowserAutomation(task, context, {
-        capture: fullPage ? "fullPage" : "viewport"
-      });
-      if (!result.screenshot) {
-        return result.text;
-      }
-      return await streamScreenshotAnalysis({
-        url: result.screenshot.url,
-        prompt: input.prompt,
-        styleMap: result.screenshot.styleMap,
-        onLog,
-        model: resolveModel("imageAnalysis", context?.models, context?.model)
-      });
-    } catch (err) {
-      return `Error taking interactive screenshot: ${err.message}`;
-    }
-  }
-  const release = await acquireBrowserLock();
-  try {
-    return await captureAndAnalyzeScreenshot({
-      prompt: input.prompt,
-      path: input.path,
-      fullPage,
-      onLog,
-      model: resolveModel("imageAnalysis", context?.models, context?.model)
-    });
-  } catch (err) {
-    return `Error taking screenshot: ${err.message}`;
-  } finally {
-    release();
-  }
-}
-var definition5;
-var init_screenshot3 = __esm({
-  "src/subagents/designExpert/tools/screenshot.ts"() {
-    "use strict";
-    init_screenshot();
-    init_browserLock();
-    init_browserAutomation();
-    init_surfaces();
-    definition5 = {
-      clearable: true,
-      name: "screenshot",
-      description: "Capture a screenshot of the current app preview and get it back with visual analysis. Choose `fullPage`: `false` captures just the visible viewport (fast \u2014 use it to review a specific section the page is scrolled to), `true` captures the entire page top-to-bottom (slower \u2014 use it to review overall composition or a layout you can't see in one screen). Use to review the current state of the UI being built. Remember, the screenshot analysis is not overly precise - for example, it cannot reliably identify specific fonts by name \u2014 it can only describe what letterforms look like.",
-      inputSchema: {
-        type: "object",
-        properties: {
-          fullPage: {
-            type: "boolean",
-            description: "true = full-height capture of the entire page; false = just the visible viewport. Pick based on whether you need the whole page or a specific section."
-          },
-          prompt: {
-            type: "string",
-            description: "Optional specific question about the screenshot. Use a bulleted list to ask many questions at once."
-          },
-          path: {
-            type: "string",
-            description: 'Navigate to this path before capturing (e.g. "/settings"). If omitted, screenshots the current page.'
-          },
-          instructions: {
-            type: "string",
-            description: "If the screenshot you need requires interaction first (dismissing a modal, clicking a tab, filling out a form, scrolling to a specific section, getting through a login/auth checkpoint), describe the steps to get there. A browser automation agent will follow these instructions, then capture per your `fullPage` choice \u2014 so with `fullPage: false` you can scroll to a section and capture just that viewport. It can bypass auth and get right to where it needs to be if you tell it to authenticate as a test user and give it the path/screen to start at. Never describe what names or values to use when applying the instructions - the browser automation agent must use its own values for it to work properly. If a specific auth role is required to access the content, be sure to note that - it can automatically assume it for the purpose of testing."
-          }
-        },
-        required: ["fullPage"]
-      }
-    };
-  }
-});
-
 // src/subagents/designExpert/tools/images/enhancePrompt.ts
 async function enhanceImagePrompt(params) {
   const {
@@ -5627,14 +5786,15 @@ var init_enhancePrompt = __esm({
 async function generateImageAssets(opts) {
   const {
     prompts,
-    sourceImages,
     transparentBackground,
     enhancePrompts,
     onLog,
+    apiConfig,
     imageGenerationModel: genModel,
     imageAnalysisModel,
     imagePromptEnhancerModel
   } = opts;
+  const sourceImages = opts.sourceImages?.length ? await resolveImageRefs(opts.sourceImages, apiConfig) : void 0;
   const width = opts.width || 2048;
   const height = opts.height || 2048;
   const config = { width, height };
@@ -5740,10 +5900,10 @@ async function generateImageAssets(opts) {
       }
       const analysis = await analyzeImage({
         prompt: ANALYZE_PROMPT,
-        imageUrl: url,
+        image: url,
         onLog,
         model: imageAnalysisModel
-      });
+      }).then((r) => r.analysis).catch((err) => `Could not review this image: ${err.message}`);
       return {
         url,
         prompt: prompts[i],
@@ -5762,6 +5922,7 @@ var init_imageGenerator = __esm({
     "use strict";
     init_runMindstudioCli();
     init_analyzeImage();
+    init_uploadImage();
     init_enhancePrompt();
     ANALYZE_PROMPT = 'You are reviewing this image for a visual designer sourcing assets for a project. Describe: what the image depicts, the mood and color palette, how the lighting and composition work, any text present in the image, whether there are any issues (artifacts, distortions), and how it could be used in a layout for an app or website. Be concise and practical. Respond only with your analysis as Markdown (starting with the title "Asset Review") and absolutely no other text. Do not use emojis - use unicode if you need symbols.';
   }
@@ -5770,10 +5931,10 @@ var init_imageGenerator = __esm({
 // src/subagents/designExpert/tools/images/generateImages.ts
 var generateImages_exports = {};
 __export(generateImages_exports, {
-  definition: () => definition6,
-  execute: () => execute6
+  definition: () => definition5,
+  execute: () => execute5
 });
-async function execute6(input, onLog, context) {
+async function execute5(input, onLog, context) {
   return generateImageAssets({
     prompts: input.prompts,
     width: input.width,
@@ -5782,6 +5943,7 @@ async function execute6(input, onLog, context) {
     sourceImages: input.referenceImage ? [input.referenceImage] : void 0,
     enhancePrompts: true,
     onLog,
+    apiConfig: context?.apiConfig,
     imageGenerationModel: resolveModel(
       "imageGeneration",
       context?.models,
@@ -5799,13 +5961,13 @@ async function execute6(input, onLog, context) {
     )
   });
 }
-var definition6;
+var definition5;
 var init_generateImages = __esm({
   "src/subagents/designExpert/tools/images/generateImages.ts"() {
     "use strict";
     init_imageGenerator();
     init_surfaces();
-    definition6 = {
+    definition5 = {
       clearable: false,
       name: "generateImages",
       description: "Generate images. Returns CDN URLs with a quality analysis for each image. Produces high-quality results for everything from photorealistic images and abstract/creative visuals. Pass multiple prompts to generate in parallel. No need to analyze images separately after generating \u2014 the analysis is included.",
@@ -5821,7 +5983,7 @@ var init_generateImages = __esm({
           },
           referenceImage: {
             type: "string",
-            description: "Optional URL of a single reference image to guide the generation \u2014 for style, subject, character consistency, or composition. Your prompt still describes the desired result; the reference conditions it. Applies to every prompt in the batch."
+            description: "Optional single reference image to guide the generation \u2014 for style, subject, character consistency, or composition. Either a URL or the path of an image file on disk (e.g. a user upload under src/.user-uploads/). Your prompt still describes the desired result; the reference conditions it. Applies to every prompt in the batch."
           },
           width: {
             type: "number",
@@ -5845,10 +6007,10 @@ var init_generateImages = __esm({
 // src/subagents/designExpert/tools/images/editImages.ts
 var editImages_exports = {};
 __export(editImages_exports, {
-  definition: () => definition7,
-  execute: () => execute7
+  definition: () => definition6,
+  execute: () => execute6
 });
-async function execute7(input, onLog, context) {
+async function execute6(input, onLog, context) {
   return generateImageAssets({
     prompts: input.prompts,
     sourceImages: input.sourceImages,
@@ -5857,6 +6019,7 @@ async function execute7(input, onLog, context) {
     transparentBackground: input.transparentBackground,
     enhancePrompts: false,
     onLog,
+    apiConfig: context?.apiConfig,
     imageGenerationModel: resolveModel(
       "imageGeneration",
       context?.models,
@@ -5874,13 +6037,13 @@ async function execute7(input, onLog, context) {
     )
   });
 }
-var definition7;
+var definition6;
 var init_editImages = __esm({
   "src/subagents/designExpert/tools/images/editImages.ts"() {
     "use strict";
     init_imageGenerator();
     init_surfaces();
-    definition7 = {
+    definition6 = {
       clearable: false,
       name: "editImages",
       description: "Edit or transform existing images. Provide one or more source image URLs as reference and a prompt describing the desired edit. Use for compositing, style transfer, subject transformation, blending multiple references, or incorporating one or more references into something new. Returns CDN URLs with analysis.",
@@ -5899,7 +6062,7 @@ var init_editImages = __esm({
             items: {
               type: "string"
             },
-            description: "One or more source/reference image URLs. These are used as the basis for the edit \u2014 the AI will use them as reference for style, subject, or composition."
+            description: "One or more source/reference images, each a URL or the path of an image file on disk (e.g. a user upload under src/.user-uploads/). These are used as the basis for the edit \u2014 the AI will use them as reference for style, subject, or composition."
           },
           width: {
             type: "number",
@@ -5943,8 +6106,8 @@ var init_copyEditor = __esm({
     init_surfaces();
     BASE_PROMPT2 = readAsset("subagents/copyEditor", "prompt.md");
     copyEditorTool = {
-      clearable: false,
       definition: {
+        clearable: false,
         name: "copyEditor",
         description: "Hand it user-facing copy and it hands back a sharper version \u2014 better structured for its audience and free of the overused words, telltale constructions, and rhythms that make text read as AI-generated. Think of it as a design expert for words: it elevates how the copy communicates and strips the AI fingerprints, but it never invents facts or claims you didn't give it. Use it on anything users will read: in-app strings, empty states, errors, the Build Overview, deck copy, launch posts, Slack announcements. Readonly.",
         inputSchema: {
@@ -5995,18 +6158,18 @@ var init_copyEditor = __esm({
 // src/subagents/designExpert/tools/polishCopy.ts
 var polishCopy_exports = {};
 __export(polishCopy_exports, {
-  definition: () => definition8,
-  execute: () => execute8
+  definition: () => definition7,
+  execute: () => execute7
 });
-async function execute8(input, _onLog, context) {
+async function execute7(input, _onLog, context) {
   return copyEditorTool.execute(input, context);
 }
-var definition8;
+var definition7;
 var init_polishCopy = __esm({
   "src/subagents/designExpert/tools/polishCopy.ts"() {
     "use strict";
     init_copyEditor();
-    definition8 = {
+    definition7 = {
       clearable: false,
       name: "polishCopy",
       description: "Hand off any user-facing copy you've written \u2014 headlines, captions, labels, body text \u2014 and get back a sharper version: better built for its audience and free of the fingerprints that make writing read as AI. It elevates how the copy communicates without inventing facts or claims you didn't give it. Give it the text plus what it's for (where it appears, the audience).",
@@ -6043,16 +6206,19 @@ var init_tools4 = __esm({
     init_scrapeWebUrl();
     init_analyzeDesign();
     init_analyzeImage2();
-    init_screenshot3();
     init_generateImages();
     init_editImages();
     init_polishCopy();
+    init_screenshot2();
     tools = {
       searchGoogle: searchGoogle_exports,
       scrapeWebUrl: scrapeWebUrl_exports,
       analyzeDesign: analyzeDesign_exports,
       analyzeImage: analyzeImage_exports,
-      screenshot: screenshot_exports,
+      // Same tool the main agent offers, imported rather than reimplemented — the
+      // two used to be near-identical copies and had already drifted apart. Its core
+      // already takes (input, onLog, context), which is this registry's convention.
+      screenshot: { definition: screenshotDefinition, execute: executeScreenshot },
       generateImages: generateImages_exports,
       editImages: editImages_exports,
       polishCopy: polishCopy_exports
@@ -6070,7 +6236,7 @@ async function initOrgContext(config) {
     cached = await fetchRemyContext(config);
     const orgDefaultModels2 = filterModelPicks(cached?.defaultModels);
     setOrgDefaultModels(orgDefaultModels2);
-    log9.debug("org context loaded", {
+    log10.debug("org context loaded", {
       delegatedAvailable: cached?.auth?.delegatedAvailable ?? false,
       requireDelegatedOnly: cached?.auth?.requireDelegatedOnly ?? false,
       hasOrgName: !!cached?.org?.name,
@@ -6079,7 +6245,7 @@ async function initOrgContext(config) {
   } catch (err) {
     cached = null;
     setOrgDefaultModels({});
-    log9.debug("org context init failed", { error: err.message });
+    log10.debug("org context init failed", { error: err.message });
   }
 }
 function getOrgContext() {
@@ -6115,20 +6281,20 @@ function renderOrgContextBlock() {
   lines.push("</org_context>");
   return lines.join("\n");
 }
-var log9, cached;
+var log10, cached;
 var init_orgContext = __esm({
   "src/orgContext.ts"() {
     "use strict";
     init_api();
     init_surfaces();
     init_logger();
-    log9 = createLogger("orgContext");
+    log10 = createLogger("orgContext");
     cached = null;
   }
 });
 
 // src/subagents/designExpert/data/sampleCache.ts
-import fs16 from "fs";
+import fs17 from "fs";
 function generateIndices(poolSize, sampleSize) {
   const n = Math.min(sampleSize, poolSize);
   const indices = Array.from({ length: poolSize }, (_, i) => i);
@@ -6140,14 +6306,14 @@ function generateIndices(poolSize, sampleSize) {
 }
 function load() {
   try {
-    return JSON.parse(fs16.readFileSync(SAMPLE_FILE, "utf-8"));
+    return JSON.parse(fs17.readFileSync(SAMPLE_FILE, "utf-8"));
   } catch {
     return null;
   }
 }
 function save(indices) {
   try {
-    fs16.writeFileSync(SAMPLE_FILE, JSON.stringify(indices));
+    fs17.writeFileSync(SAMPLE_FILE, JSON.stringify(indices));
   } catch {
   }
 }
@@ -6497,8 +6663,8 @@ Visual design expert. Describe the situation and what you need \u2014 the agent
       editFileTool.definition
     ];
     designExpertTool = {
-      clearable: false,
       definition: {
+        clearable: false,
         name: "visualDesignExpert",
         description: DESCRIPTION,
         inputSchema: {
@@ -6593,23 +6759,23 @@ var init_tools5 = __esm({
 });
 
 // src/subagents/productVision/executor.ts
-import fs17 from "fs";
-import path9 from "path";
-function resolve(filePath) {
-  return path9.join(ROADMAP_DIR, filePath);
+import fs18 from "fs";
+import path10 from "path";
+function resolve2(filePath) {
+  return path10.join(ROADMAP_DIR, filePath);
 }
 async function executeVisionTool(name, input, context) {
   switch (name) {
     case "writeFile": {
-      const filePath = resolve(input.path);
+      const filePath = resolve2(input.path);
       try {
-        fs17.mkdirSync(ROADMAP_DIR, { recursive: true });
+        fs18.mkdirSync(ROADMAP_DIR, { recursive: true });
         let oldContent = null;
         try {
-          oldContent = fs17.readFileSync(filePath, "utf-8");
+          oldContent = fs18.readFileSync(filePath, "utf-8");
         } catch {
         }
-        fs17.writeFileSync(filePath, input.content, "utf-8");
+        fs18.writeFileSync(filePath, input.content, "utf-8");
         const lineCount = input.content.split("\n").length;
         const label = oldContent !== null ? "Wrote" : "Created";
         return `${label} ${filePath} (${lineCount} lines)
@@ -6619,13 +6785,13 @@ ${unifiedDiff(filePath, oldContent ?? "", input.content)}`;
       }
     }
     case "deleteFile": {
-      const filePath = resolve(input.path);
+      const filePath = resolve2(input.path);
       try {
-        if (!fs17.existsSync(filePath)) {
+        if (!fs18.existsSync(filePath)) {
           return `Error: ${filePath} does not exist`;
         }
-        const oldContent = fs17.readFileSync(filePath, "utf-8");
-        fs17.unlinkSync(filePath);
+        const oldContent = fs18.readFileSync(filePath, "utf-8");
+        fs18.unlinkSync(filePath);
         return `Deleted ${filePath}
 ${unifiedDiff(filePath, oldContent, "")}`;
       } catch (err) {
@@ -6636,11 +6802,11 @@ ${unifiedDiff(filePath, oldContent, "")}`;
       if (!context) {
         return "Error: writePitchDeck requires execution context for design expert delegation";
       }
-      const filePath = resolve("pitch.html");
+      const filePath = resolve2("pitch.html");
       try {
-        fs17.mkdirSync(ROADMAP_DIR, { recursive: true });
-        const exists = fs17.existsSync(filePath);
-        const before = exists ? fs17.statSync(filePath).mtimeMs : null;
+        fs18.mkdirSync(ROADMAP_DIR, { recursive: true });
+        const exists = fs18.existsSync(filePath);
+        const before = exists ? fs18.statSync(filePath).mtimeMs : null;
         const delivery = exists ? `### Your deliverable
 The pitch deck already exists at \`${filePath}\`. Read it, then update it for the new <pitch_content>, keeping the presentation scaffolding intact \u2014 change only what needs to change.
 
@@ -6670,11 +6836,11 @@ Maintain the bones of the presentation scaffolding. Always keep the progress bar
 ${delivery}`;
         const result = await runDesignExpertRender({ task }, context);
         context.subAgentMessages?.set(context.toolCallId, result.messages);
-        if (!fs17.existsSync(filePath)) {
+        if (!fs18.existsSync(filePath)) {
           return `Error: the design expert did not write ${filePath}. Its reply was:
 ${result.text}`;
         }
-        if (before !== null && fs17.statSync(filePath).mtimeMs === before) {
+        if (before !== null && fs18.statSync(filePath).mtimeMs === before) {
           return `Error: the pitch deck at ${filePath} was not modified. The design expert's reply was:
 ${result.text}`;
         }
@@ -6740,8 +6906,8 @@ var init_productVision = __esm({
     init_history();
     init_surfaces();
     productVisionTool = {
-      clearable: false,
       definition: {
+        clearable: false,
         name: "productVision",
         description: "Owns the product roadmap. Reads spec and roadmap files automatically. Creates, updates, and deletes roadmap items in src/roadmap/. Describe the situation and what needs to happen.",
         inputSchema: {
@@ -6872,8 +7038,8 @@ var init_codeSanityCheck = __esm({
     init_surfaces();
     BASE_PROMPT4 = readAsset("subagents/codeSanityCheck", "prompt.md");
     codeSanityCheckTool = {
-      clearable: false,
       definition: {
+        clearable: false,
         name: "codeSanityCheck",
         description: 'Quick sanity check on an approach before building. Reviews architecture, package choices, and flags potential issues. Usually responds with "looks good." Occasionally catches something important. Readonly \u2014 can search the web and read code but cannot modify anything.',
         inputSchema: {
@@ -6977,9 +7143,9 @@ ${readAsset(
     )}
 </mindstudio_flavored_markdown_spec_docs>`;
     specSyncTool = {
-      clearable: false,
       backgroundOnly: true,
       definition: {
+        clearable: false,
         name: "specSync",
         description: "Reconcile the spec to bring it in line with code changes you have made. Provide a brief, bulleted list of what changed and why; it finds the affected spec sections and updates them to match. Always runs in the background \u2014 it returns immediately and reports back when done.",
         inputSchema: {
@@ -7054,8 +7220,8 @@ var init_scrapeWebUrl2 = __esm({
     init_runMindstudioCli();
     init_runCli();
     scrapeWebUrlTool = {
-      clearable: false,
       definition: {
+        clearable: false,
         name: "scrapeWebUrl",
         description: "Scrape the content of a web page. Returns the HTML of the page as markdown text. Optionally capture a screenshot if you need see the visual design. Use this when you need to fetch or analyze content from a website",
         inputSchema: {
@@ -7100,7 +7266,7 @@ var init_scrapeWebUrl2 = __esm({
 });
 
 // src/tools/spec/writeBuildOverview.ts
-import fs18 from "fs";
+import fs19 from "fs";
 function initialDelivery() {
   return `### Your deliverable
 Write the complete Build Overview to \`${OVERVIEW_FILE}\`. The file does not exist yet \u2014 start from this scaffold, which carries the technical hygiene for the iframed render context (keep the viewport meta and the reset). Layout, sections, type, and styling are yours to compose.
@@ -7162,8 +7328,8 @@ The copy in <overview_copy> is final \u2014 it was authored and edited before it
 </body>
 </html>`;
     buildOverviewTool = {
-      clearable: false,
       definition: {
+        clearable: false,
         name: "writeBuildOverview",
         description: "Generate or refresh the Build Overview \u2014 the project's home page in the Spec tab: a single-page, plain-language reference of everything the app actually contains, including the parts the user can't see (data stores, backend operations, access and roles, background jobs, seeded scenarios, the design system). You author the full copy: read the manifest and spec and state, plainly and exactly, what genuinely exists \u2014 real names and accurate counts \u2014 in calm, declarative, present-tense outcome language, with no persuasion or hype. Describe only what exists. Pass the complete copy as `content`; the design expert lays it out and skins it to the app's brand using your copy verbatim \u2014 it typesets your words, it does not rewrite them, so polish the copy before you pass it. Generate it at the end of a build and refresh it after meaningful work.",
         inputSchema: {
@@ -7185,7 +7351,7 @@ The copy in <overview_copy> is final \u2014 it was authored and edited before it
         if (!content) {
           return "Error: writeBuildOverview requires non-empty `content` (the overview copy).";
         }
-        const exists = fs18.existsSync(OVERVIEW_FILE);
+        const exists = fs19.existsSync(OVERVIEW_FILE);
         const task = `<overview_copy>${content}</overview_copy>
 
 ${DESIGN_BRIEF}
@@ -7203,7 +7369,7 @@ ${exists ? refreshDelivery() : initialDelivery()}`;
           }
           const result = await runDesignExpertRender({ task }, context);
           context.subAgentMessages?.set(context.toolCallId, result.messages);
-          if (!fs18.existsSync(OVERVIEW_FILE)) {
+          if (!fs19.existsSync(OVERVIEW_FILE)) {
             return `Error: the design expert did not write ${OVERVIEW_FILE}. Its reply was:
 ${result.text}`;
           }
@@ -7233,7 +7399,7 @@ function executeTool(name, input, context) {
   }
   return tool.execute(input, context);
 }
-var ALL_TOOLS, CLEARABLE_TOOLS, SUBAGENT_TOOL_NAMES;
+var ALL_TOOLS, SUBAGENT_TOOL_NAMES;
 var init_tools8 = __esm({
   "src/tools/index.ts"() {
     "use strict";
@@ -7251,6 +7417,7 @@ var init_tools8 = __esm({
     init_searchGoogle();
     init_setProjectMetadata();
     init_compactConversation();
+    init_loadSkill();
     init_readFile();
     init_writeFile();
     init_editFile();
@@ -7315,11 +7482,11 @@ var init_tools8 = __esm({
       browserAutomationTool,
       // LSP
       lspDiagnosticsTool,
-      restartProcessTool
+      restartProcessTool,
+      // Appended rather than grouped: position is part of the cache prefix, so a
+      // new tool goes at the end to leave every existing session's prefix intact.
+      loadSkillTool
     ];
-    CLEARABLE_TOOLS = new Set(
-      ALL_TOOLS.filter((t) => t.clearable).map((t) => t.definition.name)
-    );
     SUBAGENT_TOOL_NAMES = /* @__PURE__ */ new Set([
       "visualDesignExpert",
       "productVision",
@@ -7542,35 +7709,35 @@ var init_errors = __esm({
 });
 
 // src/brandExtraction/index.ts
-import fs19 from "fs";
-import path10 from "path";
+import fs20 from "fs";
+import path11 from "path";
 import { createHash } from "crypto";
 async function runExtraction(apiConfig, model) {
   const inputHash = computeInputHash();
   const cached3 = readCache();
   if (cached3 && cached3.inputHash === inputHash) {
-    log10.debug("Brand inputs unchanged \u2014 skipping extraction", { inputHash });
+    log11.debug("Brand inputs unchanged \u2014 skipping extraction", { inputHash });
     return null;
   }
-  log10.info("Extracting brand", { inputHash });
+  log11.info("Extracting brand", { inputHash });
   const brand = await extractBrand(apiConfig, model);
   if (!brand) {
-    log10.warn("Brand extraction failed \u2014 leaving cache untouched");
+    log11.warn("Brand extraction failed \u2014 leaving cache untouched");
     return null;
   }
   persistBrand(brand, inputHash);
-  log10.info("Brand persisted", { inputHash });
+  log11.info("Brand persisted", { inputHash });
   return brand;
 }
 function isDedicatedBrandFile(filePath) {
-  if (filePath.split(path10.sep).includes("@brand")) {
+  if (filePath.split(path11.sep).includes("@brand")) {
     return true;
   }
-  const { type } = parseFrontmatter2(filePath);
+  const { type } = parseFrontmatter3(filePath);
   return type.startsWith("design/color") || type.startsWith("design/typography");
 }
 function isBrandRelevant(filePath) {
-  return filePath === path10.join("src", "app.md") || isDedicatedBrandFile(filePath);
+  return filePath === path11.join("src", "app.md") || isDedicatedBrandFile(filePath);
 }
 function computeInputHash() {
   const entries = [];
@@ -7592,7 +7759,7 @@ function sha256(input) {
 }
 function readSafe(filePath) {
   try {
-    return fs19.readFileSync(filePath, "utf-8");
+    return fs20.readFileSync(filePath, "utf-8");
   } catch {
     return "";
   }
@@ -7618,9 +7785,9 @@ function readBrandManifest() {
 function walkMdFiles2(dir) {
   const results = [];
   try {
-    const entries = fs19.readdirSync(dir, { withFileTypes: true });
+    const entries = fs20.readdirSync(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const full = path10.join(dir, entry.name);
+      const full = path11.join(dir, entry.name);
       if (entry.isDirectory()) {
         results.push(...walkMdFiles2(full));
       } else if (entry.name.endsWith(".md")) {
@@ -7631,9 +7798,9 @@ function walkMdFiles2(dir) {
   }
   return results.sort();
 }
-function parseFrontmatter2(filePath) {
+function parseFrontmatter3(filePath) {
   try {
-    const content = fs19.readFileSync(filePath, "utf-8");
+    const content = fs20.readFileSync(filePath, "utf-8");
     const match = content.match(/^---\n([\s\S]*?)\n---/);
     if (!match) {
       return { type: "" };
@@ -7648,7 +7815,7 @@ function parseFrontmatter2(filePath) {
 async function extractBrand(apiConfig, model) {
   const corpus = buildCorpus();
   if (!corpus.trim()) {
-    log10.debug("No spec corpus \u2014 emitting empty brand");
+    log11.debug("No spec corpus \u2014 emitting empty brand");
     return { version: 1 };
   }
   let responseText = "";
@@ -7679,17 +7846,17 @@ async function extractBrand(apiConfig, model) {
           toolNames: []
         });
       } else if (event.type === "error") {
-        log10.error("Brand extraction stream error", { error: event.error });
+        log11.error("Brand extraction stream error", { error: event.error });
         return null;
       }
     }
   } catch (err) {
-    log10.error("Brand extraction threw", { error: err?.message });
+    log11.error("Brand extraction threw", { error: err?.message });
     return null;
   }
   const parsed = parseJsonResponse(responseText);
   if (!parsed) {
-    log10.warn("Brand extraction returned unparseable JSON", {
+    log11.warn("Brand extraction returned unparseable JSON", {
       preview: responseText.slice(0, 200)
     });
     return null;
@@ -7841,14 +8008,14 @@ function pickFont(raw) {
 }
 function persistBrand(brand, inputHash) {
   const tmp = `${BRAND_FILE}.tmp`;
-  fs19.writeFileSync(tmp, JSON.stringify(brand, null, 2), "utf-8");
-  fs19.renameSync(tmp, BRAND_FILE);
+  fs20.writeFileSync(tmp, JSON.stringify(brand, null, 2), "utf-8");
+  fs20.renameSync(tmp, BRAND_FILE);
   const cache = { inputHash, generatedAt: Date.now() };
-  fs19.writeFileSync(CACHE_FILE, JSON.stringify(cache, null, 2), "utf-8");
+  fs20.writeFileSync(CACHE_FILE, JSON.stringify(cache, null, 2), "utf-8");
 }
 function readCache() {
   try {
-    const raw = fs19.readFileSync(CACHE_FILE, "utf-8");
+    const raw = fs20.readFileSync(CACHE_FILE, "utf-8");
     const parsed = JSON.parse(raw);
     if (parsed && typeof parsed.inputHash === "string" && typeof parsed.generatedAt === "number") {
       return parsed;
@@ -7858,7 +8025,7 @@ function readCache() {
     return null;
   }
 }
-var log10, EXTRACT_PROMPT, BRAND_FILE, CACHE_FILE, HEAD_SLICE_CHARS, BRAND_CORPUS_CHAR_LIMIT;
+var log11, EXTRACT_PROMPT, BRAND_FILE, CACHE_FILE, HEAD_SLICE_CHARS, BRAND_CORPUS_CHAR_LIMIT;
 var init_brandExtraction = __esm({
   "src/brandExtraction/index.ts"() {
     "use strict";
@@ -7866,7 +8033,7 @@ var init_brandExtraction = __esm({
     init_assets();
     init_logger();
     init_usageLedger();
-    log10 = createLogger("brandExtraction");
+    log11 = createLogger("brandExtraction");
     EXTRACT_PROMPT = readAsset("brandExtraction", "extract.md");
     BRAND_FILE = ".remy-brand.json";
     CACHE_FILE = ".remy-brand.cache.json";
@@ -7883,7 +8050,7 @@ function triggerBrandExtraction(apiConfig, model) {
   }
   inflight = true;
   void runExtraction(apiConfig, model).catch((err) => {
-    log11.error("Brand extraction failed", { error: err?.message });
+    log12.error("Brand extraction failed", { error: err?.message });
   }).finally(() => {
     inflight = false;
     if (dirty) {
@@ -7892,13 +8059,13 @@ function triggerBrandExtraction(apiConfig, model) {
     }
   });
 }
-var log11, inflight, dirty;
+var log12, inflight, dirty;
 var init_trigger2 = __esm({
   "src/brandExtraction/trigger.ts"() {
     "use strict";
     init_brandExtraction();
     init_logger();
-    log11 = createLogger("brandExtraction:trigger");
+    log12 = createLogger("brandExtraction:trigger");
     inflight = false;
     dirty = false;
   }
@@ -7941,12 +8108,11 @@ async function runTurn(params) {
     onBackgroundComplete
   } = params;
   const tools2 = getToolDefinitions(onboardingState);
-  const excludeToolsFromClearing = tools2.filter((t) => !CLEARABLE_TOOLS.has(t.name)).map((t) => t.name);
   const buildModelOverride = buildModel ? filterModelPicks({ parent: buildModel }).parent : void 0;
   const baseline = resolveModel("parent", state.models, model);
   const parentModel = buildModelOverride ?? baseline;
   const modelOverride = buildModelOverride && buildModelOverride !== baseline ? { from: baseline } : void 0;
-  log12.info("Turn started", {
+  log13.info("Turn started", {
     requestId,
     model,
     buildModel: buildModelOverride,
@@ -8117,7 +8283,6 @@ async function runTurn(params) {
           system,
           messages: cleanMessagesForApi(state.messages),
           tools: tools2,
-          excludeToolsFromClearing,
           signal
         },
         {
@@ -8209,7 +8374,7 @@ async function runTurn(params) {
             const acc = toolInputAccumulators.get(event.id);
             const wasStreamed = acc?.started ?? false;
             const isInputStreaming = !!tool?.streaming?.partialInput;
-            log12.info("Tool received", {
+            log13.info("Tool received", {
               requestId,
               toolCallId: event.id,
               name: event.name
@@ -8332,7 +8497,7 @@ async function runTurn(params) {
       });
       return;
     }
-    log12.info("Tools executing", {
+    log13.info("Tools executing", {
       requestId,
       count: toolCalls.length,
       tools: toolCalls.map((tc) => tc.name)
@@ -8379,7 +8544,7 @@ async function runTurn(params) {
             let result;
             if (EXTERNAL_TOOLS.has(tc.name) && resolveExternalTool) {
               saveSession(state);
-              log12.info("Waiting for external tool result", {
+              log13.info("Waiting for external tool result", {
                 requestId,
                 toolCallId: tc.id,
                 name: tc.name
@@ -8447,7 +8612,7 @@ async function runTurn(params) {
         if (!isBackgroundCall(tc)) {
           toolRegistry?.unregister(tc.id);
         }
-        log12.info("Tool completed", {
+        log13.info("Tool completed", {
           requestId,
           toolCallId: tc.id,
           name: tc.name,
@@ -8506,7 +8671,7 @@ async function runTurn(params) {
     }
   }
 }
-var log12, BRAND_TRIGGERING_TOOLS, EXTERNAL_TOOLS, USER_BLOCKING_EXTERNAL_TOOLS;
+var log13, BRAND_TRIGGERING_TOOLS, EXTERNAL_TOOLS, USER_BLOCKING_EXTERNAL_TOOLS;
 var init_agent = __esm({
   "src/agent.ts"() {
     "use strict";
@@ -8519,13 +8684,12 @@ var init_agent = __esm({
     init_statusWatcher();
     init_errors();
     init_cleanMessages();
-    init_tools8();
     init_sentinel();
     init_trigger2();
     init_surfaces();
     init_toolRegistry();
     init_toolResultCap();
-    log12 = createLogger("agent");
+    log13 = createLogger("agent");
     BRAND_TRIGGERING_TOOLS = /* @__PURE__ */ new Set(["writeSpec", "editSpec"]);
     EXTERNAL_TOOLS = /* @__PURE__ */ new Set([
       "promptUser",
@@ -8547,8 +8711,8 @@ var init_agent = __esm({
 });
 
 // src/prompt/static/projectContext.ts
-import fs20 from "fs";
-import path11 from "path";
+import fs21 from "fs";
+import path12 from "path";
 function loadProjectRoot() {
   return `
 ## Project Root
@@ -8558,7 +8722,7 @@ File paths are relative to this directory. Every tool operates here and bash com
 }
 function loadProjectManifest() {
   try {
-    const manifest = fs20.readFileSync("mindstudio.json", "utf-8");
+    const manifest = fs21.readFileSync("mindstudio.json", "utf-8");
     return `
 ## Project Manifest (mindstudio.json)
 \`\`\`json
@@ -8576,7 +8740,7 @@ function loadSpecFileMetadata() {
     }
     const entries = [];
     for (const filePath of files) {
-      const { name, description, type } = parseFrontmatter3(filePath);
+      const { name, description, type } = parseFrontmatter4(filePath);
       let line = `- ${filePath}`;
       if (name) {
         line += ` \u2014 "${name}"`;
@@ -8599,9 +8763,9 @@ ${entries.join("\n")}`;
 function walkMdFiles3(dir) {
   const results = [];
   try {
-    const entries = fs20.readdirSync(dir, { withFileTypes: true });
+    const entries = fs21.readdirSync(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const full = path11.join(dir, entry.name);
+      const full = path12.join(dir, entry.name);
       if (entry.isDirectory()) {
         results.push(...walkMdFiles3(full));
       } else if (entry.name.endsWith(".md")) {
@@ -8612,9 +8776,9 @@ function walkMdFiles3(dir) {
   }
   return results.sort();
 }
-function parseFrontmatter3(filePath) {
+function parseFrontmatter4(filePath) {
   try {
-    const content = fs20.readFileSync(filePath, "utf-8");
+    const content = fs21.readFileSync(filePath, "utf-8");
     const match = content.match(/^---\n([\s\S]*?)\n---/);
     if (!match) {
       return { name: "", description: "", type: "" };
@@ -8630,7 +8794,7 @@ function parseFrontmatter3(filePath) {
 }
 function loadPlanStatus(onboardingState) {
   try {
-    const content = fs20.readFileSync(".remy-plan.md", "utf-8");
+    const content = fs21.readFileSync(".remy-plan.md", "utf-8");
     const match = content.match(/^---\n([\s\S]*?)\n---/);
     const status = match?.[1]?.match(/^status:\s*(.+)$/m)?.[1]?.trim();
     if (status === "pending" && onboardingState === "intake") {
@@ -8658,7 +8822,7 @@ The user has approved your implementation plan in .remy-plan.md. You may referen
 }
 function loadProjectFileListing() {
   try {
-    const entries = fs20.readdirSync(".", { withFileTypes: true });
+    const entries = fs21.readdirSync(".", { withFileTypes: true });
     const listing = entries.filter((e) => e.name !== ".git" && e.name !== "node_modules").sort((a, b) => {
       if (a.isDirectory() && !b.isDirectory()) {
         return -1;
@@ -8738,18 +8902,6 @@ Current date: ${now}
   {{compiled/design.md}}
   </design>
 
-  <building_agent_interfaces>
-  {{compiled/agent-interfaces.md}}
-  </building_agent_interfaces>
-
-  <building_mcp_interfaces>
-  {{compiled/mcp-interfaces.md}}
-  </building_mcp_interfaces>
-
-  <media_cdn>
-  {{compiled/media-cdn.md}}
-  </media_cdn>
-
   <app_files>
   {{compiled/files.md}}
   </app_files>
@@ -8767,10 +8919,10 @@ Current date: ${now}
   </secrets>
 </platform_docs>
 
+${loadSkillsCatalog()}
+
 <mindstudio_agent_sdk_docs>
   {{compiled/sdk-actions.md}}
-
-  {{compiled/task-agents.md}}
 </mindstudio_agent_sdk_docs>
 
 <mindstudio_flavored_markdown_spec_docs>
@@ -8841,20 +8993,21 @@ var init_prompt4 = __esm({
     init_assets();
     init_projectContext();
     init_orgContext();
+    init_catalog();
   }
 });
 
 // src/config.ts
-import fs21 from "fs";
-import path12 from "path";
+import fs22 from "fs";
+import path13 from "path";
 import os from "os";
 function loadConfigFile() {
   try {
-    const raw = fs21.readFileSync(CONFIG_PATH, "utf-8");
-    log13.debug("Loaded config file", { path: CONFIG_PATH });
+    const raw = fs22.readFileSync(CONFIG_PATH, "utf-8");
+    log14.debug("Loaded config file", { path: CONFIG_PATH });
     return JSON.parse(raw);
   } catch (err) {
-    log13.debug("No config file found", {
+    log14.debug("No config file found", {
       path: CONFIG_PATH,
       error: err.message
     });
@@ -8869,13 +9022,13 @@ function resolveConfig(flags2) {
   const baseUrl2 = flags2?.baseUrl || process.env.MINDSTUDIO_BASE_URL || env?.apiBaseUrl || DEFAULT_BASE_URL;
   const appId = process.env.MINDSTUDIO_APP_ID || void 0;
   if (!apiKey) {
-    log13.error("No API key found");
+    log14.error("No API key found");
     throw new Error(
       "No API key found. Set MINDSTUDIO_API_KEY or configure ~/.mindstudio-local-tunnel/config.json."
     );
   }
   const keySource = flags2?.apiKey ? "cli flag" : process.env.MINDSTUDIO_API_KEY ? "env var" : "config file";
-  log13.info("Config resolved", {
+  log14.info("Config resolved", {
     baseUrl: baseUrl2,
     keySource,
     environment: activeEnv,
@@ -8883,13 +9036,13 @@ function resolveConfig(flags2) {
   });
   return { apiKey, baseUrl: baseUrl2, appId };
 }
-var log13, CONFIG_PATH, DEFAULT_BASE_URL;
+var log14, CONFIG_PATH, DEFAULT_BASE_URL;
 var init_config = __esm({
   "src/config.ts"() {
     "use strict";
     init_logger();
-    log13 = createLogger("config");
-    CONFIG_PATH = path12.join(
+    log14 = createLogger("config");
+    CONFIG_PATH = path13.join(
       os.homedir(),
       ".mindstudio-local-tunnel",
       "config.json"
@@ -8901,11 +9054,11 @@ var init_config = __esm({
 // src/headless/attachments.ts
 import { mkdirSync, existsSync } from "fs";
 import { writeFile } from "fs/promises";
-import { basename, join, extname } from "path";
+import { basename as basename2, join, extname as extname2 } from "path";
 function filenameFromUrl(url) {
   try {
     const pathname = new URL(url).pathname;
-    const name = basename(pathname);
+    const name = basename2(pathname);
     return name && name !== "/" ? decodeURIComponent(name) : `upload-${Date.now()}`;
   } catch {
     return `upload-${Date.now()}`;
@@ -8916,7 +9069,7 @@ function resolveUniqueFilename(name, claimed) {
   if (isFree(name)) {
     return name;
   }
-  const ext = extname(name);
+  const ext = extname2(name);
   const base = name.slice(0, name.length - ext.length);
   let counter = 1;
   while (!isFree(`${base}-${counter}${ext}`)) {
@@ -8926,7 +9079,7 @@ function resolveUniqueFilename(name, claimed) {
 }
 function isImageAttachment(att) {
   const name = att.filename || filenameFromUrl(att.url);
-  return IMAGE_EXTENSIONS.has(extname(name).toLowerCase());
+  return IMAGE_EXTENSIONS.has(extname2(name).toLowerCase());
 }
 async function persistAttachments(attachments) {
   const nonVoice = attachments.filter((a) => !a.isVoice);
@@ -8955,7 +9108,7 @@ async function persistAttachments(attachments) {
       }
       const buffer = Buffer.from(await res.arrayBuffer());
       await writeFile(localPath, buffer);
-      log14.info("Attachment saved", {
+      log15.info("Attachment saved", {
         filename: name,
         path: localPath,
         bytes: buffer.length
@@ -8969,7 +9122,7 @@ async function persistAttachments(attachments) {
           if (textRes.ok) {
             extractedTextPath = `${localPath}.txt`;
             await writeFile(extractedTextPath, await textRes.text(), "utf-8");
-            log14.info("Extracted text saved", { path: extractedTextPath });
+            log15.info("Extracted text saved", { path: extractedTextPath });
           }
         } catch {
         }
@@ -9014,12 +9167,12 @@ function buildUploadHeader(results) {
   return `[Uploaded files]
 ${lines.join("\n")}`;
 }
-var log14, UPLOADS_DIR, IMAGE_EXTENSIONS;
+var log15, UPLOADS_DIR, IMAGE_EXTENSIONS;
 var init_attachments = __esm({
   "src/headless/attachments.ts"() {
     "use strict";
     init_logger();
-    log14 = createLogger("headless:attachments");
+    log15 = createLogger("headless:attachments");
     UPLOADS_DIR = "src/.user-uploads";
     IMAGE_EXTENSIONS = /* @__PURE__ */ new Set([".png", ".jpg", ".jpeg", ".gif", ".webp"]);
   }
@@ -9233,7 +9386,7 @@ var headless_exports = {};
 __export(headless_exports, {
   HeadlessSession: () => HeadlessSession
 });
-var log15, EXTERNAL_TOOL_TIMEOUT_MS, USER_FACING_TOOLS, FORCED_COMPACTION_THRESHOLD_TOKENS, HeadlessSession;
+var log16, EXTERNAL_TOOL_TIMEOUT_MS, USER_FACING_TOOLS, FORCED_COMPACTION_THRESHOLD_TOKENS, HeadlessSession;
 var init_headless = __esm({
   "src/headless/index.ts"() {
     "use strict";
@@ -9254,7 +9407,7 @@ var init_headless = __esm({
     init_messageQueue();
     init_resolve();
     init_sentinel();
-    log15 = createLogger("headless");
+    log16 = createLogger("headless");
     EXTERNAL_TOOL_TIMEOUT_MS = 3e5;
     USER_FACING_TOOLS = /* @__PURE__ */ new Set([
       "promptUser",
@@ -9399,7 +9552,7 @@ var init_headless = __esm({
         }
         const line = JSON.stringify(payload) + "\n";
         if (event === "history") {
-          log15.info("Wrote history event to stdout", {
+          log16.info("Wrote history event to stdout", {
             requestId,
             bytes: line.length
           });
@@ -9476,7 +9629,7 @@ var init_headless = __esm({
         if (this.sessionStats.lastContextSize <= FORCED_COMPACTION_THRESHOLD_TOKENS) {
           return;
         }
-        log15.info("Forced compaction gate triggered", {
+        log16.info("Forced compaction gate triggered", {
           contextSize: this.sessionStats.lastContextSize,
           threshold: FORCED_COMPACTION_THRESHOLD_TOKENS,
           requestId
@@ -9493,7 +9646,7 @@ var init_headless = __esm({
       }
       onBackgroundComplete = (toolCallId, name, result, subAgentMessages) => {
         this.pendingBlockUpdates.push({ toolCallId, result, subAgentMessages });
-        log15.info("Background complete", {
+        log16.info("Background complete", {
           toolCallId,
           name,
           requestId: this.currentRequestId
@@ -9530,17 +9683,17 @@ var init_headless = __esm({
           return Promise.resolve(early);
         }
         const shouldTimeout = !USER_FACING_TOOLS.has(name);
-        return new Promise((resolve2) => {
+        return new Promise((resolve3) => {
           const timeout = shouldTimeout ? setTimeout(() => {
             this.pendingTools.delete(id);
-            resolve2(
+            resolve3(
               "Error: Tool timed out \u2014 no response from the app environment after 5 minutes."
             );
           }, EXTERNAL_TOOL_TIMEOUT_MS) : void 0;
           this.pendingTools.set(id, {
             resolve: (result) => {
               clearTimeout(timeout);
-              resolve2(result);
+              resolve3(result);
             },
             timeout
           });
@@ -9731,7 +9884,7 @@ var init_headless = __esm({
         await this.runForcedCompactionIfNeeded(requestId);
         const attachments = parsed.attachments;
         if (attachments?.length) {
-          log15.info("Message has attachments", {
+          log16.info("Message has attachments", {
             count: attachments.length,
             urls: attachments.map((a) => a.url)
           });
@@ -9747,7 +9900,7 @@ var init_headless = __esm({
               attachmentHeader = header;
             }
           } catch (err) {
-            log15.warn("Attachment persistence failed", { error: err.message });
+            log16.warn("Attachment persistence failed", { error: err.message });
           }
         }
         let resolved = null;
@@ -9811,7 +9964,7 @@ var init_headless = __esm({
               error: "Turn ended unexpectedly"
             });
           }
-          log15.info("Turn complete", {
+          log16.info("Turn complete", {
             requestId,
             durationMs: Date.now() - this.turnStart
           });
@@ -9823,7 +9976,7 @@ var init_headless = __esm({
               error: err.message
             });
           }
-          log15.warn("Command failed", {
+          log16.warn("Command failed", {
             action: "message",
             requestId,
             error: err.message
@@ -9980,7 +10133,7 @@ var init_headless = __esm({
         try {
           parsed = JSON.parse(line);
         } catch (err) {
-          log15.warn("Invalid JSON on stdin", {
+          log16.warn("Invalid JSON on stdin", {
             error: err.message,
             lineLength: line.length,
             preview: line.slice(0, 200)
@@ -9989,7 +10142,7 @@ var init_headless = __esm({
           return;
         }
         const { action, requestId } = parsed;
-        log15.info("Command received", { action, requestId });
+        log16.info("Command received", { action, requestId });
         if (action === "tool_result" && parsed.id) {
           const id = parsed.id;
           const result = parsed.result ?? "";
@@ -9998,7 +10151,7 @@ var init_headless = __esm({
             this.pendingTools.delete(id);
             pending2.resolve(result);
           } else if (!this.running) {
-            log15.info("Late tool_result while idle, dismissing", { id });
+            log16.info("Late tool_result while idle, dismissing", { id });
             this.emit("completed", { success: true }, requestId);
           } else {
             this.earlyResults.set(id, result);
@@ -10011,7 +10164,7 @@ var init_headless = __esm({
             ...typeof parsed.before === "number" ? { before: parsed.before } : {},
             ...typeof parsed.limit === "number" ? { limit: parsed.limit } : {}
           });
-          log15.info("History response", {
+          log16.info("History response", {
             requestId,
             startIndex: page.startIndex,
             endIndex: page.endIndex,
@@ -10171,8 +10324,8 @@ var init_headless = __esm({
 // src/index.tsx
 import { render } from "ink";
 import os2 from "os";
-import fs22 from "fs";
-import path13 from "path";
+import fs23 from "fs";
+import path14 from "path";
 
 // src/tui/App.tsx
 import { useState as useState2, useCallback, useRef } from "react";
@@ -10227,6 +10380,8 @@ function summarizeInput(name, input) {
       return input.pattern || "";
     case "listDir":
       return input.path || ".";
+    case "loadSkill":
+      return input.skill || "";
     default:
       return JSON.stringify(input).slice(0, 60);
   }
@@ -10251,6 +10406,8 @@ function summarizeResult(name, result) {
       return `${lines} files`;
     case "listDir":
       return `${lines} entries`;
+    case "loadSkill":
+      return "reference loaded";
     default:
       return `${lines} lines`;
   }
@@ -10493,8 +10650,8 @@ for (let i = 0; i < args.length; i++) {
 var startupLog = createLogger("startup");
 function printDebugInfo(config) {
   const pkg = JSON.parse(
-    fs22.readFileSync(
-      path13.join(import.meta.dirname, "..", "package.json"),
+    fs23.readFileSync(
+      path14.join(import.meta.dirname, "..", "package.json"),
       "utf-8"
     )
   );