newo 2.0.1 → 2.0.3

package/dist/sync/projects.js

@@ -203,7 +203,7 @@ export async function pullSingleProject(client, customer, projectId, verbose = f
                         else if (!globalOverwriteAll) {
                             // Content is different, ask for overwrite unless global override is set
                             const existingFile = existingFiles[0];
-                            const overwriteChoice = await askForOverwrite(skill.idn, existingFile.fileName, `${skill.idn}.${getExtensionForRunner(skill.runner_type)}`);
+                            const overwriteChoice = await askForOverwrite(skill.idn, existingFile.content, scriptContent, existingFile.fileName);
                             if (overwriteChoice === 'quit') {
                                 console.log('❌ Pull operation cancelled by user');
                                 process.exit(0);

package/dist/sync/skill-files.d.ts

@@ -37,7 +37,7 @@ export declare function getSingleSkillFile(customerIdn: string, projectIdn: stri
 export declare function isContentDifferent(existingContent: string, newContent: string): boolean;
 export type OverwriteChoice = 'yes' | 'no' | 'all' | 'quit';
 /**
- * Interactive overwrite confirmation
+ * Interactive overwrite confirmation with content diff
  */
-export declare function askForOverwrite(skillIdn: string, existingFile: string, newFile: string): Promise<OverwriteChoice>;
+export declare function askForOverwrite(skillIdn: string, existingContent: string, newContent: string, fileName: string): Promise<OverwriteChoice>;
 //# sourceMappingURL=skill-files.d.ts.map

package/dist/sync/skill-files.js

@@ -93,19 +93,56 @@ export function isContentDifferent(existingContent, newContent) {
     return sha256(existingContent.trim()) !== sha256(newContent.trim());
 }
 /**
- * Interactive overwrite confirmation
+ * Interactive overwrite confirmation with content diff
  */
-export async function askForOverwrite(skillIdn, existingFile, newFile) {
+export async function askForOverwrite(skillIdn, existingContent, newContent, fileName) {
     const readline = await import('readline');
     const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout
     });
-    console.log(`\n⚠️  File exists for skill ${skillIdn}:`);
-    console.log(`   Existing: ${existingFile}`);
-    console.log(`   New:      ${newFile}`);
+    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 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 = 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) {
+        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('Overwrite? (y)es/(n)o/(a)ll/(q)uit: ', resolve);
+        rl.question(`\nReplace local with remote? (y)es/(n)o/(a)ll/(q)uit: `, resolve);
     });
     rl.close();
     const choice = answer.toLowerCase().trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newo",
-  "version": "2.0.1",
+  "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/projects.ts

@@ -270,8 +270,9 @@ export async function pullSingleProject(
               const existingFile = existingFiles[0]!;
               const overwriteChoice: OverwriteChoice = await askForOverwrite(
                 skill.idn,
-                existingFile.fileName,
-                `${skill.idn}.${getExtensionForRunner(skill.runner_type)}`
+                existingFile.content,
+                scriptContent,
+                existingFile.fileName
               );
 
               if (overwriteChoice === 'quit') {

package/src/sync/skill-files.ts

@@ -145,21 +145,64 @@ export function isContentDifferent(existingContent: string, newContent: string):
 export type OverwriteChoice = 'yes' | 'no' | 'all' | 'quit';
 
 /**
- * Interactive overwrite confirmation
+ * Interactive overwrite confirmation with content diff
  */
-export async function askForOverwrite(skillIdn: string, existingFile: string, newFile: string): Promise<OverwriteChoice> {
+export async function askForOverwrite(skillIdn: string, existingContent: string, newContent: string, fileName: string): Promise<OverwriteChoice> {
   const readline = await import('readline');
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout
   });
 
-  console.log(`\n⚠️  File exists for skill ${skillIdn}:`);
-  console.log(`   Existing: ${existingFile}`);
-  console.log(`   New:      ${newFile}`);
+  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 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 = 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) {
+    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) => {
-    rl.question('Overwrite? (y)es/(n)o/(a)ll/(q)uit: ', resolve);
+    rl.question(`\nReplace local with remote? (y)es/(n)o/(a)ll/(q)uit: `, resolve);
   });
   rl.close();