diff --git a/src/lib/global-cli-actions.ts b/src/lib/global-cli-actions.ts
index 09571b0f69e..8381fccdf9a 100644
--- a/src/lib/global-cli-actions.ts
+++ b/src/lib/global-cli-actions.ts
@@ -4,19 +4,24 @@
 /* v8 ignore start -- transitional action facade until implementations leave src/nemoclaw.ts. */
 
 import { runDeployAction as executeDeployAction } from "./deploy-action";
+import {
+  runOnboardAction as executeOnboardAction,
+  runSetupAction as executeSetupAction,
+  runSetupSparkAction as executeSetupSparkAction,
+} from "./onboard-action";
 import { getNemoClawRuntimeBridge } from "./nemoclaw-runtime-bridge";
 import { help, version } from "./root-help-action";
 
 export async function runOnboardAction(args: string[] = []): Promise<void> {
-  await getNemoClawRuntimeBridge().onboard(args);
+  await executeOnboardAction(args);
 }
 
 export async function runSetupAction(args: string[] = []): Promise<void> {
-  await getNemoClawRuntimeBridge().setup(args);
+  await executeSetupAction(args);
 }
 
 export async function runSetupSparkAction(args: string[] = []): Promise<void> {
-  await getNemoClawRuntimeBridge().setupSpark(args);
+  await executeSetupSparkAction(args);
 }
 
 export async function runDeployAction(instanceName?: string): Promise<void> {
diff --git a/src/lib/nemoclaw-runtime-bridge.ts b/src/lib/nemoclaw-runtime-bridge.ts
index 22a04a22c5a..1e520887a49 100644
--- a/src/lib/nemoclaw-runtime-bridge.ts
+++ b/src/lib/nemoclaw-runtime-bridge.ts
@@ -26,7 +26,6 @@ export interface NemoClawRuntimeBridge {
   ) => { status: number | null; output: string };
   backupAll: () => void;
   garbageCollectImages: (args?: string[]) => Promise<void>;
-  onboard: (args?: string[]) => Promise<void>;
   recoverNamedGatewayRuntime: () => Promise<GatewayRecoveryResult>;
   recoverRegistryEntries: (options?: {
     requestedSandboxName?: string | null;
@@ -55,8 +54,6 @@ export interface NemoClawRuntimeBridge {
   sandboxSkillInstall: (sandboxName: string, args?: string[]) => Promise<void>;
   sandboxSnapshot: (sandboxName: string, subArgs: string[]) => Promise<void>;
   sandboxStatus: (sandboxName: string) => Promise<void>;
-  setup: (args?: string[]) => Promise<void>;
-  setupSpark: (args?: string[]) => Promise<void>;
   upgradeSandboxes: (args?: string[]) => Promise<void>;
 }
 
diff --git a/src/lib/onboard-action.ts b/src/lib/onboard-action.ts
new file mode 100644
index 00000000000..53a099baac2
--- /dev/null
+++ b/src/lib/onboard-action.ts
@@ -0,0 +1,42 @@
+// SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { listAgents } from "./agent-defs";
+import { runDeprecatedOnboardAliasCommand, runOnboardCommand } from "./onboard-command";
+import { NOTICE_ACCEPT_ENV, NOTICE_ACCEPT_FLAG } from "./usage-notice";
+
+const { onboard: runOnboard } = require("./onboard") as {
+  onboard: (options?: unknown) => Promise<void>;
+};
+
+function buildOnboardCommandDeps(args: string[]) {
+  return {
+    args,
+    noticeAcceptFlag: NOTICE_ACCEPT_FLAG,
+    noticeAcceptEnv: NOTICE_ACCEPT_ENV,
+    env: process.env,
+    runOnboard,
+    listAgents,
+    log: console.log,
+    error: console.error,
+    exit: (code: number) => process.exit(code),
+  };
+}
+
+export async function runOnboardAction(args: string[]): Promise<void> {
+  await runOnboardCommand(buildOnboardCommandDeps(args));
+}
+
+export async function runSetupAction(args: string[] = []): Promise<void> {
+  await runDeprecatedOnboardAliasCommand({
+    ...buildOnboardCommandDeps(args),
+    kind: "setup",
+  });
+}
+
+export async function runSetupSparkAction(args: string[] = []): Promise<void> {
+  await runDeprecatedOnboardAliasCommand({
+    ...buildOnboardCommandDeps(args),
+    kind: "setup-spark",
+  });
+}
diff --git a/src/nemoclaw.ts b/src/nemoclaw.ts
index 64b5a7d895d..6e74b5426fc 100644
--- a/src/nemoclaw.ts
+++ b/src/nemoclaw.ts
@@ -57,8 +57,6 @@ const { help, version } = require("./lib/root-help-action");
 const onboardSession = require("./lib/onboard-session");
 import type { Session } from "./lib/onboard-session";
 const { parseLiveSandboxNames } = require("./lib/runtime-recovery");
-const { NOTICE_ACCEPT_ENV, NOTICE_ACCEPT_FLAG } = require("./lib/usage-notice");
-const { runDeprecatedOnboardAliasCommand, runOnboardCommand } = require("./lib/onboard-command");
 const {
   captureOpenshellCommandAsync,
   captureOpenshellCommand,
@@ -701,7 +699,6 @@ exports.runtimeBridge = {
   captureOpenshell,
   backupAll,
   garbageCollectImages,
-  onboard,
   recoverNamedGatewayRuntime,
   recoverRegistryEntries,
   runOpenshell,
@@ -720,8 +717,6 @@ exports.runtimeBridge = {
   sandboxSkillInstall,
   sandboxSnapshot,
   sandboxStatus,
-  setup,
-  setupSpark,
   upgradeSandboxes,
 };
 exports.ensureLiveSandboxOrExit = ensureLiveSandboxOrExit;
@@ -1272,40 +1267,6 @@ function exitWithSpawnResult(result: SpawnLikeResult & { signal?: NodeJS.Signals
 
 // ── Commands ─────────────────────────────────────────────────────
 
-function buildOnboardCommandDeps(args: string[]) {
-  const { onboard: runOnboard } = require("./lib/onboard");
-  const { listAgents } = require("./lib/agent-defs");
-  return {
-    args,
-    noticeAcceptFlag: NOTICE_ACCEPT_FLAG,
-    noticeAcceptEnv: NOTICE_ACCEPT_ENV,
-    env: process.env,
-    runOnboard,
-    listAgents,
-    log: console.log,
-    error: console.error,
-    exit: (code: number) => process.exit(code),
-  };
-}
-
-async function onboard(args: string[]): Promise<void> {
-  await runOnboardCommand(buildOnboardCommandDeps(args));
-}
-
-async function setup(args: string[] = []): Promise<void> {
-  await runDeprecatedOnboardAliasCommand({
-    ...buildOnboardCommandDeps(args),
-    kind: "setup",
-  });
-}
-
-async function setupSpark(args: string[] = []): Promise<void> {
-  await runDeprecatedOnboardAliasCommand({
-    ...buildOnboardCommandDeps(args),
-    kind: "setup-spark",
-  });
-}
-
 async function runOclif(commandId: string, args: string[] = []): Promise<void> {
   await runRegisteredOclifCommand(commandId, args, {
     rootDir: ROOT,