fix(continue): run the arg-parser, find the master prompt at the repo root, and let the consistency check read the state file
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
403afe606f
commit
f32baf50ad
6 changed files with 204 additions and 20 deletions
|
|
@ -29,9 +29,15 @@ See **Handover 7** in `docs/HANDOVER-CONTRACTS.md` for the full schema.
|
|||
|
||||
## Phase 0 — `--help` handling
|
||||
|
||||
Parse `$ARGUMENTS` with `parseArgs($ARGUMENTS, 'trekcontinue')` from
|
||||
`lib/parsers/arg-parser.mjs`. Dispatch the usage block ONLY when one of these
|
||||
two conditions equals exactly true (no substring search, no "contains" check):
|
||||
Parse `$ARGUMENTS` with the shared arg-parser. Run first, exactly like this:
|
||||
|
||||
```bash
|
||||
node ${CLAUDE_PLUGIN_ROOT}/lib/parsers/arg-parser.mjs --command trekcontinue -- $ARGUMENTS
|
||||
```
|
||||
|
||||
Read `flags` and `positional` from the JSON it prints. Dispatch the usage
|
||||
block ONLY when one of these two conditions equals exactly true (no substring
|
||||
search, no "contains" check):
|
||||
|
||||
- `flags['--help'] === true`, OR
|
||||
- `positional[0] === '-h'` (single-dash short form — the parser keeps it as
|
||||
|
|
@ -75,7 +81,7 @@ Typical flow:
|
|||
|
||||
## Phase 0.5 — Cleanup mode dispatch
|
||||
|
||||
After `parseArgs` has resolved `$ARGUMENTS`, check the parsed `flags`
|
||||
After the parser has printed its parse of `$ARGUMENTS`, check the parsed `flags`
|
||||
object directly (NOT a string contains-check on raw `$ARGUMENTS` — that
|
||||
substring pattern was the root cause of Bug 1).
|
||||
|
||||
|
|
@ -174,23 +180,28 @@ locations; this phase refuses ambiguity before validating the state file.
|
|||
After resolving the project directory and state-file path, look for two
|
||||
`NEXT-SESSION-PROMPT.local.md` candidates:
|
||||
|
||||
a. `<plugin-root>/NEXT-SESSION-PROMPT.local.md` — operator-managed master file
|
||||
a. `NEXT-SESSION-PROMPT.local.md` at the repo root (`git rev-parse --show-toplevel`) —
|
||||
operator-managed master file, written by the operator or an external producer, never by Voyage
|
||||
b. `<project-dir>/NEXT-SESSION-PROMPT.local.md` — producer-written sibling
|
||||
|
||||
**If both exist:**
|
||||
|
||||
- Read both via the **Read tool** (NOT Bash — same anti-substitution rule
|
||||
as Phase 2).
|
||||
- Invoke the consistency validator with both paths emitted as concrete
|
||||
literal tokens (no template substitution at the Bash boundary):
|
||||
- Invoke the consistency validator with the paths emitted as concrete
|
||||
literal tokens (no template substitution at the Bash boundary). When the
|
||||
project's `.session-state.local.json` exists, pass it with `--state-file`
|
||||
(else run the same line without the option):
|
||||
|
||||
```
|
||||
node ${CLAUDE_PLUGIN_ROOT}/lib/validators/next-session-prompt-validator.mjs --json --consistency <RESOLVED-PATH-A> <RESOLVED-PATH-B>
|
||||
node ${CLAUDE_PLUGIN_ROOT}/lib/validators/next-session-prompt-validator.mjs --json --consistency <RESOLVED-PATH-A> <RESOLVED-PATH-B> --state-file <RESOLVED-PATH-STATE>
|
||||
```
|
||||
|
||||
Replace `<RESOLVED-PATH-A>` and `<RESOLVED-PATH-B>` with the two concrete
|
||||
filesystem paths you have in your working context. The validator emits
|
||||
`{valid, errors, warnings}` JSON on stdout.
|
||||
filesystem paths you have in your working context, and
|
||||
`<RESOLVED-PATH-STATE>` with the concrete path of the project's
|
||||
`.session-state.local.json`. The validator emits `{valid, errors, warnings}`
|
||||
JSON on stdout.
|
||||
|
||||
- **If `valid: false`** (typically `NEXT_SESSION_PROMPT_PRODUCER_MISMATCH`):
|
||||
print the structured `errors[]` (each `[code] message` on its own line),
|
||||
|
|
|
|||
|
|
@ -1309,7 +1309,7 @@ but do not block.
|
|||
**Also write sibling `NEXT-SESSION-PROMPT.local.md`** with frontmatter
|
||||
(`produced_by: trekexecute`, `produced_at: <ISO-8601>`,
|
||||
`status: stopped`) — same combined ESM pattern as Phase 8 — so Phase 1.5
|
||||
of `/trekcontinue` can compare project-dir and plugin-root candidates.
|
||||
of `/trekcontinue` can compare project-dir and repo-root candidates.
|
||||
|
||||
If the entry condition **passes**:
|
||||
```
|
||||
|
|
@ -2773,7 +2773,7 @@ to stderr but do NOT block — Phase 8 must always reach the final report.
|
|||
contract — see `docs/HANDOVER-CONTRACTS.md` § Handover 7 Lifecycle) in the
|
||||
project directory. The frontmatter MUST contain `produced_by: trekexecute`
|
||||
and `produced_at: <ISO-8601>` so `/trekcontinue` Phase 1.5 can detect
|
||||
producer drift between project-dir and plugin-root candidates. Use a single
|
||||
producer drift between project-dir and repo-root candidates. Use a single
|
||||
ESM inline block so state-file + prompt-file writes succeed or fail together:
|
||||
|
||||
```bash
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue