@rigkit/cli 0.2.10 → 0.2.11

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Rigkit contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -7,7 +7,7 @@ npm i -g @rigkit/cli
 rig init
 rig plan
 rig ls
-rig -chdir=examples/smoke plan
+rig --chdir=examples/smoke plan
 ```
 
 `rig init` asks for a project name, Freestyle API key, and package manager. It creates a project folder containing a workflow-based `rig.config.ts`, `.env`, `.env.example`, `package.json`, and local ignore rules.
@@ -23,12 +23,15 @@ defined by the project run as `rig run <workspace> <operation>`, for example
 
 `rig ls` lists workspaces for the selected project. `rig ls snapshots` lists cached snapshot runs, and `rig ls config` shows the resolved project paths.
 
-Use Terraform-style global context options before the command to select another
-project or config:
+Use global context options before the command to select another project or
+config:
 
 ```bash
-rig -chdir=examples/smoke plan
-rig -chdir=examples/global-fragments -config=api.rig.config.ts apply
+rig --chdir=examples/smoke plan
+rig --chdir=examples/global-fragments --config=api.rig.config.ts apply
 ```
 
+Legacy Terraform-style aliases such as `-chdir=...` and `-config=...` are still
+accepted.
+
 Projects should install matching `@rigkit/sdk` versions locally.

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@rigkit/cli",
-  "version": "0.2.10",
+  "version": "0.2.11",
+  "license": "MIT",
   "type": "module",
   "repository": {
     "type": "git",
@@ -22,9 +23,9 @@
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "inquirer": "^13.4.3",
-    "@rigkit/provider-cmux": "0.2.10",
-    "@rigkit/engine": "0.2.10",
-    "@rigkit/runtime-client": "0.2.10"
+    "@rigkit/runtime-client": "0.2.11",
+    "@rigkit/engine": "0.2.11",
+    "@rigkit/provider-cmux": "0.2.11"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/cli.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, test } from "bun:test";
 import { existsSync, mkdirSync, mkdtempSync, realpathSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
+import { createFileProviderHostStorage } from "@rigkit/engine";
 import { projectIdFor, runtimeFingerprintFor, runtimePaths, SUPPORTED_RUNTIME_API_VERSION } from "@rigkit/runtime-client";
 import { RIGKIT_CLI_VERSION } from "./version.ts";
 
@@ -27,6 +28,7 @@ describe("CLI entrypoint", () => {
     expect(rootHelp.stdout).toContain("rm          Remove a workspace");
     expect(rootHelp.stdout).toContain("run         Run a workspace operation");
     expect(rootHelp.stdout).toContain("cache       Inspect and clear Rigkit cache");
+    expect(rootHelp.stdout).toContain("providers   Manage provider-owned local state");
 
     const version = await runCli(["version"]);
     expect(version.exitCode).toBe(0);
@@ -41,6 +43,7 @@ describe("CLI entrypoint", () => {
     expect(help.stdout).toContain("rm          Remove a workspace");
     expect(help.stdout).toContain("run         Run a workspace operation");
     expect(help.stdout).toContain("cache       Inspect and clear Rigkit cache");
+    expect(help.stdout).toContain("providers   Manage provider-owned local state");
   });
 
   test("prints an update notice when latest metadata is newer", async () => {
@@ -165,7 +168,28 @@ describe("CLI entrypoint", () => {
       expect(result.stderr).toContain("Found named Rigkit configs");
       expect(result.stderr).toContain("api.rig.config.ts");
       expect(result.stderr).toContain("web.rig.config.ts");
-      expect(result.stderr).toContain("rig -chdir=. -config=api.rig.config.ts <command>");
+      expect(result.stderr).toContain("rig --chdir=. --config=api.rig.config.ts <command>");
+    } finally {
+      rmSync(cwd, { recursive: true, force: true });
+    }
+  });
+
+  test("accepts conventional double-dash global options", async () => {
+    const cwd = mkdtempSync(join(tmpdir(), "rigkit-cli-global-options-"));
+    mkdirSync(join(cwd, "api"));
+    writeFileSync(join(cwd, "api", "rig.config.ts"), "export default {}\n");
+
+    try {
+      const result = await runCli(["--chdir=api", "projects", "--json"], { cwd });
+
+      expect(result.exitCode).toBe(0);
+      expect(result.stderr).toBe("");
+      expect(JSON.parse(result.stdout)).toEqual({
+        projects: [{
+          projectDir: join(realpathSync(cwd), "api"),
+          configPath: join(realpathSync(cwd), "api", "rig.config.ts"),
+        }],
+      });
     } finally {
       rmSync(cwd, { recursive: true, force: true });
     }
@@ -194,6 +218,31 @@ describe("CLI entrypoint", () => {
     }
   });
 
+  test("clears Freestyle provider host storage without loading a project", async () => {
+    const storageRoot = mkdtempSync(join(tmpdir(), "rigkit-provider-storage-"));
+    const storage = createFileProviderHostStorage({ providerId: "freestyle", rootDir: storageRoot });
+    storage.set("stack-auth:test", { refreshToken: "refresh-token", updatedAt: 1 });
+    storage.set("identity:test", { token: "ssh-token" });
+
+    try {
+      const result = await runCli(["providers", "freestyle", "clear", "--json"], {
+        env: { RIGKIT_HOST_STORAGE_DIR: storageRoot },
+      });
+
+      expect(result.exitCode).toBe(0);
+      expect(result.stderr).toBe("");
+      expect(JSON.parse(result.stdout)).toMatchObject({
+        ok: true,
+        providerId: "freestyle",
+        deleted: 2,
+        storageRoot,
+      });
+      expect(storage.entries()).toEqual([]);
+    } finally {
+      rmSync(storageRoot, { recursive: true, force: true });
+    }
+  });
+
   test("does not render a success marker when cache invalidation is a no-op", async () => {
     const projectDir = mkdtempSync(join(tmpdir(), "rigkit-cli-cache-invalidate-"));
 

package/src/cli.ts

@@ -10,6 +10,8 @@ import {
   type RuntimeClient,
 } from "@rigkit/runtime-client";
 import {
+  createFileProviderHostStorage,
+  defaultProviderHostStorageDir,
   type DevMachineEvent,
   type WorkflowPlan,
   type SnapshotRecord,
@@ -162,6 +164,7 @@ const STATIC_COMMANDS = new Set([
   "run",
   "ls",
   "cache",
+  "providers",
   "projects",
   "doctor",
   "version",
@@ -205,16 +208,18 @@ async function runCli(argv: string[]): Promise<void> {
     .exitOverride()
     .argument("[command]")
     .addOption(new Option("--chdir <dir>", `Switch to a directory containing ${DEFAULT_CONFIG_FILE} before running the command`).hideHelp())
-    .addOption(new Option("--config <file>", "Config file to load, relative to -chdir when set").hideHelp())
+    .addOption(new Option("--config <file>", "Config file to load, relative to --chdir when set").hideHelp())
     .addOption(new Option("--state <file>", "Local runtime state database path").hideHelp())
     .addOption(new Option("--json", "Print machine-readable JSON where supported").hideHelp())
     .addHelpText("after", [
       "",
       "Global Options:",
-      "  -chdir=DIR    Switch to a directory containing rig.config.ts before running the command",
-      "  -config=FILE  Config file to load, relative to -chdir when set",
-      "  -state=FILE   Local runtime state database path",
-      "  -json         Print machine-readable JSON where supported",
+      "  --chdir <dir>     Switch to a directory containing rig.config.ts before running the command",
+      "  --config <file>   Config file to load, relative to --chdir when set",
+      "  --state <file>    Local runtime state database path",
+      "  --json            Print machine-readable JSON where supported",
+      "",
+      "Legacy single-dash global aliases such as -chdir=DIR are still accepted.",
     ].join("\n"))
     .action(async (command?: string) => {
       if (command) program.error(`unknown command '${command}'`);
@@ -360,6 +365,22 @@ async function runCli(argv: string[]): Promise<void> {
       });
     });
 
+  const providers = program
+    .command("providers")
+    .description("Manage provider-owned local state");
+
+  const freestyleProvider = providers
+    .command("freestyle")
+    .description("Manage Freestyle provider local state");
+
+  freestyleProvider
+    .command("clear")
+    .description("Clear Freestyle provider local auth and identity state")
+    .option("--json", "Print machine-readable JSON")
+    .action(async (options: { json?: boolean }) => {
+      await runProvidersFreestyleClear(makeInvocation(rootOptions(program), options.json));
+    });
+
   program
     .command("projects")
     .description("Discover Rigkit projects below the current directory")
@@ -574,7 +595,7 @@ function canPrompt(): boolean {
 function resolveInitProjectPaths(invocation: CliInvocation, name: string): { projectDir: string; configPath: string } {
   const options = invocation.global;
   if (options.config) {
-    throw new Error(`rig init does not support -config. Use -chdir to choose the parent directory.`);
+    throw new Error(`rig init does not support --config. Use --chdir to choose the parent directory.`);
   }
 
   const parentDir = resolve(process.cwd(), options.chdir ?? ".");
@@ -964,7 +985,7 @@ async function runDiscoveredProjectOperation(
   if (!options.all && projects.length > 1) {
     throw new Error([
       "Multiple Rigkit projects found.",
-      "Use `rig projects` to list candidates, pass -chdir or -config to select one, or pass --all to run every discovered project.",
+      "Use `rig projects` to list candidates, pass --chdir or --config to select one, or pass --all to run every discovered project.",
       ...projects.map((project) => `- ${project.configPath}`),
     ].join("\n"));
   }
@@ -1082,7 +1103,7 @@ async function runCacheClear(invocation: CliInvocation, options: CacheClearOptio
 
   if (options.global && options.all) {
     if (invocation.global.chdir || invocation.global.config || invocation.global.state) {
-      throw new Error(`rig cache clear --global --all cannot be combined with -chdir, -config, or -state`);
+      throw new Error(`rig cache clear --global --all cannot be combined with --chdir, --config, or --state`);
     }
     const fragmentRoot = join(defaultRigkitHome(), "fragments");
     rmSync(fragmentRoot, { recursive: true, force: true });
@@ -1104,6 +1125,32 @@ async function runCacheClear(invocation: CliInvocation, options: CacheClearOptio
   console.log(`Cleared ${result.deleted} cache ${result.deleted === 1 ? "entry" : "entries"}.`);
 }
 
+async function runProvidersFreestyleClear(invocation: CliInvocation): Promise<void> {
+  const providerId = "freestyle";
+  const storageRoot = defaultProviderHostStorageDir();
+  const storage = createFileProviderHostStorage({ providerId, rootDir: storageRoot });
+  const keys = storage.entries().map((entry) => entry.key);
+  for (const key of keys) storage.delete(key);
+
+  const result = {
+    ok: true,
+    providerId,
+    deleted: keys.length,
+    storageRoot,
+  };
+
+  if (wantsJson(invocation)) {
+    printJson(result);
+    return;
+  }
+
+  if (keys.length === 0) {
+    console.log("No Freestyle provider local state to clear.");
+    return;
+  }
+  console.log(`Cleared ${keys.length} Freestyle provider ${keys.length === 1 ? "entry" : "entries"}.`);
+}
+
 type CacheInvalidateOptions = {
   step?: string;
   all: boolean;
@@ -1524,6 +1571,7 @@ async function runHelp(invocation: CliInvocation): Promise<void> {
         { name: "run", description: "Run a workspace operation" },
         { name: "ls", description: "List project workspaces" },
         { name: "cache", description: "Inspect and clear Rigkit cache" },
+        { name: "providers", description: "Manage provider-owned local state" },
         { name: "projects", description: "Discover Rigkit projects below the current directory" },
         { name: "doctor", description: "Show Rigkit runtime diagnostics" },
         { name: "version", description: "Show Rigkit CLI version" },
@@ -1535,7 +1583,7 @@ async function runHelp(invocation: CliInvocation): Promise<void> {
   const cmd = (name: string, description: string): string =>
     `  ${ui.bold(name.padEnd(10))}  ${description}`;
   const opt = (flag: string, description: string): string =>
-    `  ${ui.bold(flag.padEnd(12))}  ${description}`;
+    `  ${ui.bold(flag.padEnd(17))}  ${description}`;
 
   console.log([
     `${ui.bold("rig")} ${ui.dim(RIGKIT_CLI_VERSION)}`,
@@ -1553,16 +1601,19 @@ async function runHelp(invocation: CliInvocation): Promise<void> {
     cmd("run",        "Run a workspace operation"),
     cmd("ls",         "List project workspaces"),
     cmd("cache",      "Inspect and clear Rigkit cache"),
+    cmd("providers",  "Manage provider-owned local state"),
     cmd("projects",   "Discover Rigkit projects below the current directory"),
     cmd("doctor",     "Show Rigkit runtime diagnostics"),
     cmd("version",    "Show Rigkit CLI version"),
     cmd("completion", "Generate shell completion script"),
     "",
     ui.dim("Options:"),
-    opt("-chdir=DIR",   "Switch to a directory containing rig.config.ts before running the command"),
-    opt("-config=FILE", "Config file to load, relative to -chdir when set"),
-    opt("-state=FILE",  "Local runtime state database path"),
-    opt("-json",        "Print machine-readable JSON where supported"),
+    opt("--chdir <dir>",   "Switch to a directory containing rig.config.ts before running the command"),
+    opt("--config <file>", "Config file to load, relative to --chdir when set"),
+    opt("--state <file>",  "Local runtime state database path"),
+    opt("--json",          "Print machine-readable JSON where supported"),
+    "",
+    ui.dim("Legacy single-dash global aliases such as -chdir=DIR are still accepted."),
   ].join("\n"));
 }
 
@@ -2116,8 +2167,12 @@ async function promptHostSelect(params: unknown): Promise<string> {
       .filter((item) => item.value)
     : [];
   if (options.length === 0) throw new Error(`Host select prompt has no options`);
-  const defaultValue = stringField(params, "defaultValue") ?? options[0]!.value;
-  if (!canPrompt()) return defaultValue;
+  const configuredDefaultValue = stringField(params, "defaultValue");
+  const defaultValue = configuredDefaultValue ?? options[0]!.value;
+  if (!canPrompt()) {
+    if (configuredDefaultValue !== undefined) return configuredDefaultValue;
+    throw new Error(`Host select prompt requires an interactive terminal: ${message}`);
+  }
   const answers = await inquirer.prompt<{ value: string }>([{
     type: "select",
     name: "value",
@@ -2301,6 +2356,16 @@ function printPlan(plan: WorkflowPlan): void {
   console.log(`${ui.bold(plan.workflow)}  ${ui.dim(`${plan.cachedNodeCount}/${plan.nodeCount} cached`)}`);
   console.log("");
 
+  if (plan.providerChecks?.length) {
+    const rows = plan.providerChecks.map((check) => [
+      { text: check.label || check.providerName, style: ui.dim },
+      { text: check.status, style: providerCheckStatusStyle(check.status) },
+      { text: providerCheckValue(check), style: check.status === "ok" ? ((value: string) => value) : ui.warn },
+    ]);
+    console.log(ui.columns(["provider check", "status", "current"], rows));
+    console.log("");
+  }
+
   const rows = plan.nodes.map((node) => [
     { text: String(node.index + 1), style: ui.dim },
     { text: node.status, style: planStatusStyle(node.status) },
@@ -2310,6 +2375,18 @@ function printPlan(plan: WorkflowPlan): void {
   console.log(ui.columns(["#", "status", "node", "reason"], rows));
 }
 
+function providerCheckValue(check: NonNullable<WorkflowPlan["providerChecks"]>[number]): string {
+  if (check.status === "required" && check.message) return check.message;
+  if (check.detail && check.detail !== check.value && !check.value.includes(check.detail)) {
+    return `${check.value} ${ui.dim(check.detail)}`;
+  }
+  return check.value;
+}
+
+function providerCheckStatusStyle(status: string): (text: string) => string {
+  return status === "ok" ? ui.ok : ui.warn;
+}
+
 function planStatusStyle(status: string): (text: string) => string {
   switch (status) {
     case "cached":

package/src/completion.test.ts

@@ -82,6 +82,45 @@ describe("CLI completion", () => {
     }
   });
 
+  test("suggests conventional double-dash global flags by default", async () => {
+    const items = await completeRig({
+      cwd: process.cwd(),
+      words: ["rig", "--"],
+      currentIndex: 1,
+    });
+
+    expect(items.map((item) => item.value)).toEqual([
+      "--chdir=",
+      "--config=",
+      "--state=",
+      "--json",
+      "--help",
+      "--version",
+    ]);
+  });
+
+  test("completes project directories for --chdir", async () => {
+    const cwd = mkdtempSync(join(tmpdir(), "rigkit-completion-dirs-"));
+    mkdirSync(join(cwd, "examples", "global-fragments"), { recursive: true });
+
+    try {
+      const roots = await completeRig({
+        cwd,
+        words: ["rig", "--chdir="],
+        currentIndex: 1,
+      });
+
+      expect(roots).toContainEqual({
+        value: "--chdir=examples/",
+        description: "directory",
+        noSpace: true,
+        group: "Paths",
+      });
+    } finally {
+      rmSync(cwd, { recursive: true, force: true });
+    }
+  });
+
   test("completes named config files", async () => {
     const cwd = mkdtempSync(join(tmpdir(), "rigkit-completion-configs-"));
     writeFileSync(join(cwd, "api.rig.config.ts"), "export default {}\n");
@@ -183,7 +222,7 @@ describe("CLI completion", () => {
         currentIndex: 1,
       });
 
-      expect(items.map((item) => item.value)).toEqual(["plan", "projects"]);
+      expect(items.map((item) => item.value)).toEqual(["plan", "providers", "projects"]);
     });
   });
 
@@ -221,6 +260,40 @@ describe("CLI completion", () => {
     ]);
   });
 
+  test("completes provider targets, subcommands, and flags", async () => {
+    const targets = await completeRig({
+      cwd: process.cwd(),
+      words: ["rig", "providers", ""],
+      currentIndex: 2,
+    });
+
+    expect(targets.map((item) => item.value)).toEqual(["freestyle"]);
+
+    const targetFlags = await completeRig({
+      cwd: process.cwd(),
+      words: ["rig", "providers", "--"],
+      currentIndex: 2,
+    });
+
+    expect(targetFlags.map((item) => item.value)).toEqual(["--help"]);
+
+    const subcommands = await completeRig({
+      cwd: process.cwd(),
+      words: ["rig", "providers", "freestyle", ""],
+      currentIndex: 3,
+    });
+
+    expect(subcommands.map((item) => item.value)).toEqual(["clear"]);
+
+    const clearFlags = await completeRig({
+      cwd: process.cwd(),
+      words: ["rig", "providers", "freestyle", "clear", "--"],
+      currentIndex: 4,
+    });
+
+    expect(clearFlags.map((item) => item.value)).toEqual(["--json", "--help"]);
+  });
+
   test("completes project operation flags and workflow values", async () => {
     const projectDir = mkdtempSync(join(tmpdir(), "rigkit-completion-"));
     await withWorkspaceRuntime({ projectDir }, async () => {

package/src/completion.ts

@@ -28,6 +28,7 @@ type CommandName =
   | "run"
   | "ls"
   | "cache"
+  | "providers"
   | "projects"
   | "doctor"
   | "version"
@@ -126,6 +127,7 @@ const GROUP_VALUES = "Values";
 const GROUP_PATHS = "Paths";
 const GROUP_SHELLS = "Shells";
 const GROUP_CACHE = "Cache entries";
+const GROUP_PROVIDERS = "Providers";
 
 const COMMANDS: CompletionItem[] = withGroup(GROUP_COMMANDS, [
   { value: "help", description: "show CLI help" },
@@ -137,6 +139,7 @@ const COMMANDS: CompletionItem[] = withGroup(GROUP_COMMANDS, [
   { value: "run", description: "run a workspace operation" },
   { value: "ls", description: "list project workspaces" },
   { value: "cache", description: "inspect and clear Rigkit cache" },
+  { value: "providers", description: "manage provider-owned local state" },
   { value: "projects", description: "discover Rigkit projects" },
   { value: "doctor", description: "show runtime diagnostics" },
   { value: "version", description: "show CLI version" },
@@ -149,36 +152,42 @@ const JSON_OPTION = option(["--json"], "print JSON");
 const HELP_OPTION = option(["--help"], "show help");
 
 const GLOBAL_OPTIONS: OptionDefinition[] = [
-  option(["-chdir", "--chdir"], "working directory", {
+  option(["--chdir", "-chdir"], "working directory", {
     group: GROUP_GLOBAL,
     takesValue: true,
     valueKind: "directories",
     completions: [
-      { value: "-chdir=", noSpace: true },
       { value: "--chdir=", noSpace: true },
     ],
   }),
-  option(["-config", "--config"], "config file", {
+  option(["--config", "-config"], "config file", {
     group: GROUP_GLOBAL,
     takesValue: true,
     valueKind: "config-files",
     completions: [
-      { value: "-config=", noSpace: true },
       { value: "--config=", noSpace: true },
     ],
   }),
-  option(["-state", "--state"], "state database path", {
+  option(["--state", "-state"], "state database path", {
     group: GROUP_GLOBAL,
     takesValue: true,
     valueKind: "filesystem",
     completions: [
-      { value: "-state=", noSpace: true },
       { value: "--state=", noSpace: true },
     ],
   }),
-  option(["-json", "--json"], "print JSON", { group: GROUP_GLOBAL }),
-  option(["-help", "--help"], "show help", { group: GROUP_GLOBAL }),
-  option(["-version", "--version", "-v"], "show version", { group: GROUP_GLOBAL }),
+  option(["--json", "-json"], "print JSON", {
+    group: GROUP_GLOBAL,
+    completions: [{ value: "--json" }],
+  }),
+  option(["--help", "-help"], "show help", {
+    group: GROUP_GLOBAL,
+    completions: [{ value: "--help" }],
+  }),
+  option(["--version", "-version", "-v"], "show version", {
+    group: GROUP_GLOBAL,
+    completions: [{ value: "--version" }, { value: "-v" }],
+  }),
 ];
 
 const COMMAND_OPTIONS: Record<CommandName, OptionDefinition[]> = {
@@ -226,6 +235,9 @@ const COMMAND_OPTIONS: Record<CommandName, OptionDefinition[]> = {
   cache: [
     HELP_OPTION,
   ],
+  providers: [
+    HELP_OPTION,
+  ],
   projects: [
     JSON_OPTION,
     HELP_OPTION,
@@ -294,6 +306,31 @@ const CACHE_SUBCOMMAND_OPTIONS: Record<string, OptionDefinition[]> = {
   ],
 };
 
+const PROVIDER_TARGETS: CompletionItem[] = withGroup(GROUP_PROVIDERS, [
+  { value: "freestyle", description: "Freestyle provider state" },
+]);
+
+const PROVIDER_SUBCOMMANDS: Record<string, CompletionItem[]> = {
+  freestyle: withGroup(GROUP_SUBCOMMANDS, [
+    { value: "clear", description: "clear Freestyle provider local auth and identity state" },
+  ]),
+};
+
+const PROVIDER_TARGET_OPTIONS: Record<string, OptionDefinition[]> = {
+  freestyle: [
+    HELP_OPTION,
+  ],
+};
+
+const PROVIDER_SUBCOMMAND_OPTIONS: Record<string, Record<string, OptionDefinition[]>> = {
+  freestyle: {
+    clear: [
+      JSON_OPTION,
+      HELP_OPTION,
+    ],
+  },
+};
+
 const COMPLETION_SHELLS: CompletionItem[] = withGroup(GROUP_SHELLS, [
   { value: "bash", description: "Bash completion" },
   { value: "fish", description: "fish completion" },
@@ -471,6 +508,14 @@ async function optionsForCommandContext(context: CompletionContext): Promise<Opt
     if (cache.subcommand) return CACHE_SUBCOMMAND_OPTIONS[cache.subcommand] ?? [HELP_OPTION];
   }
 
+  if (context.command === "providers") {
+    const providers = parseProvidersArgs(context);
+    if (providers.provider && providers.subcommand) {
+      return PROVIDER_SUBCOMMAND_OPTIONS[providers.provider]?.[providers.subcommand] ?? [HELP_OPTION];
+    }
+    if (providers.provider) return PROVIDER_TARGET_OPTIONS[providers.provider] ?? [HELP_OPTION];
+  }
+
   return COMMAND_OPTIONS[context.command] ?? [];
 }
 
@@ -553,6 +598,8 @@ async function completeCommand(context: CompletionContext): Promise<CompletionIt
       return completeLsCommand(context);
     case "cache":
       return await completeCacheCommand(context);
+    case "providers":
+      return completeProvidersCommand(context);
     case "completion":
       return completeCompletionCommand(context);
     case "init":
@@ -690,6 +737,24 @@ async function completeCacheCommand(context: CompletionContext): Promise<Complet
   return [];
 }
 
+function completeProvidersCommand(context: CompletionContext): CompletionItem[] {
+  const providers = parseProvidersArgs(context);
+  if (!providers.provider) {
+    if (context.current.startsWith("-")) return filterItems(optionItems(COMMAND_OPTIONS.providers), context.current);
+    return filterItems(PROVIDER_TARGETS, context.current);
+  }
+
+  if (!providers.subcommand) {
+    const options = PROVIDER_TARGET_OPTIONS[providers.provider] ?? [HELP_OPTION];
+    const subcommands = PROVIDER_SUBCOMMANDS[providers.provider] ?? [];
+    if (context.current.startsWith("-")) return filterItems(optionItems(options), context.current);
+    return filterItems(subcommands, context.current);
+  }
+
+  const options = PROVIDER_SUBCOMMAND_OPTIONS[providers.provider]?.[providers.subcommand] ?? [HELP_OPTION];
+  return completeOptionsOnlyCommand(context, options);
+}
+
 function completeCompletionCommand(context: CompletionContext): CompletionItem[] {
   const shells = positionalsFrom(context.argsBefore, COMMAND_OPTIONS.completion);
   if (shells.length === 0) {
@@ -861,6 +926,15 @@ function parseCacheArgs(context: CompletionContext): { subcommand?: string; args
   };
 }
 
+function parseProvidersArgs(context: CompletionContext): { provider?: string; subcommand?: string; args: string[] } {
+  const positionals = positionalsFrom(context.argsBefore, COMMAND_OPTIONS.providers);
+  return {
+    provider: positionals[0],
+    subcommand: positionals[1],
+    args: positionals.slice(2),
+  };
+}
+
 function positionalsFrom(tokens: string[], options: OptionDefinition[]): string[] {
   return positionalTokensFrom(tokens, options).map((token) => token.value);
 }

package/src/project.test.ts

@@ -5,7 +5,7 @@ import { join } from "node:path";
 import { discoverProjectConfigs, resolveConfigPaths } from "./project.ts";
 
 describe("CLI project resolution", () => {
-  test("resolves -chdir to that directory's rig.config.ts", () => {
+  test("resolves --chdir to that directory's rig.config.ts", () => {
     const cwd = mkdtempSync(join(tmpdir(), "rigkit-cli-"));
     mkdirSync(join(cwd, "example"));
     writeFileSync(join(cwd, "example", "rig.config.ts"), "export default {}\n");
@@ -15,7 +15,7 @@ describe("CLI project resolution", () => {
     expect(paths.configPath).toBe(join(cwd, "example", "rig.config.ts"));
   });
 
-  test("resolves -config project root from the config dirname", () => {
+  test("resolves --config project root from the config dirname", () => {
     const cwd = mkdtempSync(join(tmpdir(), "rigkit-cli-"));
     const paths = resolveConfigPaths({ cwd, config: "machines/platform.ts" });
 
@@ -40,7 +40,7 @@ describe("CLI project resolution", () => {
     writeFileSync(join(cwd, "web.rig.config.ts"), "export default {}\n");
 
     expect(() => resolveConfigPaths({ cwd })).toThrow(
-      /Found named Rigkit configs[\s\S]*api\.rig\.config\.ts[\s\S]*web\.rig\.config\.ts[\s\S]*rig -chdir=\. -config=api\.rig\.config\.ts <command>/,
+      /Found named Rigkit configs[\s\S]*api\.rig\.config\.ts[\s\S]*web\.rig\.config\.ts[\s\S]*rig --chdir=\. --config=api\.rig\.config\.ts <command>/,
     );
   });
 

package/src/project.ts

@@ -159,7 +159,7 @@ function appendConfigFilesHint(
   options: { commandCwd: string; hint?: ConfigFilesHint },
 ): string {
   const hint = options.hint;
-  if (!hint) return `${message} Run "rig init" or pass -config=<file>.`;
+  if (!hint) return `${message} Run "rig init" or pass --config=<file>.`;
 
   const configFile = hint.files[0]!;
   const configPath = displayPath(options.commandCwd, join(hint.dir, configFile));
@@ -171,8 +171,8 @@ function appendConfigFilesHint(
     ...hint.files.map((file) => `- ${file}`),
     "",
     "Choose one explicitly:",
-    `  rig -config=${configPath} <command>`,
-    `  rig -chdir=${projectDir} -config=${configFile} <command>`,
+    `  rig --config=${configPath} <command>`,
+    `  rig --chdir=${projectDir} --config=${configFile} <command>`,
   ].join("\n");
 }
 

package/src/version.ts

@@ -1 +1 @@
-export const RIGKIT_CLI_VERSION = "0.2.10";
+export const RIGKIT_CLI_VERSION = "0.2.11";