oasis_test_v2 2.2.83 → 2.2.85

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;
   }
@@ -2953,6 +2977,7 @@ async function fetchResultPackage(base, fetchImpl, runId) {
 function toEpochMs(v2) {
   if (typeof v2 === "number" && Number.isFinite(v2)) return v2;
   if (typeof v2 === "string" && v2.length > 0) {
+    if (/^\d+(\.\d+)?$/.test(v2.trim())) return Number(v2.trim());
     const ms = Date.parse(v2);
     return Number.isNaN(ms) ? void 0 : ms;
   }
@@ -2969,6 +2994,98 @@ function latestSucceededRun(runs) {
   }
   return best;
 }
+function liveBoardRuns(st) {
+  const out = [];
+  const known = /* @__PURE__ */ new Set();
+  for (const t of st.turns ?? []) {
+    if (t.runId !== null) known.add(t.runId);
+    if (isTerminalRunStatus(t.status)) continue;
+    out.push({ key: t.runId ?? `msg:${t.messageId ?? "?"}`, status: t.status, ...t.agentId ? { agentId: t.agentId } : {}, source: "conversation" });
+  }
+  for (const r of st.runs) {
+    if (known.has(r.runId) || r.runId.length === 0) continue;
+    if (r.status !== "running" && r.status !== "queued") continue;
+    out.push({ key: r.runId, status: r.status, ...r.agentId ? { agentId: r.agentId } : {}, source: "registry" });
+  }
+  return out;
+}
+function latestEndedRun(st) {
+  let best;
+  for (const t of st.turns ?? []) {
+    if (!isTerminalRunStatus(t.status)) continue;
+    if (best === void 0 || (t.endedAt ?? Number.NEGATIVE_INFINITY) > (best.endedAt ?? Number.NEGATIVE_INFINITY)) best = t;
+  }
+  if (best) return { runId: best.runId, status: best.status, ...best.agentId ? { agentId: best.agentId } : {}, ...best.error ? { error: best.error } : {} };
+  const r = st.runs.find((x2) => isTerminalRunStatus(x2.status));
+  return r ? { runId: r.runId, status: r.status, ...r.agentId ? { agentId: r.agentId } : {}, ...r.error ? { error: r.error } : {} } : void 0;
+}
+function snapshotSourceRunId(st) {
+  let best;
+  for (const t of st.turns ?? []) {
+    if (t.status !== "succeeded" || t.runId === null) continue;
+    if (best === void 0 || (t.endedAt ?? Number.NEGATIVE_INFINITY) > (best.endedAt ?? Number.NEGATIVE_INFINITY)) best = t;
+  }
+  return best?.runId ?? latestSucceededRun(st.runs)?.runId;
+}
+function nonEmptyStr(v2) {
+  return typeof v2 === "string" && v2.trim().length > 0 ? v2 : void 0;
+}
+function turnError(m2, status) {
+  const events = Array.isArray(m2["events"]) ? m2["events"] : [];
+  for (let i = events.length - 1; i >= 0; i--) {
+    const e = events[i];
+    if (!e || typeof e !== "object") continue;
+    const ev = e;
+    if (ev["kind"] === "status" && ev["label"] === "error" && nonEmptyStr(ev["detail"])) return ev["detail"];
+  }
+  return status !== "succeeded" && isTerminalRunStatus(status) ? nonEmptyStr(m2["content"]) : void 0;
+}
+async function fetchBoardTurns(base, fetchImpl, boardKey) {
+  const convPath = `/api/projects/${encodeURIComponent(boardKey)}/conversations`;
+  const guard = (err) => {
+    if (err instanceof OdHttpError && (err.status === 401 || err.status === 403)) throw err;
+    return null;
+  };
+  let convs;
+  try {
+    convs = (await odApi(base, fetchImpl, "GET", convPath)).conversations ?? [];
+  } catch (err) {
+    if (err instanceof OdHttpError && err.status === 404) return [];
+    return guard(err);
+  }
+  const turns = [];
+  for (const c of convs) {
+    const cid = nonEmptyStr(c["id"]);
+    if (cid === void 0) continue;
+    let msgs;
+    try {
+      msgs = (await odApi(base, fetchImpl, "GET", `${convPath}/${encodeURIComponent(cid)}/messages`)).messages ?? [];
+    } catch (err) {
+      if (err instanceof OdHttpError && err.status === 404) continue;
+      return guard(err);
+    }
+    for (const m2 of msgs) {
+      if (!m2 || typeof m2 !== "object" || m2["role"] !== "assistant") continue;
+      const status = nonEmptyStr(m2["runStatus"]);
+      if (status === void 0) continue;
+      const runId = nonEmptyStr(m2["runId"]) ?? null;
+      const messageId = nonEmptyStr(m2["id"]) ?? null;
+      if (runId === null && messageId === null) continue;
+      const turn = { conversationId: cid, runId, messageId, status };
+      const agentId = nonEmptyStr(m2["agentId"]);
+      if (agentId) turn.agentId = agentId;
+      const error2 = turnError(m2, status);
+      if (error2) turn.error = error2;
+      const startedAt = toEpochMs(m2["startedAt"]) ?? toEpochMs(m2["createdAt"]);
+      if (startedAt !== void 0) turn.startedAt = startedAt;
+      const endedAt = toEpochMs(m2["endedAt"]);
+      if (endedAt !== void 0) turn.endedAt = endedAt;
+      turns.push(turn);
+    }
+  }
+  turns.sort((a, b2) => (b2.startedAt ?? Number.NEGATIVE_INFINITY) - (a.startedAt ?? Number.NEGATIVE_INFINITY) || 0);
+  return turns;
+}
 async function fetchBoardStatus(base, fetchImpl, artifactId) {
   const boardKey = deriveBoardKey(artifactId);
   let boardExists = true;
@@ -3011,7 +3128,31 @@ async function fetchBoardStatus(base, fetchImpl, artifactId) {
     } catch {
     }
   }
-  return { boardKey, boardExists, runs, artifacts };
+  const turns = boardExists ? await fetchBoardTurns(base, fetchImpl, boardKey) : [];
+  return { boardKey, boardExists, runs, turns, artifacts };
+}
+async function waitBoardSettled(base, fetchImpl, artifactId, opts = {}) {
+  const interval = opts.intervalMs ?? 2e4;
+  const timeout = opts.timeoutMs ?? 100 * 6e4;
+  const sleep6 = opts.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
+  const now = opts.now ?? Date.now;
+  const started = now();
+  let lastKey = null;
+  let waited = false;
+  for (; ; ) {
+    const st = await fetchBoardStatus(base, fetchImpl, artifactId);
+    const elapsedMs = now() - started;
+    if (!st.boardExists) return { status: st, settled: true, waited, live: [], elapsedMs };
+    const live = liveBoardRuns(st);
+    const unreadable = st.turns === null;
+    if (live.length === 0 && !unreadable) return { status: st, settled: true, waited, live, elapsedMs };
+    const key2 = unreadable && live.length === 0 ? "?" : live.map((r) => `${r.key}=${r.status}`).sort().join(",");
+    opts.onPoll?.({ live, elapsedMs, changed: key2 !== lastKey, unreadable });
+    lastKey = key2;
+    if (elapsedMs >= timeout) return { status: st, settled: false, waited: true, live, elapsedMs };
+    waited = true;
+    await sleep6(Math.min(interval, Math.max(0, timeout - elapsedMs)));
+  }
 }
 async function pumpDesignEvents(base, fetchImpl, runId, onLine) {
   const res = await fetchImpl(`${base}/api/runs/${runId}/events`);
@@ -3080,16 +3221,25 @@ async function harvestBoard(base, fetchImpl, publicBase, workRoot, boardKey, run
       }
     }
   }
