refactor(cli): route buffered sandbox exec through adapter

ci/source-architecture-budget.json

@@ -9,7 +9,8 @@
       "src/lib/adapters/openshell/client.ts": 21,
       "src/lib/adapters/openshell/command-argv.ts": 23,
       "src/lib/adapters/openshell/resolve.ts": 25,
-      "src/lib/adapters/openshell/runtime.ts": 53,
+      "src/lib/adapters/openshell/runtime.ts": 50,
+      "src/lib/adapters/openshell/sandbox-observer.ts": 29,
       "src/lib/adapters/openshell/timeouts.ts": 33,
       "src/lib/agent/defs.ts": 32,
       "src/lib/cli/branding.ts": 80,
@@ -30,32 +31,34 @@
       "src/lib/state/onboard-session.ts": 35,
       "src/lib/state/registry.ts": 96,
       "src/lib/state/state-root.ts": 21,
-      "src/lib/subprocess-env.ts": 22,
+      "src/lib/subprocess-env.ts": 24,
       "src/lib/validation.ts": 24
     }
   },
   "fanOut": {
     "defaultMax": 20,
     "maxByFile": {
       "src/lib/actions/inference-set.ts": 31,
-      "src/lib/actions/sandbox/connect.ts": 42,
+      "src/lib/actions/sandbox/connect.ts": 43,
       "src/lib/actions/sandbox/destroy.ts": 28,
-      "src/lib/actions/sandbox/doctor.ts": 27,
+      "src/lib/actions/sandbox/doctor.ts": 28,
       "src/lib/actions/sandbox/gateway-state.ts": 21,
       "src/lib/actions/sandbox/status-snapshot.ts": 19,
       "src/lib/actions/sandbox/policy-channel.ts": 30,
-      "src/lib/actions/sandbox/process-recovery.ts": 20,
+      "src/lib/actions/sandbox/process-recovery.ts": 22,
       "src/lib/actions/sandbox/rebuild-pipeline.ts": 30,
       "src/lib/actions/sandbox/snapshot.ts": 37,
       "src/lib/actions/uninstall/run-plan.ts": 25,
       "src/lib/inference/local.ts": 22,
       "src/lib/inference/onboard-probes.ts": 21,
       "src/lib/inference/vllm.ts": 20,
-      "src/lib/onboard.ts": 191,
+      "src/lib/onboard.ts": 192,
+      "src/lib/onboard/sandbox-gpu-create-run-attempt.ts": 21,
       "src/lib/onboard/machine/handlers/sandbox.ts": 21,
       "src/lib/policy/index.ts": 22,
       "src/lib/sandbox/config.ts": 19,
-      "src/lib/state/sandbox.ts": 21
+      "src/lib/state/sandbox.ts": 21,
+      "scripts/checks/run-managed-image-openshell-e2e.ts": 21
     }
   },
   "allowedCycles": [],

scripts/checks/layer-import-boundaries.mts

@@ -57,6 +57,13 @@ const MANAGED_STATE_ROOT_PROVIDER_MODULES = [
   "src/lib/onboard/managed-bootstrap/docker.ts",
   "src/lib/onboard/managed-bootstrap/podman-runtime.ts",
 ] as const;
+const LEGACY_BUFFERED_EXEC_HELPER = "src/lib/actions/sandbox/exec.ts";
+const INTERACTIVE_EXEC_HELPER_IMPORTERS = new Set([
+  "src/lib/actions/sandbox/agent/passthrough-json.ts",
+  "src/lib/actions/sandbox/agent/passthrough.ts",
+  "src/lib/actions/sandbox/launch.ts",
+  "src/lib/actions/sandbox/sessions/passthrough.ts",
+]);
 const MANAGED_AGENT_IDS = new Set(["openclaw", "hermes", "langchain-deepagents-code", "pi"]);
 
 function toRepoPath(absPath: string): string {
@@ -379,6 +386,66 @@ function checkNoBinLibShimImport(
   }
 }
 
