@h-rig/cli 0.0.6-alpha.92 → 0.0.6-alpha.94

package/dist/bin/rig.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env bun
 // @bun
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -15659,7 +15660,7 @@ async function executeRun(context, args, deps = {}) {
       const runs = await listRuns(context.projectRoot);
       if (text)
         printFormattedOutput(formatRunList(runs.map(toRunLike2)));
-      return { ok: true, group: "run", command, details: { runs: runs.map(toRunLike2) } };
+      return { ok: true, group: "run", command, details: { runs: runs.map(toRunLike2), source: "local" } };
     }
     case "status": {
       requireNoExtraArgs(rest, "rig run status");
@@ -17530,7 +17531,7 @@ function scanRootCommand(argv) {
       break;
     const kind = preCommandFlagKind(arg);
     if (kind === undefined) {
-      return { kind: "command", command: arg, skippedHostOnly, skippedOperatorOnly };
+      return { kind: "command", command: arg, index, skippedHostOnly, skippedOperatorOnly };
     }
     if (kind === "host")
       skippedHostOnly = true;
@@ -17551,19 +17552,18 @@ function valueAfter(argv, flag) {
   const value = index >= 0 ? argv[index + 1]?.trim() : undefined;
   return value ? value : undefined;
 }
-function explicitRunRoute(argv, workspaceRoot) {
-  const stripped = stripRootWorkspace(argv);
-  const taskRef = valueAfter(stripped, "--task") ?? stripped.slice(1).find((arg) => !arg.startsWith("-"))?.trim();
+function explicitRunRoute(runArgs, workspaceRoot) {
+  const taskRef = valueAfter(runArgs, "--task") ?? runArgs.find((arg) => !arg.startsWith("-"))?.trim();
   if (!taskRef) {
-    return { kind: "unsupported", argv, message: "Usage: rig run <task> [--title <title>] [--model <model>] [--prompt <prompt>]." };
+    return { kind: "unsupported", argv: runArgs, message: "Usage: rig run <task> [--title <title>] [--model <model>] [--prompt <prompt>]." };
   }
   return {
     kind: "run",
     taskRef,
     workspaceRoot,
-    title: valueAfter(stripped, "--title"),
-    model: valueAfter(stripped, "--model"),
-    prompt: valueAfter(stripped, "--prompt") ?? valueAfter(stripped, "--initial-prompt")
+    title: valueAfter(runArgs, "--title"),
+    model: valueAfter(runArgs, "--model"),
+    prompt: valueAfter(runArgs, "--prompt") ?? valueAfter(runArgs, "--initial-prompt")
   };
 }
 function resolveRigRootRoute(argv) {
@@ -17606,13 +17606,13 @@ function resolveRigRootRoute(argv) {
     };
   }
   if (command === "run") {
-    const runArgs = stripRootWorkspace(argv).slice(1);
+    const runArgs = stripRootWorkspace(argv.slice(scanned.index + 1));
     const firstRunArg = runArgs[0];
     const firstArgIsGroupSubcommand = firstRunArg !== undefined && !firstRunArg.startsWith("-") && isRunGroupInvocation(firstRunArg);
     const forcedDispatch = Boolean(process.env.RIG_RUN_ID) || valueAfter(runArgs, "--task") !== undefined && !firstArgIsGroupSubcommand;
     const runArg = runArgs.find((arg) => !arg.startsWith("-"));
     if (forcedDispatch || !isRunGroupInvocation(runArg))
-      return explicitRunRoute(argv, workspaceRoot);
+      return explicitRunRoute(runArgs, workspaceRoot);
     return workspaceRoot ? { kind: "operator", argv: stripRootWorkspace(argv), workspaceRoot } : { kind: "operator", argv: stripRootWorkspace(argv) };
   }
   if (isOmpRootCommand(command)) {
@@ -17778,21 +17778,32 @@ async function runRigRootCli(argv = process.argv.slice(2)) {
     }
     case "run": {
       const projectRoot = resolve58(route.workspaceRoot ?? process.cwd());
-      const { runRunProcess } = await import("@rig/rig-host");
-      await runRunProcess({
-        projectRoot,
-        taskId: route.taskRef,
-        title: route.title,
-        model: route.model,
-        prompt: route.prompt,
-        writeStdout: (text) => process.stdout.write(text)
-      });
+      const restorePublicIdentityEnv = applyPublicIdentityEnv(projectRoot);
+      try {
+        const { runRunProcess } = await import("@rig/rig-host");
+        await runRunProcess({
+          projectRoot,
+          taskId: route.taskRef,
+          title: route.title,
+          model: route.model,
+          prompt: route.prompt,
+          writeStdout: (text) => process.stdout.write(text)
+        });
+      } finally {
+        restorePublicIdentityEnv();
+      }
       return;
     }
     case "operator": {
-      const { runRigOperatorCli: runRigOperatorCli2 } = await init_operator_cli().then(() => exports_operator_cli);
-      const operatorArgv = route.workspaceRoot ? ["--project", route.workspaceRoot, ...route.argv] : [...route.argv];
-      await runRigOperatorCli2(operatorArgv);
+      const projectRoot = resolve58(route.workspaceRoot ?? process.cwd());
+      const restorePublicIdentityEnv = applyPublicIdentityEnv(projectRoot);
+      try {
+        const { runRigOperatorCli: runRigOperatorCli2 } = await init_operator_cli().then(() => exports_operator_cli);
+        const operatorArgv = route.workspaceRoot ? ["--project", route.workspaceRoot, ...route.argv] : [...route.argv];
+        await runRigOperatorCli2(operatorArgv);
+      } finally {
+        restorePublicIdentityEnv();
+      }
       return;
     }
     case "help":

package/dist/src/commands/run.js

@@ -17084,7 +17084,7 @@ function scanRootCommand(argv) {
       break;
     const kind = preCommandFlagKind(arg);
     if (kind === undefined) {
-      return { kind: "command", command: arg, skippedHostOnly, skippedOperatorOnly };
+      return { kind: "command", command: arg, index, skippedHostOnly, skippedOperatorOnly };
     }
     if (kind === "host")
       skippedHostOnly = true;
@@ -17105,19 +17105,18 @@ function valueAfter(argv, flag) {
   const value = index >= 0 ? argv[index + 1]?.trim() : undefined;
   return value ? value : undefined;
 }
-function explicitRunRoute(argv, workspaceRoot) {
-  const stripped = stripRootWorkspace(argv);
-  const taskRef = valueAfter(stripped, "--task") ?? stripped.slice(1).find((arg) => !arg.startsWith("-"))?.trim();
+function explicitRunRoute(runArgs, workspaceRoot) {
+  const taskRef = valueAfter(runArgs, "--task") ?? runArgs.find((arg) => !arg.startsWith("-"))?.trim();
   if (!taskRef) {
-    return { kind: "unsupported", argv, message: "Usage: rig run <task> [--title <title>] [--model <model>] [--prompt <prompt>]." };
+    return { kind: "unsupported", argv: runArgs, message: "Usage: rig run <task> [--title <title>] [--model <model>] [--prompt <prompt>]." };
   }
   return {
     kind: "run",
     taskRef,
     workspaceRoot,
-    title: valueAfter(stripped, "--title"),
-    model: valueAfter(stripped, "--model"),
-    prompt: valueAfter(stripped, "--prompt") ?? valueAfter(stripped, "--initial-prompt")
+    title: valueAfter(runArgs, "--title"),
+    model: valueAfter(runArgs, "--model"),
+    prompt: valueAfter(runArgs, "--prompt") ?? valueAfter(runArgs, "--initial-prompt")
   };
 }
 function resolveRigRootRoute(argv) {
@@ -17160,13 +17159,13 @@ function resolveRigRootRoute(argv) {
     };
   }
   if (command === "run") {
-    const runArgs = stripRootWorkspace(argv).slice(1);
+    const runArgs = stripRootWorkspace(argv.slice(scanned.index + 1));
     const firstRunArg = runArgs[0];
     const firstArgIsGroupSubcommand = firstRunArg !== undefined && !firstRunArg.startsWith("-") && isRunGroupInvocation(firstRunArg);
     const forcedDispatch = Boolean(process.env.RIG_RUN_ID) || valueAfter(runArgs, "--task") !== undefined && !firstArgIsGroupSubcommand;
     const runArg = runArgs.find((arg) => !arg.startsWith("-"));
     if (forcedDispatch || !isRunGroupInvocation(runArg))
-      return explicitRunRoute(argv, workspaceRoot);
+      return explicitRunRoute(runArgs, workspaceRoot);
     return workspaceRoot ? { kind: "operator", argv: stripRootWorkspace(argv), workspaceRoot } : { kind: "operator", argv: stripRootWorkspace(argv) };
   }
   if (isOmpRootCommand(command)) {
@@ -17332,21 +17331,32 @@ async function runRigRootCli(argv = process.argv.slice(2)) {
     }
     case "run": {
       const projectRoot = resolve58(route.workspaceRoot ?? process.cwd());
-      const { runRunProcess } = await import("@rig/rig-host");
-      await runRunProcess({
-        projectRoot,
-        taskId: route.taskRef,
-        title: route.title,
-        model: route.model,
-        prompt: route.prompt,
-        writeStdout: (text) => process.stdout.write(text)
-      });
+      const restorePublicIdentityEnv = applyPublicIdentityEnv(projectRoot);
+      try {
+        const { runRunProcess } = await import("@rig/rig-host");
+        await runRunProcess({
+          projectRoot,
+          taskId: route.taskRef,
+          title: route.title,
+          model: route.model,
+          prompt: route.prompt,
+          writeStdout: (text) => process.stdout.write(text)
+        });
+      } finally {
+        restorePublicIdentityEnv();
+      }
       return;
     }
     case "operator": {
-      const { runRigOperatorCli: runRigOperatorCli2 } = await init_operator_cli().then(() => exports_operator_cli);
-      const operatorArgv = route.workspaceRoot ? ["--project", route.workspaceRoot, ...route.argv] : [...route.argv];
-      await runRigOperatorCli2(operatorArgv);
+      const projectRoot = resolve58(route.workspaceRoot ?? process.cwd());
+      const restorePublicIdentityEnv = applyPublicIdentityEnv(projectRoot);
+      try {
+        const { runRigOperatorCli: runRigOperatorCli2 } = await init_operator_cli().then(() => exports_operator_cli);
+        const operatorArgv = route.workspaceRoot ? ["--project", route.workspaceRoot, ...route.argv] : [...route.argv];
+        await runRigOperatorCli2(operatorArgv);
+      } finally {
+        restorePublicIdentityEnv();
+      }
       return;
     }
     case "help":
@@ -17568,7 +17578,7 @@ async function executeRun(context, args, deps = {}) {
       const runs = await listRuns(context.projectRoot);
       if (text)
         printFormattedOutput(formatRunList(runs.map(toRunLike2)));
-      return { ok: true, group: "run", command, details: { runs: runs.map(toRunLike2) } };
+      return { ok: true, group: "run", command, details: { runs: runs.map(toRunLike2), source: "local" } };
     }
     case "status": {
       requireNoExtraArgs(rest, "rig run status");

package/dist/src/commands.js

@@ -16013,7 +16013,7 @@ function scanRootCommand(argv) {
       break;
     const kind = preCommandFlagKind(arg);
     if (kind === undefined) {
-      return { kind: "command", command: arg, skippedHostOnly, skippedOperatorOnly };
+      return { kind: "command", command: arg, index, skippedHostOnly, skippedOperatorOnly };
     }
     if (kind === "host")
       skippedHostOnly = true;
@@ -16034,19 +16034,18 @@ function valueAfter(argv, flag) {
   const value = index >= 0 ? argv[index + 1]?.trim() : undefined;
   return value ? value : undefined;
 }
-function explicitRunRoute(argv, workspaceRoot) {
-  const stripped = stripRootWorkspace(argv);
-  const taskRef = valueAfter(stripped, "--task") ?? stripped.slice(1).find((arg) => !arg.startsWith("-"))?.trim();
+function explicitRunRoute(runArgs, workspaceRoot) {
+  const taskRef = valueAfter(runArgs, "--task") ?? runArgs.find((arg) => !arg.startsWith("-"))?.trim();
   if (!taskRef) {
-    return { kind: "unsupported", argv, message: "Usage: rig run <task> [--title <title>] [--model <model>] [--prompt <prompt>]." };
+    return { kind: "unsupported", argv: runArgs, message: "Usage: rig run <task> [--title <title>] [--model <model>] [--prompt <prompt>]." };
   }
   return {
     kind: "run",
     taskRef,
     workspaceRoot,
-    title: valueAfter(stripped, "--title"),
-    model: valueAfter(stripped, "--model"),
-    prompt: valueAfter(stripped, "--prompt") ?? valueAfter(stripped, "--initial-prompt")
+    title: valueAfter(runArgs, "--title"),
+    model: valueAfter(runArgs, "--model"),
+    prompt: valueAfter(runArgs, "--prompt") ?? valueAfter(runArgs, "--initial-prompt")
   };
 }
 function resolveRigRootRoute(argv) {
@@ -16089,13 +16088,13 @@ function resolveRigRootRoute(argv) {
     };
   }
   if (command === "run") {
-    const runArgs = stripRootWorkspace(argv).slice(1);
+    const runArgs = stripRootWorkspace(argv.slice(scanned.index + 1));
     const firstRunArg = runArgs[0];
     const firstArgIsGroupSubcommand = firstRunArg !== undefined && !firstRunArg.startsWith("-") && isRunGroupInvocation(firstRunArg);
     const forcedDispatch = Boolean(process.env.RIG_RUN_ID) || valueAfter(runArgs, "--task") !== undefined && !firstArgIsGroupSubcommand;
     const runArg = runArgs.find((arg) => !arg.startsWith("-"));
     if (forcedDispatch || !isRunGroupInvocation(runArg))
-      return explicitRunRoute(argv, workspaceRoot);
+      return explicitRunRoute(runArgs, workspaceRoot);
     return workspaceRoot ? { kind: "operator", argv: stripRootWorkspace(argv), workspaceRoot } : { kind: "operator", argv: stripRootWorkspace(argv) };
   }
   if (isOmpRootCommand(command)) {
@@ -16261,21 +16260,32 @@ async function runRigRootCli(argv = process.argv.slice(2)) {
     }
     case "run": {
       const projectRoot = resolve58(route.workspaceRoot ?? process.cwd());
-      const { runRunProcess } = await import("@rig/rig-host");
-      await runRunProcess({
-        projectRoot,
-        taskId: route.taskRef,
-        title: route.title,
-        model: route.model,
-        prompt: route.prompt,
-        writeStdout: (text) => process.stdout.write(text)
-      });
+      const restorePublicIdentityEnv = applyPublicIdentityEnv(projectRoot);
+      try {
+        const { runRunProcess } = await import("@rig/rig-host");
+        await runRunProcess({
+          projectRoot,
+          taskId: route.taskRef,
+          title: route.title,
+          model: route.model,
+          prompt: route.prompt,
+          writeStdout: (text) => process.stdout.write(text)
+        });
+      } finally {
+        restorePublicIdentityEnv();
+      }
       return;
     }
     case "operator": {
-      const { runRigOperatorCli: runRigOperatorCli2 } = await init_operator_cli().then(() => exports_operator_cli);
-      const operatorArgv = route.workspaceRoot ? ["--project", route.workspaceRoot, ...route.argv] : [...route.argv];
-      await runRigOperatorCli2(operatorArgv);
+      const projectRoot = resolve58(route.workspaceRoot ?? process.cwd());
+      const restorePublicIdentityEnv = applyPublicIdentityEnv(projectRoot);
+      try {
+        const { runRigOperatorCli: runRigOperatorCli2 } = await init_operator_cli().then(() => exports_operator_cli);
+        const operatorArgv = route.workspaceRoot ? ["--project", route.workspaceRoot, ...route.argv] : [...route.argv];
+        await runRigOperatorCli2(operatorArgv);
+      } finally {
+        restorePublicIdentityEnv();
+      }
       return;
     }
     case "help":
@@ -16497,7 +16507,7 @@ async function executeRun(context, args, deps = {}) {
       const runs = await listRuns(context.projectRoot);
       if (text)
         printFormattedOutput(formatRunList(runs.map(toRunLike2)));
-      return { ok: true, group: "run", command, details: { runs: runs.map(toRunLike2) } };
+      return { ok: true, group: "run", command, details: { runs: runs.map(toRunLike2), source: "local" } };
     }
     case "status": {
       requireNoExtraArgs(rest, "rig run status");

package/dist/src/index.js

@@ -16013,7 +16013,7 @@ function scanRootCommand(argv) {
       break;
     const kind = preCommandFlagKind(arg);
     if (kind === undefined) {
-      return { kind: "command", command: arg, skippedHostOnly, skippedOperatorOnly };
+      return { kind: "command", command: arg, index, skippedHostOnly, skippedOperatorOnly };
     }
     if (kind === "host")
       skippedHostOnly = true;
@@ -16034,19 +16034,18 @@ function valueAfter(argv, flag) {
   const value = index >= 0 ? argv[index + 1]?.trim() : undefined;
   return value ? value : undefined;
 }
-function explicitRunRoute(argv, workspaceRoot) {
-  const stripped = stripRootWorkspace(argv);
-  const taskRef = valueAfter(stripped, "--task") ?? stripped.slice(1).find((arg) => !arg.startsWith("-"))?.trim();
+function explicitRunRoute(runArgs, workspaceRoot) {
+  const taskRef = valueAfter(runArgs, "--task") ?? runArgs.find((arg) => !arg.startsWith("-"))?.trim();
   if (!taskRef) {
-    return { kind: "unsupported", argv, message: "Usage: rig run <task> [--title <title>] [--model <model>] [--prompt <prompt>]." };
+    return { kind: "unsupported", argv: runArgs, message: "Usage: rig run <task> [--title <title>] [--model <model>] [--prompt <prompt>]." };
   }
   return {
     kind: "run",
     taskRef,
     workspaceRoot,
-    title: valueAfter(stripped, "--title"),
-    model: valueAfter(stripped, "--model"),
-    prompt: valueAfter(stripped, "--prompt") ?? valueAfter(stripped, "--initial-prompt")
+    title: valueAfter(runArgs, "--title"),
+    model: valueAfter(runArgs, "--model"),
+    prompt: valueAfter(runArgs, "--prompt") ?? valueAfter(runArgs, "--initial-prompt")
   };
 }
 function resolveRigRootRoute(argv) {
@@ -16089,13 +16088,13 @@ function resolveRigRootRoute(argv) {
     };
   }
   if (command === "run") {
-    const runArgs = stripRootWorkspace(argv).slice(1);
+    const runArgs = stripRootWorkspace(argv.slice(scanned.index + 1));
     const firstRunArg = runArgs[0];
     const firstArgIsGroupSubcommand = firstRunArg !== undefined && !firstRunArg.startsWith("-") && isRunGroupInvocation(firstRunArg);
     const forcedDispatch = Boolean(process.env.RIG_RUN_ID) || valueAfter(runArgs, "--task") !== undefined && !firstArgIsGroupSubcommand;
     const runArg = runArgs.find((arg) => !arg.startsWith("-"));
     if (forcedDispatch || !isRunGroupInvocation(runArg))
-      return explicitRunRoute(argv, workspaceRoot);
+      return explicitRunRoute(runArgs, workspaceRoot);
     return workspaceRoot ? { kind: "operator", argv: stripRootWorkspace(argv), workspaceRoot } : { kind: "operator", argv: stripRootWorkspace(argv) };
   }
   if (isOmpRootCommand(command)) {
@@ -16261,21 +16260,32 @@ async function runRigRootCli(argv = process.argv.slice(2)) {
     }
     case "run": {
       const projectRoot = resolve58(route.workspaceRoot ?? process.cwd());
-      const { runRunProcess } = await import("@rig/rig-host");
-      await runRunProcess({
-        projectRoot,
-        taskId: route.taskRef,
-        title: route.title,
-        model: route.model,
-        prompt: route.prompt,
-        writeStdout: (text) => process.stdout.write(text)
-      });
+      const restorePublicIdentityEnv = applyPublicIdentityEnv(projectRoot);
+      try {
+        const { runRunProcess } = await import("@rig/rig-host");
+        await runRunProcess({
+          projectRoot,
+          taskId: route.taskRef,
+          title: route.title,
+          model: route.model,
+          prompt: route.prompt,
+          writeStdout: (text) => process.stdout.write(text)
+        });
+      } finally {
+        restorePublicIdentityEnv();
+      }
       return;
     }
     case "operator": {
-      const { runRigOperatorCli: runRigOperatorCli2 } = await init_operator_cli().then(() => exports_operator_cli);
-      const operatorArgv = route.workspaceRoot ? ["--project", route.workspaceRoot, ...route.argv] : [...route.argv];
-      await runRigOperatorCli2(operatorArgv);
+      const projectRoot = resolve58(route.workspaceRoot ?? process.cwd());
+      const restorePublicIdentityEnv = applyPublicIdentityEnv(projectRoot);
+      try {
+        const { runRigOperatorCli: runRigOperatorCli2 } = await init_operator_cli().then(() => exports_operator_cli);
+        const operatorArgv = route.workspaceRoot ? ["--project", route.workspaceRoot, ...route.argv] : [...route.argv];
+        await runRigOperatorCli2(operatorArgv);
+      } finally {
+        restorePublicIdentityEnv();
+      }
       return;
     }
     case "help":
@@ -16497,7 +16507,7 @@ async function executeRun(context, args, deps = {}) {
       const runs = await listRuns(context.projectRoot);
       if (text)
         printFormattedOutput(formatRunList(runs.map(toRunLike2)));
-      return { ok: true, group: "run", command, details: { runs: runs.map(toRunLike2) } };
+      return { ok: true, group: "run", command, details: { runs: runs.map(toRunLike2), source: "local" } };
     }
     case "status": {
       requireNoExtraArgs(rest, "rig run status");

package/dist/src/operator-cli.js

@@ -15668,7 +15668,7 @@ function scanRootCommand(argv) {
       break;
     const kind = preCommandFlagKind(arg);
     if (kind === undefined) {
-      return { kind: "command", command: arg, skippedHostOnly, skippedOperatorOnly };
+      return { kind: "command", command: arg, index, skippedHostOnly, skippedOperatorOnly };
     }
     if (kind === "host")
       skippedHostOnly = true;
@@ -15689,19 +15689,18 @@ function valueAfter(argv, flag) {
   const value = index >= 0 ? argv[index + 1]?.trim() : undefined;
   return value ? value : undefined;
 }
-function explicitRunRoute(argv, workspaceRoot) {
-  const stripped = stripRootWorkspace(argv);
-  const taskRef = valueAfter(stripped, "--task") ?? stripped.slice(1).find((arg) => !arg.startsWith("-"))?.trim();
+function explicitRunRoute(runArgs, workspaceRoot) {
+  const taskRef = valueAfter(runArgs, "--task") ?? runArgs.find((arg) => !arg.startsWith("-"))?.trim();
   if (!taskRef) {
-    return { kind: "unsupported", argv, message: "Usage: rig run <task> [--title <title>] [--model <model>] [--prompt <prompt>]." };
+    return { kind: "unsupported", argv: runArgs, message: "Usage: rig run <task> [--title <title>] [--model <model>] [--prompt <prompt>]." };
   }
   return {
     kind: "run",
     taskRef,
     workspaceRoot,
-    title: valueAfter(stripped, "--title"),
-    model: valueAfter(stripped, "--model"),
-    prompt: valueAfter(stripped, "--prompt") ?? valueAfter(stripped, "--initial-prompt")
+    title: valueAfter(runArgs, "--title"),
+    model: valueAfter(runArgs, "--model"),
+    prompt: valueAfter(runArgs, "--prompt") ?? valueAfter(runArgs, "--initial-prompt")
   };
 }
 function resolveRigRootRoute(argv) {
@@ -15744,13 +15743,13 @@ function resolveRigRootRoute(argv) {
     };
   }
   if (command === "run") {
-    const runArgs = stripRootWorkspace(argv).slice(1);
+    const runArgs = stripRootWorkspace(argv.slice(scanned.index + 1));
     const firstRunArg = runArgs[0];
     const firstArgIsGroupSubcommand = firstRunArg !== undefined && !firstRunArg.startsWith("-") && isRunGroupInvocation(firstRunArg);
     const forcedDispatch = Boolean(process.env.RIG_RUN_ID) || valueAfter(runArgs, "--task") !== undefined && !firstArgIsGroupSubcommand;
     const runArg = runArgs.find((arg) => !arg.startsWith("-"));
     if (forcedDispatch || !isRunGroupInvocation(runArg))
-      return explicitRunRoute(argv, workspaceRoot);
+      return explicitRunRoute(runArgs, workspaceRoot);
     return workspaceRoot ? { kind: "operator", argv: stripRootWorkspace(argv), workspaceRoot } : { kind: "operator", argv: stripRootWorkspace(argv) };
   }
   if (isOmpRootCommand(command)) {
@@ -15916,21 +15915,32 @@ async function runRigRootCli(argv = process.argv.slice(2)) {
     }
     case "run": {
       const projectRoot = resolve56(route.workspaceRoot ?? process.cwd());
-      const { runRunProcess } = await import("@rig/rig-host");
-      await runRunProcess({
-        projectRoot,
-        taskId: route.taskRef,
-        title: route.title,
-        model: route.model,
-        prompt: route.prompt,
-        writeStdout: (text) => process.stdout.write(text)
-      });
+      const restorePublicIdentityEnv = applyPublicIdentityEnv(projectRoot);
+      try {
+        const { runRunProcess } = await import("@rig/rig-host");
+        await runRunProcess({
+          projectRoot,
+          taskId: route.taskRef,
+          title: route.title,
+          model: route.model,
+          prompt: route.prompt,
+          writeStdout: (text) => process.stdout.write(text)
+        });
+      } finally {
+        restorePublicIdentityEnv();
+      }
       return;
     }
     case "operator": {
-      const { runRigOperatorCli } = await init_operator_cli().then(() => exports_operator_cli);
-      const operatorArgv = route.workspaceRoot ? ["--project", route.workspaceRoot, ...route.argv] : [...route.argv];
-      await runRigOperatorCli(operatorArgv);
+      const projectRoot = resolve56(route.workspaceRoot ?? process.cwd());
+      const restorePublicIdentityEnv = applyPublicIdentityEnv(projectRoot);
+      try {
+        const { runRigOperatorCli } = await init_operator_cli().then(() => exports_operator_cli);
+        const operatorArgv = route.workspaceRoot ? ["--project", route.workspaceRoot, ...route.argv] : [...route.argv];
+        await runRigOperatorCli(operatorArgv);
+      } finally {
+        restorePublicIdentityEnv();
+      }
       return;
     }
     case "help":
@@ -16152,7 +16162,7 @@ async function executeRun(context, args, deps = {}) {
       const runs = await listRuns(context.projectRoot);
       if (text)
         printFormattedOutput(formatRunList(runs.map(toRunLike2)));
-      return { ok: true, group: "run", command, details: { runs: runs.map(toRunLike2) } };
+      return { ok: true, group: "run", command, details: { runs: runs.map(toRunLike2), source: "local" } };
     }
     case "status": {
       requireNoExtraArgs(rest, "rig run status");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/cli",
-  "version": "0.0.6-alpha.92",
+  "version": "0.0.6-alpha.94",
   "type": "module",
   "description": "Rig CLI launcher for upstream OMP collab; legacy operator entrypoints are retired.",
   "license": "UNLICENSED",
@@ -28,15 +28,15 @@
     "@oh-my-pi/pi-coding-agent": "16.0.4",
     "@oh-my-pi/pi-tui": "16.0.4",
     "@oh-my-pi/pi-utils": "16.0.4",
-    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.92",
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.92",
-    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.92",
-    "@rig/relay-registry": "npm:@h-rig/relay-registry@0.0.6-alpha.92",
-    "@rig/rig-extension": "npm:@h-rig/rig-extension@0.0.6-alpha.92",
-    "@rig/rig-host": "npm:@h-rig/rig-host@0.0.6-alpha.92",
-    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.92",
-    "@rig/shared": "npm:@h-rig/shared@0.0.6-alpha.92",
-    "@rig/standard-plugin": "npm:@h-rig/standard-plugin@0.0.6-alpha.92",
+    "@rig/client": "npm:@h-rig/client@0.0.6-alpha.94",
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.94",
+    "@rig/core": "npm:@h-rig/core@0.0.6-alpha.94",
+    "@rig/relay-registry": "npm:@h-rig/relay-registry@0.0.6-alpha.94",
+    "@rig/rig-extension": "npm:@h-rig/rig-extension@0.0.6-alpha.94",
+    "@rig/rig-host": "npm:@h-rig/rig-host@0.0.6-alpha.94",
+    "@rig/runtime": "npm:@h-rig/runtime@0.0.6-alpha.94",
+    "@rig/shared": "npm:@h-rig/shared@0.0.6-alpha.94",
+    "@rig/standard-plugin": "npm:@h-rig/standard-plugin@0.0.6-alpha.94",
     "@xterm/headless": "^6.0.0",
     "effect": "4.0.0-beta.78",
     "picocolors": "^1.1.1",