@mindstudio-ai/remy 0.1.175 → 0.1.176

package/dist/headless.js

@@ -83,6 +83,7 @@ function resolveConfig(flags) {
   const env = file.environments?.[activeEnv];
   const apiKey = flags?.apiKey || process.env.MINDSTUDIO_API_KEY || env?.apiKey || "";
   const baseUrl2 = flags?.baseUrl || process.env.MINDSTUDIO_BASE_URL || env?.apiBaseUrl || DEFAULT_BASE_URL;
+  const appId = process.env.MINDSTUDIO_APP_ID || void 0;
   if (!apiKey) {
     log.error("No API key found");
     throw new Error(
@@ -93,9 +94,10 @@ function resolveConfig(flags) {
   log.info("Config resolved", {
     baseUrl: baseUrl2,
     keySource,
-    environment: activeEnv
+    environment: activeEnv,
+    appId
   });
-  return { apiKey, baseUrl: baseUrl2 };
+  return { apiKey, baseUrl: baseUrl2, appId };
 }
 
 // src/assets.ts
@@ -521,8 +523,10 @@ async function* streamChat(params) {
             ...subAgentId && { subAgentId },
             durationMs: elapsed,
             stopReason: event.stopReason,
+            modelId: event.modelId,
             inputTokens: event.usage.inputTokens,
-            outputTokens: event.usage.outputTokens
+            outputTokens: event.usage.outputTokens,
+            cost: event.cost
           });
         } else if (event.type === "error") {
           log2.error("SSE error event", {
@@ -611,6 +615,7 @@ async function generateBackgroundAck(params) {
         Authorization: `Bearer ${params.apiConfig.apiKey}`
       },
       body: JSON.stringify({
+        appId: params.apiConfig.appId,
         agentName: params.agentName,
         task: params.task
       }),
@@ -626,6 +631,24 @@ async function generateBackgroundAck(params) {
   }
 }
 
+// src/usageLedger.ts
+import fs5 from "fs";
+var LEDGER_FILE = ".logs/usage.ndjson";
+var fd = null;
+function nanoToDollars(nano) {
+  return typeof nano === "number" ? nano / 1e9 : void 0;
+}
+function recordUsage(entry) {
+  try {
+    if (fd === null) {
+      fs5.mkdirSync(".logs", { recursive: true });
+      fd = fs5.openSync(LEDGER_FILE, "a");
+    }
+    fs5.writeSync(fd, JSON.stringify(entry) + "\n");
+  } catch {
+  }
+}
+
 // src/compaction/index.ts
 var log3 = createLogger("compaction");
 var CONVERSATION_SUMMARY_PROMPT = readAsset("compaction", "conversation.md");
@@ -840,6 +863,7 @@ async function generateSummary(apiConfig, name, compactionPrompt, messagesToSumm
 Conversation to summarize:
 
 ${serialized}` : serialized;
+  const iterStart = Date.now();
   for await (const event of streamChat({
     ...apiConfig,
     subAgentId: "conversationSummarizer",
@@ -849,6 +873,20 @@ ${serialized}` : serialized;
   })) {
     if (event.type === "text") {
       summaryText += event.text;
+    } else if (event.type === "done") {
+      recordUsage({
+        ts: Date.now(),
+        agentName: "conversationSummarizer",
+        modelId: event.modelId,
+        inputTokens: event.usage.inputTokens,
+        outputTokens: event.usage.outputTokens,
+        cacheCreationTokens: event.usage.cacheCreationTokens,
+        cacheReadTokens: event.usage.cacheReadTokens,
+        cost: nanoToDollars(event.cost),
+        billingEvents: event.billingEvents,
+        durationMs: Date.now() - iterStart,
+        toolNames: []
+      });
     } else if (event.type === "error") {
       log3.error("Summary generation failed", { name, error: event.error });
       return null;
@@ -863,7 +901,7 @@ ${serialized}` : serialized;
 }
 
 // src/tools/spec/readSpec.ts
-import fs5 from "fs/promises";
+import fs6 from "fs/promises";
 
 // src/tools/spec/_helpers.ts
 var HEADING_RE = /^(#{1,6})\s+(.+)$/;
@@ -983,7 +1021,7 @@ var readSpecTool = {
       return `Error: ${err.message}`;
     }
     try {
-      const content = await fs5.readFile(input.path, "utf-8");
+      const content = await fs6.readFile(input.path, "utf-8");
       const allLines = content.split("\n");
       const totalLines = allLines.length;
       const maxLines = input.maxLines === 0 ? Infinity : input.maxLines || DEFAULT_MAX_LINES;
@@ -1011,7 +1049,7 @@ var readSpecTool = {
 };
 
 // src/tools/spec/writeSpec.ts
-import fs6 from "fs/promises";
+import fs7 from "fs/promises";
 import path4 from "path";
 
 // src/tools/_helpers/diff.ts
@@ -1088,7 +1126,7 @@ var writeSpecTool = {
   },
   streaming: {
     transform: async (partial) => {
-      const oldContent = await fs6.readFile(partial.path, "utf-8").catch(() => "");
+      const oldContent = await fs7.readFile(partial.path, "utf-8").catch(() => "");
       const lineCount = partial.content.split("\n").length;
       return `Writing ${partial.path} (${lineCount} lines)
 ${unifiedDiff(partial.path, oldContent, partial.content)}`;
@@ -1102,13 +1140,13 @@ ${unifiedDiff(partial.path, oldContent, partial.content)}`;
     }
     const release = await acquireFileLock(input.path);
     try {
-      await fs6.mkdir(path4.dirname(input.path), { recursive: true });
+      await fs7.mkdir(path4.dirname(input.path), { recursive: true });
       let oldContent = null;
       try {
-        oldContent = await fs6.readFile(input.path, "utf-8");
+        oldContent = await fs7.readFile(input.path, "utf-8");
       } catch {
       }
-      await fs6.writeFile(input.path, input.content, "utf-8");
+      await fs7.writeFile(input.path, input.content, "utf-8");
       const lineCount = input.content.split("\n").length;
       const label = oldContent !== null ? "Wrote" : "Created";
       return `${label} ${input.path} (${lineCount} lines)
@@ -1122,7 +1160,7 @@ ${unifiedDiff(input.path, oldContent ?? "", input.content)}`;
 };
 
 // src/tools/spec/editSpec.ts
-import fs7 from "fs/promises";
+import fs8 from "fs/promises";
 var editSpecTool = {
   clearable: true,
   definition: {
@@ -1172,7 +1210,7 @@ var editSpecTool = {
     try {
       let originalContent;
       try {
-        originalContent = await fs7.readFile(input.path, "utf-8");
+        originalContent = await fs8.readFile(input.path, "utf-8");
       } catch (err) {
         return `Error reading file: ${err.message}`;
       }
@@ -1228,7 +1266,7 @@ ${tree}`;
         content = lines.join("\n");
       }
       try {
-        await fs7.writeFile(input.path, content, "utf-8");
+        await fs8.writeFile(input.path, content, "utf-8");
       } catch (err) {
         return `Error writing file: ${err.message}`;
       }
@@ -1240,7 +1278,7 @@ ${tree}`;
 };
 
 // src/tools/spec/listSpecFiles.ts
-import fs8 from "fs/promises";
+import fs9 from "fs/promises";
 import path5 from "path";
 var listSpecFilesTool = {
   clearable: false,
@@ -1270,7 +1308,7 @@ var listSpecFilesTool = {
 };
 async function listRecursive(dir) {
   const results = [];
-  const entries = await fs8.readdir(dir, { withFileTypes: true });
+  const entries = await fs9.readdir(dir, { withFileTypes: true });
   entries.sort((a, b) => {
     if (a.isDirectory() && !b.isDirectory()) {
       return -1;
@@ -1316,7 +1354,7 @@ var presentPublishPlanTool = {
 };
 
 // src/tools/spec/writePlan.ts
-import fs9 from "fs/promises";
+import fs10 from "fs/promises";
 var PLAN_FILE = ".remy-plan.md";
 var writePlanTool = {
   clearable: false,
@@ -1341,13 +1379,13 @@ status: pending
 ---
 
 ${content}`;
-    await fs9.writeFile(PLAN_FILE, file, "utf-8");
+    await fs10.writeFile(PLAN_FILE, file, "utf-8");
     return "Plan written to .remy-plan.md. Waiting for user approval.";
   }
 };
 
 // src/tools/spec/updatePlanStatus.ts
-import fs10 from "fs/promises";
+import fs11 from "fs/promises";
 var PLAN_FILE2 = ".remy-plan.md";
 var updatePlanStatusTool = {
   clearable: false,
@@ -1370,15 +1408,15 @@ var updatePlanStatusTool = {
     const status = input.status;
     let content;
     try {
-      content = await fs10.readFile(PLAN_FILE2, "utf-8");
+      content = await fs11.readFile(PLAN_FILE2, "utf-8");
     } catch {
       return "No plan file found.";
     }
     if (status === "rejected") {
-      await fs10.unlink(PLAN_FILE2);
+      await fs11.unlink(PLAN_FILE2);
       return "Plan rejected and removed.";
     }
-    await fs10.writeFile(
+    await fs11.writeFile(
       PLAN_FILE2,
       content.replace(/^status:\s*\w+/m, `status: ${status}`),
       "utf-8"
@@ -1684,6 +1722,90 @@ var askMindStudioSdkTool = {
   }
 };
 
+// src/subagents/common/runMindstudioCli.ts
+function stripFlags(args) {
+  const out = [];
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    if (arg === "--no-meta") {
+      continue;
+    }
+    if (arg === "--output-key") {
+      i++;
+      continue;
+    }
+    out.push(arg);
+  }
+  return out;
+}
+async function runMindstudioCli(args, options) {
+  const cleanArgs = stripFlags(args);
+  const cliAction = args[0];
+  const agentName = options?.caller ?? "mindstudio-cli";
+  const start = Date.now();
+  const raw = await runCli("mindstudio", cleanArgs, options);
+  let envelope;
+  try {
+    envelope = JSON.parse(raw);
+  } catch {
+    return raw;
+  }
+  if (envelope && typeof envelope === "object" && Array.isArray(envelope.results)) {
+    const durationMs = Date.now() - start;
+    for (const step of envelope.results) {
+      if (typeof step?.billingCost === "number") {
+        recordUsage({
+          ts: Date.now(),
+          agentName,
+          cliAction: `${cliAction}:${step.stepType ?? "step"}`,
+          cost: nanoToDollars(step.billingCost),
+          inputTokens: 0,
+          outputTokens: 0,
+          durationMs,
+          toolNames: []
+        });
+      }
+    }
+    return JSON.stringify(envelope.results);
+  }
+  if (typeof envelope?.$billingCost === "number") {
+    recordUsage({
+      ts: Date.now(),
+      agentName,
+      cliAction,
+      cost: nanoToDollars(envelope.$billingCost),
+      billingEvents: envelope.$billingEvents,
+      // CLI billing isn't expressed as input/output tokens for most actions
+      // (image gen is per-image, scrape per-page, etc). `numUnits` inside each
+      // billingEvent carries the per-event unit count.
+      inputTokens: 0,
+      outputTokens: 0,
+      durationMs: Date.now() - start,
+      toolNames: []
+    });
+  }
+  if (options?.outputKey) {
+    const v = envelope?.[options.outputKey];
+    if (v === void 0 || v === null) {
+      return JSON.stringify(stripDollarKeys(envelope));
+    }
+    return typeof v === "string" ? v : JSON.stringify(v);
+  }
+  return JSON.stringify(stripDollarKeys(envelope));
+}
+function stripDollarKeys(envelope) {
+  if (!envelope || typeof envelope !== "object" || Array.isArray(envelope)) {
+    return envelope;
+  }
+  const out = {};
+  for (const [k, v] of Object.entries(envelope)) {
+    if (!k.startsWith("$")) {
+      out[k] = v;
+    }
+  }
+  return out;
+}
+
 // src/tools/common/searchGoogle.ts
 var searchGoogleTool = {
   clearable: false,
@@ -1703,19 +1825,9 @@ var searchGoogleTool = {
   },
   async execute(input, context) {
     const query = input.query;
-    return runCli(
-      "mindstudio",
-      [
-        "search-google",
-        "--query",
-        query,
-        "--export-type",
-        "json",
-        "--output-key",
-        "results",
-        "--no-meta"
-      ],
-      { maxBuffer: 512 * 1024, onLog: context?.onLog }
+    return runMindstudioCli(
+      ["search-google", "--query", query, "--export-type", "json"],
+      { outputKey: "results", maxBuffer: 512 * 1024, onLog: context?.onLog }
     );
   }
 };
@@ -1779,7 +1891,7 @@ var compactConversationTool = {
 };
 
 // src/tools/code/readFile.ts
-import fs11 from "fs/promises";
+import fs12 from "fs/promises";
 var DEFAULT_MAX_LINES2 = 500;
 function isBinary(buffer) {
   const sample = buffer.subarray(0, 8192);
@@ -1816,7 +1928,7 @@ var readFileTool = {
   },
   async execute(input) {
     try {
-      const buffer = await fs11.readFile(input.path);
+      const buffer = await fs12.readFile(input.path);
       if (isBinary(buffer)) {
         const size = buffer.length;
         const unit = size > 1024 * 1024 ? `${(size / (1024 * 1024)).toFixed(1)}MB` : `${(size / 1024).toFixed(1)}KB`;
@@ -1850,7 +1962,7 @@ var readFileTool = {
 };
 
 // src/tools/code/writeFile.ts
-import fs12 from "fs/promises";
+import fs13 from "fs/promises";
 import path6 from "path";
 var writeFileTool = {
   clearable: true,
@@ -1888,7 +2000,7 @@ var writeFileTool = {
         lastNewlineCount = newlineCount;
         const lastNewline = partial.content.lastIndexOf("\n");
         const completeContent = partial.content.substring(0, lastNewline + 1);
-        const oldContent = await fs12.readFile(partial.path, "utf-8").catch(() => "");
+        const oldContent = await fs13.readFile(partial.path, "utf-8").catch(() => "");
         return `Writing ${partial.path} (${newlineCount} lines)
 ${unifiedDiff(partial.path, oldContent, completeContent)}`;
       }
@@ -1897,13 +2009,13 @@ ${unifiedDiff(partial.path, oldContent, completeContent)}`;
   async execute(input) {
     const release = await acquireFileLock(input.path);
     try {
-      await fs12.mkdir(path6.dirname(input.path), { recursive: true });
+      await fs13.mkdir(path6.dirname(input.path), { recursive: true });
       let oldContent = null;
       try {
-        oldContent = await fs12.readFile(input.path, "utf-8");
+        oldContent = await fs13.readFile(input.path, "utf-8");
       } catch {
       }
-      await fs12.writeFile(input.path, input.content, "utf-8");
+      await fs13.writeFile(input.path, input.content, "utf-8");
       const lineCount = input.content.split("\n").length;
       const label = oldContent !== null ? "Wrote" : "Created";
       return `${label} ${input.path} (${lineCount} lines)
@@ -1917,7 +2029,7 @@ ${unifiedDiff(input.path, oldContent ?? "", input.content)}`;
 };
 
 // src/tools/code/editFile/index.ts
-import fs13 from "fs/promises";
+import fs14 from "fs/promises";
 
 // src/tools/code/editFile/_helpers.ts
 function buildLineOffsets(content) {
@@ -2030,7 +2142,7 @@ var editFileTool = {
   async execute(input) {
     const release = await acquireFileLock(input.path);
     try {
-      const content = await fs13.readFile(input.path, "utf-8");
+      const content = await fs14.readFile(input.path, "utf-8");
       const { old_string, new_string, replace_all } = input;
       const occurrences = findOccurrences(content, old_string);
       if (replace_all) {
@@ -2046,7 +2158,7 @@ var editFileTool = {
             new_string
           );
         }
-        await fs13.writeFile(input.path, updated, "utf-8");
+        await fs14.writeFile(input.path, updated, "utf-8");
         return `Replaced ${occurrences.length} occurrence${occurrences.length > 1 ? "s" : ""} in ${input.path}
 ${unifiedDiff(input.path, content, updated)}`;
       }
@@ -2057,7 +2169,7 @@ ${unifiedDiff(input.path, content, updated)}`;
           old_string.length,
           new_string
         );
-        await fs13.writeFile(input.path, updated, "utf-8");
+        await fs14.writeFile(input.path, updated, "utf-8");
         return `Updated ${input.path}
 ${unifiedDiff(input.path, content, updated)}`;
       }
@@ -2073,7 +2185,7 @@ ${unifiedDiff(input.path, content, updated)}`;
           flex.matchedText.length,
           new_string
         );
-        await fs13.writeFile(input.path, updated, "utf-8");
+        await fs14.writeFile(input.path, updated, "utf-8");
         return `Updated ${input.path} (matched with flexible whitespace at line ${flex.line})
 ${unifiedDiff(input.path, content, updated)}`;
       }
@@ -2305,12 +2417,12 @@ var globTool = {
 };
 
 // src/tools/code/listDir.ts
-import fs14 from "fs/promises";
+import fs15 from "fs/promises";
 import path7 from "path";
 var EXCLUDE = /* @__PURE__ */ new Set([".git", "node_modules"]);
 var MAX_CHILDREN = 15;
 async function readAndSort(dirPath) {
-  const entries = await fs14.readdir(dirPath, { withFileTypes: true });
+  const entries = await fs15.readdir(dirPath, { withFileTypes: true });
   return entries.filter((e) => !EXCLUDE.has(e.name)).sort((a, b) => {
     if (a.isDirectory() && !b.isDirectory()) {
       return -1;
@@ -2351,7 +2463,7 @@ function formatSize(bytes) {
 }
 async function formatFile(dirPath, name, indent) {
   try {
-    const stat = await fs14.stat(path7.join(dirPath, name));
+    const stat = await fs15.stat(path7.join(dirPath, name));
     return `${indent}${name}${" ".repeat(Math.max(1, 30 - indent.length - name.length))}${formatSize(stat.size)}`;
   } catch {
     return `${indent}${name}`;
@@ -2661,8 +2773,7 @@ var VISION_MODEL_OVERRIDE = {
 };
 async function analyzeImage(params) {
   const { prompt, imageUrl, timeout = 2e5, onLog } = params;
-  return runCli(
-    "mindstudio",
+  return runMindstudioCli(
     [
       "analyze-image",
       "--prompt",
@@ -2670,12 +2781,9 @@ async function analyzeImage(params) {
       "--image-url",
       imageUrl,
       "--vision-model-override",
-      JSON.stringify(VISION_MODEL_OVERRIDE),
-      "--output-key",
-      "analysis",
-      "--no-meta"
+      JSON.stringify(VISION_MODEL_OVERRIDE)
     ],
-    { timeout, onLog }
+    { outputKey: "analysis", timeout, onLog }
   );
 }
 
@@ -2719,11 +2827,11 @@ async function captureAndAnalyzeScreenshot(promptOrOptions) {
   let prompt;
   let existingUrl;
   let onLog;
-  let path11;
+  let path12;
   if (typeof promptOrOptions === "object" && promptOrOptions !== null) {
     prompt = promptOrOptions.prompt;
     existingUrl = promptOrOptions.imageUrl;
-    path11 = promptOrOptions.path;
+    path12 = promptOrOptions.path;
     onLog = promptOrOptions.onLog;
   } else {
     prompt = promptOrOptions;
@@ -2735,7 +2843,7 @@ async function captureAndAnalyzeScreenshot(promptOrOptions) {
   } else {
     const ssResult = await sidecarRequest(
       "/screenshot-full-page",
-      path11 ? { path: path11 } : void 0,
+      path12 ? { path: path12 } : void 0,
       { timeout: 12e4 }
     );
     url = ssResult?.url || ssResult?.screenshotUrl;
@@ -2792,7 +2900,7 @@ function startStatusWatcher(config) {
           "Content-Type": "application/json",
           Authorization: `Bearer ${apiConfig.apiKey}`
         },
-        body: JSON.stringify({ context }),
+        body: JSON.stringify({ appId: apiConfig.appId, context }),
         signal
       });
       if (!res.ok || stopped) {
@@ -2984,8 +3092,14 @@ ${content}` : attachmentHeader;
     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 thinking = blocks.filter(
-      (b) => b.type === "thinking"
-    ).map((b) => ({ thinking: b.thinking, signature: b.signature }));
+      (b) => b.type === "thinking" || b.type === "redacted_thinking"
+    ).map(
+      (b) => b.type === "thinking" ? {
+        type: "thinking",
+        thinking: b.thinking,
+        signature: b.signature
+      } : { type: "redacted_thinking", data: b.data }
+    );
     const cleaned2 = {
       role: msg.role,
       content: text
@@ -3075,10 +3189,13 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
       if (signal?.aborted) {
         return abortResult([]);
       }
+      const iterStart = Date.now();
       const contentBlocks = [];
       let thinkingStartedAt = 0;
+      let lastThinkingRelatedStartedAt;
       let stopReason = "end_turn";
       let currentToolNames = "";
+      let lastUsage;
       const statusWatcher = startStatusWatcher({
         apiConfig,
         getContext: () => {
@@ -3153,8 +3270,20 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
                 startedAt: thinkingStartedAt,
                 completedAt: event.ts
               });
+              lastThinkingRelatedStartedAt = thinkingStartedAt;
               thinkingStartedAt = 0;
               break;
+            case "redacted_thinking_complete": {
+              const startedAt = lastThinkingRelatedStartedAt !== void 0 ? lastThinkingRelatedStartedAt + 1 : event.ts;
+              contentBlocks.push({
+                type: "redacted_thinking",
+                data: event.data,
+                startedAt,
+                completedAt: event.ts
+              });
+              lastThinkingRelatedStartedAt = startedAt;
+              break;
+            }
             case "tool_use":
               contentBlocks.push({
                 type: "tool",
@@ -3172,6 +3301,30 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
               break;
             case "done":
               stopReason = event.stopReason;
+              lastUsage = {
+                inputTokens: event.usage.inputTokens,
+                outputTokens: event.usage.outputTokens,
+                cacheCreationTokens: event.usage.cacheCreationTokens,
+                cacheReadTokens: event.usage.cacheReadTokens,
+                llmCalls: 1
+              };
+              recordUsage({
+                ts: Date.now(),
+                requestId,
+                agentName: subAgentId || "sub-agent",
+                parentToolId,
+                modelId: event.modelId,
+                inputTokens: event.usage.inputTokens,
+                outputTokens: event.usage.outputTokens,
+                cacheCreationTokens: event.usage.cacheCreationTokens,
+                cacheReadTokens: event.usage.cacheReadTokens,
+                cost: nanoToDollars(event.cost),
+                billingEvents: event.billingEvents,
+                durationMs: Date.now() - iterStart,
+                toolNames: contentBlocks.filter(
+                  (b) => b.type === "tool"
+                ).map((b) => b.name)
+              });
               break;
             case "error":
               return {
@@ -3191,7 +3344,8 @@ ${partial}` : "[INTERRUPTED] Agent was interrupted before producing output.",
       }
       messages.push({
         role: "assistant",
-        content: contentBlocks
+        content: contentBlocks,
+        ...lastUsage ? { usage: lastUsage } : {}
       });
       const toolCalls = contentBlocks.filter(
         (b) => b.type === "tool"
@@ -3517,11 +3671,11 @@ var BROWSER_TOOLS = [
 var BROWSER_EXTERNAL_TOOLS = /* @__PURE__ */ new Set(["browserCommand"]);
 
 // src/subagents/browserAutomation/prompt.ts
-import fs15 from "fs";
+import fs16 from "fs";
 var BASE_PROMPT = readAsset("subagents/browserAutomation", "prompt.md");
 function getBrowserAutomationPrompt() {
   try {
-    const appSpec = fs15.readFileSync("src/app.md", "utf-8").trim();
+    const appSpec = fs16.readFileSync("src/app.md", "utf-8").trim();
     return `${BASE_PROMPT}
 
 <!-- cache_breakpoint -->
@@ -3620,10 +3774,9 @@ var browserAutomationTool = {
                     visionModelOverride: VISION_MODEL_OVERRIDE
                   }
                 }));
-                const batchResult = await runCli(
-                  "mindstudio",
-                  ["batch", "--no-meta", JSON.stringify(batchInput)],
-                  { timeout: 2e5 }
+                const batchResult = await runMindstudioCli(
+                  ["batch", JSON.stringify(batchInput)],
+                  { timeout: 2e5, caller: "browserAutomation" }
                 );
                 try {
                   const analyses = JSON.parse(batchResult);
@@ -3846,19 +3999,9 @@ var definition = {
   }
 };
 async function execute(input, onLog) {
-  return runCli(
-    "mindstudio",
-    [
-      "search-google",
-      "--query",
-      input.query,
-      "--export-type",
-      "json",
-      "--output-key",
-      "results",
-      "--no-meta"
-    ],
-    { onLog }
+  return runMindstudioCli(
+    ["search-google", "--query", input.query, "--export-type", "json"],
+    { outputKey: "results", onLog, caller: "designExpert" }
   );
 }
 
@@ -3888,17 +4031,15 @@ async function execute2(input, onLog) {
   if (input.screenshot) {
     pageOptions.screenshot = true;
   }
-  return runCli(
-    "mindstudio",
+  return runMindstudioCli(
     [
       "scrape-url",
       "--url",
       input.url,
       "--page-options",
-      JSON.stringify(pageOptions),
-      "--no-meta"
+      JSON.stringify(pageOptions)
     ],
-    { onLog }
+    { onLog, caller: "designExpert" }
   );
 }
 
@@ -3956,8 +4097,7 @@ async function execute3(input, onLog) {
   const isImageUrl = /\.(png|jpe?g|webp|gif|svg|avif)(\?|$)/i.test(url);
   let imageUrl = url;
   if (!isImageUrl) {
-    const ssUrl = await runCli(
-      "mindstudio",
+    const ssUrl = await runMindstudioCli(
       [
         "screenshot-url",
         "--url",
@@ -3967,12 +4107,14 @@ async function execute3(input, onLog) {
         "--width",
         "1440",
         "--delay",
-        "2000",
-        "--output-key",
-        "screenshotUrl",
-        "--no-meta"
+        "2000"
       ],
-      { timeout: 12e4, onLog }
+      {
+        outputKey: "screenshotUrl",
+        timeout: 12e4,
+        onLog,
+        caller: "designExpert"
+      }
     );
     if (ssUrl.startsWith("Error")) {
       return `Could not screenshot ${url}: ${ssUrl}`;
@@ -4130,19 +4272,15 @@ ${context}
 <brief>
 ${brief}
 </brief>`;
-  const enhanced = await runCli(
-    "mindstudio",
+  const enhanced = await runMindstudioCli(
     [
       "generate-text",
       "--message",
       message,
       "--model-override",
-      JSON.stringify(MODEL_OVERRIDE),
-      "--output-key",
-      "content",
-      "--no-meta"
+      JSON.stringify(MODEL_OVERRIDE)
     ],
-    { timeout: 6e4, onLog }
+    { outputKey: "content", timeout: 6e4, onLog, caller: "designExpert" }
   );
   return enhanced.trim();
 }
@@ -4178,11 +4316,14 @@ async function generateImageAssets(opts) {
         config
       }
     });
-    const url = await runCli(
-      "mindstudio",
-      ["generate-image", "--output-key", "imageUrl", "--no-meta"],
-      { jsonLogs: true, timeout: 2e5, onLog, stdin: step }
-    );
+    const url = await runMindstudioCli(["generate-image"], {
+      outputKey: "imageUrl",
+      jsonLogs: true,
+      timeout: 2e5,
+      onLog,
+      stdin: step,
+      caller: "designExpert"
+    });
     imageUrls = [url];
   } else {
     const steps = enhancedPrompts.map((prompt) => ({
@@ -4195,11 +4336,12 @@ async function generateImageAssets(opts) {
         }
       }
     }));
-    const batchResult = await runCli("mindstudio", ["batch", "--no-meta"], {
+    const batchResult = await runMindstudioCli(["batch"], {
       jsonLogs: true,
       timeout: 2e5,
       onLog,
-      stdin: JSON.stringify(steps)
+      stdin: JSON.stringify(steps),
+      caller: "designExpert"
     });
     try {
       const parsed = JSON.parse(batchResult);
@@ -4216,17 +4358,14 @@ async function generateImageAssets(opts) {
         if (url.startsWith("Error")) {
           return url;
         }
-        const result = await runCli(
-          "mindstudio",
-          [
-            "remove-background-from-image",
-            "--image-url",
-            url,
-            "--output-key",
-            "imageUrl",
-            "--no-meta"
-          ],
-          { timeout: 2e5, onLog }
+        const result = await runMindstudioCli(
+          ["remove-background-from-image", "--image-url", url],
+          {
+            outputKey: "imageUrl",
+            timeout: 2e5,
+            onLog,
+            caller: "designExpert"
+          }
         );
         return result.startsWith("Error") ? url : result;
       })
@@ -4378,12 +4517,12 @@ async function executeDesignExpertTool(name, input, context, toolCallId, onLog)
 }
 
 // src/subagents/common/context.ts
-import fs16 from "fs";
+import fs17 from "fs";
 import path8 from "path";
 function walkMdFiles2(dir, skip) {
   const files = [];
   try {
-    for (const entry of fs16.readdirSync(dir, { withFileTypes: true })) {
+    for (const entry of fs17.readdirSync(dir, { withFileTypes: true })) {
       const full = path8.join(dir, entry.name);
       if (entry.isDirectory()) {
         if (!skip?.has(entry.name)) {
@@ -4399,7 +4538,7 @@ function walkMdFiles2(dir, skip) {
 }
 function parseFrontmatter2(filePath) {
   try {
-    const content = fs16.readFileSync(filePath, "utf-8");
+    const content = fs17.readFileSync(filePath, "utf-8");
     const match = content.match(/^---\n([\s\S]*?)\n---/);
     if (!match) {
       return {};
@@ -4445,7 +4584,7 @@ function loadRoadmapIndex() {
   const parts = [];
   try {
     const indexJson = JSON.parse(
-      fs16.readFileSync("src/roadmap/index.json", "utf-8")
+      fs17.readFileSync("src/roadmap/index.json", "utf-8")
     );
     if (indexJson.lanes?.length > 0) {
       const laneLines = indexJson.lanes.map(
@@ -4548,7 +4687,7 @@ The first-party SDK (@mindstudio-ai/agent) provides access to 200+ AI models (Op
 }
 
 // src/subagents/designExpert/data/sampleCache.ts
-import fs17 from "fs";
+import fs18 from "fs";
 var SAMPLE_FILE = ".remy-design-sample.json";
 var cached = null;
 function generateIndices(poolSize, sampleSize) {
@@ -4562,14 +4701,14 @@ function generateIndices(poolSize, sampleSize) {
 }
 function load() {
   try {
-    return JSON.parse(fs17.readFileSync(SAMPLE_FILE, "utf-8"));
+    return JSON.parse(fs18.readFileSync(SAMPLE_FILE, "utf-8"));
   } catch {
     return null;
   }
 }
 function save(indices) {
   try {
-    fs17.writeFileSync(SAMPLE_FILE, JSON.stringify(indices));
+    fs18.writeFileSync(SAMPLE_FILE, JSON.stringify(indices));
   } catch {
   }
 }
@@ -4898,7 +5037,7 @@ var VISION_TOOLS = [
 ];
 
 // src/subagents/productVision/executor.ts
-import fs18 from "fs";
+import fs19 from "fs";
 import path9 from "path";
 var ROADMAP_DIR = "src/roadmap";
 var PITCH_DECK_SHELL = readAsset(
@@ -4913,13 +5052,13 @@ async function executeVisionTool(name, input, context) {
     case "writeFile": {
       const filePath = resolve(input.path);
       try {
-        fs18.mkdirSync(ROADMAP_DIR, { recursive: true });
+        fs19.mkdirSync(ROADMAP_DIR, { recursive: true });
         let oldContent = null;
         try {
-          oldContent = fs18.readFileSync(filePath, "utf-8");
+          oldContent = fs19.readFileSync(filePath, "utf-8");
         } catch {
         }
-        fs18.writeFileSync(filePath, input.content, "utf-8");
+        fs19.writeFileSync(filePath, input.content, "utf-8");
         const lineCount = input.content.split("\n").length;
         const label = oldContent !== null ? "Wrote" : "Created";
         return `${label} ${filePath} (${lineCount} lines)
@@ -4931,11 +5070,11 @@ ${unifiedDiff(filePath, oldContent ?? "", input.content)}`;
     case "deleteFile": {
       const filePath = resolve(input.path);
       try {
-        if (!fs18.existsSync(filePath)) {
+        if (!fs19.existsSync(filePath)) {
           return `Error: ${filePath} does not exist`;
         }
-        const oldContent = fs18.readFileSync(filePath, "utf-8");
-        fs18.unlinkSync(filePath);
+        const oldContent = fs19.readFileSync(filePath, "utf-8");
+        fs19.unlinkSync(filePath);
         return `Deleted ${filePath}
 ${unifiedDiff(filePath, oldContent, "")}`;
       } catch (err) {
@@ -4948,8 +5087,8 @@ ${unifiedDiff(filePath, oldContent, "")}`;
       }
       const filePath = resolve("pitch.html");
       try {
-        fs18.mkdirSync(ROADMAP_DIR, { recursive: true });
-        const existing = fs18.existsSync(filePath) ? fs18.readFileSync(filePath, "utf-8").trim() : "";
+        fs19.mkdirSync(ROADMAP_DIR, { recursive: true });
+        const existing = fs19.existsSync(filePath) ? fs19.readFileSync(filePath, "utf-8").trim() : "";
         const currentDeck = existing || PITCH_DECK_SHELL;
         const task = `
 <pitch_content>${input.task}</pitch_content>
@@ -4974,7 +5113,7 @@ Respond only with the complete HTML file and absolutely no other text. Your resp
           /```(?:html|wireframe)\n([\s\S]*?)```/
         );
         const html = htmlMatch ? htmlMatch[1].trim() : result;
-        fs18.writeFileSync(filePath, html, "utf-8");
+        fs19.writeFileSync(filePath, html, "utf-8");
         return `Pitch deck written successfully.`;
       } catch (err) {
         return `Error generating pitch deck: ${err.message}`;
@@ -5191,15 +5330,13 @@ var scrapeWebUrlTool = {
     if (screenshot) {
       pageOptions.screenshot = true;
     }
-    return runCli(
-      "mindstudio",
+    return runMindstudioCli(
       [
         "scrape-url",
         "--url",
         url,
         "--page-options",
-        JSON.stringify(pageOptions),
-        "--no-meta"
+        JSON.stringify(pageOptions)
       ],
       { onLog: context?.onLog }
     );
@@ -5307,7 +5444,7 @@ function triggerCompaction(state, apiConfig, opts = {}) {
 }
 
 // src/brandExtraction/index.ts
-import fs19 from "fs";
+import fs20 from "fs";
 import path10 from "path";
 import { createHash } from "crypto";
 var log8 = createLogger("brandExtraction");
@@ -5356,7 +5493,7 @@ function sha256(input) {
 }
 function readSafe(filePath) {
   try {
-    return fs19.readFileSync(filePath, "utf-8");
+    return fs20.readFileSync(filePath, "utf-8");
   } catch {
     return "";
   }
@@ -5364,7 +5501,7 @@ function readSafe(filePath) {
 function walkMdFiles3(dir) {
   const results = [];
   try {
-    const entries = fs19.readdirSync(dir, { withFileTypes: true });
+    const entries = fs20.readdirSync(dir, { withFileTypes: true });
     for (const entry of entries) {
       const full = path10.join(dir, entry.name);
       if (entry.isDirectory()) {
@@ -5379,7 +5516,7 @@ function walkMdFiles3(dir) {
 }
 function parseFrontmatter3(filePath) {
   try {
-    const content = fs19.readFileSync(filePath, "utf-8");
+    const content = fs20.readFileSync(filePath, "utf-8");
     const match = content.match(/^---\n([\s\S]*?)\n---/);
     if (!match) {
       return { type: "" };
@@ -5398,6 +5535,7 @@ async function extractBrand(apiConfig) {
     return { version: 1 };
   }
   let responseText = "";
+  const iterStart = Date.now();
   try {
     for await (const event of streamChat({
       ...apiConfig,
@@ -5408,6 +5546,20 @@ async function extractBrand(apiConfig) {
     })) {
       if (event.type === "text") {
         responseText += event.text;
+      } else if (event.type === "done") {
+        recordUsage({
+          ts: Date.now(),
+          agentName: "brandExtractor",
+          modelId: event.modelId,
+          inputTokens: event.usage.inputTokens,
+          outputTokens: event.usage.outputTokens,
+          cacheCreationTokens: event.usage.cacheCreationTokens,
+          cacheReadTokens: event.usage.cacheReadTokens,
+          cost: nanoToDollars(event.cost),
+          billingEvents: event.billingEvents,
+          durationMs: Date.now() - iterStart,
+          toolNames: []
+        });
       } else if (event.type === "error") {
         log8.error("Brand extraction stream error", { error: event.error });
         return null;
@@ -5542,14 +5694,14 @@ function pickFont(raw) {
 }
 function persistBrand(brand, inputHash) {
   const tmp = `${BRAND_FILE}.tmp`;
-  fs19.writeFileSync(tmp, JSON.stringify(brand, null, 2), "utf-8");
-  fs19.renameSync(tmp, BRAND_FILE);
+  fs20.writeFileSync(tmp, JSON.stringify(brand, null, 2), "utf-8");
+  fs20.renameSync(tmp, BRAND_FILE);
   const cache = { inputHash, generatedAt: Date.now() };
-  fs19.writeFileSync(CACHE_FILE, JSON.stringify(cache, null, 2), "utf-8");
+  fs20.writeFileSync(CACHE_FILE, JSON.stringify(cache, null, 2), "utf-8");
 }
 function readCache() {
   try {
-    const raw = fs19.readFileSync(CACHE_FILE, "utf-8");
+    const raw = fs20.readFileSync(CACHE_FILE, "utf-8");
     const parsed = JSON.parse(raw);
     if (parsed && typeof parsed.inputHash === "string" && typeof parsed.generatedAt === "number") {
       return parsed;
@@ -5582,12 +5734,14 @@ function triggerBrandExtraction(apiConfig) {
 }
 
 // src/session.ts
-import fs20 from "fs";
+import fs21 from "fs";
+import path11 from "path";
 var log10 = createLogger("session");
 var SESSION_FILE = ".remy-session.json";
+var ARCHIVE_DIR = ".logs/sessions";
 function loadSession(state) {
   try {
-    const raw = fs20.readFileSync(SESSION_FILE, "utf-8");
+    const raw = fs21.readFileSync(SESSION_FILE, "utf-8");
     const data = JSON.parse(raw);
     if (Array.isArray(data.messages) && data.messages.length > 0) {
       state.messages = sanitizeMessages(data.messages);
@@ -5636,7 +5790,7 @@ function sanitizeMessages(messages) {
 }
 function saveSession(state) {
   try {
-    fs20.writeFileSync(
+    fs21.writeFileSync(
       SESSION_FILE,
       JSON.stringify({ messages: state.messages }, null, 2),
       "utf-8"
@@ -5649,8 +5803,21 @@ function saveSession(state) {
 function clearSession(state) {
   state.messages = [];
   try {
-    fs20.unlinkSync(SESSION_FILE);
-  } catch {
+    if (fs21.existsSync(SESSION_FILE)) {
+      fs21.mkdirSync(ARCHIVE_DIR, { recursive: true });
+      const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+      const dest = path11.join(ARCHIVE_DIR, `cleared-${ts}.json`);
+      fs21.renameSync(SESSION_FILE, dest);
+      log10.info("Session archived on clear", { dest });
+    }
+  } catch (err) {
+    log10.warn("Session archive on clear failed, deleting instead", {
+      error: err.message
+    });
+    try {
+      fs21.unlinkSync(SESSION_FILE);
+    } catch {
+    }
   }
 }
 
@@ -5960,9 +6127,11 @@ async function runTurn(params) {
       saveSession(state);
       return;
     }
+    const iterStart = Date.now();
     const contentBlocks = [];
     const thinkingBlockStartTimes = [];
     let thinkingCompleteCount = 0;
+    let lastThinkingRelatedStartedAt;
     let textBlockOpen = false;
     const toolInputAccumulators = /* @__PURE__ */ new Map();
     let stopReason = "end_turn";
@@ -6094,16 +6263,30 @@ async function runTurn(params) {
             }
             onEvent({ type: "thinking", text: event.text });
             break;
-          case "thinking_complete":
+          case "thinking_complete": {
+            const startedAt = thinkingBlockStartTimes[thinkingCompleteCount] ?? event.ts;
             contentBlocks.push({
               type: "thinking",
               thinking: event.thinking,
               signature: event.signature,
-              startedAt: thinkingBlockStartTimes[thinkingCompleteCount] ?? event.ts,
+              startedAt,
               completedAt: event.ts
             });
             thinkingCompleteCount++;
+            lastThinkingRelatedStartedAt = startedAt;
+            break;
+          }
+          case "redacted_thinking_complete": {
+            const startedAt = lastThinkingRelatedStartedAt !== void 0 ? lastThinkingRelatedStartedAt + 1 : event.ts;
+            contentBlocks.push({
+              type: "redacted_thinking",
+              data: event.data,
+              startedAt,
+              completedAt: event.ts
+            });
+            lastThinkingRelatedStartedAt = startedAt;
             break;
+          }
           case "tool_input_delta": {
             const acc = getOrCreateAccumulator2(event.id, event.name);
             acc.json += event.delta;
@@ -6157,6 +6340,22 @@ async function runTurn(params) {
             turnOutputTokens += event.usage.outputTokens;
             turnCacheCreation += lastCallCacheCreation;
             turnCacheRead += lastCallCacheRead;
+            recordUsage({
+              ts: Date.now(),
+              requestId,
+              agentName: "parent",
+              modelId: event.modelId,
+              inputTokens: event.usage.inputTokens,
+              outputTokens: event.usage.outputTokens,
+              cacheCreationTokens: event.usage.cacheCreationTokens,
+              cacheReadTokens: event.usage.cacheReadTokens,
+              cost: nanoToDollars(event.cost),
+              billingEvents: event.billingEvents,
+              durationMs: Date.now() - iterStart,
+              toolNames: contentBlocks.filter(
+                (b) => b.type === "tool"
+              ).map((b) => b.name)
+            });
             break;
           case "error":
             onEvent({ type: "error", error: friendlyError(event.error) });