oasis_test 0.1.107 → 0.1.108

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,25 @@ ${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**`
+    ],
     // 兜底（§10）：上次失败了 → 明确告诉它发生了什么 + 怎么破（首选 add-revision 拆出去）
     ...args.lastFailure ? args.lastFailure.resumed ? [
       // 续跑分支：上文还在它眼前，别再说"没留下任何产出"（自相矛盾），改成"接着干 + 先核现场"。
@@ -7994,14 +8020,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 +13240,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 +14091,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 +16040,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 +149135,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 +149181,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 +150008,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 +150026,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;
@@ -159376,6 +159409,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 +159455,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 +159514,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 +159643,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 +159671,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) {
@@ -183662,15 +183711,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"],
@@ -183813,12 +183867,13 @@ 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"]);
   }
 });
 
@@ -202949,7 +203004,7 @@ function syncRuntimeAssets(candidateRoots, binDir) {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.107" : "dev";
+var PKG_VERSION = true ? "0.1.108" : "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.108",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"