@laburen/delta-cli 0.0.0-stage → 0.2.0-canary.10
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/LICENSE +21 -0
- package/README.md +33 -2
- package/dist/bin.d.ts +2 -0
- package/dist/bin.js +20 -0
- package/dist/bin.js.map +1 -0
- package/dist/commands/agent-checks.d.ts +5 -0
- package/dist/commands/agent-checks.js +69 -0
- package/dist/commands/agent-checks.js.map +1 -0
- package/dist/commands/agent-run/body.d.ts +22 -0
- package/dist/commands/agent-run/body.js +88 -0
- package/dist/commands/agent-run/body.js.map +1 -0
- package/dist/commands/agent-run/render.d.ts +50 -0
- package/dist/commands/agent-run/render.js +281 -0
- package/dist/commands/agent-run/render.js.map +1 -0
- package/dist/commands/agent-run.d.ts +10 -0
- package/dist/commands/agent-run.js +243 -0
- package/dist/commands/agent-run.js.map +1 -0
- package/dist/commands/agent-tools/add.d.ts +5 -0
- package/dist/commands/agent-tools/add.js +101 -0
- package/dist/commands/agent-tools/add.js.map +1 -0
- package/dist/commands/agent-tools/remove.d.ts +5 -0
- package/dist/commands/agent-tools/remove.js +126 -0
- package/dist/commands/agent-tools/remove.js.map +1 -0
- package/dist/commands/agent-tools/shared.d.ts +283 -0
- package/dist/commands/agent-tools/shared.js +107 -0
- package/dist/commands/agent-tools/shared.js.map +1 -0
- package/dist/commands/agent-tools.d.ts +5 -0
- package/dist/commands/agent-tools.js +11 -0
- package/dist/commands/agent-tools.js.map +1 -0
- package/dist/commands/auth.d.ts +14 -0
- package/dist/commands/auth.js +171 -0
- package/dist/commands/auth.js.map +1 -0
- package/dist/commands/completion.d.ts +4 -0
- package/dist/commands/completion.js +50 -0
- package/dist/commands/completion.js.map +1 -0
- package/dist/commands/config-sources.d.ts +22 -0
- package/dist/commands/config-sources.js +46 -0
- package/dist/commands/config-sources.js.map +1 -0
- package/dist/commands/config-wizard.d.ts +9 -0
- package/dist/commands/config-wizard.js +332 -0
- package/dist/commands/config-wizard.js.map +1 -0
- package/dist/commands/orgs.d.ts +11 -0
- package/dist/commands/orgs.js +193 -0
- package/dist/commands/orgs.js.map +1 -0
- package/dist/commands/skill-dir.d.ts +18 -0
- package/dist/commands/skill-dir.js +101 -0
- package/dist/commands/skill-dir.js.map +1 -0
- package/dist/commands/token-notice.d.ts +4 -0
- package/dist/commands/token-notice.js +13 -0
- package/dist/commands/token-notice.js.map +1 -0
- package/dist/commands/whoami.d.ts +8 -0
- package/dist/commands/whoami.js +38 -0
- package/dist/commands/whoami.js.map +1 -0
- package/dist/commands/wizards.d.ts +4 -0
- package/dist/commands/wizards.js +210 -0
- package/dist/commands/wizards.js.map +1 -0
- package/dist/completion/bash.d.ts +3 -0
- package/dist/completion/bash.js +60 -0
- package/dist/completion/bash.js.map +1 -0
- package/dist/completion/files.d.ts +35 -0
- package/dist/completion/files.js +178 -0
- package/dist/completion/files.js.map +1 -0
- package/dist/completion/powershell.d.ts +9 -0
- package/dist/completion/powershell.js +83 -0
- package/dist/completion/powershell.js.map +1 -0
- package/dist/completion/tree.d.ts +25 -0
- package/dist/completion/tree.js +53 -0
- package/dist/completion/tree.js.map +1 -0
- package/dist/completion/zsh.d.ts +3 -0
- package/dist/completion/zsh.js +76 -0
- package/dist/completion/zsh.js.map +1 -0
- package/dist/config/auth.d.ts +26 -0
- package/dist/config/auth.js +223 -0
- package/dist/config/auth.js.map +1 -0
- package/dist/config/link.d.ts +16 -0
- package/dist/config/link.js +93 -0
- package/dist/config/link.js.map +1 -0
- package/dist/config/paths.d.ts +3 -0
- package/dist/config/paths.js +20 -0
- package/dist/config/paths.js.map +1 -0
- package/dist/config/settings.d.ts +8 -0
- package/dist/config/settings.js +24 -0
- package/dist/config/settings.js.map +1 -0
- package/dist/confirm.d.ts +35 -0
- package/dist/confirm.js +51 -0
- package/dist/confirm.js.map +1 -0
- package/dist/context.d.ts +29 -0
- package/dist/context.js +16 -0
- package/dist/context.js.map +1 -0
- package/dist/errors.d.ts +54 -0
- package/dist/errors.js +413 -0
- package/dist/errors.js.map +1 -0
- package/dist/generated/commands.d.ts +49 -0
- package/dist/generated/commands.js +52 -0
- package/dist/generated/commands.js.map +1 -0
- package/dist/generated/schemas.d.ts +5 -0
- package/dist/generated/schemas.js +20 -0
- package/dist/generated/schemas.js.map +1 -0
- package/dist/invocation.d.ts +64 -0
- package/dist/invocation.js +341 -0
- package/dist/invocation.js.map +1 -0
- package/dist/mode.d.ts +17 -0
- package/dist/mode.js +22 -0
- package/dist/mode.js.map +1 -0
- package/dist/operations/call.d.ts +6 -0
- package/dist/operations/call.js +17 -0
- package/dist/operations/call.js.map +1 -0
- package/dist/operations/extensions.d.ts +46 -0
- package/dist/operations/extensions.js +29 -0
- package/dist/operations/extensions.js.map +1 -0
- package/dist/operations/json-input.d.ts +7 -0
- package/dist/operations/json-input.js +50 -0
- package/dist/operations/json-input.js.map +1 -0
- package/dist/operations/params.d.ts +17 -0
- package/dist/operations/params.js +106 -0
- package/dist/operations/params.js.map +1 -0
- package/dist/operations/register.d.ts +10 -0
- package/dist/operations/register.js +102 -0
- package/dist/operations/register.js.map +1 -0
- package/dist/operations/run-operation.d.ts +8 -0
- package/dist/operations/run-operation.js +148 -0
- package/dist/operations/run-operation.js.map +1 -0
- package/dist/operations/schema-flag.d.ts +8 -0
- package/dist/operations/schema-flag.js +12 -0
- package/dist/operations/schema-flag.js.map +1 -0
- package/dist/operations/skeleton.d.ts +16 -0
- package/dist/operations/skeleton.js +116 -0
- package/dist/operations/skeleton.js.map +1 -0
- package/dist/operations/tables.d.ts +7 -0
- package/dist/operations/tables.js +131 -0
- package/dist/operations/tables.js.map +1 -0
- package/dist/operations.d.ts +5 -0
- package/dist/operations.js +7 -0
- package/dist/operations.js.map +1 -0
- package/dist/output.d.ts +33 -0
- package/dist/output.js +321 -0
- package/dist/output.js.map +1 -0
- package/dist/pickers.d.ts +51 -0
- package/dist/pickers.js +277 -0
- package/dist/pickers.js.map +1 -0
- package/dist/program.d.ts +31 -0
- package/dist/program.js +260 -0
- package/dist/program.js.map +1 -0
- package/dist/prompter.d.ts +54 -0
- package/dist/prompter.js +129 -0
- package/dist/prompter.js.map +1 -0
- package/dist/session.d.ts +45 -0
- package/dist/session.js +170 -0
- package/dist/session.js.map +1 -0
- package/dist/stdout-policy.d.ts +4 -0
- package/dist/stdout-policy.js +11 -0
- package/dist/stdout-policy.js.map +1 -0
- package/dist/update-check.d.ts +4 -0
- package/dist/update-check.js +60 -0
- package/dist/update-check.js.map +1 -0
- package/docs/SKILL.md +175 -0
- package/docs/references/auth-and-organizations.md +72 -0
- package/docs/references/commands.md +217 -0
- package/docs/references/output-and-errors.md +105 -0
- package/package.json +39 -5
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import type { CliContext } from "./context.js";
|
|
2
|
+
import { CliError } from "./errors.js";
|
|
3
|
+
import type { Mode } from "./mode.js";
|
|
4
|
+
/** Una opción de una lista: `value` es lo que se devuelve (un id o un valor del contrato). */
|
|
5
|
+
export interface PromptOption {
|
|
6
|
+
value: string;
|
|
7
|
+
label: string;
|
|
8
|
+
hint?: string;
|
|
9
|
+
}
|
|
10
|
+
/** Las preguntas que puede hacer la CLI; cancelar (Ctrl-C, Esc, Ctrl-D) lanza `CliError("cancelled")`. */
|
|
11
|
+
export interface Prompter {
|
|
12
|
+
select(params: {
|
|
13
|
+
message: string;
|
|
14
|
+
options: PromptOption[];
|
|
15
|
+
initialValue?: string;
|
|
16
|
+
}): Promise<string>;
|
|
17
|
+
multiselect(params: {
|
|
18
|
+
message: string;
|
|
19
|
+
options: PromptOption[];
|
|
20
|
+
initialValues?: string[];
|
|
21
|
+
required?: boolean;
|
|
22
|
+
}): Promise<string[]>;
|
|
23
|
+
confirm(params: {
|
|
24
|
+
message: string;
|
|
25
|
+
initialValue?: boolean;
|
|
26
|
+
}): Promise<boolean>;
|
|
27
|
+
text(params: {
|
|
28
|
+
message: string;
|
|
29
|
+
placeholder?: string;
|
|
30
|
+
initialValue?: string;
|
|
31
|
+
validate?: (value: string) => string | undefined;
|
|
32
|
+
}): Promise<string>;
|
|
33
|
+
}
|
|
34
|
+
/** Con más opciones que esto el `select` pasa a tener buscador, mostrando esta cantidad por pantalla (C31). */
|
|
35
|
+
export declare const SEARCH_THRESHOLD = 15;
|
|
36
|
+
/** Devuelve si la CLI puede preguntar (C26): ni `--non-interactive`, ni `--json`, ni CI, y stdin y stderr son terminales. */
|
|
37
|
+
export declare function canPrompt(ctx: CliContext, mode: Mode): boolean;
|
|
38
|
+
/** El error de cancelar una pregunta: código 1 y sin `next` (C32). */
|
|
39
|
+
export declare function cancelled(): CliError;
|
|
40
|
+
/** Adapter de clack: dibuja las preguntas en stderr (C25) y lee de `ctx.stdin`; todo texto que dibuja pasa escapado. */
|
|
41
|
+
export declare function clackPrompter(ctx: CliContext): Prompter;
|
|
42
|
+
/** Un ítem de una lista para elegir; `current` lo preselecciona y le suma `(current)` a la etiqueta (C28). */
|
|
43
|
+
export interface Choice extends PromptOption {
|
|
44
|
+
current?: boolean;
|
|
45
|
+
}
|
|
46
|
+
/** Elige un ítem: con uno solo lo toma sin preguntar y avisa cuál por stderr (salvo `alwaysAsk`); con varios pregunta con `select` (C28, C31). */
|
|
47
|
+
export declare function chooseOne(ctx: CliContext, mode: Mode, prompter: Prompter, params: {
|
|
48
|
+
message: string;
|
|
49
|
+
noun: string;
|
|
50
|
+
choices: Choice[];
|
|
51
|
+
alwaysAsk?: boolean;
|
|
52
|
+
/** Preselecciona el primero que no es el actual (al borrar, el actual no se puede). */
|
|
53
|
+
avoidCurrent?: boolean;
|
|
54
|
+
}): Promise<string>;
|
package/dist/prompter.js
ADDED
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
import { autocomplete, confirm, isCancel, multiselect, select, settings, text, } from "@clack/prompts";
|
|
2
|
+
import { CliError } from "./errors.js";
|
|
3
|
+
import { escapeControl, notice } from "./output.js";
|
|
4
|
+
/** Con más opciones que esto el `select` pasa a tener buscador, mostrando esta cantidad por pantalla (C31). */
|
|
5
|
+
export const SEARCH_THRESHOLD = 15;
|
|
6
|
+
/** Devuelve si la CLI puede preguntar (C26): ni `--non-interactive`, ni `--json`, ni CI, y stdin y stderr son terminales. */
|
|
7
|
+
export function canPrompt(ctx, mode) {
|
|
8
|
+
const stderrIsTTY = ctx.stderrIsTTY ?? ctx.stdoutIsTTY;
|
|
9
|
+
return !mode.nonInteractive && !mode.json && !ctx.env.CI && ctx.stdinIsTTY && stderrIsTTY;
|
|
10
|
+
}
|
|
11
|
+
/** El error de cancelar una pregunta: código 1 y sin `next` (C32). */
|
|
12
|
+
export function cancelled() {
|
|
13
|
+
return new CliError("cancelled", "Cancelled.", 1);
|
|
14
|
+
}
|
|
15
|
+
/** Corre una pregunta de clack sobre stdin y stderr; Ctrl-D o el fin de stdin la abortan y cancelar lanza `cancelled`. */
|
|
16
|
+
async function ask(ctx, prompt) {
|
|
17
|
+
const input = (ctx.stdin ?? process.stdin);
|
|
18
|
+
const controller = new AbortController();
|
|
19
|
+
// clack 1.8.1 no trata Ctrl-D: readline cierra y la promesa queda colgada (node sale 13). Ctrl-D cancela en
|
|
20
|
+
// toda pregunta, también en un `text` con algo escrito (no borra hacia adelante como en una shell).
|
|
21
|
+
const onKey = (_s, key) => {
|
|
22
|
+
if (key?.ctrl && key.name === "d")
|
|
23
|
+
controller.abort();
|
|
24
|
+
};
|
|
25
|
+
const onEnd = () => controller.abort();
|
|
26
|
+
input.on("keypress", onKey);
|
|
27
|
+
input.once("end", onEnd);
|
|
28
|
+
if (input.readableEnded)
|
|
29
|
+
controller.abort();
|
|
30
|
+
try {
|
|
31
|
+
const value = await prompt({
|
|
32
|
+
input,
|
|
33
|
+
output: ctx.stderr,
|
|
34
|
+
signal: controller.signal,
|
|
35
|
+
});
|
|
36
|
+
if (isCancel(value))
|
|
37
|
+
throw cancelled();
|
|
38
|
+
return value;
|
|
39
|
+
}
|
|
40
|
+
catch (err) {
|
|
41
|
+
if (controller.signal.aborted && !(err instanceof CliError))
|
|
42
|
+
throw cancelled();
|
|
43
|
+
throw err;
|
|
44
|
+
}
|
|
45
|
+
finally {
|
|
46
|
+
input.off("keypress", onKey);
|
|
47
|
+
input.off("end", onEnd);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* clack 1.8.1: en `confirm`, Esc primero mueve el cursor (cambia No por Yes) y después cancela, así que dibuja "Yes"
|
|
52
|
+
* tachado (Q5). Mientras dura `fn`, Esc cancela por su secuencia (`\x1b`) y no por el nombre que mueve el cursor.
|
|
53
|
+
*/
|
|
54
|
+
async function escapeWithoutToggle(fn) {
|
|
55
|
+
const byName = settings.aliases.get("escape");
|
|
56
|
+
const bySequence = settings.aliases.has("\x1b");
|
|
57
|
+
settings.aliases.delete("escape");
|
|
58
|
+
if (!bySequence)
|
|
59
|
+
settings.aliases.set("\x1b", "cancel");
|
|
60
|
+
try {
|
|
61
|
+
return await fn();
|
|
62
|
+
}
|
|
63
|
+
finally {
|
|
64
|
+
if (byName)
|
|
65
|
+
settings.aliases.set("escape", byName);
|
|
66
|
+
if (!bySequence)
|
|
67
|
+
settings.aliases.delete("\x1b");
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
/** Escapa etiqueta y `hint` de cada opción: suelen venir del servidor (nombres) y clack los dibuja tal cual (R1). */
|
|
71
|
+
function safeOptions(options) {
|
|
72
|
+
return options.map((o) => ({
|
|
73
|
+
value: o.value,
|
|
74
|
+
label: escapeControl(o.label),
|
|
75
|
+
...(o.hint !== undefined && { hint: escapeControl(o.hint) }),
|
|
76
|
+
}));
|
|
77
|
+
}
|
|
78
|
+
/** Adapter de clack: dibuja las preguntas en stderr (C25) y lee de `ctx.stdin`; todo texto que dibuja pasa escapado. */
|
|
79
|
+
export function clackPrompter(ctx) {
|
|
80
|
+
return {
|
|
81
|
+
select: (params) => ask(ctx, (streams) => {
|
|
82
|
+
const safe = {
|
|
83
|
+
...params,
|
|
84
|
+
message: escapeControl(params.message),
|
|
85
|
+
options: safeOptions(params.options),
|
|
86
|
+
};
|
|
87
|
+
return params.options.length > SEARCH_THRESHOLD
|
|
88
|
+
? autocomplete({ ...safe, ...streams, maxItems: SEARCH_THRESHOLD })
|
|
89
|
+
: select({ ...safe, ...streams });
|
|
90
|
+
}),
|
|
91
|
+
multiselect: (params) => ask(ctx, (streams) => multiselect({
|
|
92
|
+
required: false,
|
|
93
|
+
...params,
|
|
94
|
+
message: escapeControl(params.message),
|
|
95
|
+
options: safeOptions(params.options),
|
|
96
|
+
...streams,
|
|
97
|
+
})),
|
|
98
|
+
confirm: (params) => escapeWithoutToggle(() => ask(ctx, (streams) => confirm({ ...params, message: escapeControl(params.message), ...streams }))),
|
|
99
|
+
text: (params) => ask(ctx, (streams) => text({
|
|
100
|
+
...params,
|
|
101
|
+
message: escapeControl(params.message),
|
|
102
|
+
...streams,
|
|
103
|
+
validate: params.validate ? (value) => params.validate?.(value ?? "") : undefined,
|
|
104
|
+
})),
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
/** Elige un ítem: con uno solo lo toma sin preguntar y avisa cuál por stderr (salvo `alwaysAsk`); con varios pregunta con `select` (C28, C31). */
|
|
108
|
+
export async function chooseOne(ctx, mode, prompter, params) {
|
|
109
|
+
const [first, ...rest] = params.choices;
|
|
110
|
+
if (!first)
|
|
111
|
+
throw new Error("chooseOne needs at least one choice");
|
|
112
|
+
if (rest.length === 0 && !params.alwaysAsk) {
|
|
113
|
+
const hint = first.hint ? ` (${escapeControl(first.hint)})` : "";
|
|
114
|
+
notice(ctx, mode, `Only one ${params.noun} available: ${escapeControl(first.label)}${hint}.`);
|
|
115
|
+
return first.value;
|
|
116
|
+
}
|
|
117
|
+
return prompter.select({
|
|
118
|
+
message: params.message,
|
|
119
|
+
initialValue: params.avoidCurrent
|
|
120
|
+
? params.choices.find((c) => !c.current)?.value
|
|
121
|
+
: params.choices.find((c) => c.current)?.value,
|
|
122
|
+
options: params.choices.map((c) => ({
|
|
123
|
+
value: c.value,
|
|
124
|
+
label: c.current ? `${c.label} (current)` : c.label,
|
|
125
|
+
hint: c.hint,
|
|
126
|
+
})),
|
|
127
|
+
});
|
|
128
|
+
}
|
|
129
|
+
//# sourceMappingURL=prompter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prompter.js","sourceRoot":"","sources":["../src/prompter.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import { refreshToken as defaultRefreshToken, type Resources } from "@laburen/delta-sdk/platform";
|
|
2
|
+
import type { CliContext } from "./context.js";
|
|
3
|
+
import { CliError } from "./errors.js";
|
|
4
|
+
import type { Mode } from "./mode.js";
|
|
5
|
+
/** Flags globales que acepta todo comando. */
|
|
6
|
+
export interface GlobalFlags {
|
|
7
|
+
org?: string;
|
|
8
|
+
apiUrl?: string;
|
|
9
|
+
globalConfig?: string;
|
|
10
|
+
json?: boolean;
|
|
11
|
+
color?: boolean;
|
|
12
|
+
nonInteractive?: boolean;
|
|
13
|
+
}
|
|
14
|
+
/** Lo que un comando necesita para llamar a la API: la puerta ya armada y de dónde salió cada dato. */
|
|
15
|
+
export interface Session {
|
|
16
|
+
apiUrl: string;
|
|
17
|
+
configDir: string;
|
|
18
|
+
organization?: string;
|
|
19
|
+
tokenSource: "env" | "file";
|
|
20
|
+
platform: Resources;
|
|
21
|
+
/** El último token que la puerta mandó en un pedido; sirve para saber si otro proceso lo renovó (Q8). */
|
|
22
|
+
lastToken(): string | undefined;
|
|
23
|
+
}
|
|
24
|
+
/** Piezas reemplazables en tests: el `fetch` de la puerta y la función que renueva el token. */
|
|
25
|
+
export interface SessionDeps {
|
|
26
|
+
fetch?: typeof fetch;
|
|
27
|
+
refreshToken?: typeof defaultRefreshToken;
|
|
28
|
+
/** No manda el header de organización (la puerta no tiene otra forma de omitirlo en un pedido); `session.organization` igual se resuelve. */
|
|
29
|
+
omitOrganizationHeader?: boolean;
|
|
30
|
+
/** No busca `link.json` al resolver la organización (lo usa `link`, que lo va a reescribir aunque esté roto). */
|
|
31
|
+
ignoreLink?: boolean;
|
|
32
|
+
/** Si la organización no se puede resolver (link.json roto, mismatch) sigue sin organización en vez de fallar: para comandos que no la mandan. */
|
|
33
|
+
softOrganization?: boolean;
|
|
34
|
+
}
|
|
35
|
+
/** URL de la API (C16): `--api-url` > `LABUREN_API_URL` > la de la puerta, sin barras al final. */
|
|
36
|
+
export declare function resolveApiUrl(ctx: CliContext, flags: GlobalFlags): string;
|
|
37
|
+
/** `login_required` con un `next` de login que conserva la URL y la carpeta de credenciales que se usaron (Q3c). */
|
|
38
|
+
export declare function loginRequired(ctx: CliContext, flags: GlobalFlags, apiUrl: string, message: string): CliError;
|
|
39
|
+
/** Arma la sesión de un comando (C16-C20): URL, token, organización y la puerta lista para llamar. */
|
|
40
|
+
export declare function openSession(ctx: CliContext, flags: GlobalFlags, mode: Mode, deps?: SessionDeps): Promise<Session>;
|
|
41
|
+
/**
|
|
42
|
+
* Devuelve si vale reintentar una vez un pedido que falló con `err` (Q8): la API rechazó un token guardado
|
|
43
|
+
* (`invalid_token`) y auth.json ya tiene otro, porque otro proceso lo renovó. Con `LABUREN_TOKEN` nunca.
|
|
44
|
+
*/
|
|
45
|
+
export declare function tokenRenewedElsewhere(session: Session, err: unknown): Promise<boolean>;
|
package/dist/session.js
ADDED
|
@@ -0,0 +1,170 @@
|
|
|
1
|
+
import { createPlatform, DEFAULT_BASE_URL, refreshToken as defaultRefreshToken, isLaburenApiError, isLaburenOAuthError, } from "@laburen/delta-sdk/platform";
|
|
2
|
+
import { lockWaitNotice, REFRESH_TIMEOUT_MS, readAuth, withAuthLock, writeAuth, } from "./config/auth.js";
|
|
3
|
+
import { findLink } from "./config/link.js";
|
|
4
|
+
import { resolveConfigDir } from "./config/paths.js";
|
|
5
|
+
import { readSettings } from "./config/settings.js";
|
|
6
|
+
import { CliError } from "./errors.js";
|
|
7
|
+
import { commandText, invocationOf, shellQuote, withoutOption } from "./invocation.js";
|
|
8
|
+
/** Margen para renovar antes de que el token venza de verdad. */
|
|
9
|
+
const REFRESH_MARGIN_SECONDS = 60;
|
|
10
|
+
/** URL de la API (C16): `--api-url` > `LABUREN_API_URL` > la de la puerta, sin barras al final. */
|
|
11
|
+
export function resolveApiUrl(ctx, flags) {
|
|
12
|
+
return normalizeApiUrl(flags.apiUrl || ctx.env.LABUREN_API_URL || DEFAULT_BASE_URL);
|
|
13
|
+
}
|
|
14
|
+
function normalizeApiUrl(url) {
|
|
15
|
+
return url.replace(/\/+$/, "");
|
|
16
|
+
}
|
|
17
|
+
/** Errores de OAuth que significan "esta sesión ya no sirve"; el resto (server_error, etc.) no toca las credenciales. */
|
|
18
|
+
const DEAD_SESSION_OAUTH_ERRORS = new Set(["invalid_grant", "invalid_token", "expired_token"]);
|
|
19
|
+
/** `login_required` con un `next` de login que conserva la URL y la carpeta de credenciales que se usaron (Q3c). */
|
|
20
|
+
export function loginRequired(ctx, flags, apiUrl, message) {
|
|
21
|
+
const args = ["laburen", "login"];
|
|
22
|
+
if (apiUrl !== normalizeApiUrl(DEFAULT_BASE_URL))
|
|
23
|
+
args.push("--api-url", shellQuote(apiUrl));
|
|
24
|
+
const configDir = flags.globalConfig || ctx.env.LABUREN_CONFIG_DIR;
|
|
25
|
+
if (configDir)
|
|
26
|
+
args.push("--global-config", shellQuote(configDir));
|
|
27
|
+
return new CliError("login_required", message, 1, [
|
|
28
|
+
{ command: args.join(" "), when: "to sign in and save credentials" },
|
|
29
|
+
]);
|
|
30
|
+
}
|
|
31
|
+
/** Los `next` de un `organization_mismatch` según de dónde vino la organización que no coincide (Q3b). */
|
|
32
|
+
function mismatchNext(ctx, source, value, linked) {
|
|
33
|
+
const relink = {
|
|
34
|
+
command: `laburen link --org ${shellQuote(value)}`,
|
|
35
|
+
when: `to link this folder to ${value} instead`,
|
|
36
|
+
};
|
|
37
|
+
const unlink = {
|
|
38
|
+
command: "laburen unlink",
|
|
39
|
+
when: "to stop using the organization of this folder",
|
|
40
|
+
// `unlink` no usa la organización.
|
|
41
|
+
omitGlobals: ["--org"],
|
|
42
|
+
};
|
|
43
|
+
if (source === "LABUREN_ORG") {
|
|
44
|
+
return [
|
|
45
|
+
{ command: "unset LABUREN_ORG", when: `to use the organization of this folder (${linked})` },
|
|
46
|
+
relink,
|
|
47
|
+
unlink,
|
|
48
|
+
];
|
|
49
|
+
}
|
|
50
|
+
const { args } = invocationOf(ctx);
|
|
51
|
+
const rerun = args.length > 0 ? commandText(withoutOption(args, "--org")) : "laburen <command>";
|
|
52
|
+
return [
|
|
53
|
+
{
|
|
54
|
+
command: rerun,
|
|
55
|
+
when: `to run it without --org, with the organization of this folder (${linked})`,
|
|
56
|
+
omitGlobals: ["--org"],
|
|
57
|
+
},
|
|
58
|
+
relink,
|
|
59
|
+
unlink,
|
|
60
|
+
];
|
|
61
|
+
}
|
|
62
|
+
/** Resuelve la organización (C17): `--org` > `LABUREN_ORG` > link.json > la guardada (solo si se puede preguntar). */
|
|
63
|
+
async function resolveOrganization(ctx, flags, mode, configDir, ignoreLink) {
|
|
64
|
+
const link = ignoreLink ? null : await findLink(ctx.cwd);
|
|
65
|
+
const candidates = [
|
|
66
|
+
["--org", flags.org || undefined],
|
|
67
|
+
["LABUREN_ORG", ctx.env.LABUREN_ORG || undefined],
|
|
68
|
+
];
|
|
69
|
+
for (const [source, value] of candidates) {
|
|
70
|
+
if (value && link && link.link.organization_id !== value) {
|
|
71
|
+
throw new CliError("organization_mismatch", `${source} is ${value}, but ${link.path} points to ${link.link.organization_id}.`, 2, mismatchNext(ctx, source, value, link.link.organization_id));
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
const explicit = candidates.find(([, value]) => value)?.[1];
|
|
75
|
+
if (explicit)
|
|
76
|
+
return explicit;
|
|
77
|
+
if (link)
|
|
78
|
+
return link.link.organization_id;
|
|
79
|
+
if (mode.nonInteractive)
|
|
80
|
+
return undefined;
|
|
81
|
+
return (await readSettings(configDir)).organization_id;
|
|
82
|
+
}
|
|
83
|
+
/** Devuelve un token vigente: el de auth.json, o uno renovado una sola vez bajo lock aunque haya varios procesos. */
|
|
84
|
+
async function validToken(ctx, flags, configDir, apiUrl, refresh) {
|
|
85
|
+
const isFresh = (a) => a.expires_at > ctx.now() / 1000 + REFRESH_MARGIN_SECONDS;
|
|
86
|
+
const current = await readAuth(configDir);
|
|
87
|
+
if (!current || normalizeApiUrl(current.api_url) !== apiUrl)
|
|
88
|
+
throw loginRequired(ctx, flags, apiUrl, `No saved credentials for ${apiUrl}.`);
|
|
89
|
+
if (isFresh(current))
|
|
90
|
+
return current.token;
|
|
91
|
+
return withAuthLock(configDir, async () => {
|
|
92
|
+
// Otro proceso pudo renovar mientras esperábamos el lock: releemos antes de gastar el refresh.
|
|
93
|
+
const latest = await readAuth(configDir);
|
|
94
|
+
if (!latest || normalizeApiUrl(latest.api_url) !== apiUrl)
|
|
95
|
+
throw loginRequired(ctx, flags, apiUrl, `No saved credentials for ${apiUrl}.`);
|
|
96
|
+
if (isFresh(latest))
|
|
97
|
+
return latest.token;
|
|
98
|
+
try {
|
|
99
|
+
const res = await refresh({
|
|
100
|
+
refreshToken: latest.refresh_token,
|
|
101
|
+
baseUrl: apiUrl,
|
|
102
|
+
timeout: REFRESH_TIMEOUT_MS,
|
|
103
|
+
});
|
|
104
|
+
await writeAuth(configDir, {
|
|
105
|
+
token: res.access_token,
|
|
106
|
+
refresh_token: res.refresh_token,
|
|
107
|
+
expires_at: ctx.now() / 1000 + res.expires_in,
|
|
108
|
+
api_url: apiUrl,
|
|
109
|
+
});
|
|
110
|
+
return res.access_token;
|
|
111
|
+
}
|
|
112
|
+
catch (err) {
|
|
113
|
+
if (isLaburenOAuthError(err) && DEAD_SESSION_OAUTH_ERRORS.has(err.error)) {
|
|
114
|
+
throw loginRequired(ctx, flags, apiUrl, `The saved session for ${apiUrl} expired (${err.message}).`);
|
|
115
|
+
}
|
|
116
|
+
throw err;
|
|
117
|
+
}
|
|
118
|
+
}, { onWait: lockWaitNotice(ctx.stderr) });
|
|
119
|
+
}
|
|
120
|
+
/** Arma la sesión de un comando (C16-C20): URL, token, organización y la puerta lista para llamar. */
|
|
121
|
+
export async function openSession(ctx, flags, mode, deps = {}) {
|
|
122
|
+
const apiUrl = resolveApiUrl(ctx, flags);
|
|
123
|
+
const configDir = resolveConfigDir(ctx, flags.globalConfig);
|
|
124
|
+
const envToken = ctx.env.LABUREN_TOKEN || undefined;
|
|
125
|
+
const refresh = deps.refreshToken ?? defaultRefreshToken;
|
|
126
|
+
if (!envToken) {
|
|
127
|
+
// Falla antes de armar la puerta, así un token de otra URL nunca viaja.
|
|
128
|
+
const auth = await readAuth(configDir);
|
|
129
|
+
if (!auth || normalizeApiUrl(auth.api_url) !== apiUrl)
|
|
130
|
+
throw loginRequired(ctx, flags, apiUrl, `No saved credentials for ${apiUrl}.`);
|
|
131
|
+
}
|
|
132
|
+
const organization = await resolveOrganization(ctx, flags, mode, configDir, deps.ignoreLink ?? false).catch((err) => {
|
|
133
|
+
// Un comando que no manda la organización solo la usa para marcar la actual: si no se puede, sigue sin ella.
|
|
134
|
+
if (deps.softOrganization && err instanceof CliError)
|
|
135
|
+
return undefined;
|
|
136
|
+
throw err;
|
|
137
|
+
});
|
|
138
|
+
let lastToken;
|
|
139
|
+
const token = async () => {
|
|
140
|
+
lastToken = envToken ?? (await validToken(ctx, flags, configDir, apiUrl, refresh));
|
|
141
|
+
return lastToken;
|
|
142
|
+
};
|
|
143
|
+
const platform = createPlatform({
|
|
144
|
+
token,
|
|
145
|
+
organization: deps.omitOrganizationHeader ? undefined : organization,
|
|
146
|
+
baseUrl: apiUrl,
|
|
147
|
+
fetch: deps.fetch,
|
|
148
|
+
});
|
|
149
|
+
return {
|
|
150
|
+
apiUrl,
|
|
151
|
+
configDir,
|
|
152
|
+
organization,
|
|
153
|
+
tokenSource: envToken ? "env" : "file",
|
|
154
|
+
platform,
|
|
155
|
+
lastToken: () => lastToken,
|
|
156
|
+
};
|
|
157
|
+
}
|
|
158
|
+
/**
|
|
159
|
+
* Devuelve si vale reintentar una vez un pedido que falló con `err` (Q8): la API rechazó un token guardado
|
|
160
|
+
* (`invalid_token`) y auth.json ya tiene otro, porque otro proceso lo renovó. Con `LABUREN_TOKEN` nunca.
|
|
161
|
+
*/
|
|
162
|
+
export async function tokenRenewedElsewhere(session, err) {
|
|
163
|
+
if (session.tokenSource === "env")
|
|
164
|
+
return false;
|
|
165
|
+
if (!isLaburenApiError(err) || err.code !== "invalid_token")
|
|
166
|
+
return false;
|
|
167
|
+
const saved = await readAuth(session.configDir);
|
|
168
|
+
return saved !== null && saved.token !== session.lastToken();
|
|
169
|
+
}
|
|
170
|
+
//# sourceMappingURL=session.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,cAAc,EACd,gBAAgB,EAChB,YAAY,IAAI,mBAAmB,EACnC,iBAAiB,EACjB,mBAAmB,GAEnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEN,cAAc,EACd,kBAAkB,EAClB,QAAQ,EACR,YAAY,EACZ,SAAS,GACT,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAoCvF,iEAAiE;AACjE,MAAM,sBAAsB,GAAG,EAAE,CAAC;AAElC,mGAAmG;AACnG,MAAM,UAAU,aAAa,CAAC,GAAe,EAAE,KAAkB;IAChE,OAAO,eAAe,CAAC,KAAK,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,eAAe,IAAI,gBAAgB,CAAC,CAAC;AACrF,CAAC;AAED,SAAS,eAAe,CAAC,GAAW;IACnC,OAAO,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAChC,CAAC;AAED,yHAAyH;AACzH,MAAM,yBAAyB,GAAG,IAAI,GAAG,CAAC,CAAC,eAAe,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC;AAE/F,oHAAoH;AACpH,MAAM,UAAU,aAAa,CAC5B,GAAe,EACf,KAAkB,EAClB,MAAc,EACd,OAAe;IAEf,MAAM,IAAI,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAClC,IAAI,MAAM,KAAK,eAAe,CAAC,gBAAgB,CAAC;QAAE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IAC7F,MAAM,SAAS,GAAG,KAAK,CAAC,YAAY,IAAI,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC;IACnE,IAAI,SAAS;QAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;IACnE,OAAO,IAAI,QAAQ,CAAC,gBAAgB,EAAE,OAAO,EAAE,CAAC,EAAE;QACjD,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,iCAAiC,EAAE;KACpE,CAAC,CAAC;AACJ,CAAC;AAED,0GAA0G;AAC1G,SAAS,YAAY,CAAC,GAAe,EAAE,MAAc,EAAE,KAAa,EAAE,MAAc;IACnF,MAAM,MAAM,GAAG;QACd,OAAO,EAAE,sBAAsB,UAAU,CAAC,KAAK,CAAC,EAAE;QAClD,IAAI,EAAE,0BAA0B,KAAK,UAAU;KAC/C,CAAC;IACF,MAAM,MAAM,GAAG;QACd,OAAO,EAAE,gBAAgB;QACzB,IAAI,EAAE,+CAA+C;QACrD,mCAAmC;QACnC,WAAW,EAAE,CAAC,OAAO,CAAC;KACtB,CAAC;IACF,IAAI,MAAM,KAAK,aAAa,EAAE,CAAC;QAC9B,OAAO;YACN,EAAE,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,2CAA2C,MAAM,GAAG,EAAE;YAC5F,MAAM;YACN,MAAM;SACN,CAAC;IACH,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IACnC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC;IAChG,OAAO;QACN;YACC,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,kEAAkE,MAAM,GAAG;YACjF,WAAW,EAAE,CAAC,OAAO,CAAC;SACtB;QACD,MAAM;QACN,MAAM;KACN,CAAC;AACH,CAAC;AAED,sHAAsH;AACtH,KAAK,UAAU,mBAAmB,CACjC,GAAe,EACf,KAAkB,EAClB,IAAU,EACV,SAAiB,EACjB,UAAmB;IAEnB,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzD,MAAM,UAAU,GAAmC;QAClD,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,IAAI,SAAS,CAAC;QACjC,CAAC,aAAa,EAAE,GAAG,CAAC,GAAG,CAAC,WAAW,IAAI,SAAS,CAAC;KACjD,CAAC;IACF,KAAK,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,UAAU,EAAE,CAAC;QAC1C,IAAI,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe,KAAK,KAAK,EAAE,CAAC;YAC1D,MAAM,IAAI,QAAQ,CACjB,uBAAuB,EACvB,GAAG,MAAM,OAAO,KAAK,SAAS,IAAI,CAAC,IAAI,cAAc,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,EACjF,CAAC,EACD,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAC3D,CAAC;QACH,CAAC;IACF,CAAC;IACD,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5D,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;IAC3C,IAAI,IAAI,CAAC,cAAc;QAAE,OAAO,SAAS,CAAC;IAC1C,OAAO,CAAC,MAAM,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC;AACxD,CAAC;AAED,qHAAqH;AACrH,KAAK,UAAU,UAAU,CACxB,GAAe,EACf,KAAkB,EAClB,SAAiB,EACjB,MAAc,EACd,OAAmC;IAEnC,MAAM,OAAO,GAAG,CAAC,CAAW,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,GAAG,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,sBAAsB,CAAC;IAC1F,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC1C,IAAI,CAAC,OAAO,IAAI,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,MAAM;QAC1D,MAAM,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,4BAA4B,MAAM,GAAG,CAAC,CAAC;IAChF,IAAI,OAAO,CAAC,OAAO,CAAC;QAAE,OAAO,OAAO,CAAC,KAAK,CAAC;IAC3C,OAAO,YAAY,CAClB,SAAS,EACT,KAAK,IAAI,EAAE;QACV,+FAA+F;QAC/F,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,IAAI,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,MAAM;YACxD,MAAM,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,4BAA4B,MAAM,GAAG,CAAC,CAAC;QAChF,IAAI,OAAO,CAAC,MAAM,CAAC;YAAE,OAAO,MAAM,CAAC,KAAK,CAAC;QACzC,IAAI,CAAC;YACJ,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC;gBACzB,YAAY,EAAE,MAAM,CAAC,aAAa;gBAClC,OAAO,EAAE,MAAM;gBACf,OAAO,EAAE,kBAAkB;aAC3B,CAAC,CAAC;YACH,MAAM,SAAS,CAAC,SAAS,EAAE;gBAC1B,KAAK,EAAE,GAAG,CAAC,YAAY;gBACvB,aAAa,EAAE,GAAG,CAAC,aAAa;gBAChC,UAAU,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,GAAG,CAAC,UAAU;gBAC7C,OAAO,EAAE,MAAM;aACf,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,YAAY,CAAC;QACzB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,IAAI,mBAAmB,CAAC,GAAG,CAAC,IAAI,yBAAyB,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC1E,MAAM,aAAa,CAClB,GAAG,EACH,KAAK,EACL,MAAM,EACN,yBAAyB,MAAM,aAAa,GAAG,CAAC,OAAO,IAAI,CAC3D,CAAC;YACH,CAAC;YACD,MAAM,GAAG,CAAC;QACX,CAAC;IACF,CAAC,EACD,EAAE,MAAM,EAAE,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CACtC,CAAC;AACH,CAAC;AAED,sGAAsG;AACtG,MAAM,CAAC,KAAK,UAAU,WAAW,CAChC,GAAe,EACf,KAAkB,EAClB,IAAU,EACV,OAAoB,EAAE;IAEtB,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACzC,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,aAAa,IAAI,SAAS,CAAC;IACpD,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,IAAI,mBAAmB,CAAC;IAEzD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACf,wEAAwE;QACxE,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,CAAC;QACvC,IAAI,CAAC,IAAI,IAAI,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,MAAM;YACpD,MAAM,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,4BAA4B,MAAM,GAAG,CAAC,CAAC;IACjF,CAAC;IACD,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAC7C,GAAG,EACH,KAAK,EACL,IAAI,EACJ,SAAS,EACT,IAAI,CAAC,UAAU,IAAI,KAAK,CACxB,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACf,6GAA6G;QAC7G,IAAI,IAAI,CAAC,gBAAgB,IAAI,GAAG,YAAY,QAAQ;YAAE,OAAO,SAAS,CAAC;QACvE,MAAM,GAAG,CAAC;IACX,CAAC,CAAC,CAAC;IACH,IAAI,SAA6B,CAAC;IAClC,MAAM,KAAK,GAAG,KAAK,IAAI,EAAE;QACxB,SAAS,GAAG,QAAQ,IAAI,CAAC,MAAM,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QACnF,OAAO,SAAS,CAAC;IAClB,CAAC,CAAC;IACF,MAAM,QAAQ,GAAG,cAAc,CAAC;QAC/B,KAAK;QACL,YAAY,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY;QACpE,OAAO,EAAE,MAAM;QACf,KAAK,EAAE,IAAI,CAAC,KAAK;KACjB,CAAC,CAAC;IACH,OAAO;QACN,MAAM;QACN,SAAS;QACT,YAAY;QACZ,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;QACtC,QAAQ;QACR,SAAS,EAAE,GAAG,EAAE,CAAC,SAAS;KAC1B,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAAgB,EAAE,GAAY;IACzE,IAAI,OAAO,CAAC,WAAW,KAAK,KAAK;QAAE,OAAO,KAAK,CAAC;IAChD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,IAAI,KAAK,eAAe;QAAE,OAAO,KAAK,CAAC;IAC1E,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAChD,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,KAAK,KAAK,OAAO,CAAC,SAAS,EAAE,CAAC;AAC9D,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
/** Un comando que sigue útil por stderr con stdout cerrado (el turno en vivo de `agents run`, C24) pide no salir. */
|
|
2
|
+
export declare function keepRunningIfStdoutCloses(): void;
|
|
3
|
+
/** Si el proceso tiene que salir al cerrarse stdout: sí, salvo que un comando haya pedido seguir. */
|
|
4
|
+
export declare function shouldExitOnStdoutClose(): boolean;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/** Qué hace el proceso cuando quien lee stdout cierra el pipe (`| head`). */
|
|
2
|
+
let keepRunning = false;
|
|
3
|
+
/** Un comando que sigue útil por stderr con stdout cerrado (el turno en vivo de `agents run`, C24) pide no salir. */
|
|
4
|
+
export function keepRunningIfStdoutCloses() {
|
|
5
|
+
keepRunning = true;
|
|
6
|
+
}
|
|
7
|
+
/** Si el proceso tiene que salir al cerrarse stdout: sí, salvo que un comando haya pedido seguir. */
|
|
8
|
+
export function shouldExitOnStdoutClose() {
|
|
9
|
+
return !keepRunning;
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=stdout-policy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stdout-policy.js","sourceRoot":"","sources":["../src/stdout-policy.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,IAAI,WAAW,GAAG,KAAK,CAAC;AAExB,qHAAqH;AACrH,MAAM,UAAU,yBAAyB;IACxC,WAAW,GAAG,IAAI,CAAC;AACpB,CAAC;AAED,qGAAqG;AACrG,MAAM,UAAU,uBAAuB;IACtC,OAAO,CAAC,WAAW,CAAC;AACrB,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { CliContext } from "./context.js";
|
|
2
|
+
import type { Mode } from "./mode.js";
|
|
3
|
+
/** Avisa por stderr si hay versión nueva; consulta npm una vez cada 24 horas y ignora cualquier falla. */
|
|
4
|
+
export declare function checkForUpdate(ctx: CliContext, mode: Mode, configDir: string, current: string, fetchFn?: typeof fetch): Promise<void>;
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import { mkdir, readFile, writeFile } from "node:fs/promises";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
import { notice } from "./output.js";
|
|
4
|
+
const REGISTRY_URL = "https://registry.npmjs.org/@laburen/delta-cli/latest";
|
|
5
|
+
const CACHE_FILE = "update-check.json";
|
|
6
|
+
const DAY_MS = 24 * 60 * 60 * 1000;
|
|
7
|
+
const TIMEOUT_MS = 1500;
|
|
8
|
+
/** Compara versiones `x.y.z` (ignora prerelease): true si `a` es mayor que `b`. */
|
|
9
|
+
function isNewer(a, b) {
|
|
10
|
+
const pa = a.split("-")[0]?.split(".").map(Number) ?? [];
|
|
11
|
+
const pb = b.split("-")[0]?.split(".").map(Number) ?? [];
|
|
12
|
+
for (let i = 0; i < 3; i++) {
|
|
13
|
+
const d = (pa[i] ?? 0) - (pb[i] ?? 0);
|
|
14
|
+
if (d !== 0)
|
|
15
|
+
return d > 0;
|
|
16
|
+
}
|
|
17
|
+
return false;
|
|
18
|
+
}
|
|
19
|
+
async function readCache(file) {
|
|
20
|
+
try {
|
|
21
|
+
const c = JSON.parse(await readFile(file, "utf8"));
|
|
22
|
+
return typeof c.checked_at === "number" ? c : null;
|
|
23
|
+
}
|
|
24
|
+
catch {
|
|
25
|
+
return null;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
/** Avisa por stderr si hay versión nueva; consulta npm una vez cada 24 horas y ignora cualquier falla. */
|
|
29
|
+
export async function checkForUpdate(ctx, mode, configDir, current, fetchFn = fetch) {
|
|
30
|
+
if (mode.json || mode.nonInteractive || ctx.env.CI)
|
|
31
|
+
return;
|
|
32
|
+
try {
|
|
33
|
+
const file = join(configDir, CACHE_FILE);
|
|
34
|
+
let cache = await readCache(file);
|
|
35
|
+
if (!cache || ctx.now() - cache.checked_at >= DAY_MS) {
|
|
36
|
+
// Se anota el intento aunque falle, para no pagar el timeout en cada comando sin red.
|
|
37
|
+
cache = { checked_at: ctx.now(), latest: cache?.latest };
|
|
38
|
+
try {
|
|
39
|
+
const res = await fetchFn(REGISTRY_URL, { signal: AbortSignal.timeout(TIMEOUT_MS) });
|
|
40
|
+
if (res.ok) {
|
|
41
|
+
const body = (await res.json());
|
|
42
|
+
if (typeof body.version === "string")
|
|
43
|
+
cache.latest = body.version;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
// Sin red: se sigue con el último `latest` conocido.
|
|
48
|
+
}
|
|
49
|
+
await mkdir(configDir, { recursive: true, mode: 0o700 });
|
|
50
|
+
await writeFile(file, JSON.stringify(cache));
|
|
51
|
+
}
|
|
52
|
+
if (cache.latest && isNewer(cache.latest, current)) {
|
|
53
|
+
notice(ctx, mode, `Update available: ${current} → ${cache.latest}. Run npm i -g @laburen/delta-cli`);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
catch {
|
|
57
|
+
// Un chequeo de versión nunca debe romper un comando.
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
//# sourceMappingURL=update-check.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-check.js","sourceRoot":"","sources":["../src/update-check.ts"],"names":[],"mappings":"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"}
|