openfox 1.6.14 → 1.6.16

package/dist/{chunk-N25QUEPO.js → chunk-4OI4VPZ6.js}

@@ -13,12 +13,12 @@ import {
 } from "./chunk-574HZVLE.js";
 import {
   streamWithSegments
-} from "./chunk-XFXOSPYH.js";
+} from "./chunk-55N6FAAZ.js";
 import {
   getContextMessages,
   getCurrentContextWindowId,
   getEventStore
-} from "./chunk-5GE3QJSZ.js";
+} from "./chunk-6L3X7T4K.js";
 import {
   createChatDoneMessage,
   createChatMessageMessage,
@@ -34,6 +34,7 @@ import {
 } from "./chunk-22CTURMH.js";
 import {
   SETTINGS_KEYS,
+  deleteSetting,
   getSetting,
   setSetting
 } from "./chunk-7IOZFJBW.js";
@@ -375,6 +376,31 @@ You may use available tools to read files and verify changes if needed.`;
 var FORMAT_CORRECTION_PROMPT = `IMPORTANT: You MUST use the JSON function calling API. Do NOT output XML tags like <tool_call>, <function=>, or <parameter=>. Your previous attempt was stopped because you used the wrong format. Use the proper tool_calls format.`;
 
 // src/server/chat/request-context.ts
+function minimalMessagesToRequestContextMessages(messages, source = "history") {
+  return messages.map((message) => minimalMessageToRequestContextMessage(message, source));
+}
+function spreadMessageProps(message) {
+  return {
+    ...message.toolCalls ? { toolCalls: message.toolCalls } : {},
+    ...message.toolCallId ? { toolCallId: message.toolCallId } : {},
+    ...message.attachments ? { attachments: message.attachments } : {}
+  };
+}
+function minimalMessageToRequestContextMessage(message, source = "history") {
+  return {
+    role: message.role,
+    content: message.content,
+    source,
+    ...spreadMessageProps(message)
+  };
+}
+function messageToMinimal(message) {
+  return {
+    role: message.role,
+    content: message.content,
+    ...spreadMessageProps(message)
+  };
+}
 function getTriggerUserMessage(messages) {
   const stripRuntimeReminders = (content) => {
     return content.replace(/\n*<system-reminder>[\s\S]*<\/system-reminder>\s*/gi, "").trim();
@@ -396,12 +422,8 @@ function createPromptContext(input) {
     injectedFiles: input.injectedFiles,
     userMessage: input.userMessage ?? getTriggerUserMessage(input.messages),
     messages: input.messages.map((message) => ({
-      role: message.role,
-      content: message.content,
-      source: message.source,
-      ...message.toolCalls ? { toolCalls: message.toolCalls } : {},
-      ...message.toolCallId ? { toolCallId: message.toolCallId } : {},
-      ...message.attachments ? { attachments: message.attachments } : {}
+      ...messageToMinimal(message),
+      source: message.source
     })),
     tools: input.requestTools.map((tool) => ({
       name: tool.function.name,
@@ -419,19 +441,25 @@ function createAssemblyResult(input) {
   const messagesForLLM = input.messages.filter((m) => m.source !== "runtime");
   return {
     systemPrompt: input.systemPrompt,
-    messages: messagesForLLM.map((message) => ({
-      role: message.role,
-      content: message.content,
-      ...message.toolCalls ? { toolCalls: message.toolCalls } : {},
-      ...message.toolCallId ? { toolCallId: message.toolCallId } : {},
-      ...message.attachments ? { attachments: message.attachments } : {}
-    })),
+    messages: messagesForLLM.map((message) => messageToMinimal(message)),
     promptContext: createPromptContext({
       ...input,
       userMessage: triggerUserMessage
     })
   };
 }
+function buildAssemblyInput(systemPrompt, baseInput) {
+  return createAssemblyResult({
+    systemPrompt,
+    messages: baseInput.messages,
+    injectedFiles: baseInput.injectedFiles,
+    requestTools: baseInput.requestTools ?? baseInput.promptTools,
+    toolChoice: baseInput.toolChoice ?? "auto",
+    disableThinking: baseInput.disableThinking ?? false,
+    ...baseInput.customInstructions ? { customInstructions: baseInput.customInstructions } : {},
+    ...baseInput.skills && baseInput.skills.length > 0 ? { skills: baseInput.skills } : {}
+  });
+}
 function assembleAgentRequest(input) {
   const { agentDef, subAgentDefs, ...baseInput } = input;
   if (agentDef.metadata.subagent) {
@@ -440,14 +468,7 @@ function assembleAgentRequest(input) {
       agentDef,
       baseInput.skills
     );
-    return createAssemblyResult({
-      systemPrompt: systemPrompt2,
-      messages: baseInput.messages,
-      injectedFiles: baseInput.injectedFiles,
-      requestTools: baseInput.requestTools ?? baseInput.promptTools,
-      toolChoice: baseInput.toolChoice ?? "auto",
-      disableThinking: baseInput.disableThinking ?? false
-    });
+    return buildAssemblyInput(systemPrompt2, baseInput);
   }
   const systemPrompt = buildTopLevelSystemPrompt(
     baseInput.workdir,
@@ -455,14 +476,25 @@ function assembleAgentRequest(input) {
     baseInput.skills,
     subAgentDefs
   );
-  return createAssemblyResult({
-    systemPrompt,
-    messages: baseInput.messages,
-    injectedFiles: baseInput.injectedFiles,
-    requestTools: baseInput.requestTools ?? baseInput.promptTools,
-    toolChoice: baseInput.toolChoice ?? "auto",
-    disableThinking: baseInput.disableThinking ?? false
-  });
+  return buildAssemblyInput(systemPrompt, baseInput);
+}
+
+// src/server/chat/stream-utils.ts
+function buildStreamRequestObject(params) {
+  const { messages, tools, toolChoice, disableThinking, signal, onVisionFallbackStart, onVisionFallbackDone } = params;
+  const streamRequest = {
+    messages,
+    ...tools && { tools },
+    ...toolChoice && { toolChoice },
+    disableThinking: disableThinking ?? false,
+    ...signal && { signal }
+  };
+  if (onVisionFallbackStart) streamRequest.onVisionFallbackStart = onVisionFallbackStart;
+  if (onVisionFallbackDone) streamRequest.onVisionFallbackDone = onVisionFallbackDone;
+  return streamRequest;
+}
+function buildStreamRequest(client, options) {
+  return streamWithSegments(client, buildStreamRequestObject(options));
 }
 
 // src/server/chat/stats.ts
@@ -483,19 +515,29 @@ function computeAggregatedStats(input) {
 }
 
 // src/server/chat/stream-pure.ts
+function createEmptyStreamResult(aborted, xmlFormatError) {
+  return {
+    content: "",
+    toolCalls: [],
+    segments: [],
+    usage: { promptTokens: 0, completionTokens: 0 },
+    timing: { ttft: 0, completionTime: 0, tps: 0, prefillTps: 0 },
+    aborted,
+    xmlFormatError
+  };
+}
 async function* streamLLMPure(options) {
   const { messageId, systemPrompt, llmClient, messages, tools, toolChoice, signal, disableThinking, onVisionFallbackStart, onVisionFallbackDone } = options;
   const llmMessages = [{ role: "system", content: systemPrompt }, ...messages];
-  const streamRequest = {
+  const stream = buildStreamRequest(llmClient, {
     messages: llmMessages,
-    ...tools && { tools },
-    ...tools && { toolChoice: toolChoice ?? "auto" },
+    tools,
+    toolChoice,
     disableThinking: disableThinking ?? false,
-    ...signal && { signal }
-  };
-  if (onVisionFallbackStart) streamRequest.onVisionFallbackStart = onVisionFallbackStart;
-  if (onVisionFallbackDone) streamRequest.onVisionFallbackDone = onVisionFallbackDone;
-  const stream = streamWithSegments(llmClient, streamRequest);
+    signal,
+    onVisionFallbackStart,
+    onVisionFallbackDone
+  });
   const seenToolIndices = /* @__PURE__ */ new Set();
   const toolNames = /* @__PURE__ */ new Map();
   const toolIds = /* @__PURE__ */ new Map();
@@ -594,15 +636,7 @@ async function* streamLLMPure(options) {
     }
   }
   if (!result) {
-    return {
-      content: "",
-      toolCalls: [],
-      segments: [],
-      usage: { promptTokens: 0, completionTokens: 0 },
-      timing: { ttft: 0, completionTime: 0, tps: 0, prefillTps: 0 },
-      aborted,
-      xmlFormatError
-    };
+    return createEmptyStreamResult(aborted, xmlFormatError);
   }
   const baseResult = {
     content: result.content,
@@ -768,15 +802,7 @@ async function consumeStreamWithToolLoop(options) {
   let iterations = 0;
   for (; ; ) {
     if (signal?.aborted) {
-      return {
-        content: "",
-        toolCalls: [],
-        segments: [],
-        usage: { promptTokens: 0, completionTokens: 0 },
-        timing: { ttft: 0, completionTime: 0, tps: 0, prefillTps: 0 },
-        aborted: true,
-        xmlFormatError: false
-      };
+      return createEmptyStreamResult(true, false);
     }
     if (++iterations > MAX_TOOL_LOOP_ITERATIONS) {
       throw new Error("Max tool loop iterations exceeded during compaction");
@@ -844,7 +870,7 @@ async function consumeStreamWithToolLoop(options) {
 }
 async function executeToolBatchWithContext(assistantMsgId, toolCalls, ctx, onEvent) {
   const toolMessages = [];
-  let criteriaChanged = false;
+  const criteriaChanged = false;
   for (const toolCall of toolCalls) {
     if (ctx.signal?.aborted) {
       throw new Error("Aborted");
@@ -884,7 +910,7 @@ Error: ${toolResult.error}` : `Error: ${toolResult.error}`;
 }
 
 // src/server/agents/registry.ts
-import { readdir, readFile as readFile2, writeFile, copyFile, mkdir, access as access2, unlink } from "fs/promises";
+import { readdir, readFile as readFile2, writeFile, mkdir, access as access2, unlink } from "fs/promises";
 import { join as join2, dirname as dirname2 } from "path";
 import { constants as constants2 } from "fs";
 import { fileURLToPath } from "url";
@@ -904,37 +930,6 @@ async function pathExists(path) {
     return false;
   }
 }
-async function ensureDefaultAgents(configDir) {
-  const agentsDir = getAgentsDir(configDir);
-  if (!await pathExists(agentsDir)) {
-    await mkdir(agentsDir, { recursive: true });
-  }
-  let defaultFiles;
-  let sourceDir;
-  try {
-    defaultFiles = (await readdir(DEFAULTS_DIR)).filter((f) => f.endsWith(AGENT_EXTENSION));
-    sourceDir = DEFAULTS_DIR;
-  } catch {
-    try {
-      defaultFiles = (await readdir(DEFAULTS_DIR_ALT)).filter((f) => f.endsWith(AGENT_EXTENSION));
-      sourceDir = DEFAULTS_DIR_ALT;
-    } catch {
-      logger.warn("No bundled agent defaults found", { dir: DEFAULTS_DIR });
-      return;
-    }
-  }
-  for (const file of defaultFiles) {
-    const targetPath = join2(agentsDir, file);
-    if (!await pathExists(targetPath)) {
-      try {
-        await copyFile(join2(sourceDir, file), targetPath);
-        logger.info("Installed default agent", { file });
-      } catch (err) {
-        logger.error("Failed to copy default agent", { file, error: err instanceof Error ? err.message : String(err) });
-      }
-    }
-  }
-}
 function parseAgentFile(raw, filename) {
   const { data, content } = matter(raw);
   const meta = data;
@@ -977,13 +972,21 @@ async function loadAgentsFromDir(dir) {
   }
   return agents;
 }
