mirror of
https://github.com/pbakaus/impeccable.git
synced 2026-09-12 14:16:28 +03:00
Addresses the review findings on #371, plus several the bots did not catch. All fixes have regression coverage that fails on the prior code. Source corruption: - Vue accept dropped valueless root attrs (disabled, v-cloak) and, worse, rewrote @click="x" as a literal click="x" DOM attribute, because the attr parser was name-anchored and skipped the sigil. Tokenize the whole Vue attr grammar and normalize shorthands so accept round-trips directives. - --variant was interpolated unescaped into a RegExp, so --variant '.*' matched the original block first and reported a successful accept while silently restoring the original. Validate against the digits pattern the browser and the /events schema already enforce. - --id reached path.join unvalidated, so --id ../../../../etc/evil wrote and read receipts outside the project. Hoist the existing safeSessionId check into impeccable-paths and apply it at every id-to-path sink. Accept/lock correctness: - Plain HTML/JSX accept and discard did not catch SOURCE_LOCKED, so contention exited non-zero with empty stdout and the agent got no JSON to retry on. - Lock staleness was mtime-only and never read the pid it records: a holder whose critical section outran 60s had its live lock swept, admitting a second writer to the same file, while a crashed holder blocked accepts for a full 60s. Decide staleness by owner liveness, and release only our own lock. Detector: - isNeutralColor only parses computed color forms, so routing authored CSS through it reported inset 4px 0 0 #000 / black / #e5e7eb as chromatic side-tab stripes. Add an authored-color neutrality test covering hex and named neutrals; the fixture had no literal-color cases at all. - Rule line numbers were off by one for every rule after the first, and commented-out CSS was scanned as live rules. Server: - An error reply carries no sourceEventType, and inferSourceEventType returned undefined, which acknowledgePendingEvent treats as a wildcard: a stale generate worker's failure consumed the user's queued Accept, which then reached no agent and left the browser in SAVING forever. - The generate preflight spawned live-wrap.mjs synchronously inside the request handler, freezing the single-threaded server for the whole scaffold (~7.6s measured on this repo, 15s ceiling) and stalling Accept/Discard/SSE. Make it async, claiming the lease before the first await so no event double-delivers. - Every browser checkpoint was echoed back as variant_progress, so a Tune slider drag remounted the preview under the user's cursor and latched the *_reviewable phases from the wrong trigger. Gate on the reason. Cleanup: - Collapse four divergent benchmark argv parsers into scripts/lib/cli-args.mjs. Three silently misread flags: --iterations 20 benchmarked 5, --agent llm ran the fake agent, --median-target=0.4 used the default threshold. - Drop a snapshot cache this branch made write-only (it grew per session for the server's lifetime and was never read), a dead exported reconcile helper, and the unused deferReply branch. Prepared with AI assistance under maintainer direction. Co-Authored-By: Claude <noreply@anthropic.com>
75 lines
2.8 KiB
JavaScript
75 lines
2.8 KiB
JavaScript
import fs from 'node:fs';
|
|
import path from 'node:path';
|
|
|
|
import { getLiveDir, safeSessionId } from '../lib/impeccable-paths.mjs';
|
|
|
|
export const SOURCE_ARTIFACT_PREVIEW_MODE = 'source-artifact';
|
|
|
|
export function scaffoldSourceArtifactSession({
|
|
id,
|
|
count,
|
|
sourceFile,
|
|
sourceStartLine,
|
|
sourceEndLine,
|
|
originalSource,
|
|
previewContent,
|
|
cwd = process.cwd(),
|
|
} = {}) {
|
|
safeSessionId(id);
|
|
const sourcePath = resolveInside(cwd, sourceFile);
|
|
if (!sourcePath || !fs.existsSync(sourcePath)) throw new Error('source artifact target missing');
|
|
|
|
const sessionDir = path.join(getLiveDir(cwd), 'previews', id);
|
|
const extension = path.extname(sourcePath) || '.html';
|
|
const previewPath = path.join(sessionDir, 'preview' + extension);
|
|
const manifestPath = path.join(sessionDir, 'manifest.json');
|
|
fs.mkdirSync(sessionDir, { recursive: true });
|
|
|
|
const manifest = {
|
|
id,
|
|
count: Number(count || 1),
|
|
previewMode: SOURCE_ARTIFACT_PREVIEW_MODE,
|
|
sourceFile: relative(cwd, sourcePath),
|
|
previewFile: relative(cwd, previewPath),
|
|
sourceStartLine: Number(sourceStartLine),
|
|
sourceEndLine: Number(sourceEndLine),
|
|
originalSource: String(originalSource || ''),
|
|
};
|
|
fs.writeFileSync(previewPath, String(previewContent || ''), 'utf-8');
|
|
fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + '\n', 'utf-8');
|
|
return { ...manifest, manifestFile: relative(cwd, manifestPath), sessionDir: relative(cwd, sessionDir) };
|
|
}
|
|
|
|
export function findSourceArtifactManifest(id, cwd = process.cwd()) {
|
|
try { safeSessionId(id); } catch { return null; }
|
|
const manifestPath = path.join(getLiveDir(cwd), 'previews', id, 'manifest.json');
|
|
let manifest;
|
|
try { manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf-8')); } catch { return null; }
|
|
if (manifest?.id !== id || manifest?.previewMode !== SOURCE_ARTIFACT_PREVIEW_MODE) return null;
|
|
const sourcePath = resolveInside(cwd, manifest.sourceFile);
|
|
const previewPath = resolveInside(cwd, manifest.previewFile);
|
|
if (!sourcePath || !previewPath || !fs.existsSync(sourcePath) || !fs.existsSync(previewPath)) return null;
|
|
return { ...manifest, manifestPath, sourcePath, previewPath };
|
|
}
|
|
|
|
export function removeSourceArtifactSession(id, cwd = process.cwd()) {
|
|
try { safeSessionId(id); } catch { return false; }
|
|
const sessionDir = path.join(getLiveDir(cwd), 'previews', id);
|
|
if (!fs.existsSync(sessionDir)) return false;
|
|
fs.rmSync(sessionDir, { recursive: true, force: true });
|
|
return true;
|
|
}
|
|
|
|
function resolveInside(cwd, value) {
|
|
if (!value || typeof value !== 'string') return null;
|
|
const root = path.resolve(cwd);
|
|
const resolved = path.resolve(root, value);
|
|
const rel = path.relative(root, resolved);
|
|
if (!rel || rel.startsWith('..') || path.isAbsolute(rel)) return null;
|
|
return resolved;
|
|
}
|
|
|
|
function relative(cwd, value) {
|
|
return path.relative(cwd, value).split(path.sep).join('/');
|
|
}
|