@rigkit/cli 0.2.4 → 0.2.6

package/README.md

@@ -16,7 +16,7 @@ Interactive terminals use Inquirer prompts and a chalk/log-update run timeline.
 
 Interactive providers can ask the CLI to open provider-owned URLs. For example, Freestyle terminal sessions are served by the Freestyle provider, while the CLI only opens the presented URL in a browser.
 
-Workspace-specific operations run as `rig <workspace>/<operation>`, for example `rig website-workspace/open-cmux` or `rig website-workspace/remove -y`.
+Workspace-specific operations run as `rig run <workspace> <operation>`, for example `rig run website-workspace open-cmux` or `rig run website-workspace remove -y`.
 
 `rig ls` lists workspaces for the selected project. `rig ls snapshots` lists cached snapshot runs, and `rig ls config` shows the resolved project paths.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rigkit/cli",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "type": "module",
   "repository": {
     "type": "git",
@@ -25,9 +25,9 @@
     "log-symbols": "^7.0.1",
     "log-update": "^8.0.0",
     "ora": "^9.4.0",
-    "@rigkit/provider-cmux": "0.2.4",
-    "@rigkit/engine": "0.2.4",
-    "@rigkit/runtime-client": "0.2.4"
+    "@rigkit/provider-cmux": "0.2.6",
+    "@rigkit/engine": "0.2.6",
+    "@rigkit/runtime-client": "0.2.6"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/cli.test.ts

@@ -23,7 +23,8 @@ describe("CLI entrypoint", () => {
     expect(rootHelp.exitCode).toBe(0);
     expect(rootHelp.stderr).toBe("");
     expect(rootHelp.stdout).toContain("rig ");
-    expect(rootHelp.stdout).toContain("<operation> Run a project operation exposed by the runtime");
+    expect(rootHelp.stdout).toContain("plan        Plan project workflow changes");
+    expect(rootHelp.stdout).toContain("run         Run a workspace operation");
 
     const version = await runCli(["version"]);
     expect(version.exitCode).toBe(0);
@@ -34,15 +35,16 @@ describe("CLI entrypoint", () => {
     expect(help.exitCode).toBe(0);
     expect(help.stderr).toBe("");
     expect(help.stdout).toContain("rig ");
-    expect(help.stdout).toContain("<operation> Run a project operation exposed by the runtime");
+    expect(help.stdout).toContain("plan        Plan project workflow changes");
+    expect(help.stdout).toContain("run         Run a workspace operation");
   });
 
-  test("treats unknown root tokens as project operations", async () => {
+  test("rejects operation shorthand at the root", async () => {
     const result = await runCli(["unknown"]);
 
     expect(result.exitCode).toBe(1);
     expect(result.stdout).toBe("");
-    expect(result.stderr).toContain("No Rigkit config found");
+    expect(result.stderr).toContain("unknown command 'unknown'");
   });
 
   test("serves dynamic shell completion endpoint", async () => {
@@ -106,6 +108,18 @@ describe("CLI entrypoint", () => {
     });
   });
 
+  test("rejects workspace create names that are not shell-safe", async () => {
+    const projectDir = mkdtempSync(join(tmpdir(), "rigkit-cli-create-name-"));
+
+    await withWorkspaceRuntime({ projectDir }, async ({ env }) => {
+      const result = await runCli(["-C", projectDir, "create", "--name", "some workspace", "--json"], { env });
+
+      expect(result.exitCode).toBe(1);
+      expect(result.stdout).toBe("");
+      expect(result.stderr).toContain('Invalid workspace name "some workspace"');
+    });
+  });
+
   test("requires discovered projects for operation --all", async () => {
     const cwd = mkdtempSync(join(tmpdir(), "rigkit-cli-run-all-"));
 
@@ -216,6 +230,30 @@ async function withWorkspaceRuntime(
           }],
         });
       }
+      if (pathname === "/operations") {
+        return runtimeJson({
+          operations: [{
+            id: "create",
+            kind: "command",
+            source: "core",
+            title: "Create",
+            description: "Create a workspace",
+            createsWorkspace: true,
+            cli: {
+              options: [{ name: "name", flag: "--name", required: true, type: "string" }],
+            },
+            inputSchema: {
+              type: "object",
+              additionalProperties: false,
+              properties: {
+                name: { type: "string", minLength: 1 },
+              },
+              required: ["name"],
+            },
+          }],
+          workspaceOperations: [],
+        });
+      }
       return runtimeJson({ error: { message: "Not found" } }, { status: 404 });
     },
   });

package/src/cli.ts

@@ -36,6 +36,7 @@ import {
   resolveCompletionShell,
   type CompletionShell,
 } from "./completion.ts";
+import { generateWorkspaceName } from "./workspace-name.ts";
 
 type GlobalOptions = {
   project?: string;
@@ -148,41 +149,10 @@ const CLI_HOST_CAPABILITIES: Array<{ id: string; schemaHash?: string }> = [
   ...(capability.schemaHash ? { schemaHash: capability.schemaHash } : {}),
 }));
 
