@dream-craft/canvas-agent 0.6.3 → 0.6.4

package/agent-instructions.md

@@ -7,7 +7,7 @@
 - 修改当前画布时根据任务使用已配置的 infinite-canvas MCP 工具；复杂批量改动使用 `canvas_apply_ops`。
 - 用户要求把上传附件放入画布或作为生成参考图时，必须先用 `canvas_create_attachment_nodes` 创建真实图片节点，再把节点 ID 传给生成流程，不要创建空图片占位节点。
 - 生图与视频工作台分别使用 `workbench_image_*`、`workbench_video_*` 工具；提示词和素材分别使用 `prompts_search`、`assets_*` 工具。
-- 用户要求生成图片、视频、音频或文本时，默认调用对应的 `canvas_generate_image`、`canvas_generate_video`、`canvas_generate_audio`、`canvas_generate_text`，通过当前画布的生成节点完成任务。
+- 用户要求生成图片、视频、音频或文本时，默认调用对应的 `canvas_generate_image`、`canvas_generate_video`、`canvas_generate_audio`、`canvas_generate_text`，通过当前画布的生成节点完成任务。**优先级（最高）例外**：开放式/高成本创作任务（如"生成一个某某主题的视频短片"、搭完整生成链、批量产出，特征是含多个未指定的自由决策点）必须先按 `task-briefing` 技能发对齐问卷并结束本轮，用户确认口径前禁止调用任何生成、建链或触发工具——本条与下一条的"直接调用生成工具"默认指令都让位于该技能。
 - 只有用户明确要求使用“Codex 内置生图”“ImageGen 技能”或意思明确相同的能力时，才使用 Codex 自带的 `imagegen`；不要因为用户只说“生成图片”就自行改用内置生图。内置生图完成后，其结果会由 Canvas Agent 自动展示到对话并插入当前画布，无需再创建空节点或重复生成。
 - 只有用户明确说要在生图/视频工作台生成时，才使用 `workbench_image_*`、`workbench_video_*`。生成任务提交后应说明已经在画布或工作台开始生成，不要在实际没有结果时声称“已生成”。
 - 需要生成内容时直接调用对应生成工具，不要绑定特定业务场景，不要模拟鼠标点击，不要要求用户手动复制 JSON。
@@ -15,6 +15,6 @@
 
 ## Windows shell 与工具缺失行为
 
-- 沙箱环境是 Windows PowerShell 5.1。shell 只用于三类用途：读取文件（`Get-Content`）、等待（`Start-Sleep`）、文件搜索（`Get-ChildItem` / `Select-String`）。不要使用 bash/Unix 语法（`ls -la`、`head`、`grep`、`/dev/null` 等）；`python`、`python3`、`pwsh` 在本机不存在，不要尝试调用。
+- 沙箱环境是 Windows PowerShell 5.1。shell 只用于三类用途：读取文件（`Get-Content`）、等待（`Start-Sleep`）、文件搜索（`Get-ChildItem` / `Select-String`）。不要使用 bash/Unix 语法（`ls -la`、`head`、`grep`、`/dev/null` 等）；`python3`、`pwsh` 在本机不存在，python 在沙箱 shell 的 PATH 里调不到——不要用脚本语言生成 JSON 参数，直接把 JSON 写进工具参数。
 - 当工具清单中没有 `canvas_*` 前缀工具（infinite-canvas MCP 未注册或未连接）时，立即向用户报告「画布工具不可用，请检查 Canvas Agent 连接」并停止执行任务；不要把工具名当命令执行，不要在文件系统里搜索画布状态或 MCP 配置。
 - 同一 shell 命令因环境类错误（命令不存在、语法错误、权限拒绝）连续失败 2 次后，停止更换写法，向用户说明具体缺口；不要继续用其他脚本语言或管道方式重试。画布工具返回的业务错误（如「当前没有已连接画布」）按前文切换画布的规则处理，不属于此类。

package/dist/agent/codex-history.js