+async function loadDefaultAgents() {
+  const agents = await loadAgentsFromDir(DEFAULTS_DIR);
+  if (agents.length > 0) return agents;
+  return loadAgentsFromDir(DEFAULTS_DIR_ALT);
+}
+async function loadUserAgents(configDir) {
+  return loadAgentsFromDir(getAgentsDir(configDir));
+}
 async function loadAllAgents(configDir) {
-  const [builtinAgents, userAgents] = await Promise.all([
-    loadBuiltinAgents(),
-    loadAgentsFromDir(getAgentsDir(configDir))
+  const [defaultAgents, userAgents] = await Promise.all([
+    loadDefaultAgents(),
+    loadUserAgents(configDir)
   ]);
   const agentMap = /* @__PURE__ */ new Map();
-  for (const agent of builtinAgents) {
+  for (const agent of defaultAgents) {
     agentMap.set(agent.metadata.id, agent);
   }
   for (const agent of userAgents) {
@@ -996,14 +999,9 @@ async function loadAllAgentsDefault() {
     const configDir = getGlobalConfigDir(getRuntimeConfig().mode ?? "production");
     return await loadAllAgents(configDir);
   } catch {
-    return loadBuiltinAgents();
+    return loadDefaultAgents();
   }
 }
-async function loadBuiltinAgents() {
-  const agents = await loadAgentsFromDir(DEFAULTS_DIR);
-  if (agents.length > 0) return agents;
-  return loadAgentsFromDir(DEFAULTS_DIR_ALT);
-}
 async function getDefaultAgentIds() {
   for (const dir of [DEFAULTS_DIR, DEFAULTS_DIR_ALT]) {
     try {
@@ -1014,48 +1012,20 @@ async function getDefaultAgentIds() {
   }
   return [];
 }
-async function restoreDefaultAgent(configDir, agentId) {
-  const defaultIds = await getDefaultAgentIds();
-  if (!defaultIds.includes(agentId)) return false;
-  const userPath = join2(getAgentsDir(configDir), `${agentId}${AGENT_EXTENSION}`);
-  try {
-    await unlink(userPath);
-  } catch {
-  }
-  return true;
+async function getDefaultAgentContent(agentId) {
+  const defaults = await loadDefaultAgents();
+  return defaults.find((a) => a.metadata.id === agentId) ?? null;
 }
-async function getModifiedDefaultAgentIds(configDir) {
+async function isDefaultAgent(agentId) {
   const defaultIds = await getDefaultAgentIds();
-  const modified = [];
-  for (const id of defaultIds) {
-    const filename = `${id}${AGENT_EXTENSION}`;
-    const userPath = join2(getAgentsDir(configDir), filename);
-    let bundledContent = null;
-    for (const dir of [DEFAULTS_DIR, DEFAULTS_DIR_ALT]) {
-      try {
-        bundledContent = await readFile2(join2(dir, filename), "utf-8");
-        break;
-      } catch {
-      }
-    }
-    if (!bundledContent) continue;
-    try {
-      const userContent = await readFile2(userPath, "utf-8");
-      if (userContent !== bundledContent) {
-        modified.push(id);
-      }
-    } catch {
-    }
-  }
-  return modified;
+  return defaultIds.includes(agentId);
 }
-async function restoreAllDefaultAgents(configDir) {
-  const ids = await getDefaultAgentIds();
-  let count = 0;
-  for (const id of ids) {
-    if (await restoreDefaultAgent(configDir, id)) count++;
-  }
-  return count;
+function getAgentFilePaths(agentsDir, agentId) {
+  const hyphenated = agentId.replace(/_/g, "-");
+  return [
+    join2(agentsDir, `${agentId}${AGENT_EXTENSION}`),
+    join2(agentsDir, `${hyphenated}${AGENT_EXTENSION}`)
+  ];
 }
 function findAgentById(agentId, agents) {
   return agents.find((a) => a.metadata.id === agentId);
@@ -1065,11 +1035,7 @@ function getSubAgents(agents) {
 }
 async function agentExists(configDir, agentId) {
   const agentsDir = getAgentsDir(configDir);
-  const hyphenated = agentId.replace(/_/g, "-");
-  const paths = [
-    join2(agentsDir, `${agentId}${AGENT_EXTENSION}`),
-    join2(agentsDir, `${hyphenated}${AGENT_EXTENSION}`)
-  ];
+  const paths = getAgentFilePaths(agentsDir, agentId);
   for (const filePath of paths) {
     if (await pathExists(filePath)) {
       return true;
@@ -1087,21 +1053,21 @@ async function saveAgent(configDir, agent) {
   await writeFile(filePath, content, "utf-8");
 }
 async function deleteAgent(configDir, agentId) {
+  const isDefault = await isDefaultAgent(agentId);
+  if (isDefault) {
+    return { success: false, reason: "Cannot delete built-in defaults" };
+  }
   const agentsDir = getAgentsDir(configDir);
-  const hyphenated = agentId.replace(/_/g, "-");
-  const paths = [
-    join2(agentsDir, `${agentId}${AGENT_EXTENSION}`),
-    join2(agentsDir, `${hyphenated}${AGENT_EXTENSION}`)
-  ];
+  const paths = getAgentFilePaths(agentsDir, agentId);
   for (const filePath of paths) {
     try {
       await unlink(filePath);
-      return true;
+      return { success: true };
     } catch {
       continue;
     }
   }
-  return false;
+  return { success: false };
 }
 
 // src/server/tools/read.ts
@@ -1461,6 +1427,39 @@ function cancelPathConfirmationsForSession(sessionId, reason) {
 }
 
 // src/server/tools/tool-helpers.ts
+function validateAction(action, allowed, startTime) {
+  if (!action || !allowed.includes(action)) {
+    return {
+      success: false,
+      error: `Invalid action: ${action}. Must be one of: ${allowed.join(", ")}`,
+      durationMs: Date.now() - startTime,
+      truncated: false
+    };
+  }
+  return void 0;
+}
+function checkActionPermission(action, permittedActions, startTime) {
+  if (action && permittedActions && !permittedActions.includes(action)) {
+    return {
+      success: false,
+      error: `Action '${action}' not allowed. Available: ${permittedActions.join(", ")}`,
+      durationMs: Date.now() - startTime,
+      truncated: false
+    };
+  }
+  return void 0;
+}
+function requireSession(sessionManager, sessionId) {
+  return sessionManager.requireSession(sessionId);
+}
+function validateActionWithPermission(action, allowedActions, toolName, permittedActions, startTime) {
+  const actionError = validateAction(action, allowedActions, startTime ?? Date.now());
+  if (actionError) return actionError;
+  const permittedToolActions = permittedActions?.[toolName];
+  const permissionError = checkActionPermission(action, permittedToolActions, startTime ?? Date.now());
+  if (permissionError) return permissionError;
+  return void 0;
+}
 function createTool(name, definition, handler2) {
   return {
     name,
@@ -2021,11 +2020,26 @@ Make sure whitespace and indentation match exactly.`
 );
 
 // src/server/tools/shell.ts
-import { spawn as spawn2 } from "child_process";
+import "child_process";
 import { resolve as resolve4, isAbsolute as isAbsolute2 } from "path";
 
-// src/server/utils/process-tree.ts
+// src/server/utils/shell.ts
 import { spawn } from "child_process";
+function checkAborted(signal) {
+  return !!signal?.aborted;
+}
+function spawnShellProcess(command, cwd, signal, detached = false) {
+  const shell = getPlatformShell();
+  return spawn(shell.command, [...shell.args, command], {
+    cwd,
+    env: { ...process.env, FORCE_COLOR: "0" },
+    stdio: ["ignore", "pipe", "pipe"],
+    ...detached ? { detached: true } : {}
+  });
+}
+
+// src/server/utils/process-tree.ts
+import { spawn as spawn2 } from "child_process";
 import { setTimeout as sleep } from "timers/promises";
 var SIGKILL_TIMEOUT_MS = 200;
 async function terminateProcessTree(proc, options) {
@@ -2035,7 +2049,7 @@ async function terminateProcessTree(proc, options) {
   }
   if (process.platform === "win32") {
     await new Promise((resolve6) => {
-      const killer = spawn("taskkill", ["/pid", String(pid), "/f", "/t"], {
+      const killer = spawn2("taskkill", ["/pid", String(pid), "/f", "/t"], {
         stdio: "ignore",
         windowsHide: true
       });
@@ -2139,18 +2153,11 @@ ${result.stderr}`;
 );
 function executeCommand(command, cwd, timeout, signal, onProgress) {
   return new Promise((resolve6, reject) => {
-    if (signal?.aborted) {
+    if (checkAborted(signal)) {
       reject(new Error("Command aborted before execution"));
       return;
     }
-    const shell = getPlatformShell();
-    const proc = spawn2(shell.command, [...shell.args, command], {
-      cwd,
-      env: { ...process.env, FORCE_COLOR: "0" },
-      stdio: ["ignore", "pipe", "pipe"],
-      detached: true
-      // Create new process group so we can kill all children
-    });
+    const proc = spawnShellProcess(command, cwd, signal, true);
     let stdout = "";
     let stderr = "";
     let killed = false;
@@ -2168,12 +2175,12 @@ function executeCommand(command, cwd, timeout, signal, onProgress) {
       }
     };
     signal?.addEventListener("abort", onAbort);
-    proc.stdout.on("data", (data) => {
+    proc.stdout?.on("data", (data) => {
       const chunk = data.toString();
       stdout += chunk;
       onProgress?.(`[stdout] ${chunk}`);
     });
-    proc.stderr.on("data", (data) => {
+    proc.stderr?.on("data", (data) => {
       const chunk = data.toString();
       stderr += chunk;
       onProgress?.(`[stderr] ${chunk}`);
@@ -2216,10 +2223,27 @@ function formatCriteriaList(criteria) {
   if (criteria.length === 0) return "No criteria defined.";
   return criteria.map((c, i) => `${i + 1}. [${c.id}] ${c.description}`).join("\n");
 }
-var criterionTool = {
-  name: "criterion",
-  permittedActions: ["get", "add", "update", "remove", "complete", "pass", "fail"],
-  definition: {
+function completeCriterion(session, context, id, statusType, reason) {
+  const criterion = session.criteria.find((c) => c.id === id);
+  if (!criterion) {
+    return { success: false, output: `Criterion "${id}" not found` };
+  }
+  const status = statusType === "passed" ? { type: "passed", verifiedAt: (/* @__PURE__ */ new Date()).toISOString(), ...reason && { reason } } : { type: "failed", failedAt: (/* @__PURE__ */ new Date()).toISOString(), reason };
+  context.sessionManager.updateCriterionStatus(context.sessionId, id, status);
+  context.sessionManager.addCriterionAttempt(context.sessionId, id, {
+    attemptNumber: criterion.attempts.length + 1,
+    status: statusType,
+    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    ...reason ? { details: reason } : {}
+  });
+  return {
+    success: true,
+    output: statusType === "passed" ? `Criterion "${id}" verified as PASSED.${reason ? ` Verification: ${reason}` : ""}` : `Criterion "${id}" marked as FAILED. Reason: ${reason}`
+  };
+}
+var criterionTool = createTool(
+  "criterion",
+  {
     type: "function",
     function: {
       name: "criterion",
@@ -2249,267 +2273,90 @@ var criterionTool = {
       }
     }
   },
-  async execute(args, context) {
-    const startTime = Date.now();
-    try {
-      const action = args["action"];
-      const id = args["id"];
-      const description = args["description"];
-      const reason = args["reason"];
-      if (!action || !["get", "add", "update", "remove", "complete", "pass", "fail"].includes(action)) {
-        return {
-          success: false,
-          error: `Invalid action: ${action}. Must be one of: get, add, update, remove, complete, pass, fail`,
-          durationMs: Date.now() - startTime,
-          truncated: false
-        };
-      }
-      const permittedActions = context.permittedActions?.["criterion"];
-      if (permittedActions && !permittedActions.includes(action)) {
-        return {
-          success: false,
-          error: `Action '${action}' not allowed. Available: ${permittedActions.join(", ")}`,
-          durationMs: Date.now() - startTime,
-          truncated: false
-        };
-      }
-      const session = context.sessionManager.requireSession(context.sessionId);
-      if (action === "get") {
-        const criteria = session.criteria;
-        return {
-          success: true,
-          output: criteria.length === 0 ? "No criteria defined yet." : JSON.stringify(criteria.map((c) => ({
-            id: c.id,
-            description: c.description
-          })), null, 2),
-          durationMs: Date.now() - startTime,
-          truncated: false
-        };
-      }
-      if (action === "add") {
-        if (!description) {
-          return {
-            success: false,
-            error: "Missing required field: description",
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        const criterion = {
-          id: id || "",
-          description,
-          status: { type: "pending" },
-          attempts: []
-        };
-        const result = context.sessionManager.addCriterion(context.sessionId, criterion);
-        if ("error" in result) {
-          return { success: false, error: result.error, durationMs: Date.now() - startTime, truncated: false };
-        }
-        return {
-          success: true,
-          output: `Added criterion "${result.actualId}". Current criteria:
-${formatCriteriaList(result.criteria)}`,
-          durationMs: Date.now() - startTime,
-          truncated: false
-        };
-      }
-      if (action === "update") {
-        if (!id) {
-          return {
-            success: false,
-            error: "Missing required field: id",
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        if (!description) {
-          return {
-            success: false,
-            error: "Missing required field: description",
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        if (!session.criteria.find((c) => c.id === id)) {
-          return {
-            success: false,
-            error: `Criterion "${id}" not found`,
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        const criteria = context.sessionManager.updateCriterionFull(context.sessionId, id, { description });
-        return {
-          success: true,
-          output: `Updated criterion "${id}". Current criteria:
-${formatCriteriaList(criteria)}`,
-          durationMs: Date.now() - startTime,
-          truncated: false
-        };
-      }
-      if (action === "remove") {
-        if (!id) {
-          return {
-            success: false,
-            error: "Missing required field: id",
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        if (!session.criteria.find((c) => c.id === id)) {
-          return {
-            success: false,
-            error: `Criterion "${id}" not found`,
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        const criteria = context.sessionManager.removeCriterion(context.sessionId, id);
-        return {
-          success: true,
-          output: criteria.length === 0 ? `Removed criterion "${id}". No criteria remaining.` : `Removed criterion "${id}". Current criteria:
-${formatCriteriaList(criteria)}`,
-          durationMs: Date.now() - startTime,
-          truncated: false
-        };
-      }
-      if (action === "complete") {
-        if (!id) {
-          return {
-            success: false,
-            error: "Missing required field: id",
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        const criterion = session.criteria.find((c) => c.id === id);
-        if (!criterion) {
-          return {
-            success: false,
-            error: `Criterion "${id}" not found. Available: ${session.criteria.map((c) => c.id).join(", ")}`,
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        const status = {
-          type: "completed",
-          completedAt: (/* @__PURE__ */ new Date()).toISOString(),
-          ...reason ? { reason } : {}
-        };
-        context.sessionManager.updateCriterionStatus(context.sessionId, id, status);
-        return {
-          success: true,
-          output: `Criterion "${id}" marked as completed.${reason ? ` Reason: ${reason}` : ""}`,
-          durationMs: Date.now() - startTime,
-          truncated: false
-        };
-      }
-      if (action === "pass") {
-        if (!id) {
-          return {
-            success: false,
-            error: "Missing required field: id",
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        const criterion = session.criteria.find((c) => c.id === id);
-        if (!criterion) {
-          return {
-            success: false,
-            error: `Criterion "${id}" not found`,
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        const status = {
-          type: "passed",
-          verifiedAt: (/* @__PURE__ */ new Date()).toISOString(),
-          ...reason ? { reason } : {}
-        };
-        context.sessionManager.updateCriterionStatus(context.sessionId, id, status);
-        context.sessionManager.addCriterionAttempt(context.sessionId, id, {
-          attemptNumber: criterion.attempts.length + 1,
-          status: "passed",
-          timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-          ...reason && { details: reason }
-        });
-        return {
-          success: true,
-          output: `Criterion "${id}" verified as PASSED.${reason ? ` Verification: ${reason}` : ""}`,
-          durationMs: Date.now() - startTime,
-          truncated: false
-        };
-      }
-      if (action === "fail") {
-        if (!id) {
-          return {
-            success: false,
-            error: "Missing required field: id",
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        if (!reason) {
-          return {
-            success: false,
-            error: "Missing required field: reason",
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        const criterion = session.criteria.find((c) => c.id === id);
-        if (!criterion) {
-          return {
-            success: false,
-            error: `Criterion "${id}" not found`,
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        const status = {
-          type: "failed",
-          failedAt: (/* @__PURE__ */ new Date()).toISOString(),
-          reason
-        };
-        context.sessionManager.updateCriterionStatus(context.sessionId, id, status);
-        context.sessionManager.addCriterionAttempt(context.sessionId, id, {
-          attemptNumber: criterion.attempts.length + 1,
-          status: "failed",
-          timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-          details: reason
-        });
-        return {
-          success: true,
-          output: `Criterion "${id}" marked as FAILED. Reason: ${reason}`,
-          durationMs: Date.now() - startTime,
-          truncated: false
-        };
-      }
-      return {
-        success: false,
-        error: "Unexpected error",
-        durationMs: Date.now() - startTime,
-        truncated: false
-      };
-    } catch (error) {
-      return {
-        success: false,
-        error: error instanceof Error ? error.message : "Unknown error",
-        durationMs: Date.now() - startTime,
-        truncated: false
+  async (args, context, helpers) => {
+    const actionError = validateActionWithPermission(args.action, ["get", "add", "update", "remove", "complete", "pass", "fail"], "criterion", context.permittedActions);
+    if (actionError) return actionError;
+    const session = requireSession(context.sessionManager, context.sessionId);
+    if (args.action === "get") {
+      return helpers.success(
+        session.criteria.length === 0 ? "No criteria defined yet." : JSON.stringify(session.criteria.map((c) => ({ id: c.id, description: c.description })), null, 2)
+      );
+    }
+    if (args.action === "add") {
+      if (!args.description) return helpers.error("Missing required field: description");
+      const criterion = {
+        id: args.id || "",
+        description: args.description,
+        status: { type: "pending" },
+        attempts: []
       };
+      const result = context.sessionManager.addCriterion(context.sessionId, criterion);
+      if ("error" in result) return helpers.error(result.error);
+      return helpers.success(`Added criterion "${result.actualId}". Current criteria:
+${formatCriteriaList(result.criteria)}`);
+    }
+    if (args.action === "update") {
+      if (!args.id) return helpers.error("Missing required field: id");
+      if (!args.description) return helpers.error("Missing required field: description");
+      if (!session.criteria.find((c) => c.id === args.id)) return helpers.error(`Criterion "${args.id}" not found`);
+      const criteria = context.sessionManager.updateCriterionFull(context.sessionId, args.id, { description: args.description });
+      return helpers.success(`Updated criterion "${args.id}". Current criteria:
+${formatCriteriaList(criteria)}`);
+    }
+    if (args.action === "remove") {
+      if (!args.id) return helpers.error("Missing required field: id");
+      if (!session.criteria.find((c) => c.id === args.id)) return helpers.error(`Criterion "${args.id}" not found`);
+      const criteria = context.sessionManager.removeCriterion(context.sessionId, args.id);
+      return helpers.success(
+        criteria.length === 0 ? `Removed criterion "${args.id}". No criteria remaining.` : `Removed criterion "${args.id}". Current criteria:
+${formatCriteriaList(criteria)}`
+      );
+    }
+    if (args.action === "complete") {
+      if (!args.id) return helpers.error("Missing required field: id");
+      const criterion = session.criteria.find((c) => c.id === args.id);
+      if (!criterion) return helpers.error(`Criterion "${args.id}" not found. Available: ${session.criteria.map((c) => c.id).join(", ")}`);
+      context.sessionManager.updateCriterionStatus(context.sessionId, args.id, {
+        type: "completed",
+        completedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        ...args.reason ? { reason: args.reason } : {}
+      });
+      return helpers.success(`Criterion "${args.id}" marked as completed.${args.reason ? ` Reason: ${args.reason}` : ""}`);
+    }
+    if (args.action === "pass") {
+      if (!args.id) return helpers.error("Missing required field: id");
+      const result = completeCriterion(session, context, args.id, "passed", args.reason);
+      return result.success ? helpers.success(result.output) : helpers.error(result.output);
     }
+    if (args.action === "fail") {
+      if (!args.id) return helpers.error("Missing required field: id");
+      if (!args.reason) return helpers.error("Missing required field: reason");
+      const result = completeCriterion(session, context, args.id, "failed", args.reason);
+      return result.success ? helpers.success(result.output) : helpers.error(result.output);
+    }
+    return helpers.error("Unexpected error");
   }
-};
+);
 
 // src/server/tools/todo.ts
 var sessionTodos = /* @__PURE__ */ new Map();
 var onTodoUpdate = null;
-var todoTool = {
-  name: "todo",
-  permittedActions: ["list", "write", "add", "update", "remove"],
-  definition: {
+function buildTaskListSummary(todosList) {
+  const pending = todosList.filter((t) => t.status === "pending").length;
+  const inProgress = todosList.filter((t) => t.status === "in_progress").length;
+  const completed = todosList.filter((t) => t.status === "completed").length;
+  return `${completed} completed, ${inProgress} in progress, ${pending} pending`;
+}
+function validateIndex(index, todosList, helpers) {
+  if (index === void 0) return helpers.error("Missing required field: index");
+  if (index < 0 || index >= todosList.length) {
+    return helpers.error(`Index out of range: ${index}. Valid range: 0-${todosList.length - 1}`);
+  }
+  return todosList[index];
+}
+var todoTool = createTool(
+  "todo",
+  {
     type: "function",
     function: {
       name: "todo",
@@ -2552,235 +2399,65 @@ var todoTool = {
       }
     }
   },
-  async execute(args, context) {
-    const startTime = Date.now();
-    try {
-      const action = args["action"];
-      const todos = args["todos"];
-      const content = args["content"];
-      const index = args["index"];
-      const status = args["status"];
-      if (!action || !["list", "write", "add", "update", "remove"].includes(action)) {
-        return {
-          success: false,
-          error: `Invalid action: ${action}. Must be one of: list, write, add, update, remove`,
-          durationMs: Date.now() - startTime,
-          truncated: false
-        };
-      }
-      const permittedActions = context.permittedActions?.["todo"];
-      if (permittedActions && !permittedActions.includes(action)) {
-        return {
-          success: false,
-          error: `Action '${action}' not allowed. Available: ${permittedActions.join(", ")}`,
-          durationMs: Date.now() - startTime,
-          truncated: false
-        };
-      }
-      if (action === "list") {
-        const todosList = sessionTodos.get(context.sessionId) ?? [];
-        return {
-          success: true,
-          output: todosList.length === 0 ? "No tasks defined yet." : JSON.stringify(todosList, null, 2),
-          durationMs: Date.now() - startTime,
-          truncated: false
-        };
-      }
-      if (action === "write") {
-        if (!todos) {
-          return {
-            success: false,
-            error: "Missing required field: todos",
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        if (!Array.isArray(todos)) {
-          return {
-            success: false,
-            error: "todos must be an array",
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        for (const todo of todos) {
-          if (!todo.content || !todo.status) {
-            return {
-              success: false,
-              error: "Each todo must have content and status",
-              durationMs: Date.now() - startTime,
-              truncated: false
-            };
-          }
-          if (!["pending", "in_progress", "completed"].includes(todo.status)) {
-            return {
-              success: false,
-              error: `Invalid status: ${todo.status}. Must be pending, in_progress, or completed`,
-              durationMs: Date.now() - startTime,
-              truncated: false
-            };
-          }
-        }
-        sessionTodos.set(context.sessionId, todos);
-        if (onTodoUpdate) {
-          onTodoUpdate(context.sessionId, todos);
-        }
-        const pending = todos.filter((t) => t.status === "pending").length;
-        const inProgress = todos.filter((t) => t.status === "in_progress").length;
-        const completed = todos.filter((t) => t.status === "completed").length;
-        return {
-          success: true,
-          output: `Task list updated: ${completed} completed, ${inProgress} in progress, ${pending} pending`,
-          durationMs: Date.now() - startTime,
-          truncated: false
-        };
-      }
-      if (action === "add") {
-        if (!content) {
-          return {
-            success: false,
-            error: "Missing required field: content",
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        const todosList = sessionTodos.get(context.sessionId) ?? [];
-        const newTodo = { content, status: "pending" };
-        todosList.push(newTodo);
-        sessionTodos.set(context.sessionId, todosList);
-        if (onTodoUpdate) {
-          onTodoUpdate(context.sessionId, todosList);
-        }
-        const pending = todosList.filter((t) => t.status === "pending").length;
-        const inProgress = todosList.filter((t) => t.status === "in_progress").length;
-        const completed = todosList.filter((t) => t.status === "completed").length;
-        return {
-          success: true,
-          output: `Added task "${content}". Task list: ${completed} completed, ${inProgress} in progress, ${pending} pending`,
-          durationMs: Date.now() - startTime,
-          truncated: false
-        };
-      }
-      if (action === "update") {
-        if (index === void 0) {
-          return {
-            success: false,
-            error: "Missing required field: index",
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        if (!content && !status) {
-          return {
-            success: false,
-            error: "update requires content or status",
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        if (status && !["pending", "in_progress", "completed"].includes(status)) {
-          return {
-            success: false,
-            error: `Invalid status: ${status}. Must be pending, in_progress, or completed`,
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        const todosList = sessionTodos.get(context.sessionId) ?? [];
-        if (index < 0 || index >= todosList.length) {
-          return {
-            success: false,
-            error: `Index out of range: ${index}. Valid range: 0-${todosList.length - 1}`,
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        const todo = todosList[index];
-        if (!todo) {
-          return {
-            success: false,
-            error: `Index out of range: ${index}. Valid range: 0-${todosList.length - 1}`,
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        if (content) {
-          todo.content = content;
-        }
-        if (status) {
-          todo.status = status;
-        }
-        sessionTodos.set(context.sessionId, todosList);
-        if (onTodoUpdate) {
-          onTodoUpdate(context.sessionId, todosList);
+  async (args, context, helpers) => {
+    const actionError = validateActionWithPermission(args.action, ["list", "write", "add", "update", "remove"], "todo", context.permittedActions);
+    if (actionError) return actionError;
+    if (args.action === "list") {
+      const todosList = sessionTodos.get(context.sessionId) ?? [];
+      return helpers.success(
+        todosList.length === 0 ? "No tasks defined yet." : JSON.stringify(todosList, null, 2)
+      );
+    }
+    if (args.action === "write") {
+      if (!args.todos) return helpers.error("Missing required field: todos");
+      if (!Array.isArray(args.todos)) return helpers.error("todos must be an array");
+      for (const todo of args.todos) {
+        if (!todo.content || !todo.status) return helpers.error("Each todo must have content and status");
+        if (!["pending", "in_progress", "completed"].includes(todo.status)) {
+          return helpers.error(`Invalid status: ${todo.status}. Must be pending, in_progress, or completed`);
         }
-        const pending = todosList.filter((t) => t.status === "pending").length;
-        const inProgress = todosList.filter((t) => t.status === "in_progress").length;
-        const completed = todosList.filter((t) => t.status === "completed").length;
-        return {
-          success: true,
-          output: `Updated task ${index}. Task list: ${completed} completed, ${inProgress} in progress, ${pending} pending`,
-          durationMs: Date.now() - startTime,
-          truncated: false
-        };
       }
-      if (action === "remove") {
-        if (index === void 0) {
-          return {
-            success: false,
-            error: "Missing required field: index",
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        const todosList = sessionTodos.get(context.sessionId) ?? [];
-        if (index < 0 || index >= todosList.length) {
-          return {
-            success: false,
-            error: `Index out of range: ${index}. Valid range: 0-${todosList.length - 1}`,
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        const removed = todosList.splice(index, 1)[0];
-        sessionTodos.set(context.sessionId, todosList);
-        if (onTodoUpdate) {
-          onTodoUpdate(context.sessionId, todosList);
-        }
-        if (todosList.length === 0) {
-          return {
-            success: true,
-            output: `Removed task "${removed.content}". No tasks remaining.`,
-            durationMs: Date.now() - startTime,
-            truncated: false
-          };
-        }
-        const pending = todosList.filter((t) => t.status === "pending").length;
-        const inProgress = todosList.filter((t) => t.status === "in_progress").length;
-        const completed = todosList.filter((t) => t.status === "completed").length;
-        return {
-          success: true,
-          output: `Removed task "${removed.content}". Task list: ${completed} completed, ${inProgress} in progress, ${pending} pending`,
-          durationMs: Date.now() - startTime,
-          truncated: false
-        };
+      sessionTodos.set(context.sessionId, args.todos);
+      if (onTodoUpdate) onTodoUpdate(context.sessionId, args.todos);
+      return helpers.success(`${args.todos.filter((t) => t.status === "completed").length} completed, ${args.todos.filter((t) => t.status === "in_progress").length} in progress, ${args.todos.filter((t) => t.status === "pending").length} pending`);
+    }
+    if (args.action === "add") {
+      if (!args.content) return helpers.error("Missing required field: content");
+      const todosList = sessionTodos.get(context.sessionId) ?? [];
+      todosList.push({ content: args.content, status: "pending" });
+      sessionTodos.set(context.sessionId, todosList);
+      if (onTodoUpdate) onTodoUpdate(context.sessionId, todosList);
+      return helpers.success(`Added task "${args.content}". Task list: ${buildTaskListSummary(todosList)}`);
+    }
+    if (args.action === "update") {
+      if (!args.content && !args.status) return helpers.error("update requires content or status");
+      if (args.status && !["pending", "in_progress", "completed"].includes(args.status)) {
+        return helpers.error(`Invalid status: ${args.status}. Must be pending, in_progress, or completed`);
       }
-      return {
-        success: false,
-        error: "Unexpected error",
-        durationMs: Date.now() - startTime,
-        truncated: false
-      };
-    } catch (error) {
-      return {
-        success: false,
-        error: error instanceof Error ? error.message : "Unknown error",
-        durationMs: Date.now() - startTime,
-        truncated: false
-      };
+      const todosList = sessionTodos.get(context.sessionId) ?? [];
+      const indexResult = validateIndex(args.index, todosList, helpers);
+      if ("success" in indexResult && !indexResult.success) return indexResult;
+      const todo = indexResult;
+      if (args.content) todo.content = args.content;
+      if (args.status) todo.status = args.status;
+      sessionTodos.set(context.sessionId, todosList);
+      if (onTodoUpdate) onTodoUpdate(context.sessionId, todosList);
+      return helpers.success(`Updated task ${args.index}. Task list: ${buildTaskListSummary(todosList)}`);
+    }
+    if (args.action === "remove") {
+      const todosList = sessionTodos.get(context.sessionId) ?? [];
+      const indexResult = validateIndex(args.index, todosList, helpers);
+      if ("success" in indexResult && !indexResult.success) return indexResult;
+      const removed = todosList.splice(args.index, 1)[0];
+      sessionTodos.set(context.sessionId, todosList);
+      if (onTodoUpdate) onTodoUpdate(context.sessionId, todosList);
+      return helpers.success(
+        todosList.length === 0 ? `Removed task "${removed.content}". No tasks remaining.` : `Removed task "${removed.content}". Task list: ${buildTaskListSummary(todosList)}`
+      );
     }
+    return helpers.error("Unexpected error");
   }
-};
+);
 
 // src/server/chat/tool-streaming.ts
 function parseProgressMessage(message) {
@@ -2800,7 +2477,7 @@ function createToolProgressHandler(messageId, callId, onMessage) {
 }
 
 // src/server/skills/registry.ts
-import { readdir as readdir2, readFile as readFile6, writeFile as writeFile4, copyFile as copyFile2, mkdir as mkdir3, access as access3, unlink as unlink2 } from "fs/promises";
+import { readdir as readdir2, readFile as readFile6, writeFile as writeFile4, mkdir as mkdir3, access as access3, unlink as unlink2 } from "fs/promises";
 import { join as join4, dirname as dirname4 } from "path";
 import { constants as constants3 } from "fs";
 import { fileURLToPath as fileURLToPath2 } from "url";
@@ -2813,7 +2490,7 @@ var SKILL_SETTING_PREFIX = "skill.enabled.";
 function getSkillsDir(configDir) {
   return join4(configDir, "skills");
 }
-async function dirExists(path) {
+async function pathExists2(path) {
   try {
     await access3(path, constants3.R_OK);
     return true;
@@ -2821,56 +2498,40 @@ async function dirExists(path) {
     return false;
   }
 }
-async function ensureDefaultSkills(configDir) {
-  const skillsDir = getSkillsDir(configDir);
-  if (!await dirExists(skillsDir)) {
-    await mkdir3(skillsDir, { recursive: true });
-  }
-  let defaultFiles;
-  let sourceDir;
+async function loadDefaultSkills() {
+  let defaults = [];
   try {
-    defaultFiles = (await readdir2(DEFAULTS_DIR2)).filter((f) => f.endsWith(SKILL_EXTENSION));
-    sourceDir = DEFAULTS_DIR2;
+    defaults = await loadSkillsFromDir(DEFAULTS_DIR2);
   } catch {
+  }
+  if (!defaults.length) {
     try {
-      defaultFiles = (await readdir2(DEFAULTS_DIR_ALT2)).filter((f) => f.endsWith(SKILL_EXTENSION));
-      sourceDir = DEFAULTS_DIR_ALT2;
+      defaults = await loadSkillsFromDir(DEFAULTS_DIR_ALT2);
     } catch {
-      logger.warn("No bundled skill defaults found", { dir: DEFAULTS_DIR2 });
-      return;
-    }
-  }
-  for (const file of defaultFiles) {
-    const targetPath = join4(skillsDir, file);
-    if (!await dirExists(targetPath)) {
-      try {
-        await copyFile2(join4(sourceDir, file), targetPath);
-        logger.info("Installed default skill", { file });
-      } catch (err) {
-        logger.error("Failed to copy default skill", { file, error: err instanceof Error ? err.message : String(err) });
-      }
     }
   }
+  return defaults;
 }
-async function loadAllSkills(configDir) {
-  const skillsDir = getSkillsDir(configDir);
-  if (!await dirExists(skillsDir)) {
+async function loadSkillsFromDir(dir) {
+  if (!await pathExists2(dir)) {
     return [];
   }
   let files;
   try {
-    files = (await readdir2(skillsDir)).filter((f) => f.endsWith(SKILL_EXTENSION));
+    files = (await readdir2(dir)).filter((f) => f.endsWith(SKILL_EXTENSION));
   } catch {
     return [];
   }
   const skills = [];
   for (const file of files) {
     try {
-      const raw = await readFile6(join4(skillsDir, file), "utf-8");
+      const raw = await readFile6(join4(dir, file), "utf-8");
       const { data, content } = matter2(raw);
-      const metadata = data;
-      if (metadata.id && content.trim()) {
-        skills.push({ metadata, prompt: content.trim() });
+      if (data.id && content.trim()) {
+        skills.push({
+          metadata: data,
+          prompt: content.trim()
+        });
       } else {
         logger.warn("Skipping invalid skill file", { file });
       }
@@ -2880,6 +2541,23 @@ async function loadAllSkills(configDir) {
   }
   return skills;
 }
+async function loadUserSkills(configDir) {
+  return loadSkillsFromDir(getSkillsDir(configDir));
+}
+async function loadAllSkills(configDir) {
+  const [defaultSkills, userSkills] = await Promise.all([
+    loadDefaultSkills(),
+    loadUserSkills(configDir)
+  ]);
+  const skillMap = /* @__PURE__ */ new Map();
+  for (const skill of defaultSkills) {
+    skillMap.set(skill.metadata.id, skill);
+  }
+  for (const skill of userSkills) {
+    skillMap.set(skill.metadata.id, skill);
+  }
+  return Array.from(skillMap.values());
+}
 async function getEnabledSkills(configDir) {
   const all = await loadAllSkills(configDir);
   return all.filter((s) => isSkillEnabled(s.metadata.id));
@@ -2896,71 +2574,36 @@ function isSkillEnabled(skillId) {
 function setSkillEnabled(skillId, enabled) {
   setSetting(`${SKILL_SETTING_PREFIX}${skillId}`, String(enabled));
 }
-async function getDefaultSkillIds() {
-  for (const dir of [DEFAULTS_DIR2, DEFAULTS_DIR_ALT2]) {
-    try {
-      const files = (await readdir2(dir)).filter((f) => f.endsWith(SKILL_EXTENSION));
-      return files.map((f) => f.replace(SKILL_EXTENSION, ""));
-    } catch {
-    }
+async function getDefaultIds(dir, extension) {
+  try {
+    const files = (await readdir2(dir)).filter((f) => f.endsWith(extension));
+    return files.map((f) => f.replace(extension, ""));
+  } catch {
+    return [];
   }
-  return [];
 }
-async function restoreDefaultSkill(configDir, skillId) {
-  const filename = `${skillId}${SKILL_EXTENSION}`;
-  for (const dir of [DEFAULTS_DIR2, DEFAULTS_DIR_ALT2]) {
-    const sourcePath = join4(dir, filename);
-    if (await dirExists(sourcePath)) {
-      const targetPath = join4(getSkillsDir(configDir), filename);
-      await copyFile2(sourcePath, targetPath);
-      return true;
-    }
-  }
-  return false;
+async function getDefaultSkillIds() {
+  const ids = await getDefaultIds(DEFAULTS_DIR2, SKILL_EXTENSION);
+  if (ids.length) return ids;
+  return getDefaultIds(DEFAULTS_DIR_ALT2, SKILL_EXTENSION);
 }
-async function getModifiedDefaultSkillIds(configDir) {
-  const defaultIds = await getDefaultSkillIds();
-  const modified = [];
-  for (const id of defaultIds) {
-    const filename = `${id}${SKILL_EXTENSION}`;
-    const userPath = join4(getSkillsDir(configDir), filename);
-    let bundledContent = null;
-    for (const dir of [DEFAULTS_DIR2, DEFAULTS_DIR_ALT2]) {
-      try {
-        bundledContent = await readFile6(join4(dir, filename), "utf-8");
-        break;
-      } catch {
-      }
-    }
-    if (!bundledContent) continue;
-    try {
-      const userContent = await readFile6(userPath, "utf-8");
-      if (userContent !== bundledContent) {
-        modified.push(id);
-      }
-    } catch {
-    }
-  }
-  return modified;
+async function getDefaultSkillContent(skillId) {
+  const defaults = await loadDefaultSkills();
+  return defaults.find((s) => s.metadata.id === skillId) ?? null;
 }
-async function restoreAllDefaultSkills(configDir) {
-  const ids = await getDefaultSkillIds();
-  let count = 0;
-  for (const id of ids) {
-    if (await restoreDefaultSkill(configDir, id)) count++;
-  }
-  return count;
+async function isDefaultSkill(skillId) {
+  const defaultIds = await getDefaultSkillIds();
+  return defaultIds.includes(skillId);
 }
 function findSkillById(skillId, skills) {
   return skills.find((s) => s.metadata.id === skillId);
 }
 async function skillExists(configDir, skillId) {
-  const filePath = join4(getSkillsDir(configDir), `${skillId}${SKILL_EXTENSION}`);
-  return dirExists(filePath);
+  return pathExists2(join4(getSkillsDir(configDir), `${skillId}${SKILL_EXTENSION}`));
 }
 async function saveSkill(configDir, skill) {
   const skillsDir = getSkillsDir(configDir);
-  if (!await dirExists(skillsDir)) {
+  if (!await pathExists2(skillsDir)) {
     await mkdir3(skillsDir, { recursive: true });
   }
   const filePath = join4(skillsDir, `${skill.metadata.id}${SKILL_EXTENSION}`);
@@ -2968,19 +2611,31 @@ async function saveSkill(configDir, skill) {
   await writeFile4(filePath, content, "utf-8");
 }
 async function deleteSkill(configDir, skillId) {
+  const isDefault = await isDefaultSkill(skillId);
+  if (isDefault) {
+    return { success: false, reason: "Cannot delete built-in defaults" };
+  }
   const filePath = join4(getSkillsDir(configDir), `${skillId}${SKILL_EXTENSION}`);
   try {
     await unlink2(filePath);
-    const { deleteSetting } = await import("./settings-NCLN4JDZ.js");
     deleteSetting(`${SKILL_SETTING_PREFIX}${skillId}`);
-    return true;
+    return { success: true };
   } catch {
-    return false;
+    return { success: false };
   }
 }
 
 // src/server/chat/agent-loop.ts
 import stripAnsi from "strip-ansi";
+function emitPartialDoneEvents(sessionId, assistantMsgId, statsIdentity, mode, turnMetrics, promptContext, eventStore) {
+  const stats = turnMetrics.buildStats(statsIdentity, mode);
+  eventStore.append(sessionId, createMessageDoneEvent(assistantMsgId, {
+    stats,
+    partial: true,
+    promptContext
+  }));
+  eventStore.append(sessionId, createChatDoneEvent(assistantMsgId, "stopped", stats));
+}
 function getCurrentWindowMessageOptions(sessionId) {
   const contextWindowId = getCurrentContextWindowId(sessionId);
   return contextWindowId ? { contextWindowId } : void 0;
@@ -3211,13 +2866,7 @@ async function runTopLevelAgentLoop(config, turnMetrics) {
       }
     }
     if (result.aborted) {
-      const stats2 = turnMetrics.buildStats(statsIdentity, mode);
-      eventStore.append(sessionId, createMessageDoneEvent(assistantMsgId, {
-        stats: stats2,
-        partial: true,
-        promptContext: assembledRequest.promptContext
-      }));
-      eventStore.append(sessionId, createChatDoneEvent(assistantMsgId, "stopped", stats2));
+      emitPartialDoneEvents(sessionId, assistantMsgId, statsIdentity, mode, turnMetrics, assembledRequest.promptContext, eventStore);
       throw new Error("Aborted");
     }
     turnMetrics.addLLMCall(result.timing, result.usage.promptTokens, result.usage.completionTokens);
@@ -3252,25 +2901,13 @@ async function runTopLevelAgentLoop(config, turnMetrics) {
         }
       } catch (error) {
         if (error instanceof Error && error.message === "Aborted") {
-          const stats2 = turnMetrics.buildStats(statsIdentity, mode);
-          eventStore.append(sessionId, createMessageDoneEvent(assistantMsgId, {
-            stats: stats2,
-            partial: true,
-            promptContext: assembledRequest.promptContext
-          }));
-          eventStore.append(sessionId, createChatDoneEvent(assistantMsgId, "stopped", stats2));
+          emitPartialDoneEvents(sessionId, assistantMsgId, statsIdentity, mode, turnMetrics, assembledRequest.promptContext, eventStore);
           throw error;
         }
         throw error;
       }
       if (signal?.aborted) {
-        const stats2 = turnMetrics.buildStats(statsIdentity, mode);
-        eventStore.append(sessionId, createMessageDoneEvent(assistantMsgId, {
-          stats: stats2,
-          partial: true,
-          promptContext: assembledRequest.promptContext
-        }));
-        eventStore.append(sessionId, createChatDoneEvent(assistantMsgId, "stopped", stats2));
+        emitPartialDoneEvents(sessionId, assistantMsgId, statsIdentity, mode, turnMetrics, assembledRequest.promptContext, eventStore);
         throw new Error("Aborted");
       }
       const asapMessages = sessionManager.drainAsapMessages(sessionId);
@@ -3308,12 +2945,32 @@ async function runTopLevelAgentLoop(config, turnMetrics) {
   };
 }
 
+// src/server/context/nudge-helpers.ts
+function appendNudgeMessage(eventStore, sessionId, content, currentWindowMessageOptions, options) {
+  const msgId = crypto.randomUUID();
+  eventStore.append(sessionId, createMessageStartEvent(msgId, "user", content, {
+    ...currentWindowMessageOptions ?? {},
+    isSystemGenerated: true,
+    messageKind: "correction",
+    subAgentId: options.subAgentId,
+    subAgentType: options.subAgentType
+  }));
+  eventStore.append(sessionId, { type: "message.done", data: { messageId: msgId } });
+}
+
 // src/server/sub-agents/manager.ts
 var RETURN_VALUE_INSTRUCTION = `
 
 ## RETURN VALUE
 As the very last thing you do, call \`return_value\` ONCE with a structured summary of your work. This is how your findings get passed back to the calling agent. Do not finish without calling return_value.`;
 var RETURN_VALUE_NUDGE = "You must call return_value with a summary of your findings before finishing. Call return_value now.";
+function buildSubAgentResult(returnValueContent, returnValueResult, subAgentType, failed, remaining) {
+  return {
+    content: returnValueContent ?? "",
+    ...returnValueResult !== null && returnValueResult !== void 0 ? { result: returnValueResult } : {},
+    ...subAgentType === "verifier" ? { allPassed: failed.length === 0 && remaining.length === 0, failed } : {}
+  };
+}
 async function resolveAgentDef(agentId) {
   const allAgents = await loadAllAgentsDefault();
   const def = findAgentById(agentId, allAgents);
@@ -3483,19 +3140,11 @@ async function executeSubAgent(options) {
           if (consecutiveEmptyStops < nudgeConfig.maxConsecutiveNudges) {
             consecutiveEmptyStops += 1;
             const nudgeContent = nudgeConfig.buildNudgeContent(criteriaAwaiting);
-            const nudgeMsgId = crypto.randomUUID();
             eventStore.append(sessionId, createMessageDoneEvent(assistantMsgId, {
               segments: result.segments,
               promptContext
             }));
-            eventStore.append(sessionId, createMessageStartEvent(nudgeMsgId, "user", nudgeContent, {
-              ...currentWindowMessageOptions ?? {},
-              isSystemGenerated: true,
-              messageKind: "correction",
-              subAgentId,
-              subAgentType
-            }));
-            eventStore.append(sessionId, { type: "message.done", data: { messageId: nudgeMsgId } });
+            appendNudgeMessage(eventStore, sessionId, nudgeContent, currentWindowMessageOptions, { subAgentId, subAgentType });
             customMessages = [...customMessages, { role: "user", content: nudgeContent, source: "runtime" }];
             continue;
           }
@@ -3512,19 +3161,11 @@ async function executeSubAgent(options) {
       }
       if (!returnValueContent && !returnValueNudged) {
         returnValueNudged = true;
-        const nudgeMsgId = crypto.randomUUID();
         eventStore.append(sessionId, createMessageDoneEvent(assistantMsgId, {
           segments: result.segments,
           promptContext
         }));
-        eventStore.append(sessionId, createMessageStartEvent(nudgeMsgId, "user", RETURN_VALUE_NUDGE, {
-          ...currentWindowMessageOptions ?? {},
-          isSystemGenerated: true,
-          messageKind: "correction",
-          subAgentId,
-          subAgentType
-        }));
-        eventStore.append(sessionId, { type: "message.done", data: { messageId: nudgeMsgId } });
+        appendNudgeMessage(eventStore, sessionId, RETURN_VALUE_NUDGE, currentWindowMessageOptions, { subAgentId, subAgentType });
         customMessages = [...customMessages, { role: "user", content: RETURN_VALUE_NUDGE, source: "runtime" }];
         continue;
       }
@@ -3580,21 +3221,9 @@ async function executeSubAgent(options) {
     subAgentId,
     resultLength: finalContent.length
   });
-  if (subAgentType === "verifier") {
-    session = sessionManager.requireSession(sessionId);
-    const remaining = nudgeConfig?.getCriteriaAwaiting(session.criteria) ?? [];
-    const failed = session.criteria.filter((c) => c.status.type === "failed").map((c) => ({
-      id: c.id,
-      reason: c.status.type === "failed" ? c.status.reason : "unknown"
-    }));
-    return {
-      content: returnValueContent ?? finalContent,
-      ...returnValueResult ? { result: returnValueResult } : {},
-      allPassed: failed.length === 0 && remaining.length === 0,
-      failed
-    };
-  }
-  return { content: returnValueContent ?? finalContent, ...returnValueResult ? { result: returnValueResult } : { result: "success" } };
+  const failed = session.criteria.filter((c) => c.status.type === "failed").map((c) => ({ id: c.id, reason: c.status.reason ?? "unknown" }));
+  const remaining = nudgeConfig?.getCriteriaAwaiting(session.criteria) ?? [];
+  return buildSubAgentResult(returnValueContent ?? void 0, returnValueResult ?? (subAgentType !== "verifier" ? "success" : void 0), subAgentType, failed, remaining);
 }
 
 // src/server/tools/sub-agent.ts
@@ -3662,7 +3291,7 @@ var callSubAgentTool = {
       };
     }
     try {
-      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-PLVK22CF.js");
+      const { getToolRegistryForAgent: getToolRegistryForAgent2 } = await import("./tools-55YICCVH.js");
       const toolRegistry = getToolRegistryForAgent2(agentDef);
       const turnMetrics = new TurnMetrics();
       const result = await executeSubAgent({
@@ -3814,7 +3443,7 @@ function convertHTMLToMarkdown(html) {
   return turndown.turndown(html);
 }
 function stripHTMLTags(html) {
-  let text = html.replace(/<(script|style|noscript|iframe|object|embed)[^>]*>[\s\S]*?<\/\1>/gi, "").replace(/<[^>]+>/g, " ").replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&#39;/g, "'").replace(/&nbsp;/g, " ").replace(/\s+/g, " ").trim();
+  const text = html.replace(/<(script|style|noscript|iframe|object|embed)[^>]*>[\s\S]*?<\/\1>/gi, "").replace(/<[^>]+>/g, " ").replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&#39;/g, "'").replace(/&nbsp;/g, " ").replace(/\s+/g, " ").trim();
   return text;
 }
 var webFetchTool = createTool(
@@ -3916,7 +3545,7 @@ var webFetchTool = createTool(
 );
 
 // src/server/dev-server/manager.ts
-import { spawn as spawn3 } from "child_process";
+import { spawn as spawn4 } from "child_process";
 import { readFile as readFile7, writeFile as writeFile5, mkdir as mkdir4 } from "fs/promises";
 import { resolve as resolve5, join as join5 } from "path";
 var MAX_LOG_LINES = 2e3;
@@ -4010,7 +3639,7 @@ var DevServerManager = class {
     instance.exited = false;
     const resolved = this.resolveWorkdir(workdir);
     const shell = getPlatformShell();
-    const proc = spawn3(shell.command, [...shell.args, config.command], {
+    const proc = spawn4(shell.command, [...shell.args, config.command], {
       cwd: resolved,
       env: { ...process.env, FORCE_COLOR: "1" },
       stdio: ["ignore", "pipe", "pipe"],
@@ -4582,14 +4211,7 @@ function getCurrentWindowMessageOptions3(sessionId) {
   return contextWindowId ? { contextWindowId } : void 0;
 }
 function toRequestContextMessages2(messages) {
-  return messages.map((message) => ({
-    role: message.role,
-    content: message.content,
-    source: "history",
-    ...message.toolCalls ? { toolCalls: message.toolCalls } : {},
-    ...message.toolCallId ? { toolCallId: message.toolCallId } : {},
-    ...message.attachments ? { attachments: message.attachments } : {}
-  }));
+  return minimalMessagesToRequestContextMessages(messages, "history");
 }
 async function maybeAutoCompactContext(options) {
   const config = getRuntimeConfig();
@@ -4744,13 +4366,14 @@ export {
   PathAccessDeniedError,
   providePathConfirmation,
   cancelPathConfirmationsForSession,
-  ensureDefaultAgents,
+  checkAborted,
+  spawnShellProcess,
+  loadDefaultAgents,
+  loadUserAgents,
   loadAllAgents,
   loadAllAgentsDefault,
   getDefaultAgentIds,
-  restoreDefaultAgent,
-  getModifiedDefaultAgentIds,
-  restoreAllDefaultAgents,
+  getDefaultAgentContent,
   findAgentById,
   getSubAgents,
   agentExists,
@@ -4767,15 +4390,14 @@ export {
   createChatDoneEvent,
   getAllInstructions,
   assembleAgentRequest,
-  ensureDefaultSkills,
+  loadDefaultSkills,
+  loadUserSkills,
   loadAllSkills,
   getEnabledSkillMetadata,
   isSkillEnabled,
   setSkillEnabled,
   getDefaultSkillIds,
-  restoreDefaultSkill,
-  getModifiedDefaultSkillIds,
-  restoreAllDefaultSkills,
+  getDefaultSkillContent,
   findSkillById,
   skillExists,
   saveSkill,
@@ -4795,4 +4417,4 @@ export {
   getToolRegistryForAgent,
   createToolRegistry
 };
-//# sourceMappingURL=chunk-N25QUEPO.js.map
+//# sourceMappingURL=chunk-4OI4VPZ6.js.map