@fieldwangai/agentflow 0.1.95 → 0.1.97

package/bin/lib/ui-server.mjs

@@ -3923,6 +3923,31 @@ function workspaceSafeNodeOutputRelPath(value) {
   return clean;
 }
 
+function workspaceDescribeNodeOutputsDir(nodeRunDir, maxEntries = 30) {
+  const outputsDir = path.resolve(nodeRunDir || "", "outputs");
+  if (!nodeRunDir || !fs.existsSync(outputsDir)) return "Current node outputs directory is missing.";
+  const entries = [];
+  const walk = (dir, rel = "") => {
+    if (entries.length >= maxEntries) return;
+    let children = [];
+    try {
+      children = fs.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const child of children) {
+      if (entries.length >= maxEntries) break;
+      const childRel = rel ? path.posix.join(rel, child.name) : child.name;
+      entries.push(child.isDirectory() ? `${childRel}/` : childRel);
+      if (child.isDirectory()) walk(path.join(dir, child.name), childRel);
+    }
+  };
+  walk(outputsDir);
+  if (!entries.length) return "Current node outputs directory is empty.";
+  const suffix = entries.length >= maxEntries ? `\n...showing first ${maxEntries} entries` : "";
+  return `Current node outputs entries:\n${entries.map((entry) => `- outputs/${entry}`).join("\n")}${suffix}`;
+}
+
 function workspacePublishNodeOutputFile(runPackage, relPath) {
   if (!String(relPath || "").trim()) return "";
   const clean = workspaceSafeNodeOutputRelPath(relPath);
@@ -3939,6 +3964,7 @@ function workspacePublishNodeOutputFile(runPackage, relPath) {
     throw new Error(
       `Agent returned resultFile but did not create it under this node's outputs: ${clean}\n` +
       `Expected file: ${src}\n` +
+      `${workspaceDescribeNodeOutputsDir(nodeRunDir)}\n` +
       `Write outputs using a relative path from the node cwd, or use AGENTFLOW_OUTPUTS_DIR.`
     );
   }
@@ -4160,6 +4186,8 @@ function workspaceOutputProtocolRequirements(graph, nodeId) {
     "",
     `请把${resultKindText}结果写入 \`${resultFile}\`。${resultGuidance}`,
     `必须先在当前执行目录下创建 \`${resultFile}\`，不要写到绝对路径或其它 run 目录；然后再返回下面的 agentflow envelope。`,
+    `只在最终回复里写 \`resultFile: ${resultFile}\` 不会创建文件；必须通过工具或脚本实际写入该文件。`,
+    `返回前请确认 \`${resultFile}\` 已存在且非空（例如执行 \`test -s ${resultFile}\` 或等价检查）；如果无法创建文件，不要返回成功 envelope。`,
     downstreamInputRequirements ? `\n${downstreamInputRequirements}` : "",
     ...(slots.length ? [`额外输出：${slots.map((name) => `\`${name}\``).join("、")}。短值可写在 \`outParams\`，文件值写成 \`outParams.<name>File\`。`] : []),
     "最终只输出下面的 agentflow envelope，不要输出解释、进度或其它文字：",
