@jojonax/codex-copilot 1.5.5 → 1.6.0

package/src/utils/json.js

@@ -1,220 +1,220 @@
-/**
- * Safe JSON read/write utilities
- * 
- * Provides resilient JSON file operations with:
- * - Auto-repair of common corruption patterns (trailing commas, BOM, control chars)
- * - Truncation recovery via progressive trimming and bracket closure
- * - Atomic writes (temp file + rename) to prevent corruption on crash
- * - Backup creation on auto-repair
- */
-
-import { readFileSync, writeFileSync, existsSync, renameSync, copyFileSync } from 'fs';
-
-/**
- * Read and parse a JSON file with auto-repair on corruption.
- * Creates a .bak backup before overwriting with repaired content.
- * @param {string} filePath - Path to JSON file
- * @returns {any} Parsed JSON data
- * @throws {Error} If JSON is unrecoverable
- */
-export function readJSON(filePath) {
-  let raw = readFileSync(filePath, 'utf-8');
-  // Strip BOM if present
-  if (raw.charCodeAt(0) === 0xFEFF) raw = raw.slice(1);
-  try {
-    return JSON.parse(raw);
-  } catch (firstErr) {
-    const data = tryRepair(raw);
-    if (data !== null) {
-      // Save repaired version and backup original
-      try {
-        copyFileSync(filePath, filePath + '.bak');
-        writeJSON(filePath, data);
-      } catch { /* best effort */ }
-      return data;
-    }
-    throw new Error(`Invalid JSON in ${filePath}: ${firstErr.message}`);
-  }
-}
-
-/**
- * Multi-strategy JSON repair pipeline.
- * @param {string} raw - Raw file content
- * @returns {any|null} Parsed data or null if all strategies fail
- */
-function tryRepair(raw) {
-  // Strategy 0: Strip git conflict markers (<<<<<<, ======, >>>>>>)
-  // Keep the "ours" side (before =======) and discard "theirs" (after =======)
-  let cleaned = raw.replace(
-    /^<{4,}[^\n]*\n((?:(?!^={4,})[\s\S])*?)^={4,}[^\n]*\n(?:(?:(?!^>{4,})[\s\S])*?)^>{4,}[^\n]*/gm,
-    '$1'
-  );
-
-  // Strategy 1: Basic cleanup (trailing commas, control chars)
-  cleaned = cleaned
-    .replace(/,\s*([}\]])/g, '$1')
-    .replace(/[\x00-\x08\x0E-\x1F]/g, '')
-    .trim();
-
-  let result = tryParse(cleaned);
-  if (result !== null) return result;
-
-  // Strategy 2: Truncation recovery — find the last complete } or ] and close
-  // Work backwards: try truncating at each } or ] from the end
-  for (let i = cleaned.length - 1; i >= 0; i--) {
-    if (cleaned[i] === '}' || cleaned[i] === ']') {
-      let candidate = cleaned.substring(0, i + 1);
-      candidate = closeBrackets(candidate);
-      result = tryParse(candidate);
-      if (result !== null) return result;
-
-      // Also try stripping garbage prefix (start from first open bracket)
-      const firstOpen = findFirstOpen(candidate);
-      if (firstOpen > 0) {
-        let stripped = candidate.substring(firstOpen);
-        stripped = closeBrackets(stripped);
-        result = tryParse(stripped);
-        if (result !== null) return result;
-      }
-    }
-  }
-
-  // Strategy 3: Extract {…} or […] from garbage-surrounded content
-  const firstOpen = findFirstOpen(cleaned);
-  if (firstOpen >= 0) {
-    // Find the last } or ] in the string
-    const lastClose = Math.max(cleaned.lastIndexOf('}'), cleaned.lastIndexOf(']'));
-    if (lastClose > firstOpen) {
-      let candidate = cleaned.substring(firstOpen, lastClose + 1);
-      candidate = closeBrackets(candidate);
-      result = tryParse(candidate);
-      if (result !== null) return result;
-    }
-    // Also try from firstOpen to end with bracket closing
-    let candidate = cleaned.substring(firstOpen);
-    candidate = closeBrackets(candidate);
-    result = tryParse(candidate);
-    if (result !== null) return result;
-  }
-
-  return null;
-}
-
-/**
- * Find the first { or [ in a string
- */
-function findFirstOpen(s) {
-  for (let i = 0; i < s.length; i++) {
-    if (s[i] === '{' || s[i] === '[') return i;
-  }
-  return -1;
-}
-
-/**
- * Close unmatched brackets/braces in a JSON string.
- * Properly handles strings (doesn't count brackets inside quoted strings).
- */
-function closeBrackets(s) {
-  const stack = [];
-  let inString = false;
-  let escaped = false;
-
-  for (let i = 0; i < s.length; i++) {
-    const ch = s[i];
-    if (escaped) { escaped = false; continue; }
-    if (ch === '\\' && inString) { escaped = true; continue; }
-    if (ch === '"') { inString = !inString; continue; }
-    if (inString) continue;
-    if (ch === '{') stack.push('}');
-    else if (ch === '[') stack.push(']');
-    else if (ch === '}' || ch === ']') {
-      if (stack.length > 0) stack.pop();
-    }
-  }
-
-  // Append closers in reverse order
-  while (stack.length > 0) s += stack.pop();
-  return s;
-}
-
-/**
- * Try to parse JSON, return data or null.
- */
-function tryParse(s) {
-  try {
-    return JSON.parse(s);
-  } catch {
-    return null;
-  }
-}
-
-/**
- * Write JSON data to file atomically (temp file + rename).
- * Prevents corruption if process is killed mid-write.
- * @param {string} filePath - Path to JSON file
- * @param {any} data - Data to serialize
- */
-export function writeJSON(filePath, data) {
-  const tempPath = filePath + '.tmp';
-  const content = JSON.stringify(data, null, 2);
-
-  // B4: Disk space protection — catch ENOSPC/EDQUOT errors with clear message
-  try {
-    writeFileSync(tempPath, content);
-  } catch (writeErr) {
-    if (writeErr.code === 'ENOSPC' || writeErr.code === 'EDQUOT') {
-      throw new Error(`Disk full — cannot write ${filePath}. Free up space and retry.`);
-    }
-    if (writeErr.code === 'EACCES' || writeErr.code === 'EPERM') {
-      throw new Error(`Permission denied — cannot write ${filePath}. Check file/directory permissions.`);
-    }
-    throw writeErr;
-  }
-
-  renameSync(tempPath, filePath);
-
-  // Write-back verification: ensure what we wrote is valid and readable
-  try {
-    const readBack = readFileSync(filePath, 'utf-8');
-    JSON.parse(readBack);
-  } catch (verifyErr) {
-    // Write succeeded but verification failed — attempt direct overwrite
-    writeFileSync(filePath, content);
-  }
-}
-
-/**
- * Deep repair of a severely corrupted JSON file.
- * Tries readJSON's repair pipeline, then falls back to .bak file.
- * Used by the fix command when readJSON fails.
- * @param {string} filePath - Path to corrupted JSON file
- * @returns {any} Parsed JSON data
- * @throws {Error} If all repair strategies fail
- */
-export function repairRawJSON(filePath) {
-  let raw = readFileSync(filePath, 'utf-8');
-  if (raw.charCodeAt(0) === 0xFEFF) raw = raw.slice(1);
-
-  // Try the full repair pipeline
-  const data = tryRepair(raw);
-  if (data !== null) {
-    try {
-      copyFileSync(filePath, filePath + '.bak');
-      writeJSON(filePath, data);
-    } catch { /* best effort */ }
-    return data;
-  }
-
-  // Try to recover from .bak file
-  const bakPath = filePath + '.bak';
-  if (existsSync(bakPath)) {
-    try {
-      const bakRaw = readFileSync(bakPath, 'utf-8');
-      const bakData = tryRepair(bakRaw) ?? JSON.parse(bakRaw);
-      writeJSON(filePath, bakData);
-      return bakData;
-    } catch { /* backup also corrupt */ }
-  }
-
-  throw new Error(`All repair strategies failed for ${filePath}`);
-}
+/**
+ * Safe JSON read/write utilities
+ * 
+ * Provides resilient JSON file operations with:
+ * - Auto-repair of common corruption patterns (trailing commas, BOM, control chars)
+ * - Truncation recovery via progressive trimming and bracket closure
+ * - Atomic writes (temp file + rename) to prevent corruption on crash
+ * - Backup creation on auto-repair
+ */
+
+import { readFileSync, writeFileSync, existsSync, renameSync, copyFileSync } from 'fs';
+
+/**
+ * Read and parse a JSON file with auto-repair on corruption.
+ * Creates a .bak backup before overwriting with repaired content.
+ * @param {string} filePath - Path to JSON file
+ * @returns {any} Parsed JSON data
+ * @throws {Error} If JSON is unrecoverable
+ */
+export function readJSON(filePath) {
+  let raw = readFileSync(filePath, 'utf-8');
+  // Strip BOM if present
+  if (raw.charCodeAt(0) === 0xFEFF) raw = raw.slice(1);
+  try {
+    return JSON.parse(raw);
+  } catch (firstErr) {
+    const data = tryRepair(raw);
+    if (data !== null) {
+      // Save repaired version and backup original
+      try {
+        copyFileSync(filePath, filePath + '.bak');
+        writeJSON(filePath, data);
+      } catch { /* best effort */ }
+      return data;
+    }
+    throw new Error(`Invalid JSON in ${filePath}: ${firstErr.message}`);
+  }
+}
+
+/**
+ * Multi-strategy JSON repair pipeline.
+ * @param {string} raw - Raw file content
+ * @returns {any|null} Parsed data or null if all strategies fail
+ */
+function tryRepair(raw) {
+  // Strategy 0: Strip git conflict markers (<<<<<<, ======, >>>>>>)
+  // Keep the "ours" side (before =======) and discard "theirs" (after =======)
+  let cleaned = raw.replace(
+    /^<{4,}[^\n]*\n((?:(?!^={4,})[\s\S])*?)^={4,}[^\n]*\n(?:(?:(?!^>{4,})[\s\S])*?)^>{4,}[^\n]*/gm,
+    '$1'
+  );
+
+  // Strategy 1: Basic cleanup (trailing commas, control chars)
+  cleaned = cleaned
+    .replace(/,\s*([}\]])/g, '$1')
+    .replace(/[\x00-\x08\x0E-\x1F]/g, '')
+    .trim();
+
+  let result = tryParse(cleaned);
+  if (result !== null) return result;
+
+  // Strategy 2: Truncation recovery — find the last complete } or ] and close
+  // Work backwards: try truncating at each } or ] from the end
+  for (let i = cleaned.length - 1; i >= 0; i--) {
+    if (cleaned[i] === '}' || cleaned[i] === ']') {
+      let candidate = cleaned.substring(0, i + 1);
+      candidate = closeBrackets(candidate);
+      result = tryParse(candidate);
+      if (result !== null) return result;
+
+      // Also try stripping garbage prefix (start from first open bracket)
+      const firstOpen = findFirstOpen(candidate);
+      if (firstOpen > 0) {
+        let stripped = candidate.substring(firstOpen);
+        stripped = closeBrackets(stripped);
+        result = tryParse(stripped);
+        if (result !== null) return result;
+      }
+    }
+  }
+
+  // Strategy 3: Extract {…} or […] from garbage-surrounded content
+  const firstOpen = findFirstOpen(cleaned);
+  if (firstOpen >= 0) {
+    // Find the last } or ] in the string
+    const lastClose = Math.max(cleaned.lastIndexOf('}'), cleaned.lastIndexOf(']'));
+    if (lastClose > firstOpen) {
+      let candidate = cleaned.substring(firstOpen, lastClose + 1);
+      candidate = closeBrackets(candidate);
+      result = tryParse(candidate);
+      if (result !== null) return result;
+    }
+    // Also try from firstOpen to end with bracket closing
+    let candidate = cleaned.substring(firstOpen);
+    candidate = closeBrackets(candidate);
+    result = tryParse(candidate);
+    if (result !== null) return result;
+  }
+
+  return null;
+}
+
+/**
+ * Find the first { or [ in a string
+ */
+function findFirstOpen(s) {
+  for (let i = 0; i < s.length; i++) {
+    if (s[i] === '{' || s[i] === '[') return i;
+  }
+  return -1;
+}
+
+/**
+ * Close unmatched brackets/braces in a JSON string.
+ * Properly handles strings (doesn't count brackets inside quoted strings).
+ */
+function closeBrackets(s) {
+  const stack = [];
+  let inString = false;
+  let escaped = false;
+
+  for (let i = 0; i < s.length; i++) {
+    const ch = s[i];
+    if (escaped) { escaped = false; continue; }
+    if (ch === '\\' && inString) { escaped = true; continue; }
+    if (ch === '"') { inString = !inString; continue; }
+    if (inString) continue;
+    if (ch === '{') stack.push('}');
+    else if (ch === '[') stack.push(']');
+    else if (ch === '}' || ch === ']') {
+      if (stack.length > 0) stack.pop();
+    }
+  }
+
+  // Append closers in reverse order
+  while (stack.length > 0) s += stack.pop();
+  return s;
+}
+
+/**
+ * Try to parse JSON, return data or null.
+ */
+function tryParse(s) {
+  try {
+    return JSON.parse(s);
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Write JSON data to file atomically (temp file + rename).
+ * Prevents corruption if process is killed mid-write.
+ * @param {string} filePath - Path to JSON file
+ * @param {any} data - Data to serialize
+ */
+export function writeJSON(filePath, data) {
+  const tempPath = filePath + '.tmp';
+  const content = JSON.stringify(data, null, 2);
+
+  // B4: Disk space protection — catch ENOSPC/EDQUOT errors with clear message
+  try {
+    writeFileSync(tempPath, content);
+  } catch (writeErr) {
+    if (writeErr.code === 'ENOSPC' || writeErr.code === 'EDQUOT') {
+      throw new Error(`Disk full — cannot write ${filePath}. Free up space and retry.`);
+    }
+    if (writeErr.code === 'EACCES' || writeErr.code === 'EPERM') {
+      throw new Error(`Permission denied — cannot write ${filePath}. Check file/directory permissions.`);
+    }
+    throw writeErr;
+  }
+
+  renameSync(tempPath, filePath);
+
+  // Write-back verification: ensure what we wrote is valid and readable
+  try {
+    const readBack = readFileSync(filePath, 'utf-8');
+    JSON.parse(readBack);
+  } catch (verifyErr) {
+    // Write succeeded but verification failed — attempt direct overwrite
+    writeFileSync(filePath, content);
+  }
+}
+
+/**
+ * Deep repair of a severely corrupted JSON file.
+ * Tries readJSON's repair pipeline, then falls back to .bak file.
+ * Used by the fix command when readJSON fails.
+ * @param {string} filePath - Path to corrupted JSON file
+ * @returns {any} Parsed JSON data
+ * @throws {Error} If all repair strategies fail
+ */
+export function repairRawJSON(filePath) {
+  let raw = readFileSync(filePath, 'utf-8');
+  if (raw.charCodeAt(0) === 0xFEFF) raw = raw.slice(1);
+
+  // Try the full repair pipeline
+  const data = tryRepair(raw);
+  if (data !== null) {
+    try {
+      copyFileSync(filePath, filePath + '.bak');
+      writeJSON(filePath, data);
+    } catch { /* best effort */ }
+    return data;
+  }
+
+  // Try to recover from .bak file
+  const bakPath = filePath + '.bak';
+  if (existsSync(bakPath)) {
+    try {
+      const bakRaw = readFileSync(bakPath, 'utf-8');
+      const bakData = tryRepair(bakRaw) ?? JSON.parse(bakRaw);
+      writeJSON(filePath, bakData);
+      return bakData;
+    } catch { /* backup also corrupt */ }
+  }
+
+  throw new Error(`All repair strategies failed for ${filePath}`);
+}

package/src/utils/logger.js

@@ -1,41 +1,41 @@
-/**
- * Logger utility - Unified terminal output styles
- */
-
-const COLORS = {
-  green: '\x1b[32m',
-  yellow: '\x1b[33m',
-  red: '\x1b[31m',
-  cyan: '\x1b[36m',
-  dim: '\x1b[2m',
-  bold: '\x1b[1m',
-  reset: '\x1b[0m',
-};
-
-export const log = {
-  info: (msg) => console.log(`  ${COLORS.green}✔${COLORS.reset}  ${msg}`),
-  warn: (msg) => console.log(`  ${COLORS.yellow}⚠${COLORS.reset}  ${msg}`),
-  error: (msg) => console.log(`  ${COLORS.red}✗${COLORS.reset}  ${msg}`),
-  step: (msg) => console.log(`  ${COLORS.cyan}▶${COLORS.reset}  ${msg}`),
-  dim: (msg) => console.log(`  ${COLORS.dim}${msg}${COLORS.reset}`),
-  title: (msg) => console.log(`  ${COLORS.bold}${msg}${COLORS.reset}`),
-  blank: () => console.log(''),
-};
-
-/**
- * Display a progress bar
- */
-export function progressBar(current, total, label = '') {
-  const width = 30;
-  if (total <= 0) {
-    const bar = '░'.repeat(width);
-    console.log(`  ${COLORS.cyan}[${bar}]${COLORS.reset} 0% ${label}`);
-    return;
-  }
-  const rawRatio = current / total;
-  const ratio = Number.isNaN(rawRatio) ? 0 : Math.max(0, Math.min(1, rawRatio));
-  const filled = Math.round(ratio * width);
-  const bar = '█'.repeat(filled) + '░'.repeat(width - filled);
-  const pct = Math.round(ratio * 100);
-  console.log(`  ${COLORS.cyan}[${bar}]${COLORS.reset} ${pct}% ${label}`);
-}
+/**
+ * Logger utility - Unified terminal output styles
+ */
+
+const COLORS = {
+  green: '\x1b[32m',
+  yellow: '\x1b[33m',
+  red: '\x1b[31m',
+  cyan: '\x1b[36m',
+  dim: '\x1b[2m',
+  bold: '\x1b[1m',
+  reset: '\x1b[0m',
+};
+
+export const log = {
+  info: (msg) => console.log(`  ${COLORS.green}✔${COLORS.reset}  ${msg}`),
+  warn: (msg) => console.log(`  ${COLORS.yellow}⚠${COLORS.reset}  ${msg}`),
+  error: (msg) => console.log(`  ${COLORS.red}✗${COLORS.reset}  ${msg}`),
+  step: (msg) => console.log(`  ${COLORS.cyan}▶${COLORS.reset}  ${msg}`),
+  dim: (msg) => console.log(`  ${COLORS.dim}${msg}${COLORS.reset}`),
+  title: (msg) => console.log(`  ${COLORS.bold}${msg}${COLORS.reset}`),
+  blank: () => console.log(''),
+};
+
+/**
+ * Display a progress bar
+ */
+export function progressBar(current, total, label = '') {
+  const width = 30;
+  if (total <= 0) {
+    const bar = '░'.repeat(width);
+    console.log(`  ${COLORS.cyan}[${bar}]${COLORS.reset} 0% ${label}`);
+    return;
+  }
+  const rawRatio = current / total;
+  const ratio = Number.isNaN(rawRatio) ? 0 : Math.max(0, Math.min(1, rawRatio));
+  const filled = Math.round(ratio * width);
+  const bar = '█'.repeat(filled) + '░'.repeat(width - filled);
+  const pct = Math.round(ratio * 100);
+  console.log(`  ${COLORS.cyan}[${bar}]${COLORS.reset} ${pct}% ${label}`);
+}

package/src/utils/prompt.js

@@ -1,49 +1,49 @@
-/**
- * Interactive terminal utilities
- */
-
-import { createInterface } from 'readline';
-
-const rl = createInterface({ input: process.stdin, output: process.stdout });
-
-/**
- * Ask a question and wait for user input
- */
-export function ask(question) {
-  return new Promise((resolve) => {
-    rl.question(`  ${question} `, (answer) => {
-      resolve(answer.trim());
-    });
-  });
-}
-
-/**
- * Yes/No confirmation
- */
-export async function confirm(question, defaultYes = true) {
-  const hint = defaultYes ? '(Y/n)' : '(y/N)';
-  const answer = await ask(`${question} ${hint}:`);
-  if (!answer) return defaultYes;
-  return answer.toLowerCase().startsWith('y');
-}
-
-/**
- * Select from a list
- */
-export async function select(question, choices) {
-  console.log(`  ${question}`);
-  for (let i = 0; i < choices.length; i++) {
-    console.log(`    ${i + 1}. ${choices[i].label}`);
-  }
-  const answer = await ask('Enter number:');
-  const idx = parseInt(answer) - 1;
-  if (idx >= 0 && idx < choices.length) return choices[idx];
-  return choices[0]; // Default to first
-}
-
-/**
- * Close readline interface
- */
-export function closePrompt() {
-  rl.close();
-}
+/**
+ * Interactive terminal utilities
+ */
+
+import { createInterface } from 'readline';
+
+const rl = createInterface({ input: process.stdin, output: process.stdout });
+
+/**
+ * Ask a question and wait for user input
+ */
+export function ask(question) {
+  return new Promise((resolve) => {
+    rl.question(`  ${question} `, (answer) => {
+      resolve(answer.trim());
+    });
+  });
+}
+
+/**
+ * Yes/No confirmation
+ */
+export async function confirm(question, defaultYes = true) {
+  const hint = defaultYes ? '(Y/n)' : '(y/N)';
+  const answer = await ask(`${question} ${hint}:`);
+  if (!answer) return defaultYes;
+  return answer.toLowerCase().startsWith('y');
+}
+
+/**
+ * Select from a list
+ */
+export async function select(question, choices) {
+  console.log(`  ${question}`);
+  for (let i = 0; i < choices.length; i++) {
+    console.log(`    ${i + 1}. ${choices[i].label}`);
+  }
+  const answer = await ask('Enter number:');
+  const idx = parseInt(answer) - 1;
+  if (idx >= 0 && idx < choices.length) return choices[idx];
+  return choices[0]; // Default to first
+}
+
+/**
+ * Close readline interface
+ */
+export function closePrompt() {
+  rl.close();
+}