sparkecoder 0.1.121 → 0.1.123

package/dist/index.js

@@ -2346,10 +2346,10 @@ async function resizeImageIfNeeded(buffer, mediaType) {
   const willConvertToJpeg = isPng && (needsShrink || buffer.length > 2 * 1024 * 1024);
   const outputMediaType = willConvertToJpeg || !isPng ? "image/jpeg" : "image/png";
   const ext = outputMediaType === "image/png" ? ".png" : ".jpg";
-  const cachePath = join3(cacheDir, key2 + ext);
-  if (existsSync3(cachePath)) {
+  const cachePath2 = join3(cacheDir, key2 + ext);
+  if (existsSync3(cachePath2)) {
     console.log(`[image-resize] Cache hit for ${width}x${height} image`);
-    return { buffer: readFileSync2(cachePath), mediaType: outputMediaType };
+    return { buffer: readFileSync2(cachePath2), mediaType: outputMediaType };
   }
   let pipeline = sharp(buffer);
   if (needsResize) {
@@ -2374,7 +2374,7 @@ async function resizeImageIfNeeded(buffer, mediaType) {
     }
     finalMediaType = "image/jpeg";
   }
-  writeFileSync2(cachePath, result);
+  writeFileSync2(cachePath2, result);
   const resultMeta = await sharp(result).metadata();
   console.log(
     `[image-resize] ${width}x${height} -> ${resultMeta.width}x${resultMeta.height} (${(buffer.length / 1024).toFixed(0)}KB -> ${(result.length / 1024).toFixed(0)}KB, ${finalMediaType})`
@@ -7447,6 +7447,84 @@ function stripOrphanedToolResults(msg, removedIds) {
   if (parts.length === 0) return null;
   return { ...msg, content: parts };
 }
+function wrapToolsNeverThrow(tools) {
+  if (!tools || typeof tools !== "object") return tools;
+  const wrapped = {};
+  for (const [name, t] of Object.entries(tools)) {
+    if (!t || typeof t.execute !== "function") {
+      wrapped[name] = t;
+      continue;
+    }
+    const original = t.execute;
+    wrapped[name] = {
+      ...t,
+      execute: async (input, opts) => {
+        try {
+          return await original.call(t, input, opts);
+        } catch (err) {
+          const message = err?.message ?? String(err);
+          console.warn(`[tool:${name}] threw \u2014 converted to error result so the tool-call isn't orphaned:`, message);
+          return {
+            __error: true,
+            tool: name,
+            message,
+            note: "Tool execution threw an exception. The agent should treat this as a failed tool call and decide how to recover."
+          };
+        }
+      }
+    };
+  }
+  return wrapped;
+}
+function ensureToolResultsFollowCalls(messages) {
+  if (!Array.isArray(messages) || messages.length < 3) return messages;
+  let mutated = false;
+  const result = messages.slice();
+  let i = 0;
+  while (i < result.length) {
+    const msg = result[i];
+    if (msg?.role !== "assistant" || !Array.isArray(msg.content)) {
+      i++;
+      continue;
+    }
+    const callIds = /* @__PURE__ */ new Set();
+    for (const part of msg.content) {
+      if (part?.type === "tool-call" && typeof part.toolCallId === "string") {
+        callIds.add(part.toolCallId);
+      }
+    }
+    if (callIds.size === 0) {
+      i++;
+      continue;
+    }
+    let toolIdx = -1;
+    for (let j = i + 1; j < result.length; j++) {
+      const m = result[j];
+      if (m?.role === "assistant" && Array.isArray(m.content) && m.content.some((p) => p?.type === "tool-call")) {
+        break;
+      }
+      if (m?.role === "tool" && Array.isArray(m.content)) {
+        const answersOne = m.content.some(
+          (p) => p?.type === "tool-result" && typeof p.toolCallId === "string" && callIds.has(p.toolCallId)
+        );
+        if (answersOne) {
+          toolIdx = j;
+          break;
+        }
+      }
+    }
+    if (toolIdx > i + 1) {
+      const [toolMsg] = result.splice(toolIdx, 1);
+      result.splice(i + 1, 0, toolMsg);
+      mutated = true;
+      console.warn(
+        `[tool-repair] Reordered tool-result message from index ${toolIdx} to ${i + 1} to immediately follow assistant tool-call(s) (${[...callIds].join(", ")}). ${toolIdx - i - 1} message(s) were wedged between them.`
+      );
+    }
+    i++;
+  }
+  return mutated ? result : messages;
+}
 function repairToolPairing(messages) {
   const toolCallIds = /* @__PURE__ */ new Set();
   const toolResultIds = /* @__PURE__ */ new Set();
@@ -7566,6 +7644,7 @@ ${summaryContent}`
           ];
         }
         messages = repairToolPairing(messages);
+        messages = ensureToolResultsFollowCalls(messages);
         messages = ensureEndsWithUserOrTool(messages);
         return messages;
       }
@@ -7760,7 +7839,7 @@ ${summaryContent}`
         }
       }
       async addResponseMessages(messages) {
-        const safe = repairToolPairing(messages);
+        const safe = ensureToolResultsFollowCalls(repairToolPairing(messages));
         await messageQueries.addMany(this.sessionId, safe);
         try {
           const { appendTurn: appendTurn2, flattenContent: flattenContent2 } = await Promise.resolve().then(() => (init_conversation_archive(), conversation_archive_exports));
@@ -7812,6 +7891,120 @@ var init_web = __esm({
   }
 });
 
+// src/integrations/slack/persistence.ts
+import { existsSync as existsSync16, mkdirSync as mkdirSync6, readFileSync as readFileSync7, writeFileSync as writeFileSync3, renameSync } from "fs";
+import { join as join9, dirname as dirname6 } from "path";
+function cachePath() {
+  return join9(ensureAppDataDirectory(), FILENAME);
+}
+function load() {
+  if (loaded) return;
+  loaded = true;
+  const path = cachePath();
+  if (!existsSync16(path)) return;
+  try {
+    const raw = readFileSync7(path, "utf-8");
+    const parsed = JSON.parse(raw);
+    if (parsed?.version !== FILE_VERSION) return;
+    const now = Date.now();
+    for (const [id, e] of Object.entries(parsed.users || {})) {
+      if (e && typeof e.expiresAt === "number" && e.expiresAt > now) {
+        userMap.set(id, { name: e.name ?? null, expiresAt: e.expiresAt });
+      }
+    }
+    for (const [key2, e] of Object.entries(parsed.threads || {})) {
+      if (e && typeof e.expiresAt === "number" && e.expiresAt > now) {
+        threadMap.set(key2, { owned: !!e.owned, expiresAt: e.expiresAt });
+      }
+    }
+  } catch (err) {
+    console.warn(`[slack] could not load ${FILENAME}:`, err?.message || err);
+  }
+}
+function evictIfOversized(map, max) {
+  if (map.size <= max) return;
+  const sorted = [...map.entries()].sort((a, b) => a[1].expiresAt - b[1].expiresAt);
+  const toRemove = map.size - max;
+  for (let i = 0; i < toRemove; i++) map.delete(sorted[i][0]);
+}
+function scheduleSave() {
+  dirty = true;
+  if (saveTimer) return;
+  saveTimer = setTimeout(() => {
+    saveTimer = null;
+    if (dirty) saveSync();
+  }, SAVE_DEBOUNCE_MS);
+  saveTimer.unref?.();
+}
+function saveSync() {
+  dirty = false;
+  try {
+    const path = cachePath();
+    const dir = dirname6(path);
+    if (!existsSync16(dir)) mkdirSync6(dir, { recursive: true });
+    const payload = {
+      version: FILE_VERSION,
+      users: Object.fromEntries(userMap),
+      threads: Object.fromEntries(threadMap)
+    };
+    const tmp = `${path}.tmp`;
+    writeFileSync3(tmp, JSON.stringify(payload), "utf-8");
+    renameSync(tmp, path);
+  } catch (err) {
+    console.warn(`[slack] could not persist ${FILENAME}:`, err?.message || err);
+  }
+}
+function hookExit() {
+  if (exitHooked) return;
+  exitHooked = true;
+  const flush2 = () => {
+    if (dirty) saveSync();
+  };
+  process.once("beforeExit", flush2);
+  process.once("SIGINT", flush2);
+  process.once("SIGTERM", flush2);
+}
+function getCachedUserName(userId) {
+  load();
+  return userMap.get(userId);
+}
+function setCachedUserName(userId, entry2) {
+  load();
+  hookExit();
+  userMap.set(userId, entry2);
+  evictIfOversized(userMap, MAX_USERS);
+  scheduleSave();
+}
+function getCachedThreadOwnership(key2) {
+  load();
+  return threadMap.get(key2);
+}
+function setCachedThreadOwnership(key2, entry2) {
+  load();
+  hookExit();
+  threadMap.set(key2, entry2);
+  evictIfOversized(threadMap, MAX_THREADS);
+  scheduleSave();
+}
+var FILENAME, FILE_VERSION, SAVE_DEBOUNCE_MS, MAX_USERS, MAX_THREADS, loaded, userMap, threadMap, dirty, saveTimer, exitHooked;
+var init_persistence = __esm({
+  "src/integrations/slack/persistence.ts"() {
+    "use strict";
+    init_config();
+    FILENAME = "slack-cache.json";
+    FILE_VERSION = 1;
+    SAVE_DEBOUNCE_MS = 500;
+    MAX_USERS = 5e3;
+    MAX_THREADS = 5e3;
+    loaded = false;
+    userMap = /* @__PURE__ */ new Map();
+    threadMap = /* @__PURE__ */ new Map();
+    dirty = false;
+    saveTimer = null;
+    exitHooked = false;
+  }
+});
+
 // src/integrations/slack/client.ts
 function readSlackConfig() {
   try {
@@ -7934,13 +8127,13 @@ async function fetchSlackUserName(userId) {
 async function resolveSlackUserName(userId) {
   if (!userId) return null;
   const now = Date.now();
-  const hit = userNameCache.get(userId);
+  const hit = getCachedUserName(userId);
   if (hit && hit.expiresAt > now) return hit.name;
   const inflight = userInflight.get(userId);
   if (inflight) return inflight;
   const p = (async () => {
     const name = await fetchSlackUserName(userId);
-    userNameCache.set(userId, {
+    setCachedUserName(userId, {
       name,
       expiresAt: now + (name ? USER_TTL_MS : USER_FAIL_TTL_MS)
     });
@@ -7962,11 +8155,63 @@ async function normalizeSlackMentions(text) {
   }
   return text.replace(userMentionRe, (_full, id, label) => {
     if (label) return `${label} <@${id}>`;
-    const cached = userNameCache.get(id);
+    const cached = getCachedUserName(id);
     const name = cached?.name;
     return name ? `${name} <@${id}>` : `<@${id}>`;
   });
 }
+function threadCacheKey(channel, threadTs) {
+  return `${channel}\u241F${threadTs}`;
+}
+async function fetchBotParticipatedInThread(channel, threadTs) {
+  const token = getSlackBotToken();
+  if (!token) return false;
+  const self = await ensureSlackSelfIdentity();
+  if (!self) return false;
+  try {
+    const url = `https://slack.com/api/conversations.replies?channel=${encodeURIComponent(channel)}&ts=${encodeURIComponent(threadTs)}&limit=200`;
+    const res = await fetch(url, { headers: { Authorization: `Bearer ${token}` } });
+    const data = await res.json().catch(() => ({}));
+    if (!data?.ok) {
+      console.warn(`[slack] conversations.replies(${channel}/${threadTs}) failed: ${data?.error || `HTTP ${res.status}`}`);
+      return false;
+    }
+    const messages = Array.isArray(data.messages) ? data.messages : [];
+    return messages.some(
+      (m) => self.botId && m.bot_id === self.botId || self.botUserId && m.user === self.botUserId
+    );
+  } catch (err) {
+    console.warn(`[slack] conversations.replies error:`, err?.message || err);
+    return false;
+  }
+}
+async function botParticipatedInThread(channel, threadTs) {
+  if (!channel || !threadTs) return false;
+  const key2 = threadCacheKey(channel, threadTs);
+  const now = Date.now();
+  const hit = getCachedThreadOwnership(key2);
+  if (hit && hit.expiresAt > now) return hit.owned;
+  const inflight = threadOwnedInflight.get(key2);
+  if (inflight) return inflight;
+  const p = (async () => {
+    const owned = await fetchBotParticipatedInThread(channel, threadTs);
+    setCachedThreadOwnership(key2, {
+      owned,
+      expiresAt: now + (owned ? THREAD_OWNED_TTL_MS : THREAD_NEG_TTL_MS)
+    });
+    threadOwnedInflight.delete(key2);
+    return owned;
+  })();
+  threadOwnedInflight.set(key2, p);
+  return p;
+}
+function noteBotPostedInThread(channel, threadTs) {
+  if (!channel || !threadTs) return;
+  setCachedThreadOwnership(threadCacheKey(channel, threadTs), {
+    owned: true,
+    expiresAt: Date.now() + THREAD_OWNED_TTL_MS
+  });
+}
 function getSlackDeniedReplyPolicy() {
   try {
     const cfg = getConfig();
@@ -7979,17 +8224,20 @@ function getSlackDeniedReplyPolicy() {
     return { enabled: true, template: DEFAULT_DENIED_TEMPLATE };
   }
 }
-var cachedSelf, selfInflight, USER_TTL_MS, USER_FAIL_TTL_MS, userNameCache, userInflight, DEFAULT_DENIED_TEMPLATE;
+var cachedSelf, selfInflight, USER_TTL_MS, USER_FAIL_TTL_MS, userInflight, THREAD_OWNED_TTL_MS, THREAD_NEG_TTL_MS, threadOwnedInflight, DEFAULT_DENIED_TEMPLATE;
 var init_client3 = __esm({
   "src/integrations/slack/client.ts"() {
     "use strict";
     init_config();
+    init_persistence();
     cachedSelf = null;
     selfInflight = null;
     USER_TTL_MS = 60 * 60 * 1e3;
     USER_FAIL_TTL_MS = 5 * 60 * 1e3;
-    userNameCache = /* @__PURE__ */ new Map();
     userInflight = /* @__PURE__ */ new Map();
+    THREAD_OWNED_TTL_MS = 60 * 60 * 1e3;
+    THREAD_NEG_TTL_MS = 5 * 60 * 1e3;
+    threadOwnedInflight = /* @__PURE__ */ new Map();
     DEFAULT_DENIED_TEMPLATE = "Sorry, you don't have permission to use this bot. (Contact the bot owner if you think this is a mistake.)";
   }
 });
@@ -8089,6 +8337,7 @@ var init_slack = __esm({
         if (!result.ok) throw new Error(`slack post failed: ${result.error}`);
         if (r.slackChannel && r.threadTs) {
           markThreadOwned(r.slackChannel, r.threadTs);
+          noteBotPostedInThread(r.slackChannel, r.threadTs);
         }
       },
       displayLabel(ref) {
@@ -8746,8 +8995,8 @@ var init_orchestrator_actions = __esm({
 
 // src/integrations/mcp/store.ts
 import { nanoid as nanoid6 } from "nanoid";
-import { existsSync as existsSync16, readFileSync as readFileSync7 } from "fs";
-import { resolve as resolve10, join as join9 } from "path";
+import { existsSync as existsSync17, readFileSync as readFileSync8 } from "fs";
+import { resolve as resolve10, join as join10 } from "path";
 function readServers() {
   try {
     const cfg = getConfig();
@@ -8759,12 +9008,12 @@ function readServers() {
 function refreshMcpServersFromDisk() {
   const candidates = [
     resolve10(process.cwd(), "sparkecoder.config.json"),
-    join9(ensureAppDataDirectory(), "sparkecoder.config.json")
+    join10(ensureAppDataDirectory(), "sparkecoder.config.json")
   ];
   for (const path of candidates) {
-    if (!existsSync16(path)) continue;
+    if (!existsSync17(path)) continue;
     try {
-      const raw = JSON.parse(readFileSync7(path, "utf-8"));
+      const raw = JSON.parse(readFileSync8(path, "utf-8"));
       const servers2 = Array.isArray(raw?.mcp?.servers) ? raw.mcp.servers : [];
       setMcpServers(servers2);
       return servers2;
@@ -9377,7 +9626,7 @@ __export(recorder_exports, {
 import { exec as exec5 } from "child_process";
 import { promisify as promisify5 } from "util";
 import { writeFile as writeFile5, mkdir as mkdir4, readFile as readFile11, unlink as unlink2, readdir as readdir5, rm } from "fs/promises";
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 import { tmpdir } from "os";
 import { nanoid as nanoid7 } from "nanoid";
 async function checkFfmpeg() {
@@ -9434,21 +9683,21 @@ var init_recorder = __esm({
        */
       async encode() {
         if (this.frames.length === 0) return null;
-        const workDir = join10(tmpdir(), `sparkecoder-recording-${nanoid7(8)}`);
+        const workDir = join11(tmpdir(), `sparkecoder-recording-${nanoid7(8)}`);
         await mkdir4(workDir, { recursive: true });
         try {
           for (let i = 0; i < this.frames.length; i++) {
-            const framePath = join10(workDir, `frame_${String(i).padStart(6, "0")}.jpg`);
+            const framePath = join11(workDir, `frame_${String(i).padStart(6, "0")}.jpg`);
             await writeFile5(framePath, this.frames[i].data);
           }
           const duration = (this.frames[this.frames.length - 1].timestamp - this.frames[0].timestamp) / 1e3;
           const fps = duration > 0 ? Math.round(this.frames.length / duration) : 10;
           const clampedFps = Math.max(1, Math.min(fps, 30));
-          const outputPath = join10(workDir, `recording_${this.sessionId}.mp4`);
+          const outputPath = join11(workDir, `recording_${this.sessionId}.mp4`);
           const hasFfmpeg = await checkFfmpeg();
           if (hasFfmpeg) {
             await execAsync5(
-              `ffmpeg -y -framerate ${clampedFps} -i "${join10(workDir, "frame_%06d.jpg")}" -c:v libx264 -pix_fmt yuv420p -preset fast -crf 23 "${outputPath}"`,
+              `ffmpeg -y -framerate ${clampedFps} -i "${join11(workDir, "frame_%06d.jpg")}" -c:v libx264 -pix_fmt yuv420p -preset fast -crf 23 "${outputPath}"`,
               { timeout: 12e4 }
             );
           } else {
@@ -9460,7 +9709,7 @@ var init_recorder = __esm({
           const files = await readdir5(workDir);
           for (const f of files) {
             if (f.startsWith("frame_")) {
-              await unlink2(join10(workDir, f)).catch(() => {
+              await unlink2(join11(workDir, f)).catch(() => {
               });
             }
           }
@@ -9701,7 +9950,7 @@ ${prompt}` });
         const config = getConfig();
         const userContent = this.buildUserMessageContent(options.prompt, options.attachments);
         if (!options.skipSaveUserMessage) {
-          this.context.addUserMessage(userContent);
+          await this.context.addUserMessage(userContent);
         }
         await sessionQueries.updateStatus(this.session.id, "active");
         let systemPrompt = await buildSystemPrompt({
@@ -9727,7 +9976,8 @@ ${personality.trim()}`;
         }
         const messages = await this.context.getMessages();
         const tools = options.onToolProgress ? await this.createToolsWithCallbacks({ onToolProgress: options.onToolProgress }) : this.baseTools;
-        const wrappedTools = this.wrapToolsWithApproval(options, tools);
+        const approvalWrapped = this.wrapToolsWithApproval(options, tools);
+        const wrappedTools = wrapToolsNeverThrow(approvalWrapped);
         const useAnthropic = isAnthropicModel(this.session.model);
         const stream = streamText2({
           model: resolveModel(this.session.model),
@@ -9741,6 +9991,18 @@ ${personality.trim()}`;
           providerOptions: useAnthropic ? {
             anthropic: getAnthropicProviderOptions(this.session.model, { toolStreaming: true })
           } : void 0,
+          // Run repairToolPairing before EVERY step's model call, not just the
+          // first one. The AI SDK's multi-step loop can otherwise feed the model
+          // a prompt containing an orphan tool-call (e.g. when a previous step's
+          // tool result was lost, dropped during compaction, or the stream was
+          // aborted mid-tool). Repairing in `prepareStep` guarantees no orphan
+          // ever reaches the model and we never hit AI_MissingToolResultsError.
+          prepareStep: async ({ messages: stepMessages }) => {
+            const paired = repairToolPairing(stepMessages);
+            const ordered = ensureToolResultsFollowCalls(paired);
+            if (ordered === stepMessages) return {};
+            return { messages: ordered };
+          },
           onStepFinish: async (step) => {
             options.onStepFinish?.(step);
           },
@@ -9752,7 +10014,7 @@ ${personality.trim()}`;
           const result = await stream;
           const response = await result.response;
           const responseMessages = response.messages;
-          this.context.addResponseMessages(responseMessages);
+          await this.context.addResponseMessages(responseMessages);
         };
         return {
           sessionId: this.session.id,
@@ -9766,7 +10028,7 @@ ${personality.trim()}`;
        */
       async run(options) {
         const config = getConfig();
-        this.context.addUserMessage(options.prompt);
+        await this.context.addUserMessage(options.prompt);
         const systemPrompt = await buildSystemPrompt({
           workingDirectory: this.session.workingDirectory,
           skillsDirectories: config.resolvedSkillsDirectories,
@@ -9776,7 +10038,7 @@ ${personality.trim()}`;
         });
         const messages = await this.context.getMessages();
         const tools = options.onToolProgress ? await this.createToolsWithCallbacks({ onToolProgress: options.onToolProgress }) : this.baseTools;
-        const wrappedTools = this.wrapToolsWithApproval(options, tools);
+        const wrappedTools = wrapToolsNeverThrow(this.wrapToolsWithApproval(options, tools));
         const useAnthropic = isAnthropicModel(this.session.model);
         const result = await generateText3({
           model: resolveModel(this.session.model),
@@ -9787,10 +10049,17 @@ ${personality.trim()}`;
           // Enable extended thinking/reasoning for models that support it
           providerOptions: useAnthropic ? {
             anthropic: getAnthropicProviderOptions(this.session.model)
-          } : void 0
+          } : void 0,
+          // Repair tool pairing before every step (see `stream()` for full rationale).
+          prepareStep: async ({ messages: stepMessages }) => {
+            const paired = repairToolPairing(stepMessages);
+            const ordered = ensureToolResultsFollowCalls(paired);
+            if (ordered === stepMessages) return {};
+            return { messages: ordered };
+          }
         });
         const responseMessages = result.response.messages;
-        this.context.addResponseMessages(responseMessages);
+        await this.context.addResponseMessages(responseMessages);
         return {
           text: result.text,
           steps: result.steps
@@ -9964,12 +10233,20 @@ ${p.text}` : p.text;
             model: resolveModel(this.session.model),
             system: systemPrompt,
             messages,
-            tools: taskTools,
+            tools: wrapToolsNeverThrow(taskTools),
             stopWhen: stepCountIs2(500),
             abortSignal: combinedAbort,
             providerOptions: useAnthropic ? {
               anthropic: getAnthropicProviderOptions(this.session.model, { toolStreaming: true })
             } : void 0,
+            // See the matching note in `stream()` — repair tool pairing before
+            // every step so we never feed the model an orphan tool-call.
+            prepareStep: async ({ messages: stepMessages }) => {
+              const paired = repairToolPairing(stepMessages);
+              const ordered = ensureToolResultsFollowCalls(paired);
+              if (ordered === stepMessages) return {};
+              return { messages: ordered };
+            },
             onStepFinish: async (step) => {
               options.onStepFinish?.(step);
               fireWebhook("task.step_finished", { iteration, text: step.text });
@@ -10203,11 +10480,11 @@ ${p.text}` : p.text;
           const { isRemoteConfigured: isRemoteConfigured2, storageQueries: storageQueries2 } = await Promise.resolve().then(() => (init_remote(), remote_exports));
           if (!isRemoteConfigured2()) return [];
           const { readFile: readFile13 } = await import("fs/promises");
-          const { join: join17, basename: basename7 } = await import("path");
+          const { join: join18, basename: basename7 } = await import("path");
           const urls = [];
           for (const filePath of filePaths) {
             try {
-              const fullPath = filePath.startsWith("/") ? filePath : join17(this.session.workingDirectory, filePath);
+              const fullPath = filePath.startsWith("/") ? filePath : join18(this.session.workingDirectory, filePath);
               const fileName = basename7(fullPath);
               const ext = fileName.split(".").pop()?.toLowerCase() || "";
               const mimeMap = {
@@ -10412,19 +10689,19 @@ var init_session_lock = __esm({
 });
 
 // src/orchestrator/webhook-events.ts
-import { existsSync as existsSync17, readFileSync as readFileSync8, appendFileSync as appendFileSync3, writeFileSync as writeFileSync3, mkdirSync as mkdirSync6 } from "fs";
-import { dirname as dirname6, join as join11 } from "path";
+import { existsSync as existsSync18, readFileSync as readFileSync9, appendFileSync as appendFileSync3, writeFileSync as writeFileSync4, mkdirSync as mkdirSync7 } from "fs";
+import { dirname as dirname7, join as join12 } from "path";
 import { nanoid as nanoid9 } from "nanoid";
 function logFilePath() {
-  return join11(getAppDataDirectory(), "webhook-events.jsonl");
+  return join12(getAppDataDirectory(), "webhook-events.jsonl");
 }
 function ensureLoaded() {
   if (cache !== null) return cache;
   cache = [];
   try {
     const p = logFilePath();
-    if (!existsSync17(p)) return cache;
-    const lines = readFileSync8(p, "utf-8").split("\n").filter(Boolean);
+    if (!existsSync18(p)) return cache;
+    const lines = readFileSync9(p, "utf-8").split("\n").filter(Boolean);
     for (const line of lines) {
       try {
         cache.push(JSON.parse(line));
@@ -10434,7 +10711,7 @@ function ensureLoaded() {
     if (cache.length > MAX_EVENTS) {
       cache = cache.slice(-MAX_EVENTS);
       try {
-        writeFileSync3(p, cache.map((e) => JSON.stringify(e)).join("\n") + "\n");
+        writeFileSync4(p, cache.map((e) => JSON.stringify(e)).join("\n") + "\n");
       } catch {
       }
     }
@@ -10448,7 +10725,7 @@ function appendEvent(ev) {
   if (list.length > MAX_EVENTS) list.shift();
   try {
     const p = logFilePath();
-    mkdirSync6(dirname6(p), { recursive: true });
+    mkdirSync7(dirname7(p), { recursive: true });
     appendFileSync3(p, JSON.stringify(ev) + "\n");
   } catch {
   }
@@ -10479,8 +10756,8 @@ function updateEvent(id, patch) {
   list[i] = { ...list[i], ...patch };
   try {
     const p = logFilePath();
-    mkdirSync6(dirname6(p), { recursive: true });
-    writeFileSync3(p, list.map((e) => JSON.stringify(e)).join("\n") + "\n");
+    mkdirSync7(dirname7(p), { recursive: true });
+    writeFileSync4(p, list.map((e) => JSON.stringify(e)).join("\n") + "\n");
   } catch {
   }
 }
@@ -10512,7 +10789,7 @@ function listEvents(filter = {}) {
 function clearAllEvents() {
   cache = [];
   try {
-    writeFileSync3(logFilePath(), "");
+    writeFileSync4(logFilePath(), "");
   } catch {
   }
 }
@@ -10786,8 +11063,8 @@ import { Hono as Hono10 } from "hono";
 import { serve } from "@hono/node-server";
 import { cors } from "hono/cors";
 import { logger } from "hono/logger";
-import { existsSync as existsSync21, mkdirSync as mkdirSync9, writeFileSync as writeFileSync6 } from "fs";
-import { resolve as resolve12, dirname as dirname9, join as join16 } from "path";
+import { existsSync as existsSync22, mkdirSync as mkdirSync10, writeFileSync as writeFileSync7 } from "fs";
+import { resolve as resolve12, dirname as dirname10, join as join17 } from "path";
 import { spawn as spawn2 } from "child_process";
 import { createServer as createNetServer } from "net";
 import { fileURLToPath as fileURLToPath4 } from "url";
@@ -10801,9 +11078,9 @@ init_checkpoints();
 import { Hono } from "hono";
 import { zValidator } from "@hono/zod-validator";
 import { z as z16 } from "zod";
-import { existsSync as existsSync18, mkdirSync as mkdirSync7, writeFileSync as writeFileSync4, readdirSync as readdirSync3, statSync as statSync2, unlinkSync as unlinkSync2 } from "fs";
+import { existsSync as existsSync19, mkdirSync as mkdirSync8, writeFileSync as writeFileSync5, readdirSync as readdirSync3, statSync as statSync2, unlinkSync as unlinkSync2 } from "fs";
 import { readdir as readdir6 } from "fs/promises";
-import { join as join12, basename as basename5, extname as extname8, relative as relative9 } from "path";
+import { join as join13, basename as basename5, extname as extname8, relative as relative9 } from "path";
 import { nanoid as nanoid10 } from "nanoid";
 
 // src/tasks/agent-status.ts
@@ -11441,12 +11718,12 @@ sessions2.get("/:id/diff/:filePath", async (c) => {
 });
 function getAttachmentsDir(sessionId) {
   const appDataDir = getAppDataDirectory();
-  return join12(appDataDir, "attachments", sessionId);
+  return join13(appDataDir, "attachments", sessionId);
 }
 function ensureAttachmentsDir(sessionId) {
   const dir = getAttachmentsDir(sessionId);
-  if (!existsSync18(dir)) {
-    mkdirSync7(dir, { recursive: true });
+  if (!existsSync19(dir)) {
+    mkdirSync8(dir, { recursive: true });
   }
   return dir;
 }
@@ -11457,12 +11734,12 @@ sessions2.get("/:id/attachments", async (c) => {
     return c.json({ error: "Session not found" }, 404);
   }
   const dir = getAttachmentsDir(sessionId);
-  if (!existsSync18(dir)) {
+  if (!existsSync19(dir)) {
     return c.json({ sessionId, attachments: [], count: 0 });
   }
   const files = readdirSync3(dir);
   const attachments = files.map((filename) => {
-    const filePath = join12(dir, filename);
+    const filePath = join13(dir, filename);
     const stats = statSync2(filePath);
     return {
       id: filename.split("_")[0],
@@ -11497,9 +11774,9 @@ sessions2.post("/:id/attachments", async (c) => {
       const id = nanoid10(10);
       const ext = extname8(file.name) || "";
       const safeFilename = `${id}_${basename5(file.name).replace(/[^a-zA-Z0-9._-]/g, "_")}`;
-      const filePath = join12(dir, safeFilename);
+      const filePath = join13(dir, safeFilename);
       const arrayBuffer = await file.arrayBuffer();
-      writeFileSync4(filePath, Buffer.from(arrayBuffer));
+      writeFileSync5(filePath, Buffer.from(arrayBuffer));
       return c.json({
         id,
         filename: file.name,
@@ -11523,13 +11800,13 @@ sessions2.post("/:id/attachments", async (c) => {
     const id = nanoid10(10);
     const ext = extname8(body.filename) || "";
     const safeFilename = `${id}_${basename5(body.filename).replace(/[^a-zA-Z0-9._-]/g, "_")}`;
-    const filePath = join12(dir, safeFilename);
+    const filePath = join13(dir, safeFilename);
     let base64Data = body.data;
     if (base64Data.includes(",")) {
       base64Data = base64Data.split(",")[1];
     }
     const buffer = Buffer.from(base64Data, "base64");
-    writeFileSync4(filePath, buffer);
+    writeFileSync5(filePath, buffer);
     return c.json({
       id,
       filename: body.filename,
@@ -11552,7 +11829,7 @@ sessions2.delete("/:id/attachments/:attachmentId", async (c) => {
     return c.json({ error: "Session not found" }, 404);
   }
   const dir = getAttachmentsDir(sessionId);
-  if (!existsSync18(dir)) {
+  if (!existsSync19(dir)) {
     return c.json({ error: "Attachment not found" }, 404);
   }
   const files = readdirSync3(dir);
@@ -11560,7 +11837,7 @@ sessions2.delete("/:id/attachments/:attachmentId", async (c) => {
   if (!file) {
     return c.json({ error: "Attachment not found" }, 404);
   }
-  const filePath = join12(dir, file);
+  const filePath = join13(dir, file);
   unlinkSync2(filePath);
   return c.json({ success: true, id: attachmentId });
 });
@@ -11643,7 +11920,7 @@ async function listWorkspaceFiles(baseDir, currentDir, query, limit, results = [
     const entries = await readdir6(currentDir, { withFileTypes: true });
     for (const entry2 of entries) {
       if (results.length >= limit * 2) break;
-      const fullPath = join12(currentDir, entry2.name);
+      const fullPath = join13(currentDir, entry2.name);
       const relativePath = relative9(baseDir, fullPath);
       if (entry2.isDirectory() && IGNORED_DIRECTORIES.has(entry2.name)) {
         continue;
@@ -11691,7 +11968,7 @@ sessions2.get(
       return c.json({ error: "Session not found" }, 404);
     }
     const workingDirectory = session.workingDirectory;
-    if (!existsSync18(workingDirectory)) {
+    if (!existsSync19(workingDirectory)) {
       return c.json({
         sessionId,
         workingDirectory,
@@ -11799,14 +12076,148 @@ sessions2.get("/:id/browser-recording", async (c) => {
 
 // src/server/routes/agents.ts
 init_db();
-init_agent();
-init_session_lock();
-init_config();
 import { Hono as Hono2 } from "hono";
 import { zValidator as zValidator2 } from "@hono/zod-validator";
 import { z as z17 } from "zod";
-import { existsSync as existsSync19, mkdirSync as mkdirSync8, writeFileSync as writeFileSync5 } from "fs";
-import { join as join13 } from "path";
+import { existsSync as existsSync20, mkdirSync as mkdirSync9, writeFileSync as writeFileSync6 } from "fs";
+import { join as join14 } from "path";
+
+// src/agent/missing-tool-recovery.ts
+init_db();
+function extractMissingToolCallIds(error) {
+  if (!error) return [];
+  const e = error;
+  if (Array.isArray(e.toolCallIds) && e.toolCallIds.every((x) => typeof x === "string")) {
+    return e.toolCallIds;
+  }
+  const msg = typeof e.message === "string" ? e.message : "";
+  const ids = /* @__PURE__ */ new Set();
+  for (const m of msg.matchAll(/(?:tool call|tool calls)\s+([a-zA-Z0-9_\-, ]+?)(?:\.|$)/g)) {
+    for (const id of m[1].split(/\s*,\s*/)) {
+      const trimmed = id.trim();
+      if (trimmed) ids.add(trimmed);
+    }
+  }
+  return [...ids];
+}
+function isMissingToolResultsError(error) {
+  if (!error) return false;
+  const e = error;
+  if (e.name === "AI_MissingToolResultsError") return true;
+  if (Array.isArray(e.toolCallIds)) return true;
+  return typeof e.message === "string" && /tool result.*is missing for tool call/i.test(e.message);
+}
+async function recoverFromMissingToolResults(sessionId, error) {
+  const toolCallIds = extractMissingToolCallIds(error);
+  if (toolCallIds.length === 0) return null;
+  let history = [];
+  try {
+    history = await messageQueries.getModelMessages(sessionId);
+  } catch (err) {
+    console.warn("[missing-tool-recovery] could not load messages:", err?.message || err);
+  }
+  const toolInfoByCallId = /* @__PURE__ */ new Map();
+  const resultMessageIndexByCallId = /* @__PURE__ */ new Map();
+  const existingResultIds = /* @__PURE__ */ new Set();
+  for (let idx = 0; idx < history.length; idx++) {
+    const msg = history[idx];
+    if (!Array.isArray(msg.content)) continue;
+    for (const part of msg.content) {
+      if (part?.type === "tool-call" && typeof part.toolCallId === "string") {
+        if (typeof part.toolName === "string") {
+          toolInfoByCallId.set(part.toolCallId, { toolName: part.toolName, callMessageIndex: idx });
+        }
+      }
+      if (part?.type === "tool-result" && typeof part.toolCallId === "string") {
+        existingResultIds.add(part.toolCallId);
+        resultMessageIndexByCallId.set(part.toolCallId, idx);
+      }
+    }
+  }
+  const resolved = toolCallIds.map((id) => {
+    const info = toolInfoByCallId.get(id);
+    const resultIdx = resultMessageIndexByCallId.get(id);
+    const wedgedRoles = info && typeof resultIdx === "number" && resultIdx > info.callMessageIndex + 1 ? history.slice(info.callMessageIndex + 1, resultIdx).map((m) => m.role) : void 0;
+    return {
+      toolCallId: id,
+      toolName: info?.toolName ?? "unknown",
+      foundInAssistantMessage: !!info,
+      callMessageIndex: info?.callMessageIndex,
+      resultMessageIndex: resultIdx,
+      wedgedMessageRoles: wedgedRoles
+    };
+  });
+  const stillOrphaned = toolCallIds.filter((id) => !existingResultIds.has(id));
+  let syntheticToolMessageSaved = false;
+  if (stillOrphaned.length > 0) {
+    const syntheticParts = stillOrphaned.map((id) => ({
+      type: "tool-result",
+      toolCallId: id,
+      toolName: toolInfoByCallId.get(id)?.toolName ?? "unknown",
+      output: {
+        type: "text",
+        value: "[Auto-recovered: the original tool execution never produced a result (crash, timeout, or message stripped during context compaction). This synthetic placeholder lets the conversation continue.]"
+      }
+    }));
+    try {
+      await messageQueries.create(sessionId, {
+        role: "tool",
+        content: syntheticParts
+      });
+      syntheticToolMessageSaved = true;
+    } catch (err) {
+      console.error("[missing-tool-recovery] failed to persist synthetic tool message:", err?.message || err);
+    }
+  }
+  const lastFewMessageRoles = history.slice(-6).map((m) => m.role);
+  const first = resolved.find((r) => r.callMessageIndex !== void 0);
+  let contextSnapshot;
+  if (first?.callMessageIndex !== void 0) {
+    const start = Math.max(0, first.callMessageIndex - 1);
+    const end = Math.min(
+      history.length,
+      Math.max(first.callMessageIndex, first.resultMessageIndex ?? first.callMessageIndex) + 2
+    );
+    contextSnapshot = history.slice(start, end).map((m, offset) => ({
+      index: start + offset,
+      role: m.role,
+      summary: summarizeContent(m.content)
+    }));
+  }
+  const anyWedged = resolved.some((r) => r.wedgedMessageRoles && r.wedgedMessageRoles.length > 0);
+  return {
+    kind: "missing_tool_results",
+    toolCallIds,
+    resolved,
+    syntheticToolMessageSaved,
+    lastFewMessageRoles,
+    contextSnapshot,
+    hint: anyWedged ? "A non-tool message was wedged between the assistant tool-call and its tool-result (likely a Slack/system inbox event that arrived mid-turn). " + (syntheticToolMessageSaved ? "Synthetic tool-result was added as a fallback, but the proper fix (now in place) is the reordering pass that moves tool-results to immediately follow their tool-calls." : "The reordering pass should fix this on the next turn; if not, revert to the previous checkpoint.") : syntheticToolMessageSaved ? "Synthetic tool-result(s) saved. Re-send your message to continue." : "Could not auto-recover; please reset the session or revert to the previous checkpoint."
+  };
+}
+function summarizeContent(content) {
+  if (typeof content === "string") {
+    return content.length > 160 ? content.slice(0, 160) + "\u2026" : content;
+  }
+  if (!Array.isArray(content)) return String(content);
+  const parts = content.map((p) => {
+    if (!p || typeof p !== "object") return String(p);
+    if (p.type === "text") {
+      const t = String(p.text ?? "");
+      return `text(${t.length > 80 ? t.slice(0, 80) + "\u2026" : t})`;
+    }
+    if (p.type === "tool-call") return `tool-call(${p.toolName}:${p.toolCallId})`;
+    if (p.type === "tool-result") return `tool-result(${p.toolName ?? "?"}:${p.toolCallId})`;
+    if (p.type === "reasoning") return "reasoning";
+    return p.type ?? "unknown";
+  });
+  return parts.join(", ");
+}
+
+// src/server/routes/agents.ts
+init_agent();
+init_session_lock();
+init_config();
 
 // src/server/resumable-stream.ts
 import { createResumableStreamContext } from "resumable-stream/generic";
@@ -12013,12 +12424,12 @@ var rejectSchema = z17.object({
 var streamAbortControllers = /* @__PURE__ */ new Map();
 function getAttachmentsDirectory(sessionId) {
   const appDataDir = getAppDataDirectory();
-  return join13(appDataDir, "attachments", sessionId);
+  return join14(appDataDir, "attachments", sessionId);
 }
 async function saveAttachmentToDisk(sessionId, attachment, index) {
   const attachmentsDir = getAttachmentsDirectory(sessionId);
-  if (!existsSync19(attachmentsDir)) {
-    mkdirSync8(attachmentsDir, { recursive: true });
+  if (!existsSync20(attachmentsDir)) {
+    mkdirSync9(attachmentsDir, { recursive: true });
   }
   let filename = attachment.filename;
   if (!filename) {
@@ -12036,8 +12447,8 @@ async function saveAttachmentToDisk(sessionId, attachment, index) {
     attachment.mediaType = resized.mediaType;
     attachment.data = buffer.toString("base64");
   }
-  const filePath = join13(attachmentsDir, filename);
-  writeFileSync5(filePath, buffer);
+  const filePath = join14(attachmentsDir, filename);
+  writeFileSync6(filePath, buffer);
   return filePath;
 }
 function stripDataUrlPrefix2(data) {
@@ -12374,7 +12785,20 @@ ${prompt}` });
           await writeSSE(JSON.stringify({ type: "abort" }));
         } else {
           console.error("Agent error:", error);
-          await writeSSE(JSON.stringify({ type: "error", errorText: error.message }));
+          let debugPayload = void 0;
+          if (isMissingToolResultsError(error)) {
+            try {
+              const recovery = await recoverFromMissingToolResults(sessionId, error);
+              if (recovery) debugPayload = recovery;
+            } catch (recErr) {
+              console.error("[missing-tool-recovery] failed:", recErr?.message || recErr);
+            }
+          }
+          await writeSSE(JSON.stringify({
+            type: "error",
+            errorText: error.message,
+            ...debugPayload ? { debug: debugPayload } : {}
+          }));
           try {
             await activeStreamQueries.markError(streamId);
           } catch {
@@ -12914,7 +13338,20 @@ agents.post(
             await writeSSE(JSON.stringify({ type: "abort" }));
           } else {
             console.error("Agent error:", error);
-            await writeSSE(JSON.stringify({ type: "error", errorText: error.message }));
+            let debugPayload = void 0;
+            if (isMissingToolResultsError(error)) {
+              try {
+                const recovery = await recoverFromMissingToolResults(session.id, error);
+                if (recovery) debugPayload = recovery;
+              } catch (recErr) {
+                console.error("[missing-tool-recovery] failed:", recErr?.message || recErr);
+              }
+            }
+            await writeSSE(JSON.stringify({
+              type: "error",
+              errorText: error.message,
+              ...debugPayload ? { debug: debugPayload } : {}
+            }));
             await activeStreamQueries.markError(streamId);
           }
         } finally {
@@ -12997,26 +13434,26 @@ init_config();
 import { Hono as Hono3 } from "hono";
 import { zValidator as zValidator3 } from "@hono/zod-validator";
 import { z as z18 } from "zod";
-import { readFileSync as readFileSync9 } from "fs";
+import { readFileSync as readFileSync10 } from "fs";
 import { fileURLToPath as fileURLToPath3 } from "url";
-import { dirname as dirname7, join as join14 } from "path";
+import { dirname as dirname8, join as join15 } from "path";
 var __filename = fileURLToPath3(import.meta.url);
-var __dirname = dirname7(__filename);
+var __dirname = dirname8(__filename);
 var possiblePaths = [
-  join14(__dirname, "../package.json"),
+  join15(__dirname, "../package.json"),
   // From dist/server -> dist/../package.json
-  join14(__dirname, "../../package.json"),
+  join15(__dirname, "../../package.json"),
   // From dist/server (if nested differently)
-  join14(__dirname, "../../../package.json"),
+  join15(__dirname, "../../../package.json"),
   // From src/server/routes (development)
-  join14(process.cwd(), "package.json")
+  join15(process.cwd(), "package.json")
   // From current working directory
 ];
 var currentVersion = "0.0.0";
 var packageName = "sparkecoder";
 for (const packageJsonPath of possiblePaths) {
   try {
-    const packageJson = JSON.parse(readFileSync9(packageJsonPath, "utf-8"));
+    const packageJson = JSON.parse(readFileSync10(packageJsonPath, "utf-8"));
     if (packageJson.name === "sparkecoder") {
       currentVersion = packageJson.version || "0.0.0";
       packageName = packageJson.name || "sparkecoder";
@@ -13834,12 +14271,13 @@ slack.post("/events", async (c) => {
     if (inbound) {
       const isThreadReply = ev.type === "message" && ev.channel_type !== "im" && typeof ev.thread_ts === "string" && ev.thread_ts !== ev.ts;
       if (isThreadReply) {
-        const ours = isThreadOwned(ev.channel, ev.thread_ts) || await threadBelongsToUs(ev.channel, ev.thread_ts);
+        const ours = isThreadOwned(ev.channel, ev.thread_ts) || await botParticipatedInThread(ev.channel, ev.thread_ts);
         if (!ours) {
           console.log(`[slack] dropping thread reply in unknown thread: channel=${ev.channel} thread=${ev.thread_ts}`);
           updateEvent(auditId, { status: "dropped", dropReason: "thread_not_owned" });
           return c.json({ ok: true });
         }
+        markThreadOwned(ev.channel, ev.thread_ts);
       }
       if (ev.type === "app_mention" && ev.channel && (ev.thread_ts || ev.ts)) {
         markThreadOwned(ev.channel, ev.thread_ts || ev.ts);
@@ -13878,18 +14316,6 @@ slack.post("/events", async (c) => {
   }
   return c.json({ ok: true });
 });
-async function threadBelongsToUs(channel, threadTs) {
-  try {
-    const sessions3 = await sessionQueries.list(500, 0);
-    return sessions3.some((s) => {
-      const slack2 = s.config?.slack;
-      return slack2?.channel === channel && slack2?.threadTs === threadTs;
-    });
-  } catch (err) {
-    console.warn("[slack] threadBelongsToUs lookup failed:", err?.message ?? err);
-    return false;
-  }
-}
 async function findOrCreateOrchestratorId() {
   try {
     const all = await sessionQueries.list(500, 0);
@@ -14278,9 +14704,9 @@ init_skills();
 import { Hono as Hono9 } from "hono";
 import { zValidator as zValidator7 } from "@hono/zod-validator";
 import { z as z22 } from "zod";
-import { existsSync as existsSync20, statSync as statSync3 } from "fs";
+import { existsSync as existsSync21, statSync as statSync3 } from "fs";
 import { readFile as readFile12, writeFile as writeFile6, unlink as unlink3, mkdir as mkdir5 } from "fs/promises";
-import { resolve as resolve11, join as join15, basename as basename6, dirname as dirname8, extname as extname9 } from "path";
+import { resolve as resolve11, join as join16, basename as basename6, dirname as dirname9, extname as extname9 } from "path";
 var skills = new Hono9();
 function encodeId(filePath) {
   return Buffer.from(filePath, "utf-8").toString("base64url");
@@ -14339,13 +14765,13 @@ function pathToLabel(path) {
   if (path.includes("/.sparkecoder/skills")) return ".sparkecoder/skills";
   if (path.includes("/.cursor/rules")) return ".cursor/rules";
   if (path.includes("/.claude/skills")) return ".claude/skills";
-  return basename6(dirname8(path)) + "/" + basename6(path);
+  return basename6(dirname9(path)) + "/" + basename6(path);
 }
 skills.get("/", async (c) => {
   const dirs = listAllDirectories();
   const allSkills = [];
   for (const dir of dirs) {
-    if (!existsSync20(dir.path)) continue;
+    if (!existsSync21(dir.path)) continue;
     try {
       const list = await loadSkillsFromDirectory(dir.path, {
         priority: dir.priority,
@@ -14382,7 +14808,7 @@ skills.get("/", async (c) => {
       label: d.label,
       source: d.source,
       alwaysApply: d.alwaysApply,
-      exists: existsSync20(d.path),
+      exists: existsSync21(d.path),
       writable: isWritable(d.path)
     })),
     skills: allSkills
@@ -14390,7 +14816,7 @@ skills.get("/", async (c) => {
 });
 function isWritable(dir) {
   try {
-    if (!existsSync20(dir)) return false;
+    if (!existsSync21(dir)) return false;
     if (dir.includes("/skills/default")) return false;
     return true;
   } catch {
@@ -14399,7 +14825,7 @@ function isWritable(dir) {
 }
 skills.get("/:id", async (c) => {
   const filePath = decodeId(c.req.param("id"));
-  if (!filePath || !existsSync20(filePath)) {
+  if (!filePath || !existsSync21(filePath)) {
     return c.json({ error: "skill not found" }, 404);
   }
   const content = await readFile12(filePath, "utf-8");
@@ -14428,8 +14854,8 @@ skills.post(
     const safeName = basename6(fileName).replace(/[^A-Za-z0-9._-]/g, "-");
     const ext = extname9(safeName).toLowerCase();
     const finalName = ext === ".md" || ext === ".mdc" ? safeName : `${safeName}.md`;
-    const filePath = join15(targetDir, finalName);
-    if (existsSync20(filePath)) {
+    const filePath = join16(targetDir, finalName);
+    if (existsSync21(filePath)) {
       return c.json({ error: `file already exists: ${finalName}` }, 409);
     }
     try {
@@ -14446,7 +14872,7 @@ skills.put(
   zValidator7("json", z22.object({ content: z22.string() })),
   async (c) => {
     const filePath = decodeId(c.req.param("id"));
-    if (!filePath || !existsSync20(filePath)) return c.json({ error: "skill not found" }, 404);
+    if (!filePath || !existsSync21(filePath)) return c.json({ error: "skill not found" }, 404);
     if (filePath.includes("/skills/default")) {
       return c.json({ error: "built-in skills are read-only" }, 400);
     }
@@ -14456,7 +14882,7 @@ skills.put(
 );
 skills.delete("/:id", async (c) => {
   const filePath = decodeId(c.req.param("id"));
-  if (!filePath || !existsSync20(filePath)) return c.json({ error: "skill not found" }, 404);
+  if (!filePath || !existsSync21(filePath)) return c.json({ error: "skill not found" }, 404);
   if (filePath.includes("/skills/default")) {
     return c.json({ error: "built-in skills are read-only" }, 400);
   }
@@ -14476,7 +14902,7 @@ skills.post(
     }
     const next = [...current, abs];
     setSkillsAdditionalDirectories(next);
-    return c.json({ ok: true, path: abs, exists: existsSync20(abs) }, 201);
+    return c.json({ ok: true, path: abs, exists: existsSync21(abs) }, 201);
   }
 );
 skills.delete("/directories", (c) => {
@@ -14650,13 +15076,13 @@ var DEFAULT_WEB_PORT = 6969;
 var WEB_PORT_SEQUENCE = [6969, 6970, 6971, 6972, 6973, 6974, 6975, 6976, 6977, 6978];
 function getWebDirectory() {
   try {
-    const currentDir = dirname9(fileURLToPath4(import.meta.url));
+    const currentDir = dirname10(fileURLToPath4(import.meta.url));
     const webDir = resolve12(currentDir, "..", "web");
-    if (existsSync21(webDir) && existsSync21(join16(webDir, "package.json"))) {
+    if (existsSync22(webDir) && existsSync22(join17(webDir, "package.json"))) {
       return webDir;
     }
     const altWebDir = resolve12(currentDir, "..", "..", "web");
-    if (existsSync21(altWebDir) && existsSync21(join16(altWebDir, "package.json"))) {
+    if (existsSync22(altWebDir) && existsSync22(join17(altWebDir, "package.json"))) {
       return altWebDir;
     }
     return null;
@@ -14714,23 +15140,23 @@ async function findWebPort(preferredPort) {
   return { port: preferredPort, alreadyRunning: false };
 }
 function hasProductionBuild(webDir) {
-  const buildIdPath = join16(webDir, ".next", "BUILD_ID");
-  return existsSync21(buildIdPath);
+  const buildIdPath = join17(webDir, ".next", "BUILD_ID");
+  return existsSync22(buildIdPath);
 }
 function hasSourceFiles(webDir) {
-  const appDir = join16(webDir, "src", "app");
-  const pagesDir = join16(webDir, "src", "pages");
-  const rootAppDir = join16(webDir, "app");
-  const rootPagesDir = join16(webDir, "pages");
-  return existsSync21(appDir) || existsSync21(pagesDir) || existsSync21(rootAppDir) || existsSync21(rootPagesDir);
+  const appDir = join17(webDir, "src", "app");
+  const pagesDir = join17(webDir, "src", "pages");
+  const rootAppDir = join17(webDir, "app");
+  const rootPagesDir = join17(webDir, "pages");
+  return existsSync22(appDir) || existsSync22(pagesDir) || existsSync22(rootAppDir) || existsSync22(rootPagesDir);
 }
 function getStandaloneServerPath(webDir) {
   const possiblePaths2 = [
-    join16(webDir, ".next", "standalone", "server.js"),
-    join16(webDir, ".next", "standalone", "web", "server.js")
+    join17(webDir, ".next", "standalone", "server.js"),
+    join17(webDir, ".next", "standalone", "web", "server.js")
   ];
   for (const serverPath of possiblePaths2) {
-    if (existsSync21(serverPath)) {
+    if (existsSync22(serverPath)) {
       return serverPath;
     }
   }
@@ -14770,15 +15196,15 @@ async function startWebUI(apiPort, webPort = DEFAULT_WEB_PORT, quiet = false, pu
     if (!quiet) console.log(`  \u2713 Web UI already running at http://localhost:${actualPort}`);
     return { process: null, port: actualPort };
   }
-  const usePnpm = existsSync21(join16(webDir, "pnpm-lock.yaml"));
-  const useNpm = !usePnpm && existsSync21(join16(webDir, "package-lock.json"));
+  const usePnpm = existsSync22(join17(webDir, "pnpm-lock.yaml"));
+  const useNpm = !usePnpm && existsSync22(join17(webDir, "package-lock.json"));
   const pkgManager = usePnpm ? "pnpm" : useNpm ? "npm" : "npx";
   const { NODE_OPTIONS, TSX_TSCONFIG_PATH, ...cleanEnv } = process.env;
   const apiUrl = publicUrl || `http://127.0.0.1:${apiPort}`;
   const runtimeConfig = { apiBaseUrl: apiUrl };
-  const runtimeConfigPath = join16(webDir, "runtime-config.json");
+  const runtimeConfigPath = join17(webDir, "runtime-config.json");
   try {
-    writeFileSync6(runtimeConfigPath, JSON.stringify(runtimeConfig, null, 2));
+    writeFileSync7(runtimeConfigPath, JSON.stringify(runtimeConfig, null, 2));
     if (!quiet) console.log(`  \u{1F4DD} Runtime config written to ${runtimeConfigPath}`);
   } catch (err) {
     if (!quiet) console.warn(`  \u26A0 Could not write runtime config: ${err}`);
@@ -14798,7 +15224,7 @@ async function startWebUI(apiPort, webPort = DEFAULT_WEB_PORT, quiet = false, pu
   if (standaloneServerPath) {
     command = "node";
     args = ["server.js"];
-    cwd = dirname9(standaloneServerPath);
+    cwd = dirname10(standaloneServerPath);
     webEnv.PORT = String(actualPort);
     webEnv.HOSTNAME = "0.0.0.0";
     if (!quiet) console.log("  \u{1F4E6} Starting Web UI from standalone build...");
@@ -14992,8 +15418,8 @@ async function startServer(options = {}) {
   if (options.workingDirectory) {
     config.resolvedWorkingDirectory = options.workingDirectory;
   }
-  if (!existsSync21(config.resolvedWorkingDirectory)) {
-    mkdirSync9(config.resolvedWorkingDirectory, { recursive: true });
+  if (!existsSync22(config.resolvedWorkingDirectory)) {
+    mkdirSync10(config.resolvedWorkingDirectory, { recursive: true });
     if (!options.quiet) console.log(`\u{1F4C1} Created agent workspace: ${config.resolvedWorkingDirectory}`);
   }
   if (!config.resolvedRemoteServer.url) {