newo 2.0.2 → 2.0.3

package/dist/sync/skill-files.js

@@ -101,30 +101,45 @@ 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 with background colors
+    const redBg = '\x1b[41m\x1b[37m'; // Red background, white text
+    const greenBg = '\x1b[42m\x1b[30m'; // Green background, black text
+    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
+    // Show a GitHub-style colored diff with line numbers
+    const localLines = existingContent.trim().split('\n');
+    const remoteLines = newContent.trim().split('\n');
+    // Create a unified diff view
+    const maxLines = Math.max(localLines.length, remoteLines.length);
     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++;
+    const maxDiffLines = 10;
+    console.log(`${gray}   Local (-) vs Remote (+):${reset}`);
+    for (let i = 0; i < maxLines && diffShown < maxDiffLines; i++) {
+        const localLine = localLines[i];
+        const remoteLine = remoteLines[i];
+        const lineNum = String(i + 1).padStart(3);
+        // Show context line if both exist and are the same
+        if (localLine !== undefined && remoteLine !== undefined && localLine === remoteLine) {
+            console.log(`${gray}    ${lineNum}      ${localLine}${reset}`);
+        }
+        else {
+            // Show differences
+            if (localLine !== undefined) {
+                console.log(`${redBg} -  ${lineNum}      ${localLine} ${reset}`);
+                diffShown++;
+            }
+            if (remoteLine !== undefined) {
+                console.log(`${greenBg} +  ${lineNum}      ${remoteLine} ${reset}`);
+                diffShown++;
+            }
         }
     }
     if (diffShown === maxDiffLines) {
-        console.log('   ... (more differences)');
+        const remainingDiffs = Math.abs(localLines.length - remoteLines.length);
+        if (remainingDiffs > 0) {
+            console.log(`${gray}   ... (${remainingDiffs} more line differences)${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.3",
   "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,51 @@ 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 with background colors
+  const redBg = '\x1b[41m\x1b[37m';     // Red background, white text
+  const greenBg = '\x1b[42m\x1b[30m';   // Green background, black text
+  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
+  const localLines = existingContent.trim().split('\n');
+  const remoteLines = newContent.trim().split('\n');
 
-  // Show first few different lines with colors
+  // Create a unified diff view
+  const maxLines = Math.max(localLines.length, remoteLines.length);
   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++;
+  const maxDiffLines = 10;
+
+  console.log(`${gray}   Local (-) vs Remote (+):${reset}`);
+
+  for (let i = 0; i < maxLines && diffShown < maxDiffLines; i++) {
+    const localLine = localLines[i];
+    const remoteLine = remoteLines[i];
+    const lineNum = String(i + 1).padStart(3);
+
+    // Show context line if both exist and are the same
+    if (localLine !== undefined && remoteLine !== undefined && localLine === remoteLine) {
+      console.log(`${gray}    ${lineNum}      ${localLine}${reset}`);
+    } else {
+      // Show differences
+      if (localLine !== undefined) {
+        console.log(`${redBg} -  ${lineNum}      ${localLine} ${reset}`);
+        diffShown++;
+      }
+      if (remoteLine !== undefined) {
+        console.log(`${greenBg} +  ${lineNum}      ${remoteLine} ${reset}`);
+        diffShown++;
+      }
     }
   }
 
   if (diffShown === maxDiffLines) {
-    console.log('   ... (more differences)');
+    const remainingDiffs = Math.abs(localLines.length - remoteLines.length);
+    if (remainingDiffs > 0) {
+      console.log(`${gray}   ... (${remainingDiffs} more line differences)${reset}`);
+    }
   }
 
   const answer = await new Promise<string>((resolve) => {