plugin-custom-llm 1.1.1 → 1.2.1

package/README.md

@@ -7,7 +7,9 @@ NocoBase plugin for integrating external LLM providers that support OpenAI-compa
 - **OpenAI-compatible**: Works with any LLM provider exposing `/chat/completions` endpoint
 - **Auto content detection**: Handles both string and array content blocks (`[{type: 'text', text: '...'}]`)
 - **Response mapping**: Transform non-standard API responses to OpenAI format via JSON config (supports streaming SSE and JSON)
-- **Reasoning content**: Display thinking/reasoning from DeepSeek-compatible providers
+- **Reasoning content**: Display thinking/reasoning from DeepSeek-compatible providers (multi-path detection)
+- **Stream keepalive**: Prevent proxy/gateway timeouts during long model thinking phases
+- **Tool calling support**: Gemini-compatible tool schema fixing (Zod + JSON Schema)
 - **Configurable**: JSON config editors for request and response customization
 - **Locale support**: English, Vietnamese, Chinese
 
@@ -23,6 +25,11 @@ Upload `plugin-custom-llm-x.x.x.tgz` via NocoBase Plugin Manager UI, then enable
 |---|---|
 | **Base URL** | LLM endpoint URL, e.g. `https://your-llm-server.com/v1` |
 | **API Key** | Authentication key |
+| **Disable Streaming** | Disable streaming for models that return empty stream values |
+| **Stream Keep Alive** | Enable keepalive to prevent timeouts during long thinking phases |
+| **Keep Alive Interval** | Interval in ms between keepalive signals (default: 5000) |
+| **Keep Alive Content** | Visual indicator text during keepalive (default: `...`) |
+| **Timeout** | Custom timeout in ms for slow-responding models |
 | **Request config (JSON)** | Optional. Extra request configuration |
 | **Response config (JSON)** | Optional. Response parsing and mapping configuration |
 
@@ -72,6 +79,26 @@ Upload `plugin-custom-llm-x.x.x.tgz` via NocoBase Plugin Manager UI, then enable
 
 Standard OpenAI-compatible parameters: temperature, max tokens, top P, frequency/presence penalty, response format, timeout, max retries.
 
+## Changelog
+
+### v1.2.0
+
+- **Fix**: Keepalive no longer interferes with tool call sequences (prevents tool call corruption)
+- **Fix**: Gemini-compatible tool schema fixing — handles Zod schemas via dual-phase approach (pre/post conversion)
+- **Fix**: Keepalive content no longer contaminates saved messages in DB
+- **Fix**: Response metadata extraction with long ID sanitization (>128 chars truncated)
+- **Fix**: Multi-path reasoning content detection (`additional_kwargs` + `kwargs.additional_kwargs`)
+- **Fix**: Improved error recovery in keepalive consumer (immediate error propagation)
+
+### v1.1.1
+
+- Stream keepalive proxy for long thinking phases
+- Response mapping for non-standard LLM APIs
+
+### v1.0.0
+
+- Initial release with OpenAI-compatible LLM provider support
+
 ## License
 
 Apache-2.0

package/dist/client/index.d.ts

@@ -0,0 +1,8 @@
+import { Plugin } from '@nocobase/client';
+export declare class PluginCustomLLMClient extends Plugin {
+    afterAdd(): Promise<void>;
+    beforeLoad(): Promise<void>;
+    load(): Promise<void>;
+    private get aiPlugin();
+}
+export default PluginCustomLLMClient;

package/dist/client/index.js

