@nexusclawhq/cli 0.3.21 → 0.3.23

package/dist/nexus-cli/src/commands/metadata/export.js

@@ -40,24 +40,55 @@ const commander_1 = require("commander");
 const api_client_1 = require("../../services/api-client");
 const spinner_1 = require("../../utils/spinner");
 const logger_1 = require("../../utils/logger");
+const target_context_1 = require("../../services/target-context");
+const command_options_1 = require("../../utils/command-options");
+const machine_result_1 = require("../../contracts/machine-result");
 exports.exportCommand = new commander_1.Command('export')
     .description('导出当前 workspace 的 declarative metadata')
     .option('-o, --output <path>', '输出目录', '.')
+    .option('--workspace <path>', 'Workspace root', '.')
+    .option('--target-org <alias>', 'Target org alias')
+    .option('--env <name>', 'Environment descriptor name')
+    .option('--environment <name>', 'Environment descriptor name')
+    .option('--json', 'Output one machine-readable JSON document', false)
     .action(async (options) => {
-    const spinner = (0, spinner_1.createSpinner)('正在导出 metadata runtime 快照...').start();
+    const spinner = options.json ? null : (0, spinner_1.createSpinner)('正在导出 metadata runtime 快照...').start();
     try {
-        const apiClient = (0, api_client_1.createApiClient)();
+        const environmentName = (0, command_options_1.resolveEnvironmentOption)(options);
+        const targetOrg = environmentName
+            ? (0, target_context_1.resolveTargetContext)({
+                workspaceDir: options.workspace,
+                targetOrg: options.targetOrg,
+                environmentName,
+            }).context.targetOrg
+            : options.targetOrg;
+        const apiClient = (0, api_client_1.createApiClient)(targetOrg);
         const result = await apiClient.exportRuntimeMetadata();
         for (const file of result.files) {
             const targetPath = path.join(options.output, file.path);
             fs.mkdirSync(path.dirname(targetPath), { recursive: true });
             fs.writeFileSync(targetPath, file.content, 'utf-8');
         }
-        spinner.succeed('导出完成');
-        logger_1.logger.success(`\n已写入 ${result.files.length} 个文件到 ${options.output}`);
+        spinner?.succeed('导出完成');
+        if (options.json) {
+            (0, machine_result_1.emitCliResult)((0, machine_result_1.buildCliResult)({
+                command: 'metadata export',
+                phase: 'complete',
+                contractVersion: 'nexusclaw.cli-command-contract/v1',
+                ok: true,
+                data: {
+                    output: path.resolve(options.output),
+                    count: result.files.length,
+                    files: result.files.map((file) => ({ path: file.path, hash: file.hash })),
+                },
+            }));
+        }
+        else {
+            logger_1.logger.success(`\n已写入 ${result.files.length} 个文件到 ${options.output}`);
+        }
     }
     catch (error) {
-        spinner.fail('导出失败');
+        spinner?.fail('导出失败');
         logger_1.logger.error(error instanceof Error ? error.message : String(error));
         process.exit(1);
     }

package/dist/nexus-cli/src/commands/metadata/export.js.map

@@ -1 +1 @@
-{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../../../src/commands/metadata/export.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAC7B,yCAAoC;AACpC,0DAA4D;AAC5D,iDAAoD;AACpD,+CAA4C;AAE/B,QAAA,aAAa,GAAG,IAAI,mBAAO,CAAC,QAAQ,CAAC;KAC/C,WAAW,CAAC,uCAAuC,CAAC;KACpD,MAAM,CAAC,qBAAqB,EAAE,MAAM,EAAE,GAAG,CAAC;KAC1C,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACxB,MAAM,OAAO,GAAG,IAAA,uBAAa,EAAC,6BAA6B,CAAC,CAAC,KAAK,EAAE,CAAC;IAErE,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,IAAA,4BAAe,GAAE,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,qBAAqB,EAAE,CAAC;QAEvD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YAChC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACxD,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5D,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACtD,CAAC;QAED,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACxB,eAAM,CAAC,OAAO,CAAC,SAAS,MAAM,CAAC,KAAK,CAAC,MAAM,SAAS,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACxE,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrB,eAAM,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACrE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC"}
+{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../../../src/commands/metadata/export.ts"],"names":[],"mappings":"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"}

package/dist/nexus-cli/src/commands/metadata/validate-source.d.ts

@@ -1,2 +1,6 @@
 import { Command } from 'commander';
+export declare function parseValidateSourceTimeoutMs(value?: string): number;
+export declare function filterValidateSourceFiles<T extends {
+    path: string;
+}>(files: T[], pathPrefix?: string): T[];
 export declare const validateSourceCommand: Command;

package/dist/nexus-cli/src/commands/metadata/validate-source.js

@@ -4,20 +4,48 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateSourceCommand = void 0;
+exports.parseValidateSourceTimeoutMs = parseValidateSourceTimeoutMs;
+exports.filterValidateSourceFiles = filterValidateSourceFiles;
 const commander_1 = require("commander");
 const chalk_1 = __importDefault(require("chalk"));
 const api_client_1 = require("../../services/api-client");
 const source_tracker_1 = require("../../services/source-tracker");
 const spinner_1 = require("../../utils/spinner");
 const logger_1 = require("../../utils/logger");
+const DEFAULT_VALIDATE_SOURCE_TIMEOUT_MS = 120_000;
+const MAX_VALIDATE_SOURCE_TIMEOUT_MS = 15 * 60_000;
+function parseValidateSourceTimeoutMs(value) {
+    if (value === undefined)
+        return DEFAULT_VALIDATE_SOURCE_TIMEOUT_MS;
+    const timeoutMs = Number(value);
+    if (!Number.isInteger(timeoutMs) || timeoutMs < 1_000 || timeoutMs > MAX_VALIDATE_SOURCE_TIMEOUT_MS) {
+        throw new Error('--request-timeout-ms must be an integer between 1000 and 900000');
+    }
+    return timeoutMs;
+}
+function filterValidateSourceFiles(files, pathPrefix) {
+    if (!pathPrefix?.trim())
+        return files;
+    const normalizedPrefix = pathPrefix.trim().replace(/\\/g, '/').replace(/^\.\//, '');
+    return files.filter((file) => file.path.replace(/\\/g, '/').startsWith(normalizedPrefix));
+}
 exports.validateSourceCommand = new commander_1.Command('validate-source')
     .description('验证本地 declarative metadata 目录')
     .option('-s, --source <path>', '本地 metadata 根目录', '.')
+    .option('-o, --target-org <alias>', '目标 org alias')
+    .option('--path-prefix <prefix>', '仅校验 tracked path 以该前缀开头的文件')
+    .option('--request-timeout-ms <milliseconds>', '请求超时（1000..900000）', String(DEFAULT_VALIDATE_SOURCE_TIMEOUT_MS))
     .action(async (options) => {
     const spinner = (0, spinner_1.createSpinner)('正在读取本地 metadata 文件...').start();
     try {
-        const files = (0, source_tracker_1.readSourceFiles)(options.source);
-        const apiClient = (0, api_client_1.createApiClient)();
+        const allFiles = (0, source_tracker_1.readSourceFiles)(options.source);
+        const files = filterValidateSourceFiles(allFiles, options.pathPrefix);
+        if (files.length === 0) {
+            throw new Error(`No metadata files matched --path-prefix ${options.pathPrefix ?? '(all)'}`);
+        }
+        const requestTimeoutMs = parseValidateSourceTimeoutMs(options.requestTimeoutMs);
+        spinner.text = `正在校验 ${files.length} 个 metadata 文件（timeout ${requestTimeoutMs}ms）...`;
+        const apiClient = (0, api_client_1.createApiClient)(options.targetOrg, requestTimeoutMs);
         const result = await apiClient.validateRuntimeMetadata(files);
         if (!result.validation.valid) {
             spinner.fail('验证失败');
@@ -32,6 +60,7 @@ exports.validateSourceCommand = new commander_1.Command('validate-source')
     catch (error) {
         spinner.fail('验证失败');
         logger_1.logger.error(error instanceof Error ? error.message : String(error));
+        logger_1.logger.error('可使用 --request-timeout-ms 调整上限，或用 --path-prefix 分组定位问题源文件。');
         process.exit(1);
     }
 });

package/dist/nexus-cli/src/commands/metadata/validate-source.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate-source.js","sourceRoot":"","sources":["../../../../../src/commands/metadata/validate-source.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAoC;AACpC,kDAA0B;AAC1B,0DAA4D;AAC5D,kEAAgE;AAChE,iDAAoD;AACpD,+CAA4C;AAE/B,QAAA,qBAAqB,GAAG,IAAI,mBAAO,CAAC,iBAAiB,CAAC;KAChE,WAAW,CAAC,8BAA8B,CAAC;KAC3C,MAAM,CAAC,qBAAqB,EAAE,iBAAiB,EAAE,GAAG,CAAC;KACrD,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACxB,MAAM,OAAO,GAAG,IAAA,uBAAa,EAAC,uBAAuB,CAAC,CAAC,KAAK,EAAE,CAAC;IAE/D,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAA,gCAAe,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,IAAA,4BAAe,GAAE,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QAE9D,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YAC7B,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACrB,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;gBAChD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,OAAO,OAAO,EAAE,CAAC,CAAC,CAAC;YAC3C,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACxB,eAAM,CAAC,OAAO,CAAC,SAAS,KAAK,CAAC,MAAM,gBAAgB,CAAC,CAAC;IACxD,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrB,eAAM,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACrE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC"}
+{"version":3,"file":"validate-source.js","sourceRoot":"","sources":["../../../../../src/commands/metadata/validate-source.ts"],"names":[],"mappings":"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"}

package/dist/nexus-cli/src/commands/metadata/validate-source.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/nexus-cli/src/commands/metadata/validate-source.test.js

@@ -0,0 +1,23 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const strict_1 = __importDefault(require("node:assert/strict"));
+const node_test_1 = __importDefault(require("node:test"));
+const validate_source_1 = require("./validate-source");
+(0, node_test_1.default)('validate-source timeout is bounded and explicit', () => {
+    strict_1.default.equal((0, validate_source_1.parseValidateSourceTimeoutMs)(), 120_000);
+    strict_1.default.equal((0, validate_source_1.parseValidateSourceTimeoutMs)('300000'), 300_000);
+    strict_1.default.throws(() => (0, validate_source_1.parseValidateSourceTimeoutMs)('999'), /between 1000 and 900000/);
+    strict_1.default.throws(() => (0, validate_source_1.parseValidateSourceTimeoutMs)('nope'), /between 1000 and 900000/);
+});
+(0, node_test_1.default)('validate-source path prefix selects a deterministic source group', () => {
+    const files = [
+        { path: 'nexus-app/main/default/objects/Account/object.json' },
+        { path: 'nexus-app/main/default/menus/Sales.menu.json' },
+    ];
+    strict_1.default.deepEqual((0, validate_source_1.filterValidateSourceFiles)(files, './nexus-app/main/default/objects/'), [files[0]]);
+    strict_1.default.deepEqual((0, validate_source_1.filterValidateSourceFiles)(files), files);
+});
+//# sourceMappingURL=validate-source.test.js.map

package/dist/nexus-cli/src/commands/metadata/validate-source.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate-source.test.js","sourceRoot":"","sources":["../../../../../src/commands/metadata/validate-source.test.ts"],"names":[],"mappings":";;;;;AAAA,gEAAwC;AACxC,0DAA6B;AAE7B,uDAG2B;AAE3B,IAAA,mBAAI,EAAC,iDAAiD,EAAE,GAAG,EAAE;IAC3D,gBAAM,CAAC,KAAK,CAAC,IAAA,8CAA4B,GAAE,EAAE,OAAO,CAAC,CAAC;IACtD,gBAAM,CAAC,KAAK,CAAC,IAAA,8CAA4B,EAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;IAC9D,gBAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,8CAA4B,EAAC,KAAK,CAAC,EAAE,yBAAyB,CAAC,CAAC;IACpF,gBAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,8CAA4B,EAAC,MAAM,CAAC,EAAE,yBAAyB,CAAC,CAAC;AACvF,CAAC,CAAC,CAAC;AAEH,IAAA,mBAAI,EAAC,kEAAkE,EAAE,GAAG,EAAE;IAC5E,MAAM,KAAK,GAAG;QACZ,EAAE,IAAI,EAAE,oDAAoD,EAAE;QAC9D,EAAE,IAAI,EAAE,8CAA8C,EAAE;KACzD,CAAC;IACF,gBAAM,CAAC,SAAS,CACd,IAAA,2CAAyB,EAAC,KAAK,EAAE,mCAAmC,CAAC,EACrE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CACX,CAAC;IACF,gBAAM,CAAC,SAAS,CAAC,IAAA,2CAAyB,EAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;AAC5D,CAAC,CAAC,CAAC"}

package/dist/nexus-cli/src/commands/org/display.js

@@ -26,8 +26,8 @@ exports.displayCommand = new commander_1.Command('display')
             scope: cred.scope || '',
             instanceUrl: cred.instanceUrl,
             isDefault: !!cred.isDefault,
-            expiresAt: cred.expiresAt || 0,
-            status: cred.expiresAt && cred.expiresAt > Date.now() ? 'Active' : 'Expired',
+            expiresAt: (0, auth_store_1.getCredentialExpiryMs)(cred) || 0,
+            status: (0, auth_store_1.getCredentialStatus)(cred),
         }, null, 2));
         return;
     }
@@ -43,6 +43,6 @@ exports.displayCommand = new commander_1.Command('display')
         console.log(`Scope:        ${cred.scope}`);
     }
     console.log(`Default:      ${cred.isDefault ? 'Yes' : 'No'}`);
-    console.log(`Status:       ${cred.expiresAt && cred.expiresAt > Date.now() ? 'Active' : 'Expired'}`);
+    console.log(`Status:       ${(0, auth_store_1.getCredentialStatus)(cred)}`);
 });
 //# sourceMappingURL=display.js.map

