oasis_test 0.1.117 → 0.1.119

package/dist/index.js

@@ -2866,9 +2866,11 @@ var init_execution_continuity = __esm({
 });
 
 // ../contract/src/automation.ts
+var AUTOMATION_EVENT_NAMES;
 var init_automation = __esm({
   "../contract/src/automation.ts"() {
     "use strict";
+    AUTOMATION_EVENT_NAMES = ["workorder.completed"];
   }
 });
 
@@ -4799,6 +4801,11 @@ function createPolicy(cfg) {
     }
   };
 }
+function policyGetter(source, fallback = CODE_DEFAULT_POLICY) {
+  if (typeof source === "function") return source;
+  if (source) return () => source;
+  return () => fallback;
+}
 var MINUTE, HOUR, DAY, AGENT_WORK_DEADLINE_MS, AGENT_REVIEW_DEADLINE_MS, AGENT_REVIEW_MAX_RETRIES, AGENT_WORK_MAX_RETRIES, RETRY_BASE_MS, RUNTIME_MAX_RETRIES, DEFAULT_IDLE_BY_RUNTIME, DEFAULT_IDLE_MS, DEFAULT_WALL_CLOCK_BY_RUNTIME, DEFAULT_WALL_CLOCK_MS, DEFAULT_HUMAN_CADENCE, CODE_DEFAULT_POLICY;
 var init_policy = __esm({
   "../timeout-policy/src/policy.ts"() {
@@ -7526,7 +7533,11 @@ function tryToRun(state, nodeId, ctx, events) {
     nodeId,
     workId,
     reasons,
-    continuesWorkId: null,
+    // ★ 基线（配套一）：base=上一已验收版（latestAcceptId），parents[0]=最近一个有产出版
+    //（latestProposedWorkId）。两者解耦：中间夹超时/零产出空壳时 base 仍在上一已验收版、parents 跳过空壳。
+    // 不用 latestWorkId——它含空壳，会把基线钉到未验收/无产出的 work 上（isStale 比已验收 head，错）。
+    continuesWorkId: node.latestAcceptId,
+    parentWorkId: node.latestProposedWorkId,
     // 工单 e4a43a42（接续只对短时重试成立）：**已收口过的节点被重新激活 = 返工**（变更请求/驳回/上游
     // 变更把已 accept 的节点重开）→ 起全新会话，别接续那场过时的旧对话；**从未收口的节点** = 首跑或
     // 失败后重试，接续 WIP 是对的。判据 = 有没有 latest_accept。派发层据此决定 resumeSession。
@@ -7565,6 +7576,10 @@ function inputsMatch(state, node, latestWork) {
   const latestInputs = new Set(state.workInputsOf(latestWork.id).map((i) => i.upstreamWorkId));
   return currInputs.size === latestInputs.size && [...currInputs].every((x2) => latestInputs.has(x2));
 }
+function reviewMaxRetriesOf(policy) {
+  const act = policy.resolve({ executor: "agent", scenario: "review" }).timeoutAction;
+  return act.kind === "kill-rebuild" ? act.maxRetries : AGENT_REVIEW_MAX_RETRIES;
+}
 function processReviews(state, nodeId, workId, ctx, events) {
   const policy = ctx.policy ?? CODE_DEFAULT_POLICY;
   const reqs = state.requirementsOf(nodeId);
@@ -7614,7 +7629,7 @@ function processReviews(state, nodeId, workId, ctx, events) {
       }
     } else if (info.status === "failed") {
       const req = reqs.find((r) => r.reviewGroup === g2);
-      const overLimit = countFailedForReviewGroup(g2, reviews) > AGENT_REVIEW_MAX_RETRIES;
+      const overLimit = countFailedForReviewGroup(g2, reviews) > reviewMaxRetriesOf(policy);
       if (overLimit && classify(req.reviewerActorId) === "agent") {
         const lrId = req.latestReviewId;
         if (lrId) events.push({
@@ -7901,6 +7916,9 @@ CREATE TABLE IF NOT EXISTS ${schema}.works (
   outcome_detail    jsonb,
   session_ref       text,
   continues_work_id text,
+  -- \u2605 \u8C31\u7CFB\u4EB2\u672C\uFF08parents[0]\uFF09\uFF1Awork \u5EFA\u65F6\u7684\u300C\u6700\u8FD1\u4E00\u4E2A\u6709\u4EA7\u51FA\u7248\u300D\uFF08node.latest_proposed_work_id\uFF09\u3002
+  --   \u4E0E continues_work_id\uFF08base=\u5DF2\u9A8C\u6536\u7248\uFF09\u89E3\u8026\u2014\u2014\u4E24\u8005\u8BED\u4E49\u4E0D\u540C\u3001\u53D6\u503C\u5E38\u5F02\uFF08\u4E2D\u95F4\u5939\u7A7A\u58F3\u65F6\u5C24\u5176\u5982\u6B64\uFF09\u3002
+  parent_work_id    text,
   -- \u2605 work \u5C5E\u4E8E\u54EA\u6761\u9053\uFF08\u6B63\u5411\u3001\u663E\u5F0F\u4E8B\u5B9E\uFF09\uFF1A'main'=\u8282\u70B9\u4E3B\u94FE\u4EA7\u51FA / 'reply'=\u56DE\u4FE1\u8F6E\u3002\u53D6\u4EE3\u65E7\u7684\u5426\u5B9A\u5F0F\u5224\u636E
   --   "reply_to_issue_id IS NULL"\u3002\u5B58\u91CF\u884C\u6309 reply_to_issue_id \u56DE\u586B\uFF08\u89C1\u4E0B\u65B9\u8FC1\u79FB\u6BB5\uFF09\u3002
   lane              text CHECK (lane IN ('main','reply')),
@@ -8078,6 +8096,10 @@ CREATE TABLE IF NOT EXISTS ${schema}.event_handler_log (
 ALTER TABLE ${schema}.works   ADD COLUMN IF NOT EXISTS retry_at timestamptz;
 ALTER TABLE ${schema}.reviews ADD COLUMN IF NOT EXISTS retry_at timestamptz;
 ALTER TABLE ${schema}.works   ADD COLUMN IF NOT EXISTS status text;
+ALTER TABLE ${schema}.works   ADD COLUMN IF NOT EXISTS parent_work_id text;
+-- \u5B58\u91CF\u56DE\u586B\uFF1Aparent_work_id \u7F3A\u7701\u6CBF\u7528 continues_work_id\uFF08\u65E7\u6865 parents=[continues_work_id] \u7684\u65E2\u6709\u8C31\u7CFB\uFF09\uFF0C
+-- \u65B0 work \u624D\u5199\u300C\u6700\u8FD1\u6709\u4EA7\u51FA\u7248\u300D\uFF08latest_proposed_work_id\uFF09\u5B9E\u73B0 base/parents \u89E3\u8026\u3002
+UPDATE ${schema}.works SET parent_work_id = continues_work_id WHERE parent_work_id IS NULL;
 ALTER TABLE ${schema}.works   ADD COLUMN IF NOT EXISTS agent_handoff_attempt_id text;
 ALTER TABLE ${schema}.works   ADD COLUMN IF NOT EXISTS business_handoff_status text;
 ALTER TABLE ${schema}.works   ADD COLUMN IF NOT EXISTS business_handoff_recorded_at timestamptz;
@@ -9427,7 +9449,7 @@ var require_utils2 = __commonJS({
     var nodeCrypto = require("crypto");
     module2.exports = {
       postgresMd5PasswordHash,
-      randomBytes: randomBytes7,
+      randomBytes: randomBytes8,
       deriveKey,
       sha256,
       hashByName,
@@ -9437,7 +9459,7 @@ var require_utils2 = __commonJS({
     var webCrypto = nodeCrypto.webcrypto || globalThis.crypto;
     var subtleCrypto = webCrypto.subtle;
     var textEncoder = new TextEncoder();
-    function randomBytes7(length) {
+    function randomBytes8(length) {
       return webCrypto.getRandomValues(Buffer.alloc(length));
     }
     async function md5(string5) {
@@ -13569,6 +13591,7 @@ var init_store_postgres = __esm({
             outcomeDetail: w2.outcome_detail,
             sessionRef: w2.session_ref,
             continuesWorkId: w2.continues_work_id,
+            parentWorkId: w2.parent_work_id,
             // ★ lane 兜底（存量行迁移前 / 迁移与回填之间的竞态窗）：无值时按 reply_to_issue_id 派生，
             //   保证 TS 侧 `Work.lane` 恒非空。reply_to_issue_id 在读写映射层可直接读（护栏白名单）。
             lane: w2.lane ?? (w2.reply_to_issue_id == null ? "main" : "reply"),
@@ -13784,10 +13807,10 @@ var init_store_postgres = __esm({
               await this.c.query(
                 `INSERT INTO ${this.s}.works
              (id,workorder_id,node_id,assignee_actor_id,created_at,started_at,ended_at,dead_at,cancelled_at,retry_at,status,outcome,
-              outcome_detail,session_ref,continues_work_id,reply_to_issue_id,output_version_no,
+              outcome_detail,session_ref,continues_work_id,parent_work_id,reply_to_issue_id,output_version_no,
               node_version,conclusion,proposal_reason,last_activity_at,frozen_issue_ids,agent_handoff_attempt_id,business_handoff_status,business_handoff_recorded_at,
               acceptance_state,accepted_at,accepted_by,rejected_reason,override_by,override_reason,lane)
-             VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23,$24,$25,$26,$27,$28,$29,$30,$31,$32)
+             VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23,$24,$25,$26,$27,$28,$29,$30,$31,$32,$33)
              ON CONFLICT (id) DO NOTHING`,
                 [
                   w2.id,
@@ -13805,6 +13828,7 @@ var init_store_postgres = __esm({
                   w2.outcomeDetail ? JSON.stringify(w2.outcomeDetail) : null,
                   w2.sessionRef,
                   w2.continuesWorkId,
+                  w2.parentWorkId,
                   w2.replyToIssueId ?? null,
                   w2.outputVersionNo,
                   w2.nodeVersion,
@@ -14596,6 +14620,7 @@ var init_work = __esm({
             outcomeDetail: null,
             sessionRef: null,
             continuesWorkId: e.continuesWorkId,
+            parentWorkId: e.parentWorkId ?? null,
             replyToIssueId: e.replyToIssueId,
             outputVersionNo: null,
             conclusion: null,
@@ -14634,6 +14659,7 @@ var init_work = __esm({
           outcomeDetail: null,
           sessionRef: null,
           continuesWorkId: e.continuesWorkId,
+          parentWorkId: e.parentWorkId ?? null,
           outputVersionNo: null,
           conclusion: null,
           frozenIssueIds: frozen.length > 0 ? frozen : null,
@@ -15410,7 +15436,8 @@ var init_bus = __esm({
       io;
       clock;
       config;
-      policy;
+      /** 取当前策略（不是策略本身）——见 {@link EngineBusOptions.policy} 的热载不变量。 */
+      policyOf;
       registry;
       maxEffectAttempts;
       stuckAppliedRecoveryMs;
@@ -15422,7 +15449,7 @@ var init_bus = __esm({
         this.io = opts.io ?? NOOP_IO;
         this.clock = opts.clock ?? SYSTEM_CLOCK;
         this.config = opts.config ?? DEFAULT_CONFIG;
-        this.policy = opts.policy ?? CODE_DEFAULT_POLICY;
+        this.policyOf = policyGetter(opts.policy);
         this.registry = new HandlerRegistry(opts.handlers);
         this.maxEffectAttempts = opts.maxEffectAttempts ?? 3;
         this.stuckAppliedRecoveryMs = opts.stuckAppliedRecoveryMs ?? DEFAULT_STUCK_APPLIED_RECOVERY_MS;
@@ -15811,7 +15838,7 @@ var init_bus = __esm({
           if (!snapshot) return { emitted: 0, terminated: false };
           if (snapshot.workorder.lifecycle !== "active") return { emitted: 0, terminated: false };
           const state = new WorkorderState(snapshot);
-          const scanCtx = { at: this.clock.now(), actorId: SYSTEM_ACTOR2, config: this.config, policy: this.policy };
+          const scanCtx = { at: this.clock.now(), actorId: SYSTEM_ACTOR2, config: this.config, policy: this.policyOf() };
           const { events, terminated } = scan(state, scanCtx);
           await tx.applyMutations(workorderId, state.mutations);
           const allEvents = [...state.emitted, ...events];
@@ -15958,8 +15985,9 @@ function mapWorkStateToRevisionState(w2, artifactCount) {
     case "success":
       if (w2.acceptanceState === "accepted") return "merged";
       if (w2.acceptanceState === "rejected") return "rejected";
+      if (w2.conclusion == null) return "working";
       return "proposed";
-    // success but not yet judged
+    // 已 conclude、未裁决
     // ★ ADR 0148：failed 尝试没有对应的 RevisionState（枚举只有 working/proposed/merged/rejected/
     //   superseded，改枚举会牵动契约与前端，见红线 4）——仍投影成 superseded 保持生命周期语义，但**内容
     //   如实为 empty**（workToRevision 对无产出 work 给 contentKind="empty"）。读面（CLI 版本列表）据此把
@@ -16037,7 +16065,9 @@ function workToRevision(w2, workInputs, artifactFiles) {
     id: w2.id,
     artifactId: w2.nodeId,
     base: w2.continuesWorkId,
-    parents: w2.continuesWorkId ? [w2.continuesWorkId] : [],
+    // ★ 配套一：base 与 parents 解耦——base=上一已验收版（continuesWorkId），parents[0]=最近一个有产出版
+    //（parentWorkId）。两者可不同：中间夹超时/零产出空壳时 base 不动、parents 跳过空壳指向上一个有产出。
+    parents: w2.parentWorkId ? [w2.parentWorkId] : [],
     contentRef,
     contentKind,
     basedOn: Object.keys(basedOn).length > 0 ? basedOn : void 0,
@@ -16256,6 +16286,16 @@ function bridgeLoadReadModel(input) {
   for (const w2 of allWorks) {
     revisions.set(w2.id, workToRevision(w2, allWorkInputs, artifactFiles));
   }
+  for (const r of revisions.values()) {
+    if (r.state !== "proposed") continue;
+    for (const parentId of r.parents) {
+      const parent = revisions.get(parentId);
+      if (parent && parent.state === "proposed" && (parent.part ?? void 0) === (r.part ?? void 0)) {
+        parent.state = "superseded";
+        parent.supersededBy = r.id;
+      }
+    }
+  }
   const recipientsByIssue = /* @__PURE__ */ new Map();
   for (const r of allIssueRecipients) {
     const list = recipientsByIssue.get(r.issueId) ?? [];
@@ -17304,10 +17344,12 @@ var init_kernel_bridge = __esm({
               nodeId: args.artifactId,
               workId: revisionId,
               reasons: [{ kind: "initial" }],
-              // ★ base 三态：undefined=缺省续写（基当前 head，旧引擎 propose 即基上版——否则新版 base=∅、
-              // 相对当前 head 恒 stale → advanceQueue 永不落地，annotation-resolve routing 实测）；null=并发
+              // ★ base 三态：undefined=缺省续写（基「上一已验收版」node.latestAcceptId——isStale 比 concludedHead，
+              // 只有 latestAcceptId 对；旧口径 artifact.currentRev=latestWorkId 可能是一条未验收/空壳 work）；null=并发
               // 作者显式声明 base=∅（autoland stale 兜底：不落、留队）；具体 revisionId=钉旧版。
-              continuesWorkId: args.base !== void 0 ? args.base : artifact?.currentRev ?? null
+              // ★ parents[0]=「最近一个有产出版」node.latestProposedWorkId（跳过超时/零产出空壳），与 base 解耦。
+              continuesWorkId: args.base !== void 0 ? args.base : nodeRow?.latestAcceptId ?? null,
+              parentWorkId: nodeRow?.latestProposedWorkId ?? null
             }
           });
           workId = revisionId;
@@ -40107,7 +40149,7 @@ var require_websocket = __commonJS({
     var http2 = require("http");
     var net = require("net");
     var tls = require("tls");
-    var { randomBytes: randomBytes7, createHash: createHash19 } = require("crypto");
+    var { randomBytes: randomBytes8, createHash: createHash21 } = require("crypto");
     var { Duplex, Readable } = require("stream");
     var { URL: URL2 } = require("url");
     var PerMessageDeflate2 = require_permessage_deflate();
@@ -40645,7 +40687,7 @@ var require_websocket = __commonJS({
         }
       }
       const defaultPort = isSecure ? 443 : 80;
-      const key = randomBytes7(16).toString("base64");
+      const key = randomBytes8(16).toString("base64");
       const request2 = isSecure ? https.request : http2.request;
       const protocolSet = /* @__PURE__ */ new Set();
       let perMessageDeflate;
@@ -40775,7 +40817,7 @@ var require_websocket = __commonJS({
           abortHandshake(websocket, socket, "Invalid Upgrade header");
           return;
         }
-        const digest = createHash19("sha1").update(key + GUID).digest("base64");
+        const digest = createHash21("sha1").update(key + GUID).digest("base64");
         if (res.headers["sec-websocket-accept"] !== digest) {
           abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
           return;
@@ -41144,7 +41186,7 @@ var require_websocket_server = __commonJS({
     var EventEmitter = require("events");
     var http2 = require("http");
     var { Duplex } = require("stream");
-    var { createHash: createHash19 } = require("crypto");
+    var { createHash: createHash21 } = require("crypto");
     var extension2 = require_extension();
     var PerMessageDeflate2 = require_permessage_deflate();
     var subprotocol2 = require_subprotocol();
@@ -41451,7 +41493,7 @@ var require_websocket_server = __commonJS({
           );
         }
         if (this._state > RUNNING) return abortHandshake(socket, 503);
-        const digest = createHash19("sha1").update(key + GUID).digest("base64");
+        const digest = createHash21("sha1").update(key + GUID).digest("base64");
         const headers = [
           "HTTP/1.1 101 Switching Protocols",
           "Upgrade: websocket",
@@ -128706,13 +128748,13 @@ ${block}
               throw err;
             }
             const delay = base * Math.pow(3, attempt - 1);
-            yield sleep4(delay);
+            yield sleep5(delay);
           }
         }
         throw lastErr;
       });
     }
-    function sleep4(ms) {
+    function sleep5(ms) {
       return new Promise((r) => setTimeout(r, ms));
     }
     var DEFAULT_CHUNK_LIMIT = 3500;
@@ -158018,6 +158060,40 @@ var init_resume_classify = __esm({
   }
 });
 
+// ../adapters/src/_core/root-bypass.ts
+function decideRootBypass(sources) {
+  if (sources.uid !== 0) return { inject: false, reason: "not-root" };
+  if (sources.env["IS_SANDBOX"] === "1") return { inject: false, reason: "already-sandboxed" };
+  if (sources.env["CLAUDE_CODE_BUBBLEWRAP"]) return { inject: false, reason: "bubblewrap" };
+  const sw = (sources.env["OASIS_ALLOW_ROOT_BYPASS"] ?? "").trim().toLowerCase();
+  if (OFF_VALUES.has(sw)) return { inject: false, reason: "disabled" };
+  return { inject: true, reason: "root-needs-sandbox-flag" };
+}
+function rootBypassEnv(runtime, sources = { uid: process.getuid?.(), env: process.env }) {
+  const d = decideRootBypass(sources);
+  if (d.inject || d.reason === "disabled") {
+    const key = `${runtime}:${d.reason}`;
+    if (!loggedOnce.has(key)) {
+      loggedOnce.add(key);
+      console.warn(`[adapter:${runtime}] ` + JSON.stringify({
+        event: "root-bypass",
+        injected: d.inject,
+        reason: d.reason,
+        note: d.inject ? "\u4EE5 root \u8FD0\u884C\uFF1A\u6CE8\u5165 IS_SANDBOX=1 \u653E\u884C bypassPermissions\uFF08\u5173\u95ED\uFF1AOASIS_ALLOW_ROOT_BYPASS=off\uFF09" : "\u4EE5 root \u8FD0\u884C\u4E14 OASIS_ALLOW_ROOT_BYPASS=off\uFF1ACLI \u5C06\u62D2\u7EDD bypassPermissions\uFF0C\u4F1A\u8BDD\u4F1A\u7ACB\u5373\u9000\u51FA"
+      }));
+    }
+  }
+  return d.inject ? { IS_SANDBOX: "1" } : {};
+}
+var OFF_VALUES, loggedOnce;
+var init_root_bypass = __esm({
+  "../adapters/src/_core/root-bypass.ts"() {
+    "use strict";
+    OFF_VALUES = /* @__PURE__ */ new Set(["off", "0", "false", "no"]);
+    loggedOnce = /* @__PURE__ */ new Set();
+  }
+});
+
 // ../adapters/src/_core/transcript.ts
 function openTranscript(file) {
   const out = fs8.createWriteStream(file);
@@ -158268,6 +158344,7 @@ var init_claude_code = __esm({
     init_materialize_bundle();
     init_container_runtime();
     init_resume_classify();
+    init_root_bypass();
     init_session_paths();
     init_transcript();
     init_filter_extra_args();
@@ -158427,7 +158504,11 @@ var init_claude_code = __esm({
             OASIS_SERVER: job.server.url,
             OASIS_TOKEN: job.actorToken,
             // OTel 遥测（默认关；resolveOtelEnv 决定开不开，runId 进 resource 属性自然归位到本次 run）。
-            ...otelEnv
+            ...otelEnv,
+            // root 下放行 bypassPermissions（见 _core/root-bypass.ts：claude 的闸认 IS_SANDBOX=1）。
+            // 铺在最后＝系统强制层（同 OASIS_SERVER/TOKEN）：员工 env 或工单 executionEnv 里的陈旧值
+            // 不得把它顶掉。非 root / 宿主已给 / 显式关闭时是空对象，行为逐字节不变。
+            ...rootBypassEnv("claude-code")
           },
           stdio: ["pipe", "pipe", "pipe"]
         });
@@ -161493,14 +161574,17 @@ async function materialize(job, cfg) {
   const task = materializeBundle(dir, job.bundle);
   return { id, dir, task };
 }
-function buildEnv(job, extra) {
+function buildEnv(job, cfg) {
   return {
     ...scrubLeakyEnv(process.env),
-    ...extra,
+    ...cfg.env,
     ...job.env,
     ...job.wrapperPaths?.length ? { PATH: `${job.wrapperPaths.map((p2) => path12.dirname(p2)).join(path12.delimiter)}${path12.delimiter}${job.env?.["PATH"] ?? process.env["PATH"] ?? ""}` } : {},
     OASIS_SERVER: job.server.url,
-    OASIS_TOKEN: job.actorToken
+    OASIS_TOKEN: job.actorToken,
+    // root 下放行 bypassPermissions（仅 claude 家族 runtime 声明；见 _core/root-bypass.ts）。
+    // 与 OASIS_SERVER/TOKEN 同属系统强制层：员工 env 顶不掉。
+    ...cfg.rootBypassRuntime ? rootBypassEnv(cfg.rootBypassRuntime) : {}
   };
 }
 function makeFinish(id, cfg, transcriptRefPtr, transcriptOut, dir, workdirKey, runtimeSessionId, exitCbs) {
@@ -161559,7 +161643,7 @@ async function runStreamJson(job, cfg) {
     stdio: ["ignore", "pipe", "pipe"]
   }) : (0, import_node_child_process11.spawn)(cfg.bin, args, {
     cwd: dir,
-    env: buildEnv(job, cfg.env),
+    env: buildEnv(job, cfg),
     stdio: ["ignore", "pipe", "pipe"]
   });
   if (child.pid !== void 0 && job.workdirKey) lockWorkdir(dir, child.pid, "session", job.workdirKey);
@@ -161659,7 +161743,7 @@ async function runOneShotText(job, cfg) {
     stdio: ["ignore", "pipe", "pipe"]
   }) : (0, import_node_child_process11.spawn)(cfg.bin, args, {
     cwd: dir,
-    env: buildEnv(job, cfg.env),
+    env: buildEnv(job, cfg),
     stdio: ["ignore", "pipe", "pipe"]
   });
   if (child.pid !== void 0 && job.workdirKey) lockWorkdir(dir, child.pid, "session", job.workdirKey);
@@ -161743,6 +161827,7 @@ var init_subprocess = __esm({
     init_session_paths();
     init_transcript();
     init_filter_extra_args();
+    init_root_bypass();
   }
 });
 
@@ -161859,7 +161944,10 @@ var init_codebuddy = __esm({
           workRoot: opts.workRoot,
           cleanupWorkdir: opts.cleanupWorkdir,
           env: opts.env,
-          extraArgs: opts.extraArgs
+          extraArgs: opts.extraArgs,
+          // CodeBuddy 是 Claude Code 分叉，走同一个 bypassPermissions flag，root 下大概率撞同一条闸
+          // （claude 侧已实测）。声明后由 _core/root-bypass.ts 在 root 下注入 IS_SANDBOX=1。
+          rootBypassRuntime: "codebuddy"
         });
       }
     };
@@ -168058,6 +168146,10 @@ var init_memory_automation_store = __esm({
             hasSigningSecret: false
           };
         }
+        if (input.kind === "event" && input.event) {
+          t.enabled = false;
+          t.event = { source: "project", projectId: input.event.projectId, events: [...input.event.events], baselineState: "aligning" };
+        }
         return t;
       }
       async replaceTriggers(automationId, triggers) {
@@ -168085,6 +168177,7 @@ var init_memory_automation_store = __esm({
         if (t.webhook && patch.webhook && "eventFilters" in patch.webhook) {
           t.webhook.eventFilters = patch.webhook.eventFilters ?? null;
         }
+        if (t.event && patch.event?.events) t.event.events = [...patch.event.events];
         return structuredClone(t);
       }
       async deleteTrigger(triggerId) {
@@ -168113,6 +168206,33 @@ var init_memory_automation_store = __esm({
           if (t) t.publishedBy = publishedBy;
         }
       }
+      /* ---------- event 触发器（ADR 0163） ---------- */
+      async listEventTriggers() {
+        const out = [];
+        for (const t of this.triggers.values()) {
+          if (t.kind !== "event") continue;
+          const a = this.automations.get(t.automationId);
+          if (!a || !a.enabled || a.archivedAt) continue;
+          out.push(structuredClone(t));
+        }
+        return out.sort((x2, y) => x2.id < y.id ? -1 : x2.id > y.id ? 1 : 0);
+      }
+      async completeEventBaseline(triggerId, _at) {
+        const t = this.triggers.get(triggerId);
+        if (!t?.event) return;
+        t.event.baselineState = "ready";
+        t.enabled = true;
+      }
+      async resetEventBaseline(triggerId) {
+        const t = this.triggers.get(triggerId);
+        if (!t?.event) return;
+        t.event.baselineState = "aligning";
+        t.enabled = false;
+      }
+      async findRunBySpawnedWorkspace(workspace) {
+        const hits = [...this.runs.values()].filter((r) => r.spawnedWorkspaceId === workspace).sort((a, b2) => a.triggeredAt < b2.triggeredAt ? -1 : a.triggeredAt > b2.triggeredAt ? 1 : a.id < b2.id ? -1 : 1);
+        return hits[0] ? structuredClone(hits[0]) : null;
+      }
       /* ---------- runs ---------- */
       async createRun(run) {
         if (run.triggerId && run.plannedAt) {
@@ -173812,7 +173932,9 @@ async function openNewEngine(opts) {
   const bus = new EngineBus({
     store,
     io: NOOP_IO,
-    clock: SYSTEM_CLOCK
+    clock: SYSTEM_CLOCK,
+    // 原样交给 bus（bus 内部归一成取值函数）——这里绝不能 call 一次存下来，那就把热载掐死了。
+    policy: opts.policy
   });
   const kernel = await EngineKernel.open(store, bus, {
     schema: opts.schemaDefs ?? [],
@@ -183313,7 +183435,11 @@ var init_readonly_bundle = __esm({
 function makeSeededWorkorderCreator(deps) {
   const genWorkspace = deps.genWorkspace ?? (() => `ws:wo-${(0, import_node_crypto33.randomUUID)().slice(0, 8)}`);
   return async (input) => {
-    const workspace = genWorkspace();
+    const workspace = input.idempotencyKey ? workspaceForKey(input.idempotencyKey) : genWorkspace();
+    if (input.idempotencyKey) {
+      const existing = existingWorkorder(deps.kernel, workspace);
+      if (existing) return existing;
+    }
     if (deps.artifactState && (input.projectId || deps.createProject)) {
       await ensureWorkorderProject({
         workOrderId: workspace,
@@ -183392,6 +183518,20 @@ function makeSeededWorkorderCreator(deps) {
     return { workspace, rootArtifactId: briefId, spawned: planned.spawned };
   };
 }
+function workspaceForKey(key) {
+  return `ws:wo-${(0, import_node_crypto33.createHash)("sha256").update(key).digest("hex").slice(0, 8)}`;
+}
+function existingWorkorder(kernel, workspace) {
+  const arts = [...kernel.model.artifacts.values()].filter((a) => a.workspace === workspace);
+  if (arts.length === 0) return null;
+  const seed = arts.find((a) => a.inputs.length === 0) ?? arts[0];
+  return {
+    workspace,
+    rootArtifactId: seed.id,
+    // role 取自 planner 的规划结果、不是 artifact 上的字段——重试路径拿不到也无所谓（可省）。
+    spawned: arts.map((a) => ({ id: a.id, type: a.type, owner: a.owner }))
+  };
+}
 var import_node_crypto33, enc2;
 var init_create_seeded_workorder = __esm({
   "../server/src/domains/collab/create-seeded-workorder.ts"() {
@@ -186076,6 +186216,7 @@ function automationSubstantiveChange(before, after) {
 }
 function triggerSubstantiveChange(before, after) {
   if (before.enabled !== after.enabled) return true;
+  if (!jsonEq(before.event?.events ?? null, after.event?.events ?? null)) return true;
   if ((before.schedule?.cron ?? null) !== (after.schedule?.cron ?? null)) return true;
   if ((before.schedule?.tz ?? null) !== (after.schedule?.tz ?? null)) return true;
   const filtersOf = (t) => t.webhook?.eventFilters ?? null;
@@ -186927,6 +187068,17 @@ function renderDate(at, tz) {
     return at.toISOString().slice(0, 10);
   }
 }
+function eventCommandKey(runId) {
+  return `automation-event:${runId}`;
+}
+function eventDispatchState(run) {
+  const r = run.result;
+  if (r && typeof r === "object" && !Array.isArray(r)) {
+    const d = r["eventDispatch"];
+    if (d && typeof d === "object" && !Array.isArray(d)) return d;
+  }
+  return {};
+}
 function clipReply(reply) {
   const t = reply.trim();
   return t.length > CHAT_REPLY_MAX ? `${t.slice(0, CHAT_REPLY_MAX)}
@@ -186958,7 +187110,7 @@ function appendSourceNote(brief, automation, source, atIso) {
 ---
 \u672C\u5DE5\u5355\u7531\u81EA\u52A8\u5316\u300C${automation.name}\u300D\u4E8E ${atIso} \u89E6\u53D1\uFF08\u6765\u6E90\uFF1A${source}\uFF09\u3002\u5F00\u5DE5\u540E\u8BF7\u628A\u5DE5\u5355\u6807\u9898\u6539\u6210\u51C6\u786E\u53CD\u6620\u5B9E\u9645\u5DE5\u4F5C\u7684\u63CF\u8FF0\u3002`;
 }
-var import_node_crypto36, DATE_TOKEN, AutomationsService, CHAT_REPLY_MAX;
+var import_node_crypto36, DATE_TOKEN, AutomationsService, EVENT_RETRY_BASE_MS, EVENT_RETRY_MAX_MS, EVENT_RETRY_MAX_ATTEMPTS, eventAttempts, eventLastAttemptAt, eventLastError, CHAT_REPLY_MAX;
 var init_service8 = __esm({
   "../server/src/domains/automations/service.ts"() {
     "use strict";
@@ -187051,7 +187203,7 @@ var init_service8 = __esm({
         await seedScheduleNextRuns(this.store, [await this.store.getTrigger(t.id) ?? t].filter(Boolean), this.now());
         return await this.store.getTrigger(t.id);
       }
-      /** 单条触发器 PATCH。归因：比较持久化前后行，实质变更（enabled/cron/tz/eventFilters）只转移**该行**。 */
+      /** 单条触发器 PATCH。归因：比较持久化前后行，实质变更（enabled/cron/tz/eventFilters/events）只转移**该行**。 */
       async updateTrigger(triggerId, patch, editor) {
         const before = await this.store.getTrigger(triggerId);
         if (!before) throw new Error(`trigger not found: ${triggerId}`);
@@ -187062,6 +187214,9 @@ var init_service8 = __esm({
         if (after.kind === "schedule") {
           await seedScheduleNextRuns(this.store, [after], this.now());
         }
+        if (after.kind === "event" && patch.enabled === true && !before.enabled) {
+          await this.store.resetEventBaseline(triggerId);
+        }
         return await this.store.getTrigger(triggerId);
       }
       async deleteTrigger(triggerId, editor) {
@@ -187141,7 +187296,17 @@ var init_service8 = __esm({
         };
         const { run, created } = await this.store.createRun(base);
         if (!created) return run;
-        const skip = await this.admissionSkip(automation);
+        return this.dispatchRun(automation, trigger, run, source, opts);
+      }
+      /**
+       * 对一条**已占位的 pending run** 做准入 + 派发。
+       *
+       * 与 `fire()` 拆开是因为 event 触发必须「先原子占位、再决定派不派」（ADR 0163 §4.2 第 4/5 步）：
+       * 占位赢家才做权限/自环准入，输的那个直接停手。reconciler 重试也复用这里——同一 runId、
+       * 同一下游命令键，取回同一副作用。
+       */
+      async dispatchRun(automation, trigger, run, source, opts = {}) {
+        const skip = await this.admissionSkip(automation, source);
         if (skip) return this.settleSkip(run, skip.reasonCode, skip.error);
         if (automation.executionMode === "chat") {
           return this.fireChat(automation, trigger, run, opts);
@@ -187161,6 +187326,14 @@ var init_service8 = __esm({
           return settled ?? run;
         } catch (e) {
           const msg = e instanceof Error ? e.message : String(e);
+          if (source === "event") {
+            await this.store.settleRun(run.id, {
+              status: "pending",
+              result: { eventDispatch: { attempts: eventAttempts(run) + 1, lastAttemptAt: this.now().toISOString(), lastError: msg } },
+              completedAt: null
+            });
+            return await this.store.getRun(run.id);
+          }
           await this.store.settleRun(run.id, {
             status: "failed",
             error: msg,
@@ -187194,12 +187367,93 @@ var init_service8 = __esm({
         });
         return run;
       }
-      async admissionSkip(automation) {
+      /* ---------- 订阅触发（event，ADR 0163） ---------- */
+      /**
+       * 能力位：这条自动化现在能不能用订阅触发。**唯一真值在这里**——详情响应把它原样带给前端，
+       * 前端只消费不推断（否则前后端两套规则必漂移）。
+       */
+      eventTriggerCapability(automation) {
+        if (automation.executionMode === "chat" && !this.deps.chatSupportsIdempotency) {
+          return { supported: false, reason: "chat_no_idempotency" };
+        }
+        return { supported: true };
+      }
+      /**
+       * 事件消费键占位：用同一把键原子落一条 run。
+       * 唯一约束 `(automation_id, idempotency_key)` 负责多实例竞争——`created=false` 的那个实例停手。
+       */
+      claimEventRun(automation, trigger, key, envelope, status = "pending", reasonCode = null, error2 = null) {
+        const nowIso = this.now().toISOString();
+        return this.store.createRun({
+          id: this.genId("arun"),
+          automationId: automation.id,
+          triggerId: trigger.id,
+          source: "event",
+          status,
+          spawnedWorkspaceId: null,
+          spawnedArtifactId: null,
+          plannedAt: null,
+          deliveryId: null,
+          idempotencyKey: key,
+          ruleVersionId: null,
+          payload: envelope,
+          result: null,
+          error: error2,
+          reasonCode,
+          triggeredAt: nowIso,
+          completedAt: status === "skipped" ? nowIso : null
+        });
+      }
+      /** 把一条占位成功的 event run 派出去（准入 → 建单/开会话），命令键固定为 automation-event:<runId>。 */
+      dispatchEventRun(automation, trigger, run) {
+        return this.dispatchRun(automation, trigger, run, "event", {
+          ...run.payload != null ? { envelope: run.payload } : {},
+          commandKey: eventCommandKey(run.id)
+        });
+      }
+      /** 已占位但被准入拒绝：落 skipped + reasonCode（**留痕**，不是静默丢弃）。 */
+      skipEventRun(run, reasonCode, error2) {
+        return this.settleSkip(run, reasonCode, error2);
+      }
+      /**
+       * event pending 的可恢复派发（ADR 0163 §4.4）。
+       *
+       * **不走**「pending 超时即 failed」那条分支：那条规则会把「占位了但还没产生副作用」的 run 直接
+       * 判死，等于永久漏一次触发。这里按稳定 runId 重试同一下游命令键，有界退避；
+       * 达到重试上限的基础设施错误才落 failed 并告警（该 run 仍占着事件键，不自动制造第二次业务执行）。
+       */
+      async reconcileEventRun(run) {
+        const attempts = eventAttempts(run);
+        const nowMs = this.now().getTime();
+        const lastAt = eventLastAttemptAt(run) ?? Date.parse(run.triggeredAt);
+        if (attempts >= EVENT_RETRY_MAX_ATTEMPTS) {
+          await this.store.settleRun(run.id, {
+            status: "failed",
+            error: `\u8BA2\u9605\u89E6\u53D1\u6D3E\u53D1\u91CD\u8BD5 ${attempts} \u6B21\u4ECD\u5931\u8D25\uFF1A${eventLastError(run) ?? "\u672A\u77E5\u9519\u8BEF"}`,
+            reasonCode: "spawn_failed",
+            completedAt: this.now().toISOString()
+          });
+          this.log?.(`[automations] \u26A0 \u8BA2\u9605\u89E6\u53D1 run ${run.id} \u8FBE\u91CD\u8BD5\u4E0A\u9650\u5DF2\u843D failed\u2014\u2014\u8BE5 run \u4ECD\u5360\u7740\u4E8B\u4EF6\u952E\uFF0C\u4EBA\u5DE5\u6062\u590D\u5FC5\u987B\u91CD\u8BD5\u540C\u4E00 runId`);
+          return;
+        }
+        const backoffMs = attempts === 0 ? 0 : Math.min(EVENT_RETRY_BASE_MS * 2 ** (attempts - 1), EVENT_RETRY_MAX_MS);
+        if (nowMs - lastAt < backoffMs) return;
+        const automation = await this.store.getAutomation(run.automationId);
+        if (!automation) return;
+        const trigger = run.triggerId ? await this.store.getTrigger(run.triggerId) : null;
+        await this.dispatchEventRun(automation, trigger, run).catch((e) => {
+          this.log?.(`[automations] \u8BA2\u9605\u89E6\u53D1\u91CD\u8BD5\u5F02\u5E38 ${run.id}\uFF1A${String(e)}`);
+        });
+      }
+      async admissionSkip(automation, source = "manual") {
         if (automation.archivedAt) return { reasonCode: "automation_archived", error: "\u81EA\u52A8\u5316\u5DF2\u5F52\u6863" };
         if (!automation.enabled) return { reasonCode: "automation_paused", error: "\u81EA\u52A8\u5316\u5DF2\u6682\u505C" };
         if (automation.executionMode === "chat") {
           if (!automation.agentId) return { reasonCode: "config_error", error: "chat \u6A21\u5F0F\u7F3A\u5C11\u6267\u884C\u4EBA\uFF08agentId\uFF09" };
           if (!this.deps.runChat) return { reasonCode: "config_error", error: "\u672C\u5B9E\u4F8B\u672A\u63A5 chat \u6267\u884C" };
+          if (source === "event" && !this.deps.chatSupportsIdempotency) {
+            return { reasonCode: "config_error", error: "\u5BF9\u8BDD\u6267\u884C\u6682\u4E0D\u652F\u6301\u8BA2\u9605\u89E6\u53D1\uFF08chat \u9002\u914D\u5668\u7F3A\u6301\u4E45\u5E42\u7B49\u952E\uFF09" };
+          }
           if (this.deps.agentReady) {
             const ready = await this.deps.agentReady(automation.agentId);
             if (!ready.ok) return { reasonCode: ready.reason, error: ready.error };
@@ -187319,7 +187573,9 @@ var init_service8 = __esm({
           ...human ? { humanActorId: human } : {},
           ...tagId ? { tags: [tagId] } : {},
           // 成本安全（ADR 0010）：dispatch=false（默认）→ 建单即设 dispatch-hold，待人放行。
-          ...automation.dispatch ? {} : { dispatch: false }
+          ...automation.dispatch ? {} : { dispatch: false },
+          // 稳定下游键（ADR 0163 §4.4）：重试落在同一张工单上，占位后崩溃不会建出第二张。
+          ...opts.commandKey ? { idempotencyKey: opts.commandKey } : {}
         });
         return { workspace: result.workspace, rootArtifactId: result.rootArtifactId };
       }
@@ -187362,6 +187618,10 @@ var init_service8 = __esm({
               continue;
             }
             if (run.status === "pending") {
+              if (run.source === "event") {
+                await this.reconcileEventRun(run);
+                continue;
+              }
               if (nowMs - Date.parse(run.triggeredAt) > 10 * 60 * 1e3) {
                 await this.store.settleRun(run.id, {
                   status: "failed",
@@ -187438,6 +187698,15 @@ var init_service8 = __esm({
         }
       }
     };
+    EVENT_RETRY_BASE_MS = 3e4;
+    EVENT_RETRY_MAX_MS = 10 * 6e4;
+    EVENT_RETRY_MAX_ATTEMPTS = 5;
+    eventAttempts = (run) => eventDispatchState(run).attempts ?? 0;
+    eventLastAttemptAt = (run) => {
+      const at = eventDispatchState(run).lastAttemptAt;
+      return at ? Date.parse(at) : null;
+    };
+    eventLastError = (run) => eventDispatchState(run).lastError ?? null;
     CHAT_REPLY_MAX = 2e4;
   }
 });
@@ -187821,7 +188090,8 @@ function buildAutomationSummary(automation, triggers, recent, canWrite) {
     lastRun,
     nextRunAt,
     recent: ordered.slice(0, RECENT_LIMIT).map(stripRunPayload),
-    canWrite
+    canWrite,
+    capabilities: { eventTrigger: { supported: true } }
   };
 }
 function deriveNextRunAt(triggers) {
@@ -187867,10 +188137,12 @@ function validateTriggers(raw) {
         label: t.label ?? null,
         webhook: { provider, ...eventFilters !== void 0 ? { eventFilters } : {} }
       });
+    } else if (t?.kind === "event") {
+      out.push({ kind: "event", enabled: t.enabled ?? true, label: t.label ?? null, event: validateEventConfig(t.event) });
     } else if (t?.kind === "manual") {
       out.push({ kind: "manual", enabled: t.enabled ?? true, label: t.label ?? null });
     } else {
-      throw new ApiError(400, "BAD_REQUEST", "trigger.kind \u53EA\u80FD\u662F schedule\u3001webhook \u6216 manual");
+      throw new ApiError(400, "BAD_REQUEST", "trigger.kind \u53EA\u80FD\u662F schedule\u3001webhook\u3001event \u6216 manual");
     }
   }
   return out;
@@ -187892,6 +188164,28 @@ function validateEventFilters(raw) {
   }
   return out;
 }
+function validateEventConfig(raw) {
+  const cfg = raw ?? {};
+  if (cfg.source !== void 0 && cfg.source !== "project") {
+    throw new ApiError(400, "BAD_REQUEST", `\u4E0D\u652F\u6301\u7684\u4E8B\u4EF6\u6E90\uFF1A${String(cfg.source)}\uFF08\u672C\u671F\u53EA\u652F\u6301 project\uFF09`);
+  }
+  const projectId = typeof cfg.projectId === "string" ? cfg.projectId.trim() : "";
+  if (!projectId) throw new ApiError(400, "BAD_REQUEST", "event \u89E6\u53D1\u5668\u9700\u8981 event.projectId");
+  const events = normalizeEventNames(cfg.events);
+  return { source: "project", projectId, events };
+}
+function normalizeEventNames(raw) {
+  if (!Array.isArray(raw) || raw.length === 0) {
+    throw new ApiError(400, "BAD_REQUEST", `event.events \u9700\u8981\u975E\u7A7A\u6570\u7EC4\uFF08\u53EF\u9009\u503C\uFF1A${AUTOMATION_EVENT_NAMES.join(", ")}\uFF09`);
+  }
+  const known = new Set(AUTOMATION_EVENT_NAMES);
+  for (const e of raw) {
+    if (typeof e !== "string" || !known.has(e)) {
+      throw new ApiError(400, "UNKNOWN_EVENT", `\u4E0D\u652F\u6301\u7684\u4E8B\u4EF6\u7C7B\u578B\uFF1A${String(e)}\uFF08\u53EF\u9009\u503C\uFF1A${AUTOMATION_EVENT_NAMES.join(", ")}\uFF09`);
+    }
+  }
+  return AUTOMATION_EVENT_NAMES.filter((n) => raw.includes(n));
+}
 function assertValidCron(cron, tz) {
   const v2 = validateCron(cron, tz);
   if (!v2.ok) throw new ApiError(400, v2.code, v2.message);
@@ -187954,13 +188248,66 @@ function automationsDomain(opts) {
       throw new ApiError(403, "NOT_ALLOWED", "\u53EA\u6709\u521B\u5EFA\u8005\u6216\u7BA1\u7406\u5458\u53EF\u4EE5\u7BA1\u7406\u534F\u4F5C\u8005");
     }
   };
+  const decorateEventTriggers = async (automation, triggers, req) => {
+    if (!triggers.some((t) => t.kind === "event")) return triggers;
+    const cache = /* @__PURE__ */ new Map();
+    const out = [];
+    for (const t of triggers) {
+      if (t.kind !== "event" || !t.event) {
+        out.push(t);
+        continue;
+      }
+      const pid = t.event.projectId;
+      if (!cache.has(pid)) {
+        cache.set(pid, await opts.projectAccess?.({ companyId: companyOf(req), projectId: pid, actor: req.auth.actor }) ?? null);
+      }
+      const project = cache.get(pid) ?? null;
+      out.push({
+        ...t,
+        event: { ...t.event, projectAvailable: project !== null, projectName: project?.name ?? null }
+      });
+    }
+    return out;
+  };
   const summarize3 = async (automation, req) => {
     const [triggers, recent, canWrite] = await Promise.all([
       service.listTriggers(automation.id),
       service.listRuns(automation.id, { limit: RECENT_LIMIT2 }),
       canWriteOf(automation, req)
     ]);
-    return buildAutomationSummary(automation, triggers, recent, canWrite);
+    const decorated = await decorateEventTriggers(automation, triggers, req);
+    return {
+      ...buildAutomationSummary(automation, decorated, recent, canWrite),
+      // 能力位服务端算（ADR 0163 §10）：前端只消费不推断，否则前后端两套规则必漂移。
+      capabilities: { eventTrigger: service.eventTriggerCapability(automation) }
+    };
+  };
+  const assertEventTriggerWritable = async (mode, cfg, existing, req) => {
+    if (!service.eventTriggerCapability({ executionMode: mode }).supported) {
+      throw new ApiError(400, "EVENT_TRIGGER_UNSUPPORTED", "\u8BE5\u6267\u884C\u65B9\u5F0F\u6682\u4E0D\u652F\u6301\u8BA2\u9605\u89E6\u53D1\uFF08\u5BF9\u8BDD\u6267\u884C\u7F3A\u6301\u4E45\u5E42\u7B49\u952E\uFF09");
+    }
+    const project = await opts.projectAccess?.({ companyId: companyOf(req), projectId: cfg.projectId, actor: req.auth.actor });
+    if (!project) throw new ApiError(404, "NOT_FOUND", `\u6CA1\u6709\u8FD9\u4E2A\u9879\u76EE\uFF1A${cfg.projectId}`);
+    for (const other of existing) {
+      if (other.projectId !== cfg.projectId) continue;
+      const dup = cfg.events.find((e) => other.events.includes(e));
+      if (dup) throw new ApiError(409, "DUPLICATE_SUBSCRIPTION", `\u8BE5\u9879\u76EE\u7684\u8FD9\u4E2A\u4E8B\u4EF6\u5DF2\u8BA2\u9605\uFF1A${dup}`);
+    }
+  };
+  const assertEventTriggerInputs = async (mode, inputs, kept, req) => {
+    const seen = [...kept];
+    for (const input of inputs ?? []) {
+      if (input.kind !== "event" || !input.event) continue;
+      await assertEventTriggerWritable(mode, input.event, seen, req);
+      seen.push(input.event);
+    }
+  };
+  const assertModeKeepsEventTriggers = async (automation, effMode) => {
+    if (service.eventTriggerCapability({ ...automation, executionMode: effMode }).supported) return;
+    const hasEvent = (await service.listTriggers(automation.id)).some((t) => t.kind === "event");
+    if (hasEvent) {
+      throw new ApiError(400, "EVENT_TRIGGER_UNSUPPORTED", "\u8FD9\u6761\u81EA\u52A8\u5316\u6709\u8BA2\u9605\u89E6\u53D1\u5668\uFF0C\u6539\u6210\u5BF9\u8BDD\u6267\u884C\u4F1A\u5931\u53BB\u6301\u4E45\u5E42\u7B49\u4FDD\u8BC1\u2014\u2014\u8BF7\u5148\u5220\u9664\u8BA2\u9605\u89E6\u53D1\u5668");
+    }
   };
   return (router) => {
     router.get("/api/automations/templates", async () => {
@@ -188027,6 +188374,7 @@ function automationsDomain(opts) {
       assertTitleTemplate(b2.titleTemplate);
       const subscribers = assertActorIds(b2.subscribers, "subscribers");
       const triggers = validateTriggers(b2.triggers);
+      await assertEventTriggerInputs(mode, triggers, [], req);
       const created = await service.createAutomation({
         companyId: companyOf(req),
         name: b2.name,
@@ -188060,6 +188408,9 @@ function automationsDomain(opts) {
       assertTitleTemplate(b2.titleTemplate);
       const subscribers = assertActorIds(b2.subscribers, "subscribers");
       const triggers = validateTriggers(b2.triggers);
+      const kept = triggers !== void 0 ? [] : (await service.listTriggers(automation.id)).filter((t) => t.kind === "event" && t.event).map((t) => t.event);
+      await assertEventTriggerInputs(effMode, triggers, kept, req);
+      if (triggers === void 0) await assertModeKeepsEventTriggers(automation, effMode);
       const updated = await service.updateAutomation(
         automation.id,
         {
@@ -188108,6 +188459,8 @@ function automationsDomain(opts) {
       const automation = await mustGet(req);
       await requireWrite(automation, req);
       const inputs = validateTriggers([req.body]) ?? [];
+      const kept = (await service.listTriggers(automation.id)).filter((t) => t.kind === "event" && t.event).map((t) => t.event);
+      await assertEventTriggerInputs(automation.executionMode, inputs, kept, req);
       const trigger = await service.addTrigger(automation.id, inputs[0], req.auth.actor);
       return { status: 201, body: trigger };
     });
@@ -188137,6 +188490,17 @@ function automationsDomain(opts) {
         const eventFilters = validateEventFilters(b2.webhook.eventFilters);
         if (eventFilters !== void 0) patch.webhook = { eventFilters };
       }
+      if (b2.event !== void 0) {
+        if (existing.kind !== "event") throw new ApiError(400, "BAD_REQUEST", "\u975E event \u89E6\u53D1\u5668\u4E0D\u63A5\u53D7 event \u5B57\u6BB5");
+        const raw = b2.event;
+        if (raw["projectId"] !== void 0 || raw["source"] !== void 0) {
+          throw new ApiError(400, "BAD_REQUEST", "\u8BA2\u9605\u7684\u9879\u76EE\u4E0E\u4E8B\u4EF6\u6E90\u4E0D\u53EF\u4FEE\u6539\u2014\u2014\u8BF7\u5220\u9664\u8FD9\u6761\u89E6\u53D1\u5668\u540E\u91CD\u65B0\u6DFB\u52A0");
+        }
+        const events = normalizeEventNames(raw["events"]);
+        const kept = (await service.listTriggers(automation.id)).filter((t) => t.kind === "event" && t.id !== existing.id && t.event).map((t) => t.event);
+        await assertEventTriggerWritable(automation.executionMode, { projectId: existing.event.projectId, events }, kept, req);
+        patch.event = { events };
+      }
       const updated = await service.updateTrigger(existing.id, patch, req.auth.actor);
       return { status: 200, body: updated };
     });
@@ -188218,6 +188582,7 @@ var RECENT_LIMIT2;
 var init_routes9 = __esm({
   "../server/src/domains/automations/routes.ts"() {
     "use strict";
+    init_src2();
     init_templates();
     init_router();
     init_service8();
@@ -188230,17 +188595,25 @@ var init_routes9 = __esm({
 });
 
 // ../server/src/domains/automations/workorder-state.ts
-function makeAutomationWorkorderStateResolver(kernel) {
+function makeAutomationWorkorderSnapshotResolver(kernel) {
   return async (workspace) => {
     const arts = [...kernel.model.artifacts.values()].filter((a) => a.workspace === workspace);
-    if (arts.length === 0) return "unknown";
+    if (arts.length === 0) return { state: "unknown", members: [], rootArtifactId: null };
     const seed = arts.find((a) => a.inputs.length === 0) ?? arts[0];
-    if (lifecycleOf(kernel.model, seed.id) === "sealed:cancelled") return "cancelled";
+    const members = arts.map((a) => ({ artifactId: String(a.id), currentRevisionId: a.currentRev ? String(a.currentRev) : null })).sort((x2, y) => x2.artifactId < y.artifactId ? -1 : x2.artifactId > y.artifactId ? 1 : 0);
+    const rootArtifactId = String(seed.id);
+    if (lifecycleOf(kernel.model, seed.id) === "sealed:cancelled") {
+      return { state: "cancelled", members, rootArtifactId };
+    }
     const stage = deriveStage(arts.map((a) => nodeInfo(kernel.model, a)));
-    if (stage === "concluded" || stage === "sealed") return "done";
-    return "active";
+    if (stage === "concluded" || stage === "sealed") return { state: "done", members, rootArtifactId };
+    return { state: "active", members, rootArtifactId };
   };
 }
+function makeAutomationWorkorderStateResolver(kernel) {
+  const snapshot = makeAutomationWorkorderSnapshotResolver(kernel);
+  return async (workspace) => (await snapshot(workspace)).state;
+}
 function makeAutomationReplyResolver(kernel, blobs) {
   return async (workspace) => {
     const model = kernel.model;
@@ -188304,7 +188677,12 @@ function createAutomationsDomain(opts) {
   return {
     service,
     webhook,
-    register: automationsDomain({ service, webhook, ...opts.isAdmin ? { isAdmin: opts.isAdmin } : {} })
+    register: automationsDomain({
+      service,
+      webhook,
+      ...opts.isAdmin ? { isAdmin: opts.isAdmin } : {},
+      ...opts.projectAccess ? { projectAccess: opts.projectAccess } : {}
+    })
   };
 }
 var init_automations = __esm({
@@ -188596,6 +188974,210 @@ var init_playbooks = __esm({
   }
 });
 
+// ../server/src/automations/project-event-poller.ts
+function completionFingerprint(workspace, members) {
+  const canonical = JSON.stringify({
+    workspace,
+    members: [...members].sort((a, b2) => a.artifactId < b2.artifactId ? -1 : a.artifactId > b2.artifactId ? 1 : 0).map((m2) => ({ artifactId: m2.artifactId, currentRevisionId: m2.currentRevisionId ?? null }))
+  });
+  return (0, import_node_crypto39.createHash)("sha256").update(canonical).digest("hex");
+}
+function eventConsumptionKey(args) {
+  const raw = `project-event:${EVENT_KEY_VERSION}:${args.triggerId}:${args.event}:${args.workspace}:${args.fingerprint}`;
+  return raw.length <= 200 ? raw : `project-event:${EVENT_KEY_VERSION}:sha256:${(0, import_node_crypto39.createHash)("sha256").update(raw).digest("hex")}`;
+}
+var import_node_crypto39, EVENT_KEY_VERSION, EMPTY_METRICS, AUTOMATION_EVENT_HANDLERS, ProjectEventPoller;
+var init_project_event_poller = __esm({
+  "../server/src/automations/project-event-poller.ts"() {
+    "use strict";
+    import_node_crypto39 = require("node:crypto");
+    EVENT_KEY_VERSION = "v1";
+    EMPTY_METRICS = () => ({
+      scanDurationMs: 0,
+      projectsScanned: 0,
+      workordersScanned: 0,
+      newEvents: 0,
+      duplicateEvents: 0,
+      skippedEvents: 0,
+      baselineEvents: 0,
+      pollErrors: 0,
+      oldestPendingAgeMs: null
+    });
+    AUTOMATION_EVENT_HANDLERS = {
+      // 完成判据必须来自 D3 resolver（snapshot.state），不在这里复制 deriveStage。
+      // active / unknown 是「还没完成」，cancelled 永不产生 completed——四态里只有 done 触发。
+      "workorder.completed": {
+        matches: (snapshot) => snapshot.state === "done",
+        fingerprint: (workspace, snapshot) => completionFingerprint(workspace, snapshot.members)
+      }
+    };
+    ProjectEventPoller = class {
+      deps;
+      now;
+      log;
+      batchLimit;
+      inFlight = false;
+      lastMetrics = EMPTY_METRICS();
+      constructor(deps) {
+        this.deps = deps;
+        this.now = deps.now ?? (() => /* @__PURE__ */ new Date());
+        if (deps.log) this.log = deps.log;
+        this.batchLimit = deps.batchLimit ?? 200;
+      }
+      metrics() {
+        return { ...this.lastMetrics };
+      }
+      /** 一轮扫描。单实例用 inFlight 防重入；多实例无需选主——并发由数据库唯一键裁决。 */
+      async tick() {
+        if (this.inFlight) return this.lastMetrics;
+        this.inFlight = true;
+        const startedAt = this.now().getTime();
+        const m2 = EMPTY_METRICS();
+        try {
+          const triggers = await this.deps.store.listEventTriggers();
+          if (triggers.length === 0) return this.lastMetrics = { ...m2, scanDurationMs: this.now().getTime() - startedAt };
+          const snapshots2 = /* @__PURE__ */ new Map();
+          let budget = this.batchLimit;
+          for (const trigger of triggers) {
+            if (budget <= 0) break;
+            const config2 = trigger.event;
+            if (!config2?.projectId || config2.events.length === 0) continue;
+            const automation = await this.deps.store.getAutomation(trigger.automationId);
+            if (!automation) continue;
+            const groupKey = `${automation.companyId}\0${config2.projectId}`;
+            let group = snapshots2.get(groupKey);
+            if (!group) {
+              try {
+                group = await this.scanProject(automation.companyId, config2.projectId);
+                m2.projectsScanned += 1;
+                m2.workordersScanned += group.length;
+              } catch (e) {
+                m2.pollErrors += 1;
+                this.log?.(`[project-event-poller] \u626B\u63CF\u9879\u76EE\u5931\u8D25 ${config2.projectId}\uFF1A${String(e)}`);
+                group = [];
+              }
+              snapshots2.set(groupKey, group);
+            }
+            try {
+              budget -= await this.evaluateTrigger(automation, trigger, group, m2, budget);
+            } catch (e) {
+              m2.pollErrors += 1;
+              this.log?.(`[project-event-poller] \u89E6\u53D1\u5668\u6C42\u503C\u5931\u8D25 ${trigger.id}\uFF1A${String(e)}`);
+            }
+          }
+          m2.oldestPendingAgeMs = await this.oldestPendingAge();
+        } catch (e) {
+          m2.pollErrors += 1;
+          this.log?.(`[project-event-poller] tick \u5931\u8D25\uFF1A${String(e)}`);
+        } finally {
+          m2.scanDurationMs = this.now().getTime() - startedAt;
+          this.lastMetrics = m2;
+          this.inFlight = false;
+        }
+        if (m2.newEvents || m2.skippedEvents || m2.baselineEvents || m2.pollErrors) {
+          this.log?.(
+            `[project-event-poller] \u9879\u76EE ${m2.projectsScanned} / \u5DE5\u5355 ${m2.workordersScanned} \u2192 \u65B0\u4E8B\u4EF6 ${m2.newEvents}\u3001\u91CD\u590D ${m2.duplicateEvents}\u3001\u8DF3\u8FC7 ${m2.skippedEvents}\u3001\u57FA\u7EBF ${m2.baselineEvents}\u3001\u9519\u8BEF ${m2.pollErrors}\uFF08${m2.scanDurationMs}ms\uFF09`
+          );
+        }
+        return this.lastMetrics;
+      }
+      async scanProject(companyId, projectId) {
+        const workspaces = await this.deps.listProjectWorkspaces({ companyId, projectId });
+        const out = [];
+        for (const workspace of workspaces) {
+          out.push({ workspace, snapshot: await this.deps.workorderSnapshot({ companyId, workspace }) });
+        }
+        return out;
+      }
+      /** 返回本触发器消耗掉的预算条数。 */
+      async evaluateTrigger(automation, trigger, candidates, m2, budget) {
+        const config2 = trigger.event;
+        const baselining = config2.baselineState !== "ready";
+        let used = 0;
+        for (const event of config2.events) {
+          const handler = AUTOMATION_EVENT_HANDLERS[event];
+          if (!handler) continue;
+          for (const { workspace, snapshot } of candidates) {
+            if (!handler.matches(snapshot)) continue;
+            if (used >= budget) return used;
+            const fingerprint = handler.fingerprint(workspace, snapshot);
+            const key = eventConsumptionKey({ triggerId: trigger.id, event, workspace, fingerprint });
+            const envelope = {
+              event,
+              companyId: automation.companyId,
+              projectId: config2.projectId,
+              workspace,
+              rootArtifactId: snapshot.rootArtifactId,
+              completionFingerprint: fingerprint,
+              observedAt: this.now().toISOString(),
+              ...await this.originAutomationOf(workspace)
+            };
+            used += 1;
+            if (baselining) {
+              const { created: created2 } = await this.deps.service.claimEventRun(
+                automation,
+                trigger,
+                key,
+                envelope,
+                "skipped",
+                "subscription_baseline",
+                "\u8BA2\u9605\u57FA\u7EBF\u5BF9\u9F50\uFF1A\u8BA2\u9605\u751F\u6548\u524D\u5DF2\u5B8C\u6210\uFF0C\u4E0D\u56DE\u653E\u5386\u53F2"
+              );
+              if (created2) m2.baselineEvents += 1;
+              else m2.duplicateEvents += 1;
+              continue;
+            }
+            const { run, created } = await this.deps.service.claimEventRun(automation, trigger, key, envelope);
+            if (!created) {
+              m2.duplicateEvents += 1;
+              continue;
+            }
+            const denial = await this.admit(automation, trigger, envelope);
+            if (denial) {
+              await this.deps.service.skipEventRun(run, denial.reasonCode, denial.error);
+              m2.skippedEvents += 1;
+              continue;
+            }
+            await this.deps.service.dispatchEventRun(automation, trigger, run);
+            m2.newEvents += 1;
+          }
+        }
+        if (baselining) {
+          await this.deps.store.completeEventBaseline(trigger.id, this.now().toISOString());
+        }
+        return used;
+      }
+      /** 权限复查 + 自环准入。两条都只在**占位成功之后**做，因为拒绝也要留痕在同一把键上。 */
+      async admit(automation, trigger, envelope) {
+        if (envelope.originAutomationId && envelope.originAutomationId === automation.id) {
+          return { reasonCode: "self_trigger_blocked", error: "\u81EA\u89E6\u53D1\u5DF2\u963B\u65AD\uFF1A\u8FD9\u4E2A\u5DE5\u5355\u662F\u672C\u81EA\u52A8\u5316\u81EA\u5DF1\u5EFA\u7684" };
+        }
+        const accountable = trigger.publishedBy ?? (await this.deps.store.latestRuleVersion(automation.id))?.publishedBy ?? automation.createdBy ?? null;
+        const readable = await this.deps.projectReadable({
+          companyId: automation.companyId,
+          projectId: envelope.projectId,
+          actor: accountable
+        });
+        if (!readable) {
+          return { reasonCode: "project_access_revoked", error: `\u8BA2\u9605\u9879\u76EE\u5DF2\u4E0D\u53EF\u8BBF\u95EE\uFF1A${envelope.projectId}` };
+        }
+        return null;
+      }
+      async originAutomationOf(workspace) {
+        const origin = await this.deps.store.findRunBySpawnedWorkspace(workspace).catch(() => null);
+        return origin ? { originAutomationId: origin.automationId } : {};
+      }
+      async oldestPendingAge() {
+        const unsettled = await this.deps.store.listUnsettledRuns(50).catch(() => []);
+        const pending = unsettled.filter((r) => r.source === "event" && r.status === "pending");
+        if (pending.length === 0) return null;
+        const oldest = Math.min(...pending.map((r) => Date.parse(r.triggeredAt)));
+        return this.now().getTime() - oldest;
+      }
+    };
+  }
+});
+
 // ../server/src/daemon-adapter.ts
 function graceFromEnv(fallback) {
   const v2 = process.env["OASIS_NODE_LOST_GRACE_MS"];
@@ -188623,11 +189205,11 @@ function remoteAppendInput(hub, nodeId, dispatchId, entry, input, timeoutMs) {
     entry.appendWaiters.push({ resolve: resolve10, timer });
   });
 }
-var import_node_crypto39, STASH_TTL_MS, STASH_MAX_FRAMES_PER_ID, STASH_MAX_IDS, DaemonHubAdapter, BindingRouterAdapter, WorkdirBridge;
+var import_node_crypto40, STASH_TTL_MS, STASH_MAX_FRAMES_PER_ID, STASH_MAX_IDS, DaemonHubAdapter, BindingRouterAdapter, WorkdirBridge;
 var init_daemon_adapter = __esm({
   "../server/src/daemon-adapter.ts"() {
     "use strict";
-    import_node_crypto39 = require("node:crypto");
+    import_node_crypto40 = require("node:crypto");
     STASH_TTL_MS = 5 * 6e4;
     STASH_MAX_FRAMES_PER_ID = 500;
     STASH_MAX_IDS = 50;
@@ -188823,7 +189405,7 @@ var init_daemon_adapter = __esm({
       async spawn(job) {
         const nodeId = job.binding?.nodeId;
         if (!nodeId) throw new Error("DaemonHubAdapter \u9700\u8981 job.binding.nodeId\uFF08\u8DEF\u7531\u9519\u8BEF\uFF09");
-        const dispatchId = job.dispatchId ?? `dispatch:${(0, import_node_crypto39.randomUUID)()}`;
+        const dispatchId = job.dispatchId ?? `dispatch:${(0, import_node_crypto40.randomUUID)()}`;
         const entry = {
           nodeId,
           ...job.binding?.runtimeKind ? { runtimeKind: job.binding.runtimeKind } : {},
@@ -188979,7 +189561,7 @@ var init_daemon_adapter = __esm({
         }));
       }
       request(nodeId, buildFrame) {
-        const requestId = (0, import_node_crypto39.randomUUID)();
+        const requestId = (0, import_node_crypto40.randomUUID)();
         const sent = this.hub.dispatch(nodeId, buildFrame(requestId));
         if (!sent) return Promise.resolve({ ok: false, code: "NODE_OFFLINE" });
         return new Promise((resolve10) => {
@@ -189087,13 +189669,13 @@ function classifyPage(page, lastPushedHash, serviceAccount) {
   if (sha(body) === lastPushedHash) return { kind: "echo" };
   return { kind: "human-edit", content: body, updatedBy: page.updatedBy };
 }
-var import_node_crypto40, sha, enc3, dec, MirrorEngine, MapMirrorIdentities;
+var import_node_crypto41, sha, enc3, dec, MirrorEngine, MapMirrorIdentities;
 var init_engine = __esm({
   "../server/src/mirror/engine.ts"() {
     "use strict";
-    import_node_crypto40 = require("node:crypto");
+    import_node_crypto41 = require("node:crypto");
     init_src2();
-    sha = (s2) => (0, import_node_crypto40.createHash)("sha256").update(s2, "utf8").digest("hex");
+    sha = (s2) => (0, import_node_crypto41.createHash)("sha256").update(s2, "utf8").digest("hex");
     enc3 = (s2) => new TextEncoder().encode(s2);
     dec = (b2) => new TextDecoder().decode(b2);
     MirrorEngine = class {
@@ -189300,11 +189882,11 @@ function humanExitCause(exit) {
   const base = (exit.reason ? label[exit.reason] : void 0) ?? `\u4F1A\u8BDD\u5F02\u5E38\u7ED3\u675F\uFF08${exit.reason ?? "\u65E0\u9000\u51FA\u4FE1\u606F"}\uFF09`;
   return exit.errorMessage ? `${base}\uFF1A${exit.errorMessage.slice(0, 200)}` : base;
 }
-var import_node_crypto41, AUTONOMOUS_ETHOS, CONVERSATIONAL_ETHOS, SHARED_GRAPH_BODY, AUTONOMOUS_RECOVERY_TOOLS, HIGH_RISK_COMMANDS, COORDINATOR_SYSTEM_PROMPT, CONVERSATIONAL_RECOVERY_TOOLS, CONVERSATIONAL_ESCALATION_TOOLS, CONVERSATIONAL_MANAGER_BODY, MACHINE_EXIT_CODES, CoordinatorWorker;
+var import_node_crypto42, AUTONOMOUS_ETHOS, CONVERSATIONAL_ETHOS, SHARED_GRAPH_BODY, AUTONOMOUS_RECOVERY_TOOLS, HIGH_RISK_COMMANDS, COORDINATOR_SYSTEM_PROMPT, CONVERSATIONAL_RECOVERY_TOOLS, CONVERSATIONAL_ESCALATION_TOOLS, CONVERSATIONAL_MANAGER_BODY, MACHINE_EXIT_CODES, CoordinatorWorker;
 var init_worker = __esm({
   "../server/src/coordinator/worker.ts"() {
     "use strict";
-    import_node_crypto41 = require("node:crypto");
+    import_node_crypto42 = require("node:crypto");
     init_src5();
     init_identity();
     AUTONOMOUS_ETHOS = `\u4F60\u662F\u8FD9\u4E2A\u5DE5\u5355\u7684**\u7BA1\u7406\u8005**\u2014\u2014\u804C\u8D23\u662F\u8BA9\u5B83\u987A\u7545\u8DD1\u5B8C\u3002\u7CFB\u7EDF\u5728\u67D0\u4E2A\u8282\u70B9\u5361\u4F4F\u3001\u673A\u68B0\u5206\u8BCA\u786E\u8BA4"\u9700\u8981\u4F60"\u65F6\u5524\u8D77\u4F60\uFF08\u65E0\u4EBA\u5728\u573A\uFF0C\u4F60\u8FD9\u4E00\u8F6E\u628A\u80FD\u505A\u7684\u505A\u6389\uFF09\u3002\u4F60\u7684\u624B\u6BB5\u5F88\u5BBD\uFF1A
@@ -189551,7 +190133,7 @@ ${HIGH_RISK_COMMANDS}`;
         return this.deps.kernel.model.lastSeq.get(artifactId) ?? 0;
       }
       evaluationKey(kind, artifactId, evidence) {
-        const fingerprint = (0, import_node_crypto41.createHash)("sha256").update(JSON.stringify(evidence)).digest("hex");
+        const fingerprint = (0, import_node_crypto42.createHash)("sha256").update(JSON.stringify(evidence)).digest("hex");
         return `${kind}:${artifactId}:${fingerprint}`;
       }
       artifactEvidence(id) {
@@ -189928,8 +190510,8 @@ ${ctx.nodeFault}
             this.deps.log?.(`[coordinator] ${workspace} \u5168\u5C40\u4E0A\u4E0B\u6587\u8BFB\u53D6\u5931\u8D25\uFF0C\u7EE7\u7EED\u6CBF\u7528\u539F\u534F\u8C03\u8005\u4EFB\u52A1\uFF1A${String(error2)}`);
           }
         }
-        const runtimeSessionId = opts?.resumeSessionId ?? (0, import_node_crypto41.randomUUID)();
-        const coordinatorRunId = `coordinate:${(0, import_node_crypto41.randomUUID)()}`;
+        const runtimeSessionId = opts?.resumeSessionId ?? (0, import_node_crypto42.randomUUID)();
+        const coordinatorRunId = `coordinate:${(0, import_node_crypto42.randomUUID)()}`;
         const taskWithContext = coordinatorContext ? [
           task,
           ``,
@@ -189970,7 +190552,7 @@ ${ctx.nodeFault}
         const startedAtMs = Date.now();
         let trajectoryStarted = false;
         if (this.deps.trajectory) {
-          const bundleManifest = Object.fromEntries(Object.entries(job.bundle.files).map(([name, content]) => [name, (0, import_node_crypto41.createHash)("sha256").update(content).digest("hex")]));
+          const bundleManifest = Object.fromEntries(Object.entries(job.bundle.files).map(([name, content]) => [name, (0, import_node_crypto42.createHash)("sha256").update(content).digest("hex")]));
           const session = {
             runId: coordinatorRunId,
             runtimeSessionId,
@@ -190371,6 +190953,7 @@ var init_src10 = __esm({
     init_playbooks();
     init_overrides();
     init_scheduler();
+    init_project_event_poller();
     init_daemon_adapter();
     init_dispatch_fence();
     init_node_health();
@@ -190391,11 +190974,11 @@ var init_src10 = __esm({
 });
 
 // ../storage/src/postgres.ts
-var import_node_crypto42, ident3, isUniqueViolation, PostgresOplogStore, PostgresBlobStore;
+var import_node_crypto43, ident3, isUniqueViolation, PostgresOplogStore, PostgresBlobStore;
 var init_postgres = __esm({
   "../storage/src/postgres.ts"() {
     "use strict";
-    import_node_crypto42 = require("node:crypto");
+    import_node_crypto43 = require("node:crypto");
     init_esm();
     init_src2();
     ident3 = (s2) => {
@@ -190574,7 +191157,7 @@ var init_postgres = __esm({
         return new _PostgresBlobStore(pool, schema);
       }
       async put(bytes) {
-        const hash = (0, import_node_crypto42.createHash)("sha256").update(bytes).digest("hex");
+        const hash = (0, import_node_crypto43.createHash)("sha256").update(bytes).digest("hex");
         await this.pool.query(
           `INSERT INTO ${this.t} (hash, bytes, size, content_type) VALUES ($1, $2, $3, $4) ON CONFLICT (hash) DO NOTHING`,
           [hash, Buffer.from(bytes), bytes.byteLength, sniffContentType(bytes) ?? null]
@@ -194843,6 +195426,14 @@ var init_postgres_trace = __esm({
 });
 
 // ../storage/src/postgres-automations.ts
+function storedEventConfig(t) {
+  return {
+    source: "project",
+    projectId: t.event?.projectId ?? "",
+    events: t.event?.events ?? [],
+    baselineAt: null
+  };
+}
 function buildTrigger(automationId, input) {
   const t = {
     id: genId("trig"),
@@ -194863,6 +195454,10 @@ function buildTrigger(automationId, input) {
       hasSigningSecret: false
     };
   }
+  if (input.kind === "event" && input.event) {
+    t.enabled = false;
+    t.event = { source: "project", projectId: input.event.projectId, events: [...input.event.events], baselineState: "aligning" };
+  }
   return t;
 }
 function genWebhookToken2() {
@@ -195166,7 +195761,8 @@ var init_postgres_automations = __esm({
             t.schedule?.claimedAt ?? null,
             t.webhook?.token ?? null,
             t.webhook?.provider ?? null,
-            t.webhook?.eventFilters != null ? JSON.stringify(t.webhook.eventFilters) : null
+            // event_filters 一列两用（ADR 0163 §3.2：不新增列）：webhook 存过滤数组，event 存订阅配置对象。
+            t.kind === "event" ? JSON.stringify(storedEventConfig(t)) : t.webhook?.eventFilters != null ? JSON.stringify(t.webhook.eventFilters) : null
           ]
         );
       }
@@ -195212,6 +195808,10 @@ var init_postgres_automations = __esm({
         if (patch.webhook && "eventFilters" in patch.webhook) {
           push("event_filters", patch.webhook.eventFilters != null ? JSON.stringify(patch.webhook.eventFilters) : null, "::jsonb");
         }
+        if (patch.event?.events) {
+          args.push(JSON.stringify(patch.event.events));
+          sets.push(`event_filters=jsonb_set(COALESCE(event_filters, '{}'::jsonb), '{events}', $${args.length}::jsonb, true)`);
+        }
         if (sets.length === 0) return await this.getTrigger(triggerId);
         args.push(triggerId);
         const r = await this.pool.query(
@@ -195498,6 +196098,42 @@ var init_postgres_automations = __esm({
         );
         return r.rows.map(rowToTrigger);
       }
+      /* ---------- event 触发器（ADR 0163） ---------- */
+      async listEventTriggers() {
+        const r = await this.pool.query(
+          `SELECT t.* FROM ${this.s}.automation_triggers t
+         JOIN ${this.s}.automations a ON a.id = t.automation_id
+        WHERE t.kind = 'event' AND a.enabled AND a.archived_at IS NULL
+        ORDER BY t.id`
+        );
+        return r.rows.map(rowToTrigger);
+      }
+      async completeEventBaseline(triggerId, at) {
+        await this.pool.query(
+          `UPDATE ${this.s}.automation_triggers
+          SET event_filters = jsonb_set(COALESCE(event_filters, '{}'::jsonb), '{baselineAt}', to_jsonb($2::text), true),
+              enabled = true
+        WHERE id = $1 AND kind = 'event'`,
+          [triggerId, at]
+        );
+      }
+      async resetEventBaseline(triggerId) {
+        await this.pool.query(
+          `UPDATE ${this.s}.automation_triggers
+          SET event_filters = jsonb_set(COALESCE(event_filters, '{}'::jsonb), '{baselineAt}', 'null'::jsonb, true),
+              enabled = false
+        WHERE id = $1 AND kind = 'event'`,
+          [triggerId]
+        );
+      }
+      async findRunBySpawnedWorkspace(workspace) {
+        const r = await this.pool.query(
+          `SELECT * FROM ${this.s}.automation_runs WHERE spawned_workspace_id = $1
+       ORDER BY triggered_at ASC, id ASC LIMIT 1`,
+          [workspace]
+        );
+        return r.rows[0] ? rowToRun2(r.rows[0]) : null;
+      }
     };
     rowToAutomation = (row) => ({
       id: row.id,
@@ -195546,6 +196182,15 @@ var init_postgres_automations = __esm({
           hasSigningSecret: row.signing_secret != null
         };
       }
+      if (t.kind === "event") {
+        const raw = row.event_filters ?? null;
+        t.event = {
+          source: "project",
+          projectId: raw?.projectId ?? "",
+          events: raw?.events ?? [],
+          baselineState: raw?.baselineAt ? "ready" : "aligning"
+        };
+      }
       return t;
     };
     rowToRun2 = (row) => ({
@@ -195909,11 +196554,11 @@ var init_postgres_chat_sessions = __esm({
 });
 
 // ../storage/src/postgres-nodes.ts
-var import_node_crypto43, ident12, PostgresNodeStore, PostgresNodeTokenStore, rowToNode, rowToRuntime;
+var import_node_crypto44, ident12, PostgresNodeStore, PostgresNodeTokenStore, rowToNode, rowToRuntime;
 var init_postgres_nodes = __esm({
   "../storage/src/postgres-nodes.ts"() {
     "use strict";
-    import_node_crypto43 = require("node:crypto");
+    import_node_crypto44 = require("node:crypto");
     init_esm();
     ident12 = (s2) => {
       if (!/^[a-z_][a-z0-9_]*$/.test(s2)) throw new Error(`invalid schema name: ${s2}`);
@@ -196062,7 +196707,7 @@ var init_postgres_nodes = __esm({
         return store;
       }
       issue(nodeId) {
-        const token = `ont_${(0, import_node_crypto43.randomBytes)(24).toString("base64url")}`;
+        const token = `ont_${(0, import_node_crypto44.randomBytes)(24).toString("base64url")}`;
         this.cache.set(token, nodeId);
         void this.pool.query(`INSERT INTO ${this.s}.node_tokens (token,node_id) VALUES ($1,$2)`, [token, nodeId]);
         return token;
@@ -196274,11 +196919,11 @@ var init_postgres_type_registry = __esm({
 });
 
 // ../storage/src/postgres-actor-memory.ts
-var import_node_crypto44, matchClause, ident15, PostgresActorMemoryStore, rowToIndexEntry, rowToRecord;
+var import_node_crypto45, matchClause, ident15, PostgresActorMemoryStore, rowToIndexEntry, rowToRecord;
 var init_postgres_actor_memory = __esm({
   "../storage/src/postgres-actor-memory.ts"() {
     "use strict";
-    import_node_crypto44 = require("node:crypto");
+    import_node_crypto45 = require("node:crypto");
     init_src2();
     matchClause = (q) => q.requireMatch && q.keywords.length > 0 ? " WHERE m > 0" : "";
     ident15 = (s2) => {
@@ -196483,7 +197128,7 @@ var init_postgres_actor_memory = __esm({
       }
       async write(input, now) {
         if (input.memId === void 0) {
-          const memId = `mem:${(0, import_node_crypto44.randomUUID)()}`;
+          const memId = `mem:${(0, import_node_crypto45.randomUUID)()}`;
           const r2 = await this.pool.query(
             `INSERT INTO ${this.s}.actor_memories
            (mem_id, actor_id, project_id, keywords, content, version, created_at, updated_at, accessed_at, source_artifact_id, source_session_id)
@@ -196996,19 +197641,20 @@ var fs38 = __toESM(require("node:fs"));
 var os13 = __toESM(require("node:os"));
 var path32 = __toESM(require("node:path"));
 var import_node_child_process19 = require("node:child_process");
+var import_node_crypto52 = require("node:crypto");
 
 // ../cli/src/cli.ts
 var fs34 = __toESM(require("node:fs"), 1);
 var os11 = __toESM(require("node:os"), 1);
 var path28 = __toESM(require("node:path"), 1);
-var import_node_crypto49 = require("node:crypto");
+var import_node_crypto50 = require("node:crypto");
 
 // ../cli/src/serve.ts
 var fs30 = __toESM(require("node:fs"), 1);
 var os7 = __toESM(require("node:os"), 1);
 var path24 = __toESM(require("node:path"), 1);
 var import_node_child_process15 = require("node:child_process");
-var import_node_crypto45 = require("node:crypto");
+var import_node_crypto46 = require("node:crypto");
 var import_node_url7 = require("node:url");
 init_src5();
 init_src10();
@@ -197755,7 +198401,10 @@ async function startServe(opts) {
     schemaDefs: schema,
     registry: kernelRegistry,
     reworkWavefront,
-    convergenceUnified
+    convergenceUnified,
+    // ★ ADR 0147：引擎 scan 的 work/review 超时与重试上限走策略中心（与 dispatcher 墙钟、
+    // waiting-inbox 催办同源）。thunk 而非实例——随 SIGHUP / POST /api/policy/reload 热载而变。
+    policy: () => activeTimeoutPolicy
   });
   const kernel = newEngine.kernel;
   const dispatchLedger = await PostgresDispatchStore.open(pgPool, pgSchema);
@@ -198131,7 +198780,7 @@ async function startServe(opts) {
       // dispatchChat 收流、done 后落助手消息并回报最终回复。会话在控制台 chat 页可回看。
       runChat: async ({ agentId, humanActorId, title, prompt }, onDone) => {
         if (!automationDispatchChat) throw new Error("chat \u6D3E\u53D1\u5C1A\u672A\u5C31\u7EEA\uFF08serve \u542F\u52A8\u4E2D\uFF09");
-        const chatSessionId = (0, import_node_crypto45.randomUUID)();
+        const chatSessionId = (0, import_node_crypto46.randomUUID)();
         const nowIso = (/* @__PURE__ */ new Date()).toISOString();
         await chatSessionStore.createSession({
           id: chatSessionId,
@@ -198143,7 +198792,7 @@ async function startServe(opts) {
           touchedAt: nowIso,
           createdAt: nowIso
         }).catch(() => void 0);
-        await chatSessionStore.appendMessage({ id: (0, import_node_crypto45.randomUUID)(), sessionId: chatSessionId, role: "user", content: prompt, createdAt: nowIso }).catch(() => void 0);
+        await chatSessionStore.appendMessage({ id: (0, import_node_crypto46.randomUUID)(), sessionId: chatSessionId, role: "user", content: prompt, createdAt: nowIso }).catch(() => void 0);
         const session = await automationDispatchChat({ actorId: agentId, message: prompt, chatSessionId });
         let buf = "";
         session.onOutput((c) => {
@@ -198152,7 +198801,7 @@ async function startServe(opts) {
         void session.done.then(async () => {
           if (buf || session.runId) {
             await chatSessionStore.appendMessage({
-              id: (0, import_node_crypto45.randomUUID)(),
+              id: (0, import_node_crypto46.randomUUID)(),
               sessionId: chatSessionId,
               role: "assistant",
               content: buf,
@@ -198166,6 +198815,10 @@ async function startServe(opts) {
         });
         return { chatSessionId };
       },
+      // 订阅触发 × chat 的 fail-closed 开关（ADR 0163 §4.4）。当前 runChat 每次 randomUUID 建会话、
+      // 没有任何持久去重：占位后崩溃重试会多开一个会话。**在 chat 适配器补上持久幂等键之前保持 false**，
+      // 由此 event+chat 在配置期就被拒（能力位 supported=false），而不是上线后偶发重复开会话。
+      chatSupportsIdempotency: false,
       // chat 准入（≈ multica AgentReadiness）：在岗 + 有 active runtime 绑定，注定失败的触发别去开会话。
       agentReady: async (agentId) => {
         const actor = await registryStore.getActor(agentId);
@@ -198183,6 +198836,13 @@ async function startServe(opts) {
       const member = await controlPlaneStore.getMember(companyId, actor);
       return member?.role === "owner" || member?.role === "admin";
     },
+    // 订阅项目可读判据（ADR 0163 §5.2）：复用 projects 域的可见性口径，automation 侧不复制成员规则。
+    // 现状：projects 域对登录成员不做逐项目读限制，故「可读」= 项目存在；项目被删/查不到 → null → 404。
+    // 哪天 projects 加了成员级可见性，改这一个闭包即可，automation 侧不动。
+    projectAccess: async ({ projectId }) => {
+      const project = await projectStateStore.getProject(projectId);
+      return project ? { id: project.id, name: project.name } : null;
+    },
     log: (m2) => console.log(m2)
   });
   const controlPlaneStore = pgDsn && pgPool ? await PostgresControlPlaneStore.open(pgPool, pgSchema) : await FileControlPlaneStore.open(path24.join(opts.dir, "control-plane.json"));
@@ -198353,7 +199013,9 @@ async function startServe(opts) {
         schemaDefs: schema,
         registry: kernelRegistry,
         reworkWavefront,
-        convergenceUnified
+        convergenceUnified,
+        // ★ 同默认公司：漏了这里，非默认公司的引擎照旧按代码默认 30min 判超时（策略文件形同虚设）。
+        policy: () => activeTimeoutPolicy
       });
       await ensureCompanyActors(controlPlaneStore, companyId, registryStore);
       await syncRegistryRolesToKernel(registryStore, engine2.kernel);
@@ -198604,7 +199266,7 @@ async function startServe(opts) {
         }));
       }
       const limits = { wallClockMs: wallClockForKind("planner") };
-      const artifactId = `artifact:planner:${(0, import_node_crypto45.randomUUID)()}`;
+      const artifactId = `artifact:planner:${(0, import_node_crypto46.randomUUID)()}`;
       const handle = await chatRemoteAdapter.spawn({
         actor: planner.id,
         // companyId 同协调者：planner 用的就是默认公司的 actors 服务，漏签会让它一调公司域端点就 404。
@@ -199021,10 +199683,10 @@ async function startServe(opts) {
           { nodeId: priorChatSession?.runtimeId, runtimeKind: priorChatSession?.runtimeKind },
           { nodeId: binding.nodeId, runtimeKind: binding.runtimeKind }
         ) : false;
-        const runtimeSessionId = sessionId ?? (0, import_node_crypto45.randomUUID)();
+        const runtimeSessionId = sessionId ?? (0, import_node_crypto46.randomUUID)();
         const resumeRuntimeSession = Boolean(sessionId);
-        const traceRunId = `chat-run:${(0, import_node_crypto45.randomUUID)()}`;
-        const artifactId = `artifact:chat:${(0, import_node_crypto45.randomUUID)()}`;
+        const traceRunId = `chat-run:${(0, import_node_crypto46.randomUUID)()}`;
+        const artifactId = `artifact:chat:${(0, import_node_crypto46.randomUUID)()}`;
         const traceStartedAt = (/* @__PURE__ */ new Date()).toISOString();
         let lastProgressTouchMs = 0;
         const PROGRESS_TOUCH_THROTTLE_MS2 = 2e4;
@@ -199677,7 +200339,7 @@ async function startServe(opts) {
             console.log(`[new-engine] dispatchWork ${workId} \u662F human work\u2014\u2014\u4E0D\u6D3E runtime\uFF0C\u7B49\u5F85\u4EBA\u5DE5\u5904\u7406`);
             return;
           }
-          const ledgerId = `dispatch:${(0, import_node_crypto45.randomUUID)()}`;
+          const ledgerId = `dispatch:${(0, import_node_crypto46.randomUUID)()}`;
           try {
             await dispatchLedger.insertOpen({
               id: ledgerId,
@@ -199753,7 +200415,7 @@ async function startServe(opts) {
           const kernelModel = newKernel.model;
           const art = kernelModel.artifacts.get(nodeId);
           const revWid = art?.workspace ?? "";
-          const ledgerId = `dispatch:${(0, import_node_crypto45.randomUUID)()}`;
+          const ledgerId = `dispatch:${(0, import_node_crypto46.randomUUID)()}`;
           try {
             await dispatchLedger.insertOpen({
               id: ledgerId,
@@ -200875,6 +201537,31 @@ ${st.detail}
   const automationTimer = setInterval(() => {
     void automationScheduler.tick().catch((err) => console.error(`[automation-scheduler] tick \u5931\u8D25: ${String(err)}`));
   }, 3e4);
+  const eventPollMs = Number(process.env["OASIS_AUTOMATION_EVENT_POLL_MS"] ?? 1e4);
+  let automationEventTimer;
+  if (Number.isFinite(eventPollMs) && eventPollMs > 0) {
+    const eventPoller = new ProjectEventPoller({
+      store: automationStore,
+      service: automations.service,
+      log: (m2) => console.log(m2),
+      batchLimit: envNum("OASIS_AUTOMATION_EVENT_BATCH", 200),
+      // 工单→项目绑定是合法薄旁存（B5），不是内核事实——列项目下的工单只认它。
+      listProjectWorkspaces: async ({ projectId }) => (await artifactStateStore.listWorkspaceBindings()).filter((b2) => b2.projectId === projectId).map((b2) => b2.workOrderId),
+      // 完成判据必须复用 D3 resolver（不复制 deriveStage），且与成员快照同一次读取。
+      workorderSnapshot: async ({ companyId, workspace }) => {
+        const engine2 = await getEngine(companyId);
+        return makeAutomationWorkorderSnapshotResolver(engine2.kernel)(workspace);
+      },
+      // 触发时复查归因主体的项目读取权（与配置期同一口径）。
+      projectReadable: async ({ projectId }) => await projectStateStore.getProject(projectId) !== null
+    });
+    automationEventTimer = setInterval(() => {
+      void eventPoller.tick().catch((err) => console.error(`[project-event-poller] tick \u5931\u8D25: ${String(err)}`));
+    }, eventPollMs);
+    console.log(`[serve] \u9879\u76EE\u4E8B\u4EF6\u8BA2\u9605\u8F6E\u8BE2\u5668\u5DF2\u542F\u7528\uFF08\u6BCF ${Math.round(eventPollMs / 1e3)}s \u4E00\u8F6E\uFF1BOASIS_AUTOMATION_EVENT_POLL_MS=0 \u53EF\u5173\uFF09`);
+  } else {
+    console.log("[serve] \u9879\u76EE\u4E8B\u4EF6\u8BA2\u9605\u8F6E\u8BE2\u5668\u5DF2\u88AB OASIS_AUTOMATION_EVENT_POLL_MS \u663E\u5F0F\u5173\u95ED");
+  }
   let boardWatchTimer;
   const boardWatchFlag = (process.env["OASIS_BOARD_WATCH"] ?? "").trim().toLowerCase();
   if (!["0", "false", "off"].includes(boardWatchFlag)) {
@@ -200900,6 +201587,7 @@ ${st.detail}
       if (orphanSweepTimer) clearInterval(orphanSweepTimer);
       if (zeroOutputBreakerTimer) clearInterval(zeroOutputBreakerTimer);
       clearInterval(automationTimer);
+      if (automationEventTimer) clearInterval(automationEventTimer);
       if (boardWatchTimer) clearInterval(boardWatchTimer);
       clearInterval(serverHeartbeatTimer);
       hub?.close();
@@ -200967,7 +201655,7 @@ var SessionManager = class {
 // ../cli/src/daemon/ws-client.ts
 init_wrapper();
 var import_node_os9 = require("node:os");
-var import_node_crypto46 = require("node:crypto");
+var import_node_crypto47 = require("node:crypto");
 init_src8();
 init_src7();
 
@@ -201279,6 +201967,9 @@ var PENDING_STREAM_MAX = 2e3;
 var AUTH_REJECT_BACKOFF_MAX_MS = 15 * 6e4;
 var AUTH_REJECT_GIVE_UP_AFTER = 3;
 var AUTH_REJECT_RE = /Unexpected server response:\s*(401|403)/;
+var DRAIN_TIMEOUT_MS = 15e3;
+var DRAIN_POLL_MS = 50;
+var sleep4 = (ms) => new Promise((r) => setTimeout(r, ms));
 async function preflightOasisAccess(job) {
   const base = job.server.url.replace(/\/+$/, "");
   try {
@@ -201323,6 +202014,8 @@ var DaemonWsClient = class {
   stopped = false;
   /** 收到 update 但有活跃会话时置真：延后到所有会话结束再自更新，避免打断执行中的 agent。 */
   pendingUpdate = false;
+  /** 停机排空中（见 {@link drain}）：不再接新派发、不再触发延后的自更新。 */
+  draining = false;
   /** 已回 dispatch_received、尚未完成 runtime spawn 的派发；也随 hello 上报供重连对账。 */
   pendingDispatchIds = /* @__PURE__ */ new Set();
   /** setup 期间收到 kill 的派发。spawn 返回后先杀句柄，不得再宣告 session_started。 */
@@ -201379,6 +202072,73 @@ var DaemonWsClient = class {
     if (this.pingTimer) clearInterval(this.pingTimer);
     this.ws?.close();
   }
+  /** 排空中？（观测/测试用） */
+  isDraining() {
+    return this.draining;
+  }
+  /**
+   * 停机排空——在进程退出前，把「在途会话已经死了」这件事告诉服务端。
+   *
+   * ## 为什么必须有这一步（2026-08-25 生产实证）
+   *
+   * 引擎里一条 work 从 `running` 变成别的状态，全后端只有三个入口：收到 `session_exited` 帧走主路
+   * （`serve.ts` 的 work.response 桥）、同一帧走 journal 反查的兜底、以及 scan 里 **30 分钟**的
+   * `work.timeout`。前两个都要求**这一帧真的被发出来**。
+   *
+   * 而这一帧的生成者，是本进程 dispatch 分支里注册的那个 `handle.onExit` 回调——**它住在 daemon
+   * 进程内部**。子进程被杀不会自动产生任何帧；进程一死，回调就再没机会跑。
+   *
+   * 旧行为：SIGTERM handler 只删 pid 文件就 `process.exit(0)`；systemd unit 又没设 `KillMode`，
+   * 默认 `control-group` 把 daemon 和它拉起的所有会话**同时** SIGTERM——父子同死，一帧都发不出去。
+   * 实测 node-6745008c1fc7：5389 次会话起跑里 48 个没有配对退出帧，其中 43 个（90%）是重启带走的；
+   * 每一个都让对应的 work 空转到 30 分钟超时才被判死，控制台全程显示"运行中"。
+   *
+   * ## 做法：让真实退出帧走正路，只有两类才合成
+   *
+   * 不图省事直接合成假帧——`kill()` 掉在途会话，adapter 的 `killReason` 归因成 `cancelled`，既有
+   * `onExit` 正路会带着 `transcriptRef` 把**真实**帧发出去。只有两类兜底才合成：还没 spawn 的派发
+   * （没有子进程可 kill，不可能有真实帧），以及超时后仍未退出的会话（宁可给服务端一帧不精确的死讯，
+   * 也好过让它等满 30 分钟）。
+   *
+   * 排空期间 `draining` 置真：不再接新派发（见 dispatch 分支），也不再触发延后的自更新。
+   */
+  async drain(reason, timeoutMs = DRAIN_TIMEOUT_MS) {
+    if (this.draining) return;
+    this.draining = true;
+    const active = this.sessions.activeSessions();
+    const pending = [...this.pendingDispatchIds];
+    if (active.length === 0 && pending.length === 0) {
+      this.stop();
+      return;
+    }
+    log2("[node-cli]", `\u505C\u673A\u6392\u7A7A\uFF08${reason}\uFF09\uFF1A\u5728\u9014\u4F1A\u8BDD ${active.length} \u4E2A\u3001\u5F85\u8D77\u6D3E\u53D1 ${pending.length} \u4E2A\u2014\u2014\u53D1\u5B8C\u9000\u51FA\u5E27\u518D\u9000\u51FA`);
+    for (const dispatchId of pending) {
+      this.pendingDispatchIds.delete(dispatchId);
+      this.sendKeyFrame(dispatchId, {
+        type: "session_exited",
+        dispatchId,
+        sessionId: "node-shutdown",
+        info: { code: null, reason: "cancelled", errorMessage: `\u8282\u70B9 daemon \u505C\u673A\uFF08${reason}\uFF09\uFF1A\u6D3E\u53D1\u5C1A\u672A\u8D77\u4F1A\u8BDD` }
+      });
+    }
+    await Promise.all(active.map((s2) => this.sessions.kill(s2.dispatchId).catch(() => void 0)));
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline && (this.sessions.activeCount() > 0 || this.outbox.size > 0)) await sleep4(DRAIN_POLL_MS);
+    const stuck = this.sessions.activeSessions();
+    for (const s2 of stuck) {
+      log2("[node-cli]", `  \u26A0 \u4F1A\u8BDD ${s2.sessionId} \u5728 ${timeoutMs}ms \u5185\u6CA1\u9000\u51FA\uFF0C\u6309\u505C\u673A\u5408\u6210\u9000\u51FA\u5E27`);
+      this.sendKeyFrame(s2.dispatchId, {
+        type: "session_exited",
+        dispatchId: s2.dispatchId,
+        sessionId: s2.sessionId,
+        info: { code: null, reason: "cancelled", errorMessage: `\u8282\u70B9 daemon \u505C\u673A\uFF08${reason}\uFF09\uFF1A\u4F1A\u8BDD\u672A\u5728\u6392\u7A7A\u7A97\u53E3\u5185\u9000\u51FA` }
+      });
+    }
+    if (stuck.length > 0) await sleep4(DRAIN_POLL_MS * 4);
+    if (this.outbox.size > 0) log2("[node-cli]", `\u26A0 \u505C\u673A\u6392\u7A7A\u7ED3\u675F\uFF1A\u4ECD\u6709 ${this.outbox.size} \u4E2A\u9000\u51FA\u5E27\u672A\u786E\u8BA4\u9001\u8FBE\uFF08\u8FD9\u4E9B work \u4F1A\u9000\u56DE 30 \u5206\u949F\u8D85\u65F6\u515C\u5E95\uFF09`);
+    else log2("[node-cli]", "\u505C\u673A\u6392\u7A7A\u5B8C\u6210\uFF1A\u5728\u9014\u4F1A\u8BDD\u7684\u9000\u51FA\u5E27\u5747\u5DF2\u786E\u8BA4\u9001\u8FBE");
+    this.stop();
+  }
   connect() {
     if (this.stopped) return;
     const ws = new import_websocket.default(this.serverUrl, {
@@ -201455,6 +202215,16 @@ var DaemonWsClient = class {
         const { dispatchId, job } = msg;
         const t0 = Date.now();
         log2("[node-cli]", `\u2190 dispatch  ${dispatchId}  artifact=${job.artifactId}`);
+        if (this.draining) {
+          log2("[node-cli]", `  \u62D2\u6536\uFF1A\u8282\u70B9\u6B63\u5728\u505C\u673A\u6392\u7A7A \u2192 \u56DE\u9000\u51FA\u5E27\uFF0C\u670D\u52A1\u7AEF\u53EF\u7ACB\u5373\u6539\u6D3E`);
+          this.sendKeyFrame(dispatchId, {
+            type: "session_exited",
+            dispatchId,
+            sessionId: "node-draining",
+            info: { code: null, reason: "cancelled", errorMessage: "\u8282\u70B9\u6B63\u5728\u505C\u673A\u6392\u7A7A\uFF0C\u672C\u6B21\u6D3E\u53D1\u672A\u8D77\u4F1A\u8BDD" }
+          });
+          break;
+        }
         if (this.pendingDispatchIds.has(dispatchId) || this.sessions.get(dispatchId)) {
           this.send({ type: "dispatch_received", dispatchId });
           break;
@@ -201572,6 +202342,10 @@ var DaemonWsClient = class {
           log2("[node-cli]", "\u2190 update \u5FFD\u7565\uFF1A\u672C\u8FDB\u7A0B\u672A\u6CE8\u5165\u81EA\u66F4\u65B0\u903B\u8F91\uFF08\u975E node-daemon \u6258\u7BA1\uFF1F\uFF09");
           break;
         }
+        if (this.draining) {
+          log2("[node-cli]", "\u2190 update \u5FFD\u7565\uFF1A\u672C\u8FDB\u7A0B\u6B63\u5728\u505C\u673A\u6392\u7A7A");
+          break;
+        }
         const active = this.sessions.activeCount();
         if (active > 0) {
           this.pendingUpdate = true;
@@ -201592,7 +202366,7 @@ var DaemonWsClient = class {
    */
   async queryArtifactStates(artifactIds, timeoutMs = 15e3) {
     if (artifactIds.length === 0) return {};
-    const requestId = (0, import_node_crypto46.randomUUID)();
+    const requestId = (0, import_node_crypto47.randomUUID)();
     return new Promise((resolve10, reject) => {
       const timer = setTimeout(() => {
         this.gcPending.delete(requestId);
@@ -201659,6 +202433,7 @@ var DaemonWsClient = class {
   }
   /** 会话结束后调用：若之前收到过 update 但因忙延后了,且现已空闲,则触发自更新。 */
   maybeRunPendingUpdate() {
+    if (this.draining) return;
     if (this.pendingUpdate && this.sessions.activeCount() === 0) {
       this.pendingUpdate = false;
       log2("[node-cli]", "\u6240\u6709\u4F1A\u8BDD\u5DF2\u7ED3\u675F,\u6267\u884C\u5EF6\u540E\u7684\u66F4\u65B0\uFF1A\u62C9\u53D6\u6700\u65B0\u7248\u672C\u5E76\u91CD\u542F");
@@ -201822,6 +202597,7 @@ async function startNode(opts) {
   });
   console.log(`[oasis node] ${opts.nodeId} \u2192 ${opts.serverUrl}`);
   client.start();
+  opts.onReady?.({ drain: (reason) => client.drain(reason) });
   const { workRoot, legacyRoot } = resolveWorkRoots(opts.workRoot);
   const workRootIsEphemeral = workRoot.startsWith(import_node_os11.default.tmpdir());
   if (opts.gcEnabled === false && !workRootIsEphemeral) {
@@ -201929,7 +202705,7 @@ function forwardSignal(child, sig, killGroup = (pgid, signal) => {
 // ../cli/src/daemon/machine-id.ts
 var import_node_child_process17 = require("node:child_process");
 var import_node_fs21 = require("node:fs");
-var import_node_crypto47 = require("node:crypto");
+var import_node_crypto48 = require("node:crypto");
 var import_node_os12 = require("node:os");
 function linuxMachineId() {
   for (const p2 of ["/etc/machine-id", "/var/lib/dbus/machine-id"]) {
@@ -201995,7 +202771,7 @@ var defaultSources = {
 function resolveNodeId(sources = {}) {
   const s2 = { ...defaultSources, ...sources };
   const material = `${s2.machineFingerprint()}:${s2.osUser()}`;
-  const digest = (0, import_node_crypto47.createHash)("sha256").update(material).digest("hex").slice(0, 12);
+  const digest = (0, import_node_crypto48.createHash)("sha256").update(material).digest("hex").slice(0, 12);
   return `node-${digest}`;
 }
 
@@ -202329,17 +203105,22 @@ var COMMAND_DECLS = {
   },
   "automation-trigger-add": {
     group: "\u81EA\u52A8\u5316",
-    usage: "oasis automation-trigger-add <id> --kind schedule|webhook [--cron <expr> --tz <tz>] [--provider generic|github] [--label <\u540D>]",
-    description: "\u7ED9\u81EA\u52A8\u5316\u8FFD\u52A0\u4E00\u6761\u89E6\u53D1\u5668\uFF08\u4E00\u6761\u81EA\u52A8\u5316\u53EF\u6302\u591A\u4E2A\uFF09\u3002",
+    usage: "oasis automation-trigger-add <id> --kind schedule|webhook|event [--cron <expr> --tz <tz>] [--provider generic|github] [--project <projectId> --event workorder.completed] [--label <\u540D>]",
+    description: "\u7ED9\u81EA\u52A8\u5316\u8FFD\u52A0\u4E00\u6761\u89E6\u53D1\u5668\uFF08\u4E00\u6761\u81EA\u52A8\u5316\u53EF\u6302\u591A\u4E2A\uFF09\u3002event=\u8BA2\u9605\u9879\u76EE\uFF1A\u8BE5\u9879\u76EE\u4E0B\u5DE5\u5355\u5B8C\u6210\u65F6\u89E6\u53D1\u4E00\u6B21\uFF1B\u65B0\u5EFA\u540E\u5148\u8DD1\u4E00\u6B21\u57FA\u7EBF\u5BF9\u9F50\uFF08\u4E0D\u56DE\u653E\u5386\u53F2\uFF09\uFF0C\u5BF9\u9F50\u5B8C\u81EA\u52A8\u542F\u7528\u3002",
     positional: [{ name: "<id>", required: true, desc: "\u81EA\u52A8\u5316 id" }],
     flags: [
-      { name: "kind", desc: "schedule|webhook\uFF08\u9ED8\u8BA4 schedule\uFF09" },
+      { name: "kind", desc: "schedule|webhook|event\uFF08\u9ED8\u8BA4 schedule\uFF09" },
       { name: "cron", desc: "5 \u5B57\u6BB5 cron\uFF08schedule \u5FC5\u586B\uFF09" },
       { name: "tz", desc: "IANA \u65F6\u533A\uFF08\u9ED8\u8BA4 UTC\uFF09" },
       { name: "provider", desc: "webhook provider\uFF1Ageneric|github" },
+      { name: "project", desc: "\u8BA2\u9605\u7684\u9879\u76EE id\uFF08event \u5FC5\u586B\uFF1Bschedule/webhook \u4E0D\u63A5\u53D7\uFF09" },
+      { name: "event", desc: "\u8BA2\u9605\u7684\u4E8B\u4EF6\u540D\uFF08event \u5FC5\u586B\uFF0C\u53EF\u91CD\u590D\u6216\u9017\u53F7\u5206\u9694\uFF1B\u672C\u671F\u53EA\u6709 workorder.completed\uFF09" },
       { name: "label", desc: "\u663E\u793A\u540D" }
     ],
-    examples: ['oasis automation-trigger-add auto_abc123 --kind schedule --cron "0 18 * * 5" --tz Asia/Shanghai']
+    examples: [
+      'oasis automation-trigger-add auto_abc123 --kind schedule --cron "0 18 * * 5" --tz Asia/Shanghai',
+      "oasis automation-trigger-add auto_abc123 --kind event --project oasis --event workorder.completed"
+    ]
   },
   "automation-trigger-update": {
     group: "\u81EA\u52A8\u5316",
@@ -203607,13 +204388,13 @@ function ownFlagsFromDecl(command) {
 }
 
 // ../cli/src/connector-effect-runner.ts
-var import_node_crypto48 = require("node:crypto");
+var import_node_crypto49 = require("node:crypto");
 var import_node_child_process18 = require("node:child_process");
 init_src8();
 function stableKey(effect) {
   const keyFields = Object.fromEntries(Object.entries(effect.keyFields).sort(([a], [b2]) => a.localeCompare(b2)));
   const canonical = JSON.stringify({ kind: effect.kind, target: effect.target, keyFields });
-  return `sha256:${(0, import_node_crypto48.createHash)("sha256").update(canonical).digest("hex")}`;
+  return `sha256:${(0, import_node_crypto49.createHash)("sha256").update(canonical).digest("hex")}`;
 }
 async function runConnectorEffect(connector, toolArgs, deps) {
   const effect = connector.describeExternalEffect?.(toolArgs) ?? null;
@@ -204208,7 +204989,7 @@ async function runCli(argv, println = console.log, progressln = console.error) {
     const store = createNodeTokenStore(path28.join(dir, "node-tokens.json"));
     const sub = positional[0];
     if (sub === "issue") {
-      const id = flags.get("id") ?? `node-${(0, import_node_crypto49.randomUUID)()}`;
+      const id = flags.get("id") ?? `node-${(0, import_node_crypto50.randomUUID)()}`;
       const token2 = store.issue(id);
       println(token2);
       process.stderr.write(
@@ -204821,10 +205602,36 @@ ${p2.ref}  ${p2.name}`);
       break;
     }
     case "automation-trigger-add": {
-      const id = needPos(positional, 0, "oasis automation-trigger-add <id> --kind schedule|webhook ...");
+      const id = needPos(positional, 0, "oasis automation-trigger-add <id> --kind schedule|webhook|event ...");
       const kind = flags.get("kind") ?? "schedule";
-      const body = kind === "schedule" ? { kind, schedule: { cron: need(flags, "cron"), tz: flags.get("tz") ?? "UTC" }, ...flags.has("label") ? { label: flags.get("label") } : {} } : { kind, webhook: { provider: flags.get("provider") ?? "generic" }, ...flags.has("label") ? { label: flags.get("label") } : {} };
-      println(JSON.stringify(await api.post(`/api/automations/${encodeURIComponent(id)}/triggers`, body), null, 2));
+      if (kind !== "schedule" && kind !== "webhook" && kind !== "event") {
+        throw new Error(`--kind \u53EA\u80FD\u662F schedule\u3001webhook \u6216 event\uFF08\u6536\u5230 ${kind}\uFF09`);
+      }
+      if (kind !== "event" && (flags.has("project") || flags.has("event"))) {
+        throw new Error(`--project / --event \u53EA\u7528\u4E8E --kind event\uFF08\u5F53\u524D --kind ${kind}\uFF09`);
+      }
+      if (kind === "event" && (flags.has("cron") || flags.has("tz") || flags.has("provider"))) {
+        throw new Error("--kind event \u4E0D\u63A5\u53D7 --cron / --tz / --provider");
+      }
+      const label = flags.has("label") ? { label: flags.get("label") } : {};
+      let body;
+      if (kind === "schedule") {
+        body = { kind, schedule: { cron: need(flags, "cron"), tz: flags.get("tz") ?? "UTC" }, ...label };
+      } else if (kind === "webhook") {
+        body = { kind, webhook: { provider: flags.get("provider") ?? "generic" }, ...label };
+      } else {
+        const events = (flags.get("event") ?? "").split(",").map((x2) => x2.trim()).filter(Boolean);
+        if (!events.length) throw new Error("--kind event \u9700\u8981\u81F3\u5C11\u4E00\u4E2A --event\uFF08\u5982 --event workorder.completed\uFF09");
+        body = { kind, event: { source: "project", projectId: need(flags, "project"), events }, ...label };
+      }
+      const created = await api.post(
+        `/api/automations/${encodeURIComponent(id)}/triggers`,
+        body
+      );
+      println(JSON.stringify(created, null, 2));
+      if (kind === "event" && created.event?.baselineState === "aligning") {
+        println("\u2139 \u8BA2\u9605\u5DF2\u5EFA\uFF0C\u6B63\u5728\u5BF9\u9F50\u57FA\u7EBF\uFF1A\u628A\u9879\u76EE\u91CC**\u5DF2\u5B8C\u6210**\u7684\u5DE5\u5355\u8BB0\u4E3A\u300C\u5DF2\u77E5\u300D\uFF0C\u5BF9\u9F50\u5B8C\u81EA\u52A8\u542F\u7528\u3002\u5386\u53F2\u5DE5\u5355\u4E0D\u4F1A\u88AB\u8865\u89E6\u53D1\u3002");
+      }
       break;
     }
     case "automation-trigger-update": {
@@ -206673,12 +207480,12 @@ var LEGACY_SYSTEMD_UNIT = "oasis-node.service";
 var LEGACY_LAUNCHD_LABEL = "com.oasis.node";
 
 // src/install.ts
-var import_node_crypto50 = require("node:crypto");
+var import_node_crypto51 = require("node:crypto");
 var fs37 = __toESM(require("node:fs"));
 var path31 = __toESM(require("node:path"));
 function versionLabel(sourceFile, pkgVersion, npmPrefixDir) {
   if (isFromNpmPrefix(sourceFile, npmPrefixDir)) return pkgVersion;
-  const digest = (0, import_node_crypto50.createHash)("sha256").update(fs37.readFileSync(sourceFile)).digest("hex").slice(0, 8);
+  const digest = (0, import_node_crypto51.createHash)("sha256").update(fs37.readFileSync(sourceFile)).digest("hex").slice(0, 8);
   return `${pkgVersion}+local.${digest}`;
 }
 function isFromNpmPrefix(sourceFile, npmPrefixDir) {
@@ -206758,6 +207565,37 @@ function gcVersions(versionsDirPath, opts) {
   }
   return deleted;
 }
+function systemdUnitText(o) {
+  return [
+    "[Unit]",
+    `Description=Oasis Node Daemon (${o.name})`,
+    "After=network.target",
+    "",
+    // OASIS_CLI_HOME 由 daemon 继承给它 spawn 的 agent 会话——非 default 实例的会话因此
+    // 用的是**本实例**的 CLI 版本，而不是 PATH 上那个默认指向 default 的 shim。
+    // （台阶 3 的 D4 后半截会把它细到「每个会话钉 spawn 那一刻的版本」，这里先钉到实例。）
+    "[Service]",
+    `ExecStart=${o.cmd}`,
+    `Environment=PATH=${o.daemonPath}`,
+    `Environment=OASIS_CLI_HOME=${o.cliHome}`,
+    `StandardOutput=append:${o.logFile}`,
+    `StandardError=append:${o.logFile}`,
+    "Restart=on-failure",
+    "RestartSec=5",
+    // 🚨 停机时只 SIGTERM 主进程，子会话留给 daemon 自己收——它要先给每个在途会话发 session_exited，
+    // 那是服务端唯一的死亡通知渠道（生成者是 daemon 进程内的 onExit 回调）。
+    // systemd 默认的 KillMode=control-group 会把 daemon 和它拉起的所有 claude 会话**同时**杀掉：
+    // 父子同死，一帧都发不出去，对应的 work 只能空转到 scan 的 30 分钟超时才被判死。
+    // 实测占本机孤儿会话的 90%（43/48）。详见 change-record 20260825-daemon-restart-swallows-exit-frames。
+    // TimeoutStopSec 必须明显大于排空预算 DRAIN_TIMEOUT_MS(15s)，否则排空没做完就被 SIGKILL。
+    "KillMode=mixed",
+    "TimeoutStopSec=30",
+    "",
+    "[Install]",
+    "WantedBy=default.target",
+    ""
+  ].join("\n");
+}
 function shimScript() {
   return [
     "#!/bin/sh",
@@ -206770,7 +207608,7 @@ function shimScript() {
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.117" : "dev";
+var PKG_VERSION = true ? "0.1.119" : "dev";
 var LOCAL_BIN = localBin();
 var NPM_PREFIX = npmPrefix();
 var INSTANCE = DEFAULT_INSTANCE;
@@ -206852,9 +207690,8 @@ function ensureRuntimeAssets(targetDir = BIN_DIR) {
     console.error(`[oasis] connector runtime assets: \u4ECE ${synced.from} \u540C\u6B65\u4E86 ${synced.copied} \u4E2A .sh \u5230 ${targetDir}`);
   }
 }
-function installSoftware() {
+function installSoftware(label) {
   const src = process.argv[1];
-  const label = versionLabel(src, PKG_VERSION, NPM_PREFIX);
   const vDir = versionDir(label);
   installBinaryAtomic(src, path32.join(vDir, "oasis.js"));
   ensureRuntimeAssets(vDir);
@@ -206885,27 +207722,13 @@ function setupAutostart(name) {
     fs38.mkdirSync(unitDir, { recursive: true });
     const unit = systemdUnitName(name);
     fs38.mkdirSync(path32.dirname(inst.logFile), { recursive: true });
-    fs38.writeFileSync(path32.join(unitDir, unit), [
-      "[Unit]",
-      `Description=Oasis Node Daemon (${name})`,
-      "After=network.target",
-      "",
-      // OASIS_CLI_HOME 由 daemon 继承给它 spawn 的 agent 会话——非 default 实例的会话因此
-      // 用的是**本实例**的 CLI 版本，而不是 PATH 上那个默认指向 default 的 shim。
-      // （台阶 3 的 D4 后半截会把它细到「每个会话钉 spawn 那一刻的版本」，这里先钉到实例。）
-      "[Service]",
-      `ExecStart=${cmd}`,
-      `Environment=PATH=${daemonPath}`,
-      `Environment=OASIS_CLI_HOME=${inst.currentLink}`,
-      `StandardOutput=append:${inst.logFile}`,
-      `StandardError=append:${inst.logFile}`,
-      "Restart=on-failure",
-      "RestartSec=5",
-      "",
-      "[Install]",
-      "WantedBy=default.target",
-      ""
-    ].join("\n"));
+    fs38.writeFileSync(path32.join(unitDir, unit), systemdUnitText({
+      name,
+      cmd,
+      daemonPath,
+      cliHome: inst.currentLink,
+      logFile: inst.logFile
+    }));
     if (name === DEFAULT_INSTANCE) {
       try {
         (0, import_node_child_process19.execSync)(`systemctl --user disable --now ${LEGACY_SYSTEMD_UNIT} 2>/dev/null`, { stdio: "ignore" });
@@ -206992,20 +207815,12 @@ function stopDaemon(name) {
     }
   }
 }
-function selfUpdate(opts = {}) {
+function selfUpdate() {
   const cfg = readConfig();
   if (!cfg?.serverUrl) throw new Error("no config \u2014 run `oasis daemon start` first");
-  if (cfg.pinnedVersion && !opts.force) {
-    console.error(`[oasis] \u5B9E\u4F8B ${INSTANCE} \u5DF2\u9489\u5728 ${cfg.pinnedVersion}\uFF0C\u8DF3\u8FC7\u81EA\u66F4\u65B0\uFF08\u8981\u89E3\u9664\uFF1Aoasis daemon update --instance ${INSTANCE} --force\uFF09`);
-    return false;
-  }
-  if (cfg.pinnedVersion && opts.force) {
-    saveConfig({ ...cfg, pinnedVersion: void 0 });
-    console.error(`[oasis] --force\uFF1A\u5DF2\u89E3\u9664 ${INSTANCE} \u7684\u7248\u672C\u9489\u6B7B\uFF08\u539F ${cfg.pinnedVersion}\uFF09`);
-  }
   const nameArg = cfg.name ? ` --name '${cfg.name.replace(/'/g, "'\\''")}'` : "";
   const oasisBin = path32.join(NPM_PREFIX, "bin", "oasis");
-  const startCmd = `"${oasisBin}" daemon start --instance ${INSTANCE} --server-ws '${cfg.serverUrl}'${nameArg}`;
+  const startCmd = `"${oasisBin}" daemon start --upgrade --instance ${INSTANCE} --server-ws '${cfg.serverUrl}'${nameArg}`;
   const OFFICIAL = "https://registry.npmjs.org/";
   const installOfficial = `npm install -g --prefer-online --registry '${OFFICIAL}' --prefix '${NPM_PREFIX}' '${PKG_NAME}@latest'`;
   const installFallback = `npm install -g --prefer-online --prefix '${NPM_PREFIX}' '${PKG_NAME}@latest'`;
@@ -207030,7 +207845,6 @@ function selfUpdate(opts = {}) {
     const child = (0, import_node_child_process19.spawn)("sh", ["-c", inner], { detached: true, stdio: ["ignore", log3, log3] });
     child.unref();
   }
-  return true;
 }
 function resolveInstance(explicit) {
   if (!explicit) return DEFAULT_INSTANCE;
@@ -207040,6 +207854,103 @@ function resolveInstance(explicit) {
   }
   return explicit;
 }
+function currentLabelOf(inst) {
+  try {
+    return path32.basename(fs38.realpathSync(inst.currentLink));
+  } catch {
+    return null;
+  }
+}
+function instanceHasSoftware(inst) {
+  return fs38.existsSync(inst.binFile) && currentLabelOf(inst) !== null;
+}
+function newInstanceName() {
+  const existing = new Set(listInstances());
+  if (!existing.has(DEFAULT_INSTANCE)) return DEFAULT_INSTANCE;
+  for (; ; ) {
+    const n = `inst-${(0, import_node_crypto52.randomBytes)(3).toString("hex")}`;
+    if (!existing.has(n)) return n;
+  }
+}
+function planStart(explicit, serverUrl) {
+  if (explicit) {
+    const name = resolveInstance(explicit);
+    return { mode: fs38.existsSync(instancePaths(name).configFile) ? "resume" : "new", names: [name] };
+  }
+  const all = listInstances();
+  if (all.length === 0) return { mode: "new", names: [DEFAULT_INSTANCE] };
+  const want = normalizeServerUrl(serverUrl);
+  const hits = all.filter((n) => {
+    const c = readConfigAt(instancePaths(n).configFile);
+    return !!c?.serverUrl && normalizeServerUrl(c.serverUrl) === want;
+  });
+  if (hits.length === 0) return { mode: "new", names: [newInstanceName()] };
+  return { mode: "resume", names: hits };
+}
+async function startOneInstance(o) {
+  const { serverUrl, upgrade, flags } = o;
+  const prev = readConfig();
+  if (prev?.serverUrl && normalizeServerUrl(prev.serverUrl) !== normalizeServerUrl(serverUrl)) {
+    console.error(`[oasis] \u26A0 \u5B9E\u4F8B "${INSTANCE}" \u539F\u672C\u8FDE ${prev.serverUrl}\uFF0C\u672C\u6B21\u5C06\u6539\u8FDE ${serverUrl}\u2014\u2014\u8FD9\u662F**\u8FC1\u79FB**\u4E0D\u662F\u65B0\u589E\u3002`);
+    console.error(`[oasis]   \u60F3\u8BA9\u4E24\u4E2A\u63A7\u5236\u9762\u5E76\u5B58\uFF0C\u8BF7\u4E2D\u6B62\uFF08Ctrl-C\uFF09\u5E76\u6539\u7528\uFF1A`);
+    console.error(`[oasis]   oasis daemon start --instance <\u65B0\u540D\u5B57> --server-ws ${serverUrl} --enroll-token <ent_...>`);
+  }
+  const serverChanged = !!prev?.serverUrl && prev.serverUrl !== serverUrl;
+  let nodeId = serverChanged ? void 0 : prev?.nodeId;
+  let token = serverChanged ? flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] : flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] ?? prev?.token;
+  const enrollToken = o.mode === "new" ? flags.get("enroll-token") ?? process.env["OASIS_ENROLL_TOKEN"] : void 0;
+  const derivedNodeId = derivedNodeIdFor(INSTANCE);
+  if (enrollToken) {
+    const res = await fetch(`${httpBase(serverUrl)}/api/nodes/exchange`, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({ enrollToken, nodeId: derivedNodeId, hostname: os13.hostname() })
+    });
+    if (!res.ok) throw new Error(`enroll token exchange failed: HTTP ${res.status}`);
+    const body = await res.json();
+    token = body.token;
+    nodeId = body.nodeId;
+  } else if (prev?.nodeId && prev?.token && !serverChanged) {
+    nodeId = prev.nodeId;
+    token = prev.token;
+  }
+  if (!token || !nodeId) {
+    console.error("Usage: oasis daemon start --server-ws <wss://...> (--enroll-token <ent_...> | --token <ont_...>) [--name <name>] [--instance <name>] [--upgrade]");
+    process.exit(1);
+  }
+  const name = o.applyName ? flags.get("name") ?? prev?.name : prev?.name;
+  const nameChanged = prev?.name !== void 0 && name !== prev.name;
+  saveConfig({ serverUrl, token, nodeId, ...name ? { name } : {}, reportRuntimesOnNextStart: true });
+  const before = currentLabelOf(INST);
+  let label = before;
+  if (!instanceHasSoftware(INST) || upgrade) {
+    const next = versionLabel(process.argv[1], PKG_VERSION, NPM_PREFIX);
+    if (before && isLocalLabel(before) && before !== next) {
+      console.log(`  \u26A0 \u5373\u5C06\u7528 ${next} \u8986\u76D6\u672C\u5B9E\u4F8B\u6B63\u5728\u8DD1\u7684\u672C\u5730\u6784\u5EFA ${before}`);
+    }
+    label = installSoftware(next);
+  } else {
+    fs38.mkdirSync(path32.dirname(LOCAL_BIN), { recursive: true });
+    fs38.writeFileSync(LOCAL_BIN, shimScript(), { mode: 493 });
+  }
+  const pidNow = readPid();
+  const alive = !!pidNow && isRunning2(pidNow);
+  if (alive && label === before && !serverChanged && !nameChanged) {
+    console.log(`\u2713 ${INSTANCE}\uFF1A\u5DF2\u5728\u8DD1\uFF08PID ${pidNow}\uFF0C${label ?? "?"}\uFF09\uFF0C\u7248\u672C\u4E0E\u914D\u7F6E\u5747\u672A\u53D8\uFF0C\u672A\u91CD\u542F`);
+    return;
+  }
+  stopDaemon(INSTANCE);
+  const tookOver = setupAutostart(INSTANCE);
+  const suffix = nameChanged ? `  [name updated: ${prev.name} \u2192 ${name}]` : "";
+  if (!tookOver) {
+    const pid = spawnDaemon();
+    console.log(`\u2713 daemon started (instance ${INSTANCE}, PID ${pid})${suffix}`);
+  } else {
+    console.log(`\u2713 daemon started via systemd (${systemdUnitName(INSTANCE)})${suffix}`);
+  }
+  console.log(`  instance: ${INSTANCE}  nodeId: ${nodeId}  version: ${label ?? "?"}  config: ${INST.configFile}`);
+  console.log(`  logs: tail -f ${LOG_FILE}`);
+}
 function derivedNodeIdFor(name) {
   if (name === DEFAULT_INSTANCE) return resolveNodeId();
   const user = (() => {
@@ -207087,19 +207998,32 @@ void (async () => {
     }
     const cleanup = () => {
       try {
-        fs38.unlinkSync(PID_FILE);
+        if (fs38.readFileSync(PID_FILE, "utf8").trim() === String(process.pid)) fs38.unlinkSync(PID_FILE);
       } catch {
       }
     };
     process.on("exit", cleanup);
-    process.on("SIGTERM", () => {
-      cleanup();
-      process.exit(0);
-    });
-    process.on("SIGINT", () => {
-      cleanup();
-      process.exit(0);
-    });
+    let drainNode = null;
+    let shuttingDown = false;
+    const shutdown = (signal) => {
+      if (shuttingDown) {
+        console.error(`[oasis] \u6536\u5230\u7B2C\u4E8C\u6B21 ${signal}\uFF1A\u653E\u5F03\u6392\u7A7A\uFF0C\u7ACB\u5373\u9000\u51FA`);
+        cleanup();
+        process.exit(0);
+      }
+      shuttingDown = true;
+      void (async () => {
+        try {
+          await drainNode?.(signal);
+        } catch (e) {
+          console.error("[oasis] \u505C\u673A\u6392\u7A7A\u5931\u8D25\uFF08\u5728\u9014\u4F1A\u8BDD\u7684\u9000\u51FA\u5E27\u53EF\u80FD\u6CA1\u53D1\u51FA\u53BB\uFF09:", String(e));
+        }
+        cleanup();
+        process.exit(0);
+      })();
+    };
+    process.on("SIGTERM", () => shutdown("SIGTERM"));
+    process.on("SIGINT", () => shutdown("SIGINT"));
     const cleanPath = sanitizeDaemonPath(process.env["PATH"]);
     if (cleanPath !== process.env["PATH"]) {
       console.error(`[oasis] daemon PATH \u5DF2\u6E05\u6D17\uFF1A\u5254\u9664 agent \u4F1A\u8BDD\u4E34\u65F6 wrapper \u76EE\u5F55 ${(process.env["PATH"] ?? "").split(":").length - cleanPath.split(":").length} \u6761`);
@@ -207139,66 +208063,33 @@ void (async () => {
         } catch (e) {
           console.error("[oasis] self-update failed:", String(e));
         }
+      },
+      onReady: (ctl) => {
+        drainNode = ctl.drain;
       }
     });
     return;
   }
   if (dsub === "start") {
+    const explicit = flags.get("instance") || void 0;
+    const upgrade = flags.has("upgrade");
     const serverUrlFlag = flags.get("server-ws") ?? process.env["OASIS_SERVER_WS"];
-    useInstance(resolveInstance(flags.get("instance")));
-    const prev = readConfig();
-    const serverUrl = serverUrlFlag ?? prev?.serverUrl;
+    const probe = explicit ?? listInstances()[0] ?? DEFAULT_INSTANCE;
+    const serverUrl = serverUrlFlag ?? readConfigAt(instancePaths(probe).configFile)?.serverUrl;
     if (!serverUrl) {
-      console.error("Usage: oasis daemon start --server-ws <wss://...> (--enroll-token <ent_...> | --token <ont_...>) [--name <name>] [--instance <name>]");
-      process.exit(1);
-    }
-    if (!flags.get("instance") && prev?.serverUrl && normalizeServerUrl(prev.serverUrl) !== normalizeServerUrl(serverUrl)) {
-      console.error(`[oasis] \u26A0 \u5B9E\u4F8B "${INSTANCE}" \u539F\u672C\u8FDE ${prev.serverUrl}\uFF0C\u672C\u6B21\u5C06\u6539\u8FDE ${serverUrl}\u2014\u2014\u8FD9\u662F**\u8FC1\u79FB**\u4E0D\u662F\u65B0\u589E\u3002`);
-      console.error(`[oasis]   \u60F3\u8BA9\u4E24\u4E2A\u63A7\u5236\u9762\u5E76\u5B58\uFF0C\u8BF7\u4E2D\u6B62\uFF08Ctrl-C\uFF09\u5E76\u6539\u7528\uFF1A`);
-      console.error(`[oasis]   oasis daemon start --instance <\u65B0\u540D\u5B57> --server-ws ${serverUrl} --enroll-token <ent_...>`);
-    }
-    const serverChanged = !!prev?.serverUrl && prev.serverUrl !== serverUrl;
-    let nodeId = serverChanged ? void 0 : prev?.nodeId;
-    let token = serverChanged ? flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] : flags.get("token") ?? process.env["OASIS_NODE_TOKEN"] ?? prev?.token;
-    const enrollToken = flags.get("enroll-token") ?? process.env["OASIS_ENROLL_TOKEN"];
-    const derivedNodeId = derivedNodeIdFor(INSTANCE);
-    if (enrollToken) {
-      const res = await fetch(`${httpBase(serverUrl)}/api/nodes/exchange`, {
-        method: "POST",
-        headers: { "content-type": "application/json" },
-        body: JSON.stringify({ enrollToken, nodeId: derivedNodeId, hostname: os13.hostname() })
-      });
-      if (!res.ok) throw new Error(`enroll token exchange failed: HTTP ${res.status}`);
-      const body = await res.json();
-      token = body.token;
-      nodeId = body.nodeId;
-    } else if (prev?.nodeId && prev?.token && !serverChanged) {
-      nodeId = prev.nodeId;
-      token = prev.token;
-    }
-    if (!token || !nodeId) {
-      console.error("Usage: oasis daemon start --server-ws <wss://...> (--enroll-token <ent_...> | --token <ont_...>) [--name <name>] [--instance <name>]");
+      console.error("Usage: oasis daemon start --server-ws <wss://...> (--enroll-token <ent_...> | --token <ont_...>) [--name <name>] [--instance <name>] [--upgrade]");
       process.exit(1);
     }
-    const name = flags.get("name") ?? prev?.name;
-    const nameChanged = prev?.name !== void 0 && name !== prev.name;
-    saveConfig({ serverUrl, token, nodeId, ...name ? { name } : {}, reportRuntimesOnNextStart: true });
-    const installedLabel = installSoftware();
-    if (isLocalLabel(installedLabel)) {
-      saveConfig({ ...readConfig(), pinnedVersion: installedLabel });
-      console.log(`  \u672C\u5730\u6784\u5EFA \u2192 \u5DF2\u9489\u7248\u672C ${installedLabel}\uFF08\u81EA\u66F4\u65B0\u5BF9\u672C\u5B9E\u4F8B\u5931\u6548\uFF1B\u89E3\u9664\uFF1Aoasis daemon update --instance ${INSTANCE} --force\uFF09`);
+    const plan = planStart(explicit, serverUrl);
+    if (plan.mode === "resume" && plan.names.length > 1) {
+      console.log(`\u2192 \u672C\u673A\u6709 ${plan.names.length} \u4E2A\u5B9E\u4F8B\u8FDE\u7740\u8BE5\u670D\u52A1\u7AEF\uFF0C\u9010\u4E2A\u6062\u590D\uFF1A${plan.names.join(", ")}`);
+    } else if (plan.mode === "new" && !explicit && listInstances().length > 0) {
+      console.log(`\u2192 \u672C\u673A\u5DF2\u6709\u5B9E\u4F8B\uFF08${listInstances().join(", ")}\uFF09\uFF0C\u4F46\u90FD\u4E0D\u8FDE\u8BE5\u670D\u52A1\u7AEF\uFF1B\u65B0\u5EFA\u5B9E\u4F8B ${plan.names[0]}`);
     }
-    stopDaemon(INSTANCE);
-    const tookOver = setupAutostart(INSTANCE);
-    const suffix = `${nameChanged ? `  [name updated: ${prev.name} \u2192 ${name}]` : ""}`;
-    if (!tookOver) {
-      const pid = spawnDaemon();
-      console.log(`\u2713 daemon started (instance ${INSTANCE}, PID ${pid})${suffix}`);
-    } else {
-      console.log(`\u2713 daemon started via systemd (${systemdUnitName(INSTANCE)})${suffix}`);
+    for (const name of plan.names) {
+      useInstance(name);
+      await startOneInstance({ mode: plan.mode, serverUrl, upgrade, flags, applyName: plan.names.length === 1 });
     }
-    console.log(`  instance: ${INSTANCE}  nodeId: ${nodeId}  config: ${INST.configFile}`);
-    console.log(`  logs: tail -f ${LOG_FILE}`);
     if (!process.env["PATH"]?.includes(path32.dirname(LOCAL_BIN)))
       console.log(`  add to PATH: echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.bashrc && source ~/.bashrc`);
     return;
@@ -207226,13 +208117,13 @@ void (async () => {
       console.error("no config \u2014 run `oasis daemon start` first");
       process.exit(1);
     }
-    const forced = flags.has("force") || dargs.includes("--force");
-    console.log(`\u2192 \u66F4\u65B0 ${PKG_NAME} \u5230\u6700\u65B0\u7248\u672C\u5E76\u91CD\u542F\u8282\u70B9\u2026${forced ? "\uFF08--force\uFF1A\u5FFD\u7565\u5E76\u89E3\u9664\u7248\u672C\u9489\u6B7B\uFF09" : ""}`);
-    if (selfUpdate({ force: forced })) {
-      console.log(`\u2713 \u66F4\u65B0\u5DF2\u89E6\u53D1\uFF08\u540E\u53F0\u62C9\u53D6 ${PKG_NAME}@latest \u5E76\u91CD\u542F\uFF09\uFF1B\u67E5\u770B\u65E5\u5FD7\uFF1Atail -f ${LOG_FILE}`);
-    } else {
-      console.log(`\uFF08\u672A\u89E6\u53D1\u66F4\u65B0\u2014\u2014\u672C\u5B9E\u4F8B\u5DF2\u9489\u7248\u672C\uFF09`);
+    const cur = currentLabelOf(INST);
+    if (cur && isLocalLabel(cur)) {
+      console.log(`  \u26A0 \u672C\u5B9E\u4F8B\u73B0\u5728\u8DD1\u7684\u662F\u672C\u5730\u6784\u5EFA ${cur}\uFF0C\u672C\u6B21\u66F4\u65B0\u4F1A\u7528 ${PKG_NAME}@latest \u8986\u76D6\u5B83\u3002`);
     }
+    console.log(`\u2192 \u66F4\u65B0 ${PKG_NAME} \u5230\u6700\u65B0\u7248\u672C\u5E76\u91CD\u542F\u8282\u70B9\u2026`);
+    selfUpdate();
+    console.log(`\u2713 \u66F4\u65B0\u5DF2\u89E6\u53D1\uFF08\u540E\u53F0\u62C9\u53D6 ${PKG_NAME}@latest \u5E76\u91CD\u542F\uFF09\uFF1B\u67E5\u770B\u65E5\u5FD7\uFF1Atail -f ${LOG_FILE}`);
     return;
   }
   if (dsub === "status") {