@supersdk/supercli 0.2.1-staging.20 → 0.3.0-staging.22
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/consoleClient.js +17 -12
- package/dist/api/consoleClient.js.map +1 -1
- package/dist/auth/browserAuth.js +42 -44
- package/dist/auth/browserAuth.js.map +1 -1
- package/dist/auth/tokenAuth.js +46 -0
- package/dist/auth/tokenAuth.js.map +1 -0
- package/dist/cli.js +70 -8
- package/dist/cli.js.map +1 -1
- package/dist/commands/accounts.js +89 -31
- package/dist/commands/accounts.js.map +1 -1
- package/dist/commands/add.js +519 -0
- package/dist/commands/add.js.map +1 -0
- package/dist/commands/init.js +234 -0
- package/dist/commands/init.js.map +1 -0
- package/dist/commands/login.js +75 -48
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/logout.js +20 -25
- package/dist/commands/logout.js.map +1 -1
- package/dist/commands/publishSite.js +491 -149
- package/dist/commands/publishSite.js.map +1 -1
- package/dist/commands/switchaccount.js +36 -24
- package/dist/commands/switchaccount.js.map +1 -1
- package/dist/config/appConfig.js +160 -45
- package/dist/config/appConfig.js.map +1 -1
- package/dist/config/environments.js +17 -1
- package/dist/config/environments.js.map +1 -1
- package/dist/exit/exitCodes.js +55 -0
- package/dist/exit/exitCodes.js.map +1 -0
- package/dist/output/envelope.js +104 -0
- package/dist/output/envelope.js.map +1 -0
- package/dist/output/resultPrinter.js +70 -0
- package/dist/output/resultPrinter.js.map +1 -0
- package/dist/publish/siteClient.js +14 -4
- package/dist/publish/siteClient.js.map +1 -1
- package/dist/publish/siteConfig.js +278 -63
- package/dist/publish/siteConfig.js.map +1 -1
- package/dist/store/accountStore.js +2 -2
- package/dist/store/accountStore.js.map +1 -1
- package/dist/store/backends/encryptedFile.js +4 -1
- package/dist/store/backends/encryptedFile.js.map +1 -1
- package/dist/store/backends/osKeyring.js +4 -8
- package/dist/store/backends/osKeyring.js.map +1 -1
- package/dist/store/credentialStore.js +22 -0
- package/dist/store/credentialStore.js.map +1 -1
- package/dist/template/README.md +144 -85
- package/dist/template/android/app/build.gradle.kts +0 -3
- package/dist/template/android/app/src/main/java/com/supersdk/simple/EnvironmentStore.java +41 -0
- package/dist/template/android/app/src/main/java/com/supersdk/simple/MainActivity.java +57 -4
- package/dist/template/android/app/src/main/java/com/supersdk/simple/SimpleApplication.java +3 -1
- package/dist/template/android/gradle/supersdk-config-reader.gradle +5 -3
- package/dist/template/android/supersdk-default.config.json +4 -3
- package/dist/template/ios/Sources/App/EnvironmentStore.swift +35 -0
- package/dist/template/ios/Sources/App/SimpleSDKBootstrap.swift +2 -1
- package/dist/template/ios/Sources/App/SimpleSDKProbe.swift +15 -0
- package/dist/template/ios/Sources/App/SimpleViewController.swift +52 -8
- package/dist/template/ios/Tests/SimpleAppTests/SimpleSDKInitializationTests.swift +12 -1
- package/dist/template/scripts/android_snapshot_canary.py +17 -8
- package/dist/template/scripts/build_android.sh +36 -9
- package/dist/template/scripts/build_ios.sh +63 -24
- package/dist/template/scripts/build_site.sh +43 -0
- package/dist/template/scripts/lib/workspace.sh +43 -0
- package/dist/template/scripts/serve_web.py +26 -9
- package/dist/template/scripts/super_build_orchestrator.py +49 -28
- package/dist/template/scripts/supersdk_template.py +759 -240
- package/dist/template/scripts/web_package.py +44 -20
- package/dist/template/super_build.sh +40 -12
- package/dist/template/supersdk.json +25 -13
- package/dist/template/template_manifest.json +25 -0
- package/dist/template/web/src/css/style.css +28 -0
- package/dist/template/web/src/index.html +8 -0
- package/dist/template/web/src/js/app.js +92 -19
- package/dist/util/log.js +10 -1
- package/dist/util/log.js.map +1 -1
- package/dist/util/prompt.js +25 -0
- package/dist/util/prompt.js.map +1 -1
- package/dist/workspace/config.js +440 -0
- package/dist/workspace/config.js.map +1 -0
- package/dist/workspace/identity.js +106 -0
- package/dist/workspace/identity.js.map +1 -0
- package/dist/workspace/interactive.js +96 -0
- package/dist/workspace/interactive.js.map +1 -0
- package/dist/workspace/template.js +357 -0
- package/dist/workspace/template.js.map +1 -0
- package/package.json +1 -1
- package/dist/auth/refresh.js +0 -32
- package/dist/auth/refresh.js.map +0 -1
- package/dist/commands/createApp.js +0 -448
- package/dist/commands/createApp.js.map +0 -1
- package/dist/createApp/copyTemplate.js +0 -561
- package/dist/createApp/copyTemplate.js.map +0 -1
- package/dist/template/scripts/build_web.sh +0 -12
|
@@ -53,6 +53,10 @@ async function performRequest(apiOrigin, method, path, opts = {}) {
|
|
|
53
53
|
if (res.status === 401) {
|
|
54
54
|
return { kind: 'auth_invalid' };
|
|
55
55
|
}
|
|
56
|
+
if (res.status === 403) {
|
|
57
|
+
// Permanent (non-retryable) permission failure — must NOT collapse into infra_error.
|
|
58
|
+
return { kind: 'forbidden', message: 'forbidden: you lack this permission or are no longer in this organization' };
|
|
59
|
+
}
|
|
56
60
|
if (res.status === 429) {
|
|
57
61
|
return { kind: 'rate_limited', message: 'too many requests, try again later' };
|
|
58
62
|
}
|
|
@@ -94,27 +98,28 @@ class ConsoleClient {
|
|
|
94
98
|
createAuthorizeRequest(input) {
|
|
95
99
|
return performRequest(this.apiOrigin, 'POST', '/api/console/auth/cli/authorize/request', { body: input, fetchImpl: this.fetchImpl });
|
|
96
100
|
}
|
|
101
|
+
/** Exchange the one-time code for a single long-lived user token. */
|
|
97
102
|
exchangeCode(input) {
|
|
98
103
|
return performRequest(this.apiOrigin, 'POST', '/api/console/auth/cli/token', {
|
|
99
104
|
body: input,
|
|
100
105
|
fetchImpl: this.fetchImpl,
|
|
101
106
|
});
|
|
102
107
|
}
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
108
|
+
/** Confirm identity + resolve the token's bound org (replaces /me). */
|
|
109
|
+
whoami(token) {
|
|
110
|
+
return performRequest(this.apiOrigin, 'GET', '/api/open/whoami', {
|
|
111
|
+
bearer: token,
|
|
106
112
|
fetchImpl: this.fetchImpl,
|
|
107
113
|
});
|
|
108
114
|
}
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
bearer: accessToken,
|
|
115
|
+
/**
|
|
116
|
+
* Self-revoke the presented token (D-5). Bearer = the very token being
|
|
117
|
+
* revoked; the server revokes only that row (kind=1). This is a member's only
|
|
118
|
+
* way to delete their own token (the Console list is admin-only).
|
|
119
|
+
*/
|
|
120
|
+
revokeSelfToken(token) {
|
|
121
|
+
return performRequest(this.apiOrigin, 'DELETE', '/api/console/auth/cli/token/self', {
|
|
122
|
+
bearer: token,
|
|
118
123
|
fetchImpl: this.fetchImpl,
|
|
119
124
|
});
|
|
120
125
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consoleClient.js","sourceRoot":"","sources":["../../src/api/consoleClient.ts"],"names":[],"mappings":";AAAA,yEAAyE;AACzE,wEAAwE;AACxE,uCAAuC;AACvC,EAAE;AACF,0CAA0C;AAC1C,gDAAgD;AAChD,oFAAoF;AACpF,iFAAiF;AACjF,sEAAsE;AACtE,mFAAmF;AACnF,gFAAgF;AAChF,sDAAsD;AACtD,wEAAwE;AACxE,kFAAkF;;;
|
|
1
|
+
{"version":3,"file":"consoleClient.js","sourceRoot":"","sources":["../../src/api/consoleClient.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/browserAuth.js
CHANGED
|
@@ -2,11 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.defaultOpenBrowser = void 0;
|
|
4
4
|
exports.login = login;
|
|
5
|
-
// Browser-authorized login (AC-
|
|
6
|
-
//
|
|
7
|
-
//
|
|
8
|
-
//
|
|
9
|
-
//
|
|
5
|
+
// Browser-authorized login (AC-4): create an authorize request, open it in a
|
|
6
|
+
// browser (or print the URL if that fails), accept the pasted one-time code,
|
|
7
|
+
// exchange it for a SINGLE user token, confirm identity + resolve the bound org
|
|
8
|
+
// via /api/open/whoami, and only THEN persist. The org is chosen by the user in
|
|
9
|
+
// the browser (CW authorize page) and baked into the token server-side; the CLI
|
|
10
|
+
// just verifies what it got. Every failure path after the exchange best-effort
|
|
11
|
+
// self-revokes the freshly issued token and leaves local state exactly as it was.
|
|
10
12
|
const node_child_process_1 = require("node:child_process");
|
|
11
13
|
const accountStore_1 = require("../store/accountStore");
|
|
12
14
|
const log_1 = require("../util/log");
|
|
@@ -23,9 +25,10 @@ function describeFailure(action, outcome) {
|
|
|
23
25
|
return `${action} failed`;
|
|
24
26
|
}
|
|
25
27
|
}
|
|
26
|
-
|
|
28
|
+
/** Best-effort self-revoke of a just-issued token; never throws to the caller. */
|
|
29
|
+
async function bestEffortRevoke(client, token) {
|
|
27
30
|
try {
|
|
28
|
-
const outcome = await client.
|
|
31
|
+
const outcome = await client.revokeSelfToken(token);
|
|
29
32
|
if (outcome.kind !== 'success') {
|
|
30
33
|
log_1.log.warn('best-effort revoke did not confirm success (continuing anyway)', { outcomeKind: outcome.kind });
|
|
31
34
|
}
|
|
@@ -45,9 +48,8 @@ async function login(deps) {
|
|
|
45
48
|
}
|
|
46
49
|
const { request_id } = createOutcome.data;
|
|
47
50
|
const authorizeUrl = `${env.webOrigin}/cli/authorize?request=${encodeURIComponent(request_id)}`;
|
|
48
|
-
// URL **无条件**打印:"浏览器是否真的弹出来了"
|
|
49
|
-
//
|
|
50
|
-
// 手上没有任何可打开的地址。多打一行 URL 的代价远小于此。
|
|
51
|
+
// URL **无条件**打印:"浏览器是否真的弹出来了"没有可靠的跨平台信号,一旦误判成功而
|
|
52
|
+
// 不打印,用户就卡在粘码提示前、手上没有任何可打开的地址。多打一行 URL 的代价远小于此。
|
|
51
53
|
const opened = await deps.openBrowser(authorizeUrl);
|
|
52
54
|
log_1.log.info(opened
|
|
53
55
|
? `opened your browser to authorize; if nothing appeared, open this URL manually: ${authorizeUrl}`
|
|
@@ -60,25 +62,28 @@ async function login(deps) {
|
|
|
60
62
|
if (exchangeOutcome.kind !== 'success') {
|
|
61
63
|
return { ok: false, message: describeFailure('exchange authorization code', exchangeOutcome) };
|
|
62
64
|
}
|
|
63
|
-
const
|
|
64
|
-
const
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
65
|
+
const issued = exchangeOutcome.data;
|
|
66
|
+
const token = issued.token;
|
|
67
|
+
// Identity is confirmed via /api/open/whoami (not the session-only /me), so
|
|
68
|
+
// the token verifies itself and reports its bound org. Any non-SUCCESS revokes
|
|
69
|
+
// the freshly issued token and persists nothing.
|
|
70
|
+
const whoamiOutcome = await client.whoami(token);
|
|
71
|
+
if (whoamiOutcome.kind !== 'success') {
|
|
72
|
+
await bestEffortRevoke(client, token);
|
|
73
|
+
return { ok: false, message: `signed-in identity check failed: ${describeFailure('whoami', whoamiOutcome)}` };
|
|
71
74
|
}
|
|
72
|
-
const
|
|
73
|
-
const
|
|
75
|
+
const who = whoamiOutcome.data;
|
|
76
|
+
const userId = typeof who.user_id === 'number' ? who.user_id : undefined;
|
|
77
|
+
if (userId === undefined) {
|
|
78
|
+
await bestEffortRevoke(client, token);
|
|
79
|
+
return { ok: false, message: 'whoami did not return a user id; cannot establish a stable account identity' };
|
|
80
|
+
}
|
|
81
|
+
const orgId = String(who.org_id ?? issued.org_id ?? '');
|
|
82
|
+
const accountKey = (0, accountStore_1.deriveAccountKey)(env.label, env.apiOrigin, userId);
|
|
74
83
|
const existing = (0, accountStore_1.getAccount)(accountKey);
|
|
75
84
|
// Captured BEFORE any mutation so a failed commit can restore it exactly (TC-12).
|
|
76
|
-
//
|
|
77
|
-
//
|
|
78
|
-
// 承诺的「exchange 之后所有失败路径都 best-effort revoke」,把刚签发的 access+refresh
|
|
79
|
-
// 永久遗弃在服务端(每重试一次 login 就再泄漏一对)。真实触发面:encrypted-file 口令
|
|
80
|
-
// 输错(WrongPassphraseError)、keyring 里那条记录 JSON 损坏(deserialize 抛)。
|
|
81
|
-
// 读不出旧值不是致命错误 —— 回滚时按「没有旧值」处理(delete)即可,那条记录本就不可用。
|
|
85
|
+
// backend.get must be wrapped: the token is already minted, so any escape here
|
|
86
|
+
// would skip the "revoke on every post-exchange failure" promise.
|
|
82
87
|
let oldSecret = null;
|
|
83
88
|
if (existing) {
|
|
84
89
|
try {
|
|
@@ -91,20 +96,15 @@ async function login(deps) {
|
|
|
91
96
|
});
|
|
92
97
|
}
|
|
93
98
|
}
|
|
94
|
-
const newSecret = {
|
|
95
|
-
accessToken: bundle.access_token,
|
|
96
|
-
accessExpiresAt: bundle.access_expires_at,
|
|
97
|
-
refreshToken: bundle.refresh_token,
|
|
98
|
-
refreshExpiresAt: bundle.refresh_expires_at,
|
|
99
|
-
};
|
|
99
|
+
const newSecret = { token };
|
|
100
100
|
const record = {
|
|
101
101
|
accountKey,
|
|
102
102
|
envLabel: env.label,
|
|
103
103
|
apiOrigin: env.apiOrigin,
|
|
104
104
|
webOrigin: env.webOrigin,
|
|
105
|
-
userId
|
|
106
|
-
|
|
107
|
-
|
|
105
|
+
userId,
|
|
106
|
+
orgId: orgId || undefined,
|
|
107
|
+
orgName: who.org_name,
|
|
108
108
|
status: 'active',
|
|
109
109
|
backend: backend.kind,
|
|
110
110
|
createdAt: existing?.createdAt ?? Date.now(),
|
|
@@ -137,15 +137,15 @@ async function login(deps) {
|
|
|
137
137
|
});
|
|
138
138
|
}
|
|
139
139
|
}
|
|
140
|
-
await bestEffortRevoke(client,
|
|
140
|
+
await bestEffortRevoke(client, token);
|
|
141
141
|
return { ok: false, message: `failed to save account locally: ${err.message}` };
|
|
142
142
|
}
|
|
143
|
-
// Duplicate login success (AC-4/TC-11): only revoke the OLD
|
|
144
|
-
//
|
|
143
|
+
// Duplicate login success (AC-4/TC-11): only revoke the OLD token after the
|
|
144
|
+
// NEW one is durably committed, never before.
|
|
145
145
|
if (existing && oldSecret) {
|
|
146
|
-
await bestEffortRevoke(client,
|
|
146
|
+
await bestEffortRevoke(client, oldSecret.token);
|
|
147
147
|
}
|
|
148
|
-
log_1.log.info('login successful', { accountKey,
|
|
148
|
+
log_1.log.info('login successful', { accountKey, org: record.orgName ?? record.orgId });
|
|
149
149
|
return { ok: true, account: record };
|
|
150
150
|
}
|
|
151
151
|
/** Best-effort "open the default browser"; no reliable cross-platform signal that a window actually appeared. */
|
|
@@ -174,10 +174,8 @@ const defaultOpenBrowser = async (url) => {
|
|
|
174
174
|
resolve(false);
|
|
175
175
|
return;
|
|
176
176
|
}
|
|
177
|
-
// 🔴 必须等 'spawn'/'error'
|
|
178
|
-
//
|
|
179
|
-
// ENOENT 以**异步** error 事件到达,一定晚于 setImmediate —— 于是永远判成
|
|
180
|
-
// 「浏览器已打开」,授权 URL 那行不打印,用户卡在粘码提示前无 URL 可开。
|
|
177
|
+
// 🔴 必须等 'spawn'/'error' 二选一:命令不存在(headless Linux 没有 xdg-open)时
|
|
178
|
+
// spawn 不会同步抛,ENOENT 以**异步** error 事件到达 —— setImmediate 会误判成功。
|
|
181
179
|
let settled = false;
|
|
182
180
|
const settle = (opened) => {
|
|
183
181
|
if (settled)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browserAuth.js","sourceRoot":"","sources":["../../src/auth/browserAuth.ts"],"names":[],"mappings":";;;AA0DA,
|
|
1
|
+
{"version":3,"file":"browserAuth.js","sourceRoot":"","sources":["../../src/auth/browserAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Token identity (AC-5). The CLI's single credential is one user token, minted
|
|
3
|
+
// by `supercli login` (persisted) OR supplied out-of-band by the environment.
|
|
4
|
+
//
|
|
5
|
+
// token-wins: if `SUPERCLI_TOKEN` is set, it is used DIRECTLY — the local
|
|
6
|
+
// credential store / OS keyring is never consulted. This is the ONLY
|
|
7
|
+
// environment-variable channel for a token; there is deliberately no
|
|
8
|
+
// `--token` flag (a secret must never ride on argv — enforced by
|
|
9
|
+
// test/unit/util/log.test.ts TC-27), so a clean machine with no keyring can
|
|
10
|
+
// run non-interactively on `SUPERCLI_TOKEN` alone (AC-5 headline).
|
|
11
|
+
//
|
|
12
|
+
// Auth is attached as `Authorization: Bearer <token>` (+ `X-Org-Id`, added by
|
|
13
|
+
// the request clients); a `cli_`-prefixed token routes to the user-identity
|
|
14
|
+
// (AuthedUser) arm server-side.
|
|
15
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
+
exports.SUPERCLI_TOKEN_ENV = void 0;
|
|
17
|
+
exports.resolveEnvToken = resolveEnvToken;
|
|
18
|
+
exports.resolveToken = resolveToken;
|
|
19
|
+
exports.maskToken = maskToken;
|
|
20
|
+
exports.SUPERCLI_TOKEN_ENV = 'SUPERCLI_TOKEN';
|
|
21
|
+
/** The `SUPERCLI_TOKEN` value if present and non-empty, else null. */
|
|
22
|
+
function resolveEnvToken() {
|
|
23
|
+
const raw = process.env[exports.SUPERCLI_TOKEN_ENV];
|
|
24
|
+
const trimmed = raw?.trim();
|
|
25
|
+
return trimmed && trimmed.length > 0 ? trimmed : null;
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Resolves the effective token, env-first (token-wins). `readStoredToken` is a
|
|
29
|
+
* thunk so it is only invoked — and the keyring only touched — when there is no
|
|
30
|
+
* env token (TC-018: token mode makes zero keyring calls).
|
|
31
|
+
*/
|
|
32
|
+
function resolveToken(readStoredToken) {
|
|
33
|
+
const envToken = resolveEnvToken();
|
|
34
|
+
if (envToken)
|
|
35
|
+
return { token: envToken, source: 'env' };
|
|
36
|
+
const stored = readStoredToken();
|
|
37
|
+
return stored ? { token: stored, source: 'stored' } : null;
|
|
38
|
+
}
|
|
39
|
+
/** `cli_…a1b2` — enough to recognize which token, never the whole secret. */
|
|
40
|
+
function maskToken(token) {
|
|
41
|
+
const underscore = token.indexOf('_');
|
|
42
|
+
const prefix = underscore > 0 ? token.slice(0, underscore + 1) : '';
|
|
43
|
+
const tail = token.slice(-4);
|
|
44
|
+
return `${prefix}…${tail}`;
|
|
45
|
+
}
|
|
46
|
+
//# sourceMappingURL=tokenAuth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tokenAuth.js","sourceRoot":"","sources":["../../src/auth/tokenAuth.ts"],"names":[],"mappings":";AAAA,+EAA+E;AAC/E,8EAA8E;AAC9E,EAAE;AACF,4EAA4E;AAC5E,uEAAuE;AACvE,uEAAuE;AACvE,mEAAmE;AACnE,8EAA8E;AAC9E,qEAAqE;AACrE,EAAE;AACF,8EAA8E;AAC9E,4EAA4E;AAC5E,gCAAgC;;;AAYhC,0CAIC;AAOD,oCAKC;AAGD,8BAKC;AAlCY,QAAA,kBAAkB,GAAG,gBAAgB,CAAC;AASnD,sEAAsE;AACtE,SAAgB,eAAe;IAC7B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,0BAAkB,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,GAAG,EAAE,IAAI,EAAE,CAAC;IAC5B,OAAO,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AACxD,CAAC;AAED;;;;GAIG;AACH,SAAgB,YAAY,CAAC,eAAoC;IAC/D,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;IACnC,IAAI,QAAQ;QAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACxD,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7D,CAAC;AAED,6EAA6E;AAC7E,SAAgB,SAAS,CAAC,KAAa;IACrC,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACpE,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7B,OAAO,GAAG,MAAM,IAAI,IAAI,EAAE,CAAC;AAC7B,CAAC"}
|
package/dist/cli.js
CHANGED
|
@@ -4,17 +4,42 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
4
4
|
exports.buildProgram = buildProgram;
|
|
5
5
|
const commander_1 = require("commander");
|
|
6
6
|
const accounts_1 = require("./commands/accounts");
|
|
7
|
-
const
|
|
7
|
+
const add_1 = require("./commands/add");
|
|
8
|
+
const init_1 = require("./commands/init");
|
|
8
9
|
const login_1 = require("./commands/login");
|
|
9
10
|
const logout_1 = require("./commands/logout");
|
|
10
11
|
const publishSite_1 = require("./commands/publishSite");
|
|
11
12
|
const switchaccount_1 = require("./commands/switchaccount");
|
|
12
13
|
const update_1 = require("./commands/update");
|
|
14
|
+
const resultPrinter_1 = require("./output/resultPrinter");
|
|
15
|
+
const log_1 = require("./util/log");
|
|
16
|
+
const prompt_1 = require("./util/prompt");
|
|
13
17
|
// package.json is always shipped alongside dist/ in an npm package (npm
|
|
14
18
|
// always includes it regardless of the "files" allowlist), so this resolves
|
|
15
19
|
// correctly both in local dev and in an installed/packed tarball.
|
|
16
20
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
17
21
|
const pkg = require('../package.json');
|
|
22
|
+
/**
|
|
23
|
+
* The Agent Contract global options must be recognized BOTH before and after a
|
|
24
|
+
* subcommand name (TC-036). With enablePositionalOptions(), a program-level
|
|
25
|
+
* option only binds before the subcommand — so each subcommand ALSO declares
|
|
26
|
+
* `--output`/`--no-input`. Their VALUES, however, are detected straight from
|
|
27
|
+
* argv here, before parsing, so log routing + non-interactive gating are in
|
|
28
|
+
* effect even for a commander parse error that never reaches an action.
|
|
29
|
+
*/
|
|
30
|
+
function detectOutputMode(argv) {
|
|
31
|
+
for (let i = 2; i < argv.length; i++) {
|
|
32
|
+
const a = argv[i];
|
|
33
|
+
if (a === '--output')
|
|
34
|
+
return argv[i + 1] === 'json' ? 'json' : 'human';
|
|
35
|
+
if (a.startsWith('--output='))
|
|
36
|
+
return a.slice('--output='.length) === 'json' ? 'json' : 'human';
|
|
37
|
+
}
|
|
38
|
+
return 'human';
|
|
39
|
+
}
|
|
40
|
+
function detectNoInput(argv) {
|
|
41
|
+
return argv.includes('--no-input');
|
|
42
|
+
}
|
|
18
43
|
function buildProgram() {
|
|
19
44
|
const program = new commander_1.Command();
|
|
20
45
|
program
|
|
@@ -27,17 +52,20 @@ function buildProgram() {
|
|
|
27
52
|
// enablePositionalOptions 把 program 级选项限制在子命令名之前,子命令名之后
|
|
28
53
|
// 的选项一律归子命令,两个 --version 从此互不干扰。
|
|
29
54
|
.enablePositionalOptions()
|
|
30
|
-
.version(pkg.version, '--version', 'output the version number')
|
|
55
|
+
.version(pkg.version, '--version', 'output the version number')
|
|
56
|
+
.option('--output <mode>', 'output mode: "json" emits a single machine-readable envelope on stdout')
|
|
57
|
+
.option('--no-input', 'never prompt for interactive input; fail fast (implied by --output json)');
|
|
31
58
|
(0, login_1.registerLoginCommand)(program);
|
|
32
59
|
(0, accounts_1.registerAccountsCommand)(program);
|
|
33
60
|
(0, switchaccount_1.registerSwitchAccountCommand)(program);
|
|
34
61
|
(0, logout_1.registerLogoutCommand)(program);
|
|
35
62
|
(0, update_1.registerUpdateCommand)(program);
|
|
36
|
-
(0,
|
|
63
|
+
(0, init_1.registerInitCommand)(program);
|
|
64
|
+
(0, add_1.registerAddCommand)(program);
|
|
37
65
|
(0, publishSite_1.registerPublishSiteCommand)(program);
|
|
38
66
|
// `supercli help <未知命令>` 默认只闷头打印总 help,用户不知道自己敲错了命令名 ——
|
|
39
67
|
// 而 `supercli <未知命令>` 是有 `error: unknown command` 的,同一个 CLI 两种态度。
|
|
40
|
-
// 显式接管 help
|
|
68
|
+
// 显式接管 help 子命令,未知主题按未知命令同样处理。(origin/staging)
|
|
41
69
|
program
|
|
42
70
|
.command('help [command]')
|
|
43
71
|
.description('display help for a command')
|
|
@@ -53,14 +81,48 @@ function buildProgram() {
|
|
|
53
81
|
}
|
|
54
82
|
target.outputHelp();
|
|
55
83
|
});
|
|
84
|
+
// SCLI-F260809023355: repeat the global options on every subcommand (incl. the help
|
|
85
|
+
// command just added) so `--output json` is accepted AFTER the subcommand name too
|
|
86
|
+
// (enablePositionalOptions confines program-level options to before the subcommand).
|
|
87
|
+
// Read via optsWithGlobals() in commands.
|
|
88
|
+
for (const cmd of program.commands) {
|
|
89
|
+
cmd.option('--output <mode>', 'output mode: "json" emits a single machine-readable envelope on stdout');
|
|
90
|
+
cmd.option('--no-input', 'never prompt for interactive input; fail fast (implied by --output json)');
|
|
91
|
+
}
|
|
56
92
|
return program;
|
|
57
93
|
}
|
|
58
94
|
async function run() {
|
|
95
|
+
const argv = process.argv;
|
|
96
|
+
const mode = detectOutputMode(argv);
|
|
97
|
+
const noInput = detectNoInput(argv);
|
|
98
|
+
(0, log_1.setLogJsonMode)(mode === 'json');
|
|
99
|
+
// json mode implies non-interactive (AC-2); --no-input is the explicit form.
|
|
100
|
+
(0, prompt_1.setNonInteractive)(mode === 'json' || noInput);
|
|
59
101
|
const program = buildProgram();
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
102
|
+
if (mode === 'json') {
|
|
103
|
+
// In json mode a commander parse error (unknown command / missing required
|
|
104
|
+
// option / bad flag) must not print its own free-form text to stdout and
|
|
105
|
+
// exit with commander's ad-hoc code — collect it into the standard envelope
|
|
106
|
+
// and exit 6 instead (AC-1/AC-3). --help/--version still terminate 0.
|
|
107
|
+
program.exitOverride();
|
|
108
|
+
for (const cmd of program.commands)
|
|
109
|
+
cmd.exitOverride();
|
|
110
|
+
}
|
|
111
|
+
try {
|
|
112
|
+
await program.parseAsync(argv);
|
|
113
|
+
}
|
|
114
|
+
catch (err) {
|
|
115
|
+
if (err instanceof commander_1.CommanderError) {
|
|
116
|
+
if (err.code === 'commander.helpDisplayed' || err.code === 'commander.version' || err.exitCode === 0) {
|
|
117
|
+
return;
|
|
118
|
+
}
|
|
119
|
+
new resultPrinter_1.ResultPrinter(mode).failure('usage_error', err.message || 'usage error');
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
// An action threw an unexpected error rather than returning a structured
|
|
123
|
+
// result — treat as an infra/unexpected failure envelope (exit 5).
|
|
124
|
+
new resultPrinter_1.ResultPrinter(mode).failure('infra_error', err.message ?? String(err));
|
|
125
|
+
}
|
|
64
126
|
}
|
|
65
127
|
if (require.main === module) {
|
|
66
128
|
run().catch((err) => {
|
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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"}
|
|
@@ -1,46 +1,104 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.runAccounts = runAccounts;
|
|
3
4
|
exports.registerAccountsCommand = registerAccountsCommand;
|
|
4
5
|
const accountStore_1 = require("../store/accountStore");
|
|
5
6
|
const credentialStore_1 = require("../store/credentialStore");
|
|
7
|
+
const tokenAuth_1 = require("../auth/tokenAuth");
|
|
8
|
+
const resultPrinter_1 = require("../output/resultPrinter");
|
|
6
9
|
const log_1 = require("../util/log");
|
|
10
|
+
/**
|
|
11
|
+
* Default credential probe. Never prompts (encrypted-file accounts report ok
|
|
12
|
+
* without decrypting — a plain listing must not demand a passphrase). Only the
|
|
13
|
+
* os-keyring path actually reads, so a masked token can be shown for it.
|
|
14
|
+
*/
|
|
15
|
+
function defaultReadCredential(account) {
|
|
16
|
+
if (account.backend === 'encrypted-file')
|
|
17
|
+
return { status: 'ok' };
|
|
18
|
+
const backend = (0, credentialStore_1.backendForAccount)('os-keyring');
|
|
19
|
+
if (!backend.isAvailable())
|
|
20
|
+
return { status: 'missing', error: 'OS credential service unavailable' };
|
|
21
|
+
const secret = backend.get(account.accountKey);
|
|
22
|
+
if (!secret)
|
|
23
|
+
return { status: 'missing', error: 'credential missing — re-login' };
|
|
24
|
+
return { status: 'ok', masked: (0, tokenAuth_1.maskToken)(secret.token) };
|
|
25
|
+
}
|
|
26
|
+
const defaultDeps = {
|
|
27
|
+
listAccounts: accountStore_1.listAccounts,
|
|
28
|
+
getCurrentAccount: accountStore_1.getCurrentAccount,
|
|
29
|
+
readCredential: defaultReadCredential,
|
|
30
|
+
};
|
|
31
|
+
/**
|
|
32
|
+
* Core listing logic (AC-3/AC-5). needs-login / corrupt entries are DATA (the
|
|
33
|
+
* command still succeeds, exit 0 — TC-009). The command only FAILS (non-zero)
|
|
34
|
+
* when it cannot enumerate at all, e.g. the account store itself throws (TC-010).
|
|
35
|
+
*/
|
|
36
|
+
function runAccounts(deps = defaultDeps) {
|
|
37
|
+
let accounts;
|
|
38
|
+
let current;
|
|
39
|
+
try {
|
|
40
|
+
accounts = deps.listAccounts();
|
|
41
|
+
current = deps.getCurrentAccount();
|
|
42
|
+
}
|
|
43
|
+
catch (err) {
|
|
44
|
+
return { ok: false, kind: 'infra_error', message: `无法读取账号列表:${err.message}` };
|
|
45
|
+
}
|
|
46
|
+
const views = accounts.map((account) => {
|
|
47
|
+
let probe;
|
|
48
|
+
try {
|
|
49
|
+
probe = deps.readCredential(account);
|
|
50
|
+
}
|
|
51
|
+
catch (err) {
|
|
52
|
+
probe = { status: 'corrupt', error: err.message };
|
|
53
|
+
}
|
|
54
|
+
return {
|
|
55
|
+
accountKey: account.accountKey,
|
|
56
|
+
env: account.envLabel,
|
|
57
|
+
org: account.orgId,
|
|
58
|
+
orgName: account.orgName,
|
|
59
|
+
status: account.status,
|
|
60
|
+
credential: probe.status,
|
|
61
|
+
credentialMasked: probe.masked,
|
|
62
|
+
credentialError: probe.error,
|
|
63
|
+
email: account.email,
|
|
64
|
+
};
|
|
65
|
+
});
|
|
66
|
+
return {
|
|
67
|
+
ok: true,
|
|
68
|
+
result: { current: current?.accountKey ?? null, accounts: views },
|
|
69
|
+
humanMessage: views.length === 0
|
|
70
|
+
? 'no saved accounts — run `supercli login` to add one'
|
|
71
|
+
: undefined,
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
function printHuman(current, views) {
|
|
75
|
+
if (views.length === 0) {
|
|
76
|
+
log_1.log.info('no saved accounts — run `supercli login` to add one');
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
for (const v of views) {
|
|
80
|
+
const marker = current === v.accountKey ? '*' : ' ';
|
|
81
|
+
const statusLabel = v.status === 'needs-login' ? ' (needs login)' : '';
|
|
82
|
+
const healthLabel = v.credential === 'corrupt' ? ` (${v.credentialError ?? 'credential error'})` : '';
|
|
83
|
+
const orgLabel = v.orgName ? ` org=${v.orgName}` : v.org ? ` org=${v.org}` : '';
|
|
84
|
+
const idLabel = v.email ?? v.credentialMasked ?? `user:${v.accountKey}`;
|
|
85
|
+
log_1.log.info(`${marker} ${v.accountKey} ${idLabel} [${v.env}]${orgLabel}${statusLabel}${healthLabel}`);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
7
88
|
function registerAccountsCommand(program) {
|
|
8
89
|
program
|
|
9
90
|
.command('accounts')
|
|
10
91
|
.description('List saved accounts and show which one is current')
|
|
11
|
-
.action(() => {
|
|
12
|
-
const
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
|
|
92
|
+
.action((_opts, cmd) => {
|
|
93
|
+
const mode = cmd.optsWithGlobals?.()?.output === 'json' ? 'json' : 'human';
|
|
94
|
+
const printer = new resultPrinter_1.ResultPrinter(mode);
|
|
95
|
+
const outcome = runAccounts();
|
|
96
|
+
if (mode === 'human' && outcome.ok) {
|
|
97
|
+
const result = outcome.result;
|
|
98
|
+
printHuman(result.current, result.accounts);
|
|
16
99
|
return;
|
|
17
100
|
}
|
|
18
|
-
|
|
19
|
-
for (const account of withHealth) {
|
|
20
|
-
const marker = current?.accountKey === account.accountKey ? '*' : ' ';
|
|
21
|
-
const statusLabel = account.status === 'needs-login' ? ' (needs login)' : '';
|
|
22
|
-
const healthLabel = account.credentialStatus === 'corrupt' ? ` (${account.credentialError})` : '';
|
|
23
|
-
log_1.log.info(`${marker} ${account.accountKey} ${account.email} [${account.envLabel}]${statusLabel}${healthLabel}`);
|
|
24
|
-
}
|
|
101
|
+
printer.emit(outcome);
|
|
25
102
|
});
|
|
26
103
|
}
|
|
27
|
-
/**
|
|
28
|
-
* Best-effort, non-interactive credential health probe consumed via
|
|
29
|
-
* accountStore.withCredentialHealth (the single implementation of this
|
|
30
|
-
* pattern — TC-32 tests it there directly with an injected fake). Never
|
|
31
|
-
* prompts for a passphrase from a plain listing command: encrypted-file
|
|
32
|
-
* accounts are reported "ok" here unconditionally (decrypt-to-verify only
|
|
33
|
-
* happens when a credential is actually used, e.g. during refresh).
|
|
34
|
-
*/
|
|
35
|
-
function checkCredential(accounts, accountKey) {
|
|
36
|
-
const account = accounts.find((a) => a.accountKey === accountKey);
|
|
37
|
-
if (!account)
|
|
38
|
-
return { ok: false, error: 'unknown account' };
|
|
39
|
-
if (account.backend === 'encrypted-file')
|
|
40
|
-
return { ok: true };
|
|
41
|
-
const backend = (0, credentialStore_1.backendForAccount)('os-keyring');
|
|
42
|
-
if (!backend.isAvailable())
|
|
43
|
-
return { ok: false, error: 'OS credential service unavailable' };
|
|
44
|
-
return backend.get(accountKey) ? { ok: true } : { ok: false, error: 'credential missing — re-login' };
|
|
45
|
-
}
|
|
46
104
|
//# sourceMappingURL=accounts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounts.js","sourceRoot":"","sources":["../../src/commands/accounts.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"accounts.js","sourceRoot":"","sources":["../../src/commands/accounts.ts"],"names":[],"mappings":"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"}
|