@bastani/atomic 0.8.20 → 0.8.21-0

package/dist/builtin/workflows/skills/impeccable/scripts/live-discard-manual-edits.mjs

@@ -0,0 +1,51 @@
+#!/usr/bin/env node
+/**
+ * CLI helper: discard pending manual edits from the buffer without applying.
+ *
+ * Reads .impeccable/live/pending-manual-edits.json, drops entries, writes back.
+ * No source-file writes. Use this when the user wants to throw away unsaved
+ * manual edits.
+ *
+ * Trigger: only when the user explicitly asks the AI to discard / throw away /
+ * clear pending manual edits.
+ *
+ * Usage:
+ *   node live-discard-manual-edits.mjs              # discard all pending
+ *   node live-discard-manual-edits.mjs --page-url=/ # discard only entries for "/"
+ *
+ * Output JSON: { discarded: N, entries: [...discardedEntries], totalCount: N }
+ */
+
+import { readBuffer, removeEntries, truncateBuffer } from './live-manual-edits-buffer.mjs';
+
+function argVal(args, name) {
+  const prefix = name + '=';
+  for (const a of args) {
+    if (a === name) return true;
+    if (a.startsWith(prefix)) return a.slice(prefix.length);
+  }
+  return null;
+}
+
+const args = process.argv.slice(2);
+if (args.includes('--help') || args.includes('-h')) {
+  console.log('Usage: node live-discard-manual-edits.mjs [--page-url=<url>]');
+  process.exit(0);
+}
+
+const pageUrlFilter = argVal(args, '--page-url');
+const cwd = process.cwd();
+
+let discarded;
+let entries;
+const buffer = readBuffer(cwd);
+if (pageUrlFilter) {
+  entries = buffer.entries.filter((entry) => entry.pageUrl === pageUrlFilter);
+  discarded = removeEntries(cwd, (entry) => entry.pageUrl === pageUrlFilter);
+} else {
+  entries = buffer.entries;
+  discarded = truncateBuffer(cwd);
+}
+
+const remaining = readBuffer(cwd).entries.reduce((n, e) => n + e.ops.length, 0);
+console.log(JSON.stringify({ discarded, entries, totalCount: remaining }));

package/dist/builtin/workflows/skills/impeccable/scripts/live-event-validation.mjs

