@dirgha/code 1.17.0 → 1.17.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli/first-run.d.ts +10 -0
- package/dist/cli/first-run.js +86 -0
- package/dist/cli/first-run.js.map +1 -0
- package/dist/cli/main.js +16 -4
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/slash/login.d.ts +2 -2
- package/dist/cli/slash/login.js +8 -8
- package/dist/cli/slash/login.js.map +1 -1
- package/dist/cli/subcommands/login.d.ts +1 -1
- package/dist/cli/subcommands/login.js +42 -34
- package/dist/cli/subcommands/login.js.map +1 -1
- package/dist/integrations/device-auth.js +53 -42
- package/dist/integrations/device-auth.js.map +1 -1
- package/dist/intelligence/error-classifier.d.ts +2 -2
- package/dist/intelligence/error-classifier.js +76 -33
- package/dist/intelligence/error-classifier.js.map +1 -1
- package/dist/kernel/agent-loop.js +3 -0
- package/dist/kernel/agent-loop.js.map +1 -1
- package/dist/kernel/types.d.ts +2 -0
- package/dist/tui/ink/App.js +1 -1
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/use-event-projection.d.ts +1 -0
- package/dist/tui/ink/use-event-projection.js +3 -0
- package/dist/tui/ink/use-event-projection.js.map +1 -1
- package/package.json +1 -1
|
@@ -12,46 +12,49 @@
|
|
|
12
12
|
* - CLI subcommands (`dirgha login`, `dirgha logout`).
|
|
13
13
|
* - Billing preflight (`preRequestCheck` reads the bearer).
|
|
14
14
|
*/
|
|
15
|
-
import { chmod, mkdir, readFile, rename, stat, unlink, writeFile, open } from
|
|
16
|
-
import { homedir } from
|
|
17
|
-
import { dirname, join } from
|
|
18
|
-
const DEFAULT_API_BASE =
|
|
15
|
+
import { chmod, mkdir, readFile, rename, stat, unlink, writeFile, open, } from "node:fs/promises";
|
|
16
|
+
import { homedir } from "node:os";
|
|
17
|
+
import { dirname, join } from "node:path";
|
|
18
|
+
const DEFAULT_API_BASE = "https://api.dirgha.ai";
|
|
19
19
|
const POLL_INTERVAL_MS = 2_000;
|
|
20
20
|
const POLL_TIMEOUT_MS = 15 * 60 * 1_000;
|
|
21
21
|
const TOKEN_TTL_MS = 30 * 24 * 60 * 60 * 1_000;
|
|
22
22
|
function resolveApiBase(apiBase) {
|
|
23
23
|
const raw = apiBase ?? process.env.DIRGHA_API_BASE ?? DEFAULT_API_BASE;
|
|
24
|
-
return raw.replace(/\/+$/,
|
|
24
|
+
return raw.replace(/\/+$/, "");
|
|
25
25
|
}
|
|
26
26
|
function credentialsPath() {
|
|
27
|
-
return join(homedir(),
|
|
27
|
+
return join(homedir(), ".dirgha", "credentials.json");
|
|
28
28
|
}
|
|
29
29
|
function redact(err) {
|
|
30
30
|
const message = err instanceof Error ? err.message : String(err);
|
|
31
|
-
return message.replace(/Bearer\s+[\w.-]+/gi,
|
|
31
|
+
return message.replace(/Bearer\s+[\w.-]+/gi, "Bearer [REDACTED]");
|
|
32
32
|
}
|
|
33
33
|
export async function startDeviceAuth(apiBase) {
|
|
34
34
|
const base = resolveApiBase(apiBase);
|
|
35
35
|
let response;
|
|
36
36
|
try {
|
|
37
|
-
response = await fetch(`${base}/api/auth/device/
|
|
38
|
-
method:
|
|
39
|
-
headers: {
|
|
40
|
-
|
|
37
|
+
response = await fetch(`${base}/api/auth/device/request`, {
|
|
38
|
+
method: "POST",
|
|
39
|
+
headers: {
|
|
40
|
+
"Content-Type": "application/json",
|
|
41
|
+
Accept: "application/json",
|
|
42
|
+
},
|
|
43
|
+
body: JSON.stringify({ client_id: "dirgha-cli" }),
|
|
41
44
|
});
|
|
42
45
|
}
|
|
43
46
|
catch (err) {
|
|
44
|
-
throw new Error(`device/
|
|
47
|
+
throw new Error(`device/request request failed: ${redact(err)}`);
|
|
45
48
|
}
|
|
46
49
|
if (!response.ok) {
|
|
47
|
-
throw new Error(`device/
|
|
50
|
+
throw new Error(`device/request failed: HTTP ${response.status}`);
|
|
48
51
|
}
|
|
49
52
|
const data = (await response.json());
|
|
50
53
|
const deviceCode = data.device_code;
|
|
51
54
|
const userCode = data.user_code;
|
|
52
55
|
const verifyUri = data.verification_uri ?? data.verification_url;
|
|
53
56
|
if (!deviceCode || !userCode || !verifyUri) {
|
|
54
|
-
throw new Error(
|
|
57
|
+
throw new Error("device/request returned malformed payload");
|
|
55
58
|
}
|
|
56
59
|
return {
|
|
57
60
|
deviceCode,
|
|
@@ -68,10 +71,12 @@ export async function pollDeviceAuth(deviceCode, apiBase, opts = {}) {
|
|
|
68
71
|
while (Date.now() < deadline) {
|
|
69
72
|
let response;
|
|
70
73
|
try {
|
|
71
|
-
response = await fetch(`${base}/api/auth/device/poll`, {
|
|
72
|
-
method:
|
|
73
|
-
headers: {
|
|
74
|
-
|
|
74
|
+
response = await fetch(`${base}/api/auth/device/poll?device_code=${encodeURIComponent(deviceCode)}`, {
|
|
75
|
+
method: "GET",
|
|
76
|
+
headers: {
|
|
77
|
+
Accept: "application/json",
|
|
78
|
+
"Content-Type": "application/json",
|
|
79
|
+
},
|
|
75
80
|
});
|
|
76
81
|
}
|
|
77
82
|
catch (err) {
|
|
@@ -82,29 +87,31 @@ export async function pollDeviceAuth(deviceCode, apiBase, opts = {}) {
|
|
|
82
87
|
continue;
|
|
83
88
|
}
|
|
84
89
|
if (response.status === 410)
|
|
85
|
-
throw new Error(
|
|
90
|
+
throw new Error("device code expired");
|
|
86
91
|
if (response.status === 403)
|
|
87
|
-
throw new Error(
|
|
92
|
+
throw new Error("device code denied");
|
|
88
93
|
if (response.ok) {
|
|
89
94
|
const data = (await response.json());
|
|
90
|
-
if (data.status ===
|
|
95
|
+
if (data.status === "authorized" && data.token) {
|
|
91
96
|
return {
|
|
92
97
|
token: data.token,
|
|
93
|
-
userId: data.user?.id ??
|
|
94
|
-
email: data.user?.email ??
|
|
98
|
+
userId: data.user?.id ?? "unknown",
|
|
99
|
+
email: data.user?.email ?? "unknown",
|
|
95
100
|
};
|
|
96
101
|
}
|
|
97
|
-
if (data.status ===
|
|
98
|
-
throw new Error(
|
|
99
|
-
if (data.status ===
|
|
100
|
-
throw new Error(
|
|
102
|
+
if (data.status === "denied")
|
|
103
|
+
throw new Error("device code denied");
|
|
104
|
+
if (data.status === "expired")
|
|
105
|
+
throw new Error("device code expired");
|
|
101
106
|
}
|
|
102
|
-
else if (response.status !== 202 &&
|
|
107
|
+
else if (response.status !== 202 &&
|
|
108
|
+
response.status !== 425 &&
|
|
109
|
+
response.status !== 428) {
|
|
103
110
|
throw new Error(`device/poll failed: HTTP ${response.status}`);
|
|
104
111
|
}
|
|
105
112
|
await sleep(intervalMs);
|
|
106
113
|
}
|
|
107
|
-
throw new Error(
|
|
114
|
+
throw new Error("device/poll timed out");
|
|
108
115
|
}
|
|
109
116
|
export async function saveToken(token, userId, email) {
|
|
110
117
|
const path = credentialsPath();
|
|
@@ -120,9 +127,9 @@ export async function saveToken(token, userId, email) {
|
|
|
120
127
|
// then rename into place — avoids a world-readable window where any local
|
|
121
128
|
// process could read the JWT between writeFile and chmod.
|
|
122
129
|
try {
|
|
123
|
-
const fh = await open(tmp,
|
|
130
|
+
const fh = await open(tmp, "w", 0o600);
|
|
124
131
|
try {
|
|
125
|
-
await fh.writeFile(JSON.stringify(payload, null, 2),
|
|
132
|
+
await fh.writeFile(JSON.stringify(payload, null, 2), "utf8");
|
|
126
133
|
}
|
|
127
134
|
finally {
|
|
128
135
|
await fh.close();
|
|
@@ -132,17 +139,19 @@ export async function saveToken(token, userId, email) {
|
|
|
132
139
|
catch {
|
|
133
140
|
// Fallback path for platforms where open+mode isn't supported (e.g. Windows):
|
|
134
141
|
// write first, then chmod. The window is unavoidable there.
|
|
135
|
-
await writeFile(path, JSON.stringify(payload, null, 2),
|
|
142
|
+
await writeFile(path, JSON.stringify(payload, null, 2), "utf8");
|
|
136
143
|
try {
|
|
137
144
|
await chmod(path, 0o600);
|
|
138
145
|
}
|
|
139
|
-
catch {
|
|
146
|
+
catch {
|
|
147
|
+
/* non-POSIX */
|
|
148
|
+
}
|
|
140
149
|
await unlink(tmp).catch(() => undefined);
|
|
141
150
|
}
|
|
142
151
|
}
|
|
143
152
|
export async function loadToken() {
|
|
144
153
|
const path = credentialsPath();
|
|
145
|
-
const text = await readFile(path,
|
|
154
|
+
const text = await readFile(path, "utf8").catch(() => undefined);
|
|
146
155
|
if (!text)
|
|
147
156
|
return null;
|
|
148
157
|
try {
|
|
@@ -169,7 +178,7 @@ export async function clearToken() {
|
|
|
169
178
|
* Logs a single line to stderr on a successful move. Silent on no-op.
|
|
170
179
|
*/
|
|
171
180
|
export async function migrateLegacyAuth() {
|
|
172
|
-
const legacyPath = join(homedir(),
|
|
181
|
+
const legacyPath = join(homedir(), ".dirgha", "auth.json");
|
|
173
182
|
const targetPath = credentialsPath();
|
|
174
183
|
const legacyInfo = await stat(legacyPath).catch(() => undefined);
|
|
175
184
|
if (!legacyInfo || !legacyInfo.isFile() || legacyInfo.size === 0)
|
|
@@ -177,7 +186,7 @@ export async function migrateLegacyAuth() {
|
|
|
177
186
|
const targetInfo = await stat(targetPath).catch(() => undefined);
|
|
178
187
|
if (targetInfo && targetInfo.size > 0)
|
|
179
188
|
return false;
|
|
180
|
-
const text = await readFile(legacyPath,
|
|
189
|
+
const text = await readFile(legacyPath, "utf8").catch(() => undefined);
|
|
181
190
|
if (!text)
|
|
182
191
|
return false;
|
|
183
192
|
let parsed;
|
|
@@ -192,20 +201,22 @@ export async function migrateLegacyAuth() {
|
|
|
192
201
|
await mkdir(dirname(targetPath), { recursive: true });
|
|
193
202
|
const payload = {
|
|
194
203
|
token: parsed.jwt,
|
|
195
|
-
userId: parsed.userId ??
|
|
196
|
-
email:
|
|
204
|
+
userId: parsed.userId ?? "unknown",
|
|
205
|
+
email: "unknown",
|
|
197
206
|
expiresAt: parsed.expiresAt ?? new Date(Date.now() + TOKEN_TTL_MS).toISOString(),
|
|
198
207
|
};
|
|
199
|
-
await writeFile(targetPath, JSON.stringify(payload, null, 2),
|
|
208
|
+
await writeFile(targetPath, JSON.stringify(payload, null, 2), "utf8");
|
|
200
209
|
try {
|
|
201
210
|
await chmod(targetPath, 0o600);
|
|
202
211
|
}
|
|
203
|
-
catch {
|
|
212
|
+
catch {
|
|
213
|
+
/* non-POSIX */
|
|
214
|
+
}
|
|
204
215
|
await rename(legacyPath, `${legacyPath}.migrated`).catch(() => undefined);
|
|
205
|
-
process.stderr.write(
|
|
216
|
+
process.stderr.write("[auth] migrated legacy credentials\n");
|
|
206
217
|
return true;
|
|
207
218
|
}
|
|
208
219
|
function sleep(ms) {
|
|
209
|
-
return new Promise(resolve => setTimeout(resolve, ms));
|
|
220
|
+
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
210
221
|
}
|
|
211
222
|
//# sourceMappingURL=device-auth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-auth.js","sourceRoot":"","sources":["../../src/integrations/device-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"device-auth.js","sourceRoot":"","sources":["../../src/integrations/device-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
* ClassifiedError with actionable recovery hints. The agent loop and
|
|
4
4
|
* retry policy consult this — no string matching anywhere else.
|
|
5
5
|
*/
|
|
6
|
-
import type { ErrorClassifier } from
|
|
7
|
-
export type ErrorReason =
|
|
6
|
+
import type { ErrorClassifier } from "../kernel/types.js";
|
|
7
|
+
export type ErrorReason = "auth" | "billing" | "rate_limit" | "overloaded" | "timeout" | "network" | "context_overflow" | "model_not_found" | "format_error" | "tool_schema" | "content_filter" | "unknown";
|
|
8
8
|
export declare function createErrorClassifier(): ErrorClassifier;
|
|
@@ -3,69 +3,112 @@
|
|
|
3
3
|
* ClassifiedError with actionable recovery hints. The agent loop and
|
|
4
4
|
* retry policy consult this — no string matching anywhere else.
|
|
5
5
|
*/
|
|
6
|
-
import { ProviderError } from
|
|
6
|
+
import { ProviderError } from "../providers/iface.js";
|
|
7
7
|
export function createErrorClassifier() {
|
|
8
8
|
return {
|
|
9
9
|
classify(err, provider, model) {
|
|
10
10
|
const { reason, backoffMs } = diagnose(err);
|
|
11
|
-
|
|
12
|
-
void model;
|
|
11
|
+
const userMessage = composeUserMessage(reason, err, provider, model);
|
|
13
12
|
return {
|
|
14
13
|
reason,
|
|
15
14
|
retryable: isRetryable(reason),
|
|
16
15
|
backoffMs,
|
|
17
16
|
shouldFallback: shouldFallback(reason),
|
|
17
|
+
userMessage,
|
|
18
18
|
};
|
|
19
19
|
},
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
|
+
const PROVIDER_ENV = {
|
|
23
|
+
anthropic: "ANTHROPIC_API_KEY",
|
|
24
|
+
openai: "OPENAI_API_KEY",
|
|
25
|
+
openrouter: "OPENROUTER_API_KEY",
|
|
26
|
+
nvidia: "NVIDIA_API_KEY",
|
|
27
|
+
gemini: "GEMINI_API_KEY",
|
|
28
|
+
deepseek: "DEEPSEEK_API_KEY",
|
|
29
|
+
};
|
|
30
|
+
function composeUserMessage(reason, err, provider, model) {
|
|
31
|
+
const label = PROVIDER_ENV[provider];
|
|
32
|
+
switch (reason) {
|
|
33
|
+
case "auth":
|
|
34
|
+
if (label) {
|
|
35
|
+
return `No API key configured for ${provider}. Run: /keys set ${label} <your-key>
|
|
36
|
+
Or try a free model: /model tencent/hy3-preview:free`;
|
|
37
|
+
}
|
|
38
|
+
return `Authentication failed for ${provider}. Check your API key or run: dirgha setup`;
|
|
39
|
+
case "rate_limit":
|
|
40
|
+
return `Rate limited by ${provider}. Waiting and retrying automatically.
|
|
41
|
+
Tip: Add more providers for fallback.`;
|
|
42
|
+
case "overloaded":
|
|
43
|
+
return `${provider} is overloaded. Trying fallback...`;
|
|
44
|
+
case "model_not_found":
|
|
45
|
+
return `Model not found: ${model}. Check available: /models`;
|
|
46
|
+
case "billing":
|
|
47
|
+
return `Billing issue with ${provider}. Check your account balance.
|
|
48
|
+
Tip: Switch to a free model: /model tencent/hy3-preview:free`;
|
|
49
|
+
default: {
|
|
50
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
51
|
+
if (/5\d\d/.test(msg)) {
|
|
52
|
+
return `Server error from ${provider}. Retrying...`;
|
|
53
|
+
}
|
|
54
|
+
if (/timeout|timed out/i.test(msg)) {
|
|
55
|
+
return `Request to ${provider} timed out. Retrying...`;
|
|
56
|
+
}
|
|
57
|
+
return undefined;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
}
|
|
22
61
|
function diagnose(err) {
|
|
23
62
|
if (err instanceof ProviderError) {
|
|
24
63
|
const status = err.status ?? 0;
|
|
25
64
|
if (status === 401 || status === 403)
|
|
26
|
-
return { reason:
|
|
65
|
+
return { reason: "auth" };
|
|
27
66
|
if (status === 402)
|
|
28
|
-
return { reason:
|
|
67
|
+
return { reason: "billing" };
|
|
29
68
|
if (status === 404)
|
|
30
|
-
return { reason:
|
|
69
|
+
return { reason: "model_not_found" };
|
|
31
70
|
if (status === 408)
|
|
32
|
-
return { reason:
|
|
71
|
+
return { reason: "timeout", backoffMs: 1000 };
|
|
33
72
|
if (status === 413)
|
|
34
|
-
return { reason:
|
|
73
|
+
return { reason: "context_overflow" };
|
|
35
74
|
if (status === 415 || status === 422)
|
|
36
|
-
return { reason:
|
|
75
|
+
return { reason: "format_error" };
|
|
37
76
|
if (status === 429)
|
|
38
|
-
return { reason:
|
|
77
|
+
return { reason: "rate_limit", backoffMs: 4000 };
|
|
39
78
|
if (status === 503 || status === 529)
|
|
40
|
-
return { reason:
|
|
79
|
+
return { reason: "overloaded", backoffMs: 3000 };
|
|
41
80
|
if (status >= 500)
|
|
42
|
-
return { reason:
|
|
81
|
+
return { reason: "overloaded", backoffMs: 2000 };
|
|
43
82
|
const msg = err.message.toLowerCase();
|
|
44
|
-
if (msg.includes(
|
|
45
|
-
return { reason:
|
|
46
|
-
if (msg.includes(
|
|
47
|
-
return { reason:
|
|
48
|
-
if (msg.includes(
|
|
49
|
-
return { reason:
|
|
50
|
-
return { reason:
|
|
83
|
+
if (msg.includes("content filter") || msg.includes("content policy"))
|
|
84
|
+
return { reason: "content_filter" };
|
|
85
|
+
if (msg.includes("tool") && msg.includes("schema"))
|
|
86
|
+
return { reason: "tool_schema" };
|
|
87
|
+
if (msg.includes("context length"))
|
|
88
|
+
return { reason: "context_overflow" };
|
|
89
|
+
return { reason: "unknown" };
|
|
51
90
|
}
|
|
52
|
-
const message = err instanceof Error
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
if (message.includes(
|
|
56
|
-
return { reason:
|
|
57
|
-
|
|
91
|
+
const message = err instanceof Error
|
|
92
|
+
? err.message.toLowerCase()
|
|
93
|
+
: String(err).toLowerCase();
|
|
94
|
+
if (message.includes("timed out") || message.includes("abort"))
|
|
95
|
+
return { reason: "timeout", backoffMs: 1000 };
|
|
96
|
+
if (message.includes("econnrefused") ||
|
|
97
|
+
message.includes("enotfound") ||
|
|
98
|
+
message.includes("network"))
|
|
99
|
+
return { reason: "network", backoffMs: 1000 };
|
|
100
|
+
return { reason: "unknown" };
|
|
58
101
|
}
|
|
59
102
|
function isRetryable(reason) {
|
|
60
|
-
return reason ===
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
103
|
+
return (reason === "rate_limit" ||
|
|
104
|
+
reason === "overloaded" ||
|
|
105
|
+
reason === "timeout" ||
|
|
106
|
+
reason === "network");
|
|
64
107
|
}
|
|
65
108
|
function shouldFallback(reason) {
|
|
66
|
-
return reason ===
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
109
|
+
return (reason === "rate_limit" ||
|
|
110
|
+
reason === "overloaded" ||
|
|
111
|
+
reason === "model_not_found" ||
|
|
112
|
+
reason === "billing");
|
|
70
113
|
}
|
|
71
114
|
//# sourceMappingURL=error-classifier.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-classifier.js","sourceRoot":"","sources":["../../src/intelligence/error-classifier.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAgBtD,MAAM,UAAU,qBAAqB;IACnC,OAAO;QACL,QAAQ,CAAC,GAAY,EAAE,QAAgB,EAAE,KAAa;YACpD,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;YAC5C,
|
|
1
|
+
{"version":3,"file":"error-classifier.js","sourceRoot":"","sources":["../../src/intelligence/error-classifier.ts"],"names":[],"mappings":"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"}
|
|
@@ -107,6 +107,9 @@ export async function runAgentLoop(cfg) {
|
|
|
107
107
|
message: errMsg,
|
|
108
108
|
reason: classified?.reason,
|
|
109
109
|
retryable: classified?.retryable ?? false,
|
|
110
|
+
...(classified?.userMessage !== undefined
|
|
111
|
+
? { userMessage: classified.userMessage }
|
|
112
|
+
: {}),
|
|
110
113
|
...(failover !== undefined ? { failoverModel: failover } : {}),
|
|
111
114
|
});
|
|
112
115
|
if (classified?.retryable && retriesForTurn < MAX_RETRIES) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-loop.js","sourceRoot":"","sources":["../../src/kernel/agent-loop.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"agent-loop.js","sourceRoot":"","sources":["../../src/kernel/agent-loop.ts"],"names":[],"mappings":"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"}
|
package/dist/kernel/types.d.ts
CHANGED
|
@@ -110,6 +110,7 @@ export type AgentEvent = {
|
|
|
110
110
|
reason?: string;
|
|
111
111
|
retryable?: boolean;
|
|
112
112
|
failoverModel?: string;
|
|
113
|
+
userMessage?: string;
|
|
113
114
|
};
|
|
114
115
|
export interface ToolCall {
|
|
115
116
|
id: string;
|
|
@@ -177,6 +178,7 @@ export interface ClassifiedError {
|
|
|
177
178
|
backoffMs?: number;
|
|
178
179
|
shouldFallback: boolean;
|
|
179
180
|
reason: string;
|
|
181
|
+
userMessage?: string;
|
|
180
182
|
}
|
|
181
183
|
export interface AgentHooks {
|
|
182
184
|
beforeTurn?: (turnIndex: number, messages: Message[]) => Promise<"continue" | "abort">;
|
package/dist/tui/ink/App.js
CHANGED
|
@@ -766,7 +766,7 @@ function TranscriptRow({ item, }) {
|
|
|
766
766
|
// renders something rather than nothing.
|
|
767
767
|
return (_jsx(ToolBox, { name: item.name, status: item.status, argSummary: item.argSummary, outputPreview: item.outputPreview, outputKind: item.outputKind, startedAt: item.startedAt, durationMs: item.durationMs }));
|
|
768
768
|
case "error":
|
|
769
|
-
return (
|
|
769
|
+
return (_jsx(Box, { flexDirection: "column", marginBottom: 1, children: _jsxs(Box, { gap: 1, children: [_jsx(Text, { color: "red", bold: true, children: "\u2717" }), _jsx(Text, { color: "red", children: item.userMessage ?? item.message })] }) }));
|
|
770
770
|
case "notice":
|
|
771
771
|
return (_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "yellow", children: item.text }) }));
|
|
772
772
|
}
|