@@ -4347,13 +4375,17 @@ function workspaceCachedOutputValueExists(value, scopedRoot = "") {
 }
 
 function workspaceUpstreamText(graph, nodeId, outputs, scopedRoot = "") {
+  const contentEdge = workspaceContentInputEdge(graph, nodeId);
+  if (!contentEdge) return "";
+  return workspaceOutputSlotValueForEdge(graph, outputs, contentEdge, scopedRoot);
+}
+
+function workspaceContentInputEdge(graph, nodeId) {
   const edges = Array.isArray(graph?.edges) ? graph.edges : [];
   const incoming = edges
     .filter((edge) => String(edge?.target || "") === String(nodeId))
     .filter((edge) => !isWorkspaceSemanticInputSlot(workspaceTargetSlotForEdge(graph, edge)));
-  const contentEdge = incoming.find((edge) => String(edge?.targetHandle || "") === "input-1") || incoming[0];
-  if (!contentEdge) return "";
-  return workspaceOutputSlotValueForEdge(graph, outputs, contentEdge, scopedRoot);
+  return incoming.find((edge) => String(edge?.targetHandle || "") === "input-1") || incoming[0] || null;
 }
 
 function workspaceHandleIndex(handle, prefix) {
@@ -6089,6 +6121,11 @@ async function runWorkspaceGraph(root, scopedRoot, payload, userCtx = {}, opts =
     }
 
     if (workspaceDisplayKind(defId)) {
+      if (!workspaceContentInputEdge(graph, nodeId)) {
+        emit({ type: "status", nodeId, line: "Display unchanged: no content input edge" });
+        emit({ type: "node-done", nodeId, definitionId: defId, unchanged: true });
+        continue;
+      }
       const content = workspaceUpstreamText(graph, nodeId, outputs, scopedRoot);
       graph.instances[nodeId] = workspaceWriteDisplayContent(instance, content);
       const updatedDisplays = publishNodeOutput(nodeId, content);
@@ -7048,6 +7085,24 @@ function prdWorkflowSafeStateId(value) {
     .slice(0, 128) || "unknown";
 }
 
+function prdWorkflowReviewIdFromRequest(tapdId, payload = {}, durability = "temporary") {
+  if (durability === "temporary") return `r-${crypto.randomBytes(5).toString("hex")}`;
+  const requested = String(payload.reviewId || payload.review_id || "").trim();
+  if (!requested) return `review_${Date.now().toString(36)}_${crypto.randomBytes(4).toString("hex")}`;
+  const safeRequested = prdWorkflowSafeStateId(requested);
+  if (safeRequested.length <= 48) return safeRequested;
+  const stage = String(payload.stage || payload.stageKey || payload.stage_key || "review").trim();
+  const action = String(payload.action || payload.actionId || payload.action_id || "").trim();
+  const issueKey = String(payload.issueKey || payload.issue_key || payload.issue || "").trim();
+  const stageHead = prdWorkflowSafeStateId(stage.split(":")[0] || stage || "review").slice(0, 20);
+  const digest = crypto
+    .createHash("sha256")
+    .update(JSON.stringify({ tapdId: String(tapdId || ""), requested, stage, action, issueKey }))
+    .digest("hex")
+    .slice(0, 10);
+  return prdWorkflowSafeStateId(["review", tapdId, stageHead, digest].filter(Boolean).join("-")).slice(0, 64);
+}
+
 function prdWorkflowStatePath(scopedRoot, tapdId) {
   const rootDir = scopedRoot || process.cwd();
   return path.join(rootDir, ".workspace", "prd-flow", "workflow-state", `${prdWorkflowSafeStateId(tapdId)}.json`);
@@ -7436,13 +7491,10 @@ function prdWorkflowReviewHtml(title, markdown, meta = {}) {
 function prdWorkflowCreateReview(scopedRoot, tapdId, payload = {}, urlBase = "") {
   const content = String(payload.markdown || payload.content || payload.rawOutput || "").slice(0, 500000);
   if (!content.trim()) throw new Error("Missing review markdown");
-  const requestedReviewId = String(payload.reviewId || payload.review_id || "").trim();
-  const reviewId = requestedReviewId
-    ? prdWorkflowSafeStateId(requestedReviewId)
-    : `review_${Date.now().toString(36)}_${crypto.randomBytes(4).toString("hex")}`;
-  const paths = prdWorkflowReviewPaths(scopedRoot, tapdId, reviewId);
   const title = String(payload.title || payload.label || "PRD Workflow Review").trim().slice(0, 160) || "PRD Workflow Review";
   const durability = String(payload.durability || (payload.durable === true || payload.permanent === true ? "durable" : "temporary")).trim().toLowerCase() || "temporary";
+  const reviewId = prdWorkflowReviewIdFromRequest(tapdId, payload, durability);
+  const paths = prdWorkflowReviewPaths(scopedRoot, tapdId, reviewId);
   const ttlDaysRaw = Number(payload.ttlDays || payload.ttl_days || (durability === "temporary" ? 7 : 0));
   const ttlDays = Number.isFinite(ttlDaysRaw) && ttlDaysRaw > 0 ? ttlDaysRaw : 0;
   const createdAt = new Date();
@@ -10342,7 +10394,7 @@ export function startUiServer({
         const review = prdWorkflowCreateReview(scopedRoot, tapdId, payload, serverPublicBaseUrl(req, host, uiPort, payload));
         const query = new URLSearchParams();
         if (flowId) query.set("flowId", flowId);
-        if (flowSource) query.set("flowSource", flowSource);
+        if (flowId && flowSource && flowSource !== "user") query.set("flowSource", flowSource);
         if (archived) query.set("archived", "1");
         const reviewUrl = query.toString() ? `${review.url}?${query.toString()}` : review.url;
         const durability = review.durability || "temporary";