@ai-setting/roy-agent-core 1.7.53 → 1.7.56

package/dist/shared/@ai-setting/{roy-agent-core-vvxb9522.js → roy-agent-core-0bmk44ye.js}

@@ -1,13 +1,13 @@
 import {
   isValidSessionId
-} from "./roy-agent-core-yd21n6c7.js";
+} from "./roy-agent-core-bwzy00t2.js";
 import {
   TAG_MAX_COUNT,
   TAG_MIN_COUNT
-} from "./roy-agent-core-7evvpfwc.js";
+} from "./roy-agent-core-5rxs0ra3.js";
 import {
   validateWorkflowDefinition
-} from "./roy-agent-core-na73mym1.js";
+} from "./roy-agent-core-202v00x4.js";
 import {
   getCurrentBgTaskId
 } from "./roy-agent-core-c1v263jn.js";
@@ -18,13 +18,14 @@ import {
 import {
   TracedAs,
   init_decorator
-} from "./roy-agent-core-dsevjbck.js";
+} from "./roy-agent-core-b599jgyd.js";
 import {
   createLogger,
   init_logger
 } from "./roy-agent-core-8seq65bp.js";
 import {
-  __legacyDecorateClassTS
+  __legacyDecorateClassTS,
+  __require
 } from "./roy-agent-core-fs0mn2jk.js";
 
 // src/env/workflow/tools/ask-user-tool.ts
@@ -480,8 +481,25 @@ var logger5 = createLogger("workflow-validate-tool");
 var WorkflowValidateInputSchema = z6.object({
   definition: z6.any().optional().describe("Workflow definition object (alternative to definition_yaml)"),
   definition_yaml: z6.string().optional().describe("Workflow definition as YAML or JSON string"),
-  yaml: z6.string().optional().describe("Alias for definition_yaml — workflow definition as YAML or JSON string")
+  yaml: z6.string().optional().describe("Alias for definition_yaml — workflow definition as YAML or JSON string"),
+  file: z6.string().optional().describe("Path to a YAML/JSON file to validate. Use this INSTEAD of passing " + "`$(cat /path)` — shell substitutions are NOT expanded by this tool.")
 });
