@fieldwangai/agentflow 0.1.32 → 0.1.34

package/bin/lib/locales/zh.json

@@ -238,7 +238,7 @@
       "description": "当任一上游输入就绪时，沿 next 继续执行"
     },
     "control_toBool": {
-      "displayName": "转布尔",
+      "displayName": "代码转布尔",
       "description": "执行 script 脚本输出 true/false 到 prediction，类似 tool_nodejs 但强制 bool 输出，可扩展输入"
     },
     "control_delay": {
@@ -249,13 +249,9 @@
       "displayName": "等待到时间",
       "description": "持久化等待到指定时间，到点后由 scheduler 唤醒当前 run 继续执行"
     },
-    "control_deadline": {
-      "displayName": "截止判断",
-      "description": "判断当前时间是否已超过截止时间，输出 expired 布尔值"
-    },
     "control_cancelled": {
       "displayName": "取消判断",
-      "description": "判断当前 run/watch 是否已被取消，输出 cancelled 布尔值"
+      "description": "判断当前 wait/run 是否已被取消，输出 cancelled 布尔值"
     },
     "control_interval_loop": {
       "displayName": "间隔循环",
@@ -281,6 +277,18 @@
       "displayName": "Git 拉取",
       "description": "克隆或更新 Git 仓库，并输出可供下游使用的工作区上下文"
     },
+    "tool_git_worktree_load": {
+      "displayName": "加载 Worktree",
+      "description": "创建或复用 Git worktree，并输出 workspaceContext 与 gitContext"
+    },
+    "tool_git_worktree_unload": {
+      "displayName": "卸载 Worktree",
+      "description": "移除 Git worktree，并恢复下游工作区上下文"
+    },
+    "tool_gitlab_create_mr": {
+      "displayName": "提交 GitLab MR",
+      "description": "为当前分支创建或复用 GitLab Merge Request，并输出 MR 链接"
+    },
     "tool_nodejs": {
       "displayName": "Node.js 脚本",
       "description": "执行 Node.js 脚本，以 exit code 判断成败，stdout 作为结果"
@@ -313,6 +321,14 @@
       "displayName": "ASCII 图展示",
       "description": "在 Workspace 画布中渲染等宽 ASCII 图，并将文本继续传给下游"
     },