package/dist/nexus-cli/src/commands/org/display.js.map

@@ -1 +1 @@
-{"version":3,"file":"display.js","sourceRoot":"","sources":["../../../../../src/commands/org/display.ts"],"names":[],"mappings":";;;AAAA,yCAAoC;AACpC,0DAAiF;AACjF,+CAA4C;AAK/B,QAAA,cAAc,GAAG,IAAI,mBAAO,CAAC,SAAS,CAAC;KACjD,WAAW,CAAC,8BAA8B,CAAC;KAC3C,MAAM,CAAC,0BAA0B,EAAE,kBAAkB,CAAC;KACtD,MAAM,CAAC,QAAQ,EAAE,gBAAgB,CAAC;KAClC,MAAM,CAAC,CAAC,IAA4C,EAAE,EAAE;IACvD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS;QACzB,CAAC,CAAC,IAAA,2BAAc,EAAC,IAAI,CAAC,SAAS,CAAC;QAChC,CAAC,CAAC,IAAA,iCAAoB,GAAE,CAAC;IAE3B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,eAAM,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;QACrE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CACT,IAAI,CAAC,SAAS,CAAC;YACb,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,SAAS;YACtC,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE;YAC7B,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;YACvB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS;YAC3B,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,CAAC;YAC9B,MAAM,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;SAC7E,EAAE,IAAI,EAAE,CAAC,CAAC,CACZ,CAAC;QACF,OAAO;IACT,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC3C,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC3C,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,SAAS,IAAI,SAAS,EAAE,CAAC,CAAC;IAC5D,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;IACjD,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAChD,CAAC;IACD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9D,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;AACvG,CAAC,CAAC,CAAC"}
+{"version":3,"file":"display.js","sourceRoot":"","sources":["../../../../../src/commands/org/display.ts"],"names":[],"mappings":";;;AAAA,yCAAoC;AACpC,0DAKmC;AACnC,+CAA4C;AAK/B,QAAA,cAAc,GAAG,IAAI,mBAAO,CAAC,SAAS,CAAC;KACjD,WAAW,CAAC,8BAA8B,CAAC;KAC3C,MAAM,CAAC,0BAA0B,EAAE,kBAAkB,CAAC;KACtD,MAAM,CAAC,QAAQ,EAAE,gBAAgB,CAAC;KAClC,MAAM,CAAC,CAAC,IAA4C,EAAE,EAAE;IACvD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS;QACzB,CAAC,CAAC,IAAA,2BAAc,EAAC,IAAI,CAAC,SAAS,CAAC;QAChC,CAAC,CAAC,IAAA,iCAAoB,GAAE,CAAC;IAE3B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,eAAM,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;QACrE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CACT,IAAI,CAAC,SAAS,CAAC;YACb,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,SAAS;YACtC,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE;YAC7B,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE;YACvB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS;YAC3B,SAAS,EAAE,IAAA,kCAAqB,EAAC,IAAI,CAAC,IAAI,CAAC;YAC3C,MAAM,EAAE,IAAA,gCAAmB,EAAC,IAAI,CAAC;SAClC,EAAE,IAAI,EAAE,CAAC,CAAC,CACZ,CAAC;QACF,OAAO;IACT,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC3C,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC3C,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,SAAS,IAAI,SAAS,EAAE,CAAC,CAAC;IAC5D,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;IACjD,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAChD,CAAC;IACD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9D,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAA,gCAAmB,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC5D,CAAC,CAAC,CAAC"}

