Skip to content

Commit f809b1b

Browse files
geraldarthurdavisgeraldarthurdavis
committed
V48 (impl-only): Fix Gate reading suite paths
Point Gate Quality at synthesize-reads and syntheses-domain packages after the domain split. Restore canonical PTRR order (Plan→Try→Retry→Refine), fix cross-package test imports, and prefer package Jest overrides over the flat @bitcode/* map.
1 parent d2a1d4a commit f809b1b

9 files changed

Lines changed: 43 additions & 19 deletions

‎.github/workflows/bitcode-gate-quality.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -818,12 +818,15 @@ jobs:
818818
# asset-pack-harness.test.ts removed; host plan + distributed receipt remain.
819819
pnpm --filter @bitcode/pipeline-hosts exec jest --config jest.config.cjs --runTestsByPath src/__tests__/asset-pack-host-plan.test.ts --runInBand --forceExit
820820
pnpm --filter @bitcode/pipeline-hosts exec jest --config jest.config.cjs --runTestsByPath src/__tests__/distributed-execution-runtime-receipt.test.ts --runInBand --forceExit
821-
pnpm --filter @bitcode/asset-packs-pipelines-domain exec jest --config jest.config.cjs --runTestsByPath src/__tests__/reading-pipeline-integration-coverage.test.ts src/__tests__/reading-pipeline-observability.test.ts src/__tests__/reading-pipeline-contract.test.ts src/__tests__/v32-reading-pipeline-proof-coverage.test.ts --runInBand --forceExit
822-
pnpm --filter @bitcode/asset-packs-pipelines-domain exec jest --config jest.config.cjs --runTestsByPath src/__tests__/asset-pack-disclosure.test.ts src/__tests__/postprocess.test.ts src/__tests__/read-need.test.ts src/__tests__/read-need-review-resynthesis.test.ts --runInBand --forceExit
823-
pnpm --filter @bitcode/asset-packs-pipelines-domain exec jest --config jest.config.cjs --runTestsByPath src/__tests__/asset-pack-preview-boundary.test.ts --runInBand --forceExit
821+
# Reading pipeline proofs live under synthesize-reads-asset-packs (not domain).
822+
pnpm --filter @bitcode/asset-packs-pipelines-execution-pipeline-sdivf-synthesize-reads-asset-packs exec jest --config jest.config.cjs --runTestsByPath src/__tests__/reading-pipeline-integration-coverage.test.ts src/__tests__/reading-pipeline-observability.test.ts src/__tests__/reading-pipeline-contract.test.ts src/__tests__/v32-reading-pipeline-proof-coverage.test.ts --runInBand --forceExit
823+
pnpm --filter @bitcode/asset-packs-pipelines-domain exec jest --config jest.config.cjs --runTestsByPath src/__tests__/asset-pack-disclosure.test.ts --runInBand --forceExit
824+
pnpm --filter @bitcode/asset-packs-pipelines-syntheses-domain exec jest --config jest.config.cjs --runTestsByPath src/__tests__/postprocess.test.ts --runInBand --forceExit
825+
pnpm --filter @bitcode/asset-packs-pipelines-execution-pipeline-sdivf-synthesize-reads-asset-packs exec jest --config jest.config.cjs --runTestsByPath src/__tests__/read-need.test.ts src/__tests__/read-need-review-resynthesis.test.ts --runInBand --forceExit
826+
pnpm --filter @bitcode/asset-packs-pipelines-syntheses-domain exec jest --config jest.config.cjs --runTestsByPath src/__tests__/asset-pack-preview-boundary.test.ts --runInBand --forceExit
824827
pnpm --filter @bitcode/asset-packs-pipelines-domain exec jest --config jest.config.cjs --runTestsByPath src/__tests__/asset-pack-settlement-rights-delivery.test.ts --runInBand --forceExit
825-
pnpm --filter @bitcode/asset-packs-pipelines-domain exec jest --config jest.config.cjs --runTestsByPath src/__tests__/reading-operational-telemetry-repair-readback.test.ts --runInBand --forceExit
826-
pnpm --filter @bitcode/asset-packs-pipelines-domain exec jest --config jest.config.cjs --runTestsByPath src/__tests__/reading-interface-product-parity.test.ts --runInBand --forceExit
828+
pnpm --filter @bitcode/asset-packs-pipelines-execution-pipeline-sdivf-synthesize-reads-asset-packs exec jest --config jest.config.cjs --runTestsByPath src/__tests__/reading-operational-telemetry-repair-readback.test.ts --runInBand --forceExit
829+
pnpm --filter @bitcode/asset-packs-pipelines-execution-pipeline-sdivf-synthesize-reads-asset-packs exec jest --config jest.config.cjs --runTestsByPath src/__tests__/reading-interface-product-parity.test.ts --runInBand --forceExit
827830
pnpm --filter @bitcode/api exec jest --config jest.config.cjs --runTestsByPath src/conversations/__tests__/stream-events.test.ts src/conversations/__tests__/privacy.test.ts src/conversations/__tests__/telemetry.test.ts --runInBand --forceExit
828831
pnpm --dir scripts/specifying exec node --test --test-force-exit test/conversation-telemetry-proof-hooks.test.js
829832
pnpm --dir scripts/specifying exec node --test --test-force-exit test/conversation-rehearsal.test.js

‎packages/asset-packs-pipelines/syntheses/read/jest.config.cjs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,22 @@ module.exports = createJestConfig(__dirname, {
66
moduleNameMapper: {
77
'^@bitcode/asset-packs-pipelines-execution-pipeline-sdivf-synthesize-reads-asset-packs$':
88
path.join(__dirname, 'src/index.ts'),
9+
// Nested package subpaths are not covered by the flat packages/* catch-all.
10+
'^@bitcode/generic-llms-models/src/(.*)$': path.join(
11+
__dirname,
12+
'../../../generic-llms/models/src/$1',
13+
),
14+
'^@bitcode/generic-llms-models/(.*)$': path.join(
15+
__dirname,
16+
'../../../generic-llms/models/src/$1',
17+
),
18+
'^@bitcode/asset-packs-pipelines-syntheses-domain/(.*)$': path.join(
19+
__dirname,
20+
'../domain/src/$1',
21+
),
22+
'^@bitcode/asset-packs-pipelines-domain/(.*)$': path.join(
23+
__dirname,
24+
'../../domain/src/$1',
25+
),
926
},
1027
});

‎packages/asset-packs-pipelines/syntheses/read/src/__tests__/reading-interface-product-parity.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Execution } from '@bitcode/execution-generics';
22
import {
33
buildAssetPackPreviewBoundary,
4-
} from '../asset-pack-preview-boundary';
4+
} from '@bitcode/asset-packs-pipelines-syntheses-domain/asset-pack-preview-boundary';
55
import {
66
buildAssetPackSettlementRightsDeliveryBoundary,
7-
} from '../asset-pack-settlement-rights-delivery';
7+
} from '@bitcode/asset-packs-pipelines-domain/asset-pack-settlement-rights-delivery';
88
import {
99
buildDepositoryFitResultEvidence,
1010
runDepositorySearchForPipelineInput,

‎packages/asset-packs-pipelines/syntheses/read/src/__tests__/reading-local-staging-rehearsal.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Execution } from '@bitcode/execution-generics';
2-
import { buildAssetPackPreviewBoundary } from '../asset-pack-preview-boundary';
3-
import { buildAssetPackSettlementRightsDeliveryBoundary } from '../asset-pack-settlement-rights-delivery';
2+
import { buildAssetPackPreviewBoundary } from '@bitcode/asset-packs-pipelines-syntheses-domain/asset-pack-preview-boundary';
3+
import { buildAssetPackSettlementRightsDeliveryBoundary } from '@bitcode/asset-packs-pipelines-domain/asset-pack-settlement-rights-delivery';
44
import {
55
buildDepositoryFitResultEvidence,
66
runDepositorySearchForPipelineInput,

‎packages/asset-packs-pipelines/syntheses/read/src/__tests__/reading-operational-telemetry-repair-readback.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Execution } from '@bitcode/execution-generics';
22
import {
33
buildAssetPackPreviewBoundary,
4-
} from '../asset-pack-preview-boundary';
4+
} from '@bitcode/asset-packs-pipelines-syntheses-domain/asset-pack-preview-boundary';
55
import {
66
buildAssetPackSettlementRightsDeliveryBoundary,
7-
} from '../asset-pack-settlement-rights-delivery';
7+
} from '@bitcode/asset-packs-pipelines-domain/asset-pack-settlement-rights-delivery';
88
import {
99
buildDepositoryFitResultEvidence,
1010
runDepositorySearchForPipelineInput,

‎packages/asset-packs-pipelines/syntheses/read/src/__tests__/reading-pipeline-integration-coverage.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { buildAssetPackPreviewBoundary } from '../asset-pack-preview-boundary';
2-
import { buildAssetPackSettlementRightsDeliveryBoundary } from '../asset-pack-settlement-rights-delivery';
1+
import { buildAssetPackPreviewBoundary } from '@bitcode/asset-packs-pipelines-syntheses-domain/asset-pack-preview-boundary';
2+
import { buildAssetPackSettlementRightsDeliveryBoundary } from '@bitcode/asset-packs-pipelines-domain/asset-pack-settlement-rights-delivery';
33
import {
44
buildDepositoryFitResultEvidence,
55
runDepositorySearchForPipelineInput,

‎packages/asset-packs-pipelines/syntheses/read/src/reading-pipeline-contract.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export type ReadingPipelineName =
55
| typeof READ_NEED_COMPREHENSION_SYNTHESIS
66
| typeof READ_FITS_FINDING_SYNTHESIS;
77

8-
export type ReadingPipelinePtrrStepName = 'plan' | 'try' | 'refine' | 'retry';
8+
export type ReadingPipelinePtrrStepName = 'plan' | 'try' | 'retry' | 'refine';
99

1010
export type ReadingPipelineThinkingsFailsafe =
1111
| 'prepare-concise-context'
@@ -141,7 +141,8 @@ const READ_FITS_FINDING_PROMPT_TEMPLATE = [
141141
const readNeedTelemetry = (suffix: string) => `${READ_NEED_COMPREHENSION_SYNTHESIS}.telemetry.${suffix}`;
142142
const readFitsFindingTelemetry = (suffix: string) => `${READ_FITS_FINDING_SYNTHESIS}.telemetry.${suffix}`;
143143

144-
const PTRR_STEP_NAMES: ReadingPipelinePtrrStepName[] = ['plan', 'try', 'refine', 'retry'];
144+
// Canonical PTRR runtime order: Plan → Try → Retry → Refine.
145+
const PTRR_STEP_NAMES: ReadingPipelinePtrrStepName[] = ['plan', 'try', 'retry', 'refine'];
145146
const THINKINGS_FAILSAFES: ReadingPipelineThinkingsFailsafe[] = [
146147
'prepare-concise-context',
147148
'chunk-then-sum',
@@ -183,8 +184,8 @@ function ptrrPromptRegistry(
183184
ptrrStepPromptIds: {
184185
plan: `${promptPrefix}.plan`,
185186
try: `${promptPrefix}.try`,
186-
refine: `${promptPrefix}.refine`,
187187
retry: `${promptPrefix}.retry`,
188+
refine: `${promptPrefix}.refine`,
188189
},
189190
promptPartNamespaces: {
190191
agent: 'agent/*',

‎packages/asset-packs-pipelines/syntheses/read/src/reading-pipeline-observability.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ function inferPipelineName(source: ProjectionSource): ReadingPipelineName | null
465465

466466
function stepNameFromId(value: unknown): ReadingPipelinePtrrStepName | null {
467467
const text = String(value || '').split('.').pop() || '';
468-
return ['plan', 'try', 'refine', 'retry'].includes(text)
468+
return ['plan', 'try', 'retry', 'refine'].includes(text)
469469
? (text as ReadingPipelinePtrrStepName)
470470
: null;
471471
}

‎tests/jest.base.cjs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,13 @@ function createJestConfig(pkgDir, overrides = {}) {
5858
]
5959
},
6060
moduleNameMapper: {
61-
// Hierarchy package names first (nested paths), then tsconfig paths, then overrides
61+
// Jest uses first-matching pattern. Put package overrides first so nested
62+
// subpath maps (e.g. @bitcode/generic-llms-models/src/*) beat the flat
63+
// tsconfig catch-all (@bitcode/* → packages/*). Hierarchy package entries
64+
// next, then shared tsconfig-derived paths.
65+
...(overrides.moduleNameMapper || {}),
6266
...hierarchyPackageMapper,
6367
...sharedModuleNameMapper,
64-
...(overrides.moduleNameMapper || {})
6568
},
6669
setupFiles: overrides.setupFiles || [],
6770
setupFilesAfterEnv: [

0 commit comments

Comments
 (0)