refactor(cli): group openshell adapters

scripts/check-legacy-migrated-paths.ts

@@ -34,7 +34,7 @@ const REMOVED_SHIM_MOVES: Record<string, string> = {
   "bin/lib/platform.js": "src/lib/platform.ts",
   "bin/lib/preflight.js": "src/lib/preflight.ts",
   "bin/lib/registry.js": "src/lib/registry.ts",
-  "bin/lib/resolve-openshell.js": "src/lib/resolve-openshell.ts",
+  "bin/lib/resolve-openshell.js": "src/lib/adapters/openshell/resolve.ts",
   "bin/lib/runtime-recovery.js": "src/lib/runtime-recovery.ts",
   "bin/lib/sandbox-build-context.js": "src/lib/sandbox-build-context.ts",
   "bin/lib/services.js": "src/lib/services.ts",

src/lib/openshell.test.ts → src/lib/adapters/openshell/client.test.ts

@@ -14,7 +14,7 @@ import {
   runOpenshellCommand,
   stripAnsi,
   versionGte,
-} from "./openshell";
+} from "./client";
 
 interface SpawnResultSpec {
   status: number | null;

src/lib/resolve-openshell.test.ts → src/lib/adapters/openshell/resolve.test.ts

@@ -5,7 +5,7 @@ import { describe, it, expect } from "vitest";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { resolveOpenshell } from "../../dist/lib/resolve-openshell";
+import { resolveOpenshell } from "../../../../dist/lib/adapters/openshell/resolve";
 
 describe("lib/resolve-openshell", () => {
   it("returns command -v result when absolute path", () => {

src/lib/openshell-runtime.ts → src/lib/adapters/openshell/runtime.ts

@@ -5,15 +5,15 @@
 
 import type { StdioOptions } from "node:child_process";
 
-import { ROOT } from "./runner";
+import { ROOT } from "../../runner";
 import {
   captureOpenshellCommand,
   captureOpenshellCommandAsync,
   getInstalledOpenshellVersion,
   runOpenshellCommand,
-} from "./openshell";
-import { OPENSHELL_PROBE_TIMEOUT_MS } from "./openshell-timeouts";
-import { resolveOpenshell } from "./resolve-openshell";
+} from "./client";
+import { OPENSHELL_PROBE_TIMEOUT_MS } from "./timeouts";
+import { resolveOpenshell } from "./resolve";
 
 type CommandArgs = string[];
 

src/lib/openshell-timeouts.test.ts → src/lib/adapters/openshell/timeouts.test.ts

@@ -8,7 +8,7 @@ import {
   OPENSHELL_HEAVY_TIMEOUT_MS,
   OPENSHELL_OPERATION_TIMEOUT_MS,
   OPENSHELL_PROBE_TIMEOUT_MS,
-} from "./openshell-timeouts";
+} from "./timeouts";
 
 describe("openshell-timeouts", () => {
   it("exports positive integer constants", () => {

src/lib/commands/credentials/list.ts

@@ -5,7 +5,7 @@ import { Command, Flags } from "@oclif/core";
 
 import { CLI_NAME } from "../../branding";
 import { runOpenshellProviderCommand } from "../../global-cli-actions";
-import { OPENSHELL_OPERATION_TIMEOUT_MS } from "../../openshell-timeouts";
+import { OPENSHELL_OPERATION_TIMEOUT_MS } from "../../adapters/openshell/timeouts";
 import { isBridgeProviderName, recoverGatewayOrExit } from "./common";
 
 export default class CredentialsListCommand extends Command {

src/lib/commands/credentials/reset.ts

@@ -6,7 +6,7 @@ import { Args, Command, Flags } from "@oclif/core";
 import { CLI_NAME } from "../../branding";
 import { prompt as askPrompt } from "../../credentials";
 import { runOpenshellProviderCommand } from "../../global-cli-actions";
-import { OPENSHELL_OPERATION_TIMEOUT_MS } from "../../openshell-timeouts";
+import { OPENSHELL_OPERATION_TIMEOUT_MS } from "../../adapters/openshell/timeouts";
 import { isBridgeProviderName, recoverGatewayOrExit } from "./common";
 
 export default class CredentialsResetCommand extends Command {

src/lib/commands/debug.ts

@@ -8,11 +8,11 @@ import { runDebug } from "../debug";
 import type { DebugOptions } from "../debug";
 import type { RunDebugCommandDeps } from "../debug-command";
 import { runDebugCommandWithOptions } from "../debug-command";
-import type { CaptureOpenshellResult } from "../openshell";
-import { captureOpenshellCommand } from "../openshell";
-import { OPENSHELL_PROBE_TIMEOUT_MS } from "../openshell-timeouts";
+import type { CaptureOpenshellResult } from "../adapters/openshell/client";
+import { captureOpenshellCommand } from "../adapters/openshell/client";
+import { OPENSHELL_PROBE_TIMEOUT_MS } from "../adapters/openshell/timeouts";
 import * as registry from "../registry";
-import { resolveOpenshell } from "../resolve-openshell";
+import { resolveOpenshell } from "../adapters/openshell/resolve";
 import { parseLiveSandboxNames } from "../runtime-recovery";
 
 const useColor = !process.env.NO_COLOR && !!process.stderr.isTTY;

src/lib/commands/simple-global-oclif-adapters.test.ts

@@ -36,9 +36,9 @@ vi.mock("../global-cli-actions", () => ({
   showRootHelp: mocks.showRootHelp,
   showVersion: mocks.showVersion,
 }));
-vi.mock("../openshell", () => ({ captureOpenshellCommand: mocks.captureOpenshellCommand }));
+vi.mock("../adapters/openshell/client", () => ({ captureOpenshellCommand: mocks.captureOpenshellCommand }));
 vi.mock("../registry", () => ({ listSandboxes: mocks.listSandboxes }));
-vi.mock("../resolve-openshell", () => ({ resolveOpenshell: mocks.resolveOpenshell }));
+vi.mock("../adapters/openshell/resolve", () => ({ resolveOpenshell: mocks.resolveOpenshell }));
 vi.mock("../services", () => ({ startAll: mocks.startAll, stopAll: mocks.stopAll }));
 vi.mock("../services-command", () => ({
   runStartCommand: mocks.runStartCommand,

src/lib/gateway-runtime-action.ts

@@ -4,9 +4,9 @@
 const { startGatewayForRecovery } = require("./onboard") as {
   startGatewayForRecovery: () => Promise<void>;
 };
-import { OPENSHELL_OPERATION_TIMEOUT_MS, OPENSHELL_PROBE_TIMEOUT_MS } from "./openshell-timeouts";
-import { stripAnsi } from "./openshell";
-import { captureOpenshell, runOpenshell } from "./openshell-runtime";
+import { OPENSHELL_OPERATION_TIMEOUT_MS, OPENSHELL_PROBE_TIMEOUT_MS } from "./adapters/openshell/timeouts";
+import { stripAnsi } from "./adapters/openshell/client";
+import { captureOpenshell, runOpenshell } from "./adapters/openshell/runtime";
 
 function hasNamedGateway(output = ""): boolean {
   return stripAnsi(output).includes("Gateway: nemoclaw");

src/lib/global-cli-actions.test.ts

@@ -29,7 +29,7 @@ vi.mock("./onboard-action", () => ({
   runSetupAction: mocks.runSetupAction,
   runSetupSparkAction: mocks.runSetupSparkAction,
 }));
-vi.mock("./openshell-runtime", () => ({ runOpenshell: mocks.runOpenshell }));
+vi.mock("./adapters/openshell/runtime", () => ({ runOpenshell: mocks.runOpenshell }));
 vi.mock("./root-help-action", () => ({ help: mocks.help, version: mocks.version }));
 
 import {

src/lib/global-cli-actions.ts

@@ -16,7 +16,7 @@ import {
   runSetupSparkAction as executeSetupSparkAction,
 } from "./onboard-action";
 import { recoverNamedGatewayRuntime as recoverNamedGatewayRuntimeAction } from "./gateway-runtime-action";
-import { runOpenshell } from "./openshell-runtime";
+import { runOpenshell } from "./adapters/openshell/runtime";
 import { help, version } from "./root-help-action";
 
 type GatewayRecovery = { recovered: boolean };

src/lib/list-command-deps.ts

@@ -6,10 +6,10 @@
 import * as onboardSession from "./onboard-session";
 import type { ListSandboxesCommandDeps } from "./inventory-commands";
 import { parseGatewayInference } from "./inference-config";
-import { OPENSHELL_PROBE_TIMEOUT_MS } from "./openshell-timeouts";
+import { OPENSHELL_PROBE_TIMEOUT_MS } from "./adapters/openshell/timeouts";
 import { parseSshProcesses, createSystemDeps } from "./sandbox-session-state";
-import { resolveOpenshell } from "./resolve-openshell";
-import { captureOpenshell } from "./openshell-runtime";
+import { resolveOpenshell } from "./adapters/openshell/resolve";
+import { captureOpenshell } from "./adapters/openshell/runtime";
 import { recoverRegistryEntries } from "./registry-recovery-action";
 
 export function buildListCommandDeps(): ListSandboxesCommandDeps {

src/lib/maintenance-actions.ts

@@ -10,7 +10,7 @@ import {
 } from "./domain/lifecycle/options";
 import { dockerListImagesFormat, dockerRmi } from "./docker";
 import { findOrphanedSandboxImages, parseSandboxImageRows } from "./domain/maintenance/images";
-import { captureOpenshell } from "./openshell-runtime";
+import { captureOpenshell } from "./adapters/openshell/runtime";
 import * as registry from "./registry";
 import { parseLiveSandboxNames } from "./runtime-recovery";
 import * as sandboxState from "./sandbox-state";

src/lib/onboard.ts

@@ -259,7 +259,7 @@ const {
 const { sleepSeconds } = require("./wait");
 const platformUtils: typeof import("./platform") = require("./platform");
 const { inferContainerRuntime, isWsl, shouldPatchCoredns } = platformUtils;
-const { resolveOpenshell } = require("./resolve-openshell");
+const { resolveOpenshell } = require("./adapters/openshell/resolve");
 const credentials: typeof import("./credentials") = require("./credentials");
 const {
   prompt,

src/lib/policy-channel-actions.ts

@@ -15,7 +15,7 @@ const onboardProviders = require("./onboard-providers");
 import * as policies from "./policies";
 import { parsePolicyAddArgs } from "./domain/policy-channel";
 import * as registry from "./registry";
-import { runOpenshell } from "./openshell-runtime";
+import { runOpenshell } from "./adapters/openshell/runtime";
 import { rebuildSandbox } from "./sandbox-runtime-actions";
 import {
   KNOWN_CHANNELS,

src/lib/registry-recovery-action.test.ts

@@ -33,15 +33,15 @@ vi.mock("./registry.js", () => ({
   },
 }));
 
-vi.mock("./resolve-openshell.js", () => ({
+vi.mock("./adapters/openshell/resolve.js", () => ({
   resolveOpenshell: vi.fn(() => null),
 }));
 
 vi.mock("./gateway-runtime-action.js", () => ({
   recoverNamedGatewayRuntime: vi.fn(),
 }));
 
-vi.mock("./openshell-runtime.js", () => ({
+vi.mock("./adapters/openshell/runtime.js", () => ({
   captureOpenshell: vi.fn(),
 }));
 

src/lib/registry-recovery-action.ts

@@ -4,11 +4,11 @@
 import { recoverNamedGatewayRuntime } from "./gateway-runtime-action";
 import type { RecoveryResult } from "./inventory-commands";
 import * as onboardSession from "./onboard-session";
-import { OPENSHELL_PROBE_TIMEOUT_MS } from "./openshell-timeouts";
-import { captureOpenshell } from "./openshell-runtime";
+import { OPENSHELL_PROBE_TIMEOUT_MS } from "./adapters/openshell/timeouts";
+import { captureOpenshell } from "./adapters/openshell/runtime";
 import * as registry from "./registry";
 import type { SandboxEntry } from "./registry";
-import { resolveOpenshell } from "./resolve-openshell";
+import { resolveOpenshell } from "./adapters/openshell/resolve";
 import { parseLiveSandboxNames } from "./runtime-recovery";
 import { validateName } from "./runner";
 

src/lib/sandbox-config.ts

@@ -27,7 +27,7 @@ const { isPrivateHostname, isPrivateIp } = require("./private-networks");
 
 type ConfigObject = import("./credential-filter").ConfigObject;
 type ConfigValue = import("./credential-filter").ConfigValue;
-const { runOpenshellCommand, captureOpenshellCommand } = require("./openshell");
+const { runOpenshellCommand, captureOpenshellCommand } = require("./adapters/openshell/client");
 
 function parseJson<T>(text: string): T {
   return JSON.parse(text);

src/lib/sandbox-connect-action.ts

@@ -13,8 +13,8 @@ import {
   captureOpenshell,
   getOpenshellBinary,
   runOpenshell,
-} from "./openshell-runtime";
-import { OPENSHELL_PROBE_TIMEOUT_MS } from "./openshell-timeouts";
+} from "./adapters/openshell/runtime";
+import { OPENSHELL_PROBE_TIMEOUT_MS } from "./adapters/openshell/timeouts";
 import * as registry from "./registry";
 import { ROOT } from "./runner";
 import { ensureLiveSandboxOrExit } from "./sandbox-gateway-state-action";
@@ -25,7 +25,7 @@ import {
 import { checkAndRecoverSandboxProcesses } from "./sandbox-process-recovery-action";
 import * as sandboxVersion from "./sandbox-version";
 import { D, G, R, YW } from "./terminal-style";
-import { resolveOpenshell } from "./resolve-openshell";
+import { resolveOpenshell } from "./adapters/openshell/resolve";
 
 const agentRuntime = require("../../bin/lib/agent-runtime");
 

src/lib/sandbox-destroy-action.ts

@@ -13,10 +13,10 @@ import {
 } from "./domain/lifecycle/options";
 import * as onboardSession from "./onboard-session";
 import type { Session } from "./onboard-session";
-import { OPENSHELL_PROBE_TIMEOUT_MS } from "./openshell-timeouts";
+import { OPENSHELL_PROBE_TIMEOUT_MS } from "./adapters/openshell/timeouts";
 import { DASHBOARD_PORT } from "./ports";
 import * as registry from "./registry";
-import { resolveOpenshell } from "./resolve-openshell";
+import { resolveOpenshell } from "./adapters/openshell/resolve";
 import { parseLiveSandboxNames } from "./runtime-recovery";
 import {
   createSystemDeps as createSessionDeps,
@@ -45,7 +45,7 @@ const NEMOCLAW_GATEWAY_NAME = "nemoclaw";
 const DASHBOARD_FORWARD_PORT = String(DASHBOARD_PORT);
 
 function cleanupGatewayAfterLastSandbox(): void {
-  const { runOpenshell } = require("./openshell-runtime") as {
+  const { runOpenshell } = require("./adapters/openshell/runtime") as {
     runOpenshell: (args: string[], opts?: Record<string, unknown>) => { status: number | null };
   };
   const { dockerRemoveVolumesByPrefix } = require("./docker") as {
@@ -63,7 +63,7 @@ function cleanupGatewayAfterLastSandbox(): void {
 }
 
 function hasNoLiveSandboxes(): boolean {
-  const { captureOpenshell } = require("./openshell-runtime") as {
+  const { captureOpenshell } = require("./adapters/openshell/runtime") as {
     captureOpenshell: (
       args: string[],
       opts?: { ignoreError?: boolean; timeout?: number },
@@ -102,7 +102,7 @@ function cleanupSandboxServices(
 
   // Delete messaging providers created during onboard. Suppress stderr so
   // "! Provider not found" noise doesn't appear when messaging was never configured.
-  const { runOpenshell } = require("./openshell-runtime") as {
+  const { runOpenshell } = require("./adapters/openshell/runtime") as {
     runOpenshell: (args: string[], opts?: Record<string, unknown>) => { status: number | null };
   };
   for (const suffix of ["telegram-bridge", "discord-bridge", "slack-bridge"]) {
@@ -209,7 +209,7 @@ export async function destroySandbox(
   }
 
   console.log(`  Deleting sandbox '${sandboxName}'...`);
-  const { runOpenshell } = require("./openshell-runtime") as {
+  const { runOpenshell } = require("./adapters/openshell/runtime") as {
     runOpenshell: (
       args: string[],
       opts?: Record<string, unknown>,

src/lib/sandbox-doctor-action.ts

@@ -12,13 +12,13 @@ import { isErrnoException } from "./errno";
 import { recoverNamedGatewayRuntime } from "./gateway-runtime-action";
 import { probeProviderHealth } from "./inference-health";
 import { parseGatewayInference } from "./inference-config";
-import { stripAnsi } from "./openshell";
-import { captureOpenshell } from "./openshell-runtime";
-import { OPENSHELL_PROBE_TIMEOUT_MS } from "./openshell-timeouts";
+import { stripAnsi } from "./adapters/openshell/client";
+import { captureOpenshell } from "./adapters/openshell/runtime";
+import { OPENSHELL_PROBE_TIMEOUT_MS } from "./adapters/openshell/timeouts";
 import { GATEWAY_PORT, OLLAMA_PORT } from "./ports";
 import * as registry from "./registry";
 import type { SandboxEntry } from "./registry";
-import { resolveOpenshell } from "./resolve-openshell";
+import { resolveOpenshell } from "./adapters/openshell/resolve";
 import { ROOT } from "./runner";
 import { parseLiveSandboxNames } from "./runtime-recovery";
 import * as sandboxVersion from "./sandbox-version";

src/lib/sandbox-gateway-state-action.ts

@@ -18,18 +18,18 @@ const { pruneKnownHostsEntries } = require("./onboard") as {
 };
 import * as onboardSession from "./onboard-session";
 import type { Session } from "./onboard-session";
-import { stripAnsi } from "./openshell";
+import { stripAnsi } from "./adapters/openshell/client";
 import {
   captureOpenshell,
   captureOpenshellForStatus,
   getStatusProbeTimeoutMs,
   isCommandTimeout,
   runOpenshell,
-} from "./openshell-runtime";
+} from "./adapters/openshell/runtime";
 import {
   OPENSHELL_OPERATION_TIMEOUT_MS,
   OPENSHELL_PROBE_TIMEOUT_MS,
-} from "./openshell-timeouts";
+} from "./adapters/openshell/timeouts";
 import * as registry from "./registry";
 
 type SandboxGatewayState = {

src/lib/sandbox-logs-action.ts

@@ -4,7 +4,7 @@
 import { spawn } from "node:child_process";
 
 import { ROOT } from "./runner";
-import { getOpenshellBinary, runOpenshell } from "./openshell-runtime";
+import { getOpenshellBinary, runOpenshell } from "./adapters/openshell/runtime";
 import {
   buildEnableSandboxAuditLogsArgs,
   buildSandboxLogsArgs,

src/lib/sandbox-process-recovery-action.ts

@@ -15,8 +15,8 @@ import {
   getOpenshellBinary,
   isCommandTimeout,
   runOpenshell,
-} from "./openshell-runtime";
-import { OPENSHELL_PROBE_TIMEOUT_MS } from "./openshell-timeouts";
+} from "./adapters/openshell/runtime";
+import { OPENSHELL_PROBE_TIMEOUT_MS } from "./adapters/openshell/timeouts";
 import { ROOT, shellQuote } from "./runner";
 import { parseForwardList } from "./sandbox-session-state";
 import { G, R } from "./terminal-style";

src/lib/sandbox-rebuild-action.ts

@@ -24,10 +24,10 @@ import { getSandboxDeleteOutcome } from "./domain/sandbox/destroy";
 import * as nim from "./nim";
 import type { Session } from "./onboard-session";
 import * as onboardSession from "./onboard-session";
-import { captureOpenshell, runOpenshell } from "./openshell-runtime";
+import { captureOpenshell, runOpenshell } from "./adapters/openshell/runtime";
 import * as policies from "./policies";
 import * as registry from "./registry";
-import { resolveOpenshell } from "./resolve-openshell";
+import { resolveOpenshell } from "./adapters/openshell/resolve";
 import { parseLiveSandboxNames } from "./runtime-recovery";
 import { removeSandboxRegistryEntry } from "./sandbox-destroy-action";
 import { executeSandboxCommand } from "./sandbox-process-recovery-action";

src/lib/sandbox-skill-install-action.ts

@@ -8,7 +8,7 @@ import os from "node:os";
 import path from "node:path";
 
 import { CLI_NAME } from "./branding";
-import { captureOpenshell } from "./openshell-runtime";
+import { captureOpenshell } from "./adapters/openshell/runtime";
 import { ensureLiveSandboxOrExit } from "./sandbox-gateway-state-action";
 import * as skillInstall from "./skill-install";
 import { D, G, R, YW } from "./terminal-style";

src/lib/sandbox-state.ts

@@ -28,8 +28,8 @@ import path from "node:path";
 import * as registry from "./registry.js";
 import { loadAgent } from "./agent-defs.js";
 import type { AgentStateFile } from "./agent-defs.js";
-import { resolveOpenshell } from "./resolve-openshell.js";
-import { captureOpenshellCommand } from "./openshell.js";
+import { resolveOpenshell } from "./adapters/openshell/resolve.js";
+import { captureOpenshellCommand } from "./adapters/openshell/client.js";
 import { sanitizeConfigFile, isSensitiveFile } from "./credential-filter.js";
 import { shellQuote } from "./runner.js";
 

src/lib/sandbox-status-action.ts

@@ -11,9 +11,12 @@ import { probeProviderHealth } from "./inference-health";
 import * as nim from "./nim";
 import * as onboardSession from "./onboard-session";
 import type { Session } from "./onboard-session";
-import { captureOpenshellForStatus, isCommandTimeout } from "./openshell-runtime";
+import {
+  captureOpenshellForStatus,
+  isCommandTimeout,
+} from "./adapters/openshell/runtime";
 import * as registry from "./registry";
-import { resolveOpenshell } from "./resolve-openshell";
+import { resolveOpenshell } from "./adapters/openshell/resolve";
 import {
   getReconciledSandboxGatewayState,
   getSandboxGatewayStateForStatus,