oasis_test 0.1.103 → 0.1.104

package/dist/index.js

@@ -7364,9 +7364,9 @@ function checkTerminated(state) {
     if (!isBusinessDependencyEdge(state, edge)) continue;
     if (isEdgeInputUnobtainable(state, edge)) continue;
     const upstream = state.node(edge.fromNodeId);
-    if (!upstream?.latestWorkId || !businessHandoffBarrierSatisfied(state, upstream.id, upstream.latestWorkId)) return false;
+    if (!upstream?.latestAcceptId || !businessHandoffBarrierSatisfied(state, upstream.id, upstream.latestAcceptId)) return false;
   }
-  return live.every((n) => n.latestWorkId !== null && n.latestAcceptId === n.latestWorkId);
+  return live.every((n) => n.latestAcceptId !== null && (n.latestAcceptId === n.latestWorkId || n.latestAcceptId === n.latestSuccessWorkId));
 }
 function isEdgeInputUnobtainable(state, edge) {
   const upstream = state.node(edge.fromNodeId);
@@ -7394,10 +7394,17 @@ function acceptBlock(state, workId) {
   }
   const node = state.node(w2.nodeId);
   if (!node) return { code: "node-missing", detail: `\u8282\u70B9\u4E0D\u5728\u518C\uFF1A${w2.nodeId}`, overridable: false };
-  if (!w2.endedAt && !hasOutput(w2, state.artifactsOf(w2.id).length)) {
+  if (!hasOutput(w2, state.artifactsOf(w2.id).length)) {
+    if (!w2.endedAt) {
+      return {
+        code: "work-in-flight",
+        detail: `\u8FD9\u4E00\u7248\u8FD8\u5728\u8DD1\u3001\u4E14\u8FD8\u6CA1\u6709\u4EFB\u4F55\u4EA7\u51FA\u2014\u2014\u7B49\u5B83\u4EA4\u7A3F\u540E\u518D\u6536\u53E3\uFF0C\u6216\u5148\u505C\u6389\uFF08hold\uFF09/ \u91CD\u8DD1`,
+        overridable: false
+      };
+    }
     return {
-      code: "work-in-flight",
-      detail: `\u8FD9\u4E00\u7248\u8FD8\u5728\u8DD1\u3001\u4E14\u8FD8\u6CA1\u6709\u4EFB\u4F55\u4EA7\u51FA\u2014\u2014\u7B49\u5B83\u4EA4\u7A3F\u540E\u518D\u6536\u53E3\uFF0C\u6216\u5148\u505C\u6389\uFF08hold\uFF09/ \u91CD\u8DD1`,
+      code: "no-output",
+      detail: `\u8FD9\u4E00\u7248\u5DF2\u7ED3\u675F\u4F46\u6CA1\u6709\u4EFB\u4F55\u4EA7\u51FA\uFF08\u7A7A\u58F3\uFF09\u2014\u2014\u4E0D\u80FD\u628A\u6CA1\u6709\u5185\u5BB9\u7684\u7248\u672C\u6536\u53E3\u6210\u4EA4\u4ED8\u7248\u672C\uFF1B\u6539\u5BF9\u6700\u8FD1\u4E00\u7248\u6709\u4EA7\u51FA\u7684\u7248\u672C\u64CD\u4F5C\uFF0C\u6216\u91CD\u8DD1\u672C\u8282\u70B9`,
       overridable: false
     };
   }
@@ -7408,10 +7415,10 @@ function handoffBlock(state, nodeId, workId) {
   if (!requiresBusinessHandoff(state, nodeId, work)) return null;
   if (work?.acceptanceState === "accepted" && work.overrideBy) return null;
   const node = state.node(nodeId);
-  if (node?.latestWorkId !== workId) {
+  if (workId !== node?.latestWorkId && workId !== node?.latestSuccessWorkId) {
     return {
       code: "not-latest-work",
-      detail: `\u4E0D\u662F\u672C\u8282\u70B9\u6700\u65B0\u4E00\u7248\uFF08\u6700\u65B0\uFF1A${node?.latestWorkId ?? "\u65E0"}\uFF09\u2014\u2014\u6536\u53E3\u53EA\u8BA4\u6700\u65B0\u7248`,
+      detail: `\u4E0D\u662F\u672C\u8282\u70B9\u6700\u65B0\u7248\uFF08\u6700\u65B0\u5C1D\u8BD5\uFF1A${node?.latestWorkId ?? "\u65E0"}\uFF1B\u6700\u65B0\u6709\u6548\u4EA7\u51FA\uFF1A${node?.latestSuccessWorkId ?? "\u65E0"}\uFF09\u2014\u2014\u6536\u53E3\u53EA\u8BA4\u6700\u65B0\u4E00\u7248\u6216\u6700\u65B0\u6709\u6548\u4EA7\u51FA`,
       overridable: false
     };
   }
@@ -7504,6 +7511,7 @@ CREATE TABLE IF NOT EXISTS ${schema}.workflow_nodes (
   assignee_actor_id     text,
   assignee_role         text,
   latest_work_id        text,
+  latest_success_work_id text,
   latest_accept_id      text,
   is_final_output       boolean NOT NULL DEFAULT false,
   fields                jsonb,
@@ -7765,6 +7773,9 @@ CREATE INDEX IF NOT EXISTS issues_workorder_alive_idx ON ${schema}.issues (worko
 CREATE INDEX IF NOT EXISTS issues_about_alive_idx ON ${schema}.issues (about_node_id) WHERE resolved_at IS NULL;
 CREATE INDEX IF NOT EXISTS issues_raised_alive_idx ON ${schema}.issues (raised_by_node_id) WHERE resolved_at IS NULL;
 ALTER TABLE ${schema}.workflow_nodes ADD COLUMN IF NOT EXISTS fields jsonb;
+-- \u2605 \u6709\u6548\u4EA7\u51FA\u6307\u9488\uFF08ADR 0148\uFF09\uFF1Anode \u4E0A\u300C\u6700\u8FD1\u4E00\u6B21\u5C1D\u8BD5\u300D\uFF08latest_work_id\uFF09\u4E4B\u5916\u518D\u5B58\u300C\u6700\u8FD1\u4E00\u6B21\u6709\u6548\u4EA7\u51FA\u300D\uFF0C
+--   \u5931\u8D25\u7A7A\u6D3E\u53D1\u4E0D\u518D\u9876\u6389\u6210\u54C1\u3002\u56DE\u586B\u5728\u4E0B\u65B9 works.status \u56DE\u586B\u4E4B\u540E\u6267\u884C\uFF08\u4F9D\u8D56 status \u5DF2\u843D\u5E93\uFF09\u3002
+ALTER TABLE ${schema}.workflow_nodes ADD COLUMN IF NOT EXISTS latest_success_work_id text;
 -- \u2605 \u5148\u5220\u89C6\u56FE\u518D\u5220\u5217\uFF1Awork_view/node_view/workorder_view \u7528 SELECT *\uFF0C\u5BF9\u57FA\u8868\u5217\u6709\u4F9D\u8D56\u2014\u2014\u5B58\u91CF\u5E93\u4E0A
 -- DROP COLUMN \u4F1A\u62A5 "cannot drop column ... because other objects depend on it"\uFF0C\u4E14\u672C\u6BB5\u662F\u5355\u6761
 -- \u591A\u8BED\u53E5 Query\uFF08\u4E00\u4E2A\u9690\u5F0F\u4E8B\u52A1\uFF09\uFF0C\u4E00\u5904\u5931\u8D25\u5168\u6BB5\u56DE\u6EDA\u3001migrate \u629B\u9519 \u2192 serve \u8D77\u4E0D\u6765\u3002\u89C6\u56FE\u968F\u540E\u7531
@@ -7820,6 +7831,16 @@ UPDATE ${schema}.reviews SET status = CASE
   WHEN ended_at       IS NOT NULL THEN 'failed'
   ELSE 'running' END
 WHERE status IS NULL;
+-- \u2605 \u6709\u6548\u4EA7\u51FA\u6307\u9488\u56DE\u586B\uFF08ADR 0148\uFF09\uFF1Alatest_success_work_id = \u8BE5\u8282\u70B9\u6700\u8FD1\u4E00\u4E2A status=success \u7684**\u4E3B\u94FE** work
+--   \uFF08\u6392\u9664\u56DE\u4FE1 work reply_to_issue_id\uFF09\u3002\u5FC5\u987B\u5728\u4E0A\u9762 works.status \u56DE\u586B\u4E4B\u540E\uFF08\u4F9D\u8D56 status \u5DF2\u843D\u5E93\uFF09\u3002
+--   \u53EA\u586B\u5F53\u524D\u4E3A NULL \u7684\u884C \u2192 \u5E42\u7B49\uFF1A\u91CD\u542F\u65F6\u4E0D\u8986\u76D6 handler \u5DF2\u7EF4\u62A4\u7684\u503C\uFF1B\u4ECE\u672A\u6210\u529F\u8FC7\u7684\u8282\u70B9\u4FDD\u6301 NULL\u3002
+UPDATE ${schema}.workflow_nodes n SET latest_success_work_id = (
+  SELECT w.id FROM ${schema}.works w
+  WHERE w.node_id = n.id AND w.status = 'success' AND w.reply_to_issue_id IS NULL
+  ORDER BY w.created_at DESC, w.id DESC
+  LIMIT 1
+)
+WHERE n.latest_success_work_id IS NULL;
 `;
 }
 function ENGINE_VIEWS(schema) {
@@ -7835,20 +7856,25 @@ SELECT r.*, r.status AS state
 FROM ${schema}.reviews r;
 
 DROP VIEW IF EXISTS ${schema}.node_view;
+-- \u2605 ADR 0148\uFF1A\u4E3B\u6001\u6309 latest_success\uFF08\u6700\u8FD1\u4E00\u4E2A\u6709\u6548\u4EA7\u51FA\uFF09\u8D70\u2014\u2014\u300C\u5DF2\u4EA4\u4ED8 v3\u3001\u672B\u6B21\u5C1D\u8BD5 v4 \u5D29\u4E86\u300D\u663E\u793A\u5DF2\u5B8C\u6210\uFF0C
+--   \u672B\u6B21\u5931\u8D25\u53EA\u4F5C\u526F\u6807\u8BB0\uFF08\u7248\u672C\u5217\u8868\u91CC\u90A3\u6761 failed \u4ECD\u5728\uFF09\uFF0C\u4E0D\u518D\u51FA\u73B0\u300C\u56FE\u4E0A\u7EA2\u3001\u4E0B\u6E38\u5728\u8DD1\u300D\u7684\u5272\u88C2\u3002
+--   \u4E0E views.ts nodeState \u540C\u6E90\uFF1A\u5728\u8DD1\uFF08latest_work running\uFF09\u4F18\u5148\uFF1B\u5426\u5219\u6709 latest_success \u5C31\u6309\u5176\u9A8C\u6536\u4E0E\u5426\u5206
+--   \u5DF2\u5B8C\u6210/\u8BC4\u5BA1\u4E2D\uFF1B\u518D\u5426\u5219\u672B\u6B21\u5C1D\u8BD5\u5931\u8D25/dead \u2192 \u5361\u4F4F\u3002
 CREATE VIEW ${schema}.node_view AS
 SELECT n.*,
   CASE
     WHEN n.cancelled_at IS NOT NULL THEN 'dead'                    -- \u5DF2\u4F5C\u5E9F\uFF08\u79FB\u51FA\u8BA1\u5212\uFF09
     WHEN lw.id IS NULL THEN 'waiting'                              -- \u672A\u8FD0\u884C\uFF08latest_work \u4E3A\u7A7A\uFF09
     WHEN lw.status = 'retry' THEN 'waiting'                        -- \u672A\u8FD0\u884C\uFF08\u7528\u6237\u4ECB\u5165\u91CD\u8BD5\uFF0C\u7B49 try_to_run\uFF09
-    WHEN lw.status = 'running' THEN 'running'                      -- \u5728\u8FDB\u884C
-    WHEN lw.status = 'success' AND n.latest_accept_id IS DISTINCT FROM lw.id THEN 'reviewing'  -- \u8BC4\u5BA1\u4E2D
-    WHEN lw.status = 'success' AND n.latest_accept_id = lw.id THEN 'done'                     -- \u5DF2\u5B8C\u6210
-    WHEN lw.status IN ('failed','dead') THEN 'dead'                -- \u5361\u4F4F\u4E86
+    WHEN lw.status = 'running' THEN 'running'                      -- \u5728\u8FDB\u884C\uFF08\u91CD\u8DD1\u8FDB\u884C\u4E2D\u4E5F\u4F18\u5148\u663E\u793A\u5728\u8FDB\u884C\uFF09
+    WHEN ls.id IS NOT NULL AND n.latest_accept_id = ls.id THEN 'done'                     -- \u5DF2\u5B8C\u6210\uFF08\u6709\u6548\u4EA7\u51FA\u5DF2\u9A8C\u6536\uFF09
+    WHEN ls.id IS NOT NULL AND n.latest_accept_id IS DISTINCT FROM ls.id THEN 'reviewing' -- \u8BC4\u5BA1\u4E2D\uFF08\u6709\u6548\u4EA7\u51FA\u672A\u9A8C\u6536\uFF09
+    WHEN lw.status IN ('failed','dead') THEN 'dead'                -- \u4ECE\u672A\u4EA7\u51FA\u4E14\u672B\u6B21\u5C1D\u8BD5\u5931\u8D25 \u2192 \u5361\u4F4F\u4E86
     ELSE 'waiting'
   END AS state
 FROM ${schema}.workflow_nodes n
-LEFT JOIN ${schema}.works lw ON lw.id = n.latest_work_id;
+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;
 
 DROP VIEW IF EXISTS ${schema}.workorder_view;
 CREATE VIEW ${schema}.workorder_view AS
@@ -13128,6 +13154,7 @@ var init_store_postgres = __esm({
             assigneeActorId: n.assignee_actor_id,
             assigneeRole: n.assignee_role,
             latestWorkId: n.latest_work_id,
+            latestSuccessWorkId: n.latest_success_work_id ?? null,
             latestAcceptId: n.latest_accept_id,
             isFinalOutput: n.is_final_output,
             cancelledAt: iso(n.cancelled_at),
@@ -13304,9 +13331,9 @@ var init_store_postgres = __esm({
               await this.c.query(
                 `INSERT INTO ${this.s}.workflow_nodes
              (id,workorder_id,type,title,spec,version,assignee_actor_id,assignee_role,
-              latest_work_id,latest_accept_id,is_final_output,
+              latest_work_id,latest_success_work_id,latest_accept_id,is_final_output,
               fields,cancelled_at,row_version,created_at,updated_at)
-             VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16)
+             VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17)
              ON CONFLICT (id) DO NOTHING`,
                 [
                   n.id,
@@ -13318,6 +13345,7 @@ var init_store_postgres = __esm({
                   n.assigneeActorId,
                   n.assigneeRole,
                   n.latestWorkId,
+                  n.latestSuccessWorkId,
                   n.latestAcceptId,
                   n.isFinalOutput,
                   n.fields ? JSON.stringify(n.fields) : null,
@@ -13586,11 +13614,14 @@ var init_store_postgres = __esm({
        * `NOT EXISTS` 那一段是"我前面还有没跑完的兄弟就别动我"；`SKIP LOCKED` 是
        * "别的 worker 正在处理这张工单就跳过整张"。两者合起来 = 按工单分区的串行队列。
        */
-      async claimNextEvent(now) {
+      async claimNextEvent(now, recoverAppliedBefore) {
         const res = await this.c.query(
           `SELECT e.* FROM ${this.s}.events e
-        WHERE e.status = 'pending'
-          AND (e.available_at IS NULL OR e.available_at <= $1)
+        WHERE (
+                (e.status = 'pending' AND (e.available_at IS NULL OR e.available_at <= $1))
+                -- \u5D29\u6E83\u81EA\u6108\uFF1A\u5361\u5728 applied \u592A\u4E45\u7684\uFF08\u8FDB\u7A0B\u6B7B\u5728\u300C\u843D\u72B6\u6001\u300D\u4E0E\u300C\u6536\u5C3E\u300D\u4E4B\u95F4\uFF09\u4E5F\u56DE\u6536\u91CD\u8DD1
+                OR ($2::timestamptz IS NOT NULL AND e.status = 'applied' AND e.applied_at < $2::timestamptz)
+              )
           AND NOT EXISTS (
             SELECT 1 FROM ${this.s}.events p
              WHERE p.workorder_id = e.workorder_id
@@ -13599,7 +13630,7 @@ var init_store_postgres = __esm({
         ORDER BY e.seq
         FOR UPDATE OF e SKIP LOCKED
         LIMIT 1`,
-          [now]
+          [now, recoverAppliedBefore ?? null]
         );
         return res.rows[0] ? toRecord(res.rows[0]) : null;
       }
@@ -13640,10 +13671,14 @@ var init_store_postgres = __esm({
         );
         return (res.rowCount ?? 0) > 0;
       }
-      async claimAllPending(now) {
+      async claimAllPending(now, recoverAppliedBefore) {
         const res = await this.c.query(
           `SELECT e.* FROM ${this.s}.events e
-       WHERE e.status = 'pending' AND (e.available_at IS NULL OR e.available_at <= $1)
+       WHERE (
+               (e.status = 'pending' AND (e.available_at IS NULL OR e.available_at <= $1))
+               -- \u5D29\u6E83\u81EA\u6108\uFF1A\u89C1 claimNextEvent \u7684\u6CE8\u91CA
+               OR ($2::timestamptz IS NOT NULL AND e.status = 'applied' AND e.applied_at < $2::timestamptz)
+             )
          AND NOT EXISTS (SELECT 1 FROM ${this.s}.events p WHERE p.workorder_id = e.workorder_id
                           AND p.status IN ('pending','applied') AND p.seq < e.seq)
        -- \u2605 scan \u4E8B\u4EF6\u6392\u524D\u9762\uFF1Aorigin='apply' \u4E14\u65E0\u4E0A\u6E38\u4E8B\u4EF6\uFF08\u4E0D\u662F\u88AB\u5176\u4ED6\u4E8B\u4EF6\u89E6\u53D1\u7684\uFF09
@@ -13653,7 +13688,7 @@ var init_store_postgres = __esm({
          CASE WHEN e.origin = 'apply' AND e.caused_by_seq IS NULL THEN 0 ELSE 1 END,
          e.seq
        FOR UPDATE OF e SKIP LOCKED`,
-          [now]
+          [now, recoverAppliedBefore ?? null]
         );
         return res.rows.map(toRecord);
       }
@@ -13810,6 +13845,7 @@ function newNode(id, workorderId, at, version2) {
     assigneeActorId: null,
     assigneeRole: null,
     latestWorkId: null,
+    latestSuccessWorkId: null,
     latestAcceptId: null,
     isFinalOutput: false,
     cancelledAt: null,
@@ -14138,6 +14174,10 @@ var init_workorder = __esm({
 });
 
 // ../engine/src/handlers/work.ts
+function latestSuccessOf(state, nodeId) {
+  const successes = state.worksOf(nodeId).filter((w2) => !w2.replyToIssueId && w2.status === "success").sort((a, b2) => a.createdAt.localeCompare(b2.createdAt));
+  return successes.length > 0 ? successes[successes.length - 1].id : null;
+}
 var workCreate, workKill, workResponse, workHandoffRecorded, workStart, workSubmitOutput, workTimeout;
 var init_work = __esm({
   "../engine/src/handlers/work.ts"() {
@@ -14267,6 +14307,12 @@ var init_work = __esm({
             ...w2.status !== "dead" ? { status: "dead" } : {}
           });
         }
+        if (node.latestSuccessWorkId) {
+          const ls = state.work(node.latestSuccessWorkId);
+          if (!ls || ls.status !== "success") {
+            state.updateNode(e.nodeId, { latestSuccessWorkId: latestSuccessOf(state, e.nodeId) });
+          }
+        }
         killNodeReviews(state, e.nodeId, ctx.at);
       },
       async effect(e, ctx) {
@@ -14300,6 +14346,9 @@ var init_work = __esm({
           outcomeDetail: businessFailed ? { ...e.detail ?? {}, reason: "agent business handoff not delivered" } : e.detail,
           status
         });
+        if (status === "success") {
+          state.updateNode(w2.nodeId, { latestSuccessWorkId: e.workId });
+        }
       }
     };
     workHandoffRecorded = {
@@ -14309,17 +14358,20 @@ var init_work = __esm({
         const w2 = state.work(e.workId);
         if (!w2 || e.producedBy !== "agent") return;
         if (w2.agentHandoffAttemptId && w2.agentHandoffAttemptId !== e.attemptId) return;
+        const flipsToFailed = e.status === "not_delivered" && w2.endedAt && !w2.deadAt;
         state.updateWork(e.workId, {
           agentHandoffAttemptId: e.attemptId,
           businessHandoffStatus: e.status,
           businessHandoffRecordedAt: ctx.at,
-          // handoff 可以在 work.response 后到达。明确未交付必须回到现有失败/重试路径。
-          ...e.status === "not_delivered" && w2.endedAt && !w2.deadAt ? {
+          ...flipsToFailed ? {
             status: "failed",
             outcome: "failed",
             outcomeDetail: { ...w2.outcomeDetail ?? {}, reason: "agent business handoff not delivered" }
           } : {}
         });
+        if (flipsToFailed && state.node(w2.nodeId)?.latestSuccessWorkId === e.workId) {
+          state.updateNode(w2.nodeId, { latestSuccessWorkId: latestSuccessOf(state, w2.nodeId) });
+        }
       }
     };
     workStart = {
@@ -14865,7 +14917,7 @@ function emptySnapshotPlaceholder(record8) {
     reviews: []
   };
 }
-var SYSTEM_ACTOR2, NOOP_IO, SYSTEM_CLOCK, HandlerRegistry, EngineBus, ApplyFailure, sleep;
+var SYSTEM_ACTOR2, NOOP_IO, SYSTEM_CLOCK, HandlerRegistry, DEFAULT_STUCK_APPLIED_RECOVERY_MS, EngineBus, ApplyFailure, sleep;
 var init_bus = __esm({
   "../engine/src/bus.ts"() {
     "use strict";
@@ -14903,6 +14955,7 @@ var init_bus = __esm({
         return [...this.byKind.values()].flat();
       }
     };
+    DEFAULT_STUCK_APPLIED_RECOVERY_MS = 5 * 6e4;
     EngineBus = class {
       store;
       io;
@@ -14911,6 +14964,7 @@ var init_bus = __esm({
       policy;
       registry;
       maxEffectAttempts;
+      stuckAppliedRecoveryMs;
       running = false;
       /** 事件监听器（内存 pubsub）：每批事件处理完调用，供 /api/events SSE 推送（替代旧 oplog.subscribe）。 */
       eventListener = null;
@@ -14922,10 +14976,19 @@ var init_bus = __esm({
         this.policy = opts.policy ?? CODE_DEFAULT_POLICY;
         this.registry = new HandlerRegistry(opts.handlers);
         this.maxEffectAttempts = opts.maxEffectAttempts ?? 3;
+        this.stuckAppliedRecoveryMs = opts.stuckAppliedRecoveryMs ?? DEFAULT_STUCK_APPLIED_RECOVERY_MS;
       }
       setIO(io) {
         this.io = io;
       }
+      /**
+       * 崩溃自愈水位线：早于此刻仍停在 `applied` 的事件，认为是「进程死在落状态与收尾之间」的残留，
+       * 回收重跑。`stuckAppliedRecoveryMs <= 0` 时返回 undefined（= 关闭自愈，维持旧行为）。
+       */
+      recoverAppliedBefore() {
+        if (this.stuckAppliedRecoveryMs <= 0) return void 0;
+        return new Date(Date.parse(this.clock.now()) - this.stuckAppliedRecoveryMs).toISOString();
+      }
       /** 注册事件监听器——新事件处理完即回调（serve 桥接 SSE 实时推送，替代 oplog.subscribe）。返回退订。 */
       onEvent(fn) {
         this.eventListener = fn;
@@ -15014,7 +15077,7 @@ var init_bus = __esm({
         let lastFullScan = 0;
         while (true) {
           try {
-            const batch = await this.store.transaction((tx) => tx.claimAllPending(this.clock.now()));
+            const batch = await this.store.transaction((tx) => tx.claimAllPending(this.clock.now(), this.recoverAppliedBefore()));
             const touched = /* @__PURE__ */ new Set();
             if (batch.length > 0) {
               for (const record8 of batch) {
@@ -15247,6 +15310,10 @@ var init_bus = __esm({
         };
         let ok = true;
         for (const h of handlers) {
+          const effectKey = `${h.name}#effect`;
+          if (record8.appliedAt && await this.store.transaction((tx) => tx.isHandlerDone(record8.seq, effectKey))) {
+            continue;
+          }
           let lastErr = "";
           for (let attempt = 1; attempt <= this.maxEffectAttempts; attempt++) {
             try {
@@ -15259,6 +15326,8 @@ var init_bus = __esm({
           }
           if (lastErr) {
             ok = false;
+          } else {
+            await this.store.transaction((tx) => tx.markHandlerDone(record8.seq, effectKey));
           }
         }
         await this.store.transaction(async (tx) => {
@@ -15317,7 +15386,7 @@ var init_bus = __esm({
       /* ═══════════════════════ 内部：旧 applyPhase（claim + apply 一体） ═══════════════════════ */
       async applyPhase() {
         return this.store.transaction(async (tx) => {
-          const record8 = await tx.claimNextEvent(this.clock.now());
+          const record8 = await tx.claimNextEvent(this.clock.now(), this.recoverAppliedBefore());
           if (!record8) return null;
           const snapshot = await tx.loadWorkorder(record8.workorderId);
           if (snapshot?.workorder.doneAt) {
@@ -15442,6 +15511,10 @@ function mapWorkStateToRevisionState(w2) {
       if (w2.acceptanceState === "rejected") return "rejected";
       return "proposed";
     // success but not yet judged
+    // ★ ADR 0148：failed 尝试没有对应的 RevisionState（枚举只有 working/proposed/merged/rejected/
+    //   superseded，改枚举会牵动契约与前端，见红线 4）——仍投影成 superseded 保持生命周期语义，但**内容
+    //   如实为 empty**（workToRevision 对无产出 work 给 contentKind="empty"）。读面（CLI 版本列表）据此把
+    //   「superseded + empty」如实标成「未产出」，不再让「这次失败了」被读成「被更好的版本取代」。
     case "failed":
       return "superseded";
     case "retry":
@@ -15711,8 +15784,16 @@ function bridgeLoadReadModel(input) {
     const lw = node.latestWorkId ? workById.get(node.latestWorkId) : void 0;
     if (lw) {
       const st = lw.status ?? (lw.retryAt ? "retry" : lw.deadAt ? "dead" : lw.endedAt ? lw.outcome === "failed" ? "failed" : "success" : "running");
-      art.latestWorkState = st === "retry" ? null : st;
-      art.latestAccepted = node.latestAcceptId === node.latestWorkId;
+      let uiSt;
+      if (st === "retry") uiSt = null;
+      else if (st === "running") uiSt = "running";
+      else if (node.latestSuccessWorkId) uiSt = "success";
+      else uiSt = st;
+      art.latestWorkState = uiSt;
+      art.latestAccepted = node.latestSuccessWorkId !== null && node.latestAcceptId === node.latestSuccessWorkId;
+      if ((st === "failed" || st === "dead") && node.latestSuccessWorkId) {
+        art.currentRev = node.latestSuccessWorkId;
+      }
     } else {
       art.latestWorkState = null;
       art.latestAccepted = false;
@@ -15902,6 +15983,26 @@ var init_bridge_readmodel = __esm({
   }
 });
 
+// ../core/src/propose-guard.ts
+function proposeBlock(head, headArtifactCount) {
+  if (!head) return null;
+  const state = workState(head, hasOutput(head, headArtifactCount));
+  if (state === "dead") {
+    const why = head.rejectedReason ? `\uFF1A${head.rejectedReason}` : "";
+    return {
+      code: "head-dead",
+      detail: `\u8FD9\u4E00\u7248\uFF08${head.id}\uFF09\u5DF2\u88AB\u505C\u6389\uFF08${head.deadAt ?? "?"}${why}\uFF09\u2014\u2014\u4F5C\u5E9F\u7248\u4E4B\u4E0A\u4E0D\u80FD\u518D\u4EA4\u7A3F\u3002\u8981\u7EE7\u7EED\uFF0C\u5148\u91CD\u8DD1\u672C\u8282\u70B9\uFF08\u5728\u63A7\u5236\u53F0\u70B9\u300C\u91CD\u65B0\u8FD0\u884C\u300D\uFF0C\u6216\u8BA9\u7BA1\u7406\u8005\u91CD\u6D3E\uFF09\u62FF\u5230\u4E00\u4E2A\u53EF\u5199\u7684\u65B0\u7248\u672C\uFF0C\u518D propose\u3002`
+    };
+  }
+  return null;
+}
+var init_propose_guard = __esm({
+  "../core/src/propose-guard.ts"() {
+    "use strict";
+    init_src3();
+  }
+});
+
 // ../core/src/preview-intervention.ts
 function resolveOwner(type, typeDef, roleIndex, schemaSize) {
   if (!typeDef) {
@@ -16367,6 +16468,7 @@ var init_kernel_bridge = __esm({
     init_closure_gate();
     init_kernel();
     init_bridge_readmodel();
+    init_propose_guard();
     init_src3();
     init_src3();
     init_preview_intervention();
@@ -16697,8 +16799,14 @@ var init_kernel_bridge = __esm({
           }
         }
         if (!workId) {
-          const deadRev = [...this.model.revisions.values()].filter((r) => r.artifactId === args.artifactId && r.state === "superseded").sort((a, b2) => b2.createdAt.localeCompare(a.createdAt))[0];
-          if (deadRev) return deadRev;
+          const snap = await this.store.transaction((tx) => tx.loadWorkorder(wid));
+          const headId = snap?.nodes.find((n) => n.id === args.artifactId)?.latestWorkId ?? null;
+          if (headId) {
+            const headWork = snap?.works.find((w2) => w2.id === headId);
+            const headOutputs = snap?.artifacts.filter((a) => a.workId === headId).length ?? 0;
+            const block = proposeBlock(headWork, headOutputs);
+            if (block) throw new KernelError(block.detail, block.code);
+          }
           const worksCount = [...this.model.revisions.values()].filter((r) => r.artifactId === args.artifactId).length;
           const revisionId = `wk:${args.artifactId}:${worksCount + 1}`;
           await this.commit({
@@ -16974,7 +17082,8 @@ var init_kernel_bridge = __esm({
         const artifact = this.model.artifacts.get(args.artifactId);
         const currentRev = artifact?.currentRev ? this.model.revisions.get(artifact.currentRev) : void 0;
         const snap = await this.store.transaction((tx) => tx.loadWorkorder(wid));
-        const head = (currentRev && currentRev.state === "proposed" ? currentRev.id : null) ?? concludedHead(this.model, args.artifactId) ?? (snap?.nodes.find((n) => n.id === args.artifactId)?.latestWorkId ?? null);
+        const targetNode = snap?.nodes.find((n) => n.id === args.artifactId);
+        const head = (currentRev && currentRev.state === "proposed" ? currentRev.id : null) ?? concludedHead(this.model, args.artifactId) ?? (targetNode?.latestSuccessWorkId ?? targetNode?.latestWorkId ?? null);
         if (!head) throw new KernelError(`force-conclude \u65E0\u4ECE\u4E0B\u624B\uFF08${args.artifactId}\uFF09\uFF1A\u672C\u8282\u70B9\u8FD8\u6CA1\u6709\u4EFB\u4F55\u4E00\u7248\u4EA7\u51FA`, "no-head");
         const block = snap ? acceptBlock(new WorkorderState(snap), head) : null;
         if (block?.code === "already-accepted") return;
@@ -201490,7 +201599,8 @@ ${res.warning}`);
           r.id === v2.artifact.currentRev ? "\u2190 current head" : "",
           r.id === v2.concludedHead ? "\u2190 \u5DF2\u4EA4\u4ED8" : ""
         ].filter(Boolean).join(" ");
-        println(`  ${r.id}  ${r.state}  by ${r.author}  "${r.reason}"${marks ? `  ${marks}` : ""}`);
+        const stateLabel = r.state === "superseded" && r.contentKind === "empty" ? "\u672A\u4EA7\u51FA" : r.state;
+        println(`  ${r.id}  ${stateLabel}  by ${r.author}  "${r.reason}"${marks ? `  ${marks}` : ""}`);
       }
       const NOTE_ABSTRACT = 150;
       const voteRows = [];
@@ -201779,7 +201889,7 @@ function syncRuntimeAssets(candidateRoots, binDir) {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.103" : "dev";
+var PKG_VERSION = true ? "0.1.104" : "dev";
 var OASIS_DIR = path26.join(os10.homedir(), ".oasis");
 var CONFIG_FILE = path26.join(OASIS_DIR, "node-config.json");
 var PID_FILE = path26.join(OASIS_DIR, "node.pid");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.103",
+  "version": "0.1.104",
   "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": "5450f6cd7525aeb5858fa4682141f85dbf80fd16"
+    "sourceHead": "2b9f5db18e1ad2cf93a2e1c7c49aa47765d228c8"
   }
 }