-  fs2.writeFileSync(
-    path2.join(dir, "board.link"),
-    `${publicBase}/projects/${boardKey}
-\u5165\u53E3\u7A3F\uFF1A${entry}
-\u5FEB\u7167\u6765\u6E90 run\uFF1A${runId}
-\uFF08\u6D3B\u753B\u677F\u2014\u2014\u7EE7\u7EED\u8FED\u4EE3\u8BF7\u56DE\u5230\u8BE5\u9879\u76EE\uFF1B\u672C\u88C5\u7BB1\u5355\u4E3A\u8BE5\u6B21\u4EA4\u4ED8\u7684\u51BB\u7ED3\u5FEB\u7167\uFF09
-`
-  );
+  fs2.writeFileSync(path2.join(dir, BOARD_LINK_FILE), formatBoardLink({ publicBase, boardKey, entry, runId }));
   return { dir, entry };
 }
+function formatBoardLink(args) {
+  return `${args.publicBase}/projects/${args.boardKey}
+\u5165\u53E3\u7A3F\uFF1A${args.entry}
+${SOURCE_RUN_LABEL}${args.runId}
+\uFF08\u6D3B\u753B\u677F\u2014\u2014\u7EE7\u7EED\u8FED\u4EE3\u8BF7\u56DE\u5230\u8BE5\u9879\u76EE\uFF1B\u672C\u88C5\u7BB1\u5355\u4E3A\u8BE5\u6B21\u4EA4\u4ED8\u7684\u51BB\u7ED3\u5FEB\u7167\uFF09
+`;
+}
+function parseBoardLinkSourceRun(text7) {
+  for (const line2 of text7.split(/\r?\n/)) {
+    const t = line2.trim();
+    if (!t.startsWith(SOURCE_RUN_LABEL)) continue;
+    const id = t.slice(SOURCE_RUN_LABEL.length).trim();
+    return id.length > 0 && id !== UNKNOWN_SOURCE_RUN ? id : null;
+  }
+  return null;
+}
 async function startDesignChatTurn(opts) {
   const fetchImpl = withOdToken(opts.fetchImpl ?? fetch, opts.token);
   const boardKey = deriveBoardKey(opts.artifactId);
@@ -3119,7 +3269,7 @@ async function runDesignChatTurn(opts) {
   const { artifacts, fileCount } = await fetchResultPackage(opts.base, fetchImpl, runId);
   return { boardKey, conversationId, runId, userMessageId, artifacts, fileCount };
 }
-var import_node_crypto2, fs2, path2, OdHttpError, TASK_CONTEXT_DIR;
+var import_node_crypto2, fs2, path2, OdHttpError, TASK_CONTEXT_DIR, TERMINAL_TURN_STATUS, isTerminalRunStatus, BOARD_LINK_FILE, SOURCE_RUN_LABEL, UNKNOWN_SOURCE_RUN;
 var init_driver = __esm({
   "../adapters/src/open-design/driver.ts"() {
     "use strict";
@@ -3133,6 +3283,11 @@ var init_driver = __esm({
       }
     };
     TASK_CONTEXT_DIR = "task-context/";
+    TERMINAL_TURN_STATUS = /* @__PURE__ */ new Set(["succeeded", "failed", "canceled", "cancelled"]);
+    isTerminalRunStatus = (s2) => TERMINAL_TURN_STATUS.has(s2);
+    BOARD_LINK_FILE = "board.link";
+    SOURCE_RUN_LABEL = "\u5FEB\u7167\u6765\u6E90 run\uFF1A";
+    UNKNOWN_SOURCE_RUN = "status-pull";
   }
 });
 
@@ -8506,14 +8661,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 +8826,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 +8903,7 @@ ${note}` : note };
             sessionId = job.runtimeSessionId;
             ambiguousResume = true;
           }
+          if (sessionId) freshSession = false;
         } catch {
           sessionId = "";
         }
@@ -8725,6 +8917,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 +8954,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 +8975,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 +9744,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 +9805,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 +9823,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 +9846,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 +9855,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 +9904,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 } : {}
         });
       }
@@ -140895,14 +141147,19 @@ ${m2.spec.split("\n").map((l) => `  > ${l}`).join("\n")}`);
       })() : canvasMode ? [
         // 内核只出「你产什么 + 内核权威锚点」——**设计工作流散文全在你的人设（identity/AGENTS.md「产出流程」）**，
         // 那是单一真源、改它=改配置不发版（提案 design-conversational-driving 治本，2026-07-17）。这里不重复正文，
-        // 只钉住内核唯一不能漂的两件事：真实 artifactId、缺前置的逃生口 gap。
+        // 只钉住内核不能漂的几件事：真实 artifactId、缺前置的逃生口 gap，以及「下单后在会话里 status --wait 等结果」
+        //（2026-09-24 加：它直接关系引擎的零产出判定——下单即退出会被判零产出→协议续唤→连败熔断；人设各公司
+        // 各一份、未必同步更新，这条放内核才保证每个设计员工都拿得到）。
         `\u4F60\u8D1F\u8D23 **design \u4EA7\u7269 \`${artifactId}\`**\uFF0C\u8FD0\u884C\u5728**\u901A\u7528\u8FD0\u884C\u65F6**\u4E0A\u2014\u2014\u4F60\u662F\u7532\u65B9\u8BBE\u8BA1\u8D1F\u8D23\u4EBA\uFF0C\u591A\u8F6E\u5BF9\u8BDD\u9A71\u52A8**\u534F\u4F5C\u753B\u677F\u5F15\u64CE**\u6253\u78E8\u754C\u9762\u7A3F\u3002`,
         ``,
         `**\u5B8C\u6574\u5DE5\u4F5C\u6D41\uFF08\u600E\u4E48\u53D6\u8D27/\u8D77\u8F6E/\u8BFB\u4EA7\u7269/\u4EA4\u7A3F/\u522B\u624B\u6539\u677F\u6587\u4EF6\u2026\uFF09\u89C1\u4F60\u7684\u4EBA\u8BBE \`identity/AGENTS.md\` \u7684\u300C\u4EA7\u51FA\u6D41\u7A0B\uFF08design \u4EA7\u7269\uFF09\u300D**\u2014\u2014\u628A\u91CC\u9762 \`<artifactId>\` \u90FD\u6362\u6210\u672C\u4EA7\u7269 \`${artifactId}\`\u3002`,
         ``,
-        `\u5185\u6838\u53EA\u5728\u6B64\u9489\u4E24\u6761\u4E0D\u53EF\u6F02\u7684\uFF1A`,
+        `\u5185\u6838\u53EA\u5728\u6B64\u9489\u51E0\u6761\u4E0D\u53EF\u6F02\u7684\uFF1A`,
         `- **\u4EA4\u7A3F\u8D70 \`oasis propose ${artifactId} --from-dir <\u76EE\u5F55> --reason "\u2026"\`**\uFF08proposed \u624D\u8FDB\u7248\u672C\u53F2\u3001\u4E0B\u6E38\u624D\u62FF\u5F97\u5230\uFF1B\u4E0D propose = head \u4ECD \u2205\uFF09\uFF1B`,
-        `- \u7F3A**\u8FD8\u4E0D\u5B58\u5728\u7684\u4E0A\u6E38\u524D\u7F6E** \u2192 \`oasis gap ${artifactId} --desc "<\u7F3A\u4EC0\u4E48>"\` \u4EA4\u4E0A\u53BB\uFF1B\u5DF2\u505A\u5B8C\u7684\u90E8\u5206\u7167\u5E38 \`propose\`\uFF0C\u4F46\u8FD9\u4E00\u8F6E \`conclude\` \u4F1A\u88AB\u62D2\uFF0C\u63D0\u4EA4\u5B8C\u5373\u6536\u5DE5\u3002`
+        `- \u7F3A**\u8FD8\u4E0D\u5B58\u5728\u7684\u4E0A\u6E38\u524D\u7F6E** \u2192 \`oasis gap ${artifactId} --desc "<\u7F3A\u4EC0\u4E48>"\` \u4EA4\u4E0A\u53BB\uFF1B\u5DF2\u505A\u5B8C\u7684\u90E8\u5206\u7167\u5E38 \`propose\`\uFF0C\u4F46\u8FD9\u4E00\u8F6E \`conclude\` \u4F1A\u88AB\u62D2\uFF0C\u63D0\u4EA4\u5B8C\u5373\u6536\u5DE5\u3002`,
+        `- **\u5728\u672C\u4F1A\u8BDD\u91CC\u7B49\u753B\u677F\u51FA\u7ED3\u679C**\uFF08\u540C\u5F00\u53D1\u7B49 CI\uFF09\uFF1A\u5F00\u5DE5\u5148 \`oasis design status ${artifactId}\`\uFF08\u6062\u590D\u4F18\u5148\uFF0C\u677F\u4E0A\u5DF2\u6709\u8D27/\u5DF2\u6709\u5728\u8DD1\u7684\u8F6E\u6B21\u5C31\u522B\u91CD\u4E0B\uFF09\uFF1B\u4E0B\u5355\u7528 \`oasis design chat ${artifactId} \u2026 --async\`\uFF0C\u7136\u540E**\u7ACB\u523B** \`oasis design status ${artifactId} --wait --pull\` \u963B\u585E\u7B49\u8FD9\u4E00\u8F6E\u8DD1\u5B8C\u5E76\u62C9\u8D27\uFF08\u6700\u957F\u7EA6 100 \u5206\u949F\uFF1B\u963B\u585E\u671F\u95F4\u4E0D\u8017 token\uFF09\u3002\u6210\u529F \u2192 \u6838\u5BF9 \u2192 propose\uFF1B\u5931\u8D25 \u2192 \u6309\u5B83\u7ED9\u7684\u539F\u56E0\u6362\u5F15\u64CE\uFF08\`--agent\`\uFF09\u6216\u8865\u6E05\u9700\u6C42\u540E\u91CD\u4E0B\uFF0C\u518D \`--wait\`\u3002`,
+        `  - **\u4E0D\u8981\u4E0B\u5355\u540E\u76F4\u63A5\u7ED3\u675F\u4F1A\u8BDD**\u2014\u2014\u6CA1\u4EA4\u4E1C\u897F\u5C31\u6536\u5DE5\u4F1A\u88AB\u5224\u96F6\u4EA7\u51FA\uFF1B**\u4E5F\u4E0D\u8981\u81EA\u5DF1\u9694\u51E0\u5206\u949F\u624B\u52A8 status \u8F6E\u8BE2**\u2014\u2014\u6BCF\u67E5\u4E00\u6B21\u90FD\u8981\u63A8\u7406\u4E00\u6B21\u3002\u547D\u4EE4\u82E5\u88AB\u6267\u884C\u5DE5\u5177\u7684\u5355\u6761\u8D85\u65F6\u6253\u65AD\u6216\u8D85\u65F6\u9000\u51FA\uFF0C\u539F\u6837\u518D\u8DD1\u4E00\u6B21 \`--wait\` \u63A5\u7740\u7B49\uFF08\u5B83\u7B49\u7684\u662F\u753B\u677F\uFF0C\u4E0D\u4F1A\u91CD\u590D\u4E0B\u5355\uFF09\u3002`,
+        `- \u88AB\u753B\u677F\u5DE1\u68C0\u7684\u4FE1\u5524\u9192\u65F6\uFF1A\u5148\u770B\u5F53\u524D\u7248\u672C\u88C5\u7BB1\u5355 board.link \u91CC\u7684\u300C\u5FEB\u7167\u6765\u6E90 run\u300D\u662F\u4E0D\u662F\u5C31\u662F\u4FE1\u91CC\u90A3\u4E00\u8F6E\u2014\u2014\u662F\u5C31 \`oasis resolve <\u4FE1 id>\`\uFF0C\u522B\u91CD\u590D propose\u3002`
       ] : (() => {
         const codeRepo = args.codeRepo ?? null;
         const repos = typeDef?.contentType === "code" ? codeRepo?.repos : void 0;
@@ -140939,16 +141196,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 +227520,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 +228292,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 +228326,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 +228347,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 +228702,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 +228712,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 +228936,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 +229165,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 +229193,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 +229206,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 +248454,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);
@@ -277331,11 +277622,18 @@ function messageError(m2, status) {
   }
   return { error: null, errorCode: null };
 }
