hikoutei 0.10.13-dev → 0.10.14-dev
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/cli/args.d.ts +19 -0
- package/dist/cli/args.d.ts.map +1 -1
- package/dist/cli/args.js +50 -0
- package/dist/cli/args.js.map +1 -1
- package/dist/cli/checkpoint.d.ts +37 -1
- package/dist/cli/checkpoint.d.ts.map +1 -1
- package/dist/cli/checkpoint.js +94 -14
- package/dist/cli/checkpoint.js.map +1 -1
- package/dist/cli/confirm.d.ts +17 -0
- package/dist/cli/confirm.d.ts.map +1 -1
- package/dist/cli/confirm.js +1 -1
- package/dist/cli/confirm.js.map +1 -1
- package/dist/cli/envFileWriter.d.ts +15 -2
- package/dist/cli/envFileWriter.d.ts.map +1 -1
- package/dist/cli/envFileWriter.js +18 -3
- package/dist/cli/envFileWriter.js.map +1 -1
- package/dist/cli/setup.d.ts +2 -0
- package/dist/cli/setup.d.ts.map +1 -1
- package/dist/cli/setup.js +20 -2
- package/dist/cli/setup.js.map +1 -1
- package/dist/cli/setupFlow.d.ts +67 -0
- package/dist/cli/setupFlow.d.ts.map +1 -1
- package/dist/cli/setupFlow.js +401 -65
- package/dist/cli/setupFlow.js.map +1 -1
- package/dist/cli/setupProgress.d.ts +16 -1
- package/dist/cli/setupProgress.d.ts.map +1 -1
- package/dist/cli/setupProgress.js +47 -1
- package/dist/cli/setupProgress.js.map +1 -1
- package/package.json +1 -1
|
@@ -13,10 +13,12 @@
|
|
|
13
13
|
import { type SetupStateWriteFs } from "./setupPaths.js";
|
|
14
14
|
import { type SetupErrorResult } from "./flowResult.js";
|
|
15
15
|
import type { RunSetupOptions } from "./setupFlow.js";
|
|
16
|
-
/** The
|
|
16
|
+
/** The .env keys the setup CLI manages. */
|
|
17
17
|
export declare const SETUP_ENV_KEYS: {
|
|
18
18
|
readonly CREDENTIALS: "GOOGLE_APPLICATION_CREDENTIALS";
|
|
19
19
|
readonly SPREADSHEET_URL: "HIKOUTEI_SYNC_SPREADSHEET_URL";
|
|
20
|
+
/** Comma-separated credential pool for multi-SA runs (written only when ≥2 paths). */
|
|
21
|
+
readonly CREDENTIAL_POOL: "HIKOUTEI_SYNC_CREDENTIALS";
|
|
20
22
|
};
|
|
21
23
|
/** Result of writing the .env output file. */
|
|
22
24
|
export interface EnvFileWriteResult {
|
|
@@ -28,6 +30,10 @@ export interface EnvFileWriteResult {
|
|
|
28
30
|
/**
|
|
29
31
|
* Writes or updates the .env output file securely and atomically.
|
|
30
32
|
*
|
|
33
|
+
* Updates only the managed env keys (the single-SA credentials path, the
|
|
34
|
+
* spreadsheet URL, and — for multi-SA runs with at least two pool paths —
|
|
35
|
+
* the comma-separated credential pool) while preserving unrelated lines.
|
|
36
|
+
*
|
|
31
37
|
* An existing output must be a regular file at the lstat boundary (a
|
|
32
38
|
* symlink is rejected outright, and directories/FIFOs/devices/sockets are
|
|
33
39
|
* refused before any open so a FIFO can never block), the file is opened
|
|
@@ -50,7 +56,14 @@ export interface EnvFileWriteResult {
|
|
|
50
56
|
* failure or an unsafe existing entry; the caller preserves carrier codes
|
|
51
57
|
* (`SetupPathSafetyError`) and falls back to `output_write_failed` for other errors.
|
|
52
58
|
*/
|
|
53
|
-
export declare function writeSetupEnvFile(outputPath: string, credentialsPath: string, spreadsheetUrl: string, reservedPaths?: readonly string[]
|
|
59
|
+
export declare function writeSetupEnvFile(outputPath: string, credentialsPath: string, spreadsheetUrl: string, reservedPaths?: readonly string[],
|
|
60
|
+
/**
|
|
61
|
+
* Full credential pool (entry 1 first). The pool line is written only
|
|
62
|
+
* when at least two paths are present; single-SA runs never contain it
|
|
63
|
+
* (a stale pool line is removed as a managed key). Paths are joined
|
|
64
|
+
* with commas and no spaces, matching the runtime pool parser.
|
|
65
|
+
*/
|
|
66
|
+
poolPaths?: readonly string[]): EnvFileWriteResult;
|
|
54
67
|
/**
|
|
55
68
|
* Writes content to the output path atomically via a unique private temp.
|
|
56
69
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envFileWriter.d.ts","sourceRoot":"","sources":["../../../../../../src/envFileWriter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAaH,OAAO,EAML,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAe,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAErE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEtD
|
|
1
|
+
{"version":3,"file":"envFileWriter.d.ts","sourceRoot":"","sources":["../../../../../../src/envFileWriter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAaH,OAAO,EAML,KAAK,iBAAiB,EACvB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAe,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAErE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEtD,2CAA2C;AAC3C,eAAO,MAAM,cAAc;;;IAGzB,sFAAsF;;CAE9E,CAAC;AAEX,8CAA8C;AAC9C,MAAM,WAAW,kBAAkB;IACjC,0DAA0D;IAC1D,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,0EAA0E;IAC1E,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B;AAgBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,EACtB,aAAa,GAAE,SAAS,MAAM,EAAO;AACrC;;;;;GAKG;AACH,SAAS,GAAE,SAAS,MAAM,EAAO,GAChC,kBAAkB,CA2BpB;AA4GD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,EAAE,GAAE,iBAA4C,GAC/C,IAAI,CA6EN;AAED;;;;;GAKG;AACH,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AA+B7D;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,eAAe,GAAG,gBAAgB,GAAG,IAAI,CAatF"}
|
|
@@ -17,14 +17,17 @@ import { defaultSetupStateWriteFs, fsyncParentDirectory, noFollowFlag, nonBlockF
|
|
|
17
17
|
import { SETUP_ERROR_CODES, setupPathSafetyError } from "./errors.js";
|
|
18
18
|
import { errorResult } from "./flowResult.js";
|
|
19
19
|
import { findSetupPathCollision } from "./setupPathCollision.js";
|
|
20
|
-
/** The
|
|
20
|
+
/** The .env keys the setup CLI manages. */
|
|
21
21
|
export const SETUP_ENV_KEYS = {
|
|
22
22
|
CREDENTIALS: "GOOGLE_APPLICATION_CREDENTIALS",
|
|
23
23
|
SPREADSHEET_URL: "HIKOUTEI_SYNC_SPREADSHEET_URL",
|
|
24
|
+
/** Comma-separated credential pool for multi-SA runs (written only when ≥2 paths). */
|
|
25
|
+
CREDENTIAL_POOL: "HIKOUTEI_SYNC_CREDENTIALS",
|
|
24
26
|
};
|
|
25
27
|
function isManagedEnvLine(line) {
|
|
26
28
|
return (line.startsWith(`${SETUP_ENV_KEYS.CREDENTIALS}=`) ||
|
|
27
|
-
line.startsWith(`${SETUP_ENV_KEYS.SPREADSHEET_URL}=`)
|
|
29
|
+
line.startsWith(`${SETUP_ENV_KEYS.SPREADSHEET_URL}=`) ||
|
|
30
|
+
line.startsWith(`${SETUP_ENV_KEYS.CREDENTIAL_POOL}=`));
|
|
28
31
|
}
|
|
29
32
|
/** Prefix of the unique per-run private temp file for the .env write. */
|
|
30
33
|
const ENV_TEMP_PREFIX = ".hikoutei-env-";
|
|
@@ -33,6 +36,10 @@ const ENV_FILE_MODE = 0o600;
|
|
|
33
36
|
/**
|
|
34
37
|
* Writes or updates the .env output file securely and atomically.
|
|
35
38
|
*
|
|
39
|
+
* Updates only the managed env keys (the single-SA credentials path, the
|
|
40
|
+
* spreadsheet URL, and — for multi-SA runs with at least two pool paths —
|
|
41
|
+
* the comma-separated credential pool) while preserving unrelated lines.
|
|
42
|
+
*
|
|
36
43
|
* An existing output must be a regular file at the lstat boundary (a
|
|
37
44
|
* symlink is rejected outright, and directories/FIFOs/devices/sockets are
|
|
38
45
|
* refused before any open so a FIFO can never block), the file is opened
|
|
@@ -55,7 +62,14 @@ const ENV_FILE_MODE = 0o600;
|
|
|
55
62
|
* failure or an unsafe existing entry; the caller preserves carrier codes
|
|
56
63
|
* (`SetupPathSafetyError`) and falls back to `output_write_failed` for other errors.
|
|
57
64
|
*/
|
|
58
|
-
export function writeSetupEnvFile(outputPath, credentialsPath, spreadsheetUrl, reservedPaths = []
|
|
65
|
+
export function writeSetupEnvFile(outputPath, credentialsPath, spreadsheetUrl, reservedPaths = [],
|
|
66
|
+
/**
|
|
67
|
+
* Full credential pool (entry 1 first). The pool line is written only
|
|
68
|
+
* when at least two paths are present; single-SA runs never contain it
|
|
69
|
+
* (a stale pool line is removed as a managed key). Paths are joined
|
|
70
|
+
* with commas and no spaces, matching the runtime pool parser.
|
|
71
|
+
*/
|
|
72
|
+
poolPaths = []) {
|
|
59
73
|
const read = readExistingEnvFile(outputPath, [credentialsPath, ...reservedPaths]);
|
|
60
74
|
const existing = read.existing;
|
|
61
75
|
const created = read.created;
|
|
@@ -67,6 +81,7 @@ export function writeSetupEnvFile(outputPath, credentialsPath, spreadsheetUrl, r
|
|
|
67
81
|
...lines.filter((line) => !isManagedEnvLine(line)),
|
|
68
82
|
`${SETUP_ENV_KEYS.CREDENTIALS}=${credentialsPath}`,
|
|
69
83
|
`${SETUP_ENV_KEYS.SPREADSHEET_URL}=${spreadsheetUrl}`,
|
|
84
|
+
...(poolPaths.length >= 2 ? [`${SETUP_ENV_KEYS.CREDENTIAL_POOL}=${poolPaths.join(",")}`] : []),
|
|
70
85
|
];
|
|
71
86
|
const content = `${next.join("\n")}\n`;
|
|
72
87
|
// A mode repair is a modification: an existing file whose owner bits are
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envFileWriter.js","sourceRoot":"","sources":["../../../../../../src/envFileWriter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EACL,SAAS,EACT,SAAS,EACT,SAAS,EACT,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,QAAQ,GACT,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EACL,wBAAwB,EACxB,oBAAoB,EACpB,YAAY,EACZ,YAAY,EACZ,YAAY,GAEb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAAE,WAAW,EAAyB,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAGjE
|
|
1
|
+
{"version":3,"file":"envFileWriter.js","sourceRoot":"","sources":["../../../../../../src/envFileWriter.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/setup.d.ts
CHANGED
|
@@ -27,6 +27,8 @@ export interface RunSetupParams {
|
|
|
27
27
|
readonly outputPath: string;
|
|
28
28
|
readonly statePath: string;
|
|
29
29
|
readonly dryRun: boolean;
|
|
30
|
+
/** Resolved service-account count (1 for single-SA runs). */
|
|
31
|
+
readonly saCount: number;
|
|
30
32
|
}
|
|
31
33
|
/**
|
|
32
34
|
* Runs one setup attempt.
|
package/dist/cli/setup.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../../../../src/setup.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;GAcG;AAKH,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,WAAW,CAAC;AAS9D,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,mBAAmB,CAAC;AAS3B,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,
|
|
1
|
+
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../../../../src/setup.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;GAcG;AAKH,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,WAAW,CAAC;AAS9D,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,mBAAmB,CAAC;AAS3B,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAQL,KAAK,WAAW,EACjB,MAAM,gBAAgB,CAAC;AAExB,0EAA0E;AAC1E,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,6DAA6D;IAC7D,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,MAAM,EAAE,cAAc,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;AAEhF,uEAAuE;AACvE,MAAM,WAAW,QAAS,SAAQ,aAAa,CAAC,MAAM,CAAC;IACrD,2EAA2E;IAC3E,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,4DAA4D;AAC5D,MAAM,WAAW,SAAS;IACxB,4EAA4E;IAC5E,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC;AAED,8DAA8D;AAC9D,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC;AAED,uFAAuF;AACvF,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;IAC/B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,4EAA4E;IAC5E,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC;IACpC,iFAAiF;IACjF,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IACxC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B;;;;;;;OAOG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IACxB;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,uBAAuB,CAAC;IAC5C;;;;;;;;;;;;;;OAcG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;CACrC;AAQD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CAoI9E;AAsCD;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAW1F;AAED;;;;;;;;;;;;GAYG;AACH;;;;GAIG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,IAAI,CAcjD;AAkED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAE3E"}
|
package/dist/cli/setup.js
CHANGED
|
@@ -19,7 +19,7 @@ import { resolve } from "node:path";
|
|
|
19
19
|
import { fileURLToPath } from "node:url";
|
|
20
20
|
import { parseSetupArgs } from "./args.js";
|
|
21
21
|
import { SETUP_STATE_FILE_NAME } from "./checkpoint.js";
|
|
22
|
-
import { confirmSetup, promptLoginHandoff } from "./confirm.js";
|
|
22
|
+
import { confirmSetup, promptLoginHandoff, readOneInputChunk } from "./confirm.js";
|
|
23
23
|
import { SETUP_ARG_ERROR_EXIT_CODE, SETUP_ERROR_CODES, SETUP_RUNTIME_ERROR_EXIT_CODE, } from "./errors.js";
|
|
24
24
|
import { errorResult } from "./flowResult.js";
|
|
25
25
|
import { createGcloudRunner, createInteractiveLoginRunner, } from "./gcloudRunner.js";
|
|
@@ -28,7 +28,7 @@ import { createSaAccessVerifier } from "./saVerify.js";
|
|
|
28
28
|
import { safeReasonOf } from "./sdkError.js";
|
|
29
29
|
import { createHumanSheetApiFactory, } from "./sheetsFactory.js";
|
|
30
30
|
import { createSetupProgressRenderer, isCiEnvironment, } from "./setupProgress.js";
|
|
31
|
-
import { DEFAULT_KEY_FILE_NAME, findSetupPathCollision, formatPlan, formatSummary, runSetup, } from "./setupFlow.js";
|
|
31
|
+
import { DEFAULT_KEY_FILE_NAME, findSetupPathCollision, formatPlan, formatSummary, resolveSaCountForSetup, runSetup, } from "./setupFlow.js";
|
|
32
32
|
/** Auth preflight failures that a fresh `gcloud auth login` can fix. */
|
|
33
33
|
const AUTH_RETRY_CODES = new Set([
|
|
34
34
|
SETUP_ERROR_CODES.GCLOUD_NOT_LOGGED_IN,
|
|
@@ -87,6 +87,22 @@ export async function runSetupCli(context) {
|
|
|
87
87
|
context.stdout.write("Setup aborted. Pass --yes to run without confirmation.\n");
|
|
88
88
|
return SETUP_RUNTIME_ERROR_EXIT_CODE;
|
|
89
89
|
}
|
|
90
|
+
// Service-account count: prompts once on an interactive terminal
|
|
91
|
+
// without --sa-count (TTY, no --yes/--dry-run); every other session
|
|
92
|
+
// uses the flag (default 1) without prompting.
|
|
93
|
+
const saCountResolution = await resolveSaCountForSetup({
|
|
94
|
+
saCount: options.saCount,
|
|
95
|
+
yes: options.yes,
|
|
96
|
+
dryRun: options.dryRun,
|
|
97
|
+
isTTY: context.stdin.isTTY === true && context.stdout.isTTY === true,
|
|
98
|
+
write: (text) => context.stdout.write(text),
|
|
99
|
+
readLine: () => readOneInputChunk(context.stdin),
|
|
100
|
+
});
|
|
101
|
+
if (saCountResolution.status === "invalid") {
|
|
102
|
+
context.stderr.write(`hikoutei-setup:${saCountResolution.failure.code}: ${saCountResolution.failure.message}\n`);
|
|
103
|
+
context.stderr.write("Run `hikoutei setup --help` for usage.\n");
|
|
104
|
+
return SETUP_ARG_ERROR_EXIT_CODE;
|
|
105
|
+
}
|
|
90
106
|
const params = {
|
|
91
107
|
projectId: options.projectId,
|
|
92
108
|
saName: options.saName,
|
|
@@ -95,6 +111,7 @@ export async function runSetupCli(context) {
|
|
|
95
111
|
outputPath,
|
|
96
112
|
statePath,
|
|
97
113
|
dryRun: options.dryRun,
|
|
114
|
+
saCount: saCountResolution.saCount,
|
|
98
115
|
};
|
|
99
116
|
let result = await context.runSetup(params);
|
|
100
117
|
// Interactive login handoff: only the auth preflight failures a fresh
|
|
@@ -288,6 +305,7 @@ async function main(argv = process.argv.slice(2)) {
|
|
|
288
305
|
outputPath: params.outputPath,
|
|
289
306
|
statePath: params.statePath,
|
|
290
307
|
dryRun: params.dryRun,
|
|
308
|
+
saCount: params.saCount,
|
|
291
309
|
progress,
|
|
292
310
|
});
|
|
293
311
|
return runSetupCli({
|
package/dist/cli/setup.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../../../../src/setup.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,cAAc,EAAqB,MAAM,WAAW,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../../../../src/setup.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/setupFlow.d.ts
CHANGED
|
@@ -66,6 +66,7 @@
|
|
|
66
66
|
* available.
|
|
67
67
|
*/
|
|
68
68
|
import { type LockFs } from "./checkpoint.js";
|
|
69
|
+
import { type SetupFailure } from "./errors.js";
|
|
69
70
|
import { type PlannedCommand, type SetupErrorResult } from "./flowResult.js";
|
|
70
71
|
export { writeSetupEnvFile, atomicWritePrivateFile, SETUP_ENV_KEYS } from "./envFileWriter.js";
|
|
71
72
|
export { findSetupPathCollision, type SetupPathCollision } from "./setupPathCollision.js";
|
|
@@ -102,6 +103,16 @@ export interface RunSetupOptions {
|
|
|
102
103
|
/** Absolute setup checkpoint path (`.hikoutei-setup-state.json`). */
|
|
103
104
|
readonly statePath: string;
|
|
104
105
|
readonly dryRun: boolean;
|
|
106
|
+
/**
|
|
107
|
+
* Service accounts to provision as a credential pool. Defaults to 1
|
|
108
|
+
* (single-SA behavior, unchanged); N > 1 provisions `<saName>-<i>`
|
|
109
|
+
* accounts after the primary flow, sharing the same spreadsheet and
|
|
110
|
+
* recorded in `HIKOUTEI_SYNC_CREDENTIALS`. Values outside 1..10 are an
|
|
111
|
+
* `invalid_args` usage error. Resuming with a smaller count keeps every
|
|
112
|
+
* existing pool entry (the pool never shrinks); the summary reports the
|
|
113
|
+
* actual pool size.
|
|
114
|
+
*/
|
|
115
|
+
readonly saCount?: number;
|
|
105
116
|
/**
|
|
106
117
|
* Optional progress sink for the CLI renderer. When omitted the run is
|
|
107
118
|
* unaffected; when present a throwing callback is swallowed so progress
|
|
@@ -152,6 +163,16 @@ export interface SetupSummary {
|
|
|
152
163
|
readonly saWriterRole: ShareOutcome["writerRole"] | "unchanged";
|
|
153
164
|
/** True when this run resumed from an existing checkpoint. */
|
|
154
165
|
readonly resumed: boolean;
|
|
166
|
+
/** Provisioned pool size (1 for single-SA runs). */
|
|
167
|
+
readonly poolSize: number;
|
|
168
|
+
/** Key paths of the provisioned pool, entry 1 first ([keyPath] for N=1). */
|
|
169
|
+
readonly poolPaths: readonly string[];
|
|
170
|
+
/**
|
|
171
|
+
* Pool entries kept from a previous run (absent/0 for fresh runs and
|
|
172
|
+
* N=1). A resume never removes entries, so resuming with a smaller
|
|
173
|
+
* `--sa-count` reports the actual (larger) pool with this kept count.
|
|
174
|
+
*/
|
|
175
|
+
readonly poolKeptEntries?: number;
|
|
155
176
|
}
|
|
156
177
|
/** Discriminated result of a setup run. */
|
|
157
178
|
export type SetupResult = {
|
|
@@ -227,4 +248,50 @@ export declare function formatSummary(summary: SetupSummary): string;
|
|
|
227
248
|
* material and the access token are never included in messages.
|
|
228
249
|
*/
|
|
229
250
|
export declare function runSetup(options: RunSetupOptions): Promise<SetupResult>;
|
|
251
|
+
/**
|
|
252
|
+
* Derives the key path for pool entry `index` (2-based) next to the
|
|
253
|
+
* primary key path, mirroring the primary naming: `name-2.json` beside
|
|
254
|
+
* `name.json` (or `name-2` beside an extensionless `name`). The directory
|
|
255
|
+
* is preserved and no existing file is ever touched here.
|
|
256
|
+
*/
|
|
257
|
+
export declare function poolKeyPath(primaryKeyPath: string, index: number): string;
|
|
258
|
+
/** Prompt text for the interactive service-account count question. */
|
|
259
|
+
export declare const SA_COUNT_PROMPT = "Service accounts to create? [1]: ";
|
|
260
|
+
/** Reads one line of prompt input; null on end-of-input. Injectable for tests. */
|
|
261
|
+
export type SaCountLineReader = () => Promise<string | null>;
|
|
262
|
+
/** Inputs for resolving the service-account count of a run. */
|
|
263
|
+
export interface ResolveSaCountOptions {
|
|
264
|
+
/** Parsed `--sa-count` value, or undefined when the flag was not given. */
|
|
265
|
+
readonly saCount: number | undefined;
|
|
266
|
+
readonly yes: boolean;
|
|
267
|
+
readonly dryRun: boolean;
|
|
268
|
+
/** True when the session is an interactive terminal (stdin and stdout TTY). */
|
|
269
|
+
readonly isTTY: boolean;
|
|
270
|
+
/** Writes the prompt text; required when prompting. */
|
|
271
|
+
readonly write?: (text: string) => void;
|
|
272
|
+
/** Reads one input line; required when prompting. */
|
|
273
|
+
readonly readLine?: SaCountLineReader;
|
|
274
|
+
}
|
|
275
|
+
/** Outcome of resolving the service-account count of a run. */
|
|
276
|
+
export type SaCountResolution = {
|
|
277
|
+
readonly status: "ok";
|
|
278
|
+
readonly saCount: number;
|
|
279
|
+
} | {
|
|
280
|
+
readonly status: "invalid";
|
|
281
|
+
readonly failure: SetupFailure;
|
|
282
|
+
};
|
|
283
|
+
/**
|
|
284
|
+
* Resolves how many service accounts to provision.
|
|
285
|
+
*
|
|
286
|
+
* `--yes`, `--dry-run`, and non-TTY sessions never prompt and use the
|
|
287
|
+
* flag (default 1). An interactive TTY session without `--sa-count` asks
|
|
288
|
+
* once (`Service accounts to create? [1]: `): an empty answer means 1, a
|
|
289
|
+
* valid 1..10 integer wins, and invalid input re-asks exactly once before
|
|
290
|
+
* failing with an `invalid_args` usage error. End-of-input on the first
|
|
291
|
+
* read counts as empty (1); end-of-input on the re-ask fails closed with
|
|
292
|
+
* an `invalid_args` usage error (a typo followed by Ctrl-D must never
|
|
293
|
+
* silently provision 1). A missing line reader degrades to the default
|
|
294
|
+
* without prompting.
|
|
295
|
+
*/
|
|
296
|
+
export declare function resolveSaCountForSetup(options: ResolveSaCountOptions): Promise<SaCountResolution>;
|
|
230
297
|
//# sourceMappingURL=setupFlow.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupFlow.d.ts","sourceRoot":"","sources":["../../../../../../src/setupFlow.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkEG;
|
|
1
|
+
{"version":3,"file":"setupFlow.d.ts","sourceRoot":"","sources":["../../../../../../src/setupFlow.ts"],"names":[],"mappings":"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"}
|