@@ -0,0 +1,136 @@
+/**
+ * Shared event validation for the live helper server.
+ * Extracted for unit testing (insert mode rules).
+ */
+
+import { canCreateInsert } from './live-insert-ui.mjs';
+
+export const VISUAL_ACTIONS = [
+  'impeccable', 'bolder', 'quieter', 'distill', 'polish', 'typeset',
+  'colorize', 'layout', 'adapt', 'animate', 'delight', 'overdrive',
+];
+
+const ID_PATTERN = /^[0-9a-f]{8}$/;
+const VARIANT_ID_PATTERN = /^[0-9]{1,3}$/;
+const INSERT_POSITIONS = new Set(['before', 'after']);
+const FORBIDDEN_MANUAL_EDIT_TEXT_CHARS = ['<', '{', '}', '`'];
+
+function isValidId(v) { return typeof v === 'string' && ID_PATTERN.test(v); }
+function isValidVariantId(v) { return typeof v === 'string' && VARIANT_ID_PATTERN.test(v); }
+
+function validateManualEditText(newText) {
+  if (typeof newText !== 'string') return null;
+  const hits = FORBIDDEN_MANUAL_EDIT_TEXT_CHARS.filter((char) => newText.includes(char));
+  return hits.length > 0 ? hits : null;
+}
+
+function validateAnnotationFields(msg) {
+  if (msg.screenshotPath !== undefined && typeof msg.screenshotPath !== 'string') {
+    return 'generate: screenshotPath must be string';
+  }
+  if (msg.comments !== undefined && !Array.isArray(msg.comments)) {
+    return 'generate: comments must be array';
+  }
+  if (msg.strokes !== undefined && !Array.isArray(msg.strokes)) {
+    return 'generate: strokes must be array';
+  }
+  return null;
+}
+
+function validateInsertGenerate(msg) {
+  if (!msg.insert || typeof msg.insert !== 'object') return 'generate: insert mode requires insert object';
+  if (!INSERT_POSITIONS.has(msg.insert.position)) return 'generate: insert.position must be before or after';
+  const anchor = msg.insert.anchor;
+  if (!anchor || typeof anchor !== 'object') return 'generate: insert.anchor required';
+  if (!anchor.tagName && !anchor.outerHTML && !(Array.isArray(anchor.classes) && anchor.classes.length)) {
+    return 'generate: insert.anchor needs tagName, classes, or outerHTML';
+  }
+  if (!msg.placeholder || typeof msg.placeholder !== 'object') return 'generate: insert mode requires placeholder dimensions';
+  if (!Number.isFinite(msg.placeholder.width) || !Number.isFinite(msg.placeholder.height)) {
+    return 'generate: placeholder width and height must be numbers';
+  }
+  if (!canCreateInsert({
+    prompt: msg.freeformPrompt,
+    comments: msg.comments,
+    strokes: msg.strokes,
+  })) {
+    return 'generate: insert requires freeformPrompt or annotations';
+  }
+  return validateAnnotationFields(msg);
+}
+
+function validateReplaceGenerate(msg) {
+  if (!msg.action || !VISUAL_ACTIONS.includes(msg.action)) return 'generate: invalid action';
+  if (!msg.element || !msg.element.outerHTML) return 'generate: missing element context';
+  return validateAnnotationFields(msg);
+}
+
+function validateManualEditEvent(msg, label) {
+  if (!isValidId(msg.id)) return label + ': missing or malformed id';
+  if (!msg.pageUrl || typeof msg.pageUrl !== 'string') return label + ': missing pageUrl';
+  if (!msg.element || typeof msg.element !== 'object') return label + ': missing element';
+  if (!Array.isArray(msg.ops) || msg.ops.length === 0) return label + ': ops must be non-empty array';
+  if (msg.ops.length > 100) return label + ': too many ops (max 100)';
+  for (const op of msg.ops) {
+    if (typeof op.ref !== 'string') return label + ': op.ref required';
+    if (typeof op.tag !== 'string') return label + ': op.tag required';
+    if (typeof op.originalText !== 'string') return label + ': op.originalText required';
+    if (op.deleted !== true && typeof op.newText !== 'string') {
+      return label + ': text op requires newText';
+    }
+    if (typeof op.newText === 'string') {
+      if (op.deleted !== true && op.newText.trim().length === 0) {
+        return label + ': newText cannot be empty';
+      }
+      const forbidden = validateManualEditText(op.newText);
+      if (forbidden) {
+        return label + ': newText cannot contain ' + forbidden.join(' ') + ' (plain text only; ask the AI to insert markup)';
+      }
+    }
+  }
+  return null;
+}
+
+export function validateEvent(msg) {
+  if (!msg || typeof msg !== 'object' || !msg.type) return 'Missing or invalid message';
+  switch (msg.type) {
+    case 'generate':
+      if (!isValidId(msg.id)) return 'generate: missing or malformed id';
+      if (!Number.isInteger(msg.count) || msg.count < 1 || msg.count > 8) return 'generate: count must be 1-8';
+      if (msg.mode === 'insert') return validateInsertGenerate(msg);
+      return validateReplaceGenerate(msg);
+    case 'accept':
+      if (!isValidId(msg.id)) return 'accept: missing or malformed id';
+      if (!isValidVariantId(msg.variantId)) return 'accept: missing or malformed variantId';
+      if (msg.paramValues !== undefined) {
+        if (typeof msg.paramValues !== 'object' || msg.paramValues === null || Array.isArray(msg.paramValues)) {
+          return 'accept: paramValues must be an object';
+        }
+      }
+      return null;
+    case 'discard':
+      return isValidId(msg.id) ? null : 'discard: missing or malformed id';
+    case 'checkpoint':
+      if (!isValidId(msg.id)) return 'checkpoint: missing or malformed id';
+      if (!Number.isInteger(msg.revision) || msg.revision < 0) return 'checkpoint: revision must be a non-negative integer';
+      if (msg.paramValues !== undefined && (typeof msg.paramValues !== 'object' || msg.paramValues === null || Array.isArray(msg.paramValues))) {
+        return 'checkpoint: paramValues must be an object';
+      }
+      return null;
+    case 'exit':
+      return null;
+    case 'prefetch':
+      if (!msg.pageUrl || typeof msg.pageUrl !== 'string') return 'prefetch: missing pageUrl';
+      return null;
+    case 'manual_edits':
+      return validateManualEditEvent(msg, 'manual_edits');
+    case 'steer':
+      if (!isValidId(msg.id)) return 'steer: missing or malformed id';
+      if (typeof msg.message !== 'string' || !msg.message.trim()) return 'steer: message required';
+      if (msg.message.length > 4000) return 'steer: message too long';
+      if (msg.pageUrl !== undefined && typeof msg.pageUrl !== 'string') return 'steer: pageUrl must be string';
+      return null;
+    default:
+      return 'Unknown event type: ' + msg.type;
+  }
+}

