npm - @zoebuildsai/trace - Versions diffs - 1.5.0 - Mend

@zoebuildsai/trace 1.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (130) hide show

package/.gitignore +115 -0
package/.trace/progress.json +22 -0
package/README.md +466 -0
package/RELEASE-NOTES-1.5.0.md +410 -0
package/STATUS.md +245 -0
package/dist/auto-commit.d.ts +66 -0
package/dist/auto-commit.d.ts.map +1 -0
package/dist/auto-commit.js +180 -0
package/dist/auto-commit.js.map +1 -0
package/dist/cli.d.ts +7 -0
package/dist/cli.d.ts.map +1 -0
package/dist/cli.js +246 -0
package/dist/cli.js.map +1 -0
package/dist/commands.d.ts +46 -0
package/dist/commands.d.ts.map +1 -0
package/dist/commands.js +256 -0
package/dist/commands.js.map +1 -0
package/dist/diff.d.ts +23 -0
package/dist/diff.d.ts.map +1 -0
package/dist/diff.js +106 -0
package/dist/diff.js.map +1 -0
package/dist/github.d.ts.map +1 -0
package/dist/github.js.map +1 -0
package/dist/index-cache.d.ts +35 -0
package/dist/index-cache.d.ts.map +1 -0
package/dist/index-cache.js +114 -0
package/dist/index-cache.js.map +1 -0
package/dist/index.d.ts +15 -0
package/dist/index.d.ts.map +1 -0
package/dist/index.js +25 -0
package/dist/index.js.map +1 -0
package/dist/storage.d.ts +45 -0
package/dist/storage.d.ts.map +1 -0
package/dist/storage.js +151 -0
package/dist/storage.js.map +1 -0
package/dist/sync.d.ts +60 -0
package/dist/sync.js +184 -0
package/dist/tags.d.ts +85 -0
package/dist/tags.d.ts.map +1 -0
package/dist/tags.js +219 -0
package/dist/tags.js.map +1 -0
package/dist/types.d.ts +102 -0
package/dist/types.d.ts.map +1 -0
package/dist/types.js +6 -0
package/dist/types.js.map +1 -0
package/docs/.nojekyll +0 -0
package/docs/README.md +73 -0
package/docs/_config.yml +2 -0
package/docs/index.html +960 -0
package/docs-website/package.json +20 -0
package/jest.config.js +21 -0
package/package.json +50 -0
package/scripts/init.ts +290 -0
package/src/agent-audit.ts +270 -0
package/src/agent-checkout.ts +227 -0
package/src/agent-coordination.ts +318 -0
package/src/async-queue.ts +203 -0
package/src/auto-branching.ts +279 -0
package/src/auto-commit.ts +166 -0
package/src/cherry-pick.ts +252 -0
package/src/chunked-upload.ts +224 -0
package/src/cli-v2.ts +335 -0
package/src/cli.ts +318 -0
package/src/cliff-detection.ts +232 -0
package/src/commands.ts +267 -0
package/src/commit-hash-system.ts +351 -0
package/src/compression.ts +176 -0
package/src/conflict-resolution-ui.ts +277 -0
package/src/conflict-visualization.ts +238 -0
package/src/diff-formatter.ts +184 -0
package/src/diff.ts +124 -0
package/src/distributed-coordination.ts +273 -0
package/src/git-interop.ts +316 -0
package/src/index-cache.ts +88 -0
package/src/index.ts +38 -0
package/src/merge-engine.ts +143 -0
package/src/message-search.ts +370 -0
package/src/performance-monitoring.ts +236 -0
package/src/rebase.ts +327 -0
package/src/rollback.ts +215 -0
package/src/semantic-grouping.ts +245 -0
package/src/stage-area.ts +324 -0
package/src/stash.ts +278 -0
package/src/storage.ts +131 -0
package/src/sync.ts +205 -0
package/src/tags.ts +244 -0
package/src/types.ts +119 -0
package/src/webhooks.ts +119 -0
package/src/workspace-isolation.ts +298 -0
package/tests/auto-commit.test.ts +308 -0
package/tests/checkout.test.ts +136 -0
package/tests/commit.test.ts +118 -0
package/tests/diff.test.ts +191 -0
package/tests/github.test.ts +94 -0
package/tests/integration.test.ts +267 -0
package/tests/log.test.ts +125 -0
package/tests/phase2-integration.test.ts +370 -0
package/tests/storage.test.ts +167 -0
package/tests/tags.test.ts +477 -0
package/tests/types.test.ts +75 -0
package/tests/v1.1/agent-audit.test.ts +472 -0
package/tests/v1.1/agent-coordination.test.ts +308 -0
package/tests/v1.1/async-queue.test.ts +253 -0
package/tests/v1.1/comprehensive.test.ts +521 -0
package/tests/v1.1/diff-formatter.test.ts +238 -0
package/tests/v1.1/integration.test.ts +389 -0
package/tests/v1.1/onboarding.test.ts +365 -0
package/tests/v1.1/rollback.test.ts +370 -0
package/tests/v1.1/semantic-grouping.test.ts +230 -0
package/tests/v1.2/chunked-upload.test.ts +301 -0
package/tests/v1.2/cliff-detection.test.ts +272 -0
package/tests/v1.2/commit-hash-system.test.ts +288 -0
package/tests/v1.2/compression.test.ts +220 -0
package/tests/v1.2/conflict-visualization.test.ts +263 -0
package/tests/v1.2/distributed.test.ts +261 -0
package/tests/v1.2/performance-monitoring.test.ts +328 -0
package/tests/v1.3/auto-branching.test.ts +270 -0
package/tests/v1.3/message-search.test.ts +264 -0
package/tests/v1.3/stage-area.test.ts +330 -0
package/tests/v1.3/stash-rebase-cherry-pick.test.ts +361 -0
package/tests/v1.4/cli.test.ts +171 -0
package/tests/v1.4/conflict-resolution-advanced.test.ts +429 -0
package/tests/v1.4/conflict-resolution-ui.test.ts +286 -0
package/tests/v1.4/workspace-isolation-advanced.test.ts +382 -0
package/tests/v1.4/workspace-isolation.test.ts +268 -0
package/tests/v1.5/agent-coordination.real.test.ts +401 -0
package/tests/v1.5/cli-v2.test.ts +354 -0
package/tests/v1.5/git-interop.real.test.ts +358 -0
package/tests/v1.5/integration-testing.real.test.ts +440 -0
package/tsconfig.json +26 -0

