@rigkit/cli 0.2.2 → 0.2.3

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.
 
-`rig ssh <workspace>` runs the workflow's uncached `workspace.onOpen` hook before attaching or printing the SSH command.
+Workspace-specific operations run as `rig <workspace>/<operation>`, for example `rig website-workspace/open-cmux` or `rig 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.2",
+  "version": "0.2.3",
   "type": "module",
   "repository": {
     "type": "git",
@@ -25,9 +25,9 @@
     "log-symbols": "^7.0.1",
     "log-update": "^8.0.0",
     "ora": "^9.4.0",
-    "@rigkit/runtime-client": "0.2.2",
-    "@rigkit/provider-cmux": "0.2.2",
-    "@rigkit/engine": "0.2.2"
+    "@rigkit/engine": "0.2.3",
+    "@rigkit/runtime-client": "0.2.3",
+    "@rigkit/provider-cmux": "0.2.3"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/cli.test.ts

@@ -83,8 +83,8 @@ describe("CLI entrypoint", () => {
 
       expect(result.exitCode).toBe(0);
       expect(result.stderr).toBe("");
-      expect(result.stdout).toContain("name  resource  snapshot  workflow");
-      expect(result.stdout).toContain("api   vm-api    snap-api  smoke");
+      expect(result.stdout).toContain("name  workflow");
+      expect(result.stdout).toContain("api   smoke");
     });
   });
 
@@ -100,8 +100,7 @@ describe("CLI entrypoint", () => {
         workspaces: [{
           name: "api",
           workflow: "smoke",
-          resourceId: "vm-api",
-          snapshotId: "snap-api",
+          ctx: {},
         }],
       });
     });
@@ -210,14 +209,8 @@ async function withWorkspaceRuntime(
           workspaces: [{
             id: "workspace-api",
             name: "api",
-            providerId: "freestyle",
             workflow: "smoke",
-            resourceId: "vm-api",
-            snapshotId: "snap-api",
-            sourceRef: null,
-            context: {},
-            metadata: {},
-            data: {},
+            ctx: {},
             createdAt: now,
             updatedAt: now,
           }],

package/src/cli.ts

@@ -94,15 +94,8 @@ type EngineProjectInfo = {
 };
 
 type RuntimeOperationManifest = {
-  hostMethods?: {
-    known?: Array<{ id: string; modes?: string[] }>;
-    requiredByOperations?: Record<string, string[]>;
-  };
-  hostCapabilities?: {
-    optional?: Array<{ id: string; schemaHash?: string }>;
-    requiredByOperations?: Record<string, string[]>;
-  };
   operations: RuntimeOperationDefinition[];
+  workspaceOperations?: RuntimeOperationDefinition[];
 };
 
 type RuntimeOperationDefinition = {
@@ -111,8 +104,6 @@ type RuntimeOperationDefinition = {
   title?: string;
   description?: string;
   createsWorkspace?: boolean;
-  requiredHostMethods?: Array<{ id: string; modes?: string[] }>;
-  requiredHostCapabilities?: Array<{ id: string; schemaHash?: string }>;
   cli?: {
     positionals?: Array<{ name: string; index: number }>;
     options?: Array<{
@@ -801,18 +792,18 @@ async function executeRuntimeOperation(
   result: unknown;
 }> {
   const manifest = await readRuntimeOperations(runtime);
-  const operation = findRuntimeOperation(manifest.operations, requestedOperation);
-  if (!operation) {
+  const resolved = findRuntimeOperation(manifest, requestedOperation);
+  if (!resolved) {
     throw new Error(`This project does not define a Rigkit operation named "${requestedOperation}".`);
   }
+  const { operation, runOperation } = resolved;
 
-  preflightHostSupport(operation);
   const parsed = parseOperationArgs(operation, args);
   enforceHostOnlyBooleanGuards(operation, parsed);
 
   const result = await runRuntimeOperation<unknown>(
     runtime,
-    operation.id,
+    runOperation,
     parsed.input,
     { renderEvents: !wantsJson(invocation) },
   );
@@ -821,50 +812,28 @@ async function executeRuntimeOperation(
 }
 
 function findRuntimeOperation(
-  operations: RuntimeOperationDefinition[],
+  manifest: RuntimeOperationManifest,
   requestedOperation: string,
-): RuntimeOperationDefinition | undefined {
-  return operations.find((operation) =>
-    operation.id === requestedOperation || operation.aliases?.includes(requestedOperation)
-  );
-}
-
-function preflightHostSupport(operation: RuntimeOperationDefinition): void {
-  const unsupportedMethod = operation.requiredHostMethods?.find((method) => {
-    const supported = CLI_HOST_METHODS.find((item) => item.id === method.id);
-    return !supported || !supportsModes(supported.modes, method.modes);
-  });
-  if (unsupportedMethod) {
-    throw new Error(
-      `Operation "${operation.id}" requires host method "${formatMethodRequirement(unsupportedMethod)}". ` +
-        `Upgrade Rigkit or use a host that supports this method.`,
-    );
+): { 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 unsupportedCapability = operation.requiredHostCapabilities?.find((capability) => {
-    const supported = CLI_HOST_CAPABILITIES.find((item) => item.id === capability.id);
-    return !supported || (capability.schemaHash && supported.schemaHash !== capability.schemaHash);
-  });
-  if (unsupportedCapability) {
-    throw new Error(
-      `Operation "${operation.id}" requires host capability "${formatCapabilityRequirement(unsupportedCapability)}". ` +
-        `Install or enable a local host capability handler to use it from this host.`,
-    );
-  }
-}
-
-function supportsModes(hostModes: string[] | undefined, requiredModes: string[] | undefined): boolean {
-  if (!requiredModes?.length) return true;
-  const supported = new Set(hostModes ?? []);
-  return requiredModes.every((mode) => supported.has(mode));
-}
-
-function formatMethodRequirement(method: { id: string; modes?: string[] }): string {
-  return method.modes?.length ? `${method.id}:${method.modes.join("|")}` : method.id;
+  const operation = manifest.operations.find((operation) =>
+    operation.id === requestedOperation || operation.aliases?.includes(requestedOperation)
+  );
+  return operation ? { operation, runOperation: operation.id } : undefined;
 }
 
-function formatCapabilityRequirement(capability: { id: string; schemaHash?: string }): string {
-  return capability.schemaHash ? `${capability.id}@${capability.schemaHash}` : capability.id;
+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 parseOperationArgs(operation: RuntimeOperationDefinition, args: string[]): ParsedOperationInput {
@@ -1016,12 +985,12 @@ async function renderOperationResult(
       console.log("No changes applied.");
       return;
     }
-    console.log(`resolved ${result.plan.workflow} -> ${String(result.snapshotId ?? "no workspace source")}`);
+    console.log(`resolved ${result.plan.workflow}`);
     return;
   }
 
   if (operation.createsWorkspace && isWorkspaceRecord(result)) {
-    console.log(`${result.name} ${result.resourceId}`);
+    console.log(result.name);
     return;
   }
 
@@ -1036,16 +1005,8 @@ async function renderOperationResult(
     return;
   }
 
-  if (isRecord(result)) {
-    const metadata = isRecord(result.metadata) ? result.metadata : {};
-    if (typeof metadata.snapshotId === "string") {
-      console.log(metadata.snapshotId);
-      return;
-    }
-  }
-
   if (isWorkspaceRecord(result)) {
-    console.log(`${result.name} ${result.resourceId}`);
+    console.log(result.name);
     return;
   }
 
@@ -1738,8 +1699,8 @@ function isWorkflowPlan(value: unknown): value is WorkflowPlan {
 function isWorkspaceRecord(value: unknown): value is WorkspaceRecord {
   return isRecord(value) &&
     typeof value.name === "string" &&
-    typeof value.resourceId === "string" &&
-    typeof value.workflow === "string";
+    typeof value.workflow === "string" &&
+    isRecord(value.ctx);
 }
 
 function isDevMachineEvent(value: unknown): value is DevMachineEvent {
@@ -1791,7 +1752,7 @@ function printPlan(plan: WorkflowPlan): void {
 }
 
 function printWorkspaces(
-  workspaces: ReadonlyArray<Pick<WorkspaceRecord, "name" | "workflow" | "snapshotId" | "createdAt"> & { resourceId?: string }>,
+  workspaces: ReadonlyArray<Pick<WorkspaceRecord, "name" | "workflow" | "createdAt">>,
 ): void {
   if (workspaces.length === 0) {
     console.log("No workspaces.");
@@ -1799,11 +1760,9 @@ function printWorkspaces(
   }
 
   printTable(
-    ["name", "resource", "snapshot", "workflow", "created"],
+    ["name", "workflow", "created"],
     workspaces.map((workspace) => [
       workspace.name,
-      workspace.resourceId ?? "",
-      workspace.snapshotId ?? "",
       workspace.workflow,
       workspace.createdAt,
     ]),
@@ -1903,7 +1862,7 @@ function renderEvent(event: DevMachineEvent): void {
       console.error(`artifact ${event.providerId}:${event.kind}`);
       return;
     case "workspace.ready":
-      console.error(`workspace ${event.workspaceId} -> ${event.resourceId}`);
+      console.error(`workspace ${event.workspaceId} ready`);
       return;
     default:
       return;

package/src/completion.test.ts

@@ -6,7 +6,7 @@ import { projectIdFor, runtimeFingerprintFor, runtimePaths, SUPPORTED_RUNTIME_AP
 import { completeRig, formatCompletionItems, renderCompletionScript } from "./completion.ts";
 
 describe("CLI completion", () => {
-  test("completes ssh workspace targets from the runtime", async () => {
+  test("completes workspace targets from the runtime", async () => {
     const projectDir = mkdtempSync(join(tmpdir(), "rigkit-completion-"));
     await withWorkspaceRuntime({ projectDir }, async () => {
       const items = await completeRig({
@@ -16,11 +16,11 @@ describe("CLI completion", () => {
       });
 
       expect(items.map((item) => item.value)).toEqual(["api", "web"]);
-      expect(items[0]?.description).toBe("vm-api");
+      expect(items[0]?.description).toBe("smoke");
     });
   });
 
-  test("completes ssh resource ids when the current token starts like a resource id", async () => {
+  test("does not complete provider resource ids as workspace targets", async () => {
     const projectDir = mkdtempSync(join(tmpdir(), "rigkit-completion-"));
     await withWorkspaceRuntime({ projectDir }, async () => {
       const items = await completeRig({
@@ -29,7 +29,7 @@ describe("CLI completion", () => {
         currentIndex: 2,
       });
 
-      expect(items.map((item) => item.value)).toEqual(["vm-api", "vm-web"]);
+      expect(items).toEqual([]);
     });
   });
 
@@ -47,6 +47,26 @@ describe("CLI completion", () => {
     });
   });
 
+  test("completes workspace operation targets", async () => {
+    const projectDir = mkdtempSync(join(tmpdir(), "rigkit-completion-"));
+    await withWorkspaceRuntime({ projectDir }, async () => {
+      const roots = await completeRig({
+        cwd: projectDir,
+        words: ["rig", "run", ""],
+        currentIndex: 2,
+      });
+      expect(roots.map((item) => item.value)).toContain("api/");
+      expect(roots.map((item) => item.value)).toContain("ssh");
+
+      const operations = await completeRig({
+        cwd: projectDir,
+        words: ["rig", "run", "api/"],
+        currentIndex: 2,
+      });
+      expect(operations.map((item) => item.value)).toEqual(["api/remove", "api/open-cmux"]);
+    });
+  });
+
   test("formats shell completion items", () => {
     const items = [{ value: "api", description: "vm-api" }];
 
@@ -110,26 +130,16 @@ async function withWorkspaceRuntime(
             {
               id: "workspace-api",
               name: "api",
-              providerId: "freestyle",
               workflow: "smoke",
-              resourceId: "vm-api",
-              sourceRef: null,
-              context: {},
-              metadata: {},
-              data: {},
+              ctx: {},
               createdAt: now,
               updatedAt: now,
             },
             {
               id: "workspace-web",
               name: "web",
-              providerId: "freestyle",
               workflow: "smoke",
-              resourceId: "vm-web",
-              sourceRef: null,
-              context: {},
-              metadata: {},
-              data: {},
+              ctx: {},
               createdAt: now,
               updatedAt: now,
             },
@@ -138,14 +148,6 @@ async function withWorkspaceRuntime(
       }
       if (pathname === "/operations") {
         return runtimeJson({
-          hostMethods: {
-            known: [],
-            requiredByOperations: {},
-          },
-          hostCapabilities: {
-            optional: [],
-            requiredByOperations: {},
-          },
           operations: [
             {
               id: "ssh",
@@ -166,6 +168,35 @@ async function withWorkspaceRuntime(
               },
             },
           ],
+          workspaceOperations: [
+            {
+              id: "remove",
+              kind: "workspace-action",
+              source: "core",
+              title: "Remove",
+              description: "remove workspace",
+              cli: {
+                options: [{ name: "yes", flag: "--yes", aliases: ["-y"], type: "boolean", runtime: false }],
+              },
+              inputSchema: {
+                type: "object",
+                additionalProperties: false,
+                properties: {},
+              },
+            },
+            {
+              id: "open-cmux",
+              kind: "workspace-action",
+              source: "config",
+              title: "Open cmux",
+              description: "open cmux",
+              inputSchema: {
+                type: "object",
+                additionalProperties: false,
+                properties: {},
+              },
+            },
+          ],
         });
       }
       return runtimeJson({ error: { message: "Not found" } }, { status: 404 });

package/src/completion.ts

@@ -17,6 +17,7 @@ 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: "ls", description: "list project workspaces" },
   { value: "projects", description: "discover Rigkit projects" },
   { value: "doctor", description: "show runtime diagnostics" },
@@ -77,6 +78,7 @@ const OPTIONS_WITH_VALUES = new Set([
 
 type RuntimeOperationManifest = {
   operations: RuntimeOperationDefinition[];
+  workspaceOperations?: RuntimeOperationDefinition[];
 };
 
 type RuntimeOperationDefinition = {
@@ -121,7 +123,12 @@ export async function completeRig(input: CompleteRigInput): Promise<CompletionIt
       }
       return [];
     }
-    return filterItems(current.startsWith("-") ? GLOBAL_OPTIONS : [...COMMANDS, ...await safeOperationTargets(resolveProjectDir(words, cwd)), ...GLOBAL_OPTIONS], current);
+    return filterItems(
+      current.startsWith("-")
+        ? GLOBAL_OPTIONS
+        : [...COMMANDS, ...await safeOperationTargets(resolveProjectDir(words, cwd), current), ...GLOBAL_OPTIONS],
+      current,
+    );
   }
 
   if (current.startsWith("-")) {
@@ -147,7 +154,7 @@ export async function completeRig(input: CompleteRigInput): Promise<CompletionIt
   if (command === "run") {
     const run = parseRunCommand(before);
     if (!run.operation) {
-      return filterItems(await safeOperationTargets(resolveProjectDir(words, cwd)), current);
+      return filterItems(await safeOperationTargets(resolveProjectDir(words, cwd), current), current);
     }
     const operation = await safeResolveRuntimeOperation(resolveProjectDir(words, cwd), run.operation);
     const operationPositionalCount = countRunOperationPositionals(run.args);
@@ -355,48 +362,65 @@ function projectPaths(projectDir: string): { projectDir: string; configPath: str
 
 async function workspaceTargets(
   paths: { projectDir: string; configPath: string },
-  current: string,
-  includeVmIds: boolean,
+  _current: string,
+  _includeVmIds: boolean,
 ): Promise<CompletionItem[]> {
   const workspaces = await readWorkspaces(paths);
   const items = workspaces.map((workspace) => ({
     value: workspace.name,
-    description: workspace.resourceId,
+    description: workspace.workflow,
   }));
 
-  if (includeVmIds && current.length > 0) {
-    for (const workspace of workspaces) {
-      if (!workspace.resourceId) continue;
-      items.push({
-        value: workspace.resourceId,
-        description: workspace.name,
-      });
-    }
-  }
-
   return dedupeItems(items);
 }
 
-async function readWorkspaces(paths: { projectDir: string; configPath: string }): Promise<Array<{ name: string; resourceId?: string }>> {
+async function readWorkspaces(paths: { projectDir: string; configPath: string }): Promise<Array<{ name: string; workflow: string }>> {
   const runtime = await getOrStartRuntime(paths);
   const { workspaces } = await runtime.control.workspaces();
   return workspaces.map((workspace) => ({
     name: workspace.name,
-    resourceId: workspace.resourceId,
+    workflow: workspace.workflow,
   }));
 }
 
-async function operationTargets(paths: { projectDir: string; configPath: string }): Promise<CompletionItem[]> {
+async function operationTargets(
+  paths: { projectDir: string; configPath: string },
+  current: string,
+): Promise<CompletionItem[]> {
   const manifest = await readOperations(paths);
+  if (current.includes("/")) {
+    return workspaceOperationTargets(manifest, current);
+  }
+  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 [];
+  return (manifest.workspaceOperations ?? []).flatMap((operation) => [
+    { value: `${workspace}/${operation.id}`, description: operation.description ?? "workspace operation" },
+    ...(operation.aliases ?? []).map((alias) => ({
+      value: `${workspace}/${alias}`,
+      description: operation.description ?? "workspace operation",
+    })),
   ]);
 }
 
-async function safeOperationTargets(paths: { projectDir: string; configPath: string }): Promise<CompletionItem[]> {
+async function safeOperationTargets(
+  paths: { projectDir: string; configPath: string },
+  current: string,
+): Promise<CompletionItem[]> {
   try {
-    return await operationTargets(paths);
+    return await operationTargets(paths, current);
   } catch {
     return [];
   }
@@ -407,6 +431,12 @@ async function resolveRuntimeOperation(
   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) =>
     operation.id === operationId || operation.aliases?.includes(operationId)
   );
@@ -428,6 +458,15 @@ 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));
 }

package/src/init.ts

@@ -111,15 +111,16 @@ const dev = sequence(${workflowName})
     }
     return { vm: await vm.snapshotRef() };
   })
-  .create(async ({ ctx, name, providers }) => {
-    const vm = await providers.freestyle.vms.fromSnapshot(ctx.vm);
-    return {
-      name,
-      providerId: "freestyle",
-      resourceId: vm.vmId,
-      vmId: vm.vmId,
-      sourceRef: ctx.vm,
-    };
+  .workspace({
+    create: async ({ workflow, providers }) => {
+      const vm = await providers.freestyle.vms.fromSnapshot(workflow.ctx.vm);
+      return {
+        vmId: vm.vmId,
+      };
+    },
+    remove: async ({ providers, workspace }) => {
+      await providers.freestyle.vms.delete(workspace.ctx.vmId);
+    },
   });
 
 export default defineConfig({

package/src/run-presenter.ts

@@ -146,7 +146,7 @@ export function createRunPresenter(operation: string): RunPresenter | undefined
           );
           break;
         case "workspace.ready":
-          phase = `Workspace ${String(event.resourceId ?? event.workspaceId ?? "ready")} ready`;
+          phase = `Workspace ${String(event.workspaceId ?? "ready")} ready`;
           break;
         case "run.completed":
           finalStatus = "completed";

package/src/version.ts

@@ -1 +1 @@
-export const RIGKIT_CLI_VERSION = "0.2.2";
+export const RIGKIT_CLI_VERSION = "0.2.3";