Daemon/Usage: normalize token values and clamp invalid counters by zwright8 · Pull Request #32560 · openclaw/openclaw

zwright8 · 2026-03-03T04:51:52Z

Summary

split from Fix status/token regressions and Teams large-file uploads #26712 into a focused token-normalization PR
normalize gateway service token values before drift comparison in daemon audit
handle quoted token values in service/env comparisons
ignore negative provider token counters in usage normalization

Validation

pnpm exec vitest run src/daemon/service-audit.test.ts src/agents/usage.normalization.test.ts

Context

This PR is one focused slice extracted from:

Fix status/token regressions and Teams large-file uploads #26712

greptile-apps · 2026-03-03T04:53:39Z

Greptile Summary

This PR makes two targeted fixes: (1) it normalizes gateway service token values by trimming whitespace and stripping surrounding quotes before drift comparisons, preventing false gatewayTokenMismatch / gatewayTokenDrift issues caused by shell-quoted env values; (2) it silently discards negative token counters in normalizeUsage by extending asFiniteNumber to return undefined for any value below zero.

Changes:

src/daemon/service-audit.ts: New normalizeGatewayToken helper applied to both auditGatewayToken and checkTokenDrift — handles double-quoted, single-quoted, and whitespace-padded token strings correctly.
src/agents/usage.ts: asFiniteNumber now returns undefined for negative values instead of passing them through; the existing per-field clamping expression for input (line 102) is now dead code and the accompanying "Clamp to 0" comment is stale.
Tests for both changes are present and thorough.

Confidence Score: 4/5

Safe to merge — both fixes are correct and well-tested; one minor dead-code/stale-comment issue in usage.ts.
Logic is sound in both changed areas. The only nit is that the clamping expression rawInput !== undefined && rawInput < 0 ? 0 : rawInput and its associated comment in usage.ts are now unreachable dead code, but this doesn't affect correctness. All new behaviour is covered by the added tests.
src/agents/usage.ts — dead clamping expression and stale comment on line 102 should be cleaned up.

_{Last reviewed commit: 7a339b3}

greptile-apps

_{4 files reviewed, 1 comment}

_{Edit Code Review Agent Settings | Greptile}

greptile-apps · 2026-03-03T04:53:47Z

Additional Comments (1)

src/agents/usage.ts
Dead code and stale comment after asFiniteNumber change

Now that asFiniteNumber returns undefined for any value < 0, rawInput can never be negative. The clamping expression on line 102 (rawInput !== undefined && rawInput < 0 ? 0 : rawInput) and the comment above it ("Clamp to 0") are both dead/misleading — the condition rawInput < 0 will never be true.

Consider removing the dead branch and updating the comment to reflect the new "return undefined for negatives" behaviour:

  const rawInput = asFiniteNumber(
    raw.input ?? raw.inputTokens ?? raw.input_tokens ?? raw.promptTokens ?? raw.prompt_tokens,
  );
  const input = rawInput;

And update (or remove) the comment block at lines 96–98 to match the actual semantics.

Prompt To Fix With AI

This is a comment left during a code review.
Path: src/agents/usage.ts
Line: 96-102

Comment:
**Dead code and stale comment after `asFiniteNumber` change**

Now that `asFiniteNumber` returns `undefined` for any `value < 0`, `rawInput` can never be negative. The clamping expression on line 102 (`rawInput !== undefined && rawInput < 0 ? 0 : rawInput`) and the comment above it ("Clamp to 0") are both dead/misleading — the condition `rawInput < 0` will never be true.

Consider removing the dead branch and updating the comment to reflect the new "return undefined for negatives" behaviour:

```suggestion
  const rawInput = asFiniteNumber(
    raw.input ?? raw.inputTokens ?? raw.input_tokens ?? raw.promptTokens ?? raw.prompt_tokens,
  );
  const input = rawInput;
```

And update (or remove) the comment block at lines 96–98 to match the actual semantics.

How can I resolve this? If you propose a fix, please make it concise.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 7a339b3d2d

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-03-03T04:56:12Z

src/daemon/service-audit.ts

  expectedGatewayToken?: string,
 ) {
-  const expectedToken = expectedGatewayToken?.trim();
+  const expectedToken = normalizeGatewayToken(expectedGatewayToken);


Compare configured gateway token without unquoting

Applying normalizeGatewayToken to expectedGatewayToken/configToken makes drift checks treat wrapped and unwrapped values as equivalent, so a real mismatch is missed when the configured token legitimately starts and ends with quote characters (for example "abc" vs abc). gateway.auth.token is defined as a free-form string (src/config/zod-schema.ts) and credential resolution only trims whitespace (src/gateway/credentials.ts), so quote characters are meaningful; suppressing gateway-token-mismatch/gateway-token-drift here can hide a restart-breaking auth mismatch.

Useful? React with 👍 / 👎.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: cd97848f13

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-03-03T05:11:22Z

src/agents/usage.ts

+  if (value < 0) {
+    return undefined;


Keep negative input counters clamped to zero

Filtering all negative numbers in asFiniteNumber makes the existing normalizeUsage clamp path for pre-subtracted prompt/input tokens unreachable, so inputs that previously normalized to 0 now become undefined. That changes established behavior for providers that emit negative prompt counters and conflicts with current expectations in src/agents/usage.test.ts:91 and src/agents/usage.test.ts:108, which means this commit will regress usage normalization semantics (and fail the default src/**/*.test.ts suite) unless the clamp behavior is preserved.

Useful? React with 👍 / 👎.

openclaw-barnacle bot added gateway Gateway runtime agents Agent runtime and tooling size: S labels Mar 3, 2026

greptile-apps bot reviewed Mar 3, 2026

View reviewed changes

chatgpt-codex-connector bot reviewed Mar 3, 2026

View reviewed changes

zwright8 mentioned this pull request Mar 3, 2026

Fix status/token regressions and Teams large-file uploads #26712

Closed

18 tasks

zwright8 and others added 3 commits March 3, 2026 00:06

Daemon: normalize gateway tokens before drift checks

aa66943

Usage: ignore negative token counters from providers

ddcf050

Daemon: normalize quoted gateway service tokens

cd97848

zwright8 force-pushed the codex/pr26712-token-normalization-fixes branch from 7a339b3 to cd97848 Compare March 3, 2026 05:07

chatgpt-codex-connector bot reviewed Mar 3, 2026

View reviewed changes

ademczuk mentioned this pull request Mar 7, 2026

fix(daemon): normalise whitespace in checkTokenDrift to prevent false-positive warning #39108

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Daemon/Usage: normalize token values and clamp invalid counters#32560

Daemon/Usage: normalize token values and clamp invalid counters#32560
zwright8 wants to merge 3 commits intoopenclaw:mainfrom
zwright8:codex/pr26712-token-normalization-fixes

zwright8 commented Mar 3, 2026

Uh oh!

greptile-apps bot commented Mar 3, 2026

Uh oh!

greptile-apps bot left a comment

Uh oh!

greptile-apps bot commented Mar 3, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

chatgpt-codex-connector bot Mar 3, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

chatgpt-codex-connector bot Mar 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Uh oh!

Conversation

zwright8 commented Mar 3, 2026

Summary

Validation

Context

Uh oh!

greptile-apps bot commented Mar 3, 2026

Greptile Summary

Confidence Score: 4/5

Uh oh!

greptile-apps bot left a comment

Choose a reason for hiding this comment

Uh oh!

greptile-apps bot commented Mar 3, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant