@relayflows/sdk 2.0.32 → 2.0.33

package/dist/helper-reference.js

@@ -27,7 +27,8 @@ export function helperNamespacesUsed(body, root) {
     if (program === null)
         return textFallback(body, root);
     const used = new Set();
-    walk(program, (node) => {
+    const scope = { rootFunctionFound: false };
+    walkReferences(program, root, false, scope, (node) => {
         if (node.type !== 'MemberExpression')
             return;
         const object = node.object;
@@ -106,9 +107,46 @@ function textFallback(body, root) {
     }
     return used;
 }
-/** Depth-first over every child node, without pulling in a second package. */
-function walk(node, visit) {
-    visit(node);
+/**
+ * Depth-first over references that still resolve to the outer flow context.
+ *
+ * A nested callback/method parameter or lexical destructuring can reuse the
+ * context's spelling while binding an unrelated value. Counting its members
+ * would refuse the flow for a mount it never touches. Acorn gives us binding
+ * shapes, so scopes are tracked as syntax instead of guessed from text.
+ */
+function walkReferences(node, root, shadowed, state, visit) {
+    if (isFunction(node)) {
+        const parameters = Array.isArray(node.params) ? node.params.filter(isNode) : [];
+        const bindsParameter = parameters.some(parameter => patternBinds(parameter, root));
+        let bodyHidden = shadowed;
+        const isRootFunction = bindsParameter && !state.rootFunctionFound;
+        if (isRootFunction)
+            state.rootFunctionFound = true;
+        else if (bindsParameter || (isNode(node.id) && patternBinds(node.id, root)) || functionVarBinds(node, root)) {
+            bodyHidden = true;
+        }
+        // Parameter initializers run before the function body and are outside a
+        // body-level `var` scope. Keep them visible unless the parameter list
+        // itself binds the root name (in which case all parameter references are
+        // local to that parameter environment).
+        const parameterHidden = shadowed || (bindsParameter && !isRootFunction);
+        for (const parameter of parameters)
+            walkReferences(parameter, root, parameterHidden, state, visit);
+        const body = isNode(node.body) ? node.body : undefined;
+        if (body !== undefined)
+            walkReferences(body, root, bodyHidden, state, visit);
+        return;
+    }
+    let hidden = shadowed;
+    if (node.type === 'BlockStatement' && blockBinds(node, root)) {
+        hidden = true;
+    }
+    else if (node.type === 'CatchClause' && isNode(node.param) && patternBinds(node.param, root)) {
+        hidden = true;
+    }
+    if (!hidden)
+        visit(node);
     for (const key of Object.keys(node)) {
         if (key === 'type' || key === 'start' || key === 'end' || key === 'loc')
             continue;
@@ -116,13 +154,103 @@ function walk(node, visit) {
         if (Array.isArray(child)) {
             for (const entry of child)
                 if (isNode(entry))
-                    walk(entry, visit);
+                    walkReferences(entry, root, hidden, state, visit);
         }
         else if (isNode(child)) {
-            walk(child, visit);
+            walkReferences(child, root, hidden, state, visit);
         }
     }
 }
+function isFunction(node) {
+    return node.type === 'ArrowFunctionExpression'
+        || node.type === 'FunctionExpression'
+        || node.type === 'FunctionDeclaration';
+}
+/** Lexical declarations bind across their complete block, including TDZ. */
+function blockBinds(node, root) {
+    const statements = Array.isArray(node.body) ? node.body.filter(isNode) : [];
+    return statements.some((statement) => {
+        if (statement.type === 'VariableDeclaration' && statement.kind !== 'var') {
+            const declarations = Array.isArray(statement.declarations)
+                ? statement.declarations.filter(isNode) : [];
+            return declarations.some(declaration => isNode(declaration.id) && patternBinds(declaration.id, root));
+        }
+        return (statement.type === 'FunctionDeclaration' || statement.type === 'ClassDeclaration')
+            && isNode(statement.id) && patternBinds(statement.id, root);
+    });
+}
+/** Identifier occurrences that introduce bindings, including nested patterns. */
+function patternBinds(pattern, root) {
+    switch (pattern.type) {
+        case 'Identifier':
+            return pattern.name === root;
+        case 'AssignmentPattern':
+            return isNode(pattern.left) && patternBinds(pattern.left, root);
+        case 'RestElement':
+            return isNode(pattern.argument) && patternBinds(pattern.argument, root);
+        case 'ArrayPattern': {
+            const elements = Array.isArray(pattern.elements) ? pattern.elements : [];
+            return elements.some(element => isNode(element) && patternBinds(element, root));
+        }
+        case 'ObjectPattern': {
+            const properties = Array.isArray(pattern.properties) ? pattern.properties : [];
+            return properties.some(property => {
+                if (!isNode(property))
+                    return false;
+                if (property.type === 'RestElement') {
+                    return isNode(property.argument) && patternBinds(property.argument, root);
+                }
+                // Object keys are labels, not bindings. Only the value side introduces
+                // the local (including a default-value AssignmentPattern's left side).
+                return property.type === 'Property'
+                    && isNode(property.value)
+                    && patternBinds(property.value, root);
+            });
+        }
+        default:
+            return false;
+    }
+}
+/** `var` is function-scoped, so a nested function's declaration hides the
+ * outer flow context for its entire body, including code before the
+ * declaration. Nested functions have their own var scopes and are skipped. */
+function functionVarBinds(node, root) {
+    const body = isNode(node.body) ? node.body : undefined;
+    if (body === undefined)
+        return false;
+    let found = false;
+    const scan = (current) => {
+        if (found)
+            return;
+        if (current !== body && isFunction(current))
+            return;
+        if (current.type === 'VariableDeclaration' && current.kind === 'var') {
+            const declarations = Array.isArray(current.declarations)
+                ? current.declarations.filter(isNode) : [];
+            if (declarations.some(declaration => isNode(declaration.id) && patternBinds(declaration.id, root))) {
+                found = true;
+                return;
+            }
+        }
+        for (const key of Object.keys(current)) {
+            if (key === 'type' || key === 'start' || key === 'end' || key === 'loc')
+                continue;
+            const child = current[key];
+            if (Array.isArray(child)) {
+                for (const entry of child)
+                    if (isNode(entry))
+                        scan(entry);
+            }
+            else if (isNode(child)) {
+                scan(child);
+            }
+            if (found)
+                return;
+        }
+    };
+    scan(body);
+    return found;
+}
 function isNode(value) {
     return typeof value === 'object' && value !== null && typeof value.type === 'string';
 }

package/dist/helper-reference.js.map

@@ -1 +1 @@
-{"version":3,"file":"helper-reference.js","sourceRoot":"","sources":["../src/helper-reference.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"helper-reference.js","sourceRoot":"","sources":["../src/helper-reference.ts"],"names":[],"mappings":"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"}

package/dist/hosted-extension-sandbox.js

@@ -69,7 +69,7 @@ const ADDRESS_SPACE_BYTES = 16 * 1024 * 1024 * 1024;
 const DATA_BYTES = 3 * 1024 * 1024 * 1024;
 const SURFACE_RUNTIME_SHA256 = OBJECT_FREEZE({
     'flow.js': '4aaeacc55de3074f4d121ce7253c3be50a93757e6540ba8159889a9450d1c05c',
-    'helpers/providers.js': '7bc62eccaa3a9e786ae0a689bf74160585149e91feef8208e17ef8eca51eed7f',
+    'helpers/providers.js': '4eb06d0d85ca0a3434bb2dbba7407e3d95eef2dfbedaeb0e2de0c0c0ea812457',
     'provider-trigger.js': 'e2664c65397f93fb486eb6f1e756c7cec3f88b3851d79c23567cad986f80f1ff',
     'schedule.js': '8fe72f176a75ec0b5f26e12db7a597575c259a2e2cbb59690f9dc20a5e63940b',
     'triggers.js': '4a3515b571a318f6c7a5661f9310bc9af43e3faf20ea39903a9b363c51258e4c',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@relayflows/sdk",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "description": "TypeScript-first authoring SDK for Relayflows. Compiles specs; speaks the journal protocol.",
   "type": "module",
   "main": "./dist/index.js",
@@ -49,7 +49,7 @@
     "@modelcontextprotocol/sdk": "^1.30.0",
     "@relayfile/adapter-core": "0.6.2",
     "@relayfile/relay-helpers": "0.4.12",
-    "@relayflows/surface": "2.0.32",
+    "@relayflows/surface": "2.0.33",
     "@types/js-yaml": "^4.0.9",
     "acorn": "^8.18.0",
     "ai-hist": "0.4.1",

package/src/cloud-mirror-step.ts

@@ -114,6 +114,18 @@ export interface FinalStep {
   model?: string;
   tokensInput?: number;
   tokensOutput?: number;
+  /**
+   * True when tokens were counted but nobody priced them.
+   *
+   * The kernel already records this (`run-state.ts`'s `Spend`), and
+   * `flows status` already prints `(unmetered)` from it. Without it on the
+   * wire, Cloud cannot tell a step that genuinely cost nothing — a
+   * deterministic `echo` — from one that spent real money against an unpriced
+   * model: both arrive as an absent `costUsd` and render blank. Codex is the
+   * everyday case, because it selects its own model and never reports it, so
+   * `MODEL_PRICING` has nothing to match (`model-pricing.ts` says so outright).
+   */
+  costUnmetered?: true;
   costUsd?: number;
   error?: string;
   detail?: Record<string, unknown>;
@@ -314,6 +326,7 @@ interface AttemptRecord {
   tokensIn?: number;
   tokensOut?: number;
   costUsd?: number;
+  costUnmetered?: boolean;
 }
 
 /**
@@ -346,6 +359,7 @@ function attemptsByStep(events: readonly JournalEvent[]): Map<string, AttemptRec
       ...(typeof result?.['total_cost_usd'] === 'number' && Number.isFinite(result['total_cost_usd'])
         && result['total_cost_usd'] >= 0
         ? { costUsd: result['total_cost_usd'] as number } : {}),
+      ...(budget['dollars_unmetered'] === true ? { costUnmetered: true } : {}),
     });
     byStep.set(event.step_id, entries);
   }
@@ -374,6 +388,23 @@ function finalStep(
   // Cloud totals these rows for the run's spend — so a retried agent's earlier
   // charges simply vanished from the run.
   const spentUsd = attempts.reduce((total, entry) => total + (entry.costUsd ?? 0), 0);
+  const priced = attempts.some(entry => entry.costUsd !== undefined);
+  /**
+   * Any unpriced attempt makes the step's cost unknown, even when another
+   * attempt reported one.
+   *
+   * The first cut suppressed the flag whenever `spentUsd > 0`, which published
+   * a partial subtotal as though it were the whole cost: a step that spent
+   * $0.02 on attempt 1 and an unpriced amount on attempt 2 reported exactly
+   * $0.02. The two facts are not exclusive — `costUsd` is then a *lower bound*
+   * and the flag says so. `run-state.ts`'s `addSpend` keeps them together for
+   * the same reason.
+   *
+   * Presence, not a positive sum: an attempt reporting `total_cost_usd: 0` did
+   * produce a price, and testing `spentUsd === 0` would have called that step
+   * unpriced.
+   */
+  const unmetered = attempts.some(entry => entry.costUnmetered === true);
   const detail = stepDetail(attempts, env);
   const verification = step.last_attempt?.verification ?? null;
   // What the step said about itself. A gate's verdict detail is the nearest
@@ -407,7 +438,8 @@ function finalStep(
     ...(model === undefined ? {} : { model }),
     ...(tokensIn > 0 ? { tokensInput: Math.min(tokensIn, MAX_INT32) } : {}),
     ...(tokensOut > 0 ? { tokensOutput: Math.min(tokensOut, MAX_INT32) } : {}),
-    ...(spentUsd > 0 ? { costUsd: spentUsd } : {}),
+    ...(priced ? { costUsd: spentUsd } : {}),
+    ...(unmetered ? { costUnmetered: true as const } : {}),
     ...(error === undefined ? {} : { error }),
     ...(detail.detail === undefined ? {} : { detail: detail.detail }),
     ...(detail.truncated === undefined ? {} : { detailTruncated: detail.truncated }),

package/src/cloud-transcript-codex.ts

@@ -32,12 +32,22 @@ export const CODEX_FRAME_TYPES: ReadonlySet<string> = new Set([
 /** Item types whose lifecycles are matched and whose fields are read. */
 const SUPPORTED_ITEMS: ReadonlySet<string> = new Set([
   'agent_message', 'reasoning', 'command_execution', 'file_change', 'mcp_tool_call', 'error',
+  // The rest of Codex's `ThreadItemDetails` union
+  // (codex-rs/exec/src/exec_events.rs). Without these three, a real agent turn
+  // reported them as bare `unknown` placeholders naming a type and a size —
+  // honest, but useless: `todo_list` in particular updates continuously
+  // through a turn, so it was the most frequent thing a reader could not read.
+  'web_search', 'todo_list', 'collab_tool_call',
 ]);
 
 const ITEM_FRAMES: ReadonlySet<string> = new Set(['item.started', 'item.updated', 'item.completed']);
 
 /** Calls are numbered; an `apply_patch` is file activity, not a call. */
-const NUMBERED_ITEMS: ReadonlySet<string> = new Set(['command_execution', 'mcp_tool_call']);
+const NUMBERED_ITEMS: ReadonlySet<string> = new Set([
+  'command_execution', 'mcp_tool_call', 'web_search', 'collab_tool_call',
+]);
+/** Todo entries listed per snapshot; a longer plan is counted, not printed. */
+const TODO_MAX_ITEMS = 12;
 
 interface Lifecycle {
   snapshots: Array<Record<string, unknown>>;
@@ -246,6 +256,65 @@ function mcpEntry(item: Record<string, unknown>, complete: boolean, context: Con
     });
 }
 
+/**
+ * `web_search`: a query and what was done with it (`WebSearchItem` — `query`,
+ * `action`, optional structured `results`). Rendered as a call rather than
+ * prose, so a reader sees the search in sequence beside the commands.
+ */
+function webSearchEntry(item: Record<string, unknown>, complete: boolean, context: Context,
+  seq: number): TranscriptEntry | null {
+  const query = str(item['query']);
+  if (query === null) return null;
+  const action = isRecord(item['action']) ? str(item['action']['type']) : str(item['action']);
+  const results = item['results'];
+  const count = Array.isArray(results) ? results.length : null;
+  return tool('web_search', bounded(query, context.clean),
+    count === null ? null : JSON.stringify(results).length, false, {
+      seq, status: action === null ? null : bounded(action, context.clean, 40),
+      exit_code: null,
+      output_excerpt: count === null ? null : `${count} result${count === 1 ? '' : 's'}`,
+      output_truncated: false, complete, error: null,
+    });
+}
+
+/**
+ * `collab_tool_call`: Codex driving other Codex threads (`CollabToolCallItem` —
+ * `tool`, `sender_thread_id`, `receiver_thread_ids`, `agents_states`).
+ *
+ * The per-agent states are reduced to a count per status rather than listed:
+ * `agents_states` is a map keyed by agent id, and ids are not something a
+ * transcript reader can act on.
+ */
+function collabEntry(item: Record<string, unknown>, complete: boolean, context: Context,
+  seq: number): TranscriptEntry | null {
+  const name = str(item['tool']);
+  if (name === null) return null;
+  const receivers = Array.isArray(item['receiver_thread_ids']) ? item['receiver_thread_ids'].length : 0;
+  const states = isRecord(item['agents_states']) ? item['agents_states'] : null;
+  const byStatus = new Map<string, number>();
+  if (states !== null) {
+    for (const state of Object.values(states)) {
+      const status = isRecord(state) ? str(state['status']) : null;
+      if (status !== null) byStatus.set(status, (byStatus.get(status) ?? 0) + 1);
+    }
+  }
+  // Redacted like every neighbouring field. A status is provider text, not a
+  // closed vocabulary this module controls, and it was the one string here that
+  // reached the page without passing the redactor.
+  const summary = bounded(
+    [...byStatus.entries()].sort().map(([status, n]) => `${n} ${status}`).join(', '),
+    context.clean,
+  );
+  const status = str(item['status']);
+  return tool('collab_tool_call',
+    bounded(`${name}${receivers > 0 ? ` → ${receivers} thread${receivers === 1 ? '' : 's'}` : ''}`, context.clean),
+    null, status === 'failed', {
+      seq, status: status === null ? null : bounded(status, context.clean, 40),
+      exit_code: null, output_excerpt: summary.length === 0 ? null : summary,
+      output_truncated: false, complete, error: null,
+    });
+}
+
 function fileChangeEntry(item: Record<string, unknown>, complete: boolean, context: Context): TranscriptEntry | null {
   const raw = item['changes'];
   if (!Array.isArray(raw)) return null;
@@ -288,12 +357,35 @@ function itemEntries(item: Record<string, unknown>, complete: boolean, context:
     if (message === null) return [placeholder(context, itemType)];
     return [{ kind: 'error', source: 'item', message: bounded(message, context.clean, ERROR_MAX_CHARS) }];
   }
-  if (itemType === 'command_execution' || itemType === 'mcp_tool_call') {
+  if (itemType === 'todo_list') {
+    // A plan, not a call: it carries no status and earns no sequence number.
+    // `items[]` is `{text, completed}` (TodoListItem/TodoItem).
+    const items = Array.isArray(item['items']) ? item['items'] : null;
+    if (items === null) return [placeholder(context, itemType)];
+    const listed = items.slice(0, TODO_MAX_ITEMS).flatMap((entry) => {
+      const todo = isRecord(entry) ? entry : undefined;
+      const text = str(todo?.['text']);
+      return text === null ? [] : [{ text: context.clean(text), done: todo!['completed'] === true }];
+    });
+    // Counted across the whole plan; only the *display* is capped. Counting the
+    // prefix rendered a 13-item plan whose last item was done as `0/13`, which
+    // is exactly backwards from "the rest are counted, not printed".
+    const done = items.filter(entry => isRecord(entry) && entry['completed'] === true).length;
+    return [{
+      kind: 'todo', total: items.length, done,
+      items: listed, ...(items.length > listed.length ? { omitted: items.length - listed.length } : {}),
+      ...(complete ? {} : { complete: false }),
+    }];
+  }
+  if (itemType === 'command_execution' || itemType === 'mcp_tool_call'
+    || itemType === 'web_search' || itemType === 'collab_tool_call') {
     // The number is only spent on a call this module could actually read, so a
     // malformed item leaves no gap in the sequence.
     const seq = context.state.seq + 1;
-    const entry = itemType === 'command_execution'
-      ? commandEntry(item, complete, context, seq) : mcpEntry(item, complete, context, seq);
+    const entry = itemType === 'command_execution' ? commandEntry(item, complete, context, seq)
+      : itemType === 'mcp_tool_call' ? mcpEntry(item, complete, context, seq)
+      : itemType === 'web_search' ? webSearchEntry(item, complete, context, seq)
+      : collabEntry(item, complete, context, seq);
     if (entry === null) return [placeholder(context, itemType)];
     context.state.seq = seq;
     return [entry];

package/src/cloud-transcript-types.ts

@@ -138,6 +138,22 @@ export interface TranscriptResult {
   cache_creation: number | null;
 }
 
+/**
+ * Codex's running to-do list (`TodoListItem`). A plan, not a call: it carries
+ * no status and takes no sequence number, and it updates repeatedly through a
+ * turn — which is why leaving it unparsed was the most visible gap.
+ */
+export interface TranscriptTodo {
+  kind: 'todo';
+  total: number;
+  done: number;
+  items: Array<{ text: string; done: boolean }>;
+  /** Entries past the per-snapshot cap: counted, never printed. */
+  omitted?: number;
+  /** False when read off a snapshot that never completed. */
+  complete?: boolean;
+}
+
 export interface TranscriptUnknown {
   kind: 'unknown';
   type: string;
@@ -152,7 +168,8 @@ export interface TranscriptUnparsed {
 export type TranscriptEntry =
   | TranscriptAttempt | TranscriptAttemptOmitted | TranscriptInit | TranscriptMessage
   | TranscriptThinking | TranscriptTool | TranscriptFileChange | TranscriptThread
-  | TranscriptTurn | TranscriptError | TranscriptResult | TranscriptUnknown | TranscriptUnparsed;
+  | TranscriptTurn | TranscriptError | TranscriptResult | TranscriptTodo
+  | TranscriptUnknown | TranscriptUnparsed;
 
 export interface ParsedTranscript {
   entries: TranscriptEntry[];

package/src/cloud-transcript.ts

@@ -34,7 +34,7 @@ import { redact } from './redact.js';
 export type {
   ParsedTranscript, TranscriptEntry, TranscriptAttempt, TranscriptAttemptOmitted, TranscriptError,
   TranscriptFileChange, TranscriptInit, TranscriptMessage, TranscriptResult, TranscriptThinking,
-  TranscriptThread, TranscriptTool, TranscriptToolCodex, TranscriptTurn, TranscriptUnknown,
+  TranscriptThread, TranscriptTodo, TranscriptTool, TranscriptToolCodex, TranscriptTurn, TranscriptUnknown,
   TranscriptUnparsed,
 } from './cloud-transcript-types.js';
 
@@ -297,6 +297,14 @@ export function renderAgentTranscript(parsed: ParsedTranscript): string[] {
       case 'thinking':
         lines.push(`  thinking  ${thousands(entry.chars)} chars (not shown)`);
         break;
+      case 'todo': {
+        // The plan the agent is working to, as it stood at this snapshot.
+        const progress = `${entry.done}/${entry.total}`;
+        lines.push(`  plan  ${progress}${entry.complete === false ? ' (in progress)' : ''}`);
+        for (const todo of entry.items) lines.push(`    ${todo.done ? '✓' : '·'} ${safe(todo.text)}`);
+        if (entry.omitted !== undefined) lines.push(`    …${entry.omitted} more`);
+        break;
+      }
       case 'tool': {
         const size = entry.is_error ? 'ERROR'
           : entry.result_chars === null ? 'no result' : `${thousands(entry.result_chars)} chars`;

package/src/helper-reference.ts

@@ -27,7 +27,8 @@ export function helperNamespacesUsed(body: string, root: string): ReadonlySet<st
   const program = parseFlowBody(body);
   if (program === null) return textFallback(body, root);
   const used = new Set<string>();
-  walk(program, (node) => {
+  const scope = { rootFunctionFound: false };
+  walkReferences(program, root, false, scope, (node) => {
     if (node.type !== 'MemberExpression') return;
     const object = node.object as AstNode | undefined;
     if (object?.type !== 'Identifier' || object.name !== root) return;
@@ -111,20 +112,144 @@ type AstNode = {
   [key: string]: unknown;
 };
 
-/** Depth-first over every child node, without pulling in a second package. */
-function walk(node: AstNode, visit: (node: AstNode) => void): void {
-  visit(node);
+/**
+ * Depth-first over references that still resolve to the outer flow context.
+ *
+ * A nested callback/method parameter or lexical destructuring can reuse the
+ * context's spelling while binding an unrelated value. Counting its members
+ * would refuse the flow for a mount it never touches. Acorn gives us binding
+ * shapes, so scopes are tracked as syntax instead of guessed from text.
+ */
+function walkReferences(
+  node: AstNode,
+  root: string,
+  shadowed: boolean,
+  state: { rootFunctionFound: boolean },
+  visit: (node: AstNode) => void,
+): void {
+  if (isFunction(node)) {
+    const parameters = Array.isArray(node.params) ? node.params.filter(isNode) : [];
+    const bindsParameter = parameters.some(parameter => patternBinds(parameter, root));
+    let bodyHidden = shadowed;
+    const isRootFunction = bindsParameter && !state.rootFunctionFound;
+    if (isRootFunction) state.rootFunctionFound = true;
+    else if (bindsParameter || (isNode(node.id) && patternBinds(node.id, root)) || functionVarBinds(node, root)) {
+      bodyHidden = true;
+    }
+    // Parameter initializers run before the function body and are outside a
+    // body-level `var` scope. Keep them visible unless the parameter list
+    // itself binds the root name (in which case all parameter references are
+    // local to that parameter environment).
+    const parameterHidden = shadowed || (bindsParameter && !isRootFunction);
+    for (const parameter of parameters) walkReferences(parameter, root, parameterHidden, state, visit);
+    const body = isNode(node.body) ? node.body : undefined;
+    if (body !== undefined) walkReferences(body, root, bodyHidden, state, visit);
+    return;
+  }
+  let hidden = shadowed;
+  if (node.type === 'BlockStatement' && blockBinds(node, root)) {
+    hidden = true;
+  } else if (node.type === 'CatchClause' && isNode(node.param) && patternBinds(node.param, root)) {
+    hidden = true;
+  }
+
+  if (!hidden) visit(node);
   for (const key of Object.keys(node)) {
     if (key === 'type' || key === 'start' || key === 'end' || key === 'loc') continue;
     const child = node[key];
     if (Array.isArray(child)) {
-      for (const entry of child) if (isNode(entry)) walk(entry, visit);
+      for (const entry of child) if (isNode(entry)) walkReferences(entry, root, hidden, state, visit);
     } else if (isNode(child)) {
-      walk(child, visit);
+      walkReferences(child, root, hidden, state, visit);
     }
   }
 }
 
+function isFunction(node: AstNode): boolean {
+  return node.type === 'ArrowFunctionExpression'
+    || node.type === 'FunctionExpression'
+    || node.type === 'FunctionDeclaration';
+}
+
+/** Lexical declarations bind across their complete block, including TDZ. */
+function blockBinds(node: AstNode, root: string): boolean {
+  const statements = Array.isArray(node.body) ? node.body.filter(isNode) : [];
+  return statements.some((statement) => {
+    if (statement.type === 'VariableDeclaration' && statement.kind !== 'var') {
+      const declarations = Array.isArray(statement.declarations)
+        ? statement.declarations.filter(isNode) : [];
+      return declarations.some(declaration => isNode(declaration.id) && patternBinds(declaration.id, root));
+    }
+    return (statement.type === 'FunctionDeclaration' || statement.type === 'ClassDeclaration')
+      && isNode(statement.id) && patternBinds(statement.id, root);
+  });
+}
+
+/** Identifier occurrences that introduce bindings, including nested patterns. */
+function patternBinds(pattern: AstNode, root: string): boolean {
+  switch (pattern.type) {
+    case 'Identifier':
+      return pattern.name === root;
+    case 'AssignmentPattern':
+      return isNode(pattern.left) && patternBinds(pattern.left, root);
+    case 'RestElement':
+      return isNode(pattern.argument) && patternBinds(pattern.argument, root);
+    case 'ArrayPattern': {
+      const elements = Array.isArray(pattern.elements) ? pattern.elements : [];
+      return elements.some(element => isNode(element) && patternBinds(element, root));
+    }
+    case 'ObjectPattern': {
+      const properties = Array.isArray(pattern.properties) ? pattern.properties : [];
+      return properties.some(property => {
+        if (!isNode(property)) return false;
+        if (property.type === 'RestElement') {
+          return isNode(property.argument) && patternBinds(property.argument, root);
+        }
+        // Object keys are labels, not bindings. Only the value side introduces
+        // the local (including a default-value AssignmentPattern's left side).
+        return property.type === 'Property'
+          && isNode(property.value)
+          && patternBinds(property.value, root);
+      });
+    }
+    default:
+      return false;
+  }
+}
+
+/** `var` is function-scoped, so a nested function's declaration hides the
+ * outer flow context for its entire body, including code before the
+ * declaration. Nested functions have their own var scopes and are skipped. */
+function functionVarBinds(node: AstNode, root: string): boolean {
+  const body = isNode(node.body) ? node.body : undefined;
+  if (body === undefined) return false;
+  let found = false;
+  const scan = (current: AstNode): void => {
+    if (found) return;
+    if (current !== body && isFunction(current)) return;
+    if (current.type === 'VariableDeclaration' && current.kind === 'var') {
+      const declarations = Array.isArray(current.declarations)
+        ? current.declarations.filter(isNode) : [];
+      if (declarations.some(declaration => isNode(declaration.id) && patternBinds(declaration.id, root))) {
+        found = true;
+        return;
+      }
+    }
+    for (const key of Object.keys(current)) {
+      if (key === 'type' || key === 'start' || key === 'end' || key === 'loc') continue;
+      const child = current[key];
+      if (Array.isArray(child)) {
+        for (const entry of child) if (isNode(entry)) scan(entry);
+      } else if (isNode(child)) {
+        scan(child);
+      }
+      if (found) return;
+    }
+  };
+  scan(body);
+  return found;
+}
+
 function isNode(value: unknown): value is AstNode {
   return typeof value === 'object' && value !== null && typeof (value as { type?: unknown }).type === 'string';
 }

package/src/hosted-extension-sandbox.ts

@@ -109,7 +109,7 @@ const ADDRESS_SPACE_BYTES = 16 * 1024 * 1024 * 1024;
 const DATA_BYTES = 3 * 1024 * 1024 * 1024;
 const SURFACE_RUNTIME_SHA256 = OBJECT_FREEZE({
   'flow.js': '4aaeacc55de3074f4d121ce7253c3be50a93757e6540ba8159889a9450d1c05c',
-  'helpers/providers.js': '7bc62eccaa3a9e786ae0a689bf74160585149e91feef8208e17ef8eca51eed7f',
+  'helpers/providers.js': '4eb06d0d85ca0a3434bb2dbba7407e3d95eef2dfbedaeb0e2de0c0c0ea812457',
   'provider-trigger.js': 'e2664c65397f93fb486eb6f1e756c7cec3f88b3851d79c23567cad986f80f1ff',
   'schedule.js': '8fe72f176a75ec0b5f26e12db7a597575c259a2e2cbb59690f9dc20a5e63940b',
   'triggers.js': '4a3515b571a318f6c7a5661f9310bc9af43e3faf20ea39903a9b363c51258e4c',