@mindstudio-ai/remy 0.1.255 → 0.1.257

package/dist/headless.js

@@ -285,7 +285,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++) {
@@ -591,20 +591,7 @@ function renderOrgContextBlock() {
 // src/assets.ts
 import fs3 from "fs";
 import path2 from "path";
-var ROOT = findRoot(
-  import.meta.dirname ?? path2.dirname(new URL(import.meta.url).pathname)
-);
-function findRoot(start) {
-  let dir = start;
-  while (dir !== path2.dirname(dir)) {
-    if (fs3.existsSync(path2.join(dir, "package.json"))) {
-      return dir;
-    }
-    dir = path2.dirname(dir);
-  }
-  return start;
-}
-var ASSETS_BASE = fs3.existsSync(path2.join(ROOT, "dist", "prompt")) ? path2.join(ROOT, "dist") : path2.join(ROOT, "src");
+var ASSETS_BASE = import.meta.dirname ?? path2.dirname(new URL(import.meta.url).pathname);
 function assetPath(...segments) {
   return path2.join(ASSETS_BASE, ...segments);
 }
@@ -762,6 +749,81 @@ ${listing}
   }
 }
 
+// src/prompt/skills/catalog.ts
+import fs5 from "fs";
+import path4 from "path";
+var SKILLS_DIR = assetPath("prompt", "skills");
+function parseFrontmatter2(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 = fs5.readdirSync(SKILLS_DIR).filter((f) => f.endsWith(".md"));
+  } catch {
+    return [];
+  }
+  const skills = [];
+  for (const file of files.sort()) {
+    const full = path4.join(SKILLS_DIR, file);
+    const id = file.replace(/\.md$/, "");
+    const fields = parseFrontmatter2(fs5.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;
+}
+var SKILLS = loadCatalog();
+var SKILL_IDS = SKILLS.map((s) => s.id);
+function getSkill(id) {
+  return SKILLS.find((s) => s.id === id);
+}
+function readSkillBody(skill) {
+  return fs5.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>`;
+}
+
 // src/prompt/index.ts
 function resolveIncludes(template) {
   const result = template.replace(
@@ -816,18 +878,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>
@@ -845,10 +895,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>
@@ -963,7 +1013,7 @@ function mergeBackgroundResultsMessages(messages) {
 }
 
 // src/tools/spec/readSpec.ts
-import fs5 from "fs/promises";
+import fs6 from "fs/promises";
 
 // src/tools/spec/_helpers.ts
 function validateSpecPath(filePath) {
@@ -988,8 +1038,8 @@ function extractFrontmatter(content) {
 // src/tools/spec/readSpec.ts
 var DEFAULT_MAX_LINES = 500;
 var 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: {
@@ -1018,7 +1068,7 @@ var readSpecTool = {
       return `Error: ${err.message}`;
     }
     try {
-      const content = await fs5.readFile(input.path, "utf-8");
+      const content = await fs6.readFile(input.path, "utf-8");
       const allLines = content.split("\n");
       const totalLines = allLines.length;
       const maxLines = input.maxLines === 0 ? Infinity : input.maxLines || DEFAULT_MAX_LINES;
@@ -1046,8 +1096,8 @@ var readSpecTool = {
 };
 
 // src/tools/spec/writeSpec.ts
-import fs6 from "fs/promises";
-import path4 from "path";
+import fs7 from "fs/promises";
+import path5 from "path";
 
 // src/tools/_helpers/diff.ts
 var CONTEXT_LINES = 3;
@@ -1102,8 +1152,8 @@ function acquireFileLock(filePath) {
 
 // src/tools/spec/writeSpec.ts
 var 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: {
@@ -1123,7 +1173,7 @@ var writeSpecTool = {
   },
   streaming: {
     transform: async (partial) => {
-      const oldContent = await fs6.readFile(partial.path, "utf-8").catch(() => "");
+      const oldContent = await fs7.readFile(partial.path, "utf-8").catch(() => "");
       const lineCount = partial.content.split("\n").length;
       return `Writing ${partial.path} (${lineCount} lines)
 ${unifiedDiff(partial.path, oldContent, partial.content)}`;
@@ -1137,13 +1187,13 @@ ${unifiedDiff(partial.path, oldContent, partial.content)}`;
     }
     const release = await acquireFileLock(input.path);
     try {
-      await fs6.mkdir(path4.dirname(input.path), { recursive: true });
+      await fs7.mkdir(path5.dirname(input.path), { recursive: true });
       let oldContent = null;
       try {
-        oldContent = await fs6.readFile(input.path, "utf-8");
+        oldContent = await fs7.readFile(input.path, "utf-8");
       } catch {
       }
-      await fs6.writeFile(input.path, input.content, "utf-8");
+      await fs7.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)
@@ -1157,7 +1207,7 @@ ${unifiedDiff(input.path, oldContent ?? "", input.content)}`;
 };
 
 // src/tools/spec/editSpec.ts
-import fs7 from "fs/promises";
+import fs8 from "fs/promises";
 
 // src/tools/code/editFile/_helpers.ts
 function buildLineOffsets(content) {
@@ -1240,8 +1290,8 @@ function formatOccurrenceError(count, lines, filePath) {
 
 // src/tools/spec/editSpec.ts
 var 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: {
@@ -1277,7 +1327,7 @@ var editSpecTool = {
     try {
       let content;
       try {
-        content = await fs7.readFile(input.path, "utf-8");
+        content = await fs8.readFile(input.path, "utf-8");
       } catch (err) {
         return `Error reading file: ${err.message}`;
       }
@@ -1330,7 +1380,7 @@ var editSpecTool = {
         return `Error: that edit would remove or malform the spec's YAML frontmatter (the leading \`--- \u2026 ---\` block, which holds required fields like \`name\`). Narrow old_string to the body content you meant to change and leave the frontmatter block intact.`;
       }
       try {
-        await fs7.writeFile(input.path, updated, "utf-8");
+        await fs8.writeFile(input.path, updated, "utf-8");
       } catch (err) {
         return `Error writing file: ${err.message}`;
       }
@@ -1342,11 +1392,11 @@ var editSpecTool = {
 };
 
 // src/tools/spec/listSpecFiles.ts
