oasis_test_v2 2.2.29 → 2.2.30

package/dist/index.js

@@ -25935,11 +25935,19 @@ var init_codex = __esm({
             active: false,
             pendingInputs: /* @__PURE__ */ new Set(),
             codex: createCodexNormalizeState(),
-            // 本次 run 的用量：逐轮累加 `thread/tokenUsage/updated` 的 `last`（见该解析函数注释）。
-            usage: { input: 0, cacheRead: 0, cacheWrite: 0, output: 0 },
-            sawUsage: false,
-            // `thread/started` 会直接给出本会话 rollout 的绝对路径——取实际模型时不必再满盘搜。
-            rolloutPath: void 0
+            // 本次 run 的用量：`thread/tokenUsage/updated` 的 `last`（见该解析函数注释）按轮次记下，
+            // 结算时只加**本次 run 发起的轮次**（runTurnIds）。原因：`thread/resume` 之后 codex 会把线程
+            // **上一轮**的用量通知重放一遍（本机 codex 0.154.0 实测，turnId 是上一轮的），照单全收的话
+            // 每次续接都把上一轮的 token 再记一遍。没带 turnId 的通知（老版本）照旧直接计入。
+            usageByTurn: [],
+            runTurnIds: /* @__PURE__ */ new Set(),
+            // 已经发出本次 run 的 `turn/start`：在这之前出现的 `turn/started` 不是本次的轮次。
+            turnRequested: false,
+            // 会话 rollout 的绝对路径：新开线程时 `thread/started` 通知会给；**续接（thread/resume）不发这条通知**，
+            // 只能从 resume 的响应里取（同上实测）。取不到它就读不到实际模型。
+            rolloutPath: void 0,
+            // thread/start / thread/resume 响应里 codex 报的线程模型：rollout 读不到时的兜底。
+            threadModel: void 0
           }),
           initialCommand: () => ({
             jsonrpc: "2.0",
@@ -25956,12 +25964,16 @@ var init_codex = __esm({
             const threadId = thread.thread?.id ?? thread.id;
             if (typeof threadId !== "string" || !threadId) throw new Error("codex app-server returned no thread id");
             state.threadId = threadId;
+            if (typeof thread.thread?.path === "string" && thread.thread.path) state.rolloutPath ??= thread.thread.path;
+            const responseModel = typeof thread.model === "string" && thread.model ? thread.model : typeof thread.thread?.model === "string" && thread.thread.model ? thread.thread.model : void 0;
+            if (responseModel) state.threadModel = responseModel;
             const text5 = currentJob.systemPrompt ? `${currentJob.systemPrompt}
 
 ---
 
 ${task}` : task;
             state.active = true;
+            state.turnRequested = true;
             const turn = await send({
               jsonrpc: "2.0",
               method: "turn/start",
@@ -25974,7 +25986,10 @@ ${task}` : task;
               }
             });
             const turnId = turn.turn?.id ?? turn.id;
-            if (typeof turnId === "string" && turnId) state.turnId = turnId;
+            if (typeof turnId === "string" && turnId) {
+              state.turnId = turnId;
+              state.runTurnIds.add(turnId);
+            }
             if (!state.turnId) throw new Error("codex app-server returned no turn id");
           },
           liveEvents(message, state) {
@@ -26015,16 +26030,14 @@ ${task}` : task;
             }
             if (method === "thread/tokenUsage/updated") {
               const turn = parseCodexAppServerTurnUsage(params);
-              if (turn) {
-                addCodexBuckets(state.usage, turn);
-                state.sawUsage = true;
-              }
+              if (turn) state.usageByTurn.push({ turnId: typeof params?.turnId === "string" ? params.turnId : void 0, buckets: turn });
             }
             if (method === "turn/started") {
               const turn = params?.turn;
               if (typeof turn?.id === "string") {
                 state.turnId = turn.id;
                 state.active = true;
+                if (state.turnRequested) state.runTurnIds.add(turn.id);
               }
             }
             if (method === "item/agentMessage/delta" || method === "item/reasoning/textDelta") {
@@ -26056,9 +26069,16 @@ ${task}` : task;
               } catch {
               }
             }
-            model ??= resolvedModel2;
+            model ??= state.threadModel ?? resolvedModel2;
+            const usage = { input: 0, cacheRead: 0, cacheWrite: 0, output: 0 };
+            let sawUsage = false;
+            for (const entry of state.usageByTurn) {
+              if (entry.turnId !== void 0 && !state.runTurnIds.has(entry.turnId)) continue;
+              addCodexBuckets(usage, entry.buckets);
+              sawUsage = true;
+            }
             return {
-              ...state.sawUsage ? { usage: codexUsageFromBuckets(state.usage) } : {},
+              ...sawUsage ? { usage: codexUsageFromBuckets(usage) } : {},
               ...model ? { model } : {}
             };
           },
@@ -26068,7 +26088,10 @@ ${task}` : task;
               await send({ jsonrpc: "2.0", method: "turn/interrupt", params: { threadId: state.threadId, turnId: state.turnId } });
               const next = await send({ jsonrpc: "2.0", method: "turn/start", params: { threadId: state.threadId, input: [{ type: "text", text: input.text }] } });
               const nextId = next.turn?.id;
-              if (typeof nextId === "string") state.turnId = nextId;
+              if (typeof nextId === "string") {
+                state.turnId = nextId;
+                state.runTurnIds.add(nextId);
+              }
               state.active = true;
               return { accepted: true, interrupt: "unknown" };
             }
@@ -273755,7 +273778,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.29" : "dev";
+var PKG_VERSION = true ? "2.2.30" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test_v2",
-  "version": "2.2.29",
+  "version": "2.2.30",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"
@@ -26,6 +26,6 @@
     "node": ">=20"
   },
   "oasisRelease": {
-    "sourceHead": "68eff586a82e2fd668f109ffbdd672ebf77844ac"
+    "sourceHead": "013d645f571ea8a12f1a119c0dae1cc1f4c3caac"
   }
 }