V48 (impl-only): Cut shippables dual keys; settleDelivery only

Pre-production: no dual-read/write of shippables or shippable_templates.
Completion, history, stream, host emit settleDelivery only.
Template prefs use delivery_templates only.
Drop MeasureAgentOutput/MeasurementCategory/factoryMeasureAgentAbsolutes
aliases. Base SDIVF is phase-shell only (no agents in sdivf-phases).

Author: geraldarthurdavis

apps/uapi/app/api/auxillaries/template-preferences/route.ts

@@ -11,7 +11,7 @@ import userTemplatesDefaultMock from '@/mocks/user-template-preferences-default.
 import userTemplatesEmptyMock from '@/mocks/user-template-preferences-empty.json';
 
 const EMPTY_TEMPLATE_PREFERENCES = {
-  shippable_templates: {},
+  delivery_templates: {},
   evidence_document_templates: {},
 };
 

apps/uapi/components/bitcode/pipeline/ExecutionsCompleteHeaderContent/ExecutionsCompleteHeaderContent.tsx

@@ -78,9 +78,8 @@ export type RepoSnapshot = { org: string; repo: string; branch: string; commit:
 
 export type HeaderAssetPackCompletion = {
   summary?: string | null;
+  /** Buyer-repo delivery after settle Simple (sole field name). */
   settleDelivery?: HeaderSettleDelivery;
-  /** Historical dual-write of settleDelivery. */
-  shippables?: HeaderSettleDelivery;
   assetPackSynthesisArtifacts?: HeaderSettleDelivery;
   writtenAssets?: HeaderSettleDelivery;
   deliveryMechanism?: HeaderSettleDelivery;
@@ -344,13 +343,16 @@ export function getHeaderWrittenAssets(
   );
 }
 
+/**
+ * Resolve buyer-repo delivery for the executions header.
+ * settleDelivery first; deliveryMechanism is a separate connected-interface
+ * projection used only when settleDelivery is absent. Does not invent PRs.
+ */
 export function getHeaderSettleDelivery(
   assetPackCompletion?: HeaderAssetPackCompletion | null,
 ): HeaderSettleDelivery | null {
-  // Prefer settleDelivery; dual-read historical shippables.
   return (
     assetPackCompletion?.settleDelivery ||
-    assetPackCompletion?.shippables ||
     assetPackCompletion?.deliveryMechanism ||
     null
   );

apps/uapi/components/bitcode/pipeline/ExecutionsPageClient/ExecutionsPageClient.tsx

@@ -52,7 +52,9 @@ const calculateInstructionTimeoutSeconds = (confidence: number): number => {
 };
 
 export function ExecutionsClient() {
-  // Settle delivery panels: buyer PR after settle, not SDIVF Finish.
+  // Settle delivery panels: buyer-repo PR/summary from settle Simple
+  // (ship-asset-pack-patch-pr after rights). Separate from Deposit/Read SDIVF
+  // Finish, which only stores synthesis evidence and closes the run.
   const router = useRouter();
   const searchParams = useSearchParams();
   const runId = searchParams.get('runId');
@@ -66,7 +68,7 @@ export function ExecutionsClient() {
   const mergedTemplates: DeliveryTemplates = React.useMemo(() => {
     if (!preferences) return templatesSource;
     const filterByPrefs = (category: keyof DeliveryTemplates, list: DeliveryTemplates[keyof DeliveryTemplates]) => {
-      const prefIds = preferences.shippable_templates?.[category] ?? [];
+      const prefIds = preferences.delivery_templates?.[category] ?? [];
       if (!prefIds.length) return list;
       return list.filter((t) => prefIds.includes(t.id));
     };
@@ -348,7 +350,6 @@ export function ExecutionsClient() {
   const deliveryMechanismForPanels =
     getHeaderSettleDelivery(historyAssetPackCompletion) ||
     headerPostprocessed?.settleDelivery ||
-    headerPostprocessed?.shippables ||
     headerPostprocessed?.deliveryMechanism ||
     null;
   const settleDeliveryForPanels = mergeHeaderSettleDelivery(

apps/uapi/components/bitcode/pipeline/SettleDeliveryDocPanel/SettleDeliveryDocPanel.tsx

@@ -34,7 +34,10 @@ export interface SettleDeliveryDocPanelProps {
 
 /**
  * Renders settle delivery summary (buyer PR when present) plus synthesis summary.
- * PR shipping is settle-asset-pack-pipeline only — not SDIVF Finish.
+ *
+ * settleDelivery is the output surface of settle Simple (BTC → BTD → co-own →
+ * ship-asset-pack-patch-pr). It is not a phase of base SDIVF and not Finish of
+ * Deposit/Read product SDIVF pipelines.
  */
 export function SettleDeliveryDocPanel({ settleDelivery, summaryOpen, onToggleSummary }: SettleDeliveryDocPanelProps) {
   const tldr: React.ReactNode[] = [];

apps/uapi/components/bitcode/pipeline/models/pipeline-activity-history.ts

@@ -668,7 +668,7 @@ export function mapExecutionHistoryRunToWorkspaceRun(run: PipelineExecution): Wo
       run.asset_pack_completion?.summary ||
       run.asset_pack_completion?.assetPackSynthesisArtifacts?.summary ||
       run.asset_pack_completion?.writtenAssets?.summary ||
-      run.asset_pack_completion?.settleDelivery?.summary || run.asset_pack_completion?.shippables?.summary ||
+      run.asset_pack_completion?.settleDelivery?.summary ||
       run.asset_pack_completion?.deliveryMechanism?.summary ||
       failureSummary ||
       null,

apps/uapi/hooks/useTemplatePreferences.ts

@@ -1,13 +1,11 @@
 import { useCallback, useEffect, useState } from 'react';
 
 interface UserTemplatePreferencesApiResponse {
-  shippable_templates?: Record<string, string[]>;
   delivery_templates?: Record<string, string[]>;
   evidence_document_templates?: Record<string, string[]>;
 }
 
 export interface UserTemplatePreferences {
-  shippable_templates: Record<string, string[]>;
   delivery_templates: Record<string, string[]>;
   evidence_document_templates: Record<string, string[]>;
 }
@@ -43,8 +41,7 @@ export const useTemplatePreferences = (): UseTemplatePreferencesHook => {
       const res = await fetch('/api/auxillaries/template-preferences');
       if (res.status === 401 || res.status === 404) {
         setPreferences({
-          shippable_templates: {},
-        delivery_templates: {},
+          delivery_templates: {},
           evidence_document_templates: {},
         });
         return;
@@ -65,13 +62,11 @@ export const useTemplatePreferences = (): UseTemplatePreferencesHook => {
       const data = (await res.json()) as UserTemplatePreferencesApiResponse;
 
       setPreferences({
-        shippable_templates: data.delivery_templates ?? data.shippable_templates ?? {},
-        delivery_templates: data.delivery_templates ?? data.shippable_templates ?? {},
+        delivery_templates: data.delivery_templates ?? {},
         evidence_document_templates: data.evidence_document_templates ?? {},
       });
     } catch (err) {
       setPreferences({
-        shippable_templates: {},
         delivery_templates: {},
         evidence_document_templates: {},
       });

apps/uapi/jest.config.cjs

@@ -202,6 +202,9 @@ module.exports = {
     '<rootDir>/tests/productRoutes.test.ts',
     '<rootDir>/tests/repositoryContext.test.ts',
     '<rootDir>/tests/pipelineRunData.test.ts',
+    // Settle delivery completion mapping (settleDelivery only; pre-production)
+    '<rootDir>/tests/streamParser.completion.test.ts',
+    '<rootDir>/tests/executionsHeaderSemanticMirrors.test.ts',
     '<rootDir>/tests/transactionReadiness.test.ts',
     '<rootDir>/tests/pipelineSelectionQuery.test.ts',
     '<rootDir>/tests/pipelineActivityHistory.test.ts',

apps/uapi/mocking/engines/StreamingPipelineEngine.ts

@@ -654,7 +654,7 @@ export class StreamingPipelineEngine {
         paths: ['src/mock.ts', 'README.md']
       }
     };
-    // Settle delivery surface; dual-write historical shippables for reread.
+    // Mock settle Simple delivery surface; settleDelivery only (no shippables).
     const settleDelivery = {
       pullRequest: {
         url: 'https://github.com/mock/repo/pull/123',
@@ -669,7 +669,6 @@ export class StreamingPipelineEngine {
       summary: writtenAssets.summary,
       display: 'Mock Asset Pack',
       settleDelivery,
-      shippables: settleDelivery,
       assetPackSynthesisArtifacts: {
         ...settleDelivery,
         proofEvidence: ['mock AssetPack evidence captured for reread'],

apps/uapi/mocking/generators/MockDataGenerators.ts

@@ -477,7 +477,8 @@ class CompletionDataGenerator extends BaseDataGenerator {
         paths: ['src/main.ts', 'README.md', 'package.json'].slice(0, Math.floor(Math.random() * 3) + 1)
       } : null
     };
-    // Settle delivery surface (buyer PR after rights); dual-write historical key.
+    // Mock settle Simple delivery surface (buyer PR after rights). New-world
+    // mocks emit settleDelivery only — not the legacy shippables key.
     const settleDelivery = {
       pullRequest: hasPR ? {
         url: 'https://github.com/mock/repo/pull/123',
@@ -493,7 +494,6 @@ class CompletionDataGenerator extends BaseDataGenerator {
       summary: writtenAssets.summary || this.generateRealisticText(25),
       display: 'Mock Asset Pack',
       settleDelivery,
-      shippables: settleDelivery,
       assetPackSynthesisArtifacts: {
         ...settleDelivery,
         proofEvidence: ['mock AssetPack evidence captured for reread'],

apps/uapi/mocks/user-template-preferences-default.json

@@ -1,5 +1,5 @@
 {
-  "shippable_templates": {
+  "delivery_templates": {
     "pullRequests": ["pr-quick-todo"]
   },
   "evidence_document_templates": {