@yanlinglabs/winter-agent-runtime 0.0.41 → 0.0.43

package/dist/{index-hdvvezf8.js → index-bh1ve8ws.js}

@@ -7,7 +7,6 @@ import {
   computeActiveSlotSet,
   resolveSlotToProvider,
   shellWords,
-  escapeRegExpLiteral,
   validatePermissionRuleString,
   getRegisteredTool,
   listRegisteredTools,
@@ -86,7 +85,7 @@ import {
   providerCredentialRef2,
   createModelClassifier2,
   selectClassifierRoute2
-} from "./index-z9yngxj4.js";
+} from "./index-kqc3tdph.js";
 import {
   createKeychainCredentialStore,
   createKeychainSecretReader,
@@ -2243,7 +2242,7 @@ var ALL_TIER_REFUSED_ENV = [
   disableCronEnvName(WINTER_BRAND5),
   mcpOAuthTestStoreEnvName(WINTER_BRAND5)
 ];
-function escapeRegExpLiteral2(literal) {
+function escapeRegExpLiteral(literal) {
   return literal.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 var HOST_MANAGED_REFUSED_ENV_PATTERNS = [
@@ -2258,7 +2257,7 @@ var HOST_MANAGED_REFUSED_ENV_PATTERNS = [
   /_BASE_URL$/,
   /_API_BASE$/,
   /^CLAUDE_CODE_USE_/,
-  new RegExp(`^${escapeRegExpLiteral2(envName3(WINTER_BRAND5, "USE_"))}`)
+  new RegExp(`^${escapeRegExpLiteral(envName3(WINTER_BRAND5, "USE_"))}`)
 ];
 var HOST_MANAGED_DISABLED_SETTINGS_KEYS = ["apiKeyHelper"];
 function filterSettingsEnv(env, tier, opts) {
@@ -2333,29 +2332,30 @@ var BUILTIN_OUTPUT_STYLES = [
 ];
 var BUILTIN_OUTPUT_STYLE_NAMES = BUILTIN_OUTPUT_STYLES.map((s) => s.name);
 var STYLE_NAME = /^[A-Za-z0-9_-]+$/;
+var TRUE_WORDS = new Set(["1", "true", "yes", "on"]);
+var FALSE_WORDS = new Set(["0", "false", "no", "off"]);
 function claudeBoolean(value) {
   if (typeof value === "boolean")
     return value;
   if (typeof value !== "string" && typeof value !== "number")
     return;
-  const normalized = String(value).toLowerCase().trim();
-  if (["1", "true", "yes", "on"].includes(normalized))
+  const word = String(value).toLowerCase().trim();
+  if (TRUE_WORDS.has(word))
     return true;
-  if (["0", "false", "no", "off"].includes(normalized))
+  if (FALSE_WORDS.has(word))
     return false;
   return;
 }
+var EXCERPT_MAX = 100;
+var HEADING_LINE = /^#+\s+(.+)$/;
 function bodyExcerpt(body, def) {
-  for (const rawLine of body.split(`
-`)) {
-    const line = rawLine.trim();
-    if (line === "")
-      continue;
-    const heading = /^#+\s+(.+)$/.exec(line);
-    const text = heading?.[1] ?? line;
-    return text.length > 100 ? `${text.slice(0, 97)}...` : text;
-  }
-  return def;
+  const line = body.split(`
+`).map((l) => l.trim()).find((l) => l.length > 0);
+  if (line === undefined)
+    return def;
+  const heading = HEADING_LINE.exec(line);
+  const text = heading !== null ? heading[1] : line;
+  return text.length > EXCERPT_MAX ? `${text.slice(0, EXCERPT_MAX - 3)}...` : text;
 }
 function parseStyleFile(path, fallbackName, source) {
   let raw;
@@ -2398,21 +2398,20 @@ function parsePluginStyleFile(path, pluginName, fallbackBaseName) {
   } catch {
     return null;
   }
-  const { attrs, body: parsedBody } = parseFrontmatter(raw);
-  const declaredNameRaw = attrs["name"];
-  const declaredName = declaredNameRaw !== null && declaredNameRaw !== undefined ? String(declaredNameRaw) : undefined;
-  const baseName = declaredName !== undefined && declaredName.length > 0 ? declaredName : fallbackBaseName;
+  const { attrs, body } = parseFrontmatter(raw);
+  const nameAttr = attrs["name"];
+  const declaredName = nameAttr === null || nameAttr === undefined ? "" : String(nameAttr);
+  const baseName = declaredName.length > 0 ? declaredName : fallbackBaseName;
   if (!STYLE_NAME.test(baseName))
     return null;
-  const descriptionRaw = attrs["description"];
-  const descriptionCoerced = typeof descriptionRaw === "string" || typeof descriptionRaw === "number" || typeof descriptionRaw === "boolean" ? String(descriptionRaw).trim() : "";
-  const description = descriptionCoerced.length > 0 ? descriptionCoerced : bodyExcerpt(parsedBody, `Output style from ${pluginName} plugin`);
-  const keepCodingInstructions = claudeBoolean(attrs["keep-coding-instructions"]) === true;
+  const descriptionAttr = attrs["description"];
+  const declaredDescription = typeof descriptionAttr === "string" || typeof descriptionAttr === "number" || typeof descriptionAttr === "boolean" ? String(descriptionAttr).trim() : "";
+  const description = declaredDescription.length > 0 ? declaredDescription : bodyExcerpt(body, `Output style from ${pluginName} plugin`);
   return {
     name: `${pluginName}:${baseName}`,
     description,
-    body: capBytes(neutralizeReminderTags(parsedBody.trim()), OUTPUT_STYLE_MAX_BYTES).text,
-    keepCodingInstructions,
+    body: capBytes(neutralizeReminderTags(body.trim()), OUTPUT_STYLE_MAX_BYTES).text,
+    keepCodingInstructions: claudeBoolean(attrs["keep-coding-instructions"]) === true,
     source: "plugin",
     replacementDowngraded: false
   };
@@ -2488,15 +2487,24 @@ var ENVIRONMENT_HEADING = "# Environment";
 var ENVIRONMENT_LEAD_IN = "You have been invoked in the following environment: ";
 var WINTER_PRODUCT_LINE = "Winter runs this session as an agent runtime on behalf of a host application; the host decides how your output is shown to the user.";
 function shellName(raw) {
-  const shell = raw.trim().length > 0 ? raw : "unknown";
-  if (shell.includes("zsh"))
+  if (raw.trim().length === 0)
+    return "unknown";
+  if (raw.includes("zsh"))
     return "zsh";
-  if (shell.includes("bash"))
+  if (raw.includes("bash"))
     return "bash";
-  return shell;
+  return raw;
 }
 function bullets(items) {
-  return items.flatMap((item) => typeof item === "string" ? [` - ${item}`] : item.map((sub) => `  - ${sub}`));
+  const lines = [];
+  for (const item of items) {
+    if (typeof item === "string")
+      lines.push(` - ${item}`);
+    else
+      for (const member of item)
+        lines.push(`  - ${member}`);
+  }
+  return lines;
 }
 function modelLines(input) {
   const lines = [];
@@ -2690,13 +2698,21 @@ import { existsSync as existsSync2, readFileSync as readFileSync2, realpathSync,
 import { homedir as homedir2 } from "node:os";
 import { dirname, resolve as resolve2 } from "node:path";
 var DEFAULT_MAX_DEPTH2 = 5;
-var IMPORT_TOKEN_RE = /(^|\s)@((?:[^\s\\]|\\ )+)/g;
-function isValidImportPath(path) {
+function importTokenPattern() {
+  return /(^|\s)@((?:[^\s\\]|\\ )+)/g;
+}
+var BARE_IMPORT_START = /^[A-Za-z0-9._-]/;
+function importTokenPath(rawToken) {
+  const hash = rawToken.indexOf("#");
+  const withoutFragment = hash === -1 ? rawToken : rawToken.slice(0, hash);
+  if (withoutFragment.length === 0)
+    return;
+  const path = withoutFragment.replaceAll("\\ ", " ");
   if (path.startsWith("./") || path.startsWith("~/"))
-    return true;
-  if (path.startsWith("/") && path !== "/")
-    return true;
-  return !path.startsWith("@") && !/^[#%^&*()]/.test(path) && /^[a-zA-Z0-9._-]/.test(path);
+    return path;
+  if (path.startsWith("/"))
+    return path === "/" ? undefined : path;
+  return BARE_IMPORT_START.test(path) ? path : undefined;
 }
 function resolveImportPath(token, containingFileDir) {
   if (token.startsWith("~/"))
@@ -2765,15 +2781,9 @@ function expandTextRun(text, containingFileDir, depth, ctx) {
   return parts.map((part, i) => i % 2 === 1 ? part : replaceImportTokens(part, containingFileDir, depth, ctx)).join("");
 }
 function replaceImportTokens(text, containingFileDir, depth, ctx) {
-  return text.replace(IMPORT_TOKEN_RE, (full, leading, rawToken) => {
-    let token = rawToken;
-    const hashIndex = token.indexOf("#");
-    if (hashIndex !== -1)
-      token = token.slice(0, hashIndex);
-    if (token.length === 0)
-      return full;
-    token = token.replace(/\\ /g, " ");
-    if (!isValidImportPath(token))
+  return text.replace(importTokenPattern(), (full, leading, rawToken) => {
+    const token = importTokenPath(rawToken);
+    if (token === undefined)
       return full;
     const resolvedPath = resolveImportPath(token, containingFileDir);
     if (ctx.tier !== "user") {
@@ -2905,9 +2915,9 @@ var INSTRUCTIONS_CONTEXT_LABELS = {
   user: " (user's private global instructions for all projects)"
 };
 function renderInstructionsContext(files) {
-  const entries = files.filter((f) => f.content.length > 0).map((f) => `Contents of ${f.path}${INSTRUCTIONS_CONTEXT_LABELS[f.kind]}:
+  const entries = files.filter((file) => file.content !== "").map((file) => `Contents of ${file.path}${INSTRUCTIONS_CONTEXT_LABELS[file.kind]}:
 
-${f.content.trim()}`);
+${file.content.trim()}`);
   if (entries.length === 0)
     return;
   return `${INSTRUCTIONS_CONTEXT_HEADER}
@@ -3444,17 +3454,37 @@ function scanPluginSkillsAt(skillsParentDir, pluginName) {
   }
   return out;
 }
-function resolvePluginSkills(root, pluginName, declared, warnings) {
-  const defaultSkills = scanPluginSkillsAt(join9(root, "skills"), pluginName);
-  const overridePaths = resolveManifestComponentOverride(root, pluginName, "skills", declared, true, warnings);
-  if (overridePaths === undefined)
-    return defaultSkills;
-  const overrideSkills = overridePaths.flatMap((path) => scanPluginSkillsAt(path, pluginName));
+function dedupeByName(entries) {
   const byName = new Map;
-  for (const entry of [...defaultSkills, ...overrideSkills])
+  for (const entry of entries)
     byName.set(entry.name, entry);
   return [...byName.values()];
 }
+function realPathOr(path) {
+  try {
+    return realpathSync3(path);
+  } catch {
+    return path;
+  }
+}
+function isInlineCommandsMap(declared) {
+  if (typeof declared !== "object" || declared === null || Array.isArray(declared))
+    return false;
+  const first = Object.values(declared)[0];
+  if (typeof first !== "object" || first === null)
+    return false;
+  return "source" in first || "content" in first;
+}
+function resolvePluginSkills(root, pluginName, declared, warnings) {
+  const defaults = scanPluginSkillsAt(join9(root, "skills"), pluginName);
+  const override = resolveManifestComponentOverride(root, pluginName, "skills", declared, true, warnings);
+  if (override === undefined)
+    return defaults;
+  const all = [...defaults];
+  for (const dir of override)
+    all.push(...scanPluginSkillsAt(dir, pluginName));
+  return dedupeByName(all);
+}
 function scanPluginCommandFile(path, pluginName) {
   const name = basename2(path, ".md");
   let raw;
@@ -3491,7 +3521,7 @@ function scanPluginCommands(root, pluginName) {
   return scanPluginCommandsDir(join9(root, "commands"), pluginName);
 }
 function scanPluginCommandsOverride(paths, pluginName) {
-  const byName = new Map;
+  const all = [];
   for (const path of paths) {
     let isDir;
     try {
@@ -3500,25 +3530,21 @@ function scanPluginCommandsOverride(paths, pluginName) {
       continue;
     }
     if (isDir) {
-      for (const entry of scanPluginCommandsDir(path, pluginName))
-        byName.set(entry.name, entry);
+      all.push(...scanPluginCommandsDir(path, pluginName));
     } else {
       const entry = scanPluginCommandFile(path, pluginName);
       if (entry !== undefined)
-        byName.set(entry.name, entry);
+        all.push(entry);
     }
   }
-  return [...byName.values()];
+  return dedupeByName(all);
 }
 function resolveCommandsManifestOverride(root, pluginName, declared, warnings) {
   if (declared === undefined)
     return;
-  if (!Array.isArray(declared) && typeof declared === "object" && declared !== null) {
-    const firstValue = Object.values(declared)[0];
-    if (firstValue !== null && typeof firstValue === "object" && (("source" in firstValue) || ("content" in firstValue))) {
-      warnings.push(`plugin "${pluginName}"'s manifest "commands" uses the inline {name: {source|content}} form, which Winter does not support yet -- no commands were loaded from it (the default commands/ directory is still shadowed, matching claude's own behaviour whenever the key is present)`);
-      return [];
-    }
+  if (isInlineCommandsMap(declared)) {
+    warnings.push(`plugin "${pluginName}"'s manifest "commands" uses the inline {name: {source|content}} form, which Winter does not support yet -- no commands were loaded from it (the default commands/ directory is still shadowed, matching claude's own behaviour whenever the key is present)`);
+    return [];
   }
   return resolveManifestComponentOverride(root, pluginName, "commands", declared, false, warnings);
 }
@@ -3573,7 +3599,7 @@ function scanPluginAgents(root, pluginName) {
   return scanPluginAgentsDir(join9(root, "agents"), pluginName);
 }
 function scanPluginAgentsOverride(paths, pluginName) {
-  const out = {};
+  const agents = {};
   const rejected = [];
   for (const path of paths) {
     let isDir;
@@ -3584,13 +3610,14 @@ function scanPluginAgentsOverride(paths, pluginName) {
     }
     if (isDir) {
       const scanned = scanPluginAgentsDir(path, pluginName);
-      Object.assign(out, scanned.agents);
+      for (const [name, def] of Object.entries(scanned.agents))
+        agents[name] = def;
       rejected.push(...scanned.rejected);
     } else {
-      scanPluginAgentFile(path, pluginName, out, rejected);
+      scanPluginAgentFile(path, pluginName, agents, rejected);
     }
   }
-  return { agents: out, rejected };
+  return { agents, rejected };
 }
 function collectMcpServers(root, manifest) {
   const servers = {};
@@ -3641,26 +3668,20 @@ function readPluginHooksJson(root, pluginName, warnings) {
   return readHooksFile(join9(root, "hooks", "hooks.json"), pluginName, "hooks/hooks.json", warnings);
 }
 function resolveManifestHooksStringEntries(root, pluginName, declared, warnings) {
-  const entries = Array.isArray(declared) ? declared : declared !== undefined ? [declared] : [];
-  const defaultHooksJsonPath = resolve6(join9(root, "hooks", "hooks.json"));
-  const defaultHooksJsonReal = (() => {
-    try {
-      return realpathSync3(defaultHooksJsonPath);
-    } catch {
-      return defaultHooksJsonPath;
-    }
-  })();
-  const seenReal = new Set;
-  const results = [];
+  const entries = declared === undefined ? [] : Array.isArray(declared) ? declared : [declared];
+  const standardPath = resolve6(join9(root, "hooks", "hooks.json"));
+  const standardIdentity = realPathOr(standardPath);
+  const accepted = new Set;
+  const out = [];
   for (const entry of entries) {
-    if (typeof entry !== "string" || entry.length === 0)
+    if (typeof entry !== "string" || entry === "")
       continue;
     const full = resolve6(root, entry);
     if (!resolvesWithinPluginRoot(full, root)) {
       warnings.paths.push(`plugin "${pluginName}"'s manifest "hooks" entry "${entry}" escapes the plugin directory -- ignoring it`);
       continue;
     }
-    let isFile;
+    let isFile = false;
     try {
       isFile = statSync5(full).isFile();
     } catch {
@@ -3670,25 +3691,19 @@ function resolveManifestHooksStringEntries(root, pluginName, declared, warnings)
       warnings.paths.push(`plugin "${pluginName}"'s manifest "hooks" entry "${entry}" was not found at ${full} -- ignoring it`);
       continue;
     }
-    const real = (() => {
-      try {
-        return realpathSync3(full);
-      } catch {
-        return full;
-      }
-    })();
-    if (real === defaultHooksJsonReal)
+    const real = realPathOr(full);
+    if (real === standardIdentity)
       continue;
-    if (seenReal.has(real)) {
+    if (accepted.has(real)) {
       warnings.paths.push(`plugin "${pluginName}"'s manifest "hooks" entry "${entry}" duplicates another entry (both resolve to ${real}) -- loaded once`);
       continue;
     }
-    seenReal.add(real);
-    const hooksObject = readHooksFile(full, pluginName, `manifest "hooks" entry "${entry}"`, warnings.content);
-    if (hooksObject !== undefined)
-      results.push(hooksObject);
+    accepted.add(real);
+    const hooks = readHooksFile(full, pluginName, `manifest "hooks" entry "${entry}"`, warnings.content);
+    if (hooks !== undefined)
+      out.push(hooks);
   }
-  return results;
+  return out;
 }
 function mergeHookSources(root, pluginName, fromHooksJson, manifestHooks, pathWarnings, contentWarnings) {
   const merged = {};
@@ -3727,39 +3742,39 @@ function resolveManifestComponentOverride(root, pluginName, componentKey, declar
   if (declared === undefined)
     return;
   const entries = Array.isArray(declared) ? declared : [declared];
-  const resolved = [];
+  const label = `plugin "${pluginName}"'s manifest "${componentKey}"`;
+  const kept = [];
   for (const entry of entries) {
-    if (typeof entry !== "string" || entry.length === 0) {
-      warnings.push(`plugin "${pluginName}"'s manifest "${componentKey}" entry ${JSON.stringify(entry)} is not a non-empty string -- ignoring it`);
+    if (typeof entry !== "string" || entry === "") {
+      warnings.push(`${label} entry ${JSON.stringify(entry)} is not a non-empty string -- ignoring it`);
       continue;
     }
     const full = resolve6(root, entry);
     if (!resolvesWithinPluginRoot(full, root)) {
-      warnings.push(`plugin "${pluginName}"'s manifest "${componentKey}" path "${entry}" escapes the plugin directory -- ignoring it`);
+      warnings.push(`${label} path "${entry}" escapes the plugin directory -- ignoring it`);
       continue;
     }
-    let stat;
+    let isDir;
     try {
-      stat = statSync5(full);
+      isDir = statSync5(full).isDirectory();
     } catch {
-      stat = undefined;
-    }
-    if (stat === undefined) {
-      warnings.push(`plugin "${pluginName}"'s manifest "${componentKey}" path "${entry}" was not found at ${full} -- ignoring it`);
+      warnings.push(`${label} path "${entry}" was not found at ${full} -- ignoring it`);
       continue;
     }
-    if (requireDirectory && !stat.isDirectory()) {
-      const skillHint = componentKey === "skills" && basename2(entry).toLowerCase() === "skill.md" ? ` -- point to its parent directory instead` : "";
-      warnings.push(`plugin "${pluginName}"'s manifest "${componentKey}" path "${entry}" is a file, not a directory${componentKey === "skills" ? " (skills entries must be directories containing SKILL.md)" : ""}${skillHint} -- ignoring it`);
+    if (requireDirectory && !isDir) {
+      const isSkills = componentKey === "skills";
+      const why = isSkills ? " (skills entries must be directories containing SKILL.md)" : "";
+      const hint = isSkills && basename2(entry).toLowerCase() === "skill.md" ? " -- point to its parent directory instead" : "";
+      warnings.push(`${label} path "${entry}" is a file, not a directory${why}${hint} -- ignoring it`);
       continue;
     }
-    resolved.push(full);
+    kept.push(full);
   }
-  return resolved;
+  return kept;
 }
 function manifestOverrideIncludesDefaultDir(resolvedEntries, defaultDirPath) {
-  const normalizedDefault = defaultDirPath + sep3;
-  return resolvedEntries.some((entry) => (entry + sep3).startsWith(normalizedDefault));
+  const beneath = defaultDirPath + sep3;
+  return resolvedEntries.some((entry) => entry === defaultDirPath || entry.startsWith(beneath));
 }
 function shadowedFolderWarning(pluginName, componentDirName, manifestFieldName) {
   return `plugin "${pluginName}": the "${componentDirName}/" folder exists but is not auto-loaded because the manifest sets "${manifestFieldName}"`;
@@ -4373,47 +4388,116 @@ function splitCommand(prompt) {
   const args = firstSpace === -1 ? "" : trimmed.slice(firstSpace).trim();
   return { name, args };
 }
-var ARG_DOLLAR_SENTINEL = "￿";
-var ARG_BOUNDARY_SENTINEL = "￾";
-function protectSubstitutedValue(value) {
-  const cleaned = (value ?? "").replaceAll(ARG_DOLLAR_SENTINEL, "�").replaceAll(ARG_BOUNDARY_SENTINEL, "�");
-  return ARG_BOUNDARY_SENTINEL + cleaned.replaceAll("$", ARG_DOLLAR_SENTINEL) + ARG_BOUNDARY_SENTINEL;
-}
 function substituteArguments(body, args, namedArgs = []) {
-  let out = body.replaceAll(ARG_DOLLAR_SENTINEL, "�").replaceAll(ARG_BOUNDARY_SENTINEL, "�");
-  const words = shellWords(args).map((w) => w.word);
-  const named = namedArgs.map((name, i) => ({ name, i })).filter((n) => n.name.length > 0).sort((a, b) => b.name.length - a.name.length);
-  const escapeGroup = ["\\d", "ARGUMENTS", ...named.map(({ name }) => `${escapeRegExpLiteral(name)}(?![\\[\\w])`)].join("|");
-  out = out.replace(new RegExp(`(?<!\\\\)\\\\\\$(?=${escapeGroup})`, "g"), ARG_DOLLAR_SENTINEL);
-  let substituted = false;
-  for (const { name, i } of named) {
-    out = out.replace(new RegExp(`\\$${escapeRegExpLiteral(name)}(?![\\[\\w])`, "g"), () => {
-      substituted = true;
-      return protectSubstitutedValue(words[i]);
-    });
+  const text = cleanNoncharacters(body);
+  const wholeArgs = cleanNoncharacters(args);
+  const words = shellWords(args).map((w) => cleanNoncharacters(w.word));
+  const named = namedArgs.map((name, position) => ({ name, position })).filter((n) => n.name.length > 0).sort((a, b) => b.name.length - a.name.length);
+  const claimed = new Uint8Array(text.length);
+  const replacements = [];
+  let substitutions = 0;
+  const isFree = (start, end) => {
+    for (let k = start;k < end; k++)
+      if (claimed[k])
+        return false;
+    return true;
+  };
+  const claim = (start, end, value) => {
+    claimed.fill(1, start, end);
+    replacements.push({ start, end, value });
+  };
+  const endsCleanly = (at) => at >= text.length || text[at] !== "[" && !isWordChar(text.charCodeAt(at));
+  for (let i = text.indexOf("\\$");i !== -1; i = text.indexOf("\\$", i + 1)) {
+    if (i > 0 && text[i - 1] === "\\")
+      continue;
+    const after = i + 2;
+    const escapes = isDigit(text.charCodeAt(after)) || text.startsWith("ARGUMENTS", after) || named.some((n) => text.startsWith(n.name, after) && endsCleanly(after + n.name.length));
+    if (escapes) {
+      claim(i, after, "$");
+      i = after - 1;
+    }
   }
-  out = out.replace(/\$ARGUMENTS\[(\d+)\]/g, (whole, digits) => {
-    const idx = Number.parseInt(digits, 10);
-    if (words[idx] === undefined)
-      return ARG_DOLLAR_SENTINEL + whole.slice(1);
-    substituted = true;
-    return protectSubstitutedValue(words[idx]);
-  });
-  out = out.replace(/\$(\d+)(?!\w)/g, (whole, digits) => {
-    const idx = Number.parseInt(digits, 10);
-    if (words[idx] === undefined)
-      return whole;
-    substituted = true;
-    return protectSubstitutedValue(words[idx]);
-  });
-  out = out.replaceAll("$ARGUMENTS", () => {
-    substituted = true;
-    return protectSubstitutedValue(args);
-  });
-  if (!substituted && args)
-    out = `${out}
-ARGUMENTS: ${protectSubstitutedValue(args)}`;
-  return out.replaceAll(ARG_DOLLAR_SENTINEL, "$").replaceAll(ARG_BOUNDARY_SENTINEL, "");
+  for (const { name, position } of named) {
+    const needle = "$" + name;
+    for (let i = text.indexOf(needle);i !== -1; ) {
+      const end = i + needle.length;
+      if (isFree(i, end) && endsCleanly(end)) {
+        claim(i, end, words[position] ?? "");
+        substitutions++;
+        i = text.indexOf(needle, end);
+      } else {
+        i = text.indexOf(needle, i + 1);
+      }
+    }
+  }
+  const INDEXED_PREFIX = "$ARGUMENTS[";
+  for (let i = text.indexOf(INDEXED_PREFIX);i !== -1; ) {
+    let j = i + INDEXED_PREFIX.length;
+    while (isDigit(text.charCodeAt(j)))
+      j++;
+    const digitsStart = i + INDEXED_PREFIX.length;
+    if (j > digitsStart && text[j] === "]" && isFree(i, j + 1)) {
+      const index = Number(text.slice(digitsStart, j));
+      const word = index < words.length ? words[index] : undefined;
+      if (word !== undefined) {
+        claim(i, j + 1, word);
+        substitutions++;
+      } else {
+        claim(i, j + 1, text.slice(i, j + 1));
+      }
+      i = text.indexOf(INDEXED_PREFIX, j + 1);
+    } else {
+      i = text.indexOf(INDEXED_PREFIX, i + 1);
+    }
+  }
+  for (let i = text.indexOf("$");i !== -1; ) {
+    let j = i + 1;
+    while (isDigit(text.charCodeAt(j)))
+      j++;
+    if (j > i + 1 && !isWordChar(text.charCodeAt(j)) && isFree(i, j)) {
+      const index = Number(text.slice(i + 1, j));
+      const word = index < words.length ? words[index] : undefined;
+      if (word !== undefined) {
+        claim(i, j, word);
+        substitutions++;
+      }
+      i = text.indexOf("$", j);
+    } else {
+      i = text.indexOf("$", i + 1);
+    }
+  }
+  const PLAIN = "$ARGUMENTS";
+  for (let i = text.indexOf(PLAIN);i !== -1; ) {
+    const end = i + PLAIN.length;
+    if (isFree(i, end)) {
+      claim(i, end, wholeArgs);
+      substitutions++;
+      i = text.indexOf(PLAIN, end);
+    } else {
+      i = text.indexOf(PLAIN, i + 1);
+    }
+  }
+  replacements.sort((a, b) => a.start - b.start);
+  let out = "";
+  let cursor = 0;
+  for (const r of replacements) {
+    out += text.slice(cursor, r.start) + r.value;
+    cursor = r.end;
+  }
+  out += text.slice(cursor);
+  if (substitutions === 0 && args.length > 0)
+    out += `
+ARGUMENTS: ` + wholeArgs;
+  return out;
+}
+function cleanNoncharacters(s) {
+  return s.replace(/[￾￿]/g, "�");
+}
+function isDigit(code) {
+  return code >= 48 && code <= 57;
+}
+function isWordChar(code) {
+  return isDigit(code) || code >= 65 && code <= 90 || code >= 97 && code <= 122 || code === 95;
 }
 function substituteWorkflowArguments(body, args) {
   const JSON_TOKEN = "$ARGUMENTS_JSON";