prjct-cli 0.49.0 → 0.51.0

package/core/services/diff-generator.ts

@@ -0,0 +1,356 @@
+/**
+ * Diff Generator for Sync Preview
+ *
+ * Generates human-readable diffs between old and new context files.
+ * Shows what will change before sync applies.
+ *
+ * @see PRJ-125
+ * @module services/diff-generator
+ */
+
+import chalk from 'chalk'
+
+// =============================================================================
+// Types
+// =============================================================================
+
+export interface DiffSection {
+  name: string
+  type: 'added' | 'modified' | 'removed' | 'unchanged'
+  before?: string
+  after?: string
+  lineCount: number
+}
+
+export interface PreservedInfo {
+  name: string
+  lineCount: number
+}
+
+export interface SyncDiff {
+  hasChanges: boolean
+  added: DiffSection[]
+  modified: DiffSection[]
+  removed: DiffSection[]
+  preserved: PreservedInfo[]
+  tokensBefore: number
+  tokensAfter: number
+  tokenDelta: number
+}
+
+export interface DiffOptions {
+  showFullDiff?: boolean
+  colorize?: boolean
+}
+
+// =============================================================================
+// Constants
+// =============================================================================
+
+const CHARS_PER_TOKEN = 4
+
+// =============================================================================
+// Token Estimation
+// =============================================================================
+
+/**
+ * Estimate token count for content
+ */
+export function estimateTokens(content: string): number {
+  return Math.ceil(content.length / CHARS_PER_TOKEN)
+}
+
+// =============================================================================
+// Section Parsing
+// =============================================================================
+
+interface ParsedSection {
+  name: string
+  content: string
+  startLine: number
+  endLine: number
+}
+
+/**
+ * Parse markdown into sections based on headers
+ */
+export function parseMarkdownSections(content: string): ParsedSection[] {
+  const lines = content.split('\n')
+  const sections: ParsedSection[] = []
+  let currentSection: ParsedSection | null = null
+
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i]
+    const headerMatch = line.match(/^(#{1,3})\s+(.+)$/)
+
+    if (headerMatch) {
+      // Save previous section
+      if (currentSection) {
+        currentSection.endLine = i - 1
+        sections.push(currentSection)
+      }
+
+      // Start new section
+      currentSection = {
+        name: headerMatch[2].trim(),
+        content: line,
+        startLine: i,
+        endLine: i,
+      }
+    } else if (currentSection) {
+      currentSection.content += `\n${line}`
+    }
+  }
+
+  // Save last section
+  if (currentSection) {
+    currentSection.endLine = lines.length - 1
+    sections.push(currentSection)
+  }
+
+  return sections
+}
+
+/**
+ * Check if content is within a preserve block
+ */
+function isPreservedSection(content: string): boolean {
+  return content.includes('<!-- prjct:preserve')
+}
+
+// =============================================================================
+// Diff Generation
+// =============================================================================
+
+/**
+ * Generate diff between old and new content
+ */
+export function generateSyncDiff(oldContent: string, newContent: string): SyncDiff {
+  const oldSections = parseMarkdownSections(oldContent)
+  const newSections = parseMarkdownSections(newContent)
+
+  const diff: SyncDiff = {
+    hasChanges: false,
+    added: [],
+    modified: [],
+    removed: [],
+    preserved: [],
+    tokensBefore: estimateTokens(oldContent),
+    tokensAfter: estimateTokens(newContent),
+    tokenDelta: 0,
+  }
+
+  diff.tokenDelta = diff.tokensAfter - diff.tokensBefore
+
+  // Create maps for quick lookup
+  const oldMap = new Map(oldSections.map((s) => [s.name.toLowerCase(), s]))
+  const newMap = new Map(newSections.map((s) => [s.name.toLowerCase(), s]))
+
+  // Find preserved sections in old content
+  for (const section of oldSections) {
+    if (isPreservedSection(section.content)) {
+      diff.preserved.push({
+        name: section.name,
+        lineCount: section.content.split('\n').length,
+      })
+    }
+  }
+
+  // Find added and modified sections
+  for (const newSection of newSections) {
+    const key = newSection.name.toLowerCase()
+    const oldSection = oldMap.get(key)
+
+    if (!oldSection) {
+      // New section
+      diff.added.push({
+        name: newSection.name,
+        type: 'added',
+        after: newSection.content,
+        lineCount: newSection.content.split('\n').length,
+      })
+      diff.hasChanges = true
+    } else if (oldSection.content.trim() !== newSection.content.trim()) {
+      // Modified section (skip if preserved)
+      if (!isPreservedSection(oldSection.content)) {
+        diff.modified.push({
+          name: newSection.name,
+          type: 'modified',
+          before: oldSection.content,
+          after: newSection.content,
+          lineCount: newSection.content.split('\n').length,
+        })
+        diff.hasChanges = true
+      }
+    }
+  }
+
+  // Find removed sections
+  for (const oldSection of oldSections) {
+    const key = oldSection.name.toLowerCase()
+    if (!newMap.has(key) && !isPreservedSection(oldSection.content)) {
+      diff.removed.push({
+        name: oldSection.name,
+        type: 'removed',
+        before: oldSection.content,
+        lineCount: oldSection.content.split('\n').length,
+      })
+      diff.hasChanges = true
+    }
+  }
+
+  return diff
+}
+
+// =============================================================================
+// Diff Formatting
+// =============================================================================
+
+/**
+ * Format diff for terminal display
+ */
+export function formatDiffPreview(diff: SyncDiff, options: DiffOptions = {}): string {
+  const { colorize = true } = options
+  const lines: string[] = []
+
+  const green = colorize ? chalk.green : (s: string) => s
+  const red = colorize ? chalk.red : (s: string) => s
+  const yellow = colorize ? chalk.yellow : (s: string) => s
+  const dim = colorize ? chalk.dim : (s: string) => s
+  const bold = colorize ? chalk.bold : (s: string) => s
+
+  if (!diff.hasChanges) {
+    lines.push(dim('No changes detected (context is up to date)'))
+    return lines.join('\n')
+  }
+
+  lines.push('')
+  lines.push(bold('📋 Changes to context files:'))
+  lines.push('')
+
+  // Added sections
+  if (diff.added.length > 0) {
+    for (const section of diff.added) {
+      lines.push(green(`+ │ + ${section.name} (new)`))
+    }
+  }
+
+  // Modified sections
+  if (diff.modified.length > 0) {
+    for (const section of diff.modified) {
+      lines.push(yellow(`~ │   ${section.name} (modified)`))
+    }
+  }
+
+  // Removed sections
+  if (diff.removed.length > 0) {
+    for (const section of diff.removed) {
+      lines.push(red(`- │ - ${section.name} (removed)`))
+    }
+  }
+
+  // Preserved sections
+  if (diff.preserved.length > 0) {
+    lines.push('')
+    lines.push(dim('  ## Your Customizations'))
+    for (const section of diff.preserved) {
+      lines.push(dim(`  │ ✓ ${section.name} (${section.lineCount} lines preserved)`))
+    }
+  }
+
+  // Summary
+  lines.push('')
+  lines.push(dim('────────────────────────────────'))
+
+  const summaryParts: string[] = []
+  if (diff.added.length > 0) summaryParts.push(green(`+${diff.added.length} added`))
+  if (diff.modified.length > 0) summaryParts.push(yellow(`~${diff.modified.length} modified`))
+  if (diff.removed.length > 0) summaryParts.push(red(`-${diff.removed.length} removed`))
+
+  lines.push(`Summary: ${summaryParts.join(', ') || 'no changes'}`)
+
+  // Token delta
+  const tokenSign = diff.tokenDelta >= 0 ? '+' : ''
+  const tokenColor = diff.tokenDelta >= 0 ? green : red
+  lines.push(
+    `Tokens: ${diff.tokensBefore.toLocaleString()} → ${diff.tokensAfter.toLocaleString()} (${tokenColor(tokenSign + diff.tokenDelta.toLocaleString())})`
+  )
+
+  lines.push('')
+
+  return lines.join('\n')
+}
+
+/**
+ * Format full git-style diff
+ */
+export function formatFullDiff(diff: SyncDiff, options: DiffOptions = {}): string {
+  const { colorize = true } = options
+  const lines: string[] = []
+
+  const green = colorize ? chalk.green : (s: string) => s
+  const red = colorize ? chalk.red : (s: string) => s
+  const cyan = colorize ? chalk.cyan : (s: string) => s
+  const dim = colorize ? chalk.dim : (s: string) => s
+
+  // Added sections
+  for (const section of diff.added) {
+    lines.push(cyan(`@@ +${section.name} @@`))
+    if (section.after) {
+      for (const line of section.after.split('\n')) {
+        lines.push(green(`+ ${line}`))
+      }
+    }
+    lines.push('')
+  }
+
+  // Modified sections
+  for (const section of diff.modified) {
+    lines.push(cyan(`@@ ${section.name} @@`))
+    if (section.before) {
+      for (const line of section.before.split('\n').slice(0, 5)) {
+        lines.push(red(`- ${line}`))
+      }
+      if (section.before.split('\n').length > 5) {
+        lines.push(dim(`  ... ${section.before.split('\n').length - 5} more lines`))
+      }
+    }
+    if (section.after) {
+      for (const line of section.after.split('\n').slice(0, 5)) {
+        lines.push(green(`+ ${line}`))
+      }
+      if (section.after.split('\n').length > 5) {
+        lines.push(dim(`  ... ${section.after.split('\n').length - 5} more lines`))
+      }
+    }
+    lines.push('')
+  }
+
+  // Removed sections
+  for (const section of diff.removed) {
+    lines.push(cyan(`@@ -${section.name} @@`))
+    if (section.before) {
+      for (const line of section.before.split('\n').slice(0, 5)) {
+        lines.push(red(`- ${line}`))
+      }
+      if (section.before.split('\n').length > 5) {
+        lines.push(dim(`  ... ${section.before.split('\n').length - 5} more lines`))
+      }
+    }
+    lines.push('')
+  }
+
+  return lines.join('\n')
+}
+
+// =============================================================================
+// Exports
+// =============================================================================
+
+export default {
+  generateSyncDiff,
+  formatDiffPreview,
+  formatFullDiff,
+  estimateTokens,
+  parseMarkdownSections,
+}

