newo 3.7.4 → 3.7.5

package/dist/cli/commands/sandbox.js

@@ -1,21 +1,62 @@
 /**
  * Sandbox Chat Command Handler
  * Supports both single-command and interactive modes
+ *
+ * Usage:
+ *   npx newo sandbox "Hello" --customer <idn>               # Single message mode
+ *   npx newo sandbox --actor <actor_id> "Follow up"         # Continue existing chat
+ *   npx newo sandbox "ping" --connector vibe_agent          # Select specific connector (v3.7.5)
+ *   npx newo sandbox --list-connectors                      # Show running sandbox connectors (v3.7.5)
+ *   npx newo sandbox --file ./msg.txt --actor <id>          # Message from file (v3.7.5)
+ *   cat msg.txt | npx newo sandbox --stdin                  # Message from stdin (v3.7.5)
+ *   npx newo sandbox "ping" --timeout 420                   # Custom response timeout in seconds (v3.7.5)
+ *   npx newo sandbox "ping" --json                          # Machine-readable output (v3.7.5)
  */
+import fs from 'fs-extra';
 import { makeClient } from '../../api.js';
 import { getValidAccessToken } from '../../auth.js';
 import { selectSingleCustomer } from '../customer-selection.js';
 import { getChatHistory } from '../../api.js';
-import { findSandboxConnector, createChatSession, sendMessage, pollForResponse, extractAgentMessages, formatDebugInfo } from '../../sandbox/chat.js';
+import { findSandboxConnector, listRunningSandboxConnectors, createChatSession, sendMessage, pollForResponse, extractAgentMessages, formatDebugInfo } from '../../sandbox/chat.js';
+const DEFAULT_TIMEOUT_SECONDS = 60;
+/**
+ * Normalize an act's external_event_id: the chat-history converter falls back
+ * to the placeholder 'chat_history' when the API omits the field.
+ */
+function actEventId(act) {
+    if (!act)
+        return null;
+    const id = act.external_event_id;
+    return id && id !== 'chat_history' ? id : null;
+}
+/**
+ * Read message text from --file, --stdin, or positional argument
+ */
+async function resolveMessage(args) {
+    if (args.file) {
+        const filePath = String(args.file);
+        if (!(await fs.pathExists(filePath))) {
+            throw new Error(`Message file not found: ${filePath}`);
+        }
+        return await fs.readFile(filePath, 'utf8');
+    }
+    if (args.stdin) {
+        const chunks = [];
+        for await (const chunk of process.stdin) {
+            chunks.push(Buffer.from(chunk));
+        }
+        return Buffer.concat(chunks).toString('utf8');
+    }
+    const messageArg = args._[1];
+    return messageArg === undefined ? null : String(messageArg);
+}
 /**
  * Handle sandbox command
- * Usage:
- *   npx newo sandbox "Hello" --customer <idn>              # Single message mode
- *   npx newo sandbox --actor <actor_id> "Follow up"       # Continue existing chat
- *   npx newo sandbox --interactive                        # Interactive mode (TBD)
  */
 export async function handleSandboxCommand(customerConfig, args, verbose) {
-    const quiet = Boolean(args.quiet || args.q);
+    const json = Boolean(args.json);
+    // --json implies quiet logging: stdout must stay machine-readable
+    const quiet = Boolean(args.quiet || args.q) || json;
     // Save original console functions
     const originalConsoleLog = console.log;
     const originalConsoleError = console.error;
@@ -47,6 +88,13 @@ export async function handleSandboxCommand(customerConfig, args, verbose) {
             console.error = originalConsoleError;
             console.warn = originalConsoleWarn;
         }
+        const integrationIdn = args.integration ? String(args.integration) : undefined;
+        const connectorIdn = args.connector ? String(args.connector) : undefined;
+        // List running connectors and exit
+        if (args['list-connectors']) {
+            await listConnectorsCommand(client, integrationIdn, json);
+            return;
+        }
         // Check for interactive mode
         const interactive = args.interactive || args.i;
         if (interactive) {
@@ -56,32 +104,42 @@ export async function handleSandboxCommand(customerConfig, args, verbose) {
             }
             process.exit(1);
         }
+        const timeoutSeconds = args.timeout ? parseFloat(String(args.timeout)) : DEFAULT_TIMEOUT_SECONDS;
+        if (!Number.isFinite(timeoutSeconds) || timeoutSeconds <= 0) {
+            if (!quiet)
+                console.error(`❌ Invalid --timeout value: ${args.timeout} (expected positive number of seconds)`);
+            process.exit(1);
+        }
+        const options = {
+            quiet,
+            json,
+            verbose: quiet ? false : verbose,
+            timeoutMs: timeoutSeconds * 1000,
+            integrationIdn,
+            connectorIdn
+        };
         // Check if continuing existing chat
         const actorId = args.actor;
-        // Extract message from arguments (position depends on whether --actor is used)
-        const messageArg = args._[1];
-        if (!messageArg) {
+        const message = await resolveMessage(args);
+        if (message === null) {
             if (!quiet) {
                 console.log('❌ Message is required');
-                console.log('Usage: npx newo sandbox "your message" [--actor <id>]');
-                console.log('   or: npx newo sandbox --actor <id> "your message"');
+                console.log('Usage: npx newo sandbox "your message" [--actor <id>] [--connector <idn>]');
+                console.log('   or: npx newo sandbox --file <path> [--actor <id>]');
+                console.log('   or: cat msg.txt | npx newo sandbox --stdin [--actor <id>]');
             }
             process.exit(1);
         }
-        // Convert to string (minimist may parse numbers)
-        const message = String(messageArg);
         if (message.trim() === '') {
             if (!quiet)
                 console.log('❌ Message cannot be empty');
             process.exit(1);
         }
         if (actorId) {
-            // Continue existing chat
-            await continueExistingChat(client, actorId, message, verbose, quiet, originalConsoleLog, originalConsoleError, originalConsoleWarn);
+            await continueExistingChat(client, actorId, message, options, originalConsoleLog);
         }
         else {
-            // Start new chat
-            await startNewChat(client, message, verbose, quiet, originalConsoleLog, originalConsoleError, originalConsoleWarn);
+            await startNewChat(client, message, options, originalConsoleLog);
         }
     }
     catch (error) {
@@ -107,23 +165,78 @@ export async function handleSandboxCommand(customerConfig, args, verbose) {
         }
     }
 }
