opencodekit 0.6.6 → 0.7.0

package/dist/index.js

@@ -750,7 +750,7 @@ var cac = (name = "") => new CAC(name);
 // package.json
 var package_default = {
   name: "opencodekit",
-  version: "0.6.6",
+  version: "0.7.0",
   description: "CLI tool for bootstrapping and managing OpenCodeKit projects",
   type: "module",
   repository: {
@@ -785,6 +785,7 @@ var package_default = {
   dependencies: {
     "@clack/prompts": "^0.7.0",
     "@opencode-ai/plugin": "^1.0.141",
+    "beads-village": "^1.3.3",
     cac: "^6.7.14",
     "cli-table3": "^0.6.5",
     ora: "^9.0.0",
@@ -801,16 +802,16 @@ var package_default = {
   trustedDependencies: ["@beads/bd"]
 };
 
-// src/commands/init.ts
+// src/commands/agent.ts
 import {
   existsSync,
+  lstatSync,
   mkdirSync,
   readFileSync,
-  writeFileSync,
-  readdirSync
+  readdirSync,
+  writeFileSync
 } from "node:fs";
-import { join, dirname, basename } from "node:path";
-import { fileURLToPath } from "node:url";
+import { join } from "node:path";
 
 // node_modules/@clack/core/dist/index.mjs
 var import_sisteransi = __toESM(require_src(), 1);
@@ -1404,149 +1405,16 @@ function me() {
   return new RegExp(r2, "g");
 }
 
-// src/commands/init.ts
-var import_picocolors3 = __toESM(require_picocolors(), 1);
-var EXCLUDED_DIRS = [
-  "node_modules",
-  ".git",
-  "dist",
-  ".DS_Store",
-  "coverage",
-  ".next",
-  ".turbo"
-];
-var EXCLUDED_FILES = [
-  "bun.lock",
-  "package-lock.json",
-  "yarn.lock",
-  "pnpm-lock.yaml"
-];
-function detectMode(targetDir) {
-  const opencodeDir = join(targetDir, ".opencode");
-  if (existsSync(opencodeDir)) {
-    return "already-initialized";
-  }
-  if (existsSync(targetDir)) {
-    const entries = readdirSync(targetDir);
-    const hasCode = entries.some((e2) => !e2.startsWith(".") && !EXCLUDED_DIRS.includes(e2) && e2 !== "node_modules");
-    if (hasCode) {
-      return "add-config";
-    }
-  }
-  return "scaffold";
-}
-function getTemplateRoot() {
-  const __filename2 = fileURLToPath(import.meta.url);
-  const __dirname2 = dirname(__filename2);
-  const possiblePaths = [
-    join(__dirname2, "template"),
-    join(__dirname2, "..", "..", ".opencode")
-  ];
-  for (const path of possiblePaths) {
-    const opencodeDir = join(path, ".opencode");
-    if (existsSync(opencodeDir)) {
-      return path;
-    }
-  }
-  return null;
-}
-async function copyDir(src, dest) {
-  const { mkdir, readdir } = await import("node:fs/promises");
-  await mkdir(dest, { recursive: true });
-  for (const entry of await readdir(src, { withFileTypes: true })) {
-    if (EXCLUDED_DIRS.includes(entry.name))
-      continue;
-    if (!entry.isDirectory() && EXCLUDED_FILES.includes(entry.name))
-      continue;
-    const srcPath = join(src, entry.name);
-    const destPath = join(dest, entry.name);
-    if (entry.isSymbolicLink()) {
-      continue;
-    } else if (entry.isDirectory()) {
-      await copyDir(srcPath, destPath);
-    } else {
-      const content = readFileSync(srcPath, "utf-8");
-      writeFileSync(destPath, content);
-    }
-  }
-}
-async function copyOpenCodeOnly(templateRoot, targetDir) {
-  const opencodeSrc = join(templateRoot, ".opencode");
-  const opencodeDest = join(targetDir, ".opencode");
-  if (!existsSync(opencodeSrc)) {
-    return false;
-  }
-  await copyDir(opencodeSrc, opencodeDest);
-  return true;
-}
-async function initCommand(options = {}) {
-  const targetDir = process.cwd();
-  const mode = detectMode(targetDir);
-  oe(import_picocolors3.default.bgCyan(import_picocolors3.default.black(" OpenCodeKit ")));
-  if (mode === "already-initialized" && !options.force) {
-    f2.warn("Already initialized (.opencode/ exists)");
-    f2.info(`Use ${import_picocolors3.default.cyan("--force")} to reinitialize`);
-    $e("Nothing to do");
-    return;
-  }
-  const templateRoot = getTemplateRoot();
-  if (!templateRoot) {
-    f2.error("Template not found. Please reinstall opencodekit.");
-    $e(import_picocolors3.default.red("Failed"));
-    process.exit(1);
-  }
-  let projectName = basename(targetDir);
-  if (mode === "scaffold") {
-    const name = await te({
-      message: "Project name",
-      placeholder: projectName,
-      defaultValue: projectName
-    });
-    if (lD(name)) {
-      ue("Cancelled");
-      process.exit(0);
-    }
-    projectName = name || projectName;
-  }
-  const s = de();
-  if (mode === "scaffold") {
-    s.start("Scaffolding project");
-    mkdirSync(targetDir, { recursive: true });
-  } else if (mode === "add-config") {
-    s.start("Adding OpenCodeKit");
-  } else {
-    s.start("Reinitializing");
-  }
-  const success = await copyOpenCodeOnly(templateRoot, targetDir);
-  if (!success) {
-    s.stop("Failed");
-    $e(import_picocolors3.default.red("Template copy failed"));
-    process.exit(1);
-  }
-  s.stop("Done");
-  le(`cd .opencode && bun install`, "Next steps");
-  $e(import_picocolors3.default.green("Ready to code!"));
-}
-
 // src/commands/agent.ts
-import {
-  existsSync as existsSync2,
-  lstatSync,
-  mkdirSync as mkdirSync2,
-  readFileSync as readFileSync2,
-  readdirSync as readdirSync2,
-  writeFileSync as writeFileSync2
-} from "node:fs";
-import { join as join2 } from "node:path";
-var import_picocolors5 = __toESM(require_picocolors(), 1);
+var import_picocolors4 = __toESM(require_picocolors(), 1);
 
 // src/utils/errors.ts
-var import_picocolors4 = __toESM(require_picocolors(), 1);
+var import_picocolors3 = __toESM(require_picocolors(), 1);
 function showError(message, fix) {
   console.log();
-  f2.error(import_picocolors4.default.red("✗") + " " + message);
+  f2.error(import_picocolors3.default.red("✗") + " " + message);
   if (fix) {
-    f2.info("  " + import_picocolors4.default.dim("→ " + fix));
+    f2.info("  " + import_picocolors3.default.dim("→ " + fix));
   }
   console.log();
 }
@@ -1561,18 +1429,18 @@ function alreadyExists(resource, name) {
   showError(`${resource} "${name}" already exists`);
 }
 function unknownAction(action, available) {
-  showError(`Unknown action: ${action}`, `Available: ${available.map((a3) => import_picocolors4.default.cyan(a3)).join(", ")}`);
+  showError(`Unknown action: ${action}`, `Available: ${available.map((a3) => import_picocolors3.default.cyan(a3)).join(", ")}`);
 }
 function showWarning(message, suggestion) {
-  f2.warn(import_picocolors4.default.yellow("!") + " " + message);
+  f2.warn(import_picocolors3.default.yellow("!") + " " + message);
   if (suggestion) {
-    f2.info("  " + import_picocolors4.default.dim("→ " + suggestion));
+    f2.info("  " + import_picocolors3.default.dim("→ " + suggestion));
   }
 }
 function showEmpty(resource, createCmd) {
-  f2.info(import_picocolors4.default.dim(`No ${resource} found`));
+  f2.info(import_picocolors3.default.dim(`No ${resource} found`));
   if (createCmd) {
-    f2.info(import_picocolors4.default.dim(`→ Run: ${import_picocolors4.default.cyan(createCmd)}`));
+    f2.info(import_picocolors3.default.dim(`→ Run: ${import_picocolors3.default.cyan(createCmd)}`));
   }
 }
 
@@ -1590,12 +1458,12 @@ Describe what this agent does.
 Provide specific instructions for this agent.
 `;
 async function agentCommand(action) {
-  const opencodePath = join2(process.cwd(), ".opencode");
-  if (!existsSync2(opencodePath)) {
+  const opencodePath = join(process.cwd(), ".opencode");
+  if (!existsSync(opencodePath)) {
     notInitialized();
     return;
   }
-  const agentPath = join2(opencodePath, "agent");
+  const agentPath = join(opencodePath, "agent");
   switch (action) {
     case "list":
       await listAgents(agentPath);
@@ -1613,37 +1481,37 @@ async function agentCommand(action) {
   }
 }
 async function listAgents(agentPath) {
-  if (!existsSync2(agentPath)) {
+  if (!existsSync(agentPath)) {
     showEmpty("agents", "ock agent add");
     return;
   }
-  const opencodePath = join2(process.cwd(), ".opencode");
-  const configPath = join2(opencodePath, "opencode.json");
+  const opencodePath = join(process.cwd(), ".opencode");
+  const configPath = join(opencodePath, "opencode.json");
   let agentConfigs = {};
-  if (existsSync2(configPath)) {
+  if (existsSync(configPath)) {
     try {
-      const configContent = readFileSync2(configPath, "utf-8");
+      const configContent = readFileSync(configPath, "utf-8");
       const config = JSON.parse(configContent);
       agentConfigs = config.agent || {};
     } catch {}
   }
-  const entries = readdirSync2(agentPath);
+  const entries = readdirSync(agentPath);
   const agents = entries.filter((entry) => {
-    const entryPath = join2(agentPath, entry);
+    const entryPath = join(agentPath, entry);
     return lstatSync(entryPath).isFile() && entry.endsWith(".md");
   }).map((file) => file.replace(".md", ""));
   if (agents.length === 0) {
     showEmpty("agents", "ock agent add");
     return;
   }
-  f2.info(import_picocolors5.default.bold("Agents"));
+  f2.info(import_picocolors4.default.bold("Agents"));
   for (const agent of agents) {
     let model = agentConfigs[agent]?.model;
     const disabled = agentConfigs[agent]?.disable;
     if (!model) {
-      const agentFile = join2(agentPath, `${agent}.md`);
+      const agentFile = join(agentPath, `${agent}.md`);
       try {
-        const content = readFileSync2(agentFile, "utf-8");
+        const content = readFileSync(agentFile, "utf-8");
         const frontmatterMatch = content.match(/^---\n([\s\S]*?)\n---/);
         if (frontmatterMatch) {
           const modelMatch = frontmatterMatch[1].match(/^model:\s*(.+)$/m);
@@ -1653,13 +1521,13 @@ async function listAgents(agentPath) {
         }
       } catch {}
     }
-    const modelDisplay = model ? import_picocolors5.default.dim(` → ${model}`) : import_picocolors5.default.dim(" → (default)");
-    const disabledDisplay = disabled ? import_picocolors5.default.red(" [disabled]") : "";
-    console.log(`  ${import_picocolors5.default.cyan("•")} ${agent}${modelDisplay}${disabledDisplay}`);
+    const modelDisplay = model ? import_picocolors4.default.dim(` → ${model}`) : import_picocolors4.default.dim(" → (default)");
+    const disabledDisplay = disabled ? import_picocolors4.default.red(" [disabled]") : "";
+    console.log(`  ${import_picocolors4.default.cyan("•")} ${agent}${modelDisplay}${disabledDisplay}`);
   }
 }
 async function addAgent(agentPath) {
-  oe(import_picocolors5.default.bgMagenta(import_picocolors5.default.black(" Add Agent ")));
+  oe(import_picocolors4.default.bgMagenta(import_picocolors4.default.black(" Add Agent ")));
   const name = await te({
     message: "Agent name",
     placeholder: "e.g. reviewer, planner, researcher",
@@ -1686,18 +1554,18 @@ async function addAgent(agentPath) {
     ue("Cancelled");
     return;
   }
-  if (!existsSync2(agentPath)) {
-    mkdirSync2(agentPath, { recursive: true });
+  if (!existsSync(agentPath)) {
+    mkdirSync(agentPath, { recursive: true });
   }
-  const agentFile = join2(agentPath, `${name}.md`);
-  if (existsSync2(agentFile)) {
+  const agentFile = join(agentPath, `${name}.md`);
+  if (existsSync(agentFile)) {
     alreadyExists("Agent", String(name));
-    $e(import_picocolors5.default.red("Failed"));
+    $e(import_picocolors4.default.red("Failed"));
     return;
   }
   const content = AGENT_TEMPLATE.replace("{{NAME}}", String(name).charAt(0).toUpperCase() + String(name).slice(1));
-  writeFileSync2(agentFile, content);
-  f2.success(`Created ${import_picocolors5.default.cyan(`.opencode/agent/${name}.md`)}`);
+  writeFileSync(agentFile, content);
+  f2.success(`Created ${import_picocolors4.default.cyan(`.opencode/agent/${name}.md`)}`);
   if (agentType === "primary") {
     le(`Add to opencode.json:
 
@@ -1708,17 +1576,17 @@ async function addAgent(agentPath) {
   }
 }`, "Next step");
   }
-  $e(import_picocolors5.default.green("Done! Edit the file to customize."));
+  $e(import_picocolors4.default.green("Done! Edit the file to customize."));
 }
 async function viewAgent(agentPath, agentName) {
   if (!agentName) {
-    if (!existsSync2(agentPath)) {
+    if (!existsSync(agentPath)) {
       showEmpty("agents", "ock agent add");
       return;
     }
-    const entries = readdirSync2(agentPath);
+    const entries = readdirSync(agentPath);
     const agents = entries.filter((entry) => {
-      const entryPath = join2(agentPath, entry);
+      const entryPath = join(agentPath, entry);
       return lstatSync(entryPath).isFile() && entry.endsWith(".md");
     }).map((file) => file.replace(".md", ""));
     if (agents.length === 0) {
@@ -1734,181 +1602,214 @@ async function viewAgent(agentPath, agentName) {
     }
     agentName = selected;
   }
-  const agentFile = join2(agentPath, `${agentName}.md`);
-  if (!existsSync2(agentFile)) {
+  const agentFile = join(agentPath, `${agentName}.md`);
+  if (!existsSync(agentFile)) {
     notFound("Agent", agentName);
     return;
   }
-  const content = readFileSync2(agentFile, "utf-8");
+  const content = readFileSync(agentFile, "utf-8");
   console.log();
-  console.log(import_picocolors5.default.dim("─".repeat(40)));
+  console.log(import_picocolors4.default.dim("─".repeat(40)));
   console.log(content);
-  console.log(import_picocolors5.default.dim("─".repeat(40)));
+  console.log(import_picocolors4.default.dim("─".repeat(40)));
 }
 
-// src/commands/skill.ts
-import { join as join3 } from "node:path";
-import { existsSync as existsSync3, readdirSync as readdirSync3, readFileSync as readFileSync3, lstatSync as lstatSync2 } from "node:fs";
-var import_picocolors6 = __toESM(require_picocolors(), 1);
-async function skillCommand(action) {
-  const opencodePath = join3(process.cwd(), ".opencode");
-  if (!existsSync3(opencodePath)) {
-    notInitialized();
-    return;
-  }
-  switch (action) {
-    case "list":
-      await listSkills(opencodePath);
-      break;
-    case "add":
-      await addSkill(opencodePath);
-      break;
-    case "view": {
-      const skillName = process.argv[4];
-      await viewSkill(opencodePath, skillName);
-      break;
-    }
-    default:
-      unknownAction(action, ["list", "add", "view"]);
-  }
-}
-function collectSkills(basePath) {
-  const skills = [];
-  if (!existsSync3(basePath))
-    return skills;
-  const tiers = ["core", "stack", "specialized"];
-  let hasTiers = false;
-  for (const tier of tiers) {
-    const tierPath = join3(basePath, tier);
-    if (existsSync3(tierPath)) {
-      hasTiers = true;
-      const entries = readdirSync3(tierPath);
-      for (const entry of entries) {
-        const entryPath = join3(tierPath, entry);
-        if (lstatSync2(entryPath).isDirectory()) {
-          skills.push({ name: entry, path: entryPath, tier });
-        }
-      }
-    }
-  }
-  if (!hasTiers) {
-    const entries = readdirSync3(basePath);
-    for (const entry of entries) {
-      const entryPath = join3(basePath, entry);
-      if (lstatSync2(entryPath).isDirectory()) {
-        skills.push({ name: entry, path: entryPath });
-      }
-    }
-  }
-  return skills;
-}
-async function listSkills(opencodePath) {
-  const locations = [
-    { path: join3(opencodePath, "superpowers", "skills"), name: "Superpowers" },
-    { path: join3(opencodePath, "skills"), name: "Project" }
-  ];
-  let totalSkills = 0;
-  for (const loc of locations) {
-    const skills = collectSkills(loc.path);
-    if (skills.length > 0) {
-      f2.info(import_picocolors6.default.bold(loc.name));
-      for (const skill of skills) {
-        const label = skill.tier ? `${skill.tier}/${skill.name}` : skill.name;
-        console.log(`  ${import_picocolors6.default.cyan("•")} ${label}`);
-      }
-      totalSkills += skills.length;
-    }
-  }
-  if (totalSkills === 0) {
-    showEmpty("skills", "ock skill add");
-  }
+// src/commands/completion.ts
+var import_picocolors5 = __toESM(require_picocolors(), 1);
+var BASH_COMPLETION = `# ock bash completion
+_ock_completion() {
+    local cur prev commands
+    COMPREPLY=()
+    cur="\${COMP_WORDS[COMP_CWORD]}"
+    prev="\${COMP_WORDS[COMP_CWORD-1]}"
+    
+    commands="init config upgrade agent skill doctor status help"
+    
+    case "\${prev}" in
+        ock)
+            COMPREPLY=( $(compgen -W "\${commands}" -- "\${cur}") )
+            return 0
+            ;;
+        agent)
+            COMPREPLY=( $(compgen -W "list add view" -- "\${cur}") )
+            return 0
+            ;;
+        skill)
+            COMPREPLY=( $(compgen -W "list add view" -- "\${cur}") )
+            return 0
+            ;;
+        config)
+            COMPREPLY=( $(compgen -W "model mcp permission keybinds show" -- "\${cur}") )
+            return 0
+            ;;
+        init)
+            COMPREPLY=( $(compgen -W "--force" -- "\${cur}") )
+            return 0
+            ;;
+        upgrade)
+            COMPREPLY=( $(compgen -W "--force --check" -- "\${cur}") )
+            return 0
+            ;;
+        *)
+            ;;
+    esac
 }