package/core/services/sync-service.ts

@@ -31,6 +31,7 @@ import pathManager from '../infrastructure/path-manager'
 import { metricsStorage } from '../storage/metrics-storage'
 import dateHelper from '../utils/date-helper'
 import { ContextFileGenerator } from './context-generator'
+import type { SyncDiff } from './diff-generator'
 import { type StackDetection, StackDetector } from './stack-detector'
 
 const execAsync = promisify(exec)
@@ -104,10 +105,15 @@ interface SyncResult {
   aiTools: AIToolResult[]
   syncMetrics?: SyncMetrics
   error?: string
+  // Preview mode fields
+  isPreview?: boolean
+  previewDiff?: SyncDiff
 }
 
 interface SyncOptions {
   aiTools?: string[] // AI tools to generate context for (default: claude, cursor)
+  preview?: boolean // If true, return diff without applying changes
+  skipConfirmation?: boolean // If true, apply changes without confirmation (--yes flag)
 }
 
 // ============================================================================

package/core/utils/output.ts

@@ -1,9 +1,11 @@
 /**
- * Minimal Output System for prjct-cli
+ * Unified Output System for prjct-cli
  * Spinner while working → Single line result
  * With prjct branding
  *
  * Supports --quiet mode for CI/CD and scripting
+ *
+ * @see PRJ-130
  */
 
 import chalk from 'chalk'
