negotium 0.23.1 → 0.23.2

package/dist/runtime/src/agents/codex-registry.ts

@@ -10,16 +10,15 @@ const VALID_EFFORTS = new Set<EffortLevel>(CODEX_EFFORT_VALUES);
 
 // Codex CLI's own bundled default became gpt-6-astra as of v0.153.4
 // (2026-09-05); before that it was gpt-5.6-sol (`codex exec` 2026-07-10 →
-// "model: gpt-5.6-sol"). We deliberately default to gpt-6-luna — the
+// "model: gpt-5.6-sol"). We deliberately default to the luna tier — the
 // cheapest/fastest GPT-6 tier — for a general always-on assistant where most
 // queries are light. Heavier work escalates to terra/sol/astra via set_model. The
-// GPT-5.6 Sol/Luna ids are retired aliases of gpt-6-sol/gpt-6-luna (see
-// canonicalModelId), so a stored gpt-5.6-luna still runs as gpt-6-luna. This
-// value is passed explicitly to the SDK (see event-processor resolveDefaultModel),
-// so the footer and the actual model stay in sync.
+// GPT-5.6 Sol/Luna/Terra ids are retired aliases of their GPT-6 successors (see
+// canonicalModelId), so a stored gpt-5.6-luna normalizes to luna. The provider
+// resolves the tier immediately before passing it to the SDK.
 export const codexRegistry: AgentRegistry = {
   kind: "codex",
-  defaultModel: "gpt-6-luna",
+  defaultModel: "luna",
   // defaultEffort intentionally omitted — Codex SDK treats absence as
   // "reasoning off". Setting "high"/etc. would silently flip on reasoning.
 
@@ -29,7 +28,7 @@ export const codexRegistry: AgentRegistry = {
 
   validateModel(s) {
     // Codex doesn't publish a closed model list and OpenAI ships new IDs
-    // (gpt-6-astra, gpt-6-sol, gpt-5.6-terra, gpt-6-luna, o3, ...) frequently. Best-effort: accept any
+    // (gpt-6-astra, gpt-6-sol, gpt-6.1-terra, gpt-6-luna, o3, ...) frequently. Best-effort: accept any
     // non-empty string. Bad IDs surface at SDK call time with a clear error.
     return typeof s === "string" && s.length > 0;
   },

package/dist/runtime/src/agents/codex-tier-resolver.ts

@@ -0,0 +1,74 @@
+import {
+  bundledCodexModelCachePath,
+  readCompatibleCodexModelCache,
+} from "#agents/codex-native-multi-agent";
+import { hostedCodexAuthFilePath } from "#agents/execution-host";
+import { logger } from "#platform/logger";
+
+export const CODEX_TIER_FALLBACKS = {
+  astra: "gpt-6-astra",
+  sol: "gpt-6-sol",
+  luna: "gpt-6-luna",
+  terra: "gpt-6.1-terra",
+} as const;
+
+export type CodexTier = keyof typeof CODEX_TIER_FALLBACKS;
+
+const warnedCachePaths = new Set<string>();
+const warnedUnpricedSlugs = new Set<string>();
+const 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",
+]);
+
+/** Choose Codex's highest-priority visible model for each supported tier. */
+export function codexTiersFromCache(cache: unknown): Partial<Record<CodexTier, string>> {
+  const result: Partial<Record<CodexTier, string>> = {};
+  const priorities: Partial<Record<CodexTier, number>> = {};
+  if (!cache || typeof cache !== "object" || !("models" in cache)) return result;
+  const models = (cache as { models?: unknown }).models;
+  if (!Array.isArray(models)) return result;
+
+  for (const model of models) {
+    if (!model || typeof model !== "object") continue;
+    const { slug, visibility, priority } = model as Record<string, unknown>;
+    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 as CodexTier;
+    if (priorities[tier] === undefined || priority < priorities[tier]) {
+      priorities[tier] = priority;
+      result[tier] = slug;
+    }
+  }
+  return result;
+}
+
+export function resolveCodexTierModel(
+  tier: CodexTier,
+  cachePath = process.env.NEGOTIUM_CODEX_MODELS_CACHE_FILE ??
+    bundledCodexModelCachePath(hostedCodexAuthFilePath()),
+): string {
+  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];
+}

package/dist/runtime/src/agents/explicit-agent-switch.ts

