sparkecoder 0.1.120 → 0.1.122

package/dist/index.js

@@ -450,6 +450,7 @@ __export(config_exports, {
   setApiKey: () => setApiKey,
   setMcpServers: () => setMcpServers,
   setPublicUrl: () => setPublicUrl,
+  setSkillsAdditionalDirectories: () => setSkillsAdditionalDirectories,
   setSlackConfig: () => setSlackConfig,
   setWebhookToken: () => setWebhookToken
 });
@@ -739,6 +740,40 @@ function setWebhookToken(token) {
     console.warn("[config] failed to persist webhook token:", err?.message || err);
   }
 }
+function setSkillsAdditionalDirectories(directories) {
+  if (cachedConfig) {
+    const cur = cachedConfig.skills || {};
+    cachedConfig.skills = { ...cur, additionalDirectories: directories };
+    try {
+      const discovered = discoverSkillDirectories(cachedConfig.resolvedWorkingDirectory);
+      const additionalAbs = directories.map((d) => resolve(cachedConfig.resolvedWorkingDirectory, d)).filter((d) => existsSync(d));
+      cachedConfig.discoveredSkills = discovered;
+      cachedConfig.resolvedSkillsDirectories = [
+        ...discovered.allDirectories,
+        ...additionalAbs
+      ];
+    } catch {
+    }
+  }
+  try {
+    const cwdPath = resolve(process.cwd(), "sparkecoder.config.json");
+    const target = existsSync(cwdPath) ? cwdPath : join(ensureAppDataDirectory(), "sparkecoder.config.json");
+    let raw = {};
+    if (existsSync(target)) {
+      try {
+        raw = JSON.parse(readFileSync(target, "utf-8"));
+      } catch {
+        raw = {};
+      }
+    } else {
+      raw = createDefaultConfig();
+    }
+    raw.skills = { ...raw.skills || {}, additionalDirectories: directories };
+    writeFileSync(target, JSON.stringify(raw, null, 2));
+  } catch (err) {
+    console.warn("[config] failed to persist skill directories:", err?.message || err);
+  }
+}
 function setPublicUrl(publicUrl) {
   if (cachedConfig) {
     cachedConfig.server = { ...cachedConfig.server ?? {}, publicUrl };
@@ -2311,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) {
@@ -2339,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})`
@@ -3030,7 +3065,7 @@ async function createClient(serverId, handle, root) {
     },
     async waitForDiagnostics(filePath, timeoutMs = 5e3) {
       const normalized = normalizePath(filePath);
-      return new Promise((resolve12) => {
+      return new Promise((resolve13) => {
         const startTime = Date.now();
         let debounceTimer;
         let resolved = false;
@@ -3049,7 +3084,7 @@ async function createClient(serverId, handle, root) {
           if (resolved) return;
           resolved = true;
           cleanup2();
-          resolve12(diagnostics.get(normalized) || []);
+          resolve13(diagnostics.get(normalized) || []);
         };
         const onDiagnostic = () => {
           if (debounceTimer) clearTimeout(debounceTimer);
@@ -3424,7 +3459,7 @@ Working directory: ${options.workingDirectory}`,
                 isChunked: true
               });
               if (chunkCount > 1) {
-                await new Promise((resolve12) => setTimeout(resolve12, 0));
+                await new Promise((resolve13) => setTimeout(resolve13, 0));
               }
             }
           }
