aiterm-mcp 0.37.1 → 0.37.3

package/CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.37.3] - 2026-09-13
+
+### 修正
+
+- WindowsのMSIX仮想AppDataにAitermがある場合、Codex Desktopの中継起動が`MODULE_NOT_FOUND`で失敗する問題を修正した。起動済みの中継が自身の実体パスを後続processへ渡す。
+
+## [0.37.2] - 2026-09-13
+
+### 修正
+
+- Codex Steerの引数、通信中継、設定の有効化・復元をmacOSとWindowsで共通化した。OS差は起動API・接続・権限・設定保存に限定する。
+- Windowsで公式Codexの直接の親がDesktopではなくなり、他アプリの公式CLI検出を妨げていた構成を修正した。公式CodexをDesktopの直接の子、中継を公式Codexの子として起動する。
+- Windowsだけの既存launcher共有を廃止し、Macと同じくAitermのlauncherへ設定して解除時に元へ戻す。旧共有設定も次のenableで移行する。
+
 ## [0.37.1] - 2026-09-13
 
 ### 修正
@@ -1671,7 +1685,9 @@ prototype (preserved under `prototype/python/` as the porting source and referen
   `ubuntu-latest` for Node 18/20/22, publishing to npm on `v*` tags with
   provenance.
 
-[Unreleased]: https://github.com/kitepon/aiterm-mcp/compare/v0.37.1...HEAD
+[Unreleased]: https://github.com/kitepon/aiterm-mcp/compare/v0.37.3...HEAD
+[0.37.3]: https://github.com/kitepon/aiterm-mcp/compare/v0.37.2...v0.37.3
+[0.37.2]: https://github.com/kitepon/aiterm-mcp/compare/v0.37.1...v0.37.2
 [0.37.1]: https://github.com/kitepon/aiterm-mcp/compare/v0.37.0...v0.37.1
 [0.37.0]: https://github.com/kitepon/aiterm-mcp/compare/v0.36.0...v0.37.0
 [0.36.0]: https://github.com/kitepon/aiterm-mcp/compare/v0.35.1...v0.36.0

package/README.ja.md

@@ -65,9 +65,11 @@ Windowsはユーザー環境変数`CODEX_CLI_PATH`で起動設定を維持しま
 解除・旧版への巻き戻し前は`aiterm-setup --codex-steer disable`を実行してCodexを再起動してください。
 SteerはmacOS・Windowsの公式Codex Desktopと同梱CLI 0.154以上に対応します。Steer有効時の宛先は中継で起動したDesktopに限ります。
 Windowsでは公式Desktopが展開した実行ファイルを照合し、認証付きのローカル接続へ中継します。
+Windowsの仮想AppDataからの起動にも対応し、中継へ実際の保存先を引き継ぎます。
 Aitermのpackageがlauncher・中継・設定・親への配送を含み、gpt-connectorやdotagentsの導入は不要です。
-既存の互換launcherがある場合は、稼働中のDesktop接続を確認した時だけ共有し、その起動設定を変更しません。
-互換性を確認できない設定は理由付きで停止します。WindowsのDesktop更新後はsetupを再実行してください。
+両OSで公式CodexをDesktopの直接の子として保ち、中継は公式Codexの子として動きます。
+有効化時は元の起動設定を保存してAitermのlauncherを設定し、解除時に元へ戻します。選択後に他から変更された値は上書きしません。
+WindowsのDesktop更新後はsetupを再実行してください。
 LinuxのSteer付き導入は理由付き`unsupported`を返します。Aiterm単品は従来どおり利用できます。
 
 cloneもビルドも不要。どのクライアントでも公開パッケージを次のコマンドで起動する:
@@ -195,7 +197,7 @@ runtime-error store は canonical dotagents config の `collection.enabled: true
 場合だけ収集し、既定OFF、network送信は行いません。tag起点CIのnpm provenance（OIDC Trusted
 Publishing）で公開し、GitHub Release が Official MCP Registry を再登録します。
 
-**状態:** 開発継続中 · 現行公開版 **v0.37.1** · 動作対象は Linux · WSL2 · macOS · Windows ネイティブ · MIT · [変更履歴](CHANGELOG.md)。
+**状態:** 開発継続中 · 現行公開版 **v0.37.3** · 動作対象は Linux · WSL2 · macOS · Windows ネイティブ · MIT · [変更履歴](CHANGELOG.md)。
 
 ### 更新と巻き戻し
 

package/README.md

@@ -65,9 +65,11 @@ Windowsはユーザー環境変数`CODEX_CLI_PATH`で起動設定を維持しま
 解除・旧版への巻き戻し前は`aiterm-setup --codex-steer disable`を実行してCodexを再起動してください。
 SteerはmacOS・Windowsの公式Codex Desktopと同梱CLI 0.154以上に対応します。Steer有効時の宛先は中継で起動したDesktopに限ります。
 Windowsでは公式Desktopが展開した実行ファイルを照合し、認証付きのローカル接続へ中継します。
+Windowsの仮想AppDataからの起動にも対応し、中継へ実際の保存先を引き継ぎます。
 Aitermのpackageがlauncher・中継・設定・親への配送を含み、gpt-connectorやdotagentsの導入は不要です。
-既存の互換launcherがある場合は、稼働中のDesktop接続を確認した時だけ共有し、その起動設定を変更しません。
-互換性を確認できない設定は理由付きで停止します。WindowsのDesktop更新後はsetupを再実行してください。
+両OSで公式CodexをDesktopの直接の子として保ち、中継は公式Codexの子として動きます。
+有効化時は元の起動設定を保存してAitermのlauncherを設定し、解除時に元へ戻します。選択後に他から変更された値は上書きしません。
+WindowsのDesktop更新後はsetupを再実行してください。
 LinuxのSteer付き導入は理由付き`unsupported`を返します。Aiterm単品は従来どおり利用できます。
 
 No clone or build is required. Each client launches the published package with:
@@ -209,7 +211,7 @@ collection is off by default and performs no network I/O. It ships via
 tag-triggered CI with npm provenance (OIDC Trusted Publishing); the GitHub
 Release re-registers the Official MCP Registry entry.
 
-**Status:** actively maintained · current public release **v0.37.1** · runs on Linux · WSL2 · macOS · native Windows (tmux on POSIX, the tmux-CLI-compatible [psmux](https://github.com/psmux/psmux) on native Windows — no WSL required) · MIT · see the [CHANGELOG](CHANGELOG.md).
+**Status:** actively maintained · current public release **v0.37.3** · runs on Linux · WSL2 · macOS · native Windows (tmux on POSIX, the tmux-CLI-compatible [psmux](https://github.com/psmux/psmux) on native Windows — no WSL required) · MIT · see the [CHANGELOG](CHANGELOG.md).
 
 ### Update and rollback
 

package/dist/codex-relay-arguments.js

@@ -0,0 +1,36 @@
+// transportを切り替える条件と引数の扱いは全OSで共通にする。
+export function codexServerArguments(args) {
+    let server = false;
+    const result = [];
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+        if (["-c", "--config", "--enable", "--disable"].includes(arg)) {
+            result.push(arg, args[++i]);
+            continue;
+        }
+        if (/^(?:--config=|--enable=|--disable=|-c.)/.test(arg)) {
+            result.push(arg);
+            continue;
+        }
+        if (!server) {
+            if (arg !== "app-server")
+                return null;
+            server = true;
+            result.push(arg);
+            continue;
+        }
+        if (["proxy", "daemon", "start", "stop", "status", "generate-ts", "generate-json-schema", "--help", "-h", "--version", "-V"].includes(arg))
+            return null;
+        if (arg === "--stdio" || arg === "--listen=stdio://")
+            continue;
+        if (arg === "--listen") {
+            if (args[++i] !== "stdio://")
+                throw new Error("stdio以外の接続指定は変更できません");
+            continue;
+        }
+        if (arg.startsWith("--listen=") || arg.startsWith("--ws-"))
+            throw new Error("既存の接続・認証指定は変更できません");
+        result.push(arg);
+    }
+    return server ? result : null;
+}

package/dist/codex-relay-launcher.js

@@ -1,63 +1,26 @@
-// POSIXのexecで公式CLIのPIDとDesktopからの親子関係を維持する。
-const quote = (text) => `'${text.replace(/'/g, `'"'"'`)}'`;
+// POSIXのexecで公式CLIとDesktopの直接の親子関係を維持する。
+import { codexServerArguments } from "./codex-relay-arguments.js";
+import { prepareRelayDirectory } from "./codex-relay-config.js";
+const quote = (text) => "'" + text.replace(/'/g, "'\"'\"'") + "'";
 export function codexRelayLauncher(options) {
-    return `#!/bin/sh
-binary=${quote(options.binary)}
-node=${quote(options.node)}
-relay=${quote(options.relay)}
-root=${quote(options.socket_root)}
-mode=root
-value=no
-for arg do
-  if [ "$value" = yes ]; then value=no; continue; fi
-  case "$arg" in
-    -c|--config|--enable|--disable|--listen) value=yes; continue ;;
-  esac
-  if [ "$mode" = root ]; then
-    case "$arg" in
-      --config=*|--enable=*|--disable=*|-c?*) ;;
-      app-server) mode=server ;;
-      *) mode=other; break ;;
-    esac
-  else
-    case "$arg" in
-      proxy|start|stop|status|generate-ts|generate-json-schema|--help|-h|--version|-V) mode=other; break ;;
-    esac
-  fi
-done
-if [ "$mode" != server ]; then exec "$binary" "$@"; fi
-
-# 引数を一巡させ、stdio指定だけを公式Unix受付へ変更する。
-remaining=$#
-value=no
-while [ "$remaining" -gt 0 ]; do
-  arg=$1
-  shift
-  remaining=$((remaining - 1))
-  if [ "$value" = yes ]; then
-    set -- "$@" "$arg"
-    value=no
-    continue
-  fi
-  case "$arg" in
-    -c|--config|--enable|--disable) value=yes; set -- "$@" "$arg" ;;
-    --stdio) ;;
-    --listen)
-      if [ "$remaining" -eq 0 ] || [ "$1" != stdio:// ]; then
-        echo 'aiterm-relay: stdio以外の接続指定は変更できません' >&2
-        exit 2
-      fi
-      shift
-      remaining=$((remaining - 1)) ;;
-    --listen=stdio://) ;;
-    --listen=*) echo 'aiterm-relay: stdio以外の接続指定は変更できません' >&2; exit 2 ;;
-    *) set -- "$@" "$arg" ;;
-  esac
-done
-"$node" "$relay" --prepare "$root" || exit $?
-socket="$root/$$.sock"
-exec 3<&0
-"$node" "$relay" "$socket" "$$" <&3 3<&- &
-exec "$binary" "$@" --listen "unix://$socket" </dev/null >/dev/null 3<&-
-`;
+    return [
+        "#!/bin/sh",
+        "command=$(" + [options.node, options.relay, "--prepare", options.socket_root, options.binary, options.node, options.relay].map(quote).join(" ") + ' "$$" "$@") || exit $?',
+        'exec /bin/sh -c "$command"',
+        "",
+    ].join("\n");
+}
+export function preparePosixRelayLaunch(root, binary, node, relay, pid, args) {
+    const serverArgs = codexServerArguments(args);
+    if (!serverArgs)
+        return ["exec", binary, ...args].map((arg, i) => i === 0 ? arg : quote(arg)).join(" ");
+    if (!/^[1-9][0-9]*$/.test(pid) || Buffer.byteLength(root + "/9999999999.sock") >= 104)
+        throw new Error("socketのpathまたは親processの指定が不正です");
+    prepareRelayDirectory(root);
+    const socket = root + "/" + pid + ".sock";
+    return [
+        "exec 3<&0",
+        [node, relay, socket, pid].map(quote).join(" ") + " <&3 3<&- &",
+        "exec " + [binary, ...serverArgs, "--listen", "unix://" + socket].map(quote).join(" ") + " </dev/null >/dev/null 3<&-",
+    ].join("\n");
 }