package/dist/nexus-cli/src/commands/org/list.js

@@ -35,8 +35,10 @@ exports.listCommand = new commander_1.Command('list')
         loginType: c.loginType || 'unknown',
         instanceUrl: c.instanceUrl,
         scope: c.scope || '',
-        status: c.expiresAt && c.expiresAt > Date.now() ? 'Active' : 'Expired',
-        expiresAt: c.expiresAt ? new Date(c.expiresAt).toISOString() : 'Unknown',
+        status: (0, auth_store_1.getCredentialStatus)(c),
+        expiresAt: (0, auth_store_1.getCredentialExpiryMs)(c)
+            ? new Date((0, auth_store_1.getCredentialExpiryMs)(c)).toISOString()
+            : 'Unknown',
     }));
     if (json) {
         (0, machine_result_1.emitCliResult)((0, machine_result_1.buildCliResult)({

package/dist/nexus-cli/src/commands/org/list.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../src/commands/org/list.ts"],"names":[],"mappings":";;;AAAA,yCAAoC;AACpC,0DAA4D;AAC5D,iEAA0D;AAC1D,+CAA4C;AAC5C,mEAA+E;AAKlE,QAAA,WAAW,GAAG,IAAI,mBAAO,CAAC,MAAM,CAAC;KAC3C,WAAW,CAAC,8BAA8B,CAAC;KAC3C,MAAM,CAAC,QAAQ,EAAE,gBAAgB,CAAC;KAClC,MAAM,CAAC,CAAC,IAAwB,EAAE,OAAgB,EAAE,EAAE;IACrD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC;IAC3E,MAAM,KAAK,GAAG,IAAA,4BAAe,GAAE,CAAC;IAChC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,IAAI,IAAI,EAAE,CAAC;YACT,IAAA,8BAAa,EAAC,IAAA,+BAAc,EAAC;gBAC3B,OAAO,EAAE,UAAU;gBACnB,KAAK,EAAE,UAAU;gBACjB,eAAe,EAAE,mCAAmC;gBACpD,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE;aAC5B,CAAC,CAAC,CAAC;YACJ,OAAO;QACT,CAAC;QACD,eAAM,CAAC,IAAI,CAAC,4FAA4F,CAAC,CAAC;QAC1G,OAAO;IACT,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7B,OAAO,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QAC/B,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS;QACxB,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,SAAS;QACnC,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,KAAK,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE;QACpB,MAAM,EAAE,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;QACtE,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS;KACzE,CAAC,CAAC,CAAC;IAEJ,IAAI,IAAI,EAAE,CAAC;QACT,IAAA,8BAAa,EAAC,IAAA,+BAAc,EAAC;YAC3B,OAAO,EAAE,UAAU;YACnB,KAAK,EAAE,UAAU;YACjB,eAAe,EAAE,mCAAmC;YACpD,EAAE,EAAE,IAAI;YACR,IAAI,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE;SAC9B,CAAC,CAAC,CAAC;QACJ,OAAO;IACT,CAAC;IAED,MAAM,KAAK,GAAG,IAAA,6BAAW,EACvB;QACE,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE;QACpC,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE;QAChC,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE;QACtC,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE;QACvC,EAAE,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE;QACnC,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,cAAc,EAAE;QAC7C,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE;QAChC,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE;KACnC,EACD,IAAI,CACL,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACrB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../src/commands/org/list.ts"],"names":[],"mappings":"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"}

package/dist/nexus-cli/src/commands/org/login-web.d.ts

@@ -1,4 +1,5 @@
 import { Command } from 'commander';
+export declare const NEXUSCLAW_DX_OAUTH_SCOPE: string;
 export declare function generatePkcePair(): {
     verifier: string;
     challenge: string;
@@ -7,6 +8,12 @@ export declare function generatePkcePair(): {
 export declare function isLoopbackInstanceUrl(instanceUrl: string): boolean;
 export declare function isPlainHttpInstanceUrl(instanceUrl: string): boolean;
 export declare function parseAuthTimeoutSeconds(value: string): number;
+export declare function buildOAuthCallbackTimeoutMessage(input: {
+    timeoutSeconds: number;
+    instanceUrl: string;
+    clientId: string;
+    redirectUri: string;
+}): string;
 export type OAuthCallbackDisposition = 'process' | 'ignore-non-callback' | 'reject-missing-state' | 'reject-state-mismatch' | 'reject-empty-callback';
 export declare function classifyOAuthCallbackRequest(input: {
     pathname: string;

package/dist/nexus-cli/src/commands/org/login-web.js

@@ -33,11 +33,12 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loginWebCommand = void 0;
+exports.loginWebCommand = exports.NEXUSCLAW_DX_OAUTH_SCOPE = void 0;
 exports.generatePkcePair = generatePkcePair;
 exports.isLoopbackInstanceUrl = isLoopbackInstanceUrl;
 exports.isPlainHttpInstanceUrl = isPlainHttpInstanceUrl;
 exports.parseAuthTimeoutSeconds = parseAuthTimeoutSeconds;
+exports.buildOAuthCallbackTimeoutMessage = buildOAuthCallbackTimeoutMessage;
 exports.classifyOAuthCallbackRequest = classifyOAuthCallbackRequest;
 const commander_1 = require("commander");
 const crypto = __importStar(require("crypto"));
@@ -54,6 +55,12 @@ const DEFAULT_NEXUSCLAW_CLI_CLIENT_ID = 'nexusclaw-cli';
 const DEFAULT_AUTH_TIMEOUT_SECONDS = 300;
 const MIN_AUTH_TIMEOUT_SECONDS = 60;
 const MAX_AUTH_TIMEOUT_SECONDS = 1800;
+exports.NEXUSCLAW_DX_OAUTH_SCOPE = [
+    'read:accounts', 'write:accounts',
+    'read:opportunities', 'write:opportunities',
+    'read:contacts', 'write:contacts', 'read:activities',
+    'records:read', 'records:write', 'admin:plugins', 'admin:webhooks',
+].join(' ');
 const PROVIDER_PRESETS = {
     auto: {
         authorizePaths: DEFAULT_AUTHORIZE_PATHS,
@@ -63,7 +70,7 @@ const PROVIDER_PRESETS = {
     nexusclaw: {
         authorizePaths: ['/oauth/authorize'],
         tokenPaths: ['/oauth/token'],
-        defaultScope: 'read:accounts',
+        defaultScope: exports.NEXUSCLAW_DX_OAUTH_SCOPE,
     },
     salesforce: {
         authorizePaths: ['/services/oauth2/authorize'],
@@ -105,6 +112,16 @@ function parseAuthTimeoutSeconds(value) {
     }
     return seconds;
 }
+function buildOAuthCallbackTimeoutMessage(input) {
+    return [
+        `No OAuth callback received within ${input.timeoutSeconds} seconds.`,
+        `Instance: ${input.instanceUrl}`,
+        `Client ID: ${input.clientId}`,
+        `Redirect URI: ${input.redirectUri}`,
+        'If the authorize URL opened the NexusClaw home page instead of an authorization screen, the instance OAuth client or redirect allowlist is not configured for this CLI flow.',
+        `Ask the instance administrator to enable client_id=${input.clientId} and allow redirect_uri=${input.redirectUri}, then rerun nexus org login-web.`,
+    ].join(' ');
+}
 function classifyOAuthCallbackRequest(input) {
     if (input.pathname !== '/callback') {
         return 'ignore-non-callback';
@@ -125,12 +142,12 @@ function getScopeForFlow(opts) {
         return opts.scope.trim();
     }
     if (opts.provider === 'nexusclaw') {
-        return 'read:accounts';
+        return exports.NEXUSCLAW_DX_OAUTH_SCOPE;
     }
     if (opts.provider === 'salesforce') {
         return '';
     }
-    return isSalesforceAuthorizePath(opts.authorizePath) ? '' : 'read:accounts';
+    return isSalesforceAuthorizePath(opts.authorizePath) ? '' : exports.NEXUSCLAW_DX_OAUTH_SCOPE;
 }
 exports.loginWebCommand = new commander_1.Command('login-web')
     .description('Login via browser OAuth flow')
@@ -305,14 +322,33 @@ exports.loginWebCommand = new commander_1.Command('login-web')
         authUrl.searchParams.set('code_challenge', pkce.challenge);
         authUrl.searchParams.set('code_challenge_method', pkce.method);
         logger_1.logger.info(`Open this URL in your browser:\n  ${authUrl}`);
+        logger_1.logger.info(`Waiting up to ${authTimeoutSeconds} seconds for ${redirectUri}. ` +
+            'If the browser opens the NexusClaw home page without an authorization prompt, verify the instance OAuth client and redirect allowlist.');
         const { exec } = require('child_process');
         const cmd = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'start' : 'xdg-open';
-        exec(`${cmd} "${authUrl}"`);
+        exec(`${cmd} "${authUrl}"`, (error) => {
+            if (error) {
+                logger_1.logger.warn('Could not open the browser automatically. Open the authorization URL printed above manually; the callback listener remains active.');
+            }
+        });
+    });
+    server.on('error', (error) => {
+        clearTimeout(authTimeout);
+        const message = error.code === 'EADDRINUSE'
+            ? `OAuth callback port ${port} is already in use. Stop the process using ${redirectUri} and retry.`
+            : `OAuth callback listener failed: ${error.message}`;
+        spinner.fail(message);
+        process.exitCode = 1;
     });
     const authTimeout = setTimeout(() => {
-        spinner.fail('Authentication timed out');
+        spinner.fail(buildOAuthCallbackTimeoutMessage({
+            timeoutSeconds: authTimeoutSeconds,
+            instanceUrl: opts.instanceUrl,
+            clientId,
+            redirectUri,
+        }));
         server.close();
-        process.exit(1);
+        process.exitCode = 1;
     }, authTimeoutSeconds * 1000);
 }));
 async function exchangeAuthorizationCode(instanceUrl, code, clientId, clientSecret, redirectUri, tokenEndpointPaths, codeVerifier) {

package/dist/nexus-cli/src/commands/org/login-web.js.map

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

package/dist/nexus-cli/src/commands/org/login-web.test.js

@@ -40,6 +40,27 @@ const strict_1 = __importDefault(require("node:assert/strict"));
 const crypto = __importStar(require("crypto"));
 const node_test_1 = __importDefault(require("node:test"));
 const login_web_1 = require("./login-web");
+(0, node_test_1.default)('built-in NexusClaw login requests the complete DX scope contract', () => {
+    strict_1.default.deepEqual(login_web_1.NEXUSCLAW_DX_OAUTH_SCOPE.split(' '), [
+        'read:accounts', 'write:accounts',
+        'read:opportunities', 'write:opportunities',
+        'read:contacts', 'write:contacts', 'read:activities',
+        'records:read', 'records:write', 'admin:plugins', 'admin:webhooks',
+    ]);
+});
+(0, node_test_1.default)('OAuth callback timeout explains the instance-side recovery path without secrets', () => {
+    const message = (0, login_web_1.buildOAuthCallbackTimeoutMessage)({
+        timeoutSeconds: 600,
+        instanceUrl: 'http://dev.nexusclaw.cn',
+        clientId: 'nexusclaw-cli',
+        redirectUri: 'http://localhost:1717/callback',
+    });
+    strict_1.default.match(message, /No OAuth callback received within 600 seconds/);
+    strict_1.default.match(message, /client_id=nexusclaw-cli/);
+    strict_1.default.match(message, /redirect_uri=http:\/\/localhost:1717\/callback/);
+    strict_1.default.match(message, /home page instead of an authorization screen/);
+    strict_1.default.doesNotMatch(message, /access_token|refresh_token|code_verifier/);
+});
 (0, node_test_1.default)('OAuth callback classifier rejects stale/empty probes without processing them', () => {
     const expectedState = 'current-state';
     const classify = (overrides) => (0, login_web_1.classifyOAuthCallbackRequest)({

package/dist/nexus-cli/src/commands/org/login-web.test.js.map

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

package/dist/nexus-cli/src/commands/org/open.d.ts

@@ -1,3 +1,4 @@
 import { Command } from 'commander';
+export declare function redactCliSessionUrl(url: string): string;
 export declare const openCommand: Command;
 export declare function registerOpenCommand(org: Command): void;

package/dist/nexus-cli/src/commands/org/open.js

@@ -34,11 +34,17 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.openCommand = void 0;
+exports.redactCliSessionUrl = redactCliSessionUrl;
 exports.registerOpenCommand = registerOpenCommand;
 const commander_1 = require("commander");
 const auth_store_1 = require("../../services/auth-store");
 const logger_1 = require("../../utils/logger");
 const error_handler_1 = require("../../utils/error-handler");
+function redactCliSessionUrl(url) {
+    const redactedUrl = new URL(url);
+    redactedUrl.searchParams.set('token', '<redacted>');
+    return redactedUrl.toString();
+}
 exports.openCommand = new commander_1.Command('open')
     .description('Open the target org in the browser')
     .option('-o, --target-org <alias>', 'Target org alias')
@@ -53,14 +59,14 @@ exports.openCommand = new commander_1.Command('open')
         logger_1.logger.error(`Error: No valid token for org '${target}'. Please run 'nexus org login-web' or 'nexus org login-jwt' to authenticate.`);
         process.exit(1);
     }
-    if (cred.expiresAt && cred.expiresAt <= Date.now()) {
+    if ((0, auth_store_1.getCredentialStatus)(cred) === 'Expired') {
         logger_1.logger.error(`Error: No valid token for org '${cred.alias}'. Please run 'nexus org login-web' or 'nexus org login-jwt' to authenticate.`);
         process.exit(1);
     }
     const redirectPath = opts.path.startsWith('/') ? opts.path : `/${opts.path}`;
     const url = `${cred.instanceUrl}/auth/cli-session?token=${encodeURIComponent(cred.accessToken)}&redirect=${encodeURIComponent(redirectPath)}`;
     if (opts.urlOnly) {
-        console.log(url);
+        console.log(redactCliSessionUrl(url));
         return;
     }
     const open = await Promise.resolve().then(() => __importStar(require('open'))).then((m) => m.default);

package/dist/nexus-cli/src/commands/org/open.js.map

@@ -1 +1 @@
-{"version":3,"file":"open.js","sourceRoot":"","sources":["../../../../../src/commands/org/open.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyDA,kDAEC;AA3DD,yCAAoC;AACpC,0DAAiF;AACjF,+CAA4C;AAC5C,6DAA6D;AAOhD,QAAA,WAAW,GAAG,IAAI,mBAAO,CAAC,MAAM,CAAC;KAC3C,WAAW,CAAC,oCAAoC,CAAC;KACjD,MAAM,CAAC,0BAA0B,EAAE,kBAAkB,CAAC;KACtD,MAAM,CAAC,sBAAsB,EAAE,qCAAqC,EAAE,GAAG,CAAC;KAC1E,MAAM,CAAC,YAAY,EAAE,iDAAiD,CAAC;KACvE,MAAM,CACL,IAAA,gCAAgB,EAAC,KAAK,EAAE,IAA6D,EAAE,EAAE;IAEvF,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS;QACzB,CAAC,CAAC,IAAA,2BAAc,EAAC,IAAI,CAAC,SAAS,CAAC;QAChC,CAAC,CAAC,IAAA,iCAAoB,GAAE,CAAC;IAE3B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC;QAC3C,eAAM,CAAC,KAAK,CACV,kCAAkC,MAAM,+EAA+E,CACxH,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAGD,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;QACnD,eAAM,CAAC,KAAK,CACV,kCAAkC,IAAI,CAAC,KAAK,+EAA+E,CAC5H,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAGD,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;IAC7E,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,WAAW,2BAA2B,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,kBAAkB,CAAC,YAAY,CAAC,EAAE,CAAC;IAE9I,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,OAAO;IACT,CAAC;IAGD,MAAM,IAAI,GAAG,MAAM,kDAAO,MAAM,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACzD,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC;IAChB,eAAM,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,KAAK,gBAAgB,CAAC,CAAC;AACxD,CAAC,CAAC,CACH,CAAC;AAKJ,SAAgB,mBAAmB,CAAC,GAAY;IAC9C,GAAG,CAAC,UAAU,CAAC,mBAAW,CAAC,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"open.js","sourceRoot":"","sources":["../../../../../src/commands/org/open.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,kDAIC;AAsDD,kDAEC;AAjED,yCAAoC;AACpC,0DAAsG;AACtG,+CAA4C;AAC5C,6DAA6D;AAE7D,SAAgB,mBAAmB,CAAC,GAAW;IAC7C,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IACjC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACpD,OAAO,WAAW,CAAC,QAAQ,EAAE,CAAC;AAChC,CAAC;AAOY,QAAA,WAAW,GAAG,IAAI,mBAAO,CAAC,MAAM,CAAC;KAC3C,WAAW,CAAC,oCAAoC,CAAC;KACjD,MAAM,CAAC,0BAA0B,EAAE,kBAAkB,CAAC;KACtD,MAAM,CAAC,sBAAsB,EAAE,qCAAqC,EAAE,GAAG,CAAC;KAC1E,MAAM,CAAC,YAAY,EAAE,iDAAiD,CAAC;KACvE,MAAM,CACL,IAAA,gCAAgB,EAAC,KAAK,EAAE,IAA6D,EAAE,EAAE;IAEvF,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS;QACzB,CAAC,CAAC,IAAA,2BAAc,EAAC,IAAI,CAAC,SAAS,CAAC;QAChC,CAAC,CAAC,IAAA,iCAAoB,GAAE,CAAC;IAE3B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC;QAC3C,eAAM,CAAC,KAAK,CACV,kCAAkC,MAAM,+EAA+E,CACxH,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAGD,IAAI,IAAA,gCAAmB,EAAC,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;QAC5C,eAAM,CAAC,KAAK,CACV,kCAAkC,IAAI,CAAC,KAAK,+EAA+E,CAC5H,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAGD,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;IAC7E,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,WAAW,2BAA2B,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,kBAAkB,CAAC,YAAY,CAAC,EAAE,CAAC;IAE9I,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;QACtC,OAAO;IACT,CAAC;IAGD,MAAM,IAAI,GAAG,MAAM,kDAAO,MAAM,IAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACzD,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC;IAChB,eAAM,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,KAAK,gBAAgB,CAAC,CAAC;AACxD,CAAC,CAAC,CACH,CAAC;AAKJ,SAAgB,mBAAmB,CAAC,GAAY;IAC9C,GAAG,CAAC,UAAU,CAAC,mBAAW,CAAC,CAAC;AAC9B,CAAC"}

package/dist/nexus-cli/src/commands/org/open.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/nexus-cli/src/commands/org/open.test.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const strict_1 = __importDefault(require("node:assert/strict"));
+const node_test_1 = __importDefault(require("node:test"));
+const open_1 = require("./open");
+(0, node_test_1.default)('org open url-only redacts the complete credential while preserving the redirect', () => {
+    const token = 'header.sensitive-payload.signature';
+    const output = (0, open_1.redactCliSessionUrl)(`https://example.nexusclaw.com/auth/cli-session?token=${token}&redirect=%2Fobjects%2Faccount`);
+    strict_1.default.doesNotMatch(output, /sensitive-payload/);
+    strict_1.default.equal(new URL(output).searchParams.get('token'), '<redacted>');
+    strict_1.default.equal(new URL(output).searchParams.get('redirect'), '/objects/account');
+});
+//# sourceMappingURL=open.test.js.map

package/dist/nexus-cli/src/commands/org/open.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"open.test.js","sourceRoot":"","sources":["../../../../../src/commands/org/open.test.ts"],"names":[],"mappings":";;;;;AAAA,gEAAwC;AACxC,0DAA6B;AAE7B,iCAA6C;AAE7C,IAAA,mBAAI,EAAC,iFAAiF,EAAE,GAAG,EAAE;IAC3F,MAAM,KAAK,GAAG,oCAAoC,CAAC;IACnD,MAAM,MAAM,GAAG,IAAA,0BAAmB,EAChC,wDAAwD,KAAK,gCAAgC,CAC9F,CAAC;IAEF,gBAAM,CAAC,YAAY,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACjD,gBAAM,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,CAAC;IACtE,gBAAM,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,kBAAkB,CAAC,CAAC;AACjF,CAAC,CAAC,CAAC"}

package/dist/nexus-cli/src/commands/package/history.js

@@ -4,20 +4,26 @@ exports.packageHistoryCommand = void 0;
 const commander_1 = require("commander");
 const revision_ledger_1 = require("../../services/revision-ledger");
 const table_formatter_1 = require("../../utils/table-formatter");
+const command_options_1 = require("../../utils/command-options");
 exports.packageHistoryCommand = new commander_1.Command('history')
     .description('查看 package 安装历史')
     .argument('[packageName]', 'package 名称')
-    .option('--environment <environment>', 'Revision ledger environment', 'dev')
+    .option('--env <environment>', 'Revision ledger environment')
+    .option('--environment <environment>', 'Revision ledger environment')
+    .option('-w, --workspace-id <id>', 'Filter history by target workspace id')
     .option('--json', 'Output package history as JSON', false)
     .action(async (packageName, options) => {
-    const environment = (0, revision_ledger_1.resolveRevisionEnvironment)(options.environment);
+    const environment = (0, revision_ledger_1.resolveRevisionEnvironment)((0, command_options_1.resolveEnvironmentOption)(options) ?? 'dev');
     await (0, revision_ledger_1.ensureRevisionLedgerInitialized)('.', environment);
     const service = new revision_ledger_1.RevisionService(new revision_ledger_1.LedgerStorage('.'));
-    const records = await service.queryRevisions({
+    const queriedRecords = await service.queryRevisions({
         environment,
         packageName,
         limit: 100,
     });
+    const records = options.workspaceId
+        ? queriedRecords.filter((record) => record.metadata.workspaceId === options.workspaceId)
+        : queriedRecords;
     if (records.length === 0) {
         console.log('No package install history found.');
         return;