@fieldwangai/agentflow 0.1.52 → 0.1.54

package/bin/lib/auth.mjs

@@ -152,6 +152,7 @@ function userAllowlistMatchSet(users) {
 }
 
 export function isAuthUserAllowed(user) {
+  if (user?.isAdmin) return true;
   const allowlist = readUserAllowlist();
   if (!allowlist.enabled) return true;
   const allowed = userAllowlistMatchSet(allowlist.users);
@@ -266,15 +267,15 @@ export function loginOrCreateUser(username, password) {
   if (!userId) {
     return { ok: false, error: "用户名须以字母开头，仅可使用字母、数字、下划线与连字符，最多 64 字符" };
   }
-  if (!isAuthUserAllowed({ userId, username: String(username || "").trim() })) {
-    return { ok: false, forbidden: true, error: "用户不在白名单中，请联系管理员开通访问权限" };
-  }
   const pwd = String(password || "");
   if (pwd.length < 4) return { ok: false, error: "密码至少 4 位" };
 
   const users = readAuthUsers();
   const firstUser = Object.keys(users).length === 0;
   let user = users[userId];
+  if (!isAuthUserAllowed({ userId, username: String(username || "").trim(), isAdmin: Boolean(user?.isAdmin) })) {
+    return { ok: false, forbidden: true, error: "用户不在白名单中，请联系管理员开通访问权限" };
+  }
   if (!user) {
     const hashed = hashPassword(pwd);
     user = {

package/bin/lib/marketplace.mjs

@@ -392,10 +392,11 @@ export function listMarketplacePackages(workspaceRoot, opts = {}) {
   return { nodes, collections };
 }
 
-export function listMarketplaceFlowSnippets(workspaceRoot) {
+export function listMarketplaceFlowSnippets(workspaceRoot, opts = {}) {
   const root = workspacePackageRoot(workspaceRoot);
   const snippetsRoot = path.join(root, "flow-snippets");
   const snippets = [];
+  const requestedUserId = String(opts.userId || "").trim();
   if (!fs.existsSync(snippetsRoot)) return { snippets };
   for (const entry of fs.readdirSync(snippetsRoot, { withFileTypes: true })) {
     if (!entry.isDirectory()) continue;
@@ -405,6 +406,8 @@ export function listMarketplaceFlowSnippets(workspaceRoot) {
       const manifest = readYamlObject(path.join(dir, FLOW_SNIPPET_MANIFEST));
       if (!manifest) continue;
       const snippet = manifest.snippet && typeof manifest.snippet === "object" ? manifest.snippet : {};
+      const ownerUserId = String(manifest.ownerUserId || manifest.createdBy || "").trim();
+      if (requestedUserId && ownerUserId !== requestedUserId) continue;
       snippets.push({
         id: manifest.id || entry.name,
         version: manifest.version || version,
@@ -415,6 +418,7 @@ export function listMarketplaceFlowSnippets(workspaceRoot) {
         edgeCount: Number(manifest.edgeCount) || (Array.isArray(snippet.edges) ? snippet.edges.length : 0),
         createdAt: manifest.createdAt || "",
         updatedAt: manifest.updatedAt || "",
+        ownerUserId,
         packageDir: dir,
         snippet,
       });
@@ -449,12 +453,19 @@ export function deleteMarketplaceNodePackage(workspaceRoot, id, version, opts =
   return { ok: true, id, version, packageDir };
 }
 
-export function deleteMarketplaceFlowSnippetPackage(workspaceRoot, id, version) {
+export function deleteMarketplaceFlowSnippetPackage(workspaceRoot, id, version, opts = {}) {
   const packageDir = resolveWorkspaceFlowSnippetPackageDir(workspaceRoot, id, version);
   if (!packageDir) return { ok: false, error: "Invalid flow snippet id or version" };
-  if (!fs.existsSync(path.join(packageDir, FLOW_SNIPPET_MANIFEST))) {
+  const manifestPath = path.join(packageDir, FLOW_SNIPPET_MANIFEST);
+  if (!fs.existsSync(manifestPath)) {
     return { ok: false, error: `Flow snippet package not found: ${id}@${version}` };
   }
+  const manifest = readYamlObject(manifestPath) || {};
+  const ownerUserId = String(manifest.ownerUserId || manifest.createdBy || "").trim();
+  const requestedUserId = String(opts.userId || "").trim();
+  if (!requestedUserId || ownerUserId !== requestedUserId) {
+    return { ok: false, error: "Flow snippet permission denied" };
+  }
   fs.rmSync(packageDir, { recursive: true, force: true });
   const versionRoot = path.dirname(packageDir);
   try {
@@ -732,11 +743,13 @@ export function publishNodeFromInstance(workspaceRoot, payload = {}, options = {
   };
 }
 
-export function publishFlowSnippet(workspaceRoot, payload = {}) {
+export function publishFlowSnippet(workspaceRoot, payload = {}, opts = {}) {
   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 ownerUserId = String(opts.userId || "").trim();
+  if (!ownerUserId) return { ok: false, error: "Authentication required" };
 
   const rawSnippet = payload.snippet && typeof payload.snippet === "object" ? payload.snippet : {};
   const instances = rawSnippet.instances && typeof rawSnippet.instances === "object" ? rawSnippet.instances : {};
@@ -748,6 +761,11 @@ export function publishFlowSnippet(workspaceRoot, payload = {}) {
   const now = new Date().toISOString();
   const dest = resolveWorkspaceFlowSnippetPackageDir(workspaceRoot, id, version);
   if (!dest) return { ok: false, error: "Invalid snippet id or version" };
+  const existingManifest = readYamlObject(path.join(dest, FLOW_SNIPPET_MANIFEST));
+  if (existingManifest) {
+    const existingOwner = String(existingManifest.ownerUserId || existingManifest.createdBy || "").trim();
+    if (existingOwner !== ownerUserId) return { ok: false, error: "Flow snippet permission denied" };
+  }
   fs.mkdirSync(path.dirname(dest), { recursive: true });
   fs.rmSync(dest, { recursive: true, force: true });
   fs.mkdirSync(dest, { recursive: true });
@@ -759,6 +777,8 @@ export function publishFlowSnippet(workspaceRoot, payload = {}) {
     displayName: label,
     description: String(payload.description || "").trim(),
     tags: Array.isArray(payload.tags) ? payload.tags.map((x) => String(x).trim()).filter(Boolean) : [],
+    ownerUserId,
+    createdBy: ownerUserId,
     nodeCount,
     edgeCount: edges.length,
     createdAt: now,

package/bin/lib/ui-server.mjs

@@ -1601,11 +1601,15 @@ function workspaceSourceSlotForEdge(graph, edge) {
 function workspaceOutputSlotValueForEdge(graph, outputs, edge) {
   const sourceId = String(edge?.source || "");
   const slot = workspaceSourceSlotForEdge(graph, edge);
+  const out = outputs.get(sourceId);
+  const sourceIndex = workspaceHandleIndex(edge?.sourceHandle, "output");
+  const slotName = String(slot?.name || "").trim();
+  const isPrimaryOutput = !slot || slotName === "result" || slotName === "content" || sourceIndex === 0;
+  if (isPrimaryOutput && out != null && String(out).trim()) return String(out);
   if (slot && String(slot?.type || "") !== "node") {
     const value = workspaceSlotValue(slot);
     if (value.trim()) return value;
   }
-  const out = outputs.get(sourceId);
   if (out != null && String(out).trim()) return String(out);
   const instances = graph?.instances && typeof graph.instances === "object" ? graph.instances : {};
   return workspaceInstanceText(instances[sourceId]);
@@ -2022,6 +2026,26 @@ function workspaceDownstreamDisplayRequirements(graph, nodeId) {
   ].join("\n");
 }
 
+function workspaceNodeScopeGuardrails(graph, nodeId, inputValues = {}) {
+  const edges = Array.isArray(graph?.edges) ? graph.edges : [];
+  const directInputEdges = edges
+    .filter((edge) => String(edge?.target || "") === String(nodeId))
+    .filter((edge) => !isWorkspaceSemanticInputSlot(workspaceTargetSlotForEdge(graph, edge)));
+  const upstreamNodeIds = Array.from(new Set(directInputEdges.map((edge) => String(edge?.source || "").trim()).filter(Boolean)));
+  const inputNames = Object.keys(inputValues || {}).filter(Boolean);
+  return [
+    "## 当前节点上下文边界",
+    "",
+    "你只负责执行当前节点；`上游上下文`、已解析输入槽和节点任务就是本节点的业务上下文边界。",
+    upstreamNodeIds.length ? `当前直接上游节点：${upstreamNodeIds.map((id) => `\`${id}\``).join("、")}。` : "当前没有直接业务上游节点。",
+    inputNames.length ? `当前已解析输入槽：${inputNames.map((name) => `\`${name}\``).join("、")}。` : "当前没有已解析的具名业务输入槽。",
+    "不要为了理解本节点而读取或搜索整张 workspace、`workspace.graph.json`、正式 `flow.yaml`、历史 run/log 或其它未连接节点。",
+    "不要把下游展示节点已有内容、下游错误信息、其它分支节点内容当作本节点输入；下游输出要求只用于决定最终 JSON 的字段和格式。",
+    "只有当当前节点任务文本或上游输入明确要求读取/修改 `workspace.graph.json`、`flow.yaml` 或某个具体文件路径时，才可以打开对应文件。",
+    "如果完成任务所需信息不在当前节点任务、输入槽或上游上下文中，应明确说明缺少哪个上游输入，而不是扫描整张 workspace 猜测。",
+  ].join("\n");
+}
+
 function workspaceOutputProtocolRequirements(graph, nodeId) {
   const instance = graph?.instances?.[nodeId] || {};
   const outputSlots = Array.isArray(instance.output) ? instance.output : [];
@@ -2355,11 +2379,13 @@ function workspaceNodePrompt(graph, nodeId, upstreamText, skillsBlock, mcpBlock
   const instance = graph.instances[nodeId] || {};
   const body = workspaceResolveBodyPlaceholders(instance.body || "", inputValues).trim();
   const label = String(instance.label || nodeId).trim();
+  const scopeGuardrails = workspaceNodeScopeGuardrails(graph, nodeId, inputValues);
   const downstreamRequirements = workspaceDownstreamDisplayRequirements(graph, nodeId);
   const outputProtocolRequirements = workspaceOutputProtocolRequirements(graph, nodeId);
   return [
     "你正在执行 AgentFlow Workspace 画布中的一个临时节点。",
     "按 Workspace 输出协议返回该节点要传给下游展示/后续节点的数据。",
+    scopeGuardrails,
     workspaceSearchGuardrailsBlock(),
     skillsBlock ? `\n## Available Skills\n\n${skillsBlock}` : "",
     mcpBlock ? `\n## Available MCP\n\n${mcpBlock}` : "",
@@ -4816,7 +4842,7 @@ export function startUiServer({
 
     if (req.method === "GET" && url.pathname === "/api/marketplace/flow-snippets") {
       try {
-        json(res, 200, listMarketplaceFlowSnippets(root));
+        json(res, 200, listMarketplaceFlowSnippets(root, userCtx));
       } catch (e) {
         json(res, 500, { error: (e && e.message) || String(e) });
       }
@@ -4847,7 +4873,7 @@ export function startUiServer({
         return;
       }
       try {
-        const result = deleteMarketplaceFlowSnippetPackage(root, id, version);
+        const result = deleteMarketplaceFlowSnippetPackage(root, id, version, userCtx);
         json(res, result.ok ? 200 : 400, result);
       } catch (e) {
         json(res, 500, { ok: false, error: (e && e.message) || String(e) });
@@ -4926,7 +4952,7 @@ export function startUiServer({
         return;
       }
       try {
-        const result = publishFlowSnippet(root, payload || {});
+        const result = publishFlowSnippet(root, payload || {}, userCtx);
         json(res, result.ok ? 200 : 400, result);
       } catch (e) {
         json(res, 500, { ok: false, error: (e && e.message) || String(e) });