oricore 1.4.1 → 1.5.1

package/dist/{chunk-XKZSVWRX.js → chunk-MZNH54NB.js}

@@ -1,7 +1,7 @@
 import {
   __toESM,
   require_undici
-} from "./chunk-SXDGT4YB.js";
+} from "./chunk-D5X6YFSK.js";
 
 // src/core/history.ts
 import createDebug7 from "debug";
@@ -929,6 +929,7 @@ async function runLoop(opts) {
             request: result.request,
             response: result.response
           });
+          let finishChunkReceived = false;
           for await (const chunk of result.stream) {
             if (opts.signal?.aborted) {
               return createCancelError();
@@ -960,6 +961,7 @@ async function runLoop(opts) {
                 });
                 break;
               case "finish":
+                finishChunkReceived = true;
                 lastUsage = Usage.fromEventUsage(chunk.usage);
                 totalUsage.add(lastUsage);
                 if (toolCalls.length === 0 && text.trim() === "") {
@@ -998,6 +1000,13 @@ async function runLoop(opts) {
                 break;
             }
           }
+          if (!finishChunkReceived && toolCalls.length === 0 && text.trim() === "") {
+            const error = new Error(
+              "Empty response: stream ended without any chunks"
+            );
+            error.isRetryable = true;
+            throw error;
+          }
           break;
         } catch (error) {
           const nextRetryCount = retryCount + 1;
@@ -1165,6 +1174,8 @@ async function runLoop(opts) {
           }
         }
       };
