newo 2.0.2 → 2.0.4

package/dist/sync/skill-files.js

@@ -101,30 +101,66 @@ export async function askForOverwrite(skillIdn, existingContent, newContent, fil
         input: process.stdin,
         output: process.stdout
     });
-    console.log(`\n⚠️  Content differs for skill ${skillIdn} (${fileName}):`);
-    // ANSI color codes
-    const red = '\x1b[31m';
-    const green = '\x1b[32m';
+    console.log(`\n⚠️  Local changes will be replaced by remote content for skill ${skillIdn} (${fileName}):`);
+    // ANSI color codes matching GitHub diff colors from screenshot
+    const redBg = '\x1b[101m\x1b[97m'; // Light red background, white text (like GitHub)
+    const greenBg = '\x1b[102m\x1b[30m'; // Light green background, black text (like GitHub)
+    const gray = '\x1b[90m';
     const reset = '\x1b[0m';
-    // Show a GitHub-style colored diff
-    const existingLines = existingContent.trim().split('\n');
-    const newLines = newContent.trim().split('\n');
-    // Show first few different lines with colors
-    let diffShown = 0;
-    const maxDiffLines = 5;
-    for (let i = 0; i < Math.max(existingLines.length, newLines.length) && diffShown < maxDiffLines; i++) {
-        const existingLine = existingLines[i] || '';
-        const newLine = newLines[i] || '';
-        if (existingLine !== newLine) {
-            if (existingLine)
-                console.log(`${red}-${existingLine}${reset}`);
-            if (newLine)
-                console.log(`${green}+${newLine}${reset}`);
-            diffShown++;
+    // Show a GitHub-style colored diff with line numbers and context
+    const localLines = existingContent.trim().split('\n');
+    const remoteLines = newContent.trim().split('\n');
+    // Find differences and show with 2 lines context before/after
+    const diffs = [];
+    // Simple diff algorithm to find changes
+    let localIdx = 0;
+    let remoteIdx = 0;
+    while (localIdx < localLines.length || remoteIdx < remoteLines.length) {
+        const localLine = localLines[localIdx];
+        const remoteLine = remoteLines[remoteIdx];
+        if (localLine !== remoteLine) {
+            if (localLine !== undefined && remoteLine !== undefined) {
+                diffs.push({ localIndex: localIdx, remoteIndex: remoteIdx, type: 'change' });
+            }
+            else if (localLine !== undefined) {
+                diffs.push({ localIndex: localIdx, remoteIndex: -1, type: 'remove' });
+            }
+            else if (remoteLine !== undefined) {
+                diffs.push({ localIndex: -1, remoteIndex: remoteIdx, type: 'add' });
+            }
+        }
+        if (localLine !== undefined)
+            localIdx++;
+        if (remoteLine !== undefined)
+            remoteIdx++;
+    }
+    // Show diffs with context (2 lines before/after each change)
+    let shown = 0;
+    const maxDiffGroups = 3;
+    for (const diff of diffs.slice(0, maxDiffGroups)) {
+        if (shown > 0)
+            console.log(''); // Separator between diff groups
+        // Show context before
+        const contextStart = Math.max(0, diff.localIndex - 2);
+        for (let i = contextStart; i < diff.localIndex && i < localLines.length; i++) {
+            console.log(`    ${String(i + 1).padStart(3)}      ${localLines[i]}`);
+        }
+        // Show the actual diff
+        if (diff.type === 'change' || diff.type === 'remove') {
+            console.log(`${redBg} -  ${String(diff.localIndex + 1).padStart(3)}      ${localLines[diff.localIndex]} ${reset}`);
+        }
+        if (diff.type === 'change' || diff.type === 'add') {
+            console.log(`${greenBg} +  ${String(diff.remoteIndex + 1).padStart(3)}      ${remoteLines[diff.remoteIndex]} ${reset}`);
+        }
+        // Show context after
+        const contextEnd = Math.min(localLines.length, diff.localIndex + 3);
+        for (let i = diff.localIndex + 1; i < contextEnd; i++) {
+            console.log(`    ${String(i + 1).padStart(3)}      ${localLines[i]}`);
         }
+        shown++;
     }
-    if (diffShown === maxDiffLines) {
-        console.log('   ... (more differences)');
+    if (diffs.length > maxDiffGroups) {
+        console.log(`${gray}... (${diffs.length - maxDiffGroups} more diff groups)${reset}`);
     }
     const answer = await new Promise((resolve) => {
         rl.question(`\nReplace local with remote? (y)es/(n)o/(a)ll/(q)uit: `, resolve);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newo",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "NEWO CLI: Professional command-line tool with modular architecture for NEWO AI Agent development. Features IDN-based file management, real-time progress tracking, intelligent sync operations, and comprehensive multi-customer support.",
   "type": "module",
   "bin": {

package/src/sync/skill-files.ts

@@ -154,34 +154,75 @@ export async function askForOverwrite(skillIdn: string, existingContent: string,
     output: process.stdout
   });
 
-  console.log(`\n⚠️  Content differs for skill ${skillIdn} (${fileName}):`);
+  console.log(`\n⚠️  Local changes will be replaced by remote content for skill ${skillIdn} (${fileName}):`);
 
-  // ANSI color codes
-  const red = '\x1b[31m';
-  const green = '\x1b[32m';
+  // ANSI color codes matching GitHub diff colors from screenshot
+  const redBg = '\x1b[101m\x1b[97m';    // Light red background, white text (like GitHub)
+  const greenBg = '\x1b[102m\x1b[30m';  // Light green background, black text (like GitHub)
+  const gray = '\x1b[90m';
   const reset = '\x1b[0m';
 
-  // Show a GitHub-style colored diff
-  const existingLines = existingContent.trim().split('\n');
-  const newLines = newContent.trim().split('\n');
+  // Show a GitHub-style colored diff with line numbers and context
+  const localLines = existingContent.trim().split('\n');
+  const remoteLines = newContent.trim().split('\n');
 
-  // Show first few different lines with colors
-  let diffShown = 0;
-  const maxDiffLines = 5;
+  // Find differences and show with 2 lines context before/after
+  const diffs: Array<{localIndex: number, remoteIndex: number, type: 'change' | 'add' | 'remove'}> = [];
 
-  for (let i = 0; i < Math.max(existingLines.length, newLines.length) && diffShown < maxDiffLines; i++) {
-    const existingLine = existingLines[i] || '';
-    const newLine = newLines[i] || '';
+  // Simple diff algorithm to find changes
+  let localIdx = 0;
+  let remoteIdx = 0;
 
-    if (existingLine !== newLine) {
-      if (existingLine) console.log(`${red}-${existingLine}${reset}`);
-      if (newLine) console.log(`${green}+${newLine}${reset}`);
-      diffShown++;
+  while (localIdx < localLines.length || remoteIdx < remoteLines.length) {
+    const localLine = localLines[localIdx];
+    const remoteLine = remoteLines[remoteIdx];
+
+    if (localLine !== remoteLine) {
+      if (localLine !== undefined && remoteLine !== undefined) {
+        diffs.push({localIndex: localIdx, remoteIndex: remoteIdx, type: 'change'});
+      } else if (localLine !== undefined) {
+        diffs.push({localIndex: localIdx, remoteIndex: -1, type: 'remove'});
+      } else if (remoteLine !== undefined) {
+        diffs.push({localIndex: -1, remoteIndex: remoteIdx, type: 'add'});
+      }
+    }
+
+    if (localLine !== undefined) localIdx++;
+    if (remoteLine !== undefined) remoteIdx++;
+  }
+
+  // Show diffs with context (2 lines before/after each change)
+  let shown = 0;
+  const maxDiffGroups = 3;
+
+  for (const diff of diffs.slice(0, maxDiffGroups)) {
+    if (shown > 0) console.log(''); // Separator between diff groups
+
+    // Show context before
+    const contextStart = Math.max(0, diff.localIndex - 2);
+    for (let i = contextStart; i < diff.localIndex && i < localLines.length; i++) {
+      console.log(`    ${String(i + 1).padStart(3)}      ${localLines[i]}`);
+    }
+
+    // Show the actual diff
+    if (diff.type === 'change' || diff.type === 'remove') {
+      console.log(`${redBg} -  ${String(diff.localIndex + 1).padStart(3)}      ${localLines[diff.localIndex]} ${reset}`);
+    }
+    if (diff.type === 'change' || diff.type === 'add') {
+      console.log(`${greenBg} +  ${String(diff.remoteIndex + 1).padStart(3)}      ${remoteLines[diff.remoteIndex]} ${reset}`);
     }
+
+    // Show context after
+    const contextEnd = Math.min(localLines.length, diff.localIndex + 3);
+    for (let i = diff.localIndex + 1; i < contextEnd; i++) {
+      console.log(`    ${String(i + 1).padStart(3)}      ${localLines[i]}`);
+    }
+
+    shown++;
   }
 
-  if (diffShown === maxDiffLines) {
-    console.log('   ... (more differences)');
+  if (diffs.length > maxDiffGroups) {
+    console.log(`${gray}... (${diffs.length - maxDiffGroups} more diff groups)${reset}`);
   }
 
   const answer = await new Promise<string>((resolve) => {