@siact/sime-x-vue 0.0.11 → 0.0.13

package/dist/sime-x-vue.mjs

@@ -773,7 +773,8 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     debug: { type: Boolean },
     chatbotUrl: {},
     appId: {},
-    appToken: {}
+    appToken: {},
+    agentId: {}
   },
   setup(__props) {
     const props = __props;
@@ -784,6 +785,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       chatbotUrl: () => props.chatbotUrl,
       appId: () => props.appId,
       appToken: () => props.appToken,
+      agentId: () => props.agentId,
       stopBroadcast: () => stopBroadcastRef.value(),
       registerVoiceMethods: (methods) => {
         if (methods.stopBroadcast) stopBroadcastRef.value = methods.stopBroadcast;
@@ -1682,8 +1684,43 @@ function useAgentInvoke(options) {
       args: Array.isArray(cmd.args) ? cmd.args : []
     }));
   };
-  const executeHostCommands = async (toolCallId, result) => {
-    const commands = extractExecutableCommands(result);
+  const buildCommandDefinitionMap = (commands) => {
+    return new Map(commands.map((command) => [command.name, command]));
+  };
+  const toExecutableCommand = (toolName, payload, commandDefinitions) => {
+    const commandDefinition = commandDefinitions.get(toolName);
+    if (!commandDefinition) {
+      return null;
+    }
+    const parameters = commandDefinition.parameters || [];
+    if (Array.isArray(payload)) {
+      return {
+        name: toolName,
+        args: payload
+      };
+    }
+    if (!payload || typeof payload !== "object") {
+      return {
+        name: toolName,
+        args: []
+      };
+    }
+    const payloadRecord = payload;
+    return {
+      name: toolName,
+      args: parameters.map((parameter) => payloadRecord[parameter.name])
+    };
+  };
+  const resolveExecutableCommands = (toolName, payload, commandDefinitions) => {
+    const extractedCommands = extractExecutableCommands(payload);
+    if (extractedCommands.length > 0) {
+      return extractedCommands;
+    }
+    const directCommand = toExecutableCommand(toolName, payload, commandDefinitions);
+    return directCommand ? [directCommand] : [];
+  };
+  const executeHostCommands = async (toolCallId, toolName, payload, commandDefinitions) => {
+    const commands = resolveExecutableCommands(toolName, payload, commandDefinitions);
     if (commands.length === 0) return false;
     try {
       executingTools.value = /* @__PURE__ */ new Set([...executingTools.value, toolCallId]);
@@ -1731,11 +1768,12 @@ function useAgentInvoke(options) {
     const processingToolResults = /* @__PURE__ */ new Set();
     abortController = new AbortController();
     const commands = await aiChatbotX.getCommads();
+    const commandDefinitions = buildCommandDefinitionMap(commands);
     conversationHistory.value.length > 0 ? [...conversationHistory.value] : void 0;
     try {
-      const response = await fetch(options.endpoint.value, {
+      const response = await fetch(options.endpoint, {
         method: "POST",
-        headers: { "Content-Type": "application/json" },
+        headers: { "Content-Type": "application/json", Authorization: `Bearer ${options.appToken || ""}` },
         body: JSON.stringify({
           input: content,
           projectId: options.projectId || "",
@@ -1765,9 +1803,8 @@ function useAgentInvoke(options) {
               state: "result"
             };
             currentToolParts.value = [...currentToolParts.value, toolPart];
-            if (tr.toolName === "executeCommand") {
-              console.log("executeCommand", tr.result);
-              void executeHostCommands(toolPart.toolCallId, tr.result);
+            if (commandDefinitions.has(tr.toolName)) {
+              void executeHostCommands(toolPart.toolCallId, tr.toolName, tr.result, commandDefinitions);
             }
           }
         }
@@ -1784,23 +1821,27 @@ function useAgentInvoke(options) {
           );
           currentToolParts.value = toolParts;
           for (const part of toolParts) {
-            if (part.toolName === "executeCommand" && !processedToolResults.has(part.toolCallId) && !processingToolResults.has(part.toolCallId)) {
+            if (commandDefinitions.has(part.toolName) && !processedToolResults.has(part.toolCallId) && !processingToolResults.has(part.toolCallId)) {
               if (part.type === "tool-call" && part.state === "call" && part.args) {
                 processingToolResults.add(part.toolCallId);
-                void executeHostCommands(part.toolCallId, part.args).then((executed) => {
-                  if (executed) {
-                    processedToolResults.add(part.toolCallId);
+                void executeHostCommands(part.toolCallId, part.toolName, part.args, commandDefinitions).then(
+                  (executed) => {
+                    if (executed) {
+                      processedToolResults.add(part.toolCallId);
+                    }
+                    processingToolResults.delete(part.toolCallId);
                   }
-                  processingToolResults.delete(part.toolCallId);
-                });
+                );
               } else if (part.type === "tool-result" && part.result) {
                 processingToolResults.add(part.toolCallId);
-                void executeHostCommands(part.toolCallId, part.result).then((executed) => {
-                  if (executed) {
-                    processedToolResults.add(part.toolCallId);
+                void executeHostCommands(part.toolCallId, part.toolName, part.result, commandDefinitions).then(
+                  (executed) => {
+                    if (executed) {
+                      processedToolResults.add(part.toolCallId);
+                    }
+                    processingToolResults.delete(part.toolCallId);
                   }
-                  processingToolResults.delete(part.toolCallId);
-                });
+                );
               }
             }
           }
@@ -1909,9 +1950,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     xSize: {},
     xTheme: {},
     wakeWords: {},
+    wakeResponses: {},
     modelPath: {},
     projectId: {},
-    invokeUrl: {},
     voiceConfig: {},
     bubbleSize: {},
     bubbleDismissDelay: {}
@@ -1923,10 +1964,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (props.voiceConfig) return props.voiceConfig;
       return null;
     };
-    const endpoint = computed(() => {
-      return props.invokeUrl || "http://localhost:3001/agent/zyy55sw40nrl801056m0o/stream-invoke";
-    });
-    const wakeResponses = ["在呢"];
+    const wakeResponses = computed(() => props.wakeResponses || ["在呢"]);
     const tts = useTTS(getVoiceConfig);
     const bubbleBridge = {
       open: () => {
@@ -1936,8 +1974,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       scrollToBottom: () => {
       }
     };
+    const endpoint = `/sime/proxy/agent/${aiChatbotX.agentId()}/stream-invoke`;
     const agent = useAgentInvoke({
       endpoint,
+      appToken: aiChatbotX.appToken(),
       projectId: props.projectId,
       aiChatbotX,
       tts: {
@@ -1976,7 +2016,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       onWake: () => {
         interruptCurrentResponse();
         tts.warmUpAudio();
-        const text = wakeResponses[Math.floor(Math.random() * wakeResponses.length)];
+        const text = wakeResponses.value[Math.floor(Math.random() * wakeResponses.value.length)];
         tts.speak(text);
       },
       onTranscriptionDone: (text) => {
@@ -2082,7 +2122,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           unref(transcriptionText) || unref(isInvoking) ? (openBlock(), createElementBlock("div", _hoisted_11, toDisplayString(unref(isInvoking) ? "正在思考中..." : unref(transcriptionText)), 1)) : createCommentVNode("", true),
           createElementVNode("div", _hoisted_12, [
             createElementVNode("img", {
-              src: __props.xLogo ? __props.xLogo : "/sime.png",
+              src: __props.xLogo ? __props.xLogo : "/x.png",
               alt: "voice assistant",
               style: normalizeStyle({
                 width: `${__props.xSize?.width || 88}px`
@@ -2129,7 +2169,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   }
 });
 
-const voiceAssistant = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-fda883a9"]]);
+const voiceAssistant = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a88f03ab"]]);
 
 var clientCommandKey = /* @__PURE__ */ ((clientCommandKey2) => {
   clientCommandKey2["SET_THEME"] = "SiMeAgent_setTheme";