@supersdk/supercli 0.2.1-staging.20 → 0.2.1-staging.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (43) hide show
  1. package/dist/api/consoleClient.js +17 -12
  2. package/dist/api/consoleClient.js.map +1 -1
  3. package/dist/auth/browserAuth.js +42 -44
  4. package/dist/auth/browserAuth.js.map +1 -1
  5. package/dist/auth/tokenAuth.js +46 -0
  6. package/dist/auth/tokenAuth.js.map +1 -0
  7. package/dist/cli.js +66 -6
  8. package/dist/cli.js.map +1 -1
  9. package/dist/commands/accounts.js +89 -31
  10. package/dist/commands/accounts.js.map +1 -1
  11. package/dist/commands/login.js +75 -48
  12. package/dist/commands/login.js.map +1 -1
  13. package/dist/commands/logout.js +20 -25
  14. package/dist/commands/logout.js.map +1 -1
  15. package/dist/commands/publishSite.js +142 -83
  16. package/dist/commands/publishSite.js.map +1 -1
  17. package/dist/commands/switchaccount.js +36 -24
  18. package/dist/commands/switchaccount.js.map +1 -1
  19. package/dist/config/environments.js +17 -1
  20. package/dist/config/environments.js.map +1 -1
  21. package/dist/exit/exitCodes.js +55 -0
  22. package/dist/exit/exitCodes.js.map +1 -0
  23. package/dist/output/envelope.js +104 -0
  24. package/dist/output/envelope.js.map +1 -0
  25. package/dist/output/resultPrinter.js +70 -0
  26. package/dist/output/resultPrinter.js.map +1 -0
  27. package/dist/publish/siteClient.js +14 -4
  28. package/dist/publish/siteClient.js.map +1 -1
  29. package/dist/store/accountStore.js +2 -2
  30. package/dist/store/accountStore.js.map +1 -1
  31. package/dist/store/backends/encryptedFile.js +4 -1
  32. package/dist/store/backends/encryptedFile.js.map +1 -1
  33. package/dist/store/backends/osKeyring.js +4 -8
  34. package/dist/store/backends/osKeyring.js.map +1 -1
  35. package/dist/store/credentialStore.js +22 -0
  36. package/dist/store/credentialStore.js.map +1 -1
  37. package/dist/util/log.js +10 -1
  38. package/dist/util/log.js.map +1 -1
  39. package/dist/util/prompt.js +25 -0
  40. package/dist/util/prompt.js.map +1 -1
  41. package/package.json +1 -1
  42. package/dist/auth/refresh.js +0 -32
  43. package/dist/auth/refresh.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"environments.js","sourceRoot":"","sources":["../../src/config/environments.ts"],"names":[],"mappings":";;;AAoDA,gDAoBC;AAxED,4DAA4D;AAC5D,EAAE;AACF,gFAAgF;AAChF,kFAAkF;AAClF,iFAAiF;AACjF,sEAAsE;AACtE,gFAAgF;AAChF,0EAA0E;AAC1E,kFAAkF;AAClF,6EAA6E;AAC7E,iFAAiF;AACjF,+EAA+E;AAC/E,2CAAqD;AAUxC,QAAA,kBAAkB,GAA4D,MAAM,CAAC,MAAM,CAAC;IACvG,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;QAClB,KAAK,EAAE,MAAM;QACb,SAAS,EAAE,8BAA8B;QACzC,SAAS,EAAE,8BAA8B;KAC1C,CAAC;IACF,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC;QACrB,KAAK,EAAE,SAAS;QAChB,SAAS,EAAE,8BAA8B;QACzC,SAAS,EAAE,8BAA8B;KAC1C,CAAC;CACH,CAAC,CAAC;AAQH,MAAa,gBAAiB,SAAQ,KAAK;IACzC,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACjC,CAAC;CACF;AALD,4CAKC;AAED;;;GAGG;AACH,SAAgB,kBAAkB,CAAC,KAA8B;IAC/D,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QACpB,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;YACxD,MAAM,IAAI,gBAAgB,CAAC,oDAAoD,CAAC,CAAC;QACnF,CAAC;QACD,MAAM,SAAS,GAAG,IAAA,4BAAmB,EAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACvD,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,4BAAmB,EAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACrF,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;IACnD,CAAC;IACD,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QACpB,MAAM,IAAI,gBAAgB,CAAC,8DAA8D,CAAC,CAAC;IAC7F,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,IAAI,MAAM,CAAC;IAC1C,IAAI,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC5C,MAAM,IAAI,gBAAgB,CACxB,0BAA0B,KAAK,iFAAiF,CACjH,CAAC;IACJ,CAAC;IACD,OAAO,0BAAkB,CAAC,KAAK,CAAC,CAAC;AACnC,CAAC"}
