chattercatcher 0.1.27 → 0.1.28

package/dist/cli.js

@@ -8,7 +8,7 @@ import fs15 from "fs/promises";
 // package.json
 var package_default = {
   name: "chattercatcher",
-  version: "0.1.27",
+  version: "0.1.28",
   description: "\u672C\u5730\u4F18\u5148\u7684\u98DE\u4E66/Lark \u5BB6\u5EAD\u7FA4\u77E5\u8BC6\u5E93\u673A\u5668\u4EBA",
   type: "module",
   main: "dist/index.js",
@@ -971,6 +971,7 @@ function getGatewayStatus(config, secrets) {
 }
 
 // src/llm/openai-compatible.ts
+var OPENAI_EMBEDDING_BATCH_SIZE = 64;
 function normalizeBaseUrl(baseUrl) {
   return baseUrl.replace(/\/+$/, "");
 }
@@ -1002,12 +1003,66 @@ function toOpenAITool(tool) {
     }
   };
 }
+function parseToolCallArguments(value) {
+  try {
+    return JSON.parse(value);
+  } catch {
+    return {};
+  }
+}
+function decodeDsmlValue(value, isString) {
+  const trimmed = value.trim();
+  if (isString) {
+    return trimmed;
+  }
+  if (trimmed === "true") return true;
+  if (trimmed === "false") return false;
+  if (trimmed === "null") return null;
+  const numberValue = Number(trimmed);
+  if (trimmed && Number.isFinite(numberValue)) {
+    return numberValue;
+  }
+  return trimmed;
+}
+function parseDsmlToolCalls(content) {
+  if (!content?.includes("DSML")) {
+    return [];
+  }
+  const toolCalls = [];
+  const invokePattern = /<｜｜DSML｜｜invoke\s+name="([^"]+)"\s*>([\s\S]*?)<\/｜｜DSML｜｜invoke>/g;
+  const parameterPattern = /<｜｜DSML｜｜parameter\s+name="([^"]+)"\s+string="(true|false)"\s*>([\s\S]*?)<\/｜｜DSML｜｜parameter>/g;
+  for (const invoke of content.matchAll(invokePattern)) {
+    const name = invoke[1];
+    if (!name) {
+      continue;
+    }
+    const input2 = {};
+    const body = invoke[2] ?? "";
+    for (const parameter of body.matchAll(parameterPattern)) {
+      const parameterName = parameter[1];
+      if (!parameterName) {
+        continue;
+      }
+      input2[parameterName] = decodeDsmlValue(parameter[3] ?? "", parameter[2] === "true");
+    }
+    toolCalls.push({
+      id: `dsml_${toolCalls.length + 1}`,
+      name,
+      input: input2
+    });
+  }
+  return toolCalls;
+}
 function parseToolCalls(message) {
-  return message?.tool_calls?.map((toolCall) => ({
+  const standardToolCalls = message?.tool_calls?.map((toolCall) => ({
     id: toolCall.id,
     name: toolCall.function.name,
-    input: JSON.parse(toolCall.function.arguments)
+    input: parseToolCallArguments(toolCall.function.arguments)
   })) ?? [];
+  return standardToolCalls.length > 0 ? standardToolCalls : parseDsmlToolCalls(message?.content);
+}
+function isDsmlToolCallContent(content) {
+  return parseDsmlToolCalls(content).length > 0;
 }
 var OpenAICompatibleChatModel = class {
   constructor(options) {
@@ -1066,9 +1121,10 @@ var OpenAICompatibleChatModel = class {
     }
     const data2 = await response.json();
     const message = data2.choices?.[0]?.message;
+    const toolCalls = parseToolCalls(message);
     return {
-      content: message?.content ?? "",
-      toolCalls: parseToolCalls(message),
+      content: toolCalls.length > 0 && isDsmlToolCallContent(message?.content) ? "" : message?.content ?? "",
+      toolCalls,
       reasoningContent: message?.reasoning_content ?? void 0
     };
   }
@@ -1086,6 +1142,13 @@ var OpenAICompatibleEmbeddingModel = class {
     if (!this.options.baseUrl || !this.options.apiKey || !this.options.model) {
       throw new Error("Embedding \u914D\u7F6E\u4E0D\u5B8C\u6574\u3002\u8BF7\u8FD0\u884C chattercatcher setup \u6216 chattercatcher settings\u3002");
     }
+    const vectors = [];
+    for (let index2 = 0; index2 < texts.length; index2 += OPENAI_EMBEDDING_BATCH_SIZE) {
+      vectors.push(...await this.fetchEmbeddingBatch(texts.slice(index2, index2 + OPENAI_EMBEDDING_BATCH_SIZE)));
+    }
+    return vectors;
+  }
+  async fetchEmbeddingBatch(texts) {
     const response = await fetch(`${normalizeBaseUrl(this.options.baseUrl)}/embeddings`, {
       method: "POST",
       headers: {
@@ -3263,12 +3326,20 @@ function parseExactNumber2(field, min, max) {
 }
 
 // src/rag/indexer.ts
+var EMBEDDING_INDEX_BATCH_SIZE = 64;
 async function indexMessageChunks(input2) {
   const chunks = input2.messageIds ? input2.messages.listMessageChunksByMessageIds(input2.messageIds, input2.limit ?? 1e4) : input2.messages.listAllMessageChunks(input2.limit ?? 1e4);
   if (chunks.length === 0) {
     return { chunks: 0, vectors: 0 };
   }
-  const vectors = await input2.embedding.embedBatch(chunks.map((chunk) => chunk.text));
+  const vectors = [];
+  for (let index2 = 0; index2 < chunks.length; index2 += EMBEDDING_INDEX_BATCH_SIZE) {
+    vectors.push(
+      ...await input2.embedding.embedBatch(
+        chunks.slice(index2, index2 + EMBEDDING_INDEX_BATCH_SIZE).map((chunk) => chunk.text)
+      )
+    );
+  }
   const records = [];
   for (const [index2, chunk] of chunks.entries()) {
     const vector = vectors[index2];
@@ -3823,6 +3894,9 @@ var DEFAULT_MAX_MODEL_TURNS = 4;
 var DEFAULT_MAX_TOOL_CALLS = 8;
 var FEISHU_TOOL_LOOP_FALLBACK = "\u5B9A\u65F6\u4EFB\u52A1\u64CD\u4F5C\u5DF2\u63D0\u4EA4\uFF0C\u4F46\u6A21\u578B\u6CA1\u6709\u751F\u6210\u6700\u7EC8\u56DE\u590D\u3002";
 var FEISHU_TOOL_LOOP_LIMIT_REACHED = "\u5DE5\u5177\u8C03\u7528\u6B21\u6570\u5DF2\u8FBE\u5230\u4E0A\u9650\uFF0C\u8BF7\u7F29\u5C0F\u8BF7\u6C42\u540E\u91CD\u8BD5\u3002";
+function containsRawToolCallMarkup(content) {
+  return /<｜｜DSML｜｜tool_calls>|<｜｜DSML｜｜invoke\s+name=|<tool_call>|<tool_calls>/i.test(content);
+}
 function toToolResultContent(value) {
   if (typeof value === "string") return value;
   return JSON.stringify(value);
@@ -3865,6 +3939,7 @@ async function runFeishuToolLoop(input2) {
   let toolCallsUsed = 0;
   for (let turn = 0; turn < maxModelTurns; turn += 1) {
     const assistantResult = await input2.model.completeWithTools(messages, input2.tools);
+    const hasRawToolCallMarkup = containsRawToolCallMarkup(assistantResult.content);
     messages.push({
       role: "assistant",
       content: assistantResult.content,
@@ -3872,6 +3947,9 @@ async function runFeishuToolLoop(input2) {
       reasoningContent: assistantResult.reasoningContent
     });
     if (assistantResult.toolCalls.length === 0) {
+      if (hasRawToolCallMarkup) {
+        break;
+      }
       return assistantResult.content || FEISHU_TOOL_LOOP_FALLBACK;
     }
     for (const toolCall of assistantResult.toolCalls) {
@@ -3984,7 +4062,7 @@ var FeishuQuestionHandler = class {
     }
     if (this.options.sender.addReactionToMessage) {
       try {
-        await this.options.sender.addReactionToMessage(messageId, this.options.thinkingEmojiType ?? "keyboard");
+        await this.options.sender.addReactionToMessage(messageId, this.options.thinkingEmojiType ?? "OK");
         return;
       } catch (error) {
         console.log(`\u98DE\u4E66\u63D0\u95EE\u8868\u60C5\u53CD\u9988\u5931\u8D25\uFF0C\u6539\u7528\u6587\u5B57\u53CD\u9988\uFF1A${error instanceof Error ? error.message : String(error)}`);