-const MANAGEMENT_COMMANDS = new Set([
-  "completion",
-  "doctor",
-  "help",
-  "init",
-  "ls",
-  "projects",
-  "run",
-  "version",
-]);
-
-const GLOBAL_OPTIONS_WITH_VALUES = new Set(["-C", "--project", "--config", "--state"]);
-
 if (process.argv[2] === "__complete") {
   runCompletionEndpoint(process.argv.slice(3)).catch(handleCliError);
 } else {
-  runCli(normalizeOperationArgv(process.argv)).catch(handleCliError);
-}
-
-function normalizeOperationArgv(argv: string[]): string[] {
-  const args = argv.slice(2);
-  for (let index = 0; index < args.length; index += 1) {
-    const arg = args[index]!;
-    if (arg === "--") return argv;
-    if (GLOBAL_OPTIONS_WITH_VALUES.has(arg)) {
-      index += 1;
-      continue;
-    }
-    if ([...GLOBAL_OPTIONS_WITH_VALUES].some((option) => arg.startsWith(`${option}=`))) continue;
-    if (arg === "--json") continue;
-    if (arg.startsWith("-")) return argv;
-    if (MANAGEMENT_COMMANDS.has(arg)) return argv;
-    return [...argv.slice(0, 2), ...args.slice(0, index), "run", ...args.slice(index)];
-  }
-  return argv;
+  runCli(process.argv).catch(handleCliError);
 }
 
 async function runCli(argv: string[]): Promise<void> {
@@ -190,7 +160,7 @@ async function runCli(argv: string[]): Promise<void> {
   program
     .name("rig")
     .description("Rigkit workflow CLI")
-    .usage("[options] <command|operation>")
+    .usage("[options] <command>")
     .version(RIGKIT_CLI_VERSION, "-v, --version", "Show Rigkit CLI version")
     .showHelpAfterError()
     .exitOverride()
@@ -227,22 +197,46 @@ async function runCli(argv: string[]): Promise<void> {
       });
     });
 
+  for (const operation of ["plan", "apply"] as const) {
+    program
+      .command(`${operation} [args...]`)
+      .description(operation === "plan" ? "Plan project workflow changes" : "Apply project workflow changes")
+      .allowUnknownOption(true)
+      .option("--all", "Run against every discovered project")
+      .option("--discover", "Discover projects below the selected directory")
+      .option("--json", "Print machine-readable JSON")
+      .action(async (args: string[], options: { all?: boolean; discover?: boolean; json?: boolean }) => {
+        await runProjectOperation(makeInvocation(rootOptions(program), options.json), operation, args ?? [], {
+          all: Boolean(options.all),
+          discover: Boolean(options.discover),
+        });
+      });
+  }
+
+  program
+    .command("create [args...]")
+    .description("Create a workspace")
+    .allowUnknownOption(true)
+    .option("--json", "Print machine-readable JSON")
+    .action(async (args: string[], options: { json?: boolean }) => {
+      await runProjectOperation(makeInvocation(rootOptions(program), options.json), "create", args ?? [], {
+        all: false,
+        discover: false,
+      });
+    });
+
   program
-    .command("run <operation> [args...]", { hidden: true })
-    .description("Run a project operation exposed by the runtime")
+    .command("run <workspace> <operation> [args...]")
+    .description("Run a workspace operation")
     .allowUnknownOption(true)
-    .option("--all", "Run against every discovered project")
-    .option("--discover", "Discover projects below the selected directory")
     .option("--json", "Print machine-readable JSON")
     .action(async (
+      workspace: string,
       operation: string,
       args: string[],
-      options: { all?: boolean; discover?: boolean; json?: boolean },
+      options: { json?: boolean },
     ) => {
-      await runProjectOperation(makeInvocation(rootOptions(program), options.json), operation, args ?? [], {
-        all: Boolean(options.all),
-        discover: Boolean(options.discover),
-      });
+      await runWorkspaceOperation(makeInvocation(rootOptions(program), options.json), workspace, operation, args ?? []);
     });
 
   program
@@ -499,6 +493,43 @@ async function promptPackageManager(defaultValue: PackageManager): Promise<Packa
   return answers.packageManager;
 }
 
+async function promptWorkspaceName(defaultValue: string): Promise<string> {
+  const answers = await inquirer.prompt<{ name: string }>([{
+    type: "input",
+    name: "name",
+    message: "Workspace name:",
+    default: defaultValue,
+    validate(value: string) {
+      return validateWorkspaceName(value.trim());
+    },
+    filter: (value: string) => value.trim(),
+  }]);
+  return answers.name;
+}
+
+const workspaceNamePattern = /^(?!-)[A-Za-z0-9._-]+$/;
+
+function validateWorkspaceName(value: string): true | string {
+  if (!value) return "Workspace name is required.";
+  if (!workspaceNamePattern.test(value)) {
+    return 'Use only letters, numbers, ".", "_", and "-", and do not start with "-".';
+  }
+  return true;
+}
+
+function assertValidWorkspaceName(value: unknown): void {
+  if (typeof value !== "string") throw new Error(`Workspace name must be a string`);
+  const valid = validateWorkspaceName(value);
+  if (valid !== true) throw new Error(`Invalid workspace name "${value}". ${valid}`);
+}
+
+async function defaultWorkspaceName(runtime: RuntimeClient): Promise<string> {
+  const existingNames = await runtime.control.workspaces()
+    .then((response) => response.workspaces.map((workspace) => workspace.name))
+    .catch(() => []);
+  return generateWorkspaceName(existingNames);
+}
+
 async function runPackageManagerInstall(
   projectDir: string,
   packageManager: PackageManager,
@@ -649,6 +680,48 @@ async function runProjectOperation(
   }
 
   await renderOperationResult(operation, result, parsed.hostOptions);
+  printInteractiveOutputGap(invocation);
+}
+
+async function runWorkspaceOperation(
+  invocation: CliInvocation,
+  workspaceName: string,
+  requestedOperation: string,
+  args: string[],
+): Promise<void> {
+  const runtime = await loadRuntime(invocation);
+  const manifest = await readRuntimeOperations(runtime);
+  const operation = (manifest.workspaceOperations ?? []).find((item) =>
+    item.id === requestedOperation || item.aliases?.includes(requestedOperation)
+  );
+  if (!operation) {
+    throw new Error(`This project does not define a workspace operation named "${requestedOperation}".`);
+  }
+
+  const workspaces = await runtime.control.workspaces()
+    .then((response) => response.workspaces as WorkspaceRecord[])
+    .catch(() => []);
+  if (!workspaces.some((workspace) => workspace.name === workspaceName)) {
+    throw new Error(`This project does not have a workspace named "${workspaceName}".`);
+  }
+
+  const parsed = parseOperationArgs(operation, args);
+  enforceHostOnlyBooleanGuards(operation, parsed);
+
+  const result = await runRuntimeOperation<unknown>(
+    runtime,
+    `${workspaceName}/${operation.id}`,
+    parsed.input,
+    { renderEvents: !wantsJson(invocation) },
+  );
+
+  if (wantsJson(invocation)) {
+    printJson(result);
+    return;
+  }
+
+  await renderOperationResult(operation, result, parsed.hostOptions);
+  printInteractiveOutputGap(invocation);
 }
 
 async function runDiscoveredProjectOperation(
@@ -704,6 +777,7 @@ async function runDiscoveredProjectOperation(
         console.log(chalk.bold(displayProjectDir(project.projectDir)));
       }
       await renderOperationResult(operation, result, parsed.hostOptions);
+      printInteractiveOutputGap(invocation);
     }
   }
 
