npm - @bitkyc08/opencodex - Versions diffs - 0.2.0 → 0.2.2 - Mend

@bitkyc08/opencodex 0.2.0 → 0.2.2

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 (11) hide show

package/README.ko.md +1 -1
package/README.md +3 -2
package/README.zh-CN.md +1 -1
package/gui/dist/assets/{index-C9y3iMF1.js → index-Dt5t57MW.js} +1 -1
package/gui/dist/index.html +1 -1
package/package.json +1 -1
package/src/cli.ts +38 -7
package/src/codex-catalog.ts +36 -15
package/src/codex-inject.ts +64 -8
package/src/codex-paths.ts +59 -0
package/src/service.ts +77 -14

package/gui/dist/index.html CHANGED Viewed

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="color-scheme" content="dark" />
     <title>opencodex · proxy dashboard</title>
-    <script type="module" crossorigin src="/assets/index-C9y3iMF1.js"></script>
+    <script type="module" crossorigin src="/assets/index-Dt5t57MW.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-C1wlp1SM.css">
   </head>
   <body>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@bitkyc08/opencodex",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Universal provider proxy for OpenAI Codex — use any LLM with Codex CLI/App/SDK",
   "type": "module",
   "main": "src/index.ts",

package/src/cli.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 #!/usr/bin/env bun
+import { execFileSync } from "node:child_process";
 import { restoreNativeCodex } from "./codex-inject";
 import { loadConfig, readPid, removePid, writePid } from "./config";
 import { serviceCommand } from "./service";
@@ -37,9 +38,12 @@ async function syncModelsToCodex(port?: number) {
   const { injectCodexConfig } = await import("./codex-inject");
   const result = await injectCodexConfig(p, config);
   try {
-    const { syncCatalogModels } = await import("./codex-catalog");
+    const { invalidateCodexModelsCache, syncCatalogModels } = await import("./codex-catalog");
     const cat = await syncCatalogModels(config);
-    if (cat.added > 0) console.log(`   + ${cat.added} models appended to Codex catalog (${cat.path})`);
+    if (cat.added > 0) {
+      invalidateCodexModelsCache();
+      console.log(`   + ${cat.added} models appended to Codex catalog (${cat.path})`);
+    }
   } catch (e) {
     console.error("catalog sync skipped:", e instanceof Error ? e.message : String(e));
   }
@@ -85,32 +89,59 @@ function handleStart() {
 }
 function killProxy(pid: number): void {
+  if (!isProcessAlive(pid)) return;
   if (process.platform === "win32") {
+    const taskkill = `${process.env.SystemRoot ?? "C:\\Windows"}\\System32\\taskkill.exe`;
     try {
-      (require("node:child_process") as typeof import("node:child_process"))
-        .execSync(`taskkill /PID ${pid} /T /F`, { stdio: "pipe" });
-    } catch { /* process already gone */ }
+      execFileSync(taskkill, ["/PID", String(pid), "/T", "/F"], { stdio: "pipe" });
+    } catch (err) {
+      if (isProcessAlive(pid)) throw err;
+    }
   } else {
     process.kill(pid, "SIGTERM");
+    if (!waitForExit(pid, 5000)) process.kill(pid, "SIGKILL");
+  }
+  if (!waitForExit(pid, 5000)) throw new Error(`process ${pid} did not exit`);
+}
+function isProcessAlive(pid: number): boolean {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
   }
 }
