@fieldwangai/agentflow 0.1.33 → 0.1.35

package/bin/pipeline/build-node-prompt.mjs

@@ -112,6 +112,31 @@ function marketplaceRuntimeCommand(marketplaceNode, resolvedInputs, resolvedOutp
   });
 }
 
+function normalizePromptImages(images) {
+  if (!Array.isArray(images)) return [];
+  return images
+    .filter((item) => item && typeof item === "object")
+    .map((item, index) => ({
+      label: String(item.label || `image ${index + 1}`),
+      name: String(item.name || `image-${index + 1}`),
+      mimeType: String(item.mimeType || item.type || "image/png"),
+      dataUrl: String(item.dataUrl || item.data || ""),
+    }))
+    .filter((item) => item.dataUrl.startsWith("data:image/"));
+}
+
+function renderImagesForPrompt(images) {
+  const list = normalizePromptImages(images);
+  if (list.length === 0) return "";
+  const blocks = list.map((item) => [
+    `### [${item.label}]`,
+    `name: ${item.name}`,
+    `mimeType: ${item.mimeType}`,
+    `dataUrl: ${item.dataUrl}`,
+  ].join("\n"));
+  return `## 图片附件\n\n${blocks.join("\n\n")}`;
+}
+
 /**
  * 执行占位符替换，组装 prompt 并写入 intermediate 文件（文件名带 _execId）。
  * @param {number} [execId] - 本轮 execId，缺省则从 memory 读取
@@ -153,6 +178,7 @@ export function buildNodePrompt(workspaceRoot, flowName, uuid, instanceId, execI
     inst?.script != null
       ? String(inst.script || "").trim()
       : "";
+  const imagePrompt = renderImagesForPrompt(inst?.images);
 
   const { resolvedInputs = {}, resolvedOutputs = {}, systemPrompt = "" } = data;
   const workspaceContext = normalizeWorkspaceContext(opts.workspaceContext || resolvedInputs.workspaceContext, workspaceRoot, flowName, { flowDir });
@@ -197,7 +223,7 @@ ${contextBlocks.join("\n\n")}
 
 ## 执行任务
 
-${taskBody || "(无)"}
+${[taskBody || "(无)", imagePrompt].filter((x) => x && String(x).trim()).join("\n\n")}
 `;
 
   try {

package/bin/pipeline/pre-process-node.mjs

@@ -48,7 +48,7 @@ import {
   parseSkillKeyList,
   resolveWorkspaceTarget,
 } from "../lib/runtime-context.mjs";
-import { buildGitContext, loadGitWorktree, normalizeGitContext, unloadGitWorktree } from "../lib/git-worktree.mjs";
+import { buildGitContext, inferGitRepoRootFromWorktree, loadGitWorktree, normalizeGitContext, unloadGitWorktree } from "../lib/git-worktree.mjs";
 import { createGitLabMergeRequest } from "../lib/gitlab-mr.mjs";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -403,12 +403,16 @@ function emitGitWorktreeUnloadNode(workspaceRoot, flowName, uuid, instanceId, ex
   const { inputs, workspaceContext, flowJson } = resolveNodeRuntimeContexts(workspaceRoot, flowName, uuid, instanceId);
   requireWorkspaceContextInput(inputs, "tool_git_worktree_unload");
   const gitContext = normalizeGitContext(inputs.gitContext);
-  const repoPath = resolveMaybeWorkspacePath(inputs.repoPath, workspaceContext) ||
-    (gitContext?.repoPath ? path.resolve(gitContext.repoPath) : "");
   const worktreePath = resolveMaybeWorkspacePath(inputs.worktreePath, workspaceContext) ||
-    (gitContext?.worktreePath ? path.resolve(gitContext.worktreePath) : "");
-  if (!repoPath) throw new Error("tool_git_worktree_unload: repoPath or gitContext.repoPath is required");
-  if (!worktreePath) throw new Error("tool_git_worktree_unload: worktreePath or gitContext.worktreePath is required");
+    (gitContext?.worktreePath ? path.resolve(gitContext.worktreePath) : "") ||
+    (workspaceContext.cwd ? path.resolve(workspaceContext.cwd) : "") ||
+    (workspaceContext.workspaceRoot ? path.resolve(workspaceContext.workspaceRoot) : "");
+  if (!worktreePath) throw new Error("tool_git_worktree_unload: workspaceContext.cwd or worktreePath is required");
+  const repoPath = resolveMaybeWorkspacePath(inputs.repoPath, workspaceContext) ||
+    (gitContext?.repoPath ? path.resolve(gitContext.repoPath) : "") ||
+    inferGitRepoRootFromWorktree(worktreePath) ||
+    (workspaceContext.previous?.cwd ? path.resolve(workspaceContext.previous.cwd) : "") ||
+    (workspaceContext.previous?.workspaceRoot ? path.resolve(workspaceContext.previous.workspaceRoot) : "");
   const force = isTruthyInput(inputs.force);
   const prune = String(inputs.prune ?? "true").trim().toLowerCase() !== "false";
   const result = unloadGitWorktree({ repoPath, worktreePath, force, prune });
@@ -636,8 +640,14 @@ function writeWaitState(runDir, state) {
       if (parsed && typeof parsed === "object" && Array.isArray(parsed.waits)) registry = parsed;
     } catch (_) {}
   }
-  const waits = registry.waits.filter((w) => w && w.instanceId !== state.instanceId);
-  const wait = { ...state, id: state.id || state.instanceId };
+  const waitId = String(state.waitId || state.id || `${state.instanceId}:${state.execId || 1}`).trim();
+  const waits = registry.waits.filter((w) => {
+    if (!w) return false;
+    const key = String(w.waitId || w.id || "").trim();
+    if (key && key === waitId) return false;
+    return !(w.instanceId === state.instanceId && String(w.execId || 1) === String(state.execId || 1));
+  });
+  const wait = { ...state, waitId, id: state.id || waitId };
   waits.push(wait);
   registry = {
     ...registry,
@@ -651,6 +661,44 @@ function writeWaitState(runDir, state) {
   fs.writeFileSync(legacyPath, JSON.stringify(wait, null, 2) + "\n", "utf-8");
 }
 
+function buildWaitId(uuid, instanceId, execId, explicit = "") {
+  const text = String(explicit || "").trim();
+  if (text) return text;
+  return `${uuid}:${instanceId}:${execId || 1}`;
+}
+
+function readWaitStateById(runDir, waitId) {
+  const text = String(waitId || "").trim();
+  if (!text) return null;
+  const registryPath = path.join(runDir, "wait-states.json");
+  if (fs.existsSync(registryPath)) {
+    try {
+      const registry = JSON.parse(fs.readFileSync(registryPath, "utf-8"));
+      const waits = Array.isArray(registry?.waits) ? registry.waits : [];
+      const found = waits.find((w) => {
+        const key = String(w?.waitId || w?.id || "").trim();
+        return key === text;
+      });
+      if (found) return found;
+    } catch (_) {}
+  }
+  const legacyPath = path.join(runDir, "wait-state.json");
+  if (fs.existsSync(legacyPath)) {
+    try {
+      const state = JSON.parse(fs.readFileSync(legacyPath, "utf-8"));
+      const key = String(state?.waitId || state?.id || "").trim();
+      if (key === text) return state;
+    } catch (_) {}
+  }
+  return null;
+}
+
+function readCancelFlagForWait(runDir, waitId) {
+  const state = readWaitStateById(runDir, waitId);
+  if (state && (state.cancelled === true || state.status === "cancelled" || state.branch === "cancelled")) return true;
+  return readCancelFlag(runDir);
+}
+
 function readCancelFlag(runDir) {
   for (const name of ["cancelled", "cancelled.json", "wait-cancelled.json"]) {
     const p = path.join(runDir, name);
@@ -966,8 +1014,11 @@ async function main() {
       process.exit(1);
     }
 
+    const waitId = buildWaitId(uuid, instanceId, execId, inputs.waitId || inputs.watchId);
+    writeOutputSlot(runDir, instanceId, execId, "waitId", waitId);
     writeOutputSlot(runDir, instanceId, execId, "wakeAt", wakeAt);
     writeWaitState(runDir, {
+      waitId,
       status: "waiting",
       reason: definitionId,
       flowName,
@@ -993,7 +1044,7 @@ async function main() {
       `此节点为 ${definitionId}，已写入 wait-state.json，等待 scheduler 在 ${wakeAt} 唤醒。\n`,
     );
     writeCacheJsonForNode(workspaceRoot, flowName, uuid, instanceId, execId);
-    logToRunTag(workspaceRoot, flowName, uuid, "pre-process", { event: "waiting", instanceId, wakeAt, definitionId });
+    logToRunTag(workspaceRoot, flowName, uuid, "pre-process", { event: "waiting", instanceId, waitId, wakeAt, definitionId });
     console.log(JSON.stringify({
       ok: true,
       promptPath,
@@ -1084,37 +1135,22 @@ async function main() {
     return;
   }
 
-  if (definitionId === "control_deadline" || definitionId === "control_cancelled") {
+  if (definitionId === "control_cancelled") {
     const data = getResolvedValues(workspaceRoot, flowName, uuid, instanceId);
     if (!data.ok) {
-      console.error(JSON.stringify({ ok: false, error: `${definitionId}: getResolvedValues failed` }));
+      console.error(JSON.stringify({ ok: false, error: "control_cancelled: getResolvedValues failed" }));
       process.exit(1);
     }
-    const inputs = data.resolvedInputs || {};
-    let boolValue = false;
-    let message = "";
+    let boolValue;
+    let message;
     try {
-      if (definitionId === "control_deadline") {
-        const timezone = inputs.timezone || "Asia/Shanghai";
-        let deadline;
-        if (inputs.deadlineAt) {
-          deadline = parseDateTime(inputs.deadlineAt, timezone);
-        } else {
-          const start = inputs.startAt ? parseDateTime(inputs.startAt, timezone) : new Date();
-          deadline = new Date(start.getTime() + parseDurationMs(inputs.duration || ""));
-        }
-        const deadlineAt = deadline.toISOString();
-        boolValue = Date.now() >= deadline.getTime();
-        writeOutputSlot(runDir, instanceId, execId, "deadlineAt", deadlineAt);
-        writeOutputSlot(runDir, instanceId, execId, "expired", boolValue ? "true" : "false");
-        message = boolValue ? `已超过截止时间 ${deadlineAt}` : `未超过截止时间 ${deadlineAt}`;
-      } else {
-        boolValue = readCancelFlag(runDir);
-        writeOutputSlot(runDir, instanceId, execId, "cancelled", boolValue ? "true" : "false");
-        message = boolValue ? "已取消" : "未取消";
-      }
+      const inputs = data.resolvedInputs || {};
+      const waitId = String(inputs.waitId || inputs.watchId || "").trim();
+      boolValue = waitId ? readCancelFlagForWait(runDir, waitId) : readCancelFlag(runDir);
+      writeOutputSlot(runDir, instanceId, execId, "cancelled", boolValue ? "true" : "false");
+      message = boolValue ? "已取消" : "未取消";
     } catch (e) {
-      console.error(JSON.stringify({ ok: false, error: `${definitionId}: ${e.message}` }));
+      console.error(JSON.stringify({ ok: false, error: `control_cancelled: ${e.message}` }));
       process.exit(1);
     }
     writeResult(workspaceRoot, flowName, uuid, instanceId, { status: "success", message }, { execId, preserveBody: false });

package/builtin/nodes/agent_subAgent.md

@@ -19,5 +19,7 @@ output:
   - type: text
     name: result
     default: ""
+    required: true
+    showOnNode: true
 ---
 ${USER_PROMPT}

package/builtin/nodes/control_agent_toBool.md

@@ -9,6 +9,8 @@ input:
   - type: text
     name: value
     default: ""
+    required: true
+    showOnNode: true
 output:
   - type: node
     name: next
@@ -16,5 +18,7 @@ output:
   - type: bool
     name: prediction
     default: ""
+    required: true
+    showOnNode: true
 ---
 ${USER_PROMPT}

package/builtin/nodes/control_cancelled.md

@@ -1,14 +1,16 @@
 ---
-# 内置节点：取消状态判断
-description: Check whether the current run/watch has been cancelled. Use cancelled output with control_if.
-displayName: Cancelled
+# 内置节点：取消判断
+description: Check whether the current wait/run has been cancelled. Use cancelled output with control_if.
+displayName: Cancel Check
 input:
   - type: node
     name: prev
     default: ""
   - type: text
-    name: watchId
+    name: waitId
     default: ""
+    required: true
+    showOnNode: true
 output:
   - type: node
     name: next
@@ -16,5 +18,7 @@ output:
   - type: bool
     name: cancelled
     default: ""
+    required: true
+    showOnNode: true
 ---
 ${USER_PROMPT}

package/builtin/nodes/control_cd_workspace.md

@@ -35,6 +35,8 @@ output:
   - type: text
     name: workspaceContext
     default: ""
+    required: true
+    showOnNode: true
   - type: file
     name: cwd
     default: ""

package/builtin/nodes/control_delay.md

@@ -9,12 +9,21 @@ input:
   - type: text
     name: duration
     default: "10m"
+    required: true
+    showOnNode: true
 output:
   - type: node
     name: next
     default: ""
+  - type: text
+    name: waitId
+    default: ""
+    required: true
+    showOnNode: true
   - type: text
     name: wakeAt
     default: ""
+    required: true
+    showOnNode: true
 ---
 ${USER_PROMPT}

package/builtin/nodes/control_toBool.md

@@ -1,7 +1,7 @@
 ---
-# 内置节点：转布尔（本地脚本执行，★ 可扩展输入）
+# 内置节点：代码转布尔（本地脚本执行，★ 可扩展输入）
 description: "Script-based boolean conversion: executes script to produce true/false prediction. Like tool_nodejs but enforces bool output. Must have script field."
-displayName: ToBool
+displayName: Code ToBool
 input:
   - type: node
     name: prev
@@ -9,6 +9,8 @@ input:
   - type: text
     name: value
     default: ""
+    required: true
+    showOnNode: true
 output:
   - type: node
     name: next
@@ -16,6 +18,8 @@ output:
   - type: bool
     name: prediction
     default: ""
+    required: true
+    showOnNode: true
 extensible: true
 ---
 ${USER_PROMPT}

package/builtin/nodes/control_user_workspace.md

@@ -13,6 +13,8 @@ output:
   - type: text
     name: workspaceContext
     default: ""
+    required: true
+    showOnNode: true
   - type: file
     name: cwd
     default: ""

package/builtin/nodes/control_wait_until.md

@@ -9,6 +9,8 @@ input:
   - type: text
     name: until
     default: ""
+    required: true
+    showOnNode: true
   - type: text
     name: timezone
     default: "Asia/Shanghai"
@@ -16,8 +18,15 @@ output:
   - type: node
     name: next
     default: ""
+  - type: text
+    name: waitId
+    default: ""
+    required: true
+    showOnNode: true
   - type: text
     name: wakeAt
     default: ""
+    required: true
+    showOnNode: true
 ---
 ${USER_PROMPT}

package/builtin/nodes/provide_bool.md

@@ -7,5 +7,7 @@ output:
   - type: bool
     name: value
     default: "false"
+    required: true
+    showOnNode: true
 ---
 ${USER_PROMPT}

package/builtin/nodes/provide_file.md

@@ -7,5 +7,7 @@ output:
   - type: file
     name: value
     default: ""
+    required: true
+    showOnNode: true
 ---
 ${USER_PROMPT}

package/builtin/nodes/provide_str.md

@@ -7,5 +7,7 @@ output:
   - type: text
     name: value
     default: ""
+    required: true
+    showOnNode: true
 ---
 ${USER_PROMPT}

package/builtin/nodes/tool_get_env.md

@@ -6,9 +6,13 @@ input:
   - type: text
     name: key
     default: ""
+    required: true
+    showOnNode: true
 output:
   - type: text
     name: value
     default: ""
+    required: true
+    showOnNode: true
 ---
 ${USER_PROMPT}

package/builtin/nodes/tool_git_checkout.md

@@ -22,7 +22,6 @@ input:
   - type: text
     name: branch
     default: ""
-    showOnNode: true
   - type: text
     name: targetDir
     default: ""
@@ -38,6 +37,8 @@ input:
   - type: text
     name: workspaceContext
     default: ""
+    required: true
+    showOnNode: true
 output:
   - type: node
     name: next
@@ -57,8 +58,12 @@ output:
   - type: text
     name: workspaceContext
     default: ""
+    required: true
+    showOnNode: true
   - type: text
     name: gitContext
     default: ""
+    required: true
+    showOnNode: true
 ---
 Clone or update `${repoUrl}` and output workspace/git contexts for the checked-out repository.

package/builtin/nodes/tool_git_worktree_load.md

@@ -16,21 +16,22 @@ input:
   - type: file
     name: repoPath
     default: ""
-    showOnNode: true
   - type: text
     name: branch
     default: ""
-    showOnNode: true
   - type: file
     name: worktreePath
     default: ""
   - type: text
     name: gitContext
     default: ""
+    required: true
+    showOnNode: true
   - type: text
     name: workspaceContext
     default: ""
     required: true
+    showOnNode: true
 output:
   - type: node
     name: next
@@ -47,8 +48,12 @@ output:
   - type: text
     name: workspaceContext
     default: ""
+    required: true
+    showOnNode: true
   - type: text
     name: gitContext
     default: ""
+    required: true
+    showOnNode: true
 ---
 Load a Git worktree from `${repoPath}` and switch downstream workspace context to it.

package/builtin/nodes/tool_git_worktree_unload.md

@@ -3,9 +3,8 @@
 description: |
   Remove a Git worktree.
 
-  - `repoPath` is required unless `gitContext.repoPath` is connected.
-  - `worktreePath` is required unless `gitContext.worktreePath` is connected.
-  - `workspaceContext` is required so the node can restore the previous execution context.
+  - `workspaceContext` is required. Its `cwd` is used as the worktree to remove.
+  - `repoPath`, `worktreePath` and `gitContext` are optional compatibility overrides.
   - By default `force` is false; dirty worktrees fail instead of being removed.
   - By default `prune` is true.
 displayName: Unload Worktree
@@ -16,11 +15,9 @@ input:
   - type: file
     name: repoPath
     default: ""
-    showOnNode: true
   - type: file
     name: worktreePath
     default: ""
-    showOnNode: true
   - type: text
     name: gitContext
     default: ""
@@ -28,6 +25,7 @@ input:
     name: workspaceContext
     default: ""
     required: true
+    showOnNode: true
   - type: bool
     name: force
     default: "false"
@@ -44,6 +42,8 @@ output:
   - type: text
     name: workspaceContext
     default: ""
+    required: true
+    showOnNode: true
   - type: text
     name: message
     default: ""

package/builtin/nodes/tool_load_key.md

@@ -9,6 +9,8 @@ input:
   - type: text
     name: key
     default: ""
+    required: true
+    showOnNode: true
 output:
   - type: node
     name: next
@@ -16,5 +18,7 @@ output:
   - type: text
     name: result
     default: ""
+    required: true
+    showOnNode: true
 ---
 ${USER_PROMPT}

package/builtin/nodes/tool_nodejs.md

@@ -33,6 +33,8 @@ input:
   - type: text
     name: workspaceContext
     default: ""
+    required: true
+    showOnNode: true
   - type: text
     name: skillsContext
     default: ""
@@ -43,5 +45,7 @@ output:
   - type: text
     name: result
     default: ""
+    required: true
+    showOnNode: true
 ---
 ${USER_PROMPT}

package/builtin/nodes/tool_print.md

@@ -9,6 +9,8 @@ input:
   - type: text
     name: content
     default: ""
+    required: true
+    showOnNode: true
 output:
   - type: node
     name: next

package/builtin/nodes/tool_save_key.md

@@ -9,9 +9,13 @@ input:
   - type: text
     name: key
     default: ""
+    required: true
+    showOnNode: true
   - type: text
     name: value
     default: ""
+    required: true
+    showOnNode: true
 output:
   - type: node
     name: next

package/builtin/nodes/tool_user_ask.md

@@ -8,8 +8,10 @@ input:
     default: ""
   - type: file
     name: question
-    description: 要展示给用户的问题（Markdown 格式，可选）
+    description: 要展示给用户的问题（Markdown 格式）
     default: ""
+    required: true
+    showOnNode: true
 output:
   - type: node
     name: option_0

package/builtin/nodes/tool_user_check.md

@@ -10,6 +10,8 @@ input:
     name: content
     description: 要展示给用户确认的内容（Markdown 格式）
     default: ""
+    required: true
+    showOnNode: true
 output:
   - type: node
     name: next
@@ -19,4 +21,4 @@ output:
     description: 用户确认后的内容（可能已编辑/AI修改）
     default: ""
 ---
-${USER_PROMPT}
+${USER_PROMPT}