npm - @nexusclawhq/cli - Versions diffs - 0.3.4 → 0.3.5 - Mend

@nexusclawhq/cli 0.3.4 → 0.3.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (49) hide show

package/dist/nexus-cli/src/commands/source/pull.js CHANGED Viewed

@@ -1,12 +1,18 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pullCommand = void 0;
 const commander_1 = require("commander");
+const node_fs_1 = __importDefault(require("node:fs"));
 const source_tracker_1 = require("../../services/source-tracker");
 const error_handler_1 = require("../../utils/error-handler");
 const api_client_1 = require("../../services/api-client");
 const spinner_1 = require("../../utils/spinner");
 const revision_ledger_1 = require("../../services/revision-ledger");
+const machine_result_1 = require("../../contracts/machine-result");
+const target_context_1 = require("../../services/target-context");
 function matchesSelectedPath(trackedPath, selectedPaths) {
     if (!selectedPaths?.length) {
         return true;
@@ -37,7 +43,11 @@ exports.pullCommand = new commander_1.Command('pull')
         if (!options.dryRun) {
             await (0, revision_ledger_1.ensureRevisionLedgerInitialized)('.', environment);
         }
-        const client = (0, api_client_1.createApiClient)(options.targetOrg);
+        const hasManifest = node_fs_1.default.existsSync('nexus-project.yaml') || node_fs_1.default.existsSync('nexus-project.json');
+        const targetOrg = hasManifest && (!process.env.NEXUS_AUTH_TOKEN || options.targetOrg)
+            ? (0, target_context_1.resolveTargetContext)({ workspaceDir: '.', targetOrg: options.targetOrg }).context.targetOrg
+            : options.targetOrg;
+        const client = (0, api_client_1.createApiClient)(targetOrg);
         await client.ensureValidToken();
         const sourceStatus = await client.getSourceStatus();
         const statuses = (0, source_tracker_1.calculateSourceStatus)({
@@ -47,12 +57,25 @@ exports.pullCommand = new commander_1.Command('pull')
         }).filter((entry) => matchesSelectedPath(entry.path, options.path));
         const conflicts = statuses.filter((entry) => entry.syncStatus === 'conflict');
         if (conflicts.length > 0 && !options.force) {
-            throw new Error(`Source pull blocked by conflicts: ${conflicts.map((conflict) => conflict.path).join(', ')}`);
+            const error = new Error('Source pull blocked by conflicts.');
+            Object.assign(error, {
+                code: 'SOURCE_CONFLICT',
+                details: {
+                    conflicts: conflicts.map((conflict) => ({
+                        path: conflict.path,
+                        componentKey: conflict.componentKey,
+                        canonicalCollision: conflict.canonicalCollision ?? false,
+                        aliases: conflict.aliases,
+                    })),
+                },
+            });
+            throw error;
         }
         const toPull = statuses.filter((entry) => ['remote-new', 'remote-changed', 'remote-delete'].includes(entry.syncStatus)
             || (entry.syncStatus === 'conflict' && options.force));
         const metadataSelectors = options.metadata;
         const metadataDirs = options.metadataDir;
+        const filterWarnings = [];
         let filtered = toPull;
         if (metadataSelectors?.length || metadataDirs?.length) {
             if (metadataSelectors?.length && metadataDirs?.length) {
@@ -77,7 +100,11 @@ exports.pullCommand = new commander_1.Command('pull')
                 for (const selector of metadataSelectors) {
                     const matched = (0, source_tracker_1.filterByMetadataSelector)(toPull, [selector]);
                     if (matched.length === 0) {
-                        console.warn(`Warning: No matching components found for selector: ${selector}`);
+                        const warning = `No matching components found for selector: ${selector}`;
+                        if (options.json)
+                            filterWarnings.push(warning);
+                        else
+                            console.warn(`Warning: ${warning}`);
                     }
                 }
             }
@@ -85,7 +112,11 @@ exports.pullCommand = new commander_1.Command('pull')
                 for (const dir of metadataDirs) {
                     const matched = (0, source_tracker_1.filterByDirectory)(toPull, [dir]);
                     if (matched.length === 0) {
-                        console.warn(`Warning: No matching components found for directory: ${dir}`);
+                        const warning = `No matching components found for directory: ${dir}`;
+                        if (options.json)
+                            filterWarnings.push(warning);
+                        else
+                            console.warn(`Warning: ${warning}`);
                     }
                 }
             }
@@ -93,7 +124,13 @@ exports.pullCommand = new commander_1.Command('pull')
         if (filtered.length === 0) {
             spinner?.succeed('Source pull check complete');
             if (options.json) {
-                console.log(JSON.stringify({ ok: true, dryRun: !!options.dryRun, count: 0, changes: [] }));
+                (0, machine_result_1.emitCliResult)((0, machine_result_1.buildCliResult)({
+                    command: 'source pull',
+                    phase: 'complete',
+                    contractVersion: 'nexusclaw.cli-command-contract/v1',
+                    ok: true,
+                    data: { dryRun: !!options.dryRun, count: 0, changes: [], warnings: filterWarnings },
+                }));
             }
             else {
                 console.log('Nothing to pull.');
@@ -103,11 +140,12 @@ exports.pullCommand = new commander_1.Command('pull')
         if (options.dryRun) {
             spinner?.succeed('Source pull dry-run complete');
             if (options.json) {
-                console.log(JSON.stringify({
+                (0, machine_result_1.emitCliResult)((0, machine_result_1.buildCliResult)({
+                    command: 'source pull',
+                    phase: 'complete',
+                    contractVersion: 'nexusclaw.cli-command-contract/v1',
                     ok: true,
-                    dryRun: true,
-                    count: filtered.length,
-                    changes: filtered,
+                    data: { dryRun: true, count: filtered.length, changes: filtered, warnings: filterWarnings },
                 }));
             }
             else {
@@ -172,7 +210,13 @@ exports.pullCommand = new commander_1.Command('pull')
         });
         spinner?.succeed('Source pull complete');
         if (options.json) {
-            console.log(JSON.stringify({ ok: true, dryRun: false, count: filtered.length, changes: filtered }));
+            (0, machine_result_1.emitCliResult)((0, machine_result_1.buildCliResult)({
+                command: 'source pull',
+                phase: 'complete',
+                contractVersion: 'nexusclaw.cli-command-contract/v1',
+                ok: true,
+                data: { dryRun: false, count: filtered.length, changes: filtered, warnings: filterWarnings },
+            }));
         }
         else {
             console.log(`Pulled ${filtered.length} file(s) successfully.`);

package/dist/nexus-cli/src/commands/source/pull.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../../../src/commands/source/pull.ts"],"names":[],"mappings":"~~;;;~~AAAA,yCAAoC;AACpC,kEASuC;AACvC,6DAAwD;AACxD,0DAA4D;AAC5D,iDAAoD;AACpD,oEAKwC;~~AAExC~~,SAAS,mBAAmB,CAAC,WAAmB,EAAE,aAAwB;IACxE,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;QACtC,MAAM,UAAU,GAAG,IAAA,6CAA4B,EAAC,SAAS,CAAC,CAAC;QAC3D,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,WAAW,KAAK,UAAU,IAAI,WAAW,CAAC,UAAU,CAAC,GAAG,UAAU,GAAG,CAAC,CAAC;IAChF,CAAC,CAAC,CAAC;AACL,CAAC;AAEY,QAAA,WAAW,GAAG,IAAI,mBAAO,CAAC,MAAM,CAAC;KAC3C,WAAW,CAAC,qCAAqC,CAAC;KAClD,MAAM,CAAC,sBAAsB,EAAE,kBAAkB,CAAC;KAClD,MAAM,CAAC,6BAA6B,EAAE,6BAA6B,EAAE,KAAK,CAAC;KAC3E,MAAM,CAAC,SAAS,EAAE,8BAA8B,EAAE,KAAK,CAAC;KACxD,MAAM,CAAC,WAAW,EAAE,sCAAsC,EAAE,KAAK,CAAC;KAClE,MAAM,CAAC,QAAQ,EAAE,2CAA2C,EAAE,KAAK,CAAC;KACpE,MAAM,CAAC,mBAAmB,EAAE,iCAAiC,CAAC;KAC9D,MAAM,CAAC,2BAA2B,EAAE,2DAA2D,CAAC;KAChG,MAAM,CAAC,0BAA0B,EAAE,mDAAmD,CAAC;KACvF,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACxB,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,uBAAa,EAAC,0BAA0B,CAAC,CAAC,KAAK,EAAE,CAAC;IACxF,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,IAAA,4CAA0B,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACpE,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,WAAW,CAAC;QAI5C,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACpB,MAAM,IAAA,iDAA+B,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAC1D,CAAC;QACD,MAAM,MAAM,GAAG,IAAA,~~4BAAe~~,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;~~QAClD~~,MAAM,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAEhC,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,CAAC;QACpD,MAAM,QAAQ,GAAG,IAAA,sCAAqB,EAAC;YACrC,OAAO,EAAE,GAAG;YACZ,WAAW,EAAE,YAAY,CAAC,KAAK;YAC/B,aAAa,EAAE,YAAY,CAAC,aAAa;SAC1C,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAEpE,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC;QAC9E,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,~~CACb~~,~~qCAAqC~~,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,~~IAAI~~,CAAC,~~EAAE~~,~~CAC7F~~,CAAC;~~QACJ~~,CAAC;QAED,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CACvC,CAAC,YAAY,EAAE,gBAAgB,EAAE,eAAe,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC;eACzE,CAAC,KAAK,CAAC,UAAU,KAAK,UAAU,IAAI,OAAO,CAAC,KAAK,CAAC,CACtD,CAAC;QAGF,MAAM,iBAAiB,GAAyB,OAAO,CAAC,QAAQ,CAAC;QACjE,MAAM,YAAY,GAAyB,OAAO,CAAC,WAAW,CAAC;QAC/D,IAAI,QAAQ,GAAG,MAAM,CAAC;QAEtB,IAAI,iBAAiB,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,EAAE,CAAC;YACtD,IAAI,iBAAiB,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,EAAE,CAAC;gBAEtD,MAAM,UAAU,GAAG,IAAA,yCAAwB,EAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;gBACvE,MAAM,KAAK,GAAG,IAAA,kCAAiB,EAAC,MAAM,EAAE,YAAY,CAAC,CAAC;gBACtD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;gBAC/B,QAAQ,GAAG,EAAE,CAAC;gBACd,KAAK,MAAM,KAAK,IAAI,CAAC,GAAG,UAAU,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;oBAC9C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBACrB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACvB,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,IAAI,iBAAiB,EAAE,MAAM,EAAE,CAAC;gBACrC,QAAQ,GAAG,IAAA,yCAAwB,EAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;YACjE,CAAC;iBAAM,IAAI,YAAY,EAAE,MAAM,EAAE,CAAC;gBAChC,QAAQ,GAAG,IAAA,kCAAiB,EAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YACrD,CAAC;YAGD,IAAI,iBAAiB,EAAE,MAAM,EAAE,CAAC;gBAC9B,KAAK,MAAM,QAAQ,IAAI,iBAAiB,EAAE,CAAC;oBACzC,MAAM,OAAO,GAAG,IAAA,yCAAwB,EAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;oBAC7D,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBACzB,OAAO,CAAC,IAAI,CAAC,~~uDAAuD~~,~~QAAQ~~,EAAE,CAAC,CAAC;~~oBAClF~~,CAAC;gBACH,CAAC;YACH,CAAC;YACD,IAAI,YAAY,EAAE,MAAM,EAAE,CAAC;gBACzB,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;oBAC/B,MAAM,OAAO,GAAG,IAAA,kCAAiB,EAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;oBACjD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBACzB,OAAO,CAAC,IAAI,CAAC,~~wDAAwD~~,~~GAAG~~,EAAE,CAAC,CAAC;~~oBAC9E~~,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,EAAE,OAAO,CAAC,4BAA4B,CAAC,CAAC;YAC/C,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBACjB,~~OAAO~~,~~CAAC~~,~~GAAG~~,~~CAAC~~,~~IAAI~~,~~CAAC~~,~~SAAS~~,~~CAAC~~,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;~~YAC7F~~,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;YAClC,CAAC;YACD,OAAO;QACT,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,EAAE,OAAO,CAAC,8BAA8B,CAAC,CAAC;YACjD,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBACjB,OAAO,~~CAAC~~,~~GAAG~~,~~CAAC~~,~~IAAI~~,~~CAAC~~,~~SAAS~~,~~CAAC~~;~~oBACzB~~,EAAE,EAAE,IAAI;oBACR,MAAM,EAAE,IAAI~~;oBACZ~~,KAAK,EAAE,QAAQ,CAAC,MAAM~~;oBACtB~~,OAAO,EAAE,QAAQ;~~iBAClB~~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~~OAAO~~,~~CAAC~~,~~GAAG~~,~~CAAC~~,~~IAAI~~,~~CAAC~~,~~SAAS~~,~~CAAC~~,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;~~QACtG~~,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,UAAU,QAAQ,CAAC,MAAM,wBAAwB,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACpC,IAAA,2BAAW,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;IACrE,CAAC;AACH,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../../../src/commands/source/pull.ts"],"names":[],"mappings":"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"}

package/dist/nexus-cli/src/commands/source/push.js CHANGED Viewed

@@ -1,12 +1,18 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pushCommand = void 0;
 const commander_1 = require("commander");
+const node_fs_1 = __importDefault(require("node:fs"));
 const source_tracker_1 = require("../../services/source-tracker");
 const error_handler_1 = require("../../utils/error-handler");
 const api_client_1 = require("../../services/api-client");
 const spinner_1 = require("../../utils/spinner");
 const revision_ledger_1 = require("../../services/revision-ledger");
+const machine_result_1 = require("../../contracts/machine-result");
+const target_context_1 = require("../../services/target-context");
 function matchesSelectedPath(trackedPath, selectedPaths) {
     if (!selectedPaths?.length) {
         return true;
@@ -25,21 +31,28 @@ exports.pushCommand = new commander_1.Command('push')
     .option('--environment <environment>', 'Revision ledger environment', 'dev')
     .option('--force', 'Force push, ignore conflicts', false)
     .option('--dry-run', 'Show push plan without applying remote changes', false)
+    .option('--json', 'Output one machine-readable JSON document', false)
     .option('--path <paths...>', 'Only push specific source paths')
     .option('--metadata <selectors...>', 'Only push specific metadata components (Type:Name format)')
     .option('--metadata-dir <dirs...>', 'Only push source files under specific directories')
     .option('--request-timeout-ms <milliseconds>', 'Request timeout in milliseconds for the push flow', '120000')
     .action(async (options) => {
-    const spinner = (0, spinner_1.createSpinner)('Preparing source push...').start();
+    const spinner = options.json ? null : (0, spinner_1.createSpinner)('Preparing source push...').start();
     try {
         const environment = (0, revision_ledger_1.resolveRevisionEnvironment)(options.environment);
         process.env.NEXUS_ENVIRONMENT = environment;
-        await (0, revision_ledger_1.ensureRevisionLedgerInitialized)('.', environment);
+        if (!options.dryRun) {
+            await (0, revision_ledger_1.ensureRevisionLedgerInitialized)('.', environment);
+        }
         const requestTimeoutMs = Number(options.requestTimeoutMs);
         if (!Number.isFinite(requestTimeoutMs) || requestTimeoutMs <= 0) {
             throw new Error('Invalid request-timeout-ms value');
         }
-        const client = (0, api_client_1.createApiClient)(options.targetOrg, requestTimeoutMs);
+        const hasManifest = node_fs_1.default.existsSync('nexus-project.yaml') || node_fs_1.default.existsSync('nexus-project.json');
+        const targetOrg = hasManifest && (!process.env.NEXUS_AUTH_TOKEN || options.targetOrg)
+            ? (0, target_context_1.resolveTargetContext)({ workspaceDir: '.', targetOrg: options.targetOrg }).context.targetOrg
+            : options.targetOrg;
+        const client = (0, api_client_1.createApiClient)(targetOrg, requestTimeoutMs);
         await client.ensureValidToken();
         const sourceStatus = await client.getSourceStatus();
         const statuses = (0, source_tracker_1.calculateSourceStatus)({
@@ -49,18 +62,25 @@ exports.pushCommand = new commander_1.Command('push')
         }).filter((entry) => matchesSelectedPath(entry.path, options.path));
         const conflicts = statuses.filter((entry) => entry.syncStatus === 'conflict');
         if (conflicts.length > 0 && !options.force) {
-            spinner.fail('Source push blocked by conflicts');
-            console.error('Conflicts detected:');
-            for (const conflict of conflicts) {
-                console.error(`  ${conflict.path}`);
-            }
-            console.error('\nUse --force to overwrite remote changes.');
-            process.exit(1);
+            const error = new Error('Source push blocked by conflicts.');
+            Object.assign(error, {
+                code: 'SOURCE_CONFLICT',
+                details: {
+                    conflicts: conflicts.map((conflict) => ({
+                        path: conflict.path,
+                        componentKey: conflict.componentKey,
+                        canonicalCollision: conflict.canonicalCollision ?? false,
+                        aliases: conflict.aliases,
+                    })),
+                },
+            });
+            throw error;
         }
         const toPush = statuses.filter((entry) => ['local-new', 'local-changed', 'local-delete'].includes(entry.syncStatus)
             || (entry.syncStatus === 'conflict' && options.force));
         const metadataSelectors = options.metadata;
         const metadataDirs = options.metadataDir;
+        const filterWarnings = [];
         let filtered = toPush;
         if (metadataSelectors?.length || metadataDirs?.length) {
             if (metadataSelectors?.length && metadataDirs?.length) {
@@ -85,7 +105,11 @@ exports.pushCommand = new commander_1.Command('push')
                 for (const selector of metadataSelectors) {
                     const matched = (0, source_tracker_1.filterByMetadataSelector)(toPush, [selector]);
                     if (matched.length === 0) {
-                        console.warn(`Warning: No matching components found for selector: ${selector}`);
+                        const warning = `No matching components found for selector: ${selector}`;
+                        if (options.json)
+                            filterWarnings.push(warning);
+                        else
+                            console.warn(`Warning: ${warning}`);
                     }
                 }
             }
@@ -93,17 +117,33 @@ exports.pushCommand = new commander_1.Command('push')
                 for (const dir of metadataDirs) {
                     const matched = (0, source_tracker_1.filterByDirectory)(toPush, [dir]);
                     if (matched.length === 0) {
-                        console.warn(`Warning: No matching components found for directory: ${dir}`);
+                        const warning = `No matching components found for directory: ${dir}`;
+                        if (options.json)
+                            filterWarnings.push(warning);
+                        else
+                            console.warn(`Warning: ${warning}`);
                     }
                 }
             }
         }
         if (filtered.length === 0) {
-            spinner.succeed('Source push check complete');
-            console.log('Nothing to push.');
+            spinner?.succeed('Source push check complete');
+            if (options.json) {
+                (0, machine_result_1.emitCliResult)((0, machine_result_1.buildCliResult)({
+                    command: 'source push',
+                    phase: 'complete',
+                    contractVersion: 'nexusclaw.cli-command-contract/v1',
+                    ok: true,
+                    data: { dryRun: !!options.dryRun, count: 0, changes: [], plan: null, warnings: filterWarnings },
+                }));
+            }
+            else {
+                console.log('Nothing to push.');
+            }
             return;
         }
-        spinner.text = `Pushing ${filtered.length} source file(s)...`;
+        if (spinner)
+            spinner.text = `Pushing ${filtered.length} source file(s)...`;
         const localEntries = new Map((0, source_tracker_1.collectLocalSourceEntries)('.').map((entry) => [entry.path, entry]));
         const payload = filtered.map((entry) => ({
             path: entry.path,
@@ -115,14 +155,33 @@ exports.pushCommand = new commander_1.Command('push')
             dryRun: !!options.dryRun,
         });
         if (result.plan?.humanSummary?.length) {
-            console.log('Push plan:');
-            result.plan.humanSummary.forEach((line) => console.log(`  ${line}`));
+            if (!options.json) {
+                console.log('Push plan:');
+                result.plan.humanSummary.forEach((line) => console.log(`  ${line}`));
+            }
         }
         if (result.dryRun) {
-            spinner.succeed('Source push dry-run complete');
-            console.log(`\nLocal Changes (to push): ${filtered.length} file(s)`);
-            for (const entry of filtered) {
-                console.log(`  ${entry.syncStatus} ${entry.path}`);
+            spinner?.succeed('Source push dry-run complete');
+            if (options.json) {
+                (0, machine_result_1.emitCliResult)((0, machine_result_1.buildCliResult)({
+                    command: 'source push',
+                    phase: 'complete',
+                    contractVersion: 'nexusclaw.cli-command-contract/v1',
+                    ok: true,
+                    data: {
+                        dryRun: true,
+                        count: filtered.length,
+                        changes: filtered,
+                        plan: result.plan ?? null,
+                        warnings: filterWarnings,
+                    },
+                }));
+            }
+            else {
+                console.log(`\nLocal Changes (to push): ${filtered.length} file(s)`);
+                for (const entry of filtered) {
+                    console.log(`  ${entry.syncStatus} ${entry.path}`);
+                }
             }
             return;
         }
@@ -161,12 +220,31 @@ exports.pushCommand = new commander_1.Command('push')
                 summary: result.plan?.humanSummary,
             },
         });
-        spinner.succeed('Source push complete');
-        console.log(`Pushed ${filtered.length} file(s) successfully.`);
+        spinner?.succeed('Source push complete');
+        if (options.json) {
+            (0, machine_result_1.emitCliResult)((0, machine_result_1.buildCliResult)({
+                command: 'source push',
+                phase: 'complete',
+                contractVersion: 'nexusclaw.cli-command-contract/v1',
+                ok: true,
+                data: {
+                    dryRun: false,
+                    count: filtered.length,
+                    changes: filtered,
+                    plan: result.plan ?? null,
+                    beforeRevision: result.beforeRevision,
+                    afterRevision: result.afterRevision,
+                    warnings: filterWarnings,
+                },
+            }));
+        }
+        else {
+            console.log(`Pushed ${filtered.length} file(s) successfully.`);
+        }
     }
     catch (err) {
-        spinner.fail('Source push failed');
-        (0, error_handler_1.handleError)(err);
+        spinner?.fail('Source push failed');
+        (0, error_handler_1.handleError)(err, { json: !!options.json, command: 'source push' });
     }
 });
 //# sourceMappingURL=push.js.map

package/dist/nexus-cli/src/commands/source/push.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"push.js","sourceRoot":"","sources":["../../../../../src/commands/source/push.ts"],"names":[],"mappings":"~~;;;~~AAAA,yCAAoC;AACpC,kEAQuC;AACvC,6DAAwD;AACxD,0DAA4D;AAC5D,iDAAoD;AACpD,oEAKwC;~~AAExC~~,SAAS,mBAAmB,CAAC,WAAmB,EAAE,aAAwB;IACxE,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;QACtC,MAAM,UAAU,GAAG,IAAA,6CAA4B,EAAC,SAAS,CAAC,CAAC;QAC3D,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,WAAW,KAAK,UAAU,IAAI,WAAW,CAAC,UAAU,CAAC,GAAG,UAAU,GAAG,CAAC,CAAC;IAChF,CAAC,CAAC,CAAC;AACL,CAAC;AAEY,QAAA,WAAW,GAAG,IAAI,mBAAO,CAAC,MAAM,CAAC;KAC3C,WAAW,CAAC,kCAAkC,CAAC;KAC/C,MAAM,CAAC,sBAAsB,EAAE,kBAAkB,CAAC;KAClD,MAAM,CAAC,6BAA6B,EAAE,6BAA6B,EAAE,KAAK,CAAC;KAC3E,MAAM,CAAC,SAAS,EAAE,8BAA8B,EAAE,KAAK,CAAC;KACxD,MAAM,CAAC,WAAW,EAAE,gDAAgD,EAAE,KAAK,CAAC;KAC5E,MAAM,CAAC,mBAAmB,EAAE,iCAAiC,CAAC;KAC9D,MAAM,CAAC,2BAA2B,EAAE,2DAA2D,CAAC;KAChG,MAAM,CAAC,0BAA0B,EAAE,mDAAmD,CAAC;KACvF,MAAM,CAAC,qCAAqC,EAAE,mDAAmD,EAAE,QAAQ,CAAC;KAC5G,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACxB,MAAM,OAAO,GAAG,IAAA,uBAAa,EAAC,0BAA0B,CAAC,CAAC,KAAK,EAAE,CAAC;~~IAClE~~,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,IAAA,4CAA0B,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACpE,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,WAAW,CAAC;QAC5C,MAAM,IAAA,iDAA+B,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;~~QACxD~~,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,gBAAgB,IAAI,CAAC,EAAE,CAAC;YAChE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;QACD,MAAM,MAAM,GAAG,IAAA,~~4BAAe~~,EAAC,OAAO,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;~~QACpE~~,MAAM,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAEhC,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,CAAC;QACpD,MAAM,QAAQ,GAAG,IAAA,sCAAqB,EAAC;YACrC,OAAO,EAAE,GAAG;YACZ,WAAW,EAAE,YAAY,CAAC,KAAK;YAC/B,aAAa,EAAE,YAAY,CAAC,aAAa;SAC1C,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAEpE,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC;QAC9E,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YAC3C,~~OAAO~~,~~CAAC~~,IAAI,CAAC,~~kCAAkC~~,CAAC,CAAC;~~YACjD~~,~~OAAO~~,CAAC,~~KAAK~~,CAAC,~~qBAAqB~~,~~CAAC,CAAC~~;~~YACrC~~,~~KAAK~~,~~MAAM~~,~~QAAQ~~,~~IAAI~~,SAAS,EAAE,CAAC~~;gBACjC~~,~~OAAO~~,CAAC,~~KAAK~~,CAAC,~~KAAK~~,QAAQ,CAAC,IAAI,EAAE,~~CAAC~~,CAAC~~;YACtC~~,~~CAAC~~;~~YACD~~,~~OAAO~~,~~CAAC~~,~~KAAK~~,CAAC,~~4CAA4C~~,~~CAAC~~,~~CAAC~~;~~YAC5D~~,OAAO,CAAC,~~IAAI~~,CAAC,CAAC,CAAC,CAAC;~~QAClB~~,CAAC;QAED,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAC5B,CAAC,KAAK,EAAE,EAAE,CACR,CAAC,WAAW,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC;eACtE,CAAC,KAAK,CAAC,UAAU,KAAK,UAAU,IAAI,OAAO,CAAC,KAAK,CAAC,CACxD,CAAC;QAGF,MAAM,iBAAiB,GAAyB,OAAO,CAAC,QAAQ,CAAC;QACjE,MAAM,YAAY,GAAyB,OAAO,CAAC,WAAW,CAAC;QAC/D,IAAI,QAAQ,GAAG,MAAM,CAAC;QAEtB,IAAI,iBAAiB,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,EAAE,CAAC;YACtD,IAAI,iBAAiB,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,EAAE,CAAC;gBAEtD,MAAM,UAAU,GAAG,IAAA,yCAAwB,EAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;gBACvE,MAAM,KAAK,GAAG,IAAA,kCAAiB,EAAC,MAAM,EAAE,YAAY,CAAC,CAAC;gBACtD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;gBAC/B,QAAQ,GAAG,EAAE,CAAC;gBACd,KAAK,MAAM,KAAK,IAAI,CAAC,GAAG,UAAU,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;oBAC9C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBACrB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACvB,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,IAAI,iBAAiB,EAAE,MAAM,EAAE,CAAC;gBACrC,QAAQ,GAAG,IAAA,yCAAwB,EAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;YACjE,CAAC;iBAAM,IAAI,YAAY,EAAE,MAAM,EAAE,CAAC;gBAChC,QAAQ,GAAG,IAAA,kCAAiB,EAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YACrD,CAAC;YAGD,IAAI,iBAAiB,EAAE,MAAM,EAAE,CAAC;gBAC9B,KAAK,MAAM,QAAQ,IAAI,iBAAiB,EAAE,CAAC;oBACzC,MAAM,OAAO,GAAG,IAAA,yCAAwB,EAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;oBAC7D,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBACzB,OAAO,CAAC,IAAI,CAAC,~~uDAAuD~~,~~QAAQ~~,EAAE,CAAC,CAAC;~~oBAClF~~,CAAC;gBACH,CAAC;YACH,CAAC;YACD,IAAI,YAAY,EAAE,MAAM,EAAE,CAAC;gBACzB,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;oBAC/B,MAAM,OAAO,GAAG,IAAA,kCAAiB,EAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;oBACjD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBACzB,OAAO,CAAC,IAAI,CAAC,~~wDAAwD~~,~~GAAG~~,EAAE,CAAC,CAAC;~~oBAC9E~~,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,~~CAAC~~,OAAO,CAAC,4BAA4B,CAAC,CAAC;~~YAC9C~~,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;~~YAChC~~,OAAO;QACT,CAAC;QAED,OAAO,CAAC,IAAI,GAAG,WAAW,QAAQ,CAAC,MAAM,oBAAoB,CAAC;~~QAC9D~~,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,IAAA,0CAAyB,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QACjG,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACvC,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,IAAI,IAAI;YACtD,OAAO,EAAE,KAAK,CAAC,UAAU,KAAK,cAAc;SAC7C,CAAC,CAAC,CAAC;QAEJ,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC;YACrC,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM;SACzB,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC;YACtC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;~~YAC1B~~,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;~~QACvE~~,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,OAAO,~~CAAC~~,OAAO,CAAC,8BAA8B,CAAC,CAAC;~~YAChD~~,OAAO,CAAC,GAAG,CAAC,8BAA8B,QAAQ,CAAC,MAAM,UAAU,CAAC,CAAC;~~YACrE~~,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;~~gBAC7B~~,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;~~YACrD~~,CAAC;YACD,OAAO;QACT,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,CAAC;QACrD,IAAA,uCAAsB,EAAC;YACrB,OAAO,EAAE,GAAG;YACZ,MAAM,EAAE,aAAa;YACrB,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;SACjD,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,IAAA,iCAAgB,EAAC,GAAG,CAAC,CAAC;QACvC,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,IAAI,+BAAa,CAAC,GAAG,CAAC,CAAC,CAAC;QACpE,MAAM,eAAe,CAAC,oBAAoB,CAAC;YACzC,WAAW;YACX,aAAa,EAAE,aAAa;YAC5B,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gBACnC,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC3C,OAAO;oBACL,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,YAAY,EAAE,OAAO,EAAE,YAAY,IAAI,KAAK,CAAC,YAAY;oBACzD,KAAK,EAAE,OAAO,EAAE,KAAK,IAAI,kBAAkB;oBAC3C,SAAS,EAAE,OAAO,EAAE,SAAS,IAAI,EAAE;oBACnC,UAAU,EAAE,OAAO,EAAE,UAAU,IAAI,EAAE;oBACrC,cAAc,EAAE,OAAO,EAAE,cAAc,IAAI,EAAE;oBAC7C,YAAY,EAAE,OAAO,EAAE,YAAY,IAAI,IAAI;oBAC3C,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,IAAI,IAAI;iBACvD,CAAC;YACJ,CAAC,CAAC;YACF,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,QAAQ,EAAE;gBACR,aAAa,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;gBAClD,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;gBAC7B,MAAM,EAAE,KAAK;gBACb,cAAc,EAAE,MAAM,CAAC,cAAc;gBACrC,aAAa,EAAE,MAAM,CAAC,aAAa;gBACnC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,YAAY;aACnC;SACF,CAAC,CAAC;QAEH,OAAO,~~CAAC~~,OAAO,CAAC,sBAAsB,CAAC,CAAC;~~QACxC~~,OAAO,CAAC,GAAG,CAAC,UAAU,QAAQ,CAAC,MAAM,wBAAwB,CAAC,CAAC;~~IACjE~~,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,~~CAAC~~,IAAI,CAAC,oBAAoB,CAAC,CAAC;~~QACnC~~,IAAA,2BAAW,EAAC,GAAG,CAAC,CAAC;~~IACnB~~,CAAC;AACH,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"push.js","sourceRoot":"","sources":["../../../../../src/commands/source/push.ts"],"names":[],"mappings":"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"}

package/dist/nexus-cli/src/commands/source/source-sync.e2e.test.js CHANGED Viewed

@@ -195,9 +195,11 @@ async function runSourceCommand(argv) {
     process.env.NEXUS_BASE_URL = server.baseUrl;
     process.env.NEXUS_AUTH_TOKEN = 'test-token';
     try {
-        await withTempWorkspace(async () => {
+        await withTempWorkspace(async (workspaceDir) => {
             await runSourceCommand(['source', 'status', '--json']);
             await runSourceCommand(['source', 'push', '--dry-run']);
+            strict_1.default.equal(node_fs_1.default.existsSync(node_path_1.default.join(workspaceDir, '.nexus-revision-ledger.json')), false, 'status and push dry-run must not initialize the revision ledger');
+            strict_1.default.equal(node_fs_1.default.existsSync(node_path_1.default.join(workspaceDir, '.nexus-source-tracking.json')), false, 'status and push dry-run must not persist source tracking');
         });
     }
     finally {

package/dist/nexus-cli/src/commands/source/source-sync.e2e.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"source-sync.e2e.test.js","sourceRoot":"","sources":["../../../../../src/commands/source/source-sync.e2e.test.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"source-sync.e2e.test.js","sourceRoot":"","sources":["../../../../../src/commands/source/source-sync.e2e.test.ts"],"names":[],"mappings":"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"}

package/dist/nexus-cli/src/commands/source/status.js CHANGED Viewed

@@ -1,13 +1,19 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.statusCommand = void 0;
 const commander_1 = require("commander");
+const node_fs_1 = __importDefault(require("node:fs"));
 const source_tracker_1 = require("../../services/source-tracker");
 const table_formatter_1 = require("../../utils/table-formatter");
 const error_handler_1 = require("../../utils/error-handler");
 const api_client_1 = require("../../services/api-client");
 const spinner_1 = require("../../utils/spinner");
 const revision_ledger_1 = require("../../services/revision-ledger");
+const machine_result_1 = require("../../contracts/machine-result");
+const target_context_1 = require("../../services/target-context");
 function matchesSelectedPath(trackedPath, selectedPaths) {
     if (!selectedPaths?.length) {
         return true;
@@ -54,22 +60,26 @@ exports.statusCommand = new commander_1.Command('status')
     try {
         const environment = (0, revision_ledger_1.resolveRevisionEnvironment)(options.environment);
         process.env.NEXUS_ENVIRONMENT = environment;
-        await (0, revision_ledger_1.ensureRevisionLedgerInitialized)('.', environment);
-        const client = (0, api_client_1.createApiClient)(options.targetOrg);
+        const hasManifest = node_fs_1.default.existsSync('nexus-project.yaml') || node_fs_1.default.existsSync('nexus-project.json');
+        const targetOrg = hasManifest && (!process.env.NEXUS_AUTH_TOKEN || options.targetOrg)
+            ? (0, target_context_1.resolveTargetContext)({ workspaceDir: '.', targetOrg: options.targetOrg }).context.targetOrg
+            : options.targetOrg;
+        const client = (0, api_client_1.createApiClient)(targetOrg);
         await client.ensureValidToken();
         const sourceStatus = await client.getSourceStatus();
-        (0, source_tracker_1.refreshTrackingWithRemoteStatus)({
-            baseDir: '.',
-            status: sourceStatus,
-        });
         const statuses = (0, source_tracker_1.calculateSourceStatus)({
             baseDir: '.',
+            remoteFiles: sourceStatus.files,
+            baselineFiles: sourceStatus.baselineFiles,
         }).filter((entry) => matchesSelectedPath(entry.path, options.path));
         if (options.json) {
-            console.log(JSON.stringify({
-                sourceStatus,
-                files: statuses,
-            }, null, 2));
+            (0, machine_result_1.emitCliResult)((0, machine_result_1.buildCliResult)({
+                command: 'source status',
+                phase: 'complete',
+                contractVersion: 'nexusclaw.cli-command-contract/v1',
+                ok: true,
+                data: { sourceStatus, files: statuses },
+            }));
             return;
         }
         const visibleStatuses = statuses.filter((entry) => entry.syncStatus !== 'synced' || entry.driftStatus === 'drifted');
@@ -126,7 +136,7 @@ exports.statusCommand = new commander_1.Command('status')
     }
     catch (err) {
         spinner?.fail('Failed to load source status');
-        (0, error_handler_1.handleError)(err);
+        (0, error_handler_1.handleError)(err, { json: !!options.json, command: 'source status' });
     }
 });
 //# sourceMappingURL=status.js.map

package/dist/nexus-cli/src/commands/source/status.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../../src/commands/source/status.ts"],"names":[],"mappings":"~~;;;~~AAAA,yCAAoC;AACpC,~~kEAIuC~~;AACvC,iEAA0D;AAC1D,6DAAwD;AACxD,0DAA4D;AAC5D,iDAAoD;AACpD,~~oEAGwC~~;~~AAExC~~,SAAS,mBAAmB,CAAC,WAAmB,EAAE,aAAwB;IACxE,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;QACtC,MAAM,UAAU,GAAG,IAAA,6CAA4B,EAAC,SAAS,CAAC,CAAC;QAC3D,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,WAAW,KAAK,UAAU,IAAI,WAAW,CAAC,UAAU,CAAC,GAAG,UAAU,GAAG,CAAC,CAAC;IAChF,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,eAAe,CAAC,MAAc;IACrC,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,WAAW;YACd,OAAO,WAAW,CAAC;QACrB,KAAK,eAAe;YAClB,OAAO,eAAe,CAAC;QACzB,KAAK,cAAc;YACjB,OAAO,cAAc,CAAC;QACxB,KAAK,YAAY;YACf,OAAO,YAAY,CAAC;QACtB,KAAK,gBAAgB;YACnB,OAAO,gBAAgB,CAAC;QAC1B,KAAK,eAAe;YAClB,OAAO,eAAe,CAAC;QACzB,KAAK,UAAU;YACb,OAAO,UAAU,CAAC;QACpB;YACE,OAAO,QAAQ,CAAC;IACpB,CAAC;AACH,CAAC;AAEY,QAAA,aAAa,GAAG,IAAI,mBAAO,CAAC,QAAQ,CAAC;KAC/C,WAAW,CAAC,6BAA6B,CAAC;KAC1C,MAAM,CAAC,sBAAsB,EAAE,kBAAkB,CAAC;KAClD,MAAM,CAAC,6BAA6B,EAAE,6BAA6B,EAAE,KAAK,CAAC;KAC3E,MAAM,CAAC,mBAAmB,EAAE,oCAAoC,CAAC;KACjE,MAAM,CAAC,SAAS,EAAE,oBAAoB,EAAE,KAAK,CAAC;KAC9C,MAAM,CAAC,QAAQ,EAAE,2BAA2B,EAAE,KAAK,CAAC;KACpD,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACxB,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI;QAC1B,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,IAAA,uBAAa,EAAC,0BAA0B,CAAC,CAAC,KAAK,EAAE,CAAC;IACtD,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,IAAA,4CAA0B,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACpE,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,WAAW,CAAC;QAC5C,MAAM,IAAA,~~iDAA+B~~,EAAC,GAAG,EAAE,~~WAAW~~,CAAC,CAAC;~~QACxD~~,MAAM,MAAM,GAAG,IAAA,4BAAe,EAAC,~~OAAO,CAAC,~~SAAS,CAAC,CAAC;~~QAClD~~,MAAM,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAEhC,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,CAAC;QACpD,IAAA,~~gDAA+B~~,EAAC;~~YAC9B~~,OAAO,EAAE,GAAG;YACZ,~~MAAM~~,EAAE,YAAY~~;SACrB~~,CAAC,~~CAAC~~;~~QACH~~,~~MAAM~~,~~QAAQ~~,~~GAAG~~,~~IAAA~~,~~sCAAqB,EAAC~~;~~YACrC~~,~~OAAO,EAAE,GAAG;SACb,~~CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAEpE,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,~~OAAO~~,~~CAAC~~,~~GAAG~~,~~CAAC~~,~~IAAI~~,~~CAAC~~,~~SAAS~~,~~CAAC~~;~~gBACzB~~,~~YAAY~~;~~gBACZ~~,~~KAAK~~,EAAE,~~QAAQ~~;~~aAChB~~,EAAE,IAAI,EAAE,~~CAAC~~,CAAC,CAAC,CAAC;~~YACb~~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~~IACnB~~,CAAC;AACH,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../../src/commands/source/status.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAoC;AACpC,sDAAyB;AACzB,kEAGuC;AACvC,iEAA0D;AAC1D,6DAAwD;AACxD,0DAA4D;AAC5D,iDAAoD;AACpD,oEAEwC;AACxC,mEAA+E;AAC/E,kEAAqE;AAErE,SAAS,mBAAmB,CAAC,WAAmB,EAAE,aAAwB;IACxE,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;QACtC,MAAM,UAAU,GAAG,IAAA,6CAA4B,EAAC,SAAS,CAAC,CAAC;QAC3D,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,WAAW,KAAK,UAAU,IAAI,WAAW,CAAC,UAAU,CAAC,GAAG,UAAU,GAAG,CAAC,CAAC;IAChF,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,eAAe,CAAC,MAAc;IACrC,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,WAAW;YACd,OAAO,WAAW,CAAC;QACrB,KAAK,eAAe;YAClB,OAAO,eAAe,CAAC;QACzB,KAAK,cAAc;YACjB,OAAO,cAAc,CAAC;QACxB,KAAK,YAAY;YACf,OAAO,YAAY,CAAC;QACtB,KAAK,gBAAgB;YACnB,OAAO,gBAAgB,CAAC;QAC1B,KAAK,eAAe;YAClB,OAAO,eAAe,CAAC;QACzB,KAAK,UAAU;YACb,OAAO,UAAU,CAAC;QACpB;YACE,OAAO,QAAQ,CAAC;IACpB,CAAC;AACH,CAAC;AAEY,QAAA,aAAa,GAAG,IAAI,mBAAO,CAAC,QAAQ,CAAC;KAC/C,WAAW,CAAC,6BAA6B,CAAC;KAC1C,MAAM,CAAC,sBAAsB,EAAE,kBAAkB,CAAC;KAClD,MAAM,CAAC,6BAA6B,EAAE,6BAA6B,EAAE,KAAK,CAAC;KAC3E,MAAM,CAAC,mBAAmB,EAAE,oCAAoC,CAAC;KACjE,MAAM,CAAC,SAAS,EAAE,oBAAoB,EAAE,KAAK,CAAC;KAC9C,MAAM,CAAC,QAAQ,EAAE,2BAA2B,EAAE,KAAK,CAAC;KACpD,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACxB,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI;QAC1B,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,IAAA,uBAAa,EAAC,0BAA0B,CAAC,CAAC,KAAK,EAAE,CAAC;IACtD,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,IAAA,4CAA0B,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACpE,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,WAAW,CAAC;QAC5C,MAAM,WAAW,GAAG,iBAAE,CAAC,UAAU,CAAC,oBAAoB,CAAC,IAAI,iBAAE,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;QAC/F,MAAM,SAAS,GAAG,WAAW,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,OAAO,CAAC,SAAS,CAAC;YACnF,CAAC,CAAC,IAAA,qCAAoB,EAAC,EAAE,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS;YAC7F,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;QACtB,MAAM,MAAM,GAAG,IAAA,4BAAe,EAAC,SAAS,CAAC,CAAC;QAC1C,MAAM,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAEhC,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,CAAC;QACpD,MAAM,QAAQ,GAAG,IAAA,sCAAqB,EAAC;YACrC,OAAO,EAAE,GAAG;YACZ,WAAW,EAAE,YAAY,CAAC,KAAK;YAC/B,aAAa,EAAE,YAAY,CAAC,aAAa;SAC1C,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAEpE,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,IAAA,8BAAa,EAAC,IAAA,+BAAc,EAAC;gBAC3B,OAAO,EAAE,eAAe;gBACxB,KAAK,EAAE,UAAU;gBACjB,eAAe,EAAE,mCAAmC;gBACpD,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE;aACxC,CAAC,CAAC,CAAC;YACJ,OAAO;QACT,CAAC;QAED,MAAM,eAAe,GAAG,QAAQ,CAAC,MAAM,CACrC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,KAAK,QAAQ,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,CAC5E,CAAC;QAEF,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;YACzC,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;YACpD,IAAI,OAAO,CAAC,KAAK,IAAI,YAAY,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC;gBACzD,OAAO,CAAC,GAAG,CAAC,kBAAkB,YAAY,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;gBACjE,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;YAC9E,CAAC;YACD,OAAO;QACT,CAAC;QAGD,MAAM,aAAa,GAAG,eAAe,CAAC,MAAM,CAC1C,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CACrF,CAAC;QACF,MAAM,cAAc,GAAG,eAAe,CAAC,MAAM,CAC3C,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,YAAY,EAAE,gBAAgB,EAAE,eAAe,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CACxF,CAAC;QACF,MAAM,aAAa,GAAG,eAAe,CAAC,MAAM,CAC1C,CAAC,KAAK,EAAE,EAAE,CACR,CAAC,CAAC,WAAW,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,gBAAgB,EAAE,eAAe,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAC9H,CAAC;QAEF,MAAM,OAAO,GAAG;YACd,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE;YAClC,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE;YAChC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;SAC/B,CAAC;QAEF,OAAO,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;QAEzC,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;YAC1C,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBACzC,MAAM,EAAE,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC;gBACzC,KAAK,EAAE,KAAK,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG;gBACxD,IAAI,EAAE,KAAK,CAAC,IAAI;aACjB,CAAC,CAAC,CAAC;YACJ,OAAO,CAAC,GAAG,CAAC,IAAA,6BAAW,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QAC1C,CAAC;QAED,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;YAC3C,MAAM,IAAI,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC1C,MAAM,EAAE,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC;gBACzC,KAAK,EAAE,KAAK,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG;gBACxD,IAAI,EAAE,KAAK,CAAC,IAAI;aACjB,CAAC,CAAC,CAAC;YACJ,OAAO,CAAC,GAAG,CAAC,IAAA,6BAAW,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QAC1C,CAAC;QAED,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACxB,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBACzC,MAAM,EAAE,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC;gBACzC,KAAK,EAAE,KAAK,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG;gBACxD,IAAI,EAAE,KAAK,CAAC,IAAI;aACjB,CAAC,CAAC,CAAC;YACJ,OAAO,CAAC,GAAG,CAAC,IAAA,6BAAW,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QAC1C,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,KAAK,eAAe,CAAC,MAAM,0BAA0B,CAAC,CAAC;QAEnE,IAAI,OAAO,CAAC,KAAK,IAAI,YAAY,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC;YACzD,OAAO,CAAC,GAAG,CAAC,oBAAoB,YAAY,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;YACnE,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;QAC9E,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,EAAE,IAAI,CAAC,8BAA8B,CAAC,CAAC;QAC9C,IAAA,2BAAW,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC;IACvE,CAAC;AACH,CAAC,CAAC,CAAC"}