+      const approvedToolUses = [];
+      let earlyReturn = null;
       for (const toolCall of toolCalls) {
         let toolUse = {
           name: toolCall.toolName,
@@ -1188,25 +1199,10 @@ async function runLoop(opts) {
           }
         }
         if (approved) {
-          toolCallsCount++;
           if (updatedParams) {
             toolUse.params = { ...toolUse.params, ...updatedParams };
           }
-          let toolResult = await opts.tools.invoke(
-            toolUse.name,
-            JSON.stringify(toolUse.params),
-            toolUse.callId
-          );
-          if (opts.onToolResult) {
-            toolResult = await opts.onToolResult(toolUse, toolResult, approved);
-          }
-          toolResults.push({
-            toolCallId: toolUse.callId,
-            toolName: toolUse.name,
-            input: toolUse.params,
-            result: toolResult
-          });
-          turnsCount--;
+          approvedToolUses.push(toolUse);
         } else {
           let message = "Error: Tool execution was denied by user.";
           if (denyReason) {
@@ -1217,7 +1213,7 @@ async function runLoop(opts) {
             isError: true
           };
           if (opts.onToolResult) {
-            toolResult = await opts.onToolResult(toolUse, toolResult, approved);
+            toolResult = await opts.onToolResult(toolUse, toolResult, false);
           }
           toolResults.push({
             toolCallId: toolUse.callId,
@@ -1225,8 +1221,8 @@ async function runLoop(opts) {
             input: toolUse.params,
             result: toolResult
           });
-          await addDeniedResultsForRemainingTools();
           if (!denyReason) {
+            await addDeniedResultsForRemainingTools();
             await history.addMessage({
               role: "tool",
               content: toolResults.map(
@@ -1238,7 +1234,7 @@ async function runLoop(opts) {
                 )
               )
             });
-            return {
+            earlyReturn = {
               success: false,
               error: {
                 type: "tool_denied",
@@ -1250,9 +1246,60 @@ async function runLoop(opts) {
                 }
               }
             };
-          } else {
             break;
           }
+          await addDeniedResultsForRemainingTools();
+          break;
+        }
+      }
+      if (earlyReturn) {
+        return earlyReturn;
+      }
+      if (approvedToolUses.length > 0) {
+        const executionResults = await Promise.allSettled(
+          approvedToolUses.map(async (toolUse) => {
+            let toolResult = await opts.tools.invoke(
+              toolUse.name,
+              JSON.stringify(toolUse.params),
+              toolUse.callId
+            );
+            if (opts.onToolResult) {
+              toolResult = await opts.onToolResult(toolUse, toolResult, true);
+            }
+            return {
+              toolCallId: toolUse.callId,
+              toolName: toolUse.name,
+              input: toolUse.params,
+              result: toolResult
+            };
+          })
+        );
+        toolCallsCount += approvedToolUses.length;
+        turnsCount -= approvedToolUses.length;
+        for (let i = 0; i < executionResults.length; i++) {
+          const settledResult = executionResults[i];
+          if (settledResult.status === "fulfilled") {
+            toolResults.push(settledResult.value);
+          } else {
+            const failedToolUse = approvedToolUses[i];
+            let errorResult = {
+              llmContent: `Tool execution error: ${settledResult.reason instanceof Error ? settledResult.reason.message : String(settledResult.reason)}`,
+              isError: true
+            };
+            if (opts.onToolResult) {
+              errorResult = await opts.onToolResult(
+                failedToolUse,
+                errorResult,
+                true
+              );
+            }
+            toolResults.push({
+              toolCallId: failedToolUse.callId,
+              toolName: failedToolUse.name,
+              input: failedToolUse.params,
+              result: errorResult
+            });
+          }
         }
       }
       if (opts.signal?.aborted) {
@@ -1614,6 +1661,22 @@ var models = {
     open_weights: false,
     limit: { context: 2e5, output: 65536 }
   },
+  "gemini-3.1-pro-preview": {
+    name: "Gemini 3.1 Pro Preview",
+    attachment: true,
+    reasoning: true,
+    temperature: true,
+    tool_call: true,
+    knowledge: "2025-01",
+    release_date: "2026-02-19",
+    last_updated: "2026-02-19",
+    modalities: {
+      input: ["text", "image", "audio", "video", "pdf"],
+      output: ["text"]
+    },
+    open_weights: false,
+    limit: { context: 1048576, output: 65536 }
+  },
   "gemini-3-flash-preview": {
     name: "Gemini 3 Flash Preview",
     attachment: true,
@@ -2095,6 +2158,19 @@ var models = {
     open_weights: true,
     limit: { context: 204800, output: 131072 }
   },
+  "glm-5": {
+    name: "GLM-5",
+    attachment: false,
+    reasoning: true,
+    temperature: true,
+    tool_call: true,
+    knowledge: "2025-06",
+    release_date: "2026-02-10",
+    last_updated: "2026-02-10",
+    modalities: { input: ["text"], output: ["text"] },
+    open_weights: true,
+    limit: { context: 262144, output: 131072 }
+  },
   "sonoma-dusk-alpha": {
     name: "Sonoma Dusk Alpha",
     attachment: true,
@@ -2186,6 +2262,20 @@ var models = {
     open_weights: false,
     limit: { context: 2e5, output: 128e3 }
   },
+  "claude-sonnet-4-6": {
+    name: "Claude Sonnet 4.6",
+    shortName: "Sonnet 4.6",
+    attachment: true,
+    reasoning: true,
+    temperature: true,
+    tool_call: true,
+    knowledge: "2025-07-31",
+    release_date: "2026-02-17",
+    last_updated: "2026-02-17",
+    modalities: { input: ["text", "image", "pdf"], output: ["text"] },
+    open_weights: false,
+    limit: { context: 1e6, output: 64e3 }
+  },
   "ling-1t": {
     name: "InclusionAI Ling-1T",
     attachment: true,
@@ -2328,6 +2418,32 @@ var models = {
     modalities: { input: ["text"], output: ["text"] },
     open_weights: true,
     limit: { context: 204800, output: 131072 }
+  },
+  "minimax-m2.5": {
+    name: "MiniMax M2.5",
+    attachment: false,
+    reasoning: true,
+    temperature: true,
+    tool_call: true,
+    knowledge: "",
+    release_date: "2026-02-13",
+    last_updated: "2026-02-13",
+    modalities: { input: ["text"], output: ["text"] },
+    open_weights: true,
+    limit: { context: 204800, output: 131072 }
+  },
+  "minimax-m2.7": {
+    name: "MiniMax M2.7",
+    attachment: false,
+    reasoning: true,
+    temperature: true,
+    tool_call: true,
+    knowledge: "",
+    release_date: "2026-03-18",
+    last_updated: "2026-03-18",
+    modalities: { input: ["text"], output: ["text"] },
+    open_weights: true,
+    limit: { context: 204800, output: 131072 }
   }
 };
 
@@ -2444,7 +2560,7 @@ function createProxyFetch(proxyUrl) {
   }
   return async (input, init) => {
     if (!undiciFetch) {
-      undiciFetch = (await import("./undici-DJO5UB2C.js")).fetch;
+      undiciFetch = (await import("./undici-NSB7IUB7.js")).fetch;
     }
     let url;
     let requestInit = init;
@@ -2491,36 +2607,6 @@ function withProxyConfig(config, provider) {
   return result;
 }
 
-// src/utils/mergeSystemMessagesMiddleware.ts
-var mergeSystemMessagesMiddleware = {
-  specificationVersion: "v3",
-  transformParams: async ({ params }) => {
-    const mergedPrompt = [];
-    let pendingSystemContent = [];
-    for (const msg of params.prompt) {
-      if (msg.role === "system") {
-        pendingSystemContent.push(msg.content);
-      } else {
-        if (pendingSystemContent.length > 0) {
-          mergedPrompt.push({
-            role: "system",
-            content: pendingSystemContent.join("\n\n")
-          });
-          pendingSystemContent = [];
-        }
-        mergedPrompt.push(msg);
-      }
-    }
-    if (pendingSystemContent.length > 0) {
-      mergedPrompt.push({
-        role: "system",
-        content: pendingSystemContent.join("\n\n")
-      });
-    }
-    return { ...params, prompt: mergedPrompt };
-  }
-};
-
 // src/core/model/providers.ts
 var defaultModelCreator = (name, provider) => {
   if (provider.id !== "openai") {
@@ -2646,6 +2732,7 @@ var providers = {
       "gemini-2.5-flash-lite": models["gemini-2.5-flash-lite-preview-06-17"],
       "gemini-2.5-pro": models["gemini-2.5-pro"],
       "gemini-3-pro-preview": models["gemini-3-pro-preview"],
+      "gemini-3.1-pro-preview": models["gemini-3.1-pro-preview"],
       "gemini-3-flash-preview": models["gemini-3-flash-preview"]
     },
     createModel(name, provider) {
@@ -2713,7 +2800,8 @@ var providers = {
       "claude-3-5-sonnet-20241022": models["claude-3-5-sonnet-20241022"],
       "claude-haiku-4-5": models["claude-haiku-4-5"],
       "claude-opus-4-5": models["claude-opus-4-5"],
-      "claude-opus-4-6": models["claude-opus-4-6"]
+      "claude-opus-4-6": models["claude-opus-4-6"],
+      "claude-sonnet-4-6": models["claude-sonnet-4-6"]
     },
     apiFormat: "anthropic",
     headers: {
@@ -2783,6 +2871,7 @@ var providers = {
       "anthropic/claude-opus-4": models["claude-4-opus"],
       "anthropic/claude-opus-4.1": models["claude-4.1-opus"],
       "anthropic/claude-opus-4.5": models["claude-opus-4-5"],
+      "anthropic/claude-sonnet-4.6": models["claude-sonnet-4-6"],
       "anthropic/claude-opus-4.6": models["claude-opus-4-6"],
       "deepseek/deepseek-r1-0528": models["deepseek-r1-0528"],
       "deepseek/deepseek-chat-v3-0324": models["deepseek-v3-0324"],
@@ -2827,7 +2916,9 @@ var providers = {
       "z-ai/glm-4.6": models["glm-4.6"],
       "z-ai/glm-4.6v": models["glm-4.6v"],
       "z-ai/glm-4.7": models["glm-4.7"],
+      "z-ai/glm-5": models["glm-5"],
       "minimax/minimax-m2": models["minimax-m2"],
+      "minimax/minimax-m2.5": models["minimax-m2.5"],
       "openrouter/sherlock-dash-alpha": models["sherlock-dash-alpha"],
       "openrouter/sherlock-think-alpha": models["sherlock-think-alpha"],
       "xiaomi/mimo-v2-flash:free": models["mimo-v2-flash"]
@@ -2846,43 +2937,6 @@ var providers = {
       ).chat(name);
     }
   },
-  iflow: {
-    id: "iflow",
-    source: "built-in",
-    env: ["IFLOW_API_KEY"],
-    name: "iFlow",
-    api: "https://apis.iflow.cn/v1/",
-    doc: "https://iflow.cn/",
-    models: {
-      "qwen3-coder-plus": models["qwen3-coder-plus"],
-      "kimi-k2": models["kimi-k2"],
-      "kimi-k2-0905": models["kimi-k2-0905"],
-      "deepseek-v3": models["deepseek-v3-0324"],
-      "deepseek-v3.2": models["deepseek-v3-2-exp"],
-      "deepseek-r1": models["deepseek-r1-0528"],
-      "glm-4.6": models["glm-4.6"],
-      "glm-4.7": models["glm-4.7"],
-      "minimax-m2.1": models["minimax-m2.1"],
-      "qwen3-max": models["qwen3-max"]
-    },
-    createModel: createModelCreatorCompatible({
-      fetch: (url, options) => {
-        return fetch(url, {
-          ...options,
-          headers: {
-            ...options.headers,
-            "user-agent": "iFlow-Cli"
-          }
-        });
-      },
-      middlewares: [
-        mergeSystemMessagesMiddleware,
-        extractReasoningMiddleware({
-          tagName: "think"
-        })
-      ]
-    })
-  },
   moonshotai: {
     id: "moonshotai",
     source: "built-in",
@@ -2959,7 +3013,12 @@ var providers = {
       "deepseek-ai/DeepSeek-R1": models["deepseek-r1-0528"],
       "deepseek-ai/DeepSeek-V3.1": models["deepseek-v3-1"],
       "deepseek-ai/DeepSeek-V3": models["deepseek-v3-0324"],
-      "zai-org/GLM-4.5": models["glm-4.5"]
+      "zai-org/GLM-4.5": models["glm-4.5"],
+      "Pro/moonshotai/Kimi-K2.5": models["kimi-k2-5"],
+      "Pro/zai-org/GLM-5": models["glm-5"],
+      "Pro/zai-org/GLM-4.7": models["glm-4.7"],
+      "Pro/MiniMaxAI/MiniMax-M2.5": models["minimax-m2.5"],
+      "Pro/deepseek-ai/DeepSeek-V3.2": models["deepseek-v3.2"]
     },
     createModel: defaultModelCreator
   },
@@ -2976,6 +3035,7 @@ var providers = {
       "ZhipuAI/GLM-4.5": models["glm-4.5"],
       "ZhipuAI/GLM-4.5V": models["glm-4.5v"],
       "ZhipuAI/GLM-4.6": models["glm-4.6"],
+      "ZhipuAI/GLM-5": models["glm-5"],
       "deepseek-ai/DeepSeek-V3.2": models["deepseek-v3.2"],
       "deepseek-ai/DeepSeek-V3.2-Speciale": models["deepseek-v3.2-speciale"]
     },
@@ -3010,7 +3070,8 @@ var providers = {
       "glm-4.5v": models["glm-4.5v"],
       "glm-4.6": models["glm-4.6"],
       "glm-4.6v": models["glm-4.6v"],
-      "glm-4.7": models["glm-4.7"]
+      "glm-4.7": models["glm-4.7"],
+      "glm-5": models["glm-5"]
     },
     createModel: defaultModelCreator
   },
@@ -3028,10 +3089,31 @@ var providers = {
       "glm-4.5": models["glm-4.5"],
       "glm-4.5-flash": models["glm-4.5-flash"],
       "glm-4.6v": models["glm-4.6v"],
-      "glm-4.7": models["glm-4.7"]
+      "glm-4.7": models["glm-4.7"],
+      "glm-5": models["glm-5"]
     },
     createModel: defaultModelCreator
   },
+  "bailian-coding-plan": {
+    id: "bailian-coding-plan",
+    source: "built-in",
+    env: ["BAILIAN_CODING_API_KEY"],
+    name: "BaiLian Coding Plan",
+    api: "https://coding.dashscope.aliyuncs.com/apps/anthropic/v1",
+    doc: "https://www.aliyun.com/benefit/scene/codingplan",
+    apiFormat: "anthropic",
+    models: {
+      "qwen3.5-plus": models["qwen3-5-plus"],
+      "qwen3-max-2026-01-23": models["qwen3-max"],
+      "qwen3-coder-next": models["qwen3-coder-plus"],
+      "qwen3-coder-plus": models["qwen3-coder-plus"],
+      "MiniMax-M2.5": models["minimax-m2.5"],
+      "glm-5": models["glm-5"],
+      "glm-4.7": models["glm-4.7"],
+      "kimi-k2.5": models["kimi-k2-5"]
+    },
+    createModel: defaultAnthropicModelCreator
+  },
   zhipuai: {
     id: "zhipuai",
     source: "built-in",
@@ -3046,7 +3128,8 @@ var providers = {
       "glm-4.5": models["glm-4.5"],
       "glm-4.5-flash": models["glm-4.5-flash"],
       "glm-4.6v": models["glm-4.6v"],
-      "glm-4.7": models["glm-4.7"]
+      "glm-4.7": models["glm-4.7"],
+      "glm-5": models["glm-5"]
     },
     createModel: defaultModelCreator
   },
@@ -3080,9 +3163,12 @@ var providers = {
       "z-ai/glm-4.6": models["glm-4.6"],
       "z-ai/glm-4.6v": models["glm-4.6v"],
       "z-ai/glm-4.6v-flash": models["glm-4.6v"],
+      "z-ai/glm-4.7": models["glm-4.7"],
+      "z-ai/glm-5": models["glm-5"],
       "deepseek/deepseek-v3.2-speciale": models["deepseek-v3.2-speciale"],
       "deepseek/deepseek-chat": models["deepseek-v3-2-exp"],
-      "deepseek/deepseek-reasoner": models["deepseek-r1-0528"]
+      "deepseek/deepseek-reasoner": models["deepseek-r1-0528"],
+      "minimax/minimax-m2.5": models["minimax-m2.5"]
     },
     headers: {
       "X-Title": "OriCore",
@@ -3098,7 +3184,9 @@ var providers = {
     doc: "https://platform.minimaxi.io/docs/guides/quickstart",
     models: {
       "minimax-m2": models["minimax-m2"],
-      "minimax-m2.1": models["minimax-m2.1"]
+      "minimax-m2.1": models["minimax-m2.1"],
+      "minimax-m2.5": models["minimax-m2.5"],
+      "minimax-m2.7": models["minimax-m2.7"]
     },
     createModel(name, provider) {
       const baseURL = getProviderBaseURL(provider);
@@ -3117,7 +3205,9 @@ var providers = {
     doc: "https://platform.minimaxi.com/docs/guides/quickstart",
     models: {
       "minimax-m2": models["minimax-m2"],
-      "minimax-m2.1": models["minimax-m2.1"]
+      "minimax-m2.1": models["minimax-m2.1"],
+      "minimax-m2.5": models["minimax-m2.5"],
+      "minimax-m2.7": models["minimax-m2.7"]
     },
     createModel(name, provider) {
       const baseURL = getProviderBaseURL(provider);
@@ -3246,7 +3336,9 @@ var providers = {
       "zai/glm-4.7": models["glm-4.7"],
       "moonshotai/kimi-k2-thinking": models["kimi-k2-thinking"],
       "moonshotai/kimi-k2.5": models["kimi-k2.5"],
-      "deepseek/deepseek-chat-v3.2": models["deepseek-v3-2-exp"]
+      "deepseek/deepseek-chat-v3.2": models["deepseek-v3-2-exp"],
+      "openai/gpt-oss-120b": models["gpt-oss-120b"],
+      "xiaomimimo/mimo-v2-flash": models["mimo-v2-flash"]
     },
     createModel: defaultModelCreator
   },
@@ -3266,6 +3358,7 @@ var providers = {
       "claude-4-5-sonnet": models["claude-4-5-sonnet"],
       "claude-haiku-4-5": models["claude-haiku-4-5"],
       "claude-opus-4-5": models["claude-opus-4-5"],
+      "claude-sonnet-4-6": models["claude-sonnet-4-6"],
       "claude-opus-4-6": models["claude-opus-4-6"],
       "gpt-5.1": models["gpt-5.1"],
       "gpt-5.1-codex-max": models["gpt-5.1-codex-max"],
@@ -3284,6 +3377,38 @@ var providers = {
       }
       return defaultModelCreator(name, provider);
     }
+  },
+  kilo: {
+    id: "kilo",
+    source: "built-in",
+    env: ["KILO_API_KEY"],
+    name: "Kilo",
+    api: "https://api.kilo.ai/api/gateway",
+    doc: "https://kilo.ai",
+    apiFormat: "openai",
+    models: {
+      "z-ai/glm-5": models["glm-5"],
+      "z-ai/glm-5:free": models["glm-5"],
+      "z-ai/glm-4.7": models["glm-4.7"],
+      "anthropic/claude-opus-4.6": models["claude-opus-4-6"],
+      "anthropic/claude-sonnet-4.6": models["claude-sonnet-4-6"],
+      "anthropic/claude-haiku-4.5": models["claude-haiku-4-5"],
+      "anthropic/claude-sonnet-4.5": models["claude-4-5-sonnet"],
+      "google/gemini-3-flash-preview": models["gemini-3-flash-preview"],
+      "google/gemini-3-pro-preview": models["gemini-3-pro-preview"],
+      "minimax/minimax-m2.5:free": models["minimax-m2.5"],
+      "minimax/minimax-m2.5": models["minimax-m2.5"],
+      "moonshotai/kimi-k2.5": models["kimi-k2-5"]
+    },
+    createModel: (name, provider) => {
+      if (name.includes("claude-")) {
+        return defaultAnthropicModelCreator(name, provider);
+      }
+      if (name.includes("gemini-")) {
+        return defaultAnthropicModelCreator(name, provider);
+      }
+      return defaultModelCreator(name, provider);
+    }
   }
 };
 
@@ -3917,6 +4042,17 @@ function transformVariants(model, provider) {
     return {};
   }
   const id = (model.id || "").toLowerCase();
+  if (provider.id === "bailian-coding-plan") {
+    if (id.includes("kimi") || id.includes("minimax") || id.includes("glm")) {
+      return {
+        on: {
+          thinking: {
+            type: "enabled"
+          }
+        }
+      };
+    }
+  }
   if (id.includes("deepseek") || id.includes("minimax") || id.includes("glm") || id.includes("mistral") || // id.includes("kimi") ||
   id.includes("grok")) {
     return {};
@@ -4589,6 +4725,9 @@ function stripAnsi(string) {
   if (typeof string !== "string") {
     throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
   }
+  if (!string.includes("\x1B") && !string.includes("\x9B")) {
+    return string;
+  }
   return string.replace(regex, "");
 }
 
@@ -6852,72 +6991,10 @@ function readFileWithOffsetLimit(filePath, offset = 1, limit = MAX_LINES_TO_READ
 
 // src/tools/tools/skill.ts
 import path9 from "pathe";
-import { z as z10 } from "zod";
-function renderAvailableSkills(skills) {
-  return skills.map(
-    (skill) => `<skill>
-<name>${skill.name}</name>
-<description>${skill.description}</description>
-</skill>`
-  ).join("\n");
-}
-function generateDescription(skillManager) {
-  const skills = skillManager.getSkills();
-  return `Execute a skill within the main conversation
-<skills_instructions>
-When users ask you to perform tasks, check if any of the available skills below match the task. If a skill matches, use this tool to invoke it. Skills provide specialized knowledge and procedures for specific tasks.
-</skills_instructions>
-<available_skills>
-${renderAvailableSkills(skills)}
-</available_skills>`;
-}
-function createSkillTool(opts) {
-  return createTool({
-    name: "skill",
-    description: generateDescription(opts.skillManager),
-    parameters: z10.object({
-      skill: z10.string().describe("The skill name to execute")
-    }),
-    getDescription: ({ params }) => {
-      return params.skill;
-    },
-    async execute({ skill }) {
-      const trimmed = skill.trim();
-      const skillName = trimmed.startsWith("/") ? trimmed.substring(1) : trimmed;
-      const foundSkill = opts.skillManager.getSkill(skillName);
-      if (!foundSkill) {
-        return {
-          isError: true,
-          llmContent: `Skill "${skillName}" not found`
-        };
-      }
-      const body = await opts.skillManager.readSkillBody(foundSkill);
-      const baseDir = path9.dirname(foundSkill.path);
-      const messages = [
-        {
-          type: "text",
-          text: `<command-message>${skillName} is running\u2026</command-message>
-<command-name>${skillName}</command-name>`
-        },
-        {
-          type: "text",
-          text: `Base directory for this skill: ${baseDir}
-
-${body}`,
-          isMeta: true
-        }
-      ];
-      return {
-        llmContent: safeStringify(messages),
-        returnDisplay: `Loaded skill: ${foundSkill.name}`
-      };
-    },
-    approval: { category: "read" }
-  });
-}
+import { z as z11 } from "zod";
 
 // src/tools/tools/task.ts
-import { z as z11 } from "zod";
+import { z as z10 } from "zod";
 function createTaskTool(opts) {
   const { signal, sessionId } = opts;
   const { cwd, agentManager, messageBus } = opts.context;
@@ -6983,11 +7060,11 @@ Since the user is greeting, use the greeting-responder agent to respond with a f
 assistant: "I'm going to use the ${"task" /* TASK */} tool to launch the with the greeting-responder agent"
 </example>
       `,
-    parameters: z11.object({
-      description: z11.string().describe("A short (3-5 word) description of task"),
-      prompt: z11.string().describe("The task for the agent to perform"),
-      subagent_type: z11.string().describe("The type of specialized agent to use for this task"),
-      resume: z11.string().optional().describe(
+    parameters: z10.object({
+      description: z10.string().describe("A short (3-5 word) description of task"),
+      prompt: z10.string().describe("The task for the agent to perform"),
+      subagent_type: z10.string().describe("The type of specialized agent to use for this task"),
+      resume: z10.string().optional().describe(
         "Optional agent ID to resume from. If provided, the agent will continue from the previous execution transcript."
       )
     }),
@@ -7159,6 +7236,112 @@ Agent ID: ${result.agentId}`,
   });
 }
 
+// src/tools/tools/skill.ts
+function renderAvailableSkills(skills) {
+  return skills.filter((skill) => skill.modelInvocable !== false).map(
+    (skill) => `<skill>
+<name>${skill.name}</name>
+<description>${skill.description}</description>
+</skill>`
+  ).join("\n");
+}
+function generateDescription(skillManager) {
+  const skills = skillManager.getSkills({ modelInvocable: true });
+  return `Execute a skill within the main conversation
+<skills_instructions>
+When users ask you to perform tasks, check if any of the available skills below match the task. If a skill matches, use this tool to invoke it. Skills provide specialized knowledge and procedures for specific tasks.
+</skills_instructions>
+<available_skills>
+${renderAvailableSkills(skills)}
+</available_skills>`;
+}
+function createSkillTool(opts) {
+  const { skillManager, context, tools, sessionId, signal } = opts;
+  return createTool({
+    name: "skill",
+    description: generateDescription(skillManager),
+    parameters: z11.object({
+      skill: z11.string().describe("The skill name to execute"),
+      args: z11.string().optional().describe("Optional arguments to pass to the skill")
+    }),
+    getDescription: ({ params }) => {
+      return params.args ? `${params.skill} ${params.args}` : params.skill;
+    },
+    async execute({ skill, args }) {
+      const trimmed = skill.trim();
+      const skillName = trimmed.startsWith("/") ? trimmed.substring(1) : trimmed;
+      const foundSkill = skillManager.getSkill(skillName);
+      if (!foundSkill) {
+        return {
+          isError: true,
+          llmContent: `Skill "${skillName}" not found`
+        };
+      }
+      if (foundSkill.modelInvocable === false) {
+        return {
+          isError: true,
+          llmContent: `Skill "${skillName}" cannot be invoked by the model`
+        };
+      }
+      const skillArgs = args || "";
+      const body = await skillManager.readSkillBody(foundSkill, skillArgs);
+      const baseDir = path9.dirname(foundSkill.path);
+      if (foundSkill.context === "fork") {
+        if (!context.agentManager) {
+          return {
+            isError: true,
+            llmContent: `Skill "${skillName}" requires fork execution but agent manager is not available`
+          };
+        }
+        const allowedTools = foundSkill.allowedTools;
+        const filteredTools = allowedTools ? tools.filter(
+          (t) => t.name !== "skill" && allowedTools.some(
+            (allowed) => allowed.toLowerCase() === t.name.toLowerCase()
+          )
+        ) : tools.filter((t) => t.name !== "skill");
+        const taskTool = createTaskTool({
+          context,
+          tools: filteredTools,
+          sessionId,
+          signal
+        });
+        const agentType = foundSkill.agent || "general-purpose";
+        const prompt = `Base directory for this skill: ${baseDir}
+
+${body}`;
+        const toolCallId = `skill-${skillName}-${randomUUID()}`;
+        return taskTool.execute(
+          {
+            description: `Execute skill: ${skillName}`,
+            prompt,
+            subagent_type: agentType
+          },
+          toolCallId
+        );
+      }
+      const messages = [
+        {
+          type: "text",
+          text: `<command-message>${skillName} is running\u2026</command-message>
+<command-name>${skillName}</command-name>`
+        },
+        {
+          type: "text",
+          text: `Base directory for this skill: ${baseDir}
+
+${body}`,
+          isMeta: true
+        }
+      ];
+      return {
+        llmContent: safeStringify(messages),
+        returnDisplay: `Loaded skill: ${foundSkill.name}`
+      };
+    },
+    approval: { category: "read" }
+  });
+}
+
 // src/tools/tools/todo.ts
 import fs10 from "fs";
 import { readFile, writeFile } from "fs/promises";
@@ -7485,8 +7668,7 @@ async function resolveTools(opts) {
     createLSTool({ cwd }),
     createGlobTool({ cwd }),
     createGrepTool({ cwd }),
-    createFetchTool({ model, fetch: opts.context.fetch }),
-    ...hasSkills ? [createSkillTool({ skillManager: opts.context.skillManager })] : []
+    createFetchTool({ model, fetch: opts.context.fetch })
   ];
   const askUserQuestionTools = opts.askUserQuestion ? [createAskUserQuestionTool()] : [];
   const writeTools = opts.write ? [
@@ -7514,7 +7696,7 @@ async function resolveTools(opts) {
     })
   ] : [];
   const mcpTools = await getMcpTools(opts.context);
-  const allTools = [
+  let allTools = [
     ...readonlyTools,
     ...askUserQuestionTools,
     ...writeTools,
@@ -7522,6 +7704,16 @@ async function resolveTools(opts) {
     ...backgroundTools,
     ...mcpTools
   ];
+  if (hasSkills) {
+    const skillTool = createSkillTool({
+      skillManager: opts.context.skillManager,
+      context: opts.context,
+      tools: allTools,
+      sessionId: opts.sessionId,
+      signal: opts.signal
+    });
+    allTools = [...allTools, skillTool];
+  }
   let availableTools = allTools;
   try {
     availableTools = await opts.context.apply({
@@ -7757,6 +7949,18 @@ function normalizeMessagesForCompact(messages) {
         content: "[Tool operations completed]"
       };
     }
+    if (message.role === "user") {
+      if (Array.isArray(message.content)) {
+        const filteredContent = message.content.filter(
+          (part) => part.type === "text"
+        );
+        return {
+          ...message,
+          content: filteredContent.length > 0 ? filteredContent : message.content
+        };
+      }
+      return message;
+    }
     return message;
   }).filter((message) => {
     if (typeof message.content === "string") {
@@ -8347,4 +8551,4 @@ export {
   Tools,
   createLSTool
 };
-//# sourceMappingURL=chunk-XKZSVWRX.js.map
+//# sourceMappingURL=chunk-MZNH54NB.js.map