-async function addSkill(opencodePath) {
-  oe(import_picocolors6.default.bgYellow(import_picocolors6.default.black(" Add Skill ")));
-  const superpowersPath = join3(opencodePath, "superpowers", "skills");
-  const skills = collectSkills(superpowersPath);
-  if (skills.length === 0) {
-    showEmpty("skills available to install");
-    $e("Done");
-    return;
-  }
-  const selected = await ie({
-    message: "Select skill to install",
-    options: skills.map((s) => ({
-      value: s.name,
-      label: s.tier ? `${s.name} (${s.tier})` : s.name
-    }))
-  });
-  if (lD(selected)) {
-    ue("Cancelled");
-    return;
-  }
-  const skill = skills.find((s) => s.name === selected);
-  if (!skill)
-    return;
-  const skillMdPath = join3(skill.path, "SKILL.md");
-  if (!existsSync3(skillMdPath)) {
-    notFound("SKILL.md in", skill.name);
-    $e(import_picocolors6.default.red("Failed"));
-    return;
-  }
-  const content = readFileSync3(skillMdPath, "utf-8");
-  const lines = content.split(`
-`).slice(0, 10);
-  console.log();
-  console.log(import_picocolors6.default.dim("─".repeat(40)));
-  console.log(lines.join(`
-`));
-  if (content.split(`
-`).length > 10) {
-    console.log(import_picocolors6.default.dim("..."));
-  }
-  console.log(import_picocolors6.default.dim("─".repeat(40)));
-  console.log();
-  f2.success(`Skill "${skill.name}" is available at:`);
-  f2.info(import_picocolors6.default.cyan(skill.path));
-  le(`Skills in superpowers/ are auto-loaded.
-Use ${import_picocolors6.default.cyan("find_skills")} + ${import_picocolors6.default.cyan("use_skill")} in opencode.`, "Usage");
-  $e(import_picocolors6.default.green("Done!"));
+complete -F _ock_completion ock
+`;
+var ZSH_COMPLETION = `#compdef ock
+
+_ock() {
+    local -a commands
+    local -a agent_actions
+    local -a skill_actions
+    local -a config_actions
+    
+    commands=(
+        'init:Initialize OpenCodeKit in current directory'
+        'config:Edit opencode.json'
+        'upgrade:Update templates to latest version'
+        'agent:Manage agents'
+        'skill:Manage skills'
+        'doctor:Check project health'
+        'status:Show project overview'
+        'help:Show help'
+    )
+    
+    agent_actions=(
+        'list:List all agents'
+        'add:Create a new agent'
+        'view:View agent details'
+    )
+    
+    skill_actions=(
+        'list:List all skills'
+        'add:Install a skill'
+        'view:View skill details'
+    )
+    
+    config_actions=(
+        'model:Change default model'
+        'mcp:Manage MCP servers'
+        'permission:Edit permissions'
+        'keybinds:Edit keyboard shortcuts'
+        'show:View current config'
+    )
+    
+    case "$words[2]" in
+        agent)
+            _describe -t actions 'agent action' agent_actions
+            ;;
+        skill)
+            _describe -t actions 'skill action' skill_actions
+            ;;
+        config)
+            _describe -t actions 'config action' config_actions
+            ;;
+        init)
+            _arguments '--force[Reinitialize even if already exists]'
+            ;;
+        upgrade)
+            _arguments \\
+                '--force[Force upgrade even if up to date]' \\
+                '--check[Check for updates only]'
+            ;;
+        *)
+            _describe -t commands 'command' commands
+            ;;
+    esac
 }
