@artflo-ai/artflo-openclaw-plugin 0.0.13 → 0.0.14

package/dist/index.js

@@ -30,93 +30,54 @@ const plugin = {
     name: PLUGIN_NAME,
     description: PLUGIN_DESCRIPTION,
     configSchema: pluginConfigSchema,
-    async register(api) {
+    register(api) {
         const config = createPluginConfig(api);
-        // ── 确保 tools.alsoAllow 包含所有 Artflo 工具 ─────────────────────
-        try {
-            const allToolNames = Object.values(ARTFLO_TOOL_NAMES);
-            const cfg = api.runtime.config.loadConfig();
-            const tools = cfg.tools ?? {};
-            if (tools.allow && tools.allow.length > 0) {
-                const missing = allToolNames.filter((t) => !tools.allow.includes(t));
-                if (missing.length > 0) {
-                    console.warn(`[artflo] tools.allow is set. Please add ${JSON.stringify(missing)} manually.`);
-                }
-            }
-            else {
-                const existing = tools.alsoAllow ?? [];
-                const missing = allToolNames.filter((t) => !existing.includes(t));
-                if (missing.length > 0) {
-                    await api.runtime.config.writeConfigFile({
-                        ...cfg,
-                        tools: { ...tools, alsoAllow: [...existing, ...missing] },
-                    });
-                    console.log(`[artflo] Added ${missing.length} tools to tools.alsoAllow`);
-                }
-            }
-        }
-        catch (err) {
-            console.warn(`[artflo] Failed to update tools.alsoAllow:`, err instanceof Error ? err.message : String(err));
-        }
-        // ── 没有 apiKey 时跳过所有初始化，只注册 tool（tool 内部会检查 apiKey）──
-        if (!config.apiKey) {
-            console.log(`[artflo] API Key not configured. Skipping initialization.`);
-            const sessions = createSessionRegistryService(config);
-            api.registerService(sessions.service);
-            registerArtfloTools(api, { config, workspaceDir: api.rootDir, sessions: sessions.registry });
-            api.on('before_prompt_build', async () => {
-                return {
-                    appendSystemContext: [
-                        `[Artflo Plugin] env=${config.env}, apiKey=未配置`,
-                        '[MANDATORY] 在调用任何 artflo_* 工具之前，你必须先读取 artflo_canvas Skill（skills/artflo-canvas/SKILL.md）。' +
-                            '该 Skill 包含路由优先级、API Key 前置检查、操作策略、澄清标准、推荐流程、任务收尾规范等关键规则。' +
-                            '未读取 Skill 直接调用工具将导致参数错误、流程遗漏和用户体验问题。' +
-                            '如果你已在当前会话中读取过该 Skill，可以跳过此步骤。',
-                        'API Key 未配置，请引导用户通过 artflo_set_api_key 设置。',
-                    ].join('\n'),
-                };
-            });
-            return;
-        }
-        // ── 自动获取 appKey / vipAppId / vipGroup ─────────────────────────
-        if (!config.appKey || !config.vipAppId || !config.vipGroup) {
-            try {
-                const params = await fetchClientParams(config.webApiBaseUrl);
-                if (!config.appKey)
-                    config.appKey = params.appKey;
-                if (!config.vipAppId)
-                    config.vipAppId = params.vipAppId;
-                if (!config.vipGroup)
-                    config.vipGroup = params.vipGroup;
-                console.log(`[artflo] client params fetched: appKey=${config.appKey}, env=${config.env}`);
-            }
-            catch (err) {
-                console.warn(`[artflo] Failed to fetch client params, using defaults:`, err instanceof Error ? err.message : String(err));
-                if (!config.appKey)
-                    config.appKey = 'A40CB4D42E28F808';
-                if (!config.vipAppId)
-                    config.vipAppId = '7029803307044000000';
-                if (!config.vipGroup)
-                    config.vipGroup = 'group_artflo';
-            }
-        }
-        console.log(`[artflo] env=${config.env}, api=${config.apiBaseUrl}`);
         const sessions = createSessionRegistryService(config);
         api.registerService(sessions.service);
-        registerArtfloTools(api, {
-            config,
-            workspaceDir: api.rootDir,
-            sessions: sessions.registry,
+        registerArtfloTools(api, { config, workspaceDir: api.rootDir, sessions: sessions.registry });
+        // ── 确保 tools.alsoAllow 包含所有 Artflo 工具（在 service start 中异步执行）──
+        api.registerService({
+            id: 'artflo-tools-allowlist',
+            async start() {
+                try {
+                    const allToolNames = Object.values(ARTFLO_TOOL_NAMES);
+                    const cfg = api.runtime.config.loadConfig();
+                    const tools = cfg.tools ?? {};
+                    if (tools.allow && tools.allow.length > 0) {
+                        const missing = allToolNames.filter((t) => !tools.allow.includes(t));
+                        if (missing.length > 0) {
+                            console.warn(`[artflo] tools.allow is set. Please add ${JSON.stringify(missing)} manually.`);
+                        }
+                    }
+                    else {
+                        const existing = tools.alsoAllow ?? [];
+                        const missing = allToolNames.filter((t) => !existing.includes(t));
+                        if (missing.length > 0) {
+                            await api.runtime.config.writeConfigFile({
+                                ...cfg,
+                                tools: { ...tools, alsoAllow: [...existing, ...missing] },
+                            });
+                            console.log(`[artflo] Added ${missing.length} tools to tools.alsoAllow`);
+                        }
+                    }
+                }
+                catch (err) {
+                    console.warn(`[artflo] Failed to update tools.alsoAllow:`, err instanceof Error ? err.message : String(err));
+                }
+            },
         });
+        // ── 异步初始化（不阻塞同步注册）──────────────────────────────
+        if (config.apiKey) {
+            initClientParams(config);
+        }
         // ── 每次 prompt 构建时注入 Artflo 配置、用户状态和 Skill 强制提醒 ──
         api.on('before_prompt_build', async () => {
             const masked = config.apiKey
                 ? `****${config.apiKey.slice(-4)}`
                 : '未配置';
             const lines = [
-                `[Artflo Plugin] env=${config.env}, apiKey=${masked}, tz=${config.timeZone}, country=${config.countryCode}`,
+                `[Artflo Plugin] env=${config.env}, apiKey=${masked}`,
             ];
-            // ── Skill 强制读取提醒 ──
             lines.push('[MANDATORY] 在调用任何 artflo_* 工具之前，你必须先读取 artflo_canvas Skill（skills/artflo-canvas/SKILL.md）。' +
                 '该 Skill 包含路由优先级、API Key 前置检查、操作策略、澄清标准、推荐流程、任务收尾规范等关键规则。' +
                 '未读取 Skill 直接调用工具将导致参数错误、流程遗漏和用户体验问题。' +
@@ -135,6 +96,33 @@ const plugin = {
             }
             return { appendSystemContext: lines.join('\n') };
         });
+        console.log(`[artflo] registered (env=${config.env}, apiKey=${config.apiKey ? 'set' : 'not set'})`);
     },
 };
+/** 后台获取 appKey / vipAppId / vipGroup，不阻塞同步注册 */
+function initClientParams(config) {
+    if (config.appKey && config.vipAppId && config.vipGroup) {
+        console.log(`[artflo] client params already set: appKey=${config.appKey}, env=${config.env}`);
+        return;
+    }
+    fetchClientParams(config.webApiBaseUrl)
+        .then((params) => {
+        if (!config.appKey)
+            config.appKey = params.appKey;
+        if (!config.vipAppId)
+            config.vipAppId = params.vipAppId;
+        if (!config.vipGroup)
+            config.vipGroup = params.vipGroup;
+        console.log(`[artflo] client params fetched: appKey=${config.appKey}, env=${config.env}`);
+    })
+        .catch((err) => {
+        console.warn(`[artflo] Failed to fetch client params, using defaults:`, err instanceof Error ? err.message : String(err));
+        if (!config.appKey)
+            config.appKey = 'A40CB4D42E28F808';
+        if (!config.vipAppId)
+            config.vipAppId = '7029803307044000000';
+        if (!config.vipGroup)
+            config.vipGroup = 'group_artflo';
+    });
+}
 export default plugin;

package/dist/src/core/executor/element-builders.js

@@ -50,16 +50,47 @@ export function buildNodeElement(args) {
             break;
         case 'process':
             canvasType = CANVAS_NODE_TYPES.PROCESS;
+            // ── Normalize camelCase / alias field names to canonical snake_case ──
+            if (elementData.toolType !== undefined && elementData.tool_type === undefined) {
+                elementData.tool_type = elementData.toolType;
+                delete elementData.toolType;
+            }
+            if (elementData.imageCount !== undefined && elementData.count === undefined) {
+                elementData.count = elementData.imageCount;
+                delete elementData.imageCount;
+            }
+            if (elementData.outputType !== undefined && elementData.output_type === undefined) {
+                elementData.output_type = elementData.outputType;
+                delete elementData.outputType;
+            }
+            if (elementData.videoDuration !== undefined && elementData.video_duration === undefined) {
+                elementData.video_duration = elementData.videoDuration;
+                delete elementData.videoDuration;
+            }
+            if (elementData.videoSound !== undefined && elementData.video_sound === undefined) {
+                elementData.video_sound = elementData.videoSound;
+                delete elementData.videoSound;
+            }
+            if (elementData.showExecute !== undefined && elementData.show_execute === undefined) {
+                elementData.show_execute = elementData.showExecute;
+                delete elementData.showExecute;
+            }
             elementData.tool_type = elementData.tool_type ?? 1;
             elementData.status = elementData.status ?? 0;
             elementData.show_execute = elementData.show_execute ?? true;
             elementData.planning = false;
             elementData.executed = false;
             elementData.count = elementData.count ?? 1;
-            if (elementData.model && !elementData.current_model) {
-                elementData.current_model = elementData.model;
-                delete elementData.model;
+            // Normalize model field: accept model, modelKey, model_key → current_model
+            if (!elementData.current_model) {
+                const modelAlias = elementData.model || elementData.modelKey || elementData.model_key;
+                if (modelAlias) {
+                    elementData.current_model = modelAlias;
+                }
             }
+            delete elementData.model;
+            delete elementData.modelKey;
+            delete elementData.model_key;
             elementData.output_type =
                 elementData.output_type ?? getOutputType(Number(elementData.tool_type ?? 1));
             {
@@ -114,7 +145,10 @@ export function buildNodeElement(args) {
             elementData.status = elementData.status ?? 0;
             elementData.show_execute = elementData.show_execute ?? true;
             elementData.current_model =
-                elementData.model || elementData.current_model || 'gemini-2.5-flash-preview';
+                elementData.current_model || elementData.model || elementData.modelKey || elementData.model_key || 'gemini-2.5-flash-preview';
+            delete elementData.model;
+            delete elementData.modelKey;
+            delete elementData.model_key;
             if (elementData.promptCategory) {
                 elementData.prompt_category = elementData.promptCategory;
                 delete elementData.promptCategory;

package/openclaw.plugin.json

@@ -2,15 +2,20 @@
   "id": "artflo-openclaw-plugin",
   "name": "Artflo OpenClaw Plugin",
   "description": "Artflo canvas tools over direct WebSocket.",
-  "version": "0.0.2",
-  "skills": ["skills/artflo-canvas"],
+  "version": "0.0.14",
+  "skills": [
+    "skills/artflo-canvas"
+  ],
   "configSchema": {
     "type": "object",
     "additionalProperties": false,
     "properties": {
       "env": {
         "type": "string",
-        "enum": ["release", "test"],
+        "enum": [
+          "release",
+          "test"
+        ],
         "default": "release",
         "description": "Environment: release or test."
       },
@@ -26,8 +31,15 @@
     }
   },
   "uiHints": {
-    "env": { "label": "Environment" },
-    "apiKey": { "label": "API Key", "sensitive": true },
-    "operSystem": { "label": "Oper System" }
+    "env": {
+      "label": "Environment"
+    },
+    "apiKey": {
+      "label": "API Key",
+      "sensitive": true
+    },
+    "operSystem": {
+      "label": "Oper System"
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@artflo-ai/artflo-openclaw-plugin",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "type": "module",
   "description": "OpenClaw plugin that connects directly to Artflo canvas WebSocket runtime.",
   "keywords": [
@@ -34,6 +34,7 @@
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "check": "tsc -p tsconfig.json --noEmit",
+    "version": "node scripts/sync-version.mjs && git add openclaw.plugin.json",
     "notify": "node scripts/notify-publish.mjs",
     "release": "npm version patch && npm publish && node scripts/notify-publish.mjs",
     "release:minor": "npm version minor && npm publish && node scripts/notify-publish.mjs",

package/skills/artflo-canvas/SKILL.md

@@ -47,6 +47,7 @@ metadata:
 
 ## 操作策略
 
+- **输出格式硬约束**：禁止使用 markdown 超链接语法 `[文字](url)`、`[查看](url)`、`[🖼️ 查看图片](url)` 等。运行环境（微信/企业微信）不渲染 markdown，用户会看到原始语法。所有 URL 必须以纯文本直接输出，如 `画布：https://artflo.ai/project/xxx`。这条规则适用于所有面向用户的回复，包括任务收尾、错误提示、画布链接、资源链接等。
 - 优先采用先规划、后执行的工作流，而不是临时拼接低层级修改步骤。
 - 在创建或扩展多节点工作流之前，先判断用户需求是否已经足够明确，能否安全规划。
 - 澄清遵循两级标准（见下方「澄清标准」），只有必须确认的字段缺失时才提问，可以合理假设的字段直接用默认值。

package/skills/artflo-canvas/references/node-schema.json

@@ -26,7 +26,21 @@
         "properties": { "current_model": "Praline_2" }
       }
     },
-    "fieldsNote": "The 'fields' object in each nodeTypes entry below lists fields that belong INSIDE 'data'. For example, Process.fields.tool_type means data.tool_type, NOT a top-level tool_type."
+    "fieldsNote": "The 'fields' object in each nodeTypes entry below lists fields that belong INSIDE 'data'. For example, Process.fields.tool_type means data.tool_type, NOT a top-level tool_type.",
+    "fieldNamingConvention": {
+      "description": "Canvas element data fields use snake_case naming. Do NOT use camelCase aliases. The executor will attempt to normalize common mistakes, but the plan should use the correct names.",
+      "correctNames": {
+        "current_model": "模型标识（如 Praline_2）。不要用 model、modelKey、model_key",
+        "tool_type": "工具类型（如 1=文生图）。不要用 toolType",
+        "output_type": "输出类型（如 0=图片）。不要用 outputType",
+        "show_execute": "是否显示执行按钮。不要用 showExecute",
+        "video_duration": "视频时长。不要用 videoDuration",
+        "video_sound": "视频音效。不要用 videoSound",
+        "split_mode": "分割模式。不要用 splitMode",
+        "prompt_category": "Prompt 类别。不要用 promptCategory",
+        "custom_prompt": "自定义 Prompt。不要用 customPrompt"
+      }
+    }
   },
   "generalRules": [
     "Use plan node types such as input, refine, process, selector, and batch.",
@@ -593,7 +607,7 @@
     "Process": {
       "code": 130000,
       "name": "处理节点",
-      "llmDescription": "执行 AI 生成任务的核心节点，支持 Image、Video、3D Model、Upscale、Remove BG、GIF 等。关键字段: tool_type (工具类型 1=文生图 2=图生图 3=文生视频 4=图生视频 5=去背景 6=视频转GIF 8=图生3D 10=高清), status (状态 0=空闲 1=等待 2=处理中 3=完成 400=错误), output_type (输出类型 0=图片 1=视频 3=3D模型), count (生成数量), current_model (模型名称), ratio (输出比例如 1:1 16:9), resolution (分辨率如 1K 2K)，最多仅支持生成4张图片",
+      "llmDescription": "执行 AI 生成任务的核心节点，支持 Image、Video、3D Model、Upscale、Remove BG、GIF 等。关键字段: tool_type (工具类型 1=文生图 2=图生图 3=文生视频 4=图生视频 5=去背景 6=视频转GIF 8=图生3D 10=高清), status (状态 0=空闲 1=等待 2=处理中 3=完成 400=错误), output_type (输出类型 0=图片 1=视频 3=3D模型), count (生成数量), current_model (模型名称), ratio (输出比例如 1:1 16:9), resolution (分辨率如 1K 2K)，最多仅支持生成4张图片。注意: 模型字段必须使用 current_model，不要使用 model、modelKey 或 model_key。工具类型字段必须使用 tool_type（下划线），不要使用 toolType（驼峰）",
       "fields": {
         "tool_type": {
           "type": "number",

package/skills/artflo-canvas/references/node-schema.md

@@ -91,6 +91,24 @@ element.data.error_message → 错误信息
 
 `node-schema.json` 中每个节点类型的 `fields` 对象列出的是 `data` 内部的字段定义。例如 Process 节点的 `fields.tool_type` 表示的是 `data.tool_type`，不是顶层的 `tool_type`。
 
+### 字段命名规范（snake_case）
+
+画布节点 `data` 内的字段统一使用 snake_case 命名。以下是常见的正确字段名和容易混淆的错误写法：
+
+| 正确字段名 | 错误写法（不要使用） | 说明 |
+|-----------|-------------------|------|
+| `current_model` | `model`、`modelKey`、`model_key` | 模型标识，如 `Praline_2` |
+| `tool_type` | `toolType` | 工具类型，如 1=文生图 |
+| `output_type` | `outputType` | 输出类型，如 0=图片 |
+| `show_execute` | `showExecute` | 是否显示执行按钮 |
+| `video_duration` | `videoDuration` | 视频时长 |
+| `video_sound` | `videoSound` | 视频音效 |
+| `split_mode` | `splitMode` | Refine 分割模式 |
+| `prompt_category` | `promptCategory` | Prompt 类别 |
+| `custom_prompt` | `customPrompt` | 自定义 Prompt |
+
+注意：PlanDSL V2 的 `NodeData` 中允许使用 `model`（作为 `current_model` 的简写）和部分驼峰字段名（如 `customPrompt`），执行器会自动归一化。但在使用 `artflo_canvas_change_elements` 直接修改画布节点时，必须使用上表中的正确字段名，因为低层级工具不经过执行器的归一化逻辑。
+
 ## General Rules
 
 - Use plan node types such as `input`, `refine`, `process`, `selector`, and `batch`.