codex-grok-bridge 1.5.0 → 1.6.0

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 1.6.0 — 2026-09-27
+
+- Default catalog model is `grok-4.7` (`Grok 4.7 / xAI`). `grok-4.6` stays listed so existing threads still resolve.
+- `grok-*` still routes to `grok_build_cli`. No other model ids were added. `GROK_BRIDGE_MODELS` still appends extra `grok-*` ids.
+
 ## 1.5.0 — 2026-09-12
 
 First cut that accepts **Windows** (`"os": ["darwin", "linux", "win32"]`).

package/Open Codex with Grok.command

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Double-click to open the dedicated Codex window with Grok 4.6 available.
+# Double-click to open the dedicated Codex window with Grok 4.7 available.
 # Resolves everything from this file's own location, so the checkout can live
 # anywhere and be moved without editing this launcher.
 set -eu

package/README.md

@@ -1,11 +1,12 @@
 # codex-grok-bridge
 
-Run **Grok 4.6 as the model inside Codex**. Codex still owns tools, permissions,
-history and MCP. Inference uses the installed `grok` CLI login session — not an
+Run **Grok 4.7 as the model inside Codex**. Codex still owns tools, permissions,
+history and MCP. `grok-4.6` stays on the model list so existing threads still
+resolve. Inference uses the installed `grok` CLI login session — not an
 xAI API key.
 
 ```
-Codex UI/CLI → app-server → scripts/codex-wrapper.mjs (adds grok-4.6 to the model list)
+Codex UI/CLI → app-server → scripts/codex-wrapper.mjs (adds grok-4.7 and grok-4.6 to the model list)
              → localhost /v1/responses (the bridge)
              → cli-chat-proxy.grok.com
              → Codex executes every tool call; results return as the next input
@@ -20,7 +21,7 @@ prefixes stay untouched; `scripts/install-codex-grok-app.sh` and
 ---
 ## What this is
 
-A local bridge that puts Grok 4.6 on Codex’s model list and sends Codex
+A local bridge that puts Grok 4.7 on Codex’s model list and sends Codex
 `/v1/responses` traffic to `cli-chat-proxy.grok.com`. Grok does the inference.
 Codex runs every tool call (shell, patch, MCP, …) and feeds the results back as
 the next request’s `input`. That is the same agent loop as the GPT path.
@@ -32,9 +33,9 @@ so Codex still recognizes them.
 Fourteen files under `src/`. Zero runtime dependencies. Node.js ≥ 22.
 
 This is not a second-opinion review product and not a Grok-native search
-product. New Grok ids, including 4.7 when the CLI lists them, use the same
-`grok-*` route. Set `GROK_BRIDGE_MODELS=grok-4.7` to show extras in the catalog
-before they are the default. If Codex exposes a web-search tool, Grok can call
+product. The picker shows `grok-4.7` (Grok 4.7 / xAI) and keeps `grok-4.6`.
+Any other `grok-*` id uses the same route. `GROK_BRIDGE_MODELS` adds further
+`grok-*` ids. If Codex exposes a web-search tool, Grok can call
 that tool the same way it calls any other Codex tool.
 
 ## Requirements
@@ -59,7 +60,7 @@ re-verification.
 
 ```sh
 npm install -g codex-grok-bridge   # macOS, Linux, or Windows; Node ≥ 22
