argsbarg 4.0.4 → 4.1.1

package/src/builtins/install.ts

@@ -6,56 +6,51 @@ export function installBuiltinOptions(root: CliProgram): CliOption[] {
   const opts: CliOption[] = [
     {
       name: "all",
-      description: "Install binary, completions, skills, and MCP config (when enabled).",
+      description: "Install agent skills and MCP config (default artifact set for this app).",
       kind: CliOptionKind.Presence,
     },
     {
-      name: "bin",
-      description: "Copy this binary to your install directory (default ~/.local/bin).",
-      kind: CliOptionKind.Presence,
-    },
-    {
-      name: "completions",
+      name: "skill",
       description:
-        "Install bash, zsh, and fish tab-completion scripts (each skipped silently if that shell is not on PATH).",
+        "Install agent skills for Cursor, Claude, and other supported AI tools on this machine.",
       kind: CliOptionKind.Presence,
     },
-    {
-      name: "skill",
-      description: "Install Cursor and Claude Code skills when ~/.cursor or ~/.claude exists.",
+  ];
+
+  if (resolveCapabilities(root).mcp) {
+    opts.push({
+      name: "mcp",
+      description:
+        "Add MCP server configuration for Cursor, Claude Code, and other supported agents.",
       kind: CliOptionKind.Presence,
-    },
-    {
-      name: "reinstall",
-      description: "Reinstall artifacts already on disk (always includes the binary).",
+    });
+  }
+
+  if (root.appConfig) {
+    opts.push({
+      name: "configure",
+      description: "Run the interactive configuration wizard.",
       kind: CliOptionKind.Presence,
-    },
-    {
-      name: "from",
-      description: "Binary to copy (default: running executable). Used with --reinstall.",
-      kind: CliOptionKind.String,
-    },
+    });
+  }
+
+  opts.push(
     {
       name: "status",
       description: "Print what is currently installed (read-only).",
       kind: CliOptionKind.Presence,
     },
     {
-      name: "uninstall",
+      name: "reinstall",
       description:
-        "Remove installed artifacts (use --all or scoped flags; skips targets not on disk).",
+        "Refresh installed agent artifacts (skills, MCP). Used by Homebrew post_install.",
       kind: CliOptionKind.Presence,
     },
-    {
-      name: "prefix",
-      description:
-        "Install directory for the binary (default ~/.local/bin; overrides INSTALL_PREFIX).",
-      kind: CliOptionKind.String,
-    },
     {
       name: "yes",
       description: "Skip the confirmation prompt.",
       kind: CliOptionKind.Presence,
+      shortName: "y",
     },
     {
       name: "dry",
@@ -64,46 +59,10 @@ export function installBuiltinOptions(root: CliProgram): CliOption[] {
     },
     {
       name: "json",
-      description: "Print changed paths (install/update/uninstall) or status JSON on stdout.",
-      kind: CliOptionKind.Presence,
-    },
-    {
-      name: "quiet",
-      description:
-        "Suppress informational output (requires --yes, --json, --reinstall, or --update).",
+      description: "Print changed paths (install/reinstall) or status JSON on stdout.",
       kind: CliOptionKind.Presence,
     },
-  ];
-
-  if (resolveCapabilities(root).mcp) {
-    opts.splice(4, 0, {
-      name: "mcp",
-      description: "Add or update MCP server entries in Cursor and Claude config files.",
-      kind: CliOptionKind.Presence,
-    });
-  }
-
-  if (resolveCapabilities(root).update) {
-    const statusIdx = opts.findIndex((o) => o.name === "status");
-    opts.splice(statusIdx, 0, {
-      name: "update",
-      description: "Download the latest release and reinstall installed artifacts.",
-      kind: CliOptionKind.Presence,
-    });
-  }
-
-  if (root.appConfig) {
-    opts.push({
-      name: "configure",
-      description: "Interactively write app config (~/.config/<key>/config).",
-      kind: CliOptionKind.Presence,
-    });
-    opts.push({
-      name: "config",
-      description: "Remove app config file (with --uninstall).",
-      kind: CliOptionKind.Presence,
-    });
-  }
+  );
 
   return opts;
 }