-import fs8 from "fs/promises";
-import path5 from "path";
+import fs9 from "fs/promises";
+import path6 from "path";
 var 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: {
@@ -1372,7 +1422,7 @@ var listSpecFilesTool = {
 };
 async function listRecursive(dir) {
   const results = [];
-  const entries = await fs8.readdir(dir, { withFileTypes: true });
+  const entries = await fs9.readdir(dir, { withFileTypes: true });
   entries.sort((a, b) => {
     if (a.isDirectory() && !b.isDirectory()) {
       return -1;
@@ -1383,7 +1433,7 @@ async function listRecursive(dir) {
     return a.name.localeCompare(b.name);
   });
   for (const entry of entries) {
-    const fullPath = path5.join(dir, entry.name);
+    const fullPath = path6.join(dir, entry.name);
     if (entry.isDirectory()) {
       results.push(`${fullPath}/`);
       results.push(...await listRecursive(fullPath));
@@ -1396,8 +1446,8 @@ async function listRecursive(dir) {
 
 // src/tools/spec/presentPublishPlan.ts
 var 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: {
@@ -1418,11 +1468,11 @@ var presentPublishPlanTool = {
 };
 
 // src/tools/spec/writePlan.ts
-import fs9 from "fs/promises";
+import fs10 from "fs/promises";
 var PLAN_FILE = ".remy-plan.md";
 var 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: {
@@ -1443,17 +1493,17 @@ status: pending
 ---
 
 ${content}`;
-    await fs9.writeFile(PLAN_FILE, file, "utf-8");
+    await fs10.writeFile(PLAN_FILE, file, "utf-8");
     return "Plan written to .remy-plan.md. Waiting for user approval.";
   }
 };
 
 // src/tools/spec/updatePlanStatus.ts
-import fs10 from "fs/promises";
+import fs11 from "fs/promises";
 var PLAN_FILE2 = ".remy-plan.md";
 var 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: {
@@ -1475,15 +1525,15 @@ var updatePlanStatusTool = {
     }
     let content;
     try {
-      content = await fs10.readFile(PLAN_FILE2, "utf-8");
+      content = await fs11.readFile(PLAN_FILE2, "utf-8");
     } catch {
       return "No plan file found.";
     }
     if (status === "rejected") {
-      await fs10.unlink(PLAN_FILE2);
+      await fs11.unlink(PLAN_FILE2);
       return "Plan rejected and removed.";
     }
-    await fs10.writeFile(
+    await fs11.writeFile(
       PLAN_FILE2,
       content.replace(/^status:\s*\w+/m, `status: ${status}`),
       "utf-8"
@@ -1494,8 +1544,8 @@ var updatePlanStatusTool = {
 
 // src/tools/common/setProjectOnboardingState.ts
 var 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: {
@@ -1517,8 +1567,8 @@ var setProjectOnboardingStateTool = {
 
 // src/tools/common/promptUser.ts
 var 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: {
@@ -1649,8 +1699,8 @@ ${lines.join("\n")}`;
 
 // src/tools/common/confirmDestructiveAction.ts
 var 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: {
@@ -1689,7 +1739,7 @@ function formatCliResult(r) {
   return logBlock + body + truncNote;
 }
 function runCli(command, args, options) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     const timeout = options?.timeout ?? 6e4;
     const maxBuffer = options?.maxBuffer ?? 1024 * 1024;
     let finalArgs = args;
@@ -1718,7 +1768,7 @@ function runCli(command, args, options) {
       if (killTimer) {
         clearTimeout(killTimer);
       }
-      resolve2(result);
+      resolve3(result);
     };
     const child = spawn(command, finalArgs, {
       stdio: [options?.stdin ? "pipe" : "ignore", "pipe", "pipe"]
@@ -1823,8 +1873,8 @@ function runCli(command, args, options) {
 
 // src/subagents/sdkConsultant/index.ts
 var 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: {
@@ -1850,7 +1900,7 @@ var askMindStudioSdkTool = {
 };
 
 // src/usageLedger.ts
-import fs11 from "fs";
+import fs12 from "fs";
 var LEDGER_FILE = ".logs/usage.ndjson";
 var fd = null;
 function nanoToDollars(nano) {
@@ -1859,10 +1909,10 @@ function nanoToDollars(nano) {
 function recordUsage(entry) {
   try {
     if (fd === null) {
-      fs11.mkdirSync(".logs", { recursive: true });
-      fd = fs11.openSync(LEDGER_FILE, "a");
+      fs12.mkdirSync(".logs", { recursive: true });
+      fd = fs12.openSync(LEDGER_FILE, "a");
     }
-    fs11.writeSync(fd, JSON.stringify(entry) + "\n");
+    fs12.writeSync(fd, JSON.stringify(entry) + "\n");
   } catch {
   }
 }
@@ -1964,8 +2014,8 @@ function stripDollarKeys(envelope) {
 
 // src/tools/common/searchGoogle.ts
 var 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: {
@@ -1995,8 +2045,8 @@ var searchGoogleTool = {
 
 // src/tools/common/setProjectMetadata.ts
 var 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: {
@@ -2028,8 +2078,8 @@ var setProjectMetadataTool = {
 
 // src/tools/common/compactConversation.ts
 var 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: {
@@ -2051,8 +2101,47 @@ var compactConversationTool = {
   }
 };
 
+// src/tools/common/loadSkill.ts
+var 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 fs12 from "fs/promises";
+import fs13 from "fs/promises";
 var DEFAULT_WINDOW = 500;
 var MAX_BYTES = 64 * 1024;
 function isBinary(buffer) {
@@ -2065,8 +2154,8 @@ function isBinary(buffer) {
   return false;
 }
 var 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: {
@@ -2074,7 +2163,7 @@ var readFileTool = {
       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",
@@ -2094,7 +2183,7 @@ var readFileTool = {
   },
   async execute(input) {
     try {
-      const buffer = await fs12.readFile(input.path);
+      const buffer = await fs13.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`;
@@ -2166,11 +2255,11 @@ var readFileTool = {
 };
 
 // src/tools/code/writeFile.ts
-import fs13 from "fs/promises";
-import path6 from "path";
+import fs14 from "fs/promises";
+import path7 from "path";
 var 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: {
@@ -2204,7 +2293,7 @@ var writeFileTool = {
         lastNewlineCount = newlineCount;
         const lastNewline = partial.content.lastIndexOf("\n");
         const completeContent = partial.content.substring(0, lastNewline + 1);
-        const oldContent = await fs13.readFile(partial.path, "utf-8").catch(() => "");
+        const oldContent = await fs14.readFile(partial.path, "utf-8").catch(() => "");
         return `Writing ${partial.path} (${newlineCount} lines)
 ${unifiedDiff(partial.path, oldContent, completeContent)}`;
       }
@@ -2213,13 +2302,13 @@ ${unifiedDiff(partial.path, oldContent, completeContent)}`;
   async execute(input) {
     const release = await acquireFileLock(input.path);
     try {
-      await fs13.mkdir(path6.dirname(input.path), { recursive: true });
+      await fs14.mkdir(path7.dirname(input.path), { recursive: true });
       let oldContent = null;
       try {
-        oldContent = await fs13.readFile(input.path, "utf-8");
+        oldContent = await fs14.readFile(input.path, "utf-8");
       } catch {
       }
-      await fs13.writeFile(input.path, input.content, "utf-8");
+      await fs14.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)
@@ -2233,10 +2322,10 @@ ${unifiedDiff(input.path, oldContent ?? "", input.content)}`;
 };
 
 // src/tools/code/editFile/index.ts
-import fs14 from "fs/promises";
+import fs15 from "fs/promises";
 var 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: {
@@ -2265,7 +2354,7 @@ var editFileTool = {
   async execute(input) {
     const release = await acquireFileLock(input.path);
     try {
-      const content = await fs14.readFile(input.path, "utf-8");
+      const content = await fs15.readFile(input.path, "utf-8");
       const { old_string, new_string, replace_all } = input;
       const occurrences = findOccurrences(content, old_string);
       if (replace_all) {
@@ -2281,7 +2370,7 @@ var editFileTool = {
             new_string
           );
         }
-        await fs14.writeFile(input.path, updated, "utf-8");
+        await fs15.writeFile(input.path, updated, "utf-8");
         return `Replaced ${occurrences.length} occurrence${occurrences.length > 1 ? "s" : ""} in ${input.path}
 ${unifiedDiff(input.path, content, updated)}`;
       }
@@ -2292,7 +2381,7 @@ ${unifiedDiff(input.path, content, updated)}`;
           old_string.length,
           new_string
         );
-        await fs14.writeFile(input.path, updated, "utf-8");
+        await fs15.writeFile(input.path, updated, "utf-8");
         return `Updated ${input.path}
 ${unifiedDiff(input.path, content, updated)}`;
       }
@@ -2308,7 +2397,7 @@ ${unifiedDiff(input.path, content, updated)}`;
           flex.matchedText.length,
           new_string
         );
-        await fs14.writeFile(input.path, updated, "utf-8");
+        await fs15.writeFile(input.path, updated, "utf-8");
         return `Updated ${input.path} (matched with flexible whitespace at line ${flex.line})
 ${unifiedDiff(input.path, content, updated)}`;
       }
@@ -2323,13 +2412,13 @@ ${unifiedDiff(input.path, content, updated)}`;
 
 // src/tools/code/bash.ts
 import { spawn as spawn2 } from "child_process";
-import path7 from "path";
+import path8 from "path";
 var DEFAULT_TIMEOUT_MS = 12e4;
 var DEFAULT_MAX_LINES2 = 500;
 var MAX_OUTPUT_BYTES = 3e4;
 var 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: {
@@ -2358,11 +2447,11 @@ var bashTool = {
   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 ? path7.resolve(PROJECT_ROOT, input.cwd) : PROJECT_ROOT,
+        cwd: input.cwd ? path8.resolve(PROJECT_ROOT, input.cwd) : PROJECT_ROOT,
         env: { ...process.env, FORCE_COLOR: "1" }
       });
       let output = "";
@@ -2383,9 +2472,9 @@ var bashTool = {
         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;
         }
@@ -2411,18 +2500,18 @@ var bashTool = {
               `${(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}`);
       });
     });
   }
@@ -2450,8 +2539,8 @@ function formatResults(stdout, max, mode) {
   return result;
 }
 var 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: {
@@ -2540,17 +2629,17 @@ var grepTool = {
     }
     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.");
           }
         });
       });
@@ -2562,8 +2651,8 @@ var grepTool = {
 import fg from "fast-glob";
 var DEFAULT_MAX2 = 200;
 var 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: {
@@ -2607,12 +2696,12 @@ var globTool = {
 };
 
 // src/tools/code/listDir.ts
-import fs15 from "fs/promises";
-import path8 from "path";
+import fs16 from "fs/promises";
+import path9 from "path";
 var EXCLUDE = /* @__PURE__ */ new Set([".git", "node_modules"]);
 var MAX_CHILDREN = 15;
 async function readAndSort(dirPath) {
-  const entries = await fs15.readdir(dirPath, { withFileTypes: true });
+  const entries = await fs16.readdir(dirPath, { withFileTypes: true });
   return entries.filter((e) => !EXCLUDE.has(e.name)).sort((a, b) => {
     if (a.isDirectory() && !b.isDirectory()) {
       return -1;
@@ -2625,7 +2714,7 @@ async function readAndSort(dirPath) {
 }
 async function collapsePath(basePath, name) {
   let display = name;
-  let current = path8.join(basePath, name);
+  let current = path9.join(basePath, name);
   for (; ; ) {
     let children;
     try {
@@ -2635,7 +2724,7 @@ async function collapsePath(basePath, name) {
     }
     if (children.length === 1 && children[0].isDirectory()) {
       display += "/" + children[0].name;
-      current = path8.join(current, children[0].name);
+      current = path9.join(current, children[0].name);
     } else {
       break;
     }
@@ -2653,15 +2742,15 @@ function formatSize(bytes) {
 }
 async function formatFile(dirPath, name, indent) {
   try {
-    const stat = await fs15.stat(path8.join(dirPath, name));
-    return `${indent}${name}${" ".repeat(Math.max(1, 30 - indent.length - name.length))}${formatSize(stat.size)}`;
+    const stat2 = await fs16.stat(path9.join(dirPath, name));
+    return `${indent}${name}${" ".repeat(Math.max(1, 30 - indent.length - name.length))}${formatSize(stat2.size)}`;
   } catch {
     return `${indent}${name}`;
   }
 }
 var 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: {
@@ -2737,8 +2826,8 @@ var listDirTool = {
 
 // src/tools/code/editsFinished.ts
 var 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: {
@@ -2764,6 +2853,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",
@@ -2775,12 +2865,7 @@ async function sidecarRequest(endpoint, body = {}, options) {
       log4.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;
@@ -2788,6 +2873,16 @@ async function sidecarRequest(endpoint, body = {}, options) {
     log4.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}]` : "";
+    log4.error("Sidecar command failed", {
+      endpoint,
+      error: data.error,
+      errorCode: data.errorCode
+    });
+    throw new Error(`${data.error || "Unknown error"}${code}`);
+  }
+  return data;
 }
 
 // src/tools/_helpers/lsp.ts
@@ -2798,8 +2893,8 @@ async function lspRequest(endpoint, body) {
 
 // src/tools/code/lspDiagnostics.ts
 var 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: {
@@ -2847,8 +2942,8 @@ var lspDiagnosticsTool = {
 
 // src/tools/code/restartProcess.ts
 var 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: {
@@ -2865,7 +2960,7 @@ var restartProcessTool = {
   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)}`;
@@ -2874,8 +2969,8 @@ var restartProcessTool = {
 
 // src/tools/code/runScenario.ts
 var 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: {
@@ -2900,8 +2995,8 @@ var runScenarioTool = {
 
 // src/tools/code/runMethod.ts
 var 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: {
@@ -2935,8 +3030,8 @@ var runMethodTool = {
 
 // src/tools/code/queryDatabase.ts
 var 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: {
@@ -2955,24 +3050,127 @@ var queryDatabaseTool = {
   }
 };
 
+// src/tools/_helpers/uploadImage.ts
+import { readFile, stat } from "fs/promises";
+import { basename, extname, resolve } from "path";
+var log5 = createLogger("uploadImage");
+var UPLOAD_TIMEOUT_MS = 6e4;
+var CONTENT_TYPES = {
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".gif": "image/gif",
+  ".webp": "image/webp"
+};
+var hosted = /* @__PURE__ */ new Map();
+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}`);
+  }
+  log5.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();
+}
+
 // 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 };
 }
 
 // src/tools/_helpers/screenshot.ts
+var VIEWPORT_CAPTURE_TIMEOUT_MS = 45e3;
+var FULLPAGE_CAPTURE_TIMEOUT_MS = 135e3;
 var 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).`;
 var 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.`;
 function buildScreenshotAnalysisPrompt(opts) {
@@ -2992,13 +3190,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;
@@ -3009,18 +3208,19 @@ async function streamScreenshotAnalysis(opts) {
 }
 async function captureAndAnalyzeScreenshot(promptOrOptions) {
   let prompt;
-  let existingUrl;
+  let existingImage;
   let onLog;
   let model;
-  let path13;
+  let apiConfig;
+  let path14;
   let fullPage = true;
   let width;
   let height;
   let format;
   if (typeof promptOrOptions === "object" && promptOrOptions !== null) {
     prompt = promptOrOptions.prompt;
-    existingUrl = promptOrOptions.imageUrl;
-    path13 = promptOrOptions.path;
+    existingImage = promptOrOptions.image;
+    path14 = promptOrOptions.path;
     if (promptOrOptions.fullPage !== void 0) {
       fullPage = promptOrOptions.fullPage;
     }
@@ -3029,6 +3229,7 @@ async function captureAndAnalyzeScreenshot(promptOrOptions) {
     format = promptOrOptions.format;
     onLog = promptOrOptions.onLog;
     model = promptOrOptions.model;
+    apiConfig = promptOrOptions.apiConfig;
   } else {
     prompt = promptOrOptions;
   }
@@ -3037,18 +3238,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",
       {
-        ...path13 ? { path: path13 } : {},
+        ...path14 ? { path: path14 } : {},
         ...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) {
@@ -3059,7 +3262,7 @@ async function captureAndAnalyzeScreenshot(promptOrOptions) {
     styleMap = ssResult?.styleMap;
   }
   if (prompt === false) {
-    return url;
+    return resolveImageRef(url, apiConfig);
   }
   if (!model) {
     throw new Error(
@@ -3067,7 +3270,8 @@ async function captureAndAnalyzeScreenshot(promptOrOptions) {
     );
   }
   return streamScreenshotAnalysis({
-    url,
+    image: url,
+    apiConfig,
     prompt: prompt || void 0,
     styleMap,
     onLog,
@@ -3088,7 +3292,7 @@ function acquireBrowserLock() {
 }
 
 // src/toolRegistry.ts
-var log5 = createLogger("tool-registry");
+var log6 = createLogger("tool-registry");
 var 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.";
 var ToolRegistry = class {
   entries = /* @__PURE__ */ new Map();
@@ -3115,7 +3319,7 @@ var ToolRegistry = class {
     if (!entry) {
       return false;
     }
-    log5.info("Tool stopped", { toolCallId: id, name: entry.name, mode });
+    log6.info("Tool stopped", { toolCallId: id, name: entry.name, mode });
     entry.abortController.abort(mode);
     if (mode === "graceful") {
       const partial = entry.getPartialResult?.() ?? "";
@@ -3148,7 +3352,7 @@ ${partial}` : "[INTERRUPTED] Tool execution was stopped.";
     if (!entry) {
       return false;
     }
-    log5.info("Tool restarted", { toolCallId: id, name: entry.name });
+    log6.info("Tool restarted", { toolCallId: id, name: entry.name });
     entry.abortController.abort("restart");
     const newInput = patchedInput ? { ...entry.input, ...patchedInput } : entry.input;
     this.onEvent?.({
@@ -3250,6 +3454,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) {
@@ -3341,14 +3548,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
@@ -3356,7 +3579,7 @@ ${content}` : attachmentHeader;
     if (toolCalls.length > 0) {
       cleaned2.toolCalls = toolCalls;
     }
-    if (msg.providerMetadata) {
+    if (msg.providerMetadata && !rewroteToolIds) {
       cleaned2.providerMetadata = msg.providerMetadata;
     }
     if (msg.hidden) {
@@ -3368,7 +3591,7 @@ ${content}` : attachmentHeader;
 }
 
 // src/subagents/runner.ts
-var log6 = createLogger("sub-agent");
+var log7 = createLogger("sub-agent");
 async function runSubAgent(config) {
   const {
     system,
@@ -3396,7 +3619,7 @@ async function runSubAgent(config) {
   const signal = background ? bgAbort.signal : parentSignal;
   const agentName = subAgentId || "sub-agent";
   const runStart = Date.now();
-  log6.info("Sub-agent started", { requestId, parentToolId, agentName });
+  log7.info("Sub-agent started", { requestId, parentToolId, agentName });
   const emit = (e) => {
     onEvent({ ...e, parentToolId });
   };
@@ -3408,7 +3631,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;
@@ -3480,7 +3702,6 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
             system: fullSystem,
             messages: cleanMessagesForApi(messages),
             tools: tools2,
-            excludeToolsFromClearing,
             signal
           },
           {
@@ -3616,7 +3837,7 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
           ...hasArtifacts ? { artifacts } : {}
         };
       }
-      log6.info("Tools executing", {
+      log7.info("Tools executing", {
         requestId,
         parentToolId,
         count: toolCalls.length,
@@ -3693,7 +3914,7 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
           run2(tc.input);
           const r = await resultPromise;
           toolRegistry?.unregister(tc.id);
-          log6.info("Tool completed", {
+          log7.info("Tool completed", {
             requestId,
             parentToolId,
             toolCallId: tc.id,
@@ -3744,7 +3965,7 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
   const wrapRun = async () => {
     try {
       const result = await run();
-      log6.info("Sub-agent complete", {
+      log7.info("Sub-agent complete", {
         requestId,
         parentToolId,
         agentName,
@@ -3753,7 +3974,7 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
       });
       return result;
     } catch (err) {
-      log6.warn("Sub-agent error", {
+      log7.warn("Sub-agent error", {
         requestId,
         parentToolId,
         agentName,
@@ -3765,7 +3986,7 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
   if (!background) {
     return wrapRun();
   }
-  log6.info("Sub-agent backgrounded", { requestId, parentToolId, agentName });
+  log7.info("Sub-agent backgrounded", { requestId, parentToolId, agentName });
   toolRegistry?.register({
     id: parentToolId,
     name: agentName,
@@ -3874,7 +4095,7 @@ var BROWSER_TOOLS = [
                   "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",
@@ -3942,20 +4163,11 @@ var BROWSER_TOOLS = [
       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.
@@ -3965,13 +4177,13 @@ var BROWSER_TOOLS = [
 var BROWSER_EXTERNAL_TOOLS = /* @__PURE__ */ new Set(["browserCommand"]);
 
 // src/subagents/common/context.ts
-import fs16 from "fs";
-import path9 from "path";
+import fs17 from "fs";
+import path10 from "path";
 function walkMdFiles2(dir, skip) {
   const files = [];
   try {
-    for (const entry of fs16.readdirSync(dir, { withFileTypes: true })) {
-      const full = path9.join(dir, entry.name);
+    for (const entry of fs17.readdirSync(dir, { withFileTypes: true })) {
+      const full = path10.join(dir, entry.name);
       if (entry.isDirectory()) {
         if (!skip?.has(entry.name)) {
           files.push(...walkMdFiles2(full, skip));
@@ -3984,9 +4196,9 @@ function walkMdFiles2(dir, skip) {
   }
   return files.sort();
 }
-function parseFrontmatter2(filePath) {
+function parseFrontmatter3(filePath) {
   try {
-    const content = fs16.readFileSync(filePath, "utf-8");
+    const content = fs17.readFileSync(filePath, "utf-8");
     const match = content.match(/^---\n([\s\S]*?)\n---/);
     if (!match) {
       return {};
@@ -4011,7 +4223,7 @@ function loadSpecIndex() {
     return "";
   }
   const lines = files.map((f) => {
-    const fm = parseFrontmatter2(f);
+    const fm = parseFrontmatter3(f);
     let line = `- ${f}`;
     if (fm.name) {
       line += ` \u2014 "${fm.name}"`;
@@ -4032,7 +4244,7 @@ function loadRoadmapIndex() {
   const parts = [];
   try {
     const indexJson = JSON.parse(
-      fs16.readFileSync("src/roadmap/index.json", "utf-8")
+      fs17.readFileSync("src/roadmap/index.json", "utf-8")
     );
     if (indexJson.lanes?.length > 0) {
       const laneLines = indexJson.lanes.map(
@@ -4052,7 +4264,7 @@ ${indexJson.standalone.map((s) => `- ${s}`).join("\n")}`
   const files = walkMdFiles2("src/roadmap");
   if (files.length > 0) {
     const lines = files.map((f) => {
-      const fm = parseFrontmatter2(f);
+      const fm = parseFrontmatter3(f);
       let line = `- ${f}`;
       if (fm.name) {
         line += ` \u2014 "${fm.name}"`;
@@ -4148,7 +4360,8 @@ function getBrowserAutomationPrompt() {
 }
 
 // src/subagents/browserAutomation/index.ts
-var log7 = createLogger("browser-automation");
+var log8 = createLogger("browser-automation");
+var CAPTURE_COMMANDS = /* @__PURE__ */ new Set(["screenshotViewport", "screenshotFullPage"]);
 async function runBrowserAutomation(task, context, opts) {
   const release = await acquireBrowserLock();
   try {
@@ -4160,7 +4373,7 @@ async function runBrowserAutomation(task, context, opts) {
       );
     } catch {
     }
-    let lastBrowserCommandViewport;
+    let lastCapture = {};
     const result = await runSubAgent({
       system: getBrowserAutomationPrompt(),
       task,
@@ -4182,22 +4395,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);
         }
@@ -4219,14 +4416,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",
@@ -4250,15 +4449,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 {
-                log7.debug("Failed to parse batch analysis result", {
+                log8.debug("Failed to parse batch analysis result", {
                   batchResult
                 });
               }
@@ -4269,13 +4467,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 } } : {}
@@ -4285,8 +4480,8 @@ async function runBrowserAutomation(task, context, opts) {
   }
 }
 var 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: {
@@ -4315,98 +4510,104 @@ var browserAutomationTool = {
 };
 
 // src/tools/code/screenshot.ts
-var screenshotTool = {
+var 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)
-        });
+      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."
       }
-      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();
+    },
+    required: ["fullPage"]
+  }
+};
+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;
       }
-    } catch (err) {
-      return `Error taking screenshot: ${err.message}`;
+      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 screenshotTool = {
+  definition: screenshotDefinition,
+  execute: (input, context) => executeScreenshot(input, context?.onLog, context)
 };
 
 // src/subagents/designExpert/tools/searchGoogle.ts
@@ -4509,13 +4710,13 @@ Respond only with your analysis as Markdown and absolutely no other text. Do not
 var 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",
@@ -4528,9 +4729,9 @@ var definition3 = {
 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",
@@ -4553,15 +4754,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 });
 }
 
 // src/subagents/designExpert/tools/analyzeImage.ts
@@ -4573,13 +4775,16 @@ __export(analyzeImage_exports, {
 var 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",
@@ -4590,96 +4795,24 @@ var definition4 = {
   }
 };
 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 });
-}
-
-// src/subagents/designExpert/tools/screenshot.ts
-var screenshot_exports = {};
-__export(screenshot_exports, {
-  definition: () => definition5,
-  execute: () => execute5
-});
-var 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"]
-  }
-};
-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();
-  }
+  return JSON.stringify({ url, analysis });
 }
 
 // src/subagents/designExpert/tools/images/generateImages.ts
 var generateImages_exports = {};
 __export(generateImages_exports, {
-  definition: () => definition6,
-  execute: () => execute6
+  definition: () => definition5,
+  execute: () => execute5
 });
 
 // src/subagents/designExpert/tools/images/enhancePrompt.ts
@@ -4741,14 +4874,15 @@ var ANALYZE_PROMPT = 'You are reviewing this image for a visual designer sourcin
 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 };
@@ -4854,10 +4988,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],
@@ -4872,7 +5006,7 @@ async function generateImageAssets(opts) {
 }
 
 // src/subagents/designExpert/tools/images/generateImages.ts
-var definition6 = {
+var 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.",
@@ -4888,7 +5022,7 @@ var definition6 = {
       },
       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",
@@ -4906,7 +5040,7 @@ var definition6 = {
     required: ["prompts"]
   }
 };
-async function execute6(input, onLog, context) {
+async function execute5(input, onLog, context) {
   return generateImageAssets({
     prompts: input.prompts,
     width: input.width,
@@ -4915,6 +5049,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,
@@ -4936,10 +5071,10 @@ async function execute6(input, onLog, context) {
 // src/subagents/designExpert/tools/images/editImages.ts
 var editImages_exports = {};
 __export(editImages_exports, {
-  definition: () => definition7,
-  execute: () => execute7
+  definition: () => definition6,
+  execute: () => execute6
 });
-var definition7 = {
+var 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.",
@@ -4958,7 +5093,7 @@ var definition7 = {
         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",
@@ -4976,7 +5111,7 @@ var definition7 = {
     required: ["prompts", "sourceImages"]
   }
 };
-async function execute7(input, onLog, context) {
+async function execute6(input, onLog, context) {
   return generateImageAssets({
     prompts: input.prompts,
     sourceImages: input.sourceImages,
@@ -4985,6 +5120,7 @@ async function execute7(input, onLog, context) {
     transparentBackground: input.transparentBackground,
     enhancePrompts: false,
     onLog,
+    apiConfig: context?.apiConfig,
     imageGenerationModel: resolveModel(
       "imageGeneration",
       context?.models,
@@ -5006,8 +5142,8 @@ async function execute7(input, onLog, context) {
 // src/subagents/designExpert/tools/polishCopy.ts
 var polishCopy_exports = {};
 __export(polishCopy_exports, {
-  definition: () => definition8,
-  execute: () => execute8
+  definition: () => definition7,
+  execute: () => execute7
 });
 
 // src/subagents/copyEditor/tools.ts
@@ -5016,8 +5152,8 @@ var COPY_EDITOR_TOOLS = [...COMMON_READ_TOOLS];
 // src/subagents/copyEditor/index.ts
 var BASE_PROMPT2 = readAsset("subagents/copyEditor", "prompt.md");
 var 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: {
@@ -5064,7 +5200,7 @@ var copyEditorTool = {
 };
 
 // src/subagents/designExpert/tools/polishCopy.ts
-var definition8 = {
+var 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).",
@@ -5079,7 +5215,7 @@ var definition8 = {
     required: ["task"]
   }
 };
-async function execute8(input, _onLog, context) {
+async function execute7(input, _onLog, context) {
   return copyEditorTool.execute(input, context);
 }
 
@@ -5089,7 +5225,10 @@ var tools = {
   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
@@ -5108,7 +5247,7 @@ async function executeDesignExpertTool(name, input, context, toolCallId, onLog)
 }
 
 // src/subagents/designExpert/data/sampleCache.ts
-import fs17 from "fs";
+import fs18 from "fs";
 var SAMPLE_FILE = ".remy-design-sample.json";
 var cached2 = null;
 function generateIndices(poolSize, sampleSize) {
@@ -5122,14 +5261,14 @@ function generateIndices(poolSize, sampleSize) {
 }
 function load() {
   try {
-    return JSON.parse(fs17.readFileSync(SAMPLE_FILE, "utf-8"));
+    return JSON.parse(fs18.readFileSync(SAMPLE_FILE, "utf-8"));
   } catch {
     return null;
   }
 }
 function save(indices) {
   try {
-    fs17.writeFileSync(SAMPLE_FILE, JSON.stringify(indices));
+    fs18.writeFileSync(SAMPLE_FILE, JSON.stringify(indices));
   } catch {
   }
 }
@@ -5413,8 +5552,8 @@ async function runDesignExpert(opts, context) {
   });
 }
 var designExpertTool = {
-  clearable: false,
   definition: {
+    clearable: false,
     name: "visualDesignExpert",
     description: DESCRIPTION,
     inputSchema: {
@@ -5503,28 +5642,28 @@ var VISION_TOOLS = [
 ];
 
 // src/subagents/productVision/executor.ts
-import fs18 from "fs";
-import path10 from "path";
+import fs19 from "fs";
+import path11 from "path";
 var ROADMAP_DIR = "src/roadmap";
 var PITCH_DECK_SHELL = readAsset(
   "subagents/productVision",
   "pitch-deck-shell.html"
 );
-function resolve(filePath) {
-  return path10.join(ROADMAP_DIR, filePath);
+function resolve2(filePath) {
+  return path11.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 {
-        fs18.mkdirSync(ROADMAP_DIR, { recursive: true });
+        fs19.mkdirSync(ROADMAP_DIR, { recursive: true });
         let oldContent = null;
         try {
-          oldContent = fs18.readFileSync(filePath, "utf-8");
+          oldContent = fs19.readFileSync(filePath, "utf-8");
         } catch {
         }
-        fs18.writeFileSync(filePath, input.content, "utf-8");
+        fs19.writeFileSync(filePath, input.content, "utf-8");
         const lineCount = input.content.split("\n").length;
         const label = oldContent !== null ? "Wrote" : "Created";
         return `${label} ${filePath} (${lineCount} lines)
@@ -5534,13 +5673,13 @@ ${unifiedDiff(filePath, oldContent ?? "", input.content)}`;
       }
     }
     case "deleteFile": {
-      const filePath = resolve(input.path);
+      const filePath = resolve2(input.path);
       try {
-        if (!fs18.existsSync(filePath)) {
+        if (!fs19.existsSync(filePath)) {
           return `Error: ${filePath} does not exist`;
         }
-        const oldContent = fs18.readFileSync(filePath, "utf-8");
-        fs18.unlinkSync(filePath);
+        const oldContent = fs19.readFileSync(filePath, "utf-8");
+        fs19.unlinkSync(filePath);
         return `Deleted ${filePath}
 ${unifiedDiff(filePath, oldContent, "")}`;
       } catch (err) {
@@ -5551,11 +5690,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 {
-        fs18.mkdirSync(ROADMAP_DIR, { recursive: true });
-        const exists = fs18.existsSync(filePath);
-        const before = exists ? fs18.statSync(filePath).mtimeMs : null;
+        fs19.mkdirSync(ROADMAP_DIR, { recursive: true });
+        const exists = fs19.existsSync(filePath);
+        const before = exists ? fs19.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.
 
@@ -5585,11 +5724,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 (!fs18.existsSync(filePath)) {
+        if (!fs19.existsSync(filePath)) {
           return `Error: the design expert did not write ${filePath}. Its reply was:
 ${result.text}`;
         }
-        if (before !== null && fs18.statSync(filePath).mtimeMs === before) {
+        if (before !== null && fs19.statSync(filePath).mtimeMs === before) {
           return `Error: the pitch deck at ${filePath} was not modified. The design expert's reply was:
 ${result.text}`;
         }
@@ -5621,8 +5760,8 @@ function getProductVisionPrompt() {
 
 // src/subagents/productVision/index.ts
 var 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: {
@@ -5734,8 +5873,8 @@ var SANITY_CHECK_TOOLS = [
 // src/subagents/codeSanityCheck/index.ts
 var BASE_PROMPT4 = readAsset("subagents/codeSanityCheck", "prompt.md");
 var 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: {
@@ -5810,9 +5949,9 @@ ${readAsset(
 )}
 </mindstudio_flavored_markdown_spec_docs>`;
 var 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: {
@@ -5879,8 +6018,8 @@ var specSyncTool = {
 
 // src/tools/common/scrapeWebUrl.ts
 var 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: {
@@ -5923,7 +6062,7 @@ var scrapeWebUrlTool = {
 };
 
 // src/tools/spec/writeBuildOverview.ts
-import fs19 from "fs";
+import fs20 from "fs";
 var OVERVIEW_FILE = "src/overview.html";
 var DESIGN_BRIEF = `We are building the Build Overview for this app \u2014 the home page of its Spec tab. It is a calm, dense, one-page reference of everything the app actually contains, including the parts the user can't see. It renders flush inside the Spec tab's content panel (the IDE supplies the surrounding nav).
 
@@ -5980,8 +6119,8 @@ The Build Overview already exists at \`${OVERVIEW_FILE}\`. Read it, then update
 Then reply with a one-line summary of what you changed.`;
 }
 var 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: {
@@ -6003,7 +6142,7 @@ var buildOverviewTool = {
     if (!content) {
       return "Error: writeBuildOverview requires non-empty `content` (the overview copy).";
     }
-    const exists = fs19.existsSync(OVERVIEW_FILE);
+    const exists = fs20.existsSync(OVERVIEW_FILE);
     const task = `<overview_copy>${content}</overview_copy>
 
 ${DESIGN_BRIEF}
@@ -6021,7 +6160,7 @@ ${exists ? refreshDelivery() : initialDelivery()}`;
       }
       const result = await runDesignExpertRender({ task }, context);
       context.subAgentMessages?.set(context.toolCallId, result.messages);
-      if (!fs19.existsSync(OVERVIEW_FILE)) {
+      if (!fs20.existsSync(OVERVIEW_FILE)) {
         return `Error: the design expert did not write ${OVERVIEW_FILE}. Its reply was:
 ${result.text}`;
       }
@@ -6078,11 +6217,11 @@ var ALL_TOOLS = [
   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
 ];
-var CLEARABLE_TOOLS = new Set(
-  ALL_TOOLS.filter((t) => t.clearable).map((t) => t.definition.name)
-);
 var SUBAGENT_TOOL_NAMES = /* @__PURE__ */ new Set([
   "visualDesignExpert",
   "productVision",
@@ -6107,7 +6246,7 @@ function executeTool(name, input, context) {
 }
 
 // src/compaction/index.ts
-var log8 = createLogger("compaction");
+var log9 = createLogger("compaction");
 var CONVERSATION_SUMMARY_PROMPT = readAsset("compaction", "conversation.md");
 var SUBAGENT_SUMMARY_PROMPT = readAsset("compaction", "subagent.md");
 var SUMMARIZABLE_SUBAGENTS = ["visualDesignExpert", "productVision"];
@@ -6156,7 +6295,7 @@ async function compactConversation(messages, apiConfig, model) {
           if (text) {
             summaries.push({ name, text });
           } else {
-            log8.warn("Subagent summary unusable \u2014 leaving its history intact", {
+            log9.warn("Subagent summary unusable \u2014 leaving its history intact", {
               name
             });
           }
@@ -6184,7 +6323,7 @@ async function compactConversation(messages, apiConfig, model) {
       }
     ]
   }));
-  log8.info("Compaction complete", {
+  log9.info("Compaction complete", {
     summaries: summaries.length,
     recentNarrativeChars: recent.length
   });
@@ -6386,7 +6525,7 @@ async function generateSummary(apiConfig, name, compactionPrompt, messagesToSumm
       messagesToSummarize.slice(0, mid),
       messagesToSummarize.slice(mid)
     ];
-    log8.info("Chunking summary", {
+    log9.info("Chunking summary", {
       name,
       messageCount: messagesToSummarize.length,
       serializedLength: serialized.length,
@@ -6416,7 +6555,7 @@ async function generateSummary(apiConfig, name, compactionPrompt, messagesToSumm
     const parts = results.filter((p) => p !== null);
     return parts.length > 0 ? parts.join("\n\n---\n\n") : null;
   }
-  log8.info("Generating summary", {
+  log9.info("Generating summary", {
     name,
     messageCount: messagesToSummarize.length,
     serializedLength: serialized.length
@@ -6432,10 +6571,10 @@ async function generateSummary(apiConfig, name, compactionPrompt, messagesToSumm
     return null;
   }
   if (summaryText.length >= MIN_SUMMARY_CHARS) {
-    log8.info("Summary generated", { name, summaryLength: summaryText.length });
+    log9.info("Summary generated", { name, summaryLength: summaryText.length });
     return summaryText;
   }
-  log8.warn("Summary too short to be real", {
+  log9.warn("Summary too short to be real", {
     name,
     summaryLength: summaryText.length,
     minimum: MIN_SUMMARY_CHARS,
@@ -6491,21 +6630,21 @@ Write the summary of the conversation above, following your instructions.`;
         toolNames: []
       });
     } else if (event.type === "error") {
-      log8.error("Summary generation failed", { name, error: event.error });
+      log9.error("Summary generation failed", { name, error: event.error });
       return null;
     }
   }
   if (!summaryText.trim()) {
-    log8.warn("Empty summary generated", { name });
+    log9.warn("Empty summary generated", { name });
     return null;
   }
   return summaryText.trim();
 }
 
 // src/session.ts
-import fs20 from "fs";
-import path11 from "path";
-var log9 = createLogger("session");
+import fs21 from "fs";
+import path12 from "path";
+var log10 = createLogger("session");
 var SESSION_FILE = ".remy-session.json";
 var ARCHIVE_DIR = ".logs/sessions";
 var ROTATE_THRESHOLD_BYTES = 32 * 1024 * 1024;
@@ -6522,14 +6661,14 @@ var ARCHIVE_MSG_CACHE_MAX = 3;
 function loadSession(state) {
   pruneArchives();
   try {
-    const raw = fs20.readFileSync(SESSION_FILE, "utf-8");
+    const raw = fs21.readFileSync(SESSION_FILE, "utf-8");
     const data = JSON.parse(raw);
     if (data.models && typeof data.models === "object") {
       state.models = data.models;
     }
     if (Array.isArray(data.messages) && data.messages.length > 0) {
       state.messages = sanitizeMessages(data.messages);
-      log9.info("Session loaded", {
+      log10.info("Session loaded", {
         messageCount: state.messages.length,
         ...state.models && { models: state.models }
       });
@@ -6595,33 +6734,33 @@ function buildPayload(state) {
   return payload;
 }
 function archiveMessages(messages, label, models) {
-  fs20.mkdirSync(ARCHIVE_DIR, { recursive: true });
+  fs21.mkdirSync(ARCHIVE_DIR, { recursive: true });
   const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
   const count = messages.length;
-  let dest = path11.join(ARCHIVE_DIR, `${label}-${ts}.c${count}.json`);
+  let dest = path12.join(ARCHIVE_DIR, `${label}-${ts}.c${count}.json`);
   let n = 1;
-  while (fs20.existsSync(dest)) {
-    dest = path11.join(ARCHIVE_DIR, `${label}-${ts}-${n++}.c${count}.json`);
+  while (fs21.existsSync(dest)) {
+    dest = path12.join(ARCHIVE_DIR, `${label}-${ts}-${n++}.c${count}.json`);
   }
   const payload = { messages };
   if (models && Object.keys(models).length > 0) {
     payload.models = models;
   }
-  fs20.writeFileSync(dest, JSON.stringify(payload), "utf-8");
-  archiveCountCache.set(path11.basename(dest), count);
-  log9.info("Session archived", { label, dest, messageCount: count });
+  fs21.writeFileSync(dest, JSON.stringify(payload), "utf-8");
+  archiveCountCache.set(path12.basename(dest), count);
+  log10.info("Session archived", { label, dest, messageCount: count });
   pruneArchives();
   return dest;
 }
 function pruneArchives() {
   try {
-    const entries = fs20.readdirSync(ARCHIVE_DIR).filter((name) => ARCHIVE_NAME_RE.test(name));
+    const entries = fs21.readdirSync(ARCHIVE_DIR).filter((name) => ARCHIVE_NAME_RE.test(name));
     if (entries.length <= 1) {
       return;
     }
     const archives = entries.map((name) => ({
       name,
-      size: fs20.statSync(path11.join(ARCHIVE_DIR, name)).size
+      size: fs21.statSync(path12.join(ARCHIVE_DIR, name)).size
     })).sort(
       (a, b) => archiveSortKey(b.name).localeCompare(archiveSortKey(a.name))
     );
@@ -6639,14 +6778,14 @@ function pruneArchives() {
     let freed = 0;
     for (let i = cut; i < archives.length; i++) {
       try {
-        fs20.unlinkSync(path11.join(ARCHIVE_DIR, archives[i].name));
+        fs21.unlinkSync(path12.join(ARCHIVE_DIR, archives[i].name));
         freed += archives[i].size;
         removed++;
       } catch {
       }
     }
     if (removed > 0) {
-      log9.info("Session archives pruned", {
+      log10.info("Session archives pruned", {
         removed,
         freedBytes: freed,
         keptBytes: kept
@@ -6663,7 +6802,7 @@ function parseArchive(name) {
     return cached3;
   }
   try {
-    const raw = fs20.readFileSync(path11.join(ARCHIVE_DIR, name), "utf-8");
+    const raw = fs21.readFileSync(path12.join(ARCHIVE_DIR, name), "utf-8");
     const data = JSON.parse(raw);
     const messages = Array.isArray(data?.messages) ? data.messages : [];
     archiveCountCache.set(name, messages.length);
@@ -6677,7 +6816,7 @@ function parseArchive(name) {
     }
     return messages;
   } catch (err) {
-    log9.warn("Session archive unreadable", { name, error: err?.message });
+    log10.warn("Session archive unreadable", { name, error: err?.message });
     return null;
   }
 }
@@ -6701,7 +6840,7 @@ function readArchiveMessages(name) {
 function listConversationArchives() {
   let names;
   try {
-    names = fs20.readdirSync(ARCHIVE_DIR).filter((n) => ARCHIVE_NAME_RE.test(n));
+    names = fs21.readdirSync(ARCHIVE_DIR).filter((n) => ARCHIVE_NAME_RE.test(n));
   } catch {
     return { slots: [], archivedCount: 0 };
   }
@@ -6800,7 +6939,7 @@ function rotate(state) {
   }
   archiveMessages(messages.slice(0, cut), "rotated", state.models);
   state.messages = messages.slice(cut);
-  log9.info("Session rotated", {
+  log10.info("Session rotated", {
     archived: cut,
     retained: state.messages.length
   });
@@ -6812,10 +6951,10 @@ function saveSession(state) {
     if (Buffer.byteLength(serialized, "utf-8") > ROTATE_THRESHOLD_BYTES && rotate(state)) {
       serialized = JSON.stringify(buildPayload(state));
     }
-    fs20.writeFileSync(SESSION_FILE, serialized, "utf-8");
-    log9.info("Session saved", { messageCount: state.messages.length });
+    fs21.writeFileSync(SESSION_FILE, serialized, "utf-8");
+    log10.info("Session saved", { messageCount: state.messages.length });
   } catch (err) {
-    log9.warn("Session save failed", { error: err.message });
+    log10.warn("Session save failed", { error: err.message });
   }
 }
 function clearSession(state) {
@@ -6824,22 +6963,22 @@ function clearSession(state) {
       archiveMessages(state.messages, "cleared", state.models);
     }
   } catch (err) {
-    log9.warn("Session archive on clear failed", { error: err.message });
+    log10.warn("Session archive on clear failed", { error: err.message });
   }
   state.messages = [];
   try {
-    if (fs20.existsSync(SESSION_FILE)) {
-      fs20.unlinkSync(SESSION_FILE);
+    if (fs21.existsSync(SESSION_FILE)) {
+      fs21.unlinkSync(SESSION_FILE);
     }
   } catch (err) {
-    log9.warn("Session clear: could not remove live file", {
+    log10.warn("Session clear: could not remove live file", {
       error: err.message
     });
   }
 }
 
 // src/compaction/trigger.ts
-var log10 = createLogger("compaction:trigger");
+var log11 = createLogger("compaction:trigger");
 var pending = null;
 var inflightCompaction = null;
 function applyPendingSummaries(state) {
@@ -6856,7 +6995,7 @@ function applyPendingSummaries(state) {
     idx = at === -1 ? 0 : at + 1;
   }
   state.messages.splice(idx, 0, ...drained.checkpoints);
-  log10.info("Checkpoint applied", {
+  log11.info("Checkpoint applied", {
     index: idx,
     messageCount: state.messages.length
   });
@@ -6871,7 +7010,7 @@ function triggerCompaction(state, apiConfig, opts = {}) {
     return inflightCompaction;
   }
   if (pending) {
-    log10.info("Compaction skipped \u2014 a checkpoint is already waiting to apply");
+    log11.info("Compaction skipped \u2014 a checkpoint is already waiting to apply");
     return Promise.resolve();
   }
   const { blocking = false, requestId, model } = opts;
@@ -6883,11 +7022,11 @@ function triggerCompaction(state, apiConfig, opts = {}) {
   ).then((result) => {
     pending = result;
     listener?.({ type: "complete", requestId });
-    log10.info("Compaction complete");
+    log11.info("Compaction complete");
   }).catch((err) => {
     const message = err.message || "Compaction failed";
     listener?.({ type: "complete", error: message, requestId });
-    log10.error("Compaction failed", { error: message });
+    log11.error("Compaction failed", { error: message });
     throw err;
   }).finally(() => {
     inflightCompaction = null;
@@ -6896,10 +7035,10 @@ function triggerCompaction(state, apiConfig, opts = {}) {
 }
 
 // src/brandExtraction/index.ts
-import fs21 from "fs";
-import path12 from "path";
+import fs22 from "fs";
+import path13 from "path";
 import { createHash } from "crypto";
-var log11 = createLogger("brandExtraction");
+var log12 = createLogger("brandExtraction");
 var EXTRACT_PROMPT = readAsset("brandExtraction", "extract.md");
 var BRAND_FILE = ".remy-brand.json";
 var CACHE_FILE = ".remy-brand.cache.json";
@@ -6907,28 +7046,28 @@ async function runExtraction(apiConfig, model) {
   const inputHash = computeInputHash();
   const cached3 = readCache();
   if (cached3 && cached3.inputHash === inputHash) {
-    log11.debug("Brand inputs unchanged \u2014 skipping extraction", { inputHash });
+    log12.debug("Brand inputs unchanged \u2014 skipping extraction", { inputHash });
     return null;
   }
-  log11.info("Extracting brand", { inputHash });
+  log12.info("Extracting brand", { inputHash });
   const brand = await extractBrand(apiConfig, model);
   if (!brand) {
-    log11.warn("Brand extraction failed \u2014 leaving cache untouched");
+    log12.warn("Brand extraction failed \u2014 leaving cache untouched");
     return null;
   }
   persistBrand(brand, inputHash);
-  log11.info("Brand persisted", { inputHash });
+  log12.info("Brand persisted", { inputHash });
   return brand;
 }
 function isDedicatedBrandFile(filePath) {
-  if (filePath.split(path12.sep).includes("@brand")) {
+  if (filePath.split(path13.sep).includes("@brand")) {
     return true;
   }
-  const { type } = parseFrontmatter3(filePath);
+  const { type } = parseFrontmatter4(filePath);
   return type.startsWith("design/color") || type.startsWith("design/typography");
 }
 function isBrandRelevant(filePath) {
-  return filePath === path12.join("src", "app.md") || isDedicatedBrandFile(filePath);
+  return filePath === path13.join("src", "app.md") || isDedicatedBrandFile(filePath);
 }
 function computeInputHash() {
   const entries = [];
@@ -6950,7 +7089,7 @@ function sha256(input) {
 }
 function readSafe(filePath) {
   try {
-    return fs21.readFileSync(filePath, "utf-8");
+    return fs22.readFileSync(filePath, "utf-8");
   } catch {
     return "";
   }
@@ -6976,9 +7115,9 @@ function readBrandManifest() {
 function walkMdFiles3(dir) {
   const results = [];
   try {
-    const entries = fs21.readdirSync(dir, { withFileTypes: true });
+    const entries = fs22.readdirSync(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const full = path12.join(dir, entry.name);
+      const full = path13.join(dir, entry.name);
       if (entry.isDirectory()) {
         results.push(...walkMdFiles3(full));
       } else if (entry.name.endsWith(".md")) {
@@ -6989,9 +7128,9 @@ function walkMdFiles3(dir) {
   }
   return results.sort();
 }
-function parseFrontmatter3(filePath) {
+function parseFrontmatter4(filePath) {
   try {
-    const content = fs21.readFileSync(filePath, "utf-8");
+    const content = fs22.readFileSync(filePath, "utf-8");
     const match = content.match(/^---\n([\s\S]*?)\n---/);
     if (!match) {
       return { type: "" };
@@ -7006,7 +7145,7 @@ function parseFrontmatter3(filePath) {
 async function extractBrand(apiConfig, model) {
   const corpus = buildCorpus();
   if (!corpus.trim()) {
-    log11.debug("No spec corpus \u2014 emitting empty brand");
+    log12.debug("No spec corpus \u2014 emitting empty brand");
     return { version: 1 };
   }
   let responseText = "";
@@ -7037,17 +7176,17 @@ async function extractBrand(apiConfig, model) {
           toolNames: []
         });
       } else if (event.type === "error") {
-        log11.error("Brand extraction stream error", { error: event.error });
+        log12.error("Brand extraction stream error", { error: event.error });
         return null;
       }
     }
   } catch (err) {
-    log11.error("Brand extraction threw", { error: err?.message });
+    log12.error("Brand extraction threw", { error: err?.message });
     return null;
   }
   const parsed = parseJsonResponse(responseText);
   if (!parsed) {
-    log11.warn("Brand extraction returned unparseable JSON", {
+    log12.warn("Brand extraction returned unparseable JSON", {
       preview: responseText.slice(0, 200)
     });
     return null;
@@ -7201,14 +7340,14 @@ function pickFont(raw) {
 }
 function persistBrand(brand, inputHash) {
   const tmp = `${BRAND_FILE}.tmp`;
-  fs21.writeFileSync(tmp, JSON.stringify(brand, null, 2), "utf-8");
-  fs21.renameSync(tmp, BRAND_FILE);
+  fs22.writeFileSync(tmp, JSON.stringify(brand, null, 2), "utf-8");
+  fs22.renameSync(tmp, BRAND_FILE);
   const cache = { inputHash, generatedAt: Date.now() };
-  fs21.writeFileSync(CACHE_FILE, JSON.stringify(cache, null, 2), "utf-8");
+  fs22.writeFileSync(CACHE_FILE, JSON.stringify(cache, null, 2), "utf-8");
 }
 function readCache() {
   try {
-    const raw = fs21.readFileSync(CACHE_FILE, "utf-8");
+    const raw = fs22.readFileSync(CACHE_FILE, "utf-8");
     const parsed = JSON.parse(raw);
     if (parsed && typeof parsed.inputHash === "string" && typeof parsed.generatedAt === "number") {
       return parsed;
@@ -7220,7 +7359,7 @@ function readCache() {
 }
 
 // src/brandExtraction/trigger.ts
-var log12 = createLogger("brandExtraction:trigger");
+var log13 = createLogger("brandExtraction:trigger");
 var inflight = false;
 var dirty = false;
 function triggerBrandExtraction(apiConfig, model) {
@@ -7230,7 +7369,7 @@ function triggerBrandExtraction(apiConfig, model) {
   }
   inflight = true;
   void runExtraction(apiConfig, model).catch((err) => {
-    log12.error("Brand extraction failed", { error: err?.message });
+    log13.error("Brand extraction failed", { error: err?.message });
   }).finally(() => {
     inflight = false;
     if (dirty) {
@@ -7438,7 +7577,7 @@ function friendlyError(raw) {
 }
 
 // src/agent.ts
-var log13 = createLogger("agent");
+var log14 = createLogger("agent");
 var BRAND_TRIGGERING_TOOLS = /* @__PURE__ */ new Set(["writeSpec", "editSpec"]);
 function getTextContent(blocks) {
   return blocks.filter((b) => b.type === "text").map((b) => b.text).join("");
@@ -7492,12 +7631,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;
-  log13.info("Turn started", {
+  log14.info("Turn started", {
     requestId,
     model,
     buildModel: buildModelOverride,
@@ -7668,7 +7806,6 @@ async function runTurn(params) {
           system,
           messages: cleanMessagesForApi(state.messages),
           tools: tools2,
-          excludeToolsFromClearing,
           signal
         },
         {
@@ -7760,7 +7897,7 @@ async function runTurn(params) {
             const acc = toolInputAccumulators.get(event.id);
             const wasStreamed = acc?.started ?? false;
             const isInputStreaming = !!tool?.streaming?.partialInput;
-            log13.info("Tool received", {
+            log14.info("Tool received", {
               requestId,
               toolCallId: event.id,
               name: event.name
@@ -7883,7 +8020,7 @@ async function runTurn(params) {
       });
       return;
     }
-    log13.info("Tools executing", {
+    log14.info("Tools executing", {
       requestId,
       count: toolCalls.length,
       tools: toolCalls.map((tc) => tc.name)
@@ -7930,7 +8067,7 @@ async function runTurn(params) {
             let result;
             if (EXTERNAL_TOOLS.has(tc.name) && resolveExternalTool) {
               saveSession(state);
-              log13.info("Waiting for external tool result", {
+              log14.info("Waiting for external tool result", {
                 requestId,
                 toolCallId: tc.id,
                 name: tc.name
@@ -7998,7 +8135,7 @@ async function runTurn(params) {
         if (!isBackgroundCall(tc)) {
           toolRegistry?.unregister(tc.id);
         }
-        log13.info("Tool completed", {
+        log14.info("Tool completed", {
           requestId,
           toolCallId: tc.id,
           name: tc.name,
@@ -8061,13 +8198,13 @@ async function runTurn(params) {
 // src/headless/attachments.ts
 import { mkdirSync, existsSync } from "fs";
 import { writeFile } from "fs/promises";
-import { basename, join, extname } from "path";
-var log14 = createLogger("headless:attachments");
+import { basename as basename2, join, extname as extname2 } from "path";
+var log15 = createLogger("headless:attachments");
 var UPLOADS_DIR = "src/.user-uploads";
 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()}`;
@@ -8078,7 +8215,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}`)) {
@@ -8089,7 +8226,7 @@ function resolveUniqueFilename(name, claimed) {
 var IMAGE_EXTENSIONS = /* @__PURE__ */ new Set([".png", ".jpg", ".jpeg", ".gif", ".webp"]);
 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);
@@ -8118,7 +8255,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
@@ -8132,7 +8269,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 {
         }
@@ -8355,7 +8492,7 @@ function getActionChain(startName) {
 }
 
 // src/headless/index.ts
-var log15 = createLogger("headless");
+var log16 = createLogger("headless");
 var EXTERNAL_TOOL_TIMEOUT_MS = 3e5;
 var USER_FACING_TOOLS = /* @__PURE__ */ new Set([
   "promptUser",
@@ -8500,7 +8637,7 @@ var HeadlessSession = class {
     }
     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
       });
@@ -8577,7 +8714,7 @@ var HeadlessSession = class {
     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
@@ -8594,7 +8731,7 @@ var HeadlessSession = class {
   }
   onBackgroundComplete = (toolCallId, name, result, subAgentMessages) => {
     this.pendingBlockUpdates.push({ toolCallId, result, subAgentMessages });
-    log15.info("Background complete", {
+    log16.info("Background complete", {
       toolCallId,
       name,
       requestId: this.currentRequestId
@@ -8631,17 +8768,17 @@ var HeadlessSession = class {
       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
       });
@@ -8832,7 +8969,7 @@ var HeadlessSession = class {
     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)
       });
@@ -8848,7 +8985,7 @@ var HeadlessSession = class {
           attachmentHeader = header;
         }
       } catch (err) {
-        log15.warn("Attachment persistence failed", { error: err.message });
+        log16.warn("Attachment persistence failed", { error: err.message });
       }
     }
     let resolved = null;
@@ -8912,7 +9049,7 @@ var HeadlessSession = class {
           error: "Turn ended unexpectedly"
         });
       }
-      log15.info("Turn complete", {
+      log16.info("Turn complete", {
         requestId,
         durationMs: Date.now() - this.turnStart
       });
@@ -8924,7 +9061,7 @@ var HeadlessSession = class {
           error: err.message
         });
       }
-      log15.warn("Command failed", {
+      log16.warn("Command failed", {
         action: "message",
         requestId,
         error: err.message
@@ -9081,7 +9218,7 @@ var HeadlessSession = class {
     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)
@@ -9090,7 +9227,7 @@ var HeadlessSession = class {
       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 ?? "";
@@ -9099,7 +9236,7 @@ var HeadlessSession = class {
         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);
@@ -9112,7 +9249,7 @@ var HeadlessSession = class {
         ...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,