tinker-agent 1.11.0 → 2.0.0

package/CHANGELOG.md

@@ -5,6 +5,21 @@ All notable user-facing changes to Tinker are documented here. The project follo
 
 ## [Unreleased]
 
+## [2.0.0] - 2026-08-20
+
+### Changed
+
+- Estimate image input locally with deterministic size buckets instead of a
+  provider-side token-estimation request. Images are normalized for orientation
+  and provider limits before estimation and upload, keeping preflight accounting
+  aligned with the payload sent to the model.
+
+### Removed
+
+- Remove the `tokenEstimator` model-profile setting. Existing image profiles must
+  delete that field; sessions created under the previous image policy remain
+  inspectable but cannot be resumed for execution.
+
 ## [1.11.0] - 2026-08-15
 
 ### Added
@@ -208,7 +223,8 @@ All notable user-facing changes to Tinker are documented here. The project follo
 - First formal npm release under the `tinker-agent` package name with the `tinker`
   executable.
 
-[Unreleased]: https://github.com/ishowshao/tinker/compare/v1.11.0...HEAD
+[Unreleased]: https://github.com/ishowshao/tinker/compare/v2.0.0...HEAD
+[2.0.0]: https://github.com/ishowshao/tinker/releases/tag/v2.0.0
 [1.11.0]: https://github.com/ishowshao/tinker/releases/tag/v1.11.0
 [1.10.1]: https://github.com/ishowshao/tinker/releases/tag/v1.10.1
 [1.9.0]: https://github.com/ishowshao/tinker/releases/tag/v1.9.0

package/README.md

@@ -194,7 +194,6 @@ Profile fields:
 | `includeReasoningContent` | No | JSON boolean | `false` | No | Replay provider reasoning_content in Chat Completions history; ignored by Responses. |
 | `stream` | No | JSON boolean | `true` | No | Use streaming transport for the selected model API. |
 | `inputModalities` | No | Normalized modality array | `["text"]` | No | Accepted model input modalities; normalizes to ["text"] or ["text", "image"]. |
-| `tokenEstimator` | With image | Object | — | Yes | Independent token estimator required for image profiles. |
 
 `reasoning` fields:
 
@@ -205,17 +204,6 @@ Profile fields:
 
 The optional `reasoning` object declares provider-specific effort values. Efforts must be unique non-whitespace strings, `reset` is reserved by the TUI command, and `defaultEffort` must appear in `supportedEfforts`. Omitting `reasoning` sends no effort parameter and disables `/reasoning` for that profile.
 