@@ -112,32 +71,36 @@ export function installBuiltinOptions(root: CliProgram): CliOption[] {
 export function cliBuiltinInstallCommand(root: CliProgram): CliLeaf {
   const app = root.key;
   const notesLines = [
-    "First-time setup:",
-    `  ${app} install --all --yes`,
+    "Install the binary via Homebrew (tap-from-repo), then refresh agent artifacts:",
+    `  brew tap <org>/<repo>`,
+    `  brew install <tap>/${app}`,
     "",
-    "Refresh after upgrading:",
-    `  ${app} install --reinstall`,
-  ];
-  if (resolveCapabilities(root).update) {
-    notesLines.push("", "Upgrade to latest release:", `  ${app} install --update`);
-  }
-  notesLines.push(
+    "Homebrew post_install runs:",
+    `  ${app} install --reinstall --yes`,
+    "",
+    "Configure separately (interactive):",
+    `  ${app} install --configure`,
+    "",
+    "Upgrade:",
+    `  brew upgrade ${app}`,
+    "",
+    "Shell completions are installed by Homebrew during brew install.",
+    "See: https://docs.brew.sh/Shell-Completion",
     "",
     "See what is installed:",
     `  ${app} install --status`,
     "",
-    "Remove everything installed with --all:",
-    `  ${app} install --uninstall --all --yes`,
+    "Remove agent artifacts:",
+    `  ${app} uninstall --yes`,
     "",
     "Use --dry to preview changes without writing files.",
     "Use --json for machine-readable output.",
-  );
+  ];
   return {
     key: "install",
-    description:
-      "Install the binary, shell completions, agent skills, and MCP config to your user environment.",
-    notes: notesLines.join("\n"),
+    description: "Install agent skills and MCP config for this app (binary via Homebrew).",
     options: installBuiltinOptions(root),
+    notes: notesLines.join("\n"),
     handler: () => {},
   };
 }

package/src/builtins/mcp.ts

