negotium 0.23.1 → 0.23.2

package/dist/{chunk-z4r7tt2p.js → chunk-cez5m5hm.js}

@@ -8,7 +8,7 @@ import {
   logger,
   parseJsonlText,
   writeJsonlFile
-} from "./chunk-pr8p6pap.js";
+} from "./chunk-6cnpkzkb.js";
 
 // ../../packages/core/src/agents/rollout/claude.ts
 import { randomUUID } from "crypto";

package/dist/{chunk-w6xavjz2.js → chunk-s34sv3d2.js}

@@ -2,7 +2,7 @@
 import {
   hostedCodexHomePath,
   latestCodexRolloutPath
-} from "./chunk-pr8p6pap.js";
+} from "./chunk-6cnpkzkb.js";
 
 // ../../packages/core/src/agents/codex-app-server.ts
 import { spawn } from "child_process";
@@ -19,17 +19,29 @@ import {
   unlinkSync,
   writeFileSync
 } from "fs";
-import { createRequire } from "module";
 import { dirname, join } from "path";
+import { fileURLToPath } from "url";
 
 // ../../packages/core/src/version.ts
-var NEGOTIUM_VERSION = "0.23.1";
+var NEGOTIUM_VERSION = "0.23.2";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
-var moduleRequire = createRequire(import.meta.url);
-var codexSdkPackagePath = moduleRequire.resolve("@openai/codex-sdk/package.json");
-var codexSdkRequire = createRequire(codexSdkPackagePath);
-var bundledCodexPackagePath = codexSdkRequire.resolve("@openai/codex/package.json");
+function findPackageJson(specifier, searchFromDir) {
+  let dir = searchFromDir;
+  for (;; ) {
+    const candidate = join(dir, "node_modules", specifier, "package.json");
+    if (existsSync(candidate))
+      return candidate;
+    const parent = dirname(dir);
+    if (parent === dir) {
+      throw new Error(`Could not locate node_modules/${specifier} starting from ${searchFromDir}`);
+    }
+    dir = parent;
+  }
+}
+var thisModuleDir = dirname(fileURLToPath(import.meta.url));
+var codexSdkPackagePath = findPackageJson("@openai/codex-sdk", thisModuleDir);
+var bundledCodexPackagePath = findPackageJson("@openai/codex", dirname(codexSdkPackagePath));
 function readPackageVersion(packageJsonPath) {
   const parsed = JSON.parse(readFileSync(packageJsonPath, "utf8"));
   if (typeof parsed.version !== "string" || !parsed.version.trim()) {
@@ -158,4 +170,4 @@ export {
   createCodexAppServerForker
 };
 
-//# debugId=1241F1827E4BFC0C64756E2164756E21
+//# debugId=F52112FFE0B50C6764756E2164756E21

package/dist/chunk-s34sv3d2.js.map

@@ -0,0 +1,12 @@
+{
+  "version": 3,
+  "sources": ["../../../packages/core/src/agents/codex-app-server.ts", "../../../packages/core/src/agents/codex-native-multi-agent.ts", "../../../packages/core/src/version.ts"],
+  "sourcesContent": [
+    "import { type ChildProcessWithoutNullStreams, spawn } from \"node:child_process\";\nimport { codexCliScriptPath } from \"#agents/codex-native-multi-agent\";\nimport { hostedCodexHomePath } from \"#agents/execution-host\";\nimport { latestCodexRolloutPath } from \"#agents/rollout/codex\";\nimport { NEGOTIUM_VERSION } from \"#version\";\n\ninterface CodexAppServerForkResult {\n  forkId: string;\n  rolloutPath: string;\n}\n\ninterface CodexAppServerForkHost {\n  spawnServer(): ChildProcessWithoutNullStreams;\n  findRolloutPath(threadId: string): string | undefined;\n  timeoutMs: number;\n}\n\ntype JsonRpcResponse = {\n  id?: number;\n  result?: { thread?: { id?: unknown } };\n  error?: { message?: unknown };\n};\n\nexport function createCodexAppServerForker(host: CodexAppServerForkHost) {\n  return async (parentThreadId: string): Promise<CodexAppServerForkResult> => {\n    const child = host.spawnServer();\n\n    return await new Promise<CodexAppServerForkResult>((resolve, reject) => {\n      let settled = false;\n      let stdoutBuffer = \"\";\n      let stderr = \"\";\n      const timer = setTimeout(\n        () => finish(new Error(\"Codex thread fork timed out\")),\n        host.timeoutMs,\n      );\n\n      const finish = (error?: Error, result?: CodexAppServerForkResult) => {\n        if (settled) return;\n        settled = true;\n        clearTimeout(timer);\n        try {\n          child.stdin.end();\n          child.kill();\n        } catch {\n          // The app server may already have exited after stdin closed.\n        }\n        if (error) reject(error);\n        else if (result) resolve(result);\n        else reject(new Error(\"Codex thread fork returned no result\"));\n      };\n\n      const send = (message: Record<string, unknown>) => {\n        child.stdin.write(`${JSON.stringify(message)}\\n`);\n      };\n\n      child.stderr.on(\"data\", (chunk) => {\n        if (stderr.length < 8_192) stderr += String(chunk);\n      });\n      child.on(\"error\", (error) => finish(error));\n      child.on(\"exit\", (code, signal) => {\n        if (settled) return;\n        const detail = signal ? `signal ${signal}` : `code ${code ?? 1}`;\n        finish(\n          new Error(\n            `Codex app server exited with ${detail}${stderr.trim() ? `: ${stderr.trim()}` : \"\"}`,\n          ),\n        );\n      });\n      child.stdout.on(\"data\", (chunk) => {\n        stdoutBuffer += String(chunk);\n        for (;;) {\n          const newline = stdoutBuffer.indexOf(\"\\n\");\n          if (newline < 0) break;\n          const line = stdoutBuffer.slice(0, newline);\n          stdoutBuffer = stdoutBuffer.slice(newline + 1);\n          let message: JsonRpcResponse;\n          try {\n            message = JSON.parse(line) as JsonRpcResponse;\n          } catch {\n            continue;\n          }\n\n          if (message.id === 1) {\n            if (message.error) {\n              finish(new Error(String(message.error.message || \"Codex initialization failed\")));\n              return;\n            }\n            send({ method: \"initialized\" });\n            send({ id: 2, method: \"thread/fork\", params: { threadId: parentThreadId } });\n            continue;\n          }\n          if (message.id !== 2) continue;\n          if (message.error) {\n            finish(new Error(String(message.error.message || \"Codex thread fork failed\")));\n            return;\n          }\n          const forkId = message.result?.thread?.id;\n          if (typeof forkId !== \"string\" || !forkId) {\n            finish(new Error(\"Codex thread fork returned no thread id\"));\n            return;\n          }\n          const rolloutPath = host.findRolloutPath(forkId);\n          if (!rolloutPath) {\n            finish(new Error(`Codex thread fork rollout was not found for ${forkId}`));\n            return;\n          }\n          finish(undefined, { forkId, rolloutPath });\n          return;\n        }\n      });\n\n      send({\n        id: 1,\n        method: \"initialize\",\n        params: {\n          clientInfo: { name: \"negotium\", version: NEGOTIUM_VERSION },\n        },\n      });\n    });\n  };\n}\n\nconst forkCodexThread = createCodexAppServerForker({\n  spawnServer() {\n    return spawn(process.execPath, [codexCliScriptPath(), \"app-server\", \"--stdio\"], {\n      env: { ...process.env, CODEX_HOME: hostedCodexHomePath() },\n      stdio: [\"pipe\", \"pipe\", \"pipe\"],\n      // Background stdio server — no console window on Windows. Ignored on POSIX.\n      windowsHide: true,\n    });\n  },\n  findRolloutPath: latestCodexRolloutPath,\n  timeoutMs: 15_000,\n});\n\nexport async function forkCodexSession(parentThreadId: string): Promise<CodexAppServerForkResult> {\n  return await forkCodexThread(parentThreadId);\n}\n",
+    "import { type ChildProcess, spawn } from \"node:child_process\";\nimport { randomUUID } from \"node:crypto\";\nimport {\n  chmodSync,\n  copyFileSync,\n  existsSync,\n  mkdtempSync,\n  readFileSync,\n  renameSync,\n  rmSync,\n  unlinkSync,\n  writeFileSync,\n} from \"node:fs\";\nimport { tmpdir } from \"node:os\";\nimport { dirname, join } from \"node:path\";\nimport { fileURLToPath } from \"node:url\";\nimport { NEGOTIUM_VERSION } from \"#version\";\n\ntype CodexModel = Record<string, unknown>;\ntype CodexModelCache = {\n  client_version?: unknown;\n  models?: unknown;\n};\n\n// Resolving these as *modules* (`require.resolve`/`import.meta.resolve`) broke\n// under a plain Node process (which is how Codex itself spawns this server —\n// Bun's resolver is lax enough that it didn't notice) once `@openai/codex-sdk`\n// 0.165.0 dropped CommonJS support (no `\"require\"` condition in its `exports`\n// map), and `@openai/codex` was never importable to begin with — it ships only\n// a CLI `bin`, no `main`/`exports` at all. Neither package needs to be\n// imported here, only located, so this reimplements Node's own node_modules\n// directory-walk (the same algorithm `require`/`import` use internally) over\n// plain filesystem checks instead, which doesn't care what either package's\n// module shape is.\nfunction findPackageJson(specifier: string, searchFromDir: string): string {\n  let dir = searchFromDir;\n  for (;;) {\n    const candidate = join(dir, \"node_modules\", specifier, \"package.json\");\n    if (existsSync(candidate)) return candidate;\n    const parent = dirname(dir);\n    if (parent === dir) {\n      throw new Error(`Could not locate node_modules/${specifier} starting from ${searchFromDir}`);\n    }\n    dir = parent;\n  }\n}\n\nconst thisModuleDir = dirname(fileURLToPath(import.meta.url));\nconst codexSdkPackagePath = findPackageJson(\"@openai/codex-sdk\", thisModuleDir);\nconst bundledCodexPackagePath = findPackageJson(\"@openai/codex\", dirname(codexSdkPackagePath));\n\nfunction readPackageVersion(packageJsonPath: string): string {\n  const parsed = JSON.parse(readFileSync(packageJsonPath, \"utf8\")) as { version?: unknown };\n  if (typeof parsed.version !== \"string\" || !parsed.version.trim()) {\n    throw new Error(`Codex package has no valid version: ${packageJsonPath}`);\n  }\n  return parsed.version;\n}\n\nexport const BUNDLED_CODEX_VERSION = readPackageVersion(bundledCodexPackagePath);\nconst SAFE_BUNDLED_CODEX_VERSION = BUNDLED_CODEX_VERSION.replace(/[^a-zA-Z0-9._-]/g, \"_\");\nconst NEGOTIUM_MODEL_CACHE = `negotium-models-cache-${SAFE_BUNDLED_CODEX_VERSION}.json`;\nconst NEGOTIUM_MODEL_CATALOG = `negotium-model-catalog-${SAFE_BUNDLED_CODEX_VERSION}.json`;\n\nexport function codexCliScriptPath(): string {\n  return join(dirname(bundledCodexPackagePath), \"bin\", \"codex.js\");\n}\n\nfunction parseCodexModelCache(contents: string, sourcePath: string): CodexModelCache {\n  let parsed: CodexModelCache;\n  try {\n    parsed = JSON.parse(contents) as CodexModelCache;\n  } catch (error) {\n    throw new Error(`Codex model cache is invalid JSON: ${sourcePath}`, { cause: error });\n  }\n  if (!Array.isArray(parsed.models) || parsed.models.length === 0) {\n    throw new Error(`Codex model cache has no models: ${sourcePath}`);\n  }\n  return parsed;\n}\n\nfunction readCodexModelCache(cachePath: string): {\n  contents: string;\n  parsed: CodexModelCache;\n} {\n  const contents = readFileSync(cachePath, \"utf8\");\n  return { contents, parsed: parseCodexModelCache(contents, cachePath) };\n}\n\nexport function readCompatibleCodexModelCache(cachePath: string): {\n  contents: string;\n  parsed: CodexModelCache;\n} {\n  const cache = readCodexModelCache(cachePath);\n  if (cache.parsed.client_version !== BUNDLED_CODEX_VERSION) {\n    const found =\n      typeof cache.parsed.client_version === \"string\"\n        ? cache.parsed.client_version\n        : \"missing or invalid\";\n    throw new Error(\n      `Codex model cache version ${found} does not match Negotium's bundled Codex ${BUNDLED_CODEX_VERSION}: ${cachePath}`,\n    );\n  }\n  return cache;\n}\n\nfunction writePrivateFileAtomic(path: string, contents: string): void {\n  if (existsSync(path) && readFileSync(path, \"utf8\") === contents) return;\n\n  const tempPath = `${path}.${process.pid}.${randomUUID()}.tmp`;\n  try {\n    writeFileSync(tempPath, contents, { encoding: \"utf8\", mode: 0o600 });\n    renameSync(tempPath, path);\n    chmodSync(path, 0o600);\n  } finally {\n    try {\n      unlinkSync(tempPath);\n    } catch {\n      // renameSync normally consumed the temporary file.\n    }\n  }\n}\n\nexport function bundledCodexModelCachePath(authFilePath: string): string {\n  return join(dirname(authFilePath), NEGOTIUM_MODEL_CACHE);\n}\n\nasync function bootstrapCodexModelCache(codexHome: string, cachePath: string): Promise<void> {\n  const child = spawn(process.execPath, [codexCliScriptPath(), \"app-server\", \"--stdio\"], {\n    env: { ...process.env, CODEX_HOME: codexHome },\n    stdio: [\"pipe\", \"pipe\", \"pipe\"],\n    // Background stdio server — no console window on Windows. Ignored on POSIX.\n    windowsHide: true,\n  });\n\n  const refreshed = new Promise<void>((resolve, reject) => {\n    let settled = false;\n    let stdoutBuffer = \"\";\n    let stderr = \"\";\n    const timer = setTimeout(\n      () => finish(new Error(\"timed out while refreshing the Codex model catalog\")),\n      15_000,\n    );\n\n    const finish = (error?: Error) => {\n      if (settled) return;\n      settled = true;\n      clearTimeout(timer);\n      try {\n        child.stdin.end();\n        child.kill();\n      } catch {\n        // The app server may already have exited after stdin closed.\n      }\n      if (error) reject(error);\n      else if (!existsSync(cachePath)) reject(new Error(\"Codex did not create its model cache\"));\n      else resolve();\n    };\n\n    const send = (message: Record<string, unknown>) => {\n      child.stdin.write(`${JSON.stringify(message)}\\n`);\n    };\n\n    child.stderr.on(\"data\", (chunk) => {\n      if (stderr.length < 4_096) stderr += String(chunk);\n    });\n    child.on(\"error\", (error) => finish(error));\n    child.on(\"exit\", (code, signal) => {\n      if (!settled) {\n        finish(\n          new Error(\n            `Codex model catalog refresh exited with ${signal ? `signal ${signal}` : `code ${code ?? 1}`}${stderr.trim() ? `: ${stderr.trim()}` : \"\"}`,\n          ),\n        );\n      }\n    });\n    child.stdout.on(\"data\", (chunk) => {\n      stdoutBuffer += String(chunk);\n      for (;;) {\n        const newline = stdoutBuffer.indexOf(\"\\n\");\n        if (newline < 0) break;\n        const line = stdoutBuffer.slice(0, newline);\n        stdoutBuffer = stdoutBuffer.slice(newline + 1);\n        let message: { id?: number; error?: { message?: string } };\n        try {\n          message = JSON.parse(line) as typeof message;\n        } catch {\n          continue;\n        }\n        if (message.id === 1) {\n          if (message.error) {\n            finish(new Error(message.error.message || \"Codex initialization failed\"));\n            return;\n          }\n          send({ method: \"initialized\" });\n          send({ id: 2, method: \"model/list\", params: { includeHidden: true } });\n        } else if (message.id === 2) {\n          if (message.error) {\n            finish(new Error(message.error.message || \"Codex model listing failed\"));\n          } else {\n            finish();\n          }\n          return;\n        }\n      }\n    });\n\n    send({\n      id: 1,\n      method: \"initialize\",\n      params: {\n        clientInfo: { name: \"negotium\", version: NEGOTIUM_VERSION },\n        capabilities: { experimentalApi: true },\n      },\n    });\n  });\n\n  try {\n    await refreshed;\n  } finally {\n    // `child.kill()` only signals. The caller deletes CODEX_HOME right after we\n    // return, and Windows cannot delete a directory the child still holds open\n    // (EBUSY), so wait for the process to actually exit first.\n    await waitForChildExit(child, CODEX_BOOTSTRAP_EXIT_WAIT_MS);\n  }\n}\n\nconst CODEX_BOOTSTRAP_EXIT_WAIT_MS = 3_000;\n\nfunction waitForChildExit(child: ChildProcess, timeoutMs: number): Promise<void> {\n  if (child.exitCode !== null || child.signalCode !== null) return Promise.resolve();\n  return new Promise((resolve) => {\n    const timer = setTimeout(resolve, timeoutMs);\n    timer.unref?.();\n    child.once(\"exit\", () => {\n      clearTimeout(timer);\n      resolve();\n    });\n  });\n}\n\n/**\n * Remove the temporary CODEX_HOME. On Windows a just-exited child (or an\n * antivirus scan of the files it wrote) can keep the directory busy for a\n * moment, so retry, and never let cleanup of a throwaway directory fail a turn\n * whose result was already read. POSIX keeps the original behaviour: unlinking\n * open files works there, and a genuine failure still surfaces.\n */\nfunction removeIsolatedCodexHome(dir: string): void {\n  if (process.platform !== \"win32\") {\n    rmSync(dir, { recursive: true, force: true });\n    return;\n  }\n  try {\n    rmSync(dir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });\n  } catch {\n    // Best effort: the OS temp cleaner will reclaim it.\n  }\n}\n\nasync function bootstrapIsolatedCodexModelCache(\n  authFilePath: string,\n  bootstrap: (codexHome: string, cachePath: string) => Promise<void>,\n): Promise<string> {\n  const sourceHome = dirname(authFilePath);\n  const isolatedHome = mkdtempSync(join(tmpdir(), \"negotium-codex-models-\"));\n  const isolatedCachePath = join(isolatedHome, \"models_cache.json\");\n\n  try {\n    const isolatedAuthPath = join(isolatedHome, \"auth.json\");\n    copyFileSync(authFilePath, isolatedAuthPath);\n    chmodSync(isolatedAuthPath, 0o600);\n\n    // Preserve custom provider configuration while keeping the bundled CLI's\n    // cache write completely outside the user's shared CODEX_HOME.\n    const sourceConfigPath = join(sourceHome, \"config.toml\");\n    if (existsSync(sourceConfigPath)) {\n      const isolatedConfigPath = join(isolatedHome, \"config.toml\");\n      copyFileSync(sourceConfigPath, isolatedConfigPath);\n      chmodSync(isolatedConfigPath, 0o600);\n    }\n\n    await bootstrap(isolatedHome, isolatedCachePath);\n    return readCompatibleCodexModelCache(isolatedCachePath).contents;\n  } finally {\n    removeIsolatedCodexHome(isolatedHome);\n  }\n}\n\nexport async function ensureCodexModelCache(\n  authFilePath: string,\n  bootstrap: (codexHome: string, cachePath: string) => Promise<void> = bootstrapCodexModelCache,\n): Promise<string> {\n  const codexHome = dirname(authFilePath);\n  const configuredCachePath = process.env.NEGOTIUM_CODEX_MODELS_CACHE_FILE;\n  if (configuredCachePath) {\n    if (!existsSync(configuredCachePath)) {\n      throw new Error(`Configured Codex model cache does not exist: ${configuredCachePath}`);\n    }\n    readCompatibleCodexModelCache(configuredCachePath);\n    return configuredCachePath;\n  }\n\n  // The global Codex CLI owns models_cache.json and may update it to a schema\n  // newer than the SDK bundled by Negotium. Snapshot a cache generated for our\n  // exact bundled version so later global CLI updates cannot break turns.\n  const bundledCachePath = bundledCodexModelCachePath(authFilePath);\n  const sharedCachePath = join(codexHome, \"models_cache.json\");\n  if (existsSync(sharedCachePath)) {\n    try {\n      const shared = readCompatibleCodexModelCache(sharedCachePath);\n      // Keep model metadata fresh while the global CLI remains compatible.\n      writePrivateFileAtomic(bundledCachePath, shared.contents);\n      return bundledCachePath;\n    } catch {\n      // A compatible private snapshot is safer than failing because another\n      // process briefly exposed an incomplete shared-cache write.\n    }\n  }\n\n  if (existsSync(bundledCachePath)) {\n    try {\n      readCompatibleCodexModelCache(bundledCachePath);\n      return bundledCachePath;\n    } catch {\n      // Re-bootstrap below instead of passing a corrupt or version-mismatched\n      // private snapshot into this SDK version.\n    }\n  }\n\n  const refreshedContents = await bootstrapIsolatedCodexModelCache(authFilePath, bootstrap);\n  writePrivateFileAtomic(bundledCachePath, refreshedContents);\n  return bundledCachePath;\n}\n\n/**\n * Codex can resolve model metadata before `features.multi_agent=false`, so a\n * model-advertised v1/v2 value may still register native collaboration tools.\n * Feed Codex an authoritative copy of its own catalog with only that field\n * disabled. Runtime MCP delegation remains available independently.\n */\nexport function writeCodexCatalogWithNativeMultiAgentDisabled(\n  authFilePath: string,\n  sourcePath: string,\n): string {\n  const codexHome = dirname(authFilePath);\n  const outputPath = join(codexHome, NEGOTIUM_MODEL_CATALOG);\n\n  const parsed = readCodexModelCache(sourcePath).parsed;\n\n  const models = (parsed.models as unknown[]).map((model, index): CodexModel => {\n    if (!model || typeof model !== \"object\" || Array.isArray(model)) {\n      throw new Error(`Codex model cache entry ${index} is invalid: ${sourcePath}`);\n    }\n    return { ...(model as CodexModel), multi_agent_version: \"disabled\" };\n  });\n  const contents = `${JSON.stringify({ models }, null, 2)}\\n`;\n  writePrivateFileAtomic(outputPath, contents);\n  return outputPath;\n}\n",
+    "export const NEGOTIUM_VERSION = \"0.23.2\";\n"
+  ],
+  "mappings": "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",
+  "debugId": "F52112FFE0B50C6764756E2164756E21",
+  "names": []
+}

package/dist/hosted-agent.js

@@ -271,9 +271,14 @@ function agentAliases(agent) {
       return [
         "codex",
         "\uCF54\uB371\uC2A4",
+        "astra",
+        "sol",
+        "luna",
+        "terra",
         "gpt-6-luna",
         "gpt-6-sol",
         "gpt-5.6-luna",
+        "gpt-6.1-terra",
         "gpt-5.6-terra",
         "gpt-5.6-sol",
         "gpt-6-astra"
@@ -301,7 +306,7 @@ function hasExplicitAgentSwitchRequest(prompt, agent) {
   if (!prompt?.trim())
     return false;
   const text = prompt.toLowerCase().replace(/\s+/g, " ").trim();
-  const target = `(?:${agentAliases(agent).map(escapeRegExp).join("|")})`;
+  const target = `(?<![A-Za-z0-9_-])(?:${agentAliases(agent).map(escapeRegExp).join("|")})(?![A-Za-z0-9_-])`;
   const switchVerb = "(?:\uBC14\uAFD4|\uBC14\uAFD4\uC918|\uBCC0\uACBD|\uBCC0\uACBD\uD574|\uC804\uD658|\uC804\uD658\uD574|\uC124\uC815|\uC124\uC815\uD574|\uC368\uC918|\uC0AC\uC6A9|\uAC00|switch|change|set|use)";
   const switchSubject = "(?:agent|runtime|model|\uC5D0\uC774\uC804\uD2B8|\uB7F0\uD0C0\uC784|\uBAA8\uB378)";
   return [
@@ -3590,18 +3595,30 @@ import {
   unlinkSync as unlinkSync3,
   writeFileSync as writeFileSync2
 } from "fs";
-import { createRequire } from "module";
 import { tmpdir } from "os";
 import { dirname as dirname5, join as join3 } from "path";
+import { fileURLToPath } from "url";
 
 // ../../packages/core/src/version.ts
-var NEGOTIUM_VERSION = "0.23.1";
+var NEGOTIUM_VERSION = "0.23.2";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
-var moduleRequire = createRequire(import.meta.url);
-var codexSdkPackagePath = moduleRequire.resolve("@openai/codex-sdk/package.json");
-var codexSdkRequire = createRequire(codexSdkPackagePath);
-var bundledCodexPackagePath = codexSdkRequire.resolve("@openai/codex/package.json");
+function findPackageJson(specifier, searchFromDir) {
+  let dir = searchFromDir;
+  for (;; ) {
+    const candidate = join3(dir, "node_modules", specifier, "package.json");
+    if (existsSync2(candidate))
+      return candidate;
+    const parent = dirname5(dir);
+    if (parent === dir) {
+      throw new Error(`Could not locate node_modules/${specifier} starting from ${searchFromDir}`);
+    }
+    dir = parent;
+  }
+}
+var thisModuleDir = dirname5(fileURLToPath(import.meta.url));
+var codexSdkPackagePath = findPackageJson("@openai/codex-sdk", thisModuleDir);
+var bundledCodexPackagePath = findPackageJson("@openai/codex", dirname5(codexSdkPackagePath));
 function readPackageVersion(packageJsonPath) {
   const parsed = JSON.parse(readFileSync3(packageJsonPath, "utf8"));
   if (typeof parsed.version !== "string" || !parsed.version.trim()) {
@@ -3832,6 +3849,70 @@ function writeCodexCatalogWithNativeMultiAgentDisabled(authFilePath, sourcePath)
   return outputPath;
 }
 
+// ../../packages/core/src/agents/codex-tier-resolver.ts
+var CODEX_TIER_FALLBACKS = {
+  astra: "gpt-6-astra",
+  sol: "gpt-6-sol",
+  luna: "gpt-6-luna",
+  terra: "gpt-6.1-terra"
+};
+var warnedCachePaths = new Set;
+var warnedUnpricedSlugs = new Set;
+var pricedSlugs = new Set([
+  "gpt-6-astra",
+  "gpt-6-sol",
+  "gpt-6-luna",
+  "gpt-6.1-terra",
+  "gpt-5.6-sol",
+  "gpt-5.6-luna",
+  "gpt-5.6-terra"
+]);
+function codexTiersFromCache(cache) {
+  const result = {};
+  const priorities = {};
+  if (!cache || typeof cache !== "object" || !("models" in cache))
+    return result;
+  const models = cache.models;
+  if (!Array.isArray(models))
+    return result;
+  for (const model of models) {
+    if (!model || typeof model !== "object")
+      continue;
+    const { slug, visibility, priority } = model;
+    if (typeof slug !== "string" || visibility !== "list")
+      continue;
+    if (typeof priority !== "number" || !Number.isFinite(priority))
+      continue;
+    const suffix = slug.slice(slug.lastIndexOf("-") + 1);
+    if (!Object.hasOwn(CODEX_TIER_FALLBACKS, suffix))
+      continue;
+    const tier = suffix;
+    if (priorities[tier] === undefined || priority < priorities[tier]) {
+      priorities[tier] = priority;
+      result[tier] = slug;
+    }
+  }
+  return result;
+}
+function resolveCodexTierModel(tier, cachePath = process.env.NEGOTIUM_CODEX_MODELS_CACHE_FILE ?? bundledCodexModelCachePath(hostedCodexAuthFilePath())) {
+  try {
+    const selected = codexTiersFromCache(readCompatibleCodexModelCache(cachePath).parsed)[tier];
+    if (selected) {
+      if (!pricedSlugs.has(selected) && !warnedUnpricedSlugs.has(selected)) {
+        warnedUnpricedSlugs.add(selected);
+        logger.warn({ tier, model: selected }, "Codex tier model has no token-stats price");
+      }
+      return selected;
+    }
+  } catch (error) {
+    if (!warnedCachePaths.has(cachePath)) {
+      warnedCachePaths.add(cachePath);
+      logger.warn({ err: error, cachePath }, "Codex tier cache unavailable; using fallback ids");
+    }
+  }
+  return CODEX_TIER_FALLBACKS[tier];
+}
+
 // ../../packages/core/src/agents/codex-tree-kill.ts
 import { execFileSync as execFileSync2 } from "child_process";
 
@@ -4059,7 +4140,7 @@ import { chmod, copyFile, mkdtemp, rm as rm2, writeFile as writeFile2 } from "fs
 import { createServer } from "net";
 import { tmpdir as tmpdir2 } from "os";
 import { dirname as dirname6, join as join5, resolve as resolve5 } from "path";
-import { fileURLToPath } from "url";
+import { fileURLToPath as fileURLToPath2 } from "url";
 
 // ../../packages/core/src/agents/codex-windows-wrapper.ts
 import { execFile } from "child_process";
@@ -4243,7 +4324,7 @@ function shellQuote(value) {
   return `'${value.replaceAll("'", `'"'"'`)}'`;
 }
 function hookClientPath() {
-  const moduleDir = dirname6(fileURLToPath(import.meta.url));
+  const moduleDir = dirname6(fileURLToPath2(import.meta.url));
   const adjacent = resolve5(moduleDir, "codex-vault-hook.mjs");
   if (existsSync4(adjacent))
     return adjacent;
@@ -5177,6 +5258,7 @@ async function* codexProvider(opts) {
     ...codexEnvironment ? { env: codexEnvironment } : {},
     config: {
       agents: { enabled: false },
+      tools: { update_plan: { enabled: false } },
       features: {
         hooks: true,
         goals: false,
@@ -5200,7 +5282,9 @@ async function* codexProvider(opts) {
       webSearchMode: "disabled",
       webSearchEnabled: false
     } : {},
-    ...opts.model ? { model: opts.model } : {},
+    ...opts.model ? {
+      model: Object.hasOwn(CODEX_TIER_FALLBACKS, opts.model) ? resolveCodexTierModel(opts.model) : opts.model
+    } : {},
     ...opts.effort ? { modelReasoningEffort: mapEffort(opts.effort) } : {}
   };
   let currentSessionId = opts.sessionId;
@@ -5571,14 +5655,14 @@ function maestroProvider(opts) {
 }
 // ../../packages/core/src/agents/claude-runtime-inspection.ts
 import { readFileSync as readFileSync6 } from "fs";
-import { createRequire as createRequire2 } from "module";
+import { createRequire } from "module";
 import { dirname as dirname9, join as join8 } from "path";
 var cached;
 function inspectBundledClaudeRuntime() {
   if (cached)
     return cached;
   try {
-    const require2 = createRequire2(import.meta.url);
+    const require2 = createRequire(import.meta.url);
     const sdkDir = dirname9(require2.resolve("@anthropic-ai/claude-agent-sdk"));
     const sdkPackage = JSON.parse(readFileSync6(join8(sdkDir, "package.json"), "utf8"));
     const manifest = JSON.parse(readFileSync6(join8(sdkDir, "manifest.json"), "utf8"));
@@ -5654,4 +5738,4 @@ export {
   buildClaudeDisallowedTools
 };
 
-//# debugId=B911FEB22E0F0C6764756E2164756E21
+//# debugId=ACCBAC7BC2F9084364756E2164756E21