The design language that makes your AI harness better at design.
JavaScript
Simplify manual Apply rollback flow
Paul Bakaus1f2c3f9d6b20
diff --git a/skill/scripts/live-commit-manual-edits.mjs b/skill/scripts/live-commit-manual-edits.mjsindex 89572e759..eee702595 100644--- a/skill/scripts/live-commit-manual-edits.mjs+++ b/skill/scripts/live-commit-manual-edits.mjs@@ -944,8 +944,42 @@ export async function commitManualEdits({};}+ const repairContext = {+ batch,+ cwd,+ pageUrl,+ count,+ provider,+ env,+ timeoutMs,+ applyBatchToSource,+ chatAvailable,+ transactionId,+ };+const baseRollbackScope = collectApplyOwnedFiles(batch, cwd);const rollbackSnapshot = snapshotRollbackFiles(cwd, baseRollbackScope);+ const failWithRollback = ({+ scope = baseRollbackScope,+ extraFiles = [],+ failed,+ files = [],+ details = {},+ }) => {+ const rollback = rollbackChangedFiles(cwd, rollbackSnapshot, extraFiles, scope);+ return {+ applied: [],+ failed,+ files,+ cleared: 0,+ count,+ pageUrl,+ ...details,+ rolledBackFiles: rollback.rolledBackFiles,+ rollbackFailures: rollback.rollbackFailures,+ ...countByPage(cwd),+ };+ };let result;try {result = repairOnly@@ -965,42 +999,27 @@ export async function commitManualEdits({chatAvailable,});} catch (err) {- const rollback = rollbackChangedFiles(cwd, rollbackSnapshot, [], baseRollbackScope);- return {- applied: [],+ return failWithRollback({failed: batch.entries.map((entry) => ({id: entry.id,reason: err.message || String(err),candidates: candidatesForEntry(batch, entry.id),})),- files: [],- cleared: 0,- count,- pageUrl,- rolledBackFiles: rollback.rolledBackFiles,- rollbackFailures: rollback.rollbackFailures,- ...countByPage(cwd),- };+ });}if (result.status === 'error') {const rollbackScope = collectApplyOwnedFiles(batch, cwd, result.files || []);- const rollback = rollbackChangedFiles(cwd, rollbackSnapshot, result.files || [], rollbackScope);const failed = normalizeFailedEntries(batch, result, result.message || 'AI copy edit failed');- return {- applied: [],+ return failWithRollback({+ scope: rollbackScope,+ extraFiles: result.files || [],failed: failed.length > 0? failed: verificationFailuresForEntries(batch, batch.entries, result.message || 'AI copy edit failed'),files: result.files || [],- cleared: 0,- count,- pageUrl,- notes: result.notes || [],- rolledBackFiles: rollback.rolledBackFiles,- rollbackFailures: rollback.rollbackFailures,- ...countByPage(cwd),- };+ details: { notes: result.notes || [] },+ });}const reportedAppliedIds = uniqueStrings(result.appliedEntryIds || []);@@ -1013,72 +1032,44 @@ export async function commitManualEdits({const conflictingAppliedIds = reportedAppliedIds.filter((id) => failedIds.has(id));if (conflictingAppliedIds.length > 0) {- const rollback = rollbackChangedFiles(cwd, rollbackSnapshot, result.files || [], rollbackScope);const conflictingEntries = batch.entries.filter((entry) => conflictingAppliedIds.includes(entry.id));- return {- applied: [],+ return failWithRollback({+ scope: rollbackScope,+ extraFiles: result.files || [],failed: [...verificationFailuresForEntries(batch, conflictingEntries, 'conflicting_apply_result'),...aiFailed.filter((item) => !conflictingAppliedIds.includes(item.id)),],files: result.files || [],- cleared: 0,- count,- pageUrl,- notes: result.notes || [],- rolledBackFiles: rollback.rolledBackFiles,- rollbackFailures: rollback.rollbackFailures,- ...countByPage(cwd),- };+ details: { notes: result.notes || [] },+ });}const unreportedFiles = unreportedChangedFiles(cwd, rollbackSnapshot, result.files || [], rollbackScope);if (unreportedFiles.length > 0) {- const rollback = rollbackChangedFiles(cwd, rollbackSnapshot, result.files || [], [...rollbackScope, ...unreportedFiles]);- return {- applied: [],+ return failWithRollback({+ scope: [...rollbackScope, ...unreportedFiles],+ extraFiles: result.files || [],failed: verificationFailuresForEntries(batch, batch.entries, 'unreported_source_changes', { files: unreportedFiles }),files: result.files || [],- unreportedFiles,- cleared: 0,- count,- pageUrl,- notes: result.notes || [],- rolledBackFiles: rollback.rolledBackFiles,- rollbackFailures: rollback.rollbackFailures,- ...countByPage(cwd),- };+ details: { unreportedFiles, notes: result.notes || [] },+ });}if (result.status === 'done' && reportedAppliedIds.length === 0) {- const rollback = rollbackChangedFiles(cwd, rollbackSnapshot, result.files || [], rollbackScope);- return {- applied: [],+ return failWithRollback({+ scope: rollbackScope,+ extraFiles: result.files || [],failed: verificationFailuresForEntries(batch, batch.entries, 'missing_applied_entry_ids'),files: result.files || [],- cleared: 0,- count,- pageUrl,- notes: result.notes || [],- rolledBackFiles: rollback.rolledBackFiles,- rollbackFailures: rollback.rollbackFailures,- ...countByPage(cwd),- };+ details: { notes: result.notes || [] },+ });}const reportedAppliedEntries = batch.entries.filter((entry) => reportedAppliedIds.includes(entry.id));if (reportedAppliedIds.length > 0 && reportedFiles.length === 0) {return repairPostApplyValidation({- batch,- cwd,- pageUrl,- count,- provider,- env,- timeoutMs,- applyBatchToSource,- chatAvailable,- transactionId,+ ...repairContext,appliedEntryIds: reportedAppliedIds,files: result.files || [],failed: aiFailed,@@ -1089,21 +1080,10 @@ export async function commitManualEdits({});}- const verifiedAppliedIds = [];- const verificationFailed = [];- for (const entry of reportedAppliedEntries) {- const failures = verifyAppliedEntry({ batch, entry, reportedFiles, cwd });- if (failures.length === 0) {- verifiedAppliedIds.push(entry.id);- } else {- verificationFailed.push({- id: entry.id,- reason: 'source_verification_failed',- failures,- candidates: candidatesForEntry(batch, entry.id),- });- }- }+ const {+ verifiedIds: verifiedAppliedIds,+ failed: verificationFailed,+ } = verifyEntriesAfterRepair({ batch, appliedEntryIds: reportedAppliedIds, files: reportedFiles, cwd });const unreportedEntries = result.status === 'done' || result.status === 'partial'? batch.entries.filter((entry) => !reportedAppliedIds.includes(entry.id) && !aiFailed.some((item) => item.id === entry.id)): [];@@ -1133,37 +1113,22 @@ export async function commitManualEdits({reason: 'rolled_back_due_to_failed_entry_source_changed',candidates: candidatesForEntry(batch, entry.id),}));- const rollback = rollbackChangedFiles(cwd, rollbackSnapshot, result.files || [], rollbackScope);- return {- applied: [],+ return failWithRollback({+ scope: rollbackScope,+ extraFiles: result.files || [],failed: [...leakedUnapplied,...failed.filter((item) => !leakedIds.has(item.id)),...rolledBackVerified,],files: result.files || [],- cleared: 0,- count,- pageUrl,- rolledBackFiles: rollback.rolledBackFiles,- rollbackFailures: rollback.rollbackFailures,- notes: result.notes || [],- ...countByPage(cwd),- };+ details: { notes: result.notes || [] },+ });}if (verificationFailed.length > 0) {return repairPostApplyValidation({- batch,- cwd,- pageUrl,- count,- provider,- env,- timeoutMs,- applyBatchToSource,- chatAvailable,- transactionId,+ ...repairContext,appliedEntryIds: reportedAppliedIds,files: result.files || [],failed: nonRepairFailed,@@ -1180,16 +1145,7 @@ export async function commitManualEdits({? reportedAppliedEntries.filter((entry) => verifiedAppliedIds.includes(entry.id)): batch.entries;return repairPostApplyValidation({- batch,- cwd,- pageUrl,- count,- provider,- env,- timeoutMs,- applyBatchToSource,- chatAvailable,- transactionId,+ ...repairContext,appliedEntryIds: verifiedAppliedIds.length > 0? verifiedAppliedIds: postCheckEntries.map((entry) => entry.id).filter(Boolean),