llm-relay 0.44.0 → 0.46.0
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/README.md +1 -0
- package/dist/authEnv.d.ts +20 -12
- package/dist/authEnv.js +76 -36
- package/dist/authEnv.js.map +1 -1
- package/dist/backend.d.ts +26 -2
- package/dist/backend.js +79 -9
- package/dist/backend.js.map +1 -1
- package/dist/candidates.d.ts +2 -0
- package/dist/candidates.js +2 -1
- package/dist/candidates.js.map +1 -1
- package/dist/circuit-breaker.d.ts +2 -0
- package/dist/circuit-breaker.js +17 -0
- package/dist/circuit-breaker.js.map +1 -1
- package/dist/cli.d.ts +14 -0
- package/dist/cli.js +193 -5
- package/dist/cli.js.map +1 -1
- package/dist/config.d.ts +4 -3
- package/dist/config.js +87 -7
- package/dist/config.js.map +1 -1
- package/dist/cooldown-clear.d.ts +2 -0
- package/dist/cooldown-clear.js +20 -4
- package/dist/cooldown-clear.js.map +1 -1
- package/dist/credential-fleet.d.ts +5 -4
- package/dist/credential-fleet.js +9 -9
- package/dist/credential-fleet.js.map +1 -1
- package/dist/dialect-stream.d.ts +2 -1
- package/dist/dialect-stream.js +31 -3
- package/dist/dialect-stream.js.map +1 -1
- package/dist/dotenv.d.ts +2 -0
- package/dist/dotenv.js +9 -0
- package/dist/dotenv.js.map +1 -1
- package/dist/key-checker.d.ts +1 -0
- package/dist/key-checker.js +3 -2
- package/dist/key-checker.js.map +1 -1
- package/dist/key-import.d.ts +7 -0
- package/dist/key-import.js +52 -0
- package/dist/key-import.js.map +1 -1
- package/dist/keys-cli.d.ts +48 -0
- package/dist/keys-cli.js +693 -0
- package/dist/keys-cli.js.map +1 -0
- package/dist/keystore.d.ts +130 -0
- package/dist/keystore.js +1195 -0
- package/dist/keystore.js.map +1 -0
- package/dist/openai-dialect.d.ts +9 -2
- package/dist/openai-dialect.js +30 -9
- package/dist/openai-dialect.js.map +1 -1
- package/dist/os-keyring.d.ts +88 -0
- package/dist/os-keyring.js +476 -0
- package/dist/os-keyring.js.map +1 -0
- package/dist/registry.d.ts +2 -1
- package/dist/registry.js +1 -0
- package/dist/registry.js.map +1 -1
- package/dist/resolved-attempt.d.ts +2 -1
- package/dist/resolved-attempt.js +3 -2
- package/dist/resolved-attempt.js.map +1 -1
- package/dist/routes/admin.js +8 -1
- package/dist/routes/admin.js.map +1 -1
- package/dist/secret-file-acl.d.ts +47 -12
- package/dist/secret-file-acl.js +151 -16
- package/dist/secret-file-acl.js.map +1 -1
- package/dist/server.d.ts +1 -0
- package/dist/server.js +12 -2
- package/dist/server.js.map +1 -1
- package/dist/stream-commit.d.ts +7 -0
- package/dist/stream-commit.js +36 -21
- package/dist/stream-commit.js.map +1 -1
- package/dist/target-facts.d.ts +5 -0
- package/dist/target-facts.js +10 -3
- package/dist/target-facts.js.map +1 -1
- package/dist/tool-dialects.d.ts +68 -1
- package/dist/tool-dialects.js +41 -1
- package/dist/tool-dialects.js.map +1 -1
- package/package.json +1 -1
package/dist/dialect-stream.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { emitSseTail } from "./emitSse.js";
|
|
2
|
-
import { markerStart, recoverToolCalls, scanForMarker } from "./tool-dialects.js";
|
|
2
|
+
import { DIALECT_REFUSED_DESTRUCTIVE_CODE, describeRefused, markerStart, recoverToolCalls, scanForMarker } from "./tool-dialects.js";
|
|
3
3
|
function parseEvent(block) {
|
|
4
4
|
if (!block.trim())
|
|
5
5
|
return null;
|
|
@@ -29,7 +29,7 @@ function placeholders(count) {
|
|
|
29
29
|
* blocks. `schemas` types the recovered parameters; without it they stay strings and the validator
|
|
30
30
|
* reports the type error, which is the correct visible failure rather than a silent coercion.
|
|
31
31
|
*/
|
|
32
|
-
export function recoverDialectInStream(upstream, schemas) {
|
|
32
|
+
export function recoverDialectInStream(upstream, schemas, isDestructive, refusalSignal) {
|
|
33
33
|
const decoder = new TextDecoder();
|
|
34
34
|
const encoder = new TextEncoder();
|
|
35
35
|
let buffered = ""; // incomplete SSE tail between chunks
|
|
@@ -43,7 +43,16 @@ export function recoverDialectInStream(upstream, schemas) {
|
|
|
43
43
|
async start(controller) {
|
|
44
44
|
const push = (s) => controller.enqueue(encoder.encode(s));
|
|
45
45
|
const reader = upstream.getReader();
|
|
46
|
+
let finished = false;
|
|
46
47
|
const finish = () => {
|
|
48
|
+
// ⚠ `finish()` is reached twice on any capture that also sees `message_stop` — once there,
|
|
49
|
+
// once after the read loop — and `capturing` is never cleared. Without this guard every
|
|
50
|
+
// branch emitted twice: two `error` frames, or a recovered tail duplicated down to a second
|
|
51
|
+
// `tu_recovered_0`, i.e. exactly the repeated tool_use id `tool-use-ids.ts` exists to
|
|
52
|
+
// prevent. `openai-dialect.ts` `settleChoice` has had the equivalent guard all along.
|
|
53
|
+
if (finished)
|
|
54
|
+
return;
|
|
55
|
+
finished = true;
|
|
47
56
|
if (!capturing) {
|
|
48
57
|
// Flush any holdback that never became a marker.
|
|
49
58
|
if (blockText.length > emittedLen) {
|
|
@@ -52,7 +61,7 @@ export function recoverDialectInStream(upstream, schemas) {
|
|
|
52
61
|
}
|
|
53
62
|
return;
|
|
54
63
|
}
|
|
55
|
-
const out = recoverToolCalls(envelope, schemas);
|
|
64
|
+
const out = recoverToolCalls(envelope, schemas, isDestructive);
|
|
56
65
|
if (out.status === "parsed") {
|
|
57
66
|
// Close the text block we withheld from, then emit the recovered calls as the tail.
|
|
58
67
|
push(sseEvent("content_block_stop", { index: blockIndex }));
|
|
@@ -71,6 +80,25 @@ export function recoverDialectInStream(upstream, schemas) {
|
|
|
71
80
|
push(emitSseTail(msg, blockIndex + 1));
|
|
72
81
|
return;
|
|
73
82
|
}
|
|
83
|
+
// The envelope parsed, but a recovered call names a tool the operator listed as
|
|
84
|
+
// destructive. Refuse it whole instead of committing it: rescue is the relay deciding that
|
|
85
|
+
// model TEXT is a tool call, and doing that for `Bash`/`Write`/`Edit` is the fabrication
|
|
86
|
+
// "refused, never fabricated" forbids. The head is already flushed on this path, so the
|
|
87
|
+
// announcement is the error event — the same shape the unparseable case uses, with its own
|
|
88
|
+
// code so the two are distinguishable.
|
|
89
|
+
if (out.status === "refused-destructive") {
|
|
90
|
+
// Declared provenance: only this wrapper may mark the refusal as the relay's, because
|
|
91
|
+
// only it knows it wrote the event. `stream-commit.ts` will not read the wire code alone.
|
|
92
|
+
if (refusalSignal)
|
|
93
|
+
refusalSignal.refused = true;
|
|
94
|
+
push(sseEvent("error", {
|
|
95
|
+
error: {
|
|
96
|
+
type: DIALECT_REFUSED_DESTRUCTIVE_CODE,
|
|
97
|
+
message: `llm-relay: refused a ${out.dialect} tool call recovered from text because it names a destructive tool: ${describeRefused(out.refused)}`,
|
|
98
|
+
},
|
|
99
|
+
}));
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
74
102
|
// Detected but unparseable — truncated, or a variant we do not model. Fail clean MID-STREAM
|
|
75
103
|
// rather than releasing the fragment: the client cannot tell a broken tool-call tail from a
|
|
76
104
|
// final answer, which is precisely what made this read as "the job died". CLAUDE.md's rule
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dialect-stream.js","sourceRoot":"","sources":["../src/dialect-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"dialect-stream.js","sourceRoot":"","sources":["../src/dialect-stream.ts"],"names":[],"mappings":"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"}
|
package/dist/dotenv.d.ts
CHANGED
|
@@ -8,5 +8,7 @@ export interface DotEnvResult {
|
|
|
8
8
|
/** Parse `KEY=value` lines. Ignores blanks and `#` comments; strips one layer of quotes. */
|
|
9
9
|
export declare function parseDotEnv(text: string): Record<string, string>;
|
|
10
10
|
export declare function defaultEnvPath(): string;
|
|
11
|
+
/** Display-only provenance for credential resolution; never a precedence input. */
|
|
12
|
+
export declare function wasEnvNameLoadedFromFile(name: string): boolean;
|
|
11
13
|
/** Merge the env file into `env`, never overwriting a variable that is already set. */
|
|
12
14
|
export declare function loadEnvFile(path?: string, env?: NodeJS.ProcessEnv): DotEnvResult;
|
package/dist/dotenv.js
CHANGED
|
@@ -14,6 +14,7 @@ import { readFileSync, existsSync } from "node:fs";
|
|
|
14
14
|
import { homedir } from "node:os";
|
|
15
15
|
import { join } from "node:path";
|
|
16
16
|
import { keyIsPresent } from "./authEnv.js";
|
|
17
|
+
const loadedIntoProcessEnv = new Set();
|
|
17
18
|
/** Parse `KEY=value` lines. Ignores blanks and `#` comments; strips one layer of quotes. */
|
|
18
19
|
export function parseDotEnv(text) {
|
|
19
20
|
const out = {};
|
|
@@ -39,8 +40,14 @@ export function parseDotEnv(text) {
|
|
|
39
40
|
export function defaultEnvPath() {
|
|
40
41
|
return join(homedir(), ".llm-relay", ".env");
|
|
41
42
|
}
|
|
43
|
+
/** Display-only provenance for credential resolution; never a precedence input. */
|
|
44
|
+
export function wasEnvNameLoadedFromFile(name) {
|
|
45
|
+
return loadedIntoProcessEnv.has(name);
|
|
46
|
+
}
|
|
42
47
|
/** Merge the env file into `env`, never overwriting a variable that is already set. */
|
|
43
48
|
export function loadEnvFile(path = defaultEnvPath(), env = process.env) {
|
|
49
|
+
if (env === process.env)
|
|
50
|
+
loadedIntoProcessEnv.clear();
|
|
44
51
|
const result = { path, loaded: [], skipped: [] };
|
|
45
52
|
if (!existsSync(path))
|
|
46
53
|
return result;
|
|
@@ -62,6 +69,8 @@ export function loadEnvFile(path = defaultEnvPath(), env = process.env) {
|
|
|
62
69
|
}
|
|
63
70
|
env[k] = v;
|
|
64
71
|
result.loaded.push(k);
|
|
72
|
+
if (env === process.env)
|
|
73
|
+
loadedIntoProcessEnv.add(k);
|
|
65
74
|
}
|
|
66
75
|
return result;
|
|
67
76
|
}
|
package/dist/dotenv.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dotenv.js","sourceRoot":"","sources":["../src/dotenv.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"dotenv.js","sourceRoot":"","sources":["../src/dotenv.ts"],"names":[],"mappings":"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"}
|
package/dist/key-checker.d.ts
CHANGED
package/dist/key-checker.js
CHANGED
|
@@ -191,10 +191,11 @@ export async function validateProviderKeys(cfg, fetchFn = fetch, opts = {}) {
|
|
|
191
191
|
const entries = Object.entries(cfg.providers);
|
|
192
192
|
const routed = routedModelsByProvider(cfg);
|
|
193
193
|
const budgetMs = opts.budgetMs ?? PROVIDER_CHECK_BUDGET_MS;
|
|
194
|
+
const env = opts.env ?? process.env;
|
|
194
195
|
const checkOne = async (name, p, slot) => {
|
|
195
196
|
const envVarName = slot.authEnv;
|
|
196
197
|
const identity = { credentialId: slot.credentialId, label: slot.label };
|
|
197
|
-
const resolution = resolveCredentialSlot(slot,
|
|
198
|
+
const resolution = resolveCredentialSlot(slot, env);
|
|
198
199
|
const hasEnvKey = resolution.state === "declared-present";
|
|
199
200
|
if (!slot.enabled) {
|
|
200
201
|
return { provider: name, ...identity, authEnv: envVarName, hasEnvKey, status: "disabled", message: "Credential slot is disabled" };
|
|
@@ -348,7 +349,7 @@ export async function validateProviderKeys(cfg, fetchFn = fetch, opts = {}) {
|
|
|
348
349
|
credentialId: slot.credentialId,
|
|
349
350
|
label: slot.label,
|
|
350
351
|
authEnv: slot.authEnv,
|
|
351
|
-
hasEnvKey: resolveCredentialSlot(slot,
|
|
352
|
+
hasEnvKey: resolveCredentialSlot(slot, env).state === "declared-present",
|
|
352
353
|
status: "unreachable",
|
|
353
354
|
message: `No answer within ${budgetMs}ms`,
|
|
354
355
|
}))));
|
package/dist/key-checker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"key-checker.js","sourceRoot":"","sources":["../src/key-checker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"key-checker.js","sourceRoot":"","sources":["../src/key-checker.ts"],"names":[],"mappings":"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"}
|
package/dist/key-import.d.ts
CHANGED
|
@@ -19,6 +19,13 @@ export interface CredentialImportResult {
|
|
|
19
19
|
envPath: string;
|
|
20
20
|
outcomes: CredentialImportOutcome[];
|
|
21
21
|
}
|
|
22
|
+
export interface CredentialImportTarget {
|
|
23
|
+
provider: string;
|
|
24
|
+
envName: string;
|
|
25
|
+
aliases: string[];
|
|
26
|
+
}
|
|
27
|
+
/** Match only the same closed name table used by onboarding imports. */
|
|
28
|
+
export declare function matchCredentialImportName(name: string, cfg?: Config): CredentialImportTarget | undefined;
|
|
22
29
|
/** Parse only the documented FreeLLMAPI v1 export envelope. */
|
|
23
30
|
export declare function parseFreeLlmApiExportJson(text: string): CredentialImportEntry[] | null;
|
|
24
31
|
export declare function parseCredentialImport(text: string): ParsedCredentialImport;
|
package/dist/key-import.js
CHANGED
|
@@ -38,6 +38,58 @@ function importProviders(cfg) {
|
|
|
38
38
|
}
|
|
39
39
|
return result;
|
|
40
40
|
}
|
|
41
|
+
/** Match only the same closed name table used by onboarding imports. */
|
|
42
|
+
export function matchCredentialImportName(name, cfg) {
|
|
43
|
+
const normalized = normalizeName(name);
|
|
44
|
+
if (cfg === undefined) {
|
|
45
|
+
return importProviders().find((candidate) => candidate.aliases.includes(normalized));
|
|
46
|
+
}
|
|
47
|
+
// CLI-to-keystore imports are stricter than legacy onboarding: only declarations in the
|
|
48
|
+
// loaded config can become destinations. The onboarding helper intentionally retains its
|
|
49
|
+
// preset fallback, but using that here would invent an authEnv for keyless/passthrough or
|
|
50
|
+
// fleet-only providers whose slug happens to equal a preset name.
|
|
51
|
+
const exactTargets = [];
|
|
52
|
+
const aliasTargets = [];
|
|
53
|
+
for (const [provider, configured] of Object.entries(cfg.providers)) {
|
|
54
|
+
if (configured.authEnv !== undefined) {
|
|
55
|
+
const aliases = [...new Set([
|
|
56
|
+
...curatedEnvNames(provider),
|
|
57
|
+
...(IMPORT_NAME_ALIASES[provider.toLowerCase()] ?? []),
|
|
58
|
+
].map(normalizeName))];
|
|
59
|
+
const target = { provider, envName: configured.authEnv, aliases };
|
|
60
|
+
if (normalizeName(configured.authEnv) === normalized)
|
|
61
|
+
exactTargets.push(target);
|
|
62
|
+
if (aliases.includes(normalized))
|
|
63
|
+
aliasTargets.push(target);
|
|
64
|
+
continue;
|
|
65
|
+
}
|
|
66
|
+
const slots = configured.credentials ?? [];
|
|
67
|
+
for (const slot of slots) {
|
|
68
|
+
if (normalizeName(slot.authEnv) === normalized) {
|
|
69
|
+
exactTargets.push({ provider, envName: slot.authEnv, aliases: [normalized] });
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
// An exporter often names only the provider. That closed alias is safe when there is one
|
|
73
|
+
// declared destination, but ambiguous fleets require the exact slot authEnv name.
|
|
74
|
+
if (slots.length === 1) {
|
|
75
|
+
const aliases = [...new Set([
|
|
76
|
+
...curatedEnvNames(provider),
|
|
77
|
+
...(IMPORT_NAME_ALIASES[provider.toLowerCase()] ?? []),
|
|
78
|
+
].map(normalizeName))];
|
|
79
|
+
if (aliases.includes(normalized)) {
|
|
80
|
+
aliasTargets.push({ provider, envName: slots[0].authEnv, aliases });
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
// Exact loaded declarations outrank every alias across the whole provider map. Duplicate exact
|
|
85
|
+
// declarations and alias collisions are ambiguous and therefore never select by insertion order.
|
|
86
|
+
if (exactTargets.length === 1)
|
|
87
|
+
return exactTargets[0];
|
|
88
|
+
if (exactTargets.length > 1)
|
|
89
|
+
return undefined;
|
|
90
|
+
const uniqueAliases = [...new Map(aliasTargets.map((target) => [`${target.provider}\0${target.envName}`, target])).values()];
|
|
91
|
+
return uniqueAliases.length === 1 ? uniqueAliases[0] : undefined;
|
|
92
|
+
}
|
|
41
93
|
/** Parse only the documented FreeLLMAPI v1 export envelope. */
|
|
42
94
|
export function parseFreeLlmApiExportJson(text) {
|
|
43
95
|
let parsed;
|
package/dist/key-import.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"key-import.js","sourceRoot":"","sources":["../src/key-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAgCpD;;;;GAIG;AACH,MAAM,mBAAmB,GAA6B;IACpD,MAAM,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,CAAC;IACxD,GAAG,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,CAAC;IAC/C,UAAU,EAAE,CAAC,YAAY,EAAE,gBAAgB,EAAE,iBAAiB,CAAC;IAC/D,IAAI,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC;IAC1B,OAAO,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC;IACnC,QAAQ,EAAE,CAAC,UAAU,EAAE,cAAc,CAAC;IACtC,SAAS,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC;IACzC,MAAM,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC;IAChC,SAAS,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC;CAC1C,CAAC;AAEF,SAAS,aAAa,CAAC,IAAY;IACjC,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AACnC,CAAC;AAED,SAAS,eAAe,CAAC,GAAY;IACnC,MAAM,SAAS,GAAG,GAAG,EAAE,SAAS,IAAI,oBAAoB,CAAC;IACzD,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"key-import.js","sourceRoot":"","sources":["../src/key-import.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import type { Config } from "./config.js";
|
|
2
|
+
import { type KeystoreOptions } from "./keystore.js";
|
|
3
|
+
import { type KeyCheckResult } from "./key-checker.js";
|
|
4
|
+
export type KeysSecretPurpose = "credential" | "keystore-passphrase" | "export-passphrase" | "import-passphrase" | "unlock-passphrase";
|
|
5
|
+
export type KeysSecretReader = (prompt: string, purpose: KeysSecretPurpose) => Promise<string>;
|
|
6
|
+
interface PromptWriter {
|
|
7
|
+
write(value: string): unknown;
|
|
8
|
+
}
|
|
9
|
+
export interface KeysCliDependencies {
|
|
10
|
+
readonly config?: Config;
|
|
11
|
+
readonly keystore?: KeystoreOptions;
|
|
12
|
+
readonly env?: NodeJS.ProcessEnv;
|
|
13
|
+
readonly readSecret?: KeysSecretReader;
|
|
14
|
+
readonly stdin?: NodeJS.ReadStream;
|
|
15
|
+
readonly promptOutput?: PromptWriter;
|
|
16
|
+
readonly write?: (value: string) => void;
|
|
17
|
+
readonly fetch?: typeof fetch;
|
|
18
|
+
readonly keyCheckFetch?: typeof fetch;
|
|
19
|
+
/** Test/embedding seam; production deliberately defaults to the existing key checker. */
|
|
20
|
+
readonly validateKeys?: (cfg: Config, env: NodeJS.ProcessEnv) => Promise<KeyCheckResult[]>;
|
|
21
|
+
readonly envFilePath?: string;
|
|
22
|
+
readonly attachControlHeaders?: (cfg: Config, headers: Record<string, string>) => Record<string, string>;
|
|
23
|
+
}
|
|
24
|
+
export declare class KeysCliError extends Error {
|
|
25
|
+
constructor(message: string);
|
|
26
|
+
}
|
|
27
|
+
export declare const KEY_CUSTODY_THREAT_BOUNDARY: string;
|
|
28
|
+
/**
|
|
29
|
+
* One-line secret input. TTY input is handled by readline in terminal/raw mode while its output
|
|
30
|
+
* is muted after the prompt; closing and every failure path restore the caller's raw-mode state.
|
|
31
|
+
* Each piped prompt consumes one logical line from a shared reader and never prints a prompt.
|
|
32
|
+
*/
|
|
33
|
+
export declare function readMaskedOrPipedLine(prompt: string, input?: NodeJS.ReadStream, output?: PromptWriter): Promise<string>;
|
|
34
|
+
export declare function runKeysAddLocal(cfg: Config, provider: string | undefined, options?: {
|
|
35
|
+
readonly label?: string;
|
|
36
|
+
readonly envName?: string;
|
|
37
|
+
readonly check?: boolean;
|
|
38
|
+
}, deps?: KeysCliDependencies): Promise<void>;
|
|
39
|
+
export declare function runKeysListLocal(cfg: Config, deps?: KeysCliDependencies): void;
|
|
40
|
+
export declare function runKeysRotateLocal(cfg: Config, credential: string | undefined, deps?: KeysCliDependencies): Promise<void>;
|
|
41
|
+
export declare function runKeysRevokeLocal(id: string | undefined, deps?: KeysCliDependencies): void;
|
|
42
|
+
export declare function runKeysRemoveLocal(id: string | undefined, purge: boolean, deps?: KeysCliDependencies): void;
|
|
43
|
+
export declare function runKeysDisableLocal(id: string | undefined, deps?: KeysCliDependencies): void;
|
|
44
|
+
export declare function runKeysEnableLocal(id: string | undefined, deps?: KeysCliDependencies): void;
|
|
45
|
+
export declare function runKeysExportLocal(outPath: string | undefined, deps?: KeysCliDependencies): Promise<void>;
|
|
46
|
+
export declare function runKeysImportLocal(cfg: Config, importPath: string | undefined, deps?: KeysCliDependencies): Promise<void>;
|
|
47
|
+
export declare function runKeysUnlockLocal(deps?: KeysCliDependencies): Promise<void>;
|
|
48
|
+
export {};
|