staff-mcp 1.1.0 → 1.1.2

package/dist/src/utils/proxy.d.ts

@@ -1,18 +1,70 @@
-/** Redact credentials from a proxy URL for safe logging. */
-export declare function maskProxyUrl(proxyUrl: string): string;
-/** True when any proxy environment variable is present. */
+import { Agent, Dispatcher } from "undici";
+/**
+ * Whether proxy environment variables are present (NO_PROXY alone does not count).
+ */
 export declare function hasProxyEnv(env?: NodeJS.ProcessEnv): boolean;
+export type NoProxyEntryKind = "wildcard" | "exact" | "suffix" | "cidr4" | "cidr6";
+export interface NoProxyEntry {
+    kind: NoProxyEntryKind;
+    /** normalized host: lowercase, no trailing dot, no IPv6 brackets */
+    host: string;
+    /** optional port restriction; null = any port */
+    port: number | null;
+    /** network base for cidr4 (32-bit int) / cidr6 (128-bit bigint) */
+    network?: number | bigint;
+    /** prefix length for cidr kinds */
+    bits?: number;
+}
+/**
+ * Parse a NO_PROXY value into matchable entries.
+ * Supported: "*", exact hosts, ".example.com"/"*.example.com" suffixes,
+ * bare domains (exact + subdomains, curl semantics), "host:port",
+ * IPv4/IPv6 literals and CIDR ranges ("10.0.0.0/8", "fd00::/8").
+ */
+export declare function parseNoProxy(value: string | undefined | null): NoProxyEntry[];
+/** Whether a target host:port matches any NO_PROXY entry (i.e. should bypass the proxy). */
+export declare function matchesNoProxy(hostname: string, port: number | null, entries: NoProxyEntry[]): boolean;
+export interface EnvProxyConfig {
+    httpProxy?: string;
+    httpsProxy?: string;
+    noProxy?: string;
+}
+/**
+ * Pure routing decision used by EnvProxyDispatcher (exported for tests):
+ * returns the proxy URL to use for the given origin, or null for a direct connection.
+ */
+export declare function selectProxyForOrigin(origin: string | URL, config: EnvProxyConfig): string | null;
+export interface EnvProxyDispatcherOptions extends EnvProxyConfig {
+    agentOptions?: Agent.Options;
+}
+/**
+ * Dispatcher that routes traffic through HTTP(S)_PROXY unless the target
+ * matches NO_PROXY. Mirrors undici's EnvHttpProxyAgent fallback semantics
+ * (https targets fall back to HTTP_PROXY when HTTPS_PROXY is unset) but
+ * with full NO_PROXY support (CIDR, suffixes, ports, wildcard).
+ */
+export declare class EnvProxyDispatcher extends Dispatcher {
+    private directAgent;
+    private httpAgent;
+    private httpsAgent;
+    private noProxyEntries;
+    private ownedAgents;
+    constructor(opts?: EnvProxyDispatcherOptions);
+    dispatch(options: Dispatcher.DispatchOptions, handler: Dispatcher.DispatchHandlers): boolean;
+    close(): Promise<void>;
+    destroy(): Promise<void>;
+}
 /**
- * Install a proxy-aware global dispatcher for fetch(). Intended to be called
- * once at startup, before any outbound request.
+ * Configure global proxy for all fetch/undici-based traffic.
  *
- * Priority:
- * 1. explicitProxyUrl (--proxy): routes ALL outbound traffic through it
- *    (undici's ProxyAgent does not apply NO_PROXY).
- * 2. HTTP_PROXY / HTTPS_PROXY environment variables: EnvHttpProxyAgent
- *    honors them per-request, including NO_PROXY bypass rules.
- * 3. Neither: leaves the default dispatcher untouched (no behavior change).
+ * - If explicitProxyUrl is provided (--proxy), it takes precedence and is
+ *   used for ALL traffic (NO_PROXY is intentionally not applied).
+ * - Otherwise, standard HTTP_PROXY / HTTPS_PROXY / NO_PROXY environment
+ *   variables are honored with full NO_PROXY support (exact hosts, domain
+ *   suffixes, wildcards, ":port" qualifiers, IPv4/IPv6 CIDR ranges).
  *
- * @returns true when a proxy dispatcher was installed.
+ * Works on any supported Node.js version without NODE_USE_ENV_PROXY.
  */
 export declare function configureGlobalProxy(explicitProxyUrl?: string): boolean;
