reasonix 0.51.0 → 0.52.0

package/dist/cli/{desktop-H3ZHIMDA.js → desktop-LJVXWXNF.js}

@@ -3,22 +3,22 @@ import { createRequire as __cr } from 'node:module'; if (typeof globalThis.requi
 import {
   collectMemoryEntriesForWorkspace,
   readMemoryEntryDetail
-} from "./chunk-JHWQDJZA.js";
+} from "./chunk-CTRM32BP.js";
 import {
   QQChannel,
   createMcpRuntime
-} from "./chunk-5BBC6YMV.js";
+} from "./chunk-MVLPXZAA.js";
 import {
   applyPlanMode,
   buildCodeToolset
-} from "./chunk-NRROJXXT.js";
-import "./chunk-Z3MKG7MQ.js";
+} from "./chunk-FY5UERSG.js";
+import "./chunk-OMNRXZNA.js";
 import {
   Eventizer,
   autoResolveVerdict
-} from "./chunk-BM6BBFAV.js";
-import "./chunk-5AIDYVH2.js";
-import "./chunk-SVD4UPRQ.js";
+} from "./chunk-XBYHNZ5Z.js";
+import "./chunk-CFJY64UA.js";
+import "./chunk-XUZHBQSM.js";
 import {
   CacheFirstLoop,
   ImmutablePrefix,
@@ -26,53 +26,55 @@ import {
   listFilesWithStatsAsync,
   parseAtQuery,
   rankPickerCandidates
-} from "./chunk-K4YQFULP.js";
-import "./chunk-7YPMTE3U.js";
-import "./chunk-36BM7INR.js";
-import "./chunk-544J4PXD.js";
+} from "./chunk-HNZ4727T.js";
+import "./chunk-MW64SQUE.js";
+import "./chunk-D6WRFR6V.js";
+import "./chunk-RCC73DWQ.js";
 import {
   pauseGate,
   toApprovalPrompt
-} from "./chunk-UMZ6KHTS.js";
-import "./chunk-3YRTIWFX.js";
-import "./chunk-BA5R6BAE.js";
+} from "./chunk-5YLEKX2V.js";
 import {
   codeSystemPrompt
-} from "./chunk-HGK57NBN.js";
+} from "./chunk-2W4F3RIZ.js";
 import {
   SkillStore
-} from "./chunk-N4SEBLU4.js";
-import "./chunk-FEZK652I.js";
+} from "./chunk-DLTE4GBY.js";
 import "./chunk-PLHAZOLZ.js";
 import "./chunk-L3VPEESB.js";
-import "./chunk-7YB26OQO.js";
+import "./chunk-WPY7AFS6.js";
 import {
   countTokensBounded
 } from "./chunk-BOWSNGQC.js";
-import {
-  DeepSeekClient,
-  pickPrimaryBalance
-} from "./chunk-C2MRSJTV.js";
-import "./chunk-25T6CVUP.js";
-import "./chunk-2WUEAI2I.js";
+import "./chunk-CPCUMMSR.js";
 import "./chunk-6UNHNVJR.js";
 import {
   deleteSession,
+  detectGitBranch,
   listSessionsForWorkspace,
   loadSessionMessages,
   loadSessionMeta,
   patchSessionMeta,
   patchSessionWorkspaceIfMissing,
+  rewriteSession,
   sessionPath,
+  sessionsDir,
   timestampSuffix
-} from "./chunk-6XWXIVQ3.js";
+} from "./chunk-AMSK3ZLB.js";
 import {
   VERSION
 } from "./chunk-XXC2BYTV.js";
+import {
+  DeepSeekClient,
+  pickPrimaryBalance
+} from "./chunk-GFJJEW3Z.js";
+import "./chunk-25T6CVUP.js";
 import {
   loadDotenv
 } from "./chunk-2UQP6H6T.js";
