You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maka.apache.org by as...@apache.org on 2026/09/01 01:57:26 UTC

(maka) branch feat/4299-previous-request-preservation updated (3015374980 -> 554c68d5e3)

This is an automated email from the ASF dual-hosted git repository.

Astro-Han pushed a change to branch feat/4299-previous-request-preservation
in repository https://gitbox.apache.org/repos/asf/maka.git


    from 3015374980 fix(runtime): validate canonical prefix anchors
     new f732410782 chore(desktop): refresh Astryx surface inventory
     new 554c68d5e3 refactor(runtime): clarify request preservation

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../session-inspector-composition.test.ts          | 10 +--
 .../session-inspector-panel-model.test.ts          | 16 ++--
 .../src/main/__tests__/use-session-trace.test.ts   |  4 +-
 .../src/renderer/features/workbar/testing.ts       |  2 +-
 .../inspector/session-inspector-overview-model.ts  | 10 +--
 .../tools/inspector/session-inspector-panel.tsx    | 40 ++++-----
 .../src/renderer/locales/conversation-copy.ts      | 18 ++--
 docs/astryx-surface-file-inventory.md              |  2 +-
 .../src/__tests__/context-protocol.test.ts         |  4 +-
 packages/runtime-host/src/protocol/context.ts      | 90 ++++----------------
 packages/runtime-host/src/protocol/index.ts        |  2 +-
 .../src/__tests__/context-diagnostics.test.ts      |  4 +-
 .../src/__tests__/latest-context-commit.test.ts    | 16 ++--
 ...inuity.test.ts => request-preservation.test.ts} | 39 ++++-----
 packages/runtime/src/agent-run.ts                  |  9 +-
 packages/runtime/src/context-diagnostics.ts        | 21 ++---
 packages/runtime/src/latest-context-snapshot.ts    | 11 +--
 ...refix-continuity.ts => request-preservation.ts} | 98 ++++++++++------------
 18 files changed, 157 insertions(+), 239 deletions(-)
 rename packages/runtime/src/__tests__/{semantic-prefix-continuity.test.ts => request-preservation.test.ts} (91%)
 rename packages/runtime/src/{semantic-prefix-continuity.ts => request-preservation.ts} (84%)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@maka.apache.org
For additional commands, e-mail: commits-help@maka.apache.org


(maka) 01/02: chore(desktop): refresh Astryx surface inventory

Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

Astro-Han pushed a commit to branch feat/4299-previous-request-preservation
in repository https://gitbox.apache.org/repos/asf/maka.git

commit f732410782fb10f1ef1af0d6566a0757dc4bb76f
Author: AstroHan <le...@outlook.com>
AuthorDate: Tue Sep 1 09:50:20 2026 +0800

    chore(desktop): refresh Astryx surface inventory
    
    Generated-by: Codex
---
 docs/astryx-surface-file-inventory.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/astryx-surface-file-inventory.md b/docs/astryx-surface-file-inventory.md
index b1e9f656c0..95471770d2 100644
--- a/docs/astryx-surface-file-inventory.md
+++ b/docs/astryx-surface-file-inventory.md
@@ -62,7 +62,7 @@ Wiki bar: Design Conventions · API Use-the-System · Theming · Container Paddi
 | `apps/desktop/src/renderer/features/workbar/tools/artifacts/artifact-preview-registry-shell.tsx` | shell-chrome-or-panel | Banner, Button, Spinner | aligned — uses Astryx (Banner, Button, Spinner) | aligned |
 | `apps/desktop/src/renderer/features/workbar/tools/artifacts/artifact-preview.tsx` | shell-chrome-or-panel | Banner, Button, CodeBlock, Spinner | aligned — uses Astryx (Banner, Button, CodeBlock, Spinner) | aligned |
 | `apps/desktop/src/renderer/features/workbar/tools/browser/browser-panel.tsx` | shell-chrome-or-panel | EmptyState, IconButton, TextInput, Toolbar, Tooltip | aligned — uses Astryx (EmptyState, IconButton, TextInput, Toolbar, Tooltip) | aligned |
-| `apps/desktop/src/renderer/features/workbar/tools/inspector/session-inspector-panel.tsx` | shell-chrome-or-panel | Banner, Button, EmptyState, Heading, Section, Text, VStack | aligned — uses Astryx (Banner, Button, EmptyState, Heading, Section, Text, VStack) | aligned |
+| `apps/desktop/src/renderer/features/workbar/tools/inspector/session-inspector-panel.tsx` | shell-chrome-or-panel | Badge, Banner, Button, EmptyState, Heading, Section, Text, VStack | aligned — uses Astryx (Badge, Banner, Button, EmptyState, Heading, Section, Text, VStack) | aligned |
 | `apps/desktop/src/renderer/features/workbar/tools/review/session-review-panel.tsx` | shell-chrome-or-panel | Banner, Button, Collapsible, CollapsibleGroup, EmptyState, HStack, Section, Skeleton, Text, VStack | aligned — uses Astryx (Banner, Button, Collapsible, CollapsibleGroup, EmptyState, HStack, Section, Skeleton) | aligned |
 | `apps/desktop/src/renderer/features/workbar/tools/side-chat/quote-companion-panel.tsx` | shell-chrome-or-panel | Banner, Spinner | aligned — uses Astryx (Banner, Spinner) | aligned |
 | `apps/desktop/src/renderer/features/workbar/tools/terminal/session-terminal-panel.tsx` | shell-chrome-or-panel | Banner, EmptyState | aligned — uses Astryx (Banner, EmptyState) | aligned |


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@maka.apache.org
For additional commands, e-mail: commits-help@maka.apache.org


(maka) 02/02: refactor(runtime): clarify request preservation

Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

Astro-Han pushed a commit to branch feat/4299-previous-request-preservation
in repository https://gitbox.apache.org/repos/asf/maka.git

commit 554c68d5e3dea63fb4f1ac9bcd142966c436f4e7
Author: AstroHan <le...@outlook.com>
AuthorDate: Tue Sep 1 09:55:57 2026 +0800

    refactor(runtime): clarify request preservation
    
    Generated-by: Codex
---
 .../session-inspector-composition.test.ts          | 10 +--
 .../session-inspector-panel-model.test.ts          | 16 ++--
 .../src/main/__tests__/use-session-trace.test.ts   |  4 +-
 .../src/renderer/features/workbar/testing.ts       |  2 +-
 .../inspector/session-inspector-overview-model.ts  | 10 +--
 .../tools/inspector/session-inspector-panel.tsx    | 40 ++++-----
 .../src/renderer/locales/conversation-copy.ts      | 18 ++--
 .../src/__tests__/context-protocol.test.ts         |  4 +-
 packages/runtime-host/src/protocol/context.ts      | 90 ++++----------------
 packages/runtime-host/src/protocol/index.ts        |  2 +-
 .../src/__tests__/context-diagnostics.test.ts      |  4 +-
 .../src/__tests__/latest-context-commit.test.ts    | 16 ++--
 ...inuity.test.ts => request-preservation.test.ts} | 39 ++++-----
 packages/runtime/src/agent-run.ts                  |  9 +-
 packages/runtime/src/context-diagnostics.ts        | 21 ++---
 packages/runtime/src/latest-context-snapshot.ts    | 11 +--
 ...refix-continuity.ts => request-preservation.ts} | 98 ++++++++++------------
 17 files changed, 156 insertions(+), 238 deletions(-)

