@swmansion/argent 0.31.1-next.5 → 0.31.1-next.7

package/dist/client.js

@@ -7794,6 +7794,10 @@ var FLAG_REGISTRY = [
     name: "harmonyos",
     description: "HarmonyOS support: list, boot and drive HarmonyOS phones and DevEco Studio emulators over `hdc`. Off by default while the platform is experimental."
   },
+  {
+    name: "forward-secrets",
+    description: "Over `argent link` or ARGENT_TOOLS_URL, resolve each `{{secret:NAME}}` a call names on this machine and send the value with the call, so a remote tool-server can type a secret it does not hold. The linked tool-server then receives every secret of this machine that a call names, so link only one you trust with all of them. Values go only over https:// with the certificate checked, or to a loopback address. Off by default."
+  },
   {
     name: "video-watermark",
     description: "Overlay the argent corner watermark on recorded screen videos. On by default; turn it off with `argent disable video-watermark`.",
@@ -7936,6 +7940,108 @@ function getAtPath(obj, dottedKey) {
 var import_dotenv = __toESM(require_dist(), 1);
 import * as fs3 from "node:fs";
 import * as path4 from "node:path";
+var SECRET_ENV_PREFIX = "ARGENT_SECRET_";
+var SECRETS_FILE_NAME = "secrets.env";
+var SHARED_ENV_FILES = [".env.local", ".env"];
+var SECRET_NAME_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
+function envSource(env) {
+  const values = /* @__PURE__ */ new Map();
+  for (const [key, value] of Object.entries(env)) {
+    if (value === void 0 || !key.startsWith(SECRET_ENV_PREFIX)) continue;
+    const name = key.slice(SECRET_ENV_PREFIX.length);
+    if (SECRET_NAME_RE.test(name)) values.set(name, value);
+  }
+  return {
+    label: `environment (${SECRET_ENV_PREFIX}*)`,
+    kind: "env",
+    present: true,
+    names: [...values.keys()].sort(),
+    values
+  };
+}
+function fileSource(filePath, exposure) {
+  const label = filePath;
+  const absent = {
+    label,
+    kind: "file",
+    present: false,
+    names: [],
+    values: /* @__PURE__ */ new Map()
+  };
+  if (!fs3.statSync(filePath, { throwIfNoEntry: false })) return absent;
+  let content;
+  try {
+    content = fs3.readFileSync(filePath, "utf8");
+  } catch {
+    return absent;
+  }
+  const values = /* @__PURE__ */ new Map();
+  let skippedUnprefixed = false;
+  for (const [key, value] of Object.entries((0, import_dotenv.parse)(content))) {
+    const prefixed = key.startsWith(SECRET_ENV_PREFIX);
+    if (exposure === "shared" && !prefixed) {
+      skippedUnprefixed = true;
+      continue;
+    }
+    const name = prefixed ? key.slice(SECRET_ENV_PREFIX.length) : key;
+    if (SECRET_NAME_RE.test(name)) values.set(name, value);
+  }
+  return {
+    label,
+    kind: "file",
+    present: true,
+    names: [...values.keys()].sort(),
+    values,
+    ...values.size === 0 && skippedUnprefixed ? { needsPrefix: true } : {}
+  };
+}
+function secretSources(options = {}) {
+  const sources = [envSource(options.env ?? process.env)];
+  const projectRoot = findProjectRoot(options.cwd ?? process.cwd());
+  const filePaths = [];
+  if (projectRoot) {
+    filePaths.push({
+      path: path4.join(projectRoot, ".argent", SECRETS_FILE_NAME),
+      exposure: "dedicated"
+    });
+    for (const name of SHARED_ENV_FILES) {
+      filePaths.push({ path: path4.join(projectRoot, name), exposure: "shared" });
+    }
+  }
+  filePaths.push({
+    path: path4.join(resolveHomeDir(options), ".argent", SECRETS_FILE_NAME),
+    exposure: "dedicated"
+  });
+  const seen = /* @__PURE__ */ new Set();
+  for (const entry of filePaths) {
+    const resolved = path4.resolve(entry.path);
+    if (seen.has(resolved)) continue;
+    seen.add(resolved);
+    sources.push(fileSource(resolved, entry.exposure));
+  }
+  return sources;
+}
+function encodeClientSecrets(values) {
+  return Buffer.from(JSON.stringify(Object.fromEntries(values)), "utf8").toString("base64");
+}
+function lookupSecret(name, sources) {
+  for (const source of sources) {
+    const value = source.values.get(name);
+    if (value !== void 0) return value;
+  }
+  return void 0;
+}
+var SECRET_PLACEHOLDER_RE = /\{\{secret:([A-Za-z_][A-Za-z0-9_]*)\}\}/g;
+function placeholderNames(text) {
+  return Array.from(text.matchAll(SECRET_PLACEHOLDER_RE), (match) => match[1]);
+}
+var REDUNDANT_PREFIX_RE = /^argent_secret_/i;
+function lookupPlaceholderSecret(rawName, sources) {
+  const value = lookupSecret(rawName, sources);
+  if (value !== void 0 || !REDUNDANT_PREFIX_RE.test(rawName)) return { name: rawName, value };
+  const name = rawName.replace(REDUNDANT_PREFIX_RE, "");
+  return { name, value: lookupSecret(name, sources) };
+}
 
 // ../configuration-core/src/merge.ts
 function mergeRestrictive(local, global) {
@@ -8650,11 +8756,15 @@ async function ensureToolsServer(paths) {
 }
 
 // ../argent-tools-client/src/tools-client.ts
+var import_yaml2 = __toESM(require_dist2(), 1);
+import { readFile as readFile5 } from "node:fs/promises";
+import { maxHeaderSize } from "node:http";
 import * as path12 from "node:path";
 
 // ../registry/src/types.ts
 var LINKED_CALL_HEADER = "x-argent-linked";
 var E2E_DIR_CLIENT_HEADER = "x-argent-e2e-dir";
+var CLIENT_SECRETS_HEADER = "x-argent-client-secrets";
 
 // ../registry/src/artifacts.ts
 import { stat } from "node:fs/promises";
@@ -10307,6 +10417,67 @@ function carriesMembers(args) {
 function carriesUpload(args) {
   return carriesMembers(args) || wiresOf(args).some((wire) => typeof wire.uploadId === "string");
 }
+async function forwardedSecrets(args) {
+  if (!isFeatureEnabled("forward-secrets")) return void 0;
+  const names = /* @__PURE__ */ new Set();
+  const scan = (text) => {
+    for (const name of placeholderNames(text)) names.add(name);
+  };
+  const seen = /* @__PURE__ */ new WeakSet();
+  const visit = async (value) => {
+    if (typeof value === "string") return scan(value);
+    if (typeof value !== "object" || value === null || seen.has(value)) return;
+    seen.add(value);
+    const wire = value;
+    if (wire[FILE_INPUT_MARKER2] !== true) {
+      for (const nested of Object.values(value)) await visit(nested);
+      return;
+    }
+    if (!Array.isArray(wire.members)) return;
+    const yaml = [
+      .../\.ya?ml$/i.test(wire.path ?? "") ? [wire] : [],
+      ...wire.members.filter((member) => member.role === "flow")
+    ];
+    for (const file of yaml) {
+      let text;
+      if (typeof file.content === "string") {
+        text = Buffer.from(file.content, "base64").toString("utf8");
+      } else if (file.uploadId !== void 0 && file.canonical !== void 0) {
+        text = await readFile5(file.canonical, "utf8").catch(() => void 0);
+      }
+      let parsed;
+      try {
+        parsed = text === void 0 ? void 0 : (0, import_yaml2.parse)(text.trim(), { logLevel: "error" });
+      } catch {
+        continue;
+      }
+      await visit(parsed);
+    }
+  };
+  await visit(args);
+  if (names.size === 0) return void 0;
+  const sources = secretSources();
+  const values = /* @__PURE__ */ new Map();
+  for (const rawName of names) {
+    const { name, value } = lookupPlaceholderSecret(rawName, sources);
+    if (value !== void 0) values.set(name, value);
+  }
+  return values;
+}
+function secretsTransportRefusal(url) {
+  if (!URL.canParse(url)) return `${url} is not a URL`;
+  const { protocol, hostname } = new URL(url);
+  const host = hostname.replace(/^\[|\]$/g, "");
+  if (["127.0.0.1", "localhost", "::1"].includes(host)) return void 0;
+  if (protocol !== "https:") {
+    return `${url} is reached neither over https:// nor at a loopback address. Link the tool-server through an https:// URL, or through an SSH tunnel to a 127.0.0.1 port`;
+  }
+  if (process.env.NODE_TLS_REJECT_UNAUTHORIZED === "0") {
+    return `NODE_TLS_REJECT_UNAUTHORIZED=0 turns off the certificate check of ${url}. Unset it, and trust a self-signed certificate through NODE_EXTRA_CA_CERTS instead`;
+  }
+  return void 0;
+}
+var FETCH_HEAD_BYTES = 256;
 function createToolsClient(options = {}) {
   let cached = null;
   const doFetch = options.fetchImpl ?? ((url, init) => fetch(url, init));
@@ -10337,7 +10508,7 @@ function createToolsClient(options = {}) {
     const { url, token } = await baseUrl();
     const res = await doFetch(
       `${url}/tools`,
-      { headers: authHeaders2(token), signal: opts?.signal },
+      { headers: { ...options.headers?.(), ...authHeaders2(token) }, signal: opts?.signal },
       { longRunning: false, carriesUpload: false }
     );
     if (!res.ok) throw new Error(`GET /tools failed: ${res.status} ${res.statusText}`);
@@ -10395,25 +10566,51 @@ function createToolsClient(options = {}) {
     };
     const stream = opts?.onProgress !== void 0 || carriesMembers(finalArgs);
     const sentOnce = carriesUpload(finalArgs);
+    const forwarded = remote ? await forwardedSecrets(finalArgs) : void 0;
+    const encodedSecrets = forwarded ? encodeClientSecrets(forwarded) : void 0;
+    const clientSecrets = forwarded?.size ? forwarded : void 0;
+    const refusal = clientSecrets ? secretsTransportRefusal(url) : void 0;
+    if (refusal !== void 0) {
+      throw new Error(
+        `forward-secrets sends secret values only over https:// with the certificate checked, or to a loopback address, so the call was not sent (it names ${[...clientSecrets.keys()].join(", ")}): ${refusal}.`
+      );
+    }
+    const toolUrl = `${url}/tools/${encodeURIComponent(meta?.name ?? name)}`;
+    const headers = {
+      ...options.headers?.(),
+      "Content-Type": "application/json",
+      // Tells the tool-server the call came over a link, a link to
+      // 127.0.0.1 included, which nothing else in the request shows.
+      ...remote ? { [LINKED_CALL_HEADER]: "1" } : {},
+      // Tells the tool-server this client writes recordings under
+      // `.argent/e2e/`; an older client writes only `.argent/flows/`.
+      [E2E_DIR_CLIENT_HEADER]: "1",
+      ...encodedSecrets ? { [CLIENT_SECRETS_HEADER]: encodedSecrets } : {},
+      // A proxy that compresses the stream holds each line until its buffer
+      // fills. `identity` keeps the stream uncompressed end to end.
+      ...stream ? { "Accept": "application/x-ndjson", "Accept-Encoding": "identity" } : {},
+      ...authHeaders2(token)
+    };
+    if (clientSecrets !== void 0 && encodedSecrets !== void 0) {
+      const headBytes = toolUrl.length + FETCH_HEAD_BYTES + Object.entries(headers).reduce(
+        (sum, [key, value]) => sum + key.length + value.length + 4,
+        0
+      );
+      if (headBytes > maxHeaderSize) {
+        throw new Error(
+          `forward-secrets would send ${[...clientSecrets.keys()].join(", ")} in an ${CLIENT_SECRETS_HEADER} header of ${encodedSecrets.length} bytes, which takes the request headers past the ${maxHeaderSize} bytes a tool-server accepts, so the call was not sent. Define a secret this large on the machine running the tool-server instead.`
+        );
+      }
+    }
     const res = await doFetch(
-      `${url}/tools/${encodeURIComponent(meta?.name ?? name)}`,
+      toolUrl,
       {
         method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          // Tells the tool-server the call came over a link, a link to
-          // 127.0.0.1 included, which nothing else in the request shows.
-          ...remote ? { [LINKED_CALL_HEADER]: "1" } : {},
-          // Tells the tool-server this client writes recordings under
-          // `.argent/e2e/`; an older client writes only `.argent/flows/`.
-          [E2E_DIR_CLIENT_HEADER]: "1",
-          // A proxy that compresses the stream holds each line until its buffer
-          // fills. `identity` keeps the stream uncompressed end to end.
-          ...stream ? { "Accept": "application/x-ndjson", "Accept-Encoding": "identity" } : {},
-          ...authHeaders2(token)
-        },
+        headers,
         body: JSON.stringify(finalArgs ?? {}),
-        signal: opts?.signal
+        signal: opts?.signal,
+        // A followed redirect would re-send the values to wherever it points.
+        ...clientSecrets ? { redirect: "manual" } : {}
       },
       { longRunning: meta?.longRunning === true, carriesUpload: sentOnce }
     ).catch((err) => {
@@ -10451,6 +10648,17 @@ function createToolsClient(options = {}) {
       }
       json = {};
     }
+    if (clientSecrets && res.status >= 300 && res.status < 400) {
+      throw new ToolInvocationError(
+        `The tool-server answered ${res.status} ${res.statusText} to ${name}. forward-secrets does not follow a redirect, so the call was not sent on; link the URL it points to instead.`
+      );
+    }
+    const headersRefused = res.status === 431 || res.status === 400 && errorBodyMessage(json) === void 0;
+    if (clientSecrets && headersRefused) {
+      throw new ToolInvocationError(
+        `The tool-server, or a proxy in front of it, refused the request headers (${res.status}), as it does when they are too large. The ${CLIENT_SECRETS_HEADER} header carried ${[...clientSecrets.keys()].join(", ")}; define a secret this large on the machine running the tool-server instead.`
+      );
+    }
     if (!res.ok) {
       throw new ToolInvocationError(errorBodyMessage(json) ?? `${res.status} ${res.statusText}`, {
         errorCode: json.error_code,
@@ -10470,7 +10678,7 @@ function createToolsClient(options = {}) {
 }
 
 // ../argent-tools-client/src/artifacts.ts
-import { copyFile, mkdir as mkdir4, readFile as readFile5, realpath as realpath4, rm as rm3, stat as stat5, writeFile as writeFile4 } from "node:fs/promises";
+import { copyFile, mkdir as mkdir4, readFile as readFile6, realpath as realpath4, rm as rm3, stat as stat5, writeFile as writeFile4 } from "node:fs/promises";
 import { constants as fsConstants } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
 import { basename as basename7, dirname as dirname9, extname as extname2, isAbsolute as isAbsolute6, join as join13, normalize as normalize2, resolve as resolve8, sep as sep4 } from "node:path";
@@ -10659,7 +10867,7 @@ async function materializeArtifacts(result, ctx) {
             if (value.mimeType.startsWith("image/")) {
               images.push({
                 localPath: finalPath2,
-                data: await readFile5(finalPath2),
+                data: await readFile6(finalPath2),
                 mimeType: value.mimeType
               });
             }
@@ -10691,7 +10899,7 @@ async function materializeArtifacts(result, ctx) {
       }
       if (localPath) {
         if (value.mimeType.startsWith("image/")) {
-          images.push({ localPath, data: await readFile5(localPath), mimeType: value.mimeType });
+          images.push({ localPath, data: await readFile6(localPath), mimeType: value.mimeType });
         }
         return localPath;
       }

package/dist/installer.mjs

@@ -16912,7 +16912,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.31.1-next.5";
+    return "0.31.1-next.7";
   }
   return "0.0.0";
 }
@@ -23739,6 +23739,9 @@ function couldBeOurToolServer(pid, marker) {
 }
 
 // ../argent-tools-client/src/tools-client.ts
+var import_yaml4 = __toESM(require_dist2(), 1);
+import { readFile as readFile5 } from "node:fs/promises";
+import { maxHeaderSize } from "node:http";
 import * as path25 from "node:path";
 
 // ../argent-tools-client/src/link-config.ts
@@ -23782,7 +23785,7 @@ import * as path24 from "node:path";
 var INLINE_MEMBERS_BYTES = 256 * 1024;
 
 // ../argent-tools-client/src/artifacts.ts
-import { copyFile, mkdir as mkdir4, readFile as readFile5, realpath as realpath4, rm as rm3, stat as stat5, writeFile as writeFile4 } from "node:fs/promises";
+import { copyFile, mkdir as mkdir4, readFile as readFile6, realpath as realpath4, rm as rm3, stat as stat5, writeFile as writeFile4 } from "node:fs/promises";
 import { constants as fsConstants } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
 import { basename as basename7, dirname as dirname17, extname as extname2, isAbsolute as isAbsolute8, join as join26, normalize as normalize2, resolve as resolve15, sep as sep6 } from "node:path";
@@ -24326,7 +24329,7 @@ async function update(args) {
 
 // ../argent-installer/src/uninstall.ts
 var import_picocolors12 = __toESM(require_picocolors(), 1);
-var import_yaml4 = __toESM(require_dist2(), 1);
+var import_yaml5 = __toESM(require_dist2(), 1);
 import * as fs21 from "node:fs";
 import * as path27 from "node:path";
 var UNINSTALL_TOOLSERVER_STOP_FAILED = {
@@ -24425,7 +24428,7 @@ function readBundledSkillName(skillFilePath, fallbackName) {
     const content = fs21.readFileSync(skillFilePath, "utf8");
     const frontmatter = content.match(/^---\r?\n([\s\S]*?)\r?\n---/)?.[1];
     if (!frontmatter) return fallbackName;
-    const data = (0, import_yaml4.parse)(frontmatter);
+    const data = (0, import_yaml5.parse)(frontmatter);
     const name = data?.name;
     return typeof name === "string" && name.trim() ? name.trim() : fallbackName;
   } catch {