+function waitForExit(pid: number, timeoutMs: number): boolean {
+  const deadline = Date.now() + timeoutMs;
+  const marker = new Int32Array(new SharedArrayBuffer(4));
+  while (Date.now() < deadline) {
+    if (!isProcessAlive(pid)) return true;
+    Atomics.wait(marker, 0, 0, 50);
+  }
+  return !isProcessAlive(pid);
+}
 function handleStop() {
   const pid = readPid();
+  let stopFailed = false;
   if (pid) {
     try {
       killProxy(pid);
       console.log(`✅ Proxy (PID ${pid}) stopped.`);
+      removePid();
     } catch {
-      console.log("Proxy process not found.");
+      stopFailed = true;
+      console.error(`❌ Failed to stop proxy (PID ${pid}).`);
     }
-    removePid();
   } else {
     console.log("No running proxy found.");
   }
   // Recover native Codex so plain `codex` keeps working while the proxy is down.
   const r = restoreNativeCodex();
   console.log(`↩️  ${r.message}`);
+  if (stopFailed) process.exit(1);
 }
 function handleStatus() {

package/src/codex-catalog.ts CHANGED Viewed

@@ -2,12 +2,11 @@ import { copyFileSync, existsSync, mkdirSync, readFileSync, unlinkSync, writeFil
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { atomicWriteFile } from "./config";
+import { CODEX_CONFIG_PATH, CODEX_MODELS_CACHE_PATH, DEFAULT_CATALOG_PATH, readRootTomlString, resolveCodexConfigPath } from "./codex-paths";
 import { DEFAULT_MODEL_CACHE_TTL_MS, getFreshCached, getStaleCached, setCached } from "./model-cache";
 import { buildModelsRequest, resolveModelsAuthToken } from "./oauth/index";
 import type { OcxConfig, OcxProviderConfig } from "./types";
-const CODEX_CONFIG_PATH = join(homedir(), ".codex", "config.toml");
-const DEFAULT_CATALOG_PATH = join(homedir(), ".codex", "opencodex-catalog.json");
 const OCX_DIR = join(homedir(), ".opencodex");
 const CATALOG_BACKUP_PATH = join(OCX_DIR, "catalog-backup.json");
@@ -40,8 +39,8 @@ export function readCodexCatalogPath(): string {
   try {
     if (existsSync(CODEX_CONFIG_PATH)) {
       const toml = readFileSync(CODEX_CONFIG_PATH, "utf-8");
-      const m = toml.match(/^\s*model_catalog_json\s*=\s*"([^"]+)"/m);
-      if (m) return m[1];
+      const path = readRootTomlString(toml, "model_catalog_json");
+      if (path) return resolveCodexConfigPath(path);
     }
   } catch { /* ignore */ }
   return DEFAULT_CATALOG_PATH;
@@ -55,13 +54,36 @@ function readCatalog(path: string): { models?: RawEntry[]; [k: string]: unknown
   } catch { return null; }
 }
+function normalizeServiceTiers(entry: RawEntry): RawEntry {
+  if (entry.service_tier === "priority") entry.service_tier = "fast";
+  if (Array.isArray(entry.service_tiers)) {
+    entry.service_tiers = entry.service_tiers.map(tier => {
+      if (tier && typeof tier === "object" && "id" in tier && tier.id === "priority") {
+        return { ...tier, id: "fast" };
+      }
+      return tier;
+    });
+  }
+  return entry;
+}
+function loadCatalogForSync(path: string): { models?: RawEntry[]; [k: string]: unknown } | null {
+  const catalog = readCatalog(path);
+  if (catalog) return catalog;
+  return readCatalog(CODEX_MODELS_CACHE_PATH);
+}
+function readCurrentCatalogOrCache(): { models?: RawEntry[]; [k: string]: unknown } | null {
+  return readCatalog(readCodexCatalogPath()) ?? readCatalog(CODEX_MODELS_CACHE_PATH);
+}
 /**
  * A full native entry from the on-disk catalog, used as a clone template so injected
  * entries carry EVERY field Codex's strict parser requires (e.g. `base_instructions`).
  * Returns a deep copy, or null if no catalog/native entry exists.
  */
 export function loadCatalogTemplate(): RawEntry | null {
-  const cat = readCatalog(readCodexCatalogPath());
+  const cat = readCurrentCatalogOrCache();
   const native = cat?.models?.find(
     m => typeof m.slug === "string" && !m.slug.includes("/") && "base_instructions" in m,
   );
@@ -109,16 +131,16 @@ function deriveEntry(template: RawEntry | null, slug: string, desc: string, prio
       e.supported_reasoning_levels = ROUTED_REASONING_LEVELS.map(l => byEffort.get(l.effort) ?? { ...l });
       e.default_reasoning_level = "medium";
     }
-    return e;
+    return normalizeServiceTiers(e);
   }
   // Fallback when no template is available (best-effort; strict parser may need more).
-  return {
+  return normalizeServiceTiers({
     slug, display_name: slug, description: desc,
     default_reasoning_level: "medium",
     supported_reasoning_levels: ROUTED_REASONING_LEVELS.map(l => ({ ...l })),
     shell_type: "shell_command", visibility: "list", supported_in_api: true,
     priority, base_instructions: "You are a helpful coding assistant.",
-  };
+  });
 }
 /**
@@ -149,7 +171,7 @@ export function buildCatalogEntries(template: RawEntry | null, gptSlugs: string[
 /** Bare picker-visible native slugs in the live Codex catalog (drives the subagent picker UI). */
 export function listCatalogNativeSlugs(): string[] {
-  const cat = readCatalog(readCodexCatalogPath());
+  const cat = readCurrentCatalogOrCache();
   return (cat?.models ?? [])
     .filter(m => typeof m.slug === "string" && !(m.slug as string).includes("/") && m.visibility === "list")
     .map(m => m.slug as string);
@@ -244,7 +266,7 @@ export function orderForSubagents(goModels: CatalogModel[], featured?: string[])
  */
 export async function syncCatalogModels(config: OcxConfig): Promise<{ added: number; path: string }> {
   const catalogPath = readCodexCatalogPath();
-  const catalog = readCatalog(catalogPath);
+  const catalog = loadCatalogForSync(catalogPath);
   if (!catalog) return { added: 0, path: catalogPath };
   const template = (catalog.models ?? []).find(
@@ -272,9 +294,9 @@ export async function syncCatalogModels(config: OcxConfig): Promise<{ added: num
     .map(m => {
       const slug = m.slug as string;
       const priority = rank.has(slug) ? rank.get(slug)! : (baseline.get(slug) ?? (m.priority as number));
-      return { ...m, priority };
+      return normalizeServiceTiers({ ...m, priority });
     });
-  catalog.models = [...native, ...goEntries];
+  catalog.models = [...native, ...goEntries].map(m => normalizeServiceTiers(m));
   try {
     if (!existsSync(OCX_DIR)) mkdirSync(OCX_DIR, { recursive: true });
@@ -306,13 +328,12 @@ export function restoreCodexCatalog(): { removed: number; kept: number; path: st
 }
 /**
- * Delete Codex's models cache (~/.codex/models_cache.json) so the next turn re-fetches /v1/models.
+ * Delete Codex's models cache ($CODEX_HOME/models_cache.json) so the next turn re-fetches /v1/models.
  * Codex caches the model list for 5 min (DEFAULT_MODEL_CACHE_TTL); invalidating makes catalog edits
  * (enable/disable, subagent reorder) apply on the next turn instead of waiting for the TTL.
  */
 export function invalidateCodexModelsCache(): void {
   try {
-    const p = join(homedir(), ".codex", "models_cache.json");
-    if (existsSync(p)) unlinkSync(p);
+    if (existsSync(CODEX_MODELS_CACHE_PATH)) unlinkSync(CODEX_MODELS_CACHE_PATH);
   } catch { /* best-effort */ }
 }

package/src/codex-inject.ts CHANGED Viewed

@@ -1,14 +1,9 @@
 import { existsSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
 import { atomicWriteFile } from "./config";
 import { restoreCodexCatalog } from "./codex-catalog";
+import { CODEX_CONFIG_PATH, CODEX_PROFILE_PATH, DEFAULT_CATALOG_PATH, parseTomlString, readRootTomlString, tomlString } from "./codex-paths";
 import type { OcxConfig } from "./types";
-const CODEX_HOME = join(homedir(), ".codex");
-const CODEX_CONFIG_PATH = join(CODEX_HOME, "config.toml");
-const CODEX_PROFILE_PATH = join(CODEX_HOME, "opencodex.config.toml");
 const OCX_SECTION_MARKER = "# Auto-injected by opencodex";
 /**
@@ -70,11 +65,65 @@ function setRootModelProvider(content: string): string {
   return lines.join("\n");
 }
-function buildProfileFile(port: number): string {
+function readRootModelCatalogPath(content: string): string | null {
+  return readRootTomlString(content, "model_catalog_json");
+}
+function setRootModelCatalogPath(content: string, catalogPath: string): string {
+  if (readRootModelCatalogPath(content)) return content;
+  const lines = content.split("\n");
+  const firstTable = lines.findIndex(l => /^\s*\[/.test(l));
+  const key = `model_catalog_json = ${tomlString(catalogPath)}`;
+  if (firstTable === -1) {
+    return content.replace(/\n+$/, "") + "\n" + key + "\n";
+  }
+  let insertAt = firstTable;
+  while (insertAt > 0 && lines[insertAt - 1].trim() === "") insertAt--;
+  lines.splice(insertAt, 0, key);
+  return lines.join("\n");
+}
+function removeProfileSection(content: string): string {
+  const lines = content.split("\n");
+  const filtered: string[] = [];
+  let inProfile = false;
+  for (const line of lines) {
+    if (line.trim() === "[profiles.opencodex]") {
+      inProfile = true;
+      continue;
+    }
+    if (inProfile) {
+      if (line.startsWith("[") && line.trim() !== "[profiles.opencodex]") {
+        inProfile = false;
+        filtered.push(line);
+      }
+      continue;
+    }
+    filtered.push(line);
+  }
+  return filtered.join("\n").replace(/\n{3,}/g, "\n\n").trimEnd() + "\n";
+}
+function normalizeServiceTier(content: string): string {
+  return content.replace(/^(\s*service_tier\s*=\s*)["']priority["']\s*$/gm, '$1"fast"');
+}
+function stripDefaultCatalogPath(content: string): string {
+  return content
+    .split("\n")
+    .filter(line => {
+      const m = line.match(/^\s*model_catalog_json\s*=\s*("(?:\\.|[^"])*"|'[^']*')\s*$/);
+      return !m || parseTomlString(m[1]) !== DEFAULT_CATALOG_PATH;
+    })
+    .join("\n");
+}
+function buildProfileFile(port: number, catalogPath: string): string {
   return [
     "# OpenCodex proxy profile — use with: codex --profile opencodex",
     `# Routes all model requests through the opencodex proxy at localhost:${port}`,
     'model_provider = "opencodex"',
+    `model_catalog_json = ${tomlString(catalogPath)}`,
     "",
   ].join("\n");
 }
@@ -92,7 +141,12 @@ export async function injectCodexConfig(port: number, _config?: OcxConfig): Prom
   if (content.includes("[model_providers.opencodex]")) {
     content = removeOcxSection(content);
   }
+  content = removeProfileSection(content);
   content = stripExistingModelProvider(content);
+  content = normalizeServiceTier(content);
+  const catalogPath = readRootModelCatalogPath(content) ?? DEFAULT_CATALOG_PATH;
+  content = setRootModelCatalogPath(content, catalogPath);
   // 1) Root key BEFORE the first table header (must be a global, not nested under a table).
   content = setRootModelProvider(content);
@@ -100,7 +154,7 @@ export async function injectCodexConfig(port: number, _config?: OcxConfig): Prom
   content = content.trimEnd() + "\n" + buildProviderTableBlock(port);
   writeFileSync(CODEX_CONFIG_PATH, content, "utf-8");
-  writeFileSync(CODEX_PROFILE_PATH, buildProfileFile(port), "utf-8");
+  writeFileSync(CODEX_PROFILE_PATH, buildProfileFile(port, catalogPath), "utf-8");
   return {
     success: true,
@@ -141,9 +195,11 @@ export function stripOpencodexConfig(content: string): string {
   if (out.includes("[model_providers.opencodex]")) {
     out = removeOcxSection(out);
   }
+  out = removeProfileSection(out);
   // Regex (not exact-string) removal so compact `model_provider="opencodex"` is stripped too —
   // must match the detection regex above, or a detected line could survive un-removed.
   out = out.split("\n").filter(l => !/^\s*model_provider\s*=\s*"opencodex"\s*$/.test(l)).join("\n");
+  out = stripDefaultCatalogPath(out);
   return out.replace(/\n{3,}/g, "\n\n").trimEnd() + "\n";
 }

package/src/codex-paths.ts ADDED Viewed

@@ -0,0 +1,59 @@
+import { realpathSync, statSync } from "node:fs";
+import { homedir } from "node:os";
+import { isAbsolute, join, resolve } from "node:path";
+function resolveCodexHome(): string {
+  const raw = process.env.CODEX_HOME?.trim();
+  if (raw) {
+    const path = resolve(raw);
+    let stat;
+    try {
+      stat = statSync(path);
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      throw new Error(`CODEX_HOME points to ${raw}, but that path could not be read: ${message}`);
+    }
+    if (!stat.isDirectory()) {
+      throw new Error(`CODEX_HOME points to ${raw}, but that path is not a directory`);
+    }
+    return realpathSync.native(path);
+  }
+  return join(homedir(), ".codex");
+}
+export const CODEX_HOME = resolveCodexHome();
+export const CODEX_CONFIG_PATH = join(CODEX_HOME, "config.toml");
+export const CODEX_PROFILE_PATH = join(CODEX_HOME, "opencodex.config.toml");
+export const DEFAULT_CATALOG_PATH = join(CODEX_HOME, "opencodex-catalog.json");
+export const CODEX_MODELS_CACHE_PATH = join(CODEX_HOME, "models_cache.json");
+export function tomlString(value: string): string {
+  return JSON.stringify(value);
+}
+export function parseTomlString(raw: string): string {
+  if (raw.startsWith("\"")) {
+    try {
+      return JSON.parse(raw) as string;
+    } catch {
+      return raw.slice(1, -1);
+    }
+  }
+  return raw.slice(1, -1);
+}
+export function readRootTomlString(content: string, key: string): string | null {
+  const lines = content.split("\n");
+  const firstTable = lines.findIndex(l => /^\s*\[/.test(l));
+  const rootLines = firstTable === -1 ? lines : lines.slice(0, firstTable);
+  for (const line of rootLines) {
+    const m = line.match(new RegExp(`^\\s*${key}\\s*=\\s*(\"(?:\\\\.|[^\"])*\"|'[^']*')`));
+    if (m) return parseTomlString(m[1]);
+  }
+  return null;
+}
+export function resolveCodexConfigPath(path: string): string {
+  return isAbsolute(path) ? path : join(CODEX_HOME, path);
+}

package/src/service.ts CHANGED Viewed

@@ -28,10 +28,25 @@ function logPath(): string {
   return join(getConfigDir(), "service.log");
 }
+function windowsServiceScriptPath(): string {
+  return join(getConfigDir(), "opencodex-service.cmd");
+}
+function plistString(value: string): string {
+  return value
+    .replace(/&/g, "&amp;")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;")
+    .replace(/'/g, "&apos;");
+}
 export function buildPlist(): string {
   const { bun, cli } = cliEntry();
   const log = logPath();
   const path = process.env.PATH ?? "/usr/local/bin:/usr/bin:/bin";
+  const codexHome = process.env.CODEX_HOME?.trim();
+  const codexHomeXml = codexHome ? `    <key>CODEX_HOME</key><string>${plistString(codexHome)}</string>` : "";
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -39,8 +54,8 @@ export function buildPlist(): string {
   <key>Label</key><string>${LABEL}</string>
   <key>ProgramArguments</key>
   <array>
-    <string>${bun}</string>
-    <string>${cli}</string>
+    <string>${plistString(bun)}</string>
+    <string>${plistString(cli)}</string>
     <string>start</string>
   </array>
   <key>RunAtLoad</key><true/>
@@ -48,19 +63,57 @@ export function buildPlist(): string {
   <key>EnvironmentVariables</key>
   <dict>
     <key>OCX_SERVICE</key><string>1</string>
-    <key>PATH</key><string>${path}</string>
-  </dict>
-  <key>StandardOutPath</key><string>${log}</string>
-  <key>StandardErrorPath</key><string>${log}</string>
+    <key>PATH</key><string>${plistString(path)}</string>
+${codexHomeXml ? `${codexHomeXml}\n` : ""}  </dict>
+  <key>StandardOutPath</key><string>${plistString(log)}</string>
+  <key>StandardErrorPath</key><string>${plistString(log)}</string>
 </dict>
 </plist>
 `;
 }
+function systemdQuote(value: string): string {
+  return `"${value
+    .replace(/\\/g, "\\\\")
+    .replace(/"/g, "\\\"")
+    .replace(/%/g, "%%")
+    .replace(/\n/g, "\\n")}"`;
+}
+function systemdEnvironmentAssignment(name: string, value: string | undefined): string | null {
+  if (!value) return null;
+  return `Environment=${systemdQuote(`${name}=${value}`)}`;
+}
 function sh(cmd: string): string {
   return execSync(cmd, { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }).trim();
 }
+function windowsBatchValue(value: string): string {
+  return value.replace(/%/g, "%%").replace(/[\r\n]/g, "");
+}
+function windowsBatchSet(name: string, value: string | undefined): string | null {
+  if (!value) return null;
+  return `set "${name}=${windowsBatchValue(value)}"`;
+}
+export function buildWindowsServiceScript(): string {
+  const { bun, cli } = cliEntry();
+  const path = process.env.PATH ?? "";
+  const lines = [
+    "@echo off",
+    "setlocal",
+    windowsBatchSet("OCX_SERVICE", "1"),
+    windowsBatchSet("PATH", path),
+    windowsBatchSet("CODEX_HOME", process.env.CODEX_HOME?.trim()),
+    `"${bun}" "${cli}" start`,
+    "set \"OCX_EXIT=%ERRORLEVEL%\"",
+    "endlocal & exit /b %OCX_EXIT%",
+  ].filter((line): line is string => Boolean(line));
+  return `${lines.join("\r\n")}\r\n`;
+}
 // ── macOS (launchd) ──
 function installLaunchd(): void {
   const dir = join(homedir(), "Library", "LaunchAgents");
@@ -82,14 +135,19 @@ function uninstallLaunchd(): void {
 // ── Windows (Task Scheduler) ──
 function installWindows(): void {
-  const { bun, cli } = cliEntry();
-  sh(`schtasks /create /tn ${TASK} /tr "\\"${bun}\\" \\"${cli}\\" start" /sc onlogon /rl highest /f`);
+  if (!existsSync(getConfigDir())) mkdirSync(getConfigDir(), { recursive: true });
+  const script = windowsServiceScriptPath();
+  writeFileSync(script, buildWindowsServiceScript(), "utf8");
+  sh(`schtasks /create /tn ${TASK} /tr "\\"${script}\\"" /sc onlogon /rl highest /f`);
   sh(`schtasks /run /tn ${TASK}`);
 }
 function startWindows(): void { sh(`schtasks /run /tn ${TASK}`); }
 function stopWindows(): void { try { sh(`schtasks /end /tn ${TASK}`); } catch { /* not running */ } }
 function statusWindows(): string { try { return sh(`schtasks /query /tn ${TASK}`); } catch { return ""; } }
-function uninstallWindows(): void { try { sh(`schtasks /delete /tn ${TASK} /f`); } catch { /* absent */ } }
+function uninstallWindows(): void {
+  try { sh(`schtasks /delete /tn ${TASK} /f`); } catch { /* absent */ }
+  if (existsSync(windowsServiceScriptPath())) unlinkSync(windowsServiceScriptPath());
+}
 // ── Linux (systemd user unit) ──
 function unitDir(): string {
@@ -104,6 +162,12 @@ export function buildUnit(): string {
   const { bun, cli } = cliEntry();
   const log = logPath();
   const path = process.env.PATH ?? "/usr/local/bin:/usr/bin:/bin";
+  const codexHome = systemdEnvironmentAssignment("CODEX_HOME", process.env.CODEX_HOME?.trim());
+  const envLines = [
+    systemdEnvironmentAssignment("OCX_SERVICE", "1"),
+    systemdEnvironmentAssignment("PATH", path),
+    codexHome,
+  ].filter((line): line is string => Boolean(line)).join("\n");
   return `[Unit]
 Description=OpenCodex Proxy Server
 After=network-online.target
@@ -111,13 +175,12 @@ Wants=network-online.target
 [Service]
 Type=simple
-ExecStart=${bun} ${cli} start
+ExecStart=${systemdQuote(bun)} ${systemdQuote(cli)} start
 Restart=on-failure
 RestartSec=5
-Environment=OCX_SERVICE=1
-Environment=PATH=${path}
-StandardOutput=append:${log}
-StandardError=append:${log}
+${envLines}
+StandardOutput=${systemdQuote(`append:${log}`)}
+StandardError=${systemdQuote(`append:${log}`)}
 [Install]
 WantedBy=default.target