Ben Stull
2f6008ba2b
Document-edit flow SLICE-2 (specs/coauthoring-document-edit-flow.md §7.2,
INV-39/40/41 — P1 "too much to review"). A whole-document rewrite now proposes
ONE F4 proposal per CHANGED BLOCK (the unit a human reviews), but accepting a
block reconciles attribution at WORD granularity (the unit F3 records). Block =
decision unit; word = attribution unit. Supersedes INV-37's per-word cut for
document edits; selection edits unchanged.
- trackChangesModel.ts: new pure diffToBlockHunks(current, rewritten) — block-key
alignment (reusing diffArrays/diffBlocks keying): an isolated changed block →
one block-aligned hunk → the rewritten block raw (a code/mermaid fence is one
atomic whole-fence hunk, INV-23); insert/delete runs → one gap-span hunk over
the inter-anchor region (separators included) so reconstruction stays exact; a
zero-width gap-span is anchored (INV-41). Also split diffToHunks into the raw,
un-anchored wordEditHunks + the anchoring wrapper (the anchoring could grow an
insertion to overlap an adjacent hunk, corrupting a batch apply — a latent bug
that only surfaced once hunks are applied as a batch).
- trackChangesPreview.ts: runEditAndPropose document branch uses diffToBlockHunks
and tags each proposal granularity:"block".
- model.ts / proposalModel.ts: additive optional Proposal.granularity
("block"|"single"; absent ⇒ single, back-compat — no migration).
- proposalController.ts: accept of a block proposal runs an intra-block word
sub-diff (wordEditHunks, disjoint) and applies one applyAgentEdit per changed
run, descending offset — only the words Claude changed land Claude-attributed;
unchanged spans keep prior authorship (INV-40).
- Tests: diffToBlockHunks unit (reconstruction + fence atomic + add/remove);
f12Review host E2E (M blocks→M proposals, unchanged→none, fence atomic, INV-40
attribution, INV-41 insertion accept); updated the f11 document-path E2E to
per-block (INV-39 supersedes INV-37); MANUAL-SMOKE-F12 §2.
Seam note: pendingEdits.matchEvent resolves one registration per change event, so
INV-40's per-run attribution is sequential applyAgentEdit calls (N undo steps),
not one multi-replace WorkspaceEdit — see transcript Deferred decisions.
214 unit + 69/5 host E2E green.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
49 lines
2.1 KiB
TypeScript
49 lines
2.1 KiB
TypeScript
/**
|
|
* proposalModel — pure helpers over the F4 `proposals[]` section (spec §6.3,
|
|
* INV-13: pending-only). Mirrors threadModel.ts: vscode-free mutations against
|
|
* an Artifact, used inside CoauthorStore.update() by ProposalController.
|
|
* The diff body is PRESENTATION ONLY — the truth is fingerprint.text →
|
|
* replacement (INV-11); a whole-range -/+ rendering, not an LCS diff (§6.7).
|
|
*/
|
|
import { newId, type Artifact, type Fingerprint, type Proposal, type Provenance } from "./model";
|
|
|
|
export function addProposal(
|
|
artifact: Artifact,
|
|
fp: Fingerprint,
|
|
replacement: string,
|
|
author: Provenance,
|
|
opts?: { turnId?: string; instruction?: string; granularity?: "block" | "single" },
|
|
): { proposalId: string; anchorId: string } {
|
|
const anchorId = newId("a");
|
|
const proposalId = newId("pr");
|
|
artifact.anchors[anchorId] = { fingerprint: fp };
|
|
artifact.proposals.push({
|
|
id: proposalId,
|
|
anchorId,
|
|
replacement,
|
|
author,
|
|
createdAt: new Date().toISOString(),
|
|
...(opts?.turnId !== undefined ? { turnId: opts.turnId } : {}),
|
|
...(opts?.instruction !== undefined ? { instruction: opts.instruction } : {}),
|
|
...(opts?.granularity !== undefined ? { granularity: opts.granularity } : {}),
|
|
});
|
|
return { proposalId, anchorId };
|
|
}
|
|
|
|
/** Remove a pending proposal (accept and reject both end here — INV-13). */
|
|
export function removeProposal(artifact: Artifact, proposalId: string): boolean {
|
|
const before = artifact.proposals.length;
|
|
artifact.proposals = artifact.proposals.filter((p) => p.id !== proposalId);
|
|
return artifact.proposals.length < before;
|
|
}
|
|
|
|
/** Markdown comment body: instruction header + fenced whole-range diff. */
|
|
export function proposalBody(targetText: string, p: Proposal): string {
|
|
const header = p.instruction ? `**Claude proposes** — _${p.instruction}_` : "**Claude proposes**";
|
|
const diffLines = [
|
|
...targetText.split("\n").map((l) => `- ${l}`),
|
|
...p.replacement.split("\n").map((l) => `+ ${l}`),
|
|
].join("\n");
|
|
return `${header}\n\n\`\`\`diff\n${diffLines}\n\`\`\`\n\n✓ Accept applies this replacement · ✗ Reject discards it`;
|
|
}
|