mini-coder 0.0.4 → 0.0.6

package/dist/mc.js

@@ -2,16 +2,86 @@
 // @bun
 
 // src/index.ts
-import * as c7 from "yoctocolors";
+import * as c8 from "yoctocolors";
 
 // src/agent/agent.ts
-import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
-import { homedir as homedir5 } from "os";
-import { join as join11 } from "path";
-import * as c6 from "yoctocolors";
+import { existsSync as existsSync6, readFileSync as readFileSync5 } from "fs";
+import { join as join14 } from "path";
+import * as c7 from "yoctocolors";
+
+// src/cli/agents.ts
+import { existsSync, readFileSync, readdirSync } from "fs";
+import { homedir } from "os";
+import { basename, join } from "path";
+
+// src/cli/frontmatter.ts
+var FM_RE = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/;
+function parseFrontmatter(raw) {
+  const m = raw.match(FM_RE);
+  if (!m)
+    return { meta: {}, body: raw };
+  const meta = {};
+  const yamlBlock = m[1] ?? "";
+  for (const line of yamlBlock.split(`
+`)) {
+    const colon = line.indexOf(":");
+    if (colon === -1)
+      continue;
+    const key = line.slice(0, colon).trim();
+    const val = line.slice(colon + 1).trim().replace(/^["']|["']$/g, "");
+    if (key === "name")
+      meta.name = val;
+    if (key === "description")
+      meta.description = val;
+    if (key === "model")
+      meta.model = val;
+  }
+  return { meta, body: (m[2] ?? "").trim() };
+}
+
+// src/cli/agents.ts
+function loadFromDir(dir, source) {
+  const agents = new Map;
+  if (!existsSync(dir))
+    return agents;
+  let entries;
+  try {
+    entries = readdirSync(dir);
+  } catch {
+    return agents;
+  }
+  for (const entry of entries) {
+    if (!entry.endsWith(".md"))
+      continue;
+    const name = basename(entry, ".md");
+    const filePath = join(dir, entry);
+    let raw;
+    try {
+      raw = readFileSync(filePath, "utf-8");
+    } catch {
+      continue;
+    }
+    const { meta, body } = parseFrontmatter(raw);
+    agents.set(name, {
+      name,
+      description: meta.description ?? name,
+      ...meta.model ? { model: meta.model } : {},
+      systemPrompt: body,
+      source
+    });
+  }
+  return agents;
+}
+function loadAgents(cwd) {
+  const globalDir = join(homedir(), ".agents", "agents");
+  const localDir = join(cwd, ".agents", "agents");
+  const global = loadFromDir(globalDir, "global");
+  const local = loadFromDir(localDir, "local");
+  return new Map([...global, ...local]);
+}
 
 // src/cli/commands.ts
-import * as c3 from "yoctocolors";
+import * as c4 from "yoctocolors";
 
 // src/llm-api/providers.ts
 import { createAnthropic } from "@ai-sdk/anthropic";
@@ -20,34 +90,18 @@ import { createOpenAI } from "@ai-sdk/openai";
 import { createOpenAICompatible } from "@ai-sdk/openai-compatible";
 import { createOllama } from "ollama-ai-provider";
 var ZEN_BASE = "https://opencode.ai/zen/v1";
-var ZEN_ANTHROPIC_MODELS = new Set([
-  "claude-opus-4-6",
-  "claude-opus-4-5",
-  "claude-opus-4-1",
-  "claude-sonnet-4-6",
-  "claude-sonnet-4-5",
-  "claude-sonnet-4",
-  "claude-haiku-4-5",
-  "claude-3-5-haiku"
-]);
-var ZEN_OPENAI_MODELS = new Set([
-  "gpt-5.2",
-  "gpt-5.2-codex",
-  "gpt-5.1",
-  "gpt-5.1-codex",
-  "gpt-5.1-codex-max",
-  "gpt-5.1-codex-mini",
-  "gpt-5",
-  "gpt-5-codex",
-  "gpt-5-nano"
-]);
-var ZEN_GOOGLE_MODELS = new Set([
-  "gemini-3.1-pro",
-  "gemini-3-pro",
-  "gemini-3-flash"
-]);
+function zenEndpointFor(modelId) {
+  if (modelId.startsWith("claude-"))
+    return zenAnthropic()(modelId);
+  if (modelId.startsWith("gpt-"))
+    return zenOpenAI()(modelId);
+  if (modelId.startsWith("gemini-"))
+    return zenGoogle()(modelId);
+  return zenCompat()(modelId);
+}
 var _zenAnthropic = null;
 var _zenOpenAI = null;
+var _zenGoogle = null;
 var _zenCompat = null;
 function getZenApiKey() {
   const key = process.env.OPENCODE_API_KEY;
@@ -73,11 +127,14 @@ function zenOpenAI() {
   }
   return _zenOpenAI;
 }
-function zenGoogle(modelId) {
-  return createGoogleGenerativeAI({
-    apiKey: getZenApiKey(),
-    baseURL: ZEN_BASE
-  });
+function zenGoogle() {
+  if (!_zenGoogle) {
+    _zenGoogle = createGoogleGenerativeAI({
+      apiKey: getZenApiKey(),
+      baseURL: ZEN_BASE
+    });
+  }
+  return _zenGoogle;
 }
 function zenCompat() {
   if (!_zenCompat) {
@@ -146,16 +203,7 @@ function resolveModel(modelString) {
   const modelId = modelString.slice(slashIdx + 1);
   switch (provider) {
     case "zen": {
-      if (ZEN_ANTHROPIC_MODELS.has(modelId)) {
-        return zenAnthropic()(modelId);
-      }
-      if (ZEN_OPENAI_MODELS.has(modelId)) {
-        return zenOpenAI()(modelId);
-      }
-      if (ZEN_GOOGLE_MODELS.has(modelId)) {
-        return zenGoogle(modelId)(modelId);
-      }
-      return zenCompat()(modelId);
+      return zenEndpointFor(modelId);
     }
     case "anthropic":
       return directAnthropic()(modelId);
@@ -235,17 +283,17 @@ async function fetchAvailableModels() {
 
 // src/session/db.ts
 import { Database } from "bun:sqlite";
-import { existsSync, mkdirSync, unlinkSync } from "fs";
-import { homedir } from "os";
-import { join } from "path";
+import { existsSync as existsSync2, mkdirSync, unlinkSync } from "fs";
+import { homedir as homedir2 } from "os";
+import { join as join2 } from "path";
 function getConfigDir() {
-  return join(homedir(), ".config", "mini-coder");
+  return join2(homedir2(), ".config", "mini-coder");
 }
 function getDbPath() {
   const dir = getConfigDir();
-  if (!existsSync(dir))
+  if (!existsSync2(dir))
     mkdirSync(dir, { recursive: true });
-  return join(dir, "sessions.db");
+  return join2(dir, "sessions.db");
 }
 var DB_VERSION = 3;
 var SCHEMA = `
@@ -321,7 +369,7 @@ function getDb() {
         db.close();
       } catch {}
       for (const path of [dbPath, `${dbPath}-wal`, `${dbPath}-shm`]) {
-        if (existsSync(path))
+        if (existsSync2(path))
           unlinkSync(path);
       }
       db = new Database(dbPath, { create: true });
@@ -471,6 +519,18 @@ function generateSessionId() {
   return `${ts}-${rand}`;
 }
 
+// src/cli/custom-commands.ts
+import { existsSync as existsSync3, readFileSync as readFileSync2, readdirSync as readdirSync2 } from "fs";
+import { homedir as homedir4 } from "os";
+import { basename as basename2, join as join3 } from "path";
+
+// src/cli/config-conflicts.ts
+import * as c3 from "yoctocolors";
+
+// src/cli/output.ts
+import { homedir as homedir3 } from "os";
+import * as c2 from "yoctocolors";
+
 // src/cli/markdown.ts
 import * as c from "yoctocolors";
 function renderInline(text) {
@@ -584,10 +644,11 @@ function renderChunk(text, inFence) {
 }
 
 // src/cli/output.ts
-import { homedir as homedir2 } from "os";
-import * as c2 from "yoctocolors";
-var HOME = homedir2();
-var PACKAGE_VERSION = "0.0.3";
+var HOME = homedir3();
+var PACKAGE_VERSION = "0.1.0";
+function tildePath(p) {
+  return p.startsWith(HOME) ? `~${p.slice(HOME.length)}` : p;
+}
 function restoreTerminal() {
   try {
     process.stderr.write("\x1B[?25h");
@@ -1209,6 +1270,165 @@ var PREFIX = {
   success: G.ok
 };
 
+// src/cli/config-conflicts.ts
+function warnConventionConflicts(kind, scope, agentsNames, claudeNames) {
+  const agents = new Set(agentsNames);
+  const claude = new Set(claudeNames);
+  const conflicts = [];
+  for (const name of agents) {
+    if (claude.has(name))
+      conflicts.push(name);
+  }
+  if (conflicts.length === 0)
+    return;
+  conflicts.sort((a, b) => a.localeCompare(b));
+  const list = conflicts.map((n) => c3.cyan(n)).join(c3.dim(", "));
+  writeln(`${G.warn} conflicting ${kind} in ${scope} .agents and .claude: ${list} ${c3.dim("\u2014 using .agents version")}`);
+}
+
+// src/cli/custom-commands.ts
+function loadFromDir2(dir, source) {
+  const commands = new Map;
+  if (!existsSync3(dir))
+    return commands;
+  let entries;
+  try {
+    entries = readdirSync2(dir);
+  } catch {
+    return commands;
+  }
+  for (const entry of entries) {
+    if (!entry.endsWith(".md"))
+      continue;
+    const name = basename2(entry, ".md");
+    const filePath = join3(dir, entry);
+    let raw;
+    try {
+      raw = readFileSync2(filePath, "utf-8");
+    } catch {
+      continue;
+    }
+    const { meta, body } = parseFrontmatter(raw);
+    commands.set(name, {
+      name,
+      description: meta.description ?? name,
+      ...meta.model ? { model: meta.model } : {},
+      template: body,
+      source
+    });
+  }
+  return commands;
+}
+function loadCustomCommands(cwd) {
+  const globalAgentsDir = join3(homedir4(), ".agents", "commands");
+  const globalClaudeDir = join3(homedir4(), ".claude", "commands");
+  const localAgentsDir = join3(cwd, ".agents", "commands");
+  const localClaudeDir = join3(cwd, ".claude", "commands");
+  const globalAgents = loadFromDir2(globalAgentsDir, "global");
+  const globalClaude = loadFromDir2(globalClaudeDir, "global");
+  const localAgents = loadFromDir2(localAgentsDir, "local");
+  const localClaude = loadFromDir2(localClaudeDir, "local");
+  warnConventionConflicts("commands", "global", globalAgents.keys(), globalClaude.keys());
+  warnConventionConflicts("commands", "local", localAgents.keys(), localClaude.keys());
+  return new Map([
+    ...globalClaude,
+    ...globalAgents,
+    ...localClaude,
+    ...localAgents
+  ]);
+}
+async function expandTemplate(template, args, cwd) {
+  const tokens = args.match(/("([^"]*)")|('([^']*)')|(\S+)/g)?.map((t) => t.replace(/^["']|["']$/g, "")) ?? [];
+  let result = template;
+  for (let i = 9;i >= 1; i--) {
+    result = result.replaceAll(`$${i}`, tokens[i - 1] ?? "");
+  }
+  result = result.replaceAll("$ARGUMENTS", args);
+  const SHELL_RE = /!`([^`]+)`/g;
+  const shellMatches = [...result.matchAll(SHELL_RE)];
+  for (const match of shellMatches) {
+    const cmd = match[1] ?? "";
+    let output = "";
+    try {
+      const signal = AbortSignal.timeout(1e4);
+      const proc = Bun.spawn(["bash", "-c", cmd], {
+        cwd,
+        stdout: "pipe",
+        stderr: "pipe"
+      });
+      await Promise.race([
+        proc.exited,
+        new Promise((_, reject) => signal.addEventListener("abort", () => {
+          proc.kill();
+          reject(new Error("timeout"));
+        }))
+      ]);
+      const [stdout, stderr] = await Promise.all([
+        new Response(proc.stdout).text(),
+        new Response(proc.stderr).text()
+      ]);
+      const exitCode = proc.exitCode ?? 0;
+      output = exitCode === 0 ? [stdout, stderr].filter(Boolean).join(`
+`).trim() : stdout.trim();
+    } catch {}
+    result = result.replaceAll(match[0], output);
+  }
+  return result;
+}
+
+// src/cli/skills.ts
+import { existsSync as existsSync4, readFileSync as readFileSync3, readdirSync as readdirSync3, statSync } from "fs";
+import { homedir as homedir5 } from "os";
+import { join as join4 } from "path";
+function loadFromDir3(dir, source) {
+  const skills = new Map;
+  if (!existsSync4(dir))
+    return skills;
+  let entries;
+  try {
+    entries = readdirSync3(dir);
+  } catch {
+    return skills;
+  }
+  for (const entry of entries) {
+    const skillFile = join4(dir, entry, "SKILL.md");
+    try {
+      if (!statSync(join4(dir, entry)).isDirectory())
+        continue;
+      if (!existsSync4(skillFile))
+        continue;
+      const content = readFileSync3(skillFile, "utf-8");
+      const { meta } = parseFrontmatter(content);
+      const name = meta.name ?? entry;
+      skills.set(name, {
+        name,
+        description: meta.description ?? name,
+        content,
+        source
+      });
+    } catch {}
+  }
+  return skills;
+}
+function loadSkills(cwd) {
+  const globalAgentsDir = join4(homedir5(), ".agents", "skills");
+  const globalClaudeDir = join4(homedir5(), ".claude", "skills");
+  const localAgentsDir = join4(cwd, ".agents", "skills");
+  const localClaudeDir = join4(cwd, ".claude", "skills");
+  const globalAgents = loadFromDir3(globalAgentsDir, "global");
+  const globalClaude = loadFromDir3(globalClaudeDir, "global");
+  const localAgents = loadFromDir3(localAgentsDir, "local");
+  const localClaude = loadFromDir3(localClaudeDir, "local");
+  warnConventionConflicts("skills", "global", globalAgents.keys(), globalClaude.keys());
+  warnConventionConflicts("skills", "local", localAgents.keys(), localClaude.keys());
+  return new Map([
+    ...globalClaude,
+    ...globalAgents,
+    ...localClaude,
+    ...localAgents
+  ]);
+}
+
 // src/cli/commands.ts
 async function handleModel(ctx, args) {
   if (args) {
@@ -1219,20 +1439,20 @@ async function handleModel(ctx, args) {
       if (match) {
         modelId = match.id;
       } else {
-        writeln(`${PREFIX.error} unknown model ${c3.cyan(args)}  ${c3.dim("\u2014 run /models for the full list")}`);
+        writeln(`${PREFIX.error} unknown model ${c4.cyan(args)}  ${c4.dim("\u2014 run /models for the full list")}`);
         return;
       }
     }
     ctx.setModel(modelId);
-    writeln(`${PREFIX.success} model \u2192 ${c3.cyan(modelId)}`);
+    writeln(`${PREFIX.success} model \u2192 ${c4.cyan(modelId)}`);
     return;
   }
-  writeln(`${c3.dim("  fetching models\u2026")}`);
+  writeln(`${c4.dim("  fetching models\u2026")}`);
   const models = await fetchAvailableModels();
   process.stdout.write("\x1B[1A\r\x1B[2K");
   if (models.length === 0) {
     writeln(`${PREFIX.error} No models found. Check your API keys or Ollama connection.`);
-    writeln(c3.dim("  Set OPENCODE_API_KEY for Zen, or start Ollama for local models."));
+    writeln(c4.dim("  Set OPENCODE_API_KEY for Zen, or start Ollama for local models."));
     return;
   }
   const byProvider = new Map;
@@ -1246,27 +1466,27 @@ async function handleModel(ctx, args) {
   }
   writeln();
   for (const [provider, list] of byProvider) {
-    writeln(c3.bold(`  ${provider}`));
+    writeln(c4.bold(`  ${provider}`));
     for (const m of list) {
       const isCurrent = ctx.currentModel === m.id;
-      const freeTag = m.free ? c3.green(" free") : "";
-      const ctxTag = m.context ? c3.dim(` ${Math.round(m.context / 1000)}k`) : "";
-      const cur = isCurrent ? c3.cyan(" \u25C0") : "";
-      writeln(`    ${c3.dim("\xB7")} ${m.displayName}${freeTag}${ctxTag}${cur}`);
-      writeln(`      ${c3.dim(m.id)}`);
+      const freeTag = m.free ? c4.green(" free") : "";
+      const ctxTag = m.context ? c4.dim(` ${Math.round(m.context / 1000)}k`) : "";
+      const cur = isCurrent ? c4.cyan(" \u25C0") : "";
+      writeln(`    ${c4.dim("\xB7")} ${m.displayName}${freeTag}${ctxTag}${cur}`);
+      writeln(`      ${c4.dim(m.id)}`);
     }
   }
   writeln();
-  writeln(c3.dim("  /model <id>  to switch  \xB7  e.g. /model zen/claude-sonnet-4-6"));
+  writeln(c4.dim("  /model <id>  to switch  \xB7  e.g. /model zen/claude-sonnet-4-6"));
 }
 function handlePlan(ctx) {
   ctx.setPlanMode(!ctx.planMode);
   if (ctx.planMode) {
     if (ctx.ralphMode)
       ctx.setRalphMode(false);
-    writeln(`${PREFIX.info} ${c3.yellow("plan mode")} ${c3.dim("\u2014 read-only tools + MCP, no writes or shell")}`);
+    writeln(`${PREFIX.info} ${c4.yellow("plan mode")} ${c4.dim("\u2014 read-only tools + MCP, no writes or shell")}`);
   } else {
-    writeln(`${PREFIX.info} ${c3.dim("plan mode off")}`);
+    writeln(`${PREFIX.info} ${c4.dim("plan mode off")}`);
   }
 }
 function handleRalph(ctx) {
@@ -1274,17 +1494,17 @@ function handleRalph(ctx) {
   if (ctx.ralphMode) {
     if (ctx.planMode)
       ctx.setPlanMode(false);
-    writeln(`${PREFIX.info} ${c3.magenta("ralph mode")} ${c3.dim("\u2014 loops until done, fresh context each iteration")}`);
+    writeln(`${PREFIX.info} ${c4.magenta("ralph mode")} ${c4.dim("\u2014 loops until done, fresh context each iteration")}`);
   } else {
-    writeln(`${PREFIX.info} ${c3.dim("ralph mode off")}`);
+    writeln(`${PREFIX.info} ${c4.dim("ralph mode off")}`);
   }
 }
 async function handleUndo(ctx) {
   const ok = await ctx.undoLastTurn();
   if (ok) {
-    writeln(`${PREFIX.success} ${c3.dim("last turn undone \u2014 history and files restored")}`);
+    writeln(`${PREFIX.success} ${c4.dim("last turn undone \u2014 history and files restored")}`);
   } else {
-    writeln(`${PREFIX.info} ${c3.dim("nothing to undo")}`);
+    writeln(`${PREFIX.info} ${c4.dim("nothing to undo")}`);
   }
 }
 async function handleMcp(ctx, args) {
@@ -1294,28 +1514,28 @@ async function handleMcp(ctx, args) {
     case "list": {
       const servers = listMcpServers();
       if (servers.length === 0) {
-        writeln(c3.dim("  no MCP servers configured"));
-        writeln(c3.dim("  /mcp add <name> http <url>  \xB7  /mcp add <name> stdio <cmd> [args...]"));
+        writeln(c4.dim("  no MCP servers configured"));
+        writeln(c4.dim("  /mcp add <name> http <url>  \xB7  /mcp add <name> stdio <cmd> [args...]"));
         return;
       }
       writeln();
       for (const s of servers) {
-        const detail = s.url ? c3.dim(`  ${s.url}`) : s.command ? c3.dim(`  ${s.command}`) : "";
-        writeln(`  ${c3.yellow("\u2699")} ${c3.bold(s.name)}  ${c3.dim(s.transport)}${detail}`);
+        const detail = s.url ? c4.dim(`  ${s.url}`) : s.command ? c4.dim(`  ${s.command}`) : "";
+        writeln(`  ${c4.yellow("\u2699")} ${c4.bold(s.name)}  ${c4.dim(s.transport)}${detail}`);
       }
       return;
     }
     case "add": {
       const [, name, transport, ...rest] = parts;
       if (!name || !transport || rest.length === 0) {
-        writeln(c3.red("  usage: /mcp add <name> http <url>"));
-        writeln(c3.red("         /mcp add <name> stdio <cmd> [args...]"));
+        writeln(c4.red("  usage: /mcp add <name> http <url>"));
+        writeln(c4.red("         /mcp add <name> stdio <cmd> [args...]"));
         return;
       }
       if (transport === "http") {
         const url = rest[0];
         if (!url) {
-          writeln(c3.red("  usage: /mcp add <name> http <url>"));
+          writeln(c4.red("  usage: /mcp add <name> http <url>"));
           return;
         }
         upsertMcpServer({
@@ -1329,7 +1549,7 @@ async function handleMcp(ctx, args) {
       } else if (transport === "stdio") {
         const [command, ...cmdArgs] = rest;
         if (!command) {
-          writeln(c3.red("  usage: /mcp add <name> stdio <cmd> [args...]"));
+          writeln(c4.red("  usage: /mcp add <name> stdio <cmd> [args...]"));
           return;
         }
         upsertMcpServer({
@@ -1341,14 +1561,14 @@ async function handleMcp(ctx, args) {
           env: null
         });
       } else {
-        writeln(c3.red(`  unknown transport: ${transport}  (use http or stdio)`));
+        writeln(c4.red(`  unknown transport: ${transport}  (use http or stdio)`));
         return;
       }
       try {
         await ctx.connectMcpServer(name);
-        writeln(`${PREFIX.success} mcp server ${c3.cyan(name)} added and connected`);
+        writeln(`${PREFIX.success} mcp server ${c4.cyan(name)} added and connected`);
       } catch (e) {
-        writeln(`${PREFIX.success} mcp server ${c3.cyan(name)} saved  ${c3.dim(`(connection failed: ${String(e)})`)}`);
+        writeln(`${PREFIX.success} mcp server ${c4.cyan(name)} saved  ${c4.dim(`(connection failed: ${String(e)})`)}`);
       }
       return;
     }
@@ -1356,50 +1576,36 @@ async function handleMcp(ctx, args) {
     case "rm": {
       const [, name] = parts;
       if (!name) {
-        writeln(c3.red("  usage: /mcp remove <name>"));
+        writeln(c4.red("  usage: /mcp remove <name>"));
         return;
       }
       deleteMcpServer(name);
-      writeln(`${PREFIX.success} mcp server ${c3.cyan(name)} removed`);
+      writeln(`${PREFIX.success} mcp server ${c4.cyan(name)} removed`);
       return;
     }
     default:
-      writeln(c3.red(`  unknown: /mcp ${sub}`));
-      writeln(c3.dim("  subcommands: list \xB7 add \xB7 remove"));
+      writeln(c4.red(`  unknown: /mcp ${sub}`));
+      writeln(c4.dim("  subcommands: list \xB7 add \xB7 remove"));
   }
 }
 var REVIEW_PROMPT = (cwd, focus) => `You are a code reviewer. Review recent changes and provide actionable feedback.
 
 Working directory: ${cwd}
-${focus ? `Focus: ${focus}` : ""}
-
-## What to review
-- No args: \`git diff\` (unstaged) + \`git diff --cached\` (staged) + \`git status --short\` (untracked)
-- Commit hash: \`git show <hash>\`
-- Branch: \`git diff <branch>...HEAD\`
-- PR number/URL: \`gh pr view\` + \`gh pr diff\`
-
-## How to review
-After getting the diff, read the full files changed \u2014 diffs alone miss context.
-Check for AGENTS.md or CONVENTIONS.md for project conventions.
-
-## What to flag (priority order)
-1. **Bugs** \u2014 logic errors, missing edge cases, unhandled errors, race conditions, security issues. Be certain before flagging; investigate first.
-2. **Structure** \u2014 wrong abstraction, established patterns ignored, excessive nesting.
-3. **Performance** \u2014 only if obviously problematic (O(n\xB2) on unbounded data, N+1, blocking hot paths).
-4. **Style** \u2014 only clear violations of project conventions. Don't be a zealot.
-
-Only review the changed code, not pre-existing code.
-
-## Output
-- Be direct and specific: quote code, cite file and line number.
-- State the scenario/input that triggers a bug \u2014 severity depends on this.
-- No flattery, no filler. Matter-of-fact tone.
-- End with a short **Summary** of the most important items.
+${focus ? `Review: ${focus}` : "Review the current changes"}
+
+Perform a sensible code review:
+
+- Correctness: Are the changes in alignment with the goal?
+- Code quality: Is there duplicate, dead or bad code patterns introduced or as a result of the changes?
+- Is the code performant?
+- Never flag style choices as bugs, don't be a zeolot.
+- Never flag false positives, if you think something is wrong, check before saying it's an issue.
+
+Output a small summary with only the issues found. If nothing of note was found reply saying that.
 `;
 async function handleReview(ctx, args) {
   const focus = args.trim();
-  writeln(`${PREFIX.info} ${c3.cyan("review")} ${c3.dim("\u2014 spawning review subagent\u2026")}`);
+  writeln(`${PREFIX.info} ${c4.cyan("review")} ${c4.dim("\u2014 spawning review subagent\u2026")}`);
   writeln();
   try {
     const output = await ctx.runSubagent(REVIEW_PROMPT(ctx.cwd, focus));
@@ -1424,9 +1630,37 @@ ${output.result}
 }
 function handleNew(ctx) {
   ctx.startNewSession();
-  writeln(`${PREFIX.success} ${c3.dim("new session started \u2014 context cleared")}`);
+  writeln(`${PREFIX.success} ${c4.dim("new session started \u2014 context cleared")}`);
+}
+async function handleCustomCommand(cmd, args, ctx) {
+  const prompt = await expandTemplate(cmd.template, args, ctx.cwd);
+  const label = c4.cyan(cmd.name);
+  const srcPath = cmd.source === "local" ? `.agents/commands/${cmd.name}.md` : `~/.agents/commands/${cmd.name}.md`;
+  const src = c4.dim(`[${srcPath}]`);
+  writeln(`${PREFIX.info} ${label} ${src}`);
+  writeln();
+  try {
+    const output = await ctx.runSubagent(prompt, cmd.model);
+    if (output.activity.length) {
+      renderSubagentActivity(output.activity, "  ", 1);
+      writeln();
+    }
+    write(renderMarkdown(output.result));
+    writeln();
+    return {
+      type: "inject-user-message",
+      text: `/${cmd.name} output:
+
+${output.result}
+
+<system-message>Summarize the findings above to the user.</system-message>`
+    };
+  } catch (e) {
+    writeln(`${PREFIX.error} /${cmd.name} failed: ${String(e)}`);
+    return { type: "handled" };
+  }
 }
-function handleHelp() {
+function handleHelp(ctx, custom) {
   writeln();
   const cmds = [
     ["/model [id]", "list or switch models (fetches live list)"],
@@ -1445,16 +1679,49 @@ function handleHelp() {
     ["/exit", "quit"]
   ];
   for (const [cmd, desc] of cmds) {
-    writeln(`  ${c3.cyan(cmd.padEnd(26))} ${c3.dim(desc)}`);
+    writeln(`  ${c4.cyan(cmd.padEnd(26))} ${c4.dim(desc)}`);
+  }
+  if (custom.size > 0) {
+    writeln();
+    writeln(c4.dim("  custom commands:"));
+    for (const cmd of custom.values()) {
+      const tag = cmd.source === "local" ? c4.dim(" (local)") : c4.dim(" (global)");
+      writeln(`  ${c4.green(`/${cmd.name}`.padEnd(26))} ${c4.dim(cmd.description)}${tag}`);
+    }
+  }
+  const agents = loadAgents(ctx.cwd);
+  if (agents.size > 0) {
+    writeln();
+    writeln(c4.dim("  agents  (~/.agents/agents/ or .agents/agents/):"));
+    for (const agent of agents.values()) {
+      const tag = agent.source === "local" ? c4.dim(" (local)") : c4.dim(" (global)");
+      writeln(`  ${c4.magenta(`@${agent.name}`.padEnd(26))} ${c4.dim(agent.description)}${tag}`);
+    }
+  }
+  const skills = loadSkills(ctx.cwd);
+  if (skills.size > 0) {
+    writeln();
+    writeln(c4.dim("  skills  (~/.agents/skills/ or .agents/skills/):"));
+    for (const skill of skills.values()) {
+      const tag = skill.source === "local" ? c4.dim(" (local)") : c4.dim(" (global)");
+      writeln(`  ${c4.yellow(`@${skill.name}`.padEnd(26))} ${c4.dim(skill.description)}${tag}`);
+    }
   }
   writeln();
-  writeln(`  ${c3.green("@file".padEnd(26))} ${c3.dim("inject file contents into prompt (Tab to complete)")}`);
-  writeln(`  ${c3.green("!cmd".padEnd(26))} ${c3.dim("run shell command, output added as context")}`);
+  writeln(`  ${c4.green("@agent".padEnd(26))} ${c4.dim("run prompt through a custom agent (Tab to complete)")}`);
+  writeln(`  ${c4.green("@skill".padEnd(26))} ${c4.dim("inject skill instructions into prompt (Tab to complete)")}`);
+  writeln(`  ${c4.green("@file".padEnd(26))} ${c4.dim("inject file contents into prompt (Tab to complete)")}`);
+  writeln(`  ${c4.green("!cmd".padEnd(26))} ${c4.dim("run shell command, output added as context")}`);
   writeln();
-  writeln(`  ${c3.dim("ctrl+c")}  cancel  ${c3.dim("\xB7")}  ${c3.dim("ctrl+d")}  exit  ${c3.dim("\xB7")}  ${c3.dim("ctrl+r")}  history search  ${c3.dim("\xB7")}  ${c3.dim("\u2191\u2193")}  history`);
+  writeln(`  ${c4.dim("ctrl+c")}  cancel  ${c4.dim("\xB7")}  ${c4.dim("ctrl+d")}  exit  ${c4.dim("\xB7")}  ${c4.dim("ctrl+r")}  history search  ${c4.dim("\xB7")}  ${c4.dim("\u2191\u2193")}  history`);
   writeln();
 }
 async function handleCommand(command, args, ctx) {
+  const custom = loadCustomCommands(ctx.cwd);
+  const customCmd = custom.get(command.toLowerCase());
+  if (customCmd) {
+    return await handleCustomCommand(customCmd, args, ctx);
+  }
   switch (command.toLowerCase()) {
     case "model":
     case "models":
@@ -1479,15 +1746,16 @@ async function handleCommand(command, args, ctx) {
       return await handleReview(ctx, args);
     case "help":
     case "?":
-      handleHelp();
+      handleHelp(ctx, custom);
       return { type: "handled" };
     case "exit":
     case "quit":
     case "q":
       return { type: "exit" };
-    default:
-      writeln(`${PREFIX.error} unknown: /${command}  ${c3.dim("\u2014 /help for commands")}`);
+    default: {
+      writeln(`${PREFIX.error} unknown: /${command}  ${c4.dim("\u2014 /help for commands")}`);
       return { type: "unknown", command };
+    }
   }
 }
 
@@ -1527,8 +1795,8 @@ async function loadImageFile(filePath) {
 }
 
 // src/cli/input.ts
-import { join as join2, relative } from "path";
-import * as c4 from "yoctocolors";
+import { join as join5, relative } from "path";
+import * as c5 from "yoctocolors";
 var ESC = "\x1B";
 var CSI = `${ESC}[`;
 var CLEAR_LINE = `\r${CSI}2K`;
@@ -1556,16 +1824,33 @@ var CTRL_K = "\v";
 var CTRL_L = "\f";
 var CTRL_R = "\x12";
 var TAB = "\t";
-async function getFileCompletions(prefix, cwd) {
+async function getAtCompletions(prefix, cwd) {
   const query = prefix.startsWith("@") ? prefix.slice(1) : prefix;
-  const glob = new Bun.Glob(`**/*${query}*`);
   const results = [];
-  for await (const file of glob.scan({ cwd, onlyFiles: true })) {
-    if (file.includes("node_modules") || file.includes(".git"))
-      continue;
-    results.push(`@${relative(cwd, join2(cwd, file))}`);
-    if (results.length >= 10)
+  const MAX = 10;
+  const skills = loadSkills(cwd);
+  for (const [name] of skills) {
+    if (results.length >= MAX)
       break;
+    if (name.includes(query))
+      results.push(`@${name}`);
+  }
+  const agents = loadAgents(cwd);
+  for (const [name] of agents) {
+    if (results.length >= MAX)
+      break;
+    if (name.includes(query))
+      results.push(`@${name}`);
+  }
+  if (results.length < MAX) {
+    const glob = new Bun.Glob(`**/*${query}*`);
+    for await (const file of glob.scan({ cwd, onlyFiles: true })) {
+      if (file.includes("node_modules") || file.includes(".git"))
+        continue;
+      results.push(`@${relative(cwd, join5(cwd, file))}`);
+      if (results.length >= MAX)
+        break;
+    }
   }
   return results;
 }
@@ -1584,7 +1869,7 @@ async function tryExtractImageFromPaste(pasted, cwd) {
     }
   }
   if (!trimmed.includes(" ") && isImageFilename(trimmed)) {
-    const filePath = trimmed.startsWith("/") ? trimmed : join2(cwd, trimmed);
+    const filePath = trimmed.startsWith("/") ? trimmed : join5(cwd, trimmed);
     const attachment = await loadImageFile(filePath);
     if (attachment) {
       const name = filePath.split("/").pop() ?? trimmed;
@@ -1632,9 +1917,9 @@ function pasteLabel(text) {
   const more = extra > 0 ? ` +${extra} more line${extra === 1 ? "" : "s"}` : "";
   return `[pasted: "${preview}"${more}]`;
 }
-var PROMPT = c4.green("\u25B6 ");
-var PROMPT_PLAN = c4.yellow("\u2B22 ");
-var PROMPT_RALPH = c4.magenta("\u21BB ");
+var PROMPT = c5.green("\u25B6 ");
+var PROMPT_PLAN = c5.yellow("\u2B22 ");
+var PROMPT_RALPH = c5.magenta("\u21BB ");
 var PROMPT_RAW_LEN = 2;
 async function readline(opts) {
   const cwd = opts.cwd ?? process.cwd();
@@ -1653,7 +1938,7 @@ async function readline(opts) {
   const reader = getStdinReader();
   function renderPrompt() {
     const cols = process.stdout.columns ?? 80;
-    const visualBuf = (pasteBuffer ? buf.replace(PASTE_SENTINEL, c4.dim(pasteLabel(pasteBuffer))) : buf).replace(/\[image: [^\]]+\]/g, (m) => c4.dim(c4.cyan(m)));
+    const visualBuf = (pasteBuffer ? buf.replace(PASTE_SENTINEL, c5.dim(pasteLabel(pasteBuffer))) : buf).replace(/\[image: [^\]]+\]/g, (m) => c5.dim(c5.cyan(m)));
     const visualCursor = pasteBuffer ? (() => {
       const sentinelPos = buf.indexOf(PASTE_SENTINEL);
       if (sentinelPos === -1 || cursor <= sentinelPos)
@@ -1665,7 +1950,7 @@ async function readline(opts) {
     process.stdout.write(`${CLEAR_LINE}${prompt}${display}${CSI}${PROMPT_RAW_LEN + visualCursor + 1}G`);
   }
   function renderSearchPrompt() {
-    process.stdout.write(`${CLEAR_LINE}${c4.cyan("search:")} ${searchQuery}\u2588`);
+    process.stdout.write(`${CLEAR_LINE}${c5.cyan("search:")} ${searchQuery}\u2588`);
   }
   function applyHistory() {
     if (histIdx < history.length) {
@@ -1781,6 +2066,18 @@ async function readline(opts) {
           renderPrompt();
           continue;
         }
+        if (raw === `${ESC}${BACKSPACE}`) {
+          const end = cursor;
+          while (cursor > 0 && buf[cursor - 1] === " ")
+            cursor--;
+          while (cursor > 0 && buf[cursor - 1] !== " ")
+            cursor--;
+          buf = buf.slice(0, cursor) + buf.slice(end);
+          if (pasteBuffer && !buf.includes(PASTE_SENTINEL))
+            pasteBuffer = null;
+          renderPrompt();
+          continue;
+        }
         if (raw === ESC) {
           process.stdout.write(`
 `);
@@ -1860,7 +2157,7 @@ async function readline(opts) {
         const beforeCursor = buf.slice(0, cursor);
         const atMatch = beforeCursor.match(/@(\S*)$/);
         if (atMatch) {
-          const completions = await getFileCompletions(atMatch[0], cwd);
+          const completions = await getAtCompletions(atMatch[0], cwd);
           if (completions.length === 1 && completions[0]) {
             const replacement = completions[0];
             buf = buf.slice(0, cursor - (atMatch[0] ?? "").length) + replacement + buf.slice(cursor);
@@ -1869,8 +2166,8 @@ async function readline(opts) {
           } else if (completions.length > 1) {
             process.stdout.write(`
 `);
-            for (const c5 of completions)
-              process.stdout.write(`  ${c5}
+            for (const c6 of completions)
+              process.stdout.write(`  ${c6}
 `);
             renderPrompt();
           }
@@ -1984,10 +2281,10 @@ async function* runTurn(options) {
     for await (const chunk of result.fullStream) {
       if (signal?.aborted)
         break;
-      const c5 = chunk;
-      switch (c5.type) {
+      const c6 = chunk;
+      switch (c6.type) {
         case "text-delta": {
-          const delta = typeof c5.text === "string" ? c5.text : typeof c5.textDelta === "string" ? c5.textDelta : "";
+          const delta = typeof c6.text === "string" ? c6.text : typeof c6.textDelta === "string" ? c6.textDelta : "";
           yield {
             type: "text-delta",
             delta
@@ -1997,18 +2294,18 @@ async function* runTurn(options) {
         case "tool-call": {
           yield {
             type: "tool-call-start",
-            toolCallId: String(c5.toolCallId ?? ""),
-            toolName: String(c5.toolName ?? ""),
-            args: c5.input ?? c5.args
+            toolCallId: String(c6.toolCallId ?? ""),
+            toolName: String(c6.toolName ?? ""),
+            args: c6.input ?? c6.args
           };
           break;
         }
         case "tool-result": {
           yield {
             type: "tool-result",
-            toolCallId: String(c5.toolCallId ?? ""),
-            toolName: String(c5.toolName ?? ""),
-            result: "output" in c5 ? c5.output : ("result" in c5) ? c5.result : undefined,
+            toolCallId: String(c6.toolCallId ?? ""),
+            toolName: String(c6.toolName ?? ""),
+            result: "output" in c6 ? c6.output : ("result" in c6) ? c6.result : undefined,
             isError: false
           };
           break;
@@ -2016,15 +2313,15 @@ async function* runTurn(options) {
         case "tool-error": {
           yield {
             type: "tool-result",
-            toolCallId: String(c5.toolCallId ?? ""),
-            toolName: String(c5.toolName ?? ""),
-            result: c5.error ?? "Tool execution failed",
+            toolCallId: String(c6.toolCallId ?? ""),
+            toolName: String(c6.toolName ?? ""),
+            result: c6.error ?? "Tool execution failed",
             isError: true
           };
           break;
         }
         case "error": {
-          const err = c5.error;
+          const err = c6.error;
           throw err instanceof Error ? err : new Error(String(err));
         }
       }
@@ -2104,8 +2401,8 @@ async function connectMcpServer(config) {
 }
 
 // src/tools/snapshot.ts
-import { readFileSync, unlinkSync as unlinkSync2 } from "fs";
-import { join as join3 } from "path";
+import { readFileSync as readFileSync4, unlinkSync as unlinkSync2 } from "fs";
+import { join as join6 } from "path";
 async function gitBytes(args, cwd) {
   try {
     const proc = Bun.spawn(["git", ...args], {
@@ -2196,7 +2493,7 @@ async function takeSnapshot(cwd, sessionId, turnIndex) {
       return false;
     const files = [];
     for (const entry of entries) {
-      const absPath = join3(repoRoot, entry.path);
+      const absPath = join6(repoRoot, entry.path);
       if (!entry.existsOnDisk) {
         const { bytes, code } = await gitBytes(["show", `HEAD:${entry.path}`], repoRoot);
         if (code === 0) {
@@ -2210,7 +2507,7 @@ async function takeSnapshot(cwd, sessionId, turnIndex) {
       }
       if (entry.isNew) {
         try {
-          const content = readFileSync(absPath);
+          const content = readFileSync4(absPath);
           files.push({
             path: entry.path,
             content: new Uint8Array(content),
@@ -2220,7 +2517,7 @@ async function takeSnapshot(cwd, sessionId, turnIndex) {
         continue;
       }
       try {
-        const content = readFileSync(absPath);
+        const content = readFileSync4(absPath);
         files.push({
           path: entry.path,
           content: new Uint8Array(content),
@@ -2245,7 +2542,7 @@ async function restoreSnapshot(cwd, sessionId, turnIndex) {
     const root = repoRoot ?? cwd;
     let anyFailed = false;
     for (const file of files) {
-      const absPath = join3(root, file.path);
+      const absPath = join6(root, file.path);
       if (!file.existed) {
         try {
           if (await Bun.file(absPath).exists()) {
@@ -2274,8 +2571,7 @@ async function restoreSnapshot(cwd, sessionId, turnIndex) {
 }
 
 // src/session/manager.ts
-import { homedir as homedir3 } from "os";
-import * as c5 from "yoctocolors";
+import * as c6 from "yoctocolors";
 function newSession(model, cwd) {
   const id = generateSessionId();
   createSession({ id, cwd, model });
@@ -2294,19 +2590,19 @@ function touchActiveSession(session) {
 function printSessionList() {
   const sessions = listSessions(20);
   if (sessions.length === 0) {
-    writeln(c5.dim("No sessions found."));
+    writeln(c6.dim("No sessions found."));
     return;
   }
   writeln(`
-${c5.bold("Recent sessions:")}`);
+${c6.bold("Recent sessions:")}`);
   for (const s of sessions) {
     const date = new Date(s.updated_at).toLocaleString();
-    const cwd = s.cwd.startsWith(homedir3()) ? `~${s.cwd.slice(homedir3().length)}` : s.cwd;
-    const title = s.title || c5.dim("(untitled)");
-    writeln(`  ${c5.dim(s.id.padEnd(14))} ${title.padEnd(30)} ${c5.cyan(s.model.split("/").pop() ?? s.model).padEnd(20)} ${c5.dim(cwd)}  ${c5.dim(date)}`);
+    const cwd = tildePath(s.cwd);
+    const title = s.title || c6.dim("(untitled)");
+    writeln(`  ${c6.dim(s.id.padEnd(14))} ${title.padEnd(30)} ${c6.cyan(s.model.split("/").pop() ?? s.model).padEnd(20)} ${c6.dim(cwd)}  ${c6.dim(date)}`);
   }
   writeln(`
-${c5.dim("Use")} mc --resume <id> ${c5.dim("to continue a session.")}`);
+${c6.dim("Use")} mc --resume <id> ${c6.dim("to continue a session.")}`);
 }
 function getMostRecentSession() {
   const sessions = listSessions(1);
@@ -2314,8 +2610,8 @@ function getMostRecentSession() {
 }
 
 // src/tools/create.ts
-import { existsSync as existsSync2, mkdirSync as mkdirSync2 } from "fs";
-import { dirname, join as join4, relative as relative2 } from "path";
+import { existsSync as existsSync5, mkdirSync as mkdirSync2 } from "fs";
+import { dirname, join as join7, relative as relative2 } from "path";
 import { z as z2 } from "zod";
 
 // src/tools/diff.ts
@@ -2455,10 +2751,10 @@ var createTool = {
   schema: CreateSchema,
   execute: async (input) => {
     const cwd = input.cwd ?? process.cwd();
-    const filePath = input.path.startsWith("/") ? input.path : join4(cwd, input.path);
+    const filePath = input.path.startsWith("/") ? input.path : join7(cwd, input.path);
     const relPath = relative2(cwd, filePath);
     const dir = dirname(filePath);
-    if (!existsSync2(dir))
+    if (!existsSync5(dir))
       mkdirSync2(dir, { recursive: true });
     const file = Bun.file(filePath);
     const created = !await file.exists();
@@ -2470,7 +2766,7 @@ var createTool = {
 };
 
 // src/tools/glob.ts
-import { join as join5, relative as relative3 } from "path";
+import { join as join8, relative as relative3 } from "path";
 import { z as z3 } from "zod";
 var GlobSchema = z3.object({
   pattern: z3.string().describe("Glob pattern to match files against, e.g. '**/*.ts'"),
@@ -2502,7 +2798,7 @@ var globTool = {
       if (ignored)
         continue;
       try {
-        const fullPath = join5(cwd, file);
+        const fullPath = join8(cwd, file);
         const stat = await Bun.file(fullPath).stat?.() ?? null;
         matches.push({ path: file, mtime: stat?.mtime?.getTime() ?? 0 });
       } catch {
@@ -2515,13 +2811,13 @@ var globTool = {
     if (truncated)
       matches.pop();
     matches.sort((a, b) => b.mtime - a.mtime);
-    const files = matches.map((m) => relative3(cwd, join5(cwd, m.path)));
+    const files = matches.map((m) => relative3(cwd, join8(cwd, m.path)));
     return { files, count: files.length, truncated };
   }
 };
 
 // src/tools/grep.ts
-import { join as join6 } from "path";
+import { join as join9 } from "path";
 import { z as z4 } from "zod";
 
 // src/tools/hashline.ts
@@ -2607,7 +2903,7 @@ var grepTool = {
         if (ignoreGlob.some((g) => g.match(relPath) || g.match(relPath.split("/")[0] ?? ""))) {
           continue;
         }
-        const fullPath = join6(cwd, relPath);
+        const fullPath = join9(cwd, relPath);
         let text;
         try {
           text = await Bun.file(fullPath).text();
@@ -2626,11 +2922,11 @@ var grepTool = {
           const ctxStart = Math.max(0, i - contextLines);
           const ctxEnd = Math.min(lines.length - 1, i + contextLines);
           const context = [];
-          for (let c6 = ctxStart;c6 <= ctxEnd; c6++) {
+          for (let c7 = ctxStart;c7 <= ctxEnd; c7++) {
             context.push({
-              line: c6 + 1,
-              text: formatHashLine(c6 + 1, lines[c6] ?? ""),
-              isMatch: c6 === i
+              line: c7 + 1,
+              text: formatHashLine(c7 + 1, lines[c7] ?? ""),
+              isMatch: c7 === i
             });
           }
           allMatches.push({
@@ -2658,8 +2954,8 @@ var grepTool = {
 
 // src/tools/hooks.ts
 import { constants, accessSync } from "fs";
-import { homedir as homedir4 } from "os";
-import { join as join7 } from "path";
+import { homedir as homedir6 } from "os";
+import { join as join10 } from "path";
 function isExecutable(filePath) {
   try {
     accessSync(filePath, constants.X_OK);
@@ -2671,8 +2967,8 @@ function isExecutable(filePath) {
 function findHook(toolName, cwd) {
   const scriptName = `post-${toolName}`;
   const candidates = [
-    join7(cwd, ".agents", "hooks", scriptName),
-    join7(homedir4(), ".agents", "hooks", scriptName)
+    join10(cwd, ".agents", "hooks", scriptName),
+    join10(homedir6(), ".agents", "hooks", scriptName)
   ];
   for (const p of candidates) {
     if (isExecutable(p))
@@ -2761,7 +3057,7 @@ function hookEnvForRead(input, cwd) {
 }
 
 // src/tools/insert.ts
-import { join as join8, relative as relative4 } from "path";
+import { join as join11, relative as relative4 } from "path";
 import { z as z5 } from "zod";
 var InsertSchema = z5.object({
   path: z5.string().describe("File path to edit (absolute or relative to cwd)"),
@@ -2776,7 +3072,7 @@ var insertTool = {
   schema: InsertSchema,
   execute: async (input) => {
     const cwd = input.cwd ?? process.cwd();
-    const filePath = input.path.startsWith("/") ? input.path : join8(cwd, input.path);
+    const filePath = input.path.startsWith("/") ? input.path : join11(cwd, input.path);
     const relPath = relative4(cwd, filePath);
     const file = Bun.file(filePath);
     if (!await file.exists()) {
@@ -2821,7 +3117,7 @@ function parseAnchor(value) {
 }
 
 // src/tools/read.ts
-import { join as join9, relative as relative5 } from "path";
+import { join as join12, relative as relative5 } from "path";
 import { z as z6 } from "zod";
 var ReadSchema = z6.object({
   path: z6.string().describe("File path to read (absolute or relative to cwd)"),
@@ -2836,7 +3132,7 @@ var readTool = {
   schema: ReadSchema,
   execute: async (input) => {
     const cwd = input.cwd ?? process.cwd();
-    const filePath = input.path.startsWith("/") ? input.path : join9(cwd, input.path);
+    const filePath = input.path.startsWith("/") ? input.path : join12(cwd, input.path);
     const file = Bun.file(filePath);
     const exists = await file.exists();
     if (!exists) {
@@ -2869,7 +3165,7 @@ var readTool = {
 };
 
 // src/tools/replace.ts
-import { join as join10, relative as relative6 } from "path";
+import { join as join13, relative as relative6 } from "path";
 import { z as z7 } from "zod";
 var ReplaceSchema = z7.object({
   path: z7.string().describe("File path to edit (absolute or relative to cwd)"),
@@ -2884,7 +3180,7 @@ var replaceTool = {
   schema: ReplaceSchema,
   execute: async (input) => {
     const cwd = input.cwd ?? process.cwd();
-    const filePath = input.path.startsWith("/") ? input.path : join10(cwd, input.path);
+    const filePath = input.path.startsWith("/") ? input.path : join13(cwd, input.path);
     const relPath = relative6(cwd, filePath);
     const file = Bun.file(filePath);
     if (!await file.exists()) {
@@ -3025,15 +3321,19 @@ var shellTool = {
 // src/tools/subagent.ts
 import { z as z9 } from "zod";
 var SubagentInput = z9.object({
-  prompt: z9.string().describe("The task or question to give the subagent")
+  prompt: z9.string().describe("The task or question to give the subagent"),
+  agentName: z9.string().optional().describe("Name of a custom agent to use (from .agents/agents/). Omit to use a generic subagent.")
 });
-function createSubagentTool(runSubagent) {
+function createSubagentTool(runSubagent, availableAgents) {
+  const agentSection = availableAgents.size > 0 ? `
+
+When the user's message contains @<agent-name>, delegate to that agent by setting agentName to the exact agent name. Available custom agents: ${[...availableAgents.entries()].map(([name, cfg]) => `"${name}" (${cfg.description})`).join(", ")}.` : "";
   return {
     name: "subagent",
-    description: "Spawn a sub-agent to handle a focused subtask. " + "Use this for parallel exploration, specialised analysis, or tasks that benefit from " + "a fresh context window. The subagent has access to all the same tools.",
+    description: `Spawn a sub-agent to handle a focused subtask. Use this for parallel exploration, specialised analysis, or tasks that benefit from a fresh context window. The subagent has access to all the same tools.${agentSection}`,
     schema: SubagentInput,
     execute: async (input) => {
-      return runSubagent(input.prompt);
+      return runSubagent(input.prompt, input.agentName);
     }
   };
 }
@@ -3090,12 +3390,12 @@ function buildToolSet(opts) {
     withHooks(withCwdDefault(replaceTool, cwd), lookupHook, cwd, (result) => hookEnvForReplace(result, cwd), onHook),
     withHooks(withCwdDefault(insertTool, cwd), lookupHook, cwd, (result) => hookEnvForInsert(result, cwd), onHook),
     withHooks(withCwdDefault(shellTool, cwd), lookupHook, cwd, (result, input) => hookEnvForShell(result, input, cwd), onHook),
-    createSubagentTool(async (prompt) => {
+    createSubagentTool(async (prompt, agentName) => {
       if (depth >= MAX_SUBAGENT_DEPTH) {
         throw new Error(`Subagent depth limit reached (max ${MAX_SUBAGENT_DEPTH}). ` + `Cannot spawn another subagent from depth ${depth}.`);
       }
-      return opts.runSubagent(prompt, depth + 1);
-    })
+      return opts.runSubagent(prompt, depth + 1, agentName);
+    }, opts.availableAgents)
   ];
 }
 function buildReadOnlyToolSet(opts) {
@@ -3126,14 +3426,14 @@ async function getGitBranch(cwd) {
 }
 function loadContextFile(cwd) {
   const candidates = [
-    join11(cwd, "AGENTS.md"),
-    join11(cwd, "CLAUDE.md"),
-    join11(getConfigDir(), "AGENTS.md")
+    join14(cwd, "AGENTS.md"),
+    join14(cwd, "CLAUDE.md"),
+    join14(getConfigDir(), "AGENTS.md")
   ];
   for (const p of candidates) {
-    if (existsSync3(p)) {
+    if (existsSync6(p)) {
       try {
-        return readFileSync2(p, "utf-8");
+        return readFileSync5(p, "utf-8");
       } catch {}
     }
   }
@@ -3141,7 +3441,7 @@ function loadContextFile(cwd) {
 }
 function buildSystemPrompt(cwd) {
   const contextFile = loadContextFile(cwd);
-  const cwdDisplay = cwd.startsWith(homedir5()) ? `~${cwd.slice(homedir5().length)}` : cwd;
+  const cwdDisplay = tildePath(cwd);
   const now = new Date().toLocaleString(undefined, { hour12: false });
   let prompt = `You are mini-coder, a small and fast CLI coding agent.
 You have access to tools to read files, search code, make edits, run shell commands, and spawn subagents.
@@ -3180,7 +3480,7 @@ async function runShellPassthrough(command, cwd) {
     const out = [stdout, stderr].filter(Boolean).join(`
 `).trim();
     if (out)
-      writeln(c6.dim(out));
+      writeln(c7.dim(out));
     return out;
   } finally {
     restoreTerminal();
@@ -3199,22 +3499,29 @@ async function runAgent(opts) {
     session = resumed;
     currentModel = session.model;
     deleteAllSnapshots(session.id);
-    renderInfo(`Resumed session ${session.id} (${c6.cyan(currentModel)})`);
+    renderInfo(`Resumed session ${session.id} (${c7.cyan(currentModel)})`);
   } else {
     session = newSession(currentModel, cwd);
   }
   let turnIndex = getMaxTurnIndex(session.id) + 1;
   const coreHistory = [...session.messages];
-  const runSubagent = async (prompt, depth = 0) => {
+  const runSubagent = async (prompt, depth = 0, agentName, modelOverride) => {
+    const allAgents = loadAgents(cwd);
+    const agentConfig = agentName ? allAgents.get(agentName) : undefined;
+    if (agentName && !agentConfig) {
+      throw new Error(`Unknown agent "${agentName}". Available agents: ${[...allAgents.keys()].join(", ") || "(none)"}`);
+    }
+    const model = modelOverride ?? agentConfig?.model ?? currentModel;
+    const systemPrompt = agentConfig?.systemPrompt ?? buildSystemPrompt(cwd);
     const subMessages = [{ role: "user", content: prompt }];
     const subTools = buildToolSet({
       cwd,
       depth,
       runSubagent,
-      onHook: renderHook
+      onHook: renderHook,
+      availableAgents: allAgents
     });
-    const subLlm = resolveModel(currentModel);
-    const systemPrompt = buildSystemPrompt(cwd);
+    const subLlm = resolveModel(model);
     let result = "";
     let inputTokens = 0;
     let outputTokens = 0;
@@ -3254,11 +3561,13 @@ async function runAgent(opts) {
     }
     return { result, inputTokens, outputTokens, activity };
   };
+  const agents = loadAgents(cwd);
   const tools = buildToolSet({
     cwd,
     depth: 0,
     runSubagent,
-    onHook: renderHook
+    onHook: renderHook,
+    availableAgents: agents
   });
   const mcpTools = [];
   async function connectAndAddMcp(name) {
@@ -3281,7 +3590,7 @@ async function runAgent(opts) {
   for (const row of listMcpServers()) {
     try {
       await connectAndAddMcp(row.name);
-      renderInfo(`MCP: connected ${c6.cyan(row.name)}`);
+      renderInfo(`MCP: connected ${c7.cyan(row.name)}`);
     } catch (e) {
       renderError(`MCP: failed to connect ${row.name}: ${String(e)}`);
     }
@@ -3310,7 +3619,7 @@ async function runAgent(opts) {
       planMode = v;
     },
     cwd,
-    runSubagent: (prompt) => runSubagent(prompt),
+    runSubagent: (prompt, model) => runSubagent(prompt, 0, undefined, model),
     undoLastTurn: async () => {
       if (session.messages.length === 0)
         return false;
@@ -3375,14 +3684,14 @@ async function runAgent(opts) {
     }
     switch (input.type) {
       case "eof":
-        writeln(c6.dim("Goodbye."));
+        writeln(c7.dim("Goodbye."));
         return;
       case "interrupt":
         continue;
       case "command": {
         const result = await handleCommand(input.command, input.args, cmdCtx);
         if (result.type === "exit") {
-          writeln(c6.dim("Goodbye."));
+          writeln(c7.dim("Goodbye."));
           return;
         }
         if (result.type === "inject-user-message") {
@@ -3417,11 +3726,11 @@ ${out}
           while (ralphMode) {
             if (hasRalphSignal(lastText)) {
               ralphMode = false;
-              writeln(`${PREFIX.info} ${c6.dim("ralph mode off")}`);
+              writeln(`${PREFIX.info} ${c7.dim("ralph mode off")}`);
               break;
             }
             if (ralphIteration >= RALPH_MAX_ITERATIONS) {
-              writeln(`${PREFIX.info} ${c6.yellow("ralph")} ${c6.dim("\u2014 max iterations reached, stopping")}`);
+              writeln(`${PREFIX.info} ${c7.yellow("ralph")} ${c7.dim("\u2014 max iterations reached, stopping")}`);
               ralphMode = false;
               break;
             }
@@ -3447,13 +3756,6 @@ ${out}
     const allImages = [...pastedImages, ...refImages];
     const thisTurn = turnIndex++;
     const snapped = await takeSnapshot(cwd, session.id, thisTurn);
-    if (wasAborted) {
-      process.removeListener("SIGINT", onSigInt);
-      if (snapped)
-        deleteSnapshot(session.id, thisTurn);
-      turnIndex--;
-      return "";
-    }
     const coreContent = planMode ? `${resolvedText}
 
 <system-message>PLAN MODE ACTIVE: Help the user gather context for the plan -- READ ONLY</system-message>` : ralphMode ? `${resolvedText}
@@ -3470,6 +3772,19 @@ ${out}
         }))
       ]
     } : { role: "user", content: coreContent };
+    if (wasAborted) {
+      process.removeListener("SIGINT", onSigInt);
+      const stubMsg = {
+        role: "assistant",
+        content: "[interrupted]"
+      };
+      session.messages.push(userMsg, stubMsg);
+      saveMessages(session.id, [userMsg, stubMsg], thisTurn);
+      coreHistory.push(userMsg, stubMsg);
+      snapshotStack.push(snapped ? thisTurn : null);
+      touchActiveSession(session);
+      return "";
+    }
     session.messages.push(userMsg);
     saveMessages(session.id, [userMsg], thisTurn);
     coreHistory.push(userMsg);
@@ -3504,6 +3819,14 @@ ${out}
         coreHistory.push(...newMessages);
         session.messages.push(...newMessages);
         saveMessages(session.id, newMessages, thisTurn);
+      } else if (wasAborted) {
+        const stubMsg = {
+          role: "assistant",
+          content: "[interrupted]"
+        };
+        coreHistory.push(stubMsg);
+        session.messages.push(stubMsg);
+        saveMessages(session.id, [stubMsg], thisTurn);
       } else {
         rollbackTurn();
       }
@@ -3526,7 +3849,7 @@ ${out}
     const branch = await getGitBranch(cwd);
     const provider = currentModel.split("/")[0] ?? "";
     const modelShort = currentModel.split("/").slice(1).join("/");
-    const cwdDisplay = cwd.startsWith(homedir5()) ? `~${cwd.slice(homedir5().length)}` : cwd;
+    const cwdDisplay = tildePath(cwd);
     renderStatusBar({
       model: modelShort,
       provider,
@@ -3567,11 +3890,20 @@ async function resolveFileRefs(text, cwd) {
   let result = text;
   const matches = [...text.matchAll(atPattern)];
   const images = [];
-  for (const match of matches.reverse()) {
+  const skills = loadSkills(cwd);
+  for (const match of [...matches].reverse()) {
     const ref = match[1];
     if (!ref)
       continue;
-    const filePath = ref.startsWith("/") ? ref : join11(cwd, ref);
+    const skill = skills.get(ref);
+    if (skill) {
+      const replacement = `<skill name="${skill.name}">
+${skill.content}
+</skill>`;
+      result = result.slice(0, match.index) + replacement + result.slice((match.index ?? 0) + match[0].length);
+      continue;
+    }
+    const filePath = ref.startsWith("/") ? ref : join14(cwd, ref);
     if (isImageFilename(ref)) {
       const attachment = await loadImageFile(filePath);
       if (attachment) {
@@ -3647,11 +3979,11 @@ function parseArgs(argv) {
   return args;
 }
 function printHelp() {
-  writeln(`${c7.bold("mini-coder")} \u2014 a small, fast CLI coding agent
+  writeln(`${c8.bold("mini-coder")} \u2014 a small, fast CLI coding agent
 `);
-  writeln(`${c7.bold("Usage:")}  mc [options] [prompt]
+  writeln(`${c8.bold("Usage:")}  mc [options] [prompt]
 `);
-  writeln(`${c7.bold("Options:")}`);
+  writeln(`${c8.bold("Options:")}`);
   const opts = [
     ["-m, --model <id>", "Model to use (e.g. zen/claude-sonnet-4-6)"],
     ["-c, --continue", "Continue the most recent session"],
@@ -3661,10 +3993,10 @@ function printHelp() {
     ["-h, --help", "Show this help"]
   ];
   for (const [flag, desc] of opts) {
-    writeln(`  ${c7.cyan((flag ?? "").padEnd(22))} ${c7.dim(desc ?? "")}`);
+    writeln(`  ${c8.cyan((flag ?? "").padEnd(22))} ${c8.dim(desc ?? "")}`);
   }
   writeln(`
-${c7.bold("Provider env vars:")}`);
+${c8.bold("Provider env vars:")}`);
   const envs = [
     ["OPENCODE_API_KEY", "OpenCode Zen (recommended)"],
     ["ANTHROPIC_API_KEY", "Anthropic direct"],
@@ -3673,15 +4005,15 @@ ${c7.bold("Provider env vars:")}`);
     ["OLLAMA_BASE_URL", "Ollama base URL (default: http://localhost:11434)"]
   ];
   for (const [env, desc] of envs) {
-    writeln(`  ${c7.yellow((env ?? "").padEnd(22))} ${c7.dim(desc ?? "")}`);
+    writeln(`  ${c8.yellow((env ?? "").padEnd(22))} ${c8.dim(desc ?? "")}`);
   }
   writeln(`
-${c7.bold("Examples:")}`);
-  writeln(`  mc                           ${c7.dim("# interactive session")}`);
-  writeln(`  mc "explain this codebase"   ${c7.dim("# one-shot prompt then interactive")}`);
-  writeln(`  mc -c                        ${c7.dim("# continue last session")}`);
-  writeln(`  mc -m ollama/llama3.2        ${c7.dim("# use local Ollama model")}`);
-  writeln(`  mc -l                        ${c7.dim("# list sessions")}`);
+${c8.bold("Examples:")}`);
+  writeln(`  mc                           ${c8.dim("# interactive session")}`);
+  writeln(`  mc "explain this codebase"   ${c8.dim("# one-shot prompt then interactive")}`);
+  writeln(`  mc -c                        ${c8.dim("# continue last session")}`);
+  writeln(`  mc -m ollama/llama3.2        ${c8.dim("# use local Ollama model")}`);
+  writeln(`  mc -l                        ${c8.dim("# list sessions")}`);
 }
 async function main() {
   const argv = process.argv.slice(2);
@@ -3700,7 +4032,7 @@ async function main() {
     if (last) {
       sessionId = last.id;
     } else {
-      writeln(c7.dim("No previous session found, starting fresh."));
+      writeln(c8.dim("No previous session found, starting fresh."));
     }
   } else if (args.sessionId) {
     sessionId = args.sessionId;