+export declare function maskProxyUrl(url: string): string;
+export declare function logGlobalDispatcherDebug(): void;

package/dist/src/utils/proxy.js

@@ -1,66 +1,351 @@
+import { Agent, Dispatcher, ProxyAgent, getGlobalDispatcher, setGlobalDispatcher } from "undici";
+const ENV_HTTP_PROXY = ["HTTP_PROXY", "http_proxy"];
+const ENV_HTTPS_PROXY = ["HTTPS_PROXY", "https_proxy"];
+const ENV_NO_PROXY = ["NO_PROXY", "no_proxy"];
 /**
- * Global outbound proxy support for staff-mcp.
- *
- * Node's built-in env-proxy support (NODE_USE_ENV_PROXY / --use-env-proxy)
- * only exists in Node >= v22.21.0 / v24.0.0. Installing an undici global
- * dispatcher provides the same behavior on every supported Node (>= 20) and
- * covers every fetch() issued in-process: the mcp-reverse SSE connector, its
- * message POSTs, and the MCP SDK client transports (including EventSource,
- * which delegates to globalThis.fetch).
+ * Whether proxy environment variables are present (NO_PROXY alone does not count).
  */
-import { EnvHttpProxyAgent, ProxyAgent, setGlobalDispatcher } from "undici";
-/** Redact credentials from a proxy URL for safe logging. */
-export function maskProxyUrl(proxyUrl) {
+export function hasProxyEnv(env = process.env) {
+    return [...ENV_HTTP_PROXY, ...ENV_HTTPS_PROXY].some((key) => Boolean(env[key]));
+}
+/** Parse an IPv4 literal into a 32-bit number (using multiplication to avoid sign issues). */
+function parseIpv4ToInt(ip) {
+    const m = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/.exec(ip);
+    if (!m)
+        return null;
+    let result = 0;
+    for (let i = 1; i <= 4; i++) {
+        const octet = Number(m[i]);
+        if (octet > 255)
+            return null;
+        result = result * 256 + octet;
+    }
+    return result;
+}
+function matchIpv4Cidr(ip, base, bits) {
+    if (bits <= 0)
+        return true;
+    if (bits >= 32)
+        return ip === base;
+    const shift = 32 - bits;
+    return Math.floor(ip / 2 ** shift) === Math.floor(base / 2 ** shift);
+}
+/** Parse an IPv6 literal (with "::" compression and optional embedded IPv4 tail) into a 128-bit bigint. */
+function parseIpv6ToBigInt(ipInput) {
+    let ip = ipInput;
+    const zoneIdx = ip.indexOf("%"); // strip zone id, e.g. fe80::1%eth0
+    if (zoneIdx >= 0)
+        ip = ip.slice(0, zoneIdx);
+    ip = ip.toLowerCase();
+    if (!/^[0-9a-f:.]+$/.test(ip))
+        return null;
+    const expandV4Tail = (groups) => {
+        const last = groups[groups.length - 1];
+        if (last && last.includes(".")) {
+            const v4 = parseIpv4ToInt(last);
+            if (v4 === null)
+                return null;
+            groups[groups.length - 1] = Math.floor(v4 / 65536).toString(16);
+            groups.push((v4 % 65536).toString(16));
+        }
+        return groups;
+    };
+    let groups;
+    if (ip.includes("::")) {
+        const halves = ip.split("::");
+        if (halves.length !== 2)
+            return null; // at most one "::"
+        const head = halves[0] ? halves[0].split(":") : [];
+        const tail = halves[1] ? halves[1].split(":") : [];
+        const expandedTail = expandV4Tail(tail);
+        if (expandedTail === null)
+            return null;
+        const missing = 8 - (head.length + expandedTail.length);
+        if (missing < 1)
+            return null;
+        groups = [...head, ...Array(missing).fill("0"), ...expandedTail];
+    }
+    else {
+        const expanded = expandV4Tail(ip.split(":"));
+        if (expanded === null)
+            return null;
+        groups = expanded;
+    }
+    if (groups.length !== 8)
+        return null;
+    let result = 0n;
+    for (const g of groups) {
+        if (!/^[0-9a-f]{1,4}$/.test(g))
+            return null;
+        result = (result << 16n) | BigInt(parseInt(g, 16));
+    }
+    return result;
+}
+function matchIpv6Cidr(ip, base, bits) {
+    if (bits <= 0)
+        return true;
+    if (bits >= 128)
+        return ip === base;
+    const shift = BigInt(128 - bits);
+    return ip >> shift === base >> shift;
+}
+function parsePort(value) {
+    if (!/^\d{1,5}$/.test(value))
+        return null;
+    const port = Number(value);
+    return port >= 0 && port <= 65535 ? port : null;
+}
+function makeEntry(hostInput, port) {
+    let host = hostInput.toLowerCase();
+    if (host.endsWith("."))
+        host = host.slice(0, -1); // strip FQDN trailing dot
+    if (host.includes("/")) {
+        let [base, bitsStr] = host.split("/", 2);
+        // Optional port after the prefix length: "10.0.0.0/8:8080"
+        if (bitsStr.includes(":")) {
+            const [bitsPart, portPart] = bitsStr.split(":", 2);
+            const parsed = parsePort(portPart);
+            if (parsed !== null) {
+                bitsStr = bitsPart;
+                port = port ?? parsed;
+            }
+        }
+        const bits = Number(bitsStr);
+        const v4 = parseIpv4ToInt(base);
+        if (v4 !== null && Number.isInteger(bits) && bits >= 0 && bits <= 32) {
+            return { kind: "cidr4", host, port, network: v4, bits };
+        }
+        const v6 = parseIpv6ToBigInt(base);
+        if (v6 !== null && Number.isInteger(bits) && bits >= 0 && bits <= 128) {
+            return { kind: "cidr6", host, port, network: v6, bits };
+        }
+        // Unparseable CIDR: never matches (fail closed toward proxying, like undici).
+        return { kind: "exact", host: "invalid", port };
+    }
+    if (host.startsWith("*."))
+        return { kind: "suffix", host: host.slice(2), port };
+    if (host.startsWith("."))
+        return { kind: "suffix", host: host.slice(1), port };
+    return { kind: "exact", host, port };
+}
+/**
+ * Parse a NO_PROXY value into matchable entries.
+ * Supported: "*", exact hosts, ".example.com"/"*.example.com" suffixes,
+ * bare domains (exact + subdomains, curl semantics), "host:port",
+ * IPv4/IPv6 literals and CIDR ranges ("10.0.0.0/8", "fd00::/8").
+ */
+export function parseNoProxy(value) {
+    if (!value)
+        return [];
+    const entries = [];
+    for (const raw of value.split(",")) {
+        const token0 = raw.trim();
+        if (!token0)
+            continue;
+        if (token0 === "*") {
+            entries.push({ kind: "wildcard", host: "*", port: null });
+            continue;
+        }
+        // Bracketed IPv6, optionally with port: "[::1]" / "[::1]:8080"
+        if (token0.startsWith("[")) {
+            const close = token0.indexOf("]");
+            if (close > 0) {
+                const inner = token0.slice(1, close);
+                const rest = token0.slice(close + 1);
+                const port = rest.startsWith(":") ? parsePort(rest.slice(1)) : null;
+                entries.push(makeEntry(inner, port));
+                continue;
+            }
+        }
+        // "host:port" — only when there is exactly one colon (otherwise it is IPv6)
+        let host = token0;
+        let port = null;
+        if (!token0.includes("/")) {
+            const colonCount = (token0.match(/:/g) || []).length;
+            if (colonCount === 1) {
+                const [h, p] = token0.split(":");
+                const parsed = parsePort(p);
+                if (parsed !== null) {
+                    host = h;
+                    port = parsed;
+                }
+            }
+        }
+        entries.push(makeEntry(host, port));
+    }
+    return entries;
+}
+function isIpLiteral(host) {
+    return parseIpv4ToInt(host) !== null || host.includes(":");
+}
+/** Whether a target host:port matches any NO_PROXY entry (i.e. should bypass the proxy). */
+export function matchesNoProxy(hostname, port, entries) {
+    if (!hostname)
+        return false;
+    let host = hostname.toLowerCase();
+    if (host.startsWith("[") && host.endsWith("]"))
+        host = host.slice(1, -1);
+    if (host.endsWith("."))
+        host = host.slice(0, -1);
+    for (const entry of entries) {
+        if (entry.kind === "wildcard")
+            return true;
+        if (entry.port !== null && entry.port !== port)
+            continue;
+        switch (entry.kind) {
+            case "exact":
+                if (host === entry.host)
+                    return true;
+                // Bare-domain entries also cover subdomains (curl/wget semantics).
+                if (!isIpLiteral(entry.host) && host.endsWith(`.${entry.host}`))
+                    return true;
+                break;
+            case "suffix":
+                if (host === entry.host || host.endsWith(`.${entry.host}`))
+                    return true;
+                break;
+            case "cidr4": {
+                const v4 = parseIpv4ToInt(host);
+                if (v4 !== null && matchIpv4Cidr(v4, entry.network, entry.bits))
+                    return true;
+                break;
+            }
+            case "cidr6": {
+                const v6 = parseIpv6ToBigInt(host);
+                if (v6 !== null && matchIpv6Cidr(v6, entry.network, entry.bits))
+                    return true;
+                break;
+            }
+        }
+    }
+    return false;
+}
+/**
+ * Pure routing decision used by EnvProxyDispatcher (exported for tests):
+ * returns the proxy URL to use for the given origin, or null for a direct connection.
+ */
+export function selectProxyForOrigin(origin, config) {
+    let url;
     try {
-        const url = new URL(proxyUrl);
-        if (url.username)
-            url.username = "***";
-        if (url.password)
-            url.password = "***";
-        return url.toString();
+        url = typeof origin === "string" ? new URL(origin) : origin;
     }
     catch {
-        return "<invalid proxy URL>";
+        return null;
     }
+    const protocol = url.protocol.toLowerCase();
+    if (protocol !== "http:" && protocol !== "https:")
+        return null;
+    const port = url.port ? Number(url.port) : protocol === "https:" ? 443 : 80;
+    if (matchesNoProxy(url.hostname, port, parseNoProxy(config.noProxy)))
+        return null;
+    if (protocol === "https:")
+        return config.httpsProxy ?? config.httpProxy ?? null;
+    return config.httpProxy ?? null;
 }
-/** True when any proxy environment variable is present. */
-export function hasProxyEnv(env = process.env) {
-    return Boolean(env.HTTPS_PROXY ||
-        env.https_proxy ||
-        env.HTTP_PROXY ||
-        env.http_proxy);
+/**
+ * Dispatcher that routes traffic through HTTP(S)_PROXY unless the target
+ * matches NO_PROXY. Mirrors undici's EnvHttpProxyAgent fallback semantics
+ * (https targets fall back to HTTP_PROXY when HTTPS_PROXY is unset) but
+ * with full NO_PROXY support (CIDR, suffixes, ports, wildcard).
+ */
+export class EnvProxyDispatcher extends Dispatcher {
+    directAgent;
+    httpAgent;
+    httpsAgent;
+    noProxyEntries;
+    ownedAgents;
+    constructor(opts = {}) {
+        super();
+        const agentOpts = opts.agentOptions ?? {};
+        this.directAgent = new Agent(agentOpts);
+        this.ownedAgents = [this.directAgent];
+        this.noProxyEntries = parseNoProxy(opts.noProxy);
+        const mkProxy = (uri) => {
+            const agent = new ProxyAgent({ ...agentOpts, uri });
+            this.ownedAgents.push(agent);
+            return agent;
+        };
+        this.httpAgent = opts.httpProxy ? mkProxy(opts.httpProxy) : this.directAgent;
+        this.httpsAgent = opts.httpsProxy ? mkProxy(opts.httpsProxy) : this.httpAgent;
+    }
+    dispatch(options, handler) {
+        let agent = this.directAgent;
+        try {
+            const url = new URL(options.origin);
+            const protocol = url.protocol.toLowerCase();
+            const port = url.port ? Number(url.port) : protocol === "https:" ? 443 : 80;
+            if (!matchesNoProxy(url.hostname, port, this.noProxyEntries)) {
+                agent = protocol === "https:" ? this.httpsAgent : this.httpAgent;
+            }
+        }
+        catch {
+            // Unparseable origin: fall back to direct.
+        }
+        return agent.dispatch(options, handler);
+    }
+    async close() {
+        await Promise.all(this.ownedAgents.map((agent) => agent.close()));
+    }
+    async destroy() {
+        await Promise.all(this.ownedAgents.map((agent) => agent.destroy()));
+    }
 }
+// ============================================================
+//  Global installation
+// ============================================================
 /**
- * Install a proxy-aware global dispatcher for fetch(). Intended to be called
- * once at startup, before any outbound request.
+ * Configure global proxy for all fetch/undici-based traffic.
  *
- * Priority:
- * 1. explicitProxyUrl (--proxy): routes ALL outbound traffic through it
- *    (undici's ProxyAgent does not apply NO_PROXY).
- * 2. HTTP_PROXY / HTTPS_PROXY environment variables: EnvHttpProxyAgent
- *    honors them per-request, including NO_PROXY bypass rules.
- * 3. Neither: leaves the default dispatcher untouched (no behavior change).
+ * - If explicitProxyUrl is provided (--proxy), it takes precedence and is
+ *   used for ALL traffic (NO_PROXY is intentionally not applied).
+ * - Otherwise, standard HTTP_PROXY / HTTPS_PROXY / NO_PROXY environment
+ *   variables are honored with full NO_PROXY support (exact hosts, domain
+ *   suffixes, wildcards, ":port" qualifiers, IPv4/IPv6 CIDR ranges).
  *
- * @returns true when a proxy dispatcher was installed.
+ * Works on any supported Node.js version without NODE_USE_ENV_PROXY.
  */
 export function configureGlobalProxy(explicitProxyUrl) {
-    try {
-        if (explicitProxyUrl) {
+    if (explicitProxyUrl) {
+        try {
             setGlobalDispatcher(new ProxyAgent(explicitProxyUrl));
-            console.error(`[staff-mcp] Outbound proxy: ${maskProxyUrl(explicitProxyUrl)} ` +
-                `(applies to all requests; NO_PROXY is not applied for --proxy)`);
+            console.error(`[staff-mcp] Outbound proxy: using ${explicitProxyUrl} for all traffic (NO_PROXY not applied)`);
             return true;
         }
-        if (hasProxyEnv()) {
-            setGlobalDispatcher(new EnvHttpProxyAgent());
-            console.error("[staff-mcp] Outbound proxy: honoring HTTP_PROXY/HTTPS_PROXY/NO_PROXY environment variables");
-            return true;
+        catch (err) {
+            console.error(`[staff-mcp] Outbound proxy: failed to configure explicit proxy "${explicitProxyUrl}": ${err?.message ?? err}`);
+            return false;
         }
     }
-    catch (error) {
-        console.error(`[staff-mcp] Failed to configure outbound proxy: ` +
-            (error instanceof Error ? error.message : String(error)));
+    const httpProxy = process.env.HTTP_PROXY || process.env.http_proxy;
+    const httpsProxy = process.env.HTTPS_PROXY || process.env.https_proxy;
+    const noProxy = process.env.NO_PROXY || process.env.no_proxy;
+    if (httpProxy || httpsProxy) {
+        setGlobalDispatcher(new EnvProxyDispatcher({ httpProxy, httpsProxy, noProxy }));
+        const proxiesFound = [httpProxy && "HTTP_PROXY", httpsProxy && "HTTPS_PROXY"].filter(Boolean).join("/");
+        console.error(`[staff-mcp] Outbound proxy: honoring ${proxiesFound}${noProxy ? "/NO_PROXY" : ""} environment variables`);
+        return true;
     }
     return false;
 }
+export function maskProxyUrl(url) {
+    try {
+        const u = new URL(url);
+        if (u.username || u.password) {
+            u.username = "***";
+            u.password = "***";
+        }
+        return u.toString();
+    }
+    catch {
+        return "<invalid proxy URL>";
+    }
+}
+export function logGlobalDispatcherDebug() {
+    const d = getGlobalDispatcher();
+    const name = d?.constructor?.name ?? "unknown";
+    const proxyKeys = Object.getOwnPropertySymbols(d)
+        .map((s) => s.toString())
+        .filter((s) => s.includes("proxy") || s.includes("Proxy"));
+    console.error(`[staff-mcp][debug] global dispatcher: ${name} symbols: ${proxyKeys.join(", ") || "none"}`);
+}
 //# sourceMappingURL=proxy.js.map

package/dist/src/utils/proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/utils/proxy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAE5E,4DAA4D;AAC5D,MAAM,UAAU,YAAY,CAAC,QAAgB;IACzC,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC9B,IAAI,GAAG,CAAC,QAAQ;YAAE,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC;QACvC,IAAI,GAAG,CAAC,QAAQ;YAAE,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC;QACvC,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,qBAAqB,CAAC;IACjC,CAAC;AACL,CAAC;AAED,2DAA2D;AAC3D,MAAM,UAAU,WAAW,CAAC,MAAyB,OAAO,CAAC,GAAG;IAC5D,OAAO,OAAO,CACV,GAAG,CAAC,WAAW;QACf,GAAG,CAAC,WAAW;QACf,GAAG,CAAC,UAAU;QACd,GAAG,CAAC,UAAU,CACjB,CAAC;AACN,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,oBAAoB,CAAC,gBAAyB;IAC1D,IAAI,CAAC;QACD,IAAI,gBAAgB,EAAE,CAAC;YACnB,mBAAmB,CAAC,IAAI,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;YACtD,OAAO,CAAC,KAAK,CACT,+BAA+B,YAAY,CAAC,gBAAgB,CAAC,GAAG;gBAChE,gEAAgE,CACnE,CAAC;YACF,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,WAAW,EAAE,EAAE,CAAC;YAChB,mBAAmB,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAC;YAC7C,OAAO,CAAC,KAAK,CACT,4FAA4F,CAC/F,CAAC;YACF,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CACT,kDAAkD;YAClD,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAC3D,CAAC;IACN,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC"}
+{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/utils/proxy.ts"],"names":[],"mappings":"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"}

package/dist/tests/docker-proxy.test.js

@@ -5,7 +5,7 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { PassThrough } from "node:stream";
 import { test } from "node:test";
-import { runDockerProxy, validateAdditionalDockerArgs } from "../src/docker-proxy.js";
+import { buildDockerNameHint, runDockerProxy, sanitizeNameSegment, validateAdditionalDockerArgs } from "../src/docker-proxy.js";
 const FIXTURE_CONTAINER_ID = "a".repeat(64);
 const FIXTURE_SOURCE = String.raw `
 import * as fs from "node:fs";
@@ -122,7 +122,7 @@ function createFixture(t) {
     t.after(() => fs.rmSync(fixtureDir, { recursive: true, force: true }));
     return { fixtureDir, fixturePath, eventsPath, capturePath };
 }
-function runFixture(fixturePath, eventsPath, capturePath, mode, transport, input, signals, timeoutOverrides = {}) {
+function runFixture(fixturePath, eventsPath, capturePath, mode, transport, input, signals, timeoutOverrides = {}, proxyOptions = {}) {
     return runDockerProxy(["run", "fake-image"], transport, {
         command: process.execPath,
         commandPrefixArgs: [fixturePath, mode, eventsPath, capturePath],
@@ -133,6 +133,7 @@ function runFixture(fixturePath, eventsPath, capturePath, mode, transport, input
         containerCleanupTimeoutMs: 500,
         forceKillTimeoutMs: 200,
         ...timeoutOverrides,
+        ...proxyOptions,
     });
 }
 test("reverse Docker proxy ignores closed host stdin and shuts down through its private lifecycle pipe", async (t) => {
@@ -226,7 +227,7 @@ test("a Docker CLI killed before writing its cidfile falls back to the unique ge
     assert.ok(createdEvent, "fixture should expose the generated container name");
     assert.equal(await resultPromise, 137);
     const containerName = createdEvent.slice("created:".length);
-    assert.match(containerName, /^staff-mcp-\d+-[0-9a-f-]{36}$/);
+    assert.match(containerName, /^staff-mcp-session-[0-9a-f]{6}$/);
     assert.ok(readEvents(eventsPath).includes(`rm:${containerName}`));
 });
 test("shutdown before cidfile creation stops the CLI before cleaning up by name", async (t) => {
@@ -354,4 +355,41 @@ test("Docker proxy refuses a pre-existing user cidfile to avoid cleaning a stale
     assert.equal(fs.readFileSync(cidFilePath, "utf8"), "unrelated-container\n");
     assert.equal(signals.listenerCount("SIGTERM"), 0);
 });
+test("sanitizeNameSegment folds Docker-invalid characters and trims decorations", () => {
+    assert.equal(sanitizeNameSegment("Chat Poc!"), "chat-poc");
+    assert.equal(sanitizeNameSegment("--Weird__Name--"), "weird__name");
+    assert.equal(sanitizeNameSegment("my_app.v2"), "my_app.v2");
+    assert.equal(sanitizeNameSegment("工作 目录"), "");
+    assert.equal(sanitizeNameSegment(""), "");
+    assert.equal(sanitizeNameSegment("abc-def", 4), "abc");
+    assert.equal(sanitizeNameSegment("a".repeat(50)), "a".repeat(24));
+});
+test("buildDockerNameHint derives transport-aware hints from launch context", () => {
+    assert.equal(buildDockerNameHint({ workspaceDir: "/data/projs/chat-poc", transport: "stdio" }), "chat-poc");
+    assert.equal(buildDockerNameHint({ workspaceDir: "/data/projs/test", transport: "http", port: "18000" }), "test-18000");
+    assert.equal(buildDockerNameHint({ workspaceDir: "/data/projs/app", transport: "http" }), "app");
+    // reverseName identical to the workspace is redundant and therefore omitted
+    assert.equal(buildDockerNameHint({ workspaceDir: "/data/projs/chat-poc", transport: "reverse", reverseName: "chat-poc" }), "chat-poc");
+    assert.equal(buildDockerNameHint({ workspaceDir: "/data/projs/myapp", transport: "reverse", reverseName: "android-dev" }), "myapp-android-dev");
+});
+test("container name embeds a sanitized hint and a short random suffix", async (t) => {
+    const { fixturePath, eventsPath, capturePath } = createFixture(t);
+    const hostInput = new PassThrough();
+    const signals = new EventEmitter();
+    const resultPromise = runFixture(fixturePath, eventsPath, capturePath, "crash-before-cidfile", "reverse", hostInput, signals, {}, { nameHint: "My Proj_18000" });
+    const deadline = Date.now() + 3_000;
+    let createdEvent;
+    while (!createdEvent && Date.now() < deadline) {
+        createdEvent = readEvents(eventsPath).find((event) => event.startsWith("created:"));
+        if (!createdEvent) {
+            await delay(10);
+        }
+    }
+    assert.ok(createdEvent, "fixture should expose the generated container name");
+    assert.equal(await resultPromise, 137);
+    const containerName = createdEvent.slice("created:".length);
+    assert.match(containerName, /^staff-mcp-my-proj_18000-[0-9a-f]{6}$/);
+    assert.ok(containerName.length <= 63, "container name should stay within 63 characters");
+    assert.ok(readEvents(eventsPath).includes(`rm:${containerName}`));
+});
 //# sourceMappingURL=docker-proxy.test.js.map