@fieldwangai/agentflow 0.1.30 → 0.1.31

package/bin/lib/user-env.mjs

@@ -0,0 +1,83 @@
+import fs from "fs";
+import os from "os";
+import path from "path";
+
+import { getAgentflowUserEnvAbs, sanitizeAgentflowUserId } from "./paths.mjs";
+
+function normalizeEnvKey(key) {
+  return String(key || "").trim();
+}
+
+function isValidEnvKey(key) {
+  return /^[A-Za-z_][A-Za-z0-9_]*$/.test(key);
+}
+
+function readJsonObject(filePath) {
+  try {
+    if (!fs.existsSync(filePath)) return {};
+    const data = JSON.parse(fs.readFileSync(filePath, "utf-8"));
+    return data && typeof data === "object" && !Array.isArray(data) ? data : {};
+  } catch {
+    return {};
+  }
+}
+
+function getFromConfig(config, keyStr) {
+  if (!config || typeof config !== "object" || !keyStr) return undefined;
+  const parts = String(keyStr).trim().split(".");
+  let cur = config;
+  for (const p of parts) {
+    if (cur == null || typeof cur !== "object") return undefined;
+    cur = cur[p];
+  }
+  return cur != null ? String(cur) : undefined;
+}
+
+export function normalizeUserEnvRows(rawRows) {
+  const rows = Array.isArray(rawRows) ? rawRows : [];
+  const byKey = new Map();
+  for (const item of rows) {
+    if (!item || typeof item !== "object") continue;
+    const key = normalizeEnvKey(item.key);
+    if (!key || !isValidEnvKey(key)) continue;
+    byKey.set(key, String(item.value ?? ""));
+  }
+  return Array.from(byKey.entries())
+    .sort(([a], [b]) => a.localeCompare(b))
+    .map(([key, value]) => ({ key, value }));
+}
+
+export function readUserEnvRows(userId) {
+  const data = readJsonObject(getAgentflowUserEnvAbs(userId));
+  return normalizeUserEnvRows(Array.isArray(data.env) ? data.env : []);
+}
+
+export function readUserEnvObject(userId) {
+  const out = {};
+  for (const row of readUserEnvRows(userId)) {
+    out[row.key] = row.value;
+  }
+  return out;
+}
+
+export function writeUserEnvRows(userId, rows) {
+  const normalized = normalizeUserEnvRows(rows);
+  const safeUserId = sanitizeAgentflowUserId(userId);
+  const filePath = getAgentflowUserEnvAbs(safeUserId);
+  fs.mkdirSync(path.dirname(filePath), { recursive: true });
+  fs.writeFileSync(filePath, JSON.stringify({ version: 1, env: normalized }, null, 2) + "\n", "utf-8");
+  return normalized;
+}
+
+export function resolveUserEnvValue(key, userId) {
+  const keyStr = normalizeEnvKey(key);
+  if (!keyStr) return "";
+  const userEnv = readUserEnvObject(userId);
+  if (Object.prototype.hasOwnProperty.call(userEnv, keyStr)) return String(userEnv[keyStr] ?? "");
+  const processValue = process.env[keyStr];
+  if (processValue != null && processValue !== "") return String(processValue);
+  const configPath = path.join(os.homedir(), ".cursor", "config.json");
+  const fromConfig = getFromConfig(readJsonObject(configPath), keyStr);
+  return fromConfig !== undefined ? fromConfig : "";
+}
+

