@tickernelz/wardmote-adapter-utils 2026.1108.2 → 2026.1109.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/acpx-engine/ephemeral-session-environment.test.js +5 -5
- package/dist/acpx-engine/ephemeral-session-environment.test.js.map +1 -1
- package/dist/acpx-engine/execute-identity.test.js +11 -11
- package/dist/acpx-engine/execute-identity.test.js.map +1 -1
- package/dist/acpx-engine/execute.d.ts.map +1 -1
- package/dist/acpx-engine/execute.js +39 -40
- package/dist/acpx-engine/execute.js.map +1 -1
- package/dist/acpx-engine/execute.test.js +78 -78
- package/dist/acpx-engine/execute.test.js.map +1 -1
- package/dist/acpx-engine/filesystem-protocol.test.js +1 -1
- package/dist/acpx-engine/filesystem-protocol.test.js.map +1 -1
- package/dist/acpx-engine/operator-stop.test.js +2 -2
- package/dist/acpx-engine/operator-stop.test.js.map +1 -1
- package/dist/acpx-engine/run-site-sandbox.test.js +3 -3
- package/dist/acpx-engine/run-site-sandbox.test.js.map +1 -1
- package/dist/acpx-engine/spawn-smoke.test.js +6 -6
- package/dist/acpx-engine/spawn-smoke.test.js.map +1 -1
- package/dist/acpx-engine/startup-characterization.test.js +13 -13
- package/dist/acpx-engine/startup-characterization.test.js.map +1 -1
- package/dist/acpx-engine/startup-timing.test.js +2 -2
- package/dist/acpx-engine/startup-timing.test.js.map +1 -1
- package/dist/acpx-engine/terminal-session-failure.js +1 -1
- package/dist/acpx-engine/terminal-session-failure.js.map +1 -1
- package/dist/command-managed-runtime.test.js +2 -2
- package/dist/command-managed-runtime.test.js.map +1 -1
- package/dist/directory-merge-lock.test.js +2 -2
- package/dist/directory-merge-lock.test.js.map +1 -1
- package/dist/execution-target-sandbox.test.js +102 -102
- package/dist/execution-target-sandbox.test.js.map +1 -1
- package/dist/execution-target-stdin-race.test.js +25 -25
- package/dist/execution-target-stdin-race.test.js.map +1 -1
- package/dist/execution-target.d.ts.map +1 -1
- package/dist/execution-target.js +59 -60
- package/dist/execution-target.js.map +1 -1
- package/dist/execution-target.test.js +2 -2
- package/dist/execution-target.test.js.map +1 -1
- package/dist/forbidden-config-env.test.d.ts +2 -0
- package/dist/forbidden-config-env.test.d.ts.map +1 -0
- package/dist/forbidden-config-env.test.js +35 -0
- package/dist/forbidden-config-env.test.js.map +1 -0
- package/dist/git-workspace-sync.js +1 -1
- package/dist/git-workspace-sync.js.map +1 -1
- package/dist/github-launcher-environment.test.js +31 -31
- package/dist/github-launcher-environment.test.js.map +1 -1
- package/dist/github-launcher.js +9 -9
- package/dist/github-launcher.js.map +1 -1
- package/dist/index.d.ts +3 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/local-process-sandbox.test.js +8 -8
- package/dist/local-process-sandbox.test.js.map +1 -1
- package/dist/provider-models/codex.d.ts.map +1 -1
- package/dist/provider-models/codex.js +2 -2
- package/dist/provider-models/codex.js.map +1 -1
- package/dist/run-oom-score.d.ts +1 -1
- package/dist/run-oom-score.d.ts.map +1 -1
- package/dist/run-oom-score.js +1 -1
- package/dist/run-oom-score.js.map +1 -1
- package/dist/runner-connectivity.d.ts +2 -2
- package/dist/runner-connectivity.d.ts.map +1 -1
- package/dist/runner-connectivity.js +5 -5
- package/dist/runner-connectivity.js.map +1 -1
- package/dist/sandbox-callback-bridge.js +27 -27
- package/dist/sandbox-callback-bridge.js.map +1 -1
- package/dist/sandbox-callback-bridge.test.js +27 -27
- package/dist/sandbox-callback-bridge.test.js.map +1 -1
- package/dist/sandbox-install-command.js +4 -4
- package/dist/sandbox-install-command.js.map +1 -1
- package/dist/sandbox-managed-runtime.test.js +4 -4
- package/dist/sandbox-managed-runtime.test.js.map +1 -1
- package/dist/sandbox-run-log-stream.js +4 -4
- package/dist/sandbox-run-log-stream.js.map +1 -1
- package/dist/server-utils-env.test.js +2 -2
- package/dist/server-utils-env.test.js.map +1 -1
- package/dist/server-utils.d.ts +5 -5
- package/dist/server-utils.d.ts.map +1 -1
- package/dist/server-utils.js +87 -87
- package/dist/server-utils.js.map +1 -1
- package/dist/server-utils.test.js +75 -75
- package/dist/server-utils.test.js.map +1 -1
- package/dist/skill-library-manifest.test.js +4 -4
- package/dist/skill-library-manifest.test.js.map +1 -1
- package/dist/ssh.js +2 -2
- package/dist/ssh.js.map +1 -1
- package/dist/test-support/mcp-isolation-harness.js +1 -1
- package/dist/test-support/mcp-isolation-harness.js.map +1 -1
- package/dist/{paperclip-mcp-mount.d.ts → wardmote-mcp-mount.d.ts} +1 -1
- package/dist/wardmote-mcp-mount.d.ts.map +1 -0
- package/dist/{paperclip-mcp-mount.js → wardmote-mcp-mount.js} +10 -10
- package/dist/wardmote-mcp-mount.js.map +1 -0
- package/dist/{paperclip-mcp.d.ts → wardmote-mcp.d.ts} +9 -9
- package/dist/wardmote-mcp.d.ts.map +1 -0
- package/dist/{paperclip-mcp.js → wardmote-mcp.js} +36 -36
- package/dist/wardmote-mcp.js.map +1 -0
- package/dist/wardmote-mcp.test.d.ts +2 -0
- package/dist/wardmote-mcp.test.d.ts.map +1 -0
- package/dist/{paperclip-mcp.test.js → wardmote-mcp.test.js} +14 -14
- package/dist/wardmote-mcp.test.js.map +1 -0
- package/dist/{paperclip-runner-permissions.d.ts → wardmote-runner-permissions.d.ts} +18 -18
- package/dist/wardmote-runner-permissions.d.ts.map +1 -0
- package/dist/{paperclip-runner-permissions.js → wardmote-runner-permissions.js} +22 -22
- package/dist/wardmote-runner-permissions.js.map +1 -0
- package/dist/wardmote-runner-permissions.test.d.ts +2 -0
- package/dist/wardmote-runner-permissions.test.d.ts.map +1 -0
- package/dist/{paperclip-runner-permissions.test.js → wardmote-runner-permissions.test.js} +7 -7
- package/dist/wardmote-runner-permissions.test.js.map +1 -0
- package/dist/workspace-manifest.js +1 -1
- package/dist/workspace-manifest.js.map +1 -1
- package/dist/workspace-manifest.test.js +2 -2
- package/dist/workspace-manifest.test.js.map +1 -1
- package/dist/workspace-restore-merge.js +5 -5
- package/dist/workspace-restore-merge.js.map +1 -1
- package/dist/workspace-restore-merge.test.js +27 -27
- package/dist/workspace-restore-merge.test.js.map +1 -1
- package/node_modules/@clack/core/dist/index.d.mts +5 -3
- package/node_modules/@clack/core/dist/index.mjs +70 -67
- package/node_modules/@clack/core/package.json +3 -2
- package/node_modules/@clack/prompts/dist/index.d.mts +5 -4
- package/node_modules/@clack/prompts/dist/index.mjs +212 -187
- package/node_modules/@clack/prompts/package.json +3 -3
- package/node_modules/sisteransi/dist/index.d.ts +33 -0
- package/node_modules/sisteransi/dist/index.js +57 -0
- package/node_modules/sisteransi/package.json +18 -7
- package/node_modules/sisteransi/readme.md +19 -6
- package/package.json +2 -2
- package/dist/env-aliases-run.test.d.ts +0 -2
- package/dist/env-aliases-run.test.d.ts.map +0 -1
- package/dist/env-aliases-run.test.js +0 -49
- package/dist/env-aliases-run.test.js.map +0 -1
- package/dist/paperclip-mcp-mount.d.ts.map +0 -1
- package/dist/paperclip-mcp-mount.js.map +0 -1
- package/dist/paperclip-mcp.d.ts.map +0 -1
- package/dist/paperclip-mcp.js.map +0 -1
- package/dist/paperclip-mcp.test.d.ts +0 -2
- package/dist/paperclip-mcp.test.d.ts.map +0 -1
- package/dist/paperclip-mcp.test.js.map +0 -1
- package/dist/paperclip-runner-permissions.d.ts.map +0 -1
- package/dist/paperclip-runner-permissions.js.map +0 -1
- package/dist/paperclip-runner-permissions.test.d.ts +0 -2
- package/dist/paperclip-runner-permissions.test.d.ts.map +0 -1
- package/dist/paperclip-runner-permissions.test.js.map +0 -1
- package/node_modules/sisteransi/src/index.js +0 -58
- package/node_modules/sisteransi/src/sisteransi.d.ts +0 -35
package/dist/execution-target.js
CHANGED
|
@@ -18,7 +18,6 @@ import { createDuplexObservability, mapHttp2EventToDuplexLossReason, } from "./d
|
|
|
18
18
|
import { createSshCommandManagedRuntimeRunner, parseSshRemoteExecutionSpec, runSshCommand, shellQuote } from "./ssh.js";
|
|
19
19
|
import { ensureCommandResolvable, resolveCommandForLogs, runChildProcess, } from "./server-utils.js";
|
|
20
20
|
import { sanitizeRemoteExecutionEnv } from "./remote-execution-env.js";
|
|
21
|
-
import { withWardmoteEnvAliases } from "@tickernelz/wardmote-shared/env-aliases";
|
|
22
21
|
import { preferredShellForSandbox, shellCommandArgs } from "./sandbox-shell.js";
|
|
23
22
|
import { runWithRuntimeParent, } from "./acpx-engine/startup-timing.js";
|
|
24
23
|
export function postedIssueCommentLogMarker(method, requestPath, status, body) {
|
|
@@ -86,13 +85,13 @@ function resolveHostForUrl(rawHost) {
|
|
|
86
85
|
return host;
|
|
87
86
|
}
|
|
88
87
|
function resolveDefaultPaperclipApiUrl() {
|
|
89
|
-
const runtimeHost = resolveHostForUrl(process.env.
|
|
88
|
+
const runtimeHost = resolveHostForUrl(process.env.WARDMOTE_LISTEN_HOST ?? process.env.HOST ?? "localhost");
|
|
90
89
|
// 3100 matches the default Paperclip dev server port when the runtime does not provide one.
|
|
91
|
-
const runtimePort = process.env.
|
|
90
|
+
const runtimePort = process.env.WARDMOTE_LISTEN_PORT ?? process.env.PORT ?? "3100";
|
|
92
91
|
return `http://${runtimeHost}:${runtimePort}`;
|
|
93
92
|
}
|
|
94
93
|
function isBridgeDebugEnabled(env) {
|
|
95
|
-
const value = env.
|
|
94
|
+
const value = env.WARDMOTE_BRIDGE_DEBUG?.trim().toLowerCase();
|
|
96
95
|
return value === "1" || value === "true" || value === "yes";
|
|
97
96
|
}
|
|
98
97
|
function isAdapterExecutionTargetInstance(value) {
|
|
@@ -398,7 +397,7 @@ function applyRunDispositionSeam(result, settleRunDisposition) {
|
|
|
398
397
|
export async function runAdapterExecutionTargetProcess(runId, target, command, args, options) {
|
|
399
398
|
if (target?.kind === "remote" && target.transport === "sandbox") {
|
|
400
399
|
const runner = requireSandboxRunner(target);
|
|
401
|
-
const env =
|
|
400
|
+
const env = sanitizeRemoteExecutionEnv(options.env);
|
|
402
401
|
await options.onRuntimeProgress?.({
|
|
403
402
|
phase: "adapter_startup",
|
|
404
403
|
message: "Starting adapter in environment",
|
|
@@ -973,18 +972,18 @@ const fs = require('node:fs');
|
|
|
973
972
|
const path = require('node:path');
|
|
974
973
|
const cp = require('node:child_process');
|
|
975
974
|
const env = {};
|
|
976
|
-
env.
|
|
975
|
+
env.WARDMOTE_RUNNER_NETWORK_ROOTS = JSON.stringify(['/etc/resolv.conf','/etc/hosts','/etc/nsswitch.conf','/etc/ssl/certs','/etc/ssl/cert.pem'].flatMap(p => { try { return [fs.realpathSync(p)]; } catch { return []; } }));
|
|
977
976
|
if (process.argv[1] === 'host') {
|
|
978
977
|
for (const [key, value] of Object.entries(process.env)) {
|
|
979
|
-
if (/^(GH_TOKEN|GITHUB_TOKEN|GH_ENTERPRISE_TOKEN|GITHUB_ENTERPRISE_TOKEN|
|
|
978
|
+
if (/^(GH_TOKEN|GITHUB_TOKEN|GH_ENTERPRISE_TOKEN|GITHUB_ENTERPRISE_TOKEN|WARDMOTE_GIT_TOKEN|GH_CONFIG_DIR|GIT_CONFIG_(GLOBAL|SYSTEM|NOSYSTEM|COUNT|KEY_\d+|VALUE_\d+)|GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)|GIT_ASKPASS|SSH_ASKPASS|SSH_AUTH_SOCK|GIT_SSH_COMMAND|GIT_SSH)$/.test(key)) env[key] = value;
|
|
980
979
|
}
|
|
981
|
-
env.
|
|
980
|
+
env.WARDMOTE_GITHUB_HOST_HOME = process.env.HOME || '';
|
|
982
981
|
env.GH_CONFIG_DIR ||= path.join(process.env.XDG_CONFIG_HOME || path.join(process.env.HOME || '', '.config'), 'gh');
|
|
983
982
|
}
|
|
984
983
|
try {
|
|
985
984
|
const top = cp.execFileSync('git', ['rev-parse', '--show-toplevel'], {encoding:'utf8',stdio:['ignore','pipe','ignore']}).trim();
|
|
986
985
|
if (fs.realpathSync(top) === fs.realpathSync(process.cwd())) {
|
|
987
|
-
env.
|
|
986
|
+
env.WARDMOTE_GIT_METADATA_ROOTS = JSON.stringify(cp.execFileSync('git', ['rev-parse','--path-format=absolute','--git-common-dir','--git-dir'], {encoding:'utf8',stdio:['ignore','pipe','ignore']}).trim().split('\n').map(p => fs.realpathSync(p)));
|
|
988
987
|
}
|
|
989
988
|
} catch {}
|
|
990
989
|
process.stdout.write("\0" + JSON.stringify(env) + "\0");
|
|
@@ -996,9 +995,9 @@ process.stdout.write("\0" + JSON.stringify(env) + "\0");
|
|
|
996
995
|
// A legacy SSH host may run a standalone agent binary without Node. Use
|
|
997
996
|
// only the shell and Git, and emit bounded, NUL-framed environment records.
|
|
998
997
|
const probe = String.raw `
|
|
999
|
-
printf '\
|
|
998
|
+
printf '\0WARDMOTE_GIT_CONTEXT_V1\0'
|
|
1000
999
|
if [ "$1" = host ]; then
|
|
1001
|
-
for key in GH_TOKEN GITHUB_TOKEN GH_ENTERPRISE_TOKEN GITHUB_ENTERPRISE_TOKEN
|
|
1000
|
+
for key in GH_TOKEN GITHUB_TOKEN GH_ENTERPRISE_TOKEN GITHUB_ENTERPRISE_TOKEN WARDMOTE_GIT_TOKEN GH_CONFIG_DIR GIT_CONFIG_GLOBAL GIT_CONFIG_SYSTEM GIT_CONFIG_NOSYSTEM GIT_CONFIG_COUNT GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_ASKPASS SSH_ASKPASS SSH_AUTH_SOCK GIT_SSH_COMMAND GIT_SSH; do
|
|
1002
1001
|
eval 'value=${"$"}{'"$key"'-}'
|
|
1003
1002
|
[ -z "$value" ] || printf '%s\0%s\0' "$key" "$value"
|
|
1004
1003
|
done
|
|
@@ -1011,7 +1010,7 @@ if [ "$1" = host ]; then
|
|
|
1011
1010
|
done
|
|
1012
1011
|
index=$((index + 1))
|
|
1013
1012
|
done
|
|
1014
|
-
printf '
|
|
1013
|
+
printf 'WARDMOTE_GITHUB_HOST_HOME\0%s\0' "$HOME"
|
|
1015
1014
|
printf 'GH_CONFIG_DIR\0%s\0' "${"$"}{GH_CONFIG_DIR:-${"$"}{XDG_CONFIG_HOME:-$HOME/.config}/gh}"
|
|
1016
1015
|
fi
|
|
1017
1016
|
for file in /etc/resolv.conf /etc/hosts /etc/nsswitch.conf /etc/ssl/certs /etc/ssl/cert.pem; do
|
|
@@ -1023,7 +1022,7 @@ for file in /etc/resolv.conf /etc/hosts /etc/nsswitch.conf /etc/ssl/certs /etc/s
|
|
|
1023
1022
|
done
|
|
1024
1023
|
if [ -e "$file" ]; then
|
|
1025
1024
|
parent=$(cd "$(dirname "$file")" && pwd -P) || continue
|
|
1026
|
-
printf '
|
|
1025
|
+
printf 'WARDMOTE_RUNNER_NETWORK_ROOT\0%s\0' "$parent/$(basename "$file")"
|
|
1027
1026
|
fi
|
|
1028
1027
|
done
|
|
1029
1028
|
cwd=$(pwd -P)
|
|
@@ -1032,10 +1031,10 @@ if [ -n "$top" ] && [ "$(cd "$top" && pwd -P)" = "$cwd" ]; then
|
|
|
1032
1031
|
for kind in --git-common-dir --git-dir; do
|
|
1033
1032
|
root=$(git rev-parse --path-format=absolute "$kind" 2>/dev/null) || continue
|
|
1034
1033
|
root=$(cd "$root" && pwd -P) || continue
|
|
1035
|
-
printf '
|
|
1034
|
+
printf 'WARDMOTE_GIT_METADATA_ROOT\0%s\0' "$root"
|
|
1036
1035
|
done
|
|
1037
1036
|
fi
|
|
1038
|
-
printf '\
|
|
1037
|
+
printf '\0WARDMOTE_GIT_CONTEXT_END\0'
|
|
1039
1038
|
`;
|
|
1040
1039
|
const result = await adapterExecutionTargetCommandRunner(remote).execute({
|
|
1041
1040
|
command: "sh", args: ["-c", probe, "paperclip-git-context", input.hostCredentials ? "host" : "managed"],
|
|
@@ -1045,7 +1044,7 @@ printf '\0PAPERCLIP_GIT_CONTEXT_END\0'
|
|
|
1045
1044
|
});
|
|
1046
1045
|
if (result.exitCode !== 0)
|
|
1047
1046
|
throw new Error("Could not read execution-target Git context");
|
|
1048
|
-
const payload = result.stdout.split("\
|
|
1047
|
+
const payload = result.stdout.split("\0WARDMOTE_GIT_CONTEXT_V1\0")[1]?.split("\0WARDMOTE_GIT_CONTEXT_END\0")[0];
|
|
1049
1048
|
if (payload === undefined)
|
|
1050
1049
|
throw new Error("Could not read execution-target Git context");
|
|
1051
1050
|
discovered = {};
|
|
@@ -1055,15 +1054,15 @@ printf '\0PAPERCLIP_GIT_CONTEXT_END\0'
|
|
|
1055
1054
|
for (let index = 0; index + 1 < records.length; index += 2) {
|
|
1056
1055
|
const key = records[index];
|
|
1057
1056
|
const value = records[index + 1];
|
|
1058
|
-
if (key === "
|
|
1057
|
+
if (key === "WARDMOTE_GIT_METADATA_ROOT")
|
|
1059
1058
|
roots.push(value);
|
|
1060
|
-
else if (key === "
|
|
1059
|
+
else if (key === "WARDMOTE_RUNNER_NETWORK_ROOT")
|
|
1061
1060
|
networkRoots.push(value);
|
|
1062
1061
|
else
|
|
1063
1062
|
discovered[key] = value;
|
|
1064
1063
|
}
|
|
1065
|
-
discovered.
|
|
1066
|
-
discovered.
|
|
1064
|
+
discovered.WARDMOTE_GIT_METADATA_ROOTS = JSON.stringify([...new Set(roots)]);
|
|
1065
|
+
discovered.WARDMOTE_RUNNER_NETWORK_ROOTS = JSON.stringify([...new Set(networkRoots)]);
|
|
1067
1066
|
}
|
|
1068
1067
|
else {
|
|
1069
1068
|
const result = await promisify(execFile)(process.execPath, args, { cwd: input.cwd, timeout: 15_000, maxBuffer: 1024 * 1024 });
|
|
@@ -1076,11 +1075,11 @@ printf '\0PAPERCLIP_GIT_CONTEXT_END\0'
|
|
|
1076
1075
|
}
|
|
1077
1076
|
// Controller-derived roots and mode must not be replaced by agent bindings.
|
|
1078
1077
|
return { ...discovered, ...input.env,
|
|
1079
|
-
...(input.hostCredentials ? {
|
|
1080
|
-
|
|
1081
|
-
|
|
1082
|
-
|
|
1083
|
-
|
|
1078
|
+
...(input.hostCredentials ? { WARDMOTE_GITHUB_HOST_HOME: discovered.WARDMOTE_GITHUB_HOST_HOME } : {}),
|
|
1079
|
+
WARDMOTE_GIT_METADATA_ROOTS: discovered.WARDMOTE_GIT_METADATA_ROOTS ?? "[]",
|
|
1080
|
+
WARDMOTE_RUNNER_NETWORK_ROOTS: discovered.WARDMOTE_RUNNER_NETWORK_ROOTS ?? "[]",
|
|
1081
|
+
WARDMOTE_GITHUB_AUTH_MODE: input.hostCredentials ? "host" : "managed",
|
|
1082
|
+
WARDMOTE_RUNNER_NETWORK_ACCESS: input.networkAccess ? "enabled" : "disabled",
|
|
1084
1083
|
};
|
|
1085
1084
|
}
|
|
1086
1085
|
/** Stage token-free launchers next to the execution, not in shared global Git config. */
|
|
@@ -1128,7 +1127,7 @@ export async function prepareGitHubOperationLaunchers(input) {
|
|
|
1128
1127
|
await fs.writeFile(path.join(directory, program), body, { mode: 0o700 });
|
|
1129
1128
|
}
|
|
1130
1129
|
return { ...input.env, PATH: managedPath, ZDOTDIR: directory, BASH_ENV: `${directory}/.bashrc`,
|
|
1131
|
-
GH_CONFIG_DIR: configDirectory,
|
|
1130
|
+
GH_CONFIG_DIR: configDirectory, WARDMOTE_GITHUB_LAUNCHER_DIR: directory };
|
|
1132
1131
|
}
|
|
1133
1132
|
function buildBridgeResponseHeaders(response) {
|
|
1134
1133
|
const out = {};
|
|
@@ -1359,7 +1358,7 @@ export async function startAdapterExecutionTargetProcessSessionBridge(input) {
|
|
|
1359
1358
|
// the existing path; upload larger envelopes in bounded chunks instead.
|
|
1360
1359
|
const commandEnv = {};
|
|
1361
1360
|
if (commandPayload.length <= 64 * 1024) {
|
|
1362
|
-
commandEnv.
|
|
1361
|
+
commandEnv.WARDMOTE_PROCESS_SESSION_COMMAND_B64 = commandPayload;
|
|
1363
1362
|
}
|
|
1364
1363
|
else {
|
|
1365
1364
|
const payloadPath = path.posix.join(sessionDir, "command.b64");
|
|
@@ -1399,13 +1398,13 @@ export async function startAdapterExecutionTargetProcessSessionBridge(input) {
|
|
|
1399
1398
|
`mkdir -p ${shellQuote(stdinDir)} ${shellQuote(eventsDir)}`,
|
|
1400
1399
|
// I3: no numeric process identifier anywhere. Background the
|
|
1401
1400
|
// wrapper and let it go; do not capture `$!`.
|
|
1402
|
-
`
|
|
1401
|
+
`WARDMOTE_PROCESS_SESSION_DIR=${shellQuote(sessionDir)} ` +
|
|
1403
1402
|
Object.entries(commandEnv).map(([key, value]) => `${key}=${shellQuote(value)} `).join("") +
|
|
1404
1403
|
`nohup node ${shellQuote(remoteScriptPath)} >/dev/null 2>&1 < /dev/null &`,
|
|
1405
1404
|
].join("\n")),
|
|
1406
1405
|
cwd: target.remoteCwd,
|
|
1407
1406
|
env: {
|
|
1408
|
-
|
|
1407
|
+
WARDMOTE_SANDBOX_EXEC_CHANNEL: "bridge",
|
|
1409
1408
|
},
|
|
1410
1409
|
timeoutMs,
|
|
1411
1410
|
// The wrapper launch is bridge plumbing. Keep it off the persistent
|
|
@@ -1764,9 +1763,9 @@ export async function startAdapterExecutionTargetProcessSessionBridge(input) {
|
|
|
1764
1763
|
args: shellCommandArgs(`node ${shellQuote(remoteScriptPath)}`),
|
|
1765
1764
|
cwd: target.remoteCwd,
|
|
1766
1765
|
env: {
|
|
1767
|
-
|
|
1766
|
+
WARDMOTE_PROCESS_SESSION_DIR: sessionDir,
|
|
1768
1767
|
...commandEnv,
|
|
1769
|
-
|
|
1768
|
+
WARDMOTE_SANDBOX_EXEC_CHANNEL: "bridge",
|
|
1770
1769
|
},
|
|
1771
1770
|
timeoutMs,
|
|
1772
1771
|
useSession: true,
|
|
@@ -1983,7 +1982,7 @@ const PROCESS_SESSION_STDIN_POLL_TAIL = `child.stdin.on("error", () => {});
|
|
|
1983
1982
|
// and write an error event, so a lost message fails loud, and let later files
|
|
1984
1983
|
// run.
|
|
1985
1984
|
const stdinMaxParseRetries = (() => {
|
|
1986
|
-
const raw = Number.parseInt(process.env.
|
|
1985
|
+
const raw = Number.parseInt(process.env.WARDMOTE_PROCESS_SESSION_STDIN_MAX_RETRIES || "", 10);
|
|
1987
1986
|
return Number.isFinite(raw) && raw > 0 ? raw : 100;
|
|
1988
1987
|
})();
|
|
1989
1988
|
const stdinParseRetries = new Map();
|
|
@@ -2001,7 +2000,7 @@ let stdinGapRetries = 0;
|
|
|
2001
2000
|
// call sends. A test can override it through the environment, so a stubborn
|
|
2002
2001
|
// child does not force a slow test.
|
|
2003
2002
|
const terminateGraceMs = (() => {
|
|
2004
|
-
const raw = Number.parseInt(process.env.
|
|
2003
|
+
const raw = Number.parseInt(process.env.WARDMOTE_PROCESS_SESSION_TERMINATE_GRACE_MS || "", 10);
|
|
2005
2004
|
return Number.isFinite(raw) && raw > 0 ? raw : 3000;
|
|
2006
2005
|
})();
|
|
2007
2006
|
|
|
@@ -2082,7 +2081,7 @@ async function statPathIdentity(candidatePath) {
|
|
|
2082
2081
|
const stats = await fs.lstat(candidatePath);
|
|
2083
2082
|
if (stats.isSymbolicLink()) {
|
|
2084
2083
|
const error = new Error("Refusing a symbolic link on a process session control path.");
|
|
2085
|
-
error.code = "
|
|
2084
|
+
error.code = "EWARDMOTE_SYMLINK";
|
|
2086
2085
|
throw error;
|
|
2087
2086
|
}
|
|
2088
2087
|
if (!stats.isDirectory()) {
|
|
@@ -2294,7 +2293,7 @@ async function verifySessionIdentity() {
|
|
|
2294
2293
|
? "the control path no longer exists"
|
|
2295
2294
|
: code === "ENOTDIR"
|
|
2296
2295
|
? "the control path is no longer a directory"
|
|
2297
|
-
: code === "
|
|
2296
|
+
: code === "EWARDMOTE_SYMLINK"
|
|
2298
2297
|
? "the control path is now a symbolic link"
|
|
2299
2298
|
: "lstat failed" + (code ? " with " + code : "");
|
|
2300
2299
|
process.stderr.write("Latching on a lost process session identity: " + reason + ". Terminating.\\n");
|
|
@@ -2422,7 +2421,7 @@ void pollStdin().catch((error) => void writeEvent({ type: "error", message: erro
|
|
|
2422
2421
|
const PROCESS_SESSION_READ_COMMAND = `
|
|
2423
2422
|
let config;
|
|
2424
2423
|
try {
|
|
2425
|
-
let commandPayload = process.env.
|
|
2424
|
+
let commandPayload = process.env.WARDMOTE_PROCESS_SESSION_COMMAND_B64;
|
|
2426
2425
|
if (!commandPayload) {
|
|
2427
2426
|
const payloadPath = path.posix.join(sessionDir, "command.b64");
|
|
2428
2427
|
const handle = await fs.open(payloadPath, fsConstants.O_RDONLY | fsConstants.O_NOFOLLOW);
|
|
@@ -2456,7 +2455,7 @@ function getProcessSessionRemoteStreamSource() {
|
|
|
2456
2455
|
import { promises as fs, constants as fsConstants } from "node:fs";
|
|
2457
2456
|
import path from "node:path";
|
|
2458
2457
|
|
|
2459
|
-
const sessionDir = process.env.
|
|
2458
|
+
const sessionDir = process.env.WARDMOTE_PROCESS_SESSION_DIR;
|
|
2460
2459
|
if (!sessionDir) throw new Error("Missing process session bridge env.");
|
|
2461
2460
|
|
|
2462
2461
|
const stdinDir = path.posix.join(sessionDir, "stdin");
|
|
@@ -2499,8 +2498,8 @@ ${PROCESS_SESSION_READ_COMMAND}
|
|
|
2499
2498
|
// session dir and the command payload. Scrub both keys before they reach the
|
|
2500
2499
|
// spawned child, so the child never inherits a path to its own control files.
|
|
2501
2500
|
const childEnv = { ...process.env, ...(config.env || {}) };
|
|
2502
|
-
delete childEnv.
|
|
2503
|
-
delete childEnv.
|
|
2501
|
+
delete childEnv.WARDMOTE_PROCESS_SESSION_DIR;
|
|
2502
|
+
delete childEnv.WARDMOTE_PROCESS_SESSION_COMMAND_B64;
|
|
2504
2503
|
|
|
2505
2504
|
// I1: exactly one child process per emitted wrapper. Do not add a second
|
|
2506
2505
|
// tracked child handle.
|
|
@@ -2538,7 +2537,7 @@ function getProcessSessionRemoteEventFileSource() {
|
|
|
2538
2537
|
import { promises as fs, constants as fsConstants } from "node:fs";
|
|
2539
2538
|
import path from "node:path";
|
|
2540
2539
|
|
|
2541
|
-
const sessionDir = process.env.
|
|
2540
|
+
const sessionDir = process.env.WARDMOTE_PROCESS_SESSION_DIR;
|
|
2542
2541
|
if (!sessionDir) throw new Error("Missing process session bridge env.");
|
|
2543
2542
|
|
|
2544
2543
|
const stdinDir = path.posix.join(sessionDir, "stdin");
|
|
@@ -2589,8 +2588,8 @@ ${PROCESS_SESSION_READ_COMMAND}
|
|
|
2589
2588
|
// session dir and the command payload. Scrub both keys before they reach the
|
|
2590
2589
|
// spawned child, so the child never inherits a path to its own control files.
|
|
2591
2590
|
const childEnv = { ...process.env, ...(config.env || {}) };
|
|
2592
|
-
delete childEnv.
|
|
2593
|
-
delete childEnv.
|
|
2591
|
+
delete childEnv.WARDMOTE_PROCESS_SESSION_DIR;
|
|
2592
|
+
delete childEnv.WARDMOTE_PROCESS_SESSION_COMMAND_B64;
|
|
2594
2593
|
|
|
2595
2594
|
// I1: exactly one child process per emitted wrapper. Do not add a second
|
|
2596
2595
|
// tracked child handle.
|
|
@@ -3458,7 +3457,7 @@ export async function startAdapterExecutionTargetPaperclipBridge(input) {
|
|
|
3458
3457
|
const queueDir = path.posix.join(bridgeRuntimeDir, "queue");
|
|
3459
3458
|
const assetRemoteDir = path.posix.join(bridgeRuntimeDir, "server");
|
|
3460
3459
|
const bridgeToken = createSandboxCallbackBridgeToken();
|
|
3461
|
-
const configuredAttachmentBytes = attachmentMaxBytesSource?.() ?? Number(process.env.
|
|
3460
|
+
const configuredAttachmentBytes = attachmentMaxBytesSource?.() ?? Number(process.env.WARDMOTE_ATTACHMENT_MAX_BYTES);
|
|
3462
3461
|
// A larger upload limit needs multipart headroom. A smaller attachment limit
|
|
3463
3462
|
// remains enforced by the API and must not shrink unrelated JSON responses.
|
|
3464
3463
|
const defaultBodyBytes = Number.isSafeInteger(configuredAttachmentBytes) && configuredAttachmentBytes > 0
|
|
@@ -3469,12 +3468,12 @@ export async function startAdapterExecutionTargetPaperclipBridge(input) {
|
|
|
3469
3468
|
: defaultBodyBytes;
|
|
3470
3469
|
// The bridge worker runs inside the same process that serves the Paperclip
|
|
3471
3470
|
// API, so forwarded sandbox calls must target the LOCAL listen origin. The
|
|
3472
|
-
//
|
|
3471
|
+
// WARDMOTE_RUNTIME_API_URL / WARDMOTE_API_URL exports now prefer a
|
|
3473
3472
|
// configured public base URL, which is the origin browsers and external
|
|
3474
3473
|
// agents use; routing this in-process loopback hop through the network edge
|
|
3475
3474
|
// breaks deployments whose public origin sits behind a session-gated proxy
|
|
3476
3475
|
// (every forwarded agent API call is rejected at the edge). Server boot
|
|
3477
|
-
// exports
|
|
3476
|
+
// exports WARDMOTE_LISTEN_HOST / WARDMOTE_LISTEN_PORT before any run
|
|
3478
3477
|
// executes, and resolveDefaultPaperclipApiUrl() maps wildcard listen hosts
|
|
3479
3478
|
// to the loopback address of the same family (0.0.0.0 -> 127.0.0.1,
|
|
3480
3479
|
// :: -> [::1]), so the fallback is always loopback-reachable.
|
|
@@ -3499,7 +3498,7 @@ export async function startAdapterExecutionTargetPaperclipBridge(input) {
|
|
|
3499
3498
|
// record this facade produces stamps the `http2` transport value.
|
|
3500
3499
|
transport: "http2",
|
|
3501
3500
|
});
|
|
3502
|
-
//
|
|
3501
|
+
// WARDMOTE_BRIDGE_DEBUG opts into verbose stdout logs of every bridge proxy
|
|
3503
3502
|
// request/response. The query string is logged verbatim, so callers who pass
|
|
3504
3503
|
// auth tokens or other sensitive values as query parameters should be aware
|
|
3505
3504
|
// those values appear in the host process's stdout when this flag is enabled.
|
|
@@ -3678,12 +3677,12 @@ export async function startAdapterExecutionTargetPaperclipBridge(input) {
|
|
|
3678
3677
|
shellCommand,
|
|
3679
3678
|
});
|
|
3680
3679
|
const gatewayEnv = {
|
|
3681
|
-
|
|
3682
|
-
|
|
3683
|
-
|
|
3684
|
-
|
|
3685
|
-
|
|
3686
|
-
|
|
3680
|
+
WARDMOTE_API_BRIDGE_MODE: SANDBOX_CALLBACK_BRIDGE_HTTP2_MODE,
|
|
3681
|
+
WARDMOTE_BRIDGE_TOKEN: bridgeToken,
|
|
3682
|
+
WARDMOTE_BRIDGE_HOST: "127.0.0.1",
|
|
3683
|
+
WARDMOTE_BRIDGE_PORT: String(assignedPort),
|
|
3684
|
+
WARDMOTE_BRIDGE_NONCE: nonce,
|
|
3685
|
+
WARDMOTE_BRIDGE_MAX_BODY_BYTES: String(maxBodyBytes),
|
|
3687
3686
|
};
|
|
3688
3687
|
const command = buildDuplexGatewayLaunchArgv({
|
|
3689
3688
|
shellCommand,
|
|
@@ -3808,7 +3807,7 @@ export async function startAdapterExecutionTargetPaperclipBridge(input) {
|
|
|
3808
3807
|
forwardRequest: http2ForwardRequest,
|
|
3809
3808
|
routes: HTTP2_SANDBOX_CALLBACK_BRIDGE_ROUTE_ALLOWLIST,
|
|
3810
3809
|
// The same resolved limit the launch environment hands the
|
|
3811
|
-
// sandbox-side gateway (`
|
|
3810
|
+
// sandbox-side gateway (`WARDMOTE_BRIDGE_MAX_BODY_BYTES`,
|
|
3812
3811
|
// below), so the host check and the gateway check enforce one
|
|
3813
3812
|
// value instead of the host silently falling back to the
|
|
3814
3813
|
// package default.
|
|
@@ -3871,9 +3870,9 @@ export async function startAdapterExecutionTargetPaperclipBridge(input) {
|
|
|
3871
3870
|
}
|
|
3872
3871
|
return {
|
|
3873
3872
|
env: {
|
|
3874
|
-
|
|
3875
|
-
|
|
3876
|
-
|
|
3873
|
+
WARDMOTE_API_URL: sandboxOrigin,
|
|
3874
|
+
WARDMOTE_API_KEY: bridgeToken,
|
|
3875
|
+
WARDMOTE_API_BRIDGE_MODE: SANDBOX_CALLBACK_BRIDGE_HTTP2_MODE,
|
|
3877
3876
|
},
|
|
3878
3877
|
runLogTail: duplexRunLogTail,
|
|
3879
3878
|
readRunDisposition: () => dispositionLatch.disposition,
|
|
@@ -3953,10 +3952,10 @@ export async function startAdapterExecutionTargetPaperclipBridge(input) {
|
|
|
3953
3952
|
}
|
|
3954
3953
|
return {
|
|
3955
3954
|
env: {
|
|
3956
|
-
|
|
3957
|
-
|
|
3958
|
-
|
|
3959
|
-
|
|
3955
|
+
WARDMOTE_API_URL: server.baseUrl,
|
|
3956
|
+
WARDMOTE_API_KEY: bridgeToken,
|
|
3957
|
+
WARDMOTE_API_BRIDGE_MODE: "queue_v1",
|
|
3958
|
+
WARDMOTE_BRIDGE_QUEUE_DIR: queueDir,
|
|
3960
3959
|
},
|
|
3961
3960
|
runLogTail,
|
|
3962
3961
|
stop: async () => {
|