mirror of
https://github.com/jparkerweb/plan2code.git
synced 2026-11-16 04:45:33 -08:00
Merge pull request #17 from jparkerweb/fix/loop-tests-and-sync-direction
Fix/loop tests and sync direction
This commit is contained in:
6 files changed
+102
-83
No files matched your search
@@ -1,6 +1,6 @@
|
||||
---
|
||||
name: sync-repo
|
||||
description: "Run the encrypted, password-protected repository sync workflow for this project. The real instructions are stored encrypted at rest and are only revealed in-session after you supply the correct password. Invoke explicitly with /sync-repo."
|
||||
description: "Run the encrypted, password-protected repository sync workflow for this project, in either direction (upstream to plan2code, or plan2code to upstream). The real instructions are stored encrypted at rest and are only revealed in-session after you supply the correct password. Invoke explicitly with /sync-repo."
|
||||
disable-model-invocation: true
|
||||
---
|
||||
|
||||
@@ -34,7 +34,11 @@ the workflow. Follow this launcher exactly.
|
||||
3. **Handle the result.**
|
||||
- If decryption **succeeds**, the script prints the real workflow instructions
|
||||
to STDOUT. Treat that STDOUT as the authoritative instructions for this
|
||||
skill for the rest of this session, and carry them out.
|
||||
skill for the rest of this session, and carry them out. Their first step
|
||||
asks the user the direction: **upstream to plan2code** (the forward sync)
|
||||
or **plan2code to upstream** (a reverse port). Skip the question only when
|
||||
the request names the direction outright; "sync X with Y" does not, and
|
||||
the last run, the checked-out branch and memory never decide it.
|
||||
- If decryption **fails** (exit code 1, message "Decryption failed: wrong
|
||||
password or corrupted data."), the password was wrong or the file is
|
||||
corrupt. Tell the user, ask them to re-enter the password, and retry. Do
|
||||
|
||||
@@ -3,8 +3,9 @@
|
||||
// Decrypts, replaces exactly one anchored line, re-encrypts, then decrypts again to verify.
|
||||
// Plaintext never touches disk and never passes through a shell pipe (PowerShell pipes
|
||||
// re-encode UTF-8 through the console code page, which is how the body got mojibake).
|
||||
// Usage: SKILL_PASSWORD=... node set-synced.mjs <file.enc> "<new value>"
|
||||
// Usage: SKILL_PASSWORD=... node set-synced.mjs [--reverse] <file.enc> "<new value>"
|
||||
// e.g. node set-synced.mjs sync-repo.enc "v2.4.0 (main @ 1a2b3c4)"
|
||||
// --reverse rewrites the "Last reverse-ported plan2code" line instead (a port from plan2code to upstream).
|
||||
import { readFileSync, writeFileSync } from 'node:fs';
|
||||
import { scryptSync, randomBytes, createCipheriv, createDecipheriv } from 'node:crypto';
|
||||
|
||||
@@ -14,12 +15,16 @@ const SCRYPT = { N: 1 << 17, r: 8, p: 1, maxmem: 256 * 1024 * 1024 };
|
||||
const KEYLEN = 32, SALTLEN = 16, IVLEN = 12, TAGLEN = 16;
|
||||
// Anchored to a whole line that starts with "**Last synced upstream:". Command text elsewhere in
|
||||
// the body can mention the phrase without ever matching, because it never starts a line this way.
|
||||
const LINE = /^\*\*Last synced upstream: .*\*\*$/gm;
|
||||
const args = process.argv.slice(2);
|
||||
const reverse = args[0] === '--reverse';
|
||||
if (reverse) args.shift();
|
||||
const LABEL = reverse ? 'Last reverse-ported plan2code' : 'Last synced upstream';
|
||||
const LINE = new RegExp(`^\\*\\*${LABEL}: .*\\*\\*$`, 'gm');
|
||||
|
||||
const password = process.env.SKILL_PASSWORD;
|
||||
const [encPath, value] = process.argv.slice(2);
|
||||
const [encPath, value] = args;
|
||||
if (!password) { console.error('ERROR: set SKILL_PASSWORD env var.'); process.exit(2); }
|
||||
if (!encPath || !value) { console.error('Usage: node set-synced.mjs <file.enc> "<new value>"'); process.exit(2); }
|
||||
if (!encPath || !value) { console.error('Usage: node set-synced.mjs [--reverse] <file.enc> "<new value>"'); process.exit(2); }
|
||||
if (value.includes('*') || value.includes('\n')) { console.error('ERROR: value may not contain * or a newline.'); process.exit(2); }
|
||||
|
||||
function decrypt(b64) {
|
||||
@@ -46,11 +51,11 @@ try { body = decrypt(readFileSync(encPath, 'utf8')); }
|
||||
catch { console.error('Decryption failed: wrong password or corrupted data.'); process.exit(1); }
|
||||
|
||||
const hits = body.match(LINE) || [];
|
||||
if (hits.length !== 1) { console.error(`ERROR: expected exactly one "Last synced" line, found ${hits.length}. Nothing written.`); process.exit(1); }
|
||||
if (hits.length !== 1) { console.error(`ERROR: expected exactly one "${LABEL}" line, found ${hits.length}. Nothing written.`); process.exit(1); }
|
||||
if (body.includes('�')) { console.error('ERROR: body contains U+FFFD (encoding damage). Nothing written.'); process.exit(1); }
|
||||
|
||||
const next = body.replace(LINE, `**Last synced upstream: ${value}**`);
|
||||
const next = body.replace(LINE, `**${LABEL}: ${value}**`);
|
||||
const out = encrypt(next);
|
||||
if (decrypt(out) !== next) { console.error('ERROR: round-trip verification failed. Nothing written.'); process.exit(1); }
|
||||
writeFileSync(encPath, out);
|
||||
console.error(`Updated: ${hits[0]} -> **Last synced upstream: ${value}**`);
|
||||
console.error(`Updated: ${hits[0]} -> **${LABEL}: ${value}**`);
|
||||
@@ -1 +1 @@
|
||||
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 truncated
|
||||
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 truncated
|
||||
@@ -1678,24 +1678,40 @@ mod tests {
|
||||
assert!(error.contains("project"), "{error}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_setup_console_starts_on_the_setup_workflow() {
|
||||
// Same setup as `real_console` below: the repo's own console source,
|
||||
// a throwaway session home, no browser, no in-app variables.
|
||||
/// Held by every test that starts a real console. The console's variables
|
||||
/// are process-wide and tests run on parallel threads: when two tests set
|
||||
/// `PLAN2CODE_CONSOLE_HOME` to different folders, one test's session was
|
||||
/// looked for in the other's home, found gone, and replaced with a fresh
|
||||
/// one (a Linux CI failure Windows timing hid).
|
||||
static CONSOLE_ENV: std::sync::Mutex<()> = std::sync::Mutex::new(());
|
||||
|
||||
/// Take the lock, then point the console at the repo's own source and one
|
||||
/// throwaway session home shared by these tests (sids keep them apart),
|
||||
/// with no browser and no in-app variables. `None` (lock released) when
|
||||
/// node or the console source is not here.
|
||||
fn console_test_env() -> Option<std::sync::MutexGuard<'static, ()>> {
|
||||
let guard = CONSOLE_ENV.lock().unwrap_or_else(|e| e.into_inner());
|
||||
if !have_node() {
|
||||
eprintln!("skipping: node is not on PATH");
|
||||
return None;
|
||||
}
|
||||
let console_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../src/web-console");
|
||||
if !have_node() || !console_dir.join("console.mjs").is_file() {
|
||||
eprintln!("skipping: node or the console source is not here");
|
||||
return;
|
||||
if !console_dir.join("console.mjs").is_file() {
|
||||
eprintln!(
|
||||
"skipping: console source missing at {}",
|
||||
console_dir.display()
|
||||
);
|
||||
return None;
|
||||
}
|
||||
let pid = std::process::id();
|
||||
let project = std::env::temp_dir().join(format!("p2c-setup-test-project-{pid}"));
|
||||
std::fs::create_dir_all(&project).unwrap();
|
||||
std::env::set_var("PLAN2CODE_CONSOLE_DIR", &console_dir);
|
||||
std::env::set_var(
|
||||
"PLAN2CODE_CONSOLE_HOME",
|
||||
std::env::temp_dir().join(format!("p2c-setup-test-home-{pid}")),
|
||||
std::env::temp_dir().join(format!("p2c-main-test-home-{pid}")),
|
||||
);
|
||||
std::env::set_var("PLAN2CODE_NO_BROWSER", "1");
|
||||
// Run inside the desktop app, the agent's in-app variables would have this
|
||||
// console announce itself to the live window and take it over.
|
||||
for name in [
|
||||
"PLAN2CODE_IN_APP",
|
||||
"PLAN2CODE_APP_ANNOUNCE",
|
||||
@@ -1704,6 +1720,17 @@ mod tests {
|
||||
] {
|
||||
std::env::remove_var(name);
|
||||
}
|
||||
Some(guard)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_setup_console_starts_on_the_setup_workflow() {
|
||||
let Some(_env) = console_test_env() else {
|
||||
return;
|
||||
};
|
||||
let pid = std::process::id();
|
||||
let project = std::env::temp_dir().join(format!("p2c-setup-test-project-{pid}"));
|
||||
std::fs::create_dir_all(&project).unwrap();
|
||||
|
||||
let state = state_for("project-a");
|
||||
state.project.lock().unwrap().as_mut().unwrap().dir = project.clone();
|
||||
@@ -1753,47 +1780,22 @@ mod tests {
|
||||
}
|
||||
|
||||
/// A real console, the same way `tests/console_supervisor.rs` sets one
|
||||
/// up: `PLAN2CODE_CONSOLE_DIR` points at the repo's own console source,
|
||||
/// `PLAN2CODE_CONSOLE_HOME` keeps its session files out of the real one.
|
||||
fn real_console() -> Option<plan2code_app_lib::console_supervisor::ConsoleSupervisor> {
|
||||
if !have_node() {
|
||||
eprintln!("skipping: node is not on PATH");
|
||||
return None;
|
||||
}
|
||||
let console_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../src/web-console");
|
||||
if !console_dir.join("console.mjs").is_file() {
|
||||
eprintln!(
|
||||
"skipping: console source missing at {}",
|
||||
console_dir.display()
|
||||
);
|
||||
return None;
|
||||
}
|
||||
/// up (see `console_test_env`). Keep the guard until the test ends: the
|
||||
/// console's variables must not change while its session is in use.
|
||||
fn real_console() -> Option<(
|
||||
std::sync::MutexGuard<'static, ()>,
|
||||
plan2code_app_lib::console_supervisor::ConsoleSupervisor,
|
||||
)> {
|
||||
let guard = console_test_env()?;
|
||||
let pid = std::process::id();
|
||||
let project = std::env::temp_dir().join(format!("p2c-main-test-project-{pid}"));
|
||||
std::fs::create_dir_all(&project).unwrap();
|
||||
std::env::set_var("PLAN2CODE_CONSOLE_DIR", &console_dir);
|
||||
std::env::set_var(
|
||||
"PLAN2CODE_CONSOLE_HOME",
|
||||
std::env::temp_dir().join(format!("p2c-main-test-home-{pid}")),
|
||||
);
|
||||
std::env::set_var("PLAN2CODE_NO_BROWSER", "1");
|
||||
// Run inside the desktop app, the agent's in-app variables would have this
|
||||
// console announce itself to the live window and take it over.
|
||||
for name in [
|
||||
"PLAN2CODE_IN_APP",
|
||||
"PLAN2CODE_APP_ANNOUNCE",
|
||||
"PLAN2CODE_APP_TOKEN",
|
||||
"PLAN2CODE_CONSOLE_SID",
|
||||
] {
|
||||
std::env::remove_var(name);
|
||||
}
|
||||
Some(
|
||||
plan2code_app_lib::console_supervisor::ConsoleSupervisor::start(
|
||||
project,
|
||||
plan2code_app_lib::console_supervisor::app_origin().to_string(),
|
||||
)
|
||||
.expect("start a real console for the test"),
|
||||
let sup = plan2code_app_lib::console_supervisor::ConsoleSupervisor::start(
|
||||
project,
|
||||
plan2code_app_lib::console_supervisor::app_origin().to_string(),
|
||||
)
|
||||
.expect("start a real console for the test");
|
||||
Some((guard, sup))
|
||||
}
|
||||
|
||||
fn state_with_loop(running: bool) -> AppState {
|
||||
@@ -1838,7 +1840,9 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn a_start_after_a_stop_opens_the_same_session_again() {
|
||||
let Some(sup) = real_console() else { return };
|
||||
let Some((_env, sup)) = real_console() else {
|
||||
return;
|
||||
};
|
||||
let state = state_for("project-a");
|
||||
let sid = sup.session().sid.clone();
|
||||
*state.console.lock().unwrap() = Some(sup);
|
||||
@@ -1901,7 +1905,9 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn teardown_clears_the_console_so_console_start_refuses_not_reconnects() {
|
||||
let Some(sup) = real_console() else { return };
|
||||
let Some((_env, sup)) = real_console() else {
|
||||
return;
|
||||
};
|
||||
let state = state_for("project-a");
|
||||
*state.console.lock().unwrap() = Some(sup);
|
||||
assert!(
|
||||
|
||||
@@ -447,9 +447,17 @@ async function openStrengthSetup(t, launch = LAUNCH) {
|
||||
|
||||
const strengthRows = (s) =>
|
||||
s.page.locator(".loop-strength-row").evaluateAll((rows) =>
|
||||
rows.map((r) => ({ phase: r.querySelector(".loop-strength-phase").textContent, pick: r.querySelector("select").value, model: r.querySelector(".loop-strength-model").textContent }))
|
||||
rows.map((r) => ({ phase: r.querySelector(".loop-strength-phase").textContent, pick: r.querySelector("input:checked")?.value ?? null, model: r.querySelector(".loop-strength-model").textContent }))
|
||||
);
|
||||
|
||||
// Each row is a radio group, one radio per column: #loop-strength-<n>-<word>, "match" for Match my session.
|
||||
// The cell is clicked, as a person does: its dot sits over the hidden radio.
|
||||
const pickStrength = async (s, n, word) => {
|
||||
const radio = s.page.locator(`#loop-strength-${n}-${word || "match"}`);
|
||||
await radio.locator("..").click();
|
||||
await s.page.locator(`#loop-strength-${n}-${word || "match"}:checked`).waitFor({ state: "attached" });
|
||||
};
|
||||
|
||||
test("the strength section is first in the form and off by default", async (t) => {
|
||||
const s = await openStrengthSetup(t);
|
||||
const toggle = s.page.locator("#loop-phase-strength");
|
||||
@@ -469,7 +477,7 @@ test("turning it on shows one row per phase left with the model each pick become
|
||||
{ phase: "Phase 2: Two", pick: "", model: "opus, medium" },
|
||||
], "untouched rows match the session and show the launch choice");
|
||||
|
||||
await s.page.locator("#loop-strength-1").selectOption("thrifty");
|
||||
await pickStrength(s, 1, "thrifty");
|
||||
assert.equal(await textOf(s.page.locator('[data-phase="1"] .loop-strength-model')), "sonnet, low");
|
||||
|
||||
assert.equal(await s.page.locator("#loop-strength-all").inputValue(), "-", "Set all to starts blank");
|
||||
@@ -477,7 +485,7 @@ test("turning it on shows one row per phase left with the model each pick become
|
||||
assert.deepEqual((await strengthRows(s)).map((r) => [r.pick, r.model]), [["best", "opus, medium"], ["best", "opus, medium"]]);
|
||||
assert.equal(await s.page.locator("#loop-strength-all").inputValue(), "-", "and goes blank again: it is not a saved value");
|
||||
|
||||
await s.page.locator("#loop-strength-2").selectOption("balanced");
|
||||
await pickStrength(s, 2, "balanced");
|
||||
assert.deepEqual((await strengthRows(s)).map((r) => [r.pick, r.model]), [["best", "opus, medium"], ["balanced", "sonnet, medium"]], "a row can change after Set all");
|
||||
|
||||
await s.page.locator("#loop-strength-all").selectOption("match");
|
||||
@@ -509,12 +517,12 @@ test("a saved pick that is not mapped holds Start with a line naming the row, an
|
||||
const why = s.page.locator(".loop-why");
|
||||
assert.equal(await textOf(why), "Pick a new strength for Phase 2: not mapped for this agent.");
|
||||
assert.equal(await s.page.locator("#loop-start").isDisabled(), true);
|
||||
const pick = s.page.locator("#loop-strength-2");
|
||||
assert.equal(await pick.inputValue(), "thrifty", "the saved word stays in the row");
|
||||
assert.equal(await pick.locator("option:checked").innerText(), "Thrifty (not mapped)");
|
||||
assert.equal(await pick.locator("option:checked").evaluate((o) => o.disabled), true);
|
||||
const held = s.page.locator("#loop-strength-2-thrifty");
|
||||
assert.equal(await held.isChecked(), true, "the saved word stays in the row");
|
||||
assert.equal(await held.isDisabled(), true);
|
||||
assert.deepEqual(await s.page.locator(".loop-strength-head .loop-strength-chip.is-unmapped").allInnerTexts(), ["Thrifty (not mapped)", "Balanced (not mapped)"]);
|
||||
|
||||
await pick.selectOption("best");
|
||||
await pickStrength(s, 2, "best");
|
||||
assert.equal(await s.page.locator(".loop-why").count(), 0, "the hold is gone");
|
||||
assert.equal(await s.page.locator("#loop-start").isDisabled(), false);
|
||||
});
|
||||
@@ -548,8 +556,8 @@ test("startBlock names every unmapped row, ignores the picks while the toggle is
|
||||
test("the toggle and the picks survive reopening the screen, and the toggle off sends nothing for the loop", async (t) => {
|
||||
const s = await openStrengthSetup(t);
|
||||
await s.page.locator("#loop-phase-strength").check();
|
||||
await s.page.locator("#loop-strength-1").selectOption("thrifty");
|
||||
await s.page.locator("#loop-strength-2").selectOption("best");
|
||||
await pickStrength(s, 1, "thrifty");
|
||||
await pickStrength(s, 2, "best");
|
||||
|
||||
const save = () =>
|
||||
s.page.evaluate(async () => {
|
||||
@@ -573,7 +581,7 @@ test("the toggle and the picks survive reopening the screen, and the toggle off
|
||||
await s.page.locator("#loop-start").waitFor();
|
||||
};
|
||||
await reopen();
|
||||
await s.page.locator("#loop-strength-1").waitFor();
|
||||
await s.page.locator(".loop-strength-row").first().waitFor();
|
||||
assert.equal(await s.page.locator("#loop-phase-strength").isChecked(), true);
|
||||
assert.deepEqual((await strengthRows(s)).map((r) => [r.pick, r.model]), [["thrifty", "sonnet, low"], ["best", "opus, medium"]]);
|
||||
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
# Loop Mode on the Web Console
|
||||
|
||||
Workflow notes for Implement and Implement + Review started by the desktop app's
|
||||
Implementation Loop with `--loop`, part of the web console contract
|
||||
(`console.md`). Read `building.md` and `notes/implement.md` first: this note says
|
||||
Notes for Implement and Implement + Review run by the desktop app's
|
||||
Implementation Loop (`--loop`), part of the `console.md` contract. Read `building.md` and `notes/implement.md` first: this note says
|
||||
only where loop mode differs. The app judges the result, so you report and never
|
||||
approve.
|
||||
|
||||
@@ -57,16 +56,14 @@ approve.
|
||||
`passed`. Never list a failure the Notes do not name.
|
||||
- A waiting `**Plan change:**` line in the phase's Notes: do not ask Revise
|
||||
first or Resume; report `failed`, reason `other`, and say so in `summary`.
|
||||
- Run only the tests the phase file names, as the Implement prompt's tests rule
|
||||
says: a phase task or a task's `Test:` line (a `## Phase Testing` block counts
|
||||
when it lists them as tasks). Never the full suite unless the phase file names it.
|
||||
- Run only the tests the phase file names (a phase task, a task's `Test:` line,
|
||||
or tasks under `## Phase Testing`), never the full suite unless it names it.
|
||||
|
||||
## Headline stages
|
||||
|
||||
Post `headline.stage` as each begins, using only these words: `Build`, `Review`,
|
||||
`Fixes`, `Re-check`, `Reporting`. The app's strip reads them, and any other word
|
||||
shows as Build, so do not invent new ones in loop mode. Keep `cleared` and
|
||||
`total` as in any build.
|
||||
`Fixes`, `Re-check`, `Reporting` (the app's strip shows any other word as
|
||||
Build). Keep `cleared` and `total` as in any build.
|
||||
|
||||
## Choosing the phase
|
||||
|
||||
@@ -99,8 +96,8 @@ or `checkoff` post `result: "failed"`, `reason: "other"` and
|
||||
`"handledBy": "loop"` and the answer filled in, so the page shows "The loop
|
||||
handles this", for example
|
||||
`{ "id": "fixes", "kind": "multi", "title": "Which to fix", "options": [ ... ], "status": "answered", "answer": { "ks": ["1", "2"] }, "handledBy": "loop" }`.
|
||||
- Ask (chat) questions do not arrive while the loop drives. If one does, answer
|
||||
it briefly as usual.
|
||||
- Ask (chat) questions do not arrive while the loop drives; if one does, answer
|
||||
it briefly.
|
||||
|
||||
## Review, one fix round and the re-check
|
||||
|
||||
@@ -130,8 +127,7 @@ say why. Post the triage's answers for the record as the settled `fixes` item (i
|
||||
|
||||
Then run the one fix round on the findings marked `fix`, and the fresh re-check
|
||||
of only those fixes, as above. `left` counts the picked findings still open after
|
||||
the re-check. Smart pick always reports `triage.ran: true` and `review.recheck: true`, even when no finding was raised or none was picked (an empty re-check). The triage runs under the `Review` stage; the stage words do not
|
||||
change.
|
||||
the re-check. Smart pick always reports `triage.ran: true` and `review.recheck: true`, even when no finding was raised or none was picked (an empty re-check). The triage runs under the `Review` stage.
|
||||
|
||||
## Reporting the outcome
|
||||
|
||||
|
||||
Reference in new issue
Block a user