@arcships/morula-runtime 0.1.0-alpha.13 → 0.1.0-alpha.14

package/dist/index.js

@@ -740,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 = "20260922161603.81b6d5a6";
+    BUILD_ID = "20260923140226.31d77ab2";
     BUILD_CONTEXTS = {
       "local": "http://localhost:8080/api",
       "test": "https://morula.basecastle.com/api",
@@ -4424,7 +4424,7 @@ init_dist2();
 init_dist2();
 
 // src/build-env.ts
-var BUILD_VERSION2 = "0.1.0-alpha.13";
+var BUILD_VERSION2 = "0.1.0-alpha.14";
 
 // src/commands/daemon.ts
 init_dist();
@@ -8677,7 +8677,6 @@ var SessionHost = class {
       env,
       turnNo: 0,
       promptInFlight: null,
-      cancelRequested: false,
       // resume 成功 → dim 会话里已有上一进程注入的管家指令，不重复前置
       instructed: resumed,
       appliedConfig: { ...appliedConfig, permission },
@@ -8710,7 +8709,6 @@ var SessionHost = class {
     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();
@@ -8906,12 +8904,16 @@ ${fileRefs.join("\n")}` : text }];
     }
     return { blocks, fileRefs };
   }
-  /** 取消当前回合（ACP session/cancel；会话保持打开——长驻语义） */
+  /**
+   * 取消当前回合（ACP `session/cancel` 通知；会话保持打开——长驻语义）。
+   *
+   * **软中断**：dim 在安全点（step 之间）生效，不是硬杀进程；daemon 只负责把通知发出去，
+   * 本轮的终态仍由 ACP `session/prompt` 响应驱动（`cancelled` → `turn_completed`）。
+   */
   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 };
@@ -10107,16 +10109,25 @@ var DaemonRunner = class {
   /**
    * 会话宿主命令分发。
    *
-   * 两道闸：
+   * 三道闸：
    * ① **runtimeId + daemonId 自过滤**（tenant 广播 → 只有归属设备处理；字段缺失时不过滤，兼容旧服务端）。
    *    daemonId 是**实例**维度（issues/duplicate-daemon-same-runtime-double-execution.md）：同机多实例
    *    注册时会复用同一行 AgentRuntime（同一 runtimeId），缺了它两个实例会各自 `open` 同一 sessionId
    *    并各跑一轮 prompt（实测：同一轮两份正文事件、两个 daemon 都「会话已打开」）；
-   * ② **按会话串行**：服务端每轮 prompt 前会补发 `open` 做兜底，而 socket.io 只保证「送达有序」，
-   *    不保证「异步处理有序」——`void handleSessionCommand()` 会让 open/prompt 交错执行，
-   *    prompt 可能先于 open 完成而拿到 SESSION_NOT_OPEN。故按 sessionId 串成一条 promise 链。
+   * ② **按会话串行**（open / prompt / config）：服务端每轮 prompt 前会补发 `open` 做兜底，而 socket.io
+   *    只保证「送达有序」，不保证「异步处理有序」——`void handleSessionCommand()` 会让 open/prompt
+   *    交错执行，prompt 可能先于 open 完成而拿到 SESSION_NOT_OPEN。故按 sessionId 串成一条 promise 链。
+   * ③ **抢占类命令（cancel / close）不进链**：`prompt` 的 promise 直到本轮 `end_turn` 才 resolve
+   *    （`session-host.prompt()` await 的是 ACP `session/prompt` 响应），排在它后面 = 取消永远发生在
+   *    回合结束之后，用户看到的是「点了停止但没停」（issues/steward-session-cancel-queued-behind-prompt.md）。
+   *    它们只等该会话的 **open 门**——open 未完成时会话还不存在，取消只会拿到 SESSION_NOT_OPEN。
    */
   sessionCommandChains = /* @__PURE__ */ new Map();
+  /**
+   * 各会话**在飞 `open` 命令**的完成信号（抢占类命令的唯一前置门）。
+   * 只在 open 入链时登记，open 落定即清理——它表达的是「会话在设备上就绪」，与后续 prompt 无关。
+   */
+  sessionOpenGates = /* @__PURE__ */ new Map();
   handleSessionCommand(kind, payload) {
     const runtimeId = typeof payload.runtimeId === "string" ? payload.runtimeId : void 0;
     if (runtimeId && this.runtimeId && runtimeId !== this.runtimeId)
@@ -10129,15 +10140,25 @@ var DaemonRunner = class {
       this.log(`[daemon] \u4F1A\u8BDD\u547D\u4EE4 ${kind} \u7F3A\u5C11 sessionId\uFF08\u5FFD\u7565\uFF09`);
       return Promise.resolve();
     }
+    const logFailure = (err) => {
+      this.log(`[daemon] \u4F1A\u8BDD\u547D\u4EE4 ${kind} \u6267\u884C\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`);
+    };
+    if (kind === "cancel" || kind === "close") {
+      const gate = this.sessionOpenGates.get(sessionId) ?? Promise.resolve();
+      return gate.catch(() => {
+      }).then(() => this.runSessionCommand(kind, payload)).catch(logFailure);
+    }
     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)}`);
-    });
+    }).then(() => this.runSessionCommand(kind, payload)).catch(logFailure);
     this.sessionCommandChains.set(sessionId, next);
