koishi-plugin-dify-ai 0.1.7 → 0.1.9

package/lib/config.d.ts

@@ -52,6 +52,9 @@ export type VariableEntry = {
     source: 'constant';
     field: string;
     value: string;
+} | {
+    source: 'json';
+    template: string;
 };
 /** 作用域的一行：维度 + 值 */
 export interface ScopeRow {
@@ -111,8 +114,8 @@ export interface Config {
 }
 export declare const Config: Schema<Config>;
 /**
- * 上传消息文件配置（含 0.1.x 布尔遗留形态迁移）：
- * 数量与单文件大小 0 均为不限，大小仍与 Dify 各类型上限取较小值。
+ * 上传消息文件配置（含历史形态迁移：0.1.x 布尔、0.1.7 mode）。
+ * 数量与单文件大小 0 与 -1 均为不限，大小仍与 Dify 各类型上限取较小值。
  */
 export declare function resolveUploadConfig(config: Config): {
     enabled: boolean;
@@ -120,9 +123,9 @@ export declare function resolveUploadConfig(config: Config): {
     maxMb: number;
 };
 /**
- * 引用触发消息配置（含 0.1.x 布尔开关迁移）：schema 会给旧配置填默认 quote 对象，
- * 因此迁移判据是「旧布尔被配置层透传保留 且 quote 仍是默认形态（用户未在新表单改过）」——
- * 此时以旧布尔为准；用户改过新表单（quote 非默认）则新值优先。
+ * 引用触发消息配置（含历史形态迁移：0.1.x 布尔与 quoteTrigger 透传、0.1.7 mode、布尔开关新形态）。
+ * 迁移判据沿用：旧布尔被透传保留且配置未被用户改动（默认形态）时以旧布尔为准。
+ * 阈值 -1 与 0 同为总是引用（比较 elapsed >= 阈值 自然兼容）。
  */
 export declare function resolveQuoteConfig(config: Config): {
     enabled: boolean;

package/lib/index.js

@@ -49,6 +49,15 @@ var en_US_default = {
 
 // src/config.ts
 var import_koishi = require("koishi");
+
+// src/types.ts
+function isMessageTrigger(type) {
+  return type !== "schedule" && type !== "density";
+}
+__name(isMessageTrigger, "isMessageTrigger");
+var JSON_PLACEHOLDER = /\{\{\s*(\w+)(?::(\d+))?\s*\}\}/g;
+
+// src/config.ts
 var appTypeSchema = import_koishi.Schema.union([
   import_koishi.Schema.const("auto").description("自动探测"),
   import_koishi.Schema.const("chat").description("Chatbot"),
@@ -83,7 +92,7 @@ var conditionSchema = import_koishi.Schema.union([
   import_koishi.Schema.object({
     type: import_koishi.Schema.const("schedule").required(),
     cron: import_koishi.Schema.string().default("").description("Cron 表达式"),
-    intervalMinutes: import_koishi.Schema.number().default(0).min(0).description("间隔分钟")
+    intervalMinutes: import_koishi.Schema.number().default(-1).min(-1).description("间隔分钟")
   }).default({ type: "schedule", cron: "", intervalMinutes: 0 }).description("定时"),
   import_koishi.Schema.object({
     type: import_koishi.Schema.const("density").required(),
@@ -121,7 +130,7 @@ var variableSchema = import_koishi.Schema.union([
   import_koishi.Schema.object({
     source: import_koishi.Schema.const("history").required(),
     field: import_koishi.Schema.string().required().description("字段名"),
-    limit: import_koishi.Schema.natural().default(0).min(0).max(100).description("条数，0 用全局")
+    limit: import_koishi.Schema.number().default(-1).min(-1).max(100).description("条数，0 用全局")
   }).default({ source: "history", field: "", limit: 0 }).description("历史消息"),
   import_koishi.Schema.object({
     source: import_koishi.Schema.const("meta").required(),
@@ -132,17 +141,32 @@ var variableSchema = import_koishi.Schema.union([
     source: import_koishi.Schema.const("constant").required(),
     field: import_koishi.Schema.string().required().description("字段名"),
     value: import_koishi.Schema.string().role("textarea").required().description("固定文本")
-  }).default({ source: "constant", field: "", value: "" }).description("常量文本")
+  }).default({ source: "constant", field: "", value: "" }).description("常量文本"),
+  import_koishi.Schema.object({
+    source: import_koishi.Schema.const("json").required(),
+    template: import_koishi.Schema.string().role("textarea").required().description("JSON 对象")
+  }).default({ source: "json", template: "" }).description("JSON 对象")
 ]);
 var quoteSchema = import_koishi.Schema.union([
-  import_koishi.Schema.object({
-    mode: import_koishi.Schema.const("off").required()
-  }).default({ mode: "off" }).description("关闭"),
+  import_koishi.Schema.intersect([
+    import_koishi.Schema.object({
+      enabled: import_koishi.Schema.boolean().default(true).description("开启")
+    }),
+    import_koishi.Schema.union([
+      import_koishi.Schema.object({
+        enabled: import_koishi.Schema.const(true).required(),
+        minElapsedSeconds: import_koishi.Schema.number().min(-1).default(-1).description("回复耗时多少秒才引用，0 总是引用")
+      }),
+      import_koishi.Schema.object({})
+    ])
+  ]),
+  import_koishi.Schema.boolean(),
+  import_koishi.Schema.object({ mode: import_koishi.Schema.const("off").required() }),
   import_koishi.Schema.object({
     mode: import_koishi.Schema.const("on").required(),
-    minElapsedSeconds: import_koishi.Schema.natural().default(0).description("回复耗时多少秒才引用，0 总是引用")
-  }).default({ mode: "on", minElapsedSeconds: 0 }).description("开启")
-]);
+    minElapsedSeconds: import_koishi.Schema.number().min(-1).default(-1)
+  })
+]).default({ enabled: true, minElapsedSeconds: -1 });
 var cooldownSchema = import_koishi.Schema.union([
   import_koishi.Schema.object({
     mode: import_koishi.Schema.const("off").required()
@@ -158,16 +182,27 @@ var cooldownSchema = import_koishi.Schema.union([
   }).default({ mode: "sliding", minSeconds: 30, maxSeconds: 120 }).description("滑动窗口")
 ]);
 var uploadSchema = import_koishi.Schema.union([
-  import_koishi.Schema.object({
-    mode: import_koishi.Schema.const("off").required()
-  }).default({ mode: "off" }).description("关闭"),
+  import_koishi.Schema.intersect([
+    import_koishi.Schema.object({
+      enabled: import_koishi.Schema.boolean().default(true).description("开启")
+    }),
+    import_koishi.Schema.union([
+      import_koishi.Schema.object({
+        enabled: import_koishi.Schema.const(true).required(),
+        maxCount: import_koishi.Schema.number().min(-1).default(-1).description("数量上限，0 不限"),
+        maxSizeMb: import_koishi.Schema.number().min(-1).default(-1).description("单文件大小上限 MB，0 不限")
+      }),
+      import_koishi.Schema.object({})
+    ])
+  ]),
+  import_koishi.Schema.boolean(),
+  import_koishi.Schema.object({ mode: import_koishi.Schema.const("off").required() }),
   import_koishi.Schema.object({
     mode: import_koishi.Schema.const("on").required(),
-    maxCount: import_koishi.Schema.natural().default(0).description("数量上限，0 不限"),
-    maxSizeMb: import_koishi.Schema.natural().default(0).description("单文件大小上限 MB，0 不限")
-  }).default({ mode: "on", maxCount: 0, maxSizeMb: 0 }).description("开启"),
-  import_koishi.Schema.boolean().description("旧版开关")
-]);
+    maxCount: import_koishi.Schema.number().min(-1).default(-1),
+    maxSizeMb: import_koishi.Schema.number().min(-1).default(-1)
+  })
+]).default({ enabled: true, maxCount: -1, maxSizeMb: -1 });
 var Config = import_koishi.Schema.intersect([
   import_koishi.Schema.object({
     apps: import_koishi.Schema.array(
@@ -185,7 +220,7 @@ var Config = import_koishi.Schema.intersect([
       import_koishi.Schema.object({
         name: import_koishi.Schema.string().required().description("规则名"),
         enabled: import_koishi.Schema.boolean().default(true).description("启用"),
-        priority: import_koishi.Schema.number().default(0).description("优先级，大者先匹配"),
+        priority: import_koishi.Schema.number().default(-1).description("优先级，大者先匹配"),
         app: import_koishi.Schema.string().required().description("应用名"),
         conversationScope: import_koishi.Schema.union([
           import_koishi.Schema.const("per-guild").description("按群聊"),
@@ -214,9 +249,9 @@ var Config = import_koishi.Schema.intersect([
   }).description("触发规则"),
   import_koishi.Schema.object({
     parseElements: import_koishi.Schema.boolean().default(false).description("解析回复中的消息元素"),
-    quote: quoteSchema.default({ mode: "on", minElapsedSeconds: 0 }).description("引用触发消息"),
-    maxSegmentLength: import_koishi.Schema.natural().default(0).description("分段长度，0 不分段"),
-    uploadFiles: uploadSchema.default({ mode: "on", maxCount: 0, maxSizeMb: 0 }).description("上传消息中的文件")
+    quote: quoteSchema.description("引用触发消息"),
+    maxSegmentLength: import_koishi.Schema.number().min(-1).default(-1).description("分段长度，0 不分段"),
+    uploadFiles: uploadSchema.description("上传消息中的文件")
   }).description("回复行为"),
   import_koishi.Schema.object({
     requestTimeout: import_koishi.Schema.natural().role("ms").default(3e5).description("请求超时"),
@@ -309,6 +344,17 @@ function toScope(rows) {
 }
 __name(toScope, "toScope");
 function toVariable(entry) {
+  if (entry.source === "json") {
+    const template = entry.template ?? "";
+    if (!template.trim()) return null;
+    try {
+      const probe = JSON.parse(template.replace(JSON_PLACEHOLDER, "0"));
+      if (typeof probe !== "object" || probe === null || Array.isArray(probe)) return null;
+    } catch {
+      return null;
+    }
+    return { field: "", source: { type: "json", template } };
+  }
   const field = entry.field?.trim();
   if (!field) return null;
   if (entry.source === "constant") {
@@ -328,25 +374,30 @@ function toVariable(entry) {
 }
 __name(toVariable, "toVariable");
 function resolveUploadConfig(config) {
-  if (typeof config.uploadFiles === "boolean") {
-    return config.uploadFiles ? { enabled: true, maxCount: 0, maxMb: 0 } : { enabled: false, maxCount: 0, maxMb: 0 };
+  const upload = config.uploadFiles;
+  if (typeof upload === "boolean") {
+    return upload ? { enabled: true, maxCount: 0, maxMb: 0 } : { enabled: false, maxCount: 0, maxMb: 0 };
+  }
+  if (upload?.mode === "off" || upload?.enabled === false) {
+    return { enabled: false, maxCount: 0, maxMb: 0 };
   }
-  if (config.uploadFiles?.mode === "off") return { enabled: false, maxCount: 0, maxMb: 0 };
   return {
     enabled: true,
-    maxCount: Number(config.uploadFiles?.maxCount) || 0,
-    maxMb: Number(config.uploadFiles?.maxSizeMb) || 0
+    maxCount: Number(upload?.maxCount) || 0,
+    maxMb: Number(upload?.maxSizeMb) || 0
   };
 }
 __name(resolveUploadConfig, "resolveUploadConfig");
 function resolveQuoteConfig(config) {
   const quote = config.quote;
-  const isDefaultQuote = !quote || quote.mode === "on" && !(Number(quote.minElapsedSeconds) > 0);
-  if (typeof config.quoteTrigger === "boolean" && isDefaultQuote) {
+  if (typeof quote === "boolean") return { enabled: quote, minElapsedSeconds: 0 };
+  if (quote?.mode === "off") return { enabled: false, minElapsedSeconds: 0 };
+  const threshold = Number(quote?.minElapsedSeconds) || 0;
+  const untouched = !(threshold > 0) && quote?.enabled !== false;
+  if (typeof config.quoteTrigger === "boolean" && untouched) {
     return { enabled: config.quoteTrigger, minElapsedSeconds: 0 };
   }
-  if (quote?.mode === "off") return { enabled: false, minElapsedSeconds: 0 };
-  return { enabled: true, minElapsedSeconds: Number(quote?.minElapsedSeconds) || 0 };
+  return { enabled: quote?.mode === "on" ? true : quote?.enabled !== false, minElapsedSeconds: threshold };
 }
 __name(resolveQuoteConfig, "resolveQuoteConfig");
 function toCooldown(entry) {
@@ -1198,12 +1249,6 @@ var TriggerEngine = class {
   }
 };
 
-// src/types.ts
-function isMessageTrigger(type) {
-  return type !== "schedule" && type !== "density";
-}
-__name(isMessageTrigger, "isMessageTrigger");
-
 // src/requester/files.ts
 var import_promises = require("fs/promises");
 var import_fs = require("fs");
@@ -1466,11 +1511,55 @@ function resolveSource(source, fireCtx, history, now) {
   }
 }
 __name(resolveSource, "resolveSource");
+var META_PLACEHOLDERS = /* @__PURE__ */ new Set(["triggerType", "ruleName", "triggerTime"]);
+function resolvePlaceholderValue(name2, limit, fireCtx, history, now) {
+  if (name2 === "history") {
+    const channelKey = channelKeyOf(fireCtx.platform, fireCtx.channelId);
+    return history.toVariable(history.get(channelKey, limit ?? history.limit));
+  }
+  if (name2 === "isDirect") {
+    return fireCtx.session?.isDirect ?? fireCtx.isDirect ?? false;
+  }
+  if (META_PLACEHOLDERS.has(name2)) {
+    return String(resolveMetaField(name2, fireCtx, now) ?? "");
+  }
+  const value = resolveSessionField(name2, fireCtx, now);
+  return value === void 0 || value === null ? "" : String(value);
+}
+__name(resolvePlaceholderValue, "resolvePlaceholderValue");
+var BARE_PLACEHOLDER = /"\{\{\s*(\w+)(?::(\d+))?\s*\}\}"/g;
+var escapeJsonText = /* @__PURE__ */ __name((value) => JSON.stringify(value).slice(1, -1), "escapeJsonText");
+function interpolateTemplate(template, fireCtx, history, now) {
+  const resolve = /* @__PURE__ */ __name((name2, limit) => resolvePlaceholderValue(name2, limit ? Number(limit) : void 0, fireCtx, history, now), "resolve");
+  const native = template.replace(
+    BARE_PLACEHOLDER,
+    (_match, name2, limit) => JSON.stringify(resolve(name2, limit))
+  );
+  return native.replace(
+    JSON_PLACEHOLDER,
+    (_match, name2, limit) => escapeJsonText(String(resolve(name2, limit)))
+  );
+}
+__name(interpolateTemplate, "interpolateTemplate");
+function resolveJsonObject(template, fireCtx, history, now) {
+  try {
+    const parsed = JSON.parse(interpolateTemplate(template, fireCtx, history, now));
+    return typeof parsed === "object" && parsed !== null && !Array.isArray(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+__name(resolveJsonObject, "resolveJsonObject");
 function resolveVariables(rule, fireCtx, history) {
   const inputs = {};
   const now = (/* @__PURE__ */ new Date()).toISOString();
   for (const binding of rule.variables) {
-    if (!binding?.field) continue;
+    if (binding?.source?.type !== "json") continue;
+    const object = resolveJsonObject(binding.source.template, fireCtx, history, now);
+    if (object) Object.assign(inputs, object);
+  }
+  for (const binding of rule.variables) {
+    if (!binding?.field || binding.source?.type === "json") continue;
     const value = resolveSource(binding.source, fireCtx, history, now);
     if (value !== void 0) inputs[binding.field] = value;
   }
@@ -1869,6 +1958,7 @@ var name = "dify-ai";
 var inject = { required: ["database"] };
 var PROBE_TIMEOUT_MS = 1e4;
 function apply(ctx, config) {
+  const startedAt = Date.now();
   ctx.i18n.define("zh-CN", zh_CN_default);
   ctx.i18n.define("en-US", en_US_default);
   defineTables(ctx);
@@ -1880,7 +1970,11 @@ function apply(ctx, config) {
   const engine = new TriggerEngine(ctx, runner, history, rules, cooldown);
   ctx.on("ready", () => {
     engine.start();
-    void probeAppTypes(ctx, apps, appTypes);
+    ctx.logger.info("插件装配完成，耗时 %dms", Date.now() - startedAt);
+    const probeStart = Date.now();
+    void probeAppTypes(ctx, apps, appTypes).then(() => {
+      ctx.logger.info("应用类型探测完成，耗时 %dms", Date.now() - probeStart);
+    });
   });
   const admin = ctx.command("dify", { authority: 3 });
   registerMiscCommands(admin, conversationStore);

package/lib/requester/variables.d.ts

@@ -1,5 +1,9 @@
 import { FireContext } from '../types';
 import { MessageHistory } from '../history';
 import { DifyRule } from '../types';
-/** 按规则的变量映射表构造 Dify inputs */
+/**
+ * 按规则的变量映射表构造 Dify inputs。
+ * JSON 对象条目先注入（顶层键展开合并进 inputs），单条映射后注入覆盖同名键——
+ * 现有单条配置行为不变，JSON 作为批量默认值。
+ */
 export declare function resolveVariables(rule: DifyRule, fireCtx: FireContext, history: MessageHistory): Record<string, any>;

package/lib/types.d.ts

@@ -68,7 +68,12 @@ export type VariableSource = {
 } | {
     type: 'constant';
     value: string;
+} | {
+    type: 'json';
+    template: string;
 };
+/** JSON 对象模板里的占位符：{{变量名}} 或 {{history:条数}}（加载校验与运行时插值共用） */
+export declare const JSON_PLACEHOLDER: RegExp;
 /** 一条变量映射：Dify inputs 字段名 ← 来源 */
 export interface VariableBinding {
     field: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-dify-ai",
   "description": "Invoke Dify apps (chatflow / workflow / completion) in Koishi with triggers and conversation bindings",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "author": "PinkElysia",
   "license": "MIT",
   "homepage": "https://github.com/PinkElysiaDev/dify-ai-plugin-for-Koishi#readme",