@laburen/delta-cli 0.2.0-canary.10 → 0.2.0-canary.9
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/bin.js +2 -6
- package/dist/bin.js.map +1 -1
- package/dist/commands/agent-checks.d.ts +1 -3
- package/dist/commands/agent-checks.js +2 -35
- package/dist/commands/agent-checks.js.map +1 -1
- package/dist/commands/agent-run/render.d.ts +5 -15
- package/dist/commands/agent-run/render.js +15 -25
- package/dist/commands/agent-run/render.js.map +1 -1
- package/dist/commands/agent-run.js +17 -55
- package/dist/commands/agent-run.js.map +1 -1
- package/dist/commands/agent-tools/add.js +5 -26
- package/dist/commands/agent-tools/add.js.map +1 -1
- package/dist/commands/agent-tools/remove.js +2 -2
- package/dist/commands/agent-tools/remove.js.map +1 -1
- package/dist/commands/agent-tools/shared.d.ts +9 -16
- package/dist/commands/agent-tools/shared.js +12 -25
- package/dist/commands/agent-tools/shared.js.map +1 -1
- package/dist/commands/auth.js +2 -12
- package/dist/commands/auth.js.map +1 -1
- package/dist/commands/completion.js +4 -4
- package/dist/commands/completion.js.map +1 -1
- package/dist/commands/orgs.js +2 -16
- package/dist/commands/orgs.js.map +1 -1
- package/dist/commands/skill-dir.js +0 -4
- package/dist/commands/skill-dir.js.map +1 -1
- package/dist/commands/whoami.js +1 -1
- package/dist/commands/whoami.js.map +1 -1
- package/dist/completion/files.d.ts +0 -2
- package/dist/completion/files.js +0 -7
- package/dist/completion/files.js.map +1 -1
- package/dist/config/link.js +8 -27
- package/dist/config/link.js.map +1 -1
- package/dist/context.d.ts +0 -2
- package/dist/context.js +0 -1
- package/dist/context.js.map +1 -1
- package/dist/errors.js +20 -249
- package/dist/errors.js.map +1 -1
- package/dist/generated/commands.d.ts +0 -2
- package/dist/generated/commands.js +7 -7
- package/dist/generated/commands.js.map +1 -1
- package/dist/generated/schemas.js +9 -11
- package/dist/generated/schemas.js.map +1 -1
- package/dist/invocation.js +1 -17
- package/dist/invocation.js.map +1 -1
- package/dist/operations/call.js +1 -4
- package/dist/operations/call.js.map +1 -1
- package/dist/operations/extensions.d.ts +1 -1
- package/dist/operations/params.js +2 -13
- package/dist/operations/params.js.map +1 -1
- package/dist/operations/run-operation.js +7 -9
- package/dist/operations/run-operation.js.map +1 -1
- package/dist/operations/schema-flag.d.ts +1 -1
- package/dist/operations/schema-flag.js.map +1 -1
- package/dist/operations/tables.d.ts +1 -5
- package/dist/operations/tables.js +2 -81
- package/dist/operations/tables.js.map +1 -1
- package/dist/output.d.ts +1 -12
- package/dist/output.js +10 -162
- package/dist/output.js.map +1 -1
- package/dist/program.js +3 -12
- package/dist/program.js.map +1 -1
- package/docs/SKILL.md +7 -74
- package/docs/references/auth-and-organizations.md +3 -3
- package/docs/references/commands.md +17 -48
- package/docs/references/output-and-errors.md +9 -27
- package/package.json +2 -2
- package/dist/stdout-policy.d.ts +0 -4
- package/dist/stdout-policy.js +0 -11
- package/dist/stdout-policy.js.map +0 -1
package/dist/bin.js
CHANGED
|
@@ -1,15 +1,11 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { processContext } from "./context.js";
|
|
3
3
|
import { main } from "./program.js";
|
|
4
|
-
|
|
5
|
-
// Quien lee stdout cerró el pipe (`| head`): se sale con el código que ya tenga el proceso (0 si no falló), así no se
|
|
6
|
-
// siguen haciendo pedidos ni avisos que nadie lee. Excepción: el turno en vivo de `agents run` sigue para dejar el pie
|
|
7
|
-
// por stderr (C24) y lo avisa con `keepRunningIfStdoutCloses`.
|
|
4
|
+
// Quien lee stdout cerró el pipe (`| head`): se sale en silencio con el código que haya, como una CLI de Unix.
|
|
8
5
|
process.stdout.on("error", (err) => {
|
|
9
6
|
if (err.code !== "EPIPE")
|
|
10
7
|
throw err;
|
|
11
|
-
|
|
12
|
-
process.exit(process.exitCode ?? 0);
|
|
8
|
+
process.exit(process.exitCode ?? 0);
|
|
13
9
|
});
|
|
14
10
|
// stderr es solo para avisos: si se cierra, se sigue sin ellos y el comando deja su propio código de salida.
|
|
15
11
|
process.stderr.on("error", (err) => {
|
package/dist/bin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,+GAA+G;AAC/G,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAA0B,EAAE,EAAE;IACzD,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO;QAAE,MAAM,GAAG,CAAC;IACpC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;AACrC,CAAC,CAAC,CAAC;AACH,6GAA6G;AAC7G,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAA0B,EAAE,EAAE;IACzD,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO;QAAE,MAAM,GAAG,CAAC;AACrC,CAAC,CAAC,CAAC;AAEH,OAAO,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
1
|
import type { Command } from "commander";
|
|
2
|
-
/** Engancha los chequeos de `agents create` y `agents update` antes de llamar a la API
|
|
2
|
+
/** Engancha los chequeos de `agents create` y `agents update` antes de llamar a la API. */
|
|
3
3
|
export declare function registerAgentChecks(program: Command): void;
|
|
4
|
-
/** `skills versions create` y `mcp connections versions create` avisan de la versión sin activar, como `agents` (C18). */
|
|
5
|
-
export declare function registerVersionNotices(program: Command): void;
|
|
@@ -2,7 +2,6 @@ import { CliError } from "../errors.js";
|
|
|
2
2
|
import { commandText, invocationOf } from "../invocation.js";
|
|
3
3
|
import { extendOperation } from "../operations.js";
|
|
4
4
|
import { notice } from "../output.js";
|
|
5
|
-
import { noticeInactiveVersion } from "./agent-tools/shared.js";
|
|
6
5
|
/** Lo que `agents create` sin `config` descarta sin error: sin versión no hay dónde guardarlo (C30). */
|
|
7
6
|
const NEEDS_CONFIG = ["skills", "mcp_connections"];
|
|
8
7
|
/**
|
|
@@ -29,41 +28,9 @@ function checkUpdate(params, ctx, mode) {
|
|
|
29
28
|
return;
|
|
30
29
|
notice(ctx, mode, "--change-message is not saved: it only goes with a new version, and this update creates none (pass --config, --skills or --mcp-connections to create one).");
|
|
31
30
|
}
|
|
32
|
-
/** Engancha los chequeos de `agents create` y `agents update` antes de llamar a la API
|
|
31
|
+
/** Engancha los chequeos de `agents create` y `agents update` antes de llamar a la API. */
|
|
33
32
|
export function registerAgentChecks(program) {
|
|
34
33
|
extendOperation(program, ["agents", "create"], { check: checkCreate });
|
|
35
|
-
extendOperation(program, ["agents", "update"], {
|
|
36
|
-
check: checkUpdate,
|
|
37
|
-
afterResult: (ctx, mode, result, ids) => noticeInactiveVersion(ctx, mode, ids.agent_id ?? "<agent_id>", result?.version),
|
|
38
|
-
});
|
|
39
|
-
extendOperation(program, ["agents", "versions", "create"], {
|
|
40
|
-
afterResult: (ctx, mode, result, ids) => noticeInactiveVersion(ctx, mode, ids.agent_id ?? "<agent_id>", result),
|
|
41
|
-
});
|
|
42
|
-
extendOperation(program, ["agents", "versions", "restore"], {
|
|
43
|
-
afterResult: (ctx, mode, result, ids) => noticeInactiveVersion(ctx, mode, ids.agent_id ?? "<agent_id>", result),
|
|
44
|
-
});
|
|
45
|
-
}
|
|
46
|
-
/** `mcp connections versions create` sin `--url` ni `--headers` crea una copia idéntica de la última: avisa por stderr, sin frenar. */
|
|
47
|
-
function checkMcpVersionCreate(params, ctx, mode) {
|
|
48
|
-
if (params.url !== undefined || params.headers !== undefined)
|
|
49
|
-
return;
|
|
50
|
-
notice(ctx, mode, "Warning: no --url or --headers given: the new version copies the latest one unchanged.");
|
|
51
|
-
}
|
|
52
|
-
/** `skills versions create` y `mcp connections versions create` avisan de la versión sin activar, como `agents` (C18). */
|
|
53
|
-
export function registerVersionNotices(program) {
|
|
54
|
-
// `restore --no-activate` deja la copia sin activar: avisa igual que un create (C20).
|
|
55
|
-
extendOperation(program, ["skills", "versions", "restore"], {
|
|
56
|
-
afterResult: (ctx, mode, result, ids) => noticeInactiveVersion(ctx, mode, ids.skill_id ?? "<skill_id>", result, "skills"),
|
|
57
|
-
});
|
|
58
|
-
extendOperation(program, ["mcp", "connections", "versions", "restore"], {
|
|
59
|
-
afterResult: (ctx, mode, result, ids) => noticeInactiveVersion(ctx, mode, ids.connection_id ?? "<connection_id>", result, "mcp connections"),
|
|
60
|
-
});
|
|
61
|
-
extendOperation(program, ["skills", "versions", "create"], {
|
|
62
|
-
afterResult: (ctx, mode, result, ids) => noticeInactiveVersion(ctx, mode, ids.skill_id ?? "<skill_id>", result, "skills"),
|
|
63
|
-
});
|
|
64
|
-
extendOperation(program, ["mcp", "connections", "versions", "create"], {
|
|
65
|
-
check: checkMcpVersionCreate,
|
|
66
|
-
afterResult: (ctx, mode, result, ids) => noticeInactiveVersion(ctx, mode, ids.connection_id ?? "<connection_id>", result, "mcp connections"),
|
|
67
|
-
});
|
|
34
|
+
extendOperation(program, ["agents", "update"], { check: checkUpdate });
|
|
68
35
|
}
|
|
69
36
|
//# sourceMappingURL=agent-checks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-checks.js","sourceRoot":"","sources":["../../src/commands/agent-checks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-checks.js","sourceRoot":"","sources":["../../src/commands/agent-checks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAItC,wGAAwG;AACxG,MAAM,YAAY,GAAG,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;AAEnD;;;GAGG;AACH,SAAS,WAAW,CAAC,MAAc,EAAE,GAAe,EAAE,KAAW,EAAE,SAAkB;IACpF,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,SAAS;QAAE,OAAO;IACrD,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,CAAC;IACjG,IAAI,CAAC,IAAI;QAAE,OAAO;IAClB,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IACnC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC;IAC5E,MAAM,IAAI,QAAQ,CACjB,iBAAiB,EACjB,uGAAuG,EACvG,CAAC,EACD,CAAC,EAAE,OAAO,EAAE,GAAG,KAAK,mBAAmB,EAAE,IAAI,EAAE,uCAAuC,EAAE,CAAC,CACzF,CAAC;AACH,CAAC;AAED,+GAA+G;AAC/G,MAAM,eAAe,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC;AAEhE,sHAAsH;AACtH,SAAS,WAAW,CAAC,MAAc,EAAE,GAAe,EAAE,IAAU;IAC/D,IAAI,MAAM,CAAC,cAAc,KAAK,SAAS;QAAE,OAAO;IAChD,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC;QAAE,OAAO;IACvE,MAAM,CACL,GAAG,EACH,IAAI,EACJ,4JAA4J,CAC5J,CAAC;AACH,CAAC;AAED,2FAA2F;AAC3F,MAAM,UAAU,mBAAmB,CAAC,OAAgB;IACnD,eAAe,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;IACvE,eAAe,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;AACxE,CAAC"}
|
|
@@ -12,35 +12,25 @@ export interface RenderIo {
|
|
|
12
12
|
startedAt: number;
|
|
13
13
|
now(): number;
|
|
14
14
|
agentId: string;
|
|
15
|
-
/** `--version-id` con el que corrió el turno; el `continue:` del pie lo repite. */
|
|
16
|
-
versionId?: string;
|
|
17
|
-
/** `max_steps` con el que corrió el turno, para el aviso de tope de pasos; por defecto el de la API. */
|
|
18
|
-
maxSteps?: number;
|
|
19
15
|
/** Nombre con el que se corrió la CLI, para la línea `continue:`; por defecto `laburen`. */
|
|
20
16
|
cliName?: string;
|
|
21
17
|
/** Se llama con el thread apenas llega el `start`, para poder avisarlo si el turno se corta. */
|
|
22
18
|
onThread?(thread: string): void;
|
|
23
|
-
/** Corta la conexión cuando
|
|
19
|
+
/** Corta la conexión cuando stdout se cierra. */
|
|
24
20
|
abort?(): void;
|
|
25
21
|
}
|
|
26
|
-
/** stderr se cerró antes de terminar (por ejemplo
|
|
22
|
+
/** stdout o stderr se cerró antes de terminar (por ejemplo `| head -1`): no es un error, solo no hay a quién escribirle. */
|
|
27
23
|
export declare class OutputClosedError extends Error {
|
|
28
|
-
readonly stream: "stderr";
|
|
29
|
-
constructor(stream: "stderr");
|
|
24
|
+
readonly stream: "stdout" | "stderr";
|
|
25
|
+
constructor(stream: "stdout" | "stderr");
|
|
30
26
|
}
|
|
31
27
|
/**
|
|
32
28
|
* Deja en `stream` un listener permanente que ignora `EPIPE` (un write que quedó en buffer puede fallar después de que
|
|
33
29
|
* terminó el turno). Se registra una sola vez por stream; cualquier otro error, si nadie más lo escucha, se vuelve a lanzar.
|
|
34
30
|
*/
|
|
35
31
|
export declare function ignoreEpipe(stream: NodeJS.WritableStream): void;
|
|
36
|
-
/** `max_steps` que usa la API cuando el pedido no lo manda. */
|
|
37
|
-
export declare const DEFAULT_MAX_STEPS = 80;
|
|
38
|
-
/** Aviso de un turno que terminó por el tope de pasos (`finish_reason: "tool-calls"`) y no por una respuesta final (C9). */
|
|
39
|
-
export declare function stepLimitWarning(result: {
|
|
40
|
-
finish_reason: string;
|
|
41
|
-
}, maxSteps?: number): string;
|
|
42
32
|
/** El comando para seguir la conversación con el mismo thread. */
|
|
43
|
-
export declare function continueCommand(cli: string, agentId: string, thread: string
|
|
33
|
+
export declare function continueCommand(cli: string, agentId: string, thread: string): string;
|
|
44
34
|
/**
|
|
45
35
|
* Imprime el turno a medida que llega: el texto a stdout y todo lo demás (razonamiento, tools, fuentes, pie) a stderr.
|
|
46
36
|
* Devuelve el resultado del turno; un error a mitad del stream sale tal cual, con lo ya impreso en su lugar.
|
|
@@ -3,7 +3,7 @@ import { shellQuote } from "../../invocation.js";
|
|
|
3
3
|
import { escapeControl, escapeStreamText } from "../../output.js";
|
|
4
4
|
/** Largo máximo (en caracteres) del JSON de una tool en una sola línea; si pasa, se corta con `…`. */
|
|
5
5
|
export const TOOL_LINE_MAX = 100;
|
|
6
|
-
/** stderr se cerró antes de terminar (por ejemplo
|
|
6
|
+
/** stdout o stderr se cerró antes de terminar (por ejemplo `| head -1`): no es un error, solo no hay a quién escribirle. */
|
|
7
7
|
export class OutputClosedError extends Error {
|
|
8
8
|
stream;
|
|
9
9
|
constructor(stream) {
|
|
@@ -28,19 +28,9 @@ export function ignoreEpipe(stream) {
|
|
|
28
28
|
throw err;
|
|
29
29
|
});
|
|
30
30
|
}
|
|
31
|
-
/** `max_steps` que usa la API cuando el pedido no lo manda. */
|
|
32
|
-
export const DEFAULT_MAX_STEPS = 80;
|
|
33
|
-
/** Aviso de un turno que terminó por el tope de pasos (`finish_reason: "tool-calls"`) y no por una respuesta final (C9). */
|
|
34
|
-
export function stepLimitWarning(result, maxSteps) {
|
|
35
|
-
if (result.finish_reason !== "tool-calls")
|
|
36
|
-
return "";
|
|
37
|
-
return `Warning: The run stopped at the step limit (max_steps ${maxSteps ?? DEFAULT_MAX_STEPS}) before a final answer.\n`;
|
|
38
|
-
}
|
|
39
31
|
/** El comando para seguir la conversación con el mismo thread. */
|
|
40
|
-
export function continueCommand(cli, agentId, thread
|
|
41
|
-
|
|
42
|
-
const version = versionId === undefined ? "" : ` --version-id ${shellQuote(versionId)}`;
|
|
43
|
-
return `${cli} agents run ${shellQuote(agentId)} --thread ${shellQuote(thread)}${version} "…"`;
|
|
32
|
+
export function continueCommand(cli, agentId, thread) {
|
|
33
|
+
return `${cli} agents run ${shellQuote(agentId)} --thread ${shellQuote(thread)} "…"`;
|
|
44
34
|
}
|
|
45
35
|
/** JSON de una línea; un valor sin representación JSON sale como `null`. Sin escapar: se corta y después se escapa. */
|
|
46
36
|
function oneLine(value) {
|
|
@@ -73,15 +63,16 @@ export async function renderRun(run, io) {
|
|
|
73
63
|
let reasoningOpen = false;
|
|
74
64
|
let reasoningAtLineStart = false;
|
|
75
65
|
const onStdoutError = (err) => {
|
|
76
|
-
// Con stdout cerrado el turno sigue hasta el final (sin escribir texto) para poder mostrar el pie por stderr (C24).
|
|
77
66
|
if (err.code === "EPIPE") {
|
|
67
|
+
if (!stdoutClosed)
|
|
68
|
+
io.abort?.();
|
|
78
69
|
stdoutClosed = true;
|
|
79
70
|
}
|
|
80
71
|
else {
|
|
81
72
|
stdoutFailure = err;
|
|
82
73
|
}
|
|
83
74
|
};
|
|
84
|
-
// stderr cerrado (`2>&1 | head`)
|
|
75
|
+
// stderr cerrado (`2>&1 | head`) se trata igual que stdout: se corta la conexión y se sale sin stack.
|
|
85
76
|
const onStderrError = (err) => {
|
|
86
77
|
if (err.code === "EPIPE") {
|
|
87
78
|
if (!stderrClosed)
|
|
@@ -148,6 +139,8 @@ export async function renderRun(run, io) {
|
|
|
148
139
|
};
|
|
149
140
|
try {
|
|
150
141
|
for await (const chunk of run.chunks) {
|
|
142
|
+
if (stdoutClosed)
|
|
143
|
+
throw new OutputClosedError("stdout");
|
|
151
144
|
if (stderrClosed)
|
|
152
145
|
throw new OutputClosedError("stderr");
|
|
153
146
|
switch (chunk.type) {
|
|
@@ -229,6 +222,8 @@ export async function renderRun(run, io) {
|
|
|
229
222
|
}
|
|
230
223
|
catch (error) {
|
|
231
224
|
// Cortamos la conexión nosotros: el error del stream es consecuencia de eso, no algo para mostrar.
|
|
225
|
+
if (stdoutClosed)
|
|
226
|
+
throw new OutputClosedError("stdout");
|
|
232
227
|
if (stderrClosed)
|
|
233
228
|
throw new OutputClosedError("stderr");
|
|
234
229
|
throw error;
|
|
@@ -237,6 +232,8 @@ export async function renderRun(run, io) {
|
|
|
237
232
|
closeReasoning();
|
|
238
233
|
closeText();
|
|
239
234
|
}
|
|
235
|
+
if (stdoutClosed)
|
|
236
|
+
throw new OutputClosedError("stdout");
|
|
240
237
|
if (stderrClosed)
|
|
241
238
|
throw new OutputClosedError("stderr");
|
|
242
239
|
if (stdoutFailure)
|
|
@@ -259,16 +256,9 @@ export async function renderRun(run, io) {
|
|
|
259
256
|
parts.push(`${formatNumber(result.cost, 4)} credits`);
|
|
260
257
|
parts.push(`${((io.now() - io.startedAt) / 1000).toFixed(1)} s`);
|
|
261
258
|
footer.push(parts.join(" · "));
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
}
|
|
266
|
-
else {
|
|
267
|
-
footer.push(`continue: ${escapeControl(continueCommand(cli, io.agentId, thread, io.versionId))}`);
|
|
268
|
-
}
|
|
269
|
-
const warning = stepLimitWarning(result, io.maxSteps);
|
|
270
|
-
if (warning)
|
|
271
|
-
err(`\n${warning}`);
|
|
259
|
+
if (result.handoff)
|
|
260
|
+
footer.push("handed off to a human");
|
|
261
|
+
footer.push(`continue: ${escapeControl(continueCommand(cli, io.agentId, thread))}`);
|
|
272
262
|
err(`\n${footer.map((line) => c.dim(` ${line}`)).join("\n")}\n`);
|
|
273
263
|
return result;
|
|
274
264
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/commands/agent-run/render.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAElE,sGAAsG;AACtG,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/commands/agent-run/render.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAElE,sGAAsG;AACtG,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAAC;AAqBjC,4HAA4H;AAC5H,MAAM,OAAO,iBAAkB,SAAQ,KAAK;IACtB;IAArB,YAAqB,MAA2B;QAC/C,KAAK,CAAC,GAAG,MAAM,sCAAsC,CAAC,CAAC;QADnC,WAAM,GAAN,MAAM,CAAqB;QAE/C,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IACjC,CAAC;CACD;AAED,MAAM,YAAY,GAAG,IAAI,OAAO,EAAyB,CAAC;AAE1D;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,MAA6B;IACxD,IAAI,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC;QAAE,OAAO;IACrC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAA0B,EAAE,EAAE;QACjD,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO;QACjC,IAAI,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC;YAAE,MAAM,GAAG,CAAC;IACpD,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,kEAAkE;AAClE,MAAM,UAAU,eAAe,CAAC,GAAW,EAAE,OAAe,EAAE,MAAc;IAC3E,OAAO,GAAG,GAAG,eAAe,UAAU,CAAC,OAAO,CAAC,aAAa,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC;AACtF,CAAC;AAED,uHAAuH;AACvH,SAAS,OAAO,CAAC,KAAc;IAC9B,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC;AACxC,CAAC;AAED,4GAA4G;AAC5G,SAAS,GAAG,CAAC,IAAY;IACxB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,aAAa,CACnB,MAAM,CAAC,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CACpF,CAAC;AACH,CAAC;AAED,wBAAwB;AACxB,SAAS,YAAY,CAAC,CAAS,EAAE,qBAAqB,GAAG,CAAC;IACzD,OAAO,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,qBAAqB,EAAE,CAAC,CAAC;AAC7D,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAC9B,GAAiD,EACjD,EAAY;IAEZ,MAAM,CAAC,GAAG,YAAY,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IACjC,MAAM,GAAG,GAAG,EAAE,CAAC,OAAO,IAAI,SAAS,CAAC;IACpC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,IAAI,aAAgC,CAAC;IACrC,IAAI,aAAgC,CAAC;IACrC,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,iBAAiB,GAAG,IAAI,CAAC;IAC7B,IAAI,aAAa,GAAG,KAAK,CAAC;IAC1B,IAAI,oBAAoB,GAAG,KAAK,CAAC;IAEjC,MAAM,aAAa,GAAG,CAAC,GAA0B,EAAE,EAAE;QACpD,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC1B,IAAI,CAAC,YAAY;gBAAE,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC;YAChC,YAAY,GAAG,IAAI,CAAC;QACrB,CAAC;aAAM,CAAC;YACP,aAAa,GAAG,GAAG,CAAC;QACrB,CAAC;IACF,CAAC,CAAC;IACF,sGAAsG;IACtG,MAAM,aAAa,GAAG,CAAC,GAA0B,EAAE,EAAE;QACpD,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC1B,IAAI,CAAC,YAAY;gBAAE,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC;YAChC,YAAY,GAAG,IAAI,CAAC;QACrB,CAAC;aAAM,CAAC;YACP,aAAa,GAAG,GAAG,CAAC;QACrB,CAAC;IACF,CAAC,CAAC;IACF,WAAW,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;IACvB,WAAW,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;IACvB,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACrC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACrC,IAAI,CAAC;QACJ,4GAA4G;QAC5G,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAE3B,MAAM,GAAG,GAAG,CAAC,IAAY,EAAE,EAAE;YAC5B,IAAI,CAAC,YAAY;gBAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1C,CAAC,CAAC;QACF,MAAM,GAAG,GAAG,CAAC,IAAY,EAAE,EAAE;YAC5B,IAAI,CAAC,YAAY;gBAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1C,CAAC,CAAC;QACF,MAAM,cAAc,GAAG,GAAG,EAAE;YAC3B,IAAI,CAAC,aAAa;gBAAE,OAAO;YAC3B,0FAA0F;YAC1F,IAAI,CAAC,oBAAoB;gBAAE,GAAG,CAAC,IAAI,CAAC,CAAC;YACrC,aAAa,GAAG,KAAK,CAAC;QACvB,CAAC,CAAC;QACF,MAAM,aAAa,GAAG,GAAG,EAAE;YAC1B,SAAS,EAAE,CAAC;YACZ,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YACpB,aAAa,GAAG,IAAI,CAAC;YACrB,oBAAoB,GAAG,KAAK,CAAC;QAC9B,CAAC,CAAC;QACF,oHAAoH;QACpH,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,EAAE;YACxC,IAAI,GAAG,GAAG,EAAE,CAAC;YACb,KAAK,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;gBACvE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oBACX,GAAG,IAAI,IAAI,CAAC;oBACZ,oBAAoB,GAAG,IAAI,CAAC;gBAC7B,CAAC;gBACD,IAAI,IAAI,KAAK,EAAE;oBAAE,SAAS;gBAC1B,IAAI,oBAAoB;oBAAE,GAAG,IAAI,MAAM,CAAC;gBACxC,oBAAoB,GAAG,KAAK,CAAC;gBAC7B,GAAG,IAAI,IAAI,CAAC;YACb,CAAC;YACD,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAClB,CAAC,CAAC;QACF,MAAM,SAAS,GAAG,GAAG,EAAE;YACtB,IAAI,CAAC,QAAQ;gBAAE,OAAO;YACtB,IAAI,CAAC,iBAAiB;gBAAE,GAAG,CAAC,IAAI,CAAC,CAAC;YAClC,QAAQ,GAAG,KAAK,CAAC;YACjB,iBAAiB,GAAG,IAAI,CAAC;QAC1B,CAAC,CAAC;QAEF,IAAI,CAAC;YACJ,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;gBACtC,IAAI,YAAY;oBAAE,MAAM,IAAI,iBAAiB,CAAC,QAAQ,CAAC,CAAC;gBACxD,IAAI,YAAY;oBAAE,MAAM,IAAI,iBAAiB,CAAC,QAAQ,CAAC,CAAC;gBACxD,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;oBACpB,KAAK,OAAO;wBACX,IAAI,KAAK,CAAC,eAAe;4BAAE,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;wBAC9E,MAAM;oBACP,KAAK,iBAAiB;wBACrB,cAAc,EAAE,CAAC;wBACjB,aAAa,EAAE,CAAC;wBAChB,MAAM;oBACP,KAAK,iBAAiB,CAAC,CAAC,CAAC;wBACxB,IAAI,CAAC,aAAa;4BAAE,aAAa,EAAE,CAAC;wBACpC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBAC5B,MAAM;oBACP,CAAC;oBACD,KAAK,eAAe;wBACnB,cAAc,EAAE,CAAC;wBACjB,MAAM;oBACP,KAAK,YAAY;wBAChB,QAAQ,GAAG,IAAI,CAAC;wBAChB,MAAM;oBACP,KAAK,YAAY,CAAC,CAAC,CAAC;wBACnB,cAAc,EAAE,CAAC;wBACjB,MAAM,IAAI,GAAG,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBAC3C,IAAI,IAAI,KAAK,EAAE;4BAAE,MAAM;wBACvB,QAAQ,GAAG,IAAI,CAAC;wBAChB,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;wBACxC,GAAG,CAAC,IAAI,CAAC,CAAC;wBACV,MAAM;oBACP,CAAC;oBACD,KAAK,UAAU;wBACd,SAAS,EAAE,CAAC;wBACZ,MAAM;oBACP,KAAK,sBAAsB;wBAC1B,SAAS,EAAE,CAAC;wBACZ,cAAc,EAAE,CAAC;wBACjB,GAAG,CACF,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CACzF,CAAC;wBACF,MAAM;oBACP,KAAK,uBAAuB,CAAC,CAAC,CAAC;wBAC9B,SAAS,EAAE,CAAC;wBACZ,cAAc,EAAE,CAAC;wBACjB,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBAC5E,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;4BAChB,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC,CAAW,CAAC,IAAI,CAAC,CAAC;4BAClE,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;gCAAE,GAAG,CAAC,SAAS,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC1E,CAAC;6BAAM,CAAC;4BACP,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;4BACnC,4EAA4E;4BAC5E,MAAM,KAAK,GACV,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,aAAa;gCACtC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,gCAAgC,CAAC,EAAE;gCAChD,CAAC,CAAC,EAAE,CAAC;4BACP,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;wBACnD,CAAC;wBACD,MAAM;oBACP,CAAC;oBACD,KAAK,mBAAmB;wBACvB,SAAS,EAAE,CAAC;wBACZ,cAAc,EAAE,CAAC;wBACjB,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;wBAC7D,MAAM;oBACP,KAAK,YAAY;wBAChB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;wBACvB,MAAM;oBACP,KAAK,iBAAiB;wBACrB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;wBAC3C,MAAM;oBACP,KAAK,MAAM;wBACV,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;wBACrB,MAAM;oBACP;wBACC,MAAM;gBACR,CAAC;YACF,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,mGAAmG;YACnG,IAAI,YAAY;gBAAE,MAAM,IAAI,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YACxD,IAAI,YAAY;gBAAE,MAAM,IAAI,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YACxD,MAAM,KAAK,CAAC;QACb,CAAC;gBAAS,CAAC;YACV,cAAc,EAAE,CAAC;YACjB,SAAS,EAAE,CAAC;QACb,CAAC;QACD,IAAI,YAAY;YAAE,MAAM,IAAI,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACxD,IAAI,YAAY;YAAE,MAAM,IAAI,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACxD,IAAI,aAAa;YAAE,MAAM,aAAa,CAAC;QACvC,IAAI,aAAa;YAAE,MAAM,aAAa,CAAC;QAEvC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC;QAChC,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC;YACnB,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAClF,IAAI,KAAK,CAAC,IAAI,GAAG,CAAC;YACjB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC9E,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;QACpC,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC;QACjC,MAAM,KAAK,GAAG;YACb,UAAU,aAAa,CAAC,MAAM,CAAC,EAAE;YACjC,GAAG,YAAY,CAAC,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC,aAAa,CAAC,SAAS;SAClE,CAAC;QACF,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI;YAAE,KAAK,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC;QAChF,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACjE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAC/B,IAAI,MAAM,CAAC,OAAO;YAAE,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QACzD,MAAM,CAAC,IAAI,CAAC,aAAa,aAAa,CAAC,eAAe,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;QACpF,GAAG,CAAC,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClE,OAAO,MAAM,CAAC;IACf,CAAC;YAAS,CAAC;QACV,kGAAkG;QAClG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QACtC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACvC,CAAC;AACF,CAAC"}
|
|
@@ -2,16 +2,13 @@ import { readFile } from "node:fs/promises";
|
|
|
2
2
|
import { resolve } from "node:path";
|
|
3
3
|
import { InvalidArgumentError, Option } from "commander";
|
|
4
4
|
import { CliError, toCliError } from "../errors.js";
|
|
5
|
-
import {
|
|
6
|
-
import { cliName, commandText, displayCommand, invocationOf } from "../invocation.js";
|
|
5
|
+
import { cliName, displayCommand, invocationOf } from "../invocation.js";
|
|
7
6
|
import { invalidValue } from "../operations/json-input.js";
|
|
8
|
-
import { commandSchema } from "../operations/schema-flag.js";
|
|
9
7
|
import { groupFor, parseJson } from "../operations.js";
|
|
10
8
|
import { escapeControl, writeResult } from "../output.js";
|
|
11
9
|
import { run, setExitCode } from "../program.js";
|
|
12
|
-
import { keepRunningIfStdoutCloses } from "../stdout-policy.js";
|
|
13
10
|
import { buildRunBody } from "./agent-run/body.js";
|
|
14
|
-
import { continueCommand, ignoreEpipe, OutputClosedError, renderRun
|
|
11
|
+
import { continueCommand, ignoreEpipe, OutputClosedError, renderRun } from "./agent-run/render.js";
|
|
15
12
|
/** Quién avisa del Ctrl+C: por defecto la señal SIGINT del proceso; devuelve la función que la deja de escuchar. */
|
|
16
13
|
function processInterrupt(cb) {
|
|
17
14
|
process.on("SIGINT", cb);
|
|
@@ -52,29 +49,16 @@ async function readMessage(ctx, positional, opts, otherSource) {
|
|
|
52
49
|
return "";
|
|
53
50
|
return (await readStdin(ctx)).trimEnd();
|
|
54
51
|
}
|
|
55
|
-
|
|
56
|
-
function missingMessage(ctx, agentId) {
|
|
57
|
-
const { args } = invocationOf(ctx);
|
|
58
|
-
const typed = args.length > 0 ? [...args] : ["agents", "run", agentId];
|
|
59
|
-
// `<message>` va justo después del id, antes de los flags, como se escribe el comando.
|
|
60
|
-
const at = typed.indexOf(agentId);
|
|
61
|
-
typed.splice(at === -1 ? typed.length : at + 1, 0, "<message>");
|
|
52
|
+
function missingMessage() {
|
|
62
53
|
return new CliError("missing_required", "Missing message. Pass it as an argument or pipe it to stdin.", 2, [
|
|
63
54
|
{
|
|
64
|
-
command:
|
|
55
|
+
command: "laburen agents run <agent_id> <message>",
|
|
65
56
|
when: "to send the message as an argument",
|
|
66
57
|
},
|
|
67
58
|
]);
|
|
68
59
|
}
|
|
69
|
-
/** `max_steps` del pedido (`--max-steps` o el de `--data`), si lo hay. */
|
|
70
|
-
function maxStepsOf(body) {
|
|
71
|
-
const value = body.max_steps;
|
|
72
|
-
return typeof value === "number" ? value : undefined;
|
|
73
|
-
}
|
|
74
60
|
/** Corre el turno por `/stream` y lo imprime en vivo; Ctrl+C corta la conexión y sale con 130. */
|
|
75
|
-
async function runLive(ctx, session, mode, agentId, body, verbose
|
|
76
|
-
// Con stdout cerrado el turno sigue hasta el pie por stderr (C24): el bin no tiene que salir en el EPIPE.
|
|
77
|
-
keepRunningIfStdoutCloses();
|
|
61
|
+
async function runLive(ctx, session, mode, agentId, body, verbose) {
|
|
78
62
|
const controller = new AbortController();
|
|
79
63
|
let interrupted = false;
|
|
80
64
|
let thread;
|
|
@@ -87,7 +71,7 @@ async function runLive(ctx, session, mode, agentId, body, verbose, versionId) {
|
|
|
87
71
|
const startedAt = ctx.now();
|
|
88
72
|
const cli = cliName(ctx.env);
|
|
89
73
|
// Una sola convención: el comando se arma con `laburen` y se muestra con el nombre con que se corrió la CLI.
|
|
90
|
-
const continueWith = (value) => continueCommand("laburen", agentId, value
|
|
74
|
+
const continueWith = (value) => continueCommand("laburen", agentId, value);
|
|
91
75
|
// Cualquier escritura de este comando a stdout o stderr puede dar EPIPE tarde: no es un error no atrapado.
|
|
92
76
|
ignoreEpipe(ctx.stdout);
|
|
93
77
|
ignoreEpipe(ctx.stderr);
|
|
@@ -103,8 +87,6 @@ async function runLive(ctx, session, mode, agentId, body, verbose, versionId) {
|
|
|
103
87
|
startedAt,
|
|
104
88
|
now: () => ctx.now(),
|
|
105
89
|
agentId,
|
|
106
|
-
versionId,
|
|
107
|
-
maxSteps: maxStepsOf(body),
|
|
108
90
|
cliName: cli,
|
|
109
91
|
onThread: (value) => {
|
|
110
92
|
thread = value;
|
|
@@ -113,11 +95,15 @@ async function runLive(ctx, session, mode, agentId, body, verbose, versionId) {
|
|
|
113
95
|
});
|
|
114
96
|
}
|
|
115
97
|
catch (err) {
|
|
116
|
-
|
|
117
|
-
|
|
98
|
+
if (err instanceof OutputClosedError) {
|
|
99
|
+
// Con stdout cerrado y stderr abierto, la persona igual se lleva el thread para seguir.
|
|
100
|
+
if (err.stream === "stdout" && thread) {
|
|
101
|
+
ctx.stderr.write(` continue: ${escapeControl(displayCommand(ctx.env, continueWith(thread)))}\n`);
|
|
102
|
+
}
|
|
118
103
|
return;
|
|
104
|
+
}
|
|
119
105
|
if (!interrupted) {
|
|
120
|
-
// Un error con el turno ya empezado (
|
|
106
|
+
// Un error con el turno ya empezado (status 200 del SDK): `next` apunta a seguir el thread, no a `--help`.
|
|
121
107
|
throw thread
|
|
122
108
|
? toCliError(err, {
|
|
123
109
|
...invocationOf(ctx),
|
|
@@ -137,25 +123,12 @@ async function runLive(ctx, session, mode, agentId, body, verbose, versionId) {
|
|
|
137
123
|
stopListening();
|
|
138
124
|
}
|
|
139
125
|
}
|
|
140
|
-
/** Lo que imprime `agents run --schema`: el body de `agents.stream` y, como `/stream` no tiene respuesta JSON, la de `agents.generate` (lo que imprime `--json`). */
|
|
141
|
-
function runSchema() {
|
|
142
|
-
const schema = commandSchema({
|
|
143
|
-
id: "agents.stream",
|
|
144
|
-
path: ["agents", "run"],
|
|
145
|
-
positionals: ["agent_id", "message"],
|
|
146
|
-
});
|
|
147
|
-
return {
|
|
148
|
-
...schema,
|
|
149
|
-
response: schema.response ?? OPERATION_SCHEMAS["agents.generate"]?.response ?? null,
|
|
150
|
-
};
|
|
151
|
-
}
|
|
152
126
|
/** Registra `agents run <agent_id> [mensaje]`: un turno del agente; con `--json` usa `/generate`, sin él `/stream`. */
|
|
153
127
|
export function registerAgentRunCommand(program, ctx, deps) {
|
|
154
128
|
groupFor(program, "agents")
|
|
155
129
|
.command("run")
|
|
156
130
|
.description("Run one turn of an agent")
|
|
157
|
-
|
|
158
|
-
.argument("[agent_id]")
|
|
131
|
+
.argument("<agent_id>")
|
|
159
132
|
.argument("[message]", "what the user says; if omitted and stdin is not a terminal, it is read from stdin")
|
|
160
133
|
.option("--thread <id>", "continue the conversation of a previous run")
|
|
161
134
|
.option("--resource <id>", "your own id for the end user")
|
|
@@ -179,18 +152,8 @@ export function registerAgentRunCommand(program, ctx, deps) {
|
|
|
179
152
|
.option("--context <text>", "extra text for the model (repeatable)", collect)
|
|
180
153
|
.option("--data <json|@file|->", "whole request body as JSON, @file or - for stdin")
|
|
181
154
|
.option("--verbose", "show tool results in full")
|
|
182
|
-
.
|
|
183
|
-
.action(async (agentArg, messageArg, _opts, self) => {
|
|
155
|
+
.action(async (agentId, messageArg, _opts, self) => {
|
|
184
156
|
const opts = self.optsWithGlobals();
|
|
185
|
-
// Sin sesión ni llamada a la API: solo imprime lo que dice el contrato.
|
|
186
|
-
if (opts.schema) {
|
|
187
|
-
ctx.stdout.write(`${JSON.stringify(runSchema(), null, 2)}\n`);
|
|
188
|
-
return;
|
|
189
|
-
}
|
|
190
|
-
if (agentArg === undefined) {
|
|
191
|
-
self.error("missing required argument 'agent_id'", { code: "commander.missingArgument" });
|
|
192
|
-
}
|
|
193
|
-
const agentId = agentArg;
|
|
194
157
|
// El valor inicial no se manda nunca: `prepare` lo reemplaza antes de abrir la sesión.
|
|
195
158
|
let body = { messages: "" };
|
|
196
159
|
// Se arma una sola vez aunque `run` reintente la acción por un token renovado.
|
|
@@ -198,10 +161,9 @@ export function registerAgentRunCommand(program, ctx, deps) {
|
|
|
198
161
|
if (mode.json) {
|
|
199
162
|
const result = await session.platform.agents.generate(agentId, body);
|
|
200
163
|
writeResult(ctx, mode, result, "item");
|
|
201
|
-
ctx.stderr.write(stepLimitWarning(result, maxStepsOf(body)));
|
|
202
164
|
return;
|
|
203
165
|
}
|
|
204
|
-
await runLive(ctx, session, mode, agentId, body, Boolean(opts.verbose)
|
|
166
|
+
await runLive(ctx, session, mode, agentId, body, Boolean(opts.verbose));
|
|
205
167
|
}, opts, { fetch: deps.fetch }, async (mode) => {
|
|
206
168
|
// Sin --json el stdout es el texto del turno: un error, aunque sea JSON, no se pega ahí.
|
|
207
169
|
if (!mode.json)
|
|
@@ -235,7 +197,7 @@ export function registerAgentRunCommand(program, ctx, deps) {
|
|
|
235
197
|
}
|
|
236
198
|
const message = await readMessage(ctx, messageArg, opts, hasFiles || hasDataMessages);
|
|
237
199
|
if (message === "" && !hasFiles && !hasDataMessages)
|
|
238
|
-
throw missingMessage(
|
|
200
|
+
throw missingMessage();
|
|
239
201
|
body = buildRunBody(agentId, message, flags, data);
|
|
240
202
|
}, { agent_id: agentId });
|
|
241
203
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-run.js","sourceRoot":"","sources":["../../src/commands/agent-run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAgB,oBAAoB,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEvE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"agent-run.js","sourceRoot":"","sources":["../../src/commands/agent-run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,14 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { CliError, toCliError } from "../../errors.js";
|
|
1
|
+
import { CliError } from "../../errors.js";
|
|
3
2
|
import { TOOL_TYPES } from "../../generated/commands.js";
|
|
4
3
|
import { OPERATION_SCHEMAS } from "../../generated/schemas.js";
|
|
5
|
-
import { commandText
|
|
4
|
+
import { commandText } from "../../invocation.js";
|
|
6
5
|
import { parseJson } from "../../operations.js";
|
|
7
6
|
import { writeResult } from "../../output.js";
|
|
8
7
|
import { argsWithIds, missingWithChoices, pickId } from "../../pickers.js";
|
|
9
8
|
import { run } from "../../program.js";
|
|
10
9
|
import { canPrompt } from "../../prompter.js";
|
|
11
10
|
import { openSession } from "../../session.js";
|
|
12
|
-
import { addActivateOption, chooseActivate, latestTools, noticeInactiveVersion,
|
|
11
|
+
import { addActivateOption, chooseActivate, latestTools, noticeInactiveVersion, pickDeps, TOOLS_ADD, updateToolsOnLatest, } from "./shared.js";
|
|
13
12
|
/** Lo que imprime `--schema`: el schema de una tool (los ítems de `config.tools` de una versión) y la respuesta del update. */
|
|
14
13
|
function toolsAddSchema() {
|
|
15
14
|
const config = OPERATION_SCHEMAS["agents.versions.create"]?.body?.properties?.config;
|
|
@@ -20,17 +19,6 @@ function toolsAddSchema() {
|
|
|
20
19
|
response: OPERATION_SCHEMAS["agents.update"]?.response ?? null,
|
|
21
20
|
};
|
|
22
21
|
}
|
|
23
|
-
/** Si el error es de validación de `config.tools[N]` y N es la tool que se está agregando, el mensaje lo aclara; si no, el error queda igual. */
|
|
24
|
-
function explainAddedTool(err, addedIndex, hints) {
|
|
25
|
-
if (!isLaburenApiError(err))
|
|
26
|
-
return err;
|
|
27
|
-
const field = err.details.field;
|
|
28
|
-
const index = typeof field === "string" ? /^config\.tools\[(\d+)\]/.exec(field)?.[1] : undefined;
|
|
29
|
-
if (index === undefined || Number(index) !== addedIndex)
|
|
30
|
-
return err;
|
|
31
|
-
const base = toCliError(err, hints);
|
|
32
|
-
return new CliError(base.reason, `${base.message} (config.tools[${index}] is the tool you are adding.)`, base.exitCode, base.next, base.requestId, { issues: base.issues, details: base.details });
|
|
33
|
-
}
|
|
34
22
|
/** Registra `agents tools add [agent_id] --tool`: suma la tool a las de la última versión y crea una versión nueva. */
|
|
35
23
|
export function registerToolsAdd(group, ctx, deps) {
|
|
36
24
|
const command = group
|
|
@@ -66,19 +54,10 @@ Example (http tool; headers, body and query_parameters are lists of { key, value
|
|
|
66
54
|
}
|
|
67
55
|
const agentId = ids.agent_id;
|
|
68
56
|
const current = await latestTools(session, agentId);
|
|
69
|
-
if (!current.versionId)
|
|
70
|
-
throw noVersionsError(agentId);
|
|
71
57
|
activate ??= await chooseActivate(ctx, mode, deps.prompter, opts.activate);
|
|
72
|
-
|
|
73
|
-
let addedIndex = 0;
|
|
74
|
-
const updated = await updateToolsOnLatest(session, agentId, current, (tools) => {
|
|
75
|
-
addedIndex = tools.length;
|
|
76
|
-
return [...tools, tool];
|
|
77
|
-
}, activate, opts.changeMessage).catch((err) => {
|
|
78
|
-
throw explainAddedTool(err, addedIndex, { ...invocationOf(ctx), ids });
|
|
79
|
-
});
|
|
58
|
+
const updated = await updateToolsOnLatest(session, agentId, current, (tools) => [...tools, tool], activate);
|
|
80
59
|
writeResult(ctx, mode, updated, "item");
|
|
81
|
-
noticeInactiveVersion(ctx, mode, agentId, updated
|
|
60
|
+
noticeInactiveVersion(ctx, mode, agentId, updated);
|
|
82
61
|
}, opts, { fetch: deps.fetch }, async (mode) => {
|
|
83
62
|
if (opts.tool === undefined) {
|
|
84
63
|
const missing = agentArg ? [] : ["<agent_id>"];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../src/commands/agent-tools/add.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../src/commands/agent-tools/add.ts"],"names":[],"mappings":"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"}
|
|
@@ -104,9 +104,9 @@ export function registerToolsRemove(group, ctx, deps) {
|
|
|
104
104
|
confirmed = true;
|
|
105
105
|
}
|
|
106
106
|
activate ??= await chooseActivate(ctx, mode, deps.prompter, opts.activate);
|
|
107
|
-
const updated = await updateToolsOnLatest(session, agentId, current, without, activate
|
|
107
|
+
const updated = await updateToolsOnLatest(session, agentId, current, without, activate);
|
|
108
108
|
writeResult(ctx, mode, updated, "item");
|
|
109
|
-
noticeInactiveVersion(ctx, mode, agentId, updated
|
|
109
|
+
noticeInactiveVersion(ctx, mode, agentId, updated);
|
|
110
110
|
}, opts, { fetch: deps.fetch }, async (mode) => {
|
|
111
111
|
if (!agentArg && !canPrompt(ctx, mode)) {
|
|
112
112
|
throw await missingWithChoices(ctx, TOOLS_REMOVE, ids, given, "agent_id", () => openSession(ctx, opts, mode, { fetch: deps.fetch }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../src/commands/agent-tools/remove.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../src/commands/agent-tools/remove.ts"],"names":[],"mappings":"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"}
|