@botbuddy/cli 1.33.3 → 1.33.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botbuddy/cli",
-  "version": "1.33.3",
+  "version": "1.33.5",
   "description": "BotBuddy — Swarm coordination CLI for multi-agent workflows",
   "type": "module",
   "bin": {

package/src/stack-isolation.mjs

@@ -22,7 +22,7 @@
 import { createHash, randomUUID } from "node:crypto";
 import { cpSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { homedir, hostname } from "node:os";
-import { basename, join } from "node:path";
+import { basename, dirname, isAbsolute, join, relative, sep } from "node:path";
 import { lockPathForProject, projectIdFromConfig } from "./stack-file-lock.mjs";
 
 /** Where materialized leased stacks live inside the worktree (gitignored). */
@@ -36,7 +36,9 @@ export const LEASED_STACKS_DIR = ".botbuddy/stacks";
 // therefore gets a contiguous block above all of them, and every block stays a
 // valid TCP port (61000 + 200×20 − 1 = 64999).
 export const LEASED_PORT_BASE = 61000;
-/** Ports reserved per leased stack (the repo declares 10; the rest is headroom). */
+/** Ports reserved per leased stack. botbuddy-web declares 10; a repo that declares
+ * none (Supply Guard) has 7 materialized for it from the Supabase defaults
+ * (BOT-1835). The rest is headroom. */
 export const LEASED_PORT_STRIDE = 20;
 /** Distinct blocks available. Two worktree+slot pairs CAN hash to one block; as
  * with the hermetic/e2e ports that is a loud `supabase start` port-bind failure,
@@ -119,6 +121,115 @@ export function portMapInConfig(toml) {
   return map;
 }
 
+/**
+ * BOT-1835 — every host port the Supabase CLI binds, with the value it uses when
+ * the config names none.
+ *
+ * An UNDECLARED port is not an absent port. The CLI decodes its own embedded
+ * `config.toml` template first and the repo's file on top, so a config that says
+ * nothing about `[studio]` still binds 54323 — the same 54323 every other stack
+ * on the machine falls back to. BOT-1798 rewrote only the ports a repo DECLARED,
+ * which is why botbuddy-web's leases landed on 61xxx while Supply Guard's — whose
+ * `supabase/config.toml` is one `project_id` line — kept the whole 543xx default
+ * block and collided with the SG shared stack and with each other.
+ *
+ * `bindsWhenUnset: false` means the CLI publishes that port only when the config
+ * names one (inbucket's smtp/pop3 ports), so such a service is remapped when it
+ * IS declared and never newly exposed when it is not. Its documented default
+ * still belongs in the avoid-set: a config that names 54325 collides with every
+ * other config that names 54325.
+ *
+ * `sections` lists the spellings of one service, canonical first: 2.116 renamed
+ * `[inbucket]` to `[local_smtp]` and still accepts the old name. The canonical
+ * entry is the one materialization CREATES when a config names none of them —
+ * `[inbucket]` deliberately, because every CLI in the field understands it
+ * (a version that only knows `[local_smtp]` would ignore an unknown section and
+ * silently bind the default, which is the bug).
+ *
+ * `[realtime]` is NOT here: the CLI publishes no host port for it (its section
+ * has `enabled`/`ip_version` only). A `[realtime] port` a repo declares anyway is
+ * still remapped by the generic declared-port pass below.
+ */
+export const SUPABASE_SERVICE_PORTS = Object.freeze([
+  { service: "api", label: "api gateway", sections: ["api"], key: "port", defaultPort: 54321, defaultEnabled: true },
+  { service: "db", label: "database", sections: ["db"], key: "port", defaultPort: 54322, defaultEnabled: true },
+  { service: "db-shadow", label: "shadow database", sections: ["db"], key: "shadow_port", defaultPort: 54320, defaultEnabled: true },
+  { service: "pooler", label: "connection pooler", sections: ["db.pooler"], key: "port", defaultPort: 54329, defaultEnabled: false },
+  { service: "studio", label: "studio", sections: ["studio"], key: "port", defaultPort: 54323, defaultEnabled: true },
+  { service: "mail", label: "mail testing UI", sections: ["inbucket", "local_smtp", "mailpit"], key: "port", defaultPort: 54324, defaultEnabled: true },
+  { service: "mail-smtp", label: "mail SMTP", sections: ["inbucket", "local_smtp", "mailpit"], key: "smtp_port", defaultPort: 54325, defaultEnabled: true, bindsWhenUnset: false },
+  { service: "mail-pop3", label: "mail POP3", sections: ["inbucket", "local_smtp", "mailpit"], key: "pop3_port", defaultPort: 54326, defaultEnabled: true, bindsWhenUnset: false },
+  { service: "analytics", label: "analytics", sections: ["analytics"], key: "port", defaultPort: 54327, defaultEnabled: true },
+  { service: "edge-inspector", label: "edge runtime inspector", sections: ["edge_runtime"], key: "inspector_port", defaultPort: 8083, defaultEnabled: true },
+].map(Object.freeze));
+
+/** Every port value the Supabase CLI would pick on its own — the set a leased
+ * stack's ports must avoid entirely, whichever repo it was materialized from. */
+export const SUPABASE_DEFAULT_PORTS = Object.freeze(
+  new Set(SUPABASE_SERVICE_PORTS.map((s) => s.defaultPort).filter((p) => p > 0)),
+);
+
+/** `[section] enabled = true|false` as a map, for the sections that declare it.
+ * Comments are not configuration; a value the CLI would not accept is ignored so
+ * the caller falls back to the documented default. */
+function enabledFlagsInConfig(toml) {
+  const flags = new Map();
+  let section = "";
+  for (const raw of String(toml).split(/\r?\n/)) {
+    const line = raw.trim();
+    if (line.startsWith("#")) continue;
+    const sec = /^\[([^\]]+)\]/.exec(line);
+    if (sec) { section = sec[1].trim(); continue; }
+    const dotted = /^([A-Za-z0-9_.]+)\.enabled\s*=\s*(true|false)\b/.exec(line);
+    if (dotted) { if (!flags.has(dotted[1])) flags.set(dotted[1], dotted[2] === "true"); continue; }
+    if (!section) continue;
+    const m = /^enabled\s*=\s*(true|false)\b/.exec(line);
+    if (m && !flags.has(section)) flags.set(section, m[1] === "true");
+  }
+  return flags;
+}
+
+/**
+ * What the Supabase CLI would actually do with `configText`, per service: which
+ * section spells it, whether the config declares its port, whether the CLI binds
+ * it at all, and the port it would end up using (`effectivePort` — declared, or
+ * the CLI's own default). This is the view BOTH the materializer (which ports
+ * must be made explicit) and the isolation assertion (which ports must differ
+ * from the default and from the shared stack's) are written against.
+ */
+export function supabaseServicePortState(configText) {
+  const ports = portMapInConfig(configText);
+  const flags = enabledFlagsInConfig(configText);
+  return SUPABASE_SERVICE_PORTS.map((svc) => {
+    const declaredSection = svc.sections.find((s) => ports.has(`${s}.${svc.key}`)) ?? null;
+    // A service is spelled by whichever of its aliases the config already uses —
+    // for its port, for any of its other ports, or for its `enabled` flag — so a
+    // `[local_smtp]` repo never gets an `[inbucket]` section appended beside it.
+    const usedSection = declaredSection
+      ?? svc.sections.find((s) => SUPABASE_SERVICE_PORTS.some((o) => o.service !== svc.service && o.sections.includes(s) && ports.has(`${s}.${o.key}`)))
+      ?? svc.sections.find((s) => flags.has(s))
+      ?? svc.sections[0];
+    const enabledSection = svc.sections.find((s) => flags.has(s));
+    const enabled = enabledSection === undefined ? svc.defaultEnabled : flags.get(enabledSection);
+    const declaredPort = declaredSection === null ? null : Number(ports.get(`${declaredSection}.${svc.key}`));
+    const fallback = svc.bindsWhenUnset === false ? null : svc.defaultPort;
+    const effectivePort = !enabled ? null : (declaredPort ?? fallback);
+    return {
+      service: svc.service,
+      label: svc.label,
+      key: svc.key,
+      defaultPort: svc.defaultPort,
+      section: usedSection,
+      qualifiedKey: `${usedSection}.${svc.key}`,
+      declared: declaredPort !== null,
+      declaredPort,
+      enabled,
+      bound: effectivePort !== null,
+      effectivePort,
+    };
+  });
+}
+
 /** Lowercase-alphanumeric tail of a ticket/slot, e.g. `BOT-1798` → `bot1798`. */
 function identityTag(ticket, slot) {
   const source = String(ticket ?? "").trim() || String(slot ?? "").trim();
@@ -153,6 +264,49 @@ export function leasedStackIdentity({ worktreeRoot, slot, ticket, nonce } = {})
 
 const PROJECT_ID_RE = /^[a-z][a-z0-9]{0,19}$/;
 
+const escapeRe = (s) => String(s).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+
+/**
+ * BOT-1835 — write `<key> = <port>` for a service the source config left implicit,
+ * into the config body `out` (an array of lines, mutated in place).
+ *
+ * Three placements, in order of how the source already spells that table:
+ *   1. a `[section]` header exists → the key joins it, directly under the header;
+ *   2. only ROOT-LEVEL dotted keys exist (`api.port = …`) → the key joins them in
+ *      the same dotted form, because TOML forbids re-opening with `[api]` a table
+ *      that dotted keys already defined;
+ *   3. the table is absent → append it. Appending only ever adds a port, never an
+ *      `enabled` flag, so materialization can never start a service the source
+ *      does not run.
+ */
+function insertSectionPort(out, section, key, port, defaultPort) {
+  const note = defaultPort > 0 ? `  # BOT-1835: undeclared, so the CLI would bind its default ${defaultPort}` : "";
+  const isComment = (line) => line.trim().startsWith("#");
+  const headerAt = out.findIndex((line) => !isComment(line) && new RegExp(`^\\s*\\[${escapeRe(section)}\\]\\s*(?:#.*)?$`).test(line));
+  if (headerAt >= 0) {
+    // After the section's LAST key, so a service needing two ports (`[db]`) reads
+    // in declaration order and a trailing comment keeps the line it introduces.
+    let at = headerAt;
+    for (let i = headerAt + 1; i < out.length; i++) {
+      if (!isComment(out[i]) && /^\s*\[[^\]]+\]/.test(out[i])) break;
+      if (!isComment(out[i]) && /^\s*[A-Za-z0-9_."']+.*=/.test(out[i])) at = i;
+    }
+    out.splice(at + 1, 0, `${key} = ${port}${note}`);
+    return;
+  }
+  const firstHeader = out.findIndex((line) => !isComment(line) && /^\s*\[[^\]]+\]/.test(line));
+  const limit = firstHeader < 0 ? out.length : firstHeader;
+  const dotted = new RegExp(`^\\s*${escapeRe(section)}\\.[A-Za-z0-9_]+\\s*=`);
+  let lastDotted = -1;
+  for (let i = 0; i < limit; i++) if (!isComment(out[i]) && dotted.test(out[i])) lastDotted = i;
+  if (lastDotted >= 0) {
+    out.splice(lastDotted + 1, 0, `${section}.${key} = ${port}${note}`);
+    return;
+  }
+  while (out.length && out[out.length - 1].trim() === "") out.pop();
+  out.push("", `[${section}]`, `${key} = ${port}${note}`, "");
+}
+
 /**
  * The worktree's own config with exactly THREE things changed: `project_id`,
  * every declared host port, and the edge runtime's own public origin. Everything
@@ -184,12 +338,12 @@ export function rewriteLeasedStackConfig(configText, { projectId, portBase } = {
   const bare = new RegExp(`^(\\s*)((?:[A-Za-z0-9]+_)?port)(\\s*=\\s*)${TOML_INT_PORT}(.*)$`);
   const dotted = new RegExp(`^(\\s*)([A-Za-z0-9_]+\\.(?:[A-Za-z0-9]+_)?port)(\\s*=\\s*)${TOML_INT_PORT}(.*)$`);
   const ports = new Map();
-  const assign = (key) => {
+  const assign = (key, why = `supabase/config.toml declares more than ${LEASED_PORT_STRIDE} host ports`) => {
     if (!ports.has(key)) {
       if (ports.size >= LEASED_PORT_STRIDE) {
         throw new Error(
-          `refusing to materialize an isolated leased stack: supabase/config.toml declares more than ${LEASED_PORT_STRIDE} host ports ` +
-            `(at "${key}") — the leased port block cannot hold them all, and reusing a port would collide inside the stack. ` +
+          `refusing to materialize an isolated leased stack: ${why} (at "${key}") — the leased port block ` +
+            `of ${LEASED_PORT_STRIDE} cannot hold them all, and reusing a port would collide inside the stack. ` +
             "Widen LEASED_PORT_STRIDE (and the band in docs/docker-capacity.md) before adding more services.",
         );
       }
@@ -224,6 +378,19 @@ export function rewriteLeasedStackConfig(configText, { projectId, portBase } = {
     }
     out.push(line);
   }
+  // BOT-1835 — then make the UNDECLARED ports explicit. Everything above remaps
+  // what the repo wrote down; a repo that writes nothing down (Supply Guard's
+  // config is a single `project_id` line) would otherwise inherit Supabase's own
+  // 543xx defaults and collide with the shared stack and with every other lease.
+  // Only services the CLI would actually bind are given a port — a disabled
+  // section, and a port the CLI publishes only when named (inbucket's
+  // smtp/pop3), stay exactly as the source left them.
+  for (const svc of supabaseServicePortState(configText)) {
+    if (svc.declared || !svc.bound) continue;
+    const port = assign(svc.qualifiedKey, `supabase/config.toml leaves the ${svc.label} port to Supabase's default (${svc.defaultPort}) and the leased block is already full`);
+    insertSectionPort(out, svc.section, svc.key, port, svc.defaultPort);
+  }
+
   // Pin the edge origin AFTER the port pass: [edge_runtime.secrets] may precede
   // [api] in the file, so the leased api port is only known once every line is seen.
   const apiPort = ports.get("api.port");
@@ -315,6 +482,34 @@ export function assertLeasedStackIsolated(rootConfigText, stackConfigText) {
   if (shared.length) {
     throw new Error(`refusing to lease a materialized stack that reuses the shared stack's port(s) ${shared.join(", ")}.`);
   }
+  // BOT-1835 — the checks above compare what the two configs WRITE DOWN, which is
+  // vacuous for a repo that writes nothing down: the CLI then binds its own
+  // defaults and the "isolated" stack is the 543xx block every other stack falls
+  // back to. So compare what the CLI would actually BIND, service by service.
+  const rootServices = new Map(supabaseServicePortState(rootConfigText).map((s) => [s.service, s]));
+  for (const svc of supabaseServicePortState(stackConfigText)) {
+    if (!svc.bound) continue;
+    if (!svc.declared) {
+      throw new Error(
+        `refusing to lease a materialized stack that leaves the ${svc.label} port undeclared: the Supabase CLI binds its own ` +
+          `default (${svc.defaultPort}) there, and so does every other stack on this host that declares none.`,
+      );
+    }
+    if (svc.effectivePort === svc.defaultPort) {
+      throw new Error(
+        `refusing to lease a materialized stack whose ${svc.label} port is Supabase's default (${svc.defaultPort}) — ` +
+          "the shared canonical stack and every other default-porting stack bind exactly that port.",
+      );
+    }
+    const rootPort = rootServices.get(svc.service)?.effectivePort ?? null;
+    if (rootPort !== null && svc.effectivePort === rootPort) {
+      throw new Error(
+        `refusing to lease a materialized stack whose ${svc.label} port (${svc.effectivePort}) is the port the worktree's own ` +
+          "stack uses — declared there or inherited from Supabase's defaults, it is the same bound socket.",
+      );
+    }
+  }
+
   // The edge runtime must emit THIS stack's public URLs (BOT-1798, Codex #928 R9).
   // A config that leaves `env(VITE_SUPABASE_URL)` in place — the repo default,
   // because a local `supabase start` exports the origin into the shell — resolves
@@ -871,6 +1066,202 @@ function prune(stackSupabaseDir, { readdir, remove }) {
   }
 }
 
+// ── BOT-1828: functions that import a file outside supabase/ ───────────────
+//
+// Supply Guard's `supabase/functions/admin-api-keys/index.ts` imports
+// `../../../src/lib/platformApiKeysCatalog.ts` — outside `supabase/`, so the whole-tree
+// copy above never brings it along. The Supabase CLI resolves function imports when it
+// STARTS the edge runtime, so `supabase start` inside the isolated stack fails deep
+// inside the Helper with a raw ENOENT. This is a dependency-free regex walk over
+// `import …/export …/from "…"` and dynamic `import("…")` string literals — not a real
+// module resolver (the published CLI is Node-stdlib only) — so it can miss an exotic
+// re-export form, but every specifier it DOES find is resolved for real (existence +
+// worktree-containment) before anything is trusted.
+const ESCAPING_IMPORT_SCAN_EXTENSIONS = [".ts", ".js", ".mjs"];
+const ESCAPING_IMPORT_MANIFEST_NAMES = ["import_map.json", "deno.json"];
+const SUPABASE_DIR_PREFIX = `supabase${sep}`;
+
+const IMPORT_SPECIFIER_PATTERNS = [
+  // `import … from "…"` / `export … from "…"` (default, named, namespace, type-only).
+  /\b(?:import|export)\b[^'";]*?\bfrom\s*["']([^"']+)["']/g,
+  // dynamic `import("…")`.
+  /\bimport\s*\(\s*["']([^"']+)["']\s*\)/g,
+  // bare side-effecting `import "…"` (no `from` clause).
+  /^[ \t]*import\s*["']([^"']+)["']\s*;?/gm,
+];
+
+/** Strip comments before scanning for import specifiers (Codex #946 R1 P2): a
+ * `// import { old } from "../../../removed.ts"` note (or block comment) is not a
+ * live dependency, but the plain regex above has no idea — treating it as one turns
+ * a stale comment into a hard refusal of the whole stack. Block comments are removed
+ * outright; `//` line comments are stripped with a quote-aware per-character scan so
+ * a real specifier like `"https://deno.land/std/foo.ts"` (a `//` INSIDE a string) is
+ * never mistaken for a comment. Not a real tokenizer — a `/*`/`//` inside a template
+ * literal can still confuse it — but it closes the concrete failure mode a bare
+ * comment caused, which is what actually shipped in real function source. */
+function stripComments(source) {
+  const noBlockComments = source.replace(/\/\*[\s\S]*?\*\//g, "");
+  return noBlockComments
+    .split("\n")
+    .map((line) => {
+      let inString = null;
+      for (let i = 0; i < line.length; i++) {
+        const ch = line[i];
+        if (inString) {
+          if (ch === "\\") { i++; continue; }
+          if (ch === inString) inString = null;
+          continue;
+        }
+        if (ch === '"' || ch === "'" || ch === "`") { inString = ch; continue; }
+        if (ch === "/" && line[i + 1] === "/") return line.slice(0, i);
+      }
+      return line;
+    })
+    .join("\n");
+}
+
+/** Every string-literal specifier this source imports or re-exports, deduped. */
+function extractImportSpecifiers(source) {
+  const specifiers = new Set();
+  const clean = stripComments(source);
+  for (const pattern of IMPORT_SPECIFIER_PATTERNS) {
+    pattern.lastIndex = 0;
+    let match;
+    while ((match = pattern.exec(clean)) !== null) specifiers.add(match[1]);
+  }
+  return specifiers;
+}
+
+function isRelativeSpecifier(specifier) {
+  return specifier.startsWith("./") || specifier.startsWith("../");
+}
+
+/** Recursively list files under `dir` (absolute) whose name matches one of `names`
+ * (exact basenames, e.g. "deno.json") or ends with one of `exts` (e.g. ".ts") — via
+ * the same low-level readdir/stat the rest of the materializer uses, so a
+ * fault-injecting test still exercises this path. A missing `dir` has nothing to scan. */
+function listMatchingFiles(dir, { exts = [], names = [] }, { readdir, stat }) {
+  const out = [];
+  const pending = [dir];
+  while (pending.length) {
+    const current = pending.pop();
+    let entries;
+    try { entries = readdir(current); } catch { continue; }
+    for (const entry of entries) {
+      const full = join(current, entry);
+      let info;
+      try { info = stat(full); } catch { continue; }
+      if (info.isDirectory()) { pending.push(full); continue; }
+      if (names.includes(entry) || exts.some((ext) => entry.endsWith(ext))) out.push(full);
+    }
+  }
+  return out;
+}
+
+/**
+ * Scan `supabase/functions/**` (source files plus `import_map.json`/`deno.json`
+ * "imports" entries) for RELATIVE specifiers that resolve outside `supabase/`, copy
+ * each into the stack directory at the identical worktree-relative path, and follow
+ * relative imports of the COPIED files transitively. Refuses loudly — before this
+ * call copies anything — if a specifier resolves outside the worktree root or to a
+ * file that does not exist, naming the importing file and the specifier. Returns the
+ * sorted list of worktree-relative paths copied (possibly empty).
+ */
+function copyEscapingImports(worktreeRoot, stackDir, { read, mkdir, copy, readdir, stat, realpath }) {
+  const functionsDir = join(worktreeRoot, "supabase", "functions");
+  const visited = new Set(); // worktree-relative paths already queued or copied
+  const queue = [];
+
+  const resolveSpecifier = (specifier, importingAbsDir, importingRelPath) => {
+    // Lexical: `join` collapses `..`/`.` as STRINGS but never follows a symlinked
+    // directory component. fs reads/copies below follow symlinks transparently, so
+    // this is a perfectly usable path for existence/content — and, per Codex #946
+    // R1 P2, it is the path an import specifier reads relative to the COPIED file's
+    // own on-disk location once materialized, so it is what the destination and any
+    // further relative-import resolution must use too.
+    const candidate = join(importingAbsDir, specifier);
+    let real;
+    try {
+      real = realpath(candidate);
+    } catch (error) {
+      throw new Error(
+        `refusing to materialize an isolated leased stack: ${importingRelPath} imports "${specifier}", which does not exist ` +
+          `(resolved to ${candidate}${error?.code ? `: ${error.code}` : ""}). Fix the import or add the missing file.`,
+      );
+    }
+    // Security containment uses the REAL, symlink-resolved location: a symlink
+    // whose TARGET is outside the worktree must be refused even when its own
+    // lexical path looks like it stays inside.
+    const realRel = relative(worktreeRoot, real);
+    if (realRel === ".." || realRel.startsWith(`..${sep}`) || isAbsolute(realRel)) {
+      throw new Error(
+        `refusing to materialize an isolated leased stack: ${importingRelPath} imports "${specifier}", which resolves to ` +
+          `${real} — outside the worktree root ${worktreeRoot}. Move the file into the worktree, or fix the import.`,
+      );
+    }
+    // The DESTINATION (and this file's own identity in `visited`/`queue`) mirrors
+    // the LEXICAL candidate, not `real`: copying to `real`'s location would place
+    // the file somewhere the unmodified import specifier never names, and the
+    // materialized stack would fail with the same missing-file error this ticket
+    // exists to fix (Codex #946 R1 P2).
+    const rel = relative(worktreeRoot, candidate);
+    if (rel === ".." || rel.startsWith(`..${sep}`) || isAbsolute(rel)) {
+      throw new Error(
+        `refusing to materialize an isolated leased stack: ${importingRelPath} imports "${specifier}", which resolves to ` +
+          `${candidate} — outside the worktree root ${worktreeRoot}. Move the file into the worktree, or fix the import.`,
+      );
+    }
+    if (rel === "supabase" || rel.startsWith(SUPABASE_DIR_PREFIX)) return; // already copied whole
+    if (visited.has(rel)) return;
+    visited.add(rel);
+    queue.push({ absPath: candidate, relPath: rel });
+  };
+
+  const scanForImports = (absPath, relPath) => {
+    let source;
+    try { source = read(absPath, "utf8"); } catch { return; }
+    for (const specifier of extractImportSpecifiers(source)) {
+      if (isRelativeSpecifier(specifier)) resolveSpecifier(specifier, dirname(absPath), relPath);
+    }
+  };
+
+  for (const file of listMatchingFiles(functionsDir, { exts: ESCAPING_IMPORT_SCAN_EXTENSIONS }, { readdir, stat })) {
+    scanForImports(file, relative(worktreeRoot, file));
+  }
+  for (const file of listMatchingFiles(functionsDir, { names: ESCAPING_IMPORT_MANIFEST_NAMES }, { readdir, stat })) {
+    let parsed;
+    try { parsed = JSON.parse(read(file, "utf8")); } catch { continue; }
+    const imports = parsed?.imports;
+    if (!imports || typeof imports !== "object") continue;
+    const relPath = relative(worktreeRoot, file);
+    for (const specifier of Object.values(imports)) {
+      if (typeof specifier === "string" && isRelativeSpecifier(specifier)) {
+        resolveSpecifier(specifier, dirname(file), relPath);
+      }
+    }
+  }
+
+  const extraFiles = [];
+  while (queue.length) {
+    const item = queue.shift();
+    const dest = join(stackDir, item.relPath);
+    mkdir(dirname(dest), { recursive: true });
+    // An import-map "imports" entry may be a PREFIX mapping to a directory (e.g.
+    // `"@lib/": "../../../src/lib/"`, valid Deno import-map syntax) rather than a
+    // single file — cpSync without `recursive` throws ERR_FS_EISDIR on that (Codex
+    // #946 R1 P1). Copy the whole directory in that case; there is no single file
+    // whose text to scan for further imports.
+    let isDir = false;
+    try { isDir = stat(item.absPath).isDirectory(); } catch { /* copy() will report it */ }
+    copy(item.absPath, dest, isDir ? { recursive: true, force: true } : { force: true });
+    extraFiles.push(item.relPath);
+    if (!isDir && ESCAPING_IMPORT_SCAN_EXTENSIONS.some((ext) => item.relPath.endsWith(ext))) {
+      scanForImports(item.absPath, item.relPath);
+    }
+  }
+  return extraFiles.sort();
+}
+
 /**
  * Materialize (or refresh) the isolated stack directory for this run and return
  * its path RELATIVE to the worktree root — never `"."`. The directory belongs to
@@ -941,7 +1332,7 @@ export function materializeRunStackDir(cwd, { slot, ticket, nonce, idleTtlSecs }
   // stable per-slot one, so the project id is exactly as specific (and keeps a
   // refresh idempotent).
   const invocationToken = nonce ? String(nonce) : identity.projectId;
-  const marker = (portBase) => JSON.stringify({
+  const marker = (portBase, extraFiles = []) => JSON.stringify({
     schema: 1,
     project_id: identity.projectId,
     invocation_token: invocationToken,
@@ -953,6 +1344,10 @@ export function materializeRunStackDir(cwd, { slot, ticket, nonce, idleTtlSecs }
     retain_until: createdAt + Math.max(LEASED_STACK_GC_MIN_AGE_MS, ttlMs + LEASED_STACK_RETENTION_GRACE_MS),
     owner_pid: process.pid,
     host: host(),
+    // BOT-1828: worktree-relative paths copied because an edge function imports
+    // outside supabase/ — recorded so an operator can see why this stack dir has
+    // (e.g.) a src/ directory, instead of guessing at a `supabase start` failure.
+    extra_files: extraFiles,
   });
   const registryDir = io.portRegistryDir ?? defaultPortRegistryDir();
   const writeExclusive = io.writeExclusive ?? ((path, data) => writeFileSync(path, data, { flag: "wx" }));
@@ -1016,11 +1411,18 @@ export function materializeRunStackDir(cwd, { slot, ticket, nonce, idleTtlSecs }
       filter: (source) => !SKIP_ENTRIES.has(basename(source)),
     });
     write(join(stackDir, "supabase", "config.toml"), text);
+
+    // BOT-1828: bring along any file an edge function imports OUTSIDE supabase/
+    // (Supply Guard's admin-api-keys/index.ts pulls in ../../../src/lib/…) —
+    // `supabase start` resolves function imports when it starts the edge runtime, so
+    // without this the Helper fails deep inside `supabase start` with a raw ENOENT.
+    const extraFiles = copyEscapingImports(worktreeRoot, stackDir, { read, mkdir, copy, readdir, stat, realpath: resolveRoot });
+
   // Re-state the claim after the copy: the marker records who owns this directory,
   // which port block it holds, and how long a later run must keep it (Codex #928
   // R7/R12). It lives beside `supabase/`, which the refresh replaces wholesale.
-    atomicWrite(join(stackDir, LEASED_STACK_MARKER), marker(portBase), { write, rename });
-    atomicWrite(portClaimPath(registryDir, portBase), marker(portBase), { write, rename });
+    atomicWrite(join(stackDir, LEASED_STACK_MARKER), marker(portBase, extraFiles), { write, rename });
+    atomicWrite(portClaimPath(registryDir, portBase), marker(portBase, extraFiles), { write, rename });
     return stackPath;
   } catch (error) {
     try { remove(portClaimPath(registryDir, portBase), { force: true }); } catch { /* best effort */ }