@@ -14,6 +16,22 @@ import { getError } from './error-messages'
 const _FRAMES = branding.spinner.frames
 const SPEED = branding.spinner.speed
 
+/**
+ * Centralized icons for consistent output
+ */
+export const ICONS = {
+  success: chalk.green('✓'),
+  fail: chalk.red('✗'),
+  warn: chalk.yellow('⚠'),
+  info: chalk.blue('ℹ'),
+  debug: chalk.dim('🔧'),
+  bullet: chalk.dim('•'),
+  arrow: chalk.dim('→'),
+  check: chalk.green('✓'),
+  cross: chalk.red('✗'),
+  spinner: chalk.cyan('◐'),
+} as const
+
 let interval: ReturnType<typeof setInterval> | null = null
 let frame = 0
 
@@ -57,6 +75,12 @@ interface Output {
   fail(msg: string): Output
   failWithHint(error: ErrorWithHint | ErrorCode): Output
   warn(msg: string): Output
+  info(msg: string): Output
+  debug(msg: string): Output
+  success(msg: string, metrics?: OutputMetrics): Output
+  list(items: string[], options?: { bullet?: string; indent?: number }): Output
+  table(rows: Array<Record<string, string | number>>, options?: { header?: boolean }): Output
+  box(title: string, content: string): Output
   stop(): Output
   step(current: number, total: number, msg: string): Output
   progress(current: number, total: number, msg?: string): Output
@@ -99,7 +123,7 @@ const out: Output = {
           suffix = chalk.dim(` [${parts.join(' | ')}]`)
         }
       }