@@ -1,10 +1 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
 !function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("react"),require("@nocobase/plugin-ai/client"),require("@nocobase/client"),require("@nocobase/utils/client"),require("antd"),require("react-i18next")):"function"==typeof define&&define.amd?define("plugin-custom-llm",["react","@nocobase/plugin-ai/client","@nocobase/client","@nocobase/utils/client","antd","react-i18next"],t):"object"==typeof exports?exports["plugin-custom-llm"]=t(require("react"),require("@nocobase/plugin-ai/client"),require("@nocobase/client"),require("@nocobase/utils/client"),require("antd"),require("react-i18next")):e["plugin-custom-llm"]=t(e.react,e["@nocobase/plugin-ai/client"],e["@nocobase/client"],e["@nocobase/utils/client"],e.antd,e["react-i18next"])}(self,function(e,t,n,o,r,i){return function(){"use strict";var a={772:function(e){e.exports=n},645:function(e){e.exports=t},584:function(e){e.exports=o},721:function(e){e.exports=r},156:function(t){t.exports=e},238:function(e){e.exports=i}},c={};function u(e){var t=c[e];if(void 0!==t)return t.exports;var n=c[e]={exports:{}};return a[e](n,n.exports,u),n.exports}u.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return u.d(t,{a:t}),t},u.d=function(e,t){for(var n in t)u.o(t,n)&&!u.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:t[n]})},u.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},u.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var l={};return!function(){u.r(l),u.d(l,{PluginCustomLLMClient:function(){return g},default:function(){return S}});var e=u(772),t=u(156),n=u.n(t),o=u(584),r=u(238),i="@nocobase/plugin-custom-llm",a=u(721),c=u(645),p=function(){var t=(0,r.useTranslation)(i,{nsMode:"fallback"}).t;return n().createElement("div",{style:{marginBottom:24}},n().createElement(a.Collapse,{bordered:!1,size:"small",items:[{key:"options",label:t("Options"),forceRender:!0,children:n().createElement(e.SchemaComponent,{schema:{type:"void",name:"custom-llm",properties:{temperature:{title:(0,o.tval)("Temperature",{ns:i}),type:"number","x-decorator":"FormItem","x-component":"InputNumber",default:.7,"x-component-props":{step:.1,min:0,max:2}},maxCompletionTokens:{title:(0,o.tval)("Max completion tokens",{ns:i}),type:"number","x-decorator":"FormItem","x-component":"InputNumber",default:-1},topP:{title:(0,o.tval)("Top P",{ns:i}),type:"number","x-decorator":"FormItem","x-component":"InputNumber",default:1,"x-component-props":{step:.1,min:0,max:1}},frequencyPenalty:{title:(0,o.tval)("Frequency penalty",{ns:i}),type:"number","x-decorator":"FormItem","x-component":"InputNumber",default:0,"x-component-props":{step:.1,min:-2,max:2}},presencePenalty:{title:(0,o.tval)("Presence penalty",{ns:i}),type:"number","x-decorator":"FormItem","x-component":"InputNumber",default:0,"x-component-props":{step:.1,min:-2,max:2}},responseFormat:{title:(0,o.tval)("Response format",{ns:i}),type:"string","x-decorator":"FormItem","x-component":"Select",enum:[{label:t("Text"),value:"text"},{label:t("JSON"),value:"json_object"}],default:"text"},timeout:{title:(0,o.tval)("Timeout (ms)",{ns:i}),type:"number","x-decorator":"FormItem","x-component":"InputNumber",default:6e4},maxRetries:{title:(0,o.tval)("Max retries",{ns:i}),type:"number","x-decorator":"FormItem","x-component":"InputNumber",default:1}}}})}]}))},s={components:{ProviderSettingsForm:function(){return n().createElement(e.SchemaComponent,{schema:{type:"void",properties:{apiKey:{title:(0,o.tval)("API Key",{ns:i}),type:"string",required:!0,"x-decorator":"FormItem","x-component":"TextAreaWithGlobalScope"},disableStream:{title:(0,o.tval)("Disable streaming",{ns:i}),type:"boolean","x-decorator":"FormItem","x-component":"Checkbox","x-content":(0,o.tval)("Disable streaming description",{ns:i})},streamKeepAlive:{title:(0,o.tval)("Stream keepalive",{ns:i}),type:"boolean","x-decorator":"FormItem","x-component":"Checkbox","x-content":(0,o.tval)("Stream keepalive description",{ns:i})},keepAliveIntervalMs:{title:(0,o.tval)("Keepalive interval (ms)",{ns:i}),type:"number","x-decorator":"FormItem","x-component":"InputNumber","x-component-props":{placeholder:"5000",min:1e3,step:1e3,style:{width:"100%"}},description:(0,o.tval)("Keepalive interval description",{ns:i})},keepAliveContent:{title:(0,o.tval)("Keepalive content",{ns:i}),type:"string","x-decorator":"FormItem","x-component":"Input","x-component-props":{placeholder:"..."},description:(0,o.tval)("Keepalive content description",{ns:i})},timeout:{title:(0,o.tval)("Timeout (ms)",{ns:i}),type:"number","x-decorator":"FormItem","x-component":"InputNumber","x-component-props":{placeholder:"120000",min:0,step:1e3,style:{width:"100%"}},description:(0,o.tval)("Timeout description",{ns:i})},requestConfig:{title:(0,o.tval)("Request config (JSON)",{ns:i}),type:"string","x-decorator":"FormItem","x-component":"Input.TextArea","x-component-props":{placeholder:JSON.stringify({extraHeaders:{},extraBody:{},modelKwargs:{}},null,2),rows:6,style:{fontFamily:"monospace",fontSize:12}},description:(0,o.tval)("Request config description",{ns:i})},responseConfig:{title:(0,o.tval)("Response config (JSON)",{ns:i}),type:"string","x-decorator":"FormItem","x-component":"Input.TextArea","x-component-props":{placeholder:JSON.stringify({contentPath:"auto",reasoningKey:"reasoning_content",responseMapping:{content:"message.response"}},null,2),rows:8,style:{fontFamily:"monospace",fontSize:12}},description:(0,o.tval)("Response config description",{ns:i})}}}})},ModelSettingsForm:function(){return n().createElement(e.SchemaComponent,{components:{Options:p,ModelSelect:c.ModelSelect},schema:{type:"void",properties:{model:{title:(0,o.tval)("Model",{ns:i}),type:"string",required:!0,"x-decorator":"FormItem","x-component":"ModelSelect"},options:{type:"void","x-component":"Options"}}}})}}};function m(e,t,n,o,r,i,a){try{var c=e[i](a),u=c.value}catch(e){n(e);return}c.done?t(u):Promise.resolve(u).then(o,r)}function f(e){return function(){var t=this,n=arguments;return new Promise(function(o,r){var i=e.apply(t,n);function a(e){m(i,o,r,a,c,"next",e)}function c(e){m(i,o,r,a,c,"throw",e)}a(void 0)})}}function d(e,t,n){return(d=x()?Reflect.construct:function(e,t,n){var o=[null];o.push.apply(o,t);var r=new(Function.bind.apply(e,o));return n&&b(r,n.prototype),r}).apply(null,arguments)}function y(e){return(y=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function b(e,t){return(b=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function v(e){var t="function"==typeof Map?new Map:void 0;return(v=function(e){if(null===e||-1===Function.toString.call(e).indexOf("[native code]"))return e;if("function"!=typeof e)throw TypeError("Super expression must either be null or a function");if(void 0!==t){if(t.has(e))return t.get(e);t.set(e,n)}function n(){return d(e,arguments,y(this).constructor)}return n.prototype=Object.create(e.prototype,{constructor:{value:n,enumerable:!1,writable:!0,configurable:!0}}),b(n,e)})(e)}function x(){try{var e=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}))}catch(e){}return(x=function(){return!!e})()}function h(e,t){var n,o,r,i,a={label:0,sent:function(){if(1&r[0])throw r[1];return r[1]},trys:[],ops:[]};return i={next:c(0),throw:c(1),return:c(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function c(i){return function(c){var u=[i,c];if(n)throw TypeError("Generator is already executing.");for(;a;)try{if(n=1,o&&(r=2&u[0]?o.return:u[0]?o.throw||((r=o.return)&&r.call(o),0):o.next)&&!(r=r.call(o,u[1])).done)return r;switch(o=0,r&&(u=[2&u[0],r.value]),u[0]){case 0:case 1:r=u;break;case 4:return a.label++,{value:u[1],done:!1};case 5:a.label++,o=u[1],u=[0];continue;case 7:u=a.ops.pop(),a.trys.pop();continue;default:if(!(r=(r=a.trys).length>0&&r[r.length-1])&&(6===u[0]||2===u[0])){a=0;continue}if(3===u[0]&&(!r||u[1]>r[0]&&u[1]<r[3])){a.label=u[1];break}if(6===u[0]&&a.label<r[1]){a.label=r[1],r=u;break}if(r&&a.label<r[2]){a.label=r[2],a.ops.push(u);break}r[2]&&a.ops.pop(),a.trys.pop();continue}u=t.call(e,a)}catch(e){u=[6,e],o=0}finally{n=r=0}if(5&u[0])throw u[1];return{value:u[0]?u[1]:void 0,done:!0}}}}var g=function(e){var t;if("function"!=typeof e&&null!==e)throw TypeError("Super expression must either be null or a function");function n(){var e,t;if(!(this instanceof n))throw TypeError("Cannot call a class as a function");return e=n,t=arguments,e=y(e),function(e,t){var n;if(t&&("object"==((n=t)&&"undefined"!=typeof Symbol&&n.constructor===Symbol?"symbol":typeof n)||"function"==typeof t))return t;if(void 0===e)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(this,x()?Reflect.construct(e,t||[],y(this).constructor):e.apply(this,t))}return n.prototype=Object.create(e&&e.prototype,{constructor:{value:n,writable:!0,configurable:!0}}),e&&b(n,e),t=[{key:"afterAdd",value:function(){return f(function(){return h(this,function(e){return[2]})})()}},{key:"beforeLoad",value:function(){return f(function(){return h(this,function(e){return[2]})})()}},{key:"load",value:function(){var e=this;return f(function(){return h(this,function(t){return e.aiPlugin.aiManager.registerLLMProvider("custom-llm",s),[2]})})()}},{key:"aiPlugin",get:function(){return this.app.pm.get("ai")}}],function(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}(n.prototype,t),n}(v(e.Plugin)),S=g}(),l}()});

package/dist/client/llm-providers/custom-llm/ModelSettings.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const ModelSettingsForm: React.FC;

package/dist/client/llm-providers/custom-llm/ProviderSettings.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const ProviderSettingsForm: React.FC;

package/dist/client/llm-providers/custom-llm/index.d.ts

@@ -0,0 +1,2 @@
+import { LLMProviderOptions } from '@nocobase/plugin-ai/client';
+export declare const customLLMProviderOptions: LLMProviderOptions;

package/dist/client/locale.d.ts

@@ -0,0 +1,2 @@
+export declare const namespace = "@nocobase/plugin-custom-llm";
+export declare function useT(): import("react-i18next").TFunction<"@nocobase/plugin-custom-llm", undefined>;

package/dist/client/models/index.d.ts

@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+declare const _default: Record<string, ModelConstructor>;
+export default _default;

package/dist/client/plugin.d.ts

@@ -0,0 +1,5 @@
+import { Plugin } from '@nocobase/client';
+export declare class PluginCustomLlmClient extends Plugin {
+    load(): Promise<void>;
+}
+export default PluginCustomLlmClient;

package/dist/externalVersion.js

@@ -1,20 +1,13 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
 module.exports = {
-  "@nocobase/client": "2.0.15",
-  "@nocobase/plugin-ai": "2.0.15",
+  "@nocobase/client": "2.0.20",
+  "@nocobase/plugin-ai": "2.0.20",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "2.0.15",
-  "@nocobase/flow-engine": "2.0.15",
-  "@nocobase/database": "2.0.15",
-  "react": "18.2.0",
-  "@nocobase/utils": "2.0.15",
+  "@nocobase/server": "2.0.20",
+  "@nocobase/flow-engine": "2.0.20",
+  "@nocobase/database": "2.0.20",
+  "axios": "1.14.0",
+  "@nocobase/actions": "2.0.20",
+  "react": "18.3.1",
+  "@nocobase/utils": "2.0.20",
   "antd": "5.24.2"
 };

package/dist/index.d.ts

@@ -0,0 +1,2 @@
+export * from './server';
+export { default } from './server';

package/dist/index.js

@@ -1,12 +1,3 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/dist/server/index.d.ts

@@ -0,0 +1 @@
+export { default } from './plugin';

package/dist/server/index.js

@@ -1,12 +1,3 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/dist/server/llm-providers/custom-llm.d.ts

@@ -0,0 +1,54 @@
+import { LLMProvider, LLMProviderMeta } from '@nocobase/plugin-ai';
+import { Model } from '@nocobase/database';
+import { Context } from '@nocobase/actions';
+import type { ParsedAttachmentResult } from '@nocobase/plugin-ai';
+export declare class CustomLLMProvider extends LLMProvider {
+    get baseURL(): any;
+    private get requestConfig();
+    private get responseConfig();
+    createModel(): any;
+    parseResponseChunk(chunk: any): string | null;
+    parseResponseMessage(message: Model): {
+        key: Model;
+        content: Record<string, any>;
+        role: Model;
+    };
+    parseReasoningContent(chunk: any): {
+        status: string;
+        content: string;
+    } | null;
+    /**
+     * Extract response metadata from LLM output for post-save enrichment.
+     * Sanitizes overly long message IDs from Gemini or other providers.
+     */
+    parseResponseMetadata(output: any): any;
+    parseResponseError(err: any): any;
+    /**
+     * Self-contained file reading that correctly handles the APP_PUBLIC_PATH prefix.
+     *
+     * plugin-ai's encodeLocalFile does path.join(cwd, url) without stripping
+     * APP_PUBLIC_PATH, so when the app is deployed under a sub-path (e.g. /my-app)
+     * the resolved path becomes '{cwd}/my-app/storage/uploads/…' which does not exist.
+     * We cannot fix that in plugin-ai (core), so we re-implement file reading here
+     * with the prefix stripped before the cwd join.
+     */
+    private readFileAsBase64;
+    /**
+     * Override parseAttachment to convert all attachments into formats that
+     * generic OpenAI-compatible endpoints actually support:
+     *
+     *   - Images     → image_url block with base64 data URI (vision models)
+     *   - Text files → text block with decoded UTF-8 content
+     *   - Binary     → text block with base64 data URI (multi-modal or fallback)
+     *
+     * The base-class implementation returns a LangChain ContentBlock.Multimodal.File
+     * (`type: 'file'`) for non-image attachments. LangChain serialises this as the
+     * newer OpenAI Files API format which most custom/local endpoints do NOT understand,
+     * causing file content to be silently dropped.
+     *
+     * This method is entirely self-contained — it does not call super — so it is
+     * safe to use without modifying plugin-ai core.
+     */
+    parseAttachment(ctx: Context, attachment: any): Promise<ParsedAttachmentResult>;
+}
+export declare const customLLMProviderOptions: LLMProviderMeta;

package/dist/server/llm-providers/custom-llm.js

@@ -1,12 +1,3 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -42,6 +33,8 @@ __export(custom_llm_exports, {
 module.exports = __toCommonJS(custom_llm_exports);
 var import_plugin_ai = require("@nocobase/plugin-ai");
 var import_node_path = __toESM(require("node:path"));
+var import_promises = __toESM(require("node:fs/promises"));
+var import_axios = __toESM(require("axios"));
 const KEEPALIVE_PREFIX = "\u200B\u200B\u200B";
 function requireFromApp(moduleName) {
   const appNodeModules = process.env.NODE_MODULES_PATH || import_node_path.default.join(process.cwd(), "node_modules");
@@ -100,11 +93,41 @@ function extractTextContent(content, contentPath) {
   }
   return "";
 }
-function safeParseJSON(str) {
+function isTextMimetype(mimetype) {
+  if (!mimetype) return false;
+  if (mimetype.startsWith("text/")) return true;
+  const TEXT_APPLICATION_TYPES = /* @__PURE__ */ new Set([
+    "application/json",
+    "application/xml",
+    "application/xhtml+xml",
+    "application/atom+xml",
+    "application/rss+xml",
+    "application/csv",
+    "application/javascript",
+    "application/typescript",
+    "application/x-javascript",
+    "application/x-typescript",
+    "application/x-yaml",
+    "application/yaml",
+    "application/x-json",
+    "application/geo+json",
+    "application/ld+json",
+    "application/manifest+json",
+    "application/graphql",
+    "application/x-www-form-urlencoded",
+    "application/toml",
+    "application/x-sh",
+    "application/x-shellscript",
+    "application/sql"
+  ]);
+  return TEXT_APPLICATION_TYPES.has(mimetype);
+}
+function safeParseJSON(str, fieldName) {
   if (!str || typeof str !== "string") return {};
   try {
     return JSON.parse(str);
-  } catch {
+  } catch (e) {
+    console.warn(`[CustomLLM] Failed to parse ${fieldName || "JSON config"}: ${e.message}`);
     return {};
   }
 }
@@ -170,13 +193,13 @@ function createMappingFetch(responseMapping) {
 
 `));
                     } else {
-                      controller.enqueue(encoder.encode(line + "\n"));
+                      controller.enqueue(encoder.encode(line + "\n\n"));
                     }
                   } catch {
-                    controller.enqueue(encoder.encode(line + "\n"));
+                    controller.enqueue(encoder.encode(line + "\n\n"));
                   }
                 } else {
-                  controller.enqueue(encoder.encode(line + "\n"));
+                  controller.enqueue(encoder.encode(line + "\n\n"));
                 }
               }
             }
@@ -236,9 +259,16 @@ function wrapWithStreamKeepAlive(model, options) {
     let streamDone = false;
     let streamError = null;
     let notifyReady = null;
+    let hasToolCallChunks = false;
+    let hasErrored = false;
     const consumer = (async () => {
+      var _a, _b;
       try {
         for await (const chunk of baseIterator) {
+          const msg = chunk == null ? void 0 : chunk.message;
+          if (((_a = msg == null ? void 0 : msg.tool_call_chunks) == null ? void 0 : _a.length) || ((_b = msg == null ? void 0 : msg.tool_calls) == null ? void 0 : _b.length)) {
+            hasToolCallChunks = true;
+          }
           buffer.push(chunk);
           if (notifyReady) {
             notifyReady();
@@ -247,6 +277,11 @@ function wrapWithStreamKeepAlive(model, options) {
         }
       } catch (err) {
         streamError = err;
+        hasErrored = true;
+        if (notifyReady) {
+          notifyReady();
+          notifyReady = null;
+        }
       } finally {
         streamDone = true;
         if (notifyReady) {
@@ -260,6 +295,7 @@ function wrapWithStreamKeepAlive(model, options) {
         while (buffer.length > 0) {
           yield buffer.shift();
         }
+        hasToolCallChunks = false;
         if (streamDone) break;
         const waitForChunk = new Promise((resolve) => {
           notifyReady = resolve;
@@ -273,9 +309,14 @@ function wrapWithStreamKeepAlive(model, options) {
         ]);
         if (timer) clearTimeout(timer);
         if (result === "timeout" && !streamDone && buffer.length === 0) {
+          if (streamError || hasErrored) break;
+          if (hasToolCallChunks) continue;
           const keepAliveChunk = new ChatGenerationChunk({
-            message: new AIMessageChunk({ content: KEEPALIVE_PREFIX + keepAliveContent }),
-            text: KEEPALIVE_PREFIX + keepAliveContent
+            message: new AIMessageChunk({
+              content: KEEPALIVE_PREFIX,
+              additional_kwargs: { __keepalive: true }
+            }),
+            text: KEEPALIVE_PREFIX
           });
           yield keepAliveChunk;
         }
@@ -296,37 +337,51 @@ function fixEmptyToolProperties(model) {
   var _a;
   const originalBind = (_a = model.bindTools) == null ? void 0 : _a.bind(model);
   if (!originalBind) return model;
+  const PLACEHOLDER_PROP = {
+    _placeholder: { type: "string", description: "No parameters required" }
+  };
+  function fixPropertiesInSchema(schema) {
+    if (!schema || typeof schema !== "object") return;
+    if (schema.properties && typeof schema.properties === "object" && Object.keys(schema.properties).length === 0) {
+      schema.properties = { ...PLACEHOLDER_PROP };
+    }
+    for (const key of ["anyOf", "oneOf", "allOf"]) {
+      if (Array.isArray(schema[key])) {
+        schema[key].forEach((sub) => fixPropertiesInSchema(sub));
+      }
+    }
+  }
   model.bindTools = function(tools, kwargs) {
+    var _a2;
     const fixedTools = tools.map((tool) => {
-      var _a2, _b;
+      var _a3, _b;
       if (!tool || typeof tool !== "object") return tool;
+      if (typeof ((_a3 = tool.schema) == null ? void 0 : _a3.safeParse) === "function") {
+        return tool;
+      }
       const schema = tool.schema;
-      if (schema && typeof schema === "object") {
-        const props = schema.properties || (schema == null ? void 0 : schema.shape);
+      if (schema && typeof schema === "object" && !schema.safeParse) {
+        const props = schema.properties;
         if (props && typeof props === "object" && Object.keys(props).length === 0) {
           return {
             ...tool,
             schema: {
               ...schema,
-              properties: {
-                _placeholder: { type: "string", description: "No parameters required" }
-              }
+              properties: { ...PLACEHOLDER_PROP }
             }
           };
         }
       }
-      if ((_b = (_a2 = tool.function) == null ? void 0 : _a2.parameters) == null ? void 0 : _b.properties) {
-        const params = tool.function.parameters;
-        if (typeof params.properties === "object" && Object.keys(params.properties).length === 0) {
+      const funcParams = (_b = tool.function) == null ? void 0 : _b.parameters;
+      if (funcParams == null ? void 0 : funcParams.properties) {
+        if (typeof funcParams.properties === "object" && Object.keys(funcParams.properties).length === 0) {
           return {
             ...tool,
             function: {
               ...tool.function,
               parameters: {
-                ...params,
-                properties: {
-                  _placeholder: { type: "string", description: "No parameters required" }
-                }
+                ...funcParams,
+                properties: { ...PLACEHOLDER_PROP }
               }
             }
           };
@@ -334,7 +389,22 @@ function fixEmptyToolProperties(model) {
       }
       return tool;
     });
-    return originalBind(fixedTools, kwargs);
+    const result = originalBind(fixedTools, kwargs);
+    try {
+      const config = (result == null ? void 0 : result.kwargs) ?? (result == null ? void 0 : result.defaultOptions);
+      if ((config == null ? void 0 : config.tools) && Array.isArray(config.tools)) {
+        for (const tool of config.tools) {
+          if ((_a2 = tool == null ? void 0 : tool.function) == null ? void 0 : _a2.parameters) {
+            fixPropertiesInSchema(tool.function.parameters);
+          }
+          if (tool == null ? void 0 : tool.parameters) {
+            fixPropertiesInSchema(tool.parameters);
+          }
+        }
+      }
+    } catch {
+    }
+    return result;
   };
   return model;
 }
@@ -344,11 +414,11 @@ class CustomLLMProvider extends import_plugin_ai.LLMProvider {
   }
   get requestConfig() {
     var _a;
-    return safeParseJSON((_a = this.serviceOptions) == null ? void 0 : _a.requestConfig);
+    return safeParseJSON((_a = this.serviceOptions) == null ? void 0 : _a.requestConfig, "requestConfig");
   }
   get responseConfig() {
     var _a;
-    return safeParseJSON((_a = this.serviceOptions) == null ? void 0 : _a.responseConfig);
+    return safeParseJSON((_a = this.serviceOptions) == null ? void 0 : _a.responseConfig, "responseConfig");
   }
   createModel() {
     var _a;
@@ -404,11 +474,12 @@ class CustomLLMProvider extends import_plugin_ai.LLMProvider {
     const resConfig = this.responseConfig;
     const text = extractTextContent(chunk, resConfig.contentPath);
     if (isKeepAlive(text)) {
-      return null;
+      return KEEPALIVE_PREFIX;
     }
     return stripToolCallTags(text);
   }
   parseResponseMessage(message) {
+    var _a, _b;
     const { content: rawContent, messageId, metadata, role, toolCalls, attachments, workContext } = message;
     const content = {
       ...rawContent ?? {},
@@ -429,6 +500,10 @@ class CustomLLMProvider extends import_plugin_ai.LLMProvider {
       content.content = content.content.replace(new RegExp(escapedPrefix + ".*?(?=" + escapedPrefix + "|$)", "g"), "");
       content.content = stripToolCallTags(content.content);
     }
+    if (((_b = (_a = content.metadata) == null ? void 0 : _a.additional_kwargs) == null ? void 0 : _b.__keepalive) !== void 0) {
+      const { __keepalive, ...cleanKwargs } = content.metadata.additional_kwargs;
+      content.metadata = { ...content.metadata, additional_kwargs: cleanKwargs };
+    }
     return {
       key: messageId,
       content,
@@ -436,18 +511,128 @@ class CustomLLMProvider extends import_plugin_ai.LLMProvider {
     };
   }
   parseReasoningContent(chunk) {
-    var _a;
+    var _a, _b, _c;
     const resConfig = this.responseConfig;
     const reasoningKey = resConfig.reasoningKey || "reasoning_content";
-    const reasoning = (_a = chunk == null ? void 0 : chunk.additional_kwargs) == null ? void 0 : _a[reasoningKey];
+    const reasoning = ((_a = chunk == null ? void 0 : chunk.additional_kwargs) == null ? void 0 : _a[reasoningKey]) ?? ((_c = (_b = chunk == null ? void 0 : chunk.kwargs) == null ? void 0 : _b.additional_kwargs) == null ? void 0 : _c[reasoningKey]);
     if (reasoning && typeof reasoning === "string") {
       return { status: "streaming", content: reasoning };
     }
     return null;
   }
+  /**
+   * Extract response metadata from LLM output for post-save enrichment.
+   * Sanitizes overly long message IDs from Gemini or other providers.
+   */
+  parseResponseMetadata(output) {
+    var _a, _b;
+    try {
+      const generation = (_b = (_a = output == null ? void 0 : output.generations) == null ? void 0 : _a[0]) == null ? void 0 : _b[0];
+      if (!generation) return [null, null];
+      const message = generation.message;
+      let id = message == null ? void 0 : message.id;
+      if (!id) return [null, null];
+      if (typeof id === "string" && id.length > 128) {
+        id = id.substring(0, 128);
+      }
+      const metadata = {};
+      if (message == null ? void 0 : message.response_metadata) {
+        metadata.finish_reason = message.response_metadata.finish_reason;
+        metadata.system_fingerprint = message.response_metadata.system_fingerprint;
+      }
+      if (message == null ? void 0 : message.usage_metadata) {
+        metadata.usage_metadata = message.usage_metadata;
+      }
+      return Object.keys(metadata).length > 0 ? [id, metadata] : [null, null];
+    } catch {
+      return [null, null];
+    }
+  }
   parseResponseError(err) {
     return (err == null ? void 0 : err.message) ?? "Unexpected LLM service error";
   }
+  /**
+   * Self-contained file reading that correctly handles the APP_PUBLIC_PATH prefix.
+   *
+   * plugin-ai's encodeLocalFile does path.join(cwd, url) without stripping
+   * APP_PUBLIC_PATH, so when the app is deployed under a sub-path (e.g. /my-app)
+   * the resolved path becomes '{cwd}/my-app/storage/uploads/…' which does not exist.
+   * We cannot fix that in plugin-ai (core), so we re-implement file reading here
+   * with the prefix stripped before the cwd join.
+   */
+  async readFileAsBase64(ctx, attachment) {
+    const fileManager = this.app.pm.get("file-manager");
+    const rawUrl = await fileManager.getFileURL(attachment);
+    const url = decodeURIComponent(rawUrl);
+    if (url.startsWith("http://") || url.startsWith("https://")) {
+      const referer = ctx.get("referer") || "";
+      const ua = ctx.get("user-agent") || "";
+      const response = await import_axios.default.get(url, {
+        responseType: "arraybuffer",
+        // Default 30s timeout to prevent slow file servers from blocking indefinitely
+        timeout: 3e4,
+        headers: { referer, "User-Agent": ua }
+      });
+      return Buffer.from(response.data).toString("base64");
+    }
+    let localPath = url;
+    const appPublicPath = (process.env.APP_PUBLIC_PATH || "/").replace(/\/+$/, "");
+    if (appPublicPath && localPath.startsWith(appPublicPath + "/")) {
+      localPath = localPath.slice(appPublicPath.length);
+    }
+    const storageRoot = import_node_path.default.resolve(process.cwd());
+    const absPath = import_node_path.default.resolve(storageRoot, localPath.replace(/^\//, ""));
+    if (!absPath.startsWith(storageRoot + import_node_path.default.sep) && absPath !== storageRoot) {
+      throw new Error(`Attachment path escapes storage root: ${localPath}`);
+    }
+    const data = await import_promises.default.readFile(absPath);
+    return Buffer.from(data).toString("base64");
+  }
+  /**
+   * Override parseAttachment to convert all attachments into formats that
+   * generic OpenAI-compatible endpoints actually support:
+   *
+   *   - Images     → image_url block with base64 data URI (vision models)
+   *   - Text files → text block with decoded UTF-8 content
+   *   - Binary     → text block with base64 data URI (multi-modal or fallback)
+   *
+   * The base-class implementation returns a LangChain ContentBlock.Multimodal.File
+   * (`type: 'file'`) for non-image attachments. LangChain serialises this as the
+   * newer OpenAI Files API format which most custom/local endpoints do NOT understand,
+   * causing file content to be silently dropped.
+   *
+   * This method is entirely self-contained — it does not call super — so it is
+   * safe to use without modifying plugin-ai core.
+   */
+  async parseAttachment(ctx, attachment) {
+    const mimetype = attachment.mimetype || "application/octet-stream";
+    const filename = attachment.filename || attachment.name || "file";
+    const data = await this.readFileAsBase64(ctx, attachment);
+    if (mimetype.startsWith("image/")) {
+      return {
+        placement: "contentBlocks",
+        content: {
+          type: "image_url",
+          image_url: { url: `data:${mimetype};base64,${data}` }
+        }
+      };
+    }
+    let textContent;
+    if (isTextMimetype(mimetype)) {
+      const decoded = Buffer.from(data, "base64").toString("utf-8");
+      textContent = `<attachment filename="${filename}" type="${mimetype}">
+${decoded}
+</attachment>`;
+    } else {
+      textContent = `<attachment filename="${filename}" type="${mimetype}">
+data:${mimetype};base64,${data}
+</attachment>`;
+    }
+    return {
+      placement: "contentBlocks",
+      content: { type: "text", text: textContent }
+    };
+  }
 }
 const customLLMProviderOptions = {
   title: "Custom LLM (OpenAI Compatible)",

package/dist/server/plugin.d.ts

@@ -0,0 +1,12 @@
+import { Plugin } from '@nocobase/server';
+export declare class PluginCustomLLMServer extends Plugin {
+    afterAdd(): Promise<void>;
+    beforeLoad(): Promise<void>;
+    load(): Promise<void>;
+    install(): Promise<void>;
+    afterEnable(): Promise<void>;
+    afterDisable(): Promise<void>;
+    remove(): Promise<void>;
+    private get aiPlugin();
+}
+export default PluginCustomLLMServer;

package/dist/server/plugin.js

@@ -1,12 +1,3 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "AI LLM: Custom (OpenAI Compatible)",
   "displayName.zh-CN": "AI LLM：自定义（OpenAI 兼容）",
   "description": "OpenAI-compatible LLM provider with auto response format detection for external LLM services.",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "main": "dist/server/index.js",
   "nocobase": {
     "supportedVersions": [