@@ -21,9 +21,14 @@ function agentAliases(agent: AgentKind): string[] {
       return [
         "codex",
         "코덱스",
+        "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",
@@ -55,7 +60,7 @@ export function hasExplicitAgentSwitchRequest(
 ): boolean {
   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 =
     "(?:바꿔|바꿔줘|변경|변경해|전환|전환해|설정|설정해|써줘|사용|가|switch|change|set|use)";
   const switchSubject = "(?:agent|runtime|model|에이전트|런타임|모델)";

package/dist/runtime/src/agents/model-catalog.ts

@@ -21,9 +21,14 @@ export const MODEL_OWNER: Record<string, AgentKind> = {
   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",
@@ -100,7 +105,7 @@ const CLAUDE_COMMUNITY_SESSION =
  */
 export const SELECTABLE_MODELS: readonly SelectableModel[] = [
   {
-    model: "gpt-6-astra",
+    model: "astra",
     agent: "codex",
     description: "Newest OpenAI flagship; Codex's highest-capability route.",
     intelligenceTier: "fable",
@@ -111,7 +116,7 @@ export const SELECTABLE_MODELS: readonly SelectableModel[] = [
     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 — 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",
@@ -122,7 +127,7 @@ export const SELECTABLE_MODELS: readonly SelectableModel[] = [
     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",
@@ -133,14 +138,16 @@ export const SELECTABLE_MODELS: readonly SelectableModel[] = [
     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–2,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",
@@ -249,12 +256,14 @@ export const SELECTABLE_MODELS: readonly SelectableModel[] = [
 ];
 
 const SELECTABLE_MODEL_ALIASES: Readonly<Record<string, string>> = {
-  // GPT-6 Sol/Luna (2026-09-22) replace the GPT-5.6 tiers of the same name at half the price.
-  // Only the GPT-6 route is selectable; the retired ids resolve to it, so stored topic configs,
-  // cron rows and explicit requests keep working without a second, duplicate Sol/Luna. Terra has
-  // no GPT-6 successor and stays as `gpt-5.6-terra`.
-  "gpt-5.6-sol": "gpt-6-sol",
-  "gpt-5.6-luna": "gpt-6-luna",
+  // Known concrete IDs normalize to stable tier names before persistence.
+  "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",
@@ -272,15 +281,17 @@ const SELECTABLE_MODEL_ALIASES: Readonly<Record<string, string>> = {
 // ownership check and, for Codex specifically (whose `validateModel` accepts
 // any non-empty string), reaches the provider unrejected despite belonging
 // to a different agent.
-const CANONICAL_MODEL_CASING: Readonly<Record<string, string>> = Object.fromEntries(
-  SELECTABLE_MODELS.map((candidate) => [candidate.model.toLowerCase(), candidate.model]),
-);
+function canonicalModelCasing(): Readonly<Record<string, string>> {
+  return Object.fromEntries(
+    SELECTABLE_MODELS.map((candidate) => [candidate.model.toLowerCase(), candidate.model]),
+  );
+}
 
 /** Normalize supported user-facing aliases before validation or persistence. */
 export function canonicalModelId(value: string): string {
   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;
 }
 
 export function formatSelectableModel(candidate: SelectableModel): string {
@@ -344,8 +355,8 @@ export function resolveModelForAgent(
 /**
  * Default model for unattended background workers (compaction, memory
  * archiving, and similar fixed-purpose programmatic turns) — Codex prefers
- * the stronger `gpt-5.6-terra` here over its cheap interactive default
- * (`gpt-6-luna`), since nothing is waiting on the response in real time.
+ * the stronger `terra` tier here over its cheap interactive default
+ * (`luna`), since nothing is waiting on the response in real time.
  * Claude and Maestro keep their normal registry defaults (`sonnet` /
  * `deepseek-pro`).
  */
@@ -353,7 +364,7 @@ export function resolveWorkerDefaultModel(
   agent: AgentKind,
   registry: { defaultModel: string },
 ): string {
-  return agent === "codex" ? "gpt-5.6-terra" : registry.defaultModel;
+  return agent === "codex" ? "terra" : registry.defaultModel;
 }
 
 /**
@@ -409,14 +420,14 @@ export function resolveCompactionExecution(
 export const FALLBACK_ORDER: Record<AgentKind, { agent: AgentKind; model: string }[]> = {
   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" },
   ],
 };

package/dist/runtime/src/runtime/turn-event-stream.ts

@@ -1,6 +1,11 @@
 import { randomUUID } from "node:crypto";
 import { realpathSync, statSync } from "node:fs";
 import { isAbsolute, resolve } from "node:path";
+import {
+  CODEX_TIER_FALLBACKS,
+  type CodexTier,
+  resolveCodexTierModel,
+} from "#agents/codex-tier-resolver";
 import { estimateTextTokens } from "#agents/compaction-support";
 import { cleanupAgentFork } from "#agents/fork";
 import { scheduleIdleArchiveForTopic } from "#agents/idle-archiver";
@@ -180,12 +185,19 @@ export async function runTurnEventStream(
   const toolSummaryOptions = {
     cwd: control.injectParams?.cwd ?? workspaceCwdFor(topicId),
   };
+  // Usage is billed against the real model Codex actually ran (resolved from
+  // a bare tier name like "terra" the same way codexProvider resolves it for
+  // the API call itself), not the tier name stored on the topic/turn.
+  const pricedModel =
+    agentType === "codex" && Object.hasOwn(CODEX_TIER_FALLBACKS, model)
+      ? resolveCodexTierModel(model as CodexTier)
+      : model;
   const recordEventUsage = (usage: TokenUsage): void => {
     recordUsage(userId, topicTitle, usage, {
       topicId,
       ...(control.sessionId ? { providerSessionId: control.sessionId } : {}),
       agent: agentType,
-      model,
+      model: pricedModel,
     });
   };
   const broadcastContextProgress = (force = false): void => {

package/dist/runtime/src/storage/token-stats.ts

@@ -124,7 +124,8 @@ const TOKEN_PRICES: Record<string, TokenPrices> = {
   "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 },
-  // GPT-5.6 Sol/Luna are retired aliases of gpt-6-sol/gpt-6-luna, but historical usage rows still
+  "codex:gpt-6.1-terra": { input: 1, cacheRead: 0.05, output: 5 },
+  // GPT-5.6 Sol/Luna/Terra are retired aliases, but historical usage rows still
   // carry the old ids, so their prices stay for cost accounting.
   "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 },

package/dist/runtime/src/version.ts

@@ -1 +1 @@
-export const NEGOTIUM_VERSION = "0.23.1";
+export const NEGOTIUM_VERSION = "0.23.2";

package/dist/storage.js

@@ -4364,6 +4364,7 @@ var TOKEN_PRICES = {
   "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 },
@@ -5186,4 +5187,4 @@ export {
   ConversationLogDivergedError
 };
 
-//# debugId=0E6C4F3F0C7EF59464756E2164756E21
+//# debugId=B9550B6DC8305D3264756E2164756E21