@action-llama/action-llama 0.26.15 → 0.27.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/dist/agents/bash-prefix.d.ts +3 -4
- package/dist/agents/bash-prefix.d.ts.map +1 -1
- package/dist/agents/bash-prefix.js +5 -11
- package/dist/agents/bash-prefix.js.map +1 -1
- package/dist/agents/container-entry.d.ts.map +1 -1
- package/dist/agents/container-entry.js +4 -1
- package/dist/agents/container-entry.js.map +1 -1
- package/dist/agents/container-runner.d.ts +2 -0
- package/dist/agents/container-runner.d.ts.map +1 -1
- package/dist/agents/container-runner.js +38 -8
- package/dist/agents/container-runner.js.map +1 -1
- package/dist/agents/harness/claude-cli-harness.d.ts.map +1 -1
- package/dist/agents/harness/claude-cli-harness.js +12 -2
- package/dist/agents/harness/claude-cli-harness.js.map +1 -1
- package/dist/agents/harness/consumer.d.ts +1 -0
- package/dist/agents/harness/consumer.d.ts.map +1 -1
- package/dist/agents/harness/consumer.js +50 -23
- package/dist/agents/harness/consumer.js.map +1 -1
- package/dist/agents/harness/pi-harness.d.ts.map +1 -1
- package/dist/agents/harness/pi-harness.js +10 -12
- package/dist/agents/harness/pi-harness.js.map +1 -1
- package/dist/agents/harness/types.d.ts +3 -0
- package/dist/agents/harness/types.d.ts.map +1 -1
- package/dist/agents/prompt.d.ts.map +1 -1
- package/dist/agents/prompt.js +4 -2
- package/dist/agents/prompt.js.map +1 -1
- package/dist/agents/session-loop.d.ts.map +1 -1
- package/dist/agents/session-loop.js +45 -26
- package/dist/agents/session-loop.js.map +1 -1
- package/dist/agents/signals.js +3 -3
- package/dist/agents/signals.js.map +1 -1
- package/dist/agents/turn-end-error.d.ts +2 -0
- package/dist/agents/turn-end-error.d.ts.map +1 -0
- package/dist/agents/turn-end-error.js +22 -0
- package/dist/agents/turn-end-error.js.map +1 -0
- package/dist/build-info.json +1 -1
- package/dist/cli/commands/logs.d.ts.map +1 -1
- package/dist/cli/commands/logs.js +22 -6
- package/dist/cli/commands/logs.js.map +1 -1
- package/dist/cli/commands/run-agent.d.ts.map +1 -1
- package/dist/cli/commands/run-agent.js +1 -2
- package/dist/cli/commands/run-agent.js.map +1 -1
- package/dist/frontend/assets/{index-CLzpDcLm.css → index-7kUQjEK2.css} +1 -1
- package/dist/frontend/assets/{index-Dx2aJ_Db.js → index-Dq5VlyiQ.js} +2 -2
- package/dist/frontend/assets/index-Dq5VlyiQ.js.map +1 -0
- package/dist/frontend/index.html +2 -2
- package/docker/bin/al-export +50 -0
- package/package.json +1 -1
- package/dist/frontend/assets/index-Dx2aJ_Db.js.map +0 -1
- package/docker/bin/al-bash-init.sh +0 -83
|
@@ -6,7 +6,7 @@ import { getModel } from "@mariozechner/pi-ai";
|
|
|
6
6
|
import { AuthStorage, createAgentSession, SessionManager, createCodingTools, } from "@mariozechner/pi-coding-agent";
|
|
7
7
|
import { sessionStatsToUsage } from "../../shared/usage.js";
|
|
8
8
|
import { selectAvailableModels, isRateLimitError } from "../model-fallback.js";
|
|
9
|
-
import {
|
|
9
|
+
import { extractTurnEndError } from "../turn-end-error.js";
|
|
10
10
|
const MAX_PASSES = 3;
|
|
11
11
|
const DEFAULT_BACKOFF_MS = 30_000;
|
|
12
12
|
const MAX_BACKOFF_MS = 300_000;
|
|
@@ -42,9 +42,7 @@ export class PiHarness {
|
|
|
42
42
|
thinkingLevel: modelConfig.thinkingLevel,
|
|
43
43
|
authStorage,
|
|
44
44
|
resourceLoader,
|
|
45
|
-
tools: createCodingTools(cwd, {
|
|
46
|
-
bash: { commandPrefix: BASH_COMMAND_PREFIX },
|
|
47
|
-
}),
|
|
45
|
+
tools: createCodingTools(cwd, {}),
|
|
48
46
|
sessionManager: SessionManager.inMemory(),
|
|
49
47
|
settingsManager,
|
|
50
48
|
});
|
|
@@ -57,7 +55,7 @@ export class PiHarness {
|
|
|
57
55
|
eventCount++;
|
|
58
56
|
// Non-update events → debug log
|
|
59
57
|
if (event.type !== "message_update") {
|
|
60
|
-
const extra = {
|
|
58
|
+
const extra = { eventType: event.type, eventCount, raw: event };
|
|
61
59
|
if (event.type === "message_start" || event.type === "message_end") {
|
|
62
60
|
extra.role = event.role || event.message?.role;
|
|
63
61
|
extra.content = JSON.stringify(event.content || event.message?.content || []).slice(0, 500);
|
|
@@ -65,8 +63,11 @@ export class PiHarness {
|
|
|
65
63
|
}
|
|
66
64
|
if (event.type === "turn_end") {
|
|
67
65
|
extra.turnResult = JSON.stringify(event).slice(0, 500);
|
|
66
|
+
const errorMessage = extractTurnEndError(event);
|
|
67
|
+
if (errorMessage)
|
|
68
|
+
extra.errorMessage = errorMessage;
|
|
68
69
|
}
|
|
69
|
-
eventQueue.push({ type: "log", level: "debug", message: "event", data: extra });
|
|
70
|
+
eventQueue.push({ type: "log", level: "debug", message: "conversation.event", data: extra });
|
|
70
71
|
}
|
|
71
72
|
// Error events
|
|
72
73
|
if (event.type === "error") {
|
|
@@ -79,12 +80,7 @@ export class PiHarness {
|
|
|
79
80
|
}
|
|
80
81
|
// Text deltas
|
|
81
82
|
if (event.type === "message_update" && event.assistantMessageEvent?.type === "text_delta") {
|
|
82
|
-
eventQueue.push({ type: "text_delta", delta: event.assistantMessageEvent.delta });
|
|
83
|
-
}
|
|
84
|
-
// Accumulated text log on message_end
|
|
85
|
-
if (event.type === "message_end") {
|
|
86
|
-
// The consumer tracks accumulated text per turn
|
|
87
|
-
eventQueue.push({ type: "log", level: "info", message: "message_end" });
|
|
83
|
+
eventQueue.push({ type: "text_delta", delta: event.assistantMessageEvent.delta, raw: event });
|
|
88
84
|
}
|
|
89
85
|
// Tool execution events
|
|
90
86
|
if (event.type === "tool_execution_start") {
|
|
@@ -97,6 +93,7 @@ export class PiHarness {
|
|
|
97
93
|
toolName: event.toolName,
|
|
98
94
|
toolCallId: event.toolCallId,
|
|
99
95
|
command: cmd || undefined,
|
|
96
|
+
raw: event,
|
|
100
97
|
});
|
|
101
98
|
}
|
|
102
99
|
if (event.type === "tool_execution_end") {
|
|
@@ -110,6 +107,7 @@ export class PiHarness {
|
|
|
110
107
|
toolCallId: event.toolCallId,
|
|
111
108
|
result: resultStr,
|
|
112
109
|
isError: !!event.isError,
|
|
110
|
+
raw: event,
|
|
113
111
|
});
|
|
114
112
|
}
|
|
115
113
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pi-harness.js","sourceRoot":"","sources":["../../../src/agents/harness/pi-harness.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,cAAc,EACd,iBAAiB,GAClB,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAuB,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"pi-harness.js","sourceRoot":"","sources":["../../../src/agents/harness/pi-harness.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ export interface HarnessLogEvent {
|
|
|
17
17
|
export interface HarnessTextDeltaEvent {
|
|
18
18
|
type: "text_delta";
|
|
19
19
|
delta: string;
|
|
20
|
+
raw?: unknown;
|
|
20
21
|
}
|
|
21
22
|
export interface HarnessToolStartEvent {
|
|
22
23
|
type: "tool_start";
|
|
@@ -24,6 +25,7 @@ export interface HarnessToolStartEvent {
|
|
|
24
25
|
toolCallId: string;
|
|
25
26
|
/** For bash tools, the command being run */
|
|
26
27
|
command?: string;
|
|
28
|
+
raw?: unknown;
|
|
27
29
|
}
|
|
28
30
|
export interface HarnessToolEndEvent {
|
|
29
31
|
type: "tool_end";
|
|
@@ -31,6 +33,7 @@ export interface HarnessToolEndEvent {
|
|
|
31
33
|
toolCallId: string;
|
|
32
34
|
result: string;
|
|
33
35
|
isError: boolean;
|
|
36
|
+
raw?: unknown;
|
|
34
37
|
}
|
|
35
38
|
export interface HarnessUsageEvent {
|
|
36
39
|
type: "usage";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/agents/harness/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAMzE,MAAM,MAAM,YAAY,GACpB,eAAe,GACf,qBAAqB,GACrB,qBAAqB,GACrB,mBAAmB,GACnB,iBAAiB,GACjB,gBAAgB,CAAC;AAErB,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,KAAK,CAAC;IACZ,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,YAAY,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,4CAA4C;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/agents/harness/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAMzE,MAAM,MAAM,YAAY,GACpB,eAAe,GACf,qBAAqB,GACrB,qBAAqB,GACrB,mBAAmB,GACnB,iBAAiB,GACjB,gBAAgB,CAAC;AAErB,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,KAAK,CAAC;IACZ,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,YAAY,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,4CAA4C;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,EAAE,OAAO,CAAC;CAC7B;AAMD,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,mEAAmE;IACnE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;IACvE,OAAO,IAAI,IAAI,CAAC;CACjB;AAED,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/agents/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAK3D,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,eAAe,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/D,gFAAgF;IAChF,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAgB,cAAc,IAAI,MAAM,CAiDvC;AAED,wBAAgB,kBAAkB,CAAC,eAAe,CAAC,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,MAAM,CA4DzG;AAMD,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,MAAM,CAmCtG;
|
|
1
|
+
{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/agents/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAK3D,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,eAAe,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/D,gFAAgF;IAChF,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAgB,cAAc,IAAI,MAAM,CAiDvC;AAED,wBAAgB,kBAAkB,CAAC,eAAe,CAAC,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,MAAM,CA4DzG;AAMD,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,MAAM,CAmCtG;AAuCD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,MAAM,CAO3F;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAE7C;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAG9E;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,CAGlE;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,MAAM,CAE5F;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAG1G;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,MAAM,CAE/H;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,MAAM,CAEnH"}
|
package/dist/agents/prompt.js
CHANGED
|
@@ -112,7 +112,8 @@ function buildEnvironmentContext(options) {
|
|
|
112
112
|
"**Filesystem:** The filesystem is writable. Your working directory is your current CWD.",
|
|
113
113
|
"Clone repos and write files directly in the current directory.",
|
|
114
114
|
"",
|
|
115
|
-
"**Environment variables:**
|
|
115
|
+
"**Environment variables:** Plain `export` does not persist across bash commands.",
|
|
116
|
+
"Persist values with `al-export NAME value`. Before each later command that needs them, start with `. \"$(al-export -f)\"`.",
|
|
116
117
|
"</environment>",
|
|
117
118
|
].join("\n");
|
|
118
119
|
}
|
|
@@ -123,7 +124,8 @@ function buildEnvironmentContext(options) {
|
|
|
123
124
|
"Your working directory is `/app/static` which contains your agent files (SKILL.md, agent-config.json).",
|
|
124
125
|
"All write operations (git clone, file creation, etc.) must target `/tmp`.",
|
|
125
126
|
"",
|
|
126
|
-
"**Environment variables:**
|
|
127
|
+
"**Environment variables:** Plain `export` does not persist across bash commands.",
|
|
128
|
+
"Persist values with `al-export NAME value`. Before each later command that needs them, start with `. \"$(al-export -f)\"`.",
|
|
127
129
|
"</environment>",
|
|
128
130
|
].join("\n");
|
|
129
131
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/agents/prompt.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/agents/prompt.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-loop.d.ts","sourceRoot":"","sources":["../../src/agents/session-loop.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,mBAAmB,EAA2C,MAAM,qBAAqB,CAAC;AAInG,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,cAAc,EAAE,mBAAmB,CAAC;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,cAAc,EAAE,GAAG,CAAC;IACpB,eAAe,EAAE,GAAG,CAAC;IACrB,gEAAgE;IAChE,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;IACtE,oBAAoB,CAAC,EAAE,MAAM,IAAI,CAAC;CACnC;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,EAAE,OAAO,CAAC;CAC7B;
|
|
1
|
+
{"version":3,"file":"session-loop.d.ts","sourceRoot":"","sources":["../../src/agents/session-loop.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,mBAAmB,EAA2C,MAAM,qBAAqB,CAAC;AAInG,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,cAAc,EAAE,mBAAmB,CAAC;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,cAAc,EAAE,GAAG,CAAC;IACpB,eAAe,EAAE,GAAG,CAAC;IACrB,gEAAgE;IAChE,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;IACtE,oBAAoB,CAAC,EAAE,MAAM,IAAI,CAAC;CACnC;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,EAAE,OAAO,CAAC;CAC7B;AAgBD,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,iBAAiB,CAAC,CAyK5B"}
|
|
@@ -9,10 +9,21 @@ import { AuthStorage, createAgentSession, SessionManager, createCodingTools, } f
|
|
|
9
9
|
import { sessionStatsToUsage } from "../shared/usage.js";
|
|
10
10
|
import { selectAvailableModels, isRateLimitError } from "./model-fallback.js";
|
|
11
11
|
import { isUnrecoverableError, UNRECOVERABLE_THRESHOLD } from "../shared/errors.js";
|
|
12
|
-
import {
|
|
12
|
+
import { extractTurnEndError } from "./turn-end-error.js";
|
|
13
13
|
const MAX_PASSES = 3;
|
|
14
14
|
const DEFAULT_BACKOFF_MS = 30_000;
|
|
15
15
|
const MAX_BACKOFF_MS = 300_000;
|
|
16
|
+
function extractToolResultText(result) {
|
|
17
|
+
try {
|
|
18
|
+
const parsed = JSON.parse(result);
|
|
19
|
+
if (parsed?.content?.[0]?.text)
|
|
20
|
+
return String(parsed.content[0].text);
|
|
21
|
+
}
|
|
22
|
+
catch {
|
|
23
|
+
// Fall back to raw result.
|
|
24
|
+
}
|
|
25
|
+
return result;
|
|
26
|
+
}
|
|
16
27
|
export async function runSessionLoop(prompt, opts) {
|
|
17
28
|
const { models, circuitBreaker, cwd, resourceLoader, settingsManager, providerKeys, log, onUnrecoverableAbort } = opts;
|
|
18
29
|
const pendingCmds = new Map();
|
|
@@ -41,16 +52,14 @@ export async function runSessionLoop(prompt, opts) {
|
|
|
41
52
|
thinkingLevel: modelThinking,
|
|
42
53
|
authStorage,
|
|
43
54
|
resourceLoader,
|
|
44
|
-
tools: createCodingTools(cwd, {
|
|
45
|
-
bash: { commandPrefix: BASH_COMMAND_PREFIX },
|
|
46
|
-
}),
|
|
55
|
+
tools: createCodingTools(cwd, {}),
|
|
47
56
|
sessionManager: SessionManager.inMemory(),
|
|
48
57
|
settingsManager,
|
|
49
58
|
});
|
|
50
59
|
session.subscribe((event) => {
|
|
51
60
|
eventCount++;
|
|
52
61
|
if (event.type !== "message_update") {
|
|
53
|
-
const extra = {
|
|
62
|
+
const extra = { eventType: event.type, eventCount, raw: event };
|
|
54
63
|
if (event.type === "message_start" || event.type === "message_end") {
|
|
55
64
|
extra.role = event.role || event.message?.role;
|
|
56
65
|
extra.content = JSON.stringify(event.content || event.message?.content || []).slice(0, 500);
|
|
@@ -58,8 +67,11 @@ export async function runSessionLoop(prompt, opts) {
|
|
|
58
67
|
}
|
|
59
68
|
if (event.type === "turn_end") {
|
|
60
69
|
extra.turnResult = JSON.stringify(event).slice(0, 500);
|
|
70
|
+
const errorMessage = extractTurnEndError(event);
|
|
71
|
+
if (errorMessage)
|
|
72
|
+
extra.errorMessage = errorMessage;
|
|
61
73
|
}
|
|
62
|
-
log("debug", "event", extra);
|
|
74
|
+
log("debug", "conversation.event", extra);
|
|
63
75
|
}
|
|
64
76
|
if (event.type === "error") {
|
|
65
77
|
log("error", "session error", { error: String(event.error || event.message || JSON.stringify(event)) });
|
|
@@ -71,19 +83,26 @@ export async function runSessionLoop(prompt, opts) {
|
|
|
71
83
|
}
|
|
72
84
|
if (event.type === "message_end") {
|
|
73
85
|
if (currentTurnText.trim()) {
|
|
74
|
-
log("info", "
|
|
86
|
+
log("info", "conversation.message", {
|
|
87
|
+
kind: "conversation",
|
|
88
|
+
role: event.role || event.message?.role || "assistant",
|
|
89
|
+
stopReason: event.stopReason || event.stop_reason,
|
|
90
|
+
text: currentTurnText.trim(),
|
|
91
|
+
raw: event,
|
|
92
|
+
});
|
|
75
93
|
}
|
|
76
94
|
currentTurnText = "";
|
|
77
95
|
}
|
|
78
96
|
if (event.type === "tool_execution_start") {
|
|
79
97
|
const cmd = String(event.args?.command || "");
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
98
|
+
pendingCmds.set(event.toolCallId, cmd);
|
|
99
|
+
log("info", "conversation.tool_call", {
|
|
100
|
+
kind: "conversation",
|
|
101
|
+
tool: event.toolName,
|
|
102
|
+
toolCallId: event.toolCallId,
|
|
103
|
+
cmd,
|
|
104
|
+
raw: event,
|
|
105
|
+
});
|
|
87
106
|
}
|
|
88
107
|
if (event.type === "tool_execution_end") {
|
|
89
108
|
const resultStr = typeof event.result === "string"
|
|
@@ -91,16 +110,19 @@ export async function runSessionLoop(prompt, opts) {
|
|
|
91
110
|
: JSON.stringify(event.result);
|
|
92
111
|
const originCmd = pendingCmds.get(event.toolCallId);
|
|
93
112
|
pendingCmds.delete(event.toolCallId);
|
|
113
|
+
const resultText = extractToolResultText(resultStr);
|
|
114
|
+
log(event.isError ? "error" : "info", "conversation.tool_result", {
|
|
115
|
+
kind: "conversation",
|
|
116
|
+
tool: event.toolName,
|
|
117
|
+
toolCallId: event.toolCallId,
|
|
118
|
+
cmd: originCmd,
|
|
119
|
+
result: resultStr,
|
|
120
|
+
resultText,
|
|
121
|
+
isError: event.isError,
|
|
122
|
+
raw: event,
|
|
123
|
+
});
|
|
94
124
|
if (event.isError) {
|
|
95
|
-
|
|
96
|
-
let errorMsg = resultStr;
|
|
97
|
-
try {
|
|
98
|
-
const parsed = JSON.parse(resultStr);
|
|
99
|
-
if (parsed?.content?.[0]?.text)
|
|
100
|
-
errorMsg = parsed.content[0].text;
|
|
101
|
-
}
|
|
102
|
-
catch { /* use raw string */ }
|
|
103
|
-
if (isUnrecoverableError(errorMsg)) {
|
|
125
|
+
if (isUnrecoverableError(resultText)) {
|
|
104
126
|
unrecoverableErrors++;
|
|
105
127
|
if (unrecoverableErrors >= UNRECOVERABLE_THRESHOLD) {
|
|
106
128
|
log("error", "Aborting: repeated auth/permission failures — check credentials");
|
|
@@ -111,9 +133,6 @@ export async function runSessionLoop(prompt, opts) {
|
|
|
111
133
|
}
|
|
112
134
|
}
|
|
113
135
|
}
|
|
114
|
-
else {
|
|
115
|
-
log("debug", "tool done", { tool: event.toolName, resultLength: resultStr.length });
|
|
116
|
-
}
|
|
117
136
|
}
|
|
118
137
|
});
|
|
119
138
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-loop.js","sourceRoot":"","sources":["../../src/agents/session-loop.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,cAAc,EACd,iBAAiB,GAClB,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAuB,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACnG,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"session-loop.js","sourceRoot":"","sources":["../../src/agents/session-loop.ts"],"names":[],"mappings":"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"}
|
package/dist/agents/signals.js
CHANGED
|
@@ -77,11 +77,11 @@ echo '{"ok":true}'
|
|
|
77
77
|
writeFileSync(join(binDir, "al-status"), alStatus, { mode: 0o755 });
|
|
78
78
|
writeFileSync(join(binDir, "al-return"), alReturn, { mode: 0o755 });
|
|
79
79
|
writeFileSync(join(binDir, "al-exit"), alExit, { mode: 0o755 });
|
|
80
|
-
// Copy
|
|
80
|
+
// Copy environment helper scripts from docker/bin/ (included in the npm package).
|
|
81
81
|
const thisDir = dirname(fileURLToPath(import.meta.url));
|
|
82
82
|
const packageRoot = join(thisDir, "..", "..");
|
|
83
|
-
const
|
|
84
|
-
writeFileSync(join(binDir, "al-
|
|
83
|
+
const exportSrc = join(packageRoot, "docker", "bin", "al-export");
|
|
84
|
+
writeFileSync(join(binDir, "al-export"), readFileSync(exportSrc), { mode: 0o755 });
|
|
85
85
|
}
|
|
86
86
|
/**
|
|
87
87
|
* Read signal files written by the shell commands.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signals.js","sourceRoot":"","sources":["../../src/agents/signals.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACxE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AASpC;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,SAAiB;IAC/C,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AAC5C,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB,CAAC,MAAc,EAAE,SAAiB;IACrE,SAAS,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACvC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE1C,wCAAwC;IACxC,MAAM,OAAO,GAAG;;;;;;;;CAQjB,CAAC;IAEA,iCAAiC;IACjC,MAAM,QAAQ,GAAG;;;;;;;;;CASlB,CAAC;IAEA,iEAAiE;IACjE,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;CAclB,CAAC;IAEA,wCAAwC;IACxC,oEAAoE;IACpE,MAAM,MAAM,GAAG;QACb,WAAW;QACX,iBAAiB;QACjB,iDAAiD;QACjD,sBAAsB;QACtB,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAClE,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACpE,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACpE,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAEhE,
|
|
1
|
+
{"version":3,"file":"signals.js","sourceRoot":"","sources":["../../src/agents/signals.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"turn-end-error.d.ts","sourceRoot":"","sources":["../../src/agents/turn-end-error.ts"],"names":[],"mappings":"AAAA,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAuBtE"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
export function extractTurnEndError(event) {
|
|
2
|
+
if (!event || typeof event !== "object")
|
|
3
|
+
return undefined;
|
|
4
|
+
const record = event;
|
|
5
|
+
const candidates = [
|
|
6
|
+
record.errorMessage,
|
|
7
|
+
record.error_message,
|
|
8
|
+
record.error,
|
|
9
|
+
record.message,
|
|
10
|
+
];
|
|
11
|
+
for (const value of candidates) {
|
|
12
|
+
if (typeof value === "string" && value.trim()) {
|
|
13
|
+
return value.trim();
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
const result = record.result;
|
|
17
|
+
if (result && typeof result === "object") {
|
|
18
|
+
return extractTurnEndError(result);
|
|
19
|
+
}
|
|
20
|
+
return undefined;
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=turn-end-error.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"turn-end-error.js","sourceRoot":"","sources":["../../src/agents/turn-end-error.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,mBAAmB,CAAC,KAAc;IAChD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IAE1D,MAAM,MAAM,GAAG,KAAgC,CAAC;IAChD,MAAM,UAAU,GAAG;QACjB,MAAM,CAAC,YAAY;QACnB,MAAM,CAAC,aAAa;QACpB,MAAM,CAAC,KAAK;QACZ,MAAM,CAAC,OAAO;KACf,CAAC;IAEF,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;QAC/B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YAC9C,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;QACtB,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7B,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QACzC,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
package/dist/build-info.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"gitSha":"
|
|
1
|
+
{"gitSha":"372be03d"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/logs.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/logs.ts"],"names":[],"mappings":"AA4eA,wBAAsB,OAAO,CAC3B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GACpK,OAAO,CAAC,IAAI,CAAC,CAsJf"}
|
|
@@ -58,7 +58,7 @@ function formatConversationEntry(entry, showAll = false) {
|
|
|
58
58
|
if (!showAll) {
|
|
59
59
|
// Skip debug-level noise (except tool errors which are level 50)
|
|
60
60
|
if (entry.level <= 20 && !SKIP_MESSAGES.has(msg)) {
|
|
61
|
-
// Show debug tool starts for non-bash tools
|
|
61
|
+
// Show debug tool starts for non-bash tools and conversation events only in --all
|
|
62
62
|
if (msg === "tool start") {
|
|
63
63
|
const tool = String(entry.tool || "unknown");
|
|
64
64
|
return `${time} ${BLUE}▸ ${tool}${RESET}`;
|
|
@@ -70,7 +70,7 @@ function formatConversationEntry(entry, showAll = false) {
|
|
|
70
70
|
return null;
|
|
71
71
|
}
|
|
72
72
|
// ── Assistant text output ──
|
|
73
|
-
if (msg === "assistant") {
|
|
73
|
+
if (msg === "assistant" || msg === "conversation.message") {
|
|
74
74
|
const text = String(entry.text || "");
|
|
75
75
|
if (!text)
|
|
76
76
|
return null;
|
|
@@ -83,15 +83,28 @@ function formatConversationEntry(entry, showAll = false) {
|
|
|
83
83
|
return `${first}\n${rest}`;
|
|
84
84
|
}
|
|
85
85
|
// ── Bash command ──
|
|
86
|
-
if (msg === "bash") {
|
|
86
|
+
if (msg === "bash" || (msg === "conversation.tool_call" && entry.tool === "bash")) {
|
|
87
87
|
const cmd = String(entry.cmd || "");
|
|
88
88
|
return `${time} ${instanceTag}${CYAN}$ ${cmd}${RESET}`;
|
|
89
89
|
}
|
|
90
90
|
// ── Tool start (non-bash, logged at info level in some paths) ──
|
|
91
|
-
if (msg === "tool start") {
|
|
91
|
+
if (msg === "tool start" || msg === "conversation.tool_call") {
|
|
92
92
|
const tool = String(entry.tool || "unknown");
|
|
93
93
|
return `${time} ${BLUE}▸ ${tool}${RESET}`;
|
|
94
94
|
}
|
|
95
|
+
// ── Tool result ──
|
|
96
|
+
if (msg === "conversation.tool_result") {
|
|
97
|
+
const tool = String(entry.tool || "unknown");
|
|
98
|
+
const cmd = entry.cmd ? `\n ${DIM}$ ${String(entry.cmd)}${RESET}` : "";
|
|
99
|
+
const text = String(entry.resultText || entry.result || "");
|
|
100
|
+
const rendered = text
|
|
101
|
+
? `\n ${DIM}${text.split("\n").join(`\n `)}${RESET}`
|
|
102
|
+
: "";
|
|
103
|
+
if (entry.isError) {
|
|
104
|
+
return `${time} ${instanceTag}${RED}✗ ${tool} failed${RESET}${cmd}${rendered}`;
|
|
105
|
+
}
|
|
106
|
+
return `${time} ${instanceTag}${GRAY}↳ ${tool} result${RESET}${cmd}${rendered}`;
|
|
107
|
+
}
|
|
95
108
|
// ── Tool error ──
|
|
96
109
|
if (msg === "tool error") {
|
|
97
110
|
const tool = String(entry.tool || "unknown");
|
|
@@ -149,8 +162,8 @@ function formatConversationEntry(entry, showAll = false) {
|
|
|
149
162
|
return `${time} ${YELLOW}WARN: ${msg}${RESET}${warnText}${warnError}${extraStr}`;
|
|
150
163
|
}
|
|
151
164
|
// ── Session events (debug-level, visible with --all) ──
|
|
152
|
-
if (msg === "event") {
|
|
153
|
-
const evType = String(entry.type || "unknown");
|
|
165
|
+
if (msg === "event" || msg === "conversation.event") {
|
|
166
|
+
const evType = String(entry.eventType || entry.type || "unknown");
|
|
154
167
|
const parts = [`${time} ${GRAY}▪ ${evType}${RESET}`];
|
|
155
168
|
if (entry.role)
|
|
156
169
|
parts[0] += ` ${DIM}role=${entry.role}${RESET}`;
|
|
@@ -165,6 +178,9 @@ function formatConversationEntry(entry, showAll = false) {
|
|
|
165
178
|
const tr = String(entry.turnResult).slice(0, 200);
|
|
166
179
|
parts.push(` ${GRAY}${tr}${RESET}`);
|
|
167
180
|
}
|
|
181
|
+
if (entry.raw) {
|
|
182
|
+
parts.push(` ${GRAY}${JSON.stringify(entry.raw).slice(0, 500)}${RESET}`);
|
|
183
|
+
}
|
|
168
184
|
return parts.join("\n");
|
|
169
185
|
}
|
|
170
186
|
// ── Tool done (debug-level, visible with --all) ──
|