@fieldwangai/agentflow 0.1.31 → 0.1.33

package/bin/lib/locales/zh.json

@@ -281,6 +281,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 +325,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 +340,10 @@
     "provide_file": {
       "displayName": "文件",
       "description": "直接提供文件路径或内容，value 会原样供下游引用"
+    },
+    "provide_bool": {
+      "displayName": "布尔",
+      "description": "直接提供 true/false 布尔值，value 会供下游 bool 引脚引用"
     }
   },
   "pipeline": {

package/bin/lib/marketplace.mjs

@@ -2,10 +2,17 @@ import fs from "fs";
 import path from "path";
 import yaml from "js-yaml";
 
-import { MARKETPLACE_PACKAGES_DIR } from "./paths.mjs";
+import {
+  ARCHIVED_PIPELINES_DIR_NAME,
+  LEGACY_PIPELINES_DIR,
+  MARKETPLACE_PACKAGES_DIR,
+  PIPELINES_DIR,
+  getUserPipelinesRoot,
+} from "./paths.mjs";
 
 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) {
@@ -55,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;
   });
 }
 
@@ -100,6 +112,107 @@ function listVersionDirs(baseDir) {
     .filter(Boolean);
 }
 
+function isSafePathSegment(value) {
+  const text = String(value || "").trim();
+  return Boolean(text) && !text.includes("\0") && !path.isAbsolute(text) && !text.split(/[\\/]+/).includes("..");
+}
+
+function resolveWorkspaceNodePackageDir(workspaceRoot, id, version) {
+  if (!isSafePathSegment(id) || !isSafePathSegment(version)) return null;
+  const base = path.resolve(workspacePackageRoot(workspaceRoot), "nodes");
+  const target = path.resolve(base, id, version);
+  if (target !== base && !target.startsWith(base + path.sep)) return null;
+  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;
+  let entries = [];
+  try {
+    entries = fs.readdirSync(rootDir, { withFileTypes: true });
+  } catch {
+    return out;
+  }
+  for (const entry of entries) {
+    if (!entry.isDirectory() || entry.name === ARCHIVED_PIPELINES_DIR_NAME) continue;
+    const dir = path.join(rootDir, entry.name);
+    if (!fs.existsSync(path.join(dir, "flow.yaml"))) continue;
+    out.push({ flowId: entry.name, flowSource: source, archived, flowDir: dir });
+  }
+  return out;
+}
+
+function listWritableFlowDirs(workspaceRoot, opts = {}) {
+  const root = path.resolve(workspaceRoot);
+  const userRoot = getUserPipelinesRoot(opts.userId);
+  const wsRoot = path.join(root, PIPELINES_DIR);
+  const legacyRoot = path.join(root, LEGACY_PIPELINES_DIR);
+  return [
+    ...collectFlowDirs(userRoot, "user", false),
+    ...collectFlowDirs(path.join(userRoot, ARCHIVED_PIPELINES_DIR_NAME), "user", true),
+    ...collectFlowDirs(wsRoot, "workspace", false),
+    ...collectFlowDirs(path.join(wsRoot, ARCHIVED_PIPELINES_DIR_NAME), "workspace", true),
+    ...collectFlowDirs(legacyRoot, "workspace", false),
+    ...collectFlowDirs(path.join(legacyRoot, ARCHIVED_PIPELINES_DIR_NAME), "workspace", true),
+  ];
+}
+
+function depMatchesNode(dep, id, version) {
+  if (typeof dep === "string") {
+    const parsed = parseMarketplaceDefinitionId(dep.startsWith("marketplace:") ? dep : `marketplace:${dep}`);
+    return Boolean(parsed && parsed.id === id && (!parsed.version || parsed.version === version));
+  }
+  if (!dep || typeof dep !== "object") return false;
+  return dep.id === id && (dep.version == null || String(dep.version) === version);
+}
+
+function instanceMatchesNode(inst, id, version) {
+  const parsed = parseMarketplaceDefinitionId(inst?.definitionId);
+  return Boolean(parsed && parsed.id === id && (!parsed.version || parsed.version === version));
+}
+
+export function listMarketplaceNodeUsages(workspaceRoot, id, version, opts = {}) {
+  const usages = [];
+  if (!id || !version) return usages;
+  for (const flow of listWritableFlowDirs(workspaceRoot, opts)) {
+    const flowYamlPath = path.join(flow.flowDir, "flow.yaml");
+    const data = readYamlObject(flowYamlPath);
+    if (!data) continue;
+    const hits = [];
+    const deps = data.dependencies && typeof data.dependencies === "object" ? data.dependencies : {};
+    const nodeDeps = Array.isArray(deps.nodes) ? deps.nodes : [];
+    for (const dep of nodeDeps) {
+      if (depMatchesNode(dep, id, version)) {
+        hits.push({ instanceId: "dependencies.nodes", label: "dependency" });
+      }
+    }
+    const instances = data.instances && typeof data.instances === "object" ? data.instances : {};
+    for (const [instanceId, inst] of Object.entries(instances)) {
+      if (instanceMatchesNode(inst, id, version)) {
+        hits.push({ instanceId, label: inst?.label || instanceId });
+      }
+    }
+    if (hits.length > 0) {
+      usages.push({
+        flowId: flow.flowId,
+        flowSource: flow.flowSource,
+        archived: flow.archived,
+        instances: hits,
+      });
+    }
+  }
+  return usages;
+}
+
 function findNodePackageDir(workspaceRoot, id, version) {
   const root = workspacePackageRoot(workspaceRoot);
   const nodeBase = path.join(root, "nodes", id);
@@ -230,7 +343,7 @@ export function listMarketplaceNodes(workspaceRoot, flowData = null) {
   return out.sort((a, b) => a.id.localeCompare(b.id) || a.version.localeCompare(b.version));
 }
 
-export function listMarketplacePackages(workspaceRoot) {
+export function listMarketplacePackages(workspaceRoot, opts = {}) {
   const root = workspacePackageRoot(workspaceRoot);
   const nodes = listMarketplaceNodes(workspaceRoot).map((n) => ({
     id: n.id,
@@ -242,6 +355,7 @@ export function listMarketplacePackages(workspaceRoot) {
     outputs: n.output,
     packagedFiles: Array.isArray(n.packagedFiles) ? n.packagedFiles : [],
     packageDir: n.packageDir,
+    usage: listMarketplaceNodeUsages(workspaceRoot, n.id, n.version, opts),
   }));
   const collections = [];
   const collectionsRoot = path.join(root, "collections");
@@ -265,6 +379,63 @@ export function listMarketplacePackages(workspaceRoot) {
   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" };
+  if (!fs.existsSync(path.join(packageDir, NODE_MANIFEST))) {
+    return { ok: false, error: `Marketplace node package not found: ${id}@${version}` };
+  }
+  const usage = listMarketplaceNodeUsages(workspaceRoot, id, version, opts);
+  if (usage.length > 0) {
+    return { ok: false, error: "Marketplace node is still used by flows", usage };
+  }
+  fs.rmSync(packageDir, { recursive: true, force: true });
+  const versionRoot = path.dirname(packageDir);
+  try {
+    if (fs.existsSync(versionRoot) && fs.readdirSync(versionRoot).length === 0) {
+      fs.rmdirSync(versionRoot);
+    }
+  } catch {
+    /* keep non-empty or unreadable parent */
+  }
+  return { ok: true, id, version, packageDir };
+}
+
 export function writeFlowMarketplaceLock(workspaceRoot, flowDir, flowData) {
   if (!flowData || !flowData.instances || typeof flowData.instances !== "object") return null;
   const nodes = {};
@@ -465,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();
@@ -522,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

@@ -262,11 +262,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 +280,5 @@ export const LOCAL_ONLY_TERMINAL_SUCCESS_IDS = new Set([
   "tool_print",
   "provide_str",
   "provide_file",
+  "provide_bool",
 ]);