From f7ee10f89f0a7c5b673be279b2edca1563bb2383 Mon Sep 17 00:00:00 2001 From: LoopX Agent <337587101+loopx-agent@users.noreply.github.com> Date: Wed, 18 Nov 2026 20:54:33 +0800 Subject: [PATCH] Fix warm delta source paths in saved replan context Signed-off-by: LoopX Agent <337587101+loopx-agent@users.noreply.github.com> --- loopx/control_plane/quota/context_delivery.ts | 19 ++++++---- .../quota/progressive_context.ts | 2 +- .../control_plane_ts/context_delivery.test.ts | 36 ++++++++++++++++++- 3 files changed, 49 insertions(+), 8 deletions(-) diff --git a/loopx/control_plane/quota/context_delivery.ts b/loopx/control_plane/quota/context_delivery.ts index a9e843b2b5..84ba868418 100644 --- a/loopx/control_plane/quota/context_delivery.ts +++ b/loopx/control_plane/quota/context_delivery.ts @@ -359,7 +359,7 @@ function groupCurrentValues(delta: Exclude; - before: Path; after: Path; values?: ProjectionSourceValues}; + before: Path; after: Path; immutableSource: JsonObject; values?: ProjectionSourceValues}; function changeTree(before: unknown, after: unknown, forced: Path[], preserveFileNumbers = false, source?: SourceComparison): Delta | null { @@ -370,8 +370,15 @@ function changeTree(before: unknown, after: unknown, forced: Path[], preserveFil const copy = (value: T): T => source?.values ? value : clone(value); const literal = (value: unknown, path: Path): Delta => { const result = {value: copy(value)}; - if (source?.values && typeof value === "number") - source.values.set(result, new Map([["value", [...source.after, ...path]]])); + if (source?.values && typeof value === "number") { + // A staged view can place a number at a new path. The bridge can copy + // from that path only when it already holds the value in the capture. + const originalPath = [...source.after, ...path]; + const captured = originalPath.reduce((node, key) => + node !== null && typeof node === "object" && Object.hasOwn(node, key) + ? (node as Record)[key] : undefined, source.immutableSource); + if (Object.is(captured, value)) source.values.set(result, new Map([["value", originalPath]])); + } return result; }; const identity = (value: unknown, path: Path, side: "before" | "after"): string => source @@ -598,7 +605,7 @@ export function fileNavigationPaths(context: JsonObject): Path[] { /** Shared encoding within one presentation transaction; callers publish once * against their original source so numeric facts never round-trip through JS. */ export function encodeContextDelivery(request: JsonObject, legacyQuotaFields: readonly string[], - values: ProjectionSourceValues, fileNavigation: Path[] = []): JsonObject { + values: ProjectionSourceValues, fileNavigation: Path[] = [], immutableSource = request): JsonObject { const context = requireJsonObject(request.context, "current projection"); const identity = contextSourceIdentity(request, request.source_number_tokens); const surface = surfaceOf(request.surface ?? "work_context"), target = targetBinding(request, context, surface); @@ -626,7 +633,7 @@ export function encodeContextDelivery(request: JsonObject, legacyQuotaFields: re // The presentation owner may require navigation without opening the base. // This does not turn file continuity into confirmed model delivery. const changes = changeTree(prior, context, fileBacked ? fileNavigation : after.paths, fileBacked, - {identity, before: ["baseline", "context"], after: ["context"], + {identity, before: ["baseline", "context"], after: ["context"], immutableSource, ...(request.source_edits === true ? {values} : {})}); const delta: JsonObject = {schema_version: VERSION, mode: "delta", target, base: binding, ancestry: Number(depth) + 1, changes, @@ -688,7 +695,7 @@ export function restoreContextDelivery(request: JsonObject, legacyQuotaFields: r const before = freshPaths(context, surface, legacyQuotaFields, base), after = freshPaths(currentContext, surface, legacyQuotaFields, target); if (!fileBacked && (!before.valid || !after.valid)) return fallback(); const currentChanges = (paths: Path[]) => changeTree(context, currentContext, paths, fileBacked, - {identity, before: ["baseline", "context"], after: ["current", "context"], + {identity, before: ["baseline", "context"], after: ["current", "context"], immutableSource: request, ...(request.source_edits === true ? {values} : {})}); const wireIdentity = contextProjectionIdentity(request, {changes: delivery.changes}, request.source_number_tokens, values); const matches = (changes: ReturnType) => diff --git a/loopx/control_plane/quota/progressive_context.ts b/loopx/control_plane/quota/progressive_context.ts index e8f0e76ad5..6723b2d8ad 100644 --- a/loopx/control_plane/quota/progressive_context.ts +++ b/loopx/control_plane/quota/progressive_context.ts @@ -732,7 +732,7 @@ export function prepareProgressiveContextDelivery(request: JsonObject, legacyFie const required = requiredNativeContext(request, sourceValues, plan); const codec = nativeContextContinuity({...request, context: required.context, ...(request.source_number_tokens === undefined ? {} : {source_number_tokens: required.tokens})}); - const delivery = encodeContextDelivery(codec, legacyFields, sourceValues, fileNavigationPaths(required.context)); + const delivery = encodeContextDelivery(codec, legacyFields, sourceValues, fileNavigationPaths(required.context), request); // The Python edit adapter already reconstructs this exact required view. // Full native delivery can use that copy; delta still carries its own edits. if (request.source_edits === true && delivery.mode === "full") delete delivery.context; diff --git a/tests/control_plane_ts/context_delivery.test.ts b/tests/control_plane_ts/context_delivery.test.ts index 8e560c25c2..fa23fd9807 100644 --- a/tests/control_plane_ts/context_delivery.test.ts +++ b/tests/control_plane_ts/context_delivery.test.ts @@ -3,7 +3,7 @@ import assert from "node:assert/strict"; import test from "node:test"; import type {JsonObject} from "../../loopx/control_plane/effect_program.ts"; import {compactTodoContextSource, prepareContextDelivery, restoreContextDelivery} from "../../loopx/control_plane/quota/context_delivery.ts"; - +import {prepareProgressiveContextDelivery} from "../../loopx/control_plane/quota/progressive_context.ts"; import {evaluateTurnEnvelope} from "../../loopx/control_plane/quota/turn_envelope.ts"; import {updateNativeContextLifecycle} from "../../loopx/control_plane/quota/native_context_lifecycle.ts"; @@ -28,6 +28,40 @@ test("only the provider-qualified native replay can retain a complete resume bas assert.equal(state.context_epoch, "original"); }); +test("warm progressive edits copy only numbers present in the captured input", () => { + const goalBody = "Keep the original requirements, recorded evidence and stop conditions. ".repeat(180); + const original = {goal_id: "goal", goalBody, live_count: 7}; + const initial = {...original, live_count: 6, outcome_requirements_index: {revision: 1, goalBody}}; + const view = {...original, outcome_requirements_index: {revision: 2, goalBody}}; + const source = {scope, capture_id: "next", surface: "quota_packet", context: original, + native_projection: {path: "decision.json", sha256: "c".repeat(64)}}; + const baseline = prepareContextDelivery({...source, capture_id: "previous", context: initial}); + const request = {...source, baseline, source_edits: true, + continuity: {basis: "captured_file", capture_bytes_verified: true, target: baseline.target}}; + const plan = {staged_context: view, deferred: [], instructions: []}; + const {changes} = prepareProgressiveContextDelivery(request, [], [], plan) as { + changes: {path: (string | number)[]; from?: (string | number)[]; value?: unknown; remove?: true}[]; + }; + const at = (root: unknown, path: (string | number)[]) => path.reduce((node, key) => { + assert.ok(node !== null && typeof node === "object" && Object.hasOwn(node, key), `Missing field ${path.join(".")}`); + return (node as Record)[key]; + }, root); + const wire: JsonObject = structuredClone(request); + for (const edit of changes) { + const parent = at(wire, edit.path.slice(0, -1)) as Record; + const key = edit.path.at(-1)!; + if (edit.remove) delete parent[key]; + else parent[key] = structuredClone(edit.from ? at(request, edit.from) : edit.value); + } + const delta = wire.delivery as JsonObject; + assert.equal(delta.mode, "delta"); + assert.ok(changes.some(edit => edit.path[0] === "delivery" && edit.from?.join(".") === "context.live_count")); + const current = prepareContextDelivery({...source, context: wire.context}); + const restored = restoreContextDelivery({delivery: delta, baseline, current}); + assert.equal(restored.mode, "delta"); + assert.deepEqual(restored.context, {...view, context_details: {path: "decision.json", sha256: "c".repeat(64)}}); +}); + test("a tool workdir can report an exact selected read without changing the native workspace", () => { const sourceDigest = "a".repeat(64), viewDigest = "b".repeat(64); const state = {session_id: "native", cwd: "/host", context_epoch: "original",