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

package/dist/src/launcher.d.ts

@@ -0,0 +1,61 @@
+import type { RunnerContext } from "./runner";
+export type PolicyModeValue = "off" | "observe" | "enforce";
+export interface ResolveProjectRootOptions {
+    readonly envProjectRoot?: string;
+    readonly execPath?: string;
+    readonly importDir?: string;
+    readonly cwd?: string;
+}
+export interface CliIo {
+    readonly log: (message: string) => void;
+    readonly error: (message: string) => void;
+}
+export interface RigCliRunOptions {
+    readonly argv?: readonly string[];
+    readonly io?: CliIo;
+    readonly envProjectRoot?: string;
+    readonly execPath?: string;
+    readonly importDir?: string;
+    readonly cwd?: string;
+}
+export interface RigCliModule {
+    readonly CliError: new (message: string, exitCode?: number) => Error & {
+        exitCode: number;
+    };
+    execute: (context: RunnerContext, args: string[]) => Promise<unknown>;
+    initializeRuntime: (options: {
+        projectRoot: string;
+        dryRun: boolean;
+        outputMode: "json" | "text";
+        runId?: string | undefined;
+        policyMode?: PolicyModeValue | undefined;
+    }) => Promise<RunnerContext>;
+    loadPolicy(projectRoot: string): {
+        mode: PolicyModeValue;
+    };
+    takeFlag(args: string[], flag: string): {
+        value: boolean;
+        rest: string[];
+    };
+    takeOption(args: string[], option: string): {
+        value?: string;
+        rest: string[];
+    };
+    withProjectRoot(projectRoot: string): void;
+}
+export declare function parsePolicyMode(value: string | undefined): PolicyModeValue | undefined;
+export declare function resolveProjectRoot({ envProjectRoot, execPath, importDir, cwd, }: ResolveProjectRootOptions): string;
+export interface CliErrorPayload {
+    readonly ok: false;
+    readonly code: string;
+    readonly message: string;
+    readonly exitCode: number;
+    /** Remediation hint (next command to run); rendered as `Next: <hint>`. */
+    readonly hint?: string;
+    readonly stack?: string;
+}
+export declare function normalizeCliErrorPayload(error: unknown, CliErrorClass: RigCliModule["CliError"], options?: {
+    readonly debug?: boolean;
+}): CliErrorPayload;
+export declare function runRigCli(module: RigCliModule, options?: RigCliRunOptions): Promise<void>;
+export declare function hydrateProcessEnvFromDotEnv(projectRoot: string): void;

package/dist/src/launcher.js

@@ -1,9 +1,64 @@
 // @bun
 // packages/cli/src/launcher.ts
 import { existsSync } from "fs";
-import { resolve } from "path";
+import { basename, resolve } from "path";
 import { loadDotEnvSecrets } from "@rig/runtime/baked-secrets";
 import { RIG_DEFINITION_DIRNAME, RIG_STATE_DIRNAME, resolveNearestRigProjectRoot } from "@rig/runtime/layout";