@@ -526,7 +526,12 @@ function commandDetail(item) {
 }
 /** 生成 MCP 工具的用户可读详情。 */
 function toolHistoryDetail(tool, item, input, error) {
-    return { kind: "tool", status: itemStatus(item, error), rows: toolInputRows(tool, input), ...(error ? { output: error } : {}) };
+    const status = itemStatus(item, error);
+    // 问卷卡片：前端按 detail.kind === "survey" 渲染可交互表单。历史快照在轮次结束后会成为权威消息，
+    // 因此这一支必须原样透传入参——否则历史同步会把已渲染的问卷卡片替换成一行普通工具卡。
+    if (tool === "canvas_present_survey" && status === "completed" && !error)
+        return { kind: "survey", status, survey: input };
+    return { kind: "tool", status, rows: toolInputRows(tool, input), ...(error ? { output: error } : {}) };
 }
 function itemErrorMessage(item) {
     return String(field(field(item, "error"), "message") || "");
@@ -558,6 +563,8 @@ function toolHistorySummary(tool, item, input) {
     }
     if (tool === "canvas_get_selection")
         return "已读取当前选中内容";
+    if (tool === "canvas_present_survey")
+        return "已呈现对齐问卷";
     if (tool === "prompts_search")
         return `找到 ${numberValue(field(result, "total"))} 条提示词`;
     if (tool === "assets_list")
@@ -760,6 +767,8 @@ function toolName(name) {
         return "读取画布";
     if (name === "canvas_get_selection")
         return "读取选区";
+    if (name === "canvas_present_survey")
+        return "发起对齐问卷";
     if (name === "canvas_export_snapshot")
         return "导出快照";
     if (name === "canvas_create_node")

package/dist/canvas/schemas.d.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
 /** Canvas Agent 对外提供的工具名称。 */
-export declare const toolNames: readonly ["site_navigate", "canvas_list_projects", "canvas_get_state", "canvas_get_selection", "canvas_export_snapshot", "canvas_apply_ops", "canvas_create_node", "canvas_create_attachment_nodes", "canvas_create_text_node", "canvas_create_text_nodes", "canvas_create_config_node", "canvas_create_image_prompt_flow", "canvas_create_generation_flow", "canvas_generate_text", "canvas_generate_image", "canvas_generate_video", "canvas_generate_audio", "canvas_update_node", "canvas_update_node_text", "canvas_move_nodes", "canvas_resize_node", "canvas_delete_nodes", "canvas_connect_nodes", "canvas_select_nodes", "canvas_set_viewport", "canvas_run_generation", "generation_get_status", "workbench_image_get_config", "workbench_image_generate", "workbench_video_get_config", "workbench_video_generate", "prompts_search", "assets_list", "assets_add"];
+export declare const toolNames: readonly ["site_navigate", "canvas_list_projects", "canvas_get_state", "canvas_get_selection", "canvas_export_snapshot", "canvas_apply_ops", "canvas_create_node", "canvas_create_attachment_nodes", "canvas_create_text_node", "canvas_create_text_nodes", "canvas_create_config_node", "canvas_create_image_prompt_flow", "canvas_create_generation_flow", "canvas_generate_text", "canvas_generate_image", "canvas_generate_video", "canvas_generate_audio", "canvas_update_node", "canvas_update_node_text", "canvas_move_nodes", "canvas_resize_node", "canvas_delete_nodes", "canvas_connect_nodes", "canvas_set_viewport", "canvas_select_nodes", "canvas_present_survey", "canvas_run_generation", "generation_get_status", "workbench_image_get_config", "workbench_image_generate", "workbench_video_get_config", "workbench_video_generate", "prompts_search", "assets_list", "assets_add"];
 export type ToolName = (typeof toolNames)[number];
 export declare const canvasOpSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     type: z.ZodLiteral<"add_node">;
@@ -234,7 +234,13 @@ export declare const toolInputSchemas: {
         page?: number | undefined;
         pageSize?: number | undefined;
     }>;
-    canvas_get_state: z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>;
+    canvas_get_state: z.ZodObject<{
+        full: z.ZodOptional<z.ZodBoolean>;
+    }, "passthrough", z.ZodTypeAny, z.objectOutputType<{
+        full: z.ZodOptional<z.ZodBoolean>;
+    }, z.ZodTypeAny, "passthrough">, z.objectInputType<{
+        full: z.ZodOptional<z.ZodBoolean>;
+    }, z.ZodTypeAny, "passthrough">>;
     canvas_get_selection: z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>;
     canvas_export_snapshot: z.ZodObject<{}, "passthrough", z.ZodTypeAny, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">, z.objectInputType<{}, z.ZodTypeAny, "passthrough">>;
     canvas_apply_ops: z.ZodObject<{
@@ -792,6 +798,73 @@ export declare const toolInputSchemas: {
     }, {
         ids: string[];
     }>;
+    canvas_present_survey: z.ZodObject<{
+        title: z.ZodOptional<z.ZodString>;
+        contextText: z.ZodOptional<z.ZodString>;
+        groups: z.ZodType<{
+            title: string;
+            options: {
+                label: string;
+                description?: string | undefined;
+                recommended?: boolean | undefined;
+            }[];
+            mode?: "single" | "multi" | undefined;
+            allowCustom?: boolean | undefined;
+        }[], z.ZodTypeDef, {
+            title: string;
+            options: {
+                label: string;
+                description?: string | undefined;
+                recommended?: boolean | undefined;
+            }[];
+            mode?: "single" | "multi" | undefined;
+            allowCustom?: boolean | undefined;
+        }[]>;
+    }, "passthrough", z.ZodTypeAny, z.objectOutputType<{
+        title: z.ZodOptional<z.ZodString>;
+        contextText: z.ZodOptional<z.ZodString>;
+        groups: z.ZodType<{
+            title: string;
+            options: {
+                label: string;
+                description?: string | undefined;
+                recommended?: boolean | undefined;
+            }[];
+            mode?: "single" | "multi" | undefined;
+            allowCustom?: boolean | undefined;
+        }[], z.ZodTypeDef, {
+            title: string;
+            options: {
+                label: string;
+                description?: string | undefined;
+                recommended?: boolean | undefined;
+            }[];
+            mode?: "single" | "multi" | undefined;
+            allowCustom?: boolean | undefined;
+        }[]>;
+    }, z.ZodTypeAny, "passthrough">, z.objectInputType<{
+        title: z.ZodOptional<z.ZodString>;
+        contextText: z.ZodOptional<z.ZodString>;
+        groups: z.ZodType<{
+            title: string;
+            options: {
+                label: string;
+                description?: string | undefined;
+                recommended?: boolean | undefined;
+            }[];
+            mode?: "single" | "multi" | undefined;
+            allowCustom?: boolean | undefined;
+        }[], z.ZodTypeDef, {
+            title: string;
+            options: {
+                label: string;
+                description?: string | undefined;
+                recommended?: boolean | undefined;
+            }[];
+            mode?: "single" | "multi" | undefined;
+            allowCustom?: boolean | undefined;
+        }[]>;
+    }, z.ZodTypeAny, "passthrough">>;
     canvas_set_viewport: z.ZodObject<{
         viewport: z.ZodObject<{
             x: z.ZodNumber;

package/dist/canvas/schemas.js

@@ -46,8 +46,9 @@ export const toolNames = [
     "canvas_resize_node",
     "canvas_delete_nodes",
     "canvas_connect_nodes",
-    "canvas_select_nodes",
     "canvas_set_viewport",
+    "canvas_select_nodes",
+    "canvas_present_survey",
     "canvas_run_generation",
     "generation_get_status",
     "workbench_image_get_config",
@@ -110,7 +111,7 @@ const generationFlowSchema = z.object({
 export const toolInputSchemas = {
     site_navigate: z.object({ path: z.string() }),
     canvas_list_projects: z.object({ keyword: z.string().optional(), page: z.number().optional(), pageSize: z.number().optional() }),
-    canvas_get_state: z.object({}).passthrough(),
+    canvas_get_state: z.object({ full: z.boolean().optional() }).passthrough(),
     canvas_get_selection: z.object({}).passthrough(),
     canvas_export_snapshot: z.object({}).passthrough(),
     canvas_apply_ops: z.object({ ops: jsonArraySchema(canvasOpSchema) }),
@@ -132,6 +133,16 @@ export const toolInputSchemas = {
     canvas_delete_nodes: z.object({ ids: jsonArraySchema(z.string(), 1) }),
     canvas_connect_nodes: z.object({ connections: jsonArraySchema(z.object({ fromNodeId: z.string(), toNodeId: z.string() }), 1) }),
     canvas_select_nodes: z.object({ ids: jsonArraySchema(z.string()) }),
+    canvas_present_survey: z.object({
+        title: z.string().optional(),
+        contextText: z.string().optional(),
+        groups: jsonArraySchema(z.object({
+            title: z.string(),
+            mode: z.enum(["single", "multi"]).optional(),
+            options: jsonArraySchema(z.object({ label: z.string(), description: z.string().optional(), recommended: z.boolean().optional() }), 1),
+            allowCustom: z.boolean().optional(),
+        }), 1),
+    }).passthrough(),
     canvas_set_viewport: z.object({ viewport: viewportSchema }),
     canvas_run_generation: z.object({ nodeId: z.string(), mode: generationModeSchema.optional(), prompt: z.string().optional() }),
     generation_get_status: z.object({ scope: z.enum(["all", "canvas", "image", "video"]).optional(), taskId: z.string().optional(), nodeIds: jsonArraySchema(z.string()).optional(), limit: z.number().optional() }),
@@ -146,7 +157,7 @@ export const toolInputSchemas = {
 export const toolDescriptions = {
     site_navigate: "跳转网站页面。path 可为 / (首页)、/canvas (我的画布)、/canvas/:id (指定画布)、/image (生图工作台)、/video (视频创作台)、/prompts (提示词库)、/assets (我的素材)、/config (配置)。操作画布前若不在画布页，先用本工具打开画布。",
     canvas_list_projects: "列出用户全部画布（仅标题、创建/更新时间、节点数、连线数，不含完整数据），支持 keyword 搜索和 page/pageSize 分页。返回的 id 可配合 site_navigate 跳转到 /canvas/:id 打开对应画布。",
-    canvas_get_state: "读取当前网页画布的节点、连线、选区和视口。",
+    canvas_get_state: "读取当前网页画布的节点、连线、选区和视口。默认节点 metadata.content 超过 240 字符会被截断；full: true 返回未截断内容，做提示词/种子与生成参数（如画幅比例）的一致性分析时必须带 full: true，避免漏看长文本里的画幅假设。",
     canvas_get_selection: "读取当前网页画布选中的节点。",
     canvas_export_snapshot: "导出当前画布快照，用于理解布局。",
     canvas_apply_ops: "批量操作当前网页画布。ops 支持 add_node（nodeType 可为内置类型或已启用插件的 \"<pluginId>:<name>\" 类型）、update_node、delete_node、delete_connections、connect_nodes、set_viewport、select_nodes、arrange_nodes、run_generation。ops 最小示例：[{\"type\":\"add_node\",\"id\":\"main\",\"nodeType\":\"text\",\"title\":\"主提示词\",\"metadata\":{\"content\":\"提示词内容\"}}]，连接节点用 {\"type\":\"connect_nodes\",\"fromNodeId\":\"main\",\"toNodeId\":\"target\"}，connect_nodes 必须同时提供 fromNodeId 与 toNodeId。arrange_nodes 只带意图（ids 或 all 二选一 + mode/axis/side），坐标由网页端排版算法计算并在整理后聚焦结果，不要自己算坐标或预判结果。mode=auto/flow/by_media/row/column/grid/spread 为防重叠整理，结果不重叠；mode=align/distribute 是对齐/等距工具，按定义会让节点在一条线上重叠或贴合，这是预期行为，不要据此判定整理失败。",
@@ -168,6 +179,7 @@ export const toolDescriptions = {
     canvas_delete_nodes: "删除指定节点及相关连线。",
     canvas_connect_nodes: "批量连接节点。",
     canvas_select_nodes: "设置当前选中节点。",
+    canvas_present_survey: "向用户呈现一张可交互的对齐问卷卡片（分组单选/多选 + 自定义输入），用于开放式创作任务动手前确认需求口径。调用后立即返回，本轮结束等待用户在卡片中提交选择；不要在无用户回复时继续执行任务，也不要用纯文本列表代替本工具。groups 每组含 title、mode（single 默认/multi）、options（label/description/recommended 标注推荐项）、allowCustom（是否允许自定义输入）；title/contextText 为卡片标题与现状说明。",
     canvas_set_viewport: "调整画布视口。",
     canvas_run_generation: "触发指定节点生成，通常用于配置节点或文本/图片/视频/音频节点。",
     generation_get_status: "查询当前活动网页的生成任务状态。默认返回画布、生图工作台和视频工作台最近任务；可用 scope 过滤来源，用 taskId 查询工作台任务，用 nodeIds 查询画布节点。",

package/dist/canvas/session.js

@@ -415,6 +415,9 @@ export class CanvasSession {
             throw new Error(`未知工具：${String(name)}`);
         logger.info("MCP tool called", { name, input: rawInput, targetClientId: this.targetClientId });
         const input = parseToolInput(name, rawInput);
+        // 问卷呈现是 agent 本地动作：不依赖画布连接，返回即结束本轮等用户在卡片中提交。
+        if (name === "canvas_present_survey")
+            return { presented: true };
         if (SITE_TOOLS.has(name)) {
             if (!this.clients.size)
                 throw new Error("当前没有已连接网页");
@@ -423,7 +426,9 @@ export class CanvasSession {
         const readTool = ["canvas_get_state", "canvas_get_selection", "canvas_export_snapshot"].includes(name);
         if (readTool && (!this.clients.size || !this.canvasState))
             throw new Error("当前没有已连接画布");
-        if (name === "canvas_get_state" || name === "canvas_export_snapshot")
+        if (name === "canvas_get_state")
+            return input.full === true ? this.canvasState : compactCanvasState(this.canvasState);
+        if (name === "canvas_export_snapshot")
             return compactCanvasState(this.canvasState);
         if (name === "canvas_get_selection") {
             const ids = new Set(this.canvasState?.selectedNodeIds || []);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dream-craft/canvas-agent",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",