@fieldwangai/agentflow 0.1.26 → 0.1.28

package/bin/lib/apply.mjs

@@ -32,6 +32,18 @@ const PARALLEL_PREFIX_COLORS = [
   (s) => chalk.blue(s),
 ];
 
+function readExistingResultBranch(workspaceRoot, flowName, uuid, instanceId) {
+  const resultPath = path.join(getRunDir(workspaceRoot, flowName, uuid), "intermediate", instanceId, `${instanceId}.result.md`);
+  if (!fs.existsSync(resultPath)) return null;
+  try {
+    const raw = fs.readFileSync(resultPath, "utf-8");
+    const m = raw.match(/^\s*branch:\s*["']?([^"'\s]+)["']?/m);
+    return m ? m[1] : null;
+  } catch {
+    return null;
+  }
+}
+
 /** parallel 默认 false */
 export async function apply(workspaceRoot, flowName, uuidArg, dryRun, agentModel = null, force = true, parallel = false, cliInputs = {}) {
   ensureReference(workspaceRoot);
@@ -764,8 +776,13 @@ export async function resume(workspaceRoot, flowName, uuid, instanceIdOptional,
     const failedNodes = Object.keys(instanceStatus).filter((id) => instanceStatus[id] === "failed");
     nodesToResume = [...new Set([...pendingNodes, ...failedNodes])];
   }
-  const payload = JSON.stringify({ status: "success", message: t("apply.user_confirmed") });
   for (const instanceId of nodesToResume) {
+    const existingBranch = readExistingResultBranch(workspaceRoot, flowName, uuid, instanceId);
+    const payload = JSON.stringify({
+      status: "success",
+      message: t("apply.user_confirmed"),
+      ...(existingBranch ? { branch: existingBranch } : {}),
+    });
     const wr = runNodeScript(
       workspaceRoot,
       "write-result.mjs",

package/bin/lib/catalog-flows.mjs

@@ -16,6 +16,7 @@ import {
   getUserPipelinesRoot,
 } from "./paths.mjs";
 import { Table } from "./table.mjs";
+import { listMarketplaceNodes, parseMarketplaceDefinitionId, resolveMarketplaceNodePackage } from "./marketplace.mjs";
 
 /** 从指定目录收集含 flow.yaml 的子目录名。 */
 export function collectPipelineNamesFromDir(dirPath) {
@@ -201,6 +202,16 @@ export function listNodesJson(workspaceRoot, flowId, flowSource, opts = {}) {
   const archived = Boolean(opts.archived);
   const byId = new Map();
   const pipelineTranslations = {};
+  let marketplaceFlowData = null;
+  if (flowId && flowSource) {
+    const flowPath = getFlowYamlAbs(workspaceRoot, flowId, flowSource, opts);
+    if (flowPath.path && fs.existsSync(flowPath.path)) {
+      try {
+        const parsed = yaml.load(fs.readFileSync(flowPath.path, "utf-8"));
+        if (parsed && typeof parsed === "object") marketplaceFlowData = parsed;
+      } catch (_) {}
+    }
+  }
   const addFromDir = (dir, source, flowIdOpt) => {
     if (!fs.existsSync(dir) || !fs.statSync(dir).isDirectory()) return;
     const files = fs.readdirSync(dir, { withFileTypes: true }).filter((e) => e.isFile() && e.name.endsWith(".md"));
@@ -235,6 +246,26 @@ export function listNodesJson(workspaceRoot, flowId, flowSource, opts = {}) {
   addFromDir(PACKAGE_BUILTIN_NODES_DIR, "project");
   addFromDir(path.join(root, LEGACY_NODES_DIR), "project");
   addFromDir(path.join(root, PROJECT_NODES_DIR), "project");
+  for (const manifest of listMarketplaceNodes(root, marketplaceFlowData)) {
+    let type = "agent";
+    const runtimeType = String(manifest.runtime?.type || manifest.type || "").toLowerCase();
+    if (runtimeType.startsWith("control")) type = "control";
+    else if (runtimeType.startsWith("provide")) type = "provide";
+    byId.set(manifest.definitionId, {
+      id: manifest.definitionId,
+      packageId: manifest.id,
+      version: manifest.version,
+      type,
+      label: manifest.displayName,
+      displayName: manifest.displayName,
+      description: manifest.description,
+      inputs: manifest.input,
+      outputs: manifest.output,
+      source: manifest.source || "marketplace",
+      packageDir: manifest.packageDir,
+      runtime: manifest.runtime,
+    });
+  }
   if (flowId && flowSource) {
     if (flowSource === "builtin") {
       addFromDir(path.join(PACKAGE_BUILTIN_PIPELINES_DIR, flowId, "nodes"), "flow", flowId);
@@ -443,6 +474,40 @@ export function getFlowYamlAbs(workspaceRoot, flowId, flowSource, options = {})
 export function readNodeJson(workspaceRoot, nodeId, flowId, flowSource, opts = {}) {
   const root = path.resolve(workspaceRoot);
   const archived = Boolean(opts.archived);
+  const marketSpec = parseMarketplaceDefinitionId(nodeId);
+  if (marketSpec) {
+    let flowDir = root;
+    if (flowId && flowSource) {
+      const flowPath = getFlowYamlAbs(workspaceRoot, flowId, flowSource, opts);
+      if (flowPath.path) flowDir = path.dirname(flowPath.path);
+      if (flowPath.path && fs.existsSync(flowPath.path)) {
+        try {
+          const parsed = yaml.load(fs.readFileSync(flowPath.path, "utf-8"));
+          if (parsed && typeof parsed === "object") opts.flowData = parsed;
+        } catch (_) {}
+      }
+    }
+    const resolved = resolveMarketplaceNodePackage(root, flowDir, nodeId, opts.flowData || null);
+    if (!resolved) return { error: "Node not found: " + nodeId };
+    const readmePath = path.join(resolved.packageDir, "README.md");
+    let type = "agent";
+    const runtimeType = String(resolved.runtime?.type || resolved.type || "").toLowerCase();
+    if (runtimeType.startsWith("control")) type = "control";
+    else if (runtimeType.startsWith("provide")) type = "provide";
+    return {
+      type,
+      label: resolved.displayName,
+      displayName: resolved.displayName,
+      inputs: resolved.input,
+      outputs: resolved.output,
+      executionLogic: fs.existsSync(readmePath) ? fs.readFileSync(readmePath, "utf-8").trim() : undefined,
+      description: resolved.description,
+      packageId: resolved.id,
+      version: resolved.version,
+      packageDir: resolved.packageDir,
+      runtime: resolved.runtime,
+    };
+  }
   const fileName = nodeId.endsWith(".md") ? nodeId : `${nodeId}.md`;
   const pathsToTry = [];
   if (flowId && flowSource) {

package/bin/lib/composer-skill-router.mjs

@@ -13,6 +13,7 @@
  */
 import fs from "fs";
 import path from "path";
+import yaml from "js-yaml";
 
 // ─── 意图模式定义 ─────────────────────────────────────────────────────────
 
@@ -124,6 +125,112 @@ function readFileCached(absPath) {
   }
 }
 
+function parseSkillFile(absPath) {
+  const content = readFileCached(absPath);
+  if (!content) return null;
+  const fmMatch = content.match(/^---\n([\s\S]*?)\n---\n?/);
+  let meta = {};
+  if (fmMatch) {
+    try {
+      meta = yaml.load(fmMatch[1]) || {};
+    } catch {
+      meta = {};
+    }
+  }
+  const dirName = path.basename(path.dirname(absPath));
+  const name = String(meta.name || dirName).trim();
+  if (!name) return null;
+  const description = String(meta.description || "").trim();
+  return {
+    name,
+    description,
+    content,
+    body: stripFrontmatter(content),
+    absPath,
+  };
+}
+
+function listSkillDirs(rootDir) {
+  try {
+    return fs.readdirSync(rootDir, { withFileTypes: true })
+      .filter((e) => e.isDirectory())
+      .map((e) => path.join(rootDir, e.name, "SKILL.md"))
+      .filter((p) => fs.existsSync(p));
+  } catch {
+    return [];
+  }
+}
+
+function skillSources(packageRoot, workspaceRoot) {
+  const sources = [
+    { source: "builtin", label: "AgentFlow", dir: path.join(packageRoot, "skills") },
+  ];
+  if (workspaceRoot) {
+    sources.push(
+      { source: "workspace-agents", label: ".agents", dir: path.join(workspaceRoot, ".agents", "skills") },
+      { source: "workspace-cursor", label: ".cursor", dir: path.join(workspaceRoot, ".cursor", "skills") },
+    );
+  }
+  return sources;
+}
+
+export function listComposerSkills(packageRoot, workspaceRoot) {
+  const out = [];
+  const seenKeys = new Set();
+  for (const src of skillSources(packageRoot, workspaceRoot)) {
+    for (const skillPath of listSkillDirs(src.dir)) {
+      const skill = parseSkillFile(skillPath);
+      if (!skill) continue;
+      const key = `${src.source}:${skill.name}`;
+      if (seenKeys.has(key)) continue;
+      seenKeys.add(key);
+      out.push({
+        key,
+        id: skill.name,
+        name: skill.name,
+        description: skill.description,
+        source: src.source,
+        sourceLabel: src.label,
+        path: skill.absPath,
+      });
+    }
+  }
+  return out.sort((a, b) => {
+    const bySource = a.sourceLabel.localeCompare(b.sourceLabel);
+    if (bySource !== 0) return bySource;
+    return a.name.localeCompare(b.name);
+  });
+}
+
+export function loadResourcesForSkillKeys(skillKeys, packageRoot, workspaceRoot) {
+  if (!Array.isArray(skillKeys) || skillKeys.length === 0) {
+    return { skills: [], references: [], skillsHint: "", hasContext: false };
+  }
+  const wanted = new Set(skillKeys.map((x) => String(x || "").trim()).filter(Boolean));
+  if (wanted.size === 0) return { skills: [], references: [], skillsHint: "", hasContext: false };
+
+  const skills = [];
+  for (const item of listComposerSkills(packageRoot, workspaceRoot)) {
+    if (!wanted.has(item.key) && !wanted.has(item.name)) continue;
+    const parsed = parseSkillFile(item.path);
+    if (!parsed) continue;
+    skills.push({
+      id: item.name,
+      content: parsed.body,
+      absPath: item.path,
+      source: item.source,
+      sourceLabel: item.sourceLabel,
+    });
+  }
+
+  return {
+    skills,
+    references: [],
+    skillsHint: buildSelectedSkillsHint(skills),
+    hasContext: skills.length > 0,
+  };
+}
+
 // ─── 意图检测 ─────────────────────────────────────────────────────────────
 
 /**
@@ -307,6 +414,16 @@ function buildSkillsHint(intents, skills, references) {
   return lines.join("\n");
 }
 
+function buildSelectedSkillsHint(skills) {
+  if (!Array.isArray(skills) || skills.length === 0) return "";
+  const lines = ["## 用户选择的 skills"];
+  for (const s of skills) {
+    lines.push(`- 使用 skill \`${s.id}\`：${s.absPath}`);
+  }
+  lines.push("如任务与所选 skill 匹配，请先读取对应 SKILL.md 并遵循其说明；如果只是问答，按问题直接回答。");
+  return lines.join("\n");
+}
+
 // ─── 辅助 ─────────────────────────────────────────────────────────────────
 
 function stripFrontmatter(content) {

package/bin/lib/help.mjs

@@ -20,6 +20,10 @@ AgentFlow CLI — 使用 Cursor / OpenCode / Claude Code CLI 流式输出驱动
   agentflow ui [--host <addr>] [--port <n>] [--scheduler] [--no-open]  本地 HTTP：流水线列表 + React Flow 节点流程图编辑保存（默认 127.0.0.1:8765；可用 AGENTFLOW_UI_HOST）
   agentflow scheduler start [--poll-ms <ms>]  启动定时执行调度器（读取各流水线 schedule.json）
   agentflow scheduler status [--json]         查看定时执行配置与状态
+  agentflow scheduler cancel <FlowName> <uuid>  取消某次等待中的 watch/run
+  agentflow marketplace list [--json]         查看 workspace 本地节点市场
+  agentflow marketplace publish-node <dir>    发布本地节点包到 workspace market
+  agentflow marketplace install-node <FlowName> <nodeSpec>  将 market 节点依赖写入 flow
   agentflow apply <FlowName> [uuid]            或 agentflow apply <uuid>（由 uuid 反查 pipeline）
   agentflow validate <FlowName> [uuid]        校验流程；终端下输出易读结果，--json 或管道时输出 JSON；传 uuid 时写入 runDir/intermediate/validation.json
   agentflow resume <FlowName> <uuid> [instanceId]  将 pending 与 failed 节点标为已确认并继续 apply
@@ -85,6 +89,10 @@ Usage:
   agentflow ui [--host <addr>] [--port <n>] [--scheduler] [--no-open]  Local HTTP: pipeline list + React Flow node diagram editor (default 127.0.0.1:8765; AGENTFLOW_UI_HOST supported)
   agentflow scheduler start [--poll-ms <ms>]  Start the scheduled-run scheduler (reads each pipeline schedule.json)
   agentflow scheduler status [--json]         Show scheduled-run configuration and state
+  agentflow scheduler cancel <FlowName> <uuid>  Cancel a waiting watch/run
+  agentflow marketplace list [--json]         Show workspace local marketplace packages
+  agentflow marketplace publish-node <dir>    Publish a local node package to the workspace market
+  agentflow marketplace install-node <FlowName> <nodeSpec>  Add a marketplace node dependency to a flow
   agentflow apply <FlowName> [uuid]            Or agentflow apply <uuid> (resolve pipeline from uuid)
   agentflow validate <FlowName> [uuid]        Validate flow; readable output in terminal, JSON with --json or pipe; writes to runDir/intermediate/validation.json when uuid provided
   agentflow resume <FlowName> <uuid> [instanceId]  Mark pending and failed nodes as acknowledged and continue apply

package/bin/lib/locales/en.json

@@ -241,6 +241,26 @@
       "displayName": "To Bool",
       "description": "Execute script to produce true/false prediction. Like tool_nodejs but enforces bool output. Extensible inputs."
     },
+    "control_delay": {
+      "displayName": "Delay",
+      "description": "Persistently wait for a relative duration, then scheduler resumes this run."
+    },
+    "control_wait_until": {
+      "displayName": "Wait Until",
+      "description": "Persistently wait until an absolute time, then scheduler resumes this run."
+    },
+    "control_deadline": {
+      "displayName": "Deadline",
+      "description": "Check whether the deadline has expired and output expired as bool."
+    },
+    "control_cancelled": {
+      "displayName": "Cancelled",
+      "description": "Check whether the current run/watch has been cancelled and output cancelled as bool."
+    },
+    "control_interval_loop": {
+      "displayName": "Interval Loop",
+      "description": "Persistently wait by interval and branch to continue, done, timeout, or cancelled based on done, cancelled, and deadline inputs."
+    },
     "control_agent_toBool": {
       "displayName": "Agent ToBool",
       "description": "AI-powered boolean judgment for non-deterministic scenarios"
@@ -341,4 +361,4 @@
       "control_toBool_check": { "label": "Check Result" }
     }
   }
-}
+}

package/bin/lib/locales/zh.json

@@ -241,6 +241,26 @@
       "displayName": "转布尔",
       "description": "执行 script 脚本输出 true/false 到 prediction，类似 tool_nodejs 但强制 bool 输出，可扩展输入"
     },
+    "control_delay": {
+      "displayName": "延迟等待",
+      "description": "持久化等待一段时间，到点后由 scheduler 唤醒当前 run 继续执行"
+    },
+    "control_wait_until": {
+      "displayName": "等待到时间",
+      "description": "持久化等待到指定时间，到点后由 scheduler 唤醒当前 run 继续执行"
+    },
+    "control_deadline": {
+      "displayName": "截止判断",
+      "description": "判断当前时间是否已超过截止时间，输出 expired 布尔值"
+    },
+    "control_cancelled": {
+      "displayName": "取消判断",
+      "description": "判断当前 run/watch 是否已被取消，输出 cancelled 布尔值"
+    },
+    "control_interval_loop": {
+      "displayName": "间隔循环",
+      "description": "按固定间隔持久化等待，并根据 done、cancelled、deadline 分支到继续、完成、超时或取消"
+    },
     "control_agent_toBool": {
       "displayName": "AI 转布尔",
       "description": "由 AI 判断输入内容的布尔含义，适用于不确定性场景"
@@ -341,4 +361,4 @@
       "control_toBool_check": { "label": "检查结果" }
     }
   }
-}
+}

package/bin/lib/main.mjs

@@ -30,7 +30,8 @@ import { startUiServer } from "./ui-server.mjs";
 import { hubLogin, hubLogout } from "./hub-login.mjs";
 import { hubPublish } from "./hub-publish.mjs";
 import { hubListRemote, hubDownload } from "./hub-remote.mjs";
-import { listScheduleStatuses, startScheduler } from "./scheduler.mjs";
+import { cancelScheduledRun, listScheduleStatuses, startScheduler } from "./scheduler.mjs";
+import { installFlowDependency, listMarketplacePackages, publishNodePackage } from "./marketplace.mjs";
 
 async function readStdin() {
   const chunks = [];
@@ -210,6 +211,43 @@ export async function main() {
     process.stdout.write(JSON.stringify(result) + "\n");
     process.exit(result.error ? 1 : 0);
   }
+  if (sub === "marketplace") {
+    const action = shift();
+    if (action === "list") {
+      const result = listMarketplacePackages(workspaceRoot);
+      if (jsonMode) {
+        process.stdout.write(JSON.stringify(result) + "\n");
+      } else {
+        const table = new Table({ head: ["type", "id", "version", "name", "path"], style: { head: [] } });
+        for (const n of result.nodes) table.push(["node", n.id, n.version, n.displayName || "", n.packageDir]);
+        for (const c of result.collections) table.push(["collection", c.id, c.version, c.displayName || "", c.packageDir]);
+        process.stdout.write(table.toString() + "\n");
+      }
+      process.exit(0);
+    }
+    if (action === "publish-node") {
+      const sourceDir = shift();
+      if (!sourceDir) throw new Error("Usage: agentflow marketplace publish-node <packageDir> [--json]");
+      const result = publishNodePackage(workspaceRoot, sourceDir);
+      if (jsonMode) process.stdout.write(JSON.stringify(result) + "\n");
+      else if (result.ok) process.stdout.write(`Published node ${result.id}@${result.version}: ${result.definitionId}\n`);
+      else throw new Error(result.error || "publish-node failed");
+      process.exit(result.ok ? 0 : 1);
+    }
+    if (action === "install-node") {
+      const flowId = shift();
+      const spec = shift();
+      if (!flowId || !spec) throw new Error("Usage: agentflow marketplace install-node <flow> <nodeSpec> [--json]");
+      const flowDir = getFlowDir(workspaceRoot, flowId);
+      if (!flowDir) throw new Error(`Flow not found: ${flowId}`);
+      const result = installFlowDependency(workspaceRoot, flowDir, spec);
+      if (jsonMode) process.stdout.write(JSON.stringify(result) + "\n");
+      else if (result.ok) process.stdout.write(`Installed ${result.definitionId} into ${flowId}\n`);
+      else throw new Error(result.error || "install-node failed");
+      process.exit(result.ok ? 0 : 1);
+    }
+    throw new Error("Usage: agentflow marketplace <list|publish-node|install-node> [--json]");
+  }
   if (sub === "copy-builtin" && jsonMode) {
     const flowId = shift();
     let targetFlowId;
@@ -382,7 +420,7 @@ export async function main() {
         process.exit(0);
       }
       const rows = listScheduleStatuses(workspaceRoot);
-      const table = new Table({ head: ["flow", "source", "enabled", "cron", "timezone", "next", "running", "lastRun", "error"], style: { head: [] } });
+      const table = new Table({ head: ["flow", "source", "enabled", "cron", "timezone", "next", "running", "waiting", "lastRun", "error"], style: { head: [] } });
       for (const r of rows) {
         table.push([
           r.flowId,
@@ -392,6 +430,7 @@ export async function main() {
           r.timezone || "",
           r.nextRunAt || "",
           r.running ? "yes" : "no",
+          String(r.waiting || 0),
           r.lastRunUuid || "",
           r.lastError || "",
         ]);
@@ -399,7 +438,21 @@ export async function main() {
       process.stdout.write(table.toString() + "\n");
       process.exit(0);
     }
-    throw new Error("Usage: agentflow scheduler <start|status> [--once] [--poll-ms <ms>] [--json]");
+    if (action === "cancel") {
+      const flowId = shift();
+      const uuid = shift();
+      if (!flowId || !uuid) throw new Error("Usage: agentflow scheduler cancel <flow> <uuid> [--json]");
+      const result = cancelScheduledRun(workspaceRoot, flowId, uuid);
+      if (jsonMode) {
+        process.stdout.write(JSON.stringify(result) + "\n");
+      } else if (result.ok) {
+        process.stdout.write(`Cancelled ${flowId}/${uuid}; updated waits: ${result.updatedWaits}\n`);
+      } else {
+        throw new Error(result.error || "cancel failed");
+      }
+      process.exit(result.ok ? 0 : 1);
+    }
+    throw new Error("Usage: agentflow scheduler <start|status|cancel> [--once] [--poll-ms <ms>] [--json]");
   }
   // ──── Hub commands ────
   if (sub === "login") {