oasis_test 0.1.107 → 0.1.109

package/dist/index.js

@@ -993,20 +993,27 @@ function pinnedReviewerOf(model, artifactId, role) {
   }
   return best?.actor ?? null;
 }
+function latestAttempt(attempts) {
+  let best = null;
+  for (const a of attempts) {
+    if (best === null || a.at > best.at || a.at === best.at && a.seq >= best.seq) best = a;
+  }
+  return best;
+}
 function concludeMilestones(model, id) {
   return (model.concludeAttempts.get(id) ?? []).filter(
     (a) => attemptStatus(model, a) === "satisfied"
   );
 }
 function pendingConcludeAttempt(model, id) {
-  const last = model.concludeAttempts.get(id)?.at(-1);
+  const last = latestAttempt(model.concludeAttempts.get(id) ?? []);
   return last && attemptStatus(model, last) === "pending" ? last : null;
 }
 function isConcluded(model, id) {
   return concludeMilestones(model, id).length > 0;
 }
 function concludedHead(model, id) {
-  return concludeMilestones(model, id).at(-1)?.head ?? null;
+  return latestAttempt(concludeMilestones(model, id))?.head ?? null;
 }
 function revisionsOf(model, id) {
   return [...model.revisions.values()].filter((r) => r.artifactId === id);
@@ -4068,6 +4075,41 @@ ${m2.spec.split("\n").map((l) => `  > ${l}`).join("\n")}`);
         });
       })()
     ),
+    // ★ 2026-08-18：交稿时把「系统看不出来的四件事」一并带上。
+    //
+    // 为什么必须写在**任务书**里：adapter 只把 TASK.md 当提示词喂给模型，其余 bundle 文件（包括
+    // execution/CONTINUITY.md）只是躺在工作目录里、没人读。`--reason` 之所以交付过的节点 100% 都有，
+    // 正因为它既进了任务书又是必填；这四项此前只活在 `oasis help propose` 里——next 上节点全部更新到
+    // 认得它们之后的 10 小时里，两次真实交付**一次都没带**（实测 0/2）。
+    //
+    // 给 `none` 出口是刻意的：逼着写自由文本只会得到「暂无」这种假保证，而「确认没有」与「没人写」
+    // 对下游是两条完全不同的信息（渲染侧据此分流，见 renderDeliveredWorkHandoff）。
+    ...args.action === "review" ? [] : [
+      ``,
+      `### \u4EA4\u7A3F\u65F6\u4E00\u5E76\u5E26\u4E0A\uFF1A\u4E0B\u6E38\u8981\u7528\u7684\u56DB\u4EF6\u4E8B`,
+      `\u8FD9\u56DB\u9879\u4F1A\u539F\u6837\u51FA\u73B0\u5728\u4E0B\u6E38\u8282\u70B9\u7684 \`inputs/<\u672C\u8282\u70B9>@<\u7248\u672C>/${UPSTREAM_HANDOFF_BASENAME}\` \u91CC\u3002\u5206\u53F7\u5206\u9694\uFF1B**\u786E\u5B9E\u6CA1\u6709\u5C31\u5199 \`none\`\uFF0C\u522B\u7F16\u300C\u6682\u65E0\u300D**\uFF1A`,
+      `- \`--gaps\` **\u4F60\u6CA1\u80FD\u6838\u9A8C\u7684\u90E8\u5206** \u2014\u2014 \u6700\u8981\u7D27\u7684\u4E00\u9879\u3002\u4E0B\u6E38\u9ED8\u8BA4\u300C\u4E0A\u6E38\u4EA4\u4E86\u5C31\u662F\u9A8C\u8FC7\u4E86\u300D\uFF0C\u4F60\u4E0D\u5199\uFF0C\u6CA1\u9A8C\u7684\u90A3\u5757\u5C31\u76F4\u63A5\u8FDB\u4E0B\u4E00\u73AF\u3002\u4F8B\uFF1A\`--gaps "\u6CA1\u505A\u538B\u6D4B;\u53EA\u5728 dev \u9A8C\u8FC7"\``,
+      `- \`--unresolved\` **\u4F60\u77E5\u9053\u4F46\u6CA1\u89E3\u51B3\u7684** \u2014\u2014 \u514D\u5F97\u4E0B\u6E38\u91CD\u590D\u8E29\u4F60\u5DF2\u7ECF\u8E29\u8FC7\u7684\u5751\u3002\u4F8B\uFF1A\`--unresolved "\u7EBF\u4E0A\u914D\u989D\u6CA1\u786E\u8BA4"\``,
+      `- \`--risks\` **\u4EA4\u4ED8\u7269\u672C\u8EAB\u6CA1\u9519\u3001\u4F46\u7528\u7684\u65F6\u5019\u8981\u5F53\u5FC3\u7684** \u2014\u2014 \u4F8B\uFF1A\`--risks "\u5E76\u53D1\u8C03\u7528\u53EF\u80FD\u89E6\u53D1\u9650\u6D41"\``,
+      `- \`--next\` **\u5EFA\u8BAE\u4E0B\u6E38\u5148\u505A\u54EA\u4E00\u6B65**\uFF08\u53EF\u9009\uFF09\u2014\u2014 \u4F8B\uFF1A\`--next "\u5148\u8DD1\u4E00\u6B21\u5C0F\u6D41\u91CF\u7070\u5EA6"\``,
+      `\u5199 \`none\` = \u300C\u6211\u786E\u8BA4\u6CA1\u6709\u300D\uFF1B\u4E0D\u5199 = \u300C\u6CA1\u4EBA\u5199\u8FC7\u300D\u3002**\u8FD9\u4E24\u4EF6\u4E8B\u5BF9\u4E0B\u6E38\u5B8C\u5168\u4E0D\u540C\uFF0C\u522B\u6DF7\u3002**`,
+      ``,
+      `### \u4F1A\u8BDD\u53EF\u80FD\u88AB\u780D\uFF1A\u4E2D\u9014\u7559\u4E2A\u65AD\u70B9`,
+      // ★ 2026-08-18：`continuity-checkpoint` 此前在任务书里出现 **0 次**——说明书只在
+      // `execution/CONTINUITY.md`（没人读）和 `oasis help` 里。线上 160 条 checkpoint 只有 6 条带
+      // pendingSteps，且全部来自同一个自己跑 `oasis help continuity-checkpoint` 摸出来的 agent。
+      // 「知道的会用、且用得很好」已被实证，缺的只是这段话。
+      // 刻意不写「过去 24 小时发生 N 次」这类统计：任务书是长期提示词，写死的数字会过期变成假话。
+      `\u4F60\u8FD9\u4E00\u8F6E\u968F\u65F6\u53EF\u80FD\u88AB\u780D\u2014\u2014\u8D85\u65F6\u3001\u989D\u5EA6\u6253\u6EE1\u3001\u8282\u70B9\u6389\u7EBF\u90FD\u4F1A\uFF0C\u800C\u4E14**\u662F\u5E38\u4E8B**\u3002\u771F\u88AB\u780D\u65F6\uFF0C\u4E0B\u4E00\u8D9F\u63A5\u624B\u7684\u4EBA\u53EA\u770B\u5F97\u5230\u300C\u4F60\u4E3A\u4EC0\u4E48\u65AD\u300D\uFF0C\u770B\u4E0D\u5230\u300C\u4F60\u5E72\u5230\u54EA\u300D\u2014\u2014\u9664\u975E\u4F60\u7559\u4E86\u65AD\u70B9\u3002`,
+      `\u505A\u5B8C\u4E00\u4E2A\u9636\u6BB5\u3001\u6216\u8981\u5F00\u59CB\u4E00\u4EF6\u53EF\u80FD\u5F88\u4E45\u7684\u4E8B\u4E4B\u524D\uFF0C\u987A\u624B\u8BB0\u4E00\u6761\uFF08\u51E0\u79D2\u8FD4\u56DE\uFF0C\u4E0D\u6253\u65AD\u4F60\uFF09\uFF1A`,
+      `\`\`\``,
+      `oasis continuity-checkpoint --trigger stage_completed \\`,
+      `  --completed "\u5DF2\u5B8C\u6210\u7684\u6B65\u9AA4,\u9017\u53F7\u5206\u9694\uFF08\u7528\u7A33\u5B9A\u7684\u540D\u5B57\uFF0C\u91CD\u8DD1\u65F6\u540C\u4E00\u6B65\u540C\u4E00\u4E2A\u540D\uFF09" \\`,
+      `  --pending "\u8FD8\u5269\u4EC0\u4E48\u6CA1\u505A" \\`,
+      `  --recoverability full|partial|none`,
+      `\`\`\``,
+      `**\u53EA\u6709\u4F60\u77E5\u9053\u300C\u8FD8\u5269\u4EC0\u4E48\u300D**\u2014\u2014\u7CFB\u7EDF\u80FD\u81EA\u52A8\u8BB0\u4E0B\u4F60\u8DD1\u8FC7\u54EA\u4E9B\u547D\u4EE4\u3001\u4EA4\u5230\u4E86\u54EA\u4E00\u7248\uFF0C\u4F46\u63A8\u4E0D\u51FA\u4F60\u6253\u7B97\u5E72\u4EC0\u4E48\u3002\u522B\u5199\u7A7A\u8BDD\uFF1B\u6CA1\u4EC0\u4E48\u53EF\u5199\u5C31\u4E0D\u5199\uFF0C\u522B\u4E3A\u4E86\u586B\u800C\u586B\u3002`
+    ],
     // 兜底（§10）：上次失败了 → 明确告诉它发生了什么 + 怎么破（首选 add-revision 拆出去）
     ...args.lastFailure ? args.lastFailure.resumed ? [
       // 续跑分支：上文还在它眼前，别再说"没留下任何产出"（自相矛盾），改成"接着干 + 先核现场"。
@@ -7994,14 +8036,13 @@ FROM ${schema}.workflow_nodes n
 LEFT JOIN ${schema}.works lw ON lw.id = n.latest_work_id
 LEFT JOIN ${schema}.works ls ON ls.id = n.latest_success_work_id;
 
+-- workorder_view \u5DF2\u4E0B\u7EBF\uFF08\u5DE5\u5355 1aa1f35b\uFF09\uFF1A\u5B83\u53EA\u989D\u5916\u7ED9\u51FA total_count / done_count \u4E24\u4E2A\u8FDB\u5EA6\u6570\uFF0C\u5168\u4ED3\u96F6\u6D88\u8D39\u65B9\uFF0C
+-- \u4E14\u53E3\u5F84\u4E0E\u540E\u7AEF\u771F\u6E90\uFF08server summaryOfWorkspace \u7684 progressExcludingBrief\uFF09\u4E0D\u540C\u2014\u2014total \u53EA\u6392 cancelled\u3001done \u7528
+-- latest_accept_id IS NOT NULL\uFF08\u66FE\u88AB\u9A8C\u6536\u8FC7\u81F3\u5C11\u4E00\u6B21\uFF09\uFF0C\u800C\u771F\u6E90\u6392\u9664 brief + \u5DF2\u4F5C\u5E9F\u3001\u6309\u300C\u9A8C\u6536\u843D\u5728\u5F53\u524D\u7248\u300D\u7B97\u3002
+-- \u4FDD\u7559\u4E00\u4EFD\u89C6\u56FE\u65E2\u6CA1\u4EBA\u8BFB\u3001\u53E3\u5F84\u53C8\u5BF9\u4E0D\u4E0A\uFF0C\u53EA\u4F1A\u662F\u7B2C\u4E09\u5904\u5BF9\u4E0D\u4E0A\u7684\u8FDB\u5EA6\u6570\u3002\u8FD9\u91CC\u4E0D\u518D CREATE\uFF1B\u4E0B\u9762\u7684 DROP \u8BA9\u5B58\u91CF\u5E93
+-- \u5728\u4E0B\u6B21 migrate \u65F6\u628A\u65E7\u89C6\u56FE\u5220\u6389\uFF08ENGINE_DDL \u6BB5\u4EA6\u6709\u4E00\u5904 DROP\uFF0C\u4E8C\u8005\u90FD\u7559\u4EE5\u9632\u91CD\u6392\uFF09\u3002\u5DE5\u5355\u8FDB\u5EA6\u7EDF\u4E00\u8D70\u540E\u7AEF\u8BFB\u6A21\u578B\uFF0C
+-- \u9700\u8981 SQL \u4FA7\u7EDF\u8BA1\u65F6\u53E6\u7ACB\u4E0E\u771F\u6E90\u540C\u53E3\u5F84\u7684\u89C6\u56FE\u5E76\u6CE8\u660E\u670D\u52A1\u5BF9\u8C61\uFF0C\u522B\u590D\u6D3B\u8FD9\u4E24\u4E2A\u6570\u3002
 DROP VIEW IF EXISTS ${schema}.workorder_view;
-CREATE VIEW ${schema}.workorder_view AS
-SELECT o.*,
-  (SELECT count(*) FROM ${schema}.workflow_nodes n
-    WHERE n.workorder_id = o.id AND n.cancelled_at IS NULL) AS total_count,
-  (SELECT count(*) FROM ${schema}.workflow_nodes n
-    WHERE n.workorder_id = o.id AND n.cancelled_at IS NULL AND n.latest_accept_id IS NOT NULL) AS done_count
-FROM ${schema}.workorders o;
 `;
 }
 var init_schema2 = __esm({
@@ -13215,7 +13256,10 @@ var init_store_postgres = __esm({
         JOIN ${this.s}.workflow_nodes n ON n.id = r.node_id WHERE n.workorder_id = $1`,
           [id]
         );
