@arcships/morula-runtime 0.1.0-alpha.3 → 0.1.0-alpha.4

package/dist/index.js

@@ -362,6 +362,66 @@ var init_portal_server = __esm({
   }
 });
 
+// src/daemon/dim-locate.ts
+import { accessSync, constants } from "node:fs";
+import { homedir as homedir4 } from "node:os";
+import { join as join6 } from "node:path";
+function isExecutable(p) {
+  try {
+    accessSync(p, constants.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function knownDimLocations() {
+  const home = homedir4();
+  return [
+    "/Applications/DimAgent.app/Contents/Resources/runtime/cli/dim",
+    "/Applications/Dim.app/Contents/Resources/runtime/cli/dim",
+    join6(home, "Applications", "DimAgent.app", "Contents", "Resources", "runtime", "cli", "dim"),
+    join6(home, ".dimcode", "bin", "dim"),
+    join6(home, ".local", "bin", "dim")
+  ];
+}
+function resolveDimCandidates(primary) {
+  const out = [];
+  const push = (p) => {
+    if (p && !out.includes(p))
+      out.push(p);
+  };
+  push(primary);
+  for (const c of knownDimLocations())
+    push(c);
+  for (const dir of (process.env.PATH ?? "").split(":").filter(Boolean))
+    push(join6(dir, "dim"));
+  return out;
+}
+function resolveDimBinary() {
+  const explicit = process.env.MORULA_DIM_PATH?.trim();
+  if (explicit) {
+    return isExecutable(explicit) ? explicit : "dim";
+  }
+  for (const candidate of knownDimLocations()) {
+    if (isExecutable(candidate)) {
+      return candidate;
+    }
+  }
+  const pathDirs = (process.env.PATH ?? "").split(":").filter(Boolean);
+  for (const dir of pathDirs) {
+    const candidate = join6(dir, "dim");
+    if (isExecutable(candidate)) {
+      return candidate;
+    }
+  }
+  return "dim";
+}
+var init_dim_locate = __esm({
+  "src/daemon/dim-locate.ts"() {
+    "use strict";
+  }
+});
+
 // src/daemon/acp/acp-connection.ts
 var acp_connection_exports = {};
 __export(acp_connection_exports, {
@@ -400,6 +460,7 @@ var DEFAULT_ACP_INIT_TIMEOUT_MS, cachedDimVersion, requestSeq, AcpConnection;
 var init_acp_connection = __esm({
   "src/daemon/acp/acp-connection.ts"() {
     "use strict";
+    init_dim_locate();
     DEFAULT_ACP_INIT_TIMEOUT_MS = 45e3;
     cachedDimVersion = null;
     requestSeq = 0;
@@ -424,6 +485,46 @@ var init_acp_connection = __esm({
       setPermissionHandler(handler) {
         this.permissionHandler = handler;
       }
+      /**
+       * P5（issues/daemon-dim-spawn-enoent.md）：按候选顺序尝试 spawn `dim acp` 子进程。
+       * 以 `spawn` 事件判成功（进程已创建）；`error` 事件（ENOENT/EACCES 等，进程未起来）
+       * 则回收本次尝试并换下一个候选。全部失败抛最后一个错误。
+       */
+      async spawnFirstUsable(candidates) {
+        let lastError = null;
+        for (const dimPath of candidates) {
+          const child = spawn3(dimPath, ["acp"], {
+            cwd: this.options.cwd,
+            env: { ...process.env, ...this.options.env },
+            stdio: ["pipe", "pipe", "pipe"],
+            detached: process.platform !== "win32"
+          });
+          try {
+            await new Promise((resolve2, reject) => {
+              child.once("error", reject);
+              child.once("spawn", resolve2);
+            });
+            return child;
+          } catch (error) {
+            lastError = error;
+            const message = error instanceof Error ? error.message : String(error);
+            process.stderr.write(`[daemon] dim spawn \u5931\u8D25 ${dimPath}\uFF08\u5C1D\u8BD5\u4E0B\u4E00\u4E2A\u5019\u9009\uFF09: ${message}
+`);
+            try {
+              const { existsSync: existsSync17 } = await import("node:fs");
+              process.stderr.write(
+                `[daemon]   diag: fileExists=${existsSync17(dimPath)} cwdExists=${this.options.cwd ? existsSync17(this.options.cwd) : "n/a"} PATH=${(process.env.PATH ?? "").slice(0, 140)} DYLD=${process.env.DYLD_LIBRARY_PATH ?? "-"} NODE_OPTIONS=${process.env.NODE_OPTIONS ?? "-"}
+`
+              );
+            } catch {
+            }
+            child.removeAllListeners("error");
+            child.removeAllListeners("spawn");
+          }
+        }
+        const detail = lastError instanceof Error ? lastError.message : String(lastError);
+        throw new Error(`dim acp \u8FDB\u7A0B\u9519\u8BEF: ${detail}\uFF08\u5DF2\u5C1D\u8BD5 ${candidates.length} \u4E2A\u5019\u9009\u8DEF\u5F84\uFF09`);
+      }
       get isAlive() {
         return this.child !== null && this.child.exitCode === null && !this.exited;
       }
@@ -435,12 +536,7 @@ var init_acp_connection = __esm({
         if (this.isAlive)
           return;
         this.exited = false;
-        const child = spawn3(this.options.dimPath, ["acp"], {
-          cwd: this.options.cwd,
-          env: { ...process.env, ...this.options.env },
-          stdio: ["pipe", "pipe", "pipe"],
-          detached: process.platform !== "win32"
-        });
+        const child = await this.spawnFirstUsable(resolveDimCandidates(this.options.dimPath));
         this.child = child;
         child.stderr.on("data", (d) => {
           const text = d.toString().trim();
@@ -691,10 +787,10 @@ __export(dim_home_exports, {
 });
 import { execFileSync as execFileSync3 } from "node:child_process";
 import { chmodSync as chmodSync2, copyFileSync, existsSync as existsSync4, readFileSync as readFileSync4, rmSync as rmSync3 } from "node:fs";
-import { homedir as homedir4 } from "node:os";
-import { join as join6 } from "node:path";
+import { homedir as homedir5 } from "node:os";
+import { join as join7 } from "node:path";
 function isolatedDimHome() {
-  return join6(homedir4(), ".morula", "dimcode");
+  return join7(homedir5(), ".morula", "dimcode");
 }
 function resolveIsolatedDimEnv() {
   return {};
@@ -1715,7 +1811,7 @@ function page(ok, message) {
 }
 
 // ../morula-cli-core/dist/build-env.js
-var BUILD_ID = "20260914094501.nogit";
+var BUILD_ID = "20260916074556.nogit";
 var BUILD_CONTEXTS = {
   "local": "http://localhost:8080/api",
   "test": "https://morula.basecastle.com/api",
@@ -2073,9 +2169,6 @@ var ReportApi = class {
   listByAutopilot(autopilotId, query = {}) {
     return this.client.get(`/agent-autopilots/${encodeURIComponent(requiredId2(autopilotId, "autopilot"))}/reports`, { ...query });
   }
-  archive(id) {
-    return this.client.patch(`/agent-reports/${encodeURIComponent(requiredId2(id))}`, { status: "archived" });
-  }
 };
 function requiredId2(id, label = "report") {
   const normalized = id.trim();
@@ -2873,7 +2966,7 @@ function redactInputSummary(value) {
 }
 
 // src/build-env.ts
-var BUILD_VERSION2 = "0.1.0-alpha.3";
+var BUILD_VERSION2 = "0.1.0-alpha.4";
 
 // src/commands/daemon.ts
 import { existsSync as existsSync15, mkdirSync as mkdirSync11, readFileSync as readFileSync10, rmSync as rmSync7, writeFileSync as writeFileSync9 } from "node:fs";
@@ -3256,10 +3349,34 @@ var DaemonApi = class {
   submitCleanupResult(id, runtimeId, body) {
     return this.client.post(`/agent-workspace-cleanups/${id}/result`, body, { runtimeId });
   }
+  /**
+   * 单条进度上报（兼容入口；runner 已改为批量 `recordProgressBatch`）。
+   * 与批量走同一条端点/同一份契约：`items` 缺省时服务端按单条语义处理顶层字段。
+   */
   recordProgress(taskId, body) {
-    return this.taskRequest(taskId, `/agent-tasks/${taskId}/progress`, { body });
+    return this.recordProgressBatch(taskId, [body]);
   }
-  /** M2-B4：执行事件（工具调用等）→ agent_events（taskRunId+seq 唯一，前端时间线消费） */
+  /**
+   * 批量进度上报（issues/daemon-stream-events-silently-stop-mid-run.md 根因 A）：
+   * 每 500ms 一批、**一次请求**提交，吞吐不再被单条 RTT 钉在 ~27 req/s
+   * （绑定推理模型的任务实测产出 ~110 片段/s，逐条发必然积压数分钟，并把终态回传堵在后面）。
+   *
+   * 兼容性：顶层字段带该批首条 —— 旧服务端没有 `items` 支持（`whitelist` 会剥离该字段），
+   * 收到后降级为「每批只落 1 条」，而不是整批 400 丢失。
+   */
+  recordProgressBatch(taskId, items) {
+    if (items.length === 0)
+      return Promise.resolve({ ok: true, inserted: 0 });
+    return this.taskRequest(taskId, `/agent-tasks/${taskId}/progress`, {
+      body: { ...items[0], items }
+    });
+  }
+  /**
+   * M2-B4：执行事件（工具调用等）→ agent_events（taskRunId+seq 唯一，前端时间线消费）。
+   *
+   * P3：`turnNo` 为多回合预留位（`turn_started` / `turn_interrupted` 用它标记回合边界）；
+   * 服务端 `agent_events.turn_no` 直接落该值，也是「检查点消费标第几回合」的判据来源。
+   */
   recordEvent(taskId, body) {
     return this.taskRequest(taskId, `/agent-tasks/${taskId}/events`, { body });
   }
@@ -3267,6 +3384,46 @@ var DaemonApi = class {
   recordStreamChunk(taskId, body) {
     return this.taskRequest(taskId, `/agent-tasks/${taskId}/stream-chunk`, { body });
   }
+  /**
+   * 会话指针回传（P0 §5.4 前置修复）：只写 `dimSessionId`/`dimWorkDir`，不改任务状态。
+   *
+   * 取消路径下 daemon 跳过 submitResult，指针若只随 result 回传就永久丢失 → 续跑/接着聊不可能。
+   * 失败不抛（调用方 fire-and-forget）——丢指针只影响续跑能力，不该反过来影响任务执行。
+   */
+  reportSessionPointer(taskId, body) {
+    return this.taskRequest(
+      taskId,
+      `/agent-tasks/${taskId}/session`,
+      { body }
+    );
+  }
+  /**
+   * P1（features/stage-runtime-live-chat.md §5.2 机器协议）：对话消息回执。
+   *
+   * 语义边界（P1 必须严格遵守，误回执会丢话）：
+   * - 只对 `targetTaskId === 本任务` 的消息发 `consumed`——那才是被合并进本轮 prompt 的消息；
+   * - `delivered` **不**由 daemon 发（服务端创建 follow-up run 时置位）；
+   * - `interrupting` 属 P3，P1 不发。
+   */
+  ackMessage(taskId, messageId, body) {
+    return this.taskRequest(
+      taskId,
+      `/agent-tasks/${taskId}/messages/${messageId}/ack`,
+      { body }
+    );
+  }
+  /**
+   * P1：对话补齐（WS 是 best-effort，拉取才是 correctness path）。
+   *
+   * `afterSeq` / `limit` 走 **query**（不是 token，见 `taskRequest` 注释）；`limit` 缺省即不传，
+   * 由服务端默认值决定。旧服务端无该端点 → 404，调用方只记日志（补齐失败不影响本轮执行）。
+   */
+  listTaskChat(taskId, options = {}) {
+    return this.taskRequest(taskId, `/agent-tasks/${taskId}/chat`, {
+      method: "GET",
+      query: { afterSeq: options.afterSeq ?? 0, limit: options.limit }
+    });
+  }
   /** 任务级审批请求上报（Phase 2）：返回 { ok, approvalId } */
   requestApproval(taskId, body) {
     return this.taskRequest(
@@ -3317,17 +3474,19 @@ function buildGithubSkillBody(baseBranch = "main") {
   return COLLABORATION_SKILL_BODY.replaceAll("__MORULA_BASE__", base);
 }
 function buildGitlabSkillBody(repoFullName, baseUrl, baseBranch = "main") {
-  const projectPath = encodeURIComponent(repoFullName);
   const host = new URL(baseUrl).host;
   const base = baseBranch?.trim() || "main";
+  const repo = repoFullName?.trim();
   const body = COLLABORATION_SKILL_BODY.replaceAll("__MORULA_BASE__", base);
+  const repoLine = repo ? `- **\u672C\u4EFB\u52A1\u4E3B\u4ED3\u5E93**\uFF1A\`${repo}\`\uFF08\u591A\u4ED3\u5E93\u4EFB\u52A1\u6309\u4F60\u5B9E\u9645\u6539\u52A8\u7684\u4ED3\u5E93\u9010\u4E2A\u5EFA MR\uFF0C\u89C1 \xA70.5 \u4ED3\u5E93\u4E0E\u5DE5\u4F5C\u76EE\u5F55\uFF09\u3002
+` : "";
   return `${body}
 
 ## GitLab \u5E73\u53F0\u8BF4\u660E\uFF08\u672C\u4EFB\u52A1\u4ED3\u5E93\u662F GitLab\uFF0C\u8986\u76D6\u4E0A\u6587 gh \u76F8\u5173\u6307\u4EE4\uFF09
 
 \u672C\u4EFB\u52A1\u5DE5\u4F5C\u533A\u6765\u81EA **GitLab**\uFF08${host}\uFF09\uFF0C\u4E0D\u662F GitHub\uFF1A
 
-- **\u4E0D\u8981**\u4F7F\u7528 \`gh\`\uFF08GitHub CLI \u5728\u672C\u5E73\u53F0\u4E0D\u53EF\u7528\u3001\u4F1A\u5931\u8D25\uFF09\u3002
+${repoLine}- **\u4E0D\u8981**\u4F7F\u7528 \`gh\`\uFF08GitHub CLI \u5728\u672C\u5E73\u53F0\u4E0D\u53EF\u7528\u3001\u4F1A\u5931\u8D25\uFF09\u3002
 - **\u8BA4\u8BC1**\uFF1A\u672C\u73AF\u5883 Git remote \u5DF2\u914D\u7F6E\u4E3A **SSH**\uFF08\`git@${host}:\`\uFF09\uFF0C\u8BA4\u8BC1\u8D70\u672C\u673A SSH agent / keychain\uFF0C**\u65E0\u9700\u5BC6\u7801\u3001\u65E0\u9700 HTTPS token\u3001\u65E0\u9700\u624B\u52A8\u8F93\u5165\u51ED\u636E**\u3002
   - \`git fetch origin\` / \`git pull\` / \`git push\` \u76F4\u63A5\u53EF\u7528\uFF1B**\u4E0D\u8981\u5207\u6362\u6210 HTTPS \u5730\u5740\u91CD\u8BD5**\uFF08HTTPS \u65E0\u51ED\u636E\u4F1A \`HTTP Basic: Access denied\`\uFF09\u3002
   - \u9700\u8981\u5237\u65B0\u8FDC\u7AEF\u6700\u65B0\u4EE3\u7801\u65F6\u76F4\u63A5 \`git fetch origin\`\uFF08\u6362\u5206\u652F\u7528 \`git fetch origin <branch>\` \u540E \`git switch -c\` \u6216 \`git checkout -b\`\uFF09\uFF0C**\u4E0D\u8981**\u5BFB\u627E \`MORULA_GITLAB_TOKEN\` \u6216\u7528 curl \u62C9\u53D6\u3002
@@ -3345,9 +3504,16 @@ function buildGitlabSkillBody(repoFullName, baseUrl, baseBranch = "main") {
   \`\`\`bash
   morula repo mr list <taskId> --state opened
   \`\`\`
-  \u8FD4\u56DE\u4EFB\u52A1\u7A7A\u95F4\u4ED3\u5E93\u7684 open MR\uFF08iid / title / sourceBranch / targetBranch / webUrl\uFF09\u3002\u5BA1\u67E5\u5355\u4E2A MR \u7684 diff \u4ECD\u7528 \`morula repo checkout\` \u540E \`git diff\`\u3002
+  \u8FD4\u56DE\u4EFB\u52A1\u7A7A\u95F4\u4ED3\u5E93\u7684 open MR\uFF08iid / title / sourceBranch / targetBranch / webUrl / createdAt / updatedAt / author\uFF09\u3002\u5BA1\u67E5\u5355\u4E2A MR \u7684 diff \u4ECD\u7528 \`morula repo checkout\` \u540E \`git diff\`\u3002
   - \u672C\u547D\u4EE4\u53EA\u8BFB\uFF08\u4E0D approve / \u4E0D merge / \u4E0D\u8BC4\u8BBA\u2014\u2014**\u5408\u5E76\u7531\u4EBA\u51B3\u5B9A**\uFF0C\u89C1\u5951\u7EA6\u7B2C 4 \u6761\uFF09\uFF1B
   - \u82E5\u8FD4\u56DE \`NO_CONNECTION\`\uFF08\u4EFB\u52A1\u672A\u7ED1\u5B9A\u4ED3\u5E93\u8FDE\u63A5\uFF09\uFF0C\u8BF4\u660E\u672C\u4EFB\u52A1\u4E0D\u662F MR \u5DE1\u68C0\u573A\u666F\uFF0C\u76F4\u63A5\u6309\u4EFB\u52A1\u8981\u6C42\u56DE\u5E94\uFF0C\u4E0D\u8981\u81EA\u884C\u731C\u6D4B\u3002
+- **\u5728 MR \u4E0A\u7559\u8BC4\u5BA1\u610F\u89C1\uFF08\u5DE1\u68C0/\u5BA1\u67E5\u7C7B\u4EFB\u52A1\uFF0C\u975E\u8BC4\u5BA1\u4EFB\u52A1\u65F6\uFF09**\uFF1A\u7528 \`morula repo mr comment\`\uFF0C**\u4E00\u6761 MR \u6700\u591A\u4E00\u6761\u8BC4\u8BBA**\uFF1A
+  \`\`\`bash
+  morula repo mr get <taskId> --mr <iid> --notes   # \u5199\u4E4B\u524D\u5148\u8BFB\u5DF2\u6709\u8BA8\u8BBA\uFF08\u5E73\u53F0\u4E0D\u505A\u53BB\u91CD\uFF0C\u91CD\u590D\u7531\u4F60\u907F\u514D\uFF09
+  morula repo mr comment <taskId> --mr <iid> --content-file <path>
+  \`\`\`
+  \u5185\u5BB9\u4E3A\u7ED3\u8BBA + \u5173\u952E\u95EE\u9898\uFF08\u6587\u4EF6:\u884C + \u5EFA\u8BAE\uFF09\uFF0C\u672B\u5C3E\u5E26\u7F72\u540D\u884C \`> \u7531\u81EA\u52A8\u5316\u300C<\u81EA\u52A8\u5316\u540D\u79F0>\u300D\u4E8E <\u65E5\u671F> \u751F\u6210\`\uFF08\u4F9B\u4E0B\u4E00\u8F6E\u81EA\u8BC6\u522B\uFF09\uFF1B
+  **\u4E0D\u8981\u7528 \`morula review submit\`**\uFF08\u90A3\u662F\u8BC4\u5BA1\u4EFB\u52A1\u7684\u673A\u5668\u534F\u8BAE\uFF0C\u4F1A\u9A71\u52A8\u4E1A\u52A1\u4EFB\u52A1\u72B6\u6001\u56DE\u9000\uFF09\u3002
 - \u5173\u8054/\u5173\u5355\u8BED\u4E49\u4E0E\u4E0A\u6587\u4E00\u81F4\uFF1AMR \u7684 title / body / \u6E90\u5206\u652F\u51FA\u73B0\u4EFB\u52A1\u7F16\u53F7 \u2192 \u81EA\u52A8\u5173\u8054\uFF1B\`Closes <\u4EFB\u52A1\u7F16\u53F7>\` \u2192 merge \u65F6\u81EA\u52A8\u6D41\u8F6C\u4EFB\u52A1\u3002
 `;
 }
@@ -3483,6 +3649,7 @@ var COLLABORATION_SKILL_BODY = `# Working on Morula issues\uFF08\u534F\u4F5C\u59
   morula repo checkout <taskId> <repoFullName> [--ref <branch|sha>]   # \u62C9\u53D6/\u5207\u6362\u4ED3\u5E93\uFF08\u8FD4\u56DE\u7269\u5316\u8DEF\u5F84\uFF0C\u89C1 0.5\uFF09
   morula repo prepare <taskId> <repoFullName>   # \u591A\u4ED3\u5E93\u4EFB\u52A1\uFF1A\u7269\u5316\u5176\u4ED6\u4ED3\u5E93\u5230\u4EFB\u52A1\u5DE5\u4F5C\u533A\u6839\u4E0B\uFF08\u89C1 0.5\uFF09
   morula comment list --object <objectId>   # \u8BFB\u8BC4\u8BBA\uFF08\u4EFB\u52A1=objectId\uFF09
+  morula task inbox [--peek]                # \u8FD0\u884C\u4E2D\u68C0\u67E5\u70B9\uFF1A\u53D6\u672C\u7EBF\u7A0B\u672A\u6D88\u8D39\u6D88\u606F\uFF0C\u7EB3\u5165\u672C\u56DE\u5408\uFF08\u89C1 1.3\uFF09
   # \u6CE8\uFF1A\u6700\u7EC8\u603B\u7ED3\u8BC4\u8BBA\u7531\u670D\u52A1\u7AEF\u7EDF\u4E00\u53D1\u9001\uFF08\u4F5C\u8005=\u667A\u80FD\u4F53\uFF09\uFF0C\u4E0D\u8981\u8C03\u7528 comment add \u81EA\u884C\u7F6E\u8BC4\u3002
   \`\`\`
 - **\u53EF\u7528\u4ED3\u5E93\u6E05\u5355**\u7531\u7CFB\u7EDF\u63D0\u793A\u76F4\u63A5\u7ED9\u51FA\uFF08\u300C\u53EF\u7528\u4ED3\u5E93\u300D/\u300C\u591A\u4ED3\u5E93\u4EFB\u52A1\u300D\u6BB5\uFF09\uFF0C**\u4E0D\u9700\u8981**\u81EA\u5DF1\u67E5\uFF1B\u53EA\u6709\u5728\u7CFB\u7EDF\u63D0\u793A\u672A\u7ED9\u51FA\u3001\u53C8\u786E\u5B9E\u9700\u8981\u679A\u4E3E\u65F6\u624D\u7528
@@ -3528,6 +3695,44 @@ morula report create --title "<\u4E00\u53E5\u8BDD\u6807\u9898>" --content "<Mark
 - \u62A5\u544A\u843D\u5E93\u540E\u521B\u5EFA\u8005\u4E0E\u8BA2\u9605\u8005\u4F1A\u6536\u5230\u8F7B\u901A\u77E5\uFF08\u53EA\u542B\u6807\u9898\u4E0E\u8DF3\u8F6C\uFF09\uFF1B
 - \u4E0D\u4EA7\u51FA\u4E5F\u6CA1\u5173\u7CFB\uFF1A\u4EFB\u52A1\u7EC8\u6001\u65F6\u5E73\u53F0\u4F1A\u7528\u4F60\u7684\u6700\u7EC8\u8F93\u51FA\u515C\u5E95\u843D\u4E00\u4EFD\u62A5\u544A\uFF08\u4F46\u515C\u5E95\u4E0D\u5982\u4F60\u4E3B\u52A8\u7EC4\u7EC7\u7684\u5185\u5BB9\u6E05\u6670\uFF0C\u4FE1\u606F\u7C7B\u4EA7\u51FA**\u4F18\u5148\u4E3B\u52A8\u4EA7\u51FA**\uFF09\u3002
 
+## 1.3 \u8FD0\u884C\u4E2D\u53CD\u9988\uFF1A\u68C0\u67E5\u70B9\u4E0E\u6253\u65AD\uFF08\u672C\u56DE\u5408\u5185\u751F\u6548\uFF09
+
+\u7528\u6237\u53EF\u4EE5\u5728**\u4F60\u6B63\u5728\u8FD0\u884C\u7684\u8FD9\u4E00\u4E2A\u56DE\u5408\u5185**\u53D1\u6765\u610F\u89C1\u2014\u2014\u4E0D\u5FC5\u7B49\u672C\u8F6E\u7ED3\u675F\u3001\u4E5F\u4E0D\u5FC5\u91CD\u5F00\u4EFB\u52A1\u3002\u4F60\u8981\u5728\u4E24\u5904\u914D\u5408\uFF1A
+
+**\u2460 \u4E3B\u52A8\u67E5\u68C0\u67E5\u70B9\uFF08\`morula task inbox\`\uFF09\u2014\u2014\u53EA\u5728\u8FD9\u56DB\u4E2A\u65F6\u673A\u67E5\uFF0C\u4E0D\u8981\u66F4\u9891\u7E41**
+
+\`\`\`bash
+morula task inbox            # \u53D6\u8D70\u672C\u7EBF\u7A0B\u672A\u6D88\u8D39\u7684\u6D88\u606F\uFF08\u670D\u52A1\u7AEF\u6807\u8BB0\u300C\u672C\u56DE\u5408\u5DF2\u6D88\u8D39\u300D\uFF09
+morula task inbox --peek     # \u53EA\u770B\u4E0D\u53D6\uFF08\u786E\u8BA4\u6709\u6CA1\u6709\u65B0\u610F\u89C1\uFF0C\u4E0D\u6807\u8BB0\u6D88\u8D39\uFF09
+\`\`\`
+
+\u56DB\u4E2A\u65F6\u673A\uFF08\u95ED\u73AF\u679A\u4E3E\uFF0C**\u4E0D\u8981**\u6BCF\u4E00\u6B65\u90FD\u67E5\uFF09\uFF1A
+
+1. \u4E00\u6279\u6587\u4EF6\u6539\u52A8**\u5B8C\u6210\u4E4B\u540E**\uFF08\u51C6\u5907\u8FDB\u5165\u4E0B\u4E00\u6279\u4E4B\u524D\uFF09\uFF1B
+2. \`git commit\` **\u4E4B\u524D**\uFF1B
+3. \`git push\` / \u5EFA PR **\u4E4B\u524D**\uFF1B
+4. \u6536\u5230\u300C\u8FD0\u884C\u4E2D\u88AB\u6253\u65AD\u300D\u63D0\u793A\u65F6\uFF08\u89C1 \u2461\uFF09\u3002
+
+\u62FF\u5230\u6D88\u606F\u540E\uFF1A
+
+- **\u6709\u6D88\u606F** \u2192 \u9010\u6761\u7EB3\u5165\u672C\u56DE\u5408\uFF0C\u6309\u7528\u6237\u7684\u610F\u89C1\u8C03\u6574\uFF0C\u5E76\u5728\u6700\u7EC8\u603B\u7ED3\u91CC**\u56DE\u6267\u5F0F\u8BF4\u660E**\uFF08\u300C\u5DF2\u6309\u8981\u6C42\u6539\u4E3A X\u300D\uFF09\uFF1B
+- **\u6CA1\u6709\u6D88\u606F** \u2192 **\u7ACB\u5373\u7EE7\u7EED\u624B\u4E0A\u7684\u4E8B\uFF0C\u4E0D\u8981\u5C55\u5F00\u8BA8\u8BBA\u3001\u4E0D\u8981\u590D\u8FF0\u68C0\u67E5\u8FC7\u7A0B\u3001\u4E0D\u8981\u5728\u603B\u7ED3\u91CC\u63D0\u300C\u68C0\u67E5\u8FC7\u6CA1\u6709\u65B0\u610F\u89C1\u300D**\uFF1B
+- \u7528\u6237\u7684\u610F\u89C1**\u4E0D\u5F97\u63A8\u7FFB\u5B83\u6CA1\u6D89\u53CA\u7684\u90E8\u5206**\uFF1A\u5DF2\u5B8C\u6210\u7684\u3001\u4E0E\u610F\u89C1\u65E0\u5173\u7684\u6539\u52A8\u4FDD\u7559\uFF1B\u610F\u89C1\u4E0E\u539F\u59CB\u9700\u6C42\u51B2\u7A81\u65F6**\u4EE5\u610F\u89C1\u4E3A\u51C6**\u5E76\u5728\u603B\u7ED3\u91CC\u8BF4\u660E\u5DEE\u5F02\uFF1B
+- \u4E0D\u8981\u53CD\u590D\u8F6E\u8BE2\uFF08\u4E00\u6B21\u68C0\u67E5\u5C31\u662F\u4E00\u6B21\u5DE5\u5177\u8C03\u7528\uFF0C\u6709\u5F00\u9500\uFF09\u3002
+
+**\u2461 \u88AB\u6253\u65AD\u65F6\uFF08\u7528\u6237\u6309\u4E86\u300C\u7ACB\u5373\u6253\u65AD\u300D\uFF09\u4F60\u4F1A\u5728\u540C\u4E00\u4F1A\u8BDD\u6536\u5230\u65B0\u7684\u6307\u4EE4**
+
+- \u4E0A\u4E00\u56DE\u5408\u5728**\u5B89\u5168\u70B9**\u88AB\u4E2D\u65AD\uFF1A\u5176\u4E2D\u7684\u5DE5\u5177\u8FDB\u5EA6\u5DF2\u4E22\u5F03\uFF0C**\u88AB\u4E2D\u65AD\u7684\u5DE5\u5177\u8C03\u7528\u6CA1\u6709\u7ED3\u679C**\uFF08\u65F6\u95F4\u7EBF\u6807\u4E3A\u5DF2\u4E2D\u65AD\uFF09\u2014\u2014\u9700\u8981\u65F6\u91CD\u65B0\u6267\u884C\uFF0C\u4E0D\u8981\u5047\u5B9A\u5B83\u5DF2\u6210\u529F\uFF1B
+- \u65B0\u6D88\u606F\u5C31\u662F\u7528\u6237\u7684\u6700\u65B0\u610F\u89C1\uFF1A\u5148\u6309\u5B83\u8C03\u6574\u65B9\u5411\uFF0C\u518D\u7EE7\u7EED\u5B8C\u6210\u672C\u4EFB\u52A1\uFF1B\u5DE5\u4F5C\u533A\u6587\u4EF6\u4E0E git \u72B6\u6001\u4ECD\u5728\uFF0C\u4E0D\u7528\u91CD\u505A\u5DF2\u5B8C\u6210\u7684\u90E8\u5206\u3002
+
+**\u2462 \u7528\u6237\u610F\u89C1\u4E0E\u300C\u8981\u4E0D\u8981\u8FD4\u5DE5\u300D\u7531\u4F60\u81EA\u5DF1\u5224\u65AD\uFF0C\u5E73\u53F0\u4E0D\u4EE3\u505A**
+
+- \u5E73\u53F0**\u4E0D\u4F1A**\u56E0\u4E3A\u7528\u6237\u8BF4\u4E86\u53E5\u8BDD\u5C31\u56DE\u9000\u9636\u6BB5\u3001\u6539\u4EFB\u52A1\u72B6\u6001\u6216\u6D3E\u8FD4\u5DE5\u4EFB\u52A1\u2014\u2014**\u90A3\u662F\u4F60\u7684\u5224\u65AD**\uFF1A\u8BC4\u4F30\u540E\u8BA4\u4E3A\u5FC5\u987B\u63A8\u5012\u91CD\u505A\uFF0C\u5C31\u6309\u4F60\u81EA\u5DF1\u7684\u534F\u8BAE\u8868\u8FBE\uFF08\u8BC4\u5BA1\u9636\u6BB5\u7528 \`morula review submit\` \u7ED9\u51FA\u7ED3\u8BBA\uFF1B\u5206\u6790\u9636\u6BB5\u7528 \`morula task analysis-verdict\`\uFF09\uFF0C\u72B6\u6001\u6D41\u8F6C\u7531\u670D\u52A1\u7AEF\u6309\u65E2\u6709\u89C4\u5219\u9A71\u52A8\uFF1B
+- \u4F60\u53EA\u8DDF**\u5F53\u524D\u9636\u6BB5**\u5BF9\u8BDD\uFF1A\u6D88\u606F\u5C31\u662F\u53D1\u7ED9\u5F53\u524D\u9636\u6BB5\u8D1F\u8D23\u667A\u80FD\u4F53\u7684\u3002**\u4E0D\u8981**\u56E0\u4E3A\u6536\u5230\u610F\u89C1\u5C31\u53BB\u64CD\u4F5C\u522B\u7684\u9636\u6BB5\u6216\u522B\u7684\u5BF9\u8C61\u7684\u8D44\u6E90\uFF1B
+- **\u8BC4\u5BA1\u9636\u6BB5\u4F60\u53EA\u505A\u8BC4\u5BA1**\uFF08\u770B diff\u3001\u6838\u5BF9\u76EE\u6807\u3001\u51FA\u7ED3\u8BBA\uFF09\uFF0C**\u4E0D\u8981\u6539\u4EE3\u7801\u3001\u4E0D\u8981\u5EFA\u5206\u652F/\u63D0 PR**\u3002
+
+> \u4E3A\u4EC0\u4E48\u662F\u8FD9\u56DB\u4E2A\u65F6\u673A\uFF1A\u68C0\u67E5\u662F**\u5DE5\u5177\u8C03\u7528**\uFF0C\u6709 token \u4E0E\u5EF6\u8FDF\u5F00\u9500\uFF1B\u300C\u65E0\u6D88\u606F\u7ACB\u5373\u7EE7\u7EED\u300D\u662F\u4E3A\u4E86\u4E0D\u8BA9\u68C0\u67E5\u70B9\u628A\u4E3B\u7EBF\u5E26\u504F\u3002
+
 ## 2. PR \u94FE\u63A5\u4E0E\u5173\u5355\u610F\u56FE\u662F\u4E24\u5957\u4E0D\u540C\u7684\u5951\u7EA6
 
 - **\u94FE\u63A5\u901A\u9053**\uFF1APR \u7684 title / branch / body \u4E2D\u51FA\u73B0\u4EFB\u52A1\u7F16\u53F7 \u2192 \u670D\u52A1\u7AEF\u81EA\u52A8\u5173\u8054 PR \u5230\u4EFB\u52A1\u3002
@@ -3617,6 +3822,20 @@ morula report create --title "<\u4E00\u53E5\u8BDD\u6807\u9898>" --content "<Mark
 - **\u4E0D\u8981\u624B\u52A8\u6D41\u8F6C\u672C\u4EFB\u52A1\u72B6\u6001**\uFF08\u4E0D\u8981\u8C03 \`morula task state\`\uFF09\uFF1A\u8BC4\u5BA1\u7ED3\u8BBA\u7531\u670D\u52A1\u7AEF\u636E\u6B64\u63A8\u8FDB\u3002
 - **\u5FC5\u987B\u4E0A\u62A5**\uFF1A\u6F0F\u62A5\u4F1A\u8BA9\u4EFB\u52A1\u505C\u5728\u300C\u5F85\u8BC4\u5BA1\u300D\uFF0C\u5F00\u53D1\u65E0\u6CD5\u8FDB\u5165\u4E0B\u4E00\u8F6E\u3002
 
+## 4.3 \u5728 MR/PR \u4E0A\u7559\u8BC4\u5BA1\u610F\u89C1\uFF08\u5DE1\u68C0/\u5BA1\u67E5\u7C7B\u4EFB\u52A1\uFF0C\u975E\u8BC4\u5BA1\u4EFB\u52A1\u65F6\uFF09
+
+> **\u4EC5\u5F53\u672C\u4EFB\u52A1\u662F\u5DE1\u68C0/\u5BA1\u67E5\u7C7B\uFF08\u5982\u81EA\u52A8\u5316\u5B9A\u65F6 PR Review\uFF09\uFF0C\u4E14\u786E\u5B9E\u53D1\u73B0\u503C\u5F97\u63D0\u51FA\u7684\u95EE\u9898\u65F6\u9002\u7528**\uFF1B\u5F00\u53D1/\u5206\u6790/\u95EE\u7B54\u4EFB\u52A1\u8DF3\u8FC7\u672C\u8282\u3002
+
+- **\u6B63\u786E\u59FF\u52BF**\uFF1A\u7528 \`morula repo mr comment\`\uFF08\u670D\u52A1\u7AEF\u673A\u5668\u534F\u8BAE\uFF0C\u53EA\u5199\u8BC4\u8BBA\uFF1A\u4E0D approve\u3001\u4E0D merge\u3001\u4E0D close\uFF09\uFF0C**\u4E00\u6761 MR \u6700\u591A\u4E00\u6761\u8BC4\u8BBA**\uFF1A
+  \`\`\`bash
+  morula repo mr get <taskId> --mr <iid> --notes   # \u5199\u4E4B\u524D\u5148\u8BFB\u5DF2\u6709\u8BA8\u8BBA\uFF08\u5E73\u53F0\u4E0D\u505A\u53BB\u91CD\uFF0C\u91CD\u590D\u7531\u4F60\u907F\u514D\uFF09
+  morula repo mr comment <taskId> --mr <iid> --content-file <path>
+  \`\`\`
+- \u5185\u5BB9\u4E3A**\u7ED3\u8BBA + \u5173\u952E\u95EE\u9898**\uFF08\u6587\u4EF6:\u884C + \u95EE\u9898 + \u5EFA\u8BAE\uFF09\uFF0C\u4E0D\u8981\u8D34\u5927\u6BB5\u65E5\u5FD7\u6216\u590D\u8FF0 diff\uFF1B\u957F\u5185\u5BB9\u5199\u6210\u62A5\u544A\uFF08\`morula report create\`\uFF09\u540E\u7528\u6458\u8981\u5F15\u7528\uFF1B
+- \u672B\u5C3E\u5E26\u7F72\u540D\u884C \`> \u7531\u81EA\u52A8\u5316\u300C<\u81EA\u52A8\u5316\u540D\u79F0>\u300D\u4E8E <\u65E5\u671F> \u751F\u6210\`\u2014\u2014\u4F9B\u4EBA\u4E0E agent \u4E0B\u4E00\u8F6E\u8BC6\u522B\u8FD9\u662F\u672C\u81EA\u52A8\u5316\u7684\u5386\u53F2\u8BC4\u8BBA\uFF1B
+- \u82E5\u672C\u81EA\u52A8\u5316\u5DF2\u5C31\u540C\u4E00\u95EE\u9898\u7559\u8FC7\u8BC4\u8BBA\u3001\u7ED3\u8BBA\u4E0E\u8FD9\u6B21\u4E00\u81F4 \u2192 **\u4E0D\u8981\u91CD\u590D\u8BC4\u8BBA**\uFF1B
+- \u26D4 **\u4E0D\u8981\u7528 \`morula review submit\`**\uFF08\u90A3\u662F\u8BC4\u5BA1\u4EFB\u52A1\u7684\u673A\u5668\u534F\u8BAE\uFF0C\u4F1A\u9A71\u52A8\u4E1A\u52A1\u4EFB\u52A1\u72B6\u6001\u56DE\u9000\uFF09\u3002
+
 ## 5. \u8BC4\u8BBA\u4EA4\u4ED8\u7EAA\u5F8B
 
 - **\u4F55\u65F6\u53D1\u8BC4\u8BBA**\uFF1A**\u6700\u7EC8\u603B\u7ED3\u8BC4\u8BBA\u7531\u670D\u52A1\u7AEF\u7EDF\u4E00\u4EE5\u667A\u80FD\u4F53\u8EAB\u4EFD\u53D1\u9001**\uFF08\u4EFB\u52A1\u5B8C\u6210\u65F6\u81EA\u52A8\u53D1\u5E03\u5230\u4EFB\u52A1\u5BF9\u8C61\uFF0C\u4F5C\u8005=\u5F53\u524D\u667A\u80FD\u4F53\uFF09\u3002**\u4F60\u4E0D\u9700\u8981\u3001\u4E5F\u4E0D\u5E94\u8C03\u7528 \`morula comment add\`**\u2014\u2014\u53EA\u8981\u5728\u6700\u7EC8\u8F93\u51FA\u91CC\u7ED9\u51FA\u7528\u6237\u5173\u5FC3\u7684\u7ED3\u8BBA\u5373\u53EF\uFF0C\u670D\u52A1\u7AEF\u4F1A\u4F5C\u4E3A\u8BE5\u667A\u80FD\u4F53\u7684\u5B8C\u6210\u8BC4\u8BBA\u53D1\u5E03\u3002chat \u4F1A\u8BDD\u65E0 objectId \u7684\u4EFB\u52A1\uFF08\u7EAF\u5BF9\u8BDD\u6D3E\u53D1\uFF09\u4E0D\u56DE\u8BC4\u8BBA\u2014\u2014\u6700\u7EC8\u4EA4\u4ED8\u7531 daemon \u56DE\u586B assistant \u6D88\u606F\u3002
@@ -3677,6 +3896,8 @@ var COLLABORATION_SKILL_SOURCE_MAP = `# morula-working-on-issues \u2014 \u5951\u
 | CLI \u4EFB\u52A1\u8BE6\u60C5\uFF08**\u65E0\u53C2**\u53D6\u672C\u4EFB\u52A1\uFF1B\u5E26\u53C2\u53D6\u4E1A\u52A1\u5BF9\u8C61\uFF09 | \`morula task get\` \u2192 \`GET /agent-tasks/:id\`\uFF1B\`morula task get <objectId>\` \u2192 \`GET /objects/:id\` | \`packages/morula-cli/src/commands/task.ts\` |
 | daemon \u6CE8\u5165\u51ED\u636E\uFF08agent \u65E0\u9700\u81EA\u884C\u767B\u5F55\uFF09 | runner \u6CE8\u5165 \`env\` \u7ED9 Provider \u5B50\u8FDB\u7A0B | \`packages/runtime/src/daemon/runner.ts\` |
 | \u7CFB\u7EDF\u63D0\u793A\u6CE8\u5165\uFF08\u9636\u6BB5\u804C\u8D23 / \u76EE\u6807 / \u4ED3\u5E93\u6E05\u5355 / \u5DE5\u5177\u6307\u5F15\uFF09\uFF1B\u4EFB\u52A1\u8BE6\u60C5\u7531 \`morula task get\`\uFF08\u65E0\u53C2\uFF09\u83B7\u53D6 | \`buildTaskPromptWithContract\`\uFF08\`runner.ts\`\uFF0C\u552F\u4E00\u8FDB dim \u7684 messages[0]\uFF09\uFF1BCLI \`packages/morula-cli/src/commands/task.ts\`\uFF08resolveTaskId \u2192 \`GET /agent-tasks/:id\`\uFF09 | \`packages/runtime/src/daemon/runner.ts\` |
+| \u8FD0\u884C\u4E2D\u68C0\u67E5\u70B9\uFF08\u672C\u56DE\u5408\u5185\u53D6\u7528\u6237\u610F\u89C1\uFF09 | CLI \`morula task inbox [--peek]\` \u2192 \`GET /agent-tasks/:id/thread/inbox\`\uFF08\u673A\u5668\u534F\u8BAE\uFF1B\u9ED8\u8BA4\u53D6\u8D70\u5373\u6D88\u8D39\uFF0C\u843D \`consumed\` + \u5F53\u56DE\u5408\u53F7\uFF09\uFF1B\u5951\u7EA6\u65F6\u673A\u89C1\u672C SKILL 1.3 | \`packages/morula-cli/src/commands/task.ts\`\u3001\`src/modules/agent-task/chat/object-agent-chat.controller.ts\`\u3001\`object-agent-message.service.ts\`\uFF08\`getThreadInbox\`\uFF09 |
+| \u8FD0\u884C\u4E2D\u6253\u65AD\uFF08\u540C\u4E00\u4F1A\u8BDD\u91CD\u5F00\u4E00\u8F6E\uFF09 | daemon \u5728\u5B89\u5168\u70B9\uFF08\`inFlightTools === 0\`\uFF09\`session/cancel\` \u2192 \`session/resume\` \u2192 \u7528\u65B0\u610F\u89C1\u91CD\u5F00 prompt\uFF1B\u56DE\u5408\u53F7\u4E0E\u4E2D\u65AD\u70B9\u4E0A\u62A5\u4E3A \`turn_started\` / \`turn_interrupted\` \u4E8B\u4EF6 | \`packages/runtime/src/daemon/acp/dim-acp-executor.ts\`\uFF08\u56DE\u5408\u5FAA\u73AF\uFF09\u3001\`runner.ts\`\uFF08\`buildSteerPort\`\uFF09\u3001\`src/modules/agent-task/chat/object-agent-message.service.ts\`\uFF08\`steerDeliveryStrategy\`\uFF09 |
 
 ## 3. \u6539\u4EE3\u7801\u9ED8\u8BA4\u4EA7 PR\uFF08\u5206\u652F\u7EAA\u5F8B\uFF0CAgent \u53D6\u540D\uFF09
 
@@ -3738,46 +3959,7 @@ var COLLABORATION_SKILL_SOURCE_MAP = `# morula-working-on-issues \u2014 \u5951\u
 // src/daemon/runner.ts
 init_daemon_config();
 init_dim_home();
-
-// src/daemon/dim-locate.ts
-import { accessSync, constants } from "node:fs";
-import { homedir as homedir5 } from "node:os";
-import { join as join7 } from "node:path";
-function isExecutable(p) {
-  try {
-    accessSync(p, constants.X_OK);
-    return true;
-  } catch {
-    return false;
-  }
-}
-function resolveDimBinary() {
-  const explicit = process.env.MORULA_DIM_PATH?.trim();
-  if (explicit) {
-    return isExecutable(explicit) ? explicit : "dim";
-  }
-  const pathDirs = (process.env.PATH ?? "").split(":").filter(Boolean);
-  for (const dir of pathDirs) {
-    const candidate = join7(dir, "dim");
-    if (isExecutable(candidate)) {
-      return candidate;
-    }
-  }
-  const home = homedir5();
-  const knownLocations = [
-    "/Applications/DimAgent.app/Contents/Resources/runtime/cli/dim",
-    "/Applications/Dim.app/Contents/Resources/runtime/cli/dim",
-    join7(home, "Applications", "DimAgent.app", "Contents", "Resources", "runtime", "cli", "dim"),
-    join7(home, ".dimcode", "bin", "dim"),
-    join7(home, ".local", "bin", "dim")
-  ];
-  for (const candidate of knownLocations) {
-    if (isExecutable(candidate)) {
-      return candidate;
-    }
-  }
-  return "dim";
-}
+init_dim_locate();
 
 // src/daemon/flags.ts
 function isFlagEnabled(name, defaultValue = true) {
@@ -4135,9 +4317,18 @@ function normalizeOptionId(decision) {
 var DEFAULT_TIMEOUT_MS2 = 30 * 60 * 1e3;
 var DEFAULT_IDLE_TIMEOUT_MS = 5 * 60 * 1e3;
 var DEFAULT_TOOL_IDLE_TIMEOUT_MS = 20 * 60 * 1e3;
+var DEFAULT_MAX_TURNS = 8;
+var DEFAULT_TASK_WALL_CLOCK_MS = 2 * 60 * 60 * 1e3;
+var DEFAULT_STEER_SAFETY_MS = 30 * 1e3;
 var PROMPT_RPC_TIMEOUT_GRACE_MS = 1e4;
 var WATCHDOG_TICK_MS = 15e3;
 var KILL_GRACE_MS = 3e3;
+function resolveSteerSafetyMs(raw = process.env.MORULA_STEER_SAFETY_MS) {
+  if (raw === void 0 || raw === "")
+    return DEFAULT_STEER_SAFETY_MS;
+  const parsed = Number(raw);
+  return Number.isFinite(parsed) && parsed >= 0 ? Math.trunc(parsed) : DEFAULT_STEER_SAFETY_MS;
+}
 var ACP_INIT_RETRY_DELAYS_MS = [2e3, 8e3];
 function isAcpInitRetryableError(error) {
   const message = error instanceof Error ? error.message : String(error ?? "");
@@ -4232,6 +4423,11 @@ function extractProviderError(text) {
   }
   return null;
 }
+function payloadToolCallId(msg) {
+  const payload = msg.payload ?? {};
+  const raw = payload.toolCall?.id ?? payload.toolCallId ?? payload.id;
+  return typeof raw === "string" && raw.length > 0 ? raw : null;
+}
 function resolveAcpModelId(models2, requested, configOptions) {
   if (!requested.trim())
     return null;
@@ -4278,7 +4474,9 @@ var DimAcpExecutor = class {
       let ownsConnection = false;
       let sessionId = "";
       let finalText = "";
-      let inFlightTools = 0;
+      let turnNo = 1;
+      const inFlightToolCalls = /* @__PURE__ */ new Map();
+      const inFlightTools = () => inFlightToolCalls.size;
       let lastActivityAt = Date.now();
       let watchdogTimer = null;
       let watchdogFired = false;
@@ -4336,10 +4534,12 @@ var DimAcpExecutor = class {
         if (idle <= 0)
           return;
         lastActivityAt = Date.now();
-        inFlightTools = 0;
+        inFlightToolCalls.clear();
         watchdogTimer = setInterval(() => {
+          maybeInterruptAtSafePoint();
+          enforceTaskWallClock();
           const toolBudget = Number(process.env.MORULA_DIM_TOOL_IDLE_TIMEOUT_MS) || DEFAULT_TOOL_IDLE_TIMEOUT_MS;
-          const budget = inFlightTools > 0 ? toolBudget : idle;
+          const budget = inFlightTools() > 0 ? toolBudget : idle;
           if (Date.now() - lastActivityAt > budget) {
             watchdogFired = true;
             if (sessionId && conn)
@@ -4348,7 +4548,8 @@ var DimAcpExecutor = class {
             finish({
               ok: false,
               error: `daemon: idle watchdog fired\uFF08${Math.round(budget / 1e3)}s \u65E0\u6D3B\u52A8\uFF09`,
-              sessionId: sessionId || void 0
+              sessionId: sessionId || void 0,
+              turns: turnNo
             });
           }
         }, WATCHDOG_TICK_MS);
@@ -4357,6 +4558,60 @@ var DimAcpExecutor = class {
       const markActivity = () => {
         lastActivityAt = Date.now();
       };
+      let activeSteer = null;
+      let steerWaitingSince = 0;
+      let wallClockFired = false;
+      let interruptedTurns = 0;
+      let turnKind = "initial";
+      const steerSafetyMs = resolveSteerSafetyMs();
+      const taskStartedAt = Date.now();
+      const maxTurns = Math.max(1, Math.trunc(opts.steer?.maxTurns ?? DEFAULT_MAX_TURNS));
+      const taskWallClockMs = opts.steer?.wallClockMs ?? 0;
+      const wallClockExceeded = () => taskWallClockMs > 0 && Date.now() - taskStartedAt > taskWallClockMs;
+      function maybeInterruptAtSafePoint() {
+        if (!opts.steer || activeSteer || !conn || !sessionId)
+          return;
+        const pending = opts.steer.peek();
+        if (!pending) {
+          steerWaitingSince = 0;
+          return;
+        }
+        let waitedMs = 0;
+        if (inFlightTools() > 0) {
+          if (steerWaitingSince === 0)
+            steerWaitingSince = Date.now();
+          waitedMs = Date.now() - steerWaitingSince;
+          if (steerSafetyMs === 0 || waitedMs < steerSafetyMs)
+            return;
+        }
+        activeSteer = pending;
+        steerWaitingSince = 0;
+        opts.steer.onInterrupting({ turnNo, messageId: pending.messageId });
+        process.stderr.write(`[daemon] \u5B89\u5168\u70B9\u6253\u65AD\uFF1Aturn=${turnNo} message=${pending.messageId} inFlightTools=${inFlightTools()} waited=${waitedMs}ms
+`);
+        conn.cancel(sessionId);
+      }
+      function enforceTaskWallClock() {
+        if (wallClockFired || !wallClockExceeded())
+          return;
+        wallClockFired = true;
+        process.stderr.write(`[daemon] \u4EFB\u52A1\u5899\u949F\u8D85\u9650\uFF08${Math.round(taskWallClockMs / 1e3)}s\uFF09\uFF0C\u7EC8\u6B62\u672C\u8F6E\u5E76\u8981\u6C42\u4EBA\u4ECB\u5165
+`);
+        if (sessionId && conn)
+          conn.cancel(sessionId);
+      }
+      function emitAbortedTools() {
+        const aborted = [];
+        for (const [callId, toolName] of inFlightToolCalls) {
+          aborted.push(toolName);
+          opts.onEvent?.({
+            eventType: "tool:completed",
+            payload: { toolCallId: callId, toolName, toolResult: "\uFF08\u8FD0\u884C\u4E2D\u6253\u65AD\uFF1A\u8BE5\u5DE5\u5177\u8C03\u7528\u88AB\u4E2D\u65AD\uFF0C\u65E0\u7ED3\u679C\uFF09", aborted: true }
+          }, finalText);
+        }
+        inFlightToolCalls.clear();
+        return aborted;
+      }
       const setupOnce = async () => {
         if (pool) {
           conn = await pool.acquire();
@@ -4382,12 +4637,23 @@ var DimAcpExecutor = class {
         }
       });
       setup().then(async () => {
-        timer = setTimeout(() => {
-          if (sessionId && conn)
-            conn.cancel(sessionId);
-          killTree(conn);
-          finish({ ok: false, error: `dim \u6267\u884C\u8D85\u65F6\uFF08${Math.round(timeout / 1e3)}s\uFF09`, sessionId: sessionId || void 0 });
-        }, timeout);
+        const armTurnTimer = () => {
+          if (timer)
+            clearTimeout(timer);
+          timer = setTimeout(() => {
+            if (sessionId && conn)
+              conn.cancel(sessionId);
+            killTree(conn);
+            finish({
+              ok: false,
+              error: `dim \u5355\u56DE\u5408\u8D85\u65F6\uFF08${Math.round(timeout / 1e3)}s\uFF09`,
+              sessionId: sessionId || void 0,
+              turns: turnNo,
+              interrupted: interruptedTurns > 0
+            });
+          }, timeout);
+        };
+        armTurnTimer();
         opts.signal?.addEventListener("abort", abortHandler, { once: true });
         startWatchdog();
         const bridge = new AcpPermissionBridge();
@@ -4451,56 +4717,142 @@ var DimAcpExecutor = class {
         pool?.touch();
         markActivity();
         opts.onEvent?.(mapper.readyMessage(sessionId), "");
-        const result = await conn.prompt(sessionId, opts.userPrompt, (update) => {
-          markActivity();
+        const reopenSessionAfterInterrupt = async () => {
+          try {
+            await conn.resumeSession({ ...sessionParams, sessionId });
+            return true;
+          } catch (e1) {
+            process.stderr.write(`[daemon] \u6253\u65AD\u540E\u4F1A\u8BDD\u7EED\u5F00\u5931\u8D25\uFF08resume\uFF09\uFF0C\u6539\u8BD5 load: ${errMessage(e1)}
+`);
+          }
+          try {
+            await conn.loadSession({ ...sessionParams, sessionId });
+            return true;
+          } catch (e2) {
+            process.stderr.write(`[daemon] \u6253\u65AD\u540E\u4F1A\u8BDD\u7EED\u5F00\u5931\u8D25\uFF08load\uFF09\uFF0C\u56DE\u9000\u65B0\u5EFA\u4F1A\u8BDD\uFF08\u4E0A\u4E0B\u6587\u672A\u4FDD\u7559\uFF09: ${errMessage(e2)}
+`);
+          }
+          const created = await conn.newSession(sessionParams);
+          sessionId = created.sessionId;
+          await conn.setConfigOption(sessionId, "permission", "workspace-write").catch(() => {
+          });
+          opts.onEvent?.(mapper.readyMessage(sessionId), "");
+          return false;
+        };
+        let promptText = opts.userPrompt;
+        let sessionReset = false;
+        for (; ; ) {
+          armTurnTimer();
+          activeSteer = null;
+          opts.steer?.onTurnStarted?.({ turnNo, kind: turnKind });
+          const result = await conn.prompt(sessionId, promptText, (update) => {
+            markActivity();
+            pool?.touch();
+            const { messages } = mapper.map(sessionId, update);
+            for (const msg of messages) {
+              if (msg.eventType === "text:delta") {
+                const delta = typeof msg.payload?.delta === "string" ? msg.payload.delta : "";
+                finalText += delta;
+                opts.onProgress({ stage: "output", summary: delta });
+                opts.onEvent?.(msg, finalText);
+              } else if (msg.eventType === "thinking:delta") {
+                const delta = typeof msg.payload?.delta === "string" ? msg.payload.delta : "";
+                opts.onProgress({ stage: "thinking", summary: delta });
+                opts.onEvent?.(msg, finalText);
+              } else if (msg.eventType === "tool:started") {
+                const callId = payloadToolCallId(msg) ?? `tool-${Date.now()}`;
+                inFlightToolCalls.set(callId, typeof msg.payload?.toolName === "string" ? msg.payload.toolName : "tool");
+                opts.onEvent?.(msg, finalText);
+                opts.onProgress({
+                  stage: "tool_call",
+                  toolName: typeof msg.payload?.toolName === "string" ? msg.payload.toolName : "tool",
+                  toolInput: typeof msg.payload?.toolInput === "object" && msg.payload?.toolInput !== null ? msg.payload.toolInput : void 0,
+                  summary: typeof msg.payload?.toolName === "string" ? msg.payload.toolName : "tool"
+                });
+              } else {
+                if (msg.eventType === "tool:completed" || msg.eventType === "tool:failed") {
+                  const callId = payloadToolCallId(msg);
+                  if (callId)
+                    inFlightToolCalls.delete(callId);
+                }
+                opts.onEvent?.(msg, finalText);
+              }
+            }
+            maybeInterruptAtSafePoint();
+          }, timeout + PROMPT_RPC_TIMEOUT_GRACE_MS);
+          if (settled)
+            return;
           pool?.touch();
-          const { messages } = mapper.map(sessionId, update);
-          for (const msg of messages) {
-            if (msg.eventType === "text:delta") {
-              const delta = typeof msg.payload?.delta === "string" ? msg.payload.delta : "";
-              finalText += delta;
-              opts.onProgress({ stage: "output", summary: delta });
-              opts.onEvent?.(msg, finalText);
-            } else if (msg.eventType === "thinking:delta") {
-              const delta = typeof msg.payload?.delta === "string" ? msg.payload.delta : "";
-              opts.onProgress({ stage: "thinking", summary: delta });
-              opts.onEvent?.(msg, finalText);
-            } else if (msg.eventType === "tool:started") {
-              inFlightTools += 1;
-              opts.onEvent?.(msg, finalText);
-              opts.onProgress({
-                stage: "tool_call",
-                toolName: typeof msg.payload?.toolName === "string" ? msg.payload.toolName : "tool",
-                toolInput: typeof msg.payload?.toolInput === "object" && msg.payload?.toolInput !== null ? msg.payload.toolInput : void 0,
-                summary: typeof msg.payload?.toolName === "string" ? msg.payload.toolName : "tool"
-              });
-            } else {
-              opts.onEvent?.(msg, finalText);
+          markActivity();
+          const usage2 = result.usage ?? mapper.latestUsage;
+          const cancelled = result.stopReason === "cancelled";
+          const base = { sessionId, turns: turnNo, interrupted: interruptedTurns > 0 };
+          if (wallClockFired || wallClockExceeded()) {
+            const abortedTools = emitAbortedTools();
+            opts.steer?.onTurnInterrupted?.({ turnNo, reason: "wall-clock", abortedTools });
+            killTree(conn);
+            finish({
+              ...base,
+              ok: false,
+              error: `\u5DF2\u8FBE\u4EFB\u52A1\u5899\u949F\u4E0A\u9650\uFF08${Math.round(taskWallClockMs / 1e3)}s\uFF09\uFF0C\u5DF2\u7EC8\u6B62\u672C\u8F6E\uFF0C\u8BF7\u4EBA\u4ECB\u5165`
+            });
+            return;
+          }
+          if (cancelled && activeSteer) {
+            interruptedTurns += 1;
+            const abortedTools = emitAbortedTools();
+            const nextTurn = turnNo + 1;
+            const withinBudget = nextTurn <= maxTurns;
+            opts.steer?.onTurnInterrupted?.({ turnNo, reason: withinBudget ? "steer" : "max-turns", abortedTools });
+            if (!withinBudget) {
+              process.stderr.write(`[daemon] \u5DF2\u8FBE\u6700\u5927\u56DE\u5408\u6570 ${maxTurns}\uFF0C\u5269\u4F59\u6253\u65AD\u8BF7\u6C42\u4EA4\u7531\u4E0B\u4E00\u8F6E
+`);
+              finish({ ...base, ok: true, text: finalText, tokenUsage: usage2 });
+              return;
             }
+            turnKind = "after-interrupt";
+            promptText = opts.steer.consume({ turnNo: nextTurn, sessionReset });
+            turnNo = nextTurn;
+            sessionReset = !await reopenSessionAfterInterrupt();
+            continue;
+          }
+          if (cancelled) {
+            finish({ ...base, ok: false, error: "\u4EFB\u52A1\u88AB\u53D6\u6D88" });
+            return;
+          }
+          if (result.stopReason === "max_tokens") {
+            opts.onEvent?.(mapper.runEndedMessage({ stopReason: "max_tokens", usage: usage2 }), finalText);
+            finish({ ...base, ok: false, error: "dim \u8FBE\u5230 max_tokens \u4E0A\u9650", tokenUsage: usage2 });
+            return;
+          }
+          if (result.stopReason === "refusal") {
+            opts.onEvent?.(mapper.runEndedMessage({ stopReason: "refusal", usage: usage2 }), finalText);
+            const providerError = extractProviderError(finalText);
+            finish({ ...base, ok: false, error: providerError ?? "\u6A21\u578B\u62D2\u7EDD\u6267\u884C", tokenUsage: usage2 });
+            return;
+          }
+          const leftover = activeSteer ?? opts.steer?.peek() ?? null;
+          if (leftover && turnNo + 1 <= maxTurns && !wallClockExceeded()) {
+            const nextTurn = turnNo + 1;
+            turnKind = "appended";
+            promptText = opts.steer.consume({ turnNo: nextTurn, sessionReset });
+            turnNo = nextTurn;
+            sessionReset = false;
+            activeSteer = null;
+            process.stderr.write(`[daemon] \u56DE\u5408\u5DF2\u81EA\u7136\u7ED3\u675F\uFF0C\u6253\u65AD\u8BF7\u6C42\u964D\u7EA7\u4E3A\u8FFD\u52A0\u4E00\u8F6E\uFF08turn=${nextTurn}\uFF09
+`);
+            continue;
           }
-        }, timeout + PROMPT_RPC_TIMEOUT_GRACE_MS);
-        stopWatchdog();
-        pool?.touch();
-        const usage2 = result.usage ?? mapper.latestUsage;
-        if (result.stopReason === "cancelled") {
-          finish({ ok: false, error: "\u4EFB\u52A1\u88AB\u53D6\u6D88", sessionId });
-        } else if (result.stopReason === "max_tokens") {
-          opts.onEvent?.(mapper.runEndedMessage({ stopReason: "max_tokens", usage: usage2 }), finalText);
-          finish({ ok: false, error: "dim \u8FBE\u5230 max_tokens \u4E0A\u9650", tokenUsage: usage2, sessionId });
-        } else if (result.stopReason === "refusal") {
-          opts.onEvent?.(mapper.runEndedMessage({ stopReason: "refusal", usage: usage2 }), finalText);
-          const providerError = extractProviderError(finalText);
-          finish({ ok: false, error: providerError ?? "\u6A21\u578B\u62D2\u7EDD\u6267\u884C", tokenUsage: usage2, sessionId });
-        } else {
           opts.onEvent?.(mapper.runEndedMessage({ stopReason: result.stopReason, usage: usage2 }), finalText);
-          finish({ ok: true, text: finalText, tokenUsage: usage2, sessionId });
+          finish({ ...base, ok: true, text: finalText, tokenUsage: usage2 });
+          return;
         }
       }).catch((err) => {
         const message = err instanceof Error ? err.message : String(err);
         if (sessionId && conn && message.includes("\u8D85\u65F6")) {
           conn.cancel(sessionId);
         }
-        finish({ ok: false, error: message, sessionId: sessionId || void 0 });
+        finish({ ok: false, error: message, sessionId: sessionId || void 0, turns: turnNo, interrupted: interruptedTurns > 0 });
       });
     });
   }
@@ -4653,6 +5005,8 @@ function createDimEventNormalizer(opts) {
           type: "tool_call_completed",
           callId: String(callId),
           toolName: typeof p.toolName === "string" ? p.toolName : void 0,
+          // P3：运行中打断留下的孤儿调用（无真实结果）→ 时间线标中断点，不伪装成正常完成
+          ...p.aborted === true ? { aborted: true } : {},
           ...outputSummary !== void 0 ? { outputSummary } : {}
         });
         break;
@@ -4733,6 +5087,16 @@ var DIM_CAPABILITIES = {
   authentication: "required",
   sessionResume: true,
   // ACP session/resume + session/load 跨任务续跑（2026-08-12 实测可用）
+  // E4 能力矩阵（features/stage-runtime-live-chat.md §三）：
+  // - `checkpointInbox`（P2）：合作式检查点已落地（`morula task inbox` + 契约 skill 的四处时机），
+  //   agent 在本回合内主动拉取未消费消息并纳入**本回合**；
+  // - `midRunSteer`（P3）：安全点打断已落地（等 `inFlightTools === 0` → session/cancel →
+  //   session/resume 同会话重开一轮，见 acp/dim-acp-executor.ts 的回合循环）；
+  //   破坏性档留一键回退：`MORULA_LIVE_CHAT_STEER=0` 时能力位同步为 false
+  //   （前端自动隐藏入口、后端 typed 拒绝），避免「按钮亮着但 daemon 不打断」的假能力。
+  // 能力位只在实现真正可用后置 true —— 前端据此渲染入口，后端据此 typed 拒绝，同源判据。
+  midRunSteer: isFlagEnabled("MORULA_LIVE_CHAT_STEER", true),
+  checkpointInbox: true,
   modelSelection: "workspace_config",
   systemPromptMode: "native",
   skillInjection: "agents_skills",
@@ -4824,6 +5188,7 @@ var DimAgentAdapter = class {
     return await new Promise((resolve2) => {
       const events = [];
       let sessionId = null;
+      let reportedSessionId = null;
       const normalizer = createDimEventNormalizer({
         onEvent: (event) => {
           events.push(event);
@@ -4836,6 +5201,10 @@ var DimAgentAdapter = class {
       const onEvent = (msg, finalText) => {
         if (msg.type === "ready" && typeof msg.sessionId === "string" && msg.sessionId) {
           sessionId = msg.sessionId;
+          if (reportedSessionId !== sessionId) {
+            reportedSessionId = sessionId;
+            input.onEvent({ type: "session", providerSessionId: sessionId });
+          }
         }
         normalizer.handle(msg, finalText);
       };
@@ -4868,7 +5237,9 @@ var DimAgentAdapter = class {
           }
         },
         timeoutMs: input.timeoutMs,
-        signal: input.signal
+        signal: input.signal,
+        // P3：运行中打断端口由上层（runner）提供；未提供时执行器保持单回合语义
+        steer: input.steer ?? null
       }).then((result) => {
         const finalText = finalAssistantSelector(events);
         resolve2({
@@ -4878,7 +5249,9 @@ var DimAgentAdapter = class {
           usage: result.tokenUsage ? normalizeUsage(result.tokenUsage) : null,
           exitCode: result.ok ? 0 : null,
           error: result.ok ? null : { code: "DIM_RUN_FAILED", message: result.error ?? "dim \u6267\u884C\u5931\u8D25" },
-          resumeFailed: result.resumeFailed
+          resumeFailed: result.resumeFailed,
+          turns: result.turns,
+          interrupted: result.interrupted
         });
       }).catch((err) => {
         resolve2({
@@ -4907,6 +5280,8 @@ var FAKE_CAPABILITIES = {
   approvalMode: "none",
   authentication: "none",
   sessionResume: false,
+  midRunSteer: false,
+  checkpointInbox: false,
   modelSelection: "explicit",
   systemPromptMode: "native",
   skillInjection: "prompt_only",
@@ -6105,6 +6480,144 @@ function materializeAdditionalRepo(input) {
   return input.targetPath;
 }
 
+// src/daemon/task-messages.ts
+var TASK_MESSAGE_QUEUE_MAX = 200;
+function asRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function asNonEmptyString(value) {
+  return typeof value === "string" && value.length > 0 ? value : null;
+}
+function normalizeAgentMessage(value) {
+  const row = asRecord(value);
+  if (!row)
+    return null;
+  const id = asNonEmptyString(row.id);
+  if (!id)
+    return null;
+  const seq = row.seq;
+  if (typeof seq !== "number" || !Number.isFinite(seq))
+    return null;
+  return {
+    id,
+    seq,
+    authorType: typeof row.authorType === "string" ? row.authorType : "unknown",
+    authorPrincipalId: asNonEmptyString(row.authorPrincipalId),
+    authorName: asNonEmptyString(row.authorName),
+    content: typeof row.content === "string" ? row.content : "",
+    mode: typeof row.mode === "string" ? row.mode : "queue",
+    deliveryState: typeof row.deliveryState === "string" ? row.deliveryState : "pending",
+    deliveryError: asNonEmptyString(row.deliveryError),
+    targetTaskId: asNonEmptyString(row.targetTaskId),
+    anchorEventSeq: typeof row.anchorEventSeq === "number" ? row.anchorEventSeq : null,
+    turnNo: typeof row.turnNo === "number" ? row.turnNo : null,
+    createdAt: typeof row.createdAt === "string" ? row.createdAt : ""
+  };
+}
+function parseTaskMessageFrame(value) {
+  const frame = asRecord(value);
+  if (!frame)
+    return null;
+  const taskId = asNonEmptyString(frame.taskId);
+  if (!taskId || !Array.isArray(frame.messages))
+    return null;
+  const messages = frame.messages.map(normalizeAgentMessage).filter((message) => message !== null);
+  if (messages.length === 0)
+    return null;
+  return {
+    type: "agent-task:message",
+    taskId,
+    objectId: asNonEmptyString(frame.objectId),
+    anchorKey: typeof frame.anchorKey === "string" ? frame.anchorKey : "",
+    messages
+  };
+}
+function upsertTaskMessages(existing, incoming, max = TASK_MESSAGE_QUEUE_MAX) {
+  const byId = /* @__PURE__ */ new Map();
+  for (const message of existing)
+    byId.set(message.id, message);
+  for (const message of incoming)
+    byId.set(message.id, message);
+  const merged = [...byId.values()].sort((a, b) => a.seq - b.seq || a.id.localeCompare(b.id));
+  const dropped = Math.max(0, merged.length - max);
+  return { messages: dropped > 0 ? merged.slice(dropped) : merged, dropped };
+}
+function selectConsumedMessages(messages, taskId) {
+  return messages.filter((message) => message.targetTaskId === taskId);
+}
+function selectSteerMessages(messages, taskId) {
+  return messages.filter((message) => message.mode === "steer").filter((message) => message.deliveryState !== "consumed" && message.deliveryState !== "withdrawn").filter((message) => message.targetTaskId === taskId).sort((a, b) => a.seq - b.seq);
+}
+function renderMessageList(messages) {
+  return messages.map((message) => `${message.seq}. \u3010${message.authorType === "user" ? "\u4EBA" : message.authorType === "system" ? "\u5E73\u53F0" : "\u8FD0\u884C\u65F6"}\u3011${message.content}`).join("\n\n");
+}
+function buildSteerPrompt(input) {
+  const opinions = input.messages.length > 0 ? renderMessageList(input.messages) : "\uFF08\u6253\u65AD\u8BF7\u6C42\u672A\u88AB\u53D6\u5230\uFF0C\u8BF7\u6309\u539F\u59CB\u9700\u6C42\u7EE7\u7EED\uFF09";
+  const resetNote = input.sessionReset ? "\n- \u26A0\uFE0F \u4F1A\u8BDD\u5DF2\u91CD\u5EFA\uFF1A\u4E0A\u4E00\u56DE\u5408\u7684\u5BF9\u8BDD\u4E0A\u4E0B\u6587**\u672A\u4FDD\u7559**\uFF0C\u8BF7\u4EE5\u672C\u56DE\u5408\u7ED9\u51FA\u7684\u4FE1\u606F\u4E3A\u51C6\uFF08\u5DE5\u4F5C\u533A\u6587\u4EF6\u4E0E git \u72B6\u6001\u4ECD\u5728\uFF09\u3002" : "";
+  const originalPrompt = input.taskPrompt?.trim() ? `
+
+\u3010\u539F\u59CB\u4EFB\u52A1\u9700\u6C42\uFF08\u672C\u8F6E\u662F\u540C\u4E00\u6B21\u5DE5\u4F5C\u7684\u5EF6\u7EED\uFF09\u3011
+${input.taskPrompt.trim()}` : "";
+  return `\u3010\u8FD0\u884C\u4E2D\u6253\u65AD \xB7 \u8BF7\u5148\u6309\u8FD9\u4E9B\u610F\u89C1\u8C03\u6574\uFF0C\u518D\u7EE7\u7EED\u3011
+\u4F60\u6B63\u5728\u6267\u884C\u7B2C ${input.turnNo - 1} \u56DE\u5408\uFF0C\u4EBA\u5728\u8FD0\u884C\u8FC7\u7A0B\u4E2D\u63D0\u51FA\u4E86\u4EE5\u4E0B\u610F\u89C1\uFF08\u6309\u63D0\u51FA\u987A\u5E8F\uFF09\uFF1A
+
+${opinions}
+
+\u8981\u6C42\uFF1A
+1. \u5148\u9010\u6761\u5904\u7406\u4E0A\u8FF0\u610F\u89C1\uFF0C\u518D\u7EE7\u7EED\u5B8C\u6210\u672C\u4EFB\u52A1\uFF1B\u610F\u89C1\u4E0E\u539F\u59CB\u9700\u6C42\u51B2\u7A81\u65F6**\u4EE5\u610F\u89C1\u4E3A\u51C6**\uFF0C\u5E76\u5728\u6700\u7EC8\u603B\u7ED3\u91CC\u8BF4\u660E\u5DEE\u5F02\u3002
+2. \u4E0D\u8981\u63A8\u7FFB\u4E0A\u8FF0\u610F\u89C1\u672A\u6D89\u53CA\u7684\u90E8\u5206\uFF1B\u5DF2\u7ECF\u5B8C\u6210\u4E14\u4E0D\u5728\u610F\u89C1\u8303\u56F4\u5185\u7684\u6539\u52A8\u4FDD\u7559\u3002
+3. \u4E0A\u4E00\u56DE\u5408\u5728\u5B89\u5168\u70B9\u88AB\u4E2D\u65AD\uFF0C\u5176\u4E2D\u7684\u5DE5\u5177\u8FDB\u5EA6\u5DF2\u4E22\u5F03\u3001\u88AB\u4E2D\u65AD\u7684\u8C03\u7528**\u6CA1\u6709\u7ED3\u679C**\uFF08\u65F6\u95F4\u7EBF\u4E0A\u6807\u4E3A\u5DF2\u4E2D\u65AD\uFF09\u2014\u2014\u9700\u8981\u65F6\u91CD\u65B0\u6267\u884C\uFF0C\u4E0D\u8981\u5047\u5B9A\u5B83\u5DF2\u6210\u529F\u3002${resetNote}${originalPrompt}`;
+}
+
+// src/daemon/stage-contracts.ts
+var STAGE_CONTRACTS = {
+  todo: `## \u672C\u4EFB\u52A1\u9636\u6BB5\uFF1A\u5F85\u5206\u6790\uFF08\u9700\u6C42\u5206\u6790\uFF09
+
+\u53EA\u505A\u9700\u6C42\u5206\u6790\uFF0C\u4E0D\u5199\u4EE3\u7801\uFF1A\u5224\u65AD\u9700\u6C42\u662F\u5426\u6E05\u6670\u53EF\u5F00\u53D1\uFF0C\u4EA7\u51FA\u53EF\u6267\u884C\u7684\u65B9\u6848\u3001\u8303\u56F4\u4E0E\u98CE\u9669\u3001\u9A8C\u6536\u70B9\uFF0C\u4E3A\u5F00\u53D1\u63D0\u4F9B\u8F93\u5165\u3002\u4E0D\u5EFA\u5206\u652F\u3001\u4E0D\u63D0 PR\u3002
+
+\u7ED3\u8BBA\u5FC5\u987B\u4EE5\u673A\u5668\u534F\u8BAE\u4E0A\u62A5\uFF08\u547D\u4EE4\u7528\u6CD5\u89C1 \`morula-working-on-issues\` skill \u4E0E \`morula task --help\`\uFF09\uFF0C\u5426\u5219\u4EFB\u52A1\u4F1A\u505C\u5728\u300C\u5F85\u5206\u6790\u300D\u3002`,
+  in_progress: `## \u672C\u4EFB\u52A1\u9636\u6BB5\uFF1A\u5F00\u53D1\u5B9E\u73B0
+
+\u6309\u4EFB\u52A1\u63CF\u8FF0\u4E0E\u5206\u6790\u7ED3\u8BBA\u5B8C\u6210\u4EE3\u7801\u6539\u52A8\uFF0C\u672C\u5730\u81EA\u9A8C\u8BC1\uFF08\u6784\u5EFA/\u6D4B\u8BD5\uFF09\u901A\u8FC7\u540E\u63D0\u4EA4 MR\u3002\u53EA\u505A\u6700\u5C0F\u5FC5\u8981\u6539\u52A8\uFF0C\u4E0D\u505A\u65E0\u5173\u91CD\u6784\uFF1B\u4E0D\u5408\u5E76 MR\u3001\u4E0D\u505A\u8BC4\u5BA1\u7ED3\u8BBA\u3002
+
+\u63D0\u4EA4 MR \u5FC5\u987B\u8D70\u5E73\u53F0\u901A\u9053\uFF08\u7528\u6CD5\u89C1 \`morula-working-on-issues\` skill \u4E0E \`morula repo --help\`\uFF09\uFF1B\u88AB\u73AF\u5883\u963B\u65AD\u65F6\u5982\u5B9E\u62A5\u544A\u963B\u585E\u539F\u56E0\uFF08PR_BLOCKED + \u539F\u56E0\uFF09\uFF0C\u4E0D\u8981\u5047\u88C5\u5B8C\u6210\u3002`,
+  review: `## \u672C\u4EFB\u52A1\u9636\u6BB5\uFF1ACode Review
+
+\u53EA\u8BFB\u8BC4\u5BA1\uFF0C\u4E0D\u4FEE\u6539\u4EE3\u7801\uFF1A\u57FA\u4E8E**\u771F\u5B9E diff**\uFF08PR \u5206\u652F\u76F8\u5BF9\u76EE\u6807\u5206\u652F\uFF09\u8BC4\u4F30\u6B63\u786E\u6027 / \u5B89\u5168\u6027 / \u98CE\u683C / \u6D4B\u8BD5\u8986\u76D6 / \u662F\u5426\u7B26\u5408\u539F\u59CB\u9700\u6C42\uFF0C\u7ED9\u51FA\u660E\u786E\u7ED3\u8BBA\u4E0E\u5177\u4F53\u610F\u89C1\u3002\u4E0D\u5EFA\u5206\u652F\u3001\u4E0D\u5408\u5E76 MR\u3001\u4E0D\u8BC4\u5BA1\u81EA\u5DF1\u5F00\u53D1\u7684\u4EFB\u52A1\u3002
+
+\u7ED3\u8BBA\u5FC5\u987B\u4EE5\u673A\u5668\u534F\u8BAE\u4E0A\u62A5\uFF08\u547D\u4EE4\u7528\u6CD5\u89C1 \`morula-working-on-issues\` skill \u4E0E \`morula review --help\`\uFF09\uFF0C\u672A\u4E0A\u62A5\u5219\u4EFB\u52A1\u505C\u5728\u300C\u5F85\u8BC4\u5BA1\u300D\u3002`
+};
+var AUTOPILOT_CONTRACT = `## \u672C\u4EFB\u52A1\uFF1A\u81EA\u52A8\u5316\u5DE1\u68C0\uFF08\u7531\u300C\u81EA\u52A8\u5316\u300D\u7684\u5B9A\u65F6 / Webhook / \u624B\u52A8\u89E6\u53D1\uFF09
+
+\u6309\u4EFB\u52A1\u8BF4\u660E\uFF08runbook\uFF09\u6267\u884C\uFF0C\u4EA7\u51FA**\u62A5\u544A**\uFF1A\`morula report create --title <\u6807\u9898> --content-file <md>\`
+\uFF08\u7701\u7565 --autopilot \u65F6\u670D\u52A1\u7AEF\u81EA\u52A8\u5F52\u5C5E\u672C\u81EA\u52A8\u5316\uFF1B\u957F\u5185\u5BB9\u4E00\u5F8B\u7528 --content-file\uFF09\u3002
+
+- \u53EA\u8BFB\u4E3A\u4E3B\uFF1A\u4E0D\u6539\u4E1A\u52A1\u6570\u636E\u3001\u4E0D\u5EFA\u5206\u652F\u3001\u4E0D\u63D0 PR\uFF08\u9664\u975E\u4EFB\u52A1\u8BF4\u660E\u660E\u786E\u8981\u6C42\uFF09\u3002
+- \u7ED3\u8BBA\u5199\u8FDB\u6700\u7EC8\u8F93\u51FA\uFF0C\u5E76\u540C\u6B65\u843D\u4E00\u4EFD\u62A5\u544A\uFF1B\u62A5\u544A\u91CC\u7ED9\u300C\u6587\u4EF6:\u884C + \u4E25\u91CD\u5EA6 + \u5EFA\u8BAE\u300D\u8FD9\u7C7B\u53EF\u6267\u884C\u4FE1\u606F\u3002
+- \u4E0D\u8981\u8C03\u7528 \`morula task state\` / \`morula task analysis-verdict\` / \`morula review submit\`\uFF1A
+  \u672C\u4EFB\u52A1\u6CA1\u6709\u5173\u8054\u4E1A\u52A1\u4EFB\u52A1\uFF0C\u8FD9\u4E9B\u8C03\u7528\u4F1A\u88AB\u5E73\u53F0\u62D2\u7EDD\u3002
+- \u9700\u8981\u5728 MR \u4E0A\u7559\u8BC4\u5BA1\u610F\u89C1\u65F6\u7528 \`morula repo mr comment\`\uFF08\u53EA\u5199\u8BC4\u8BBA\uFF0C\u4E0D approve\u3001\u4E0D merge\uFF09\u3002
+  **\u5199\u4E4B\u524D\u5FC5\u987B\u5148 \`morula repo mr get <taskId> --mr <iid> --notes\` \u8BFB\u5DF2\u6709\u8BA8\u8BBA**\uFF1A
+  \u5982\u679C\u672C\u81EA\u52A8\u5316\u5DF2\u5C31\u540C\u4E00\u95EE\u9898\u7559\u8FC7\u8BC4\u8BBA\u3001\u7ED3\u8BBA\u4E0E\u8FD9\u6B21\u4E00\u81F4\uFF0C\u5C31\u4E0D\u8981\u518D\u8BC4\u8BBA\uFF08\u5E73\u53F0\u4E0D\u505A\u53BB\u91CD\uFF0C\u91CD\u590D\u7531\u4F60\u907F\u514D\uFF09\uFF1B
+  \u53EA\u6709\u51FA\u73B0\u65B0\u95EE\u9898\u6216\u7ED3\u8BBA\u53D8\u5316\u65F6\u624D\u5199\u65B0\u8BC4\u8BBA\u3002\u8BC4\u8BBA\u672B\u5C3E\u5E26\u7F72\u540D\u884C \`> \u7531\u81EA\u52A8\u5316\u300C<\u540D\u79F0>\u300D\u4E8E <\u65E5\u671F> \u751F\u6210\`\uFF0C
+  \u4F9B\u4F60\u81EA\u5DF1\u5728\u4E0B\u4E00\u8F6E\u8BC6\u522B\u5386\u53F2\u8BC4\u8BBA\u3002
+
+## \u80FD\u529B\u5165\u53E3\uFF08\u6267\u884C\u65B9\u5F0F\u7531\u5E73\u53F0\u8D1F\u8D23\uFF0C\u4EFB\u52A1\u8BF4\u660E\u91CC\u4E0D\u4F1A\u5199\u8FD9\u4E9B\uFF09
+
+- \u672C\u4EFB\u52A1\u4E0E\u5E73\u53F0\u4EA4\u4E92**\u53EA\u80FD**\u901A\u8FC7 \`morula\` CLI\uFF1A\u672C\u4EFB\u52A1**\u6CA1\u6709**\u5E73\u53F0\u5DE5\u5177 / MCP \u8C03\u7528\u9762
+  \uFF08\`create_object\`\u3001\`create_report\` \u8FD9\u7C7B\u5DE5\u5177\u5728\u672C\u4EFB\u52A1\u5185\u4E0D\u53EF\u7528\uFF09\uFF1B\u547D\u4EE4\u53C2\u6570\u4EE5 \`morula <resource> --help\` \u4E3A\u51C6\u3002
+- \u4ED3\u5E93\u8BFB\u53D6\u4E0E\u6539\u52A8\u3001\u5DE5\u4F5C\u533A\u5E03\u5C40\u3001\u5206\u652F\u4E0E MR \u89C4\u5219\u89C1\u5DF2\u6CE8\u5165\u7684\u534F\u4F5C\u5951\u7EA6 skill\uFF08\xA70.5 \u4ED3\u5E93\u4E0E\u5DE5\u4F5C\u76EE\u5F55\uFF09\u3002
+- \u8981\u7ED9\u4EBA\u751F\u6210\u5F85\u8DDF\u8FDB\u7684\u4EFB\u52A1\uFF1A\`morula task create --space <spaceId> --title <\u6807\u9898> --description <\u5185\u5BB9>\`
+  \uFF08\`<spaceId>\` \u53D6 \`morula task get\` \u8FD4\u56DE\u7684 \`contextSnapshot\`\uFF09\uFF1B\u65B0\u5EFA\u4EFB\u52A1\u9ED8\u8BA4\u843D\u300C\u5F85\u89C4\u5212\u300D\uFF0C
+  \u7531\u4EBA\u786E\u8BA4\u540E\u518D\u6D3E\u53D1\u4FEE\u590D\u3002\u62A5\u544A\u4E0E\u4EFB\u52A1\u662F\u4E24\u4E2A\u57DF\uFF0C\u4E0D\u8981\u628A\u5F85\u529E\u4E8B\u9879\u5199\u8FDB\u62A5\u544A\u6B63\u6587\u5F53\u4EFB\u52A1\u7528\u3002`;
+function buildStageContract(stageCode, source) {
+  if (source === "autopilot")
+    return AUTOPILOT_CONTRACT;
+  if (!stageCode)
+    return "";
+  return STAGE_CONTRACTS[stageCode] ?? "";
+}
+
 // src/daemon/ws-client.ts
 import { createHash as createHash2 } from "node:crypto";
 import { io } from "socket.io-client";
@@ -6135,10 +6648,49 @@ var DaemonWsClient = class {
   authReloads = 0;
   reconnectAttempts = 0;
   pollOnly = false;
+  /**
+   * P1：已订阅的任务房间（taskId → afterSeq）。**订阅意图独立于连接状态**——
+   * 连接未就绪（初始连接中 / 重连中 / 凭证重载重建 socket）时先登记，连上后由 `joinTaskRooms()` 重放，
+   * 否则「连上之前 claim 到的任务」永远收不到消息（服务端不发 tenant 广播）。
+   */
+  taskRooms = /* @__PURE__ */ new Map();
   /** 是否已降级为 poll-only（认证长期失败；runner 的 poll 兜底继续工作） */
   get isPollOnly() {
     return this.pollOnly;
   }
+  /** 当前已订阅的任务房间（诊断/测试用只读快照） */
+  get subscribedTaskIds() {
+    return [...this.taskRooms.keys()];
+  }
+  /**
+   * P1：订阅 `task:<taskId>` 房间（幂等）——本 run 的对话消息（`agent-task:message`）只发进该房间。
+   *
+   * 连接未就绪时只登记（连上后 `joinTaskRooms()` 补发），保证「先 claim 后连上」也不漏帧。
+   * `afterSeq`：与前端同口径的订阅水位（补齐由 HTTP 拉取负责，见 runner 的 catch-up）。
+   */
+  subscribeTask(taskId, afterSeq = 0) {
+    this.taskRooms.set(taskId, afterSeq);
+    if (this.socket?.connected)
+      this.socket.emit("subscribe:task", { taskId, afterSeq });
+  }
+  /**
+   * P1：退订 `task:<taskId>` 房间（run 终态调用；未订阅时是 no-op）。
+   * 意图表与 socket 两侧都要清——否则重连重放会把已结束任务的房间重新订上（泄漏：消息队列只增不减）。
+   */
+  unsubscribeTask(taskId) {
+    if (!this.taskRooms.delete(taskId))
+      return;
+    if (this.socket?.connected)
+      this.socket.emit("unsubscribe:task", { taskId });
+  }
+  /** 把已登记的任务房间订阅重放到当前 socket（首次连接 / 重连 / 换票重建都走这里） */
+  joinTaskRooms() {
+    const socket = this.socket;
+    if (!socket)
+      return;
+    for (const [taskId, afterSeq] of this.taskRooms)
+      socket.emit("subscribe:task", { taskId, afterSeq });
+  }
   /** 当前凭证指纹（日志用；不泄露本体） */
   get tokenFingerprint() {
     return tokenFingerprint(this.currentToken);
@@ -6176,6 +6728,9 @@ var DaemonWsClient = class {
       this.reconnectAttempts = 0;
       this.authReloads = 0;
       console.log(`[daemon] WS \u5DF2\u8FDE\u63A5\uFF08${(/* @__PURE__ */ new Date()).toISOString()}\uFF09`);
+      this.joinTaskRooms();
+      for (const taskId of this.taskRooms.keys())
+        handlers.onTaskResubscribed?.(taskId);
     });
     socket.on("agent-task:dispatched", (payload) => {
       handlers.onTaskDispatched(payload.taskId, payload.runtimeId);
@@ -6194,6 +6749,11 @@ var DaemonWsClient = class {
       void reason;
       handlers.onDisconnected();
     });
+    socket.on("agent-task:message", (payload) => {
+      const event = parseTaskMessageFrame(payload);
+      if (event)
+        handlers.onTaskMessage(event);
+    });
     socket.on("connect_error", (error) => {
       this.onConnectError(socket, error);
     });
@@ -6291,30 +6851,6 @@ var DaemonWsClient = class {
   }
 };
 
-// src/daemon/stage-contracts.ts
-var STAGE_CONTRACTS = {
-  todo: `## \u672C\u4EFB\u52A1\u9636\u6BB5\uFF1A\u5F85\u5206\u6790\uFF08\u9700\u6C42\u5206\u6790\uFF09
-
-\u53EA\u505A\u9700\u6C42\u5206\u6790\uFF0C\u4E0D\u5199\u4EE3\u7801\uFF1A\u5224\u65AD\u9700\u6C42\u662F\u5426\u6E05\u6670\u53EF\u5F00\u53D1\uFF0C\u4EA7\u51FA\u53EF\u6267\u884C\u7684\u65B9\u6848\u3001\u8303\u56F4\u4E0E\u98CE\u9669\u3001\u9A8C\u6536\u70B9\uFF0C\u4E3A\u5F00\u53D1\u63D0\u4F9B\u8F93\u5165\u3002\u4E0D\u5EFA\u5206\u652F\u3001\u4E0D\u63D0 PR\u3002
-
-\u7ED3\u8BBA\u5FC5\u987B\u4EE5\u673A\u5668\u534F\u8BAE\u4E0A\u62A5\uFF08\u547D\u4EE4\u7528\u6CD5\u89C1 \`morula-working-on-issues\` skill \u4E0E \`morula task --help\`\uFF09\uFF0C\u5426\u5219\u4EFB\u52A1\u4F1A\u505C\u5728\u300C\u5F85\u5206\u6790\u300D\u3002`,
-  in_progress: `## \u672C\u4EFB\u52A1\u9636\u6BB5\uFF1A\u5F00\u53D1\u5B9E\u73B0
-
-\u6309\u4EFB\u52A1\u63CF\u8FF0\u4E0E\u5206\u6790\u7ED3\u8BBA\u5B8C\u6210\u4EE3\u7801\u6539\u52A8\uFF0C\u672C\u5730\u81EA\u9A8C\u8BC1\uFF08\u6784\u5EFA/\u6D4B\u8BD5\uFF09\u901A\u8FC7\u540E\u63D0\u4EA4 MR\u3002\u53EA\u505A\u6700\u5C0F\u5FC5\u8981\u6539\u52A8\uFF0C\u4E0D\u505A\u65E0\u5173\u91CD\u6784\uFF1B\u4E0D\u5408\u5E76 MR\u3001\u4E0D\u505A\u8BC4\u5BA1\u7ED3\u8BBA\u3002
-
-\u63D0\u4EA4 MR \u5FC5\u987B\u8D70\u5E73\u53F0\u901A\u9053\uFF08\u7528\u6CD5\u89C1 \`morula-working-on-issues\` skill \u4E0E \`morula repo --help\`\uFF09\uFF1B\u88AB\u73AF\u5883\u963B\u65AD\u65F6\u5982\u5B9E\u62A5\u544A\u963B\u585E\u539F\u56E0\uFF08PR_BLOCKED + \u539F\u56E0\uFF09\uFF0C\u4E0D\u8981\u5047\u88C5\u5B8C\u6210\u3002`,
-  review: `## \u672C\u4EFB\u52A1\u9636\u6BB5\uFF1ACode Review
-
-\u53EA\u8BFB\u8BC4\u5BA1\uFF0C\u4E0D\u4FEE\u6539\u4EE3\u7801\uFF1A\u57FA\u4E8E**\u771F\u5B9E diff**\uFF08PR \u5206\u652F\u76F8\u5BF9\u76EE\u6807\u5206\u652F\uFF09\u8BC4\u4F30\u6B63\u786E\u6027 / \u5B89\u5168\u6027 / \u98CE\u683C / \u6D4B\u8BD5\u8986\u76D6 / \u662F\u5426\u7B26\u5408\u539F\u59CB\u9700\u6C42\uFF0C\u7ED9\u51FA\u660E\u786E\u7ED3\u8BBA\u4E0E\u5177\u4F53\u610F\u89C1\u3002\u4E0D\u5EFA\u5206\u652F\u3001\u4E0D\u5408\u5E76 MR\u3001\u4E0D\u8BC4\u5BA1\u81EA\u5DF1\u5F00\u53D1\u7684\u4EFB\u52A1\u3002
-
-\u7ED3\u8BBA\u5FC5\u987B\u4EE5\u673A\u5668\u534F\u8BAE\u4E0A\u62A5\uFF08\u547D\u4EE4\u7528\u6CD5\u89C1 \`morula-working-on-issues\` skill \u4E0E \`morula review --help\`\uFF09\uFF0C\u672A\u4E0A\u62A5\u5219\u4EFB\u52A1\u505C\u5728\u300C\u5F85\u8BC4\u5BA1\u300D\u3002`
-};
-function buildStageContract(stageCode) {
-  if (!stageCode)
-    return "";
-  return STAGE_CONTRACTS[stageCode] ?? "";
-}
-
 // src/daemon/runner.ts
 var HEARTBEAT_INTERVAL_MS = 3e4;
 var POLL_INTERVAL_MS = 15e3;
@@ -6322,6 +6858,30 @@ var TICK_BUDGET_MS = 6e4;
 var OUTBOX_REPLAY_MAX_FAILURES = 5;
 var OUTBOX_REPLAY_PAUSE_MS = 5 * 6e4;
 var OUTBOX_MAX_ATTEMPTS_PER_ROUND = 2;
+var PROGRESS_BATCH_MAX = 500;
+var OBSERVATION_WARN_INTERVAL_MS = 3e4;
+var TERMINAL_OBSERVATION_DRAIN_BUDGET_MS = Number(process.env.MORULA_TERMINAL_DRAIN_BUDGET_MS ?? 2e3);
+async function drainObservationTail(args) {
+  const startedAt = Date.now();
+  const progressDrained = await waitWithin(args.progress, args.budgetMs);
+  const remaining = args.budgetMs - (Date.now() - startedAt);
+  await waitWithin(args.stream, Math.max(0, remaining));
+  return { progressDrained, streamDrained: !args.streamPending() };
+}
+async function waitWithin(promise, ms) {
+  if (ms <= 0)
+    return false;
+  let timer;
+  const timeout = new Promise((resolve2) => {
+    timer = setTimeout(resolve2, ms, false);
+    timer.unref?.();
+  });
+  const settled = promise.then(() => true, () => true);
+  const done = await Promise.race([settled, timeout]);
+  if (timer)
+    clearTimeout(timer);
+  return done;
+}
 var OUTBOX_PERMANENT_CODES = ["NOT_FOUND", "CONFLICT"];
 var DEFAULT_MODEL = "deepseek-v4-flash";
 var DaemonRunner = class {
@@ -6360,6 +6920,16 @@ var DaemonRunner = class {
   cancels = /* @__PURE__ */ new Map();
   /** Phase 2：审批决策等待表（approvalId → resolver；WS 事件 resolve，轮询兜底） */
   pendingApprovals = /* @__PURE__ */ new Map();
+  /**
+   * P1（features/stage-runtime-live-chat.md §P1-9）：本 run 的对话消息内存队列
+   * （taskId → 按 seq 升序的消息）。与 `cancels` / `pendingApprovals` 同款：进程内 per-task 状态，
+   * `handleTask` 收尾清空（跨任务不泄漏）。
+   *
+   * 用途只有两个：① ACP 会话建立瞬间对「本轮吃掉的」消息回执 `consumed`；
+   * ② WS 帧与 HTTP 补齐的**去重合并**（同一条消息两条通道都会来）。
+   * 消息的权威状态与投递都在服务端，这里只是镜像（不做投递决策）。
+   */
+  pendingMessages = /* @__PURE__ */ new Map();
   dimPath;
   model;
   /** 独立 dim 数据空间 env 覆盖（DIMCODE_HOME=~/.morula/dimcode；空对象=初始化失败回退共享空间） */
@@ -6454,31 +7024,7 @@ var DaemonRunner = class {
     this.log(`[daemon] \u5DF2\u6CE8\u518C runtime=${registered.id} daemonId=${cfg.daemonId}`);
     this.repoCheckout?.setRuntimeId(registered.id);
     this.startHeartbeatTimer();
-    this.ws.connect({
-      onTaskDispatched: (taskId, runtimeId) => {
-        this.onTaskDispatched(taskId, runtimeId);
-      },
-      // M1-A1：取消信号 → 中断执行中的 dim 进程
-      onTaskCancelled: (taskId) => {
-        const ctrl = this.cancels.get(taskId);
-        if (ctrl) {
-          this.log(`[daemon] \u6536\u5230\u53D6\u6D88\u4FE1\u53F7 task=${taskId}\uFF0C\u4E2D\u65AD\u6267\u884C`);
-          ctrl.abort();
-          this.cancels.delete(taskId);
-        }
-      },
-      onDisconnected: () => {
-      },
-      // Phase 2：审批决策 → resolve 等待者（daemon 侧 ACP permission/response）
-      onApprovalDecision: (event) => {
-        const waiter = this.pendingApprovals.get(event.approvalId);
-        if (waiter) {
-          clearTimeout(waiter.timer);
-          this.pendingApprovals.delete(event.approvalId);
-          waiter.resolve(event.decision);
-        }
-      }
-    });
+    this.ws.connect(this.buildWsHandlers());
     void this.replayOutbox();
     while (this.running) {
       await this.tick();
@@ -6608,6 +7154,7 @@ var DaemonRunner = class {
         }
       } catch {
       }
+      void this.catchUpTaskMessages(taskId);
     }
     void this.replayOutbox();
     try {
@@ -6797,6 +7344,48 @@ var DaemonRunner = class {
     }, Math.max(0, nextAt - Date.now()));
     this.outboxTimer.unref?.();
   }
+  /**
+   * WS 下行事件 → runner 逻辑的接线（§6.2 主通道）。
+   *
+   * 抽成方法而不是内联在 `start()` 里：`start()` 需要注册/网络才跑得起来，
+   * 拆开后单测可直接拿到 handlers 驱动事件（不必起 socket、不必真连服务端）。
+   */
+  buildWsHandlers() {
+    return {
+      onTaskDispatched: (taskId, runtimeId) => {
+        this.onTaskDispatched(taskId, runtimeId);
+      },
+      // M1-A1：取消信号 → 中断执行中的 dim 进程
+      onTaskCancelled: (taskId) => {
+        const ctrl = this.cancels.get(taskId);
+        if (ctrl) {
+          this.log(`[daemon] \u6536\u5230\u53D6\u6D88\u4FE1\u53F7 task=${taskId}\uFF0C\u4E2D\u65AD\u6267\u884C`);
+          ctrl.abort();
+          this.cancels.delete(taskId);
+        }
+      },
+      onDisconnected: () => {
+      },
+      // Phase 2：审批决策 → resolve 等待者（daemon 侧 ACP permission/response）
+      onApprovalDecision: (event) => {
+        const waiter = this.pendingApprovals.get(event.approvalId);
+        if (waiter) {
+          clearTimeout(waiter.timer);
+          this.pendingApprovals.delete(event.approvalId);
+          waiter.resolve(event.decision);
+        }
+      },
+      // P1：本 run 的对话消息（房间 task:<taskId>）→ 去重合并进内存队列；
+      // 回执时机是「ACP 会话建立瞬间」（见 runOnce 的 session 分支），不是收到就回执。
+      onTaskMessage: (event) => {
+        this.enqueueTaskMessages(event);
+      },
+      // P1：重连后房间已重放 → 立即按 afterSeq 重新补齐（断连期间的帧不会补发，只能拉）
+      onTaskResubscribed: (taskId) => {
+        void this.catchUpTaskMessages(taskId);
+      }
+    };
+  }
   /**
    * 派发事件入口（P0-b，issues/agent-task-false-failure-on-daemon-fetch-error.md）：
    * 服务端把派发事件发到 **tenant 房间**（daemon-executor.service.ts `sendToTenant`，WS 无 per-runtime
@@ -6828,6 +7417,8 @@ var DaemonRunner = class {
         return;
       }
       claimed = true;
+      this.ws.subscribeTask(taskId, 0);
+      void this.catchUpTaskMessages(taskId);
       await this.executeTask(taskId, ctrl.signal);
     } catch (error) {
       if (ctrl.signal.aborted) {
@@ -6845,9 +7436,148 @@ var DaemonRunner = class {
     } finally {
       this.cancels.delete(taskId);
       this.processing.delete(taskId);
+      this.ws.unsubscribeTask(taskId);
+      this.pendingMessages.delete(taskId);
       this.api.clearTaskToken(taskId);
     }
   }
+  /**
+   * P1 消息入队（§P1-9 第 2/3 条）：`agent-task:message` 帧与 `GET /chat` 补齐共用同一条合并路径
+   * （合并规则见 `upsertTaskMessages`：按 id 去重、按 seq 升序、超上限丢最旧）。
+   *
+   * 只接受**正在本机处理**的任务：房间退订后仍可能到达迟到帧，别的任务/别的设备的帧也可能因重连重放而来。
+   * 若不设这道闸，队列会出现无人回收的 taskId（收尾只清 `processing` 里的任务）→ 跨任务泄漏。
+   */
+  enqueueTaskMessages(frame) {
+    if (!this.processing.has(frame.taskId))
+      return;
+    const { messages, dropped } = upsertTaskMessages(this.pendingMessages.get(frame.taskId) ?? [], frame.messages);
+    this.pendingMessages.set(frame.taskId, messages);
+    if (dropped > 0)
+      this.log(`[daemon] \u4EFB\u52A1 ${frame.taskId} \u5BF9\u8BDD\u6D88\u606F\u961F\u5217\u8D85\u4E0A\u9650 ${TASK_MESSAGE_QUEUE_MAX}\uFF0C\u5DF2\u4E22\u5F03\u6700\u65E7 ${dropped} \u6761`);
+  }
+  /**
+   * P1 补齐（§P1-9 第 3 条）：订阅后 / 重连重订阅后拉本线程消息，与 WS 帧走同一条去重合并。
+   *
+   * **拉取才是 correctness path**（WS 只是唤醒，断了就不重发）：这是「跑通期间收到的消息一条不丢」的保证。
+   * 失败**只记日志**：补齐是兜底能力，不能反过来打断正在跑的 run（旧服务端无此端点 → 404 也走这里）。
+   */
+  async catchUpTaskMessages(taskId) {
+    try {
+      const chat = await this.api.listTaskChat(taskId, { afterSeq: 0 });
+      const rows = chat?.messages ?? [];
+      if (rows.length === 0)
+        return;
+      this.enqueueTaskMessages({
+        type: "agent-task:message",
+        taskId,
+        objectId: chat?.thread?.objectId ?? null,
+        anchorKey: chat?.thread?.anchorKey ?? "",
+        messages: rows
+      });
+    } catch (error) {
+      this.log(`[daemon] \u4EFB\u52A1 ${taskId} \u5BF9\u8BDD\u6D88\u606F\u8865\u9F50\u5931\u8D25: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  }
+  /**
+   * P1/P3 消费回执：对**本轮真正进入执行上下文**的消息回执 `consumed{turnNo}`。
+   *
+   * 判据严格限定 `targetTaskId === taskId`：这类消息才是服务端合并进本轮 prompt 的。
+   * `targetTaskId` 为 null / 别的 run 的消息**仍在服务端排队**，会由投递器合并进后续 follow-up run ——
+   * 对它们回执等于把话丢掉。`delivered` 不回执（服务端创建 follow-up run 时自己置位）。
+   *
+   * `excludeSteer`（P3）：首回合**不能**把打断请求算成「已消费」——它没进首回合的 prompt，
+   * 而是要在下一个安全点打断后由 `consumeSteer` 注入下一回合（见 `buildSteerPort`）。
+   *
+   * fire-and-forget + `.catch(log)`：服务端行状态是权威，丢一次回执不影响消息本身，
+   * 但绝不能因此拖慢或打断本轮执行。回执发出后即从内存队列移除（本 run 只消费一次）。
+   */
+  ackConsumedMessages(taskId, turnNo = 1, options = {}) {
+    const queued = this.pendingMessages.get(taskId);
+    if (!queued || queued.length === 0)
+      return [];
+    const consumed = selectConsumedMessages(queued, taskId).filter((message) => !options.excludeSteer || message.mode !== "steer");
+    if (consumed.length === 0)
+      return [];
+    for (const message of consumed) {
+      void this.api.ackMessage(taskId, message.id, { state: "consumed", turnNo }).catch((error) => {
+        this.log(`[daemon] \u4EFB\u52A1 ${taskId} \u6D88\u606F\u56DE\u6267\u5931\u8D25 message=${message.id}: ${error instanceof Error ? error.message : String(error)}`);
+      });
+    }
+    const consumedIds = new Set(consumed.map((message) => message.id));
+    this.pendingMessages.set(taskId, queued.filter((message) => !consumedIds.has(message.id)));
+    return consumed.map((message) => message.id);
+  }
+  /**
+   * P3：本 run 待处理的打断请求（按 seq 升序，取一条用于触发；`consume` 时全部取走）。
+   * 判据见 `selectSteerMessages`（严格要求已投给本 run）。
+   */
+  pendingSteerMessages(taskId) {
+    return selectSteerMessages(this.pendingMessages.get(taskId) ?? [], taskId);
+  }
+  /**
+   * 取走打断请求并给出下一回合的 prompt（P3）。取走即回执 `consumed{turnNo}`——
+   * 此刻这句话**确实**进了下一回合的 prompt，语义诚实（不是「猜它进去了」）。
+   */
+  consumeSteer(taskId, detail, turnNo, sessionReset) {
+    const messages = this.pendingSteerMessages(taskId);
+    if (messages.length > 0) {
+      const ids = new Set(messages.map((message) => message.id));
+      this.pendingMessages.set(taskId, (this.pendingMessages.get(taskId) ?? []).filter((message) => !ids.has(message.id)));
+      for (const message of messages) {
+        void this.api.ackMessage(taskId, message.id, { state: "consumed", turnNo }).catch((error) => {
+          this.log(`[daemon] \u4EFB\u52A1 ${taskId} \u6253\u65AD\u6D88\u606F\u56DE\u6267\u5931\u8D25 message=${message.id}: ${error instanceof Error ? error.message : String(error)}`);
+        });
+      }
+      this.log(`[daemon] \u4EFB\u52A1 ${taskId} \u6253\u65AD\u8BF7\u6C42\u5DF2\u6CE8\u5165\u7B2C ${turnNo} \u56DE\u5408 prompt\uFF08${messages.length} \u6761\uFF09`);
+    } else {
+      this.log(`[daemon] \u4EFB\u52A1 ${taskId} \u8FDB\u5165\u7B2C ${turnNo} \u56DE\u5408\uFF0C\u4F46\u6253\u65AD\u8BF7\u6C42\u5DF2\u88AB\u6E05\u7A7A\uFF08\u6309\u539F\u59CB\u9700\u6C42\u7EE7\u7EED\uFF09`);
+    }
+    return buildSteerPrompt({
+      turnNo,
+      messages,
+      taskPrompt: detail.taskPrompt,
+      sessionReset
+    });
+  }
+  /**
+   * P3：运行中打断端口（provider 侧的「怎么停、下一轮说什么」全从这里取，见 `ProviderSteerPort`）。
+   *
+   * `MORULA_LIVE_CHAT_STEER=0` 时不提供端口 = 退回单回合（steer 消息留在队列里，
+   * run 终态由服务端 D27 按 follow-up 轮次投递）——破坏性档必须有一键回退路径（§八）。
+   */
+  buildSteerPort(taskId, detail) {
+    if (!isFlagEnabled("MORULA_LIVE_CHAT_STEER", true))
+      return null;
+    return {
+      peek: () => {
+        const [first] = this.pendingSteerMessages(taskId);
+        return first ? { messageId: first.id } : null;
+      },
+      onInterrupting: ({ turnNo, messageId }) => {
+        this.log(`[daemon] \u4EFB\u52A1 ${taskId} \u6253\u65AD\u4E2D\uFF08\u7B2C ${turnNo} \u56DE\u5408\uFF0C\u5B89\u5168\u70B9\u4E2D\u65AD\uFF09message=${messageId}`);
+        void this.api.ackMessage(taskId, messageId, { state: "interrupting", turnNo }).catch((error) => {
+          this.log(`[daemon] \u4EFB\u52A1 ${taskId} \u6253\u65AD\u4E2D\u56DE\u6267\u5931\u8D25 message=${messageId}: ${error instanceof Error ? error.message : String(error)}`);
+        });
+      },
+      consume: ({ turnNo, sessionReset }) => this.consumeSteer(taskId, detail, turnNo, sessionReset === true),
+      onTurnStarted: ({ turnNo, kind }) => {
+        void this.api.recordEvent(taskId, { type: "turn_started", turnNo, output: { kind } }).catch(() => {
+        });
+        if (kind === "initial")
+          this.ackConsumedMessages(taskId, turnNo, { excludeSteer: true });
+      },
+      onTurnInterrupted: ({ turnNo, reason, abortedTools }) => {
+        this.log(`[daemon] \u4EFB\u52A1 ${taskId} \u7B2C ${turnNo} \u56DE\u5408\u88AB\u4E2D\u65AD\uFF08${reason}${abortedTools.length > 0 ? `\uFF0C\u5728\u98DE\u5DE5\u5177 ${abortedTools.length} \u4E2A\u5DF2\u6807 aborted` : ""}\uFF09`);
+        void this.api.recordEvent(taskId, {
+          type: "turn_interrupted",
+          turnNo,
+          output: { reason, abortedTools }
+        }).catch(() => {
+        });
+      }
+    };
+  }
   async executeTask(taskId, signal) {
     const detail = await this.api.getTask(taskId);
     this.log(`[daemon] \u5F00\u59CB\u4EFB\u52A1 ${taskId}\uFF08${detail.executor.executorName}\uFF09`);
@@ -6961,7 +7691,15 @@ var DaemonRunner = class {
       writeCustomSkills(taskRoot, customSkills, this.log);
       this.log(`[daemon] \u5DF2\u6CE8\u5165 ${customSkills.length} \u4E2A\u81EA\u5B9A\u4E49 skill \u5230 .agents/skills/`);
     }
-    writeCollaborationSkill(taskRoot, repo, repoBaseUrl, this.log, detail.workContext?.baseBranch);
+    const contractPlatform = resolveContractPlatform(detail.availableRepos, repo, repoBaseUrl, detail.workContext?.baseBranch);
+    writeCollaborationSkill(
+      taskRoot,
+      contractPlatform.repoFullName,
+      contractPlatform.baseUrl,
+      this.log,
+      contractPlatform.baseBranch,
+      contractPlatform.provider
+    );
     writeTaskContextBrief(taskRoot, taskId, detail, repo, this.log);
     writeProjectAgentsMd(taskRoot, detail.projectAgentsMd, this.log);
     return { taskRoot, repoDir, worktreePath, env, repoBaseUrl };
@@ -7120,6 +7858,20 @@ var DaemonRunner = class {
     let thoughtBuf = "";
     let thoughtTimer = null;
     let streamFlushing = false;
+    const observationWarnAt = {};
+    const observationStats = { progressFailed: 0, progressDropped: 0, streamFailed: 0, streamDropped: 0 };
+    let progressDropAll = false;
+    let streamDropAll = false;
+    let progressPending = 0;
+    let streamInFlight = 0;
+    const streamPendingCount = () => streamChunks.length + streamInFlight;
+    const logObservation = (channel, event, reason, total) => {
+      const now = Date.now();
+      if (now - (observationWarnAt[channel] ?? 0) < OBSERVATION_WARN_INTERVAL_MS)
+        return;
+      observationWarnAt[channel] = now;
+      this.log(`[daemon] \u4EFB\u52A1 ${taskId} ${channel} ${event}\uFF08\u7D2F\u8BA1 ${total} \u6761\uFF09\uFF1A${reason}`);
+    };
     const progressBuf = [];
     let progressTimer = null;
     let progressChain = Promise.resolve();
@@ -7129,13 +7881,28 @@ var DaemonRunner = class {
       if (batch.length === 0)
         return progressChain;
       progressChain = progressChain.then(async () => {
-        for (const p of batch) {
-          await this.api.recordProgress(taskId, {
+        if (progressDropAll)
+          return;
+        progressPending += batch.length;
+        for (let offset = 0; offset < batch.length; offset += PROGRESS_BATCH_MAX) {
+          if (progressDropAll)
+            return;
+          const slice = batch.slice(offset, offset + PROGRESS_BATCH_MAX);
+          await this.api.recordProgressBatch(taskId, slice.map((p) => ({
             stage: p.stage,
             summary: p.summary ? String(redactValue(p.summary)) : void 0,
             toolName: p.toolName,
             toolInput: p.toolInput !== void 0 ? redactInputSummary(p.toolInput) : void 0
-          }).catch(() => {
+          }))).then((res) => {
+            progressPending -= slice.length;
+            if (res && res.ok === false) {
+              observationStats.progressFailed += slice.length;
+              logObservation("progress", "\u4E0A\u62A5\u672A\u843D\u5E93", String(res.code ?? "unknown"), observationStats.progressFailed);
+            }
+          }).catch((err) => {
+            progressPending -= slice.length;
+            observationStats.progressFailed += slice.length;
+            logObservation("progress", "\u4E0A\u62A5\u5931\u8D25", err?.message ?? String(err), observationStats.progressFailed);
           });
         }
       });
@@ -7153,9 +7920,23 @@ var DaemonRunner = class {
         return;
       streamFlushing = true;
       const batch = streamChunks.splice(0);
+      streamInFlight += batch.length;
       try {
         for (const c of batch) {
-          await this.api.recordStreamChunk(taskId, c).catch(() => {
+          if (streamDropAll) {
+            streamInFlight -= 1;
+            continue;
+          }
+          await this.api.recordStreamChunk(taskId, c).then((res) => {
+            streamInFlight -= 1;
+            if (res && res.ok === false) {
+              observationStats.streamFailed += 1;
+              logObservation("stream", "\u4E0A\u62A5\u672A\u843D\u5E93", String(res.code ?? "unknown"), observationStats.streamFailed);
+            }
+          }).catch((err) => {
+            streamInFlight -= 1;
+            observationStats.streamFailed += 1;
+            logObservation("stream", "\u4E0A\u62A5\u5931\u8D25", err?.message ?? String(err), observationStats.streamFailed);
           });
         }
       } finally {
@@ -7172,17 +7953,19 @@ var DaemonRunner = class {
         void flushStreamChunks(false);
       }
     };
-    const resumeSessionId = providerKey === "dim" ? detail.lastRun?.dimSessionId ?? null : null;
+    const resumeSessionId = providerKey === "dim" ? detail.dimSessionId ?? detail.lastRun?.dimSessionId ?? null : null;
+    const resumeWorkDir = detail.dimWorkDir ?? detail.lastRun?.dimWorkDir ?? null;
+    const canResume = !!resumeSessionId && !!resumeWorkDir && existsSync12(resumeWorkDir);
     const input = {
       executionId: `${taskId}:1`,
       // task-workspace-layout：新会话 cwd = 任务工作区根（AGENTS.md/.agents 在根下，仓库在子目录）
-      cwd: resumeSessionId && detail.lastRun?.dimWorkDir ? detail.lastRun.dimWorkDir : taskRoot,
+      cwd: canResume ? resumeWorkDir : taskRoot,
       // LOCAL-AGENT-FIX-003：把协作契约前置到任务上下文（userPrompt = Multica 的 messages[0]）；
       // dim 是 systemPromptMode:'native'，systemPrompt 不进 LLM，契约/al上下文均以 userPrompt 承载。
       userPrompt: buildTaskPromptWithContract(detail, repoBaseUrl),
       env,
       modelId: requestedModelId ?? this.model,
-      resumeSessionId,
+      resumeSessionId: canResume ? resumeSessionId : null,
       approvalPolicy: {
         version: 1,
         readonly: false,
@@ -7195,6 +7978,8 @@ var DaemonRunner = class {
       approvalDecider: isFlagEnabled("MORULA_DIM_APPROVAL_MODE", false) && detail.executor.approvalMode === "manual" ? this.createApprovalDecider(taskId, `${taskId}:1`) : void 0,
       // M1-A1：取消信号透传（WS cancelled / 轮询兜底 → abort → 进程组中断）
       signal,
+      // P3：运行中打断端口（安全点中断 → 同会话续开一轮；能力门控见 §三 E4）
+      steer: this.buildSteerPort(taskId, detail),
       onEvent: (event) => {
         if (event.type === "progress") {
           if (event.summary || event.toolName)
@@ -7255,6 +8040,15 @@ var DaemonRunner = class {
           streamChunks.push({ chunkType: "usage", seqHint: nextChunkSeq(), data: event.usage });
           void flushStreamChunks(true);
         }
+        if (event.type === "session" && event.providerSessionId) {
+          void this.api.reportSessionPointer(taskId, {
+            dimSessionId: event.providerSessionId,
+            // 与传给 provider 的 cwd 同源（session 绑定 cwd，续跑要求一致，见上方 resumeWorkDir 说明）
+            dimWorkDir: canResume ? resumeWorkDir : taskRoot
+          }).catch((error) => {
+            this.log(`[daemon] \u4F1A\u8BDD\u6307\u9488\u56DE\u4F20\u5931\u8D25 task=${taskId}: ${error instanceof Error ? error.message : String(error)}`);
+          });
+        }
       }
     };
     const result = await provider.run(input);
@@ -7278,10 +8072,24 @@ var DaemonRunner = class {
       clearTimeout(progressTimer);
       progressTimer = null;
     }
-    await flushProgress().catch(() => {
-    });
-    await flushStreamChunks(true).catch(() => {
+    const progressDrain = flushProgress();
+    const streamDrain = flushStreamChunks(true);
+    const drained = await drainObservationTail({
+      progress: progressDrain,
+      stream: streamDrain,
+      streamPending: () => streamPendingCount() > 0,
+      budgetMs: TERMINAL_OBSERVATION_DRAIN_BUDGET_MS
     });
+    if (!drained.progressDrained) {
+      progressDropAll = true;
+      observationStats.progressDropped += progressPending;
+      logObservation("progress", "\u6536\u5C3E\u4E22\u5F03\u6B8B\u4F59", `\u6392\u7A7A\u8D85\u9884\u7B97 ${TERMINAL_OBSERVATION_DRAIN_BUDGET_MS}ms\uFF0C\u6B8B\u4F59\u4E0D\u518D\u53D1\u9001`, observationStats.progressDropped);
+    }
+    if (!drained.streamDrained) {
+      streamDropAll = true;
+      observationStats.streamDropped += streamPendingCount();
+      logObservation("stream", "\u6536\u5C3E\u4E22\u5F03\u6B8B\u4F59", `\u6392\u7A7A\u8D85\u9884\u7B97 ${TERMINAL_OBSERVATION_DRAIN_BUDGET_MS}ms\uFF0C\u6B8B\u4F59\u4E0D\u518D\u53D1\u9001`, observationStats.streamDropped);
+    }
     return result;
   }
   /**
@@ -7491,16 +8299,44 @@ function writeCustomSkills(targetDir, skills, log) {
 ${skill.content ?? ""}`, "utf8");
   }
 }
-function writeCollaborationSkill(targetDir, repo, repoBaseUrl, log, baseBranch) {
+function writeCollaborationSkill(targetDir, repo, repoBaseUrl, log, baseBranch, provider = repoBaseUrl ? "gitlab" : "github") {
   const dir = join15(targetDir, ".agents", "skills", COLLABORATION_SKILL_NAME);
   const refsDir = join15(dir, "references");
   mkdirSync9(refsDir, { recursive: true });
-  const front = repoBaseUrl ? buildGitlabSkillFrontmatter() : COLLABORATION_SKILL_FRONTMATTER;
-  const body = repoBaseUrl ? buildGitlabSkillBody(repo ?? "", repoBaseUrl, baseBranch) : buildGithubSkillBody(baseBranch);
+  const isGitlab = provider === "gitlab" && !!repoBaseUrl;
+  const front = isGitlab ? buildGitlabSkillFrontmatter() : COLLABORATION_SKILL_FRONTMATTER;
+  const body = isGitlab ? buildGitlabSkillBody(repo ?? "", repoBaseUrl, baseBranch) : buildGithubSkillBody(baseBranch);
   writeFileSync8(join15(dir, "SKILL.md"), `${front}
 ${body}`, "utf8");
   writeFileSync8(join15(refsDir, "working-on-issues-source-map.md"), COLLABORATION_SKILL_SOURCE_MAP, "utf8");
-  log?.(`[daemon] \u5DF2\u6CE8\u5165\u534F\u4F5C\u5951\u7EA6 skill ${COLLABORATION_SKILL_NAME}\uFF08${repoBaseUrl ? "GitLab" : "GitHub"} \u7248\uFF09\u5230 .agents/skills/`);
+  log?.(`[daemon] \u5DF2\u6CE8\u5165\u534F\u4F5C\u5951\u7EA6 skill ${COLLABORATION_SKILL_NAME}\uFF08${isGitlab ? "GitLab" : "GitHub"} \u7248\uFF0C\u4ED3\u5E93=${repo ?? "\u65E0"}\uFF09\u5230 .agents/skills/`);
+}
+function resolveContractPlatform(availableRepos, boundRepo, boundBaseUrl, boundBaseBranch) {
+  const repos = (availableRepos ?? []).filter((r) => !!r?.repoFullName);
+  const bound = boundRepo ? repos.find((r) => r.repoFullName === boundRepo) ?? null : null;
+  const preferred = bound ?? repos[0] ?? null;
+  if (boundBaseUrl) {
+    return {
+      provider: "gitlab",
+      repoFullName: boundRepo,
+      baseUrl: boundBaseUrl,
+      baseBranch: boundBaseBranch ?? preferred?.defaultBranch ?? void 0
+    };
+  }
+  const gitlabRepo = repos.find((r) => (r.baseUrl ?? "").trim() !== "");
+  if (gitlabRepo) {
+    return {
+      provider: "gitlab",
+      repoFullName: gitlabRepo.repoFullName,
+      baseUrl: gitlabRepo.baseUrl ?? void 0,
+      baseBranch: boundBaseBranch ?? gitlabRepo.defaultBranch ?? void 0
+    };
+  }
+  return {
+    provider: "github",
+    repoFullName: boundRepo ?? preferred?.repoFullName ?? null,
+    baseBranch: boundBaseBranch ?? preferred?.defaultBranch ?? void 0
+  };
 }
 function writeTaskContextBrief(targetDir, taskId, detail, repo, log) {
   const briefDir = join15(targetDir, ".agent_context");
@@ -7596,7 +8432,8 @@ ${multiRepoList}
 - \u4EFB\u52A1\u8BE6\u60C5\uFF08\u4EFB\u52A1\u7F16\u53F7 / \u5173\u8054\u5BF9\u8C61 / \u4E1A\u52A1\u76EE\u6807 / \u8BC4\u8BBA / PR\uFF09\uFF1A\`morula task get\`\uFF08\u65E0\u53C2\uFF0CtaskId \u7531\u6267\u884C\u73AF\u5883\u63D0\u4F9B\uFF09\u3002
 
 `;
-  const stageContract = buildStageContract(detail.stageCode);
+  const taskSource = detail.contextSnapshot?.source;
+  const stageContract = buildStageContract(detail.stageCode, typeof taskSource === "string" ? taskSource : void 0);
   const stageContractBlock = stageContract ? `${stageContract}
 
 ` : "";
@@ -7796,6 +8633,7 @@ import { existsSync as existsSync13, readFileSync as readFileSync9, realpathSync
 import { homedir as homedir8 } from "node:os";
 import { dirname as dirname6, join as join16 } from "node:path";
 init_daemon_config();
+init_dim_locate();
 async function doctorCommand(context) {
   const probe = context.parsed.flags.probe === true || context.parsed.flags.probe === "true";
   const { facts, checks } = await collectDoctor(context, probe);