@dujavi/ai-md 0.3.0 → 0.5.0

package/bin/ai-md.js

@@ -3,7 +3,13 @@
 
 const { spawnSync } = require("child_process");
 const path = require("path");
-const { resolveConfig } = require("../lib/config");
+const {
+  resolveConfig,
+  applyEnvFromConfig,
+  writeMachineConfig,
+  readMachineConfig,
+  expandHome,
+} = require("../lib/config");
 const { emit, fail } = require("../lib/output");
 const { collectStatus, statusHelp } = require("../lib/status");
 const {
@@ -14,14 +20,77 @@ const {
   ensureCursorLinks,
   ensureAgentSkillLinks,
 } = require("../lib/commands");
+const { runScript, runScripts } = require("../lib/scripts");
 
 const scriptsDir = path.join(__dirname, "..", "scripts");
-const cfg = resolveConfig();
 
-process.env.AI_MD_DIR = cfg.dir;
-process.env.AI_MD_REMOTE = cfg.remote;
-process.env.CURSOR_MD_DIR = cfg.dir;
-process.env.CURSOR_MD_REMOTE = cfg.remote;
+function applyFlag(out, flag, args) {
+  switch (flag) {
+    case "--json":
+      out.json = true;
+      return true;
+    case "--full":
+      out.full = true;
+      return true;
+    case "--force":
+      out.force = true;
+      return true;
+    case "--dry-run":
+      out.dryRun = true;
+      return true;
+    case "--fix":
+      out.fix = true;
+      out.force = true;
+      return true;
+    case "-m":
+    case "--message":
+      out.message = args.shift();
+      return true;
+    case "--repo":
+      out.repo = args.shift();
+      return true;
+    case "--name":
+      out.name = args.shift();
+      return true;
+    case "--project":
+      out.project = args.shift();
+      return true;
+    case "--from":
+      out.from = args.shift();
+      return true;
+    case "--remote":
+      out.remote = args.shift();
+      return true;
+    case "--dir":
+      out.dir = expandHome(args.shift());
+      return true;
+    case "--agents":
+      out.agents = String(args.shift() || "cursor")
+        .split(",")
+        .map((s) => s.trim())
+        .filter(Boolean);
+      return true;
+    case "--script": {
+      const name = args.shift();
+      if (!name) {
+        fail("--script requires a name", {
+          exitCode: 2,
+          json: out.json,
+          help: ["ai-md setup --script ensure-tools"],
+        });
+        process.exit(2);
+      }
+      out.scripts.push(name);
+      return true;
+    }
+    case "-h":
+    case "--help":
+      out.cmdHelp = true;
+      return true;
+    default:
+      return false;
+  }
+}
 
 function parseArgs(argv) {
   const out = {
@@ -36,7 +105,12 @@ function parseArgs(argv) {
     name: null,
     project: null,
     from: "base",
+    remote: null,
+    dir: null,
     agents: ["cursor"],
+    scripts: [],
+    scriptName: null,
+    scriptArgs: [],
     rest: [],
   };
   const args = [...argv];
@@ -50,58 +124,26 @@ function parseArgs(argv) {
     return out;
   }
   if (first.startsWith("-")) {
-    // flags before command → treat as status with flags
     out.cmd = "status";
   } else {
     out.cmd = args.shift();
   }
-  while (args.length) {
-    const a = args.shift();
-    switch (a) {
-      case "--json":
-        out.json = true;
-        break;
-      case "--full":
-        out.full = true;
-        break;
-      case "--force":
-        out.force = true;
-        break;
-      case "--dry-run":
-        out.dryRun = true;
-        break;
-      case "--fix":
-        out.fix = true;
-        out.force = true;
-        break;
-      case "-m":
-      case "--message":
-        out.message = args.shift();
-        break;
-      case "--repo":
-        out.repo = args.shift();
-        break;
-      case "--name":
-        out.name = args.shift();
-        break;
-      case "--project":
-        out.project = args.shift();
-        break;
-      case "--from":
-        out.from = args.shift();
-        break;
-      case "--agents":
-        out.agents = String(args.shift() || "cursor")
-          .split(",")
-          .map((s) => s.trim())
-          .filter(Boolean);
-        break;
-      case "-h":
-      case "--help":
-        out.cmdHelp = true;
-        break;
-      default:
-        if (a.startsWith("-")) {
+
+  // `script <name> [--] [args...]` — ai-md flags only before the name
+  if (out.cmd === "script" || out.cmd === "run-script") {
+    while (args.length) {
+      const a = args[0];
+      if (a === "--") {
+        fail("script name required before `--`", {
+          exitCode: 2,
+          json: out.json,
+          help: ["ai-md script ensure-tools -- --dry-run"],
+        });
+        process.exit(2);
+      }
+      if (a.startsWith("-")) {
+        args.shift();
+        if (!applyFlag(out, a, args)) {
           fail(`unknown flag: ${a}`, {
             exitCode: 2,
             json: out.json,
@@ -109,9 +151,46 @@ function parseArgs(argv) {
           });
           process.exit(2);
         }
-        out.rest.push(a);
-        break;
+        continue;
+      }
+      out.scriptName = args.shift();
+      break;
+    }
+    if (!out.scriptName) {
+      fail("script requires a name", {
+        exitCode: 2,
+        json: out.json,
+        help: ["ai-md script <name> [--] [args...]"],
+      });
+      process.exit(2);
+    }
+    if (args[0] === "--") args.shift();
+    out.scriptArgs = args;
+    return out;
+  }
+
+  while (args.length) {
+    const a = args.shift();
+    if (a === "--") {
+      out.scriptArgs = args;
+      break;
     }
+    if (a === "set" || a === "show") {
+      out.rest.push(a);
+      continue;
+    }
+    if (a.startsWith("-")) {
+      if (!applyFlag(out, a, args)) {
+        fail(`unknown flag: ${a}`, {
+          exitCode: 2,
+          json: out.json,
+          help: ["Run `ai-md --help`"],
+        });
+        process.exit(2);
+      }
+      continue;
+    }
+    out.rest.push(a);
   }
   return out;
 }
@@ -127,44 +206,63 @@ Layout:
   ~/.ai-md/skills, rules     System (global) base — linked to ~/.cursor
   ~/.ai-md/templates/<type>  Project-type starters (default: base)
   ~/.ai-md/projects/<name>   Per-app overlays (repo .cursor → here)
+  ~/.ai-md/scripts/<name>    Private machine scripts (ai-md script / setup --script)
+
+Machine config (persisted):
+  ~/.config/ai-md/config.json   dir + remote (override with AI_MD_CONFIG)
+  Precedence: --flag > env > config file > defaults
+
+Supported harnesses (--agents):
+  cursor   ~/.cursor/skills (+ ~/.cursor/rules via install)  [default]
+  claude   ~/.claude/skills
+  agents   ~/.agents/skills
 
 Commands:
+  setup              First-time machine setup: save config, install, optional --script
+  config             Show persisted config (or: config set --remote/--dir)
   status             Snapshot (default when no command) [AXI]
   doctor             Diagnose links/projects; --fix repairs
   install            Clone remote if needed; link ~/.cursor + optional agents
   pull | push        Sync private git repo
-  ensure-tools       Install/update grok + quota-axi (alias: tools)
+  script             Run ~/.ai-md/scripts/<name> (alias: run-script)
   init-project       Seed projects/<name> from templates/<from> + link .cursor/
   apply-template     Merge missing files from a template into a project
   link-project       Link repo .cursor/ without seeding (alias: link)
   help               Show this help
 
 Options:
-  --json             JSON instead of TOON (status/doctor/init/…)
+  --remote <url>     Private content git remote (persisted by setup/config set/install)
+  --dir <path>       Local AI_MD_DIR (default ~/.ai-md; persisted same way)
+  --json             JSON instead of TOON
   --full             Include paths and drift details
-  --agents <list>    Skill link targets: cursor,claude,agents (default: cursor)
+  --agents <list>    Skill link harnesses: cursor,claude,agents (default: cursor)
+  --script <name>    With setup/install: run private script (repeatable)
   --repo <path>      App repository root
-  --name <id>        Project id under projects/ (default: basename)
+  --name <id>        Project id under projects/
   --project <id>     Target project for apply-template
   --from <id>        Template under templates/ (default: base)
-  --force            Replace non-symlink .cursor / re-merge
-  --dry-run          Preview without writing
+  --force            Replace non-symlink paths
+  --dry-run          Preview without writing (before script name / before --)
   --fix             doctor: repair symlinks
   -m, --message      push commit message
+  --                 End of ai-md options; remaining args go to private scripts
 
 Examples:
-  ai-md
-  ai-md status --json
-  ai-md init-project --repo ~/presenter --from base
-  ai-md apply-template --project presenter --from base
+  ai-md setup --remote https://github.com/<you>/.ai-md.git --script ensure-tools
+  ai-md setup --remote <url> --script ensure-tools -- --dry-run
+  ai-md script ensure-tools
+  ai-md script ensure-tools -- --dry-run
+  ai-md config set --remote https://github.com/<you>/.ai-md.git --dir ~/.ai-md
+  ai-md install --remote https://github.com/<you>/.ai-md.git
   ai-md doctor --fix --agents cursor,claude
+  ai-md init-project --repo ~/presenter --from base
 `);
 }
 
-function runBash(script, args) {
+function runBash(script, args, env) {
   const result = spawnSync("bash", [path.join(scriptsDir, script), ...args], {
     stdio: "inherit",
-    env: process.env,
+    env,
   });
   if (result.error) {
     fail(result.error.message, { exitCode: 1 });
@@ -173,6 +271,37 @@ function runBash(script, args) {
   process.exit(result.status === null ? 1 : result.status);
 }
 
+function persistIfRequested(opts) {
+  if (opts.remote == null && opts.dir == null) return null;
+  return writeMachineConfig(
+    { dir: opts.dir, remote: opts.remote },
+    process.env,
+    { dryRun: opts.dryRun }
+  );
+}
+
+function runInstall(cfg, opts) {
+  const bashArgs = ["install"];
+  if (opts.force) bashArgs.push("--force");
+  if (opts.dryRun) bashArgs.push("--dry-run");
+  const result = spawnSync(
+    "bash",
+    [path.join(scriptsDir, "sync-config.sh"), ...bashArgs],
+    { stdio: "inherit", env: process.env }
+  );
+  if (result.status !== 0) {
+    process.exit(result.status === null ? 1 : result.status);
+  }
+  const links = [
+    ...ensureCursorLinks(cfg, { force: opts.force, dryRun: opts.dryRun }),
+    ...ensureAgentSkillLinks(cfg, opts.agents, {
+      force: opts.force,
+      dryRun: opts.dryRun,
+    }),
+  ];
+  return links;
+}
+
 function main() {
   const opts = parseArgs(process.argv.slice(2));
 
@@ -181,8 +310,116 @@ function main() {
     return;
   }
 
+  let cfg = resolveConfig(process.env, {
+    dir: opts.dir || undefined,
+    remote: opts.remote || undefined,
+  });
+  applyEnvFromConfig(cfg);
+
   try {
     switch (opts.cmd) {
+      case "config": {
+        const sub = opts.rest[0] || "show";
+        if (sub === "set") {
+          if (opts.remote == null && opts.dir == null) {
+            fail("config set requires --remote and/or --dir", {
+              exitCode: 2,
+              json: opts.json,
+              help: [
+                "ai-md config set --remote https://github.com/<you>/.ai-md.git --dir ~/.ai-md",
+              ],
+            });
+            process.exit(2);
+          }
+          const saved = writeMachineConfig(
+            { dir: opts.dir, remote: opts.remote },
+            process.env,
+            { dryRun: opts.dryRun }
+          );
+          cfg = resolveConfig(process.env);
+          emit({
+            data: {
+              ...saved,
+              resolved: {
+                dir: cfg.dir,
+                remote: cfg.remote,
+                sources: cfg.sources,
+              },
+            },
+            json: opts.json,
+            help: [
+              "Run `ai-md install` if ~/.ai-md is not cloned yet",
+              "Run `ai-md setup --remote <url> --script ensure-tools` for first-time bootstrap",
+            ],
+          });
+          break;
+        }
+        const stored = readMachineConfig();
+        cfg = resolveConfig(process.env);
+        emit({
+          data: {
+            path: stored.path,
+            stored: stored.raw,
+            resolved: {
+              dir: cfg.dir,
+              remote: cfg.remote,
+              sources: cfg.sources,
+            },
+          },
+          json: opts.json,
+          help: [
+            "ai-md config set --remote <url> --dir ~/.ai-md",
+            "Flags and env override the config file",
+          ],
+        });
+        break;
+      }
+      case "setup": {
+        const saved = writeMachineConfig(
+          {
+            dir: opts.dir || cfg.dir,
+            remote: opts.remote || cfg.remote,
+          },
+          process.env,
+          { dryRun: opts.dryRun }
+        );
+        cfg = resolveConfig(process.env, {
+          dir: opts.dir || undefined,
+          remote: opts.remote || undefined,
+        });
+        applyEnvFromConfig(cfg);
+        const links = opts.dryRun ? [] : runInstall(cfg, opts);
+        const scripts =
+          opts.scripts.length === 0
+            ? []
+            : runScripts(cfg, opts.scripts, opts.scriptArgs, {
+                dryRun: opts.dryRun,
+              });
+        const failed = scripts.find((s) => s.exitCode !== 0);
+        const data = collectStatus({
+          full: opts.full,
+          agents: opts.agents,
+          from: opts.from,
+        });
+        emit({
+          data: {
+            setup: "ok",
+            config: saved,
+            links,
+            scripts,
+            ...data,
+          },
+          json: opts.json,
+          help: [
+            opts.scripts.length
+              ? "Run `ai-md status` to verify"
+              : "Run `ai-md script <name>` for private machine scripts (e.g. ensure-tools)",
+            "Run `ai-md init-project --repo <path> --from base` for a new app",
+          ],
+        });
+        if (failed) process.exit(failed.exitCode);
+        break;
+      }
       case "status": {
         const data = collectStatus({
           full: opts.full,
@@ -260,55 +497,65 @@ function main() {
         break;
       }
       case "install": {
-        // clone/pull via bash, then Node links (incl. agents)
-        const bashArgs = ["install"];
-        if (opts.force) bashArgs.push("--force");
-        if (opts.dryRun) bashArgs.push("--dry-run");
-        const result = spawnSync(
-          "bash",
-          [path.join(scriptsDir, "sync-config.sh"), ...bashArgs],
-          { stdio: "inherit", env: process.env }
-        );
-        if (result.status !== 0) {
-          process.exit(result.status === null ? 1 : result.status);
+        const saved = persistIfRequested(opts);
+        if (saved) {
+          cfg = resolveConfig(process.env, {
+            dir: opts.dir || undefined,
+            remote: opts.remote || undefined,
+          });
+          applyEnvFromConfig(cfg);
         }
-        const links = [
-          ...ensureCursorLinks(cfg, { force: opts.force, dryRun: opts.dryRun }),
-          ...ensureAgentSkillLinks(cfg, opts.agents, {
-            force: opts.force,
-            dryRun: opts.dryRun,
-          }),
-        ];
+        const links = runInstall(cfg, opts);
+        const scripts =
+          opts.scripts.length === 0
+            ? []
+            : runScripts(cfg, opts.scripts, opts.scriptArgs, {
+                dryRun: opts.dryRun,
+              });
+        const failed = scripts.find((s) => s.exitCode !== 0);
         const data = collectStatus({ full: opts.full, agents: opts.agents });
         emit({
-          data: { install: "ok", links, ...data },
+          data: { install: "ok", config: saved, links, scripts, ...data },
           json: opts.json,
           help: [
-            "Run `ai-md ensure-tools` to install grok + quota-axi",
+            "Run `ai-md script <name>` for private machine scripts",
             "Run `ai-md init-project --repo <path>` for a new app",
           ],
         });
+        if (failed) process.exit(failed.exitCode);
         break;
       }
       case "pull":
-        runBash("sync-config.sh", [
-          "pull",
-          ...(opts.dryRun ? ["--dry-run"] : []),
-        ]);
+        runBash(
+          "sync-config.sh",
+          ["pull", ...(opts.dryRun ? ["--dry-run"] : [])],
+          process.env
+        );
         break;
       case "push": {
         const args = ["push"];
         if (opts.message) args.push("-m", opts.message);
         if (opts.dryRun) args.push("--dry-run");
-        runBash("sync-config.sh", args);
+        runBash("sync-config.sh", args, process.env);
         break;
       }
-      case "ensure-tools":
-      case "tools":
-        runBash("ensure-agent-tools.sh", [
-          ...(opts.dryRun ? ["--dry-run"] : []),
-        ]);
+      case "script":
+      case "run-script": {
+        const result = runScript(cfg, opts.scriptName, opts.scriptArgs, {
+          dryRun: opts.dryRun,
+        });
+        emit({
+          data: { scripts: [result] },
+          json: opts.json,
+          help: [
+            "Scripts live in ~/.ai-md/scripts/ (private content repo)",
+            "ai-md script <name> -- [args...]",
+            "ai-md setup --script <name> -- [args...]",
+          ],
+        });
+        process.exit(result.exitCode);
         break;
+      }
       default:
         fail(`unknown command: ${opts.cmd}`, {
           exitCode: 2,
@@ -319,7 +566,7 @@ function main() {
     }
   } catch (err) {
     fail(err.message || String(err), {
-      exitCode: err.code === "EINVAL" ? 2 : 1,
+      exitCode: err.code === "EINVAL" || err.code === "ENOENT" ? 2 : 1,
       json: opts.json,
       help: ["Run `ai-md --help`"],
     });