+    "display_html": {
+      "displayName": "HTML 展示",
+      "description": "在 Workspace 画布中用 sandbox iframe 渲染 HTML，并将源码继续传给下游"
+    },
+    "display_image": {
+      "displayName": "图片展示",
+      "description": "在 Workspace 画布中预览图片 URL、data URL 或图片路径，并将来源继续传给下游"
+    },
     "provide_str": {
       "displayName": "文本",
       "description": "直接提供一段文本，value 会原样供下游引用"
@@ -320,6 +336,10 @@
     "provide_file": {
       "displayName": "文件",
       "description": "直接提供文件路径或内容，value 会原样供下游引用"
+    },
+    "provide_bool": {
+      "displayName": "布尔",
+      "description": "直接提供 true/false 布尔值，value 会供下游 bool 引脚引用"
     }
   },
   "pipeline": {

package/bin/lib/marketplace.mjs

@@ -12,6 +12,7 @@ import {
 
 const NODE_MANIFEST = "node.yaml";
 const COLLECTION_MANIFEST = "collection.yaml";
+const FLOW_SNIPPET_MANIFEST = "flow-snippet.yaml";
 const LOCK_FILENAME = "agentflow.lock.json";
 
 function workspacePackageRoot(workspaceRoot) {
@@ -61,15 +62,20 @@ function readJsonObject(filePath) {
 function normalizeSlotList(value) {
   if (!Array.isArray(value)) return [];
   return value.map((slot) => {
-    if (!slot || typeof slot !== "object") return { type: "text", name: "", default: "" };
+    if (!slot || typeof slot !== "object") return { type: "text", name: "", default: "", showOnNode: false };
     const type = slot.type != null ? String(slot.type).trim() : "text";
     const name = slot.name != null ? String(slot.name).trim() : "";
     const def = slot.default !== undefined ? slot.default : slot.value;
-    return {
+    const normalized = {
       type,
       name,
       default: def == null ? "" : String(def),
     };
+    if (slot.required != null) normalized.required = Boolean(slot.required);
+    normalized.showOnNode = slot.showOnNode != null
+      ? Boolean(slot.showOnNode)
+      : Boolean(normalized.required) || type.toLowerCase() === "node";
+    return normalized;
   });
 }
 
@@ -119,6 +125,14 @@ function resolveWorkspaceNodePackageDir(workspaceRoot, id, version) {
   return target;
 }
 
+function resolveWorkspaceFlowSnippetPackageDir(workspaceRoot, id, version) {
+  if (!isSafePathSegment(id) || !isSafePathSegment(version)) return null;
+  const base = path.resolve(workspacePackageRoot(workspaceRoot), "flow-snippets");
+  const target = path.resolve(base, id, version);
+  if (target !== base && !target.startsWith(base + path.sep)) return null;
+  return target;
+}
+
 function collectFlowDirs(rootDir, source, archived = false) {
   const out = [];
   if (!fs.existsSync(rootDir)) return out;
@@ -365,6 +379,41 @@ export function listMarketplacePackages(workspaceRoot, opts = {}) {
   return { nodes, collections };
 }
 
+export function listMarketplaceFlowSnippets(workspaceRoot) {
+  const root = workspacePackageRoot(workspaceRoot);
+  const snippetsRoot = path.join(root, "flow-snippets");
+  const snippets = [];
+  if (!fs.existsSync(snippetsRoot)) return { snippets };
+  for (const entry of fs.readdirSync(snippetsRoot, { withFileTypes: true })) {
+    if (!entry.isDirectory()) continue;
+    const base = path.join(snippetsRoot, entry.name);
+    for (const version of listVersionDirs(base)) {
+      const dir = path.join(base, version);
+      const manifest = readYamlObject(path.join(dir, FLOW_SNIPPET_MANIFEST));
+      if (!manifest) continue;
+      const snippet = manifest.snippet && typeof manifest.snippet === "object" ? manifest.snippet : {};
+      snippets.push({
+        id: manifest.id || entry.name,
+        version: manifest.version || version,
+        displayName: manifest.displayName || manifest.name || entry.name,
+        description: manifest.description || "",
+        tags: Array.isArray(manifest.tags) ? manifest.tags.map((x) => String(x)) : [],
+        nodeCount: Number(manifest.nodeCount) || Object.keys(snippet.instances || {}).length || 0,
+        edgeCount: Number(manifest.edgeCount) || (Array.isArray(snippet.edges) ? snippet.edges.length : 0),
+        createdAt: manifest.createdAt || "",
+        updatedAt: manifest.updatedAt || "",
+        packageDir: dir,
+        snippet,
+      });
+    }
+  }
+  snippets.sort((a, b) => {
+    const byTime = String(b.updatedAt || b.createdAt || "").localeCompare(String(a.updatedAt || a.createdAt || ""));
+    return byTime || a.id.localeCompare(b.id) || a.version.localeCompare(b.version);
+  });
+  return { snippets };
+}
+
 export function deleteMarketplaceNodePackage(workspaceRoot, id, version, opts = {}) {
   const packageDir = resolveWorkspaceNodePackageDir(workspaceRoot, id, version);
   if (!packageDir) return { ok: false, error: "Invalid marketplace node id or version" };
@@ -587,11 +636,15 @@ export function publishNodeFromInstance(workspaceRoot, payload = {}, options = {
     type: slot.type,
     name: slot.name,
     default: slot.default,
+    ...(slot.required != null ? { required: Boolean(slot.required) } : {}),
+    ...(slot.showOnNode != null ? { showOnNode: Boolean(slot.showOnNode) } : {}),
   }));
   const outputs = normalizeSlotList(payload.outputs || payload.output).map((slot) => ({
     type: slot.type,
     name: slot.name,
     default: slot.default,
+    ...(slot.required != null ? { required: Boolean(slot.required) } : {}),
+    ...(slot.showOnNode != null ? { showOnNode: Boolean(slot.showOnNode) } : {}),
   }));
   const script = String(payload.script || "").trim();
   const body = String(payload.body || "").trim();
@@ -644,6 +697,57 @@ export function publishNodeFromInstance(workspaceRoot, payload = {}, options = {
   };
 }
 
+export function publishFlowSnippet(workspaceRoot, payload = {}) {
+  const label = String(payload.displayName || payload.name || payload.id || "flow snippet").trim();
+  const id = safePackageId(payload.id || payload.packageId || label);
+  const version = normalizeVersion(payload.version || "1.0.0");
+  if (!id) return { ok: false, error: "Invalid snippet id" };
+
+  const rawSnippet = payload.snippet && typeof payload.snippet === "object" ? payload.snippet : {};
+  const instances = rawSnippet.instances && typeof rawSnippet.instances === "object" ? rawSnippet.instances : {};
+  const edges = Array.isArray(rawSnippet.edges) ? rawSnippet.edges : [];
+  const ui = rawSnippet.ui && typeof rawSnippet.ui === "object" ? rawSnippet.ui : {};
+  const nodeCount = Object.keys(instances).length;
+  if (nodeCount < 2) return { ok: false, error: "A flow snippet needs at least two nodes" };
+
+  const now = new Date().toISOString();
+  const dest = resolveWorkspaceFlowSnippetPackageDir(workspaceRoot, id, version);
+  if (!dest) return { ok: false, error: "Invalid snippet id or version" };
+  fs.mkdirSync(path.dirname(dest), { recursive: true });
+  fs.rmSync(dest, { recursive: true, force: true });
+  fs.mkdirSync(dest, { recursive: true });
+
+  const manifest = {
+    id,
+    version,
+    name: label,
+    displayName: label,
+    description: String(payload.description || "").trim(),
+    tags: Array.isArray(payload.tags) ? payload.tags.map((x) => String(x).trim()).filter(Boolean) : [],
+    nodeCount,
+    edgeCount: edges.length,
+    createdAt: now,
+    updatedAt: now,
+    snippet: {
+      instances,
+      edges: edges.map((edge) => ({
+        source: String(edge.source || ""),
+        target: String(edge.target || ""),
+        sourceHandle: edge.sourceHandle ?? null,
+        targetHandle: edge.targetHandle ?? null,
+      })).filter((edge) => edge.source && edge.target),
+      ui,
+    },
+  };
+  fs.writeFileSync(path.join(dest, FLOW_SNIPPET_MANIFEST), yaml.dump(manifest, { lineWidth: -1 }), "utf-8");
+  fs.writeFileSync(
+    path.join(dest, "README.md"),
+    `# ${label}\n\n${manifest.description || "Published from an AgentFlow canvas selection."}\n`,
+    "utf-8",
+  );
+  return { ok: true, id, version, packageDir: dest, snippet: manifest.snippet };
+}
+
 export function installFlowDependency(workspaceRoot, flowDir, spec) {
   const parsed = parseMarketplaceDefinitionId(spec.startsWith("marketplace:") ? spec : `marketplace:${spec}`);
   if (!parsed) return { ok: false, error: `Invalid marketplace node spec: ${spec}` };

package/bin/lib/paths.mjs

@@ -253,7 +253,6 @@ export const LOCAL_ONLY_DEFINITION_IDS = new Set([
   "control_if",
   "control_delay",
   "control_wait_until",
-  "control_deadline",
   "control_cancelled",
   "control_interval_loop",
   "control_cd_workspace",
@@ -262,11 +261,15 @@ export const LOCAL_ONLY_DEFINITION_IDS = new Set([
   "control_start",
   "control_end",
   "tool_git_checkout",
+  "tool_git_worktree_load",
+  "tool_git_worktree_unload",
+  "tool_gitlab_create_mr",
   "tool_print",
   "tool_user_check",
   "tool_user_ask",
   "provide_str",
   "provide_file",
+  "provide_bool",
 ]);
 
 /** 仅 pre+post 且由 CLI 负责写终态的节点 */
@@ -276,4 +279,5 @@ export const LOCAL_ONLY_TERMINAL_SUCCESS_IDS = new Set([
   "tool_print",
   "provide_str",
   "provide_file",
+  "provide_bool",
 ]);

package/bin/lib/scheduler.mjs

@@ -136,7 +136,7 @@ function readJsonObject(filePath) {
 }
 
 function waitStateKey(state) {
-  return String((state && (state.id || state.instanceId)) || "");
+  return String((state && (state.waitId || state.id || state.instanceId)) || "");
 }
 
 function persistedWaitState(state) {
@@ -181,17 +181,22 @@ function writeWaitState(waitState, patch = {}) {
     ...(patch && typeof patch === "object" ? patch : {}),
     updatedAt: new Date().toISOString(),
   };
+  const key = waitStateKey(next);
+  if (key) {
+    next.waitId = String(next.waitId || key);
+    next.id = String(next.id || next.waitId);
+  }
   const runDir = next.runDir || (next.waitPath ? path.dirname(next.waitPath) : "");
   if (!runDir) return;
 
   const legacyPath = next.legacyPath || next.waitPath || path.join(runDir, WAIT_STATE_FILENAME);
   const registryPath = next.registryPath || path.join(runDir, WAIT_STATES_FILENAME);
   const persisted = persistedWaitState(next);
-  const key = waitStateKey(persisted);
+  const persistedKey = waitStateKey(persisted);
 
   const registry = readJsonObject(registryPath);
   if (registry && Array.isArray(registry.waits)) {
-    const waits = registry.waits.filter((w) => waitStateKey(w) !== key);
+    const waits = registry.waits.filter((w) => waitStateKey(w) !== persistedKey);
     waits.push(persisted);
     fs.writeFileSync(registryPath, JSON.stringify({ ...registry, updatedAt: new Date().toISOString(), waits }, null, 2) + "\n", "utf-8");
   }