argsbarg 5.0.3 → 5.1.1

package/CHANGELOG.md

@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [5.1.1] - 2026-07-04
+
+### Fixed
+
+- **Configure without MCP** — skill-only apps (`mcpServer` unset) no longer prompt for MCP host config during interactive `configure`; MCP install targets default to disabled unless `mcpServer.enabled` is true.
+
+### Changed
+
+- **Internal DRY refactors** — shared bash/zsh completion simulate emitters, module-level `errorResult()` in the parser, unified configure stdin prompt via `readPromptLine`, and a shared `mcpServerRequiredForArtifact` predicate linking install defaults with schema validation.
+
+## [5.1.0] - 2026-07-04
+
+### Changed
+
+- **Breaking: `config get`/`set` → `configure get`/`set`** — top-level `config` removed; app config introspection lives under the `configure` built-in.
+
 ## [5.0.3] - 2026-07-04
 
 ### Changed
@@ -579,7 +595,9 @@ const cli = { ... } satisfies CliProgram;  // or : CliProgram
 - Migrate schemas: rename every `children` property to **`commands`**; move positional definitions to **`CliPositional`** objects on `positionals` and strip `positional` / `argMin` / `argMax` from flag definitions under `options` (flags only carry `name`, `description`, `kind`, and optional `shortName`).
 - Imports: use `CliPositional` where needed; replace `CliOptionDef` with `CliOption` or `CliPositional` as appropriate.
 
-[Unreleased]: https://github.com/bdombro/bun-argsbarg/compare/v5.0.3...HEAD
+[Unreleased]: https://github.com/bdombro/bun-argsbarg/compare/v5.1.1...HEAD
+[5.1.1]: https://github.com/bdombro/bun-argsbarg/releases/tag/v5.1.1
+[5.1.0]: https://github.com/bdombro/bun-argsbarg/releases/tag/v5.1.0
 [5.0.3]: https://github.com/bdombro/bun-argsbarg/releases/tag/v5.0.3
 [5.0.2]: https://github.com/bdombro/bun-argsbarg/releases/tag/v5.0.2
 [5.0.1]: https://github.com/bdombro/bun-argsbarg/releases/tag/v5.0.1

package/docs/cli-program.md

@@ -412,11 +412,11 @@ await cli.run();
 
 | Field | Default | Purpose |
 | --- | --- | --- |
-| `description` | *(required)* | Shown in prompts, `config get`, and bundle manifests |
+| `description` | *(required)* | Shown in prompts, `configure get`, and bundle manifests |
 | `title` | config key | Short label in interactive `configure` |
 | `default` | — | Used when `jsonSchema` omitted (all-string mode) |
 | `required` | `true` | When `false`, optional unless required by `jsonSchema` |
-| `sensitive` | name heuristic (`token`, `secret`, …) | Redact in prompts, `config get`, and status |
+| `sensitive` | name heuristic (`token`, `secret`, …) | Redact in prompts, `configure get`, and status |
 | `env` | — | When set: non-empty host env overrides file; consulted again after `resolve` when `resolve` returns `undefined`; exported to `process.env` after resolve |
 | `resolve` | — | Optional fallback after file; return `undefined` to fall back to `env` (if set) and defaults |
 
@@ -425,7 +425,7 @@ await cli.run();
 - Default: `$XDG_CONFIG_HOME/<sanitized-key>/config` or `%APPDATA%/<key>/config`.
 - JSON: flat object keyed by schema names — `{ "apiToken": "…", "maxRetries": 5 }`.
 - **Strict:** unknown keys rejected on load.
