@monoes/monodesign 1.2.20 → 1.2.22

package/skill/scripts/live-commit-manual-edits-repair.mjs

@@ -0,0 +1,166 @@
+/**
+ * Repair-attempt loop for live-commit-manual-edits.mjs: when a batched AI
+ * apply fails post-apply validation, re-invoke the copy-edit agent with the
+ * failure detail attached, up to a bounded number of attempts.
+ *
+ * Split out of live-commit-manual-edits.mjs. See that file for context.
+ */
+
+import { countByPage } from './live/manual-edits-buffer.mjs';
+import {
+  runCopyEditBatchAgent,
+  runCopyEditPostApplyChecks,
+} from './live-copy-edit-agent.mjs';
+import {
+  candidatesForEntry,
+  mergeFailedEntries,
+  mergeUniqueStrings,
+  normalizeFailedEntries,
+  repairAttemptLimit,
+  summarizeAppliedEntries,
+  summarizeRepairFailures,
+  buildRepairBatch,
+} from './live-commit-manual-edits-utils.mjs';
+import {
+  verifyEntriesAfterRepair,
+  verificationFailuresForEntries,
+} from './live-commit-manual-edits-verify.mjs';
+import { clearAppliedEntries } from './live-commit-manual-edits-rollback.mjs';
+
+export async function repairPostApplyValidation({
+  batch,
+  cwd,
+  pageUrl,
+  count,
+  provider,
+  env,
+  timeoutMs,
+  applyBatchToSource,
+  chatAvailable,
+  transactionId,
+  appliedEntryIds,
+  files,
+  failed,
+  notes,
+  warnings,
+  postChecks,
+  repairReason = 'post_apply_validation_failed',
+  repairFailures = null,
+}) {
+  const maxAttempts = repairAttemptLimit(env);
+  let currentFiles = mergeUniqueStrings(files || []);
+  let currentAppliedIds = mergeUniqueStrings(appliedEntryIds || []);
+  let currentFailed = Array.isArray(failed) ? failed : [];
+  let currentNotes = Array.isArray(notes) ? notes : [];
+  let currentWarnings = Array.isArray(warnings) ? warnings : [];
+  let currentFailures = Array.isArray(repairFailures) ? repairFailures : (postChecks?.failures || []);
+
+  for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
+    const repair = {
+      attempt,
+      maxAttempts,
+      transactionId: transactionId || null,
+      reason: repairReason,
+      failures: summarizeRepairFailures(currentFailures),
+      files: currentFiles,
+      pageUrl,
+    };
+    let repairResult;
+    try {
+      repairResult = await runCopyEditBatchAgent(buildRepairBatch(batch, repair), {
+        cwd,
+        provider,
+        env,
+        timeoutMs,
+        applyBatchToSource,
+        chatAvailable,
+      });
+    } catch (err) {
+      currentFailures = [{
+        reason: 'repair_agent_failed',
+        message: err.message || String(err),
+      }];
+      continue;
+    }
+
+    currentFiles = mergeUniqueStrings(currentFiles, repairResult.files || []);
+    currentNotes = [...currentNotes, ...(repairResult.notes || [])];
+    currentWarnings = [...currentWarnings, ...(repairResult.warnings || [])];
+    currentAppliedIds = mergeUniqueStrings(currentAppliedIds, repairResult.appliedEntryIds || []);
+    currentFailed = mergeFailedEntries(
+      currentFailed,
+      normalizeFailedEntries(batch, repairResult, 'repair_failed'),
+    );
+
+    const verified = verifyEntriesAfterRepair({
+      batch,
+      appliedEntryIds: currentAppliedIds,
+      files: currentFiles,
+      cwd,
+    });
+    if (verified.failed.length > 0) {
+      currentFailures = verified.failed;
+      continue;
+    }
+
+    const repairedChecks = runCopyEditPostApplyChecks({ cwd, files: currentFiles });
+    currentWarnings = [...currentWarnings, ...(repairedChecks.warnings || [])];
+    if (!repairedChecks.ok) {
+      currentFailures = repairedChecks.failures || [];
+      continue;
+    }
+
+    const cleared = clearAppliedEntries(cwd, verified.verifiedIds);
+    const counts = countByPage(cwd);
+    const verifiedIdSet = new Set(verified.verifiedIds);
+    return {
+      applied: summarizeAppliedEntries(batch.entries, verified.verifiedIds),
+      failed: mergeFailedEntries(currentFailed).filter((item) => !verifiedIdSet.has(item.id)),
+      files: currentFiles,
+      cleared,
+      count,
+      pageUrl,
+      warnings: currentWarnings,
+      notes: currentNotes,
+      repair: {
+        status: 'repaired',
+        attempts: attempt,
+        maxAttempts,
+        transactionId: transactionId || null,
+      },
+      ...counts,
+    };
+  }
+
+  const decisionFailedEntries = currentAppliedIds.length > 0
+    ? (batch.entries || [])
+        .filter((entry) => currentAppliedIds.includes(entry.id))
+        .map((entry) => ({
+          id: entry.id,
+          reason: repairReason,
+          checks: currentFailures,
+          candidates: candidatesForEntry(batch, entry.id),
+        }))
+    : verificationFailuresForEntries(batch, batch.entries || [], repairReason, { checks: currentFailures });
+  return {
+    applied: [],
+    failed: mergeFailedEntries(decisionFailedEntries, currentFailed),
+    files: currentFiles,
+    cleared: 0,
+    count,
+    pageUrl,
+    warnings: currentWarnings,
+    notes: currentNotes,
+    reason: 'manual_edit_repair_needs_decision',
+    needsManualDecision: true,
+    repair: {
+      status: 'needs_decision',
+      attempts: maxAttempts,
+      maxAttempts,
+      transactionId: transactionId || null,
+      failures: summarizeRepairFailures(currentFailures),
+      files: currentFiles,
+    },
+    ...countByPage(cwd),
+  };
+}

