@blade-hq/agent-kit 0.5.14 → 0.5.17

package/dist/{chunk-SZSTLXEP.js → chunk-SPHQXYME.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-J3XVFPOV.js";
 import {
   BladeClient
-} from "./chunk-7I7AMUCI.js";
+} from "./chunk-SZKVEYL6.js";
 import {
   createClientActions,
   useCardStateStore
@@ -693,15 +693,11 @@ var TOOL_NAME_ALIASES = {
   file_read: "Read",
   file_write: "Write",
   finish_task: "FinishTask",
-  get_skill_content: "GetSkillContent",
   glob: "Glob",
   grep: "Grep",
-  list_skill_tools: "ListSkillTools",
-  load_skill_tools: "LoadSkillTools",
   ls: "Ls",
   read: "Read",
-  run_skill_tool: "RunSkillTool",
-  search_skills: "SearchSkills",
+  read_skill: "ReadSkill",
   web_fetch: "WebFetch",
   web_search: "WebSearch",
   write: "Write"
@@ -719,11 +715,7 @@ var TOOL_DISPLAY_LABELS = {
   WebFetch: "\u6574\u7406\u7F51\u9875\u5185\u5BB9",
   Agent: "\u6D3E\u751F\u5B50\u667A\u80FD\u4F53",
   AskUserQuestion: "\u5411\u7528\u6237\u63D0\u95EE",
-  SearchSkills: "\u641C\u7D22\u6280\u80FD",
-  GetSkillContent: "\u8BFB\u53D6\u6280\u80FD",
-  ListSkillTools: "\u67E5\u770B\u5DE5\u5177\u5217\u8868",
-  LoadSkillTools: "\u52A0\u8F7D\u6280\u80FD",
-  RunSkillTool: "\u6267\u884C\u6280\u80FD\u5DE5\u5177",
+  ReadSkill: "\u8BFB\u53D6\u6280\u80FD",
   FinishTask: "\u4EFB\u52A1\u5B8C\u6210",
   ExitPlanMode: "\u63D0\u4EA4\u8BA1\u5212",
   ListSessions: "\u5217\u51FA\u5386\u53F2\u4F1A\u8BDD",
@@ -743,7 +735,6 @@ var PRIORITY_FILE_KEYS = [
   "destination",
   "filename"
 ];
-var FILE_PATH_PATTERN = /(?:^|[\s"'`：:])([^\s"'`,;:)\]}，。；、]+?\.[a-z0-9]{1,8})(?=$|[\s"'`,.;:)\]}，。；、])/i;
 function safeParseJson(value) {
   if (!value) return null;
   try {
@@ -759,18 +750,6 @@ function getStringArgValue(args, key) {
   const value = args?.[key];
   return typeof value === "string" ? value.trim() : "";
 }
-var GENERIC_DISPLAY_NAMES = new Set(Object.values(TOOL_DISPLAY_LABELS));
-function getRunSkillDisplayName(toolCall, args) {
-  const argDisplayName = getStringArgValue(args, "display_name");
-  if (argDisplayName) return argDisplayName;
-  const displayName = toolCall.display_name?.trim() ?? "";
-  if (displayName && (displayName === "\u5199\u5165\u6587\u4EF6" || !GENERIC_DISPLAY_NAMES.has(displayName))) {
-    return displayName;
-  }
-  const argToolName = getStringArgValue(args, "tool_name");
-  if (argToolName) return argToolName;
-  return "";
-}
 function getCommandDescription(args) {
   return getStringArgValue(args, "description");
 }
@@ -803,44 +782,6 @@ function findFileLikeValue(value, depth = 0, allowPlainString = false) {
   }
   return null;
 }
-function extractFilePathFromText(text) {
-  return text.match(FILE_PATH_PATTERN)?.[1] ?? null;
-}
-function extractFilePathFromResult(result) {
-  if (typeof result === "string") {
-    const parsed = safeParseJson(result);
-    if (parsed != null && parsed !== result) {
-      const found = extractFilePathFromResult(parsed);
-      if (found) return found;
-    }
-    return extractFilePathFromText(result);
-  }
-  if (Array.isArray(result)) {
-    for (const item of result) {
-      const found = extractFilePathFromResult(item);
-      if (found) return found;
-    }
-    return null;
-  }
-  if (isPlainObject(result)) {
-    for (const key of PRIORITY_FILE_KEYS) {
-      const direct = findFileLikeValue(result[key], 0, true);
-      if (direct) return direct;
-    }
-    for (const nested of Object.values(result)) {
-      const found = extractFilePathFromResult(nested);
-      if (found) return found;
-    }
-  }
-  return null;
-}
-function isWriteLikeRunSkillTool(label, args) {
-  const normalizedLabel = label.trim();
-  if (normalizedLabel === "\u5199\u5165\u6587\u4EF6" || /write/i.test(normalizedLabel)) return true;
-  const toolName = getStringArgValue(args, "tool_name");
-  if (/write/i.test(toolName)) return true;
-  return false;
-}
 function formatFileName(filePath) {
   return filePath.split("/").pop() ?? filePath;
 }
@@ -864,70 +805,15 @@ function getToolDisplayLabel(toolCall) {
   if (metaDisplayName) {
     return metaDisplayName;
   }
-  switch (normalized) {
-    case "RunSkillTool": {
-      const runSkillDisplayName = getRunSkillDisplayName(toolCall, args);
-      if (runSkillDisplayName) {
-        const filePath = extractToolFilePath(toolCall);
-        if (filePath && isWriteLikeRunSkillTool(runSkillDisplayName, args)) {
-          return `${runSkillDisplayName}\u300C${formatFileName(filePath)}\u300D`;
-        }
-        return runSkillDisplayName;
-      }
-      return "\u6267\u884C\u6280\u80FD\u5DE5\u5177";
-    }
-    case "Bash": {
-      const description = getCommandDescription(args);
-      return description || "\u6267\u884C\u547D\u4EE4\u884C\u64CD\u4F5C";
-    }
-    case "BgBash": {
-      const description = getCommandDescription(args);
-      return description ? `\u540E\u53F0\u6267\u884C\uFF1A${description}` : "\u540E\u53F0\u6267\u884C\u547D\u4EE4";
-    }
-    case "Read":
-    case "Write":
-    case "Edit": {
-      const description = getCommandDescription(args);
-      return description || baseLabel;
-    }
-    case "Ls": {
-      const path = args && typeof args.path === "string" ? args.path : "";
-      return path ? `${baseLabel}\u300C${path}\u300D` : baseLabel;
-    }
-    case "Glob": {
-      const pattern = args && typeof args.pattern === "string" ? args.pattern : "";
-      return pattern ? `${baseLabel}\u300C${pattern}\u300D` : baseLabel;
-    }
-    case "Grep": {
-      const pattern = args && typeof args.pattern === "string" ? args.pattern : "";
-      return pattern ? `${baseLabel}\u300C${pattern}\u300D` : baseLabel;
-    }
-    case "WebSearch":
-    case "WebFetch": {
-      const query = args && typeof args.query === "string" ? args.query : "";
-      return query ? `${baseLabel}\u300C${query}\u300D` : baseLabel;
-    }
-    case "GetSkillContent": {
-      const skillName = args && typeof args.skill_id === "string" ? args.skill_id : args && typeof args.skill_name === "string" ? args.skill_name : "";
-      return skillName ? `${baseLabel}\u300C${skillName}\u300D` : baseLabel;
-    }
-    case "SearchSkills": {
-      const query = args && typeof args.query === "string" ? args.query : "";
-      return query ? `${baseLabel}\u300C${query}\u300D` : baseLabel;
-    }
-    case "ListSkillTools": {
-      const skillId = args && typeof args.skill_id === "string" ? args.skill_id : "";
-      return skillId ? `${baseLabel}\u300C${skillId}\u300D` : baseLabel;
-    }
-    case "LoadSkillTools":
-      return "\u52A0\u8F7D\u6280\u80FD";
-    case "FinishTask": {
-      const title = args && typeof args.title === "string" ? args.title : "";
-      return title ? `${baseLabel}\uFF1A${title}` : baseLabel;
-    }
-    default:
-      return baseLabel;
+  const description = getCommandDescription(args);
+  if (normalized === "BgBash") {
+    return description ? `\u540E\u53F0\u6267\u884C\uFF1A${description}` : "\u540E\u53F0\u6267\u884C\u547D\u4EE4";
+  }
+  if (normalized === "FinishTask") {
+    const title = args && typeof args.title === "string" ? args.title : "";
+    return title ? `${baseLabel}\uFF1A${title}` : baseLabel;
   }
+  return description || baseLabel;
 }
 function getToolTone(status) {
   if (status === "error" || status === "cancelled") return "red";
@@ -948,8 +834,6 @@ function extractToolFilePath(toolCall) {
   let filePath = null;
   if (formattedName === "Read" || formattedName === "Write" || formattedName === "Edit") {
     filePath = findFileLikeValue(argsValue);
-  } else if (formattedName === "RunSkillTool") {
-    filePath = findFileLikeValue(argsValue) ?? extractFilePathFromResult(toolCall.result);
   }
   if (!filePath || isInternalStatusFile(filePath)) return null;
   return filePath;
@@ -1607,13 +1491,14 @@ function extractAskAnswers(turns) {
   }
   return answers;
 }
-function registerCreatedSessionState(set, session, mode = DEFAULT_SESSION_MODE) {
+function registerCreatedSessionState(set, session, mode = DEFAULT_SESSION_MODE, options = {}) {
+  const fresh = options.fresh ?? true;
   useChatStore.getState().setTurns(session.id, []);
   useTaskStore.getState().setTasks(session.id, []);
   set((state) => ({
     sessions: [session, ...state.sessions.filter((item) => item.id !== session.id)],
     modes: { ...state.modes, [session.id]: state.modes[session.id] ?? mode },
-    _freshSessions: new Set(state._freshSessions).add(session.id)
+    _freshSessions: fresh ? new Set(state._freshSessions).add(session.id) : new Set([...state._freshSessions].filter((id) => id !== session.id))
   }));
 }
 async function revalidateViewerSessions(existingSessions) {
@@ -1715,8 +1600,8 @@ var useSessionStore = create5()((set, get) => ({
     });
     return session_id;
   },
-  registerCreatedSession: (session, mode = DEFAULT_SESSION_MODE) => {
-    registerCreatedSessionState(set, session, mode);
+  registerCreatedSession: (session, mode = DEFAULT_SESSION_MODE, options = {}) => {
+    registerCreatedSessionState(set, session, mode, options);
   },
   upsertSession: (session) => {
     set((state) => ({
@@ -2386,6 +2271,9 @@ var AgentSocket = class {
   pendingReplayModes = /* @__PURE__ */ new Map();
   oomNotifiedKeys = /* @__PURE__ */ new Set();
   pendingTurnPatches = /* @__PURE__ */ new Map();
+  joinedSessions = /* @__PURE__ */ new Set();
+  requestedJoins = /* @__PURE__ */ new Set();
+  pendingJoins = /* @__PURE__ */ new Map();
   patchFlushHandle = null;
   patchFlushCancel = null;
   _ensureConnected() {
@@ -2508,6 +2396,7 @@ var AgentSocket = class {
         }
         useChatStore.getState().setStreaming(sessionId, false);
         invalidateContextStats(sessionId);
+        void this._syncSessionTurnsFromHistory(sessionId);
         useRuntimeStore.getState().addEvent(sessionId, {
           type: "chat:end",
           title: status === "paused" ? "Waiting for input" : status === "interrupted" ? "\u8FD0\u884C\u5DF2\u4E2D\u65AD" : status === "failed" ? "Run failed" : "Run completed",
@@ -2694,10 +2583,13 @@ var AgentSocket = class {
     this.socket.on("connect", () => {
       useConnectionStore.getState().markConnected();
       console.log("[agent-socket] connected, id:", this.socket.id);
+      this.joinedSessions.clear();
+      this.requestedJoins.clear();
+      this.pendingJoins.clear();
       const sessionId = this.subscribedSession;
       if (sessionId) {
         useSessionStore.getState().setActiveSession(sessionId);
-        this.socket.emit("session:subscribe", { session_id: sessionId });
+        void this._ensureJoined(sessionId);
       }
     });
     this.socket.on("connect_error", (err) => {
@@ -2803,6 +2695,14 @@ var AgentSocket = class {
       detail: OOM_MESSAGE
     });
   }
+  async _syncSessionTurnsFromHistory(sessionId) {
+    try {
+      const turns = await this.client.sessions.getSessionTurns(sessionId);
+      if (turns.length === 0) return;
+      useChatStore.getState().setTurns(sessionId, turns);
+    } catch {
+    }
+  }
   _applySystemNotification(sessionId, loopId, notification) {
     const notificationType = notification.notification_type ?? "system_notification";
     const title = notification.title ?? notificationType;
@@ -2844,7 +2744,7 @@ var AgentSocket = class {
       useUiStore.getState().clearArtifacts();
       useCardStateStore.getState().clearAllStates();
     }
-    this.socket.emit("session:subscribe", { session_id: sessionId });
+    void this._ensureJoined(sessionId);
   }
   unsubscribe() {
     const previousSessionId = this.subscribedSession;
@@ -2852,6 +2752,9 @@ var AgentSocket = class {
       this.socket.emit("session:unsubscribe", { session_id: previousSessionId });
       useUiBridgeStore.getState().clearSession(previousSessionId);
       this.subscribedSession = null;
+      this.requestedJoins.delete(previousSessionId);
+      this.joinedSessions.delete(previousSessionId);
+      this.pendingJoins.delete(previousSessionId);
     }
     this.previewArtifactsByToolCall.clear();
   }
@@ -2865,7 +2768,44 @@ var AgentSocket = class {
    * 幂等：后端 session:subscribe handler 只做 enter_room，重复 emit 无副作用。
    */
   attachSession(sessionId) {
-    this.socket.emit("session:subscribe", { session_id: sessionId });
+    void this._ensureJoined(sessionId);
+  }
+  _ensureJoined(sessionId) {
+    if (this.joinedSessions.has(sessionId)) {
+      return Promise.resolve();
+    }
+    this.requestedJoins.add(sessionId);
+    const pending = this.pendingJoins.get(sessionId);
+    if (pending) {
+      return pending;
+    }
+    const join = new Promise((resolve, reject) => {
+      this.socket.timeout(5e3).emit(
+        "session:subscribe",
+        { session_id: sessionId },
+        (err, response) => {
+          if (err) {
+            reject(err);
+            return;
+          }
+          if (response && response.ok === false) {
+            reject(new Error(response.message || "Session subscription failed"));
+            return;
+          }
+          if (this.requestedJoins.has(sessionId)) {
+            this.joinedSessions.add(sessionId);
+          }
+          resolve();
+        }
+      );
+    }).finally(() => {
+      this.pendingJoins.delete(sessionId);
+    });
+    this.pendingJoins.set(sessionId, join);
+    return join;
+  }
+  _shouldWaitForJoinBeforeSend(sessionId) {
+    return this.subscribedSession === sessionId || this.joinedSessions.has(sessionId) || this.pendingJoins.has(sessionId) || this.requestedJoins.has(sessionId);
   }
   send(sessionId, message, mode, askuserAnswer, extras) {
     this._ensureConnected();
@@ -2897,7 +2837,7 @@ var AgentSocket = class {
       this.pendingReplayMessages.set(sessionId, message);
       this.pendingReplayModes.set(sessionId, mode);
     }
-    this.socket.emit("chat:send", {
+    const payload = {
       session_id: sessionId,
       message,
       mode,
@@ -2905,7 +2845,19 @@ var AgentSocket = class {
       model: extras?.model,
       whatif: extras?.whatif,
       replay_decision: extras?.replay_decision
-    });
+    };
+    const sendPayload = () => {
+      this.socket.emit("chat:send", payload);
+    };
+    if (this._shouldWaitForJoinBeforeSend(sessionId)) {
+      void this._ensureJoined(sessionId).then(sendPayload).catch((error) => {
+        useChatStore.getState().setStreaming(sessionId, false);
+        useSessionStore.getState().updateSessionStatus(sessionId, "failed");
+        useChatStore.getState().addErrorMessage(sessionId, error.message || "\u4F1A\u8BDD\u8BA2\u9605\u5931\u8D25\uFF0C\u6D88\u606F\u672A\u53D1\u9001");
+      });
+    } else {
+      sendPayload();
+    }
     const skillId = extractSkillIdForAnalytics(message);
     trackEvent("message_sent", {
       session_id: sessionId,
@@ -3189,4 +3141,4 @@ export {
   bootstrapBladeClient,
   getBootstrappedClient
 };
-//# sourceMappingURL=chunk-SZSTLXEP.js.map
+//# sourceMappingURL=chunk-SPHQXYME.js.map