-        const works = await this.c.query(`SELECT * FROM ${this.s}.works WHERE workorder_id = $1`, [id]);
+        const works = await this.c.query(
+          `SELECT * FROM ${this.s}.works WHERE workorder_id = $1 ORDER BY created_at ASC, id ASC`,
+          [id]
+        );
         const arts = await this.c.query(
           `SELECT a.* FROM ${this.s}.work_artifacts a JOIN ${this.s}.works w ON w.id = a.work_id WHERE w.workorder_id = $1`,
           [id]
@@ -14063,6 +14107,11 @@ var init_plan = __esm({
         if (!node || node.cancelledAt) return;
         killLatestWork(state, e.nodeId, ctx.at);
         killNodeReviews(state, e.nodeId, ctx.at);
+        for (const issue2 of state.allIssues()) {
+          if (issue2.resolvedAt !== null) continue;
+          if (issue2.aboutNodeId !== e.nodeId && issue2.raisedByNodeId !== e.nodeId) continue;
+          state.updateIssue(issue2.id, { resolvedAt: ctx.at, resolution: "wontfix" });
+        }
         state.updateNode(e.nodeId, { cancelledAt: ctx.at, updatedAt: ctx.at });
         for (const edge of state.edgesFrom(e.nodeId)) {
           const dn = state.node(edge.toNodeId);
@@ -16007,6 +16056,7 @@ function bridgeLoadReadModel(input) {
   const holds = /* @__PURE__ */ new Map();
   for (const node of allNodes) {
     if (!node.latestWorkId) continue;
+    if (node.cancelledAt) continue;
     const lw = allWorks.find((w2) => w2.id === node.latestWorkId);
     if (!lw || !lw.deadAt) continue;
     if (node.latestAcceptId === node.latestWorkId) continue;
@@ -149101,6 +149151,7 @@ function stallOf(model, id, runtime, dispatcherSignals) {
   if (gaps.length > 0) {
     return { kind: "waiting_human", action: "resolve_gap", detail: `\u5361\u5728\u7F3A\u53E3\u4E0A\u5F85\u4EBA\u8865\uFF1A${gaps[0].description}` };
   }
+  if (isDeliveredSettled(model, id)) return null;
   if (isHeld(model, id)) {
     const h = holdOf(model, id);
     return { kind: "held", action: "resume", detail: `\u5DF2\u6682\u505C\u6D3E\u53D1${h?.reason ? `\uFF1A${h.reason}` : ""}\u2014\u2014\u5F85\u6062\u590D`, ...h?.at ? { since: h.at } : {} };
@@ -149146,7 +149197,7 @@ function stallOf(model, id, runtime, dispatcherSignals) {
     if (dep) return { kind: "waiting_system", ref: dep.to, detail: `\u7B49\u4E0A\u6E38\u6536\u53E3\uFF1A${dep.to}` };
     return { kind: "waiting_system", detail: `\u963B\u585E\u4E2D\uFF1A${b2.reasons[0] ?? "\u5F85\u524D\u7F6E\u5C31\u7EEA"}` };
   }
-  const queueCause = lifecycleOf(model, id) === "active" ? queueBlockCauseOf(model, id) : null;
+  const queueCause = queueBlockCauseOf(model, id);
   if (queueCause !== null) {
     const pending = queueOf(model, id);
     const since = pending[0]?.createdAt;
@@ -149973,9 +150024,10 @@ function summaryOfWorkspace(model, workspace, arts, ref2, resolveProject, dispat
     owner: ref2(seed.owner),
     participants: participantIds.map(ref2),
     artifactCount: arts.length,
+    // 原始计数（含 brief、含已作废）——仅作旧客户端回退；界面真源是下面的 progressExcludingBrief。
     progress: { concluded, total: arts.length },
-    // ADR 0088 D1：两个派生位内联，前端不再按行拉详情。口径逐字对齐它替代的旧前端函数。
-    progressExcludingBrief: progressExcludingBrief(arts, members, { concluded, total: arts.length }),
+    // ADR 0088 D1：派生位内联，前端不再按行拉详情。这是进度的唯一真源（排除 brief + 已作废，见函数注释）。
+    progressExcludingBrief: progressExcludingBrief(arts, members),
     ...runtimeAlertOf(arts, members, runtimeOf) ?? {},
     updatedAt: lastOps[lastOps.length - 1] ?? "",
     projectId: resolveProject?.(workspace) ?? null,
@@ -149990,20 +150042,17 @@ function tagsOf(seed) {
   if (!Array.isArray(raw)) return [];
   return [...new Set(raw.map((v2) => typeof v2 === "string" ? v2.trim() : "").filter(Boolean))];
 }
-function progressExcludingBrief(arts, members, progress) {
-  let briefCount = 0;
-  let briefConcluded = 0;
+function progressExcludingBrief(arts, members) {
+  let total = 0;
+  let concluded = 0;
   for (let i = 0; i < arts.length; i++) {
-    if (arts[i].type !== "brief") continue;
-    briefCount++;
-    const s2 = deriveNodeStage(members[i]);
-    if (s2 === "concluded" || s2 === "sealed") briefConcluded++;
+    const info = members[i];
+    if (arts[i].type === "brief") continue;
+    if (info.sealed) continue;
+    total++;
+    if (info.concluded) concluded++;
   }
-  if (briefCount === 0) return progress;
-  return {
-    concluded: Math.max(0, progress.concluded - briefConcluded),
-    total: Math.max(0, progress.total - briefCount)
-  };
+  return { concluded, total };
 }
 function runtimeAlertOf(arts, members, runtimeOf) {
   if (!runtimeOf) return void 0;
@@ -158830,6 +158879,8 @@ async function listModels(runtime, executablePath) {
       return cachedDiscovery(runtime, async () => await discoverACPModels(executablePath ?? "kimi", "kimi", ["acp"]) ?? []);
     case "kiro":
       return cachedDiscovery(runtime, async () => await discoverACPModels(executablePath ?? "kiro-cli", "kiro", ["acp"]) ?? []);
+    case "reasonix":
+      return cachedDiscovery(runtime, async () => await discoverACPModels(executablePath ?? "reasonix", "reasonix", ["acp"]) ?? []);
     case "openclaw":
       return cachedDiscovery(runtime, () => discoverOpenclawModels(executablePath));
     default:
@@ -159376,6 +159427,7 @@ var init_codex = __esm({
   "../adapters/src/codex/index.ts"() {
     "use strict";
     import_node_child_process9 = require("node:child_process");
+    init_container_runtime();
     import_node_crypto15 = require("node:crypto");
     fs10 = __toESM(require("node:fs"), 1);
     os5 = __toESM(require("node:os"), 1);
@@ -159421,9 +159473,6 @@ var init_codex = __esm({
        */
       capabilities = { appendInput: false };
       async spawn(job) {
-        if (job.executionEnv) {
-          throw new Error("executionEnv\uFF1Acodex runtime \u5C1A\u672A\u652F\u6301\u5BB9\u5668\u5316\u6267\u884C\uFF08ADR-0147\uFF09\uFF0C\u8BF7\u6539\u6D3E claude-code \u5458\u5DE5\u6216\u53BB\u6389\u8BE5\u8282\u70B9\u7684 executionEnv \u58F0\u660E");
-        }
         const slug6 = job.artifactId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 32);
         const id = `codex-${slug6}-${(0, import_node_crypto15.randomUUID)().slice(0, 8)}`;
         const startedAtMs = Date.now();
@@ -159483,7 +159532,21 @@ var init_codex = __esm({
           ),
           promptViaStdin ? "-" : prompt
         ];
-        const child = (0, import_node_child_process9.spawn)(this.opts.codexBin ?? "codex", args, {
+        const containerized = await maybeContainerize({
+          bin: this.opts.codexBin ?? "codex",
+          args,
+          cwd: dir,
+          job,
+          ...this.opts.workRoot !== void 0 ? { workRoot: this.opts.workRoot } : {},
+          ...this.opts.env !== void 0 ? { extraEnvEarly: this.opts.env } : {}
+        });
+        const child = containerized ? (0, import_node_child_process9.spawn)(containerized.bin, containerized.args, {
+          cwd: dir,
+          env: scrubLeakyEnv(process.env),
+          // stdin 的开合口径与宿主分支一致：codex 只在走 stdin 时才该收到管道（见下方长注释）。
+          // 容器包装本身带 `-i`，podman 会把这条管道透传给容器内进程。
+          stdio: [promptViaStdin ? "pipe" : "ignore", "pipe", "pipe"]
+        }) : (0, import_node_child_process9.spawn)(this.opts.codexBin ?? "codex", args, {
           cwd: dir,
           env: {
             ...scrubLeakyEnv(process.env),
@@ -159598,6 +159661,7 @@ var init_codex = __esm({
         };
         const timer = setTimeout(() => {
           killReason ??= "timeout";
+          if (containerized) killContainerBestEffort(containerized.containerName, containerized.mode);
           child.kill("SIGKILL");
         }, job.limits.wallClockMs);
         child.on("error", () => {
@@ -159625,13 +159689,16 @@ var init_codex = __esm({
             ...telemetry.usage ? { usage: telemetry.usage } : {},
             ...model ? { model } : {},
             ...runtimeSessionId ? { runtimeSessionId } : {},
-            ...errorMessage ? { errorMessage } : {}
+            ...errorMessage ? { errorMessage } : {},
+            // 跑在哪个镜像上要落账：同一题换了镜像，分数就不可比（ADR-0147 M5）
+            ...containerized?.imageDigest ? { imageDigest: containerized.imageDigest } : {}
           });
         });
         return {
           id,
           async kill() {
             killReason ??= "cancelled";
+            if (containerized) killContainerBestEffort(containerized.containerName, containerized.mode);
             child.kill("SIGKILL");
           },
           onExit(cb) {
@@ -160073,6 +160140,20 @@ function joinOutputParts(parts) {
   if (parts.every((p2) => typeof p2 === "string")) return parts.join("");
   return parts;
 }
+function pickApprovalOptionId(params) {
+  const raw = params?.options;
+  if (!Array.isArray(raw)) return LEGACY_APPROVE_OPTION_ID;
+  const options = raw.filter(
+    (o) => typeof o?.optionId === "string"
+  );
+  if (options.length === 0) return LEGACY_APPROVE_OPTION_ID;
+  const byId = options.find((o) => o.optionId === LEGACY_APPROVE_OPTION_ID)?.optionId;
+  const byKind = (kind) => options.find((o) => o.kind === kind)?.optionId;
+  const nonReject = options.find(
+    (o) => !String(o.kind ?? o.optionId).startsWith("reject")
+  )?.optionId;
+  return byId ?? byKind("allow_always") ?? byKind("allow_once") ?? nonReject ?? LEGACY_APPROVE_OPTION_ID;
+}
 function normalizeACPUpdate(data) {
   const d = data;
   if (!d) return ["", data];
@@ -160321,7 +160402,8 @@ async function runACPSession(job, cfg) {
       if (reason === "cancelled") finish({ code: null, reason: "cancelled", transcriptRef });
     },
     () => streamingCurrentTurn,
-    cfg.finalUsageIsAuthoritative === true
+    cfg.finalUsageIsAuthoritative === true,
+    cfg.vendorUsageNotification
   );
   usageClient = client;
   const rl = readline3.createInterface({ input: child.stdout });
@@ -160491,7 +160573,7 @@ ${task}` : task;
     }
   };
 }
-var import_node_child_process10, import_node_crypto16, fs11, path11, readline3, ACPClient;
+var import_node_child_process10, import_node_crypto16, fs11, path11, readline3, ACPClient, LEGACY_APPROVE_OPTION_ID;
 var init_acp = __esm({
   "../adapters/src/_core/acp.ts"() {
     "use strict";
@@ -160510,13 +160592,14 @@ var init_acp = __esm({
     init_transcript();
     init_filter_extra_args();
     ACPClient = class {
-      constructor(write, onOutput, onTelemetry, onStop, acceptNotification = () => true, finalUsageIsAuthoritative = false) {
+      constructor(write, onOutput, onTelemetry, onStop, acceptNotification = () => true, finalUsageIsAuthoritative = false, vendorUsage) {
         this.write = write;
         this.onOutput = onOutput;
         this.onTelemetry = onTelemetry;
         this.onStop = onStop;
         this.acceptNotification = acceptNotification;
         this.finalUsageIsAuthoritative = finalUsageIsAuthoritative;
+        this.vendorUsage = vendorUsage;
       }
       nextId = 0;
       pending = /* @__PURE__ */ new Map();
@@ -160530,7 +160613,37 @@ var init_acp = __esm({
        * 是否还在流。每收到一条 session/update / session/notification 就 +1，主循环轮询该值。
        */
       notificationCount = 0;
+      /** 厂商私有用量：已完成轮次的累计 + 当前轮的最新快照，两者相加即 this.usage。 */
+      vendorTurnBase = newUsageAcc();
+      vendorTurnSnapshot = newUsageAcc();
+      applyVendorUsage(params) {
+        const picked = this.vendorUsage?.pick(params);
+        if (!picked) return;
+        this.vendorTurnSnapshot = {
+          inputTokens: picked.inputTokens ?? 0,
+          outputTokens: picked.outputTokens ?? 0,
+          cacheReadTokens: picked.cacheReadTokens ?? 0,
+          cacheCreationTokens: picked.cacheCreationTokens ?? 0
+        };
+        this.usage = {
+          inputTokens: this.vendorTurnBase.inputTokens + this.vendorTurnSnapshot.inputTokens,
+          outputTokens: this.vendorTurnBase.outputTokens + this.vendorTurnSnapshot.outputTokens,
+          cacheReadTokens: this.vendorTurnBase.cacheReadTokens + this.vendorTurnSnapshot.cacheReadTokens,
+          cacheCreationTokens: this.vendorTurnBase.cacheCreationTokens + this.vendorTurnSnapshot.cacheCreationTokens
+        };
+      }
+      /** 新一轮 prompt 发出前，把上一轮的快照折进基数（快照是「当前轮」口径，会归零重来）。 */
+      foldVendorTurn() {
+        this.vendorTurnBase = {
+          inputTokens: this.vendorTurnBase.inputTokens + this.vendorTurnSnapshot.inputTokens,
+          outputTokens: this.vendorTurnBase.outputTokens + this.vendorTurnSnapshot.outputTokens,
+          cacheReadTokens: this.vendorTurnBase.cacheReadTokens + this.vendorTurnSnapshot.cacheReadTokens,
+          cacheCreationTokens: this.vendorTurnBase.cacheCreationTokens + this.vendorTurnSnapshot.cacheCreationTokens
+        };
+        this.vendorTurnSnapshot = newUsageAcc();
+      }
       request(method, params) {
+        if (this.vendorUsage && method === "session/prompt") this.foldVendorTurn();
         const id = this.nextId++;
         return new Promise((resolve10, reject) => {
           this.pending.set(id, { resolve: resolve10, reject, method });
@@ -160582,11 +160695,15 @@ var init_acp = __esm({
       handleAgentRequest(raw) {
         const method = raw["method"];
         const id = raw["id"];
-        const resp = method === "session/request_permission" ? { jsonrpc: "2.0", id, result: { outcome: { outcome: "selected", optionId: "approve_for_session" } } } : { jsonrpc: "2.0", id, error: { code: -32601, message: `method not found: ${method}` } };
+        const resp = method === "session/request_permission" ? { jsonrpc: "2.0", id, result: { outcome: { outcome: "selected", optionId: pickApprovalOptionId(raw["params"]) } } } : { jsonrpc: "2.0", id, error: { code: -32601, message: `method not found: ${method}` } };
         this.write(JSON.stringify(resp) + "\n");
       }
       handleNotification(raw) {
         const method = raw["method"];
+        if (this.vendorUsage && method === this.vendorUsage.method) {
+          this.applyVendorUsage(raw["params"]);
+          return;
+        }
         if (method !== "session/update" && method !== "session/notification") return;
         const params = raw["params"];
         if (!params?.update) return;
@@ -160745,6 +160862,7 @@ var init_acp = __esm({
         });
       }
     };
+    LEGACY_APPROVE_OPTION_ID = "approve_for_session";
   }
 });
 
@@ -160846,6 +160964,72 @@ var init_kiro = __esm({
   }
 });
 
+// ../adapters/src/reasonix/index.ts
+var REASONIX_BLOCKED_FLAGS, REASONIX_USAGE_NOTIFICATION, ReasonixAdapter;
+var init_reasonix = __esm({
+  "../adapters/src/reasonix/index.ts"() {
+    "use strict";
+    init_acp();
+    REASONIX_BLOCKED_FLAGS = /* @__PURE__ */ new Map([
+      ["--model", "value"],
+      ["--planner", "value"],
+      ["--sandbox-network", "value"],
+      ["--sandbox-bash", "value"],
+      ["--workspace-only", "boolean"]
+    ]);
+    REASONIX_USAGE_NOTIFICATION = {
+      method: "_reasonix.io/session/status_update",
+      pick(params) {
+        const rec = (v2) => v2 && typeof v2 === "object" && !Array.isArray(v2) ? v2 : void 0;
+        const num2 = (v2) => typeof v2 === "number" && Number.isFinite(v2) && v2 >= 0 ? v2 : void 0;
+        const turn = rec(rec(rec(rec(params)?.["status"])?.["usage"])?.["turn"]);
+        if (!turn) return void 0;
+        const promptTokens = num2(turn["promptTokens"]);
+        const cacheHit = num2(turn["cacheHitTokens"]);
+        const cacheMiss = num2(turn["cacheMissTokens"]);
+        const inputTokens = cacheMiss ?? (promptTokens === void 0 ? void 0 : Math.max(0, promptTokens - (cacheHit ?? 0)));
+        const outputTokens = num2(turn["completionTokens"]);
+        if (inputTokens === void 0 && outputTokens === void 0 && cacheHit === void 0) return void 0;
+        return {
+          ...inputTokens !== void 0 ? { inputTokens } : {},
+          ...outputTokens !== void 0 ? { outputTokens } : {},
+          ...cacheHit !== void 0 ? { cacheReadTokens: cacheHit } : {}
+        };
+      }
+    };
+    ReasonixAdapter = class {
+      constructor(opts = {}) {
+        this.opts = opts;
+      }
+      /** ADR-0093：ACP 引擎原生支持对话追加（同 session 二次 session/prompt）。 */
+      capabilities = { appendInput: true };
+      spawn(job) {
+        return runACPSession(job, {
+          bin: this.opts.reasonixBin ?? "reasonix",
+          args: [
+            "acp",
+            "--planner",
+            "auto",
+            "--sandbox-network",
+            "auto",
+            "--sandbox-bash",
+            "auto",
+            "--workspace-only"
+          ],
+          model: this.opts.model,
+          resumeMethod: "session/resume",
+          vendorUsageNotification: REASONIX_USAGE_NOTIFICATION,
+          blockedFlags: REASONIX_BLOCKED_FLAGS,
+          workRoot: this.opts.workRoot,
+          cleanupWorkdir: this.opts.cleanupWorkdir,
+          env: this.opts.env,
+          extraArgs: this.opts.extraArgs
+        });
+      }
+    };
+  }
+});
+
 // ../adapters/src/_core/subprocess.ts
 async function materialize(job, cfg) {
   const slug6 = job.artifactId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 32);
@@ -161926,6 +162110,7 @@ var init_src6 = __esm({
     init_hermes();
     init_kimi();
     init_kiro();
+    init_reasonix();
     init_cursor();
     init_codebuddy();
     init_gemini();
@@ -163913,6 +164098,7 @@ async function startOasisServer(opts) {
                   ...tokenClaims.artifactId !== void 0 ? { artifactId: tokenClaims.artifactId } : {},
                   durableRefs: tokenClaims.artifactId !== void 0 ? [{ kind: "artifact", id: tokenClaims.artifactId, label: body.command }] : [],
                   at: (/* @__PURE__ */ new Date()).toISOString(),
+                  ...listArg("pendingSteps") ? { pendingSteps: listArg("pendingSteps") } : {},
                   ...delivered ? { delivered } : {}
                 });
               } catch (error2) {
@@ -166274,7 +166460,14 @@ var init_memory_registry_store = __esm({
         this.skillFiles.delete(skillId);
       }
       async putVariable(v2) {
-        this.variables.set(this._varKey(v2.key, v2.actorId, v2.projectId), { ...v2 });
+        const mk = this._varKey(v2.key, v2.actorId, v2.projectId);
+        const ex = this.variables.get(mk);
+        this.variables.set(mk, { ...v2, ...ex?.lastUsedAt !== void 0 ? { lastUsedAt: ex.lastUsedAt } : {} });
+      }
+      async touchVariableUsage(key, actorId, projectId, when) {
+        const mk = this._varKey(key, actorId, projectId);
+        const ex = this.variables.get(mk);
+        if (ex) this.variables.set(mk, { ...ex, lastUsedAt: when });
       }
       async patchVariableValue(key, actorId, valueEncrypted, updatedAt) {
         const mk = this._varKey(key, actorId);
@@ -174422,9 +174615,37 @@ ${input.description}
           // 非连接器写入到此 deliveryMode 必非空（上面已拦）；连接器写入沿用 env（其值经 sensitiveVars 剔除，不进 env）。
           deliveryMode: v2.deliveryMode ?? "env",
           valueEncrypted: v2.encrypted === false ? `plain:${v2.value}` : this.encrypt(v2.value),
-          updatedAt: this.now()
+          updatedAt: this.now(),
+          // ADR 凭据保险库补章 §D2.2：expiresAt 写侧穿透——**显式带 key**（含 undefined），使清空（传空→undefined）
+          // 也落到底（store 两实现都按此覆盖）。lastUsedAt 从不由写侧传，取用时另刷（§D2.3）。
+          expiresAt: v2.expiresAt
         });
       }
+      /** ADR 凭据保险库补章 §D2.3：某一行变量「明文真被取用」→ 刷 lastUsedAt。行按 (key, actorId?, projectId?)
+       *  唯一键定位（与 put/delete 同址）。store 未实现该方法时静默跳过（不影响主功能）。 */
+      async touchVariableUsage(key, origin, when) {
+        await this.opts.store.touchVariableUsage?.(key, origin?.actorId, origin?.projectId, when ?? this.now());
+      }
+      /**
+       * ADR 凭据保险库补章 §D1.2：**人类控制台** reveal 的取值——不走 agent 的 `resolveActorProvisionEntries`
+       * 解析链（人类既无 personal 变量也无派单 artifactId，那条链恒空）。直接按存储唯一键取该行、解出明文。
+       *   - `selector` 由控制台列表行给出（personal 带 actorId、project 带 projectId、global 两者皆空）——
+       *     与 `GET /api/variables`「对所有人类返回全量」的可见口径一致（补章 §D1.3），列得到即 reveal 得到。
+       *   - 命中返回明文 + 该行的 origin（供刷 lastUsedAt）；未命中（无此行）返回 null（路由映射 403，与 agent 同壳）。
+       */
+      async revealHumanValue(key, selector) {
+        const wantActor = selector?.actorId;
+        const wantProject = selector?.projectId;
+        const rows = await this.opts.store.listVariables();
+        const row = rows.find(
+          (r) => r.key === key && (r.actorId ?? void 0) === (wantActor ?? void 0) && (r.projectId ?? void 0) === (wantProject ?? void 0)
+        );
+        if (!row) return null;
+        return {
+          value: this.decodeCiphertext(row.valueEncrypted),
+          origin: { ...row.actorId !== void 0 ? { actorId: row.actorId } : {}, ...row.projectId !== void 0 ? { projectId: row.projectId } : {} }
+        };
+      }
       /** 更新已有变量的 encrypted 属性（重新加密或解密），不改其他字段 */
       async patchVariableEncryption(key, actorId, encrypted) {
         const ct = await this.opts.store.getVariableCiphertext(key, actorId);
@@ -174463,7 +174684,10 @@ ${input.description}
             // 缺省视为 env（ADR §4.4；存量行读侧统一回填）
             encrypted: !isPlain,
             maskedValue: isPlain ? r.valueEncrypted.slice(6) : mask(this.decrypt(r.valueEncrypted)),
-            updatedAt: r.updatedAt
+            updatedAt: r.updatedAt,
+            // ADR 凭据保险库补章 §D2.1：到期/取用时间戳透传（展示层据此染色；补章 §D2.4）。
+            ...r.expiresAt !== void 0 ? { expiresAt: r.expiresAt } : {},
+            ...r.lastUsedAt !== void 0 ? { lastUsedAt: r.lastUsedAt } : {}
           };
         });
       }
@@ -174556,7 +174780,12 @@ ${input.description}
         const gated = (row) => !row.connectorId || enabledConnectors.has(row.connectorId);
         const put = (row) => {
           if (!gated(row)) return;
-          merged.set(row.key, { key: row.key, value: this.decodeCiphertext(row.valueEncrypted), deliveryMode: row.deliveryMode ?? "env" });
+          merged.set(row.key, {
+            key: row.key,
+            value: this.decodeCiphertext(row.valueEncrypted),
+            deliveryMode: row.deliveryMode ?? "env",
+            origin: { ...row.actorId !== void 0 ? { actorId: row.actorId } : {}, ...row.projectId !== void 0 ? { projectId: row.projectId } : {} }
+          });
         };
         for (const row of rows) {
           if (row.scope === "global" && !row.actorId) put(row);
@@ -174576,7 +174805,7 @@ ${input.description}
       async resolveRevealValue(actorId, key, opts) {
         const entries = await this.resolveActorProvisionEntries(actorId, { ...opts, refreshConnectors: false });
         const hit = entries.find((e) => e.key === key);
-        return hit ? { value: hit.value } : null;
+        return hit ? { value: hit.value, ...hit.origin ? { origin: hit.origin } : {} } : null;
       }
       encrypt(plain) {
         const iv = (0, import_node_crypto26.randomBytes)(12);
@@ -175805,6 +176034,21 @@ var init_connector_skills = __esm({
 function isKnownRevealSource(source) {
   return CREDENTIAL_REVEAL_SOURCES.has(source) || source.startsWith("agent-skill:");
 }
+function clientMetaFromReq(req) {
+  const fwd = req.raw?.headers?.["x-forwarded-for"];
+  const fwdFirst = (Array.isArray(fwd) ? fwd[0] : fwd)?.split(",")[0]?.trim();
+  const clientIp = fwdFirst || req.raw?.socket?.remoteAddress || void 0;
+  const ua = req.raw?.headers?.["user-agent"];
+  const userAgent = (Array.isArray(ua) ? ua[0] : ua) || void 0;
+  return { ...clientIp ? { clientIp } : {}, ...userAgent ? { userAgent } : {} };
+}
+function normalizeExpiresAt(raw) {
+  if (raw === void 0 || raw === null || raw === "") return void 0;
+  if (typeof raw !== "string") throw new ApiError(400, "BAD_REQUEST", "expiresAt \u987B\u4E3A ISO-8601 \u5B57\u7B26\u4E32");
+  const t = Date.parse(raw);
+  if (Number.isNaN(t)) throw new ApiError(400, "BAD_REQUEST", `expiresAt \u4E0D\u662F\u5408\u6CD5\u65E5\u671F\uFF1A${raw}`);
+  return new Date(t).toISOString();
+}
 function positionsFromPayload(body) {
   if (!body) return void 0;
   if (Object.prototype.hasOwnProperty.call(body, "roles")) {
@@ -175839,6 +176083,8 @@ function actorsDomain(opts) {
   const { resolveCtx } = opts;
   const revealLimits = opts.credentialRevealLimits ?? { perSession: 200, perSessionPerKey: 20 };
   const revealLimiter = new RevealRateLimiter(revealLimits.perSession, revealLimits.perSessionPerKey);
+  const consoleRevealLimits = opts.credentialRevealLimits?.console ?? { perSession: 60, perSessionPerKey: 10 };
+  const consoleRevealLimiter = new RevealRateLimiter(consoleRevealLimits.perSession, consoleRevealLimits.perSessionPerKey);
   return (router) => {
     router.get("/api/actors", async (req) => {
       const { service } = await resolveCtx(req.auth.companyId);
@@ -176125,11 +176371,6 @@ function actorsDomain(opts) {
       }
     };
     const auditVariableChange = async (req, kind, variableKey, targetScope) => {
-      const fwd = req.raw?.headers?.["x-forwarded-for"];
-      const fwdFirst = (Array.isArray(fwd) ? fwd[0] : fwd)?.split(",")[0]?.trim();
-      const clientIp = fwdFirst || req.raw?.socket?.remoteAddress || void 0;
-      const ua = req.raw?.headers?.["user-agent"];
-      const userAgent = (Array.isArray(ua) ? ua[0] : ua) || void 0;
       await opts.credentialAudit?.({
         kind,
         actor: req.auth.actor,
@@ -176137,8 +176378,7 @@ function actorsDomain(opts) {
         targetScope,
         source: "console",
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-        ...clientIp ? { clientIp } : {},
-        ...userAgent ? { userAgent } : {}
+        ...clientMetaFromReq(req)
       });
     };
     router.get("/api/variables", async (req) => {
@@ -176151,6 +176391,7 @@ function actorsDomain(opts) {
       const { service } = await resolveCtx(req.auth.companyId);
       const b2 = req.body;
       if (!b2?.key) throw new ApiError(400, "BAD_REQUEST", "\u7F3A\u5C11 key");
+      const expiresAt2 = normalizeExpiresAt(b2.expiresAt);
       if (b2.scope !== "global" && b2.scope !== "personal" && b2.scope !== "project") {
         throw new ApiError(
           400,
@@ -176191,7 +176432,8 @@ function actorsDomain(opts) {
         ...b2.deliveryMode !== void 0 ? { deliveryMode: b2.deliveryMode } : {},
         ...b2.connectorId !== void 0 ? { connectorId: b2.connectorId } : {},
         ...b2.overrides !== void 0 ? { overrides: b2.overrides } : {},
-        ...b2.encrypted !== void 0 ? { encrypted: b2.encrypted } : {}
+        ...b2.encrypted !== void 0 ? { encrypted: b2.encrypted } : {},
+        expiresAt: expiresAt2
       });
       await auditVariableChange(
         req,
@@ -176229,6 +176471,7 @@ function actorsDomain(opts) {
       const actorId = req.params.id;
       const b2 = req.body;
       if (!b2?.key) throw new ApiError(400, "BAD_REQUEST", "\u7F3A\u5C11 key");
+      const expiresAt2 = normalizeExpiresAt(b2.expiresAt);
       if (b2.deliveryMode !== void 0 && b2.deliveryMode !== "env" && b2.deliveryMode !== "ref" && b2.deliveryMode !== "broker") {
         throw new ApiError(400, "BAD_REQUEST", "deliveryMode \u53EA\u80FD\u662F env\u3001ref \u6216 broker");
       }
@@ -176259,7 +176502,8 @@ function actorsDomain(opts) {
         ...b2.deliveryMode !== void 0 ? { deliveryMode: b2.deliveryMode } : {},
         ...b2.connectorId !== void 0 ? { connectorId: b2.connectorId } : {},
         ...b2.overrides !== void 0 ? { overrides: b2.overrides } : {},
-        ...b2.encrypted !== void 0 ? { encrypted: b2.encrypted } : {}
+        ...b2.encrypted !== void 0 ? { encrypted: b2.encrypted } : {},
+        expiresAt: expiresAt2
       });
       await auditVariableChange(req, "credential_write", b2.key, `personal:${actorId}`);
       return { status: 201, body: { ok: true } };
@@ -176280,25 +176524,33 @@ function actorsDomain(opts) {
       const source = typeof b2?.source === "string" && b2.source.trim() || "agent-cli";
       if (!isKnownRevealSource(source)) throw new ApiError(400, "BAD_REQUEST", `\u672A\u8BC6\u522B\u7684 source\u300C${source}\u300D\uFF08\xA74.5.4\uFF1A\u53EA\u63A5\u53D7\u8BC6\u522B\u503C\uFF09`);
       const actor = req.auth.actor;
+      const isHuman2 = isHumanActor(actor);
+      const isConsole = source === "console";
+      const timestamp = (/* @__PURE__ */ new Date()).toISOString();
       const artifactId = req.auth.dispatch?.artifactId;
       const sessionId = req.auth.dispatch?.sessionId;
-      const now = Date.now();
-      const timestamp = new Date(now).toISOString();
-      const sessionKey = sessionId ?? `${actor}::${artifactId ?? "no-artifact"}`;
       const dispatchFields = { ...sessionId ? { sessionId } : {}, ...artifactId ? { artifactId } : {} };
-      const throttled = revealLimiter.check(sessionKey, key, now);
+      const consoleMeta = isConsole ? clientMetaFromReq(req) : {};
+      if (isConsole && !isHuman2) {
+        await opts.credentialAudit?.({ kind: "credential_reveal_denied", actor, variableKey: key, source, timestamp, reason: "no_permission", ...dispatchFields, ...consoleMeta });
+        return { status: 403, body: { code: "denied", key } };
+      }
+      const now = Date.now();
+      const sessionKey = isConsole ? actor : sessionId ?? `${actor}::${artifactId ?? "no-artifact"}`;
+      const limiter = isConsole ? consoleRevealLimiter : revealLimiter;
+      const throttled = limiter.check(sessionKey, key, now);
       if (throttled) {
-        await opts.credentialAudit?.({ kind: "credential_reveal_throttled", actor, variableKey: key, source, timestamp, scope: throttled, ...dispatchFields });
+        await opts.credentialAudit?.({ kind: "credential_reveal_throttled", actor, variableKey: key, source, timestamp, scope: throttled, ...dispatchFields, ...consoleMeta });
         return { status: 429, body: { code: "throttled", key, scope: throttled } };
       }
-      const scope = artifactId && opts.resolveDispatchScope ? await opts.resolveDispatchScope(artifactId) : {};
-      const resolved = await service.resolveRevealValue(actor, key, scope);
+      const resolved = isHuman2 ? await service.revealHumanValue(key, { ...b2?.actorId ? { actorId: b2.actorId } : {}, ...b2?.projectId ? { projectId: b2.projectId } : {} }) : await service.resolveRevealValue(actor, key, artifactId && opts.resolveDispatchScope ? await opts.resolveDispatchScope(artifactId) : {});
       if (!resolved) {
         const reason = await service.hasVariableKey(key) ? "no_permission" : "not_found";
-        await opts.credentialAudit?.({ kind: "credential_reveal_denied", actor, variableKey: key, source, timestamp, reason, ...dispatchFields });
+        await opts.credentialAudit?.({ kind: "credential_reveal_denied", actor, variableKey: key, source, timestamp, reason, ...dispatchFields, ...consoleMeta });
         return { status: 403, body: { code: "denied", key } };
       }
-      await opts.credentialAudit?.({ kind: "credential_reveal", actor, variableKey: key, source, timestamp, ...dispatchFields });
+      await opts.credentialAudit?.({ kind: "credential_reveal", actor, variableKey: key, source, timestamp, ...dispatchFields, ...consoleMeta });
+      await service.touchVariableUsage(key, resolved.origin, timestamp);
       return { status: 200, body: { value: resolved.value } };
     });
     router.get("/api/variables/reveal-audit", async (req) => {
@@ -176801,7 +177053,7 @@ var init_routes2 = __esm({
     init_image_upload();
     init_skill_materializer();
     init_connector_skills();
-    CREDENTIAL_REVEAL_SOURCES = /* @__PURE__ */ new Set(["agent-cli", "agent-exec", "smoke-test", "oasis-internal"]);
+    CREDENTIAL_REVEAL_SOURCES = /* @__PURE__ */ new Set(["agent-cli", "agent-exec", "smoke-test", "oasis-internal", "console"]);
     RevealRateLimiter = class {
       constructor(perSession, perSessionPerKey, ttlMs = 2 * 60 * 6e4) {
         this.perSession = perSession;
@@ -183017,8 +183269,8 @@ function executionContinuityDomain(service) {
       if (b2.changedOutputs !== void 0 && !isRefArray(b2.changedOutputs) || b2.unresolvedIssues !== void 0 && !isStringArray(b2.unresolvedIssues) || b2.risks !== void 0 && !isStringArray(b2.risks) || b2.nextActions !== void 0 && !isStringArray(b2.nextActions) || b2.verificationGaps !== void 0 && !isStringArray(b2.verificationGaps)) {
         throw new ApiError(400, "BAD_REQUEST", "handoff arrays contain invalid values");
       }
-      if (!isUserHandoff(b2.userHandoff)) {
-        throw new ApiError(400, "BAD_REQUEST", "\u7F3A\u5C11\u5408\u6CD5\u7684 userHandoff\uFF1BAgent \u5FC5\u987B\u63D0\u4EA4\u672C\u6B21\u5DE5\u4F5C\u7684\u4E1A\u52A1\u4EA4\u63A5\u6458\u8981");
+      if (b2.userHandoff !== void 0 && b2.userHandoff !== null && !isUserHandoff(b2.userHandoff)) {
+        throw new ApiError(400, "BAD_REQUEST", "userHandoff \u5F62\u72B6\u975E\u6CD5\uFF08\u53EF\u4EE5\u4E0D\u7ED9\uFF1B\u7ED9\u4E86\u5C31\u8981\u5408\u6CD5\uFF09");
       }
       const handoff = await service.handoff({
         attemptId,
@@ -183069,10 +183321,20 @@ function renderResumePack(pack) {
   if (!pack.previousAttempt) lines.push("- This is the first attempt.");
   else {
     lines.push(`- Attempt ${pack.previousAttempt.attemptNo ?? "?"}: ${pack.previousHandoff?.summary || pack.previousAttempt.status}`);
-    if (pack.latestCheckpoint) {
-      lines.push(`- Recoverability: ${pack.latestCheckpoint.recoverability}`);
-      for (const step of pack.latestCheckpoint.pendingSteps) lines.push(`  - pending: ${step}`);
-      for (const ref2 of pack.latestCheckpoint.durableRefs) lines.push(`  - durable: ${ref2.kind}:${ref2.id}${ref2.version ? `@${ref2.version}` : ""}`);
+    const cp = pack.latestCheckpoint;
+    const done = cp?.completedStepIds ?? [];
+    const durable = (cp?.durableRefs.length ? cp.durableRefs : pack.previousHandoff?.changedOutputs) ?? [];
+    if (cp) lines.push(`- Recoverability: ${cp.recoverability}`);
+    if (done.length > 0) lines.push(`- \u4E0A\u4E00\u8D9F\u5DF2\u5B8C\u6210\u7684\u6B65\u9AA4\uFF1A${done.join("\u3001")}`);
+    for (const ref2 of durable) {
+      lines.push(`  - durable: ${ref2.kind}:${ref2.id}${ref2.version ? `@${ref2.version}` : ""}${ref2.label ? ` \u2014 ${ref2.label}` : ""}`);
+    }
+    if (cp && cp.pendingSteps.length > 0) {
+      for (const step of cp.pendingSteps) lines.push(`  - pending: ${step}`);
+    } else {
+      lines.push(
+        durable.length > 0 || done.length > 0 ? "- \u672A\u5B8C\u6210\u7684\u6B65\u9AA4\uFF1A**\u672A\u77E5**\uFF08\u4E0A\u4E00\u8D9F\u6CA1\u7559 checkpoint\uFF09\u2014\u2014\u4EE5\u4E0A\u9762\u8FD9\u4E9B\u5DF2\u843D\u5730\u7684\u4EA7\u51FA\u4E3A\u51C6\uFF0C\u81EA\u5DF1\u6838\u5BF9\u8FD8\u7F3A\u4EC0\u4E48\uFF0C\u522B\u4ECE\u5934\u91CD\u505A\u3002" : "- \u4E0A\u4E00\u8D9F\u6CA1\u7559\u4E0B\u4EFB\u4F55\u53EF\u6062\u590D\u7684\u75D5\u8FF9\uFF08\u6CA1\u8DD1\u5230\u4EFB\u4F55\u6301\u4E45\u5316\u547D\u4EE4\uFF09\u2014\u2014\u6309\u9996\u6B21\u6267\u884C\u5904\u7406\u3002"
+      );
     }
   }
   lines.push("", "## External effects");
@@ -183181,6 +183443,7 @@ function renderCoordinatorView(view) {
 function shouldInjectResumePack(pack) {
   const status = pack?.previousAttempt?.status;
   if (!status) return false;
+  if (status === "running" || status === "queued") return false;
   return status !== "succeeded" && status !== "no-output";
 }
 function renderContinuityProtocol() {
@@ -183413,9 +183676,6 @@ var init_service7 = __esm({
       async handoff(input) {
         if (!HANDOFF_OUTCOMES2.has(input.outcome)) throw new Error(`invalid handoff outcome: ${input.outcome}`);
         if (!input.summary.trim()) throw new Error("handoff summary is required");
-        if (input.producedBy === "agent" && !input.userHandoff) {
-          throw new Error("agent-authored handoff requires userHandoff");
-        }
         const userHandoff = input.userHandoff ? normalizeUserHandoff(input.outcome, input.changedOutputs ?? [], input.userHandoff) : void 0;
         const attempt = await this.awaitAttempt(input.attemptId);
         const handoff = await this.afterAttemptVisible(() => this.store.putHandoff({
@@ -183619,8 +183879,7 @@ var init_service7 = __esm({
           "failed"
         ].map((state) => [state, nodes.filter((node) => node.nodeState === state).length]));
         const collaborationStatus = nodes.length > 0 && nodes.every((node) => DONE_STATES.has(node.nodeState)) ? "completed" : nodes.some((node) => BLOCKING_STATES.has(node.nodeState)) ? "needs_coordination" : "in_progress";
-        const handoffSummary = [...nodes].sort((a, b2) => Number(BLOCKING_STATES.has(b2.nodeState)) - Number(BLOCKING_STATES.has(a.nodeState))).map((node) => node.summary.trim()).find(Boolean) ?? "";
-        return { workOrderId, mode: this.mode, collaborationStatus, handoffSummary, progress, nodes, dependencyBlocks, todo: todos };
+        return { workOrderId, mode: this.mode, collaborationStatus, progress, nodes, dependencyBlocks, todo: todos };
       }
     };
   }
@@ -183662,15 +183921,20 @@ var init_handoff_work_bridge = __esm({
 
 // ../server/src/domains/execution-continuity/upstream-handoff-input.ts
 function renderRefs(refs) {
-  return refs.map(
-    (ref2) => `- ${ref2.kind}:${ref2.id}${ref2.version ? `@${ref2.version}` : ""}${ref2.label ? ` \u2014 ${ref2.label}` : ""}`
-  );
+  return refs.map((ref2) => {
+    const label = ref2.id.startsWith(`${ref2.kind}:`) ? ref2.id : `${ref2.kind}:${ref2.id}`;
+    return `- ${label}${ref2.version ? `@${ref2.version}` : ""}${ref2.label ? ` \u2014 ${ref2.label}` : ""}`;
+  });
 }
 function bounded(text) {
   const t = text.trim();
   return [...t].length <= INJECTED_TEXT_LIMIT ? t : `${[...t].slice(0, INJECTED_TEXT_LIMIT).join("")}\u2026\uFF08\u539F\u6587\u8FC7\u957F\uFF0C\u6B64\u5904\u622A\u65AD\uFF1B\u5B8C\u6574\u5185\u5BB9\u89C1\u8BE5\u4E0A\u6E38\u8282\u70B9\u7684\u4EA4\u4ED8\u8BF4\u660E\uFF09`;
 }
+function isExplicitNone(values) {
+  return values.length === 1 && NONE_TOKENS.has((values[0] ?? "").trim().toLowerCase());
+}
 function renderList(title, values) {
+  if (isExplicitNone(values)) return [`## ${title}`, "- \u6267\u884C\u4EBA\u786E\u8BA4\uFF1A\u65E0", ""];
   return [
     `## ${title}`,
     ...values.length > 0 ? values.map((value) => `- ${value}`) : ["- None"],
@@ -183750,8 +184014,7 @@ function createUpstreamHandoffInputResolver(opts) {
       const edge = snapshot.edges.find(
         (candidate) => candidate.fromNodeId === input.upstreamNodeId && candidate.toNodeId === input.downstreamNodeId
       );
-      const downstream = snapshot.nodes.find((node) => node.id === input.downstreamNodeId);
-      const businessEdge = edge?.kind === "data" && edge.required && downstream?.fields?.[BUSINESS_HANDOFF_POLICY_FIELD] !== BUSINESS_HANDOFF_POLICY_EXEMPT;
+      const businessEdge = edge?.kind === "data" && edge.required;
       if (!businessEdge) return null;
       if (edge.pinnedWorkId !== input.pinnedWorkId) {
         warn(
@@ -183813,12 +184076,12 @@ function createUpstreamHandoffInputResolver(opts) {
     }
   };
 }
-var INJECTED_TEXT_LIMIT;
+var INJECTED_TEXT_LIMIT, NONE_TOKENS;
 var init_upstream_handoff_input = __esm({
   "../server/src/domains/execution-continuity/upstream-handoff-input.ts"() {
     "use strict";
-    init_src3();
     INJECTED_TEXT_LIMIT = 4e3;
+    NONE_TOKENS = /* @__PURE__ */ new Set(["none", "n/a", "na", "nil", "\u65E0", "\u6CA1\u6709", "\u6682\u65E0"]);
   }
 });
 
@@ -188029,7 +188292,10 @@ function rowToVariable(row) {
     // **不塌成 env**，否则未知档位读回来变明文；仅 null/空回填 "env"（存量行）。派单侧按未知档保守处理。
     deliveryMode: typeof row.delivery_mode === "string" && row.delivery_mode ? row.delivery_mode : "env",
     valueEncrypted: row.value_encrypted,
-    updatedAt: new Date(row.updated_at).toISOString()
+    updatedAt: new Date(row.updated_at).toISOString(),
+    // ADR 凭据保险库补章 §D2.1：到期/取用时间戳（text 列存 ISO 字符串，原样带出；null/空 = undefined）。
+    ...row.expires_at ? { expiresAt: row.expires_at } : {},
+    ...row.last_used_at ? { lastUsedAt: row.last_used_at } : {}
   };
 }
 var ident4, PostgresRegistryStore, rowToActor, rowToConfig, rowToAgentPrefs;
@@ -188192,6 +188458,8 @@ var init_postgres_registry = __esm({
         await pool.query(`ALTER TABLE IF EXISTS "${s2}".variables ADD COLUMN IF NOT EXISTS project_id text`);
         await pool.query(`ALTER TABLE IF EXISTS "${s2}".variables ADD COLUMN IF NOT EXISTS environment text`);
         await pool.query(`ALTER TABLE IF EXISTS "${s2}".variables ADD COLUMN IF NOT EXISTS delivery_mode text`);
+        await pool.query(`ALTER TABLE IF EXISTS "${s2}".variables ADD COLUMN IF NOT EXISTS expires_at text`);
+        await pool.query(`ALTER TABLE IF EXISTS "${s2}".variables ADD COLUMN IF NOT EXISTS last_used_at text`);
         await pool.query(`DROP INDEX IF EXISTS "${s2}"."${s2}_variables_key_actor_uq"`);
         await pool.query(`DROP INDEX IF EXISTS "${s2}"."${s2}_variables_scope_uq"`);
         await pool.query(`
@@ -188668,10 +188936,10 @@ var init_postgres_registry = __esm({
       /* ---------- 变量 ---------- */
       async putVariable(v2) {
         await this.pool.query(
-          `INSERT INTO ${this.s}.variables (key, scope, actor_id, project_id, connector_id, overrides, delivery_mode, value_encrypted, updated_at)
-       VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9)
+          `INSERT INTO ${this.s}.variables (key, scope, actor_id, project_id, connector_id, overrides, delivery_mode, value_encrypted, updated_at, expires_at)
+       VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10)
        ON CONFLICT (key, COALESCE(actor_id, ''), COALESCE(project_id, '')) DO UPDATE
-         SET scope=$2, actor_id=$3, project_id=$4, connector_id=$5, overrides=$6, delivery_mode=$7, value_encrypted=$8, updated_at=$9`,
+         SET scope=$2, actor_id=$3, project_id=$4, connector_id=$5, overrides=$6, delivery_mode=$7, value_encrypted=$8, updated_at=$9, expires_at=$10`,
           [
             v2.key,
             v2.scope,
@@ -188681,10 +188949,18 @@ var init_postgres_registry = __esm({
             v2.overrides ?? null,
             v2.deliveryMode ?? null,
             v2.valueEncrypted,
-            v2.updatedAt
+            v2.updatedAt,
+            v2.expiresAt ?? null
           ]
         );
       }
+      async touchVariableUsage(key, actorId, projectId, when) {
+        await this.pool.query(
+          `UPDATE ${this.s}.variables SET last_used_at=$4
+       WHERE key=$1 AND COALESCE(actor_id,'')=COALESCE($2::text,'') AND COALESCE(project_id,'')=COALESCE($3::text,'')`,
+          [key, actorId ?? null, projectId ?? null, when]
+        );
+      }
       async patchVariableValue(key, actorId, valueEncrypted, updatedAt) {
         const aid = actorId ?? null;
         await this.pool.query(
@@ -194415,6 +194691,15 @@ async function buildActorProvision(service, actorId, scope, onBrokerRefused) {
   const brokerRefused = [];
   applyRefDelivery(env, entries, void 0, (k2) => brokerRefused.push(k2));
   if (onBrokerRefused) for (const k2 of brokerRefused) await onBrokerRefused(k2);
+  const brokerSet = new Set(brokerRefused);
+  for (const e of entries) {
+    if (brokerSet.has(e.key)) continue;
+    try {
+      await service.touchVariableUsage(e.key, e.origin);
+    } catch (err) {
+      console.warn(`[credential] touchVariableUsage(${e.key}) \u5931\u8D25\uFF08\u4E0D\u963B\u65AD\u6D3E\u5355\uFF09\uFF1A${err instanceof Error ? err.message : String(err)}`);
+    }
+  }
   return {
     env,
     wrapperPaths: [oasisWrapperScript(), ...provision.wrapperPaths],
@@ -195726,7 +196011,10 @@ async function startServe(opts) {
       ...await materializeSkillFiles({ service: actors.service, actorId, runtimeKind })
     }),
     uploadChatAttachment: async ({ contentBase64 }) => ({ blobRef: await assets.put(new Uint8Array(Buffer.from(contentBase64, "base64"))) }),
-    onDispatchCommandCompleted: async ({ dispatchId, command, durableRefs, at, delivered }) => {
+    onDispatchCommandCompleted: async ({ dispatchId, command, durableRefs, at, delivered, pendingSteps }) => {
+      if (pendingSteps && pendingSteps.length > 0) {
+        traceStoreSink.checkpointState(dispatchId, { pendingSteps: [...pendingSteps] });
+      }
       traceStoreSink.checkpoint(dispatchId, {
         trigger: "important_output",
         // 交作业的那条命令带着版本号（`wk:<节点>:<n>`），比笼统的「动过这个产物」有用得多——
@@ -197696,12 +197984,13 @@ var KNOWN2 = [
   { adapter: "copilot", binary: "copilot" },
   { adapter: "kimi", binary: "kimi" },
   { adapter: "kiro", binary: "kiro-cli" },
+  { adapter: "reasonix", binary: "reasonix" },
   { adapter: "pi", binary: "pi" },
   { adapter: "openclaw", binary: "openclaw" },
   { adapter: "codebuddy", binary: "codebuddy" },
   { adapter: "antigravity", binary: "agy" }
 ];
-var NATIVE_APPEND_RUNTIMES = /* @__PURE__ */ new Set(["hermes", "gemini", "kimi", "kiro"]);
+var NATIVE_APPEND_RUNTIMES = /* @__PURE__ */ new Set(["hermes", "gemini", "kimi", "kiro", "reasonix"]);
 function onPath(binary) {
   try {
     const cmd = process.platform === "win32" ? "where" : "which";
@@ -198505,6 +198794,7 @@ async function startNode(opts) {
     copilot: new CopilotAdapter(),
     kimi: new KimiAdapter(),
     kiro: new KiroAdapter(),
+    reasonix: new ReasonixAdapter(),
     pi: new PiAdapter(),
     openclaw: new OpenClawAdapter(),
     codebuddy: new CodebuddyAdapter(),
@@ -198989,7 +199279,8 @@ var COMMAND_DECLS = {
       { name: "unresolved", desc: "\u7559\u7ED9\u4E0B\u6E38\u7684\u672A\u51B3\u4E8B\u9879\uFF08\u5206\u53F7\u5206\u9694\uFF09\u3002\u5199\u8FDB\u672C\u8282\u70B9\u7684\u6280\u672F\u4EA4\u63A5\uFF0C\u4E0B\u6E38\u5F00\u5DE5\u524D\u4F1A\u8BFB\u5230" },
       { name: "risks", desc: "\u4E0B\u6E38\u8BE5\u77E5\u9053\u7684\u98CE\u9669\uFF08\u5206\u53F7\u5206\u9694\uFF09" },
       { name: "next", desc: "\u5EFA\u8BAE\u4E0B\u6E38\u63A5\u7740\u505A\u4EC0\u4E48\uFF08\u5206\u53F7\u5206\u9694\uFF09" },
-      { name: "gaps", desc: "\u4F60\u6CA1\u80FD\u6838\u9A8C\u7684\u90E8\u5206\uFF08\u5206\u53F7\u5206\u9694\uFF09\u2014\u2014\u522B\u8BA9\u4E0B\u6E38\u4EE5\u4E3A\u5DF2\u9A8C\u8FC7" }
+      { name: "gaps", desc: "\u4F60\u6CA1\u80FD\u6838\u9A8C\u7684\u90E8\u5206\uFF08\u5206\u53F7\u5206\u9694\uFF09\u2014\u2014\u522B\u8BA9\u4E0B\u6E38\u4EE5\u4E3A\u5DF2\u9A8C\u8FC7" },
+      { name: "pending", desc: "\u8FD8\u5269\u4EC0\u4E48\u6CA1\u505A\uFF08\u5206\u53F7\u5206\u9694\uFF09\u3002\u5B58\u8FDB\u672C\u8F6E checkpoint\uFF1A\u8FD9\u4E00\u8D9F\u82E5\u88AB\u780D\uFF08\u8D85\u65F6/\u989D\u5EA6/\u6389\u7EBF\uFF09\uFF0C\u4E0B\u4E00\u8D9F\u63A5\u624B\u7684\u4EBA\u636E\u5B83\u63A5\u7740\u505A" }
     ],
     examples: [
       'oasis propose artifact:dev:abc-123 --from-dir deliverable/ --reason "\u4FEE\u590D\u767B\u5F55\u9875\u767D\u5C4F"',
@@ -201675,7 +201966,9 @@ ${res.warning}`);
         ...semicolonList(flags.get("unresolved"), "unresolvedIssues"),
         ...semicolonList(flags.get("risks"), "risks"),
         ...semicolonList(flags.get("next"), "nextActions"),
-        ...semicolonList(flags.get("gaps"), "verificationGaps")
+        ...semicolonList(flags.get("gaps"), "verificationGaps"),
+        // 「还剩什么没做」：唯一系统推不出来的字段，挂在本来就要跑的命令上（见 server 的 pendingSteps 注释）
+        ...semicolonList(flags.get("pending"), "pendingSteps")
       });
       println(message);
       break;
@@ -202949,7 +203242,7 @@ function syncRuntimeAssets(candidateRoots, binDir) {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.107" : "dev";
+var PKG_VERSION = true ? "0.1.109" : "dev";
 var OASIS_DIR = path28.join(os11.homedir(), ".oasis");
 var CONFIG_FILE = path28.join(OASIS_DIR, "node-config.json");
 var PID_FILE = path28.join(OASIS_DIR, "node.pid");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.107",
+  "version": "0.1.109",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"