@ecology91/skills 0.1.3 → 0.1.5

package/README.md

@@ -1,7 +1,7 @@
 # Skills For Real Engineers
 
-[![skills.sh](https://skills.sh/b/ecology9191/skills)](https://skills.sh/ecology9191/skills)
-[![npm](https://img.shields.io/npm/v/@ecology91/skills)](https://www.npmjs.com/package/@ecology91/skills)
+[skills.sh](https://skills.sh/ecology9191/skills)
+[npm](https://www.npmjs.com/package/@ecology91/skills)
 
 Agent skills for doing real engineering with opencode - not vibe coding.
 
@@ -9,34 +9,39 @@ Developing real applications is hard. Approaches like GSD, BMAD, and Spec-Kit tr
 
 These skills are designed to be small, easy to adapt, and composable. They work with any model. They're based on decades of engineering experience. Hack around with them. Make them your own. Enjoy.
 
-## Quickstart For opencode
+## Quickstart
 
-1. Install the skills into opencode from the fork repo:
+1. Install the skills globally from the fork repo (via [skills.sh](https://skills.sh)):
 
 ```bash
-npx skills@latest add ecology9191/skills -a opencode
+npx skills@latest add ecology9191/skills -g
 ```
 
-2. Or install the published npm package directly:
+1. Or install from a git checkout or the published npm package:
 
 ```bash
 npx --package @ecology91/skills ecology91-skills
 ```
 
-3. For local development on this repo, link the checked-out skills into opencode's global skills directory:
+This opens an interactive menu grouped by bucket (`engineering`, `productivity`, `misc`). Toggle a whole category or pick individual skills in one screen. Use `--all` to skip the menu, or `--bucket` / `--skill` for non-interactive partial installs.
+
+From a git checkout this symlinks into `~/.agents/skills` so edits in the repo are live. From the published package it copies files instead.
 
 ```bash
-./scripts/link-skills.sh
+npx --package @ecology91/skills ecology91-skills --all
+npx --package @ecology91/skills ecology91-skills --bucket engineering --skill tdd
 ```
 
-4. Quit and restart opencode so it reloads the skill list.
+1. Force a copy install from a checkout with `--copy`.
 
-5. Run `/setup-agent-skills` in opencode. It will:
-   - Ask you which issue tracker you want to use (GitHub, GitLab, Beads, `.scratch`, or another workflow)
-   - Ask you what labels you apply to issues when you triage them (`/triage` uses labels)
-   - Ask you where you want to save any docs we create
+OpenCode auto-loads `~/.agents/skills` alongside its own config tree, so one global install works across harnesses.
 
-6. Bam - you're ready to go.
+1. Quit and restart your agent so it reloads the skill list.
+2. Run `/setup-agent-skills` in your coding agent. It will:
+  - Ask you which issue tracker you want to use (GitHub, GitLab, Beads, `.scratch`, or another workflow)
+  - Ask you what labels you apply to issues when you triage them (`/triage` uses labels)
+  - Ask you where you want to save any docs we create
+3. Bam - you're ready to go.
 
 This repo also includes `opencode.json`, so opencode loads the promoted skill buckets automatically when you open this repo directly.
 
@@ -56,10 +61,10 @@ This is just the same in the AI age. There is a communication gap between you an
 
 **The Fix** is to use:
 
-- [`/grill-me`](./skills/productivity/grill-me/SKILL.md) - for non-code uses
-- [`/grill-with-docs`](./skills/engineering/grill-with-docs/SKILL.md) - same as [`/grill-me`](./skills/productivity/grill-me/SKILL.md), but adds more goodies (see below)
+- `[/grill-me](./skills/productivity/grill-me/SKILL.md)` - for non-code uses
+- `[/grill-with-docs](./skills/engineering/grill-with-docs/SKILL.md)` - same as `[/grill-me](./skills/productivity/grill-me/SKILL.md)`, but adds more goodies (see below)
 
-These are my most popular skills. They help you align with the agent before you get started, and think deeply about the change you're making. Use them _every_ time you want to make a change.
+These are my most popular skills. They help you align with the agent before you get started, and think deeply about the change you're making. Use them *every* time you want to make a change.
 
 ### #2: The Agent Is Way Too Verbose
 
@@ -73,10 +78,7 @@ I felt the same tension with my agents. Agents are usually dropped into a projec
 
 **The Fix** for this is a shared language. It's a document that helps agents decode the jargon used in the project.
 
-<details>
-<summary>
 Example
-</summary>
 
 Here's a before-and-after example. Which one is easier to read?
 
@@ -85,9 +87,9 @@ Here's a before-and-after example. Which one is easier to read?
 
 This concision pays off session after session.
 
-</details>
 
-This is built into [`/grill-with-docs`](./skills/engineering/grill-with-docs/SKILL.md). It's a grilling session, but that helps you build a shared language with the AI, and document hard-to-explain decisions in ADR's.
+
+This is built into `[/grill-with-docs](./skills/engineering/grill-with-docs/SKILL.md)`. It's a grilling session, but that helps you build a shared language with the AI, and document hard-to-explain decisions in ADR's.
 
 It's hard to explain how powerful this is. It might be the single coolest technique in this repo. Try it, and see.
 
@@ -104,7 +106,7 @@ It's hard to explain how powerful this is. It might be the single coolest techni
 >
 > David Thomas & Andrew Hunt, [The Pragmatic Programmer](https://www.amazon.co.uk/Pragmatic-Programmer-Anniversary-Journey-Mastery/dp/B0833F1T3V)
 
-**The Problem**: Let's say that you and the agent are aligned on what to build. What happens when the agent _still_ produces crap?
+**The Problem**: Let's say that you and the agent are aligned on what to build. What happens when the agent *still* produces crap?
 
 It's time to look at your feedback loops. Without feedback on how the code it produces actually runs, the agent will be flying blind.
 
@@ -112,13 +114,13 @@ It's time to look at your feedback loops. Without feedback on how the code it pr
 
 For automated tests, a red-green-refactor loop is critical. This is where the agent writes a failing test first, then fixes the test. This helps give the agent a consistent level of feedback that results in far better code.
 
-I've built a **[`/tdd`](./skills/engineering/tdd/SKILL.md) skill** you can slot into any project. It encourages red-green-refactor and gives the agent plenty of guidance on what makes good and bad tests.
+I've built a `**[/tdd](./skills/engineering/tdd/SKILL.md)` skill** you can slot into any project. It encourages red-green-refactor and gives the agent plenty of guidance on what makes good and bad tests.
 
-For debugging, I've also built a **[`/diagnose`](./skills/engineering/diagnose/SKILL.md)** skill that wraps best debugging practices into a simple loop.
+For debugging, I've also built a `**[/diagnose](./skills/engineering/diagnose/SKILL.md)`** skill that wraps best debugging practices into a simple loop.
 
 ### #4: We Built A Ball Of Mud
 
-> "Invest in the design of the system _every day_."
+> "Invest in the design of the system *every day*."
 >
 > Kent Beck, [Extreme Programming Explained](https://www.amazon.co.uk/Extreme-Programming-Explained-Embrace-Change/dp/0321278658)
 
@@ -132,10 +134,10 @@ For debugging, I've also built a **[`/diagnose`](./skills/engineering/diagnose/S
 
 This is built in to every layer of these skills:
 
-- [`/to-prd`](./skills/engineering/to-prd/SKILL.md) quizzes you about which modules you're touching before creating a PRD
-- [`/zoom-out`](./skills/engineering/zoom-out/SKILL.md) tells the agent to explain code in the context of the whole system
+- `[/to-prd](./skills/engineering/to-prd/SKILL.md)` quizzes you about which modules you're touching before creating a PRD
+- `[/zoom-out](./skills/engineering/zoom-out/SKILL.md)` tells the agent to explain code in the context of the whole system
 
-And crucially, [`/improve-codebase-architecture`](./skills/engineering/improve-codebase-architecture/SKILL.md) helps you rescue a codebase that has become a ball of mud. I recommend running it on your codebase once every few days.
+And crucially, `[/improve-codebase-architecture](./skills/engineering/improve-codebase-architecture/SKILL.md)` helps you rescue a codebase that has become a ball of mud. I recommend running it on your codebase once every few days.
 
 ### Summary
 
@@ -177,3 +179,4 @@ Tools I keep around but rarely use.
 - **[migrate-to-shoehorn](./skills/misc/migrate-to-shoehorn/SKILL.md)** — Migrate test files from `as` type assertions to @total-typescript/shoehorn.
 - **[scaffold-exercises](./skills/misc/scaffold-exercises/SKILL.md)** — Create exercise directory structures with sections, problems, solutions, and explainers.
 - **[setup-pre-commit](./skills/misc/setup-pre-commit/SKILL.md)** — Set up Husky pre-commit hooks with lint-staged, Prettier, type checking, and tests.
+

package/bin/collect-skills.mjs

@@ -0,0 +1,97 @@
+import fs from "node:fs";
+import path from "node:path";
+
+export const buckets = [
+  { id: "engineering", label: "daily code work" },
+  { id: "productivity", label: "daily non-code workflow tools" },
+  { id: "misc", label: "kept around but rarely used" },
+];
+
+const DESCRIPTION_MAX = 80;
+
+function readDescription(skillMdPath) {
+  const content = fs.readFileSync(skillMdPath, "utf8");
+  const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
+  if (!match) return "";
+
+  for (const line of match[1].split("\n")) {
+    const desc = line.match(/^description:\s*(.+)$/);
+    if (!desc) continue;
+
+    let value = desc[1].trim();
+    if (
+      (value.startsWith('"') && value.endsWith('"')) ||
+      (value.startsWith("'") && value.endsWith("'"))
+    ) {
+      value = value.slice(1, -1);
+    }
+
+    const firstLine = value.split("\n")[0].trim();
+    if (firstLine.length <= DESCRIPTION_MAX) return firstLine;
+    return `${firstLine.slice(0, DESCRIPTION_MAX - 1)}…`;
+  }
+
+  return "";
+}
+
+/**
+ * @param {string} root
+ * @param {string} destRoot
+ */
+export function collectSkillsByBucket(root, destRoot) {
+  /** @type {{ id: string, label: string, skills: { name: string, src: string, dest: string, description: string, bucket: string }[] }[]} */
+  const catalog = [];
+
+  for (const bucket of buckets) {
+    const bucketDir = path.join(root, "skills", bucket.id);
+    if (!fs.existsSync(bucketDir)) continue;
+
+    /** @type {{ name: string, src: string, dest: string, description: string, bucket: string }[]} */
+    const skills = [];
+
+    for (const entry of fs.readdirSync(bucketDir, { withFileTypes: true })) {
+      if (!entry.isDirectory()) continue;
+
+      const src = path.join(bucketDir, entry.name);
+      const skillMd = path.join(src, "SKILL.md");
+      if (!fs.existsSync(skillMd)) continue;
+
+      skills.push({
+        name: entry.name,
+        src,
+        dest: path.join(destRoot, entry.name),
+        description: readDescription(skillMd),
+        bucket: bucket.id,
+      });
+    }
+
+    skills.sort((a, b) => a.name.localeCompare(b.name));
+    if (skills.length > 0) {
+      catalog.push({ id: bucket.id, label: bucket.label, skills });
+    }
+  }
+
+  return catalog;
+}
+
+/** @param {{ id: string, label: string, skills: { name: string }[] }[]} catalog */
+export function flattenCatalog(catalog) {
+  return catalog.flatMap((bucket) => bucket.skills);
+}
+
+/** @param {{ name: string, bucket: string }[]} skills */
+export function countByBucket(skills) {
+  /** @type {Record<string, number>} */
+  const counts = {};
+  for (const skill of skills) {
+    counts[skill.bucket] = (counts[skill.bucket] ?? 0) + 1;
+  }
+  return counts;
+}
+
+/** @param {Record<string, number>} counts */
+export function formatBucketCounts(counts) {
+  return Object.entries(counts)
+    .map(([bucket, count]) => `${bucket}: ${count}`)
+    .join(", ");
+}

package/bin/install.mjs

@@ -3,50 +3,178 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import {
+  collectSkillsByBucket,
+  countByBucket,
+  flattenCatalog,
+  formatBucketCounts,
+} from "./collect-skills.mjs";
+import { promptSkillSelection } from "./prompt-skills.mjs";
+import { parseArgs, resolveSelection, skillsFromNames } from "./resolve-selection.mjs";
 
 const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
-const buckets = ["engineering", "productivity", "misc"];
-const args = new Set(process.argv.slice(2));
+const destRoot = path.join(os.homedir(), ".agents", "skills");
 
-if (args.has("--help") || args.has("-h")) {
-  console.log(`Usage: npx @ecology91/skills [--dry-run]\n\nCopies promoted skills into ~/.config/opencode/skills.`);
+function printHelp() {
+  console.log(`Usage: npx @ecology91/skills [options]
+
+Install promoted skills into ~/.agents/skills.
+
+From a git checkout, symlinks by default so local edits are picked up live.
+From the published npm package, copies by default.
+
+Interactive mode (TTY): pick buckets and individual skills in one menu.
+Non-interactive (CI, pipes): installs all promoted skills.
+
+  --dry-run         Print actions without installing
+  --copy            Force copies instead of symlinks
+  --link            Force symlinks
+  --all             Skip menu; install all promoted skills
+  --bucket <ids>    Comma-separated buckets (engineering, productivity, misc)
+  --skill <names>   Comma-separated skill names`);
+}
+
+let parsed;
+try {
+  parsed = parseArgs(process.argv.slice(2));
+} catch (error) {
+  console.error(`error: ${error.message}`);
+  process.exit(1);
+}
+
+const { flags, values } = parsed;
+
+if (flags.has("--help") || flags.has("-h")) {
+  printHelp();
   process.exit(0);
 }
 
-const dryRun = args.has("--dry-run");
-const destRoot = path.join(os.homedir(), ".config", "opencode", "skills");
+const dryRun = flags.has("--dry-run");
+const isGitCheckout = fs.existsSync(path.join(root, ".git"));
+const link = flags.has("--link") || (isGitCheckout && !flags.has("--copy"));
+const isInteractive =
+  Boolean(process.stdin.isTTY && process.stdout.isTTY) && !flags.has("--all");
 
-function copySkill(src, dest) {
-  if (dryRun) {
-    console.log(`would install ${path.basename(src)} -> ${dest}`);
+const catalog = collectSkillsByBucket(root, destRoot);
+const allSkills = flattenCatalog(catalog);
+
+function assertSafeDest() {
+  if (!fs.lstatSync(destRoot, { throwIfNoEntry: false })?.isSymbolicLink()) {
     return;
   }
 
-  fs.rmSync(dest, { recursive: true, force: true });
-  fs.mkdirSync(path.dirname(dest), { recursive: true });
-  fs.cpSync(src, dest, { recursive: true, force: true });
-  console.log(`installed ${path.basename(src)} -> ${dest}`);
+  const resolved = fs.realpathSync(destRoot);
+  const repoReal = fs.realpathSync(root);
+  if (resolved === repoReal || resolved.startsWith(`${repoReal}${path.sep}`)) {
+    console.error(
+      `error: ${destRoot} is a symlink into this repo (${resolved}).`,
+    );
+    console.error(
+      `Remove it (rm "${destRoot}") and re-run; the installer will recreate it as a real dir.`,
+    );
+    process.exit(1);
+  }
 }
 
-const skills = [];
+/** @param {{ bucket: string, name: string }[]} skills */
+function groupSkillsByBucket(skills) {
+  /** @type {Map<string, typeof skills>} */
+  const grouped = new Map();
+  for (const skill of skills) {
+    const list = grouped.get(skill.bucket) ?? [];
+    list.push(skill);
+    grouped.set(skill.bucket, list);
+  }
+  return grouped;
+}
 
-for (const bucket of buckets) {
-  const bucketDir = path.join(root, "skills", bucket);
-  if (!fs.existsSync(bucketDir)) continue;
+/** @param {{ bucket: string, name: string, src: string, dest: string }[]} skills */
+function installCopy(skills) {
+  if (!dryRun) {
+    assertSafeDest();
+    fs.mkdirSync(destRoot, { recursive: true });
+  }
 
-  for (const entry of fs.readdirSync(bucketDir, { withFileTypes: true })) {
-    if (!entry.isDirectory()) continue;
+  const grouped = groupSkillsByBucket(skills);
+  for (const [bucket, bucketSkills] of grouped) {
+    console.log(`${bucket} (${bucketSkills.length})`);
+    for (const skill of bucketSkills) {
+      if (dryRun) {
+        console.log(`  would install ${skill.name} -> ${skill.dest}`);
+        continue;
+      }
 
-    const src = path.join(bucketDir, entry.name);
-    if (!fs.existsSync(path.join(src, "SKILL.md"))) continue;
+      fs.rmSync(skill.dest, { recursive: true, force: true });
+      fs.cpSync(skill.src, skill.dest, { recursive: true, force: true });
+      console.log(`  installed ${skill.name} -> ${skill.dest}`);
+    }
+  }
+}
+
+/** @param {{ bucket: string, name: string, src: string, dest: string }[]} skills */
+function installLink(skills) {
+  if (dryRun) {
+    const grouped = groupSkillsByBucket(skills);
+    for (const [bucket, bucketSkills] of grouped) {
+      console.log(`${bucket} (${bucketSkills.length})`);
+      for (const skill of bucketSkills) {
+        console.log(`  would link ${skill.name} -> ${skill.dest} (${skill.src})`);
+      }
+    }
+    return;
+  }
+
+  assertSafeDest();
+  fs.mkdirSync(destRoot, { recursive: true });
 
-    skills.push([src, path.join(destRoot, entry.name)]);
+  const grouped = groupSkillsByBucket(skills);
+  for (const [bucket, bucketSkills] of grouped) {
+    console.log(`${bucket} (${bucketSkills.length})`);
+    for (const skill of bucketSkills) {
+      const stat = fs.lstatSync(skill.dest, { throwIfNoEntry: false });
+      if (stat) {
+        fs.rmSync(skill.dest, { recursive: true, force: true });
+      }
+
+      fs.symlinkSync(skill.src, skill.dest);
+      console.log(`  linked ${skill.name} -> ${skill.src}`);
+    }
   }
 }
 
-if (!dryRun) fs.mkdirSync(destRoot, { recursive: true });
+let selectedSkills;
+try {
+  selectedSkills = resolveSelection(catalog, parsed, isInteractive);
+} catch (error) {
+  console.error(`error: ${error.message}`);
+  process.exit(1);
+}
 
-for (const [src, dest] of skills) copySkill(src, dest);
+if (selectedSkills === null) {
+  const selectedNames = await promptSkillSelection(catalog);
+  if (selectedNames === null) {
+    process.exit(0);
+  }
+  selectedSkills = skillsFromNames(selectedNames, allSkills);
+}
+
+if (selectedSkills.length === 0) {
+  console.log("No skills selected.");
+  process.exit(0);
+}
+
+if (link) {
+  installLink(selectedSkills);
+  const verb = dryRun ? "Checked" : "Linked";
+  console.log(
+    `${verb} ${selectedSkills.length} skills to ~/.agents/skills (${formatBucketCounts(countByBucket(selectedSkills))}).`,
+  );
+} else {
+  installCopy(selectedSkills);
+  const verb = dryRun ? "Checked" : "Installed";
+  console.log(
+    `${verb} ${selectedSkills.length} skills to ~/.agents/skills (${formatBucketCounts(countByBucket(selectedSkills))}).`,
+  );
+}
 
-console.log(`${dryRun ? "Checked" : "Installed"} ${skills.length} skills for opencode.`);
-console.log("Restart opencode to reload the skill list.");
+console.log("Restart your agent (opencode, Cursor, etc.) to reload the skill list.");

package/bin/prompt-skills.mjs

@@ -0,0 +1,39 @@
+import { cancel, groupMultiselect, intro, isCancel, outro } from "@clack/prompts";
+
+/**
+ * @param {{ id: string, label: string, skills: { name: string, description: string }[] }[]} catalog
+ * @returns {Promise<string[] | null>}
+ */
+export async function promptSkillSelection(catalog) {
+  /** @type {Record<string, { value: string, label: string }[]>} */
+  const options = {};
+  const allNames = [];
+
+  for (const bucket of catalog) {
+    options[`${bucket.id} — ${bucket.label}`] = bucket.skills.map((skill) => ({
+      value: skill.name,
+      label: skill.description
+        ? `${skill.name} — ${skill.description}`
+        : skill.name,
+    }));
+    allNames.push(...bucket.skills.map((skill) => skill.name));
+  }
+
+  intro("ecology91-skills");
+
+  const selected = await groupMultiselect({
+    message: "Select skills to install",
+    selectableGroups: true,
+    options,
+    initialValues: allNames,
+    required: true,
+  });
+
+  if (isCancel(selected)) {
+    cancel("Installation cancelled.");
+    return null;
+  }
+
+  outro(`Selected ${selected.length} skill${selected.length === 1 ? "" : "s"}.`);
+  return selected;
+}

package/bin/resolve-selection.mjs

@@ -0,0 +1,107 @@
+import { buckets } from "./collect-skills.mjs";
+
+const bucketIds = new Set(buckets.map((bucket) => bucket.id));
+
+/**
+ * @param {string[]} argv
+ */
+export function parseArgs(argv) {
+  const flags = new Set();
+  /** @type {Record<string, string>} */
+  const values = {};
+
+  for (let i = 0; i < argv.length; i++) {
+    const arg = argv[i];
+
+    if (arg === "--bucket" || arg === "--skill") {
+      const value = argv[i + 1];
+      if (!value || value.startsWith("-")) {
+        throw new Error(`Missing value for ${arg}`);
+      }
+      values[arg.slice(2)] = value;
+      i++;
+      continue;
+    }
+
+    if (arg.startsWith("-")) {
+      flags.add(arg);
+    }
+  }
+
+  return { flags, values };
+}
+
+/**
+ * @param {string | undefined} raw
+ */
+function splitList(raw) {
+  if (!raw) return [];
+  return raw
+    .split(",")
+    .map((part) => part.trim())
+    .filter(Boolean);
+}
+
+/**
+ * @param {{ id: string, skills: { name: string, bucket: string }[] }[]} catalog
+ * @param {{ flags: Set<string>, values: Record<string, string> }} parsed
+ * @param {boolean} isInteractive
+ */
+export function resolveSelection(catalog, parsed, isInteractive) {
+  const allSkills = catalog.flatMap((bucket) => bucket.skills);
+  const allNames = new Set(allSkills.map((skill) => skill.name));
+  const { flags, values } = parsed;
+
+  const hasExplicitSelection =
+    flags.has("--all") || values.bucket || values.skill || !isInteractive;
+
+  if (hasExplicitSelection) {
+    return filterByFlags(allSkills, values, allNames);
+  }
+
+  return null;
+}
+
+/**
+ * @param {{ name: string, bucket: string }[]} allSkills
+ * @param {Record<string, string>} values
+ * @param {Set<string>} allNames
+ */
+function filterByFlags(allSkills, values, allNames) {
+  const bucketFilter = new Set(splitList(values.bucket));
+  const skillFilter = new Set(splitList(values.skill));
+
+  for (const bucket of bucketFilter) {
+    if (!bucketIds.has(bucket)) {
+      throw new Error(
+        `Unknown bucket "${bucket}". Expected one of: ${[...bucketIds].join(", ")}`,
+      );
+    }
+  }
+
+  for (const skill of skillFilter) {
+    if (!allNames.has(skill)) {
+      throw new Error(`Unknown skill "${skill}".`);
+    }
+  }
+
+  return allSkills.filter((skill) => {
+    if (bucketFilter.size > 0 && !bucketFilter.has(skill.bucket)) {
+      return false;
+    }
+    if (skillFilter.size > 0 && !skillFilter.has(skill.name)) {
+      return false;
+    }
+    return true;
+  });
+}
+
+/**
+ * @param {string[] | null} selectedNames
+ * @param {{ name: string }[]} allSkills
+ */
+export function skillsFromNames(selectedNames, allSkills) {
+  if (!selectedNames || selectedNames.length === 0) return [];
+  const byName = new Map(allSkills.map((skill) => [skill.name, skill]));
+  return selectedNames.map((name) => byName.get(name)).filter(Boolean);
+}

package/bin/resolve-selection.test.mjs

@@ -0,0 +1,60 @@
+import assert from "node:assert/strict";
+import { test } from "node:test";
+import { parseArgs, resolveSelection, skillsFromNames } from "./resolve-selection.mjs";
+
+const catalog = [
+  {
+    id: "engineering",
+    label: "daily code work",
+    skills: [
+      { name: "tdd", bucket: "engineering" },
+      { name: "diagnose", bucket: "engineering" },
+    ],
+  },
+  {
+    id: "productivity",
+    label: "daily non-code workflow tools",
+    skills: [{ name: "caveman", bucket: "productivity" }],
+  },
+];
+
+test("parseArgs splits bucket and skill values", () => {
+  const parsed = parseArgs(["--bucket", "engineering", "--skill", "tdd,diagnose"]);
+  assert.equal(parsed.values.bucket, "engineering");
+  assert.equal(parsed.values.skill, "tdd,diagnose");
+});
+
+test("resolveSelection returns all skills when non-interactive", () => {
+  const parsed = parseArgs([]);
+  const selected = resolveSelection(catalog, parsed, false);
+  assert.equal(selected?.length, 3);
+});
+
+test("resolveSelection filters by bucket", () => {
+  const parsed = parseArgs(["--bucket", "engineering"]);
+  const selected = resolveSelection(catalog, parsed, true);
+  assert.deepEqual(
+    selected?.map((skill) => skill.name).sort(),
+    ["diagnose", "tdd"],
+  );
+});
+
+test("resolveSelection intersects bucket and skill filters", () => {
+  const parsed = parseArgs(["--bucket", "engineering", "--skill", "tdd"]);
+  const selected = resolveSelection(catalog, parsed, true);
+  assert.deepEqual(selected?.map((skill) => skill.name), ["tdd"]);
+});
+
+test("resolveSelection rejects unknown bucket", () => {
+  const parsed = parseArgs(["--bucket", "personal"]);
+  assert.throws(
+    () => resolveSelection(catalog, parsed, true),
+    /Unknown bucket "personal"/,
+  );
+});
+
+test("skillsFromNames preserves prompt order", () => {
+  const allSkills = catalog.flatMap((bucket) => bucket.skills);
+  const selected = skillsFromNames(["caveman", "tdd"], allSkills);
+  assert.deepEqual(selected.map((skill) => skill.name), ["caveman", "tdd"]);
+});

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@ecology91/skills",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "opencode agent skills for real engineering workflows.",
   "license": "MIT",
   "type": "module",
+  "dependencies": {
+    "@clack/prompts": "^0.11.0"
+  },
   "bin": {
     "ecology91-skills": "bin/install.mjs"
   },
@@ -35,5 +38,14 @@
   ],
   "publishConfig": {
     "access": "public"
+  },
+  "scripts": {
+    "typecheck": "node --check bin/install.mjs && node --check bin/collect-skills.mjs && node --check bin/prompt-skills.mjs && node --check bin/resolve-selection.mjs && node --check bin/resolve-selection.test.mjs && node --check scripts/verify-package-files.mjs",
+    "test": "node --test bin/resolve-selection.test.mjs && node bin/install.mjs --dry-run --copy --all",
+    "test:unit": "node --test bin/resolve-selection.test.mjs",
+    "link-skills": "./scripts/link-skills.sh",
+    "build": "node scripts/verify-package-files.mjs",
+    "validate:fast": "npm run typecheck && npm run test",
+    "validate": "npm run validate:fast && npm run build"
   }
 }

package/scripts/link-skills.sh

@@ -1,40 +1,5 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Links promoted skills in the repository to opencode's global skills
-# directory, so they can be used from any opencode project.
-
 REPO="$(cd "$(dirname "$0")/.." && pwd)"
-DEST="$HOME/.config/opencode/skills"
-
-# If the destination is a symlink that resolves into this repo, we'd end up
-# writing the per-skill symlinks back into the repo's own skills/ tree. Detect
-# and bail out instead of polluting the working copy.
-if [ -L "$DEST" ]; then
-  resolved="$(readlink -f "$DEST")"
-  case "$resolved" in
-    "$REPO"|"$REPO"/*)
-      echo "error: $DEST is a symlink into this repo ($resolved)." >&2
-      echo "Remove it (rm \"$DEST\") and re-run; the script will recreate it as a real dir." >&2
-      exit 1
-      ;;
-  esac
-fi
-
-mkdir -p "$DEST"
-
-for bucket in engineering productivity misc; do
-  find "$REPO/skills/$bucket" -name SKILL.md -not -path '*/node_modules/*' -print0
-done |
-while IFS= read -r -d '' skill_md; do
-  src="$(dirname "$skill_md")"
-  name="$(basename "$src")"
-  target="$DEST/$name"
-
-  if [ -e "$target" ] && [ ! -L "$target" ]; then
-    rm -rf "$target"
-  fi
-
-  ln -sfn "$src" "$target"
-  echo "linked $name -> $src"
-done
+exec node "$REPO/bin/install.mjs" --link "$@"

package/scripts/verify-package-files.mjs

@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
+const pkg = JSON.parse(fs.readFileSync(path.join(root, "package.json"), "utf8"));
+
+for (const entry of pkg.files) {
+  const target = path.join(root, entry);
+  if (!fs.existsSync(target)) {
+    console.error(`Missing packaged path: ${entry}`);
+    process.exit(1);
+  }
+}
+
+console.log(`Verified ${pkg.files.length} packaged paths.`);

package/skills/engineering/grill-with-docs/CONTEXT-FORMAT.md

@@ -10,7 +10,7 @@
 ## Language
 
 **Order**:
-{A concise description of the term}
+{A one or two sentence description of the term}
 _Avoid_: Purchase, transaction
 
 **Invoice**:
@@ -20,27 +20,13 @@ _Avoid_: Bill, payment request
 **Customer**:
 A person or organization that places orders.
 _Avoid_: Client, buyer, account
-
-## Relationships
-
-- An **Order** produces one or more **Invoices**
-- An **Invoice** belongs to exactly one **Customer**
-
-## Example dialogue
-
-> **Dev:** "When a **Customer** places an **Order**, do we create the **Invoice** immediately?"
-> **Domain expert:** "No — an **Invoice** is only generated once a **Fulfillment** is confirmed."
-
-## Flagged ambiguities
-
-- "account" was used to mean both **Customer** and **User** — resolved: these are distinct concepts.
 ```
 
 ## Rules
 
 - **Be opinionated.** When multiple words exist for the same concept, pick the best one and list the others as aliases to avoid.
 - **Flag conflicts explicitly.** If a term is used ambiguously, call it out in "Flagged ambiguities" with a clear resolution.
-- **Keep definitions tight.** One sentence max. Define what it IS, not what it does.
+- **Keep definitions tight.** One or two sentences max. Define what it IS, not what it does.
 - **Show relationships.** Use bold term names and express cardinality where obvious.
 - **Only include terms specific to this project's context.** General programming concepts (timeouts, error types, utility patterns) don't belong even if the project uses them extensively. Before adding a term, ask: is this a concept unique to this context, or a general programming concept? Only the former belongs.
 - **Group terms under subheadings** when natural clusters emerge. If all terms belong to a single cohesive area, a flat list is fine.

package/skills/engineering/improve-codebase-architecture/HTML-REPORT.md

@@ -0,0 +1,123 @@
+# HTML Report Format
+
+The architectural review is rendered as a single self-contained HTML file in the OS temp directory. Tailwind and Mermaid both come from CDNs. Mermaid handles graph-shaped diagrams reliably; hand-built divs and inline SVG handle the more editorial visuals (mass diagrams, cross-sections). Mix the two — don't lean on Mermaid for everything, it'll start to look generic.
+
+## Scaffold
+
+```html
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>Architecture review — {{repo name}}</title>
+    <script src="https://cdn.tailwindcss.com"></script>
+    <script type="module">
+      import mermaid from "https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.esm.min.mjs";
+      mermaid.initialize({ startOnLoad: true, theme: "neutral", securityLevel: "loose" });
+    </script>
+    <style>
+      /* small custom layer for things Tailwind doesn't cover cleanly:
+         dashed seam lines, hand-drawn-feeling arrow heads, etc. */
+      .seam { stroke-dasharray: 4 4; }
+      .leak { stroke: #dc2626; }
+      .deep { background: linear-gradient(135deg, #0f172a, #1e293b); }
+    </style>
+  </head>
+  <body class="bg-stone-50 text-slate-900 font-sans">
+    <main class="max-w-5xl mx-auto px-6 py-12 space-y-12">
+      <header>...</header>
+      <section id="candidates" class="space-y-10">...</section>
+      <section id="top-recommendation">...</section>
+    </main>
+  </body>
+</html>
+```
+
+## Header
+
+Repo name, date, and a compact legend: solid box = module, dashed line = seam, red arrow = leakage, thick dark box = deep module. No introduction paragraph — straight into the candidates.
+
+## Candidate card
+
+The diagrams carry the weight. Prose is sparse, plain, and uses the glossary terms ([LANGUAGE.md](LANGUAGE.md)) without ceremony.
+
+Each candidate is one `<article>`:
+
+- **Title** — short, names the deepening (e.g. "Collapse the Order intake pipeline").
+- **Badge row** — recommendation strength (`Strong` = emerald, `Worth exploring` = amber, `Speculative` = slate), plus a tag for the dependency category (`in-process`, `local-substitutable`, `ports & adapters`, `mock`).
+- **Files** — monospaced list, `font-mono text-sm`.
+- **Before / After diagram** — the centrepiece. Two columns, side by side. See patterns below.
+- **Problem** — one sentence. What hurts.
+- **Solution** — one sentence. What changes.
+- **Wins** — bullets, ≤6 words each. e.g. "Tests hit one interface", "Pricing logic stops leaking", "Delete 4 shallow wrappers".
+- **ADR callout** (if applicable) — one line in an amber-tinted box.
+
+No paragraphs of explanation. If the diagram needs a paragraph to be understood, redraw the diagram.
+
+## Diagram patterns
+
+Pick the pattern that fits the candidate. Mix them. Don't make every diagram look the same — variety is part of the point.
+
+### Mermaid graph (the workhorse for dependencies / call flow)
+
+Use a Mermaid `flowchart` or `graph` when the point is "X calls Y calls Z, and look at the mess." Wrap it in a Tailwind-styled card so it doesn't feel parachuted in. Style with classDef to colour leakage edges red and the deep module dark. Sequence diagrams work well for "before: 6 round-trips; after: 1."
+
+```html
+<div class="rounded-lg border border-slate-200 bg-white p-4">
+  <pre class="mermaid">
+    flowchart LR
+      A[OrderHandler] --> B[OrderValidator]
+      B --> C[OrderRepo]
+      C -.leak.-> D[PricingClient]
+      classDef leak stroke:#dc2626,stroke-width:2px;
+      class C,D leak
+  </pre>
+</div>
+```
+
+### Hand-built boxes-and-arrows (when Mermaid's layout fights you)
+
+Modules as `<div>`s with borders and labels. Arrows as inline SVG `<line>` or `<path>` elements positioned absolutely over a relative container. Reach for this when you want the "after" diagram to feel like one thick-bordered deep module with greyed-out internals — Mermaid won't render that with the right weight.
+
+### Cross-section (good for layered shallowness)
+
+Stack horizontal bands (`h-12 border-l-4`) to show layers a call passes through. Before: 6 thin layers each doing nothing. After: 1 thick band labelled with the consolidated responsibility.
+
+### Mass diagram (good for "interface as wide as implementation")
+
+Two rectangles per module — one for interface surface area, one for implementation. Before: interface rectangle is nearly as tall as the implementation rectangle (shallow). After: interface rectangle is short, implementation rectangle is tall (deep).
+
+### Call-graph collapse
+
+Before: a tree of function calls rendered as nested boxes. After: the same tree collapsed into one box, with the now-internal calls shown faded inside it.
+
+## Style guidance
+
+- Lean editorial, not corporate-dashboard. Generous whitespace. Serif optional for headings (`font-serif` works well with stone/slate).
+- Colour sparingly: one accent (emerald or indigo) plus red for leakage and amber for warnings.
+- Keep diagrams ~320px tall so before/after sits comfortably side by side without scrolling.
+- Use `text-xs uppercase tracking-wider` for module labels inside diagrams — they should read as schematic, not as UI.
+- The only scripts are the Tailwind CDN and the Mermaid ESM import. The report is otherwise static — no app code, no interactivity beyond Mermaid's own rendering.
+
+## Top recommendation section
+
+One larger card. Candidate name, one sentence on why, anchor link to its card. That's it.
+
+## Tone
+
+Plain English, concise — but the architectural nouns and verbs come straight from [LANGUAGE.md](LANGUAGE.md). Concision is not an excuse to drift.
+
+**Use exactly:** module, interface, implementation, depth, deep, shallow, seam, adapter, leverage, locality.
+
+**Never substitute:** component, service, unit (for module) · API, signature (for interface) · boundary (for seam) · layer, wrapper (for module, when you mean module).
+
+**Phrasings that fit the style:**
+
+- "Order intake module is shallow — interface nearly matches the implementation."
+- "Pricing leaks across the seam."
+- "Deepen: one interface, one place to test."
+- "Two adapters justify the seam: HTTP in prod, in-memory in tests."
+
+**Wins bullets** name the gain in glossary terms: *"locality: bugs concentrate in one module"*, *"leverage: one interface, N call sites"*, *"interface shrinks; implementation absorbs the wrappers"*. Don't write *"easier to maintain"* or *"cleaner code"* — those terms aren't in the glossary and don't earn their place.
+
+No hedging, no throat-clearing, no "it's worth noting that…". If a sentence could be a bullet, make it a bullet. If a bullet could be cut, cut it. If a term isn't in [LANGUAGE.md](LANGUAGE.md), reach for one that is before inventing a new one.

package/skills/engineering/improve-codebase-architecture/SKILL.md

@@ -44,20 +44,30 @@ Then use the Agent tool with `subagent_type=Explore` to walk the codebase. Don't
 
 Apply the **deletion test** to anything you suspect is shallow: would deleting it concentrate complexity, or just move it? A "yes, concentrates" is the signal you want.
 
-### 2. Present candidates
+### 2. Present candidates as an HTML report
 
-Present a numbered list of deepening opportunities. For each candidate:
+Write a self-contained HTML file to the OS temp directory so nothing lands in the repo. Resolve the temp dir from `$TMPDIR`, falling back to `/tmp` (or `%TEMP%` on Windows), and write to `<tmpdir>/architecture-review-<timestamp>.html` so each run gets a fresh file. Open it for the user — `xdg-open <path>` on Linux, `open <path>` on macOS, `start <path>` on Windows — and tell them the absolute path.
+
+The report uses **Tailwind via CDN** for layout and styling, and **Mermaid via CDN** for diagrams where a graph/flow/sequence reliably communicates the structure. Mix Mermaid with hand-crafted CSS/SVG visuals — use Mermaid when relationships are graph-shaped (call graphs, dependencies, sequences), and hand-built divs/SVG when you want something more editorial (mass diagrams, cross-sections, collapse animations). Each candidate gets a **before/after visualisation**. Be visual.
+
+For each candidate, the same template as before, but rendered as a card:
 
 - **Files** — which files/modules are involved
 - **Problem** — why the current architecture is causing friction
 - **Solution** — plain English description of what would change
-- **Benefits** — explained in terms of locality and leverage, and also in how tests would improve
+- **Benefits** — explained in terms of locality and leverage, and how tests would improve
+- **Before / After diagram** — side-by-side, custom-drawn, illustrating the shallowness and the deepening
+- **Recommendation strength** — one of `Strong`, `Worth exploring`, `Speculative`, rendered as a badge
+
+End the report with a **Top recommendation** section: which candidate you'd tackle first and why.
 
 **Use CONTEXT.md vocabulary for the domain, and [LANGUAGE.md](LANGUAGE.md) vocabulary for the architecture.** If `CONTEXT.md` defines "Order," talk about "the Order intake module" — not "the FooBarHandler," and not "the Order service."
 
-**ADR conflicts**: if a candidate contradicts an existing ADR, only surface it when the friction is real enough to warrant revisiting the ADR. Mark it clearly (e.g. _"contradicts ADR-0007 — but worth reopening because…"_). Don't list every theoretical refactor an ADR forbids.
+**ADR conflicts**: if a candidate contradicts an existing ADR, only surface it when the friction is real enough to warrant revisiting the ADR. Mark it clearly in the card (e.g. a warning callout: _"contradicts ADR-0007 — but worth reopening because…"_). Don't list every theoretical refactor an ADR forbids.
+
+See [HTML-REPORT.md](HTML-REPORT.md) for the full HTML scaffold, diagram patterns, and styling guidance.
 
-Do NOT propose interfaces yet. Ask the user: "Which of these would you like to explore?"
+Do NOT propose interfaces yet. After the file is written, ask the user: "Which of these would you like to explore?"
 
 ### 3. Grilling loop
 

package/skills/productivity/handoff/SKILL.md

@@ -4,10 +4,12 @@ description: Compact the current conversation into a handoff document for anothe
 argument-hint: "What will the next session be used for?"
 ---
 
-Write a handoff document summarising the current conversation so a fresh agent can continue the work. Save it to a path produced by `mktemp -t handoff-XXXXXX.md` (read the file before you write to it).
+Write a handoff document summarising the current conversation so a fresh agent can continue the work. Save to the temporary directory of the user's OS - not the current workspace.
 
-Suggest the skills to be used, if any, by the next session.
+Include a "suggested skills" section in the document, which suggests skills that the agent should invoke.
 
 Do not duplicate content already captured in other artifacts (PRDs, plans, ADRs, issues, commits, diffs). Reference them by path or URL instead.
 
+Redact any sensitive information, such as API keys, passwords, or personally identifiable information.
+
 If the user passed arguments, treat them as a description of what the next session will focus on and tailor the doc accordingly.