npm - @bitkyc08/opencodex - Versions diffs - 2.6.19 → 2.6.20 - Mend

@bitkyc08/opencodex 2.6.19 → 2.6.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/gui/dist/assets/{index-Barime1y.js → index-iWo2gxQ2.js} +1 -1
package/gui/dist/index.html +1 -1
package/package.json +1 -1
package/src/server.ts +29 -7
package/src/service.ts +30 -1
package/src/update-job.ts +5 -6

package/gui/dist/index.html CHANGED Viewed

@@ -16,7 +16,7 @@
         } catch (e) {}
       })();
     </script>
-    <script type="module" crossorigin src="/assets/index-Barime1y.js"></script>
+    <script type="module" crossorigin src="/assets/index-iWo2gxQ2.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-DDcEW0Cm.css">
   </head>
   <body>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@bitkyc08/opencodex",
-  "version": "2.6.19",
+  "version": "2.6.20",
   "description": "Universal provider proxy for OpenAI Codex — use any LLM with Codex CLI/App/SDK",
   "type": "module",
   "main": "./bin/package-main.mjs",

package/src/server.ts CHANGED Viewed

@@ -444,15 +444,22 @@ async function handleResponses(
       linkAbortSignal(upstream, turnAc.signal);
       registerTurn(turnAc);
       if (recordTerminalOutcomes) {
+        // A real terminal was parsed from the (teed) inspection stream — record it as the outcome
+        // even if the client has already disconnected: the turn genuinely reached that terminal, so
+        // it must log as completed/failed, not be dropped or downgraded to a cancel (#44). A pure
+        // client-cancel (no terminal seen) is finalized separately via consumeForInspection's onCancel.
         const reportNativeTerminal = (status: ResponsesTerminalStatus) => {
-          if (options.abortSignal?.aborted) {
-            options.onNativePassthroughCancel?.();
-            return;
-          }
           terminalRecorder?.(status);
           options.onNativePassthroughTerminal?.(status);
         };
-        consumeForInspection(inspectBody, reportNativeTerminal, turnAc.signal, () => unregisterTurn(turnAc), logCtx);
+        consumeForInspection(
+          inspectBody,
+          reportNativeTerminal,
+          turnAc.signal,
+          () => unregisterTurn(turnAc),
+          logCtx,
+          () => options.onNativePassthroughCancel?.(),
+        );
       } else {
         consumeForResponseLogMetadata(inspectBody, logCtx, turnAc.signal, () => unregisterTurn(turnAc));
       }
@@ -1302,12 +1309,13 @@ export function relaySseWithHeartbeat(
  * Background-consume an SSE stream purely for terminal-outcome inspection (quota tracking).
  * Does not produce output; safe to ignore errors (the client-facing stream is separate).
  */
-function consumeForInspection(
+export function consumeForInspection(
   body: ReadableStream<Uint8Array>,
   onTerminal: (status: ResponsesTerminalStatus) => void,
   signal?: AbortSignal,
   onDone?: () => void,
   logCtx?: RequestLogContext,
+  onCancel?: () => void,
 ): void {
   const reader = body.getReader();
   const decoder = new TextDecoder();
@@ -1316,13 +1324,21 @@ function consumeForInspection(
   let cancelled = false;
   if (signal) {
     if (signal.aborted) {
+      // Aborted before we could read anything (Codex disconnects the instant it finishes reading).
+      // Finalize as a client-cancel and release the turn — the early return skips pump()'s finally,
+      // so onDone/onCancel must run here or the entry is silently dropped (#44).
       cancelled = true;
       reader.cancel(signal.reason).catch(() => {});
+      onCancel?.();
+      onDone?.();
       return;
     }
     signal.addEventListener("abort", () => {
+      // Mid-drain disconnect: record a client-cancel entry (idempotent downstream) instead of the
+      // suppressed onTerminal path. onDone still fires via pump()'s finally after the read rejects.
       cancelled = true;
       reader.cancel(signal.reason).catch(() => {});
+      onCancel?.();
     }, { once: true });
   }
   const pump = async () => {
@@ -2102,9 +2118,15 @@ export function startServer(port?: number) {
   const listenPort = port ?? config.port ?? 10100;
   setCorsOrigin(listenPort);
+  // Canonicalize an explicit "localhost" bind to IPv4 so it matches the injected base_url (which
+  // resolves localhost→127.0.0.1): on Windows `localhost` resolves ::1-first, but the injected URL
+  // is 127.0.0.1, so binding literal "localhost" would reintroduce the F4 refusal. Wildcards
+  // (0.0.0.0/::) and specific hosts are left untouched so intentional exposure is preserved.
+  const bindHost = /^localhost$/i.test(config.hostname ?? "") ? "127.0.0.1" : (config.hostname ?? "127.0.0.1");
   const server: Server<WsData> = Bun.serve<WsData>({
     port: listenPort,
-    hostname: config.hostname ?? "127.0.0.1",
+    hostname: bindHost,
     idleTimeout: 255,
     async fetch(req, requestServer): Promise<Response> {
       const url = new URL(req.url);

package/src/service.ts CHANGED Viewed

@@ -493,12 +493,41 @@ WantedBy=default.target
 `;
 }
+/** The per-user runtime dir systemd creates (holds the user-bus socket), or null. */
+function userRuntimeDir(): string | null {
+  const fromEnv = process.env.XDG_RUNTIME_DIR;
+  if (fromEnv && existsSync(fromEnv)) return fromEnv;
+  if (typeof process.getuid === "function") {
+    const candidate = `/run/user/${process.getuid()}`;
+    if (existsSync(candidate)) return candidate;
+  }
+  return null;
+}
+/**
+ * SSH sessions frequently start without `XDG_RUNTIME_DIR`/`DBUS_SESSION_BUS_ADDRESS`, so
+ * `systemctl --user` can't find the user bus even when systemd is running. Point `XDG_RUNTIME_DIR`
+ * at the per-user runtime dir when it exists so the `--user` probe and install commands reach the
+ * bus. No-op when already set or when no runtime dir exists (e.g. genuinely non-systemd hosts).
+ */
+function ensureUserBusEnv(): void {
+  if (process.env.XDG_RUNTIME_DIR) return;
+  const dir = userRuntimeDir();
+  if (dir) process.env.XDG_RUNTIME_DIR = dir;
+}
 function isSystemd(): boolean {
   try { execSync("systemctl --version", { stdio: "pipe" }); } catch { return false; }
-  try { execSync("systemctl --user show-environment", { stdio: "pipe" }); return true; } catch { return false; }
+  ensureUserBusEnv();
+  // Prefer the user-bus probe; but an SSH session without a user D-Bus fails it even when systemd
+  // is present (F9). Fall back to the per-user runtime dir existing — a strong signal the user
+  // systemd instance is available — so a first-time `ocx service install` isn't wrongly refused.
+  try { execSync("systemctl --user show-environment", { stdio: "pipe" }); return true; } catch { /* no user bus in this session */ }
+  return userRuntimeDir() !== null;
 }
 function installSystemd(): void {
+  ensureUserBusEnv(); // reach the user bus over a bare SSH session (F9)
   const dir = unitDir();
   if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
   if (!existsSync(getConfigDir())) mkdirSync(getConfigDir(), { recursive: true });

package/src/update-job.ts CHANGED Viewed

@@ -78,10 +78,6 @@ function nodeBin(): string {
   return process.platform === "win32" ? "node.exe" : "node";
 }
-function ocxBin(): string {
-  return process.platform === "win32" ? "ocx.cmd" : "ocx";
-}
 function packageLauncherPath(): string {
   return join(dirname(fileURLToPath(import.meta.url)), "..", "bin", "ocx.mjs");
 }
@@ -163,8 +159,11 @@ export function restartCommand(
     const args = serviceInstalled ? [launcher, "service", "install"] : [launcher, "start"];
     return { mode, bin, args, display: formatCommand(bin, args) };
   }
-  const bin = ocxBin();
-  const args = serviceInstalled ? ["service", "install"] : ["start"];
+  // bun/source installs: restart via the current runtime executable + package launcher (both real
+  // .exe files), NOT the `ocx.cmd` shim. Spawning a `.cmd` shell-less throws EINVAL on Windows
+  // Node/Bun ≥18.20/20.12 (CVE-2024-27980 hardening) — the same class the npm path (nodeBin) avoids.
+  const bin = process.execPath;
+  const args = serviceInstalled ? [launcher, "service", "install"] : [launcher, "start"];
   return { mode, bin, args, display: formatCommand(bin, args) };
 }