newo 2.0.0 → 2.0.2

package/dist/sync/projects.js

@@ -48,9 +48,10 @@ export async function pullSingleProject(client, customer, projectId, verbose = f
         }
     }
     const newHashes = {};
-    // Progress tracking
+    // Progress tracking and overwrite control
     let totalSkills = 0;
     let processedSkills = 0;
+    let globalOverwriteAll = silentOverwrite;
     // Count total skills for progress tracking
     for (const project of projects) {
         const agents = await listAgents(client, project.id);
@@ -182,7 +183,7 @@ export async function pullSingleProject(client, customer, projectId, verbose = f
                         // Check if any existing file has the same content
                         hasContentMatch = existingFiles.some(file => !isContentDifferent(file.content, scriptContent));
                         if (hasContentMatch) {
-                            // Content is the same - remove old files and write with correct IDN name
+                            // Content is the same - handle file naming
                             const matchingFile = existingFiles.find(file => !isContentDifferent(file.content, scriptContent));
                             const correctName = `${skill.idn}.${getExtensionForRunner(skill.runner_type)}`;
                             if (matchingFile && matchingFile.fileName !== correctName) {
@@ -192,30 +193,44 @@ export async function pullSingleProject(client, customer, projectId, verbose = f
                                     console.log(`        🔄 Renamed ${matchingFile.fileName} → ${correctName}`);
                             }
                             else if (matchingFile && matchingFile.fileName === correctName) {
-                                // Already has correct name and content
+                                // Already has correct name and content - skip completely
                                 shouldWrite = false;
                                 newHashes[matchingFile.filePath] = sha256(scriptContent);
                                 if (verbose)
                                     console.log(`        ✓ Content unchanged for ${skill.idn}, keeping existing file`);
                             }
                         }
-                        else if (!silentOverwrite) {
-                            // Content is different, ask for overwrite
+                        else if (!globalOverwriteAll) {
+                            // Content is different, ask for overwrite unless global override is set
                             const existingFile = existingFiles[0];
-                            const shouldOverwrite = await askForOverwrite(skill.idn, existingFile.fileName, `${skill.idn}.${getExtensionForRunner(skill.runner_type)}`);
-                            if (!shouldOverwrite) {
-                                shouldWrite = false;
-                                if (verbose)
-                                    console.log(`        ⚠️  Skipped overwrite for ${skill.idn}`);
+                            const overwriteChoice = await askForOverwrite(skill.idn, existingFile.content, scriptContent, existingFile.fileName);
+                            if (overwriteChoice === 'quit') {
+                                console.log('❌ Pull operation cancelled by user');
+                                process.exit(0);
                             }
-                            else {
-                                // Remove existing files before writing new one
+                            else if (overwriteChoice === 'all') {
+                                globalOverwriteAll = true;
+                                // Continue with overwrite
                                 for (const file of existingFiles) {
                                     await fs.remove(file.filePath);
                                     if (verbose)
                                         console.log(`        🗑️  Removed ${file.fileName}`);
                                 }
                             }
+                            else if (overwriteChoice === 'yes') {
+                                // Single overwrite
+                                for (const file of existingFiles) {
+                                    await fs.remove(file.filePath);
+                                    if (verbose)
+                                        console.log(`        🗑️  Removed ${file.fileName}`);
+                                }
+                            }
+                            else {
+                                // User said no
+                                shouldWrite = false;
+                                if (verbose)
+                                    console.log(`        ⚠️  Skipped overwrite for ${skill.idn}`);
+                            }
                         }
                         else {
                             // Silent overwrite mode - remove existing files

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

@@ -35,8 +35,9 @@ export declare function getSingleSkillFile(customerIdn: string, projectIdn: stri
  * Check if skill script content is different from target content
  */
 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<boolean>;
+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,29 +93,53 @@ 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⚠️  Content differs for skill ${skillIdn} (${fileName}):`);
+    // ANSI color codes
+    const red = '\x1b[31m';
+    const green = '\x1b[32m';
+    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++;
+        }
+    }
+    if (diffShown === maxDiffLines) {
+        console.log('   ... (more differences)');
+    }
     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();
     if (choice === 'q' || choice === 'quit') {
-        console.log('❌ Pull operation cancelled by user');
-        process.exit(0);
+        return 'quit';
     }
     if (choice === 'a' || choice === 'all') {
-        return true; // This should be handled by caller to set global overwrite mode
+        return 'all';
+    }
+    if (choice === 'y' || choice === 'yes') {
+        return 'yes';
     }
-    return choice === 'y' || choice === 'yes';
+    return 'no';
 }
 //# sourceMappingURL=skill-files.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newo",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "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

@@ -27,6 +27,7 @@ import {
   askForOverwrite,
   getExtensionForRunner
 } from './skill-files.js';
+import type { OverwriteChoice } from './skill-files.js';
 import fs from 'fs-extra';
 import { sha256, saveHashes } from '../hash.js';
 import yaml from 'js-yaml';
@@ -96,9 +97,10 @@ export async function pullSingleProject(
 
   const newHashes: HashStore = {};
 
-  // Progress tracking
+  // Progress tracking and overwrite control
   let totalSkills = 0;
   let processedSkills = 0;
+  let globalOverwriteAll = silentOverwrite;
 
   // Count total skills for progress tracking
   for (const project of projects) {
@@ -249,7 +251,7 @@ export async function pullSingleProject(
             hasContentMatch = existingFiles.some(file => !isContentDifferent(file.content, scriptContent));
 
             if (hasContentMatch) {
-              // Content is the same - remove old files and write with correct IDN name
+              // Content is the same - handle file naming
               const matchingFile = existingFiles.find(file => !isContentDifferent(file.content, scriptContent));
               const correctName = `${skill.idn}.${getExtensionForRunner(skill.runner_type)}`;
 
@@ -258,29 +260,41 @@ export async function pullSingleProject(
                 await fs.remove(matchingFile.filePath);
                 if (verbose) console.log(`        🔄 Renamed ${matchingFile.fileName} → ${correctName}`);
               } else if (matchingFile && matchingFile.fileName === correctName) {
-                // Already has correct name and content
+                // Already has correct name and content - skip completely
                 shouldWrite = false;
                 newHashes[matchingFile.filePath] = sha256(scriptContent);
                 if (verbose) console.log(`        ✓ Content unchanged for ${skill.idn}, keeping existing file`);
               }
-            } else if (!silentOverwrite) {
-              // Content is different, ask for overwrite
+            } else if (!globalOverwriteAll) {
+              // Content is different, ask for overwrite unless global override is set
               const existingFile = existingFiles[0]!;
-              const shouldOverwrite = await askForOverwrite(
+              const overwriteChoice: OverwriteChoice = await askForOverwrite(
                 skill.idn,
-                existingFile.fileName,
-                `${skill.idn}.${getExtensionForRunner(skill.runner_type)}`
+                existingFile.content,
+                scriptContent,
+                existingFile.fileName
               );
 
-              if (!shouldOverwrite) {
-                shouldWrite = false;
-                if (verbose) console.log(`        ⚠️  Skipped overwrite for ${skill.idn}`);
-              } else {
-                // Remove existing files before writing new one
+              if (overwriteChoice === 'quit') {
+                console.log('❌ Pull operation cancelled by user');
+                process.exit(0);
+              } else if (overwriteChoice === 'all') {
+                globalOverwriteAll = true;
+                // Continue with overwrite
+                for (const file of existingFiles) {
+                  await fs.remove(file.filePath);
+                  if (verbose) console.log(`        🗑️  Removed ${file.fileName}`);
+                }
+              } else if (overwriteChoice === 'yes') {
+                // Single overwrite
                 for (const file of existingFiles) {
                   await fs.remove(file.filePath);
                   if (verbose) console.log(`        🗑️  Removed ${file.fileName}`);
                 }
+              } else {
+                // User said no
+                shouldWrite = false;
+                if (verbose) console.log(`        ⚠️  Skipped overwrite for ${skill.idn}`);
               }
             } else {
               // Silent overwrite mode - remove existing files

package/src/sync/skill-files.ts

@@ -142,35 +142,66 @@ export function isContentDifferent(existingContent: string, newContent: string):
   return sha256(existingContent.trim()) !== sha256(newContent.trim());
 }
 
+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<boolean> {
+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⚠️  Content differs for skill ${skillIdn} (${fileName}):`);
+
+  // ANSI color codes
+  const red = '\x1b[31m';
+  const green = '\x1b[32m';
+  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++;
+    }
+  }
+
+  if (diffShown === maxDiffLines) {
+    console.log('   ... (more differences)');
+  }
 
   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();
 
   const choice = answer.toLowerCase().trim();
 
   if (choice === 'q' || choice === 'quit') {
-    console.log('❌ Pull operation cancelled by user');
-    process.exit(0);
+    return 'quit';
   }
 
   if (choice === 'a' || choice === 'all') {
-    return true; // This should be handled by caller to set global overwrite mode
+    return 'all';
+  }
+
+  if (choice === 'y' || choice === 'yes') {
+    return 'yes';
   }
 
-  return choice === 'y' || choice === 'yes';
+  return 'no';
 }