-- **CLI:** missing required config exits 1 before the leaf handler (TTY prompt when interactive). Built-in `docs` and `config get`/`set` skip this exit.
+- **CLI:** missing required config exits 1 before the leaf handler (TTY prompt when interactive). Built-in `docs` and `configure get`/`set` skip this exit.
 - **MCP:** server stays up; missing config returns `isError: true` at `tools/call`.
 - **Configure:** interactive `configure` runs the app config wizard; **`configure --sync`** refreshes agent artifacts.
 - **Agent integration:** `configure.agentIntegration` (`mcp` | `skill` | `both`) sets default sync targets; see [configure.md](configure.md#configuretargets).
@@ -436,7 +436,7 @@ See [config-schema.md](config-schema.md) for codegen, [configure.md](configure.m
 
 ## Reserved names
 
-Do not declare user commands named `completion`, `configure`, `mcp`, `version`, `docs`, or `config` at the root — ArgsBarg injects these when configured.
+Do not declare user commands named `completion`, `configure`, `mcp`, `version`, or `docs` at the root — ArgsBarg injects these when configured. App config uses `configure get` / `configure set` subcommands (not a top-level `config` command).
 
 ## Cursor rule for consumer repos
 

package/docs/config-schema.md

@@ -40,7 +40,7 @@ await cli.run();
 | --- | --- |
 | Config file | Flat JSON keyed by schema names; strict load (unknown keys rejected) |
 | Interactive `configure` / `--status` | Auto-runs config wizard when `entries` is non-empty; `--status` for read-only inventory |
-| Built-in `config get` / `config set` | Read/write resolved values (opt-out via `commands: false`) |
+| Built-in `configure get` / `configure set` | Read/write resolved values (opt-out via `commands: false`) |
 | MCP bundle / Claude plugin | `userConfig` for entries with `env` set |
 | `ctx.appConfig` in handlers | `get`, `require`, `set`, `read`, `path`, `dir` — prefer over `process.env` |
 
@@ -48,7 +48,7 @@ await cli.run();
 
 **No public config I/O exports** — consumers use `program.appConfig` for authoring and `ctx.appConfig` in handlers.
 
-See [cli-program.md — Configuration](cli-program.md#configuration-programappconfig) for resolution order, bootstrap timing, and reserved `config` command.
+See [cli-program.md — Configuration](cli-program.md#configuration-programappconfig) for resolution order, bootstrap timing, and `configure get`/`set`.
 
 ## `CliAppConfig` and `CliAppConfigEntry`
 
@@ -191,26 +191,26 @@ appConfig: {
 
 All file values are strings. Defaults come from `entry.default`.
 
-## Built-in `config` command
+## Built-in `configure get` / `configure set`
 
 When `program.appConfig` is set and `commands !== false`:
 
 | Subcommand | Purpose |
 | --- | --- |
-| `config get [key]` | Resolved value(s); `--json`; `--json --pretty` |
-| `config set <key> <value>` | One key; full document re-validated after merge |
+| `configure get [key]` | Resolved value(s); `--json`; `--json --pretty` |
+| `configure set <key> <value>` | One key; full document re-validated after merge |
 
-`config get`/`set` skip required-config exit and TTY prompts. Sensitive values redact on `get` (`REDACTED` / `{ "set": true }` with `--json`).
+`configure get`/`set` skip required-config exit and TTY prompts. Sensitive values redact on `get` (`REDACTED` / `{ "set": true }` with `--json`).
 
-Object/array/`$ref` properties require `--json` on `config set`.
+Object/array/`$ref` properties require `--json` on `configure set`.
 
 ## Example in this repo
 
 | Example | Role |
 | --- | --- |
-| [`examples/full-example/`](../examples/full-example/) | **Copy template** — schemagen discovery, `APP_CONFIG_JSON_SCHEMA` bridge, `program.appConfig`, built-in `config get`/`set` |
+| [`examples/full-example/`](../examples/full-example/) | **Copy template** — schemagen discovery, `APP_CONFIG_JSON_SCHEMA` bridge, `program.appConfig`, built-in `configure get`/`set` |
 
 ```bash
 cd examples/full-example && just setup && just schemagen
-FULL_EXAMPLE_API_TOKEN=dev just run config get apiToken --json
+FULL_EXAMPLE_API_TOKEN=dev just run configure get apiToken --json
 ```

package/docs/configure.md

@@ -47,6 +47,10 @@ Dev flow matches release: formula `install` copies the binary and generates comp
 
 # Remove app config only (not skills/MCP)
 <key> configure --remove-config --yes
+
+# Read or write app config (non-interactive; when program.appConfig is set)
+<key> configure get [key] [--json] [--pretty]
+<key> configure set <key> <value> [--json]
 ```
 
 Non-interactive / CI: pass **`--yes`** (or **`--json`**, **`--sync`**, **`--remove-all`**, **`--remove-config`**) — see [Confirmation](#confirmation).
@@ -60,7 +64,7 @@ Non-interactive / CI: pass **`--yes`** (or **`--json`**, **`--sync`**, **`--remo
 | Cursor skill | Y/n prompt | `~/.cursor/skills/<dir>/` when `~/.cursor` exists |
 | Claude skill | Y/n prompt | `~/.claude/skills/<dir>/` when `~/.claude` exists |
 | Codex / OpenCode / OpenClaw skills | Y/n prompt | Agent-specific dirs when available |
-| MCP config | Y/n prompt | Cursor, Claude Code/Desktop, OpenCode, Codex, OpenClaw, ChatGPT desktop |
+| MCP config | Y/n prompt when `mcpServer.enabled` | Cursor, Claude Code/Desktop, OpenCode, Codex, OpenClaw, ChatGPT desktop |
 | App config | auto-runs wizard | Interactive wizard writes `~/.local/lib/<key>/config.json` |
 
 ### Externally managed binary (Homebrew)

package/docs/mcp.md

@@ -327,7 +327,7 @@ At server start (`Cli.serveMcp()`), before the NDJSON loop:
 - Loaded at MCP startup; host `process.env` wins for mapped env vars already set.
 - Missing required config does **not** exit the MCP server — enforced at `tools/call` with a helpful error.
 - Configure interactively: `myapp configure` (see [configure.md](configure.md)).
-- Built-in `config get` / `config set` when `program.appConfig.commands` is enabled (default). Hosts inject `user_config` → env at spawn; they never write the argsbarg config file.
+- Built-in `configure get` / `configure set` when `program.appConfig.commands` is enabled (default). Hosts inject `user_config` → env at spawn; they never write the argsbarg config file.
 
 Example:
 

package/examples/full-example/README.md

@@ -6,7 +6,7 @@
 
 | Area | Files / wiring |
 | --- | --- |
-| All builtins | `completion`, `version`, `install`, `docs`, `mcp`, `config get`/`set` |
+| All builtins | `completion`, `version`, `configure`, `docs`, `mcp`, `configure get`/`set` |
 | `program.appConfig` | `src/types.ts` (`AppConfig`) → `schemas/configSchemas.ts` |
 | `outputSchema` | `src/commands/status/types.ts` (`StatusJsonOutput`) → `schemas/outputSchemas.ts` |
 | Schemagen | `scripts/schemagen.ts` + `scripts/schemagen/discover-schema-roots.ts` |
@@ -47,7 +47,7 @@ cd examples/full-example
 just setup
 just schemagen   # after changing src/**/types.ts
 FULL_EXAMPLE_API_TOKEN=dev just run status --json
-FULL_EXAMPLE_API_TOKEN=dev just run config get apiToken --json
+FULL_EXAMPLE_API_TOKEN=dev just run configure get apiToken --json
 FULL_EXAMPLE_API_TOKEN=dev just run docs readme
 ```
 

package/examples/full-example/src/program.ts

@@ -50,8 +50,5 @@ export const program = {
     mcpd: true,
     claudePlugin: true,
   },
-  configure: {
-    // Defaults: agentIntegration picks skill vs MCP for sync; app config is opt-in in interactive configure.
-  },
   commands: [echoCommand, statusCommand],
 } satisfies CliProgram;

package/index.d.ts

@@ -281,7 +281,7 @@ export interface CliAppConfigEntry {
 	/** When `false`, optional for bootstrap and MCP enforcement. Default: `true`. */
 	required?: boolean;
 	/**
-	 * Mask stdin during prompts and redact on `config get`.
+	 * Mask stdin during prompts and redact on `configure get`.
 	 * Default: `/key|token|secret|password/i.test(name)`.
 	 */
 	sensitive?: boolean;
@@ -297,7 +297,7 @@ export interface CliAppConfigEntry {
  * App configuration block on the program root ({@link CliProgram.appConfig}).
  */
 export interface CliAppConfig {
-	/** Built-in `config get` / `config set`. Default: enabled when `appConfig` is set. */
+	/** Built-in `configure get` / `configure set`. Default: enabled when `appConfig` is set. */
 	commands?: boolean | {
 		enabled?: boolean;
 		mcpSet?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "argsbarg",
-  "version": "5.0.3",
+  "version": "5.1.1",
   "type": "module",
   "engines": {
     "bun": ">=1.3"

package/src/builtins/builtins.test.ts

@@ -154,8 +154,8 @@ describe("completion emitters", () => {
 
 /** Tests for schema export builtins. */
 describe("schema export builtins", () => {
-  /** ExportPresentationBuiltins includes config when appConfig set. */
-  test("exportPresentationBuiltins includes config when appConfig set", () => {
+  /** ExportPresentationBuiltins nests configure get/set when appConfig set. */
+  test("exportPresentationBuiltins nests configure get/set when appConfig set", () => {
     const withConfig: CliProgram = {
       ...fixture,
       appConfig: {
@@ -165,8 +165,14 @@ describe("schema export builtins", () => {
       },
     };
     const builtins = exportPresentationBuiltins(withConfig);
-    expect(builtins.map((b) => b.key)).toContain("config");
     expect(builtins.map((b) => b.key)).toContain("configure");
+    expect(builtins.map((b) => b.key)).not.toContain("config");
+    const configureNode = builtins.find((b) => b.key === "configure");
+    expect(configureNode && "commands" in configureNode).toBe(true);
+    if (configureNode && "commands" in configureNode) {
+      const keys = configureNode.commands?.map((c) => c.key) ?? [];
+      expect(keys).toEqual(expect.arrayContaining(["get", "set"]));
+    }
   });
 
   test("exportPresentationBuiltins omits hidden completion", () => {

package/src/builtins/completion-bash.ts

@@ -1,4 +1,5 @@
 import { CliOptionKind, type CliRouter } from "../types.ts";
+import { emitConsumeLong, emitConsumeShort, emitMatchChild } from "./completion-simulate-shared.ts";
 import { collectScopes, type ScopeRec } from "./scopes.ts";
 import {
   escShellSingleQuoted,
@@ -8,105 +9,6 @@ import {
   mainName,
 } from "./shell-helpers.ts";
 
-function emitConsumeLong(ident: string, scopes: ScopeRec[]): string {
-  let o = "_${ident}_nac_consume_long() {\n".replace("${ident}", ident);
-  o += '  local sid="$1" w="$2" nw="$3"\n';
-  o += "  case $sid in\n";
-  for (const [i, sc] of scopes.entries()) {
-    o += `    ${i})\n`;
-    o += "      case $w in\n";
-    o +=
-      "        " +
-      kHelpLong +
-      "|${kHelpLong}=*|${kHelpShort}) echo 1 ;;\n"
-        .replace(/\$\{kHelpLong\}/g, kHelpLong)
-        .replace(/\$\{kHelpShort\}/g, kHelpShort);
-    for (const op of sc.opts) {
-      const base = `--${op.name}`;
-      if (op.kind === "presence") {
-        o += `        ${base}${"|${base}=*) echo 1 ;;\n".replace(/\$\{base\}/g, base)}`;
-      } else {
-        o += `        ${base}=*) echo 1 ;;\n`;
-        o += `        ${base}) echo 2 ;;\n`;
-      }
-    }
-    o += "        *) echo 0 ;;\n";
-    o += "      esac\n";
-    o += "      ;;\n";
-  }
-  o += "    *) echo 0 ;;\n";
-  o += "  esac\n";
-  o += "}\n";
-  return o;
-}
-
-function emitConsumeShort(ident: string, scopes: ScopeRec[]): string {
-  let o = "_${ident}_nac_consume_short() {\n".replace("${ident}", ident);
-  o += '  local sid="$1" w="$2"\n';
-  o += "  case $sid in\n";
-  for (const [i, sc] of scopes.entries()) {
-    o += `    ${i})\n`;
-    o += "      local rest=${w#-}\n";
-    o += "      local ch\n";
-    o += "      local saw=0\n";
-    o += "      while [[ -n $rest ]]; do\n";
-    o += "        ch=${rest:0:1}\n";
-    o += "        rest=${rest:1}\n";
-    o += "        case $ch in\n";
-    let boolChars = "";
-    for (const op of sc.opts) {
-      if (!op.shortName) continue;
-      if (op.kind === "presence") {
-        boolChars += `${op.shortName}|`;
-      } else {
-        o += `          ${op.shortName})\n`;
-        o += "            if [[ $saw -ne 0 || -n $rest ]]; then echo 0; return; fi\n";
-        o += "            echo 2; return ;;\n";
-      }
-    }
-    if (boolChars.length > 0) {
-      boolChars = boolChars.slice(0, -1);
-      o += `          ${boolChars}) ;;\n`;
-    }
-    o += "          *) echo 0; return ;;\n";
-    o += "        esac\n";
-    o += "        saw=1\n";
-    o += "      done\n";
-    o += "      echo 1\n";
-    o += "      ;;\n";
-  }
-  o += "    *) echo 0 ;;\n";
-  o += "  esac\n";
-  o += "}\n";
-  return o;
-}
-
-function emitMatchChild(
-  ident: string,
-  scopes: ScopeRec[],
-  pathIndex: Record<string, number>,
-): string {
-  let o = "_${ident}_nac_match_child() {\n".replace("${ident}", ident);
-  o += '  local sid="$1" w="$2"\n';
-  o += "  case $sid in\n";
-  for (const [sid, sc] of scopes.entries()) {
-    if (sc.kids.length === 0) continue;
-    o += `    ${sid})\n`;
-    o += "      case $w in\n";
-    for (const ch of sc.kids) {
-      const childPath = sc.path === "" ? ch.key : `${sc.path}/${ch.key}`;
-      const cid = pathIndex[childPath] ?? 0;
-      o += `        ${ch.key}) echo ${cid}; return 0 ;;\n`;
-    }
-    o += "      esac\n";
-    o += "      ;;\n";
-  }
-  o += "  esac\n";
-  o += "  return 1\n";
-  o += "}\n";
-  return o;
-}
-
 function emitSimulate(ident: string): string {
   let o = "_${ident}_nac_simulate() {\n".replace("${ident}", ident);
   o += "  local i=1 sid=0 w steps next\n";
@@ -247,7 +149,7 @@ export function completionBashScript(schema: CliRouter): string {
   }
 
   out += emitConsumeLong(ident, scopes);
-  out += emitConsumeShort(ident, scopes);
+  out += emitConsumeShort(ident, scopes, "bash");
   out += emitMatchChild(ident, scopes, pathIndex);
   out += emitSimulate(ident);
   out += emitEnumReplyBash(ident, scopes);

package/src/builtins/completion-simulate-shared.ts

@@ -0,0 +1,120 @@
+/*
+Shared shell completion emitters for bash and zsh simulate helpers.
+Generates _nac_consume_long, _nac_consume_short, and _nac_match_child functions
+used while walking argv to determine completion scope.
+*/
+
+import type { ScopeRec } from "./scopes.ts";
+import { kHelpLong, kHelpShort } from "./shell-helpers.ts";
+
+/** Which shell dialect to emit for bundled short-flag parsing. */
+export type CompletionShellDialect = "bash" | "zsh";
+
+/** Emits `_<ident>_nac_consume_long` — identical for bash and zsh. */
+export function emitConsumeLong(ident: string, scopes: ScopeRec[]): string {
+  let o = "_${ident}_nac_consume_long() {\n".replace("${ident}", ident);
+  o += '  local sid="$1" w="$2" nw="$3"\n';
+  o += "  case $sid in\n";
+  for (const [i, sc] of scopes.entries()) {
+    o += `    ${i})\n`;
+    o += "      case $w in\n";
+    o +=
+      "        " +
+      kHelpLong +
+      "|${kHelpLong}=*|${kHelpShort}) echo 1 ;;\n"
+        .replace(/\$\{kHelpLong\}/g, kHelpLong)
+        .replace(/\$\{kHelpShort\}/g, kHelpShort);
+    for (const op of sc.opts) {
+      const base = `--${op.name}`;
+      if (op.kind === "presence") {
+        o += `        ${base}${"|${base}=*) echo 1 ;;\n".replace(/\$\{base\}/g, base)}`;
+      } else {
+        o += `        ${base}=*) echo 1 ;;\n`;
+        o += `        ${base}) echo 2 ;;\n`;
+      }
+    }
+    o += "        *) echo 0 ;;\n";
+    o += "      esac\n";
+    o += "      ;;\n";
+  }
+  o += "    *) echo 0 ;;\n";
+  o += "  esac\n";
+  o += "}\n";
+  return o;
+}
+
+/** Emits `_<ident>_nac_consume_short`; dialect selects substring syntax. */
+export function emitConsumeShort(
+  ident: string,
+  scopes: ScopeRec[],
+  dialect: CompletionShellDialect,
+): string {
+  const firstChar = dialect === "bash" ? "ch=${rest:0:1}" : "ch=${rest[1,1]}";
+  const restAdvance = dialect === "bash" ? "rest=${rest:1}" : "rest=${rest[2,-1]}";
+
+  let o = "_${ident}_nac_consume_short() {\n".replace("${ident}", ident);
+  o += '  local sid="$1" w="$2"\n';
+  o += "  case $sid in\n";
+  for (const [i, sc] of scopes.entries()) {
+    o += `    ${i})\n`;
+    o += "      local rest=${w#-}\n";
+    o += "      local ch\n";
+    o += "      local saw=0\n";
+    o += "      while [[ -n $rest ]]; do\n";
+    o += `        ${firstChar}\n`;
+    o += `        ${restAdvance}\n`;
+    o += "        case $ch in\n";
+    let boolChars = "";
+    for (const op of sc.opts) {
+      if (!op.shortName) continue;
+      if (op.kind === "presence") {
+        boolChars += `${op.shortName}|`;
+      } else {
+        o += `          ${op.shortName})\n`;
+        o += "            if [[ $saw -ne 0 || -n $rest ]]; then echo 0; return; fi\n";
+        o += "            echo 2; return ;;\n";
+      }
+    }
+    if (boolChars.length > 0) {
+      boolChars = boolChars.slice(0, -1);
+      o += `          ${boolChars}) ;;\n`;
+    }
+    o += "          *) echo 0; return ;;\n";
+    o += "        esac\n";
+    o += "        saw=1\n";
+    o += "      done\n";
+    o += "      echo 1\n";
+    o += "      ;;\n";
+  }
+  o += "    *) echo 0 ;;\n";
+  o += "  esac\n";
+  o += "}\n";
+  return o;
+}
+
+/** Emits `_<ident>_nac_match_child` — identical for bash and zsh. */
+export function emitMatchChild(
+  ident: string,
+  scopes: ScopeRec[],
+  pathIndex: Record<string, number>,
+): string {
+  let o = "_${ident}_nac_match_child() {\n".replace("${ident}", ident);
+  o += '  local sid="$1" w="$2"\n';
+  o += "  case $sid in\n";
+  for (const [sid, sc] of scopes.entries()) {
+    if (sc.kids.length === 0) continue;
+    o += `    ${sid})\n`;
+    o += "      case $w in\n";
+    for (const ch of sc.kids) {
+      const childPath = sc.path === "" ? ch.key : `${sc.path}/${ch.key}`;
+      const cid = pathIndex[childPath] ?? 0;
+      o += `        ${ch.key}) echo ${cid}; return 0 ;;\n`;
+    }
+    o += "      esac\n";
+    o += "      ;;\n";
+  }
+  o += "  esac\n";
+  o += "  return 1\n";
+  o += "}\n";
+  return o;
+}

package/src/builtins/completion-zsh.ts

@@ -1,4 +1,5 @@
 import { CliOptionKind, type CliRouter } from "../types.ts";
+import { emitConsumeLong, emitConsumeShort, emitMatchChild } from "./completion-simulate-shared.ts";
 import { collectScopes, type ScopeRec } from "./scopes.ts";
 import {
   escShellSingleQuoted,
@@ -53,105 +54,6 @@ function emitScopeArraysZsh(ident: string, scopes: ScopeRec[]): string {
   return out;
 }
 
-function emitConsumeLongZsh(ident: string, scopes: ScopeRec[]): string {
-  let o = "_${ident}_nac_consume_long() {\n".replace("${ident}", ident);
-  o += '  local sid="$1" w="$2" nw="$3"\n';
-  o += "  case $sid in\n";
-  for (const [i, sc] of scopes.entries()) {
-    o += `    ${i})\n`;
-    o += "      case $w in\n";
-    o +=
-      "        " +
-      kHelpLong +
-      "|${kHelpLong}=*|${kHelpShort}) echo 1 ;;\n"
-        .replace(/\$\{kHelpLong\}/g, kHelpLong)
-        .replace(/\$\{kHelpShort\}/g, kHelpShort);
-    for (const op of sc.opts) {
-      const base = `--${op.name}`;
-      if (op.kind === "presence") {
-        o += `        ${base}${"|${base}=*) echo 1 ;;\n".replace(/\$\{base\}/g, base)}`;
-      } else {
-        o += `        ${base}=*) echo 1 ;;\n`;
-        o += `        ${base}) echo 2 ;;\n`;
-      }
-    }
-    o += "        *) echo 0 ;;\n";
-    o += "      esac\n";
-    o += "      ;;\n";
-  }
-  o += "    *) echo 0 ;;\n";
-  o += "  esac\n";
-  o += "}\n";
-  return o;
-}
-
-function emitConsumeShortZsh(ident: string, scopes: ScopeRec[]): string {
-  let o = "_${ident}_nac_consume_short() {\n".replace("${ident}", ident);
-  o += '  local sid="$1" w="$2"\n';
-  o += "  case $sid in\n";
-  for (const [i, sc] of scopes.entries()) {
-    o += `    ${i})\n`;
-    o += "      local rest=${w#-}\n";
-    o += "      local ch\n";
-    o += "      local saw=0\n";
-    o += "      while [[ -n $rest ]]; do\n";
-    o += "        ch=${rest[1,1]}\n";
-    o += "        rest=${rest[2,-1]}\n";
-    o += "        case $ch in\n";
-    let boolChars = "";
-    for (const op of sc.opts) {
-      if (!op.shortName) continue;
-      if (op.kind === "presence") {
-        boolChars += `${op.shortName}|`;
-      } else {
-        o += `          ${op.shortName})\n`;
-        o += "            if [[ $saw -ne 0 || -n $rest ]]; then echo 0; return; fi\n";
-        o += "            echo 2; return ;;\n";
-      }
-    }
-    if (boolChars.length > 0) {
-      boolChars = boolChars.slice(0, -1);
-      o += `          ${boolChars}) ;;\n`;
-    }
-    o += "          *) echo 0; return ;;\n";
-    o += "        esac\n";
-    o += "        saw=1\n";
-    o += "      done\n";
-    o += "      echo 1\n";
-    o += "      ;;\n";
-  }
-  o += "    *) echo 0 ;;\n";
-  o += "  esac\n";
-  o += "}\n";
-  return o;
-}
-
-function emitMatchChildZsh(
-  ident: string,
-  scopes: ScopeRec[],
-  pathIndex: Record<string, number>,
-): string {
-  let o = "_${ident}_nac_match_child() {\n".replace("${ident}", ident);
-  o += '  local sid="$1" w="$2"\n';
-  o += "  case $sid in\n";
-  for (const [sid, sc] of scopes.entries()) {
-    if (sc.kids.length === 0) continue;
-    o += `    ${sid})\n`;
-    o += "      case $w in\n";
-    for (const ch of sc.kids) {
-      const childPath = sc.path === "" ? ch.key : `${sc.path}/${ch.key}`;
-      const cid = pathIndex[childPath] ?? 0;
-      o += `        ${ch.key}) echo ${cid}; return 0 ;;\n`;
-    }
-    o += "      esac\n";
-    o += "      ;;\n";
-  }
-  o += "  esac\n";
-  o += "  return 1\n";
-  o += "}\n";
-  return o;
-}
-
 function emitSimulateZsh(ident: string): string {
   let o = "_${ident}_nac_simulate() {\n".replace("${ident}", ident);
   o += "  local i=2 sid=0 w steps next\n";
@@ -264,9 +166,9 @@ export function completionZshScript(schema: CliRouter): string {
 
   let out = `#compdef ${schema.key}\n\n`;
   out += emitScopeArraysZsh(ident, scopes);
