unity-open-mcp 1.2.3 → 1.4.0

package/dist/server.js

@@ -38,18 +38,24 @@ const PACKAGE_VERSION = readPackageVersion();
 /** Name → tool lookup, built once for default-injection in the CallTool handler. */
 const TOOL_BY_NAME = new Map(ALL_TOOLS.map((t) => [t.name, t]));
 /**
- * Resolve env for the MCP server. UNITY_PROJECT_PATH is mandatory. The port
- * uses M13 T4.3 instance discovery:
+ * Resolve env for the MCP server. The port uses M13 T4.3 instance discovery:
  *   1. UNITY_OPEN_MCP_BRIDGE_PORT env var (override wins; users who pin a
  *      port keep working as before)
  *   2. ~/.unity-open-mcp/instances/<hash>.json lock file (when its pid is alive)
  *   3. deterministic hash of the project path (20000 + sha256 % 10000)
  * The resolved port is logged so users can see which bridge was picked.
+ *
+ * The project path is normally resolved by the caller (`index.ts`, via
+ * `resolveProjectPath`) and passed in already absolute, so a portable spawn
+ * (`--project-from-cwd`) never has to round-trip through the environment.
+ * When no path is supplied this falls back to raw `UNITY_PROJECT_PATH` for
+ * embedders that call `getEnv()` directly.
  */
-export function getEnv() {
-    const projectPath = process.env[PROJECT_PATH_ENV_VAR];
+export function getEnv(options = {}) {
+    const projectPath = options.projectPath ?? process.env[PROJECT_PATH_ENV_VAR];
     if (!projectPath) {
-        console.error(`unity-open-mcp: ${PROJECT_PATH_ENV_VAR} environment variable is required.`);
+        console.error(`unity-open-mcp: ${PROJECT_PATH_ENV_VAR} environment variable is required ` +
+            "(or pass --project-from-cwd).");
         process.exit(1);
     }
     const rawEnvPort = process.env[PORT_ENV_VAR];
@@ -115,6 +121,7 @@ export function createServer(projectPath, port, authToken, envPort) {
         }
     };
     const router = new ToolRouter(liveClient, batchSpawn, projectPath, eventStream, sessionState, notifyToolListChanged);
+    server.onclose = () => router.closeJobs();
     const resourceRouter = new ResourceRouter({
         live: liveClient,
         pingCache,
@@ -165,29 +172,21 @@ export function createServer(projectPath, port, authToken, envPort) {
                 });
             }
         }
+        // Job ownership is per request, even when the bridge port is unchanged:
+        // the identity travels with the call through every route, including a
+        // tool reached via manage_tools(action: invoke).
+        const identity = { agent: routing.agentId, port: routing.portOverride };
         // No port override → default router (the common single-bridge case).
         if (routing.portOverride === undefined) {
-            return router.route(name, routedArgs);
+            return router.route(name, routedArgs, identity);
         }
