@charzhu/openjaw-agent 0.3.1 → 0.3.3

package/dist/main.js

@@ -19,22 +19,90 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// src/packageRoot.ts
+// src/desktop/launcher.ts
+var launcher_exports = {};
+__export(launcher_exports, {
+  launchDesktop: () => launchDesktop
+});
+import { spawn } from "node:child_process";
 import { existsSync } from "node:fs";
-import { dirname, join } from "node:path";
+import { createRequire } from "node:module";
+import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-function findPackageRoot() {
+async function launchDesktop(forwardedArgs) {
+  let electronBinary;
+  try {
+    const require2 = createRequire(import.meta.url);
+    electronBinary = require2("electron");
+  } catch (err) {
+    process.stderr.write(ELECTRON_MISSING_HINT);
+    process.exit(1);
+  }
   const here = dirname(fileURLToPath(import.meta.url));
+  const candidates = [
+    resolve(here, "electronMain.js"),
+    // source layout / direct dist/desktop run
+    resolve(here, "desktop", "electronMain.js")
+    // dist/main.js → dist/desktop/electronMain.js
+  ];
+  const electronEntry = candidates.find((p) => existsSync(p)) ?? candidates[0];
+  const child = spawn(electronBinary, [electronEntry, ...forwardedArgs], {
+    stdio: "inherit",
+    env: process.env,
+    windowsHide: false
+  });
+  await new Promise((resolve7) => {
+    child.on("exit", (code) => {
+      process.exit(code ?? 0);
+      resolve7();
+    });
+    child.on("error", (err) => {
+      process.stderr.write(`openjaw-agent app: failed to spawn electron: ${err.message}
+`);
+      process.exit(1);
+      resolve7();
+    });
+  });
+}
+var ELECTRON_MISSING_HINT;
+var init_launcher = __esm({
+  "src/desktop/launcher.ts"() {
+    "use strict";
+    ELECTRON_MISSING_HINT = [
+      "",
+      "The desktop UI requires the optional `electron` peer dependency, which",
+      "is not currently installed.",
+      "",
+      "To install it globally with openjaw-agent:",
+      "  npm install -g @charzhu/openjaw-agent --include=optional",
+      "",
+      "Or, if you are running from a local clone:",
+      "  cd path/to/openjaw-agent && npm install electron",
+      "",
+      "CLI usage (no desktop UI) is unaffected: just run `openjaw-agent` without",
+      "the `app` subcommand.",
+      ""
+    ].join("\n");
+    __name(launchDesktop, "launchDesktop");
+  }
+});
+
+// src/packageRoot.ts
+import { existsSync as existsSync2 } from "node:fs";
+import { dirname as dirname2, join } from "node:path";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+function findPackageRoot() {
+  const here = dirname2(fileURLToPath2(import.meta.url));
   let dir2 = here;
   for (let i = 0; i < 6; i++) {
-    if (existsSync(join(dir2, "package.json")) && existsSync(join(dir2, "prompts"))) {
+    if (existsSync2(join(dir2, "package.json")) && existsSync2(join(dir2, "prompts"))) {
       return dir2;
     }
-    const parent = dirname(dir2);
+    const parent = dirname2(dir2);
     if (parent === dir2) break;
     dir2 = parent;
   }
-  return dirname(here);
+  return dirname2(here);
 }
 function packageRoot() {
   if (cached === null) {
@@ -73,8 +141,8 @@ __export(config_exports, {
   saveAgentConfig: () => saveAgentConfig,
   updateBridgeConfig: () => updateBridgeConfig
 });
-import { readFileSync, writeFileSync, existsSync as existsSync2, mkdirSync } from "node:fs";
-import { join as join2, dirname as dirname2 } from "node:path";
+import { readFileSync, writeFileSync, existsSync as existsSync3, mkdirSync } from "node:fs";
+import { join as join2, dirname as dirname3 } from "node:path";
 import { homedir } from "node:os";
 import { parse as parseYaml, stringify as stringifyYaml } from "yaml";
 function getConfigDir() {
@@ -88,10 +156,10 @@ function loadAgentConfig() {
   const userConfigPath = getConfigPath();
   const bundledConfigPath = packageBundledConfigPath();
   let configPath = null;
-  if (existsSync2(userConfigPath)) {
+  if (existsSync3(userConfigPath)) {
     configPath = userConfigPath;
-  } else if (existsSync2(bundledConfigPath)) {
-    if (!existsSync2(configDir2)) {
+  } else if (existsSync3(bundledConfigPath)) {
+    if (!existsSync3(configDir2)) {
       mkdirSync(configDir2, { recursive: true });
     }
     const bundledContent = readFileSync(bundledConfigPath, "utf8");
@@ -101,7 +169,7 @@ function loadAgentConfig() {
     console.log(`  Edit it to change provider/model settings.
 `);
   } else {
-    if (!existsSync2(configDir2)) {
+    if (!existsSync3(configDir2)) {
       mkdirSync(configDir2, { recursive: true });
     }
     writeFileSync(userConfigPath, stringifyYaml(DEFAULT_CONFIG), "utf8");
@@ -131,7 +199,8 @@ function loadAgentConfig() {
       copilot_oauth_client_id: parsedLlm?.copilot_oauth_client_id ?? DEFAULT_CONFIG.llm.copilot_oauth_client_id,
       context_compression: parsedLlm?.context_compression,
       compression_threshold: parsedLlm?.compression_threshold,
-      compression_model: parsedLlm?.compression_model
+      compression_model: parsedLlm?.compression_model,
+      max_tool_rounds: parsedLlm?.max_tool_rounds
     },
     telegram: parsed?.telegram ?? void 0,
     feishu: parsed?.feishu ?? void 0,
@@ -171,7 +240,7 @@ function saveAgentConfig(config) {
 }
 function loadRawConfigYaml() {
   const path3 = getConfigPath();
-  if (!existsSync2(path3)) {
+  if (!existsSync3(path3)) {
     return { path: path3, yamlObj: void 0 };
   }
   const raw = readFileSync(path3, "utf8");
@@ -188,13 +257,13 @@ function updateBridgeConfig(name, values) {
       next2[name] = values;
     }
     const tmpPath = `${path3}.tmp`;
-    const dir2 = dirname2(path3);
-    if (!existsSync2(dir2)) {
+    const dir2 = dirname3(path3);
+    if (!existsSync3(dir2)) {
       mkdirSync(dir2, { recursive: true });
     }
     writeFileSync(tmpPath, stringifyYaml(next2), "utf8");
-    const { renameSync } = await import("node:fs");
-    renameSync(tmpPath, path3);
+    const { renameSync: renameSync2 } = await import("node:fs");
+    renameSync2(tmpPath, path3);
   }, "task");
   const next = configWriteChain.then(task, task);
   configWriteChain = next.then(
@@ -249,7 +318,7 @@ __export(image_resize_exports, {
   resizeImageForAgent: () => resizeImageForAgent
 });
 import { execSync } from "node:child_process";
-import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, unlinkSync, existsSync as existsSync3, mkdirSync as mkdirSync2 } from "node:fs";
+import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, unlinkSync, existsSync as existsSync4, mkdirSync as mkdirSync2 } from "node:fs";
 import { join as join3 } from "node:path";
 import { tmpdir } from "node:os";
 import { randomUUID } from "node:crypto";
@@ -300,7 +369,7 @@ Write-Output "$newW x $newH"
       `powershell -NoProfile -NonInteractive -EncodedCommand ${encoded}`,
       { timeout: 15e3, encoding: "utf-8" }
     ).trim();
-    if (!existsSync3(outputPath)) {
+    if (!existsSync4(outputPath)) {
       throw new Error(`Resize produced no output (PowerShell said: ${result})`);
     }
     const resizedBuffer = readFileSync2(outputPath);
@@ -310,17 +379,17 @@ Write-Output "$newW x $newH"
     return { base64: resizedBase64, mimeType: actualMimeType };
   } finally {
     try {
-      if (existsSync3(inputPath)) unlinkSync(inputPath);
+      if (existsSync4(inputPath)) unlinkSync(inputPath);
     } catch {
     }
     try {
-      if (existsSync3(outputPath)) unlinkSync(outputPath);
+      if (existsSync4(outputPath)) unlinkSync(outputPath);
     } catch {
     }
   }
 }
 async function resizeImageFileForAgent(filePath) {
-  if (!existsSync3(filePath)) {
+  if (!existsSync4(filePath)) {
     throw new Error(`Image file not found: ${filePath}`);
   }
   const buffer = readFileSync2(filePath);
@@ -868,7 +937,7 @@ Start-Sleep -Milliseconds 50
   }
 }
 async function wait(duration) {
-  await new Promise((resolve6) => setTimeout(resolve6, duration * 1e3));
+  await new Promise((resolve7) => setTimeout(resolve7, duration * 1e3));
   return { output: `Waited ${duration} seconds` };
 }
 function getDisplayDimensions() {
@@ -1976,12 +2045,12 @@ var init_copilot_token = __esm({
 });
 
 // src/provider-auth.ts
-import { existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync4 } from "node:fs";
+import { existsSync as existsSync5, mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync4 } from "node:fs";
 import { join as join5 } from "node:path";
 import { homedir as homedir2 } from "node:os";
 function getAuthDir() {
   const dir2 = join5(homedir2(), ".openjaw-agent");
-  if (!existsSync4(dir2)) mkdirSync3(dir2, { recursive: true });
+  if (!existsSync5(dir2)) mkdirSync3(dir2, { recursive: true });
   return dir2;
 }
 function getProviderAuthPath() {
@@ -1992,7 +2061,7 @@ function emptyFile() {
 }
 function loadProviderCredentials() {
   const path3 = getProviderAuthPath();
-  if (!existsSync4(path3)) return emptyFile();
+  if (!existsSync5(path3)) return emptyFile();
   const parsed = JSON.parse(readFileSync3(path3, "utf8"));
   return {
     version: 1,
@@ -2205,8 +2274,8 @@ function safeJsonParse(value) {
   }
 }
 async function loadWebSocket() {
-  const { createRequire } = await import("node:module");
-  return createRequire(import.meta.url)("ws");
+  const { createRequire: createRequire3 } = await import("node:module");
+  return createRequire3(import.meta.url)("ws");
 }
 function responsesWebSocketUrl(baseUrl) {
   const url = new URL(`${baseUrl.replace(/\/+$/, "")}/responses`);
@@ -2563,7 +2632,7 @@ var init_copilot = __esm({
           handshakeTimeout: RESPONSES_WEBSOCKET_CONNECT_TIMEOUT_MS
         });
         const request = JSON.stringify(this.buildResponsesWebSocketRequest(requestBody));
-        return new Promise((resolve6, reject) => {
+        return new Promise((resolve7, reject) => {
           const accumulator = { sawTextDelta: false, text: null, toolCalls: [] };
           let settled = false;
           const timeout = setTimeout(() => {
@@ -2577,7 +2646,7 @@ var init_copilot = __esm({
             settled = true;
             clearTimeout(timeout);
             ws.close();
-            resolve6(value);
+            resolve7(value);
           }, "finish");
           const fail = /* @__PURE__ */ __name((error) => {
             if (settled) return;
@@ -2641,7 +2710,8 @@ var init_copilot = __esm({
             messages.push({
               role: "assistant",
               content: msg.content,
-              ...toolCalls?.length ? { tool_calls: toolCalls } : {}
+              ...toolCalls?.length ? { tool_calls: toolCalls } : {},
+              ...msg.reasoningOpaque ? { reasoning_opaque: msg.reasoningOpaque } : {}
             });
           } else {
             for (const result of msg.results) {
@@ -2671,11 +2741,12 @@ var init_copilot = __esm({
           messages: this.buildChatMessages(options),
           tools: options.tools.length > 0 ? options.tools.map(toChatTool) : void 0,
           tool_choice: options.tools.length > 0 ? "auto" : void 0,
-          temperature: this.config.temperature
+          temperature: this.config.temperature,
+          stream: true
         };
         const res = await fetch(`${await this.baseUrl(options.signal)}/chat/completions`, {
           method: "POST",
-          headers: await this.headers(options),
+          headers: { ...await this.headers(options), Accept: "text/event-stream" },
           body: JSON.stringify(requestBody),
           signal: options.signal
         });
@@ -2683,19 +2754,85 @@ var init_copilot = __esm({
           const detail = await res.text();
           throw new Error(`GitHub Copilot chat error: ${res.status} ${detail}`);
         }
-        const data = await res.json();
-        const choice = data.choices?.[0];
-        if (!choice?.message) throw new Error("No response from GitHub Copilot");
-        const toolCalls = (choice.message.tool_calls ?? []).map((tc) => ({
-          id: tc.id,
-          name: tc.function.name,
-          input: safeJsonParse(tc.function.arguments)
-        }));
+        if (!res.body) throw new Error("GitHub Copilot chat: no response body for stream");
+        let text = null;
+        let finishReason;
+        let reasoningOpaque;
+        let promptTokens;
+        let completionTokens;
+        const toolSlots = [];
+        const lastSlotByIndex = /* @__PURE__ */ new Map();
+        const reader = res.body.getReader();
+        const decoder = new TextDecoder();
+        let buf = "";
+        for (; ; ) {
+          const { done, value } = await reader.read();
+          if (done) break;
+          buf += decoder.decode(value, { stream: true });
+          let nl;
+          while ((nl = buf.indexOf("\n")) !== -1) {
+            const rawLine = buf.slice(0, nl).trim();
+            buf = buf.slice(nl + 1);
+            if (!rawLine.startsWith("data:")) continue;
+            const payload = rawLine.slice(5).trim();
+            if (payload === "[DONE]") continue;
+            let evt;
+            try {
+              evt = JSON.parse(payload);
+            } catch {
+              continue;
+            }
+            const choice = evt.choices?.[0];
+            if (choice) {
+              const delta = choice.delta;
+              if (delta) {
+                if (typeof delta.content === "string") text = (text ?? "") + delta.content;
+                if (typeof delta.reasoning_opaque === "string") {
+                  reasoningOpaque = (reasoningOpaque ?? "") + delta.reasoning_opaque;
+                }
+                const deltaToolCalls = delta.tool_calls;
+                for (const tc of deltaToolCalls ?? []) {
+                  const idx = typeof tc.index === "number" ? tc.index : 0;
+                  const fn = tc.function;
+                  const startsNewCall = typeof tc.id === "string" || typeof fn?.name === "string";
+                  let slot;
+                  if (startsNewCall) {
+                    slot = { args: "" };
+                    if (typeof tc.id === "string") slot.id = tc.id;
+                    if (fn?.name) slot.name = fn.name;
+                    toolSlots.push(slot);
+                    lastSlotByIndex.set(idx, slot);
+                  } else {
+                    slot = lastSlotByIndex.get(idx) ?? { args: "" };
+                    if (!lastSlotByIndex.has(idx)) {
+                      toolSlots.push(slot);
+                      lastSlotByIndex.set(idx, slot);
+                    }
+                  }
+                  if (typeof fn?.arguments === "string") slot.args += fn.arguments;
+                }
+              }
+              if (typeof choice.finish_reason === "string") finishReason = choice.finish_reason;
+              if (typeof choice.reasoning_opaque === "string") {
+                reasoningOpaque = choice.reasoning_opaque;
+              }
+              const msg = choice.message;
+              if (typeof msg?.reasoning_opaque === "string") reasoningOpaque = msg.reasoning_opaque;
+            }
+            const usage2 = evt.usage;
+            if (usage2) {
+              promptTokens = usage2.prompt_tokens;
+              completionTokens = usage2.completion_tokens;
+            }
+          }
+        }
+        const toolCalls = toolSlots.filter((slot) => slot.id && slot.name).map((slot) => ({ id: slot.id, name: slot.name, input: safeJsonParse(slot.args) }));
         return {
-          text: choice.message.content,
+          text,
           toolCalls,
-          stopReason: toolCalls.length > 0 ? "tool_use" : choice.finish_reason === "length" ? "max_tokens" : "end",
-          usage: this.usage(data.usage?.prompt_tokens, data.usage?.completion_tokens)
+          stopReason: toolCalls.length > 0 ? "tool_use" : finishReason === "length" ? "max_tokens" : "end",
+          usage: this.usage(promptTokens, completionTokens),
+          reasoningOpaque
         };
       }
       buildResponsesInput(options) {
@@ -2945,13 +3082,13 @@ var init_providers = __esm({
 });
 
 // src/session.ts
-import { readFileSync as readFileSync4, writeFileSync as writeFileSync5, existsSync as existsSync5, mkdirSync as mkdirSync4, readdirSync } from "node:fs";
+import { readFileSync as readFileSync4, writeFileSync as writeFileSync5, existsSync as existsSync6, mkdirSync as mkdirSync4, readdirSync, renameSync, unlinkSync as unlinkSync3 } from "node:fs";
 import { join as join6 } from "node:path";
 import { homedir as homedir3 } from "node:os";
 import { randomUUID as randomUUID2 } from "node:crypto";
 function getSessionsDir() {
   const dir2 = join6(homedir3(), ".openjaw-agent", "sessions");
-  if (!existsSync5(dir2)) mkdirSync4(dir2, { recursive: true });
+  if (!existsSync6(dir2)) mkdirSync4(dir2, { recursive: true });
   return dir2;
 }
 function sessionPath(id) {
@@ -2972,11 +3109,23 @@ function createSession(provider, model) {
 function saveSession(session) {
   session.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
   session.turnCount = session.messages.filter((m) => m.role === "user").length;
-  writeFileSync5(sessionPath(session.id), JSON.stringify(session, null, 2), "utf8");
+  const finalPath = sessionPath(session.id);
+  const tmpPath = `${finalPath}.tmp`;
+  const payload = JSON.stringify(session, null, 2);
+  try {
+    writeFileSync5(tmpPath, payload, "utf8");
+    renameSync(tmpPath, finalPath);
+  } catch (err) {
+    try {
+      unlinkSync3(tmpPath);
+    } catch {
+    }
+    throw err;
+  }
 }
 function loadSession(id) {
   const path3 = sessionPath(id);
-  if (!existsSync5(path3)) return null;
+  if (!existsSync6(path3)) return null;
   try {
     return JSON.parse(readFileSync4(path3, "utf8"));
   } catch {
@@ -3361,7 +3510,7 @@ var init_cache_monitor = __esm({
 });
 
 // src/telemetry.ts
-import { appendFileSync, existsSync as existsSync6, mkdirSync as mkdirSync5, readFileSync as readFileSync5 } from "node:fs";
+import { appendFileSync, existsSync as existsSync7, mkdirSync as mkdirSync5, readFileSync as readFileSync5 } from "node:fs";
 import { join as join7 } from "node:path";
 import { homedir as homedir4 } from "node:os";
 function now() {
@@ -3384,7 +3533,7 @@ var init_telemetry = __esm({
       constructor(sessionId) {
         this.sessionId = sessionId;
         try {
-          if (!existsSync6(TELEMETRY_DIR)) {
+          if (!existsSync7(TELEMETRY_DIR)) {
             mkdirSync5(TELEMETRY_DIR, { recursive: true });
           }
         } catch {
@@ -3415,7 +3564,7 @@ var init_telemetry = __esm({
       getRecentEvents(limit = 20) {
         try {
           const todayFile = join7(TELEMETRY_DIR, `${today()}.jsonl`);
-          if (!existsSync6(todayFile)) return [];
+          if (!existsSync7(todayFile)) return [];
           const lines = readFileSync5(todayFile, "utf-8").trim().split("\n");
           return lines.slice(-limit).map((l) => JSON.parse(l));
         } catch {
@@ -3963,13 +4112,13 @@ function selectToolsForRequest(params) {
     addByName(name);
   }
   const relevantCategories = categoriesForMessage(userMessage);
-  for (const tool of allTools) {
-    if (selected.size >= maxTools) break;
+  const relevantTools = allTools.map((tool, index) => ({ index, score: toolRelevanceScore(tool.name, userMessage), tool })).filter(({ tool }) => {
     const cat = categoryForTool(tool.name);
-    if (cat === "mcp") continue;
-    if (relevantCategories.has(cat)) {
-      selected.set(tool.name, tool);
-    }
+    return cat !== "mcp" && relevantCategories.has(cat) && !selected.has(tool.name);
+  }).sort((a, b) => b.score - a.score || a.index - b.index);
+  for (const { tool } of relevantTools) {
+    if (selected.size >= maxTools) break;
+    selected.set(tool.name, tool);
   }
   if (selected.size < maxTools && relevantCategories.size === 0) {
     for (const tool of allTools) {
@@ -4000,6 +4149,20 @@ function categoriesForMessage(message) {
   }
   return categories;
 }
+function preloadRelevantCategoriesForRequest(loader, message) {
+  if (typeof loader.loadCategory !== "function") return [];
+  const loaded = [];
+  for (const category of categoriesForMessage(message)) {
+    if (category === "mcp" || category === "meta" || category === "skill") continue;
+    const added = loader.loadCategory(category);
+    if (added > 0) loaded.push(category);
+  }
+  return loaded;
+}
+function toolOutputLooksFailed(output) {
+  if (!output) return false;
+  return /^\s*\{?"?(error|success)"?\s*:\s*("|false)/i.test(output) || /\b(error|not found|enoent|failed)\b/i.test(output.slice(0, 300));
+}
 function normalizeCategory(value) {
   const normalized = value.toLowerCase();
   if (["browser", "email", "teams", "office", "wechat", "memory", "files", "system"].includes(normalized)) {
@@ -4020,6 +4183,20 @@ function categoryForTool(toolName) {
   if (toolName.startsWith("system_") || toolName.startsWith("clipboard_") || ["code_execute", "web_fetch", "web_search", "web_extract", "notify", "sleep", "ask_user", "config"].includes(toolName)) return "system";
   return "mcp";
 }
+function toolRelevanceScore(toolName, message) {
+  const lower = message.toLowerCase();
+  const name = toolName.toLowerCase();
+  if (/https?:\/\//i.test(message) && ["web_extract", "web_fetch", "web_search"].includes(name)) return 150;
+  if (/(?:^|[\s"'`])(?:~|\.\.?|[A-Za-z]:)?[\\/][^\s"'`]+|\b[\w.-]+\.(html?|md|txt|json|ya?ml|ts|tsx|js|jsx|py|csv|xlsx?|pptx?|pdf)\b/i.test(message) && ["file_read", "file_info", "file_list"].includes(name)) return 145;
+  if (/\b(repo|repository|source code|github|codebase)\b/.test(lower) && ["system_run", "code_execute", "grep", "glob", "web_extract", "web_fetch", "file_read"].includes(name)) return 140;
+  if (/https?:\/\//i.test(message) && ["browser_navigate", "browser_extract", "browser_snapshot"].includes(name)) return 135;
+  if (/\b(powerpoint|pptx?|presentation|slides?|deck)\b/.test(lower) && ["powerpoint_focus", "powerpoint_new_presentation", "powerpoint_new_slide", "powerpoint_read_content", "powerpoint_send_keys", "powerpoint_screenshot"].includes(name)) return 130;
+  if (/\b(powerpoint|pptx?|presentation|slides?|deck)\b/.test(lower) && name.startsWith("powerpoint_")) return 85;
+  if (/\b(excel|spreadsheet|xlsx?|csv|data analysis)\b/.test(lower) && ["excel_focus", "excel_new_workbook", "excel_read_content", "excel_enter_value", "excel_enter_formula"].includes(name)) return 95;
+  if (/\b(word|docx?|document|report)\b/.test(lower) && ["word_focus", "word_new_document", "word_read_content", "word_insert_text", "word_save"].includes(name)) return 95;
+  if (name === "openjaw_load_tools" || name === "invoke_skill") return 90;
+  return 0;
+}
 var DEFAULT_OPENAI_MAX_TOOLS, MCP_AUTO_GROW_HARD_CAP, BUILTIN_HEADROOM, FOUNDATION_TOOL_NAMES, PROFILE_CATEGORIES, CATEGORY_KEYWORDS;
 var init_tool_exposure = __esm({
   "src/tool-exposure.ts"() {
@@ -4043,10 +4220,10 @@ var init_tool_exposure = __esm({
     CATEGORY_KEYWORDS = [
       { category: "email", patterns: [/\b(email|mail|outlook|inbox|calendar|schedule|meeting|invite|today|tomorrow)\b/i] },
       { category: "teams", patterns: [/\b(teams|chat|channel|message|dm|meeting|standup|today|mention)\b/i] },
-      { category: "browser", patterns: [/\b(browser|page|website|web|navigate|click|screenshot|snapshot|console|image|search online)\b/i] },
-      { category: "files", patterns: [/\b(file|folder|directory|read|write|edit|grep|glob|find in repo|codebase)\b/i] },
+      { category: "browser", patterns: [/\b(browser|page|website|web|navigate|click|screenshot|snapshot|console|image|search online)\b/i, /https?:\/\//i] },
+      { category: "files", patterns: [/\b(file|folder|directory|read|write|edit|grep|glob|find in repo|codebase|source code|repo|repository|downloads?)\b/i, /(?:^|[\s"'`])(?:~|\.\.?|[A-Za-z]:)?[\\/][^\s"'`]+/i, /\b[\w.-]+\.(html?|md|txt|json|ya?ml|ts|tsx|js|jsx|py|csv|xlsx?|pptx?|pdf)\b/i] },
       { category: "system", patterns: [/\b(shell|command|terminal|run|execute|clipboard|notify|sleep|web search|fetch url|extract url|read url|article|docs?|paper|source page|news|latest|headlines|current events|breaking news)\b/i] },
-      { category: "office", patterns: [/\b(word|excel|powerpoint|spreadsheet|document|presentation|slide)\b/i] },
+      { category: "office", patterns: [/\b(word|excel|powerpoint|pptx?|spreadsheet|document|presentation|slide|deck)\b/i] },
       { category: "wechat", patterns: [/\b(wechat|weixin)\b/i] },
       { category: "memory", patterns: [/\b(memory|remember|recall|todo|preference)\b/i] }
     ];
@@ -4058,8 +4235,245 @@ var init_tool_exposure = __esm({
     __name(rememberLoadedToolExposure, "rememberLoadedToolExposure");
     __name(selectToolsForRequest, "selectToolsForRequest");
     __name(categoriesForMessage, "categoriesForMessage");
+    __name(preloadRelevantCategoriesForRequest, "preloadRelevantCategoriesForRequest");
+    __name(toolOutputLooksFailed, "toolOutputLooksFailed");
     __name(normalizeCategory, "normalizeCategory");
     __name(categoryForTool, "categoryForTool");
+    __name(toolRelevanceScore, "toolRelevanceScore");
+  }
+});
+
+// src/turn-control.ts
+var DEFAULT_MAX_TOOL_ROUNDS, IterationBudget;
+var init_turn_control = __esm({
+  "src/turn-control.ts"() {
+    "use strict";
+    DEFAULT_MAX_TOOL_ROUNDS = 100;
+    IterationBudget = class {
+      static {
+        __name(this, "IterationBudget");
+      }
+      used = 0;
+      graceUsed = false;
+      max;
+      constructor(max = DEFAULT_MAX_TOOL_ROUNDS) {
+        this.max = Math.max(1, Math.floor(max));
+      }
+      get remaining() {
+        return Math.max(0, this.max - this.used);
+      }
+      get consumed() {
+        return this.used;
+      }
+      /** True while there is budget (or the one-time grace round) left to run. */
+      canContinue() {
+        return this.remaining > 0 || !this.graceUsed;
+      }
+      /** True only when the budget is spent and we are on the grace round. */
+      isGraceRound() {
+        return this.remaining === 0 && !this.graceUsed;
+      }
+      /** Consume one round. Returns false if nothing (not even grace) is left. */
+      consume() {
+        if (this.remaining > 0) {
+          this.used += 1;
+          return true;
+        }
+        if (!this.graceUsed) {
+          this.graceUsed = true;
+          return true;
+        }
+        return false;
+      }
+      /** Give a round back (e.g. a round that made no model-visible progress). */
+      refund() {
+        if (this.used > 0) this.used -= 1;
+      }
+    };
+  }
+});
+
+// src/tool-guardrails.ts
+function isNoProgressTracked(toolName) {
+  if (MUTATING_TOOLS.has(toolName)) return false;
+  if (toolName.startsWith("powerpoint_") || toolName.startsWith("word_") || toolName.startsWith("excel_")) {
+    return false;
+  }
+  return true;
+}
+function signatureOf(toolName, args) {
+  return `${toolName}\0${canonicalJson(args ?? {})}`;
+}
+function canonicalJson(value) {
+  if (value === null || typeof value !== "object") return JSON.stringify(value) ?? "null";
+  if (Array.isArray(value)) return `[${value.map(canonicalJson).join(",")}]`;
+  const obj = value;
+  const keys = Object.keys(obj).sort();
+  return `{${keys.map((k) => `${JSON.stringify(k)}:${canonicalJson(obj[k])}`).join(",")}}`;
+}
+function hashOutput(output) {
+  let h = 2166136261;
+  const s = output ?? "";
+  for (let i = 0; i < s.length; i++) {
+    h ^= s.charCodeAt(i);
+    h = Math.imul(h, 16777619);
+  }
+  return (h >>> 0).toString(16);
+}
+function appendGuardrailGuidance(result, decision) {
+  if (decision.action !== "warn" && decision.action !== "halt" || !decision.message) return result;
+  const label = decision.action === "halt" ? "Tool loop hard stop" : "Tool loop warning";
+  return `${result || ""}
+
+[${label}: ${decision.code}; count=${decision.count}; ${decision.message}]`;
+}
+function blockedToolResult(decision) {
+  return JSON.stringify({ error: decision.message, guardrail: { code: decision.code, action: decision.action } });
+}
+var DEFAULT_GUARDRAIL_THRESHOLDS, MUTATING_TOOLS, ToolLoopGuardrails;
+var init_tool_guardrails = __esm({
+  "src/tool-guardrails.ts"() {
+    "use strict";
+    DEFAULT_GUARDRAIL_THRESHOLDS = {
+      hardStopEnabled: true,
+      exactFailureWarnAfter: 2,
+      exactFailureBlockAfter: 5,
+      sameToolFailureWarnAfter: 3,
+      sameToolFailureHaltAfter: 8,
+      noProgressWarnAfter: 2,
+      noProgressBlockAfter: 5
+    };
+    MUTATING_TOOLS = /* @__PURE__ */ new Set([
+      "file_write",
+      "file_edit",
+      "file_delete",
+      "notify",
+      "ask_user",
+      "memory_append",
+      "memory_save"
+    ]);
+    __name(isNoProgressTracked, "isNoProgressTracked");
+    __name(signatureOf, "signatureOf");
+    __name(canonicalJson, "canonicalJson");
+    __name(hashOutput, "hashOutput");
+    ToolLoopGuardrails = class {
+      static {
+        __name(this, "ToolLoopGuardrails");
+      }
+      t;
+      exactFailure = /* @__PURE__ */ new Map();
+      sameToolFailure = /* @__PURE__ */ new Map();
+      noProgress = /* @__PURE__ */ new Map();
+      haltDecision = null;
+      constructor(thresholds = {}) {
+        this.t = { ...DEFAULT_GUARDRAIL_THRESHOLDS, ...thresholds };
+      }
+      /** Set once a block/halt has fired; the loop reads this to stop the turn. */
+      get halted() {
+        return this.haltDecision;
+      }
+      /**
+       * Consult before (re-)executing a tool call. Returns `block` if this exact
+       * call has already failed/no-progressed past the hard-stop threshold, so the
+       * loop can skip execution and tell the model to change strategy.
+       */
+      before(toolName, args) {
+        if (!this.t.hardStopEnabled) return { action: "allow", toolName };
+        const sig = signatureOf(toolName, args);
+        const exact = this.exactFailure.get(sig) ?? 0;
+        if (exact >= this.t.exactFailureBlockAfter) {
+          return this.recordHalt({
+            action: "block",
+            code: "repeated_exact_failure_block",
+            message: `Blocked ${toolName}: the same tool call failed ${exact} times with identical arguments. Stop retrying it unchanged; change strategy or explain the blocker.`,
+            toolName,
+            count: exact
+          });
+        }
+        if (isNoProgressTracked(toolName)) {
+          const rec = this.noProgress.get(sig);
+          if (rec && rec.count >= this.t.noProgressBlockAfter) {
+            return this.recordHalt({
+              action: "block",
+              code: "idempotent_no_progress_block",
+              message: `Blocked ${toolName}: this call returned the same result ${rec.count} times. Stop repeating it unchanged; use the result already provided or try a different approach.`,
+              toolName,
+              count: rec.count
+            });
+          }
+        }
+        return { action: "allow", toolName };
+      }
+      /**
+       * Record the outcome after a tool call. Returns a `warn` to append to the
+       * tool result, or a `halt` to stop the turn. `failed` is derived by the
+       * caller from the output shape (reuse tool-exposure's toolOutputLooksFailed).
+       */
+      after(toolName, args, output, failed) {
+        const sig = signatureOf(toolName, args);
+        if (failed) {
+          const exact = (this.exactFailure.get(sig) ?? 0) + 1;
+          this.exactFailure.set(sig, exact);
+          this.noProgress.delete(sig);
+          const same = (this.sameToolFailure.get(toolName) ?? 0) + 1;
+          this.sameToolFailure.set(toolName, same);
+          if (this.t.hardStopEnabled && same >= this.t.sameToolFailureHaltAfter) {
+            return this.recordHalt({
+              action: "halt",
+              code: "same_tool_failure_halt",
+              message: `Stopped ${toolName}: it failed ${same} times this turn. Stop retrying the same failing tool path and choose a different approach.`,
+              toolName,
+              count: same
+            });
+          }
+          if (exact >= this.t.exactFailureWarnAfter) {
+            return {
+              action: "warn",
+              code: "repeated_exact_failure_warning",
+              message: `${toolName} has failed ${exact} times with identical arguments. This looks like a loop; inspect the error and change strategy instead of retrying it unchanged.`,
+              toolName,
+              count: exact
+            };
+          }
+          if (same >= this.t.sameToolFailureWarnAfter) {
+            return {
+              action: "warn",
+              code: "same_tool_failure_warning",
+              message: `${toolName} has failed ${same} times this turn. This looks like a loop. Do not switch to text-only replies; keep using tools, but inspect the latest error and verify your assumptions before retrying.`,
+              toolName,
+              count: same
+            };
+          }
+          return { action: "allow", toolName, count: exact };
+        }
+        this.exactFailure.delete(sig);
+        this.sameToolFailure.delete(toolName);
+        if (!isNoProgressTracked(toolName)) {
+          this.noProgress.delete(sig);
+          return { action: "allow", toolName };
+        }
+        const hash3 = hashOutput(output);
+        const prev = this.noProgress.get(sig);
+        const count = prev && prev.hash === hash3 ? prev.count + 1 : 1;
+        this.noProgress.set(sig, { hash: hash3, count });
+        if (count >= this.t.noProgressWarnAfter) {
+          return {
+            action: "warn",
+            code: "idempotent_no_progress_warning",
+            message: `${toolName} returned the same result ${count} times. Use the result already provided or change the approach instead of repeating it unchanged.`,
+            toolName,
+            count
+          };
+        }
+        return { action: "allow", toolName, count };
+      }
+      recordHalt(decision) {
+        this.haltDecision = decision;
+        return decision;
+      }
+    };
+    __name(appendGuardrailGuidance, "appendGuardrailGuidance");
+    __name(blockedToolResult, "blockedToolResult");
   }
 });
 
@@ -4075,8 +4489,8 @@ function isOAuthAbortError(err) {
 function oauthDomain(enterpriseUrl) {
   return enterpriseUrl ? normalizeCopilotEnterpriseDomain(enterpriseUrl) : "github.com";
 }
-async function startCopilotDeviceFlow(clientId, enterpriseUrl) {
-  if (!clientId.trim()) {
+async function startCopilotDeviceFlow(clientId2, enterpriseUrl) {
+  if (!clientId2.trim()) {
     throw new Error("GitHub OAuth client ID is required for Copilot login.");
   }
   const normalizedEnterpriseUrl = enterpriseUrl ? normalizeCopilotEnterpriseDomain(enterpriseUrl) : void 0;
@@ -4089,7 +4503,7 @@ async function startCopilotDeviceFlow(clientId, enterpriseUrl) {
       "User-Agent": "openjaw-agent/0.1.0"
     },
     body: JSON.stringify({
-      client_id: clientId,
+      client_id: clientId2,
       scope: "read:user"
     })
   });
@@ -4105,7 +4519,7 @@ async function startCopilotDeviceFlow(clientId, enterpriseUrl) {
     verificationUri: body.verification_uri,
     userCode: body.user_code,
     deviceCode: body.device_code,
-    clientId,
+    clientId: clientId2,
     intervalSeconds: body.interval ?? 5,
     enterpriseUrl: normalizedEnterpriseUrl
   };
@@ -4409,8 +4823,8 @@ For local proxy mode without API keys, use /connect maestro.`
         }
       };
     }
-    const clientId = resolveCopilotClientId();
-    if (!clientId) {
+    const clientId2 = resolveCopilotClientId();
+    if (!clientId2) {
       emit({
         type: "error",
         content: [
@@ -4426,7 +4840,7 @@ For local proxy mode without API keys, use /connect maestro.`
     }
     const label = enterpriseUrl ? `GitHub Enterprise (${enterpriseUrl})` : "GitHub.com";
     try {
-      const flow = await startCopilotDeviceFlow(clientId, enterpriseUrl);
+      const flow = await startCopilotDeviceFlow(clientId2, enterpriseUrl);
       emit({
         type: "system",
         content: [
@@ -4612,6 +5026,8 @@ var init_agent_loop = __esm({
     init_telemetry();
     init_context_compressor();
     init_tool_exposure();
+    init_turn_control();
+    init_tool_guardrails();
     init_provider_auth();
     init_connect();
     AgentLoop = class {
@@ -4949,6 +5365,66 @@ var init_agent_loop = __esm({
         this.conversationHistory = next.messages;
         return { session_id: next.id, title: next.summary };
       }
+      /**
+       * Create a brand-new empty session and switch this AgentLoop over to it.
+       * Unlike branchSession, the new session starts with an empty history —
+       * this is the "+" button / `/clear`-equivalent for users who want a
+       * fresh conversation without affecting their current one.
+       *
+       * Persists the current session first (so any unsaved counters / summary
+       * land on disk) before swapping. Returns null if a turn is currently
+       * in flight (matching swapToSession's defense-in-depth posture); the
+       * caller is responsible for interrupting first.
+       */
+      createAndSwitchTo() {
+        if (this.isRunning) return null;
+        saveSession(this.session);
+        const next = createSession(this.config.llm.provider, this.config.llm.model);
+        saveSession(next);
+        this.session = next;
+        this.conversationHistory = next.messages;
+        this._toolExposureState = createToolExposureState();
+        this._compactedOnResume = false;
+        this._toolRoundsInRun = 0;
+        return next;
+      }
+      /**
+       * Resume an existing on-disk session as the active session for this loop.
+       * Persists the current session first, then loads the target's messages
+       * into `conversationHistory` and rebinds `this.session` so subsequent
+       * `prompt.submit` turns run against the resumed conversation.
+       *
+       * Returns the loaded `SessionData` on success, or `null` if:
+       *   - a turn is currently in flight (callers must abort or wait first);
+       *   - the target session id doesn't exist on disk.
+       *
+       * Provider/model are NOT switched. The session's recorded provider/model
+       * fields are updated to whatever the loop is currently configured for —
+       * matching the constructor's resume behaviour, which loads the messages
+       * but keeps the AgentLoop's `config.llm.provider/model` as-is. A user
+       * who wants the resumed session's original model must call `switchModel`
+       * separately (or run via the `/model` slash command).
+       *
+       * Required by both A3 defer-on-switch and any future A2 concurrent-
+       * streaming refactor (the desktop UI's `session.resume` RPC depends on
+       * this method actually rebinding history — see the plan, section
+       * "Multi-session story").
+       */
+      swapToSession(targetId) {
+        if (this.isRunning) return null;
+        const target = loadSession(targetId);
+        if (!target) return null;
+        saveSession(this.session);
+        target.provider = this.config.llm.provider;
+        target.model = this.config.llm.model;
+        this.session = target;
+        this.conversationHistory = target.messages;
+        this._toolExposureState = createToolExposureState();
+        this._compactedOnResume = false;
+        this._toolRoundsInRun = 0;
+        saveSession(this.session);
+        return target;
+      }
       /** Read-only access to the underlying session metadata. */
       getSessionMeta() {
         return {
@@ -5132,15 +5608,25 @@ ${summary}
           const MAX_SAME_ACTIONS = 3;
           let previousCacheReadTokens = 0;
           let maxTokensContinuations = 0;
+          const budget = new IterationBudget(this.config.llm.max_tool_rounds ?? DEFAULT_MAX_TOOL_ROUNDS);
+          const guardrails = new ToolLoopGuardrails();
           for (let step = 0; ; step++) {
             if (signal.aborted) {
               yield { type: "answer", content: "[Interrupted by user]" };
               return;
             }
+            const forceFinalSummary = budget.isGraceRound();
+            if (!budget.consume()) {
+              const reason = "max_iterations";
+              yield { type: "answer", content: `[Reached the maximum of ${budget.max} tool rounds. Stopping.]`, exitReason: reason };
+              return;
+            }
             let responseText = null;
             const responseToolCalls = [];
             let responseStopReason = "end";
+            let responseReasoningOpaque;
             let responseUsage;
+            preloadRelevantCategoriesForRequest(this.toolRegistry, userMessage);
             const allTools = this.toolRegistry.listTools();
             const exposure = selectToolsForRequest({
               config: this.config,
@@ -5148,7 +5634,13 @@ ${summary}
               userMessage,
               state: this._toolExposureState
             });
-            const tools = exposure.tools;
+            const tools = forceFinalSummary ? [] : exposure.tools;
+            if (forceFinalSummary) {
+              messages.push({
+                role: "user",
+                content: "[System: You've reached the maximum number of tool-calling rounds. Do not call any more tools. Summarize what you accomplished, what is still incomplete, and any blocker, as your final answer.]"
+              });
+            }
             const chatOptions = {
               systemPrompt,
               messages,
@@ -5231,6 +5723,7 @@ ${summary}
                 responseToolCalls.push(...response.toolCalls);
                 responseStopReason = response.stopReason;
                 responseUsage = response.usage;
+                responseReasoningOpaque = response.reasoningOpaque;
               }
             } catch (apiError) {
               const errMsg = apiError instanceof Error ? apiError.message : String(apiError);
@@ -5357,10 +5850,11 @@ ${summary}
               this.conversationHistory.push({ role: "assistant", content: responseText });
               this.session.messages = this.conversationHistory;
               saveSession(this.session);
+              const exitReason = forceFinalSummary ? "max_iterations" : "completed";
               if (!this.provider.chatStream) {
-                yield { type: "answer", content: responseText ?? "" };
+                yield { type: "answer", content: responseText ?? "", exitReason };
               } else {
-                yield { type: "answer", content: "" };
+                yield { type: "answer", content: "", exitReason };
               }
               if (this._toolRoundsInRun >= 1 || responseText && responseText.length > 200) {
                 void this.postTurnMemorySave(systemPrompt, messages, tools, signal);
@@ -5392,7 +5886,8 @@ ${summary}
             messages.push({
               role: "assistant",
               content: responseText,
-              toolCalls: validToolCalls
+              toolCalls: validToolCalls,
+              reasoningOpaque: responseReasoningOpaque
             });
             const computerCalls = validToolCalls.filter((tc) => tc.name === "computer");
             const otherCalls = validToolCalls.filter((tc) => tc.name !== "computer");
@@ -5400,6 +5895,10 @@ ${summary}
               if (signal.aborted) {
                 return { id: tc.id, name: tc.name, output: "[Interrupted]", imageData: void 0 };
               }
+              const pre = guardrails.before(tc.name, tc.input);
+              if (pre.action === "block") {
+                return { id: tc.id, name: tc.name, output: blockedToolResult(pre), imageData: void 0 };
+              }
               let output;
               let imageData2;
               try {
@@ -5456,7 +5955,12 @@ ${summary}
                 }
               } catch {
               }
-              const outputStr = typeof output === "string" ? output : JSON.stringify(output ?? { error: "No output" });
+              let outputStr = typeof output === "string" ? output : JSON.stringify(output ?? { error: "No output" });
+              const failed = toolOutputLooksFailed(outputStr);
+              const verdict = guardrails.after(tc.name, tc.input, outputStr, failed);
+              if (verdict.action === "warn" || verdict.action === "halt") {
+                outputStr = appendGuardrailGuidance(outputStr, verdict);
+              }
               return { id: tc.id, name: tc.name, output: outputStr, imageData: imageData2 };
             }, "executeOne");
             const results = [];
@@ -5484,18 +5988,18 @@ ${summary}
                       content: parsed.question,
                       choices: parsed.choices ?? void 0
                     };
-                    const userResponse = await new Promise((resolve6) => {
+                    const userResponse = await new Promise((resolve7) => {
                       if (this._pendingAskUserResponse !== null) {
                         const buffered = this._pendingAskUserResponse;
                         this._pendingAskUserResponse = null;
-                        resolve6(buffered);
+                        resolve7(buffered);
                         return;
                       }
-                      this._askUserResolver = resolve6;
+                      this._askUserResolver = resolve7;
                       setTimeout(() => {
-                        if (this._askUserResolver === resolve6) {
+                        if (this._askUserResolver === resolve7) {
                           this._askUserResolver = null;
-                          resolve6("[No response from user \u2014 timed out after 5 minutes]");
+                          resolve7("[No response from user \u2014 timed out after 5 minutes]");
                         }
                       }, 5 * 60 * 1e3);
                     });
@@ -5516,6 +6020,15 @@ ${summary}
             this.conversationHistory = [...messages];
             this.session.messages = this.conversationHistory;
             saveSession(this.session);
+            if (guardrails.halted) {
+              const reason = "guardrail_halt";
+              yield {
+                type: "answer",
+                content: `[Stopped: ${guardrails.halted.message ?? "tool loop detected"}]`,
+                exitReason: reason
+              };
+              return;
+            }
             if (this._toolRoundsInRun > 0 && this._toolRoundsInRun % 5 === 0) {
               messages.push({
                 role: "user",
@@ -5590,14 +6103,14 @@ __export(settings_exports, {
 });
 import { z } from "zod";
 import { readFile, writeFile, mkdir } from "node:fs/promises";
-import { existsSync as existsSync7 } from "node:fs";
+import { existsSync as existsSync8 } from "node:fs";
 import { join as join9 } from "node:path";
 import { homedir as homedir6 } from "node:os";
 import { parse as parseYaml2, stringify as stringifyYaml2 } from "yaml";
 async function ensureDirectories() {
   const dirs = [OPENJAW_DIR, SESSIONS_DIR, MEMORY_DIR];
   for (const dir2 of dirs) {
-    if (!existsSync7(dir2)) {
+    if (!existsSync8(dir2)) {
       await mkdir(dir2, { recursive: true });
     }
   }
@@ -5608,7 +6121,7 @@ async function loadConfig() {
   }
   await ensureDirectories();
   let rawConfig = {};
-  if (existsSync7(CONFIG_PATH)) {
+  if (existsSync8(CONFIG_PATH)) {
     const content = await readFile(CONFIG_PATH, "utf-8");
     rawConfig = parseYaml2(content);
   }
@@ -5658,7 +6171,13 @@ var init_settings = __esm({
     MicrosoftConfigSchema = z.object({
       tenant_id: z.string().optional(),
       client_id: z.string().optional(),
-      client_secret: z.string().optional()
+      client_secret: z.string().optional(),
+      // Graph token acquisition strategy:
+      //   'auto' (default) — try the WAM broker first (reliable, browser-free on
+      //          Windows), fall back to CDP browser-token extraction.
+      //   'wam'  — broker only (no CDP fallback).
+      //   'cdp'  — legacy browser-token extraction only (disable WAM).
+      auth_mode: z.enum(["auto", "wam", "cdp"]).optional()
     });
     BrowserConfigSchema = z.object({
       executable: z.string().optional(),
@@ -6158,7 +6677,7 @@ var init_browser = __esm({
           await Page.domContentEventFired();
         } else if (options.waitFor === "networkidle") {
           await Page.loadEventFired();
-          await new Promise((resolve6) => setTimeout(resolve6, 1e3));
+          await new Promise((resolve7) => setTimeout(resolve7, 1e3));
         }
         const result = await Runtime.evaluate({
           expression: "document.title"
@@ -6929,7 +7448,7 @@ var init_browser = __esm({
           if (exists) {
             return true;
           }
-          await new Promise((resolve6) => setTimeout(resolve6, 200));
+          await new Promise((resolve7) => setTimeout(resolve7, 200));
         }
         return false;
       }
@@ -7157,10 +7676,10 @@ function createBrowseTools(config, sharedBrowser) {
         }
       },
       execute: /* @__PURE__ */ __name(async (input) => {
-        const { join: join48 } = await import("node:path");
+        const { join: join49 } = await import("node:path");
         const { tmpdir: tmpdir13 } = await import("node:os");
         const { randomUUID: randomUUID15 } = await import("node:crypto");
-        const screenshotPath = join48(tmpdir13(), `openjaw-browser-${randomUUID15().slice(0, 8)}.png`);
+        const screenshotPath = join49(tmpdir13(), `openjaw-browser-${randomUUID15().slice(0, 8)}.png`);
         const screenshot = await browser.screenshot({ fullPage: false, path: screenshotPath });
         const snapshot = await browser.snapshot({ full: false });
         return {
@@ -7855,7 +8374,7 @@ var init_outlook_desktop = __esm({
         }
       }
       sleep(ms) {
-        return new Promise((resolve6) => setTimeout(resolve6, ms));
+        return new Promise((resolve7) => setTimeout(resolve7, ms));
       }
     };
   }
@@ -8453,14 +8972,14 @@ var init_outlook_web = __esm({
         await this.browser.typeChars(text);
       }
       sleep(ms) {
-        return new Promise((resolve6) => setTimeout(resolve6, ms));
+        return new Promise((resolve7) => setTimeout(resolve7, ms));
       }
     };
   }
 });
 
 // ../openjaw-mcp/dist/auth/token-pool.js
-import { existsSync as existsSync8, mkdirSync as mkdirSync6, readFileSync as readFileSync6, writeFileSync as writeFileSync6 } from "node:fs";
+import { existsSync as existsSync9, mkdirSync as mkdirSync6, readFileSync as readFileSync6, writeFileSync as writeFileSync6 } from "node:fs";
 import { join as join10 } from "node:path";
 import { homedir as homedir7 } from "node:os";
 function decodeJwtPayload(jwt) {
@@ -8657,7 +9176,7 @@ var init_token_pool = __esm({
        * Load pool from disk, including legacy token files.
        */
       load() {
-        if (existsSync8(POOL_FILE)) {
+        if (existsSync9(POOL_FILE)) {
           try {
             const raw = readFileSync6(POOL_FILE, "utf-8");
             const data = JSON.parse(raw);
@@ -8684,7 +9203,7 @@ var init_token_pool = __esm({
        */
       loadLegacyFiles() {
         const legacyDir = join10(POOL_DIR, "tokens");
-        if (!existsSync8(legacyDir))
+        if (!existsSync9(legacyDir))
           return;
         try {
           const { readdirSync: readdirSync8 } = __require("node:fs");
@@ -8868,7 +9387,7 @@ var init_cdp_token_extractor = __esm({
         }
         logger_default.info("CDP: reloading tab for token refresh", { url: targetTab.url, audience });
         await this.reloadTab(targetTab);
-        await new Promise((resolve6) => setTimeout(resolve6, PAGE_RELOAD_WAIT_MS));
+        await new Promise((resolve7) => setTimeout(resolve7, PAGE_RELOAD_WAIT_MS));
         if (!targetTab.webSocketDebuggerUrl)
           return [];
         const freshPages = await this.listPages();
@@ -8985,19 +9504,19 @@ var init_cdp_token_extractor = __esm({
        * Evaluate a JS expression in a tab and return the string result.
        */
       async evaluateInTab(wsUrl, expression) {
-        return new Promise((resolve6) => {
+        return new Promise((resolve7) => {
           let ws;
           try {
             ws = new WebSocket(wsUrl);
           } catch (err) {
             logger_default.warn("CDP: WebSocket constructor failed", { wsUrl: wsUrl.substring(0, 60), error: String(err) });
-            resolve6(null);
+            resolve7(null);
             return;
           }
           const timer = setTimeout(() => {
             logger_default.warn("CDP: evaluateInTab timeout", { wsUrl: wsUrl.substring(0, 60) });
             ws.close();
-            resolve6(null);
+            resolve7(null);
           }, CDP_TIMEOUT_MS);
           ws.on("open", () => {
             ws.send(JSON.stringify({
@@ -9011,18 +9530,18 @@ var init_cdp_token_extractor = __esm({
             if (resp.id === 1) {
               clearTimeout(timer);
               ws.close();
-              resolve6(resp.result?.result?.value ?? null);
+              resolve7(resp.result?.result?.value ?? null);
             }
           });
           ws.on("error", (err) => {
             logger_default.warn("CDP: evaluateInTab WS error", { error: String(err), wsUrl: wsUrl.substring(0, 60) });
             clearTimeout(timer);
-            resolve6(null);
+            resolve7(null);
           });
         });
       }
       async extractFromTab(wsUrl) {
-        return new Promise((resolve6, reject) => {
+        return new Promise((resolve7, reject) => {
           const ws = new WebSocket(wsUrl);
           const timer = setTimeout(() => {
             ws.close();
@@ -9042,14 +9561,14 @@ var init_cdp_token_extractor = __esm({
               ws.close();
               const value = resp.result?.result?.value;
               if (!value) {
-                resolve6([]);
+                resolve7([]);
                 return;
               }
               try {
                 const tokens = JSON.parse(value);
-                resolve6(tokens);
+                resolve7(tokens);
               } catch {
-                resolve6([]);
+                resolve7([]);
               }
             }
           });
@@ -9065,11 +9584,11 @@ var init_cdp_token_extractor = __esm({
       async reloadTab(page) {
         if (!page.webSocketDebuggerUrl)
           return;
-        return new Promise((resolve6, reject) => {
+        return new Promise((resolve7, reject) => {
           const ws = new WebSocket(page.webSocketDebuggerUrl);
           const timer = setTimeout(() => {
             ws.close();
-            resolve6();
+            resolve7();
           }, 1e4);
           ws.on("open", () => {
             ws.send(JSON.stringify({
@@ -9083,7 +9602,7 @@ var init_cdp_token_extractor = __esm({
             if (resp.id === 1) {
               clearTimeout(timer);
               ws.close();
-              resolve6();
+              resolve7();
             }
           });
           ws.on("error", (err) => {
@@ -9123,13 +9642,172 @@ var init_cdp_token_extractor = __esm({
   }
 });
 
+// ../openjaw-mcp/dist/auth/wam-token-provider.js
+var wam_token_provider_exports = {};
+__export(wam_token_provider_exports, {
+  WAM_GRAPH_SCOPES: () => WAM_GRAPH_SCOPES,
+  acquireGraphToken: () => acquireGraphToken,
+  acquireTokenForAudience: () => acquireTokenForAudience,
+  configureWam: () => configureWam,
+  isWamAvailable: () => isWamAvailable,
+  setWamWindowHandleProvider: () => setWamWindowHandleProvider
+});
+import { InteractionRequiredAuthError } from "@azure/msal-node";
+function configureWam(opts) {
+  if (opts.clientId)
+    clientId = opts.clientId;
+  if (opts.tenant)
+    tenant = opts.tenant;
+  if (typeof opts.enabled === "boolean")
+    wamEnabled = opts.enabled;
+}
+function setWamWindowHandleProvider(fn) {
+  windowHandleProvider = fn;
+}
+async function getBrokerPlugin() {
+  if (brokerLoadAttempted)
+    return nativeBrokerPlugin;
+  brokerLoadAttempted = true;
+  if (process.platform !== "win32") {
+    logger_default.debug("WAM: not win32, broker unavailable");
+    return null;
+  }
+  try {
+    const { NativeBrokerPlugin } = await import("@azure/msal-node-extensions");
+    const plugin = new NativeBrokerPlugin();
+    nativeBrokerPlugin = plugin;
+  } catch (err) {
+    logger_default.warn("WAM: failed to load NativeBrokerPlugin", { error: err instanceof Error ? err.message : String(err) });
+    nativeBrokerPlugin = null;
+  }
+  return nativeBrokerPlugin;
+}
+async function getApp() {
+  const plugin = await getBrokerPlugin();
+  if (!plugin || !plugin.isBrokerAvailable)
+    return null;
+  if (!msalApp) {
+    const { PublicClientApplication } = await import("@azure/msal-node");
+    msalApp = new PublicClientApplication({
+      auth: { clientId, authority: `https://login.microsoftonline.com/${tenant}` },
+      broker: { nativeBrokerPlugin: plugin }
+    });
+  }
+  return msalApp;
+}
+function withBrokerLock(fn) {
+  const result = _brokerQueue.then(fn, fn);
+  _brokerQueue = result.then(() => void 0, () => void 0);
+  return result;
+}
+function isInteractionRequired(err) {
+  if (err instanceof InteractionRequiredAuthError)
+    return true;
+  const msg = err instanceof Error ? err.message : String(err);
+  return /interaction[_\-\s]?required|no[_\-\s]?account/i.test(msg);
+}
+async function acquireUnlocked(app, scopes) {
+  const accounts = await app.getAllAccounts();
+  const account = selectedAccount ?? accounts.find((a) => a.tenantId === tenant) ?? (accounts.length === 1 ? accounts[0] : void 0);
+  if (account) {
+    try {
+      return await app.acquireTokenSilent({ scopes, account });
+    } catch (err) {
+      if (!isInteractionRequired(err)) {
+        logger_default.warn("WAM: silent acquire failed (non-interactive)", {
+          error: err instanceof Error ? err.message.split("\n")[0] : String(err)
+        });
+        throw err;
+      }
+      logger_default.info("WAM: silent failed, interaction required");
+    }
+  }
+  const windowHandle = windowHandleProvider?.() ?? void 0;
+  const result = await app.acquireTokenInteractive({
+    scopes,
+    windowHandle,
+    openBrowser: noop,
+    prompt: "select_account",
+    loginHint: account?.username
+  });
+  if (result.account)
+    selectedAccount = result.account;
+  return result;
+}
+async function acquireGraphToken(scopes = WAM_GRAPH_SCOPES) {
+  return acquireTokenForScopes(scopes);
+}
+async function acquireTokenForAudience(audience, _perms = []) {
+  const base = audience.endsWith("/") ? audience.slice(0, -1) : audience;
+  return acquireTokenForScopes([`${base}/.default`]);
+}
+async function acquireTokenForScopes(scopes) {
+  if (!wamEnabled || brokerPoisoned)
+    return null;
+  try {
+    const app = await getApp();
+    if (!app)
+      return null;
+    const result = await withBrokerLock(() => acquireUnlocked(app, scopes));
+    return result?.accessToken ?? null;
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    if (/AccountUnusable|broker.*unavailable/i.test(msg)) {
+      brokerPoisoned = true;
+      logger_default.warn("WAM: broker poisoned, disabling for this session", { error: msg.split("\n")[0] });
+    } else {
+      logger_default.warn("WAM: acquire failed, will fall back", { error: msg.split("\n")[0] });
+    }
+    return null;
+  }
+}
+async function isWamAvailable() {
+  if (!wamEnabled || brokerPoisoned)
+    return false;
+  const plugin = await getBrokerPlugin();
+  return !!plugin && plugin.isBrokerAvailable;
+}
+var CORP_TENANT, DEFAULT_CLIENT_ID, WAM_GRAPH_SCOPES, clientId, tenant, windowHandleProvider, wamEnabled, brokerLoadAttempted, nativeBrokerPlugin, msalApp, brokerPoisoned, selectedAccount, _brokerQueue, noop;
+var init_wam_token_provider = __esm({
+  "../openjaw-mcp/dist/auth/wam-token-provider.js"() {
+    "use strict";
+    init_logger();
+    CORP_TENANT = "72f988bf-86f1-41af-91ab-2d7cd011db47";
+    DEFAULT_CLIENT_ID = "99fa64eb-feda-4f94-aecd-30637ca7bf2d";
+    WAM_GRAPH_SCOPES = ["https://graph.microsoft.com/.default"];
+    clientId = DEFAULT_CLIENT_ID;
+    tenant = CORP_TENANT;
+    windowHandleProvider = null;
+    wamEnabled = true;
+    __name(configureWam, "configureWam");
+    __name(setWamWindowHandleProvider, "setWamWindowHandleProvider");
+    brokerLoadAttempted = false;
+    nativeBrokerPlugin = null;
+    msalApp = null;
+    brokerPoisoned = false;
+    selectedAccount = null;
+    __name(getBrokerPlugin, "getBrokerPlugin");
+    __name(getApp, "getApp");
+    _brokerQueue = Promise.resolve();
+    __name(withBrokerLock, "withBrokerLock");
+    noop = /* @__PURE__ */ __name(async () => {
+    }, "noop");
+    __name(isInteractionRequired, "isInteractionRequired");
+    __name(acquireUnlocked, "acquireUnlocked");
+    __name(acquireGraphToken, "acquireGraphToken");
+    __name(acquireTokenForAudience, "acquireTokenForAudience");
+    __name(acquireTokenForScopes, "acquireTokenForScopes");
+    __name(isWamAvailable, "isWamAvailable");
+  }
+});
+
 // ../openjaw-mcp/dist/auth/graph-token-provider.js
-import { existsSync as existsSync9, readFileSync as readFileSync7, writeFileSync as writeFileSync7, mkdirSync as mkdirSync7 } from "node:fs";
-import { join as join11, dirname as dirname3 } from "node:path";
+import { existsSync as existsSync10, readFileSync as readFileSync7, writeFileSync as writeFileSync7, mkdirSync as mkdirSync7 } from "node:fs";
+import { join as join11, dirname as dirname4 } from "node:path";
 import { homedir as homedir8 } from "node:os";
 import { exec as exec2 } from "node:child_process";
 import { promisify as promisify2 } from "node:util";
-import { fileURLToPath as fileURLToPath2 } from "node:url";
+import { fileURLToPath as fileURLToPath3 } from "node:url";
 function getSharedPool() {
   if (!sharedPool) {
     sharedPool = new TokenPool();
@@ -9149,9 +9827,10 @@ var init_graph_token_provider = __esm({
     init_logger();
     init_token_pool();
     init_cdp_token_extractor();
+    init_wam_token_provider();
     execAsync2 = promisify2(exec2);
-    __filename = fileURLToPath2(import.meta.url);
-    __dirname = dirname3(__filename);
+    __filename = fileURLToPath3(import.meta.url);
+    __dirname = dirname4(__filename);
     TOKEN_PROFILES = {
       "graph-chat": {
         scopes: ["Chat.Read"],
@@ -9225,6 +9904,23 @@ var init_graph_token_provider = __esm({
           this.scheduleProactiveRefresh(pooled.expiresAt);
           return pooled.secret;
         }
+        {
+          const wamJwt = await acquireTokenForAudience(this.preferredAudience, this.requiredScopes);
+          if (wamJwt) {
+            const added = this.pool.addTokenFromJwt(wamJwt, "wam");
+            const token = this.pool.getToken(this.requiredScopes, this.preferredAudience);
+            if (token) {
+              this.saveLegacyToken(token.secret);
+              this.scheduleProactiveRefresh(token.expiresAt);
+              logger_default.info("Token acquired via WAM broker", { tokenName: this.tokenName });
+              return token.secret;
+            }
+            if (added) {
+              this.scheduleProactiveRefresh(added.expiresAt);
+              return added.secret;
+            }
+          }
+        }
         logger_default.info("Tier 1 (pool) empty \u2014 trying Tier 2 (CDP extraction)...", {
           tokenName: this.tokenName,
           audience: this.preferredAudience
@@ -9482,7 +10178,7 @@ var init_graph_token_provider = __esm({
        * Tier 4: Legacy Python script fallback.
        */
       async extractViaLegacyScript() {
-        if (!existsSync9(this.extractScript)) {
+        if (!existsSync10(this.extractScript)) {
           return false;
         }
         try {
@@ -9498,7 +10194,7 @@ var init_graph_token_provider = __esm({
        */
       migrateLegacyToken(tokenName) {
         const legacyPath = join11(homedir8(), ".graph-token", "tokens", `${tokenName}.json`);
-        if (!existsSync9(legacyPath))
+        if (!existsSync10(legacyPath))
           return;
         try {
           const data = JSON.parse(readFileSync7(legacyPath, "utf-8"));
@@ -9757,9 +10453,9 @@ var init_outlook_graph = __esm({
         const wellKnown = WELL_KNOWN_FOLDERS[lower];
         if (wellKnown)
           return wellKnown;
-        const cached7 = this.folderIdCache.get(lower);
-        if (cached7)
-          return cached7;
+        const cached8 = this.folderIdCache.get(lower);
+        if (cached8)
+          return cached8;
         try {
           const result = await this.graphGet(`/me/mailFolders?$filter=displayName eq '${folderName.replace(/'/g, "''")}'&$top=1`);
           if (result.value.length > 0) {
@@ -10017,7 +10713,7 @@ var init_outlook_graph = __esm({
 import { DatabaseSync } from "node:sqlite";
 import { join as join12 } from "node:path";
 import { homedir as homedir9 } from "node:os";
-import { mkdirSync as mkdirSync8, existsSync as existsSync10 } from "node:fs";
+import { mkdirSync as mkdirSync8, existsSync as existsSync11 } from "node:fs";
 function hasFts5() {
   return _hasFts5;
 }
@@ -10033,7 +10729,7 @@ function detectFts5(database) {
 }
 function getMemoryDb() {
   if (!db) {
-    if (!existsSync10(DB_DIR)) {
+    if (!existsSync11(DB_DIR)) {
       mkdirSync8(DB_DIR, { recursive: true });
     }
     db = new DatabaseSync(DB_PATH);
@@ -10117,9 +10813,9 @@ var init_db = __esm({
 import { createHash as createHash2 } from "node:crypto";
 function encodeAtom(word, dim2 = HRR_DIM) {
   const cacheKey = `${word}:${dim2}`;
-  const cached7 = atomCache.get(cacheKey);
-  if (cached7)
-    return cached7;
+  const cached8 = atomCache.get(cacheKey);
+  if (cached8)
+    return cached8;
   const phases = new Float64Array(dim2);
   const bytesNeeded = dim2 * 4;
   const chunks = [];
@@ -10394,7 +11090,7 @@ __export(store_exports, {
   MemoryStore: () => MemoryStore
 });
 import { readFile as readFile2, readdir } from "node:fs/promises";
-import { existsSync as existsSync11 } from "node:fs";
+import { existsSync as existsSync12 } from "node:fs";
 import { join as join13 } from "node:path";
 var MemoryStore;
 var init_store = __esm({
@@ -10452,7 +11148,7 @@ var init_store = __esm({
         const db2 = this.ensureDb();
         let migrated = 0;
         const insert = db2.prepare("INSERT INTO memories (content, source, created_at) VALUES (?, ?, ?)");
-        if (existsSync11(this.memoryFile)) {
+        if (existsSync12(this.memoryFile)) {
           const content = await readFile2(this.memoryFile, "utf-8");
           const entries = this.parseMarkdownToEntries(content, "MEMORY.md");
           for (const entry of entries) {
@@ -10460,7 +11156,7 @@ var init_store = __esm({
             migrated++;
           }
         }
-        if (existsSync11(this.memoryDir)) {
+        if (existsSync12(this.memoryDir)) {
           const files = await readdir(this.memoryDir);
           const mdFiles = files.filter((f) => f.endsWith(".md")).sort().reverse();
           for (const file2 of mdFiles) {
@@ -10744,13 +11440,13 @@ function createMemoryTools(config) {
         const todos = input.todos;
         try {
           const { appendFile: appendFile2, mkdir: mkdir5 } = await import("node:fs/promises");
-          const { existsSync: existsSync34 } = await import("node:fs");
-          const { join: join48 } = await import("node:path");
-          const { homedir: homedir32 } = await import("node:os");
-          const memoryDir = join48(homedir32(), ".openjaw", "memory");
-          if (!existsSync34(memoryDir))
+          const { existsSync: existsSync36 } = await import("node:fs");
+          const { join: join49 } = await import("node:path");
+          const { homedir: homedir33 } = await import("node:os");
+          const memoryDir = join49(homedir33(), ".openjaw", "memory");
+          if (!existsSync36(memoryDir))
             await mkdir5(memoryDir, { recursive: true });
-          const todoPath = join48(memoryDir, "TODOS.md");
+          const todoPath = join49(memoryDir, "TODOS.md");
           const { writeFile: writeFile5 } = await import("node:fs/promises");
           await writeFile5(todoPath, `# Session Todos
 
@@ -12071,7 +12767,7 @@ var init_teams_desktop = __esm({
         }
       }
       sleep(ms) {
-        return new Promise((resolve6) => setTimeout(resolve6, ms));
+        return new Promise((resolve7) => setTimeout(resolve7, ms));
       }
       /**
        * Get the current Teams window state
@@ -12938,7 +13634,7 @@ var init_teams_web = __esm({
         }
       }
       sleep(ms) {
-        return new Promise((resolve6) => setTimeout(resolve6, ms));
+        return new Promise((resolve7) => setTimeout(resolve7, ms));
       }
     };
   }
@@ -13335,9 +14031,9 @@ ${loopContent}` : loopContent;
        */
       async findChannelByName(searchTerm) {
         const searchLower = searchTerm.toLowerCase();
-        const cached7 = this.channelIdCache.get(searchLower);
-        if (cached7) {
-          return { ...cached7, displayName: searchTerm };
+        const cached8 = this.channelIdCache.get(searchLower);
+        if (cached8) {
+          return { ...cached8, displayName: searchTerm };
         }
         try {
           const teamsData = await this.graphGet("/v1.0/me/joinedTeams");
@@ -13517,9 +14213,9 @@ ${loopContent}` : loopContent;
        * Results are cached per chat ID.
        */
       async getChatMembers(chatOrChannelId) {
-        const cached7 = this.chatMembersCache.get(chatOrChannelId);
-        if (cached7)
-          return cached7;
+        const cached8 = this.chatMembersCache.get(chatOrChannelId);
+        if (cached8)
+          return cached8;
         try {
           let endpoint;
           if (this.contextType === "channel" && this.currentChannelTeamId && chatOrChannelId === this.currentChannelId) {
@@ -13757,9 +14453,9 @@ ${loopContent}` : loopContent;
        */
       async resolveChannelIds(teamName, channelName) {
         const cacheKey = `${teamName}/${channelName}`;
-        const cached7 = this.channelIdCache.get(cacheKey);
-        if (cached7)
-          return cached7;
+        const cached8 = this.channelIdCache.get(cacheKey);
+        if (cached8)
+          return cached8;
         const teamsData = await this.graphGet("/v1.0/me/joinedTeams");
         const team = teamsData.value?.find((t) => t.displayName.toLowerCase() === teamName.toLowerCase());
         if (!team) {
@@ -14336,7 +15032,7 @@ var init_teams_chat_monitor = __esm({
         return this.sentMessages.has(normalized);
       }
       sleep(ms) {
-        return new Promise((resolve6) => setTimeout(resolve6, ms));
+        return new Promise((resolve7) => setTimeout(resolve7, ms));
       }
       /**
        * Attempt to reconnect the browser after detecting a disconnection.
@@ -15123,7 +15819,7 @@ ${lines.join("\n")}`;
             globalThis.__teamsSeenMessages.set(chatName, seenIds);
           }
           if (syncMode) {
-            return new Promise((resolve6) => {
+            return new Promise((resolve7) => {
               const timer2 = setInterval(async () => {
                 try {
                   const current = await channel.readCurrentChatMessages();
@@ -15132,7 +15828,7 @@ ${lines.join("\n")}`;
                     if (!seenIds.has(msgId) && msg.sender !== currentUserName) {
                       clearInterval(timer2);
                       seenIds.add(msgId);
-                      resolve6({
+                      resolve7({
                         success: true,
                         channel: channelType,
                         sync: true,
@@ -15209,7 +15905,7 @@ ${lines.join("\n")}`;
             globalThis.__teamsSeenMessages.set(chatName, seenIds);
           }
           if (syncMode) {
-            return new Promise((resolve6) => {
+            return new Promise((resolve7) => {
               const timer2 = setInterval(async () => {
                 try {
                   const current = await channel.readCurrentChatMessages();
@@ -15218,7 +15914,7 @@ ${lines.join("\n")}`;
                     if (!seenIds.has(msgId) && msg.sender !== currentUserName) {
                       clearInterval(timer2);
                       seenIds.add(msgId);
-                      resolve6({
+                      resolve7({
                         success: true,
                         channel: channelType,
                         sync: true,
@@ -15576,7 +16272,7 @@ ${lines.join("\n")}`;
   return allTools;
 }
 function sleep2(ms) {
-  return new Promise((resolve6) => setTimeout(resolve6, ms));
+  return new Promise((resolve7) => setTimeout(resolve7, ms));
 }
 var MAX_STORED_ENTRIES, ENTRY_TTL_MS;
 var init_chat = __esm({
@@ -15601,8 +16297,8 @@ var init_chat = __esm({
 
 // ../openjaw-mcp/dist/tools/files.js
 import { readFile as readFile3, writeFile as writeFile2, readdir as readdir2, stat, mkdir as mkdir2, unlink } from "node:fs/promises";
-import { existsSync as existsSync12, readFileSync as readFileSync8 } from "node:fs";
-import { join as join15, dirname as dirname4, basename, extname } from "node:path";
+import { existsSync as existsSync13, readFileSync as readFileSync8 } from "node:fs";
+import { join as join15, dirname as dirname5, basename, extname } from "node:path";
 import { execSync as execSync3 } from "node:child_process";
 function createFileTools(_config) {
   return [
@@ -15639,7 +16335,7 @@ function createFileTools(_config) {
       execute: /* @__PURE__ */ __name(async (input) => {
         const path3 = input.path;
         const encoding = input.encoding ?? "utf-8";
-        if (!existsSync12(path3)) {
+        if (!existsSync13(path3)) {
           return { error: `File not found: ${path3}` };
         }
         const BINARY_EXTENSIONS = /* @__PURE__ */ new Set([
@@ -15750,12 +16446,12 @@ function createFileTools(_config) {
         const append2 = input.append ?? false;
         const createDirs = input.create_dirs ?? true;
         if (createDirs) {
-          const dir2 = dirname4(path3);
-          if (!existsSync12(dir2)) {
+          const dir2 = dirname5(path3);
+          if (!existsSync13(dir2)) {
             await mkdir2(dir2, { recursive: true });
           }
         }
-        if (append2 && existsSync12(path3)) {
+        if (append2 && existsSync13(path3)) {
           const existing = await readFile3(path3, "utf-8");
           await writeFile2(path3, existing + content, "utf-8");
         } else {
@@ -15802,7 +16498,7 @@ function createFileTools(_config) {
         const recursive = input.recursive ?? false;
         const includeHidden = input.include_hidden ?? false;
         const pattern = input.pattern;
-        if (!existsSync12(dirPath)) {
+        if (!existsSync13(dirPath)) {
           return { error: `Directory not found: ${dirPath}` };
         }
         const results = [];
@@ -15850,7 +16546,7 @@ function createFileTools(_config) {
       requiresConfirmation: true,
       execute: /* @__PURE__ */ __name(async (input) => {
         const path3 = input.path;
-        if (!existsSync12(path3)) {
+        if (!existsSync13(path3)) {
           return { error: `File not found: ${path3}` };
         }
         await unlink(path3);
@@ -15872,7 +16568,7 @@ function createFileTools(_config) {
       },
       execute: /* @__PURE__ */ __name(async (input) => {
         const path3 = input.path;
-        if (!existsSync12(path3)) {
+        if (!existsSync13(path3)) {
           return { error: `Path not found: ${path3}` };
         }
         const stats = await stat(path3);
@@ -15902,7 +16598,7 @@ function createFileTools(_config) {
       },
       execute: /* @__PURE__ */ __name(async (input) => {
         const filePath = input.path;
-        if (!existsSync12(filePath)) {
+        if (!existsSync13(filePath)) {
           return { error: `Image not found: ${filePath}` };
         }
         const ext = extname(filePath).toLowerCase();
@@ -15948,7 +16644,7 @@ function createFileTools(_config) {
         const path3 = input.path;
         const oldStr = input.old_str;
         const newStr = input.new_str;
-        if (!existsSync12(path3)) {
+        if (!existsSync13(path3)) {
           return { error: `File not found: ${path3}` };
         }
         const fileStats = await stat(path3);
@@ -16134,7 +16830,7 @@ var init_web_search_types = __esm({
 });
 
 // ../openjaw-mcp/dist/tools/shell.js
-import { spawn } from "node:child_process";
+import { spawn as spawn2 } from "node:child_process";
 import clipboardy from "clipboardy";
 import notifier from "node-notifier";
 function truncateOutput(text, maxLines = 200) {
@@ -16400,12 +17096,12 @@ function createShellTools(_config, hooks) {
         const shell = input.shell ?? true;
         if (input.background) {
           const { tmpdir: tmpdir13 } = await import("node:os");
-          const { join: join48 } = await import("node:path");
+          const { join: join49 } = await import("node:path");
           const { randomUUID: randomUUID15 } = await import("node:crypto");
           const { createWriteStream: createWriteStream2 } = await import("node:fs");
           const taskId = randomUUID15().slice(0, 8);
-          const outputPath = join48(tmpdir13(), `oj-bg-${taskId}.log`);
-          const detached = spawn(command, [], {
+          const outputPath = join49(tmpdir13(), `oj-bg-${taskId}.log`);
+          const detached = spawn2(command, [], {
             shell,
             cwd,
             detached: true,
@@ -16424,8 +17120,8 @@ function createShellTools(_config, hooks) {
             message: `Command started in background (PID: ${detached.pid}). Output: ${outputPath}`
           };
         }
-        return new Promise((resolve6) => {
-          const proc = spawn(command, [], {
+        return new Promise((resolve7) => {
+          const proc = spawn2(command, [], {
             shell,
             cwd,
             timeout,
@@ -16442,7 +17138,7 @@ function createShellTools(_config, hooks) {
           proc.on("close", (code) => {
             const stdoutResult = truncateOutput(stdout.trim());
             const stderrResult = truncateOutput(stderr.trim());
-            resolve6({
+            resolve7({
               command,
               exitCode: code,
               stdout: stdoutResult.text,
@@ -16453,7 +17149,7 @@ function createShellTools(_config, hooks) {
             });
           });
           proc.on("error", (error) => {
-            resolve6({
+            resolve7({
               command,
               exitCode: -1,
               stdout: "",
@@ -16487,8 +17183,8 @@ function createShellTools(_config, hooks) {
       },
       requiresConfirmation: false,
       execute: /* @__PURE__ */ __name(async (input) => {
-        const { writeFileSync: writeFileSync23, unlinkSync: unlinkSync9 } = await import("node:fs");
-        const { join: join48 } = await import("node:path");
+        const { writeFileSync: writeFileSync23, unlinkSync: unlinkSync10 } = await import("node:fs");
+        const { join: join49 } = await import("node:path");
         const { tmpdir: tmpdir13 } = await import("node:os");
         const { randomUUID: randomUUID15 } = await import("node:crypto");
         const { execFile: execFile3 } = await import("node:child_process");
@@ -16507,14 +17203,14 @@ function createShellTools(_config, hooks) {
         const interpreter = interpreterMap[language];
         if (!interpreter)
           return { error: `Unsupported language: ${language}` };
-        const tmpFile = join48(tmpdir13(), `oj-code-${randomUUID15().slice(0, 8)}${ext}`);
+        const tmpFile = join49(tmpdir13(), `oj-code-${randomUUID15().slice(0, 8)}${ext}`);
         try {
           writeFileSync23(tmpFile, code, "utf-8");
           const startTime = Date.now();
-          const result = await new Promise((resolve6) => {
+          const result = await new Promise((resolve7) => {
             execFile3(interpreter.cmd, [...interpreter.args, tmpFile], { timeout, maxBuffer: 10 * 1024 * 1024 }, (error, stdout2, stderr2) => {
               const exitCode = error ? typeof error.code === "number" ? error.code : 1 : 0;
-              resolve6({ exitCode, stdout: stdout2 ?? "", stderr: stderr2 ?? "" });
+              resolve7({ exitCode, stdout: stdout2 ?? "", stderr: stderr2 ?? "" });
             });
           });
           const executionTimeMs = Date.now() - startTime;
@@ -16540,7 +17236,7 @@ function createShellTools(_config, hooks) {
           };
         } finally {
           try {
-            unlinkSync9(tmpFile);
+            unlinkSync10(tmpFile);
           } catch {
           }
         }
@@ -16607,7 +17303,7 @@ function createShellTools(_config, hooks) {
         required: ["title", "message"]
       },
       execute: /* @__PURE__ */ __name(async (input) => {
-        return new Promise((resolve6) => {
+        return new Promise((resolve7) => {
           notifier.notify({
             title: input.title,
             message: input.message,
@@ -16615,9 +17311,9 @@ function createShellTools(_config, hooks) {
             sound: true
           }, (err) => {
             if (err) {
-              resolve6({ error: err.message });
+              resolve7({ error: err.message });
             } else {
-              resolve6({ success: true });
+              resolve7({ success: true });
             }
           });
         });
@@ -16721,7 +17417,7 @@ function createShellTools(_config, hooks) {
       },
       execute: /* @__PURE__ */ __name(async (input) => {
         const seconds = Math.min(Math.max(0.1, input.seconds), 60);
-        await new Promise((resolve6) => setTimeout(resolve6, seconds * 1e3));
+        await new Promise((resolve7) => setTimeout(resolve7, seconds * 1e3));
         return { waited: seconds, message: `Waited ${seconds} seconds` };
       }, "execute")
     },
@@ -17833,7 +18529,7 @@ var init_office_desktop = __esm({
         return Array.isArray(parsed) ? parsed : [parsed];
       }
       sleep(ms) {
-        return new Promise((resolve6) => setTimeout(resolve6, ms));
+        return new Promise((resolve7) => setTimeout(resolve7, ms));
       }
     };
   }
@@ -19514,7 +20210,7 @@ public class Win32Send {
         }
       }
       sleep(ms) {
-        return new Promise((resolve6) => setTimeout(resolve6, ms));
+        return new Promise((resolve7) => setTimeout(resolve7, ms));
       }
     };
   }
@@ -19579,7 +20275,7 @@ function getActiveMonitors() {
   return result;
 }
 function sleep3(ms) {
-  return new Promise((resolve6) => setTimeout(resolve6, ms));
+  return new Promise((resolve7) => setTimeout(resolve7, ms));
 }
 async function fileHash(filePath) {
   const data = fs.readFileSync(filePath);
@@ -20261,6 +20957,224 @@ var init_wechat = __esm({
   }
 });
 
+// ../openjaw-mcp/dist/tools/workiq.js
+import { spawn as spawn3 } from "node:child_process";
+import { accessSync, chmodSync, constants, existsSync as existsSync14, readFileSync as readFileSync9 } from "node:fs";
+import { createRequire as createRequire2 } from "node:module";
+import { homedir as homedir10 } from "node:os";
+import { dirname as dirname6, join as join16 } from "node:path";
+import { fileURLToPath as fileURLToPath4 } from "node:url";
+function workiqStateFilePath() {
+  return join16(homedir10(), ".work-iq-cli", ".workiq.json");
+}
+function workiqPlatformDir(pkgDir) {
+  if (process.platform === "win32") {
+    const nativeDir = join16(pkgDir, "bin", `win-${process.arch}`);
+    if (!existsSync14(nativeDir) && process.arch !== "x64")
+      return "win-x64";
+    return `win-${process.arch}`;
+  }
+  if (process.platform === "darwin")
+    return `osx-${process.arch}`;
+  return `linux-${process.arch}`;
+}
+function ensureExecutable(binaryPath) {
+  if (process.platform === "win32")
+    return;
+  try {
+    accessSync(binaryPath, constants.X_OK);
+  } catch {
+    try {
+      chmodSync(binaryPath, 493);
+    } catch {
+    }
+  }
+}
+function resolveWorkIQBinaryInPackage(pkgDir) {
+  const binaryName = process.platform === "win32" ? "workiq.exe" : "workiq";
+  const binaryPath = join16(pkgDir, "bin", workiqPlatformDir(pkgDir), binaryName);
+  if (!existsSync14(binaryPath))
+    return null;
+  ensureExecutable(binaryPath);
+  return binaryPath;
+}
+function resolveWorkIQBinary(nodeModulesPath) {
+  return resolveWorkIQBinaryInPackage(join16(nodeModulesPath, "@microsoft", "workiq"));
+}
+function isWorkIQEulaAccepted() {
+  const path3 = workiqStateFilePath();
+  if (!existsSync14(path3))
+    return false;
+  try {
+    const parsed = JSON.parse(readFileSync9(path3, "utf-8"));
+    if (typeof parsed !== "object" || parsed === null)
+      return false;
+    const obj = parsed;
+    const v = obj["I-accept-EULA"] ?? obj["i-accept-eula"] ?? obj.eulaAccepted ?? obj.eula_accepted ?? obj.acceptedEula ?? obj.eula;
+    if (typeof v === "string")
+      return v.trim().toLowerCase() === "true";
+    return v === true || v === 1;
+  } catch {
+    return false;
+  }
+}
+function findWorkIQPackageDir() {
+  const anchors = [
+    () => fileURLToPath4(import.meta.url),
+    () => createRequire2(import.meta.url).resolve("@charzhu/openjaw/package.json"),
+    () => join16(process.cwd(), "index.js")
+  ];
+  for (const getAnchor of anchors) {
+    try {
+      const req = createRequire2(getAnchor());
+      const pkgJson = req.resolve("@microsoft/workiq/package.json");
+      return dirname6(pkgJson);
+    } catch {
+    }
+  }
+  return null;
+}
+function findWorkIQBinary() {
+  const pkgDir = findWorkIQPackageDir();
+  if (pkgDir) {
+    const found = resolveWorkIQBinaryInPackage(pkgDir);
+    if (found)
+      return found;
+  }
+  for (const nm of [join16(process.cwd(), "node_modules")]) {
+    const found = resolveWorkIQBinary(nm);
+    if (found)
+      return found;
+  }
+  return null;
+}
+function runWorkIQ(binaryPath, args, stdinText, timeoutMs) {
+  return new Promise((resolve7) => {
+    const proc = spawn3(binaryPath, args, {
+      stdio: ["pipe", "pipe", "pipe"],
+      windowsHide: true,
+      timeout: timeoutMs
+    });
+    let stdout = "";
+    let stderr = "";
+    proc.stdout?.on("data", (d) => {
+      stdout += d.toString();
+    });
+    proc.stderr?.on("data", (d) => {
+      stderr += d.toString();
+    });
+    proc.on("error", (err) => {
+      resolve7({ exitCode: -1, stdout, stderr, error: err.message });
+    });
+    proc.on("close", (code) => {
+      resolve7({ exitCode: code, stdout: stdout.trim(), stderr: stderr.trim() });
+    });
+    if (stdinText !== void 0) {
+      proc.stdin?.write(stdinText.endsWith("\n") ? stdinText : stdinText + "\n");
+    }
+    proc.stdin?.end();
+  });
+}
+function createWorkIQTools(_config) {
+  return [
+    {
+      name: "workiq_ask",
+      description: 'Query Microsoft 365 work data (your emails, meetings, calendar, documents, people, projects) by asking a natural-language question. Backed by the WorkIQ CLI. Prefer this for "what/who/when" questions about your work context. First use requires accepting the WorkIQ license via workiq_accept_eula.',
+      parameters: {
+        type: "object",
+        properties: {
+          question: {
+            type: "string",
+            description: 'The natural-language question about your M365 work data, e.g. "what meetings do I have tomorrow?"'
+          },
+          timeout: {
+            type: "number",
+            description: "Timeout in milliseconds (default 120000, max 300000)."
+          }
+        },
+        required: ["question"]
+      },
+      requiresConfirmation: false,
+      execute: /* @__PURE__ */ __name(async (input) => {
+        if (!isWorkIQEulaAccepted())
+          return EULA_REFUSAL;
+        const binary = findWorkIQBinary();
+        if (!binary) {
+          return {
+            error: "WorkIQ CLI is unavailable: no @microsoft/workiq binary was found for this platform/arch. It ships as a bundled dependency \u2014 try reinstalling openjaw-mcp dependencies (`npm install`)."
+          };
+        }
+        const question = String(input.question ?? "").trim();
+        if (!question)
+          return { error: "workiq_ask requires a non-empty question." };
+        const timeout = Math.min(Number(input.timeout) || 12e4, 3e5);
+        const result = await runWorkIQ(binary, ["ask"], question, timeout);
+        if (result.error) {
+          return { error: `WorkIQ failed to run: ${result.error}`, stderr: result.stderr };
+        }
+        return {
+          answer: result.stdout,
+          ...result.stderr ? { stderr: result.stderr } : {},
+          success: result.exitCode === 0,
+          ...result.exitCode !== 0 ? { exitCode: result.exitCode } : {}
+        };
+      }, "execute")
+    },
+    {
+      name: "workiq_accept_eula",
+      description: "Accept the WorkIQ CLI license agreement (one-time, required before workiq_ask works). Runs `workiq accept-eula`; the CLI records acceptance in ~/.work-iq-cli/.workiq.json and it persists across all apps on this machine.",
+      parameters: {
+        type: "object",
+        properties: {}
+      },
+      requiresConfirmation: true,
+      execute: /* @__PURE__ */ __name(async () => {
+        const binary = findWorkIQBinary();
+        if (!binary) {
+          return {
+            error: "WorkIQ CLI is unavailable: no @microsoft/workiq binary was found for this platform/arch. It ships as a bundled dependency \u2014 try reinstalling openjaw-mcp dependencies (`npm install`)."
+          };
+        }
+        if (isWorkIQEulaAccepted()) {
+          return { accepted: true, message: "WorkIQ license was already accepted." };
+        }
+        const result = await runWorkIQ(binary, ["accept-eula"], void 0, 6e4);
+        if (result.error) {
+          return { error: `Failed to run accept-eula: ${result.error}`, stderr: result.stderr };
+        }
+        const accepted = isWorkIQEulaAccepted();
+        return {
+          accepted,
+          success: result.exitCode === 0 && accepted,
+          ...result.stdout ? { output: result.stdout } : {},
+          ...result.stderr ? { stderr: result.stderr } : {},
+          ...!accepted ? { message: "accept-eula ran but acceptance was not recorded; the user may have declined in the CLI." } : {}
+        };
+      }, "execute")
+    }
+  ];
+}
+var EULA_REFUSAL;
+var init_workiq = __esm({
+  "../openjaw-mcp/dist/tools/workiq.js"() {
+    "use strict";
+    __name(workiqStateFilePath, "workiqStateFilePath");
+    __name(workiqPlatformDir, "workiqPlatformDir");
+    __name(ensureExecutable, "ensureExecutable");
+    __name(resolveWorkIQBinaryInPackage, "resolveWorkIQBinaryInPackage");
+    __name(resolveWorkIQBinary, "resolveWorkIQBinary");
+    __name(isWorkIQEulaAccepted, "isWorkIQEulaAccepted");
+    __name(findWorkIQPackageDir, "findWorkIQPackageDir");
+    __name(findWorkIQBinary, "findWorkIQBinary");
+    __name(runWorkIQ, "runWorkIQ");
+    EULA_REFUSAL = {
+      eula_required: true,
+      message: "WorkIQ requires a one-time license agreement before first use. Call the `workiq_accept_eula` tool to accept it (the user will be asked to confirm), then retry `workiq_ask`."
+    };
+    __name(createWorkIQTools, "createWorkIQTools");
+  }
+});
+
 // ../openjaw-mcp/dist/tools/categories.js
 function categoryForTool2(toolName) {
   for (const [prefix, category] of TOOL_PREFIX_MAP) {
@@ -20282,12 +21196,16 @@ var init_categories = __esm({
     init_memory();
     init_office();
     init_wechat();
+    init_workiq();
     TOOL_CATEGORIES = {
       browser: /* @__PURE__ */ __name((config, browser) => createBrowseTools(config, browser), "browser"),
       email: /* @__PURE__ */ __name((config, browser) => createEmailTools(config, browser), "email"),
       teams: /* @__PURE__ */ __name((config, browser) => createChatTools(config, browser), "teams"),
       files: /* @__PURE__ */ __name((config) => createFileTools(config), "files"),
-      system: /* @__PURE__ */ __name((config, _browser, hooks) => createShellTools(config, hooks), "system"),
+      // WorkIQ CLI tools (M365 natural-language query) ride the always-loaded
+      // `system` category alongside shell tools — no separate profile wiring,
+      // and they auth themselves so there's nothing to gate at load time.
+      system: /* @__PURE__ */ __name((config, _browser, hooks) => [...createShellTools(config, hooks), ...createWorkIQTools(config)], "system"),
       memory: /* @__PURE__ */ __name((config) => createMemoryTools(config), "memory"),
       office: /* @__PURE__ */ __name((config) => createOfficeTools(config), "office"),
       wechat: /* @__PURE__ */ __name((config) => createWeChatTools(config), "wechat")
@@ -20325,6 +21243,7 @@ var init_categories = __esm({
       ["sleep", "system"],
       ["ask_user", "system"],
       ["config", "system"],
+      ["workiq_", "system"],
       ["todo_write", "memory"]
     ];
     __name(categoryForTool2, "categoryForTool");
@@ -20593,11 +21512,11 @@ var init_registry = __esm({
 });
 
 // src/prompts/identity.ts
-import { readFileSync as readFileSync9 } from "node:fs";
-import { join as join16 } from "node:path";
+import { readFileSync as readFileSync10 } from "node:fs";
+import { join as join17 } from "node:path";
 function getIdentitySection() {
   if (cached2 === void 0) {
-    cached2 = readFileSync9(join16(packagePromptsDir(), "IDENTITY.md"), "utf8");
+    cached2 = readFileSync10(join17(packagePromptsDir(), "IDENTITY.md"), "utf8");
   }
   return cached2;
 }
@@ -20611,11 +21530,11 @@ var init_identity = __esm({
 });
 
 // src/prompts/reasoning.ts
-import { readFileSync as readFileSync10 } from "node:fs";
-import { join as join17 } from "node:path";
+import { readFileSync as readFileSync11 } from "node:fs";
+import { join as join18 } from "node:path";
 function getReasoningSection() {
   if (cached3 === void 0) {
-    cached3 = readFileSync10(join17(packagePromptsDir(), "REASONING.md"), "utf8");
+    cached3 = readFileSync11(join18(packagePromptsDir(), "REASONING.md"), "utf8");
   }
   return cached3;
 }
@@ -20629,11 +21548,11 @@ var init_reasoning = __esm({
 });
 
 // src/prompts/safety.ts
-import { readFileSync as readFileSync11 } from "node:fs";
-import { join as join18 } from "node:path";
+import { readFileSync as readFileSync12 } from "node:fs";
+import { join as join19 } from "node:path";
 function getSafetySection() {
   if (cached4 === void 0) {
-    cached4 = readFileSync11(join18(packagePromptsDir(), "SAFETY.md"), "utf8");
+    cached4 = readFileSync12(join19(packagePromptsDir(), "SAFETY.md"), "utf8");
   }
   return cached4;
 }
@@ -20647,11 +21566,11 @@ var init_safety = __esm({
 });
 
 // src/prompts/computerUse.ts
-import { readFileSync as readFileSync12 } from "node:fs";
-import { join as join19 } from "node:path";
+import { readFileSync as readFileSync13 } from "node:fs";
+import { join as join20 } from "node:path";
 function getComputerUseSection() {
   if (cached5 === void 0) {
-    cached5 = readFileSync12(join19(packagePromptsDir(), "COMPUTER_USE.md"), "utf8");
+    cached5 = readFileSync13(join20(packagePromptsDir(), "COMPUTER_USE.md"), "utf8");
   }
   return cached5;
 }
@@ -20665,19 +21584,19 @@ var init_computerUse = __esm({
 });
 
 // src/prompts/user.ts
-import { readFileSync as readFileSync13, existsSync as existsSync13, writeFileSync as writeFileSync9, mkdirSync as mkdirSync10 } from "node:fs";
-import { join as join20 } from "node:path";
-import { homedir as homedir10 } from "node:os";
+import { readFileSync as readFileSync14, existsSync as existsSync15, writeFileSync as writeFileSync9, mkdirSync as mkdirSync10 } from "node:fs";
+import { join as join21 } from "node:path";
+import { homedir as homedir11 } from "node:os";
 function getUserSection() {
   if (cached6 === void 0) {
-    if (!existsSync13(userOverridePath)) {
-      const bundledPath = join20(packagePromptsDir(), "USER.md");
-      if (existsSync13(bundledPath)) {
-        if (!existsSync13(configDir)) mkdirSync10(configDir, { recursive: true });
-        writeFileSync9(userOverridePath, readFileSync13(bundledPath, "utf8"), "utf8");
+    if (!existsSync15(userOverridePath)) {
+      const bundledPath = join21(packagePromptsDir(), "USER.md");
+      if (existsSync15(bundledPath)) {
+        if (!existsSync15(configDir)) mkdirSync10(configDir, { recursive: true });
+        writeFileSync9(userOverridePath, readFileSync14(bundledPath, "utf8"), "utf8");
       }
     }
-    cached6 = existsSync13(userOverridePath) ? readFileSync13(userOverridePath, "utf8") : null;
+    cached6 = existsSync15(userOverridePath) ? readFileSync14(userOverridePath, "utf8") : null;
   }
   return cached6;
 }
@@ -20686,8 +21605,8 @@ var init_user = __esm({
   "src/prompts/user.ts"() {
     "use strict";
     init_packageRoot();
-    configDir = join20(homedir10(), ".openjaw-agent");
-    userOverridePath = join20(configDir, "USER.md");
+    configDir = join21(homedir11(), ".openjaw-agent");
+    userOverridePath = join21(configDir, "USER.md");
     __name(getUserSection, "getUserSection");
   }
 });
@@ -20699,8 +21618,8 @@ __export(memory_exports, {
   setMemoryPrefetchQuery: () => setMemoryPrefetchQuery,
   shouldSkipPrefetch: () => shouldSkipPrefetch
 });
-import { join as join21 } from "node:path";
-import { homedir as homedir11 } from "node:os";
+import { join as join22 } from "node:path";
+import { homedir as homedir12 } from "node:os";
 function setMemoryPrefetchQuery(query) {
   currentQuery = query;
 }
@@ -20751,7 +21670,7 @@ function getMemorySection() {
   if (shouldSkipPrefetch(currentQuery)) return null;
   try {
     const { DatabaseSync: DatabaseSync2 } = __require("node:sqlite");
-    const dbPath = join21(homedir11(), ".openjaw", "memory.db");
+    const dbPath = join22(homedir12(), ".openjaw", "memory.db");
     let db2;
     try {
       db2 = new DatabaseSync2(dbPath, { readOnly: true });
@@ -20966,9 +21885,9 @@ var init_frontmatter = __esm({
 });
 
 // src/skills/registry.ts
-import { existsSync as existsSync14, readFileSync as readFileSync14, readdirSync as readdirSync2, statSync } from "node:fs";
-import { join as join22 } from "node:path";
-import { homedir as homedir12 } from "node:os";
+import { existsSync as existsSync16, readFileSync as readFileSync15, readdirSync as readdirSync2, statSync } from "node:fs";
+import { join as join23 } from "node:path";
+import { homedir as homedir13 } from "node:os";
 function skillRoots() {
   return rootsOverride ?? { bundledDir: packageSkillsDir(), userDir: DEFAULT_USER_DIR };
 }
@@ -20988,7 +21907,7 @@ function loadSkillBody(skillName) {
   const skill = findSkill(skillName);
   if (!skill) return null;
   try {
-    const content = readFileSync14(skill.filePath, "utf-8").trim();
+    const content = readFileSync15(skill.filePath, "utf-8").trim();
     const parsed = parseSkillFile(content, `${skill.name}.md`);
     return parsed.body;
   } catch {
@@ -21044,7 +21963,7 @@ function normalizeSkillName(name) {
 function loadFlatSkillsFromDir(dir2, source, priority, out) {
   for (const entry of safeReadDir(dir2)) {
     if (!entry.isFile() || !isMarkdown(entry.name)) continue;
-    const filePath = join22(dir2, entry.name);
+    const filePath = join23(dir2, entry.name);
     const skill = parseSkillAtPath(filePath, dir2, entry.name, source, entry.name);
     if (skill) putSkill(out, skill, priority);
   }
@@ -21052,10 +21971,10 @@ function loadFlatSkillsFromDir(dir2, source, priority, out) {
 function loadPackagedSkillsFromDir(dir2, out) {
   for (const entry of safeReadDir(dir2)) {
     if (!entry.isDirectory()) continue;
-    const rootDir2 = join22(dir2, entry.name);
+    const rootDir2 = join23(dir2, entry.name);
     const entrypoint = findPackageEntrypoint(rootDir2);
     if (!entrypoint) continue;
-    const filePath = join22(rootDir2, entrypoint);
+    const filePath = join23(rootDir2, entrypoint);
     const skill = parseSkillAtPath(filePath, rootDir2, entrypoint, "user", `${entry.name}.md`);
     if (skill) putSkill(out, skill, 2);
   }
@@ -21071,7 +21990,7 @@ function findPackageEntrypoint(dir2) {
 }
 function parseSkillAtPath(filePath, rootDir2, entrypoint, source, fallbackFilename) {
   try {
-    const content = readFileSync14(filePath, "utf-8").trim();
+    const content = readFileSync15(filePath, "utf-8").trim();
     if (!content) return null;
     const parsed = parseSkillFile(content, fallbackFilename);
     const name = normalizeSkillName(parsed.meta.name);
@@ -21096,7 +22015,7 @@ function putSkill(out, skill, priority) {
   }
 }
 function safeReadDir(dir2) {
-  if (!existsSync14(dir2)) return [];
+  if (!existsSync16(dir2)) return [];
   try {
     return readdirSync2(dir2, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name));
   } catch {
@@ -21108,11 +22027,11 @@ function buildRegistrySignature() {
   return [signatureForDir(roots.bundledDir), signatureForDir(roots.userDir)].join("|");
 }
 function signatureForDir(dir2) {
-  if (!existsSync14(dir2)) return `${dir2}:missing`;
+  if (!existsSync16(dir2)) return `${dir2}:missing`;
   const parts = [];
   try {
     for (const entry of safeReadDir(dir2)) {
-      const fullPath = join22(dir2, entry.name);
+      const fullPath = join23(dir2, entry.name);
       if (entry.isFile()) {
         if (!isMarkdown(entry.name)) continue;
         parts.push(fileSignature(fullPath, `f:${entry.name}`));
@@ -21120,7 +22039,7 @@ function signatureForDir(dir2) {
         parts.push(fileSignature(fullPath, `d:${entry.name}`));
         for (const child of safeReadDir(fullPath)) {
           if (child.isFile() && isMarkdown(child.name)) {
-            parts.push(fileSignature(join22(fullPath, child.name), `d:${entry.name}/${child.name}`));
+            parts.push(fileSignature(join23(fullPath, child.name), `d:${entry.name}/${child.name}`));
           }
         }
       }
@@ -21147,7 +22066,7 @@ var init_registry2 = __esm({
     "use strict";
     init_frontmatter();
     init_packageRoot();
-    DEFAULT_USER_DIR = join22(homedir12(), ".openjaw-agent", "skills");
+    DEFAULT_USER_DIR = join23(homedir13(), ".openjaw-agent", "skills");
     ENTRYPOINT_NAMES = ["SKILL.md", "skill.md"];
     cachedSkills = null;
     rootsOverride = null;
@@ -21213,9 +22132,9 @@ __export(context_exports, {
   getContextSection: () => getContextSection,
   setActiveBridges: () => setActiveBridges
 });
-import { existsSync as existsSync15, readFileSync as readFileSync15, readdirSync as readdirSync3 } from "node:fs";
+import { existsSync as existsSync17, readFileSync as readFileSync16, readdirSync as readdirSync3 } from "node:fs";
 import { execSync as execSync4 } from "node:child_process";
-import { join as join23 } from "node:path";
+import { join as join24 } from "node:path";
 function detectProjectInfo() {
   const cwd = process.cwd();
   const lines = [];
@@ -21229,9 +22148,9 @@ function detectProjectInfo() {
   } catch {
   }
   try {
-    const pkgPath = join23(cwd, "package.json");
-    if (existsSync15(pkgPath)) {
-      const pkg = JSON.parse(readFileSync15(pkgPath, "utf8"));
+    const pkgPath = join24(cwd, "package.json");
+    if (existsSync17(pkgPath)) {
+      const pkg = JSON.parse(readFileSync16(pkgPath, "utf8"));
       const name = pkg.name || "unknown";
       const desc = pkg.description ? ` \u2014 ${pkg.description}`.slice(0, 120) : "";
       lines.push(`- Project: ${name}${desc}`);
@@ -21255,7 +22174,7 @@ function detectProjectInfo() {
     ["package.json", "JavaScript"]
   ];
   for (const [file2, lang] of indicators) {
-    if (existsSync15(join23(cwd, file2))) {
+    if (existsSync17(join24(cwd, file2))) {
       lines.push(`- Language: ${lang} (${file2})`);
       break;
     }
@@ -21269,9 +22188,9 @@ function detectProjectInfo() {
   } catch {
   }
   try {
-    const readmePath = join23(cwd, "README.md");
-    if (existsSync15(readmePath)) {
-      let content = readFileSync15(readmePath, "utf8").slice(0, 500).replace(/\r?\n/g, " ").trim();
+    const readmePath = join24(cwd, "README.md");
+    if (existsSync17(readmePath)) {
+      let content = readFileSync16(readmePath, "utf8").slice(0, 500).replace(/\r?\n/g, " ").trim();
       if (content.length > 300) content = content.slice(0, 297) + "...";
       if (content) lines.push(`- README: ${content}`);
     }
@@ -21380,6 +22299,30 @@ var init_mcp = __esm({
   }
 });
 
+// src/prompts/workiq.ts
+function getWorkIQSection() {
+  if (cached7 === void 0) {
+    cached7 = [
+      "## Microsoft 365 work data (WorkIQ)",
+      "",
+      'You can answer questions about the user\'s work context \u2014 their emails, meetings, calendar, documents, people, and projects \u2014 using the `workiq_ask` tool. Pass a natural-language question (e.g. "what meetings do I have tomorrow?", "summarize my unread email from Alice") and it returns an answer from the WorkIQ CLI.',
+      "",
+      "Guidance:",
+      "- Prefer `workiq_ask` over web search or guessing when the user asks about *their own* work data (meetings, emails, documents, people, projects).",
+      "- First use requires a one-time license acceptance. If `workiq_ask` returns `eula_required`, call `workiq_accept_eula` (the user will be asked to confirm) and then retry the original question.",
+      "- `workiq_ask` signs the user in on first use via the system account; you do not need to handle authentication."
+    ].join("\n");
+  }
+  return cached7;
+}
+var cached7;
+var init_workiq2 = __esm({
+  "src/prompts/workiq.ts"() {
+    "use strict";
+    __name(getWorkIQSection, "getWorkIQSection");
+  }
+});
+
 // src/prompts/index.ts
 var prompts_exports = {};
 __export(prompts_exports, {
@@ -21408,6 +22351,7 @@ var init_prompts = __esm({
     init_skills();
     init_context();
     init_mcp();
+    init_workiq2();
     init_sections();
     buildSections = /* @__PURE__ */ __name((opts = {}) => [
       // Static sections (cached across calls)
@@ -21415,6 +22359,7 @@ var init_prompts = __esm({
       systemPromptSection("reasoning", () => getReasoningSection()),
       systemPromptSection("safety", () => getSafetySection()),
       systemPromptSection("computerUse", () => getComputerUseSection()),
+      systemPromptSection("workiq", () => getWorkIQSection()),
       // Dynamic boundary marker
       systemPromptSection("boundary", () => SYSTEM_PROMPT_DYNAMIC_BOUNDARY),
       // Dynamic sections (memoized within a resolve cycle via section cache)
@@ -21534,9 +22479,9 @@ __export(telegram_exports, {
   TelegramBridge: () => TelegramBridge
 });
 import TelegramBot from "node-telegram-bot-api";
-import { writeFileSync as writeFileSync10, unlinkSync as unlinkSync3, existsSync as existsSync16 } from "node:fs";
-import { join as join24 } from "node:path";
-import { tmpdir as tmpdir4, homedir as homedir13 } from "node:os";
+import { writeFileSync as writeFileSync10, unlinkSync as unlinkSync4, existsSync as existsSync18 } from "node:fs";
+import { join as join25 } from "node:path";
+import { tmpdir as tmpdir4, homedir as homedir14 } from "node:os";
 import { randomUUID as randomUUID4 } from "node:crypto";
 var MAX_TELEGRAM_MSG, MIME_TYPES, TelegramBridge;
 var init_telegram = __esm({
@@ -21737,12 +22682,12 @@ var init_telegram = __esm({
 Options: ${chunk.choices.join(" | ")}` : "";
                   await this.bot.sendMessage(chatId, `\u2753 ${question}${choicesText}`);
                   updateStatus("\u2753 Waiting for your response...");
-                  const userReply = await new Promise((resolve6) => {
-                    this._pendingReplyResolver = resolve6;
+                  const userReply = await new Promise((resolve7) => {
+                    this._pendingReplyResolver = resolve7;
                     setTimeout(() => {
-                      if (this._pendingReplyResolver === resolve6) {
+                      if (this._pendingReplyResolver === resolve7) {
                         this._pendingReplyResolver = null;
-                        resolve6("[No response \u2014 timed out]");
+                        resolve7("[No response \u2014 timed out]");
                       }
                     }, 5 * 60 * 1e3);
                   });
@@ -21779,7 +22724,7 @@ Options: ${chunk.choices.join(" | ")}` : "";
         try {
           const fileId = voice.file_id;
           const filePath = await this.bot.getFileLink(fileId);
-          const tempFile = join24(tmpdir4(), `oj-tg-voice-${randomUUID4().slice(0, 8)}.ogg`);
+          const tempFile = join25(tmpdir4(), `oj-tg-voice-${randomUUID4().slice(0, 8)}.ogg`);
           const response = await fetch(filePath);
           const buffer = Buffer.from(await response.arrayBuffer());
           writeFileSync10(tempFile, buffer);
@@ -21795,7 +22740,7 @@ Options: ${chunk.choices.join(" | ")}` : "";
             transcription = "[Could not transcribe voice message. Please type your message instead.]";
           }
           try {
-            if (existsSync16(tempFile)) unlinkSync3(tempFile);
+            if (existsSync18(tempFile)) unlinkSync4(tempFile);
           } catch {
           }
           if (transcription.startsWith("[")) {
@@ -21853,7 +22798,7 @@ Options: ${chunk.choices.join(" | ")}` : "";
           const response = await fetch(filePath);
           const buffer = Buffer.from(await response.arrayBuffer());
           const ext = fileName.includes(".") ? "." + fileName.split(".").pop() : "";
-          const tempPath = join24(tmpdir4(), `oj-tg-doc-${randomUUID4().slice(0, 8)}${ext}`);
+          const tempPath = join25(tmpdir4(), `oj-tg-doc-${randomUUID4().slice(0, 8)}${ext}`);
           writeFileSync10(tempPath, buffer);
           const text = caption || `I've sent you a file: ${fileName}. It's saved at ${tempPath}. Please analyze it.`;
           const fullText = `${text}
@@ -21861,7 +22806,7 @@ Options: ${chunk.choices.join(" | ")}` : "";
 [File received: ${fileName} (${buffer.length} bytes), saved to: ${tempPath}]`;
           await this.handleText(chatId, fullText);
           try {
-            if (existsSync16(tempPath)) unlinkSync3(tempPath);
+            if (existsSync18(tempPath)) unlinkSync4(tempPath);
           } catch {
           }
         } catch {
@@ -21887,12 +22832,12 @@ Options: ${chunk.choices.join(" | ")}` : "";
           let match;
           while ((match = pattern.exec(normalized)) !== null) {
             const filePath = match[1];
-            const resolvedPath = filePath.startsWith("~") ? join24(homedir13(), filePath.slice(1)) : filePath;
+            const resolvedPath = filePath.startsWith("~") ? join25(homedir14(), filePath.slice(1)) : filePath;
             if (sentFiles.has(resolvedPath)) continue;
             if (filePath.includes("http") || filePath.includes("node_modules")) continue;
             const fileName = filePath.split(/[\\/]/).pop() || "";
             if (fileName.startsWith("oj-") || fileName.endsWith(".log") || fileName.endsWith(".tmp")) continue;
-            if (existsSync16(resolvedPath)) {
+            if (existsSync18(resolvedPath)) {
               try {
                 const { statSync: statSync5 } = await import("node:fs");
                 const stat2 = statSync5(resolvedPath);
@@ -22056,26 +23001,27 @@ var init_meta = __esm({
 // src/mcp-client.ts
 var mcp_client_exports = {};
 __export(mcp_client_exports, {
-  MCPClientManager: () => MCPClientManager
+  MCPClientManager: () => MCPClientManager,
+  restoreStdinAfterReadlinePrompt: () => restoreStdinAfterReadlinePrompt
 });
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
-import { existsSync as existsSync17, readFileSync as readFileSync17, readdirSync as readdirSync4, writeFileSync as writeFileSync11, mkdirSync as mkdirSync11 } from "node:fs";
-import { join as join25, dirname as dirname5, resolve } from "node:path";
-import { homedir as homedir14 } from "node:os";
+import { existsSync as existsSync19, readFileSync as readFileSync18, readdirSync as readdirSync4, writeFileSync as writeFileSync11, mkdirSync as mkdirSync11 } from "node:fs";
+import { join as join26, dirname as dirname7, resolve as resolve2 } from "node:path";
+import { homedir as homedir15 } from "node:os";
 import { execSync as execSync5 } from "node:child_process";
 import { EventEmitter } from "node:events";
 import * as readline from "node:readline";
 function findCopilotOAuthToken(serverUrl) {
-  if (!existsSync17(COPILOT_OAUTH_DIR)) return null;
+  if (!existsSync19(COPILOT_OAUTH_DIR)) return null;
   try {
     const files = readdirSync4(COPILOT_OAUTH_DIR).filter((f) => f.endsWith(".tokens.json"));
     for (const file2 of files) {
-      const filePath = join25(COPILOT_OAUTH_DIR, file2);
+      const filePath = join26(COPILOT_OAUTH_DIR, file2);
       try {
-        const data = JSON.parse(readFileSync17(filePath, "utf-8"));
+        const data = JSON.parse(readFileSync18(filePath, "utf-8"));
         if (data.scope && data.accessToken) {
           const urlDomain = new URL(serverUrl).hostname;
           if (data.scope.includes(urlDomain)) {
@@ -22091,18 +23037,18 @@ function findCopilotOAuthToken(serverUrl) {
 }
 function refreshCopilotToken(refreshToken, tokenFilePath) {
   try {
-    const existing = JSON.parse(readFileSync17(tokenFilePath, "utf-8"));
+    const existing = JSON.parse(readFileSync18(tokenFilePath, "utf-8"));
     const jwtParts = existing.accessToken.split(".");
     if (jwtParts.length < 2) return null;
     const padded = jwtParts[1] + "=".repeat(4 - jwtParts[1].length % 4);
     const claims = JSON.parse(Buffer.from(padded, "base64").toString("utf-8"));
-    const clientId = claims.azp;
+    const clientId2 = claims.azp;
     const tid = claims.tid;
     const aud = claims.aud;
-    if (!clientId || !tid || !aud) return null;
+    if (!clientId2 || !tid || !aud) return null;
     const scope = `${aud}/.default offline_access`;
     const bodyParams = [
-      `client_id=${clientId}`,
+      `client_id=${clientId2}`,
       `grant_type=refresh_token`,
       `refresh_token=${encodeURIComponent(refreshToken)}`,
       `scope=${encodeURIComponent(scope)}`
@@ -22162,7 +23108,7 @@ function discoverAllConfigs(cwd) {
   for (const { name: pluginName, servers } of pluginConfigs) {
     addServers(servers, `~/.copilot/.../plugins/${pluginName}/.mcp.json`, "plugin", false);
   }
-  const vscodeConfig = readVSCodeMcpConfig(join25(cwd, ".vscode", "mcp.json"), cwd);
+  const vscodeConfig = readVSCodeMcpConfig(join26(cwd, ".vscode", "mcp.json"), cwd);
   if (vscodeConfig) {
     addServers(vscodeConfig, ".vscode/mcp.json", "vscode", false);
   }
@@ -22173,18 +23119,18 @@ function discoverAllConfigs(cwd) {
   return result;
 }
 function readMcpConfig(filePath) {
-  if (!existsSync17(filePath)) return null;
+  if (!existsSync19(filePath)) return null;
   try {
-    const raw = JSON.parse(readFileSync17(filePath, "utf-8"));
+    const raw = JSON.parse(readFileSync18(filePath, "utf-8"));
     return raw.mcpServers || null;
   } catch {
     return null;
   }
 }
 function readVSCodeMcpConfig(filePath, cwd) {
-  if (!existsSync17(filePath)) return null;
+  if (!existsSync19(filePath)) return null;
   try {
-    const raw = JSON.parse(readFileSync17(filePath, "utf-8"));
+    const raw = JSON.parse(readFileSync18(filePath, "utf-8"));
     const servers = raw.servers;
     if (!servers || typeof servers !== "object") return null;
     const result = {};
@@ -22205,10 +23151,10 @@ function readVSCodeMcpConfig(filePath, cwd) {
 }
 function walkParentsForMcpJson(startDir) {
   const results = [];
-  let dir2 = resolve(startDir);
-  const root = dirname5(dir2) === dir2 ? dir2 : "";
+  let dir2 = resolve2(startDir);
+  const root = dirname7(dir2) === dir2 ? dir2 : "";
   while (dir2 && dir2 !== root) {
-    const filePath = join25(dir2, ".mcp.json");
+    const filePath = join26(dir2, ".mcp.json");
     const config = readMcpConfig(filePath);
     if (config) {
       const filtered = {};
@@ -22219,20 +23165,20 @@ function walkParentsForMcpJson(startDir) {
         results.push({ path: filePath, servers: filtered });
       }
     }
-    const parent = dirname5(dir2);
+    const parent = dirname7(dir2);
     if (parent === dir2) break;
     dir2 = parent;
   }
   return results;
 }
 function discoverCopilotPlugins() {
-  if (!existsSync17(COPILOT_PLUGINS_DIR)) return [];
+  if (!existsSync19(COPILOT_PLUGINS_DIR)) return [];
   const results = [];
   try {
     const entries = readdirSync4(COPILOT_PLUGINS_DIR, { withFileTypes: true });
     for (const entry of entries) {
       if (!entry.isDirectory()) continue;
-      const mcpPath = join25(COPILOT_PLUGINS_DIR, entry.name, ".mcp.json");
+      const mcpPath = join26(COPILOT_PLUGINS_DIR, entry.name, ".mcp.json");
       const config = readMcpConfig(mcpPath);
       if (config) {
         const filtered = {};
@@ -22249,9 +23195,9 @@ function discoverCopilotPlugins() {
   return results;
 }
 function discoverAgencyBuiltins() {
-  if (!existsSync17(AGENCY_CONFIG) || !existsSync17(AGENCY_EXE)) return {};
+  if (!existsSync19(AGENCY_CONFIG) || !existsSync19(AGENCY_EXE)) return {};
   try {
-    const content = readFileSync17(AGENCY_CONFIG, "utf-8");
+    const content = readFileSync18(AGENCY_CONFIG, "utf-8");
     const result = {};
     const builtinsMatch = content.match(/\[mcps\.builtins\]([\s\S]*?)(?=\n\[|$)/);
     if (!builtinsMatch) return {};
@@ -22319,17 +23265,17 @@ function truncateDescription(desc, maxLen) {
   return desc.slice(0, maxLen - 3) + "...";
 }
 function loadConsent() {
-  if (!existsSync17(OJ_CONSENT_FILE)) {
+  if (!existsSync19(OJ_CONSENT_FILE)) {
     return { approved: [], denied: [] };
   }
   try {
-    return JSON.parse(readFileSync17(OJ_CONSENT_FILE, "utf-8"));
+    return JSON.parse(readFileSync18(OJ_CONSENT_FILE, "utf-8"));
   } catch {
     return { approved: [], denied: [] };
   }
 }
 function saveConsent(data) {
-  if (!existsSync17(OJ_AGENT_DIR)) {
+  if (!existsSync19(OJ_AGENT_DIR)) {
     mkdirSync11(OJ_AGENT_DIR, { recursive: true });
   }
   writeFileSync11(OJ_CONSENT_FILE, JSON.stringify(data, null, 2) + "\n", "utf-8");
@@ -22340,66 +23286,82 @@ async function promptConsent(servers) {
     input: process.stdin,
     output: process.stderr
   });
-  const ask = /* @__PURE__ */ __name((question) => new Promise((resolve6) => rl.question(question, resolve6)), "ask");
-  const w = process.stderr.columns || 80;
-  const inner = w - 4;
-  const hLine = "\u2500".repeat(inner);
-  const pad = /* @__PURE__ */ __name((s, len) => s + " ".repeat(Math.max(0, len - stripAnsi(s).length)), "pad");
-  console.error("");
-  console.error(`  \x1B[36m\u256D${hLine}\u256E\x1B[0m`);
-  console.error(`  \x1B[36m\u2502\x1B[0m ${pad("\x1B[36m\x1B[1m\u{1F50C} New MCP Servers Discovered\x1B[0m", inner - 1)}\x1B[36m\u2502\x1B[0m`);
-  console.error(`  \x1B[36m\u251C${hLine}\u2524\x1B[0m`);
-  const bySource = /* @__PURE__ */ new Map();
-  for (const s of servers) {
-    const list = bySource.get(s.source) || [];
-    list.push(s);
-    bySource.set(s.source, list);
-  }
-  for (const [source, sourceServers] of bySource) {
-    const srcLine = `\x1B[2m  From ${source}\x1B[0m`;
-    console.error(`  \x1B[36m\u2502\x1B[0m ${pad(srcLine, inner - 1)}\x1B[36m\u2502\x1B[0m`);
-    for (const s of sourceServers) {
-      const cmdParts = [s.def.command, ...(s.def.args || []).slice(0, 2)];
-      const cmdStr = cmdParts.join(" ");
-      const truncCmd = cmdStr.length > inner - s.name.length - 12 ? cmdStr.slice(0, inner - s.name.length - 15) + "..." : cmdStr;
-      const serverLine = `  \x1B[33m\u25CB\x1B[0m \x1B[1m${s.name}\x1B[0m \x1B[2m${truncCmd}\x1B[0m`;
-      console.error(`  \x1B[36m\u2502\x1B[0m ${pad(serverLine, inner - 1)}\x1B[36m\u2502\x1B[0m`);
-    }
-    console.error(`  \x1B[36m\u2502\x1B[0m ${" ".repeat(inner - 1)}\x1B[36m\u2502\x1B[0m`);
-  }
-  console.error(`  \x1B[36m\u251C${hLine}\u2524\x1B[0m`);
-  console.error(`  \x1B[36m\u2502\x1B[0m ${pad("\x1B[2m  Y = enable all  \xB7  N = skip all  \xB7  S = select individually\x1B[0m", inner - 1)}\x1B[36m\u2502\x1B[0m`);
-  console.error(`  \x1B[36m\u2570${hLine}\u256F\x1B[0m`);
-  console.error("");
-  const answer = await ask("  \x1B[36m\u276F\x1B[0m Enable these servers? \x1B[2m(Y/n/s)\x1B[0m: ");
-  const trimmed = answer.trim().toLowerCase();
-  let approved;
-  if (trimmed === "" || trimmed === "y" || trimmed === "yes") {
-    approved = servers.map((s) => s.name);
-    console.error(`  \x1B[32m\u25CF All ${approved.length} servers enabled\x1B[0m`);
-  } else if (trimmed === "n" || trimmed === "no") {
-    approved = [];
-    console.error(`  \x1B[33m\u25CB All servers skipped\x1B[0m`);
-  } else if (trimmed === "s" || trimmed === "select") {
-    approved = [];
+  try {
+    const ask = /* @__PURE__ */ __name((question) => new Promise((resolve7) => rl.question(question, resolve7)), "ask");
+    const w = process.stderr.columns || 80;
+    const inner = w - 4;
+    const hLine = "\u2500".repeat(inner);
+    const pad = /* @__PURE__ */ __name((s, len) => s + " ".repeat(Math.max(0, len - stripAnsi(s).length)), "pad");
     console.error("");
+    console.error(`  \x1B[36m\u256D${hLine}\u256E\x1B[0m`);
+    console.error(`  \x1B[36m\u2502\x1B[0m ${pad("\x1B[36m\x1B[1m\u{1F50C} New MCP Servers Discovered\x1B[0m", inner - 1)}\x1B[36m\u2502\x1B[0m`);
+    console.error(`  \x1B[36m\u251C${hLine}\u2524\x1B[0m`);
+    const bySource = /* @__PURE__ */ new Map();
     for (const s of servers) {
-      const a = await ask(`  \x1B[36m\u276F\x1B[0m Enable \x1B[33m\x1B[1m${s.name}\x1B[0m? \x1B[2m(y/N)\x1B[0m: `);
-      if (a.trim().toLowerCase() === "y" || a.trim().toLowerCase() === "yes") {
-        approved.push(s.name);
-        console.error(`    \x1B[32m\u25CF ${s.name} enabled\x1B[0m`);
-      } else {
-        console.error(`    \x1B[2m\u25CB ${s.name} skipped\x1B[0m`);
+      const list = bySource.get(s.source) || [];
+      list.push(s);
+      bySource.set(s.source, list);
+    }
+    for (const [source, sourceServers] of bySource) {
+      const srcLine = `\x1B[2m  From ${source}\x1B[0m`;
+      console.error(`  \x1B[36m\u2502\x1B[0m ${pad(srcLine, inner - 1)}\x1B[36m\u2502\x1B[0m`);
+      for (const s of sourceServers) {
+        const cmdParts = [s.def.command, ...(s.def.args || []).slice(0, 2)];
+        const cmdStr = cmdParts.join(" ");
+        const truncCmd = cmdStr.length > inner - s.name.length - 12 ? cmdStr.slice(0, inner - s.name.length - 15) + "..." : cmdStr;
+        const serverLine = `  \x1B[33m\u25CB\x1B[0m \x1B[1m${s.name}\x1B[0m \x1B[2m${truncCmd}\x1B[0m`;
+        console.error(`  \x1B[36m\u2502\x1B[0m ${pad(serverLine, inner - 1)}\x1B[36m\u2502\x1B[0m`);
+      }
+      console.error(`  \x1B[36m\u2502\x1B[0m ${" ".repeat(inner - 1)}\x1B[36m\u2502\x1B[0m`);
+    }
+    console.error(`  \x1B[36m\u251C${hLine}\u2524\x1B[0m`);
+    console.error(`  \x1B[36m\u2502\x1B[0m ${pad("\x1B[2m  Y = enable all  \xB7  N = skip all  \xB7  S = select individually\x1B[0m", inner - 1)}\x1B[36m\u2502\x1B[0m`);
+    console.error(`  \x1B[36m\u2570${hLine}\u256F\x1B[0m`);
+    console.error("");
+    const answer = await ask("  \x1B[36m\u276F\x1B[0m Enable these servers? \x1B[2m(Y/n/s)\x1B[0m: ");
+    const trimmed = answer.trim().toLowerCase();
+    let approved;
+    if (trimmed === "" || trimmed === "y" || trimmed === "yes") {
+      approved = servers.map((s) => s.name);
+      console.error(`  \x1B[32m\u25CF All ${approved.length} servers enabled\x1B[0m`);
+    } else if (trimmed === "n" || trimmed === "no") {
+      approved = [];
+      console.error(`  \x1B[33m\u25CB All servers skipped\x1B[0m`);
+    } else if (trimmed === "s" || trimmed === "select") {
+      approved = [];
+      console.error("");
+      for (const s of servers) {
+        const a = await ask(`  \x1B[36m\u276F\x1B[0m Enable \x1B[33m\x1B[1m${s.name}\x1B[0m? \x1B[2m(y/N)\x1B[0m: `);
+        if (a.trim().toLowerCase() === "y" || a.trim().toLowerCase() === "yes") {
+          approved.push(s.name);
+          console.error(`    \x1B[32m\u25CF ${s.name} enabled\x1B[0m`);
+        } else {
+          console.error(`    \x1B[2m\u25CB ${s.name} skipped\x1B[0m`);
+        }
       }
-    }
-    console.error(`
+      console.error(`
   \x1B[32m${approved.length}/${servers.length} servers enabled\x1B[0m`);
-  } else {
-    approved = servers.map((s) => s.name);
+    } else {
+      approved = servers.map((s) => s.name);
+    }
+    console.error("");
+    return approved;
+  } finally {
+    rl.close();
+    restoreStdinAfterReadlinePrompt();
+  }
+}
+function restoreStdinAfterReadlinePrompt(input = process.stdin) {
+  try {
+    if (input.isTTY && input.setRawMode) {
+      input.setRawMode(false);
+    }
+  } catch {
+  }
+  try {
+    input.pause();
+  } catch {
   }
-  console.error("");
-  rl.close();
-  return approved;
 }
 function stripAnsi(str) {
   return str.replace(/\x1b\[[0-9;]*m/g, "");
@@ -22408,14 +23370,14 @@ var OJ_AGENT_DIR, OJ_MCP_CONFIG, OJ_CONSENT_FILE, COPILOT_MCP_CONFIG, COPILOT_PL
 var init_mcp_client = __esm({
   "src/mcp-client.ts"() {
     "use strict";
-    OJ_AGENT_DIR = join25(homedir14(), ".openjaw-agent");
-    OJ_MCP_CONFIG = join25(OJ_AGENT_DIR, "mcp.json");
-    OJ_CONSENT_FILE = join25(OJ_AGENT_DIR, "mcp-consent.json");
-    COPILOT_MCP_CONFIG = join25(homedir14(), ".copilot", "mcp-config.json");
-    COPILOT_PLUGINS_DIR = join25(homedir14(), ".copilot", "installed-plugins", "copilot-plugins");
-    COPILOT_OAUTH_DIR = join25(homedir14(), ".copilot", "mcp-oauth-config");
-    AGENCY_CONFIG = join25(homedir14(), ".agency", "agency.toml");
-    AGENCY_EXE = join25(process.env.APPDATA || join25(homedir14(), "AppData", "Roaming"), "agency", "CurrentVersion", "agency.exe");
+    OJ_AGENT_DIR = join26(homedir15(), ".openjaw-agent");
+    OJ_MCP_CONFIG = join26(OJ_AGENT_DIR, "mcp.json");
+    OJ_CONSENT_FILE = join26(OJ_AGENT_DIR, "mcp-consent.json");
+    COPILOT_MCP_CONFIG = join26(homedir15(), ".copilot", "mcp-config.json");
+    COPILOT_PLUGINS_DIR = join26(homedir15(), ".copilot", "installed-plugins", "copilot-plugins");
+    COPILOT_OAUTH_DIR = join26(homedir15(), ".copilot", "mcp-oauth-config");
+    AGENCY_CONFIG = join26(homedir15(), ".agency", "agency.toml");
+    AGENCY_EXE = join26(process.env.APPDATA || join26(homedir15(), "AppData", "Roaming"), "agency", "CurrentVersion", "agency.exe");
     SELF_PATTERNS = ["openjaw-mcp/dist/index.js", "openjaw-mcp\\dist\\index.js", "openjaw-agent"];
     __name(findCopilotOAuthToken, "findCopilotOAuthToken");
     __name(refreshCopilotToken, "refreshCopilotToken");
@@ -22615,11 +23577,11 @@ var init_mcp_client = __esm({
        * Add a new MCP server at runtime. Saves to ~/.openjaw-agent/mcp.json and connects.
        */
       async addServer(name, def) {
-        if (!existsSync17(OJ_AGENT_DIR)) mkdirSync11(OJ_AGENT_DIR, { recursive: true });
+        if (!existsSync19(OJ_AGENT_DIR)) mkdirSync11(OJ_AGENT_DIR, { recursive: true });
         let config = {};
-        if (existsSync17(OJ_MCP_CONFIG)) {
+        if (existsSync19(OJ_MCP_CONFIG)) {
           try {
-            const raw = JSON.parse(readFileSync17(OJ_MCP_CONFIG, "utf-8"));
+            const raw = JSON.parse(readFileSync18(OJ_MCP_CONFIG, "utf-8"));
             config = raw.mcpServers || {};
           } catch {
           }
@@ -22727,6 +23689,7 @@ var init_mcp_client = __esm({
             const headers = {};
             if (def.env?.AUTHORIZATION) headers["Authorization"] = def.env.AUTHORIZATION;
             if (def.env?.AUTH_TOKEN) headers["Authorization"] = `Bearer ${def.env.AUTH_TOKEN}`;
+            if (def.headers) Object.assign(headers, def.headers);
             transport = new SSEClientTransport(new URL(def.url), {
               requestInit: Object.keys(headers).length > 0 ? { headers } : void 0
             });
@@ -22747,10 +23710,10 @@ var init_mcp_client = __esm({
               let tokenExpiry = 0;
               if (copilotTokenFile) {
                 try {
-                  const cached7 = JSON.parse(readFileSync17(copilotTokenFile, "utf-8"));
-                  cachedToken = cached7.accessToken;
-                  cachedRefreshToken = cached7.refreshToken;
-                  tokenExpiry = cached7.expiresAt || 0;
+                  const cached8 = JSON.parse(readFileSync18(copilotTokenFile, "utf-8"));
+                  cachedToken = cached8.accessToken;
+                  cachedRefreshToken = cached8.refreshToken;
+                  tokenExpiry = cached8.expiresAt || 0;
                 } catch {
                 }
               }
@@ -22790,11 +23753,15 @@ var init_mcp_client = __esm({
                 return globalThis.fetch(url, { ...init, headers });
               }, "customFetch");
             }
+            const requestHeaders = {};
+            if (staticAuth) requestHeaders["Authorization"] = staticAuth;
+            if (def.headers) Object.assign(requestHeaders, def.headers);
             const transportOpts = {};
             if (customFetch) {
               transportOpts.fetch = customFetch;
-            } else if (staticAuth) {
-              transportOpts.requestInit = { headers: { Authorization: staticAuth } };
+            }
+            if (Object.keys(requestHeaders).length > 0) {
+              transportOpts.requestInit = { headers: requestHeaders };
             }
             transport = new StreamableHTTPClientTransport(new URL(def.url), transportOpts);
           } else {
@@ -22855,6 +23822,7 @@ var init_mcp_client = __esm({
     __name(loadConsent, "loadConsent");
     __name(saveConsent, "saveConsent");
     __name(promptConsent, "promptConsent");
+    __name(restoreStdinAfterReadlinePrompt, "restoreStdinAfterReadlinePrompt");
     __name(stripAnsi, "stripAnsi");
   }
 });
@@ -23185,13 +24153,13 @@ __export(scheduler_exports, {
   stopAllTasks: () => stopAllTasks,
   stopTask: () => stopTask
 });
-import { readFileSync as readFileSync18, writeFileSync as writeFileSync12, existsSync as existsSync18, mkdirSync as mkdirSync12 } from "node:fs";
-import { join as join26 } from "node:path";
-import { homedir as homedir15 } from "node:os";
+import { readFileSync as readFileSync19, writeFileSync as writeFileSync12, existsSync as existsSync20, mkdirSync as mkdirSync12 } from "node:fs";
+import { join as join27 } from "node:path";
+import { homedir as homedir16 } from "node:os";
 function getJobsPath() {
-  const dir2 = join26(homedir15(), ".openjaw-agent");
-  if (!existsSync18(dir2)) mkdirSync12(dir2, { recursive: true });
-  return join26(dir2, "cron-jobs.json");
+  const dir2 = join27(homedir16(), ".openjaw-agent");
+  if (!existsSync20(dir2)) mkdirSync12(dir2, { recursive: true });
+  return join27(dir2, "cron-jobs.json");
 }
 function parseInterval(input) {
   const match = input.match(/^(\d+)\s*(s|sec|seconds?|m|min|minutes?|h|hr|hours?|d|day|days?)$/i);
@@ -23328,9 +24296,9 @@ function saveJobs() {
 }
 function loadJobs() {
   const path3 = getJobsPath();
-  if (!existsSync18(path3)) return [];
+  if (!existsSync20(path3)) return [];
   try {
-    const raw = readFileSync18(path3, "utf8");
+    const raw = readFileSync19(path3, "utf8");
     return JSON.parse(raw);
   } catch {
     return [];
@@ -23562,10 +24530,10 @@ __export(repl_exports, {
 });
 import * as readline2 from "readline";
 import { readFile as readFile4 } from "node:fs/promises";
-import { existsSync as existsSync19 } from "node:fs";
-import { join as join27, dirname as dirname6 } from "node:path";
-import { homedir as homedir16 } from "node:os";
-import { fileURLToPath as fileURLToPath3 } from "node:url";
+import { existsSync as existsSync21 } from "node:fs";
+import { join as join28, dirname as dirname8 } from "node:path";
+import { homedir as homedir17 } from "node:os";
+import { fileURLToPath as fileURLToPath5 } from "node:url";
 async function selectPrompt(message, choices, defaultIdx) {
   const { default: select } = await import("@inquirer/select");
   return select({ message, choices, default: defaultIdx });
@@ -23581,8 +24549,8 @@ async function loadPrompts(promptsDir) {
   const files = ["IDENTITY.md", "REASONING.md", "COMPUTER_USE.md", "SAFETY.md", "USER.md"];
   const parts = [];
   for (const file2 of files) {
-    const path3 = join27(promptsDir, file2);
-    if (existsSync19(path3)) {
+    const path3 = join28(promptsDir, file2);
+    if (existsSync21(path3)) {
       const content = await readFile4(path3, "utf8");
       parts.push(content);
     }
@@ -23598,11 +24566,11 @@ async function loadPrompts(promptsDir) {
 }
 async function loadMemorySummary() {
   const memoryPaths = [
-    join27(homedir16(), ".openjaw", "MEMORY.md"),
-    join27(homedir16(), ".openjaw", "memory", "MEMORY.md")
+    join28(homedir17(), ".openjaw", "MEMORY.md"),
+    join28(homedir17(), ".openjaw", "memory", "MEMORY.md")
   ];
   for (const memoryPath of memoryPaths) {
-    if (existsSync19(memoryPath)) {
+    if (existsSync21(memoryPath)) {
       const content = await readFile4(memoryPath, "utf8");
       return content.slice(0, 2e3);
     }
@@ -23610,8 +24578,8 @@ async function loadMemorySummary() {
   return "";
 }
 async function startREPL(resumeSessionId) {
-  const promptsDir = join27(__dirname2, "..", "prompts");
-  const packagePromptsDir2 = existsSync19(promptsDir) ? promptsDir : join27(homedir16(), ".openjaw-agent", "prompts");
+  const promptsDir = join28(__dirname2, "..", "prompts");
+  const packagePromptsDir2 = existsSync21(promptsDir) ? promptsDir : join28(homedir17(), ".openjaw-agent", "prompts");
   await ensureDirectories();
   const config = await loadConfig();
   const systemPrompt = await loadPrompts(packagePromptsDir2);
@@ -24175,8 +25143,8 @@ var init_repl = __esm({
     init_connect();
     init_scheduler();
     __name(selectPrompt, "selectPrompt");
-    __filename2 = fileURLToPath3(import.meta.url);
-    __dirname2 = dirname6(__filename2);
+    __filename2 = fileURLToPath5(import.meta.url);
+    __dirname2 = dirname8(__filename2);
     C = {
       reset: "\x1B[0m",
       dim: "\x1B[2m",
@@ -24201,9 +25169,9 @@ var init_repl = __esm({
 });
 
 // src/voice/tts.ts
-import { execSync as execSync6, spawn as spawn2 } from "node:child_process";
-import { existsSync as existsSync20, unlinkSync as unlinkSync4, mkdirSync as mkdirSync14 } from "node:fs";
-import { join as join28 } from "node:path";
+import { execSync as execSync6, spawn as spawn4 } from "node:child_process";
+import { existsSync as existsSync22, unlinkSync as unlinkSync5, mkdirSync as mkdirSync14 } from "node:fs";
+import { join as join29 } from "node:path";
 import { tmpdir as tmpdir5 } from "node:os";
 import { randomUUID as randomUUID5 } from "node:crypto";
 function hasEdgeTts() {
@@ -24257,8 +25225,8 @@ async function listVoices() {
   }
 }
 async function speakEdgeTts(text, voice, options) {
-  if (!existsSync20(TTS_TEMP_DIR)) mkdirSync14(TTS_TEMP_DIR, { recursive: true });
-  const audioFile = join28(TTS_TEMP_DIR, `tts-${randomUUID5().slice(0, 8)}.mp3`);
+  if (!existsSync22(TTS_TEMP_DIR)) mkdirSync14(TTS_TEMP_DIR, { recursive: true });
+  const audioFile = join29(TTS_TEMP_DIR, `tts-${randomUUID5().slice(0, 8)}.mp3`);
   let playerProc = null;
   let stopped = false;
   try {
@@ -24270,9 +25238,9 @@ async function speakEdgeTts(text, voice, options) {
       timeout: 15e3,
       stdio: ["pipe", "pipe", "pipe"]
     });
-    if (stopped || !existsSync20(audioFile)) return { stop: /* @__PURE__ */ __name(() => {
+    if (stopped || !existsSync22(audioFile)) return { stop: /* @__PURE__ */ __name(() => {
     }, "stop") };
-    playerProc = spawn2("powershell.exe", [
+    playerProc = spawn4("powershell.exe", [
       "-NoProfile",
       "-Command",
       `Add-Type -AssemblyName PresentationCore; $p = New-Object System.Windows.Media.MediaPlayer; $p.Open([Uri]"${audioFile}"); $p.Play(); Start-Sleep -Milliseconds 500; while($p.Position -lt $p.NaturalDuration.TimeSpan -and $p.HasAudio){ Start-Sleep -Milliseconds 200 }; $p.Close()`
@@ -24282,14 +25250,14 @@ async function speakEdgeTts(text, voice, options) {
     });
     playerProc.on("exit", () => {
       try {
-        if (existsSync20(audioFile)) unlinkSync4(audioFile);
+        if (existsSync22(audioFile)) unlinkSync5(audioFile);
       } catch {
       }
       playerProc = null;
     });
   } catch {
     try {
-      if (existsSync20(audioFile)) unlinkSync4(audioFile);
+      if (existsSync22(audioFile)) unlinkSync5(audioFile);
     } catch {
     }
   }
@@ -24301,7 +25269,7 @@ async function speakEdgeTts(text, voice, options) {
         playerProc = null;
       }
       try {
-        if (existsSync20(audioFile)) unlinkSync4(audioFile);
+        if (existsSync22(audioFile)) unlinkSync5(audioFile);
       } catch {
       }
     }, "stop")
@@ -24318,7 +25286,7 @@ $synth.Speak('${safeText}')
 $synth.Dispose()
 `;
   const encoded = Buffer.from(script, "utf16le").toString("base64");
-  const proc = spawn2("powershell.exe", ["-NoProfile", "-EncodedCommand", encoded], {
+  const proc = spawn4("powershell.exe", ["-NoProfile", "-EncodedCommand", encoded], {
     stdio: ["pipe", "pipe", "pipe"],
     windowsHide: true
   });
@@ -24340,7 +25308,7 @@ var init_tts = __esm({
     "use strict";
     DEFAULT_VOICE_EN = "en-US-AriaNeural";
     DEFAULT_VOICE_ZH = "zh-CN-XiaoxiaoNeural";
-    TTS_TEMP_DIR = join28(tmpdir5(), "oj-tts");
+    TTS_TEMP_DIR = join29(tmpdir5(), "oj-tts");
     edgeTtsAvailable = null;
     __name(hasEdgeTts, "hasEdgeTts");
     __name(ensureEdgeTts, "ensureEdgeTts");
@@ -24354,13 +25322,13 @@ var init_tts = __esm({
 });
 
 // src/voice/stt.ts
-import { spawn as spawn3, execSync as execSync7 } from "node:child_process";
-import { join as join29 } from "node:path";
+import { spawn as spawn5, execSync as execSync7 } from "node:child_process";
+import { join as join30 } from "node:path";
 import { tmpdir as tmpdir6 } from "node:os";
-import { existsSync as existsSync21, unlinkSync as unlinkSync5 } from "node:fs";
+import { existsSync as existsSync23, unlinkSync as unlinkSync6 } from "node:fs";
 import { randomUUID as randomUUID6 } from "node:crypto";
 async function listenOnce(timeoutSeconds = 10, language = "en-US") {
-  const resultFile = join29(tmpdir6(), `oj-stt-${randomUUID6().slice(0, 8)}.txt`);
+  const resultFile = join30(tmpdir6(), `oj-stt-${randomUUID6().slice(0, 8)}.txt`);
   const script = `
 $ProgressPreference = 'SilentlyContinue'
 $ErrorActionPreference = 'Stop'
@@ -24395,8 +25363,8 @@ try {
 }
 `;
   const encoded = Buffer.from(script, "utf16le").toString("base64");
-  return new Promise((resolve6) => {
-    const proc = spawn3("powershell.exe", ["-NoProfile", "-STA", "-EncodedCommand", encoded], {
+  return new Promise((resolve7) => {
+    const proc = spawn5("powershell.exe", ["-NoProfile", "-STA", "-EncodedCommand", encoded], {
       stdio: ["pipe", "pipe", "pipe"],
       windowsHide: true
     });
@@ -24410,25 +25378,25 @@ try {
     });
     const timer = setTimeout(() => {
       if (!proc.killed) proc.kill();
-      resolve6(null);
+      resolve7(null);
     }, (timeoutSeconds + 5) * 1e3);
     proc.on("exit", () => {
       clearTimeout(timer);
       const output = stdout.replace(/#< CLIXML[\s\S]*/m, "").trim();
       if (output === "NO_SPEECH" || output.startsWith("ERROR") || !output) {
-        resolve6(null);
+        resolve7(null);
         return;
       }
       const parts = output.split("|");
       const text = parts[0]?.trim();
       const confidence = parseFloat(parts[1] || "0");
       if (text) {
-        resolve6({ text, confidence: isNaN(confidence) ? 0.5 : confidence });
+        resolve7({ text, confidence: isNaN(confidence) ? 0.5 : confidence });
       } else {
-        resolve6(null);
+        resolve7(null);
       }
       try {
-        if (existsSync21(resultFile)) unlinkSync5(resultFile);
+        if (existsSync23(resultFile)) unlinkSync6(resultFile);
       } catch {
       }
     });
@@ -24662,9 +25630,9 @@ __export(clipboard_image_exports, {
   readClipboardImage: () => readClipboardImage
 });
 import { execSync as execSync8 } from "node:child_process";
-import { join as join30 } from "node:path";
+import { join as join31 } from "node:path";
 import { tmpdir as tmpdir7 } from "node:os";
-import { readFileSync as readFileSync20, unlinkSync as unlinkSync6, existsSync as existsSync22 } from "node:fs";
+import { readFileSync as readFileSync21, unlinkSync as unlinkSync7, existsSync as existsSync24 } from "node:fs";
 import { randomUUID as randomUUID7 } from "node:crypto";
 function encodePS(script) {
   return Buffer.from(script, "utf16le").toString("base64");
@@ -24689,7 +25657,7 @@ Add-Type -AssemblyName System.Windows.Forms
 }
 function readClipboardImage() {
   try {
-    const tempPath = join30(tmpdir7(), `oj-clip-${randomUUID7().slice(0, 8)}.png`);
+    const tempPath = join31(tmpdir7(), `oj-clip-${randomUUID7().slice(0, 8)}.png`);
     const script = `
 $ProgressPreference = 'SilentlyContinue'
 $ErrorActionPreference = 'Stop'
@@ -24706,16 +25674,16 @@ $img.Dispose()
       { encoding: "utf-8", timeout: 8e3, windowsHide: true, stdio: ["pipe", "pipe", "pipe"] }
     ).trim();
     const clean = output.replace(/#< CLIXML[\s\S]*/m, "").trim();
-    if (clean === "NO_IMAGE" || !existsSync22(tempPath)) {
+    if (clean === "NO_IMAGE" || !existsSync24(tempPath)) {
       return null;
     }
     const match = clean.match(/(\d+)x(\d+)/);
     const width = match ? parseInt(match[1], 10) : 0;
     const height = match ? parseInt(match[2], 10) : 0;
-    const buffer = readFileSync20(tempPath);
+    const buffer = readFileSync21(tempPath);
     const base64 = buffer.toString("base64");
     try {
-      unlinkSync6(tempPath);
+      unlinkSync7(tempPath);
     } catch {
     }
     return { base64, mimeType: "image/png", width, height };
@@ -25541,9 +26509,9 @@ __export(pet_exports, {
   getRandomReaction: () => getRandomReaction,
   renamePet: () => renamePet
 });
-import { existsSync as existsSync23, readFileSync as readFileSync21, writeFileSync as writeFileSync14, mkdirSync as mkdirSync15 } from "node:fs";
-import { join as join31 } from "node:path";
-import { homedir as homedir17 } from "node:os";
+import { existsSync as existsSync25, readFileSync as readFileSync22, writeFileSync as writeFileSync14, mkdirSync as mkdirSync15 } from "node:fs";
+import { join as join32 } from "node:path";
+import { homedir as homedir18 } from "node:os";
 function hashCode(str) {
   let hash3 = 0;
   for (let i = 0; i < str.length; i++) {
@@ -25561,20 +26529,20 @@ function seededRandom(seed) {
   };
 }
 function getPetPath() {
-  return join31(homedir17(), ".openjaw-agent", "pet.json");
+  return join32(homedir18(), ".openjaw-agent", "pet.json");
 }
 function loadStoredPet() {
   const path3 = getPetPath();
-  if (!existsSync23(path3)) return null;
+  if (!existsSync25(path3)) return null;
   try {
-    return JSON.parse(readFileSync21(path3, "utf-8"));
+    return JSON.parse(readFileSync22(path3, "utf-8"));
   } catch {
     return null;
   }
 }
 function saveStoredPet(data) {
-  const dir2 = join31(homedir17(), ".openjaw-agent");
-  if (!existsSync23(dir2)) mkdirSync15(dir2, { recursive: true });
+  const dir2 = join32(homedir18(), ".openjaw-agent");
+  if (!existsSync25(dir2)) mkdirSync15(dir2, { recursive: true });
   writeFileSync14(getPetPath(), JSON.stringify(data, null, 2), "utf-8");
 }
 function generatePet(userId) {
@@ -26123,34 +27091,34 @@ ${output}
   }
 }
 function expandUrl(ref, warnings) {
-  return new Promise((resolve6) => {
+  return new Promise((resolve7) => {
     const url = ref.target;
     const mod = url.startsWith("https") ? https : http;
     const req = mod.get(url, { timeout: 15e3 }, (res) => {
       if (res.statusCode && (res.statusCode >= 300 && res.statusCode < 400) && res.headers.location) {
         const redirectMod = res.headers.location.startsWith("https") ? https : http;
         const req2 = redirectMod.get(res.headers.location, { timeout: 15e3 }, (res2) => {
-          collectResponse(res2, ref, warnings, resolve6);
+          collectResponse(res2, ref, warnings, resolve7);
         });
         req2.on("error", (e) => {
           warnings.push(`\u26A0\uFE0F @url fetch error: ${e.message}`);
-          resolve6(null);
+          resolve7(null);
         });
         return;
       }
-      collectResponse(res, ref, warnings, resolve6);
+      collectResponse(res, ref, warnings, resolve7);
     });
     req.on("error", (e) => {
       warnings.push(`\u26A0\uFE0F @url fetch error: ${e.message}`);
-      resolve6(null);
+      resolve7(null);
     });
   });
 }
-function collectResponse(res, ref, warnings, resolve6) {
+function collectResponse(res, ref, warnings, resolve7) {
   if (res.statusCode && res.statusCode >= 400) {
     warnings.push(`\u26A0\uFE0F @url returned HTTP ${res.statusCode}: ${ref.target}`);
     res.resume();
-    resolve6(null);
+    resolve7(null);
     return;
   }
   const chunks = [];
@@ -26162,14 +27130,14 @@ function collectResponse(res, ref, warnings, resolve6) {
       text = text.slice(0, 5e4) + "\n\u2026 (truncated)";
     }
     const tokens = estimateTokens2(text);
-    resolve6(`\u{1F310} @url:${ref.target} (${tokens} tokens)
+    resolve7(`\u{1F310} @url:${ref.target} (${tokens} tokens)
 \`\`\`
 ${text}
 \`\`\``);
   });
   res.on("error", (e) => {
     warnings.push(`\u26A0\uFE0F @url fetch error: ${e.message}`);
-    resolve6(null);
+    resolve7(null);
   });
 }
 function stripHtml(html) {
@@ -26670,13 +27638,13 @@ Type /resume <id> to resume.` });
         if (input === "/export") {
           try {
             const { writeFile: writeFile5, mkdir: mkdir5 } = await import("node:fs/promises");
-            const { join: join48 } = await import("node:path");
-            const { homedir: homedir32 } = await import("node:os");
-            const { existsSync: existsSync34 } = await import("node:fs");
-            const exportDir = join48(homedir32(), ".openjaw-agent", "exports");
-            if (!existsSync34(exportDir)) await mkdir5(exportDir, { recursive: true });
+            const { join: join49 } = await import("node:path");
+            const { homedir: homedir33 } = await import("node:os");
+            const { existsSync: existsSync36 } = await import("node:fs");
+            const exportDir = join49(homedir33(), ".openjaw-agent", "exports");
+            if (!existsSync36(exportDir)) await mkdir5(exportDir, { recursive: true });
             const filename = `session-${agentLoop.sessionId}.md`;
-            const filepath = join48(exportDir, filename);
+            const filepath = join49(exportDir, filename);
             const lines = [
               `# OpenJaw Agent Session ${agentLoop.sessionId}`,
               `Date: ${(/* @__PURE__ */ new Date()).toISOString()}`,
@@ -26895,9 +27863,9 @@ ${list}` });
             const cmd = lang === "python" ? "python" : lang === "node" ? "node" : "pwsh";
             const args = lang === "python" ? ["-i", "-u"] : lang === "node" ? ["-i"] : ["-NoProfile", "-NoLogo"];
             try {
-              const { spawn: spawn8 } = await import("node:child_process");
+              const { spawn: spawn10 } = await import("node:child_process");
               if (replRef.current) replRef.current.kill();
-              const proc = spawn8(cmd, args, {
+              const proc = spawn10(cmd, args, {
                 stdio: ["pipe", "pipe", "pipe"],
                 windowsHide: true
               });
@@ -26937,7 +27905,7 @@ ${list}` });
         if (replRef.current && replLangRef.current && !input.startsWith("/")) {
           const proc = replRef.current;
           proc.stdin?.write(input + "\n");
-          await new Promise((resolve6) => setTimeout(resolve6, 800));
+          await new Promise((resolve7) => setTimeout(resolve7, 800));
           const flush = proc._ojFlush;
           const output = flush ? flush() : "";
           if (output.trim()) {
@@ -27251,14 +28219,14 @@ Options: ${chunk.choices.join(" | ")}` : chunk.content;
                 waitingForAskUserRef.current = true;
                 setIsRunning(false);
                 setWaitingForAskUser(true);
-                await new Promise((resolve6) => {
+                await new Promise((resolve7) => {
                   const checkInterval = setInterval(() => {
                     if (!waitingForAskUserRef.current || !agentLoop.isWaitingForAskUser) {
                       clearInterval(checkInterval);
                       waitingForAskUserRef.current = false;
                       setWaitingForAskUser(false);
                       setIsRunning(true);
-                      resolve6();
+                      resolve7();
                     }
                   }, 200);
                 });
@@ -27533,7 +28501,7 @@ var skill_tool_exports = {};
 __export(skill_tool_exports, {
   createSkillTool: () => createSkillTool
 });
-import { readFileSync as readFileSync23, writeFileSync as writeFileSync15 } from "node:fs";
+import { readFileSync as readFileSync24, writeFileSync as writeFileSync15 } from "node:fs";
 function resolveSkillTimeoutMs() {
   const raw = process.env["OPENJAW_SKILL_TIMEOUT_MS"];
   const parsed = raw ? Number(raw) : NaN;
@@ -27554,8 +28522,8 @@ async function withTimeout(promise, ms) {
   try {
     return await Promise.race([
       promise,
-      new Promise((resolve6) => {
-        timeoutId = setTimeout(() => resolve6(SKILL_TIMEOUT), ms);
+      new Promise((resolve7) => {
+        timeoutId = setTimeout(() => resolve7(SKILL_TIMEOUT), ms);
       })
     ]);
   } finally {
@@ -27701,7 +28669,7 @@ function extractLessons(chunks) {
 }
 function appendLessonsLearned(skillPath, lessons) {
   try {
-    const content = readFileSync23(skillPath, "utf8");
+    const content = readFileSync24(skillPath, "utf8");
     const datestamp = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
     if (content.includes("## Lessons Learned")) {
       const updated = content.replace(
@@ -27746,9 +28714,9 @@ var teams_exports = {};
 __export(teams_exports, {
   TeamsBridge: () => TeamsBridge
 });
-import { readFileSync as readFileSync24, writeFileSync as writeFileSync16, existsSync as existsSync25 } from "node:fs";
-import { join as join33 } from "node:path";
-import { homedir as homedir19, tmpdir as tmpdir8 } from "node:os";
+import { readFileSync as readFileSync25, writeFileSync as writeFileSync16, existsSync as existsSync27 } from "node:fs";
+import { join as join34 } from "node:path";
+import { homedir as homedir20, tmpdir as tmpdir8 } from "node:os";
 import { randomUUID as randomUUID8 } from "node:crypto";
 var AGENT_PREFIX, POLL_INTERVAL, TeamsBridge;
 var init_teams = __esm({
@@ -27836,7 +28804,7 @@ var init_teams = __esm({
                   const { resizeImageFileForAgent: resizeImageFileForAgent2 } = await Promise.resolve().then(() => (init_image_resize(), image_resize_exports));
                   imageData = await resizeImageFileForAgent2(imageFile);
                 } catch {
-                  const imgBuffer = readFileSync24(imageFile);
+                  const imgBuffer = readFileSync25(imageFile);
                   const ext = imageFile.split(".").pop()?.toLowerCase() || "png";
                   const mimeType = ext === "jpg" || ext === "jpeg" ? "image/jpeg" : ext === "gif" ? "image/gif" : ext === "webp" ? "image/webp" : "image/png";
                   imageData = { base64: imgBuffer.toString("base64"), mimeType };
@@ -27912,7 +28880,7 @@ var init_teams = __esm({
           const resp = await fetch(url, { headers: { Authorization: `Bearer ${token}` } });
           if (!resp.ok) return null;
           const buffer = Buffer.from(await resp.arrayBuffer());
-          const tempPath = join33(tmpdir8(), `oj-teams-${randomUUID8().slice(0, 6)}-${filename}`);
+          const tempPath = join34(tmpdir8(), `oj-teams-${randomUUID8().slice(0, 6)}-${filename}`);
           writeFileSync16(tempPath, buffer);
           return tempPath;
         } catch {
@@ -27927,7 +28895,7 @@ var init_teams = __esm({
           const contentType = resp.headers.get("content-type") ?? "image/png";
           const ext = contentType.includes("jpeg") ? ".jpg" : contentType.includes("gif") ? ".gif" : ".png";
           const buffer = Buffer.from(await resp.arrayBuffer());
-          const tempPath = join33(tmpdir8(), `oj-teams-img-${randomUUID8().slice(0, 6)}${ext}`);
+          const tempPath = join34(tmpdir8(), `oj-teams-img-${randomUUID8().slice(0, 6)}${ext}`);
           writeFileSync16(tempPath, buffer);
           return tempPath;
         } catch {
@@ -27968,7 +28936,7 @@ var init_teams = __esm({
       async sendFileToSelfChat(filePath) {
         const token = this.getGraphToken();
         const fileName = filePath.split(/[\\/]/).pop() || "file";
-        const fileBuffer = readFileSync24(filePath);
+        const fileBuffer = readFileSync25(filePath);
         const uploadResp = await fetch(
           `https://graph.microsoft.com/v1.0/me/drive/root:/OpenJaw-Shared/${fileName}:/content`,
           {
@@ -28021,7 +28989,7 @@ var init_teams = __esm({
             if (filePath.includes("http") || filePath.includes("node_modules")) continue;
             const fileName = filePath.split(/[\\/]/).pop() || "";
             if (fileName.startsWith("oj-") || fileName.endsWith(".log") || fileName.endsWith(".tmp")) continue;
-            if (existsSync25(filePath)) {
+            if (existsSync27(filePath)) {
               try {
                 const { statSync: statSync5 } = await import("node:fs");
                 const stat2 = statSync5(filePath);
@@ -28039,9 +29007,9 @@ var init_teams = __esm({
       }
       /** Get Graph access token from disk. */
       getGraphToken() {
-        const tokenPath = join33(homedir19(), ".graph-token", "tokens", "graph-chat.json");
-        if (!existsSync25(tokenPath)) throw new Error("Graph token not found");
-        const data = JSON.parse(readFileSync24(tokenPath, "utf-8"));
+        const tokenPath = join34(homedir20(), ".graph-token", "tokens", "graph-chat.json");
+        if (!existsSync27(tokenPath)) throw new Error("Graph token not found");
+        const data = JSON.parse(readFileSync25(tokenPath, "utf-8"));
         if (!data.access_token) throw new Error("No access_token");
         return data.access_token;
       }
@@ -28165,12 +29133,12 @@ var init_teams = __esm({
 Options: ${chunk.choices.join(" | ")}` : "";
                 await this.sendToSelfChat(`\u2753 ${question}${choicesText}`);
                 if (!answerSent) await updateStatus("\u{1F916} OpenJaw Agent \u2014 \u2753 Waiting for your response...");
-                const userReply = await new Promise((resolve6) => {
-                  this._pendingReplyResolver = resolve6;
+                const userReply = await new Promise((resolve7) => {
+                  this._pendingReplyResolver = resolve7;
                   setTimeout(() => {
-                    if (this._pendingReplyResolver === resolve6) {
+                    if (this._pendingReplyResolver === resolve7) {
                       this._pendingReplyResolver = null;
-                      resolve6("[No response \u2014 timed out]");
+                      resolve7("[No response \u2014 timed out]");
                     }
                   }, 5 * 60 * 1e3);
                 });
@@ -28242,8 +29210,8 @@ __export(feishu_exports, {
   FeishuBridge: () => FeishuBridge
 });
 import * as lark from "@larksuiteoapi/node-sdk";
-import { readFileSync as readFileSync25, existsSync as existsSync26 } from "node:fs";
-import { join as join34 } from "node:path";
+import { readFileSync as readFileSync26, existsSync as existsSync28 } from "node:fs";
+import { join as join35 } from "node:path";
 import { tmpdir as tmpdir9 } from "node:os";
 import { randomUUID as randomUUID9 } from "node:crypto";
 var FeishuBridge;
@@ -28479,9 +29447,9 @@ var init_feishu = __esm({
             params: { type: "image" }
           });
           if (resp) {
-            const tempPath = join34(tmpdir9(), `oj-feishu-img-${randomUUID9().slice(0, 6)}.png`);
+            const tempPath = join35(tmpdir9(), `oj-feishu-img-${randomUUID9().slice(0, 6)}.png`);
             await resp.writeFile(tempPath);
-            const buffer = readFileSync25(tempPath);
+            const buffer = readFileSync26(tempPath);
             let imageData;
             try {
               const { resizeImageFileForAgent: resizeImageFileForAgent2 } = await Promise.resolve().then(() => (init_image_resize(), image_resize_exports));
@@ -28502,7 +29470,7 @@ var init_feishu = __esm({
             params: { type: "file" }
           });
           if (resp) {
-            const tempPath = join34(tmpdir9(), `oj-feishu-file-${randomUUID9().slice(0, 6)}-${fileName}`);
+            const tempPath = join35(tmpdir9(), `oj-feishu-file-${randomUUID9().slice(0, 6)}-${fileName}`);
             await resp.writeFile(tempPath);
             await this.handleMessage(chatId, `I've sent you a file: ${fileName}. It's saved at ${tempPath}. Please analyze it.`);
           }
@@ -28579,7 +29547,7 @@ var init_feishu = __esm({
             const fileName = filePath.split(/[\\/]/).pop() || "";
             if (fileName.startsWith("oj-") || fileName.endsWith(".log") || fileName.endsWith(".tmp")) continue;
             if (filePath.includes("http") || filePath.includes("node_modules")) continue;
-            const exists = existsSync26(filePath);
+            const exists = existsSync28(filePath);
             this.emit({ type: "system", content: `\u{1F50D} Found path: ${filePath} (exists: ${exists})` });
             if (exists) {
               try {
@@ -28654,12 +29622,12 @@ ${err.stack?.split("\n").slice(0, 3).join("\n")}` : String(err);
       }
       /** Wait for the next user message (used by ask_user flow) */
       waitForUserReply(_chatId) {
-        return new Promise((resolve6) => {
-          this._pendingReplyResolver = resolve6;
+        return new Promise((resolve7) => {
+          this._pendingReplyResolver = resolve7;
           setTimeout(() => {
-            if (this._pendingReplyResolver === resolve6) {
+            if (this._pendingReplyResolver === resolve7) {
               this._pendingReplyResolver = null;
-              resolve6("[No response \u2014 timed out]");
+              resolve7("[No response \u2014 timed out]");
             }
           }, 5 * 60 * 1e3);
         });
@@ -28680,10 +29648,10 @@ __export(wechat_exports, {
   sniffMediaKind: () => sniffMediaKind,
   validateMediaForUpload: () => validateMediaForUpload
 });
-import { existsSync as existsSync27, readFileSync as readFileSync26, writeFileSync as writeFileSync18, unlinkSync as unlinkSync7, statSync as statSync3 } from "node:fs";
+import { existsSync as existsSync29, readFileSync as readFileSync27, writeFileSync as writeFileSync18, unlinkSync as unlinkSync8, statSync as statSync3 } from "node:fs";
 import { mkdirSync as mkdirSync16 } from "node:fs";
-import { extname as extname3, join as join35 } from "node:path";
-import { homedir as homedir21 } from "node:os";
+import { extname as extname3, join as join36 } from "node:path";
+import { homedir as homedir22 } from "node:os";
 import { randomBytes, randomUUID as randomUUID10, createDecipheriv, createCipheriv, createHash as createHash3 } from "node:crypto";
 function mimeFromFilename(fileName) {
   return MIME_MAP[extname3(fileName).toLowerCase()] || "application/octet-stream";
@@ -28751,7 +29719,7 @@ function expandEnvVars(p) {
     return v !== void 0 ? v : m;
   });
   if (out.startsWith("~")) {
-    out = join35(homedir21(), out.slice(1).replace(/^[\\/]/, ""));
+    out = join36(homedir22(), out.slice(1).replace(/^[\\/]/, ""));
   }
   return out;
 }
@@ -28901,15 +29869,15 @@ var init_wechat2 = __esm({
       }
       // ── Auth ──
       getAccountPath() {
-        const dir2 = join35(homedir21(), ".openjaw-agent");
-        if (!existsSync27(dir2)) mkdirSync16(dir2, { recursive: true });
-        return join35(dir2, "wechat-account.json");
+        const dir2 = join36(homedir22(), ".openjaw-agent");
+        if (!existsSync29(dir2)) mkdirSync16(dir2, { recursive: true });
+        return join36(dir2, "wechat-account.json");
       }
       loadAccount() {
         const path3 = this.getAccountPath();
-        if (!existsSync27(path3)) return false;
+        if (!existsSync29(path3)) return false;
         try {
-          this.account = JSON.parse(readFileSync26(path3, "utf-8"));
+          this.account = JSON.parse(readFileSync27(path3, "utf-8"));
           return !!this.account?.token;
         } catch {
           return false;
@@ -28925,7 +29893,7 @@ var init_wechat2 = __esm({
       /** Delete saved session and clear current account (for /wechat logout) */
       logout() {
         const path3 = this.getAccountPath();
-        if (existsSync27(path3)) unlinkSync7(path3);
+        if (existsSync29(path3)) unlinkSync8(path3);
         this.account = null;
         this.emit({ type: "system", content: "\u{1F7E2} WeChat: \u5DF2\u767B\u51FA\uFF0C\u4E0B\u6B21\u6D88\u606F\u5C06\u91CD\u65B0\u626B\u7801" });
       }
@@ -28950,9 +29918,9 @@ var init_wechat2 = __esm({
         try {
           const qrTerminal = await import("qrcode-terminal");
           const mod = qrTerminal.default || qrTerminal;
-          const qrAscii = await new Promise((resolve6, reject) => {
+          const qrAscii = await new Promise((resolve7, reject) => {
             try {
-              mod.generate(qrUrl, { small: true }, (out) => resolve6(out));
+              mod.generate(qrUrl, { small: true }, (out) => resolve7(out));
             } catch (e) {
               reject(e);
             }
@@ -29218,12 +30186,12 @@ Scan URL manually: ${qrUrl}` });
                 const choicesText = chunk.choices?.length ? `
 \u9009\u9879: ${chunk.choices.join(" | ")}` : "";
                 await this.sendText(userId, `\u2753 ${question}${choicesText}`, contextToken);
-                const userReply = await new Promise((resolve6) => {
-                  this._pendingReplyResolver = resolve6;
+                const userReply = await new Promise((resolve7) => {
+                  this._pendingReplyResolver = resolve7;
                   setTimeout(() => {
-                    if (this._pendingReplyResolver === resolve6) {
+                    if (this._pendingReplyResolver === resolve7) {
                       this._pendingReplyResolver = null;
-                      resolve6("[No response \u2014 timed out]");
+                      resolve7("[No response \u2014 timed out]");
                     }
                   }, 5 * 60 * 1e3);
                 });
@@ -29387,7 +30355,7 @@ Scan URL manually: ${qrUrl}` });
        */
       async uploadFile(filePath, fileName, toUserId) {
         if (!this.account) return null;
-        const plaintext = readFileSync26(filePath);
+        const plaintext = readFileSync27(filePath);
         const rawsize = plaintext.length;
         if (rawsize === 0) {
           this.emit({ type: "system", content: `\u26A0 WeChat upload skipped (file is empty): ${fileName}` });
@@ -29547,7 +30515,7 @@ Scan URL manually: ${qrUrl}` });
           if (!fileName) continue;
           if (fileName.startsWith("oj-") || fileName.endsWith(".log") || fileName.endsWith(".tmp")) continue;
           if (filePath.includes("http://") || filePath.includes("https://") || filePath.includes("node_modules")) continue;
-          if (!existsSync27(filePath)) continue;
+          if (!existsSync29(filePath)) continue;
           attemptedFiles.add(dedupKey);
           attempted++;
           try {
@@ -29669,9 +30637,9 @@ __export(legacy_ink_ui_exports, {
 });
 import React6 from "react";
 import { render } from "ink";
-import { existsSync as existsSync28 } from "node:fs";
-import { join as join36 } from "node:path";
-import { homedir as homedir22 } from "node:os";
+import { existsSync as existsSync30 } from "node:fs";
+import { join as join37 } from "node:path";
+import { homedir as homedir23 } from "node:os";
 import { EventEmitter as EventEmitter2 } from "node:events";
 async function startInkUI(resumeSessionId, bridges = []) {
   await ensureDirectories();
@@ -29699,12 +30667,12 @@ async function startInkUI(resumeSessionId, bridges = []) {
   });
   const agentLoop = new AgentLoop(agentConfig, toolRegistry, resumeSessionId);
   toolRegistry.setWebSearchExecutor(createWebSearchExecutor(agentLoop));
-  const memoryDbPath = join36(homedir22(), ".openjaw", "memory.db");
+  const memoryDbPath = join37(homedir23(), ".openjaw", "memory.db");
   const memoryLegacyPaths = [
-    join36(homedir22(), ".openjaw", "MEMORY.md"),
-    join36(homedir22(), ".openjaw", "memory", "MEMORY.md")
+    join37(homedir23(), ".openjaw", "MEMORY.md"),
+    join37(homedir23(), ".openjaw", "memory", "MEMORY.md")
   ];
-  const memoryStatus = existsSync28(memoryDbPath) ? "loaded" : memoryLegacyPaths.some((p) => existsSync28(p)) ? "legacy" : "empty";
+  const memoryStatus = existsSync30(memoryDbPath) ? "loaded" : memoryLegacyPaths.some((p) => existsSync30(p)) ? "legacy" : "empty";
   const systemPromptFn = /* @__PURE__ */ __name(() => getSystemPrompt({ mcpManager }), "systemPromptFn");
   const { createSkillTool: createSkillTool2 } = await Promise.resolve().then(() => (init_skill_tool(), skill_tool_exports));
   toolRegistry.registerTool(createSkillTool2(agentConfig, toolRegistry, systemPromptFn));
@@ -29971,6 +30939,15 @@ var init_agentBus = __esm({
       hasRpc(method) {
         return this.handlers.has(method);
       }
+      /**
+       * Read the currently-registered handler for `method`, or undefined if
+       * none. The desktop layer uses this to wrap an existing handler with
+       * a lock-aware override (electronMain.ts registers `session.resume`
+       * after registerRpcHandlers and needs to delegate to the original).
+       */
+      getRpc(method) {
+        return this.handlers.get(method);
+      }
       /**
        * RPC dispatch entry point. Mirrors hermes's WebSocket `request(method, params)`
        * but is a direct in-process function call. When no handler is registered,
@@ -30072,9 +31049,9 @@ var init_agentBus = __esm({
 });
 
 // src/bridges/registry.ts
-import { existsSync as existsSync29, unlinkSync as unlinkSync8 } from "node:fs";
-import { homedir as homedir23 } from "node:os";
-import { join as join37 } from "node:path";
+import { existsSync as existsSync31, unlinkSync as unlinkSync9 } from "node:fs";
+import { homedir as homedir24 } from "node:os";
+import { join as join38 } from "node:path";
 var BRIDGE_REGISTRY, BRIDGE_NAMES, isBridgeName, normalizeCredentialsForConfig, BridgeManager, parseListInput;
 var init_registry3 = __esm({
   "src/bridges/registry.ts"() {
@@ -30173,15 +31150,15 @@ var init_registry3 = __esm({
           return { instance, stop: /* @__PURE__ */ __name(() => instance.stop(), "stop") };
         },
         async onForget(instance) {
-          const wechatPath = join37(homedir23(), ".openjaw-agent", "wechat-account.json");
+          const wechatPath = join38(homedir24(), ".openjaw-agent", "wechat-account.json");
           if (instance && typeof instance.logout === "function") {
             try {
               instance.logout();
             } catch {
             }
-          } else if (existsSync29(wechatPath)) {
+          } else if (existsSync31(wechatPath)) {
             try {
-              unlinkSync8(wechatPath);
+              unlinkSync9(wechatPath);
             } catch {
             }
           }
@@ -30454,12 +31431,19 @@ var init_registry3 = __esm({
 
 // src/bootstrap.ts
 import { EventEmitter as EventEmitter4 } from "node:events";
-import { existsSync as existsSync30 } from "node:fs";
-import { homedir as homedir24 } from "node:os";
-import { join as join38 } from "node:path";
+import { existsSync as existsSync32 } from "node:fs";
+import { homedir as homedir25 } from "node:os";
+import { join as join39 } from "node:path";
 async function bootstrapAgent(opts = {}) {
   await ensureDirectories();
   const config = await loadConfig();
+  const { configureWam: configureWam2 } = await Promise.resolve().then(() => (init_wam_token_provider(), wam_token_provider_exports));
+  const authMode = config.microsoft?.auth_mode ?? "auto";
+  configureWam2({
+    enabled: authMode !== "cdp",
+    ...config.microsoft?.client_id ? { clientId: config.microsoft.client_id } : {},
+    ...config.microsoft?.tenant_id ? { tenant: config.microsoft.tenant_id } : {}
+  });
   const toolRegistry = new ToolRegistry(config);
   const memoryStore = new MemoryStore(config);
   await toolRegistry.initializeProfile("core");
@@ -30467,9 +31451,10 @@ async function bootstrapAgent(opts = {}) {
   const { createMetaTool: createMetaTool2 } = await Promise.resolve().then(() => (init_meta(), meta_exports));
   toolRegistry.registerTool(createMetaTool2(toolRegistry));
   const agentConfig = loadAgentConfig();
+  const interactiveMcp = opts.interactiveMcp !== false;
   const mcpManager = new MCPClientManager();
   try {
-    await mcpManager.prepare(process.cwd(), true);
+    await mcpManager.prepare(process.cwd(), interactiveMcp);
   } catch (err) {
     process.stderr.write(
       `\x1B[33m\u26A0 MCP discovery failed: ${err instanceof Error ? err.message : String(err)}\x1B[0m
@@ -30486,12 +31471,12 @@ async function bootstrapAgent(opts = {}) {
   });
   const agentLoop = new AgentLoop(agentConfig, toolRegistry, opts.resumeSessionId);
   toolRegistry.setWebSearchExecutor(createWebSearchExecutor(agentLoop));
-  const memoryDbPath = join38(homedir24(), ".openjaw", "memory.db");
+  const memoryDbPath = join39(homedir25(), ".openjaw", "memory.db");
   const memoryLegacyPaths = [
-    join38(homedir24(), ".openjaw", "MEMORY.md"),
-    join38(homedir24(), ".openjaw", "memory", "MEMORY.md")
+    join39(homedir25(), ".openjaw", "MEMORY.md"),
+    join39(homedir25(), ".openjaw", "memory", "MEMORY.md")
   ];
-  const memoryStatus = existsSync30(memoryDbPath) ? "loaded" : memoryLegacyPaths.some((p) => existsSync30(p)) ? "legacy" : "empty";
+  const memoryStatus = existsSync32(memoryDbPath) ? "loaded" : memoryLegacyPaths.some((p) => existsSync32(p)) ? "legacy" : "empty";
   const systemPromptFn = /* @__PURE__ */ __name(() => getSystemPrompt({ mcpManager }), "systemPromptFn");
   const { createSkillTool: createSkillTool2 } = await Promise.resolve().then(() => (init_skill_tool(), skill_tool_exports));
   toolRegistry.registerTool(createSkillTool2(agentConfig, toolRegistry, systemPromptFn));
@@ -30724,8 +31709,8 @@ function createPromptCollector(bus, getSessionId) {
   }, "emit");
   const register = /* @__PURE__ */ __name((kind) => {
     const requestId = randomUUID12();
-    const promise = new Promise((resolve6) => {
-      pending.set(requestId, { kind, resolve: resolve6 });
+    const promise = new Promise((resolve7) => {
+      pending.set(requestId, { kind, resolve: resolve7 });
     });
     return { promise, requestId };
   }, "register");
@@ -31283,7 +32268,7 @@ import { c as _c } from "react/compiler-runtime";
 import { jsx as jsx10 } from "react/jsx-runtime";
 import { jsx as jsx22 } from "react/jsx-runtime";
 import { Buffer as Buffer2 } from "buffer";
-import { spawn as spawn4 } from "child_process";
+import { spawn as spawn6 } from "child_process";
 import { jsx as jsx32 } from "react/jsx-runtime";
 import { ansiCodesToString, reduceAnsiCodes, tokenize as tokenize2, undoAnsiCodes } from "@alcalzone/ansi-tokenize";
 import emojiRegex from "emoji-regex";
@@ -31353,7 +32338,7 @@ import { Buffer as Buffer3 } from "buffer";
 import { createContext as createContext7, useEffect as useEffect4, useState as useState22 } from "react";
 import { c as _c10 } from "react/compiler-runtime";
 import { jsx as jsx12 } from "react/jsx-runtime";
-import { readFileSync as readFileSync27 } from "fs";
+import { readFileSync as readFileSync28 } from "fs";
 import codeExcerpt from "code-excerpt";
 import StackUtils from "stack-utils";
 import { jsx as jsx13, jsxs as jsxs8 } from "react/jsx-runtime";
@@ -31361,7 +32346,7 @@ import { jsx as jsx14 } from "react/jsx-runtime";
 import { ansiCodesToString as ansiCodesToString3, diffAnsiCodes as diffAnsiCodes2 } from "@alcalzone/ansi-tokenize";
 import { styledCharsFromTokens, tokenize as tokenize3 } from "@alcalzone/ansi-tokenize";
 import bidiFactory from "bidi-js";
-import noop from "lodash-es/noop.js";
+import noop3 from "lodash-es/noop.js";
 import { LegacyRoot } from "react-reconciler/constants.js";
 import { jsx as jsx15 } from "react/jsx-runtime";
 import { default as default2, UncontrolledTextInput } from "ink-text-input";
@@ -31709,8 +32694,8 @@ function supportsOsc52Clipboard(terminal2 = env.terminal) {
   return OSC52_CAPABLE_TERMINALS.includes(terminal2 ?? "");
 }
 function execFileNoThrow(file2, args, options = {}) {
-  return new Promise((resolve6) => {
-    const child = spawn4(file2, args, {
+  return new Promise((resolve7) => {
+    const child = spawn6(file2, args, {
       cwd: options.useCwd ? process.cwd() : void 0,
       env: options.env,
       stdio: "pipe"
@@ -31732,13 +32717,13 @@ function execFileNoThrow(file2, args, options = {}) {
       if (timer) {
         clearTimeout(timer);
       }
-      resolve6({ stdout, stderr, code: 1, error: String(error) });
+      resolve7({ stdout, stderr, code: 1, error: String(error) });
     });
     child.on("close", (code) => {
       if (timer) {
         clearTimeout(timer);
       }
-      resolve6({ stdout, stderr, code: timedOut ? 124 : code ?? 0 });
+      resolve7({ stdout, stderr, code: timedOut ? 124 : code ?? 0 });
     });
     if (options.input) {
       child.stdin?.write(options.input);
@@ -32950,11 +33935,11 @@ function sliceAnsi(str, start, end) {
   }
   if (end !== void 0) {
     const key = `${start}|${end}|${str}`;
-    const cached7 = sliceCache.get(key);
-    if (cached7 !== void 0) {
+    const cached8 = sliceCache.get(key);
+    if (cached8 !== void 0) {
       sliceCache.delete(key);
-      sliceCache.set(key, cached7);
-      return cached7;
+      sliceCache.set(key, cached8);
+      return cached8;
     }
     const result = computeSlice(str, start, end);
     if (sliceCache.size >= SLICE_CACHE_LIMIT) {
@@ -33009,11 +33994,11 @@ function computeSlice(str, start, end) {
   return result;
 }
 function lineWidth(line) {
-  const cached7 = cache.get(line);
-  if (cached7 !== void 0) {
+  const cached8 = cache.get(line);
+  if (cached8 !== void 0) {
     cache.delete(line);
-    cache.set(line, cached7);
-    return cached7;
+    cache.set(line, cached8);
+    return cached8;
   }
   const width = stringWidth(line);
   if (cache.size >= MAX_CACHE_SIZE) {
@@ -33030,11 +34015,11 @@ function evictLineWidthCache(keepRatio = 0) {
 }
 function memoizedWrap(text, maxWidth, wrapType) {
   const key = `${maxWidth}|${wrapType}|${text}`;
-  const cached7 = wrapCache.get(key);
-  if (cached7 !== void 0) {
+  const cached8 = wrapCache.get(key);
+  if (cached8 !== void 0) {
     wrapCache.delete(key);
-    wrapCache.set(key, cached7);
-    return cached7;
+    wrapCache.set(key, cached8);
+    return cached8;
   }
   const result = computeWrap(text, maxWidth, wrapType);
   if (wrapCache.size >= WRAP_CACHE_LIMIT) {
@@ -34994,9 +35979,9 @@ function collectRemovedRects(parent, removed, underAbsolute = false) {
   }
   const elem = removed;
   const isAbsolute2 = underAbsolute || elem.style.position === "absolute";
-  const cached7 = nodeCache.get(elem);
-  if (cached7) {
-    addPendingClear(parent, cached7, isAbsolute2);
+  const cached8 = nodeCache.get(elem);
+  if (cached8) {
+    addPendingClear(parent, cached8, isAbsolute2);
     nodeCache.delete(elem);
   }
   for (const child of elem.childNodes) {
@@ -36711,8 +37696,8 @@ function setTerminalFocused(v) {
     cb();
   }
   if (!v) {
-    for (const resolve6 of resolvers) {
-      resolve6();
+    for (const resolve7 of resolvers) {
+      resolve7();
     }
     resolvers.clear();
   }
@@ -37116,31 +38101,31 @@ function renderNodeToOutput(node, output, {
     if (y < 0 && node.style.position === "absolute") {
       y = 0;
     }
-    const cached7 = nodeCache.get(node);
-    if (!node.dirty && !skipSelfBlit && node.pendingScrollDelta === void 0 && cached7 && cached7.x === x && cached7.y === y && cached7.width === width && cached7.height === height && prevScreen) {
+    const cached8 = nodeCache.get(node);
+    if (!node.dirty && !skipSelfBlit && node.pendingScrollDelta === void 0 && cached8 && cached8.x === x && cached8.y === y && cached8.width === width && cached8.height === height && prevScreen) {
       const fx = Math.floor(x);
       const fy = Math.floor(y);
       const fw = Math.floor(width);
       const fh = Math.floor(height);
       output.blit(prevScreen, fx, fy, fw, fh);
       if (node.style.position === "absolute") {
-        absoluteRectsCur.push(cached7);
+        absoluteRectsCur.push(cached8);
       }
       blitEscapingAbsoluteDescendants(node, output, prevScreen, fx, fy, fw, fh);
       return;
     }
-    const positionChanged = cached7 !== void 0 && (cached7.x !== x || cached7.y !== y || cached7.width !== width || cached7.height !== height);
+    const positionChanged = cached8 !== void 0 && (cached8.x !== x || cached8.y !== y || cached8.width !== width || cached8.height !== height);
     if (positionChanged) {
       layoutShifted = true;
       absoluteOverlayMoved ||= node.style.position === "absolute";
     }
-    if (cached7 && (node.dirty || positionChanged)) {
+    if (cached8 && (node.dirty || positionChanged)) {
       output.clear(
         {
-          x: Math.floor(cached7.x),
-          y: Math.floor(cached7.y),
-          width: Math.floor(cached7.width),
-          height: Math.floor(cached7.height)
+          x: Math.floor(cached8.x),
+          y: Math.floor(cached8.y),
+          width: Math.floor(cached8.width),
+          height: Math.floor(cached8.height)
         },
         node.style.position === "absolute"
       );
@@ -37315,7 +38300,7 @@ function renderNodeToOutput(node, output, {
             const delta = contentCached.y - contentY;
             const regionTop = Math.floor(y + contentYoga.getComputedTop());
             const regionBottom = regionTop + innerHeight - 1;
-            if (cached7?.y === y && cached7.height === height && innerHeight > 0 && Math.abs(delta) < innerHeight) {
+            if (cached8?.y === y && cached8.height === height && innerHeight > 0 && Math.abs(delta) < innerHeight) {
               hint = { top: regionTop, bottom: regionBottom, delta };
               scrollHint = hint;
             } else {
@@ -37615,13 +38600,13 @@ function blitEscapingAbsoluteDescendants(node, output, prevScreen, px, py, pw, p
     }
     const elem = child;
     if (elem.style.position === "absolute") {
-      const cached7 = nodeCache.get(elem);
-      if (cached7) {
-        absoluteRectsCur.push(cached7);
-        const cx = Math.floor(cached7.x);
-        const cy = Math.floor(cached7.y);
-        const cw = Math.floor(cached7.width);
-        const ch = Math.floor(cached7.height);
+      const cached8 = nodeCache.get(elem);
+      if (cached8) {
+        absoluteRectsCur.push(cached8);
+        const cx = Math.floor(cached8.x);
+        const cy = Math.floor(cached8.y);
+        const cw = Math.floor(cached8.width);
+        const ch = Math.floor(cached8.height);
         if (cx < px || cy < py || cx + cw > pr || cy + ch > pb) {
           output.blit(prevScreen, cx, cy, cw, ch);
         }
@@ -37637,20 +38622,20 @@ function renderScrolledChildren(node, output, offsetX, offsetY, hasRemovedChild,
     const childElem = childNode;
     const cy = childElem.yogaNode;
     if (cy) {
-      const cached7 = nodeCache.get(childElem);
+      const cached8 = nodeCache.get(childElem);
       let top;
       let height;
-      if (cached7?.top !== void 0 && !childElem.dirty && cumHeightShift === 0) {
-        top = cached7.top;
-        height = cached7.height;
+      if (cached8?.top !== void 0 && !childElem.dirty && cumHeightShift === 0) {
+        top = cached8.top;
+        height = cached8.height;
       } else {
         top = cy.getComputedTop();
         height = cy.getComputedHeight();
         if (childElem.dirty) {
-          cumHeightShift += height - (cached7 ? cached7.height : 0);
+          cumHeightShift += height - (cached8 ? cached8.height : 0);
         }
-        if (cached7) {
-          cached7.top = top;
+        if (cached8) {
+          cached8.top = top;
         }
       }
       const bottom = top + height;
@@ -38336,7 +39321,7 @@ function ErrorOverview({ error }) {
   let lineWidth2 = 0;
   if (filePath && origin?.line) {
     try {
-      const sourceCode = readFileSync27(filePath, "utf8");
+      const sourceCode = readFileSync28(filePath, "utf8");
       excerpt = codeExcerpt(sourceCode, origin.line);
       if (excerpt) {
         for (const { line } of excerpt) {
@@ -40060,11 +41045,11 @@ var init_entry_exports = __esm({
           return rawStringWidth(str);
         }
       }
-      const cached7 = widthCache.get(str);
-      if (cached7 !== void 0) {
+      const cached8 = widthCache.get(str);
+      if (cached8 !== void 0) {
         widthCache.delete(str);
-        widthCache.set(str, cached7);
-        return cached7;
+        widthCache.set(str, cached8);
+        return cached8;
       }
       const w = rawStringWidth(str);
       if (widthCache.size >= WIDTH_CACHE_LIMIT) {
@@ -42169,9 +43154,9 @@ $ npm install --save-dev react-devtools-core
         if (char.length === 1) {
           const code = char.charCodeAt(0);
           if (code < 128) {
-            const cached7 = this.ascii[code];
-            if (cached7 !== -1) {
-              return cached7;
+            const cached8 = this.ascii[code];
+            if (cached8 !== -1) {
+              return cached8;
             }
             const index2 = this.strings.length;
             this.strings.push(char);
@@ -42950,11 +43935,11 @@ $ npm install --save-dev react-devtools-core
        * and the terminal doesn't respond, the promise remains pending.
        */
       send(query) {
-        return new Promise((resolve6) => {
+        return new Promise((resolve7) => {
           this.queue.push({
             kind: "query",
             match: query.match,
-            resolve: /* @__PURE__ */ __name((r) => resolve6(r), "resolve")
+            resolve: /* @__PURE__ */ __name((r) => resolve7(r), "resolve")
           });
           this.stdout.write(query.request);
         });
@@ -42969,8 +43954,8 @@ $ npm install --save-dev react-devtools-core
        * Safe to call with no pending queries — still waits for a round-trip.
        */
       flush() {
-        return new Promise((resolve6) => {
-          this.queue.push({ kind: "sentinel", resolve: resolve6 });
+        return new Promise((resolve7) => {
+          this.queue.push({ kind: "sentinel", resolve: resolve7 });
           this.stdout.write(SENTINEL);
         });
       }
@@ -45450,8 +46435,8 @@ $ npm install --save-dev react-devtools-core
         }
       }
       async waitUntilExit() {
-        this.exitPromise ||= new Promise((resolve6, reject) => {
-          this.resolveExitPromise = resolve6;
+        this.exitPromise ||= new Promise((resolve7, reject) => {
+          this.resolveExitPromise = resolve7;
           this.rejectExitPromise = reject;
         });
         return this.exitPromise;
@@ -45865,7 +46850,7 @@ var init_details = __esm({
 });
 
 // src/lib/clipboard.ts
-import { execFile, spawn as spawn5 } from "node:child_process";
+import { execFile, spawn as spawn7 } from "node:child_process";
 import { promisify as promisify6 } from "node:util";
 function isUsableClipboardText(text) {
   if (!text || !/[^\s]/.test(text)) {
@@ -45938,14 +46923,14 @@ function writeClipboardCommands(platform2, env2) {
   attempts.push({ cmd: "xsel", args: ["--clipboard", "--input"] });
   return attempts;
 }
-async function writeClipboardText(text, platform2 = process.platform, start = spawn5, env2 = process.env) {
+async function writeClipboardText(text, platform2 = process.platform, start = spawn7, env2 = process.env) {
   const candidates = writeClipboardCommands(platform2, env2);
   for (const { cmd, args } of candidates) {
     try {
-      const ok = await new Promise((resolve6) => {
+      const ok = await new Promise((resolve7) => {
         const child = start(cmd, [...args], { stdio: ["pipe", "ignore", "ignore"], windowsHide: true });
-        child.once("error", () => resolve6(false));
-        child.once("close", (code) => resolve6(code === 0));
+        child.once("error", () => resolve7(false));
+        child.once("close", (code) => resolve7(code === 0));
         child.stdin?.end(text);
       });
       if (ok) {
@@ -46004,8 +46989,8 @@ async function readOsc52Clipboard(querier, timeoutMs = 500) {
   if (!querier) {
     return null;
   }
-  const timeout = new Promise((resolve6) => {
-    setTimeout(() => resolve6(void 0), timeoutMs);
+  const timeout = new Promise((resolve7) => {
+    setTimeout(() => resolve7(void 0), timeoutMs);
   });
   const query = querier.send({
     request: buildOsc52ClipboardQuery(),
@@ -46035,8 +47020,8 @@ var init_osc52 = __esm({
 
 // src/lib/terminalSetup.ts
 import { copyFile, mkdir as mkdir3, readFile as readFile5, writeFile as writeFile3 } from "node:fs/promises";
-import { homedir as homedir25 } from "node:os";
-import { join as join39 } from "node:path";
+import { homedir as homedir26 } from "node:os";
+import { join as join40 } from "node:path";
 function detectVSCodeLikeTerminal(env2 = process.env) {
   const askpass = env2["VSCODE_GIT_ASKPASS_MAIN"]?.toLowerCase() ?? "";
   if (env2["CURSOR_TRACE_ID"] || askpass.includes("cursor")) {
@@ -46090,14 +47075,14 @@ function stripJsonComments(content) {
 function isRemoteShellSession(env2) {
   return Boolean(env2["SSH_CONNECTION"] || env2["SSH_TTY"] || env2["SSH_CLIENT"]);
 }
-function getVSCodeStyleConfigDir(appName, platform2 = process.platform, env2 = process.env, homeDir = homedir25()) {
+function getVSCodeStyleConfigDir(appName, platform2 = process.platform, env2 = process.env, homeDir = homedir26()) {
   if (platform2 === "darwin") {
-    return join39(homeDir, "Library", "Application Support", appName, "User");
+    return join40(homeDir, "Library", "Application Support", appName, "User");
   }
   if (platform2 === "win32") {
-    return env2["APPDATA"] ? join39(env2["APPDATA"], appName, "User") : null;
+    return env2["APPDATA"] ? join40(env2["APPDATA"], appName, "User") : null;
   }
-  return join39(homeDir, ".config", appName, "User");
+  return join40(homeDir, ".config", appName, "User");
 }
 function isKeybinding(value) {
   return typeof value === "object" && value !== null;
@@ -46165,7 +47150,7 @@ async function backupFile(filePath, ops) {
 async function configureTerminalKeybindings(terminal2, options) {
   const env2 = options?.env ?? process.env;
   const platform2 = options?.platform ?? process.platform;
-  const homeDir = options?.homeDir ?? homedir25();
+  const homeDir = options?.homeDir ?? homedir26();
   const ops = { ...DEFAULT_FILE_OPS, ...options?.fileOps ?? {} };
   const meta = TERMINAL_META[terminal2];
   if (isRemoteShellSession(env2)) {
@@ -46181,7 +47166,7 @@ async function configureTerminalKeybindings(terminal2, options) {
       message: `Could not determine ${meta.label} settings path on this platform.`
     };
   }
-  const keybindingsFile = join39(configDir2, "keybindings.json");
+  const keybindingsFile = join40(configDir2, "keybindings.json");
   try {
     await ops.mkdir(configDir2, { recursive: true });
     let keybindings = [];
@@ -46264,7 +47249,7 @@ async function shouldPromptForTerminalSetup(options) {
     return false;
   }
   const platform2 = options?.platform ?? process.platform;
-  const homeDir = options?.homeDir ?? homedir25();
+  const homeDir = options?.homeDir ?? homedir26();
   const ops = { ...DEFAULT_FILE_OPS, ...options?.fileOps ?? {} };
   const meta = TERMINAL_META[detected];
   const configDir2 = getVSCodeStyleConfigDir(meta.appName, platform2, env2, homeDir);
@@ -46272,7 +47257,7 @@ async function shouldPromptForTerminalSetup(options) {
     return false;
   }
   try {
-    const content = await ops.readFile(join39(configDir2, "keybindings.json"), "utf8");
+    const content = await ops.readFile(join40(configDir2, "keybindings.json"), "utf8");
     const parsed = JSON.parse(stripJsonComments(content));
     if (!Array.isArray(parsed)) {
       return true;
@@ -46378,7 +47363,7 @@ var init_overlayStore = __esm({
     $overlayState = atom2(buildOverlayState());
     $isBlocked = computed2(
       $overlayState,
-      ({ agents, approval, clarify, confirm, mcpHub, modelPicker, pager, picker, secret, skillsHub, sudo }) => Boolean(agents || approval || clarify || confirm || mcpHub || modelPicker || pager || picker || secret || skillsHub || sudo)
+      ({ agents, approval, clarify, confirm, mcpHub, pager, picker, secret, skillsHub, sudo }) => Boolean(agents || approval || clarify || confirm || mcpHub || pager || picker || secret || skillsHub || sudo)
     );
     patchOverlayState = /* @__PURE__ */ __name((next) => $overlayState.set(typeof next === "function" ? next($overlayState.get()) : { ...$overlayState.get(), ...next }), "patchOverlayState");
     resetFlowOverlays = /* @__PURE__ */ __name(() => $overlayState.set({
@@ -47023,8 +48008,8 @@ var init_bridges = __esm({
 // src/lib/memory.ts
 import { createWriteStream } from "node:fs";
 import { mkdir as mkdir4, readdir as readdir3, readFile as readFile6, writeFile as writeFile4 } from "node:fs/promises";
-import { homedir as homedir26, tmpdir as tmpdir11 } from "node:os";
-import { join as join40 } from "node:path";
+import { homedir as homedir27, tmpdir as tmpdir11 } from "node:os";
+import { join as join41 } from "node:path";
 import { pipeline } from "node:stream/promises";
 import { getHeapSnapshot, getHeapSpaceStatistics, getHeapStatistics } from "node:v8";
 async function captureMemoryDiagnostics(trigger) {
@@ -47098,11 +48083,11 @@ async function captureMemoryDiagnostics(trigger) {
 async function performHeapDump(trigger = "manual") {
   try {
     const diagnostics = await captureMemoryDiagnostics(trigger);
-    const dir2 = process.env.OPENJAW_HEAPDUMP_DIR?.trim() || join40(homedir26() || tmpdir11(), ".openjaw-agent", "heapdumps");
+    const dir2 = process.env.OPENJAW_HEAPDUMP_DIR?.trim() || join41(homedir27() || tmpdir11(), ".openjaw-agent", "heapdumps");
     await mkdir4(dir2, { recursive: true });
     const base = `hermes-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}-${process.pid}-${trigger}`;
-    const heapPath = join40(dir2, `${base}.heapsnapshot`);
-    const diagPath = join40(dir2, `${base}.diagnostics.json`);
+    const heapPath = join41(dir2, `${base}.heapsnapshot`);
+    const diagPath = join41(dir2, `${base}.diagnostics.json`);
     await writeFile4(diagPath, JSON.stringify(diagnostics, null, 2), { mode: 384 });
     await pipeline(getHeapSnapshot(), createWriteStream(heapPath, { mode: 384 }));
     return { diagPath, heapPath, success: true };
@@ -47959,15 +48944,15 @@ var init_ops = __esm({
           }
           const [a, b] = parts;
           const history = getSpawnHistory();
-          const resolve6 = /* @__PURE__ */ __name((token) => {
+          const resolve7 = /* @__PURE__ */ __name((token) => {
             const n = parseInt(token, 10);
             if (Number.isFinite(n) && n >= 1 && n <= history.length) {
               return history[n - 1] ?? null;
             }
             return null;
           }, "resolve");
-          const baseline = resolve6(a);
-          const candidate = resolve6(b);
+          const baseline = resolve7(a);
+          const candidate = resolve7(b);
           if (!baseline || !candidate) {
             return ctx.transcript.sys(`replay-diff: could not resolve indices \xB7 history has ${history.length} entries`);
           }
@@ -48861,8 +49846,8 @@ var init_setup = __esm({
 
 // src/app/slash/catalog.ts
 import { readdirSync as readdirSync6 } from "node:fs";
-import { homedir as homedir27 } from "node:os";
-import { isAbsolute, join as join41, resolve as resolve3, sep } from "node:path";
+import { homedir as homedir28 } from "node:os";
+import { isAbsolute, join as join42, resolve as resolve4, sep } from "node:path";
 function buildCommandsCatalog(extras = {}) {
   const canon = {};
   const pairs = [];
@@ -48964,7 +49949,7 @@ function buildPathCompletions(word) {
         prefix = expanded.slice(lastSep + 1);
       }
     }
-    const resolved = isAbsolute(dir2) ? dir2 : resolve3(process.cwd(), dir2);
+    const resolved = isAbsolute(dir2) ? dir2 : resolve4(process.cwd(), dir2);
     const entries = readdirSync6(resolved, { withFileTypes: true });
     const items = entries.filter((e) => e.name.toLowerCase().startsWith(prefix.toLowerCase())).filter((e) => prefix || !e.name.startsWith(".")).slice(0, 50).map((e) => {
       const full = dir2 + e.name + (e.isDirectory() ? sep : "");
@@ -49004,7 +49989,7 @@ var init_catalog = __esm({
     slashifyPair = /* @__PURE__ */ __name((cmd) => [`/${cmd.name}`, cmd.help ?? ""], "slashifyPair");
     __name(buildCommandsCatalog, "buildCommandsCatalog");
     __name(buildSlashCompletions, "buildSlashCompletions");
-    tildeExpand = /* @__PURE__ */ __name((p) => p.startsWith("~") ? join41(homedir27(), p.slice(1).replace(/^[\\/]/, "")) : p, "tildeExpand");
+    tildeExpand = /* @__PURE__ */ __name((p) => p.startsWith("~") ? join42(homedir28(), p.slice(1).replace(/^[\\/]/, "")) : p, "tildeExpand");
     __name(buildPathCompletions, "buildPathCompletions");
   }
 });
@@ -49169,39 +50154,39 @@ var init_planner = __esm({
 });
 
 // src/workflows/persistence.ts
-import { existsSync as existsSync31, mkdirSync as mkdirSync17, readdirSync as readdirSync7, readFileSync as readFileSync28, writeFileSync as writeFileSync19 } from "node:fs";
-import { homedir as homedir28 } from "node:os";
-import { basename as basename3, join as join42, resolve as resolve4 } from "node:path";
+import { existsSync as existsSync33, mkdirSync as mkdirSync17, readdirSync as readdirSync7, readFileSync as readFileSync29, writeFileSync as writeFileSync19 } from "node:fs";
+import { homedir as homedir29 } from "node:os";
+import { basename as basename3, join as join43, resolve as resolve5 } from "node:path";
 function ensureDir(path3) {
-  if (!existsSync31(path3)) mkdirSync17(path3, { recursive: true });
+  if (!existsSync33(path3)) mkdirSync17(path3, { recursive: true });
 }
 function safeSegment(value) {
   return value.replace(/[^a-zA-Z0-9._-]+/g, "-").slice(0, 80) || "default";
 }
 function readJson(path3) {
   try {
-    return JSON.parse(readFileSync28(path3, "utf8"));
+    return JSON.parse(readFileSync29(path3, "utf8"));
   } catch {
     return null;
   }
 }
 function saveWorkflowSnapshot(snapshot) {
   ensureDir(workflowDir());
-  const path3 = join42(workflowDir(), `${safeSegment(snapshot.id)}.json`);
+  const path3 = join43(workflowDir(), `${safeSegment(snapshot.id)}.json`);
   writeFileSync19(path3, `${JSON.stringify(snapshot, null, 2)}
 `, "utf8");
   return path3;
 }
 function loadWorkflowSnapshot(id) {
-  const path3 = join42(workflowDir(), `${safeSegment(id)}.json`);
+  const path3 = join43(workflowDir(), `${safeSegment(id)}.json`);
   return readJson(path3);
 }
 function listWorkflowSnapshots(limit = 30) {
-  if (!existsSync31(workflowDir())) return [];
+  if (!existsSync33(workflowDir())) return [];
   const entries = [];
   for (const entry of readdirSync7(workflowDir(), { withFileTypes: true })) {
     if (!entry.isFile() || !entry.name.endsWith(".json")) continue;
-    const path3 = join42(workflowDir(), entry.name);
+    const path3 = join43(workflowDir(), entry.name);
     const snapshot = readJson(path3);
     if (!snapshot) continue;
     entries.push({
@@ -49219,10 +50204,10 @@ function listWorkflowSnapshots(limit = 30) {
 }
 function saveSpawnTreeSnapshot(input) {
   const sessionId = safeSegment(input.session_id ?? "default");
-  const dir2 = join42(spawnTreeDir(), sessionId);
+  const dir2 = join43(spawnTreeDir(), sessionId);
   ensureDir(dir2);
   const stamp = new Date((input.finished_at ?? Date.now() / 1e3) * 1e3).toISOString().replace(/[:.]/g, "-");
-  const path3 = join42(dir2, `${stamp}-${Math.random().toString(36).slice(2, 8)}.json`);
+  const path3 = join43(dir2, `${stamp}-${Math.random().toString(36).slice(2, 8)}.json`);
   const snapshot = {
     count: input.subagents?.length ?? 0,
     finished_at: input.finished_at,
@@ -49236,12 +50221,12 @@ function saveSpawnTreeSnapshot(input) {
   return path3;
 }
 function listSpawnTreeSnapshots(sessionId = "default", limit = 30) {
-  const dir2 = join42(spawnTreeDir(), safeSegment(sessionId));
-  if (!existsSync31(dir2)) return [];
+  const dir2 = join43(spawnTreeDir(), safeSegment(sessionId));
+  if (!existsSync33(dir2)) return [];
   const entries = [];
   for (const entry of readdirSync7(dir2, { withFileTypes: true })) {
     if (!entry.isFile() || !entry.name.endsWith(".json")) continue;
-    const path3 = join42(dir2, entry.name);
+    const path3 = join43(dir2, entry.name);
     const snapshot = readJson(path3);
     if (!snapshot) continue;
     entries.push({
@@ -49256,8 +50241,8 @@ function listSpawnTreeSnapshots(sessionId = "default", limit = 30) {
   return entries.sort((a, b) => (b.finished_at ?? 0) - (a.finished_at ?? 0)).slice(0, Math.max(1, limit));
 }
 function loadSpawnTreeSnapshot(path3) {
-  const root = resolve4(spawnTreeDir());
-  const resolved = resolve4(path3);
+  const root = resolve5(spawnTreeDir());
+  const resolved = resolve5(path3);
   if (!resolved.startsWith(root)) return null;
   const snapshot = readJson(resolved);
   return snapshot ? { ...snapshot, path: resolved } : null;
@@ -49266,9 +50251,9 @@ var rootDir, workflowDir, spawnTreeDir;
 var init_persistence = __esm({
   "src/workflows/persistence.ts"() {
     "use strict";
-    rootDir = /* @__PURE__ */ __name(() => join42(homedir28(), ".openjaw-agent"), "rootDir");
-    workflowDir = /* @__PURE__ */ __name(() => join42(rootDir(), "workflows"), "workflowDir");
-    spawnTreeDir = /* @__PURE__ */ __name(() => join42(rootDir(), "spawn-trees"), "spawnTreeDir");
+    rootDir = /* @__PURE__ */ __name(() => join43(homedir29(), ".openjaw-agent"), "rootDir");
+    workflowDir = /* @__PURE__ */ __name(() => join43(rootDir(), "workflows"), "workflowDir");
+    spawnTreeDir = /* @__PURE__ */ __name(() => join43(rootDir(), "spawn-trees"), "spawnTreeDir");
     __name(ensureDir, "ensureDir");
     __name(safeSegment, "safeSegment");
     __name(readJson, "readJson");
@@ -49848,11 +50833,11 @@ ${highlights}` : ""
 });
 
 // src/rpcHandlers.ts
-import { spawn as spawn6 } from "node:child_process";
+import { spawn as spawn8 } from "node:child_process";
 import { randomUUID as randomUUID14 } from "node:crypto";
-import { existsSync as existsSync32, mkdirSync as mkdirSync18, readFileSync as readFileSync29, rmSync, statSync as statSync4, writeFileSync as writeFileSync20 } from "node:fs";
-import { homedir as homedir29 } from "node:os";
-import { basename as basename4, extname as extname4, join as join43 } from "node:path";
+import { existsSync as existsSync34, mkdirSync as mkdirSync18, readFileSync as readFileSync30, rmSync, statSync as statSync4, writeFileSync as writeFileSync20 } from "node:fs";
+import { homedir as homedir30 } from "node:os";
+import { basename as basename4, extname as extname4, join as join44 } from "node:path";
 function registerRpcHandlers(options) {
   const { agentConfig, agentLoop, bridgeEmitter, bridgeManager, bus, mcpManager, systemPromptFn, toolRegistry, voiceManager } = options;
   let currentRun = null;
@@ -50077,6 +51062,7 @@ ${helpMessage}` : field.label;
         const modelInfo = agentLoop.getActiveModelMetadata();
         const nextEffort = parsed.clear ? void 0 : modelInfo ? resolveReasoningEffortForModel(modelInfo, parsed.effort) : parsed.effort;
         agentLoop.updateReasoningEffort(nextEffort);
+        agentConfig.llm.model_reasoning_effort = nextEffort;
         bus.emitEvent({
           payload: sessionInfoSnapshot(agentLoop, toolRegistry),
           session_id: agentLoop.sessionId,
@@ -50166,17 +51152,39 @@ ${helpMessage}` : field.label;
       return { ok: false };
     }
   });
-  bus.registerRpc("session.create", () => ({
-    info: sessionInfoSnapshot(agentLoop, toolRegistry),
-    session_id: agentLoop.sessionId
-  }));
+  bus.registerRpc("session.create", () => {
+    if (agentLoop.turnCount === 0 && agentLoop.history.length === 0) {
+      return {
+        info: sessionInfoSnapshot(agentLoop, toolRegistry),
+        session_id: agentLoop.sessionId
+      };
+    }
+    const created = agentLoop.createAndSwitchTo();
+    if (!created) {
+      return {
+        error: "cannot create a new session while a turn is in flight",
+        session_id: agentLoop.sessionId
+      };
+    }
+    bus.emitEvent({
+      payload: sessionInfoSnapshot(agentLoop, toolRegistry),
+      session_id: agentLoop.sessionId,
+      type: "session.info"
+    });
+    return {
+      info: sessionInfoSnapshot(agentLoop, toolRegistry),
+      session_id: agentLoop.sessionId
+    };
+  });
   bus.registerRpc("session.resume", (params) => {
     const id = String(params.session_id ?? agentLoop.sessionId);
-    const data = loadSession(id);
+    const swapped = agentLoop.swapToSession(id);
+    const data = swapped ?? loadSession(id);
+    const visibleMessages = (data?.messages ?? []).filter((m) => !messageIsInternalSelfPrompt(m));
     return {
       info: sessionInfoSnapshot(agentLoop, toolRegistry),
-      message_count: data?.messages.length ?? 0,
-      messages: (data?.messages ?? []).map((m) => {
+      message_count: visibleMessages.length,
+      messages: visibleMessages.map((m) => {
         if (m.role === "tool_result") {
           return {
             role: "tool",
@@ -50184,13 +51192,14 @@ ${helpMessage}` : field.label;
           };
         }
         const content = m.content;
+        const raw = typeof content === "string" ? content : Array.isArray(content) ? content.map((c) => c.type === "text" ? c.text : "[image]").join("") : "";
         return {
           role: m.role,
-          text: typeof content === "string" ? content : Array.isArray(content) ? content.map((c) => c.type === "text" ? c.text : "[image]").join("") : ""
+          text: stripDisplayPrefix(raw, m.role)
         };
       }),
-      resumed: data ? id : void 0,
-      session_id: id
+      resumed: swapped ? id : void 0,
+      session_id: agentLoop.sessionId
     };
   });
   bus.registerRpc("session.list", () => ({
@@ -50200,6 +51209,10 @@ ${helpMessage}` : field.label;
       preview: s.summary,
       source: `${s.provider}/${s.model}`,
       started_at: Date.parse(s.createdAt) || Date.now(),
+      // updated_at drives the sidebar's "last activity" date grouping.
+      // listSessions already sorts by updatedAt desc, so emitting it
+      // here saves the renderer a second parse.
+      updated_at: Date.parse(s.updatedAt) || Date.now(),
       title: s.summary || s.id
     }))
   }));
@@ -50234,12 +51247,12 @@ ${helpMessage}` : field.label;
     const id = String(params.session_id ?? agentLoop.sessionId) || agentLoop.sessionId;
     const data = loadSession(id);
     const messages = data?.messages ?? agentLoop.history;
-    const exportDir = join43(homedir29(), ".openjaw-agent", "exports");
-    if (!existsSync32(exportDir)) {
+    const exportDir = join44(homedir30(), ".openjaw-agent", "exports");
+    if (!existsSync34(exportDir)) {
       mkdirSync18(exportDir, { recursive: true });
     }
     const safeId = id.replace(/[^a-zA-Z0-9_.-]/g, "_") || agentLoop.sessionId;
-    const file2 = join43(exportDir, `session-${safeId}.md`);
+    const file2 = join44(exportDir, `session-${safeId}.md`);
     const lines = [
       `# OpenJaw Agent Session ${id}`,
       `Date: ${(/* @__PURE__ */ new Date()).toISOString()}`,
@@ -50269,8 +51282,8 @@ ${helpMessage}` : field.label;
       return { deleted: "" };
     }
     try {
-      const file2 = join43(homedir29(), ".openjaw-agent", "sessions", `${id}.json`);
-      if (existsSync32(file2)) {
+      const file2 = join44(homedir30(), ".openjaw-agent", "sessions", `${id}.json`);
+      if (existsSync34(file2)) {
         rmSync(file2);
       }
       return { deleted: id };
@@ -50343,11 +51356,11 @@ ${helpMessage}` : field.label;
   bus.registerRpc("shell.exec", async (params) => {
     const command = String(params.command ?? "");
     if (!command) return { code: -1, stderr: "empty command" };
-    return await new Promise((resolve6) => {
+    return await new Promise((resolve7) => {
       const isWin = process.platform === "win32";
       const shell = isWin ? "powershell.exe" : "sh";
       const args = isWin ? ["-NoProfile", "-Command", command] : ["-c", command];
-      const child = spawn6(shell, args, { timeout: 3e4 });
+      const child = spawn8(shell, args, { timeout: 3e4 });
       let stdout = "";
       let stderr = "";
       let truncated = false;
@@ -50370,10 +51383,10 @@ ${helpMessage}` : field.label;
         if (truncated) {
           stderr += "\n[output truncated to 1MB]";
         }
-        resolve6({ code: code ?? -1, stderr, stdout });
+        resolve7({ code: code ?? -1, stderr, stdout });
       });
       child.on("error", (err) => {
-        resolve6({ code: -1, stderr: err.message });
+        resolve7({ code: -1, stderr: err.message });
       });
     });
   });
@@ -50404,6 +51417,11 @@ ${helpMessage}` : field.label;
     const modelInfo = agentLoop.getModelMetadata(provider, model);
     const reasoningEffort = parsedEffort?.clear ? void 0 : parsedEffort?.effort ? modelInfo ? resolveReasoningEffortForModel(modelInfo, parsedEffort.effort) : parsedEffort.effort : modelInfo ? resolveReasoningEffortForModel(modelInfo, agentLoop.reasoningEffort) : agentLoop.reasoningEffort;
     agentLoop.switchModel(provider, model, reasoningEffort);
+    bus.emitEvent({
+      payload: sessionInfoSnapshot(agentLoop, toolRegistry),
+      session_id: agentLoop.sessionId,
+      type: "session.info"
+    });
     return {
       info: sessionInfoSnapshot(agentLoop, toolRegistry),
       ok: true
@@ -50481,8 +51499,8 @@ ${helpMessage}` : field.label;
     if (auth.auth_type !== "oauth") {
       throw new Error(`${PROVIDER_LABELS[slug]} does not use OAuth (auth_type=${auth.auth_type})`);
     }
-    const clientId = resolveCopilotClientId();
-    if (!clientId) {
+    const clientId2 = resolveCopilotClientId();
+    if (!clientId2) {
       throw new Error(
         "GitHub Copilot login needs a GitHub OAuth App client ID. Set GITHUB_COPILOT_CLIENT_ID or llm.copilot_oauth_client_id in ~/.openjaw-agent/config.yaml."
       );
@@ -50494,7 +51512,7 @@ ${helpMessage}` : field.label;
       }
       return agentConfig.llm.copilot_enterprise_url;
     })();
-    const flow = await startCopilotDeviceFlow(clientId, enterpriseUrl);
+    const flow = await startCopilotDeviceFlow(clientId2, enterpriseUrl);
     const flowId = randomUUID14();
     const controller = new AbortController();
     const timer = setTimeout(() => {
@@ -51015,13 +52033,13 @@ ${helpMessage}` : field.label;
     const firstSpace = raw.search(/\s/);
     const path3 = firstSpace > 0 ? raw.slice(0, firstSpace) : raw;
     const remainder = firstSpace > 0 ? raw.slice(firstSpace).trim() : "";
-    if (!existsSync32(path3)) {
+    if (!existsSync34(path3)) {
       throw new Error(`image.attach: file not found: ${path3}`);
     }
     let buffer;
     let fileSize = 0;
     try {
-      buffer = readFileSync29(path3);
+      buffer = readFileSync30(path3);
       fileSize = statSync4(path3).size;
     } catch (err) {
       throw new Error(`image.attach: ${err instanceof Error ? err.message : String(err)}`);
@@ -51067,13 +52085,13 @@ ${helpMessage}` : field.label;
     }
   });
   bus.registerRpc("reload.env", () => {
-    const envPath = join43(homedir29(), ".openjaw-agent", ".env");
-    if (!existsSync32(envPath)) {
+    const envPath = join44(homedir30(), ".openjaw-agent", ".env");
+    if (!existsSync34(envPath)) {
       return { updated: 0 };
     }
     let updated = 0;
     try {
-      const raw = readFileSync29(envPath, "utf-8");
+      const raw = readFileSync30(envPath, "utf-8");
       for (const line of raw.split(/\r?\n/)) {
         const trimmed = line.trim();
         if (!trimmed || trimmed.startsWith("#")) continue;
@@ -51252,7 +52270,7 @@ ${helpMessage}` : field.label;
     }
   };
 }
-var PROVIDERS2, PROVIDER_LABELS, PROVIDER_AUTH, isProviderAuthenticated, buildProviderOption, fetchLiveModels, parseReasoningEffortInput, skillDescription, listRegistrySkills, registrySkillsByCategory, formatSkillExecutionResult, reasoningEffortsForModel, resolveReasoningEffortForModel, BRIDGE_SOURCES, isBridgeSource, inferBridgeSource, bridgeLabels, bridgeEventLabels, stripBridgeGlyph, firstLogLine, bridgeUser, formatBridgeText, runProcess, contentToText, sessionMessageToMarkdown, sessionInfoSnapshot, MCP_TOOL_PREFIX, MAX_TOTAL_TOOLS, syncMcpTools;
+var PROVIDERS2, PROVIDER_LABELS, PROVIDER_AUTH, isProviderAuthenticated, buildProviderOption, fetchLiveModels, parseReasoningEffortInput, skillDescription, listRegistrySkills, registrySkillsByCategory, formatSkillExecutionResult, reasoningEffortsForModel, resolveReasoningEffortForModel, BRIDGE_SOURCES, isBridgeSource, inferBridgeSource, bridgeLabels, bridgeEventLabels, stripBridgeGlyph, firstLogLine, bridgeUser, formatBridgeText, runProcess, contentToText, sessionMessageToMarkdown, DISPLAY_PREFIX_PATTERNS, stripDisplayPrefix, INTERNAL_SELF_PROMPT_PATTERNS, isInternalSelfPrompt, messageIsInternalSelfPrompt, sessionInfoSnapshot, MCP_TOOL_PREFIX, MAX_TOTAL_TOOLS, syncMcpTools;
 var init_rpcHandlers = __esm({
   "src/rpcHandlers.ts"() {
     "use strict";
@@ -51462,8 +52480,8 @@ var init_rpcHandlers = __esm({
 ${raw}`;
       return `${header}: ${raw}`;
     }, "formatBridgeText");
-    runProcess = /* @__PURE__ */ __name((command, args, timeout = 2e4) => new Promise((resolve6) => {
-      const child = spawn6(command, args, { timeout, windowsHide: true });
+    runProcess = /* @__PURE__ */ __name((command, args, timeout = 2e4) => new Promise((resolve7) => {
+      const child = spawn8(command, args, { timeout, windowsHide: true });
       let stdout = "";
       let stderr = "";
       let truncated = false;
@@ -51486,9 +52504,9 @@ ${raw}`;
         if (truncated) {
           stderr += "\n[output truncated to 1MB]";
         }
-        resolve6({ code: code ?? -1, stderr, stdout });
+        resolve7({ code: code ?? -1, stderr, stdout });
       });
-      child.on("error", (err) => resolve6({ code: -1, stderr: err.message, stdout }));
+      child.on("error", (err) => resolve7({ code: -1, stderr: err.message, stdout }));
     }), "runProcess");
     contentToText = /* @__PURE__ */ __name((content) => {
       if (typeof content === "string") return content;
@@ -51512,6 +52530,27 @@ ${raw}`;
       }
       return [];
     }, "sessionMessageToMarkdown");
+    DISPLAY_PREFIX_PATTERNS = [
+      /^\[USER TASK\]:\s*/
+    ];
+    stripDisplayPrefix = /* @__PURE__ */ __name((text, role) => {
+      if (role !== "user") return text;
+      let out = text;
+      for (const pattern of DISPLAY_PREFIX_PATTERNS) {
+        out = out.replace(pattern, "");
+      }
+      return out;
+    }, "stripDisplayPrefix");
+    INTERNAL_SELF_PROMPT_PATTERNS = [
+      /^\[System:\s/
+    ];
+    isInternalSelfPrompt = /* @__PURE__ */ __name((rawText) => INTERNAL_SELF_PROMPT_PATTERNS.some((p) => p.test(rawText)), "isInternalSelfPrompt");
+    messageIsInternalSelfPrompt = /* @__PURE__ */ __name((m) => {
+      if (m.role !== "user") return false;
+      const content = m.content;
+      const raw = typeof content === "string" ? content : Array.isArray(content) ? content.map((c) => c.type === "text" ? c.text : "").join("") : "";
+      return isInternalSelfPrompt(raw);
+    }, "messageIsInternalSelfPrompt");
     sessionInfoSnapshot = /* @__PURE__ */ __name((agentLoop, toolRegistry) => ({
       cwd: process.cwd(),
       model: agentLoop.model,
@@ -51646,14 +52685,14 @@ var init_memoryMonitor = __esm({
 });
 
 // src/lib/openExternalUrl.ts
-import { spawn as spawn7 } from "node:child_process";
+import { spawn as spawn9 } from "node:child_process";
 import { platform } from "node:os";
 function openExternalUrl(rawUrl, dependencies = {}) {
   const url = parseSafeUrl(rawUrl);
   if (!url) {
     return false;
   }
-  const spawnFn = dependencies.spawn ?? spawn7;
+  const spawnFn = dependencies.spawn ?? spawn9;
   const platformId = dependencies.platform?.() ?? platform();
   const command = openCommand(platformId);
   if (!command) {
@@ -52146,9 +53185,9 @@ var init_useVirtualHistory = __esm({
       viewportHeight
     }) => itemCount > 0 && viewportHeight > 0 && !sticky && !liveTailActive, "shouldSetVirtualClamp");
     ensureVirtualItemHeight = /* @__PURE__ */ __name((heights, key, index, estimate, estimateHeight) => {
-      const cached7 = heights.get(key);
-      if (cached7 !== void 0) {
-        return Math.max(1, Math.floor(cached7));
+      const cached8 = heights.get(key);
+      if (cached8 !== void 0) {
+        return Math.max(1, Math.floor(cached8));
       }
       const seeded = Math.max(1, Math.floor(estimateHeight?.(index, key) ?? estimate));
       heights.set(key, seeded);
@@ -53586,7 +54625,7 @@ function createGatewayEventHandler(ctx) {
     setTimeout(async () => {
       let sid = getUiState().sid;
       for (let i = 0; !sid && i < 40; i += 1) {
-        await new Promise((resolve6) => setTimeout(resolve6, 100));
+        await new Promise((resolve7) => setTimeout(resolve7, 100));
         sid = getUiState().sid;
       }
       if (!sid) {
@@ -54333,21 +55372,21 @@ var init_useCompletion = __esm({
 });
 
 // src/lib/history.ts
-import { appendFileSync as appendFileSync4, existsSync as existsSync33, mkdirSync as mkdirSync19, readFileSync as readFileSync30 } from "node:fs";
-import { homedir as homedir30 } from "node:os";
-import { join as join44 } from "node:path";
+import { appendFileSync as appendFileSync4, existsSync as existsSync35, mkdirSync as mkdirSync19, readFileSync as readFileSync31 } from "node:fs";
+import { homedir as homedir31 } from "node:os";
+import { join as join45 } from "node:path";
 function load() {
   if (cache3) {
     return cache3;
   }
   try {
-    if (!existsSync33(file)) {
+    if (!existsSync35(file)) {
       cache3 = [];
       return cache3;
     }
     const entries = [];
     let current = [];
-    for (const line of readFileSync30(file, "utf8").split("\n")) {
+    for (const line of readFileSync31(file, "utf8").split("\n")) {
       if (line.startsWith("+")) {
         current.push(line.slice(1));
       } else if (current.length) {
@@ -54378,7 +55417,7 @@ function append(line) {
     items.splice(0, items.length - MAX);
   }
   try {
-    if (!existsSync33(dir)) {
+    if (!existsSync35(dir)) {
       mkdirSync19(dir, { recursive: true });
     }
     const ts = (/* @__PURE__ */ new Date()).toISOString().replace("T", " ").replace("Z", "");
@@ -54395,8 +55434,8 @@ var init_history = __esm({
   "src/lib/history.ts"() {
     "use strict";
     MAX = 1e3;
-    dir = process.env.OPENJAW_HOME ?? join44(homedir30(), ".openjaw-agent");
-    file = join44(dir, ".openjaw-agent_history");
+    dir = process.env.OPENJAW_HOME ?? join45(homedir31(), ".openjaw-agent");
+    file = join45(dir, ".openjaw-agent_history");
     cache3 = null;
     __name(load, "load");
     __name(append, "append");
@@ -54489,8 +55528,8 @@ var init_useQueue = __esm({
 });
 
 // src/lib/editor.ts
-import { accessSync, constants } from "node:fs";
-import { delimiter, join as join45 } from "node:path";
+import { accessSync as accessSync2, constants as constants2 } from "node:fs";
+import { delimiter, join as join46 } from "node:path";
 var FALLBACKS, isExecutable, resolveEditor;
 var init_editor = __esm({
   "src/lib/editor.ts"() {
@@ -54498,7 +55537,7 @@ var init_editor = __esm({
     FALLBACKS = ["editor", "nano", "pico", "vi", "emacs"];
     isExecutable = /* @__PURE__ */ __name((path3) => {
       try {
-        accessSync(path3, constants.X_OK);
+        accessSync2(path3, constants2.X_OK);
         return true;
       } catch {
         return false;
@@ -54513,7 +55552,7 @@ var init_editor = __esm({
         return ["notepad.exe"];
       }
       const dirs = (env2.PATH ?? "").split(delimiter).filter(Boolean);
-      const found = FALLBACKS.flatMap((name) => dirs.map((d) => join45(d, name))).find(isExecutable);
+      const found = FALLBACKS.flatMap((name) => dirs.map((d) => join46(d, name))).find(isExecutable);
       return [found ?? "vi"];
     }, "resolveEditor");
   }
@@ -54521,9 +55560,9 @@ var init_editor = __esm({
 
 // src/app/useComposerState.ts
 import { spawnSync } from "node:child_process";
-import { mkdtempSync, readFileSync as readFileSync31, rmSync as rmSync2, writeFileSync as writeFileSync21 } from "node:fs";
+import { mkdtempSync, readFileSync as readFileSync32, rmSync as rmSync2, writeFileSync as writeFileSync21 } from "node:fs";
 import { tmpdir as tmpdir12 } from "node:os";
-import { join as join46 } from "node:path";
+import { join as join47 } from "node:path";
 import { useStore } from "@nanostores/react";
 import { useCallback as useCallback7, useMemo as useMemo6, useState as useState12 } from "react";
 function insertAtCursor(value, cursor, text) {
@@ -54680,8 +55719,8 @@ function useComposerState({
     [handleResolvedPaste, onClipboardPaste, querier]
   );
   const openEditor = useCallback7(async () => {
-    const dir2 = mkdtempSync(join46(tmpdir12(), "hermes-"));
-    const file2 = join46(dir2, "prompt.md");
+    const dir2 = mkdtempSync(join47(tmpdir12(), "hermes-"));
+    const file2 = join47(dir2, "prompt.md");
     const [cmd, ...args] = resolveEditor();
     writeFileSync21(file2, [...inputBuf, input].join("\n"));
     let exitCode = null;
@@ -54692,7 +55731,7 @@ function useComposerState({
       if (exitCode !== 0) {
         return;
       }
-      const text = readFileSync31(file2, "utf8").trimEnd();
+      const text = readFileSync32(file2, "utf8").trimEnd();
       if (!text) {
         return;
       }
@@ -56774,8 +57813,8 @@ __export(perfPane_exports, {
   logFrameEvent: () => logFrameEvent
 });
 import { appendFileSync as appendFileSync5, mkdirSync as mkdirSync20 } from "node:fs";
-import { homedir as homedir31 } from "node:os";
-import { dirname as dirname7, join as join47 } from "node:path";
+import { homedir as homedir32 } from "node:os";
+import { dirname as dirname9, join as join48 } from "node:path";
 import { Profiler } from "react";
 import { jsx as jsx17 } from "react/jsx-runtime";
 function PerfPane({ children, id }) {
@@ -56791,13 +57830,13 @@ var init_perfPane = __esm({
     init_entry_exports();
     ENABLED = /^(?:1|true|yes|on)$/i.test((process.env.OPENJAW_DEV_PERF ?? "").trim());
     THRESHOLD_MS = Number(process.env.OPENJAW_DEV_PERF_MS ?? "2") || 0;
-    LOG_PATH2 = process.env.OPENJAW_DEV_PERF_LOG?.trim() || join47(homedir31(), ".openjaw-agent", "perf.log");
+    LOG_PATH2 = process.env.OPENJAW_DEV_PERF_LOG?.trim() || join48(homedir32(), ".openjaw-agent", "perf.log");
     logReady = false;
     writeRow = /* @__PURE__ */ __name((row) => {
       if (!logReady) {
         logReady = true;
         try {
-          mkdirSync20(dirname7(LOG_PATH2), { recursive: true });
+          mkdirSync20(dirname9(LOG_PATH2), { recursive: true });
         } catch {
         }
       }
@@ -62055,7 +63094,7 @@ var init_mathUnicode = __esm({
 
 // src/lib/syntax.ts
 function highlightLine(line, lang, t) {
-  const spec = resolve5(lang);
+  const spec = resolve6(lang);
   if (!spec) {
     return [["", line]];
   }
@@ -62087,7 +63126,7 @@ function highlightLine(line, lang, t) {
   }
   return tokens;
 }
-var KW, TS, PY, SH, GO, RUST, SQL, LANGS, ALIAS, resolve5, isHighlightable, TOKEN_RE;
+var KW, TS, PY, SH, GO, RUST, SQL, LANGS, ALIAS, resolve6, isHighlightable, TOKEN_RE;
 var init_syntax = __esm({
   "src/lib/syntax.ts"() {
     "use strict";
@@ -62141,8 +63180,8 @@ var init_syntax = __esm({
       yml: "yaml",
       zsh: "sh"
     };
-    resolve5 = /* @__PURE__ */ __name((lang) => LANGS[ALIAS[lang] ?? lang] ?? null, "resolve");
-    isHighlightable = /* @__PURE__ */ __name((lang) => resolve5(lang) !== null, "isHighlightable");
+    resolve6 = /* @__PURE__ */ __name((lang) => LANGS[ALIAS[lang] ?? lang] ?? null, "resolve");
+    isHighlightable = /* @__PURE__ */ __name((lang) => resolve6(lang) !== null, "isHighlightable");
     TOKEN_RE = /'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"|`(?:[^`\\]|\\.)*`|\b\d+(?:\.\d+)?\b|[A-Za-z_$][\w$]*/g;
     __name(highlightLine, "highlightLine");
   }
@@ -62242,9 +63281,9 @@ function MdImpl({ compact, t, text }) {
   const nodes = useMemo14(() => {
     const bucket = cacheBucket(t);
     const cacheKey = `${compact ? "1" : "0"}|${text}`;
-    const cached7 = cacheGet(bucket, cacheKey);
-    if (cached7) {
-      return cached7;
+    const cached8 = cacheGet(bucket, cacheKey);
+    if (cached8) {
+      return cached8;
     }
     const lines = ensureEmojiPresentation(text).split("\n");
     const nodes2 = [];
@@ -64477,12 +65516,18 @@ var init_entry = __esm({
 // src/main.ts
 async function main() {
   const args = process.argv.slice(2);
+  if (args[0] === "app") {
+    const { launchDesktop: launchDesktop2 } = await Promise.resolve().then(() => (init_launcher(), launcher_exports));
+    await launchDesktop2(args.slice(1));
+    return;
+  }
   if (args.includes("--help") || args.includes("-h")) {
     console.log(`
 OpenJaw Agent \u2014 Autonomous desktop AI assistant
 
 Usage:
   openjaw-agent                        Start new session (Ink UI)
+  openjaw-agent app                    Start the Electron desktop UI (optional)
   openjaw-agent --legacy-ui            Start with the previous Ink UI (pre-rewrite)
   openjaw-agent --telegram             Ink UI + Telegram bridge (hybrid)
   openjaw-agent --telegram --headless  Telegram only (no desktop UI)