-  out += emitConsumeLongZsh(ident, scopes);
-  out += emitConsumeShortZsh(ident, scopes);
-  out += emitMatchChildZsh(ident, scopes, pathIndex);
+  out += emitConsumeLong(ident, scopes);
+  out += emitConsumeShort(ident, scopes, "zsh");
+  out += emitMatchChild(ident, scopes, pathIndex);
   out += emitSimulateZsh(ident);
   out += emitEnumReplyZsh(ident, scopes);
   out += emitMainBodyZsh(schema, ident);

package/src/builtins/config.test.ts

@@ -38,7 +38,7 @@ describe("builtins/config", () => {
       const configPath = resolveAppConfigPath(program);
       mkdirSync(dirname(configPath), { recursive: true });
       writeFileSync(configPath, `${JSON.stringify({ apiToken: "secret" })}\n`);
-      const result = await new Cli(program).invoke(["config", "get", "apiToken"]);
+      const result = await new Cli(program).invoke(["configure", "get", "apiToken"]);
       expect(result.exitCode).toBe(0);
       expect(result.stdout.trim()).toBe("REDACTED");
     } finally {
@@ -61,7 +61,7 @@ describe("builtins/config", () => {
       const configPath = resolveAppConfigPath(program);
       mkdirSync(dirname(configPath), { recursive: true });
       writeFileSync(configPath, `${JSON.stringify({ apiToken: "secret" })}\n`);
-      const result = await new Cli(program).invoke(["config", "get", "apiToken", "--json"]);
+      const result = await new Cli(program).invoke(["configure", "get", "apiToken", "--json"]);
       expect(result.exitCode).toBe(0);
       expect(JSON.parse(result.stdout)).toEqual({ set: true });
     } finally {
@@ -82,9 +82,9 @@ describe("builtins/config", () => {
     try {
       const program = configFixture();
       writeAppConfigFile(program, { apiToken: "seed" });
-      const result = await new Cli(program).invoke(["config", "set", "port", "9090"]);
+      const result = await new Cli(program).invoke(["configure", "set", "port", "9090"]);
       expect(result.exitCode).toBe(0);
-      const get = await new Cli(program).invoke(["config", "get", "port"]);
+      const get = await new Cli(program).invoke(["configure", "get", "port"]);
       expect(get.stdout.trim()).toBe("9090");
     } finally {
       if (prevHome === undefined) delete process.env.HOME;