+    if (kind === "open")
+      this.sessionOpenGates.set(sessionId, next);
     void next.finally(() => {
       if (this.sessionCommandChains.get(sessionId) === next)
         this.sessionCommandChains.delete(sessionId);
+      if (this.sessionOpenGates.get(sessionId) === next)
+        this.sessionOpenGates.delete(sessionId);
     });
     return next;
   }
@@ -10153,9 +10174,13 @@ var DaemonRunner = class {
         await host.open(payload);
       else if (kind === "prompt")
         await host.prompt(payload);
-      else if (kind === "cancel")
-        host.cancel(payload);
-      else if (kind === "config")
+      else if (kind === "cancel") {
+        const res = host.cancel(payload);
+        if (res.ok)
+          this.log(`[daemon] \u4F1A\u8BDD ${String(payload.sessionId ?? "")} \u53D6\u6D88\u5DF2\u4E0B\u53D1\uFF08ACP session/cancel\uFF09`);
+        else
+          this.log(`[daemon] \u4F1A\u8BDD ${String(payload.sessionId ?? "")} \u53D6\u6D88\u5931\u8D25: ${res.error ?? "UNKNOWN"}`);
+      } else if (kind === "config")
         await host.config(payload);
       else if (kind === "close")
         await host.close(payload);

package/dist/morula.js

@@ -704,8 +704,8 @@ function page(ok, message) {
 }
 
 // ../morula-cli-core/dist/build-env.js
-var BUILD_VERSION = "0.1.0-alpha.13";
-var BUILD_ID = "20260922161603.81b6d5a6";
+var BUILD_VERSION = "0.1.0-alpha.14";
+var BUILD_ID = "20260923140226.31d77ab2";
 var BUILD_CONTEXTS = {
   "local": "http://localhost:8080/api",
   "test": "https://morula.basecastle.com/api",

package/dist/plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "morula-cli",
-  "version": "0.1.0-alpha.13",
+  "version": "0.1.0-alpha.14",
   "description": "Use Morula CLI task management from DimCode.",
   "interface": {
     "displayName": "Morula CLI",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@arcships/morula-runtime",
   "type": "module",
-  "version": "0.1.0-alpha.13",
+  "version": "0.1.0-alpha.14",
   "description": "Device-level CLI for the Morula local agent runtime (daemon/portal/models/auth) and the Morula business CLI (morula), distributed via npm",
   "bin": {
     "morula-runtime": "./bin/morula-runtime.js",