-import "./chunk-DVD67FXQ.js";
+import "./chunk-ARBGTNHM.js";
+import "./chunk-6QBUXA73.js";
+import "./chunk-CLHMV6OL.js";
 import {
   DEFAULT_MODEL,
   bridgeEndpointEnv,
@@ -84,13 +86,17 @@ import {
   loadEditMode,
   loadEditor,
   loadEndpoint,
+  loadExaApiKey,
+  loadMetasoApiKey,
   loadModel,
+  loadPerplexityApiKey,
   loadQQConfig,
   loadReasoningEffort,
   loadRecentWorkspaces,
   loadResolvedSkillPaths,
   loadShowSystemEvents,
   loadSubagentModels,
+  loadTavilyApiKey,
   loadWorkspaceDir,
   parseMcpSpec,
   pushRecentWorkspace,
@@ -108,14 +114,14 @@ import {
   saveWorkspaceDir,
   webSearchEngine,
   writeConfig
-} from "./chunk-A5PBEIJ7.js";
+} from "./chunk-AOYUW3HR.js";
 import "./chunk-TUK7OWJA.js";
 
 // src/cli/commands/desktop.ts
 import { AsyncLocalStorage } from "async_hooks";
-import { existsSync, statSync, writeSync } from "fs";
+import { existsSync as existsSync2, statSync as statSync2, writeSync } from "fs";
 import { readFile } from "fs/promises";
-import { isAbsolute, join, resolve } from "path";
+import { isAbsolute, join as join2, resolve } from "path";
 import { stdin } from "process";
 import { createInterface } from "readline";
 
@@ -249,6 +255,386 @@ function clearQQTurnRouting(state) {
   state.pendingByTab.clear();
 }
 
+// src/session-import.ts
+import { existsSync, readFileSync, readdirSync, statSync } from "fs";
+import { homedir } from "os";
+import { basename, extname, join } from "path";
+function parseExternalSessionFile(source, path) {
+  if (!existsSync(path)) {
+    throw new Error(`source file not found: ${path}`);
+  }
+  return source === "claude" ? parseClaudeSessionFile(path) : parseCodexSessionFile(path);
+}
+function buildImportedSessionName(source, path, imported) {
+  const stem = basename(path, extname(path));
+  const hint = oneLine(imported.nameHint || imported.summary || stem, 48);
+  return `${source}-${hint || stem || "session"}`;
+}
+function importExternalSession(opts) {
+  const imported = parseExternalSessionFile(opts.source, opts.path);
+  if (imported.messages.length === 0) {
+    throw new Error(`no importable chat messages found in ${opts.path}`);
+  }
+  const name = opts.name?.trim() || buildImportedSessionName(opts.source, opts.path, imported);
+  const outputPath = sessionPath(name);
+  if (existsSync(outputPath) && !opts.force) {
+    throw new Error(`target session already exists: ${name}`);
+  }
+  rewriteSession(name, imported.messages);
+  const workspace = opts.workspace?.trim() || imported.workspace;
+  const summary = opts.summary?.trim() || imported.summary;
+  const branch = workspace ? detectGitBranch(workspace) : void 0;
+  patchSessionMeta(name, {
+    workspace,
+    summary,
+    branch,
+    importedSource: opts.source,
+    importedPath: opts.path
+  });
+  return {
+    source: opts.source,
+    path: opts.path,
+    name,
+    messageCount: imported.messages.length,
+    workspace,
+    summary,
+    branch
+  };
+}
+function discoverExternalSessionApps() {
+  return ["claude", "codex"].map((source) => {
+    const root = defaultSessionRoot(source);
+    const files = scanExternalSessionFiles(source);
+    const latest = files[0];
+    return {
+      source,
+      label: source === "claude" ? "Claude Code" : "Codex",
+      root,
+      available: files.length > 0,
+      sessionCount: files.length,
+      latestMtime: latest ? new Date(latest.mtimeMs).toISOString() : void 0
+    };
+  });
+}
+function importExternalSessions(opts) {
+  let imported = 0;
+  let skipped = 0;
+  let failed = 0;
+  let latestName;
+  const existing = importedPathKeys();
+  for (const source of opts.sources) {
+    const files = scanExternalSessionFiles(source);
+    for (const file of files) {
+      const key = importKey(source, file.path);
+      if (existing.has(key)) {
+        skipped++;
+        continue;
+      }
+      try {
+        const result = importExternalSession({
+          source,
+          path: file.path,
+          workspace: opts.workspace
+        });
+        existing.add(key);
+        imported++;
+        latestName ||= result.name;
+      } catch {
+        failed++;
+      }
+    }
+  }
+  return { imported, skipped, failed, latestName };
+}
+function defaultSessionRoot(source) {
+  return source === "claude" ? join(homedir(), ".claude", "projects") : join(homedir(), ".codex", "sessions");
+}
+function scanExternalSessionFiles(source) {
+  const root = defaultSessionRoot(source);
+  const out = [];
+  collectJsonl(root, source, out);
+  out.sort((a, b) => b.mtimeMs - a.mtimeMs);
+  return out;
+}
+function collectJsonl(dir, source, out) {
+  if (!existsSync(dir)) return;
+  let entries;
+  try {
+    entries = readdirSync(dir);
+  } catch {
+    return;
+  }
+  for (const entry of entries) {
+    const path = join(dir, entry);
+    let stat;
+    try {
+      stat = statSync(path);
+    } catch {
+      continue;
+    }
+    if (stat.isDirectory()) {
+      collectJsonl(path, source, out);
+    } else if (stat.isFile() && entry.endsWith(".jsonl")) {
+      out.push({ source, path, mtimeMs: stat.mtimeMs });
+    }
+  }
+}
+function importedPathKeys() {
+  const out = /* @__PURE__ */ new Set();
+  const dir = sessionsDir();
+  if (!existsSync(dir)) return out;
+  let files;
+  try {
+    files = readdirSync(dir);
+  } catch {
+    return out;
+  }
+  for (const file of files) {
+    if (!file.endsWith(".jsonl") || file.endsWith(".events.jsonl")) continue;
+    const name = file.replace(/\.jsonl$/, "");
+    const meta = loadSessionMeta(name);
+    if (meta.importedSource && meta.importedPath) {
+      out.add(importKey(meta.importedSource, meta.importedPath));
+    }
+  }
+  return out;
+}
+function importKey(source, path) {
+  return `${source}:${path}`;
+}
+function parseClaudeSessionFile(path) {
+  const records = readJsonl(path);
+  const messages = [];
+  const toolNames = /* @__PURE__ */ new Map();
+  let workspace;
+  let firstUserText;
+  for (const record of records) {
+    if (!workspace) workspace = firstString(record.cwd) || firstString(record.project);
+    if (record.isMeta === true) continue;
+    if (!record.message || typeof record.message !== "object") continue;
+    const role = normalizeRole(record.message.role);
+    if (!role) continue;
+    if (role === "assistant") {
+      const assistant = normalizeClaudeAssistant(record.message.content);
+      for (const call of assistant.toolCalls) {
+        if (call.id && call.function?.name) toolNames.set(call.id, call.function.name);
+      }
+      if (assistant.content || assistant.toolCalls.length > 0) {
+        messages.push({
+          role: "assistant",
+          content: assistant.content || null,
+          tool_calls: assistant.toolCalls.length > 0 ? assistant.toolCalls : void 0,
+          reasoning_content: assistant.reasoning || void 0
+        });
+      }
+      continue;
+    }
+    const user = normalizeClaudeUser(record.message.content, toolNames);
+    if (user.content) {
+      messages.push({ role: "user", content: user.content });
+      if (!firstUserText) firstUserText = user.content;
+    }
+    messages.push(...user.toolMessages);
+  }
+  return {
+    messages,
+    workspace,
+    nameHint: firstUserText,
+    summary: summarize(firstUserText)
+  };
+}
+function parseCodexSessionFile(path) {
+  const records = readJsonl(path);
+  const messages = [];
+  const fallback = [];
+  let workspace;
+  let firstUserText;
+  for (const record of records) {
+    if (record.type === "session_meta" || record.type === "turn_context") {
+      workspace ||= firstString(record.payload?.cwd);
+    }
+    if (record.type === "response_item" && record.payload?.type === "message") {
+      const role = normalizeRole(record.payload.role);
+      if (!role) continue;
+      const content = normalizeCodexMessageContent(role, record.payload.content);
+      if (!content) continue;
+      messages.push({ role, content });
+      if (role === "user" && !firstUserText) firstUserText = content;
+      continue;
+    }
+    if (record.type === "event_msg") {
+      const eventType = firstString(record.payload?.type);
+      const content = firstString(record.payload?.message);
+      if (!content) continue;
+      if (eventType === "user_message") {
+        fallback.push({ role: "user", content });
+        if (!firstUserText) firstUserText = content;
+      } else if (eventType === "agent_message") {
+        fallback.push({ role: "assistant", content });
+      }
+    }
+  }
+  const importedMessages = messages.length > 0 ? messages : dedupeAdjacentMessages(fallback);
+  return {
+    messages: importedMessages,
+    workspace,
+    nameHint: firstUserText,
+    summary: summarize(firstUserText)
+  };
+}
+function normalizeClaudeAssistant(content) {
+  if (typeof content === "string") {
+    return { content: content.trim(), toolCalls: [] };
+  }
+  if (!Array.isArray(content)) {
+    return { content: "", toolCalls: [] };
+  }
+  const textParts = [];
+  const toolCalls = [];
+  const reasoningParts = [];
+  for (const item of content) {
+    if (!item || typeof item !== "object") continue;
+    const type = firstString(item.type);
+    if (type === "text") {
+      const text = firstString(item.text);
+      if (text) textParts.push(text);
+      continue;
+    }
+    if (type === "thinking") {
+      const text = firstString(item.thinking);
+      if (text) reasoningParts.push(text);
+      continue;
+    }
+    if (type === "tool_use") {
+      const name = firstString(item.name);
+      if (!name) continue;
+      toolCalls.push({
+        id: firstString(item.id),
+        type: "function",
+        function: {
+          name,
+          arguments: safeJson(item.input ?? {})
+        }
+      });
+    }
+  }
+  return {
+    content: joinParts(textParts),
+    toolCalls,
+    reasoning: joinParts(reasoningParts) || void 0
+  };
+}
+function normalizeClaudeUser(content, toolNames) {
+  if (typeof content === "string") {
+    return { content: content.trim(), toolMessages: [] };
+  }
+  if (!Array.isArray(content)) {
+    return { content: "", toolMessages: [] };
+  }
+  const userText = [];
+  const toolMessages = [];
+  for (const item of content) {
+    if (!item || typeof item !== "object") continue;
+    const type = firstString(item.type);
+    if (type === "text") {
+      const text = firstString(item.text);
+      if (text) userText.push(text);
+      continue;
+    }
+    if (type === "image") {
+      userText.push("[image omitted]");
+      continue;
+    }
+    if (type === "tool_result") {
+      const callId = firstString(item.tool_use_id);
+      toolMessages.push({
+        role: "tool",
+        content: normalizeArbitraryContent(item.content),
+        tool_call_id: callId,
+        name: callId ? toolNames.get(callId) : void 0
+      });
+    }
+  }
+  return { content: joinParts(userText), toolMessages };
+}
+function normalizeCodexMessageContent(role, content) {
+  if (typeof content === "string") return content.trim();
+  if (!Array.isArray(content)) return "";
+  const textParts = [];
+  for (const item of content) {
+    if (!item || typeof item !== "object") continue;
+    const type = firstString(item.type);
+    if (type === "input_text" || type === "output_text" || type === "text") {
+      const text = firstString(item.text);
+      if (!text) continue;
+      if (role === "user" && looksLikeCodexBootstrapBlock(text)) continue;
+      textParts.push(text);
+    }
+  }
+  return joinParts(textParts);
+}
+function looksLikeCodexBootstrapBlock(text) {
+  const trimmed = text.trimStart();
+  return trimmed.startsWith("# AGENTS.md instructions for ") || trimmed.startsWith("<environment_context>");
+}
+function dedupeAdjacentMessages(messages) {
+  const out = [];
+  for (const msg of messages) {
+    const prev = out[out.length - 1];
+    if (prev && prev.role === msg.role && prev.content === msg.content) continue;
+    out.push(msg);
+  }
+  return out;
+}
+function normalizeArbitraryContent(value) {
+  if (typeof value === "string") return value;
+  if (Array.isArray(value)) {
+    const textParts = value.map((item) => {
+      if (typeof item === "string") return item;
+      if (item && typeof item === "object") {
+        return firstString(item.text);
+      }
+      return "";
+    }).filter(Boolean);
+    if (textParts.length > 0) return joinParts(textParts);
+  }
+  return safeJson(value);
+}
+function readJsonl(path) {
+  const raw = readFileSync(path, "utf8");
+  return raw.split(/\r?\n/).map((line) => line.trim()).filter(Boolean).flatMap((line) => {
+    try {
+      return [JSON.parse(line)];
+    } catch {
+      return [];
+    }
+  });
+}
+function normalizeRole(value) {
+  return value === "user" || value === "assistant" ? value : void 0;
+}
+function firstString(value) {
+  return typeof value === "string" && value.trim().length > 0 ? value : void 0;
+}
+function safeJson(value) {
+  try {
+    return JSON.stringify(value ?? null);
+  } catch {
+    return JSON.stringify(String(value));
+  }
+}
+function joinParts(parts) {
+  return parts.map((part) => part.trim()).filter(Boolean).join("\n\n");
+}
+function summarize(text) {
+  const flat = oneLine(text || "", 120);
+  return flat || void 0;
+}
+function oneLine(text, max) {
+  const flat = text.replace(/\s+/g, " ").trim();
+  return flat.length > max ? `${flat.slice(0, max)}...` : flat;
+}
+
 // src/cli/commands/desktop.ts
 var desktopQqRuntimeSnapshot = {
   runtimeState: "disconnected"
@@ -367,6 +753,19 @@ function buildLoadedMessages(records) {
   }
   return elideLoadedMessages(out);
 }
+function maskApiKey(key) {
+  if (!key) return void 0;
+  if (key.length <= 7) return `${key.slice(0, 2)}\u2026`;
+  return `${key.slice(0, 6)}\u2026${key.slice(-3)}`;
+}
+function collectWebSearchApiKeyPrefixes() {
+  return {
+    metaso: maskApiKey(loadMetasoApiKey()),
+    tavily: maskApiKey(loadTavilyApiKey()),
+    perplexity: maskApiKey(loadPerplexityApiKey()),
+    exa: maskApiKey(loadExaApiKey())
+  };
+}
 function emitSettings(tab) {
   const ep = loadEndpoint();
   const editMode = loadEditMode();
@@ -385,6 +784,8 @@ function emitSettings(tab) {
       model: tab.currentModel,
       editor: loadEditor(),
       webSearchEngine: webSearchEngine(),
+      webSearchEndpoint: readConfig().webSearchEndpoint,
+      webSearchApiKeys: collectWebSearchApiKeyPrefixes(),
       subagentModels: loadSubagentModels(),
       showSystemEvents: loadShowSystemEvents(),
       version: VERSION
@@ -434,6 +835,45 @@ function emitSessions(tab) {
     emit({ type: "$error", message: `session_list failed: ${err.message}` }, tab.id);
   }
 }
+function loadSessionIntoTab(tab, name, actions) {
+  const records = loadSessionMessages(name);
+  const backfilledWorkspace = patchSessionWorkspaceIfMissing(name, tab.rootDir);
+  const meta = loadSessionMeta(name);
+  if (tab.aborter) tab.switching = true;
+  actions.abortTurn(tab);
+  actions.cancelPendingGates(tab);
+  tab.currentSession = name;
+  actions.persistOpenTabs();
+  if (tab.runtime) tab.runtime = buildRuntimeFor(tab);
+  const loadedMessages = buildLoadedMessages(records);
+  if (loadedMessages.length === 0) {
+    let sizeBytes = 0;
+    try {
+      sizeBytes = statSync2(sessionPath(name)).size;
+    } catch {
+    }
+    process.stderr.write(
+      `session_load: "${name}" returned 0 messages (file size=${sizeBytes}B) \u2014 empty or unreadable jsonl
+`
+    );
+    emit({ type: "$session_empty", name, sizeBytes }, tab.id);
+  }
+  emit(
+    {
+      type: "$session_loaded",
+      name,
+      messages: loadedMessages,
+      carryover: {
+        totalCostUsd: meta.totalCostUsd ?? 0,
+        cacheHitTokens: meta.cacheHitTokens ?? 0,
+        cacheMissTokens: meta.cacheMissTokens ?? 0,
+        totalCompletionTokens: meta.totalCompletionTokens ?? 0
+      }
+    },
+    tab.id
+  );
+  if (backfilledWorkspace) emitSessions(tab);
+}
 function summarizeMcpSpec(raw) {
   try {
     const parsed = parseMcpSpec(raw);
@@ -579,7 +1019,7 @@ async function getSymbolIndexFor(tab) {
       const batch = candidates.slice(i, i + PARALLEL);
       await Promise.all(
         batch.map(async (entry) => {
-          const abs = isAbsolute(entry.path) ? entry.path : join(tab.rootDir, entry.path);
+          const abs = isAbsolute(entry.path) ? entry.path : join2(tab.rootDir, entry.path);
           try {
             const text = await readFile(abs, "utf8");
             const lines = text.split(/\r?\n/);
@@ -1147,7 +1587,7 @@ ${optionsList}${p.allowCustom ? "\n\n(You can also reply with custom text.)" : "
       emitSettings(tab);
       return;
     }
-    if (!existsSync(target) || !statSync(target).isDirectory()) {
+    if (!existsSync2(target) || !statSync2(target).isDirectory()) {
       emit({ type: "$error", message: `Workspace not found: ${target}` }, tab.id);
       emitSettings(tab);
       return;
@@ -1442,7 +1882,7 @@ ${optionsList}${p.allowCustom ? "\n\n(You can also reply with custom text.)" : "
     let restoredMessages;
     if (restore?.session) {
       try {
-        if (existsSync(sessionPath(restore.session))) {
+        if (existsSync2(sessionPath(restore.session))) {
           const msgs = buildLoadedMessages(loadSessionMessages(restore.session));
           if (msgs.length > 0) {
             tab.currentSession = restore.session;
@@ -1488,7 +1928,7 @@ ${optionsList}${p.allowCustom ? "\n\n(You can also reply with custom text.)" : "
   }
   const savedTabs = loadDesktopOpenTabs().filter((t) => {
     try {
-      return existsSync(t.dir) && statSync(t.dir).isDirectory();
+      return existsSync2(t.dir) && statSync2(t.dir).isDirectory();
     } catch {
       return false;
     }
@@ -1772,45 +2212,77 @@ ${found.body}${argsLine}`;
       }
       return;
     }
-    if (msg.cmd === "session_load") {
+    if (msg.cmd === "session_import") {
       try {
-        const records = loadSessionMessages(msg.name);
-        const backfilledWorkspace = patchSessionWorkspaceIfMissing(msg.name, tab.rootDir);
-        const meta = loadSessionMeta(msg.name);
-        if (tab.aborter) tab.switching = true;
-        abortTurn(tab);
-        cancelPendingGates(tab);
-        tab.currentSession = msg.name;
-        persistOpenTabs();
-        if (tab.runtime) tab.runtime = buildRuntimeFor(tab);
-        const loadedMessages = buildLoadedMessages(records);
-        if (loadedMessages.length === 0) {
-          let sizeBytes = 0;
-          try {
-            sizeBytes = statSync(sessionPath(msg.name)).size;
-          } catch {
-          }
-          process.stderr.write(
-            `session_load: "${msg.name}" returned 0 messages (file size=${sizeBytes}B) \u2014 empty or unreadable jsonl
-`
-          );
-          emit({ type: "$session_empty", name: msg.name, sizeBytes }, tab.id);
-        }
+        const result = importExternalSession({
+          source: msg.source,
+          path: msg.path,
+          name: msg.name,
+          workspace: tab.rootDir
+        });
+        emitSessions(tab);
+        loadSessionIntoTab(tab, result.name, {
+          abortTurn,
+          cancelPendingGates,
+          persistOpenTabs
+        });
+      } catch (err) {
+        emit(
+          { type: "$error", message: `session_import failed: ${err.message}` },
+          tab.id
+        );
+      }
+      return;
+    }
+    if (msg.cmd === "session_import_scan") {
+      try {
+        emit({ type: "$session_import_sources", apps: discoverExternalSessionApps() }, tab.id);
+      } catch (err) {
+        emit(
+          { type: "$error", message: `session_import_scan failed: ${err.message}` },
+          tab.id
+        );
+      }
+      return;
+    }
+    if (msg.cmd === "session_import_bulk") {
+      try {
+        const result = importExternalSessions({
+          sources: msg.sources,
+          workspace: tab.rootDir
+        });
+        emitSessions(tab);
         emit(
           {
-            type: "$session_loaded",
-            name: msg.name,
-            messages: loadedMessages,
-            carryover: {
-              totalCostUsd: meta.totalCostUsd ?? 0,
-              cacheHitTokens: meta.cacheHitTokens ?? 0,
-              cacheMissTokens: meta.cacheMissTokens ?? 0,
-              totalCompletionTokens: meta.totalCompletionTokens ?? 0
-            }
+            type: "$session_import_result",
+            imported: result.imported,
+            skipped: result.skipped,
+            failed: result.failed
           },
           tab.id
         );
-        if (backfilledWorkspace) emitSessions(tab);
+        if (result.latestName) {
+          loadSessionIntoTab(tab, result.latestName, {
+            abortTurn,
+            cancelPendingGates,
+            persistOpenTabs
+          });
+        }
+      } catch (err) {
+        emit(
+          { type: "$error", message: `session_import_bulk failed: ${err.message}` },
+          tab.id
+        );
+      }
+      return;
+    }
+    if (msg.cmd === "session_load") {
+      try {
+        loadSessionIntoTab(tab, msg.name, {
+          abortTurn,
+          cancelPendingGates,
+          persistOpenTabs
+        });
       } catch (err) {
         process.stderr.write(`session_load: "${msg.name}" threw \u2014 ${err.message}
 `);
@@ -1866,9 +2338,24 @@ ${found.body}${argsLine}`;
         }
         if (msg.editor !== void 0) saveEditor(msg.editor);
         if (msg.showSystemEvents !== void 0) saveShowSystemEvents(msg.showSystemEvents);
-        if (msg.webSearchEngine !== void 0) {
+        if (msg.webSearchEngine !== void 0 || msg.webSearchEndpoint !== void 0 || msg.metasoApiKey !== void 0 || msg.tavilyApiKey !== void 0 || msg.perplexityApiKey !== void 0 || msg.exaApiKey !== void 0) {
           const cfg = readConfig();
-          cfg.webSearchEngine = msg.webSearchEngine;
+          if (msg.webSearchEngine !== void 0) cfg.webSearchEngine = msg.webSearchEngine;
+          if (msg.webSearchEndpoint !== void 0) {
+            cfg.webSearchEndpoint = msg.webSearchEndpoint?.trim() || void 0;
+          }
+          if (msg.metasoApiKey !== void 0) {
+            cfg.metasoApiKey = msg.metasoApiKey?.trim() || void 0;
+          }
+          if (msg.tavilyApiKey !== void 0) {
+            cfg.tavilyApiKey = msg.tavilyApiKey?.trim() || void 0;
+          }
+          if (msg.perplexityApiKey !== void 0) {
+            cfg.perplexityApiKey = msg.perplexityApiKey?.trim() || void 0;
+          }
+          if (msg.exaApiKey !== void 0) {
+            cfg.exaApiKey = msg.exaApiKey?.trim() || void 0;
+          }
           writeConfig(cfg);
         }
         if (msg.subagentModels !== void 0) {
@@ -2041,7 +2528,7 @@ ${found.body}${argsLine}`;
     if (msg.cmd === "mention_preview") {
       const nonce = msg.nonce;
       const rel = msg.path;
-      const abs = isAbsolute(rel) ? rel : join(tab.rootDir, rel);
+      const abs = isAbsolute(rel) ? rel : join2(tab.rootDir, rel);
       const safeAbs = resolve(abs);
       const safeRoot = resolve(tab.rootDir);
       if (!safeAbs.startsWith(safeRoot)) {
@@ -2125,4 +2612,4 @@ export {
   normalizeSessionTitle,
   writeAllSync
 };
-//# sourceMappingURL=desktop-H3ZHIMDA.js.map
+//# sourceMappingURL=desktop-LJVXWXNF.js.map