package/skill/scripts/live-commit-manual-edits-rollback.mjs

@@ -0,0 +1,231 @@
+/**
+ * Filesystem snapshot/rollback helpers for live-commit-manual-edits.mjs:
+ * scanning candidate rollback files, snapshotting their content, detecting
+ * what changed, and restoring them when an apply attempt must be undone.
+ *
+ * Split out of live-commit-manual-edits.mjs. See that file for context.
+ */
+
+import { isGeneratedFile } from './lib/is-generated.mjs';
+import { readBuffer, writeBuffer } from './live/manual-edits-buffer.mjs';
+import { uniqueStrings } from './live-commit-manual-edits-utils.mjs';
+import { normalizeRollbackPath } from './live-commit-manual-edits-paths.mjs';
+import fs from 'node:fs';
+import path from 'node:path';
+
+const ROLLBACK_EXTENSIONS = new Set([
+  '.astro',
+  '.cjs',
+  '.css',
+  '.htm',
+  '.html',
+  '.js',
+  '.json',
+  '.jsx',
+  '.md',
+  '.mdx',
+  '.mjs',
+  '.scss',
+  '.svelte',
+  '.svg',
+  '.ts',
+  '.tsx',
+  '.txt',
+  '.vue',
+  '.yaml',
+  '.yml',
+]);
+const ROLLBACK_SKIP_DIRS = new Set([
+  '.astro',
+  '.git',
+  '.monodesign',
+  '.next',
+  '.nuxt',
+  '.svelte-kit',
+  'build',
+  'coverage',
+  'dist',
+  'node_modules',
+  'out',
+]);
+
+export function clearAppliedEntries(cwd, appliedEntryIds) {
+  const ids = new Set(appliedEntryIds);
+  if (ids.size === 0) return 0;
+  const buffer = readBuffer(cwd);
+  let cleared = 0;
+  const kept = [];
+  for (const entry of buffer.entries || []) {
+    if (ids.has(entry.id)) {
+      cleared += Array.isArray(entry.ops) ? entry.ops.length : 0;
+    } else {
+      kept.push(entry);
+    }
+  }
+  writeBuffer(cwd, { version: buffer.version || 1, entries: kept });
+  return cleared;
+}
+
+export function snapshotRollbackFiles(cwd, files = null) {
+  const snapshot = new Map();
+  const rollbackFiles = Array.isArray(files) && files.length > 0
+    ? uniqueStrings(files).map((file) => normalizeRollbackPath(cwd, file)).filter(Boolean)
+    : collectRollbackFiles(cwd);
+  for (const relativeFile of rollbackFiles) {
+    const absolute = path.resolve(cwd, relativeFile);
+    try {
+      snapshot.set(relativeFile, {
+        existed: true,
+        content: fs.readFileSync(absolute, 'utf-8'),
+      });
+    } catch (err) {
+      if (err?.code === 'ENOENT') {
+        snapshot.set(relativeFile, { existed: false });
+      }
+      // Other read failures are not safe to roll back.
+    }
+  }
+  return snapshot;
+}
+
+function collectRollbackFiles(cwd) {
+  const out = [];
+  const seenDirs = new Set();
+  const seenFiles = new Set();
+  scanRollbackDir(cwd, cwd, out, seenDirs, seenFiles, 0);
+  return out;
+}
+
+function scanRollbackDir(dir, cwd, out, seenDirs, seenFiles, depth) {
+  if (depth > 10) return;
+  let realDir;
+  try { realDir = fs.realpathSync(dir); } catch { return; }
+  if (seenDirs.has(realDir)) return;
+  seenDirs.add(realDir);
+
+  let entries;
+  try { entries = fs.readdirSync(dir, { withFileTypes: true }); } catch { return; }
+  for (const entry of entries) {
+    if (entry.isDirectory()) {
+      if (ROLLBACK_SKIP_DIRS.has(entry.name)) continue;
+      scanRollbackDir(path.join(dir, entry.name), cwd, out, seenDirs, seenFiles, depth + 1);
+      continue;
+    }
+    if (!entry.isFile()) continue;
+    if (!ROLLBACK_EXTENSIONS.has(path.extname(entry.name).toLowerCase())) continue;
+    const absolute = path.join(dir, entry.name);
+    if (isGeneratedFile(absolute, { cwd })) continue;
+    let realFile;
+    try { realFile = fs.realpathSync(absolute); } catch { continue; }
+    if (seenFiles.has(realFile)) continue;
+    seenFiles.add(realFile);
+    const relative = path.relative(cwd, absolute).split(path.sep).join('/');
+    if (!relative || relative.startsWith('..') || path.isAbsolute(relative)) continue;
+    out.push(relative);
+  }
+}
+
+function changedFilesSinceSnapshot(cwd, snapshot, scopeFiles = null) {
+  const changed = new Map();
+  const scopedFiles = Array.isArray(scopeFiles) && scopeFiles.length > 0
+    ? scopeFiles.map((file) => normalizeRollbackPath(cwd, file)).filter(Boolean)
+    : null;
+  const currentFiles = new Set(scopedFiles || collectRollbackFiles(cwd));
+  for (const [relativeFile, before] of snapshot.entries()) {
+    if (scopedFiles && !currentFiles.has(relativeFile)) continue;
+    const absolute = path.resolve(cwd, relativeFile);
+    if (before?.existed === false) {
+      if (fs.existsSync(absolute)) changed.set(relativeFile, { file: relativeFile, kind: 'added' });
+      continue;
+    }
+    if (!fs.existsSync(absolute)) {
+      changed.set(relativeFile, { file: relativeFile, kind: 'deleted' });
+      continue;
+    }
+    let content;
+    try { content = fs.readFileSync(absolute, 'utf-8'); } catch { continue; }
+    if (content !== before.content) {
+      changed.set(relativeFile, { file: relativeFile, kind: 'modified' });
+    }
+  }
+  for (const relativeFile of currentFiles) {
+    if (!snapshot.has(relativeFile)) {
+      changed.set(relativeFile, { file: relativeFile, kind: 'unknown' });
+    }
+  }
+  return [...changed.values()];
+}
+
+export function rollbackChangedFiles(cwd, snapshot, extraFiles = [], scopeFiles = []) {
+  const scope = new Set(
+    [...(scopeFiles || []), ...(extraFiles || [])]
+      .map((file) => normalizeRollbackPath(cwd, file))
+      .filter(Boolean),
+  );
+  const changed = changedFilesSinceSnapshot(cwd, snapshot, [...scope]);
+  const byFile = new Map(changed.map((item) => [item.file, item]));
+  for (const file of extraFiles || []) {
+    const relative = normalizeRollbackPath(cwd, file);
+    if (relative && !byFile.has(relative)) {
+      byFile.set(relative, { file: relative, kind: snapshot.has(relative) ? 'reported' : 'unknown' });
+    }
+  }
+
+  const rolledBackFiles = [];
+  const rollbackFailures = [];
+  for (const item of byFile.values()) {
+    if (!scope.has(item.file)) continue;
+    const absolute = path.resolve(cwd, item.file);
+    const before = snapshot.get(item.file);
+    try {
+      if (before?.existed !== false && typeof before?.content === 'string') {
+        fs.mkdirSync(path.dirname(absolute), { recursive: true });
+        fs.writeFileSync(absolute, before.content, 'utf-8');
+      } else if (before?.existed === false && item.kind === 'added' && fs.existsSync(absolute)) {
+        fs.rmSync(absolute);
+      } else {
+        rollbackFailures.push({ file: item.file, reason: 'no_snapshot' });
+        continue;
+      }
+      rolledBackFiles.push(item.file);
+    } catch (err) {
+      rollbackFailures.push({ file: item.file, reason: 'restore_failed', message: err.message || String(err) });
+    }
+  }
+  return { rolledBackFiles, rollbackFailures };
+}
+
+export function collectApplyOwnedFiles(batch, cwd, extraFiles = []) {
+  const files = [];
+  for (const entry of batch?.entries || []) {
+    for (const op of entry.ops || []) files.push(op.sourceHint?.file);
+  }
+  for (const candidate of batch?.candidates || []) {
+    files.push(candidate.sourceHint?.relativeFile, candidate.sourceHint?.file);
+    for (const item of candidate.textMatches || []) files.push(item.file);
+    for (const item of candidate.objectKeyMatches || []) files.push(item.file);
+    for (const item of candidate.locatorMatches || []) files.push(item.file);
+    for (const item of candidate.contextTextMatches || []) files.push(item.file);
+  }
+  files.push(...(extraFiles || []));
+  return uniqueStrings(files)
+    .map((file) => normalizeRollbackPath(cwd, file))
+    .filter(Boolean);
+}
+
+export function unreportedChangedFiles(cwd, snapshot, reportedFiles, scopeFiles = []) {
+  const reported = new Set(
+    (reportedFiles || [])
+      .map((file) => normalizeRollbackPath(cwd, file))
+      .filter(Boolean),
+  );
+  const scope = new Set(
+    (scopeFiles || [])
+      .map((file) => normalizeRollbackPath(cwd, file))
+      .filter(Boolean),
+  );
+  return changedFilesSinceSnapshot(cwd, snapshot, [...scope])
+    .map((item) => item.file)
+    .filter((file) => scope.has(file))
+    .filter((file) => !reported.has(file));
+}

