@mindstudio-ai/remy 0.1.174 → 0.1.176

package/dist/index.js

@@ -55,14 +55,14 @@ function initLoggerHeadless(level = "info") {
 }
 function initLoggerInteractive(level = "error") {
   currentLevel = LEVELS[level];
-  let fd = null;
+  let fd2 = null;
   writeFn = (line) => {
     try {
-      if (fd === null) {
+      if (fd2 === null) {
         fs.mkdirSync(".logs", { recursive: true });
-        fd = fs.openSync(".logs/agent.ndjson", "a");
+        fd2 = fs.openSync(".logs/agent.ndjson", "a");
       }
-      fs.writeSync(fd, line + "\n");
+      fs.writeSync(fd2, line + "\n");
     } catch {
     }
   };
@@ -209,8 +209,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") {
           log.error("SSE error event", {
@@ -296,6 +298,7 @@ async function generateBackgroundAck(params) {
         Authorization: `Bearer ${params.apiConfig.apiKey}`
       },
       body: JSON.stringify({
+        appId: params.apiConfig.appId,
         agentName: params.agentName,
         task: params.task
       }),
@@ -1237,12 +1240,127 @@ var init_sdkConsultant = __esm({
   }
 });
 
+// src/usageLedger.ts
+import fs8 from "fs";
+function nanoToDollars(nano) {
+  return typeof nano === "number" ? nano / 1e9 : void 0;
+}
+function recordUsage(entry) {
+  try {
+    if (fd === null) {
+      fs8.mkdirSync(".logs", { recursive: true });
+      fd = fs8.openSync(LEDGER_FILE, "a");
+    }
+    fs8.writeSync(fd, JSON.stringify(entry) + "\n");
+  } catch {
+  }
+}
+var LEDGER_FILE, fd;
+var init_usageLedger = __esm({
+  "src/usageLedger.ts"() {
+    "use strict";
+    LEDGER_FILE = ".logs/usage.ndjson";
+    fd = null;
+  }
+});
+
+// src/subagents/common/runMindstudioCli.ts
+function stripFlags(args2) {
+  const out = [];
+  for (let i = 0; i < args2.length; i++) {
+    const arg = args2[i];
+    if (arg === "--no-meta") {
+      continue;
+    }
+    if (arg === "--output-key") {
+      i++;
+      continue;
+    }
+    out.push(arg);
+  }
+  return out;
+}
+async function runMindstudioCli(args2, options) {
+  const cleanArgs = stripFlags(args2);
+  const cliAction = args2[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;
+}
+var init_runMindstudioCli = __esm({
+  "src/subagents/common/runMindstudioCli.ts"() {
+    "use strict";
+    init_runCli();
+    init_usageLedger();
+  }
+});
+
 // src/tools/common/searchGoogle.ts
 var searchGoogleTool;
 var init_searchGoogle = __esm({
   "src/tools/common/searchGoogle.ts"() {
     "use strict";
-    init_runCli();
+    init_runMindstudioCli();
     searchGoogleTool = {
       clearable: false,
       definition: {
@@ -1261,19 +1379,9 @@ var init_searchGoogle = __esm({
       },
       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 }
         );
       }
     };
@@ -1320,12 +1428,12 @@ var init_setProjectMetadata = __esm({
 });
 
 // src/assets.ts
-import fs8 from "fs";
+import fs9 from "fs";
 import path3 from "path";
 function findRoot(start) {
   let dir = start;
   while (dir !== path3.dirname(dir)) {
-    if (fs8.existsSync(path3.join(dir, "package.json"))) {
+    if (fs9.existsSync(path3.join(dir, "package.json"))) {
       return dir;
     }
     dir = path3.dirname(dir);
@@ -1338,7 +1446,7 @@ function assetPath(...segments) {
 function readAsset(...segments) {
   const full = assetPath(...segments);
   try {
-    return fs8.readFileSync(full, "utf-8").trim();
+    return fs9.readFileSync(full, "utf-8").trim();
   } catch {
     throw new Error(`Required asset missing: ${full}`);
   }
@@ -1346,7 +1454,7 @@ function readAsset(...segments) {
 function readJsonAsset(fallback, ...segments) {
   const full = assetPath(...segments);
   try {
-    return JSON.parse(fs8.readFileSync(full, "utf-8"));
+    return JSON.parse(fs9.readFileSync(full, "utf-8"));
   } catch {
     return fallback;
   }
@@ -1358,7 +1466,7 @@ var init_assets = __esm({
     ROOT = findRoot(
       import.meta.dirname ?? path3.dirname(new URL(import.meta.url).pathname)
     );
-    ASSETS_BASE = fs8.existsSync(path3.join(ROOT, "dist", "prompt")) ? path3.join(ROOT, "dist") : path3.join(ROOT, "src");
+    ASSETS_BASE = fs9.existsSync(path3.join(ROOT, "dist", "prompt")) ? path3.join(ROOT, "dist") : path3.join(ROOT, "src");
   }
 });
 
@@ -1571,6 +1679,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",
@@ -1580,6 +1689,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") {
       log2.error("Summary generation failed", { name, error: event.error });
       return null;
@@ -1599,6 +1722,7 @@ var init_compaction = __esm({
     init_api();
     init_assets();
     init_logger();
+    init_usageLedger();
     log2 = createLogger("compaction");
     CONVERSATION_SUMMARY_PROMPT = readAsset("compaction", "conversation.md");
     SUBAGENT_SUMMARY_PROMPT = readAsset("compaction", "subagent.md");
@@ -1608,11 +1732,11 @@ var init_compaction = __esm({
 });
 
 // src/prompt/static/projectContext.ts
-import fs9 from "fs";
+import fs10 from "fs";
 import path4 from "path";
 function loadProjectManifest() {
   try {
-    const manifest = fs9.readFileSync("mindstudio.json", "utf-8");
+    const manifest = fs10.readFileSync("mindstudio.json", "utf-8");
     return `
 ## Project Manifest (mindstudio.json)
 \`\`\`json
@@ -1653,7 +1777,7 @@ ${entries.join("\n")}`;
 function walkMdFiles(dir) {
   const results = [];
   try {
-    const entries = fs9.readdirSync(dir, { withFileTypes: true });
+    const entries = fs10.readdirSync(dir, { withFileTypes: true });
     for (const entry of entries) {
       const full = path4.join(dir, entry.name);
       if (entry.isDirectory()) {
@@ -1668,7 +1792,7 @@ function walkMdFiles(dir) {
 }
 function parseFrontmatter(filePath) {
   try {
-    const content = fs9.readFileSync(filePath, "utf-8");
+    const content = fs10.readFileSync(filePath, "utf-8");
     const match = content.match(/^---\n([\s\S]*?)\n---/);
     if (!match) {
       return { name: "", description: "", type: "" };
@@ -1684,7 +1808,7 @@ function parseFrontmatter(filePath) {
 }
 function loadPlanStatus() {
   try {
-    const content = fs9.readFileSync(".remy-plan.md", "utf-8");
+    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") {
@@ -1706,7 +1830,7 @@ The user has approved your implementation plan in .remy-plan.md. You may referen
 }
 function loadProjectFileListing() {
   try {
-    const entries = fs9.readdirSync(".", { withFileTypes: true });
+    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;
@@ -1961,7 +2085,7 @@ var init_compactConversation = __esm({
 });
 
 // src/tools/code/readFile.ts
-import fs10 from "fs/promises";
+import fs11 from "fs/promises";
 function isBinary(buffer) {
   const sample = buffer.subarray(0, 8192);
   for (let i = 0; i < sample.length; i++) {
@@ -2002,7 +2126,7 @@ var init_readFile = __esm({
       },
       async execute(input) {
         try {
-          const buffer = await fs10.readFile(input.path);
+          const buffer = await fs11.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`;
@@ -2038,7 +2162,7 @@ var init_readFile = __esm({
 });
 
 // src/tools/code/writeFile.ts
-import fs11 from "fs/promises";
+import fs12 from "fs/promises";
 import path5 from "path";
 var writeFileTool;
 var init_writeFile = __esm({
@@ -2082,7 +2206,7 @@ var init_writeFile = __esm({
             lastNewlineCount = newlineCount;
             const lastNewline = partial.content.lastIndexOf("\n");
             const completeContent = partial.content.substring(0, lastNewline + 1);
-            const oldContent = await fs11.readFile(partial.path, "utf-8").catch(() => "");
+            const oldContent = await fs12.readFile(partial.path, "utf-8").catch(() => "");
             return `Writing ${partial.path} (${newlineCount} lines)
 ${unifiedDiff(partial.path, oldContent, completeContent)}`;
           }
@@ -2091,13 +2215,13 @@ ${unifiedDiff(partial.path, oldContent, completeContent)}`;
       async execute(input) {
         const release = await acquireFileLock(input.path);
         try {
-          await fs11.mkdir(path5.dirname(input.path), { recursive: true });
+          await fs12.mkdir(path5.dirname(input.path), { recursive: true });
           let oldContent = null;
           try {
-            oldContent = await fs11.readFile(input.path, "utf-8");
+            oldContent = await fs12.readFile(input.path, "utf-8");
           } catch {
           }
-          await fs11.writeFile(input.path, input.content, "utf-8");
+          await fs12.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)
@@ -2197,7 +2321,7 @@ var init_helpers2 = __esm({
 });
 
 // src/tools/code/editFile/index.ts
-import fs12 from "fs/promises";
+import fs13 from "fs/promises";
 var editFileTool;
 var init_editFile = __esm({
   "src/tools/code/editFile/index.ts"() {
@@ -2236,7 +2360,7 @@ var init_editFile = __esm({
       async execute(input) {
         const release = await acquireFileLock(input.path);
         try {
-          const content = await fs12.readFile(input.path, "utf-8");
+          const content = await fs13.readFile(input.path, "utf-8");
           const { old_string, new_string, replace_all } = input;
           const occurrences = findOccurrences(content, old_string);
           if (replace_all) {
@@ -2252,7 +2376,7 @@ var init_editFile = __esm({
                 new_string
               );
             }
-            await fs12.writeFile(input.path, updated, "utf-8");
+            await fs13.writeFile(input.path, updated, "utf-8");
             return `Replaced ${occurrences.length} occurrence${occurrences.length > 1 ? "s" : ""} in ${input.path}
 ${unifiedDiff(input.path, content, updated)}`;
           }
@@ -2263,7 +2387,7 @@ ${unifiedDiff(input.path, content, updated)}`;
               old_string.length,
               new_string
             );
-            await fs12.writeFile(input.path, updated, "utf-8");
+            await fs13.writeFile(input.path, updated, "utf-8");
             return `Updated ${input.path}
 ${unifiedDiff(input.path, content, updated)}`;
           }
@@ -2279,7 +2403,7 @@ ${unifiedDiff(input.path, content, updated)}`;
               flex.matchedText.length,
               new_string
             );
-            await fs12.writeFile(input.path, updated, "utf-8");
+            await fs13.writeFile(input.path, updated, "utf-8");
             return `Updated ${input.path} (matched with flexible whitespace at line ${flex.line})
 ${unifiedDiff(input.path, content, updated)}`;
           }
@@ -2531,10 +2655,10 @@ var init_glob = __esm({
 });
 
 // src/tools/code/listDir.ts
-import fs13 from "fs/promises";
+import fs14 from "fs/promises";
 import path6 from "path";
 async function readAndSort(dirPath) {
-  const entries = await fs13.readdir(dirPath, { withFileTypes: true });
+  const entries = await fs14.readdir(dirPath, { withFileTypes: true });
   return entries.filter((e) => !EXCLUDE.has(e.name)).sort((a, b) => {
     if (a.isDirectory() && !b.isDirectory()) {
       return -1;
@@ -2575,7 +2699,7 @@ function formatSize(bytes) {
 }
 async function formatFile(dirPath, name, indent) {
   try {
-    const stat = await fs13.stat(path6.join(dirPath, name));
+    const stat = await fs14.stat(path6.join(dirPath, name));
     return `${indent}${name}${" ".repeat(Math.max(1, 30 - indent.length - name.length))}${formatSize(stat.size)}`;
   } catch {
     return `${indent}${name}`;
@@ -2940,8 +3064,7 @@ var init_queryDatabase = __esm({
 // src/subagents/common/analyzeImage.ts
 async function analyzeImage(params) {
   const { prompt, imageUrl, timeout = 2e5, onLog } = params;
-  return runCli(
-    "mindstudio",
+  return runMindstudioCli(
     [
       "analyze-image",
       "--prompt",
@@ -2949,24 +3072,21 @@ 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 }
   );
 }
 var VISION_MODEL, VISION_MODEL_OVERRIDE;
 var init_analyzeImage = __esm({
   "src/subagents/common/analyzeImage.ts"() {
     "use strict";
-    init_runCli();
+    init_runMindstudioCli();
     VISION_MODEL = "claude-4-6-sonnet";
-    VISION_MODEL_OVERRIDE = JSON.stringify({
+    VISION_MODEL_OVERRIDE = {
       model: VISION_MODEL,
       config: { thinkingBudget: "off" }
-    });
+    };
   }
 });
 
@@ -3006,11 +3126,11 @@ async function captureAndAnalyzeScreenshot(promptOrOptions) {
   let prompt;
   let existingUrl;
   let onLog;
-  let path12;
+  let path13;
   if (typeof promptOrOptions === "object" && promptOrOptions !== null) {
     prompt = promptOrOptions.prompt;
     existingUrl = promptOrOptions.imageUrl;
-    path12 = promptOrOptions.path;
+    path13 = promptOrOptions.path;
     onLog = promptOrOptions.onLog;
   } else {
     prompt = promptOrOptions;
@@ -3022,7 +3142,7 @@ async function captureAndAnalyzeScreenshot(promptOrOptions) {
   } else {
     const ssResult = await sidecarRequest(
       "/screenshot-full-page",
-      path12 ? { path: path12 } : void 0,
+      path13 ? { path: path13 } : void 0,
       { timeout: 12e4 }
     );
     url = ssResult?.url || ssResult?.screenshotUrl;
@@ -3097,7 +3217,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) {
@@ -3299,8 +3419,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
@@ -3395,10 +3521,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: () => {
@@ -3473,8 +3602,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",
@@ -3492,6 +3633,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 {
@@ -3511,7 +3676,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"
@@ -3708,6 +3874,7 @@ var init_runner = __esm({
     "use strict";
     init_api();
     init_logger();
+    init_usageLedger();
     init_statusWatcher();
     init_cleanMessages();
     log5 = createLogger("sub-agent");
@@ -3854,10 +4021,10 @@ var init_tools = __esm({
 });
 
 // src/subagents/browserAutomation/prompt.ts
-import fs14 from "fs";
+import fs15 from "fs";
 function getBrowserAutomationPrompt() {
   try {
-    const appSpec = fs14.readFileSync("src/app.md", "utf-8").trim();
+    const appSpec = fs15.readFileSync("src/app.md", "utf-8").trim();
     return `${BASE_PROMPT}
 
 <!-- cache_breakpoint -->
@@ -3889,14 +4056,15 @@ var init_browserAutomation = __esm({
     init_sidecar();
     init_browserLock();
     init_screenshot();
-    init_runCli();
+    init_runMindstudioCli();
+    init_analyzeImage();
     init_logger();
     log6 = createLogger("browser-automation");
     browserAutomationTool = {
       clearable: true,
       definition: {
         name: "runAutomatedBrowserTest",
-        description: "Run an automated browser test against the live preview. Describe what to test \u2014 the agent figures out how. Use after meaningful changes to frontend code, to reproduce user-reported issues, or to test end-to-end flows. Reports settled states between steps; it cannot reliably observe transient animation frames. For timing-sensitive bugs, read the source first. Never give it explicit values to use when filling out forms or creating accounts \u2014 it will use its own judgement (often it needs specific values to trigger dev-mode bypasses of things like login verification codes).",
+        description: "Run an automated browser test against the live preview. Describe what to test \u2014 the agent figures out how. Use after meaningful changes to frontend code, to reproduce user-reported issues, or to test end-to-end flows. Never give it explicit values to use when filling out forms or creating accounts \u2014 it will use its own judgement (often it needs specific values to trigger dev-mode bypasses of things like login verification codes).",
         inputSchema: {
           type: "object",
           properties: {
@@ -3972,13 +4140,13 @@ var init_browserAutomation = __esm({
                         imageUrl: s.result.url,
                         prompt: buildScreenshotAnalysisPrompt({
                           styleMap: s.result.styleMap
-                        })
+                        }),
+                        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);
@@ -4032,7 +4200,7 @@ var init_screenshot2 = __esm({
       clearable: true,
       definition: {
         name: "screenshot",
-        description: "Capture a full-height screenshot of the app preview and get a description of what's on screen. Captures the settled page state \u2014 it cannot reliably catch animations, transitions, or transient state. For timing-sensitive bugs, read the source instead. Optionally provide specific questions about what you're looking for. Use a bulleted list to ask many questions at once. To ask additional questions about a screenshot you have already captured, pass its URL as imageUrl to skip recapture. If the screenshot requires interaction first (logging in, clicking a tab, dismissing a modal), use the instructions param to describe the steps.",
+        description: "Capture a full-height screenshot of the app preview and get a description of what's on screen. Captures the settled page state \u2014 it cannot catch animations, transitions, or transient state. Optionally provide specific questions about what you're looking for. Use a bulleted list to ask many questions at once. To ask additional questions about a screenshot you have already captured, pass its URL as imageUrl to skip recapture. If the screenshot requires interaction first (logging in, clicking a tab, dismissing a modal), use the instructions param to describe the steps.",
         inputSchema: {
           type: "object",
           properties: {
@@ -4203,26 +4371,16 @@ __export(searchGoogle_exports, {
   execute: () => execute
 });
 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" }
   );
 }
 var definition;
 var init_searchGoogle2 = __esm({
   "src/subagents/designExpert/tools/searchGoogle.ts"() {
     "use strict";
-    init_runCli();
+    init_runMindstudioCli();
     definition = {
       clearable: false,
       name: "searchGoogle",
@@ -4252,24 +4410,22 @@ 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" }
   );
 }
 var definition2;
 var init_scrapeWebUrl = __esm({
   "src/subagents/designExpert/tools/scrapeWebUrl.ts"() {
     "use strict";
-    init_runCli();
+    init_runMindstudioCli();
     definition2 = {
       clearable: false,
       name: "scrapeWebUrl",
@@ -4300,8 +4456,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",
@@ -4311,12 +4466,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}`;
@@ -4334,7 +4491,7 @@ var DESIGN_REFERENCE_PROMPT, definition3;
 var init_analyzeDesign = __esm({
   "src/subagents/designExpert/tools/analyzeDesign.ts"() {
     "use strict";
-    init_runCli();
+    init_runMindstudioCli();
     init_analyzeImage();
     DESIGN_REFERENCE_PROMPT = `
 You are analyzing a screenshot of a real website or app for a designer's personal technique/inspiration reference notes.
@@ -4526,19 +4683,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();
 }
@@ -4546,13 +4699,13 @@ var ENHANCE_MODEL, MODEL_OVERRIDE, SYSTEM_PROMPT;
 var init_enhancePrompt = __esm({
   "src/subagents/designExpert/tools/images/enhancePrompt.ts"() {
     "use strict";
-    init_runCli();
+    init_runMindstudioCli();
     init_assets();
     ENHANCE_MODEL = "claude-4-6-sonnet";
-    MODEL_OVERRIDE = JSON.stringify({
+    MODEL_OVERRIDE = {
       model: ENHANCE_MODEL,
       config: { reasoning: "false" }
-    });
+    };
     SYSTEM_PROMPT = readAsset(
       "subagents/designExpert/tools/images/enhance-image-prompt.md"
     );
@@ -4589,11 +4742,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) => ({
@@ -4606,11 +4762,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);
@@ -4627,17 +4784,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;
       })
@@ -4673,7 +4827,7 @@ var ANALYZE_PROMPT;
 var init_imageGenerator = __esm({
   "src/subagents/designExpert/tools/images/imageGenerator.ts"() {
     "use strict";
-    init_runCli();
+    init_runMindstudioCli();
     init_analyzeImage();
     init_enhancePrompt();
     ANALYZE_PROMPT = 'You are reviewing this image for a visual designer sourcing assets for a project. Describe: what the image depicts, the mood and color palette, how the lighting and composition work, any text present in the image, whether there are any issues (artifacts, distortions), and how it could be used in a layout for an app or website. Be concise and practical. Respond only with your analysis as Markdown (starting with the title "Asset Review") and absolutely no other text. Do not use emojis - use unicode if you need symbols.';
@@ -4833,12 +4987,12 @@ var init_tools3 = __esm({
 });
 
 // src/subagents/common/context.ts
-import fs15 from "fs";
+import fs16 from "fs";
 import path7 from "path";
 function walkMdFiles2(dir, skip) {
   const files = [];
   try {
-    for (const entry of fs15.readdirSync(dir, { withFileTypes: true })) {
+    for (const entry of fs16.readdirSync(dir, { withFileTypes: true })) {
       const full = path7.join(dir, entry.name);
       if (entry.isDirectory()) {
         if (!skip?.has(entry.name)) {
@@ -4854,7 +5008,7 @@ function walkMdFiles2(dir, skip) {
 }
 function parseFrontmatter2(filePath) {
   try {
-    const content = fs15.readFileSync(filePath, "utf-8");
+    const content = fs16.readFileSync(filePath, "utf-8");
     const match = content.match(/^---\n([\s\S]*?)\n---/);
     if (!match) {
       return {};
@@ -4900,7 +5054,7 @@ function loadRoadmapIndex() {
   const parts = [];
   try {
     const indexJson = JSON.parse(
-      fs15.readFileSync("src/roadmap/index.json", "utf-8")
+      fs16.readFileSync("src/roadmap/index.json", "utf-8")
     );
     if (indexJson.lanes?.length > 0) {
       const laneLines = indexJson.lanes.map(
@@ -5008,7 +5162,7 @@ var init_context = __esm({
 });
 
 // src/subagents/designExpert/data/sampleCache.ts
-import fs16 from "fs";
+import fs17 from "fs";
 function generateIndices(poolSize, sampleSize) {
   const n = Math.min(sampleSize, poolSize);
   const indices = Array.from({ length: poolSize }, (_, i) => i);
@@ -5020,14 +5174,14 @@ function generateIndices(poolSize, sampleSize) {
 }
 function load() {
   try {
-    return JSON.parse(fs16.readFileSync(SAMPLE_FILE, "utf-8"));
+    return JSON.parse(fs17.readFileSync(SAMPLE_FILE, "utf-8"));
   } catch {
     return null;
   }
 }
 function save(indices) {
   try {
-    fs16.writeFileSync(SAMPLE_FILE, JSON.stringify(indices));
+    fs17.writeFileSync(SAMPLE_FILE, JSON.stringify(indices));
   } catch {
   }
 }
@@ -5424,7 +5578,7 @@ var init_tools4 = __esm({
 });
 
 // src/subagents/productVision/executor.ts
-import fs17 from "fs";
+import fs18 from "fs";
 import path8 from "path";
 function resolve(filePath) {
   return path8.join(ROADMAP_DIR, filePath);
@@ -5434,13 +5588,13 @@ async function executeVisionTool(name, input, context) {
     case "writeFile": {
       const filePath = resolve(input.path);
       try {
-        fs17.mkdirSync(ROADMAP_DIR, { recursive: true });
+        fs18.mkdirSync(ROADMAP_DIR, { recursive: true });
         let oldContent = null;
         try {
-          oldContent = fs17.readFileSync(filePath, "utf-8");
+          oldContent = fs18.readFileSync(filePath, "utf-8");
         } catch {
         }
-        fs17.writeFileSync(filePath, input.content, "utf-8");
+        fs18.writeFileSync(filePath, input.content, "utf-8");
         const lineCount = input.content.split("\n").length;
         const label = oldContent !== null ? "Wrote" : "Created";
         return `${label} ${filePath} (${lineCount} lines)
@@ -5452,11 +5606,11 @@ ${unifiedDiff(filePath, oldContent ?? "", input.content)}`;
     case "deleteFile": {
       const filePath = resolve(input.path);
       try {
-        if (!fs17.existsSync(filePath)) {
+        if (!fs18.existsSync(filePath)) {
           return `Error: ${filePath} does not exist`;
         }
-        const oldContent = fs17.readFileSync(filePath, "utf-8");
-        fs17.unlinkSync(filePath);
+        const oldContent = fs18.readFileSync(filePath, "utf-8");
+        fs18.unlinkSync(filePath);
         return `Deleted ${filePath}
 ${unifiedDiff(filePath, oldContent, "")}`;
       } catch (err) {
@@ -5469,8 +5623,8 @@ ${unifiedDiff(filePath, oldContent, "")}`;
       }
       const filePath = resolve("pitch.html");
       try {
-        fs17.mkdirSync(ROADMAP_DIR, { recursive: true });
-        const existing = fs17.existsSync(filePath) ? fs17.readFileSync(filePath, "utf-8").trim() : "";
+        fs18.mkdirSync(ROADMAP_DIR, { recursive: true });
+        const existing = fs18.existsSync(filePath) ? fs18.readFileSync(filePath, "utf-8").trim() : "";
         const currentDeck = existing || PITCH_DECK_SHELL;
         const task = `
 <pitch_content>${input.task}</pitch_content>
@@ -5495,7 +5649,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;
-        fs17.writeFileSync(filePath, html, "utf-8");
+        fs18.writeFileSync(filePath, html, "utf-8");
         return `Pitch deck written successfully.`;
       } catch (err) {
         return `Error generating pitch deck: ${err.message}`;
@@ -5744,7 +5898,7 @@ var scrapeWebUrlTool;
 var init_scrapeWebUrl2 = __esm({
   "src/tools/common/scrapeWebUrl.ts"() {
     "use strict";
-    init_runCli();
+    init_runMindstudioCli();
     scrapeWebUrlTool = {
       clearable: false,
       definition: {
@@ -5772,15 +5926,13 @@ var init_scrapeWebUrl2 = __esm({
         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 }
         );
@@ -5890,10 +6042,11 @@ var init_tools6 = __esm({
 });
 
 // src/session.ts
-import fs18 from "fs";
+import fs19 from "fs";
+import path9 from "path";
 function loadSession(state) {
   try {
-    const raw = fs18.readFileSync(SESSION_FILE, "utf-8");
+    const raw = fs19.readFileSync(SESSION_FILE, "utf-8");
     const data = JSON.parse(raw);
     if (Array.isArray(data.messages) && data.messages.length > 0) {
       state.messages = sanitizeMessages(data.messages);
@@ -5942,7 +6095,7 @@ function sanitizeMessages(messages) {
 }
 function saveSession(state) {
   try {
-    fs18.writeFileSync(
+    fs19.writeFileSync(
       SESSION_FILE,
       JSON.stringify({ messages: state.messages }, null, 2),
       "utf-8"
@@ -5955,17 +6108,31 @@ function saveSession(state) {
 function clearSession(state) {
   state.messages = [];
   try {
-    fs18.unlinkSync(SESSION_FILE);
-  } catch {
+    if (fs19.existsSync(SESSION_FILE)) {
+      fs19.mkdirSync(ARCHIVE_DIR, { recursive: true });
+      const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+      const dest = path9.join(ARCHIVE_DIR, `cleared-${ts}.json`);
+      fs19.renameSync(SESSION_FILE, dest);
+      log7.info("Session archived on clear", { dest });
+    }
+  } catch (err) {
+    log7.warn("Session archive on clear failed, deleting instead", {
+      error: err.message
+    });
+    try {
+      fs19.unlinkSync(SESSION_FILE);
+    } catch {
+    }
   }
 }
-var log7, SESSION_FILE;
+var log7, SESSION_FILE, ARCHIVE_DIR;
 var init_session = __esm({
   "src/session.ts"() {
     "use strict";
     init_logger();
     log7 = createLogger("session");
     SESSION_FILE = ".remy-session.json";
+    ARCHIVE_DIR = ".logs/sessions";
   }
 });
 
@@ -6175,8 +6342,8 @@ var init_errors = __esm({
 });
 
 // src/brandExtraction/index.ts
-import fs19 from "fs";
-import path9 from "path";
+import fs20 from "fs";
+import path10 from "path";
 import { createHash } from "crypto";
 async function runExtraction(apiConfig) {
   const inputHash = computeInputHash();
@@ -6198,7 +6365,7 @@ async function runExtraction(apiConfig) {
 function computeInputHash() {
   const entries = [];
   for (const filePath of walkMdFiles3("src")) {
-    if (filePath === path9.join("src", "app.md")) {
+    if (filePath === path10.join("src", "app.md")) {
       entries.push({ path: filePath, content: readSafe(filePath) });
       continue;
     }
@@ -6220,7 +6387,7 @@ function sha256(input) {
 }
 function readSafe(filePath) {
   try {
-    return fs19.readFileSync(filePath, "utf-8");
+    return fs20.readFileSync(filePath, "utf-8");
   } catch {
     return "";
   }
@@ -6228,9 +6395,9 @@ 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 = path9.join(dir, entry.name);
+      const full = path10.join(dir, entry.name);
       if (entry.isDirectory()) {
         results.push(...walkMdFiles3(full));
       } else if (entry.name.endsWith(".md")) {
@@ -6243,7 +6410,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: "" };
@@ -6262,6 +6429,7 @@ async function extractBrand(apiConfig) {
     return { version: 1 };
   }
   let responseText = "";
+  const iterStart = Date.now();
   try {
     for await (const event of streamChat({
       ...apiConfig,
@@ -6272,6 +6440,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;
@@ -6406,14 +6588,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;
@@ -6430,6 +6612,7 @@ var init_brandExtraction = __esm({
     init_api();
     init_assets();
     init_logger();
+    init_usageLedger();
     log8 = createLogger("brandExtraction");
     EXTRACT_PROMPT = readAsset("brandExtraction", "extract.md");
     BRAND_FILE = ".remy-brand.json";
@@ -6561,9 +6744,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";
@@ -6695,16 +6880,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;
@@ -6758,6 +6957,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) });
@@ -7004,6 +7219,7 @@ var init_agent = __esm({
     init_tools6();
     init_session();
     init_logger();
+    init_usageLedger();
     init_parsePartialJson();
     init_statusWatcher();
     init_errors();
@@ -7033,12 +7249,12 @@ var init_agent = __esm({
 });
 
 // src/config.ts
-import fs20 from "fs";
-import path10 from "path";
+import fs21 from "fs";
+import path11 from "path";
 import os from "os";
 function loadConfigFile() {
   try {
-    const raw = fs20.readFileSync(CONFIG_PATH, "utf-8");
+    const raw = fs21.readFileSync(CONFIG_PATH, "utf-8");
     log11.debug("Loaded config file", { path: CONFIG_PATH });
     return JSON.parse(raw);
   } catch (err) {
@@ -7055,6 +7271,7 @@ function resolveConfig(flags2) {
   const env = file.environments?.[activeEnv];
   const apiKey = flags2?.apiKey || process.env.MINDSTUDIO_API_KEY || env?.apiKey || "";
   const baseUrl2 = flags2?.baseUrl || process.env.MINDSTUDIO_BASE_URL || env?.apiBaseUrl || DEFAULT_BASE_URL;
+  const appId = process.env.MINDSTUDIO_APP_ID || void 0;
   if (!apiKey) {
     log11.error("No API key found");
     throw new Error(
@@ -7065,9 +7282,10 @@ function resolveConfig(flags2) {
   log11.info("Config resolved", {
     baseUrl: baseUrl2,
     keySource,
-    environment: activeEnv
+    environment: activeEnv,
+    appId
   });
-  return { apiKey, baseUrl: baseUrl2 };
+  return { apiKey, baseUrl: baseUrl2, appId };
 }
 var log11, CONFIG_PATH, DEFAULT_BASE_URL;
 var init_config = __esm({
@@ -7075,7 +7293,7 @@ var init_config = __esm({
     "use strict";
     init_logger();
     log11 = createLogger("config");
-    CONFIG_PATH = path10.join(
+    CONFIG_PATH = path11.join(
       os.homedir(),
       ".mindstudio-local-tunnel",
       "config.json"
@@ -8321,8 +8539,8 @@ var init_headless = __esm({
 // src/index.tsx
 import { render } from "ink";
 import os2 from "os";
-import fs21 from "fs";
-import path11 from "path";
+import fs22 from "fs";
+import path12 from "path";
 
 // src/tui/App.tsx
 import { useState as useState2, useCallback, useRef } from "react";
@@ -8640,8 +8858,8 @@ for (let i = 0; i < args.length; i++) {
 var startupLog = createLogger("startup");
 function printDebugInfo(config) {
   const pkg = JSON.parse(
-    fs21.readFileSync(
-      path11.join(import.meta.dirname, "..", "package.json"),
+    fs22.readFileSync(
+      path12.join(import.meta.dirname, "..", "package.json"),
       "utf-8"
     )
   );