package/dist/codex-relay-setup.js

@@ -0,0 +1,44 @@
+import { readRelayConfig } from "./codex-relay-config.js";
+import { SetupError } from "./setup-platform.js";
+// 設定・競合・再実行・復元・実効確認の順序は全OSで同じにする。
+export async function configureRelay(action, runtime) {
+    const previous = readRelayConfig(runtime.directory);
+    if (action === "status") {
+        if (!previous?.enabled)
+            return { status: "disabled" };
+        if (runtime.getGui("CODEX_CLI_PATH") !== previous.launcher)
+            return { status: "failed", reason_code: "codex_steer_configuration_changed" };
+        return await runtime.live(previous) ? { status: "ready" } : { status: "restart_required", reason_code: "codex_restart_required" };
+    }
+    if (action === "disable") {
+        if (!previous?.enabled)
+            return { status: "disabled" };
+        if (![previous.launcher, previous.previous_cli_path].includes(runtime.getGui("CODEX_CLI_PATH")))
+            throw new SetupError("codex_steer_configuration_changed", "起動設定が他から変更されています。所有外の値は上書きしません");
+        runtime.unpersist(previous.launcher);
+        runtime.setGui("CODEX_CLI_PATH", previous.previous_cli_path);
+        if (runtime.getGui("CODEX_CLI_PATH") !== previous.previous_cli_path)
+            throw new SetupError("codex_steer_readback_failed", "元の起動設定を確認できません");
+        runtime.save(runtime.directory, { ...previous, enabled: false });
+        return { status: "restart_required", reason_code: "codex_restart_required" };
+    }
+    for (const key of ["CODEX_APP_SERVER_WS_URL", "CODEX_APP_SERVER_USE_LOCAL_DAEMON", "CODEX_APP_SERVER_FORCE_CLI"]) {
+        if (runtime.getGui(key))
+            throw new SetupError("codex_steer_configuration_conflict", `${key}が設定されています。既存の接続設定は上書きしません`);
+    }
+    const binary = runtime.findBinary();
+    const current = runtime.getGui("CODEX_CLI_PATH");
+    if (previous?.enabled && ![previous.launcher, previous.previous_cli_path].includes(current))
+        throw new SetupError("codex_steer_configuration_changed", "起動設定が他から変更されています");
+    runtime.prepare(runtime.directory);
+    const launcher = await runtime.build(binary);
+    const config = { schema: "aiterm.codex-relay.v1", enabled: true, binary, node: runtime.node,
+        launcher, socket_root: runtime.socket_root, previous_cli_path: previous?.enabled ? previous.previous_cli_path : current };
+    // 起動設定の変更前に復元値を保存する。読戻し不一致を成功扱いしない。
+    runtime.save(runtime.directory, config);
+    runtime.persist(launcher);
+    runtime.setGui("CODEX_CLI_PATH", launcher);
+    if (runtime.getGui("CODEX_CLI_PATH") !== launcher)
+        throw new SetupError("codex_steer_readback_failed", "Steerの起動設定を確認できません");
+    return await runtime.live(config) ? { status: "ready" } : { status: "restart_required", reason_code: "codex_restart_required" };
+}