+/**
+ * Print running connectors of the (sandbox) integration
+ */
+async function listConnectorsCommand(client, integrationIdn, asJson) {
+    const connectors = await listRunningSandboxConnectors(client, integrationIdn);
+    if (asJson) {
+        console.log(JSON.stringify(connectors.map(c => ({
+            connector_idn: c.connector_idn,
+            integration_idn: c.integration_idn,
+            title: c.title,
+            status: c.status
+        })), null, 2));
+        return;
+    }
+    if (connectors.length === 0) {
+        console.log(`No running connectors found in integration '${integrationIdn || 'sandbox'}'`);
+        return;
+    }
+    console.log(`🔌 Running connectors in integration '${integrationIdn || 'sandbox'}':\n`);
+    for (const c of connectors) {
+        console.log(`   ${c.connector_idn}${c.title ? `  (${c.title})` : ''}`);
+    }
+    console.log(`\n💡 Use: npx newo sandbox "your message" --connector <connector_idn>`);
+}
+/**
+ * Build and print the --json result object
+ */
+function printJsonResult(session, acts, userAct, elapsedMs, print) {
+    const agentAct = acts.find(a => a.is_agent) || null;
+    const jsonResult = {
+        actor_id: session.user_actor_id,
+        persona_id: session.user_persona_id !== 'unknown' ? session.user_persona_id : null,
+        connector_idn: session.connector_idn,
+        // external_event_id of the user turn is the correlation key for `newo logs --event-id`
+        external_event_id: actEventId(userAct),
+        user_external_event_id: actEventId(userAct),
+        agent_external_event_id: actEventId(agentAct),
+        response: agentAct ? (agentAct.source_text || agentAct.original_text || null) : null,
+        elapsed_ms: elapsedMs,
+        timed_out: agentAct === null,
+        flow_idn: agentAct && agentAct.flow_idn !== 'unknown' ? agentAct.flow_idn : null,
+        skill_idn: agentAct && agentAct.skill_idn !== 'unknown' ? agentAct.skill_idn : null,
+        session_id: agentAct && agentAct.session_id !== 'unknown' ? agentAct.session_id : null
+    };
+    print(JSON.stringify(jsonResult, null, 2));
+}
 /**
  * Start a new sandbox chat and send a message
  */