package/skill/scripts/live-commit-manual-edits-utils.mjs

@@ -0,0 +1,167 @@
+/**
+ * Small generic helpers for live-commit-manual-edits.mjs: CLI arg parsing,
+ * batch/entry bookkeeping, and repair-attempt bookkeeping.
+ *
+ * Split out of live-commit-manual-edits.mjs. See that file for context.
+ */
+
+const DEFAULT_REPAIR_ATTEMPTS = 3;
+
+export function argVal(args, name) {
+  const prefix = `${name}=`;
+  for (const arg of args) {
+    if (arg === name) return true;
+    if (arg.startsWith(prefix)) return arg.slice(prefix.length);
+  }
+  return null;
+}
+
+export function countOps(entries) {
+  let count = 0;
+  for (const entry of entries || []) count += Array.isArray(entry.ops) ? entry.ops.length : 0;
+  return count;
+}
+
+export function summarizeAppliedEntries(entries, appliedEntryIds) {
+  const ids = new Set(appliedEntryIds);
+  const out = [];
+  for (const entry of entries || []) {
+    if (!ids.has(entry.id)) continue;
+    for (const op of entry.ops || []) {
+      out.push({
+        id: entry.id,
+        ref: op.ref,
+        originalText: op.originalText,
+        newText: op.newText,
+      });
+    }
+  }
+  return out;
+}
+
+export function normalizeFailedEntries(batch, result, fallbackReason) {
+  const failed = [];
+  const failedByEntryId = new Map();
+  for (const item of result?.failed || []) {
+    const entryId = item.entryId || item.id || null;
+    if (!entryId) continue;
+    failedByEntryId.set(entryId, item);
+  }
+
+  for (const entry of batch.entries || []) {
+    const item = failedByEntryId.get(entry.id);
+    if (!item) continue;
+    failed.push({
+      id: entry.id,
+      reason: item.reason || item.message || fallbackReason || 'failed',
+      candidates: Array.isArray(item.candidates) && item.candidates.length > 0
+        ? item.candidates
+        : candidatesForEntry(batch, entry.id),
+    });
+  }
+  return failed;
+}
+
+export function mergeFailedEntries(...groups) {
+  const out = [];
+  const indexById = new Map();
+  for (const item of groups.flatMap((group) => Array.isArray(group) ? group : [])) {
+    if (!item || typeof item !== 'object') continue;
+    const id = typeof item.id === 'string' && item.id ? item.id : null;
+    if (!id) {
+      out.push(item);
+      continue;
+    }
+    const existingIndex = indexById.get(id);
+    if (existingIndex === undefined) {
+      indexById.set(id, out.length);
+      out.push(item);
+      continue;
+    }
+    out[existingIndex] = {
+      ...out[existingIndex],
+      ...item,
+      candidates: item.candidates || out[existingIndex].candidates,
+      checks: item.checks || out[existingIndex].checks,
+    };
+  }
+  return out;
+}
+
+export function candidatesForEntry(batch, entryId) {
+  return (batch.candidates || [])
+    .filter((candidate) => candidate.entryId === entryId)
+    .flatMap((candidate) => [
+      ...(candidate.sourceHint ? [candidate.sourceHint] : []),
+      ...(candidate.textMatches || []),
+      ...(candidate.objectKeyMatches || []),
+      ...(candidate.locatorMatches || []),
+      ...(candidate.contextTextMatches || []),
+    ])
+    .slice(0, 12);
+}
+
+export function uniqueStrings(values) {
+  return [...new Set(values.filter((value) => typeof value === 'string' && value.trim()))];
+}
+
+export function allEntryIds(batch) {
+  return (batch?.entries || []).map((entry) => entry.id).filter(Boolean);
+}
+
+export function mergeUniqueStrings(...groups) {
+  return uniqueStrings(groups.flatMap((group) => Array.isArray(group) ? group : []));
+}
+
+export function repairAttemptLimit(env = process.env) {
+  const value = Number(env.MONODESIGN_LIVE_MANUAL_EDIT_REPAIR_ATTEMPTS || DEFAULT_REPAIR_ATTEMPTS);
+  if (!Number.isFinite(value)) return DEFAULT_REPAIR_ATTEMPTS;
+  return Math.max(1, Math.min(10, Math.trunc(value)));
+}
+
+export function summarizeRepairFailures(failures = []) {
+  return failures.map((failure) => {
+    const out = {
+      reason: failure.reason || failure.detail || 'validation_failed',
+    };
+    if (failure.id || failure.entryId) out.entryId = failure.id || failure.entryId;
+    if (failure.ref) out.ref = failure.ref;
+    if (failure.detail) out.detail = failure.detail;
+    if (failure.file) out.file = failure.file;
+    if (failure.message) out.message = failure.message;
+    if (failure.marker) out.marker = failure.marker;
+    if (Array.isArray(failure.files)) out.files = failure.files.slice(0, 8);
+    if (Array.isArray(failure.candidates)) {
+      out.candidates = failure.candidates.slice(0, 8).map((candidate) => ({
+        file: candidate.file,
+        line: candidate.line,
+        kind: candidate.kind,
+        reason: candidate.reason,
+      }));
+    }
+    if (Array.isArray(failure.failures)) {
+      out.failures = failure.failures.slice(0, 8).map((item) => ({
+        ref: item.ref,
+        reason: item.reason || item.detail,
+        detail: item.detail,
+        candidates: Array.isArray(item.candidates)
+          ? item.candidates.slice(0, 6).map((candidate) => ({
+              file: candidate.file,
+              line: candidate.line,
+              kind: candidate.kind,
+              reason: candidate.reason,
+            }))
+          : undefined,
+      }));
+    }
+    if (failure.checks) out.checks = failure.checks;
+    return out;
+  }).slice(0, 20);
+}
+
+export function buildRepairBatch(batch, repair) {
+  return {
+    ...batch,
+    repair,
+  };
+}