diff --git a/apps/desktop/src/main/__tests__/session-inspector-composition.test.ts b/apps/desktop/src/main/__tests__/session-inspector-composition.test.ts
index 570bd5ead6..31fed020b6 100644
--- a/apps/desktop/src/main/__tests__/session-inspector-composition.test.ts
+++ b/apps/desktop/src/main/__tests__/session-inspector-composition.test.ts
@@ -23,7 +23,7 @@ import { createElement } from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 import {
   InspectorCompositionSection,
-  InspectorRequestPrefixBadge,
+  InspectorRequestPreservationBadge,
 } from '../../renderer/features/workbar/testing.js';
 import { getDesktopConversationCopy } from '../../renderer/locales/conversation-copy.js';
 
@@ -66,9 +66,9 @@ test('maps each request-composition category to the same colour in the chart and
 
 test('renders the Runtime divergence location as a compact badge', () => {
   const markup = renderToStaticMarkup(
-    createElement(InspectorRequestPrefixBadge, {
+    createElement(InspectorRequestPreservationBadge, {
       copy: getDesktopConversationCopy('en').inspector,
-      requestPrefix: {
+      requestPreservation: {
         status: 'diverged',
         previousSegmentCount: 8,
         preservedSegmentCount: 2,
@@ -77,6 +77,6 @@ test('renders the Runtime divergence location as a compact badge', () => {
     }),
   );
 
-  assert.match(markup, /Request prefix diverged at message 3/);
-  assert.match(markup, /data-maka-contract="request-prefix-continuity"/);
+  assert.match(markup, /Previous request changed at message 3/);
+  assert.match(markup, /data-maka-contract="request-preservation"/);
 });
diff --git a/apps/desktop/src/main/__tests__/session-inspector-panel-model.test.ts b/apps/desktop/src/main/__tests__/session-inspector-panel-model.test.ts
index f7e2b407c8..8235b60da3 100644
--- a/apps/desktop/src/main/__tests__/session-inspector-panel-model.test.ts
+++ b/apps/desktop/src/main/__tests__/session-inspector-panel-model.test.ts
@@ -139,7 +139,7 @@ test('does not estimate a cache-hit ratio from partial usage', () => {
   assert.equal(overview.cacheHitRate, undefined);
 });
 
-test('keeps provider cache read and write usage separate from prefix continuity', () => {
+test('keeps provider cache read and write usage separate from request preservation', () => {
   const overview = deriveInspectorOverviewModel(undefined, {
     range: { from: 0, to: 1 },
     totalRequests: 1,
@@ -172,11 +172,11 @@ test('keeps provider cache read and write usage separate from prefix continuity'
   });
 
   assert.deepEqual(overview.providerCacheUsage, { readTokens: 7, writeTokens: 4 });
-  assert.equal(overview.requestPrefix, undefined);
+  assert.equal(overview.requestPreservation, undefined);
 });
 
-test('passes the Runtime request-prefix verdict through without recomputing it', () => {
-  const requestPrefix = {
+test('passes the Runtime request-preservation verdict through without recomputing it', () => {
+  const requestPreservation = {
     status: 'diverged' as const,
     previousSegmentCount: 8,
     preservedSegmentCount: 2,
@@ -187,10 +187,10 @@ test('passes the Runtime request-prefix verdict through without recomputing it',
     providerId: 'anthropic',
     modelId: 'claude',
     completedAt: 10,
-    requestPrefix,
+    requestPreservation,
   });
 
-  assert.equal(overview.requestPrefix, requestPrefix);
+  assert.equal(overview.requestPreservation, requestPreservation);
 });
 
 test('does not create an empty overview for a request without a predecessor', () => {
@@ -199,14 +199,14 @@ test('does not create an empty overview for a request without a predecessor', ()
     providerId: 'anthropic',
     modelId: 'claude',
     completedAt: 10,
-    requestPrefix: {
+    requestPreservation: {
       status: 'no_predecessor',
       previousSegmentCount: 0,
       preservedSegmentCount: 0,
     },
   });
 
-  assert.equal(overview.requestPrefix, undefined);
+  assert.equal(overview.requestPreservation, undefined);
 });
 
 test('derives per-turn cost only from priced model-call step totals', () => {
diff --git a/apps/desktop/src/main/__tests__/use-session-trace.test.ts b/apps/desktop/src/main/__tests__/use-session-trace.test.ts
index 3a32cc6d8c..320c191ce8 100644
--- a/apps/desktop/src/main/__tests__/use-session-trace.test.ts
+++ b/apps/desktop/src/main/__tests__/use-session-trace.test.ts
@@ -317,7 +317,7 @@ describe('useSessionTrace', () => {
     assert.equal(harness.reads.length, 2, 'a closing burst is one re-read, not three');
   });
 
-  it('does not keep an earlier request-prefix verdict while its refresh fails', async () => {
+  it('does not keep an earlier request-preservation verdict while its refresh fails', async () => {
     const { root } = installReactRenderer();
     const harness = createTraceHarness({
       context: async (_sessionId, readIndex) => {
@@ -329,7 +329,7 @@ describe('useSessionTrace', () => {
             providerId: 'anthropic',
             modelId: 'model',
             completedAt: 1,
-            requestPrefix: {
+            requestPreservation: {
               status: 'preserved',
               previousSegmentCount: 1,
               preservedSegmentCount: 1,
diff --git a/apps/desktop/src/renderer/features/workbar/testing.ts b/apps/desktop/src/renderer/features/workbar/testing.ts
index c0eb23a02e..96363b696a 100644
--- a/apps/desktop/src/renderer/features/workbar/testing.ts
+++ b/apps/desktop/src/renderer/features/workbar/testing.ts
@@ -35,7 +35,7 @@ export * from './tools/inspector/session-inspector-panel-model.js';
 export {
   compactNumberFormatter,
   InspectorCompositionSection,
-  InspectorRequestPrefixBadge,
+  InspectorRequestPreservationBadge,
 } from './tools/inspector/session-inspector-panel.js';
 export * from './tools/inspector/session-inspector-overview-model.js';
 export * from './tools/side-chat/quote-companion-panel-state.js';
diff --git a/apps/desktop/src/renderer/features/workbar/tools/inspector/session-inspector-overview-model.ts b/apps/desktop/src/renderer/features/workbar/tools/inspector/session-inspector-overview-model.ts
index ef00f4919f..d6e4839f86 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/inspector/session-inspector-overview-model.ts
+++ b/apps/desktop/src/renderer/features/workbar/tools/inspector/session-inspector-overview-model.ts
@@ -142,8 +142,8 @@ export interface InspectorOverviewModel {
   cacheHitRate?: number;
   /** Provider-reported cache usage; independent of semantic continuity. */
   providerCacheUsage?: { readTokens: number; writeTokens: number };
-  /** Runtime-owned semantic prefix verdict; Desktop only presents it. */
-  requestPrefix?: Extract<ContextDiagnosticsResult, { status: 'available' }>['requestPrefix'];
+  /** Runtime-owned request-preservation verdict; Desktop only presents it. */
+  requestPreservation?: Extract<ContextDiagnosticsResult, { status: 'available' }>['requestPreservation'];
 }
 
 export function estimatedSessionCost(
@@ -193,9 +193,9 @@ export function deriveInspectorOverviewModel(
     ...(cacheHitRate !== undefined ? { cacheHitRate } : {}),
     ...(providerCacheUsage ? { providerCacheUsage } : {}),
     ...(diagnostics?.status === 'available' &&
-    diagnostics.requestPrefix &&
-    diagnostics.requestPrefix.status !== 'no_predecessor'
-      ? { requestPrefix: diagnostics.requestPrefix }
+    diagnostics.requestPreservation &&
+    diagnostics.requestPreservation.status !== 'no_predecessor'
+      ? { requestPreservation: diagnostics.requestPreservation }
       : {}),
   };
 }
diff --git a/apps/desktop/src/renderer/features/workbar/tools/inspector/session-inspector-panel.tsx b/apps/desktop/src/renderer/features/workbar/tools/inspector/session-inspector-panel.tsx
index 4e1acbaaa2..c0f7a7c6ac 100644
--- a/apps/desktop/src/renderer/features/workbar/tools/inspector/session-inspector-panel.tsx
+++ b/apps/desktop/src/renderer/features/workbar/tools/inspector/session-inspector-panel.tsx
@@ -149,7 +149,7 @@ export function SessionInspectorPanel(props: { sessionId: string; active: boolea
             {copy.summaryUnavailable}
           </Text>
         )}
-        {(snapshot.summary || overview.context || overview.composition || overview.requestPrefix) && (
+        {(snapshot.summary || overview.context || overview.composition || overview.requestPreservation) && (
           <InspectorOverview
             copy={copy}
             locale={locale}
@@ -273,8 +273,8 @@ function InspectorOverview(props: {
 
   return (
     <VStack gap={6} data-maka-contract="session-inspector-overview">
-      {overview.requestPrefix && (
-        <InspectorRequestPrefixBadge copy={copy} requestPrefix={overview.requestPrefix} />
+      {overview.requestPreservation && (
+        <InspectorRequestPreservationBadge copy={copy} requestPreservation={overview.requestPreservation} />
       )}
       {props.showTotals && (
         <VStack gap={2} data-maka-contract="session-inspector-stats">
@@ -320,41 +320,41 @@ function InspectorOverview(props: {
   );
 }
 
-export function InspectorRequestPrefixBadge(props: {
+export function InspectorRequestPreservationBadge(props: {
   copy: InspectorCopy;
-  requestPrefix: NonNullable<ReturnType<typeof deriveInspectorOverviewModel>['requestPrefix']>;
+  requestPreservation: NonNullable<ReturnType<typeof deriveInspectorOverviewModel>['requestPreservation']>;
 }) {
-  const { requestPrefix, copy } = props;
-  if (requestPrefix.status === 'no_predecessor') return null;
-  if (requestPrefix.status === 'preserved') {
+  const { requestPreservation, copy } = props;
+  if (requestPreservation.status === 'no_predecessor') return null;
+  if (requestPreservation.status === 'preserved') {
     return (
       <Badge
         variant="neutral"
-        label={copy.overview.requestPrefix.preserved(
-          requestPrefix.preservedSegmentCount,
-          requestPrefix.previousSegmentCount,
+        label={copy.overview.requestPreservation.preserved(
+          requestPreservation.preservedSegmentCount,
+          requestPreservation.previousSegmentCount,
         )}
-        data-maka-contract="request-prefix-continuity"
+        data-maka-contract="request-preservation"
       />
     );
   }
-  if (requestPrefix.status === 'diverged') {
+  if (requestPreservation.status === 'diverged') {
     return (
       <Badge
         variant="error"
-        label={copy.overview.requestPrefix.diverged(
-          copy.overview.requestPrefix.segment[requestPrefix.firstDivergentSegment.kind],
-          requestPrefix.firstDivergentSegment.index + 1,
+        label={copy.overview.requestPreservation.diverged(
+          copy.overview.requestPreservation.segment[requestPreservation.firstDivergentSegment.kind],
+          requestPreservation.firstDivergentSegment.index + 1,
         )}
-        data-maka-contract="request-prefix-continuity"
+        data-maka-contract="request-preservation"
       />
     );
   }
   return (
     <Badge
-      variant={requestPrefix.status === 'unknown' ? 'warning' : 'neutral'}
-      label={copy.overview.requestPrefix.cannotJudge}
-      data-maka-contract="request-prefix-continuity"
+      variant={requestPreservation.status === 'unknown' ? 'warning' : 'neutral'}
+      label={copy.overview.requestPreservation.cannotJudge}
+      data-maka-contract="request-preservation"
     />
   );
 }
diff --git a/apps/desktop/src/renderer/locales/conversation-copy.ts b/apps/desktop/src/renderer/locales/conversation-copy.ts
index 23d49803ac..18f316620c 100644
--- a/apps/desktop/src/renderer/locales/conversation-copy.ts
+++ b/apps/desktop/src/renderer/locales/conversation-copy.ts
@@ -263,7 +263,7 @@ export interface DesktopConversationCopy {
       /** The three figures a reader opens this tab for, as headline stats. */
       cacheHit: string;
       providerCache: string;
-      requestPrefix: {
+      requestPreservation: {
         preserved: (preserved: number, previous: number) => string;
         diverged: (segment: string, index: number) => string;
         cannotJudge: string;
@@ -607,10 +607,10 @@ const COPY = {
         },
         cacheHit: '缓存命中率',
         providerCache: 'Provider 缓存读取 / 写入',
-        requestPrefix: {
-          preserved: (preserved, previous) => `请求前缀 ${preserved}/${previous} 保持`,
-          diverged: (segment, index) => `请求前缀在${segment} ${index}处分叉`,
-          cannotJudge: '请求前缀无法判断',
+        requestPreservation: {
+          preserved: (preserved, previous) => `上次请求内容已保留 ${preserved}/${previous}`,
+          diverged: (segment, index) => `上次请求从${segment} ${index}起有变化`,
+          cannotJudge: '无法比较上次请求',
           segment: {
             tool_schema: '工具',
             system_prompt: '系统提示',
@@ -854,11 +854,11 @@ const COPY = {
         },
         cacheHit: 'Cache hit rate',
         providerCache: 'Provider cache read / write',
-        requestPrefix: {
+        requestPreservation: {
           preserved: (preserved, previous) =>
-            `Request prefix ${preserved}/${previous} preserved`,
-          diverged: (segment, index) => `Request prefix diverged at ${segment} ${index}`,
-          cannotJudge: 'Request prefix unavailable',
+            `Previous request ${preserved}/${previous} preserved`,
+          diverged: (segment, index) => `Previous request changed at ${segment} ${index}`,
+          cannotJudge: 'Previous request could not be compared',
           segment: {
             tool_schema: 'tool',
             system_prompt: 'system prompt',
diff --git a/packages/runtime-host/src/__tests__/context-protocol.test.ts b/packages/runtime-host/src/__tests__/context-protocol.test.ts
index 88d7ead1b5..d557db1917 100644
--- a/packages/runtime-host/src/__tests__/context-protocol.test.ts
+++ b/packages/runtime-host/src/__tests__/context-protocol.test.ts
@@ -71,7 +71,7 @@ test('context operations preserve bounded exact wire values', () => {
           turnCount: 2,
           estimatedTokens: 12,
         },
-        requestPrefix: {
+        requestPreservation: {
           status: 'diverged',
           previousSegmentCount: 8,
           preservedSegmentCount: 2,
@@ -102,7 +102,7 @@ test('context operations preserve bounded exact wire values', () => {
           turnCount: 2,
           estimatedTokens: 12,
         },
-        requestPrefix: {
+        requestPreservation: {
           status: 'diverged',
           previousSegmentCount: 8,
           preservedSegmentCount: 2,
diff --git a/packages/runtime-host/src/protocol/context.ts b/packages/runtime-host/src/protocol/context.ts
index 8ae912f8f2..456d2cb2b0 100644
--- a/packages/runtime-host/src/protocol/context.ts
+++ b/packages/runtime-host/src/protocol/context.ts
@@ -28,7 +28,7 @@ import { invalidProtocolFrame } from './errors.js';
 import { defineOperation } from './operation-spec.js';
 import { decodeContextCompactionOutcome, decodeTurnSnapshot, type TurnSnapshot } from './turn.js';
 import type { ContextCompactionOutcome } from '@maka/core/events';
-import type { SemanticPrefixContinuity } from '@maka/runtime/context-diagnostics';
+import { isRequestPreservation, type RequestPreservation } from '@maka/runtime/context-diagnostics';
 
 export interface ContextDiagnosticsQueryInput {
   readonly sessionId: string;
@@ -72,7 +72,7 @@ export interface ContextDiagnosticsComposition {
   readonly unlabelledToolBytes?: number;
 }
 
-export type ContextDiagnosticsRequestPrefix = SemanticPrefixContinuity;
+export type ContextDiagnosticsRequestPreservation = RequestPreservation;
 
 export type ContextDiagnosticsResult =
   | {
@@ -102,7 +102,7 @@ export type ContextDiagnosticsResult =
         readonly estimatedTokens: number;
       };
       /** Runtime-owned verdict; Host and Desktop must not recompute it. */
-      readonly requestPrefix?: ContextDiagnosticsRequestPrefix;
+      readonly requestPreservation?: ContextDiagnosticsRequestPreservation;
     };
 
 const QUERY_ERRORS = [
@@ -179,7 +179,7 @@ function decodeContextDiagnosticsResult(value: unknown): ContextDiagnosticsResul
       'contextWindow',
       'composition',
       'compaction',
-      'requestPrefix',
+      'requestPreservation',
     ],
   );
   if (record.status === 'unavailable') {
@@ -208,7 +208,7 @@ function decodeContextDiagnosticsResult(value: unknown): ContextDiagnosticsResul
       'contextWindow',
       'composition',
       'compaction',
-      'requestPrefix',
+      'requestPreservation',
     ],
   );
   return {
@@ -236,80 +236,22 @@ function decodeContextDiagnosticsResult(value: unknown): ContextDiagnosticsResul
     ...(available.compaction === undefined
       ? {}
       : { compaction: decodeContextDiagnosticsCompaction(available.compaction) }),
-    ...(available.requestPrefix === undefined
+    ...(available.requestPreservation === undefined
       ? {}
-      : { requestPrefix: decodeContextDiagnosticsRequestPrefix(available.requestPrefix) }),
+      : {
+          requestPreservation: decodeContextDiagnosticsRequestPreservation(
+            available.requestPreservation,
+          ),
+        }),
   };
 }
 
-function decodeContextDiagnosticsRequestPrefix(value: unknown): ContextDiagnosticsRequestPrefix {
-  const prefix = requireShapedRecord(
-    value,
-    'Context diagnostics request prefix',
-    ['status', 'previousSegmentCount', 'preservedSegmentCount'],
-    ['firstDivergentSegment'],
-  );
-  const previousSegmentCount = requireCount(prefix.previousSegmentCount, 'previousSegmentCount');
-  const preservedSegmentCount = requireCount(prefix.preservedSegmentCount, 'preservedSegmentCount');
-  if (preservedSegmentCount > previousSegmentCount) {
-    throw invalidProtocolFrame('Invalid request prefix segment counts');
-  }
-  if (prefix.status === 'no_predecessor' || prefix.status === 'unavailable') {
-    if (
-      prefix.firstDivergentSegment !== undefined ||
-      previousSegmentCount !== 0 ||
-      preservedSegmentCount !== 0
-    ) {
-      throw invalidProtocolFrame('Invalid unavailable request prefix');
-    }
-    return { status: prefix.status, previousSegmentCount: 0, preservedSegmentCount: 0 };
-  }
-  if (prefix.status === 'preserved' || prefix.status === 'unknown') {
-    if (
-      prefix.firstDivergentSegment !== undefined ||
-      (prefix.status === 'preserved' && preservedSegmentCount !== previousSegmentCount)
-    ) {
-      throw invalidProtocolFrame('Invalid request prefix result');
-    }
-    return { status: prefix.status, previousSegmentCount, preservedSegmentCount };
-  }
-  if (prefix.status !== 'diverged' || prefix.firstDivergentSegment === undefined) {
-    throw invalidProtocolFrame('Invalid request prefix status');
-  }
-  const segment = requireShapedRecord(
-    prefix.firstDivergentSegment,
-    'Request prefix divergent segment',
-    ['kind', 'index'],
-    ['role', 'label'],
-  );
-  if (
-    segment.kind !== 'tool_schema' &&
-    segment.kind !== 'system_prompt' &&
-    segment.kind !== 'message' &&
-    segment.kind !== 'provider_options'
-  ) {
-    throw invalidProtocolFrame('Invalid request prefix segment kind');
+function decodeContextDiagnosticsRequestPreservation(
+  value: unknown,
+): ContextDiagnosticsRequestPreservation {
+  if (!isRequestPreservation(value)) {
+    throw invalidProtocolFrame('Invalid context diagnostics request preservation');
   }
-  return {
-    status: 'diverged',
-    previousSegmentCount,
-    preservedSegmentCount,
-    firstDivergentSegment: {
-      kind: segment.kind,
-      index: requireCount(segment.index, 'requestPrefixSegmentIndex'),
-      ...(segment.role === undefined
-        ? {}
-        : { role: requireOptionalSegmentText(segment.role, 'requestPrefixSegmentRole') }),
-      ...(segment.label === undefined
-        ? {}
-        : { label: requireOptionalSegmentText(segment.label, 'requestPrefixSegmentLabel') }),
-    },
-  };
-}
-
-function requireOptionalSegmentText(value: unknown, label: string): string {
-  if (typeof value !== 'string' || value.length > 256)
-    throw invalidProtocolFrame(`Invalid ${label}`);
   return value;
 }
 
diff --git a/packages/runtime-host/src/protocol/index.ts b/packages/runtime-host/src/protocol/index.ts
index d02181ecec..3bb43b1fe8 100644
--- a/packages/runtime-host/src/protocol/index.ts
+++ b/packages/runtime-host/src/protocol/index.ts
@@ -96,7 +96,7 @@ export const RUNTIME_HOST_PROTOCOL_VERSION = 0 as const;
 // Increment when the same protocol version no longer guarantees safe Client-Host
 // interoperability. Mismatches are rejected before domain commands are admitted.
 export const RUNTIME_HOST_COMPATIBILITY_EPOCH = 83 as const;
-// 83: Context diagnostics may carry Runtime-owned semantic request-prefix continuity.
+// 83: Context diagnostics may carry Runtime-owned request preservation.
 // 82: Session removal reports how many linked subtasks it archived, and adds a
 // `session.remove.preview` query for that count before the delete. Older peers
 // reject the extra removed-result field and the unknown operation.
diff --git a/packages/runtime/src/__tests__/context-diagnostics.test.ts b/packages/runtime/src/__tests__/context-diagnostics.test.ts
index c04168c275..02e565446b 100644
--- a/packages/runtime/src/__tests__/context-diagnostics.test.ts
+++ b/packages/runtime/src/__tests__/context-diagnostics.test.ts
@@ -70,7 +70,7 @@ test('rejects v2 snapshots that the canonical writer cannot produce', () => {
     },
     {
       ...base,
-      requestPrefix: {
+      requestPreservation: {
         status: 'diverged',
         previousSegmentCount: 1,
         preservedSegmentCount: 0,
@@ -79,7 +79,7 @@ test('rejects v2 snapshots that the canonical writer cannot produce', () => {
     },
     {
       ...base,
-      requestPrefix: {
+      requestPreservation: {
         status: 'preserved',
         previousSegmentCount: 1,
         preservedSegmentCount: 1,
diff --git a/packages/runtime/src/__tests__/latest-context-commit.test.ts b/packages/runtime/src/__tests__/latest-context-commit.test.ts
index 5344412cca..5666a5b875 100644
--- a/packages/runtime/src/__tests__/latest-context-commit.test.ts
+++ b/packages/runtime/src/__tests__/latest-context-commit.test.ts
@@ -48,7 +48,7 @@ import { BackendRegistry, SessionManager } from '../session-manager.js';
 import { readLatestContextDiagnostics } from '../context-diagnostics.js';
 import { createTestAiSdkBackend } from './execution-boundary-test-helpers.js';
 
-test('real consecutive sends seal a preserved prefix verdict that survives restart', async () => {
+test('real consecutive sends preserve the previous request across restart', async () => {
   // Tracker → backend → the kernel seam a backend is actually built with →
   // AgentRun → the storage transaction. Every layer in that list once had a
   // signature that compiled while dropping the row, and no test crossed all of
@@ -137,7 +137,7 @@ test('real consecutive sends seal a preserved prefix verdict that survives resta
       diagnostics.composition?.segments.some((segment) => segment.kind === 'messages'),
       'and the request describes what it was made of',
     );
-    assert.deepEqual(diagnostics.requestPrefix, {
+    assert.deepEqual(diagnostics.requestPreservation, {
       status: 'no_predecessor',
       previousSegmentCount: 0,
       preservedSegmentCount: 0,
@@ -155,11 +155,11 @@ test('real consecutive sends seal a preserved prefix verdict that survives resta
     const successor = await readLatestContextDiagnostics(runStore, session.id);
     assert.equal(successor.status, 'available');
     if (successor.status !== 'available') return;
-    assert.ok(successor.requestPrefix);
-    assert.equal(successor.requestPrefix.status, 'preserved');
+    assert.ok(successor.requestPreservation);
+    assert.equal(successor.requestPreservation.status, 'preserved');
     assert.equal(
-      successor.requestPrefix.preservedSegmentCount,
-      successor.requestPrefix.previousSegmentCount,
+      successor.requestPreservation.preservedSegmentCount,
+      successor.requestPreservation.previousSegmentCount,
     );
 
     await manager.stopSession(session.id, { source: 'stop_button' });
@@ -188,7 +188,7 @@ test('real consecutive sends seal a preserved prefix verdict that survives resta
       const restarted = await readLatestContextDiagnostics(reopened, session.id);
       assert.equal(restarted.status, 'available');
       if (restarted.status !== 'available') return;
-      assert.deepEqual(restarted.requestPrefix, successor.requestPrefix);
+      assert.deepEqual(restarted.requestPreservation, successor.requestPreservation);
 
       let coldScans = 0;
       const cold = await readLatestContextDiagnostics(
@@ -210,7 +210,7 @@ test('real consecutive sends seal a preserved prefix verdict that survives resta
       assert.equal(cold.status, 'available');
       if (cold.status !== 'available') return;
       assert.deepEqual(cold.composition, successor.composition);
-      assert.deepEqual(cold.requestPrefix, successor.requestPrefix);
+      assert.deepEqual(cold.requestPreservation, successor.requestPreservation);
     } finally {
       reopened.close?.();
     }
diff --git a/packages/runtime/src/__tests__/semantic-prefix-continuity.test.ts b/packages/runtime/src/__tests__/request-preservation.test.ts
similarity index 91%
rename from packages/runtime/src/__tests__/semantic-prefix-continuity.test.ts
rename to packages/runtime/src/__tests__/request-preservation.test.ts
index 99145b5ddd..a77da048b1 100644
--- a/packages/runtime/src/__tests__/semantic-prefix-continuity.test.ts
+++ b/packages/runtime/src/__tests__/request-preservation.test.ts
@@ -27,9 +27,9 @@ import type {
 } from '@maka/core/model-call-attempt';
 import type { AgentRunEvent, AgentRunHeader } from '@maka/core/agent-run';
 import {
-  deriveAttemptSemanticPrefixContinuity,
-  deriveSemanticPrefixContinuity,
-} from '../semantic-prefix-continuity.js';
+  deriveAttemptRequestPreservation,
+  deriveRequestPreservation,
+} from '../request-preservation.js';
 
 test('keeps every earlier cacheable segment when the current request only appends', () => {
   const previous = observation([message(0, 'system'), message(1, 'user-1')]);
@@ -39,7 +39,7 @@ test('keeps every earlier cacheable segment when the current request only append
     message(2, 'assistant-1'),
   ]);
 
-  assert.deepEqual(deriveSemanticPrefixContinuity(current, previous), {
+  assert.deepEqual(deriveRequestPreservation(current, previous), {
     status: 'preserved',
     previousSegmentCount: 2,
     preservedSegmentCount: 2,
@@ -50,7 +50,7 @@ test('does not treat opaque digests as evidence of divergence', () => {
   const previous = observation([{ ...message(0, 'redacted-a'), comparison: 'opaque' }]);
   const current = observation([{ ...message(0, 'redacted-b'), comparison: 'opaque' }]);
 
-  assert.deepEqual(deriveSemanticPrefixContinuity(current, previous), {
+  assert.deepEqual(deriveRequestPreservation(current, previous), {
     status: 'unknown',
     previousSegmentCount: 1,
     preservedSegmentCount: 0,
@@ -61,7 +61,7 @@ test('reports the first changed earlier segment', () => {
   const previous = observation([message(0, 'system'), message(1, 'user-1')]);
   const current = observation([message(0, 'system'), message(1, 'edited-user-1')]);
 
-  assert.deepEqual(deriveSemanticPrefixContinuity(current, previous), {
+  assert.deepEqual(deriveRequestPreservation(current, previous), {
     status: 'diverged',
     previousSegmentCount: 2,
     preservedSegmentCount: 1,
@@ -73,7 +73,7 @@ test('reports the first removed earlier segment', () => {
   const previous = observation([message(0, 'system'), message(1, 'user-1')]);
   const current = observation([message(0, 'system')]);
 
-  assert.deepEqual(deriveSemanticPrefixContinuity(current, previous), {
+  assert.deepEqual(deriveRequestPreservation(current, previous), {
     status: 'diverged',
     previousSegmentCount: 2,
     preservedSegmentCount: 1,
@@ -89,7 +89,7 @@ test('reports the current segment at the first middle deletion', () => {
   ]);
   const current = observation([message(0, 'system'), message(2, 'assistant-1')]);
 
-  assert.deepEqual(deriveSemanticPrefixContinuity(current, previous), {
+  assert.deepEqual(deriveRequestPreservation(current, previous), {
     status: 'diverged',
     previousSegmentCount: 3,
     preservedSegmentCount: 1,
@@ -105,7 +105,7 @@ test('reports an inserted segment as the first divergence', () => {
     message(2, 'assistant-1'),
   ]);
 
-  assert.deepEqual(deriveSemanticPrefixContinuity(current, previous), {
+  assert.deepEqual(deriveRequestPreservation(current, previous), {
     status: 'diverged',
     previousSegmentCount: 2,
     preservedSegmentCount: 1,
@@ -125,7 +125,7 @@ test('reports the first moved segment after a reorder', () => {
     message(1, 'user-1'),
   ]);
 
-  assert.deepEqual(deriveSemanticPrefixContinuity(current, previous), {
+  assert.deepEqual(deriveRequestPreservation(current, previous), {
     status: 'diverged',
     previousSegmentCount: 3,
     preservedSegmentCount: 1,
@@ -266,11 +266,11 @@ test('does not compare a child run against its parent session run', async () =>
   assert.equal(
     await statusOf(
       current,
-      [run('run-parent', 'turn-1', PROVIDER_STATE), run('run-child', 'turn-1', PROVIDER_STATE)],
+      [
+        run('run-parent', 'turn-1', PROVIDER_STATE),
+        run('run-child', 'turn-1', PROVIDER_STATE, { parentRunId: 'run-parent' }),
+      ],
       [previous],
-      undefined,
-      false,
-      { parentRunId: 'run-parent' },
     ),
     'unavailable',
   );
@@ -281,16 +281,11 @@ async function statusOf(
   runs: AgentRunHeader[],
   attempts: ModelCallAttempt[],
   admission?: { runId: string; previousRootTurnId: string | null },
-  currentSessionInline = true,
-  lineage: { parentRunId?: string } = {},
 ) {
   return (
-    await deriveAttemptSemanticPrefixContinuity({
+    await deriveAttemptRequestPreservation({
       current,
-      currentProviderStateIdentity: PROVIDER_STATE,
-      currentSessionInline,
-      lineage,
-      store: prefixStore(runs, attempts, admission),
+      store: preservationStore(runs, attempts, admission),
     })
   ).status;
 }
@@ -382,7 +377,7 @@ function continuationSource(
   };
 }
 
-function prefixStore(
+function preservationStore(
   runs: AgentRunHeader[],
   attempts: ModelCallAttempt[],
   admission?: { runId: string; previousRootTurnId: string | null },
diff --git a/packages/runtime/src/agent-run.ts b/packages/runtime/src/agent-run.ts
index fcc512333d..21beebfea4 100644
--- a/packages/runtime/src/agent-run.ts
+++ b/packages/runtime/src/agent-run.ts
@@ -91,7 +91,7 @@ import {
 import { DEFAULT_TOOL_MODE, isToolMode, type ToolMode } from '@maka/core/tool-mode';
 import { materializeRuntimeEventTranscriptProjection } from './runtime-ledger-repair.js';
 import { cloneAndFreezeRuntimeSnapshot } from './runtime-snapshot.js';
-import { deriveAttemptSemanticPrefixContinuity } from './semantic-prefix-continuity.js';
+import { deriveAttemptRequestPreservation } from './request-preservation.js';
 
 export interface AgentRunActiveSession {
   sessionId: string;
@@ -479,11 +479,8 @@ export class AgentRun {
       if (!runStore) return;
       let projected = latestContext;
       if (projected && attempt.callKind === 'main') {
-        const requestPrefix = await deriveAttemptSemanticPrefixContinuity({
+        const requestPreservation = await deriveAttemptRequestPreservation({
           current: attempt,
-          currentProviderStateIdentity: this.providerStateIdentity,
-          currentSessionInline: this.isSessionInline(),
-          lineage: this.lineage,
           store: runStore,
         }).catch(() => ({
           status: 'unavailable' as const,
@@ -492,7 +489,7 @@ export class AgentRun {
         }));
         projected = {
           ...projected,
-          snapshot: { ...projected.snapshot, requestPrefix },
+          snapshot: { ...projected.snapshot, requestPreservation },
         };
       }
       await runStore.appendEvent(
diff --git a/packages/runtime/src/context-diagnostics.ts b/packages/runtime/src/context-diagnostics.ts
index 0d77f87192..d3aff6ce69 100644
--- a/packages/runtime/src/context-diagnostics.ts
+++ b/packages/runtime/src/context-diagnostics.ts
@@ -41,12 +41,12 @@ import {
   type HistoryCompactCheckpoint,
 } from './history-compact-checkpoint.js';
 import {
-  deriveAttemptSemanticPrefixContinuity,
+  deriveAttemptRequestPreservation,
   isCanonicalAttemptForRun,
-  type SemanticPrefixContinuity,
-} from './semantic-prefix-continuity.js';
+  type RequestPreservation,
+} from './request-preservation.js';
 
-export type { SemanticPrefixContinuity } from './semantic-prefix-continuity.js';
+export { isRequestPreservation, type RequestPreservation } from './request-preservation.js';
 
 export type ContextDiagnosticsUnavailableReason = 'no_completed_request' | 'trace_unavailable';
 
@@ -107,7 +107,7 @@ export type ContextDiagnostics =
       composition?: ContextDiagnosticsComposition;
       compaction?: ContextDiagnosticsCompaction;
       /** Absent only for historical projections written before this diagnostic existed. */
-      requestPrefix?: SemanticPrefixContinuity;
+      requestPreservation?: RequestPreservation;
     };
 
 export interface ContextDiagnosticsComposition {
@@ -262,13 +262,10 @@ async function rebuildContextFromLedger(
     (anchor && !anchor.hasRequestObservation
       ? exactHistoricalComposition(anchor, historicalAttempts)
       : undefined);
-  const requestPrefix =
+  const requestPreservation =
     anchor?.attempt && anchor.run
-      ? await deriveAttemptSemanticPrefixContinuity({
+      ? await deriveAttemptRequestPreservation({
           current: anchor.attempt,
-          currentProviderStateIdentity: anchor.run.providerStateIdentity,
-          currentSessionInline: true,
-          lineage: anchor.run,
           store: runStore,
         })
       : undefined;
@@ -285,7 +282,7 @@ async function rebuildContextFromLedger(
     ...(resolved.contextWindow !== undefined ? { contextWindow: resolved.contextWindow } : {}),
     ...(composition ? { composition } : {}),
     ...(boundary ? { compaction: contextDiagnosticsCompactionOf(boundary.checkpoint) } : {}),
-    ...(requestPrefix ? { requestPrefix } : {}),
+    ...(requestPreservation ? { requestPreservation } : {}),
   };
   // Repair on the way out, so this scan happens once per session rather than
   // on every panel refresh. Best-effort: the caller already has its answer,
@@ -383,7 +380,7 @@ function availableFrom(snapshot: LatestContextSnapshot): ContextDiagnostics {
     ...(snapshot.contextWindow !== undefined ? { contextWindow: snapshot.contextWindow } : {}),
     ...(snapshot.composition ? { composition: snapshot.composition } : {}),
     ...(snapshot.compaction ? { compaction: snapshot.compaction } : {}),
-    ...(snapshot.requestPrefix ? { requestPrefix: snapshot.requestPrefix } : {}),
+    ...(snapshot.requestPreservation ? { requestPreservation: snapshot.requestPreservation } : {}),
   };
 }
 
diff --git a/packages/runtime/src/latest-context-snapshot.ts b/packages/runtime/src/latest-context-snapshot.ts
index e363cbdb80..89b632c6cb 100644
--- a/packages/runtime/src/latest-context-snapshot.ts
+++ b/packages/runtime/src/latest-context-snapshot.ts
@@ -29,10 +29,7 @@ import type {
   ContextDiagnosticsComposition,
 } from './context-diagnostics.js';
 import { foldPromptComposition, type SizedRequestSegment } from './prompt-composition.js';
-import {
-  isSemanticPrefixContinuity,
-  type SemanticPrefixContinuity,
-} from './semantic-prefix-continuity.js';
+import { isRequestPreservation, type RequestPreservation } from './request-preservation.js';
 
 /**
  * One request's context, frozen by the transaction that committed it (#2323).
@@ -72,7 +69,7 @@ export interface LatestContextSnapshot {
   /** The boundary that applied when this request was built, if any. */
   compaction?: ContextDiagnosticsCompaction;
   /** Runtime-owned conclusion; consumers must not select or compare observations. */
-  requestPrefix?: SemanticPrefixContinuity;
+  requestPreservation?: RequestPreservation;
 }
 
 /**
@@ -141,7 +138,7 @@ export function readLatestContextSnapshot(
       'contextWindow',
       'composition',
       'compaction',
-      'requestPrefix',
+      'requestPreservation',
     ],
   );
   if (!record) return undefined;
@@ -157,7 +154,7 @@ export function readLatestContextSnapshot(
       (!isCount(record.contextWindow) || record.contextWindow === 0)) ||
     (record.composition !== undefined && !isContextDiagnosticsComposition(record.composition)) ||
     (record.compaction !== undefined && !isContextDiagnosticsCompaction(record.compaction)) ||
-    (record.requestPrefix !== undefined && !isSemanticPrefixContinuity(record.requestPrefix))
+    (record.requestPreservation !== undefined && !isRequestPreservation(record.requestPreservation))
   ) {
     return undefined;
   }
diff --git a/packages/runtime/src/semantic-prefix-continuity.ts b/packages/runtime/src/request-preservation.ts
similarity index 84%
rename from packages/runtime/src/semantic-prefix-continuity.ts
rename to packages/runtime/src/request-preservation.ts
index 7edbe1aace..cb393af7e1 100644
--- a/packages/runtime/src/semantic-prefix-continuity.ts
+++ b/packages/runtime/src/request-preservation.ts
@@ -30,7 +30,7 @@ import {
   type AgentRunStore,
 } from '@maka/core/agent-run';
 
-export type SemanticPrefixContinuity =
+export type RequestPreservation =
   | {
       status: 'no_predecessor' | 'unavailable';
       previousSegmentCount: 0;
@@ -45,15 +45,15 @@ export type SemanticPrefixContinuity =
       status: 'diverged';
       previousSegmentCount: number;
       preservedSegmentCount: number;
-      firstDivergentSegment: SemanticPrefixSegmentRef;
+      firstDivergentSegment: RequestPreservationSegmentRef;
     };
 
-export type SemanticPrefixSegmentRef = Pick<
+export type RequestPreservationSegmentRef = Pick<
   PreparedRequestObservationSegment,
   'kind' | 'index' | 'role' | 'label'
 >;
 
-type PrefixStore = Pick<AgentRunStore, 'listSessionRuns' | 'readEvents'>;
+type PreservationStore = Pick<AgentRunStore, 'listSessionRuns' | 'readEvents'>;
 
 interface RootAdmissionReader {
   readRootTurnAdmission?(
@@ -62,44 +62,37 @@ interface RootAdmissionReader {
   ): Promise<{ runId: string; previousRootTurnId?: string | null } | undefined>;
 }
 
-interface AttemptContinuityInput {
+interface AttemptPreservationInput {
   current: ModelCallAttempt;
-  currentProviderStateIdentity?: `sha256:${string}`;
-  currentSessionInline: boolean;
-  lineage: {
-    parentRunId?: string;
-    parentTurnId?: string;
-    retriedFromTurnId?: string;
-    regeneratedFromTurnId?: string;
-    branchOfTurnId?: string;
-    parentSessionId?: string;
-  };
-  store: PrefixStore;
+  store: PreservationStore;
 }
 
-export async function deriveAttemptSemanticPrefixContinuity(
-  input: AttemptContinuityInput,
-): Promise<SemanticPrefixContinuity> {
-  const { current } = input;
-  if (!input.currentSessionInline || current.callKind !== 'main' || !current.requestObservation) {
+export async function deriveAttemptRequestPreservation(
+  input: AttemptPreservationInput,
+): Promise<RequestPreservation> {
+  const { current, store } = input;
+  if (current.callKind !== 'main' || !current.requestObservation) {
     return unavailable();
   }
+  const runs = await store.listSessionRuns(current.sessionId);
+  const currentRun = runs.find((run) => run.runId === current.runId);
+  if (!currentRun || !isSessionInlineRun(currentRun)) return unavailable();
 
-  const predecessor = await predecessorAttempt(input);
+  const predecessor = await predecessorAttempt(current, currentRun, runs, store);
   if (predecessor === null) {
     return { status: 'no_predecessor', previousSegmentCount: 0, preservedSegmentCount: 0 };
   }
-  if (!predecessor || !sameDomain(input, predecessor)) return unavailable();
-  return deriveSemanticPrefixContinuity(
+  if (!predecessor || !sameDomain(current, currentRun, predecessor)) return unavailable();
+  return deriveRequestPreservation(
     current.requestObservation,
     predecessor.attempt.requestObservation!,
   );
 }
 
-export function deriveSemanticPrefixContinuity(
+export function deriveRequestPreservation(
   currentObservation: PreparedRequestObservation,
   previousObservation: PreparedRequestObservation,
-): SemanticPrefixContinuity {
+): RequestPreservation {
   const current = currentObservation.segments.filter((segment) => segment.cacheable);
   const previous = previousObservation.segments.filter((segment) => segment.cacheable);
   const previousSegmentCount = representedCount(previous);
@@ -155,7 +148,7 @@ function representedCount(segments: readonly PreparedRequestObservationSegment[]
   return segments.reduce((count, segment) => count + (segment.representedSegments ?? 1), 0);
 }
 
-function segmentRef(segment: PreparedRequestObservationSegment): SemanticPrefixSegmentRef {
+function segmentRef(segment: PreparedRequestObservationSegment): RequestPreservationSegmentRef {
   return {
     kind: segment.kind,
     index: segment.index,
@@ -165,13 +158,11 @@ function segmentRef(segment: PreparedRequestObservationSegment): SemanticPrefixS
 }
 
 async function predecessorAttempt(
-  input: AttemptContinuityInput,
+  current: ModelCallAttempt,
+  currentRun: AgentRunHeader,
+  runs: readonly AgentRunHeader[],
+  store: PreservationStore,
 ): Promise<{ attempt: ModelCallAttempt; run: AgentRunHeader } | null | undefined> {
-  const { current, lineage, store } = input;
-  const runs = await store.listSessionRuns(current.sessionId);
-  const currentRun = runs.find((run) => run.runId === current.runId);
-  if (!currentRun) return undefined;
-
   if (current.attempt > 0) {
     return uniqueAttempt(
       currentRun,
@@ -189,24 +180,23 @@ async function predecessorAttempt(
       ),
     );
   }
-  if (lineage.parentRunId) {
-    const parent = runs.find((run) => run.runId === lineage.parentRunId);
+  if (currentRun.parentRunId) {
+    const parent = runs.find((run) => run.runId === currentRun.parentRunId);
     return parent ? latestAttempt(parent, await attemptsFor(store, parent)) : undefined;
   }
   if (
-    lineage.parentSessionId ||
-    lineage.parentTurnId ||
-    lineage.retriedFromTurnId ||
-    lineage.regeneratedFromTurnId ||
-    lineage.branchOfTurnId
+    currentRun.parentSessionId ||
+    currentRun.parentTurnId ||
+    currentRun.retriedFromTurnId ||
+    currentRun.regeneratedFromTurnId ||
+    currentRun.branchOfTurnId
   ) {
     return undefined;
   }
 
-  const admission = await (store as PrefixStore & RootAdmissionReader).readRootTurnAdmission?.(
-    current.sessionId,
-    current.turnId,
-  );
+  const admission = await (
+    store as PreservationStore & RootAdmissionReader
+  ).readRootTurnAdmission?.(current.sessionId, current.turnId);
   if (
     !admission ||
     admission.runId !== current.runId ||
@@ -248,7 +238,10 @@ function uniqueDurableRunTip(runs: readonly AgentRunHeader[]): AgentRunHeader |
   return visited.size === runs.length ? tips[0] : undefined;
 }
 
-async function attemptsFor(store: PrefixStore, run: AgentRunHeader): Promise<ModelCallAttempt[]> {
+async function attemptsFor(
+  store: PreservationStore,
+  run: AgentRunHeader,
+): Promise<ModelCallAttempt[]> {
   const attempts: ModelCallAttempt[] = [];
   for (const event of await store.readEvents(run.sessionId, run.runId)) {
     if (event.type !== 'model_call_attempt_recorded') continue;
@@ -301,20 +294,17 @@ function uniqueAttempt(
 }
 
 function sameDomain(
-  input: {
-    current: ModelCallAttempt;
-    currentProviderStateIdentity?: `sha256:${string}`;
-  },
+  current: ModelCallAttempt,
+  currentRun: AgentRunHeader,
   previous: { attempt: ModelCallAttempt; run: AgentRunHeader },
 ): boolean {
-  const current = input.current;
   const before = previous.attempt;
   if (!before.requestObservation) return false;
   const currentPartition = exactProviderPartition(current.requestObservation!);
   const previousPartition = exactProviderPartition(before.requestObservation);
   return (
-    input.currentProviderStateIdentity !== undefined &&
-    input.currentProviderStateIdentity === previous.run.providerStateIdentity &&
+    currentRun.providerStateIdentity !== undefined &&
+    currentRun.providerStateIdentity === previous.run.providerStateIdentity &&
     current.sessionId === before.sessionId &&
     current.connectionSlug !== undefined &&
     current.connectionSlug === before.connectionSlug &&
@@ -331,11 +321,11 @@ function exactProviderPartition(observation: PreparedRequestObservation): string
   return segments.map((segment) => `${segment.index}:${segment.digest}`).join('|');
 }
 
-function unavailable(): SemanticPrefixContinuity {
+function unavailable(): RequestPreservation {
   return { status: 'unavailable', previousSegmentCount: 0, preservedSegmentCount: 0 };
 }
 
-export function isSemanticPrefixContinuity(value: unknown): value is SemanticPrefixContinuity {
+export function isRequestPreservation(value: unknown): value is RequestPreservation {
   if (!value || typeof value !== 'object') return false;
   const candidate = value as {
     status?: unknown;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@maka.apache.org
For additional commands, e-mail: commits-help@maka.apache.org