@h-rig/cli 0.0.6-alpha.64 → 0.0.6-alpha.66

package/dist/src/launcher.js

@@ -4,6 +4,57 @@ import { existsSync } from "fs";
 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,
+  RigServerStatusOutput,
+  RigStatsOutput,
+  RigTaskListOutput,
+  RigTaskShowOutput
+} from "@rig/contracts";
+var CLI_OUTPUT_SCHEMAS = {
+  "task list": RigTaskListOutput,
+  "task show": RigTaskShowOutput,
+  "run list": RigRunListOutput,
+  "run show": RigRunShowOutput,
+  "server status": RigServerStatusOutput,
+  "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;
@@ -47,14 +98,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 };
@@ -97,14 +151,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 });
@@ -112,6 +171,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/runner.js

@@ -4,10 +4,19 @@ var {$ } = globalThis.Bun;
 import { existsSync, mkdirSync } from "fs";
 import { resolve } from "path";
 import { EventBus } from "@rig/runtime/control-plane/runtime/events";
-import { CliError } from "@rig/runtime/control-plane/errors";
+import { CliError as RuntimeCliError } from "@rig/runtime/control-plane/errors";
 import { evaluate, loadPolicy, resolveAction } from "@rig/runtime/control-plane/runtime/guard";
 import { buildBinary } from "@rig/runtime/control-plane/runtime/isolation";
-import { CliError as CliError2 } from "@rig/runtime/control-plane/errors";
+
+class CliError extends RuntimeCliError {
+  hint;
+  constructor(message, exitCode = 1, options = {}) {
+    super(message, exitCode);
+    if (options.hint?.trim()) {
+      this.hint = options.hint.trim();
+    }
+  }
+}
 function withProjectRoot(projectRoot) {
   $.cwd(projectRoot);
 }
@@ -125,7 +134,7 @@ async function runCommand(context, parts) {
       matchedRuleIds: guardDecision.matchedRules.map((r) => r.id),
       mode: effectiveMode
     });
-    throw new CliError(`Policy blocked command: ${formatted}`, 126);
+    throw new CliError(`Policy blocked command: ${formatted}`, 126, { hint: "Review rig/policy/policy.json, or re-run with `--policy-mode observe` to log instead of block." });
   }
   const startedAt = new Date;
   await context.emitEvent("command.started", {
@@ -218,7 +227,7 @@ function takeOption(args, option) {
     if (current === option) {
       const next = args[index + 1];
       if (!next || next.startsWith("-")) {
-        throw new CliError(`Missing value for ${option}`);
+        throw new CliError(`Missing value for ${option}`, 1, { hint: `Provide a value after ${option}, e.g. \`${option} <value>\`.` });
       }
       value = next;
       index += 1;
@@ -254,5 +263,5 @@ export {
   initializeRuntime,
   formatCommand,
   ensureAgentShellBinary,
-  CliError2 as CliError
+  CliError
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/cli",
-  "version": "0.0.6-alpha.64",
+  "version": "0.0.6-alpha.66",
   "type": "module",
   "description": "Rig package",
   "license": "UNLICENSED",
@@ -23,12 +23,15 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "@earendil-works/pi-coding-agent": "npm:@h-rig/pi-coding-agent@0.0.6-alpha.64",
-    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.64",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.64",
-    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.64",
-    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.64",
-    "@rig/standard-plugin": "npm:@h-rig/standard-plugin@0.0.6-alpha.64",
+    "@earendil-works/pi-coding-agent": "0.79.0",
+    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.66",
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.66",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.66",
+    "@rig/pi-rig": "npm:@h-rig/pi-rig@0.0.6-alpha.66",
+    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.66",
+    "@rig/server": "npm:@h-rig/server@0.0.6-alpha.66",
+    "@rig/standard-plugin": "npm:@h-rig/standard-plugin@0.0.6-alpha.66",
+    "effect": "4.0.0-beta.78",
     "picocolors": "^1.1.1"
   }
 }