Closes M4. The review's three findings are fixed, the durability rule the specification always implied is now enforced, and M3's and M4's browser behaviour has been verified in a real browser for the first time. B-1 -- the Save Point list was an N+1 that loaded whole Action rows, narration included, to answer "does a row exist here". It is now one bulk two-column coordinate query plus one lineage: 53 SELECTs for 25 Save Points became 5, and the count no longer grows with the list. The clause is an OR of exact (branch, depth) pairs rather than two IN lists, because the cross product would report a Save Point resolved on the strength of another one's depth existing on this one's branch. A test builds exactly that trap. B-2 -- reclassified during closeout from "missing warning" to a behaviour defect, and fixed as one. STORY-BRANCH-SEMANTICS §19 says a named checkpoint remains until explicitly deleted, and §28 already required future cleanup to retain checkpoint-referenced paths; a cascade that silently removed Save Points with a branch violated both, and a warning would only have documented the violation. A branch a Save Point names can no longer be deleted. The request is refused with the offending Save Points named, the user deletes them explicitly -- which deletes no story -- and the branch then goes. The scope is the subtree, because deleting a branch takes its descendants. Both delete controls disable and explain. Recorded as a new §19.1; models.py, TECHNICAL-DESIGN §8.8 and DATA-MODEL §8 had all recorded the cascade as the rule and now record the refusal. An earlier pass in this same closeout had kept the cascade and added a warning. That was the wrong fix and its tests were replaced rather than left standing, since they pinned the defect. B-3 -- the D11/L03 automation never left one process, so it could not distinguish durable state from a live Python object. It now spawns real server processes, kills the first, and reads the campaign back with the second. C-5 -- creating a Save Point takes the campaign's turn lock. "Save where I am" has to name one committed position, and the head is what a turn in flight is about to move. Rename and Delete deliberately do not take it. The architecture is untouched: a Save Point is still name + note + (branch, depth), and restore is still coordinate -> head.move_to_node -> head.move_to -> attempts.restore_state. No second restore path, no state copied into a checkpoint, no fork on restore. Browser verification -- the first in this project, and it covers both milestones. Firefox 154.0.1 through geckodriver over the W3C WebDriver protocol, driving the rendered DOM: 47/47 checks, twice, on independent databases, no console errors. M3's Undo/Redo enable states, transcript movement, Retry and the take pager, divergence retiring Redo; M4's whole Save Point lifecycle, both confirmations, and the new branch-delete refusal including its recovery. No dependency was added: the WebDriver client is stdlib HTTP. No application defect was found by the browser. Four failures occurred, all in the harness -- a wrong SPA route, a wait comparing transcript length when the empty-story placeholder is longer than the first turn, a fixture deleting the branch it was reading, and a reload assertion that sampled once instead of waiting. The last was checked against the app before being called a harness bug. Tests: 698 backend pass (was 680), 60 M4, 94 M3 history, 66 export/ migrations, 93 security/local-only. Frontend lint and build clean, Docker build clean, loopback binding unchanged. No assertion weakened, no skip added. Planning: STORY-BRANCH-SEMANTICS §19.1 is the only behavioural change and it strengthens §19. V1-ACCEPTANCE-TESTS records D11-D14, I04, L03 and the E-series, keeping automated, live-runtime and browser evidence distinct, and weakens no pass condition. DATA-MODEL records the coordinate with the retry measurement that settles it. BROWSER-UX-SPEC rules for Moment over Turn. BUILD-MILESTONES marks M4 COMPLETE, closes M3's browser condition, and lists what M5 inherits. VERSION adds v2.6. No new ADR: ADR 005 already decides that history is preserved rather than overwritten, and §19.1 is that decision applied to checkpoint-referenced history. M4 is closed. M5 may now be briefed; it has not been started. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PWU4gTfLYY6Qq9U7aa9Qw2
196 lines
8.7 KiB
React
196 lines
8.7 KiB
React
// The branch panel: every line the story has taken, and the map of them.
|
||
//
|
||
// One request draws the whole panel. `fork_depth` says where a branch leaves
|
||
// its parent and `depth` says where it currently ends, so the shape is two
|
||
// numbers a row rather than a walk.
|
||
//
|
||
// Delete belongs here rather than in a later subphase because nothing prunes
|
||
// the tree on its own. This panel is the first place you can make a fork, so
|
||
// it has to be the first place you can unmake one.
|
||
|
||
import { useEffect, useState } from 'react'
|
||
import { api } from '../../../api'
|
||
import { BranchMap } from '../../../BranchMap'
|
||
import { branchLabel, headLineage, orderBranches, savePointsUnder } from '../../../branches'
|
||
|
||
function BranchPanel({ advId, refreshKey, onSwitched, onTreeChanged, onError }) {
|
||
const [branches, setBranches] = useState(null)
|
||
const [failed, setFailed] = useState(null)
|
||
const [busyId, setBusyId] = useState(null)
|
||
const [renaming, setRenaming] = useState(null) // { id, text }
|
||
const [confirming, setConfirming] = useState(null)
|
||
const [mapOpen, setMapOpen] = useState(false)
|
||
const [tick, setTick] = useState(0)
|
||
|
||
useEffect(() => {
|
||
let cancelled = false
|
||
setFailed(null)
|
||
api.listBranches(advId)
|
||
.then((list) => { if (!cancelled) setBranches(list) })
|
||
.catch((err) => { if (!cancelled) setFailed(err.message) })
|
||
return () => { cancelled = true }
|
||
}, [advId, refreshKey, tick])
|
||
|
||
// Answers whether it worked. Both callers keep an editor open on a refusal —
|
||
// a rename the server turned down must not take the typed name with it.
|
||
async function run(branchId, work) {
|
||
setBusyId(branchId)
|
||
try {
|
||
await work()
|
||
setTick((t) => t + 1)
|
||
// Deleting a branch takes its memories with it, and nothing else on the
|
||
// screen would hear about that — no turn is played, and the story on the
|
||
// current path does not change by a single action.
|
||
onTreeChanged()
|
||
return true
|
||
} catch (err) {
|
||
onError(err.message)
|
||
return false
|
||
} finally {
|
||
setBusyId(null)
|
||
}
|
||
}
|
||
|
||
// One copy of each operation. The list below and the map overlay both go
|
||
// through these, so a rule cannot hold in one view and not the other, and a
|
||
// failure is reported one way wherever it was asked for.
|
||
const switchTo = (b) => run(b.id, async () => onSwitched(await api.switchBranch(advId, b.id)))
|
||
const renameTo = (b, name) => run(b.id, () => api.renameBranch(advId, b.id, name))
|
||
const removeBranch = (b) => run(b.id, () => api.deleteBranch(advId, b.id))
|
||
|
||
const saveName = async (b) => { if (await renameTo(b, renaming.text)) setRenaming(null) }
|
||
const remove = async (b) => { if (await removeBranch(b)) setConfirming(null) }
|
||
|
||
if (failed) return <div className="panel-empty">Couldn’t read the branches — {failed}</div>
|
||
if (!branches) return <div className="panel-empty">Reading the tree…</div>
|
||
|
||
const lineage = headLineage(branches)
|
||
|
||
return (
|
||
<div className="branch-panel">
|
||
{/* The list says which lines exist; the map says where they parted and
|
||
how much story each one is, which is the part a list cannot draw. */}
|
||
<button type="button" className="branch-map-open" onClick={() => setMapOpen(true)}>
|
||
⌗ See the tree
|
||
</button>
|
||
{branches.length === 1 && (
|
||
<p className="branch-intro">
|
||
One thread so far. Retry a turn, then take an attempt the story moved
|
||
past — that is what makes a second one.
|
||
</p>
|
||
)}
|
||
<div className="branch-list">
|
||
{orderBranches(branches).map(({ branch, indent }) => {
|
||
const isRenaming = renaming?.id === branch.id
|
||
const isConfirming = confirming === branch.id
|
||
const busy = busyId === branch.id
|
||
// The server refuses to delete the line being read or any line it
|
||
// was forked from. The button said nothing about that and answered
|
||
// with a toast; it now says so before it is pressed.
|
||
const loadBearing = lineage.has(branch.id)
|
||
// A Save Point naming a moment on this branch, or on anything forked
|
||
// from it, keeps the branch alive: named moments last until the user
|
||
// deletes them, so the server refuses the deletion rather than taking
|
||
// them with it. Counted over the subtree, because deleting a branch
|
||
// takes its descendants.
|
||
const protecting = savePointsUnder(branches, branch.id)
|
||
return (
|
||
<div key={branch.id} className={`branch-row ${branch.is_head ? 'here' : ''}`}
|
||
style={{ marginLeft: indent * 12 }}>
|
||
<div className="branch-head">
|
||
<span className="branch-glyph" aria-hidden="true">
|
||
{branch.parent_branch_id === null ? '●' : '└'}
|
||
</span>
|
||
{isRenaming ? (
|
||
<input
|
||
className="branch-rename"
|
||
autoFocus
|
||
maxLength={80}
|
||
value={renaming.text}
|
||
onChange={(e) => setRenaming({ ...renaming, text: e.target.value })}
|
||
onKeyDown={(e) => {
|
||
if (e.key === 'Enter') saveName(branch)
|
||
if (e.key === 'Escape') setRenaming(null)
|
||
}}
|
||
/>
|
||
) : (
|
||
<span className="branch-name">{branchLabel(branch)}</span>
|
||
)}
|
||
{branch.is_head && <span className="branch-here">reading</span>}
|
||
</div>
|
||
|
||
<div className="branch-meta">
|
||
{branch.own_actions} of its own
|
||
{branch.parent_branch_id !== null && ` · forked at moment ${branch.fork_depth + 1}`}
|
||
{` · ends at ${branch.depth + 1}`}
|
||
{protecting > 0 &&
|
||
` · ${protecting === 1 ? '1 Save Point' : `${protecting} Save Points`} kept here`}
|
||
</div>
|
||
|
||
{isConfirming ? (
|
||
<div className="branch-confirm">
|
||
{/* Only reachable when no Save Point points into this
|
||
subtree — the button is disabled otherwise, and the server
|
||
refuses regardless. So this says what the deletion costs
|
||
without hedging about Save Points that cannot be at risk. */}
|
||
<span>
|
||
Delete this branch and everything forked from it? The story
|
||
on other paths, and every Save Point, is unaffected.
|
||
</span>
|
||
<button type="button" className="danger" disabled={busy}
|
||
onClick={() => remove(branch)}>Delete</button>
|
||
<button type="button" onClick={() => setConfirming(null)}>Keep</button>
|
||
</div>
|
||
) : (
|
||
<div className="branch-tools">
|
||
{!branch.is_head && (
|
||
<button type="button" disabled={busy} onClick={() => switchTo(branch)}>Switch</button>
|
||
)}
|
||
{isRenaming ? (
|
||
<>
|
||
<button type="button" disabled={busy} onClick={() => saveName(branch)}>Save</button>
|
||
<button type="button" onClick={() => setRenaming(null)}>Cancel</button>
|
||
</>
|
||
) : (
|
||
<button type="button" disabled={busy}
|
||
onClick={() => setRenaming({ id: branch.id, text: branch.name || '' })}>
|
||
Rename
|
||
</button>
|
||
)}
|
||
{/* The root holds the turns every other branch borrows, and
|
||
the server refuses it — so it is not offered. */}
|
||
{branch.parent_branch_id !== null && (
|
||
<button type="button" className="danger"
|
||
disabled={busy || loadBearing || protecting > 0}
|
||
title={
|
||
loadBearing
|
||
? 'The line you are reading is built on this one. Switch away first.'
|
||
: protecting > 0
|
||
? `${protecting === 1 ? 'A Save Point is' : `${protecting} Save Points are`} saved on this line or one forked from it. Delete ${protecting === 1 ? 'it' : 'them'} first — deleting a Save Point deletes no story.`
|
||
: undefined
|
||
}
|
||
onClick={() => setConfirming(branch.id)}>Delete</button>
|
||
)}
|
||
</div>
|
||
)}
|
||
</div>
|
||
)
|
||
})}
|
||
</div>
|
||
|
||
{mapOpen && (
|
||
<BranchMap
|
||
branches={branches}
|
||
busyId={busyId}
|
||
onSwitch={switchTo}
|
||
onRename={renameTo}
|
||
onDelete={removeBranch}
|
||
onClose={() => setMapOpen(false)}
|
||
/>
|
||
)}
|
||
</div>
|
||
)
|
||
}
|
||
|
||
export { BranchPanel }
|