@h-rig/cli 0.0.6-alpha.90 → 0.0.6-alpha.91

package/dist/src/commands/dist.d.ts

@@ -1,5 +1,5 @@
 import { type RunnerContext } from "../runner";
-import type { CommandOutcome } from "@rig/runtime/control-plane/runtime/types";
+import type { CommandOutcome } from "@rig/runtime";
 export type DistDoctorDetails = {
     bun: {
         available: boolean;

package/dist/src/commands/dist.js

@@ -58,11 +58,11 @@ Usage: ${usage}`);
 }
 
 // packages/cli/src/commands/dist.ts
-import { buildBinary as buildBinary2 } from "@rig/runtime/control-plane/runtime/isolation";
 import {
   computeRuntimeImageFingerprint,
   computeRuntimeImageId
 } from "@rig/runtime/control-plane/runtime/image/index";
+import { buildBinary as buildBinary2 } from "@rig/runtime/control-plane/runtime/isolation";
 
 // packages/cli/src/commands/_parsers.ts
 import { homedir } from "os";
@@ -88,7 +88,7 @@ function resolveInstallDir(scope, explicitPath) {
 
 // packages/cli/src/commands/_paths.ts
 import { resolve as resolve2 } from "path";
-import { resolveMonorepoRoot } from "@rig/runtime/control-plane/native/utils";
+import { resolveMonorepoRoot } from "@rig/runtime/layout";
 function resolveControlPlaneMonorepoRoot(projectRoot) {
   return resolveMonorepoRoot(projectRoot);
 }
@@ -124,8 +124,9 @@ function collectRigValidatorBuildTargets(input) {
   if (!existsSync(validatorsRoot))
     return [];
   const targets = [];
-  const categories = readdirSync(validatorsRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory());
-  for (const category of categories) {
+  for (const category of readdirSync(validatorsRoot, { withFileTypes: true })) {
+    if (!category.isDirectory())
+      continue;
     const categoryDir = resolve3(validatorsRoot, category.name);
     for (const entry of readdirSync(categoryDir, { withFileTypes: true })) {
       if (!entry.isFile() || !entry.name.endsWith(".ts"))
@@ -133,9 +134,10 @@ function collectRigValidatorBuildTargets(input) {
       const check = entry.name.replace(/\.ts$/, "");
       if (!check || check === "index" || check === "shared")
         continue;
+      const validatorName = `${category.name}-${check}`;
       targets.push({
         source: `packages/runtime/src/control-plane/validators/${category.name}/${entry.name}`,
-        dest: resolve3(input.imageDir, `bin/validators/${category.name}-${check}`),
+        dest: resolve3(input.imageDir, `bin/validators/${validatorName}`),
         cwd: input.hostProjectRoot
       });
     }
@@ -147,15 +149,22 @@ async function findLatestDistBinary(projectRoot) {
   if (!existsSync(distRoot)) {
     return null;
   }
-  const entries = readdirSync(distRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory() && entry.name.startsWith("rig-")).map((entry) => ({
-    name: entry.name,
-    mtimeMs: statSync(resolve3(distRoot, entry.name)).mtimeMs
-  })).sort((a, b) => b.mtimeMs - a.mtimeMs || b.name.localeCompare(a.name));
-  for (const { name } of entries) {
-    const candidate = resolve3(distRoot, name, "bin", "rig");
-    if (existsSync(candidate) && await isRunnableRigBinary(candidate, projectRoot)) {
-      return candidate;
-    }
+  const candidates = [];
+  for (const entry of readdirSync(distRoot, { withFileTypes: true })) {
+    if (!entry.name.startsWith("rig-") && entry.name !== "rig")
+      continue;
+    const entryPath = resolve3(distRoot, entry.name);
+    const binary = entry.isDirectory() ? resolve3(entryPath, "bin", "rig") : entryPath;
+    try {
+      const stat = statSync(binary);
+      if (stat.isFile())
+        candidates.push({ path: binary, mtimeMs: stat.mtimeMs });
+    } catch {}
+  }
+  candidates.sort((a, b) => b.mtimeMs - a.mtimeMs);
+  for (const { path } of candidates) {
+    if (await isRunnableRigBinary(path, projectRoot))
+      return path;
   }
   return null;
 }
@@ -194,9 +203,8 @@ async function executeDist(context, args) {
       const { value: outputDir, rest: pending } = takeOption(rest, "--output-dir");
       requireNoExtraArgs(pending, "rig dist build [--output-dir <dir>]");
       const commandParts = ["bun", "run", "packages/cli/bin/build-rig-binaries.ts"];
-      if (outputDir) {
+      if (outputDir)
         commandParts.push("--output-dir", outputDir);
-      }
       await context.runCommand(commandParts);
       return { ok: true, group: "dist", command, details: { outputDir: outputDir || null } };
     }
@@ -204,9 +212,9 @@ async function executeDist(context, args) {
       let pending = rest;
       const scopeResult = takeOption(pending, "--scope");
       pending = scopeResult.rest;
-      const pathResult = takeOption(pending, "--path");
+      const pathResult = takeOption(pending, "--dir");
       pending = pathResult.rest;
-      requireNoExtraArgs(pending, "rig dist install [--scope user|system] [--path <dir>]");
+      requireNoExtraArgs(pending, "rig dist install [--scope user|system] [--dir <dir>]");
       const scope = parseInstallScope(scopeResult.value);
       const installDir = resolveInstallDir(scope, pathResult.value);
       mkdirSync(installDir, { recursive: true });
@@ -400,7 +408,7 @@ async function executeDist(context, args) {
       return { ok: true, group: "dist", command, details: { imageId: currentId, count: targets.length } };
     }
     default:
-      throw new CliError(`Unknown dist command: ${command}`, 1, { hint: "Run `rig dist --help` \u2014 commands are build|install|doctor." });
+      throw new CliError(`Unknown dist command: ${command}`, 1, { hint: "Run `rig dist --help` \u2014 commands are build|install|doctor|rebuild-agent." });
   }
 }
 export {

package/dist/src/commands/doctor.d.ts

@@ -1,3 +1,3 @@
-import type { CommandOutcome } from "@rig/runtime/control-plane/runtime/types";
+import type { CommandOutcome } from "@rig/runtime";
 import { type RunnerContext } from "../runner";
 export declare function executeDoctor(context: RunnerContext, args: string[]): Promise<CommandOutcome>;