V48 (impl-only): Discovery search after wave-1; product search keys

Discovery is sequential(parallel(comprehend, regurgitation), search).
Deposit: search-depository-for-deposit-relevants.
Read: search-depository-for-read-need-fits (fits-finding).

Author: geraldarthurdavis

packages/asset-packs-pipelines/domain/src/__tests__/deposit-agent-prompt-contracts.test.ts

@@ -152,10 +152,10 @@ const SPECS: DepositAgentPromptSpec[] = [
     input: {},
   },
   {
-    title: 'DepositDepositorySearchAgent (Discovery: search-depository)',
+    title: 'DepositDepositorySearchForRelevantsAgent (Discovery: search-depository-for-deposit-relevants)',
     agent: DepositDepositorySearchAgent,
     identity:
-      'You are the SynthesizeAssetPacks Discovery agent that searches the Bitcode Depository',
+      'You are Discovery search-depository-for-deposit-relevants. You run after codebase',
     requirements: 'From repository coordinates, sourceCheckoutCatalog (paths/samples), obfuscation guidance,',
     wrapper: 'Return ONLY {"guidance": {...}, "searchQueries": [...]}',
     schemaFields: [
@@ -167,7 +167,7 @@ const SPECS: DepositAgentPromptSpec[] = [
       'searchQueries',
     ],
     ptrr: [
-      'Plan: from sourceCheckoutCatalog paths, measurements, obfuscations, and demand context,',
+      'Plan: use wave-1 codebase comprehension and inherent regurgitation outcomes plus',
       'Try: produce demand guidance and the searchQueries list the Depository search tool will run.',
       'Refine: ensure queries and guidance are grounded in sourceCheckoutCatalog evidence, demand-aligned, and source-safe.',
       'Retry: return minimal demand guidance and broad searchQueries rather than failing.',

packages/asset-packs-pipelines/domain/src/__tests__/deposit-setup-discovery-agents.test.ts

@@ -332,25 +332,23 @@ describe('discovery conditional runtime registry roster', () => {
     };
   }
 
-  it('deposit mode registers exactly three Discovery agents (no synonym aliases)', () => {
+  it('deposit mode registers wave-1 + search-depository-for-deposit-relevants', () => {
     const registry = recordingRegistry();
     registerDiscoveryAgents(registry, 'deposit');
     expect([...registry.registrations.keys()].sort()).toEqual([
       'discovery:comprehend-codebase',
       'discovery:inherent-regurgitation',
-      'discovery:search-depository',
+      'discovery:search-depository-for-deposit-relevants',
     ]);
   });
 
-  it('read/default mode registers the same product three-agent Discovery roster', () => {
-    for (const mode of [undefined, 'read']) {
-      const registry = recordingRegistry();
-      registerDiscoveryAgents(registry, mode);
-      expect([...registry.registrations.keys()].sort()).toEqual([
-        'discovery:comprehend-codebase',
-        'discovery:inherent-regurgitation',
-        'discovery:search-depository',
-      ]);
-    }
+  it('read mode registers wave-1 + search-depository-for-read-need-fits', () => {
+    const registry = recordingRegistry();
+    registerDiscoveryAgents(registry, 'read');
+    expect([...registry.registrations.keys()].sort()).toEqual([
+      'discovery:comprehend-codebase',
+      'discovery:inherent-regurgitation',
+      'discovery:search-depository-for-read-need-fits',
+    ]);
   });
 });

packages/asset-packs-pipelines/domain/src/__tests__/synthesize-asset-packs-phase-rosters.test.ts

@@ -14,7 +14,13 @@
 jest.mock('@bitcode/generic-llms', () =>
   require('./support/generic-llms-mock').makeGenericLLMsMock());
 
-import { registerDiscoveryAgents } from '../phases/discovery';
+import {
+  registerDiscoveryAgents,
+  DISCOVERY_COMPREHEND_CODEBASE,
+  DISCOVERY_INHERENT_REGURGITATION,
+  DISCOVERY_SEARCH_DEPOSITORY_FOR_DEPOSIT_RELEVANTS,
+  DISCOVERY_SEARCH_DEPOSITORY_FOR_READ_NEED_FITS,
+} from '../phases/discovery';
 import { registerImplementationAgents } from '../phases/implementation';
 import { registerValidationAgentsForType } from '../phases/validation';
 import { registerFinishAgentsForType } from '../phases/finish';
@@ -33,6 +39,7 @@ import {
 
 import depositCodebaseComprehensionAgent from '../agents/discovery/deposit-codebase-comprehension-agent';
 import depositDepositorySearchAgent from '../agents/discovery/deposit-depository-search-agent';
+import readDepositorySearchForNeedFitsAgent from '../agents/discovery/read-depository-search-for-need-fits-agent';
 import depositInherentRegurgitationAgent from '../agents/discovery/deposit-inherent-regurgitation-agent';
 import depositAssetPackSynthesisAgent from '../agents/implementation/deposit-asset-pack-synthesis-agent';
 import readAssetPackSynthesisAgent from '../agents/implementation/read-asset-pack-synthesis-agent';
@@ -66,39 +73,50 @@ async function resolveEntry(entry: any) {
 }
 
 describe('per-mode agent rosters (conditional runtime registries)', () => {
-  it('deposit discovery registers exactly the three deposit agents', async () => {
+  it('deposit discovery registers wave-1 agents + deposit-relevants search', async () => {
     const registry = fakeRegistry();
     registerDiscoveryAgents(registry, 'deposit');
 
     expect(Array.from(registry.entries.keys())).toEqual([
-      'discovery:comprehend-codebase',
-      'discovery:search-depository',
-      'discovery:inherent-regurgitation',
+      DISCOVERY_COMPREHEND_CODEBASE,
+      DISCOVERY_INHERENT_REGURGITATION,
+      DISCOVERY_SEARCH_DEPOSITORY_FOR_DEPOSIT_RELEVANTS,
     ]);
-    expect(await resolveEntry(registry.entries.get('discovery:comprehend-codebase'))).toBe(
+    expect(await resolveEntry(registry.entries.get(DISCOVERY_COMPREHEND_CODEBASE))).toBe(
       depositCodebaseComprehensionAgent,
     );
-    expect(await resolveEntry(registry.entries.get('discovery:search-depository'))).toBe(
-      depositDepositorySearchAgent,
-    );
-    expect(await resolveEntry(registry.entries.get('discovery:inherent-regurgitation'))).toBe(
+    expect(
+      await resolveEntry(registry.entries.get(DISCOVERY_SEARCH_DEPOSITORY_FOR_DEPOSIT_RELEVANTS)),
+    ).toBe(depositDepositorySearchAgent);
+    expect(await resolveEntry(registry.entries.get(DISCOVERY_INHERENT_REGURGITATION))).toBe(
       depositInherentRegurgitationAgent,
     );
   });
 
-  it.each([['read'], [undefined], ['deposit']])(
-    'discovery (mode=%s) always registers the product three-agent roster',
-    (mode) => {
-      const registry = fakeRegistry();
-      registerDiscoveryAgents(registry, mode);
+  it('read discovery registers wave-1 agents + read-need-fits search', async () => {
+    const registry = fakeRegistry();
+    registerDiscoveryAgents(registry, 'read');
 
-      expect(Array.from(registry.entries.keys())).toEqual([
-        'discovery:comprehend-codebase',
-        'discovery:search-depository',
-        'discovery:inherent-regurgitation',
-      ]);
-    },
-  );
+    expect(Array.from(registry.entries.keys())).toEqual([
+      DISCOVERY_COMPREHEND_CODEBASE,
+      DISCOVERY_INHERENT_REGURGITATION,
+      DISCOVERY_SEARCH_DEPOSITORY_FOR_READ_NEED_FITS,
+    ]);
+    expect(
+      await resolveEntry(registry.entries.get(DISCOVERY_SEARCH_DEPOSITORY_FOR_READ_NEED_FITS)),
+    ).toBe(readDepositorySearchForNeedFitsAgent);
+  });
+
+  it('default (non-read) discovery registers deposit-relevants search', () => {
+    const registry = fakeRegistry();
+    registerDiscoveryAgents(registry, undefined);
+    expect(Array.from(registry.entries.keys())).toContain(
+      DISCOVERY_SEARCH_DEPOSITORY_FOR_DEPOSIT_RELEVANTS,
+    );
+    expect(Array.from(registry.entries.keys())).not.toContain(
+      DISCOVERY_SEARCH_DEPOSITORY_FOR_READ_NEED_FITS,
+    );
+  });
 
   it('implementation registers deposit-named vs read synthesis keys by mode', async () => {
     const depositKey = 'implementation:deposit-asset-pack-synthesis';
@@ -220,9 +238,14 @@ function harness(keys: string[]) {
 }
 
 const DEPOSIT_DISCOVERY_KEYS = [
-  'discovery:comprehend-codebase',
-  'discovery:search-depository',
-  'discovery:inherent-regurgitation',
+  DISCOVERY_COMPREHEND_CODEBASE,
+  DISCOVERY_INHERENT_REGURGITATION,
+  DISCOVERY_SEARCH_DEPOSITORY_FOR_DEPOSIT_RELEVANTS,
+];
+const READ_DISCOVERY_KEYS = [
+  DISCOVERY_COMPREHEND_CODEBASE,
+  DISCOVERY_INHERENT_REGURGITATION,
+  DISCOVERY_SEARCH_DEPOSITORY_FOR_READ_NEED_FITS,
 ];
 const DEPOSIT_IMPLEMENTATION_KEY = 'implementation:deposit-asset-pack-synthesis';
 const DEPOSIT_VALIDATION_KEY =
@@ -241,23 +264,30 @@ const READ_FINISH_KEYS = [
 ];
 
 describe('product phase delegators execute the roster (execution-tree walk)', () => {
-  it('deposit discovery runs comprehend-codebase ∥ search-depository ∥ inherent-regurgitation', async () => {
+  it('deposit discovery: parallel(comprehend, regurgitation) then deposit-relevants search', async () => {
     const { calls, root } = harness(DEPOSIT_DISCOVERY_KEYS);
     const phaseExec = root.child('seq-2');
 
     await depositDiscoveryPhase({ seed: true }, phaseExec);
 
-    // Parallel — assert set equality, not order.
-    expect(new Set(calls)).toEqual(new Set(DEPOSIT_DISCOVERY_KEYS));
     expect(calls).toHaveLength(3);
+    // Wave 1 (either order) then wave 2 search last.
+    expect(new Set(calls.slice(0, 2))).toEqual(
+      new Set([DISCOVERY_COMPREHEND_CODEBASE, DISCOVERY_INHERENT_REGURGITATION]),
+    );
+    expect(calls[2]).toBe(DISCOVERY_SEARCH_DEPOSITORY_FOR_DEPOSIT_RELEVANTS);
   });
 
-  it('read discovery reuses the three deposit discovery agent keys in parallel', async () => {
-    const { calls, root } = harness(DEPOSIT_DISCOVERY_KEYS);
+  it('read discovery: parallel(comprehend, regurgitation) then read-need-fits search', async () => {
+    const { calls, root } = harness(READ_DISCOVERY_KEYS);
 
     await readDiscoveryPhase({ seed: true }, root.child('seq-2'));
 
-    expect(new Set(calls)).toEqual(new Set(DEPOSIT_DISCOVERY_KEYS));
+    expect(calls).toHaveLength(3);
+    expect(new Set(calls.slice(0, 2))).toEqual(
+      new Set([DISCOVERY_COMPREHEND_CODEBASE, DISCOVERY_INHERENT_REGURGITATION]),
+    );
+    expect(calls[2]).toBe(DISCOVERY_SEARCH_DEPOSITORY_FOR_READ_NEED_FITS);
   });
 
   it('deposit implementation resolves deposit-asset-pack-synthesis', async () => {

packages/asset-packs-pipelines/domain/src/agents/discovery/deposit-depository-search-agent.ts

@@ -1,10 +1,16 @@
 /**
- * Deposit depository-search agent — Discovery (parallel).
+ * Discovery wave-2 agent: search-depository-for-deposit-relevants.
  *
- * Plan: synthesize search queries from this run's sourceCheckoutCatalog,
+ * Runs **after** parallel codebase comprehension + inherent regurgitation so
+ * queries can use wave-1 grounding (especially comprehend-codebase).
+ *
+ * Deposit purpose: find **relevant** settled Depository supply / demand
+ * alignment for this deposit synthesis run (not Need-fits — that is read).
+ *
+ * Plan: synthesize search queries from wave-1 signals, sourceCheckoutCatalog,
  * obfuscations, measurements, and demand context.
  * Try: call depository-asset-pack-search (embeddings policy + lexical rank).
- * Refine/Retry: source-safe demand guidance for Implementation.
+ * Refine/Retry: source-safe demand/relevance guidance for Implementation.
  */
 
 import { factoryPTRRAgent } from '@bitcode/agent-generics';
@@ -44,10 +50,12 @@ const DepositorySearchOutputSchema = z.object({
 export type DepositReadDemandGuidance = z.infer<typeof ReadDemandGuidanceSchema>;
 
 const IDENTITY = part(
-  'You are the SynthesizeAssetPacks Discovery agent that searches the Bitcode Depository ' +
-    'for settled AssetPack supply relevant to this deposit synthesis run. Build search ' +
-    'queries from the sourceCheckoutCatalog, obfuscations, checkout measurements, and ' +
-    'demand context so synthesized packs have high likelihood of future demand. Be source-safe.',
+  'You are Discovery search-depository-for-deposit-relevants. You run after codebase ' +
+    'comprehension and inherent regurgitation. Search the Bitcode Depository for settled ' +
+    'AssetPack supply **relevant** to this deposit synthesis run. Build search queries from ' +
+    'wave-1 comprehension signals, sourceCheckoutCatalog, obfuscations, checkout measurements, ' +
+    'and demand context so synthesized packs align with likely demand. Be source-safe. ' +
+    'This is deposit relevance search — not Need-fit search (that is the read product agent).',
 );
 
 const REQUIREMENTS = part(
@@ -60,8 +68,9 @@ const REQUIREMENTS = part(
 );
 
 const PLAN = part(
-  'Plan: from sourceCheckoutCatalog paths, measurements, obfuscations, and demand context, ' +
-    'synthesize Depository search queries that retrieve AssetPacks relevant to high-demand synthesis.',
+  'Plan: use wave-1 codebase comprehension and inherent regurgitation outcomes plus ' +
+    'sourceCheckoutCatalog, measurements, obfuscations, and demand context to synthesize ' +
+    'Depository search queries that retrieve AssetPacks **relevant** to high-demand deposit synthesis.',
 );
 const TRY = part(
   'Try: produce demand guidance and the searchQueries list the Depository search tool will run.',
@@ -91,9 +100,9 @@ export const DepositDepositorySearchAgent = factoryPTRRAgent<
   z.infer<typeof DepositorySearchInputSchema>,
   z.infer<typeof DepositorySearchOutputSchema>
 >({
-  name: 'DepositDepositorySearchAgent',
+  name: 'DepositDepositorySearchForRelevantsAgent',
   description:
-    'Plans Depository AssetPack search queries and produces read-demand guidance for deposit synthesis.',
+    'Discovery wave-2: search Depository for deposit-relevant supply; query plan after codebase comprehension.',
   outputSchema: DepositorySearchOutputSchema,
   tools: ['depository-asset-pack-search'],
   prompt,