@@ -28,7 +28,7 @@ export function cliBuiltinMcpCommand(program: CliProgram): CliRouter {
 
   const bundle: CliLeaf = {
     key: "bundle",
-    description: "Pack Claude Desktop `.mcpb` and Claude Code plugin zip from dist/<key>.",
+    description: "Pack dist MCP artifacts (`.mcpb`, Claude Code plugin zip) from dist/<key>.",
     handler: () => {},
   };
 

package/src/builtins/registry.ts

@@ -5,6 +5,7 @@ import { cliBuiltinCompletionGroup } from "./completion-group.ts";
 import { cliBuiltinConfigGroupIfEnabled } from "./config.ts";
 import { cliBuiltinInstallCommand } from "./install.ts";
 import { cliBuiltinMcpCommand } from "./mcp.ts";
+import { cliBuiltinUninstallCommand } from "./uninstall.ts";
 import { cliBuiltinVersionCommand } from "./version.ts";
 
 type BuiltinFactory = (program: CliProgram) => CliNode | null;
@@ -30,6 +31,7 @@ export function resolveBuiltins(program: CliProgram, caps: CliCapabilities): Cli
   pushBuiltin(builtins, program, () => cliBuiltinVersionCommand());
   if (caps.install) {
     pushBuiltin(builtins, program, (p) => cliBuiltinInstallCommand(p));
+    pushBuiltin(builtins, program, (p) => cliBuiltinUninstallCommand(p));
   }
   pushBuiltin(builtins, program, (p) => cliBuiltinDocsGroupIfEnabled(p) ?? null);
   if (caps.mcp) {

package/src/builtins/uninstall.ts

@@ -0,0 +1,80 @@
+import { resolveCapabilities } from "../capabilities.ts";
+import { type CliLeaf, type CliOption, CliOptionKind, type CliProgram } from "../types.ts";
+
+/** Uninstall command options (dynamic: `--mcp` only when MCP is enabled). */
+export function uninstallBuiltinOptions(root: CliProgram): CliOption[] {
+  const opts: CliOption[] = [
+    {
+      name: "all",
+      description: "Remove all detected agent artifacts (default when no scope flags are given).",
+      kind: CliOptionKind.Presence,
+    },
+    {
+      name: "skill",
+      description: "Remove agent skills only.",
+      kind: CliOptionKind.Presence,
+    },
+  ];
+
+  if (resolveCapabilities(root).mcp) {
+    opts.push({
+      name: "mcp",
+      description: "Remove MCP server configuration only.",
+      kind: CliOptionKind.Presence,
+    });
+  }
+
+  if (root.appConfig) {
+    opts.push({
+      name: "configure",
+      description: "Remove the app config file only.",
+      kind: CliOptionKind.Presence,
+    });
+  }
+
+  opts.push(
+    {
+      name: "yes",
+      description: "Skip the confirmation prompt.",
+      kind: CliOptionKind.Presence,
+      shortName: "y",
+    },
+    {
+      name: "dry",
+      description: "Show what would change without writing files.",
+      kind: CliOptionKind.Presence,
+    },
+    {
+      name: "json",
+      description: "Print changed paths on stdout.",
+      kind: CliOptionKind.Presence,
+    },
+  );
+
+  return opts;
+}
+
+/** Builds the `uninstall` built-in command. */
+export function cliBuiltinUninstallCommand(root: CliProgram): CliLeaf {
+  const app = root.key;
+  const notesLines = [
+    "Remove agent artifacts installed by this app (skills, MCP, config).",
+    "Run before `brew uninstall` while the CLI is still on PATH:",
+    "",
+    `  ${app} uninstall --yes`,
+    `  brew uninstall <tap>/${app}`,
+    "",
+    "Remove app config only:",
+    `  ${app} uninstall --configure --yes`,
+    "",
+    "Use --dry to preview changes without writing files.",
+    "Use --json for machine-readable output.",
+  ];
+  return {
+    key: "uninstall",
+    description: "Remove agent skills, MCP config, and app config for this app.",
+    options: uninstallBuiltinOptions(root),
+    notes: notesLines.join("\n"),
+    handler: () => {},
+  };
+}

package/src/capabilities.ts

@@ -12,7 +12,6 @@ export interface CliCapabilities {
   mcp: boolean;
   install: boolean;
   docs: boolean;
-  update: boolean;
   configCommands: boolean;
 }
 
@@ -24,7 +23,6 @@ export function resolveCapabilities(program: CliProgram): CliCapabilities {
     mcp: program.mcpServer?.enabled === true,
     install,
     docs: program.docs?.enabled === true,
-    update: install && typeof program.install?.updateGetLatest === "function",
     configCommands: configCommandsEnabled(program),
   };
 }
@@ -33,7 +31,7 @@ export function resolveCapabilities(program: CliProgram): CliCapabilities {
 export function reservedCommandNames(caps: CliCapabilities): string[] {
   const names = ["completion", "version"];
   if (caps.install) {
-    names.push("install");
+    names.push("install", "uninstall");
   }
   if (caps.docs) {
     names.push("docs");
@@ -65,13 +63,13 @@ export type CapabilityFeature = "mcp" | "install" | "docs" | "config";
 export function capabilityDeniedMessage(feature: CapabilityFeature): string {
   switch (feature) {
     case "mcp":
-      return "MCP is not enabled. Set mcpServer: { enabled: true } on the program root.\n";
+      return "MCP is not available for this app.\n";
     case "install":
-      return "install is disabled. Remove install.enabled: false from the program root.\n";
+      return "Install is not available for this app.\n";
     case "docs":
-      return "docs is not enabled. Set docs: { enabled: true } on the program root.\n";
+      return "Documentation commands are not available for this app.\n";
     case "config":
-      return "config commands are disabled. Set program.appConfig or enable config.commands.\n";
+      return "Configuration commands are not available for this app.\n";
   }
 }
 

package/src/cli-tool/cli-smoke.test.ts

@@ -0,0 +1,19 @@
+import { describe, expect, test } from "bun:test";
+import { spawnSync } from "node:child_process";
+import { join } from "node:path";
+
+const main = join(import.meta.dir, "main.ts");
+
+describe("argsbarg cli-tool", () => {
+  test("version subcommand prints version", () => {
+    const proc = spawnSync("bun", [main, "version"], { encoding: "utf8" });
+    expect(proc.status).toBe(0);
+    expect(proc.stdout.trim().length).toBeGreaterThan(0);
+  });
+
+  test("completion subcommand emits bash script", () => {
+    const proc = spawnSync("bun", [main, "completion", "bash"], { encoding: "utf8" });
+    expect(proc.status).toBe(0);
+    expect(proc.stdout).toContain("complete");
+  });
+});

package/src/cli-tool/create.test.ts

@@ -0,0 +1,119 @@
+import { describe, expect, test } from "bun:test";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import {
+  applyCreate,
+  classNameFromKey,
+  diffCreate,
+  diffCreateDetails,
+  renderCreateTree,
+  substituteTemplateContent,
+} from "./create.ts";
+
+describe("argsbarg create", () => {
+  test("substitutes {key} tokens", () => {
+    const out = substituteTemplateContent(
+      "key={key} class={className} env={envPrefix}_API_TOKEN tap={tap} org={tapOrg}",
+      {
+        key: "my-cli",
+        className: "MyCli",
+        tap: "org/my-cli",
+        homepage: "https://github.com/org/my-cli",
+        releaseRepo: "org/my-cli",
+        desc: "My CLI",
+        force: false,
+        dryRun: false,
+        check: false,
+        diff: false,
+        yes: false,
+        devTemplate: false,
+      },
+    );
+    expect(out).toContain("my-cli");
+    expect(out).toContain("MyCli");
+    expect(out).toContain("MY_CLI_API_TOKEN");
+    expect(out).toContain("org/my-cli");
+    expect(out).not.toContain("{key}");
+  });
+
+  test("classNameFromKey", () => {
+    expect(classNameFromKey("sqsp-i18n")).toBe("SqspI18n");
+  });
+
+  test("renderCreateTree includes justfile and create-identity", () => {
+    const tree = renderCreateTree({
+      key: "testapp",
+      className: "Testapp",
+      tap: "local/testapp",
+      homepage: "https://example.com",
+      releaseRepo: "example/testapp",
+      desc: "Test",
+      force: false,
+      dryRun: false,
+      check: false,
+      diff: false,
+      yes: false,
+      devTemplate: false,
+    });
+    expect(tree.has("justfile")).toBe(true);
+    expect(tree.has("biome.json")).toBe(true);
+    expect(tree.has(".cursor/rules/code.mdc")).toBe(true);
+    expect(tree.has("scripts/create-identity.ts")).toBe(true);
+    const identity = tree.get("scripts/create-identity.ts");
+    expect(identity).toContain('key: "testapp"');
+    const formula = tree.get("scripts/formula-shared.ts");
+    expect(formula).toContain("create-identity.ts");
+  });
+
+  test("--check detects drift", () => {
+    const dir = mkdtempSync(join(tmpdir(), "argsbarg-create-"));
+    try {
+      applyCreate(dir, {
+        key: "testapp",
+        className: "Testapp",
+        tap: "local/testapp",
+        homepage: "https://example.com",
+        releaseRepo: "example/testapp",
+        desc: "Test",
+        force: true,
+        dryRun: false,
+        check: false,
+        diff: false,
+        yes: false,
+        devTemplate: false,
+      });
+      expect(diffCreate(dir, { key: "testapp", className: "Testapp" })).toEqual([]);
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("--check infers options from create-identity.ts", () => {
+    const dir = mkdtempSync(join(tmpdir(), "argsbarg-create-"));
+    try {
+      applyCreate(dir, {
+        key: "testapp",
+        className: "Testapp",
+        tap: "local/testapp",
+        homepage: "https://example.com",
+        releaseRepo: "example/testapp",
+        desc: "Test",
+        force: true,
+        dryRun: false,
+        check: false,
+        diff: false,
+        yes: false,
+        devTemplate: false,
+      });
+      expect(diffCreate(dir, { check: true })).toEqual([]);
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  test("--diff captures drift details", () => {
+    const drifts = diffCreateDetails("/nonexistent", { key: "x" });
+    expect(drifts.length).toBeGreaterThan(0);
+  });
+});