package/bin/pipeline/get-env.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /**
- * apply -ai get-env：按 key 从系统环境变量与 ~/.cursor/config.json 读取 value。
- * 优先级：先查 process.env[key]，若无则查 ~/.cursor/config.json（支持点号路径如 openai.apiKey）。
+ * apply -ai get-env：按 key 从用户私有 env、系统环境变量与 ~/.cursor/config.json 读取 value。
+ * 优先级：先查当前 AGENTFLOW_USER_ID 的私有 env，再查 process.env[key]，最后查 ~/.cursor/config.json（支持点号路径如 openai.apiKey）。
  *
  * 用法（apply 步骤，由 CLI 调用）：
  *   agentflow apply -ai get-env <workspaceRoot> <flowName> <uuid> <instanceId> <execId> <key>
@@ -15,39 +15,15 @@
 
 import fs from "fs";
 import path from "path";
-import os from "os";
 
 import { getRunDir } from "../lib/paths.mjs";
+import { resolveUserEnvValue } from "../lib/user-env.mjs";
 import { writeResult } from "./write-result.mjs";
 import { outputDirForNode, outputNodeBasename } from "./get-exec-id.mjs";
 
-function getFromConfig(config, keyStr) {
-  if (!config || typeof config !== "object" || !keyStr) return undefined;
-  const parts = String(keyStr).trim().split(".");
-  let cur = config;
-  for (const p of parts) {
-    if (cur == null || typeof cur !== "object") return undefined;
-    cur = cur[p];
-  }
-  return cur != null ? String(cur) : undefined;
-}
-
 function resolveValue(keyStr) {
-  let value = "";
-  if (!keyStr) return value;
-  value = process.env[keyStr] ?? "";
-  if (value === "") {
-    const configPath = path.join(os.homedir(), ".cursor", "config.json");
-    if (fs.existsSync(configPath)) {
-      try {
-        const raw = fs.readFileSync(configPath, "utf-8");
-        const config = JSON.parse(raw);
-        const fromConfig = getFromConfig(config, keyStr);
-        if (fromConfig !== undefined) value = fromConfig;
-      } catch (_) {}
-    }
-  }
-  return value;
+  if (!keyStr) return "";
+  return resolveUserEnvValue(keyStr, process.env.AGENTFLOW_USER_ID || "");
 }
 
 function main() {

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

@@ -24,6 +24,7 @@
 
 import { spawnSync } from "child_process";
 import fs from "fs";
+import os from "os";
 import path from "path";
 import { fileURLToPath } from "url";
 
@@ -337,9 +338,9 @@ function emitCdWorkspaceNode(workspaceRoot, flowName, uuid, instanceId, execId)
   if (mode === "pop") {
     next = normalizeWorkspaceContext(workspaceContext.previous, workspaceRoot, flowName);
   } else {
-    const target = resolveWorkspaceTarget(inputs.target || inputs.path || inputs.repoPath || "", workspaceContext);
+    const target = resolveWorkspaceTarget(inputs.path || inputs.target || inputs.repoPath || "", workspaceContext);
     if (!fs.existsSync(target) || !fs.statSync(target).isDirectory()) {
-      throw new Error(`control_cd_workspace: target directory not found: ${target}`);
+      throw new Error(`control_cd_workspace: path directory not found: ${target}`);
     }
     next = {
       version: 1,
@@ -358,6 +359,25 @@ function emitCdWorkspaceNode(workspaceRoot, flowName, uuid, instanceId, execId)
   return emitLocalNoopPrompt(workspaceRoot, runDir, instanceId, "cd-workspace", `Workspace context switched to: ${next.cwd}\n`);
 }
 
+function emitUserWorkspaceNode(workspaceRoot, flowName, uuid, instanceId, execId) {
+  const runDir = getRunDir(workspaceRoot, flowName, uuid);
+  const { workspaceContext } = resolveNodeRuntimeContexts(workspaceRoot, flowName, uuid, instanceId);
+  const homeDir = path.resolve(os.homedir());
+  const next = {
+    version: 1,
+    label: "home",
+    cwd: homeDir,
+    workspaceRoot: homeDir,
+    pipelineWorkspace: workspaceContext.pipelineWorkspace || path.resolve(workspaceRoot),
+    flowDir: workspaceContext.flowDir,
+    previous: workspaceContext,
+  };
+  writeOutputSlot(runDir, instanceId, execId, "workspaceContext", JSON.stringify(next));
+  writeOutputSlot(runDir, instanceId, execId, "cwd", next.cwd);
+  writeResult(workspaceRoot, flowName, uuid, instanceId, { status: "success", message: `user workspace: ${homeDir}` }, { execId });
+  return emitLocalNoopPrompt(workspaceRoot, runDir, instanceId, "user-workspace", `Workspace context switched to user home: ${homeDir}\n`);
+}
+
 function emitLoadSkillsNode(workspaceRoot, flowName, uuid, instanceId, execId) {
   const runDir = getRunDir(workspaceRoot, flowName, uuid);
   const { inputs, workspaceContext, skillsContext: existingSkills } = resolveNodeRuntimeContexts(workspaceRoot, flowName, uuid, instanceId);
@@ -981,16 +1001,18 @@ function main() {
     return;
   }
 
-  if (definitionId === "tool_git_checkout" || definitionId === "control_cd_workspace" || definitionId === "control_load_skills" || definitionId === "tool_print") {
+  if (definitionId === "tool_git_checkout" || definitionId === "control_cd_workspace" || definitionId === "control_user_workspace" || definitionId === "control_load_skills" || definitionId === "tool_print") {
     try {
       const promptPath =
         definitionId === "tool_git_checkout"
           ? emitGitCheckoutNode(workspaceRoot, flowName, uuid, instanceId, execId, resultPathRel)
           : definitionId === "control_cd_workspace"
             ? emitCdWorkspaceNode(workspaceRoot, flowName, uuid, instanceId, execId)
-            : definitionId === "control_load_skills"
-              ? emitLoadSkillsNode(workspaceRoot, flowName, uuid, instanceId, execId)
-              : emitToolPrintNode(workspaceRoot, flowName, uuid, instanceId, execId);
+            : definitionId === "control_user_workspace"
+              ? emitUserWorkspaceNode(workspaceRoot, flowName, uuid, instanceId, execId)
+              : definitionId === "control_load_skills"
+                ? emitLoadSkillsNode(workspaceRoot, flowName, uuid, instanceId, execId)
+                : emitToolPrintNode(workspaceRoot, flowName, uuid, instanceId, execId);
       writeCacheJsonForNode(workspaceRoot, flowName, uuid, instanceId, execId);
       logToRunTag(workspaceRoot, flowName, uuid, "pre-process", { event: "runtime-context-node", instanceId, definitionId });
       console.log(JSON.stringify({

package/bin/pipeline/run-tool-nodejs.mjs

@@ -19,6 +19,7 @@ import path from "path";
 import { fileURLToPath } from "url";
 
 import { getRunDir } from "../lib/paths.mjs";
+import { readUserEnvObject } from "../lib/user-env.mjs";
 import { validateAndParse } from "./validate-script-output.mjs";
 import { writeResult } from "./write-result.mjs";
 import { loadExecId, outputNodeBasename, outputDirForNode } from "./get-exec-id.mjs";
@@ -29,6 +30,10 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const MAX_RETRIES = 3;
 const RETRY_DELAY_MS = 1000;
 
+function runtimeEnv() {
+  return { ...process.env, ...readUserEnvObject(process.env.AGENTFLOW_USER_ID || "") };
+}
+
 function runOnce(workspaceRoot, flowName, uuid, instanceId, execId, scriptArgs) {
   const runDir = getRunDir(workspaceRoot, flowName, uuid);
   const outputDir = path.join(runDir, outputDirForNode(instanceId));
@@ -41,11 +46,13 @@ function runOnce(workspaceRoot, flowName, uuid, instanceId, execId, scriptArgs)
           cwd: workspaceRoot,
           shell: false,
           stdio: ["inherit", "pipe", "pipe"],
+          env: runtimeEnv(),
         })
       : spawnSync(normalizedCmd, [], {
           cwd: workspaceRoot,
           shell: true,
           stdio: ["inherit", "pipe", "pipe"],
+          env: runtimeEnv(),
         });
 
   const stdout = child.stdout?.toString("utf-8") ?? "";

package/builtin/nodes/agent_subAgent.md

@@ -1,7 +1,7 @@
 ---
-# 内置节点：SubAgent
-description: 利用 SubAgent 执行任务；可接收 workspaceContext 切换执行工作区，并接收 skillsContext 注入已加载 skills。
-displayName: SubAgent
+# 内置节点：子 Agent
+description: 利用子 Agent 执行任务；可接收 workspaceContext 切换执行工作区，并接收 skillsContext 注入已加载 skills。
+displayName: 子 Agent
 input:
   - type: node
     name: prev
@@ -16,5 +16,8 @@ output:
   - type: node
     name: next
     default: ""
+  - type: text
+    name: result
+    default: ""
 ---
 ${USER_PROMPT}

package/builtin/nodes/control_cd_workspace.md

@@ -4,19 +4,21 @@ description: |
   Switch the runtime workspace context for downstream nodes without changing the AgentFlow pipeline workspace.
 
   Modes:
-  - `set`: switch to target, keep previous stack unchanged.
-  - `push`: switch to target and save the incoming context as previous.
+  - `set`: switch to path, keep previous stack unchanged.
+  - `push`: switch to path and save the incoming context as previous.
   - `pop`: restore the previous context.
 
-  `target` supports `${workspaceRoot}`, `${pipelineWorkspace}`, `${flowDir}`, absolute paths, and paths relative to current workspace context.
+  `path` supports `${workspaceRoot}`, `${pipelineWorkspace}`, `${flowDir}`, absolute paths, and paths relative to the input workspace context.
 displayName: CD Workspace
 input:
   - type: node
     name: prev
     default: ""
   - type: text
-    name: target
-    default: "${pipelineWorkspace}"
+    name: path
+    default: ""
+    required: true
+    showOnNode: true
   - type: text
     name: mode
     default: "set"
@@ -40,4 +42,4 @@ output:
     name: previous
     default: ""
 ---
-Switch downstream execution to `${target}` using mode `${mode}`.
+Switch downstream execution to `${path}` using mode `${mode}`.

package/builtin/nodes/control_load_skills.md

@@ -22,6 +22,8 @@ input:
   - type: text
     name: skillKeys
     default: ""
+    required: true
+    showOnNode: true
   - type: text
     name: mergeMode
     default: "replace"

package/builtin/nodes/control_user_workspace.md

@@ -0,0 +1,20 @@
+---
+# Built-in node: User Workspace
+description: Output a workspace context pointing to the current user's home directory.
+displayName: User Workspace
+input:
+  - type: node
+    name: prev
+    default: ""
+output:
+  - type: node
+    name: next
+    default: ""
+  - type: text
+    name: workspaceContext
+    default: ""
+  - type: file
+    name: cwd
+    default: ""
+---
+Use the current user's home directory as downstream workspace context.

package/builtin/nodes/display_ascii.md

@@ -9,9 +9,14 @@ input:
   - type: text
     name: content
     default: ""
+    required: true
+    showOnNode: true
 output:
   - type: text
     name: content
     default: ""
+  - type: node
+    name: next
+    default: ""
 ---
 ${content}

package/builtin/nodes/display_markdown.md

@@ -9,9 +9,14 @@ input:
   - type: text
     name: content
     default: ""
+    required: true
+    showOnNode: true
 output:
   - type: text
     name: content
     default: ""
+  - type: node
+    name: next
+    default: ""
 ---
 ${content}

package/builtin/nodes/display_mermaid.md

@@ -9,9 +9,14 @@ input:
   - type: text
     name: content
     default: ""
+    required: true
+    showOnNode: true
 output:
   - type: text
     name: content
     default: ""
+  - type: node
+    name: next
+    default: ""
 ---
 ${content}

package/builtin/nodes/tool_git_checkout.md

@@ -16,9 +16,12 @@ input:
   - type: text
     name: repoUrl
     default: ""
+    required: true
+    showOnNode: true
   - type: text
     name: branch
     default: ""
+    showOnNode: true
   - type: text
     name: targetDir
     default: ""