-async function viewSkill(opencodePath, skillName) {
-  const superpowersPath = join3(opencodePath, "superpowers", "skills");
-  const skills = collectSkills(superpowersPath);
-  if (skills.length === 0) {
-    showEmpty("skills");
-    return;
-  }
-  if (!skillName) {
+
+_ock "$@"
+`;
+var FISH_COMPLETION = `# ock fish completion
+complete -c ock -n "__fish_use_subcommand" -a "init" -d "Initialize OpenCodeKit"
+complete -c ock -n "__fish_use_subcommand" -a "config" -d "Edit opencode.json"
+complete -c ock -n "__fish_use_subcommand" -a "upgrade" -d "Update templates"
+complete -c ock -n "__fish_use_subcommand" -a "agent" -d "Manage agents"
+complete -c ock -n "__fish_use_subcommand" -a "skill" -d "Manage skills"
+complete -c ock -n "__fish_use_subcommand" -a "doctor" -d "Check project health"
+complete -c ock -n "__fish_use_subcommand" -a "status" -d "Show project overview"
+
+# agent subcommands
+complete -c ock -n "__fish_seen_subcommand_from agent" -a "list" -d "List agents"
+complete -c ock -n "__fish_seen_subcommand_from agent" -a "add" -d "Add agent"
+complete -c ock -n "__fish_seen_subcommand_from agent" -a "view" -d "View agent"
+
+# skill subcommands
+complete -c ock -n "__fish_seen_subcommand_from skill" -a "list" -d "List skills"
+complete -c ock -n "__fish_seen_subcommand_from skill" -a "add" -d "Add skill"
+complete -c ock -n "__fish_seen_subcommand_from skill" -a "view" -d "View skill"
+
+# config subcommands
+complete -c ock -n "__fish_seen_subcommand_from config" -a "model" -d "Change model"
+complete -c ock -n "__fish_seen_subcommand_from config" -a "mcp" -d "Manage MCP"
+complete -c ock -n "__fish_seen_subcommand_from config" -a "permission" -d "Edit permissions"
+complete -c ock -n "__fish_seen_subcommand_from config" -a "keybinds" -d "Edit keybinds"
+complete -c ock -n "__fish_seen_subcommand_from config" -a "show" -d "View config"
+
+# init options
+complete -c ock -n "__fish_seen_subcommand_from init" -l force -d "Reinitialize"
+
+# upgrade options
+complete -c ock -n "__fish_seen_subcommand_from upgrade" -l force -d "Force upgrade"
+complete -c ock -n "__fish_seen_subcommand_from upgrade" -l check -d "Check only"
+`;
+async function completionCommand(shell) {
+  if (!shell) {
+    oe(import_picocolors5.default.bgCyan(import_picocolors5.default.black(" Shell Completion ")));
     const selected = await ie({
-      message: "Select skill to view",
-      options: skills.map((s) => ({ value: s.name, label: s.name }))
+      message: "Select your shell",
+      options: [
+        { value: "bash", label: "Bash" },
+        { value: "zsh", label: "Zsh" },
+        { value: "fish", label: "Fish" }
+      ]
     });
     if (lD(selected)) {
+      ue("Cancelled");
       return;
     }
-    skillName = selected;
-  }
-  const skill = skills.find((s) => s.name === skillName);
-  if (!skill) {
-    notFound("Skill", skillName);
-    return;
+    shell = selected;
   }
-  const skillMdPath = join3(skill.path, "SKILL.md");
-  if (!existsSync3(skillMdPath)) {
-    notFound("SKILL.md");
-    return;
+  let script;
+  let setupInstructions;
+  switch (shell) {
+    case "bash":
+      script = BASH_COMPLETION;
+      setupInstructions = `Add to ~/.bashrc:
+  source <(ock completion bash)
+
+Or save to file:
+  ock completion bash > ~/.local/share/bash-completion/completions/ock`;
+      break;
+    case "zsh":
+      script = ZSH_COMPLETION;
+      setupInstructions = `Add to ~/.zshrc (before compinit):
+  source <(ock completion zsh)
+
+Or save to fpath:
+  ock completion zsh > ~/.zsh/completions/_ock
+  # Then add to ~/.zshrc: fpath=(~/.zsh/completions $fpath)`;
+      break;
+    case "fish":
+      script = FISH_COMPLETION;
+      setupInstructions = `Save to fish completions:
+  ock completion fish > ~/.config/fish/completions/ock.fish`;
+      break;
+    default:
+      f2.error(`Unknown shell: ${shell}`);
+      return;
   }
-  const content = readFileSync3(skillMdPath, "utf-8");
-  console.log();
-  console.log(import_picocolors6.default.dim("─".repeat(40)));
-  console.log(content);
-  console.log(import_picocolors6.default.dim("─".repeat(40)));
+  console.log(script);
+  console.error();
+  console.error(import_picocolors5.default.bold("Setup:"));
+  console.error(import_picocolors5.default.dim(setupInstructions));
 }
 
 // src/commands/config.ts
