@drafthq/draft 2.7.0 → 2.7.1

package/.claude-plugin/marketplace.json

@@ -12,7 +12,7 @@
       "name": "draft",
       "source": "./",
       "description": "Context-Driven Development: draft specs and plans before implementation. Structured workflows for features and fixes.",
-      "version": "2.7.0",
+      "version": "2.7.1",
       "author": {
         "name": "mayurpise"
       },

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "draft",
   "description": "Context-Driven Development: draft specs and plans before implementation. Structured workflows for features and fixes.",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "author": {
     "name": "mayurpise"
   },

package/README.md

@@ -62,16 +62,18 @@ draft install <host>
 draft list                             # show every host + where it installs
 ```
 
-| Host | `draft install …` | Lands in |
-|------|-------------------|----------|
-| **Claude Code** | `claude-code` | `./.claude-plugin/` + `skills/` `core/` (project) |
-| **Cursor** | `cursor` | `~/.cursor/plugins/local/draft/` (global) |
-| **Codex** | `codex` | `./AGENTS.md` (project) |
-| **opencode** | `opencode` | `./AGENTS.md` + `~/.agents/skills/draft/` |
+Each host installs the way that host actually loads extensions — no manual steps after the command:
 
-Flags: `--global` / `--project` to pick scope, `--dry-run` to preview writes, `--force` to overwrite, `--no-graph` to skip the graph-engine fetch.
+| Host | `draft install …` | What it does |
+|------|-------------------|--------------|
+| **Claude Code** | `claude-code` | Registers the plugin via `claude plugin marketplace add` + `claude plugin install` (user scope). Restart Claude Code. |
+| **Cursor** | `cursor` | Copies the plugin into `~/.cursor/plugins/local/draft/` (auto-loaded). Restart Cursor. |
+| **Codex** | `codex` | Writes `./AGENTS.md`, which Codex reads automatically. |
+| **opencode** | `opencode` | Writes `./AGENTS.md` + `~/.agents/skills/draft/`, both auto-discovered. |
 
-Then, in Claude Code:
+Flags: `--global` / `--project` to pick scope, `--dry-run` to preview, `--force` to overwrite, `--no-graph` to skip the graph-engine fetch.
+
+Then, in Claude Code (after restarting):
 
 ```bash
 /draft:init       # 5-phase codebase analysis (one-time)

package/cli/src/hosts/claude-code.js

@@ -1,45 +1,46 @@
 'use strict';
 
