@fieldwangai/agentflow 0.1.32 → 0.1.34

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

@@ -41,12 +41,15 @@ import { getRunDir, sanitizeAgentflowUserId } from "../lib/paths.mjs";
 import {
   buildSkillsContext,
   buildSkillsContextFromRegistry,
+  buildDefaultWorkspaceContext,
   expandRuntimePlaceholders,
   normalizeSkillsContext,
   normalizeWorkspaceContext,
   parseSkillKeyList,
   resolveWorkspaceTarget,
 } from "../lib/runtime-context.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));
 
@@ -264,6 +267,12 @@ function isTruthyInput(value) {
   return text === "true" || text === "1" || text === "yes" || text === "y" || text === "on";
 }
 
+function resolveMaybeWorkspacePath(raw, workspaceContext, extra = {}) {
+  const text = String(raw || "").trim();
+  if (!text) return "";
+  return resolveWorkspaceTarget(text, workspaceContext, extra);
+}
+
 function emitGitCheckoutNode(workspaceRoot, flowName, uuid, instanceId, execId, resultPathRel) {
   const runDir = getRunDir(workspaceRoot, flowName, uuid);
   const { inputs, workspaceContext } = resolveNodeRuntimeContexts(workspaceRoot, flowName, uuid, instanceId);
@@ -312,6 +321,12 @@ function emitGitCheckoutNode(workspaceRoot, flowName, uuid, instanceId, execId,
 
   const currentBranch = runGit(["rev-parse", "--abbrev-ref", "HEAD"], targetDir).stdout.trim();
   const commit = runGit(["rev-parse", "HEAD"], targetDir).stdout.trim();
+  const gitContext = buildGitContext({
+    repoPath: targetDir,
+    branch: currentBranch === "HEAD" ? "DETACHED" : currentBranch,
+    commit,
+    remote: String(inputs.remote || "origin").trim() || "origin",
+  });
   const outWorkspaceContext = {
     version: 1,
     label: inputs.label || sanitizeRepoDirName(repoUrl),
@@ -326,10 +341,131 @@ function emitGitCheckoutNode(workspaceRoot, flowName, uuid, instanceId, execId,
   writeOutputSlot(runDir, instanceId, execId, "commit", commit);
   writeOutputSlot(runDir, instanceId, execId, "changed", changed ? "true" : "false");
   writeOutputSlot(runDir, instanceId, execId, "workspaceContext", JSON.stringify(outWorkspaceContext));
+  writeOutputSlot(runDir, instanceId, execId, "gitContext", JSON.stringify(gitContext));
   writeResult(workspaceRoot, flowName, uuid, instanceId, { status: "success", message: `git ${action}: ${currentBranch}@${commit.slice(0, 8)}` }, { execId });
   return emitLocalNoopPrompt(workspaceRoot, runDir, instanceId, "git-checkout", `Git checkout completed: ${targetDir}\n`);
 }
 
+function requireWorkspaceContextInput(inputs, definitionId) {
+  if (!String(inputs?.workspaceContext || "").trim()) {
+    throw new Error(`${definitionId}: workspaceContext is required`);
+  }
+}
+
+function emitGitWorktreeLoadNode(workspaceRoot, flowName, uuid, instanceId, execId) {
+  const runDir = getRunDir(workspaceRoot, flowName, uuid);
+  const { inputs, workspaceContext } = resolveNodeRuntimeContexts(workspaceRoot, flowName, uuid, instanceId);
+  requireWorkspaceContextInput(inputs, "tool_git_worktree_load");
+  const gitContext = normalizeGitContext(inputs.gitContext);
+  const repoPath = resolveMaybeWorkspacePath(inputs.repoPath, workspaceContext) ||
+    (gitContext?.repoPath ? path.resolve(gitContext.repoPath) : "");
+  if (!repoPath) throw new Error("tool_git_worktree_load: repoPath or gitContext.repoPath is required");
+  const branch = String(inputs.branch || "").trim();
+  const worktreePath = resolveMaybeWorkspacePath(inputs.worktreePath, workspaceContext, { branch }) ||
+    (gitContext?.worktreePath ? path.resolve(gitContext.worktreePath) : "");
+  const result = loadGitWorktree({
+    repoPath,
+    branch,
+    worktreePath,
+    pipelineWorkspace: workspaceContext.pipelineWorkspace || path.resolve(workspaceRoot),
+  });
+  const outWorkspaceContext = {
+    version: 1,
+    label: result.branch === "DETACHED" ? `worktree:${result.commit.slice(0, 8)}` : `worktree:${result.branch}`,
+    cwd: result.worktreePath,
+    workspaceRoot: result.worktreePath,
+    pipelineWorkspace: workspaceContext.pipelineWorkspace || path.resolve(workspaceRoot),
+    flowDir: workspaceContext.flowDir,
+    previous: workspaceContext,
+  };
+  const outGitContext = buildGitContext({
+    repoPath: result.repoRoot,
+    worktreePath: result.worktreePath,
+    branch: result.branch,
+    commit: result.commit,
+    remote: gitContext?.remote || "origin",
+    remoteUrl: gitContext?.remoteUrl || "",
+  });
+  writeOutputSlot(runDir, instanceId, execId, "worktreePath", result.worktreePath);
+  writeOutputSlot(runDir, instanceId, execId, "branch", result.branch);
+  writeOutputSlot(runDir, instanceId, execId, "commit", result.commit);
+  writeOutputSlot(runDir, instanceId, execId, "workspaceContext", JSON.stringify(outWorkspaceContext));
+  writeOutputSlot(runDir, instanceId, execId, "gitContext", JSON.stringify(outGitContext));
+  writeResult(workspaceRoot, flowName, uuid, instanceId, {
+    status: "success",
+    message: `worktree loaded: ${result.worktreePath} (${result.branch}@${result.commit.slice(0, 8)})`,
+  }, { execId });
+  return emitLocalNoopPrompt(workspaceRoot, runDir, instanceId, "git-worktree-load", `Git worktree loaded: ${result.worktreePath}\n`);
+}
+
+function emitGitWorktreeUnloadNode(workspaceRoot, flowName, uuid, instanceId, execId) {
+  const runDir = getRunDir(workspaceRoot, flowName, uuid);
+  const { inputs, workspaceContext, flowJson } = resolveNodeRuntimeContexts(workspaceRoot, flowName, uuid, instanceId);
+  requireWorkspaceContextInput(inputs, "tool_git_worktree_unload");
+  const gitContext = normalizeGitContext(inputs.gitContext);
+  const worktreePath = resolveMaybeWorkspacePath(inputs.worktreePath, workspaceContext) ||
+    (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 });
+  const nextWorkspaceContext = workspaceContext.previous
+    ? normalizeWorkspaceContext(workspaceContext.previous, workspaceRoot, flowName, flowJson)
+    : buildDefaultWorkspaceContext(workspaceRoot, flowName, flowJson);
+  writeOutputSlot(runDir, instanceId, execId, "removed", "true");
+  writeOutputSlot(runDir, instanceId, execId, "message", result.message);
+  writeOutputSlot(runDir, instanceId, execId, "workspaceContext", JSON.stringify(nextWorkspaceContext));
+  writeResult(workspaceRoot, flowName, uuid, instanceId, {
+    status: "success",
+    message: result.message,
+  }, { execId });
+  return emitLocalNoopPrompt(workspaceRoot, runDir, instanceId, "git-worktree-unload", `${result.message}\n`);
+}
+
+async function emitGitLabCreateMrNode(workspaceRoot, flowName, uuid, instanceId, execId) {
+  const runDir = getRunDir(workspaceRoot, flowName, uuid);
+  const { inputs, workspaceContext } = resolveNodeRuntimeContexts(workspaceRoot, flowName, uuid, instanceId);
+  const repoPath = resolveMaybeWorkspacePath(inputs.repoPath, workspaceContext);
+  const result = await createGitLabMergeRequest({
+    gitContext: inputs.gitContext,
+    workspaceCwd: workspaceContext.cwd,
+    repoPath,
+    sourceBranch: inputs.sourceBranch,
+    targetBranch: inputs.targetBranch,
+    title: inputs.title,
+    description: inputs.description,
+    draft: inputs.draft,
+    labels: inputs.labels,
+    push: inputs.push,
+    remote: inputs.remote,
+    tokenEnv: inputs.tokenEnv,
+    gitlabApiBase: inputs.gitlabApiBase,
+    removeSourceBranch: inputs.removeSourceBranch,
+    squash: inputs.squash,
+  }, process.env);
+  writeOutputSlot(runDir, instanceId, execId, "mrUrl", result.mrUrl);
+  writeOutputSlot(runDir, instanceId, execId, "created", result.created ? "true" : "false");
+  writeOutputSlot(runDir, instanceId, execId, "mrIid", result.mrIid ?? "");
+  writeOutputSlot(runDir, instanceId, execId, "projectId", result.projectId ?? "");
+  writeOutputSlot(runDir, instanceId, execId, "sourceBranch", result.sourceBranch ?? "");
+  writeOutputSlot(runDir, instanceId, execId, "targetBranch", result.targetBranch ?? "");
+  writeOutputSlot(runDir, instanceId, execId, "title", result.title ?? "");
+  writeOutputSlot(runDir, instanceId, execId, "message", result.message ?? "");
+  writeResult(workspaceRoot, flowName, uuid, instanceId, {
+    status: "success",
+    message: result.message || result.mrUrl,
+    body: result.mrUrl,
+  }, { execId });
+  return emitLocalNoopPrompt(workspaceRoot, runDir, instanceId, "gitlab-create-mr", `${result.message || "GitLab MR ready"}\n${result.mrUrl}\n`);
+}
+
 function emitCdWorkspaceNode(workspaceRoot, flowName, uuid, instanceId, execId) {
   const runDir = getRunDir(workspaceRoot, flowName, uuid);
   const { inputs, workspaceContext } = resolveNodeRuntimeContexts(workspaceRoot, flowName, uuid, instanceId);
@@ -461,7 +597,7 @@ function emitToolPrintNode(workspaceRoot, flowName, uuid, instanceId, execId) {
   const flowJson = readFlowJsonObject(workspaceRoot, flowName, uuid);
   const data = getResolvedValues(workspaceRoot, flowName, uuid, instanceId);
   const inputs = data.ok ? (data.resolvedInputs || {}) : {};
-  const skipNames = new Set(["prev", "next", "workspaceContext", "skillsContext", "workspaceRoot", "pipelineWorkspace", "flowName", "runDir", "flowDir", "cwd"]);
+  const skipNames = new Set(["prev", "next", "workspaceContext", "gitContext", "skillsContext", "workspaceRoot", "pipelineWorkspace", "flowName", "runDir", "flowDir", "cwd"]);
 
   let content = readPrintableValue(inputs.content, runDir);
   if (!content) {
@@ -504,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,
@@ -519,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);
@@ -681,7 +861,7 @@ ${directCommand}
   return { optionalPromptPath: relativePath.replace(/\\/g, "/"), directCommand };
 }
 
-function main() {
+async function main() {
   const args = process.argv.slice(2);
   if (args.length < 4) {
     console.error(
@@ -834,8 +1014,11 @@ 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,
@@ -861,7 +1044,7 @@ 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,
@@ -952,37 +1135,22 @@ 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 });
@@ -1001,18 +1169,24 @@ function main() {
     return;
   }
 
-  if (definitionId === "tool_git_checkout" || definitionId === "control_cd_workspace" || definitionId === "control_user_workspace" || definitionId === "control_load_skills" || definitionId === "tool_print") {
+  if (definitionId === "tool_git_checkout" || definitionId === "tool_git_worktree_load" || definitionId === "tool_git_worktree_unload" || definitionId === "tool_gitlab_create_mr" || definitionId === "control_cd_workspace" || definitionId === "control_user_workspace" || definitionId === "control_load_skills" || definitionId === "tool_print") {
     try {
       const promptPath =
         definitionId === "tool_git_checkout"
           ? emitGitCheckoutNode(workspaceRoot, flowName, uuid, instanceId, execId, resultPathRel)
-          : definitionId === "control_cd_workspace"
-            ? emitCdWorkspaceNode(workspaceRoot, flowName, uuid, instanceId, execId)
-            : definitionId === "control_user_workspace"
-              ? emitUserWorkspaceNode(workspaceRoot, flowName, uuid, instanceId, execId)
-              : definitionId === "control_load_skills"
-                ? emitLoadSkillsNode(workspaceRoot, flowName, uuid, instanceId, execId)
-                : emitToolPrintNode(workspaceRoot, flowName, uuid, instanceId, execId);
+          : definitionId === "tool_git_worktree_load"
+            ? emitGitWorktreeLoadNode(workspaceRoot, flowName, uuid, instanceId, execId)
+            : definitionId === "tool_git_worktree_unload"
+              ? emitGitWorktreeUnloadNode(workspaceRoot, flowName, uuid, instanceId, execId)
+              : definitionId === "tool_gitlab_create_mr"
+                ? await emitGitLabCreateMrNode(workspaceRoot, flowName, uuid, instanceId, execId)
+                : definitionId === "control_cd_workspace"
+                  ? emitCdWorkspaceNode(workspaceRoot, flowName, uuid, instanceId, execId)
+                  : definitionId === "control_user_workspace"
+                    ? emitUserWorkspaceNode(workspaceRoot, flowName, uuid, instanceId, execId)
+                    : definitionId === "control_load_skills"
+                      ? emitLoadSkillsNode(workspaceRoot, flowName, uuid, instanceId, execId)
+                      : emitToolPrintNode(workspaceRoot, flowName, uuid, instanceId, execId);
       writeCacheJsonForNode(workspaceRoot, flowName, uuid, instanceId, execId);
       logToRunTag(workspaceRoot, flowName, uuid, "pre-process", { event: "runtime-context-node", instanceId, definitionId });
       console.log(JSON.stringify({
@@ -1103,4 +1277,7 @@ function main() {
   console.log(JSON.stringify(output));
 }
 
-main();
+main().catch((e) => {
+  console.error(JSON.stringify({ ok: false, error: e.message || String(e) }));
+  process.exit(1);
+});

package/bin/pipeline/validate-flow.mjs

@@ -493,26 +493,16 @@ function checkFlowCore(nodes, edges, flowDir, nodeIdToSlots, getNodeBody, instan
         }
       }
 
-      // provide_str / provide_file output 类型校验
-      if (defId === "provide_str") {
+      // provide_str / provide_file / provide_bool output 类型校验
+      if (defId === "provide_str" || defId === "provide_file" || defId === "provide_bool") {
         const out = Array.isArray(inst.output) ? inst.output : [];
+        const expectedType = defId === "provide_file" ? "file" : defId === "provide_bool" ? "bool" : "text";
         if (out.length !== 1) {
-          errors.push(`节点 "${n.id}"（provide_str）output 必须仅有 1 个槽位（value:text），当前 ${out.length} 个`);
+          errors.push(`节点 "${n.id}"（${defId}）output 必须仅有 1 个槽位（value:${expectedType}），当前 ${out.length} 个`);
         } else {
           const t0 = normType(out[0] && out[0].type);
-          if (t0 !== "text") {
-            errors.push(`节点 "${n.id}"（provide_str）output[0].type 必须为 \`text\`，当前为 \`${t0 || "(空)"}\``);
-          }
-        }
-      }
-      if (defId === "provide_file") {
-        const out = Array.isArray(inst.output) ? inst.output : [];
-        if (out.length !== 1) {
-          errors.push(`节点 "${n.id}"（provide_file）output 必须仅有 1 个槽位（value:file），当前 ${out.length} 个`);
-        } else {
-          const t0 = normType(out[0] && out[0].type);
-          if (t0 !== "file") {
-            errors.push(`节点 "${n.id}"（provide_file）output[0].type 必须为 \`file\`，当前为 \`${t0 || "(空)"}\``);
+          if (t0 !== expectedType) {
+            errors.push(`节点 "${n.id}"（${defId}）output[0].type 必须为 \`${expectedType}\`，当前为 \`${t0 || "(空)"}\``);
           }
         }
       }
@@ -675,7 +665,7 @@ function computeValidation(loaded, workspaceRoot) {
     if (!isNodeEdge) continue;
     if (srcDef.startsWith("provide_") || tgtDef.startsWith("provide_")) {
       validationErrors.push(
-        `provide_* 节点不得出现在控制链上（node→node 边）：${e.source} ${sh} -> ${e.target} ${th}；provide 仅作数据源，请改连下游 text/file 数据槽`
+        `provide_* 节点不得出现在控制链上（node→node 边）：${e.source} ${sh} -> ${e.target} ${th}；provide 仅作数据源，请改连下游 text/file/bool 数据槽`
       );
     }
   }

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/display_html.md

@@ -0,0 +1,31 @@
+---
+# Built-in node: HTML Display
+description: Display HTML content in workspace canvas; passes HTML downstream as text
+displayName: HTML Display
+input:
+  - type: node
+    name: prev
+    default: ""
+  - type: text
+    name: content
+    default: ""
+    required: true
+    showOnNode: true
+  - type: file
+    name: filePath
+    default: ""
+    showOnNode: false
+  - type: text
+    name: workspaceContext
+    default: ""
+    showOnNode: false
+output:
+  - type: text
+    name: content
+    default: ""
+    showOnNode: false
+  - type: node
+    name: next
+    default: ""
+---
+${content}

package/builtin/nodes/display_image.md

@@ -0,0 +1,35 @@
+---
+# Built-in node: Image Display
+description: Display an image URL, data URL, or image path in workspace canvas; passes source downstream as text
+displayName: Image Display
+input:
+  - type: node
+    name: prev
+    default: ""
+  - type: text
+    name: src
+    default: ""
+    required: true
+    showOnNode: true
+  - type: file
+    name: filePath
+    default: ""
+    showOnNode: false
+  - type: text
+    name: alt
+    default: ""
+    showOnNode: false
+  - type: text
+    name: workspaceContext
+    default: ""
+    showOnNode: false
+output:
+  - type: text
+    name: src
+    default: ""
+    showOnNode: false
+  - type: node
+    name: next
+    default: ""
+---
+${src}

package/builtin/nodes/provide_bool.md

@@ -0,0 +1,13 @@
+---
+# 内置节点：直接提供布尔值
+description: Provide a boolean value directly, value will be passed to downstream as true or false
+displayName: Boolean
+input: []
+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}