@qduc/term2 0.9.4 → 0.10.1

package/dist/utils/shell/execute-shell.js

@@ -11,16 +11,8 @@ const defaultExecImpl = (command, options, callback) => {
     });
     let stdout = '';
     let stderr = '';
-    let killed = false;
     let ex = null;
     const maxBuffer = options.maxBuffer ?? 1024 * 1024;
-    let timeoutId;
-    if (options.timeout && options.timeout > 0) {
-        timeoutId = setTimeout(() => {
-            killed = true;
-            child.kill('SIGTERM');
-        }, options.timeout);
-    }
     child.stdout?.setEncoding('utf8');
     child.stdout?.on('data', (chunk) => {
         stdout += chunk;
@@ -38,8 +30,6 @@ const defaultExecImpl = (command, options, callback) => {
         }
     });
     child.on('close', (code, signal) => {
-        if (timeoutId)
-            clearTimeout(timeoutId);
         if (ex) {
             callback(ex, stdout, stderr);
             return;
@@ -48,15 +38,12 @@ const defaultExecImpl = (command, options, callback) => {
             const err = new Error(`Command failed: ${command}`);
             err.code = code;
             err.signal = signal;
-            err.killed = killed;
             callback(err, stdout, stderr);
             return;
         }
         callback(null, stdout, stderr);
     });
     child.on('error', (err) => {
-        if (timeoutId)
-            clearTimeout(timeoutId);
         if (!ex) {
             ex = err;
         }
@@ -102,13 +89,51 @@ export async function executeShellCommand(command, options = {}) {
     try {
         const result = await new Promise((resolve, reject) => {
             let unregisterPauseController;
+            let timeoutId;
+            let timeoutStartedAt;
+            let remainingTimeoutMs = timeout ?? 0;
+            let paused = false;
+            let settled = false;
+            const clearCommandTimeout = () => {
+                if (timeoutId) {
+                    clearTimeout(timeoutId);
+                    timeoutId = undefined;
+                }
+                timeoutStartedAt = undefined;
+            };
+            const stopChild = () => {
+                if (paused) {
+                    paused = false;
+                    signalChildProcess(child, 'SIGCONT');
+                }
+                stopChildProcess(child);
+            };
+            const startCommandTimeout = () => {
+                if (remainingTimeoutMs <= 0 || timeoutId)
+                    return;
+                timeoutStartedAt = Date.now();
+                timeoutId = setTimeout(() => {
+                    timeoutId = undefined;
+                    remainingTimeoutMs = 0;
+                    stopChild();
+                }, remainingTimeoutMs);
+            };
+            const pauseCommandTimeout = () => {
+                if (!timeoutId || timeoutStartedAt === undefined)
+                    return;
+                remainingTimeoutMs = Math.max(0, remainingTimeoutMs - (Date.now() - timeoutStartedAt));
+                clearCommandTimeout();
+            };
             const child = execImpl(command, {
                 cwd,
-                timeout,
                 maxBuffer,
                 env: childEnv,
                 detached: process.platform !== 'win32',
             }, (error, stdout, stderr) => {
+                if (settled)
+                    return;
+                settled = true;
+                clearCommandTimeout();
                 signal?.removeEventListener('abort', stopChild);
                 unregisterPauseController?.();
                 if (error) {
@@ -119,20 +144,34 @@ export async function executeShellCommand(command, options = {}) {
                 }
                 resolve({ stdout, stderr });
             });
-            const stopChild = () => stopChildProcess(child);
-            if (pauseOnSandboxNetworkApproval) {
-                unregisterPauseController = registerSandboxNetworkApprovalPauseController({
-                    pause: () => signalChildProcess(child, 'SIGSTOP'),
-                    resume: () => signalChildProcess(child, 'SIGCONT'),
-                });
-            }
-            if (signal?.aborted) {
-                stopChild();
-            }
-            else {
-                signal?.addEventListener('abort', stopChild, { once: true });
+            if (!settled) {
+                startCommandTimeout();
+                if (pauseOnSandboxNetworkApproval) {
+                    unregisterPauseController = registerSandboxNetworkApprovalPauseController({
+                        pause: () => {
+                            if (settled || paused)
+                                return;
+                            pauseCommandTimeout();
+                            paused = true;
+                            signalChildProcess(child, 'SIGSTOP');
+                        },
+                        resume: () => {
+                            if (settled || !paused)
+                                return;
+                            paused = false;
+                            startCommandTimeout();
+                            signalChildProcess(child, 'SIGCONT');
+                        },
+                    });
+                }
+                if (signal?.aborted) {
+                    stopChild();
+                }
+                else {
+                    signal?.addEventListener('abort', stopChild, { once: true });
+                }
+                child.stdin?.end();
             }
-            child.stdin?.end();
         });
         return {
             stdout: result.stdout?.toString() ?? '',

package/dist/utils/shell/execute-shell.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute-shell.js","sourceRoot":"","sources":["../../../source/utils/shell/execute-shell.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"execute-shell.js","sourceRoot":"","sources":["../../../source/utils/shell/execute-shell.ts"],"names":[],"mappings":"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"}

package/dist/utils/shell/sandbox/docker-host-control-grants.d.ts

@@ -0,0 +1,27 @@
+import type { ISettingsService } from '../../../services/service-interfaces.js';
+export type DockerHostControlGrant = 'once' | 'session' | 'project';
+type DockerHostControlGrantRequest = {
+    command: string;
+    cwd: string;
+    scope: DockerHostControlGrant;
+    sessionId: string;
+};
+declare const realRoot: (cwd: string) => string;
+export declare const configureDockerHostControlGrants: (settings: ISettingsService) => void;
+export declare const grantDockerHostControl: (grant: DockerHostControlGrantRequest) => void;
+export declare const consumeDockerHostControlOnce: (sessionId: string, command: string) => boolean;
+export declare const hasDockerHostControlSession: (sessionId: string, cwd: string) => boolean;
+export declare const hasDockerHostControlProject: (cwd: string) => boolean;
+export declare const clearDockerHostControlSession: (sessionId: string) => void;
+export declare const recordDockerHostControlDenial: (command: string) => void;
+export declare const consumeDockerHostControlDenial: (command: string) => boolean;
+/**
+ * Whether this command must go through the Docker host-control approval prompt:
+ * either it reads as a Docker invocation, or a sandboxed run of it was already
+ * blocked from the daemon (the only signal for indirect invocations).
+ */
+export declare const requiresDockerHostControlApproval: (command: string) => boolean;
+export declare const resetDockerHostControlGrantsForTests: () => void;
+export declare const normalizeDockerHostControlWorkspaceRoot: typeof realRoot;
+export {};
+//# sourceMappingURL=docker-host-control-grants.d.ts.map

package/dist/utils/shell/sandbox/docker-host-control-grants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"docker-host-control-grants.d.ts","sourceRoot":"","sources":["../../../../source/utils/shell/sandbox/docker-host-control-grants.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAGhF,MAAM,MAAM,sBAAsB,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;AAEpE,KAAK,6BAA6B,GAAG;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,sBAAsB,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,QAAA,MAAM,QAAQ,QAAS,MAAM,WAO5B,CAAC;AA4EF,eAAO,MAAM,gCAAgC,aAAc,gBAAgB,SAC9B,CAAC;AAC9C,eAAO,MAAM,sBAAsB,UAAW,6BAA6B,SAAyC,CAAC;AACrH,eAAO,MAAM,4BAA4B,cAAe,MAAM,WAAW,MAAM,YACtB,CAAC;AAC1D,eAAO,MAAM,2BAA2B,cAAe,MAAM,OAAO,MAAM,YACtB,CAAC;AACrD,eAAO,MAAM,2BAA2B,QAAS,MAAM,YAA4C,CAAC;AACpG,eAAO,MAAM,6BAA6B,cAAe,MAAM,SAAoD,CAAC;AACpH,eAAO,MAAM,6BAA6B,YAAa,MAAM,SAAkD,CAAC;AAChH,eAAO,MAAM,8BAA8B,YAAa,MAAM,YAAmD,CAAC;AAElH;;;;GAIG;AACH,eAAO,MAAM,iCAAiC,YAAa,MAAM,YACiB,CAAC;AACnF,eAAO,MAAM,oCAAoC,YAAgD,CAAC;AAClG,eAAO,MAAM,uCAAuC,iBAAW,CAAC"}

package/dist/utils/shell/sandbox/docker-host-control-grants.js

@@ -0,0 +1,96 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { requestsDockerHostControl } from './docker-host-control.js';
+const realRoot = (cwd) => {
+    const resolved = path.resolve(cwd);
+    try {
+        return fs.realpathSync(resolved);
+    }
+    catch {
+        return resolved;
+    }
+};
+/** Narrow capability grant store. Persistence is intentionally limited to user settings. */
+class DockerHostControlGrants {
+    #settings;
+    #onceBySession = new Map();
+    #sessionRootsBySession = new Map();
+    #deniedCommands = new Set();
+    /** A sandboxed run of this command was blocked from the Docker daemon. */
+    recordDenial(command) {
+        this.#deniedCommands.add(command);
+    }
+    consumeDenial(command) {
+        return this.#deniedCommands.delete(command);
+    }
+    hasDenial(command) {
+        return this.#deniedCommands.has(command);
+    }
+    configure(settings) {
+        this.#settings = settings;
+    }
+    grant({ command, cwd, scope, sessionId }) {
+        if (scope === 'once') {
+            const commands = this.#onceBySession.get(sessionId) ?? new Set();
+            commands.add(command);
+            this.#onceBySession.set(sessionId, commands);
+        }
+        if (scope === 'session') {
+            const roots = this.#sessionRootsBySession.get(sessionId) ?? new Set();
+            roots.add(realRoot(cwd));
+            this.#sessionRootsBySession.set(sessionId, roots);
+        }
+        if (scope === 'project')
+            this.grantProject(cwd);
+    }
+    consumeOnce(sessionId, command) {
+        const commands = this.#onceBySession.get(sessionId);
+        if (!commands?.delete(command))
+            return false;
+        if (commands.size === 0)
+            this.#onceBySession.delete(sessionId);
+        return true;
+    }
+    hasSession(sessionId, cwd) {
+        return this.#sessionRootsBySession.get(sessionId)?.has(realRoot(cwd)) ?? false;
+    }
+    hasProject(cwd) {
+        return (this.#settings?.get('sandbox.dockerHostControlProjects') ?? []).includes(realRoot(cwd));
+    }
+    grantProject(cwd) {
+        if (!this.#settings)
+            throw new Error('Docker host-control grants are not configured.');
+        const root = realRoot(cwd);
+        const projects = this.#settings.get('sandbox.dockerHostControlProjects') ?? [];
+        if (!projects.includes(root))
+            this.#settings.set('sandbox.dockerHostControlProjects', [...projects, root]);
+    }
+    clearSession(sessionId) {
+        this.#onceBySession.delete(sessionId);
+        this.#sessionRootsBySession.delete(sessionId);
+    }
+    resetForTests() {
+        this.#onceBySession.clear();
+        this.#sessionRootsBySession.clear();
+        this.#deniedCommands.clear();
+        this.#settings = undefined;
+    }
+}
+const dockerHostControlGrants = new DockerHostControlGrants();
+export const configureDockerHostControlGrants = (settings) => dockerHostControlGrants.configure(settings);
+export const grantDockerHostControl = (grant) => dockerHostControlGrants.grant(grant);
+export const consumeDockerHostControlOnce = (sessionId, command) => dockerHostControlGrants.consumeOnce(sessionId, command);
+export const hasDockerHostControlSession = (sessionId, cwd) => dockerHostControlGrants.hasSession(sessionId, cwd);
+export const hasDockerHostControlProject = (cwd) => dockerHostControlGrants.hasProject(cwd);
+export const clearDockerHostControlSession = (sessionId) => dockerHostControlGrants.clearSession(sessionId);
+export const recordDockerHostControlDenial = (command) => dockerHostControlGrants.recordDenial(command);
+export const consumeDockerHostControlDenial = (command) => dockerHostControlGrants.consumeDenial(command);
+/**
+ * Whether this command must go through the Docker host-control approval prompt:
+ * either it reads as a Docker invocation, or a sandboxed run of it was already
+ * blocked from the daemon (the only signal for indirect invocations).
+ */
+export const requiresDockerHostControlApproval = (command) => requestsDockerHostControl(command) || dockerHostControlGrants.hasDenial(command);
+export const resetDockerHostControlGrantsForTests = () => dockerHostControlGrants.resetForTests();
+export const normalizeDockerHostControlWorkspaceRoot = realRoot;
+//# sourceMappingURL=docker-host-control-grants.js.map

package/dist/utils/shell/sandbox/docker-host-control-grants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"docker-host-control-grants.js","sourceRoot":"","sources":["../../../../source/utils/shell/sandbox/docker-host-control-grants.ts"],"names":[],"mappings":"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"}

package/dist/utils/shell/sandbox/docker-host-control.d.ts

@@ -0,0 +1,32 @@
+export interface DockerHostControl {
+    socketPath: string;
+    configDir: string;
+    cleanup(): void;
+}
+/**
+ * Recognizes direct Docker CLI invocations wherever the shell can put them:
+ * after operators, inside subshells or brace groups, on a later line, behind a
+ * wrapper such as `sudo`/`timeout`, or preceded by environment assignments.
+ * Matching on command position rather than substring keeps `cat Dockerfile`
+ * and `git commit -m "docker"` out. Docker reached indirectly (through a script
+ * or package command) is out of reach of any command-string check.
+ */
+export declare function requestsDockerHostControl(command: string): boolean;
+/**
+ * Detects a sandboxed command that failed because it could not reach the Docker
+ * daemon. This is the only signal available for Docker reached indirectly —
+ * through a script, `make` target, or package command — where the command
+ * string itself never mentions Docker.
+ */
+export declare function detectDockerDaemonBlock(stderr: string): boolean;
+/**
+ * Instruction shown to the agent when the sandbox blocked Docker, encouraging a
+ * same-command retry so the user can approve host control for it.
+ */
+export declare const DOCKER_HOST_CONTROL_RETRY_INSTRUCTION = "Sandbox blocked this command from reaching the Docker daemon. Retry the same command; the user will be prompted to allow Docker host control for it.";
+/**
+ * Docker Desktop's Unix socket controls the host daemon, so this deliberately
+ * recognizes only its canonical per-user macOS endpoint.
+ */
+export declare function createDockerHostControl(home?: string): DockerHostControl;
+//# sourceMappingURL=docker-host-control.d.ts.map

package/dist/utils/shell/sandbox/docker-host-control.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"docker-host-control.d.ts","sourceRoot":"","sources":["../../../../source/utils/shell/sandbox/docker-host-control.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,IAAI,IAAI,CAAC;CACjB;AAoFD;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CA2BlE;AAYD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE/D;AAED;;;GAGG;AACH,eAAO,MAAM,qCAAqC,yJACsG,CAAC;AAEzJ;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,SAAe,GAAG,iBAAiB,CAwB9E"}

package/dist/utils/shell/sandbox/docker-host-control.js

@@ -0,0 +1,164 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { SANDBOX_TEMP_DIR } from '../temp-dir.js';
+const DOCKER_BINARIES = new Set(['docker', 'docker-compose']);
+// Programs that run another program, so the Docker invocation is one token later.
+const COMMAND_WRAPPERS = new Set([
+    'env',
+    'sudo',
+    'doas',
+    'command',
+    'exec',
+    'builtin',
+    'nohup',
+    'nice',
+    'ionice',
+    'stdbuf',
+    'time',
+    'timeout',
+    'xargs',
+]);
+// Shell punctuation that returns the scanner to command position: control
+// operators, grouping, and redirection.
+const OPERATOR_CHARS = ';|&()<>{}';
+const ENV_ASSIGNMENT = /^[A-Za-z_][A-Za-z0-9_]*=/;
+const WRAPPER_OPTION = /^-|^\d+(?:\.\d+)?[smhd]?$/;
+/**
+ * Splits a command into words and operators. Quoting matters: without it,
+ * `git commit -m "fix(docker): update"` would look like a Docker invocation
+ * after a subshell, and a false positive refuses the command outright.
+ */
+function tokenizeShellCommand(command) {
+    const tokens = [];
+    let word = '';
+    let quote;
+    const endWord = () => {
+        if (word)
+            tokens.push({ value: word, isOperator: false });
+        word = '';
+    };
+    for (let index = 0; index < command.length; index++) {
+        const char = command[index];
+        if (quote) {
+            if (char === quote)
+                quote = undefined;
+            else
+                word += char;
+            continue;
+        }
+        if (char === "'" || char === '"') {
+            quote = char;
+            continue;
+        }
+        if (char === '\\') {
+            word += command[++index] ?? '';
+            continue;
+        }
+        if (char === '\n') {
+            // A newline separates commands exactly like `;`.
+            endWord();
+            tokens.push({ value: ';', isOperator: true });
+            continue;
+        }
+        if (/\s/.test(char)) {
+            endWord();
+            continue;
+        }
+        if (OPERATOR_CHARS.includes(char)) {
+            endWord();
+            tokens.push({ value: char, isOperator: true });
+            continue;
+        }
+        word += char;
+    }
+    endWord();
+    return tokens;
+}
+/**
+ * Recognizes direct Docker CLI invocations wherever the shell can put them:
+ * after operators, inside subshells or brace groups, on a later line, behind a
+ * wrapper such as `sudo`/`timeout`, or preceded by environment assignments.
+ * Matching on command position rather than substring keeps `cat Dockerfile`
+ * and `git commit -m "docker"` out. Docker reached indirectly (through a script
+ * or package command) is out of reach of any command-string check.
+ */
+export function requestsDockerHostControl(command) {
+    let atCommandPosition = true;
+    let afterWrapper = false;
+    for (const { value, isOperator } of tokenizeShellCommand(command)) {
+        if (isOperator) {
+            atCommandPosition = true;
+            afterWrapper = false;
+            continue;
+        }
+        if (!atCommandPosition)
+            continue;
+        if (ENV_ASSIGNMENT.test(value))
+            continue;
+        const name = value.split('/').pop() ?? '';
+        if (DOCKER_BINARIES.has(name))
+            return true;
+        if (COMMAND_WRAPPERS.has(name)) {
+            afterWrapper = true;
+            continue;
+        }
+        // A wrapper's own flags and durations still precede the real command.
+        if (afterWrapper && WRAPPER_OPTION.test(value))
+            continue;
+        atCommandPosition = false;
+        afterWrapper = false;
+    }
+    return false;
+}
+// Docker cannot read its own config under the sandbox, so it loses the
+// desktop-linux context and reports failure against the default socket. Both
+// that form and a direct permission failure mean "the sandbox stood in the way".
+const DOCKER_DAEMON_BLOCK_PATTERNS = [
+    /permission denied while trying to connect to the docker (?:api|daemon)/i,
+    /cannot connect to the docker daemon/i,
+    /docker\.sock[^\n]*(?:permission denied|operation not permitted)/i,
+    /(?:permission denied|operation not permitted)[^\n]*docker\.sock/i,
+];
+/**
+ * Detects a sandboxed command that failed because it could not reach the Docker
+ * daemon. This is the only signal available for Docker reached indirectly —
+ * through a script, `make` target, or package command — where the command
+ * string itself never mentions Docker.
+ */
+export function detectDockerDaemonBlock(stderr) {
+    return DOCKER_DAEMON_BLOCK_PATTERNS.some((pattern) => pattern.test(stderr));
+}
+/**
+ * Instruction shown to the agent when the sandbox blocked Docker, encouraging a
+ * same-command retry so the user can approve host control for it.
+ */
+export const DOCKER_HOST_CONTROL_RETRY_INSTRUCTION = 'Sandbox blocked this command from reaching the Docker daemon. Retry the same command; the user will be prompted to allow Docker host control for it.';
+/**
+ * Docker Desktop's Unix socket controls the host daemon, so this deliberately
+ * recognizes only its canonical per-user macOS endpoint.
+ */
+export function createDockerHostControl(home = os.homedir()) {
+    if (process.platform !== 'darwin') {
+        throw new Error('Docker host control is currently supported only on macOS.');
+    }
+    const socketPath = path.join(home, '.docker', 'run', 'docker.sock');
+    let socketStat;
+    try {
+        socketStat = fs.statSync(socketPath);
+    }
+    catch {
+        throw new Error(`Docker Desktop socket is unavailable at ${socketPath}.`);
+    }
+    if (!socketStat.isSocket()) {
+        throw new Error(`Docker Desktop endpoint is not a Unix socket: ${socketPath}.`);
+    }
+    const configDir = fs.mkdtempSync(path.join(SANDBOX_TEMP_DIR, 'docker-config-'));
+    fs.chmodSync(configDir, 0o700);
+    return {
+        socketPath,
+        configDir,
+        cleanup: () => fs.rmSync(configDir, { recursive: true, force: true }),
+    };
+}
+//# sourceMappingURL=docker-host-control.js.map

package/dist/utils/shell/sandbox/docker-host-control.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"docker-host-control.js","sourceRoot":"","sources":["../../../../source/utils/shell/sandbox/docker-host-control.ts"],"names":[],"mappings":"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"}

package/dist/utils/shell/sandbox/sandbox-env.d.ts

@@ -2,6 +2,10 @@ export declare function isSecretKey(key: string): boolean;
 export interface SandboxEnvironmentOptions {
     cwd?: string;
     readPolicy?: 'standard' | 'strict';
+    dockerHostControl?: {
+        socketPath: string;
+        configDir: string;
+    };
 }
 export declare function createSandboxEnvironment(source?: NodeJS.ProcessEnv, options?: SandboxEnvironmentOptions): NodeJS.ProcessEnv;
 //# sourceMappingURL=sandbox-env.d.ts.map

package/dist/utils/shell/sandbox/sandbox-env.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sandbox-env.d.ts","sourceRoot":"","sources":["../../../../source/utils/shell/sandbox/sandbox-env.ts"],"names":[],"mappings":"AAQA,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAehD;AAED,MAAM,WAAW,yBAAyB;IACxC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAC;CACpC;AAED,wBAAgB,wBAAwB,CACtC,MAAM,GAAE,MAAM,CAAC,UAAwB,EACvC,OAAO,GAAE,yBAA8B,GACtC,MAAM,CAAC,UAAU,CAsBnB"}
+{"version":3,"file":"sandbox-env.d.ts","sourceRoot":"","sources":["../../../../source/utils/shell/sandbox/sandbox-env.ts"],"names":[],"mappings":"AAQA,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAehD;AAED,MAAM,WAAW,yBAAyB;IACxC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAC;IACnC,iBAAiB,CAAC,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;CAC/D;AAED,wBAAgB,wBAAwB,CACtC,MAAM,GAAE,MAAM,CAAC,UAAwB,EACvC,OAAO,GAAE,yBAA8B,GACtC,MAAM,CAAC,UAAU,CA2BnB"}

package/dist/utils/shell/sandbox/sandbox-env.js

@@ -1,5 +1,5 @@
 import { resolveSandboxXdgLayout } from '../temp-dir.js';
-const ALLOWED_EXACT_KEYS = new Set(['PATH', 'SHELL', 'TMPDIR', 'TEMP', 'TMP', 'TERM', 'HOME']);
+const ALLOWED_EXACT_KEYS = new Set(['PATH', 'SHELL', 'TMPDIR', 'TEMP', 'TMP', 'TERM', 'HOME', 'TMUX']);
 function isAllowedKey(key) {
     return ALLOWED_EXACT_KEYS.has(key) || key === 'LANG' || key.startsWith('LC_');
 }
@@ -35,6 +35,10 @@ export function createSandboxEnvironment(source = process.env, options = {}) {
         env.XDG_DATA_HOME = data;
         env.XDG_STATE_HOME = state;
     }
+    if (options.dockerHostControl) {
+        env.DOCKER_HOST = `unix://${options.dockerHostControl.socketPath}`;
+        env.DOCKER_CONFIG = options.dockerHostControl.configDir;
+    }
     return env;
 }
 //# sourceMappingURL=sandbox-env.js.map

package/dist/utils/shell/sandbox/sandbox-env.js.map

@@ -1 +1 @@
-{"version":3,"file":"sandbox-env.js","sourceRoot":"","sources":["../../../../source/utils/shell/sandbox/sandbox-env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAEzD,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAE/F,SAAS,YAAY,CAAC,GAAW;IAC/B,OAAO,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,MAAM,IAAI,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;AAChF,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAW;IACrC,OAAO,CACL,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC;QACzB,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC;QACvB,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC;QACxB,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC;QACtB,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC;QACzB,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC;QACtB,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC;QACxB,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC;QACzB,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC;QAC5B,GAAG,KAAK,cAAc;QACtB,GAAG,KAAK,eAAe;QACvB,GAAG,KAAK,eAAe,CACxB,CAAC;AACJ,CAAC;AAOD,MAAM,UAAU,wBAAwB,CACtC,MAAM,GAAsB,OAAO,CAAC,GAAG,EACvC,OAAO,GAA8B,EAAE;IAEvC,MAAM,GAAG,GAAsB,EAAE,CAAC;IAElC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,8EAA8E;QAC9E,4FAA4F;QAC5F,IAAI,KAAK,KAAK,SAAS,IAAI,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;YAClE,SAAS;QACX,CAAC;QACD,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACnB,CAAC;IAED,IAAI,OAAO,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;QACpC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACzC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;QACpE,GAAG,CAAC,eAAe,GAAG,MAAM,CAAC;QAC7B,GAAG,CAAC,cAAc,GAAG,KAAK,CAAC;QAC3B,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC;QACzB,GAAG,CAAC,cAAc,GAAG,KAAK,CAAC;IAC7B,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"sandbox-env.js","sourceRoot":"","sources":["../../../../source/utils/shell/sandbox/sandbox-env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAEzD,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAEvG,SAAS,YAAY,CAAC,GAAW;IAC/B,OAAO,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,MAAM,IAAI,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;AAChF,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAW;IACrC,OAAO,CACL,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC;QACzB,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC;QACvB,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC;QACxB,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC;QACtB,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC;QACzB,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC;QACtB,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC;QACxB,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC;QACzB,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC;QAC5B,GAAG,KAAK,cAAc;QACtB,GAAG,KAAK,eAAe;QACvB,GAAG,KAAK,eAAe,CACxB,CAAC;AACJ,CAAC;AAQD,MAAM,UAAU,wBAAwB,CACtC,MAAM,GAAsB,OAAO,CAAC,GAAG,EACvC,OAAO,GAA8B,EAAE;IAEvC,MAAM,GAAG,GAAsB,EAAE,CAAC;IAElC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,8EAA8E;QAC9E,4FAA4F;QAC5F,IAAI,KAAK,KAAK,SAAS,IAAI,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;YAClE,SAAS;QACX,CAAC;QACD,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACnB,CAAC;IAED,IAAI,OAAO,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;QACpC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACzC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAC;QACpE,GAAG,CAAC,eAAe,GAAG,MAAM,CAAC;QAC7B,GAAG,CAAC,cAAc,GAAG,KAAK,CAAC;QAC3B,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC;QACzB,GAAG,CAAC,cAAc,GAAG,KAAK,CAAC;IAC7B,CAAC;IAED,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;QAC9B,GAAG,CAAC,WAAW,GAAG,UAAU,OAAO,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAC;QACnE,GAAG,CAAC,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC;IAC1D,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}

package/dist/utils/shell/sandbox/sandbox-failure-classifier.d.ts

@@ -12,6 +12,10 @@ export type SandboxFailureClassification = {
     confidence: SandboxFailureConfidence;
     stderr: string;
     deniedRead: DeniedReadInfo;
+} | {
+    type: 'docker_blocked';
+    confidence: SandboxFailureConfidence;
+    stderr: string;
 };
 export interface ClassifySandboxFailureOptions {
     command: string;
@@ -19,6 +23,9 @@ export interface ClassifySandboxFailureOptions {
     annotatedStderr: string;
     sandboxed: boolean;
     readPolicy?: SandboxReadPolicy;
+    /** The run already held Docker host control, so a daemon failure is Docker's, not the sandbox's. */
+    dockerHostControlActive?: boolean;
+    exitCode?: number | null;
 }
-export declare function classifySandboxFailure({ command, rawStderr, annotatedStderr, sandboxed, readPolicy, }: ClassifySandboxFailureOptions): SandboxFailureClassification | null;
+export declare function classifySandboxFailure({ command, rawStderr, annotatedStderr, sandboxed, readPolicy, dockerHostControlActive, exitCode, }: ClassifySandboxFailureOptions): SandboxFailureClassification | null;
 //# sourceMappingURL=sandbox-failure-classifier.d.ts.map

package/dist/utils/shell/sandbox/sandbox-failure-classifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sandbox-failure-classifier.d.ts","sourceRoot":"","sources":["../../../../source/utils/shell/sandbox/sandbox-failure-classifier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAoB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAElF,MAAM,MAAM,wBAAwB,GAAG,oBAAoB,GAAG,gBAAgB,CAAC;AAE/E,MAAM,MAAM,oBAAoB,GAAG,SAAS,GAAG,SAAS,CAAC;AAEzD,MAAM,MAAM,4BAA4B,GACpC;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,oBAAoB,CAAC;IAC7B,UAAU,EAAE,wBAAwB,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,UAAU,EAAE,wBAAwB,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,cAAc,CAAC;CAC5B,CAAC;AAEN,MAAM,WAAW,6BAA6B;IAC5C,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC;AAUD,wBAAgB,sBAAsB,CAAC,EACrC,OAAO,EACP,SAAS,EACT,eAAe,EACf,SAAS,EACT,UAAU,GACX,EAAE,6BAA6B,GAAG,4BAA4B,GAAG,IAAI,CAuCrE"}
+{"version":3,"file":"sandbox-failure-classifier.d.ts","sourceRoot":"","sources":["../../../../source/utils/shell/sandbox/sandbox-failure-classifier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAoB,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGlF,MAAM,MAAM,wBAAwB,GAAG,oBAAoB,GAAG,gBAAgB,CAAC;AAE/E,MAAM,MAAM,oBAAoB,GAAG,SAAS,GAAG,SAAS,CAAC;AAEzD,MAAM,MAAM,4BAA4B,GACpC;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,oBAAoB,CAAC;IAC7B,UAAU,EAAE,wBAAwB,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,UAAU,EAAE,wBAAwB,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,cAAc,CAAC;CAC5B,GACD;IACE,IAAI,EAAE,gBAAgB,CAAC;IACvB,UAAU,EAAE,wBAAwB,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEN,MAAM,WAAW,6BAA6B;IAC5C,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,oGAAoG;IACpG,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAUD,wBAAgB,sBAAsB,CAAC,EACrC,OAAO,EACP,SAAS,EACT,eAAe,EACf,SAAS,EACT,UAAU,EACV,uBAAuB,EACvB,QAAQ,GACT,EAAE,6BAA6B,GAAG,4BAA4B,GAAG,IAAI,CAoDrE"}

package/dist/utils/shell/sandbox/sandbox-failure-classifier.js

@@ -1,15 +1,27 @@
 import { detectDeniedRead } from './denied-read-detector.js';
+import { detectDockerDaemonBlock } from './docker-host-control.js';
 function hasRuntimeAnnotation(rawStderr, annotatedStderr) {
     return annotatedStderr !== rawStderr;
 }
 function hasProxyAllowlistBlock(stderr) {
     return /blocked-by-allowlist/i.test(stderr) || (/\b403\s+Forbidden\b/i.test(stderr) && /allowlist/i.test(stderr));
 }
-export function classifySandboxFailure({ command, rawStderr, annotatedStderr, sandboxed, readPolicy, }) {
+export function classifySandboxFailure({ command, rawStderr, annotatedStderr, sandboxed, readPolicy, dockerHostControlActive, exitCode, }) {
     if (!sandboxed) {
         return null;
     }
     const runtimeAnnotated = hasRuntimeAnnotation(rawStderr, annotatedStderr);
+    // Checked before the generic branches: a blocked daemon connection is
+    // actionable (the user can grant host control) where "blocked" is not.
+    // Reporting this replaces the command's output, so a command that succeeded
+    // is taken at its word however its stderr reads.
+    if (!dockerHostControlActive && exitCode !== 0 && detectDockerDaemonBlock(annotatedStderr)) {
+        return {
+            type: 'docker_blocked',
+            confidence: runtimeAnnotated ? 'runtime_annotation' : 'stderr_pattern',
+            stderr: annotatedStderr,
+        };
+    }
     const proxyAllowlistBlocked = hasProxyAllowlistBlock(annotatedStderr) || hasProxyAllowlistBlock(rawStderr);
     if (readPolicy === 'strict') {
         const deniedRead = detectDeniedRead(command, annotatedStderr);

package/dist/utils/shell/sandbox/sandbox-failure-classifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"sandbox-failure-classifier.js","sourceRoot":"","sources":["../../../../source/utils/shell/sandbox/sandbox-failure-classifier.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAuB,MAAM,2BAA2B,CAAC;AA4BlF,SAAS,oBAAoB,CAAC,SAAiB,EAAE,eAAuB;IACtE,OAAO,eAAe,KAAK,SAAS,CAAC;AACvC,CAAC;AAED,SAAS,sBAAsB,CAAC,MAAc;IAC5C,OAAO,uBAAuB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;AACpH,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,EACrC,OAAO,EACP,SAAS,EACT,eAAe,EACf,SAAS,EACT,UAAU,GACoB;IAC9B,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IAC1E,MAAM,qBAAqB,GAAG,sBAAsB,CAAC,eAAe,CAAC,IAAI,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAE3G,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC5B,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAC9D,IAAI,UAAU,EAAE,CAAC;YACf,OAAO;gBACL,IAAI,EAAE,aAAa;gBACnB,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,gBAAgB;gBACtE,MAAM,EAAE,eAAe;gBACvB,UAAU;aACX,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO;YACL,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;YACrD,UAAU,EAAE,oBAAoB;YAChC,MAAM,EAAE,eAAe;SACxB,CAAC;IACJ,CAAC;IAED,IAAI,qBAAqB,EAAE,CAAC;QAC1B,OAAO;YACL,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,SAAS;YACjB,UAAU,EAAE,gBAAgB;YAC5B,MAAM,EAAE,eAAe;SACxB,CAAC;IACJ,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"sandbox-failure-classifier.js","sourceRoot":"","sources":["../../../../source/utils/shell/sandbox/sandbox-failure-classifier.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAuB,MAAM,2BAA2B,CAAC;AAClF,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAoCnE,SAAS,oBAAoB,CAAC,SAAiB,EAAE,eAAuB;IACtE,OAAO,eAAe,KAAK,SAAS,CAAC;AACvC,CAAC;AAED,SAAS,sBAAsB,CAAC,MAAc;IAC5C,OAAO,uBAAuB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;AACpH,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,EACrC,OAAO,EACP,SAAS,EACT,eAAe,EACf,SAAS,EACT,UAAU,EACV,uBAAuB,EACvB,QAAQ,GACsB;IAC9B,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;IAE1E,sEAAsE;IACtE,uEAAuE;IACvE,4EAA4E;IAC5E,iDAAiD;IACjD,IAAI,CAAC,uBAAuB,IAAI,QAAQ,KAAK,CAAC,IAAI,uBAAuB,CAAC,eAAe,CAAC,EAAE,CAAC;QAC3F,OAAO;YACL,IAAI,EAAE,gBAAgB;YACtB,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,gBAAgB;YACtE,MAAM,EAAE,eAAe;SACxB,CAAC;IACJ,CAAC;IAED,MAAM,qBAAqB,GAAG,sBAAsB,CAAC,eAAe,CAAC,IAAI,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAE3G,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC5B,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAC9D,IAAI,UAAU,EAAE,CAAC;YACf,OAAO;gBACL,IAAI,EAAE,aAAa;gBACnB,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,gBAAgB;gBACtE,MAAM,EAAE,eAAe;gBACvB,UAAU;aACX,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO;YACL,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;YACrD,UAAU,EAAE,oBAAoB;YAChC,MAAM,EAAE,eAAe;SACxB,CAAC;IACJ,CAAC;IAED,IAAI,qBAAqB,EAAE,CAAC;QAC1B,OAAO;YACL,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,SAAS;YACjB,UAAU,EAAE,gBAAgB;YAC5B,MAAM,EAAE,eAAe;SACxB,CAAC;IACJ,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}