@cjhyy/code-shell-capability-coding 0.9.22 → 0.9.25

package/dist/external-runtimes/codex/event-translator.d.ts

@@ -37,6 +37,10 @@ export declare class CodexEventTranslator {
     private readonly codeshellServer;
     private turnNumber;
     private activeTurnId;
+    private usageTurnId;
+    private cumulativeUsage;
+    private turnUsageBaseline;
+    private turnUsage;
     /** Turns that reached a terminal state. Late events for these are dropped. */
     private readonly finishedTurns;
     /**
@@ -64,6 +68,8 @@ export declare class CodexEventTranslator {
     private onError;
     private onAgentDelta;
     private onReasoningDelta;
+    private resetTurnUsage;
+    private updateTurnUsage;
     private onTokenUsage;
     /**
      * A CodeShell Host Tool call must not produce a card here — `ToolExecutor`

package/dist/external-runtimes/codex/event-translator.js

@@ -70,6 +70,10 @@ export class CodexEventTranslator {
     codeshellServer;
     turnNumber = 0;
     activeTurnId;
+    usageTurnId;
+    cumulativeUsage = {};
+    turnUsageBaseline = {};
+    turnUsage = {};
     /** Turns that reached a terminal state. Late events for these are dropped. */
     finishedTurns = new Set();
     /**
@@ -157,7 +161,13 @@ export class CodexEventTranslator {
         // must not reactivate the session.
         if (turnId && this.finishedTurns.has(turnId))
             return [];
+        if (turnId && turnId === this.activeTurnId)
+            return [];
         this.activeTurnId = turnId;
+        // Usage may arrive before turn/started. Keep the counts already attributed
+        // to this turn, and reset only when a different user turn begins.
+        if (!turnId || turnId !== this.usageTurnId)
+            this.resetTurnUsage(turnId);
         this.turnNumber += 1;
         return [{ type: "stream_request_start", turnNumber: this.turnNumber }];
     }
@@ -214,8 +224,40 @@ export class CodexEventTranslator {
         const delta = str(params.delta);
         return delta ? [{ type: "thinking_delta", text: delta }] : [];
     }
+    resetTurnUsage(turnId) {
+        this.usageTurnId = turnId;
+        this.turnUsageBaseline = { ...this.cumulativeUsage };
+        this.turnUsage = {};
+    }
+    updateTurnUsage(key, last, total) {
+        if (total !== undefined) {
+            if (this.turnUsage[key] === undefined &&
+                this.turnUsageBaseline[key] !== undefined &&
+                total < this.turnUsageBaseline[key]) {
+                // A provider accounting window can restart between turns. Rebase the
+                // first update only: a lower snapshot during the same turn may instead
+                // be an out-of-order delivery, which must not count as fresh work.
+                this.turnUsageBaseline[key] = 0;
+                this.cumulativeUsage[key] = 0;
+            }
+            // A resumed thread has history, but no local baseline yet. Its first
+            // update identifies that history as total - last. Subsequent updates use
+            // cumulative differences, so repeated notifications never add usage twice
+            // and intermediate model requests remain counted throughout the turn.
+            this.turnUsageBaseline[key] ??= Math.max(0, total - (last ?? 0));
+            this.turnUsage[key] = Math.max(this.turnUsage[key] ?? 0, total - this.turnUsageBaseline[key]);
+            this.cumulativeUsage[key] = Math.max(this.cumulativeUsage[key] ?? 0, total);
+        }
+        else if (last !== undefined) {
+            // Older/partial notifications have no reliable request identity. Preserve
+            // the snapshot without adding it repeatedly as if each delivery were work.
+            this.turnUsage[key] = Math.max(this.turnUsage[key] ?? 0, last);
+        }
+        return this.turnUsage[key];
+    }
     onTokenUsage(params) {
-        if (this.isStale(str(params.turnId)))
+        const turnId = str(params.turnId) ?? this.activeTurnId;
+        if (this.isStale(turnId))
             return [];
         const usage = asRecord(params.tokenUsage);
         const total = asRecord(usage?.total);
@@ -224,6 +266,8 @@ export class CodexEventTranslator {
         const promptTokens = number(last?.inputTokens);
         if (promptTokens === undefined)
             return [];
+        if (turnId && turnId !== this.usageTurnId)
+            this.resetTurnUsage(turnId);
         const cacheReadTokens = number(last?.cachedInputTokens);
         const cumulativePromptTokens = number(total?.inputTokens);
         const cumulativeCacheReadTokens = number(total?.cachedInputTokens);
@@ -231,6 +275,9 @@ export class CodexEventTranslator {
         const cumulativeCacheCreationTokens = number(total?.cacheWriteInputTokens);
         const completionTokens = number(last?.outputTokens);
         const cumulativeCompletionTokens = number(total?.outputTokens);
+        const singleTurnPromptTokens = this.updateTurnUsage("promptTokens", promptTokens, cumulativePromptTokens);
+        const singleTurnCacheReadTokens = this.updateTurnUsage("cacheReadTokens", cacheReadTokens, cumulativeCacheReadTokens);
+        const singleTurnCacheCreationTokens = this.updateTurnUsage("cacheCreationTokens", cacheCreationTokens, cumulativeCacheCreationTokens);
         return [
             {
                 type: "usage_update",
@@ -239,11 +286,9 @@ export class CodexEventTranslator {
                 promptTokensConfidence: "high",
                 ...(cacheReadTokens !== undefined ? { cacheReadTokens } : {}),
                 ...(cacheCreationTokens !== undefined ? { cacheCreationTokens } : {}),
-                singleTurnPromptTokens: promptTokens,
-                ...(cacheReadTokens !== undefined ? { singleTurnCacheReadTokens: cacheReadTokens } : {}),
-                ...(cacheCreationTokens !== undefined
-                    ? { singleTurnCacheCreationTokens: cacheCreationTokens }
-                    : {}),
+                singleTurnPromptTokens,
+                ...(singleTurnCacheReadTokens !== undefined ? { singleTurnCacheReadTokens } : {}),
+                ...(singleTurnCacheCreationTokens !== undefined ? { singleTurnCacheCreationTokens } : {}),
                 ...(cumulativePromptTokens !== undefined ? { cumulativePromptTokens } : {}),
                 ...(cumulativeCacheReadTokens !== undefined ? { cumulativeCacheReadTokens } : {}),
                 ...(cumulativeCacheCreationTokens !== undefined ? { cumulativeCacheCreationTokens } : {}),

package/dist/external-runtimes/shared/mcp-bridge.js

@@ -49,20 +49,6 @@ export function threadIdFromMeta(params) {
     }
     return undefined;
 }
-function turnIdFromMeta(params) {
-    if (!params || typeof params !== "object")
-        return undefined;
-    const meta = params._meta;
-    if (!meta || typeof meta !== "object")
-        return undefined;
-    const turn = meta["x-codex-turn-metadata"];
-    if (turn && typeof turn === "object") {
-        const id = turn.turn_id;
-        if (typeof id === "string" && id)
-            return id;
-    }
-    return undefined;
-}
 /** Model-facing text for a routing refusal. Says what happened without leaking
  *  which other sessions exist. */
 function missMessage(reason) {
@@ -271,7 +257,10 @@ export async function startLoopbackMcpBridge(options) {
             const started = Date.now();
             // The host is the authorization boundary; the bridge only routes.
             const outcome = await resolved.host.execute({
-                id: turnIdFromMeta(message.params) ?? `mcp-${randomBytes(6).toString("hex")}`,
+                // One turn can contain many calls, including parallel ones. A turn id
+                // aliases their transcript/UI entries and overwrites navigate with a
+                // later observe error. Mint a host identity for each actual invocation.
+                id: `mcp-${randomBytes(12).toString("hex")}`,
                 name,
                 input: params?.arguments ?? {},
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cjhyy/code-shell-capability-coding",
-  "version": "0.9.22",
+  "version": "0.9.25",
   "description": "Coding capability pack for the generic code-shell agent core.",
   "type": "module",
   "main": "./dist/index.js",
@@ -39,7 +39,7 @@
     "clean": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\""
   },
   "dependencies": {
-    "@cjhyy/code-shell-core": "0.9.22"
+    "@cjhyy/code-shell-core": "0.9.25"
   },
   "engines": {
     "node": ">=20.10"