oasis_test_v2 2.2.83 → 2.2.84

package/dist/index.js

@@ -1347,6 +1347,21 @@ function actualModelId(model) {
   if (!t) return void 0;
   return isPseudoModelId(t) ? void 0 : t;
 }
+function modelSourceRank(model, source) {
+  if (!actualModelId(model)) return -1;
+  return source ? MODEL_SOURCE_RANK[source] ?? 1 : 1;
+}
+function preferRunModel(existing, incoming, tie = "keep") {
+  const incomingModel = actualModelId(incoming.effectiveModel);
+  if (!incomingModel) return null;
+  const existingRank = modelSourceRank(existing.effectiveModel, existing.modelSource);
+  const incomingRank = modelSourceRank(incomingModel, incoming.modelSource);
+  if (incomingRank > existingRank) return { effectiveModel: incomingModel, modelSource: incoming.modelSource ?? null };
+  if (incomingRank === existingRank && tie === "replace") {
+    return { effectiveModel: incomingModel, modelSource: incoming.modelSource ?? null };
+  }
+  return null;
+}
 function legacyScopeIsEmpty(scope2) {
   return scope2.artifactIds.length === 0 && scope2.chatSessionIds.length === 0 && (scope2.runtimeInstanceIds?.length ?? 0) === 0;
 }
@@ -1356,11 +1371,20 @@ function legacyScopeMatcher(scope2) {
   const runtimes = new Set(scope2.runtimeInstanceIds ?? []);
   return (run) => run.artifactId != null && artifacts.has(run.artifactId) || run.chatSessionId != null && sessions.has(run.chatSessionId) || run.runtimeInstanceId != null && runtimes.has(run.runtimeInstanceId);
 }
-var PSEUDO_MODEL_IDS, DISPLAY_CNY_PER_USD, USAGE_POINT_FINAL_SEQ;
+var PSEUDO_MODEL_IDS, MODEL_SOURCE_RANK, DISPLAY_CNY_PER_USD, USAGE_POINT_FINAL_SEQ;
 var init_trace = __esm({
   "../contract/src/trace.ts"() {
     "use strict";
     PSEUDO_MODEL_IDS = ["default", "default[]", "auto"];
+    MODEL_SOURCE_RANK = {
+      runtime: 2,
+      runtime_rollout: 2,
+      requested: 1,
+      session_override: 1,
+      actor_config: 1,
+      runtime_default: 1,
+      unknown: 0
+    };
     DISPLAY_CNY_PER_USD = 7.2;
     USAGE_POINT_FINAL_SEQ = 2147483647;
   }
@@ -8506,14 +8530,46 @@ async function runACPSession(job, cfg) {
   let runtimeReportedModel;
   let requestedModelAccepted;
   const reportedModel = () => pickReportedModel({ runtime: [routedModel, runtimeReportedModel], requested: requestedModelAccepted });
+  let turnIndex = 0;
+  let turnStartedMs = Date.now();
+  let freshSession = true;
+  let routedPollInflight = false;
   const pollRoutedModel = async () => {
-    if (routedModel || !cfg.readRoutedModel || !capturedSessionId) return;
-    if (actualModelId(runtimeReportedModel)) return;
+    if (!cfg.readRoutedModel || !capturedSessionId || exited) return false;
+    if (actualModelId(runtimeReportedModel)) return true;
+    if (routedPollInflight) return false;
+    routedPollInflight = true;
+    const turn = turnIndex;
     try {
-      routedModel = await cfg.readRoutedModel(capturedSessionId);
+      const found2 = actualModelId(await cfg.readRoutedModel(capturedSessionId, {
+        turnStartedMs,
+        freshSession
+      }));
+      if (!found2 || turn !== turnIndex) return false;
+      if (found2 !== routedModel) {
+        routedModel = found2;
+        emitUsageCheckpoint();
+      }
+      return true;
     } catch {
+      return false;
+    } finally {
+      routedPollInflight = false;
     }
-    if (routedModel) emitUsageCheckpoint();
+  };
+  const ROUTED_MODEL_POLL_DELAYS_MS = [0, 150, 400, 900, 2e3];
+  let routedSamplingTurn = -1;
+  const startRoutedModelSampling = () => {
+    if (!cfg.readRoutedModel || routedSamplingTurn === turnIndex) return;
+    routedSamplingTurn = turnIndex;
+    const turn = turnIndex;
+    void (async () => {
+      for (const delay of ROUTED_MODEL_POLL_DELAYS_MS) {
+        if (delay > 0) await new Promise((r) => setTimeout(r, delay));
+        if (exited || turn !== turnIndex) return;
+        if (await pollRoutedModel()) return;
+      }
+    })();
   };
   const modelForUsage = () => reportedModel()?.model;
   const usageCheckpointCbs = [];
@@ -8639,11 +8695,15 @@ ${note}` : note };
     },
     (text7) => {
       confirmAppendBatch();
+      startRoutedModelSampling();
       if (cfg.classifyPromptFailure && turnMessage.length < PROMPT_TURN_MESSAGE_MAX) turnMessage += text7;
       for (const cb of outputCbs) cb(text7);
     },
     (e) => {
-      if (["message", "thought", "tool_use", "tool_result"].includes(e.kind)) confirmAppendBatch();
+      if (["message", "thought", "tool_use", "tool_result"].includes(e.kind)) {
+        confirmAppendBatch();
+        startRoutedModelSampling();
+      }
       for (const cb of telemetryCbs) cb(e);
     },
     // runtime 自己用 stopReason=cancelled 收尾时也保留取消语义；此前误记成 error，
@@ -8712,6 +8772,7 @@ ${note}` : note };
             sessionId = job.runtimeSessionId;
             ambiguousResume = true;
           }
+          if (sessionId) freshSession = false;
         } catch {
           sessionId = "";
         }
