negotium 0.23.1 → 0.23.2

package/dist/agent-helpers.js

@@ -603,9 +603,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"
@@ -633,7 +638,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 [
@@ -5241,7 +5246,7 @@ var init_codex = __esm(async () => {
 });
 
 // ../../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
 import { spawn as spawn2 } from "child_process";
@@ -5257,9 +5262,22 @@ import {
   unlinkSync as unlinkSync5,
   writeFileSync as writeFileSync4
 } from "fs";
-import { createRequire as createRequire2 } from "module";
 import { tmpdir } from "os";
 import { dirname as dirname7, join as join7 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+function findPackageJson(specifier, searchFromDir) {
+  let dir = searchFromDir;
+  for (;; ) {
+    const candidate = join7(dir, "node_modules", specifier, "package.json");
+    if (existsSync6(candidate))
+      return candidate;
+    const parent = dirname7(dir);
+    if (parent === dir) {
+      throw new Error(`Could not locate node_modules/${specifier} starting from ${searchFromDir}`);
+    }
+    dir = parent;
+  }
+}
 function readPackageVersion(packageJsonPath) {
   const parsed = JSON.parse(readFileSync5(packageJsonPath, "utf8"));
   if (typeof parsed.version !== "string" || !parsed.version.trim()) {
@@ -5484,12 +5502,11 @@ function writeCodexCatalogWithNativeMultiAgentDisabled(authFilePath, sourcePath)
   writePrivateFileAtomic(outputPath, contents);
   return outputPath;
 }
-var moduleRequire, codexSdkPackagePath, codexSdkRequire, bundledCodexPackagePath, BUNDLED_CODEX_VERSION, SAFE_BUNDLED_CODEX_VERSION, NEGOTIUM_MODEL_CACHE, NEGOTIUM_MODEL_CATALOG, CODEX_BOOTSTRAP_EXIT_WAIT_MS = 3000;
+var thisModuleDir, codexSdkPackagePath, bundledCodexPackagePath, BUNDLED_CODEX_VERSION, SAFE_BUNDLED_CODEX_VERSION, NEGOTIUM_MODEL_CACHE, NEGOTIUM_MODEL_CATALOG, CODEX_BOOTSTRAP_EXIT_WAIT_MS = 3000;
 var init_codex_native_multi_agent = __esm(() => {
-  moduleRequire = createRequire2(import.meta.url);
-  codexSdkPackagePath = moduleRequire.resolve("@openai/codex-sdk/package.json");
-  codexSdkRequire = createRequire2(codexSdkPackagePath);
-  bundledCodexPackagePath = codexSdkRequire.resolve("@openai/codex/package.json");
+  thisModuleDir = dirname7(fileURLToPath2(import.meta.url));
+  codexSdkPackagePath = findPackageJson("@openai/codex-sdk", thisModuleDir);
+  bundledCodexPackagePath = findPackageJson("@openai/codex", dirname7(codexSdkPackagePath));
   BUNDLED_CODEX_VERSION = readPackageVersion(bundledCodexPackagePath);
   SAFE_BUNDLED_CODEX_VERSION = BUNDLED_CODEX_VERSION.replace(/[^a-zA-Z0-9._-]/g, "_");
   NEGOTIUM_MODEL_CACHE = `negotium-models-cache-${SAFE_BUNDLED_CODEX_VERSION}.json`;
@@ -5633,7 +5650,7 @@ var init_codex_registry = __esm(async () => {
   VALID_EFFORTS2 = new Set(CODEX_EFFORT_VALUES);
   codexRegistry = {
     kind: "codex",
-    defaultModel: "gpt-6-luna",
+    defaultModel: "luna",
     expandModelAlias(s) {
       return s;
     },
@@ -6791,6 +6808,76 @@ var init_claude_provider = __esm(async () => {
   claudeProcessExitListeners = new WeakMap;
 });
 
+// ../../packages/core/src/agents/codex-tier-resolver.ts
+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];
+}
+var CODEX_TIER_FALLBACKS, warnedCachePaths, warnedUnpricedSlugs, pricedSlugs;
+var init_codex_tier_resolver = __esm(async () => {
+  init_codex_native_multi_agent();
+  init_logger();
+  await init_execution_host();
+  CODEX_TIER_FALLBACKS = {
+    astra: "gpt-6-astra",
+    sol: "gpt-6-sol",
+    luna: "gpt-6-luna",
+    terra: "gpt-6.1-terra"
+  };
+  warnedCachePaths = new Set;
+  warnedUnpricedSlugs = new Set;
+  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"
+  ]);
+});
+
 // ../../packages/core/src/agents/codex-tree-manager.ts
 function createCodexTreeManager(host, options = {}) {
   const sigkillDelayMs = options.sigkillDelayMs ?? 5000;
@@ -7176,7 +7263,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 dirname10, join as join13, resolve as resolve8 } from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import { fileURLToPath as fileURLToPath3 } from "url";
 function evaluateCodexVaultPreToolUse(input, userId, operations) {
   if (operations.referencesSensitiveStorage(input.tool_input)) {
     return {
@@ -7204,7 +7291,7 @@ function shellQuote(value) {
   return `'${value.replaceAll("'", `'"'"'`)}'`;
 }
 function hookClientPath() {
-  const moduleDir = dirname10(fileURLToPath2(import.meta.url));
+  const moduleDir = dirname10(fileURLToPath3(import.meta.url));
   const adjacent = resolve8(moduleDir, "codex-vault-hook.mjs");
   if (existsSync13(adjacent))
     return adjacent;
@@ -8273,6 +8360,7 @@ async function* codexProvider(opts) {
     ...codexEnvironment ? { env: codexEnvironment } : {},
     config: {
       agents: { enabled: false },
+      tools: { update_plan: { enabled: false } },
       features: {
         hooks: true,
         goals: false,
@@ -8296,7 +8384,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;
@@ -8558,6 +8648,7 @@ var init_codex_provider = __esm(async () => {
   init_file_events();
   init_logger();
   await __promiseAll([
+    init_codex_tier_resolver(),
     init_codex_vault_hook_bridge(),
     init_execution_host(),
     init_codex(),
@@ -8851,10 +8942,13 @@ __export(exports_model_catalog, {
   FALLBACK_ORDER: () => FALLBACK_ORDER,
   AGENT_DISPLAY_NAME: () => AGENT_DISPLAY_NAME
 });
+function canonicalModelCasing() {
+  return Object.fromEntries(SELECTABLE_MODELS.map((candidate) => [candidate.model.toLowerCase(), candidate.model]));
+}
 function canonicalModelId(value) {
   const trimmed = value.trim();
   const lower = trimmed.toLowerCase();
-  return SELECTABLE_MODEL_ALIASES[lower] ?? CANONICAL_MODEL_CASING[lower] ?? trimmed;
+  return SELECTABLE_MODEL_ALIASES[lower] ?? canonicalModelCasing()[lower] ?? trimmed;
 }
 function formatSelectableModel(candidate) {
   const tier = `${candidate.intelligenceTier[0].toUpperCase()}${candidate.intelligenceTier.slice(1)}`;
@@ -8899,7 +8993,7 @@ function resolveModelForAgent(agent, requested, registry) {
   return registry.validateModel(candidate) ? candidate : defaultModel;
 }
 function resolveWorkerDefaultModel(agent, registry) {
-  return agent === "codex" ? "gpt-5.6-terra" : registry.defaultModel;
+  return agent === "codex" ? "terra" : registry.defaultModel;
 }
 function resolveWorkerModel(agent, requested, registry) {
   const workerDefault = resolveWorkerDefaultModel(agent, registry);
@@ -8916,7 +9010,7 @@ function resolveCompactionExecution(agent, registry) {
   const effort = registry.validateEffort("medium") ? "medium" : registry.defaultEffort;
   return { model, ...effort ? { effort } : {} };
 }
-var MODEL_OWNER, MODEL_COST_RESEARCHED_AT = "2026-09-05", MODEL_COST_ROUTING_SUMMARY = "Cost basis (2026-09-05): Codex Pro 20x and Claude Max 20x are each $200/month; Maestro models are pay-per-token. DeepSeek Flash is cheapest. gpt-6-astra and Claude Fable 5.1 are the newest flagships, both priced at $10/M input / $50/M output.", CODEX_PRO_20X_COST = "ChatGPT Pro 20x subscription: $200/month", CODEX_COMMUNITY_WEEKLY = "Community plan-level observation: roughly 2\u20134B raw/cached tokens per week; fresh-input equivalent is much lower and unstable (low confidence)", CLAUDE_MAX_20X_COST = "Claude Max 20x subscription: $200/month", CLAUDE_COMMUNITY_SESSION = "Community observations vary from roughly 220\u2013250K locally displayed tokens per 5-hour session to billions of cache-heavy raw tokens per week; calibrated reports value a full weekly allowance around $680\u2013$1,900 at API rates. Recent heavy-model reports reach the weekly cap after about 4\u20135 full sessions (low confidence; not a token cap)", SELECTABLE_MODELS, SELECTABLE_MODEL_ALIASES, CANONICAL_MODEL_CASING, FALLBACK_ORDER, AGENT_DISPLAY_NAME;
+var MODEL_OWNER, MODEL_COST_RESEARCHED_AT = "2026-09-05", MODEL_COST_ROUTING_SUMMARY = "Cost basis (2026-09-05): Codex Pro 20x and Claude Max 20x are each $200/month; Maestro models are pay-per-token. DeepSeek Flash is cheapest. gpt-6-astra and Claude Fable 5.1 are the newest flagships, both priced at $10/M input / $50/M output.", CODEX_PRO_20X_COST = "ChatGPT Pro 20x subscription: $200/month", CODEX_COMMUNITY_WEEKLY = "Community plan-level observation: roughly 2\u20134B raw/cached tokens per week; fresh-input equivalent is much lower and unstable (low confidence)", CLAUDE_MAX_20X_COST = "Claude Max 20x subscription: $200/month", CLAUDE_COMMUNITY_SESSION = "Community observations vary from roughly 220\u2013250K locally displayed tokens per 5-hour session to billions of cache-heavy raw tokens per week; calibrated reports value a full weekly allowance around $680\u2013$1,900 at API rates. Recent heavy-model reports reach the weekly cap after about 4\u20135 full sessions (low confidence; not a token cap)", SELECTABLE_MODELS, SELECTABLE_MODEL_ALIASES, FALLBACK_ORDER, AGENT_DISPLAY_NAME;
 var init_model_catalog = __esm(() => {
   init_config();
   MODEL_OWNER = {
@@ -8924,9 +9018,14 @@ var init_model_catalog = __esm(() => {
     opus: "claude",
     haiku: "claude",
     fable: "claude",
+    astra: "codex",
+    sol: "codex",
+    luna: "codex",
+    terra: "codex",
     "gpt-6-astra": "codex",
     "gpt-6-sol": "codex",
     "gpt-6-luna": "codex",
+    "gpt-6.1-terra": "codex",
     "gpt-5.6-luna": "codex",
     "gpt-5.6-terra": "codex",
     "gpt-5.6-sol": "codex",
@@ -8947,7 +9046,7 @@ var init_model_catalog = __esm(() => {
   };
   SELECTABLE_MODELS = [
     {
-      model: "gpt-6-astra",
+      model: "astra",
       agent: "codex",
       description: "Newest OpenAI flagship; Codex's highest-capability route.",
       intelligenceTier: "fable",
@@ -8957,7 +9056,7 @@ var init_model_catalog = __esm(() => {
       estimatedUsage: `Released 2026-09-03; became Codex CLI's bundled default in v0.153.4 (2026-09-05). Local message-count/quota-weight ranges not yet published as of the last catalog check \u2014 expect a quota weight above gpt-6-sol given the higher per-token cost. ${CODEX_COMMUNITY_WEEKLY}`
     },
     {
-      model: "gpt-6-sol",
+      model: "sol",
       agent: "codex",
       description: "GPT-6 generation Sol route (2026-09-22) for demanding coding and agentic work.",
       intelligenceTier: "opus",
@@ -8967,7 +9066,7 @@ var init_model_catalog = __esm(() => {
       estimatedUsage: `Released 2026-09-22; local message-count/quota-weight ranges not yet published. ${CODEX_COMMUNITY_WEEKLY}`
     },
     {
-      model: "gpt-6-luna",
+      model: "luna",
       agent: "codex",
       description: "Default Codex route (GPT-6 Luna, 2026-09-22): fast, high-volume, lowest cost.",
       intelligenceTier: "sonnet",
@@ -8977,14 +9076,14 @@ var init_model_catalog = __esm(() => {
       estimatedUsage: `Released 2026-09-22; local message-count/quota-weight ranges not yet published. ${CODEX_COMMUNITY_WEEKLY}`
     },
     {
-      model: "gpt-5.6-terra",
+      model: "terra",
       agent: "codex",
-      description: "High-capability Codex route for complex coding and reasoning.",
+      description: "GPT-6.1 Terra route (2026-10-26) for complex coding, visual reasoning, and computer use.",
       intelligenceTier: "opus",
-      routingSummary: "complex coding and reasoning; 2.5x Codex quota cost",
+      routingSummary: "capable coding and computer use at a lower cost than GPT-5.6 Terra",
       accessCost: CODEX_PRO_20X_COST,
-      marginalTokenCost: "Codex credits: $2.50/M uncached input, $0.25/M cached input, $15/M output",
-      estimatedUsage: `Official Pro 20x range: 400\u20132,200 local messages per 5 hours; quota weight 2.5x the retired GPT-5.6 Luna. ${CODEX_COMMUNITY_WEEKLY}`
+      marginalTokenCost: "Codex credits (OpenAI API rate): $1/M uncached input, $0.05/M cached input, $5/M output",
+      estimatedUsage: `Released 2026-10-26; local message-count/quota-weight ranges not yet published. ${CODEX_COMMUNITY_WEEKLY}`
     },
     {
       model: "fable",
@@ -9078,8 +9177,13 @@ var init_model_catalog = __esm(() => {
     }
   ];
   SELECTABLE_MODEL_ALIASES = {
-    "gpt-5.6-sol": "gpt-6-sol",
-    "gpt-5.6-luna": "gpt-6-luna",
+    "gpt-6-astra": "astra",
+    "gpt-5.6-sol": "sol",
+    "gpt-6-sol": "sol",
+    "gpt-5.6-luna": "luna",
+    "gpt-6-luna": "luna",
+    "gpt-5.6-terra": "terra",
+    "gpt-6.1-terra": "terra",
     kimi: "kimi-k3",
     "kimi-pro": "kimi-k3",
     "kimi-code": "kimi-k2.7-code",
@@ -9087,18 +9191,17 @@ var init_model_catalog = __esm(() => {
     "glm-pro": "glm-5.3",
     "glm-flash": "glm-5.3-flash"
   };
-  CANONICAL_MODEL_CASING = Object.fromEntries(SELECTABLE_MODELS.map((candidate) => [candidate.model.toLowerCase(), candidate.model]));
   FALLBACK_ORDER = {
     claude: [
       { agent: "maestro", model: "deepseek-pro" },
-      { agent: "codex", model: "gpt-6-luna" }
+      { agent: "codex", model: "luna" }
     ],
     codex: [
       { agent: "maestro", model: "deepseek-pro" },
       { agent: "claude", model: "sonnet" }
     ],
     maestro: [
-      { agent: "codex", model: "gpt-6-luna" },
+      { agent: "codex", model: "luna" },
       { agent: "claude", model: "sonnet" }
     ]
   };
@@ -14151,6 +14254,7 @@ var init_token_stats = __esm(async () => {
     "codex:gpt-6-astra": { input: 10, cacheWrite: 12.5, cacheRead: 1, output: 50 },
     "codex:gpt-6-sol": { input: 2, cacheRead: 0.2, output: 10 },
     "codex:gpt-6-luna": { input: 0.1, cacheRead: 0.01, output: 0.5 },
+    "codex:gpt-6.1-terra": { input: 1, cacheRead: 0.05, output: 5 },
     "codex:gpt-5.6-sol": { input: 5, cacheRead: 0.5, output: 30 },
     "codex:gpt-5.6-terra": { input: 2.5, cacheRead: 0.25, output: 15 },
     "codex:gpt-5.6-luna": { input: 1, cacheRead: 0.1, output: 6 },
@@ -19336,12 +19440,13 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
   const toolSummaryOptions = {
     cwd: control.injectParams?.cwd ?? workspaceCwdFor(topicId)
   };
+  const pricedModel = agentType === "codex" && Object.hasOwn(CODEX_TIER_FALLBACKS, model) ? resolveCodexTierModel(model) : model;
   const recordEventUsage = (usage) => {
     recordUsage(userId, topicTitle, usage, {
       topicId,
       ...control.sessionId ? { providerSessionId: control.sessionId } : {},
       agent: agentType,
-      model
+      model: pricedModel
     });
   };
   const broadcastContextProgress = (force = false) => {
@@ -19923,6 +20028,7 @@ var init_turn_event_stream = __esm(async () => {
   init_usage_alert();
   init_sensitive_path();
   await __promiseAll([
+    init_codex_tier_resolver(),
     init_fork(),
     init_idle_archiver(),
     init_idle_compact(),
@@ -23477,4 +23583,4 @@ export {
   DEFAULT_SELF_CONFIG_PRODUCT
 };
 
-//# debugId=54CABEB880CA0A4C64756E2164756E21
+//# debugId=811014A35D4C1D5664756E2164756E21