ascendant-skills 2.1.0 → 2.1.1

package/bin/cli.mjs

@@ -2,165 +2,214 @@
 /**
  * `npx ascendant-skills install`: detect coding tools, ask project or
  * global, then install the ascendant plugin (Claude Code, Codex, OpenCode)
- * or skill (everything else) into each. Dependency-free; Node >= 18.
+ * or skill (everything else) into each. Built on effect/cli; Node >= 18.
  *
  * The command matrix lives in ../lib/plan.mjs; this file only probes the
  * machine, prompts, and runs the plan.
  */
 
-import { spawnSync } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import path from "node:path";
-import { createInterface } from "node:readline/promises";
 import { fileURLToPath } from "node:url";
-import {
-  PROVIDERS,
-  detectProviders,
-  parseArgs,
-  parseProviders,
-  planInstall,
-} from "../lib/plan.mjs";
+import { Console, Effect, Option } from "effect";
+import { CliError, Command, Flag, Prompt } from "effect/cli";
+import { ChildProcess, ChildProcessSpawner } from "effect/process";
+import { NodeRuntime, NodeServices } from "@effect/platform-node";
+import { PROVIDERS, SCOPES, detectProviders, parseProviders, planInstall } from "../lib/plan.mjs";
 
 const IS_WINDOWS = process.platform === "win32";
 const PKG = JSON.parse(
   readFileSync(fileURLToPath(new URL("../package.json", import.meta.url)), "utf-8"),
 );
 
-const HELP = `ascendant-skills v${PKG.version}
+const BIN_NAMES = [...new Set([...PROVIDERS.flatMap((p) => p.bins), "npx"])];
+const HOME_DIRS = [...new Set(PROVIDERS.flatMap((p) => p.homeDirs))];
 
-Install the Ascendant Vedic astrology skill and plugins into your coding tools.
+/** Probe PATH and the home directory once; the plan reads the results synchronously. */
+const detectMachine = Effect.sync(() => {
+  const exts = IS_WINDOWS ? (process.env.PATHEXT ?? ".EXE;.CMD;.BAT").split(";") : [""];
+  const dirs = (process.env.PATH ?? "").split(path.delimiter).filter(Boolean);
+  const bins = new Set(
+    BIN_NAMES.filter((name) =>
+      dirs.some((dir) => exts.some((ext) => existsSync(path.join(dir, name + ext)))),
+    ),
+  );
+  const homeDirs = new Set(HOME_DIRS.filter((rel) => existsSync(path.join(homedir(), rel))));
+  return {
+    hasBin: (name) => bins.has(name),
+    hasHomeDir: (rel) => homeDirs.has(rel),
+  };
+});
+
+const opencodeMajor = (machine) =>
+  Effect.gen(function* () {
+    if (!machine.hasBin("opencode")) return undefined;
+    const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+    const out = yield* spawner
+      .string(ChildProcess.make("opencode", ["--version"], { shell: IS_WINDOWS }))
+      .pipe(Effect.orElseSucceed(() => ""));
+    const match = /(\d+)\.\d+/.exec(out);
+    return match ? Number(match[1]) : undefined;
+  });
 
-Usage:
-  npx ascendant-skills install [options]
+/** Run one plan step with inherited stdio. A missing CLI counts as a failure. */
+const runStep = (step) =>
+  Effect.gen(function* () {
+    const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+    // Windows CLIs (claude, npx, ...) are .cmd shims that need a shell. Every
+    // argument comes from plan.mjs constants, so nothing user-supplied is
+    // interpolated into the shell line.
+    const code = yield* spawner.exitCode(
+      ChildProcess.make(step.command, step.args, {
+        shell: IS_WINDOWS,
+        stdin: "inherit",
+        stdout: "inherit",
+        stderr: "inherit",
+      }),
+    );
+    return code === 0;
+  }).pipe(Effect.orElseSucceed(() => false));
 
-Options:
-  --providers=<ids>   Comma-separated tools, or "all" (default: detected)
-                      ${PROVIDERS.map((p) => p.id).join(", ")}
-  --scope=<scope>     project | global (default: asks; global with --yes)
-  -y, --yes           Skip prompts and use the defaults
-  --dry-run           Print the commands without running them
-  -h, --help          Show this help
-`;
+const userError = (message) => new CliError.UserError({ cause: message });
 
