@workclaw/openclaw-workclaw 1.0.336 → 1.0.337

package/dist/packages/plugin/src/api/accounts-api.js

@@ -18,6 +18,9 @@ async function readRequestBody(req) {
 }
 async function loadRuntimeConfig(api) {
   const runtimeConfig = api.runtime?.config;
+  if (runtimeConfig?.current) {
+    return runtimeConfig.current();
+  }
   if (runtimeConfig?.loadConfig) {
     return runtimeConfig.loadConfig();
   }
@@ -25,6 +28,25 @@ async function loadRuntimeConfig(api) {
 }
 async function writeRuntimeConfig(api, config) {
   const runtimeConfig = api.runtime?.config;
+  const afterWrite = { mode: "none", reason: "workclaw-accounts-api" };
+  if (runtimeConfig?.mutateConfigFile) {
+    await runtimeConfig.mutateConfigFile({
+      afterWrite,
+      mutate(draft) {
+        for (const key of Object.keys(draft)) {
+          if (!(key in config)) {
+            delete draft[key];
+          }
+        }
+        Object.assign(draft, JSON.parse(JSON.stringify(config)));
+      }
+    });
+    return;
+  }
+  if (runtimeConfig?.replaceConfigFile) {
+    await runtimeConfig.replaceConfigFile(config, afterWrite);
+    return;
+  }
   if (runtimeConfig?.writeConfigFile) {
     await runtimeConfig.writeConfigFile(config);
     return;

package/dist/packages/plugin/src/gateway/config-writer.js

@@ -27,66 +27,92 @@ async function writeConfigFile(newConfig, cfg, log) {
   try {
     const runtime = getWorkclawRuntime();
     const configApi = runtime.config;
+    const afterWrite = {
+      mode: "auto",
+      reason: "workclaw-full-config-write"
+    };
     logger.info(`[智小途-配置] 准备写入配置 (channels/openclaw-workclaw/accounts): ${JSON.stringify(newConfig?.channels?.["openclaw-workclaw"]?.accounts, null, 2)}`);
     logger.info(`[智小途-配置] 准备写入配置 (models): ${JSON.stringify(newConfig?.models, null, 2)}`);
-    let followUp;
     if (configApi.mutateConfigFile) {
-      followUp = await configApi.mutateConfigFile({
+      const result = await configApi.mutateConfigFile({
         mutate: (draft) => {
-          deepMerge(draft, newConfig);
+          replaceObjectContents(draft, newConfig);
         },
-        afterWrite: "none"
-        // 插件内部操作，不需要自动重启
+        afterWrite
       });
-      logger.info(`[智小途-配置] 配置写入成功（使用 mutateConfigFile）`);
-      if (followUp?.followUp) {
-        logger.info(`[智小途-配置] 写者意图: ${followUp.followUp}`);
-        handleConfigFollowUp(followUp, log);
-      }
+      logger.info("[智小途-配置] 配置写入成功（使用 mutateConfigFile）");
+      logConfigWriteResult(result, log);
     } else if (configApi.replaceConfigFile) {
-      followUp = await configApi.replaceConfigFile(newConfig, "none");
-      logger.info(`[智小途-配置] 配置写入成功（使用 replaceConfigFile）`);
-      if (followUp?.followUp) {
-        logger.info(`[智小途-配置] 写者意图: ${followUp.followUp}`);
-        handleConfigFollowUp(followUp, log);
-      }
+      const result = await configApi.replaceConfigFile(newConfig, afterWrite);
+      logger.info("[智小途-配置] 配置写入成功（使用 replaceConfigFile）");
+      logConfigWriteResult(result, log);
     } else if (configApi.writeConfigFile) {
       await configApi.writeConfigFile(newConfig);
-      logger.info(`[智小途-配置] 配置写入成功（使用 writeConfigFile - 兼容模式）`);
+      logger.info("[智小途-配置] 配置写入成功（使用 writeConfigFile - 兼容模式）");
     } else {
       throw new Error("No config write API available");
     }
-    deepMerge(cfg, newConfig);
+    replaceObjectContents(cfg, newConfig);
   } catch (err) {
     logger.error(`[智小途-配置] 写入配置失败: ${String(err)}`);
     throw err;
   }
 }
-function deepMerge(target, source) {
+async function mutateConfigPatch(cfg, mutate, log, reason = "workclaw-config-patch") {
+  const runtime = getWorkclawRuntime();
+  const configApi = runtime.config;
+  const afterWrite = {
+    mode: "none",
+    reason
+  };
+  if (configApi.mutateConfigFile) {
+    const result = await configApi.mutateConfigFile({
+      mutate,
+      afterWrite
+    });
+    logConfigWriteResult(result, log);
+  } else {
+    const nextConfig = cloneConfig(cfg);
+    mutate(nextConfig);
+    if (configApi.replaceConfigFile) {
+      const result = await configApi.replaceConfigFile(nextConfig, afterWrite);
+      logConfigWriteResult(result, log);
+    } else if (configApi.writeConfigFile) {
+      await configApi.writeConfigFile(nextConfig);
+    } else {
+      throw new Error("No config write API available");
+    }
+  }
+  mutate(cfg);
+}
+function replaceObjectContents(target, source) {
+  if (target == null || typeof target !== "object")
+    return;
   if (source == null || typeof source !== "object")
     return;
-  for (const key of Object.keys(source)) {
-    const sourceValue = source[key];
-    const targetValue = target[key];
-    if (sourceValue != null && typeof sourceValue === "object" && !Array.isArray(sourceValue) && targetValue != null && typeof targetValue === "object" && !Array.isArray(targetValue)) {
-      deepMerge(targetValue, sourceValue);
-    } else {
-      target[key] = sourceValue;
+  for (const key of Object.keys(target)) {
+    if (!(key in source)) {
+      delete target[key];
     }
   }
+  const clonedSource = cloneConfig(source);
+  Object.assign(target, clonedSource);
 }
-function handleConfigFollowUp(followUp, log) {
-  switch (followUp.strategy) {
-    case "auto":
-      log?.info?.("[智小途-配置] 框架将在适当时机自动重启");
-      break;
-    case "restart":
-      log?.info?.("[智小途-配置] 需要重启才能使配置生效");
-      break;
-    case "none":
-    default:
-      log?.info?.("[智小途-配置] 配置已立即生效，无需重启");
-      break;
+function cloneConfig(value) {
+  return JSON.parse(JSON.stringify(value));
+}
+function logConfigWriteResult(result, log) {
+  if (!result)
+    return;
+  const serialized = JSON.stringify(result);
+  log?.info?.(`[智小途-配置] 写入结果: ${serialized}`);
+  const mode = result.followUp?.mode ?? result.afterWrite?.mode;
+  if (mode === "restart") {
+    log?.info?.("[智小途-配置] 框架要求重启后生效");
+  } else if (mode === "auto") {
+    log?.info?.("[智小途-配置] 框架将按自动策略评估 reload/restart");
+  } else if (mode === "none") {
+    log?.info?.("[智小途-配置] 配置按 none 策略写入，不请求自动重启");
   }
 }
 function loadOpenConversationId(accountId, userId) {
@@ -161,35 +187,55 @@ async function initWorkclawAgent(params, cfg, log) {
     const workclawCfg = cfg?.channels?.[PLUGIN_ID];
     if (!workclawCfg)
       return;
+    const accountId = params.accountId || "default";
+    const existingApiKey = cfg.models?.providers?.[DEFAULT_PROVIDER]?.apiKey;
+    const shouldWriteApiKey = Boolean(
+      params.apiKey && !(existingApiKey && typeof existingApiKey === "object" && existingApiKey.type)
+    );
     if (params.apiKey) {
-      const existingApiKey = cfg.models?.providers?.[DEFAULT_PROVIDER]?.apiKey;
       if (existingApiKey && typeof existingApiKey === "object" && existingApiKey.type) {
         logger.info(`[智小途-智能体] apiKey 是 SecretRef (type=${existingApiKey.type})，跳过覆盖`);
       } else {
-        if (!cfg.models)
-          cfg.models = {};
-        if (!cfg.models.providers)
-          cfg.models.providers = {};
-        if (!cfg.models.providers[DEFAULT_PROVIDER])
-          cfg.models.providers[DEFAULT_PROVIDER] = {};
-        cfg.models.providers[DEFAULT_PROVIDER].apiKey = params.apiKey;
         logger.info(`[智小途-智能体] apiKey 已设置（明文值）`);
       }
     }
     if (params.agentId) {
-      const accountId = params.accountId || "default";
-      const accounts = workclawCfg.accounts ?? {};
-      workclawCfg.accounts = accounts;
-      if (!accounts[accountId])
-        accounts[accountId] = {};
-      accounts[accountId].agentId = params.agentId;
       logger.info(`[智小途-智能体] agentId=${params.agentId} 已设置 accountId=${accountId}`);
     }
     if (params.userId) {
-      workclawCfg.userId = params.userId;
       logger.info(`[智小途-智能体] userId=${params.userId} 已设置`);
     }
-    await writeConfigFile(cfg, cfg, log);
+    await mutateConfigPatch(
+      cfg,
+      (draft) => {
+        if (!draft.channels)
+          draft.channels = {};
+        if (!draft.channels[PLUGIN_ID])
+          draft.channels[PLUGIN_ID] = {};
+        const draftWorkclawCfg = draft.channels[PLUGIN_ID];
+        if (shouldWriteApiKey) {
+          if (!draft.models)
+            draft.models = {};
+          if (!draft.models.providers)
+            draft.models.providers = {};
+          if (!draft.models.providers[DEFAULT_PROVIDER])
+            draft.models.providers[DEFAULT_PROVIDER] = {};
+          draft.models.providers[DEFAULT_PROVIDER].apiKey = params.apiKey;
+        }
+        if (params.agentId) {
+          const accounts = draftWorkclawCfg.accounts ?? {};
+          draftWorkclawCfg.accounts = accounts;
+          if (!accounts[accountId])
+            accounts[accountId] = {};
+          accounts[accountId].agentId = params.agentId;
+        }
+        if (params.userId) {
+          draftWorkclawCfg.userId = params.userId;
+        }
+      },
+      log,
+      "workclaw-init-agent"
+    );
     logger.info(`[智小途-智能体] 所有配置已持久化`);
   } catch (err) {
     logger.error(`[智小途-智能体] 初始化失败: ${String(err)}`);

package/dist/src/api/accounts-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accounts-api.d.ts","sourceRoot":"","sources":["../../../src/api/accounts-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAgE5D,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,iBAAiB,IAC/C,KAAK,GAAG,EAAE,KAAK,GAAG,mBA2FjC"}
+{"version":3,"file":"accounts-api.d.ts","sourceRoot":"","sources":["../../../src/api/accounts-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AA0F5D,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,iBAAiB,IAC/C,KAAK,GAAG,EAAE,KAAK,GAAG,mBA2FjC"}

package/dist/src/gateway/config-writer.d.ts

@@ -68,11 +68,9 @@ export declare function saveWorkClawUserId(accountId: string, userId: string | n
  */
 export declare function saveWorkClawAgentId(accountId: string, agentId: string | number, cfg: any, log?: ConfigLogger): Promise<void>;
 /**
- * 仅将 apiKey 保存到配置内存。
+ * 将 apiKey 保存到模型配置并持久化到 openclaw.json。
  *
- * 不写入 openclaw.json 以避免触发 openclaw 的配置监听器，
- * 否则会重新解析环境变量（如 ${MODEL_API_KEY}）
- * 并可能覆盖运行时配置中已解析的值。
+ * 使用局部 mutate，避免把整份运行时快照回写到配置文件。
  */
 export declare function saveWorkClawApiKey(apiKey: string, cfg: any, log?: ConfigLogger): Promise<void>;
 export {};

package/dist/src/gateway/config-writer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-writer.d.ts","sourceRoot":"","sources":["../../../src/gateway/config-writer.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAmBH,UAAU,YAAY;IACpB,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IAC5B,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;CAC9B;AA+DD;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CACnC,SAAS,EAAE,GAAG,EACd,GAAG,EAAE,GAAG,EACR,GAAG,CAAC,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,CAsDf;AAoDD;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAavF;AAED;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,MAAM,EAC1B,GAAG,EAAE,GAAG,EACR,GAAG,CAAC,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,CAmBf;AA4DD;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE;IACN,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,EACD,GAAG,EAAE,GAAG,EACR,GAAG,CAAC,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,CA+Cf;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,GAAG,EAAE,GAAG,EACR,GAAG,CAAC,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,CAef;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,GAAG,EAAE,GAAG,EACR,GAAG,CAAC,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,CAmCf;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,GAAG,EACR,GAAG,CAAC,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,CAkBf"}
+{"version":3,"file":"config-writer.d.ts","sourceRoot":"","sources":["../../../src/gateway/config-writer.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAmBH,UAAU,YAAY;IACpB,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IAC5B,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;CAC9B;AA2ED;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CACnC,SAAS,EAAE,GAAG,EACd,GAAG,EAAE,GAAG,EACR,GAAG,CAAC,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,CAyCf;AAoHD;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAavF;AAED;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,kBAAkB,EAAE,MAAM,EAC1B,GAAG,EAAE,GAAG,EACR,GAAG,CAAC,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,CAmBf;AA4DD;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE;IACN,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,EACD,GAAG,EAAE,GAAG,EACR,GAAG,CAAC,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,CAuEf;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,GAAG,EAAE,GAAG,EACR,GAAG,CAAC,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,GAAG,EAAE,GAAG,EACR,GAAG,CAAC,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,CA0Cf;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,GAAG,EACR,GAAG,CAAC,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,CAuBf"}

package/openclaw.plugin.json

@@ -35,9 +35,21 @@
       "description": "智小途企业通讯平台",
       "schema": {
         "type": "object",
-        "additionalProperties": true,
+        "additionalProperties": false,
         "required": ["appKey", "appSecret"],
         "properties": {
+          "enabled": {
+            "type": "boolean",
+            "title": "是否启用"
+          },
+          "baseUrl": {
+            "type": "string",
+            "title": "接口地址"
+          },
+          "websocketUrl": {
+            "type": "string",
+            "title": "WebSocket 地址"
+          },
           "appKey": {
             "type": "string",
             "description": "智小途应用 Key",
@@ -47,6 +59,168 @@
             "type": "string",
             "description": "智小途应用 Secret",
             "title": "应用 Secret"
+          },
+          "agentId": {
+            "title": "默认智能体 ID",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "number"
+              }
+            ]
+          },
+          "userId": {
+            "title": "默认用户 ID",
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "number"
+              }
+            ]
+          },
+          "localIp": {
+            "type": "string",
+            "title": "本地 IP"
+          },
+          "requestTimeout": {
+            "type": "integer",
+            "minimum": 1,
+            "title": "请求超时毫秒"
+          },
+          "allowInsecureTls": {
+            "type": "boolean",
+            "title": "允许不安全 TLS"
+          },
+          "allowRawJsonPayload": {
+            "type": "boolean",
+            "title": "允许原始 JSON 负载"
+          },
+          "uploadUrl": {
+            "type": "string",
+            "title": "上传地址"
+          },
+          "uploadFieldName": {
+            "type": "string",
+            "title": "上传字段名"
+          },
+          "uploadHeaders": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            },
+            "title": "上传请求头"
+          },
+          "uploadFormFields": {
+            "type": "object",
+            "additionalProperties": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "number"
+                },
+                {
+                  "type": "boolean"
+                }
+              ]
+            },
+            "title": "上传表单字段"
+          },
+          "uploadResponseUrlPath": {
+            "type": "string",
+            "title": "上传响应 URL 路径"
+          },
+          "dmPolicy": {
+            "type": "string",
+            "enum": ["open"],
+            "title": "私聊策略"
+          },
+          "allowFrom": {
+            "type": "array",
+            "title": "允许发送者",
+            "items": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "number"
+                }
+              ]
+            }
+          },
+          "mediaMaxMb": {
+            "type": "number",
+            "exclusiveMinimum": 0,
+            "title": "媒体大小上限"
+          },
+          "accounts": {
+            "type": "object",
+            "title": "账户配置",
+            "additionalProperties": {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "enabled": {
+                  "type": "boolean"
+                },
+                "name": {
+                  "type": "string"
+                },
+                "agentId": {
+                  "anyOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "number"
+                    }
+                  ]
+                },
+                "userId": {
+                  "anyOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "number"
+                    }
+                  ]
+                },
+                "openConversationId": {
+                  "type": "string"
+                },
+                "dmPolicy": {
+                  "type": "string",
+                  "enum": ["open"]
+                },
+                "allowFrom": {
+                  "type": "array",
+                  "items": {
+                    "anyOf": [
+                      {
+                        "type": "string"
+                      },
+                      {
+                        "type": "number"
+                      }
+                    ]
+                  }
+                },
+                "mediaMaxMb": {
+                  "type": "number",
+                  "exclusiveMinimum": 0
+                },
+                "allowInsecureTls": {
+                  "type": "boolean"
+                }
+              }
+            }
           }
         }
       },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@workclaw/openclaw-workclaw",
   "type": "module",
-  "version": "1.0.336",
+  "version": "1.0.337",
   "description": "智小途企业通讯平台 OpenClaw 渠道插件",
   "license": "MIT",
   "keywords": [