@@ -4043,7 +4078,7 @@ async function loadSkillsFromDirectory(directory, options = {}) {
   if (!existsSync10(directory)) {
     return [];
   }
-  const skills = [];
+  const skills2 = [];
   const entries = await readdir(directory, { withFileTypes: true });
   for (const entry2 of entries) {
     let filePath;
@@ -4067,7 +4102,7 @@ async function loadSkillsFromDirectory(directory, options = {}) {
     if (parsed) {
       const alwaysApply = forceAlwaysApply || parsed.metadata.alwaysApply;
       const loadType = alwaysApply ? "always" : defaultLoadType;
-      skills.push({
+      skills2.push({
         name: parsed.metadata.name,
         description: parsed.metadata.description,
         filePath,
@@ -4081,7 +4116,7 @@ async function loadSkillsFromDirectory(directory, options = {}) {
     } else {
       const name = getSkillNameFromPath(filePath);
       const firstParagraph = content.split("\n\n")[0]?.slice(0, 200) || "No description";
-      skills.push({
+      skills2.push({
         name,
         description: firstParagraph.replace(/^#\s*/, "").trim(),
         filePath,
@@ -4094,7 +4129,7 @@ async function loadSkillsFromDirectory(directory, options = {}) {
       });
     }
   }
-  return skills.filter(
+  return skills2.filter(
     (s) => s.platforms.length === 0 || s.platforms.includes(process.platform)
   );
 }
@@ -4102,8 +4137,8 @@ async function loadAllSkills(directories) {
   const allSkills = [];
   const seenNames = /* @__PURE__ */ new Set();
   for (const dir of directories) {
-    const skills = await loadSkillsFromDirectory(dir);
-    for (const skill of skills) {
+    const skills2 = await loadSkillsFromDirectory(dir);
+    for (const skill of skills2) {
       if (!seenNames.has(skill.name.toLowerCase())) {
         seenNames.add(skill.name.toLowerCase());
         allSkills.push(skill);
@@ -4116,12 +4151,12 @@ async function loadAllSkillsFromDiscovered(discovered) {
   const allSkills = [];
   const seenNames = /* @__PURE__ */ new Set();
   for (const { path, priority } of discovered.alwaysLoadedDirs) {
-    const skills = await loadSkillsFromDirectory(path, {
+    const skills2 = await loadSkillsFromDirectory(path, {
       priority,
       defaultLoadType: "always",
       forceAlwaysApply: true
     });
-    for (const skill of skills) {
+    for (const skill of skills2) {
       if (!seenNames.has(skill.name.toLowerCase())) {
         seenNames.add(skill.name.toLowerCase());
         allSkills.push(skill);
@@ -4129,12 +4164,12 @@ async function loadAllSkillsFromDiscovered(discovered) {
     }
   }
   for (const { path, priority } of discovered.onDemandDirs) {
-    const skills = await loadSkillsFromDirectory(path, {
+    const skills2 = await loadSkillsFromDirectory(path, {
       priority,
       defaultLoadType: "on_demand",
       forceAlwaysApply: false
     });
-    for (const skill of skills) {
+    for (const skill of skills2) {
       if (!seenNames.has(skill.name.toLowerCase())) {
         seenNames.add(skill.name.toLowerCase());
         allSkills.push(skill);
@@ -4159,7 +4194,7 @@ async function loadAllSkillsFromDiscovered(discovered) {
     all: allSkills
   };
 }
-async function getGlobMatchedSkills(skills, activeFiles, workingDirectory) {
+async function getGlobMatchedSkills(skills2, activeFiles, workingDirectory) {
   if (activeFiles.length === 0) {
     return [];
   }
@@ -4169,7 +4204,7 @@ async function getGlobMatchedSkills(skills, activeFiles, workingDirectory) {
     }
     return f;
   });
-  const matchedSkills = skills.filter((skill) => {
+  const matchedSkills = skills2.filter((skill) => {
     if (skill.alwaysApply || skill.loadType === "always") {
       return false;
     }
@@ -4215,8 +4250,8 @@ async function loadSkillContent(skillName, directories) {
     content: parsed ? parsed.body : content
   };
 }
-function formatSkillsForContext(skills) {
-  const onDemandSkills = skills.filter((s) => !s.alwaysApply && s.loadType !== "always");
+function formatSkillsForContext(skills2) {
+  const onDemandSkills = skills2.filter((s) => !s.alwaysApply && s.loadType !== "always");
   if (onDemandSkills.length === 0) {
     return "No on-demand skills available.";
   }
@@ -4227,12 +4262,12 @@ function formatSkillsForContext(skills) {
   }
   return lines.join("\n");
 }
-function formatAlwaysLoadedSkills(skills) {
-  if (skills.length === 0) {
+function formatAlwaysLoadedSkills(skills2) {
+  if (skills2.length === 0) {
     return "";
   }
   const sections = [];
-  for (const skill of skills) {
+  for (const skill of skills2) {
     sections.push(`### ${skill.name}
 
 ${skill.content}`);
@@ -4241,12 +4276,12 @@ ${skill.content}`);
 
 ${sections.join("\n\n---\n\n")}`;
 }
-function formatGlobMatchedSkills(skills) {
-  if (skills.length === 0) {
+function formatGlobMatchedSkills(skills2) {
+  if (skills2.length === 0) {
     return "";
   }
   const sections = [];
-  for (const skill of skills) {
+  for (const skill of skills2) {
     sections.push(`### ${skill.name}
 
 ${skill.content}`);
@@ -4288,16 +4323,16 @@ Once loaded, a skill's content will be available in the conversation context.`,
       try {
         switch (action) {
           case "list": {
-            const skills = await loadAllSkills(options.skillsDirectories);
+            const skills2 = await loadAllSkills(options.skillsDirectories);
             return {
               success: true,
               action: "list",
-              skillCount: skills.length,
-              skills: skills.map((s) => ({
+              skillCount: skills2.length,
+              skills: skills2.map((s) => ({
                 name: s.name,
                 description: s.description
               })),
-              formatted: formatSkillsForContext(skills)
+              formatted: formatSkillsForContext(skills2)
             };
           }
           case "load": {
@@ -4735,8 +4770,8 @@ var init_subagent = __esm({
           if (eventQueue.length > 0) {
             yield eventQueue.shift();
           } else if (!done) {
-            const event = await new Promise((resolve12) => {
-              resolveNext = resolve12;
+            const event = await new Promise((resolve13) => {
+              resolveNext = resolve13;
             });
             if (event) {
               yield event;
@@ -6512,8 +6547,8 @@ async function buildSystemPrompt(options) {
     }
   } else {
     const { loadAllSkills: loadAllSkills2 } = await Promise.resolve().then(() => (init_skills(), skills_exports));
-    const skills = await loadAllSkills2(skillsDirectories);
-    onDemandSkillsContext = formatSkillsForContext(skills);
+    const skills2 = await loadAllSkills2(skillsDirectories);
+    onDemandSkillsContext = formatSkillsForContext(skills2);
   }
   const todos = await todoQueries.getBySession(sessionId);
   const todosContext = formatTodosForContext(todos);
@@ -7412,6 +7447,35 @@ 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 repairToolPairing(messages) {
   const toolCallIds = /* @__PURE__ */ new Set();
   const toolResultIds = /* @__PURE__ */ new Set();
@@ -7777,6 +7841,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 {
@@ -7899,13 +8077,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)
     });
@@ -7927,11 +8105,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();
@@ -7944,17 +8174,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.)";
   }
 });
@@ -8054,6 +8287,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) {
@@ -8711,8 +8945,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();
@@ -8724,12 +8958,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;
@@ -8981,11 +9215,11 @@ function waitForTaskQuestionAnswer(question) {
   if (pendingQuestions.has(k)) {
     return Promise.reject(new Error(`Question already pending: ${question.questionId}`));
   }
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve13, reject) => {
     pendingQuestions.set(k, {
       ...question,
       createdAt: /* @__PURE__ */ new Date(),
-      resolve: resolve12,
+      resolve: resolve13,
       reject
     });
   });
@@ -9342,7 +9576,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() {
@@ -9399,21 +9633,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 {
@@ -9425,7 +9659,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(() => {
               });
             }
           }
@@ -9692,7 +9926,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),
@@ -9706,6 +9941,17 @@ ${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 repaired = repairToolPairing(stepMessages);
+            if (repaired === stepMessages) return {};
+            return { messages: repaired };
+          },
           onStepFinish: async (step) => {
             options.onStepFinish?.(step);
           },
@@ -9741,7 +9987,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),
@@ -9752,7 +9998,13 @@ ${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 repaired = repairToolPairing(stepMessages);
+            if (repaired === stepMessages) return {};
+            return { messages: repaired };
+          }
         });
         const responseMessages = result.response.messages;
         this.context.addResponseMessages(responseMessages);
@@ -9929,12 +10181,19 @@ ${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 repaired = repairToolPairing(stepMessages);
+              if (repaired === stepMessages) return {};
+              return { messages: repaired };
+            },
             onStepFinish: async (step) => {
               options.onStepFinish?.(step);
               fireWebhook("task.step_finished", { iteration, text: step.text });
@@ -10134,14 +10393,14 @@ ${p.text}` : p.text;
           const result = await recorder.encode();
           recorder.clear();
           if (!result) return [];
-          const { readFile: readFile12, unlink: unlink3 } = await import("fs/promises");
+          const { readFile: readFile13, unlink: unlink4 } = await import("fs/promises");
           const uploadInfo = await storageQueries2.getUploadUrl(
             this.session.id,
             `browser-recording-${Date.now()}.mp4`,
             "video/mp4",
             "browser-recording"
           );
-          const fileData = await readFile12(result.path);
+          const fileData = await readFile13(result.path);
           await fetch(uploadInfo.uploadUrl, {
             method: "PUT",
             headers: { "Content-Type": "video/mp4" },
@@ -10149,7 +10408,7 @@ ${p.text}` : p.text;
           });
           await storageQueries2.updateFile(uploadInfo.fileId, { sizeBytes: result.sizeBytes });
           const dlInfo = await storageQueries2.getDownloadUrl(uploadInfo.fileId);
-          await unlink3(result.path).catch(() => {
+          await unlink4(result.path).catch(() => {
           });
           console.log(`[TASK] Browser recording uploaded (${result.sizeBytes} bytes)`);
           return [dlInfo.downloadUrl];
@@ -10167,13 +10426,13 @@ ${p.text}` : p.text;
         try {
           const { isRemoteConfigured: isRemoteConfigured2, storageQueries: storageQueries2 } = await Promise.resolve().then(() => (init_remote(), remote_exports));
           if (!isRemoteConfigured2()) return [];
-          const { readFile: readFile12 } = await import("fs/promises");
-          const { join: join16, basename: basename6 } = await import("path");
+          const { readFile: readFile13 } = await import("fs/promises");
+          const { join: join18, basename: basename7 } = await import("path");
           const urls = [];
           for (const filePath of filePaths) {
             try {
-              const fullPath = filePath.startsWith("/") ? filePath : join16(this.session.workingDirectory, filePath);
-              const fileName = basename6(fullPath);
+              const fullPath = filePath.startsWith("/") ? filePath : join18(this.session.workingDirectory, filePath);
+              const fileName = basename7(fullPath);
               const ext = fileName.split(".").pop()?.toLowerCase() || "";
               const mimeMap = {
                 pdf: "application/pdf",
@@ -10197,7 +10456,7 @@ ${p.text}` : p.text;
                 contentType,
                 "task-output"
               );
-              const fileData = await readFile12(fullPath);
+              const fileData = await readFile13(fullPath);
               await fetch(uploadInfo.uploadUrl, {
                 method: "PUT",
                 headers: { "Content-Type": contentType },
@@ -10246,8 +10505,8 @@ ${p.text}` : p.text;
               this.pendingApprovals.set(toolCallId, await execution);
               options.onApprovalRequired?.(await execution);
               await sessionQueries.updateStatus(this.session.id, "waiting");
-              const approved = await new Promise((resolve12) => {
-                approvalResolvers.set(toolCallId, { resolve: resolve12, sessionId: this.session.id });
+              const approved = await new Promise((resolve13) => {
+                approvalResolvers.set(toolCallId, { resolve: resolve13, sessionId: this.session.id });
               });
               const resolverData = approvalResolvers.get(toolCallId);
               approvalResolvers.delete(toolCallId);
@@ -10353,8 +10612,8 @@ async function withSessionLock(sessionId, fn) {
   state2.pending++;
   const prev = state2.tail;
   let release;
-  const next = new Promise((resolve12) => {
-    release = resolve12;
+  const next = new Promise((resolve13) => {
+    release = resolve13;
   });
   state2.tail = prev.then(() => next);
   await prev;
@@ -10377,19 +10636,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));
@@ -10399,7 +10658,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 {
       }
     }
@@ -10413,7 +10672,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 {
   }
@@ -10444,8 +10703,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 {
   }
 }
@@ -10477,7 +10736,7 @@ function listEvents(filter = {}) {
 function clearAllEvents() {
   cache = [];
   try {
-    writeFileSync3(logFilePath(), "");
+    writeFileSync4(logFilePath(), "");
   } catch {
   }
 }
@@ -10747,12 +11006,12 @@ init_agent();
 
 // src/server/index.ts
 import "dotenv/config";
-import { Hono as Hono9 } from "hono";
+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 existsSync20, mkdirSync as mkdirSync9, writeFileSync as writeFileSync6 } from "fs";
-import { resolve as resolve11, dirname as dirname8, join as join15 } 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";
@@ -10766,9 +11025,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
@@ -11406,12 +11665,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;
 }
@@ -11422,12 +11681,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],
@@ -11462,9 +11721,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,
@@ -11488,13 +11747,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,
@@ -11517,7 +11776,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);
@@ -11525,7 +11784,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 });
 });
@@ -11608,7 +11867,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;
@@ -11656,7 +11915,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,
@@ -11764,14 +12023,101 @@ 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 toolNameByCallId = /* @__PURE__ */ new Map();
+  const existingResultIds = /* @__PURE__ */ new Set();
+  for (const msg of history) {
+    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") toolNameByCallId.set(part.toolCallId, part.toolName);
+      }
+      if (part?.type === "tool-result" && typeof part.toolCallId === "string") {
+        existingResultIds.add(part.toolCallId);
+      }
+    }
+  }
+  const resolved = toolCallIds.map((id) => ({
+    toolCallId: id,
+    toolName: toolNameByCallId.get(id) ?? "unknown",
+    foundInAssistantMessage: toolNameByCallId.has(id)
+  }));
+  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: toolNameByCallId.get(id) ?? "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);
+  return {
+    kind: "missing_tool_results",
+    toolCallIds,
+    resolved,
+    syntheticToolMessageSaved,
+    lastFewMessageRoles,
+    hint: 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."
+  };
+}
+
+// src/server/routes/agents.ts
+init_agent();
+init_session_lock();
+init_config();
 
 // src/server/resumable-stream.ts
 import { createResumableStreamContext } from "resumable-stream/generic";
@@ -11927,7 +12273,7 @@ async function emitSyntheticToolStreaming(writeSSE, toolCallStarts, toolCallId,
       toolCallId,
       argsTextDelta: chunk
     }));
-    await new Promise((resolve12) => setTimeout(resolve12, 0));
+    await new Promise((resolve13) => setTimeout(resolve13, 0));
   }
 }
 function buildDevtoolsContextXml(sessionId) {
@@ -11978,12 +12324,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) {
@@ -12001,8 +12347,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) {
@@ -12182,7 +12528,7 @@ ${prompt}` });
                 chunkIndex,
                 chunkCount
               }));
-              await new Promise((resolve12) => setTimeout(resolve12, 0));
+              await new Promise((resolve13) => setTimeout(resolve13, 0));
             }
             const browserPort = progress.data?.browserStreamPort;
             const browserClosed = progress.data?.browserClosed;
@@ -12339,7 +12685,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 {
@@ -12729,7 +13088,7 @@ agents.post(
                   chunkIndex,
                   chunkCount
                 }));
-                await new Promise((resolve12) => setTimeout(resolve12, 0));
+                await new Promise((resolve13) => setTimeout(resolve13, 0));
               }
               const browserPort = progress.data?.browserStreamPort;
               const browserClosed = progress.data?.browserClosed;
@@ -12879,7 +13238,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 {
@@ -12962,26 +13334,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";
@@ -13799,12 +14171,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);
@@ -13843,18 +14216,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);
@@ -14237,6 +14598,224 @@ mcpRouter.post("/:id/test", async (c) => {
   return c.json(result);
 });
 
+// src/server/routes/skills.ts
+init_config();
+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 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 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");
+}
+function decodeId(id) {
+  try {
+    const decoded = Buffer.from(id, "base64url").toString("utf-8");
+    return decoded || null;
+  } catch {
+    return null;
+  }
+}
+function listAllDirectories() {
+  const cfg = getConfig();
+  const discovered = discoverSkillDirectories(cfg.resolvedWorkingDirectory);
+  const out = [];
+  for (const { path, priority } of discovered.alwaysLoadedDirs) {
+    out.push({
+      path,
+      source: pathToSource(path),
+      label: pathToLabel(path),
+      priority,
+      alwaysApply: true
+    });
+  }
+  for (const { path, priority } of discovered.onDemandDirs) {
+    out.push({
+      path,
+      source: pathToSource(path),
+      label: pathToLabel(path),
+      priority,
+      alwaysApply: false
+    });
+  }
+  const additional = cfg.skills?.additionalDirectories || [];
+  for (const dir of additional) {
+    const abs = resolve11(cfg.resolvedWorkingDirectory, dir);
+    if (out.some((d) => d.path === abs)) continue;
+    out.push({
+      path: abs,
+      source: "additional",
+      label: pathToLabel(abs),
+      priority: 50,
+      alwaysApply: false
+    });
+  }
+  return out;
+}
+function pathToSource(path) {
+  if (path.includes("/skills/default") || path.endsWith("/skills/default")) return "builtin";
+  return "project";
+}
+function pathToLabel(path) {
+  if (path.includes("/skills/default")) return "Built-in (default)";
+  if (path.includes("/.sparkecoder/rules")) return ".sparkecoder/rules";
+  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(dirname9(path)) + "/" + basename6(path);
+}
+skills.get("/", async (c) => {
+  const dirs = listAllDirectories();
+  const allSkills = [];
+  for (const dir of dirs) {
+    if (!existsSync21(dir.path)) continue;
+    try {
+      const list = await loadSkillsFromDirectory(dir.path, {
+        priority: dir.priority,
+        defaultLoadType: dir.alwaysApply ? "always" : "on_demand",
+        forceAlwaysApply: dir.alwaysApply
+      });
+      for (const s of list) {
+        let size = 0;
+        try {
+          size = statSync3(s.filePath).size;
+        } catch {
+        }
+        allSkills.push({
+          id: encodeId(s.filePath),
+          name: s.name,
+          description: s.description,
+          filePath: s.filePath,
+          fileName: basename6(s.filePath),
+          sourceDir: dir.path,
+          sourceLabel: dir.label,
+          sourceType: dir.source,
+          alwaysApply: s.alwaysApply,
+          globs: s.globs,
+          sizeBytes: size
+        });
+      }
+    } catch (err) {
+      console.warn("[skills] failed to read", dir.path, err?.message || err);
+    }
+  }
+  return c.json({
+    directories: dirs.map((d) => ({
+      path: d.path,
+      label: d.label,
+      source: d.source,
+      alwaysApply: d.alwaysApply,
+      exists: existsSync21(d.path),
+      writable: isWritable(d.path)
+    })),
+    skills: allSkills
+  });
+});
+function isWritable(dir) {
+  try {
+    if (!existsSync21(dir)) return false;
+    if (dir.includes("/skills/default")) return false;
+    return true;
+  } catch {
+    return false;
+  }
+}
+skills.get("/:id", async (c) => {
+  const filePath = decodeId(c.req.param("id"));
+  if (!filePath || !existsSync21(filePath)) {
+    return c.json({ error: "skill not found" }, 404);
+  }
+  const content = await readFile12(filePath, "utf-8");
+  return c.json({
+    id: c.req.param("id"),
+    filePath,
+    fileName: basename6(filePath),
+    content,
+    writable: !filePath.includes("/skills/default")
+  });
+});
+skills.post(
+  "/",
+  zValidator7("json", z22.object({
+    directory: z22.string().min(1),
+    fileName: z22.string().min(1),
+    content: z22.string()
+  })),
+  async (c) => {
+    const { directory, fileName, content } = c.req.valid("json");
+    const cfg = getConfig();
+    const targetDir = resolve11(cfg.resolvedWorkingDirectory, directory);
+    if (targetDir.includes("/skills/default")) {
+      return c.json({ error: "cannot write into built-in skills directory" }, 400);
+    }
+    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 = join16(targetDir, finalName);
+    if (existsSync21(filePath)) {
+      return c.json({ error: `file already exists: ${finalName}` }, 409);
+    }
+    try {
+      await mkdir5(targetDir, { recursive: true });
+      await writeFile6(filePath, content, "utf-8");
+    } catch (err) {
+      return c.json({ error: err?.message || "write failed" }, 500);
+    }
+    return c.json({ id: encodeId(filePath), filePath, fileName: finalName }, 201);
+  }
+);
+skills.put(
+  "/:id",
+  zValidator7("json", z22.object({ content: z22.string() })),
+  async (c) => {
+    const filePath = decodeId(c.req.param("id"));
+    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);
+    }
+    await writeFile6(filePath, c.req.valid("json").content, "utf-8");
+    return c.json({ ok: true });
+  }
+);
+skills.delete("/:id", async (c) => {
+  const filePath = decodeId(c.req.param("id"));
+  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);
+  }
+  await unlink3(filePath);
+  return c.json({ ok: true });
+});
+skills.post(
+  "/directories",
+  zValidator7("json", z22.object({ path: z22.string().min(1) })),
+  (c) => {
+    const cfg = getConfig();
+    const inputPath = c.req.valid("json").path.trim();
+    const abs = resolve11(cfg.resolvedWorkingDirectory, inputPath);
+    const current = cfg.skills?.additionalDirectories || [];
+    if (current.some((d) => resolve11(cfg.resolvedWorkingDirectory, d) === abs)) {
+      return c.json({ error: "directory already added" }, 409);
+    }
+    const next = [...current, abs];
+    setSkillsAdditionalDirectories(next);
+    return c.json({ ok: true, path: abs, exists: existsSync21(abs) }, 201);
+  }
+);
+skills.delete("/directories", (c) => {
+  const inputPath = c.req.query("path");
+  if (!inputPath) return c.json({ error: "path query param required" }, 400);
+  const cfg = getConfig();
+  const abs = resolve11(cfg.resolvedWorkingDirectory, inputPath);
+  const current = cfg.skills?.additionalDirectories || [];
+  const next = current.filter((d) => resolve11(cfg.resolvedWorkingDirectory, d) !== abs);
+  setSkillsAdditionalDirectories(next);
+  return c.json({ ok: true });
+});
+
 // src/server/auth/cf-access.ts
 init_config();
 import { createRemoteJWKSet, jwtVerify } from "jose";
@@ -14397,13 +14976,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 = dirname8(fileURLToPath4(import.meta.url));
-    const webDir = resolve11(currentDir, "..", "web");
-    if (existsSync20(webDir) && existsSync20(join15(webDir, "package.json"))) {
+    const currentDir = dirname10(fileURLToPath4(import.meta.url));
+    const webDir = resolve12(currentDir, "..", "web");
+    if (existsSync22(webDir) && existsSync22(join17(webDir, "package.json"))) {
       return webDir;
     }
-    const altWebDir = resolve11(currentDir, "..", "..", "web");
-    if (existsSync20(altWebDir) && existsSync20(join15(altWebDir, "package.json"))) {
+    const altWebDir = resolve12(currentDir, "..", "..", "web");
+    if (existsSync22(altWebDir) && existsSync22(join17(altWebDir, "package.json"))) {
       return altWebDir;
     }
     return null;
@@ -14426,18 +15005,18 @@ async function isSparkcoderWebRunning(port) {
   }
 }
 function isPortInUse(port) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     const server = createNetServer();
     server.once("error", (err) => {
       if (err.code === "EADDRINUSE") {
-        resolve12(true);
+        resolve13(true);
       } else {
-        resolve12(false);
+        resolve13(false);
       }
     });
     server.once("listening", () => {
       server.close();
-      resolve12(false);
+      resolve13(false);
     });
     server.listen(port, "0.0.0.0");
   });
@@ -14461,30 +15040,30 @@ async function findWebPort(preferredPort) {
   return { port: preferredPort, alreadyRunning: false };
 }
 function hasProductionBuild(webDir) {
-  const buildIdPath = join15(webDir, ".next", "BUILD_ID");
-  return existsSync20(buildIdPath);
+  const buildIdPath = join17(webDir, ".next", "BUILD_ID");
+  return existsSync22(buildIdPath);
 }
 function hasSourceFiles(webDir) {
-  const appDir = join15(webDir, "src", "app");
-  const pagesDir = join15(webDir, "src", "pages");
-  const rootAppDir = join15(webDir, "app");
-  const rootPagesDir = join15(webDir, "pages");
-  return existsSync20(appDir) || existsSync20(pagesDir) || existsSync20(rootAppDir) || existsSync20(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 = [
-    join15(webDir, ".next", "standalone", "server.js"),
-    join15(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 (existsSync20(serverPath)) {
+    if (existsSync22(serverPath)) {
       return serverPath;
     }
   }
   return null;
 }
 function runCommand(command, args, cwd, env) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     const child = spawn2(command, args, {
       cwd,
       stdio: ["ignore", "pipe", "pipe"],
@@ -14499,10 +15078,10 @@ function runCommand(command, args, cwd, env) {
       output += data.toString();
     });
     child.on("close", (code) => {
-      resolve12({ success: code === 0, output });
+      resolve13({ success: code === 0, output });
     });
     child.on("error", (err) => {
-      resolve12({ success: false, output: err.message });
+      resolve13({ success: false, output: err.message });
     });
   });
 }
@@ -14517,15 +15096,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 = existsSync20(join15(webDir, "pnpm-lock.yaml"));
-  const useNpm = !usePnpm && existsSync20(join15(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 = join15(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}`);
@@ -14545,7 +15124,7 @@ async function startWebUI(apiPort, webPort = DEFAULT_WEB_PORT, quiet = false, pu
   if (standaloneServerPath) {
     command = "node";
     args = ["server.js"];
-    cwd = dirname8(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...");
@@ -14586,10 +15165,10 @@ async function startWebUI(apiPort, webPort = DEFAULT_WEB_PORT, quiet = false, pu
   let started = false;
   let exited = false;
   let exitCode = null;
-  const startedPromise = new Promise((resolve12) => {
+  const startedPromise = new Promise((resolve13) => {
     const timeout = setTimeout(() => {
       if (!started && !exited) {
-        resolve12(false);
+        resolve13(false);
       }
     }, startupTimeout);
     child.stdout?.on("data", (data) => {
@@ -14603,7 +15182,7 @@ async function startWebUI(apiPort, webPort = DEFAULT_WEB_PORT, quiet = false, pu
       if (!started && (output.includes("Ready") || output.includes("started") || output.includes("localhost"))) {
         started = true;
         clearTimeout(timeout);
-        resolve12(true);
+        resolve13(true);
       }
     });
     child.stderr?.on("data", (data) => {
@@ -14615,14 +15194,14 @@ async function startWebUI(apiPort, webPort = DEFAULT_WEB_PORT, quiet = false, pu
     child.on("error", (err) => {
       if (!quiet) console.error(`  \u274C Web UI spawn error: ${err.message}`);
       clearTimeout(timeout);
-      resolve12(false);
+      resolve13(false);
     });
     child.on("exit", (code) => {
       exited = true;
       exitCode = code;
       if (!started) {
         clearTimeout(timeout);
-        resolve12(false);
+        resolve13(false);
       }
       webUIProcess = null;
     });
@@ -14645,7 +15224,7 @@ function stopWebUI() {
   }
 }
 async function createApp(options = {}) {
-  const app = new Hono9();
+  const app = new Hono10();
   app.use("*", cors({
     origin: "*",
     // Allow all origins
@@ -14673,6 +15252,7 @@ async function createApp(options = {}) {
   app.route("/api/schedules", schedulesRouter);
   app.route("/api/orchestrator", orchestratorRouter);
   app.route("/api/mcp", mcpRouter);
+  app.route("/api/skills", skills);
   app.route("/api/webhooks", webhooksRouter);
   const config = getConfig();
   const webhookToken = config?.webhooks?.token;
@@ -14738,8 +15318,8 @@ async function startServer(options = {}) {
   if (options.workingDirectory) {
     config.resolvedWorkingDirectory = options.workingDirectory;
   }
-  if (!existsSync20(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) {