-import { existsSync as existsSync4, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "node:fs";
-import { join as join4 } from "node:path";
-var import_picocolors7 = __toESM(require_picocolors(), 1);
+import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "node:fs";
+import { join as join2 } from "node:path";
+var import_picocolors6 = __toESM(require_picocolors(), 1);
 var DEFAULT_SERVER_PORT = 4096;
 var MODELS_DEV_URL = "https://models.dev/api.json";
 async function fetchFromServer(endpoint) {
@@ -1938,13 +1839,13 @@ async function getAgentsFromServer() {
   return fetchFromServer("/agent");
 }
 async function configCommand(action) {
-  const opencodePath = join4(process.cwd(), ".opencode");
-  const configPath = join4(opencodePath, "opencode.json");
-  if (!existsSync4(opencodePath)) {
+  const opencodePath = join2(process.cwd(), ".opencode");
+  const configPath = join2(opencodePath, "opencode.json");
+  if (!existsSync2(opencodePath)) {
     notInitialized();
     return;
   }
-  if (!existsSync4(configPath)) {
+  if (!existsSync2(configPath)) {
     showError("opencode.json not found", "ock init --force");
     return;
   }
@@ -1999,64 +1900,66 @@ async function configCommand(action) {
   }
 }
 function loadConfig(configPath) {
-  return JSON.parse(readFileSync4(configPath, "utf-8"));
+  const content = readFileSync2(configPath, "utf-8");
+  const jsonWithoutComments = content.replace(/\/\*[\s\S]*?\*\//g, "").replace(/^\s*\/\/.*$/gm, "");
+  return JSON.parse(jsonWithoutComments);
 }
 function saveConfig(configPath, config) {
-  writeFileSync3(configPath, JSON.stringify(config, null, 2) + `
+  writeFileSync2(configPath, JSON.stringify(config, null, 2) + `
 `);
 }
 function showConfig(configPath) {
   const config = loadConfig(configPath);
   console.log();
-  console.log(import_picocolors7.default.bold("  Model"));
-  console.log(`    ${import_picocolors7.default.cyan(config.model || "not set")}`);
+  console.log(import_picocolors6.default.bold("  Model"));
+  console.log(`    ${import_picocolors6.default.cyan(config.model || "not set")}`);
   if (config.small_model) {
-    console.log(import_picocolors7.default.bold("  Small Model"));
-    console.log(`    ${import_picocolors7.default.cyan(config.small_model)}`);
+    console.log(import_picocolors6.default.bold("  Small Model"));
+    console.log(`    ${import_picocolors6.default.cyan(config.small_model)}`);
   }
-  console.log(import_picocolors7.default.bold("  Theme"));
-  console.log(`    ${import_picocolors7.default.cyan(config.theme || "system")}`);
-  console.log(import_picocolors7.default.bold("  Share"));
-  console.log(`    ${import_picocolors7.default.cyan(config.share || "manual")}`);
+  console.log(import_picocolors6.default.bold("  Theme"));
+  console.log(`    ${import_picocolors6.default.cyan(config.theme || "system")}`);
+  console.log(import_picocolors6.default.bold("  Share"));
+  console.log(`    ${import_picocolors6.default.cyan(config.share || "manual")}`);
   const autoupdateDisplay = config.autoupdate === "notify" ? "notify" : config.autoupdate === false ? "disabled" : "enabled";
-  console.log(import_picocolors7.default.bold("  Autoupdate"));
-  console.log(`    ${import_picocolors7.default.cyan(autoupdateDisplay)}`);
+  console.log(import_picocolors6.default.bold("  Autoupdate"));
+  console.log(`    ${import_picocolors6.default.cyan(autoupdateDisplay)}`);
   if (config.tui && Object.keys(config.tui).length > 0) {
-    console.log(import_picocolors7.default.bold("  TUI"));
+    console.log(import_picocolors6.default.bold("  TUI"));
     if (config.tui.scroll_speed !== undefined) {
-      console.log(`    scroll_speed: ${import_picocolors7.default.cyan(String(config.tui.scroll_speed))}`);
+      console.log(`    scroll_speed: ${import_picocolors6.default.cyan(String(config.tui.scroll_speed))}`);
     }
     if (config.tui.scroll_acceleration !== undefined) {
-      console.log(`    scroll_acceleration: ${import_picocolors7.default.cyan(String(config.tui.scroll_acceleration))}`);
+      console.log(`    scroll_acceleration: ${import_picocolors6.default.cyan(String(config.tui.scroll_acceleration))}`);
     }
     if (config.tui.diff_style) {
-      console.log(`    diff_style: ${import_picocolors7.default.cyan(config.tui.diff_style)}`);
+      console.log(`    diff_style: ${import_picocolors6.default.cyan(config.tui.diff_style)}`);
     }
   }
   if (config.mcp && Object.keys(config.mcp).length > 0) {
-    console.log(import_picocolors7.default.bold("  MCP Servers"));
+    console.log(import_picocolors6.default.bold("  MCP Servers"));
     for (const [name, server] of Object.entries(config.mcp)) {
-      const status = server.enabled === false ? import_picocolors7.default.dim("off") : import_picocolors7.default.green("on");
+      const status = server.enabled === false ? import_picocolors6.default.dim("off") : import_picocolors6.default.green("on");
       console.log(`    ${status} ${name}`);
     }
   }
   if (config.tools && Object.keys(config.tools).length > 0) {
-    console.log(import_picocolors7.default.bold("  Tools"));
+    console.log(import_picocolors6.default.bold("  Tools"));
     for (const [tool, enabled] of Object.entries(config.tools)) {
-      const status = enabled === false ? import_picocolors7.default.red("off") : import_picocolors7.default.green("on");
+      const status = enabled === false ? import_picocolors6.default.red("off") : import_picocolors6.default.green("on");
       console.log(`    ${status} ${tool}`);
     }
   }
   if (config.keybinds && Object.keys(config.keybinds).length > 0) {
-    console.log(import_picocolors7.default.bold("  Keybinds"));
+    console.log(import_picocolors6.default.bold("  Keybinds"));
     for (const [action, key] of Object.entries(config.keybinds)) {
-      console.log(`    ${import_picocolors7.default.dim(action)}: ${import_picocolors7.default.cyan(key)}`);
+      console.log(`    ${import_picocolors6.default.dim(action)}: ${import_picocolors6.default.cyan(key)}`);
     }
   }
   console.log();
 }
 async function configMenu(configPath) {
-  oe(import_picocolors7.default.bgCyan(import_picocolors7.default.black(" Configuration ")));
+  oe(import_picocolors6.default.bgCyan(import_picocolors6.default.black(" Configuration ")));
   while (true) {
     const action = await ie({
       message: "What do you want to configure?",
@@ -2131,8 +2034,8 @@ async function editModel(configPath, modelType = "model") {
   const config = loadConfig(configPath);
   const currentModel = config[modelType] || "not set";
   const modelLabel = modelType === "small_model" ? "Small Model" : "Model";
-  f2.info(`Current ${modelLabel}: ${import_picocolors7.default.cyan(currentModel)}`);
-  f2.info(import_picocolors7.default.dim("Fetching models from models.dev..."));
+  f2.info(`Current ${modelLabel}: ${import_picocolors6.default.cyan(currentModel)}`);
+  f2.info(import_picocolors6.default.dim("Fetching models from models.dev..."));
   const modelsDevData = await fetchFromModelsDev();
   if (!modelsDevData || Object.keys(modelsDevData).length === 0) {
     f2.warn("models.dev unavailable - please enter manually");
@@ -2153,7 +2056,7 @@ async function editModel(configPath, modelType = "model") {
     }
     config[modelType] = newModel;
     saveConfig(configPath, config);
-    f2.success(`${modelLabel} set to ${import_picocolors7.default.cyan(newModel)}`);
+    f2.success(`${modelLabel} set to ${import_picocolors6.default.cyan(newModel)}`);
     return;
   }
   f2.success("Fetched models from models.dev");
@@ -2216,7 +2119,7 @@ async function editModel(configPath, modelType = "model") {
     }
     config[modelType] = customModel;
     saveConfig(configPath, config);
-    f2.success(`${modelLabel} set to ${import_picocolors7.default.cyan(customModel)}`);
+    f2.success(`${modelLabel} set to ${import_picocolors6.default.cyan(customModel)}`);
     return;
   }
   if (providerId === "__search__") {
@@ -2281,7 +2184,7 @@ async function editModel(configPath, modelType = "model") {
   const fullModelId = `${providerId}/${selectedModel}`;
   config[modelType] = fullModelId;
   saveConfig(configPath, config);
-  f2.success(`${modelLabel} set to ${import_picocolors7.default.cyan(fullModelId)}`);
+  f2.success(`${modelLabel} set to ${import_picocolors6.default.cyan(fullModelId)}`);
 }
 function getModelsForProvider(provider) {
   const options = [];
@@ -2329,7 +2232,7 @@ async function editAgentModel(configPath) {
   let agentNames = [];
   const agentInfoMap = new Map;
   if (serverAgents && serverAgents.length > 0) {
-    f2.info(import_picocolors7.default.dim("Fetched agents from OpenCode server"));
+    f2.info(import_picocolors6.default.dim("Fetched agents from OpenCode server"));
     for (const agent of serverAgents) {
       agentNames.push(agent.name);
       agentInfoMap.set(agent.name, {
@@ -2353,14 +2256,14 @@ async function editAgentModel(configPath) {
     return;
   }
   console.log();
-  console.log(import_picocolors7.default.bold("  Agent Models"));
+  console.log(import_picocolors6.default.bold("  Agent Models"));
   for (const name of agentNames) {
     const info = agentInfoMap.get(name);
-    const model = info?.model || import_picocolors7.default.dim("(default)");
-    const builtIn = info?.builtIn ? import_picocolors7.default.dim(" [built-in]") : "";
+    const model = info?.model || import_picocolors6.default.dim("(default)");
+    const builtIn = info?.builtIn ? import_picocolors6.default.dim(" [built-in]") : "";
     const localConfig = config.agent[name];
-    const disabled = localConfig?.disable ? import_picocolors7.default.red(" [disabled]") : "";
-    console.log(`    ${import_picocolors7.default.cyan(name)}: ${model}${builtIn}${disabled}`);
+    const disabled = localConfig?.disable ? import_picocolors6.default.red(" [disabled]") : "";
+    console.log(`    ${import_picocolors6.default.cyan(name)}: ${model}${builtIn}${disabled}`);
   }
   console.log();
   const agentOptions = [
@@ -2408,7 +2311,7 @@ async function editAgentModel(configPath) {
     }
     config.agent[agentName].disable = !currentAgent.disable;
     saveConfig(configPath, config);
-    const status = config.agent[agentName].disable ? import_picocolors7.default.red("disabled") : import_picocolors7.default.green("enabled");
+    const status = config.agent[agentName].disable ? import_picocolors6.default.red("disabled") : import_picocolors6.default.green("enabled");
     f2.success(`Agent ${agentName}: ${status}`);
     return;
   }
@@ -2429,8 +2332,8 @@ async function editAgentModel(configPath) {
     return;
   }
   const agentInfo = agentInfoMap.get(agentName);
-  f2.info(`Current model: ${import_picocolors7.default.cyan(agentInfo?.model || currentAgent.model || "(default)")}`);
-  f2.info(import_picocolors7.default.dim("Fetching models from models.dev..."));
+  f2.info(`Current model: ${import_picocolors6.default.cyan(agentInfo?.model || currentAgent.model || "(default)")}`);
+  f2.info(import_picocolors6.default.dim("Fetching models from models.dev..."));
   const modelsDevData = await fetchFromModelsDev();
   if (!modelsDevData || Object.keys(modelsDevData).length === 0) {
     f2.warn("models.dev unavailable - please enter manually");
@@ -2452,7 +2355,7 @@ async function editAgentModel(configPath) {
     }
     config.agent[agentName].model = newModel;
     saveConfig(configPath, config);
-    f2.success(`${agentName} model set to ${import_picocolors7.default.cyan(newModel)}`);
+    f2.success(`${agentName} model set to ${import_picocolors6.default.cyan(newModel)}`);
     return;
   }
   const localProviders = config.provider || {};
@@ -2510,7 +2413,7 @@ async function editAgentModel(configPath) {
       agentConfig.model = undefined;
     }
     saveConfig(configPath, config);
-    f2.success(`${agentName} model set to ${import_picocolors7.default.cyan("(default)")}`);
+    f2.success(`${agentName} model set to ${import_picocolors6.default.cyan("(default)")}`);
     return;
   }
   if (providerId === "__custom__") {
@@ -2532,7 +2435,7 @@ async function editAgentModel(configPath) {
     }
     config.agent[agentName].model = customModel;
     saveConfig(configPath, config);
-    f2.success(`${agentName} model set to ${import_picocolors7.default.cyan(customModel)}`);
+    f2.success(`${agentName} model set to ${import_picocolors6.default.cyan(customModel)}`);
     return;
   }
   if (providerId === "__search__") {
@@ -2587,7 +2490,7 @@ async function editAgentModel(configPath) {
   }
   config.agent[agentName].model = fullModelId;
   saveConfig(configPath, config);
-  f2.success(`${agentName} model set to ${import_picocolors7.default.cyan(fullModelId)}`);
+  f2.success(`${agentName} model set to ${import_picocolors6.default.cyan(fullModelId)}`);
 }
 async function editMCP(configPath) {
   const config = loadConfig(configPath);
@@ -2606,11 +2509,11 @@ async function editMCP(configPath) {
     return;
   }
   console.log();
-  console.log(import_picocolors7.default.bold("  MCP Servers"));
+  console.log(import_picocolors6.default.bold("  MCP Servers"));
   for (const [name, server] of Object.entries(config.mcp)) {
-    const status = server.enabled === false ? import_picocolors7.default.red("off") : import_picocolors7.default.green("on");
-    const type = server.type === "remote" ? import_picocolors7.default.dim("remote") : import_picocolors7.default.dim("local");
-    const endpoint = server.type === "remote" ? import_picocolors7.default.dim(` → ${server.url}`) : import_picocolors7.default.dim(` → ${(server.command || []).join(" ")}`);
+    const status = server.enabled === false ? import_picocolors6.default.red("off") : import_picocolors6.default.green("on");
+    const type = server.type === "remote" ? import_picocolors6.default.dim("remote") : import_picocolors6.default.dim("local");
+    const endpoint = server.type === "remote" ? import_picocolors6.default.dim(` → ${server.url}`) : import_picocolors6.default.dim(` → ${(server.command || []).join(" ")}`);
     console.log(`    ${status} ${name} ${type}${endpoint}`);
   }
   console.log();
@@ -2656,7 +2559,7 @@ async function toggleMCP(configPath, config) {
   const wasEnabled = server.enabled !== false;
   server.enabled = !wasEnabled;
   saveConfig(configPath, config);
-  const status = server.enabled ? import_picocolors7.default.green("enabled") : import_picocolors7.default.dim("disabled");
+  const status = server.enabled ? import_picocolors6.default.green("enabled") : import_picocolors6.default.dim("disabled");
   f2.success(`${serverName}: ${status}`);
 }
 async function addMCPServer(configPath, config) {
@@ -2722,7 +2625,7 @@ async function addMCPServer(configPath, config) {
     };
   }
   saveConfig(configPath, config);
-  f2.success(`Added MCP server: ${import_picocolors7.default.cyan(serverName)}`);
+  f2.success(`Added MCP server: ${import_picocolors6.default.cyan(serverName)}`);
 }
 async function removeMCP(configPath, config) {
   const servers = Object.keys(config.mcp || {}).map((name) => ({
@@ -2753,13 +2656,13 @@ async function editPermissions(configPath) {
     config.permission = {};
   }
   console.log();
-  console.log(import_picocolors7.default.bold("  Current Permissions"));
-  console.log(`    edit: ${import_picocolors7.default.cyan(config.permission.edit || "ask")}`);
-  console.log(`    external_directory: ${import_picocolors7.default.cyan(config.permission.external_directory || "ask")}`);
+  console.log(import_picocolors6.default.bold("  Current Permissions"));
+  console.log(`    edit: ${import_picocolors6.default.cyan(config.permission.edit || "ask")}`);
+  console.log(`    external_directory: ${import_picocolors6.default.cyan(config.permission.external_directory || "ask")}`);
   if (config.permission.bash) {
-    console.log(import_picocolors7.default.bold("  Bash"));
+    console.log(import_picocolors6.default.bold("  Bash"));
     for (const [pattern, perm] of Object.entries(config.permission.bash)) {
-      console.log(`    ${import_picocolors7.default.dim(pattern)}: ${import_picocolors7.default.cyan(perm)}`);
+      console.log(`    ${import_picocolors6.default.dim(pattern)}: ${import_picocolors6.default.cyan(perm)}`);
     }
   }
   console.log();
@@ -2821,9 +2724,9 @@ async function editKeybinds(configPath) {
   }
   if (Object.keys(config.keybinds).length > 0) {
     console.log();
-    console.log(import_picocolors7.default.bold("  Current Keybinds"));
+    console.log(import_picocolors6.default.bold("  Current Keybinds"));
     for (const [action2, key] of Object.entries(config.keybinds)) {
-      console.log(`    ${import_picocolors7.default.dim(action2)}: ${import_picocolors7.default.cyan(key)}`);
+      console.log(`    ${import_picocolors6.default.dim(action2)}: ${import_picocolors6.default.cyan(key)}`);
     }
     console.log();
   }
@@ -2876,7 +2779,7 @@ async function editKeybinds(configPath) {
   }
   config.keybinds[keybindName] = newKey;
   saveConfig(configPath, config);
-  f2.success(`${keybindName} → ${import_picocolors7.default.cyan(newKey)}`);
+  f2.success(`${keybindName} → ${import_picocolors6.default.cyan(newKey)}`);
 }
 var OPENCODE_THEMES = [
   { value: "system", label: "System", hint: "follows OS preference" },
@@ -2916,7 +2819,7 @@ var OPENCODE_THEMES = [
 async function editTheme(configPath) {
   const config = loadConfig(configPath);
   const currentTheme = config.theme || "system";
-  f2.info(`Current theme: ${import_picocolors7.default.cyan(currentTheme)}`);
+  f2.info(`Current theme: ${import_picocolors6.default.cyan(currentTheme)}`);
   const validTheme = OPENCODE_THEMES.some((t) => t.value === currentTheme) ? currentTheme : "system";
   const selectedTheme = await ie({
     message: "Select theme",
@@ -2933,7 +2836,7 @@ async function editTheme(configPath) {
   }
   config.theme = selectedTheme;
   saveConfig(configPath, config);
-  f2.success(`Theme set to ${import_picocolors7.default.cyan(selectedTheme)}`);
+  f2.success(`Theme set to ${import_picocolors6.default.cyan(selectedTheme)}`);
 }
 async function editTui(configPath) {
   const config = loadConfig(configPath);
@@ -2981,7 +2884,7 @@ async function editTui(configPath) {
     }
     config.tui.diff_style = style;
     saveConfig(configPath, config);
-    f2.success(`Diff style set to ${import_picocolors7.default.cyan(style)}`);
+    f2.success(`Diff style set to ${import_picocolors6.default.cyan(style)}`);
   } else {
     const settingKey = setting;
     const value = await te({
@@ -2998,7 +2901,7 @@ async function editTui(configPath) {
     }
     config.tui[settingKey] = value ? Number(value) : undefined;
     saveConfig(configPath, config);
-    f2.success(`${settingKey} set to ${import_picocolors7.default.cyan(value || "default")}`);
+    f2.success(`${settingKey} set to ${import_picocolors6.default.cyan(value || "default")}`);
   }
 }
 async function editTools(configPath) {
@@ -3018,9 +2921,9 @@ async function editTools(configPath) {
     "todoread"
   ];
   console.log();
-  console.log(import_picocolors7.default.bold("  Tool Status"));
+  console.log(import_picocolors6.default.bold("  Tool Status"));
   for (const tool of commonTools) {
-    const status = config.tools[tool] === false ? import_picocolors7.default.red("off") : import_picocolors7.default.green("on");
+    const status = config.tools[tool] === false ? import_picocolors6.default.red("off") : import_picocolors6.default.green("on");
     console.log(`    ${status} ${tool}`);
   }
   console.log();
@@ -3054,7 +2957,7 @@ async function editTools(configPath) {
     const wasEnabled = config.tools[toolName] !== false;
     config.tools[toolName] = !wasEnabled;
     saveConfig(configPath, config);
-    const status = config.tools[toolName] ? import_picocolors7.default.green("enabled") : import_picocolors7.default.red("disabled");
+    const status = config.tools[toolName] ? import_picocolors6.default.green("enabled") : import_picocolors6.default.red("disabled");
     f2.success(`${toolName}: ${status}`);
   } else {
     const toolName = await te({
@@ -3077,13 +2980,13 @@ async function editTools(configPath) {
     }
     config.tools[toolName] = enabled;
     saveConfig(configPath, config);
-    f2.success(`Added ${toolName}: ${enabled ? import_picocolors7.default.green("on") : import_picocolors7.default.red("off")}`);
+    f2.success(`Added ${toolName}: ${enabled ? import_picocolors6.default.green("on") : import_picocolors6.default.red("off")}`);
   }
 }
 async function editShare(configPath) {
   const config = loadConfig(configPath);
   const current = config.share || "manual";
-  f2.info(`Current share setting: ${import_picocolors7.default.cyan(current)}`);
+  f2.info(`Current share setting: ${import_picocolors6.default.cyan(current)}`);
   const selected = await ie({
     message: "Share setting",
     options: [
@@ -3106,13 +3009,13 @@ async function editShare(configPath) {
   const shareValue = selected;
   config.share = shareValue;
   saveConfig(configPath, config);
-  f2.success(`Share set to ${import_picocolors7.default.cyan(shareValue)}`);
+  f2.success(`Share set to ${import_picocolors6.default.cyan(shareValue)}`);
 }
 async function editAutoupdate(configPath) {
   const config = loadConfig(configPath);
   const current = config.autoupdate ?? true;
   const display = current === "notify" ? "notify" : current ? "enabled" : "disabled";
-  f2.info(`Current autoupdate: ${import_picocolors7.default.cyan(display)}`);
+  f2.info(`Current autoupdate: ${import_picocolors6.default.cyan(display)}`);
   const selected = await ie({
     message: "Autoupdate behavior",
     options: [
@@ -3143,69 +3046,366 @@ async function editAutoupdate(configPath) {
     config.autoupdate = selectedValue === "true";
   }
   saveConfig(configPath, config);
-  f2.success(`Autoupdate set to ${import_picocolors7.default.cyan(selectedValue)}`);
+  f2.success(`Autoupdate set to ${import_picocolors6.default.cyan(selectedValue)}`);
 }
 
-// src/commands/upgrade.ts
-import { join as join5, dirname as dirname2 } from "node:path";
-import { fileURLToPath as fileURLToPath2 } from "node:url";
+// src/commands/init.ts
 import {
-  existsSync as existsSync5,
-  readFileSync as readFileSync5,
-  writeFileSync as writeFileSync4,
-  readdirSync as readdirSync4,
-  mkdirSync as mkdirSync3,
-  copyFileSync
+  existsSync as existsSync3,
+  mkdirSync as mkdirSync2,
+  readFileSync as readFileSync3,
+  writeFileSync as writeFileSync3,
+  readdirSync as readdirSync2
 } from "node:fs";
-var import_picocolors8 = __toESM(require_picocolors(), 1);
-var PRESERVE_FILES = [
-  "opencode.json"
+import { join as join3, dirname, basename } from "node:path";
+import { fileURLToPath } from "node:url";
+var import_picocolors7 = __toESM(require_picocolors(), 1);
+var EXCLUDED_DIRS = [
+  "node_modules",
+  ".git",
+  "dist",
+  ".DS_Store",
+  "coverage",
+  ".next",
+  ".turbo"
 ];
-var PRESERVE_DIRS = [
-  "agent",
-  "command",
-  "memory"
+var EXCLUDED_FILES = [
+  "bun.lock",
+  "package-lock.json",
+  "yarn.lock",
+  "pnpm-lock.yaml"
 ];
-var SKIP_DIRS = ["node_modules", ".git", "dist", "coverage"];
-function getTemplateRoot2() {
-  const __filename2 = fileURLToPath2(import.meta.url);
-  const __dirname2 = dirname2(__filename2);
+function detectMode(targetDir) {
+  const opencodeDir = join3(targetDir, ".opencode");
+  if (existsSync3(opencodeDir)) {
+    return "already-initialized";
+  }
+  if (existsSync3(targetDir)) {
+    const entries = readdirSync2(targetDir);
+    const hasCode = entries.some((e2) => !e2.startsWith(".") && !EXCLUDED_DIRS.includes(e2) && e2 !== "node_modules");
+    if (hasCode) {
+      return "add-config";
+    }
+  }
+  return "scaffold";
+}
+function getTemplateRoot() {
+  const __filename2 = fileURLToPath(import.meta.url);
+  const __dirname2 = dirname(__filename2);
   const possiblePaths = [
-    join5(__dirname2, "template"),
-    join5(__dirname2, "..", "..", ".opencode")
+    join3(__dirname2, "template"),
+    join3(__dirname2, "..", "..", ".opencode")
   ];
   for (const path of possiblePaths) {
-    const opencodeDir = join5(path, ".opencode");
-    if (existsSync5(opencodeDir)) {
+    const opencodeDir = join3(path, ".opencode");
+    if (existsSync3(opencodeDir)) {
       return path;
     }
   }
   return null;
 }
-function getCurrentVersion(opencodeDir) {
-  const versionFile = join5(opencodeDir, ".version");
-  if (existsSync5(versionFile)) {
-    return readFileSync5(versionFile, "utf-8").trim();
-  }
-  return null;
-}
-function getPackageVersion() {
-  const __filename2 = fileURLToPath2(import.meta.url);
-  const __dirname2 = dirname2(__filename2);
-  const pkgPaths = [
-    join5(__dirname2, "..", "..", "package.json"),
-    join5(__dirname2, "..", "package.json")
-  ];
-  for (const pkgPath of pkgPaths) {
-    if (existsSync5(pkgPath)) {
-      const pkg = JSON.parse(readFileSync5(pkgPath, "utf-8"));
-      return pkg.version;
+async function copyDir(src, dest) {
+  const { mkdir, readdir } = await import("node:fs/promises");
+  await mkdir(dest, { recursive: true });
+  for (const entry of await readdir(src, { withFileTypes: true })) {
+    if (EXCLUDED_DIRS.includes(entry.name))
+      continue;
+    if (!entry.isDirectory() && EXCLUDED_FILES.includes(entry.name))
+      continue;
+    const srcPath = join3(src, entry.name);
+    const destPath = join3(dest, entry.name);
+    if (entry.isSymbolicLink()) {
+      continue;
+    } else if (entry.isDirectory()) {
+      await copyDir(srcPath, destPath);
+    } else {
+      const content = readFileSync3(srcPath, "utf-8");
+      writeFileSync3(destPath, content);
     }
   }
-  return "unknown";
 }
-async function checkVersion(opencodeDir) {
-  const current = getCurrentVersion(opencodeDir);
+async function copyOpenCodeOnly(templateRoot, targetDir) {
+  const opencodeSrc = join3(templateRoot, ".opencode");
+  const opencodeDest = join3(targetDir, ".opencode");
+  if (!existsSync3(opencodeSrc)) {
+    return false;
+  }
+  await copyDir(opencodeSrc, opencodeDest);
+  return true;
+}
+async function initCommand(options = {}) {
+  const targetDir = process.cwd();
+  const mode = detectMode(targetDir);
+  oe(import_picocolors7.default.bgCyan(import_picocolors7.default.black(" OpenCodeKit ")));
+  if (mode === "already-initialized" && !options.force) {
+    f2.warn("Already initialized (.opencode/ exists)");
+    f2.info(`Use ${import_picocolors7.default.cyan("--force")} to reinitialize`);
+    $e("Nothing to do");
+    return;
+  }
+  const templateRoot = getTemplateRoot();
+  if (!templateRoot) {
+    f2.error("Template not found. Please reinstall opencodekit.");
+    $e(import_picocolors7.default.red("Failed"));
+    process.exit(1);
+  }
+  let projectName = basename(targetDir);
+  if (mode === "scaffold") {
+    const name = await te({
+      message: "Project name",
+      placeholder: projectName,
+      defaultValue: projectName
+    });
+    if (lD(name)) {
+      ue("Cancelled");
+      process.exit(0);
+    }
+    projectName = name || projectName;
+  }
+  const s = de();
+  if (mode === "scaffold") {
+    s.start("Scaffolding project");
+    mkdirSync2(targetDir, { recursive: true });
+  } else if (mode === "add-config") {
+    s.start("Adding OpenCodeKit");
+  } else {
+    s.start("Reinitializing");
+  }
+  const success = await copyOpenCodeOnly(templateRoot, targetDir);
+  if (!success) {
+    s.stop("Failed");
+    $e(import_picocolors7.default.red("Template copy failed"));
+    process.exit(1);
+  }
+  s.stop("Done");
+  le(`cd .opencode && bun install`, "Next steps");
+  $e(import_picocolors7.default.green("Ready to code!"));
+}
+
+// src/commands/menu.ts
+var import_picocolors10 = __toESM(require_picocolors(), 1);
+import { existsSync as existsSync6, readdirSync as readdirSync5, lstatSync as lstatSync3 } from "node:fs";
+import { join as join6, basename as basename2 } from "node:path";
+
+// src/commands/skill.ts
+import { join as join4 } from "node:path";
+import { existsSync as existsSync4, readdirSync as readdirSync3, readFileSync as readFileSync4, lstatSync as lstatSync2 } from "node:fs";
+var import_picocolors8 = __toESM(require_picocolors(), 1);
+async function skillCommand(action) {
+  const opencodePath = join4(process.cwd(), ".opencode");
+  if (!existsSync4(opencodePath)) {
+    notInitialized();
+    return;
+  }
+  switch (action) {
+    case "list":
+      await listSkills(opencodePath);
+      break;
+    case "add":
+      await addSkill(opencodePath);
+      break;
+    case "view": {
+      const skillName = process.argv[4];
+      await viewSkill(opencodePath, skillName);
+      break;
+    }
+    default:
+      unknownAction(action, ["list", "add", "view"]);
+  }
+}
+function collectSkills(basePath) {
+  const skills = [];
+  if (!existsSync4(basePath))
+    return skills;
+  const tiers = ["core", "stack", "specialized"];
+  let hasTiers = false;
+  for (const tier of tiers) {
+    const tierPath = join4(basePath, tier);
+    if (existsSync4(tierPath)) {
+      hasTiers = true;
+      const entries = readdirSync3(tierPath);
+      for (const entry of entries) {
+        const entryPath = join4(tierPath, entry);
+        if (lstatSync2(entryPath).isDirectory()) {
+          skills.push({ name: entry, path: entryPath, tier });
+        }
+      }
+    }
+  }
+  if (!hasTiers) {
+    const entries = readdirSync3(basePath);
+    for (const entry of entries) {
+      const entryPath = join4(basePath, entry);
+      if (lstatSync2(entryPath).isDirectory()) {
+        skills.push({ name: entry, path: entryPath });
+      }
+    }
+  }
+  return skills;
+}
+async function listSkills(opencodePath) {
+  const locations = [
+    { path: join4(opencodePath, "superpowers", "skills"), name: "Superpowers" },
+    { path: join4(opencodePath, "skills"), name: "Project" }
+  ];
+  let totalSkills = 0;
+  for (const loc of locations) {
+    const skills = collectSkills(loc.path);
+    if (skills.length > 0) {
+      f2.info(import_picocolors8.default.bold(loc.name));
+      for (const skill of skills) {
+        const label = skill.tier ? `${skill.tier}/${skill.name}` : skill.name;
+        console.log(`  ${import_picocolors8.default.cyan("•")} ${label}`);
+      }
+      totalSkills += skills.length;
+    }
+  }
+  if (totalSkills === 0) {
+    showEmpty("skills", "ock skill add");
+  }
+}
+async function addSkill(opencodePath) {
+  oe(import_picocolors8.default.bgYellow(import_picocolors8.default.black(" Add Skill ")));
+  const superpowersPath = join4(opencodePath, "superpowers", "skills");
+  const skills = collectSkills(superpowersPath);
+  if (skills.length === 0) {
+    showEmpty("skills available to install");
+    $e("Done");
+    return;
+  }
+  const selected = await ie({
+    message: "Select skill to install",
+    options: skills.map((s) => ({
+      value: s.name,
+      label: s.tier ? `${s.name} (${s.tier})` : s.name
+    }))
+  });
+  if (lD(selected)) {
+    ue("Cancelled");
+    return;
+  }
+  const skill = skills.find((s) => s.name === selected);
+  if (!skill)
+    return;
+  const skillMdPath = join4(skill.path, "SKILL.md");
+  if (!existsSync4(skillMdPath)) {
+    notFound("SKILL.md in", skill.name);
+    $e(import_picocolors8.default.red("Failed"));
+    return;
+  }
+  const content = readFileSync4(skillMdPath, "utf-8");
+  const lines = content.split(`
+`).slice(0, 10);
+  console.log();
+  console.log(import_picocolors8.default.dim("─".repeat(40)));
+  console.log(lines.join(`
+`));
+  if (content.split(`
+`).length > 10) {
+    console.log(import_picocolors8.default.dim("..."));
+  }
+  console.log(import_picocolors8.default.dim("─".repeat(40)));
+  console.log();
+  f2.success(`Skill "${skill.name}" is available at:`);
+  f2.info(import_picocolors8.default.cyan(skill.path));
+  le(`Skills in superpowers/ are auto-loaded.
+Use ${import_picocolors8.default.cyan("find_skills")} + ${import_picocolors8.default.cyan("use_skill")} in opencode.`, "Usage");
+  $e(import_picocolors8.default.green("Done!"));
+}
+async function viewSkill(opencodePath, skillName) {
+  const superpowersPath = join4(opencodePath, "superpowers", "skills");
+  const skills = collectSkills(superpowersPath);
+  if (skills.length === 0) {
+    showEmpty("skills");
+    return;
+  }
+  if (!skillName) {
+    const selected = await ie({
+      message: "Select skill to view",
+      options: skills.map((s) => ({ value: s.name, label: s.name }))
+    });
+    if (lD(selected)) {
+      return;
+    }
+    skillName = selected;
+  }
+  const skill = skills.find((s) => s.name === skillName);
+  if (!skill) {
+    notFound("Skill", skillName);
+    return;
+  }
+  const skillMdPath = join4(skill.path, "SKILL.md");
+  if (!existsSync4(skillMdPath)) {
+    notFound("SKILL.md");
+    return;
+  }
+  const content = readFileSync4(skillMdPath, "utf-8");
+  console.log();
+  console.log(import_picocolors8.default.dim("─".repeat(40)));
+  console.log(content);
+  console.log(import_picocolors8.default.dim("─".repeat(40)));
+}
+
+// src/commands/upgrade.ts
+import { join as join5, dirname as dirname2 } from "node:path";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+import {
+  existsSync as existsSync5,
+  readFileSync as readFileSync5,
+  writeFileSync as writeFileSync4,
+  readdirSync as readdirSync4,
+  mkdirSync as mkdirSync3,
+  copyFileSync
+} from "node:fs";
+var import_picocolors9 = __toESM(require_picocolors(), 1);
+var PRESERVE_FILES = [
+  "opencode.json"
+];
+var PRESERVE_DIRS = [
+  "agent",
+  "command",
+  "memory"
+];
+var SKIP_DIRS = ["node_modules", ".git", "dist", "coverage"];
+function getTemplateRoot2() {
+  const __filename2 = fileURLToPath2(import.meta.url);
+  const __dirname2 = dirname2(__filename2);
+  const possiblePaths = [
+    join5(__dirname2, "template"),
+    join5(__dirname2, "..", "..", ".opencode")
+  ];
+  for (const path of possiblePaths) {
+    const opencodeDir = join5(path, ".opencode");
+    if (existsSync5(opencodeDir)) {
+      return path;
+    }
+  }
+  return null;
+}
+function getCurrentVersion(opencodeDir) {
+  const versionFile = join5(opencodeDir, ".version");
+  if (existsSync5(versionFile)) {
+    return readFileSync5(versionFile, "utf-8").trim();
+  }
+  return null;
+}
+function getPackageVersion() {
+  const __filename2 = fileURLToPath2(import.meta.url);
+  const __dirname2 = dirname2(__filename2);
+  const pkgPaths = [
+    join5(__dirname2, "..", "..", "package.json"),
+    join5(__dirname2, "..", "package.json")
+  ];
+  for (const pkgPath of pkgPaths) {
+    if (existsSync5(pkgPath)) {
+      const pkg = JSON.parse(readFileSync5(pkgPath, "utf-8"));
+      return pkg.version;
+    }
+  }
+  return "unknown";
+}
+async function checkVersion(opencodeDir) {
+  const current = getCurrentVersion(opencodeDir);
   const latest = getPackageVersion();
   return {
     current,
@@ -3281,23 +3481,23 @@ async function upgradeCommand(options = {}) {
     notInitialized();
     return;
   }
-  oe(import_picocolors8.default.bgCyan(import_picocolors8.default.black(" Upgrade ")));
+  oe(import_picocolors9.default.bgCyan(import_picocolors9.default.black(" Upgrade ")));
   const versionInfo = await checkVersion(opencodeDir);
   console.log();
-  console.log(`  ${import_picocolors8.default.bold("Installed")}  ${import_picocolors8.default.cyan(versionInfo.current || "unknown")}`);
-  console.log(`  ${import_picocolors8.default.bold("Latest")}     ${import_picocolors8.default.cyan(versionInfo.latest || "unknown")}`);
+  console.log(`  ${import_picocolors9.default.bold("Installed")}  ${import_picocolors9.default.cyan(versionInfo.current || "unknown")}`);
+  console.log(`  ${import_picocolors9.default.bold("Latest")}     ${import_picocolors9.default.cyan(versionInfo.latest || "unknown")}`);
   console.log();
   if (options.check) {
     if (versionInfo.needsUpdate) {
-      f2.info(`Update available: ${import_picocolors8.default.cyan(versionInfo.latest)}`);
-      $e(`Run ${import_picocolors8.default.cyan("ock upgrade")} to update`);
+      f2.info(`Update available: ${import_picocolors9.default.cyan(versionInfo.latest)}`);
+      $e(`Run ${import_picocolors9.default.cyan("ock upgrade")} to update`);
     } else {
-      $e(import_picocolors8.default.green("Already up to date"));
+      $e(import_picocolors9.default.green("Already up to date"));
     }
     return;
   }
   if (!versionInfo.needsUpdate && !options.force) {
-    $e(import_picocolors8.default.green("Already up to date"));
+    $e(import_picocolors9.default.green("Already up to date"));
     return;
   }
   const templateRoot = getTemplateRoot2();
@@ -3333,205 +3533,10 @@ async function upgradeCommand(options = {}) {
     f2.info(`Preserved ${result.preserved.length} user files`);
   }
   le("cd .opencode && bun install", "Run if dependencies changed");
-  $e(import_picocolors8.default.green(`Upgraded to ${versionInfo.latest}`));
-}
-
-// src/commands/completion.ts
-var import_picocolors9 = __toESM(require_picocolors(), 1);
-var BASH_COMPLETION = `# ock bash completion
-_ock_completion() {
-    local cur prev commands
-    COMPREPLY=()
-    cur="\${COMP_WORDS[COMP_CWORD]}"
-    prev="\${COMP_WORDS[COMP_CWORD-1]}"
-    
-    commands="init config upgrade agent skill doctor status help"
-    
-    case "\${prev}" in
-        ock)
-            COMPREPLY=( $(compgen -W "\${commands}" -- "\${cur}") )
-            return 0
-            ;;
-        agent)
-            COMPREPLY=( $(compgen -W "list add view" -- "\${cur}") )
-            return 0
-            ;;
-        skill)
-            COMPREPLY=( $(compgen -W "list add view" -- "\${cur}") )
-            return 0
-            ;;
-        config)
-            COMPREPLY=( $(compgen -W "model mcp permission keybinds show" -- "\${cur}") )
-            return 0
-            ;;
-        init)
-            COMPREPLY=( $(compgen -W "--force" -- "\${cur}") )
-            return 0
-            ;;
-        upgrade)
-            COMPREPLY=( $(compgen -W "--force --check" -- "\${cur}") )
-            return 0
-            ;;
-        *)
-            ;;
-    esac
-}
-complete -F _ock_completion ock
-`;
-var ZSH_COMPLETION = `#compdef ock
-
-_ock() {
-    local -a commands
-    local -a agent_actions
-    local -a skill_actions
-    local -a config_actions
-    
-    commands=(
-        'init:Initialize OpenCodeKit in current directory'
-        'config:Edit opencode.json'
-        'upgrade:Update templates to latest version'
-        'agent:Manage agents'
-        'skill:Manage skills'
-        'doctor:Check project health'
-        'status:Show project overview'
-        'help:Show help'
-    )
-    
-    agent_actions=(
-        'list:List all agents'
-        'add:Create a new agent'
-        'view:View agent details'
-    )
-    
-    skill_actions=(
-        'list:List all skills'
-        'add:Install a skill'
-        'view:View skill details'
-    )
-    
-    config_actions=(
-        'model:Change default model'
-        'mcp:Manage MCP servers'
-        'permission:Edit permissions'
-        'keybinds:Edit keyboard shortcuts'
-        'show:View current config'
-    )
-    
-    case "$words[2]" in
-        agent)
-            _describe -t actions 'agent action' agent_actions
-            ;;
-        skill)
-            _describe -t actions 'skill action' skill_actions
-            ;;
-        config)
-            _describe -t actions 'config action' config_actions
-            ;;
-        init)
-            _arguments '--force[Reinitialize even if already exists]'
-            ;;
-        upgrade)
-            _arguments \\
-                '--force[Force upgrade even if up to date]' \\
-                '--check[Check for updates only]'
-            ;;
-        *)
-            _describe -t commands 'command' commands
-            ;;
-    esac
-}
-
-_ock "$@"
-`;
-var FISH_COMPLETION = `# ock fish completion
-complete -c ock -n "__fish_use_subcommand" -a "init" -d "Initialize OpenCodeKit"
-complete -c ock -n "__fish_use_subcommand" -a "config" -d "Edit opencode.json"
-complete -c ock -n "__fish_use_subcommand" -a "upgrade" -d "Update templates"
-complete -c ock -n "__fish_use_subcommand" -a "agent" -d "Manage agents"
-complete -c ock -n "__fish_use_subcommand" -a "skill" -d "Manage skills"
-complete -c ock -n "__fish_use_subcommand" -a "doctor" -d "Check project health"
-complete -c ock -n "__fish_use_subcommand" -a "status" -d "Show project overview"
-
-# agent subcommands
-complete -c ock -n "__fish_seen_subcommand_from agent" -a "list" -d "List agents"
-complete -c ock -n "__fish_seen_subcommand_from agent" -a "add" -d "Add agent"
-complete -c ock -n "__fish_seen_subcommand_from agent" -a "view" -d "View agent"
-
-# skill subcommands
-complete -c ock -n "__fish_seen_subcommand_from skill" -a "list" -d "List skills"
-complete -c ock -n "__fish_seen_subcommand_from skill" -a "add" -d "Add skill"
-complete -c ock -n "__fish_seen_subcommand_from skill" -a "view" -d "View skill"
-
-# config subcommands
-complete -c ock -n "__fish_seen_subcommand_from config" -a "model" -d "Change model"
-complete -c ock -n "__fish_seen_subcommand_from config" -a "mcp" -d "Manage MCP"
-complete -c ock -n "__fish_seen_subcommand_from config" -a "permission" -d "Edit permissions"
-complete -c ock -n "__fish_seen_subcommand_from config" -a "keybinds" -d "Edit keybinds"
-complete -c ock -n "__fish_seen_subcommand_from config" -a "show" -d "View config"
-
-# init options
-complete -c ock -n "__fish_seen_subcommand_from init" -l force -d "Reinitialize"
-
-# upgrade options
-complete -c ock -n "__fish_seen_subcommand_from upgrade" -l force -d "Force upgrade"
-complete -c ock -n "__fish_seen_subcommand_from upgrade" -l check -d "Check only"
-`;
-async function completionCommand(shell) {
-  if (!shell) {
-    oe(import_picocolors9.default.bgCyan(import_picocolors9.default.black(" Shell Completion ")));
-    const selected = await ie({
-      message: "Select your shell",
-      options: [
-        { value: "bash", label: "Bash" },
-        { value: "zsh", label: "Zsh" },
-        { value: "fish", label: "Fish" }
-      ]
-    });
-    if (lD(selected)) {
-      ue("Cancelled");
-      return;
-    }
-    shell = selected;
-  }
-  let script;
-  let setupInstructions;
-  switch (shell) {
-    case "bash":
-      script = BASH_COMPLETION;
-      setupInstructions = `Add to ~/.bashrc:
-  source <(ock completion bash)
-
-Or save to file:
-  ock completion bash > ~/.local/share/bash-completion/completions/ock`;
-      break;
-    case "zsh":
-      script = ZSH_COMPLETION;
-      setupInstructions = `Add to ~/.zshrc (before compinit):
-  source <(ock completion zsh)
-
-Or save to fpath:
-  ock completion zsh > ~/.zsh/completions/_ock
-  # Then add to ~/.zshrc: fpath=(~/.zsh/completions $fpath)`;
-      break;
-    case "fish":
-      script = FISH_COMPLETION;
-      setupInstructions = `Save to fish completions:
-  ock completion fish > ~/.config/fish/completions/ock.fish`;
-      break;
-    default:
-      f2.error(`Unknown shell: ${shell}`);
-      return;
-  }
-  console.log(script);
-  console.error();
-  console.error(import_picocolors9.default.bold("Setup:"));
-  console.error(import_picocolors9.default.dim(setupInstructions));
+  $e(import_picocolors9.default.green(`Upgraded to ${versionInfo.latest}`));
 }
 
 // src/commands/menu.ts
-var import_picocolors10 = __toESM(require_picocolors(), 1);
-import { existsSync as existsSync6, readdirSync as readdirSync5, lstatSync as lstatSync3 } from "node:fs";
-import { join as join6, basename as basename2 } from "node:path";
 async function interactiveMenu(version) {
   oe(import_picocolors10.default.bgCyan(import_picocolors10.default.black(` OpenCodeKit v${version} `)));
   const action = await ie({