fix(cron): adopt registerHeadlessToolSearchCatalog after tool-search symbol localization

steipete · steipete · commit 1481b609b2a3 · 2026-07-07T11:00:50.000-07:00
Upstream #101831 made registerToolSearchCatalog module-private; fold the headless ref-only catalog registration into one public seam.
diff --git a/src/agents/code-mode-headless.test.ts b/src/agents/code-mode-headless.test.ts
@@ -1,9 +1,8 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { runCodeModeScriptHeadless, testing, type CodeModeHeadlessResult } from "./code-mode.js";
 import {
-  buildToolSearchCatalogEntries,
   createToolSearchCatalogRef,
-  registerToolSearchCatalog,
+  registerHeadlessToolSearchCatalog,
   type ToolSearchToolContext,
 } from "./tool-search.js";
 import { jsonResult, type AnyAgentTool } from "./tools/common.js";
@@ -23,10 +22,7 @@ function createHeadlessHarness(tools: AnyAgentTool[] = []): ToolSearchToolContex
     tools: { codeMode: { enabled: false, timeoutMs: 60_000 } },
   } as never;
   const catalogRef = createToolSearchCatalogRef();
-  registerToolSearchCatalog({
-    catalogRef,
-    entries: buildToolSearchCatalogEntries(tools),
-  });
+  registerHeadlessToolSearchCatalog({ catalogRef, tools });
   return {
     config,
     runtimeConfig: config,
diff --git a/src/agents/tool-search.ts b/src/agents/tool-search.ts
@@ -713,12 +713,18 @@ function shouldCatalogTool(tool: AnyAgentTool): boolean {
   return true;
 }
 
-/** Build policy-wrapped entries for a catalog owned only by an explicit ref. */
-export function buildToolSearchCatalogEntries(
-  tools: readonly AnyAgentTool[],
-  hookContext?: HookContext,
-): ToolSearchCatalogEntry[] {
-  return tools
+/**
+ * Register a catalog owned only by an explicit ref (no session keys), for
+ * headless callers like cron trigger evaluation. Registration internals stay
+ * module-private; this is the single public seam for ref-only catalogs.
+ */
+export function registerHeadlessToolSearchCatalog(params: {
+  catalogRef: ToolSearchCatalogRef;
+  tools: readonly AnyAgentTool[];
+  hookContext?: HookContext;
+}): void {
+  const { catalogRef, tools, hookContext } = params;
+  const entries = tools
     .filter((tool) => shouldCatalogTool(tool))
     .map((tool) => {
       const scopedTool =
@@ -727,6 +733,7 @@ export function buildToolSearchCatalogEntries(
           : tool;
       return toCatalogEntry(scopedTool, undefined, hookContext);
     });
+  registerToolSearchCatalog({ catalogRef, entries });
 }
 
 export function collectUniqueCatalogToolNames(tools: readonly AnyAgentTool[]): Set<string> {
diff --git a/src/cron/trigger-script.ts b/src/cron/trigger-script.ts
@@ -24,9 +24,8 @@ import {
 import { ensureRuntimePluginsLoaded } from "../agents/runtime-plugins.js";
 import { resolveSandboxContext } from "../agents/sandbox.js";
 import {
-  buildToolSearchCatalogEntries,
   createToolSearchCatalogRef,
-  registerToolSearchCatalog,
+  registerHeadlessToolSearchCatalog,
   type ToolSearchToolContext,
 } from "../agents/tool-search.js";
 import type { AnyAgentTool } from "../agents/tools/common.js";
@@ -404,12 +403,10 @@ export function createCronTriggerEvaluator(deps: CronTriggerEvaluatorDeps) {
 
       const catalogRef = createToolSearchCatalogRef();
       const runId = `cron-trigger:${params.jobId}:${crypto.randomUUID()}`;
-      registerToolSearchCatalog({
+      registerHeadlessToolSearchCatalog({
         catalogRef,
-        entries: buildToolSearchCatalogEntries(runtime.tools, {
-          ...runtime.hookContext,
-          runId,
-        }),
+        tools: runtime.tools,
+        hookContext: { ...runtime.hookContext, runId },
       });
       const remainingWallClockMs = evaluationScope.deadline - Date.now();
       if (remainingWallClockMs <= 0) {