-codex-grok                         # launches Codex with Grok 4.6 available
+codex-grok                         # launches Codex with Grok 4.7 available
 codex-grok exec --skip-git-repo-check --sandbox workspace-write 'your task'
 ```
 
@@ -84,9 +85,9 @@ On Linux that wrapper is `~/.local/share/codex-grok-bridge/app` plus a user
 `.desktop` entry; the stock `/usr/lib/chatgpt` tree is not patched. On Windows
 it is `%LOCALAPPDATA%\codex-grok-bridge`; `WindowsApps` is never written.
 
-In the new Codex window, **select Grok 4.6 / xAI before starting a new
-thread**. Existing GPT models stay on the list. A Codex window that was already
-open does not get this extension.
+In the new Codex window, **select Grok 4.7 / xAI before starting a new
+thread**. Existing GPT models stay on the list, and so does `grok-4.6`. A Codex
+window that was already open does not get this extension.
 
 The dedicated window stores UI data under
 `~/.local/share/codex-grok-bridge/desktop` and **shares** the normal Codex home
@@ -280,7 +281,7 @@ Start here when something breaks. Do not open `~/.grok/auth.json` or
 | `GROK_BRIDGE_TRANSPORT=fetch` | Use Node `fetch` instead of `node:http(s)` |
 | `GROK_BRIDGE_INFERENCE=cli` | Fall back to the CLI envelope path |
 | `GROK_BRIDGE_DIAGNOSTICS=off` | Do not write the JSONL log |
-| `GROK_BRIDGE_MODELS` | Extra `grok-*` catalog ids (comma or space), e.g. `grok-4.7` |
+| `GROK_BRIDGE_MODELS` | Extra `grok-*` catalog ids (comma or space) beyond `grok-4.7` and `grok-4.6` |
 | `NODE` | Absolute `node` binary for the `.command` launcher / desktop scripts |
 | `CODEX_GROK_APP` | Alternate app path for the desktop installer (macOS: `/Applications/Codex Grok.app`; Linux: `~/.local/share/codex-grok-bridge/app`; Windows: `%LOCALAPPDATA%\codex-grok-bridge\app`) |
 
@@ -347,7 +348,7 @@ responses. Codex’s and Grok’s own retention policies still apply.
 
 ## 이게 뭔가
 
-Grok 4.6을 Codex 모델 목록에 넣고, Codex의 `/v1/responses`를
+Grok 4.7을 Codex 모델 목록에 넣고, Codex의 `/v1/responses`를
 `cli-chat-proxy.grok.com`으로 넘기는 로컬 브리지입니다. 추론은 Grok이 합니다.
 도구 호출(셸, 패치, MCP, …)은 Codex가 실행하고, 결과는 다음 요청의 `input`으로
 돌아갑니다. GPT 경로와 같은 에이전트 루프입니다.
@@ -359,10 +360,11 @@ calling으로 옮기고, 상류 Responses 스트림을 전달한 뒤, Codex가
 `src/` 아래 파일 14개. 런타임 의존성 없음. Node.js 22 이상. 1.5.0부터 npm
 `"os"`는 `darwin` / `linux` / `win32`입니다.
 
-코드 리뷰 전용 제품이 아니고 Grok 네이티브 검색 제품도 아닙니다. CLI가 새
-id(4.7 포함)를 내놓으면 같은 `grok-*` 경로로 붙습니다. 기본 카탈로그에 먼저
-보이게 하려면 `GROK_BRIDGE_MODELS=grok-4.7`을 씁니다. Codex가 웹 검색 도구를
-노출하면 Grok은 다른 Codex 도구와 같이 그 도구를 호출할 수 있습니다.
+코드 리뷰 전용 제품이 아니고 Grok 네이티브 검색 제품도 아닙니다. 피커에는
+`grok-4.7`(Grok 4.7 / xAI)이 기본으로 보이고 `grok-4.6`도 남습니다. 그 외
+`grok-*` id도 같은 경로로 붙고, `GROK_BRIDGE_MODELS`로 카탈로그에 더합니다.
+Codex가 웹 검색 도구를 노출하면 Grok은 다른 Codex 도구와 같이 그 도구를
+호출할 수 있습니다.
 
 ## 필요한 것
 
@@ -385,7 +387,7 @@ id(4.7 포함)를 내놓으면 같은 `grok-*` 경로로 붙습니다. 기본
 
 ```sh
 npm install -g codex-grok-bridge   # macOS, Linux, Windows; Node ≥ 22
