@fieldwangai/agentflow 0.1.137 → 0.1.141

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

@@ -51,6 +51,13 @@ import {
 import { buildGitContext, inferGitRepoRootFromWorktree, loadGitWorktree, normalizeGitContext, unloadGitWorktree } from "../lib/git-worktree.mjs";
 import { createGitLabMergeRequest } from "../lib/gitlab-mr.mjs";
 import { sendWecomAppMarkdown, sendWecomGroupMarkdown } from "../lib/wecom.mjs";
+import {
+  advanceJenkinsBuild,
+  createJenkinsSkillInvoker,
+  normalizeJenkinsBuildConfig,
+  readJenkinsBuildState,
+  writeJenkinsBuildState,
+} from "../lib/jenkins.mjs";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -500,6 +507,106 @@ async function emitWecomMarkdownNode(workspaceRoot, flowName, uuid, instanceId,
   return emitLocalNoopPrompt(workspaceRoot, runDir, instanceId, "wecom-markdown", `${result.message}\n`);
 }
 
+function emitJenkinsBuildNode(workspaceRoot, flowName, uuid, instanceId, execId) {
+  const runDir = getRunDir(workspaceRoot, flowName, uuid);
+  const data = getResolvedValues(workspaceRoot, flowName, uuid, instanceId);
+  if (!data.ok) throw new Error("getResolvedValues failed");
+  const inputs = data.resolvedInputs || {};
+  const config = normalizeJenkinsBuildConfig(inputs);
+  const statePath = path.join(runDir, "state", `${instanceId}.jenkins.json`);
+  const priorState = readJenkinsBuildState(statePath);
+  if (priorState?.job && priorState.job !== config.job) {
+    throw new Error(`checkpoint job mismatch: ${priorState.job} != ${config.job}`);
+  }
+  let invoker = null;
+  const invoke = (operation, args) => {
+    if (!invoker) {
+      invoker = createJenkinsSkillInvoker({
+        workspaceRoot,
+        credentialRef: config.credentialRef,
+        env: process.env,
+      });
+    }
+    return invoker(operation, args);
+  };
+  const result = advanceJenkinsBuild({
+    state: priorState,
+    config,
+    invoke,
+    persistState: (state) => writeJenkinsBuildState(statePath, state),
+    nowMs: Date.now(),
+    cancelled: readCancelFlag(runDir),
+  });
+  writeJenkinsBuildState(statePath, result.state);
+  writeOutputSlot(runDir, instanceId, execId, "status", result.outputs?.status || result.state?.status || "");
+  writeOutputSlot(runDir, instanceId, execId, "url", result.outputs?.url || result.state?.url || result.state?.buildUrl || "");
+  writeOutputSlot(runDir, instanceId, execId, "qrUrl", result.outputs?.qrUrl || result.state?.qrUrl || "");
+
+  const message = result.message || result.state?.message || "Jenkins Build";
+  if (result.kind === "failed") {
+    writeResult(
+      workspaceRoot,
+      flowName,
+      uuid,
+      instanceId,
+      { status: "failed", message },
+      { execId, preserveBody: false, body: JSON.stringify({ status: "ERROR", message }, null, 2) },
+    );
+    throw new Error(message);
+  }
+
+  const promptPath = emitLocalNoopPrompt(
+    workspaceRoot,
+    runDir,
+    instanceId,
+    result.kind === "waiting" ? "jenkins-waiting" : "jenkins-complete",
+    `${message}\n`,
+  );
+  if (result.kind === "waiting") {
+    const waitId = `${uuid}:${instanceId}:jenkins-build`;
+    writeWaitState(runDir, {
+      waitId,
+      status: "waiting",
+      reason: "tool_jenkins_build",
+      resumeMode: "rerun",
+      flowName,
+      uuid,
+      instanceId,
+      execId,
+      phase: result.state?.phase || "queued",
+      buildNumber: result.state?.buildNumber || "",
+      wakeAt: result.wakeAt,
+      createdAt: priorState?.createdAt || new Date().toISOString(),
+    });
+    writeResult(
+      workspaceRoot,
+      flowName,
+      uuid,
+      instanceId,
+      { status: "pending", message },
+      { execId, preserveBody: false, body: JSON.stringify({ phase: result.state?.phase, wakeAt: result.wakeAt }, null, 2) },
+    );
+  } else {
+    writeResult(
+      workspaceRoot,
+      flowName,
+      uuid,
+      instanceId,
+      { status: "success", message },
+      {
+        execId,
+        preserveBody: false,
+        body: JSON.stringify({
+          status: result.outputs?.status || result.state?.status || "",
+          url: result.outputs?.url || result.state?.url || "",
+          qrUrl: result.outputs?.qrUrl || result.state?.qrUrl || "",
+        }, null, 2),
+      },
+    );
+  }
+  return { promptPath, lifecycle: result.kind };
+}
+
 function emitCdWorkspaceNode(workspaceRoot, flowName, uuid, instanceId, execId) {
   const runDir = getRunDir(workspaceRoot, flowName, uuid);
   const { inputs, workspaceContext } = resolveNodeRuntimeContexts(workspaceRoot, flowName, uuid, instanceId);
@@ -1203,26 +1310,29 @@ async function main() {
     return;
   }
 
-  if (definitionId === "tool_git_checkout" || definitionId === "tool_git_worktree_load" || definitionId === "tool_git_worktree_unload" || definitionId === "tool_gitlab_create_mr" || definitionId === "tool_wecom_send_group_markdown" || definitionId === "tool_wecom_send_app_markdown" || 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 === "tool_jenkins_build" || definitionId === "tool_wecom_send_group_markdown" || definitionId === "tool_wecom_send_app_markdown" || definitionId === "control_cd_workspace" || definitionId === "control_user_workspace" || definitionId === "control_load_skills" || definitionId === "tool_print") {
     try {
-      const promptPath =
+      const localResult =
         definitionId === "tool_git_checkout"
-          ? emitGitCheckoutNode(workspaceRoot, flowName, uuid, instanceId, execId, resultPathRel)
+          ? { promptPath: emitGitCheckoutNode(workspaceRoot, flowName, uuid, instanceId, execId, resultPathRel) }
           : definitionId === "tool_git_worktree_load"
-            ? emitGitWorktreeLoadNode(workspaceRoot, flowName, uuid, instanceId, execId)
+            ? { promptPath: emitGitWorktreeLoadNode(workspaceRoot, flowName, uuid, instanceId, execId) }
             : definitionId === "tool_git_worktree_unload"
-              ? emitGitWorktreeUnloadNode(workspaceRoot, flowName, uuid, instanceId, execId)
+              ? { promptPath: emitGitWorktreeUnloadNode(workspaceRoot, flowName, uuid, instanceId, execId) }
               : definitionId === "tool_gitlab_create_mr"
-                ? await emitGitLabCreateMrNode(workspaceRoot, flowName, uuid, instanceId, execId)
+                ? { promptPath: await emitGitLabCreateMrNode(workspaceRoot, flowName, uuid, instanceId, execId) }
+                : definitionId === "tool_jenkins_build"
+                  ? emitJenkinsBuildNode(workspaceRoot, flowName, uuid, instanceId, execId)
                 : definitionId === "tool_wecom_send_group_markdown" || definitionId === "tool_wecom_send_app_markdown"
-                  ? await emitWecomMarkdownNode(workspaceRoot, flowName, uuid, instanceId, execId, definitionId)
+                  ? { promptPath: await emitWecomMarkdownNode(workspaceRoot, flowName, uuid, instanceId, execId, definitionId) }
                   : definitionId === "control_cd_workspace"
-                    ? emitCdWorkspaceNode(workspaceRoot, flowName, uuid, instanceId, execId)
+                    ? { promptPath: emitCdWorkspaceNode(workspaceRoot, flowName, uuid, instanceId, execId) }
                     : definitionId === "control_user_workspace"
-                      ? emitUserWorkspaceNode(workspaceRoot, flowName, uuid, instanceId, execId)
+                      ? { promptPath: emitUserWorkspaceNode(workspaceRoot, flowName, uuid, instanceId, execId) }
                       : definitionId === "control_load_skills"
-                        ? emitLoadSkillsNode(workspaceRoot, flowName, uuid, instanceId, execId)
-                        : emitToolPrintNode(workspaceRoot, flowName, uuid, instanceId, execId);
+                        ? { promptPath: emitLoadSkillsNode(workspaceRoot, flowName, uuid, instanceId, execId) }
+                        : { promptPath: emitToolPrintNode(workspaceRoot, flowName, uuid, instanceId, execId) };
+      const promptPath = localResult.promptPath;
       writeCacheJsonForNode(workspaceRoot, flowName, uuid, instanceId, execId);
       logToRunTag(workspaceRoot, flowName, uuid, "pre-process", { event: "runtime-context-node", instanceId, definitionId });
       console.log(JSON.stringify({
@@ -1233,6 +1343,7 @@ async function main() {
         subagent: "agentflow-node-executor",
         optionalPromptPath: promptPath,
         definitionId,
+        ...(localResult.lifecycle ? { nodeLifecycle: localResult.lifecycle } : {}),
       }));
       return;
     } catch (e) {

package/bin/pipeline/run-log.mjs

@@ -21,11 +21,11 @@ const LOG_FILE = "logs/log.txt";
  * @param {string} tag - 来源标识：get-ready-nodes | check-cache | pre-process | post-process | result
  * @param {string|object} message - 文本或对象（对象会 JSON.stringify）
  */
-export function logToRunTag(workspaceRoot, flowName, uuid, tag, message) {
+export function logToRunTag(workspaceRoot, flowName, uuid, tag, message, opts = {}) {
   if (!workspaceRoot || !flowName || !uuid) return;
   const text = typeof message === "string" ? message : JSON.stringify(message);
   try {
-    const runDir = getRunDir(workspaceRoot, flowName, uuid);
+    const runDir = opts.runDir || getRunDir(workspaceRoot, flowName, uuid);
     const logPath = path.join(runDir, LOG_FILE);
     fs.mkdirSync(path.dirname(logPath), { recursive: true });
     const line = `[${new Date().toISOString()}] [${tag}] ${text}\n`;

package/bin/pipeline/write-result.mjs

@@ -12,7 +12,7 @@
  *   import { writeResult } from "./write-result.mjs";
  *   writeResult(workspaceRoot, flowName, uuid, instanceId, fields, options?)
  * fields: { status, message, finishedAt?, outputPath?, branch?, cacheNotMetReason?, elapsedMs? }
- * options: { preserveBody?: boolean, body?: string, execId?: number }
+ * options: { preserveBody?: boolean, body?: string, execId?: number, runDir?: string }
  */
 
 import fs from "fs";
@@ -53,10 +53,10 @@ function getExistingBody(resultPath) {
  * @param {string} uuid - 本次 run 的 uuid
  * @param {string} instanceId - 节点 instance id
  * @param {{ status: string, message: string, finishedAt?: string, outputPath?: string, branch?: string, cacheNotMetReason?: string, elapsedMs?: number }} fields - 必填 status、message；可选其余（elapsedMs 为节点执行耗时毫秒，供 UI 展示）
- * @param {{ preserveBody?: boolean, body?: string, execId?: number }} [options] - preserveBody：保留已有正文；body：指定正文内容；execId：本轮 execId，缺省则从 memory 读取
+ * @param {{ preserveBody?: boolean, body?: string, execId?: number, runDir?: string }} [options] - preserveBody：保留已有正文；body：指定正文内容；execId：本轮 execId，缺省则从 memory 读取；runDir：多用户调度时使用已解析的精确运行目录
  */
 export function writeResult(workspaceRoot, flowName, uuid, instanceId, fields, options = {}) {
-  const runDir = getRunDir(workspaceRoot, flowName, uuid);
+  const runDir = options.runDir || getRunDir(workspaceRoot, flowName, uuid);
   const execId = options.execId ?? loadExecId(workspaceRoot, flowName, uuid, instanceId);
   const resultBasename = intermediateResultBasename(instanceId, execId);
   const resultPath = path.join(runDir, intermediateDirForNode(instanceId), resultBasename);
@@ -114,7 +114,7 @@ export function writeResult(workspaceRoot, flowName, uuid, instanceId, fields, o
     branch: branch ?? undefined,
     cacheNotMetReason: cacheNotMetReason ?? undefined,
     resultPathRel: path.relative(runDir, resultPath),
-  });
+  }, { runDir });
 }
 
 function main() {

package/builtin/nodes/tool_jenkins_build.md

@@ -0,0 +1,64 @@
+---
+# Built-in node: durable Jenkins build
+description: |
+  Trigger one Jenkins job and durably monitor it until completion.
+
+  The node persists queue/build checkpoints and never keeps a process blocked while waiting.
+  Scheduler re-enters the same node at `pollInterval`; an existing queueId/buildNumber is reused,
+  so a resumed run does not trigger the job again. Jenkins FAILURE/ABORTED/TIMEOUT are business
+  outcomes and continue to downstream notification nodes. Authentication, configuration, and
+  repeated platform request errors fail the AgentFlow node.
+
+  Credentials are read from environment configuration. `credentialRef: team-ci` selects
+  `JENKINS_TEAM_CI_BASE_URL`, `JENKINS_TEAM_CI_USERNAME`, and `JENKINS_TEAM_CI_TOKEN`, falling
+  back to the standard `JENKINS_BASE_URL`, `JENKINS_USERNAME`, and `JENKINS_TOKEN` variables.
+displayName: Jenkins Build
+input:
+  - type: node
+    name: prev
+    default: ""
+  - type: text
+    name: job
+    default: ""
+    required: true
+    showOnNode: true
+  - type: text
+    name: parameters
+    default: "{}"
+    description: "Jenkins Job 参数 JSON object。"
+    showOnNode: true
+  - type: text
+    name: credentialRef
+    default: ""
+    description: "Project Deployment 中配置的 Jenkins 凭证引用；不在 flow.yaml 中填写 token。"
+    showOnNode: false
+  - type: text
+    name: pollInterval
+    default: "30s"
+    showOnNode: false
+  - type: text
+    name: timeout
+    default: "2h"
+    showOnNode: false
+output:
+  - type: node
+    name: next
+    default: ""
+  - type: text
+    name: status
+    default: ""
+    required: true
+    showOnNode: true
+  - type: text
+    name: url
+    default: ""
+    required: true
+    description: "优先返回安装包 URL；没有安装包时返回 Jenkins Build URL。"
+    showOnNode: true
+  - type: text
+    name: qrUrl
+    default: ""
+    description: "解析到二维码时返回，否则为空。"
+    showOnNode: true
+---
+Trigger Jenkins job `${job}` with `${parameters}`, wait durably, then output `${status}`, `${url}`, and optional `${qrUrl}`.

package/builtin/pipelines/jenkins-build-notify/flow.yaml

@@ -0,0 +1,217 @@
+instances:
+  start:
+    definitionId: control_start
+    label: Start
+    role: normal
+    input: []
+    output:
+      - type: node
+        name: next
+        value: ""
+    body: ""
+  job:
+    definitionId: provide_str
+    label: Jenkins Job
+    role: normal
+    input: []
+    output:
+      - type: text
+        name: value
+        value: ""
+    body: ""
+  parameters:
+    definitionId: provide_str
+    label: Build Parameters
+    role: normal
+    input: []
+    output:
+      - type: text
+        name: value
+        value: "{}"
+    body: ""
+  credential_ref:
+    definitionId: provide_str
+    label: Credential Ref
+    role: normal
+    input: []
+    output:
+      - type: text
+        name: value
+        value: ""
+    body: ""
+  webhook_key:
+    definitionId: provide_str
+    label: WeCom Webhook Key
+    role: normal
+    input: []
+    output:
+      - type: text
+        name: value
+        value: ""
+    body: ""
+  jenkins_build:
+    definitionId: tool_jenkins_build
+    label: Jenkins Build
+    role: normal
+    input:
+      - type: node
+        name: prev
+        value: ""
+      - type: text
+        name: job
+        value: ""
+      - type: text
+        name: parameters
+        value: "{}"
+      - type: text
+        name: credentialRef
+        value: ""
+      - type: text
+        name: pollInterval
+        value: "30s"
+      - type: text
+        name: timeout
+        value: "2h"
+    output:
+      - type: node
+        name: next
+        value: ""
+      - type: text
+        name: status
+        value: ""
+      - type: text
+        name: url
+        value: ""
+      - type: text
+        name: qrUrl
+        value: ""
+    body: ""
+  format_notification:
+    definitionId: tool_nodejs
+    label: Format Build Notification
+    role: normal
+    input:
+      - type: node
+        name: prev
+        value: ""
+      - type: text
+        name: status
+        value: ""
+      - type: text
+        name: url
+        value: ""
+      - type: text
+        name: qrUrl
+        value: ""
+    output:
+      - type: node
+        name: next
+        value: ""
+      - type: text
+        name: markdown
+        value: ""
+    script: >-
+      node -e "const fs=require('fs');const [status,url,qr,out]=process.argv.slice(1);const lines=['## Jenkins 构建结果','> 状态：'+status];if(url)lines.push('[查看构建或产物]('+url+')');if(qr)lines.push('[查看二维码]('+qr+')');fs.writeFileSync(out,lines.join('\n\n'));" ${status} ${url} ${qrUrl} ${markdown}
+    body: ""
+  notify:
+    definitionId: tool_wecom_send_group_markdown
+    label: WeCom Notification
+    role: normal
+    input:
+      - type: node
+        name: prev
+        value: ""
+      - type: text
+        name: markdown
+        value: ""
+      - type: text
+        name: webhookUrl
+        value: ""
+      - type: text
+        name: webhookKey
+        value: ""
+    output:
+      - type: node
+        name: next
+        value: ""
+      - type: bool
+        name: sent
+        value: ""
+      - type: text
+        name: message
+        value: ""
+      - type: text
+        name: response
+        value: ""
+    body: ""
+  end:
+    definitionId: control_end
+    label: End
+    role: normal
+    input:
+      - type: node
+        name: prev
+        value: ""
+    output: []
+    body: ""
+edges:
+  - source: start
+    target: jenkins_build
+    sourceHandle: output-0
+    targetHandle: input-0
+  - source: job
+    target: jenkins_build
+    sourceHandle: output-0
+    targetHandle: input-1
+  - source: parameters
+    target: jenkins_build
+    sourceHandle: output-0
+    targetHandle: input-2
+  - source: credential_ref
+    target: jenkins_build
+    sourceHandle: output-0
+    targetHandle: input-3
+  - source: jenkins_build
+    target: format_notification
+    sourceHandle: output-0
+    targetHandle: input-0
+  - source: jenkins_build
+    target: format_notification
+    sourceHandle: output-1
+    targetHandle: input-1
+  - source: jenkins_build
+    target: format_notification
+    sourceHandle: output-2
+    targetHandle: input-2
+  - source: jenkins_build
+    target: format_notification
+    sourceHandle: output-3
+    targetHandle: input-3
+  - source: format_notification
+    target: notify
+    sourceHandle: output-0
+    targetHandle: input-0
+  - source: format_notification
+    target: notify
+    sourceHandle: output-1
+    targetHandle: input-1
+  - source: webhook_key
+    target: notify
+    sourceHandle: output-0
+    targetHandle: input-3
+  - source: notify
+    target: end
+    sourceHandle: output-0
+    targetHandle: input-0
+ui:
+  nodePositions:
+    start: { x: -460, y: 60 }
+    job: { x: -450, y: 180 }
+    parameters: { x: -450, y: 300 }
+    credential_ref: { x: -450, y: 420 }
+    webhook_key: { x: 350, y: 360 }
+    jenkins_build: { x: -120, y: 100 }
+    format_notification: { x: 210, y: 100 }
+    notify: { x: 530, y: 100 }
+    end: { x: 830, y: 100 }
+  description: Jenkins 构建完成后发送企业微信通知