package/src/conflict-resolution-ui.ts ADDED Viewed

@@ -0,0 +1,277 @@
+/**
+ * Conflict Resolution UI for Trace
+ * Visual & interactive conflict resolution
+ */
+export interface ConflictMarker {
+  startLine: number;
+  endLine: number;
+  oursStart: number;
+  oursEnd: number;
+  theirsStart: number;
+  theirsEnd: number;
+}
+export interface ConflictResolution {
+  file: string;
+  resolution: 'ours' | 'theirs' | 'manual' | 'combined';
+  marker: ConflictMarker;
+  resolvedContent?: string;
+}
+export class ConflictResolutionUI {
+  /**
+   * Render conflict in interactive HTML
+   */
+  static renderHTML(file: string, ours: string, theirs: string, base: string): string {
+    const oursLines = ours.split('\n');
+    const theirsLines = theirs.split('\n');
+    const baseLines = base.split('\n');
+    const html = `
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Trace Conflict Resolution: ${file}</title>
+  <style>
+    * { margin: 0; padding: 0; font-family: monospace; }
+    body { background: #f5f5f5; padding: 20px; }
+    .container { max-width: 1200px; margin: 0 auto; background: white; padding: 20px; border-radius: 8px; }
+    .header { border-bottom: 2px solid #333; margin-bottom: 20px; padding-bottom: 10px; }
+    h1 { font-size: 24px; margin-bottom: 5px; }
+    .file-path { color: #666; font-size: 14px; }
+    .conflict-container { display: grid; grid-template-columns: 1fr 1fr; gap: 20px; margin-bottom: 20px; }
+    .section { border: 1px solid #ddd; border-radius: 4px; overflow: hidden; }
+    .section-header { background: #f0f0f0; padding: 10px; font-weight: bold; border-bottom: 1px solid #ddd; }
+    .section-header.ours { color: #2196F3; }
+    .section-header.theirs { color: #FF9800; }
+    .section-header.base { color: #999; }
+    .content { padding: 15px; max-height: 400px; overflow-y: auto; }
+    .line { display: flex; }
+    .line-num { width: 40px; background: #f9f9f9; padding: 5px; text-align: right; color: #999; border-right: 1px solid #eee; }
+    .line-content { flex: 1; padding: 5px 10px; white-space: pre-wrap; }
+    .actions { margin-top: 20px; padding-top: 20px; border-top: 1px solid #ddd; display: flex; gap: 10px; }
+    button { padding: 10px 20px; border: none; border-radius: 4px; cursor: pointer; font-size: 14px; }
+    .btn-ours { background: #2196F3; color: white; }
+    .btn-theirs { background: #FF9800; color: white; }
+    .btn-manual { background: #4CAF50; color: white; }
+    .btn-skip { background: #999; color: white; }
+    button:hover { opacity: 0.9; }
+    .stats { background: #f0f0f0; padding: 15px; margin-bottom: 20px; border-radius: 4px; }
+    .stat-row { display: flex; justify-content: space-between; margin-bottom: 5px; }
+  </style>
+</head>
+<body>
+  <div class="container">
+    <div class="header">
+      <h1>🔀 Conflict Resolution</h1>
+      <div class="file-path">File: ${file}</div>
+    </div>
+    <div class="stats">
+      <div class="stat-row">
+        <span>Your Version (Ours):</span>
+        <strong>${oursLines.length} lines</strong>
+      </div>
+      <div class="stat-row">
+        <span>Incoming Version (Theirs):</span>
+        <strong>${theirsLines.length} lines</strong>
+      </div>
+      <div class="stat-row">
+        <span>Base Version:</span>
+        <strong>${baseLines.length} lines</strong>
+      </div>
+    </div>
+    <div class="conflict-container">
+      <div class="section">
+        <div class="section-header ours">✓ Your Changes (Ours)</div>
+        <div class="content">
+          ${oursLines.map((line, i) => `<div class="line"><div class="line-num">${i + 1}</div><div class="line-content">${this.escapeHtml(line)}</div></div>`).join('')}
+        </div>
+      </div>
+      <div class="section">
+        <div class="section-header theirs">⚡ Incoming Changes (Theirs)</div>
+        <div class="content">
+          ${theirsLines.map((line, i) => `<div class="line"><div class="line-num">${i + 1}</div><div class="line-content">${this.escapeHtml(line)}</div></div>`).join('')}
+        </div>
+      </div>
+    </div>
+    <div class="section">
+      <div class="section-header base">Base Version</div>
+      <div class="content">
+        ${baseLines.map((line, i) => `<div class="line"><div class="line-num">${i + 1}</div><div class="line-content">${this.escapeHtml(line)}</div></div>`).join('')}
+      </div>
+    </div>
+    <div class="actions">
+      <button class="btn-ours" onclick="resolve('ours')">✓ Use Ours</button>
+      <button class="btn-theirs" onclick="resolve('theirs')">⚡ Use Theirs</button>
+      <button class="btn-manual" onclick="resolve('manual')">✏️ Manual Merge</button>
+      <button class="btn-skip" onclick="resolve('skip')">⏭️ Skip</button>
+    </div>
+  </div>
+  <script>
+    function resolve(choice) {
+      console.log('Resolved:', choice);
+      // In real implementation, would send back to CLI/agent
+    }
+  </script>
+</body>
+</html>
+    `;
+    return html;
+  }
+  /**
+   * Render conflict in terminal (TUI)
+   */
+  static renderTerminal(
+    file: string,
+    ours: string[],
+    theirs: string[],
+    base: string[]
+  ): string {
+    let output = `\n🔀 CONFLICT RESOLUTION: ${file}\n`;
+    output += `${'='.repeat(70)}\n\n`;
+    output += `YOURS (Current Branch):\n`;
+    output += `${'-'.repeat(70)}\n`;
+    ours.slice(0, 10).forEach((line, i) => {
+      output += `${(i + 1).toString().padEnd(3)} | ${line}\n`;
+    });
+    if (ours.length > 10) output += `... +${ours.length - 10} more lines\n`;
+    output += `\nTHEIRS (Incoming Changes):\n`;
+    output += `${'-'.repeat(70)}\n`;
+    theirs.slice(0, 10).forEach((line, i) => {
+      output += `${(i + 1).toString().padEnd(3)} | ${line}\n`;
+    });
+    if (theirs.length > 10) output += `... +${theirs.length - 10} more lines\n`;
+    output += `\nBASE (Common Ancestor):\n`;
+    output += `${'-'.repeat(70)}\n`;
+    base.slice(0, 5).forEach((line, i) => {
+      output += `${(i + 1).toString().padEnd(3)} | ${line}\n`;
+    });
+    if (base.length > 5) output += `... +${base.length - 5} more lines\n`;
+    output += `\n${'-'.repeat(70)}\n`;
+    output += `RESOLUTION OPTIONS:\n`;
+    output += `  [o] Use OURS (current branch changes)\n`;
+    output += `  [t] Use THEIRS (incoming changes)\n`;
+    output += `  [m] MANUAL (combine both)\n`;
+    output += `  [s] SKIP (resolve later)\n`;
+    output += `${'-'.repeat(70)}\n`;
+    return output;
+  }
+  /**
+   * Suggest resolution based on heuristics
+   */
+  static suggestResolution(
+    ours: string,
+    theirs: string,
+    base: string
+  ): { suggestion: string; confidence: number; reason: string } {
+    const ourLength = ours.length;
+    const theirLength = theirs.length;
+    const baseLength = base.length;
+    // Simple heuristic: prefer shorter diffs
+    if (Math.abs(ourLength - baseLength) < Math.abs(theirLength - baseLength)) {
+      return {
+        suggestion: 'ours',
+        confidence: 0.7,
+        reason: 'Ours diff is smaller (less likely to break)',
+      };
+    }
+    if (Math.abs(theirLength - baseLength) < Math.abs(ourLength - baseLength)) {
+      return {
+        suggestion: 'theirs',
+        confidence: 0.7,
+        reason: 'Theirs diff is smaller (less likely to break)',
+      };
+    }
+    return {
+      suggestion: 'manual',
+      confidence: 0.5,
+      reason: 'Both diffs are similar - manual review recommended',
+    };
+  }
+  /**
+   * Parse conflict markers
+   */
+  static parseConflictMarkers(content: string): {
+    hasConflicts: boolean;
+    markers: ConflictMarker[];
+  } {
+    const lines = content.split('\n');
+    const markers: ConflictMarker[] = [];
+    let i = 0;
+    while (i < lines.length) {
+      if (lines[i].startsWith('<<<<<<< ')) {
+        const startLine = i;
+        let oursEnd = i;
+        let theirsStart = i;
+        let theirsEnd = i;
+        // Find separator
+        while (i < lines.length && !lines[i].startsWith('=======')) {
+          i++;
+        }
+        oursEnd = i;
+        theirsStart = i + 1;
+        // Find end
+        while (i < lines.length && !lines[i].startsWith('>>>>>>>')) {
+          i++;
+        }
+        theirsEnd = i - 1;
+        markers.push({
+          startLine,
+          endLine: i,
+          oursStart: startLine + 1,
+          oursEnd,
+          theirsStart,
+          theirsEnd,
+        });
+      }
+      i++;
+    }
+    return {
+      hasConflicts: markers.length > 0,
+      markers,
+    };
+  }
+  /**
+   * Escape HTML special characters
+   */
+  private static escapeHtml(text: string): string {
+    return text
+      .replace(/&/g, '&amp;')
+      .replace(/</g, '&lt;')
+      .replace(/>/g, '&gt;')
+      .replace(/"/g, '&quot;')
+      .replace(/'/g, '&#039;');
+  }
+}
+export default ConflictResolutionUI;

package/src/conflict-visualization.ts ADDED Viewed

@@ -0,0 +1,238 @@
+/**
+ * Conflict Visualization for Trace
+ * Render merge conflicts in human/agent readable format
+ */
+export interface ConflictHunk {
+  startLine: number;
+  endLine: number;
+  ours: string[];
+  theirs: string[];
+}
+export interface ConflictMarker {
+  type: 'start' | 'divider' | 'end';
+  agentA: string;
+  agentB: string;
+  line: number;
+}
+export interface VisualizedConflict {
+  file: string;
+  format: 'ascii' | 'json' | 'html';
+  content: string;
+  hunks: ConflictHunk[];
+}
+export class ConflictVisualization {
+  /**
+   * Render conflict as ASCII (human-readable)
+   */
+  static toASCII(file: string, hunks: ConflictHunk[], agentA: string, agentB: string): string {
+    const lines: string[] = [];
+    lines.push(`╔═══════════════════════════════════════════╗`);
+    lines.push(`║ CONFLICT: ${file}`);
+    lines.push(`║ ${agentA} vs ${agentB}`);
+    lines.push(`╚═══════════════════════════════════════════╝\n`);
+    for (let i = 0; i < hunks.length; i++) {
+      const hunk = hunks[i];
+      lines.push(`┌─ Conflict ${i + 1} (lines ${hunk.startLine}-${hunk.endLine}) ─┐\n`);
+      lines.push(`╭─ ${agentA} ─────────────────────────`);
+      for (const line of hunk.ours) {
+        lines.push(`│ ${line}`);
+      }
+      lines.push(`╰───────────────────────────────────────`);
+      lines.push(``);
+      lines.push(`╭─ ${agentB} ─────────────────────────`);
+      for (const line of hunk.theirs) {
+        lines.push(`│ ${line}`);
+      }
+      lines.push(`╰───────────────────────────────────────`);
+      lines.push(`\n`);
+    }
+    return lines.join('\n');
+  }
+  /**
+   * Render conflict as JSON (machine-readable for agents)
+   */
+  static toJSON(file: string, hunks: ConflictHunk[], agentA: string, agentB: string): string {
+    const conflict = {
+      file,
+      agentA,
+      agentB,
+      timestamp: new Date().toISOString(),
+      hunks: hunks.map((h, i) => ({
+        index: i,
+        startLine: h.startLine,
+        endLine: h.endLine,
+        ours: h.ours,
+        theirs: h.theirs,
+        oursCount: h.ours.length,
+        theirsCount: h.theirs.length,
+      })),
+      totalHunks: hunks.length,
+    };
+    return JSON.stringify(conflict, null, 2);
+  }
+  /**
+   * Render conflict as HTML (visual UI)
+   */
+  static toHTML(file: string, hunks: ConflictHunk[], agentA: string, agentB: string): string {
+    let html = `
+<html>
+<head>
+  <style>
+    body { font-family: monospace; background: #f5f5f5; }
+    .conflict { background: #fff; border: 1px solid #ccc; margin: 10px; padding: 10px; }
+    .file-header { font-weight: bold; color: #d00; margin-bottom: 10px; }
+    .hunk { margin: 10px 0; border: 1px solid #ddd; }
+    .agent-a { background: #ffe0e0; border-left: 3px solid #f00; padding: 5px; }
+    .agent-b { background: #e0f0ff; border-left: 3px solid #00f; padding: 5px; }
+    .line { margin: 2px 0; }
+  </style>
+</head>
+<body>
+  <div class="conflict">
+    <div class="file-header">CONFLICT: ${file}</div>
+    <div>Agent: ${agentA} vs ${agentB}</div>
+    <div style="margin-top: 10px;">`;
+    for (let i = 0; i < hunks.length; i++) {
+      const hunk = hunks[i];
+      html += `
+      <div class="hunk">
+        <div style="font-weight: bold; margin-bottom: 5px;">Conflict ${i + 1} (lines ${hunk.startLine}-${hunk.endLine})</div>
+        <div class="agent-a">
+          <strong>${agentA}:</strong>
+          ${hunk.ours.map(line => `<div class="line">${line}</div>`).join('')}
+        </div>
+        <div class="agent-b" style="margin-top: 5px;">
+          <strong>${agentB}:</strong>
+          ${hunk.theirs.map(line => `<div class="line">${line}</div>`).join('')}
+        </div>
+      </div>`;
+    }
+    html += `
+    </div>
+  </div>
+</body>
+</html>`;
+    return html;
+  }
+  /**
+   * Render with standard git conflict markers
+   */
+  static toGitFormat(hunks: ConflictHunk[], agentA: string, agentB: string): string {
+    const lines: string[] = [];
+    for (const hunk of hunks) {
+      lines.push(`<<<<<<< ${agentA}`);
+      lines.push(...hunk.ours);
+      lines.push(`=======`);
+      lines.push(...hunk.theirs);
+      lines.push(`>>>>>>> ${agentB}`);
+      lines.push('');
+    }
+    return lines.join('\n');
+  }
+  /**
+   * Parse git conflict markers
+   */
+  static parseGitMarkers(content: string, agentA: string, agentB: string): ConflictHunk[] {
+    const hunks: ConflictHunk[] = [];
+    const lines = content.split('\n');
+    let i = 0;
+    while (i < lines.length) {
+      if (lines[i].startsWith('<<<<<<< ')) {
+        const startLine = i;
+        const ours: string[] = [];
+        let theirsStart = -1;
+        i++;
+        while (i < lines.length && !lines[i].startsWith('=======')) {
+          ours.push(lines[i]);
+          i++;
+        }
+        if (i < lines.length && lines[i].startsWith('=======')) {
+          theirsStart = i;
+          i++;
+        }
+        const theirs: string[] = [];
+        while (i < lines.length && !lines[i].startsWith('>>>>>>> ')) {
+          theirs.push(lines[i]);
+          i++;
+        }
+        if (i < lines.length && lines[i].startsWith('>>>>>>> ')) {
+          hunks.push({
+            startLine,
+            endLine: i,
+            ours,
+            theirs,
+          });
+          i++;
+        }
+      } else {
+        i++;
+      }
+    }
+    return hunks;
+  }
+  /**
+   * Suggest resolution (side with fewer changes or shorter diff)
+   */
+  static suggestResolution(hunks: ConflictHunk[], agentA: string, agentB: string): string {
+    let totalOurs = 0;
+    let totalTheirs = 0;
+    for (const hunk of hunks) {
+      totalOurs += hunk.ours.join('').length;
+      totalTheirs += hunk.theirs.join('').length;
+    }
+    return totalOurs <= totalTheirs ? agentA : agentB;
+  }
+  /**
+   * Calculate conflict statistics
+   */
+  static getStats(hunks: ConflictHunk[]): {
+    totalHunks: number;
+    totalLinesInConflict: number;
+    avgHunkSize: number;
+  } {
+    let totalLines = 0;
+    for (const hunk of hunks) {
+      totalLines += hunk.ours.length + hunk.theirs.length;
+    }
+    return {
+      totalHunks: hunks.length,
+      totalLinesInConflict: totalLines,
+      avgHunkSize: hunks.length > 0 ? totalLines / hunks.length : 0,
+    };
+  }
+}
+export default ConflictVisualization;

package/src/diff-formatter.ts ADDED Viewed

@@ -0,0 +1,184 @@
+/**
+ * Diff Formatter for Trace
+ * Outputs diffs in multiple formats: JSON (for agents), ASCII (for humans), Timeline
+ */
+export interface DiffEntry {
+  path: string;
+  type: 'add' | 'modify' | 'delete';
+  lines?: { added: number; removed: number; changed: number };
+  size?: { before: number; after: number };
+}
+export interface DiffOutput {
+  format: 'json' | 'ascii' | 'timeline';
+  files: DiffEntry[];
+  summary: {
+    total: number;
+    added: number;
+    modified: number;
+    deleted: number;
+    totalLinesChanged: number;
+  };
+}
+export class DiffFormatter {
+  /**
+   * Parse git diff output into structured format
+   */
+  static parseGitDiff(gitOutput: string): DiffEntry[] {
+    const lines = gitOutput.split('\n');
+    const entries: DiffEntry[] = [];
+    let current: DiffEntry | null = null;
+    for (const line of lines) {
+      if (line.startsWith('diff --git')) {
+        // Extract path from: diff --git a/path b/path
+        const match = line.match(/b\/(.+)$/);
+        if (match) {
+          if (current) entries.push(current);
+          current = {
+            path: match[1],
+            type: 'modify',
+            lines: { added: 0, removed: 0, changed: 0 },
+          };
+        }
+      } else if (line.startsWith('new file')) {
+        if (current) current.type = 'add';
+      } else if (line.startsWith('deleted file')) {
+        if (current) current.type = 'delete';
+      } else if (line.startsWith('@@')) {
+        // Parse hunk header: @@ -old,count +new,count @@
+        const match = line.match(/@@ -(\d+),?(\d+)? \+(\d+),?(\d+)? @@/);
+        if (match && current) {
+          const oldCount = parseInt(match[2] || '1', 10);
+          const newCount = parseInt(match[4] || '1', 10);
+          current.lines!.added += Math.max(0, newCount - oldCount);
+          current.lines!.removed += Math.max(0, oldCount - newCount);
+          current.lines!.changed++;
+        }
+      }
+    }
+    if (current) entries.push(current);
+    return entries;
+  }
+  /**
+   * Format diff as JSON for agents
+   */
+  static toJSON(entries: DiffEntry[]): DiffOutput {
+    const summary = {
+      total: entries.length,
+      added: entries.filter(e => e.type === 'add').length,
+      modified: entries.filter(e => e.type === 'modify').length,
+      deleted: entries.filter(e => e.type === 'delete').length,
+      totalLinesChanged: entries.reduce((sum, e) => sum + (e.lines?.changed || 0), 0),
+    };
+    return {
+      format: 'json',
+      files: entries,
+      summary,
+    };
+  }
+  /**
+   * Format diff as ASCII for humans
+   */
+  static toASCII(entries: DiffEntry[]): string {
+    const lines: string[] = [];
+    lines.push('═'.repeat(60));
+    lines.push('CHANGES');
+    lines.push('═'.repeat(60));
+    for (const entry of entries) {
+      const icon = entry.type === 'add' ? '✨' : entry.type === 'delete' ? '🗑️' : '✏️';
+      lines.push(`${icon} ${entry.type.toUpperCase()}: ${entry.path}`);
+      if (entry.lines) {
+        const stats = [];
+        if (entry.lines.added > 0) stats.push(`+${entry.lines.added}`);
+        if (entry.lines.removed > 0) stats.push(`-${entry.lines.removed}`);
+        if (stats.length > 0) {
+          lines.push(`   ${stats.join(' ')}`);
+        }
+      }
+    }
+    lines.push('═'.repeat(60));
+    lines.push(`Total: ${entries.length} files changed`);
+    lines.push('═'.repeat(60));
+    return lines.join('\n');
+  }
+  /**
+   * Format diff as timeline (ASCII art)
+   */
+  static toTimeline(entries: DiffEntry[]): string {
+    const lines: string[] = [];
+    lines.push('TIMELINE VIEW');
+    lines.push('─'.repeat(50));
+    let timeIndex = 0;
+    for (const entry of entries) {
+      const icon = entry.type === 'add' ? '●' : entry.type === 'delete' ? '◯' : '◐';
+      const time = String(timeIndex++).padStart(2, ' ');
+      lines.push(`${icon} [${time}] ${entry.path}`);
+      if (entry.lines?.changed) {
+        lines.push(`    └─ ${entry.lines.changed} change(s)`);
+      }
+    }
+    lines.push('─'.repeat(50));
+    return lines.join('\n');
+  }
+  /**
+   * Auto-select format based on context
+   */
+  static format(entries: DiffEntry[], format?: 'json' | 'ascii' | 'timeline'): string | DiffOutput {
+    const selectedFormat = format || 'ascii'; // Default to human-readable
+    switch (selectedFormat) {
+      case 'json':
+        return this.toJSON(entries);
+      case 'ascii':
+        return this.toASCII(entries);
+      case 'timeline':
+        return this.toTimeline(entries);
+      default:
+        return this.toASCII(entries);
+    }
+  }
+  /**
+   * Sanitize diff output (remove sensitive paths)
+   */
+  static sanitize(entries: DiffEntry[]): DiffEntry[] {
+    const sensitivePatterns = [
+      /\.env/,
+      /\.key$/,
+      /secret/i,
+      /password/i,
+      /token/i,
+      /private/i,
+      /config\/.*key/,
+    ];
+    return entries.filter(entry => {
+      // Don't filter out sensitive files, just flag them
+      const isSensitive = sensitivePatterns.some(pattern => pattern.test(entry.path));
+      if (isSensitive) {
+        console.warn(`⚠️ Sensitive file detected: ${entry.path}`);
+      }
+      return true;
+    });
+  }
+}
+export default DiffFormatter;