package/dist/codex-relay-stdio.js

@@ -0,0 +1,81 @@
+// Desktopと公式App Serverを結ぶ共通のJSONL中継。OS adapterは接続先とprocess終了だけを供給する。
+import { createInterface } from "node:readline";
+import { once } from "node:events";
+import { setTimeout as delay } from "node:timers/promises";
+export async function relayCodexStdio(adapter) {
+    let socket;
+    let ending = false;
+    let failure;
+    let stopping;
+    const stop = () => stopping ??= adapter.stop();
+    const input = createInterface({ input: process.stdin, crlfDelay: Infinity });
+    // 接続準備中に届いたinitializeとEOFも同じ順序で扱う。
+    const lines = input[Symbol.asyncIterator]();
+    const end = () => { ending = true; void stop().catch(error => { failure = error; }); socket?.terminate(); input.close(); process.stdin.destroy(); };
+    const outputFailed = (error) => { failure = error; end(); };
+    process.stdout.once("error", outputFailed);
+    const drain = () => socket?.resume();
+    process.stdout.on("drain", drain);
+    try {
+        const deadline = Date.now() + 15_000;
+        while (!ending) {
+            if (!adapter.alive())
+                throw new Error("公式App Serverが起動中に終了しました");
+            socket = adapter.socket();
+            const candidate = socket;
+            let opened = false;
+            candidate.once("open", () => { opened = true; });
+            // upgradeと最初のframeが同じ受信単位でも、openのawaitより先に受け付ける。
+            candidate.on("message", (data, binary) => {
+                if (binary) {
+                    failure = new Error("公式App Serverから予期しないバイナリ応答を受信しました");
+                    end();
+                    return;
+                }
+                if (!process.stdout.write(data.toString() + "\n"))
+                    candidate.pause();
+            });
+            candidate.on("error", error => { if (opened) {
+                failure = error;
+                end();
+            } });
+            candidate.on("close", () => {
+                if (opened && !ending) {
+                    failure = new Error("公式App Serverとの接続が終了しました");
+                    end();
+                }
+            });
+            try {
+                await once(socket, "open");
+                break;
+            }
+            catch (error) {
+                socket.on("error", () => { });
+                socket.terminate();
+                if (ending)
+                    break;
+                // 公式受付の作成だけを待つ。送信済みRPCは再送しない。
+                if (!["ENOENT", "ECONNREFUSED"].includes(error.code ?? "") || Date.now() >= deadline)
+                    throw error;
+                await delay(25);
+            }
+        }
+        if (ending) {
+            if (failure)
+                throw failure;
+            return;
+        }
+        const connected = socket;
+        adapter.connected?.();
+        for await (const line of lines)
+            await new Promise((resolve, reject) => connected.send(line, error => error ? reject(error) : resolve()));
+        if (failure)
+            throw failure;
+    }
+    finally {
+        end();
+        await stop();
+        process.stdout.off("error", outputFailed);
+        process.stdout.off("drain", drain);
+    }
+}