-codex-grok                         # Grok 4.6이 있는 Codex를 띄움
+codex-grok                         # Grok 4.7이 있는 Codex를 띄움
 codex-grok exec --skip-git-repo-check --sandbox workspace-write '작업 내용'
 ```
 
@@ -410,9 +412,9 @@ Linux에서는 `~/.local/share/codex-grok-bridge/app`과 사용자 `.desktop`이
 정품 `/usr/lib/chatgpt`는 패치하지 않습니다. Windows에서는
 `%LOCALAPPDATA%\codex-grok-bridge`이고 `WindowsApps`는 쓰지 않습니다.
 
-새로 열린 Codex 창에서 **새 작업을 시작하기 전에 Grok 4.6 / xAI를 선택**하세요.
-기존 GPT 모델도 목록에 남습니다. 이미 열려 있던 일반 Codex 창에는 이 확장이
-주입되지 않습니다.
+새로 열린 Codex 창에서 **새 작업을 시작하기 전에 Grok 4.7 / xAI를 선택**하세요.
+기존 GPT 모델과 `grok-4.6`도 목록에 남습니다. 이미 열려 있던 일반 Codex 창에는
+이 확장이 주입되지 않습니다.
 
 전용 창은 UI 데이터를 `~/.local/share/codex-grok-bridge/desktop`에 두고,
 계정·작업·설정은 기존 Codex 홈을 **공유**합니다. 작업 내용과 설정 변경은 다른
@@ -595,7 +597,7 @@ provider에 Codex `request_max_retries` / `stream_max_retries`를 2로 두어
 | `GROK_BRIDGE_TRANSPORT=fetch` | `node:http(s)` 대신 Node `fetch` |
 | `GROK_BRIDGE_INFERENCE=cli` | CLI 봉투 경로로 폴백 |
 | `GROK_BRIDGE_DIAGNOSTICS=off` | JSONL 로그를 쓰지 않음 |
-| `GROK_BRIDGE_MODELS` | 카탈로그에 더할 `grok-*` id (쉼표/공백). 예: `grok-4.7` |
+| `GROK_BRIDGE_MODELS` | `grok-4.7`과 `grok-4.6` 외에 카탈로그에 더할 `grok-*` id (쉼표/공백) |
 | `NODE` | `.command` / 데스크톱 스크립트가 쓸 `node` 절대 경로 |
 | `CODEX_GROK_APP` | 데스크톱 설치기가 쓸 앱 경로 (macOS: `/Applications/Codex Grok.app`; Linux: `~/.local/share/codex-grok-bridge/app`; Windows: `%LOCALAPPDATA%\codex-grok-bridge\app`) |
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "codex-grok-bridge",
-  "version": "1.5.0",
-  "description": "Run Grok 4.6 as the model inside Codex, with Codex still owning tools, permissions, history and MCP. Uses the grok login session, not an API key.",
+  "version": "1.6.0",
+  "description": "Run Grok 4.7 as the model inside Codex, with Codex still owning tools, permissions, history and MCP. Uses the grok login session, not an API key.",
   "type": "module",
   "license": "MIT",
   "author": "deximple",

package/scripts/codex-grok.mjs

@@ -2,6 +2,7 @@
 import { spawn } from "node:child_process";
 import { startRuntime } from "../src/runtime.mjs";
 import { resolveCodexBinary } from "../src/paths.mjs";
+import { DEFAULT_GROK_MODEL } from "../src/models.mjs";
 const runtime = await startRuntime();
 const userArgs = process.argv.slice(2);
 const overrides = [
@@ -11,7 +12,7 @@ const overrides = [
   "-c",
   `model_catalog_json=${JSON.stringify(runtime.catalogPath)}`,
   "-m",
-  "grok-4.6",
+  DEFAULT_GROK_MODEL,
 ];
 const args =
   userArgs[0] === "exec"

package/scripts/install-codex-grok-app.ps1

@@ -25,7 +25,33 @@ New-Item -ItemType Directory -Force -Path (Join-Path $App "scripts"), (Join-Path
 Copy-Item (Join-Path $Root "scripts\*.mjs") (Join-Path $App "scripts") -Force
 Copy-Item (Join-Path $Root "src\*.mjs") (Join-Path $App "src") -Force
 
-$Node = if ($env:NODE) { $env:NODE } else { (Get-Command node -ErrorAction Stop).Source }
+function Resolve-NodeExe {
+  $cmd = Get-Command node -ErrorAction SilentlyContinue
+  if ($cmd -and $cmd.Source) { return $cmd.Source }
+  if ($env:NODE) { return $env:NODE }
+  $candidates = @()
+  if ($env:ProgramFiles) {
+    $candidates += Join-Path $env:ProgramFiles "nodejs\node.exe"
+  }
+  $x86 = ${env:ProgramFiles(x86)}
+  if ($x86) {
+    $candidates += Join-Path $x86 "nodejs\node.exe"
+  }
+  if ($env:LOCALAPPDATA) {
+    $candidates += Join-Path $env:LOCALAPPDATA "Programs\nodejs\node.exe"
+    $candidates += Join-Path $env:LOCALAPPDATA "Programs\node\node.exe"
+  }
+  if ($env:USERPROFILE) {
+    $candidates += Join-Path $env:USERPROFILE "node\node.exe"
+    $candidates += Join-Path $env:USERPROFILE "nodejs\node.exe"
+  }
+  foreach ($candidate in $candidates) {
+    if ($candidate -and (Test-Path -LiteralPath $candidate)) { return $candidate }
+  }
+  Write-Error "node not found. Set NODE to the node.exe path, or install Node.js."
+}
+
+$Node = Resolve-NodeExe
 $Launcher = Join-Path $App "codex-grok-desktop.cmd"
 @"
 @echo off

package/scripts/launch-desktop.mjs

@@ -7,8 +7,10 @@ import {
   desktopLaunchEnv,
   desktopUserDataDir,
   isGrokDesktopProcess,
+  parseWin32ProcessJson,
   resolveDesktopApp,
   resolvePlatform,
+  selectGrokDesktopPid,
 } from "../src/paths.mjs";
 
 const platform = resolvePlatform();
@@ -22,25 +24,41 @@ function log(message) {
 }
 
 function grokPidWin32() {
-  const systemRoot = process.env.SystemRoot || "C:\\Windows";
-  const powershell = `${systemRoot}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`;
   try {
-    const out = execFileSync(
-      powershell,
-      [
-        "-NoProfile",
-        "-Command",
-        `Get-CimInstance Win32_Process | Where-Object { $_.CommandLine -like ${JSON.stringify(`*--user-data-dir=${userData}*`)} } | Select-Object -First 1 -ExpandProperty ProcessId`,
-      ],
-      { encoding: "utf8", windowsHide: true, timeout: 15000 },
-    );
-    const pid = Number(String(out).trim());
-    return Number.isInteger(pid) && pid > 0 ? pid : null;
+    const injected = process.env.CODEX_GROK_CIM_JSON;
+    const rows =
+      injected != null
+        ? parseWin32ProcessJson(injected)
+        : parseWin32ProcessJson(queryWin32Processes());
+    return selectGrokDesktopPid(rows, userData, {
+      platform: "win32",
+      env: process.env,
+    });
   } catch {
     return null;
   }
 }
 
+function queryWin32Processes() {
+  const systemRoot = process.env.SystemRoot || "C:\\Windows";
+  const powershell = path.join(
+    systemRoot,
+    "System32",
+    "WindowsPowerShell",
+    "v1.0",
+    "powershell.exe",
+  );
+  return execFileSync(
+    powershell,
+    [
+      "-NoProfile",
+      "-Command",
+      `Get-CimInstance Win32_Process | Where-Object { $_.ProcessId -ne $PID -and $_.CommandLine -like ${JSON.stringify(`*--user-data-dir=${userData}*`)} } | Select-Object ProcessId, CommandLine | ConvertTo-Json -Compress`,
+    ],
+    { encoding: "utf8", windowsHide: true, timeout: 15000 },
+  );
+}
+
 function grokPid() {
   if (platform === "win32") return grokPidWin32();
   const out = execFileSync("/bin/ps", ["-axo", "pid=,command="], {
@@ -74,10 +92,18 @@ function notify(text) {
   } catch {}
 }
 
+function desktopCommand(app) {
+  if (/\.(mjs|cjs|js)$/i.test(app)) {
+    return { command: process.execPath, args: [app, ...desktopLaunchArgs(userData)] };
+  }
+  return { command: app, args: desktopLaunchArgs(userData) };
+}
+
 function startWin32(wrapper) {
   const app = resolveDesktopApp();
+  const { command, args } = desktopCommand(app);
   log(`start win32 app=${app} wrapper=${wrapper}`);
-  const child = spawn(app, desktopLaunchArgs(userData), {
+  const child = spawn(command, args, {
     stdio: "inherit",
     env: {
       ...process.env,
@@ -156,15 +182,18 @@ try {
   const running = grokPid();
   if (running) {
     log(`activate pid=${running}`);
-    if (platform !== "darwin") {
-      process.exit(0);
-    }
-    try {
-      activate(running);
-      notify("Codex Grok 창을 앞으로 가져왔습니다.");
+    if (platform === "darwin") {
+      try {
+        activate(running);
+        notify("Codex Grok 창을 앞으로 가져왔습니다.");
+        process.exit(0);
+      } catch (error) {
+        log(`activate failed: ${error.message}`);
+      }
+    } else if (platform === "linux") {
+      // Fall through to startLinux so Electron can focus the existing window.
+    } else {
       process.exit(0);
-    } catch (error) {
-      log(`activate failed: ${error.message}`);
     }
   }
   if (platform === "linux") startLinux(wrapper);

package/src/models.mjs

@@ -1,5 +1,6 @@
-export const DEFAULT_GROK_MODEL = "grok-4.6";
+export const DEFAULT_GROK_MODEL = "grok-4.7";
 export const GROK_PROVIDER = "grok_build_cli";
+const RETAINED_GROK_MODELS = ["grok-4.6"];
 
 export function isGrokModel(model) {
   return typeof model === "string" && model.startsWith("grok-");
@@ -27,10 +28,10 @@ export function extraGrokModels(env = process.env) {
 }
 
 export function catalogModelIds(env = process.env) {
-  const ids = [DEFAULT_GROK_MODEL];
-  const seen = new Set(ids);
-  for (const id of extraGrokModels(env)) {
-    if (seen.has(id)) continue;
+  const ids = [];
+  const seen = new Set();
+  for (const id of [DEFAULT_GROK_MODEL, ...RETAINED_GROK_MODELS, ...extraGrokModels(env)]) {
+    if (!isGrokModel(id) || seen.has(id)) continue;
     seen.add(id);
     ids.push(id);
   }

package/src/paths.mjs

@@ -93,14 +93,17 @@ export function linuxDesktopEntryPath(home = homedir(), xdgDataHome) {
   return path.join(dataHome, "applications", "codex-grok.desktop");
 }
 
-export function desktopLaunchEnv({ wrapper, userData, pathPrefix }) {
-  const env = {
+export function desktopLaunchEnv({ wrapper, userData, pathPrefix, env = process.env }) {
+  const next = {
     CODEX_CLI_PATH: wrapper,
     CODEX_APP_SERVER_FORCE_CLI: "1",
     CODEX_ELECTRON_USER_DATA_PATH: userData,
   };
-  if (pathPrefix) env.PATH = pathPrefix;
-  return env;
+  if (pathPrefix) {
+    const inherited = env.PATH ?? env.Path ?? "";
+    next.PATH = inherited ? `${pathPrefix}${path.delimiter}${inherited}` : pathPrefix;
+  }
+  return next;
 }
 
 export function desktopLaunchArgs(userData) {
@@ -120,6 +123,25 @@ export function isGrokDesktopProcess(line, userData, options = {}) {
   return /MacOS\/(ChatGPT|Codex)(\s|$)/.test(line);
 }
 
+export function parseWin32ProcessJson(text) {
+  const raw = String(text ?? "").trim();
+  if (!raw) return [];
+  const data = JSON.parse(raw);
+  return Array.isArray(data) ? data : [data];
+}
+
+export function selectGrokDesktopPid(rows, userData, options = {}) {
+  const probePid = options.probePid;
+  for (const row of rows ?? []) {
+    const pid = Number(row?.ProcessId);
+    if (!Number.isInteger(pid) || pid <= 0) continue;
+    if (probePid != null && pid === Number(probePid)) continue;
+    const line = String(row?.CommandLine ?? "");
+    if (isGrokDesktopProcess(line, userData, options)) return pid;
+  }
+  return null;
+}
+
 export function isForbiddenInstallDir(app) {
   const resolved = path.resolve(app);
   const norm = resolved.replace(/\\/g, "/").toLowerCase();

package/src/tools.mjs

@@ -4,7 +4,7 @@ import {
   isImageGenerationItem,
   saveGeneratedImage,
 } from "./imagegen.mjs";
-import { resolveGrokModel } from "./models.mjs";
+import { DEFAULT_GROK_MODEL, resolveGrokModel } from "./models.mjs";
 
 const OBJECT_SCHEMA = { type: "object", properties: {} };
 
@@ -124,12 +124,11 @@ function mergeObjectFragments(fragments) {
   for (const fragment of fragments) {
     if (fragment.properties && typeof fragment.properties === "object")
       Object.assign(properties, fragment.properties);
-    if (Array.isArray(fragment.required)) {
-      required =
-        required === undefined
-          ? fragment.required.slice()
-          : required.filter((key) => fragment.required.includes(key));
-    }
+    const keys = Array.isArray(fragment.required) ? fragment.required : [];
+    required =
+      required === undefined
+        ? keys.slice()
+        : required.filter((key) => keys.includes(key));
   }
   return { properties, required };
 }
@@ -180,12 +179,14 @@ function usableParameters(parameters) {
       : {}),
     ...merged.properties,
   };
-  let required = merged.required;
-  if (Array.isArray(parameters.required)) {
-    required =
-      required === undefined
-        ? parameters.required.slice()
-        : required.filter((key) => parameters.required.includes(key));
+  const intersection = merged.required ?? [];
+  const root = Array.isArray(parameters.required) ? parameters.required : [];
+  const required = [];
+  const seen = new Set();
+  for (const key of [...root, ...intersection]) {
+    if (seen.has(key)) continue;
+    seen.add(key);
+    required.push(key);
   }
   const first = fragments[0];
   return emitObjectParameters(
@@ -407,11 +408,16 @@ function toProxyInput(input, map) {
 // no way to answer "is Grok actually attached?" and either hedges or goes
 // hunting through config files. Stated once, in the instructions, it costs a
 // few tokens and removes the whole class of question.
-export const TRANSPORT_PROVENANCE =
-  "Transport: this request is served by the local Codex-Grok bridge — model " +
-  "grok-4.6 via the grok_build_cli provider, with Codex owning tools, history " +
-  "and permissions. If asked whether Grok is attached to the Codex harness, " +
-  "this line is the authoritative answer and no tool call is needed to confirm it.";
+export function transportProvenance(model = DEFAULT_GROK_MODEL) {
+  return (
+    "Transport: this request is served by the local Codex-Grok bridge — model " +
+    `${model} via the grok_build_cli provider, with Codex owning tools, history ` +
+    "and permissions. If asked whether Grok is attached to the Codex harness, " +
+    "this line is the authoritative answer and no tool call is needed to confirm it."
+  );
+}
+
+export const TRANSPORT_PROVENANCE = transportProvenance();
 
 // Codex still injects its imagegen skill. That skill's fallback is OpenAI
 // (`image_gen` or a Python CLI). The model will read the skill and send the
@@ -447,9 +453,10 @@ export function toProxyRequest(body) {
     request.tool_choice = proxyToolChoice(body.tool_choice, map);
     request.parallel_tool_calls = body.parallel_tool_calls !== false;
   }
+  const provenanceLine = transportProvenance(request.model);
   const provenance = imageGenOn
-    ? `${TRANSPORT_PROVENANCE}\n\n${IMAGE_GENERATION_PROVENANCE}`
-    : TRANSPORT_PROVENANCE;
+    ? `${provenanceLine}\n\n${IMAGE_GENERATION_PROVENANCE}`
+    : provenanceLine;
   request.instructions =
     typeof body.instructions === "string" && body.instructions
       ? `${body.instructions}\n\n${provenance}`