@arcships/morula-runtime 0.1.0-alpha.6 → 0.1.0-alpha.8

package/dist/index.js

@@ -72,6 +72,11 @@ function parseArgs(argv) {
   const positionals = [];
   const flags = {};
   const bareFlags = [];
+  const valueOccurrences = {};
+  const recordValue = (key, value) => {
+    flags[key] = value;
+    (valueOccurrences[key] ??= []).push(value);
+  };
   let positionalOnly = false;
   for (let index = 0; index < argv.length; index += 1) {
     const value = argv[index];
@@ -93,7 +98,7 @@ function parseArgs(argv) {
     }
     const equal = value.indexOf("=");
     if (equal > 2) {
-      flags[value.slice(2, equal)] = value.slice(equal + 1);
+      recordValue(value.slice(2, equal), value.slice(equal + 1));
       continue;
     }
     const key = value.slice(2);
@@ -101,19 +106,25 @@ function parseArgs(argv) {
       throw usage("invalid empty flag");
     const next = argv[index + 1];
     if (next !== void 0 && !next.startsWith("--")) {
-      flags[key] = next;
+      recordValue(key, next);
       index += 1;
     } else {
       flags[key] = true;
       bareFlags.push(key);
     }
   }
+  const repeatedFlags = {};
+  for (const [key, values] of Object.entries(valueOccurrences)) {
+    if (values.length > 1)
+      repeatedFlags[key] = values;
+  }
   return {
     command: positionals.shift(),
     action: positionals.shift(),
     positionals,
     flags,
-    bareFlags
+    bareFlags,
+    repeatedFlags
   };
 }
 function flagString(flags, ...names) {
@@ -729,7 +740,7 @@ var BUILD_ID, BUILD_CONTEXTS, BUILD_DEFAULT_CONTEXT;
 var init_build_env = __esm({
   "../morula-cli-core/dist/build-env.js"() {
     "use strict";
-    BUILD_ID = "20260917063948.nogit";
+    BUILD_ID = "20260921065825.nogit";
     BUILD_CONTEXTS = {
       "local": "http://localhost:8080/api",
       "test": "https://morula.basecastle.com/api",
@@ -739,6 +750,48 @@ var init_build_env = __esm({
   }
 });
 
+// ../morula-api-client/dist/agent-task.js
+function requiredId(id) {
+  const normalized = id.trim();
+  if (!normalized)
+    throw new TypeError("agent task id is required");
+  return normalized;
+}
+var AgentTaskApi;
+var init_agent_task = __esm({
+  "../morula-api-client/dist/agent-task.js"() {
+    "use strict";
+    AgentTaskApi = class {
+      client;
+      constructor(client) {
+        this.client = client;
+      }
+      /** 列出 AgentTask（objectId 必填；status/page/pageSize 可选） */
+      list(query = {}) {
+        return this.client.get("/agent-tasks", query);
+      }
+      /**
+       * 取消执行。
+       *
+       * 服务端语义（`agent-task.controller.ts` cancel，2026-09-20 起）：
+       * - 成功 → 200 `{ ok: true, message: 'Task cancelled' }`；
+       * - 任务不存在 → **404** `NOT_FOUND`；
+       * - 状态不允许（`completed` / `cancelled`）→ **409** `CONFLICT`（带可读原因）。
+       *
+       * 即：**失败会 reject**（不再 200 假成功，见 issues/agent-task-cancel-returns-200-on-failure.md）——
+       * 调用方按异常/退出码判断，不要假定「调用返回了就是已取消」。
+       */
+      cancel(id) {
+        return this.client.post(`/agent-tasks/${encodeURIComponent(requiredId(id))}/cancel`);
+      }
+      /** 重跑失败/已取消的执行（服务端复制原任务重新入队，返回**新** taskId） */
+      rerun(id) {
+        return this.client.post(`/agent-tasks/${encodeURIComponent(requiredId(id))}/rerun`);
+      }
+    };
+  }
+});
+
 // ../morula-api-client/dist/attachment.js
 var AttachmentApi;
 var init_attachment = __esm({
@@ -788,6 +841,13 @@ var init_attachment = __esm({
       getDownloadUrl(id) {
         return this.client.get(`/attachments/${encodeURIComponent(id)}/download-url`);
       }
+      /**
+       * 读取附件的解析产物全文（MinerU markdown）。
+       * 未解析/解析中/解析失败由服务端在返回体里说明，不当作 HTTP 错误。
+       */
+      content(id, maxChars) {
+        return this.client.get(`/attachments/${encodeURIComponent(id)}/content`, { maxChars });
+      }
       /** 更新附件关联的资源 ID */
       updateResourceId(id, resourceId) {
         return this.client.patch(`/attachments/${encodeURIComponent(id)}`, { resourceId });
@@ -826,6 +886,93 @@ var init_auth = __esm({
   }
 });
 
+// ../morula-api-client/dist/autopilot.js
+var AutopilotApi;
+var init_autopilot = __esm({
+  "../morula-api-client/dist/autopilot.js"() {
+    "use strict";
+    AutopilotApi = class {
+      client;
+      constructor(client) {
+        this.client = client;
+      }
+      list(query = {}) {
+        return this.client.get("/agent-autopilots", query);
+      }
+      create(input) {
+        return this.client.post("/agent-autopilots", input);
+      }
+    };
+  }
+});
+
+// ../morula-api-client/dist/ci.js
+function requiredId2(id, label) {
+  const normalized = id.trim();
+  if (!normalized)
+    throw new TypeError(`${label} is required`);
+  return normalized;
+}
+var CiApi;
+var init_ci = __esm({
+  "../morula-api-client/dist/ci.js"() {
+    "use strict";
+    CiApi = class {
+      client;
+      constructor(client) {
+        this.client = client;
+      }
+      /** 任务面 CI 视图（本任务关联的流水线运行 + 部署记录 + 归属依据） */
+      taskView(taskId, query = {}) {
+        return this.client.get(`/agent-tasks/${encodeURIComponent(requiredId2(taskId, "task id"))}/vcs/ci`, query);
+      }
+      /** 任务面部署记录（D3：仅展示，不驱动流转） */
+      taskDeployments(taskId) {
+        return this.client.get(`/agent-tasks/${encodeURIComponent(requiredId2(taskId, "task id"))}/vcs/ci/deployments`);
+      }
+      /** 空间面 CI 巡检视图（管家主入口；`ref` / `failed` / `limit` 为服务端过滤） */
+      spaceView(spaceId, query = {}) {
+        return this.client.get(`/vcs/spaces/${encodeURIComponent(requiredId2(spaceId, "space id"))}/ci`, query);
+      }
+      /** 空间面部署记录（D3：仅展示） */
+      spaceDeployments(spaceId) {
+        return this.client.get(`/vcs/spaces/${encodeURIComponent(requiredId2(spaceId, "space id"))}/ci/deployments`);
+      }
+      /**
+       * job 日志（按 job id；服务端反查所属运行）。
+       *
+       * 两个面共用本端点：任务凭证按 tenantId 收敛，会话凭证按 `connection.spaceId === scopeId` 收敛。
+       * `truncated` 显式返回——日志被尾部截断时调用方必须知道（不能把截断当全文）。
+       */
+      jobLog(jobId, query = {}) {
+        return this.client.get(`/vcs/jobs/${encodeURIComponent(requiredId2(jobId, "job id"))}/log`, query);
+      }
+      /** 失败用例清单（平台可选能力：GitLab test_report 有、GitHub 无 → `CAPABILITY_UNSUPPORTED`） */
+      testReport(runId) {
+        return this.client.get(`/vcs/runs/${encodeURIComponent(requiredId2(runId, "run id"))}/test-report`);
+      }
+      /**
+       * 重跑整条流水线的失败 job（Phase 3；开放面 = 人 + 管家）。
+       *
+       * 只允许 failure / cancelled 的运行，其余状态服务端回 `CI_RETRY_NOT_ALLOWED`（不是 4xx）。
+       * **非幂等**：每次调用都会在平台上产生一次新的重跑，重复调用不会去重。
+       */
+      retryRun(runId) {
+        return this.client.post(`/vcs/runs/${encodeURIComponent(requiredId2(runId, "run id"))}/retry`);
+      }
+      /**
+       * 重跑单个 job（Phase 3；开放面 = 人 + 管家）。
+       *
+       * 服务端按 jobId 反查所属运行（`CI_JOB_NOT_FOUND` 覆盖「job 不存在」与「反查不到运行」两种情况）；
+       * 状态门禁与 `retryRun` 相同。非幂等。
+       */
+      retryJob(jobId) {
+        return this.client.post(`/vcs/jobs/${encodeURIComponent(requiredId2(jobId, "job id"))}/retry`);
+      }
+    };
+  }
+});
+
 // ../morula-api-client/dist/client.js
 function sanitizeHeaderValue(raw, maxLength) {
   if (!raw)
@@ -870,28 +1017,35 @@ function isEnvelope(value) {
 function errorFromResponse(status3, parsed, raw) {
   const message = extractMessage(parsed, raw, status3);
   const details = isEnvelope(parsed) ? parsed.data : parsed;
+  const errorCode = extractErrorCode(parsed);
   if (status3 === 400 || status3 === 422) {
-    return new MorulaApiError("BAD_REQUEST", message, EXIT_CODE.USAGE, status3, false, details);
+    return new MorulaApiError("BAD_REQUEST", message, EXIT_CODE.USAGE, status3, false, details, errorCode);
   }
   if (status3 === 401) {
-    return new MorulaApiError("UNAUTHENTICATED", message, EXIT_CODE.UNAUTHENTICATED, status3, false, details);
+    return new MorulaApiError("UNAUTHENTICATED", message, EXIT_CODE.UNAUTHENTICATED, status3, false, details, errorCode);
   }
   if (status3 === 403) {
-    return new MorulaApiError("FORBIDDEN", message, EXIT_CODE.FORBIDDEN, status3, false, details);
+    return new MorulaApiError("FORBIDDEN", message, EXIT_CODE.FORBIDDEN, status3, false, details, errorCode);
   }
   if (status3 === 404) {
-    return new MorulaApiError("NOT_FOUND", message, EXIT_CODE.NOT_FOUND, status3, false, details);
+    return new MorulaApiError("NOT_FOUND", message, EXIT_CODE.NOT_FOUND, status3, false, details, errorCode);
   }
   if (status3 === 409) {
-    return new MorulaApiError("CONFLICT", message, EXIT_CODE.CONFLICT, status3, false, details);
+    return new MorulaApiError("CONFLICT", message, EXIT_CODE.CONFLICT, status3, false, details, errorCode);
   }
   if (status3 === 429) {
-    return new MorulaApiError("RATE_LIMITED", message, EXIT_CODE.UPSTREAM, status3, true, details);
+    return new MorulaApiError("RATE_LIMITED", message, EXIT_CODE.UPSTREAM, status3, true, details, errorCode);
   }
   if (status3 >= 500) {
-    return new MorulaApiError("UPSTREAM", message, EXIT_CODE.UPSTREAM, status3, true, details);
+    return new MorulaApiError("UPSTREAM", message, EXIT_CODE.UPSTREAM, status3, true, details, errorCode);
   }
-  return new MorulaApiError("HTTP_ERROR", message, EXIT_CODE.OTHER, status3, false, details);
+  return new MorulaApiError("HTTP_ERROR", message, EXIT_CODE.OTHER, status3, false, details, errorCode);
+}
+function extractErrorCode(parsed) {
+  if (!parsed || typeof parsed !== "object")
+    return void 0;
+  const value = parsed.errorCode;
+  return typeof value === "string" && value.trim() ? value.trim() : void 0;
 }
 function extractMessage(parsed, raw, status3) {
   if (parsed && typeof parsed === "object" && "message" in parsed) {
@@ -927,14 +1081,16 @@ var init_client = __esm({
       status;
       retryable;
       details;
+      errorCode;
       name = "MorulaApiError";
-      constructor(code, message, exitCode, status3, retryable = false, details) {
+      constructor(code, message, exitCode, status3, retryable = false, details, errorCode) {
         super(message);
         this.code = code;
         this.exitCode = exitCode;
         this.status = status3;
         this.retryable = retryable;
         this.details = details;
+        this.errorCode = errorCode;
       }
     };
     CLI_BUILD_HEADER = "X-Morula-Cli-Build";
@@ -1061,7 +1217,7 @@ var init_client = __esm({
 });
 
 // ../morula-api-client/dist/comment.js
-function requiredId(id) {
+function requiredId3(id) {
   const normalized = id.trim();
   if (!normalized)
     throw new TypeError("comment id is required");
@@ -1083,23 +1239,142 @@ var init_comment = __esm({
         return this.client.get("/comments", params);
       }
       get(id) {
-        return this.client.get(`/comments/${encodeURIComponent(requiredId(id))}`);
+        return this.client.get(`/comments/${encodeURIComponent(requiredId3(id))}`);
       }
       create(input) {
         return this.client.post("/comments", input);
       }
       update(id, input) {
-        return this.client.patch(`/comments/${encodeURIComponent(requiredId(id))}`, input);
+        return this.client.patch(`/comments/${encodeURIComponent(requiredId3(id))}`, input);
       }
       delete(id) {
-        return this.client.delete(`/comments/${encodeURIComponent(requiredId(id))}`);
+        return this.client.delete(`/comments/${encodeURIComponent(requiredId3(id))}`);
+      }
+    };
+  }
+});
+
+// ../morula-api-client/dist/dashboard.js
+function requiredId4(id) {
+  const normalized = id.trim();
+  if (!normalized)
+    throw new TypeError("space id is required");
+  return normalized;
+}
+var DashboardApi;
+var init_dashboard = __esm({
+  "../morula-api-client/dist/dashboard.js"() {
+    "use strict";
+    DashboardApi = class {
+      client;
+      constructor(client) {
+        this.client = client;
+      }
+      get(spaceId) {
+        return this.client.get(`/spaces/${encodeURIComponent(requiredId4(spaceId))}/dashboard`);
+      }
+      statistics(spaceId) {
+        return this.client.get(`/spaces/${encodeURIComponent(requiredId4(spaceId))}/statistics`);
+      }
+      workload(spaceId) {
+        return this.client.get(`/spaces/${encodeURIComponent(requiredId4(spaceId))}/workload`);
+      }
+    };
+  }
+});
+
+// ../morula-api-client/dist/document.js
+function requiredId5(id) {
+  const normalized = String(id).trim();
+  if (!normalized)
+    throw new TypeError("document id is required");
+  return normalized;
+}
+var DocumentApi;
+var init_document = __esm({
+  "../morula-api-client/dist/document.js"() {
+    "use strict";
+    DocumentApi = class {
+      client;
+      constructor(client) {
+        this.client = client;
+      }
+      list(query = {}) {
+        return this.client.get("/documents", query);
+      }
+      get(id) {
+        return this.client.get(`/documents/${encodeURIComponent(requiredId5(id))}`);
+      }
+      /** 已解析归档的文档内容（Markdown 正文等） */
+      artifacts(id) {
+        return this.client.get(`/documents/${encodeURIComponent(requiredId5(id))}/artifacts`);
+      }
+    };
+  }
+});
+
+// ../morula-api-client/dist/object-meta.js
+function requiredId6(id) {
+  const normalized = id.trim();
+  if (!normalized)
+    throw new TypeError("object id is required");
+  return normalized;
+}
+function requiredKey(key) {
+  const normalized = key.trim();
+  if (!normalized)
+    throw new TypeError("meta key is required");
+  return normalized;
+}
+var ObjectMetaApi;
+var init_object_meta = __esm({
+  "../morula-api-client/dist/object-meta.js"() {
+    "use strict";
+    ObjectMetaApi = class {
+      client;
+      constructor(client) {
+        this.client = client;
+      }
+      list(objectId) {
+        return this.client.get(`/objects/${encodeURIComponent(requiredId6(objectId))}/agent-meta`);
+      }
+      set(objectId, key, value) {
+        return this.client.request(`/objects/${encodeURIComponent(requiredId6(objectId))}/agent-meta/${encodeURIComponent(requiredKey(key))}`, { method: "PUT", body: { value } });
+      }
+    };
+  }
+});
+
+// ../morula-api-client/dist/repo.js
+function requiredId7(id) {
+  const normalized = id.trim();
+  if (!normalized)
+    throw new TypeError("space id is required");
+  return normalized;
+}
+var RepoApi;
+var init_repo = __esm({
+  "../morula-api-client/dist/repo.js"() {
+    "use strict";
+    RepoApi = class {
+      client;
+      constructor(client) {
+        this.client = client;
+      }
+      /** 目录清单（path 缺省 = 仓库根） */
+      files(spaceId, query = {}) {
+        return this.client.get(`/spaces/${encodeURIComponent(requiredId7(spaceId))}/repo/files`, query);
+      }
+      /** 单文件内容（path 必填） */
+      read(spaceId, query) {
+        return this.client.get(`/spaces/${encodeURIComponent(requiredId7(spaceId))}/repo/file`, query);
       }
     };
   }
 });
 
 // ../morula-api-client/dist/report.js
-function requiredId2(id, label = "report") {
+function requiredId8(id, label = "report") {
   const normalized = id.trim();
   if (!normalized)
     throw new TypeError(`${label} id is required`);
@@ -1118,17 +1393,17 @@ var init_report = __esm({
         return this.client.post("/agent-reports", input);
       }
       get(id) {
-        return this.client.get(`/agent-reports/${encodeURIComponent(requiredId2(id))}`);
+        return this.client.get(`/agent-reports/${encodeURIComponent(requiredId8(id))}`);
       }
       listByAutopilot(autopilotId, query = {}) {
-        return this.client.get(`/agent-autopilots/${encodeURIComponent(requiredId2(autopilotId, "autopilot"))}/reports`, { ...query });
+        return this.client.get(`/agent-autopilots/${encodeURIComponent(requiredId8(autopilotId, "autopilot"))}/reports`, { ...query });
       }
     };
   }
 });
 
 // ../morula-api-client/dist/space-member.js
-function requiredId3(id) {
+function requiredId9(id) {
   const normalized = id.trim();
   if (!normalized)
     throw new TypeError("space member id is required");
@@ -1147,23 +1422,23 @@ var init_space_member = __esm({
         return this.client.get("/space-members", { spaceId, ...query });
       }
       get(id) {
-        return this.client.get(`/space-members/${encodeURIComponent(requiredId3(id))}`);
+        return this.client.get(`/space-members/${encodeURIComponent(requiredId9(id))}`);
       }
       create(input) {
         return this.client.post("/space-members", input);
       }
       update(id, input) {
-        return this.client.patch(`/space-members/${encodeURIComponent(requiredId3(id))}`, input);
+        return this.client.patch(`/space-members/${encodeURIComponent(requiredId9(id))}`, input);
       }
       delete(id) {
-        return this.client.delete(`/space-members/${encodeURIComponent(requiredId3(id))}`);
+        return this.client.delete(`/space-members/${encodeURIComponent(requiredId9(id))}`);
       }
     };
   }
 });
 
 // ../morula-api-client/dist/space.js
-function requiredId4(id) {
+function requiredId10(id) {
   const normalized = id.trim();
   if (!normalized)
     throw new TypeError("space id is required");
@@ -1182,23 +1457,51 @@ var init_space = __esm({
         return this.client.get("/spaces", query);
       }
       get(id) {
-        return this.client.get(`/spaces/${encodeURIComponent(requiredId4(id))}`);
+        return this.client.get(`/spaces/${encodeURIComponent(requiredId10(id))}`);
       }
       create(input) {
         return this.client.post("/spaces", input);
       }
       update(id, input) {
-        return this.client.patch(`/spaces/${encodeURIComponent(requiredId4(id))}`, input);
+        return this.client.patch(`/spaces/${encodeURIComponent(requiredId10(id))}`, input);
       }
       delete(id) {
-        return this.client.delete(`/spaces/${encodeURIComponent(requiredId4(id))}`);
+        return this.client.delete(`/spaces/${encodeURIComponent(requiredId10(id))}`);
+      }
+    };
+  }
+});
+
+// ../morula-api-client/dist/steward.js
+function requiredId11(id) {
+  const normalized = id.trim();
+  if (!normalized)
+    throw new TypeError("project id is required");
+  return normalized;
+}
+var StewardApi;
+var init_steward = __esm({
+  "../morula-api-client/dist/steward.js"() {
+    "use strict";
+    StewardApi = class {
+      client;
+      constructor(client) {
+        this.client = client;
+      }
+      /** 管家信息（未接管的空间返回 null） */
+      get(projectId) {
+        return this.client.get(`/stewards/projects/${encodeURIComponent(requiredId11(projectId))}`);
+      }
+      /** 派单：建任务并派发（目标状态由 state 决定，backlog 不派发执行） */
+      dispatch(projectId, input) {
+        return this.client.post(`/stewards/projects/${encodeURIComponent(requiredId11(projectId))}/dispatch`, input);
       }
     };
   }
 });
 
 // ../morula-api-client/dist/task.js
-function requiredId5(id) {
+function requiredId12(id) {
   const normalized = id.trim();
   if (!normalized)
     throw new TypeError("task id is required");
@@ -1217,16 +1520,16 @@ var init_task = __esm({
         return this.client.get("/objects", query);
       }
       get(id) {
-        return this.client.get(`/objects/${encodeURIComponent(requiredId5(id))}`);
+        return this.client.get(`/objects/${encodeURIComponent(requiredId12(id))}`);
       }
       create(input) {
         return this.client.post("/objects", input);
       }
       update(id, input) {
-        return this.client.patch(`/objects/${encodeURIComponent(requiredId5(id))}`, input);
+        return this.client.patch(`/objects/${encodeURIComponent(requiredId12(id))}`, input);
       }
       delete(id) {
-        return this.client.delete(`/objects/${encodeURIComponent(requiredId5(id))}`);
+        return this.client.delete(`/objects/${encodeURIComponent(requiredId12(id))}`);
       }
       /** 查询空间字段模板（字段 key → id 映射、options） */
       getSchemaFields(spaceId) {
@@ -1293,44 +1596,76 @@ var MorulaClient;
 var init_dist = __esm({
   "../morula-api-client/dist/index.js"() {
     "use strict";
+    init_agent_task();
     init_attachment();
     init_auth();
+    init_autopilot();
+    init_ci();
     init_client();
     init_comment();
+    init_dashboard();
+    init_document();
+    init_object_meta();
+    init_repo();
     init_report();
     init_space_member();
     init_space();
+    init_steward();
     init_task();
     init_webhook();
+    init_agent_task();
     init_attachment();
     init_auth();
+    init_autopilot();
+    init_ci();
     init_client();
     init_comment();
+    init_dashboard();
+    init_document();
+    init_object_meta();
+    init_repo();
     init_report();
     init_space_member();
     init_space();
+    init_steward();
     init_task();
     init_types();
     init_webhook();
     MorulaClient = class {
       http;
+      agentTasks;
       attachments;
       auth;
+      autopilots;
+      ci;
       comments;
+      dashboard;
+      documents;
+      objectMeta;
       reports;
+      repos;
       tasks;
       spaces;
       spaceMembers;
+      stewards;
       webhooks;
       constructor(options) {
         this.http = new MorulaApiClient(options);
+        this.agentTasks = new AgentTaskApi(this.http);
         this.attachments = new AttachmentApi(this.http);
         this.auth = new AuthApi(this.http);
+        this.autopilots = new AutopilotApi(this.http);
+        this.ci = new CiApi(this.http);
         this.comments = new CommentApi(this.http);
+        this.dashboard = new DashboardApi(this.http);
+        this.documents = new DocumentApi(this.http);
+        this.objectMeta = new ObjectMetaApi(this.http);
         this.reports = new ReportApi(this.http);
+        this.repos = new RepoApi(this.http);
         this.tasks = new TaskApi(this.http);
         this.spaces = new SpaceApi(this.http);
         this.spaceMembers = new SpaceMemberApi(this.http);
+        this.stewards = new StewardApi(this.http);
         this.webhooks = new WebhookApi(this.http);
       }
     };
@@ -1384,7 +1719,8 @@ function renderActionHelp(base, resource, action) {
       ...f.valueHint ? { valueHint: f.valueHint } : {},
       required: f.required ?? false,
       ...f.enum ? { enum: f.enum } : {},
-      ...f.default !== void 0 ? { default: f.default } : {}
+      ...f.default !== void 0 ? { default: f.default } : {},
+      ...f.repeatable ? { repeatable: true } : {}
     })),
     examples: action.examples ?? [],
     writes: action.writes ?? "none",
@@ -1522,6 +1858,16 @@ function validateArgs(resource, action, parsed, options = {}) {
       hint: `${usageHint}  (e.g. --${flag} ${valuePart})`
     });
   }
+  for (const [name, values] of Object.entries(parsed.repeatedFlags)) {
+    if (values.length < 2)
+      continue;
+    const spec = declaredFlags.find((f) => f.name === name);
+    if (spec?.repeatable)
+      continue;
+    throw usage(`duplicate flag --${name} (given ${values.length} times; only the last value would be used)`, {
+      hint: usageHint
+    });
+  }
   for (const spec of declaredFlags) {
     if (!spec.required)
       continue;
@@ -1631,6 +1977,8 @@ function resolveToken(flags, env, context, baseUrl, saved, options) {
     return { token: explicitToken, tokenSource: "flag" };
   if (!options.excludeTaskToken && env.MORULA_TASK_TOKEN)
     return { token: env.MORULA_TASK_TOKEN, tokenSource: "env:MORULA_TASK_TOKEN" };
+  if (!options.excludeTaskToken && env.MORULA_SESSION_TOKEN)
+    return { token: env.MORULA_SESSION_TOKEN, tokenSource: "env:MORULA_SESSION_TOKEN" };
   if (env.MORULA_TOKEN)
     return { token: env.MORULA_TOKEN, tokenSource: "env:MORULA_TOKEN" };
   const savedToken = saved?.url && normalizeBaseUrl(saved.url) === baseUrl ? saved.token : void 0;
@@ -1775,6 +2123,10 @@ async function run(argv, deps = {}) {
         code: error.code,
         message: error.message,
         ...error.retryable ? { retryable: true } : {},
+        // 服务端业务错误码（如 SESSION_SCOPE_DENIED）：`code` 是按 HTTP 状态派生的粗档位，
+        // 行为契约要判断的是业务码——不打印出来，契约就永远不可执行
+        // （issues/api-client-drops-business-error-code.md）。退出码仍由 `error.exitCode` 决定。
+        ...error instanceof MorulaApiError && error.errorCode ? { errorCode: error.errorCode } : {},
         // 新增字段（可选）：可执行的下一步 + typo 建议
         ...error instanceof CliError && error.hint ? { hint: error.hint } : {},
         ...error instanceof CliError && error.didYouMean ? { didYouMean: error.didYouMean } : {}
@@ -2293,8 +2645,27 @@ var init_daemon_config = __esm({
 
 // src/daemon/daemon-lock.ts
 import { execFileSync as execFileSync3 } from "node:child_process";
-import { closeSync as closeSync2, mkdirSync as mkdirSync4, openSync as openSync2, readFileSync as readFileSync2, renameSync, rmSync as rmSync4, writeFileSync as writeFileSync3, writeSync } from "node:fs";
+import { closeSync as closeSync2, existsSync as existsSync5, mkdirSync as mkdirSync4, openSync as openSync2, readFileSync as readFileSync2, renameSync, rmSync as rmSync4, writeFileSync as writeFileSync3, writeSync } from "node:fs";
 import { dirname as dirname4, join as join6 } from "node:path";
+function daemonPidPath(configDir) {
+  return join6(configDir, "daemon", DAEMON_PID_FILE);
+}
+function readPidFile(file) {
+  if (!existsSync5(file))
+    return 0;
+  try {
+    return Number(readFileSync2(file, "utf8").trim() || 0);
+  } catch {
+    return 0;
+  }
+}
+function probeDaemonInstance(configDir) {
+  const lock = probeDaemonLock(join6(configDir, "daemon", DAEMON_LOCK_FILE));
+  const lockPid = lock.state === "active" ? lock.record.pid : 0;
+  const filePid = readPidFile(daemonPidPath(configDir));
+  const pid = lockPid || (isProcessAlive(filePid) ? filePid : 0);
+  return { running: pid > 0, pid: pid > 0 ? pid : null, lockState: lock.state };
+}
 function isProcessAlive(pid) {
   if (!pid || pid <= 0)
     return false;
@@ -2444,11 +2815,12 @@ async function stopDaemonByPid(pid, options = {}) {
   await waitForExit(pid, 2e3, pollMs);
   return { pid, outcome: "killed" };
 }
-var DAEMON_LOCK_FILE;
+var DAEMON_LOCK_FILE, DAEMON_PID_FILE;
 var init_daemon_lock = __esm({
   "src/daemon/daemon-lock.ts"() {
     "use strict";
     DAEMON_LOCK_FILE = "daemon.lock";
+    DAEMON_PID_FILE = "daemon.pid";
   }
 });
 
@@ -2458,10 +2830,9 @@ __export(portal_instances_exports, {
   candidateConfigFiles: () => candidateConfigFiles,
   createPortalEnvironmentResolver: () => createPortalEnvironmentResolver,
   normalizeBaseUrl: () => normalizeBaseUrl2,
-  parseBaseUrl: () => parseBaseUrl,
-  readPidFile: () => readPidFile
+  parseBaseUrl: () => parseBaseUrl
 });
-import { existsSync as existsSync5, readFileSync as readFileSync3, readdirSync, statSync } from "node:fs";
+import { readdirSync, statSync } from "node:fs";
 import { homedir as homedir5 } from "node:os";
 import { dirname as dirname5, join as join7 } from "node:path";
 function parseBaseUrl(raw) {
@@ -2527,16 +2898,6 @@ function readContexts(file) {
     return null;
   }
 }
-function readPidFile(configDir) {
-  const file = join7(configDir, "daemon", "daemon.pid");
-  if (!existsSync5(file))
-    return 0;
-  try {
-    return Number(readFileSync3(file, "utf8").trim() || 0);
-  } catch {
-    return 0;
-  }
-}
 function createPortalEnvironmentResolver(options = {}) {
   const env = options.env ?? process.env;
   const log = options.log ?? (() => {
@@ -2565,7 +2926,7 @@ function createPortalEnvironmentResolver(options = {}) {
         baseUrl: entry.url,
         normalized,
         token: entry.token,
-        hasLiveDaemon: isProcessAlive(readPidFile(configDir)),
+        hasLiveDaemon: probeDaemonInstance(configDir).running,
         isDefaultDir: configDir === defaultConfigDir,
         configMtimeMs: configMtimeMs(file)
       });
@@ -2611,6 +2972,25 @@ function createPortalEnvironmentResolver(options = {}) {
           return void 0;
         }
       },
+      daemonId: () => {
+        try {
+          return loadDaemonConfig(new FileConfigStore(join7(instance.configDir, "config.yaml")))?.daemonId;
+        } catch {
+          return void 0;
+        }
+      },
+      isDeviceOnline: async (daemonId) => {
+        if (!instance.token)
+          return null;
+        try {
+          const client = createMorulaClient({ baseUrl: instance.baseUrl, token: instance.token, fetch: options.fetch });
+          const rows = await client.http.get("/agent-runtimes");
+          return (Array.isArray(rows) ? rows : []).some((row) => row.daemonId === daemonId && row.status === "online");
+        } catch (error) {
+          log(`[portal] \u67E5\u8BE2 ${instance.context} \u7684\u8BBE\u5907\u5728\u7EBF\u72B6\u6001\u5931\u8D25: ${error instanceof Error ? error.message : String(error)}`);
+          return null;
+        }
+      },
       validateToken: async (token) => {
         if (!instance.token)
           return false;
@@ -2669,9 +3049,13 @@ var init_portal_instances = __esm({
 var portal_server_exports = {};
 __export(portal_server_exports, {
   DEFAULT_PORTAL_PORT: () => DEFAULT_PORTAL_PORT,
-  PortalServer: () => PortalServer
+  PortalServer: () => PortalServer,
+  REGISTRATION_CONFIRM_TIMEOUT_MS: () => REGISTRATION_CONFIRM_TIMEOUT_MS,
+  START_CONFIRM_TIMEOUT_MS: () => START_CONFIRM_TIMEOUT_MS,
+  waitForDaemonRegistration: () => waitForDaemonRegistration,
+  waitForDaemonStart: () => waitForDaemonStart
 });
-import { existsSync as existsSync6, readFileSync as readFileSync4, writeFileSync as writeFileSync4 } from "node:fs";
+import { readFileSync as readFileSync3, rmSync as rmSync5, writeFileSync as writeFileSync4 } from "node:fs";
 import { createServer as createServer2 } from "node:http";
 import { homedir as homedir6 } from "node:os";
 import { join as join8 } from "node:path";
@@ -2679,35 +3063,61 @@ function stateDir() {
   return process.env.MORULA_CONFIG_DIR ?? join8(homedir6(), ".morula-cli");
 }
 function pidFileIn(configDir) {
-  return join8(configDir, "daemon", "daemon.pid");
+  return join8(configDir, "daemon", DAEMON_PID_FILE);
 }
 function daemonLogIn(configDir) {
   return join8(configDir, "daemon", "daemon.log");
 }
-function isPidAlive(pid) {
-  if (!pid || pid <= 0)
-    return false;
+async function waitForDaemonStart(configDir, childPid, timeoutMs = START_CONFIRM_TIMEOUT_MS) {
+  const deadline = Date.now() + timeoutMs;
+  for (; ; ) {
+    const probe = probeDaemonInstance(configDir);
+    if (probe.running)
+      return { running: true, pid: probe.pid };
+    if (!isProcessAlive(childPid))
+      return { running: false, reason: "exited" };
+    if (Date.now() >= deadline)
+      return { running: false, reason: "timeout" };
+    await new Promise((resolve2) => setTimeout(resolve2, START_CONFIRM_POLL_MS));
+  }
+}
+async function waitForDaemonRegistration(isDeviceOnline, daemonId, childPid, timeoutMs = REGISTRATION_CONFIRM_TIMEOUT_MS) {
+  const deadline = Date.now() + timeoutMs;
+  let queryFailed = false;
+  for (; ; ) {
+    const online = await isDeviceOnline(daemonId);
+    if (online === true)
+      return "registered";
+    if (online === null)
+      queryFailed = true;
+    if (!isProcessAlive(childPid))
+      return "exited";
+    if (Date.now() >= deadline)
+      return queryFailed ? "unknown" : "not-registered";
+    await new Promise((resolve2) => setTimeout(resolve2, START_CONFIRM_POLL_MS));
+  }
+}
+function tailDaemonLog(configDir, maxLines = 5) {
   try {
-    process.kill(pid, 0);
-    return true;
+    const lines = readFileSync3(daemonLogIn(configDir), "utf8").trimEnd().split("\n");
+    return lines.slice(-maxLines).join(" / ") || null;
   } catch {
-    return false;
+    return null;
   }
 }
-function readPidFrom(file) {
-  if (!existsSync6(file))
-    return 0;
-  return Number(readFileSync4(file, "utf8").trim() || 0);
-}
-var DEFAULT_PORTAL_PORT, DEFAULT_CORS_ORIGINS, PortalServer;
+var DEFAULT_PORTAL_PORT, DEFAULT_CORS_ORIGINS, START_CONFIRM_TIMEOUT_MS, REGISTRATION_CONFIRM_TIMEOUT_MS, START_CONFIRM_POLL_MS, PortalServer;
 var init_portal_server = __esm({
   "src/daemon/portal-server.ts"() {
     "use strict";
     init_daemon_config();
+    init_daemon_lock();
     init_portal_instances();
     init_spawn();
     DEFAULT_PORTAL_PORT = 23491;
     DEFAULT_CORS_ORIGINS = ["*"];
+    START_CONFIRM_TIMEOUT_MS = 5e3;
+    REGISTRATION_CONFIRM_TIMEOUT_MS = 5e3;
+    START_CONFIRM_POLL_MS = 200;
     PortalServer = class {
       port;
       server = null;
@@ -2848,14 +3258,13 @@ var init_portal_server = __esm({
         if (failed)
           return;
         const configDir = target?.configDir ?? stateDir();
-        const pid = readPidFrom(pidFileIn(configDir));
-        const running = isPidAlive(pid);
+        const probe = probeDaemonInstance(configDir);
         const runtimeId = target ? target.runtimeId() : this.store ? loadDaemonConfig(this.store)?.runtimeId : void 0;
         const self = target ? { context: target.context, baseUrl: target.baseUrl } : this.selfEnvironment();
         this.json(res, 200, {
           ok: true,
-          daemonRunning: running,
-          pid: running ? pid : null,
+          daemonRunning: probe.running,
+          pid: probe.pid,
           runtimeId: runtimeId ?? null,
           // 支持按请求声明目标环境（前端据此决定是否走多环境路径；缺省 = 旧版 portal）
           envRouting: true,
@@ -2870,10 +3279,10 @@ var init_portal_server = __esm({
         if (!await this.authorize(req, res, target))
           return;
         const configDir = target?.configDir ?? stateDir();
-        const pidFile = pidFileIn(configDir);
-        const existing = readPidFrom(pidFile);
-        if (isPidAlive(existing)) {
-          this.json(res, 200, { ok: true, pid: existing, alreadyRunning: true });
+        const where = target ? `\uFF08\u73AF\u5883 ${target.context}\uFF0C\u76EE\u5F55 ${configDir}\uFF09` : "";
+        const existing = probeDaemonInstance(configDir);
+        if (existing.running) {
+          this.json(res, 200, { ok: true, pid: existing.pid, alreadyRunning: true });
           return;
         }
         const result = spawnDaemonProcess({
@@ -2884,18 +3293,54 @@ var init_portal_server = __esm({
           this.json(res, 500, { ok: false, error: result.error ?? `spawn \u5931\u8D25\uFF08pid=${result.pid}\uFF09` });
           return;
         }
+        const confirmed = await waitForDaemonStart(configDir, result.pid);
+        if (!confirmed.running) {
+          if (!isProcessAlive(readPidFile(pidFileIn(configDir))))
+            rmSync5(pidFileIn(configDir), { force: true });
+          this.log(`[portal] daemon \u672A\u80FD\u542F\u52A8 pid=${result.pid}${where}\uFF1A${confirmed.reason}`);
+          this.json(res, 500, {
+            ok: false,
+            error: confirmed.reason === "exited" ? "DAEMON_EXITED" : "DAEMON_START_TIMEOUT",
+            hint: `daemon \u672A\u542F\u52A8\u6210\u529F\uFF08${confirmed.reason === "exited" ? "\u5B50\u8FDB\u7A0B\u5DF2\u9000\u51FA" : "\u7B49\u5F85\u8D85\u65F6"}\uFF09\uFF1A${tailDaemonLog(configDir) ?? "\u8BE6\u89C1 daemon \u65E5\u5FD7"}`,
+            logFile: daemonLogIn(configDir)
+          });
+          return;
+        }
+        if (confirmed.pid !== result.pid) {
+          this.log(`[portal] \u5DF2\u6709\u5B9E\u4F8B\u5728\u8FD0\u884C pid=${confirmed.pid}${where}\uFF0C\u672C\u6B21 spawn \u7684\u5B50\u8FDB\u7A0B\u5DF2\u8BA9\u4F4D`);
+          this.json(res, 200, { ok: true, pid: confirmed.pid, alreadyRunning: true });
+          return;
+        }
+        const daemonId = target?.daemonId();
+        if (target && daemonId) {
+          const reg = await waitForDaemonRegistration(target.isDeviceOnline, daemonId, confirmed.pid);
+          if (reg === "exited" || reg === "not-registered") {
+            if (!isProcessAlive(readPidFile(pidFileIn(configDir))))
+              rmSync5(pidFileIn(configDir), { force: true });
+            this.log(`[portal] daemon \u8FDB\u7A0B\u5DF2\u8D77\u6765\u4F46\u672A\u6CE8\u518C\u4E0A\u7EBF pid=${confirmed.pid}${where}\uFF1A${reg}`);
+            this.json(res, 500, {
+              ok: false,
+              error: "DAEMON_NOT_REGISTERED",
+              hint: `daemon \u8FDB\u7A0B\u5DF2\u542F\u52A8\u4F46\u672A\u5728\u670D\u52A1\u7AEF\u6CE8\u518C\u4E0A\u7EBF\uFF08${reg === "exited" ? "\u8FDB\u7A0B\u5DF2\u9000\u51FA" : "\u7B49\u5F85\u8D85\u65F6"}\uFF09\uFF1A${tailDaemonLog(configDir) ?? "\u8BE6\u89C1 daemon \u65E5\u5FD7"}`,
+              logFile: daemonLogIn(configDir)
+            });
+            return;
+          }
+          if (reg === "unknown")
+            this.log(`[portal] \u65E0\u6CD5\u786E\u8BA4\u6CE8\u518C\u72B6\u6001\uFF08\u67E5\u8BE2\u5931\u8D25\uFF09pid=${confirmed.pid}${where}\uFF0C\u6309\u542F\u52A8\u6210\u529F\u5904\u7406`);
+        }
         try {
-          writeFileSync4(pidFile, String(result.pid), { mode: 384 });
+          writeFileSync4(pidFileIn(configDir), String(confirmed.pid), { mode: 384 });
         } catch {
           try {
-            process.kill(result.pid, "SIGTERM");
+            process.kill(confirmed.pid, "SIGTERM");
           } catch {
           }
           this.json(res, 500, { ok: false, error: "pid \u6587\u4EF6\u5199\u5165\u5931\u8D25" });
           return;
         }
-        this.log(`[portal] daemon \u5DF2\u62C9\u8D77 pid=${result.pid}${target ? `\uFF08\u73AF\u5883 ${target.context}\uFF0C\u76EE\u5F55 ${configDir}\uFF09` : ""}`);
-        this.json(res, 200, { ok: true, pid: result.pid, alreadyRunning: false });
+        this.log(`[portal] daemon \u5DF2\u62C9\u8D77 pid=${confirmed.pid}${where}`);
+        this.json(res, 200, { ok: true, pid: confirmed.pid, alreadyRunning: false });
       }
       async handleStop(req, res, url) {
         const { target, failed } = this.resolveTarget(res, url);
@@ -2904,15 +3349,15 @@ var init_portal_server = __esm({
         if (!await this.authorize(req, res, target))
           return;
         const configDir = target?.configDir ?? stateDir();
-        const existing = readPidFrom(pidFileIn(configDir));
-        if (isPidAlive(existing)) {
+        const existing = probeDaemonInstance(configDir);
+        if (existing.running) {
           try {
-            process.kill(existing, "SIGTERM");
+            process.kill(existing.pid, "SIGTERM");
           } catch {
           }
-          this.log(`[portal] daemon \u505C\u6B62\u4FE1\u53F7\u5DF2\u53D1\u9001 pid=${existing}${target ? `\uFF08\u73AF\u5883 ${target.context}\uFF09` : ""}`);
+          this.log(`[portal] daemon \u505C\u6B62\u4FE1\u53F7\u5DF2\u53D1\u9001 pid=${existing.pid}${target ? `\uFF08\u73AF\u5883 ${target.context}\uFF09` : ""}`);
         }
-        this.json(res, 200, { ok: true, pid: existing || null });
+        this.json(res, 200, { ok: true, pid: existing.pid });
       }
       /**
        * start/stop 鉴权：目标环境用**它自己的**服务端校验 token（这正是跨环境 401 的修复点）；
@@ -3020,6 +3465,7 @@ __export(acp_connection_exports, {
   AcpConnection: () => AcpConnection,
   DEFAULT_ACP_INIT_TIMEOUT_MS: () => DEFAULT_ACP_INIT_TIMEOUT_MS,
   countDimAcpProcesses: () => countDimAcpProcesses,
+  normalizeAcpConfigOptions: () => normalizeAcpConfigOptions,
   resolveAcpInitTimeoutMs: () => resolveAcpInitTimeoutMs
 });
 import { execFileSync as execFileSync4, spawn as spawn3 } from "node:child_process";
@@ -3048,6 +3494,16 @@ function countDimAcpProcesses() {
     return null;
   }
 }
+function normalizeAcpConfigOptions(raw) {
+  if (Array.isArray(raw))
+    return raw;
+  if (raw && typeof raw === "object") {
+    const nested = raw.configOptions;
+    if (Array.isArray(nested))
+      return nested;
+  }
+  return null;
+}
 var DEFAULT_ACP_INIT_TIMEOUT_MS, cachedDimVersion, requestSeq, AcpConnection;
 var init_acp_connection = __esm({
   "src/daemon/acp/acp-connection.ts"() {
@@ -3063,6 +3519,7 @@ var init_acp_connection = __esm({
           outcome: { outcome: "selected", optionId: "allow" }
         }));
         this.onExit = options.onExit;
+        this.elicitationHandler = options.onElicitation;
       }
       options;
       child = null;
@@ -3070,6 +3527,7 @@ var init_acp_connection = __esm({
       pending = /* @__PURE__ */ new Map();
       exited = false;
       permissionHandler;
+      elicitationHandler;
       onExit;
       /** sessionId → 当前 update 处理器（同一 session 单活跃 prompt） */
       updateHandlers = /* @__PURE__ */ new Map();
@@ -3103,9 +3561,9 @@ var init_acp_connection = __esm({
             process.stderr.write(`[daemon] dim spawn \u5931\u8D25 ${dimPath}\uFF08\u5C1D\u8BD5\u4E0B\u4E00\u4E2A\u5019\u9009\uFF09: ${message}
 `);
             try {
-              const { existsSync: existsSync19 } = await import("node:fs");
+              const { existsSync: existsSync18 } = await import("node:fs");
               process.stderr.write(
-                `[daemon]   diag: fileExists=${existsSync19(dimPath)} cwdExists=${this.options.cwd ? existsSync19(this.options.cwd) : "n/a"} PATH=${(process.env.PATH ?? "").slice(0, 140)} DYLD=${process.env.DYLD_LIBRARY_PATH ?? "-"} NODE_OPTIONS=${process.env.NODE_OPTIONS ?? "-"}
+                `[daemon]   diag: fileExists=${existsSync18(dimPath)} cwdExists=${this.options.cwd ? existsSync18(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 {
@@ -3155,7 +3613,12 @@ var init_acp_connection = __esm({
         child.stdout.on("data", (d) => this.onStdout(d.toString()));
         const init = {
           protocolVersion: 1,
-          clientCapabilities: { auth: { terminal: true } },
+          // elicitation.form 只在**有处理器时**声明：声明了却不应答会让 dim 挂起等用户输入。
+          // 形状是对象而非 boolean（V2 实测：boolean 被 dim 以 -32602 拒绝）。
+          clientCapabilities: {
+            auth: { terminal: true },
+            ...this.elicitationHandler ? { elicitation: { form: {} } } : {}
+          },
           clientInfo: { name: "morula-runtime", version: "1.0.0" }
         };
         const initTimeoutMs = resolveAcpInitTimeoutMs();
@@ -3200,26 +3663,38 @@ var init_acp_connection = __esm({
         return this.request("session/set_config_option", { sessionId, configId, value }).then(() => {
         });
       }
+      /**
+       * 设置会话配置项并**全量返回** configOptions（ACP 规范：set_config_option 响应即全量配置）。
+       * 会话宿主用（§4.4 配置变更回写）；任务链路只需 fire-and-forget，继续用 setConfigOption。
+       *
+       * **返回已归一化为数组**：ACP 的响应体是 `{ configOptions: ConfigOption[] }`（对象），
+       * 而 `session/new` / `resume` 的 `configOptions` 字段本身就是数组——两处形状不同，
+       * 调用方（会话宿主 → 服务端落库 → 前端输入区值域）必须拿到同一种形状，否则前端拿到对象会崩。
+       */
+      setConfigOptionFull(sessionId, configId, value) {
+        return this.request("session/set_config_option", { sessionId, configId, value }).then((res) => normalizeAcpConfigOptions(res) ?? []);
+      }
       /**
        * 发起 prompt：立即返回；事件流经 updateHandler 推送；返回的 Promise 在
        * turn 结束（prompt 响应）时 resolve。
        *
        * @param sessionId ACP 会话 ID
-       * @param text 用户输入文本
+       * @param prompt 用户输入。字符串 = 纯文本；数组 = 多模态 content block
+       *   （`image` block 用于对话附件，见 steward-core-acp-migration §五 P2-3）
        * @param updateHandler 会话事件回调
-       * @param timeoutMs prompt 整轮 RPC 超时。注意：dim 直到整轮 agent 循环结束
-       *   （stopReason）才回复 prompt，长时间的多步工具执行/模型生成都会占满该窗口，
-       *   因此调用方必须传入 ≥ 任务总超时（如 executor 的 timeoutMs）的值，否则长任务
-       *   会被 RPC 层提前误杀。默认 300s 仅为向后兼容的保守值。
+       * @param timeoutMs prompt 整轮 RPC 超时。**未设 / <= 0 = 不设超时（默认）**：dim 直到整轮
+       *   agent 循环结束（stopReason）才回复 prompt，多步工具执行/长模型生成都会占满窗口，
+       *   给 RPC 层设超时等于给「合法的长回合」埋误杀点。限时与否由调用方（executor 的
+       *   单回合预算）决定，executor 默认即传 0（不设超时）。
        */
-      prompt(sessionId, text, updateHandler, timeoutMs = 3e5) {
+      prompt(sessionId, prompt, updateHandler, timeoutMs = 0) {
         if (this.updateHandlers.has(sessionId)) {
           return Promise.reject(new Error(`session ${sessionId} \u5DF2\u6709\u6D3B\u8DC3 prompt\uFF08ACP \u5355\u6D3B\u8DC3\u7EA6\u675F\uFF09`));
         }
         this.updateHandlers.set(sessionId, updateHandler);
         const params = {
           sessionId,
-          prompt: [{ type: "text", text }],
+          prompt: typeof prompt === "string" ? [{ type: "text", text: prompt }] : prompt,
           messageId: `m-${randomUUID2().slice(0, 8)}`
         };
         return this.request("session/prompt", params, timeoutMs).then(
@@ -3278,17 +3753,20 @@ var init_acp_connection = __esm({
           return Promise.reject(new Error(`dim acp \u8FDB\u7A0B\u4E0D\u53EF\u7528\uFF08${method}\uFF09`));
         const id = ++requestSeq;
         return new Promise((resolve2, reject) => {
-          const timer = setTimeout(() => {
+          const onTimeout = () => {
             this.pending.delete(id);
             reject(new Error(`dim acp ${method} \u8D85\u65F6\uFF08${Math.round(timeoutMs / 1e3)}s\uFF09`));
-          }, timeoutMs);
+          };
+          const timer = timeoutMs > 0 ? setTimeout(onTimeout, timeoutMs) : null;
           this.pending.set(id, {
             resolve: (v) => {
-              clearTimeout(timer);
+              if (timer)
+                clearTimeout(timer);
               resolve2(v);
             },
             reject: (e) => {
-              clearTimeout(timer);
+              if (timer)
+                clearTimeout(timer);
               reject(e);
             }
           });
@@ -3359,6 +3837,21 @@ var init_acp_connection = __esm({
           );
           return;
         }
+        if (method === "elicitation/create") {
+          const id = msg.id;
+          const params = msg.params;
+          const handler = this.elicitationHandler;
+          if (!handler) {
+            this.respond(id, { action: "decline" });
+            return;
+          }
+          void handler(params).then(
+            (response) => this.respond(id, response),
+            // 处理器异常（含超时）：回 cancel，让 agent 走「用户没答」的分支，而不是挂死
+            () => this.respond(id, { action: "cancel" })
+          );
+          return;
+        }
         if (method === "$/cancel_request") {
           return;
         }
@@ -3378,7 +3871,7 @@ __export(dim_home_exports, {
   resolveIsolatedDimEnv: () => resolveIsolatedDimEnv
 });
 import { execFileSync as execFileSync5 } from "node:child_process";
-import { chmodSync as chmodSync2, copyFileSync, existsSync as existsSync7, readFileSync as readFileSync5, rmSync as rmSync5 } from "node:fs";
+import { chmodSync as chmodSync2, copyFileSync, existsSync as existsSync6, readFileSync as readFileSync4, rmSync as rmSync6 } from "node:fs";
 import { homedir as homedir8 } from "node:os";
 import { join as join10 } from "node:path";
 function isolatedDimHome() {
@@ -3405,11 +3898,11 @@ __export(dim_model_exports, {
 import { createRequire } from "node:module";
 import { spawnSync } from "node:child_process";
 import { closeSync as closeSync3, existsSync as existsSync10, openSync as openSync3, readFileSync as readFileSync7, unlinkSync } from "node:fs";
-import { homedir as homedir10, tmpdir } from "node:os";
-import { join as join13 } from "node:path";
+import { homedir as homedir11, tmpdir } from "node:os";
+import { join as join14 } from "node:path";
 function dimSqlitePath(env) {
   const home = env?.DIMCODE_HOME?.trim();
-  const candidates = home && home !== "" ? [join13(home, "v2", "dimcode.sqlite"), join13(home, "dimcode.sqlite")] : [join13(homedir10(), ".dimcode", "v2", "dimcode.sqlite")];
+  const candidates = home && home !== "" ? [join14(home, "v2", "dimcode.sqlite"), join14(home, "dimcode.sqlite")] : [join14(homedir11(), ".dimcode", "v2", "dimcode.sqlite")];
   return candidates.find((p) => existsSync10(p)) ?? null;
 }
 function listDimModels(dimPath = "dim", env) {
@@ -3444,12 +3937,12 @@ function listDimModels(dimPath = "dim", env) {
 function hostDimEnv(env) {
   const home = env?.DIMCODE_HOME?.trim();
   if (home && home !== "" && home.includes(".morula") && home.includes("dimcode")) {
-    return { ...process.env, DIMCODE_HOME: join13(homedir10(), ".dimcode", "v2") };
+    return { ...process.env, DIMCODE_HOME: join14(homedir11(), ".dimcode", "v2") };
   }
   return env ? { ...env } : null;
 }
 function listDimModelsFromCli(dimPath, env) {
-  const tmpFile = join13(tmpdir(), `${DIM_MODELS_TMP_PREFIX}${process.pid}-${Date.now()}.json`);
+  const tmpFile = join14(tmpdir(), `${DIM_MODELS_TMP_PREFIX}${process.pid}-${Date.now()}.json`);
   const fd = openSync3(tmpFile, "w");
   let collected = "";
   try {
@@ -3486,8 +3979,8 @@ function listDimModelsFromCli(dimPath, env) {
 }
 function dimOAuthTokenPath(env) {
   const home = env?.DIMCODE_HOME?.trim();
-  const dir = home && home !== "" ? home : join13(homedir10(), ".dimcode", "v2");
-  for (const p of [join13(dir, "auth.json"), join13(dir, "v2", "auth.json")]) {
+  const dir = home && home !== "" ? home : join14(homedir11(), ".dimcode", "v2");
+  for (const p of [join14(dir, "auth.json"), join14(dir, "v2", "auth.json")]) {
     if (existsSync10(p))
       return p;
   }
@@ -3632,14 +4125,14 @@ init_dist2();
 init_dist2();
 
 // src/build-env.ts
-var BUILD_VERSION2 = "0.1.0-alpha.6";
+var BUILD_VERSION2 = "0.1.0-alpha.8";
 
 // src/commands/daemon.ts
 init_dist();
 init_dist2();
-import { existsSync as existsSync17, mkdirSync as mkdirSync12, readFileSync as readFileSync11, rmSync as rmSync8, writeFileSync as writeFileSync10 } from "node:fs";
-import { homedir as homedir12 } from "node:os";
-import { dirname as dirname9, join as join20 } from "node:path";
+import { existsSync as existsSync17, mkdirSync as mkdirSync14, readFileSync as readFileSync11, rmSync as rmSync10, writeFileSync as writeFileSync12 } from "node:fs";
+import { homedir as homedir13 } from "node:os";
+import { dirname as dirname10, join as join22 } from "node:path";
 
 // src/daemon/daemon-autostart.ts
 init_portal_autostart();
@@ -3708,9 +4201,9 @@ init_portal_server();
 // src/daemon/runner.ts
 init_dist2();
 import { execFileSync as execFileSync10 } from "node:child_process";
-import { existsSync as existsSync15, mkdirSync as mkdirSync11, statSync as statSync3, writeFileSync as writeFileSync9 } from "node:fs";
+import { existsSync as existsSync15, mkdirSync as mkdirSync13, statSync as statSync4, writeFileSync as writeFileSync11 } from "node:fs";
 import { arch, hostname } from "node:os";
-import { dirname as dirname7, join as join18 } from "node:path";
+import { dirname as dirname8, join as join20 } from "node:path";
 
 // src/daemon/acp/acp-connection-pool.ts
 var DEFAULT_IDLE_MS = 30 * 60 * 1e3;
@@ -3954,7 +4447,7 @@ var DaemonApi = class {
   recordEvent(taskId, body) {
     return this.taskRequest(taskId, `/agent-tasks/${taskId}/events`, { body });
   }
-  /** ACP 流式事件（Phase 1）：daemon → Server → WS 前端 */
+  /** ACP 流式事件（Phase 1 → P2-2）：daemon → Server → WS 前端（`delta` 为 transient，不落库） */
   recordStreamChunk(taskId, body) {
     return this.taskRequest(taskId, `/agent-tasks/${taskId}/stream-chunk`, { body });
   }
@@ -4015,19 +4508,200 @@ var DaemonApi = class {
   getGitHubToken(taskId, repo) {
     return this.client.get("/vcs/daemon-token", { taskId, repo });
   }
+  // ── 会话宿主机器协议（steward-core-acp-migration §4.3/§4.4，P0 骨架） ──
+  /** 会话级 token 缓存（每会话独立凭证，注入工作区 env MORULA_SESSION_TOKEN） */
+  sessionTokens = /* @__PURE__ */ new Map();
+  setSessionToken(sessionId, token) {
+    this.sessionTokens.set(sessionId, token);
+  }
+  clearSessionToken(sessionId) {
+    this.sessionTokens.delete(sessionId);
+  }
+  /** 会话级机器协议请求（session token 通道；无 token 时回退设备级 client 凭证） */
+  sessionRequest(sessionId, path, options = {}) {
+    const token = this.sessionTokens.get(sessionId);
+    return this.client.request(path, {
+      method: "POST",
+      ...options,
+      ...token ? { token } : {}
+    });
+  }
+  /** 会话级机器协议请求（可指定 method；elicitation 查询用 GET + 长轮询） */
+  sessionRequestWithMethod(sessionId, method, path, options = {}) {
+    const token = this.sessionTokens.get(sessionId);
+    return this.client.request(path, {
+      method,
+      ...options,
+      ...token ? { token } : {}
+    });
+  }
+  /** 会话宿主事件上报（→ agent_events owner=session + WS exec:session 房间） */
+  recordSessionEvent(sessionId, body) {
+    return this.sessionRequest(sessionId, `/agent-sessions/${sessionId}/events`, { body });
+  }
   /**
-   * A2（issues/multi-repo-task-missing-workcontext-link.md）：**不传 repo** 的平台凭证
-   * ——服务端按「任务空间内 active 的连接」择一签发（凭证是平台凭据，不是某仓库的凭据）。
-   *
-   * 用于无主仓库 / 多仓库任务（daemon 走 scratch 隔离目录、`resolveRepo(detail) = null`）：
-   * 这些任务的 agent 同样需要 MORULA_GITLAB_TOKEN / MORULA_GITLAB_URL 才能自己走 GitLab API
-   * 兜底建 MR（否则链路两端都没有自愈路径）。旧版服务端强制校验 repo（400）——调用方需容忍失败。
+   * 会话流式增量上报（P2-2：transient，**不落库**；服务端转推 `agent-task:delta` 到 exec:session 房间）。
+   * 与 `recordSessionEvent` 的语义差别：这里是「可丢的过程信号」，失败不重试、不占 seq。
+   * `kind`：`text` = assistant 正文，`thinking` = 推理原文（durable 对应 `agent_thought_delta`）。
+   */
+  recordSessionStreamChunk(sessionId, body) {
+    return this.sessionRequest(sessionId, `/agent-sessions/${sessionId}/stream-chunk`, { body });
+  }
+  /** 会话绑定与指针回传（dimSessionId / workspaceDir / runtimeId；只写绑定列不改状态） */
+  reportSessionBinding(sessionId, body) {
+    return this.sessionRequest(sessionId, `/agent-sessions/${sessionId}/session`, { body });
+  }
+  /**
+   * 会话关闭上报。
+   * `reason='idle'`（空闲回收）→ 服务端只回到 `idle`（保留 dimSessionId，下次可 resume）；
+   * `reason='command'`（用户/平台显式关闭）→ 终态 `closed`（§4.4/§4.1 的衔接）。
+   */
+  closeAgentSession(sessionId, reason = "command") {
+    return this.sessionRequest(sessionId, `/agent-sessions/${sessionId}/close`, { body: { reason } });
+  }
+  /**
+   * 结构化提问登记（§4.6 ②）：服务端落库 + 推前端确认卡，立即返回 elicitationId。
+   * 用户应答由 `getElicitation` 长轮询取回（见 session-host.handleElicitation）。
+   */
+  createElicitation(sessionId, body) {
+    return this.sessionRequest(
+      sessionId,
+      `/agent-sessions/${sessionId}/elicitation`,
+      { body }
+    );
+  }
+  /** 结构化提问结果查询（waitMs 内被回答则提前返回；服务端最多持 waitMs） */
+  getElicitation(sessionId, elicitationId, waitMs) {
+    return this.sessionRequestWithMethod(sessionId, "GET", `/agent-sessions/${sessionId}/elicitations/${elicitationId}`, {
+      query: { waitMs },
+      // 服务端最多持 waitMs，客户端留 10s 余量（避免「服务端刚返回、客户端已超时」的假失败）
+      timeoutMs: waitMs + 1e4
+    });
+  }
+  /**
+   * A2（issues/multi-repo-task-missing-workcontext-link.md）：**不传 repo** 的平台凭证
+   * ——服务端按「任务空间内 active 的连接」择一签发（凭证是平台凭据，不是某仓库的凭据）。
+   *
+   * 用于无主仓库 / 多仓库任务（daemon 走 scratch 隔离目录、`resolveRepo(detail) = null`）：
+   * 这些任务的 agent 同样需要 MORULA_GITLAB_TOKEN / MORULA_GITLAB_URL 才能自己走 GitLab API
+   * 兜底建 MR（否则链路两端都没有自愈路径）。旧版服务端强制校验 repo（400）——调用方需容忍失败。
    */
   getSpaceDaemonToken(taskId) {
     return this.client.get("/vcs/daemon-token", { taskId });
   }
 };
 
+// src/daemon/assistant-text-stream.ts
+var TEXT_DELTA_WINDOW_MS = 200;
+var TEXT_SEGMENT_MAX_CHARS = 2e3;
+var PARAGRAPH_BREAK = "\n\n";
+var AssistantTextStream = class {
+  constructor(sink, options = {}) {
+    this.sink = sink;
+    this.windowMs = options.windowMs ?? TEXT_DELTA_WINDOW_MS;
+    this.segmentMaxChars = Math.max(1, options.segmentMaxChars ?? TEXT_SEGMENT_MAX_CHARS);
+    this.log = options.log ?? (() => {
+    });
+  }
+  sink;
+  windowMs;
+  segmentMaxChars;
+  log;
+  /** 当前段的完整文本（未落段部分） */
+  buffer = "";
+  /** 当前段已通过 onDelta 发出的字符数 */
+  sent = 0;
+  /** 当前段序号（落段后 +1） */
+  seg = 0;
+  timer = null;
+  disposed = false;
+  /** 段落落库串行链：段落事件必须按 seg 顺序落库（上行 HTTP 并发会乱序 → 回放正文错序） */
+  paragraphChain = Promise.resolve();
+  /** 当前段落序号（诊断/测试用） */
+  get currentSeg() {
+    return this.seg;
+  }
+  /** 喂入一个文本增量 */
+  push(text) {
+    if (this.disposed || !text)
+      return;
+    this.buffer += text;
+    let idx = this.buffer.lastIndexOf(PARAGRAPH_BREAK);
+    while (idx >= 0) {
+      this.cutParagraph(idx + PARAGRAPH_BREAK.length);
+      idx = this.buffer.lastIndexOf(PARAGRAPH_BREAK);
+    }
+    while (this.buffer.length >= this.segmentMaxChars)
+      this.cutParagraph(this.segmentMaxChars);
+    if (this.buffer.length > 0)
+      this.scheduleDelta();
+  }
+  /** 把当前 buffer 的前 `length` 个字符作为一段落切出去（同步改状态，落库走串行链） */
+  cutParagraph(length) {
+    const head = this.buffer.slice(0, length);
+    const rest = this.buffer.slice(length);
+    this.buffer = head;
+    this.sent = Math.min(this.sent, head.length);
+    void this.flushParagraph();
+    this.buffer = rest;
+    this.sent = 0;
+  }
+  /** 强制结束当前段落（工具调用前 / 回合结束前调用并 await） */
+  async flushParagraph() {
+    if (this.timer) {
+      clearTimeout(this.timer);
+      this.timer = null;
+    }
+    this.flushDelta();
+    if (!this.buffer)
+      return this.paragraphChain;
+    const text = this.buffer;
+    const seg = this.seg;
+    this.buffer = "";
+    this.sent = 0;
+    this.seg += 1;
+    this.paragraphChain = this.paragraphChain.then(async () => {
+      try {
+        await this.sink.onParagraph(seg, text);
+      } catch (err) {
+        this.log(`[text-stream] \u6BB5\u843D ${seg} \u843D\u5E93\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`);
+      }
+    });
+    return this.paragraphChain;
+  }
+  /** 释放定时器（会话关闭 / 任务收尾） */
+  dispose() {
+    this.disposed = true;
+    if (this.timer) {
+      clearTimeout(this.timer);
+      this.timer = null;
+    }
+    this.buffer = "";
+    this.sent = 0;
+  }
+  scheduleDelta() {
+    if (this.timer || this.disposed)
+      return;
+    this.timer = setTimeout(() => {
+      this.timer = null;
+      this.flushDelta();
+    }, this.windowMs);
+    this.timer.unref?.();
+  }
+  /** 把「未发出的新增文本」作为一次 transient 增量直通 */
+  flushDelta() {
+    if (this.buffer.length <= this.sent)
+      return;
+    const text = this.buffer.slice(this.sent);
+    this.sent = this.buffer.length;
+    try {
+      this.sink.onDelta(this.seg, text);
+    } catch (err) {
+      this.log(`[text-stream] \u589E\u91CF\u76F4\u901A\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`);
+    }
+  }
+};
+
 // src/daemon/contract-skill.ts
 var COLLABORATION_SKILL_NAME = "morula-working-on-issues";
 var COLLABORATION_SKILL_FRONTMATTER = `---
@@ -4099,11 +4773,13 @@ var COLLABORATION_SKILL_BODY = `# Working on Morula issues\uFF08\u534F\u4F5C\u59
 
 ## 0. \u8FD0\u884C\u65F6\u4E0A\u4E0B\u6587\u4E0E\u4EFB\u52A1\u8BE6\u60C5\u83B7\u53D6\uFF08\u5BF9\u5E94\u4EFB\u52A1\u7CFB\u7EDF\u63D0\u793A\u8BCD\uFF0C\u5FC5\u987B\u4E00\u4E00\u5BF9\u5E94\uFF09
 
-\u4EFB\u52A1\u7CFB\u7EDF\u63D0\u793A\u8BCD\uFF08\u53D1\u7ED9\u4F60\u7684\u9996\u6761\u6D88\u606F\uFF09\u53EA\u627F\u8F7D\uFF1A**\u4F60\u7684\u8EAB\u4EFD**\uFF08\u9636\u6BB5\u804C\u8D23\uFF09\u3001**\u4F60\u7684\u76EE\u6807**\uFF08\u300C\u4F60\u7684\u76EE\u6807\u300D\u6BB5\uFF09\u3001
-**\u5DE5\u4F5C\u533A\u4E0E\u5DE5\u5177**\uFF08\u4ED3\u5E93\u6E05\u5355\u3001skill \u6307\u5F15\uFF09\u3002**\u4EFB\u52A1\u8BE6\u60C5\u4E0D\u8FDB\u63D0\u793A\u8BCD**\uFF0C\u4E00\u5F8B\u7528 CLI \u83B7\u53D6\uFF1A
+\u4EFB\u52A1\u7CFB\u7EDF\u63D0\u793A\u8BCD\uFF08\u53D1\u7ED9\u4F60\u7684\u9996\u6761\u6D88\u606F\uFF09\u53EA\u627F\u8F7D\u56DB\u6837\uFF1A**\u4F60\u7684\u8EAB\u4EFD\u4E0E\u8FB9\u754C**\uFF08\u9636\u6BB5\u804C\u8D23\uFF09\u3001**\u4F60\u7684\u76EE\u6807**\uFF08\u300C\u4F60\u7684\u76EE\u6807\u300D\u6BB5\uFF09\u3001
+**\u94A5\u5319**\uFF08\u300C\u57FA\u672C\u4FE1\u606F\u300D\u6BB5\u7684\u4EFB\u52A1 ID / \u7A7A\u95F4 ID\u2014\u2014\u53EA\u662F\u547D\u4EE4\u5165\u53C2\uFF0C\u4E0D\u662F\u4EFB\u52A1\u4FE1\u606F\uFF09\u3001**\u5DE5\u4F5C\u533A\u4E0E\u5DE5\u5177\u5165\u53E3**\uFF08\u672C skill \u4E0E
+\`morula task get\` / \`morula repo list\` \u7684\u7528\u6CD5\u6307\u5F15\uFF09\u3002**\u5176\u4F59\u4E0A\u4E0B\u6587\u4E0E\u4EFB\u52A1\u8BE6\u60C5\u4E00\u5F8B\u4E0D\u8FDB\u63D0\u793A\u8BCD**\uFF0C\u7528 CLI \u83B7\u53D6\uFF1A
 
 - **\u5F53\u524D\u4EFB\u52A1\u8BE6\u60C5**\uFF1A\`morula task get\`\uFF08\u65E0\u53C2\uFF09\u2014\u2014taskId \u7531\u6267\u884C\u73AF\u5883\u63D0\u4F9B\uFF08\`MORULA_TASK_ID\` env / \`.morula/checkout.json\`\uFF09\uFF0C\u65E0\u9700\u4E5F\u4E0D\u5E94\u4ECE\u522B\u5904\u731C\u3002\u8FD4\u56DE\uFF1A\`id\`\uFF08\u672C\u4EFB\u52A1 AgentTask ID\uFF0CUUID\uFF09\u3001\`code\`\uFF08\u4EFB\u52A1\u7F16\u53F7\uFF0C\u5982 \`SPW299-59\`\uFF09\u3001\`objectId\`\uFF08\u5173\u8054\u4E1A\u52A1\u4EFB\u52A1\u5BF9\u8C61\uFF09\u3001\`taskPrompt\`\uFF08\u672C\u6B21\u76EE\u6807\u539F\u6587\uFF09\u3001\`contextSnapshot\`\u3001\`status\`\u3002
 - **\u4E1A\u52A1\u4EFB\u52A1\u8BE6\u60C5**\uFF08\u6807\u9898/\u63CF\u8FF0\uFF09\uFF1A\`morula task get <objectId>\`\uFF1B**\u5173\u952E\u8BC4\u8BBA**\uFF08\u7528\u6237\u539F\u59CB\u8BC9\u6C42/\u5206\u6790\u7ED3\u8BBA\uFF09\uFF1A\`morula comment list --object <objectId>\`\u3002
+- **\u7A7A\u95F4\u4ED3\u5E93\u6E05\u5355**\uFF08\u591A\u4ED3\u5E93\u4EFB\u52A1\u5224\u65AD\u4F9D\u636E\uFF09\uFF1A\`morula repo list --space <spaceId>\`\u2014\u2014\u63D0\u793A\u8BCD\u4E0D\u5217\u4ED3\u5E93\uFF0C\u9700\u8981\u65F6\u81EA\u5DF1\u67E5\u3002
 - **\u300C\u4F60\u7684\u76EE\u6807\u300D**\uFF1A\u7CFB\u7EDF\u63D0\u793A\u300C\u4F60\u7684\u76EE\u6807\u300D\u6BB5 = \u672C\u6B21\u4EFB\u52A1\u7684\u539F\u59CB\u8BC9\u6C42\uFF0C\u636E\u6B64\u5224\u65AD\u8981\u505A\u4EC0\u4E48\u3002
 
 > **\u5DE5\u4F5C\u76EE\u5F55 = \u4EFB\u52A1\u5DE5\u4F5C\u533A\u6839**\uFF1A\u6839\u4E0B\u653E \`AGENTS.md\`\uFF08\u7A7A\u95F4\u9879\u76EE\u8BF4\u660E\uFF0C\u5DF2\u4F5C\u4E3A project.instructions \u81EA\u52A8\u52A0\u8F7D\uFF09\u3001
@@ -4137,7 +4813,7 @@ var COLLABORATION_SKILL_BODY = `# Working on Morula issues\uFF08\u534F\u4F5C\u59
 
 ## 0.3 \u5206\u652F\u547D\u540D\uFF1A\u7531\u4F60\uFF08Agent\uFF09\u53D6\u540D\u5E76\u4E0A\u62A5
 
-- **\u4EFB\u52A1 ID \u83B7\u53D6**\uFF1A\u672C\u4EFB\u52A1\u7684 AgentTask ID\uFF08UUID\uFF09\u7528 \`morula task get\`\uFF08\u65E0\u53C2\uFF09\u8FD4\u56DE\u7684 \`id\` \u53D6\u5F97\u2014\u2014taskId \u94A5\u5319\u7531\u6267\u884C\u73AF\u5883\u63D0\u4F9B\uFF0C\u4E0D\u8FDB\u7CFB\u7EDF\u63D0\u793A\u3002\`.agent_context/task-context.md\` \u5F00\u5934\u4E5F\u6709\u540C\u4E00 UUID\u3002\u9700\u8981\u8C03\u7528 \`morula task branch\` \u65F6\u7528\u5B83\u4F5C\u4E3A taskId\u3002
+- **\u4EFB\u52A1 ID \u83B7\u53D6**\uFF1A\u672C\u4EFB\u52A1\u7684 AgentTask ID\uFF08UUID\uFF09\u5728\u7CFB\u7EDF\u63D0\u793A\u300C\u57FA\u672C\u4FE1\u606F\u300D\u6BB5\uFF08\u4E5F\u662F \`morula task get\`\uFF08\u65E0\u53C2\uFF09\u8FD4\u56DE\u7684 \`id\`\uFF0C\`.agent_context/task-context.md\` \u5F00\u5934\u4EA6\u6709\uFF09\u3002\u9700\u8981\u8C03\u7528 \`morula task branch\` \u65F6\u7528\u5B83\u4F5C\u4E3A taskId\u3002
   - **\u91CD\u8981\u533A\u5206**\uFF1A\`morula task branch <taskId>\` \u7684 taskId \u7528**\u672C\u4EFB\u52A1 UUID**\uFF08\u673A\u5668\u534F\u8BAE\uFF09\uFF1B\u4F46 **MR / \u5206\u652F / PR \u91CC\u7684\u4EFB\u52A1\u7F16\u53F7\u7528\u5BF9\u5916\u7F16\u53F7 code**\uFF08\u5982 \`AGENT-958201\`\uFF0C\u7528\u4E8E\u670D\u52A1\u7AEF\u5173\u8054/\u5173\u5355\uFF09\u2014\u2014**\u4E0D\u8981\u7528 UUID \u6807\u8BB0 MR**\uFF08UUID \u5173\u5355\u53EA\u8BA4\u4E1A\u52A1\u5BF9\u8C61\uFF0CAgentTask \u4E0D\u4F1A\u88AB\u8BC6\u522B\uFF0C\u4F1A\u5BFC\u81F4 MR \u5173\u8054\u5931\u8D25\uFF09\u3002
 - **\u53EA\u6709\u9700\u8981\u6539\u4EE3\u7801\u5E76\u63A8\u5206\u652F\u7684\u4EFB\u52A1\u624D\u53D6\u540D**\uFF1B\u7EAF\u95EE\u7B54/\u53EA\u8BFB\u8C03\u7814/\u672C\u5730\u8D77\u670D\u52A1\u4E0D\u5EFA\u5206\u652F\uFF08\u89C1\u7B2C 3 \u6761\u51B3\u7B56\u6811\uFF09\u3002
 - **\u5148\u68C0\u67E5\u5F53\u524D\u5206\u652F**\uFF1A\u82E5\u4ED3\u5E93\u5DF2\u6709 feature \u5206\u652F\uFF08\u540C\u4EFB\u52A1/\u540C\u4E00\u6539\u52A8\u95ED\u73AF\u7684\u540E\u7EED\u8F6E\u6B21\u590D\u7528\uFF09\uFF0C**\u76F4\u63A5\u7EE7\u7EED\u7528\u5F53\u524D\u5206\u652F\uFF0C\u4E0D\u8981\u65B0\u5EFA**\uFF08\u5728\u4ED3\u5E93\u76EE\u5F55\u5185\u6267\u884C\uFF09\uFF1A
@@ -4190,13 +4866,13 @@ var COLLABORATION_SKILL_BODY = `# Working on Morula issues\uFF08\u534F\u4F5C\u59
   \u251C\u2500\u2500 .agents/skills/                \u2190 \u534F\u4F5C\u5951\u7EA6 + \u672C\u4EFB\u52A1\u81EA\u5B9A\u4E49 skill
   \u251C\u2500\u2500 .agent_context/task-context.md \u2190 \u4EFB\u52A1\u4E0A\u4E0B\u6587\uFF08\u89C1 0 \u8282\uFF09
   \u251C\u2500\u2500 .morula/checkout.json          \u2190 daemon \u51ED\u636E\uFF08CLI \u5185\u90E8\u4F7F\u7528\uFF0C\u4E0D\u8981\u624B\u52A8\u8BFB\uFF09
-  \u251C\u2500\u2500 <owner>-<repo>/                \u2190 \u4E3B\u4ED3\u5E93\uFF08\u7CFB\u7EDF\u63D0\u793A\u300C\u4ED3\u5E93\u53EF\u7528\u6027\u300D\u91CC\u7684\u90A3\u4E2A\uFF09
+  \u251C\u2500\u2500 <owner>-<repo>/                \u2190 \u4E3B\u4ED3\u5E93\uFF08\u5DF2\u6309\u5E73\u53F0\u89E3\u6790\u7ED3\u679C\u7269\u5316\uFF1B\u672C\u5730\u6CA1\u6709\u7684\u4ED3\u5E93\u6309\u9700 checkout\uFF09
   \u2514\u2500\u2500 <owner>-<repo2>/               \u2190 \u6B21\u4ED3\u5E93 / \u53EA\u8BFB\u68C0\u51FA\uFF08\u6309\u9700\u7269\u5316\uFF0C\u4E0E\u4E3B\u4ED3\u5E93\u540C\u7EA7\uFF09
   \`\`\`
 
 - **git / gh \u547D\u4EE4\u4E00\u5F8B\u5728\u5BF9\u5E94\u4ED3\u5E93\u76EE\u5F55\u5185\u6267\u884C**\uFF08\`cd <\u5DE5\u4F5C\u533A\u6839>/<\u4ED3\u5E93\u76EE\u5F55>\`\uFF0C\u6216 \`git -C <\u4ED3\u5E93\u76EE\u5F55> ...\`\uFF09\uFF1A
   \u5DE5\u4F5C\u533A\u6839\u4E0D\u662F git \u4ED3\u5E93\uFF0C\u5728\u6839\u76EE\u5F55\u8DD1 git \u547D\u4EE4\u5FC5\u7136\u5931\u8D25\u3002\`morula\` CLI \u53EF\u5728\u5DE5\u4F5C\u533A\u6839\u6216\u5176\u4EFB\u610F\u5B50\u76EE\u5F55\u6267\u884C\uFF08\u89C1 0.4\uFF09\u3002
-- **\u4E3B\u4ED3\u5E93**\uFF1A\u7CFB\u7EDF\u63D0\u793A\u7ED9\u51FA\u7684\u4ED3\u5E93\u5DF2\u5728\u5DE5\u4F5C\u533A\u6839\u4E0B\u5C31\u7EEA\uFF08\u76EE\u5F55\u540D = \u4ED3\u5E93\u5168\u540D\u628A \`/\` \u6362\u6210 \`-\`\uFF0C\u5982 \`human-resources/xxx\` \u2192 \`human-resources-xxx\`\uFF09\uFF1B\u76F4\u63A5\u5728\u8BE5\u76EE\u5F55\u5185\u5EFA\u5206\u652F/\u63D0\u4EA4/\u63A8\u5206\u652F/\u63D0 PR\u3002
+- **\u4E3B\u4ED3\u5E93**\uFF1A\u5E73\u53F0\u5DF2\u89E3\u6790\u51FA\u7684\u4ED3\u5E93\u5728**\u5DE5\u4F5C\u533A\u6839\u4E0B\u5C31\u7EEA**\uFF08\u76EE\u5F55\u540D = \u4ED3\u5E93\u5168\u540D\u628A \`/\` \u6362\u6210 \`-\`\uFF0C\u5982 \`human-resources/xxx\` \u2192 \`human-resources-xxx\`\uFF09\uFF1B\`ls\` \u5DE5\u4F5C\u533A\u6839\u5373\u53EF\u770B\u5230\uFF0C\u76F4\u63A5\u5728\u8BE5\u76EE\u5F55\u5185\u5EFA\u5206\u652F/\u63D0\u4EA4/\u63A8\u5206\u652F/\u63D0 PR\u3002**\u9700\u8981\u7A7A\u95F4\u7ED1\u5B9A\u4E86\u54EA\u4E9B\u4ED3\u5E93\u65F6\u81EA\u5DF1\u67E5**\uFF1A\`morula repo list --space <spaceId>\`\uFF08spaceId \u89C1\u7CFB\u7EDF\u63D0\u793A\u300C\u57FA\u672C\u4FE1\u606F\u300D\u6BB5\uFF09\u3002
 - **\u82E5\u4EFB\u52A1\u9700\u8981\u4E86\u89E3\u4ED3\u5E93\u5185\u5BB9/\u4EE3\u7801/\u63D0\u4EA4\u72B6\u6001\uFF08\u8BFB\u573A\u666F\uFF0C\u542B\u7EAF\u95EE\u7B54\uFF09**\uFF1A\u7528 \`morula repo checkout <taskId> <repoFullName>\`\uFF08\u672C\u5730 daemon \u7AEF\u70B9\uFF0C**\u672C\u8F6E\u7ACB\u5373\u7269\u5316**\u5E76\u8FD4\u56DE\u8DEF\u5F84\uFF0C\u901A\u5E38\u662F\u5DE5\u4F5C\u533A\u6839\u4E0B\u7684 \`<\u4ED3\u5E93\u76EE\u5F55>-readonly\`\uFF09\uFF0C\u7136\u540E\u5728\u8BE5\u8DEF\u5F84\u5185\u53EA\u8BFB\u67E5\u8BC1\uFF1A
   - \u8BFB\u4EE3\u7801/\u63D0\u4EA4/\u5206\u652F\uFF1A\`git -C <\u8DEF\u5F84> log --oneline -20\`\u3001\`git -C <\u8DEF\u5F84> show <sha>\`\u3001\`git -C <\u8DEF\u5F84> branch -a\`\u3001\`rg "\u5173\u952E\u8BCD" <\u8DEF\u5F84>\`\u3001\u8BFB\u6587\u4EF6\u7B49\uFF08**\u53EA\u8BFB**\uFF0C\u4E0D\u5EFA\u5206\u652F\u3001\u4E0D\u6539\u4EE3\u7801\u3001\u4E0D\u63D0 PR\uFF09\uFF1B
   - \u5237\u65B0\u8FDC\u7AEF\u6700\u65B0\uFF1A\`git -C <\u8DEF\u5F84> fetch origin --prune\`\uFF08remote \u5DF2\u914D\u7F6E SSH\uFF0C\u514D\u5BC6\uFF09\u3002
@@ -4204,7 +4880,7 @@ var COLLABORATION_SKILL_BODY = `# Working on Morula issues\uFF08\u534F\u4F5C\u59
 - **\u82E5\u4EFB\u52A1\u9700\u8981\u6539\u4EE3\u7801**\uFF1A\u7528 \`morula repo checkout <taskId> <repoFullName>\` \u62C9\u53D6/\u5207\u6362\u4ED3\u5E93\uFF08\u8BA4\u8BC1\u5DF2\u7531\u6267\u884C\u73AF\u5883\u6CE8\u5165\uFF09\uFF0C
   \u62FF\u5230\u8FD4\u56DE\u7684\u4ED3\u5E93\u8DEF\u5F84\u540E**chdir \u8FDB\u8BE5\u4ED3\u5E93\u76EE\u5F55**\uFF0C\u518D\u6309\u7B2C 0.3 \u6761\u5EFA\u5206\u652F\u3001\u7B2C 3 \u6761\u63D0 PR\u3002\u53EF\u9009 \`--ref <branch|sha>\` \u6307\u5B9A\u68C0\u51FA\u5206\u652F\u3002
 - **\u82E5\u4EFB\u52A1\u7EAF\u95EE\u7B54\u3001\u6216\u7A7A\u95F4\u65E0\u53EF\u7528\u4ED3\u5E93**\uFF1A\u76F4\u63A5\u56DE\u7B54\u7528\u6237\u95EE\u9898\uFF0C\u4E0D\u6784\u5EFA\u5206\u652F/PR\uFF08\u89C1\u7B2C 3 \u6761\u51B3\u7B56\u6811\uFF09\u3002
-- **\u82E5\u4EFB\u52A1\u6D89\u53CA\u591A\u4E2A\u4ED3\u5E93\uFF08\u591A\u4ED3\u5E93\u4EFB\u52A1\uFF09**\uFF1A\u6D89\u53CA\u54EA\u4E9B\u4ED3\u5E93\u7531**\u4F60**\u7ED3\u5408\u4EFB\u52A1\u63CF\u8FF0\u5224\u65AD\uFF08\u7CFB\u7EDF\u63D0\u793A\u300C\u591A\u4ED3\u5E93\u4EFB\u52A1\u300D\u6BB5 + \u4EFB\u52A1\u63CF\u8FF0\u300C\u6D89\u53CA\u4ED3\u5E93\u300D\u6BB5\u662F\u7BA1\u5BB6\u7684\u521D\u59CB\u5224\u65AD\uFF1B\u6267\u884C\u4E2D\u53D1\u73B0\u8FD8\u9700\u6539\u52A8\u5176\u4ED6\u4ED3\u5E93\u65F6\uFF0C\u81EA\u884C prepare \u62C9\u53D6\uFF09\uFF0C**\u4E0D\u9700\u8981\u5411\u7528\u6237\u9010\u4E2A\u786E\u8BA4**\uFF1A
+- **\u82E5\u4EFB\u52A1\u6D89\u53CA\u591A\u4E2A\u4ED3\u5E93\uFF08\u591A\u4ED3\u5E93\u4EFB\u52A1\uFF09**\uFF1A\u6D89\u53CA\u54EA\u4E9B\u4ED3\u5E93\u7531**\u4F60**\u7ED3\u5408\u4EFB\u52A1\u63CF\u8FF0\u5224\u65AD\uFF08\u4EFB\u52A1\u63CF\u8FF0\u91CC\u7684\u300C\u6D89\u53CA\u4ED3\u5E93\u300D\u662F\u7BA1\u5BB6\u7684\u521D\u59CB\u5224\u65AD\uFF1B\u7A7A\u95F4\u7ED1\u5B9A\u4E86\u54EA\u4E9B\u4ED3\u5E93\u7528 \`morula repo list --space <spaceId>\` \u67E5\uFF1B\u6267\u884C\u4E2D\u53D1\u73B0\u8FD8\u9700\u6539\u52A8\u5176\u4ED6\u4ED3\u5E93\u65F6\uFF0C\u81EA\u884C prepare \u62C9\u53D6\uFF09\uFF0C**\u4E0D\u9700\u8981\u5411\u7528\u6237\u9010\u4E2A\u786E\u8BA4**\uFF1A
   1. \u4E3B\u4ED3\u5E93\uFF1A\u5728\u5B83\u7684\u5B50\u76EE\u5F55\u5185\u76F4\u63A5 git \u64CD\u4F5C\uFF08\u5DE5\u4F5C\u533A\u6839\u4E0D\u662F\u4ED3\u5E93\uFF09\uFF1B
   2. \u5176\u4ED6\u4ED3\u5E93\u7528 \`morula repo prepare <taskId> <repoFullName>\` \u7269\u5316\u5230\u4EFB\u52A1\u5DE5\u4F5C\u533A\u6839\u4E0B\uFF08**\u4E0E\u4E3B\u4ED3\u5E93\u540C\u7EA7\u7684\u5B50\u76EE\u5F55**\uFF0C\u672C\u5730 daemon \u7AEF\u70B9\uFF0C\u672C\u8F6E\u7ACB\u5373\u7269\u5316\u5E76\u8FD4\u56DE\u8DEF\u5F84\uFF1Bgit \u534F\u8BAE\u62C9\u53D6\uFF0C\u4E0D\u8D70\u5E73\u53F0 API\uFF09\uFF1B
   3. \u5728\u54EA\u4E2A\u4ED3\u5E93\u6539\u52A8\uFF0C\u5C31\u5728\u54EA\u4E2A\u4ED3\u5E93\u5185\u5EFA\u5206\u652F\uFF08\u7B2C 0.3 \u6761\u547D\u540D\u89C4\u8303\uFF09\u3001\u63A8\u5206\u652F\u5E76\u5EFA PR/MR\uFF08title/description \u5E26\u4EFB\u52A1\u7F16\u53F7\uFF09\uFF1B\u6BCF\u4E2A\u4ED3\u5E93\u7684 PR \u670D\u52A1\u7AEF\u90FD\u4F1A\u81EA\u52A8\u5173\u8054\u5230\u672C\u4EFB\u52A1\u3002**\u5206\u652F\u540D\u9010\u4ED3\u4E0A\u62A5**\uFF1A\u4E3B\u4ED3\u5E93\uFF08\u5176\u5B50\u76EE\u5F55\uFF09\u7528 \`morula task branch <taskId> --name <\u5206\u652F\u540D>\`\uFF1B\u6B21\u4ED3\u5E93\uFF08\u540C\u7EA7\u5B50\u76EE\u5F55\uFF09\u7528 \`morula task branch <taskId> --name <\u5206\u652F\u540D> --repo <owner/name>\` \u2014\u2014 \u670D\u52A1\u7AEF\u636E\u6B64\u628A\u5206\u652F\u540D\u5199\u5230\u8BE5\u4ED3\u5E93\u7684\u5DE5\u4F5C\u4E0A\u4E0B\u6587\uFF08\u5E73\u53F0\u4FA7\u9010\u4ED3\u5EFA MR \u515C\u5E95\u3001\u4EA4\u4ED8\u6E05\u5355\u90FD\u4F9D\u8D56\u5B83\uFF1B\u4E0D\u62A5\u5219\u4E00\u76F4\u505C\u5728\u5360\u4F4D\u5206\u652F\u540D \`morula/tmp-*\`\uFF0C\u5E73\u53F0\u627E\u4E0D\u5230\u4F60\u7684\u5206\u652F\uFF09\uFF1B
@@ -4226,8 +4902,8 @@ var COLLABORATION_SKILL_BODY = `# Working on Morula issues\uFF08\u534F\u4F5C\u59
   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
-  \`morula repo list --space <spaceId>\`\uFF08\`<spaceId>\` = \`morula task get\` \u8FD4\u56DE\u7684 \`contextSnapshot.spaceId\`\uFF09\u3002
+- **\u53EF\u7528\u4ED3\u5E93\u6E05\u5355**\uFF1A\u7CFB\u7EDF\u63D0\u793A**\u4E0D\u518D\u5217\u51FA**\u4ED3\u5E93\u2014\u2014\u9700\u8981\u679A\u4E3E\u7A7A\u95F4\u7ED1\u5B9A\u7684\u4ED3\u5E93\u65F6\u7528
+  \`morula repo list --space <spaceId>\`\uFF08\`<spaceId>\` \u89C1\u7CFB\u7EDF\u63D0\u793A\u300C\u57FA\u672C\u4FE1\u606F\u300D\u6BB5\uFF0C\u6216 \`morula task get\` \u8FD4\u56DE\u7684 \`contextSnapshot.spaceId\`\uFF09\u3002
 - **\u6BCF\u4E2A\u547D\u4EE4\u7684\u5B8C\u6574\u53C2\u6570\u4EE5 \`morula <resource> --help\` \u4E3A\u51C6**\uFF08\u5982 \`morula repo --help\` \u53EA\u5217 repo \u7684\u7528\u6CD5\uFF09\uFF1B\u4E0D\u786E\u5B9A\u67D0\u547D\u4EE4\u652F\u6301\u54EA\u4E9B\u65D7\u6807\u65F6\u5148\u67E5\u5B83\uFF0C\u4E0D\u8981\u51ED\u8BB0\u5FC6\u62FC\u53C2\u6570\u3002
 - **\u7981\u6B62** \`curl\` / \`wget\` \u76F4\u8FDE\u5E73\u53F0 REST API\uFF1B\u7981\u6B62\u8BFB\u53D6 \`~/.morula-cli/config.yaml\`\u3001token \u6587\u4EF6\u6216\u73AF\u5883\u53D8\u91CF\u4E2D\u7684\u5BC6\u94A5\u3002
 - **\u672C\u5730 \`.morula/checkout.json\` \u662F daemon \u7BA1\u7406\u6587\u4EF6**\uFF08\`morula repo checkout\` \u5185\u90E8\u8BFB\u53D6\u7AEF\u53E3\u4E0E\u4EFB\u52A1\u51ED\u636E\uFF09\uFF0C**\u4E0D\u8981\u624B\u52A8\u8BFB\u53D6/\u590D\u5236\u5176\u4E2D\u7684\u5B57\u6BB5**\uFF1B\u51ED\u636E\u7531 CLI \u5904\u7406\uFF0C\u4F60\u4E0D\u9700\u8981\u4E5F\u4E0D\u5E94\u5F53\u770B\u5230\u5B83\u3002
@@ -4414,7 +5090,7 @@ morula task inbox --peek     # \u53EA\u770B\u4E0D\u53D6\uFF08\u786E\u8BA4\u6709\
 
 - **\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
 - **\u7EC8\u7AEF\u8F93\u51FA\u3001\u601D\u8003\u8FC7\u7A0B\u3001\u5DE5\u5177\u65E5\u5FD7\u7528\u6237\u90FD\u770B\u4E0D\u5230**\u2014\u2014\u7528\u6237\u770B\u5230\u7684\u53EA\u6709\u670D\u52A1\u7AEF\u6574\u5408\u540E\u53D1\u5E03\u7684\u6700\u7EC8\u603B\u7ED3\u8BC4\u8BBA\u3002
-- **\u8BC4\u8BBA @\u89E6\u53D1\u4EFB\u52A1\uFF08\u672C\u4EFB\u52A1\u7531\u8BC4\u8BBA\u89E6\u53D1\uFF0C\u89E6\u53D1\u8BC4\u8BBA ID \u89C1\u7CFB\u7EDF\u63D0\u793A\uFF09**\uFF1A\u670D\u52A1\u7AEF\u4F1A\u628A\u6700\u7EC8\u603B\u7ED3\u81EA\u52A8\u4F5C\u4E3A**\u8BE5\u89E6\u53D1\u8BC4\u8BBA\u7684\u56DE\u590D**\u53D1\u51FA\uFF08\u6302\u5728\u88AB @ \u7684\u8BC4\u8BBA\u4E0B\uFF09\u3002\u4F60\u65E0\u9700\u3001\u4E5F\u4E0D\u8981\u81EA\u5DF1\u8C03\u7528 \`morula comment add\`/add_comment\u3002
+- **\u8BC4\u8BBA @\u89E6\u53D1\u4EFB\u52A1\uFF08\u672C\u4EFB\u52A1\u7531\u8BC4\u8BBA\u89E6\u53D1\uFF09**\uFF1A\u670D\u52A1\u7AEF\u4F1A\u628A\u6700\u7EC8\u603B\u7ED3\u81EA\u52A8\u4F5C\u4E3A**\u8BE5\u89E6\u53D1\u8BC4\u8BBA\u7684\u56DE\u590D**\u53D1\u51FA\uFF08\u6302\u5728\u88AB @ \u7684\u8BC4\u8BBA\u4E0B\uFF09\u3002\u4F60\u65E0\u9700\u3001\u4E5F\u4E0D\u8981\u81EA\u5DF1\u8C03\u7528 \`morula comment add\`/add_comment\u3002
 - **\u9632\u91CD\u590D\uFF08\u670D\u52A1\u7AEF\u4FDD\u8BC1\uFF09**\uFF1A\u670D\u52A1\u7AEF\u5BF9\u300C\u540C\u4E00\u4E2A\u4EFB\u52A1\u53EA\u53D1\u4E00\u6761\u5B8C\u6210\u8BC4\u8BBA\u300D\u505A\u5E42\u7B49\uFF0C\u4E0D\u4F1A\u91CD\u590D\u5237\u5C4F\u3002\u4F60\u4E0D\u9700\u8981\u3001\u4E5F\u4E0D\u8981\u53BB\u67E5/\u53D1\u591A\u6761\u3002
 - **\u6700\u7EC8\u8F93\u51FA = \u53EA\u7559\u7ED3\u8BBA**\uFF08\u4E0D\u8BBE\u5B57\u6570\u4E0A\u9650\u3001\u4E0D\u8981\u6C42\u56FA\u5B9A\u683C\u5F0F\uFF0C\u81EA\u7136\u7EC4\u7EC7\u5373\u53EF\uFF09\uFF1A
   - \u5FC5\u7B54\uFF1A**\u505A\u4E86\u4EC0\u4E48\u3001\u7ED3\u679C\u5982\u4F55\u3001\u7528\u6237\u9700\u8981\u77E5\u9053\u7684\u540E\u7EED**\u3002
@@ -4469,7 +5145,7 @@ var COLLABORATION_SKILL_SOURCE_MAP = `# morula-working-on-issues \u2014 \u5951\u
 | CLI \u5199\u8BC4\u8BBA\uFF08**\u5951\u7EA6\u7981\u6B62 agent \u81EA\u884C\u8C03\u7528**\uFF1A\u5B8C\u6210\u8BC4\u8BBA\u7531\u670D\u52A1\u7AEF\u7EDF\u4E00\u53D1\u9001\uFF0C\u89C1\u672C\u6587\u4EF6\u7B2C 5 \u6761\uFF09 | \`morula comment add\`\uFF08\u547D\u4EE4\u5B58\u5728\uFF0C\u4F46\u672C\u5951\u7EA6\u8981\u6C42\u4E0D\u8C03\u7528\uFF09 | \`packages/morula-cli/src/commands/comment.ts\` |
 | 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\` |
+| \u7CFB\u7EDF\u63D0\u793A\u6CE8\u5165\uFF08\u8EAB\u4EFD\u4E0E\u8FB9\u754C = \u9636\u6BB5\u804C\u8D23 / \u76EE\u6807 / \u94A5\u5319 taskId+spaceId / \u5DE5\u5177\u5165\u53E3\u6307\u5F15\uFF09\uFF1B\u4EFB\u52A1\u8BE6\u60C5\u4E0E\u4ED3\u5E93\u6E05\u5355\u7531 \`morula task get\`\uFF08\u65E0\u53C2\uFF09\u3001\`morula repo list --space\` \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 |
 
@@ -4545,7 +5221,7 @@ function isFlagEnabled(name, defaultValue = true) {
 
 // src/daemon/git-env.ts
 import { execFileSync as execFileSync6 } from "node:child_process";
-import { existsSync as existsSync8, mkdirSync as mkdirSync6 } from "node:fs";
+import { existsSync as existsSync7, mkdirSync as mkdirSync6 } from "node:fs";
 import { join as join11 } from "node:path";
 var GIT_CANDIDATE_DIRS = ["/usr/bin", "/usr/local/bin", "/opt/homebrew/bin", "/opt/local/bin"];
 function prependToPath(dirs) {
@@ -4562,14 +5238,14 @@ function ensureGitOnPath() {
     return;
   } catch {
   }
-  const missing = prependToPath(GIT_CANDIDATE_DIRS.filter((d) => existsSync8(join11(d, "git"))));
+  const missing = prependToPath(GIT_CANDIDATE_DIRS.filter((d) => existsSync7(join11(d, "git"))));
   if (missing.length) {
     console.warn(`[daemon] PATH \u7F3A\u5C11 git\uFF0C\u5DF2\u8865\u5145: ${missing.join(", ")}`);
   }
 }
 function ensureNodeOnPath() {
   const nodeDir = process.execPath ? join11(process.execPath, "..") : "";
-  const candidates = [nodeDir, "/usr/local/bin", "/opt/homebrew/bin"].filter((d) => d && existsSync8(join11(d, "node")));
+  const candidates = [nodeDir, "/usr/local/bin", "/opt/homebrew/bin"].filter((d) => d && existsSync7(join11(d, "node")));
   const missing = prependToPath(candidates);
   if (missing.length) {
     console.warn(`[daemon] PATH \u7F3A\u5C11 node\uFF0C\u5DF2\u8865\u5145: ${missing.join(", ")}`);
@@ -4605,24 +5281,49 @@ function buildGitlabSshRemote(repoFullName, baseUrl) {
     return `ssh://git@${host}:${url.port}/${repoFullName}.git`;
   return `git@${host}:${repoFullName}.git`;
 }
-function ensureRepo(workdir, tenantId, repo, env, remoteUrl) {
+function buildDaemonRepoUrl(repoFullName, baseUrl) {
+  if (!baseUrl)
+    return `https://github.com/${repoFullName}.git`;
+  const url = new URL(baseUrl);
+  const path = repoFullName.replace(/^\/+/, "");
+  return `${url.protocol}//${url.host}/${path}.git`;
+}
+function ensureRepo(workdir, tenantId, repo, env, remoteUrl, daemonRemoteUrl) {
   const repoDir = join11(workdir, tenantId, repo);
-  if (existsSync8(join11(repoDir, ".git"))) {
+  const fetchUrl = daemonRemoteUrl ?? remoteUrl ?? buildDaemonRepoUrl(repo);
+  if (existsSync7(join11(repoDir, ".git"))) {
     if (remoteUrl)
       syncRemoteUrl(repoDir, remoteUrl, env);
     try {
-      execFileSync6("git", ["-C", repoDir, "fetch", "origin", "--prune"], { env, stdio: "pipe" });
-    } catch {
+      if (daemonRemoteUrl) {
+        execFileSync6(
+          "git",
+          ["-C", repoDir, "fetch", "--prune", fetchUrl, "+refs/heads/*:refs/remotes/origin/*"],
+          { env, stdio: "pipe" }
+        );
+      } else {
+        execFileSync6("git", ["-C", repoDir, "fetch", "origin", "--prune"], { env, stdio: "pipe" });
+      }
+    } catch (err) {
+      throw new Error(`REPO_SYNC_FAILED: \u62C9\u53D6\u4ED3\u5E93\u5931\u8D25 ${repo}: ${gitErrorText(err)}`);
     }
     return repoDir;
   }
   mkdirSync6(repoDir, { recursive: true });
-  execFileSync6("git", ["clone", "--filter=blob:none", remoteUrl ?? `https://github.com/${repo}`, repoDir], {
-    env,
-    stdio: "pipe"
-  });
+  try {
+    execFileSync6("git", ["clone", "--filter=blob:none", fetchUrl, repoDir], { env, stdio: "pipe" });
+  } catch (err) {
+    throw new Error(`REPO_SYNC_FAILED: \u514B\u9686\u4ED3\u5E93\u5931\u8D25 ${repo}: ${gitErrorText(err)}`);
+  }
+  if (remoteUrl && remoteUrl !== fetchUrl)
+    syncRemoteUrl(repoDir, remoteUrl, env);
   return repoDir;
 }
+function gitErrorText(err) {
+  const e = err;
+  const stderr = e?.stderr ? e.stderr.toString().trim() : "";
+  return stderr || e?.message || String(err);
+}
 function syncRemoteUrl(repoDir, remoteUrl, env) {
   try {
     const cur = execFileSync6("git", ["-C", repoDir, "remote", "get-url", "origin"], { env, stdio: "pipe" }).toString().trim();
@@ -4635,7 +5336,7 @@ function syncRemoteUrl(repoDir, remoteUrl, env) {
 function isLinkedWorktree(repoDir) {
   try {
     const gitDir = execFileSync6("git", ["-C", repoDir, "rev-parse", "--absolute-git-dir"], { encoding: "utf8", stdio: "pipe" }).trim();
-    return !!gitDir && existsSync8(join11(gitDir, "commondir"));
+    return !!gitDir && existsSync7(join11(gitDir, "commondir"));
   } catch {
     return false;
   }
@@ -4673,7 +5374,7 @@ function ensureGitIdentity(repoDir, personaName) {
 }
 
 // src/daemon/outbox.ts
-import { existsSync as existsSync9, mkdirSync as mkdirSync7, readdirSync as readdirSync2, readFileSync as readFileSync6, rmSync as rmSync6, writeFileSync as writeFileSync5 } from "node:fs";
+import { existsSync as existsSync8, mkdirSync as mkdirSync7, readdirSync as readdirSync2, readFileSync as readFileSync5, rmSync as rmSync7, writeFileSync as writeFileSync5 } from "node:fs";
 import { homedir as homedir9 } from "node:os";
 import { join as join12 } from "node:path";
 var OUTBOX_RETRY_SCHEDULE = [1e3, 4e3, 16e3, 6e4, 3e5];
@@ -4689,14 +5390,14 @@ function writeOutbox(entry, configDir) {
 }
 function readOutboxEntries(configDir) {
   const dir = outboxDir(configDir);
-  if (!existsSync9(dir))
+  if (!existsSync8(dir))
     return [];
   const entries = [];
   for (const file of readdirSync2(dir)) {
     if (!file.endsWith(".json"))
       continue;
     try {
-      const raw = readFileSync6(join12(dir, file), "utf8");
+      const raw = readFileSync5(join12(dir, file), "utf8");
       const parsed = JSON.parse(raw);
       if (parsed && typeof parsed.taskId === "string")
         entries.push(parsed);
@@ -4706,7 +5407,7 @@ function readOutboxEntries(configDir) {
   return entries;
 }
 function removeOutbox(taskId, configDir) {
-  rmSync6(join12(outboxDir(configDir), `${taskId}.json`), { force: true });
+  rmSync7(join12(outboxDir(configDir), `${taskId}.json`), { force: true });
 }
 function staleDir(configDir) {
   return join12(outboxDir(configDir), "stale");
@@ -4729,13 +5430,113 @@ function outboxAge(entry) {
   return Number.isFinite(created) ? Date.now() - created : Number.POSITIVE_INFINITY;
 }
 
+// src/daemon/plugin-register.ts
+import { chmodSync as chmodSync3, cpSync, existsSync as existsSync9, mkdirSync as mkdirSync8, readdirSync as readdirSync3, readFileSync as readFileSync6, rmSync as rmSync8, statSync as statSync2, writeFileSync as writeFileSync6 } from "node:fs";
+import { homedir as homedir10 } from "node:os";
+import { dirname as dirname6, join as join13 } from "node:path";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+var PLUGIN_NAME = "morula-cli";
+var MANIFEST_DIR_NAME = ".codex-plugin";
+function legacyAgentsPluginDir(home = homedir10()) {
+  return join13(home, ".agents", "plugins", PLUGIN_NAME);
+}
+function resolveDimcodeHome(env = process.env, home = homedir10()) {
+  const fromEnv = env.DIMCODE_HOME?.trim();
+  return fromEnv || join13(home, ".dimcode", "v2");
+}
+function defaultPluginsRoot(env = process.env, home = homedir10()) {
+  return join13(resolveDimcodeHome(env, home), "plugins");
+}
+function resolvePackagePaths(entryUrl) {
+  const distDir = dirname6(fileURLToPath2(entryUrl));
+  return {
+    packageRoot: dirname6(distDir),
+    distDir,
+    assetsDir: join13(distDir, "plugin")
+  };
+}
+function buildLauncherScript(opts) {
+  const entry = join13(opts.packageRoot, "dist", "morula.js");
+  return `#!/bin/sh
+# Morula \u4E1A\u52A1 CLI \u542F\u52A8\u5668\uFF08\u7531 \`morula-runtime setup\` \u751F\u6210\uFF1BNode \u5347\u7EA7\u540E\u91CD\u8DD1 setup \u5237\u65B0\uFF09\u3002
+# \u4E0D\u4F9D\u8D56\u8C03\u7528\u65B9 PATH \u91CC\u7684 node\uFF08agent \u6267\u884C\u73AF\u5883 PATH \u5E38\u88AB\u88C1\u526A\uFF09\uFF0C\u4EC5\u4F5C\u515C\u5E95\u3002
+NODE=${JSON.stringify(opts.nodePath)}
+[ -x "$NODE" ] || NODE="$(command -v node 2>/dev/null || true)"
+if [ -z "$NODE" ]; then
+  echo '{"code":"ERROR","message":"node not found; reinstall or re-run: morula-runtime setup"}' >&2
+  exit 127
+fi
+exec "$NODE" ${JSON.stringify(entry)} "$@"
+`;
+}
+function assetsReady(paths) {
+  return existsSync9(join13(paths.assetsDir, "plugin.json")) && existsSync9(join13(paths.assetsDir, "skills"));
+}
+function listSkillNames(assetsDir) {
+  const dir = join13(assetsDir, "skills");
+  if (!existsSync9(dir))
+    return [];
+  return readdirSync3(dir).filter((name) => {
+    try {
+      return statSync2(join13(dir, name)).isDirectory();
+    } catch {
+      return false;
+    }
+  }).sort();
+}
+function pluginBinDir(env = process.env, home = homedir10()) {
+  return join13(defaultPluginsRoot(env, home), PLUGIN_NAME, "bin");
+}
+function pluginBinPath(env = process.env, home = homedir10()) {
+  return join13(pluginBinDir(env, home), "morula");
+}
+function prependPluginBinToPath(currentPath, env = process.env, home = homedir10()) {
+  const binDir = pluginBinDir(env, home);
+  const segments = (currentPath ?? "").split(":").filter(Boolean);
+  if (segments[0] === binDir)
+    return currentPath ?? binDir;
+  return [binDir, ...segments.filter((s) => s !== binDir)].join(":");
+}
+function registerPlugin(opts) {
+  const { pluginsRoot, paths, version } = opts;
+  const nodePath = opts.nodePath ?? process.execPath;
+  const pluginDir = join13(pluginsRoot, PLUGIN_NAME);
+  if (!assetsReady(paths))
+    throw new Error(`plugin assets not found at ${paths.assetsDir}; run \`pnpm run build:dist\` (dev) or reinstall the package`);
+  const skillsSrc = join13(paths.assetsDir, "skills");
+  const skills = listSkillNames(paths.assetsDir);
+  const manifestDir = join13(pluginDir, MANIFEST_DIR_NAME);
+  mkdirSync8(manifestDir, { recursive: true });
+  const manifest = JSON.parse(readFileSync6(join13(paths.assetsDir, "plugin.json"), "utf8"));
+  writeFileSync6(join13(manifestDir, "plugin.json"), `${JSON.stringify({ ...manifest, version }, null, 2)}
+`);
+  const skillsDest = join13(pluginDir, "skills");
+  rmSync8(skillsDest, { recursive: true, force: true });
+  mkdirSync8(skillsDest, { recursive: true });
+  cpSync(skillsSrc, skillsDest, { recursive: true });
+  const binDir = join13(pluginDir, "bin");
+  mkdirSync8(binDir, { recursive: true });
+  const binPath = join13(binDir, "morula");
+  writeFileSync6(binPath, buildLauncherScript({ nodePath, packageRoot: paths.packageRoot }));
+  chmodSync3(binPath, 493);
+  const legacy = legacyAgentsPluginDir(opts.home);
+  return {
+    pluginDir,
+    binPath,
+    skills,
+    version,
+    node: nodePath,
+    legacyDir: existsSync9(join13(legacy, MANIFEST_DIR_NAME)) ? legacy : null
+  };
+}
+
 // src/daemon/acp/acp-event-mapper.ts
 var AcpEventMapper = class {
   lastUsage = void 0;
   reset() {
     this.lastUsage = void 0;
   }
-  /** 取当前 usage（run:ended 附着用） */
+  /** 取当前 usage（回放/观测用；**不再**作为 tokenUsage 附着——token 总量以 prompt 响应的 usage 为准） */
   get latestUsage() {
     return this.lastUsage;
   }
@@ -4761,6 +5562,13 @@ var AcpEventMapper = class {
         }
         break;
       }
+      case "user_message_chunk": {
+        const text = update.content?.type === "text" ? update.content.text : "";
+        if (text) {
+          messages.push({ eventType: "user_message:delta", payload: { delta: text } });
+        }
+        break;
+      }
       case "tool_call": {
         messages.push({
           eventType: "tool:started",
@@ -4788,11 +5596,13 @@ var AcpEventMapper = class {
         break;
       }
       case "usage_update": {
-        this.lastUsage = {
-          inputTokens: void 0,
-          outputTokens: void 0,
-          totalTokens: typeof update.used === "number" ? update.used : void 0
+        const usage2 = {
+          contextUsed: typeof update.used === "number" ? update.used : 0,
+          contextSize: typeof update.size === "number" ? update.size : 0,
+          cost: update.cost ?? null
         };
+        this.lastUsage = usage2;
+        messages.push({ eventType: "usage:context", payload: { usage: usage2 } });
         break;
       }
       default:
@@ -4888,14 +5698,9 @@ function normalizeOptionId(decision) {
 }
 
 // src/daemon/acp/dim-acp-executor.ts
-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 STEER_POLL_TICK_MS = 15e3;
 var KILL_GRACE_MS = 3e3;
 function resolveSteerSafetyMs(raw = process.env.MORULA_STEER_SAFETY_MS) {
   if (raw === void 0 || raw === "")
@@ -5038,7 +5843,7 @@ var DimAcpExecutor = class {
   /** 每次 run 前由调用方注入（daemon 单例池） */
   pool = null;
   async run(opts) {
-    const timeout = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS2;
+    const timeout = opts.timeoutMs && opts.timeoutMs > 0 ? opts.timeoutMs : 0;
     const mapper = new AcpEventMapper();
     const pool = opts.pool ?? this.pool;
     return await new Promise((resolve2) => {
@@ -5051,9 +5856,7 @@ var DimAcpExecutor = class {
       let turnNo = 1;
       const inFlightToolCalls = /* @__PURE__ */ new Map();
       const inFlightTools = () => inFlightToolCalls.size;
-      let lastActivityAt = Date.now();
-      let watchdogTimer = null;
-      let watchdogFired = false;
+      let steerPollTimer = null;
       let resumeFailed;
       const killTree = (c) => {
         if (!c)
@@ -5064,10 +5867,10 @@ var DimAcpExecutor = class {
           c.kill();
         }
       };
-      const stopWatchdog = () => {
-        if (watchdogTimer) {
-          clearInterval(watchdogTimer);
-          watchdogTimer = null;
+      const stopSteerPoll = () => {
+        if (steerPollTimer) {
+          clearInterval(steerPollTimer);
+          steerPollTimer = null;
         }
       };
       let abortHandler = () => {
@@ -5078,7 +5881,7 @@ var DimAcpExecutor = class {
         settled = true;
         if (timer)
           clearTimeout(timer);
-        stopWatchdog();
+        stopSteerPoll();
         if (ownsConnection && conn) {
           void conn.close().catch(() => {
           });
@@ -5103,45 +5906,17 @@ var DimAcpExecutor = class {
           finish({ ok: false, error: "\u4EFB\u52A1\u88AB\u53D6\u6D88", sessionId: sessionId || void 0 });
         }
       };
-      const startWatchdog = () => {
-        const idle = Number(process.env.MORULA_DIM_IDLE_TIMEOUT_MS) || DEFAULT_IDLE_TIMEOUT_MS;
-        if (idle <= 0)
-          return;
-        lastActivityAt = Date.now();
-        inFlightToolCalls.clear();
-        watchdogTimer = setInterval(() => {
+      const startSteerPoll = () => {
+        steerPollTimer = 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;
-          if (Date.now() - lastActivityAt > budget) {
-            watchdogFired = true;
-            if (sessionId && conn)
-              conn.cancel(sessionId);
-            killTree(conn);
-            finish({
-              ok: false,
-              error: `daemon: idle watchdog fired\uFF08${Math.round(budget / 1e3)}s \u65E0\u6D3B\u52A8\uFF09`,
-              sessionId: sessionId || void 0,
-              turns: turnNo
-            });
-          }
-        }, WATCHDOG_TICK_MS);
-        watchdogTimer.unref?.();
-      };
-      const markActivity = () => {
-        lastActivityAt = Date.now();
+        }, STEER_POLL_TICK_MS);
+        steerPollTimer.unref?.();
       };
       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;
@@ -5165,15 +5940,6 @@ var DimAcpExecutor = class {
 `);
         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) {
@@ -5212,8 +5978,12 @@ var DimAcpExecutor = class {
       });
       setup().then(async () => {
         const armTurnTimer = () => {
-          if (timer)
+          if (timer) {
             clearTimeout(timer);
+            timer = void 0;
+          }
+          if (timeout <= 0)
+            return;
           timer = setTimeout(() => {
             if (sessionId && conn)
               conn.cancel(sessionId);
@@ -5229,7 +5999,7 @@ var DimAcpExecutor = class {
         };
         armTurnTimer();
         opts.signal?.addEventListener("abort", abortHandler, { once: true });
-        startWatchdog();
+        startSteerPoll();
         const bridge = new AcpPermissionBridge();
         conn.setPermissionHandler(bridge.createHandler(opts.approval, opts.approvalMode === "manual"));
         const sessionParams = { cwd: opts.cwd, mcpServers: [] };
@@ -5279,7 +6049,7 @@ var DimAcpExecutor = class {
             process.stderr.write(`[daemon] \u4EFB\u52A1\u6307\u5B9A\u6A21\u578B ${opts.model} \u65E0\u6CD5\u5339\u914D ACP \u53EF\u7528\u6A21\u578B\uFF08\u5C06\u4F7F\u7528 dim \u9ED8\u8BA4\u6A21\u578B\uFF09
 `);
           } else {
-            await conn.setModel(sess.sessionId, modelId).catch((err) => {
+            await conn.setConfigOption(sess.sessionId, "model", modelId).catch((err) => {
               process.stderr.write(`[daemon] \u4EFB\u52A1\u6307\u5B9A\u6A21\u578B ${modelId} \u4E0B\u53D1\u5931\u8D25\uFF08\u5C06\u4F7F\u7528 dim \u9ED8\u8BA4\u6A21\u578B\uFF09: ${err.message}
 `);
             });
@@ -5289,7 +6059,6 @@ var DimAcpExecutor = class {
         });
         sessionId = sess.sessionId;
         pool?.touch();
-        markActivity();
         opts.onEvent?.(mapper.readyMessage(sessionId), "");
         const reopenSessionAfterInterrupt = async () => {
           try {
@@ -5320,7 +6089,6 @@ var DimAcpExecutor = class {
           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) {
@@ -5353,37 +6121,18 @@ var DimAcpExecutor = class {
               }
             }
             maybeInterruptAtSafePoint();
-          }, timeout + PROMPT_RPC_TIMEOUT_GRACE_MS);
+          }, timeout > 0 ? timeout + PROMPT_RPC_TIMEOUT_GRACE_MS : 0);
           if (settled)
             return;
           pool?.touch();
-          markActivity();
-          const usage2 = result.usage ?? mapper.latestUsage;
+          const usage2 = result.usage ?? void 0;
           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;
-            }
+            opts.steer?.onTurnInterrupted?.({ turnNo, reason: "steer", abortedTools });
             turnKind = "after-interrupt";
             promptText = opts.steer.consume({ turnNo: nextTurn, sessionReset });
             turnNo = nextTurn;
@@ -5406,7 +6155,7 @@ var DimAcpExecutor = class {
             return;
           }
           const leftover = activeSteer ?? opts.steer?.peek() ?? null;
-          if (leftover && turnNo + 1 <= maxTurns && !wallClockExceeded()) {
+          if (leftover) {
             const nextTurn = turnNo + 1;
             turnKind = "appended";
             promptText = opts.steer.consume({ turnNo: nextTurn, sessionReset });
@@ -5507,7 +6256,15 @@ function createDimEventNormalizer(opts) {
   let currentMessageId = null;
   let currentText = "";
   let hasBoundarySignal = false;
+  let pendingUserText = "";
+  const flushUserMessage = () => {
+    if (pendingUserText.trim().length > 0) {
+      opts.onEvent({ type: "user_message", text: pendingUserText });
+    }
+    pendingUserText = "";
+  };
   const startMessage = (messageId) => {
+    flushUserMessage();
     if (currentMessageId !== null && currentText.trim().length > 0) {
       opts.onEvent({ type: "assistant_message_completed", messageId: currentMessageId, text: currentText });
     }
@@ -5520,7 +6277,22 @@ function createDimEventNormalizer(opts) {
     const eventType = msg.eventType;
     if (!eventType)
       return;
+    if (eventType !== "user_message:delta")
+      flushUserMessage();
     switch (eventType) {
+      case "user_message:delta": {
+        const delta = msg.payload?.delta ?? "";
+        if (delta)
+          pendingUserText += delta;
+        break;
+      }
+      case "usage:context": {
+        const usage2 = msg.payload?.usage;
+        if (usage2 && typeof usage2 === "object") {
+          opts.onEvent({ type: "usage", usage: normalizeUsage(usage2) });
+        }
+        break;
+      }
       case "message:started": {
         const messageId = extractMessageId(msg.payload) ?? `msg-${msg.payload?.messageId ?? "run"}`;
         startMessage(messageId);
@@ -5535,9 +6307,12 @@ function createDimEventNormalizer(opts) {
         currentText = "";
         break;
       }
-      case "thinking:delta":
+      case "thinking:delta": {
+        const delta = msg.payload?.delta ?? "";
+        if (delta)
+          opts.onEvent({ type: "assistant_thinking_delta", text: delta });
         break;
-      // 思考过程不进最终回复
+      }
       case "text:delta": {
         const delta = msg.payload?.delta ?? "";
         if (!delta)
@@ -5611,6 +6386,7 @@ function createDimEventNormalizer(opts) {
         break;
       }
       case "run:ended": {
+        flushUserMessage();
         if (currentMessageId !== null && currentText.trim().length > 0) {
           opts.onEvent({ type: "assistant_message_completed", messageId: currentMessageId, text: currentText });
         } else if (!hasBoundarySignal && finalText.trim()) {
@@ -5648,7 +6424,11 @@ function normalizeUsage(raw) {
   return {
     inputTokens: typeof u.inputTokens === "number" ? u.inputTokens : void 0,
     outputTokens: typeof u.outputTokens === "number" ? u.outputTokens : void 0,
-    totalTokens: typeof u.totalTokens === "number" ? u.totalTokens : void 0
+    totalTokens: typeof u.totalTokens === "number" ? u.totalTokens : void 0,
+    // ACP usage_update（上下文占用语义，P0-8）：透传给前端状态行
+    contextUsed: typeof u.contextUsed === "number" ? u.contextUsed : void 0,
+    contextSize: typeof u.contextSize === "number" ? u.contextSize : void 0,
+    cost: u.cost && typeof u.cost === "object" && typeof u.cost.amount === "number" ? u.cost : null
   };
 }
 var DIM_CAPABILITIES = {
@@ -5703,8 +6483,8 @@ var DimAgentAdapter = class {
     }
   }
   async probe() {
-    const { existsSync: existsSync19 } = await import("node:fs");
-    const installed = existsSync19(this.dimPath) || this.dimPath === "dim";
+    const { existsSync: existsSync18 } = await import("node:fs");
+    const installed = existsSync18(this.dimPath) || this.dimPath === "dim";
     let authStatus = installed ? "unknown" : "error";
     let lastProbeErrorCode = installed ? void 0 : "DIM_CLI_NOT_FOUND";
     let lastProbeError = installed ? void 0 : `\u672A\u627E\u5230 dim CLI\uFF08${this.dimPath}\uFF09`;
@@ -5996,62 +6776,89 @@ function pickLegacyDimModels(inventory) {
 
 // src/daemon/repo-cache.ts
 import { execFileSync as execFileSync7 } from "node:child_process";
-import { existsSync as existsSync11, mkdirSync as mkdirSync8 } from "node:fs";
-import { dirname as dirname6, join as join14 } from "node:path";
+import { existsSync as existsSync11, mkdirSync as mkdirSync9 } from "node:fs";
+import { dirname as dirname7, join as join15 } from "node:path";
 function ownerOf(repoFullName) {
   const idx = repoFullName.indexOf("/");
   return idx > 0 ? repoFullName.slice(0, idx) : "_default";
 }
 function buildRepoCachePath(workdir, tenantId, repoFullName) {
-  return join14(workdir, "repos", tenantId, ownerOf(repoFullName), repoFullName);
+  return join15(workdir, "repos", tenantId, ownerOf(repoFullName), repoFullName);
 }
-function openRepoCache(workdir, tenantId, repoFullName, env, remoteUrl) {
+function openRepoCache(workdir, tenantId, repoFullName, env, agentRemoteUrl, daemonRemoteUrl) {
   const repoCachePath = buildRepoCachePath(workdir, tenantId, repoFullName);
-  const url = remoteUrl ?? `https://github.com/${repoFullName}`;
+  const currentOrigin = () => {
+    if (!existsSync11(join15(repoCachePath, ".git")))
+      return null;
+    try {
+      return execFileSync7("git", ["-C", repoCachePath, "remote", "get-url", "origin"], { encoding: "utf8", env, stdio: "pipe" }).trim() || null;
+    } catch {
+      return null;
+    }
+  };
+  const fetchUrl = () => daemonRemoteUrl ?? currentOrigin() ?? agentRemoteUrl ?? `https://github.com/${repoFullName}.git`;
+  const originUrl = () => agentRemoteUrl ?? fetchUrl();
   return {
     repoCachePath,
     ensure() {
-      if (existsSync11(join14(repoCachePath, ".git"))) {
-        if (url)
-          syncRemoteUrl(repoCachePath, url, env);
+      if (existsSync11(join15(repoCachePath, ".git"))) {
+        syncRemoteUrl(repoCachePath, originUrl(), env);
         return;
       }
-      mkdirSync8(dirname6(repoCachePath), { recursive: true });
-      execFileSync7("git", ["clone", "--filter=blob:none", url, repoCachePath], {
-        env,
-        stdio: "pipe"
-      });
+      mkdirSync9(dirname7(repoCachePath), { recursive: true });
+      const cloneUrl = fetchUrl();
+      try {
+        execFileSync7("git", ["clone", "--filter=blob:none", cloneUrl, repoCachePath], { env, stdio: "pipe" });
+      } catch (err) {
+        throw new Error(`REPO_SYNC_FAILED: \u514B\u9686\u4ED3\u5E93\u5931\u8D25 ${repoFullName}: ${gitErrorText2(err)}`);
+      }
+      if (originUrl() !== cloneUrl)
+        syncRemoteUrl(repoCachePath, originUrl(), env);
     },
     fetch() {
       try {
-        execFileSync7("git", ["-C", repoCachePath, "fetch", "origin", "--prune"], { env, stdio: "pipe" });
-      } catch {
+        if (daemonRemoteUrl) {
+          execFileSync7(
+            "git",
+            ["-C", repoCachePath, "fetch", "--prune", daemonRemoteUrl, "+refs/heads/*:refs/remotes/origin/*"],
+            { env, stdio: "pipe" }
+          );
+        } else {
+          execFileSync7("git", ["-C", repoCachePath, "fetch", "origin", "--prune"], { env, stdio: "pipe" });
+        }
+      } catch (err) {
+        throw new Error(`REPO_SYNC_FAILED: \u62C9\u53D6\u4ED3\u5E93\u5931\u8D25 ${repoFullName}: ${gitErrorText2(err)}`);
       }
     }
   };
 }
+function gitErrorText2(err) {
+  const e = err;
+  const stderr = e?.stderr ? e.stderr.toString().trim() : "";
+  return stderr || e?.message || String(err);
+}
 
 // src/daemon/repo-checkout-service.ts
 import { createServer as createServer3 } from "node:http";
 import { execFileSync as execFileSync9 } from "node:child_process";
-import { existsSync as existsSync14, mkdirSync as mkdirSync10, readdirSync as readdirSync4, writeFileSync as writeFileSync8 } from "node:fs";
-import { basename as basename2, join as join17 } from "node:path";
+import { existsSync as existsSync14, mkdirSync as mkdirSync11, readdirSync as readdirSync5, writeFileSync as writeFileSync9 } from "node:fs";
+import { basename as basename2, join as join18 } from "node:path";
 
 // src/daemon/worktree-manager.ts
 import { execFileSync as execFileSync8 } from "node:child_process";
-import { existsSync as existsSync13, mkdirSync as mkdirSync9, readdirSync as readdirSync3, readFileSync as readFileSync9, renameSync as renameSync2, rmSync as rmSync7, statSync as statSync2, writeFileSync as writeFileSync7 } from "node:fs";
-import { basename, join as join16, sep as sep2 } from "node:path";
+import { existsSync as existsSync13, mkdirSync as mkdirSync10, readdirSync as readdirSync4, readFileSync as readFileSync9, renameSync as renameSync2, rmSync as rmSync9, statSync as statSync3, writeFileSync as writeFileSync8 } from "node:fs";
+import { basename, join as join17, sep as sep2 } from "node:path";
 
 // src/daemon/workspace-marker.ts
-import { existsSync as existsSync12, readFileSync as readFileSync8, writeFileSync as writeFileSync6 } from "node:fs";
-import { join as join15 } from "node:path";
+import { existsSync as existsSync12, readFileSync as readFileSync8, writeFileSync as writeFileSync7 } from "node:fs";
+import { join as join16 } from "node:path";
 var WORKTREE_MARKER_FILE = ".morula-worktree.json";
 var WORKTREE_MARKER_SCHEMA = 1;
 function markerPath(worktreePath) {
-  return join15(worktreePath, WORKTREE_MARKER_FILE);
+  return join16(worktreePath, WORKTREE_MARKER_FILE);
 }
 function writeWorktreeMarker(worktreePath, marker) {
-  writeFileSync6(markerPath(worktreePath), `${JSON.stringify(marker, null, 2)}
+  writeFileSync7(markerPath(worktreePath), `${JSON.stringify(marker, null, 2)}
 `, "utf8");
 }
 function readWorktreeMarker(worktreePath) {
@@ -6083,14 +6890,14 @@ function buildTaskRootPath(workdir, tenantId, runtimeId, workContextId, code) {
     throw new Error("WORKTREE_RUNTIME_ID_MISSING: \u7F3A\u5C11 runtimeId\uFF0C\u65E0\u6CD5\u6784\u9020\u6309\u6267\u884C\u8005\u9694\u79BB\u7684 worktree \u8DEF\u5F84");
   }
   const dirName = code ? `${safeDirName(code)}-${workContextId.slice(0, 8)}` : workContextId;
-  return join16(workdir, "worktrees", tenantId, runtimeSegment, dirName);
+  return join17(workdir, "worktrees", tenantId, runtimeSegment, dirName);
 }
 function buildWorktreePath(workdir, tenantId, runtimeId, workContextId, code, repoFullName) {
-  return join16(buildTaskRootPath(workdir, tenantId, runtimeId, workContextId, code), safeDirName(repoFullName));
+  return join17(buildTaskRootPath(workdir, tenantId, runtimeId, workContextId, code), safeDirName(repoFullName));
 }
 function buildLegacyWorktreePath(workdir, tenantId, workContextId, code) {
   const dirName = code ? `${safeDirName(code)}-${workContextId.slice(0, 8)}` : workContextId;
-  return join16(workdir, "worktrees", tenantId, dirName);
+  return join17(workdir, "worktrees", tenantId, dirName);
 }
 var legacyPathWarned = /* @__PURE__ */ new Set();
 function warnLegacyWorktreeResidue(legacyPath) {
@@ -6101,13 +6908,13 @@ function warnLegacyWorktreeResidue(legacyPath) {
 }
 var legacyLayoutWarned = /* @__PURE__ */ new Set();
 function warnLegacyLayoutWorktreeResidue(taskRoot, worktreePath) {
-  if (legacyLayoutWarned.has(taskRoot) || existsSync13(worktreePath) || !existsSync13(join16(taskRoot, WORKTREE_MARKER_FILE)))
+  if (legacyLayoutWarned.has(taskRoot) || existsSync13(worktreePath) || !existsSync13(join17(taskRoot, WORKTREE_MARKER_FILE)))
     return;
   legacyLayoutWarned.add(taskRoot);
   console.warn(`[daemon] \u68C0\u6D4B\u5230\u65E7\u5E03\u5C40\u4EFB\u52A1\u5DE5\u4F5C\u533A\uFF08\u4ED3\u5E93\u76F4\u63A5\u4F4D\u4E8E\u5DE5\u4F5C\u533A\u6839\uFF09: ${taskRoot} \u2014\u2014 \u65B0\u5E03\u5C40\u4F1A\u5728\u5176\u4E0B\u521B\u5EFA\u4ED3\u5E93\u5B50\u76EE\u5F55\uFF0C\u65E7\u76EE\u5F55\u5185\u5BB9\u4E0D\u518D\u88AB\u4F7F\u7528\uFF1B\u5176\u4E2D\u53EF\u80FD\u6709\u672A\u63A8\u9001\u6539\u52A8\uFF0C\u786E\u8BA4\u65E0\u9700\u4FDD\u7559\u540E\u53EF\u624B\u52A8\u5220\u9664\uFF08\u4E0D\u81EA\u52A8\u8FC1\u79FB/\u6E05\u7406\uFF09`);
 }
 function ensureMarkerIgnoredAndCommitted(worktreePath, env) {
-  const gitignorePath = join16(worktreePath, ".gitignore");
+  const gitignorePath = join17(worktreePath, ".gitignore");
   const existing = existsSync13(gitignorePath) ? readFileSync9(gitignorePath, "utf8") : "";
   const requiredLines = [WORKTREE_MARKER_FILE];
   const missing = requiredLines.filter((l) => !existing.split("\n").some((line) => line.trim() === l));
@@ -6115,7 +6922,7 @@ function ensureMarkerIgnoredAndCommitted(worktreePath, env) {
     const next = `${existing.trimEnd() ? `${existing.trimEnd()}
 ` : ""}${missing.join("\n")}
 `;
-    writeFileSync7(gitignorePath, next, "utf8");
+    writeFileSync8(gitignorePath, next, "utf8");
     try {
       execFileSync8("git", ["-C", worktreePath, "add", ".gitignore"], { env, stdio: "pipe" });
       execFileSync8(
@@ -6195,17 +7002,17 @@ function sleepSync2(ms) {
 function backoffMs(baseMs, random = Math.random) {
   return Math.round(baseMs * (0.5 + random() * 0.5));
 }
-function gitErrorText(err) {
+function gitErrorText3(err) {
   const e = err;
   const stderr = e?.stderr ? e.stderr.toString() : "";
   return `${stderr}${stderr ? "\n" : ""}${e?.message ?? String(err)}`;
 }
 function isIndexLockConflict(err) {
-  const text = gitErrorText(err);
+  const text = gitErrorText3(err);
   return /index\.lock/i.test(text) || /另一个 git 进程|another git process/i.test(text);
 }
 function worktreeIndexLockPath(repoCachePath, worktreePath) {
-  return join16(repoCachePath, ".git", "worktrees", basename(worktreePath), "index.lock");
+  return join17(repoCachePath, ".git", "worktrees", basename(worktreePath), "index.lock");
 }
 function indexLockPathFromError(text) {
   const m = text.match(/[^\s'‘’"]*index\.lock/);
@@ -6242,7 +7049,7 @@ function addWorktreeWithRetry(repoCachePath, worktreePath, ref, deps = {}) {
         throw err;
       if (attempt === WORKTREE_ADD_MAX_ATTEMPTS)
         break;
-      const lockPath = indexLockPathFromError(gitErrorText(err)) ?? worktreeIndexLockPath(repoCachePath, worktreePath);
+      const lockPath = indexLockPathFromError(gitErrorText3(err)) ?? worktreeIndexLockPath(repoCachePath, worktreePath);
       const released = waitForIndexLockRelease(lockPath, waitMs);
       const backoff = backoffMs(WORKTREE_ADD_BACKOFF_MS[attempt - 1]);
       console.warn(
@@ -6251,7 +7058,7 @@ function addWorktreeWithRetry(repoCachePath, worktreePath, ref, deps = {}) {
       sleepSync2(backoff);
     }
   }
-  throw new Error(`WORKTREE_ADD_FAILED: worktree add \u8FDE\u7EED ${WORKTREE_ADD_MAX_ATTEMPTS} \u6B21\u5931\u8D25\uFF08${gitErrorText(lastErr).trim()}\uFF09`);
+  throw new Error(`WORKTREE_ADD_FAILED: worktree add \u8FDE\u7EED ${WORKTREE_ADD_MAX_ATTEMPTS} \u6B21\u5931\u8D25\uFF08${gitErrorText3(lastErr).trim()}\uFF09`);
 }
 var FOREIGN_RESIDUE_MAX_ENTRIES = 64;
 var FOREIGN_RESIDUE_SCAN_LIMIT = 2e3;
@@ -6259,7 +7066,7 @@ var foreignResidueHits = /* @__PURE__ */ new Map();
 function inspectForeignDirectory(dir) {
   let entries = [];
   try {
-    entries = readdirSync3(dir, { withFileTypes: true });
+    entries = readdirSync4(dir, { withFileTypes: true });
   } catch {
   }
   const topNames = entries.slice(0, 20).map((e) => `${e.name}${e.isDirectory() ? "/" : ""}`);
@@ -6273,7 +7080,7 @@ function inspectForeignDirectory(dir) {
       return;
     let children = [];
     try {
-      children = readdirSync3(p, { withFileTypes: true });
+      children = readdirSync4(p, { withFileTypes: true });
     } catch {
       return;
     }
@@ -6281,9 +7088,9 @@ function inspectForeignDirectory(dir) {
       if (count >= FOREIGN_RESIDUE_SCAN_LIMIT)
         return;
       count++;
-      const full = join16(p, e.name);
+      const full = join17(p, e.name);
       try {
-        const st = statSync2(full);
+        const st = statSync3(full);
         bytes += st.size;
         minMs = Math.min(minMs, st.mtimeMs);
         maxMs = Math.max(maxMs, st.mtimeMs);
@@ -6313,7 +7120,7 @@ function reportForeignResidue(worktreePath, forensics, cleaned) {
     console.warn(`[daemon] ${detail}`);
 }
 function prepareWorktree(input) {
-  const cache = openRepoCache(input.workdir, input.tenantId, input.repoFullName, input.env, input.remoteUrl);
+  const cache = openRepoCache(input.workdir, input.tenantId, input.repoFullName, input.env, input.remoteUrl, input.daemonRemoteUrl);
   cache.ensure();
   cache.fetch();
   const requestedBase = input.baseBranch?.trim();
@@ -6369,7 +7176,7 @@ function prepareWorktree(input) {
     if (!isGitRepo) {
       const forensics = inspectForeignDirectory(worktreePath);
       try {
-        rmSync7(worktreePath, { recursive: true, force: true });
+        rmSync9(worktreePath, { recursive: true, force: true });
       } catch {
         reportForeignResidue(worktreePath, forensics, false);
         throw new Error(`WORKTREE_RESIDUE: \u76EE\u5F55 ${worktreePath} \u6B8B\u7559\u4E14\u6E05\u7406\u5931\u8D25\uFF0C\u8BF7\u4EBA\u5DE5\u5904\u7406`);
@@ -6425,7 +7232,7 @@ function prepareWorktree(input) {
     }
   }
   if (!existsSync13(worktreePath)) {
-    mkdirSync9(join16(worktreePath, ".."), { recursive: true });
+    mkdirSync10(join17(worktreePath, ".."), { recursive: true });
     addWorktreeWithRetry(cache.repoCachePath, worktreePath, `origin/${input.baseBranch}`);
     writeWorktreeMarker(worktreePath, {
       schemaVersion: 1,
@@ -6442,7 +7249,7 @@ function prepareWorktree(input) {
   {
     const dotMorulaRescue = `${worktreePath}.morula-rescue`;
     if (existsSync13(dotMorulaRescue)) {
-      const dotMorulaDir = join16(worktreePath, ".morula");
+      const dotMorulaDir = join17(worktreePath, ".morula");
       if (!existsSync13(dotMorulaDir)) {
         try {
           renameSync2(dotMorulaRescue, dotMorulaDir);
@@ -6451,7 +7258,7 @@ function prepareWorktree(input) {
           console.warn(`[daemon] worktree \u6F02\u79FB\u81EA\u52A8\u6062\u590D: .morula/ \u5F52\u8FD8\u5931\u8D25\uFF0C\u5907\u4EFD\u4FDD\u7559\u5728 ${dotMorulaRescue}`);
         }
       } else {
-        rmSync7(dotMorulaRescue, { recursive: true, force: true });
+        rmSync9(dotMorulaRescue, { recursive: true, force: true });
       }
     }
   }
@@ -6471,10 +7278,10 @@ function prepareWorktree(input) {
   };
 }
 function resolveWorkspaceLayout(root, expected) {
-  const primaryDir = join16(root, safeDirName(expected.repoFullName));
-  if (existsSync13(join16(primaryDir, WORKTREE_MARKER_FILE)))
+  const primaryDir = join17(root, safeDirName(expected.repoFullName));
+  if (existsSync13(join17(primaryDir, WORKTREE_MARKER_FILE)))
     return { primaryDir, legacy: false };
-  if (existsSync13(join16(root, WORKTREE_MARKER_FILE)))
+  if (existsSync13(join17(root, WORKTREE_MARKER_FILE)))
     return { primaryDir: root, legacy: true };
   return null;
 }
@@ -6498,7 +7305,7 @@ function validateRemovable(taskRoot, expected, repoCachePath) {
     ).join("\n");
     if (statusRelevant.length > 0)
       return "WORKTREE_DIRTY";
-    const additionalActivity = legacy ? findActivityInReposDir(join16(primaryDir, ".morula", "repos")) : findAdditionalRepoActivity(taskRoot, { excludeDirs: [primaryDir] });
+    const additionalActivity = legacy ? findActivityInReposDir(join17(primaryDir, ".morula", "repos")) : findAdditionalRepoActivity(taskRoot, { excludeDirs: [primaryDir] });
     if (additionalActivity)
       return "WORKTREE_DIRTY";
     try {
@@ -6541,13 +7348,13 @@ function findActivityInReposDir(reposDir) {
     return null;
   let names = [];
   try {
-    names = readdirSync3(reposDir);
+    names = readdirSync4(reposDir);
   } catch {
     return null;
   }
   for (const name of names) {
-    const repoPath = join16(reposDir, name);
-    if (!existsSync13(join16(repoPath, ".git")))
+    const repoPath = join17(reposDir, name);
+    if (!existsSync13(join17(repoPath, ".git")))
       continue;
     if (repoHasActivity(repoPath))
       return repoPath;
@@ -6558,20 +7365,20 @@ function findAdditionalRepoActivity(taskRoot, options = {}) {
   const excluded = new Set(options.excludeDirs ?? []);
   let entries = [];
   try {
-    entries = readdirSync3(taskRoot, { withFileTypes: true });
+    entries = readdirSync4(taskRoot, { withFileTypes: true });
   } catch {
     return null;
   }
-  const candidates = entries.filter((e) => e.isDirectory() && !e.name.startsWith(".")).map((e) => join16(taskRoot, e.name)).filter((dir) => !excluded.has(dir));
-  const legacyReposDir = join16(taskRoot, ".morula", "repos");
+  const candidates = entries.filter((e) => e.isDirectory() && !e.name.startsWith(".")).map((e) => join17(taskRoot, e.name)).filter((dir) => !excluded.has(dir));
+  const legacyReposDir = join17(taskRoot, ".morula", "repos");
   if (existsSync13(legacyReposDir)) {
     try {
-      candidates.push(...readdirSync3(legacyReposDir).map((n) => join16(legacyReposDir, n)));
+      candidates.push(...readdirSync4(legacyReposDir).map((n) => join17(legacyReposDir, n)));
     } catch {
     }
   }
   for (const repoPath of candidates) {
-    if (!existsSync13(join16(repoPath, ".git")))
+    if (!existsSync13(join17(repoPath, ".git")))
       continue;
     if (repoHasActivity(repoPath))
       return repoPath;
@@ -6579,18 +7386,18 @@ function findAdditionalRepoActivity(taskRoot, options = {}) {
   return null;
 }
 function cleanupInjectedSkills(dir) {
-  const injectedSkillsRoot = join16(dir, ".agents", "skills");
+  const injectedSkillsRoot = join17(dir, ".agents", "skills");
   if (!existsSync13(injectedSkillsRoot))
     return;
   try {
-    for (const name of readdirSync3(injectedSkillsRoot)) {
+    for (const name of readdirSync4(injectedSkillsRoot)) {
       if (name === COLLABORATION_SKILL_NAME || /^[\w-]{1,64}$/.test(name)) {
-        rmSync7(join16(injectedSkillsRoot, name), { recursive: true, force: true });
+        rmSync9(join17(injectedSkillsRoot, name), { recursive: true, force: true });
       }
     }
-    if (readdirSync3(injectedSkillsRoot).length === 0) {
-      rmSync7(join16(dir, ".agents", "skills"), { recursive: true, force: true });
-      rmSync7(join16(dir, ".agents"), { recursive: true, force: true });
+    if (readdirSync4(injectedSkillsRoot).length === 0) {
+      rmSync9(join17(dir, ".agents", "skills"), { recursive: true, force: true });
+      rmSync9(join17(dir, ".agents"), { recursive: true, force: true });
     }
   } catch {
   }
@@ -6599,15 +7406,15 @@ function collectSiblingGitCommonDirs(taskRoot, excludeDir) {
   const dirs = /* @__PURE__ */ new Set();
   let entries = [];
   try {
-    entries = readdirSync3(taskRoot, { withFileTypes: true });
+    entries = readdirSync4(taskRoot, { withFileTypes: true });
   } catch {
     return [];
   }
   for (const e of entries) {
     if (!e.isDirectory() || e.name.startsWith("."))
       continue;
-    const repoPath = join16(taskRoot, e.name);
-    if (repoPath === excludeDir || !existsSync13(join16(repoPath, ".git")))
+    const repoPath = join17(taskRoot, e.name);
+    if (repoPath === excludeDir || !existsSync13(join17(repoPath, ".git")))
       continue;
     try {
       const commonDir = execFileSync8("git", ["-C", repoPath, "rev-parse", "--path-format=absolute", "--git-common-dir"], { encoding: "utf8", stdio: "pipe" }).trim();
@@ -6624,13 +7431,13 @@ function removeTaskWorkspace(repoCachePath, taskRoot, expected) {
     throw new Error("MARKER_MISMATCH");
   const { primaryDir, legacy } = layout;
   if (!legacy) {
-    if (primaryDir !== join16(taskRoot, safeDirName(expected.repoFullName)) || !isManagedWorkspaceRoot(taskRoot))
+    if (primaryDir !== join17(taskRoot, safeDirName(expected.repoFullName)) || !isManagedWorkspaceRoot(taskRoot))
       throw new Error("GIT_REMOVE_FAILED");
   }
   cleanupInjectedSkills(legacy ? primaryDir : taskRoot);
   const siblingCommonDirs = legacy ? [] : collectSiblingGitCommonDirs(taskRoot, primaryDir);
   try {
-    rmSync7(taskRoot, { recursive: true, force: true });
+    rmSync9(taskRoot, { recursive: true, force: true });
   } catch {
     throw new Error("GIT_REMOVE_FAILED");
   }
@@ -6654,7 +7461,7 @@ function removeWorktree(repoCachePath, worktreePath) {
 }
 
 // src/daemon/repo-checkout-service.ts
-var CHECKOUT_JSON_FILE = join17(".morula", "checkout.json");
+var CHECKOUT_JSON_FILE = join18(".morula", "checkout.json");
 var LocalRepoCheckoutService = class {
   constructor(opts) {
     this.opts = opts;
@@ -6742,9 +7549,9 @@ var LocalRepoCheckoutService = class {
       return;
     this.tasks.set(taskId, { workdir, checkToken, primaryRepoDir });
     try {
-      const dir = join17(workdir, ".morula");
-      mkdirSync10(dir, { recursive: true, mode: 448 });
-      writeFileSync8(join17(dir, "checkout.json"), JSON.stringify({
+      const dir = join18(workdir, ".morula");
+      mkdirSync11(dir, { recursive: true, mode: 448 });
+      writeFileSync9(join18(dir, "checkout.json"), JSON.stringify({
         taskId,
         port: this.boundPort,
         checkToken
@@ -6798,7 +7605,8 @@ var LocalRepoCheckoutService = class {
         this.opts.tenantId,
         repoFullName,
         env,
-        baseUrl ? buildGitlabSshRemote(repoFullName, baseUrl) : void 0
+        baseUrl ? buildGitlabSshRemote(repoFullName, baseUrl) : void 0,
+        baseUrl ? buildDaemonRepoUrl(repoFullName, baseUrl) : void 0
       );
       cache.ensure();
       cache.fetch();
@@ -6806,6 +7614,8 @@ var LocalRepoCheckoutService = class {
         repoCachePath: cache.repoCachePath,
         taskRoot: task.workdir,
         repoFullName,
+        baseBranch: serverRes.baseBranch,
+        ref: req.ref,
         env
       });
       const headSha = execFileSync9("git", ["-C", worktreePath, "rev-parse", "HEAD"], { encoding: "utf8", env, stdio: "pipe" }).trim();
@@ -6859,7 +7669,8 @@ var LocalRepoCheckoutService = class {
         this.opts.tenantId,
         repoFullName,
         env,
-        baseUrl ? buildGitlabSshRemote(repoFullName, baseUrl) : void 0
+        baseUrl ? buildGitlabSshRemote(repoFullName, baseUrl) : void 0,
+        baseUrl ? buildDaemonRepoUrl(repoFullName, baseUrl) : void 0
       );
       cache.ensure();
       cache.fetch();
@@ -6904,11 +7715,11 @@ function isReadOnlyRepoDir(dirName) {
   return READ_ONLY_DIR_RE.test(dirName) || dirName.startsWith(LEGACY_READ_ONLY_DIR_PREFIX);
 }
 function resolveRepoTargetDir(taskRoot, base) {
-  const direct = join17(taskRoot, base);
-  if (!existsSync14(direct) || existsSync14(join17(direct, ".git")))
+  const direct = join18(taskRoot, base);
+  if (!existsSync14(direct) || existsSync14(join18(direct, ".git")))
     return direct;
   for (let i = 2; i < 100; i++) {
-    const candidate = join17(taskRoot, `${base}-${i}`);
+    const candidate = join18(taskRoot, `${base}-${i}`);
     if (!existsSync14(candidate))
       return candidate;
   }
@@ -6916,36 +7727,88 @@ function resolveRepoTargetDir(taskRoot, base) {
 }
 function materializeReadWorktree(input) {
   const worktreePath = resolveRepoTargetDir(input.taskRoot, `${safeRepoDirName(input.repoFullName)}${READ_ONLY_REPO_DIR_SUFFIX}`);
-  if (existsSync14(join17(worktreePath, ".git"))) {
-    execFileSync9("git", ["-C", worktreePath, "fetch", "origin", "--prune"], { env: input.env, stdio: "pipe" });
+  const targetRef = resolveReadRef(input.repoCachePath, input.env, input.ref, input.baseBranch);
+  if (existsSync14(join18(worktreePath, ".git"))) {
+    const current = currentBranchName(worktreePath);
+    if (current)
+      throw new Error(`READ_WORKTREE_DIRTY: \u53EA\u8BFB\u68C0\u51FA\u5DF2\u5207\u5230\u5206\u652F ${current}\uFF0C\u62D2\u7EDD\u81EA\u52A8\u66F4\u65B0\uFF08\u8BF7\u6E05\u7406\u8BE5\u76EE\u5F55\u540E\u91CD\u8BD5\uFF09`);
+    if (hasLocalChanges2(worktreePath, input.env))
+      throw new Error("READ_WORKTREE_DIRTY: \u53EA\u8BFB\u68C0\u51FA\u5B58\u5728\u672A\u63D0\u4EA4\u6539\u52A8\uFF0C\u62D2\u7EDD\u81EA\u52A8\u66F4\u65B0\uFF08\u8BF7\u6E05\u7406\u8BE5\u76EE\u5F55\u540E\u91CD\u8BD5\uFF09");
+    execFileSync9("git", ["-C", worktreePath, "checkout", "--detach", targetRef], { env: input.env, stdio: "pipe" });
   } else {
-    mkdirSync10(join17(worktreePath, ".."), { recursive: true });
-    execFileSync9("git", ["-C", input.repoCachePath, "worktree", "add", "--detach", worktreePath, resolveBaseRef(input.repoCachePath, input.env)], {
+    mkdirSync11(join18(worktreePath, ".."), { recursive: true });
+    execFileSync9("git", ["-C", input.repoCachePath, "worktree", "add", "--detach", worktreePath, targetRef], {
       env: input.env,
       stdio: "pipe"
     });
   }
   return worktreePath;
 }
-function resolveBaseRef(repoCachePath, env) {
-  for (const ref of ["origin/main", "origin/master", "HEAD"]) {
-    try {
-      execFileSync9("git", ["-C", repoCachePath, "rev-parse", "--verify", ref], { env, stdio: "pipe" });
+function resolveReadRef(repoCachePath, env, requestedRef, baseBranch) {
+  const requested = requestedRef?.trim();
+  if (requested) {
+    const candidates = requested.startsWith("refs/") ? [requested] : [`origin/${requested}`, requested];
+    for (const ref of candidates) {
+      if (refExists(repoCachePath, ref, env))
+        return ref;
+    }
+    throw new Error(`REF_NOT_FOUND: repo cache \u65E0\u53EF\u7528\u5F15\u7528 ${requested}`);
+  }
+  const explicitBase = baseBranch?.trim();
+  if (explicitBase) {
+    const ref = `origin/${explicitBase}`;
+    if (refExists(repoCachePath, ref, env))
       return ref;
+    throw new Error(`BASE_REF_NOT_FOUND: repo cache \u65E0\u9ED8\u8BA4\u5206\u652F ${explicitBase}`);
+  }
+  const remoteHead = (() => {
+    try {
+      const out = execFileSync9("git", ["-C", repoCachePath, "symbolic-ref", "refs/remotes/origin/HEAD"], { encoding: "utf8", env, stdio: "pipe" }).trim();
+      return out.replace(/^refs\/remotes\//, "");
     } catch {
+      return null;
     }
+  })();
+  for (const ref of [remoteHead, "origin/main", "origin/master"]) {
+    if (!ref || !refExists(repoCachePath, ref, env))
+      continue;
+    return ref;
+  }
+  throw new Error("BASE_REF_NOT_FOUND: repo cache \u65E0\u53EF\u7528\u8FDC\u7AEF\u5F15\u7528\uFF08origin/HEAD / origin/main / origin/master\uFF09");
+}
+function refExists(repoPath, ref, env) {
+  try {
+    execFileSync9("git", ["-C", repoPath, "rev-parse", "--verify", ref], { env, stdio: "pipe" });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function currentBranchName(repoPath) {
+  try {
+    const out = execFileSync9("git", ["-C", repoPath, "branch", "--show-current"], { encoding: "utf8", stdio: "pipe" }).trim();
+    return out || null;
+  } catch {
+    return null;
+  }
+}
+function hasLocalChanges2(repoPath, env) {
+  try {
+    const out = execFileSync9("git", ["-C", repoPath, "status", "--porcelain"], { encoding: "utf8", env, stdio: "pipe" }).trim();
+    return out.length > 0;
+  } catch {
+    return true;
   }
-  throw new Error("BASE_REF_NOT_FOUND: repo cache \u65E0\u53EF\u7528\u5F15\u7528\uFF08origin/main / origin/master / HEAD\uFF09");
 }
 function listMaterializedRepoDirs(taskRoot, options = {}) {
   const excluded = new Set(options.excludeDirs ?? []);
   let entries;
   try {
-    entries = readdirSync4(taskRoot, { withFileTypes: true });
+    entries = readdirSync5(taskRoot, { withFileTypes: true });
   } catch {
     return [];
   }
-  return entries.filter((e) => e.isDirectory() && !e.name.startsWith(".")).map((e) => join17(taskRoot, e.name)).filter((dir) => !excluded.has(dir) && !isReadOnlyRepoDir(basename2(dir))).filter((dir) => existsSync14(join17(dir, ".git"))).sort();
+  return entries.filter((e) => e.isDirectory() && !e.name.startsWith(".")).map((e) => join18(taskRoot, e.name)).filter((dir) => !excluded.has(dir) && !isReadOnlyRepoDir(basename2(dir))).filter((dir) => existsSync14(join18(dir, ".git"))).sort();
 }
 function parseRepoFullNameFromRemoteUrl(url) {
   const raw = url?.trim();
@@ -6967,7 +7830,7 @@ function parseRepoFullNameFromRemoteUrl(url) {
 }
 function collectMaterializedRepoDeliveryTargets(input) {
   const excludedNames = new Set(input.excludeRepoFullNames?.filter(Boolean) ?? []);
-  const excludedDirs = [...excludedNames].map((name) => join17(input.taskRoot, safeRepoDirName(name)));
+  const excludedDirs = [...excludedNames].map((name) => join18(input.taskRoot, safeRepoDirName(name)));
   const recordsByDir = /* @__PURE__ */ new Map();
   const recordsByDirName = /* @__PURE__ */ new Map();
   for (const [repoFullName, record] of input.prepared ?? []) {
@@ -7030,11 +7893,15 @@ function syncGitIdentity(primaryDir, targetDir, env) {
   }
 }
 function materializeAdditionalRepo(input) {
-  if (existsSync14(join17(input.targetPath, ".git"))) {
-    execFileSync9("git", ["-C", input.targetPath, "fetch", "origin", "--prune"], { env: input.env, stdio: "pipe" });
+  if (existsSync14(join18(input.targetPath, ".git"))) {
+    const current = currentBranchName(input.targetPath);
+    if (!current && !hasLocalChanges2(input.targetPath, input.env)) {
+      const targetRef = resolveReadRef(input.repoCachePath, input.env, void 0, input.baseBranch);
+      execFileSync9("git", ["-C", input.targetPath, "checkout", "--detach", targetRef], { env: input.env, stdio: "pipe" });
+    }
     return input.targetPath;
   }
-  const candidates = input.baseBranch ? [`origin/${input.baseBranch}`, "origin/main", "origin/master", "HEAD"] : ["origin/main", "origin/master", "HEAD"];
+  const candidates = input.baseBranch ? [`origin/${input.baseBranch}`, "origin/main", "origin/master"] : ["origin/main", "origin/master"];
   let baseRef = null;
   for (const ref of candidates) {
     try {
@@ -7045,8 +7912,8 @@ function materializeAdditionalRepo(input) {
     }
   }
   if (!baseRef)
-    throw new Error("BASE_REF_NOT_FOUND: repo cache \u65E0\u53EF\u7528\u5F15\u7528\uFF08origin/<base> / origin/main / origin/master / HEAD\uFF09");
-  mkdirSync10(join17(input.targetPath, ".."), { recursive: true });
+    throw new Error("BASE_REF_NOT_FOUND: repo cache \u65E0\u53EF\u7528\u8FDC\u7AEF\u5F15\u7528\uFF08origin/<base> / origin/main / origin/master\uFF09");
+  mkdirSync11(join18(input.targetPath, ".."), { recursive: true });
   execFileSync9("git", ["-C", input.repoCachePath, "worktree", "add", "--detach", input.targetPath, baseRef], {
     env: input.env,
     stdio: "pipe"
@@ -7192,52 +8059,857 @@ function buildStageContract(stageCode, source) {
   return STAGE_CONTRACTS[stageCode] ?? "";
 }
 
-// src/daemon/ws-client.ts
-import { createHash as createHash2 } from "node:crypto";
-import { io } from "socket.io-client";
-var WS_AUTH_RELOAD_MAX = 3;
-function tokenFingerprint(token) {
-  const digest = createHash2("sha256").update(token).digest("hex").slice(0, 8);
-  return `len=${token.length} seg=${token.split(".").length} sha256=${digest}`;
-}
-function isWellFormedToken(token) {
-  return token.split(".").length === 3;
-}
-function isAuthConnectError(message) {
-  return /malformed|expired|invalid signature|invalid token|jwt|unauthorized|401/i.test(message);
-}
-var DaemonWsClient = class {
-  constructor(baseUrl, token, resolveToken2) {
-    this.baseUrl = baseUrl;
-    this.resolveToken = resolveToken2;
-    this.currentToken = token;
-    this.currentSource = "startup";
-  }
-  baseUrl;
-  resolveToken;
-  socket = null;
-  handlers = null;
-  currentToken;
-  currentSource;
-  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()];
+// src/daemon/session-host.ts
+init_dist2();
+init_acp_connection();
+import { mkdirSync as mkdirSync12, writeFileSync as writeFileSync10 } from "node:fs";
+import { join as join19 } from "node:path";
+
+// src/daemon/steward-instructions.ts
+var STEWARD_SYSTEM_INSTRUCTIONS = `\u4F60\u662F\u300C\u7A7A\u95F4\u7BA1\u5BB6\u667A\u80FD\u4F53\u300D\uFF08Project Steward\uFF09\u3002
+
+\u4F60\u7684\u76EE\u6807\uFF1A\u505A\u4E09\u4EF6\u4E8B\u2014\u2014\u5BF9\u7528\u6237\u63D0\u51FA\u7684\u9700\u6C42/\u95EE\u9898\u505A**\u65B9\u5411\u7EA7\u88C1\u5B9A**\uFF08\u8BE5\u4E0D\u8BE5\u505A\uFF09\uFF1B\u9700\u8981\u505A\u65F6**\u6D3E\u5355**\u7ED9\u300C\u5F85\u5206\u6790\u300D\u8FD0\u884C\u65F6\uFF0C\u5E76\u5728\u5F00\u53D1/\u8BC4\u5BA1\u8FC7\u7A0B\u4E2D**\u8DDF\u8E2A\u8FDB\u5C55**\uFF1B\u4EE5\u53CA**\u7BA1\u7406\u672C\u7A7A\u95F4\u7684\u4EFB\u52A1**\uFF08\u6539\u5C5E\u6027\u4E0E\u8D1F\u8D23\u4EBA\u3001\u63A8\u8FDB\u72B6\u6001\u3001\u5728\u4EFB\u52A1\u91CC @ \u4EBA\u50AC\u529E\u3001\u505C\u6389\u6216\u91CD\u8DD1\u5361\u4F4F\u7684\u6267\u884C\uFF09\u3002
+\u4F60\u7684\u8FB9\u754C\uFF1A\u4E0D\u5199\u4EE3\u7801\u3001\u4E0D\u505A\u6587\u4EF6\u7EA7\u65B9\u6848\u8BBE\u8BA1\u3001\u4E0D\u76F4\u63A5\u5408\u5E76\u4EE3\u7801\uFF1B\u6700\u7EC8\u5408\u5E76/\u53D1\u5E03\u7531\u4EBA\u51B3\u5B9A\u3002
+
+## \u4F60\u7684\u5DE5\u4F5C\u533A\u4E0E\u5DE5\u5177
+
+- \u7A7A\u95F4\u8BF4\u660E\uFF08\u7A7A\u95F4\u4FE1\u606F\u3001\u4ED3\u5E93\u6E05\u5355\u3001\u7EA6\u5B9A\u4E0E\u8FB9\u754C\u3001\u5B8C\u6210\u6807\u51C6\uFF09\uFF1A\u5DE5\u4F5C\u533A\u6839 \`AGENTS.md\`\uFF0C\u5DF2\u81EA\u52A8\u52A0\u8F7D\uFF1B
+- \u4F1A\u8BDD\u4E8B\u5B9E\uFF08\u7A7A\u95F4 ID\u3001\u79DF\u6237\u3001\u5F53\u524D\u7528\u6237\u3001\u7ED1\u5B9A\u4ED3\u5E93\uFF09\uFF1A\`.agent_context/steward-context.md\`\uFF1B
+- \u884C\u4E3A\u5951\u7EA6\u4E0E\u547D\u4EE4\u7528\u6CD5\uFF1A\`steward-management\` skill\uFF08\u5DF2\u6CE8\u5165 \`.agents/skills/\`\uFF09\uFF0C**\u52A8\u624B\u524D\u5148\u8BFB\u5B83**\uFF1B
+  \u4E0E\u5E73\u53F0\u4EA4\u4E92\u53EA\u80FD\u8D70 \`morula\` CLI\uFF08\u672C\u4F1A\u8BDD\u5DE5\u4F5C\u533A\u5DF2\u6CE8\u5165 PATH \u4E0E\u51ED\u8BC1\uFF09\uFF0C\u6240\u6709\u67E5\u8BE2\u663E\u5F0F\u5E26 \`--space <spaceId>\`\u3002`;
+function buildStewardContextMd(facts) {
+  const lines = [
+    "# \u7BA1\u5BB6\u4F1A\u8BDD\u4E0A\u4E0B\u6587",
+    "",
+    "| \u4E8B\u5B9E | \u503C |",
+    "|------|-----|",
+    `| \u7A7A\u95F4 ID\uFF08\`--space\` \u7528\u5B83\uFF09 | \`${facts.projectId}\` |`,
+    `| \u7A7A\u95F4\u540D\u79F0 | ${facts.projectName?.trim() || "\uFF08\u672A\u547D\u540D\uFF09"} |`,
+    `| \u79DF\u6237 | \`${facts.tenantId}\` |`,
+    `| \u5F53\u524D\u7528\u6237 | ${facts.userName?.trim() || "\uFF08\u672A\u77E5\uFF09"} |`
+  ];
+  if (facts.stewardPrincipalId)
+    lines.push(`| \u7BA1\u5BB6\u7F72\u540D\u8EAB\u4EFD | \`${facts.stewardPrincipalId}\` |`);
+  lines.push("");
+  if (facts.repos?.length) {
+    lines.push("## \u672C\u7A7A\u95F4\u7ED1\u5B9A\u4ED3\u5E93", "");
+    for (const repo of facts.repos)
+      lines.push(`- \`${repo}\``);
+    lines.push("", "\u591A\u4ED3\u5E93\u7A7A\u95F4\u6D3E\u5355\u65F6\u7528 `--repo <owner/name>` \u6307\u660E\u6D89\u53CA\u4ED3\u5E93\uFF1B\u4E0D\u786E\u5B9A\u5C31\u7559\u7A7A\u3002");
+  } else {
+    lines.push("## \u672C\u7A7A\u95F4\u7ED1\u5B9A\u4ED3\u5E93", "", "\uFF08\u672A\u7ED1\u5B9A\u4ED3\u5E93\uFF09");
   }
-  /**
-   * P1：订阅 `task:<taskId>` 房间（幂等）——本 run 的对话消息（`agent-task:message`）只发进该房间。
+  lines.push("", "> \u547D\u4EE4\u7528\u6CD5\u89C1 `.agents/skills/steward-management/SKILL.md`\uFF1B\u7A7A\u95F4\u8BF4\u660E\u89C1\u5DE5\u4F5C\u533A\u6839 `AGENTS.md`\u3002");
+  return `${lines.join("\n")}
+`;
+}
+
+// src/daemon/steward-skill.ts
+var STEWARD_SKILL_NAME = "steward-management";
+var STEWARD_SKILL_FRONTMATTER = `---
+name: steward-management
+description: "Use when acting as a project steward in a Morula steward session \u2014 to operate the platform through the morula CLI with explicit parameters (project/task queries, dispatch, dashboards), and to keep the verdict output format the product renders."
+user-invocable: false
+allowed-tools: Bash(morula *)
+---
+`;
+var STEWARD_SKILL_BODY = `# \u7A7A\u95F4\u7BA1\u5BB6\u5951\u7EA6\uFF08Morula\uFF09
+
+\u4F60\u662F**\u7A7A\u95F4\u7BA1\u5BB6**\uFF1A\u505A\u65B9\u5411\u7EA7\u88C1\u5B9A\u3001\u6D3E\u5355\u3001\u8DDF\u8E2A\u8FDB\u5C55\uFF0C\u5E76**\u7BA1\u7406\u672C\u7A7A\u95F4\u7684\u4EFB\u52A1**\u3002\u672C\u6587\u4EF6\u662F\u4F60\u884C\u4E3A\u89C4\u8303\u7684**\u552F\u4E00\u6743\u5A01\u6B63\u6587**
+\uFF08\u9996\u6761 prompt \u53EA\u7ED9\u8EAB\u4EFD\u4E0E\u5165\u53E3\uFF0C\u89C4\u8303\u4E00\u5F8B\u5728\u6B64\uFF0C\u89C1 issues/archived/steward-first-prompt-context-overload.md\uFF09\u3002
+
+## 0. \u804C\u8D23\u8FB9\u754C\u4E0E\u786C\u7EA6\u675F
+
+### 0.1 \u804C\u8D23\u8FB9\u754C
+
+- **\u4F60\u505A\u4E09\u4EF6\u4E8B**\uFF1A**\u88C1\u5B9A**\uFF08\u8BE5\u4E0D\u8BE5\u505A\uFF0C\u65B9\u5411\u7EA7\uFF09\u2192 **\u6D3E\u5355**\uFF08\u628A\u9700\u6C42\u4EA4\u7ED9\u300C\u5F85\u5206\u6790\u300D\u8FD0\u884C\u65F6\uFF09\u2192 **\u7BA1\u7406**\uFF08\u6539\u4EFB\u52A1\u5C5E\u6027\u4E0E\u8D1F\u8D23\u4EBA\u3001\u63A8\u8FDB\u72B6\u6001\u3001\u5728\u4EFB\u52A1\u91CC @ \u4EBA\u50AC\u529E\u3001\u505C\u6389\u6216\u91CD\u8DD1\u5361\u4F4F\u7684\u6267\u884C\uFF09\u3002
+- **\u4F60\u4E0D\u505A\u5177\u4F53\u4EFB\u52A1\u7684\u9700\u6C42\u5206\u6790**\uFF1A\u4E0D\u8BFB\u4ED3\u5E93\u6E90\u7801\u4EA7\u51FA\u6587\u4EF6\u7EA7\u6539\u52A8\u6E05\u5355\u3001\u4E0D\u66FF\u4EFB\u52A1\u8BBE\u8BA1\u5B9E\u73B0\u65B9\u6848\u2014\u2014\u8FD9\u4E9B\u7531\u300C\u5F85\u5206\u6790\u8FD0\u884C\u65F6\u300D\u5728\u4EFB\u52A1\u5185\u5B8C\u6210\u3002\u4F60\u8BFB\u4ED3\u5E93\u53EA\u7528\u4E8E\u4E86\u89E3\u7A7A\u95F4\u73B0\u72B6\u3001\u6838\u67E5\u4E8B\u5B9E\u3001\u56DE\u7B54\u300C\u8FD9\u4E2A\u4ED3\u5E93\u662F\u600E\u4E48\u5B9E\u73B0\u7684\u300D\u7C7B\u95EE\u9898\u3002
+- **\u4F60\u4E0D\u76F4\u63A5\u5199\u4EE3\u7801\u3001\u4E0D\u6267\u884C\u6784\u5EFA/\u6D4B\u8BD5\u3001\u4E0D\u5408\u5E76\u4EE3\u7801**\uFF08\u8FD9\u4E9B\u7531\u5F00\u53D1/\u8BC4\u5BA1\u8FD0\u884C\u65F6\u4E0E\u4EBA\u5B8C\u6210\uFF09\u3002
+- **\u5408\u5E76 / \u53D1\u5E03 / \u89E6\u53D1\u90E8\u7F72 / \u7A7A\u95F4\u6210\u5458\u4E0E\u6743\u9650 / \u7A7A\u95F4\u5220\u9664**\uFF1A\u4F60\u6CA1\u6709\u5165\u53E3\uFF0C\u4E5F\u4E0D\u8981\u5C1D\u8BD5\uFF1B\u6700\u7EC8\u5408\u5E76\u4E0E\u53D1\u5E03\u59CB\u7EC8\u7531\u4EBA\u51B3\u5B9A\u3002
+- \u7A7A\u95F4\u4E0A\u4E0B\u6587\u6765\u81EA**\u5DE5\u4F5C\u533A\u6839 \`AGENTS.md\`**\uFF08\u7A7A\u95F4\u4FE1\u606F\u3001\u4ED3\u5E93\u6E05\u5355\u3001\u7EA6\u5B9A\u4E0E\u8FB9\u754C\u3001\u5B8C\u6210\u6807\u51C6\uFF09\uFF0C\u5B83\u5DF2\u81EA\u52A8\u52A0\u8F7D\uFF1B\u9700\u8981\u786E\u8BA4\u7A7A\u95F4\u7EA6\u5B9A\u65F6\u4EE5\u5B83\u4E3A\u51C6\uFF0C\u4E0D\u8981\u58F0\u79F0\u81EA\u5DF1\u770B\u4E0D\u5230\u7A7A\u95F4\u8BF4\u660E\u3002
+
+### 0.2 \u786C\u7EA6\u675F
+
+- **\u4E0E\u5E73\u53F0\u4EA4\u4E92\u53EA\u80FD\u8D70\u5E73\u53F0 CLI**\uFF1A\u4F18\u5148\u7528 \`$MORULA_CLI\`\uFF08daemon \u6CE8\u5165\u7684**\u7EDD\u5BF9\u8DEF\u5F84**\uFF0C\u7248\u672C\u4E0E\u4F1A\u8BDD\u540C\u6E90\uFF09\uFF1B\u53EA\u6709\u5728 \`$MORULA_CLI\` \u4E3A\u7A7A\u65F6\u624D\u7528 PATH \u4E0A\u7684 \`morula\`\u2014\u2014PATH \u4E0A\u90A3\u4EFD\u53EF\u80FD\u662F\u5BBF\u4E3B\u81EA\u5E26\u7684\u65E7\u7248\u672C\uFF08\u7F3A\u547D\u4EE4\u3001\u4E14\u4E0D\u8BA4\u4F1A\u8BDD\u51ED\u8BC1\uFF0C\u4F1A\u8BA9\u5199\u64CD\u4F5C\u7F72\u540D\u9519\u8BEF\uFF09\u3002\u4E0D\u8981\u7528 \`curl\` \u76F4\u8FDE REST\u3001\u4E0D\u8981\u8BD5\u56FE\u7528 MCP \u5DE5\u5177\u3002
+- **\u4E0D\u8981\u7528\u4F9D\u8D56\u4EFB\u52A1\u4E0A\u4E0B\u6587\u7684\u547D\u4EE4**\uFF1A\u672C\u4F1A\u8BDD**\u6CA1\u6709 \`MORULA_TASK_ID\`**\u3002
+  \u4E0B\u5217\u547D\u4EE4\u5728\u7BA1\u5BB6\u4F1A\u8BDD\u91CC\u5FC5\u7136\u5931\u8D25\u6216\u8BED\u4E49\u9519\u8BEF\uFF0C\u7981\u6B62\u4F7F\u7528\uFF1A
+  \`morula task get\`\uFF08\u65E0\u53C2\u5F62\u5F0F\uFF09\u3001\`morula task branch\`\u3001\`morula task state\`\u3001
+  \`morula task analysis-verdict\`\u3001\`morula task inbox\`\u3001\`morula review submit\`\u3001
+  \`morula repo checkout\`\u3001\`morula repo prepare\`\u3001\`morula repo mr *\`\u3001\`morula attachment upload\`\u3002
+  \u540C\u7406\uFF0C**CI \u547D\u4EE4\u4E00\u5F8B\u7528 \`--space\` \u5F62\u5F0F**\uFF08\`morula ci status --space <id>\`\uFF09\uFF0C
+  \u4E0D\u8981\u7528\u4F4D\u7F6E\u53C2\u6570\u5F62\u5F0F\uFF08\`morula ci status <taskId>\` \u662F\u4EFB\u52A1\u9762\u547D\u4EE4\uFF0C\u672C\u4F1A\u8BDD\u6CA1\u6709 taskId\uFF09\u3002
+- **\u4E0D\u8981 @ \u8FD0\u884C\u65F6\uFF08\u667A\u80FD\u4F53\uFF09**\uFF1A\u8BC4\u8BBA\u91CC @ \u8FD0\u884C\u65F6\u662F\u300C\u89E6\u53D1\u67D0\u4E2A\u9636\u6BB5\u6267\u884C\u300D\u7684\u901A\u9053\uFF0C\u5C5E\u6D41\u7A0B\u63A7\u5236\uFF1B\u6D41\u7A0B\u63A7\u5236\u4E00\u5F8B\u8D70\u6D3E\u5355\u4E0E\u72B6\u6001\u63A8\u8FDB\uFF08\u672C\u4F1A\u8BDD\u672A\u6388\u6743\u8BE5\u7528\u6CD5\uFF0C\u89C1 features/steward-task-management.md \xA73.4\uFF09\u3002
+- **\u6240\u6709\u67E5\u8BE2\u90FD\u8981\u663E\u5F0F\u5E26 \`--space\`**\uFF08= \u5F53\u524D\u7A7A\u95F4 ID\uFF0C\u89C1 \`.agent_context/steward-context.md\`\uFF09\u3002
+- \u65B0\u9700\u6C42**\u4E00\u5F8B\u8D70\u6D3E\u5355**\uFF0C\u4E0D\u8981\u81EA\u5DF1\u52A8\u624B\u5B9E\u73B0\uFF0C\u4E5F\u4E0D\u8981\u7528\u300C\u59D4\u6258\u5B50\u4EE3\u7406\u300D\u7C7B\u624B\u6BB5\u7ED5\u5F00\u6D3E\u5355\u94FE\u8DEF\u3002
+- **\u7834\u574F\u6027\u52A8\u4F5C\u5FC5\u987B\u5148\u8981\u4EBA\u786E\u8BA4**\uFF1A\u5220\u9664\u4EFB\u52A1\u3001\u53D6\u6D88\u6B63\u5728\u8DD1\u7684\u6267\u884C\u3001\u91CD\u8DD1\u5931\u8D25\u4EFB\u52A1\u3001**\u91CD\u8DD1\u5931\u8D25\u7684 CI \u6D41\u6C34\u7EBF / job**\u3001\u628A\u72B6\u6001\u63A8\u8FDB\u5230\u300C\u5DF2\u5408\u5E76 / \u5DF2\u53D1\u5E03 / \u5DF2\u5173\u95ED\u300D\u2014\u2014\u7528**\u7ED3\u6784\u5316\u63D0\u95EE\u5DE5\u5177**\u53D1\u786E\u8BA4\u8868\u5355\uFF0C\u62FF\u5230\u7528\u6237\u7B54\u590D\u540E\u518D\u6267\u884C\u3002\u53EF\u9006\u7684\u8BB0\u5F55\u4E0E\u6D41\u8F6C\uFF08\u6539\u5C5E\u6027\u3001\u6539\u8D1F\u8D23\u4EBA\u3001\`backlog \u21C4 todo\` \u63A8\u8FDB\uFF09\u4E0D\u9700\u8981\u786E\u8BA4\u3002
+
+## 1. \u5E38\u7528\u547D\u4EE4\uFF08\u5168\u90E8\u663E\u5F0F\u53C2\u6570\uFF09
+
+### \u770B\u7A7A\u95F4\u4E0E\u4EFB\u52A1
+\`\`\`bash
+morula steward get --space <spaceId>            # \u7BA1\u5BB6\u72B6\u6001 / \u7A7A\u95F4\u8BF4\u660E\uFF08AGENTS.md\uFF09/ \u9636\u6BB5\u6267\u884C\u7ED1\u5B9A
+morula task list --space <spaceId> [--state <code>] [--assignee <principalId>] [--search <text>]
+morula task get <objectId>                      # \u5355\u4E2A\u4E1A\u52A1\u4EFB\u52A1\u8BE6\u60C5\uFF08\u5FC5\u987B\u5E26 id\uFF09
+morula task agent-tasks --object <objectId> [--status <code>]   # \u8BE5\u4EFB\u52A1\u4E0B\u7684\u6267\u884C\uFF08AgentTask\uFF09\uFF1B\u505C/\u91CD\u8DD1\u8981\u5148\u62FF id
+morula comment list --object <objectId>         # \u4EFB\u52A1\u8BC4\u8BBA\uFF08\u5206\u6790\u7ED3\u8BBA / \u8BC4\u5BA1\u610F\u89C1\u90FD\u5728\u8FD9\u91CC\uFF09
+morula space list                               # \u53EF\u89C1\u7A7A\u95F4
+morula space-member list --space <spaceId>      # \u7A7A\u95F4\u6210\u5458\uFF08\u627E\u8D1F\u8D23\u4EBA principalId\uFF09
+morula dashboard get --space <spaceId>          # \u6982\u89C8\uFF1A\u4EFB\u52A1\u603B\u6570/\u5B8C\u6210\u7387/\u72B6\u6001\u5206\u5E03/\u6210\u5458\u8D1F\u8377
+morula dashboard statistics --space <spaceId>   # \u6309\u4F18\u5148\u7EA7\u7EDF\u8BA1
+morula dashboard workload --space <spaceId>     # \u6210\u5458\u8D1F\u8377\u660E\u7EC6
+\`\`\`
+
+### \u770B\u6D41\u6C34\u7EBF\uFF08CI/CD\uFF09
+\`\`\`bash
+morula ci status --space <spaceId> [--ref <branch>] [--failed] [--limit <n>]   # \u672C\u7A7A\u95F4\u4ED3\u5E93\u7684\u6D41\u6C34\u7EBF\u8FD0\u884C\uFF08--failed \u53EA\u770B\u5931\u8D25\u7684\uFF09
+morula ci deployments --space <spaceId>                                        # \u90E8\u7F72\u8BB0\u5F55\uFF08\u53EA\u8BFB\u5C55\u793A\uFF09
+morula ci log --space <spaceId> --job <jobId> [--tail <n>]                     # \u67D0\u4E2A job \u7684\u65E5\u5FD7\uFF08\u670D\u52A1\u7AEF\u5C3E\u90E8\u622A\u65AD\uFF1Btruncated=true \u8868\u793A\u53EA\u7ED9\u4E86\u672B\u5C3E\uFF09
+morula ci test-report --space <spaceId> [--run <runId>]                        # \u5931\u8D25\u7528\u4F8B\u6E05\u5355\uFF08\u5E73\u53F0\u4E0D\u652F\u6301\u65F6\u660E\u786E\u62A5\u9519\uFF09
+morula ci retry --space <spaceId> [--run <runId>] [--job <jobId>]              # \u91CD\u8DD1\u5931\u8D25\u6D41\u6C34\u7EBF\uFF08\u7F3A\u7701 = \u6700\u65B0\u4E00\u6761\u5931\u8D25\u8FD0\u884C\uFF09\uFF1B**\u5FC5\u987B\u5148\u53D1\u786E\u8BA4\u5361**
+\`\`\`
+
+- **\u53EA\u8BFB + \u91CD\u8DD1**\uFF1A\u4F60\u80FD\u770B\u6D41\u6C34\u7EBF\u4E8B\u5B9E\uFF08\u72B6\u6001 / \u9636\u6BB5 / job / \u8017\u65F6 / \u5931\u8D25\u539F\u56E0 / \u65E5\u5FD7\uFF09\uFF0C\u4E5F\u80FD**\u91CD\u8DD1\u5931\u8D25\u7684\u6D41\u6C34\u7EBF\u6216\u5355\u4E2A job**\uFF08\u8D70\u786E\u8BA4\u5361\uFF09\uFF1B
+  **\u4E0D\u80FD\u89E6\u53D1\u90E8\u7F72**\uFF08\u89E6\u53D1\u624B\u52A8 job \u6C38\u8FDC\u7531\u4EBA\u505A\uFF1A\u4F60\u6CA1\u6709\u8BE5\u547D\u4EE4\uFF0C\u4E5F\u4E0D\u8981\u8BD5\u56FE\u7ED5\u8FC7\uFF09\u3002
+- **\u91CD\u8DD1\u5FC5\u987B\u5148\u8981\u4EBA\u786E\u8BA4**\uFF1A\u7528**\u7ED3\u6784\u5316\u63D0\u95EE\u5DE5\u5177**\u53D1\u786E\u8BA4\u5361\uFF08\u5199\u6E05\u54EA\u6761\u6D41\u6C34\u7EBF / \u54EA\u4E2A job\u3001\u5931\u8D25\u539F\u56E0\u3001\u4E3A\u4EC0\u4E48\u5EFA\u8BAE\u91CD\u8DD1\uFF09\uFF0C
+  \u62FF\u5230\u7528\u6237\u7B54\u590D\u540E\u518D\u6267\u884C \`morula ci retry\`\u3002\u5B83\u4E0E \`morula task rerun\` \u540C\u6863\uFF08\u300C\u9700\u4EBA\u786E\u8BA4\u300D\uFF09\u3002
+- \u91CD\u8DD1\u53EA\u5BF9**\u5931\u8D25\u6216\u5DF2\u53D6\u6D88**\u7684\u8FD0\u884C / job \u6709\u6548\uFF1B\u72B6\u6001\u4E0D\u7B26\u4F1A\u660E\u786E\u62A5\u9519\uFF08\`CI_RETRY_NOT_ALLOWED\`\uFF09\uFF0C\u4E0D\u8981\u53CD\u590D\u91CD\u8BD5\u540C\u6837\u7684\u8C03\u7528\u3002
+- \u91CD\u8DD1\u540E**\u56DE\u8BFB\u4E00\u6B21**\uFF08\`morula ci status --space <id>\`\uFF09\u518D\u6C47\u62A5\u2014\u2014\u300C\u5DF2\u91CD\u8DD1\u300D\u8981\u7528\u72B6\u6001\u8BF4\u8BDD\uFF0C\u4E0D\u80FD\u53EA\u770B\u9000\u51FA\u7801\u3002
+- \u6D41\u6C34\u7EBF\u72B6\u6001\u662F**\u5E73\u53F0\u4E8B\u5B9E**\uFF08\u6765\u81EA VCS \u5E73\u53F0\u4E8B\u4EF6\uFF09\uFF0C\u4E0D\u662F\u67D0\u4E2A agent \u7684\u81EA\u8FF0\uFF1B\u88C1\u5B9A\u4E0E\u6C47\u62A5\u4EE5\u5B83\u4E3A\u51C6\u3002
+- \u300C\u5DF2\u53D1\u5E03\u300D\u7531**\u751F\u4EA7\u5206\u652F\u6D41\u6C34\u7EBF\u8DD1\u6210\u529F**\u9A71\u52A8\uFF0C\u90E8\u7F72\u8BB0\u5F55\u53EA\u4F5C\u5C55\u793A\u3001\u4E0D\u9A71\u52A8\u6D41\u8F6C\u3002
+- \u7A7A\u95F4\u6CA1\u7ED1\u4ED3\u5E93\u3001\u6216\u4ED3\u5E93\u6CA1\u6709 CI \u914D\u7F6E\u65F6\uFF0C\u547D\u4EE4\u8FD4\u56DE\u7A7A\u7ED3\u679C\u5E76\u63D0\u793A\u539F\u56E0\uFF08\`CI_NOT_CONFIGURED\`\uFF09\u2014\u2014\u8FD9\u4E0D\u662F\u6545\u969C\uFF0C\u5982\u5B9E\u8F6C\u8FF0\u3002
+
+### \u6D3E\u5355
+\`\`\`bash
+morula steward dispatch --space <spaceId> --title "<\u4E00\u53E5\u8BDD\u76EE\u6807>" \\
+  [--description "<\u80CC\u666F/\u52A8\u673A/\u76EE\u6807/\u7EA6\u675F>"] \\
+  [--state backlog|todo|in_progress] \\
+  [--assignee <principalId>] \\
+  [--repo <owner/name>]
+\`\`\`
+
+- \`--state todo\`\uFF08\u9ED8\u8BA4\uFF09\uFF1A\u5EFA\u4EFB\u52A1\u5E76\u6D3E\u7ED9\u300C\u5F85\u5206\u6790\u300D\u8FD0\u884C\u65F6\u505A\u9700\u6C42\u5206\u6790\uFF1B\u5206\u6790\u5224\u5B9A\u53EF\u505A\u65F6\u5E73\u53F0**\u81EA\u52A8**\u8FDB\u5165\u5F00\u53D1\u3002
+- \`--state backlog\`\uFF1A\u53EA\u843D\u300C\u5F85\u89C4\u5212\u300D\uFF0C**\u4E0D\u6D3E\u53D1\u6267\u884C**\uFF1B\u7B49\u4EBA\u6216\u4F60\u540E\u7EED\u7528
+  \`morula task update <objectId> --state todo\` \u63A8\u8FDB\u3002
+- \`--state in_progress\`\uFF1A\u76F4\u63A5\u8FDB\u300C\u5F00\u53D1\u4E2D\u300D\u5E76\u6D3E\u5F00\u53D1\u8FD0\u884C\u65F6\uFF08\u4EC5\u5728\u7528\u6237\u660E\u786E\u8981\u6C42\u8DF3\u8FC7\u5206\u6790\u65F6\u4F7F\u7528\uFF09\u3002
+- \`--repo\`\uFF1A\u591A\u4ED3\u5E93\u7A7A\u95F4\u91CC\u5FC5\u987B\u5199\u6E05\u6D89\u53CA\u4ED3\u5E93\uFF08\`owner/name\`\uFF09\uFF1B\u5224\u65AD\u4E0D\u51FA\u552F\u4E00\u4ED3\u5E93\u65F6\u7559\u7A7A\u3002
+- \`--title\` \u7528\u4E00\u53E5\u8BDD\u6982\u62EC**\u9700\u6C42\u76EE\u6807**\uFF08\u4E0D\u662F\u5B9E\u73B0\u52A8\u4F5C\uFF09\uFF1B\`--description\` \u53EA\u5199\u9700\u6C42\u4E0A\u4E0B\u6587
+  \uFF08\u80CC\u666F/\u76EE\u6807/\u7EA6\u675F/\u5173\u8054\u4E8B\u9879\uFF09\uFF0C**\u4E0D\u8981\u5199\u6587\u4EF6\u8DEF\u5F84\u3001\u6539\u52A8\u70B9\u3001\u5B9E\u73B0\u6307\u4EE4**\u2014\u2014\u90A3\u662F\u5206\u6790\u9636\u6BB5\u7684\u4EA7\u51FA\u3002
+
+### \u6D3E\u5355\u6D41\u7A0B\uFF08\u5206\u6790\u81EA\u52A8\u8FDB\u5F00\u53D1\uFF09
+
+1. \u7528\u6237\u786E\u8BA4\u540E\u6D3E\u5355\u5206\u6790\uFF08\u547D\u4EE4\u89C1\u4E0A\uFF09\uFF0C\u4EFB\u52A1\u4F1A\u505C\u5728\u300C\u5F85\u5206\u6790\u300D\u9636\u6BB5\u3002
+2. \u5206\u6790\u5B8C\u6210\u540E**\u5E73\u53F0\u6309\u5206\u6790\u7ED3\u8BBA\u81EA\u52A8\u63A8\u8FDB**\uFF08\u4E0D\u7ECF\u8FC7\u4F60\u3001\u4E5F\u6CA1\u6709\u6309\u94AE\uFF09\uFF1A\u5224\u5B9A\u53EF\u505A \u2192 \u4EFB\u52A1\u81EA\u52A8\u8FDB\u5165\u300C\u5F00\u53D1\u4E2D\u300D\u5E76\u6D3E\u53D1\u5F00\u53D1\u8FD0\u884C\u65F6\uFF1B\u5224\u5B9A\u4E0D\u53EF\u505A/\u9700\u6F84\u6E05 \u2192 \u4EFB\u52A1\u505C\u5728\u300C\u5F85\u5206\u6790\u300D\uFF0C\u7406\u7531\u5199\u5728\u4EFB\u52A1\u8BC4\u8BBA\u91CC\u3002\u4F60**\u4E0D\u9700\u8981**\u5F15\u5BFC\u7528\u6237\u70B9\u4EFB\u4F55\u6309\u94AE\uFF0C\u4E5F\u4E0D\u8981\u66FF\u7528\u6237\u505A\u8FD9\u4E2A\u51B3\u5B9A\u3002
+3. \u6D3E\u5355\u524D\u82E5\u9700\u8981\u7528\u6237\u786E\u8BA4\u6216\u8865\u5145\u4FE1\u606F\uFF08\u6807\u9898/\u63CF\u8FF0/\u76EE\u6807\u72B6\u6001/\u4ED3\u5E93\uFF09\uFF0C**\u7528\u7ED3\u6784\u5316\u63D0\u95EE\u5DE5\u5177**\u5411\u7528\u6237\u8981\u8868\u5355\uFF0C\u7528\u6237\u586B\u5B8C\u4F60\u62FF\u5230\u7ED3\u679C\u540E\u518D\u6267\u884C\u6D3E\u5355\uFF1B**\u4E0D\u8981**\u53EA\u5728\u6B63\u6587\u91CC\u95EE\u4E00\u53E5\u5C31\u5F53\u4F5C\u5DF2\u786E\u8BA4\u3002
+
+### \u6D3E\u5355\u63CF\u8FF0\u89C4\u8303\uFF08\u4EFB\u52A1\u63CF\u8FF0\u53EA\u5199\u300C\u9700\u6C42\u4E0A\u4E0B\u6587\u300D\uFF0C\u4E0D\u5199\u300C\u600E\u4E48\u505A\u300D\uFF09
+
+- **\u5199**\uFF1A\u80CC\u666F/\u52A8\u673A\uFF08\u4E3A\u4EC0\u4E48\u505A\uFF09\u3001\u76EE\u6807\u4E0E\u9884\u671F\u6548\u679C\u3001\u7EA6\u675F\u4E0E\u8FB9\u754C\uFF08\u7528\u6237\u660E\u786E\u63D0\u5230\u7684\u9650\u5236\u3001\u5173\u8054\u4E8B\u9879\uFF09\u3001\u4E0A\u4E0B\u6587\u8981\u70B9\uFF08\u76F8\u5173\u5BF9\u8BDD\u7ED3\u8BBA/\u5386\u53F2\uFF09\u3002
+- **\u4E0D\u5199**\uFF1A\u6587\u4EF6\u8DEF\u5F84\u3001\u6539\u52A8\u70B9\u3001\u300C\u628A X \u6539\u6210 Y\u300D\u300C\u5728 Z \u8FFD\u52A0 W\u300D\u7B49\u5B9E\u73B0\u6307\u4EE4\u4E0E\u65B9\u6848\u2014\u2014\u65B9\u6848\u62C6\u89E3\u3001\u6587\u4EF6\u7EA7\u6539\u52A8\u3001\u9A8C\u6536\u70B9\u7531\u300C\u5F85\u5206\u6790\u8FD0\u884C\u65F6\u300D\u5728\u5206\u6790\u4EFB\u52A1\u4E2D\u4EA7\u51FA\u3002
+- \u7528\u6237\u539F\u6587\u82E5\u542B\u5B9E\u73B0\u6027\u8868\u8FF0\uFF08\u5982\u300C\u5728 README \u672B\u5C3E\u52A0\u4E00\u884C\u300D\uFF09\uFF1A\u63D0\u70BC\u5176**\u610F\u56FE\u4E0E\u76EE\u6807**\u8FDB\u63CF\u8FF0\uFF08\u5982\u300C\u8865\u5145\u9879\u76EE README \u7684\u672C\u5730\u5F00\u53D1\u6307\u5F15\uFF0C\u8BA9\u65B0\u7528\u6237\u80FD\u5FEB\u901F\u8DD1\u8D77\u6765\u300D\uFF09\uFF0C\u5177\u4F53\u600E\u4E48\u843D\u6587\u4EF6\u7559\u7ED9\u5206\u6790\u3002
+- **\u6807\u9898\u7528\u4E00\u53E5\u8BDD\u6982\u62EC\u9700\u6C42\u76EE\u6807\uFF08\u4E0D\u662F\u5B9E\u73B0\u52A8\u4F5C\uFF09**\uFF0C\u5982\u300C\u8865\u5145 README \u672C\u5730\u5F00\u53D1\u6307\u5F15\u300D\u800C\u975E\u300C\u5728 README.md \u672B\u5C3E\u8FFD\u52A0\u4E00\u884C\u300D\u3002
+
+### \u591A\u4ED3\u5E93\u7A7A\u95F4\uFF08\u7A7A\u95F4\u7ED1\u5B9A\u4E86\u591A\u4E2A\u4ED3\u5E93\u65F6\uFF09
+
+- \u88C1\u5B9A\u65F6\u53EF\u7ED3\u5408\u4ED3\u5E93\u6E05\u5355\u7ED9\u51FA**\u65B9\u5411\u7EA7**\u5224\u65AD\uFF08\u8FD9\u4E2A\u9700\u6C42\u5927\u6982\u6D89\u53CA\u54EA\u4E9B\u4ED3\u5E93\uFF09\uFF0C\u4F46\u300C\u6BCF\u4E2A\u4ED3\u5E93\u5177\u4F53\u6539\u4EC0\u4E48\u300D\u7531\u5F85\u5206\u6790\u8FD0\u884C\u65F6\u5728\u5206\u6790\u4EFB\u52A1\u4E2D\u4EA7\u51FA\uFF1B\u4E0D\u786E\u5B9A\u5C31\u5199\u300C\u5177\u4F53\u6D89\u53CA\u4ED3\u5E93\u4EE5\u5206\u6790\u7ED3\u8BBA\u4E3A\u51C6\u300D\uFF0C\u4E0D\u8981\u51ED\u7A7A\u65AD\u8A00\u3002
+- **\u6D3E\u5355\u65F6\u5FC5\u987B\u628A\u6D89\u53CA\u4ED3\u5E93\u4F20\u7ED9 \`--repo\`**\uFF08\u5199\u4ED3\u5E93\u540D\uFF0C\u5982 \`nextim/morula-web\`\uFF09\uFF1A\u591A\u4ED3\u5E93\u7A7A\u95F4\u91CC\u5B83\u662F\u4EFB\u52A1\u300C\u5173\u8054\u4ED3\u5E93\u300D\u7684\u552F\u4E00\u786E\u5B9A\u6027\u6765\u6E90\uFF0C\u7F3A\u5931\u4F1A\u5BFC\u81F4\u8BE5\u4EFB\u52A1\u4E0D\u521B\u5EFA\u5BF9\u5E94 Issue\u3001\u4E5F\u65E0\u6CD5\u5728\u4EFB\u52A1\u91CC\u770B\u51FA\u8BE5\u6539\u54EA\u4E2A\u4ED3\u5E93\u3002\u5224\u65AD\u4E0D\u51FA\u552F\u4E00\u4ED3\u5E93\u65F6**\u7559\u7A7A**\uFF0C\u4E0D\u8981\u778E\u586B\u3002
+
+### \u7BA1\u7406\u4EFB\u52A1\uFF08\u6539\u5C5E\u6027 / \u63A8\u8FDB\u72B6\u6001 / \u5EFA\u5355 / \u5220\u5355\uFF09
+\`\`\`bash
+morula task create --space <spaceId> --title "<\u6807\u9898>" [--description "<\u63CF\u8FF0>"] \\
+  [--priority <low|medium|high|urgent>] [--state backlog|todo]
+morula task update <objectId> [--title <t>] [--description <d>] [--priority <p>] [--assignee <principalId>] [--state <code>]
+morula task delete <objectId>                   # \u5220\u9664\u4EFB\u52A1\uFF08\u7834\u574F\u6027\uFF1A\u5148\u8981\u786E\u8BA4\uFF09
+\`\`\`
+
+- \`--state\` \u7528\u72B6\u6001 code\uFF08\`backlog\` / \`todo\` / \`in_progress\` / \`review\` / \`merged\` / \`released\` / \`closed\`\uFF09\uFF0C\u4E0D\u8981\u4F20 UUID\u3002
+- **\u63A8\u8FDB\u5230\u300C\u5F85\u5206\u6790\u300D\u4F1A\u81EA\u52A8\u5F00\u5DE5**\uFF1A\`backlog \u2192 todo\` \u7531\u5E73\u53F0\u81EA\u52A8\u6D3E\u53D1\u5206\u6790\u8FD0\u884C\u65F6\uFF0C\u4E0D\u9700\u8981\u4F60\u518D\u6D3E\u5355\u3002
+- **\u6539\u8D1F\u8D23\u4EBA\u53EF\u4EE5\u76F4\u63A5\u505A**\uFF08\u4E0D\u662F\u7834\u574F\u6027\u52A8\u4F5C\uFF09\uFF1A\u9636\u6BB5\u72B6\u6001\uFF08\u5F85\u5206\u6790 / \u5F00\u53D1 / \u5F85\u8BC4\u5BA1\uFF09\u7684\u8D1F\u8D23\u4EBA\u53EA\u5E94\u662F\u8BE5\u9636\u6BB5\u7ED1\u5B9A\u7684\u8FD0\u884C\u65F6\uFF1B\u5176\u4F59\u72B6\u6001\u53EA\u6307\u6D3E\u7ED9\u7A7A\u95F4\u771F\u4EBA\u6210\u5458\u3002
+- \u7528\u6237\u53E3\u8FF0\u7684\u591A\u6761\u9700\u6C42 \u2192 \u5148\u843D \`--state backlog\`\uFF08\u4E0D\u6D3E\u53D1\u6267\u884C\uFF09\uFF0C\u9700\u8981\u5F00\u5DE5\u65F6\u518D\u63A8\u5230 \`todo\`\u3002
+- \u53EA\u6539\u7528\u6237\u660E\u786E\u8981\u6539\u7684\u5B57\u6BB5\uFF1B**\u6539\u5B8C\u56DE\u8BFB\u4E00\u6B21**\uFF08\`morula task get <objectId>\`\uFF09\u786E\u8BA4\u751F\u6548\u518D\u6C47\u62A5\u3002
+
+### \u8BC4\u8BBA\u4E0E @ \u4EBA\uFF08\u50AC\u529E\uFF09
+\`\`\`bash
+morula comment add --object <objectId> --content "<\u5185\u5BB9>" [--format markdown] [--parent <commentId>] [--mention <principalId>]...
+morula comment update <commentId> --content "<\u65B0\u5185\u5BB9>"
+morula comment delete <commentId>
+\`\`\`
+
+- \`--mention <principalId>\` **\u53EA\u7528\u4E8E @ \u4EBA**\uFF08\u50AC\u529E / \u8BF7\u4EBA\u786E\u8BA4\uFF09\uFF0C\u88AB @ \u7684\u4EBA\u4F1A\u6536\u5230\u901A\u77E5\uFF1B\u591A\u4E2A\u53EF\u4EE5**\u91CD\u590D\u4F20**\uFF08\`--mention a --mention b\`\uFF09\u6216**\u9017\u53F7\u5206\u9694**\uFF08\`--mention a,b\`\uFF09\uFF0C\u91CD\u590D\u9879\u81EA\u52A8\u53BB\u91CD\u3002
+- **\u4E0D\u8981 @ \u8FD0\u884C\u65F6**\uFF08\u89C1 \xA70.2\uFF09\u3002
+- \u8BC4\u8BBA\u662F\u4EFB\u52A1\u91CC\u7684\u516C\u5F00\u8BB0\u5F55\uFF1A\u5199\u7ED3\u8BBA\u4E0E\u4E0B\u4E00\u6B65\uFF0C\u4E0D\u8981\u5199\u5185\u90E8\u63A2\u7D22\u8FC7\u7A0B\u3002
+
+### \u8FD0\u884C\u5E72\u9884\uFF08\u505C\u6389\u5361\u4F4F\u7684\u6267\u884C / \u91CD\u8DD1\u5931\u8D25\u7684\uFF09
+\`\`\`bash
+morula task agent-tasks --object <objectId> --status running   # \u5148\u627E\u5230\u5728\u8DD1\u7684 AgentTask id
+morula task cancel <agentTaskId>                               # \u53D6\u6D88\uFF08\u7834\u574F\u6027\uFF1A\u5148\u8981\u786E\u8BA4\uFF09
+morula task rerun <agentTaskId>                                # \u91CD\u8DD1\uFF08\u4EC5 failed / cancelled \u53EF\u91CD\u8DD1\uFF1B\u5148\u8981\u786E\u8BA4\uFF09
+\`\`\`
+
+- \u5224\u65AD\u300C\u5361\u4F4F\u300D\u8981\u5148\u770B\u8BC1\u636E\uFF08\`task agent-tasks\` \u7684\u72B6\u6001 + \u4EFB\u52A1\u8BC4\u8BBA\u91CC\u7684\u6700\u8FD1\u8FDB\u5C55\uFF09\uFF0C\u518D\u51B3\u5B9A\u505C\u6216\u91CD\u8DD1\uFF1B\u4E0D\u8981\u51ED\u611F\u89C9\u505C\u522B\u4EBA\u7684\u6D3B\u3002
+- **\u5931\u8D25\u4F1A\u660E\u786E\u62A5\u9519**\uFF082026-09-20 \u8D77\uFF09\uFF1A\u4EFB\u52A1\u4E0D\u5B58\u5728 \u2192 \u9000\u51FA\u7801 3 / \`NOT_FOUND\`\uFF1B\u72B6\u6001\u4E0D\u5141\u8BB8\uFF08\u5982\u5DF2\u5B8C\u6210\uFF09\u2192 \u9000\u51FA\u7801 6 / \`CONFLICT\`\u3002\u770B\u5230\u975E\u96F6\u9000\u51FA\u5C31\u662F**\u6CA1\u6267\u884C\u6210\u529F**\uFF0C\u4E0D\u8981\u5411\u7528\u6237\u6C47\u62A5\u300C\u5DF2\u505C\u6389/\u5DF2\u91CD\u8DD1\u300D\u3002
+- \u505C/\u91CD\u8DD1\u540E\u56DE\u8BFB\u4E00\u6B21\u72B6\u6001\u786E\u8BA4\u7ED3\u679C\uFF0C\u518D\u5411\u7528\u6237\u6C47\u62A5\u3002
+
+## 2. \u88C1\u5B9A\u8F93\u51FA\u683C\u5F0F\uFF08\u524D\u7AEF\u6309\u6B64\u6E32\u67D3\uFF0C\u5FC5\u987B\u9075\u5B88\uFF09
+
+\u56DE\u590D\u7528\u6237\u65F6\uFF0C\u7ED3\u8BBA\u884C\u5FC5\u987B\u662F\u4E0B\u5217\u56DB\u8005\u4E4B\u4E00\uFF0C\u5355\u72EC\u6210\u884C\uFF1A
+
+- \`\u7ED3\u8BBA\uFF1A\u2705 \u5EFA\u8BAE\u505A\`
+- \`\u7ED3\u8BBA\uFF1A\u274C \u4E0D\u5EFA\u8BAE\u505A\`
+- \`\u7ED3\u8BBA\uFF1A\u23F8 \u6682\u7F13\`
+- \`\u7ED3\u8BBA\uFF1A\u2753 \u9700\u6F84\u6E05\`
+
+\u968F\u540E\u7ED9\u300C\u7406\u7531\u300D\uFF08\u65B9\u5411\u7EA7\uFF1A\u7A7A\u95F4\u73B0\u72B6 / \u4EFB\u52A1\u73B0\u72B6 / \u6210\u672C\u6536\u76CA\uFF09\uFF0C\u300C\u5EFA\u8BAE\u505A\u300D\u65F6\u518D\u7ED9\u65B9\u5411\u7EA7\u8303\u56F4
+\uFF08\u5927\u81F4\u6D89\u53CA\u4EC0\u4E48\u3001\u9884\u671F\u6548\u679C\uFF09\uFF0C**\u4E0D\u8981**\u7ED9\u6587\u4EF6\u7EA7\u6539\u52A8\u6E05\u5355\u3002
+
+## 3. \u4E8B\u5B9E\u7EAA\u5F8B\u4E0E\u8FDB\u5C55\u540C\u6B65
+
+- **\u4EFB\u52A1\u7F16\u53F7\uFF08\u5982 SPW299-28\uFF09\u53EA\u80FD\u53D6\u81EA\u547D\u4EE4\u8FD4\u56DE\u503C**\uFF08\`morula steward dispatch\` / \`morula task list\` \u8FD4\u56DE\u7684 \`code\`\uFF09\u3002
+  \u8FD4\u56DE\u503C\u91CC\u6CA1\u6709\u7F16\u53F7\u5C31\u4E0D\u8981\u5199\u7F16\u53F7\uFF0C**\u4E0D\u5F97\u81EA\u884C\u7F16\u9020**\u3002
+- \u62A5\u8FDB\u5C55\u524D\u5148\u67E5\uFF08\`morula task list\` / \`morula task get\` / \`morula comment list\`\uFF09\uFF0C\u4E0D\u8981\u51ED\u8BB0\u5FC6\u65AD\u8A00\u3002
+- **\u5199\u64CD\u4F5C\u540E\u56DE\u8BFB**\uFF1A\u6539\u5C5E\u6027 / \u63A8\u8FDB\u72B6\u6001 / \u505C\u91CD\u8DD1\u4E4B\u540E\uFF0C\u7528\u67E5\u8BE2\u547D\u4EE4\u786E\u8BA4\u7ED3\u679C\uFF0C\u518D\u5411\u7528\u6237\u6C47\u62A5\u300C\u5DF2\u751F\u6548\u300D\u3002
+- \u547D\u4EE4\u8F93\u51FA\u662F stdout \u4E0A\u7684 JSON\uFF1B\u51FA\u9519\u65F6\u770B stderr \u7684 \`code\` / \`message\` \u5B57\u6BB5\u5E76\u636E\u6B64\u8C03\u6574\uFF0C\u4E0D\u8981\u91CD\u8BD5\u540C\u6837\u7684\u8C03\u7528\u3002
+  \uFF08\u5199\u64CD\u4F5C\u62A5 \`FORBIDDEN\` \u4E14\u6587\u6848\u662F\u300C\u4F1A\u8BDD\u51ED\u8BC1\u4E0D\u80FD\u6267\u884C\u8BE5\u5199\u64CD\u4F5C\u300D= \u8FD9\u6761\u80FD\u529B\u4E0D\u5728\u7BA1\u5BB6\u6388\u6743\u8303\u56F4\u5185\uFF08\u4F1A\u8BDD\u4F5C\u7528\u57DF\u9650\u5236\uFF09\uFF1A**\u4E0D\u8981\u7ED5\u9053\u91CD\u8BD5**\uFF0C\u76F4\u63A5\u544A\u8BC9\u7528\u6237\u8BE5\u80FD\u529B\u672A\u5F00\u653E\u3002\uFF09
+- \u5E73\u53F0**\u4E0D\u518D**\u5411\u4F1A\u8BDD\u81EA\u52A8\u63A8\u9001\u6C47\u62A5\u6D88\u606F\u3002\u7528\u6237\u95EE\u8FDB\u5C55\u65F6\uFF0C\u7528 CLI \u67E5\u8BE2\u540E\u56DE\u7B54\uFF1A\u4EFB\u52A1\u72B6\u6001\u770B\u677F\u5B9E\u65F6\u53EF\u89C1\uFF0C
+  \u5206\u6790\u7ED3\u8BBA\u4E0E\u8BC4\u5BA1\u610F\u89C1\u5728\u4EFB\u52A1\u8BC4\u8BBA\u91CC\uFF0C\u4EA4\u4ED8\u7ED3\u679C\u5728\u4EFB\u52A1\u7684\u300C\u5173\u8054 PR / Commit\u300D\u533A\u3002
+`;
+function buildStewardSkillFile() {
+  return `${STEWARD_SKILL_FRONTMATTER}
+${STEWARD_SKILL_BODY}`;
+}
+
+// src/daemon/session-host.ts
+var SESSION_IDLE_DEFAULT_MS = 30 * 60 * 1e3;
+var ELICITATION_DEFAULT_TIMEOUT_MS = 5 * 60 * 1e3;
+var ATTACHMENT_FETCH_TIMEOUT_MS = 3e4;
+function safeAttachmentName(fileName) {
+  const base = (fileName || "attachment").split(/[\\/]/).pop() ?? "attachment";
+  const cleaned = base.replace(/[\u0000-\u001F<>:"|?*]/g, "_").replace(/^\.+/, "_").trim();
+  return cleaned.slice(0, 120) || "attachment";
+}
+function resolveSessionIdleMs(env = process.env) {
+  const raw = Number(env.MORULA_SESSION_IDLE_MS);
+  return Number.isFinite(raw) && raw > 0 ? raw : SESSION_IDLE_DEFAULT_MS;
+}
+function resolveElicitationTimeoutMs(env = process.env) {
+  const raw = Number(env.MORULA_DIM_APPROVAL_TIMEOUT_MS);
+  return Number.isFinite(raw) && raw > 0 ? raw : ELICITATION_DEFAULT_TIMEOUT_MS;
+}
+var ELICITATION_POLL_WAIT_MS = 15e3;
+var SessionHost = class {
+  constructor(options) {
+    this.options = options;
+    this.log = options.log ?? ((line) => console.log(line));
+    this.idleMs = resolveSessionIdleMs();
+  }
+  options;
+  sessions = /* @__PURE__ */ new Map();
+  log;
+  idleMs;
+  /** 当前打开的会话（morula AgentSession.id 列表；诊断/测试用） */
+  get openSessionIds() {
+    return [...this.sessions.keys()];
+  }
+  /**
+   * 打开会话：建/复用工作区 → 起**独立** dim acp 进程 → session/new（或 resume 续跑）
+   * → 应用配置 → 指针回传。工作区保留（close 不清理）。
+   *
+   * **幂等**：已打开且进程存活 → 只刷新凭证/注入物与变化过的配置，**不重建进程**
+   * （服务端每轮 prompt 前都会补发 open 做兜底：daemon 可能重启或空闲回收过，
+   * 用同一条命令覆盖「首次打开」与「兜底确认」两种语义，避免两端各维护一套「是否已打开」状态）。
+   */
+  async open(cmd) {
+    if (!cmd?.sessionId || !cmd?.tenantId || !cmd?.projectId)
+      return { ok: false, error: "SESSION_OPEN_INVALID_ARGS" };
+    const workspaceDir = join19(this.options.workdir, "steward", cmd.tenantId, cmd.projectId);
+    mkdirSync12(workspaceDir, { recursive: true });
+    this.writeInjections(workspaceDir, cmd);
+    const existing = this.sessions.get(cmd.sessionId);
+    if (existing?.conn.isAlive) {
+      if (cmd.sessionToken) {
+        this.options.api.setSessionToken(cmd.sessionId, cmd.sessionToken);
+        existing.env.MORULA_SESSION_TOKEN = cmd.sessionToken;
+      }
+      this.touch(existing);
+      const changed = this.diffConfig(existing.appliedConfig, this.configFrom(cmd));
+      for (const [configId, value] of Object.entries(changed)) {
+        await existing.conn.setConfigOptionFull(existing.dimSessionId, configId, value).then((raw) => {
+          const full = normalizeAcpConfigOptions(raw) ?? [];
+          if (full.length > 0) {
+            void this.options.api.reportSessionBinding(cmd.sessionId, { configOptions: full }).catch(() => {
+            });
+          }
+        }).catch((err) => this.log(`[session-host] \u4F1A\u8BDD ${cmd.sessionId} \u914D\u7F6E ${configId} \u589E\u91CF\u4E0B\u53D1\u5931\u8D25: ${err.message}`));
+      }
+      existing.appliedConfig = { ...existing.appliedConfig, ...changed };
+      return { ok: true, dimSessionId: existing.dimSessionId, workspaceDir: existing.workspaceDir, alreadyOpen: true };
+    }
+    if (existing)
+      await this.close({ sessionId: cmd.sessionId }, "reopen");
+    if (cmd.sessionToken)
+      this.options.api.setSessionToken(cmd.sessionId, cmd.sessionToken);
+    const env = {
+      ...cmd.sessionToken ? { MORULA_SESSION_TOKEN: cmd.sessionToken } : {},
+      ...this.options.baseUrl ? { MORULA_API_URL: this.options.baseUrl } : {},
+      // 会话上下文（对齐任务链路的 MORULA_TASK_ID）：让 `morula` CLI 知道「我在哪个会话里」，
+      // 派单幂等与 elicitation 回传需要它；管家会话**没有** MORULA_TASK_ID（任务专属命令会因此拒绝执行）
+      MORULA_SESSION_ID: cmd.sessionId,
+      MORULA_SPACE_ID: cmd.projectId,
+      // 插件 bin 前置 + 显式 CLI 路径：否则 agent 会解析到宿主/桌面应用自带的旧 `morula`——
+      // 新命令不存在，且旧 CLI 不认 MORULA_SESSION_TOKEN（回落用户凭证）→ 写操作署名错、
+      // 写面作用域校验被绕过。PATH 只是第一道保险（dim 会重写 agent shell 的 PATH），
+      // 可靠的是 `MORULA_CLI` 绝对路径（契约要求 agent 用它）。
+      // 见 issues/steward-cli-resolves-stale-bundled-morula.md。
+      PATH: prependPluginBinToPath(process.env.PATH),
+      MORULA_CLI: pluginBinPath(),
+      ...this.options.isolatedDimEnv ?? {}
+    };
+    const onExit = (code) => {
+      this.log(`[session-host] \u4F1A\u8BDD ${cmd.sessionId} \u7684 dim acp \u8FDB\u7A0B\u9000\u51FA\uFF08code=${code}\uFF09`);
+      const managed2 = this.sessions.get(cmd.sessionId);
+      if (managed2 && managed2.conn === conn) {
+        this.sessions.delete(cmd.sessionId);
+        this.options.api.clearSessionToken(cmd.sessionId);
+      }
+    };
+    const connOptions = {
+      dimPath: this.options.dimPath,
+      cwd: workspaceDir,
+      // process.env 值域含 undefined（ProcessEnv），显式收敛为 string 索引（spawn env 语义）
+      env: { ...process.env, ...env },
+      // P1-7：审批默认全自动放行（管家人在环收敛到 elicitation 一处，见 §4.7 取舍）。
+      // 注意：dim 的权限引擎决定 allow/deny/ask，client 无法强制——`permission` 只选 preset。
+      onPermissionRequest: async () => ({ outcome: { outcome: "selected", optionId: "allow" } }),
+      onElicitation: async (request) => this.handleElicitation(cmd.sessionId, request),
+      onExit
+    };
+    const conn = this.options.acpConnectionFactory ? this.options.acpConnectionFactory(connOptions) : new AcpConnection(connOptions);
+    try {
+      await conn.start();
+    } catch (err) {
+      return { ok: false, error: `dim acp \u542F\u52A8\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}` };
+    }
+    const sessionParams = { cwd: workspaceDir, mcpServers: [] };
+    let dimSessionId;
+    let resumed = false;
+    let resumeFailed = null;
+    let configOptions;
+    if (cmd.dimSessionId) {
+      try {
+        const r = await conn.resumeSession({ ...sessionParams, sessionId: cmd.dimSessionId });
+        configOptions = normalizeAcpConfigOptions(r.configOptions) ?? void 0;
+        dimSessionId = cmd.dimSessionId;
+        resumed = true;
+      } catch {
+        try {
+          const r = await conn.loadSession({ ...sessionParams, sessionId: cmd.dimSessionId });
+          configOptions = normalizeAcpConfigOptions(r.configOptions) ?? void 0;
+          dimSessionId = cmd.dimSessionId;
+          resumed = true;
+        } catch (err) {
+          resumeFailed = err instanceof Error ? err.message : String(err);
+          const created = await conn.newSession(sessionParams);
+          configOptions = normalizeAcpConfigOptions(created.configOptions) ?? void 0;
+          dimSessionId = created.sessionId;
+        }
+      }
+    } else {
+      const created = await conn.newSession(sessionParams);
+      configOptions = normalizeAcpConfigOptions(created.configOptions) ?? void 0;
+      dimSessionId = created.sessionId;
+    }
+    const appliedConfig = this.configFrom(cmd);
+    const permission = appliedConfig.permission || "workspace-write";
+    const applyConfig = async (configId, value) => {
+      try {
+        const full = normalizeAcpConfigOptions(await conn.setConfigOptionFull(dimSessionId, configId, value)) ?? [];
+        if (full.length > 0)
+          configOptions = full;
+      } catch (err) {
+        this.log(`[session-host] \u4F1A\u8BDD ${cmd.sessionId} \u914D\u7F6E ${configId}=${value} \u4E0B\u53D1\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`);
+      }
+    };
+    await applyConfig("permission", permission);
+    if (appliedConfig.modelId)
+      await applyConfig("model", appliedConfig.modelId);
+    if (appliedConfig.thoughtLevel)
+      await applyConfig("thought_level", appliedConfig.thoughtLevel);
+    if (appliedConfig.agentMode)
+      await applyConfig("mode", appliedConfig.agentMode);
+    void this.options.api.reportSessionBinding(cmd.sessionId, {
+      dimSessionId,
+      workspaceDir,
+      ...cmd.runtimeId ? { runtimeId: cmd.runtimeId } : {},
+      ...cmd.providerKey ? { providerKey: cmd.providerKey } : {},
+      ...configOptions !== void 0 ? { configOptions } : {}
+    }).catch((err) => {
+      this.log(`[session-host] \u4F1A\u8BDD ${cmd.sessionId} \u6307\u9488\u56DE\u4F20\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`);
+    });
+    const managed = {
+      sessionId: cmd.sessionId,
+      conn,
+      dimSessionId,
+      workspaceDir,
+      env,
+      turnNo: 0,
+      promptInFlight: null,
+      cancelRequested: false,
+      // resume 成功 → dim 会话里已有上一进程注入的管家指令，不重复前置
+      instructed: resumed,
+      appliedConfig: { ...appliedConfig, permission },
+      idleTimer: setTimeout(() => {
+        void this.close({ sessionId: cmd.sessionId }, "idle");
+      }, this.idleMs),
+      lastActiveAt: Date.now()
+    };
+    managed.idleTimer.unref?.();
+    this.sessions.set(cmd.sessionId, managed);
+    this.log(`[session-host] \u4F1A\u8BDD\u5DF2\u6253\u5F00 ${cmd.sessionId}\uFF08dim=${dimSessionId}\uFF0Cworkspace=${workspaceDir}${resumeFailed ? `\uFF0C\u7EED\u8DD1\u5931\u8D25\u5DF2\u65B0\u5EFA\uFF1A${resumeFailed}` : ""}\uFF09`);
+    return { ok: true, dimSessionId, workspaceDir };
+  }
+  /**
+   * 送一轮 prompt（同一会话单活跃——ACP 硬约束；忙时返回 SESSION_BUSY 不排队，
+   * 排队语义由服务端消息投递状态机承载，见 §4.2）。
+   * 事件映射复用任务链路同款 mapper + normalizer（含 P0-8 修正：user_message / usage 上下文语义）。
+   *
+   * **管家指令前置**（§4.4）：新建 dim 会话的**首条** prompt 前置 `STEWARD_SYSTEM_INSTRUCTIONS`
+   * （ACP 无 system prompt 通道）。resume 的会话里已有，不重复注入。
+   * 该常量只含身份/边界/目标/工作区与工具入口（提示词极简，见 steward-instructions.ts 文件头）；
+   * 行为规范与命令用法在 `.agents/skills/steward-management/SKILL.md`，由 agent 按需读取。
+   */
+  async prompt(cmd) {
+    const managed = this.sessions.get(cmd.sessionId);
+    if (!managed)
+      return { ok: false, error: "SESSION_NOT_OPEN" };
+    if (managed.promptInFlight)
+      return { ok: false, error: "SESSION_BUSY" };
+    if (!cmd.prompt?.trim())
+      return { ok: false, error: "SESSION_PROMPT_EMPTY" };
+    managed.turnNo += 1;
+    managed.cancelRequested = false;
+    this.touch(managed);
+    const turnNo = managed.turnNo;
+    const mapper = new AcpEventMapper();
+    let seqHint = 0;
+    const nextSeq = () => ++seqHint;
+    const textStream = new AssistantTextStream({
+      onDelta: (seg, delta) => {
+        void this.options.api.recordSessionStreamChunk(managed.sessionId, {
+          chunkType: "delta",
+          data: { kind: "text", seg, text: delta }
+        }).catch(() => {
+        });
+      },
+      onParagraph: (seg, text2) => this.options.api.recordSessionEvent(managed.sessionId, {
+        type: "agent_message_delta",
+        output: { text: redactValue(text2), seg },
+        turnNo,
+        seqHint: nextSeq()
+      }).then(() => void 0).catch((err) => {
+        this.log(`[session-host] \u4F1A\u8BDD ${managed.sessionId} \u6BB5\u843D\u4E8B\u4EF6\u4E0A\u62A5\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`);
+      })
+    }, { log: this.log });
+    const thinkingStream = new AssistantTextStream({
+      onDelta: (seg, delta) => {
+        void this.options.api.recordSessionStreamChunk(managed.sessionId, {
+          chunkType: "delta",
+          data: { kind: "thinking", seg, text: delta }
+        }).catch(() => {
+        });
+      },
+      onParagraph: (seg, text2) => this.options.api.recordSessionEvent(managed.sessionId, {
+        type: "agent_thought_delta",
+        output: { text: redactValue(text2), seg },
+        turnNo,
+        seqHint: nextSeq()
+      }).then(() => void 0).catch((err) => {
+        this.log(`[session-host] \u4F1A\u8BDD ${managed.sessionId} \u601D\u8003\u6BB5\u843D\u4E0A\u62A5\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`);
+      })
+    }, { log: this.log });
+    let textChain = Promise.resolve();
+    let thinkingPending = false;
+    const gateThinking = () => {
+      if (thinkingPending) {
+        thinkingPending = false;
+        textChain = textChain.then(() => thinkingStream.flushParagraph());
+      }
+      return textChain;
+    };
+    const onEvent = (event) => {
+      this.touch(managed);
+      if (event.type === "assistant_thinking_delta") {
+        thinkingPending = true;
+        thinkingStream.push(event.text);
+      } else if (event.type === "assistant_text_delta") {
+        void gateThinking().then(() => textStream.push(event.text));
+      } else if (event.type === "tool_call_started") {
+        void gateThinking().then(() => textStream.flushParagraph()).then(() => this.options.api.recordSessionEvent(managed.sessionId, {
+          type: "tool_call_started",
+          toolName: event.toolName,
+          callId: event.callId,
+          input: event.input !== void 0 ? redactInputSummary(event.input) : void 0,
+          output: void 0,
+          turnNo,
+          seqHint: nextSeq()
+        })).catch(() => {
+        });
+      } else if (event.type === "tool_call_completed") {
+        void this.options.api.recordSessionEvent(managed.sessionId, {
+          type: "tool_call_completed",
+          callId: event.callId,
+          toolName: event.toolName,
+          output: {
+            callId: event.callId,
+            toolName: event.toolName,
+            status: event.aborted ? "aborted" : "completed",
+            ...event.outputSummary !== void 0 ? { summary: String(redactValue(String(event.outputSummary).slice(0, 200))) } : {}
+          },
+          turnNo,
+          seqHint: nextSeq()
+        }).catch(() => {
+        });
+      } else if (event.type === "user_message") {
+        void this.options.api.recordSessionEvent(managed.sessionId, {
+          type: "user_message",
+          output: { text: event.text },
+          turnNo
+        }).catch(() => {
+        });
+      } else if (event.type === "usage") {
+        void this.options.api.recordSessionEvent(managed.sessionId, {
+          type: "usage",
+          output: event.usage,
+          turnNo
+        }).catch(() => {
+        });
+      } else if (event.type === "session" && event.providerSessionId) {
+        void this.options.api.reportSessionBinding(managed.sessionId, { dimSessionId: event.providerSessionId }).catch(() => {
+        });
+      }
+    };
+    const normalizer = createDimEventNormalizer({ onEvent });
+    const updateHandler = (update) => {
+      const { messages } = mapper.map(managed.dimSessionId, update);
+      for (const message of messages)
+        normalizer.handle(message, "");
+    };
+    const text = managed.instructed ? cmd.prompt : `${STEWARD_SYSTEM_INSTRUCTIONS}
+
+---
+
+${cmd.prompt}`;
+    const run3 = (async () => {
+      try {
+        const { blocks, fileRefs } = await this.materializeAttachments(managed.workspaceDir, cmd.attachments ?? []);
+        const promptBlocks = [{ type: "text", text: fileRefs.length > 0 ? `${text}
+
+---
+
+\u672C\u8F6E\u9644\u4EF6\u5DF2\u4E0B\u8F7D\u5230\u4F1A\u8BDD\u5DE5\u4F5C\u533A\uFF08\u7528 read/exec \u5DE5\u5177\u6309\u8DEF\u5F84\u8BFB\u53D6\uFF0C\u4E0D\u8981\u91CD\u590D\u4E0B\u8F7D\uFF09\uFF1A
+${fileRefs.join("\n")}` : text }];
+        promptBlocks.push(...blocks);
+        const pending = managed.conn.prompt(managed.dimSessionId, promptBlocks, updateHandler);
+        managed.instructed = true;
+        void this.options.api.recordSessionEvent(managed.sessionId, {
+          type: "turn_started",
+          output: { ...cmd.messageId ? { messageId: cmd.messageId } : {} },
+          turnNo
+        }).catch(() => {
+        });
+        const result = await pending;
+        await gateThinking();
+        await textStream.flushParagraph();
+        normalizer.finish({ eventType: "run:ended", payload: { stopReason: result.stopReason } }, "");
+        await this.options.api.recordSessionEvent(managed.sessionId, {
+          type: "turn_completed",
+          output: { stopReason: result.stopReason, ...cmd.messageId ? { messageId: cmd.messageId } : {} },
+          turnNo
+        }).catch(() => {
+        });
+        return { ok: true, stopReason: result.stopReason };
+      } catch (err) {
+        await gateThinking();
+        await textStream.flushParagraph();
+        const message = err instanceof Error ? err.message : String(err);
+        await this.options.api.recordSessionEvent(managed.sessionId, {
+          type: "turn_failed",
+          output: { error: message, ...cmd.messageId ? { messageId: cmd.messageId } : {} },
+          turnNo
+        }).catch(() => {
+        });
+        return { ok: false, error: message };
+      } finally {
+        textStream.dispose();
+        thinkingStream.dispose();
+        managed.promptInFlight = null;
+        this.touch(managed);
+      }
+    })();
+    managed.promptInFlight = run3;
+    return run3;
+  }
+  /**
+   * 附件物化（§五 P2-3）：
+   * - **图片** → ACP `image` content block（base64 + mimeType），直接进模型上下文；
+   * - **其他文件** → 下载到 `<workspace>/attachments/<安全文件名>`，返回路径引用文本
+   *   （doc 明确「文件走工作区文件 + 路径引用」：不进上下文，由 agent 按需读取）。
+   *
+   * 下载失败不抛：记日志并跳过该附件（本轮照常发出）。
+   */
+  async materializeAttachments(workspaceDir, attachments) {
+    const blocks = [];
+    const fileRefs = [];
+    if (attachments.length === 0)
+      return { blocks, fileRefs };
+    const dir = join19(workspaceDir, "attachments");
+    for (const attachment of attachments) {
+      try {
+        const res = await fetch(attachment.downloadUrl, { signal: AbortSignal.timeout(ATTACHMENT_FETCH_TIMEOUT_MS) });
+        if (!res.ok)
+          throw new Error(`HTTP ${res.status}`);
+        const bytes = Buffer.from(await res.arrayBuffer());
+        if (attachment.isImage) {
+          blocks.push({ type: "image", data: bytes.toString("base64"), mimeType: attachment.fileType || "image/png" });
+        } else {
+          mkdirSync12(dir, { recursive: true });
+          const target = join19(dir, safeAttachmentName(attachment.fileName));
+          writeFileSync10(target, bytes);
+          fileRefs.push(`- ${attachment.fileName} \u2192 ${target}`);
+        }
+      } catch (err) {
+        this.log(`[session-host] \u9644\u4EF6 ${attachment.id}\uFF08${attachment.fileName}\uFF09\u62C9\u53D6\u5931\u8D25\uFF0C\u672C\u8F6E\u5DF2\u8DF3\u8FC7: ${err instanceof Error ? err.message : String(err)}`);
+      }
+    }
+    return { blocks, fileRefs };
+  }
+  /** 取消当前回合（ACP session/cancel；会话保持打开——长驻语义） */
+  cancel(cmd) {
+    const managed = this.sessions.get(cmd.sessionId);
+    if (!managed)
+      return { ok: false, error: "SESSION_NOT_OPEN" };
+    managed.cancelRequested = true;
+    managed.conn.cancel(managed.dimSessionId);
+    this.touch(managed);
+    return { ok: true };
+  }
+  /**
+   * 配置变更（configId ∈ model / thought_level / mode / permission）。
+   * ACP `set_config_option` 全量返回 configOptions——回写由服务端（配置端点）消费，
+   * 这里原样返回给调用方。
+   */
+  async config(cmd) {
+    const managed = this.sessions.get(cmd.sessionId);
+    if (!managed)
+      return { ok: false, error: "SESSION_NOT_OPEN" };
+    this.touch(managed);
+    try {
+      const result = normalizeAcpConfigOptions(await managed.conn.setConfigOptionFull(managed.dimSessionId, cmd.configId, cmd.value)) ?? [];
+      managed.appliedConfig = { ...managed.appliedConfig, [this.configKey(cmd.configId)]: cmd.value };
+      if (result.length > 0) {
+        void this.options.api.reportSessionBinding(cmd.sessionId, { configOptions: result }).catch((err) => this.log(`[session-host] \u4F1A\u8BDD ${cmd.sessionId} configOptions \u56DE\u4F20\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`));
+      }
+      return { ok: true, configOptions: result };
+    } catch (err) {
+      return { ok: false, error: err instanceof Error ? err.message : String(err) };
+    }
+  }
+  /**
+   * 关闭会话：ACP session/close → 进程回收 → 服务端上报。
+   * **工作区保留**（steward/<tenant>/<project> 可复用；清理属服务端清理命令域）。
+   *
+   * @param reason `idle` = 空闲回收（服务端回到 idle，保留 dimSessionId 以便 resume）；
+   *               `command` = 用户/平台显式关闭（服务端终态 closed）；
+   *               `reopen` = daemon 内部重建（**不上报**，紧接着的 open 会重新绑定）。
+   */
+  async close(cmd, reason = "command") {
+    const managed = this.sessions.get(cmd.sessionId);
+    if (!managed)
+      return { ok: true };
+    this.sessions.delete(cmd.sessionId);
+    clearTimeout(managed.idleTimer);
+    try {
+      await managed.conn.close();
+    } catch {
+    }
+    if (reason === "reopen") {
+      this.log(`[session-host] \u4F1A\u8BDD ${cmd.sessionId} \u8FDE\u63A5\u91CD\u5EFA\uFF08\u5DE5\u4F5C\u533A\u4FDD\u7559 ${managed.workspaceDir}\uFF09`);
+      return { ok: true };
+    }
+    this.options.api.clearSessionToken(cmd.sessionId);
+    void this.options.api.closeAgentSession(cmd.sessionId, reason).catch((err) => {
+      this.log(`[session-host] \u4F1A\u8BDD ${cmd.sessionId} \u5173\u95ED\u4E0A\u62A5\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`);
+    });
+    this.log(`[session-host] \u4F1A\u8BDD\u5DF2\u5173\u95ED ${cmd.sessionId}\uFF08\u539F\u56E0=${reason}\uFF1B\u5DE5\u4F5C\u533A\u4FDD\u7559 ${managed.workspaceDir}\uFF09`);
+    return { ok: true };
+  }
+  /**
+   * 关闭全部会话（daemon 停机时收尾）。
+   * 用 `idle` 而非 `command`：daemon 停机不是用户关闭会话，dim 会话应当可 resume
+   * （否则服务端会把会话打成终态 `closed`，下次上线再也接不回来）。
+   */
+  async closeAll() {
+    for (const sessionId of [...this.sessions.keys()])
+      await this.close({ sessionId }, "idle").catch(() => {
+      });
+  }
+  // ────────────────────────── 内部 ──────────────────────────
+  /** 活跃信号：刷新空闲回收计时（事件/prompt/取消都算活跃）。定时器 unref——回收器不应单独钉住进程（daemon 有 WS/心跳常驻句柄） */
+  touch(managed) {
+    managed.lastActiveAt = Date.now();
+    clearTimeout(managed.idleTimer);
+    managed.idleTimer = setTimeout(() => {
+      void this.close({ sessionId: managed.sessionId }, "idle");
+    }, this.idleMs);
+    managed.idleTimer.unref?.();
+  }
+  /** 工作区注入物（幂等覆盖；daemon 侧组装，P1-6） */
+  writeInjections(workspaceDir, cmd) {
+    writeProjectAgentsMd(workspaceDir, cmd.agentsMd, this.log);
+    const skillDir = join19(workspaceDir, ".agents", "skills", STEWARD_SKILL_NAME);
+    mkdirSync12(skillDir, { recursive: true });
+    writeFileSync10(join19(skillDir, "SKILL.md"), buildStewardSkillFile(), "utf8");
+    const contextDir = join19(workspaceDir, ".agent_context");
+    mkdirSync12(contextDir, { recursive: true });
+    writeFileSync10(
+      join19(contextDir, "steward-context.md"),
+      buildStewardContextMd(cmd.facts ?? { projectId: cmd.projectId, tenantId: cmd.tenantId }),
+      "utf8"
+    );
+  }
+  configFrom(cmd) {
+    return {
+      ...cmd.modelId?.trim() ? { modelId: cmd.modelId.trim() } : {},
+      ...cmd.thoughtLevel?.trim() ? { thoughtLevel: cmd.thoughtLevel.trim() } : {},
+      ...cmd.agentMode?.trim() ? { agentMode: cmd.agentMode.trim() } : {},
+      ...cmd.permission?.trim() ? { permission: cmd.permission.trim() } : {}
+    };
+  }
+  /** 配置差异 → ACP configId 映射（只返回变化项；open 幂等路径用） */
+  diffConfig(applied, next) {
+    const out = {};
+    for (const key of ["modelId", "thoughtLevel", "agentMode", "permission"]) {
+      const value = next[key];
+      if (value && value !== applied[key])
+        out[this.configIdOf(key)] = value;
+    }
+    return out;
+  }
+  /** 本地字段名 → ACP configId（§4.4：model / thought_level / mode / permission） */
+  configIdOf(key) {
+    if (key === "modelId")
+      return "model";
+    if (key === "thoughtLevel")
+      return "thought_level";
+    if (key === "agentMode")
+      return "mode";
+    return key;
+  }
+  /** ACP configId → 本地字段名（config 变更回写用） */
+  configKey(configId) {
+    if (configId === "model")
+      return "modelId";
+    if (configId === "thought_level")
+      return "thoughtLevel";
+    if (configId === "mode")
+      return "agentMode";
+    return configId;
+  }
+  /**
+   * 结构化提问上行（§4.6 ②）：登记 → 长轮询切片等待用户应答 → 超时回 cancel。
+   *
+   * 为什么两段式（登记 + 轮询）而不是一个长连接：用户可能几分钟才填完，单个悬挂 HTTP 请求
+   * 会撞上服务端 requestTimeout 与中间层空闲超时；切片等待把「无悬挂长连接」与
+   * 「应答即达」两个目标同时拿到。
+   */
+  async handleElicitation(sessionId, request) {
+    const timeoutMs = resolveElicitationTimeoutMs();
+    let elicitationId;
+    try {
+      const created = await this.options.api.createElicitation(sessionId, {
+        toolCallId: request.toolCallId,
+        message: request.message,
+        requestedSchema: request.requestedSchema
+      });
+      if (!created?.ok || !created.elicitationId) {
+        this.log(`[session-host] \u4F1A\u8BDD ${sessionId} \u7ED3\u6784\u5316\u63D0\u95EE\u767B\u8BB0\u5931\u8D25: ${created?.code ?? "unknown"}`);
+        return { action: "decline" };
+      }
+      elicitationId = created.elicitationId;
+    } catch (err) {
+      this.log(`[session-host] \u4F1A\u8BDD ${sessionId} \u7ED3\u6784\u5316\u63D0\u95EE\u767B\u8BB0\u5F02\u5E38: ${err instanceof Error ? err.message : String(err)}`);
+      return { action: "decline" };
+    }
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+      const remaining = deadline - Date.now();
+      try {
+        const result = await this.options.api.getElicitation(sessionId, elicitationId, Math.min(ELICITATION_POLL_WAIT_MS, remaining));
+        if (result?.status === "answered")
+          return { action: result.action ?? "accept", content: result.content ?? {} };
+        if (result?.status === "cancelled")
+          return { action: "cancel" };
+        if (result?.status === "expired") {
+          this.log(`[session-host] \u4F1A\u8BDD ${sessionId} \u7ED3\u6784\u5316\u63D0\u95EE\u5DF2\u5728\u670D\u52A1\u7AEF\u8FC7\u671F\uFF08${elicitationId}\uFF09`);
+          return { action: "cancel" };
+        }
+      } catch (err) {
+        this.log(`[session-host] \u4F1A\u8BDD ${sessionId} \u7ED3\u6784\u5316\u63D0\u95EE\u67E5\u8BE2\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`);
+        return { action: "cancel" };
+      }
+      const managed = this.sessions.get(sessionId);
+      if (managed)
+        this.touch(managed);
+    }
+    this.log(`[session-host] \u4F1A\u8BDD ${sessionId} \u7ED3\u6784\u5316\u63D0\u95EE\u7B49\u5F85\u8D85\u65F6\uFF08${Math.round(timeoutMs / 1e3)}s\uFF0C${elicitationId}\uFF09`);
+    return { action: "cancel" };
+  }
+};
+
+// src/daemon/ws-client.ts
+import { createHash as createHash2 } from "node:crypto";
+import { io } from "socket.io-client";
+var WS_AUTH_RELOAD_MAX = 3;
+function tokenFingerprint(token) {
+  const digest = createHash2("sha256").update(token).digest("hex").slice(0, 8);
+  return `len=${token.length} seg=${token.split(".").length} sha256=${digest}`;
+}
+function isWellFormedToken(token) {
+  return token.split(".").length === 3;
+}
+function isAuthConnectError(message) {
+  return /malformed|expired|invalid signature|invalid token|jwt|unauthorized|401/i.test(message);
+}
+var DaemonWsClient = class {
+  constructor(baseUrl, token, resolveToken2) {
+    this.baseUrl = baseUrl;
+    this.resolveToken = resolveToken2;
+    this.currentToken = token;
+    this.currentSource = "startup";
+  }
+  baseUrl;
+  resolveToken;
+  socket = null;
+  handlers = null;
+  currentToken;
+  currentSource;
+  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）。
@@ -7328,6 +9000,12 @@ var DaemonWsClient = class {
       if (event)
         handlers.onTaskMessage(event);
     });
+    for (const kind of ["open", "prompt", "cancel", "config", "close"]) {
+      socket.on(`agent-session:${kind}`, (payload) => {
+        if (payload && typeof payload === "object")
+          handlers.onSessionCommand?.(kind, payload);
+      });
+    }
     socket.on("connect_error", (error) => {
       this.onConnectError(socket, error);
     });
@@ -7510,6 +9188,12 @@ var DaemonRunner = class {
   isolatedDimEnv = {};
   /** ACP 连接池（ACP-only：daemon 启动即建，懒 spawn，首个任务才起 dim acp 进程） */
   acpPool = null;
+  /**
+   * 会话宿主（steward-core-acp-migration §4.4，P0 骨架）：长驻会话（管家对话）的执行载体，
+   * 每会话独立 dim acp 进程（不走连接池）。P0 只接骨架（WS 命令转发 + 机器协议上报），
+   * 服务端发射端（agent-session:*）在 P1-5 接入。
+   */
+  sessionHost = null;
   /** LOCAL-AGENT-REPO-READ-001：本地 repo checkout 端点（agent 本轮内读仓库） */
   repoCheckout = null;
   async start() {
@@ -7545,6 +9229,15 @@ var DaemonRunner = class {
         env: this.isolatedDimEnv
       });
       this.log("[daemon] dim executor: acp-v1\uFF08ACP-only\uFF0C\u957F\u9A7B dim acp \u8FDB\u7A0B\uFF09");
+      this.sessionHost = new SessionHost({
+        api: this.api,
+        workdir: cfg2?.workdir ?? process.cwd(),
+        dimPath: this.dimPath,
+        isolatedDimEnv: this.isolatedDimEnv,
+        baseUrl: this.client.baseUrl,
+        log: this.log
+      });
+      this.log(`[daemon] session host: ready\uFF08\u7A7A\u95F2\u56DE\u6536 ${Math.round(resolveSessionIdleMs() / 6e4)}min\uFF0CMORULA_SESSION_IDLE_MS \u8986\u76D6\uFF09`);
       this.repoCheckout = new LocalRepoCheckoutService({
         api: this.api,
         cfg: cfg2 ?? loadDaemonConfig(this.store),
@@ -7563,7 +9256,7 @@ var DaemonRunner = class {
     this.log(`[daemon] dim CLI: ${this.dimPath}`);
     let binaryMtime = "unknown";
     try {
-      binaryMtime = statSync3(process.execPath).mtime.toISOString();
+      binaryMtime = statSync4(process.execPath).mtime.toISOString();
     } catch (_) {
     }
     this.log(`[daemon] binary=${process.execPath} mtime=${binaryMtime} v=${BUILD_VERSION2}`);
@@ -7629,6 +9322,11 @@ var DaemonRunner = class {
       });
       this.acpPool = null;
     }
+    if (this.sessionHost) {
+      void this.sessionHost.closeAll().catch(() => {
+      });
+      this.sessionHost = null;
+    }
     this.repoCheckout?.close();
     this.repoCheckout = null;
   }
@@ -7965,9 +9663,68 @@ var DaemonRunner = class {
       // P1：重连后房间已重放 → 立即按 afterSeq 重新补齐（断连期间的帧不会补发，只能拉）
       onTaskResubscribed: (taskId) => {
         void this.catchUpTaskMessages(taskId);
+      },
+      // 会话宿主命令（steward-core-acp-migration §4.4，P1-5）：转发给 SessionHost。
+      // 服务端发到 **tenant 房间**（同租户每台 daemon 都收到，WS 无 per-runtime 房间），
+      // 故与 `agent-task:dispatched` 同口径按 `runtimeId` 自过滤。
+      onSessionCommand: (kind, payload) => {
+        void this.handleSessionCommand(kind, payload);
       }
     };
   }
+  /**
+   * 会话宿主命令分发。
+   *
+   * 两道闸：
+   * ① **runtimeId 自过滤**（tenant 广播 → 只有归属设备处理；缺失时不过滤，兼容旧服务端）；
+   * ② **按会话串行**：服务端每轮 prompt 前会补发 `open` 做兜底，而 socket.io 只保证「送达有序」，
+   *    不保证「异步处理有序」——`void handleSessionCommand()` 会让 open/prompt 交错执行，
+   *    prompt 可能先于 open 完成而拿到 SESSION_NOT_OPEN。故按 sessionId 串成一条 promise 链。
+   */
+  sessionCommandChains = /* @__PURE__ */ new Map();
+  handleSessionCommand(kind, payload) {
+    const runtimeId = typeof payload.runtimeId === "string" ? payload.runtimeId : void 0;
+    if (runtimeId && this.runtimeId && runtimeId !== this.runtimeId)
+      return Promise.resolve();
+    const sessionId = typeof payload.sessionId === "string" ? payload.sessionId : "";
+    if (!sessionId) {
+      this.log(`[daemon] \u4F1A\u8BDD\u547D\u4EE4 ${kind} \u7F3A\u5C11 sessionId\uFF08\u5FFD\u7565\uFF09`);
+      return Promise.resolve();
+    }
+    const prev = this.sessionCommandChains.get(sessionId) ?? Promise.resolve();
+    const next = prev.catch(() => {
+    }).then(() => this.runSessionCommand(kind, payload)).catch((err) => {
+      this.log(`[daemon] \u4F1A\u8BDD\u547D\u4EE4 ${kind} \u6267\u884C\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`);
+    });
+    this.sessionCommandChains.set(sessionId, next);
+    void next.finally(() => {
+      if (this.sessionCommandChains.get(sessionId) === next)
+        this.sessionCommandChains.delete(sessionId);
+    });
+    return next;
+  }
+  /** 单条会话命令执行（畸形命令记日志不抛——单条坏命令不该打断 daemon 主循环） */
+  async runSessionCommand(kind, payload) {
+    const host = this.sessionHost;
+    if (!host) {
+      this.log(`[daemon] \u6536\u5230\u4F1A\u8BDD\u547D\u4EE4 ${kind}\uFF0C\u4F46\u4F1A\u8BDD\u5BBF\u4E3B\u672A\u5C31\u7EEA\uFF08\u5FFD\u7565\uFF09`);
+      return;
+    }
+    try {
+      if (kind === "open")
+        await host.open(payload);
+      else if (kind === "prompt")
+        await host.prompt(payload);
+      else if (kind === "cancel")
+        host.cancel(payload);
+      else if (kind === "config")
+        await host.config(payload);
+      else if (kind === "close")
+        await host.close(payload);
+    } catch (err) {
+      this.log(`[daemon] \u4F1A\u8BDD\u547D\u4EE4 ${kind} \u6267\u884C\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`);
+    }
+  }
   /**
    * 派发事件入口（P0-b，issues/agent-task-false-failure-on-daemon-fetch-error.md）：
    * 服务端把派发事件发到 **tenant 房间**（daemon-executor.service.ts `sendToTenant`，WS 无 per-runtime
@@ -8194,7 +9951,13 @@ var DaemonRunner = class {
       // 本任务的 AgentTask ID：`morula repo mr create`（服务端建 MR 通道）等机器协议据此定位任务；
       // agent 不需要也不应自己拼（issues/mr-created-outside-bound-project.md）
       ...taskId ? { MORULA_TASK_ID: taskId } : {},
-      ...this.client?.baseUrl ? { MORULA_API_URL: this.client.baseUrl } : {}
+      ...this.client?.baseUrl ? { MORULA_API_URL: this.client.baseUrl } : {},
+      // 插件 bin 前置 + 显式 CLI 路径（与会话链路同源）：任务里的 agent 也必须用本包物化的 `morula`，
+      // 而不是宿主/桌面应用自带的旧版（旧版不认任务/会话凭证，且缺部分命令旗标 → 契约指令直接失败）。
+      // PATH 只是第一道保险（dim 会重写 agent shell 的 PATH），可靠的是 `MORULA_CLI` 绝对路径。
+      // 见 issues/steward-cli-resolves-stale-bundled-morula.md。
+      PATH: prependPluginBinToPath(process.env.PATH),
+      MORULA_CLI: pluginBinPath()
     };
     let repoDir = cfg.workdir;
     let taskRoot = cfg.workdir;
@@ -8205,6 +9968,7 @@ var DaemonRunner = class {
       const wc = detail.workContext;
       repoBaseUrl = tokenRes.baseUrl;
       const remoteUrl = repoBaseUrl ? buildGitlabSshRemote(wc?.repoFullName ?? repo, repoBaseUrl) : void 0;
+      const daemonRemoteUrl = buildDaemonRepoUrl(wc?.repoFullName ?? repo, repoBaseUrl);
       env = { ...env, ...buildRepoEnv(tokenRes.token, repoBaseUrl) };
       if (wc?.baseBranch?.trim())
         env = { ...env, MORULA_BASE_BRANCH: wc.baseBranch.trim() };
@@ -8220,7 +9984,8 @@ var DaemonRunner = class {
           baseBranch: wc.baseBranch || "main",
           code: detail.code ?? null,
           env,
-          remoteUrl
+          remoteUrl,
+          daemonRemoteUrl
         });
         repoDir = managed.worktreePath;
         worktreePath = managed.worktreePath;
@@ -8229,7 +9994,7 @@ var DaemonRunner = class {
         });
         this.log(`[daemon] \u4EFB\u52A1 ${taskId} \u5DE5\u4F5C\u533A\u5C31\u7EEA: ${taskRoot}\uFF08\u4ED3\u5E93 ${repoDir}\uFF0Cbranch=${wc.branchName}\uFF09`);
       } else {
-        repoDir = ensureRepo(cfg.workdir, this.tenantId, repo, env, remoteUrl);
+        repoDir = ensureRepo(cfg.workdir, this.tenantId, repo, env, remoteUrl, daemonRemoteUrl);
         taskRoot = repoDir;
       }
       ensureGitIdentity(repoDir, detail.executor.executorName);
@@ -8246,12 +10011,12 @@ var DaemonRunner = class {
       });
       if (spaceToken?.token)
         env = { ...env, ...buildRepoEnv(spaceToken.token, spaceToken.baseUrl) };
-      repoDir = join18(cfg.workdir, "scratch", taskId);
+      repoDir = join20(cfg.workdir, "scratch", taskId);
       taskRoot = repoDir;
-      mkdirSync11(repoDir, { recursive: true });
-      const readme = join18(repoDir, "README.md");
+      mkdirSync13(repoDir, { recursive: true });
+      const readme = join20(repoDir, "README.md");
       if (!existsSync15(readme)) {
-        writeFileSync9(
+        writeFileSync11(
           readme,
           `# \u9694\u79BB\u5DE5\u4F5C\u533A\uFF08\u4EFB\u52A1 ${taskId}\uFF09
 
@@ -8259,7 +10024,8 @@ var DaemonRunner = class {
 \u7981\u6B62\u63A2\u7D22/\u4FEE\u6539\u672C\u76EE\u5F55\u4E4B\u5916\u7684\u4EFB\u4F55\u8DEF\u5F84\u2014\u2014\u5C24\u5176\u662F daemon \u6839\u76EE\u5F55\u4E0B\u7684 repos/\u3001worktrees/\u3001scratch/ \u7B49\u3002
 
 ## \u8BFB\u53D6\u4ED3\u5E93\u5185\u5BB9\uFF08\u91CD\u8981\uFF09
-\u82E5\u7CFB\u7EDF\u63D0\u793A/\u4EFB\u52A1\u4E0A\u4E0B\u6587\u51FA\u73B0\u300C\u53EF\u7528\u4ED3\u5E93\u300D\u6216\u4F60\u88AB @ \u4E86\u67D0\u4E2A\u4ED3\u5E93\uFF08\u5982 \`human-resources/xxx\`\uFF09\uFF0C\u672C\u76EE\u5F55\u91CC\u6CA1\u6709\u8BE5\u4ED3\u5E93\u662F\u6B63\u5E38\u7684\u2014\u2014\u4ED3\u5E93\u7531 \`morula repo checkout <\u672C\u4EFB\u52A1ID> <repoFullName>\` \u7269\u5316\uFF08\u672C\u5730 daemon \u7AEF\u70B9\uFF0C\u672C\u8F6E\u7ACB\u5373\u7269\u5316\u5E76\u8FD4\u56DE\u8DEF\u5F84\uFF09\uFF0C\u7269\u5316\u540E\u53EA\u8BFB\u67E5\u8BC1\uFF08git log / \u8BFB\u6587\u4EF6\uFF09\uFF0C\u4E0D\u5EFA\u5206\u652F\u3001\u4E0D\u6539\u4EE3\u7801\u3002
+\u82E5\u4EFB\u52A1\u9700\u8981\u8BFB/\u6539\u67D0\u4E2A\u4ED3\u5E93\uFF08\u4EFB\u52A1\u63CF\u8FF0\u91CC\u63D0\u5230\u3001\u6216\u4F60\u88AB @ \u4E86\u67D0\u4E2A\u4ED3\u5E93\u5982 \`human-resources/xxx\`\uFF09\uFF0C\u672C\u76EE\u5F55\u91CC\u6CA1\u6709\u8BE5\u4ED3\u5E93\u662F\u6B63\u5E38\u7684\u2014\u2014\u7A7A\u95F4\u7ED1\u5B9A\u4E86\u54EA\u4E9B\u4ED3\u5E93\u7528 \`morula repo list --space <spaceId>\` \u67E5\uFF08spaceId \u89C1\u7CFB\u7EDF\u63D0\u793A\u300C\u57FA\u672C\u4FE1\u606F\u300D\u6BB5\uFF09\u3002
+\u4ED3\u5E93\u7531 \`morula repo checkout <\u672C\u4EFB\u52A1ID> <repoFullName>\` \u7269\u5316\uFF08\u672C\u5730 daemon \u7AEF\u70B9\uFF0C\u672C\u8F6E\u7ACB\u5373\u7269\u5316\u5E76\u8FD4\u56DE\u8DEF\u5F84\uFF09\uFF0C\u7269\u5316\u540E\u53EA\u8BFB\u67E5\u8BC1\uFF08git log / \u8BFB\u6587\u4EF6\uFF09\uFF0C\u4E0D\u5EFA\u5206\u652F\u3001\u4E0D\u6539\u4EE3\u7801\u3002
 \u82E5\u4EFB\u52A1\u9700\u8981**\u6539\u52A8**\u4ED3\u5E93\uFF08\u591A\u4ED3\u5E93\u4EFB\u52A1\u7531\u4F60\u5224\u65AD\u6D89\u53CA\u54EA\u4E9B\u4ED3\u5E93\uFF09\uFF0C\u7528 \`morula repo prepare <\u672C\u4EFB\u52A1ID> <repoFullName>\` \u7269\u5316\u5230\u672C\u76EE\u5F55\uFF08\u8FD4\u56DE\u8DEF\u5F84\uFF09\uFF0C\u4ED3\u5E93\u4F1A\u4F5C\u4E3A\u672C\u76EE\u5F55\u4E0B\u7684\u5B50\u6587\u4EF6\u5939\u51FA\u73B0\uFF08\u5982 \`<owner>-<repo>/\`\uFF09\uFF0Cgit \u64CD\u4F5C\u5728\u8BE5\u5B50\u6587\u4EF6\u5939\u5185\u8FDB\u884C\u3002
 \u4E0D\u8981\u5728\u672C\u5730\u641C\u7D22\u4ED3\u5E93\u662F\u5426\u5B58\u5728\u2014\u2014\u672C\u5730\u6CA1\u6709 \u2260 \u4ED3\u5E93\u4E0D\u5B58\u5728\uFF0C\u5148\u6267\u884C checkout/prepare\u3002\u8BE6\u89C1\u534F\u4F5C\u5951\u7EA6 0.5 \u8282\u3002
 `,
@@ -8435,8 +10201,6 @@ var DaemonRunner = class {
    */
   async runOnce(taskId, detail, taskRoot, provider, providerKey, requestedModelId, env, repoBaseUrl, signal) {
     const streamChunks = [];
-    let textBuf = "";
-    let textTimer = null;
     let thoughtBuf = "";
     let thoughtTimer = null;
     let streamFlushing = false;
@@ -8535,6 +10299,16 @@ var DaemonRunner = class {
         void flushStreamChunks(false);
       }
     };
+    const textStream = new AssistantTextStream({
+      onDelta: (seg, text) => {
+        streamChunks.push({ chunkType: "delta", data: { kind: "text", seg, text } });
+        void flushStreamChunks(true);
+      },
+      onParagraph: (seg, text) => {
+        streamChunks.push({ chunkType: "text", seqHint: nextChunkSeq(), data: { text, seg } });
+        void flushStreamChunks(true);
+      }
+    }, { log: (line) => this.log(`[daemon] ${line}`) });
     const resumeSessionId = providerKey === "dim" ? detail.dimSessionId ?? detail.lastRun?.dimSessionId ?? null : null;
     const resumeWorkDir = detail.dimWorkDir ?? detail.lastRun?.dimWorkDir ?? null;
     const canResume = !!resumeSessionId && !!resumeWorkDir && existsSync15(resumeWorkDir);
@@ -8581,16 +10355,19 @@ var DaemonRunner = class {
           }
         }
         if (event.type === "tool_call_started") {
-          streamChunks.push({
-            chunkType: "tool",
-            seqHint: nextChunkSeq(),
-            data: {
-              toolName: event.toolName,
-              callId: event.callId,
-              input: event.input !== void 0 ? redactInputSummary(event.input) : void 0
-            }
+          void textStream.flushParagraph().then(() => {
+            streamChunks.push({
+              chunkType: "tool",
+              seqHint: nextChunkSeq(),
+              data: {
+                toolName: event.toolName,
+                callId: event.callId,
+                input: event.input !== void 0 ? redactInputSummary(event.input) : void 0
+              }
+            });
+            void flushStreamChunks(true);
+          }).catch(() => {
           });
-          void flushStreamChunks(true);
         }
         if (event.type === "tool_call_completed") {
           streamChunks.push({
@@ -8606,17 +10383,7 @@ var DaemonRunner = class {
           void flushStreamChunks(true);
         }
         if (event.type === "assistant_text_delta") {
-          textBuf += event.text;
-          if (!textTimer) {
-            textTimer = setTimeout(() => {
-              textTimer = null;
-              if (textBuf) {
-                streamChunks.push({ chunkType: "text", seqHint: nextChunkSeq(), data: { text: textBuf } });
-                textBuf = "";
-                void flushStreamChunks(false);
-              }
-            }, 200);
-          }
+          textStream.push(event.text);
         }
         if (event.type === "usage") {
           streamChunks.push({ chunkType: "usage", seqHint: nextChunkSeq(), data: event.usage });
@@ -8634,14 +10401,8 @@ var DaemonRunner = class {
       }
     };
     const result = await provider.run(input);
-    if (textTimer) {
-      clearTimeout(textTimer);
-      textTimer = null;
-    }
-    if (textBuf) {
-      streamChunks.push({ chunkType: "text", seqHint: nextChunkSeq(), data: { text: textBuf } });
-      textBuf = "";
-    }
+    await textStream.flushParagraph();
+    textStream.dispose();
     if (thoughtTimer) {
       clearTimeout(thoughtTimer);
       thoughtTimer = null;
@@ -8811,7 +10572,7 @@ var DaemonRunner = class {
       await this.api.submitCleanupResult(item.id, this.runtimeId, { ok: true });
       return;
     }
-    const managedRoot = join18(cfg.workdir, "worktrees", this.tenantId);
+    const managedRoot = join20(cfg.workdir, "worktrees", this.tenantId);
     if (!wc.worktreePath.startsWith(`${managedRoot}/`)) {
       await this.api.submitCleanupResult(item.id, this.runtimeId, {
         ok: false,
@@ -8859,38 +10620,38 @@ function isDebugLogEnabled() {
 var spaceTokenFailureLogged = false;
 function writeCustomSkills(targetDir, skills, log) {
   const NAME_RE = /^[\w-]{1,64}$/;
-  const base = join18(targetDir, ".agents", "skills");
+  const base = join20(targetDir, ".agents", "skills");
   for (const skill of skills) {
     const name = skill.name.trim();
     if (!NAME_RE.test(name)) {
       log?.(`[daemon] \u8DF3\u8FC7\u975E\u6CD5 skill \u540D\u79F0: ${JSON.stringify(name)}`);
       continue;
     }
-    const dir = join18(base, name);
-    if (dirname7(dir) !== base) {
+    const dir = join20(base, name);
+    if (dirname8(dir) !== base) {
       log?.(`[daemon] \u8DF3\u8FC7\u8D8A\u754C skill \u8DEF\u5F84: ${JSON.stringify(name)}`);
       continue;
     }
-    mkdirSync11(dir, { recursive: true });
+    mkdirSync13(dir, { recursive: true });
     const meta = ["---", `name: ${name}`];
     if (skill.description?.trim()) {
       meta.push(`description: ${skill.description.trim().replace(/\n/g, " ")}`);
     }
     meta.push("---", "");
-    writeFileSync9(join18(dir, "SKILL.md"), `${meta.join("\n")}
+    writeFileSync11(join20(dir, "SKILL.md"), `${meta.join("\n")}
 ${skill.content ?? ""}`, "utf8");
   }
 }
 function writeCollaborationSkill(targetDir, repo, repoBaseUrl, log, baseBranch, provider = repoBaseUrl ? "gitlab" : "github") {
-  const dir = join18(targetDir, ".agents", "skills", COLLABORATION_SKILL_NAME);
-  const refsDir = join18(dir, "references");
-  mkdirSync11(refsDir, { recursive: true });
+  const dir = join20(targetDir, ".agents", "skills", COLLABORATION_SKILL_NAME);
+  const refsDir = join20(dir, "references");
+  mkdirSync13(refsDir, { recursive: true });
   const isGitlab = provider === "gitlab" && !!repoBaseUrl;
   const front = isGitlab ? buildGitlabSkillFrontmatter() : COLLABORATION_SKILL_FRONTMATTER;
   const body = isGitlab ? buildGitlabSkillBody(repo ?? "", repoBaseUrl, baseBranch) : buildGithubSkillBody(baseBranch);
-  writeFileSync9(join18(dir, "SKILL.md"), `${front}
+  writeFileSync11(join20(dir, "SKILL.md"), `${front}
 ${body}`, "utf8");
-  writeFileSync9(join18(refsDir, "working-on-issues-source-map.md"), COLLABORATION_SKILL_SOURCE_MAP, "utf8");
+  writeFileSync11(join20(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${isGitlab ? "GitLab" : "GitHub"} \u7248\uFF0C\u4ED3\u5E93=${repo ?? "\u65E0"}\uFF09\u5230 .agents/skills/`);
 }
 function resolveContractPlatform(availableRepos, boundRepo, boundBaseUrl, boundBaseBranch) {
@@ -8921,8 +10682,8 @@ function resolveContractPlatform(availableRepos, boundRepo, boundBaseUrl, boundB
   };
 }
 function writeTaskContextBrief(targetDir, taskId, detail, repo, log) {
-  const briefDir = join18(targetDir, ".agent_context");
-  mkdirSync11(briefDir, { recursive: true });
+  const briefDir = join20(targetDir, ".agent_context");
+  mkdirSync13(briefDir, { recursive: true });
   const brief = `# \u4EFB\u52A1\u4E0A\u4E0B\u6587\uFF08Task Context\uFF09
 
 - \u672C AgentTask \u4EFB\u52A1 ID\uFF1A\`${taskId}\`
@@ -8931,7 +10692,7 @@ function writeTaskContextBrief(targetDir, taskId, detail, repo, log) {
 ---
 
 ${buildTaskPromptWithContract(detail, void 0)}`;
-  writeFileSync9(join18(briefDir, "task-context.md"), brief, "utf8");
+  writeFileSync11(join20(briefDir, "task-context.md"), brief, "utf8");
   log?.(`[daemon] \u5DF2\u6CE8\u5165\u4EFB\u52A1\u4E0A\u4E0B\u6587 brief \u5230 .agent_context/task-context.md`);
 }
 var PROJECT_AGENTS_MD_MAX_CHARS = 1e5;
@@ -8945,8 +10706,8 @@ function writeProjectAgentsMd(targetDir, agentsMd, log) {
     log?.(`[daemon] \u7A7A\u95F4 AGENTS.md \u5185\u5BB9\u8D85\u957F\uFF08${content.length} \u5B57\u7B26 > ${PROJECT_AGENTS_MD_MAX_CHARS}\uFF09\uFF0C\u5DF2\u622A\u65AD\u5199\u5165`);
     content = content.slice(0, PROJECT_AGENTS_MD_MAX_CHARS);
   }
-  mkdirSync11(targetDir, { recursive: true });
-  writeFileSync9(join18(targetDir, "AGENTS.md"), `${content}
+  mkdirSync13(targetDir, { recursive: true });
+  writeFileSync11(join20(targetDir, "AGENTS.md"), `${content}
 `, "utf8");
   log?.(`[daemon] \u5DF2\u6CE8\u5165\u7A7A\u95F4\u9879\u76EE\u8BF4\u660E\u5230 AGENTS.md\uFF08${content.length} \u5B57\u7B26\uFF0C\u4F5C\u4E3A project.instructions \u81EA\u52A8\u52A0\u8F7D\uFF09`);
   return true;
@@ -8966,52 +10727,20 @@ function resolveRepo(detail) {
 }
 function buildTaskPromptWithContract(detail, repoBaseUrl) {
   const prompt = detail.taskPrompt ?? "";
-  const repo = resolveRepo(detail);
-  const snapRepo = detail.contextSnapshot;
-  const repoResolution = typeof snapRepo?.repoResolution === "string" ? snapRepo.repoResolution : void 0;
-  const availableRepos = Array.isArray(detail.availableRepos) ? detail.availableRepos.filter((r) => r.repoFullName) : [];
-  const multiRepoList = availableRepos.length > 1 ? availableRepos.map((r) => `- ${r.repoFullName}\uFF08\u9ED8\u8BA4\u5206\u652F\uFF1A${r.defaultBranch || "main"}\uFF09`).join("\n") : "";
-  const multiRepoGuide = availableRepos.length > 1 ? `\u3010\u591A\u4ED3\u5E93\u4EFB\u52A1\u3011\u672C\u4EFB\u52A1\u7A7A\u95F4\u7ED1\u5B9A\u4E86\u591A\u4E2A\u4ED3\u5E93\uFF08\u6E05\u5355\u89C1\u4E0B\uFF09\uFF0C\u6D89\u53CA\u54EA\u4E9B\u4ED3\u5E93\u7531\u4F60\u7ED3\u5408\u4EFB\u52A1\u63CF\u8FF0\u5224\u65AD\u6267\u884C\uFF08\u4EFB\u52A1\u63CF\u8FF0\u300C\u6D89\u53CA\u4ED3\u5E93\u300D\u6BB5\u4E3A\u521D\u59CB\u5224\u65AD\uFF09\uFF1B\u6539\u52A8\u53D1\u751F\u5728\u54EA\u4E2A\u4ED3\u5E93\uFF0C\u5C31\u5728\u54EA\u4E2A\u4ED3\u5E93\u5185\u5EFA\u5206\u652F\u5E76\u63D0 PR/MR\uFF0C\u6BCF\u4E2A\u4ED3\u5E93\u7684 PR \u90FD\u4F1A\u88AB\u670D\u52A1\u7AEF\u81EA\u52A8\u5173\u8054\u5230\u672C\u4EFB\u52A1\u3002
-\u53EF\u7528\u4ED3\u5E93\u6E05\u5355\uFF1A
-${multiRepoList}
-
-` : "";
-  let repoHint = "";
-  const repoRefs = Array.isArray(detail.contextSnapshot?.repoRefs) ? detail.contextSnapshot.repoRefs : [];
-  if (repoRefs.length > 0) {
-    const list = repoRefs.map((r) => r.repoFullName).filter(Boolean).join("\u3001");
-    repoHint = `\u7528\u6237 @ \u6307\u5B9A\u8BFB\u53D6\u4ED3\u5E93\uFF1A${list}\uFF08\u53EA\u8BFB\u67E5\u8BC1\uFF0C\u4E0D\u5EFA\u5206\u652F\u3001\u4E0D\u6539\u4EE3\u7801\uFF1B\u7269\u5316\u65B9\u5F0F\u89C1 \`morula-working-on-issues\` skill \xA70.5\uFF09\u3002
-
-`;
-  } else if (repo) {
-    repoHint = `${multiRepoGuide}\u53EF\u7528\u4ED3\u5E93\uFF1A${repo}\uFF08\u7A7A\u95F4\u7ED1\u5B9A\u4ED3\u5E93\uFF1B\u7269\u5316/\u5206\u652F/MR \u64CD\u4F5C\u65B9\u5F0F\u89C1 \`morula-working-on-issues\` skill \xA70.5\uFF09\u3002
-
-`;
-  } else if (repoResolution === "MULTI_REPO_AGENT_DECIDES") {
-    repoHint = `${multiRepoGuide}\u53EF\u7528\u4ED3\u5E93\uFF1A${availableRepos.map((r) => r.repoFullName).join("\u3001")}\uFF08\u4EFB\u52A1\u7A7A\u95F4\u7ED1\u5B9A\uFF1B\u7269\u5316/\u5206\u652F/MR \u64CD\u4F5C\u65B9\u5F0F\u89C1 \`morula-working-on-issues\` skill \xA70.5\uFF09\u3002
-
-`;
-  } else if (repoResolution === "REPO_SELECTION_REQUIRED") {
-    const snapCandidates = Array.isArray(detail.contextSnapshot?.repoCandidates) ? detail.contextSnapshot.repoCandidates : [];
-    const candidates = snapCandidates.length > 0 ? snapCandidates : availableRepos.map((r) => r.repoFullName).filter((n) => Boolean(n));
-    repoHint = candidates.length > 0 ? `\u7A7A\u95F4\u5173\u8054\u591A\u4E2A\u4ED3\u5E93\uFF0C\u9700\u8981\u5411\u7528\u6237\u786E\u8BA4\u8981\u64CD\u4F5C\u7684\u4ED3\u5E93\uFF08\u5019\u9009\uFF1A${candidates.join("\u3001")}\uFF09\u3002
-
-` : `\u7A7A\u95F4\u5173\u8054\u591A\u4E2A\u4ED3\u5E93\uFF0C\u9700\u8981\u5411\u7528\u6237\u786E\u8BA4\u8981\u64CD\u4F5C\u7684\u4ED3\u5E93\u3002
-
-`;
-  } else if (!repo && (repoResolution === "NO_CONNECTION" || !repoResolution)) {
-    if (availableRepos.length > 0) {
-      const list = availableRepos.map((r) => r.repoFullName).filter(Boolean).join("\u3001");
-      repoHint = `\u53EF\u7528\u4ED3\u5E93\uFF1A${list}\uFF08\u4EFB\u52A1\u7A7A\u95F4\u7ED1\u5B9A\uFF1B\u53EA\u8BFB\u67E5\u8BC1\u65B9\u5F0F\u89C1 \`morula-working-on-issues\` skill \xA70.5\uFF09\u3002
+  void repoBaseUrl;
+  const snap = detail.contextSnapshot;
+  const spaceId = typeof snap?.spaceId === "string" && snap.spaceId.trim() ? snap.spaceId.trim() : "";
+  const keysHint = `## \u57FA\u672C\u4FE1\u606F
 
-`;
-    }
-  }
+- \u4EFB\u52A1 ID\uFF08AgentTask\uFF0C\`morula task branch\` \u7B49\u547D\u4EE4\u7684 taskId \u7528\u5B83\uFF09\uFF1A\`${detail.id}\`
+${spaceId ? `- \u7A7A\u95F4 ID\uFF08\u6240\u6709 \`--space\` \u7528\u5B83\uFF09\uFF1A\`${spaceId}\`
+` : ""}`;
   const toolsHint = `## \u5DE5\u4F5C\u533A\u4E0E\u5DE5\u5177
 
-- \u5DE5\u4F5C\u76EE\u5F55 = \u4EFB\u52A1\u5DE5\u4F5C\u533A\u6839\uFF0C\u4ED3\u5E93\u662F\u5176\u4E0B\u7684\u5B50\u76EE\u5F55\uFF08\u5E03\u5C40\u4E0E\u7269\u5316/\u5206\u652F/MR \u64CD\u4F5C\u65B9\u5F0F\u89C1 \`morula-working-on-issues\` skill \xA70.5\uFF09\uFF1B
+- \u5DE5\u4F5C\u76EE\u5F55 = \u4EFB\u52A1\u5DE5\u4F5C\u533A\u6839\uFF08cwd\uFF09\uFF1B\u4ED3\u5E93\u662F\u5B83\u4E0B\u9762\u7684\u5B50\u76EE\u5F55\uFF08\u5E03\u5C40 / \u7269\u5316 / \u5206\u652F / MR \u7528\u6CD5\u89C1 \`morula-working-on-issues\` skill \xA70.5\uFF09\uFF1B
 - \u5E73\u53F0\u4EA4\u4E92\u5951\u7EA6\u4E0E\u547D\u4EE4\u7528\u6CD5\uFF1A\`morula-working-on-issues\` skill\uFF08\u5DF2\u6CE8\u5165 \`.agents/skills/\`\uFF09\uFF0C\u6309\u9700\u8BFB\u53D6\uFF1B
-- \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
+- \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\uFF1B
+- \u7A7A\u95F4\u4ED3\u5E93\u6E05\u5355\uFF08\u591A\u4ED3\u5E93\u4EFB\u52A1\uFF09\uFF1A\`morula repo list --space <spaceId>\`\uFF08spaceId \u89C1\u4E0A\u300C\u57FA\u672C\u4FE1\u606F\u300D\u6BB5\uFF09\u3002
 
 `;
   const taskSource = detail.contextSnapshot?.source;
@@ -9019,19 +10748,12 @@ ${multiRepoList}
   const stageContractBlock = stageContract ? `${stageContract}
 
 ` : "";
-  const snapCtx = detail.contextSnapshot;
-  let extraHint = "";
-  if (snapCtx?.triggerSource === "comment_mention" && snapCtx.commentId) {
-    extraHint += `\u672C\u4EFB\u52A1\u7531\u8BC4\u8BBA\u89E6\u53D1\uFF08\u6700\u7EC8\u603B\u7ED3\u7531\u670D\u52A1\u7AEF\u81EA\u52A8\u4F5C\u4E3A\u8BE5\u89E6\u53D1\u8BC4\u8BBA\u7684\u56DE\u590D\u53D1\u51FA\uFF0C\u65E0\u9700\u81EA\u884C\u8BC4\u8BBA\uFF09\u3002
-
-`;
-  }
-  if (snapCtx?.handoffNote && typeof snapCtx.handoffNote === "string" && snapCtx.handoffNote.trim()) {
-    extraHint += `\u6307\u6D3E\u4EA4\u4ED8\u8981\u6C42\uFF08\u7528\u6237\u663E\u5F0F\u6307\u5B9A\uFF0C\u5FC5\u987B\u6EE1\u8DB3\uFF09\uFF1A**${snapCtx.handoffNote.trim()}**
+  const handoff = typeof snap?.handoffNote === "string" ? snap.handoffNote.trim() : "";
+  const extraHint = handoff ? `\u6307\u6D3E\u4EA4\u4ED8\u8981\u6C42\uFF08\u7528\u6237\u663E\u5F0F\u6307\u5B9A\uFF0C\u5FC5\u987B\u6EE1\u8DB3\uFF09\uFF1A**${handoff}**
 
-`;
-  }
-  const head = `${stageContractBlock}${toolsHint}${repoHint}${extraHint}`;
+` : "";
+  const head = `${stageContractBlock}${keysHint}
+${toolsHint}${extraHint}`;
   return head ? `${head}========== \u4F60\u7684\u76EE\u6807 ==========
 ${prompt}` : `${prompt}`;
 }
@@ -9044,7 +10766,7 @@ async function reportRepoTargets(taskId, targets, env, ops) {
 }
 async function reportOneRepoTarget(taskId, target, env, ops) {
   const execEnv = mergeExecEnv(env);
-  if (!existsSync15(target.dir) || !existsSync15(join18(target.dir, ".git"))) {
+  if (!existsSync15(target.dir) || !existsSync15(join20(target.dir, ".git"))) {
     ops.log(`[daemon] \u4EFB\u52A1 ${taskId} \u4ED3\u5E93 ${target.repoFullName} \u4EA4\u4ED8\u8DF3\u8FC7\uFF1A\u5DE5\u4F5C\u76EE\u5F55\u5DF2\u4E0D\u5B58\u5728\uFF08cleanup/\u5206\u652F\u6539\u540D\u65F6\u5E8F\uFF09`);
     return;
   }
@@ -9213,8 +10935,8 @@ Task ref: ${taskCode}\uFF08\u7531 morula \u81EA\u52A8\u8865\u5145\uFF0C\u7528\u4
 // src/commands/doctor.ts
 init_dist2();
 import { existsSync as existsSync16, readFileSync as readFileSync10, realpathSync } from "node:fs";
-import { homedir as homedir11 } from "node:os";
-import { dirname as dirname8, join as join19 } from "node:path";
+import { homedir as homedir12 } from "node:os";
+import { dirname as dirname9, join as join21 } from "node:path";
 init_daemon_config();
 init_daemon_lock();
 init_dim_locate();
@@ -9234,10 +10956,10 @@ async function doctorCommand(context) {
 async function collectDoctor(context, probe) {
   const checks = [];
   const env = context.env;
-  const configDir = env.MORULA_CONFIG_DIR ?? join19(homedir11(), ".morula-cli");
-  const configPath = env.MORULA_CONFIG ?? join19(configDir, "config.yaml");
-  const daemonPath = join19(dirname8(configPath), "daemon");
-  const logFile = join19(daemonPath, "daemon.log");
+  const configDir = env.MORULA_CONFIG_DIR ?? join21(homedir12(), ".morula-cli");
+  const configPath = env.MORULA_CONFIG ?? join21(configDir, "config.yaml");
+  const daemonPath = join21(dirname9(configPath), "daemon");
+  const logFile = join21(daemonPath, "daemon.log");
   const contextName = context.runtime.context ?? null;
   const baseUrl = context.runtime.baseUrl ?? null;
   const tokenPresent = Boolean(context.runtime.token);
@@ -9251,12 +10973,11 @@ async function collectDoctor(context, probe) {
       configReadable = false;
     }
   }
-  const lockPath = join19(daemonPath, DAEMON_LOCK_FILE);
+  const lockPath = join21(daemonPath, DAEMON_LOCK_FILE);
   const lock = probeDaemonLock(lockPath);
-  const pidFile = join19(daemonPath, "daemon.pid");
-  const filePid = existsSync16(pidFile) ? Number(readFileSync10(pidFile, "utf8").trim() || 0) : 0;
-  const lockPid = lock.state === "active" ? lock.record.pid : 0;
-  const daemonPid = lockPid || (isProcessAlive(filePid) ? filePid : 0) || null;
+  const pidFile = join21(daemonPath, DAEMON_PID_FILE);
+  const filePid = readPidFile(pidFile);
+  const daemonPid = probeDaemonInstance(configDir).pid;
   const cfg = loadDaemonConfig(context.store);
   const dim = safeResolveDim();
   const dimPath = dim.path;
@@ -9424,12 +11145,12 @@ function detectInstallMode() {
 
 // src/commands/daemon.ts
 function configFilePath(env) {
-  return env.MORULA_CONFIG ?? join20(env.MORULA_CONFIG_DIR ?? join20(homedir12(), ".morula-cli"), "config.yaml");
+  return env.MORULA_CONFIG ?? join22(env.MORULA_CONFIG_DIR ?? join22(homedir13(), ".morula-cli"), "config.yaml");
 }
 function daemonDir(configPath) {
-  return join20(dirname9(configPath), "daemon");
+  return join22(dirname10(configPath), "daemon");
 }
-var PID_FILE = "daemon.pid";
+var PID_FILE = DAEMON_PID_FILE;
 var LOG_FILE = "daemon.log";
 async function daemonCommand(context) {
   const { action } = context.parsed;
@@ -9621,8 +11342,8 @@ async function run2(context) {
     saveDaemonConfig(context.store, { name, workdir, maxConcurrent });
   }
   const resolvedWorkdir = workdir ?? loadDaemonConfig(context.store)?.workdir ?? DEFAULT_WORKDIR;
-  mkdirSync12(resolvedWorkdir, { recursive: true });
-  const lockPath = join20(daemonDir(configFilePath(context.env)), DAEMON_LOCK_FILE);
+  mkdirSync14(resolvedWorkdir, { recursive: true });
+  const lockPath = join22(daemonDir(configFilePath(context.env)), DAEMON_LOCK_FILE);
   const acquired = acquireDaemonLock(lockPath, { workdir: resolvedWorkdir });
   if (!acquired.ok) {
     const pid = acquired.existing?.pid;
@@ -9696,10 +11417,10 @@ async function start(context) {
   }
   const dir = daemonDir(configFilePath(context.env));
   if (!dryRun)
-    mkdirSync12(dir, { recursive: true, mode: 448 });
-  const pidFile = join20(dir, PID_FILE);
-  const logFile = join20(dir, LOG_FILE);
-  const lockPath = join20(dir, DAEMON_LOCK_FILE);
+    mkdirSync14(dir, { recursive: true, mode: 448 });
+  const pidFile = join22(dir, PID_FILE);
+  const logFile = join22(dir, LOG_FILE);
+  const lockPath = join22(dir, DAEMON_LOCK_FILE);
   const lock = probeDaemonLock(lockPath);
   if (lock.state === "active") {
     throw new CliError(
@@ -9718,7 +11439,7 @@ async function start(context) {
       });
     }
     if (!dryRun)
-      rmSync8(pidFile, { force: true });
+      rmSync10(pidFile, { force: true });
   }
   const env = {
     ...process.env,
@@ -9756,12 +11477,12 @@ async function start(context) {
   const { spawnDaemonProcess: spawnDaemonProcess2 } = await Promise.resolve().then(() => (init_spawn(), spawn_exports));
   const result = spawnDaemonProcess2({ logFile, env });
   if (result.error || result.pid <= 0) {
-    rmSync8(pidFile, { force: true });
+    rmSync10(pidFile, { force: true });
     throw new CliError("DAEMON_START_FAILED", EXIT.OTHER, `[daemon] \u542F\u52A8\u5931\u8D25: ${result.error ?? `pid=${result.pid}`}`, false, {
       hint: `tail -n 50 ${logFile}`
     });
   }
-  writeFileSync10(pidFile, String(result.pid), { mode: 384 });
+  writeFileSync12(pidFile, String(result.pid), { mode: 384 });
   context.err(`[daemon] \u5DF2\u540E\u53F0\u542F\u52A8\uFF08pid=${result.pid}\uFF09\uFF0C\u65E5\u5FD7: ${logFile}`);
   return { running: true, pid: result.pid, logFile, lockFile: lockPath };
 }
@@ -9769,8 +11490,8 @@ async function stop(context) {
   rejectUnknownFlags(context.parsed.flags, ["dry-run"]);
   const dryRun = isDryRun(context);
   const dir = daemonDir(configFilePath(context.env));
-  const pidFile = join20(dir, PID_FILE);
-  const lockPath = join20(dir, DAEMON_LOCK_FILE);
+  const pidFile = join22(dir, PID_FILE);
+  const lockPath = join22(dir, DAEMON_LOCK_FILE);
   const lock = probeDaemonLock(lockPath);
   const lockPid = lock.state === "absent" ? null : lock.record?.pid ?? null;
   const filePid = existsSync17(pidFile) ? Number(readFileSync11(pidFile, "utf8").trim()) : null;
@@ -9783,7 +11504,7 @@ async function stop(context) {
     };
   }
   if (!pid) {
-    rmSync8(pidFile, { force: true });
+    rmSync10(pidFile, { force: true });
     releaseDaemonLock(lockPath);
     return { running: false, message: "daemon \u672A\u5728\u8FD0\u884C\uFF08\u65E0\u5B58\u6D3B pid\uFF09" };
   }
@@ -9792,7 +11513,7 @@ async function stop(context) {
     releaseDaemonLock(lockPath);
   else
     releaseDaemonLock(lockPath, pid);
-  rmSync8(pidFile, { force: true });
+  rmSync10(pidFile, { force: true });
   if (result.outcome === "killed")
     context.err(`[daemon] pid=${pid} \u672A\u54CD\u5E94 SIGTERM\uFF0C\u5DF2 SIGKILL\uFF08\u9501\u5DF2\u91CA\u653E\uFF09`);
   return { running: false, stoppedPid: pid, outcome: result.outcome };
@@ -9801,21 +11522,17 @@ async function status2(context) {
   rejectUnknownFlags(context.parsed.flags, []);
   const cfg = loadDaemonConfig(context.store);
   const dir = daemonDir(configFilePath(context.env));
-  const pidFile = join20(dir, PID_FILE);
-  const lockPath = join20(dir, DAEMON_LOCK_FILE);
-  const lock = probeDaemonLock(lockPath);
-  const lockPid = lock.state === "active" ? lock.record.pid : null;
-  const filePid = existsSync17(pidFile) ? Number(readFileSync11(pidFile, "utf8").trim() || 0) : 0;
-  const pid = lockPid ?? (isProcessAlive(filePid) ? filePid : null);
+  const lockPath = join22(dir, DAEMON_LOCK_FILE);
+  const probe = probeDaemonInstance(dirname10(configFilePath(context.env)));
   return {
-    running: pid !== null,
-    pid,
+    running: probe.running,
+    pid: probe.pid,
     daemonId: cfg?.daemonId ?? null,
     runtimeId: cfg?.runtimeId ?? null,
     name: cfg?.name ?? null,
     workdir: cfg?.workdir ?? DEFAULT_WORKDIR,
     maxConcurrent: cfg?.maxConcurrent ?? DEFAULT_MAX_CONCURRENT,
-    logFile: join20(dir, LOG_FILE),
+    logFile: join22(dir, LOG_FILE),
     lockFile: lockPath
   };
 }
@@ -9843,95 +11560,6 @@ function parseMaxConcurrent(context) {
 
 // src/commands/setup.ts
 init_dist2();
-
-// src/daemon/plugin-register.ts
-import { chmodSync as chmodSync3, cpSync, existsSync as existsSync18, mkdirSync as mkdirSync13, readdirSync as readdirSync5, readFileSync as readFileSync12, rmSync as rmSync9, statSync as statSync4, writeFileSync as writeFileSync11 } from "node:fs";
-import { homedir as homedir13 } from "node:os";
-import { dirname as dirname10, join as join21 } from "node:path";
-import { fileURLToPath as fileURLToPath2 } from "node:url";
-var PLUGIN_NAME = "morula-cli";
-var MANIFEST_DIR_NAME = ".codex-plugin";
-function legacyAgentsPluginDir(home = homedir13()) {
-  return join21(home, ".agents", "plugins", PLUGIN_NAME);
-}
-function resolveDimcodeHome(env = process.env, home = homedir13()) {
-  const fromEnv = env.DIMCODE_HOME?.trim();
-  return fromEnv || join21(home, ".dimcode", "v2");
-}
-function defaultPluginsRoot(env = process.env, home = homedir13()) {
-  return join21(resolveDimcodeHome(env, home), "plugins");
-}
-function resolvePackagePaths(entryUrl) {
-  const distDir = dirname10(fileURLToPath2(entryUrl));
-  return {
-    packageRoot: dirname10(distDir),
-    distDir,
-    assetsDir: join21(distDir, "plugin")
-  };
-}
-function buildLauncherScript(opts) {
-  const entry = join21(opts.packageRoot, "dist", "morula.js");
-  return `#!/bin/sh
-# Morula \u4E1A\u52A1 CLI \u542F\u52A8\u5668\uFF08\u7531 \`morula-runtime setup\` \u751F\u6210\uFF1BNode \u5347\u7EA7\u540E\u91CD\u8DD1 setup \u5237\u65B0\uFF09\u3002
-# \u4E0D\u4F9D\u8D56\u8C03\u7528\u65B9 PATH \u91CC\u7684 node\uFF08agent \u6267\u884C\u73AF\u5883 PATH \u5E38\u88AB\u88C1\u526A\uFF09\uFF0C\u4EC5\u4F5C\u515C\u5E95\u3002
-NODE=${JSON.stringify(opts.nodePath)}
-[ -x "$NODE" ] || NODE="$(command -v node 2>/dev/null || true)"
-if [ -z "$NODE" ]; then
-  echo '{"code":"ERROR","message":"node not found; reinstall or re-run: morula-runtime setup"}' >&2
-  exit 127
-fi
-exec "$NODE" ${JSON.stringify(entry)} "$@"
-`;
-}
-function assetsReady(paths) {
-  return existsSync18(join21(paths.assetsDir, "plugin.json")) && existsSync18(join21(paths.assetsDir, "skills"));
-}
-function listSkillNames(assetsDir) {
-  const dir = join21(assetsDir, "skills");
-  if (!existsSync18(dir))
-    return [];
-  return readdirSync5(dir).filter((name) => {
-    try {
-      return statSync4(join21(dir, name)).isDirectory();
-    } catch {
-      return false;
-    }
-  }).sort();
-}
-function registerPlugin(opts) {
-  const { pluginsRoot, paths, version } = opts;
-  const nodePath = opts.nodePath ?? process.execPath;
-  const pluginDir = join21(pluginsRoot, PLUGIN_NAME);
-  if (!assetsReady(paths))
-    throw new Error(`plugin assets not found at ${paths.assetsDir}; run \`pnpm run build:dist\` (dev) or reinstall the package`);
-  const skillsSrc = join21(paths.assetsDir, "skills");
-  const skills = listSkillNames(paths.assetsDir);
-  const manifestDir = join21(pluginDir, MANIFEST_DIR_NAME);
-  mkdirSync13(manifestDir, { recursive: true });
-  const manifest = JSON.parse(readFileSync12(join21(paths.assetsDir, "plugin.json"), "utf8"));
-  writeFileSync11(join21(manifestDir, "plugin.json"), `${JSON.stringify({ ...manifest, version }, null, 2)}
-`);
-  const skillsDest = join21(pluginDir, "skills");
-  rmSync9(skillsDest, { recursive: true, force: true });
-  mkdirSync13(skillsDest, { recursive: true });
-  cpSync(skillsSrc, skillsDest, { recursive: true });
-  const binDir = join21(pluginDir, "bin");
-  mkdirSync13(binDir, { recursive: true });
-  const binPath = join21(binDir, "morula");
-  writeFileSync11(binPath, buildLauncherScript({ nodePath, packageRoot: paths.packageRoot }));
-  chmodSync3(binPath, 493);
-  const legacy = legacyAgentsPluginDir(opts.home);
-  return {
-    pluginDir,
-    binPath,
-    skills,
-    version,
-    node: nodePath,
-    legacyDir: existsSync18(join21(legacy, MANIFEST_DIR_NAME)) ? legacy : null
-  };
-}
-
-// src/commands/setup.ts
 var KNOWN_FLAGS = ["root", "help"];
 async function setupCommand(context) {
   rejectUnknownFlags(context.parsed.flags, KNOWN_FLAGS);