fix: pid mismatch

Author: xianml

src/lib/paths.ts

@@ -6,18 +6,21 @@ const APP_DIR = path.join(os.homedir(), ".local", "share", "copilot-api")
 
 const GITHUB_TOKEN_PATH = path.join(APP_DIR, "github_token")
 const CLAUDE_CODE_CONFIG_PATH = path.join(APP_DIR, "claude-code.json")
+const CODEX_CONFIG_PATH = path.join(APP_DIR, "codex.json")
 const PID_PATH = path.join(APP_DIR, "server.pid")
 
 export const PATHS = {
   APP_DIR,
   GITHUB_TOKEN_PATH,
   CLAUDE_CODE_CONFIG_PATH,
+  CODEX_CONFIG_PATH,
   PID_PATH,
 }
 
 export async function ensurePaths(): Promise<void> {
   await fs.mkdir(PATHS.APP_DIR, { recursive: true })
   await ensureFile(PATHS.GITHUB_TOKEN_PATH)
+  await ensureFile(PATHS.CODEX_CONFIG_PATH)
 }
 
 async function ensureFile(filePath: string): Promise<void> {

src/start.ts

@@ -196,15 +196,28 @@ async function prepareDaemon(
 
   if (options.codex) {
     invariant(state.models, "Models should be loaded by now")
-    const selectedModel = await consola.prompt(
-      "Select a model to use with Codex",
-      {
+    const storedCodex = await loadCodexConfig()
+    const hasStored =
+      storedCodex !== null
+      && state.models.data.some((model) => model.id === storedCodex.model)
+
+    const envCodexModel =
+      options.claudeCodeReset ? null : (
+        (process.env.COPILOT_API_CODEX_MODEL
+        ?? (hasStored ? storedCodex.model : null))
+      )
+
+    const selectedModel =
+      envCodexModel
+      ?? (await consola.prompt("Select a model to use with Codex", {
         type: "select",
         options: state.models.data.map((model) => model.id),
-      },
-    )
+      }))
 
     envExtras.COPILOT_API_CODEX_MODEL = selectedModel
+    if (!hasStored || options.claudeCodeReset) {
+      await saveCodexConfig({ model: selectedModel })
+    }
 
     const codexCommand = buildCodexCommand(serverUrl, selectedModel)
 
@@ -329,8 +342,15 @@ async function handleClaudeCode(options: RunServerOptions, serverUrl: string) {
 async function handleCodex(options: RunServerOptions, serverUrl: string) {
   invariant(state.models, "Models should be loaded by now")
 
+  const stored = await loadCodexConfig()
+  const hasStored =
+    stored !== null
+    && state.models.data.some((model) => model.id === stored.model)
+
   const envCodexModel =
-    options.claudeCodeReset ? null : process.env.COPILOT_API_CODEX_MODEL
+    options.claudeCodeReset ? null : (
+      (process.env.COPILOT_API_CODEX_MODEL ?? (hasStored ? stored.model : null))
+    )
 
   const selectedModel =
     envCodexModel
@@ -339,6 +359,10 @@ async function handleCodex(options: RunServerOptions, serverUrl: string) {
       options: state.models.data.map((model) => model.id),
     }))
 
+  if (!hasStored || options.claudeCodeReset) {
+    await saveCodexConfig({ model: selectedModel })
+  }
+
   const codexCommand = buildCodexCommand(serverUrl, selectedModel)
 
   if (!options.daemon || !envCodexModel) {
@@ -504,9 +528,17 @@ export const start = defineCommand({
         env: { ...process.env, COPILOT_API_IS_DAEMON: "1", ...envExtras },
       })
 
-      await fs.writeFile(PATHS.PID_PATH, String(child.pid))
+      const childPid = Number(child.pid)
+      if (!Number.isFinite(childPid)) {
+        consola.error("Failed to determine daemon pid; not writing pid file.")
+        process.exit(1)
+      }
+
+      const pidString = `${childPid}`
+      await fs.writeFile(PATHS.PID_PATH, pidString, "utf8")
+
       consola.info(
-        `Copilot API server is starting in the background (pid ${child.pid}).`,
+        `Copilot API server is starting in the background (pid ${childPid}).`,
       )
       child.unref()
       // Ensure parent process exits after spawning daemon
@@ -522,6 +554,10 @@ interface ClaudeCodeConfig {
   smallModel: string
 }
 
+interface CodexConfig {
+  model: string
+}
+
 const loadClaudeCodeConfig = async (): Promise<ClaudeCodeConfig | null> => {
   try {
     const content = await fs.readFile(PATHS.CLAUDE_CODE_CONFIG_PATH, "utf8")
@@ -546,3 +582,17 @@ const clearClaudeCodeConfig = async () => {
     // ignore
   }
 }
+
+const loadCodexConfig = async (): Promise<CodexConfig | null> => {
+  try {
+    const content = await fs.readFile(PATHS.CODEX_CONFIG_PATH, "utf8")
+    if (!content) return null
+    return JSON.parse(content) as CodexConfig
+  } catch {
+    return null
+  }
+}
+
+const saveCodexConfig = async (config: CodexConfig) => {
+  await fs.writeFile(PATHS.CODEX_CONFIG_PATH, JSON.stringify(config, null, 2))
+}