package/dist/builtin/workflows/skills/impeccable/scripts/live-inject.mjs

@@ -116,7 +116,7 @@ Output (JSON):
     if (!fs.existsSync(absFile)) return { file: relFile, error: 'file_not_found' };
     const content = fs.readFileSync(absFile, 'utf-8');
     const withoutOld = revertCspMeta(removeTag(content, config.commentSyntax));
-    const withTag = insertTag(withoutOld, config, port);
+    const withTag = insertTag(withoutOld, config, port, relFile);
     if (withTag === withoutOld) {
       return { file: relFile, error: 'insertion_point_not_found', anchor: config.insertBefore || config.insertAfter };
     }
@@ -256,18 +256,22 @@ function validateConfig(cfg) {
 function commentOpen(syntax) { return syntax === 'jsx' ? '{/*' : '<!--'; }
 function commentClose(syntax) { return syntax === 'jsx' ? '*/}' : '-->'; }
 
-function buildTagBlock(syntax, port) {
+function buildTagBlock(syntax, port, filePath) {
   const open = commentOpen(syntax);
   const close = commentClose(syntax);
+  // Astro processes <script> tags by default and rewrites src to its own
+  // bundled URL. is:inline opts out so the literal external src survives.
+  const isAstro = typeof filePath === 'string' && filePath.endsWith('.astro');
+  const scriptAttrs = isAstro ? 'is:inline ' : '';
   return (
     open + ' ' + MARKER_OPEN_TEXT + ' ' + close + '\n' +
-    '<script src="http://localhost:' + port + '/live.js"></script>\n' +
+    '<script ' + scriptAttrs + 'src="http://localhost:' + port + '/live.js"></script>\n' +
     open + ' ' + MARKER_CLOSE_TEXT + ' ' + close + '\n'
   );
 }
 
-function insertTag(content, config, port) {
-  const block = buildTagBlock(config.commentSyntax, port);
+function insertTag(content, config, port, filePath) {
+  const block = buildTagBlock(config.commentSyntax, port, filePath);
   // insertBefore: match the LAST occurrence. Anchors like `</body>` naturally
   // belong at the end, and the same literal can appear earlier in code blocks
   // within rendered documentation pages.
@@ -299,12 +303,21 @@ function insertTag(content, config, port) {
  */
 function removeTag(content, _syntax) {
   const patterns = [
-    /([ \t]*)<!--\s*impeccable-live-start\s*-->[\s\S]*?<!--\s*impeccable-live-end\s*-->[ \t]*\n/,
-    /([ \t]*)\{\/\*\s*impeccable-live-start\s*\*\/\}[\s\S]*?\{\/\*\s*impeccable-live-end\s*\*\/\}[ \t]*\n/,
+    /([ \t]*)<!--\s*impeccable-live-start\s*-->[\s\S]*?<!--\s*impeccable-live-end\s*-->([ \t]*(?:\n|$)?)/,
+    /([ \t]*)\{\/\*\s*impeccable-live-start\s*\*\/\}[\s\S]*?\{\/\*\s*impeccable-live-end\s*\*\/\}([ \t]*(?:\n|$)?)/,
   ];
   for (const pat of patterns) {
-    const next = content.replace(pat, '$1');
-    if (next !== content) return next;
+    let changed = false;
+    let next = content;
+    do {
+      content = next;
+      next = content.replace(pat, (_match, leadingIndent, trailing = '') => {
+        if (trailing.includes('\n')) return leadingIndent;
+        return leadingIndent || trailing || '';
+      });
+      if (next !== content) changed = true;
+    } while (next !== content);
+    if (changed) return next;
   }
   return content;
 }