-`tokenEstimator` fields:
-
-| Field | Type / constraint | Secret | Description |
-| --- | --- | --- | --- |
-| `kind` | Literal `"moonshot-estimate-token-count-v1"` | No | Estimator protocol discriminator. |
-| `model` | Non-empty string | No | Estimator model name. |
-| `apiBase` | Non-empty string | No | Estimator API base URL. |
-| `apiKey` | Non-empty string | Yes | Estimator API credential. |
-| `timeoutMs` | Integer 1000–60000 | No | Estimator request timeout in milliseconds. |
-| `maxRetries` | Literal `0` | No | Estimator retry count; retries are disabled. |
-
 Text-only profile example:
 
 ```json
@@ -271,15 +259,7 @@ Image-capable profile example:
       "inputModalities": [
         "text",
         "image"
-      ],
-      "tokenEstimator": {
-        "kind": "moonshot-estimate-token-count-v1",
-        "model": "example-token-estimator",
-        "apiBase": "https://estimator.example.com/v1",
-        "apiKey": "your-estimator-api-key",
-        "timeoutMs": 30000,
-        "maxRetries": 0
-      }
+      ]
     }
   }
 }
@@ -370,7 +350,7 @@ configured profile.
 ### Image Input
 
 Image attachment is enabled only for a profile whose `inputModalities` explicitly
-includes `image` and which supplies a valid `tokenEstimator`. In the interactive
+includes `image`. In the interactive
 TUI, type `@` and select a file that is inside the workspace and visible to the
 workspace search rules. One-shot commands, clipboard image bytes, remote URLs, and
 files outside or ignored by the workspace search are not supported.
@@ -378,7 +358,11 @@ files outside or ignored by the workspace search are not supported.
 Tinker accepts PNG (not APNG), JPEG, and static WebP. It rejects GIF, animated
 WebP, and other formats. A message and provider request may contain at most eight
 images; each image may be at most 20 MiB, 4096 pixels on either edge, and 8,847,360
-pixels in total. See the
+pixels in total. Provider requests preserve smaller images and proportionally
+downscale larger images to a maximum 2048-pixel long edge. Context planning uses
+fixed local token buckets derived from the materialized dimensions and performs no
+independent token-estimator request. See the
+[`image token bucket design`](docs/image-token-bucket-estimation-design.md) and
 [`multimodal image input design`](docs/multimodal-image-input-design.md) for the
 complete fixed policy and persistence contract.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinker-agent",
-  "version": "1.11.0",
+  "version": "2.0.0",
   "description": "A personal coding agent with an interactive TUI and one-shot CLI.",
   "license": "Apache-2.0",
   "type": "module",

package/src/agent/context-meter.ts

@@ -2,13 +2,8 @@ import type { ModelContextBudget } from "../model/model-context-profile";
 import type {
   ModelRequestOutput,
   ModelUsage,
-  MaterializedModelRequest,
   PreparedModelRequest,
 } from "../model/model-client";
-import type {
-  InputTokenEstimate,
-  InputTokenEstimator,
-} from "../model/input-token-estimator";
 import {
   assertContextBudget,
   contextPressure,
@@ -68,7 +63,6 @@ export class ContextMeter {
   private anchor?: MeasuredContextAnchor;
   private lastProviderUsage?: ModelUsage;
   private calibrationIdentity?: string;
-  private readonly providerEstimateCache = new Map<string, InputTokenEstimate>();
 
   constructor(
     private readonly budget: ModelContextBudget,
@@ -129,13 +123,14 @@ export class ContextMeter {
     let guardedDeltaTokens: number | undefined;
     if (anchor === undefined) {
       source = "estimated_full";
-      usedInputTokens = Math.ceil(rawFullEstimate.totalTokens * correctionFactor);
+      usedInputTokens = guardedEstimate(rawFullEstimate, correctionFactor);
     } else {
       source = "measured_plus_estimated_delta";
-      rawDeltaTokens = estimatePromptSegments(
+      const rawDelta = estimatePromptSegments(
         prepared.promptSegments.slice(anchor.segmentCount),
-      ).totalTokens;
-      guardedDeltaTokens = Math.ceil(rawDeltaTokens * correctionFactor);
+      );
+      rawDeltaTokens = rawDelta.totalTokens;
+      guardedDeltaTokens = guardedEstimate(rawDelta, correctionFactor);
       usedInputTokens = anchor.totalTokens + guardedDeltaTokens;
     }
 
@@ -217,62 +212,6 @@ export class ContextMeter {
     };
   }
 
-  applyProviderEstimate(
-    prepared: PreparedModelRequest,
-    estimate: {
-      inputTokens: number;
-      coverage: "messages" | "full_request";
-    },
-  ): ContextUsageSnapshot {
-    if (!Number.isSafeInteger(estimate.inputTokens) || estimate.inputTokens < 0) {
-      throw new Error("Provider input estimate must be a non-negative safe integer.");
-    }
-    const local = this.measure(prepared);
-    const measurement = this.measurements.get(prepared)!;
-    const guardedTools =
-      estimate.coverage === "messages"
-        ? Math.ceil(
-            measurement.rawFullEstimate.toolSchemaTokens * local.correctionFactor,
-          )
-        : 0;
-    const providerGuarded = estimate.inputTokens + guardedTools;
-    if (providerGuarded <= local.usedInputTokens) {
-      return local;
-    }
-    const snapshot: ContextUsageSnapshot = {
-      ...local,
-      usedInputTokens: providerGuarded,
-      source: "provider_estimated",
-      pressure: contextPressure(providerGuarded, this.budget),
-    };
-    this.measurements.set(prepared, {
-      rawFullEstimate: measurement.rawFullEstimate,
-      snapshot,
-    });
-    return snapshot;
-  }
-
-  async estimateProviderInput(
-    prepared: MaterializedModelRequest,
-    estimator: InputTokenEstimator,
-    options: { signal: AbortSignal },
-  ): Promise<InputTokenEstimate> {
-    options.signal.throwIfAborted();
-    const key = providerEstimateCacheKey(
-      prepared,
-      estimator.compatibility.coverageVersion,
-    );
-    const cached = this.providerEstimateCache.get(key);
-    if (cached !== undefined) {
-      return cached;
-    }
-    const estimate = await estimator.estimate(prepared, options);
-    options.signal.throwIfAborted();
-    const frozen = Object.freeze({ ...estimate });
-    this.providerEstimateCache.set(key, frozen);
-    return frozen;
-  }
-
   assertWithinBudget(snapshot: ContextUsageSnapshot): void {
     assertContextBudget({
       usedInputTokens: snapshot.usedInputTokens,
@@ -295,7 +234,6 @@ export class ContextMeter {
       this.lastProviderUsage = undefined;
       this.measurements = new WeakMap();
       this.calibration.clear();
-      this.providerEstimateCache.clear();
       this.calibrationIdentity = nextIdentity;
       throw new Error(
         "Context revision changed the request configuration or tool schema.",
@@ -304,7 +242,6 @@ export class ContextMeter {
     this.anchor = undefined;
     this.lastProviderUsage = undefined;
     this.measurements = new WeakMap();
-    this.providerEstimateCache.clear();
     this.calibrationIdentity = nextIdentity;
   }
 
@@ -315,7 +252,6 @@ export class ContextMeter {
     this.measurements = new WeakMap();
     this.calibration.clear();
     this.calibrationIdentity = undefined;
-    this.providerEstimateCache.clear();
   }
 
   private usableAnchor(
@@ -330,10 +266,7 @@ export class ContextMeter {
       anchor.requestConfigHash !== prepared.requestConfigHash ||
       anchor.toolSchemaHash !== prepared.toolSchemaHash ||
       anchor.segmentCount > prepared.promptSegments.length ||
-      prefixHashes[anchor.segmentCount] !== anchor.prefixHash ||
-      prepared.promptSegments
-        .slice(anchor.segmentCount)
-        .some((segment) => (segment.media?.length ?? 0) > 0)
+      prefixHashes[anchor.segmentCount] !== anchor.prefixHash
     ) {
       this.anchor = undefined;
       return undefined;
@@ -359,18 +292,14 @@ export class ContextMeter {
   }
 }
 
-function providerEstimateCacheKey(
-  prepared: PreparedModelRequest,
-  coverageVersion: string,
-): string {
-  return [
-    prepared.requestConfigHash,
-    prepared.toolSchemaHash,
-    lastPromptPrefixHash(
-      promptPrefixHashes(prepared.requestConfigHash, prepared.promptSegments),
-    ),
-    coverageVersion,
-  ].join(":");
+function guardedEstimate(
+  breakdown: RawContextBreakdown,
+  correctionFactor: number,
+): number {
+  return (
+    Math.ceil(breakdown.textAndProtocolTokens * correctionFactor) +
+    breakdown.imageTokens
+  );
 }
 
 function assertMeasuredContextAnchor(anchor: MeasuredContextAnchor): void {

package/src/agent/loop.ts

@@ -175,20 +175,7 @@ export async function runAgent(input: RunAgentInput): Promise<RunAgentResult> {
             assetStore: input.assetStore,
             signal: input.signal,
           });
-          if (preflight.source === "measured_plus_estimated_delta") {
-            preflight = input.contextMeter.measure(request);
-          } else {
-            const estimator = input.model.inputTokenEstimator;
-            if (estimator === undefined) {
-              throw new Error("Image model request has no input token estimator.");
-            }
-            const estimate = await input.contextMeter.estimateProviderInput(
-              request as MaterializedModelRequest,
-              estimator,
-              { signal: input.signal },
-            );
-            preflight = input.contextMeter.applyProviderEstimate(request, estimate);
-          }
+          preflight = input.contextMeter.measure(request);
           input.contextMeter.assertWithinBudget(preflight);
           await input.runtimeSession.append({
             type: "context.usage.updated",

package/src/agent/runtime-session.ts

@@ -581,11 +581,6 @@ class DefaultRuntimeSession implements RuntimeSession {
         contextProfile: input.contextProfile,
         messageProtocol: input.modelClient.messageProtocol,
         inputModalities: input.modelClient.inputModalities ?? ["text"],
-        ...(input.modelClient.inputTokenEstimator === undefined
-          ? {}
-          : {
-              tokenEstimator: input.modelClient.inputTokenEstimator.compatibility,
-            }),
       });
       if (input.selection.mode === "resume") {
         store.assertSessionCompatibility(compatibility);
@@ -1641,24 +1636,6 @@ class DefaultRuntimeSession implements RuntimeSession {
         { assetStore: this.assetStore, signal: controller.signal },
       );
       admissionSnapshot = this.contextMeter.measure(admissionPrepared);
-      if (
-        prepared.mediaOccurrenceCount > 0 &&
-        admissionSnapshot.source !== "measured_plus_estimated_delta"
-      ) {
-        const estimator = this.input.modelClient.inputTokenEstimator;
-        if (estimator === undefined) {
-          throw new Error("Image model request has no input token estimator.");
-        }
-        const estimate = await this.contextMeter.estimateProviderInput(
-          admissionPrepared,
-          estimator,
-          { signal: controller.signal },
-        );
-        admissionSnapshot = this.contextMeter.applyProviderEstimate(
-          admissionPrepared,
-          estimate,
-        );
-      }
       this.contextMeter.assertWithinBudget(admissionSnapshot);
       controller.signal.throwIfAborted();
       const turn = this.stageTurn(input.userMessage);

package/src/cli/config.ts

@@ -14,7 +14,6 @@ import {
   type ModelInputModality,
   type ModelProfile,
   type ModelProfiles,
-  type ModelTokenEstimatorProfile,
   unknownProfileError,
 } from "./model-profiles";
 import type { MemoryEmbeddingConfig } from "../memory/contracts";
@@ -40,7 +39,6 @@ export type RunnerConfig = {
   readonly contextBudget: ModelContextBudget;
   readonly profileName?: string;
   readonly inputModalities: readonly ModelInputModality[];
-  readonly tokenEstimator?: ModelTokenEstimatorProfile;
   readonly bashGuardMode: "guard" | "yolo";
   readonly bashGuardSource: "default" | "environment" | "cli";
 };
@@ -184,9 +182,6 @@ function runnerConfigTemplateFromProfile(
     inputModalities: profile.inputModalities,
     bashGuardMode: environment.bashGuardMode,
     bashGuardSource: environment.bashGuardSource,
-    ...(profile.tokenEstimator === undefined
-      ? {}
-      : { tokenEstimator: profile.tokenEstimator }),
   });
 }
 

package/src/cli/model-profiles.ts

@@ -10,9 +10,6 @@ import {
   MODEL_PROFILE_FIELDS,
   MODEL_PROFILES_DOCUMENT_FIELDS,
   MODEL_REASONING_FIELDS,
-  MODEL_TOKEN_ESTIMATOR_FIELDS,
-  type ModelTokenEstimatorKind,
-  type ModelTokenEstimatorMaxRetries,
 } from "./public-config-contract";
 import type { MemoryEmbeddingConfig } from "../memory/contracts";
 import type { ReasoningEffortConfig } from "../model/reasoning-effort";
@@ -29,20 +26,10 @@ export type ModelProfile = {
   readonly includeReasoningContent: boolean;
   readonly stream: boolean;
   readonly inputModalities: readonly ModelInputModality[];
-  readonly tokenEstimator?: ModelTokenEstimatorProfile;
 };
 
 export type ModelInputModality = "text" | "image";
 
-export type ModelTokenEstimatorProfile = {
-  readonly kind: ModelTokenEstimatorKind;
-  readonly model: string;
-  readonly apiBase: string;
-  readonly apiKey: string;
-  readonly timeoutMs: number;
-  readonly maxRetries: ModelTokenEstimatorMaxRetries;
-};
-
 export type ModelProfiles = {
   readonly defaultProfile: string;
   readonly profiles: ReadonlyMap<string, ModelProfile>;
@@ -285,16 +272,6 @@ function parseProfile(
     value.inputModalities,
     `${where}: "inputModalities"`,
   );
-  const tokenEstimator =
-    value.tokenEstimator === undefined
-      ? undefined
-      : parseTokenEstimator(value.tokenEstimator, `${where}: "tokenEstimator"`);
-  if (inputModalities.includes("image") && tokenEstimator === undefined) {
-    throw new Error(
-      `${where}: image input requires a complete "tokenEstimator" configuration.`,
-    );
-  }
-
   createModelContextProfile({
     contextWindowTokens,
     maxSupportedOutputTokens,
@@ -312,7 +289,6 @@ function parseProfile(
     includeReasoningContent,
     stream,
     inputModalities,
-    ...(tokenEstimator === undefined ? {} : { tokenEstimator }),
   });
 }
 
@@ -434,54 +410,7 @@ function parseInputModalities(
   );
 }
 
-function parseTokenEstimator(value: unknown, name: string): ModelTokenEstimatorProfile {
-  if (!isRecord(value)) {
-    throw new Error(`${name} must be an object.`);
-  }
-  assertKnownKeys(
-    value,
-    MODEL_TOKEN_ESTIMATOR_FIELDS.map((field) => field.name),
-    name,
-  );
-  const kindField = tokenEstimatorField("kind");
-  if (value.kind !== kindField.literalValue) {
-    throw new Error(`${name}.kind must be ${JSON.stringify(kindField.literalValue)}.`);
-  }
-  const model = parseTokenEstimatorString(value, "model", name);
-  const apiBase = parseTokenEstimatorString(value, "apiBase", name);
-  const apiKey = parseTokenEstimatorString(value, "apiKey", name);
-  const timeoutField = tokenEstimatorField("timeoutMs");
-  if (timeoutField.valueKind !== "positive-integer") {
-    throw new Error("Token estimator timeoutMs contract kind is invalid.");
-  }
-  const timeoutMs = requirePositiveInteger(value.timeoutMs, `${name}.timeoutMs`);
-  if (
-    timeoutField.minimum === undefined ||
-    timeoutField.maximum === undefined ||
-    timeoutMs < timeoutField.minimum ||
-    timeoutMs > timeoutField.maximum
-  ) {
-    throw new Error(
-      `${name}.timeoutMs must be between ${timeoutField.minimum} and ${timeoutField.maximum}.`,
-    );
-  }
-  const maxRetriesField = tokenEstimatorField("maxRetries");
-  if (value.maxRetries !== maxRetriesField.literalValue) {
-    throw new Error(`${name}.maxRetries must be ${maxRetriesField.literalValue}.`);
-  }
-  return Object.freeze({
-    kind: kindField.literalValue,
-    model,
-    apiBase,
-    apiKey,
-    timeoutMs,
-    maxRetries: maxRetriesField.literalValue,
-  });
-}
-
 type ModelProfileFieldName = (typeof MODEL_PROFILE_FIELDS)[number]["name"];
-type ModelTokenEstimatorFieldName =
-  (typeof MODEL_TOKEN_ESTIMATOR_FIELDS)[number]["name"];
 
 function modelProfileField<Name extends ModelProfileFieldName>(
   name: Name,
@@ -496,21 +425,6 @@ function modelProfileField<Name extends ModelProfileFieldName>(
   >;
 }
 
-function tokenEstimatorField<Name extends ModelTokenEstimatorFieldName>(
-  name: Name,
-): Extract<(typeof MODEL_TOKEN_ESTIMATOR_FIELDS)[number], { readonly name: Name }> {
-  const field = MODEL_TOKEN_ESTIMATOR_FIELDS.find(
-    (candidate) => candidate.name === name,
-  );
-  if (field === undefined) {
-    throw new Error(`Missing token estimator field contract for ${name}.`);
-  }
-  return field as Extract<
-    (typeof MODEL_TOKEN_ESTIMATOR_FIELDS)[number],
-    { readonly name: Name }
-  >;
-}
-
 function parseProfileString(
   value: Record<string, unknown>,
   name: "model" | "apiBase" | "apiKey",
@@ -555,18 +469,6 @@ function parseProfileBoolean(
     : parseBoolean(value[name], `${where}: ${JSON.stringify(name)}`);
 }
 
-function parseTokenEstimatorString(
-  value: Record<string, unknown>,
-  name: "model" | "apiBase" | "apiKey",
-  where: string,
-): string {
-  const field = tokenEstimatorField(name);
-  if (field.valueKind !== "non-empty-string") {
-    throw new Error(`Token estimator field ${name} has an invalid contract kind.`);
-  }
-  return requireString(value[name], `${where}.${name}`);
-}
-
 function assertKnownKeys(
   value: Record<string, unknown>,
   allowed: readonly string[],

package/src/cli/public-config-contract.ts

@@ -242,11 +242,7 @@ export const PUBLIC_CONFIG_FIELDS = Object.freeze([
 
 export type ModelProfileField = {
   readonly name: string;
-  readonly valueKind:
-    | PublicConfigValueKind
-    | "input-modalities"
-    | "reasoning"
-    | "token-estimator";
+  readonly valueKind: PublicConfigValueKind | "input-modalities" | "reasoning";
   readonly required: boolean;
   readonly defaultValue?: string | number | boolean | readonly string[];
   readonly secret: boolean;
@@ -337,13 +333,6 @@ export const MODEL_PROFILE_FIELDS = Object.freeze([
     description:
       'Accepted model input modalities; normalizes to ["text"] or ["text", "image"].',
   }),
-  profileField({
-    name: "tokenEstimator",
-    valueKind: "token-estimator",
-    required: false,
-    secret: true,
-    description: "Independent token estimator required for image profiles.",
-  }),
 ]);
 
 export type ModelReasoningField = {
@@ -375,82 +364,6 @@ export const MODEL_REASONING_FIELDS = Object.freeze([
   }),
 ]);
 
-export type ModelTokenEstimatorField = {
-  readonly name: string;
-  readonly valueKind: PublicConfigValueKind | "literal-string" | "literal-number";
-  readonly required: true;
-  readonly secret: boolean;
-  readonly literalValue?: string | number;
-  readonly minimum?: number;
-  readonly maximum?: number;
-  readonly description: string;
-};
-
-function estimatorField<const T extends ModelTokenEstimatorField>(
-  field: T,
-): Readonly<T> {
-  return Object.freeze(field);
-}
-
-export const MODEL_TOKEN_ESTIMATOR_FIELDS = Object.freeze([
-  estimatorField({
-    name: "kind",
-    valueKind: "literal-string",
-    required: true,
-    secret: false,
-    literalValue: "moonshot-estimate-token-count-v1",
-    description: "Estimator protocol discriminator.",
-  }),
-  estimatorField({
-    name: "model",
-    valueKind: "non-empty-string",
-    required: true,
-    secret: false,
-    description: "Estimator model name.",
-  }),
-  estimatorField({
-    name: "apiBase",
-    valueKind: "non-empty-string",
-    required: true,
-    secret: false,
-    description: "Estimator API base URL.",
-  }),
-  estimatorField({
-    name: "apiKey",
-    valueKind: "non-empty-string",
-    required: true,
-    secret: true,
-    description: "Estimator API credential.",
-  }),
-  estimatorField({
-    name: "timeoutMs",
-    valueKind: "positive-integer",
-    required: true,
-    secret: false,
-    minimum: 1_000,
-    maximum: 60_000,
-    description: "Estimator request timeout in milliseconds.",
-  }),
-  estimatorField({
-    name: "maxRetries",
-    valueKind: "literal-number",
-    required: true,
-    secret: false,
-    literalValue: 0,
-    description: "Estimator retry count; retries are disabled.",
-  }),
-]);
-
-export type ModelTokenEstimatorKind = Extract<
-  (typeof MODEL_TOKEN_ESTIMATOR_FIELDS)[number],
-  { readonly name: "kind" }
->["literalValue"];
-
-export type ModelTokenEstimatorMaxRetries = Extract<
-  (typeof MODEL_TOKEN_ESTIMATOR_FIELDS)[number],
-  { readonly name: "maxRetries" }
->["literalValue"];
-
 export type MemoryConfigField = {
   readonly name: "profile" | "embedding";
   readonly valueKind: "non-empty-string" | "embedding-profile";

package/src/cli/runner-dependencies.ts

@@ -66,7 +66,6 @@ export function createModelClient(
     | "apiKey"
     | "apiBase"
     | "inputModalities"
-    | "tokenEstimator"
   >,
   env: NodeJS.ProcessEnv = process.env,
   reasoningEffort?: ReasoningEffortController,
@@ -82,9 +81,6 @@ export function createModelClient(
       ...(activeReasoningEffort === undefined
         ? {}
         : { reasoningEffort: activeReasoningEffort }),
-      ...(config.tokenEstimator === undefined
-        ? {}
-        : { tokenEstimator: config.tokenEstimator }),
       ...(env.TINKER_TEST_FAKE_MODEL_REQUEST_LOG === undefined ||
       env.TINKER_TEST_FAKE_MODEL_REQUEST_LOG === ""
         ? {}
@@ -102,9 +98,6 @@ export function createModelClient(
     ...(activeReasoningEffort === undefined
       ? {}
       : { reasoningEffort: activeReasoningEffort }),
-    ...(config.tokenEstimator === undefined
-      ? {}
-      : { tokenEstimator: config.tokenEstimator }),
   };
   if (config.api === "responses") {
     return new OpenAIResponsesModelClient(common);

package/src/cli/tui-memory.ts

@@ -47,9 +47,6 @@ export async function initializeTuiMemory(input: {
             stream: profile.stream,
             contextBudget: memoryConfig.contextBudget,
             inputModalities: profile.inputModalities,
-            ...(profile.tokenEstimator === undefined
-              ? {}
-              : { tokenEstimator: profile.tokenEstimator }),
           },
           input.env,
         );