package/dist/codex-stdio-relay.js

@@ -1,18 +1,18 @@
 #!/usr/bin/env node
-// DesktopのJSONLと公式App ServerのUnix WebSocketの中継。RPCの内容は変更しない。
+// Unix socketとPOSIX signalのadapter。中継するJSONLと終了契約はWindowsと共通。
 import { createConnection } from "node:net";
-import { createInterface } from "node:readline";
 import { setTimeout as delay } from "node:timers/promises";
-import { once } from "node:events";
 import { fileURLToPath } from "node:url";
 import WebSocket from "ws";
-import { prepareRelayDirectory } from "./codex-relay-config.js";
+import { preparePosixRelayLaunch } from "./codex-relay-launcher.js";
+import { relayCodexStdio } from "./codex-relay-stdio.js";
 export async function runCodexStdioRelay(socketPath, serverPid) {
-    let socket;
-    let ending = false;
-    let stopping;
-    function stopServer() {
-        return stopping ??= (async () => {
+    await relayCodexStdio({
+        alive: () => process.ppid === serverPid,
+        socket: () => new WebSocket("ws://localhost/rpc", {
+            createConnection: () => createConnection(socketPath), handshakeTimeout: 10_000, perMessageDeflate: false,
+        }),
+        stop: async () => {
             // 公式Unix受付は1回目でturn完了待ち、2回目で終了する。
             for (let i = 0; i < 2; i++) {
                 if (process.ppid !== serverPid)
@@ -28,93 +28,26 @@ export async function runCodexStdioRelay(socketPath, serverPid) {
                 if (i === 0)
                     await delay(100);
             }
-        })();
-    }
-    async function connectDuringStartup() {
-        const deadline = Date.now() + 15_000;
-        while (true) {
-            if (process.ppid !== serverPid)
-                throw new Error("公式App Serverが起動中に終了しました");
-            const candidate = new WebSocket("ws://localhost/rpc", {
-                createConnection: () => createConnection(socketPath), handshakeTimeout: 10_000, perMessageDeflate: false,
-            });
-            try {
-                await once(candidate, "open");
-                return candidate;
-            }
-            catch (error) {
-                candidate.on("error", () => { });
-                candidate.terminate();
-                // exec直後のsocket作成だけを待つ。送信済みRPCは再送しない。
-                if (!["ENOENT", "ECONNREFUSED"].includes(error.code ?? "") || Date.now() >= deadline)
-                    throw error;
-                await delay(25);
-            }
-        }
-    }
-    try {
-        socket = await connectDuringStartup();
-        const connected = socket;
-        connected.on("message", (data, binary) => {
-            if (binary) {
-                process.stderr.write("aiterm-relay: 予期しないバイナリ応答\n");
-                process.exitCode = 1;
-                void stopServer();
-                connected.terminate();
-                return;
-            }
-            if (!process.stdout.write(`${data.toString()}\n`))
-                connected.pause();
-        });
-        process.stdout.on("drain", () => connected.resume());
-        connected.on("error", () => {
-            process.stderr.write("aiterm-relay: 通信に失敗しました\n");
-            process.exitCode = 1;
-            void stopServer();
-        });
-        connected.on("close", () => {
-            if (!ending) {
-                process.stderr.write("aiterm-relay: 公式App Serverとの接続が終了しました\n");
-                process.exitCode = 1;
-            }
-            process.stdin.destroy();
-        });
-        process.stdout.on("error", () => { ending = true; void stopServer(); connected.terminate(); process.stdin.destroy(); });
-        const lines = createInterface({ input: process.stdin, crlfDelay: Infinity });
-        for await (const line of lines) {
-            await new Promise((resolve, reject) => connected.send(line, error => error ? reject(error) : resolve()));
-        }
-        ending = true;
-        await stopServer();
-        connected.terminate();
-    }
-    catch (error) {
-        process.stderr.write(`aiterm-relay: 中継失敗: ${error instanceof Error ? error.message : String(error)}\n`);
-        process.exitCode = 1;
-        await stopServer();
-        socket?.terminate();
-        process.stdin.destroy();
-    }
+        },
+    });
 }
 if (process.argv[1] === fileURLToPath(import.meta.url)) {
-    const [socket, pid] = process.argv.slice(2);
-    if (socket === "--prepare") {
-        try {
+    const [socket, pid, ...args] = process.argv.slice(2);
+    try {
+        if (socket === "--prepare") {
             if (process.platform === "win32")
-                throw new Error("WindowsのAF_UNIX中継は未対応です");
-            if (!pid || Buffer.byteLength(`${pid}/9999999999.sock`) >= 104)
-                throw new Error("socketのpathが長すぎます");
-            prepareRelayDirectory(pid);
-        }
-        catch (error) {
-            process.stderr.write(`aiterm-relay: ${error instanceof Error ? error.message : String(error)}\n`);
-            process.exitCode = 2;
+                throw new Error("POSIX launcherはこのOSで利用できません");
+            if (!pid || args.length < 4)
+                throw new Error("中継の起動指定がありません");
+            process.stdout.write(preparePosixRelayLaunch(pid, args[0], args[1], args[2], args[3], args.slice(4)));
         }
+        else if (!socket || !/^[1-9][0-9]*$/.test(pid ?? "") || Number(pid) !== process.ppid)
+            throw new Error("親processの指定が不正です");
+        else
+            await runCodexStdioRelay(socket, Number(pid));
     }
-    else if (!socket || !/^\d+$/.test(pid ?? "") || Number(pid) <= 1 || Number(pid) !== process.ppid) {
-        process.stderr.write("aiterm-relay: 親processの指定が不正です\n");
-        process.exitCode = 2;
+    catch (error) {
+        process.stderr.write("aiterm-relay: " + (error instanceof Error ? error.message : String(error)) + "\n");
+        process.exitCode = 1;
     }
-    else
-        await runCodexStdioRelay(socket, Number(pid));
 }

package/dist/setup-codex-relay.js

@@ -7,12 +7,13 @@ import { fileURLToPath } from "node:url";
 import { randomUUID } from "node:crypto";
 import { SetupError } from "./setup-platform.js";
 import { CodexDeliveryError } from "./codex-delivery-error.js";
-import { readRelayConfig, relayConfigDirectory, prepareRelayDirectory } from "./codex-relay-config.js";
+import { relayConfigDirectory, prepareRelayDirectory } from "./codex-relay-config.js";
 import { codexRelayLauncher } from "./codex-relay-launcher.js";
 import { withCodexRelay } from "./codex-relay-client.js";
 import { readRuntimeProcesses } from "./process-runtime.js";
 import { installRelayLogin, removeRelayLogin } from "./codex-relay-login.js";
-import { configureWindowsCodexSteer } from "./windows-codex-setup.js";
+import { windowsCodexRuntime } from "./windows-codex-setup.js";
+import { configureRelay } from "./codex-relay-setup.js";
 function command(executable, args) {
     const result = spawnSync(executable, args, { encoding: "utf8", timeout: 15_000 });
     if (result.error || result.status !== 0)
@@ -123,65 +124,31 @@ function writeConfig(directory, config) {
 }
 export async function configureCodexSteer(action = "status", overrides = {}) {
     if ((overrides.platform ?? process.platform) === "win32")
-        return configureWindowsCodexSteer(action, overrides);
+        return configureRelay(action, windowsCodexRuntime(overrides));
     const runtime = {
         platform: process.platform, directory: relayConfigDirectory(), socket_root: `/tmp/aiterm-codex-${process.getuid?.() ?? 0}`,
         node: process.execPath, relay: fileURLToPath(new URL("./codex-stdio-relay.js", import.meta.url)),
         findBinary: findDesktopBinary, getGui,
         setGui: (key, value) => { command("/bin/launchctl", value === null ? ["unsetenv", key] : ["setenv", key, value]); },
         persist: installRelayLogin, unpersist: removeRelayLogin,
-        verify: verifyRelayLauncher, live: liveRelay, ...overrides,
+        verify: verifyRelayLauncher, live: liveRelay, prepare: prepareRelayDirectory, save: writeConfig,
+        build: async (binary) => {
+            const launcher = path.join(runtime.directory, "codex");
+            const candidate = path.join(runtime.directory, `codex-${randomUUID()}`);
+            fs.writeFileSync(candidate, codexRelayLauncher({ binary, node: runtime.node, relay: runtime.relay, socket_root: runtime.socket_root }), { mode: 0o700, flag: "wx" });
+            try {
+                await runtime.verify(candidate);
+                fs.renameSync(candidate, launcher);
+            }
+            finally {
+                if (fs.existsSync(candidate))
+                    fs.unlinkSync(candidate);
+            }
+            return launcher;
+        }, ...overrides,
     };
     if (runtime.platform !== "darwin") {
         return action === "enable" ? { status: "unsupported", reason_code: "codex_steer_platform_unsupported" } : { status: "disabled" };
     }
-    const previous = readRelayConfig(runtime.directory);
-    if (action === "status") {
-        if (!previous?.enabled)
-            return { status: "disabled" };
-        if (runtime.getGui("CODEX_CLI_PATH") !== previous.launcher)
-            return { status: "failed", reason_code: "codex_steer_configuration_changed" };
-        return await runtime.live(previous) ? { status: "ready" } : { status: "restart_required", reason_code: "codex_restart_required" };
-    }
-    if (action === "disable") {
-        if (!previous?.enabled)
-            return { status: "disabled" };
-        if (![previous.launcher, previous.previous_cli_path].includes(runtime.getGui("CODEX_CLI_PATH")))
-            throw new SetupError("codex_steer_configuration_changed", "起動設定が他から変更されています。所有外の値は上書きしません");
-        runtime.unpersist(previous.launcher);
-        runtime.setGui("CODEX_CLI_PATH", previous.previous_cli_path);
-        if (runtime.getGui("CODEX_CLI_PATH") !== previous.previous_cli_path)
-            throw new SetupError("codex_steer_readback_failed", "元の起動設定を確認できません");
-        writeConfig(runtime.directory, { ...previous, enabled: false });
-        return { status: "restart_required", reason_code: "codex_restart_required" };
-    }
-    for (const key of ["CODEX_APP_SERVER_WS_URL", "CODEX_APP_SERVER_USE_LOCAL_DAEMON", "CODEX_APP_SERVER_FORCE_CLI"]) {
-        if (runtime.getGui(key))
-            throw new SetupError("codex_steer_configuration_conflict", `${key}が設定されています。既存の接続設定は上書きしません`);
-    }
-    const binary = runtime.findBinary();
-    const current = runtime.getGui("CODEX_CLI_PATH");
-    if (previous?.enabled && ![previous.launcher, previous.previous_cli_path].includes(current))
-        throw new SetupError("codex_steer_configuration_changed", "起動設定が他から変更されています");
-    prepareRelayDirectory(runtime.directory);
-    const launcher = path.join(runtime.directory, "codex");
-    const config = { schema: "aiterm.codex-relay.v1", enabled: true, binary, node: runtime.node,
-        launcher, socket_root: runtime.socket_root, previous_cli_path: previous?.enabled ? previous.previous_cli_path : current };
-    const candidate = path.join(runtime.directory, `codex-${randomUUID()}`);
-    fs.writeFileSync(candidate, codexRelayLauncher({ ...config, relay: runtime.relay }), { mode: 0o700, flag: "wx" });
-    try {
-        await runtime.verify(candidate);
-        fs.renameSync(candidate, launcher);
-    }
-    finally {
-        if (fs.existsSync(candidate))
-            fs.unlinkSync(candidate);
-    }
-    // 起動設定の変更前に復元値を保存する。読戻し不一致を成功扱いしない。
-    writeConfig(runtime.directory, config);
-    runtime.persist(launcher);
-    runtime.setGui("CODEX_CLI_PATH", launcher);
-    if (runtime.getGui("CODEX_CLI_PATH") !== launcher)
-        throw new SetupError("codex_steer_readback_failed", "Steerの起動設定を確認できません");
-    return await runtime.live(config) ? { status: "ready" } : { status: "restart_required", reason_code: "codex_restart_required" };
+    return configureRelay(action, runtime);
 }

package/dist/windows-codex-connection.js

@@ -76,33 +76,25 @@ export function windowsSocketConnection(file) {
         invalid("Steer認証情報が不正です。");
     return { url: record.endpoint, options: { headers: { Authorization: `Bearer ${token}` } } };
 }
-/** 登録済みlauncherとDesktopの子孫にある、対応する公式接続だけを共有できる。 */
-export function windowsDesktopRelay(launcher, rows = readWindowsProcesses()) {
+/** 公式CLIの直接の親がDesktopであり、選択したlauncherの接続先を使っていることを確認する。 */
+export function windowsDesktopRelay(launcher, rows = readWindowsProcesses(), root = join(dirname(launcher), "sessions")) {
     const parents = new Map(rows.map(row => [row.pid, row]));
     for (const server of rows) {
         if (basename(server.executable).toLowerCase() !== "codex.exe" || !server.command.includes("--ws-token-file"))
             continue;
-        let row = parents.get(server.parent_pid);
-        let matchedLauncher = false;
-        let matchedDesktop = false;
-        const seen = new Set();
-        while (row && !seen.has(row.pid)) {
-            seen.add(row.pid);
-            if (row.executable.toLowerCase() === launcher.toLowerCase())
-                matchedLauncher = true;
-            if (/\\WindowsApps\\OpenAI\.Codex_[^\\]+\\app\\(?:ChatGPT|Codex)\.exe$/i.test(row.executable)) {
-                matchedDesktop = true;
-                break;
-            }
-            row = parents.get(row.parent_pid);
-        }
-        if (!matchedLauncher || !matchedDesktop)
+        const desktop = parents.get(server.parent_pid);
+        if (!desktop || !/\\WindowsApps\\OpenAI\.Codex_[^\\]+\\app\\(?:ChatGPT|Codex)\.exe$/i.test(desktop.executable))
+            continue;
+        if (!rows.some(row => row.parent_pid === desktop.pid && row.executable.toLowerCase() === launcher.toLowerCase()))
             continue;
         const token = /(?:^|\s)--ws-token-file\s+(?:"([^"]+)"|(\S+))/.exec(server.command);
         const tokenFile = token?.[1] ?? token?.[2];
         if (!tokenFile || !isAbsolute(tokenFile) || basename(tokenFile) !== "token")
             continue;
         const file = join(dirname(tokenFile), "connection.json");
+        const location = relative(root, file);
+        if (isAbsolute(location) || location === ".." || location.startsWith("..\\") || location.startsWith("../"))
+            continue;
         if (readWindowsRelay(file, rows).serverPid !== server.pid)
             invalid("Steer接続記録と親Codexが一致しません。");
         return file;