-      console.log(`${chalk.green('✓')} ${truncate(msg, 50)}${suffix}`)
+      console.log(`${ICONS.success} ${truncate(msg, 50)}${suffix}`)
     }
     return this
   },
@@ -107,7 +131,7 @@ const out: Output = {
   // Errors go to stderr even in quiet mode
   fail(msg: string) {
     this.stop()
-    console.error(`${chalk.red('✗')} ${truncate(msg, 65)}`)
+    console.error(`${ICONS.fail} ${truncate(msg, 65)}`)
     return this
   },
 
@@ -116,7 +140,7 @@ const out: Output = {
     this.stop()
     const err = typeof error === 'string' ? getError(error) : error
     console.error()
-    console.error(`${chalk.red('✗')} ${err.message}`)
+    console.error(`${ICONS.fail} ${err.message}`)
     if (err.file) {
       console.error(chalk.dim(`  File: ${err.file}`))
     }
@@ -132,7 +156,91 @@ const out: Output = {
 
   warn(msg: string) {
     this.stop()
-    if (!quietMode) console.log(`${chalk.yellow('⚠')} ${truncate(msg, 65)}`)
+    if (!quietMode) console.log(`${ICONS.warn} ${truncate(msg, 65)}`)
+    return this
+  },
+
+  // Informational message
+  info(msg: string) {
+    this.stop()
+    if (!quietMode) console.log(`${ICONS.info} ${msg}`)
+    return this
+  },
+
+  // Debug message (only if DEBUG=1 or DEBUG=true)
+  debug(msg: string) {
+    this.stop()
+    const debugEnabled = process.env.DEBUG === '1' || process.env.DEBUG === 'true'
+    if (!quietMode && debugEnabled) {
+      console.log(`${ICONS.debug} ${chalk.dim(msg)}`)
+    }
+    return this
+  },
+
+  // Alias for done - explicit success indicator
+  success(msg: string, metrics?: OutputMetrics) {
+    return this.done(msg, metrics)
+  },
+
+  // Bulleted list
+  list(items: string[], options: { bullet?: string; indent?: number } = {}) {
+    this.stop()
+    if (quietMode) return this
+    const bullet = options.bullet || ICONS.bullet
+    const indent = ' '.repeat(options.indent || 0)
+    for (const item of items) {
+      console.log(`${indent}${bullet} ${item}`)
+    }
+    return this
+  },
+
+  // Simple table output
+  table(rows: Array<Record<string, string | number>>, options: { header?: boolean } = {}) {
+    this.stop()
+    if (quietMode || rows.length === 0) return this
+
+    const keys = Object.keys(rows[0])
+    const colWidths: Record<string, number> = {}
+
+    // Calculate column widths
+    for (const key of keys) {
+      colWidths[key] = key.length
+      for (const row of rows) {
+        const val = String(row[key] ?? '')
+        if (val.length > colWidths[key]) colWidths[key] = val.length
+      }
+    }
+
+    // Print header if requested
+    if (options.header !== false) {
+      const headerLine = keys.map((k) => k.padEnd(colWidths[k])).join('  ')
+      console.log(chalk.dim(headerLine))
+      console.log(chalk.dim('─'.repeat(headerLine.length)))
+    }
+
+    // Print rows
+    for (const row of rows) {
+      const line = keys.map((k) => String(row[k] ?? '').padEnd(colWidths[k])).join('  ')
+      console.log(line)
+    }
+    return this
+  },
+
+  // Boxed content
+  box(title: string, content: string) {
+    this.stop()
+    if (quietMode) return this
+    const lines = content.split('\n')
+    const maxLen = Math.max(title.length, ...lines.map((l) => l.length))
+    const border = '─'.repeat(maxLen + 2)
+
+    console.log(chalk.dim(`┌${border}┐`))
+    console.log(chalk.dim('│') + ` ${chalk.bold(title.padEnd(maxLen))} ` + chalk.dim('│'))
+    console.log(chalk.dim(`├${border}┤`))
+    for (const line of lines) {
+      console.log(chalk.dim('│') + ` ${line.padEnd(maxLen)} ` + chalk.dim('│'))
+    }
+    console.log(chalk.dim(`└${border}┘`))
     return this
   },