-async function startNewChat(client, message, verbose, quiet = false, originalConsoleLog = console.log, _originalConsoleError = console.error, _originalConsoleWarn = console.warn) {
+async function startNewChat(client, message, options, originalConsoleLog) {
+    const { quiet, json, verbose, timeoutMs } = options;
     if (!quiet)
         console.log('🔧 Starting new sandbox chat...\n');
-    // Find sandbox connector
-    const connector = await findSandboxConnector(client, quiet ? false : verbose);
+    // Find sandbox connector (throws with available list when --connector not found)
+    const selection = {};
+    if (options.integrationIdn)
+        selection.integrationIdn = options.integrationIdn;
+    if (options.connectorIdn)
+        selection.connectorIdn = options.connectorIdn;
+    const connector = await findSandboxConnector(client, verbose, selection);
     if (!connector) {
         if (!quiet) {
             console.error('❌ No running sandbox connector found');
             console.error('   Please ensure you have a sandbox connector configured in your NEWO project');
         }
+        else if (json) {
+            originalConsoleLog(JSON.stringify({ error: 'No running sandbox connector found' }));
+        }
         process.exit(1);
     }
     // Create chat session
-    const session = await createChatSession(client, connector, quiet ? false : verbose);
+    const session = await createChatSession(client, connector, verbose);
     if (!quiet) {
         console.log(`\n📋 Chat Session Created:`);
         console.log(`   Chat ID (actor_id): ${session.user_actor_id}`);
@@ -132,14 +245,20 @@ async function startNewChat(client, message, verbose, quiet = false, originalCon
         console.log(`   External ID: ${session.external_id}\n`);
         console.log(`📤 You: ${message}\n`);
     }
-    else {
+    else if (!json) {
         // In quiet mode, output Chat ID FIRST to stdout
         originalConsoleLog(`CHAT_ID:${session.user_actor_id}`);
         originalConsoleLog(`You: ${message}`);
     }
-    const sentAt = await sendMessage(client, session, message, quiet ? false : verbose);
+    const startedAt = Date.now();
+    const sentAt = await sendMessage(client, session, message, verbose);
     // Poll for response
-    const { acts, agentPersonaId } = await pollForResponse(client, session, sentAt, quiet ? false : verbose);
+    const { acts, agentPersonaId, userAct } = await pollForResponse(client, session, sentAt, verbose, timeoutMs);
+    const elapsedMs = Date.now() - startedAt;
+    if (json) {
+        printJsonResult(session, acts, userAct, elapsedMs, originalConsoleLog);
+        return;
+    }
     if (acts.length === 0) {
         if (!quiet) {
             console.log('⏱️  No response received within timeout period');
@@ -174,38 +293,40 @@ async function startNewChat(client, message, verbose, quiet = false, originalCon
     if (quiet) {
         return; // Exit early, showing only messages
     }
-    // Display debug information (skip in quiet mode)
-    if (!quiet) {
-        if (verbose) {
-            console.log('\n📊 Debug Information:');
-            console.log(formatDebugInfo(acts));
-            console.log('');
-        }
-        else {
-            // Show condensed debug info for single-command mode
-            console.log('📊 Debug Summary:');
-            const agentActs = acts.filter(a => a.is_agent);
-            if (agentActs.length > 0) {
-                const lastAct = agentActs[agentActs.length - 1];
-                if (lastAct) {
-                    console.log(`   Flow: ${lastAct.flow_idn || 'N/A'}`);
-                    console.log(`   Skill: ${lastAct.skill_idn || 'N/A'}`);
-                    console.log(`   Session: ${lastAct.session_id}`);
+    // Display debug information
+    if (verbose) {
+        console.log('\n📊 Debug Information:');
+        console.log(formatDebugInfo(acts));
+        console.log('');
+    }
+    else {
+        // Show condensed debug info for single-command mode
+        console.log('📊 Debug Summary:');
+        const agentActs = acts.filter(a => a.is_agent);
+        if (agentActs.length > 0) {
+            const lastAct = agentActs[agentActs.length - 1];
+            if (lastAct) {
+                console.log(`   Flow: ${lastAct.flow_idn || 'N/A'}`);
+                console.log(`   Skill: ${lastAct.skill_idn || 'N/A'}`);
+                console.log(`   Session: ${lastAct.session_id}`);
+                if (actEventId(userAct)) {
+                    console.log(`   Event ID (user turn): ${actEventId(userAct)}`);
                 }
-                console.log(`   Acts Processed: ${acts.length} (${agentActs.length} agent, ${acts.length - agentActs.length} system)`);
             }
-            console.log('');
+            console.log(`   Acts Processed: ${acts.length} (${agentActs.length} agent, ${acts.length - agentActs.length} system)`);
         }
-        // Show continuation info
-        console.log(`💡 To continue this conversation:`);
-        console.log(`   npx newo sandbox --actor ${session.user_actor_id} "your next message"`);
         console.log('');
     }
+    // Show continuation info
+    console.log(`💡 To continue this conversation:`);
+    console.log(`   npx newo sandbox --actor ${session.user_actor_id} "your next message"`);
+    console.log('');
 }
 /**
  * Continue an existing sandbox chat
  */
-async function continueExistingChat(client, actorId, message, verbose, quiet = false, originalConsoleLog = console.log, _originalConsoleError = console.error, _originalConsoleWarn = console.warn) {
+async function continueExistingChat(client, actorId, message, options, originalConsoleLog) {
+    const { quiet, json, verbose, timeoutMs } = options;
     if (!quiet) {
         console.log(`💬 Continuing chat...`);
         console.log(`   Chat ID: ${actorId}\n`);
@@ -232,20 +353,27 @@ async function continueExistingChat(client, actorId, message, verbose, quiet = f
         user_actor_id: actorId,
         user_persona_id: 'unknown', // Not needed for continuation
         agent_persona_id: null,
-        connector_idn: 'sandbox',
+        connector_idn: options.connectorIdn || 'sandbox',
         session_id: null,
         external_id: 'continuation'
     };
     // Send message (use original console in quiet mode)
     if (quiet) {
-        originalConsoleLog(`You: ${message}`);
+        if (!json)
+            originalConsoleLog(`You: ${message}`);
     }
     else {
         console.log(`📤 You: ${message}\n`);
     }
-    const sentAt = await sendMessage(client, session, message, quiet ? false : verbose);
+    const startedAt = Date.now();
+    const sentAt = await sendMessage(client, session, message, verbose);
     // Poll for response using timestamp-based filtering
-    const { acts } = await pollForResponse(client, session, sentAt, quiet ? false : verbose);
+    const { acts, userAct } = await pollForResponse(client, session, sentAt, verbose, timeoutMs);
+    const elapsedMs = Date.now() - startedAt;
+    if (json) {
+        printJsonResult(session, acts, userAct, elapsedMs, originalConsoleLog);
+        return;
+    }
     if (acts.length === 0) {
         if (!quiet) {
             console.log('⏱️  No response received within timeout period');
@@ -292,6 +420,9 @@ async function continueExistingChat(client, actorId, message, verbose, quiet = f
                     console.log(`   Flow: ${lastAct.flow_idn || 'N/A'}`);
                     console.log(`   Skill: ${lastAct.skill_idn || 'N/A'}`);
                     console.log(`   Session: ${lastAct.session_id}`);
+                    if (actEventId(userAct)) {
+                        console.log(`   Event ID (user turn): ${actEventId(userAct)}`);
+                    }
                 }
                 console.log(`   Acts Processed: ${acts.length} (${agentActs.length} agent, ${acts.length - agentActs.length} user)`);
             }

package/dist/cli/commands/update-skill.d.ts

@@ -0,0 +1,4 @@
+import type { MultiCustomerConfig, CliArgs } from '../../types.js';
+export declare function findLocalProjectWorkspace(customerIdn: string, projectIdn: string): Promise<string | null>;
+export declare function handleUpdateSkillCommand(customerConfig: MultiCustomerConfig, args: CliArgs, verbose?: boolean): Promise<void>;
+//# sourceMappingURL=update-skill.d.ts.map

package/dist/cli/commands/update-skill.js

@@ -0,0 +1,119 @@
+/**
+ * Update Skill Command Handler - Point edit of a skill directly on the platform
+ *
+ * Usage:
+ *   newo update-skill <skill-idn> --project <idn> --agent <idn> --flow <idn> \
+ *       [--model <provider_idn>/<model_idn>] \
+ *       [--script <file.nsl|file.guidance>] \
+ *       [--publish] [--publish-description "<text>"]
+ *
+ * Unlike `newo push`, this changes exactly one skill without requiring a
+ * pulled workspace and without touching any other modified files. Typical
+ * use: temporarily switching a skill's model for an A/B test run.
+ */
+import fs from 'fs-extra';
+import { requireSingleCustomer } from '../customer-selection.js';
+import { makeClient, updateSkill, publishFlow } from '../../api.js';
+import { getValidAccessToken } from '../../auth.js';
+import { resolveRemoteSkill, parseModelFlag } from '../../sync/remote-skill.js';
+import { projectDir } from '../../fsutil.js';
+import { v2ProjectDir } from '../../format/paths-v2.js';
+const USAGE = 'Usage: newo update-skill <skill-idn> --project <project-idn> --agent <agent-idn> --flow <flow-idn> [--model <provider>/<model>] [--script <file>] [--publish] [--publish-description "<text>"] [--customer <idn>]';
+export async function findLocalProjectWorkspace(customerIdn, projectIdn) {
+    const candidates = [
+        projectDir(customerIdn, projectIdn),
+        v2ProjectDir(customerIdn, projectIdn)
+    ];
+    for (const candidate of candidates) {
+        if (await fs.pathExists(candidate)) {
+            return candidate;
+        }
+    }
+    return null;
+}
+export async function handleUpdateSkillCommand(customerConfig, args, verbose = false) {
+    const skillIdn = args._[1];
+    const projectIdn = args.project;
+    const agentIdn = args.agent;
+    const flowIdn = args.flow;
+    const modelFlag = args.model;
+    const scriptFlag = args.script;
+    const shouldPublish = Boolean(args.publish);
+    const publishDescription = args['publish-description'];
+    if (!skillIdn || !projectIdn || !agentIdn || !flowIdn) {
+        console.error('Error: skill IDN, --project, --agent and --flow are required');
+        console.error(USAGE);
+        process.exit(1);
+    }
+    if (!modelFlag && !scriptFlag) {
+        console.error('Error: nothing to update — pass --model and/or --script');
+        console.error(USAGE);
+        process.exit(1);
+    }
+    const newModel = modelFlag ? parseModelFlag(String(modelFlag)) : null;
+    let newScript = null;
+    if (scriptFlag) {
+        const scriptPath = String(scriptFlag);
+        if (!(await fs.pathExists(scriptPath))) {
+            console.error(`Error: script file not found: ${scriptPath}`);
+            process.exit(1);
+        }
+        newScript = await fs.readFile(scriptPath, 'utf8');
+    }
+    const selectedCustomer = requireSingleCustomer(customerConfig, args.customer);
+    const token = await getValidAccessToken(selectedCustomer);
+    const client = await makeClient(verbose, token);
+    if (verbose)
+        console.log(`🔍 Resolving skill ${projectIdn}/${agentIdn}/${flowIdn}/${skillIdn}...`);
+    const { project, agent, flow, skill } = await resolveRemoteSkill(client, {
+        projectIdn,
+        agentIdn,
+        flowIdn,
+        skillIdn
+    });
+    // Build updated skill object, preserving everything we don't change
+    const updatedSkill = {
+        ...skill,
+        ...(newModel ? { model: newModel } : {}),
+        ...(newScript !== null ? { prompt_script: newScript } : {})
+    };
+    console.log(`✏️  Updating skill: ${project.idn}/${agent.idn}/${flow.idn}/${skill.idn} (${skill.id})`);
+    if (newModel) {
+        console.log(`   Model: ${skill.model.provider_idn}/${skill.model.model_idn} → ${newModel.provider_idn}/${newModel.model_idn}`);
+    }
+    if (newScript !== null) {
+        console.log(`   Script: ${(skill.prompt_script || '').length} chars → ${newScript.length} chars (from ${scriptFlag})`);
+    }
+    await updateSkill(client, updatedSkill);
+    console.log('✅ Skill updated (draft)');
+    // Warn when a pulled local workspace exists: it now diverges from the platform
+    const localProjectDir = await findLocalProjectWorkspace(selectedCustomer.idn, project.idn);
+    if (localProjectDir) {
+        console.warn(`⚠️  Local workspace exists at ${localProjectDir} and now differs from the platform.`);
+        console.warn(`   Run 'newo pull' to sync it, or remember to revert this change.`);
+    }
+    if (shouldPublish) {
+        const publishData = {
+            version: '1.0',
+            description: publishDescription || 'Published via NEWO CLI (update-skill)',
+            type: 'public'
+        };
+        try {
+            await publishFlow(client, flow.id, publishData);
+            console.log(`🚀 Flow published: ${flow.idn}`);
+        }
+        catch (error) {
+            const errorMessage = error.response?.data?.message || error.message || 'Unknown error';
+            console.error(`❌ Failed to publish flow '${flow.idn}': ${errorMessage}`);
+            const errorDetails = error.response?.data?.reasons || error.response?.data?.errors || error.response?.data?.detail;
+            if (errorDetails) {
+                console.error(`   Details: ${JSON.stringify(errorDetails)}`);
+            }
+            process.exit(1);
+        }
+    }
+    else {
+        console.log(`💡 Changes are draft-only. Add --publish to publish flow '${flow.idn}'.`);
+    }
+}
+//# sourceMappingURL=update-skill.js.map

package/dist/cli.js

@@ -21,6 +21,8 @@ import { handleDeleteAgentCommand } from './cli/commands/delete-agent.js';
 import { handleCreateFlowCommand } from './cli/commands/create-flow.js';
 import { handleDeleteFlowCommand } from './cli/commands/delete-flow.js';
 import { handleCreateSkillCommand } from './cli/commands/create-skill.js';
+import { handleGetSkillCommand } from './cli/commands/get-skill.js';
+import { handleUpdateSkillCommand } from './cli/commands/update-skill.js';
 import { handleDeleteSkillCommand } from './cli/commands/delete-skill.js';
 import { handleCreateProjectCommand } from './cli/commands/create-project.js';
 import { handleCreateCustomerCommand } from './cli/commands/create-customer.js';
@@ -161,6 +163,12 @@ async function main() {
             case 'create-skill':
                 await handleCreateSkillCommand(customerConfig, args, verbose);
                 break;
+            case 'get-skill':
+                await handleGetSkillCommand(customerConfig, args, verbose);
+                break;
+            case 'update-skill':
+                await handleUpdateSkillCommand(customerConfig, args, verbose);
+                break;
             case 'delete-skill':
                 await handleDeleteSkillCommand(customerConfig, args, verbose);
                 break;

package/dist/domain/strategies/sync/V2ProjectSyncStrategy.d.ts

@@ -104,6 +104,9 @@ export declare class V2ProjectSyncStrategy implements ISyncStrategy<ProjectMeta,
      * V2 path: newo_customers/{cust}/{proj}/agents/{agent}/flows/{flow}/skills/{skill}.nsl
      */
     private pushV2SkillUpdate;
+    private normalizePathForComparison;
+    private resolveV2SkillTargetForScriptPath;
+    private resolveV2SkillTargetFromCanonicalPath;
     /**
      * Push a V2 library skill update
      * Path: .../newo_customers/{cust}/{proj}/libraries/{lib}/skills/{skillFile}

package/dist/domain/strategies/sync/V2ProjectSyncStrategy.js

@@ -14,6 +14,7 @@
  *           skills/{SkillIdn}.nsl|.nslg
  */
 import fs from 'fs-extra';
+import path from 'path';
 import { listProjects, listAgents, listFlowSkills, listFlowEvents, listFlowStates, createSkill, createSkillParameter, updateSkill, publishFlow, getProjectAttributes, getCustomerAttributes, listLibraries, updateLibrarySkill, getFlow, } from '../../../api.js';
 import { syncFlowMetadata, emptyFlowSyncCounts, totalFlowSyncOps, describeFlowSyncCounts } from '../../../sync/flow-metadata.js';
 import { ensureStateOnly, writeFileSafe, mapPath, } from '../../../fsutil.js';
@@ -460,7 +461,7 @@ export class V2ProjectSyncStrategy {
                     const isLibrary = change.path.includes('/libraries/');
                     const count = isLibrary
                         ? await this.pushV2LibrarySkillUpdate(client, change, mapData, newHashes)
-                        : await this.pushV2SkillUpdate(client, change, mapData, newHashes);
+                        : await this.pushV2SkillUpdate(client, change, mapData, newHashes, customer.idn);
                     result.updated += count;
                 }
             }
@@ -818,23 +819,12 @@ export class V2ProjectSyncStrategy {
      *
      * V2 path: newo_customers/{cust}/{proj}/agents/{agent}/flows/{flow}/skills/{skill}.nsl
      */
-    async pushV2SkillUpdate(client, change, mapData, newHashes) {
-        // Parse V2 path to extract entity hierarchy
-        // Path: .../newo_customers/{cust}/{proj}/agents/{agent}/flows/{flow}/skills/{skillFile}
-        const pathParts = change.path.split('/');
-        const skillFileName = pathParts[pathParts.length - 1] || '';
-        const skillIdn = skillFileName.replace(/\.(nsl|nslg|jinja|guidance)$/, '');
-        // skills/ -> flow/ -> flows/ -> agent/ -> agents/ -> project/
-        const flowIdn = pathParts[pathParts.length - 3] || '';
-        const agentIdn = pathParts[pathParts.length - 5] || '';
-        const projectIdn = pathParts[pathParts.length - 7] || '';
-        // Look up skill in map
-        const projectData = mapData.projects[projectIdn];
-        const agentData = projectData?.agents[agentIdn];
-        const flowData = agentData?.flows[flowIdn];
-        const skillData = flowData?.skills[skillIdn];
-        if (!skillData) {
-            throw new Error(`Skill ${skillIdn} not found in project map (path: ${change.path})`);
+    async pushV2SkillUpdate(client, change, mapData, newHashes, customerIdn) {
+        const target = await this.resolveV2SkillTargetForScriptPath(customerIdn, change.path, mapData) ||
+            this.resolveV2SkillTargetFromCanonicalPath(change.path, mapData);
+        const skillData = target?.skillData;
+        if (!target || !skillData) {
+            throw new Error(`Skill not found in project map (path: ${change.path})`);
         }
         // Read updated script content
         const content = await fs.readFile(change.path, 'utf8');
@@ -850,9 +840,67 @@ export class V2ProjectSyncStrategy {
             path: skillData.path
         });
         newHashes[change.path] = sha256(content);
-        this.logger.info(`[newo_v2] Pushed: ${skillIdn}`);
+        this.logger.info(`[newo_v2] Pushed: ${target.skillIdn}`);
         return 1;
     }
+    normalizePathForComparison(filePath) {
+        return path.resolve(filePath).replace(/\\/g, '/');
+    }
+    async resolveV2SkillTargetForScriptPath(customerIdn, scriptPath, mapData) {
+        const normalizedScriptPath = this.normalizePathForComparison(scriptPath);
+        for (const [projectIdn, projectData] of Object.entries(mapData.projects)) {
+            for (const [agentIdn, agentData] of Object.entries(projectData.agents)) {
+                for (const [flowIdn, flowData] of Object.entries(agentData.flows)) {
+                    const flowYamlPath = v2FlowYamlPath(customerIdn, projectIdn, agentIdn, flowIdn);
+                    if (!(await fs.pathExists(flowYamlPath))) {
+                        continue;
+                    }
+                    let flowDef;
+                    try {
+                        flowDef = await parseV2FlowYaml(flowYamlPath);
+                    }
+                    catch {
+                        continue;
+                    }
+                    for (const skill of flowDef.skills || []) {
+                        const runnerType = this.normalizeRunnerType(skill.runner_type || flowData.skills[skill.idn]?.runner_type);
+                        const resolvedScriptPath = await this.resolveV2FlowSkillScriptPath(customerIdn, projectIdn, agentIdn, flowIdn, skill.idn, runnerType, skill.prompt_script);
+                        if (this.normalizePathForComparison(resolvedScriptPath) === normalizedScriptPath) {
+                            return {
+                                projectIdn,
+                                agentIdn,
+                                flowIdn,
+                                skillIdn: skill.idn,
+                                skillData: flowData.skills[skill.idn]
+                            };
+                        }
+                    }
+                }
+            }
+        }
+        return null;
+    }
+    resolveV2SkillTargetFromCanonicalPath(scriptPath, mapData) {
+        // Parse canonical V2 path:
+        // .../newo_customers/{cust}/{proj}/agents/{agent}/flows/{flow}/skills/{skillFile}
+        const pathParts = scriptPath.split('/');
+        const skillFileName = pathParts[pathParts.length - 1] || '';
+        const skillIdn = skillFileName.replace(/\.(nsl|nslg|jinja|guidance)$/, '');
+        // skills/ -> flow/ -> flows/ -> agent/ -> agents/ -> project/
+        const flowIdn = pathParts[pathParts.length - 3] || '';
+        const agentIdn = pathParts[pathParts.length - 5] || '';
+        const projectIdn = pathParts[pathParts.length - 7] || '';
+        const projectData = mapData.projects[projectIdn];
+        const agentData = projectData?.agents[agentIdn];
+        const flowData = agentData?.flows[flowIdn];
+        return {
+            projectIdn,
+            agentIdn,
+            flowIdn,
+            skillIdn,
+            skillData: flowData?.skills[skillIdn]
+        };
+    }
     /**
      * Push a V2 library skill update
      * Path: .../newo_customers/{cust}/{proj}/libraries/{lib}/skills/{skillFile}