+function checkBufferedExecHelperImport(
+  absPath: string,
+  repoPath: string,
+  sourceFile: ts.SourceFile,
+  violations: Violation[],
+): void {
+  if (repoPath === LEGACY_BUFFERED_EXEC_HELPER || INTERACTIVE_EXEC_HELPER_IMPORTERS.has(repoPath)) {
+    return;
+  }
+  const namespaceImports = new Set<string>();
+  for (const statement of sourceFile.statements) {
+    if (
+      !ts.isImportDeclaration(statement) ||
+      !ts.isStringLiteralLike(statement.moduleSpecifier) ||
+      resolveInternalImport(absPath, statement.moduleSpecifier.text) !== LEGACY_BUFFERED_EXEC_HELPER
+    ) {
+      continue;
+    }
+    const bindings = statement.importClause?.namedBindings;
+    if (bindings && ts.isNamedImports(bindings)) {
+      for (const binding of bindings.elements) {
+        if ((binding.propertyName?.text ?? binding.name.text) !== "buildOpenshellExecArgs")
+          continue;
+        const pos = position(sourceFile, binding);
+        addViolation(
+          violations,
+          repoPath,
+          pos.line,
+          pos.column,
+          "buffered-exec-uses-async-executor",
+          "buffered sandbox execution must use the async command executor instead of buildOpenshellExecArgs",
+        );
+      }
+    } else if (bindings && ts.isNamespaceImport(bindings)) {
+      namespaceImports.add(bindings.name.text);
+    }
+  }
+  if (namespaceImports.size === 0) return;
+  const visit = (node: ts.Node): void => {
+    if (
+      ts.isPropertyAccessExpression(node) &&
+      ts.isIdentifier(node.expression) &&
+      namespaceImports.has(node.expression.text) &&
+      node.name.text === "buildOpenshellExecArgs"
+    ) {
+      const pos = position(sourceFile, node);
+      addViolation(
+        violations,
+        repoPath,
+        pos.line,
+        pos.column,
+        "buffered-exec-uses-async-executor",
+        "buffered sandbox execution must use the async command executor instead of buildOpenshellExecArgs",
+      );
+    }
+    ts.forEachChild(node, visit);
+  };
+  visit(sourceFile);
+}
+
 function checkMessagingManifestFile(
   absPath: string,
   repoPath: string,
@@ -506,11 +573,23 @@ export function findLayerImportBoundaryViolations(root = SRC_ROOT): Violation[]
     const messagingManifestFile = isMessagingManifestFile(repoPath);
     const commandFile = isCommandFile(repoPath);
     const source = readFileSync(absPath, "utf8");
-    if (!domainFile && !actionFile && !adapterFile && !messagingManifestFile && !commandFile) {
-      checkNoBinLibShimImport(absPath, repoPath, collectPreprocessedImportRefs(source), violations);
+    const preprocessedImports = collectPreprocessedImportRefs(source);
+    const importsBufferedExecHelper =
+      repoPath !== LEGACY_BUFFERED_EXEC_HELPER &&
+      !INTERACTIVE_EXEC_HELPER_IMPORTERS.has(repoPath) &&
+      preprocessedImports.some(
+        (ref) => resolveInternalImport(absPath, ref.specifier) === LEGACY_BUFFERED_EXEC_HELPER,
+      );
+    const layerFile =
+      domainFile || actionFile || adapterFile || messagingManifestFile || commandFile;
+    if (!layerFile && !importsBufferedExecHelper) {
+      checkNoBinLibShimImport(absPath, repoPath, preprocessedImports, violations);
       continue;
     }
     const sourceFile = sourceFileFor(absPath, source);
+    if (importsBufferedExecHelper) {
+      checkBufferedExecHelperImport(absPath, repoPath, sourceFile, violations);
+    }
     const imports = collectImportRefs(sourceFile);
     checkNoBinLibShimImport(absPath, repoPath, imports, violations);
     if (domainFile) {

scripts/checks/run-managed-image-openshell-e2e.ts

@@ -9,6 +9,7 @@ import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { resolveAgent } from "../../src/lib/agent/onboard.ts";
 import { parseOpenShellSandboxId } from "../../src/lib/adapters/openshell/sandbox-identity.ts";
+import { createCliOpenShellSandboxCommandExecutor } from "../../src/lib/adapters/openshell/sandbox-command-cli.ts";
 import { createCliOpenShellSandboxObserverFromRunner } from "../../src/lib/adapters/openshell/sandbox-observer-cli.ts";
 import { isValidName, NAME_ALLOWED_FORMAT } from "../../src/lib/name-validation.ts";
 import {
@@ -67,6 +68,7 @@ import {
 // and profile policy remains in managed-image-protected-runtime-contract.ts.
 
 const MANAGED_AGENTS = new Set<ShippedManagedImageAgent>(SHIPPED_MANAGED_IMAGE_AGENTS);
+const REPOSITORY_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..", "..");
 const MODEL = "nvidia/nemotron-3-ultra-550b-a55b";
 const GATEWAY_NAME = "nemoclaw";
 const GATEWAY_PORT = 8080;
@@ -367,12 +369,7 @@ export function parseManagedImageOpenShellE2eInputs(argv: readonly string[]): In
 }
 
 export function managedImageOpenShellBasePolicyPath(agent: ShippedManagedImageAgent): string {
-  return path.resolve(
-    path.dirname(fileURLToPath(import.meta.url)),
-    "..",
-    "..",
-    ...MANAGED_AGENT_BASE_POLICIES[agent],
-  );
+  return path.resolve(REPOSITORY_ROOT, ...MANAGED_AGENT_BASE_POLICIES[agent]);
 }
 
 export interface ManagedImageCommandResult {
@@ -784,8 +781,10 @@ function assertProtectedLocalInference(
 export function failureInjectingAdapter(
   onboard: OnboardModule,
   stateRoot: string,
+  commandExecutor = createCliOpenShellSandboxCommandExecutor({ hostCwd: REPOSITORY_ROOT }),
 ): ManagedBootstrapAdapter {
   const adapter = createDockerManagedBootstrapAdapter({
+    commandExecutor,
     runCaptureOpenshell: onboard.runCaptureOpenshell,
     runOpenshell: onboard.runOpenshell,
     sleep: onboard.sleepSeconds,
@@ -1139,6 +1138,9 @@ async function run<T extends ManagedImageOpenShellE2eLocalInferenceEvidence = ne
           detail: null,
           at: new Date().toISOString(),
         });
+    const commandExecutor = createCliOpenShellSandboxCommandExecutor({
+      hostCwd: REPOSITORY_ROOT,
+    });
     let flow: Awaited<ReturnType<typeof runSandboxGpuCreateFlow>> | null = null;
     try {
       flow = await runSandboxGpuCreateFlow(
@@ -1179,6 +1181,7 @@ async function run<T extends ManagedImageOpenShellE2eLocalInferenceEvidence = ne
           ...startupPlan,
         },
         {
+          commandExecutor,
           runOpenshell: onboard.runOpenshell,
           runCaptureOpenshell: onboard.runCaptureOpenshell,
           sandboxObserver: createCliOpenShellSandboxObserverFromRunner(onboard.runOpenshell),
@@ -1188,7 +1191,7 @@ async function run<T extends ManagedImageOpenShellE2eLocalInferenceEvidence = ne
           ...(input.failureInjection
             ? {
                 createManagedBootstrapAdapter: (stateRoot: string) =>
-                  failureInjectingAdapter(onboard!, stateRoot),
+                  failureInjectingAdapter(onboard!, stateRoot, commandExecutor),
               }
             : {}),
         },

src/commands/sandbox/gateway/restart.ts

@@ -31,7 +31,7 @@ export default class GatewayRestartCliCommand extends NemoClawCommand {
 
   public async run(): Promise<void> {
     const { args, flags } = await this.parse(GatewayRestartCliCommand);
-    const result = restartSandboxGateway(args.sandboxName, { quiet: flags.quiet === true });
+    const result = await restartSandboxGateway(args.sandboxName, { quiet: flags.quiet === true });
     if (!result.ok) {
       this.setExitCode(1);
     }