@@ -780,7 +854,7 @@ async function executeRuntimeOperation(
   }
   const { operation, runOperation } = resolved;
 
-  const parsed = parseOperationArgs(operation, args);
+  const parsed = await parseOperationArgsWithPrompts(invocation, runtime, operation, args);
   enforceHostOnlyBooleanGuards(operation, parsed);
 
   const result = await runRuntimeOperation<unknown>(
@@ -797,28 +871,43 @@ function findRuntimeOperation(
   manifest: RuntimeOperationManifest,
   requestedOperation: string,
 ): { operation: RuntimeOperationDefinition; runOperation: string } | undefined {
-  const workspaceOperation = parseWorkspaceOperationId(requestedOperation);
-  if (workspaceOperation) {
-    const operation = (manifest.workspaceOperations ?? []).find((item) => item.id === workspaceOperation.operation);
-    return operation ? { operation, runOperation: requestedOperation } : undefined;
-  }
-
   const operation = manifest.operations.find((operation) =>
     operation.id === requestedOperation || operation.aliases?.includes(requestedOperation)
   );
   return operation ? { operation, runOperation: operation.id } : undefined;
 }
 
-function parseWorkspaceOperationId(value: string): { workspace: string; operation: string } | undefined {
-  const slash = value.indexOf("/");
-  if (slash <= 0 || slash === value.length - 1) return undefined;
-  return {
-    workspace: value.slice(0, slash),
-    operation: value.slice(slash + 1),
-  };
+async function parseOperationArgsWithPrompts(
+  invocation: CliInvocation,
+  runtime: RuntimeClient,
+  operation: RuntimeOperationDefinition,
+  args: string[],
+): Promise<ParsedOperationInput> {
+  const parsed = parseOperationArgs(operation, args, {
+    allowMissingRequired: !wantsJson(invocation) && canPrompt(),
+  });
+
+  if (
+    operation.createsWorkspace &&
+    parsed.input.name === undefined &&
+    !wantsJson(invocation) &&
+    canPrompt()
+  ) {
+    parsed.input.name = await promptWorkspaceName(await defaultWorkspaceName(runtime));
+  }
+  if (operation.createsWorkspace && parsed.input.name !== undefined) {
+    assertValidWorkspaceName(parsed.input.name);
+  }
+
+  enforceRequiredOperationInputs(operation, parsed);
+  return parsed;
 }
 
-function parseOperationArgs(operation: RuntimeOperationDefinition, args: string[]): ParsedOperationInput {
+function parseOperationArgs(
+  operation: RuntimeOperationDefinition,
+  args: string[],
+  options: { allowMissingRequired?: boolean } = {},
+): ParsedOperationInput {
   const cli = inferCliMetadata(operation);
   const input: Record<string, unknown> = {};
   const hostOptions: Record<string, unknown> = {};
@@ -857,19 +946,27 @@ function parseOperationArgs(operation: RuntimeOperationDefinition, args: string[
     assignPositional(positionals, positionalIndex++, arg, input);
   }
 
+  if (!options.allowMissingRequired) enforceRequiredOperationInputs(operation, { input, hostOptions });
+
+  return { input, hostOptions };
+}
+
+function enforceRequiredOperationInputs(
+  operation: RuntimeOperationDefinition,
+  parsed: ParsedOperationInput,
+): void {
+  const cli = inferCliMetadata(operation);
   for (const option of cli.options ?? []) {
-    if (option.required && input[option.name] === undefined && hostOptions[option.name] === undefined) {
+    if (option.required && parsed.input[option.name] === undefined && parsed.hostOptions[option.name] === undefined) {
       throw new Error(`Operation ${operation.id} requires ${option.flag}`);
     }
   }
 
   for (const name of operation.inputSchema?.required ?? []) {
-    if (input[name] === undefined) {
+    if (parsed.input[name] === undefined) {
       throw new Error(`Operation ${operation.id} requires ${name}`);
     }
   }
-
-  return { input, hostOptions };
 }
 
 function enforceHostOnlyBooleanGuards(
@@ -1072,7 +1169,10 @@ async function runHelp(invocation: CliInvocation): Promise<void> {
       commands: [
         { name: "help", description: "Show Rigkit CLI help" },
         { name: "init", description: "Initialize a Rigkit project" },
-        { name: "<operation>", description: "Run a project operation exposed by the runtime" },
+        { name: "plan", description: "Plan project workflow changes" },
+        { name: "apply", description: "Apply project workflow changes" },
+        { name: "create", description: "Create a workspace" },
+        { name: "run", description: "Run a workspace operation" },
         { name: "ls", description: "List project workspaces" },
         { name: "projects", description: "Discover Rigkit projects below the current directory" },
         { name: "doctor", description: "Show Rigkit runtime diagnostics" },
@@ -1086,12 +1186,15 @@ async function runHelp(invocation: CliInvocation): Promise<void> {
     `rig ${RIGKIT_CLI_VERSION}`,
     "",
     "Usage:",
-    "  rig [options] <command|operation>",
+    "  rig [options] <command>",
     "",
     "Commands:",
     "  help        Show Rigkit CLI help",
     "  init        Initialize a Rigkit project",
-    "  <operation> Run a project operation exposed by the runtime",
+    "  plan        Plan project workflow changes",
+    "  apply       Apply project workflow changes",
+    "  create      Create a workspace",
+    "  run         Run a workspace operation",
     "  ls          List project workspaces",
     "  projects    Discover Rigkit projects below the current directory",
     "  doctor      Show Rigkit runtime diagnostics",
@@ -1773,6 +1876,11 @@ function printJson(value: unknown): void {
   console.log(JSON.stringify(value, null, 2));
 }
 
+function printInteractiveOutputGap(invocation: CliInvocation): void {
+  if (wantsJson(invocation) || !process.stdout.isTTY) return;
+  console.log("");
+}
+
 function printPlan(plan: WorkflowPlan): void {
   console.log(`${plan.workflow}: ${plan.cachedNodeCount}/${plan.nodeCount} nodes cached`);
 

package/src/completion.test.ts

@@ -3,7 +3,7 @@ import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { projectIdFor, runtimeFingerprintFor, runtimePaths, SUPPORTED_RUNTIME_API_VERSION } from "@rigkit/runtime-client";
-import { completeRig, formatCompletionItems, renderCompletionScript } from "./completion.ts";
+import { completeRig, formatCompletionItems, formatWorkspaceAge, renderCompletionScript } from "./completion.ts";
 
 describe("CLI completion", () => {
   test("completes workspace targets from the runtime", async () => {
@@ -11,12 +11,12 @@ describe("CLI completion", () => {
     await withWorkspaceRuntime({ projectDir }, async () => {
       const items = await completeRig({
         cwd: projectDir,
-        words: ["rig", "ssh", ""],
+        words: ["rig", "run", ""],
         currentIndex: 2,
       });
 
       expect(items.map((item) => item.value)).toEqual(["api", "web"]);
-      expect(items[0]?.description).toBe("smoke");
+      expect(items[0]?.description).toBe("smoke - 2h old");
     });
   });
 
@@ -25,7 +25,7 @@ describe("CLI completion", () => {
     await withWorkspaceRuntime({ projectDir }, async () => {
       const items = await completeRig({
         cwd: projectDir,
-        words: ["rig", "ssh", "vm-"],
+        words: ["rig", "run", "vm-"],
         currentIndex: 2,
       });
 
@@ -39,7 +39,7 @@ describe("CLI completion", () => {
     await withWorkspaceRuntime({ projectDir, cleanupDir: parentDir }, async () => {
       const items = await completeRig({
         cwd: parentDir,
-        words: ["rig", "-C", "project", "ssh", ""],
+        words: ["rig", "-C", "project", "run", ""],
         currentIndex: 4,
       });
 
@@ -55,15 +55,42 @@ describe("CLI completion", () => {
         words: ["rig", "run", ""],
         currentIndex: 2,
       });
-      expect(roots.map((item) => item.value)).toContain("api/");
-      expect(roots.map((item) => item.value)).toContain("ssh");
+      expect(roots.map((item) => item.value)).toEqual(["api", "web"]);
+      expect(roots[0]).toMatchObject({ description: "smoke - 2h old" });
 
-      const operations = await completeRig({
+      const exactWorkspace = await completeRig({
         cwd: projectDir,
-        words: ["rig", "run", "api/"],
+        words: ["rig", "run", "api"],
         currentIndex: 2,
       });
-      expect(operations.map((item) => item.value)).toEqual(["api/remove", "api/open-cmux"]);
+      expect(exactWorkspace.map((item) => item.value)).toEqual(["api"]);
+
+      const workspaceAfterSpace = await completeRig({
+        cwd: projectDir,
+        words: ["rig", "run", "api", ""],
+        currentIndex: 3,
+      });
+      expect(workspaceAfterSpace.map((item) => item.value)).toEqual(["remove", "open-cmux"]);
+
+      const operationPrefix = await completeRig({
+        cwd: projectDir,
+        words: ["rig", "run", "api", "open"],
+        currentIndex: 3,
+      });
+      expect(operationPrefix.map((item) => item.value)).toEqual(["open-cmux"]);
+    });
+  });
+
+  test("completes top-level project commands at the root command position", async () => {
+    const projectDir = mkdtempSync(join(tmpdir(), "rigkit-completion-"));
+    await withWorkspaceRuntime({ projectDir }, async () => {
+      const items = await completeRig({
+        cwd: projectDir,
+        words: ["rig", "p"],
+        currentIndex: 1,
+      });
+
+      expect(items.map((item) => item.value)).toEqual(["plan", "projects"]);
     });
   });
 
@@ -72,7 +99,21 @@ describe("CLI completion", () => {
 
     expect(formatCompletionItems(items, "bash")).toBe("api");
     expect(formatCompletionItems(items, "zsh")).toBe("api\tvm-api");
+    expect(formatCompletionItems([{ value: "api", description: "workspace smoke", noSpace: true }], "zsh"))
+      .toBe("api\tworkspace smoke\tnospace");
     expect(renderCompletionScript("zsh")).toContain("rig __complete");
+    expect(renderCompletionScript("zsh")).toContain("compadd -S ''");
+    expect(renderCompletionScript("zsh")).toContain('display="${value} -- ${description}"');
+  });
+
+  test("formats workspace ages", () => {
+    const now = Date.parse("2026-05-14T12:00:00.000Z");
+
+    expect(formatWorkspaceAge("2026-05-14T11:59:45.000Z", now)).toBe("just now");
+    expect(formatWorkspaceAge("2026-05-14T11:30:00.000Z", now)).toBe("30m old");
+    expect(formatWorkspaceAge("2026-05-14T09:00:00.000Z", now)).toBe("3h old");
+    expect(formatWorkspaceAge("2026-05-11T12:00:00.000Z", now)).toBe("3d old");
+    expect(formatWorkspaceAge("not-a-date", now)).toBeUndefined();
   });
 
   test("completes ls targets", async () => {
@@ -124,7 +165,10 @@ async function withWorkspaceRuntime(
         });
       }
       if (pathname === "/workspaces") {
-        const now = new Date(0).toISOString();
+        const nowMs = Date.now();
+        const apiCreatedAt = new Date(nowMs - 2 * 60 * 60 * 1000).toISOString();
+        const webCreatedAt = new Date(nowMs - 5 * 60 * 1000).toISOString();
+        const updatedAt = new Date(nowMs).toISOString();
         return runtimeJson({
           workspaces: [
             {
@@ -132,16 +176,16 @@ async function withWorkspaceRuntime(
               name: "api",
               workflow: "smoke",
               ctx: {},
-              createdAt: now,
-              updatedAt: now,
+              createdAt: apiCreatedAt,
+              updatedAt,
             },
             {
               id: "workspace-web",
               name: "web",
               workflow: "smoke",
               ctx: {},
-              createdAt: now,
-              updatedAt: now,
+              createdAt: webCreatedAt,
+              updatedAt,
             },
           ],
         });

package/src/completion.ts

@@ -6,6 +6,7 @@ export type CompletionShell = "bash" | "fish" | "zsh";
 export type CompletionItem = {
   value: string;
   description?: string;
+  noSpace?: boolean;
 };
 
 type CompleteRigInput = {
@@ -17,7 +18,10 @@ type CompleteRigInput = {
 const COMMANDS: CompletionItem[] = [
   { value: "help", description: "show CLI help" },
   { value: "init", description: "initialize a Rigkit project" },
-  { value: "run", description: "run a project operation" },
+  { value: "plan", description: "plan project workflow changes" },
+  { value: "apply", description: "apply project workflow changes" },
+  { value: "create", description: "create a workspace" },
+  { value: "run", description: "run a workspace operation" },
   { value: "ls", description: "list project workspaces" },
   { value: "projects", description: "discover Rigkit projects" },
   { value: "doctor", description: "show runtime diagnostics" },
@@ -45,11 +49,22 @@ const COMMAND_OPTIONS: Record<string, CompletionItem[]> = {
     { value: "--force", description: "overwrite existing config" },
     { value: "--json", description: "print JSON" },
   ],
-  operation: [
+  plan: [
     { value: "--all", description: "run against every discovered project" },
     { value: "--discover", description: "discover projects below the selected directory" },
     { value: "--json", description: "print JSON" },
   ],
+  apply: [
+    { value: "--all", description: "run against every discovered project" },
+    { value: "--discover", description: "discover projects below the selected directory" },
+    { value: "--json", description: "print JSON" },
+  ],
+  create: [
+    { value: "--json", description: "print JSON" },
+  ],
+  run: [
+    { value: "--json", description: "print JSON" },
+  ],
   ls: [
     { value: "workspaces", description: "list workspaces" },
     { value: "snapshots", description: "list snapshots" },
@@ -66,6 +81,8 @@ const COMMAND_OPTIONS: Record<string, CompletionItem[]> = {
   ],
 };
 
+const PROJECT_OPERATION_COMMANDS = new Set(["plan", "apply", "create"]);
+
 const OPTIONS_WITH_VALUES = new Set([
   "-C",
   "--project",
@@ -91,6 +108,13 @@ type RuntimeOperationDefinition = {
   };
 };
 
+type RuntimeWorkspaceCompletion = {
+  name: string;
+  workflow: string;
+  createdAt: string;
+  updatedAt: string;
+};
+
 export async function completeRig(input: CompleteRigInput): Promise<CompletionItem[]> {
   const cwd = input.cwd ?? process.cwd();
   const words = input.words.length > 0 ? input.words : ["rig"];
@@ -102,66 +126,49 @@ export async function completeRig(input: CompleteRigInput): Promise<CompletionIt
   if (expectsOptionValue(before)) return [];
 
   if (!command) {
-    const rootOperation = parseRootOperation(before);
-    if (rootOperation.operation) {
-      if (current.startsWith("-")) {
-        const operation = await safeResolveRuntimeOperation(resolveProjectDir(words, cwd), rootOperation.operation);
-        return filterItems([
-          ...(operation?.cli?.options ?? []).flatMap((option) => [
-            { value: option.flag, description: option.name },
-            ...(option.aliases ?? []).map((alias) => ({ value: alias, description: option.name })),
-          ]),
-          ...COMMAND_OPTIONS.operation,
-          ...GLOBAL_OPTIONS,
-        ], current);
-      }
-      const operation = await safeResolveRuntimeOperation(resolveProjectDir(words, cwd), rootOperation.operation);
-      const operationPositionalCount = countRunOperationPositionals(rootOperation.args);
-      const positional = operation?.cli?.positionals?.find((item) => item.index === operationPositionalCount);
-      if (positional && /workspace|vm/i.test(positional.name)) {
-        return filterItems(await workspaceTargets(resolveProjectDir(words, cwd), current, /vm/i.test(positional.name)), current);
-      }
-      return [];
-    }
     return filterItems(
       current.startsWith("-")
         ? GLOBAL_OPTIONS
-        : [...COMMANDS, ...await safeOperationTargets(resolveProjectDir(words, cwd), current), ...GLOBAL_OPTIONS],
+        : [...COMMANDS, ...GLOBAL_OPTIONS],
       current,
     );
   }
 
   if (current.startsWith("-")) {
     if (command === "run") {
-      const run = parseRunCommand(before);
-      if (run.operation) {
-        const operation = await safeResolveRuntimeOperation(resolveProjectDir(words, cwd), run.operation);
+      const run = parseWorkspaceRunCommand(before);
+      if (run.workspace && run.operation) {
+        const operation = await safeResolveWorkspaceOperation(resolveProjectDir(words, cwd), run.operation);
         return filterItems([
           ...(operation?.cli?.options ?? []).flatMap((option) => [
             { value: option.flag, description: option.name },
             ...(option.aliases ?? []).map((alias) => ({ value: alias, description: option.name })),
           ]),
-          ...COMMAND_OPTIONS.operation,
+          ...COMMAND_OPTIONS.run,
           ...GLOBAL_OPTIONS,
         ], current);
       }
     }
+    if (PROJECT_OPERATION_COMMANDS.has(command)) {
+      const operation = await safeResolveRuntimeOperation(resolveProjectDir(words, cwd), command);
+      return filterItems([
+        ...(operation?.cli?.options ?? []).flatMap((option) => [
+          { value: option.flag, description: option.name },
+          ...(option.aliases ?? []).map((alias) => ({ value: alias, description: option.name })),
+        ]),
+        ...(COMMAND_OPTIONS[command] ?? []),
+        ...GLOBAL_OPTIONS,
+      ], current);
+    }
     return filterItems([...(COMMAND_OPTIONS[command] ?? []), ...GLOBAL_OPTIONS], current);
   }
 
   const positionalCount = countPositionals(before, command);
 
   if (command === "run") {
-    const run = parseRunCommand(before);
-    if (!run.operation) {
-      return filterItems(await safeOperationTargets(resolveProjectDir(words, cwd), current), current);
-    }
-    const operation = await safeResolveRuntimeOperation(resolveProjectDir(words, cwd), run.operation);
-    const operationPositionalCount = countRunOperationPositionals(run.args);
-    const positional = operation?.cli?.positionals?.find((item) => item.index === operationPositionalCount);
-    if (positional && /workspace|vm/i.test(positional.name)) {
-      return filterItems(await workspaceTargets(resolveProjectDir(words, cwd), current, /vm/i.test(positional.name)), current);
-    }
+    const run = parseWorkspaceRunCommand(before);
+    if (!run.workspace) return filterItems(await workspaceTargets(resolveProjectDir(words, cwd)), current);
+    if (!run.operation) return filterItems(await safeWorkspaceOperationTargets(resolveProjectDir(words, cwd)), current);
   }
 
   if (command === "completion" && positionalCount === 0) {
@@ -178,6 +185,9 @@ export async function completeRig(input: CompleteRigInput): Promise<CompletionIt
 export function formatCompletionItems(items: CompletionItem[], shell: CompletionShell): string {
   const lines = items.map((item) => {
     if (shell === "bash") return item.value;
+    if (shell === "zsh" && item.noSpace) {
+      return `${item.value}\t${item.description ?? ""}\tnospace`;
+    }
     return item.description ? `${item.value}\t${item.description}` : item.value;
   });
   return lines.join("\n");
@@ -217,22 +227,37 @@ complete -c rig -f -a "(__rig_complete)"
 `;
   }
 
-  return `#compdef rig
+return `#compdef rig
 # rig zsh completion
 _rig() {
-  local -a raw completions
-  local line value description
+  local -a raw values displays nospace_values nospace_displays
+  local line value description rest marker display
   raw=("\${(@f)$(command rig __complete --shell zsh --index $((CURRENT - 1)) -- "\${words[@]}" 2>/dev/null)}")
   for line in "\${raw[@]}"; do
     value="\${line%%$'\\t'*}"
+    description=""
+    marker=""
     if [[ "$line" == *$'\\t'* ]]; then
-      description="\${line#*$'\\t'}"
-      completions+=("\${value}:\${description}")
+      rest="\${line#*$'\\t'}"
+      description="\${rest%%$'\\t'*}"
+      if [[ "$rest" == *$'\\t'* ]]; then
+        marker="\${rest#*$'\\t'}"
+      fi
+    fi
+    display="\${value}"
+    if [[ -n "$description" ]]; then
+      display="\${value} -- \${description}"
+    fi
+    if [[ "$marker" == "nospace" ]]; then
+      nospace_values+=("\${value}")
+      nospace_displays+=("\${display}")
     else
-      completions+=("\${value}")
+      values+=("\${value}")
+      displays+=("\${display}")
     fi
   done
-  _describe 'rig' completions
+  (( \${#nospace_values} )) && compadd -S '' -d nospace_displays -a nospace_values
+  (( \${#values} )) && compadd -d displays -a values
 }
 compdef _rig rig
 `;
@@ -278,7 +303,7 @@ function countPositionals(words: string[], command: string): number {
   return count;
 }
 
-function parseRunCommand(words: string[]): { operation?: string; args: string[] } {
+function parseWorkspaceRunCommand(words: string[]): { workspace?: string; operation?: string; args: string[] } {
   let foundRun = false;
   const args: string[] = [];
   for (let index = 0; index < words.length; index += 1) {
@@ -295,37 +320,7 @@ function parseRunCommand(words: string[]): { operation?: string; args: string[]
     }
     args.push(word);
   }
-  return { operation: args[0], args: args.slice(1) };
-}
-
-function parseRootOperation(words: string[]): { operation?: string; args: string[] } {
-  const args: string[] = [];
-  for (let index = 0; index < words.length; index += 1) {
-    const word = words[index]!;
-    if (OPTIONS_WITH_VALUES.has(word)) {
-      index += 1;
-      continue;
-    }
-    if (word.startsWith("--") && word.includes("=")) continue;
-    if (word.startsWith("-")) continue;
-    args.push(word);
-  }
-  return { operation: args[0], args: args.slice(1) };
-}
-
-function countRunOperationPositionals(args: string[]): number {
-  let count = 0;
-  for (let index = 0; index < args.length; index += 1) {
-    const arg = args[index]!;
-    if (OPTIONS_WITH_VALUES.has(arg)) {
-      index += 1;
-      continue;
-    }
-    if (arg.startsWith("--") && arg.includes("=")) continue;
-    if (arg.startsWith("-")) continue;
-    count += 1;
-  }
-  return count;
+  return { workspace: args[0], operation: args[1], args: args.slice(2) };
 }
 
 function expectsOptionValue(words: string[]): boolean {
@@ -362,92 +357,85 @@ function projectPaths(projectDir: string): { projectDir: string; configPath: str
 
 async function workspaceTargets(
   paths: { projectDir: string; configPath: string },
-  _current: string,
-  _includeVmIds: boolean,
 ): Promise<CompletionItem[]> {
   const workspaces = await readWorkspaces(paths);
   const items = workspaces.map((workspace) => ({
     value: workspace.name,
-    description: workspace.workflow,
+    description: workspaceDescription(workspace, { prefix: false }),
   }));
 
   return dedupeItems(items);
 }
 
-async function readWorkspaces(paths: { projectDir: string; configPath: string }): Promise<Array<{ name: string; workflow: string }>> {
+async function readWorkspaces(paths: { projectDir: string; configPath: string }): Promise<RuntimeWorkspaceCompletion[]> {
   const runtime = await getOrStartRuntime(paths);
   const { workspaces } = await runtime.control.workspaces();
   return workspaces.map((workspace) => ({
     name: workspace.name,
     workflow: workspace.workflow,
+    createdAt: workspace.createdAt,
+    updatedAt: workspace.updatedAt,
   }));
 }
 
-async function operationTargets(
+async function safeWorkspaceOperationTargets(
   paths: { projectDir: string; configPath: string },
-  current: string,
 ): Promise<CompletionItem[]> {
-  const manifest = await readOperations(paths);
-  if (current.includes("/")) {
-    return workspaceOperationTargets(manifest, current);
+  try {
+    const manifest = await readOperations(paths);
+    return workspaceOperationTargets(manifest);
+  } catch {
+    return [];
   }
-  const workspaces = await readWorkspaces(paths).catch(() => []);
-  return manifest.operations.flatMap((operation) => [
-    { value: operation.id, description: operation.description },
-    ...(operation.aliases ?? []).map((alias) => ({ value: alias, description: operation.description })),
-  ]).concat(workspaces.map((workspace) => ({
-    value: `${workspace.name}/`,
-    description: `workspace ${workspace.workflow}`,
-  })));
 }
 
-function workspaceOperationTargets(manifest: RuntimeOperationManifest, current: string): CompletionItem[] {
-  const slash = current.indexOf("/");
-  if (slash < 0) return [];
-  const workspace = current.slice(0, slash);
-  if (!workspace) return [];
+function workspaceOperationTargets(manifest: RuntimeOperationManifest): CompletionItem[] {
   return (manifest.workspaceOperations ?? []).flatMap((operation) => [
-    { value: `${workspace}/${operation.id}`, description: operation.description ?? "workspace operation" },
+    { value: operation.id, description: operation.description ?? "workspace operation" },
     ...(operation.aliases ?? []).map((alias) => ({
-      value: `${workspace}/${alias}`,
+      value: alias,
       description: operation.description ?? "workspace operation",
     })),
   ]);
 }
 
-async function safeOperationTargets(
+async function resolveRuntimeOperation(
   paths: { projectDir: string; configPath: string },
-  current: string,
-): Promise<CompletionItem[]> {
+  operationId: string,
+): Promise<RuntimeOperationDefinition | undefined> {
+  const manifest = await readOperations(paths);
+  return manifest.operations.find((operation) =>
+    operation.id === operationId || operation.aliases?.includes(operationId)
+  );
+}
+
+async function safeResolveRuntimeOperation(
+  paths: { projectDir: string; configPath: string },
+  operationId: string,
+): Promise<RuntimeOperationDefinition | undefined> {
   try {
-    return await operationTargets(paths, current);
+    return await resolveRuntimeOperation(paths, operationId);
   } catch {
-    return [];
+    return undefined;
   }
 }
 
-async function resolveRuntimeOperation(
+async function resolveWorkspaceOperation(
   paths: { projectDir: string; configPath: string },
   operationId: string,
 ): Promise<RuntimeOperationDefinition | undefined> {
   const manifest = await readOperations(paths);
-  const workspaceOperation = parseWorkspaceOperationId(operationId);
-  if (workspaceOperation) {
-    return (manifest.workspaceOperations ?? []).find((operation) =>
-      operation.id === workspaceOperation.operation || operation.aliases?.includes(workspaceOperation.operation)
-    );
-  }
-  return manifest.operations.find((operation) =>
+  return (manifest.workspaceOperations ?? []).find((operation) =>
     operation.id === operationId || operation.aliases?.includes(operationId)
   );
 }
 
-async function safeResolveRuntimeOperation(
+async function safeResolveWorkspaceOperation(
   paths: { projectDir: string; configPath: string },
   operationId: string,
 ): Promise<RuntimeOperationDefinition | undefined> {
   try {
-    return await resolveRuntimeOperation(paths, operationId);
+    return await resolveWorkspaceOperation(paths, operationId);
   } catch {
     return undefined;
   }
@@ -458,15 +446,6 @@ async function readOperations(paths: { projectDir: string; configPath: string })
   return await runtime.control.operations() as unknown as RuntimeOperationManifest;
 }
 
-function parseWorkspaceOperationId(value: string): { workspace: string; operation: string } | undefined {
-  const slash = value.indexOf("/");
-  if (slash <= 0 || slash === value.length - 1) return undefined;
-  return {
-    workspace: value.slice(0, slash),
-    operation: value.slice(slash + 1),
-  };
-}
-
 function filterItems(items: CompletionItem[], current: string): CompletionItem[] {
   return dedupeItems(items).filter((item) => item.value.startsWith(current));
 }
@@ -481,3 +460,31 @@ function dedupeItems(items: CompletionItem[]): CompletionItem[] {
   }
   return deduped;
 }
+
+function workspaceDescription(workspace: RuntimeWorkspaceCompletion, options: { prefix: boolean }): string {
+  const label = options.prefix ? `workspace ${workspace.workflow}` : workspace.workflow;
+  const age = formatWorkspaceAge(workspace.createdAt);
+  return age ? `${label} - ${age}` : label;
+}
+
+export function formatWorkspaceAge(createdAt: string, nowMs = Date.now()): string | undefined {
+  const createdAtMs = Date.parse(createdAt);
+  if (!Number.isFinite(createdAtMs)) return undefined;
+
+  const elapsedSeconds = Math.max(0, Math.floor((nowMs - createdAtMs) / 1000));
+  if (elapsedSeconds < 60) return "just now";
+
+  const elapsedMinutes = Math.floor(elapsedSeconds / 60);
+  if (elapsedMinutes < 60) return `${elapsedMinutes}m old`;
+
+  const elapsedHours = Math.floor(elapsedMinutes / 60);
+  if (elapsedHours < 48) return `${elapsedHours}h old`;
+
+  const elapsedDays = Math.floor(elapsedHours / 24);
+  if (elapsedDays < 30) return `${elapsedDays}d old`;
+
+  const elapsedMonths = Math.floor(elapsedDays / 30);
+  if (elapsedMonths < 24) return `${elapsedMonths}mo old`;
+
+  return `${Math.floor(elapsedMonths / 12)}y old`;
+}

package/src/version.ts

@@ -1 +1 @@
-export const RIGKIT_CLI_VERSION = "0.2.4";
+export const RIGKIT_CLI_VERSION = "0.2.6";

package/src/workspace-name.test.ts

@@ -0,0 +1,17 @@
+import { describe, expect, test } from "bun:test";
+import { generateWorkspaceName } from "./workspace-name.ts";
+
+describe("workspace name defaults", () => {
+  test("generates shell-safe adjective noun names", () => {
+    expect(generateWorkspaceName([], () => 0)).toBe("snowy-ridge");
+  });
+
+  test("skips generated names that already exist", () => {
+    const randomValues = [0, 0, 0.5, 0.5];
+    let index = 0;
+    const name = generateWorkspaceName(["snowy-ridge"], () => randomValues[index++] ?? 0.5);
+
+    expect(name).not.toBe("snowy-ridge");
+    expect(name).toMatch(/^(?!-)[A-Za-z0-9._-]+$/);
+  });
+});

package/src/workspace-name.ts

@@ -0,0 +1,59 @@
+const adjectives = [
+  "snowy",
+  "bright",
+  "quiet",
+  "rapid",
+  "silver",
+  "clear",
+  "steady",
+  "bold",
+  "lucky",
+  "fresh",
+  "golden",
+  "nimble",
+  "calm",
+  "brisk",
+  "sharp",
+  "sunny",
+] as const;
+
+const nouns = [
+  "ridge",
+  "harbor",
+  "signal",
+  "orbit",
+  "bridge",
+  "summit",
+  "field",
+  "grove",
+  "spark",
+  "stone",
+  "valley",
+  "meadow",
+  "trail",
+  "cove",
+  "anchor",
+  "beacon",
+] as const;
+
+export function generateWorkspaceName(
+  existingNames: Iterable<string> = [],
+  random: () => number = Math.random,
+): string {
+  const existing = new Set(existingNames);
+
+  for (let attempt = 0; attempt < 100; attempt += 1) {
+    const name = `${pick(adjectives, random)}-${pick(nouns, random)}`;
+    if (!existing.has(name)) return name;
+  }
+
+  return `workspace-${Date.now().toString(36)}-${Math.floor(random() * 10000).toString(36)}`;
+}
+
+function pick<const Values extends readonly string[]>(
+  values: Values,
+  random: () => number,
+): Values[number] {
+  const index = Math.min(values.length - 1, Math.floor(random() * values.length));
+  return values[index]!;
+}