@zero-library/chat-copilot 3.2.4 → 3.2.5

package/dist/index.cjs.js

@@ -1085,7 +1085,7 @@ function formatResourceName(resourceName) {
   return `${name.slice(0, 3)}***${name.slice(-3)}${extension}`;
 }
 function ReadonlyResourceTag({ resource }) {
-  return /* @__PURE__ */ jsxRuntime.jsx("div", { className: index_module_default.resourceTag, children: /* @__PURE__ */ jsxRuntime.jsxs(antd.Tag, { color: "blue", children: [
+  return /* @__PURE__ */ jsxRuntime.jsx("span", { className: index_module_default.resourceTag, children: /* @__PURE__ */ jsxRuntime.jsxs(antd.Tag, { color: "blue", children: [
     resource.resourceLabel,
     "\uFF1A",
     formatResourceName(resource.resourceName)
@@ -1101,7 +1101,7 @@ function ResourceTag({ resource }) {
       node?.remove();
     });
   };
-  return /* @__PURE__ */ jsxRuntime.jsx("div", { className: index_module_default.resourceTag, children: /* @__PURE__ */ jsxRuntime.jsxs(antd.Tag, { closeIcon: true, color: "blue", onClose: handleClose, children: [
+  return /* @__PURE__ */ jsxRuntime.jsx("span", { className: index_module_default.resourceTag, children: /* @__PURE__ */ jsxRuntime.jsxs(antd.Tag, { closeIcon: true, color: "blue", onClose: handleClose, children: [
     resource.resourceLabel,
     "\uFF1A",
     formatResourceName(resource.resourceName)
@@ -1197,10 +1197,14 @@ var VariableNode = class _VariableNode extends lexical.DecoratorNode {
 function $createVariableNode(resourceLabel, resourceName, resourceType, resourceId) {
   return new VariableNode(resourceLabel, resourceName, resourceType, resourceId);
 }
+var RESOURCE_TOKEN_REGEX_SOURCE = String.raw`\/?(\w+):\/\/([^?\s#]+)\?name=([^&\s#]+)&label=([^#\s]+)(?:#)?`;
+function createResourceTokenRegex() {
+  return new RegExp(RESOURCE_TOKEN_REGEX_SOURCE, "g");
+}
 function serializeResourceToken(resourceLabel, resourceName, resourceType, resourceId) {
   return `${encodeURIComponent(resourceType)}://${encodeURIComponent(resourceId)}?name=${encodeURIComponent(resourceName)}&label=${encodeURIComponent(
     resourceLabel
-  )}`;
+  )}#`;
 }
 var emptyAgentResources = {
   skills: [],
@@ -1252,6 +1256,45 @@ var categoryValueTypeMap = Object.fromEntries(
   Object.entries(resourceTypeConfigMap).map(([type, config]) => [config.categoryValue, type])
 );
 var isHashCommandConfig = (config) => !!config && !Array.isArray(config);
+function insertVariableNode(editor, { resourceLabel, resourceName, resourceType, resourceId }, nodeToReplace) {
+  editor.update(() => {
+    const variableNode = $createVariableNode(resourceLabel, resourceName, resourceType, resourceId);
+    if (nodeToReplace) {
+      nodeToReplace.replace(variableNode);
+      variableNode.selectNext();
+      return;
+    }
+    const trailingTextNode = lexical.$createTextNode("");
+    const selection = lexical.$getSelection();
+    if (lexical.$isRangeSelection(selection)) {
+      selection.insertNodes([variableNode, trailingTextNode]);
+      trailingTextNode.select();
+      return;
+    }
+    const root = lexical.$getRoot();
+    const lastChild = root.getLastChild();
+    const paragraph = lastChild?.getType() === "paragraph" ? lastChild : lexical.$createParagraphNode();
+    if (!paragraph.getParent()) {
+      root.append(paragraph);
+    }
+    paragraph.append(variableNode, trailingTextNode);
+    trailingTextNode.select();
+  });
+}
+function ResourceInsertPlugin() {
+  const [editor] = LexicalComposerContext.useLexicalComposerContext();
+  const chatStore = useChatStore();
+  const resourceInsertionState = valtio.useSnapshot(chatStore.resourceInsertion);
+  React10.useEffect(() => {
+    const pendingResource = resourceInsertionState.pending;
+    if (!pendingResource) return;
+    editor.focus(() => {
+      insertVariableNode(editor, pendingResource);
+    });
+    chatStore.consumeInsertedResource(pendingResource.requestId);
+  }, [chatStore, editor, resourceInsertionState.pending]);
+  return null;
+}
 var ResourceOption = class extends LexicalTypeaheadMenuPlugin.MenuOption {
   group;
   item;
@@ -1411,13 +1454,16 @@ function VariablePickerPlugin({ commandConfig = {} }) {
       const resource = selectedOption.item;
       const resourceLabel = selectedOption.group.label;
       const resourceType = selectedOption.group.value;
-      editor.update(() => {
-        const variableNode = $createVariableNode(resourceLabel, resource.label, resourceType, resource.value);
-        if (nodeToReplace) {
-          nodeToReplace.replace(variableNode);
-          variableNode.selectNext();
-        }
-      });
+      insertVariableNode(
+        editor,
+        {
+          resourceLabel,
+          resourceName: resource.label,
+          resourceType,
+          resourceId: resource.value
+        },
+        nodeToReplace
+      );
       closeMenu();
     },
     [editor]
@@ -1457,7 +1503,7 @@ function VariablePickerPlugin({ commandConfig = {} }) {
 function InitialStatePlugin({ value }) {
   const [editor] = LexicalComposerContext.useLexicalComposerContext();
   function parseAndAppendNodes(paragraph, value2) {
-    const variableRegex = /\/?(\w+):\/\/([^?\s]+)\?name=([^&\s]+)&label=([^\s]+)/g;
+    const variableRegex = createResourceTokenRegex();
     let lastIndex = 0;
     let match;
     while ((match = variableRegex.exec(value2)) !== null) {
@@ -1612,6 +1658,7 @@ var ChatInput = React10__namespace.forwardRef(
       ),
       /* @__PURE__ */ jsxRuntime.jsx(LexicalHistoryPlugin.HistoryPlugin, {}),
       /* @__PURE__ */ jsxRuntime.jsx(VariablePickerPlugin, { commandConfig }),
+      /* @__PURE__ */ jsxRuntime.jsx(ResourceInsertPlugin, {}),
       /* @__PURE__ */ jsxRuntime.jsx(LexicalOnChangePlugin.OnChangePlugin, { onChange: handleOnChange }),
       /* @__PURE__ */ jsxRuntime.jsx(InitialStatePlugin, { value: stringValue })
     ] }) });
@@ -2000,7 +2047,7 @@ function createChatStore() {
       await getAgentInfo(agentInfo.id);
     }
     agent.agentInfo = { ...agent.agentInfo, ...agentInfo };
-    if (config.layout.userInput) {
+    if (config.layout.userInput && agent.agentInfo.agentType === 1 /* FLOW */) {
       await getUserInput(agent.agentInfo.id);
     }
     config.hooks?.onAfterSwitchAgent?.(agent.agentInfo);
@@ -2218,6 +2265,21 @@ function createChatStore() {
   const focusTarget = valtio.proxy({
     target: null
   });
+  let resourceInsertionRequestId = 0;
+  const resourceInsertion = valtio.proxy({
+    pending: null
+  });
+  const insertResource = (resource) => {
+    resourceInsertion.pending = {
+      requestId: ++resourceInsertionRequestId,
+      ...resource
+    };
+  };
+  const consumeInsertedResource = (requestId) => {
+    if (resourceInsertion.pending?.requestId === requestId) {
+      resourceInsertion.pending = null;
+    }
+  };
   const openSubAgent = async (item) => {
     let subConvId = item.subConversationId ?? item.metadata?.conversationId;
     let agentName = item.agentName;
@@ -2886,6 +2948,7 @@ function createChatStore() {
     const canProceed = await config.hooks?.onBeforeSend?.(msgContent, files || []);
     if (canProceed === false) return;
     if (conversation.active.userInput?.length) {
+      console.log(conversation.active.userInput);
       const invalid = conversation.active.userInput.some((item) => {
         const isRequired = item.rules?.some((r) => r.type === "required");
         if (isRequired) {
@@ -3052,7 +3115,13 @@ function createChatStore() {
     /** 关闭子智能体执行详情面板 */
     closeSubAgent,
     /** 右侧面板聚焦意图（通用） */
-    focusTarget
+    focusTarget,
+    /** 待插入的资源节点请求 */
+    resourceInsertion,
+    /** 发起资源节点插入 */
+    insertResource,
+    /** 消费已处理的资源节点请求 */
+    consumeInsertedResource
   };
 }
 var AuthImage = ({ path, size, shape = "square" }) => {
@@ -4129,6 +4198,7 @@ var MdEdit_default = ({ data, loading }) => {
 };
 var PreviewLink_default = ({ data, loading, message: message3, ...rest }) => {
   const chatStore = useChatStore();
+  const conversationId = chatStore.conversation.active?.id;
   const conversationWorkspacePrefix = "/workspace";
   const getLinkFileName = (path) => {
     const lastSegment = path.split("/").pop();
@@ -4158,7 +4228,7 @@ var PreviewLink_default = ({ data, loading, message: message3, ...rest }) => {
     chatStore.setPreview({
       fileUrl: chatStore.config.services.request.getPreviewUrl({
         path: normalizedPath,
-        workspaceId: message3.conversationId
+        workspaceId: conversationId
       }),
       fileName,
       suffix
@@ -5922,7 +5992,6 @@ var RunStartedNode = React10__namespace.default.memo(() => {
   ] });
 });
 var RESOURCE_MARKDOWN_TAG = "resourcetag";
-var RESOURCE_TOKEN_REGEX = /(\w+):\/\/([^?\s]+)\?name=([^&\s]+)&label=([^\s]+)/g;
 function QuestionSummary({ content }) {
   const { t: t11 } = common.useTranslation(NS_CHAT_COPILOT);
   return /* @__PURE__ */ jsxRuntime.jsxs("span", { style: { display: "inline-flex", flexDirection: "column", gap: 4 }, children: [
@@ -5936,7 +6005,8 @@ function MessageResourceTag({ data }) {
   return /* @__PURE__ */ jsxRuntime.jsx(ReadonlyResourceTag, { resource });
 }
 function transformResourceText(content) {
-  return content.replace(RESOURCE_TOKEN_REGEX, (_, resourceType, resourceId, resourceName, resourceLabel) => {
+  const resourceTokenRegex = createResourceTokenRegex();
+  return content.replace(resourceTokenRegex, (_, resourceType, resourceId, resourceName, resourceLabel) => {
     const resource = {
       resourceType: decodeURIComponent(resourceType),
       resourceId: decodeURIComponent(resourceId),
@@ -6909,29 +6979,8 @@ var emptyAgentResources2 = {
   subAgents: [],
   tools: []
 };
-var focusSenderInputToEnd = () => {
-  requestAnimationFrame(() => {
-    requestAnimationFrame(() => {
-      const input = document.querySelector('.zero-chat-sender .ant-sender-input[contenteditable="true"]');
-      if (!input) return;
-      input.focus();
-      const selection = window.getSelection();
-      if (!selection) return;
-      const range = document.createRange();
-      range.selectNodeContents(input);
-      range.collapse(false);
-      selection.removeAllRanges();
-      selection.addRange(range);
-    });
-  });
-};
-var appendResourceToken = (content, token) => {
-  if (!content) return token;
-  return /\s$/.test(content) ? `${content}${token}` : `${content}  ${token}`;
-};
 var ResourceBtn_default = ({ types = defaultResourceTypes }) => {
   const chatStore = useChatStore();
-  const conversationState = valtio.useSnapshot(chatStore.conversation);
   const { t: t11 } = common.useTranslation(NS_CHAT_COPILOT);
   const [open, setOpen] = React10.useState(false);
   const [loading, setLoading] = React10.useState(false);
@@ -6941,15 +6990,13 @@ var ResourceBtn_default = ({ types = defaultResourceTypes }) => {
       key: getResourceKey(item),
       label: getLabel(item),
       onClick: () => {
-        const resourceName = getLabel(item);
-        const currentContent = conversationState.messages[conversationState.active.id]?.content || "";
-        const nextContent = appendResourceToken(
-          currentContent,
-          serializeResourceToken(resourceLabel, resourceName, resourceTypeMap[categoryKey].nodeType, getResourceKey(item))
-        );
-        chatStore.setContent(nextContent);
+        chatStore.insertResource({
+          resourceLabel,
+          resourceName: getLabel(item),
+          resourceType: resourceTypeMap[categoryKey].nodeType,
+          resourceId: getResourceKey(item)
+        });
         setOpen(false);
-        focusSenderInputToEnd();
       }
     }));
     const buildSubMenu = (key, label, items2, getLabel) => ({
@@ -6993,7 +7040,7 @@ var ResourceBtn_default = ({ types = defaultResourceTypes }) => {
         label: t11("empty")
       }
     ];
-  }, [chatStore, conversationState.active.id, conversationState.messages, loading, resources, t11, types]);
+  }, [chatStore, loading, resources, t11, types]);
   const handleOpenChange = async (nextOpen) => {
     setOpen(nextOpen);
     if (!nextOpen) return;
@@ -7269,10 +7316,19 @@ var UserInputPanel = () => {
   const [activeKey, setActiveKey] = React10.useState(["1"]);
   const { t: t11 } = common.useTranslation(NS_CHAT_COPILOT);
   const inputs = React10.useMemo(() => {
-    if (agentState.agentInfo.userInput?.length > 0) {
-      return agentState.agentInfo.userInput;
-    }
+    return agentState.agentInfo.userInput || [];
   }, [agentState.agentInfo.userInput]);
+  const syncConversationUserInput = React10.useCallback(
+    (values) => {
+      if (inputs.length === 0) return;
+      const newInput = inputs.map((item) => ({
+        ...item,
+        value: values[item.name]
+      }));
+      chatStore.setConversationUserInput(newInput);
+    },
+    [chatStore, inputs]
+  );
   React10.useEffect(() => {
     if (inputs.length > 0) {
       const initialValues = inputs.reduce((acc, cur) => {
@@ -7281,23 +7337,15 @@ var UserInputPanel = () => {
         return acc;
       }, {});
       form.setFieldsValue(initialValues);
+      syncConversationUserInput(initialValues);
     }
-  }, [inputs, form]);
-  const handleValuesChange = (changedValues) => {
-    if (agentState.agentInfo.userInput?.length > 0) {
-      const newInput = agentState.agentInfo.userInput.map((v) => {
-        if (v.name in changedValues) {
-          const newValue = changedValues[v.name];
-          return { ...v, value: newValue };
-        }
-        return v;
-      });
-      chatStore.setConversationUserInput(newInput);
-      return;
-    }
+  }, [form, inputs, syncConversationUserInput]);
+  const handleValuesChange = (_changedValues, allValues) => {
+    syncConversationUserInput(allValues);
   };
   const handleStartChat = () => {
     form.validateFields().then(() => {
+      syncConversationUserInput(form.getFieldsValue(true));
       setActiveKey([]);
     }).catch(() => {
       antd.message.error(t11("checkParams"));