+
+// packages/cli/src/commands/_json-output.ts
+import { Schema } from "effect";
+import {
+  RigDoctorCheckOutput,
+  RigInboxApprovalsOutput,
+  RigInboxInputsOutput,
+  RigRunListOutput,
+  RigRunShowOutput,
+  RigServerRepairLinkOutput,
+  RigServerStatusOutput,
+  RigServerUseOutput,
+  RigStatsOutput,
+  RigTaskListOutput,
+  RigTaskShowOutput
+} from "@rig/contracts";
+var CLI_OUTPUT_SCHEMAS = {
+  "task list": RigTaskListOutput,
+  "task show": RigTaskShowOutput,
+  "run list": RigRunListOutput,
+  "run show": RigRunShowOutput,
+  "server use": RigServerUseOutput,
+  "server status": RigServerStatusOutput,
+  "server repair-link": RigServerRepairLinkOutput,
+  "inbox approvals": RigInboxApprovalsOutput,
+  "inbox inputs": RigInboxInputsOutput,
+  "doctor check": RigDoctorCheckOutput,
+  "stats show": RigStatsOutput
+};
+function isCommandOutcomeLike(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return false;
+  const record = value;
+  return typeof record.group === "string" && typeof record.command === "string";
+}
+function buildCliJsonEnvelope(outcome, options = {}) {
+  if (!isCommandOutcomeLike(outcome))
+    return null;
+  const commandKey = `${outcome.group} ${outcome.command}`;
+  const schema = CLI_OUTPUT_SCHEMAS[commandKey];
+  if (!schema)
+    return null;
+  const warn = options.warn ?? ((message) => console.error(message));
+  const envelope = { v: 1, command: commandKey, data: outcome.details ?? {} };
+  try {
+    Schema.decodeUnknownSync(schema)(JSON.parse(JSON.stringify(envelope)));
+    return envelope;
+  } catch (error) {
+    warn(`[rig] --json output for "${commandKey}" failed schema validation; printing legacy payload. ` + `(${error instanceof Error ? error.message.split(`
+`)[0] : String(error)})`);
+    return null;
+  }
+}
+
+// packages/cli/src/launcher.ts
 function parsePolicyMode(value) {
   if (!value) {
     return;
@@ -14,7 +69,7 @@ function parsePolicyMode(value) {
   throw new Error(`Invalid --policy-mode value: ${value}. Use off|observe|enforce.`);
 }
 function hasRigProjectMarker(candidate) {
-  return existsSync(resolve(candidate, RIG_DEFINITION_DIRNAME)) || existsSync(resolve(candidate, RIG_STATE_DIRNAME)) || existsSync(resolve(candidate, "rig.config.ts")) || existsSync(resolve(candidate, "rig.config.json"));
+  return existsSync(resolve(candidate, RIG_DEFINITION_DIRNAME)) || existsSync(resolve(candidate, RIG_STATE_DIRNAME)) || existsSync(resolve(candidate, "rig.config.ts")) || existsSync(resolve(candidate, "rig.config.json")) || existsSync(resolve(candidate, ".git"));
 }
 function resolveProjectRoot({
   envProjectRoot,
@@ -26,7 +81,9 @@ function resolveProjectRoot({
     return resolve(cwd, envProjectRoot);
   }
   const fallbackImportDir = importDir ?? cwd;
-  const candidates = [cwd, resolve(execPath, "..", ".."), resolve(fallbackImportDir, "..")];
+  const execName = basename(execPath).toLowerCase();
+  const execCandidates = execName === "rig" || execName === "rig.exe" ? [resolve(execPath, "..", "..")] : [];
+  const candidates = [cwd, ...execCandidates, resolve(fallbackImportDir, "..")];
   for (const candidate of candidates) {
     const nearest = resolveNearestRigProjectRoot(candidate);
     if (hasRigProjectMarker(nearest)) {
@@ -45,14 +102,17 @@ function normalizeCliErrorCode(message, isCliError) {
   return isCliError ? "CLI_ERROR" : "UNEXPECTED_ERROR";
 }
 function normalizeCliErrorPayload(error, CliErrorClass, options = {}) {
-  const isCliError = error instanceof CliErrorClass;
+  const isCliError = error instanceof CliErrorClass || error instanceof Error && error.name === "CliError" && typeof error.exitCode === "number";
   const message = error instanceof Error ? error.message : String(error);
   const exitCode = isCliError ? error.exitCode : 1;
+  const rawHint = error instanceof Error ? error.hint : undefined;
+  const hint = typeof rawHint === "string" && rawHint.trim() ? rawHint.trim() : undefined;
   const payload = {
     ok: false,
     code: normalizeCliErrorCode(message, isCliError),
     message,
-    exitCode
+    exitCode,
+    ...hint ? { hint } : {}
   };
   if (options.debug && error instanceof Error && error.stack) {
     return { ...payload, stack: error.stack };
@@ -95,14 +155,19 @@ async function runRigCli(module, options = {}) {
     const context = await module.initializeRuntime(runtimeOptions);
     const outcome = await module.execute(context, runIdResult.rest);
     if (outputMode === "json") {
-      io.log(JSON.stringify({
-        ok: true,
-        runId: context.runId,
-        outcome,
-        eventsFile: context.eventBus.getEventsFile(),
-        policyFile: resolve(projectRoot, "rig", "policy", "policy.json"),
-        policyMode: context.policyMode ?? policyMode ?? module.loadPolicy(projectRoot).mode
-      }, null, 2));
+      const envelope = buildCliJsonEnvelope(outcome, { warn: io.error });
+      if (envelope) {
+        io.log(JSON.stringify(envelope, null, 2));
+      } else {
+        io.log(JSON.stringify({
+          ok: true,
+          runId: context.runId,
+          outcome,
+          eventsFile: context.eventBus.getEventsFile(),
+          policyFile: resolve(projectRoot, "rig", "policy", "policy.json"),
+          policyMode: context.policyMode ?? policyMode ?? module.loadPolicy(projectRoot).mode
+        }, null, 2));
+      }
     }
   } catch (error) {
     const payload = normalizeCliErrorPayload(error, module.CliError, { debug: debugErrors });
@@ -110,6 +175,9 @@ async function runRigCli(module, options = {}) {
       io.error(JSON.stringify(payload, null, 2));
     } else {
       io.error(debugErrors && payload.stack ? payload.stack : payload.message);
+      if (payload.hint) {
+        io.error(`Next: ${payload.hint}`);
+      }
     }
     process.exit(payload.exitCode);
   }

package/dist/src/operator-cli.d.ts

@@ -0,0 +1,2 @@
+/** Run an operator command (`rig task|run|inbox|stats|inspect|doctor|...`). */
+export declare function runRigOperatorCli(argv: readonly string[]): Promise<void>;