@openclaw/openshell-sandbox 2026.5.20-beta.1 → 2026.5.20-beta.2

package/dist/index.js

@@ -1,33 +1,16 @@
-import { createRequire } from "node:module";
 import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
 import { buildExecRemoteCommand, createRemoteShellSandboxFsBridge, createSshSandboxSessionFromConfigText, createWritableRenameTargetResolver, disposeSshSandboxSession, registerSandboxBackend, resolvePreferredOpenClawTmpDir, runPluginCommandWithTimeout, runSshSandboxCommand, sanitizeEnvVars, shellEscape, withTempWorkspace } from "openclaw/plugin-sdk/sandbox";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { normalizeLowercaseStringOrEmpty } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { loadJsonFile } from "openclaw/plugin-sdk/json-store";
 import { buildPluginConfigSchema } from "openclaw/plugin-sdk/core";
 import { formatPluginConfigIssue, mapPluginConfigIssues } from "openclaw/plugin-sdk/extension-shared";
 import { z } from "zod";
 import { root } from "openclaw/plugin-sdk/file-access-runtime";
 import { isPathInside, movePathWithCopyFallback } from "openclaw/plugin-sdk/security-runtime";
 //#region extensions/openshell/src/cli.ts
-const require = createRequire(import.meta.url);
-let cachedBundledOpenShellCommand;
-function resolveBundledOpenShellCommand() {
-	if (cachedBundledOpenShellCommand !== void 0) return cachedBundledOpenShellCommand;
-	try {
-		const packageJsonPath = require.resolve("openshell/package.json");
-		const packageJson = loadJsonFile(packageJsonPath);
-		const relativeBin = typeof packageJson?.bin === "string" ? packageJson.bin : packageJson?.bin?.openshell;
-		cachedBundledOpenShellCommand = relativeBin ? path.resolve(path.dirname(packageJsonPath), relativeBin) : null;
-	} catch {
-		cachedBundledOpenShellCommand = null;
-	}
-	return cachedBundledOpenShellCommand;
-}
 function resolveOpenShellCommand(command) {
-	if (command !== "openshell") return command;
-	return resolveBundledOpenShellCommand() ?? command;
+	return command;
 }
 function buildOpenShellBaseArgv(config) {
 	const argv = [resolveOpenShellCommand(config.command)];
@@ -38,6 +21,15 @@ function buildOpenShellBaseArgv(config) {
 function buildRemoteCommand(argv) {
 	return argv.map((entry) => shellEscape(entry)).join(" ");
 }
+function applyGatewayEndpointToSshConfig(params) {
+	const endpoint = params.gatewayEndpoint?.trim();
+	if (!endpoint) return params.configText;
+	return params.configText.replace(/^(\s*ProxyCommand\s+)(.*)$/m, (line, prefix, command) => {
+		if (!command.includes("ssh-proxy")) return line;
+		if (/(^|\s)--server(\s|=)|(^|\s)--gateway-endpoint(\s|=)/.test(command)) return line;
+		return `${prefix}${command} --server ${shellEscape(endpoint)}`;
+	});
+}
 async function runOpenShellCli(params) {
 	return await runPluginCommandWithTimeout({
 		argv: [...buildOpenShellBaseArgv(params.context.config), ...params.args],
@@ -56,7 +48,10 @@ async function createOpenShellSshSession(params) {
 		]
 	});
 	if (result.code !== 0) throw new Error(result.stderr.trim() || "openshell sandbox ssh-config failed");
-	return await createSshSandboxSessionFromConfigText({ configText: result.stdout });
+	return await createSshSandboxSessionFromConfigText({ configText: applyGatewayEndpointToSshConfig({
+		configText: result.stdout,
+		gatewayEndpoint: params.context.config.gatewayEndpoint
+	}) });
 }
 //#endregion
 //#region extensions/openshell/src/config.ts
@@ -857,7 +852,7 @@ function resolveOpenShellPluginConfigFromConfig(config, fallback) {
 }
 function buildOpenShellSandboxName(scopeKey) {
 	const trimmed = scopeKey.trim() || "session";
-	const safe = normalizeLowercaseStringOrEmpty(trimmed).replace(/[^a-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 32);
+	const safe = normalizeLowercaseStringOrEmpty(trimmed).replace(/[^a-z0-9-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 32);
 	const hash = Array.from(trimmed).reduce((acc, char) => (acc * 33 ^ char.charCodeAt(0)) >>> 0, 5381);
 	return `openclaw-${safe || "session"}-${hash.toString(16).slice(0, 8)}`;
 }

package/openclaw.plugin.json

@@ -4,7 +4,7 @@
     "onStartup": true
   },
   "name": "OpenShell Sandbox",
-  "description": "Sandbox backend powered by OpenShell with mirrored local workspaces and SSH-based command execution.",
+  "description": "Sandbox backend powered by the NVIDIA OpenShell CLI with mirrored local workspaces and SSH-based command execution.",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,
@@ -67,7 +67,7 @@
     },
     "command": {
       "label": "OpenShell Command",
-      "help": "Path or command name for the openshell CLI."
+      "help": "Path or command name for the NVIDIA OpenShell CLI."
     },
     "gateway": {
       "label": "Gateway Name",

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "@openclaw/openshell-sandbox",
-  "version": "2026.5.20-beta.1",
-  "description": "OpenClaw OpenShell sandbox backend",
+  "version": "2026.5.20-beta.2",
+  "description": "OpenClaw sandbox backend for the NVIDIA OpenShell CLI",
   "repository": {
     "type": "git",
     "url": "https://github.com/openclaw/openclaw"
   },
   "type": "module",
   "dependencies": {
-    "openshell": "0.1.0",
     "zod": "4.4.3"
   },
   "devDependencies": {
@@ -24,10 +23,10 @@
       "minHostVersion": ">=2026.5.12-beta.1"
     },
     "compat": {
-      "pluginApi": ">=2026.5.20-beta.1"
+      "pluginApi": ">=2026.5.20-beta.2"
     },
     "build": {
-      "openclawVersion": "2026.5.20-beta.1",
+      "openclawVersion": "2026.5.20-beta.2",
       "bundledDist": false
     },
     "release": {
@@ -43,7 +42,7 @@
     "openclaw.plugin.json"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.5.20-beta.1"
+    "openclaw": ">=2026.5.20-beta.2"
   },
   "peerDependenciesMeta": {
     "openclaw": {