newo 2.0.3 → 2.0.5

package/dist/sync/skill-files.js

@@ -102,45 +102,68 @@ export async function askForOverwrite(skillIdn, existingContent, newContent, fil
         output: process.stdout
     });
     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
+    // 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 with line numbers
+    // Show a GitHub-style colored diff with line numbers and context
     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 = 10;
-    console.log(`${gray}   Local (-) vs Remote (+):${reset}`);
-    for (let i = 0; i < maxLines && diffShown < maxDiffLines; i++) {
+    // Find the first differing section and show it with context
+    let diffStart = -1;
+    let diffEnd = -1;
+    // Find first difference
+    for (let i = 0; i < Math.max(localLines.length, remoteLines.length); i++) {
+        if (localLines[i] !== remoteLines[i]) {
+            diffStart = i;
+            break;
+        }
+    }
+    if (diffStart === -1) {
+        // No differences found (shouldn't happen, but handle gracefully)
+        console.log(`${gray}   No differences found${reset}`);
+        return 'no';
+    }
+    // Find end of difference section
+    diffEnd = diffStart;
+    while (diffEnd < Math.max(localLines.length, remoteLines.length) &&
+        (localLines[diffEnd] !== remoteLines[diffEnd] ||
+            localLines[diffEnd] === undefined ||
+            remoteLines[diffEnd] === undefined)) {
+        diffEnd++;
+    }
+    // Show context before (2 lines)
+    const contextStart = Math.max(0, diffStart - 2);
+    for (let i = contextStart; i < diffStart; i++) {
+        if (localLines[i] !== undefined) {
+            console.log(`    ${String(i + 1).padStart(3)}      ${localLines[i]}`);
+        }
+    }
+    // Show the differences
+    const maxDiffLine = Math.min(diffEnd, Math.max(localLines.length, remoteLines.length));
+    for (let i = diffStart; i < maxDiffLine; 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}`);
+        if (localLine !== undefined && (remoteLine === undefined || localLine !== remoteLine)) {
+            console.log(`${redBg} -  ${String(i + 1).padStart(3)}      ${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 (remoteLine !== undefined && (localLine === undefined || localLine !== remoteLine)) {
+            console.log(`${greenBg} +  ${String(i + 1).padStart(3)}      ${remoteLine} ${reset}`);
         }
     }
-    if (diffShown === maxDiffLines) {
-        const remainingDiffs = Math.abs(localLines.length - remoteLines.length);
-        if (remainingDiffs > 0) {
-            console.log(`${gray}   ... (${remainingDiffs} more line differences)${reset}`);
+    // Show context after (2 lines)
+    const contextEnd = Math.min(localLines.length, diffEnd + 2);
+    for (let i = diffEnd; i < contextEnd; i++) {
+        if (localLines[i] !== undefined) {
+            console.log(`    ${String(i + 1).padStart(3)}      ${localLines[i]}`);
         }
     }
+    // Show if there are more differences
+    const totalDiffs = Math.abs(localLines.length - remoteLines.length) + (diffEnd - diffStart);
+    if (totalDiffs > (diffEnd - diffStart)) {
+        console.log(`${gray}... (${totalDiffs - (diffEnd - diffStart)} more 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.3",
+  "version": "2.0.5",
   "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

@@ -156,51 +156,79 @@ export async function askForOverwrite(skillIdn: string, existingContent: string,
 
   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
+  // 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 with line numbers
+  // Show a GitHub-style colored diff with line numbers and context
   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 = 10;
+  // Find the first differing section and show it with context
+  let diffStart = -1;
+  let diffEnd = -1;
 
-  console.log(`${gray}   Local (-) vs Remote (+):${reset}`);
+  // Find first difference
+  for (let i = 0; i < Math.max(localLines.length, remoteLines.length); i++) {
+    if (localLines[i] !== remoteLines[i]) {
+      diffStart = i;
+      break;
+    }
+  }
+
+  if (diffStart === -1) {
+    // No differences found (shouldn't happen, but handle gracefully)
+    console.log(`${gray}   No differences found${reset}`);
+    return 'no';
+  }
 
-  for (let i = 0; i < maxLines && diffShown < maxDiffLines; i++) {
+  // Find end of difference section
+  diffEnd = diffStart;
+  while (diffEnd < Math.max(localLines.length, remoteLines.length) &&
+         (localLines[diffEnd] !== remoteLines[diffEnd] ||
+          localLines[diffEnd] === undefined ||
+          remoteLines[diffEnd] === undefined)) {
+    diffEnd++;
+  }
+
+  // Show context before (2 lines)
+  const contextStart = Math.max(0, diffStart - 2);
+  for (let i = contextStart; i < diffStart; i++) {
+    if (localLines[i] !== undefined) {
+      console.log(`    ${String(i + 1).padStart(3)}      ${localLines[i]}`);
+    }
+  }
+
+  // Show the differences
+  const maxDiffLine = Math.min(diffEnd, Math.max(localLines.length, remoteLines.length));
+  for (let i = diffStart; i < maxDiffLine; 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 (localLine !== undefined && (remoteLine === undefined || localLine !== remoteLine)) {
+      console.log(`${redBg} -  ${String(i + 1).padStart(3)}      ${localLine} ${reset}`);
+    }
+    if (remoteLine !== undefined && (localLine === undefined || localLine !== remoteLine)) {
+      console.log(`${greenBg} +  ${String(i + 1).padStart(3)}      ${remoteLine} ${reset}`);
     }
   }
 
-  if (diffShown === maxDiffLines) {
-    const remainingDiffs = Math.abs(localLines.length - remoteLines.length);
-    if (remainingDiffs > 0) {
-      console.log(`${gray}   ... (${remainingDiffs} more line differences)${reset}`);
+  // Show context after (2 lines)
+  const contextEnd = Math.min(localLines.length, diffEnd + 2);
+  for (let i = diffEnd; i < contextEnd; i++) {
+    if (localLines[i] !== undefined) {
+      console.log(`    ${String(i + 1).padStart(3)}      ${localLines[i]}`);
     }
   }
 
+  // Show if there are more differences
+  const totalDiffs = Math.abs(localLines.length - remoteLines.length) + (diffEnd - diffStart);
+  if (totalDiffs > (diffEnd - diffStart)) {
+    console.log(`${gray}... (${totalDiffs - (diffEnd - diffStart)} more differences)${reset}`);
+  }
+
   const answer = await new Promise<string>((resolve) => {
     rl.question(`\nReplace local with remote? (y)es/(n)o/(a)ll/(q)uit: `, resolve);
   });