@orkestrel/scaffold 0.0.101 → 0.0.102

package/dist/agents/skills/orkestrel-publish/scripts/wave.js

@@ -36,17 +36,12 @@ function readManifest(target) {
     }
 }
 function readRanges(manifest, fields) {
-    const ranges = new Map();
-    for (const field of fields) {
+    return new Map(fields.flatMap((field) => {
         const block = manifest[field];
         if (typeof block !== 'object' || block === null)
-            continue;
-        for (const [name, range] of Object.entries(block)) {
-            if (typeof range === 'string')
-                ranges.set(`${field} ${name}`, range);
-        }
-    }
-    return ranges;
+            return [];
+        return Object.entries(block).flatMap(([name, range]) => typeof range === 'string' ? [[`${field} ${name}`, range]] : []);
+    }));
 }
 function compareRanges(published, final) {
     const names = [...new Set([...published.keys(), ...final.keys()])].sort();
@@ -112,7 +107,12 @@ function describeFailure(result) {
         .slice(-3)
         .join(' | ');
 }
-function runStep(runner, step, file, args, cwd) {
+function readVerdict(result) {
+    return { exit: result.status ?? undefined, note: describeFailure(result) };
+}
+// A judge reads the finished command and answers the exit and note its one log entry carries, so no
+// entry is amended after it is appended.
+function runStep(runner, step, file, args, cwd, judge = readVerdict) {
     const command = describeCommand(file, args);
     if (runner.dry) {
         runner.steps.push({ step, command, exit: undefined, durationMs: 0, note: 'dry run' });
@@ -125,15 +125,42 @@ function runStep(runner, step, file, args, cwd) {
         windowsHide: true,
         maxBuffer: 64 * 1024 * 1024,
     });
-    runner.steps.push({
-        step,
-        command,
-        exit: result.status ?? undefined,
-        durationMs: Date.now() - started,
-        note: describeFailure(result),
-    });
+    const durationMs = Date.now() - started;
+    const verdict = judge(result);
+    runner.steps.push({ step, command, exit: verdict.exit, durationMs, note: verdict.note });
     return result;
 }
+// The audit exits 1 on the drift the pin step exists to close, so its exit is a reading here.
+function judgePin(result) {
+    const releases = readReleases(result.stdout);
+    if (releases === undefined || (result.status !== 0 && result.status !== 1)) {
+        return {
+            exit: result.status === null || result.status === 0 ? 2 : result.status,
+            note: releases === undefined ? 'the audit printed no releases envelope' : describeFailure(result),
+        };
+    }
+    return { exit: 0, note: `${releases.length} release reading(s)` };
+}
+function judgeOverwrite(result, offline) {
+    if (!offline || result.status !== 1)
+        return readVerdict(result);
+    const note = readString(readJsonObject(result.stdout), 'note');
+    return note !== undefined && note.includes(OFFLINE_REFUSAL)
+        ? { exit: 0, note: 'offline overwrite skipped the catalog step by design' }
+        : { exit: 1, note: describeFailure(result) };
+}
+// The audit reads the canonical sources of scaffold's own checkout as foreign paths and exits 1.
+function judgeVerify(result, own) {
+    if (readReleases(result.stdout) === undefined) {
+        return {
+            exit: result.status === null || result.status === 0 ? 2 : result.status,
+            note: 'the audit printed no releases envelope',
+        };
+    }
+    return own && result.status === 1
+        ? { exit: 0, note: 'foreign-path findings are expected on the scaffold checkout' }
+        : readVerdict(result);
+}
 function runNpmStep(runner, step, args) {
     const command = `npm ${args.join(' ')}`;
     if (runner.dry) {
@@ -154,52 +181,53 @@ function runNpmStep(runner, step, args) {
 function recordStep(runner, step, command, note) {
     runner.steps.push({ step, command, exit: runner.dry ? undefined : 0, durationMs: 0, note });
 }
-function replaceLastStep(runner, exit, note) {
-    const last = runner.steps.pop();
-    if (last !== undefined)
-        runner.steps.push({ ...last, exit, note });
-}
 function failed(runner) {
     return runner.steps.some((entry) => entry.exit !== undefined &&
         entry.exit !== 0 &&
         entry.step !== 'pins' &&
         entry.step !== 'compare');
 }
+// A release moves a declared range to its registry caret when the range differs, and a later release
+// of the same name reads the range the earlier one wrote.
+function computeRanges(ranges, releases) {
+    return releases.reduce((state, release) => {
+        if (release.latest === undefined || !(release.name in state.ranges))
+            return state;
+        const caret = `^${release.latest}`;
+        return state.ranges[release.name] === caret
+            ? state
+            : {
+                ranges: { ...state.ranges, [release.name]: caret },
+                moved: [...state.moved, `${release.name} ${String(release.range)} -> ${caret}`],
+            };
+    }, { ranges, moved: [] });
+}
 function writeRanges(target, releases) {
     const manifest = readManifest(target);
     if (manifest === undefined)
         return [];
-    const moved = [];
-    for (const field of RANGE_FIELDS) {
+    const fields = RANGE_FIELDS.flatMap((field) => {
         const block = manifest[field];
         if (typeof block !== 'object' || block === null)
-            continue;
-        const ranges = Object.fromEntries(Object.entries(block));
-        for (const release of releases) {
-            if (release.latest === undefined || !(release.name in ranges))
-                continue;
-            const caret = `^${release.latest}`;
-            if (ranges[release.name] !== caret) {
-                ranges[release.name] = caret;
-                moved.push(`${release.name} ${String(release.range)} -> ${caret}`);
-            }
-        }
-        manifest[field] = ranges;
+            return [];
+        return [{ field, ...computeRanges(Object.fromEntries(Object.entries(block)), releases) }];
+    });
+    const moved = fields.flatMap((entry) => entry.moved);
+    if (moved.length > 0) {
+        const written = {
+            ...manifest,
+            ...Object.fromEntries(fields.map((entry) => [entry.field, entry.ranges])),
+        };
+        writeFileSync(join(target, 'package.json'), `${JSON.stringify(written, null, '\t')}\n`);
     }
-    if (moved.length > 0)
-        writeFileSync(join(target, 'package.json'), `${JSON.stringify(manifest, null, '\t')}\n`);
     return moved;
 }
 function runPin(runner, scaffoldFile, scaffoldPrefix, offline) {
-    const audit = runStep(runner, 'pin', scaffoldFile, [...scaffoldPrefix, 'audit', '--json', ...offline], runner.target);
+    const audit = runStep(runner, 'pin', scaffoldFile, [...scaffoldPrefix, 'audit', '--json', ...offline], runner.target, judgePin);
     if (audit !== undefined) {
         const releases = readReleases(audit.stdout);
-        if (releases === undefined || (audit.status !== 0 && audit.status !== 1)) {
-            replaceLastStep(runner, audit.status === null || audit.status === 0 ? 2 : audit.status, releases === undefined ? 'the audit printed no releases envelope' : describeFailure(audit));
+        if (releases === undefined || (audit.status !== 0 && audit.status !== 1))
             return;
-        }
-        // The audit exits 1 on the drift this step exists to close, so its exit is a reading here.
-        replaceLastStep(runner, 0, `${releases.length} release reading(s)`);
         const moved = writeRanges(runner.target, releases);
         recordStep(runner, 'pin', 'rewrite @orkestrel ranges to the registry caret', moved.length === 0 ? 'no range moved' : moved.join(', '));
     }
@@ -226,33 +254,18 @@ function runCommit(runner) {
     }
 }
 function runOverwrite(runner, scaffoldFile, scaffoldPrefix, offline) {
-    const written = runStep(runner, 'overwrite', scaffoldFile, [...scaffoldPrefix, 'overwrite', '--json', ...offline], runner.target);
-    if (runner.offline && written !== undefined && written.status === 1) {
-        const note = readString(readJsonObject(written.stdout), 'note');
-        if (note !== undefined && note.includes(OFFLINE_REFUSAL)) {
-            replaceLastStep(runner, 0, 'offline overwrite skipped the catalog step by design');
-        }
-        else {
-            replaceLastStep(runner, 1, describeFailure(written));
-        }
-    }
+    runStep(runner, 'overwrite', scaffoldFile, [...scaffoldPrefix, 'overwrite', '--json', ...offline], runner.target, (result) => judgeOverwrite(result, runner.offline));
     if (!failed(runner)) {
         runStep(runner, 'overwrite', scaffoldFile, [...scaffoldPrefix, 'audit', ...offline], runner.target);
     }
 }
 function runVerify(runner, scaffoldFile, scaffoldPrefix, offline, own) {
-    const audit = runStep(runner, 'verify', scaffoldFile, [...scaffoldPrefix, 'audit', '--json', ...offline], runner.target);
+    const audit = runStep(runner, 'verify', scaffoldFile, [...scaffoldPrefix, 'audit', '--json', ...offline], runner.target, (result) => judgeVerify(result, own));
     if (audit === undefined)
         return;
-    // The audit reads the canonical sources of scaffold's own checkout as foreign paths and exits 1.
-    if (own && audit.status === 1) {
-        replaceLastStep(runner, 0, 'foreign-path findings are expected on the scaffold checkout');
-    }
     const releases = readReleases(audit.stdout);
-    if (releases === undefined) {
-        replaceLastStep(runner, audit.status === null || audit.status === 0 ? 2 : audit.status, 'the audit printed no releases envelope');
+    if (releases === undefined)
         return;
-    }
     const drift = releases.filter((release) => release.latest !== undefined && release.range !== `^${release.latest}`);
     runner.steps.push({
         step: 'verify',
@@ -336,13 +349,6 @@ function runVisit(argv) {
     const version = readString(manifest, 'version');
     const before = readRanges(manifest, RANGE_FIELDS);
     const offline = runner.offline ? ['--offline'] : [];
-    let hits;
-    let ruling = {
-        distMoved: undefined,
-        rangesMoved: undefined,
-        ranges: undefined,
-        hits: undefined,
-    };
     if (selected.has('pin'))
         runPin(runner, scaffoldFile, scaffoldPrefix, offline);
     if (selected.has('commit') && !failed(runner))
@@ -359,9 +365,9 @@ function runVisit(argv) {
     }
     if (selected.has('install') && !failed(runner))
         runNpmStep(runner, 'install', ['install']);
-    if (selected.has('pins') && !failed(runner)) {
-        hits = runPins(runner, before, readOption(argv, '--prior') ?? version);
-    }
+    const hits = selected.has('pins') && !failed(runner)
+        ? runPins(runner, before, readOption(argv, '--prior') ?? version)
+        : undefined;
     if (selected.has('format') && !failed(runner))
         runNpmStep(runner, 'format', ['run', 'format']);
     if (selected.has('gates') && !failed(runner)) {
@@ -371,9 +377,10 @@ function runVisit(argv) {
             runNpmStep(runner, 'gates', ['run', gate]);
         }
     }
-    if (selected.has('compare') && !failed(runner))
-        ruling = runCompare(runner, name);
-    ruling = { ...ruling, hits };
+    const compared = selected.has('compare') && !failed(runner)
+        ? runCompare(runner, name)
+        : { distMoved: undefined, rangesMoved: undefined, ranges: undefined, hits: undefined };
+    const ruling = { ...compared, hits };
     const bump = ruling.distMoved === true || ruling.rangesMoved === true
         ? 'bump'
         : ruling.distMoved === undefined || ruling.rangesMoved === undefined
@@ -397,23 +404,26 @@ function readLayers(catalogPath) {
     const end = text.indexOf('<!-- /orkestrel:catalog -->');
     if (start === -1 || end === -1)
         return undefined;
-    const layers = new Map();
-    for (const line of text.slice(start, end).split(/\r\n|\n/)) {
+    const rows = text
+        .slice(start, end)
+        .split(/\r\n|\n/)
+        .flatMap((line) => {
         const match = line.match(/^\|\s*`(@orkestrel\/[a-z0-9-]+)`\s*\|\s*`([^`]+)`\s*\|\s*(L\d+)\s*\|/u);
-        if (match?.[1] === undefined || match[3] === undefined)
-            continue;
-        const members = layers.get(match[3]) ?? [];
-        members.push(`${match[1]} ${match[2] ?? ''}`.trim());
-        layers.set(match[3], members);
-    }
-    return new Map([...layers.entries()].sort(([left], [right]) => Number(left.slice(1)) - Number(right.slice(1))));
+        return match?.[1] === undefined || match[3] === undefined
+            ? []
+            : [{ layer: match[3], member: `${match[1]} ${match[2] ?? ''}`.trim() }];
+    });
+    return new Map([...Map.groupBy(rows, ({ layer }) => layer)]
+        .map(([layer, members]) => [layer, members.map(({ member }) => member)])
+        .sort(([left], [right]) => Number(left.slice(1)) - Number(right.slice(1))));
 }
 function renderVisit(visit) {
-    const lines = visit.steps.map((entry) => `wave: ${entry.step.padEnd(9)} exit=${entry.exit === undefined ? 'dry' : String(entry.exit)} ${String(entry.durationMs).padStart(7)} ms  ${entry.command}${entry.note === undefined ? '' : `  (${entry.note})`}`);
-    lines.push(`wave: ruling dist ${describeReading(visit.ruling.distMoved, 'moved', 'same')}, ranges ${describeReading(visit.ruling.rangesMoved, 'moved', 'same')}${visit.ruling.hits === undefined ? '' : `, ${visit.ruling.hits} self-pin hit(s)`}`);
-    for (const range of visit.ruling.ranges ?? [])
-        lines.push(`wave: range ${range}`);
-    lines.push(visit.row);
+    const lines = [
+        ...visit.steps.map((entry) => `wave: ${entry.step.padEnd(9)} exit=${entry.exit === undefined ? 'dry' : String(entry.exit)} ${String(entry.durationMs).padStart(7)} ms  ${entry.command}${entry.note === undefined ? '' : `  (${entry.note})`}`),
+        `wave: ruling dist ${describeReading(visit.ruling.distMoved, 'moved', 'same')}, ranges ${describeReading(visit.ruling.rangesMoved, 'moved', 'same')}${visit.ruling.hits === undefined ? '' : `, ${visit.ruling.hits} self-pin hit(s)`}`,
+        ...(visit.ruling.ranges ?? []).map((range) => `wave: range ${range}`),
+        visit.row,
+    ];
     return `${lines.join('\n')}\n`;
 }
 function main(argv) {

package/dist/agents/skills/orkestrel-publish/scripts/window.js

@@ -18,7 +18,7 @@
 // succeeded, 3 when it did not, 64 on usage.
 import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
 import { dirname, join, resolve } from 'node:path';
-import { readList, readMissingFlags, readOption, readString, runNpm, } from "../../orkestrel-dispatch/scripts/helpers.js";
+import { parseJsonRecord, readList, readMissingFlags, readOption, readString, runNpm, } from "../../orkestrel-dispatch/scripts/helpers.js";
 const POLL_MS = 5_000;
 const ACCEPTED = /^\+ (\S+)@(\S+)\s*$/mu;
 function waitFor(ms) {
@@ -31,27 +31,28 @@ function readWhoami() {
     const user = result.stdout.trim();
     return result.status === 0 && user !== '' ? user : undefined;
 }
-async function pollWhoami(waitSeconds) {
-    const started = Date.now();
-    let user = readWhoami();
-    while (user === undefined && Date.now() - started < waitSeconds * 1000) {
-        await waitFor(POLL_MS);
-        user = readWhoami();
-    }
-    return user;
+async function pollWhoami(waitSeconds, started = Date.now()) {
+    const user = readWhoami();
+    if (user !== undefined || Date.now() - started >= waitSeconds * 1000)
+        return user;
+    await waitFor(POLL_MS);
+    return pollWhoami(waitSeconds, started);
 }
 function readServed(name, version) {
     const result = runNpm(['view', `${name}@${version}`, 'version', '--json']);
     return result.status === 0 && result.stdout.replace(/["\s]/gu, '') === version;
 }
-async function confirmServed(name, version, waitSeconds) {
-    const started = Date.now();
-    let served = readServed(name, version);
-    while (!served && Date.now() - started < waitSeconds * 1000) {
-        await waitFor(POLL_MS);
-        served = readServed(name, version);
-    }
-    return served;
+async function confirmServed(name, version, waitSeconds, started = Date.now()) {
+    const served = readServed(name, version);
+    if (served || Date.now() - started >= waitSeconds * 1000)
+        return served;
+    await waitFor(POLL_MS);
+    return confirmServed(name, version, waitSeconds, started);
+}
+function findGitRoot(directory) {
+    return existsSync(join(directory, '.git')) || dirname(directory) === directory
+        ? directory
+        : findGitRoot(dirname(directory));
 }
 function readErrorCode(text) {
     return text.match(/\b(E[A-Z0-9]{3,}|EOTP|E401|E403|E404)\b/u)?.[1];
@@ -61,46 +62,49 @@ function readManifestName(directory) {
     if (!existsSync(path))
         return { name: undefined, version: undefined };
     try {
-        const parsed = JSON.parse(readFileSync(path, 'utf8'));
-        if (typeof parsed !== 'object' || parsed === null)
-            return { name: undefined, version: undefined };
-        const record = Object.fromEntries(Object.entries(parsed));
+        const record = parseJsonRecord(readFileSync(path, 'utf8'));
         return { name: readString(record, 'name'), version: readString(record, 'version') };
     }
     catch {
         return { name: undefined, version: undefined };
     }
 }
-async function publishAll(directories, otp, waitSeconds) {
-    mkdirSync('tmp/units', { recursive: true });
-    const uploads = [];
-    for (const directory of directories) {
-        const manifest = readManifestName(directory);
-        const journal = `tmp/units/publish-${(manifest.name ?? directory).replace(/[^A-Za-z0-9.-]+/gu, '-')}.log`;
-        const result = runNpm(['publish', '--ignore-scripts', '--browser=false', `--otp=${otp}`], directory);
-        writeFileSync(journal, `${result.stdout}\n${result.stderr}\nexit=${result.status ?? 'null'}\n`);
-        const match = `${result.stdout}\n${result.stderr}`.match(ACCEPTED);
-        const accepted = result.status === 0 && match !== null;
-        const name = match?.[1] ?? manifest.name;
-        const version = match?.[2] ?? manifest.version;
-        const upload = {
-            directory,
-            name,
-            version,
-            exit: result.status ?? undefined,
-            accepted,
-            confirmed: false,
-            code: accepted ? undefined : readErrorCode(result.stderr),
-            journal,
-        };
-        if (!accepted) {
-            uploads.push(upload);
-            console.error(`window: ${name ?? directory} refused (${upload.code ?? `exit ${String(result.status)}`}); resume from it on a fresh code`);
-            break;
-        }
+function publishPackage(directory, otp) {
+    const manifest = readManifestName(directory);
+    const journal = `tmp/units/publish-${(manifest.name ?? directory).replace(/[^A-Za-z0-9.-]+/gu, '-')}.log`;
+    const result = runNpm(['publish', '--ignore-scripts', '--browser=false', `--otp=${otp}`], directory);
+    writeFileSync(journal, `${result.stdout}\n${result.stderr}\nexit=${result.status ?? 'null'}\n`);
+    const match = `${result.stdout}\n${result.stderr}`.match(ACCEPTED);
+    const accepted = result.status === 0 && match !== null;
+    const name = match?.[1] ?? manifest.name;
+    const version = match?.[2] ?? manifest.version;
+    const upload = {
+        directory,
+        name,
+        version,
+        exit: result.status ?? undefined,
+        accepted,
+        confirmed: false,
+        code: accepted ? undefined : readErrorCode(result.stderr),
+        journal,
+    };
+    if (accepted) {
         console.error(`window: accepted ${name ?? '?'}@${version ?? '?'}`);
-        uploads.push(upload);
     }
+    else {
+        console.error(`window: ${name ?? directory} refused (${upload.code ?? `exit ${String(result.status)}`}); resume from it on a fresh code`);
+    }
+    return upload;
+}
+async function publishAll(directories, otp, waitSeconds) {
+    mkdirSync('tmp/units', { recursive: true });
+    // A step after the first refusal returns the state unchanged, so nothing publishes past it.
+    const { uploads } = directories.reduce((state, directory) => {
+        if (state.stopped)
+            return state;
+        const upload = publishPackage(directory, otp);
+        return { uploads: [...state.uploads, upload], stopped: !upload.accepted };
+    }, { uploads: [], stopped: false });
     const confirmed = [];
     for (const upload of uploads) {
         if (!upload.accepted || upload.name === undefined || upload.version === undefined) {
@@ -151,9 +155,7 @@ async function main(argv) {
             return 64;
         }
         for (const directory of directories) {
-            let root = resolve(directory);
-            while (!existsSync(join(root, '.git')) && dirname(root) !== root)
-                root = dirname(root);
+            const root = findGitRoot(resolve(directory));
             const entry = join(root, '.git');
             if (!existsSync(entry) || !statSync(entry).isFile())
                 continue;