-function hasBin(name) {
-  const exts = IS_WINDOWS ? (process.env.PATHEXT ?? ".EXE;.CMD;.BAT").split(";") : [""];
-  const dirs = (process.env.PATH ?? "").split(path.delimiter).filter(Boolean);
-  return dirs.some((dir) => exts.some((ext) => existsSync(path.join(dir, name + ext))));
-}
-
-function hasHomeDir(rel) {
-  return existsSync(path.join(homedir(), rel));
-}
-
-function opencodeMajor() {
-  if (!hasBin("opencode")) return undefined;
-  const out = spawnSync("opencode", ["--version"], { encoding: "utf-8", shell: IS_WINDOWS });
-  const match = /(\d+)\.\d+/.exec(out.stdout ?? "");
-  return match ? Number(match[1]) : undefined;
-}
-
-async function ask(rl, question, fallback) {
-  const answer = (await rl.question(question)).trim();
-  return answer === "" ? fallback : answer;
-}
-
-async function choose(opts, detected) {
-  const interactive = !opts.yes && process.stdin.isTTY;
-  let { providers, scope } = opts;
-
-  if (!interactive) {
-    return { providers: providers ?? detected, scope: scope ?? "global" };
-  }
-
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
-  try {
-    if (!providers) {
+const parseProvidersOrFail = (raw) =>
+  Effect.try({
+    try: () => parseProviders(raw),
+    catch: (error) => userError(error instanceof Error ? error.message : String(error)),
+  });
+
+/**
+ * Fill in providers and scope. Flags win; anything missing is asked for only
+ * on an interactive terminal without `--yes`, otherwise the defaults apply.
+ * `providersFlag` is the raw `--providers` value, parsed here.
+ */
+const choose = ({ providersFlag, scope, yes, detected }) =>
+  Effect.gen(function* () {
+    const interactive = !yes && process.stdin.isTTY;
+    if (!interactive) {
+      const providers =
+        providersFlag === undefined ? detected : yield* parseProvidersOrFail(providersFlag);
+      return { providers, scope: scope ?? "global" };
+    }
+
+    let providers;
+    if (providersFlag === undefined) {
       const names = detected.map((id) => PROVIDERS.find((p) => p.id === id).name);
-      console.log(
+      yield* Console.log(
         detected.length > 0 ? `Detected: ${names.join(", ")}` : "No coding tools detected.",
       );
-      const raw = await ask(
-        rl,
-        `Install for which tools? [${detected.length > 0 ? detected.join(",") : "e.g. claude,cursor"}] `,
-        detected.join(","),
+      const raw = yield* Prompt.run(
+        Prompt.String({
+          message: `Install for which tools? [${detected.length > 0 ? detected.join(",") : "e.g. claude,cursor"}]`,
+          default: detected.join(","),
+        }),
       );
-      providers = raw === "" ? [] : parseProviders(raw);
+      providers = raw.trim() === "" ? [] : yield* parseProvidersOrFail(raw);
+    } else {
+      providers = yield* parseProvidersOrFail(providersFlag);
     }
-    if (!scope) {
-      const raw = await ask(
-        rl,
-        "Install for this project or globally? (project/global) [global] ",
-        "global",
+
+    let chosenScope = scope;
+    if (chosenScope === undefined) {
+      chosenScope = yield* Prompt.run(
+        Prompt.Select({
+          message: "Install for this project or globally?",
+          choices: [
+            { title: "Globally", value: "global" },
+            { title: "This project", value: "project" },
+          ],
+        }),
       );
-      scope = raw.toLowerCase().startsWith("p") ? "project" : "global";
     }
-  } finally {
-    rl.close();
-  }
-  return { providers, scope };
-}
-
-function run(step) {
-  // Windows CLIs (claude, npx, ...) are .cmd shims that need a shell. Every
-  // argument comes from plan.mjs constants, so nothing user-supplied is
-  // interpolated into the shell line.
-  const result = spawnSync(step.command, step.args, { stdio: "inherit", shell: IS_WINDOWS });
-  return result.status === 0;
-}
-
-async function main() {
-  const opts = parseArgs(process.argv.slice(2));
-  if (opts.help || opts.command === undefined) {
-    console.log(HELP);
-    return opts.help ? 0 : 1;
-  }
-  if (opts.command !== "install") {
-    console.error(`Unknown command: ${opts.command}\n\n${HELP}`);
-    return 1;
-  }
-
-  const detected = detectProviders({ hasBin, hasHomeDir });
-  const { providers, scope } = await choose(opts, detected);
-  if (providers.length === 0) {
-    console.error(
-      "Nothing to install. Pass --providers=<ids>, for example --providers=claude,cursor.",
-    );
-    return 1;
-  }
-
-  const { steps, notes } = planInstall({
-    providers,
-    scope,
-    hasBin,
-    opencodeMajor: opencodeMajor(),
+
+    return { providers, scope: chosenScope };
   });
-  console.log(`\nInstalling ascendant (${scope}) for: ${providers.join(", ")}\n`);
-
-  const failed = [];
-  for (const step of steps) {
-    console.log(`→ ${step.label}\n  $ ${[step.command, ...step.args].join(" ")}`);
-    if (opts.dryRun) continue;
-    if (!run(step)) failed.push(step.label);
-  }
-
-  for (const note of notes) console.log(`\nNote: ${note}`);
-  if (failed.length > 0) {
-    console.error(`\nFailed: ${failed.join("; ")}`);
-    return 1;
-  }
-  if (!opts.dryRun) {
-    console.log(
-      "\nDone. Restart your tool, then run /ascendant (Codex: $ascendant) with your birth details.",
-    );
-  }
-  return 0;
-}
-
-main().then(
-  (code) => process.exit(code),
-  (error) => {
-    console.error(error instanceof Error ? error.message : error);
-    process.exit(1);
+
+const install = Command.make(
+  "install",
+  {
+    providers: Flag.optional(
+      Flag.String("providers").pipe(
+        Flag.withDescription(
+          `Comma-separated tools, or "all" (default: detected). Ids: ${PROVIDERS.map((p) => p.id).join(", ")}`,
+        ),
+      ),
+    ),
+    scope: Flag.optional(
+      Flag.Literals("scope", SCOPES).pipe(
+        Flag.withDescription("project | global (default: asks; global with --yes)"),
+      ),
+    ),
+    yes: Flag.Boolean("yes").pipe(
+      Flag.withAlias("y"),
+      Flag.withDefault(false),
+      Flag.withDescription("Skip prompts and use the defaults"),
+    ),
+    dryRun: Flag.Boolean("dry-run").pipe(
+      Flag.withDefault(false),
+      Flag.withDescription("Print the commands without running them"),
+    ),
   },
+  ({ providers, scope, yes, dryRun }) =>
+    Effect.gen(function* () {
+      const machine = yield* detectMachine;
+      const detected = detectProviders(machine);
+      const choice = yield* choose({
+        providersFlag: Option.getOrUndefined(providers),
+        scope: Option.getOrUndefined(scope),
+        yes,
+        detected,
+      });
+      if (choice.providers.length === 0) {
+        return yield* Effect.fail(
+          userError(
+            "Nothing to install. Pass --providers=<ids>, for example --providers=claude,cursor.",
+          ),
+        );
+      }
+
+      const { steps, notes } = planInstall({
+        providers: choice.providers,
+        scope: choice.scope,
+        hasBin: machine.hasBin,
+        opencodeMajor: yield* opencodeMajor(machine),
+      });
+      yield* Console.log(
+        `\nInstalling ascendant (${choice.scope}) for: ${choice.providers.join(", ")}\n`,
+      );
+
+      const failed = [];
+      for (const step of steps) {
+        yield* Console.log(`→ ${step.label}\n  $ ${[step.command, ...step.args].join(" ")}`);
+        if (dryRun) continue;
+        if (!(yield* runStep(step))) failed.push(step.label);
+      }
+
+      for (const note of notes) yield* Console.log(`\nNote: ${note}`);
+      if (failed.length > 0) {
+        return yield* Effect.fail(userError(`Failed: ${failed.join("; ")}`));
+      }
+      if (!dryRun) {
+        yield* Console.log(
+          "\nDone. Restart your tool, then run /ascendant (Codex: $ascendant) with your birth details.",
+        );
+      }
+    }),
+).pipe(
+  Command.withDescription(
+    "Install the Ascendant Vedic astrology skill and plugins into your coding tools.",
+  ),
+);
+
+const root = Command.make("ascendant-skills").pipe(
+  Command.withDescription(
+    "Install the Ascendant Vedic astrology skill and plugins into your coding tools.",
+  ),
+  Command.withSubcommands([install]),
+);
+
+Command.runWith(root, { version: PKG.version })(process.argv.slice(2)).pipe(
+  Effect.provide(NodeServices.layer),
+  NodeRuntime.runMain,
 );

package/lib/plan.mjs

@@ -77,60 +77,14 @@ export const PROVIDERS = [
   },
 ];
 
-const PROVIDER_IDS = PROVIDERS.map((p) => p.id);
-const SCOPES = ["project", "global"];
+export const PROVIDER_IDS = PROVIDERS.map((p) => p.id);
+export const SCOPES = ["project", "global"];
 
 /**
- * Parse argv (without node and script). Accepts `--flag=value` and
- * `--flag value`. Throws on unknown flags, providers or scopes so a typo in
- * a scripted install fails loudly instead of installing nothing.
+ * Parse a comma-separated `--providers` value. Throws on an empty value or an
+ * unknown id so a typo in a scripted install fails loudly instead of
+ * installing nothing. `all` expands to every provider.
  */
-export function parseArgs(argv) {
-  const opts = {
-    command: undefined,
-    providers: undefined,
-    scope: undefined,
-    yes: false,
-    dryRun: false,
-    help: false,
-  };
-  const args = [...argv];
-  while (args.length > 0) {
-    const arg = args.shift();
-    const [flag, inline] = arg.startsWith("--") ? splitFlag(arg) : [arg, undefined];
-    const value = () => inline ?? args.shift();
-    switch (flag) {
-      case "-h":
-      case "--help":
-        opts.help = true;
-        break;
-      case "-y":
-      case "--yes":
-        opts.yes = true;
-        break;
-      case "--dry-run":
-        opts.dryRun = true;
-        break;
-      case "--providers":
-        opts.providers = parseProviders(value());
-        break;
-      case "--scope":
-        opts.scope = parseScope(value());
-        break;
-      default:
-        if (flag.startsWith("-")) throw new Error(`Unknown option: ${flag}`);
-        if (opts.command !== undefined) throw new Error(`Unexpected argument: ${flag}`);
-        opts.command = flag;
-    }
-  }
-  return opts;
-}
-
-function splitFlag(arg) {
-  const eq = arg.indexOf("=");
-  return eq === -1 ? [arg, undefined] : [arg.slice(0, eq), arg.slice(eq + 1)];
-}
-
 export function parseProviders(raw) {
   if (!raw) throw new Error(`--providers needs a value: ${PROVIDER_IDS.join(",")} or all`);
   const ids = raw
@@ -147,12 +101,6 @@ export function parseProviders(raw) {
   return [...new Set(ids)];
 }
 
-export function parseScope(raw) {
-  const scope = raw?.trim().toLowerCase();
-  if (!SCOPES.includes(scope)) throw new Error(`--scope must be one of: ${SCOPES.join(", ")}`);
-  return scope;
-}
-
 /**
  * Which providers are installed, given probes for binaries and home dirs.
  * `hasBin(name)` and `hasHomeDir(relPath)` are injected by the CLI.
@@ -229,11 +177,14 @@ export function planInstall({ providers, scope, hasBin, opencodeMajor }) {
   }
 
   if (skillAgents.length > 0) {
+    // `npx ascendant-skills` implies npx, but `bunx ascendant-skills` works
+    // too and Bun-only machines have no npx to hand off to.
+    const [runner, ...runnerArgs] = hasBin("npx") ? ["npx", "-y"] : ["bunx"];
     steps.push({
       label: `Agent Skills: ${skillAgents.join(", ")}`,
-      command: "npx",
+      command: runner,
       args: [
-        "-y",
+        ...runnerArgs,
         "skills",
         "add",
         REPO,

package/package.json

@@ -1,37 +1,41 @@
 {
   "name": "ascendant-skills",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "One command to install the Ascendant Vedic astrology skill and plugins into Claude Code, Codex, OpenCode, Cursor, Gemini CLI and more.",
-  "type": "module",
-  "bin": {
-    "ascendant-skills": "bin/cli.mjs"
-  },
-  "files": [
-    "bin/",
-    "lib/",
-    "README.md"
+  "keywords": [
+    "agent-skills",
+    "astrology",
+    "claude-code",
+    "codex",
+    "opencode",
+    "vedic astrology"
   ],
-  "engines": {
-    "node": ">=18"
-  },
+  "homepage": "https://astro-ascendant.vercel.app",
   "license": "AGPL-3.0-or-later",
   "author": {
     "name": "Laxman K R",
     "email": "krlaxman03@gmail.com",
     "url": "https://thaletto.vercel.app"
   },
-  "homepage": "https://astro-ascendant.vercel.app",
   "repository": {
     "type": "git",
     "url": "https://github.com/astro-ascendant/skills.git",
     "directory": "packages/ascendant-skills"
   },
-  "keywords": [
-    "agent-skills",
-    "claude-code",
-    "codex",
-    "opencode",
-    "astrology",
-    "vedic astrology"
-  ]
+  "bin": {
+    "ascendant-skills": "bin/cli.mjs"
+  },
+  "files": [
+    "bin/",
+    "lib/",
+    "README.md"
+  ],
+  "type": "module",
+  "dependencies": {
+    "@effect/platform-node": "4.0.5",
+    "effect": "4.0.5"
+  },
+  "engines": {
+    "node": ">=18"
+  }
 }