-const path = require('path');
-const { asset } = require('../lib/paths');
-
-// Draft's native plugin shape: the .claude-plugin manifest + skills/core/bin and
-// the deterministic shell helpers the skills invoke. Copied into the project root
-// so Claude Code (and Cursor, which shares the format) discovers it locally.
-const ITEMS = [
-  { p: '.claude-plugin', kind: 'copyTree' },
-  { p: 'skills', kind: 'copyTree' },
-  { p: 'core', kind: 'copyTree' },
-  { p: 'bin', kind: 'copyTree' },
-  { p: 'scripts/tools', kind: 'copyTree' },
-  { p: 'scripts/fetch-memory-engine.sh', kind: 'copyFile' },
-  { p: 'scripts/lib.sh', kind: 'copyFile' },
-];
+// Claude Code loads plugins from its own registry (via a marketplace), NOT from
+// an arbitrary project directory — so copying files into the cwd never registers
+// the /draft:* commands. The correct install is the `claude plugin` CLI:
+//   claude plugin marketplace add drafthq/draft
+//   claude plugin install draft@draft-plugins --scope <user|project>
+// Default scope is `user` (global, available in every project). If the `claude`
+// CLI isn't on PATH, we print the equivalent in-session slash commands.
+const MARKETPLACE_REPO = 'drafthq/draft';
+const PLUGIN_REF = 'draft@draft-plugins'; // name@<marketplace name from marketplace.json>
 
 module.exports = {
   id: 'claude-code',
   label: 'Claude Code',
   aliases: ['claude', 'claudecode'],
-  defaultScope: 'project',
+  defaultScope: 'global',
 
   plan(ctx) {
-    const root = ctx.cwd;
-    const actions = ITEMS.map((it) => ({
-      kind: it.kind,
-      src: asset(it.p),
-      dest: path.join(root, it.p),
-      label: it.p,
-      // Guard on the manifest dir: its presence marks a prior Draft install.
-      guard: it.p === '.claude-plugin',
-    }));
-
+    const scope = ctx.scope === 'project' ? 'project' : 'user'; // --global -> user
     return {
-      targetSummary: `${root} (project)`,
-      actions,
-      graph: true,
-      done: 'Draft plugin copied into the project. Run /draft in Claude Code to see the commands.',
-      notes: [
-        'Alternative (no npm): /plugin marketplace add drafthq/draft  then  /plugin install draft',
+      targetSummary: `Claude Code plugin registry (scope: ${scope})`,
+      requires: 'claude',
+      actions: [
+        {
+          kind: 'exec',
+          cmd: 'claude',
+          args: ['plugin', 'marketplace', 'add', MARKETPLACE_REPO],
+          label: `claude plugin marketplace add ${MARKETPLACE_REPO}`,
+        },
+        {
+          kind: 'exec',
+          cmd: 'claude',
+          args: ['plugin', 'install', PLUGIN_REF, '--scope', scope],
+          label: `claude plugin install ${PLUGIN_REF} --scope ${scope}`,
+        },
+      ],
+      graph: false, // /draft:init fetches the graph engine on first use
+      done: 'Installed draft. Restart Claude Code (or start a new session), then run /draft:init.',
+      fallbackTitle: 'Claude Code CLI not found. Run these in Claude Code instead:',
+      fallback: [
+        '/plugin marketplace add drafthq/draft',
+        '/plugin install draft',
       ],
     };
   },

package/cli/src/installer.js

@@ -1,10 +1,29 @@
 'use strict';
 
+const { spawnSync } = require('child_process');
 const fsx = require('./lib/fsx');
 const log = require('./lib/log');
 const { fetchGraph } = require('./lib/graph');
 
+function hasBinary(name) {
+  // ENOENT on the error means the binary is not on PATH.
+  const r = spawnSync(name, ['--version'], { stdio: 'ignore' });
+  return !(r.error && r.error.code === 'ENOENT');
+}
+
 function execAction(act, ctx) {
+  const printable = `${act.cmd} ${act.args.join(' ')}`;
+  log.plan(`${ctx.dryRun ? 'would run' : 'running'}: ${printable}`);
+  if (ctx.dryRun) return 0;
+  const r = spawnSync(act.cmd, act.args, { stdio: 'inherit' });
+  if (r.error) {
+    log.error(`failed to run ${act.cmd}: ${r.error.message}`);
+    return 1;
+  }
+  return r.status == null ? 1 : r.status;
+}
+
+function fsAction(act, ctx) {
   log.plan(`${ctx.dryRun ? 'would write' : 'writing'}: ${act.dest}`);
   if (ctx.dryRun) return;
   switch (act.kind) {
@@ -22,13 +41,28 @@ function execAction(act, ctx) {
   }
 }
 
+function printFallback(plan) {
+  if (plan.fallbackTitle) log.warn(plan.fallbackTitle);
+  (plan.fallback || []).forEach((line) => log.info('    ' + line));
+}
+
 function install(host, ctx) {
   const plan = host.plan(ctx);
   log.step(`Installing Draft -> ${host.label}  [${plan.targetSummary}]${ctx.dryRun ? '  (dry run)' : ''}`);
 
-  // Pre-flight: every bundled source must exist, and guarded targets must not
-  // already exist unless --force. Checked up front so a failure writes nothing.
+  // A plan may require an external CLI (e.g. claude). If it's missing, print
+  // the manual fallback and stop — but only when actually installing; a
+  // dry run still shows the planned commands.
+  if (plan.requires && !ctx.dryRun && !hasBinary(plan.requires)) {
+    printFallback(plan);
+    return 0;
+  }
+
+  // Pre-flight: for file copies, every bundled source must exist and guarded
+  // targets must not already exist unless --force. Checked up front so a
+  // failure writes nothing.
   for (const act of plan.actions) {
+    if (act.kind === 'exec') continue;
     if (!fsx.exists(act.src)) {
       log.error(`Bundled asset missing: ${act.src}`);
       log.error('Reinstall @drafthq/draft — the package looks incomplete.');
@@ -41,7 +75,16 @@ function install(host, ctx) {
   }
 
   for (const act of plan.actions) {
-    execAction(act, ctx);
+    if (act.kind === 'exec') {
+      const code = execAction(act, ctx);
+      if (code !== 0) {
+        log.error(`Step failed (exit ${code}): ${act.label || act.cmd}`);
+        if (plan.fallback) printFallback(plan);
+        return code;
+      }
+    } else {
+      fsAction(act, ctx);
+    }
   }
 
   if (plan.graph && ctx.graph && !ctx.dryRun) {
@@ -58,4 +101,4 @@ function install(host, ctx) {
   return 0;
 }
 
-module.exports = { install };
+module.exports = { install, hasBinary };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drafthq/draft",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "Context-Driven Development for AI coding agents — install Draft into Claude Code, Cursor, Codex, or opencode.",
   "bin": {
     "draft": "cli/bin/draft.js"