oasis_test 0.1.36 → 0.1.37

package/dist/index.js

@@ -184,6 +184,7 @@ function fold(model, op) {
         anchor: { target: op.target, ...p2.anchorSpan !== void 0 ? { span: p2.anchorSpan } : {} },
         author: op.actor,
         body: p2.body,
+        ...p2.attachments !== void 0 && p2.attachments.length > 0 ? { attachments: p2.attachments.map((a) => ({ ...a })) } : {},
         state: "open",
         kind: p2.kind ?? defaultKind,
         stagedResolution: null,
@@ -1858,17 +1859,17 @@ var init_kernel = __esm({
         const artifact = this.artifactOrThrow(args.artifactId);
         this.enforceAcl("propose", this.schema.get(artifact.type), args.actor, artifact.owner);
         const proposingPart = args.part ?? null;
-        if (unresolvedGapsOf(this.model, args.artifactId).some((g2) => g2.part === proposingPart)) {
+        if (proposingPart !== null && unresolvedGapsOf(this.model, args.artifactId).some((g2) => g2.part === proposingPart)) {
           throw new KernelError(
-            `${args.artifactId}${args.part ? `/${args.part}` : ""} \u6709\u672A\u89E3\u6790\u7684 gap\uFF0C\u4E0D\u80FD propose\u2014\u2014\u524D\u7F6E\u5C31\u7EEA\u4F1A\u91CD\u65B0\u5524\u8D77\u4F60\u7EED\u505A\uFF08\u7EBF2 #1\uFF1A\u63D0 gap \u7684\u5DE5\u4F5C\u9879\u4FDD\u6301 pending\uFF09\u3002`
+            `\u5931\u8D25\uFF1A\u8FD9\u4E2A\u90E8\u4EF6\uFF08${args.part}\uFF09\u8FD8\u6709\u672A\u89E3\u51B3\u7684 gap\uFF0C\u4E0D\u80FD\u63D0\u4EA4\u3002\u53EF\u4EE5\u76F4\u63A5\u6536\u5DE5\u2014\u2014gap \u6709\u7ED3\u679C\u540E\u7CFB\u7EDF\u4F1A\u91CD\u65B0\u5524\u8D77\u4F60\u7EED\u505A\uFF0C\u4E0D\u7528\u7B49\u5728\u8FD9\u91CC\u3002`
           );
         }
-        const proposingHasOpenBackpressure = [...this.model.annotations.values()].some(
+        const proposingHasOpenBackpressure = proposingPart !== null && [...this.model.annotations.values()].some(
           (a) => a.raisedFrom === args.artifactId && a.state === "open" && a.raisedFromPart === proposingPart
         );
         if (proposingHasOpenBackpressure) {
           throw new KernelError(
-            `${args.artifactId}${args.part ? `/${args.part}` : ""} \u6709\u672A\u7B54\u590D\u7684\u56DE\u538B annotation\uFF0C\u4E0D\u80FD propose\u2014\u2014\u7B49\u4E0A\u6E38\u56DE\u5E94\u540E\u7531\u6D3E\u53D1\u5668\u91CD\u6D3E\u4F60\u7EED\u505A\uFF08\u7EBF2 #1\uFF1A\u63D0\u56DE\u538B\u7684\u5DE5\u4F5C\u9879\u4FDD\u6301 pending\uFF09\u3002`
+            `\u5931\u8D25\uFF1A\u8FD9\u4E2A\u90E8\u4EF6\uFF08${args.part}\uFF09\u8FD8\u6709\u672A\u7B54\u590D\u7684\u56DE\u538B\uFF08\u4F60\u5411\u4E0A\u6E38\u63D0\u7684\u7591\u95EE\u8FD8\u6CA1\u56DE\uFF09\uFF0C\u4E0D\u80FD\u63D0\u4EA4\u3002\u53EF\u4EE5\u76F4\u63A5\u6536\u5DE5\u2014\u2014\u4E0A\u6E38\u7B54\u590D\u540E\u7CFB\u7EDF\u4F1A\u91CD\u65B0\u5524\u8D77\u4F60\u7EED\u505A\u3002`
           );
         }
         const base = args.base === void 0 ? artifact.currentRev : args.base;
@@ -1892,6 +1893,14 @@ var init_kernel = __esm({
               `part "${args.part}" \u4E0D\u662F ${args.artifactId} \u58F0\u660E\u7684\u90E8\u4EF6\uFF08\u6709\uFF1A${(artifact.parts ?? []).map((p2) => p2.name).join("\u3001") || "\u65E0"}\uFF09`
             );
           }
+          const alreadyProduced = revisionsOf(this.model, args.artifactId).some(
+            (r) => r.part === args.part && r.state !== "rejected"
+          );
+          if (alreadyProduced) {
+            throw new KernelError(
+              `\u5931\u8D25\uFF1A\u8FD9\u4E2A\u90E8\u4EF6\uFF08${args.part}\uFF09\u5DF2\u7ECF\u63D0\u4EA4\u8FC7\u4E00\u7248\u4E86\u2014\u2014\u4E00\u90E8\u4EF6\u4E00\u7248\u3001\u4EA4\u4E86\u5373\u7EC8\u7ED3\uFF0C\u4E0D\u80FD\u518D\u4EA4\u3002\u53EF\u4EE5\u76F4\u63A5\u6536\u5DE5\u3002`
+            );
+          }
         }
         if (args.rebasedFrom !== void 0) {
           const old = this.model.revisions.get(args.rebasedFrom);
@@ -2081,6 +2090,12 @@ var init_kernel = __esm({
             `\u8FD8\u6709\u672A\u7B54\u590D\u7684\u56DE\u538B annotation\uFF08\u81EA\u63D0 ${openSelfAnno.length} \u6761\uFF09\uFF0C\u4E0D\u80FD conclude\u2014\u2014\u7B49\u4E0A\u6E38\u56DE\u5E94\u3001\u90A3\u6761 revision \u7EED\u5B8C\u518D\u6536\u53E3\uFF08\u7EBF2 \u2462\uFF09`
           );
         }
+        const openReceived = openBackpressureOf(this.model, args.artifactId);
+        if (openReceived.length > 0) {
+          throw new KernelError(
+            `\u5931\u8D25\uFF1A\u8FD8\u6709 ${openReceived.length} \u6761\u4E0B\u6E38\u56DE\u538B\u6CA1\u7B54\u590D\uFF08\u4E0B\u6E38\u660E\u786E\u6253\u56DE\u4E86\u5F53\u524D\u7248\u672C\uFF09\uFF0C\u4E0D\u80FD conclude\u2014\u2014\u5148\u6309\u56DE\u538B\u6539\u5185\u5BB9\u3001resolve \u56DE\u5E94\u4E0B\u6E38\uFF0C\u518D\u6536\u53E3\uFF08\u4E24\u5C42\u9501\u70B9 \xA76.3\uFF09\u3002`
+          );
+        }
         const unproduced = (artifact.parts ?? []).filter(
           (p2) => !revisionsOf(this.model, args.artifactId).some((r) => r.part === p2.name && r.state !== "rejected")
         );
@@ -2262,6 +2277,7 @@ var init_kernel = __esm({
         const payload = {
           annotationId,
           body: args.body,
+          ...args.attachments !== void 0 && args.attachments.length > 0 ? { attachments: args.attachments } : {},
           // 信箱语义（v3.1 ①a）：命令层一律盖章——新批注都是"寄给 owner 的信"；存量旧 op 无此字段不参与唤醒
           mail: true,
           ...args.span !== void 0 ? { anchorSpan: args.span } : {},
@@ -2577,7 +2593,7 @@ var init_kernel = __esm({
        * 派生里程碑带 forced(by, reason)，消费者可见。
        */
       async forceConclude(args) {
-        this.bounceHeadMovers(args.artifactId);
+        this.bounceHeadMovers(args.artifactId, { allowPendingGate: true });
         this.ensureActive(args.artifactId);
         const artifact = this.artifactOrThrow(args.artifactId);
         if (artifact.currentRev === null) {
@@ -3029,10 +3045,10 @@ ${res.candidates.map((c) => `  - ${c.type}:${c.title ?? "(\u65E0title)"} \u2192
         return this.blobs;
       }
       /** 推进 head / 改变队列结局的命令：两档冻结都拦；收尾 gate 待审中 = 派生的 merge 档冻结（§5.7）。 */
-      bounceHeadMovers(artifactId) {
+      bounceHeadMovers(artifactId, opts) {
         const scope = this.frozen.get(artifactId);
         if (scope) throw new FrozenError(artifactId, scope);
-        if (pendingConcludeAttempt(this.model, artifactId)) throw new FrozenError(artifactId, "merge");
+        if (!opts?.allowPendingGate && pendingConcludeAttempt(this.model, artifactId)) throw new FrozenError(artifactId, "merge");
       }
       /** propose（emit）类：只有 write 档（§11.7 干预）才拦——merge 档下照常入队。 */
       bounceWrites(artifactId) {
@@ -3757,31 +3773,6 @@ function partHasOpenBackpressure(model, id, part) {
 function partProduced(model, artifactId, part) {
   return revisionsOf(model, artifactId).some((r) => r.part === part && r.state !== "rejected");
 }
-function partLastRevSeq(model, artifactId, part) {
-  let max = null;
-  for (const r of revisionsOf(model, artifactId)) {
-    if (r.part !== part || r.state === "rejected") continue;
-    const seq = model.proposeSeq.get(r.id);
-    if (seq !== void 0 && (max === null || seq > max)) max = seq;
-  }
-  return max;
-}
-function partReworkNeeded(model, artifactId, part) {
-  const mySeq = partLastRevSeq(model, artifactId, part);
-  if (mySeq === null) return false;
-  for (const a of pendingBackpressureResponsesOf(model, artifactId)) {
-    if (a.raisedFromPart === part) return true;
-  }
-  for (const g2 of model.gaps.get(artifactId) ?? []) {
-    if (g2.part === part && g2.resolved && g2.resolvedAtSeq !== void 0 && g2.resolvedAtSeq > mySeq) return true;
-  }
-  const spec = (model.artifacts.get(artifactId)?.parts ?? []).find((p2) => p2.name === part);
-  for (const dep of spec?.deps ?? []) {
-    const depSeq = partLastRevSeq(model, artifactId, dep);
-    if (depSeq !== null && depSeq > mySeq) return true;
-  }
-  return false;
-}
 function computeProduceJobs(model) {
   const out = [];
   for (const artifact of model.artifacts.values()) {
@@ -3801,7 +3792,7 @@ function computeProduceJobs(model) {
     if (partHasOpenBackpressure(model, artifact.id, null)) continue;
     for (const part of parts) {
       if (gaps.some((g2) => g2.part === part.name) || partHasOpenBackpressure(model, artifact.id, part.name)) continue;
-      if (partProduced(model, artifact.id, part.name) && !partReworkNeeded(model, artifact.id, part.name)) continue;
+      if (partProduced(model, artifact.id, part.name)) continue;
       const deps = part.deps ?? [];
       if (!deps.every((d) => partProduced(model, artifact.id, d))) continue;
       out.push({ artifactId: artifact.id, part: part.name });
@@ -3817,7 +3808,6 @@ function computeIntegrateJobs(model) {
     if (!isProducible(model, artifact.id)) continue;
     if (openBackpressureOf(model, artifact.id).length > 0) continue;
     if (!parts.every((p2) => partProduced(model, artifact.id, p2.name))) continue;
-    if (parts.some((p2) => partReworkNeeded(model, artifact.id, p2.name))) continue;
     if (queueOf(model, artifact.id).length === 0) continue;
     out.push(artifact.id);
   }
@@ -21687,6 +21677,121 @@ var init_router = __esm({
   }
 });
 
+// ../server/src/live-chat.ts
+var DEFAULT_BUFFER_MAX, DEFAULT_GRACE_MS, LiveChatRegistry;
+var init_live_chat = __esm({
+  "../server/src/live-chat.ts"() {
+    "use strict";
+    DEFAULT_BUFFER_MAX = 4e3;
+    DEFAULT_GRACE_MS = 6e4;
+    LiveChatRegistry = class {
+      turns = /* @__PURE__ */ new Map();
+      bufferMax;
+      graceMs;
+      constructor(opts = {}) {
+        this.bufferMax = opts.bufferMax ?? DEFAULT_BUFFER_MAX;
+        this.graceMs = opts.graceMs ?? DEFAULT_GRACE_MS;
+      }
+      /**
+       * 开始一轮。若该会话已有驻留的旧轮（上一轮已 done 但还在 grace 期），先清掉。
+       * 同一会话不允许两轮 running 并存——上层保证一个 chatSessionId 一次只发一轮。
+       */
+      start(chatSessionId, handle) {
+        const prev = this.turns.get(chatSessionId);
+        if (prev?.evictTimer) clearTimeout(prev.evictTimer);
+        const turn = {
+          chatSessionId,
+          runtimeSessionId: handle.runtimeSessionId,
+          ...handle.runId ? { runId: handle.runId } : {},
+          seq: 0,
+          buffer: [],
+          minBufferedSeq: 0,
+          subscribers: /* @__PURE__ */ new Set(),
+          status: "running",
+          handle
+        };
+        this.turns.set(chatSessionId, turn);
+        return {
+          runtimeSessionId: turn.runtimeSessionId,
+          emit: (part) => {
+            const withSeq = { ...part, seq: ++turn.seq };
+            turn.buffer.push(withSeq);
+            if (turn.minBufferedSeq === 0) turn.minBufferedSeq = withSeq.seq;
+            if (turn.buffer.length > this.bufferMax) {
+              const dropped = turn.buffer.splice(0, turn.buffer.length - this.bufferMax);
+              const last = dropped[dropped.length - 1];
+              if (last) turn.minBufferedSeq = last.seq + 1;
+            }
+            for (const sub of turn.subscribers) {
+              try {
+                sub(withSeq);
+              } catch {
+              }
+            }
+            return withSeq;
+          },
+          subscribe: (sub) => {
+            turn.subscribers.add(sub);
+            return () => {
+              turn.subscribers.delete(sub);
+            };
+          },
+          finish: (status) => {
+            turn.status = status;
+            turn.subscribers.clear();
+            turn.evictTimer = setTimeout(() => {
+              if (this.turns.get(chatSessionId) === turn) this.turns.delete(chatSessionId);
+            }, this.graceMs);
+            turn.evictTimer.unref?.();
+          },
+          bufferedParts: () => turn.buffer.slice()
+        };
+      }
+      /**
+       * 观众接入运行中的一轮。无该会话的 live 轮时返回 null（前端回退 getChatSessionDetail 读 DB 最终态）。
+       * 有则返回需补发的历史 part + 当前状态 + detach。live part 后续经 sub 推送。
+       */
+      attach(chatSessionId, fromSeq, sub) {
+        const turn = this.turns.get(chatSessionId);
+        if (!turn) return null;
+        const gap = turn.minBufferedSeq > 0 && fromSeq + 1 < turn.minBufferedSeq;
+        const replay = turn.buffer.filter((p2) => p2.seq > fromSeq);
+        if (turn.status === "running") {
+          turn.subscribers.add(sub);
+        }
+        return {
+          replay,
+          status: turn.status,
+          gap,
+          detach: () => {
+            turn.subscribers.delete(sub);
+          }
+        };
+      }
+      /** 显式停止：kill agent 这一轮。返回是否命中一个 live 轮。 */
+      stop(chatSessionId) {
+        const turn = this.turns.get(chatSessionId);
+        if (!turn) return false;
+        if (turn.status === "running") {
+          try {
+            turn.handle.kill();
+          } catch {
+          }
+        }
+        return true;
+      }
+      /** 该会话当前是否有一轮 running（供上层判断是否要挡并发发送）。 */
+      isRunning(chatSessionId) {
+        return this.turns.get(chatSessionId)?.status === "running";
+      }
+      /** 测试/排障用：当前驻留的会话数。 */
+      size() {
+        return this.turns.size;
+      }
+    };
+  }
+});
+
 // ../server/src/governance/workorder-drafts.ts
 var import_node_fs, WorkorderDraftStore;
 var init_workorder_drafts = __esm({
@@ -23315,6 +23420,17 @@ function truncateOutput(text) {
   return text.length > CHAT_OUTPUT_LIMIT ? `${text.slice(0, CHAT_OUTPUT_LIMIT)}
 ...[truncated]` : text;
 }
+function startStreamKeepalive(res, ms = 15e3) {
+  const timer = setInterval(() => {
+    if (res.destroyed || !res.writable) return;
+    try {
+      res.write("\n");
+    } catch {
+    }
+  }, ms);
+  timer.unref?.();
+  return () => clearInterval(timer);
+}
 function chatPartFromTrajectoryEvent(event) {
   const payload = asObj2(event.payload);
   if (event.kind === "message") {
@@ -23418,6 +23534,16 @@ function optStr(args, key) {
   if (typeof v2 !== "string") throw new Error(`\u53C2\u6570 ${key} \u5FC5\u987B\u662F\u5B57\u7B26\u4E32`);
   return v2;
 }
+function attachmentArgs(args) {
+  const raw = args["attachments"];
+  if (!Array.isArray(raw)) return void 0;
+  return raw.filter((a) => typeof a === "object" && a !== null).filter((a) => typeof a.name === "string" && (typeof a.text === "string" || typeof a.blobRef === "string")).slice(0, 5).map((a) => ({
+    name: a.name,
+    ...typeof a.text === "string" ? { text: a.text } : {},
+    ...typeof a.blobRef === "string" ? { blobRef: a.blobRef } : {},
+    ...typeof a.contentType === "string" ? { contentType: a.contentType } : {}
+  }));
+}
 function hasOpenHumanChangeRequest2(kernel, artifactId) {
   return hasOpenHumanChangeRequest(kernel.model, artifactId);
 }
@@ -23802,7 +23928,7 @@ ${acceptanceCriteria.map((c) => `- ${c}`).join("\n")}` : brief;
       });
       const parts = kernel.model.artifacts.get(artifactId)?.parts ?? [];
       let landed = false;
-      if (!holdForReview && !requiresHumanReview && qBefore === 0 && parts.length <= 1) {
+      if (!holdForReview && !requiresHumanReview && qBefore === 0 && (revision.part === void 0 || parts.length <= 1)) {
         try {
           const r = await kernel.advanceQueue(artifactId, actor);
           landed = r.landed.some((x2) => x2.id === revision.id);
@@ -23963,6 +24089,7 @@ ${acceptanceCriteria.map((c) => `- ${c}`).join("\n")}` : brief;
     }
     case "annotate": {
       const raisedFrom = optStr(args, "raisedFrom");
+      const attachments = attachmentArgs(args);
       const mentions = Array.isArray(args["mentions"]) ? args["mentions"].filter((x2) => typeof x2 === "string" && x2.startsWith("actor:")) : void 0;
       if (mentions !== void 0 && mentions.length > 0 && isAgent(actor)) {
         throw new Error("@ \u6743\u53EA\u5C5E\u4E8E\u4EBA\uFF1Aagent \u627E agent \u7528\u56DE\u538B\uFF08annotate --from\uFF09\u6216\u5199\u4FE1\u5230\u5B83\u7684\u4EA7\u7269\uFF1B\u66FF\u4EBA @ \u9700\u5728 1:1 \u4F1A\u8BDD\u4E2D\uFF08\u7F72\u540D\u4EE3\u7F72\uFF09\u3002");
@@ -23974,6 +24101,7 @@ ${acceptanceCriteria.map((c) => `- ${c}`).join("\n")}` : brief;
         ...hand !== void 0 ? { hand } : {},
         // 署名（§四）：1:1 会话中作者=对话的人，agent 手留审计
         ...mentions !== void 0 && mentions.length > 0 ? { mentions } : {},
+        ...attachments !== void 0 && attachments.length > 0 ? { attachments } : {},
         ...optStr(args, "revisionId") !== void 0 ? { revisionId: optStr(args, "revisionId") } : {},
         ...raisedFrom !== void 0 ? { raisedFrom } : {},
         ...optStr(args, "raisedFromPart") !== void 0 ? { raisedFromPart: optStr(args, "raisedFromPart") } : {},
@@ -24311,6 +24439,7 @@ async function startOasisServer(opts) {
   const resolveEngine = opts.resolveEngine ?? (async () => ({ kernel: opts.kernel, oplog: opts.oplog, blobs: opts.blobs, ...opts.registry ? { registry: opts.registry } : {} }));
   const domainRouter = new Router();
   for (const register of opts.domains ?? []) register(domainRouter);
+  const liveChat = new LiveChatRegistry();
   const httpServer = http.createServer((req, res) => {
     void (async () => {
       try {
@@ -24937,6 +25066,61 @@ async function startOasisServer(opts) {
           }
           return;
         }
+        if (req.method === "GET" && /^\/api\/chat-sessions\/[^/]+\/stream$/.test(url.pathname)) {
+          const sid = decodeURIComponent(url.pathname.split("/")[3] ?? "");
+          const cs = opts.chatSession ? await opts.chatSession.getSession(sid).catch(() => null) : null;
+          if (!cs || cs.humanActorId !== actor) {
+            res.writeHead(404, { "content-type": "application/json" }).end(JSON.stringify({ error: "CHAT_SESSION_NOT_FOUND" }));
+            return;
+          }
+          const fromSeq = Math.max(0, Number(url.searchParams.get("fromSeq") ?? "0") || 0);
+          const sub = (part) => {
+            if (res.destroyed) return;
+            res.write(`${JSON.stringify(part)}
+`);
+            if (part.type === "done") res.end();
+          };
+          const att = liveChat.attach(sid, fromSeq, sub);
+          if (!att) {
+            res.writeHead(204).end();
+            return;
+          }
+          res.writeHead(200, {
+            "content-type": "application/x-ndjson; charset=utf-8",
+            "transfer-encoding": "chunked",
+            "access-control-expose-headers": "X-Session-Id, X-Replay-Gap",
+            "x-session-id": cs.runtimeSessionId ?? "",
+            ...att.gap ? { "x-replay-gap": "1" } : {}
+          });
+          res.flushHeaders();
+          const stopKa = startStreamKeepalive(res);
+          for (const part of att.replay) {
+            if (!res.destroyed) res.write(`${JSON.stringify(part)}
+`);
+          }
+          if (att.status !== "running") {
+            att.detach();
+            stopKa();
+            res.end();
+            return;
+          }
+          res.on("close", () => {
+            stopKa();
+            att.detach();
+          });
+          return;
+        }
+        if (req.method === "POST" && /^\/api\/chat-sessions\/[^/]+\/stop$/.test(url.pathname)) {
+          const sid = decodeURIComponent(url.pathname.split("/")[3] ?? "");
+          const cs = opts.chatSession ? await opts.chatSession.getSession(sid).catch(() => null) : null;
+          if (!cs || cs.humanActorId !== actor) {
+            res.writeHead(404, { "content-type": "application/json" }).end(JSON.stringify({ error: "CHAT_SESSION_NOT_FOUND" }));
+            return;
+          }
+          const stopped = liveChat.stop(sid);
+          res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify({ stopped }));
+          return;
+        }
         if (url.pathname === "/api/chat" && req.method === "POST") {
           try {
             const body = JSON.parse(rawBody);
@@ -24982,11 +25166,14 @@ async function startOasisServer(opts) {
               }
               let assistantText = "";
               let persisted = false;
-              const streamedParts = [];
+              let live = null;
+              const localParts = [];
+              const collectedParts = () => (live ? live.bufferedParts() : localParts).filter((p2) => p2.type !== "done");
               const finalizeAssistant = async () => {
                 if (persisted || !chatStore || !persistTarget) return;
                 persisted = true;
-                if (!assistantText && !session.runId && streamedParts.length === 0) return;
+                const parts = collectedParts();
+                if (!assistantText && !session.runId && parts.length === 0) return;
                 const { randomUUID: randomUUID19 } = await import("node:crypto");
                 await chatStore.appendMessage({
                   id: randomUUID19(),
@@ -24995,7 +25182,7 @@ async function startOasisServer(opts) {
                   content: assistantText,
                   createdAt: (/* @__PURE__ */ new Date()).toISOString(),
                   ...session.runId ? { runId: session.runId } : {},
-                  ...streamedParts.length ? { parts: streamedParts } : {}
+                  ...parts.length ? { parts } : {}
                 }).catch(() => void 0);
                 await chatStore.updateSession(persistTarget.id, {
                   // 优先落 runtime-native id（codex rollout / ACP session/new 返回），让下一轮 resume
@@ -25005,21 +25192,38 @@ async function startOasisServer(opts) {
                 }).catch(() => void 0);
               };
               let finished = false;
+              let detachViewer;
+              let stopKeepalive;
               res.on("close", () => {
-                if (!finished) {
+                stopKeepalive?.();
+                if (finished) return;
+                if (live) {
+                  detachViewer?.();
+                } else {
                   void session.kill?.();
                   void finalizeAssistant();
                 }
               });
               if (typedParts) {
-                let seq = 0;
-                const writePart = (part) => {
-                  const withSeq = { ...part, seq: ++seq };
-                  if (part.type !== "done") streamedParts.push(withSeq);
-                  if (res.destroyed) return;
-                  res.write(`${JSON.stringify(withSeq)}
+                live = body.chatSessionId ? liveChat.start(body.chatSessionId, {
+                  runtimeSessionId: session.id,
+                  ...session.runId ? { runId: session.runId } : {},
+                  kill: () => {
+                    void session.kill?.();
+                  }
+                }) : null;
+                let localSeq = 0;
+                const writeToRes = (part) => {
+                  if (!res.destroyed) res.write(`${JSON.stringify(part)}
 `);
                 };
+                const emit = (part) => {
+                  if (live) return live.emit(part);
+                  const withSeq = { ...part, seq: ++localSeq };
+                  if (part.type !== "done") localParts.push(withSeq);
+                  writeToRes(withSeq);
+                  return withSeq;
+                };
                 res.writeHead(200, {
                   "content-type": "application/x-ndjson; charset=utf-8",
                   "transfer-encoding": "chunked",
@@ -25027,25 +25231,32 @@ async function startOasisServer(opts) {
                   "x-session-id": session.id,
                   ...session.runId ? { "x-run-id": session.runId } : {}
                 });
+                res.flushHeaders();
+                stopKeepalive = startStreamKeepalive(res);
+                if (live) detachViewer = live.subscribe(writeToRes);
                 let sawTextOutput = false;
                 session.onOutput((chunk) => {
                   sawTextOutput = true;
                   assistantText += chunk;
-                  writePart({ type: "text", text: chunk });
+                  emit({ type: "text", text: chunk });
                 });
                 session.onTelemetry?.((event) => {
                   if (event.kind === "message" && sawTextOutput) return;
                   const part = chatPartFromTrajectoryEvent(event);
-                  if (part) writePart(part);
+                  if (part) emit(part);
                 });
+                let errored = false;
                 try {
                   await session.done;
                 } catch (err) {
-                  writePart({ type: "error", text: err instanceof Error ? err.message : String(err) });
+                  errored = true;
+                  emit({ type: "error", text: err instanceof Error ? err.message : String(err) });
                 }
                 finished = true;
                 await finalizeAssistant();
-                writePart({ type: "done", sessionId: session.id });
+                emit({ type: "done", sessionId: session.id });
+                live?.finish(errored ? "error" : "done");
+                stopKeepalive?.();
                 res.end();
                 return;
               }
@@ -25481,6 +25692,7 @@ var init_server3 = __esm({
     init_src2();
     init_mcp2();
     init_router();
+    init_live_chat();
     init_workorder_drafts();
     init_draft_edit();
     init_workorder_detail();
@@ -37964,14 +38176,15 @@ var init_codex = __esm({
         const task = job.bundle.files["TASK.md"];
         if (!task) throw new Error("bundle \u7F3A TASK.md\uFF08\u88C5\u914D\u5668\u5951\u7EA6\uFF09");
         const prompt = job.systemPrompt ? ["# System Prompt", job.systemPrompt, "", "# Task", task].join("\n") : task;
-        const resumeArgs = job.resumeRuntimeSession && job.runtimeSessionId ? ["exec", "resume", job.runtimeSessionId] : ["exec"];
+        const isResume = Boolean(job.resumeRuntimeSession && job.runtimeSessionId);
         const args = [
-          ...resumeArgs,
+          "exec",
+          "-C",
+          dir,
+          ...isResume ? ["resume", job.runtimeSessionId] : [],
           "--json",
           "--dangerously-bypass-approvals-and-sandbox",
           "--skip-git-repo-check",
-          "-C",
-          dir,
           ...job.model ?? this.opts.model ? ["--model", job.model ?? this.opts.model] : [],
           // 打开 reasoning 摘要通道：默认 auto，让 codex 产出 reasoning item（→ thought → 前端思考块）。
           ...this.opts.reasoningSummary !== "none" ? ["-c", `model_reasoning_summary=${this.opts.reasoningSummary ?? "auto"}`] : [],
@@ -38577,6 +38790,9 @@ function parseArgsJSON(argsText) {
 function extractSessionID(result) {
   return result?.sessionId ?? "";
 }
+function extractStopReason(result) {
+  return result?.stopReason ?? "";
+}
 async function runACPSession(job, cfg) {
   const slug6 = job.artifactId.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 32);
   const binTag = path9.basename(cfg.bin).replace(/[^a-zA-Z0-9]/g, "").slice(0, 12) || "acp";
@@ -38611,8 +38827,11 @@ async function runACPSession(job, cfg) {
   let killedByUs = false;
   let actualModel;
   let capturedSessionId;
+  let usageClient;
   const finish = (info) => {
     if (exited) return;
+    const usage = info.usage ?? (usageClient ? buildUsage(usageClient.usage, estimateCost(usageClient.usage, actualModel)) : void 0);
+    if (usage && !info.usage) info = { ...info, usage };
     if (actualModel && !info.model) info = { ...info, model: actualModel };
     if (capturedSessionId && !info.runtimeSessionId) info = { ...info, runtimeSessionId: capturedSessionId };
     if (cfg.cleanupWorkdir) {
@@ -38660,6 +38879,7 @@ async function runACPSession(job, cfg) {
     },
     () => streamingCurrentTurn
   );
+  usageClient = client;
   const rl = readline3.createInterface({ input: child.stdout });
   const readerDone = new Promise((resolve4) => {
     rl.on("line", (line) => {
@@ -38677,7 +38897,9 @@ async function runACPSession(job, cfg) {
   });
   child.on("exit", (code) => {
     clearTimeout(timer);
-    finish({ code: killedByUs ? null : code, reason: killedByUs ? "timeout" : code === 0 ? "clean" : "error", transcriptRef });
+    void readerDone.then(() => {
+      finish({ code: killedByUs ? null : code, reason: killedByUs ? "timeout" : code === 0 ? "clean" : "error", transcriptRef });
+    });
   });
   void (async () => {
     try {
@@ -38688,6 +38910,7 @@ async function runACPSession(job, cfg) {
       });
       const resolvedModel = job.model ?? cfg.model;
       let sessionId = "";
+      let ambiguousResume = false;
       if (job.resumeRuntimeSession && job.runtimeSessionId) {
         const method = cfg.resumeMethod ?? "session/load";
         try {
@@ -38697,7 +38920,11 @@ async function runACPSession(job, cfg) {
             mcpServers: [],
             ...resolvedModel ? { model: resolvedModel } : {}
           });
-          sessionId = extractSessionID(resumeRes) || job.runtimeSessionId;
+          sessionId = extractSessionID(resumeRes);
+          if (!sessionId) {
+            sessionId = job.runtimeSessionId;
+            ambiguousResume = true;
+          }
         } catch {
           sessionId = "";
         }
@@ -38722,10 +38949,24 @@ async function runACPSession(job, cfg) {
 
 ${task}` : task;
       streamingCurrentTurn = true;
-      await client.request("session/prompt", {
+      let promptResult = await client.request("session/prompt", {
         sessionId,
         prompt: [{ type: "text", text: userText }]
       });
+      if (ambiguousResume && extractStopReason(promptResult) === "refusal" && !hasUsage(client.usage)) {
+        const sessionRes = await client.request("session/new", {
+          cwd: dir,
+          mcpServers: [],
+          ...resolvedModel ? { model: resolvedModel } : {}
+        });
+        sessionId = extractSessionID(sessionRes);
+        if (!sessionId) throw new Error("session/new returned no sessionId");
+        capturedSessionId = sessionId;
+        promptResult = await client.request("session/prompt", {
+          sessionId,
+          prompt: [{ type: "text", text: userText }]
+        });
+      }
       const usage = buildUsage(client.usage, estimateCost(client.usage, actualModel));
       if (!exited) finish({ code: 0, reason: "clean", transcriptRef, usage, model: actualModel });
       child.kill("SIGTERM");
@@ -40821,6 +41062,39 @@ function collabDomain(opts) {
       if (draft) return { status: 200, body: buildWorkorderDraftDetail(draft, resolve4) };
       return { status: 404, body: { error: { code: "not_found", message: `\u5DE5\u5355\u4E0D\u5B58\u5728: ${req.params.id}` } } };
     });
+    router.post("/api/workorders/:id/hold", async (req) => {
+      const { kernel, artifacts } = await resolveCtx(req.auth.companyId);
+      const ws = req.params.id;
+      const arts = [...kernel.model.artifacts.values()].filter((a) => a.workspace === ws);
+      if (arts.length === 0) {
+        return { status: 404, body: { error: { code: "not_found", message: `\u5DE5\u5355\u4E0D\u5B58\u5728: ${ws}` } } };
+      }
+      if (!artifacts) {
+        return { status: 503, body: { error: { code: "no_store", message: "\u63A7\u5236\u9762\u65C1\u5B58\u672A\u63A5\u5165\uFF0C\u65E0\u6CD5\u6682\u505C" } } };
+      }
+      const held = (await artifacts.listWorkspaceDispatchHeld()).includes(ws);
+      if (held) return { status: 200, body: { held: false } };
+      await artifacts.setWorkspaceDispatchHold(ws, true);
+      return { status: 200, body: { held: true } };
+    });
+    router.post("/api/workorders/:id/cancel", async (req) => {
+      if (!isHumanActor(req.auth.actor)) {
+        return { status: 403, body: { error: { code: "forbidden", message: "\u53D6\u6D88\u5DE5\u5355\u662F\u9500\u6BC1\u6027\u6CBB\u7406\u64CD\u4F5C\uFF0C\u4EC5\u4EBA\u7C7B\u53EF\u6267\u884C" } } };
+      }
+      const { kernel } = await resolveCtx(req.auth.companyId);
+      const ws = req.params.id;
+      const active = [...kernel.model.artifacts.values()].filter((a) => a.workspace === ws && lifecycleOf(kernel.model, a.id) === "active");
+      const all = [...kernel.model.artifacts.values()].filter((a) => a.workspace === ws);
+      if (all.length === 0) {
+        return { status: 404, body: { error: { code: "not_found", message: `\u5DE5\u5355\u4E0D\u5B58\u5728: ${ws}` } } };
+      }
+      let cancelled = 0;
+      for (const a of active) {
+        await kernel.seal({ artifactId: a.id, actor: req.auth.actor, reason: "cancelled", note: "\u5DE5\u5355\u53D6\u6D88\uFF08\u6279\u91CF\uFF09" });
+        cancelled += 1;
+      }
+      return { status: 200, body: { cancelled } };
+    });
     router.post("/api/workorders/:id/dispatch", async (req) => {
       const { kernel, artifacts } = await resolveCtx(req.auth.companyId);
       const ws = req.params.id;
@@ -40891,6 +41165,7 @@ function collabDomain(opts) {
 var init_collab = __esm({
   "../server/src/domains/collab/index.ts"() {
     "use strict";
+    init_src2();
     init_workorders();
     init_workorder_detail();
     init_inbox();
@@ -57730,7 +58005,7 @@ ${res.warning}`);
 }
 
 // src/index.ts
-var PKG_VERSION = true ? "0.1.36" : "dev";
+var PKG_VERSION = true ? "0.1.37" : "dev";
 var OASIS_DIR = path18.join(os10.homedir(), ".oasis");
 var CONFIG_FILE = path18.join(OASIS_DIR, "node-config.json");
 var PID_FILE = path18.join(OASIS_DIR, "node.pid");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis_test",
-  "version": "0.1.36",
+  "version": "0.1.37",
   "description": "Oasis node daemon + CLI — background daemon, auto-start, full server CLI",
   "bin": {
     "oasis": "./dist/index.js"