@supersdk/supercli 0.3.0-staging.29 → 0.3.0-staging.31
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.
- package/dist/api/settingsClient.js +43 -0
- package/dist/api/settingsClient.js.map +1 -0
- package/dist/cli.js +4 -0
- package/dist/cli.js.map +1 -1
- package/dist/commands/env.js +53 -0
- package/dist/commands/env.js.map +1 -0
- package/dist/commands/settings.js +307 -0
- package/dist/commands/settings.js.map +1 -0
- package/dist/output/envelope.js +20 -5
- package/dist/output/envelope.js.map +1 -1
- package/dist/output/resultPrinter.js +7 -3
- package/dist/output/resultPrinter.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SettingsClient = void 0;
|
|
4
|
+
const consoleClient_1 = require("./consoleClient");
|
|
5
|
+
function scopedPath(spid, env) {
|
|
6
|
+
return `/api/console/cli/projects/${encodeURIComponent(spid)}/envs/${encodeURIComponent(env)}/settings`;
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* The only Settings transport exposed to SuperCLI. Its method surface mirrors
|
|
10
|
+
* the CA CLI-only facade exactly: list, detail, and single-request upsert.
|
|
11
|
+
*/
|
|
12
|
+
class SettingsClient {
|
|
13
|
+
apiOrigin;
|
|
14
|
+
fetchImpl;
|
|
15
|
+
constructor(apiOrigin, fetchImpl) {
|
|
16
|
+
this.apiOrigin = apiOrigin;
|
|
17
|
+
this.fetchImpl = fetchImpl;
|
|
18
|
+
}
|
|
19
|
+
listEnvironments(ctx, spid) {
|
|
20
|
+
return (0, consoleClient_1.performRequest)(this.apiOrigin, 'GET', `/api/console/projects/${encodeURIComponent(spid)}/envs`, { bearer: ctx.token, fetchImpl: this.fetchImpl });
|
|
21
|
+
}
|
|
22
|
+
list(ctx, scope) {
|
|
23
|
+
return (0, consoleClient_1.performRequest)(this.apiOrigin, 'GET', scopedPath(scope.spid, scope.env), {
|
|
24
|
+
bearer: ctx.token,
|
|
25
|
+
fetchImpl: this.fetchImpl,
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
get(ctx, scope, name) {
|
|
29
|
+
return (0, consoleClient_1.performRequest)(this.apiOrigin, 'GET', `${scopedPath(scope.spid, scope.env)}/${encodeURIComponent(name)}`, {
|
|
30
|
+
bearer: ctx.token,
|
|
31
|
+
fetchImpl: this.fetchImpl,
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
set(ctx, scope, name, jsContent) {
|
|
35
|
+
return (0, consoleClient_1.performRequest)(this.apiOrigin, 'PUT', `${scopedPath(scope.spid, scope.env)}/${encodeURIComponent(name)}`, {
|
|
36
|
+
bearer: ctx.token,
|
|
37
|
+
body: { js_content: jsContent },
|
|
38
|
+
fetchImpl: this.fetchImpl,
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
exports.SettingsClient = SettingsClient;
|
|
43
|
+
//# sourceMappingURL=settingsClient.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"settingsClient.js","sourceRoot":"","sources":["../../src/api/settingsClient.ts"],"names":[],"mappings":";;;AAAA,mDAAqF;AAwCrF,SAAS,UAAU,CAAC,IAAY,EAAE,GAAW;IAC3C,OAAO,6BAA6B,kBAAkB,CAAC,IAAI,CAAC,SAAS,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC;AAC1G,CAAC;AAED;;;GAGG;AACH,MAAa,cAAc;IAEN;IACA;IAFnB,YACmB,SAAiB,EACjB,SAAqB;QADrB,cAAS,GAAT,SAAS,CAAQ;QACjB,cAAS,GAAT,SAAS,CAAY;IACrC,CAAC;IAEJ,gBAAgB,CAAC,GAA2B,EAAE,IAAY;QACxD,OAAO,IAAA,8BAAc,EACnB,IAAI,CAAC,SAAS,EACd,KAAK,EACL,yBAAyB,kBAAkB,CAAC,IAAI,CAAC,OAAO,EACxD,EAAE,MAAM,EAAE,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CACjD,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,GAA2B,EAAE,KAAoC;QACpE,OAAO,IAAA,8BAAc,EAAmB,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE;YAChG,MAAM,EAAE,GAAG,CAAC,KAAK;YACjB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,GAAG,CAAC,GAA2B,EAAE,KAAoC,EAAE,IAAY;QACjF,OAAO,IAAA,8BAAc,EAAgB,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,EAAE,EAAE;YAC9H,MAAM,EAAE,GAAG,CAAC,KAAK;YACjB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,GAAG,CACD,GAA2B,EAC3B,KAAoC,EACpC,IAAY,EACZ,SAAiB;QAEjB,OAAO,IAAA,8BAAc,EAAqB,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,EAAE,EAAE;YACnI,MAAM,EAAE,GAAG,CAAC,KAAK;YACjB,IAAI,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE;YAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;IACL,CAAC;CACF;AAzCD,wCAyCC"}
|
package/dist/cli.js
CHANGED
|
@@ -11,6 +11,8 @@ const login_1 = require("./commands/login");
|
|
|
11
11
|
const logout_1 = require("./commands/logout");
|
|
12
12
|
const publishSite_1 = require("./commands/publishSite");
|
|
13
13
|
const register_1 = require("./commands/register");
|
|
14
|
+
const env_1 = require("./commands/env");
|
|
15
|
+
const settings_1 = require("./commands/settings");
|
|
14
16
|
const switchaccount_1 = require("./commands/switchaccount");
|
|
15
17
|
const update_1 = require("./commands/update");
|
|
16
18
|
const resultPrinter_1 = require("./output/resultPrinter");
|
|
@@ -67,6 +69,8 @@ function buildProgram() {
|
|
|
67
69
|
(0, register_1.registerRegisterCommand)(program);
|
|
68
70
|
(0, publishSite_1.registerPublishSiteCommand)(program);
|
|
69
71
|
(0, analytics_1.registerAnalyticsCommand)(program);
|
|
72
|
+
(0, env_1.registerEnvCommand)(program);
|
|
73
|
+
(0, settings_1.registerSettingsCommand)(program);
|
|
70
74
|
// `supercli help <未知命令>` 默认只闷头打印总 help,用户不知道自己敲错了命令名 ——
|
|
71
75
|
// 而 `supercli <未知命令>` 是有 `error: unknown command` 的,同一个 CLI 两种态度。
|
|
72
76
|
// 显式接管 help 子命令,未知主题按未知命令同样处理。(origin/staging)
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.runEnvList = runEnvList;
|
|
4
|
+
exports.registerEnvCommand = registerEnvCommand;
|
|
5
|
+
const resultPrinter_1 = require("../output/resultPrinter");
|
|
6
|
+
const settings_1 = require("./settings");
|
|
7
|
+
function value(flag) {
|
|
8
|
+
const trimmed = flag?.trim();
|
|
9
|
+
return trimmed && trimmed.length > 0 ? trimmed : null;
|
|
10
|
+
}
|
|
11
|
+
function projectEnvironment(input) {
|
|
12
|
+
return { name: input.name, builtin: input.builtin, created_at: input.created_at };
|
|
13
|
+
}
|
|
14
|
+
async function runEnvList(opts, deps = settings_1.defaultSettingsDeps) {
|
|
15
|
+
const spid = value(opts.spid);
|
|
16
|
+
if (!spid)
|
|
17
|
+
return { ok: false, kind: 'usage_error', message: '--spid is required' };
|
|
18
|
+
const auth = (0, settings_1.resolveSettingsAuth)(deps);
|
|
19
|
+
if ((0, settings_1.isCommandOutcome)(auth))
|
|
20
|
+
return auth;
|
|
21
|
+
const outcome = await deps.createClient(auth.apiOrigin).listEnvironments({ token: auth.token }, spid);
|
|
22
|
+
switch (outcome.kind) {
|
|
23
|
+
case 'success': {
|
|
24
|
+
const result = { spid, environments: outcome.data.map(projectEnvironment) };
|
|
25
|
+
return { ok: true, result, humanMessage: JSON.stringify(result, null, 2) };
|
|
26
|
+
}
|
|
27
|
+
case 'business_error':
|
|
28
|
+
return { ok: false, kind: 'business_error', publicCode: outcome.code, message: `environment list was rejected (${outcome.code})` };
|
|
29
|
+
case 'auth_invalid':
|
|
30
|
+
return { ok: false, kind: 'auth_invalid', message: 'environment-list authentication failed — run `supercli login` again or replace SUPERCLI_TOKEN' };
|
|
31
|
+
case 'forbidden':
|
|
32
|
+
return { ok: false, kind: 'forbidden', message: 'environment-list access is forbidden for this project' };
|
|
33
|
+
case 'rate_limited':
|
|
34
|
+
return { ok: false, kind: 'rate_limited', message: 'environment-list request was rate limited — retry later' };
|
|
35
|
+
case 'infra_error':
|
|
36
|
+
return { ok: false, kind: 'infra_error', message: 'environment-list service is unavailable or returned an invalid response — retry later' };
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
function outputModeOf(cmd) {
|
|
40
|
+
return cmd.optsWithGlobals?.()?.output === 'json' ? 'json' : 'human';
|
|
41
|
+
}
|
|
42
|
+
function registerEnvCommand(program) {
|
|
43
|
+
const env = program.command('env').description('Inspect project environments available to the current CLI identity.');
|
|
44
|
+
env.command('list')
|
|
45
|
+
.description('List live environments for one project.')
|
|
46
|
+
.requiredOption('--spid <spid>', 'project workspace identifier')
|
|
47
|
+
.option('--output <mode>', 'output mode: "json" emits a single machine-readable envelope on stdout')
|
|
48
|
+
.option('--no-input', 'never prompt for interactive input; fail fast (implied by --output json)')
|
|
49
|
+
.action(async (opts, cmd) => {
|
|
50
|
+
new resultPrinter_1.ResultPrinter(outputModeOf(cmd)).emit(await runEnvList(opts));
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=env.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/commands/env.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,307 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.defaultSettingsDeps = void 0;
|
|
37
|
+
exports.isCommandOutcome = isCommandOutcome;
|
|
38
|
+
exports.resolveSettingsAuth = resolveSettingsAuth;
|
|
39
|
+
exports.resolveSettingContent = resolveSettingContent;
|
|
40
|
+
exports.runSettingsList = runSettingsList;
|
|
41
|
+
exports.runSettingsGet = runSettingsGet;
|
|
42
|
+
exports.runSettingsSet = runSettingsSet;
|
|
43
|
+
exports.registerSettingsCommand = registerSettingsCommand;
|
|
44
|
+
const fs = __importStar(require("node:fs"));
|
|
45
|
+
const settingsClient_1 = require("../api/settingsClient");
|
|
46
|
+
const tokenAuth_1 = require("../auth/tokenAuth");
|
|
47
|
+
const environments_1 = require("../config/environments");
|
|
48
|
+
const resultPrinter_1 = require("../output/resultPrinter");
|
|
49
|
+
const accountStore_1 = require("../store/accountStore");
|
|
50
|
+
const credentialStore_1 = require("../store/credentialStore");
|
|
51
|
+
const log_1 = require("../util/log");
|
|
52
|
+
const prompt_1 = require("../util/prompt");
|
|
53
|
+
function storedToken(account) {
|
|
54
|
+
return (0, credentialStore_1.backendForAccount)(account.backend, {
|
|
55
|
+
passphraseProvider: account.backend === 'encrypted-file'
|
|
56
|
+
? () => (0, prompt_1.promptHiddenSync)(`Encryption passphrase for ${account.email ?? account.accountKey}: `)
|
|
57
|
+
: undefined,
|
|
58
|
+
}).get(account.accountKey)?.token ?? null;
|
|
59
|
+
}
|
|
60
|
+
exports.defaultSettingsDeps = {
|
|
61
|
+
getCurrentAccount: accountStore_1.getCurrentAccount,
|
|
62
|
+
getStoredToken: storedToken,
|
|
63
|
+
markNeedsLogin: accountStore_1.markAccountNeedsLogin,
|
|
64
|
+
createClient: (apiOrigin) => new settingsClient_1.SettingsClient(apiOrigin),
|
|
65
|
+
// Read bytes first: `utf8` decoding would silently replace malformed input.
|
|
66
|
+
readFile: (file) => fs.readFileSync(file),
|
|
67
|
+
};
|
|
68
|
+
const SETTINGS_USER_DATA_PATHS = [
|
|
69
|
+
'$.settings[*].name',
|
|
70
|
+
'$.settings[*].description',
|
|
71
|
+
'$.setting.name',
|
|
72
|
+
'$.setting.js_content',
|
|
73
|
+
'$.setting.description',
|
|
74
|
+
'$.setting.mock_params.**',
|
|
75
|
+
];
|
|
76
|
+
function value(flag) {
|
|
77
|
+
const trimmed = flag?.trim();
|
|
78
|
+
return trimmed && trimmed.length > 0 ? trimmed : null;
|
|
79
|
+
}
|
|
80
|
+
function isCommandOutcome(valueToCheck) {
|
|
81
|
+
return valueToCheck !== null && typeof valueToCheck === 'object' && 'ok' in valueToCheck;
|
|
82
|
+
}
|
|
83
|
+
function resolveSettingsAuth(deps) {
|
|
84
|
+
const envToken = (0, tokenAuth_1.resolveEnvToken)();
|
|
85
|
+
if (envToken)
|
|
86
|
+
return { token: envToken, apiOrigin: (0, environments_1.resolveApiOrigin)().apiOrigin };
|
|
87
|
+
const account = deps.getCurrentAccount();
|
|
88
|
+
if (!account) {
|
|
89
|
+
return { ok: false, kind: 'needs_login', message: 'no account is logged in — run `supercli login` first or set SUPERCLI_TOKEN' };
|
|
90
|
+
}
|
|
91
|
+
let token;
|
|
92
|
+
try {
|
|
93
|
+
token = deps.getStoredToken(account);
|
|
94
|
+
}
|
|
95
|
+
catch {
|
|
96
|
+
return { ok: false, kind: 'needs_login', message: 'cannot access the local credential — run `supercli login` again or set SUPERCLI_TOKEN' };
|
|
97
|
+
}
|
|
98
|
+
if (!token) {
|
|
99
|
+
deps.markNeedsLogin(account.accountKey);
|
|
100
|
+
return { ok: false, kind: 'needs_login', message: 'no valid credential found locally — run `supercli login` again or set SUPERCLI_TOKEN' };
|
|
101
|
+
}
|
|
102
|
+
return { token, apiOrigin: account.apiOrigin };
|
|
103
|
+
}
|
|
104
|
+
function scope(opts) {
|
|
105
|
+
const spid = value(opts.spid);
|
|
106
|
+
const env = value(opts.env);
|
|
107
|
+
if (!spid || !env)
|
|
108
|
+
return { ok: false, kind: 'usage_error', message: '--spid and --env are both required' };
|
|
109
|
+
return { spid, env };
|
|
110
|
+
}
|
|
111
|
+
function nameOf(opts) {
|
|
112
|
+
const name = value(opts.name);
|
|
113
|
+
if (!name)
|
|
114
|
+
return { ok: false, kind: 'usage_error', message: 'a setting <name> is required' };
|
|
115
|
+
return name;
|
|
116
|
+
}
|
|
117
|
+
/** Resolve only argv/file input; this must happen before credentials or HTTP. */
|
|
118
|
+
function resolveSettingContent(opts, deps) {
|
|
119
|
+
const hasContent = opts.content !== undefined;
|
|
120
|
+
const hasFile = opts.file !== undefined;
|
|
121
|
+
if (Number(hasContent) + Number(hasFile) !== 1) {
|
|
122
|
+
return { ok: false, kind: 'usage_error', message: 'choose exactly one content source: --content <js> or --file <path>' };
|
|
123
|
+
}
|
|
124
|
+
if (hasContent)
|
|
125
|
+
return opts.content ?? '';
|
|
126
|
+
try {
|
|
127
|
+
// fatal=true is required: replacement characters would change an executable
|
|
128
|
+
// setting while concealing that the file was not valid UTF-8.
|
|
129
|
+
return new TextDecoder('utf-8', { fatal: true }).decode(deps.readFile(opts.file ?? ''));
|
|
130
|
+
}
|
|
131
|
+
catch {
|
|
132
|
+
return { ok: false, kind: 'usage_error', message: 'could not read a valid UTF-8 settings file; verify --file points to a readable UTF-8 file' };
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
function settingsFailure(outcome) {
|
|
136
|
+
switch (outcome.kind) {
|
|
137
|
+
case 'business_error':
|
|
138
|
+
return {
|
|
139
|
+
ok: false,
|
|
140
|
+
kind: 'business_error',
|
|
141
|
+
publicCode: outcome.code,
|
|
142
|
+
// CA validation messages tell the caller how to fix the Setting. Keep
|
|
143
|
+
// that detail here; ResultPrinter owns the shared token redaction
|
|
144
|
+
// boundary for both JSON and human failures.
|
|
145
|
+
message: outcome.message || `settings request was rejected (${outcome.code})`,
|
|
146
|
+
};
|
|
147
|
+
case 'auth_invalid':
|
|
148
|
+
return { ok: false, kind: 'auth_invalid', message: 'settings authentication failed — run `supercli login` again or replace SUPERCLI_TOKEN' };
|
|
149
|
+
case 'forbidden':
|
|
150
|
+
return { ok: false, kind: 'forbidden', message: 'settings write or read access is forbidden for this project environment' };
|
|
151
|
+
case 'rate_limited':
|
|
152
|
+
return { ok: false, kind: 'rate_limited', message: 'settings request was rate limited — retry later' };
|
|
153
|
+
case 'infra_error':
|
|
154
|
+
return { ok: false, kind: 'infra_error', message: 'settings service is unavailable or returned an invalid response — retry later' };
|
|
155
|
+
case 'success':
|
|
156
|
+
return { ok: false, kind: 'infra_error', message: 'unexpected settings client outcome' };
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
function projectSummary(input) {
|
|
160
|
+
return {
|
|
161
|
+
name: input.name,
|
|
162
|
+
description: input.description,
|
|
163
|
+
created_at: input.created_at,
|
|
164
|
+
updated_at: input.updated_at,
|
|
165
|
+
};
|
|
166
|
+
}
|
|
167
|
+
function projectDetail(input) {
|
|
168
|
+
return {
|
|
169
|
+
...projectSummary(input),
|
|
170
|
+
id: input.id,
|
|
171
|
+
js_content: input.js_content,
|
|
172
|
+
mock_params: input.mock_params,
|
|
173
|
+
created_by: input.created_by,
|
|
174
|
+
updated_by: input.updated_by,
|
|
175
|
+
};
|
|
176
|
+
}
|
|
177
|
+
function projectSet(input) {
|
|
178
|
+
return {
|
|
179
|
+
status: input.status,
|
|
180
|
+
name: input.name,
|
|
181
|
+
description_present: input.description_present,
|
|
182
|
+
created_at: input.created_at,
|
|
183
|
+
updated_at: input.updated_at,
|
|
184
|
+
content_sha256: input.content_sha256,
|
|
185
|
+
utf8_bytes: input.utf8_bytes,
|
|
186
|
+
mock_params_present: input.mock_params_present,
|
|
187
|
+
};
|
|
188
|
+
}
|
|
189
|
+
async function runSettingsList(opts, deps = exports.defaultSettingsDeps) {
|
|
190
|
+
const target = scope(opts);
|
|
191
|
+
if (isCommandOutcome(target))
|
|
192
|
+
return target;
|
|
193
|
+
const auth = resolveSettingsAuth(deps);
|
|
194
|
+
if (isCommandOutcome(auth))
|
|
195
|
+
return auth;
|
|
196
|
+
const outcome = await deps.createClient(auth.apiOrigin).list({ token: auth.token }, target);
|
|
197
|
+
if (outcome.kind !== 'success')
|
|
198
|
+
return settingsFailure(outcome);
|
|
199
|
+
const result = { ...target, settings: outcome.data.map(projectSummary) };
|
|
200
|
+
return {
|
|
201
|
+
ok: true,
|
|
202
|
+
result,
|
|
203
|
+
humanMessage: JSON.stringify(result, null, 2),
|
|
204
|
+
allowTokenShapedPaths: SETTINGS_USER_DATA_PATHS.slice(0, 2),
|
|
205
|
+
};
|
|
206
|
+
}
|
|
207
|
+
async function runSettingsGet(opts, deps = exports.defaultSettingsDeps) {
|
|
208
|
+
const target = scope(opts);
|
|
209
|
+
if (isCommandOutcome(target))
|
|
210
|
+
return target;
|
|
211
|
+
const name = nameOf(opts);
|
|
212
|
+
if (isCommandOutcome(name))
|
|
213
|
+
return name;
|
|
214
|
+
const auth = resolveSettingsAuth(deps);
|
|
215
|
+
if (isCommandOutcome(auth))
|
|
216
|
+
return auth;
|
|
217
|
+
const outcome = await deps.createClient(auth.apiOrigin).get({ token: auth.token }, target, name);
|
|
218
|
+
if (outcome.kind !== 'success')
|
|
219
|
+
return settingsFailure(outcome);
|
|
220
|
+
const result = { ...target, setting: projectDetail(outcome.data) };
|
|
221
|
+
return {
|
|
222
|
+
ok: true,
|
|
223
|
+
result,
|
|
224
|
+
humanMessage: JSON.stringify(result, null, 2),
|
|
225
|
+
allowTokenShapedPaths: SETTINGS_USER_DATA_PATHS.slice(2),
|
|
226
|
+
};
|
|
227
|
+
}
|
|
228
|
+
async function runSettingsSet(opts, deps = exports.defaultSettingsDeps) {
|
|
229
|
+
const content = resolveSettingContent(opts, deps);
|
|
230
|
+
if (isCommandOutcome(content))
|
|
231
|
+
return content;
|
|
232
|
+
const target = scope(opts);
|
|
233
|
+
if (isCommandOutcome(target))
|
|
234
|
+
return target;
|
|
235
|
+
const name = nameOf(opts);
|
|
236
|
+
if (isCommandOutcome(name))
|
|
237
|
+
return name;
|
|
238
|
+
const auth = resolveSettingsAuth(deps);
|
|
239
|
+
if (isCommandOutcome(auth))
|
|
240
|
+
return auth;
|
|
241
|
+
const outcome = await deps.createClient(auth.apiOrigin).set({ token: auth.token }, target, name, content);
|
|
242
|
+
if (outcome.kind !== 'success')
|
|
243
|
+
return settingsFailure(outcome);
|
|
244
|
+
const setting = projectSet(outcome.data);
|
|
245
|
+
const result = {
|
|
246
|
+
...target,
|
|
247
|
+
name,
|
|
248
|
+
status: setting.status,
|
|
249
|
+
setting: {
|
|
250
|
+
name: setting.name,
|
|
251
|
+
description_present: setting.description_present,
|
|
252
|
+
created_at: setting.created_at,
|
|
253
|
+
updated_at: setting.updated_at,
|
|
254
|
+
mock_params_present: setting.mock_params_present,
|
|
255
|
+
},
|
|
256
|
+
content_sha256: setting.content_sha256,
|
|
257
|
+
utf8_bytes: setting.utf8_bytes,
|
|
258
|
+
};
|
|
259
|
+
return {
|
|
260
|
+
ok: true,
|
|
261
|
+
result,
|
|
262
|
+
humanMessage: JSON.stringify(result, null, 2),
|
|
263
|
+
// Both fields are the same Setting name. Scope remains intentionally
|
|
264
|
+
// outside this allowlist so a credential-shaped --spid/--env fails closed.
|
|
265
|
+
allowTokenShapedPaths: ['$.name', '$.setting.name'],
|
|
266
|
+
};
|
|
267
|
+
}
|
|
268
|
+
function outputModeOf(cmd) {
|
|
269
|
+
return cmd.optsWithGlobals?.()?.output === 'json' ? 'json' : 'human';
|
|
270
|
+
}
|
|
271
|
+
function addLeafOutputOptions(command) {
|
|
272
|
+
return command
|
|
273
|
+
.option('--output <mode>', 'output mode: "json" emits a single machine-readable envelope on stdout')
|
|
274
|
+
.option('--no-input', 'never prompt for interactive input; fail fast (implied by --output json)');
|
|
275
|
+
}
|
|
276
|
+
function emit(printer, outcome) {
|
|
277
|
+
printer.emit(outcome);
|
|
278
|
+
}
|
|
279
|
+
function registerSettingsCommand(program) {
|
|
280
|
+
const settings = program.command('settings').description('Read or publish scoped Settings through the CLI-only Console API.');
|
|
281
|
+
addLeafOutputOptions(settings.command('list')
|
|
282
|
+
.description('List Settings summaries in one project environment.')
|
|
283
|
+
.requiredOption('--spid <spid>', 'project workspace identifier')
|
|
284
|
+
.requiredOption('--env <env>', 'project environment')
|
|
285
|
+
.action(async (opts, cmd) => emit(new resultPrinter_1.ResultPrinter(outputModeOf(cmd)), await runSettingsList(opts))));
|
|
286
|
+
addLeafOutputOptions(settings.command('get <name>')
|
|
287
|
+
.description('Read one Setting, including its original JavaScript content.')
|
|
288
|
+
.requiredOption('--spid <spid>', 'project workspace identifier')
|
|
289
|
+
.requiredOption('--env <env>', 'project environment')
|
|
290
|
+
.action(async (name, opts, cmd) => {
|
|
291
|
+
emit(new resultPrinter_1.ResultPrinter(outputModeOf(cmd)), await runSettingsGet({ ...opts, name }));
|
|
292
|
+
}));
|
|
293
|
+
addLeafOutputOptions(settings.command('set <name>')
|
|
294
|
+
.description('Create or update one Setting. Choose exactly one of --content or --file; direct content may be recorded in shell history.')
|
|
295
|
+
.requiredOption('--spid <spid>', 'project workspace identifier')
|
|
296
|
+
.requiredOption('--env <env>', 'project environment')
|
|
297
|
+
.option('--content <js>', 'direct JavaScript content (may be recorded in shell history)')
|
|
298
|
+
.option('--file <path>', 'read UTF-8 JavaScript content from a file')
|
|
299
|
+
.action(async (name, opts, cmd) => {
|
|
300
|
+
const mode = outputModeOf(cmd);
|
|
301
|
+
if (mode === 'human' && opts.content !== undefined) {
|
|
302
|
+
log_1.log.warn('--content may be recorded in local shell history; prefer --file for sensitive or multi-line Settings content');
|
|
303
|
+
}
|
|
304
|
+
emit(new resultPrinter_1.ResultPrinter(mode), await runSettingsSet({ ...opts, name }));
|
|
305
|
+
}));
|
|
306
|
+
}
|
|
307
|
+
//# sourceMappingURL=settings.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/commands/settings.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmFA,4CAEC;AAED,kDAmBC;AAgBD,sDAiBC;AA4DD,0CAcC;AAED,wCAgBC;AAED,wCAkCC;AAgBD,0DAiCC;AA5TD,4CAA8B;AAE9B,0DAM+B;AAE/B,iDAAoD;AACpD,yDAA0D;AAC1D,2DAA8F;AAC9F,wDAAqG;AACrG,8DAA6D;AAC7D,qCAAkC;AAClC,2CAAkD;AAoClD,SAAS,WAAW,CAAC,OAAsB;IACzC,OAAO,IAAA,mCAAiB,EAAC,OAAO,CAAC,OAAO,EAAE;QACxC,kBAAkB,EAAE,OAAO,CAAC,OAAO,KAAK,gBAAgB;YACtD,CAAC,CAAC,GAAG,EAAE,CAAC,IAAA,yBAAgB,EAAC,6BAA6B,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,UAAU,IAAI,CAAC;YAC9F,CAAC,CAAC,SAAS;KACd,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,KAAK,IAAI,IAAI,CAAC;AAC5C,CAAC;AAEY,QAAA,mBAAmB,GAAiB;IAC/C,iBAAiB,EAAjB,gCAAiB;IACjB,cAAc,EAAE,WAAW;IAC3B,cAAc,EAAE,oCAAqB;IACrC,YAAY,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,+BAAc,CAAC,SAAS,CAAC;IAC1D,4EAA4E;IAC5E,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC;CAC1C,CAAC;AAEF,MAAM,wBAAwB,GAAG;IAC/B,oBAAoB;IACpB,2BAA2B;IAC3B,gBAAgB;IAChB,sBAAsB;IACtB,uBAAuB;IACvB,0BAA0B;CAClB,CAAC;AAEX,SAAS,KAAK,CAAC,IAAwB;IACrC,MAAM,OAAO,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC;IAC7B,OAAO,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AACxD,CAAC;AAED,SAAgB,gBAAgB,CAAC,YAAqB;IACpD,OAAO,YAAY,KAAK,IAAI,IAAI,OAAO,YAAY,KAAK,QAAQ,IAAI,IAAI,IAAI,YAAY,CAAC;AAC3F,CAAC;AAED,SAAgB,mBAAmB,CAAC,IAAkB;IACpD,MAAM,QAAQ,GAAG,IAAA,2BAAe,GAAE,CAAC;IACnC,IAAI,QAAQ;QAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAA,+BAAgB,GAAE,CAAC,SAAS,EAAE,CAAC;IAElF,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;IACzC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,4EAA4E,EAAE,CAAC;IACnI,CAAC;IACD,IAAI,KAAoB,CAAC;IACzB,IAAI,CAAC;QACH,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,uFAAuF,EAAE,CAAC;IAC9I,CAAC;IACD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACxC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,sFAAsF,EAAE,CAAC;IAC7I,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;AACjD,CAAC;AAED,SAAS,KAAK,CAAC,IAA0B;IACvC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,oCAAoC,EAAE,CAAC;IAC5G,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;AACvB,CAAC;AAED,SAAS,MAAM,CAAC,IAAwB;IACtC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,8BAA8B,EAAE,CAAC;IAC9F,OAAO,IAAI,CAAC;AACd,CAAC;AAED,iFAAiF;AACjF,SAAgB,qBAAqB,CACnC,IAAkD,EAClD,IAAoC;IAEpC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC;IAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;IACxC,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/C,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,oEAAoE,EAAE,CAAC;IAC3H,CAAC;IACD,IAAI,UAAU;QAAE,OAAO,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;IAC1C,IAAI,CAAC;QACH,4EAA4E;QAC5E,8DAA8D;QAC9D,OAAO,IAAI,WAAW,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;IAC1F,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,2FAA2F,EAAE,CAAC;IAClJ,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAI,OAAyB;IACnD,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,KAAK,gBAAgB;YACnB,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,IAAI,EAAE,gBAAgB;gBACtB,UAAU,EAAE,OAAO,CAAC,IAAI;gBACxB,sEAAsE;gBACtE,kEAAkE;gBAClE,6CAA6C;gBAC7C,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,kCAAkC,OAAO,CAAC,IAAI,GAAG;aAC9E,CAAC;QACJ,KAAK,cAAc;YACjB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,uFAAuF,EAAE,CAAC;QAC/I,KAAK,WAAW;YACd,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,yEAAyE,EAAE,CAAC;QAC9H,KAAK,cAAc;YACjB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,iDAAiD,EAAE,CAAC;QACzG,KAAK,aAAa;YAChB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,+EAA+E,EAAE,CAAC;QACtI,KAAK,SAAS;YACZ,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,oCAAoC,EAAE,CAAC;IAC7F,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,KAAqB;IAC3C,OAAO;QACL,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,UAAU,EAAE,KAAK,CAAC,UAAU;KAC7B,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,KAAoB;IACzC,OAAO;QACL,GAAG,cAAc,CAAC,KAAK,CAAC;QACxB,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,UAAU,EAAE,KAAK,CAAC,UAAU;KAC7B,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,KAAyB;IAC3C,OAAO;QACL,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;QAC9C,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;KAC/C,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,eAAe,CAAC,IAA0B,EAAE,OAAqB,2BAAmB;IACxG,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,IAAI,gBAAgB,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IAC5C,MAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,gBAAgB,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;IAC5F,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,eAAe,CAAC,OAAO,CAAC,CAAC;IAChE,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;IACzE,OAAO;QACL,EAAE,EAAE,IAAI;QACR,MAAM;QACN,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7C,qBAAqB,EAAE,wBAAwB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;KAC5D,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,cAAc,CAAC,IAAwB,EAAE,OAAqB,2BAAmB;IACrG,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,IAAI,gBAAgB,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1B,IAAI,gBAAgB,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,gBAAgB,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACjG,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,eAAe,CAAC,OAAO,CAAC,CAAC;IAChE,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;IACnE,OAAO;QACL,EAAE,EAAE,IAAI;QACR,MAAM;QACN,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7C,qBAAqB,EAAE,wBAAwB,CAAC,KAAK,CAAC,CAAC,CAAC;KACzD,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,cAAc,CAAC,IAAwB,EAAE,OAAqB,2BAAmB;IACrG,MAAM,OAAO,GAAG,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAClD,IAAI,gBAAgB,CAAC,OAAO,CAAC;QAAE,OAAO,OAAO,CAAC;IAC9C,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,IAAI,gBAAgB,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1B,IAAI,gBAAgB,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,gBAAgB,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1G,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,eAAe,CAAC,OAAO,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,MAAM,GAAG;QACb,GAAG,MAAM;QACT,IAAI;QACJ,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,OAAO,EAAE;YACP,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;YAChD,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;SACjD;QACD,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,UAAU,EAAE,OAAO,CAAC,UAAU;KAC/B,CAAC;IACF,OAAO;QACL,EAAE,EAAE,IAAI;QACR,MAAM;QACN,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7C,sEAAsE;QACtE,2EAA2E;QAC3E,qBAAqB,EAAE,CAAC,QAAQ,EAAE,gBAAgB,CAAC;KACpD,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,GAAY;IAChC,OAAQ,GAAG,CAAC,eAAe,EAAE,EAA0B,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;AAChG,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAgB;IAC5C,OAAO,OAAO;SACX,MAAM,CAAC,iBAAiB,EAAE,wEAAwE,CAAC;SACnG,MAAM,CAAC,YAAY,EAAE,0EAA0E,CAAC,CAAC;AACtG,CAAC;AAED,SAAS,IAAI,CAAC,OAAsB,EAAE,OAAuB;IAC3D,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACxB,CAAC;AAED,SAAgB,uBAAuB,CAAC,OAAgB;IACtD,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,WAAW,CAAC,mEAAmE,CAAC,CAAC;IAC9H,oBAAoB,CAClB,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;SACrB,WAAW,CAAC,qDAAqD,CAAC;SAClE,cAAc,CAAC,eAAe,EAAE,8BAA8B,CAAC;SAC/D,cAAc,CAAC,aAAa,EAAE,qBAAqB,CAAC;SACpD,MAAM,CAAC,KAAK,EAAE,IAA0B,EAAE,GAAY,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,6BAAa,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CACvI,CAAC;IACF,oBAAoB,CAClB,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC;SAC3B,WAAW,CAAC,8DAA8D,CAAC;SAC3E,cAAc,CAAC,eAAe,EAAE,8BAA8B,CAAC;SAC/D,cAAc,CAAC,aAAa,EAAE,qBAAqB,CAAC;SACpD,MAAM,CAAC,KAAK,EAAE,IAAY,EAAE,IAA0B,EAAE,GAAY,EAAE,EAAE;QACvE,IAAI,CAAC,IAAI,6BAAa,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,cAAc,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACtF,CAAC,CAAC,CACL,CAAC;IACF,oBAAoB,CAClB,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC;SAC3B,WAAW,CAAC,2HAA2H,CAAC;SACxI,cAAc,CAAC,eAAe,EAAE,8BAA8B,CAAC;SAC/D,cAAc,CAAC,aAAa,EAAE,qBAAqB,CAAC;SACpD,MAAM,CAAC,gBAAgB,EAAE,8DAA8D,CAAC;SACxF,MAAM,CAAC,eAAe,EAAE,2CAA2C,CAAC;SACpE,MAAM,CAAC,KAAK,EAAE,IAAY,EAAE,IAAwB,EAAE,GAAY,EAAE,EAAE;QACrE,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YACnD,SAAG,CAAC,IAAI,CAAC,8GAA8G,CAAC,CAAC;QAC3H,CAAC;QACD,IAAI,CAAC,IAAI,6BAAa,CAAC,IAAI,CAAC,EAAE,MAAM,cAAc,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC,CAAC,CACL,CAAC;AACJ,CAAC"}
|
package/dist/output/envelope.js
CHANGED
|
@@ -76,6 +76,16 @@ class ResultLeakError extends Error {
|
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
78
|
exports.ResultLeakError = ResultLeakError;
|
|
79
|
+
function pathIsAllowed(pathStr, allowTokenShapedPaths) {
|
|
80
|
+
const normalized = pathStr.replace(/\[\d+\]/g, '[*]');
|
|
81
|
+
return allowTokenShapedPaths.some((allowed) => {
|
|
82
|
+
if (allowed.endsWith('.**')) {
|
|
83
|
+
const root = allowed.slice(0, -3);
|
|
84
|
+
return normalized === root || normalized.startsWith(`${root}.`) || normalized.startsWith(`${root}[`);
|
|
85
|
+
}
|
|
86
|
+
return normalized === allowed;
|
|
87
|
+
});
|
|
88
|
+
}
|
|
79
89
|
/**
|
|
80
90
|
* Defense-in-depth self-check (PRD "开工前项"): a `result` payload is written to
|
|
81
91
|
* stdout WITHOUT going through log.ts's redact(), so before emitting it we assert
|
|
@@ -83,21 +93,26 @@ exports.ResultLeakError = ResultLeakError;
|
|
|
83
93
|
* leaking a token onto stdout — the primary control is still "commands never put
|
|
84
94
|
* a raw token into result".
|
|
85
95
|
*/
|
|
86
|
-
function assertNoTokenShapedValue(value, pathStr = '$', depth = 0) {
|
|
87
|
-
if (value == null
|
|
96
|
+
function assertNoTokenShapedValue(value, pathStr = '$', depth = 0, opts = {}) {
|
|
97
|
+
if (value == null)
|
|
88
98
|
return;
|
|
99
|
+
// The traversal budget is only a denial-of-service guard. Exceeding it must
|
|
100
|
+
// fail closed; silently skipping a deep subtree could expose a credential.
|
|
101
|
+
if (depth > 64)
|
|
102
|
+
throw new ResultLeakError(pathStr);
|
|
89
103
|
if (typeof value === 'string') {
|
|
90
|
-
if (TOKEN_VALUE_PATTERN.test(value))
|
|
104
|
+
if (TOKEN_VALUE_PATTERN.test(value) && !pathIsAllowed(pathStr, opts.allowTokenShapedPaths ?? [])) {
|
|
91
105
|
throw new ResultLeakError(pathStr);
|
|
106
|
+
}
|
|
92
107
|
return;
|
|
93
108
|
}
|
|
94
109
|
if (Array.isArray(value)) {
|
|
95
|
-
value.forEach((v, i) => assertNoTokenShapedValue(v, `${pathStr}[${i}]`, depth + 1));
|
|
110
|
+
value.forEach((v, i) => assertNoTokenShapedValue(v, `${pathStr}[${i}]`, depth + 1, opts));
|
|
96
111
|
return;
|
|
97
112
|
}
|
|
98
113
|
if (typeof value === 'object') {
|
|
99
114
|
for (const [k, v] of Object.entries(value)) {
|
|
100
|
-
assertNoTokenShapedValue(v, `${pathStr}.${k}`, depth + 1);
|
|
115
|
+
assertNoTokenShapedValue(v, `${pathStr}.${k}`, depth + 1, opts);
|
|
101
116
|
}
|
|
102
117
|
}
|
|
103
118
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envelope.js","sourceRoot":"","sources":["../../src/output/envelope.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6BA,8CAEC;AAgBD,8CAEC;
|
|
1
|
+
{"version":3,"file":"envelope.js","sourceRoot":"","sources":["../../src/output/envelope.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,10 +31,10 @@ class ResultPrinter {
|
|
|
31
31
|
!Array.isArray(result) &&
|
|
32
32
|
result.request_id === this.requestId) {
|
|
33
33
|
const { request_id: _requestId, ...withoutRequestId } = result;
|
|
34
|
-
(0, envelope_1.assertNoTokenShapedValue)(withoutRequestId);
|
|
34
|
+
(0, envelope_1.assertNoTokenShapedValue)(withoutRequestId, '$', 0, opts);
|
|
35
35
|
}
|
|
36
36
|
else {
|
|
37
|
-
(0, envelope_1.assertNoTokenShapedValue)(result);
|
|
37
|
+
(0, envelope_1.assertNoTokenShapedValue)(result, '$', 0, opts);
|
|
38
38
|
}
|
|
39
39
|
if (this.mode === 'json') {
|
|
40
40
|
const envelope = {
|
|
@@ -78,7 +78,11 @@ class ResultPrinter {
|
|
|
78
78
|
/** Render a CommandOutcome uniformly. */
|
|
79
79
|
emit(outcome) {
|
|
80
80
|
if (outcome.ok) {
|
|
81
|
-
this.success(outcome.result, {
|
|
81
|
+
this.success(outcome.result, {
|
|
82
|
+
soft: outcome.soft,
|
|
83
|
+
humanMessage: outcome.humanMessage,
|
|
84
|
+
allowTokenShapedPaths: outcome.allowTokenShapedPaths,
|
|
85
|
+
});
|
|
82
86
|
}
|
|
83
87
|
else {
|
|
84
88
|
this.failure(outcome.kind, outcome.message, { publicCode: outcome.publicCode });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resultPrinter.js","sourceRoot":"","sources":["../../src/output/resultPrinter.ts"],"names":[],"mappings":";;;AAAA,kEAAkE;AAClE,+EAA+E;AAC/E,2EAA2E;AAC3E,yEAAyE;AACzE,4DAA4D;AAC5D,gFAAgF;AAChF,
|
|
1
|
+
{"version":3,"file":"resultPrinter.js","sourceRoot":"","sources":["../../src/output/resultPrinter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@supersdk/supercli",
|
|
3
|
-
"version": "0.3.0-staging.
|
|
3
|
+
"version": "0.3.0-staging.31",
|
|
4
4
|
"description": "SuperSDK official command-line tool: browser-authorized login and multi-account context for supercli commands.",
|
|
5
5
|
"license": "UNLICENSED",
|
|
6
6
|
"bin": {
|