@@ -8725,6 +8786,7 @@ ${note}` : note };
         sessionId = extractSessionID(sessionRes);
         runtimeReportedModel = extractCurrentModelID(sessionRes) ?? runtimeReportedModel;
         if (!sessionId) throw new Error("session/new returned no sessionId");
+        freshSession = true;
       }
       capturedSessionId = sessionId;
       if (resolvedModel2) {
@@ -8761,6 +8823,8 @@ ${task}` : task;
       const sendPrompt = async (text7) => {
         turnMessage = "";
         turnStderr = [];
+        turnIndex += 1;
+        turnStartedMs = Date.now();
         const p2 = client.request("session/prompt", { sessionId, prompt: [{ type: "text", text: text7 }] });
         inflightStopReason = p2.then((r) => extractStopReason(r), () => "");
         try {
@@ -8780,6 +8844,7 @@ ${task}` : task;
         sessionId = extractSessionID(sessionRes);
         runtimeReportedModel = extractCurrentModelID(sessionRes) ?? runtimeReportedModel;
         if (!sessionId) throw new Error("session/new returned no sessionId");
+        freshSession = true;
         capturedSessionId = sessionId;
         emitUsageCheckpoint();
         promptResult = await sendPrompt(userText);
@@ -9548,14 +9613,59 @@ function pickCursorModelName(value2) {
   };
   return visit(value2, 0) ?? fallback;
 }
-function modelNameInCell(cell) {
-  if (typeof cell !== "string" || !cell.includes("modelName")) return void 0;
+function parseCell(cell) {
+  if (typeof cell !== "string") return void 0;
   try {
-    return pickCursorModelName(JSON.parse(cell));
+    return JSON.parse(cell);
   } catch {
     return void 0;
   }
 }
+function looksLikeTimeKey(key2) {
+  const tokens2 = key2.replace(/([a-z0-9])([A-Z])/g, "$1 $2").toLowerCase().split(/[^a-z0-9]+/).filter(Boolean);
+  const last = tokens2[tokens2.length - 1];
+  if (!last || !TIME_KEY_TAILS.includes(last)) return false;
+  return last !== "at" || tokens2.length > 1;
+}
+function cursorTimeValueMs(value2) {
+  if (typeof value2 === "bigint") return cursorTimeValueMs(Number(value2));
+  if (typeof value2 === "number") {
+    if (!Number.isFinite(value2)) return void 0;
+    if (value2 > 1e15) return Math.floor(value2 / 1e3);
+    if (value2 > 1e12) return value2;
+    if (value2 > 1e9) return value2 * 1e3;
+    return void 0;
+  }
+  if (typeof value2 === "string") {
+    const t = value2.trim();
+    if (!t) return void 0;
+    if (/^\d+$/.test(t)) return cursorTimeValueMs(Number(t));
+    const ms = Date.parse(t);
+    return Number.isFinite(ms) ? ms : void 0;
+  }
+  return void 0;
+}
+function cursorRowTimeMs(row, parsedCells) {
+  let best;
+  const take = (v2) => {
+    const ms = cursorTimeValueMs(v2);
+    if (ms !== void 0 && (best === void 0 || ms > best)) best = ms;
+  };
+  for (const [key2, value2] of Object.entries(row)) if (looksLikeTimeKey(key2)) take(value2);
+  const visit = (node2, depth) => {
+    if (depth > 8 || node2 === null || typeof node2 !== "object") return;
+    if (Array.isArray(node2)) {
+      for (const item of node2) visit(item, depth + 1);
+      return;
+    }
+    for (const [key2, value2] of Object.entries(node2)) {
+      if (looksLikeTimeKey(key2)) take(value2);
+      visit(value2, depth + 1);
+    }
+  };
+  for (const parsed of parsedCells) visit(parsed, 0);
+  return best;
+}
 async function openReadOnly(file) {
   try {
     const sqlite = await import("node:sqlite");
@@ -9564,7 +9674,9 @@ async function openReadOnly(file) {
     return null;
   }
 }
-async function readCursorRoutedModel(sessionId, env = process.env) {
+async function readCursorRoutedModel(sessionId, window3) {
+  const env = window3.env ?? process.env;
+  const earliest = window3.turnStartedMs - TURN_CLOCK_TOLERANCE_MS;
   const file = cursorAcpSessionStorePath(sessionId, env);
   if (!file) return void 0;
   const db = await openReadOnly(file);
@@ -9580,10 +9692,17 @@ async function readCursorRoutedModel(sessionId, env = process.env) {
         continue;
       }
       for (const row of rows) {
-        for (const cell of Object.values(row)) {
-          const model = modelNameInCell(cell);
-          if (model) return model;
+        const cells = Object.values(row);
+        if (!cells.some((cell) => typeof cell === "string" && cell.includes("modelName"))) continue;
+        const parsed = cells.map(parseCell);
+        const model = parsed.map((value2) => value2 === void 0 ? void 0 : pickCursorModelName(value2)).find((name) => !!name);
+        if (!model) continue;
+        const rowMs = cursorRowTimeMs(row, parsed);
+        if (rowMs !== void 0) {
+          if (rowMs >= earliest) return model;
+          continue;
         }
+        if (window3.freshSession) return model;
       }
     }
     return void 0;
@@ -9596,7 +9715,7 @@ async function readCursorRoutedModel(sessionId, env = process.env) {
     }
   }
 }
-var fs10, os6, path12, MAX_TABLES, MAX_ROWS_PER_TABLE;
+var fs10, os6, path12, MAX_TABLES, MAX_ROWS_PER_TABLE, TURN_CLOCK_TOLERANCE_MS, TIME_KEY_TAILS;
 var init_local_store = __esm({
   "../adapters/src/cursor/local-store.ts"() {
     "use strict";
@@ -9605,6 +9724,8 @@ var init_local_store = __esm({
     path12 = __toESM(require("node:path"), 1);
     MAX_TABLES = 24;
     MAX_ROWS_PER_TABLE = 200;
+    TURN_CLOCK_TOLERANCE_MS = 1e3;
+    TIME_KEY_TAILS = ["at", "ts", "time", "timestamp", "date", "millis", "epoch"];
   }
 });
 
@@ -9652,7 +9773,7 @@ var init_cursor = __esm({
           // 采集点 4：「自动」档下 cursor 对外只报 `default[]`（不是型号、查不到价，v2 上 385 条记的就是它），
           // 而它自己的 `~/.cursor/acp-sessions/<会话号>/store.db` 里逐条回复都带实际路由到的模型。
           // 这是 cursor 的内部格式：读不到就退回会话级自报值，绝不报错（见 local-store.ts）。
-          readRoutedModel: (sessionId) => readCursorRoutedModel(sessionId),
+          readRoutedModel: (sessionId, window3) => readCursorRoutedModel(sessionId, window3),
           ...this.opts.syncSkills ? { syncSkills: this.opts.syncSkills } : {}
         });
       }
@@ -140939,16 +141060,32 @@ ${m2.spec.split("\n").map((l) => `  > ${l}`).join("\n")}`);
     //
     // 这些字段不能成为「没做完也能交」的出口：真正未满足交付标准时继续完成，外部阻塞走 oasis gap。
     // 四项本身只传递一份已达标成果的非阻塞残余信息，不参与 conclude 判据。
-    ...args.action === "review" ? [] : [
+    //
+    // ★ 2026-09-23（语菲，验收用例 H-01）：此前只列参数名、没说挂在哪条命令上，agent 常把它们写到
+    // `oasis conclude` 上——conclude 只收 `--note`，其余参数被静默丢掉（v2 上 143 次执行里写过这四项
+    // 16 次，6 次写在 conclude 上、全丢）。所以点名「是 propose 的参数」并给一条**追加式**示例：
+    // 只示范「在那条命令末尾加上什么」，不给整条 propose——design（交稿目录不是 deliverable/）、
+    // 分批续跑（要带 --checkpoint --continue）各有自己的提交命令，照抄一整条会交错目录或漏参数。
+    // 「没有就连参数名也不写」：只写参数名不跟值会被 parseArgs 拒（CLI 侧已对这四项放宽为空值，
+    // 但未升级的节点包仍会拒），提示词也把这条路堵上。
+    //
+    // 集成会话（integrating || queueTaskDue）不出这段：那一档「怎么提交」明令「绝不要用 oasis propose」，
+    // 而 `oasis integrate` 也不收这四项——再教「这是 propose 的参数」只会把它引去 propose，
+    // 队列从 N 变 N+1、随后 conclude 撞 queue not quiescent（本文件「怎么提交」那段注释记的卡死形状）。
+    ...args.action === "review" || integrating || queueTaskDue ? [] : [
       ``,
       `### \u4EA4\u4ED8\u65F6\u7684\u975E\u963B\u585E\u4FE1\u606F`,
-      `\`--reason\` \u5199\u660E\u76F8\u5BF9\u4E0A\u4E00\u7248\u6539\u4E86\u4EC0\u4E48\u3001\u4E3A\u4EC0\u4E48\u3001\u53EF\u80FD\u5F71\u54CD\u4EC0\u4E48\uFF1B\u9996\u6B21\u7248\u672C\u8BF4\u660E\u672C\u7248\u5B8C\u6210\u5185\u5BB9\u3002`,
-      `\u53EA\u6709\u5F53\u524D\u7248\u672C\u5DF2\u7ECF\u8FBE\u5230\u4EA4\u4ED8\u6807\u51C6\u65F6\uFF0C\u624D\u53EF\u4EE5\u8BB0\u5F55\uFF1A`,
+      `\u4E0B\u9762\u51E0\u9879\u662F\u4EA4\u4ED8\u547D\u4EE4\uFF08\`oasis propose\`\uFF09\u7684\u53C2\u6570\uFF0C\u76F4\u63A5\u52A0\u5728\u90A3\u6761\u547D\u4EE4\u540E\u9762\uFF0C\u548C \`--reason\` \u5199\u5728\u4E00\u8D77\uFF1B\`oasis conclude\` \u53EA\u6536 \`--note\`\uFF0C\u5199\u5728 conclude \u4E0A\u7684\u5176\u5B83\u53C2\u6570\u4E0D\u4F1A\u88AB\u8BB0\u5F55\u3002`,
+      `\`--reason\` \u5199\u660E\u76F8\u5BF9\u4E0A\u4E00\u7248\u6539\u4E86\u4EC0\u4E48\u3001\u4E3A\u4EC0\u4E48\u3001\u53EF\u80FD\u5F71\u54CD\u4EC0\u4E48\uFF1B\u9996\u6B21\u7248\u672C\u8BF4\u660E\u672C\u7248\u5B8C\u6210\u601D\u8DEF\u548C\u5185\u5BB9\u3002`,
+      `\u53EA\u6709\u5F53\u524D\u7248\u672C\u5DF2\u7ECF\u8FBE\u5230\u4EA4\u4ED8\u6807\u51C6\u65F6\uFF0C\u624D\u53EF\u4EE5\u8BB0\u5F55\uFF08\u6BCF\u9879\u53EF\u4EE5\u5199\u591A\u6761\uFF0C\u7528\u82F1\u6587\u5206\u53F7 \`;\` \u9694\u5F00\uFF1B\u4EE5\u4E0B\u67D0\u4E00\u9879\u5982\u679C\u6CA1\u6709\u5C31\u4E0D\u5199\uFF0C\u540C\u65F6\u8BE5\u53C2\u6570\u4E5F\u4E0D\u5199\uFF09\uFF1A`,
       `- \`--unresolved\`\uFF1A\u4EFB\u52A1\u8303\u56F4\u4E4B\u5916\u7684\u5DF2\u77E5\u95EE\u9898\uFF1B`,
       `- \`--risks\`\uFF1A\u6210\u679C\u53EF\u4EA4\u4ED8\uFF0C\u4F46\u4F7F\u7528\u65F6\u9700\u6CE8\u610F\u7684\u6B8B\u4F59\u98CE\u9669\uFF1B`,
       `- \`--gaps\`\uFF1A\u4E0D\u5C5E\u4E8E\u672C\u6B21\u5F3A\u5236\u9A8C\u6536\u6761\u4EF6\u7684\u9A8C\u8BC1\u8303\u56F4\u9650\u5236\uFF1B`,
       `- \`--next\`\uFF1A\u4E0B\u6E38\u5982\u4F55\u4F7F\u7528\u6210\u679C\uFF0C\u4E0D\u662F\u4F60\u5269\u4F59\u6CA1\u505A\u7684\u5DE5\u4F5C\u3002`,
-      `\u672A\u8FBE\u5230\u4EA4\u4ED8\u6807\u51C6\u7684\u4E8B\u9879\u4E0D\u80FD\u653E\u5728\u8FD9\u91CC\uFF0C\u5E94\u7EE7\u7EED\u5B8C\u6210\u6216\u8FD0\u884C \`oasis gap\`\u3002`,
+      `\u4F8B\u5982\u5728\u90A3\u6761\u547D\u4EE4\u672B\u5C3E\u52A0\u4E0A\uFF1A\`--risks "<\u98CE\u9669\u4E00>; <\u98CE\u9669\u4E8C>" --next "<\u4E0B\u6E38\u600E\u4E48\u7528>"\``,
+      `\u672A\u8FBE\u5230\u4EA4\u4ED8\u6807\u51C6\u7684\u4E8B\u9879\u4E0D\u80FD\u653E\u5728\u8FD9\u91CC\uFF0C\u5E94\u7EE7\u7EED\u5B8C\u6210\u6216\u8FD0\u884C \`oasis gap\`\u3002`
+    ],
+    ...args.action === "review" ? [] : [
       ``,
       `### \u4F1A\u8BDD\u53EF\u80FD\u88AB\u780D\uFF1A\u4E2D\u9014\u7559\u4E2A\u65AD\u70B9`,
       // ★ 2026-08-18：`continuity-checkpoint` 此前在任务书里出现 **0 次**——说明书只在
@@ -227247,14 +227384,13 @@ function frameTokenTotal(usage) {
   return (usage.inputTokens ?? 0) + (usage.outputTokens ?? 0) + (usage.cacheReadTokens ?? 0) + (usage.cacheCreationTokens ?? 0);
 }
 async function backfillRunModel(target, run, model, modelSource, warn) {
-  const effectiveModel = actualModelId(model);
-  if (!effectiveModel) return;
-  if (hasModelName(run.effectiveModel)) return;
+  const patch = preferRunModel(
+    { effectiveModel: run.effectiveModel, modelSource: run.modelSource },
+    { effectiveModel: model, modelSource: modelSource === "requested" ? "requested" : "runtime" }
+  );
+  if (!patch) return;
   try {
-    await target.store.updateRun(target.runId, {
-      effectiveModel,
-      modelSource: modelSource === "requested" ? "requested" : "runtime"
-    });
+    await target.store.updateRun(target.runId, patch);
   } catch (err) {
     warn(`[usage-ledger] run ${target.runId} \u7684\u6A21\u578B\u540D\u8865\u5199\u5931\u8D25\uFF08\u4E0D\u5F71\u54CD\u4F1A\u8BDD\uFF09\uFF1A${String(err)}`);
   }
@@ -228020,8 +228156,10 @@ var init_sink = __esm({
           const isErr = status === "failed" || status === "timeout";
           const errorFields = isErr ? { errorCode: update.exit.reason ?? "error", errorMessage: formatExitError(update.exit) } : {};
           const exitModel = actualModelId(update.exit.model);
-          const model = exitModel ?? actualModelId(st.observedModel) ?? null;
-          const modelSource = exitModel && update.exit.modelSource === "requested" ? "requested" : "runtime";
+          const observedModel = actualModelId(st.observedModel);
+          const exitIsRequestedOnly = update.exit.modelSource === "requested";
+          const model = (exitIsRequestedOnly ? observedModel ?? exitModel : exitModel ?? observedModel) ?? null;
+          const modelSource = model && model === exitModel && exitIsRequestedOnly && !observedModel ? "requested" : "runtime";
           const exitRtId = typeof update.exit.runtimeSessionId === "string" && update.exit.runtimeSessionId.trim() ? update.exit.runtimeSessionId.trim() : void 0;
           if (exitRtId) st.baseMetadata = { ...st.baseMetadata, runtimeSessionId: exitRtId };
           const exitWorkdir = typeof update.exit.workdirRef === "string" && update.exit.workdirRef.trim() ? update.exit.workdirRef.trim() : void 0;
@@ -228052,6 +228190,12 @@ var init_sink = __esm({
               createdAt: update.exit.at
             });
           }
+          const currentRun = model ? await this.store.getRun(st.runId).catch(() => null) : null;
+          const modelPatch = model ? preferRunModel(
+            { effectiveModel: currentRun?.effectiveModel, modelSource: currentRun?.modelSource },
+            { effectiveModel: model, modelSource },
+            "replace"
+          ) : null;
           const finished = await this.store.updateRun(st.runId, {
             status,
             endedAt: update.exit.at,
@@ -228067,7 +228211,7 @@ var init_sink = __esm({
             // token/成本来自 adapter 解析 stream-json（含 cache）；不带则不写、保持 null。
             ...update.exit.usage ? { usage: update.exit.usage } : {},
             // effectiveModel/modelSource 喂用量聚合（聚合键含 model）；与 chat/finishRun 路径一致。
-            ...model ? { effectiveModel: model, modelSource } : {},
+            ...modelPatch ?? {},
             // metadata 整列替换：必须带上 baseMetadata（bundleManifest/runtimeSessionId）一起写回。
             // model 有则并入（前端 findModelInValue 直接读 metadata.model）。**不能只在有 model 时才写**
             // ——否则无 model 的 run（如回捕型 runtime 没报模型）会把 exit 校正过的会话号丢掉。
@@ -228422,10 +228566,8 @@ function wireRecoveredChatTurn(deps) {
     live.emit({ type: "done", ...plan.runtimeSessionId ? { sessionId: plan.runtimeSessionId } : {} });
     live.finish(failed ? "error" : "done");
     deps.unregister();
-    const nativeSessionMetadata = info.runtimeSessionId && info.runtimeSessionId !== plan.runtimeSessionId ? nativeRuntimeSessionMetadata(
-      (await trace.getRun(plan.runId).catch(() => null))?.metadata,
-      info.runtimeSessionId
-    ) : void 0;
+    const currentRun = await trace.getRun(plan.runId).catch(() => null);
+    const nativeSessionMetadata = info.runtimeSessionId && info.runtimeSessionId !== plan.runtimeSessionId ? nativeRuntimeSessionMetadata(currentRun?.metadata, info.runtimeSessionId) : void 0;
     enqueueTrace(async () => {
       await appender.append([{
         eventType: "run.finished",
@@ -228434,7 +228576,7 @@ function wireRecoveredChatTurn(deps) {
         startedAt: finishedAt
       }]);
       await appender.update({
-        ...runTerminalPatch(info, plan.startedAt, finishedAt),
+        ...runTerminalPatch(info, plan.startedAt, finishedAt, currentRun),
         // 运行时自己退干净了，但平台没把输出接全——运行记录不许写「成功」（Bug 0123）。
         // 退出帧本身已经是失败时保持它的归因，只补一句缺口说明。
         ...outputGapRunPatch(droppedFrames, exitIsFailure, info),
@@ -228658,7 +228800,7 @@ async function reconcileChatExitFrame(deps) {
       ];
       await deps.trace.appendEvents(row.runId, seqless.map((e, i) => ({ ...e, seq: baseSeq + i + 1 })));
       await deps.trace.updateRun(row.runId, {
-        ...runTerminalPatch(info, run.startedAt, finishedAt),
+        ...runTerminalPatch(info, run.startedAt, finishedAt, run),
         ...outputGapRunPatch(droppedFrames, exitIsFailure, info),
         // 首轮占位会话号 → runtime 报回的原生号（Bug 0171，判据见本函数上方那一段）。
         ...nativeSessionMetadata ? { metadata: nativeSessionMetadata } : {}
@@ -228887,6 +229029,7 @@ var init_chat_recovery = __esm({
     "use strict";
     init_file_restore();
     init_continuation3();
+    init_src();
     init_chat_parts();
     init_sink();
     init_usage_ledger();
@@ -228914,7 +229057,7 @@ var init_chat_recovery = __esm({
       const existing = formatExitError(info);
       return { errorMessage: existing ? `${existing}\uFF1B${gap}` : gap };
     };
-    runTerminalPatch = (info, startedAt, endedAt) => ({
+    runTerminalPatch = (info, startedAt, endedAt, current) => ({
       status: classifySessionExitStatus(info),
       endedAt,
       durationMs: Date.parse(endedAt) - Date.parse(startedAt),
@@ -228927,7 +229070,11 @@ var init_chat_recovery = __esm({
       // 不能用 null 覆盖，否则恢复轮的 token 会掉进「未知模型」桶。
       // 伪型号（`default[]` / `auto`）不是模型名，不写；请求值（`requested`）与实际值分开记来源
       // ——重挂路与 chat 主路、派发路三处必须同一判据，否则同一条 run 换条路收尾归属就变了。
-      ...chatExitModelFields(info.model, null, null, info.modelSource)
+      ...preferRunModel(
+        { effectiveModel: current?.effectiveModel, modelSource: current?.modelSource },
+        chatExitModelFields(info.model, null, null, info.modelSource),
+        "replace"
+      ) ?? {}
     });
   }
 });
@@ -248171,8 +248318,16 @@ var init_service8 = __esm({
           errorCode: input.errorCode ?? null,
           errorMessage: input.errorMessage ?? null,
           usage: input.usage ?? null,
-          effectiveModel: input.effectiveModel ?? run.effectiveModel ?? null,
-          modelSource: input.modelSource ?? run.modelSource ?? null,
+          // 模型那两格按取值优先级挑（上游诊断 ④），不是无条件「收尾值优先」：`input` 里可能只剩
+          // 请求值（claude 一条 init 都没吐就退出、ACP `set_model` 被接受但运行时从没回报），
+          // 而 run 行上可能已经由运行中检查点补上了运行时回报的**实际值**——请求值顶掉实际值，
+          // 这一轮就永远记在一个没跑过的型号头上（PR #2213 评审阻断项 1）。同档以收尾值为准
+          // （`replace`）：收尾只写一次，且它是这一轮解析链的最终结论。
+          ...preferRunModel(
+            { effectiveModel: run.effectiveModel, modelSource: run.modelSource },
+            { effectiveModel: input.effectiveModel, modelSource: input.modelSource },
+            "replace"
+          ) ?? { effectiveModel: run.effectiveModel ?? null, modelSource: run.modelSource ?? null },
           transcriptRef: input.transcriptRef ?? null
         };
         const updated = await this.store.updateRun(id, patch);
@@ -286195,7 +286350,13 @@ async function startServe(opts) {
             metadata: { ...base, dispatchId: handle.id },
             // 恢复路径拿不到 dispatchChat 闭包里的 fallback 解析结果，开跑时先写进账本；退出帧若上报
             // 更精确 model 仍会覆盖为 runtime 来源。
-            ...chatModel ? { effectiveModel: chatModel, modelSource: chatModelSource } : {}
+            // 这是**请求值**（会话选择 / 员工配置 / runtime 默认），按 ④ 排在实际值之下：采集点 1 的
+            // 首帧检查点可能已经先一步把运行时回报的实际值写进这一行（两条路都是异步入队，谁先到不定），
+            // 预写不能把它顶掉。
+            ...preferRunModel(
+              { effectiveModel: run.effectiveModel, modelSource: run.modelSource },
+              { effectiveModel: chatModel, modelSource: chatModelSource }
+            ) ?? {}
           });
         });
         const buffered = [];
@@ -286267,11 +286428,17 @@ async function startServe(opts) {
               }]);
               const usage = info.usage ?? null;
               const modelFields = chatExitModelFields(info.model, chatModel, chatModelSource, info.modelSource);
+              const needsNativeSessionMetadata = !!info.runtimeSessionId && info.runtimeSessionId !== runtimeSessionId;
+              const currentRun = needsNativeSessionMetadata || "effectiveModel" in modelFields ? await (await traceStoreFor(runCompanyId)).getRun(traceRunId).catch(() => null) : null;
               let nativeSessionMetadata;
-              if (info.runtimeSessionId && info.runtimeSessionId !== runtimeSessionId) {
-                const run = await (await traceStoreFor(runCompanyId)).getRun(traceRunId).catch(() => null);
-                nativeSessionMetadata = nativeRuntimeSessionMetadata(run?.metadata, info.runtimeSessionId);
+              if (needsNativeSessionMetadata) {
+                nativeSessionMetadata = nativeRuntimeSessionMetadata(currentRun?.metadata, info.runtimeSessionId);
               }
+              const modelPatch = preferRunModel(
+                { effectiveModel: currentRun?.effectiveModel, modelSource: currentRun?.modelSource },
+                { effectiveModel: modelFields.effectiveModel, modelSource: modelFields.modelSource },
+                "replace"
+              ) ?? {};
               await traceAppender.update({
                 status: classifySessionExitStatus(info),
                 endedAt,
@@ -286281,7 +286448,7 @@ async function startServe(opts) {
                 ...!isHealthySessionExit(info) && info.reason !== "cancelled" ? { errorCode: info.reason ?? "error", errorMessage: formatExitError(info) } : {},
                 transcriptRef: info.transcriptRef ?? null,
                 usage,
-                ...modelFields,
+                ...modelPatch,
                 ...nativeSessionMetadata ? { metadata: nativeSessionMetadata } : {}
               });
               if (usage) await settleRunUsage(await traceStoreFor(runCompanyId), traceRunId);
@@ -294035,6 +294202,7 @@ ${buildCommandIndex()}
 ${USAGE_FOOTER}`;
 var COMMAND_HELP = buildCommandHelp();
 var HISTORICAL_REVIEW_GUIDANCE = "\u672C\u7968\u4E0D\u53C2\u4E0E\u672C\u8F6E quorum\uFF1B\u4F46\u5B83\u6307\u51FA\u7684\u95EE\u9898\u53EF\u80FD\u4ECD\u7136\u5B58\u5728\uFF0C\u9700\u9010\u6761\u5BF9\u7167 diff \u786E\u8BA4";
+var EMPTY_OK_NOTE_FLAGS = /* @__PURE__ */ new Set(["unresolved", "risks", "gaps", "next"]);
 function parseArgs(argv) {
   const positional = [];
   const flags = /* @__PURE__ */ new Map();
@@ -294061,6 +294229,10 @@ function parseArgs(argv) {
       const value2 = argv[i + 1];
       const key2 = a.slice(2);
       if (value2 === void 0 || value2.startsWith("--")) {
+        if (EMPTY_OK_NOTE_FLAGS.has(key2)) {
+          flags.set(key2, "");
+          continue;
+        }
         if (!booleanFlags.has(key2)) throw new Error(`flag ${a} \u9700\u8981\u4E00\u4E2A\u503C`);
         flags.set(key2, "true");
       } else {
@@ -294298,7 +294470,7 @@ async function waitForCommandAuthorization(base, headers, draftId, fallback) {
     }
   }
 }
-var CLI_VERSION = "2.2.83" ? "2.2.83" : "dev";
+var CLI_VERSION = "2.2.84" ? "2.2.84" : "dev";
 function apiHeaders(token, company) {
   const headers = {
     authorization: `Bearer ${token}`,
@@ -296165,6 +296337,10 @@ ${res.warning}`);
         note: flags.get("note")
       });
       println(message);
+      const ignoredNotes = [...EMPTY_OK_NOTE_FLAGS].filter((k2) => flags.has(k2)).map((k2) => `--${k2}`);
+      if (ignoredNotes.length > 0) {
+        println(`\u26A0 ${ignoredNotes.join("\u3001")} \u6CA1\u6709\u88AB\u8BB0\u5F55\uFF1Aoasis conclude \u53EA\u6536 --note\u3002\u8FD9\u51E0\u9879\u8981\u5199\u5728 oasis propose \u4E0A\uFF0C\u4E0B\u6B21\u4EA4\u4ED8\u65F6\u4E00\u8D77\u5E26\u4E0A\u3002`);
+      }
       break;
     }
     case "review": {
@@ -298214,7 +298390,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.83" : "dev";
+var PKG_VERSION = true ? "2.2.84" : "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.83",
+  "version": "2.2.84",
   "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": "5c5d91942396438773ec82f08aae69e2c0f52bf3"
+    "sourceHead": "aa2e3257b82571a32312b457698fdbe5e223d970"
   }
 }