-        // Port override → build a transient LiveClient aimed at the override
-        // port. The override bypasses shared session state: it is a fresh client
-        // that resolves its own auth token from the override port's instance
-        // lock (when one exists). The agent id travels as X-Agent-Id so the
-        // target bridge's fair queue can schedule it.
-        const overrideAuth = resolveAuthToken(projectPath, routing.portOverride);
-        // M23 Plan 3 review (M2) — the override client targets a different bridge
-        // port than the default client, so it must NOT share the default
-        // PingCache: a fresh snapshot from the default bridge would let a call
-        // to bridge B short-circuit its own /ping and bypass
-        // bridge_not_connected / compile-wait checks. A private per-client cache
-        // (matching the client's per-request, session-bypassing nature) keeps
-        // each port's ready-state isolated.
-        const overrideLive = new LiveClient(routing.portOverride, new PingCache(), overrideAuth, projectPath, routing.agentId, 
-        // A per-request _meta.port override is authoritative exactly like an
-        // env-port override: pass it as envPort so refreshEndpointFromLock is
-        // a no-op for this transient client (no lock re-resolution).
-        routing.portOverride);
-        return router.routeOverride(name, routedArgs, overrideLive);
+        // Port override → a transient LiveClient bound to the Editor whose
+        // instance lock claims the override port (see forPortOverride). It
+        // bypasses shared session state, including the default PingCache. The
+        // agent id travels as X-Agent-Id so the target bridge's fair queue can
+        // schedule it.
+        const overrideLive = LiveClient.forPortOverride(routing.portOverride, projectPath, routing.agentId);
+        return router.routeOverride(name, routedArgs, overrideLive, identity);
     });
     server.setRequestHandler(ListResourcesRequestSchema, async () => ({
         resources: ALL_RESOURCES,

package/dist/server.js.map

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

package/dist/setup/codex-toml.d.ts

@@ -0,0 +1,23 @@
+export declare class CodexTomlError extends Error {
+    readonly code: string;
+    constructor(code: string, message: string);
+}
+export interface CodexServerEntry {
+    command: string;
+    args: string[];
+    /** Env keys this run sets. */
+    env: Record<string, string>;
+    /** Env keys this run removes when present (a stale machine path). */
+    removeEnv: string[];
+}
+/**
+ * Merge `entry` into `body` under `[mcp_servers.<serverKey>]`. Keys the entry
+ * does not own (`enabled`, timeouts, extra env vars, `.tools.*` tables) are
+ * left exactly as they are. Idempotent: merging the result again returns it
+ * unchanged.
+ */
+export declare function mergeCodexServer(body: string, serverKey: string, entry: CodexServerEntry): string;
+/** A fresh `[mcp_servers.<key>]` block (plus `.env` when there is any). */
+export declare function renderCodexServer(serverKey: string, entry: CodexServerEntry, eol?: string): string;
+/** TOML basic string. */
+export declare function renderString(value: string): string;

package/dist/setup/codex-toml.js

@@ -0,0 +1,514 @@
+// Surgical edits to a Codex `config.toml`.
+//
+// `setup --client codex` owns exactly one server entry: the
+// `[mcp_servers.<key>]` table and its `.env` sub-table (or an inline
+// `env = { … }`). Everything else in the file — other servers, their
+// comments, API tokens, formatting — must survive byte for byte, so this is a
+// line-level editor rather than a parse-and-reserialize: the package ships
+// with one runtime dependency and a TOML serializer would reformat the whole
+// file anyway.
+//
+// The editor recognizes the shapes Codex documents and the Hub / bridge
+// window write: a `[mcp_servers.<key>]` header (bare or quoted segments), plain
+// `key = value` lines (multi-line arrays and strings included), an `.env`
+// sub-table or a one-line inline `env` table, comments, and CRLF files. Any
+// other way of spelling the same entry (dotted keys from a parent table, an
+// inline server table, arrays of tables) is refused with `CodexTomlError`
+// instead of guessed at — a wrong guess would corrupt a file that usually
+// holds credentials.
+export class CodexTomlError extends Error {
+    code;
+    constructor(code, message) {
+        super(message);
+        this.code = code;
+        this.name = "CodexTomlError";
+    }
+}
+/**
+ * Merge `entry` into `body` under `[mcp_servers.<serverKey>]`. Keys the entry
+ * does not own (`enabled`, timeouts, extra env vars, `.tools.*` tables) are
+ * left exactly as they are. Idempotent: merging the result again returns it
+ * unchanged.
+ */
+export function mergeCodexServer(body, serverKey, entry) {
+    const eol = body.includes("\r\n") ? "\r\n" : "\n";
+    const lines = body.split(/\r?\n/);
+    const items = scan(lines);
+    const main = ["mcp_servers", serverKey];
+    const envPath = [...main, "env"];
+    const label = `[${renderKeyPath(main)}]`;
+    for (const item of items) {
+        if (item.kind === "array-header" && startsWith(item.path, main)) {
+            throw refuse(label, "is declared as an array of tables");
+        }
+        if (item.kind === "kv") {
+            const full = [...item.table, ...item.key];
+            if (startsWith(full, main) && item.table.length < main.length) {
+                throw refuse(label, "is spelled with dotted keys or an inline table");
+            }
+            if (samePath(item.table, main) && item.key.length > 1 && item.key[0] === "env") {
+                throw refuse(label, "sets env through dotted keys");
+            }
+        }
+    }
+    const headers = items.filter((i) => i.kind === "header");
+    const mainHeaders = headers.filter((h) => samePath(h.path, main));
+    const envHeaders = headers.filter((h) => samePath(h.path, envPath));
+    if (mainHeaders.length > 1 || envHeaders.length > 1) {
+        throw refuse(label, "is declared more than once");
+    }
+    const mainHeader = mainHeaders[0];
+    const envHeader = envHeaders[0];
+    if (!mainHeader) {
+        if (envHeader)
+            throw refuse(label, "has an env table but no server table");
+        return appendBlock(body, eol, renderCodexServer(serverKey, entry, eol));
+    }
+    const edits = [];
+    const mainKvs = kvsIn(items, main);
+    const find = (key) => mainKvs.find((kv) => kv.key.length === 1 && kv.key[0] === key);
+    const missing = [];
+    for (const [key, rendered] of [
+        ["command", renderString(entry.command)],
+        ["args", renderStringArray(entry.args)],
+    ]) {
+        const kv = find(key);
+        if (!kv)
+            missing.push(`${key} = ${rendered}`);
+        else
+            replaceValue(edits, kv, rendered);
+    }
+    if (missing.length > 0)
+        edits.push({ start: mainHeader.line + 1, end: mainHeader.line, lines: missing });
+    const inlineEnv = find("env");
+    if (inlineEnv && envHeader)
+        throw refuse(label, "defines env both inline and as a table");
+    if (inlineEnv) {
+        if (inlineEnv.endLine !== inlineEnv.line)
+            throw refuse(label, "has a multi-line inline env table");
+        replaceValue(edits, inlineEnv, mergeInlineTable(inlineEnv.value, entry, label));
+    }
+    else if (envHeader) {
+        const envKvs = kvsIn(items, envPath);
+        const inserts = [];
+        for (const [key, value] of Object.entries(entry.env)) {
+            const kv = envKvs.find((e) => e.key.length === 1 && e.key[0] === key);
+            if (kv)
+                replaceValue(edits, kv, renderString(value));
+            else
+                inserts.push(`${renderKey(key)} = ${renderString(value)}`);
+        }
+        for (const key of entry.removeEnv) {
+            if (key in entry.env)
+                continue;
+            const kv = envKvs.find((e) => e.key.length === 1 && e.key[0] === key);
+            if (kv)
+                edits.push({ start: kv.line, end: kv.endLine, lines: [] });
+        }
+        if (inserts.length > 0)
+            edits.push({ start: envHeader.line + 1, end: envHeader.line, lines: inserts });
+    }
+    else if (Object.keys(entry.env).length > 0) {
+        // After the last line of the server table, before any `.tools.*` table.
+        const last = Math.max(mainHeader.line, ...mainKvs.map((kv) => kv.endLine));
+        edits.push({
+            start: last + 1,
+            end: last,
+            lines: ["", `[${renderKeyPath(envPath)}]`, ...envLines(entry.env)],
+        });
+    }
+    return applyEdits(lines, edits).join(eol);
+}
+/** A fresh `[mcp_servers.<key>]` block (plus `.env` when there is any). */
+export function renderCodexServer(serverKey, entry, eol = "\n") {
+    const main = ["mcp_servers", serverKey];
+    const out = [
+        `[${renderKeyPath(main)}]`,
+        "enabled = true",
+        `command = ${renderString(entry.command)}`,
+        `args = ${renderStringArray(entry.args)}`,
+    ];
+    if (Object.keys(entry.env).length > 0) {
+        out.push("", `[${renderKeyPath([...main, "env"])}]`, ...envLines(entry.env));
+    }
+    return out.join(eol) + eol;
+}
+function scan(lines) {
+    const items = [];
+    let table = [];
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        const trimmed = line.trimStart();
+        if (trimmed === "" || trimmed.startsWith("#"))
+            continue;
+        if (trimmed.startsWith("[")) {
+            const header = parseHeader(line);
+            if (header) {
+                items.push({ kind: header.array ? "array-header" : "header", line: i, path: header.path });
+                table = header.path;
+                continue;
+            }
+        }
+        const key = parseKeyPath(line, 0);
+        if (!key)
+            continue;
+        let pos = skipSpaces(line, key.end);
+        if (line[pos] !== "=")
+            continue;
+        pos = skipSpaces(line, pos + 1);
+        const end = scanValue(lines, i, pos);
+        const value = end.line === i
+            ? line.slice(pos, end.col)
+            : [line.slice(pos), ...lines.slice(i + 1, end.line), lines[end.line].slice(0, end.col)].join("\n");
+        items.push({
+            kind: "kv",
+            line: i,
+            endLine: end.line,
+            table,
+            key: key.path,
+            prefix: line.slice(0, pos),
+            value,
+            trailing: lines[end.line].slice(end.col),
+        });
+        i = end.line;
+    }
+    return items;
+}
+function parseHeader(line) {
+    let pos = skipSpaces(line, 0);
+    const array = line.startsWith("[[", pos);
+    pos += array ? 2 : 1;
+    const key = parseKeyPath(line, pos);
+    if (!key)
+        return null;
+    pos = skipSpaces(line, key.end);
+    if (!line.startsWith(array ? "]]" : "]", pos))
+        return null;
+    pos = skipSpaces(line, pos + (array ? 2 : 1));
+    if (pos < line.length && line[pos] !== "#")
+        return null;
+    return { path: key.path, array };
+}
+/** Dotted key (`a.b`, `"a b".c`, `'lit'`) starting at `start` (after spaces). */
+function parseKeyPath(line, start) {
+    const path = [];
+    let pos = skipSpaces(line, start);
+    for (;;) {
+        const ch = line[pos];
+        let segment;
+        if (ch === '"') {
+            let out = "";
+            pos++;
+            while (pos < line.length && line[pos] !== '"') {
+                if (line[pos] === "\\" && pos + 1 < line.length) {
+                    out += line[pos + 1];
+                    pos += 2;
+                }
+                else {
+                    out += line[pos++];
+                }
+            }
+            if (line[pos] !== '"')
+                return null;
+            pos++;
+            segment = out;
+        }
+        else if (ch === "'") {
+            const close = line.indexOf("'", pos + 1);
+            if (close < 0)
+                return null;
+            segment = line.slice(pos + 1, close);
+            pos = close + 1;
+        }
+        else {
+            const match = /^[A-Za-z0-9_-]+/.exec(line.slice(pos));
+            if (!match)
+                return null;
+            segment = match[0];
+            pos += segment.length;
+        }
+        path.push(segment);
+        const next = skipSpaces(line, pos);
+        if (line[next] !== ".")
+            return { path, end: pos };
+        pos = skipSpaces(line, next + 1);
+    }
+}
+/**
+ * Where the value that begins at (`line`, `col`) ends: strings (single and
+ * multi-line, basic and literal) and bracket nesting may carry it across
+ * lines. Returns the position just past the value on its last line, before
+ * any trailing spaces or comment.
+ */
+function scanValue(lines, line, col) {
+    let state = "normal";
+    let depth = 0;
+    for (let l = line; l < lines.length; l++) {
+        const text = lines[l];
+        let lastValueEnd = l === line ? col : 0;
+        for (let c = l === line ? col : 0; c < text.length; c++) {
+            const ch = text[c];
+            if (state === "normal") {
+                if (ch === "#")
+                    break;
+                if (text.startsWith('"""', c)) {
+                    state = "ml-basic";
+                    c += 2;
+                }
+                else if (text.startsWith("'''", c)) {
+                    state = "ml-literal";
+                    c += 2;
+                }
+                else if (ch === '"')
+                    state = "basic";
+                else if (ch === "'")
+                    state = "literal";
+                else if (ch === "[" || ch === "{")
+                    depth++;
+                else if (ch === "]" || ch === "}")
+                    depth--;
+                if (ch !== " " && ch !== "\t")
+                    lastValueEnd = c + 1;
+            }
+            else if (state === "basic" || state === "ml-basic") {
+                if (ch === "\\") {
+                    c++;
+                }
+                else if (state === "basic" && ch === '"') {
+                    state = "normal";
+                }
+                else if (state === "ml-basic" && text.startsWith('"""', c)) {
+                    state = "normal";
+                    c += 2;
+                }
+                lastValueEnd = c + 1;
+            }
+            else {
+                if (state === "literal" && ch === "'")
+                    state = "normal";
+                else if (state === "ml-literal" && text.startsWith("'''", c)) {
+                    state = "normal";
+                    c += 2;
+                }
+                lastValueEnd = c + 1;
+            }
+        }
+        // A single-line string cannot run past its line; treat it as closed.
+        if (state === "basic" || state === "literal")
+            state = "normal";
+        if (state === "normal" && depth <= 0)
+            return { line: l, col: lastValueEnd };
+    }
+    return { line: lines.length - 1, col: lines[lines.length - 1].length };
+}
+function replaceValue(edits, kv, rendered) {
+    if (kv.value === rendered)
+        return;
+    // Same strings spelled differently (a multi-line array, literal quotes):
+    // nothing to change, so the user's formatting stays.
+    const current = parseStrings(kv.value);
+    const next = parseStrings(rendered);
+    if (current && next && current.kind === next.kind && sameStrings(current.values, next.values))
+        return;
+    edits.push({ start: kv.line, end: kv.endLine, lines: [`${kv.prefix}${rendered}${kv.trailing}`] });
+}
+function applyEdits(lines, edits) {
+    const out = [...lines];
+    // Bottom-up so earlier line numbers stay valid; an insert at the same line
+    // as a replacement lands after it.
+    const ordered = [...edits].sort((a, b) => b.start - a.start || b.end - a.end);
+    for (const edit of ordered) {
+        out.splice(edit.start, Math.max(0, edit.end - edit.start + 1), ...edit.lines);
+    }
+    return out;
+}
+function appendBlock(body, eol, block) {
+    if (body.trim() === "")
+        return block;
+    let out = body.endsWith("\n") ? body : body + eol;
+    const lines = out.split(/\r?\n/);
+    const lastContent = lines.length >= 2 ? lines[lines.length - 2] : "";
+    if (lastContent.trim() !== "")
+        out += eol;
+    return out + block;
+}
+/** `{ A = "1", B = "2" }` with this run's keys set in place and removals dropped. */
+function mergeInlineTable(raw, entry, label) {
+    const inner = raw.trim();
+    if (!inner.startsWith("{") || !inner.endsWith("}")) {
+        throw refuse(label, "has an env value that is not a table");
+    }
+    const pairs = splitTopLevel(inner.slice(1, -1));
+    const kept = [];
+    const seen = new Set();
+    for (const pair of pairs) {
+        const key = parseKeyPath(pair, 0);
+        if (!key)
+            throw refuse(label, "has an env table this editor cannot read");
+        const name = key.path.length === 1 ? key.path[0] : undefined;
+        if (name !== undefined && name in entry.env) {
+            kept.push(`${pair.slice(0, skipSpaces(pair, skipSpaces(pair, key.end) + 1))}${renderString(entry.env[name])}`);
+            seen.add(name);
+        }
+        else if (name !== undefined && entry.removeEnv.includes(name)) {
+            continue;
+        }
+        else {
+            kept.push(pair);
+        }
+    }
+    for (const [key, value] of Object.entries(entry.env)) {
+        if (!seen.has(key))
+            kept.push(`${renderKey(key)} = ${renderString(value)}`);
+    }
+    return kept.length === 0 ? "{}" : `{ ${kept.join(", ")} }`;
+}
+/** Split `a = 1, b = [2, 3]` on commas outside strings and brackets; trimmed, empties dropped. */
+function splitTopLevel(text) {
+    const parts = [];
+    let depth = 0;
+    let quote = null;
+    let start = 0;
+    for (let i = 0; i < text.length; i++) {
+        const ch = text[i];
+        if (quote) {
+            if (quote === '"' && ch === "\\")
+                i++;
+            else if (ch === quote)
+                quote = null;
+        }
+        else if (ch === '"' || ch === "'")
+            quote = ch;
+        else if (ch === "[" || ch === "{")
+            depth++;
+        else if (ch === "]" || ch === "}")
+            depth--;
+        else if (ch === "," && depth === 0) {
+            parts.push(text.slice(start, i));
+            start = i + 1;
+        }
+    }
+    parts.push(text.slice(start));
+    return parts.map((p) => p.trim()).filter((p) => p.length > 0);
+}
+/**
+ * A string or an array of strings, read back from raw TOML; `null` for any
+ * other value. Only used to decide that a value is already what we would write.
+ */
+function parseStrings(raw) {
+    const text = raw.trim();
+    const readString = (pos) => {
+        const quote = text[pos];
+        if (quote === "'") {
+            const close = text.indexOf("'", pos + 1);
+            return close < 0 ? null : { value: text.slice(pos + 1, close), end: close + 1 };
+        }
+        if (quote !== '"')
+            return null;
+        let value = "";
+        for (let i = pos + 1; i < text.length; i++) {
+            const ch = text[i];
+            if (ch === '"')
+                return { value, end: i + 1 };
+            if (ch !== "\\") {
+                value += ch;
+                continue;
+            }
+            const esc = text[++i];
+            const simple = { n: "\n", t: "\t", r: "\r", '"': '"', "\\": "\\" };
+            if (esc in simple)
+                value += simple[esc];
+            else if (esc === "u" || esc === "U") {
+                const len = esc === "u" ? 4 : 8;
+                value += String.fromCodePoint(parseInt(text.slice(i + 1, i + 1 + len), 16));
+                i += len;
+            }
+            else
+                return null;
+        }
+        return null;
+    };
+    if (!text.startsWith("[")) {
+        const single = readString(0);
+        return single && single.end === text.length ? { kind: "string", values: [single.value] } : null;
+    }
+    const values = [];
+    let pos = 1;
+    for (;;) {
+        while (pos < text.length && /[\s,]/.test(text[pos]))
+            pos++;
+        if (text[pos] === "#") {
+            while (pos < text.length && text[pos] !== "\n")
+                pos++;
+            continue;
+        }
+        if (text[pos] === "]")
+            return pos === text.length - 1 ? { kind: "array", values } : null;
+        const item = readString(pos);
+        if (!item)
+            return null;
+        values.push(item.value);
+        pos = item.end;
+    }
+}
+function sameStrings(a, b) {
+    return a.length === b.length && a.every((value, i) => value === b[i]);
+}
+// ---------------------------------------------------------------------------
+// Rendering
+// ---------------------------------------------------------------------------
+function envLines(env) {
+    return Object.entries(env).map(([key, value]) => `${renderKey(key)} = ${renderString(value)}`);
+}
+function renderKey(key) {
+    return /^[A-Za-z0-9_-]+$/.test(key) ? key : renderString(key);
+}
+function renderKeyPath(path) {
+    return path.map(renderKey).join(".");
+}
+function renderStringArray(values) {
+    return `[${values.map(renderString).join(", ")}]`;
+}
+/** TOML basic string. */
+export function renderString(value) {
+    let out = '"';
+    for (const ch of value) {
+        const code = ch.codePointAt(0);
+        if (ch === "\\")
+            out += "\\\\";
+        else if (ch === '"')
+            out += '\\"';
+        else if (ch === "\n")
+            out += "\\n";
+        else if (ch === "\r")
+            out += "\\r";
+        else if (ch === "\t")
+            out += "\\t";
+        else if (code < 0x20 || code === 0x7f)
+            out += `\\u${code.toString(16).padStart(4, "0")}`;
+        else
+            out += ch;
+    }
+    return out + '"';
+}
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+function kvsIn(items, table) {
+    return items.filter((i) => i.kind === "kv" && samePath(i.table, table));
+}
+function samePath(a, b) {
+    return a.length === b.length && a.every((segment, i) => segment === b[i]);
+}
+function startsWith(path, prefix) {
+    return path.length >= prefix.length && prefix.every((segment, i) => path[i] === segment);
+}
+function skipSpaces(text, pos) {
+    while (pos < text.length && (text[pos] === " " || text[pos] === "\t"))
+        pos++;
+    return pos;
+}
+function refuse(label, why) {
+    return new CodexTomlError("unsupported_codex_config", `${label} ${why}; setup only edits the plain table form and leaves this file unchanged.`);
+}
+//# sourceMappingURL=codex-toml.js.map