* fix(#1776): scope prune phase resolution to ## Current Position cmdStatePrune resolved the current phase by extracting the `Phase` field over the WHOLE STATE.md body. stateExtractField's fallback chain ends in a pipe-table match (`| Phase | N |`), so a STATE.md lacking a `Current Phase` field and a prose `Phase:` line — but carrying an unrelated `Phase`-labelled table row (e.g. a historical verification table) — resolved that stale table cell as the current phase and computed a wrong cutoff (bailing "Only N phases" or pruning at a stale boundary). Resolve the phase via the same canonical chain buildStateFrontmatter uses — frontmatter `current_phase` → `Current Phase` field → prose `Phase: X of Y` — but scope ONLY the prose term to the `## Current Position` section via the fence-aware locateCurrentPosition seam (new exported sliceCurrentPositionSection). Frontmatter and the explicit `Current Phase` field stay document-wide (they are unambiguous); the shared stateExtractField is not narrowed for any other caller. Tests (folded into tests/state-prune.test.cjs): a stray `| Phase | 2 |` table with the real phase in frontmatter no longer drives the cutoff (fail-first on base); template-conformant STATE.md is unchanged; and a fast-check boundary-containment property that a `| Phase | N |` row outside Current Position never leaks into the scoped resolution. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * chore(#1776): add changeset for prune Current Position scoping Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Co-authored-by: Tom Boucher <trekkie@nomorestars.com>
This commit is contained in:
committed by
GitHub
parent
dae7f81482
commit
50ff7a8707
@@ -528,6 +528,21 @@ function locateCurrentPosition(body: string): { start: number; end: number } | n
|
||||
return { start, end };
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the body text of the `## Current Position` section, or `null` when it
|
||||
* is absent. Reuses the fence-aware `locateCurrentPosition` locator (ADR-1372).
|
||||
*
|
||||
* Exposed so callers that must read a position field (e.g. `cmdStatePrune`,
|
||||
* #1776) can scope extraction to the canonical section instead of the whole
|
||||
* document — where `stateExtractField`'s pipe-table fallback could otherwise
|
||||
* latch onto an unrelated `| Phase | N |` row elsewhere in STATE.md. This
|
||||
* scopes the *caller*; the shared extractor is left broad for every other use.
|
||||
*/
|
||||
export function sliceCurrentPositionSection(body: string): string | null {
|
||||
const span = locateCurrentPosition(body);
|
||||
return span === null ? null : body.slice(span.start, span.end);
|
||||
}
|
||||
|
||||
/**
|
||||
* First-time ## Current Position mutation: update Phase / Plan / Status /
|
||||
* Last activity lines. Mirrors state.cts:2261-2324 byte-for-behaviour
|
||||
|
||||
@@ -32,7 +32,7 @@ const { extractFrontmatter, reconstructFrontmatter } = frontmatter;
|
||||
import scanPhasePlans = require('./plan-scan.cjs');
|
||||
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
||||
import stateTransitionMod = require('./state-transition.cjs');
|
||||
const { transitionCore, applyStatePreservation } = stateTransitionMod;
|
||||
const { transitionCore, applyStatePreservation, sliceCurrentPositionSection } = stateTransitionMod;
|
||||
type StateTransitionIntent = stateTransitionMod.StateTransitionIntent;
|
||||
type StateTransitionDeps = stateTransitionMod.StateTransitionDeps;
|
||||
type PhaseInventoryRecord = stateTransitionMod.PhaseInventoryRecord;
|
||||
@@ -2501,12 +2501,31 @@ function cmdStatePrune(cwd: string, options: StatePruneOptions, raw: boolean): v
|
||||
|
||||
const keepRecent = parseInt(String(options.keepRecent), 10) || 3;
|
||||
const dryRun = !!options.dryRun;
|
||||
// #1760: the canonical STATE.md template emits `Phase: [X] of [Y]`, not
|
||||
// `Current Phase:`. Read both (mirroring buildStateFrontmatter /
|
||||
// resolvePhaseIdForCompletePhase) so prune engages on template-conformant
|
||||
// STATE.md instead of bailing with "Only 0 phases — nothing to prune".
|
||||
// Resolve the current phase via the same canonical chain buildStateFrontmatter
|
||||
// uses (frontmatter `current_phase` → `Current Phase` field → prose `Phase: X
|
||||
// of Y`), so prune engages on template-conformant STATE.md instead of bailing
|
||||
// "Only 0 phases" (#1760).
|
||||
// #1776: scope ONLY the prose `Phase:` term to the canonical `## Current
|
||||
// Position` section. Over the whole body, `stateExtractField`'s pipe-table
|
||||
// fallback matches any `| Phase | N |` row (e.g. a historical verification
|
||||
// table), resolving a stale phase and computing a wrong cutoff. Frontmatter and
|
||||
// the explicit `Current Phase` field are unambiguous, so they stay document-wide;
|
||||
// the shared extractor is not narrowed for any other caller.
|
||||
const rawState = fs.readFileSync(statePath, 'utf-8');
|
||||
const currentPhaseRaw = stateExtractField(rawState, 'Current Phase') || stateExtractField(rawState, 'Phase');
|
||||
const fm = extractFrontmatter(rawState) as Record<string, unknown>;
|
||||
const body = stripFrontmatter(rawState);
|
||||
// Mirror buildStateFrontmatter's fmScalar: only string/number/boolean
|
||||
// frontmatter scalars are usable (an object/array `current_phase` is ignored,
|
||||
// which also avoids a base-to-string on a non-primitive).
|
||||
const fmRawPhase = fm.current_phase;
|
||||
const fmCurrentPhase =
|
||||
typeof fmRawPhase === 'string' ? (fmRawPhase.trim() || null)
|
||||
: typeof fmRawPhase === 'number' || typeof fmRawPhase === 'boolean' ? String(fmRawPhase)
|
||||
: null;
|
||||
const positionSection = sliceCurrentPositionSection(body);
|
||||
const prosePhase =
|
||||
positionSection !== null ? parseProsePhaseField(stateExtractField(positionSection, 'Phase')).phase : null;
|
||||
const currentPhaseRaw = fmCurrentPhase ?? stateExtractField(body, 'Current Phase') ?? prosePhase;
|
||||
const currentPhase = parseInt(String(currentPhaseRaw), 10) || 0;
|
||||
const cutoff = currentPhase - keepRecent;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user