@baishuyun/chat-backend 0.0.16 → 0.0.17

package/.env.example

@@ -20,4 +20,7 @@ FILL_BOT_ID=xxxxx
 QUERY_BOT_ID=xxxxx
 
 # query suggest bot id
-QUERY_SUGGEST_BOT_ID=xxxx
+QUERY_SUGGEST_BOT_ID=xxxx
+
+# deepseek api key
+DS_API_KEY=sk-xxxx

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @baishuyun/chat-backend
 
+## 0.0.17
+
+### Patch Changes
+
+- Updated dependencies
+  - @baishuyun/coze-provider@0.0.17
+  - @baishuyun/agents@0.0.17
+  - @baishuyun/types@1.0.17
+
 ## 0.0.16
 
 ### Patch Changes

package/config/default.ts

@@ -1,3 +1,4 @@
+import { deepseek } from '@ai-sdk/deepseek';
 import { asyncConfig } from 'config/async.js';
 // load async configurations
 const fetchRemoteConfig = async () => {
@@ -18,6 +19,13 @@ export default {
 
     apiAuthKey: process.env.COZE_API_KEY,
 
+    deepseekApiKey: process.env.DS_API_KEY,
+
+    common: {
+      baseUrl: `http://${process.env.AGENT_HOST}/v3/`,
+      apiKey: process.env.BOT_API_KEY, // load from env
+    },
+
     form: {
       build: {
         botId: process.env.BUILD_BOT_ID || '7579927677256073216',

package/dist/config/default.js

@@ -1,3 +1,4 @@
+import { deepseek } from '@ai-sdk/deepseek';
 import { asyncConfig } from 'config/async.js';
 // load async configurations
 const fetchRemoteConfig = async () => {
@@ -14,6 +15,11 @@ export default {
     agent: {
         host: process.env.AGENT_HOST || '47.99.202.157',
         apiAuthKey: process.env.COZE_API_KEY,
+        deepseekApiKey: process.env.DS_API_KEY,
+        common: {
+            baseUrl: `http://${process.env.AGENT_HOST}/v3/`,
+            apiKey: process.env.BOT_API_KEY, // load from env
+        },
         form: {
             build: {
                 botId: process.env.BUILD_BOT_ID || '7579927677256073216',

package/dist/src/app/main.js

@@ -3,12 +3,14 @@
  */
 // 应用实例
 import app from '../config/hono.config.js';
+import { createCommonRouter } from '../routes/common/common.route.js';
 // 子路由
 import { createFormRouter } from '../routes/form/form.route.js';
 import { createReportRouter } from '../routes/report/report.route.js';
 // 挂载子路由
 app.route('web/api/form', createFormRouter());
 app.route('web/api/report', createReportRouter());
+app.route('web/api/common', createCommonRouter());
 // 基础健康检查
 app.get('/web/api/health', (c) => {
     return c.json({

package/dist/src/controllers/common/connect.controll.js

@@ -0,0 +1,20 @@
+import { convertToModelMessages, streamText } from 'ai';
+import { createBaseModel } from './model.js';
+export const connectToAgent = async (c) => {
+    let requestBody;
+    try {
+        const json = await c.req.json();
+        requestBody = json;
+    }
+    catch (_) {
+        return c.json({ error: 'Invalid JSON' }, 400);
+    }
+    const botId = requestBody.botId;
+    const messages = requestBody.messages;
+    const stream = streamText({
+        model: createBaseModel(botId),
+        messages: convertToModelMessages(messages),
+        includeRawChunks: true,
+    });
+    return stream.toUIMessageStreamResponse();
+};

package/dist/src/controllers/common/model.js

@@ -0,0 +1,10 @@
+import { createCoze } from '@baishuyun/coze-provider';
+import config from 'config';
+export const createBaseModel = (botId) => {
+    const coze = createCoze({
+        apiKey: config.get('agent.common.apiKey'),
+        baseURL: config.get('agent.common.baseUrl'),
+        botId: botId,
+    });
+    return coze.chat('chat');
+};

package/dist/src/controllers/form/build/build.controller.js

@@ -1,7 +1,10 @@
-import { convertToModelMessages, streamText } from "ai";
+import { convertToModelMessages, streamText, generateText } from "ai";
 import {} from "hono";
 import { createModel } from "./model.js";
 import { createFieldsJsonTransformStream, SuggestionTransformStream, } from "@baishuyun/coze-provider";
+import { logger } from "../../../logger/index.js";
+import config from 'config';
+import { determineUserIntentByInput } from "./utils.js";
 /**
  * 搭建表单
  * @param c
@@ -16,10 +19,16 @@ export const buildForm = async (c) => {
     catch (_) {
         return c.json({ error: "Invalid JSON" }, 400);
     }
-    const isBuildStage = requestBody.stage === "build";
-    const formName = requestBody.name || "未命名表单";
+    const intent = await determineUserIntentByInput(requestBody.text, requestBody.stage);
+    const isBuildStage = intent === "build";
+    const formName = requestBody.name;
+    const model = createModel([
+        () => createFieldsJsonTransformStream(isBuildStage),
+        () => new SuggestionTransformStream(isBuildStage),
+    ]);
+    logger.debug("intent: " + intent);
     const allMessages = [...requestBody.messages];
-    if (isBuildStage) {
+    if (isBuildStage && formName) {
         allMessages.push({
             role: "user",
             parts: [
@@ -30,11 +39,12 @@ export const buildForm = async (c) => {
             ],
         });
     }
+    // clear empty text parts to avoid unnecessary streaming
+    allMessages.forEach((message) => {
+        message.parts = message.parts.filter((part) => part.type === "text" && part.text.trim() !== "");
+    });
     const stream = streamText({
-        model: createModel([
-            () => createFieldsJsonTransformStream(isBuildStage),
-            () => new SuggestionTransformStream(isBuildStage),
-        ]),
+        model,
         messages: convertToModelMessages(allMessages),
         includeRawChunks: true,
         headers: {
@@ -43,17 +53,5 @@ export const buildForm = async (c) => {
             "x-user-token": c.req.header("authorization") || "",
         },
     });
-    const response = stream.toUIMessageStreamResponse();
-    // Add SSE keep-alive headers to prevent proxy timeouts during streaming
-    return new Response(response.body, {
-        status: response.status,
-        statusText: response.statusText,
-        headers: {
-            ...Object.fromEntries(response.headers),
-            'Connection': 'keep-alive',
-            'Keep-Alive': 'timeout=300',
-            'X-Accel-Buffering': 'no',
-            'Cache-Control': 'no-cache, no-transform',
-        },
-    });
+    return stream.toUIMessageStreamResponse();
 };

package/dist/src/controllers/form/build/model.js

@@ -1,3 +1,4 @@
+import { createFormBuildIntentAgent } from "@baishuyun/agents";
 import { createCoze } from "@baishuyun/coze-provider";
 import config from "config";
 export const createModel = (extraStreamTransformers) => {
@@ -9,3 +10,7 @@ export const createModel = (extraStreamTransformers) => {
     });
     return coze.chat("chat");
 };
+export const createUserIntentAgent = () => {
+    const dsApiKey = config.get("agent.deepseekApiKey");
+    return createFormBuildIntentAgent(dsApiKey);
+};

package/dist/src/controllers/form/build/utils.js

@@ -0,0 +1,30 @@
+import { createUserIntentAgent } from "./model.js";
+export const determineUserIntentByInput = async (input, userOriginIntent) => {
+    if (userOriginIntent === "design") {
+        return "design";
+    }
+    if (!input || input.trim() === "") {
+        return userOriginIntent;
+    }
+    const agent = createUserIntentAgent();
+    const intent = await agent.generate({
+        messages: [{
+                role: "user",
+                content: [{
+                        type: "text",
+                        text: input,
+                    }]
+            }]
+    });
+    const result = intent.response.messages;
+    if (!result || result.length === 0) {
+        return userOriginIntent;
+    }
+    const lastMessage = result[result.length - 1];
+    if (!lastMessage.content || lastMessage.content.length === 0) {
+        return userOriginIntent;
+    }
+    const lastContent = lastMessage.content[0];
+    const intentText = lastContent.text === "build" ? "build" : lastContent.text === "design" ? "design" : userOriginIntent;
+    return intentText;
+};

package/dist/src/controllers/form/fill/createFieldsFillingResultTransformStream.js

@@ -54,14 +54,13 @@ export const createFieldsFillingResultTransformer = (enableJsonParser) => {
             }
             catch (e) {
                 logger.debug('exception in transform while processing filling chunk');
-                // Enqueue error message before closing to allow client to receive it
+                controller.error(e);
                 enqueueTextDelta('error', {
                     type: 'agent-error',
                     error: '解析异常，请刷新重试',
                 });
                 resolveParseCompleted?.();
-                // Graceful close after error notification
-                controller.terminate();
+                controller.terminate(); // 信号通知下游可读流已关闭
             }
         },
         start: (controller) => {
@@ -107,14 +106,12 @@ export const createFieldsFillingResultTransformer = (enableJsonParser) => {
                     console.error('JsonWidgetStream: JSON Parsing Error:', err);
                     errorLogged = true;
                 }
-                // Enqueue error message before closing to allow client to receive it
                 enqueueTextDelta('error', {
                     type: 'agent-error',
                     error: '操作超时，请刷新重试',
                 });
                 resolveParseCompleted?.();
-                // Graceful close after error notification
-                controller.terminate();
+                controller.terminate(); // 信号通知下游可读流已关闭
             };
             parser.onEnd = () => {
                 enqueueTextDelta(' ', JSON.stringify({

package/dist/src/controllers/form/fill/fill.controller.js

@@ -61,19 +61,7 @@ export const fillForm = async (c) => {
             'x-user-token': c.req.header('authorization') || '',
         },
     });
-    const response = stream.toUIMessageStreamResponse({
+    return stream.toUIMessageStreamResponse({
         originalMessages: messages, // 建议添加，便于消息 ID 管理
     });
-    // Add SSE keep-alive headers to prevent proxy timeouts during streaming
-    return new Response(response.body, {
-        status: response.status,
-        statusText: response.statusText,
-        headers: {
-            ...Object.fromEntries(response.headers),
-            'Connection': 'keep-alive',
-            'Keep-Alive': 'timeout=300',
-            'X-Accel-Buffering': 'no',
-            'Cache-Control': 'no-cache, no-transform',
-        },
-    });
 };

package/dist/src/controllers/form/fill/utils.js

@@ -104,6 +104,7 @@ export function trimFormStructure(fields) {
                 widget: {
                     type: item.widget.type,
                     widgetName: item.widget.widgetName,
+                    noRepeat: item.widget.noRepeat, // 保留 noRepeat 属性
                 },
             }));
         }

package/dist/src/controllers/report/query/createQueryTransformStream.js

@@ -48,10 +48,18 @@ function handleParsedValue(ctx) {
     const { parsedInfo, getResult, currentChunkId, deltaChunkEnqueuer: enqueueTextDelta, ctrl } = ctx;
     const { value } = parsedInfo;
     logger.debug('Parsed JSON value: ' + JSON.stringify(value));
+    // aggregate 类型 —— name 字段触发，独立处理后直接返回
+    if (isTargetElement('$.name', parsedInfo)) {
+        handleAggregateName(ctx);
+        return;
+    }
     // Phase 0: 报表标题 —— 初始化结果并发送 text-start, 必须为起始字段
     if (isTargetElement('$.title', parsedInfo)) {
         handleTitle(ctx);
     }
+    // Phase 3: aggregate 结果无需后续字段处理
+    if (getResult().isAggregate)
+        return;
     // Phase 4: 按注册的 handler 分发字段处理
     for (const { path, handler } of fieldHandlers) {
         if (isTargetElement(path, parsedInfo)) {
@@ -70,6 +78,7 @@ function handleAggregateName(ctx) {
         title: value,
         source: 'aggregate',
         type: 'data_table',
+        isAggregate: true,
     });
     logger.debug('Parsed aggregate table title: ' + value);
     enqueueTextDelta(`${JSON.stringify(value)},`, { type: 'query-stream-parsed-info', result: JSON.stringify(getResult()) }, currentChunkId + 1, false);

package/dist/src/controllers/report/query/query.controller.js

@@ -36,19 +36,7 @@ export const queryReport = async (c) => {
             'x-user-id': Date.now().toString(), // uid,
         },
     });
-    const response = stream.toUIMessageStreamResponse({
+    return stream.toUIMessageStreamResponse({
         originalMessages: messages, // 建议添加，便于消息 ID 管理
     });
-    // Add SSE keep-alive headers to prevent proxy timeouts during streaming
-    return new Response(response.body, {
-        status: response.status,
-        statusText: response.statusText,
-        headers: {
-            ...Object.fromEntries(response.headers),
-            'Connection': 'keep-alive',
-            'Keep-Alive': 'timeout=300',
-            'X-Accel-Buffering': 'no',
-            'Cache-Control': 'no-cache, no-transform',
-        },
-    });
 };

package/dist/src/routes/common/common.route.js

@@ -0,0 +1,7 @@
+import { Hono } from 'hono';
+import { connectToAgent } from '../../controllers/common/connect.controll.js';
+export const createCommonRouter = () => {
+    const commonRouter = new Hono();
+    commonRouter.post('/connect', connectToAgent);
+    return commonRouter;
+};

package/dist/src/utils/createJsonStreamTransformer.js

@@ -83,8 +83,8 @@ class JsonStreamProcessor {
                     await this.parseCompleted;
                 logger.debug('Parser stopped gracefully');
             }
-            // Graceful close: don't call terminate() which abruptly closes the stream
-            // The stream will close naturally when all chunks are processed
+            if (!this.terminated)
+                controller.terminate();
         }
         catch (error) {
             controller.error(`Cleanup error: ${error}`);
@@ -160,14 +160,7 @@ class JsonStreamProcessor {
     terminateStream(controller) {
         this.completeParsing();
         this.terminated = true;
-        // Use error() instead of terminate() to signal an error condition
-        // This allows the stream to be properly handled by upstream consumers
-        try {
-            controller.error(new Error('Stream terminated due to error'));
-        }
-        catch (e) {
-            // Controller may already be closed, ignore
-        }
+        controller.terminate();
     }
     /** 向下游推送 agent-error 并终止流 */
     enqueueError(controller, error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baishuyun/chat-backend",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -22,8 +22,9 @@
     "parse-sse": "^0.1.0",
     "pino": "^10.1.0",
     "zod": "^4.1.13",
-    "@baishuyun/coze-provider": "0.0.16",
-    "@baishuyun/types": "1.0.16"
+    "@baishuyun/coze-provider": "0.0.17",
+    "@baishuyun/agents": "0.0.17",
+    "@baishuyun/types": "1.0.17"
   },
   "devDependencies": {
     "@types/config": "^3.3.5",
@@ -34,7 +35,7 @@
     "pm2": "^6.0.14",
     "tsx": "^4.7.1",
     "typescript": "^5.8.3",
-    "@baishuyun/typescript-config": "0.0.16"
+    "@baishuyun/typescript-config": "0.0.17"
   },
   "scripts": {
     "dev": "cross-env NODE_ENV=development tsx watch src/index.ts",

package/src/app/main.ts

@@ -4,6 +4,7 @@
 
 // 应用实例
 import app from '../config/hono.config.js';
+import { createCommonRouter } from '../routes/common/common.route.js';
 
 // 子路由
 import { createFormRouter } from '../routes/form/form.route.js';
@@ -12,6 +13,7 @@ import { createReportRouter } from '../routes/report/report.route.js';
 // 挂载子路由
 app.route('web/api/form', createFormRouter());
 app.route('web/api/report', createReportRouter());
+app.route('web/api/common', createCommonRouter());
 
 // 基础健康检查
 app.get('/web/api/health', (c) => {

package/src/controllers/common/connect.controll.ts

@@ -0,0 +1,24 @@
+import { convertToModelMessages, streamText } from 'ai';
+import type { Context } from 'hono';
+import { createBaseModel } from './model.js';
+
+export const connectToAgent = async (c: Context) => {
+  let requestBody;
+  try {
+    const json = await c.req.json();
+    requestBody = json;
+  } catch (_) {
+    return c.json({ error: 'Invalid JSON' }, 400);
+  }
+
+  const botId = requestBody.botId;
+  const messages = requestBody.messages;
+
+  const stream = streamText({
+    model: createBaseModel(botId),
+    messages: convertToModelMessages(messages),
+    includeRawChunks: true,
+  });
+
+  return stream.toUIMessageStreamResponse();
+};

package/src/controllers/common/model.ts

@@ -0,0 +1,12 @@
+import { createCoze } from '@baishuyun/coze-provider';
+import config from 'config';
+
+export const createBaseModel = (botId: string) => {
+  const coze = createCoze({
+    apiKey: config.get<string>('agent.common.apiKey'),
+    baseURL: config.get<string>('agent.common.baseUrl'),
+    botId: botId,
+  });
+
+  return coze.chat('chat');
+};

package/src/controllers/form/build/build.controller.ts

@@ -1,10 +1,13 @@
-import { convertToModelMessages, streamText, type TextUIPart } from "ai";
+import { convertToModelMessages, streamText, generateText, type TextUIPart } from "ai";
 import { type Context } from "hono";
 import { createModel } from "./model.js";
 import {
   createFieldsJsonTransformStream,
   SuggestionTransformStream,
 } from "@baishuyun/coze-provider";
+import { logger } from "../../../logger/index.js";
+import config from 'config';
+import { determineUserIntentByInput } from "./utils.js";
 
 /**
  * 搭建表单
@@ -21,11 +24,19 @@ export const buildForm = async (c: Context) => {
     return c.json({ error: "Invalid JSON" }, 400);
   }
 
-  const isBuildStage = requestBody.stage === "build";
-  const formName = requestBody.name || "未命名表单";
+  const intent = await determineUserIntentByInput(requestBody.text, requestBody.stage);
+
+  const isBuildStage = intent === "build";
+  const formName = requestBody.name;
+  const model = createModel([
+    () => createFieldsJsonTransformStream(isBuildStage),
+    () => new SuggestionTransformStream(isBuildStage),
+  ]);
+
+  logger.debug("intent: " + intent);
 
   const allMessages = [...requestBody.messages];
-  if (isBuildStage) {
+  if (isBuildStage && formName) {
     allMessages.push({
       role: "user",
       parts: [
@@ -45,10 +56,7 @@ export const buildForm = async (c: Context) => {
   });
 
   const stream = streamText({
-    model: createModel([
-      () => createFieldsJsonTransformStream(isBuildStage),
-      () => new SuggestionTransformStream(isBuildStage),
-    ]),
+    model,
     messages: convertToModelMessages(allMessages),
     includeRawChunks: true,
     headers: {

package/src/controllers/form/build/model.ts

@@ -1,4 +1,5 @@
 import type { LanguageModelV2StreamPart } from "@ai-sdk/provider";
+import { createFormBuildIntentAgent } from "@baishuyun/agents";
 import { createCoze } from "@baishuyun/coze-provider";
 import config from "config";
 
@@ -14,3 +15,8 @@ export const createModel = (
 
   return coze.chat("chat");
 };
+
+export const createUserIntentAgent = () => {
+  const dsApiKey = config.get<string>("agent.deepseekApiKey");
+  return createFormBuildIntentAgent(dsApiKey);
+}

package/src/controllers/form/build/utils.ts

@@ -0,0 +1,43 @@
+import { createUserIntentAgent } from "./model.js"
+
+export const determineUserIntentByInput = async (input: string, userOriginIntent: "build" | "design" | null): Promise<"build" | "design" | null> => {
+    if (userOriginIntent === "design") {
+        return "design";
+    }
+
+    if (!input || input.trim() === "") {
+        return userOriginIntent;
+    }
+
+  const agent = createUserIntentAgent();
+
+  const intent = await agent.generate({
+    messages: [{
+      role: "user",
+      content: [{
+        type: "text",
+        text: input,
+      }]
+    }]
+  })
+
+  const result = intent.response.messages;
+  if (!result || result.length === 0) {
+    return userOriginIntent;
+  }
+
+  const lastMessage = result[result.length - 1];
+
+  if (!lastMessage.content || lastMessage.content.length === 0) {
+    return userOriginIntent;
+  }
+
+  const lastContent = lastMessage.content[0] as {
+    type: "text";
+    text: string;
+  };
+
+  const intentText = lastContent.text === "build" ? "build" : lastContent.text === "design" ? "design" : userOriginIntent;
+
+  return intentText;
+}

package/src/controllers/form/fill/utils.ts

@@ -166,6 +166,7 @@ export function trimFormStructure(fields: OriginalField[]): TrimmedField[] {
           widget: {
             type: item.widget.type,
             widgetName: item.widget.widgetName,
+            noRepeat: item.widget.noRepeat, // 保留 noRepeat 属性
           },
         }));
     }

package/src/routes/common/common.route.ts

@@ -0,0 +1,10 @@
+import { Hono } from 'hono';
+import { connectToAgent } from '../../controllers/common/connect.controll.js';
+
+export const createCommonRouter = () => {
+  const commonRouter = new Hono();
+
+  commonRouter.post('/connect', connectToAgent);
+
+  return commonRouter;
+};