@mindstudio-ai/remy 0.1.239 → 0.1.240

package/dist/index.js

@@ -1522,7 +1522,7 @@ var init_assets = __esm({
 });
 
 // src/compaction/index.ts
-async function compactConversation(messages, apiConfig, system, tools2, model) {
+async function compactConversation(messages, apiConfig, model) {
   const endIndex = findSafeInsertionPoint(messages);
   const summaries = [];
   const tasks = [];
@@ -1530,6 +1530,7 @@ async function compactConversation(messages, apiConfig, system, tools2, model) {
     messages,
     endIndex
   );
+  let conversationFailed = false;
   if (conversationMessages.length > 0) {
     tasks.push(
       generateSummary(
@@ -1537,12 +1538,12 @@ async function compactConversation(messages, apiConfig, system, tools2, model) {
         "conversation",
         CONVERSATION_SUMMARY_PROMPT,
         conversationMessages,
-        system,
-        tools2,
         model
       ).then((text) => {
         if (text) {
           summaries.push({ name: "conversation", text });
+        } else {
+          conversationFailed = true;
         }
       })
     );
@@ -1560,18 +1561,25 @@ async function compactConversation(messages, apiConfig, system, tools2, model) {
           name,
           SUBAGENT_SUMMARY_PROMPT,
           subagentMessages,
-          system,
-          tools2,
           model
         ).then((text) => {
           if (text) {
             summaries.push({ name, text });
+          } else {
+            log2.warn("Subagent summary unusable \u2014 leaving its history intact", {
+              name
+            });
           }
         })
       );
     }
   }
   await Promise.all(tasks);
+  if (conversationFailed) {
+    throw new Error(
+      "Could not summarize the conversation \u2014 the model did not return a usable summary. History left intact."
+    );
+  }
   const checkpointMessages = summaries.map((s) => ({
     role: "user",
     hidden: true,
@@ -1716,65 +1724,106 @@ function serializeForSummary(messages) {
   }
   return lines.join("\n\n");
 }
-async function generateSummary(apiConfig, name, compactionPrompt, messagesToSummarize, mainSystem, mainTools, model) {
+async function generateSummary(apiConfig, name, compactionPrompt, messagesToSummarize, model, opts = {}) {
   const serialized = serializeForSummary(messagesToSummarize);
   if (!serialized.trim()) {
     return null;
   }
-  if (serialized.length > CHUNK_CHAR_LIMIT && messagesToSummarize.length > 1) {
+  const splittable = messagesToSummarize.length > 1;
+  const allowRetry = opts.allowRetry ?? true;
+  if (splittable && (opts.forceChunk || serialized.length > CHUNK_CHAR_LIMIT)) {
     const mid = Math.floor(messagesToSummarize.length / 2);
+    const halves = [
+      messagesToSummarize.slice(0, mid),
+      messagesToSummarize.slice(mid)
+    ];
     log2.info("Chunking summary", {
       name,
       messageCount: messagesToSummarize.length,
-      serializedLength: serialized.length
+      serializedLength: serialized.length,
+      forced: !!opts.forceChunk
     });
-    const [first, second] = await Promise.all([
-      generateSummary(
-        apiConfig,
-        `${name} [pt1]`,
-        compactionPrompt,
-        messagesToSummarize.slice(0, mid),
-        mainSystem,
-        mainTools,
-        model
-      ),
-      generateSummary(
-        apiConfig,
-        `${name} [pt2]`,
-        compactionPrompt,
-        messagesToSummarize.slice(mid),
-        mainSystem,
-        mainTools,
-        model
+    const results = await Promise.all(
+      halves.map(
+        (half, i) => generateSummary(
+          apiConfig,
+          `${name} [pt${i + 1}]`,
+          compactionPrompt,
+          half,
+          model,
+          // A split driven by size gets its children a retry of their own. A
+          // split that IS the retry does not, or a model that will not
+          // summarize at any size fans out call after call before giving up.
+          { allowRetry: opts.forceChunk ? false : allowRetry }
+        )
       )
-    ]);
-    const parts = [first, second].filter((p) => !!p);
+    );
+    const lost = results.some(
+      (r, i) => r === null && serializeForSummary(halves[i]).trim()
+    );
+    if (lost) {
+      return null;
+    }
+    const parts = results.filter((p) => p !== null);
     return parts.length > 0 ? parts.join("\n\n---\n\n") : null;
   }
   log2.info("Generating summary", {
     name,
     messageCount: messagesToSummarize.length,
-    cacheReuse: !!mainSystem
+    serializedLength: serialized.length
   });
-  let summaryText = "";
-  const useMainCache = !!mainSystem;
-  const system = useMainCache ? mainSystem : compactionPrompt;
-  const tools2 = [];
-  const userContent = useMainCache ? `${compactionPrompt}
+  const summaryText = await runSummaryCall(
+    apiConfig,
+    name,
+    compactionPrompt,
+    serialized,
+    model
+  );
+  if (summaryText === null) {
+    return null;
+  }
+  if (summaryText.length >= MIN_SUMMARY_CHARS) {
+    log2.info("Summary generated", { name, summaryLength: summaryText.length });
+    return summaryText;
+  }
+  log2.warn("Summary too short to be real", {
+    name,
+    summaryLength: summaryText.length,
+    minimum: MIN_SUMMARY_CHARS,
+    serializedLength: serialized.length,
+    retrying: splittable && allowRetry
+  });
+  if (!splittable || !allowRetry) {
+    return null;
+  }
+  return generateSummary(
+    apiConfig,
+    name,
+    compactionPrompt,
+    messagesToSummarize,
+    model,
+    { forceChunk: true, allowRetry: false }
+  );
+}
+async function runSummaryCall(apiConfig, name, compactionPrompt, serialized, model) {
+  const userContent = `Conversation to summarize:
 
----
+${serialized}
 
-Conversation to summarize:
+---
 
-${serialized}` : serialized;
+Write the summary of the conversation above, following your instructions.`;
+  let summaryText = "";
   const iterStart = Date.now();
-  for await (const event of streamChat({
+  for await (const event of streamChatWithRetry({
     ...apiConfig,
     model,
     subAgentId: "conversationSummarizer",
-    system,
+    system: compactionPrompt,
     messages: [{ role: "user", content: userContent }],
-    tools: tools2
+    // Always empty. With a toolset available the model picks `tool_use` over
+    // producing a summary, leaving summaryText empty.
+    tools: []
   })) {
     if (event.type === "text") {
       summaryText += event.text;
@@ -1801,10 +1850,9 @@ ${serialized}` : serialized;
     log2.warn("Empty summary generated", { name });
     return null;
   }
-  log2.info("Summary generated", { name, summaryLength: summaryText.length });
   return summaryText.trim();
 }
-var log2, CONVERSATION_SUMMARY_PROMPT, SUBAGENT_SUMMARY_PROMPT, SUMMARIZABLE_SUBAGENTS, CHUNK_CHAR_LIMIT;
+var log2, CONVERSATION_SUMMARY_PROMPT, SUBAGENT_SUMMARY_PROMPT, SUMMARIZABLE_SUBAGENTS, CHUNK_CHAR_LIMIT, MIN_SUMMARY_CHARS;
 var init_compaction = __esm({
   "src/compaction/index.ts"() {
     "use strict";
@@ -1817,137 +1865,8 @@ var init_compaction = __esm({
     CONVERSATION_SUMMARY_PROMPT = readAsset("compaction", "conversation.md");
     SUBAGENT_SUMMARY_PROMPT = readAsset("compaction", "subagent.md");
     SUMMARIZABLE_SUBAGENTS = ["visualDesignExpert", "productVision"];
-    CHUNK_CHAR_LIMIT = 24e5;
-  }
-});
-
-// src/prompt/static/projectContext.ts
-import fs10 from "fs";
-import path4 from "path";
-function loadProjectManifest() {
-  try {
-    const manifest = fs10.readFileSync("mindstudio.json", "utf-8");
-    return `
-## Project Manifest (mindstudio.json)
-\`\`\`json
-${manifest}
-\`\`\``;
-  } catch {
-    return "";
-  }
-}
-function loadSpecFileMetadata() {
-  try {
-    const files = walkMdFiles("src");
-    if (files.length === 0) {
-      return "";
-    }
-    const entries = [];
-    for (const filePath of files) {
-      const { name, description, type } = parseFrontmatter(filePath);
-      let line = `- ${filePath}`;
-      if (name) {
-        line += ` \u2014 "${name}"`;
-      }
-      if (type) {
-        line += ` (${type})`;
-      }
-      if (description) {
-        line += ` \u2014 ${description}`;
-      }
-      entries.push(line);
-    }
-    return `
-## Spec Files
-${entries.join("\n")}`;
-  } catch {
-    return "";
-  }
-}
-function walkMdFiles(dir) {
-  const results = [];
-  try {
-    const entries = fs10.readdirSync(dir, { withFileTypes: true });
-    for (const entry of entries) {
-      const full = path4.join(dir, entry.name);
-      if (entry.isDirectory()) {
-        results.push(...walkMdFiles(full));
-      } else if (entry.name.endsWith(".md")) {
-        results.push(full);
-      }
-    }
-  } catch {
-  }
-  return results.sort();
-}
-function parseFrontmatter(filePath) {
-  try {
-    const content = fs10.readFileSync(filePath, "utf-8");
-    const match = content.match(/^---\n([\s\S]*?)\n---/);
-    if (!match) {
-      return { name: "", description: "", type: "" };
-    }
-    const fm = match[1];
-    const name = fm.match(/^name:\s*(.+)$/m)?.[1]?.trim() ?? "";
-    const description = fm.match(/^description:\s*(.+)$/m)?.[1]?.trim() ?? "";
-    const type = fm.match(/^type:\s*(.+)$/m)?.[1]?.trim() ?? "";
-    return { name, description, type };
-  } catch {
-    return { name: "", description: "", type: "" };
-  }
-}
-function loadPlanStatus(onboardingState) {
-  try {
-    const content = fs10.readFileSync(".remy-plan.md", "utf-8");
-    const match = content.match(/^---\n([\s\S]*?)\n---/);
-    const status = match?.[1]?.match(/^status:\s*(.+)$/m)?.[1]?.trim();
-    if (status === "pending" && onboardingState === "intake") {
-      return `
-<pending_initial_plan>
-This is your initial plan, proposed via writePlan and awaiting the user's decision. The user approves it by pressing "Start Building" \u2014 you'll get an approveInitialPlan message when they do, and it will tell you to begin. Until then, stay in intake: keep discussing, and revise with writePlan if the user asks. Don't start building on your own, even if the user says "looks good" in chat.
-</pending_initial_plan>`;
-    }
-    if (status === "pending") {
-      return `
-<pending_plan>
-You have a pending implementation plan in .remy-plan.md awaiting user approval. Do NOT begin implementing the plan until the user approves it. You may continue chatting, answering questions, and revising the plan if asked. To revise, call writePlan again with updated content. When the user approves the plan (via chat or any other signal), call updatePlanStatus with status "approved" before beginning any implementation work.
-</pending_plan>`;
-    }
-    if (status === "approved") {
-      return `
-<approved_plan>
-The user has approved your implementation plan in .remy-plan.md. You may reference it during implementation. Delete the file when you have finished all planned work.
-</approved_plan>`;
-    }
-    return "";
-  } catch {
-    return "";
-  }
-}
-function loadProjectFileListing() {
-  try {
-    const entries = fs10.readdirSync(".", { withFileTypes: true });
-    const listing = entries.filter((e) => e.name !== ".git" && e.name !== "node_modules").sort((a, b) => {
-      if (a.isDirectory() && !b.isDirectory()) {
-        return -1;
-      }
-      if (!a.isDirectory() && b.isDirectory()) {
-        return 1;
-      }
-      return a.name.localeCompare(b.name);
-    }).map((e) => e.isDirectory() ? `${e.name}/` : e.name).join("\n");
-    return `
-## Project Files
-\`\`\`
-${listing}
-\`\`\``;
-  } catch {
-    return "";
-  }
-}
-var init_projectContext = __esm({
-  "src/prompt/static/projectContext.ts"() {
-    "use strict";
+    CHUNK_CHAR_LIMIT = 2e5;
+    MIN_SUMMARY_CHARS = 400;
   }
 });
 
@@ -2111,220 +2030,430 @@ var init_surfaces = __esm({
   }
 });
 
-// src/orgContext.ts
-async function initOrgContext(config) {
-  try {
-    cached = await fetchRemyContext(config);
-    const orgDefaultModels2 = filterModelPicks(cached?.defaultModels);
-    setOrgDefaultModels(orgDefaultModels2);
-    log3.debug("org context loaded", {
-      delegatedAvailable: cached?.auth?.delegatedAvailable ?? false,
-      requireDelegatedOnly: cached?.auth?.requireDelegatedOnly ?? false,
-      hasOrgName: !!cached?.org?.name,
-      orgDefaultModels: orgDefaultModels2
-    });
-  } catch (err) {
-    cached = null;
-    setOrgDefaultModels({});
-    log3.debug("org context init failed", { error: err.message });
-  }
+// src/automatedActions/sentinel.ts
+function sentinel(name) {
+  return `@@automated::${name}@@`;
 }
-function getOrgContext() {
-  return cached;
+function automatedMessage(name, body) {
+  return body ? `${sentinel(name)}
+${body}` : sentinel(name);
 }
-function renderOrgContextBlock() {
-  const ctx = cached;
-  const auth = ctx?.auth;
-  if (!auth || !auth.delegatedAvailable && !auth.requireDelegatedOnly) {
-    return "";
-  }
-  const lines = ["<org_auth_context>"];
-  if (ctx?.org?.name && ctx?.org?.name !== "Personal Workspace") {
-    lines.push(`This app is owned by the organization "${ctx.org.name}".`);
-  }
-  if (auth.delegatedAvailable) {
-    lines.push(
-      '"Sign in with Remy" (platform-delegated sign-in) is an available auth type for this app: organization members can sign in without a verification code.'
-    );
+function hasSentinel(text, name) {
+  return text.startsWith(sentinel(name));
+}
+function isAutomatedMessage(text) {
+  return text.startsWith("@@automated::");
+}
+function parseSentinel(text) {
+  const match = text.match(/^@@automated::(\w+)@@(.*)/s);
+  if (!match) {
+    return null;
   }
-  if (auth.requireDelegatedOnly) {
-    lines.push(
-      "This organization requires delegated sign-in: non-delegated human auth methods (email-code, sms-code) are blocked at the platform edge for its apps."
-    );
+  return { name: match[1], remainder: match[2] };
+}
+function stripSentinelLine(text) {
+  return text.replace(/^@@automated::[^@]*@@[^\n]*\n?/, "");
+}
+function buildBackgroundResultsMessage(results) {
+  const xml = results.map(
+    (r) => `<tool_result id="${r.toolCallId}" name="${r.name}">
+${r.result}
+</tool_result>`
+  ).join("\n\n");
+  const plural = results.length > 1 ? "s" : "";
+  const body = `This is an automated message containing the result${plural} of ${results.length > 1 ? "tool calls" : "a tool call"} that ${results.length > 1 ? "have" : "has"} been working in the background. This is not a direct message from the user.
+<background_results>
+${xml}
+</background_results>`;
+  return automatedMessage("background_results", body);
+}
+function mergeBackgroundResultsMessages(messages) {
+  const results = [];
+  const toolRe = /<tool_result id="([^"]+)" name="([^"]+)">\n([\s\S]*?)\n<\/tool_result>/g;
+  for (const msg of messages) {
+    for (const m of msg.matchAll(toolRe)) {
+      results.push({ toolCallId: m[1], name: m[2], result: m[3] });
+    }
   }
-  lines.push("</org_auth_context>");
-  return lines.join("\n");
+  return buildBackgroundResultsMessage(results);
 }
-var log3, cached;
-var init_orgContext = __esm({
-  "src/orgContext.ts"() {
+var init_sentinel = __esm({
+  "src/automatedActions/sentinel.ts"() {
     "use strict";
-    init_api();
-    init_surfaces();
-    init_logger();
-    log3 = createLogger("orgContext");
-    cached = null;
   }
 });
 
-// src/prompt/index.ts
-function resolveIncludes(template) {
-  const result = template.replace(
-    /\{\{([^}]+)\}\}/g,
-    (_, filePath) => readAsset("prompt", filePath.trim())
-  );
-  return result.replace(/\n{3,}/g, "\n\n").trim();
+// src/subagents/common/cleanMessages.ts
+function findLastSummaryCheckpoint(messages, name) {
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const msg = messages[i];
+    if (!Array.isArray(msg.content)) {
+      continue;
+    }
+    for (const block of msg.content) {
+      if (block.type === "summary" && block.name === name) {
+        return i;
+      }
+    }
+  }
+  return -1;
 }
-function buildSystemPrompt(onboardingState, viewContext) {
-  const projectContext = [
-    loadProjectManifest(),
-    loadSpecFileMetadata(),
-    loadProjectFileListing()
-  ].filter(Boolean).join("\n");
-  const now = (/* @__PURE__ */ new Date()).toLocaleDateString("en-US", {
-    month: "long",
-    day: "numeric",
-    year: "numeric"
-  });
-  const template = `
-{{static/identity.md}}
-
-Current date: ${now}
-
-<platform_docs>
-  <platform>
-  {{compiled/platform.md}}
-  </platform>
-
-  <manifest>
-  {{compiled/manifest.md}}
-  </manifest>
-
-  <tables>
-  {{compiled/tables.md}}
-  </tables>
-
-  <methods>
-  {{compiled/methods.md}}
-  </methods>
-
-  <auth>
-  {{compiled/auth.md}}
-  </auth>
-
-  <dev_and_deploy>
-  {{compiled/dev-and-deploy.md}}
-  </dev_and_deploy>
-
-  <design>
-  {{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>
-
-  <interfaces>
-  {{compiled/interfaces.md}}
-  </interfaces>
-
-  <scenarios>
-  {{compiled/scenarios.md}}
-  </scenarios>
-
-  <secrets>
-  {{compiled/secrets.md}}
-  </secrets>
-</platform_docs>
-
-<mindstudio_agent_sdk_docs>
-  {{compiled/sdk-actions.md}}
-
-  {{compiled/task-agents.md}}
-</mindstudio_agent_sdk_docs>
-
-<mindstudio_flavored_markdown_spec_docs>
-  {{compiled/msfm.md}}
-</mindstudio_flavored_markdown_spec_docs>
-
-<intake_mode_instructions>
-  {{static/intake.md}}
-</intake_mode_instructions>
-
-<spec_authoring_instructions>
-  {{static/authoring.md}}
-</spec_authoring_instructions>
-
-<team>
-  {{static/team.md}}
-</team>
-
-<code_authoring_instructions>
-{{static/coding.md}}
-
-<typescript_lsp>
-{{static/lsp.md}}
-</typescript_lsp>
-</code_authoring_instructions>
-
-<conversation_summaries>
-Your conversation history may include <prior_conversation_summary> blocks in the user's messages. These are automated summaries of earlier messages that have been compacted to save context space. The user does not see this summary, they see the full conversation history in their UI. Treat the summary as ground truth for what happened before, but do not reference it directly to the user ("as mentioned in the summary..."). Just continue naturally as if you remember the prior work.
-
-Old tool results are periodically cleared from the conversation to save context space. This is automatic and expected \u2014 you don't need to note down or preserve information from tool results. If you need to reference something from an earlier tool call, just re-read the file or re-run the query.
-</conversation_summaries>
-
-<project_onboarding>
-New projects progress through three onboarding states. The user might skip this entirely and jump straight into working on the existing scaffold (which defaults to onboardingFinished), but ideally new projects move through each phase:
-
-- **intake**: Gathering requirements. The project has scaffold code (a "hello world" starter) but it's not the user's app yet. Focus on understanding what they want to build, not on the existing code. Intake ends with a plan proposal via writePlan.
-- **building**: The user approved the initial plan. The agent is writing the spec and building the app. This can take a while and involves heavy tool use (spec authoring, design expert consultation, code generation, verification, polishing).
-- **buildComplete**: The build is done. The frontend is showing the user a reveal experience (pitch deck, app preview). The agent does not need to do anything in this state; the frontend advances to onboardingFinished when the user is ready.
-- **onboardingFinished**: The project is built and ready. Full development mode with all tools available. From here on, keep spec and code in sync as changes are made.
-</project_onboarding>
-
-{{static/instructions.md}}
-
-<!-- cache_breakpoint -->
-
-<current_project_onboarding_state>
-  ${onboardingState ?? "onboardingFinished"}
-</current_project_onboarding_state>
+function fixOrphanedToolCalls(messages) {
+  const toolResultIds = /* @__PURE__ */ new Set();
+  for (const msg of messages) {
+    if (msg.role === "user" && msg.toolCallId) {
+      toolResultIds.add(msg.toolCallId);
+    }
+  }
+  const result = [];
+  for (const msg of messages) {
+    result.push(msg);
+    if (msg.role !== "assistant" || !Array.isArray(msg.content)) {
+      continue;
+    }
+    const toolBlocks = msg.content.filter(
+      (b) => b.type === "tool"
+    );
+    const orphans = toolBlocks.filter((tc) => !toolResultIds.has(tc.id));
+    for (const tc of orphans) {
+      result.push({
+        role: "user",
+        content: "Error: tool result lost (session recovered)",
+        toolCallId: tc.id,
+        isToolError: true
+      });
+      toolResultIds.add(tc.id);
+    }
+  }
+  return result;
+}
+function cleanMessagesForApi(messages) {
+  const checkpointIdx = findLastSummaryCheckpoint(messages, "conversation");
+  let startIdx = 0;
+  const prefix = [];
+  if (checkpointIdx !== -1) {
+    const checkpointMsg = messages[checkpointIdx];
+    const blocks = checkpointMsg.content;
+    const summaryBlock = blocks.find(
+      (b) => b.type === "summary" && b.name === "conversation"
+    );
+    if (summaryBlock && summaryBlock.type === "summary") {
+      prefix.push({
+        role: "user",
+        content: `<conversation_summary>
+${summaryBlock.text}
+</conversation_summary>`,
+        hidden: true
+      });
+    }
+    startIdx = checkpointIdx + 1;
+  }
+  const messagesToProcess = fixOrphanedToolCalls(messages.slice(startIdx));
+  const toolUseIds = /* @__PURE__ */ new Set();
+  for (const msg of messagesToProcess) {
+    if (msg.role === "assistant" && Array.isArray(msg.content)) {
+      for (const block of msg.content) {
+        if (block.type === "tool") {
+          toolUseIds.add(block.id);
+        }
+      }
+    }
+  }
+  const cleaned = messagesToProcess.filter((msg) => {
+    if (Array.isArray(msg.content)) {
+      const blocks = msg.content;
+      if (blocks.some((b) => b.type === "summary")) {
+        return false;
+      }
+    }
+    if (msg.role === "assistant" && Array.isArray(msg.content) && msg.content.length === 0) {
+      return false;
+    }
+    if (msg.role === "user" && msg.toolCallId && !toolUseIds.has(msg.toolCallId)) {
+      return false;
+    }
+    return true;
+  }).map((msg) => {
+    if (msg.role === "user" && typeof msg.content === "string") {
+      const { attachmentHeader, ...rest } = msg;
+      let content = isAutomatedMessage(msg.content) ? stripSentinelLine(msg.content) : msg.content;
+      if (attachmentHeader) {
+        content = content ? `${attachmentHeader}
 
-<project_context>
-${projectContext}
-</project_context>
+${content}` : attachmentHeader;
+      }
+      return { ...rest, content };
+    }
+    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 cleaned2 = {
+      role: msg.role,
+      content: text
+    };
+    if (toolCalls.length > 0) {
+      cleaned2.toolCalls = toolCalls;
+    }
+    if (msg.providerMetadata) {
+      cleaned2.providerMetadata = msg.providerMetadata;
+    }
+    if (msg.hidden) {
+      cleaned2.hidden = true;
+    }
+    return cleaned2;
+  });
+  return [...prefix, ...cleaned];
+}
+var init_cleanMessages = __esm({
+  "src/subagents/common/cleanMessages.ts"() {
+    "use strict";
+    init_sentinel();
+  }
+});
 
-${renderOrgContextBlock()}
+// src/toolResultCap.ts
+function capToolResult(result) {
+  const total = Buffer.byteLength(result, "utf-8");
+  if (total <= MAX_TOOL_RESULT_BYTES) {
+    return result;
+  }
+  const head = Buffer.from(result, "utf-8").subarray(0, MAX_TOOL_RESULT_BYTES).toString("utf-8");
+  return head + `
 
-<view_context>
-The user is currently in ${viewContext?.mode ?? "code"} mode.
-${viewContext?.activeFile ? `Active file: ${viewContext.activeFile}` : ""}
-</view_context>
+(tool result truncated at ${(MAX_TOOL_RESULT_BYTES / 1024).toFixed(0)}KB of ${(total / 1024).toFixed(0)}KB \u2014 too large to keep in context. Narrow the call (select fewer fields, paginate, or query a subset) instead of fetching everything.)`;
+}
+var MAX_TOOL_RESULT_BYTES;
+var init_toolResultCap = __esm({
+  "src/toolResultCap.ts"() {
+    "use strict";
+    MAX_TOOL_RESULT_BYTES = 256 * 1024;
+  }
+});
 
-${loadPlanStatus(onboardingState)}
-`;
-  return resolveIncludes(template);
+// src/session.ts
+import fs10 from "fs";
+import path4 from "path";
+function loadSession(state) {
+  pruneArchives();
+  try {
+    const raw = fs10.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);
+      log3.info("Session loaded", {
+        messageCount: state.messages.length,
+        ...state.models && { models: state.models }
+      });
+      return true;
+    }
+  } catch {
+  }
+  return false;
+}
+function capOversizedResults(msg) {
+  if (msg.role === "assistant" && Array.isArray(msg.content)) {
+    for (const block of msg.content) {
+      if (block.type === "tool" && typeof block.result === "string") {
+        block.result = capToolResult(block.result);
+      }
+    }
+  } else if (msg.role === "user" && msg.toolCallId && typeof msg.content === "string") {
+    msg.content = capToolResult(msg.content);
+  }
+}
+function sanitizeMessages(messages) {
+  const result = [];
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
+    capOversizedResults(msg);
+    result.push(msg);
+    if (msg.role !== "assistant" || !Array.isArray(msg.content)) {
+      continue;
+    }
+    const toolBlocks = msg.content.filter(
+      (b) => b.type === "tool"
+    );
+    if (toolBlocks.length === 0) {
+      continue;
+    }
+    const resultIds = /* @__PURE__ */ new Set();
+    for (let j = i + 1; j < messages.length; j++) {
+      const next = messages[j];
+      if (next.role === "user" && next.toolCallId) {
+        resultIds.add(next.toolCallId);
+      } else {
+        break;
+      }
+    }
+    for (const tc of toolBlocks) {
+      if (!resultIds.has(tc.id)) {
+        result.push({
+          role: "user",
+          content: "Error: tool result lost (session recovered)",
+          toolCallId: tc.id,
+          isToolError: true
+        });
+      }
+    }
+  }
+  return result;
+}
+function buildPayload(state) {
+  const payload = { messages: state.messages };
+  if (state.models && Object.keys(state.models).length > 0) {
+    payload.models = state.models;
+  }
+  return payload;
+}
+function archiveMessages(messages, label, models) {
+  fs10.mkdirSync(ARCHIVE_DIR, { recursive: true });
+  const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+  let dest = path4.join(ARCHIVE_DIR, `${label}-${ts}.json`);
+  let n = 1;
+  while (fs10.existsSync(dest)) {
+    dest = path4.join(ARCHIVE_DIR, `${label}-${ts}-${n++}.json`);
+  }
+  const payload = { messages };
+  if (models && Object.keys(models).length > 0) {
+    payload.models = models;
+  }
+  fs10.writeFileSync(dest, JSON.stringify(payload), "utf-8");
+  log3.info("Session archived", { label, dest, messageCount: messages.length });
+  pruneArchives();
+  return dest;
+}
+function pruneArchives() {
+  try {
+    const entries = fs10.readdirSync(ARCHIVE_DIR).filter((name) => /^(cleared|rotated)-.*\.json$/.test(name));
+    if (entries.length <= 1) {
+      return;
+    }
+    const sortKey = (name) => name.replace(/^(cleared|rotated)-/, "");
+    const archives = entries.map((name) => ({
+      name,
+      size: fs10.statSync(path4.join(ARCHIVE_DIR, name)).size
+    })).sort((a, b) => sortKey(b.name).localeCompare(sortKey(a.name)));
+    let kept = 0;
+    let cut = archives.length;
+    for (let i = 0; i < archives.length; i++) {
+      if (i === 0 || kept + archives[i].size <= ARCHIVE_RETENTION_BYTES) {
+        kept += archives[i].size;
+      } else {
+        cut = i;
+        break;
+      }
+    }
+    let removed = 0;
+    let freed = 0;
+    for (let i = cut; i < archives.length; i++) {
+      try {
+        fs10.unlinkSync(path4.join(ARCHIVE_DIR, archives[i].name));
+        freed += archives[i].size;
+        removed++;
+      } catch {
+      }
+    }
+    if (removed > 0) {
+      log3.info("Session archives pruned", {
+        removed,
+        freedBytes: freed,
+        keptBytes: kept
+      });
+    }
+  } catch {
+  }
+}
+function rotate(state) {
+  const messages = state.messages;
+  if (messages.length === 0) {
+    return false;
+  }
+  let tailBytes = 0;
+  let scrollbackStart = 0;
+  for (let i = messages.length - 1; i >= 0; i--) {
+    tailBytes += Buffer.byteLength(JSON.stringify(messages[i]), "utf-8") + 1;
+    if (tailBytes >= RETAIN_TAIL_BYTES) {
+      scrollbackStart = i;
+      break;
+    }
+  }
+  const checkpointIdx = findLastSummaryCheckpoint(messages, "conversation");
+  let cut = checkpointIdx === -1 ? scrollbackStart : Math.min(scrollbackStart, checkpointIdx);
+  cut = findSafeInsertionPoint(messages, cut);
+  if (cut <= 0) {
+    return false;
+  }
+  archiveMessages(messages.slice(0, cut), "rotated", state.models);
+  state.messages = messages.slice(cut);
+  log3.info("Session rotated", {
+    archived: cut,
+    retained: state.messages.length
+  });
+  return true;
 }
-var init_prompt = __esm({
-  "src/prompt/index.ts"() {
+function saveSession(state) {
+  try {
+    let serialized = JSON.stringify(buildPayload(state));
+    if (Buffer.byteLength(serialized, "utf-8") > ROTATE_THRESHOLD_BYTES && rotate(state)) {
+      serialized = JSON.stringify(buildPayload(state));
+    }
+    fs10.writeFileSync(SESSION_FILE, serialized, "utf-8");
+    log3.info("Session saved", { messageCount: state.messages.length });
+  } catch (err) {
+    log3.warn("Session save failed", { error: err.message });
+  }
+}
+function clearSession(state) {
+  try {
+    if (state.messages.length > 0) {
+      archiveMessages(state.messages, "cleared", state.models);
+    }
+  } catch (err) {
+    log3.warn("Session archive on clear failed", { error: err.message });
+  }
+  state.messages = [];
+  try {
+    if (fs10.existsSync(SESSION_FILE)) {
+      fs10.unlinkSync(SESSION_FILE);
+    }
+  } catch (err) {
+    log3.warn("Session clear: could not remove live file", {
+      error: err.message
+    });
+  }
+}
+var log3, SESSION_FILE, ARCHIVE_DIR, ROTATE_THRESHOLD_BYTES, RETAIN_TAIL_BYTES, ARCHIVE_RETENTION_BYTES;
+var init_session = __esm({
+  "src/session.ts"() {
     "use strict";
-    init_assets();
-    init_projectContext();
-    init_orgContext();
+    init_logger();
+    init_compaction();
+    init_cleanMessages();
+    init_toolResultCap();
+    log3 = createLogger("session");
+    SESSION_FILE = ".remy-session.json";
+    ARCHIVE_DIR = ".logs/sessions";
+    ROTATE_THRESHOLD_BYTES = 32 * 1024 * 1024;
+    RETAIN_TAIL_BYTES = 16 * 1024 * 1024;
+    ARCHIVE_RETENTION_BYTES = 64 * 1024 * 1024;
   }
 });
 
 // src/compaction/trigger.ts
-function getPendingSummaries() {
-  return pendingSummaries.splice(0);
+function applyPendingSummaries(state) {
+  const summaries = pendingSummaries.splice(0);
+  if (summaries.length === 0) {
+    return;
+  }
+  const idx = findSafeInsertionPoint(state.messages);
+  state.messages.splice(idx, 0, ...summaries);
+  saveSession(state);
 }
 function setCompactionListener(l) {
   listener = l;
@@ -2335,13 +2464,9 @@ function triggerCompaction(state, apiConfig, opts = {}) {
   }
   const { blocking = false, requestId, model } = opts;
   listener?.({ type: "started", blocking, requestId });
-  const system = buildSystemPrompt("onboardingFinished");
-  const tools2 = getToolDefinitions("onboardingFinished");
   inflightCompaction = compactConversation(
     state.messages,
     apiConfig,
-    system,
-    tools2,
     resolveModel("conversationSummarizer", state.models, model)
   ).then((summaries) => {
     pendingSummaries.push(...summaries);
@@ -2362,10 +2487,9 @@ var init_trigger = __esm({
   "src/compaction/trigger.ts"() {
     "use strict";
     init_compaction();
-    init_prompt();
-    init_tools8();
     init_logger();
     init_surfaces();
+    init_session();
     log4 = createLogger("compaction:trigger");
     pendingSummaries = [];
     inflightCompaction = null;
@@ -3604,25 +3728,6 @@ ${partial}` : "[INTERRUPTED] Tool execution was stopped.";
   }
 });
 
-// src/toolResultCap.ts
-function capToolResult(result) {
-  const total = Buffer.byteLength(result, "utf-8");
-  if (total <= MAX_TOOL_RESULT_BYTES) {
-    return result;
-  }
-  const head = Buffer.from(result, "utf-8").subarray(0, MAX_TOOL_RESULT_BYTES).toString("utf-8");
-  return head + `
-
-(tool result truncated at ${(MAX_TOOL_RESULT_BYTES / 1024).toFixed(0)}KB of ${(total / 1024).toFixed(0)}KB \u2014 too large to keep in context. Narrow the call (select fewer fields, paginate, or query a subset) instead of fetching everything.)`;
-}
-var MAX_TOOL_RESULT_BYTES;
-var init_toolResultCap = __esm({
-  "src/toolResultCap.ts"() {
-    "use strict";
-    MAX_TOOL_RESULT_BYTES = 256 * 1024;
-  }
-});
-
 // src/statusWatcher.ts
 function startStatusWatcher(config) {
   const { apiConfig, getContext, onStatus, interval = 5e3, signal } = config;
@@ -3679,195 +3784,11 @@ function startStatusWatcher(config) {
     resume() {
       pauseCount = Math.max(0, pauseCount - 1);
     }
-  };
-}
-var init_statusWatcher = __esm({
-  "src/statusWatcher.ts"() {
-    "use strict";
-  }
-});
-
-// src/automatedActions/sentinel.ts
-function sentinel(name) {
-  return `@@automated::${name}@@`;
-}
-function automatedMessage(name, body) {
-  return body ? `${sentinel(name)}
-${body}` : sentinel(name);
-}
-function hasSentinel(text, name) {
-  return text.startsWith(sentinel(name));
-}
-function isAutomatedMessage(text) {
-  return text.startsWith("@@automated::");
-}
-function parseSentinel(text) {
-  const match = text.match(/^@@automated::(\w+)@@(.*)/s);
-  if (!match) {
-    return null;
-  }
-  return { name: match[1], remainder: match[2] };
-}
-function stripSentinelLine(text) {
-  return text.replace(/^@@automated::[^@]*@@[^\n]*\n?/, "");
-}
-function buildBackgroundResultsMessage(results) {
-  const xml = results.map(
-    (r) => `<tool_result id="${r.toolCallId}" name="${r.name}">
-${r.result}
-</tool_result>`
-  ).join("\n\n");
-  const plural = results.length > 1 ? "s" : "";
-  const body = `This is an automated message containing the result${plural} of ${results.length > 1 ? "tool calls" : "a tool call"} that ${results.length > 1 ? "have" : "has"} been working in the background. This is not a direct message from the user.
-<background_results>
-${xml}
-</background_results>`;
-  return automatedMessage("background_results", body);
-}
-function mergeBackgroundResultsMessages(messages) {
-  const results = [];
-  const toolRe = /<tool_result id="([^"]+)" name="([^"]+)">\n([\s\S]*?)\n<\/tool_result>/g;
-  for (const msg of messages) {
-    for (const m of msg.matchAll(toolRe)) {
-      results.push({ toolCallId: m[1], name: m[2], result: m[3] });
-    }
-  }
-  return buildBackgroundResultsMessage(results);
-}
-var init_sentinel = __esm({
-  "src/automatedActions/sentinel.ts"() {
-    "use strict";
-  }
-});
-
-// src/subagents/common/cleanMessages.ts
-function findLastSummaryCheckpoint(messages, name) {
-  for (let i = messages.length - 1; i >= 0; i--) {
-    const msg = messages[i];
-    if (!Array.isArray(msg.content)) {
-      continue;
-    }
-    for (const block of msg.content) {
-      if (block.type === "summary" && block.name === name) {
-        return i;
-      }
-    }
-  }
-  return -1;
-}
-function fixOrphanedToolCalls(messages) {
-  const toolResultIds = /* @__PURE__ */ new Set();
-  for (const msg of messages) {
-    if (msg.role === "user" && msg.toolCallId) {
-      toolResultIds.add(msg.toolCallId);
-    }
-  }
-  const result = [];
-  for (const msg of messages) {
-    result.push(msg);
-    if (msg.role !== "assistant" || !Array.isArray(msg.content)) {
-      continue;
-    }
-    const toolBlocks = msg.content.filter(
-      (b) => b.type === "tool"
-    );
-    const orphans = toolBlocks.filter((tc) => !toolResultIds.has(tc.id));
-    for (const tc of orphans) {
-      result.push({
-        role: "user",
-        content: "Error: tool result lost (session recovered)",
-        toolCallId: tc.id,
-        isToolError: true
-      });
-      toolResultIds.add(tc.id);
-    }
-  }
-  return result;
-}
-function cleanMessagesForApi(messages) {
-  const checkpointIdx = findLastSummaryCheckpoint(messages, "conversation");
-  let startIdx = 0;
-  const prefix = [];
-  if (checkpointIdx !== -1) {
-    const checkpointMsg = messages[checkpointIdx];
-    const blocks = checkpointMsg.content;
-    const summaryBlock = blocks.find(
-      (b) => b.type === "summary" && b.name === "conversation"
-    );
-    if (summaryBlock && summaryBlock.type === "summary") {
-      prefix.push({
-        role: "user",
-        content: `<conversation_summary>
-${summaryBlock.text}
-</conversation_summary>`,
-        hidden: true
-      });
-    }
-    startIdx = checkpointIdx + 1;
-  }
-  const messagesToProcess = fixOrphanedToolCalls(messages.slice(startIdx));
-  const toolUseIds = /* @__PURE__ */ new Set();
-  for (const msg of messagesToProcess) {
-    if (msg.role === "assistant" && Array.isArray(msg.content)) {
-      for (const block of msg.content) {
-        if (block.type === "tool") {
-          toolUseIds.add(block.id);
-        }
-      }
-    }
-  }
-  const cleaned = messagesToProcess.filter((msg) => {
-    if (Array.isArray(msg.content)) {
-      const blocks = msg.content;
-      if (blocks.some((b) => b.type === "summary")) {
-        return false;
-      }
-    }
-    if (msg.role === "assistant" && Array.isArray(msg.content) && msg.content.length === 0) {
-      return false;
-    }
-    if (msg.role === "user" && msg.toolCallId && !toolUseIds.has(msg.toolCallId)) {
-      return false;
-    }
-    return true;
-  }).map((msg) => {
-    if (msg.role === "user" && typeof msg.content === "string") {
-      const { attachmentHeader, ...rest } = msg;
-      let content = isAutomatedMessage(msg.content) ? stripSentinelLine(msg.content) : msg.content;
-      if (attachmentHeader) {
-        content = content ? `${attachmentHeader}
-
-${content}` : attachmentHeader;
-      }
-      return { ...rest, content };
-    }
-    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 cleaned2 = {
-      role: msg.role,
-      content: text
-    };
-    if (toolCalls.length > 0) {
-      cleaned2.toolCalls = toolCalls;
-    }
-    if (msg.providerMetadata) {
-      cleaned2.providerMetadata = msg.providerMetadata;
-    }
-    if (msg.hidden) {
-      cleaned2.hidden = true;
-    }
-    return cleaned2;
-  });
-  return [...prefix, ...cleaned];
+  };
 }
-var init_cleanMessages = __esm({
-  "src/subagents/common/cleanMessages.ts"() {
+var init_statusWatcher = __esm({
+  "src/statusWatcher.ts"() {
     "use strict";
-    init_sentinel();
   }
 });
 
@@ -4485,7 +4406,7 @@ ${appSpec}
   }
 }
 var BASE_PROMPT;
-var init_prompt2 = __esm({
+var init_prompt = __esm({
   "src/subagents/browserAutomation/prompt.ts"() {
     "use strict";
     init_assets();
@@ -4632,7 +4553,7 @@ var init_browserAutomation = __esm({
     "use strict";
     init_runner();
     init_tools();
-    init_prompt2();
+    init_prompt();
     init_sidecar();
     init_browserLock();
     init_screenshot();
@@ -5443,14 +5364,14 @@ var init_editImages = __esm({
 // src/subagents/common/context.ts
 import fs16 from "fs";
 import path7 from "path";
-function walkMdFiles2(dir, skip) {
+function walkMdFiles(dir, skip) {
   const files = [];
   try {
     for (const entry of fs16.readdirSync(dir, { withFileTypes: true })) {
       const full = path7.join(dir, entry.name);
       if (entry.isDirectory()) {
         if (!skip?.has(entry.name)) {
-          files.push(...walkMdFiles2(full, skip));
+          files.push(...walkMdFiles(full, skip));
         }
       } else if (entry.name.endsWith(".md")) {
         files.push(full);
@@ -5460,7 +5381,7 @@ function walkMdFiles2(dir, skip) {
   }
   return files.sort();
 }
-function parseFrontmatter2(filePath) {
+function parseFrontmatter(filePath) {
   try {
     const content = fs16.readFileSync(filePath, "utf-8");
     const match = content.match(/^---\n([\s\S]*?)\n---/);
@@ -5482,12 +5403,12 @@ function parseFrontmatter2(filePath) {
   }
 }
 function loadSpecIndex() {
-  const files = walkMdFiles2("src", /* @__PURE__ */ new Set(["roadmap"]));
+  const files = walkMdFiles("src", /* @__PURE__ */ new Set(["roadmap"]));
   if (files.length === 0) {
     return "";
   }
   const lines = files.map((f) => {
-    const fm = parseFrontmatter2(f);
+    const fm = parseFrontmatter(f);
     let line = `- ${f}`;
     if (fm.name) {
       line += ` \u2014 "${fm.name}"`;
@@ -5525,10 +5446,10 @@ ${indexJson.standalone.map((s) => `- ${s}`).join("\n")}`
     }
   } catch {
   }
-  const files = walkMdFiles2("src/roadmap");
+  const files = walkMdFiles("src/roadmap");
   if (files.length > 0) {
     const lines = files.map((f) => {
-      const fm = parseFrontmatter2(f);
+      const fm = parseFrontmatter(f);
       let line = `- ${f}`;
       if (fm.name) {
         line += ` \u2014 "${fm.name}"`;
@@ -5757,6 +5678,62 @@ var init_tools4 = __esm({
   }
 });
 
+// src/orgContext.ts
+async function initOrgContext(config) {
+  try {
+    cached = await fetchRemyContext(config);
+    const orgDefaultModels2 = filterModelPicks(cached?.defaultModels);
+    setOrgDefaultModels(orgDefaultModels2);
+    log9.debug("org context loaded", {
+      delegatedAvailable: cached?.auth?.delegatedAvailable ?? false,
+      requireDelegatedOnly: cached?.auth?.requireDelegatedOnly ?? false,
+      hasOrgName: !!cached?.org?.name,
+      orgDefaultModels: orgDefaultModels2
+    });
+  } catch (err) {
+    cached = null;
+    setOrgDefaultModels({});
+    log9.debug("org context init failed", { error: err.message });
+  }
+}
+function getOrgContext() {
+  return cached;
+}
+function renderOrgContextBlock() {
+  const ctx = cached;
+  const auth = ctx?.auth;
+  if (!auth || !auth.delegatedAvailable && !auth.requireDelegatedOnly) {
+    return "";
+  }
+  const lines = ["<org_auth_context>"];
+  if (ctx?.org?.name && ctx?.org?.name !== "Personal Workspace") {
+    lines.push(`This app is owned by the organization "${ctx.org.name}".`);
+  }
+  if (auth.delegatedAvailable) {
+    lines.push(
+      '"Sign in with Remy" (platform-delegated sign-in) is an available auth type for this app: organization members can sign in without a verification code.'
+    );
+  }
+  if (auth.requireDelegatedOnly) {
+    lines.push(
+      "This organization requires delegated sign-in: non-delegated human auth methods (email-code, sms-code) are blocked at the platform edge for its apps."
+    );
+  }
+  lines.push("</org_auth_context>");
+  return lines.join("\n");
+}
+var log9, cached;
+var init_orgContext = __esm({
+  "src/orgContext.ts"() {
+    "use strict";
+    init_api();
+    init_surfaces();
+    init_logger();
+    log9 = createLogger("orgContext");
+    cached = null;
+  }
+});
+
 // src/subagents/designExpert/data/sampleCache.ts
 import fs17 from "fs";
 function generateIndices(poolSize, sampleSize) {
@@ -5978,7 +5955,7 @@ This project is in the "${state}" phase. The codebase is a placeholder scaffold
   return prompt;
 }
 var SUBAGENT, RUNTIME_PLACEHOLDERS, PROMPT_TEMPLATE;
-var init_prompt3 = __esm({
+var init_prompt2 = __esm({
   "src/subagents/designExpert/prompt.ts"() {
     "use strict";
     init_assets();
@@ -6100,7 +6077,7 @@ var init_designExpert = __esm({
     init_runner();
     init_tools4();
     init_tools2();
-    init_prompt3();
+    init_prompt2();
     init_history();
     init_surfaces();
     init_writeFile();
@@ -6336,7 +6313,7 @@ function getProductVisionPrompt() {
   return parts.join("\n\n");
 }
 var BASE_PROMPT3;
-var init_prompt4 = __esm({
+var init_prompt3 = __esm({
   "src/subagents/productVision/prompt.ts"() {
     "use strict";
     init_assets();
@@ -6356,7 +6333,7 @@ var init_productVision = __esm({
     init_tools5();
     init_tools2();
     init_executor();
-    init_prompt4();
+    init_prompt3();
     init_history();
     init_surfaces();
     productVisionTool = {
@@ -6618,544 +6595,332 @@ ${readAsset(
           return "Error: spec sync requires execution context";
         }
         if (context.onboardingState !== "onboardingFinished") {
-          return "Spec sync runs only after the build is finished (onboardingFinished). During intake and the initial build you author the spec directly, so there is nothing to reconcile yet.";
-        }
-        const specIndex = loadSpecIndex();
-        const parts = [
-          BASE_PROMPT5,
-          loadPlatformBrief(),
-          MSFM_DOCS,
-          "<!-- cache_breakpoint -->"
-        ];
-        if (specIndex) {
-          parts.push(specIndex);
-        }
-        const system = parts.join("\n\n");
-        const result = await runSubAgent({
-          system,
-          task: input.task,
-          tools: SPEC_SYNC_TOOLS,
-          externalTools: /* @__PURE__ */ new Set(),
-          executeTool: (name, toolInput) => executeTool(name, toolInput, context),
-          apiConfig: context.apiConfig,
-          model: resolveModel("specSync", context.models, context.model),
-          subAgentId: "specSync",
-          signal: context.signal,
-          parentToolId: context.toolCallId,
-          requestId: context.requestId,
-          onEvent: context.onEvent,
-          resolveExternalTool: context.resolveExternalTool,
-          toolRegistry: context.toolRegistry,
-          // Always background + serialized: never blocks Remy's turn, and two
-          // reconciliations queue (FIFO) instead of running at once.
-          background: true,
-          acquireLock: acquireSpecSyncLock,
-          onBackgroundComplete: (bgResult) => {
-            context.onBackgroundComplete?.(
-              context.toolCallId,
-              "specSync",
-              bgResult.text,
-              bgResult.messages
-            );
-          }
-        });
-        context.subAgentMessages?.set(context.toolCallId, result.messages);
-        return result.text;
-      }
-    };
-  }
-});
-
-// src/tools/common/scrapeWebUrl.ts
-var scrapeWebUrlTool;
-var init_scrapeWebUrl2 = __esm({
-  "src/tools/common/scrapeWebUrl.ts"() {
-    "use strict";
-    init_runMindstudioCli();
-    scrapeWebUrlTool = {
-      clearable: false,
-      definition: {
-        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: {
-          type: "object",
-          properties: {
-            url: {
-              type: "string",
-              description: "The URL to fetch."
-            },
-            screenshot: {
-              type: "boolean",
-              description: "Capture a screenshot of the page in addition to the text content. Adds latency; only use when you need to see the visual design."
-            }
-          },
-          required: ["url"]
-        }
-      },
-      async execute(input, context) {
-        const url = input.url;
-        const screenshot = input.screenshot;
-        const pageOptions = { onlyMainContent: true };
-        if (screenshot) {
-          pageOptions.screenshot = true;
-        }
-        return runMindstudioCli(
-          [
-            "scrape-url",
-            "--url",
-            url,
-            "--page-options",
-            JSON.stringify(pageOptions)
-          ],
-          { onLog: context?.onLog }
-        );
-      }
-    };
-  }
-});
-
-// src/tools/spec/writeBuildOverview.ts
-import fs19 from "fs";
-function initialDelivery() {
-  return `### Your deliverable
-Write the complete Build Overview to \`${OVERVIEW_FILE}\`. The file does not exist yet \u2014 start from this scaffold, which carries the technical hygiene for the iframed render context (keep the viewport meta and the reset). Layout, sections, type, and styling are yours to compose.
-
-<overview_shell>
-${OVERVIEW_SHELL}
-</overview_shell>
-
-Reply with a one-line summary of what you wrote \u2014 not the HTML.`;
-}
-function refreshDelivery() {
-  return `### Your deliverable
-The Build Overview already exists at \`${OVERVIEW_FILE}\`. Read it, then update it to reflect <overview_copy>, preserving its established skin \u2014 change only what the copy changed.
-
-Reply with a one-line summary of what you changed \u2014 not the HTML.`;
-}
-var OVERVIEW_FILE, DESIGN_BRIEF, OVERVIEW_SHELL, buildOverviewTool;
-var init_writeBuildOverview = __esm({
-  "src/tools/spec/writeBuildOverview.ts"() {
-    "use strict";
-    init_designExpert();
-    OVERVIEW_FILE = "src/overview.html";
-    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).
-
-Take the plain-language copy in <overview_copy> and lay it out and skin it into a single, beautiful, self-contained HTML document in the app's own brand.
-
-### The single hard rule
-The copy in <overview_copy> is final \u2014 it was authored and edited before it reached you. Treat it as locked content to typeset, not a draft to improve. Reproduce the words exactly: do not rewrite, rephrase, shorten, expand, reorder, or "polish" them, and do not run them through any copy tool. This is the opposite of your usual role \u2014 here you own layout, typography, and visual design only, and the words (every number, name, label, claim, and sentence) are fixed. A single changed word or wrong number breaks this document's purpose.
-
-### What it is (and is not)
-- A typeset reference dossier: composed, dense, a little cool \u2014 substantial at a glance, then readable. Density communicates substance; sparse and airy reads as "not much here."
-- Brand-skinned: pull the palette, type system, and a single accent from the app's spec. The accent leads labels and figures; it is a mark, not a fill.
-- NOT a slide deck \u2014 no theatrics, no building to a climax, no persuasion.
-- NOT a docs site \u2014 no raised or shadowed cards, no hover-lift, no clickable-feeling surfaces, no sticky table of contents.
-- NOT a sparse memo \u2014 a restrained single-column page under-sells the work.
-- No header chrome and no footer: open straight on the app's logo and name so it sits flush with the IDE.
-
-### Constraints
-- A single self-contained HTML file. Fonts may load from a CDN; everything else (CSS, the logo SVG) is inline.
-- Responsive: fills the embedded panel width and collapses gracefully at narrow widths.`;
-    OVERVIEW_SHELL = `<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="utf-8">
-<!-- This renders inside an iframe in the IDE. Keep it a simple, self-contained
-     static document \u2014 no scroll/zoom/accessibility scaffolding beyond this head.
-     The user-scalable=no viewport is intentional; leave it. -->
-<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-<title>Build Overview</title>
-<!-- SKIN: link the app's fonts here (CDN \u2014 e.g. Fontshare / Google Fonts). -->
-<style>
-*, *::before, *::after { margin: 0; padding: 0; box-sizing: border-box; }
-</style>
-</head>
-<body>
-<!-- Compose the Build Overview here. Layout, sections, type, and styling are
-     yours \u2014 keep everything inline and self-contained, brand-skinned from the
-     app's spec. -->
-</body>
-</html>`;
-    buildOverviewTool = {
-      clearable: false,
-      definition: {
-        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: {
-          type: "object",
-          properties: {
-            content: {
-              type: "string",
-              description: "The full Build Overview copy you authored: everything the app contains, in plain present-tense outcome language, with real names and exact counts. The design expert lays this out and skins it to the brand verbatim \u2014 it styles your words, it does not rewrite them \u2014 so this should be the final copy."
-            }
-          },
-          required: ["content"]
-        }
-      },
-      async execute(input, context) {
-        if (!context) {
-          return "Error: writeBuildOverview requires execution context for design expert delegation";
-        }
-        const content = (input.content ?? "").trim();
-        if (!content) {
-          return "Error: writeBuildOverview requires non-empty `content` (the overview copy).";
+          return "Spec sync runs only after the build is finished (onboardingFinished). During intake and the initial build you author the spec directly, so there is nothing to reconcile yet.";
         }
-        const exists = fs19.existsSync(OVERVIEW_FILE);
-        const task = `<overview_copy>${content}</overview_copy>
-
-${DESIGN_BRIEF}
-
-${exists ? refreshDelivery() : initialDelivery()}`;
-        try {
-          if (exists) {
-            input.background = true;
-            const result2 = await runDesignExpertRender(
-              { task, background: true, reportingName: "writeBuildOverview" },
-              context
+        const specIndex = loadSpecIndex();
+        const parts = [
+          BASE_PROMPT5,
+          loadPlatformBrief(),
+          MSFM_DOCS,
+          "<!-- cache_breakpoint -->"
+        ];
+        if (specIndex) {
+          parts.push(specIndex);
+        }
+        const system = parts.join("\n\n");
+        const result = await runSubAgent({
+          system,
+          task: input.task,
+          tools: SPEC_SYNC_TOOLS,
+          externalTools: /* @__PURE__ */ new Set(),
+          executeTool: (name, toolInput) => executeTool(name, toolInput, context),
+          apiConfig: context.apiConfig,
+          model: resolveModel("specSync", context.models, context.model),
+          subAgentId: "specSync",
+          signal: context.signal,
+          parentToolId: context.toolCallId,
+          requestId: context.requestId,
+          onEvent: context.onEvent,
+          resolveExternalTool: context.resolveExternalTool,
+          toolRegistry: context.toolRegistry,
+          // Always background + serialized: never blocks Remy's turn, and two
+          // reconciliations queue (FIFO) instead of running at once.
+          background: true,
+          acquireLock: acquireSpecSyncLock,
+          onBackgroundComplete: (bgResult) => {
+            context.onBackgroundComplete?.(
+              context.toolCallId,
+              "specSync",
+              bgResult.text,
+              bgResult.messages
             );
-            context.subAgentMessages?.set(context.toolCallId, result2.messages);
-            return result2.text;
-          }
-          const result = await runDesignExpertRender({ task }, context);
-          context.subAgentMessages?.set(context.toolCallId, result.messages);
-          if (!fs19.existsSync(OVERVIEW_FILE)) {
-            return `Error: the design expert did not write ${OVERVIEW_FILE}. Its reply was:
-${result.text}`;
           }
-          return `Build overview written to ${OVERVIEW_FILE}. ${result.text}`;
-        } catch (err) {
-          return `Error generating build overview: ${err.message}`;
-        }
+        });
+        context.subAgentMessages?.set(context.toolCallId, result.messages);
+        return result.text;
       }
     };
   }
 });
 
-// src/tools/index.ts
-function deriveContext(parent, toolCallId) {
-  return { ...parent, toolCallId };
-}
-function getToolDefinitions(_onboardingState) {
-  return ALL_TOOLS.map((t) => t.definition);
-}
-function getToolByName(name) {
-  return ALL_TOOLS.find((t) => t.definition.name === name);
-}
-function executeTool(name, input, context) {
-  const tool = getToolByName(name);
-  if (!tool) {
-    return Promise.resolve(`Error: Unknown tool "${name}"`);
-  }
-  return tool.execute(input, context);
-}
-var ALL_TOOLS, CLEARABLE_TOOLS, SUBAGENT_TOOL_NAMES;
-var init_tools8 = __esm({
-  "src/tools/index.ts"() {
+// src/tools/common/scrapeWebUrl.ts
+var scrapeWebUrlTool;
+var init_scrapeWebUrl2 = __esm({
+  "src/tools/common/scrapeWebUrl.ts"() {
     "use strict";
-    init_readSpec();
-    init_writeSpec();
-    init_editSpec();
-    init_listSpecFiles();
-    init_presentPublishPlan();
-    init_writePlan();
-    init_updatePlanStatus();
-    init_setProjectOnboardingState();
-    init_promptUser();
-    init_confirmDestructiveAction();
-    init_sdkConsultant();
-    init_searchGoogle();
-    init_setProjectMetadata();
-    init_compactConversation();
-    init_readFile();
-    init_writeFile();
-    init_editFile();
-    init_bash();
-    init_grep();
-    init_glob();
-    init_listDir();
-    init_editsFinished();
-    init_lspDiagnostics();
-    init_restartProcess();
-    init_runScenario();
-    init_runMethod();
-    init_queryDatabase();
-    init_screenshot2();
-    init_browserAutomation();
-    init_designExpert();
-    init_productVision();
-    init_codeSanityCheck();
-    init_copyEditor();
-    init_specSync();
-    init_scrapeWebUrl2();
-    init_writeBuildOverview();
-    ALL_TOOLS = [
-      // Common
-      setProjectOnboardingStateTool,
-      promptUserTool,
-      confirmDestructiveActionTool,
-      askMindStudioSdkTool,
-      scrapeWebUrlTool,
-      searchGoogleTool,
-      setProjectMetadataTool,
-      designExpertTool,
-      productVisionTool,
-      codeSanityCheckTool,
-      copyEditorTool,
-      specSyncTool,
-      // no-ops until onboardingFinished; kept here so the tool list stays cache-stable
-      buildOverviewTool,
-      compactConversationTool,
-      // Post-onboarding
-      presentPublishPlanTool,
-      writePlanTool,
-      updatePlanStatusTool,
-      // Spec
-      readSpecTool,
-      writeSpecTool,
-      editSpecTool,
-      listSpecFilesTool,
-      // Code
-      readFileTool,
-      writeFileTool,
-      editFileTool,
-      bashTool,
-      grepTool,
-      globTool,
-      listDirTool,
-      editsFinishedTool,
-      runScenarioTool,
-      runMethodTool,
-      queryDatabaseTool,
-      screenshotTool,
-      browserAutomationTool,
-      // LSP
-      lspDiagnosticsTool,
-      restartProcessTool
-    ];
-    CLEARABLE_TOOLS = new Set(
-      ALL_TOOLS.filter((t) => t.clearable).map((t) => t.definition.name)
-    );
-    SUBAGENT_TOOL_NAMES = /* @__PURE__ */ new Set([
-      "visualDesignExpert",
-      "productVision",
-      "codeSanityCheck",
-      "copyEditor",
-      "specSync",
-      "runAutomatedBrowserTest",
-      "askMindStudioSdk"
-    ]);
-  }
-});
-
-// src/session.ts
-import fs20 from "fs";
-import path9 from "path";
-function loadSession(state) {
-  pruneArchives();
-  try {
-    const raw = fs20.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", {
-        messageCount: state.messages.length,
-        ...state.models && { models: state.models }
-      });
-      return true;
-    }
-  } catch {
-  }
-  return false;
-}
-function capOversizedResults(msg) {
-  if (msg.role === "assistant" && Array.isArray(msg.content)) {
-    for (const block of msg.content) {
-      if (block.type === "tool" && typeof block.result === "string") {
-        block.result = capToolResult(block.result);
-      }
-    }
-  } else if (msg.role === "user" && msg.toolCallId && typeof msg.content === "string") {
-    msg.content = capToolResult(msg.content);
-  }
-}
-function sanitizeMessages(messages) {
-  const result = [];
-  for (let i = 0; i < messages.length; i++) {
-    const msg = messages[i];
-    capOversizedResults(msg);
-    result.push(msg);
-    if (msg.role !== "assistant" || !Array.isArray(msg.content)) {
-      continue;
-    }
-    const toolBlocks = msg.content.filter(
-      (b) => b.type === "tool"
-    );
-    if (toolBlocks.length === 0) {
-      continue;
-    }
-    const resultIds = /* @__PURE__ */ new Set();
-    for (let j = i + 1; j < messages.length; j++) {
-      const next = messages[j];
-      if (next.role === "user" && next.toolCallId) {
-        resultIds.add(next.toolCallId);
-      } else {
-        break;
-      }
-    }
-    for (const tc of toolBlocks) {
-      if (!resultIds.has(tc.id)) {
-        result.push({
-          role: "user",
-          content: "Error: tool result lost (session recovered)",
-          toolCallId: tc.id,
-          isToolError: true
-        });
+    init_runMindstudioCli();
+    scrapeWebUrlTool = {
+      clearable: false,
+      definition: {
+        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: {
+          type: "object",
+          properties: {
+            url: {
+              type: "string",
+              description: "The URL to fetch."
+            },
+            screenshot: {
+              type: "boolean",
+              description: "Capture a screenshot of the page in addition to the text content. Adds latency; only use when you need to see the visual design."
+            }
+          },
+          required: ["url"]
+        }
+      },
+      async execute(input, context) {
+        const url = input.url;
+        const screenshot = input.screenshot;
+        const pageOptions = { onlyMainContent: true };
+        if (screenshot) {
+          pageOptions.screenshot = true;
+        }
+        return runMindstudioCli(
+          [
+            "scrape-url",
+            "--url",
+            url,
+            "--page-options",
+            JSON.stringify(pageOptions)
+          ],
+          { onLog: context?.onLog }
+        );
       }
-    }
-  }
-  return result;
-}
-function buildPayload(state) {
-  const payload = { messages: state.messages };
-  if (state.models && Object.keys(state.models).length > 0) {
-    payload.models = state.models;
+    };
   }
-  return payload;
+});
+
+// src/tools/spec/writeBuildOverview.ts
+import fs19 from "fs";
+function initialDelivery() {
+  return `### Your deliverable
+Write the complete Build Overview to \`${OVERVIEW_FILE}\`. The file does not exist yet \u2014 start from this scaffold, which carries the technical hygiene for the iframed render context (keep the viewport meta and the reset). Layout, sections, type, and styling are yours to compose.
+
+<overview_shell>
+${OVERVIEW_SHELL}
+</overview_shell>
+
+Reply with a one-line summary of what you wrote \u2014 not the HTML.`;
 }
-function archiveMessages(messages, label, models) {
-  fs20.mkdirSync(ARCHIVE_DIR, { recursive: true });
-  const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-  let dest = path9.join(ARCHIVE_DIR, `${label}-${ts}.json`);
-  let n = 1;
-  while (fs20.existsSync(dest)) {
-    dest = path9.join(ARCHIVE_DIR, `${label}-${ts}-${n++}.json`);
-  }
-  const payload = { messages };
-  if (models && Object.keys(models).length > 0) {
-    payload.models = models;
-  }
-  fs20.writeFileSync(dest, JSON.stringify(payload), "utf-8");
-  log9.info("Session archived", { label, dest, messageCount: messages.length });
-  pruneArchives();
-  return dest;
+function refreshDelivery() {
+  return `### Your deliverable
+The Build Overview already exists at \`${OVERVIEW_FILE}\`. Read it, then update it to reflect <overview_copy>, preserving its established skin \u2014 change only what the copy changed.
+
+Reply with a one-line summary of what you changed \u2014 not the HTML.`;
 }
-function pruneArchives() {
-  try {
-    const entries = fs20.readdirSync(ARCHIVE_DIR).filter((name) => /^(cleared|rotated)-.*\.json$/.test(name));
-    if (entries.length <= 1) {
-      return;
-    }
-    const sortKey = (name) => name.replace(/^(cleared|rotated)-/, "");
-    const archives = entries.map((name) => ({
-      name,
-      size: fs20.statSync(path9.join(ARCHIVE_DIR, name)).size
-    })).sort((a, b) => sortKey(b.name).localeCompare(sortKey(a.name)));
-    let kept = 0;
-    let cut = archives.length;
-    for (let i = 0; i < archives.length; i++) {
-      if (i === 0 || kept + archives[i].size <= ARCHIVE_RETENTION_BYTES) {
-        kept += archives[i].size;
-      } else {
-        cut = i;
-        break;
-      }
-    }
-    let removed = 0;
-    let freed = 0;
-    for (let i = cut; i < archives.length; i++) {
-      try {
-        fs20.unlinkSync(path9.join(ARCHIVE_DIR, archives[i].name));
-        freed += archives[i].size;
-        removed++;
-      } catch {
+var OVERVIEW_FILE, DESIGN_BRIEF, OVERVIEW_SHELL, buildOverviewTool;
+var init_writeBuildOverview = __esm({
+  "src/tools/spec/writeBuildOverview.ts"() {
+    "use strict";
+    init_designExpert();
+    OVERVIEW_FILE = "src/overview.html";
+    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).
+
+Take the plain-language copy in <overview_copy> and lay it out and skin it into a single, beautiful, self-contained HTML document in the app's own brand.
+
+### The single hard rule
+The copy in <overview_copy> is final \u2014 it was authored and edited before it reached you. Treat it as locked content to typeset, not a draft to improve. Reproduce the words exactly: do not rewrite, rephrase, shorten, expand, reorder, or "polish" them, and do not run them through any copy tool. This is the opposite of your usual role \u2014 here you own layout, typography, and visual design only, and the words (every number, name, label, claim, and sentence) are fixed. A single changed word or wrong number breaks this document's purpose.
+
+### What it is (and is not)
+- A typeset reference dossier: composed, dense, a little cool \u2014 substantial at a glance, then readable. Density communicates substance; sparse and airy reads as "not much here."
+- Brand-skinned: pull the palette, type system, and a single accent from the app's spec. The accent leads labels and figures; it is a mark, not a fill.
+- NOT a slide deck \u2014 no theatrics, no building to a climax, no persuasion.
+- NOT a docs site \u2014 no raised or shadowed cards, no hover-lift, no clickable-feeling surfaces, no sticky table of contents.
+- NOT a sparse memo \u2014 a restrained single-column page under-sells the work.
+- No header chrome and no footer: open straight on the app's logo and name so it sits flush with the IDE.
+
+### Constraints
+- A single self-contained HTML file. Fonts may load from a CDN; everything else (CSS, the logo SVG) is inline.
+- Responsive: fills the embedded panel width and collapses gracefully at narrow widths.`;
+    OVERVIEW_SHELL = `<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<!-- This renders inside an iframe in the IDE. Keep it a simple, self-contained
+     static document \u2014 no scroll/zoom/accessibility scaffolding beyond this head.
+     The user-scalable=no viewport is intentional; leave it. -->
+<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+<title>Build Overview</title>
+<!-- SKIN: link the app's fonts here (CDN \u2014 e.g. Fontshare / Google Fonts). -->
+<style>
+*, *::before, *::after { margin: 0; padding: 0; box-sizing: border-box; }
+</style>
+</head>
+<body>
+<!-- Compose the Build Overview here. Layout, sections, type, and styling are
+     yours \u2014 keep everything inline and self-contained, brand-skinned from the
+     app's spec. -->
+</body>
+</html>`;
+    buildOverviewTool = {
+      clearable: false,
+      definition: {
+        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: {
+          type: "object",
+          properties: {
+            content: {
+              type: "string",
+              description: "The full Build Overview copy you authored: everything the app contains, in plain present-tense outcome language, with real names and exact counts. The design expert lays this out and skins it to the brand verbatim \u2014 it styles your words, it does not rewrite them \u2014 so this should be the final copy."
+            }
+          },
+          required: ["content"]
+        }
+      },
+      async execute(input, context) {
+        if (!context) {
+          return "Error: writeBuildOverview requires execution context for design expert delegation";
+        }
+        const content = (input.content ?? "").trim();
+        if (!content) {
+          return "Error: writeBuildOverview requires non-empty `content` (the overview copy).";
+        }
+        const exists = fs19.existsSync(OVERVIEW_FILE);
+        const task = `<overview_copy>${content}</overview_copy>
+
+${DESIGN_BRIEF}
+
+${exists ? refreshDelivery() : initialDelivery()}`;
+        try {
+          if (exists) {
+            input.background = true;
+            const result2 = await runDesignExpertRender(
+              { task, background: true, reportingName: "writeBuildOverview" },
+              context
+            );
+            context.subAgentMessages?.set(context.toolCallId, result2.messages);
+            return result2.text;
+          }
+          const result = await runDesignExpertRender({ task }, context);
+          context.subAgentMessages?.set(context.toolCallId, result.messages);
+          if (!fs19.existsSync(OVERVIEW_FILE)) {
+            return `Error: the design expert did not write ${OVERVIEW_FILE}. Its reply was:
+${result.text}`;
+          }
+          return `Build overview written to ${OVERVIEW_FILE}. ${result.text}`;
+        } catch (err) {
+          return `Error generating build overview: ${err.message}`;
+        }
       }
-    }
-    if (removed > 0) {
-      log9.info("Session archives pruned", {
-        removed,
-        freedBytes: freed,
-        keptBytes: kept
-      });
-    }
-  } catch {
+    };
   }
+});
+
+// src/tools/index.ts
+function deriveContext(parent, toolCallId) {
+  return { ...parent, toolCallId };
 }
-function rotate(state) {
-  const messages = state.messages;
-  if (messages.length === 0) {
-    return false;
-  }
-  let tailBytes = 0;
-  let scrollbackStart = 0;
-  for (let i = messages.length - 1; i >= 0; i--) {
-    tailBytes += Buffer.byteLength(JSON.stringify(messages[i]), "utf-8") + 1;
-    if (tailBytes >= RETAIN_TAIL_BYTES) {
-      scrollbackStart = i;
-      break;
-    }
-  }
-  const checkpointIdx = findLastSummaryCheckpoint(messages, "conversation");
-  let cut = checkpointIdx === -1 ? scrollbackStart : Math.min(scrollbackStart, checkpointIdx);
-  cut = findSafeInsertionPoint(messages, cut);
-  if (cut <= 0) {
-    return false;
-  }
-  archiveMessages(messages.slice(0, cut), "rotated", state.models);
-  state.messages = messages.slice(cut);
-  log9.info("Session rotated", {
-    archived: cut,
-    retained: state.messages.length
-  });
-  return true;
+function getToolDefinitions(_onboardingState) {
+  return ALL_TOOLS.map((t) => t.definition);
 }
-function saveSession(state) {
-  try {
-    let serialized = JSON.stringify(buildPayload(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 });
-  } catch (err) {
-    log9.warn("Session save failed", { error: err.message });
-  }
+function getToolByName(name) {
+  return ALL_TOOLS.find((t) => t.definition.name === name);
 }
-function clearSession(state) {
-  try {
-    if (state.messages.length > 0) {
-      archiveMessages(state.messages, "cleared", state.models);
-    }
-  } catch (err) {
-    log9.warn("Session archive on clear failed", { error: err.message });
-  }
-  state.messages = [];
-  try {
-    if (fs20.existsSync(SESSION_FILE)) {
-      fs20.unlinkSync(SESSION_FILE);
-    }
-  } catch (err) {
-    log9.warn("Session clear: could not remove live file", {
-      error: err.message
-    });
+function executeTool(name, input, context) {
+  const tool = getToolByName(name);
+  if (!tool) {
+    return Promise.resolve(`Error: Unknown tool "${name}"`);
   }
+  return tool.execute(input, context);
 }
-var log9, SESSION_FILE, ARCHIVE_DIR, ROTATE_THRESHOLD_BYTES, RETAIN_TAIL_BYTES, ARCHIVE_RETENTION_BYTES;
-var init_session = __esm({
-  "src/session.ts"() {
+var ALL_TOOLS, CLEARABLE_TOOLS, SUBAGENT_TOOL_NAMES;
+var init_tools8 = __esm({
+  "src/tools/index.ts"() {
     "use strict";
-    init_logger();
-    init_compaction();
-    init_cleanMessages();
-    init_toolResultCap();
-    log9 = createLogger("session");
-    SESSION_FILE = ".remy-session.json";
-    ARCHIVE_DIR = ".logs/sessions";
-    ROTATE_THRESHOLD_BYTES = 32 * 1024 * 1024;
-    RETAIN_TAIL_BYTES = 16 * 1024 * 1024;
-    ARCHIVE_RETENTION_BYTES = 64 * 1024 * 1024;
+    init_readSpec();
+    init_writeSpec();
+    init_editSpec();
+    init_listSpecFiles();
+    init_presentPublishPlan();
+    init_writePlan();
+    init_updatePlanStatus();
+    init_setProjectOnboardingState();
+    init_promptUser();
+    init_confirmDestructiveAction();
+    init_sdkConsultant();
+    init_searchGoogle();
+    init_setProjectMetadata();
+    init_compactConversation();
+    init_readFile();
+    init_writeFile();
+    init_editFile();
+    init_bash();
+    init_grep();
+    init_glob();
+    init_listDir();
+    init_editsFinished();
+    init_lspDiagnostics();
+    init_restartProcess();
+    init_runScenario();
+    init_runMethod();
+    init_queryDatabase();
+    init_screenshot2();
+    init_browserAutomation();
+    init_designExpert();
+    init_productVision();
+    init_codeSanityCheck();
+    init_copyEditor();
+    init_specSync();
+    init_scrapeWebUrl2();
+    init_writeBuildOverview();
+    ALL_TOOLS = [
+      // Common
+      setProjectOnboardingStateTool,
+      promptUserTool,
+      confirmDestructiveActionTool,
+      askMindStudioSdkTool,
+      scrapeWebUrlTool,
+      searchGoogleTool,
+      setProjectMetadataTool,
+      designExpertTool,
+      productVisionTool,
+      codeSanityCheckTool,
+      copyEditorTool,
+      specSyncTool,
+      // no-ops until onboardingFinished; kept here so the tool list stays cache-stable
+      buildOverviewTool,
+      compactConversationTool,
+      // Post-onboarding
+      presentPublishPlanTool,
+      writePlanTool,
+      updatePlanStatusTool,
+      // Spec
+      readSpecTool,
+      writeSpecTool,
+      editSpecTool,
+      listSpecFilesTool,
+      // Code
+      readFileTool,
+      writeFileTool,
+      editFileTool,
+      bashTool,
+      grepTool,
+      globTool,
+      listDirTool,
+      editsFinishedTool,
+      runScenarioTool,
+      runMethodTool,
+      queryDatabaseTool,
+      screenshotTool,
+      browserAutomationTool,
+      // LSP
+      lspDiagnosticsTool,
+      restartProcessTool
+    ];
+    CLEARABLE_TOOLS = new Set(
+      ALL_TOOLS.filter((t) => t.clearable).map((t) => t.definition.name)
+    );
+    SUBAGENT_TOOL_NAMES = /* @__PURE__ */ new Set([
+      "visualDesignExpert",
+      "productVision",
+      "codeSanityCheck",
+      "copyEditor",
+      "specSync",
+      "runAutomatedBrowserTest",
+      "askMindStudioSdk"
+    ]);
   }
 });
 
@@ -7369,8 +7134,8 @@ var init_errors = __esm({
 });
 
 // src/brandExtraction/index.ts
-import fs21 from "fs";
-import path10 from "path";
+import fs20 from "fs";
+import path9 from "path";
 import { createHash } from "crypto";
 async function runExtraction(apiConfig, model) {
   const inputHash = computeInputHash();
@@ -7390,15 +7155,15 @@ async function runExtraction(apiConfig, model) {
   return brand;
 }
 function isBrandRelevant(filePath) {
-  if (filePath === path10.join("src", "app.md")) {
+  if (filePath === path9.join("src", "app.md")) {
     return true;
   }
-  const { type } = parseFrontmatter3(filePath);
+  const { type } = parseFrontmatter2(filePath);
   return type.startsWith("design/color") || type.startsWith("design/typography");
 }
 function computeInputHash() {
   const entries = [];
-  for (const filePath of walkMdFiles3("src")) {
+  for (const filePath of walkMdFiles2("src")) {
     if (isBrandRelevant(filePath)) {
       entries.push({ path: filePath, content: readSafe(filePath) });
     }
@@ -7416,19 +7181,19 @@ function sha256(input) {
 }
 function readSafe(filePath) {
   try {
-    return fs21.readFileSync(filePath, "utf-8");
+    return fs20.readFileSync(filePath, "utf-8");
   } catch {
     return "";
   }
 }
-function walkMdFiles3(dir) {
+function walkMdFiles2(dir) {
   const results = [];
   try {
-    const entries = fs21.readdirSync(dir, { withFileTypes: true });
+    const entries = fs20.readdirSync(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const full = path10.join(dir, entry.name);
+      const full = path9.join(dir, entry.name);
       if (entry.isDirectory()) {
-        results.push(...walkMdFiles3(full));
+        results.push(...walkMdFiles2(full));
       } else if (entry.name.endsWith(".md")) {
         results.push(full);
       }
@@ -7437,9 +7202,9 @@ function walkMdFiles3(dir) {
   }
   return results.sort();
 }
-function parseFrontmatter3(filePath) {
+function parseFrontmatter2(filePath) {
   try {
-    const content = fs21.readFileSync(filePath, "utf-8");
+    const content = fs20.readFileSync(filePath, "utf-8");
     const match = content.match(/^---\n([\s\S]*?)\n---/);
     if (!match) {
       return { type: "" };
@@ -7503,7 +7268,7 @@ async function extractBrand(apiConfig, model) {
   return validateBrand(parsed);
 }
 function buildCorpus() {
-  const all = walkMdFiles3("src");
+  const all = walkMdFiles2("src");
   const ordered = [
     ...all.filter(isBrandRelevant),
     ...all.filter((f) => !isBrandRelevant(f))
@@ -7636,14 +7401,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);
+  fs20.writeFileSync(tmp, JSON.stringify(brand, null, 2), "utf-8");
+  fs20.renameSync(tmp, BRAND_FILE);
   const cache = { inputHash, generatedAt: Date.now() };
-  fs21.writeFileSync(CACHE_FILE, JSON.stringify(cache, null, 2), "utf-8");
+  fs20.writeFileSync(CACHE_FILE, JSON.stringify(cache, null, 2), "utf-8");
 }
 function readCache() {
   try {
-    const raw = fs21.readFileSync(CACHE_FILE, "utf-8");
+    const raw = fs20.readFileSync(CACHE_FILE, "utf-8");
     const parsed = JSON.parse(raw);
     if (parsed && typeof parsed.inputHash === "string" && typeof parsed.generatedAt === "number") {
       return parsed;
@@ -8264,64 +8029,349 @@ async function runTurn(params) {
         }
       }
     }
-    const lastNonExcluded = toolCalls.filter(
-      (tc) => !STATUS_EXCLUDED_TOOLS.has(tc.name)
-    );
-    lastCompletedTools = lastNonExcluded.map((tc) => tc.name).join(", ");
-    lastCompletedInput = JSON.stringify(lastNonExcluded.at(-1)?.input ?? {});
-    lastCompletedResult = results.at(-1)?.result ?? "";
-    for (const r of results) {
-      state.messages.push({
-        role: "user",
-        content: r.result,
-        toolCallId: r.id,
-        isToolError: r.isError
-      });
+    const lastNonExcluded = toolCalls.filter(
+      (tc) => !STATUS_EXCLUDED_TOOLS.has(tc.name)
+    );
+    lastCompletedTools = lastNonExcluded.map((tc) => tc.name).join(", ");
+    lastCompletedInput = JSON.stringify(lastNonExcluded.at(-1)?.input ?? {});
+    lastCompletedResult = results.at(-1)?.result ?? "";
+    for (const r of results) {
+      state.messages.push({
+        role: "user",
+        content: r.result,
+        toolCallId: r.id,
+        isToolError: r.isError
+      });
+    }
+    if (signal?.aborted) {
+      onEvent({ type: "turn_cancelled" });
+      saveSession(state);
+      return;
+    }
+  }
+}
+var log12, BRAND_TRIGGERING_TOOLS, EXTERNAL_TOOLS, USER_BLOCKING_EXTERNAL_TOOLS;
+var init_agent = __esm({
+  "src/agent.ts"() {
+    "use strict";
+    init_api();
+    init_tools8();
+    init_session();
+    init_logger();
+    init_usageLedger();
+    init_parsePartialJson();
+    init_statusWatcher();
+    init_errors();
+    init_cleanMessages();
+    init_tools8();
+    init_sentinel();
+    init_trigger2();
+    init_surfaces();
+    init_toolRegistry();
+    init_toolResultCap();
+    log12 = createLogger("agent");
+    BRAND_TRIGGERING_TOOLS = /* @__PURE__ */ new Set(["writeSpec", "editSpec"]);
+    EXTERNAL_TOOLS = /* @__PURE__ */ new Set([
+      "promptUser",
+      "setProjectOnboardingState",
+      "presentPublishPlan",
+      "confirmDestructiveAction",
+      "runScenario",
+      "runMethod",
+      "queryDatabase",
+      "browserCommand",
+      "setProjectMetadata"
+    ]);
+    USER_BLOCKING_EXTERNAL_TOOLS = /* @__PURE__ */ new Set([
+      "promptUser",
+      "presentPublishPlan",
+      "confirmDestructiveAction"
+    ]);
+  }
+});
+
+// src/prompt/static/projectContext.ts
+import fs21 from "fs";
+import path10 from "path";
+function loadProjectManifest() {
+  try {
+    const manifest = fs21.readFileSync("mindstudio.json", "utf-8");
+    return `
+## Project Manifest (mindstudio.json)
+\`\`\`json
+${manifest}
+\`\`\``;
+  } catch {
+    return "";
+  }
+}
+function loadSpecFileMetadata() {
+  try {
+    const files = walkMdFiles3("src");
+    if (files.length === 0) {
+      return "";
+    }
+    const entries = [];
+    for (const filePath of files) {
+      const { name, description, type } = parseFrontmatter3(filePath);
+      let line = `- ${filePath}`;
+      if (name) {
+        line += ` \u2014 "${name}"`;
+      }
+      if (type) {
+        line += ` (${type})`;
+      }
+      if (description) {
+        line += ` \u2014 ${description}`;
+      }
+      entries.push(line);
+    }
+    return `
+## Spec Files
+${entries.join("\n")}`;
+  } catch {
+    return "";
+  }
+}
+function walkMdFiles3(dir) {
+  const results = [];
+  try {
+    const entries = fs21.readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      const full = path10.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        results.push(...walkMdFiles3(full));
+      } else if (entry.name.endsWith(".md")) {
+        results.push(full);
+      }
+    }
+  } catch {
+  }
+  return results.sort();
+}
+function parseFrontmatter3(filePath) {
+  try {
+    const content = fs21.readFileSync(filePath, "utf-8");
+    const match = content.match(/^---\n([\s\S]*?)\n---/);
+    if (!match) {
+      return { name: "", description: "", type: "" };
+    }
+    const fm = match[1];
+    const name = fm.match(/^name:\s*(.+)$/m)?.[1]?.trim() ?? "";
+    const description = fm.match(/^description:\s*(.+)$/m)?.[1]?.trim() ?? "";
+    const type = fm.match(/^type:\s*(.+)$/m)?.[1]?.trim() ?? "";
+    return { name, description, type };
+  } catch {
+    return { name: "", description: "", type: "" };
+  }
+}
+function loadPlanStatus(onboardingState) {
+  try {
+    const content = fs21.readFileSync(".remy-plan.md", "utf-8");
+    const match = content.match(/^---\n([\s\S]*?)\n---/);
+    const status = match?.[1]?.match(/^status:\s*(.+)$/m)?.[1]?.trim();
+    if (status === "pending" && onboardingState === "intake") {
+      return `
+<pending_initial_plan>
+This is your initial plan, proposed via writePlan and awaiting the user's decision. The user approves it by pressing "Start Building" \u2014 you'll get an approveInitialPlan message when they do, and it will tell you to begin. Until then, stay in intake: keep discussing, and revise with writePlan if the user asks. Don't start building on your own, even if the user says "looks good" in chat.
+</pending_initial_plan>`;
+    }
+    if (status === "pending") {
+      return `
+<pending_plan>
+You have a pending implementation plan in .remy-plan.md awaiting user approval. Do NOT begin implementing the plan until the user approves it. You may continue chatting, answering questions, and revising the plan if asked. To revise, call writePlan again with updated content. When the user approves the plan (via chat or any other signal), call updatePlanStatus with status "approved" before beginning any implementation work.
+</pending_plan>`;
     }
-    if (signal?.aborted) {
-      onEvent({ type: "turn_cancelled" });
-      saveSession(state);
-      return;
+    if (status === "approved") {
+      return `
+<approved_plan>
+The user has approved your implementation plan in .remy-plan.md. You may reference it during implementation. Delete the file when you have finished all planned work.
+</approved_plan>`;
     }
+    return "";
+  } catch {
+    return "";
   }
 }
-var log12, BRAND_TRIGGERING_TOOLS, EXTERNAL_TOOLS, USER_BLOCKING_EXTERNAL_TOOLS;
-var init_agent = __esm({
-  "src/agent.ts"() {
+function loadProjectFileListing() {
+  try {
+    const entries = fs21.readdirSync(".", { withFileTypes: true });
+    const listing = entries.filter((e) => e.name !== ".git" && e.name !== "node_modules").sort((a, b) => {
+      if (a.isDirectory() && !b.isDirectory()) {
+        return -1;
+      }
+      if (!a.isDirectory() && b.isDirectory()) {
+        return 1;
+      }
+      return a.name.localeCompare(b.name);
+    }).map((e) => e.isDirectory() ? `${e.name}/` : e.name).join("\n");
+    return `
+## Project Files
+\`\`\`
+${listing}
+\`\`\``;
+  } catch {
+    return "";
+  }
+}
+var init_projectContext = __esm({
+  "src/prompt/static/projectContext.ts"() {
     "use strict";
-    init_api();
-    init_tools8();
-    init_session();
-    init_logger();
-    init_usageLedger();
-    init_parsePartialJson();
-    init_statusWatcher();
-    init_errors();
-    init_cleanMessages();
-    init_tools8();
-    init_sentinel();
-    init_trigger2();
-    init_surfaces();
-    init_toolRegistry();
-    init_toolResultCap();
-    log12 = createLogger("agent");
-    BRAND_TRIGGERING_TOOLS = /* @__PURE__ */ new Set(["writeSpec", "editSpec"]);
-    EXTERNAL_TOOLS = /* @__PURE__ */ new Set([
-      "promptUser",
-      "setProjectOnboardingState",
-      "presentPublishPlan",
-      "confirmDestructiveAction",
-      "runScenario",
-      "runMethod",
-      "queryDatabase",
-      "browserCommand",
-      "setProjectMetadata"
-    ]);
-    USER_BLOCKING_EXTERNAL_TOOLS = /* @__PURE__ */ new Set([
-      "promptUser",
-      "presentPublishPlan",
-      "confirmDestructiveAction"
-    ]);
+  }
+});
+
+// src/prompt/index.ts
+function resolveIncludes(template) {
+  const result = template.replace(
+    /\{\{([^}]+)\}\}/g,
+    (_, filePath) => readAsset("prompt", filePath.trim())
+  );
+  return result.replace(/\n{3,}/g, "\n\n").trim();
+}
+function buildSystemPrompt(onboardingState, viewContext) {
+  const projectContext = [
+    loadProjectManifest(),
+    loadSpecFileMetadata(),
+    loadProjectFileListing()
+  ].filter(Boolean).join("\n");
+  const now = (/* @__PURE__ */ new Date()).toLocaleDateString("en-US", {
+    month: "long",
+    day: "numeric",
+    year: "numeric"
+  });
+  const template = `
+{{static/identity.md}}
+
+Current date: ${now}
+
+<platform_docs>
+  <platform>
+  {{compiled/platform.md}}
+  </platform>
+
+  <manifest>
+  {{compiled/manifest.md}}
+  </manifest>
+
+  <tables>
+  {{compiled/tables.md}}
+  </tables>
+
+  <methods>
+  {{compiled/methods.md}}
+  </methods>
+
+  <auth>
+  {{compiled/auth.md}}
+  </auth>
+
+  <dev_and_deploy>
+  {{compiled/dev-and-deploy.md}}
+  </dev_and_deploy>
+
+  <design>
+  {{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>
+
+  <interfaces>
+  {{compiled/interfaces.md}}
+  </interfaces>
+
+  <scenarios>
+  {{compiled/scenarios.md}}
+  </scenarios>
+
+  <secrets>
+  {{compiled/secrets.md}}
+  </secrets>
+</platform_docs>
+
+<mindstudio_agent_sdk_docs>
+  {{compiled/sdk-actions.md}}
+
+  {{compiled/task-agents.md}}
+</mindstudio_agent_sdk_docs>
+
+<mindstudio_flavored_markdown_spec_docs>
+  {{compiled/msfm.md}}
+</mindstudio_flavored_markdown_spec_docs>
+
+<intake_mode_instructions>
+  {{static/intake.md}}
+</intake_mode_instructions>
+
+<spec_authoring_instructions>
+  {{static/authoring.md}}
+</spec_authoring_instructions>
+
+<team>
+  {{static/team.md}}
+</team>
+
+<code_authoring_instructions>
+{{static/coding.md}}
+
+<typescript_lsp>
+{{static/lsp.md}}
+</typescript_lsp>
+</code_authoring_instructions>
+
+<conversation_summaries>
+Your conversation history may include <prior_conversation_summary> blocks in the user's messages. These are automated summaries of earlier messages that have been compacted to save context space. The user does not see this summary, they see the full conversation history in their UI. Treat the summary as ground truth for what happened before, but do not reference it directly to the user ("as mentioned in the summary..."). Just continue naturally as if you remember the prior work.
+
+Old tool results are periodically cleared from the conversation to save context space. This is automatic and expected \u2014 you don't need to note down or preserve information from tool results. If you need to reference something from an earlier tool call, just re-read the file or re-run the query.
+</conversation_summaries>
+
+<project_onboarding>
+New projects progress through three onboarding states. The user might skip this entirely and jump straight into working on the existing scaffold (which defaults to onboardingFinished), but ideally new projects move through each phase:
+
+- **intake**: Gathering requirements. The project has scaffold code (a "hello world" starter) but it's not the user's app yet. Focus on understanding what they want to build, not on the existing code. Intake ends with a plan proposal via writePlan.
+- **building**: The user approved the initial plan. The agent is writing the spec and building the app. This can take a while and involves heavy tool use (spec authoring, design expert consultation, code generation, verification, polishing).
+- **buildComplete**: The build is done. The frontend is showing the user a reveal experience (pitch deck, app preview). The agent does not need to do anything in this state; the frontend advances to onboardingFinished when the user is ready.
+- **onboardingFinished**: The project is built and ready. Full development mode with all tools available. From here on, keep spec and code in sync as changes are made.
+</project_onboarding>
+
+{{static/instructions.md}}
+
+<!-- cache_breakpoint -->
+
+<current_project_onboarding_state>
+  ${onboardingState ?? "onboardingFinished"}
+</current_project_onboarding_state>
+
+<project_context>
+${projectContext}
+</project_context>
+
+${renderOrgContextBlock()}
+
+<view_context>
+The user is currently in ${viewContext?.mode ?? "code"} mode.
+${viewContext?.activeFile ? `Active file: ${viewContext.activeFile}` : ""}
+</view_context>
+
+${loadPlanStatus(onboardingState)}
+`;
+  return resolveIncludes(template);
+}
+var init_prompt4 = __esm({
+  "src/prompt/index.ts"() {
+    "use strict";
+    init_assets();
+    init_projectContext();
+    init_orgContext();
   }
 });
 
@@ -8721,9 +8771,8 @@ var init_headless = __esm({
     init_logger();
     init_config();
     init_orgContext();
-    init_prompt();
+    init_prompt4();
     init_trigger();
-    init_compaction();
     init_trigger2();
     init_lsp();
     init_agent();
@@ -8835,7 +8884,9 @@ var init_headless = __esm({
             const data = event.error ? { error: event.error } : {};
             this.emit("compaction_complete", data, event.requestId);
             this.sessionStats.compactionInProgress = false;
-            this.sessionStats.lastContextSize = 0;
+            if (!event.error) {
+              this.sessionStats.lastContextSize = 0;
+            }
             this.sessionStats.messageCount = this.state.messages.length;
             this.persistStats();
           }
@@ -8969,20 +9020,10 @@ var init_headless = __esm({
             requestId,
             model: this.opts.model
           });
-          this.applyPendingSummaries();
+          applyPendingSummaries(this.state);
         } catch {
         }
       }
-      /** Drain pending compaction summaries and insert at a safe point. */
-      applyPendingSummaries() {
-        const summaries = getPendingSummaries();
-        if (summaries.length === 0) {
-          return;
-        }
-        const idx = findSafeInsertionPoint(this.state.messages);
-        this.state.messages.splice(idx, 0, ...summaries);
-        saveSession(this.state);
-      }
       onBackgroundComplete = (toolCallId, name, result, subAgentMessages) => {
         this.pendingBlockUpdates.push({ toolCallId, result, subAgentMessages });
         log15.info("Background complete", {
@@ -9311,7 +9352,7 @@ var init_headless = __esm({
             error: err.message
           });
         }
-        this.applyPendingSummaries();
+        applyPendingSummaries(this.state);
         this.applyPendingBlockUpdates();
       }
       async handleMessage(parsed, requestId) {
@@ -9615,7 +9656,7 @@ var init_headless = __esm({
               model: this.opts.model
             });
             if (!this.running) {
-              this.applyPendingSummaries();
+              applyPendingSummaries(this.state);
             }
             this.emit("completed", { success: true }, requestId);
           } catch (err) {
@@ -9795,7 +9836,8 @@ function MessageList({ turns }) {
 
 // src/tui/App.tsx
 init_agent();
-init_prompt();
+init_trigger();
+init_prompt4();
 init_session();
 import { jsx as jsx5, jsxs as jsxs4 } from "react/jsx-runtime";
 function App({ apiConfig, model }) {
@@ -9933,6 +9975,7 @@ Error: ${err.message}`,
           done: true
         }));
       }
+      applyPendingSummaries(agentState);
       abortRef.current = null;
       setIsRunning(false);
     },