@ahood/cli 0.5.1 → 0.6.0

package/dist/spec.js

@@ -1,4 +1,5 @@
 import { join } from "node:path";
+import { UsageError } from "./usage-error.js";
 // Owner and skill segments become filesystem path components (.claude/skills/<owner>/<skill>)
 // and URL path segments, so both are restricted to a safe charset that cannot contain "..",
 // "/", "\", or a leading dot -- this is what closes the path-traversal hole in add/remove
@@ -17,19 +18,19 @@ export const SEMVER_RE = /^(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-[0-
 const MAX_SEGMENT_LENGTH = { owner: 32, skill: 64 };
 export function validateSegment(value, kind, spec) {
     if (!SEGMENT_RE.test(value) || value === "." || value === "..") {
-        throw new Error(`Invalid ${kind} "${value}" in "${spec}" -- must start with a letter/digit and contain only letters, digits, ".", "_", or "-".`);
+        throw new UsageError(`Invalid ${kind} "${value}" in "${spec}" -- must start with a letter/digit and contain only letters, digits, ".", "_", or "-".`);
     }
     const maxLength = MAX_SEGMENT_LENGTH[kind];
     if (value.length > maxLength) {
-        throw new Error(`Invalid ${kind} in "${spec.slice(0, 60)}${spec.length > 60 ? "..." : ""}" -- ${kind} segment is too long (${value.length} characters; must be at most ${maxLength}).`);
+        throw new UsageError(`Invalid ${kind} in "${spec.slice(0, 60)}${spec.length > 60 ? "..." : ""}" -- ${kind} segment is too long (${value.length} characters; must be at most ${maxLength}).`);
     }
 }
 export function parseOwnerSkill(spec, usage) {
     if (!spec)
-        throw new Error(usage);
+        throw new UsageError(usage);
     const parts = spec.split("/");
     if (parts.length !== 2 || !parts[0] || !parts[1])
-        throw new Error(usage);
+        throw new UsageError(usage);
     const [owner, skill] = parts;
     validateSegment(owner, "owner", spec);
     validateSegment(skill, "skill", spec);
@@ -37,15 +38,15 @@ export function parseOwnerSkill(spec, usage) {
 }
 export function parseOwnerSkillVersion(spec, usage) {
     if (!spec)
-        throw new Error(usage);
+        throw new UsageError(usage);
     const atIndex = spec.lastIndexOf("@");
     const ownerSkill = atIndex > 0 ? spec.slice(0, atIndex) : spec;
     const version = atIndex > 0 ? spec.slice(atIndex + 1) : "latest";
     if (atIndex > 0 && version === "") {
-        throw new Error(`Missing version after "@" in "${spec}".\n${usage}`);
+        throw new UsageError(`Missing version after "@" in "${spec}".\n${usage}`);
     }
     if (version !== "latest" && !SEMVER_RE.test(version)) {
-        throw new Error(`Invalid version "${version}" in "${spec}" -- expected "latest" or a semver like 1.2.3.\n${usage}`);
+        throw new UsageError(`Invalid version "${version}" in "${spec}" -- expected "latest" or a semver like 1.2.3.\n${usage}`);
     }
     const { owner, skill } = parseOwnerSkill(ownerSkill, usage);
     return { owner, skill, version };
@@ -67,10 +68,10 @@ export function validateExternalUrl(value, flag) {
         url = new URL(value);
     }
     catch {
-        throw new Error(`${flag} must be a valid http:// or https:// URL (got "${value}").`);
+        throw new UsageError(`${flag} must be a valid http:// or https:// URL (got "${value}").`);
     }
     if (url.protocol !== "https:" && url.protocol !== "http:") {
-        throw new Error(`${flag} must use http:// or https:// (got scheme "${url.protocol}" from "${value}").`);
+        throw new UsageError(`${flag} must use http:// or https:// (got scheme "${url.protocol}" from "${value}").`);
     }
 }
 export const SKILLS_ROOT = join(".claude", "skills");
@@ -78,3 +79,26 @@ export const LOCKFILE_PATH = join(".claude", "skills.lock.json");
 export function skillDir(owner, skill) {
     return join(SKILLS_ROOT, owner, skill);
 }
+// Claude Code's own subagent loader scans .claude/agents/*.md as flat files
+// (non-recursive), unlike .claude/skills/<owner>/<skill>/ which nests by
+// owner -- a bare .claude/agents/<skill>.md would let two different owners'
+// same-named agent collide and silently overwrite each other. Joining the
+// owner into the filename with "@" keeps the layout flat (so Claude Code
+// still finds it) while staying collision-resistant: SEGMENT_RE's character
+// class is exactly [a-z0-9._-] (case-insensitive), which does not include
+// "@" -- so "@" can never appear inside a valid owner or skill segment, and
+// the joined filename always contains exactly one "@", at the boundary
+// between the two segments. That makes the join unambiguous for any pair of
+// SEGMENT_RE-valid values, including ones containing hyphens (e.g.
+// owner="al-ice"/skill="bob" joins to "al-ice@bob.md", which cannot also be
+// produced by any other valid owner/skill pair). "@" is a valid filename
+// character on Linux, macOS, and Windows.
+export const AGENTS_ROOT = join(".claude", "agents");
+export function agentPath(owner, skill) {
+    return join(AGENTS_ROOT, `${owner}@${skill}.md`);
+}
+// .mcp.json lives at the project root -- Claude Code's own convention for
+// MCP server configuration (unlike .claude/skills or .claude/agents, this
+// file isn't under .claude/ at all, since it's a convention MCP clients
+// broadly share, not one specific to this CLI).
+export const MCP_CONFIG_PATH = ".mcp.json";

package/dist/usage-error.js

@@ -0,0 +1,8 @@
+// Thrown for a usage/validation error caught locally, before any network
+// call -- a missing/malformed argument, an invalid flag value, a bad
+// owner/skill spec, etc. Kept distinct from a plain Error so exit-code.ts's
+// exitCodeFor() can map it to exit code 2 ("usage or validation error", per
+// the README's exit-code table) instead of falling through to the generic 1
+// ("general error") that every other thrown Error gets (ahood-cli#80).
+export class UsageError extends Error {
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ahood/cli",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "CLI for ahood, a registry for installing and publishing Claude Code skills.",
   "license": "MIT",
   "homepage": "https://github.com/AlexKay28/ahood-cli",
@@ -32,7 +32,9 @@
     "sync-readme": "node scripts/sync-readme.mjs"
   },
   "dependencies": {
-    "tar-stream": "^3.2.1"
+    "@modelcontextprotocol/sdk": "^1.30.0",
+    "tar-stream": "^3.2.1",
+    "zod": "^4.5.4"
   },
   "devDependencies": {
     "@types/node": "^20",