chainlesschain 0.166.101 → 0.166.102

package/src/commands/agent.js

@@ -308,6 +308,10 @@ export function registerAgentCommand(program, dependencies = {}) {
       "LLM provider (ollama, openai, volcengine, deepseek, ...)",
     )
     .option("--base-url <url>", "API base URL")
+    .option(
+      "--service-tier <tier>",
+      "Reviewed provider service tier (standard, fast, flex, ultrafast)",
+    )
     .option("--api-key <key>", "API key")
     .option(
       "--think [level]",
@@ -769,8 +773,9 @@ export function registerAgentCommand(program, dependencies = {}) {
       // --capabilities: print the machine-readable manifest and exit — no
       // config, no bootstrap, no network (gap-analysis 2026-07-11 快速收益 #6).
       if (options.capabilities) {
-        const { buildAgentCapabilities } =
-          await import("../lib/headless-manifest.js");
+        const { buildAgentCapabilities } = await import(
+          "../lib/headless-manifest.js"
+        );
         console.log(JSON.stringify(buildAgentCapabilities(), null, 2));
         return;
       }
@@ -789,8 +794,9 @@ export function registerAgentCommand(program, dependencies = {}) {
       let toolAdmission = null;
       if (process.env.CC_TOOL_ADMISSION) {
         try {
-          const { parseToolAdmissionConfig } =
-            await import("../lib/agent-tool-admission.js");
+          const { parseToolAdmissionConfig } = await import(
+            "../lib/agent-tool-admission.js"
+          );
           toolAdmission = parseToolAdmissionConfig(
             process.env.CC_TOOL_ADMISSION,
           );
@@ -878,8 +884,9 @@ export function registerAgentCommand(program, dependencies = {}) {
       // screen readers (mono theme + no repainting status line). Applied
       // before anything renders.
       {
-        const { screenReaderRequested, applyScreenReaderMode } =
-          await import("../lib/accessibility.js");
+        const { screenReaderRequested, applyScreenReaderMode } = await import(
+          "../lib/accessibility.js"
+        );
         if (screenReaderRequested(options)) {
           applyScreenReaderMode();
         }
@@ -912,8 +919,9 @@ export function registerAgentCommand(program, dependencies = {}) {
       };
       if (options.worktree !== undefined || backgroundRequested) {
         try {
-          const { resolveBackgroundWorktreePolicy } =
-            await import("../lib/background-worktree-policy.js");
+          const { resolveBackgroundWorktreePolicy } = await import(
+            "../lib/background-worktree-policy.js"
+          );
           worktreeDecision = resolveBackgroundWorktreePolicy({
             background: backgroundRequested,
             worktree: options.worktree,
@@ -965,8 +973,9 @@ export function registerAgentCommand(program, dependencies = {}) {
       };
       if (worktreeDecision.enabled) {
         try {
-          const { setupAgentWorktree, finishAgentWorktree } =
-            await import("../lib/agent-worktree.js");
+          const { setupAgentWorktree, finishAgentWorktree } = await import(
+            "../lib/agent-worktree.js"
+          );
           _finishAgentWorktreeFn = finishAgentWorktree;
           const detectedRepoRoot = worktreeDecision.repoRoot || invocationCwd;
           const worktreeCwd =
@@ -994,8 +1003,9 @@ export function registerAgentCommand(program, dependencies = {}) {
             const { loadHooks } = await import("../lib/settings-hooks.cjs");
             _worktreeSettingsHooks =
               loadHooks({ cwd: _worktree.repoRoot }).hooks || null;
-            const { runWorktreeCreateHooks, dispatchAsyncHooks } =
-              await import("../lib/settings-hook-events.js");
+            const { runWorktreeCreateHooks, dispatchAsyncHooks } = await import(
+              "../lib/settings-hook-events.js"
+            );
             await runWorktreeCreateHooks(_worktreeSettingsHooks, {
               worktreePath: _worktree.path,
               branch: _worktree.branch,
@@ -1003,8 +1013,9 @@ export function registerAgentCommand(program, dependencies = {}) {
               cwd: _worktree.path,
             });
             if (!_worktreeAsyncSupervisor) {
-              const { AsyncHookSupervisor } =
-                await import("../lib/async-hook-supervisor.js");
+              const { AsyncHookSupervisor } = await import(
+                "../lib/async-hook-supervisor.js"
+              );
               _worktreeAsyncSupervisor = new AsyncHookSupervisor({
                 persistStats: true,
               });
@@ -1089,8 +1100,9 @@ export function registerAgentCommand(program, dependencies = {}) {
       // Claude-Code parity: auto-checkpoint defaults ON inside a git repo
       // (shadow-commit engine, zero working-tree touch); explicit
       // --checkpoint / --no-checkpoint always wins.
-      const { resolveAutoCheckpoint } =
-        await import("../lib/auto-checkpoint-default.js");
+      const { resolveAutoCheckpoint } = await import(
+        "../lib/auto-checkpoint-default.js"
+      );
       const autoCheckpoint = resolveAutoCheckpoint({
         flagValue: options.checkpoint,
         flagSource: command?.getOptionValueSource?.("checkpoint"),
@@ -1118,8 +1130,9 @@ export function registerAgentCommand(program, dependencies = {}) {
           options.outputFormat !== "text" ||
           !process.stdin.isTTY;
         if (headlessIntent) {
-          const { getLastLogicalSessionId } =
-            await import("../lib/session-transcript-migration.js");
+          const { getLastLogicalSessionId } = await import(
+            "../lib/session-transcript-migration.js"
+          );
           const database =
             sessionBootstrapContext.db?.getDatabase?.() ||
             sessionBootstrapContext.db?.getDb?.() ||
@@ -1127,8 +1140,9 @@ export function registerAgentCommand(program, dependencies = {}) {
           options.session = getLastLogicalSessionId(database);
         } else {
           // Interactive: picker across both stores (agent REPL rebuilds either).
-          const { pickRecentSession } =
-            await import("../lib/session-picker.js");
+          const { pickRecentSession } = await import(
+            "../lib/session-picker.js"
+          );
           const picked = await pickRecentSession(sessionBootstrapContext, {
             message: "Resume which agent session?",
           });
@@ -1154,8 +1168,9 @@ export function registerAgentCommand(program, dependencies = {}) {
         // diagnostics belong on stderr; stdout may already be reserved for a
         // JSON/NDJSON protocol selected by this command.
         await withQuietStdout(async () => {
-          const { sessionHasPersistedEvidence } =
-            await import("../harness/jsonl-session-store.js");
+          const { sessionHasPersistedEvidence } = await import(
+            "../harness/jsonl-session-store.js"
+          );
           if (!sessionHasPersistedEvidence(options.session)) {
             const [{ bootstrap }, { ensureCanonicalSessionFromDatabase }] =
               await Promise.all([
@@ -1185,8 +1200,9 @@ export function registerAgentCommand(program, dependencies = {}) {
       // a no-op (silent) for a fresh run.
       if (options.forkSession && options.session) {
         const store = await import("../harness/jsonl-session-store.js");
-        const { applyForkSession } =
-          await import("../runtime/headless-runner.js");
+        const { applyForkSession } = await import(
+          "../runtime/headless-runner.js"
+        );
         const fork = applyForkSession(
           {
             forkSession: true,
@@ -1259,8 +1275,9 @@ export function registerAgentCommand(program, dependencies = {}) {
       let settingsSandbox = null;
       let managedSettingsSandbox = null;
       try {
-        const { loadSettingsConfig } =
-          await import("../lib/settings-loader.cjs");
+        const { loadSettingsConfig } = await import(
+          "../lib/settings-loader.cjs"
+        );
         const sc = loadSettingsConfig({
           cwd: process.cwd(),
           settingsFile: options.settings || null,
@@ -1451,8 +1468,9 @@ export function registerAgentCommand(program, dependencies = {}) {
       // never pollutes spawned-bin test stderr.
       if (!process.env.VITEST && !process.env.VITEST_WORKER_ID) {
         try {
-          const { maybeWarnDeprecatedModel } =
-            await import("../lib/model-deprecation.js");
+          const { maybeWarnDeprecatedModel } = await import(
+            "../lib/model-deprecation.js"
+          );
           maybeWarnDeprecatedModel({ model: options.model });
         } catch {
           /* fail-open: a deprecation notice must never affect the run */
@@ -1536,8 +1554,9 @@ export function registerAgentCommand(program, dependencies = {}) {
         ) {
           decisionConfig = Object.freeze({ mode: "off" });
         } else {
-          const { resolveHeadlessSkillDecisionOptions } =
-            await import("../runtime/headless-runner.js");
+          const { resolveHeadlessSkillDecisionOptions } = await import(
+            "../runtime/headless-runner.js"
+          );
           decisionConfig = resolveHeadlessSkillDecisionOptions(options);
         }
       } catch (error) {
@@ -1599,8 +1618,9 @@ export function registerAgentCommand(program, dependencies = {}) {
           process.exit(1);
           return;
         }
-        const { runAgentHeadlessStream } =
-          await import("../runtime/headless-stream.js");
+        const { runAgentHeadlessStream } = await import(
+          "../runtime/headless-stream.js"
+        );
         const { parseToolList, validateHeadlessInvocationOptions } =
           await import("../runtime/headless-runner.js");
         const cwd = process.cwd();
@@ -1859,8 +1879,9 @@ export function registerAgentCommand(program, dependencies = {}) {
         // presenting a fresh conversation as a successful resume.
         if (resumeRequested && options.session) {
           const hasPersistedEvidence = await withQuietStdout(async () => {
-            const { sessionHasPersistedEvidence } =
-              await import("../harness/jsonl-session-store.js");
+            const { sessionHasPersistedEvidence } = await import(
+              "../harness/jsonl-session-store.js"
+            );
             return sessionHasPersistedEvidence(options.session);
           });
           if (!hasPersistedEvidence) {
@@ -1870,14 +1891,16 @@ export function registerAgentCommand(program, dependencies = {}) {
             );
           }
         }
-        const { runAgentHeadless, parseToolList } =
-          await import("../runtime/headless-runner.js");
+        const { runAgentHeadless, parseToolList } = await import(
+          "../runtime/headless-runner.js"
+        );
         // --goal-condition: validate the spec up front so a bad prefix fails
         // fast (before any model call) with a clear message.
         if (options.goalCondition) {
           try {
-            const { parseGoalCondition } =
-              await import("../lib/goal-condition-engine.js");
+            const { parseGoalCondition } = await import(
+              "../lib/goal-condition-engine.js"
+            );
             parseGoalCondition(options.goalCondition);
           } catch (e) {
             process.stderr.write(`--goal-condition: ${e.message}\n`);
@@ -1896,8 +1919,9 @@ export function registerAgentCommand(program, dependencies = {}) {
           : null;
         let evolutionComposition;
         try {
-          const { validateHeadlessInvocationOptions } =
-            await import("../runtime/headless-runner.js");
+          const { validateHeadlessInvocationOptions } = await import(
+            "../runtime/headless-runner.js"
+          );
           validateHeadlessInvocationOptions({
             outputFormat: options.outputFormat,
             permissionMode: options.permissionMode,

package/src/data/changelog.json

@@ -1,6 +1,19 @@
 {
   "source": "CHANGELOG.md",
   "releases": [
+    {
+      "productVersion": null,
+      "cliVersion": "0.166.102",
+      "cliVersions": ["0.166.102"],
+      "date": null,
+      "title": "",
+      "sections": [
+        {
+          "heading": "Fixed - cc CLI 0.166.102: restore session pricing validation",
+          "body": "- Accept the reviewed Priority and Ultrafast pricing terms when validating the\n  built-in model catalog, restoring session observability, budget and Eval\n  projections while continuing to reject unknown tiers and invalid multipliers.\n- Make the model-switch warning regression insensitive to source formatting.\n- Publish Personal Data Hub 0.4.65 with source snapshots in answer citations\n  before CLI 0.166.102, then pair VS Code 0.37.146 and JetBrains 0.4.164 after\n  the exact release commit passes its complete Actions gates."
+        }
+      ]
+    },
     {
       "productVersion": null,
       "cliVersion": "0.166.101",

package/src/lib/config-schema.js

@@ -69,6 +69,19 @@ const DESCRIPTORS = [
     default: DEFAULT_CONFIG.llm.model,
     description: "Default model id",
   }),
+  descriptor("llm.serviceTier", "string", {
+    enum: [
+      "standard",
+      "default",
+      "auto",
+      "fast",
+      "priority",
+      "flex",
+      "ultrafast",
+    ],
+    description:
+      "Requested live service tier; model and endpoint support are checked before dispatch",
+  }),
   descriptor("llm.visionModel", ["string", "null"], {
     description: "Model used for image turns",
   }),
@@ -502,11 +515,11 @@ function valueIssue(key, code, message) {
 function isPersistedSecretRef(value) {
   return Boolean(
     value &&
-    typeof value === "object" &&
-    !Array.isArray(value) &&
-    Object.keys(value).length === 1 &&
-    typeof value.__cc_secret_ref === "string" &&
-    value.__cc_secret_ref.length > 0,
+      typeof value === "object" &&
+      !Array.isArray(value) &&
+      Object.keys(value).length === 1 &&
+      typeof value.__cc_secret_ref === "string" &&
+      value.__cc_secret_ref.length > 0,
   );
 }
 

package/src/lib/context-memory-kernel/memory-query-index.js

@@ -2,6 +2,9 @@ import { createHash } from "node:crypto";
 
 export const MEMORY_QUERY_INDEX_SCHEMA = "chainlesschain.memory-query-index/v1";
 const CURSOR_SCHEMA = "chainlesschain.memory-list-cursor/v1";
+// Preserve the existing English collation while avoiding constructing locale
+// options for every comparison during shard sorts, cursor search and merging.
+const memoryRowCollator = new Intl.Collator("en");
 
 export function queryDigest(bytes) {
   return `sha256:${createHash("sha256").update(bytes).digest("hex")}`;
@@ -10,8 +13,8 @@ export function queryDigest(bytes) {
 export function compareMemoryRows(left, right) {
   return (
     right.importance - left.importance ||
-    right.updatedAt.localeCompare(left.updatedAt, "en") ||
-    left.memoryId.localeCompare(right.memoryId, "en")
+    memoryRowCollator.compare(right.updatedAt, left.updatedAt) ||
+    memoryRowCollator.compare(left.memoryId, right.memoryId)
   );
 }
 

package/src/lib/context-memory-kernel/runtime.js

@@ -22,6 +22,10 @@ export function createCliContextMemoryRuntime(options = {}) {
   const memoryPort =
     options.memoryPort ||
     new SegmentedMemoryPort({
+      queryIndexCacheMode:
+        options.memoryQueryIndexCacheMode ||
+        (options.env || process.env).CC_CONTEXT_MEMORY_QUERY_CACHE ||
+        "validate-disk",
       readOnly: !decision.canonical,
       ...(options.memoryFilePath ? { filePath: options.memoryFilePath } : {}),
     });

package/src/lib/context-memory-kernel/segmented-memory-port.js

@@ -170,6 +170,7 @@ export class SegmentedMemoryPort extends DurableJsonMemoryPort {
     maxTotalBytes = DEFAULT_MAX_TOTAL_BYTES,
     maxEvents = DEFAULT_SEGMENTED_MAX_EVENTS,
     readOnly = false,
+    queryIndexCacheMode = "validate-disk",
     ...options
   } = {}) {
     super({ ...options, maxEvents });
@@ -177,6 +178,9 @@ export class SegmentedMemoryPort extends DurableJsonMemoryPort {
       throw new TypeError("maxTotalBytes must be a positive safe integer");
     this.maxTotalBytes = maxTotalBytes;
     this.readOnly = Boolean(readOnly);
+    if (!["validate-disk", "verified-memory"].includes(queryIndexCacheMode))
+      throw new TypeError("Unknown query index cache mode");
+    this.queryIndexCacheMode = queryIndexCacheMode;
     this.filePath = resolve(this.filePath);
     this.shardDirectory = `${this.filePath}.shards`;
     this._queryIndexes = new Map();
@@ -656,6 +660,27 @@ export class SegmentedMemoryPort extends DurableJsonMemoryPort {
 
   _readQueryIndex(manifest, bucket) {
     const descriptor = manifest.shards[bucket];
+    const binding = JSON.stringify([
+      manifest.digest,
+      manifest.storeRevision,
+      descriptor.digest,
+      descriptor.queryDigest,
+      descriptor.queryBytes,
+      descriptor.recordCount,
+    ]);
+    const cached = this._queryIndexes.get(bucket);
+    // This is an already verified, host-owned decoded snapshot, never a trust
+    // decision based on filesystem timestamps. Re-read and verify the current
+    // manifest on every operation; any generation/authority change invalidates
+    // this binding. Selected authority shards are still read and verified.
+    // Disk repair remains eager in validate-disk mode; verified-memory repairs
+    // a derived index on the next cache miss, rather than every warm query.
+    if (
+      this.queryIndexCacheMode === "verified-memory" &&
+      descriptor.queryDigest &&
+      cached?.binding === binding
+    )
+      return cached.index;
     let bytes;
     if (descriptor.queryDigest) {
       const file = this._queryIndexPath(bucket, descriptor);
@@ -705,8 +730,8 @@ export class SegmentedMemoryPort extends DurableJsonMemoryPort {
       bytes = encodeQueryIndex(this._readShard(manifest, bucket));
     }
     const digest = descriptor.queryDigest || queryDigest(bytes);
-    const cached = this._queryIndexes.get(bucket);
-    if (cached?.digest === digest) return cached.index;
+    if (cached?.digest === digest && cached.binding === binding)
+      return cached.index;
     let index;
     try {
       index = compileQueryIndex(bytes, descriptor);
@@ -717,7 +742,7 @@ export class SegmentedMemoryPort extends DurableJsonMemoryPort {
         cause,
       );
     }
-    this._queryIndexes.set(bucket, { digest, index });
+    this._queryIndexes.set(bucket, { digest, binding, index });
     return index;
   }
 

package/src/lib/context-source-ledger.js

@@ -40,7 +40,28 @@ class ContextSourceLedger {
    * @returns {string} entryId
    */
   record(entry) {
+    if (
+      entry.tokenCount != null &&
+      (!Number.isSafeInteger(entry.tokenCount) || entry.tokenCount < 0)
+    ) {
+      throw new TypeError(
+        "Context tokenCount must be a non-negative safe integer",
+      );
+    }
     const entryId = entry.entryId || crypto.randomUUID();
+    const previous = this._entries.get(entryId);
+    if (previous) {
+      for (const [index, key] of [
+        [this._byTurn, previous.turnId],
+        [this._bySession, previous.sessionId],
+      ]) {
+        const remaining = (index.get(key) || []).filter(
+          (item) => item.entryId !== entryId,
+        );
+        if (remaining.length) index.set(key, remaining);
+        else index.delete(key);
+      }
+    }
     const full = {
       entryId,
       traceId: entry.traceId || null,
@@ -53,6 +74,7 @@ class ContextSourceLedger {
       summary: entry.summary,
       metadata: entry.metadata,
       tokenCount: entry.tokenCount || 0,
+      tokenBasis: entry.tokenBasis === "observed" ? "observed" : "estimated",
       insertedAt: new Date(),
       tags: entry.tags || [],
     };
@@ -64,7 +86,8 @@ class ContextSourceLedger {
     this._byTurn.get(full.turnId).push(full);
 
     // Index by session
-    if (!this._bySession.has(full.sessionId)) this._bySession.set(full.sessionId, []);
+    if (!this._bySession.has(full.sessionId))
+      this._bySession.set(full.sessionId, []);
     this._bySession.get(full.sessionId).push(full);
 
     return entryId;
@@ -82,6 +105,7 @@ class ContextSourceLedger {
       summary: entry.summary || entry.content,
       metadata: entry.metadata,
       tokenCount: entry.tokenCount ?? entry.tokens ?? 0,
+      tokenBasis: entry.tokenBasis,
       traceId: entry.traceId,
     });
   }
@@ -95,14 +119,31 @@ class ContextSourceLedger {
   }
 
   /** Aggregate token usage by source type. */
-  getTokenBreakdown() {
-    const bySource = {};
+  getTokenBreakdown(options = {}) {
+    const sources = new Map();
     let total = 0;
-    for (const entry of this._entries.values()) {
+    for (const entry of this.getProvenance(options)) {
       total += entry.tokenCount;
-      bySource[entry.sourceType] = (bySource[entry.sourceType] || 0) + entry.tokenCount;
+      sources.set(
+        entry.sourceType,
+        (sources.get(entry.sourceType) || 0) + entry.tokenCount,
+      );
     }
-    return { total, bySource };
+    return { total, bySource: Object.fromEntries(sources) };
+  }
+
+  /** Source attribution is separate from provider request usage and billing. */
+  getTokenReport(options = {}) {
+    const entries = this.getProvenance(options);
+    const byBasis = { estimated: 0, observed: 0 };
+    for (const entry of entries) byBasis[entry.tokenBasis] += entry.tokenCount;
+    return {
+      ...this.getTokenBreakdown(options),
+      byBasis,
+      entries: entries.length,
+      currentRequestVerified: false,
+      billingVerified: false,
+    };
   }
 
   /** Clear the in-memory ledger (test/runtime lifecycle boundary). */
@@ -146,7 +187,8 @@ class ContextSourceLedger {
 
     for (const e of entries) {
       byType[e.sourceType] = (byType[e.sourceType] || 0) + 1;
-      byPermission[e.permissionMode] = (byPermission[e.permissionMode] || 0) + 1;
+      byPermission[e.permissionMode] =
+        (byPermission[e.permissionMode] || 0) + 1;
       bySource[e.sourceId] = (bySource[e.sourceId] || 0) + 1;
       totalTokens += e.tokenCount;
       avgConfidence += e.confidence;
@@ -162,7 +204,7 @@ class ContextSourceLedger {
       byType,
       byPermission,
       bySource,
-      entries: entries.map(e => ({
+      entries: entries.map((e) => ({
         sourceType: e.sourceType,
         sourceId: e.sourceId,
         permissionMode: e.permissionMode,
@@ -184,8 +226,9 @@ class ContextSourceLedger {
       this._entries.delete(e.entryId);
       const turnEntries = this._byTurn.get(e.turnId);
       if (turnEntries) {
-        const idx = turnEntries.findIndex(x => x.entryId === e.entryId);
+        const idx = turnEntries.findIndex((x) => x.entryId === e.entryId);
         if (idx >= 0) turnEntries.splice(idx, 1);
+        if (!turnEntries.length) this._byTurn.delete(e.turnId);
       }
     }
     this._bySession.delete(sessionId);

package/src/lib/goal-condition-engine.js

@@ -246,6 +246,16 @@ function whichLimitHit(state, budget, nowMs) {
  * the loop stops. Does NOT mutate `state` — returns the next one.
  */
 export function evaluateGoalStep(state, evaluation, budget, opts = {}) {
+  if (state.done === true) {
+    return {
+      state: { ...state },
+      decision:
+        state.outcome === "completed"
+          ? GOAL_DECISION.COMPLETE
+          : GOAL_DECISION.EXHAUSTED,
+      events: [],
+    };
+  }
   const nowMs = Number(opts.now ?? state.startedAtMs);
   const next = {
     ...state,
@@ -326,10 +336,23 @@ export class GoalConditionEngine {
 
   /** Accumulate a turn's usage before evaluating it. */
   recordTurnUsage({ tokens = 0, costUsd = 0 } = {}) {
+    if (
+      !Number.isSafeInteger(tokens) ||
+      tokens < 0 ||
+      typeof costUsd !== "number" ||
+      !Number.isFinite(costUsd) ||
+      costUsd < 0 ||
+      !Number.isSafeInteger(this.state.tokens + tokens) ||
+      !Number.isFinite(this.state.costUsd + costUsd)
+    ) {
+      throw new RangeError(
+        "Goal usage requires finite non-negative cost and safe token counts",
+      );
+    }
     this.state = {
       ...this.state,
-      tokens: this.state.tokens + (Number(tokens) || 0),
-      costUsd: this.state.costUsd + (Number(costUsd) || 0),
+      tokens: this.state.tokens + tokens,
+      costUsd: this.state.costUsd + costUsd,
     };
     return this.state;
   }

package/src/lib/llm-config-defaults.js

@@ -38,16 +38,18 @@ export async function reconcileConfigLlmProvider(cfgLlm = {}) {
   if (!cfgLlm || !cfgLlm.provider || !cfgLlm.baseUrl) {
     return { llm: cfgLlm, changed: false };
   }
-  const { inferProviderFromBaseUrl, modelForeignToProvider } =
-    await import("./runnable-provider.js");
+  const { inferProviderFromBaseUrl, modelForeignToProvider } = await import(
+    "./runnable-provider.js"
+  );
   const inferred = inferProviderFromBaseUrl(cfgLlm.baseUrl);
   if (!inferred || inferred === cfgLlm.provider) {
     return { llm: cfgLlm, changed: false };
   }
   const corrected = { ...cfgLlm, provider: inferred };
   if (modelForeignToProvider(inferred, cfgLlm.model)) {
-    const { selectModelForTask, TaskType } =
-      await import("./task-model-selector.js");
+    const { selectModelForTask, TaskType } = await import(
+      "./task-model-selector.js"
+    );
     const def = selectModelForTask(inferred, TaskType.CHAT);
     if (def) corrected.model = def;
   }
@@ -88,6 +90,8 @@ export function applyConfigLlmDefaults(options = {}, cfgLlm = {}, opts = {}) {
     options.provider === cfgLlm.provider
   ) {
     if (!options.baseUrl && cfgLlm.baseUrl) options.baseUrl = cfgLlm.baseUrl;
+    if (options.serviceTier == null && cfgLlm.serviceTier != null)
+      options.serviceTier = cfgLlm.serviceTier;
     backfillApiKey(options, cfgLlm);
     if (!options.model && !opts.explicitModel && cfgLlm.model) {
       options.model = cfgLlm.model;
@@ -96,6 +100,8 @@ export function applyConfigLlmDefaults(options = {}, cfgLlm = {}, opts = {}) {
   }
   if (options.provider || !cfgLlm.provider) return options;
   options.provider = cfgLlm.provider;
+  if (options.serviceTier == null && cfgLlm.serviceTier != null)
+    options.serviceTier = cfgLlm.serviceTier;
   if (opts.explicitModel) {
     options.model = opts.explicitModel;
   } else if (cfgLlm.model) {

package/src/lib/llm-pricing.js

@@ -67,6 +67,9 @@ export const PRICE_TABLE = Object.freeze({
         exact: true,
         terms: Object.freeze({
           ...GPT6_PRICING_TERMS,
+          ...(model.serviceMultipliers
+            ? { serviceMultipliers: model.serviceMultipliers }
+            : {}),
           ...(model.cacheReadMultiplier == null
             ? {}
             : { cacheReadMultiplier: model.cacheReadMultiplier }),
@@ -259,9 +262,16 @@ export function normalizePricingTerms(value) {
       Reflect.ownKeys(tiers).length === 0 ||
       Reflect.ownKeys(tiers).some(
         (key) =>
-          !["standard", "default", "auto", "batch", "flex", "fast"].includes(
-            key,
-          ) || !finite(tiers[key]),
+          ![
+            "standard",
+            "default",
+            "auto",
+            "batch",
+            "flex",
+            "fast",
+            "priority",
+            "ultrafast",
+          ].includes(key) || !finite(tiers[key]),
       )
     )
       fail();
@@ -378,7 +388,9 @@ export function estimateCost({
     ? Object.hasOwn(rate.terms.serviceMultipliers, serviceTier)
       ? rate.terms.serviceMultipliers[serviceTier]
       : null
-    : 1;
+    : ["standard", "default"].includes(serviceTier)
+      ? 1
+      : null;
   if (
     !rate ||
     tierMultiplier == null ||