@rigkit/cli 0.2.3 → 0.2.4

package/package.json

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

package/src/cli.ts

@@ -405,29 +405,29 @@ async function runInit(invocation: CliInvocation, options: InitOptions): Promise
 async function resolveInitAnswers(
   options: InitOptions,
   jsonMode: boolean,
-): Promise<{ name: string; apiKey: string; packageManager: PackageManager }> {
-  if (jsonMode && (options.name === undefined || !options.apiKey?.trim())) {
-    throw new Error(`rig init --json requires --name and --api-key`);
+): Promise<{ name: string; apiKey?: string; packageManager: PackageManager }> {
+  if (jsonMode && options.name === undefined) {
+    throw new Error(`rig init --json requires --name`);
   }
 
   if (jsonMode && options.packageManager && options.packageManager !== "skip") {
     throw new Error(`rig init --json only supports --package-manager skip`);
   }
 
-  if (options.name === undefined || !options.apiKey) {
+  if (options.name === undefined) {
     assertInteractiveInit();
   }
 
   if (!jsonMode) {
     console.log(chalk.bold("Initialize Rigkit"));
-    console.log(chalk.dim("This creates a project folder with rig.config.ts, .env, package.json, and local ignore rules."));
+    console.log(chalk.dim("This creates a project folder with rig.config.ts, package.json, and local ignore rules."));
     console.log("");
   }
 
   const name = options.name !== undefined
     ? normalizeMachineName(options.name)
     : await promptName();
-  const apiKey = options.apiKey?.trim() || await promptRequiredSecret("Freestyle API key");
+  const apiKey = options.apiKey?.trim();
   const packageManager = options.packageManager ?? (jsonMode || !canPrompt() ? "skip" : await promptPackageManager("skip"));
 
   return {
@@ -439,7 +439,7 @@ async function resolveInitAnswers(
 
 function assertInteractiveInit(): void {
   if (canPrompt()) return;
-  throw new Error(`rig init needs --name and --api-key when not running in an interactive terminal`);
+  throw new Error(`rig init needs --name when not running in an interactive terminal`);
 }
 
 function canPrompt(): boolean {
@@ -478,14 +478,6 @@ async function promptName(): Promise<string> {
   return answers.name;
 }
 
-async function promptRequiredSecret(label: string): Promise<string> {
-  for (;;) {
-    const value = (await promptSecret(label)).trim();
-    if (value) return value;
-    console.log(chalk.red(`${label} is required.`));
-  }
-}
-
 async function promptPackageManager(defaultValue: PackageManager): Promise<PackageManager> {
   const choices: Array<{ value: PackageManager; label: string; hint: string }> = [
     { value: "npm", label: "npm", hint: "npm install" },
@@ -507,16 +499,6 @@ async function promptPackageManager(defaultValue: PackageManager): Promise<Packa
   return answers.packageManager;
 }
 
-async function promptSecret(label: string): Promise<string> {
-  const answers = await inquirer.prompt<{ value: string }>([{
-    type: "password",
-    name: "value",
-    message: `${label}:`,
-    mask: "*",
-  }]);
-  return answers.value;
-}
-
 async function runPackageManagerInstall(
   projectDir: string,
   packageManager: PackageManager,
@@ -1214,10 +1196,12 @@ async function runRuntimeOperation<T>(
       return;
     }
     if (isHostCapabilityRequestEvent(event)) {
-      presenter?.pause();
+      const suspendPresenter = hostCapabilityNeedsTerminal(event);
+      const logger = createHostCapabilityLogger(event, presenter);
+      if (suspendPresenter) presenter?.pause();
       try {
         if (sendSession) {
-          await answerHostCapabilityRequestOverSession(sendSession, event);
+          await answerHostCapabilityRequestOverSession(sendSession, event, { logger });
         } else if (respond) {
           await answerHostCapabilityRequestOverSession((message) => {
             if (isRecord(message) && message.type === "response") {
@@ -1225,12 +1209,12 @@ async function runRuntimeOperation<T>(
               if (id) return respond(id, "error" in message ? { error: message.error } : { result: message.result });
             }
             throw new Error(`Session response channel cannot send ${String(isRecord(message) ? message.type : typeof message)}`);
-          }, event);
+          }, event, { logger });
         } else {
-          await answerHostCapabilityRequest(runtime, event);
+          await answerHostCapabilityRequest(runtime, event, { logger });
         }
       } finally {
-        presenter?.resume();
+        if (suspendPresenter) presenter?.resume();
       }
       return;
     }
@@ -1352,6 +1336,7 @@ type HostCapabilityRequestEvent = {
   type: "host.capability.request";
   requestId?: string;
   id?: string;
+  nodePath?: string;
   capability: string;
   params: unknown;
 };
@@ -1360,6 +1345,15 @@ type HostRequestHandlingOptions = {
   quietOpen?: boolean;
 };
 
+type HostCapabilityLogOptions = {
+  stream?: "stdout" | "stderr" | "info";
+  label?: string;
+};
+
+type HostCapabilityRequestHandlingOptions = {
+  logger?: (data: string, options?: HostCapabilityLogOptions) => void;
+};
+
 class UnsupportedHostCapabilityError extends Error {
   constructor(capability: string) {
     super(
@@ -1407,11 +1401,15 @@ async function answerHostRequestOverSession(
   }
 }
 
-async function answerHostCapabilityRequest(runtime: RuntimeClient, event: HostCapabilityRequestEvent): Promise<void> {
+async function answerHostCapabilityRequest(
+  runtime: RuntimeClient,
+  event: HostCapabilityRequestEvent,
+  options: HostCapabilityRequestHandlingOptions = {},
+): Promise<void> {
   const requestId = event.requestId ?? event.id;
   if (!requestId) throw new Error(`Host capability request is missing requestId`);
   try {
-    const handled = await handleHostCapabilityRequest(event.capability, event.params);
+    const handled = await handleHostCapabilityRequest(event.capability, event.params, options);
     await runtime.control.hostResponse(requestId, { result: handled.result });
   } catch (error) {
     await runtime.control.hostResponse(requestId, {
@@ -1423,11 +1421,12 @@ async function answerHostCapabilityRequest(runtime: RuntimeClient, event: HostCa
 async function answerHostCapabilityRequestOverSession(
   send: (message: unknown) => void | Promise<void>,
   event: HostCapabilityRequestEvent,
+  options: HostCapabilityRequestHandlingOptions = {},
 ): Promise<void> {
   const id = event.id ?? event.requestId;
   if (!id) throw new Error(`Host capability request is missing id`);
   try {
-    const handled = await handleHostCapabilityRequest(event.capability, event.params);
+    const handled = await handleHostCapabilityRequest(event.capability, event.params, options);
     await send({ type: "response", id, result: handled.result });
     if (handled.closed) reportHostCapabilityClosed(send, id, handled.closed);
   } catch (error) {
@@ -1473,6 +1472,34 @@ function hostRequestNeedsTerminal(event: HostRequestEvent): boolean {
   }
 }
 
+function hostCapabilityNeedsTerminal(event: HostCapabilityRequestEvent): boolean {
+  switch (event.capability) {
+    case "cmux.open":
+      return false;
+    default:
+      return true;
+  }
+}
+
+function createHostCapabilityLogger(
+  event: HostCapabilityRequestEvent,
+  presenter: RunPresenter | undefined,
+): (data: string, options?: HostCapabilityLogOptions) => void {
+  return (data, options = {}) => {
+    if (presenter) {
+      presenter.render({
+        type: "log.output",
+        nodePath: event.nodePath ?? "runtime",
+        stream: options.stream ?? "info",
+        label: options.label ?? event.capability,
+        data,
+      });
+      return;
+    }
+    console.error(data);
+  };
+}
+
 function isTrustedCaptureHostCommand(params: unknown): boolean {
   return process.env.RIGKIT_TRUST_HOST_COMMANDS === "1" &&
     isRecord(params) &&
@@ -1484,12 +1511,18 @@ type HandledHostCapability = {
   closed?: Promise<void>;
 };
 
-async function handleHostCapabilityRequest(capability: string, params: unknown): Promise<HandledHostCapability> {
+async function handleHostCapabilityRequest(
+  capability: string,
+  params: unknown,
+  options: HostCapabilityRequestHandlingOptions = {},
+): Promise<HandledHostCapability> {
   const handler = CLI_HOST_CAPABILITY_HANDLERS.get(capability);
   if (!handler) {
     throw new UnsupportedHostCapabilityError(capability);
   }
-  return normalizeHostCapabilityResult(await handler.handle(params));
+  return normalizeHostCapabilityResult(await handler.handle(params, {
+    log: (data, logOptions) => options.logger?.(data, logOptions),
+  }));
 }
 
 function normalizeHostCapabilityResult(value: unknown): HandledHostCapability {
@@ -1685,6 +1718,7 @@ function isHostCapabilityRequestEvent(value: unknown): value is HostCapabilityRe
   return isRecord(value) &&
     value.type === "host.capability.request" &&
     (typeof value.requestId === "string" || typeof value.id === "string") &&
+    (value.nodePath === undefined || typeof value.nodePath === "string") &&
     typeof value.capability === "string";
 }
 
@@ -1760,15 +1794,35 @@ function printWorkspaces(
   }
 
   printTable(
-    ["name", "workflow", "created"],
+    ["name", "workflow", "created", "age"],
     workspaces.map((workspace) => [
       workspace.name,
       workspace.workflow,
       workspace.createdAt,
+      formatWorkspaceAge(workspace.createdAt),
     ]),
   );
 }
 
+function formatWorkspaceAge(createdAt: string): string {
+  const createdTime = Date.parse(createdAt);
+  if (Number.isNaN(createdTime)) return chalk.dim("unknown");
+
+  const ageMs = Math.max(0, Date.now() - createdTime);
+  const minute = 60 * 1000;
+  const hour = 60 * minute;
+  const day = 24 * hour;
+  const label = ageMs < hour
+    ? `${Math.max(1, Math.floor(ageMs / minute))}m`
+    : ageMs < day
+      ? `${Math.floor(ageMs / hour)}h`
+      : `${Math.floor(ageMs / day)}d`;
+
+  if (ageMs < day) return chalk.green(label);
+  if (ageMs <= 3 * day) return chalk.yellow(label);
+  return chalk.red(label);
+}
+
 function printSnapshots(snapshots: SnapshotRecord[]): void {
   if (snapshots.length === 0) {
     console.log("No snapshots.");

package/src/init.test.ts

@@ -3,7 +3,12 @@ import { existsSync, mkdirSync, mkdtempSync, readFileSync, writeFileSync } from
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { initProject, normalizeMachineName } from "./init.ts";
-import { FREESTYLE_PROVIDER_PACKAGE_NAME, PROJECT_PACKAGE_NAME } from "./project.ts";
+import {
+  FREESTYLE_PROVIDER_PACKAGE_NAME,
+  FREESTYLE_SDK_PACKAGE_NAME,
+  FREESTYLE_SDK_PACKAGE_VERSION,
+  PROJECT_PACKAGE_NAME,
+} from "./project.ts";
 import { RIGKIT_CLI_VERSION } from "./version.ts";
 
 describe("initProject", () => {
@@ -14,7 +19,6 @@ describe("initProject", () => {
       projectDir,
       configPath: join(projectDir, "rig.config.ts"),
       name: "Platform API",
-      apiKey: "fs_test_123",
     });
 
     expect(result.name).toBe("platform-api");
@@ -22,16 +26,18 @@ describe("initProject", () => {
     expect(existsSync(projectDir)).toBe(true);
     expect(result.created).toEqual({
       config: true,
-      env: true,
-      envExample: true,
+      env: false,
+      envExample: false,
       gitignore: true,
       packageJson: true,
     });
 
     expect(readFileSync(join(projectDir, "rig.config.ts"), "utf8")).toContain('sequence("platform-api"');
     expect(readFileSync(join(projectDir, "rig.config.ts"), "utf8")).toContain("defineConfig({");
-    expect(readFileSync(join(projectDir, ".env"), "utf8")).toBe("FREESTYLE_API_KEY=fs_test_123\n");
-    expect(readFileSync(join(projectDir, ".env.example"), "utf8")).toBe("FREESTYLE_API_KEY=\n");
+    expect(readFileSync(join(projectDir, "rig.config.ts"), "utf8")).toContain("new VmSpec()");
+    expect(readFileSync(join(projectDir, "rig.config.ts"), "utf8")).not.toContain("FREESTYLE_API_KEY");
+    expect(existsSync(join(projectDir, ".env"))).toBe(false);
+    expect(existsSync(join(projectDir, ".env.example"))).toBe(false);
     expect(readFileSync(join(projectDir, ".gitignore"), "utf8")).toContain(".env\n.rigkit/\n");
 
     const pkg = JSON.parse(readFileSync(join(projectDir, "package.json"), "utf8"));
@@ -40,6 +46,7 @@ describe("initProject", () => {
     expect(pkg.scripts.apply).toBe("rig apply");
     expect(pkg.devDependencies[PROJECT_PACKAGE_NAME]).toBe(RIGKIT_CLI_VERSION);
     expect(pkg.devDependencies[FREESTYLE_PROVIDER_PACKAGE_NAME]).toBe(RIGKIT_CLI_VERSION);
+    expect(pkg.devDependencies[FREESTYLE_SDK_PACKAGE_NAME]).toBe(FREESTYLE_SDK_PACKAGE_VERSION);
   });
 
   test("updates existing project files without replacing package metadata", () => {

package/src/init.ts

@@ -1,13 +1,18 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { RIGKIT_CLI_VERSION } from "./version.ts";
-import { FREESTYLE_PROVIDER_PACKAGE_NAME, PROJECT_PACKAGE_NAME } from "./project.ts";
+import {
+  FREESTYLE_PROVIDER_PACKAGE_NAME,
+  FREESTYLE_SDK_PACKAGE_NAME,
+  FREESTYLE_SDK_PACKAGE_VERSION,
+  PROJECT_PACKAGE_NAME,
+} from "./project.ts";
 
 export type InitProjectInput = {
   projectDir: string;
   configPath: string;
   name: string;
-  apiKey: string;
+  apiKey?: string;
   force?: boolean;
 };
 
@@ -47,11 +52,14 @@ export function initProject(input: InitProjectInput): InitProjectResult {
     writeFileSync(input.configPath, starterConfig(name));
   }
 
+  const apiKey = input.apiKey?.trim();
   const envPath = join(input.projectDir, ".env");
-  const env = writeEnvFile(envPath, input.apiKey);
+  const env = apiKey
+    ? writeEnvFile(envPath, apiKey)
+    : { created: false, updated: false };
 
   const envExamplePath = join(input.projectDir, ".env.example");
-  const wroteEnvExample = !existsSync(envExamplePath);
+  const wroteEnvExample = Boolean(apiKey) && !existsSync(envExamplePath);
   if (wroteEnvExample) {
     writeFileSync(envExamplePath, "FREESTYLE_API_KEY=\n");
   }
@@ -94,32 +102,46 @@ export function normalizeMachineName(value: string): string {
 export function starterConfig(name: string): string {
   const workflowName = JSON.stringify(normalizeMachineName(name));
 
-  return `import { defineConfig, env, sequence } from "@rigkit/sdk";
-import { freestyle } from "@rigkit/provider-freestyle";
+  return `import { defineConfig, sequence } from "@rigkit/sdk";
+import { freestyle, VmBaseImage, VmSpec } from "@rigkit/provider-freestyle";
 
-const freestyleProvider = freestyle.provider({
-  apiKey: () => env.secret("FREESTYLE_API_KEY"),
-  image: "node-22",
-});
+const vmIdleTimeoutSeconds = 3600;
+const vmSpec = new VmSpec()
+  .baseImage(new VmBaseImage("FROM node:22"))
+  .idleTimeoutSeconds(vmIdleTimeoutSeconds);
+
+const freestyleProvider = freestyle.provider();
 
 const dev = sequence(${workflowName})
-  .step("verify-node-22", async ({ providers }) => {
-    const vm = await providers.freestyle.vms.create();
-    const result = await vm.probe("node --version", { name: "node is v22" });
-    if (!result.ok || !result.stdout.trim().startsWith("v22.")) {
-      throw new Error(\`Expected Node.js v22, got: \${result.stdout}\${result.stderr}\`);
+  .step("verify-node-22", async ({ providers, step }) => {
+    const { vm, vmId } = await providers.freestyle.client.vms.create({
+      spec: vmSpec,
+      logger: step.log,
+    });
+    try {
+      const result = await vm.exec("node --version");
+      if ((result.statusCode ?? 0) !== 0 || !result.stdout.trim().startsWith("v22.")) {
+        throw new Error(\`Expected Node.js v22, got: \${result.stdout}\${result.stderr}\`);
+      }
+      const snapshot = await vm.snapshot();
+      return { ctx: { snapshotId: snapshot.snapshotId } };
+    } finally {
+      await providers.freestyle.client.vms.delete({ vmId });
     }
-    return { vm: await vm.snapshotRef() };
   })
   .workspace({
-    create: async ({ workflow, providers }) => {
-      const vm = await providers.freestyle.vms.fromSnapshot(workflow.ctx.vm);
+    create: async ({ workflow, providers, step }) => {
+      const { vmId } = await providers.freestyle.client.vms.create({
+        snapshotId: workflow.ctx.snapshotId,
+        idleTimeoutSeconds: vmIdleTimeoutSeconds,
+        logger: step.log,
+      });
       return {
-        vmId: vm.vmId,
+        vmId,
       };
     },
     remove: async ({ providers, workspace }) => {
-      await providers.freestyle.vms.delete(workspace.ctx.vmId);
+      await providers.freestyle.client.vms.delete({ vmId: workspace.ctx.vmId });
     },
   });
 
@@ -218,11 +240,13 @@ function ensureProjectPackageJson(
   const devDependencies = isRecord(pkg.devDependencies) ? pkg.devDependencies : {};
   const sdkDependencyChanged =
     devDependencies[PROJECT_PACKAGE_NAME] !== RIGKIT_CLI_VERSION ||
-    devDependencies[FREESTYLE_PROVIDER_PACKAGE_NAME] !== RIGKIT_CLI_VERSION;
+    devDependencies[FREESTYLE_PROVIDER_PACKAGE_NAME] !== RIGKIT_CLI_VERSION ||
+    devDependencies[FREESTYLE_SDK_PACKAGE_NAME] !== FREESTYLE_SDK_PACKAGE_VERSION;
   if (sdkDependencyChanged) {
     delete devDependencies["@rigkit/runtime"];
     devDependencies[PROJECT_PACKAGE_NAME] = RIGKIT_CLI_VERSION;
     devDependencies[FREESTYLE_PROVIDER_PACKAGE_NAME] = RIGKIT_CLI_VERSION;
+    devDependencies[FREESTYLE_SDK_PACKAGE_NAME] = FREESTYLE_SDK_PACKAGE_VERSION;
     updated = true;
   }
   pkg.devDependencies = sortObject(devDependencies);

package/src/project.ts

@@ -4,6 +4,8 @@ import { existsSync, readdirSync } from "node:fs";
 export const DEFAULT_CONFIG_FILE = "rig.config.ts";
 export const PROJECT_PACKAGE_NAME = "@rigkit/sdk";
 export const FREESTYLE_PROVIDER_PACKAGE_NAME = "@rigkit/provider-freestyle";
+export const FREESTYLE_SDK_PACKAGE_NAME = "freestyle";
+export const FREESTYLE_SDK_PACKAGE_VERSION = "^0.1.51";
 
 export type ConfigPathOptions = {
   project?: string;

package/src/version.ts

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