@blade-hq/agent-kit 1.0.16 → 1.0.18

package/dist/{chunk-U4KVB5OB.js → chunk-MKZ4VTJ2.js}

@@ -1,7 +1,7 @@
 import {
   apiFetchResponse,
   getAuthedUrl
-} from "./chunk-QEYZZDLM.js";
+} from "./chunk-TLB4ORQT.js";
 
 // src/react/lib/session-file-preview.ts
 var IMAGE_EXTS = /* @__PURE__ */ new Set(["png", "jpg", "jpeg", "gif", "svg", "webp", "ico", "bmp"]);
@@ -117,4 +117,4 @@ export {
   resolveTextPreviewType,
   resolveSessionFilePreviewTarget
 };
-//# sourceMappingURL=chunk-U4KVB5OB.js.map
+//# sourceMappingURL=chunk-MKZ4VTJ2.js.map

package/dist/{chunk-QEYZZDLM.js → chunk-TLB4ORQT.js}

@@ -3389,6 +3389,21 @@ function isGisGoalListPayload(value) {
 function isGisResourceListPayload(value) {
   return isRecord4(value) && Array.isArray(value.resources);
 }
+function sessionStatusFromChatEnd(status) {
+  if (status === "paused") return "waiting_for_input";
+  if (status === "interrupted") return "interrupted";
+  if (status === "failed") return "failed";
+  return "completed";
+}
+function extractTerminalChatEndStatus(events) {
+  for (let i = events.length - 1; i >= 0; i--) {
+    const event = events[i];
+    if (event?.type !== "chat:end") continue;
+    const status = event.payload?.status;
+    return typeof status === "string" ? status : "completed";
+  }
+  return null;
+}
 function isGisTargetListPayload(value) {
   return isRecord4(value) && Array.isArray(value.targets);
 }
@@ -3439,6 +3454,7 @@ var AgentSocket = class {
   joinedSessions = /* @__PURE__ */ new Set();
   requestedJoins = /* @__PURE__ */ new Set();
   pendingJoins = /* @__PURE__ */ new Map();
+  recentChatEndAt = /* @__PURE__ */ new Map();
   boardProjectRefCounts = /* @__PURE__ */ new Map();
   patchFlushHandle = null;
   patchFlushCancel = null;
@@ -3552,7 +3568,8 @@ var AgentSocket = class {
     s.on("turn:events", (data) => {
       const sessionId = this._resolveSessionId(data);
       if (!sessionId || !data.events?.length) return;
-      if (!useChatStore.getState().isStreaming[sessionId]) {
+      const terminalChatEndStatus = extractTerminalChatEndStatus(data.events);
+      if (!terminalChatEndStatus && !useChatStore.getState().isStreaming[sessionId]) {
         useSessionStore.getState().updateSessionStatus(sessionId, "running");
         useChatStore.getState().setStreaming(sessionId, true);
       }
@@ -3575,6 +3592,16 @@ var AgentSocket = class {
           notifyWorkspaceFilesChanged(sessionId);
         }
       }
+      if (terminalChatEndStatus) {
+        useSessionStore.getState().updateSessionStatus(sessionId, sessionStatusFromChatEnd(terminalChatEndStatus));
+        if (terminalChatEndStatus === "interrupted") {
+          useChatStore.getState().markInterrupted(sessionId);
+        } else if (terminalChatEndStatus === "failed") {
+          useChatStore.getState().markFailed(sessionId);
+        }
+        useChatStore.getState().setStreaming(sessionId, false);
+        invalidateContextStats(sessionId);
+      }
     });
     s.on("chat:start", (data) => {
       const sessionId = this._resolveSessionId(data);
@@ -3588,16 +3615,14 @@ var AgentSocket = class {
       if (sessionId) {
         this._flushPendingTurnPatches(sessionId);
         const status = data?.status ?? "completed";
-        useSessionStore.getState().updateSessionStatus(
-          sessionId,
-          status === "paused" ? "waiting_for_input" : status === "interrupted" ? "interrupted" : status === "failed" ? "failed" : "completed"
-        );
+        useSessionStore.getState().updateSessionStatus(sessionId, sessionStatusFromChatEnd(status));
         if (status === "interrupted") {
           useChatStore.getState().markInterrupted(sessionId);
         } else if (status === "failed") {
           useChatStore.getState().markFailed(sessionId);
         }
         useChatStore.getState().setStreaming(sessionId, false);
+        this.recentChatEndAt.set(sessionId, Date.now());
         invalidateContextStats(sessionId);
         void this._syncSessionTurnsFromHistory(sessionId);
         useRuntimeStore.getState().addEvent(sessionId, {
@@ -3623,6 +3648,7 @@ var AgentSocket = class {
         useSessionStore.getState().setErrorMessage(sessionId, message);
         useChatStore.getState().markFailed(sessionId);
         useChatStore.getState().setStreaming(sessionId, false);
+        this.recentChatEndAt.set(sessionId, Date.now());
         useRuntimeStore.getState().addEvent(sessionId, {
           type: "system:error",
           title: "Runtime error",
@@ -4136,8 +4162,17 @@ var AgentSocket = class {
   _shouldWaitForJoinBeforeSend(sessionId) {
     return this.subscribedSession === sessionId || this.joinedSessions.has(sessionId) || this.pendingJoins.has(sessionId) || this.requestedJoins.has(sessionId);
   }
-  send(sessionId, message, mode, askuserAnswer, extras) {
+  async send(sessionId, message, mode, askuserAnswer, extras) {
     this._ensureConnected();
+    if (useChatStore.getState().isStreaming[sessionId]) {
+      useChatStore.getState().addErrorMessage(sessionId, "\u5F53\u524D\u56DE\u590D\u5C1A\u672A\u7ED3\u675F\uFF0C\u8BF7\u7A0D\u540E\u518D\u53D1\u9001\u3002");
+      return;
+    }
+    await this._ensureSessionIdleBeforeSend(sessionId);
+    if (useChatStore.getState().isStreaming[sessionId]) {
+      useChatStore.getState().addErrorMessage(sessionId, "\u5F53\u524D\u56DE\u590D\u5C1A\u672A\u7ED3\u675F\uFF0C\u8BF7\u7A0D\u540E\u518D\u53D1\u9001\u3002");
+      return;
+    }
     if (!(askuserAnswer && typeof askuserAnswer.tool_call_id === "string")) {
       useChatStore.getState().addUserMessage(sessionId, message);
     }
@@ -4194,6 +4229,24 @@ var AgentSocket = class {
       });
     }
   }
+  async _ensureSessionIdleBeforeSend(sessionId) {
+    const lastEndedAt = this.recentChatEndAt.get(sessionId) ?? 0;
+    if (Date.now() - lastEndedAt > 3e3) {
+      return;
+    }
+    const deadline = Date.now() + 3e3;
+    while (Date.now() < deadline) {
+      const response = await this.stop(sessionId);
+      const status = String(response.status ?? "");
+      if (status === "idle" || status === "done" || status === "interrupted") {
+        return;
+      }
+      if (status !== "stopping") {
+        return;
+      }
+      await new Promise((resolve) => globalThis.setTimeout(resolve, 150));
+    }
+  }
   /**
    * 在 agent loop 运行期间追加补充消息。
    * 消息会在下一轮 LLM 调用前以 user-supplement 形式注入。
@@ -4482,4 +4535,4 @@ export {
   bootstrapBladeClient,
   getBootstrappedClient
 };
-//# sourceMappingURL=chunk-QEYZZDLM.js.map
+//# sourceMappingURL=chunk-TLB4ORQT.js.map