@mindstudio-ai/remy 0.1.239 → 0.1.241

package/dist/headless.js

@@ -618,6 +618,18 @@ function readJsonAsset(fallback, ...segments) {
 // src/prompt/static/projectContext.ts
 import fs4 from "fs";
 import path3 from "path";
+
+// src/projectRoot.ts
+var PROJECT_ROOT = process.cwd();
+
+// src/prompt/static/projectContext.ts
+function loadProjectRoot() {
+  return `
+## Project Root
+\`${PROJECT_ROOT}\`
+
+File paths are relative to this directory. Every tool operates here and bash commands run it it.`;
+}
 function loadProjectManifest() {
   try {
     const manifest = fs4.readFileSync("mindstudio.json", "utf-8");
@@ -750,6 +762,7 @@ function resolveIncludes(template) {
 }
 function buildSystemPrompt(onboardingState, viewContext) {
   const projectContext = [
+    loadProjectRoot(),
     loadProjectManifest(),
     loadSpecFileMetadata(),
     loadProjectFileListing()
@@ -2148,6 +2161,7 @@ ${unifiedDiff(input.path, content, updated)}`;
 
 // src/tools/code/bash.ts
 import { spawn as spawn2 } from "child_process";
+import path7 from "path";
 var DEFAULT_TIMEOUT_MS = 12e4;
 var DEFAULT_MAX_LINES2 = 500;
 var MAX_OUTPUT_BYTES = 3e4;
@@ -2165,7 +2179,7 @@ var bashTool = {
         },
         cwd: {
           type: "string",
-          description: "Working directory to run the command in. Defaults to the project root."
+          description: "Working directory, relative to the project root. Defaults to the project root itself."
         },
         timeout: {
           type: "number",
@@ -2184,7 +2198,9 @@ var bashTool = {
     const timeoutMs = input.timeout ? input.timeout * 1e3 : DEFAULT_TIMEOUT_MS;
     return new Promise((resolve2) => {
       const child = spawn2("sh", ["-c", input.command], {
-        cwd: input.cwd || void 0,
+        // Pinned rather than inherited. `undefined` here means "wherever the
+        // process happens to be", which is the project root only by luck.
+        cwd: input.cwd ? path7.resolve(PROJECT_ROOT, input.cwd) : PROJECT_ROOT,
         env: { ...process.env, FORCE_COLOR: "1" }
       });
       let output = "";
@@ -2430,7 +2446,7 @@ var globTool = {
 
 // src/tools/code/listDir.ts
 import fs15 from "fs/promises";
-import path7 from "path";
+import path8 from "path";
 var EXCLUDE = /* @__PURE__ */ new Set([".git", "node_modules"]);
 var MAX_CHILDREN = 15;
 async function readAndSort(dirPath) {
@@ -2447,7 +2463,7 @@ async function readAndSort(dirPath) {
 }
 async function collapsePath(basePath, name) {
   let display = name;
-  let current = path7.join(basePath, name);
+  let current = path8.join(basePath, name);
   for (; ; ) {
     let children;
     try {
@@ -2457,7 +2473,7 @@ async function collapsePath(basePath, name) {
     }
     if (children.length === 1 && children[0].isDirectory()) {
       display += "/" + children[0].name;
-      current = path7.join(current, children[0].name);
+      current = path8.join(current, children[0].name);
     } else {
       break;
     }
@@ -2475,7 +2491,7 @@ function formatSize(bytes) {
 }
 async function formatFile(dirPath, name, indent) {
   try {
-    const stat = await fs15.stat(path7.join(dirPath, name));
+    const stat = await fs15.stat(path8.join(dirPath, name));
     return `${indent}${name}${" ".repeat(Math.max(1, 30 - indent.length - name.length))}${formatSize(stat.size)}`;
   } catch {
     return `${indent}${name}`;
@@ -2836,12 +2852,12 @@ async function captureAndAnalyzeScreenshot(promptOrOptions) {
   let existingUrl;
   let onLog;
   let model;
-  let path12;
+  let path13;
   let fullPage = true;
   if (typeof promptOrOptions === "object" && promptOrOptions !== null) {
     prompt = promptOrOptions.prompt;
     existingUrl = promptOrOptions.imageUrl;
-    path12 = promptOrOptions.path;
+    path13 = promptOrOptions.path;
     if (promptOrOptions.fullPage !== void 0) {
       fullPage = promptOrOptions.fullPage;
     }
@@ -2857,7 +2873,7 @@ async function captureAndAnalyzeScreenshot(promptOrOptions) {
   } else {
     const ssResult = await sidecarRequest(
       fullPage ? "/screenshot-full-page" : "/screenshot-viewport",
-      path12 ? { path: path12 } : void 0,
+      path13 ? { path: path13 } : void 0,
       { timeout: fullPage ? 12e4 : 3e4 }
     );
     url = ssResult?.url || ssResult?.screenshotUrl;
@@ -4662,12 +4678,12 @@ __export(polishCopy_exports, {
 
 // src/subagents/common/context.ts
 import fs17 from "fs";
-import path8 from "path";
+import path9 from "path";
 function walkMdFiles2(dir, skip) {
   const files = [];
   try {
     for (const entry of fs17.readdirSync(dir, { withFileTypes: true })) {
-      const full = path8.join(dir, entry.name);
+      const full = path9.join(dir, entry.name);
       if (entry.isDirectory()) {
         if (!skip?.has(entry.name)) {
           files.push(...walkMdFiles2(full, skip));
@@ -5310,14 +5326,14 @@ var VISION_TOOLS = [
 
 // src/subagents/productVision/executor.ts
 import fs19 from "fs";
-import path9 from "path";
+import path10 from "path";
 var ROADMAP_DIR = "src/roadmap";
 var PITCH_DECK_SHELL = readAsset(
   "subagents/productVision",
   "pitch-deck-shell.html"
 );
 function resolve(filePath) {
-  return path9.join(ROADMAP_DIR, filePath);
+  return path10.join(ROADMAP_DIR, filePath);
 }
 async function executeVisionTool(name, input, context) {
   switch (name) {
@@ -5913,7 +5929,7 @@ var log8 = createLogger("compaction");
 var CONVERSATION_SUMMARY_PROMPT = readAsset("compaction", "conversation.md");
 var SUBAGENT_SUMMARY_PROMPT = readAsset("compaction", "subagent.md");
 var SUMMARIZABLE_SUBAGENTS = ["visualDesignExpert", "productVision"];
-async function compactConversation(messages, apiConfig, system, tools2, model) {
+async function compactConversation(messages, apiConfig, model) {
   const endIndex = findSafeInsertionPoint(messages);
   const summaries = [];
   const tasks = [];
@@ -5921,6 +5937,7 @@ async function compactConversation(messages, apiConfig, system, tools2, model) {
     messages,
     endIndex
   );
+  let conversationFailed = false;
   if (conversationMessages.length > 0) {
     tasks.push(
       generateSummary(
@@ -5928,12 +5945,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;
         }
       })
     );
@@ -5951,18 +5968,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 {
+            log8.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,
@@ -6107,66 +6131,108 @@ function serializeForSummary(messages) {
   }
   return lines.join("\n\n");
 }
-var CHUNK_CHAR_LIMIT = 24e5;
-async function generateSummary(apiConfig, name, compactionPrompt, messagesToSummarize, mainSystem, mainTools, model) {
+var CHUNK_CHAR_LIMIT = 2e5;
+var MIN_SUMMARY_CHARS = 400;
+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)
+    ];
     log8.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;
   }
   log8.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) {
+    log8.info("Summary generated", { name, summaryLength: summaryText.length });
+    return summaryText;
+  }
+  log8.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;
@@ -6193,16 +6259,223 @@ ${serialized}` : serialized;
     log8.warn("Empty summary generated", { name });
     return null;
   }
-  log8.info("Summary generated", { name, summaryLength: summaryText.length });
   return summaryText.trim();
 }
 
+// src/session.ts
+import fs21 from "fs";
+import path11 from "path";
+var log9 = createLogger("session");
+var SESSION_FILE = ".remy-session.json";
+var ARCHIVE_DIR = ".logs/sessions";
+var ROTATE_THRESHOLD_BYTES = 32 * 1024 * 1024;
+var RETAIN_TAIL_BYTES = 16 * 1024 * 1024;
+var ARCHIVE_RETENTION_BYTES = 64 * 1024 * 1024;
+function loadSession(state) {
+  pruneArchives();
+  try {
+    const raw = fs21.readFileSync(SESSION_FILE, "utf-8");
+    const data = JSON.parse(raw);
+    if (data.models && typeof data.models === "object") {
+      state.models = data.models;
+    }
+    if (Array.isArray(data.messages) && data.messages.length > 0) {
+      state.messages = sanitizeMessages(data.messages);
+      log9.info("Session loaded", {
+        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) {
+  fs21.mkdirSync(ARCHIVE_DIR, { recursive: true });
+  const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+  let dest = path11.join(ARCHIVE_DIR, `${label}-${ts}.json`);
+  let n = 1;
+  while (fs21.existsSync(dest)) {
+    dest = path11.join(ARCHIVE_DIR, `${label}-${ts}-${n++}.json`);
+  }
+  const payload = { messages };
+  if (models && Object.keys(models).length > 0) {
+    payload.models = models;
+  }
+  fs21.writeFileSync(dest, JSON.stringify(payload), "utf-8");
+  log9.info("Session archived", { label, dest, messageCount: messages.length });
+  pruneArchives();
+  return dest;
+}
+function pruneArchives() {
+  try {
+    const entries = fs21.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: fs21.statSync(path11.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 {
+        fs21.unlinkSync(path11.join(ARCHIVE_DIR, archives[i].name));
+        freed += archives[i].size;
+        removed++;
+      } catch {
+      }
+    }
+    if (removed > 0) {
+      log9.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);
+  log9.info("Session rotated", {
+    archived: cut,
+    retained: state.messages.length
+  });
+  return true;
+}
+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));
+    }
+    fs21.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 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 (fs21.existsSync(SESSION_FILE)) {
+      fs21.unlinkSync(SESSION_FILE);
+    }
+  } catch (err) {
+    log9.warn("Session clear: could not remove live file", {
+      error: err.message
+    });
+  }
+}
+
 // src/compaction/trigger.ts
-var log9 = createLogger("compaction:trigger");
+var log10 = createLogger("compaction:trigger");
 var pendingSummaries = [];
 var inflightCompaction = null;
-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);
 }
 var listener = null;
 function setCompactionListener(l) {
@@ -6214,22 +6487,18 @@ 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);
     listener?.({ type: "complete", requestId });
-    log9.info("Compaction complete");
+    log10.info("Compaction complete");
   }).catch((err) => {
     const message = err.message || "Compaction failed";
     listener?.({ type: "complete", error: message, requestId });
-    log9.error("Compaction failed", { error: message });
+    log10.error("Compaction failed", { error: message });
     throw err;
   }).finally(() => {
     inflightCompaction = null;
@@ -6238,10 +6507,10 @@ function triggerCompaction(state, apiConfig, opts = {}) {
 }
 
 // src/brandExtraction/index.ts
-import fs21 from "fs";
-import path10 from "path";
+import fs22 from "fs";
+import path12 from "path";
 import { createHash } from "crypto";
-var log10 = createLogger("brandExtraction");
+var log11 = createLogger("brandExtraction");
 var EXTRACT_PROMPT = readAsset("brandExtraction", "extract.md");
 var BRAND_FILE = ".remy-brand.json";
 var CACHE_FILE = ".remy-brand.cache.json";
@@ -6249,21 +6518,21 @@ async function runExtraction(apiConfig, model) {
   const inputHash = computeInputHash();
   const cached3 = readCache();
   if (cached3 && cached3.inputHash === inputHash) {
-    log10.debug("Brand inputs unchanged \u2014 skipping extraction", { inputHash });
+    log11.debug("Brand inputs unchanged \u2014 skipping extraction", { inputHash });
     return null;
   }
-  log10.info("Extracting brand", { inputHash });
+  log11.info("Extracting brand", { inputHash });
   const brand = await extractBrand(apiConfig, model);
   if (!brand) {
-    log10.warn("Brand extraction failed \u2014 leaving cache untouched");
+    log11.warn("Brand extraction failed \u2014 leaving cache untouched");
     return null;
   }
   persistBrand(brand, inputHash);
-  log10.info("Brand persisted", { inputHash });
+  log11.info("Brand persisted", { inputHash });
   return brand;
 }
 function isBrandRelevant(filePath) {
-  if (filePath === path10.join("src", "app.md")) {
+  if (filePath === path12.join("src", "app.md")) {
     return true;
   }
   const { type } = parseFrontmatter3(filePath);
@@ -6289,7 +6558,7 @@ function sha256(input) {
 }
 function readSafe(filePath) {
   try {
-    return fs21.readFileSync(filePath, "utf-8");
+    return fs22.readFileSync(filePath, "utf-8");
   } catch {
     return "";
   }
@@ -6297,9 +6566,9 @@ function readSafe(filePath) {
 function walkMdFiles3(dir) {
   const results = [];
   try {
-    const entries = fs21.readdirSync(dir, { withFileTypes: true });
+    const entries = fs22.readdirSync(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const full = path10.join(dir, entry.name);
+      const full = path12.join(dir, entry.name);
       if (entry.isDirectory()) {
         results.push(...walkMdFiles3(full));
       } else if (entry.name.endsWith(".md")) {
@@ -6312,7 +6581,7 @@ function walkMdFiles3(dir) {
 }
 function parseFrontmatter3(filePath) {
   try {
-    const content = fs21.readFileSync(filePath, "utf-8");
+    const content = fs22.readFileSync(filePath, "utf-8");
     const match = content.match(/^---\n([\s\S]*?)\n---/);
     if (!match) {
       return { type: "" };
@@ -6327,7 +6596,7 @@ function parseFrontmatter3(filePath) {
 async function extractBrand(apiConfig, model) {
   const corpus = buildCorpus();
   if (!corpus.trim()) {
-    log10.debug("No spec corpus \u2014 emitting empty brand");
+    log11.debug("No spec corpus \u2014 emitting empty brand");
     return { version: 1 };
   }
   let responseText = "";
@@ -6358,17 +6627,17 @@ async function extractBrand(apiConfig, model) {
           toolNames: []
         });
       } else if (event.type === "error") {
-        log10.error("Brand extraction stream error", { error: event.error });
+        log11.error("Brand extraction stream error", { error: event.error });
         return null;
       }
     }
   } catch (err) {
-    log10.error("Brand extraction threw", { error: err?.message });
+    log11.error("Brand extraction threw", { error: err?.message });
     return null;
   }
   const parsed = parseJsonResponse(responseText);
   if (!parsed) {
-    log10.warn("Brand extraction returned unparseable JSON", {
+    log11.warn("Brand extraction returned unparseable JSON", {
       preview: responseText.slice(0, 200)
     });
     return null;
@@ -6510,14 +6779,14 @@ function pickFont(raw) {
 }
 function persistBrand(brand, inputHash) {
   const tmp = `${BRAND_FILE}.tmp`;
-  fs21.writeFileSync(tmp, JSON.stringify(brand, null, 2), "utf-8");
-  fs21.renameSync(tmp, BRAND_FILE);
+  fs22.writeFileSync(tmp, JSON.stringify(brand, null, 2), "utf-8");
+  fs22.renameSync(tmp, BRAND_FILE);
   const cache = { inputHash, generatedAt: Date.now() };
-  fs21.writeFileSync(CACHE_FILE, JSON.stringify(cache, null, 2), "utf-8");
+  fs22.writeFileSync(CACHE_FILE, JSON.stringify(cache, null, 2), "utf-8");
 }
 function readCache() {
   try {
-    const raw = fs21.readFileSync(CACHE_FILE, "utf-8");
+    const raw = fs22.readFileSync(CACHE_FILE, "utf-8");
     const parsed = JSON.parse(raw);
     if (parsed && typeof parsed.inputHash === "string" && typeof parsed.generatedAt === "number") {
       return parsed;
@@ -6529,7 +6798,7 @@ function readCache() {
 }
 
 // src/brandExtraction/trigger.ts
-var log11 = createLogger("brandExtraction:trigger");
+var log12 = createLogger("brandExtraction:trigger");
 var inflight = false;
 var dirty = false;
 function triggerBrandExtraction(apiConfig, model) {
@@ -6539,7 +6808,7 @@ function triggerBrandExtraction(apiConfig, model) {
   }
   inflight = true;
   void runExtraction(apiConfig, model).catch((err) => {
-    log11.error("Brand extraction failed", { error: err?.message });
+    log12.error("Brand extraction failed", { error: err?.message });
   }).finally(() => {
     inflight = false;
     if (dirty) {
@@ -6549,208 +6818,6 @@ function triggerBrandExtraction(apiConfig, model) {
   });
 }
 
-// src/session.ts
-import fs22 from "fs";
-import path11 from "path";
-var log12 = createLogger("session");
-var SESSION_FILE = ".remy-session.json";
-var ARCHIVE_DIR = ".logs/sessions";
-var ROTATE_THRESHOLD_BYTES = 32 * 1024 * 1024;
-var RETAIN_TAIL_BYTES = 16 * 1024 * 1024;
-var ARCHIVE_RETENTION_BYTES = 64 * 1024 * 1024;
-function loadSession(state) {
-  pruneArchives();
-  try {
-    const raw = fs22.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);
-      log12.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) {
-  fs22.mkdirSync(ARCHIVE_DIR, { recursive: true });
-  const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-  let dest = path11.join(ARCHIVE_DIR, `${label}-${ts}.json`);
-  let n = 1;
-  while (fs22.existsSync(dest)) {
-    dest = path11.join(ARCHIVE_DIR, `${label}-${ts}-${n++}.json`);
-  }
-  const payload = { messages };
-  if (models && Object.keys(models).length > 0) {
-    payload.models = models;
-  }
-  fs22.writeFileSync(dest, JSON.stringify(payload), "utf-8");
-  log12.info("Session archived", { label, dest, messageCount: messages.length });
-  pruneArchives();
-  return dest;
-}
-function pruneArchives() {
-  try {
-    const entries = fs22.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: fs22.statSync(path11.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 {
-        fs22.unlinkSync(path11.join(ARCHIVE_DIR, archives[i].name));
-        freed += archives[i].size;
-        removed++;
-      } catch {
-      }
-    }
-    if (removed > 0) {
-      log12.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);
-  log12.info("Session rotated", {
-    archived: cut,
-    retained: state.messages.length
-  });
-  return true;
-}
-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));
-    }
-    fs22.writeFileSync(SESSION_FILE, serialized, "utf-8");
-    log12.info("Session saved", { messageCount: state.messages.length });
-  } catch (err) {
-    log12.warn("Session save failed", { error: err.message });
-  }
-}
-function clearSession(state) {
-  try {
-    if (state.messages.length > 0) {
-      archiveMessages(state.messages, "cleared", state.models);
-    }
-  } catch (err) {
-    log12.warn("Session archive on clear failed", { error: err.message });
-  }
-  state.messages = [];
-  try {
-    if (fs22.existsSync(SESSION_FILE)) {
-      fs22.unlinkSync(SESSION_FILE);
-    }
-  } catch (err) {
-    log12.warn("Session clear: could not remove live file", {
-      error: err.message
-    });
-  }
-}
-
 // src/parsePartialJson.ts
 var PartialJSON = class extends Error {
 };
@@ -7950,7 +8017,9 @@ var HeadlessSession = class {
         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();
       }
@@ -8084,20 +8153,10 @@ var HeadlessSession = class {
         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", {
@@ -8426,7 +8485,7 @@ var HeadlessSession = class {
         error: err.message
       });
     }
-    this.applyPendingSummaries();
+    applyPendingSummaries(this.state);
     this.applyPendingBlockUpdates();
   }
   async handleMessage(parsed, requestId) {
@@ -8730,7 +8789,7 @@ var HeadlessSession = class {
           model: this.opts.model
         });
         if (!this.running) {
-          this.applyPendingSummaries();
+          applyPendingSummaries(this.state);
         }
         this.emit("completed", { success: true }, requestId);
       } catch (err) {