snow-ai 0.5.24 → 0.5.26

package/bundle/cli.mjs

@@ -1429,11 +1429,11 @@ var require_react_development = __commonJS({
           var dispatcher = resolveDispatcher();
           return dispatcher.useReducer(reducer3, initialArg, init);
         }
-        function useRef13(initialValue) {
+        function useRef14(initialValue) {
           var dispatcher = resolveDispatcher();
           return dispatcher.useRef(initialValue);
         }
-        function useEffect50(create3, deps) {
+        function useEffect51(create3, deps) {
           var dispatcher = resolveDispatcher();
           return dispatcher.useEffect(create3, deps);
         }
@@ -2216,14 +2216,14 @@ var require_react_development = __commonJS({
         exports2.useContext = useContext13;
         exports2.useDebugValue = useDebugValue;
         exports2.useDeferredValue = useDeferredValue;
-        exports2.useEffect = useEffect50;
+        exports2.useEffect = useEffect51;
         exports2.useId = useId;
         exports2.useImperativeHandle = useImperativeHandle2;
         exports2.useInsertionEffect = useInsertionEffect;
         exports2.useLayoutEffect = useLayoutEffect2;
         exports2.useMemo = useMemo30;
         exports2.useReducer = useReducer8;
-        exports2.useRef = useRef13;
+        exports2.useRef = useRef14;
         exports2.useState = useState57;
         exports2.useSyncExternalStore = useSyncExternalStore;
         exports2.useTransition = useTransition;
@@ -45437,10 +45437,10 @@ var require_symlink = __commonJS({
       pathExists2(dstpath, (err, destinationExists) => {
         if (err) return callback(err);
         if (destinationExists) return callback(null);
-        symlinkPaths(srcpath, dstpath, (err2, relative8) => {
+        symlinkPaths(srcpath, dstpath, (err2, relative9) => {
           if (err2) return callback(err2);
-          srcpath = relative8.toDst;
-          symlinkType(relative8.toCwd, type, (err3, type2) => {
+          srcpath = relative9.toDst;
+          symlinkType(relative9.toCwd, type, (err3, type2) => {
             if (err3) return callback(err3);
             const dir = path53.dirname(dstpath);
             pathExists2(dir, (err4, dirExists) => {
@@ -45458,9 +45458,9 @@ var require_symlink = __commonJS({
     function createSymlinkSync(srcpath, dstpath, type) {
       const destinationExists = fs42.existsSync(dstpath);
       if (destinationExists) return void 0;
-      const relative8 = symlinkPathsSync(srcpath, dstpath);
-      srcpath = relative8.toDst;
-      type = symlinkTypeSync(relative8.toCwd, type);
+      const relative9 = symlinkPathsSync(srcpath, dstpath);
+      srcpath = relative9.toDst;
+      type = symlinkTypeSync(relative9.toCwd, type);
       const dir = path53.dirname(dstpath);
       const exists = fs42.existsSync(dir);
       if (exists) return fs42.symlinkSync(srcpath, dstpath, type);
@@ -45971,8 +45971,8 @@ var init_logger = __esm({
         const timestamp = Date.now();
         const ext = path5.extname(filePath);
         const basename6 = path5.basename(filePath, ext);
-        const dirname10 = path5.dirname(filePath);
-        const rotatedPath = path5.join(dirname10, `${basename6}-${timestamp}${ext}`);
+        const dirname11 = path5.dirname(filePath);
+        const rotatedPath = path5.join(dirname11, `${basename6}-${timestamp}${ext}`);
         fs5.renameSync(filePath, rotatedPath);
       }
       writeLog(level, message, meta) {
@@ -47918,11 +47918,11 @@ var init_systemPrompt = __esm({
 
 ### Rigorous Coding Habits
 - **Location Code**: Must First use a search tool to locate the line number of the code, then use \`filesystem-read\` to read the code content
-- **Boundary verification**: MUST use \`filesystem-read\` to identify complete code boundaries before ANY edit. Never guess line numbers or code structure
+- **Boundary verification - COMPLETE CODE BLOCKS ONLY**: MUST use \`filesystem-read\` to identify COMPLETE code boundaries before ANY edit. Never guess line numbers or code structure. MANDATORY: verify ALL closing pairs are included - every \`{\` must have \`}\`, every \`(\` must have \`)\`, every \`[\` must have \`]\`, every \`<tag>\` must have \`</tag>\`. Count and match ALL opening/closing symbols before editing. ABSOLUTE PROHIBITIONS: NEVER edit partial functions (missing closing brace), NEVER edit incomplete HTML/XML/JSX tags (missing closing tag), NEVER edit partial code blocks (unmatched brackets/braces/parentheses).
 - **Impact analysis**: Consider modification impact and conflicts with existing business logic
 - **Optimal solution**: Avoid hardcoding/shortcuts unless explicitly requested
 - **Avoid duplication**: Search for existing reusable functions before creating new ones
-- **Compilable code**: No syntax errors - always verify complete syntactic units
+- **Compilable code**: No syntax errors - always verify complete syntactic units with ALL opening/closing pairs matched
 
 ### Smart Action Mode
 **Principle: Understand enough to code correctly, but don't over-investigate**
@@ -47987,9 +47987,11 @@ AI: todo-add(content=["Read utils module structure", "Identify refactor targets"
 **CRITICAL: BOUNDARY-FIRST EDITING**
 
 **MANDATORY WORKFLOW:**
-1. **READ & VERIFY** - Use \`filesystem-read\` to identify COMPLETE units (functions: opening to closing brace, markup: full tags, check indentation)
-2. **COPY COMPLETE CODE** - Remove line numbers, preserve all content
-3. **EDIT** - \`filesystem-edit_search\` (fuzzy match, safer) or \`filesystem-edit\` (line-based, for add/delete)
+1. **READ & VERIFY** - Use \`filesystem-read\` to identify COMPLETE units (functions: entire declaration to final closing brace \`}\`, HTML/XML/JSX markup: full opening \`<tag>\` to closing \`</tag>\` pairs, code blocks: ALL matching brackets/braces/parentheses with proper indentation)
+2. **COUNT & MATCH** - Before editing, MANDATORY verification: count ALL opening and closing symbols - every \`{\` must have \`}\`, every \`(\` must have \`)\`, every \`[\` must have \`]\`, every \`<tag>\` must have \`</tag>\`. Verify indentation levels are consistent.
+3. **COPY COMPLETE CODE** - Remove line numbers, preserve ALL content including ALL closing symbols
+4. **ABSOLUTE PROHIBITIONS** - NEVER edit partial functions (missing closing brace \`}\`), NEVER edit incomplete markup (missing \`</tag>\`), NEVER edit partial code blocks (unmatched \`{\`, \`}\`, \`(\`, \`)\`, \`[\`, \`]\`), NEVER copy line numbers from filesystem-read output
+5. **EDIT** - \`filesystem-edit_search\` (fuzzy match, safer) or \`filesystem-edit\` (line-based, for add/delete) - use ONLY after verification passes
 
 **BATCH OPERATIONS:** Modify 2+ files? Use batch: \`filesystem-read(filePath=["a.ts","b.ts"])\` or \`filesystem-edit_search(filePath=[{path:"a.ts",...},{path:"b.ts",...}])\`
 
@@ -60384,7 +60386,7 @@ var require_snapshot_recorder = __commonJS({
   "node_modules/undici/lib/mock/snapshot-recorder.js"(exports2, module2) {
     "use strict";
     var { writeFile: writeFile4, readFile: readFile3, mkdir: mkdir5 } = __require("node:fs/promises");
-    var { dirname: dirname10, resolve: resolve12 } = __require("node:path");
+    var { dirname: dirname11, resolve: resolve12 } = __require("node:path");
     var { setTimeout: setTimeout2, clearTimeout: clearTimeout2 } = __require("node:timers");
     var { InvalidArgumentError, UndiciError } = require_errors();
     var { hashId, isUrlExcludedFactory, normalizeHeaders, createHeaderFilters } = require_snapshot_utils();
@@ -60608,7 +60610,7 @@ var require_snapshot_recorder = __commonJS({
           throw new InvalidArgumentError("Snapshot path is required");
         }
         const resolvedPath = resolve12(path53);
-        await mkdir5(dirname10(resolvedPath), { recursive: true });
+        await mkdir5(dirname11(resolvedPath), { recursive: true });
         const data = Array.from(this.#snapshots.entries()).map(([hash, snapshot]) => ({
           hash,
           snapshot
@@ -76195,46 +76197,313 @@ var init_role = __esm({
 var skills_exports = {};
 __export(skills_exports, {
   checkSkillExists: () => checkSkillExists,
+  createSkillFromGenerated: () => createSkillFromGenerated,
   createSkillTemplate: () => createSkillTemplate,
   default: () => skills_default,
   generateExamplesTemplate: () => generateExamplesTemplate,
   generateReferenceTemplate: () => generateReferenceTemplate,
+  generateSkillDraftWithAI: () => generateSkillDraftWithAI,
   generateSkillTemplate: () => generateSkillTemplate,
   getSkillDirectory: () => getSkillDirectory,
+  validateSkillId: () => validateSkillId,
   validateSkillName: () => validateSkillName
 });
 import { homedir as homedir8 } from "os";
 import { join as join10 } from "path";
 import { mkdir as mkdir2, writeFile as writeFile2 } from "fs/promises";
 import { existsSync as existsSync10 } from "fs";
-function validateSkillName(name) {
+function validateSkillId(name) {
   if (!name || name.trim().length === 0) {
     return { valid: false, error: "Skill name cannot be empty" };
   }
   const trimmedName = name.trim();
-  if (trimmedName.length > 64) {
-    return { valid: false, error: "Skill name must be 64 characters or less" };
+  if (trimmedName.length > 256) {
+    return { valid: false, error: "Skill name must be 256 characters or less" };
+  }
+  if (trimmedName.includes("\\")) {
+    return {
+      valid: false,
+      error: 'Skill name must use "/" as namespace separator (backslashes are not allowed)'
+    };
   }
-  const validNamePattern = /^[a-z0-9-]+$/;
-  if (!validNamePattern.test(trimmedName)) {
+  if (trimmedName.includes(":")) {
+    return { valid: false, error: 'Skill name must not contain ":"' };
+  }
+  if (trimmedName.startsWith("/") || trimmedName.endsWith("/")) {
+    return { valid: false, error: 'Skill name must not start or end with "/"' };
+  }
+  const segments = trimmedName.split("/");
+  if (segments.some((segment) => segment.length === 0)) {
     return {
       valid: false,
-      error: "Skill name must contain only lowercase letters, numbers, and hyphens"
+      error: "Skill name must not contain empty namespace segments"
     };
   }
+  const validSegmentPattern = /^[a-z0-9-]+$/;
+  for (const segment of segments) {
+    if (segment === "." || segment === "..") {
+      return {
+        valid: false,
+        error: 'Skill name must not contain "." or ".." segments'
+      };
+    }
+    if (segment.length > 64) {
+      return {
+        valid: false,
+        error: "Each skill name segment must be 64 characters or less"
+      };
+    }
+    if (!validSegmentPattern.test(segment)) {
+      return {
+        valid: false,
+        error: "Skill name segments must contain only lowercase letters, numbers, and hyphens"
+      };
+    }
+  }
   return { valid: true };
 }
+function validateSkillName(name) {
+  return validateSkillId(name);
+}
+function stripLeadingFrontMatter(markdown) {
+  const content = markdown.trim();
+  const descriptionPattern = /^---\s*[\s\S]*?---\s*/;
+  if (descriptionPattern.test(content)) {
+    return content.replace(descriptionPattern, "").trim();
+  }
+  return content;
+}
+function sanitizeSkillName(input2) {
+  const raw = input2.trim().toLowerCase();
+  const replaced = raw.replace(/[\s_]+/g, "-");
+  const filtered = replaced.replace(/[^a-z0-9-]/g, "");
+  const collapsed = filtered.replace(/-+/g, "-").replace(/^-|-$/g, "");
+  return collapsed.slice(0, 64);
+}
+function makeUniqueSkillName(baseName, projectRoot) {
+  const validation = validateSkillName(baseName);
+  let safeBase = validation.valid ? baseName : sanitizeSkillName(baseName);
+  if (!safeBase) {
+    safeBase = "generated-skill";
+  }
+  let candidate = safeBase;
+  let suffix = 2;
+  while (checkSkillExists(candidate, "global") || checkSkillExists(candidate, "project", projectRoot)) {
+    const suffixText = `-${suffix++}`;
+    const maxBaseLen = 64 - suffixText.length;
+    const truncatedBase = safeBase.slice(0, Math.max(1, maxBaseLen));
+    candidate = `${truncatedBase}${suffixText}`;
+  }
+  return candidate;
+}
+function extractTaggedJson(text3) {
+  const match2 = text3.match(/<json>\s*([\s\S]*?)\s*<\/json>/i);
+  if (match2 && match2[1]) {
+    return match2[1].trim();
+  }
+  return null;
+}
+function extractTaggedFiles(text3) {
+  var _a21;
+  const map3 = /* @__PURE__ */ new Map();
+  const re = /<file\s+path="([^"]+)">\s*([\s\S]*?)\s*<\/file>/gi;
+  let match2;
+  while (match2 = re.exec(text3)) {
+    const path53 = (_a21 = match2[1]) == null ? void 0 : _a21.trim();
+    const content = match2[2] ?? "";
+    if (path53) {
+      map3.set(path53, content);
+    }
+  }
+  return map3;
+}
+function buildSkillGenerationSystemPrompt() {
+  return `You create Snow CLI Skills (Claude Code compatible).
+
+Rules (MUST FOLLOW):
+1) Output MUST ONLY contain: <json>...</json> and <file path="...">...</file> blocks. No other text.
+2) The <json> block MUST be valid JSON with keys: name, description.
+3) name MUST be a directory-safe slug: lowercase letters, numbers, hyphens only (^[a-z0-9-]+$), max 64 chars.
+4) description and ALL file contents MUST be written in the SAME LANGUAGE as the user's requirement.
+5) Generate exactly 3 file blocks with these paths (case-sensitive):
+   - SKILL.md
+   - reference.md
+   - examples.md
+6) The SKILL.md content MUST NOT include YAML front matter. Start with a single H1 title and include these sections:
+   - ## Instructions
+     - ### Context
+     - ### Steps (numbered)
+   - ## Examples (at least 2)
+   - ## Best Practices
+   - ## Common Pitfalls
+   - ## Related Skills
+   - ## References
+7) Do NOT mention or include allowed-tools (Snow CLI will manage it).
+
+Quality bar:
+- Be concrete, step-by-step, with realistic examples.
+- Keep it helpful and production-oriented.`;
+}
+function buildSkillGenerationUserPrompt(requirement) {
+  return `Generate a Snow CLI Skill from the requirement below.
+
+CRITICAL OUTPUT FORMAT (no extra text):
+<json>
+{"name":"example-skill","description":"..."}
+</json>
+<file path="SKILL.md">
+# ...
+</file>
+<file path="reference.md">
+# ...
+</file>
+<file path="examples.md">
+# ...
+</file>
+
+Rules:
+- Output ONLY the <json> and <file> blocks.
+- <json> must be valid JSON with keys: name, description (no other keys).
+- name must be a slug: lowercase letters, numbers, hyphens only (^[a-z0-9-]+$), max 64 chars.
+- description and ALL file contents MUST be written in the SAME LANGUAGE as the requirement.
+- The SKILL.md content MUST NOT include YAML front matter.
+- Do NOT mention allowed-tools.
+
+Requirement:
+${requirement}`;
+}
+async function callModelForText(messages, abortSignal) {
+  var _a21, _b14;
+  const config3 = getOpenAiConfig();
+  const model = config3.advancedModel || config3.basicModel;
+  if (!model) {
+    throw new Error("\u672A\u914D\u7F6E\u6A21\u578B\uFF0C\u8BF7\u5148\u5728\u8BBE\u7F6E\u4E2D\u9009\u62E9\u6A21\u578B");
+  }
+  let stream;
+  switch (config3.requestMethod) {
+    case "anthropic":
+      stream = createStreamingAnthropicCompletion({
+        model,
+        messages,
+        max_tokens: 3e3,
+        includeBuiltinSystemPrompt: false,
+        disableThinking: true
+      }, abortSignal);
+      break;
+    case "gemini":
+      stream = createStreamingGeminiCompletion({
+        model,
+        messages,
+        includeBuiltinSystemPrompt: false
+      }, abortSignal);
+      break;
+    case "responses":
+      stream = createStreamingResponse({
+        model,
+        messages,
+        includeBuiltinSystemPrompt: false,
+        tool_choice: "none"
+      }, abortSignal);
+      break;
+    case "chat":
+    default:
+      stream = createStreamingChatCompletion({
+        model,
+        messages,
+        includeBuiltinSystemPrompt: false,
+        // NOTE: chat.ts uses `options.temperature || 0.7`, so 0 would be ignored.
+        temperature: 1e-4
+      }, abortSignal);
+      break;
+  }
+  let text3 = "";
+  for await (const chunk2 of stream) {
+    if (abortSignal == null ? void 0 : abortSignal.aborted) {
+      throw new Error("Request aborted");
+    }
+    if (chunk2 && typeof chunk2 === "object") {
+      if (chunk2.type === "content" && typeof chunk2.content === "string") {
+        text3 += chunk2.content;
+        continue;
+      }
+      const maybeChoices = chunk2.choices;
+      const deltaContent = (_b14 = (_a21 = maybeChoices == null ? void 0 : maybeChoices[0]) == null ? void 0 : _a21.delta) == null ? void 0 : _b14.content;
+      if (typeof deltaContent === "string") {
+        text3 += deltaContent;
+      }
+    }
+  }
+  if (!text3.trim()) {
+    throw new Error("\u6A21\u578B\u672A\u8FD4\u56DE\u53EF\u7528\u5185\u5BB9");
+  }
+  return text3;
+}
+async function generateSkillDraftWithAI(requirement, projectRoot, abortSignal) {
+  const trimmed = requirement.trim();
+  if (!trimmed) {
+    throw new Error("\u6280\u80FD\u9700\u6C42\u4E0D\u80FD\u4E3A\u7A7A");
+  }
+  const systemPrompt = buildSkillGenerationSystemPrompt();
+  const userPrompt = buildSkillGenerationUserPrompt(trimmed);
+  const messages = [
+    { role: "system", content: systemPrompt },
+    { role: "user", content: userPrompt }
+  ];
+  const raw = await callModelForText(messages, abortSignal);
+  const jsonText = extractTaggedJson(raw);
+  const files = extractTaggedFiles(raw);
+  if (!jsonText) {
+    throw new Error("AI \u8F93\u51FA\u7F3A\u5C11 <json> \u5757");
+  }
+  const parseResult = parseJsonWithFix(jsonText, {
+    toolName: "skills ai json",
+    logWarning: true,
+    logError: true
+  });
+  if (!parseResult.success || !parseResult.data) {
+    throw new Error("AI \u8F93\u51FA JSON \u89E3\u6790\u5931\u8D25");
+  }
+  const nameRaw = typeof parseResult.data.name === "string" ? parseResult.data.name.trim() : "";
+  const descriptionRaw = typeof parseResult.data.description === "string" ? parseResult.data.description.trim() : "";
+  const skillBody = files.get("SKILL.md");
+  const referenceMd = files.get("reference.md");
+  const examplesMd = files.get("examples.md");
+  if (!skillBody || !referenceMd || !examplesMd) {
+    throw new Error("AI \u8F93\u51FA\u7F3A\u5C11\u6587\u4EF6\u5185\u5BB9\uFF08\u9700\u8981 SKILL.md/reference.md/examples.md\uFF09");
+  }
+  const uniqueName = makeUniqueSkillName(nameRaw, projectRoot);
+  return {
+    skillName: uniqueName,
+    description: descriptionRaw || uniqueName,
+    generated: {
+      skillMarkdownBody: stripLeadingFrontMatter(skillBody),
+      referenceMarkdown: stripLeadingFrontMatter(referenceMd),
+      examplesMarkdown: stripLeadingFrontMatter(examplesMd)
+    }
+  };
+}
+function generateSkillMarkdownWithFrontMatter(metadata, bodyMarkdown) {
+  const cleanedBody = stripLeadingFrontMatter(bodyMarkdown).trim();
+  return `---
+name: ${metadata.name}
+description: ${metadata.description}
+allowed-tools:
+---
+
+${cleanedBody}
+`;
+}
 function checkSkillExists(skillName, location, projectRoot) {
   const skillDir = getSkillDirectory(skillName, location, projectRoot);
   return existsSync10(skillDir);
 }
 function getSkillDirectory(skillName, location, projectRoot) {
+  const segments = skillName.split("/").filter(Boolean);
   if (location === "global") {
-    return join10(homedir8(), ".snow", "skills", skillName);
-  } else {
-    const root2 = projectRoot || process.cwd();
-    return join10(root2, ".snow", "skills", skillName);
+    return join10(homedir8(), ".snow", "skills", ...segments);
   }
+  const root2 = projectRoot || process.cwd();
+  return join10(root2, ".snow", "skills", ...segments);
 }
 function generateSkillTemplate(metadata) {
   return `---
@@ -76360,6 +76629,69 @@ What this advanced example demonstrates.
 **Result:** What was achieved
 `;
 }
+async function createSkillFromGenerated(skillName, description, generated, location, projectRoot) {
+  try {
+    const skillDir = getSkillDirectory(skillName, location, projectRoot);
+    if (existsSync10(skillDir)) {
+      return {
+        success: false,
+        path: skillDir,
+        error: `Skill "${skillName}" already exists at ${skillDir}`
+      };
+    }
+    await mkdir2(skillDir, { recursive: true });
+    await mkdir2(join10(skillDir, "scripts"), { recursive: true });
+    await mkdir2(join10(skillDir, "templates"), { recursive: true });
+    const leafName = skillName.split("/").filter(Boolean).pop() || skillName;
+    const skillContent = generateSkillMarkdownWithFrontMatter({ name: leafName, description }, generated.skillMarkdownBody);
+    await writeFile2(join10(skillDir, "SKILL.md"), skillContent, "utf-8");
+    await writeFile2(join10(skillDir, "reference.md"), generated.referenceMarkdown.trim() + "\n", "utf-8");
+    await writeFile2(join10(skillDir, "examples.md"), generated.examplesMarkdown.trim() + "\n", "utf-8");
+    const templateContent = `This is a template file for ${skillName}.
+
+You can use this as a starting point for generating code, configurations, or documentation.
+
+Variables can be referenced like: {{variable_name}}
+`;
+    await writeFile2(join10(skillDir, "templates", "template.txt"), templateContent, "utf-8");
+    const scriptContent = `#!/usr/bin/env python3
+"""
+Helper script for ${skillName}
+
+Usage:
+    python scripts/helper.py <input_file>
+"""
+
+import sys
+
+def main():
+    if len(sys.argv) < 2:
+        print("Usage: python helper.py <input_file>")
+        sys.exit(1)
+    
+    input_file = sys.argv[1]
+    print(f"Processing {input_file}...")
+    
+    # Add your processing logic here
+    
+    print("Done!")
+
+if __name__ == "__main__":
+    main()
+`;
+    await writeFile2(join10(skillDir, "scripts", "helper.py"), scriptContent, "utf-8");
+    return {
+      success: true,
+      path: skillDir
+    };
+  } catch (error) {
+    return {
+      success: false,
+      path: "",
+      error: error instanceof Error ? error.message : "Unknown error"
+    };
+  }
+}
 async function createSkillTemplate(skillName, description, location, projectRoot) {
   try {
     const skillDir = getSkillDirectory(skillName, location, projectRoot);
@@ -76373,7 +76705,8 @@ async function createSkillTemplate(skillName, description, location, projectRoot
     await mkdir2(skillDir, { recursive: true });
     await mkdir2(join10(skillDir, "scripts"), { recursive: true });
     await mkdir2(join10(skillDir, "templates"), { recursive: true });
-    const skillContent = generateSkillTemplate({ name: skillName, description });
+    const leafName = skillName.split("/").filter(Boolean).pop() || skillName;
+    const skillContent = generateSkillTemplate({ name: leafName, description });
     await writeFile2(join10(skillDir, "SKILL.md"), skillContent, "utf-8");
     const referenceContent = generateReferenceTemplate();
     await writeFile2(join10(skillDir, "reference.md"), referenceContent, "utf-8");
@@ -76429,6 +76762,12 @@ var init_skills = __esm({
   "dist/utils/commands/skills.js"() {
     "use strict";
     init_commandExecutor();
+    init_apiConfig();
+    init_chat();
+    init_responses();
+    init_gemini();
+    init_anthropic();
+    init_retryUtils();
     registerCommand("skills", {
       execute: async () => {
         return {
@@ -80592,7 +80931,12 @@ var init_en = __esm({
         confirmSave: "Save this custom command? (y/n)",
         confirmYes: "Yes",
         confirmNo: "Cancel",
-        escCancel: "Press ESC to cancel"
+        escCancel: "Press ESC to cancel",
+        resultTypeExecute: "Execute in terminal",
+        resultTypePrompt: "Send to AI",
+        resultLocationGlobal: "Global (~/.snow/commands/)",
+        resultLocationProject: "Project (.snow/commands/)",
+        saveSuccessMessage: "Custom command '{name}' saved successfully!\nType: {type}\nLocation: {location}\nYou can now use /{name}"
       },
       chatScreen: {
         // Header
@@ -80798,9 +81142,24 @@ var init_en = __esm({
       },
       skillsCreation: {
         title: "Create New Skill",
+        modeLabel: "Creation Mode:",
+        modeAi: "AI Generate (describe requirement)",
+        modeManual: "Manual (create templates)",
+        requirementLabel: "Requirement:",
+        requirementHint: "Describe what you want this Skill to do (content will follow this language)",
+        requirementPlaceholder: "e.g., Generate a Skill for releasing npm packages...",
+        generatingLabel: "AI Generating...",
+        generatingMessage: "Generating skill files, please wait",
+        filesLabel: "Files to be created:",
+        editName: "Edit Name",
+        editNameLabel: "Current Skill Name:",
+        editNameHint: "Enter a new skill name (lowercase letters/numbers/hyphens, max 64 chars)",
+        editNamePlaceholder: "new-skill-name",
+        regenerate: "Regenerate",
+        cancel: "Cancel",
         nameLabel: "Skill Name:",
-        nameHint: "Use lowercase letters, numbers, and hyphens only (max 64 chars)",
-        namePlaceholder: "my-skill-name",
+        nameHint: 'Use lowercase letters, numbers, and hyphens. Use "/" to namespace (max 64 chars per segment)',
+        namePlaceholder: "team/my-skill-name",
         descriptionLabel: "Description:",
         descriptionHint: "Brief description of what this Skill does and when to use it",
         descriptionPlaceholder: "A brief description...",
@@ -80817,7 +81176,15 @@ var init_en = __esm({
         errorInvalidName: "Invalid skill name",
         errorExistsBoth: 'Skill "{name}" already exists in both global and project locations',
         errorExistsGlobal: 'Skill "{name}" already exists in global location (~/.snow/skills/)',
-        errorExistsProject: 'Skill "{name}" already exists in project location (.snow/skills/)'
+        errorExistsProject: 'Skill "{name}" already exists in project location (.snow/skills/)',
+        errorExistsAny: 'Skill "{name}" already exists, please choose another name',
+        errorGeneration: "AI generation failed",
+        errorNoGeneratedContent: "No generated content, please retry",
+        resultModeAi: "AI Generated",
+        resultModeManual: "Manual Template",
+        createSuccessMessage: 'Skill "{name}" created successfully!\nMode: {mode}\nLocation: {location}\nPath: {path}\n\nThe following files have been created:\n- SKILL.md (main skill documentation)\n- reference.md (detailed reference)\n- examples.md (usage examples)\n- templates/template.txt (template file)\n- scripts/helper.py (helper script)\n\nYou can now edit these files to customize your skill.',
+        createErrorMessage: "Failed to create skill: {error}",
+        errorUnknown: "Unknown error"
       },
       askUser: {
         header: "[User Input Required]",
@@ -81563,7 +81930,12 @@ var init_zh = __esm({
         confirmSave: "\u4FDD\u5B58\u6B64\u81EA\u5B9A\u4E49\u547D\u4EE4? (y/n)",
         confirmYes: "Yes",
         confirmNo: "Cancel",
-        escCancel: "\u6309 ESC \u53D6\u6D88"
+        escCancel: "\u6309 ESC \u53D6\u6D88",
+        resultTypeExecute: "\u5728\u7EC8\u7AEF\u6267\u884C",
+        resultTypePrompt: "\u53D1\u9001\u7ED9 AI",
+        resultLocationGlobal: "\u5168\u5C40 (~/.snow/commands/)",
+        resultLocationProject: "\u9879\u76EE (.snow/commands/)",
+        saveSuccessMessage: "\u81EA\u5B9A\u4E49\u547D\u4EE4 '{name}' \u4FDD\u5B58\u6210\u529F\uFF01\n\u7C7B\u578B: {type}\n\u4F4D\u7F6E: {location}\n\u4F60\u73B0\u5728\u53EF\u4EE5\u4F7F\u7528 /{name}"
       },
       chatScreen: {
         // Header
@@ -81769,9 +82141,24 @@ var init_zh = __esm({
       },
       skillsCreation: {
         title: "\u521B\u5EFA\u65B0\u6280\u80FD",
+        modeLabel: "\u9009\u62E9\u521B\u5EFA\u65B9\u5F0F:",
+        modeAi: "AI \u751F\u6210\uFF08\u8F93\u5165\u9700\u6C42\u5373\u53EF\uFF09",
+        modeManual: "\u624B\u52A8\u521B\u5EFA\uFF08\u751F\u6210\u6A21\u677F\uFF09",
+        requirementLabel: "\u6280\u80FD\u9700\u6C42:",
+        requirementHint: "\u7B80\u8981\u63CF\u8FF0\u4F60\u5E0C\u671B\u8BE5\u6280\u80FD\u5B8C\u6210\u4EC0\u4E48\uFF08\u751F\u6210\u5185\u5BB9\u5C06\u8DDF\u968F\u6B64\u8BED\u8A00\uFF09",
+        requirementPlaceholder: "\u4F8B\u5982\uFF1A\u751F\u6210\u4E00\u4E2A\u7528\u4E8E\u53D1\u5E03 npm \u5305\u7684\u6280\u80FD\u2026",
+        generatingLabel: "AI \u751F\u6210\u4E2D...",
+        generatingMessage: "\u6B63\u5728\u751F\u6210\u6280\u80FD\u6587\u4EF6\uFF0C\u8BF7\u7A0D\u7B49",
+        filesLabel: "\u5C06\u521B\u5EFA\u6587\u4EF6:",
+        editName: "\u7F16\u8F91\u540D\u79F0",
+        editNameLabel: "\u5F53\u524D\u6280\u80FD\u540D\u79F0:",
+        editNameHint: "\u8F93\u5165\u65B0\u7684\u6280\u80FD\u540D\u79F0\uFF08\u5C0F\u5199\u5B57\u6BCD/\u6570\u5B57/\u8FDE\u5B57\u7B26\uFF0C\u6700\u591A 64 \u4E2A\u5B57\u7B26\uFF09",
+        editNamePlaceholder: "new-skill-name",
+        regenerate: "\u91CD\u65B0\u751F\u6210",
+        cancel: "\u53D6\u6D88",
         nameLabel: "\u6280\u80FD\u540D\u79F0:",
-        nameHint: "\u4EC5\u4F7F\u7528\u5C0F\u5199\u5B57\u6BCD\u3001\u6570\u5B57\u548C\u8FDE\u5B57\u7B26\uFF08\u6700\u591A 64 \u4E2A\u5B57\u7B26\uFF09",
-        namePlaceholder: "my-skill-name",
+        nameHint: '\u4EC5\u4F7F\u7528\u5C0F\u5199\u5B57\u6BCD\u3001\u6570\u5B57\u548C\u8FDE\u5B57\u7B26\uFF0C\u53EF\u7528 "/" \u4F5C\u4E3A\u547D\u540D\u7A7A\u95F4\u5206\u9694\uFF08\u6BCF\u6BB5\u6700\u591A 64 \u4E2A\u5B57\u7B26\uFF09',
+        namePlaceholder: "team/my-skill-name",
         descriptionLabel: "\u63CF\u8FF0:",
         descriptionHint: "\u7B80\u8981\u63CF\u8FF0\u6B64\u6280\u80FD\u7684\u7528\u9014\u548C\u4F7F\u7528\u573A\u666F",
         descriptionPlaceholder: "\u7B80\u8981\u63CF\u8FF0...",
@@ -81788,7 +82175,15 @@ var init_zh = __esm({
         errorInvalidName: "\u65E0\u6548\u7684\u6280\u80FD\u540D\u79F0",
         errorExistsBoth: '\u6280\u80FD "{name}" \u5728\u5168\u5C40\u548C\u9879\u76EE\u4F4D\u7F6E\u90FD\u5DF2\u5B58\u5728',
         errorExistsGlobal: '\u6280\u80FD "{name}" \u5DF2\u5B58\u5728\u4E8E\u5168\u5C40\u4F4D\u7F6E (~/.snow/skills/)',
-        errorExistsProject: '\u6280\u80FD "{name}" \u5DF2\u5B58\u5728\u4E8E\u9879\u76EE\u4F4D\u7F6E (.snow/skills/)'
+        errorExistsProject: '\u6280\u80FD "{name}" \u5DF2\u5B58\u5728\u4E8E\u9879\u76EE\u4F4D\u7F6E (.snow/skills/)',
+        errorExistsAny: '\u6280\u80FD "{name}" \u5DF2\u5B58\u5728\uFF0C\u8BF7\u6362\u4E00\u4E2A\u540D\u79F0',
+        errorGeneration: "AI \u751F\u6210\u5931\u8D25",
+        errorNoGeneratedContent: "\u7F3A\u5C11\u751F\u6210\u5185\u5BB9\uFF0C\u8BF7\u91CD\u8BD5",
+        resultModeAi: "AI \u751F\u6210",
+        resultModeManual: "\u624B\u52A8\u6A21\u677F",
+        createSuccessMessage: '\u6280\u80FD "{name}" \u521B\u5EFA\u6210\u529F\uFF01\n\u6A21\u5F0F: {mode}\n\u4F4D\u7F6E: {location}\n\u8DEF\u5F84: {path}\n\n\u5DF2\u521B\u5EFA\u4EE5\u4E0B\u6587\u4EF6\uFF1A\n- SKILL.md\uFF08\u4E3B\u6280\u80FD\u6587\u6863\uFF09\n- reference.md\uFF08\u8BE6\u7EC6\u53C2\u8003\uFF09\n- examples.md\uFF08\u4F7F\u7528\u793A\u4F8B\uFF09\n- templates/template.txt\uFF08\u6A21\u677F\u6587\u4EF6\uFF09\n- scripts/helper.py\uFF08\u8F85\u52A9\u811A\u672C\uFF09\n\n\u4F60\u73B0\u5728\u53EF\u4EE5\u7F16\u8F91\u8FD9\u4E9B\u6587\u4EF6\u6765\u81EA\u5B9A\u4E49\u6280\u80FD\u3002',
+        createErrorMessage: "\u521B\u5EFA\u6280\u80FD\u5931\u8D25\uFF1A{error}",
+        errorUnknown: "\u672A\u77E5\u9519\u8BEF"
       },
       askUser: {
         header: "[\u9700\u8981\u7528\u6237\u8F93\u5165]",
@@ -82534,7 +82929,12 @@ var init_zh_TW = __esm({
         confirmSave: "Save this custom command? (y/n)",
         confirmYes: "Yes",
         confirmNo: "Cancel",
-        escCancel: "Press ESC to cancel"
+        escCancel: "Press ESC to cancel",
+        resultTypeExecute: "\u5728\u7D42\u7AEF\u57F7\u884C",
+        resultTypePrompt: "\u50B3\u9001\u7D66 AI",
+        resultLocationGlobal: "\u5168\u57DF (~/.snow/commands/)",
+        resultLocationProject: "\u5C08\u6848 (.snow/commands/)",
+        saveSuccessMessage: "\u81EA\u8A02\u547D\u4EE4 '{name}' \u5132\u5B58\u6210\u529F\uFF01\n\u985E\u578B: {type}\n\u4F4D\u7F6E: {location}\n\u4F60\u73FE\u5728\u53EF\u4EE5\u4F7F\u7528 /{name}"
       },
       chatScreen: {
         // Header
@@ -82740,6 +83140,21 @@ var init_zh_TW = __esm({
       },
       skillsCreation: {
         title: "\u5275\u5EFA\u65B0\u6280\u80FD",
+        modeLabel: "\u9078\u64C7\u5275\u5EFA\u65B9\u5F0F:",
+        modeAi: "AI \u751F\u6210\uFF08\u8F38\u5165\u9700\u6C42\u5373\u53EF\uFF09",
+        modeManual: "\u624B\u52D5\u5275\u5EFA\uFF08\u751F\u6210\u6A21\u677F\uFF09",
+        requirementLabel: "\u6280\u80FD\u9700\u6C42:",
+        requirementHint: "\u7C21\u8981\u63CF\u8FF0\u4F60\u5E0C\u671B\u8A72\u6280\u80FD\u5B8C\u6210\u4EC0\u9EBC\uFF08\u751F\u6210\u5167\u5BB9\u5C07\u8DDF\u96A8\u6B64\u8A9E\u8A00\uFF09",
+        requirementPlaceholder: "\u4F8B\u5982\uFF1A\u751F\u6210\u4E00\u500B\u7528\u65BC\u767C\u4F48 npm \u5957\u4EF6\u7684\u6280\u80FD\u2026",
+        generatingLabel: "AI \u751F\u6210\u4E2D...",
+        generatingMessage: "\u6B63\u5728\u751F\u6210\u6280\u80FD\u6A94\u6848\uFF0C\u8ACB\u7A0D\u7B49",
+        filesLabel: "\u5C07\u5275\u5EFA\u6A94\u6848:",
+        editName: "\u7DE8\u8F2F\u540D\u7A31",
+        editNameLabel: "\u76EE\u524D\u6280\u80FD\u540D\u7A31:",
+        editNameHint: "\u8F38\u5165\u65B0\u7684\u6280\u80FD\u540D\u7A31\uFF08\u5C0F\u5BEB\u5B57\u6BCD/\u6578\u5B57/\u9023\u5B57\u7B26\uFF0C\u6700\u591A 64 \u500B\u5B57\u7B26\uFF09",
+        editNamePlaceholder: "new-skill-name",
+        regenerate: "\u91CD\u65B0\u751F\u6210",
+        cancel: "\u53D6\u6D88",
         nameLabel: "\u6280\u80FD\u540D\u7A31:",
         nameHint: "\u50C5\u4F7F\u7528\u5C0F\u5BEB\u5B57\u6BCD\u3001\u6578\u5B57\u548C\u9023\u5B57\u7B26\uFF08\u6700\u591A 64 \u500B\u5B57\u7B26\uFF09",
         namePlaceholder: "my-skill-name",
@@ -82758,7 +83173,15 @@ var init_zh_TW = __esm({
         errorInvalidName: "\u7121\u6548\u7684\u6280\u80FD\u540D\u7A31",
         errorExistsBoth: '\u6280\u80FD "{name}" \u5728\u5168\u5C40\u548C\u9805\u76EE\u4F4D\u7F6E\u90FD\u5DF2\u5B58\u5728',
         errorExistsGlobal: '\u6280\u80FD "{name}" \u5DF2\u5B58\u5728\u65BC\u5168\u5C40\u4F4D\u7F6E (~/.snow/skills/)',
-        errorExistsProject: '\u6280\u80FD "{name}" \u5DF2\u5B58\u5728\u65BC\u9805\u76EE\u4F4D\u7F6E (.snow/skills/)'
+        errorExistsProject: '\u6280\u80FD "{name}" \u5DF2\u5B58\u5728\u65BC\u9805\u76EE\u4F4D\u7F6E (.snow/skills/)',
+        errorExistsAny: '\u6280\u80FD "{name}" \u5DF2\u5B58\u5728\uFF0C\u8ACB\u63DB\u4E00\u500B\u540D\u7A31',
+        errorGeneration: "AI \u751F\u6210\u5931\u6557",
+        errorNoGeneratedContent: "\u7F3A\u5C11\u751F\u6210\u5167\u5BB9\uFF0C\u8ACB\u91CD\u8A66",
+        resultModeAi: "AI \u751F\u6210",
+        resultModeManual: "\u624B\u52D5\u6A21\u677F",
+        createSuccessMessage: '\u6280\u80FD "{name}" \u5275\u5EFA\u6210\u529F\uFF01\n\u6A21\u5F0F: {mode}\n\u4F4D\u7F6E: {location}\n\u8DEF\u5F91: {path}\n\n\u5DF2\u5275\u5EFA\u4EE5\u4E0B\u6A94\u6848\uFF1A\n- SKILL.md\uFF08\u4E3B\u6280\u80FD\u6587\u4EF6\uFF09\n- reference.md\uFF08\u8A73\u7D30\u53C3\u8003\uFF09\n- examples.md\uFF08\u4F7F\u7528\u7BC4\u4F8B\uFF09\n- templates/template.txt\uFF08\u6A21\u677F\u6A94\u6848\uFF09\n- scripts/helper.py\uFF08\u8F14\u52A9\u8173\u672C\uFF09\n\n\u4F60\u73FE\u5728\u53EF\u4EE5\u7DE8\u8F2F\u9019\u4E9B\u6A94\u6848\u4F86\u81EA\u8A02\u6280\u80FD\u3002',
+        createErrorMessage: "\u5275\u5EFA\u6280\u80FD\u5931\u6557\uFF1A{error}",
+        errorUnknown: "\u672A\u77E5\u932F\u8AA4"
       },
       askUser: {
         header: "[\u9700\u8981\u4F7F\u7528\u8005\u8F38\u5165]",
@@ -98766,49 +99189,49 @@ var require_fast_uri = __commonJS({
       schemelessOptions.skipEscape = true;
       return serialize(resolved, schemelessOptions);
     }
-    function resolveComponent(base, relative8, options3, skipNormalization) {
+    function resolveComponent(base, relative9, options3, skipNormalization) {
       const target = {};
       if (!skipNormalization) {
         base = parse3(serialize(base, options3), options3);
-        relative8 = parse3(serialize(relative8, options3), options3);
+        relative9 = parse3(serialize(relative9, options3), options3);
       }
       options3 = options3 || {};
-      if (!options3.tolerant && relative8.scheme) {
-        target.scheme = relative8.scheme;
-        target.userinfo = relative8.userinfo;
-        target.host = relative8.host;
-        target.port = relative8.port;
-        target.path = removeDotSegments(relative8.path || "");
-        target.query = relative8.query;
+      if (!options3.tolerant && relative9.scheme) {
+        target.scheme = relative9.scheme;
+        target.userinfo = relative9.userinfo;
+        target.host = relative9.host;
+        target.port = relative9.port;
+        target.path = removeDotSegments(relative9.path || "");
+        target.query = relative9.query;
       } else {
-        if (relative8.userinfo !== void 0 || relative8.host !== void 0 || relative8.port !== void 0) {
-          target.userinfo = relative8.userinfo;
-          target.host = relative8.host;
-          target.port = relative8.port;
-          target.path = removeDotSegments(relative8.path || "");
-          target.query = relative8.query;
+        if (relative9.userinfo !== void 0 || relative9.host !== void 0 || relative9.port !== void 0) {
+          target.userinfo = relative9.userinfo;
+          target.host = relative9.host;
+          target.port = relative9.port;
+          target.path = removeDotSegments(relative9.path || "");
+          target.query = relative9.query;
         } else {
-          if (!relative8.path) {
+          if (!relative9.path) {
             target.path = base.path;
-            if (relative8.query !== void 0) {
-              target.query = relative8.query;
+            if (relative9.query !== void 0) {
+              target.query = relative9.query;
             } else {
               target.query = base.query;
             }
           } else {
-            if (relative8.path[0] === "/") {
-              target.path = removeDotSegments(relative8.path);
+            if (relative9.path[0] === "/") {
+              target.path = removeDotSegments(relative9.path);
             } else {
               if ((base.userinfo !== void 0 || base.host !== void 0 || base.port !== void 0) && !base.path) {
-                target.path = "/" + relative8.path;
+                target.path = "/" + relative9.path;
               } else if (!base.path) {
-                target.path = relative8.path;
+                target.path = relative9.path;
               } else {
-                target.path = base.path.slice(0, base.path.lastIndexOf("/") + 1) + relative8.path;
+                target.path = base.path.slice(0, base.path.lastIndexOf("/") + 1) + relative9.path;
               }
               target.path = removeDotSegments(target.path);
             }
-            target.query = relative8.query;
+            target.query = relative9.query;
           }
           target.userinfo = base.userinfo;
           target.host = base.host;
@@ -98816,7 +99239,7 @@ var require_fast_uri = __commonJS({
         }
         target.scheme = base.scheme;
       }
-      target.fragment = relative8.fragment;
+      target.fragment = relative9.fragment;
       return target;
     }
     function equal(uriA, uriB, options3) {
@@ -280486,7 +280909,7 @@ var require_files = __commonJS({
     var fs42 = __require("fs");
     var url = __require("url");
     var os23 = __require("os");
-    var dirname10 = __require("path").dirname;
+    var dirname11 = __require("path").dirname;
     var resolvePath = __require("path").resolve;
     var isAbsolutePath = require_path_is_absolute();
     var promises = require_promises();
@@ -280501,7 +280924,7 @@ var require_files = __commonJS({
           }
         };
       }
-      var base = options3.relativeToFile ? dirname10(options3.relativeToFile) : null;
+      var base = options3.relativeToFile ? dirname11(options3.relativeToFile) : null;
       function read2(uri, encoding) {
         return resolveUri(uri).then(function(path53) {
           return readFile3(path53, encoding).caught(function(error) {
@@ -288423,8 +288846,8 @@ var require_xlsx = __commonJS({
           }
           return L.length - R.length;
         }
-        function dirname10(p) {
-          if (p.charAt(p.length - 1) == "/") return p.slice(0, -1).indexOf("/") === -1 ? p : dirname10(p.slice(0, -1));
+        function dirname11(p) {
+          if (p.charAt(p.length - 1) == "/") return p.slice(0, -1).indexOf("/") === -1 ? p : dirname11(p.slice(0, -1));
           var c = p.lastIndexOf("/");
           return c === -1 ? p : p.slice(0, c + 1);
         }
@@ -288845,7 +289268,7 @@ var require_xlsx = __commonJS({
             data.push([cfb.FullPaths[i2], cfb.FileIndex[i2]]);
           }
           for (i2 = 0; i2 < data.length; ++i2) {
-            var dad = dirname10(data[i2][0]);
+            var dad = dirname11(data[i2][0]);
             s = fullPaths[dad];
             if (!s) {
               data.push([dad, {
@@ -288881,13 +289304,13 @@ var require_xlsx = __commonJS({
               elt.size = 0;
               elt.type = 5;
             } else if (nm.slice(-1) == "/") {
-              for (j = i2 + 1; j < data.length; ++j) if (dirname10(cfb.FullPaths[j]) == nm) break;
+              for (j = i2 + 1; j < data.length; ++j) if (dirname11(cfb.FullPaths[j]) == nm) break;
               elt.C = j >= data.length ? -1 : j;
-              for (j = i2 + 1; j < data.length; ++j) if (dirname10(cfb.FullPaths[j]) == dirname10(nm)) break;
+              for (j = i2 + 1; j < data.length; ++j) if (dirname11(cfb.FullPaths[j]) == dirname11(nm)) break;
               elt.R = j >= data.length ? -1 : j;
               elt.type = 1;
             } else {
-              if (dirname10(cfb.FullPaths[i2 + 1] || "") == dirname10(nm)) elt.R = i2 + 1;
+              if (dirname11(cfb.FullPaths[i2 + 1] || "") == dirname11(nm)) elt.R = i2 + 1;
               elt.type = 2;
             }
           }
@@ -350842,7 +351265,7 @@ ${fileList}`,
               let errorMessage = `\u274C Search content not found in file: ${filePath}
 
 `;
-              errorMessage += `\u{1F50D} Using smart fuzzy matching (threshold: 60%)
+              errorMessage += `\u{1F50D} Using smart fuzzy matching (threshold: ${threshold})
 `;
               if (isOverEscaped(searchContent)) {
                 errorMessage += `\u26A0\uFE0F  Detected over-escaped content, automatic fix attempted but failed
@@ -351388,7 +351811,7 @@ ${formattedDiagnostics}`;
       },
       {
         name: "filesystem-edit_search",
-        description: 'RECOMMENDED for most edits: Search-and-replace with SMART FUZZY MATCHING. **CRITICAL PATH REQUIREMENTS**: (1) filePath parameter is REQUIRED - MUST be a valid non-empty string or array, never use undefined/null/empty string, (2) Use EXACT file paths from search results or user input - never use placeholders like "path/to/file", (3) If uncertain about path, use search tools first to find the correct file. **SUPPORTS BATCH EDITING**: Pass (1) single file with search/replace, (2) array of file paths with unified search/replace, or (3) array of {path, searchContent, replaceContent, occurrence?} for per-file edits. **CRITICAL WORKFLOW FOR CODE SAFETY**: (1) Use search tools (codebase-search or ACE tools) to locate code, (2) MUST use filesystem-read to identify COMPLETE code boundaries (entire function body with all braces, complete markup tags with opening/closing pairs, full code blocks), (3) Copy the COMPLETE code block (without line numbers), (4) Verify boundaries are intact (matching braces/brackets/tags), (5) Use THIS tool. **WHY USE THIS**: No line tracking needed, auto-handles spacing/tabs differences, finds best fuzzy match even with whitespace changes, safer than line-based editing. **SMART MATCHING**: Uses similarity algorithm (60% threshold) to find code even if indentation/spacing differs from your search string. Automatically corrects over-escaped content. If multiple matches found, selects best match first (highest similarity score). **COMMON ERRORS TO AVOID**: Using invalid/empty file paths, modifying only part of a function (missing closing brace), incomplete markup tags (HTML/Vue/JSX), partial code blocks, copying line numbers from filesystem-read output. Always include complete syntactic units with all opening/closing pairs. **BATCH EXAMPLE**: filePath=[{path:"a.ts", searchContent:"old1", replaceContent:"new1"}, {path:"b.ts", searchContent:"old2", replaceContent:"new2"}]',
+        description: 'RECOMMENDED for most edits: Search-and-replace with SMART FUZZY MATCHING. **CRITICAL PATH REQUIREMENTS**: (1) filePath parameter is REQUIRED - MUST be a valid non-empty string or array, never use undefined/null/empty string, (2) Use EXACT file paths from search results or user input - never use placeholders like "path/to/file", (3) If uncertain about path, use search tools first to find the correct file. **SUPPORTS BATCH EDITING**: Pass (1) single file with search/replace, (2) array of file paths with unified search/replace, or (3) array of {path, searchContent, replaceContent, occurrence?} for per-file edits. **CRITICAL WORKFLOW FOR CODE SAFETY - COMPLETE BOUNDARIES REQUIRED**: (1) Use search tools (codebase-search or ACE tools) to locate code, (2) MUST use filesystem-read to identify COMPLETE code boundaries with ALL closing pairs: entire function from declaration to final closing brace `}`, complete HTML/XML/JSX tags from opening `<tag>` to closing `</tag>`, full code blocks with ALL matching brackets/braces/parentheses, (3) Copy the COMPLETE code block (without line numbers) - verify you have captured ALL opening and closing symbols, (4) MANDATORY verification: Count and match ALL pairs - every `{` must have `}`, every `(` must have `)`, every `[` must have `]`, every `<tag>` must have `</tag>`, (5) Use THIS tool only after verification passes. **ABSOLUTE PROHIBITIONS**: NEVER edit partial functions (missing closing brace), NEVER edit incomplete markup (missing closing tag), NEVER edit partial code blocks (unmatched brackets), NEVER copy line numbers from filesystem-read output. **WHY USE THIS**: No line tracking needed, auto-handles spacing/tabs differences, finds best fuzzy match even with whitespace changes, safer than line-based editing. **SMART MATCHING**: Uses similarity algorithm to find code even if indentation/spacing differs from your search string. Automatically corrects over-escaped content. If multiple matches found, selects best match first (highest similarity score). **COMMON FATAL ERRORS TO AVOID**: Using invalid/empty file paths, modifying only part of a function (missing closing brace `}`), incomplete markup tags (HTML/Vue/JSX missing `</tag>`), partial code blocks (unmatched `{`, `}`, `(`, `)`, `[`, `]`), copying line numbers from filesystem-read output. You MUST include complete syntactic units with ALL opening/closing pairs verified and matched. **BATCH EXAMPLE**: filePath=[{path:"a.ts", searchContent:"old1", replaceContent:"new1"}, {path:"b.ts", searchContent:"old2", replaceContent:"new2"}]',
         inputSchema: {
           type: "object",
           properties: {
@@ -351458,7 +351881,7 @@ ${formattedDiagnostics}`;
       },
       {
         name: "filesystem-edit",
-        description: 'Line-based editing for precise control. **CRITICAL PATH REQUIREMENTS**: (1) filePath parameter is REQUIRED - MUST be a valid non-empty string or array, never use undefined/null/empty string, (2) Use EXACT file paths from search results or user input - never use placeholders like "path/to/file", (3) If uncertain about path, use search tools first to find the correct file. **SUPPORTS BATCH EDITING**: Pass (1) single file with line range, (2) array of file paths with unified line range, or (3) array of {path, startLine, endLine, newContent} for per-file edits. **WHEN TO USE**: (1) Adding new code sections, (2) Deleting specific line ranges, (3) When search-replace not suitable. **CRITICAL WORKFLOW FOR CODE SAFETY**: (1) Use search tools (codebase-search or ACE tools) to locate area, (2) MUST use filesystem-read to identify COMPLETE code boundaries - for functions: include opening line to closing brace; for markup tags (HTML/Vue/JSX): include opening tag to closing tag; for code blocks: include all braces/brackets, (3) Verify line range covers the ENTIRE syntactic unit (check indentation levels, matching pairs), (4) Use THIS tool with exact startLine/endLine. **BEST PRACTICE**: Keep edits small (under 15 lines recommended) for better accuracy. For larger changes, make multiple parallel edits to non-overlapping sections instead of one large edit. **RECOMMENDATION**: For modifying existing code, use filesystem-edit_search - safer and no line tracking needed. **WHY LINE-BASED IS RISKIER**: Line numbers can shift during editing, making it easy to target wrong lines. Search-replace avoids this by matching actual content. **COMMON ERRORS TO AVOID**: Using invalid/empty file paths, line range stops mid-function (missing closing brace), partial markup tags, incomplete code blocks, targeting wrong lines after file changes. Always verify boundaries with filesystem-read first. **BATCH EXAMPLE**: filePath=[{path:"a.ts", startLine:10, endLine:20, newContent:"..."}, {path:"b.ts", startLine:50, endLine:60, newContent:"..."}]',
+        description: 'Line-based editing for precise control. **CRITICAL PATH REQUIREMENTS**: (1) filePath parameter is REQUIRED - MUST be a valid non-empty string or array, never use undefined/null/empty string, (2) Use EXACT file paths from search results or user input - never use placeholders like "path/to/file", (3) If uncertain about path, use search tools first to find the correct file. **SUPPORTS BATCH EDITING**: Pass (1) single file with line range, (2) array of file paths with unified line range, or (3) array of {path, startLine, endLine, newContent} for per-file edits. **WHEN TO USE**: (1) Adding new code sections, (2) Deleting specific line ranges, (3) When search-replace not suitable. **CRITICAL WORKFLOW FOR CODE SAFETY - COMPLETE BOUNDARIES REQUIRED**: (1) Use search tools (codebase-search or ACE tools) to locate area, (2) MUST use filesystem-read to identify COMPLETE code boundaries with ALL closing pairs: for functions - include opening declaration to final closing brace `}`; for HTML/XML/JSX markup tags - include opening `<tag>` to closing `</tag>`; for code blocks - include ALL matching braces/brackets/parentheses, (3) MANDATORY verification before editing: count opening and closing symbols in your target range - every `{` must have matching `}`, every `(` must have `)`, every `[` must have `]`, every `<tag>` must have `</tag>`, verify indentation levels are consistent, (4) Use THIS tool with exact startLine/endLine ONLY after verification passes. **ABSOLUTE PROHIBITIONS**: NEVER edit line range that stops mid-function (missing closing brace `}`), NEVER edit partial markup tags (missing `</tag>`), NEVER edit incomplete code blocks (unmatched brackets), NEVER edit without verifying boundaries first. **BEST PRACTICE**: Keep edits small (under 15 lines recommended) for better accuracy. For larger changes, make multiple parallel edits to non-overlapping sections instead of one large edit. **RECOMMENDATION**: For modifying existing code, use filesystem-edit_search - safer and no line tracking needed. **WHY LINE-BASED IS RISKIER**: Line numbers can shift during editing, making it easy to target wrong lines. Search-replace avoids this by matching actual content. **COMMON FATAL ERRORS TO AVOID**: Using invalid/empty file paths, line range stops mid-function (missing closing brace `}`), partial markup tags (missing `</tag>`), incomplete code blocks (unmatched `{`, `}`, `(`, `)`, `[`, `]`), targeting wrong lines after file changes, not verifying boundaries with filesystem-read first. You MUST verify complete syntactic units with ALL opening/closing pairs matched. **BATCH EXAMPLE**: filePath=[{path:"a.ts", startLine:10, endLine:20, newContent:"..."}, {path:"b.ts", startLine:50, endLine:60, newContent:"..."}]',
         inputSchema: {
           type: "object",
           properties: {
@@ -403920,7 +404343,7 @@ var require_util12 = __commonJS({
     exports2.isAbsolute = function(aPath) {
       return aPath.charAt(0) === "/" || urlRegexp.test(aPath);
     };
-    function relative8(aRoot, aPath) {
+    function relative9(aRoot, aPath) {
       if (aRoot === "") {
         aRoot = ".";
       }
@@ -403939,7 +404362,7 @@ var require_util12 = __commonJS({
       }
       return Array(level + 1).join("../") + aPath.substr(aRoot.length + 1);
     }
-    exports2.relative = relative8;
+    exports2.relative = relative9;
     var supportsNullProto = (function() {
       var obj2 = /* @__PURE__ */ Object.create(null);
       return !("__proto__" in obj2);
@@ -429708,6 +430131,16 @@ var init_codebaseSearch = __esm({
           return lastResults;
         } catch (error) {
           logger.error("Codebase search failed:", error);
+          if (enableAgentReview) {
+            codebaseSearchEvents.emitSearchEvent({
+              type: "search-complete",
+              attempt: 0,
+              maxAttempts: MAX_SEARCH_RETRIES,
+              currentTopN: topN,
+              message: `Search failed: ${error instanceof Error ? error.message : "Unknown error"}`,
+              query
+            });
+          }
           throw error;
         }
       }
@@ -435993,7 +436426,7 @@ var require_gray_matter = __commonJS({
 });
 
 // dist/mcp/skills.js
-import { join as join21 } from "path";
+import { dirname as dirname8, join as join21, relative as relative6 } from "path";
 import { existsSync as existsSync21 } from "fs";
 import { readFile as readFile2 } from "fs/promises";
 import { homedir as homedir14 } from "os";
@@ -436032,64 +436465,75 @@ async function readSkillFile(skillPath) {
     return null;
   }
 }
-async function loadAvailableSkills(projectRoot) {
-  const skills = /* @__PURE__ */ new Map();
-  const globalSkillsDir = join21(homedir14(), ".snow", "skills");
-  const projectSkillsDir = projectRoot ? join21(projectRoot, ".snow", "skills") : null;
-  if (existsSync21(globalSkillsDir)) {
-    try {
-      const { readdirSync: readdirSync3 } = await import("fs");
-      const entries = readdirSync3(globalSkillsDir, { withFileTypes: true });
-      for (const entry of entries) {
-        if (entry.isDirectory()) {
-          const skillPath = join21(globalSkillsDir, entry.name);
-          const skillData = await readSkillFile(skillPath);
-          if (skillData) {
-            skills.set(entry.name, {
-              name: skillData.metadata.name || entry.name,
-              description: skillData.metadata.description || "",
-              location: "global",
-              path: skillPath,
-              content: skillData.content,
-              allowedTools: skillData.metadata.allowedTools
-            });
-          }
-        }
-      }
-    } catch (error) {
-      console.error("Failed to load global skills:", error);
-    }
+function normalizeSkillId(skillId) {
+  return skillId.replace(/\\/g, "/").replace(/^\.\/+/, "");
+}
+async function loadSkillsFromDirectory(skills, baseSkillsDir, location) {
+  if (!existsSync21(baseSkillsDir)) {
+    return;
   }
-  if (projectSkillsDir && existsSync21(projectSkillsDir)) {
-    try {
-      const { readdirSync: readdirSync3 } = await import("fs");
-      const entries = readdirSync3(projectSkillsDir, { withFileTypes: true });
+  try {
+    const { readdirSync: readdirSync3 } = await import("fs");
+    const pendingDirs = [baseSkillsDir];
+    while (pendingDirs.length > 0) {
+      const currentDir = pendingDirs.pop();
+      if (!currentDir)
+        continue;
+      let entries;
+      try {
+        entries = readdirSync3(currentDir, { withFileTypes: true });
+      } catch {
+        continue;
+      }
       for (const entry of entries) {
         if (entry.isDirectory()) {
-          const skillPath = join21(projectSkillsDir, entry.name);
-          const skillData = await readSkillFile(skillPath);
-          if (skillData) {
-            skills.set(entry.name, {
-              name: skillData.metadata.name || entry.name,
-              description: skillData.metadata.description || "",
-              location: "project",
-              path: skillPath,
-              content: skillData.content,
-              allowedTools: skillData.metadata.allowedTools
-            });
-          }
+          pendingDirs.push(join21(currentDir, entry.name));
+          continue;
         }
+        if (!entry.isFile() || entry.name !== "SKILL.md") {
+          continue;
+        }
+        const skillFile = join21(currentDir, entry.name);
+        const skillDir = dirname8(skillFile);
+        const rawSkillId = relative6(baseSkillsDir, skillDir);
+        const skillId = normalizeSkillId(rawSkillId);
+        if (!skillId || skillId === ".") {
+          continue;
+        }
+        const skillData = await readSkillFile(skillDir);
+        if (!skillData) {
+          continue;
+        }
+        const fallbackName = skillId.split("/").filter(Boolean).pop() || skillId;
+        skills.set(skillId, {
+          id: skillId,
+          name: skillData.metadata.name || fallbackName,
+          description: skillData.metadata.description || "",
+          location,
+          path: skillDir,
+          content: skillData.content,
+          allowedTools: skillData.metadata.allowedTools
+        });
       }
-    } catch (error) {
-      console.error("Failed to load project skills:", error);
     }
+  } catch (error) {
+    console.error(`Failed to load ${location} skills:`, error);
+  }
+}
+async function loadAvailableSkills(projectRoot) {
+  const skills = /* @__PURE__ */ new Map();
+  const globalSkillsDir = join21(homedir14(), ".snow", "skills");
+  const projectSkillsDir = projectRoot ? join21(projectRoot, ".snow", "skills") : null;
+  await loadSkillsFromDirectory(skills, globalSkillsDir, "global");
+  if (projectSkillsDir) {
+    await loadSkillsFromDirectory(skills, projectSkillsDir, "project");
   }
   return skills;
 }
 function generateSkillToolDescription(skills) {
   const skillsList = Array.from(skills.values()).map((skill) => `<skill>
 <name>
-${skill.name}
+${skill.id}
 </name>
 <description>
 ${skill.description}
@@ -436104,7 +436548,7 @@ ${skill.location}
 When users ask you to perform tasks, check if any of the available skills below can help complete the task more effectively. Skills provide specialized capabilities and domain knowledge.
 
 How to use skills:
-- Invoke skills using this tool with the skill name only (no arguments)
+- Invoke skills using this tool with the skill id only (no arguments)
 - When you invoke a skill, you will see <command-message>The "{name}" skill is loading</command-message>
 - The skill's prompt will expand and provide detailed instructions on how to complete the task
 - Examples:
@@ -436136,7 +436580,7 @@ async function getMCPTools2(projectRoot) {
         properties: {
           skill: {
             type: "string",
-            description: 'The skill name (no arguments). E.g., "pdf" or "data-analysis"'
+            description: 'The skill id (no arguments). E.g., "pdf", "data-analysis", or "helloagents/analyze"'
           }
         },
         required: ["skill"],
@@ -436196,15 +436640,16 @@ async function executeSkillTool(toolName, args2, projectRoot) {
   if (toolName !== "skill-execute") {
     throw new Error(`Unknown tool: ${toolName}`);
   }
-  const skillName = args2.skill;
-  if (!skillName || typeof skillName !== "string") {
+  const requestedSkillId = args2.skill;
+  if (!requestedSkillId || typeof requestedSkillId !== "string") {
     throw new Error("skill parameter is required and must be a string");
   }
+  const skillId = normalizeSkillId(requestedSkillId);
   const skills = await loadAvailableSkills(projectRoot);
-  const skill = skills.get(skillName);
+  const skill = skills.get(skillId);
   if (!skill) {
     const availableSkills = Array.from(skills.keys()).join(", ");
-    throw new Error(`Skill "${skillName}" not found. Available skills: ${availableSkills || "none"}`);
+    throw new Error(`Skill "${skillId}" not found. Available skills: ${availableSkills || "none"}`);
   }
   const directoryTree = await generateSkillTree(skill.path);
   let toolRestriction = "";
@@ -441549,7 +441994,8 @@ error: ${error || "(empty)"}`);
     } else {
       try {
         const mcpConfig = getMCPConfig();
-        for (const configuredServiceName of Object.keys(mcpConfig.mcpServers)) {
+        const serviceNames = Object.keys(mcpConfig.mcpServers).sort((a, b) => b.length - a.length);
+        for (const configuredServiceName of serviceNames) {
           const prefix = `${configuredServiceName}-`;
           if (toolName.startsWith(prefix)) {
             serviceName = configuredServiceName;
@@ -543557,7 +544003,7 @@ function LoadingIndicator({ isStreaming, isStopping, isSaving, hasPendingToolCon
         retryStatus.attempt,
         "/5)"
       )
-    ) : (codebaseSearchStatus == null ? void 0 : codebaseSearchStatus.isSearching) ? import_react113.default.createElement(CodebaseSearchStatus, { status: codebaseSearchStatus }) : codebaseSearchStatus && !codebaseSearchStatus.isSearching && codebaseSearchStatus.reviewResults ? import_react113.default.createElement(CodebaseSearchStatus, { status: codebaseSearchStatus }) : import_react113.default.createElement(
+    ) : (codebaseSearchStatus == null ? void 0 : codebaseSearchStatus.isSearching) ? import_react113.default.createElement(CodebaseSearchStatus, { status: codebaseSearchStatus }) : codebaseSearchStatus && !codebaseSearchStatus.isSearching ? import_react113.default.createElement(CodebaseSearchStatus, { status: codebaseSearchStatus }) : import_react113.default.createElement(
       Text,
       { color: theme14.colors.menuSecondary, dimColor: true },
       import_react113.default.createElement(ShimmerText, { text: isReasoning ? t.chatScreen.statusDeepThinking : streamTokenCount > 0 ? t.chatScreen.statusWriting : t.chatScreen.statusThinking }),
@@ -543962,6 +544408,7 @@ var init_SkillsCreationPanel = __esm({
     "use strict";
     import_react115 = __toESM(require_react(), 1);
     await init_build2();
+    await init_build3();
     await init_build4();
     init_ThemeContext();
     init_I18nContext();
@@ -543969,16 +544416,145 @@ var init_SkillsCreationPanel = __esm({
     SkillsCreationPanel = ({ onSave, onCancel, projectRoot }) => {
       const { theme: theme14 } = useTheme();
       const { t } = useI18n();
-      const [step, setStep] = (0, import_react115.useState)("name");
+      const [step, setStep] = (0, import_react115.useState)("mode");
+      const [mode, setMode] = (0, import_react115.useState)("manual");
       const [skillName, setSkillName] = (0, import_react115.useState)("");
       const [description, setDescription] = (0, import_react115.useState)("");
       const [location, setLocation] = (0, import_react115.useState)("global");
+      const [requirement, setRequirement] = (0, import_react115.useState)("");
+      const [generated, setGenerated] = (0, import_react115.useState)();
       const [errorMessage, setErrorMessage] = (0, import_react115.useState)("");
+      const abortControllerRef = (0, import_react115.useRef)(null);
+      const handleCancel = (0, import_react115.useCallback)(() => {
+        var _a21;
+        try {
+          (_a21 = abortControllerRef.current) == null ? void 0 : _a21.abort();
+        } catch {
+        }
+        onCancel();
+      }, [onCancel]);
+      const handleNameSubmit = (0, import_react115.useCallback)((value) => {
+        if (!value.trim()) {
+          return;
+        }
+        const trimmedName = value.trim();
+        const validation = validateSkillId(trimmedName);
+        if (!validation.valid) {
+          setErrorMessage(validation.error || t.skillsCreation.errorInvalidName);
+          return;
+        }
+        const existsGlobal = checkSkillExists(trimmedName, "global");
+        const existsProject = checkSkillExists(trimmedName, "project", projectRoot);
+        if (existsGlobal && existsProject) {
+          setErrorMessage(t.skillsCreation.errorExistsBoth.replace("{name}", trimmedName));
+          return;
+        }
+        if (existsGlobal) {
+          setErrorMessage(t.skillsCreation.errorExistsGlobal.replace("{name}", trimmedName));
+          return;
+        }
+        if (existsProject) {
+          setErrorMessage(t.skillsCreation.errorExistsProject.replace("{name}", trimmedName));
+          return;
+        }
+        setErrorMessage("");
+        setSkillName(trimmedName);
+        setStep("description");
+      }, [projectRoot, t.skillsCreation]);
+      const handleDescriptionSubmit = (0, import_react115.useCallback)((value) => {
+        if (value.trim()) {
+          setDescription(value.trim());
+          setStep("location");
+        }
+      }, []);
+      const handleRequirementSubmit = (0, import_react115.useCallback)((value) => {
+        if (value.trim()) {
+          setRequirement(value.trim());
+          setErrorMessage("");
+          setStep("ai-location");
+        }
+      }, []);
+      const handleConfirmManual = (0, import_react115.useCallback)(async () => {
+        await onSave(skillName, description, location);
+      }, [skillName, description, location, onSave]);
+      const handleConfirmAI = (0, import_react115.useCallback)(async () => {
+        if (!generated) {
+          setErrorMessage(t.skillsCreation.errorNoGeneratedContent);
+          return;
+        }
+        await onSave(skillName, description, location, generated);
+      }, [generated, skillName, description, location, onSave, t.skillsCreation]);
+      const handleEditNameSubmit = (0, import_react115.useCallback)((value) => {
+        if (!value.trim()) {
+          return;
+        }
+        const trimmedName = value.trim();
+        const validation = validateSkillId(trimmedName);
+        if (!validation.valid) {
+          setErrorMessage(validation.error || t.skillsCreation.errorInvalidName);
+          return;
+        }
+        const existsGlobal = checkSkillExists(trimmedName, "global");
+        const existsProject = checkSkillExists(trimmedName, "project", projectRoot);
+        if (existsGlobal || existsProject) {
+          setErrorMessage(t.skillsCreation.errorExistsAny.replace("{name}", trimmedName));
+          return;
+        }
+        setErrorMessage("");
+        setSkillName(trimmedName);
+        setStep("ai-preview");
+      }, [projectRoot, t.skillsCreation]);
+      (0, import_react115.useEffect)(() => {
+        if (step !== "ai-generating") {
+          return;
+        }
+        const controller = new AbortController();
+        abortControllerRef.current = controller;
+        setErrorMessage("");
+        setGenerated(void 0);
+        generateSkillDraftWithAI(requirement, projectRoot, controller.signal).then((draft) => {
+          setSkillName(draft.skillName);
+          setDescription(draft.description);
+          setGenerated(draft.generated);
+          setStep("ai-preview");
+        }).catch((error) => {
+          if (controller.signal.aborted) {
+            return;
+          }
+          const message = error instanceof Error ? error.message : t.skillsCreation.errorGeneration;
+          setErrorMessage(message);
+          setStep("ai-error");
+        }).finally(() => {
+          abortControllerRef.current = null;
+        });
+        return () => {
+          try {
+            controller.abort();
+          } catch {
+          }
+        };
+      }, [step, requirement, projectRoot, t.skillsCreation.errorGeneration]);
+      const keyHandlingActive = step === "mode" || step === "location" || step === "confirm" || step === "ai-location" || step === "ai-generating" || step === "ai-preview" || step === "ai-error";
       use_input_default((input2, key) => {
         if (key.escape) {
           handleCancel();
           return;
         }
+        if (step === "mode") {
+          if (input2.toLowerCase() === "m") {
+            setMode("manual");
+            setErrorMessage("");
+            setStep("name");
+          } else if (input2.toLowerCase() === "a") {
+            setMode("ai");
+            setErrorMessage("");
+            setSkillName("");
+            setDescription("");
+            setGenerated(void 0);
+            setStep("ai-requirement");
+          }
+          return;
+        }
         if (step === "location") {
           if (input2.toLowerCase() === "g") {
             setLocation("global");
@@ -543987,51 +544563,45 @@ var init_SkillsCreationPanel = __esm({
             setLocation("project");
             setStep("confirm");
           }
-        } else if (step === "confirm") {
+          return;
+        }
+        if (step === "confirm") {
           if (input2.toLowerCase() === "y") {
-            handleConfirm();
+            handleConfirmManual();
           } else if (input2.toLowerCase() === "n") {
             handleCancel();
           }
+          return;
         }
-      }, { isActive: step === "location" || step === "confirm" });
-      const handleNameSubmit = (0, import_react115.useCallback)((value) => {
-        if (value.trim()) {
-          const trimmedName = value.trim();
-          const validation = validateSkillName(trimmedName);
-          if (!validation.valid) {
-            setErrorMessage(validation.error || t.skillsCreation.errorInvalidName);
-            return;
+        if (step === "ai-location") {
+          if (input2.toLowerCase() === "g") {
+            setLocation("global");
+            setStep("ai-generating");
+          } else if (input2.toLowerCase() === "p") {
+            setLocation("project");
+            setStep("ai-generating");
           }
-          const existsGlobal = checkSkillExists(trimmedName, "global");
-          const existsProject = checkSkillExists(trimmedName, "project", projectRoot);
-          if (existsGlobal && existsProject) {
-            setErrorMessage(t.skillsCreation.errorExistsBoth.replace("{name}", trimmedName));
-            return;
-          } else if (existsGlobal) {
-            setErrorMessage(t.skillsCreation.errorExistsGlobal.replace("{name}", trimmedName));
-            return;
-          } else if (existsProject) {
-            setErrorMessage(t.skillsCreation.errorExistsProject.replace("{name}", trimmedName));
-            return;
+          return;
+        }
+        if (step === "ai-preview") {
+          if (input2.toLowerCase() === "y") {
+            handleConfirmAI();
+          } else if (input2.toLowerCase() === "e") {
+            setErrorMessage("");
+            setStep("ai-edit-name");
+          } else if (input2.toLowerCase() === "r") {
+            setErrorMessage("");
+            setStep("ai-generating");
           }
-          setErrorMessage("");
-          setSkillName(trimmedName);
-          setStep("description");
+          return;
         }
-      }, [projectRoot, t.skillsCreation]);
-      const handleDescriptionSubmit = (0, import_react115.useCallback)((value) => {
-        if (value.trim()) {
-          setDescription(value.trim());
-          setStep("location");
+        if (step === "ai-error") {
+          if (input2.toLowerCase() === "r") {
+            setErrorMessage("");
+            setStep("ai-generating");
+          }
         }
-      }, []);
-      const handleConfirm = (0, import_react115.useCallback)(async () => {
-        await onSave(skillName, description, location);
-      }, [skillName, description, location, onSave]);
-      const handleCancel = (0, import_react115.useCallback)(() => {
-        onCancel();
-      }, [onCancel]);
+      }, { isActive: keyHandlingActive });
       return import_react115.default.createElement(
         Box_default,
         { flexDirection: "column", padding: 1, borderStyle: "round", borderColor: theme14.colors.border },
@@ -544040,7 +544610,47 @@ var init_SkillsCreationPanel = __esm({
           { marginBottom: 1 },
           import_react115.default.createElement(Text, { bold: true, color: theme14.colors.menuSelected }, t.skillsCreation.title)
         ),
-        step === "name" && import_react115.default.createElement(
+        step === "mode" && import_react115.default.createElement(
+          Box_default,
+          { flexDirection: "column" },
+          import_react115.default.createElement(
+            Box_default,
+            { marginBottom: 1 },
+            import_react115.default.createElement(Text, { color: theme14.colors.text }, t.skillsCreation.modeLabel)
+          ),
+          import_react115.default.createElement(
+            Box_default,
+            { gap: 2 },
+            import_react115.default.createElement(
+              Box_default,
+              null,
+              import_react115.default.createElement(Text, { color: theme14.colors.success, bold: true }, "[A]"),
+              import_react115.default.createElement(
+                Text,
+                { color: theme14.colors.text },
+                " ",
+                t.skillsCreation.modeAi
+              )
+            ),
+            import_react115.default.createElement(
+              Box_default,
+              null,
+              import_react115.default.createElement(Text, { color: theme14.colors.menuSelected, bold: true }, "[M]"),
+              import_react115.default.createElement(
+                Text,
+                { color: theme14.colors.text },
+                " ",
+                t.skillsCreation.modeManual
+              )
+            )
+          ),
+          import_react115.default.createElement(
+            Box_default,
+            { marginTop: 1 },
+            import_react115.default.createElement(Text, { dimColor: true }, t.skillsCreation.escCancel)
+          )
+        ),
+        mode === "manual" && step === "name" && import_react115.default.createElement(
           Box_default,
           { flexDirection: "column" },
           import_react115.default.createElement(
@@ -544065,7 +544675,7 @@ var init_SkillsCreationPanel = __esm({
             import_react115.default.createElement(Text, { dimColor: true }, t.skillsCreation.escCancel)
           )
         ),
-        step === "description" && import_react115.default.createElement(
+        mode === "manual" && step === "description" && import_react115.default.createElement(
           Box_default,
           { flexDirection: "column" },
           import_react115.default.createElement(
@@ -544096,7 +544706,293 @@ var init_SkillsCreationPanel = __esm({
             import_react115.default.createElement(Text, { dimColor: true }, t.skillsCreation.escCancel)
           )
         ),
-        step === "location" && import_react115.default.createElement(
+        mode === "manual" && step === "location" && import_react115.default.createElement(
+          Box_default,
+          { flexDirection: "column" },
+          import_react115.default.createElement(
+            Box_default,
+            { marginBottom: 1 },
+            import_react115.default.createElement(
+              Text,
+              { color: theme14.colors.text },
+              t.skillsCreation.nameLabel,
+              " ",
+              import_react115.default.createElement(Text, { bold: true, color: theme14.colors.success }, skillName)
+            )
+          ),
+          import_react115.default.createElement(
+            Box_default,
+            { marginBottom: 1 },
+            import_react115.default.createElement(
+              Text,
+              { color: theme14.colors.text },
+              t.skillsCreation.descriptionLabel,
+              " ",
+              import_react115.default.createElement(Text, { color: theme14.colors.menuNormal }, description)
+            )
+          ),
+          import_react115.default.createElement(
+            Box_default,
+            { marginBottom: 1, marginTop: 1 },
+            import_react115.default.createElement(Text, { color: theme14.colors.text }, t.skillsCreation.locationLabel)
+          ),
+          import_react115.default.createElement(
+            Box_default,
+            { marginTop: 1, flexDirection: "column", gap: 1 },
+            import_react115.default.createElement(
+              Box_default,
+              null,
+              import_react115.default.createElement(Text, { color: theme14.colors.success, bold: true }, "[G]"),
+              import_react115.default.createElement(
+                Text,
+                { color: theme14.colors.text },
+                " ",
+                t.skillsCreation.locationGlobal
+              )
+            ),
+            import_react115.default.createElement(
+              Box_default,
+              { marginLeft: 4 },
+              import_react115.default.createElement(Text, { dimColor: true }, t.skillsCreation.locationGlobalInfo)
+            ),
+            import_react115.default.createElement(
+              Box_default,
+              { marginTop: 1 },
+              import_react115.default.createElement(Text, { color: theme14.colors.menuSelected, bold: true }, "[P]"),
+              import_react115.default.createElement(
+                Text,
+                { color: theme14.colors.text },
+                " ",
+                t.skillsCreation.locationProject
+              )
+            ),
+            import_react115.default.createElement(
+              Box_default,
+              { marginLeft: 4 },
+              import_react115.default.createElement(Text, { dimColor: true }, t.skillsCreation.locationProjectInfo)
+            )
+          ),
+          import_react115.default.createElement(
+            Box_default,
+            { marginTop: 1 },
+            import_react115.default.createElement(Text, { dimColor: true }, t.skillsCreation.escCancel)
+          )
+        ),
+        mode === "manual" && step === "confirm" && import_react115.default.createElement(
+          Box_default,
+          { flexDirection: "column" },
+          import_react115.default.createElement(
+            Box_default,
+            { marginBottom: 1 },
+            import_react115.default.createElement(
+              Text,
+              { color: theme14.colors.text },
+              t.skillsCreation.nameLabel,
+              " ",
+              import_react115.default.createElement(Text, { bold: true, color: theme14.colors.success }, skillName)
+            )
+          ),
+          import_react115.default.createElement(
+            Box_default,
+            { marginBottom: 1 },
+            import_react115.default.createElement(
+              Text,
+              { color: theme14.colors.text },
+              t.skillsCreation.descriptionLabel,
+              " ",
+              import_react115.default.createElement(Text, { color: theme14.colors.menuNormal }, description)
+            )
+          ),
+          import_react115.default.createElement(
+            Box_default,
+            { marginBottom: 1 },
+            import_react115.default.createElement(
+              Text,
+              { color: theme14.colors.text },
+              t.skillsCreation.locationLabel,
+              " ",
+              import_react115.default.createElement(Text, { bold: true, color: theme14.colors.menuSelected }, location === "global" ? t.skillsCreation.locationGlobal : t.skillsCreation.locationProject)
+            )
+          ),
+          import_react115.default.createElement(
+            Box_default,
+            { marginTop: 1 },
+            import_react115.default.createElement(Text, { color: theme14.colors.text }, t.skillsCreation.confirmQuestion)
+          ),
+          import_react115.default.createElement(
+            Box_default,
+            { marginTop: 1, gap: 2 },
+            import_react115.default.createElement(
+              Box_default,
+              null,
+              import_react115.default.createElement(Text, { color: theme14.colors.success, bold: true }, "[Y]"),
+              import_react115.default.createElement(
+                Text,
+                { color: theme14.colors.text },
+                " ",
+                t.skillsCreation.confirmYes
+              )
+            ),
+            import_react115.default.createElement(
+              Box_default,
+              null,
+              import_react115.default.createElement(Text, { color: theme14.colors.error, bold: true }, "[N]"),
+              import_react115.default.createElement(
+                Text,
+                { color: theme14.colors.text },
+                " ",
+                t.skillsCreation.confirmNo
+              )
+            )
+          )
+        ),
+        mode === "ai" && step === "ai-requirement" && import_react115.default.createElement(
+          Box_default,
+          { flexDirection: "column" },
+          import_react115.default.createElement(
+            Box_default,
+            { marginBottom: 1 },
+            import_react115.default.createElement(Text, { color: theme14.colors.text }, t.skillsCreation.requirementLabel)
+          ),
+          import_react115.default.createElement(
+            Box_default,
+            { marginBottom: 1 },
+            import_react115.default.createElement(Text, { dimColor: true }, t.skillsCreation.requirementHint)
+          ),
+          import_react115.default.createElement(TextInput, { placeholder: t.skillsCreation.requirementPlaceholder, onSubmit: handleRequirementSubmit }),
+          import_react115.default.createElement(
+            Box_default,
+            { marginTop: 1 },
+            import_react115.default.createElement(Text, { dimColor: true }, t.skillsCreation.escCancel)
+          )
+        ),
+        mode === "ai" && step === "ai-location" && import_react115.default.createElement(
+          Box_default,
+          { flexDirection: "column" },
+          import_react115.default.createElement(
+            Box_default,
+            { marginBottom: 1 },
+            import_react115.default.createElement(
+              Text,
+              { color: theme14.colors.text },
+              t.skillsCreation.requirementLabel,
+              " ",
+              import_react115.default.createElement(Text, { color: theme14.colors.menuNormal }, requirement)
+            )
+          ),
+          import_react115.default.createElement(
+            Box_default,
+            { marginBottom: 1, marginTop: 1 },
+            import_react115.default.createElement(Text, { color: theme14.colors.text }, t.skillsCreation.locationLabel)
+          ),
+          import_react115.default.createElement(
+            Box_default,
+            { marginTop: 1, flexDirection: "column", gap: 1 },
+            import_react115.default.createElement(
+              Box_default,
+              null,
+              import_react115.default.createElement(Text, { color: theme14.colors.success, bold: true }, "[G]"),
+              import_react115.default.createElement(
+                Text,
+                { color: theme14.colors.text },
+                " ",
+                t.skillsCreation.locationGlobal
+              )
+            ),
+            import_react115.default.createElement(
+              Box_default,
+              { marginLeft: 4 },
+              import_react115.default.createElement(Text, { dimColor: true }, t.skillsCreation.locationGlobalInfo)
+            ),
+            import_react115.default.createElement(
+              Box_default,
+              { marginTop: 1 },
+              import_react115.default.createElement(Text, { color: theme14.colors.menuSelected, bold: true }, "[P]"),
+              import_react115.default.createElement(
+                Text,
+                { color: theme14.colors.text },
+                " ",
+                t.skillsCreation.locationProject
+              )
+            ),
+            import_react115.default.createElement(
+              Box_default,
+              { marginLeft: 4 },
+              import_react115.default.createElement(Text, { dimColor: true }, t.skillsCreation.locationProjectInfo)
+            )
+          ),
+          import_react115.default.createElement(
+            Box_default,
+            { marginTop: 1 },
+            import_react115.default.createElement(Text, { dimColor: true }, t.skillsCreation.escCancel)
+          )
+        ),
+        mode === "ai" && step === "ai-generating" && import_react115.default.createElement(
+          Box_default,
+          { flexDirection: "column" },
+          import_react115.default.createElement(
+            Box_default,
+            { marginBottom: 1 },
+            import_react115.default.createElement(Text, { color: theme14.colors.text }, t.skillsCreation.generatingLabel)
+          ),
+          import_react115.default.createElement(
+            Box_default,
+            null,
+            import_react115.default.createElement(
+              Text,
+              { color: theme14.colors.menuNormal },
+              import_react115.default.createElement(build_default, { type: "dots" }),
+              " ",
+              t.skillsCreation.generatingMessage
+            )
+          ),
+          import_react115.default.createElement(
+            Box_default,
+            { marginTop: 1 },
+            import_react115.default.createElement(Text, { dimColor: true }, t.skillsCreation.escCancel)
+          )
+        ),
+        mode === "ai" && step === "ai-error" && import_react115.default.createElement(
+          Box_default,
+          { flexDirection: "column" },
+          import_react115.default.createElement(
+            Box_default,
+            { marginBottom: 1 },
+            import_react115.default.createElement(Text, { color: theme14.colors.error }, t.skillsCreation.errorGeneration)
+          ),
+          errorMessage && import_react115.default.createElement(
+            Box_default,
+            { marginBottom: 1 },
+            import_react115.default.createElement(Text, { color: theme14.colors.error }, errorMessage)
+          ),
+          import_react115.default.createElement(
+            Box_default,
+            { marginTop: 1, gap: 2 },
+            import_react115.default.createElement(
+              Box_default,
+              null,
+              import_react115.default.createElement(Text, { color: theme14.colors.menuSelected, bold: true }, "[R]"),
+              import_react115.default.createElement(
+                Text,
+                { color: theme14.colors.text },
+                " ",
+                t.skillsCreation.regenerate
+              )
+            ),
+            import_react115.default.createElement(
+              Box_default,
+              null,
+              import_react115.default.createElement(Text, { color: theme14.colors.menuSecondary, dimColor: true }, "[ESC]"),
+              import_react115.default.createElement(
+                Text,
+                { color: theme14.colors.text },
+                " ",
+                t.skillsCreation.cancel
+              )
+            )
+          )
+        ),
+        mode === "ai" && step === "ai-preview" && import_react115.default.createElement(
           Box_default,
           { flexDirection: "column" },
           import_react115.default.createElement(
@@ -544123,43 +545019,74 @@ var init_SkillsCreationPanel = __esm({
           ),
           import_react115.default.createElement(
             Box_default,
-            { marginBottom: 1, marginTop: 1 },
-            import_react115.default.createElement(Text, { color: theme14.colors.text }, t.skillsCreation.locationLabel)
+            { marginBottom: 1 },
+            import_react115.default.createElement(
+              Text,
+              { color: theme14.colors.text },
+              t.skillsCreation.locationLabel,
+              " ",
+              import_react115.default.createElement(Text, { bold: true, color: theme14.colors.menuSelected }, location === "global" ? t.skillsCreation.locationGlobal : t.skillsCreation.locationProject)
+            )
           ),
           import_react115.default.createElement(
             Box_default,
-            { marginTop: 1, flexDirection: "column", gap: 1 },
+            { marginTop: 1, flexDirection: "column" },
+            import_react115.default.createElement(Text, { color: theme14.colors.text }, t.skillsCreation.filesLabel),
+            import_react115.default.createElement(
+              Box_default,
+              { marginLeft: 2, flexDirection: "column" },
+              import_react115.default.createElement(Text, { dimColor: true }, "- SKILL.md"),
+              import_react115.default.createElement(Text, { dimColor: true }, "- reference.md"),
+              import_react115.default.createElement(Text, { dimColor: true }, "- examples.md"),
+              import_react115.default.createElement(Text, { dimColor: true }, "- templates/template.txt"),
+              import_react115.default.createElement(Text, { dimColor: true }, "- scripts/helper.py")
+            )
+          ),
+          errorMessage && import_react115.default.createElement(
+            Box_default,
+            { marginTop: 1 },
+            import_react115.default.createElement(Text, { color: theme14.colors.error }, errorMessage)
+          ),
+          import_react115.default.createElement(
+            Box_default,
+            { marginTop: 1 },
+            import_react115.default.createElement(Text, { color: theme14.colors.text }, t.skillsCreation.confirmQuestion)
+          ),
+          import_react115.default.createElement(
+            Box_default,
+            { marginTop: 1, gap: 2 },
             import_react115.default.createElement(
               Box_default,
               null,
-              import_react115.default.createElement(Text, { color: theme14.colors.success, bold: true }, "[G]"),
+              import_react115.default.createElement(Text, { color: theme14.colors.success, bold: true }, "[Y]"),
               import_react115.default.createElement(
                 Text,
                 { color: theme14.colors.text },
                 " ",
-                t.skillsCreation.locationGlobal
+                t.skillsCreation.confirmYes
               )
             ),
             import_react115.default.createElement(
               Box_default,
-              { marginLeft: 4 },
-              import_react115.default.createElement(Text, { dimColor: true }, t.skillsCreation.locationGlobalInfo)
-            ),
-            import_react115.default.createElement(
-              Box_default,
-              { marginTop: 1 },
-              import_react115.default.createElement(Text, { color: theme14.colors.menuSelected, bold: true }, "[P]"),
+              null,
+              import_react115.default.createElement(Text, { color: theme14.colors.menuSelected, bold: true }, "[E]"),
               import_react115.default.createElement(
                 Text,
                 { color: theme14.colors.text },
                 " ",
-                t.skillsCreation.locationProject
+                t.skillsCreation.editName
               )
             ),
             import_react115.default.createElement(
               Box_default,
-              { marginLeft: 4 },
-              import_react115.default.createElement(Text, { dimColor: true }, t.skillsCreation.locationProjectInfo)
+              null,
+              import_react115.default.createElement(Text, { color: theme14.colors.warning, bold: true }, "[R]"),
+              import_react115.default.createElement(
+                Text,
+                { color: theme14.colors.text },
+                " ",
+                t.skillsCreation.regenerate
+              )
             )
           ),
           import_react115.default.createElement(
@@ -544168,7 +545095,7 @@ var init_SkillsCreationPanel = __esm({
             import_react115.default.createElement(Text, { dimColor: true }, t.skillsCreation.escCancel)
           )
         ),
-        step === "confirm" && import_react115.default.createElement(
+        mode === "ai" && step === "ai-edit-name" && import_react115.default.createElement(
           Box_default,
           { flexDirection: "column" },
           import_react115.default.createElement(
@@ -544177,63 +545104,26 @@ var init_SkillsCreationPanel = __esm({
             import_react115.default.createElement(
               Text,
               { color: theme14.colors.text },
-              t.skillsCreation.nameLabel,
+              t.skillsCreation.editNameLabel,
               " ",
-              import_react115.default.createElement(Text, { bold: true, color: theme14.colors.success }, skillName)
+              import_react115.default.createElement(Text, { color: theme14.colors.menuNormal }, skillName)
             )
           ),
           import_react115.default.createElement(
             Box_default,
             { marginBottom: 1 },
-            import_react115.default.createElement(
-              Text,
-              { color: theme14.colors.text },
-              t.skillsCreation.descriptionLabel,
-              " ",
-              import_react115.default.createElement(Text, { color: theme14.colors.menuNormal }, description)
-            )
+            import_react115.default.createElement(Text, { dimColor: true }, t.skillsCreation.editNameHint)
           ),
-          import_react115.default.createElement(
-            Box_default,
-            { marginBottom: 1 },
-            import_react115.default.createElement(
-              Text,
-              { color: theme14.colors.text },
-              t.skillsCreation.locationLabel,
-              " ",
-              import_react115.default.createElement(Text, { bold: true, color: theme14.colors.menuSelected }, location === "global" ? t.skillsCreation.locationGlobal : t.skillsCreation.locationProject)
-            )
-          ),
-          import_react115.default.createElement(
+          import_react115.default.createElement(TextInput, { placeholder: t.skillsCreation.editNamePlaceholder, onSubmit: handleEditNameSubmit }),
+          errorMessage && import_react115.default.createElement(
             Box_default,
             { marginTop: 1 },
-            import_react115.default.createElement(Text, { color: theme14.colors.text }, t.skillsCreation.confirmQuestion)
+            import_react115.default.createElement(Text, { color: theme14.colors.error }, errorMessage)
           ),
           import_react115.default.createElement(
             Box_default,
-            { marginTop: 1, gap: 2 },
-            import_react115.default.createElement(
-              Box_default,
-              null,
-              import_react115.default.createElement(Text, { color: theme14.colors.success, bold: true }, "[Y]"),
-              import_react115.default.createElement(
-                Text,
-                { color: theme14.colors.text },
-                " ",
-                t.skillsCreation.confirmYes
-              )
-            ),
-            import_react115.default.createElement(
-              Box_default,
-              null,
-              import_react115.default.createElement(Text, { color: theme14.colors.error, bold: true }, "[N]"),
-              import_react115.default.createElement(
-                Text,
-                { color: theme14.colors.text },
-                " ",
-                t.skillsCreation.confirmNo
-              )
-            )
+            { marginTop: 1 },
+            import_react115.default.createElement(Text, { dimColor: true }, t.skillsCreation.escCancel)
           )
         )
       );
@@ -545930,41 +546820,6 @@ var init_useToolConfirmation = __esm({
 });
 
 // dist/utils/execution/toolExecutor.js
-function fixMergedToolName(toolName) {
-  const knownPrefixes = getRegisteredServicePrefixes();
-  let foundPrefixes = [];
-  for (const prefix of knownPrefixes) {
-    let searchIndex = 0;
-    while (true) {
-      const index = toolName.indexOf(prefix, searchIndex);
-      if (index === -1)
-        break;
-      foundPrefixes.push({ prefix, index });
-      searchIndex = index + 1;
-    }
-  }
-  foundPrefixes.sort((a, b) => a.index - b.index);
-  if (foundPrefixes.length > 1) {
-    const firstPrefix = foundPrefixes[0];
-    const secondPrefix = foundPrefixes[1];
-    if (firstPrefix && secondPrefix && firstPrefix.index === 0) {
-      const firstToolName = toolName.substring(0, secondPrefix.index);
-      console.warn(`[Tool Name Fix] Detected merged tool names: "${toolName}"`);
-      console.warn(`[Tool Name Fix] Extracted first tool: "${firstToolName}"`);
-      console.warn(`[Tool Name Fix] Ignored second tool starting at: "${toolName.substring(secondPrefix.index)}"`);
-      return {
-        fixedName: firstToolName,
-        wasMerged: true,
-        originalName: toolName
-      };
-    }
-  }
-  return {
-    fixedName: toolName,
-    wasMerged: false,
-    originalName: toolName
-  };
-}
 function safeParseToolArguments(argsString) {
   if (!argsString || argsString.trim() === "") {
     return {};
@@ -546058,16 +546913,6 @@ function extractMultimodalContent(result2) {
   };
 }
 async function executeToolCall(toolCall, abortSignal, onTokenUpdate, onSubAgentMessage, requestToolConfirmation, isToolAutoApproved, yoloMode, addToAlwaysApproved, onUserInteractionNeeded) {
-  const toolNameFix = fixMergedToolName(toolCall.function.name);
-  if (toolNameFix.wasMerged) {
-    toolCall = {
-      ...toolCall,
-      function: {
-        ...toolCall.function,
-        name: toolNameFix.fixedName
-      }
-    };
-  }
   let result2;
   let executionError = null;
   let escKeyListener;
@@ -548248,7 +549093,10 @@ async function handleConversationWithTools(options3) {
               if (subAgentMessage.message.type === "tool_calls") {
                 const toolCalls = subAgentMessage.message.tool_calls;
                 if (toolCalls && toolCalls.length > 0) {
-                  const toolMessages = toolCalls.filter((toolCall) => isToolNeedTwoStepDisplay(toolCall.function.name)).map((toolCall) => {
+                  const timeConsumingTools = toolCalls.filter((tc) => isToolNeedTwoStepDisplay(tc.function.name));
+                  const quickTools = toolCalls.filter((tc) => !isToolNeedTwoStepDisplay(tc.function.name));
+                  const newMessages = [];
+                  for (const toolCall of timeConsumingTools) {
                     const toolDisplay = formatToolCallMessage(toolCall);
                     let toolArgs;
                     try {
@@ -548264,7 +549112,6 @@ async function handleConversationWithTools(options3) {
                         name: toolCall.function.name,
                         arguments: toolArgs
                       },
-                      // Don't include toolDisplay for sub-agent tools to avoid showing parameters
                       toolCallId: toolCall.id,
                       toolPending: true,
                       subAgent: {
@@ -548273,109 +549120,176 @@ async function handleConversationWithTools(options3) {
                         isComplete: false
                       },
                       subAgentInternal: true
-                      // Mark as internal sub-agent message
                     };
-                    return uiMsg;
-                  });
+                    newMessages.push(uiMsg);
+                  }
+                  if (quickTools.length > 0) {
+                    const toolLines = quickTools.map((tc, index) => {
+                      const display = formatToolCallMessage(tc);
+                      const isLast = index === quickTools.length - 1;
+                      const prefix = isLast ? "\u2514\u2500" : "\u251C\u2500";
+                      const params = display.args.map((arg) => `${arg.key}: ${arg.value}`).join(", ");
+                      return `
+  \x1B[2m${prefix} ${display.toolName}${params ? ` (${params})` : ""}\x1B[0m`;
+                    });
+                    const uiMsg = {
+                      role: "subagent",
+                      content: `\x1B[38;2;184;122;206m\u2687 ${subAgentMessage.agentName}${toolLines.join("")}\x1B[0m`,
+                      streaming: false,
+                      subAgent: {
+                        agentId: subAgentMessage.agentId,
+                        agentName: subAgentMessage.agentName,
+                        isComplete: false
+                      },
+                      subAgentInternal: true,
+                      // Store pending tool call IDs for later status update
+                      pendingToolIds: quickTools.map((tc) => tc.id)
+                    };
+                    newMessages.push(uiMsg);
+                  }
                   const sessionMsg = {
                     role: "assistant",
                     content: toolCalls.map((tc) => {
                       const display = formatToolCallMessage(tc);
-                      return `\u2687\u26A1 ${display.toolName}`;
+                      return isToolNeedTwoStepDisplay(tc.function.name) ? `\u2687\u26A1 ${display.toolName}` : `\u2687 ${display.toolName}`;
                     }).join(", "),
                     subAgentInternal: true,
                     tool_calls: toolCalls
                   };
                   saveMessage(sessionMsg).catch((err) => console.error("Failed to save sub-agent tool call:", err));
-                  return [...prev, ...toolMessages];
+                  return [...prev, ...newMessages];
                 }
               }
               if (subAgentMessage.message.type === "tool_result") {
                 const msg = subAgentMessage.message;
                 const isError2 = msg.content.startsWith("Error:");
-                const statusIcon = isError2 ? "\u2717" : "\u2713";
-                const statusText = isError2 ? `
+                const isTimeConsumingTool = isToolNeedTwoStepDisplay(msg.tool_name);
+                const sessionMsg = {
+                  role: "tool",
+                  tool_call_id: msg.tool_call_id,
+                  content: msg.content,
+                  subAgentInternal: true
+                };
+                saveMessage(sessionMsg).catch((err) => console.error("Failed to save sub-agent tool result:", err));
+                if (isTimeConsumingTool) {
+                  const statusIcon = isError2 ? "\u2717" : "\u2713";
+                  const statusText = isError2 ? `
   \u2514\u2500 ${msg.content}` : "";
-                let terminalResultData;
-                if (msg.tool_name === "terminal-execute" && !isError2) {
-                  try {
-                    const resultData = JSON.parse(msg.content);
-                    if (resultData.stdout !== void 0 || resultData.stderr !== void 0) {
-                      terminalResultData = {
-                        stdout: resultData.stdout,
-                        stderr: resultData.stderr,
-                        exitCode: resultData.exitCode,
-                        command: resultData.command
-                      };
+                  let terminalResultData;
+                  if (msg.tool_name === "terminal-execute" && !isError2) {
+                    try {
+                      const resultData = JSON.parse(msg.content);
+                      if (resultData.stdout !== void 0 || resultData.stderr !== void 0) {
+                        terminalResultData = {
+                          stdout: resultData.stdout,
+                          stderr: resultData.stderr,
+                          exitCode: resultData.exitCode,
+                          command: resultData.command
+                        };
+                      }
+                    } catch (e) {
+                    }
+                  }
+                  let fileToolData = void 0;
+                  if (!isError2 && (msg.tool_name === "filesystem-create" || msg.tool_name === "filesystem-edit" || msg.tool_name === "filesystem-edit_search")) {
+                    try {
+                      const resultData = JSON.parse(msg.content);
+                      if (resultData.content) {
+                        fileToolData = {
+                          name: msg.tool_name,
+                          arguments: {
+                            content: resultData.content,
+                            path: resultData.path || resultData.filename
+                          }
+                        };
+                      } else if (resultData.oldContent && resultData.newContent) {
+                        fileToolData = {
+                          name: msg.tool_name,
+                          arguments: {
+                            oldContent: resultData.oldContent,
+                            newContent: resultData.newContent,
+                            filename: resultData.path || resultData.filename,
+                            completeOldContent: resultData.completeOldContent,
+                            completeNewContent: resultData.completeNewContent,
+                            contextStartLine: resultData.contextStartLine
+                          }
+                        };
+                      } else if (resultData.batchResults && Array.isArray(resultData.batchResults)) {
+                        fileToolData = {
+                          name: msg.tool_name,
+                          arguments: {
+                            isBatch: true,
+                            batchResults: resultData.batchResults
+                          }
+                        };
+                      }
+                    } catch (e) {
                     }
-                  } catch (e) {
                   }
+                  const uiMsg = {
+                    role: "subagent",
+                    content: `\x1B[38;2;0;186;255m\u2687${statusIcon} ${msg.tool_name}\x1B[0m${statusText}`,
+                    streaming: false,
+                    toolResult: !isError2 ? msg.content : void 0,
+                    terminalResult: terminalResultData,
+                    toolCall: terminalResultData ? {
+                      name: msg.tool_name,
+                      arguments: terminalResultData
+                    } : fileToolData ? fileToolData : void 0,
+                    subAgent: {
+                      agentId: subAgentMessage.agentId,
+                      agentName: subAgentMessage.agentName,
+                      isComplete: false
+                    },
+                    subAgentInternal: true
+                  };
+                  return [...prev, uiMsg];
                 }
-                let fileToolData = void 0;
-                if (!isError2 && (msg.tool_name === "filesystem-create" || msg.tool_name === "filesystem-edit" || msg.tool_name === "filesystem-edit_search")) {
-                  try {
-                    const resultData = JSON.parse(msg.content);
-                    if (resultData.content) {
-                      fileToolData = {
-                        name: msg.tool_name,
-                        arguments: {
-                          content: resultData.content,
-                          path: resultData.path || resultData.filename
-                        }
-                      };
-                    } else if (resultData.oldContent && resultData.newContent) {
-                      fileToolData = {
-                        name: msg.tool_name,
-                        arguments: {
-                          oldContent: resultData.oldContent,
-                          newContent: resultData.newContent,
-                          filename: resultData.path || resultData.filename,
-                          completeOldContent: resultData.completeOldContent,
-                          completeNewContent: resultData.completeNewContent,
-                          contextStartLine: resultData.contextStartLine
-                        }
+                if (isError2) {
+                  const statusText = `
+  \u2514\u2500 ${msg.content}`;
+                  const uiMsg = {
+                    role: "subagent",
+                    content: `\x1B[38;2;255;100;100m\u2687\u2717 ${msg.tool_name}\x1B[0m${statusText}`,
+                    streaming: false,
+                    subAgent: {
+                      agentId: subAgentMessage.agentId,
+                      agentName: subAgentMessage.agentName,
+                      isComplete: false
+                    },
+                    subAgentInternal: true
+                  };
+                  return [...prev, uiMsg];
+                }
+                const pendingMsgIndex = prev.findIndex((m) => {
+                  var _a22, _b14, _c6;
+                  return m.role === "subagent" && ((_a22 = m.subAgent) == null ? void 0 : _a22.agentId) === subAgentMessage.agentId && !((_b14 = m.subAgent) == null ? void 0 : _b14.isComplete) && ((_c6 = m.pendingToolIds) == null ? void 0 : _c6.includes(msg.tool_call_id));
+                });
+                if (pendingMsgIndex !== -1) {
+                  const updated = [...prev];
+                  const pendingMsg = updated[pendingMsgIndex];
+                  if (pendingMsg && pendingMsg.pendingToolIds) {
+                    const newPendingIds = pendingMsg.pendingToolIds.filter((id) => id !== msg.tool_call_id);
+                    if (newPendingIds.length === 0) {
+                      updated[pendingMsgIndex] = {
+                        ...pendingMsg,
+                        content: `${pendingMsg.content} \x1B[38;2;100;200;100m\u2713\x1B[0m`,
+                        pendingToolIds: newPendingIds
                       };
-                    } else if (resultData.batchResults && Array.isArray(resultData.batchResults)) {
-                      fileToolData = {
-                        name: msg.tool_name,
-                        arguments: {
-                          isBatch: true,
-                          batchResults: resultData.batchResults
-                        }
+                    } else {
+                      updated[pendingMsgIndex] = {
+                        ...pendingMsg,
+                        pendingToolIds: newPendingIds
                       };
                     }
-                  } catch (e) {
                   }
+                  return updated;
                 }
-                const uiMsg = {
-                  role: "subagent",
-                  content: `\x1B[38;2;0;186;255m\u2687${statusIcon} ${msg.tool_name}\x1B[0m${statusText}`,
-                  streaming: false,
-                  toolResult: !isError2 ? msg.content : void 0,
-                  terminalResult: terminalResultData,
-                  toolCall: terminalResultData ? {
-                    name: msg.tool_name,
-                    arguments: terminalResultData
-                  } : fileToolData ? fileToolData : void 0,
-                  subAgent: {
-                    agentId: subAgentMessage.agentId,
-                    agentName: subAgentMessage.agentName,
-                    isComplete: false
-                  },
-                  subAgentInternal: true
-                };
-                const sessionMsg = {
-                  role: "tool",
-                  tool_call_id: msg.tool_call_id,
-                  content: msg.content,
-                  subAgentInternal: true
-                };
-                saveMessage(sessionMsg).catch((err) => console.error("Failed to save sub-agent tool result:", err));
-                return [...prev, uiMsg];
+                return prev;
               }
               const existingIndex = prev.findIndex((m) => {
                 var _a22, _b14;
-                return m.role === "subagent" && ((_a22 = m.subAgent) == null ? void 0 : _a22.agentId) === subAgentMessage.agentId && !((_b14 = m.subAgent) == null ? void 0 : _b14.isComplete) && !m.toolCall;
+                return m.role === "subagent" && ((_a22 = m.subAgent) == null ? void 0 : _a22.agentId) === subAgentMessage.agentId && !((_b14 = m.subAgent) == null ? void 0 : _b14.isComplete) && !m.pendingToolIds;
               });
               let content = "";
               if (subAgentMessage.message.type === "content") {
@@ -548867,43 +549781,64 @@ function convertSessionMessagesToUI(sessionMessages) {
     const msg = sessionMessages[i];
     if (!msg)
       continue;
-    if (msg.role === "system")
-      continue;
     if (msg.subAgentInternal && msg.role === "assistant" && msg.tool_calls) {
-      for (const toolCall of msg.tool_calls) {
-        if (isToolNeedTwoStepDisplay(toolCall.function.name)) {
-          const toolDisplay = formatToolCallMessage(toolCall);
-          let toolArgs;
-          try {
-            toolArgs = JSON.parse(toolCall.function.arguments);
-          } catch (e) {
-            toolArgs = {};
-          }
-          uiMessages.push({
-            role: "subagent",
-            content: `\x1B[38;2;184;122;206m\u2687\u26A1 ${toolDisplay.toolName}\x1B[0m`,
-            streaming: false,
-            toolCall: {
-              name: toolCall.function.name,
-              arguments: toolArgs
-            },
-            // Don't include toolDisplay for sub-agent tools to avoid showing parameters
-            toolCallId: toolCall.id,
-            toolPending: false,
-            subAgentInternal: true
-          });
+      const timeConsumingTools = msg.tool_calls.filter((tc) => isToolNeedTwoStepDisplay(tc.function.name));
+      const quickTools = msg.tool_calls.filter((tc) => !isToolNeedTwoStepDisplay(tc.function.name));
+      for (const toolCall of timeConsumingTools) {
+        const toolDisplay = formatToolCallMessage(toolCall);
+        let toolArgs;
+        try {
+          toolArgs = JSON.parse(toolCall.function.arguments);
+        } catch (e) {
+          toolArgs = {};
         }
+        uiMessages.push({
+          role: "subagent",
+          content: `\x1B[38;2;184;122;206m\u2687\u26A1 ${toolDisplay.toolName}\x1B[0m`,
+          streaming: false,
+          toolCall: {
+            name: toolCall.function.name,
+            arguments: toolArgs
+          },
+          toolCallId: toolCall.id,
+          toolPending: false,
+          subAgentInternal: true
+        });
         processedToolCalls.add(toolCall.id);
       }
+      if (quickTools.length > 0) {
+        let agentName = "Sub-Agent";
+        for (let j = i + 1; j < sessionMessages.length; j++) {
+          const nextMsg = sessionMessages[j];
+          if (nextMsg && nextMsg.subAgentInternal && nextMsg.role === "tool") {
+            break;
+          }
+        }
+        const toolLines = quickTools.map((tc, index) => {
+          const display = formatToolCallMessage(tc);
+          const isLast = index === quickTools.length - 1;
+          const prefix = isLast ? "\u2514\u2500" : "\u251C\u2500";
+          const params = display.args.map((arg) => `${arg.key}: ${arg.value}`).join(", ");
+          return `
+  \x1B[2m${prefix} ${display.toolName}${params ? ` (${params})` : ""}\x1B[0m`;
+        });
+        uiMessages.push({
+          role: "subagent",
+          content: `\x1B[38;2;184;122;206m\u2687 ${agentName}${toolLines.join("")}\x1B[0m`,
+          streaming: false,
+          subAgentInternal: true,
+          pendingToolIds: quickTools.map((tc) => tc.id)
+        });
+        for (const tc of quickTools) {
+          processedToolCalls.add(tc.id);
+        }
+      }
       continue;
     }
     if (msg.subAgentInternal && msg.role === "tool" && msg.tool_call_id) {
       const isError2 = msg.content.startsWith("Error:");
-      const statusIcon = isError2 ? "\u2717" : "\u2713";
-      const statusText = isError2 ? `
-  \u2514\u2500 ${msg.content}` : "";
       let toolName = "tool";
-      let terminalResultData;
+      let isTimeConsumingTool = false;
       for (let j = i - 1; j >= 0; j--) {
         const prevMsg = sessionMessages[j];
         if (!prevMsg)
@@ -548912,36 +549847,90 @@ function convertSessionMessagesToUI(sessionMessages) {
           const tc = prevMsg.tool_calls.find((t) => t.id === msg.tool_call_id);
           if (tc) {
             toolName = tc.function.name;
-            if (toolName === "terminal-execute" && !isError2) {
-              try {
-                const resultData = JSON.parse(msg.content);
-                if (resultData.stdout !== void 0 || resultData.stderr !== void 0) {
-                  terminalResultData = {
-                    stdout: resultData.stdout,
-                    stderr: resultData.stderr,
-                    exitCode: resultData.exitCode,
-                    command: resultData.command
-                  };
+            isTimeConsumingTool = isToolNeedTwoStepDisplay(toolName);
+            break;
+          }
+        }
+      }
+      if (isTimeConsumingTool) {
+        const statusIcon = isError2 ? "\u2717" : "\u2713";
+        const statusText = isError2 ? `
+  \u2514\u2500 ${msg.content}` : "";
+        let terminalResultData;
+        if (toolName === "terminal-execute" && !isError2) {
+          try {
+            const resultData = JSON.parse(msg.content);
+            if (resultData.stdout !== void 0 || resultData.stderr !== void 0) {
+              terminalResultData = {
+                stdout: resultData.stdout,
+                stderr: resultData.stderr,
+                exitCode: resultData.exitCode,
+                command: resultData.command
+              };
+            }
+          } catch (e) {
+          }
+        }
+        let fileToolData = void 0;
+        if (!isError2 && (toolName === "filesystem-create" || toolName === "filesystem-edit" || toolName === "filesystem-edit_search")) {
+          try {
+            const resultData = JSON.parse(msg.content);
+            if (resultData.content) {
+              fileToolData = {
+                name: toolName,
+                arguments: {
+                  content: resultData.content,
+                  path: resultData.path || resultData.filename
                 }
-              } catch (e) {
-              }
+              };
+            } else if (resultData.oldContent && resultData.newContent) {
+              fileToolData = {
+                name: toolName,
+                arguments: {
+                  oldContent: resultData.oldContent,
+                  newContent: resultData.newContent,
+                  filename: resultData.path || resultData.filename,
+                  completeOldContent: resultData.completeOldContent,
+                  completeNewContent: resultData.completeNewContent,
+                  contextStartLine: resultData.contextStartLine
+                }
+              };
+            } else if (resultData.batchResults && Array.isArray(resultData.batchResults)) {
+              fileToolData = {
+                name: toolName,
+                arguments: {
+                  isBatch: true,
+                  batchResults: resultData.batchResults
+                }
+              };
             }
-            break;
+          } catch (e) {
           }
         }
+        uiMessages.push({
+          role: "subagent",
+          content: `\x1B[38;2;0;186;255m\u2687${statusIcon} ${toolName}\x1B[0m${statusText}`,
+          streaming: false,
+          toolResult: !isError2 ? msg.content : void 0,
+          terminalResult: terminalResultData,
+          toolCall: terminalResultData ? {
+            name: toolName,
+            arguments: terminalResultData
+          } : fileToolData ? fileToolData : void 0,
+          subAgentInternal: true
+        });
+      } else {
+        if (isError2) {
+          const statusText = `
+  \u2514\u2500 ${msg.content}`;
+          uiMessages.push({
+            role: "subagent",
+            content: `\x1B[38;2;255;100;100m\u2687\u2717 ${toolName}\x1B[0m${statusText}`,
+            streaming: false,
+            subAgentInternal: true
+          });
+        }
       }
-      uiMessages.push({
-        role: "subagent",
-        content: `\x1B[38;2;0;186;255m\u2687${statusIcon} ${toolName}\x1B[0m${statusText}`,
-        streaming: false,
-        toolResult: !isError2 ? msg.content : void 0,
-        terminalResult: terminalResultData,
-        toolCall: terminalResultData ? {
-          name: toolName,
-          arguments: terminalResultData
-        } : void 0,
-        subAgentInternal: true
-      });
       continue;
     }
     if (msg.role === "assistant" && msg.tool_calls && msg.tool_calls.length > 0 && !msg.subAgentInternal) {
@@ -551371,9 +552360,9 @@ var init_handler = __esm({
         if (this.fsw.closed) {
           return;
         }
-        const dirname10 = sysPath.dirname(file);
+        const dirname11 = sysPath.dirname(file);
         const basename6 = sysPath.basename(file);
-        const parent = this.fsw._getWatchedDir(dirname10);
+        const parent = this.fsw._getWatchedDir(dirname11);
         let prevStats = stats;
         if (parent.has(basename6))
           return;
@@ -551400,7 +552389,7 @@ var init_handler = __esm({
                 prevStats = newStats2;
               }
             } catch (error) {
-              this.fsw._remove(dirname10, basename6);
+              this.fsw._remove(dirname11, basename6);
             }
           } else if (parent.has(basename6)) {
             const at = newStats.atimeMs;
@@ -551645,11 +552634,11 @@ function createPattern(matcher2) {
       if (matcher2.path === string)
         return true;
       if (matcher2.recursive) {
-        const relative8 = sysPath2.relative(matcher2.path, string);
-        if (!relative8) {
+        const relative9 = sysPath2.relative(matcher2.path, string);
+        if (!relative9) {
           return false;
         }
-        return !relative8.startsWith("..") && !sysPath2.isAbsolute(relative8);
+        return !relative9.startsWith("..") && !sysPath2.isAbsolute(relative9);
       }
       return false;
     };
@@ -554067,43 +555056,34 @@ function ChatScreen({ autoResume, enableYolo }) {
       await saveCustomCommand(name, command, type, void 0, location, workingDirectory);
       await registerCustomCommands(workingDirectory);
       panelState.setShowCustomCommandConfig(false);
-      const typeDesc = type === "execute" ? "Execute in terminal" : "Send to AI";
-      const locationDesc = location === "global" ? "Global (~/.snow/commands/)" : "Project (.snow/commands/)";
+      const typeDesc = type === "execute" ? t.customCommand.resultTypeExecute : t.customCommand.resultTypePrompt;
+      const locationDesc = location === "global" ? t.customCommand.resultLocationGlobal : t.customCommand.resultLocationProject;
+      const content = t.customCommand.saveSuccessMessage.replace("{name}", name).replace("{type}", typeDesc).replace("{location}", locationDesc);
       const successMessage = {
         role: "command",
-        content: `Custom command '${name}' saved successfully!
-Type: ${typeDesc}
-Location: ${locationDesc}
-You can now use /${name}`,
+        content,
         commandName: "custom"
       };
       setMessages((prev) => [...prev, successMessage]);
-    }, onSkillsSave: async (skillName, description, location) => {
-      const result2 = await createSkillTemplate(skillName, description, location, workingDirectory);
+    }, onSkillsSave: async (skillName, description, location, generated) => {
+      const result2 = generated ? await createSkillFromGenerated(skillName, description, generated, location, workingDirectory) : await createSkillTemplate(skillName, description, location, workingDirectory);
       panelState.setShowSkillsCreation(false);
       if (result2.success) {
-        const locationDesc = location === "global" ? "Global (~/.snow/skills/)" : "Project (.snow/skills/)";
+        const locationDesc = location === "global" ? t.skillsCreation.locationGlobal : t.skillsCreation.locationProject;
+        const modeDesc = generated ? t.skillsCreation.resultModeAi : t.skillsCreation.resultModeManual;
+        const content = t.skillsCreation.createSuccessMessage.replace("{name}", skillName).replace("{mode}", modeDesc).replace("{location}", locationDesc).replace("{path}", result2.path);
         const successMessage = {
           role: "command",
-          content: `Skill '${skillName}' created successfully!
-Location: ${locationDesc}
-Path: ${result2.path}
-
-The following files have been created:
-- SKILL.md (main skill documentation)
-- reference.md (detailed reference)
-- examples.md (usage examples)
-- templates/template.txt (template file)
-- scripts/helper.py (helper script)
-
-You can now edit these files to customize your skill.`,
+          content,
           commandName: "skills"
         };
         setMessages((prev) => [...prev, successMessage]);
       } else {
+        const errorText = result2.error || t.skillsCreation.errorUnknown;
+        const content = t.skillsCreation.createErrorMessage.replace("{error}", errorText);
         const errorMessage = {
           role: "command",
-          content: `Failed to create skill: ${result2.error}`,
+          content,
           commandName: "skills"
         };
         setMessages((prev) => [...prev, errorMessage]);