+function ownerIsWorking(model, a) {
+  if (a.latestWorkState !== "running") return false;
+  const latest = [...model.revisions.values()].filter((r) => r.artifactId === a.id && r.lane !== "reply").sort((x2, y) => y.createdAt.localeCompare(x2.createdAt))[0];
+  return latest !== void 0 && latest.author === a.owner;
+}
 var RUN_MARKER_PREFIX, boardWatchRunMarker, parseRunMarker, SINCE_MARKER_PREFIX, boardWatchSinceMarker, parseSinceMarker, TERMINAL_RUN_STATUS, MAX_REASON_CHARS, MAX_LISTED_FILES, BoardWatcher;
 var init_board_watch = __esm({
   "../server/src/design/board-watch.ts"() {
     "use strict";
+    init_src();
     init_src7();
+    init_src2();
     RUN_MARKER_PREFIX = "[od-board-watch run:";
     boardWatchRunMarker = (roundKey) => `${RUN_MARKER_PREFIX}${roundKey}]`;
     parseRunMarker = (body2) => {
@@ -277368,6 +277666,14 @@ var init_board_watch = __esm({
       seenConvAt = /* @__PURE__ */ new Map();
       /** 公司 → 上次记下的失败原文（同样的错只记一次；成功一轮就清掉）。 */
       companyLastError = /* @__PURE__ */ new Map();
+      /** `<公司>\0<artifactId>\0<轮次键>` → 这一轮已被取走（head 来自它或更晚的一轮），不再重判。只在内存，不写假信。 */
+      takenRounds = /* @__PURE__ */ new Set();
+      /** `<公司>\0<boardKey>` → (runId → endedAt)：判断 head 的快照来源 run 是不是「更晚的一轮」用。 */
+      roundEndedAt = /* @__PURE__ */ new Map();
+      /** `<公司>\0<revisionId>` → 该版 board.link 的快照来源 runId（null = 没有/读不到）。revision 内容不可变，缓存安全。 */
+      revisionSourceRun = /* @__PURE__ */ new Map();
+      /** 因 owner 在做而压着没写的 `<公司>\0<artifactId>`（只为日志只打一次）。 */
+      deferredLogged = /* @__PURE__ */ new Set();
       async odGet(path47) {
         const fetchImpl = this.deps.fetchImpl ?? fetch;
         try {
@@ -277428,7 +277734,8 @@ var init_board_watch = __esm({
         if (listCompanies && kernelFor) {
           for (const companyId of await listCompanies()) {
             try {
-              await this.tickCompany(companyId, await kernelFor(companyId), now, denied);
+              const blobs = this.deps.blobsFor ? await this.deps.blobsFor(companyId) : void 0;
+              await this.tickCompany(companyId, await kernelFor(companyId), now, denied, blobs);
               this.companyLastError.delete(companyId);
             } catch (err) {
               const msg = String(err);
@@ -277438,7 +277745,7 @@ var init_board_watch = __esm({
             }
           }
         } else {
-          await this.tickCompany("", this.deps.kernel, now, denied);
+          await this.tickCompany("", this.deps.kernel, now, denied, this.deps.blobs);
         }
         if (denied.length > 0) {
           const codes = [...new Set(denied.map((d) => d.status))].join("/");
@@ -277449,7 +277756,7 @@ var init_board_watch = __esm({
         }
       }
       /** 巡一家公司（company 为空串 = 单 kernel 模式）；被拒的板记进 denied，由 tick 统一汇总成一行。 */
-      async tickCompany(company, kernel, now, denied) {
+      async tickCompany(company, kernel, now, denied, blobs) {
         const { boardKeyOf, log: log3 } = this.deps;
         const graceMs = this.deps.firstLookGraceMs ?? 10 * 6e4;
         const maxPerTick = this.deps.maxLettersPerTick ?? 2;
@@ -277484,12 +277791,40 @@ var init_board_watch = __esm({
             continue;
           }
           if (recordedSince === null && !this.pinnedSince.has(pinKey)) this.pinnedSince.set(pinKey, since);
-          const fresh = read3.value.rounds.filter((r) => r.endedAt > since && !lettered.has(r.key)).sort((x2, y) => x2.endedAt - y.endedAt);
+          const endedAtOf = this.roundEndedAt.get(`${company}\0${boardKey}`) ?? /* @__PURE__ */ new Map();
+          this.roundEndedAt.set(`${company}\0${boardKey}`, endedAtOf);
+          for (const r of read3.value.rounds) if (r.runId !== null) endedAtOf.set(r.runId, r.endedAt);
+          const takenKey = (r) => `${company}\0${a.id}\0${r.key}`;
+          const fresh = read3.value.rounds.filter((r) => r.endedAt > since && !lettered.has(r.key) && !this.takenRounds.has(takenKey(r))).sort((x2, y) => x2.endedAt - y.endedAt);
+          const deferKey = `${company}\0${a.id}`;
+          if (fresh.length > 0 && ownerIsWorking(model, a)) {
+            if (!this.deferredLogged.has(deferKey)) {
+              this.deferredLogged.add(deferKey);
+              log3?.(`[board-watch] ${tag}${a.id} \u7684 owner \u6B63\u5728\u6267\u884C\u8FD9\u4E2A\u8282\u70B9\uFF0C\u677F ${boardKey} \u4E0A ${fresh.length} \u8F6E\u7ED3\u675F\u7684\u5BF9\u8BDD\u5148\u4E0D\u5199\u4FE1\uFF0C\u7B49\u5B83\u8FD9\u8F6E work \u7ED3\u675F\u518D\u770B`);
+            }
+            continue;
+          }
+          this.deferredLogged.delete(deferKey);
+          const sourceRuns = fresh.length > 0 && blobs ? await this.headSourceRuns(company, blobs, model, a, log3, tag) : [];
+          const takenBy = (r) => {
+            for (const src of sourceRuns) {
+              if (r.runId !== null && src === r.runId) return src;
+              const srcEnded = endedAtOf.get(src);
+              if (srcEnded !== void 0 && srcEnded >= r.endedAt) return src;
+            }
+            return null;
+          };
           const seen = /* @__PURE__ */ new Set();
           for (const r of fresh) {
             if (written >= maxPerTick) break;
             if (seen.has(r.key)) continue;
             seen.add(r.key);
+            const src = takenBy(r);
+            if (src !== null) {
+              this.takenRounds.add(takenKey(r));
+              log3?.(`[board-watch] ${tag}${a.id} \u2190 \u677F ${boardKey} \u4E00\u8F6E\u5BF9\u8BDD\u7ED3\u675F\uFF08${r.key.slice(0, 12)} ${r.status}\uFF09\uFF0C\u5F53\u524D\u7248\u672C\u7684\u5FEB\u7167\u6765\u6E90 run ${src} \u5DF2\u8986\u76D6\u5B83 \u2192 \u4E0D\u5199\u4FE1`);
+              continue;
+            }
             const ok3 = r.status === "succeeded";
             const reason = ok3 ? null : r.error ?? (r.runId !== null ? await this.runErrorFromRegistry(boardKey, r.runId) : null);
             await kernel.annotate({ artifactId: a.id, actor, body: this.letterBody(a.id, boardKey, r, since, reason), kind: "comment" });
@@ -277502,6 +277837,36 @@ var init_board_watch = __esm({
           }
         }
       }
+      /**
+       * 当前 head 与最近一版装箱单（两者可能不同：head 在跑空壳/被打回时回落）各自 board.link 里的快照来源 runId。
+       * 读不到（非装箱单、没有 board.link、blob 缺失、占位 status-pull）的不算。
+       */
+      async headSourceRuns(company, blobs, model, a, log3, tag) {
+        const candidates = [];
+        const head = a.currentRev ? model.revisions.get(a.currentRev) : void 0;
+        if (head) candidates.push(head);
+        const latestManifest = [...model.revisions.values()].filter((r) => r.artifactId === a.id && r.contentKind === "manifest" && r.contentRef.length > 0).sort((x2, y) => y.createdAt.localeCompare(x2.createdAt))[0];
+        if (latestManifest && latestManifest.id !== head?.id) candidates.push(latestManifest);
+        const out = [];
+        for (const rev of candidates) {
+          if (rev.contentKind !== "manifest" || rev.contentRef.length === 0) continue;
+          const cacheKey = `${company}\0${rev.id}`;
+          let src = this.revisionSourceRun.get(cacheKey);
+          if (src === void 0) {
+            try {
+              const manifest = parseManifest(await blobs.get(rev.contentRef));
+              const entry = manifest.entries.find((e) => e.path === BOARD_LINK_FILE);
+              src = entry ? parseBoardLinkSourceRun(new TextDecoder().decode(await blobs.get(entry.hash))) : null;
+            } catch (err) {
+              log3?.(`[board-watch] ${tag}\u8BFB ${a.id} \u7248\u672C ${rev.id} \u7684 board.link \u5931\u8D25\uFF08${String(err)}\uFF09\uFF0C\u6309\u300C\u4E0D\u77E5\u9053\u6765\u81EA\u54EA\u4E00\u8F6E\u300D\u5904\u7406`);
+              src = null;
+            }
+            this.revisionSourceRun.set(cacheKey, src);
+          }
+          if (src !== null) out.push(src);
+        }
+        return out;
+      }
       letterBody(artifactId, boardKey, r, since, reason) {
         const marker = `${boardWatchRunMarker(r.key)} ${boardWatchSinceMarker(since)}`;
         const round = `${r.runId !== null ? `run ${r.runId.slice(0, 8)}` : `\u6D88\u606F ${r.key.slice(4, 12)}`}\uFF0C\u5F15\u64CE=${r.agentId ?? "?"}\uFF0C\u7ED3\u675F\u4E8E ${new Date(r.endedAt).toISOString()}`;
@@ -277512,7 +277877,8 @@ var init_board_watch = __esm({
             `\u753B\u677F ${boardKey} \u4E0A\u6709\u4E00\u8F6E\u5BF9\u8BDD\u8DD1\u5B8C\u4E86\uFF08${round}\uFF09\uFF0C\u8FD9\u4E00\u8F6E\u4EA7\u51FA\uFF1A`,
             files,
             ``,
-            `\u53D6\u8D27\u6838\u5BF9\uFF1A\`oasis design status ${artifactId} --pull\` \u2192 \u5BF9\u7740 DESIGN_BRIEF.md \u4E0E inputs/ \u9010\u5B57\u6BB5\u6838\uFF08\u6570\u636E\u5BF9\u4E0D\u5BF9\u3001\u72B6\u6001\u5168\u4E0D\u5168\u3001\u6709\u6CA1\u6709\u7F16\u9020\uFF09\u3002\u591F\u597D\u5C31 \`oasis propose ${artifactId} --from-dir <\u76EE\u5F55> --reason "<\u8FD9\u7248\u505A\u4E86\u4EC0\u4E48>"\`\uFF1B\u8981\u6539\u5C31\u56DE\u677F\u4E0A\u518D\u6765\u4E00\u8F6E \`oasis design chat ${artifactId} --turn continue --message "<\u8981\u6539\u4EC0\u4E48>" --async\`\uFF08\u26D4 \u522B\u628A --pull \u4E0B\u6765\u7684\u6587\u4EF6\u5728\u672C\u5730\u624B\u6539\u540E propose\uFF09\u3002\u8FD9\u4E00\u8F6E\u82E5\u662F\u4EBA\u76F4\u63A5\u5728\u677F\u4E0A\u804A\u51FA\u6765\u7684\u3001\u5185\u5BB9\u4E0D\u5FC5\u6536\u5F55\uFF0C\u56DE\u5E16\u8BF4\u660E\u540E\u6309 wontfix \u5904\u7406\u5373\u53EF\uFF08\u540C\u4E00\u8F6E\u4E0D\u4F1A\u518D\u6765\u4FE1\uFF09\u3002`
+            `\u5148\u770B\u8FD9\u4E00\u8F6E\u662F\u4E0D\u662F\u5DF2\u7ECF\u4EA4\u8FC7\uFF1A\u5F53\u524D\u7248\u672C\u88C5\u7BB1\u5355\u91CC board.link \u7684\u300C\u5FEB\u7167\u6765\u6E90 run\u300D\u5982\u679C\u5C31\u662F ${r.runId ?? "\u8FD9\u4E00\u8F6E"}\uFF0C\u8BF4\u660E\u5DF2\u53D6\u8D70\uFF0C\`oasis resolve <\u672C\u4FE1 id> --as resolved\` \u5373\u53EF\uFF0C\u522B\u91CD\u590D propose\u3002`,
+            `\u6CA1\u4EA4\u8FC7\u5C31\u53D6\u8D27\u6838\u5BF9\uFF1A\`oasis design status ${artifactId} --wait --pull\`\uFF08\u677F\u4E0A\u8FD8\u6709\u5728\u8DD1\u7684\u8F6E\u6B21\u4F1A\u5148\u7B49\u5B83\u8DD1\u5B8C\uFF09\u2192 \u5BF9\u7740 DESIGN_BRIEF.md \u4E0E inputs/ \u9010\u5B57\u6BB5\u6838\uFF08\u6570\u636E\u5BF9\u4E0D\u5BF9\u3001\u72B6\u6001\u5168\u4E0D\u5168\u3001\u6709\u6CA1\u6709\u7F16\u9020\uFF09\u3002\u591F\u597D\u5C31 \`oasis propose ${artifactId} --from-dir <\u76EE\u5F55> --reason "<\u8FD9\u7248\u505A\u4E86\u4EC0\u4E48>"\`\uFF1B\u8981\u6539\u5C31\u56DE\u677F\u4E0A\u518D\u6765\u4E00\u8F6E \`oasis design chat ${artifactId} --turn continue --message "<\u8981\u6539\u4EC0\u4E48>" --async\`\uFF0C\u968F\u540E \`oasis design status ${artifactId} --wait --pull\` \u7B49\u7ED3\u679C\uFF08\u26D4 \u522B\u628A --pull \u4E0B\u6765\u7684\u6587\u4EF6\u5728\u672C\u5730\u624B\u6539\u540E propose\uFF09\u3002\u8FD9\u4E00\u8F6E\u82E5\u662F\u4EBA\u76F4\u63A5\u5728\u677F\u4E0A\u804A\u51FA\u6765\u7684\u3001\u5185\u5BB9\u4E0D\u5FC5\u6536\u5F55\uFF0C\u56DE\u5E16\u8BF4\u660E\u540E\u6309 wontfix \u5904\u7406\u5373\u53EF\uFF08\u540C\u4E00\u8F6E\u4E0D\u4F1A\u518D\u6765\u4FE1\uFF09\u3002`
           ].join("\n");
         }
         const quoted = reason === null ? null : reason.length > MAX_REASON_CHARS ? `${reason.slice(0, MAX_REASON_CHARS)}\u2026` : reason;
@@ -277521,7 +277887,7 @@ var init_board_watch = __esm({
           `\u753B\u677F ${boardKey} \u4E0A\u6709\u4E00\u8F6E\u5BF9\u8BDD**\u6CA1\u8DD1\u6210**\uFF08\u7EC8\u6001=${r.status}\uFF0C${round}\uFF09\u3002`,
           quoted !== null ? `od \u8BB0\u7684\u539F\u56E0\uFF08\u539F\u6587\uFF09\uFF1A${quoted}${r.errorCode !== null ? `\uFF08\u9519\u8BEF\u7801 ${r.errorCode}\uFF09` : ""}` : `od \u6CA1\u6709\u8BB0\u5F55\u8FD9\u4E00\u8F6E\u7684\u5931\u8D25\u539F\u56E0\u3002`,
           ``,
-          `\u5148 \`oasis design status ${artifactId}\` \u770B\u677F\u4E0A\u6709\u6CA1\u6709\u53EF\u7528\u7684\u4E0A\u4E00\u7248\uFF1A\u6709\u5C31\u7167\u5E38\u53D6\u8D27\u6838\u5BF9\u3002\u8981\u91CD\u8DD1\u5C31\u81EA\u5DF1\u5224\u65AD\uFF1A\u50CF\u662F\u989D\u5EA6/\u9650\u6D41\u5C31\u7B49\u6062\u590D\u540E\u518D\u6765\uFF0C\u6216\u6362\u4E2A\u5F15\u64CE \`oasis design chat ${artifactId} --agent <\u5F15\u64CE> --message "<\u2026>" --async\`\uFF1B\u50CF\u662F\u9700\u6C42/\u6570\u636E\u95EE\u9898\u5C31\u628A\u5B83\u4EEC\u9489\u5F97\u66F4\u6B7B\u540E\u91CD\u8D77\u4E00\u8F6E\uFF1B\u4ECD\u4E0D\u884C\u7528 \`oasis gap ${artifactId} --desc "<\u5361\u5728\u54EA>"\` \u5192\u6CE1\u7ED9\u4EBA\u3002`
+          `\u5148 \`oasis design status ${artifactId}\` \u770B\u677F\u4E0A\u6709\u6CA1\u6709\u53EF\u7528\u7684\u4E0A\u4E00\u7248\uFF1A\u6709\u5C31\u7167\u5E38\u53D6\u8D27\u6838\u5BF9\u3002\u8981\u91CD\u8DD1\u5C31\u81EA\u5DF1\u5224\u65AD\uFF1A\u50CF\u662F\u989D\u5EA6/\u9650\u6D41\u5C31\u7B49\u6062\u590D\u540E\u518D\u6765\uFF0C\u6216\u6362\u4E2A\u5F15\u64CE \`oasis design chat ${artifactId} --turn continue --agent <\u5F15\u64CE> --message "<\u2026>" --async\`\uFF1B\u50CF\u662F\u9700\u6C42/\u6570\u636E\u95EE\u9898\u5C31\u628A\u5B83\u4EEC\u9489\u5F97\u66F4\u6B7B\u540E\u91CD\u8D77\u4E00\u8F6E\u3002\u91CD\u4E0B\u4E4B\u540E\u7ACB\u523B \`oasis design status ${artifactId} --wait --pull\` \u5728\u4F1A\u8BDD\u91CC\u7B49\u7ED3\u679C\uFF0C\u522B\u4E0B\u5355\u5C31\u6536\u5DE5\u3002\u4ECD\u4E0D\u884C\u7528 \`oasis gap ${artifactId} --desc "<\u5361\u5728\u54EA>"\` \u5192\u6CE1\u7ED9\u4EBA\u3002`
         ].join("\n");
       }
     };
@@ -278654,6 +279020,7 @@ __export(src_exports2, {
   openNewEngine: () => openNewEngine,
   operatorCrossCompanyRead: () => operatorCrossCompanyRead,
   outputsPartProvider: () => outputsPartProvider,
+  ownerIsWorking: () => ownerIsWorking,
   packMatches: () => packMatches,
   parentConversationTaskLines: () => parentConversationTaskLines,
   parseConnectorSkillId: () => parseConnectorSkillId,
@@ -286195,7 +286562,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 +286640,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 +286660,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);
@@ -289142,6 +289521,8 @@ ${nodeFault}` : "");
         return [defaultCompanyId, ...active.filter((id) => id !== defaultCompanyId)];
       },
       kernelFor: async (companyId) => (await getEngine(companyId)).kernel,
+      // 读 head 装箱单里的 board.link（「快照来源 run」）判断这一轮是否已被取走，已取走就不写信
+      blobsFor: async (companyId) => (await getEngine(companyId)).blobs,
       odBase,
       ...odToken ? { odToken } : {},
       boardKeyOf: deriveBoardKey,
@@ -292401,29 +292782,32 @@ var COMMAND_DECLS = {
     flags: [
       { name: "message", desc: "\u6D88\u606F\u5185\u5BB9", required: true },
       { name: "turn", desc: "\u5BF9\u8BDD\u8F6E\u6B21\uFF08first | continue\uFF09" },
-      { name: "async", desc: "\u5F02\u6B65\u6A21\u5F0F\uFF08\u8D77\u5B8C\u5373\u8FD4\uFF09" },
+      { name: "async", desc: "\u4E0B\u5355\u5373\u8FD4\uFF1B\u968F\u540E\u7528 design status --wait --pull \u963B\u585E\u7B49\u7ED3\u679C" },
       { name: "system", desc: "\u7CFB\u7EDF\u63D0\u793A" }
     ],
     examples: ['oasis design chat artifact:design:xyz --message "\u628A\u6309\u94AE\u6539\u6210\u84DD\u8272" --turn continue']
   },
   "design status": {
     group: "\u8BBE\u8BA1\u7A3F",
-    usage: "oasis design status <artifactId> [--pull]",
-    description: "\u67E5\u753B\u677F\u73B0\u72B6\uFF08\u6062\u590D\u4F18\u5148\uFF09\u3002\u88AB\u6D3E\u53D1\u5148\u8DD1\u5B83\u2014\u2014\u5F15\u64CE\u5728\u8DD1\u5C31\u522B\u8D77\u65B0\u8F6E\u3002",
+    usage: "oasis design status <artifactId> [--pull] [--wait [--wait-timeout <\u5206\u949F>]]",
+    description: "\u67E5\u753B\u677F\u73B0\u72B6\uFF08\u6062\u590D\u4F18\u5148\uFF09\u3002\u88AB\u6D3E\u53D1\u5148\u8DD1\u5B83\u2014\u2014\u5F15\u64CE\u5728\u8DD1\u5C31\u522B\u8D77\u65B0\u8F6E\u3002--wait\uFF1A\u677F\u4E0A\u6709\u5728\u8DD1\u7684\u8F6E\u6B21\u5C31\u963B\u585E\u7B49\u5230\u5168\u90E8\u7ED3\u675F\uFF08\u4E0D\u7BA1\u662F\u8C01\u8D77\u7684\uFF09\uFF0C\u518D\u6253\u5370\u7ED3\u679C\uFF1B\u8D85\u65F6\u975E\u96F6\u9000\u51FA\u3002",
     positional: [
       { name: "<artifactId>", required: true, desc: "\u4EA7\u7269 id" }
     ],
     flags: [
-      { name: "pull", desc: "\u62C9\u53D6\u6700\u65B0\u753B\u677F\u5185\u5BB9\u5230\u672C\u5730" }
+      { name: "pull", desc: "\u62C9\u53D6\u6700\u65B0\u753B\u677F\u5185\u5BB9\u5230\u672C\u5730\uFF08\u5E26 --wait \u65F6\uFF1A\u7B49\u5B8C\u4E14\u6700\u8FD1\u4E00\u8F6E\u6210\u529F\u624D\u62C9\uFF09" },
+      { name: "wait", desc: "\u677F\u4E0A\u6709\u5728\u8DD1\u7684\u8F6E\u6B21\u5C31\u963B\u585E\u7B49\u5B83\u4EEC\u7ED3\u675F\uFF08\u540C gh pr checks --watch\uFF09", boolean: true },
+      { name: "wait-timeout", desc: "--wait \u6700\u591A\u7B49\u51E0\u5206\u949F\uFF08\u9ED8\u8BA4 100\uFF09" },
+      { name: "wait-interval", desc: "--wait \u8F6E\u8BE2\u95F4\u9694\u79D2\u6570\uFF08\u9ED8\u8BA4 20\uFF09" }
     ],
-    examples: ["oasis design status artifact:design:xyz --pull"]
+    examples: ["oasis design status artifact:design:xyz --wait --pull", "oasis design status artifact:design:xyz --pull"]
   },
   design: {
     group: "\u8BBE\u8BA1\u7A3F",
     usage: "oasis design <chat|status> <artifactId> ...",
     description: "\u8BBE\u8BA1\u4EA7\u7269\u76F8\u5173\u64CD\u4F5C\u3002\u8FDE\u54EA\u4E2A open-design\uFF1A\u5458\u5DE5\u5F00\u4E86 open-design \u8FDE\u63A5\u5668\u5C31\u8FDE\u5B83\u767B\u8BB0\u7684\u5730\u5740\u5E76\u5E26\u4EE4\u724C\uFF08\u4EFB\u610F\u8282\u70B9\u53EF\u7528\uFF09\uFF0C\u5426\u5219 $OASIS_OPEN_DESIGN_URL\uFF0C\u518D\u5426\u5219\u672C\u673A\u3002",
     subCommands: ["design chat", "design status"],
-    examples: ['oasis design chat artifact:design:xyz --message "\u8BBE\u8BA1\u767B\u5F55\u9875" --async']
+    examples: ['oasis design chat artifact:design:xyz --message "\u8BBE\u8BA1\u767B\u5F55\u9875" --async', "oasis design status artifact:design:xyz --wait --pull"]
   },
   // —— 图机制（§6/§7） ——
   annotate: {
@@ -294035,6 +294419,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 +294446,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 {
@@ -294096,6 +294485,15 @@ function needPos(positional, i, usage) {
   if (v2 === void 0) throw new Error(`\u7528\u6CD5: ${usage}`);
   return v2;
 }
+function positiveNumberFlag(flags, name, dflt) {
+  const raw = flags.get(name);
+  if (raw === void 0) return dflt;
+  const n = Number(raw);
+  if (!Number.isFinite(n) || n <= 0) throw new Error(`--${name} \u8981\u4E00\u4E2A\u6B63\u6570\uFF08\u6536\u5230\uFF1A${raw}\uFF09`);
+  return n;
+}
+var shortRunKey = (key2) => key2.startsWith("msg:") ? `\u6D88\u606F ${key2.slice(4, 12)}` : `run ${key2.slice(0, 8)}`;
+var clipReason = (reason) => reason.length > 300 ? `${reason.slice(0, 300)}\u2026` : reason;
 function semicolonList(raw, field) {
   if (raw === void 0) return {};
   const items = raw.split(";").map((x2) => x2.trim()).filter(Boolean);
@@ -294298,7 +294696,7 @@ async function waitForCommandAuthorization(base, headers, draftId, fallback) {
     }
   }
 }
-var CLI_VERSION = "2.2.83" ? "2.2.83" : "dev";
+var CLI_VERSION = "2.2.85" ? "2.2.85" : "dev";
 function apiHeaders(token, company) {
   const headers = {
     authorization: `Bearer ${token}`,
@@ -296068,7 +296466,7 @@ ${res.warning}`);
           println(`[design] \u753B\u677F ${deriveBoardKey(artifactId)} \u2190 ${artifactId}\uFF1B${isContinue ? "\u7EED\u8F6E" : "\u9996\u8F6E"}\uFF08--async\uFF09\u2192 od \u5F15\u64CE ${odLabel} \u2026`);
           const started = await startDesignChatTurn(baseTurnOpts);
           println(`[design] \u5DF2\u4E0B\u5355\uFF1Arun ${started.runId.slice(0, 8)}\uFF08board ${started.boardKey}, \u53EF\u89C1 user \u56DE\u5408 ${started.userMessageId.slice(0, 8)}\uFF09\u3002\u5F15\u64CE\u901A\u5E38\u8981 13\u201344 \u5206\u949F\u3002`);
-          println(`[design] \u4E4B\u540E\u7528 oasis design status ${artifactId} \u67E5\u8FDB\u5EA6/\u53D6\u8D27\uFF08--pull \u62C9\u4EA7\u7269\u5230\u672C\u5730\u8BFB\uFF09\uFF1B\u4E0D\u5FC5\u5B88\u7740\u7B49\u3002`);
+          println(`[design] \u4E0B\u4E00\u6B65\u7ACB\u523B\u6267\u884C\uFF1Aoasis design status ${artifactId} --wait --pull\uFF08\u963B\u585E\u7B49\u8FD9\u4E00\u8F6E\u8DD1\u5B8C\u5E76\u62C9\u8D27\uFF0C\u6700\u957F\u7B49 100 \u5206\u949F\uFF09\u3002\u522B\u4E0B\u5355\u540E\u76F4\u63A5\u7ED3\u675F\u4F1A\u8BDD\uFF0C\u4E5F\u522B\u81EA\u5DF1\u9694\u51E0\u5206\u949F\u624B\u52A8 status\u3002`);
           break;
         }
         println(`[design] \u753B\u677F ${deriveBoardKey(artifactId)} \u2190 ${artifactId}\uFF1B${isContinue ? "\u7EED\u8F6E" : "\u9996\u8F6E"}\u5BF9\u8BDD\u9A71\u52A8 od \u5F15\u64CE ${odLabel} \u2026`);
@@ -296082,46 +296480,82 @@ ${res.warning}`);
         break;
       }
       if (sub === "status") {
-        const artifactId = needPos(positional, 1, "oasis design status <artifactId> [--pull]");
+        const artifactId = needPos(positional, 1, "oasis design status <artifactId> [--pull] [--wait]");
         const od = resolveOpenDesignEndpoint(flags.get("od-url"));
         const odBase = od.base;
         const odFetch = withOdToken(fetch, od.token);
-        const st = await fetchBoardStatus(odBase, odFetch, artifactId);
+        let st;
+        let waitedForRun = false;
+        if (flags.get("wait") === "true") {
+          const timeoutMin = positiveNumberFlag(flags, "wait-timeout", 100);
+          const intervalSec = positiveNumberFlag(flags, "wait-interval", 20);
+          const fmt = (ms) => `${Math.floor(ms / 6e4)} \u5206 ${Math.floor(ms % 6e4 / 1e3)} \u79D2`;
+          const waited = await waitBoardSettled(odBase, odFetch, artifactId, {
+            timeoutMs: timeoutMin * 6e4,
+            intervalMs: intervalSec * 1e3,
+            // 每次轮询打一行撑 liveness；状态没变只打短的一行，别刷屏
+            onPoll: ({ live: live2, elapsedMs, changed, unreadable }) => {
+              if (!changed) return println(`[design] \u2026\u4ECD\u5728\u7B49\uFF08\u5DF2\u7B49 ${fmt(elapsedMs)}\uFF09`);
+              if (live2.length === 0 && unreadable) return println(`[design] \u8FD9\u6B21\u6CA1\u8BFB\u5230\u753B\u677F\u5BF9\u8BDD\u8BB0\u5F55\uFF08od \u6682\u65F6\u4E0D\u901A\uFF1F\uFF09\uFF0C\u63A5\u7740\u7B49\uFF08\u5DF2\u7B49 ${fmt(elapsedMs)}\uFF09`);
+              const runs = live2.map((r) => `${shortRunKey(r.key)} \u72B6\u6001=${r.status}${r.agentId ? ` \u5F15\u64CE=${r.agentId}` : ""}`).join("\uFF1B");
+              println(`[design] \u7B49\u753B\u677F\u8FD9\u4E00\u8F6E\u8DD1\u5B8C\uFF1A${runs}\uFF08\u5DF2\u7B49 ${fmt(elapsedMs)}\uFF0C\u4E0A\u9650 ${timeoutMin} \u5206\u949F\uFF09`);
+            }
+          });
+          st = waited.status;
+          waitedForRun = waited.waited;
+          if (!waited.settled) {
+            const runs = waited.live.map((r) => `${shortRunKey(r.key)} \u72B6\u6001=${r.status}`).join("\u3001") || "\u5BF9\u8BDD\u8BB0\u5F55\u8BFB\u4E0D\u5230";
+            println(`[design] \u7B49\u4E86 ${fmt(waited.elapsedMs)}\uFF0C\u753B\u677F\u4E0A\u8FD9\u4E00\u8F6E\u8FD8\u6CA1\u7ED3\u675F\uFF08${runs}\uFF09\u2014\u2014\u5F15\u64CE\u8FD8\u5728\u8DD1\uFF0C\u53EF\u7A0D\u540E\u518D oasis design status ${artifactId} --wait${flags.get("pull") === "true" ? " --pull" : ""}\u3002\u522B\u53E6\u8D77\u65B0\u8F6E\u3002`);
+            process.exitCode = 2;
+            break;
+          }
+          if (waitedForRun) println(`[design] \u753B\u677F\u4E0A\u7684\u8F6E\u6B21\u90FD\u5DF2\u7ED3\u675F\uFF08\u7B49\u4E86 ${fmt(waited.elapsedMs)}\uFF09\u3002`);
+        } else {
+          st = await fetchBoardStatus(odBase, odFetch, artifactId);
+        }
         if (!st.boardExists) {
-          println(`[design] \u753B\u677F ${st.boardKey} \u5C1A\u4E0D\u5B58\u5728\u2014\u2014\u8FD8\u6CA1\u8D77\u8FC7\u4EFB\u4F55\u4E00\u8F6E\u3002\u5F00\u5DE5\uFF1Aoasis design chat ${artifactId} --message "<\u8BBE\u8BA1\u9700\u6C42+\u771F\u5B9E\u6570\u636E>" --async`);
+          println(`[design] \u753B\u677F ${st.boardKey} \u5C1A\u4E0D\u5B58\u5728\u2014\u2014\u8FD8\u6CA1\u8D77\u8FC7\u4EFB\u4F55\u4E00\u8F6E\u3002\u5F00\u5DE5\uFF1Aoasis design chat ${artifactId} --message "<\u8BBE\u8BA1\u9700\u6C42+\u771F\u5B9E\u6570\u636E>" --async\uFF0C\u968F\u540E oasis design status ${artifactId} --wait --pull`);
           break;
         }
-        const live = st.runs.filter((r) => r.status === "running" || r.status === "queued");
+        const live = liveBoardRuns(st);
         if (live.length > 0) {
-          for (const r of live) println(`[design] \u5F15\u64CE\u5728\u8DD1\uFF1Arun ${r.runId.slice(0, 8)} \u72B6\u6001=${r.status}\u2014\u2014\u522B\u518D\u8D77\u65B0\u8F6E\uFF1B\u8FC7\u51E0\u5206\u949F\u518D status\uFF0C\u6216\u672C\u8F6E\u6536\u5DE5\u7B49\u91CD\u6D3E\u3002`);
+          for (const r of live) println(`[design] \u5F15\u64CE\u5728\u8DD1\uFF1A${shortRunKey(r.key)} \u72B6\u6001=${r.status}${r.agentId ? ` \u5F15\u64CE=${r.agentId}` : ""}\u2014\u2014\u522B\u518D\u8D77\u65B0\u8F6E\uFF1B\u7528 oasis design status ${artifactId} --wait --pull \u963B\u585E\u7B49\u5B83\u8DD1\u5B8C\u5E76\u62C9\u8D27\u3002`);
         } else if (st.runs.length > 0) {
           for (const r of st.runs.slice(0, 3)) {
             println(`[design] \u8FD1\u671F run\uFF1A${r.runId.slice(0, 8)} \u7EC8\u6001=${r.status}${r.agentId ? ` \u5F15\u64CE=${r.agentId}` : ""}`);
-            if (r.status === "failed" && r.error) {
-              const reason = r.error.length > 300 ? `${r.error.slice(0, 300)}\u2026` : r.error;
-              println(`[design]   \u5931\u8D25\u539F\u56E0\uFF08od \u539F\u6587\uFF09\uFF1A${reason}`);
-            }
+            if (r.status === "failed" && r.error) println(`[design]   \u5931\u8D25\u539F\u56E0\uFF08od \u539F\u6587\uFF09\uFF1A${clipReason(r.error)}`);
+          }
+        } else if ((st.turns ?? []).length > 0) {
+          for (const t of (st.turns ?? []).slice(0, 3)) {
+            println(`[design] \u8FD1\u671F run\uFF08\u5BF9\u8BDD\u8BB0\u5F55\uFF09\uFF1A${(t.runId ?? t.messageId ?? "?").slice(0, 8)} \u7EC8\u6001=${t.status}${t.agentId ? ` \u5F15\u64CE=${t.agentId}` : ""}`);
+            if (t.status !== "succeeded" && t.error) println(`[design]   \u5931\u8D25\u539F\u56E0\uFF08od \u539F\u6587\uFF09\uFF1A${clipReason(t.error)}`);
           }
         } else {
           println(`[design] \u65E0\u5728\u4E16 run \u8BB0\u5F55\uFF08od \u91CD\u542F\u540E\u4E3A\u7A7A\uFF0C\u5C5E\u6B63\u5E38\uFF09\u2014\u2014\u770B\u4E0B\u9762\u677F\u4E0A\u4EA7\u7269\u5373\u6301\u4E45\u771F\u76F8\u3002`);
         }
+        const last = latestEndedRun(st);
+        const lastFailed = waitedForRun && last !== void 0 && last.status !== "succeeded";
+        if (lastFailed) {
+          println(`[design] \u521A\u7ED3\u675F\u7684\u8FD9\u4E00\u8F6E\u6CA1\u8DD1\u6210\uFF08\u7EC8\u6001=${last.status}${last.agentId ? ` \u5F15\u64CE=${last.agentId}` : ""}\uFF09${last.error ? `\uFF1A${clipReason(last.error)}` : "\uFF0Cod \u6CA1\u8BB0\u539F\u56E0"}\u3002`);
+          println(`[design] \u50CF\u989D\u5EA6/\u9650\u6D41/\u5F15\u64CE\u6545\u969C \u2192 \u6362\u5F15\u64CE\u91CD\u4E0B\uFF1Aoasis design chat ${artifactId} --turn continue --agent <\u53E6\u4E00\u4E2A\u5F15\u64CE> --message "<\u2026>" --async\uFF1B\u50CF\u9700\u6C42/\u6570\u636E\u4E0D\u6E05 \u2192 \u8865\u6E05\u695A\u540E\u91CD\u4E0B\uFF1B\u4E0B\u5B8C\u7167\u65E7 oasis design status ${artifactId} --wait --pull\u3002`);
+        }
         if (st.artifacts.length === 0) {
-          println(`[design] \u677F\u4E0A\u8FD8\u6CA1\u6709\u4EA4\u4ED8\u7269\u3002${live.length > 0 ? "\u7B49\u5F15\u64CE\u8DD1\u5B8C\u518D\u6765\u3002" : `\u8D77\u4E00\u8F6E\uFF1Aoasis design chat ${artifactId} --message "<\u2026>" --async`}`);
+          println(`[design] \u677F\u4E0A\u8FD8\u6CA1\u6709\u4EA4\u4ED8\u7269\u3002${live.length > 0 ? `\u7B49\u5F15\u64CE\u8DD1\u5B8C\uFF1Aoasis design status ${artifactId} --wait --pull` : `\u8D77\u4E00\u8F6E\uFF1Aoasis design chat ${artifactId} --message "<\u2026>" --async\uFF0C\u968F\u540E oasis design status ${artifactId} --wait --pull`}`);
           break;
         }
         println(`[design] \u677F\u4E0A\u4EA4\u4ED8\u7269\uFF08\u6301\u4E45\uFF0C\u65B0\u2192\u65E7\uFF09\uFF1A`);
         for (const a of st.artifacts) println(`  - ${a.path}\uFF08${a.kind ?? "?"}\uFF09status=${a.status ?? "?"}${a.mtime ? ` \xB7 ${new Date(a.mtime).toISOString()}` : ""}`);
-        if (flags.get("pull") === "true") {
+        if (flags.get("pull") === "true" && !lastFailed) {
           const odPublic = (flags.get("od-public-url") ?? process.env["OASIS_OPEN_DESIGN_PUBLIC_URL"] ?? "https://design.open-friday.com").replace(/\/$/, "");
-          const { dir: dir2, entry } = await harvestBoard(odBase, odFetch, odPublic, os13.tmpdir(), st.boardKey, latestSucceededRun(st.runs)?.runId ?? "status-pull");
+          const { dir: dir2, entry } = await harvestBoard(odBase, odFetch, odPublic, os13.tmpdir(), st.boardKey, snapshotSourceRunId(st) ?? "status-pull");
           println(`[design] \u5DF2\u62C9\u5230\u672C\u5730\uFF1A${dir2}\uFF08\u5165\u53E3 ${entry}\uFF09`);
           println(`[design] \u8BFB\u5B8C\u6EE1\u610F\u5373\u4EA4\u7A3F\uFF1Aoasis propose ${artifactId} --from-dir ${dir2} --reason "<\u8FD9\u7248\u505A\u4E86\u4EC0\u4E48>"`);
-        } else {
+        } else if (!lastFailed) {
           println(`[design] \u53D6\u8D27\uFF1Aoasis design status ${artifactId} --pull\uFF08\u62C9\u5230\u672C\u5730\u76EE\u5F55\u8BFB\uFF0C\u8BFB\u5B8C propose --from-dir \u4EA4\u7A3F\uFF09`);
         }
         break;
       }
-      throw new Error("\u7528\u6CD5\uFF1Aoasis design chat <artifactId> --message <t> [--turn first|continue] [--async]\uFF1Boasis design status <artifactId> [--pull]");
+      throw new Error("\u7528\u6CD5\uFF1Aoasis design chat <artifactId> --message <t> [--turn first|continue] [--async]\uFF1Boasis design status <artifactId> [--pull] [--wait [--wait-timeout <\u5206\u949F>]]");
     }
     case "merge": {
       const artifactId = needPos(positional, 0, "oasis merge <artifactId> [revisionId]");
@@ -296165,6 +296599,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 +298652,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "2.2.83" : "dev";
+var PKG_VERSION = true ? "2.2.85" : "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.85",
   "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": "760b80b59c0caa8c7469a804b84360f5ecf3a71a"
   }
 }