+function isAllowedPath(absPath) {
+  const cwd = process.cwd();
+  const normalized = absPath.replace(/\\/g, "/");
+  if (normalized === cwd || normalized.startsWith(`${cwd}/`))
+    return true;
+  if (normalized === "/tmp" || normalized.startsWith("/tmp/"))
+    return true;
+  return false;
+}
+function detectShellSubstitution(text) {
+  const trimmed = text.trim();
+  const looksLikeSubstitution = /^\$\(.*\)$/.test(trimmed) || /^`.*`$/.test(trimmed) || /\$\(\s*cat\s+/.test(trimmed) || /`\s*cat\s+/.test(trimmed);
+  if (!looksLikeSubstitution)
+    return;
+  return "Shell substitutions such as `$(cat /path)` are NOT expanded by this tool — the " + "string is passed to the YAML parser verbatim, which is why you saw " + "`Parsed definition is not an object`. Pass the path directly instead: " + 'workflow_validate({ file: "/tmp/x.yaml" }).';
+}
 function createWorkflowValidateTool(_workflowService) {
   return {
     name: "workflow_validate",
@@ -493,13 +511,56 @@ function createWorkflowValidateTool(_workflowService) {
         let definition;
         if (params.definition && typeof params.definition === "object") {
           definition = params.definition;
+        } else if (params.file && typeof params.file === "string") {
+          const fs = await import("node:fs/promises");
+          const nodePath = await import("node:path");
+          const abs = nodePath.resolve(params.file);
+          if (!isAllowedPath(abs)) {
+            return {
+              success: false,
+              output: "",
+              error: `Refusing to read outside the working directory or /tmp: ${abs}. Copy the file into CWD or /tmp first.`,
+              metadata: { execution_time_ms: 0 }
+            };
+          }
+          let raw;
+          try {
+            raw = await fs.readFile(abs, "utf-8");
+          } catch (readErr) {
+            const code = readErr?.code;
+            return {
+              success: false,
+              output: "",
+              error: code === "ENOENT" ? `Workflow file not found: ${abs}. Check the path (it is resolved against CWD: ${process.cwd()}).` : `Failed to read workflow file ${abs}: ${readErr instanceof Error ? readErr.message : String(readErr)}`,
+              metadata: { execution_time_ms: 0 }
+            };
+          }
+          try {
+            definition = yaml2.parse(raw);
+          } catch (yamlErr) {
+            return {
+              success: false,
+              output: "",
+              error: `Invalid YAML in ${abs}: ${yamlErr instanceof Error ? yamlErr.message : String(yamlErr)}`,
+              metadata: { execution_time_ms: 0 }
+            };
+          }
         } else {
           const yamlText = params.yaml ?? params.definition_yaml;
           if (!yamlText || typeof yamlText !== "string") {
             return {
               success: false,
               output: "",
-              error: "Must provide either 'definition' (object), 'definition_yaml', or 'yaml' (string)",
+              error: "Must provide either 'definition' (object), 'file' (path), 'definition_yaml', or 'yaml' (string)",
+              metadata: { execution_time_ms: 0 }
+            };
+          }
+          const substitutionHint = detectShellSubstitution(yamlText);
+          if (substitutionHint) {
+            return {
+              success: false,
+              output: "",
+              error: substitutionHint,
               metadata: { execution_time_ms: 0 }
             };
           }
@@ -518,7 +579,7 @@ function createWorkflowValidateTool(_workflowService) {
           return {
             success: false,
             output: "",
-            error: "Parsed definition is not an object",
+            error: `Parsed definition is not an object (got ${definition === null ? "null" : typeof definition}). If you passed a file path as a string, use workflow_validate({ file: "/path/to.yaml" }) ` + "instead of embedding `$(cat ...)` — shell substitutions are not expanded here.",
             metadata: { execution_time_ms: 0 }
           };
         }
@@ -803,7 +864,7 @@ class RunWorkflowToolRunner {
 __legacyDecorateClassTS([
   TracedAs("workflow.run-workflow-tool.execute", {
     recordParams: true,
-    recordResult: true
+    recordResult: false
   })
 ], RunWorkflowToolRunner.prototype, "execute", null);
 
@@ -845,7 +906,7 @@ class RunWorkflowLifecycleTracer {
 __legacyDecorateClassTS([
   TracedAs("workflow.run-tool.pre-attach", {
     recordParams: true,
-    recordResult: true
+    recordResult: false
   })
 ], RunWorkflowLifecycleTracer.prototype, "execute", null);
 function createRunWorkflowTool(workflowService, hooks) {

package/dist/shared/@ai-setting/{roy-agent-core-k8b440n3.js → roy-agent-core-16t0zfbk.js}

@@ -1,7 +1,7 @@
 import {
   init_env_context,
   init_env_event
-} from "./roy-agent-core-5apmk4qw.js";
+} from "./roy-agent-core-jszgaevt.js";
 import {
   __esm
 } from "./roy-agent-core-fs0mn2jk.js";

package/dist/shared/@ai-setting/{roy-agent-core-4z3rq5gw.js → roy-agent-core-1pnfkspm.js}

@@ -1,9 +1,9 @@
 import {
   init_context
-} from "./roy-agent-core-k8b440n3.js";
+} from "./roy-agent-core-16t0zfbk.js";
 import {
   getEnvContext
-} from "./roy-agent-core-5apmk4qw.js";
+} from "./roy-agent-core-jszgaevt.js";
 import {
   __esm
 } from "./roy-agent-core-fs0mn2jk.js";

package/dist/shared/@ai-setting/{roy-agent-core-na73mym1.js → roy-agent-core-202v00x4.js}

@@ -1,7 +1,7 @@
 import {
   DAGManager,
   init_dag_manager
-} from "./roy-agent-core-8s9jd2qy.js";
+} from "./roy-agent-core-nra8vfrs.js";
 
 // src/env/workflow/utils/node-output-contracts.ts
 var VIRTUAL_OUTPUT_FIELD = "output";
@@ -315,6 +315,167 @@ function formatTemplateContractFindings(findings) {
 
 // src/env/workflow/utils/validate-workflow-definition.ts
 init_dag_manager();
+
+// src/env/workflow/utils/shell-dialect-lint.ts
+var RULES = [
+  {
+    name: "pipefail",
+    re: /\bset\s+(?:-[A-Za-z]+\s+)*-?[A-Za-z]*o[A-Za-z]*\s+pipefail\b/,
+    fix: "dash 不支持 set -o pipefail（含 set -euo pipefail）。改用落文件再取退出码: " + "`cmd > /tmp/o 2>&1; RC=$?; cat /tmp/o; exit $RC`"
+  },
+  {
+    name: "PIPESTATUS",
+    re: /\$\{PIPESTATUS\[/,
+    fix: "dash 不支持 ${PIPESTATUS[n]}。改用把管道左端输出落文件，再单独取 $?: " + "`cmd > /tmp/o 2>&1; RC=$?`"
+  },
+  {
+    name: "substring-replace",
+    re: /\$\{[A-Za-z_][A-Za-z0-9_]*\/\//,
+    fix: "dash 不支持 ${VAR//a/b}。改用 tr 或 sed: " + '`V=$(echo "$V" | tr -d ".")`'
+  },
+  {
+    name: "BASH_SOURCE",
+    re: /\$\{BASH_SOURCE/,
+    fix: "dash 不支持 ${BASH_SOURCE[0]}。改用 $0（或显式写绝对路径）"
+  },
+  {
+    name: "process-substitution",
+    re: /(?:^|[\s;&|(])[<>]\([^)]/,
+    fix: "dash 不支持进程替换 <(cmd) / >(cmd)。改用显式 bash 或临时文件: " + "`bash -c 'diff <(a) <(b)'` 或 `a > /tmp/a; b > /tmp/b; diff /tmp/a /tmp/b`"
+  },
+  {
+    name: "here-string",
+    re: /(?<!<)<<<\s*[^\s<]/,
+    fix: "dash 不支持 here-string <<<。改用 printf 管道: " + '`printf "%s\\n" "$X" | cmd`'
+  },
+  {
+    name: "ansi-c-quote",
+    re: /\$'(?:[^'\\]|\\.)*\\/,
+    fix: "dash 不支持 ANSI-C 转义 $'...'（会静默保留反斜杠）。改用 printf: " + '`printf "a\\tb\\n"`'
+  },
+  {
+    name: "dbl-bracket",
+    re: /\[\[(?=[\s\-!$\u0027])/,
+    fix: 'dash 不支持 [[ ]]。改用 [ ]（注意 quote 变量: `[ -f "$F" ]`）'
+  },
+  {
+    name: "source",
+    re: /(?:^|[\s;&|(])source\s+(?:~|\$|\.|\/)[^\s;|&]*|(?:^|[\s;&|(])source\s+[A-Za-z0-9_.-]+\.sh\b/,
+    fix: "dash 不支持 source。改用 POSIX 点命令: `. <file>`"
+  },
+  {
+    name: "array",
+    re: /(^|[\s;&|(])([A-Za-z_][A-Za-z0-9_]*)=\(/,
+    fix: "dash 不支持数组。改用空格分隔的字符串 + for 循环: " + '`PYS="3.12 3.13"; for p in $PYS; do ...; done`'
+  },
+  {
+    name: "function-keyword",
+    re: /(^|\n)[ \t]*function\s+[A-Za-z_]/,
+    fix: "dash 不支持 function 关键字。改用 `name() { ... }`"
+  },
+  {
+    name: "RANDOM",
+    re: /\$RANDOM\b/,
+    fix: "dash 不支持 $RANDOM（静默为空）。改用 " + "`awk -v s=$(date +%s%N) 'BEGIN{srand(s); print int(rand()*32768)}'`"
+  },
+  {
+    name: "echo-e",
+    re: /(^|[\s;&|(])echo\s+-[ne]*e[A-Za-z]*\b/,
+    fix: 'dash 的 echo 不解析 -e（会输出字面 "-e"）。改用 printf: `printf "%s\\n" "$X"`'
+  }
+];
+function stripComments(command) {
+  const lines = command.split(`
+`);
+  const out = [];
+  for (const line of lines) {
+    let inSingle = false;
+    let inDouble = false;
+    let cut = -1;
+    for (let i = 0;i < line.length; i++) {
+      const ch = line[i];
+      if (ch === "\\" && !inSingle) {
+        i++;
+        continue;
+      }
+      if (ch === "'" && !inDouble) {
+        inSingle = !inSingle;
+        continue;
+      }
+      if (ch === '"' && !inSingle) {
+        inDouble = !inDouble;
+        continue;
+      }
+      if (ch === "#" && !inSingle && !inDouble) {
+        const prev = i === 0 ? " " : line[i - 1];
+        if (/\s/.test(prev)) {
+          cut = i;
+          break;
+        }
+      }
+    }
+    out.push(cut >= 0 ? line.slice(0, cut) : line);
+  }
+  return out.join(`
+`);
+}
+function stripQuotedHeredocBodies(command) {
+  const lines = command.split(`
+`);
+  const out = [];
+  let delim = null;
+  for (const line of lines) {
+    if (delim !== null) {
+      if (line.trim() === delim) {
+        out.push(line);
+        delim = null;
+      }
+      continue;
+    }
+    const m = /<<-?\s*(?:'([^']+)'|"([^"]+)")/.exec(line);
+    out.push(line);
+    if (m)
+      delim = (m[1] ?? m[2] ?? "").trim();
+  }
+  return out.join(`
+`);
+}
+function stripForeignShellBodies(command) {
+  const re = /(\b(?:bash|sh)\s+-[a-z]*c[a-z]*\s+)(?:'[\s\S]*?'|"[\s\S]*?")/g;
+  return command.replace(re, "$1<foreign-shell-body>");
+}
+function isEntirelyBashInvocation(command) {
+  const re = /^(?:[A-Za-z_][A-Za-z0-9_]*=[^\s;|&]*\s+)*\/?(?:[\w./-]*\/)?bash\s+-(?:[a-z]*c[a-z]*)\s+(?:'[\s\S]*'|"[\s\S]*")\s*$/;
+  return re.test(command.trim());
+}
+function lintShellDialect(command) {
+  if (!command || typeof command !== "string")
+    return [];
+  const scannable = stripComments(stripForeignShellBodies(stripQuotedHeredocBodies(command)));
+  if (scannable.trim().length === 0)
+    return [];
+  if (isEntirelyBashInvocation(scannable))
+    return [];
+  const findings = [];
+  const seen = new Set;
+  for (const rule of RULES) {
+    if (seen.has(rule.name))
+      continue;
+    const m = rule.re.exec(scannable);
+    if (!m)
+      continue;
+    seen.add(rule.name);
+    const start = Math.max(0, m.index - 30);
+    const excerpt = scannable.slice(start, m.index + m[0].length + 40).replace(/\s+/g, " ").trim();
+    findings.push({ name: rule.name, fix: rule.fix, excerpt });
+  }
+  return findings;
+}
+function formatShellDialectFindings(nodeId, findings) {
+  return findings.map((f) => `[shell-dialect] node "${nodeId}" uses bash-only "${f.name}": ${f.fix} | near: ${f.excerpt}`);
+}
+
+// src/env/workflow/utils/validate-workflow-definition.ts
 function validateWorkflowDefinition(definition, options = {}) {
   if (!definition || typeof definition !== "object") {
     return {
@@ -352,8 +513,17 @@ function validateWorkflowDefinition(definition, options = {}) {
   const contractErrors = findings.filter((f) => f.severity === "error");
   const contractWarnings = findings.filter((f) => f.severity === "warning");
   const contractInfos = findings.filter((f) => f.severity === "info");
+  const dialectWarnings = [];
+  if (structural.valid && options.lintShellDialect !== false) {
+    try {
+      dialectWarnings.push(...collectShellDialectWarnings(definition));
+    } catch {}
+  }
   const errors = [...structural.errors, ...formatTemplateContractFindings(contractErrors)];
-  const warnings = formatTemplateContractFindings(contractWarnings);
+  const warnings = [
+    ...formatTemplateContractFindings(contractWarnings),
+    ...dialectWarnings
+  ];
   const infos = formatTemplateContractFindings(contractInfos);
   return {
     valid: structural.valid && contractErrors.length === 0,
@@ -363,5 +533,46 @@ function validateWorkflowDefinition(definition, options = {}) {
     ...findings.length > 0 ? { findings } : {}
   };
 }
+function extractToolCommands(config) {
+  if (!config || typeof config !== "object")
+    return [];
+  const out = [];
+  const COMMAND_KEYS = ["command", "cmd"];
+  const CONTAINER_KEYS = ["input", "inputs", "args"];
+  for (const key of COMMAND_KEYS) {
+    const v = config[key];
+    if (typeof v === "string")
+      out.push(v);
+  }
+  for (const key of CONTAINER_KEYS) {
+    const container = config[key];
+    if (!container || typeof container !== "object" || Array.isArray(container))
+      continue;
+    for (const cmdKey of COMMAND_KEYS) {
+      const v = container[cmdKey];
+      if (typeof v === "string")
+        out.push(v);
+    }
+  }
+  return out;
+}
+function collectShellDialectWarnings(definition) {
+  const def = definition;
+  if (!def || !Array.isArray(def.nodes))
+    return [];
+  const warnings = [];
+  for (const node of def.nodes) {
+    if (node?.type !== "tool")
+      continue;
+    const nodeId = typeof node.id === "string" ? node.id : String(node.id ?? "<unnamed>");
+    for (const command of extractToolCommands(node.config)) {
+      const findings = lintShellDialect(command);
+      if (findings.length > 0) {
+        warnings.push(...formatShellDialectFindings(nodeId, findings));
+      }
+    }
+  }
+  return warnings;
+}
 
 export { VIRTUAL_OUTPUT_FIELD, NODE_OUTPUT_CONTRACTS, getNodeOutputContract, hasClosedOutputContract, RESULT_INVALID_NODE_TYPES, getAgentDeclaredJsonFields, validateTemplateContracts, getTemplateContractErrors, getTemplateContractWarnings, formatTemplateContractFindings, validateWorkflowDefinition };