1
+ {"version":3,"file":"environments.js","sourceRoot":"","sources":["../../src/config/environments.ts"],"names":[],"mappings":";;;AAwDA,4CAOC;AAMD,gDAoBC;AAzFD,4DAA4D;AAC5D,EAAE;AACF,gFAAgF;AAChF,kFAAkF;AAClF,iFAAiF;AACjF,sEAAsE;AACtE,gFAAgF;AAChF,0EAA0E;AAC1E,kFAAkF;AAClF,6EAA6E;AAC7E,iFAAiF;AACjF,+EAA+E;AAC/E,2CAAqD;AAUxC,QAAA,kBAAkB,GAA4D,MAAM,CAAC,MAAM,CAAC;IACvG,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;QAClB,KAAK,EAAE,MAAM;QACb,SAAS,EAAE,8BAA8B;QACzC,SAAS,EAAE,8BAA8B;KAC1C,CAAC;IACF,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC;QACrB,KAAK,EAAE,SAAS;QAChB,SAAS,EAAE,8BAA8B;QACzC,SAAS,EAAE,8BAA8B;KAC1C,CAAC;CACH,CAAC,CAAC;AAQH,MAAa,gBAAiB,SAAQ,KAAK;IACzC,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACjC,CAAC;CACF;AALD,4CAKC;AAEY,QAAA,uBAAuB,GAAG,qBAAqB,CAAC;AAE7D;;;;;GAKG;AACH,SAAgB,gBAAgB,CAAC,QAAiC,EAAE;IAClE,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,+BAAuB,CAAC,EAAE,IAAI,EAAE,CAAC;IAC7D,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG,IAAA,4BAAmB,EAAC,OAAO,CAAC,CAAC;QAC5C,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;IACnE,CAAC;IACD,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;AACnC,CAAC;AAED;;;GAGG;AACH,SAAgB,kBAAkB,CAAC,KAA8B;IAC/D,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QACpB,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;YACxD,MAAM,IAAI,gBAAgB,CAAC,oDAAoD,CAAC,CAAC;QACnF,CAAC;QACD,MAAM,SAAS,GAAG,IAAA,4BAAmB,EAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACvD,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,4BAAmB,EAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACrF,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;IACnD,CAAC;IACD,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QACpB,MAAM,IAAI,gBAAgB,CAAC,8DAA8D,CAAC,CAAC;IAC7F,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,IAAI,MAAM,CAAC;IAC1C,IAAI,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC5C,MAAM,IAAI,gBAAgB,CACxB,0BAA0B,KAAK,iFAAiF,CACjH,CAAC;IACJ,CAAC;IACD,OAAO,0BAAkB,CAAC,KAAK,CAAC,CAAC;AACnC,CAAC"}
@@ -0,0 +1,55 @@
1
+ "use strict";
2
+ // Programmable exit-code classification (AC-3). Maps a command outcome kind to
3
+ // (a) the process exit code and (b) the stable `error.code` string in the JSON
4
+ // envelope, so an Agent can branch on either channel.
5
+ //
6
+ // success / soft_success -> 0 (soft_success also sets soft:true)
7
+ // business_error / forbidden -> 2
8
+ // auth_invalid / needs_login -> 3
9
+ // rate_limited -> 4
10
+ // infra_error -> 5
11
+ // usage_error (commander) -> 6
12
+ //
13
+ // 🔴 exit 2 (forbidden: you lack this permission / are no longer in this org)
14
+ // and exit 3 (auth_invalid: the token itself is gone/expired) are deliberately
15
+ // distinct — AC-6/TC-048 requires the CLI to tell "token deleted" (exit 3) apart
16
+ // from "removed from org" (exit 2).
17
+ Object.defineProperty(exports, "__esModule", { value: true });
18
+ exports.ERROR_CODE = exports.EXIT = void 0;
19
+ exports.classifyFailure = classifyFailure;
20
+ exports.EXIT = {
21
+ SUCCESS: 0,
22
+ BUSINESS: 2,
23
+ AUTH: 3,
24
+ RATE_LIMITED: 4,
25
+ INFRA: 5,
26
+ USAGE: 6,
27
+ };
28
+ /** Stable envelope `error.code` strings (machine-readable failure categories). */
29
+ exports.ERROR_CODE = {
30
+ BUSINESS_ERROR: 'BUSINESS_ERROR',
31
+ FORBIDDEN: 'FORBIDDEN',
32
+ AUTH_INVALID: 'AUTH_INVALID',
33
+ RATE_LIMITED: 'RATE_LIMITED',
34
+ INFRA_ERROR: 'INFRA_ERROR',
35
+ USAGE_ERROR: 'USAGE_ERROR',
36
+ };
37
+ /** Maps a failing outcome kind to its envelope error.code + process exit code. */
38
+ function classifyFailure(kind) {
39
+ switch (kind) {
40
+ case 'business_error':
41
+ return { errorCode: exports.ERROR_CODE.BUSINESS_ERROR, exitCode: exports.EXIT.BUSINESS };
42
+ case 'forbidden':
43
+ return { errorCode: exports.ERROR_CODE.FORBIDDEN, exitCode: exports.EXIT.BUSINESS };
44
+ case 'auth_invalid':
45
+ case 'needs_login':
46
+ return { errorCode: exports.ERROR_CODE.AUTH_INVALID, exitCode: exports.EXIT.AUTH };
47
+ case 'rate_limited':
48
+ return { errorCode: exports.ERROR_CODE.RATE_LIMITED, exitCode: exports.EXIT.RATE_LIMITED };
49
+ case 'infra_error':
50
+ return { errorCode: exports.ERROR_CODE.INFRA_ERROR, exitCode: exports.EXIT.INFRA };
51
+ case 'usage_error':
52
+ return { errorCode: exports.ERROR_CODE.USAGE_ERROR, exitCode: exports.EXIT.USAGE };
53
+ }
54
+ }
55
+ //# sourceMappingURL=exitCodes.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"exitCodes.js","sourceRoot":"","sources":["../../src/exit/exitCodes.ts"],"names":[],"mappings":";AAAA,+EAA+E;AAC/E,+EAA+E;AAC/E,sDAAsD;AACtD,EAAE;AACF,sEAAsE;AACtE,oCAAoC;AACpC,oCAAoC;AACpC,kCAAkC;AAClC,kCAAkC;AAClC,kCAAkC;AAClC,EAAE;AACF,8EAA8E;AAC9E,+EAA+E;AAC/E,iFAAiF;AACjF,oCAAoC;;;AAuCpC,0CAgBC;AArDY,QAAA,IAAI,GAAG;IAClB,OAAO,EAAE,CAAC;IACV,QAAQ,EAAE,CAAC;IACX,IAAI,EAAE,CAAC;IACP,YAAY,EAAE,CAAC;IACf,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;CACA,CAAC;AAmBX,kFAAkF;AACrE,QAAA,UAAU,GAAG;IACxB,cAAc,EAAE,gBAAgB;IAChC,SAAS,EAAE,WAAW;IACtB,YAAY,EAAE,cAAc;IAC5B,YAAY,EAAE,cAAc;IAC5B,WAAW,EAAE,aAAa;IAC1B,WAAW,EAAE,aAAa;CAClB,CAAC;AAEX,kFAAkF;AAClF,SAAgB,eAAe,CAAC,IAAsD;IACpF,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,gBAAgB;YACnB,OAAO,EAAE,SAAS,EAAE,kBAAU,CAAC,cAAc,EAAE,QAAQ,EAAE,YAAI,CAAC,QAAQ,EAAE,CAAC;QAC3E,KAAK,WAAW;YACd,OAAO,EAAE,SAAS,EAAE,kBAAU,CAAC,SAAS,EAAE,QAAQ,EAAE,YAAI,CAAC,QAAQ,EAAE,CAAC;QACtE,KAAK,cAAc,CAAC;QACpB,KAAK,aAAa;YAChB,OAAO,EAAE,SAAS,EAAE,kBAAU,CAAC,YAAY,EAAE,QAAQ,EAAE,YAAI,CAAC,IAAI,EAAE,CAAC;QACrE,KAAK,cAAc;YACjB,OAAO,EAAE,SAAS,EAAE,kBAAU,CAAC,YAAY,EAAE,QAAQ,EAAE,YAAI,CAAC,YAAY,EAAE,CAAC;QAC7E,KAAK,aAAa;YAChB,OAAO,EAAE,SAAS,EAAE,kBAAU,CAAC,WAAW,EAAE,QAAQ,EAAE,YAAI,CAAC,KAAK,EAAE,CAAC;QACrE,KAAK,aAAa;YAChB,OAAO,EAAE,SAAS,EAAE,kBAAU,CAAC,WAAW,EAAE,QAAQ,EAAE,YAAI,CAAC,KAAK,EAAE,CAAC;IACvE,CAAC;AACH,CAAC"}
@@ -0,0 +1,104 @@
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.ResultLeakError = exports.SCHEMA_VERSION = void 0;
37
+ exports.generateRequestId = generateRequestId;
38
+ exports.redactTokenShaped = redactTokenShaped;
39
+ exports.assertNoTokenShapedValue = assertNoTokenShapedValue;
40
+ // Agent Contract JSON envelope (AC-1). The single, stable shape every command
41
+ // emits on stdout under `--output json`:
42
+ //
43
+ // { schema_version, ok, result | error{code,message}, request_id, soft? }
44
+ //
45
+ // Compatibility promise (AC-1): `schema_version` is a NUMBER and the skeleton is
46
+ // append-only — fields are added, never renamed or removed, so an older parser
47
+ // keeps working. `request_id` is CLI-generated locally (AC-10), present even for
48
+ // a usage error that fails before any network call is made.
49
+ const crypto = __importStar(require("node:crypto"));
50
+ /** Envelope skeleton version. Bump only when adding fields (never breaking). */
51
+ exports.SCHEMA_VERSION = 1;
52
+ /** CLI-local request id — never depends on a server response (AC-10 / TC-044). */
53
+ function generateRequestId() {
54
+ return `cli_${crypto.randomUUID()}`;
55
+ }
56
+ // A full CLI/service token is `cli_`/`sst_` followed by a long base64url run
57
+ // (alphabet A-Za-z0-9 plus `-` and `_` — the generator uses base64url, so ~40% of real
58
+ // tokens carry a `-`/`_` within the first 16 chars and MUST be matched · review EXR-4).
59
+ // A masked identity (e.g. `cli_…a1b2`) uses an ellipsis (not in the class), so it does
60
+ // not trip this guard.
61
+ const TOKEN_VALUE_PATTERN = /(?:cli|sst)_[A-Za-z0-9_-]{16,}/;
62
+ /**
63
+ * Global variant used to REDACT (not assert) token-shaped runs from a free-text error
64
+ * message before it reaches stdout/stderr (review EXR-5 · defense-in-depth). Unlike result
65
+ * payloads (which fail closed via assertNoTokenShapedValue), an error message may legitimately
66
+ * echo user input, so we scrub rather than throw — never lose the error, never leak a token.
67
+ */
68
+ const TOKEN_VALUE_PATTERN_G = /(?:cli|sst)_[A-Za-z0-9_-]{16,}/g;
69
+ function redactTokenShaped(message) {
70
+ return message.replace(TOKEN_VALUE_PATTERN_G, '[redacted]');
71
+ }
72
+ class ResultLeakError extends Error {
73
+ constructor(where) {
74
+ super(`refusing to emit result: a token-shaped value was found at ${where}`);
75
+ this.name = 'ResultLeakError';
76
+ }
77
+ }
78
+ exports.ResultLeakError = ResultLeakError;
79
+ /**
80
+ * Defense-in-depth self-check (PRD "开工前项"): a `result` payload is written to
81
+ * stdout WITHOUT going through log.ts's redact(), so before emitting it we assert
82
+ * no string value looks like a live token. Fails closed (throws) rather than ever
83
+ * leaking a token onto stdout — the primary control is still "commands never put
84
+ * a raw token into result".
85
+ */
86
+ function assertNoTokenShapedValue(value, pathStr = '$', depth = 0) {
87
+ if (value == null || depth > 8)
88
+ return;
89
+ if (typeof value === 'string') {
90
+ if (TOKEN_VALUE_PATTERN.test(value))
91
+ throw new ResultLeakError(pathStr);
92
+ return;
93
+ }
94
+ if (Array.isArray(value)) {
95
+ value.forEach((v, i) => assertNoTokenShapedValue(v, `${pathStr}[${i}]`, depth + 1));
96
+ return;
97
+ }
98
+ if (typeof value === 'object') {
99
+ for (const [k, v] of Object.entries(value)) {
100
+ assertNoTokenShapedValue(v, `${pathStr}.${k}`, depth + 1);
101
+ }
102
+ }
103
+ }
104
+ //# sourceMappingURL=envelope.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"envelope.js","sourceRoot":"","sources":["../../src/output/envelope.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6BA,8CAEC;AAgBD,8CAEC;AAgBD,4DAeC;AAhFD,8EAA8E;AAC9E,yCAAyC;AACzC,EAAE;AACF,4EAA4E;AAC5E,EAAE;AACF,iFAAiF;AACjF,+EAA+E;AAC/E,iFAAiF;AACjF,4DAA4D;AAC5D,oDAAsC;AAEtC,gFAAgF;AACnE,QAAA,cAAc,GAAG,CAAC,CAAC;AAgBhC,kFAAkF;AAClF,SAAgB,iBAAiB;IAC/B,OAAO,OAAO,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;AACtC,CAAC;AAED,6EAA6E;AAC7E,uFAAuF;AACvF,wFAAwF;AACxF,uFAAuF;AACvF,uBAAuB;AACvB,MAAM,mBAAmB,GAAG,gCAAgC,CAAC;AAE7D;;;;;GAKG;AACH,MAAM,qBAAqB,GAAG,iCAAiC,CAAC;AAChE,SAAgB,iBAAiB,CAAC,OAAe;IAC/C,OAAO,OAAO,CAAC,OAAO,CAAC,qBAAqB,EAAE,YAAY,CAAC,CAAC;AAC9D,CAAC;AAED,MAAa,eAAgB,SAAQ,KAAK;IACxC,YAAY,KAAa;QACvB,KAAK,CAAC,8DAA8D,KAAK,EAAE,CAAC,CAAC;QAC7E,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;IAChC,CAAC;CACF;AALD,0CAKC;AAED;;;;;;GAMG;AACH,SAAgB,wBAAwB,CAAC,KAAc,EAAE,OAAO,GAAG,GAAG,EAAE,KAAK,GAAG,CAAC;IAC/E,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,GAAG,CAAC;QAAE,OAAO;IACvC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,IAAI,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC;YAAE,MAAM,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC;QACxE,OAAO;IACT,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,wBAAwB,CAAC,CAAC,EAAE,GAAG,OAAO,IAAI,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;QACpF,OAAO;IACT,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC,EAAE,CAAC;YACtE,wBAAwB,CAAC,CAAC,EAAE,GAAG,OAAO,IAAI,CAAC,EAAE,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;AACH,CAAC"}
@@ -0,0 +1,70 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.ResultPrinter = void 0;
4
+ // The single result-output channel (AC-1). Independent of log.ts:
5
+ // - json mode: emits EXACTLY ONE line on stdout — the envelope — and nothing
6
+ // else; every process log line is forced onto stderr (setLogJsonMode).
7
+ // - human mode: prints a human-readable message via log (info->stdout,
8
+ // error->stderr), preserving the pre-Agent-Contract UX.
9
+ // Either way, failures set process.exitCode from the AC-3 classification table.
10
+ const envelope_1 = require("./envelope");
11
+ const exitCodes_1 = require("../exit/exitCodes");
12
+ const log_1 = require("../util/log");
13
+ function writeStdoutLine(s) {
14
+ process.stdout.write(`${s}\n`);
15
+ }
16
+ class ResultPrinter {
17
+ mode;
18
+ requestId;
19
+ constructor(mode, requestId) {
20
+ this.mode = mode;
21
+ this.requestId = requestId ?? (0, envelope_1.generateRequestId)();
22
+ }
23
+ /** Emit a success result (exit stays 0). */
24
+ success(result, opts = {}) {
25
+ if (this.mode === 'json') {
26
+ (0, envelope_1.assertNoTokenShapedValue)(result);
27
+ const envelope = {
28
+ schema_version: envelope_1.SCHEMA_VERSION,
29
+ ok: true,
30
+ result,
31
+ request_id: this.requestId,
32
+ ...(opts.soft ? { soft: true } : {}),
33
+ };
34
+ writeStdoutLine(JSON.stringify(envelope));
35
+ return;
36
+ }
37
+ if (opts.humanMessage)
38
+ log_1.log.info(opts.humanMessage);
39
+ }
40
+ /** Emit a structured failure and set process.exitCode from the AC-3 table. */
41
+ failure(kind, message) {
42
+ // EXR-5: scrub any token-shaped run from the free-text message before it reaches
43
+ // stdout (json) or stderr (human) — error messages bypass log.ts's redact().
44
+ const safeMessage = (0, envelope_1.redactTokenShaped)(message);
45
+ const { errorCode, exitCode } = (0, exitCodes_1.classifyFailure)(kind);
46
+ process.exitCode = exitCode;
47
+ if (this.mode === 'json') {
48
+ const envelope = {
49
+ schema_version: envelope_1.SCHEMA_VERSION,
50
+ ok: false,
51
+ error: { code: errorCode, message: safeMessage },
52
+ request_id: this.requestId,
53
+ };
54
+ writeStdoutLine(JSON.stringify(envelope));
55
+ return;
56
+ }
57
+ log_1.log.error(safeMessage);
58
+ }
59
+ /** Render a CommandOutcome uniformly. */
60
+ emit(outcome) {
61
+ if (outcome.ok) {
62
+ this.success(outcome.result, { soft: outcome.soft, humanMessage: outcome.humanMessage });
63
+ }
64
+ else {
65
+ this.failure(outcome.kind, outcome.message);
66
+ }
67
+ }
68
+ }
69
+ exports.ResultPrinter = ResultPrinter;
70
+ //# sourceMappingURL=resultPrinter.js.map
@@ -0,0 +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,yCAMoB;AACpB,iDAAsE;AACtE,qCAAkC;AASlC,SAAS,eAAe,CAAC,CAAS;IAChC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACjC,CAAC;AAED,MAAa,aAAa;IAIb;IAHF,SAAS,CAAS;IAE3B,YACW,IAAgB,EACzB,SAAkB;QADT,SAAI,GAAJ,IAAI,CAAY;QAGzB,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,IAAA,4BAAiB,GAAE,CAAC;IACpD,CAAC;IAED,4CAA4C;IAC5C,OAAO,CAAC,MAAe,EAAE,OAAkD,EAAE;QAC3E,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACzB,IAAA,mCAAwB,EAAC,MAAM,CAAC,CAAC;YACjC,MAAM,QAAQ,GAAa;gBACzB,cAAc,EAAE,yBAAc;gBAC9B,EAAE,EAAE,IAAI;gBACR,MAAM;gBACN,UAAU,EAAE,IAAI,CAAC,SAAS;gBAC1B,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACrC,CAAC;YACF,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC1C,OAAO;QACT,CAAC;QACD,IAAI,IAAI,CAAC,YAAY;YAAE,SAAG,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACrD,CAAC;IAED,8EAA8E;IAC9E,OAAO,CAAC,IAAsD,EAAE,OAAe;QAC7E,iFAAiF;QACjF,6EAA6E;QAC7E,MAAM,WAAW,GAAG,IAAA,4BAAiB,EAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAe,EAAC,IAAI,CAAC,CAAC;QACtD,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC5B,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACzB,MAAM,QAAQ,GAAa;gBACzB,cAAc,EAAE,yBAAc;gBAC9B,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE;gBAChD,UAAU,EAAE,IAAI,CAAC,SAAS;aAC3B,CAAC;YACF,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC1C,OAAO;QACT,CAAC;QACD,SAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACzB,CAAC;IAED,yCAAyC;IACzC,IAAI,CAAC,OAAuB;QAC1B,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;YACf,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;QAC3F,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;CACF;AAvDD,sCAuDC"}
@@ -62,7 +62,10 @@ class SiteClient {
62
62
  const timer = setTimeout(() => controller.abort(), opts.timeoutMs ?? 60_000);
63
63
  let res;
64
64
  try {
65
- const headers = this.headers(ctx, opts.jsonBody !== undefined ? { 'content-type': 'application/json' } : undefined);
65
+ const headers = this.headers(ctx, {
66
+ ...(opts.jsonBody !== undefined ? { 'content-type': 'application/json' } : {}),
67
+ ...(opts.extraHeaders ?? {}),
68
+ });
66
69
  res = await this.fetchImpl(`${this.apiOrigin}${path}`, {
67
70
  method,
68
71
  headers,
@@ -99,7 +102,9 @@ class SiteClient {
99
102
  message: `zip file is ${input.zip.length} bytes — over the 50 MiB upload limit`,
100
103
  });
101
104
  }
102
- if (!Number.isSafeInteger(input.expectedSiteId) || input.expectedSiteId <= 0) {
105
+ // A real deploy must reference a verified site id; a dry-run of a not-yet-
106
+ // created site legitimately has none (0), so the guard only applies off dry-run.
107
+ if (!input.dryRun && (!Number.isSafeInteger(input.expectedSiteId) || input.expectedSiteId <= 0)) {
103
108
  return Promise.resolve({
104
109
  kind: 'infra_error',
105
110
  message: 'expectedSiteId must be a positive integer from a verified SiteView',
@@ -114,8 +119,13 @@ class SiteClient {
114
119
  form.append('version', input.version);
115
120
  if (input.description !== undefined)
116
121
  form.append('description', input.description);
117
- form.append('expected_site_id', String(input.expectedSiteId));
118
- return this.send(ctx, 'POST', `/api/console/projects/${encodeURIComponent(spid)}/sites/${encodeURIComponent(slug)}/envs/${encodeURIComponent(env)}/deploys`, { formBody: form });
122
+ if (Number.isSafeInteger(input.expectedSiteId) && input.expectedSiteId > 0) {
123
+ form.append('expected_site_id', String(input.expectedSiteId));
124
+ }
125
+ if (input.dryRun)
126
+ form.append('dry_run', 'true');
127
+ const extraHeaders = input.idempotencyKey ? { 'x-idempotency-key': input.idempotencyKey } : undefined;
128
+ return this.send(ctx, 'POST', `/api/console/projects/${encodeURIComponent(spid)}/sites/${encodeURIComponent(slug)}/envs/${encodeURIComponent(env)}/deploys`, { formBody: form, extraHeaders });
119
129
  }
120
130
  }
121
131
  exports.SiteClient = SiteClient;
@@ -1 +1 @@
1
- {"version":3,"file":"siteClient.js","sourceRoot":"","sources":["../../src/publish/siteClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"siteClient.js","sourceRoot":"","sources":["../../src/publish/siteClient.ts"],"names":[],"mappings":"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"}
@@ -160,7 +160,7 @@ function upsertAccountAndSetCurrent(record) {
160
160
  const accounts = { ...data.accounts, [record.accountKey]: record };
161
161
  return { next: { version: FILE_VERSION, current: record.accountKey, accounts }, result: undefined };
162
162
  });
163
- log_1.log.info('account saved', { accountKey: record.accountKey, email: (0, log_1.maskEmail)(record.email) });
163
+ log_1.log.info('account saved', { accountKey: record.accountKey, email: record.email ? (0, log_1.maskEmail)(record.email) : undefined });
164
164
  }
165
165
  /** Marks an account as needing re-login (AC-9: the only path a 401 may take). If it was current, current becomes none — never auto-switches. */
166
166
  function markAccountNeedsLogin(accountKey) {
@@ -200,7 +200,7 @@ function resolveSelector(accounts, selector) {
200
200
  const byKey = accounts.find((a) => a.accountKey === selector);
201
201
  if (byKey)
202
202
  return { kind: 'found', account: byKey };
203
- const byEmail = accounts.filter((a) => a.email.toLowerCase() === selector.toLowerCase());
203
+ const byEmail = accounts.filter((a) => a.email && a.email.toLowerCase() === selector.toLowerCase());
204
204
  if (byEmail.length === 1)
205
205
  return { kind: 'found', account: byEmail[0] };
206
206
  if (byEmail.length > 1)
@@ -1 +1 @@
1
- {"version":3,"file":"accountStore.js","sourceRoot":"","sources":["../../src/store/accountStore.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"accountStore.js","sourceRoot":"","sources":["../../src/store/accountStore.ts"],"names":[],"mappings":"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"}
@@ -51,6 +51,7 @@ const fs = __importStar(require("node:fs"));
51
51
  const os = __importStar(require("node:os"));
52
52
  const path = __importStar(require("node:path"));
53
53
  const fsAtomic_1 = require("../../util/fsAtomic");
54
+ const credentialStore_1 = require("../credentialStore");
54
55
  const SCRYPT_KEYLEN = 32;
55
56
  // RFC 7914 "interactive" tier scrypt params — a passphrase is entered on
56
57
  // every use, so this must stay fast enough not to be an annoyance while
@@ -151,7 +152,9 @@ function createEncryptedFileBackend(getPassphrase) {
151
152
  decipher.setAuthTag(tag);
152
153
  try {
153
154
  const plaintext = Buffer.concat([decipher.update(ciphertext), decipher.final()]);
154
- return JSON.parse(plaintext.toString('utf8'));
155
+ // A legacy double-token payload decrypts fine but is not the new shape —
156
+ // downgrade to null (needs-login) rather than hand back a stale bundle (AC-8).
157
+ return (0, credentialStore_1.parseCredentialSecret)(plaintext.toString('utf8'));
155
158
  }
156
159
  catch {
157
160
  // GCM tag verification failed before any plaintext was returned —
@@ -1 +1 @@
1
- {"version":3,"file":"encryptedFile.js","sourceRoot":"","sources":["../../../src/store/backends/encryptedFile.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgHA,gEAoEC;AApLD,uEAAuE;AACvE,uEAAuE;AACvE,2EAA2E;AAC3E,oEAAoE;AACpE,sDAAsD;AACtD,EAAE;AACF,yEAAyE;AACzE,sEAAsE;AACtE,2EAA2E;AAC3E,0EAA0E;AAC1E,oCAAoC;AACpC,oDAAsC;AACtC,4CAA8B;AAC9B,4CAA8B;AAC9B,gDAAkC;AAClC,kDAA2E;AAe3E,MAAM,aAAa,GAAG,EAAE,CAAC;AACzB,yEAAyE;AACzE,wEAAwE;AACxE,6EAA6E;AAC7E,6EAA6E;AAC7E,0BAA0B;AAC1B,MAAM,aAAa,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;AAIjD,SAAS,SAAS;IAChB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IACrF,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,UAAU;IACjB,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;AACrC,CAAC;AAED,SAAS,SAAS;IAChB,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACH,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,UAAU,EAAE,CAAC;QAC1E,OAAO,UAAU,EAAE,CAAC;IACtB,CAAC;IACD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAc,CAAC;QAC5C,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YAC3G,OAAO,UAAU,EAAE,CAAC;QACtB,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,UAAU,EAAE,CAAC;IACtB,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,KAAgB;IAClC,IAAA,8BAAmB,EAAC,SAAS,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AACnE,CAAC;AAED,SAAS,aAAa;IACpB,OAAO,GAAG,SAAS,EAAE,OAAO,CAAC;AAC/B,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAS,aAAa,CAAI,MAA8D;IACtF,MAAM,OAAO,GAAG,IAAA,0BAAe,EAAC,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAChF,IAAI,CAAC;QACH,2BAA2B;QAC3B,MAAM,OAAO,GAAG,SAAS,EAAE,CAAC;QAC5B,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QACzC,UAAU,CAAC,IAAI,CAAC,CAAC;QACjB,OAAO,MAAM,CAAC;IAChB,CAAC;YAAS,CAAC;QACT,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,UAAkB,EAAE,IAAY;IACjD,OAAO,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;AAC3E,CAAC;AAED,MAAa,oBAAqB,SAAQ,KAAK;IAC7C;QACE,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAChE,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAC;IACrC,CAAC;CACF;AALD,oDAKC;AAED,SAAgB,0BAA0B,CAAC,aAAiC;IAC1E,OAAO;QACL,IAAI,EAAE,gBAAgB;QACtB,WAAW;YACT,sEAAsE;YACtE,OAAO,IAAI,CAAC;QACd,CAAC;QACD,GAAG,CAAC,UAAU;YACZ,mDAAmD;YACnD,2CAA2C;YAC3C,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC;YAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACxC,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,CAAC;YAExB,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;YACnC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC/C,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YAC3C,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC7C,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAC3D,MAAM,GAAG,GAAG,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YAExC,MAAM,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAC,aAAa,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YACjE,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACzB,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBACjF,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAqB,CAAC;YACpE,CAAC;YAAC,MAAM,CAAC;gBACP,kEAAkE;gBAClE,iEAAiE;gBACjE,kEAAkE;gBAClE,MAAM,IAAI,oBAAoB,EAAE,CAAC;YACnC,CAAC;QACH,CAAC;QACD,GAAG,CAAC,UAAU,EAAE,MAAM;YACpB,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;YACnC,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YACpC,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAClC,MAAM,GAAG,GAAG,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YAExC,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YAC7D,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;YAC9D,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC7E,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;YAEhC,mDAAmD;YACnD,sCAAsC;YACtC,MAAM,KAAK,GAAe;gBACxB,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAC7B,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBACzB,GAAG,EAAE,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAC3B,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC;aAC1C,CAAC;YACF,aAAa,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAC1B,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE;gBAC1E,MAAM,EAAE,SAAS;aAClB,CAAC,CAAC,CAAC;QACN,CAAC;QACD,MAAM,CAAC,UAAU;YACf,sEAAsE;YACtE,qCAAqC;YACrC,aAAa,CAAC,CAAC,OAAO,EAAE,EAAE;gBACxB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;oBAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;gBAC9E,MAAM,OAAO,GAAG,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;gBACvC,OAAO,OAAO,CAAC,UAAU,CAAC,CAAC;gBAC3B,OAAO,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;YAC9D,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"encryptedFile.js","sourceRoot":"","sources":["../../../src/store/backends/encryptedFile.ts"],"names":[],"mappings":"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"}
@@ -55,19 +55,15 @@ exports.createOsKeyringBackend = createOsKeyringBackend;
55
55
  // real-machine verification deferred to the BL-006 window.
56
56
  const node_child_process_1 = require("node:child_process");
57
57
  const os = __importStar(require("node:os"));
58
+ const credentialStore_1 = require("../credentialStore");
58
59
  const SERVICE = 'supersdk-cli';
59
60
  function serialize(secret) {
60
61
  return JSON.stringify(secret);
61
62
  }
63
+ // Returns null (never throws) for a malformed OR legacy double-token payload,
64
+ // so a stale keyring entry downgrades cleanly to needs-login (AC-8).
62
65
  function deserialize(raw) {
63
- const parsed = JSON.parse(raw);
64
- if (typeof parsed.accessToken !== 'string' ||
65
- typeof parsed.accessExpiresAt !== 'number' ||
66
- typeof parsed.refreshToken !== 'string' ||
67
- typeof parsed.refreshExpiresAt !== 'number') {
68
- throw new Error('malformed credential payload read from OS keyring');
69
- }
70
- return parsed;
66
+ return (0, credentialStore_1.parseCredentialSecret)(raw);
71
67
  }
72
68
  // ---- macOS: /usr/bin/security ----
73
69
  function darwinBackend() {
@@ -1 +1 @@
1
- {"version":3,"file":"osKeyring.js","sourceRoot":"","sources":["../../../src/store/backends/osKeyring.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"osKeyring.js","sourceRoot":"","sources":["../../../src/store/backends/osKeyring.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.NoCredentialBackendError = void 0;
4
+ exports.parseCredentialSecret = parseCredentialSecret;
4
5
  exports.selectCredentialBackend = selectCredentialBackend;
5
6
  exports.backendForAccount = backendForAccount;
6
7
  // Credential (secret) storage abstraction (AC-8). Metadata lives in
@@ -18,6 +19,27 @@ exports.backendForAccount = backendForAccount;
18
19
  const osKeyring_1 = require("./backends/osKeyring");
19
20
  const encryptedFile_1 = require("./backends/encryptedFile");
20
21
  const log_1 = require("../util/log");
22
+ /**
23
+ * Parses a stored credential payload into the single-token shape. Returns null
24
+ * (never throws) for anything that is not exactly `{ token: string }` — most
25
+ * importantly a legacy `{ accessToken, refreshToken, ... }` bundle, which must
26
+ * downgrade to needs-login instead of throwing a parse error (AC-8).
27
+ */
28
+ function parseCredentialSecret(raw) {
29
+ let parsed;
30
+ try {
31
+ parsed = JSON.parse(raw);
32
+ }
33
+ catch {
34
+ return null;
35
+ }
36
+ if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
37
+ return null;
38
+ const token = parsed.token;
39
+ if (typeof token !== 'string' || token.length === 0)
40
+ return null;
41
+ return { token };
42
+ }
21
43
  class NoCredentialBackendError extends Error {
22
44
  constructor() {
23
45
  super('no OS credential service is available on this system (e.g. headless Linux without secret-tool), ' +
@@ -1 +1 @@
1
- {"version":3,"file":"credentialStore.js","sourceRoot":"","sources":["../../src/store/credentialStore.ts"],"names":[],"mappings":";;;AA0DA,0DAaC;AASD,8CAeC;AA/FD,oEAAoE;AACpE,0EAA0E;AAC1E,+BAA+B;AAC/B,2EAA2E;AAC3E,0FAA0F;AAC1F,4EAA4E;AAC5E,4EAA4E;AAC5E,EAAE;AACF,0EAA0E;AAC1E,0EAA0E;AAC1E,4EAA4E;AAC5E,sDAAsD;AACtD,oDAA8D;AAC9D,4DAA+F;AAC/F,qCAAkC;AAmBlC,MAAa,wBAAyB,SAAQ,KAAK;IACjD;QACE,KAAK,CACH,kGAAkG;YAChG,kGAAkG;YAClG,8FAA8F,CACjG,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,0BAA0B,CAAC;IACzC,CAAC;CACF;AATD,4DASC;AAWD;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,OAA6B,EAAE;IACrE,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,IAAI,IAAA,kCAAsB,GAAE,CAAC;IACpE,IAAI,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAChC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC3E,CAAC;QACD,OAAO,IAAI,CAAC,oBAAoB,IAAI,IAAA,0CAA0B,EAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAC1F,CAAC;IACD,SAAG,CAAC,KAAK,CAAC,uEAAuE,CAAC,CAAC;IACnF,MAAM,IAAI,wBAAwB,EAAE,CAAC;AACvC,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAC/B,kBAAyC,EACzC,OAII,EAAE;IAEN,IAAI,kBAAkB,KAAK,YAAY,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC,gBAAgB,IAAI,IAAA,kCAAsB,GAAE,CAAC;IAC3D,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;IAC3E,CAAC;IACD,OAAO,IAAI,CAAC,oBAAoB,IAAI,IAAA,0CAA0B,EAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;AAC1F,CAAC"}
1
+ {"version":3,"file":"credentialStore.js","sourceRoot":"","sources":["../../src/store/credentialStore.ts"],"names":[],"mappings":";;;AA+BA,sDAWC;AAqCD,0DAaC;AASD,8CAeC;AApHD,oEAAoE;AACpE,0EAA0E;AAC1E,+BAA+B;AAC/B,2EAA2E;AAC3E,0FAA0F;AAC1F,4EAA4E;AAC5E,4EAA4E;AAC5E,EAAE;AACF,0EAA0E;AAC1E,0EAA0E;AAC1E,4EAA4E;AAC5E,sDAAsD;AACtD,oDAA8D;AAC9D,4DAA+F;AAC/F,qCAAkC;AAWlC;;;;;GAKG;AACH,SAAgB,qBAAqB,CAAC,GAAW;IAC/C,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAC;IAChF,MAAM,KAAK,GAAI,MAA8B,CAAC,KAAK,CAAC;IACpD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACjE,OAAO,EAAE,KAAK,EAAE,CAAC;AACnB,CAAC;AAYD,MAAa,wBAAyB,SAAQ,KAAK;IACjD;QACE,KAAK,CACH,kGAAkG;YAChG,kGAAkG;YAClG,8FAA8F,CACjG,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,0BAA0B,CAAC;IACzC,CAAC;CACF;AATD,4DASC;AAWD;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,OAA6B,EAAE;IACrE,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,IAAI,IAAA,kCAAsB,GAAE,CAAC;IACpE,IAAI,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAChC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC3E,CAAC;QACD,OAAO,IAAI,CAAC,oBAAoB,IAAI,IAAA,0CAA0B,EAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAC1F,CAAC;IACD,SAAG,CAAC,KAAK,CAAC,uEAAuE,CAAC,CAAC;IACnF,MAAM,IAAI,wBAAwB,EAAE,CAAC;AACvC,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAC/B,kBAAyC,EACzC,OAII,EAAE;IAEN,IAAI,kBAAkB,KAAK,YAAY,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC,gBAAgB,IAAI,IAAA,kCAAsB,GAAE,CAAC;IAC3D,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;IAC3E,CAAC;IACD,OAAO,IAAI,CAAC,oBAAoB,IAAI,IAAA,0CAA0B,EAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;AAC1F,CAAC"}
package/dist/util/log.js CHANGED
@@ -8,9 +8,18 @@
8
8
  // primary control; the primary control is "call sites never log secrets".
9
9
  Object.defineProperty(exports, "__esModule", { value: true });
10
10
  exports.log = void 0;
11
+ exports.setLogJsonMode = setLogJsonMode;
11
12
  exports.maskEmail = maskEmail;
12
13
  const SECRET_KEY_PATTERN = /token|secret|passphrase|password|code/i;
13
14
  const REDACTED = '[redacted]';
15
+ // When `--output json` is active, stdout must carry EXACTLY the result envelope
16
+ // (AC-1). Every log line — regardless of level, and regardless of SUPERCLI_LOG —
17
+ // is forced onto stderr so nothing pollutes the machine-parsed stdout. Default
18
+ // (human) behavior is unchanged: info/debug->stdout, warn/error->stderr.
19
+ let jsonOutputMode = false;
20
+ function setLogJsonMode(on) {
21
+ jsonOutputMode = on;
22
+ }
14
23
  function redact(value, depth = 0) {
15
24
  if (value == null || depth > 4)
16
25
  return value;
@@ -35,7 +44,7 @@ function maskEmail(email) {
35
44
  return `${head}***${email.slice(at)}`;
36
45
  }
37
46
  function write(level, message, meta) {
38
- const stream = level === 'error' || level === 'warn' ? process.stderr : process.stdout;
47
+ const stream = jsonOutputMode || level === 'error' || level === 'warn' ? process.stderr : process.stdout;
39
48
  const safeMeta = meta ? redact(meta) : undefined;
40
49
  if (process.env.SUPERCLI_LOG === 'json') {
41
50
  stream.write(`${JSON.stringify({ level, ts: new Date().toISOString(), message, ...(safeMeta ? { meta: safeMeta } : {}) })}\n`);
@@ -1 +1 @@
1
- {"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/util/log.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/util/log.ts"],"names":[],"mappings":"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"}
@@ -33,6 +33,9 @@ var __importStar = (this && this.__importStar) || (function () {
33
33
  };
34
34
  })();
35
35
  Object.defineProperty(exports, "__esModule", { value: true });
36
+ exports.NonInteractiveError = void 0;
37
+ exports.setNonInteractive = setNonInteractive;
38
+ exports.isNonInteractive = isNonInteractive;
36
39
  exports.promptLineSync = promptLineSync;
37
40
  exports.isInteractiveStdin = isInteractiveStdin;
38
41
  exports.promptLineWithDefaultSync = promptLineWithDefaultSync;
@@ -43,6 +46,24 @@ exports.promptHiddenSync = promptHiddenSync;
43
46
  // from inside that synchronous call without infecting the whole store layer
44
47
  // with async/await. This is the same technique the `prompt-sync` package uses.
45
48
  const fs = __importStar(require("node:fs"));
49
+ // Non-interactive mode (AC-2): `--output json` and `--no-input` both imply the
50
+ // caller cannot answer a prompt. When set, prompts fail fast with a structured
51
+ // error instead of blocking on stdin — an Agent must never hang waiting for a
52
+ // paste. cli.ts flips this on before commander parses, based on argv.
53
+ let nonInteractive = false;
54
+ function setNonInteractive(on) {
55
+ nonInteractive = on;
56
+ }
57
+ function isNonInteractive() {
58
+ return nonInteractive;
59
+ }
60
+ class NonInteractiveError extends Error {
61
+ constructor(message = 'interactive input is required but the session is non-interactive; set SUPERCLI_TOKEN to run unattended') {
62
+ super(message);
63
+ this.name = 'NonInteractiveError';
64
+ }
65
+ }
66
+ exports.NonInteractiveError = NonInteractiveError;
46
67
  const CHAR_LF = String.fromCharCode(10);
47
68
  const CHAR_CR = String.fromCharCode(13);
48
69
  const CHAR_EOF = String.fromCharCode(4); // Ctrl-D
@@ -73,6 +94,8 @@ function readCharFromFd(fd, buf) {
73
94
  }
74
95
  /** Visible line input (used for pasting the one-time authorization code). */
75
96
  function promptLineSync(question) {
97
+ if (nonInteractive)
98
+ throw new NonInteractiveError();
76
99
  process.stderr.write(question);
77
100
  const buf = Buffer.alloc(1);
78
101
  let result = '';
@@ -112,6 +135,8 @@ function promptLineWithDefaultSync(question, defaultValue) {
112
135
  }
113
136
  /** Masked input where the terminal supports raw mode; falls back to visible input otherwise (piped stdin, CI). */
114
137
  function promptHiddenSync(question) {
138
+ if (nonInteractive)
139
+ throw new NonInteractiveError();
115
140
  const stdin = process.stdin;
116
141
  if (!stdin.isTTY || typeof stdin.setRawMode !== 'function') {
117
142
  return promptLineSync(question);