@evident-ai/cli 3.1.1-dev.993411a → 3.1.1-dev.a4167a6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +15 -11
- package/dist/index.js +1413 -140
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -11,8 +11,8 @@ import chalk2 from "chalk";
|
|
|
11
11
|
|
|
12
12
|
// src/lib/config.ts
|
|
13
13
|
import Conf from "conf";
|
|
14
|
-
import {
|
|
15
|
-
import {
|
|
14
|
+
import { chmodSync, existsSync, statSync } from "fs";
|
|
15
|
+
import { dirname } from "path";
|
|
16
16
|
var PRODUCTION_API_URL = "https://api.production.evident.run/v1";
|
|
17
17
|
var PRODUCTION_TUNNEL_URL = "wss://tunnel.production.evident.run";
|
|
18
18
|
var defaults = {
|
|
@@ -47,8 +47,35 @@ var credentials = new Conf({
|
|
|
47
47
|
projectName: "evident",
|
|
48
48
|
projectSuffix: "",
|
|
49
49
|
configName: "credentials",
|
|
50
|
-
defaults: {}
|
|
50
|
+
defaults: {},
|
|
51
|
+
configFileMode: 384
|
|
51
52
|
});
|
|
53
|
+
var CREDENTIALS_FILE_MODE = 384;
|
|
54
|
+
var CREDENTIALS_DIR_MODE = 448;
|
|
55
|
+
var permissionWarningEmitted = false;
|
|
56
|
+
function hardenCredentialsPermissions() {
|
|
57
|
+
if (process.platform === "win32") {
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
const file = credentials.path;
|
|
61
|
+
for (const [path, mode] of [
|
|
62
|
+
[file, CREDENTIALS_FILE_MODE],
|
|
63
|
+
[dirname(file), CREDENTIALS_DIR_MODE]
|
|
64
|
+
]) {
|
|
65
|
+
try {
|
|
66
|
+
if (existsSync(path) && (statSync(path).mode & 511) !== mode) {
|
|
67
|
+
chmodSync(path, mode);
|
|
68
|
+
}
|
|
69
|
+
} catch (err) {
|
|
70
|
+
if (!permissionWarningEmitted) {
|
|
71
|
+
permissionWarningEmitted = true;
|
|
72
|
+
console.error(
|
|
73
|
+
`[config] could not restrict permissions on ${path}; the credentials file may be readable by other users on this machine: ${err instanceof Error ? err.message : String(err)}`
|
|
74
|
+
);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
}
|
|
52
79
|
function getApiUrlConfig() {
|
|
53
80
|
return getApiUrl();
|
|
54
81
|
}
|
|
@@ -59,6 +86,7 @@ function credentialsKey() {
|
|
|
59
86
|
return getApiUrl();
|
|
60
87
|
}
|
|
61
88
|
function getCredentials() {
|
|
89
|
+
hardenCredentialsPermissions();
|
|
62
90
|
const byEndpoint = credentials.get("byEndpoint") ?? {};
|
|
63
91
|
return byEndpoint[credentialsKey()] ?? {};
|
|
64
92
|
}
|
|
@@ -70,14 +98,17 @@ function setCredentials(creds) {
|
|
|
70
98
|
expiresAt: creds.expiresAt
|
|
71
99
|
};
|
|
72
100
|
credentials.set("byEndpoint", byEndpoint);
|
|
101
|
+
hardenCredentialsPermissions();
|
|
73
102
|
}
|
|
74
103
|
function clearCredentials() {
|
|
75
104
|
const byEndpoint = credentials.get("byEndpoint") ?? {};
|
|
76
105
|
delete byEndpoint[credentialsKey()];
|
|
77
106
|
credentials.set("byEndpoint", byEndpoint);
|
|
107
|
+
hardenCredentialsPermissions();
|
|
78
108
|
}
|
|
79
109
|
function clearAllCredentials() {
|
|
80
110
|
credentials.clear();
|
|
111
|
+
hardenCredentialsPermissions();
|
|
81
112
|
}
|
|
82
113
|
function getCliName() {
|
|
83
114
|
const argv1 = process.argv[1] || "";
|
|
@@ -285,14 +316,14 @@ function blank() {
|
|
|
285
316
|
console.log();
|
|
286
317
|
}
|
|
287
318
|
function waitForEnter(prompt = "Press Enter to continue...") {
|
|
288
|
-
return new Promise((
|
|
319
|
+
return new Promise((resolve3) => {
|
|
289
320
|
process.stdout.write(chalk.dim(prompt));
|
|
290
321
|
const handler = () => {
|
|
291
322
|
process.stdin.removeListener("data", handler);
|
|
292
323
|
process.stdin.setRawMode?.(false);
|
|
293
324
|
process.stdin.pause();
|
|
294
325
|
console.log();
|
|
295
|
-
|
|
326
|
+
resolve3();
|
|
296
327
|
};
|
|
297
328
|
if (process.stdin.isTTY) {
|
|
298
329
|
process.stdin.setRawMode?.(true);
|
|
@@ -302,7 +333,7 @@ function waitForEnter(prompt = "Press Enter to continue...") {
|
|
|
302
333
|
});
|
|
303
334
|
}
|
|
304
335
|
function sleep(ms) {
|
|
305
|
-
return new Promise((
|
|
336
|
+
return new Promise((resolve3) => setTimeout(resolve3, ms));
|
|
306
337
|
}
|
|
307
338
|
|
|
308
339
|
// src/commands/login.ts
|
|
@@ -373,22 +404,23 @@ async function deviceFlowLogin(options) {
|
|
|
373
404
|
}
|
|
374
405
|
async function tokenLogin() {
|
|
375
406
|
console.log("Token login mode.");
|
|
376
|
-
console.log("
|
|
407
|
+
console.log("Run `evident login` on a machine with a browser to get a token.");
|
|
408
|
+
console.log("Manage or revoke existing tokens under Settings \u2192 CLI tokens.");
|
|
377
409
|
blank();
|
|
378
410
|
process.stdout.write("Paste token: ");
|
|
379
|
-
const token = await new Promise((
|
|
411
|
+
const token = await new Promise((resolve3) => {
|
|
380
412
|
let data = "";
|
|
381
413
|
process.stdin.setEncoding("utf8");
|
|
382
414
|
process.stdin.on("data", (chunk) => {
|
|
383
415
|
data += chunk;
|
|
384
416
|
});
|
|
385
417
|
process.stdin.on("end", () => {
|
|
386
|
-
|
|
418
|
+
resolve3(data.trim());
|
|
387
419
|
});
|
|
388
420
|
if (process.stdin.isTTY) {
|
|
389
421
|
process.stdin.once("data", (chunk) => {
|
|
390
422
|
process.stdin.pause();
|
|
391
|
-
|
|
423
|
+
resolve3(chunk.toString().trim());
|
|
392
424
|
});
|
|
393
425
|
process.stdin.resume();
|
|
394
426
|
}
|
|
@@ -467,9 +499,9 @@ async function whoami() {
|
|
|
467
499
|
}
|
|
468
500
|
|
|
469
501
|
// src/commands/run.ts
|
|
502
|
+
import { homedir as homedir2 } from "os";
|
|
503
|
+
import { isAbsolute as isAbsolute2, join as join2, parse, resolve as resolvePath } from "path";
|
|
470
504
|
import chalk6 from "chalk";
|
|
471
|
-
import ora3 from "ora";
|
|
472
|
-
import { select as select3 } from "@inquirer/prompts";
|
|
473
505
|
|
|
474
506
|
// ../../packages/types/src/telemetry/index.ts
|
|
475
507
|
var TelemetryEventTypes = {
|
|
@@ -485,6 +517,10 @@ var TelemetryEventTypes = {
|
|
|
485
517
|
var MAX_FRAME_BYTES = 256 * 1024;
|
|
486
518
|
var TUNNEL_DRAIN_PING_PATH = "/__evident/drain";
|
|
487
519
|
|
|
520
|
+
// ../../packages/types/src/runner-files.ts
|
|
521
|
+
var MAX_FILE_PUSH_BYTES = 64 * 1024;
|
|
522
|
+
var MAX_FILE_SYNC_DIRECTORIES = 16;
|
|
523
|
+
|
|
488
524
|
// ../../packages/types/src/logging/index.ts
|
|
489
525
|
var CORRELATION_ID_HEADER = "x-evident-correlation-id";
|
|
490
526
|
function log(level, event, fields) {
|
|
@@ -499,6 +535,12 @@ function log(level, event, fields) {
|
|
|
499
535
|
);
|
|
500
536
|
}
|
|
501
537
|
}
|
|
538
|
+
function errorFields(err) {
|
|
539
|
+
if (err instanceof Error) {
|
|
540
|
+
return { error: err.message, error_name: err.name };
|
|
541
|
+
}
|
|
542
|
+
return { error: String(err) };
|
|
543
|
+
}
|
|
502
544
|
function stripQuery(url) {
|
|
503
545
|
try {
|
|
504
546
|
return new URL(url).pathname;
|
|
@@ -508,6 +550,10 @@ function stripQuery(url) {
|
|
|
508
550
|
}
|
|
509
551
|
}
|
|
510
552
|
|
|
553
|
+
// src/commands/run.ts
|
|
554
|
+
import ora3 from "ora";
|
|
555
|
+
import { select as select3 } from "@inquirer/prompts";
|
|
556
|
+
|
|
511
557
|
// src/lib/telemetry.ts
|
|
512
558
|
var CLI_VERSION = (true ? "3.0.0" : void 0) ?? process.env.npm_package_version ?? "unknown";
|
|
513
559
|
function getCliVersion() {
|
|
@@ -719,7 +765,7 @@ async function waitForOpenCodeHealth(port, timeoutMs = 3e4) {
|
|
|
719
765
|
if (health.healthy) {
|
|
720
766
|
return health;
|
|
721
767
|
}
|
|
722
|
-
await new Promise((
|
|
768
|
+
await new Promise((resolve3) => setTimeout(resolve3, 1e3));
|
|
723
769
|
}
|
|
724
770
|
return { healthy: false, error: "Timeout waiting for OpenCode to be healthy" };
|
|
725
771
|
}
|
|
@@ -734,7 +780,7 @@ function buildOpenCodeVersionWarning(version2) {
|
|
|
734
780
|
if (isQueueValidatedVersion(version2)) return null;
|
|
735
781
|
const detected = version2 ? `v${version2}` : "unknown";
|
|
736
782
|
const validated = QUEUE_VALIDATED_OPENCODE_VERSIONS.map((v) => `v${v}`).join(", ");
|
|
737
|
-
return `Warning: opencode ${detected} is not a queue-validated version (validated: ${validated}). Native message queuing \u2014 which channel (Slack
|
|
783
|
+
return `Warning: opencode ${detected} is not a queue-validated version (validated: ${validated}). Native message queuing \u2014 which channel (Slack) message handling relies on \u2014 is unverified on this version; queued/follow-up messages may behave unexpectedly. Continuing anyway. Bumping the validated set requires re-running the queue validation.`;
|
|
738
784
|
}
|
|
739
785
|
|
|
740
786
|
// src/lib/opencode/process.ts
|
|
@@ -1026,6 +1072,12 @@ async function promptOpenCodeInstall(interactive) {
|
|
|
1026
1072
|
return action;
|
|
1027
1073
|
}
|
|
1028
1074
|
|
|
1075
|
+
// src/lib/opencode/provider-check.ts
|
|
1076
|
+
function buildNoProviderWarning(hasProvider) {
|
|
1077
|
+
if (hasProvider !== false) return null;
|
|
1078
|
+
return "Warning: opencode has no authenticated model provider configured, so it won't be able to answer prompts. Run `opencode auth login` to set one up (see https://opencode.ai for details).";
|
|
1079
|
+
}
|
|
1080
|
+
|
|
1029
1081
|
// src/lib/opencode/session.ts
|
|
1030
1082
|
function opencodeBase(port) {
|
|
1031
1083
|
return `http://127.0.0.1:${port}`;
|
|
@@ -1228,6 +1280,11 @@ async function getModelAttachmentCapability(port, model) {
|
|
|
1228
1280
|
}
|
|
1229
1281
|
const entry = provider.models[modelId];
|
|
1230
1282
|
if (!entry || typeof entry !== "object") return null;
|
|
1283
|
+
if (entry.capabilities && typeof entry.capabilities === "object") {
|
|
1284
|
+
if (typeof entry.capabilities.attachment === "boolean") {
|
|
1285
|
+
return entry.capabilities.attachment;
|
|
1286
|
+
}
|
|
1287
|
+
}
|
|
1231
1288
|
return typeof entry.attachment === "boolean" ? entry.attachment : null;
|
|
1232
1289
|
} catch (err) {
|
|
1233
1290
|
console.error(
|
|
@@ -1256,6 +1313,16 @@ async function buildFileParts(attachments, capable) {
|
|
|
1256
1313
|
);
|
|
1257
1314
|
dataUrl = null;
|
|
1258
1315
|
}
|
|
1316
|
+
if (dataUrl !== null && typeof dataUrl === "object") {
|
|
1317
|
+
outcomes.push({
|
|
1318
|
+
index: a.index,
|
|
1319
|
+
mime: a.mime,
|
|
1320
|
+
filename: a.filename,
|
|
1321
|
+
status: "failed",
|
|
1322
|
+
reason: "needs_reauth"
|
|
1323
|
+
});
|
|
1324
|
+
continue;
|
|
1325
|
+
}
|
|
1259
1326
|
if (dataUrl == null) {
|
|
1260
1327
|
outcomes.push({ index: a.index, mime: a.mime, filename: a.filename, status: "failed" });
|
|
1261
1328
|
continue;
|
|
@@ -1337,7 +1404,7 @@ async function sendPromptAsync(port, sessionId, content, options, attachments) {
|
|
|
1337
1404
|
}
|
|
1338
1405
|
}
|
|
1339
1406
|
if (attempt < READ_BACK_ATTEMPTS - 1) {
|
|
1340
|
-
await new Promise((
|
|
1407
|
+
await new Promise((resolve3) => setTimeout(resolve3, READ_BACK_DELAY_MS));
|
|
1341
1408
|
}
|
|
1342
1409
|
}
|
|
1343
1410
|
return null;
|
|
@@ -1465,6 +1532,9 @@ function isPreamblePinnedRunning(messages, userMessageId) {
|
|
|
1465
1532
|
const reply = findLastAssistantReplyFor(messages, userMessageId);
|
|
1466
1533
|
return completedOf(reply) != null && finishOf(reply) === "tool-calls";
|
|
1467
1534
|
}
|
|
1535
|
+
function isB2AbandonmentConfirmed(params) {
|
|
1536
|
+
return params.pinnedForMs >= params.minPinnedMs && params.descendantOngoing === false;
|
|
1537
|
+
}
|
|
1468
1538
|
function messageError(messages, userMessageId) {
|
|
1469
1539
|
const reply = findLastAssistantReplyFor(messages, userMessageId);
|
|
1470
1540
|
const error2 = errorOf(reply);
|
|
@@ -1478,12 +1548,79 @@ function messageError(messages, userMessageId) {
|
|
|
1478
1548
|
}
|
|
1479
1549
|
return "The agent run failed.";
|
|
1480
1550
|
}
|
|
1551
|
+
function messageFailure(messages, userMessageId) {
|
|
1552
|
+
const reply = findLastAssistantReplyFor(messages, userMessageId);
|
|
1553
|
+
const error2 = errorOf(reply);
|
|
1554
|
+
if (error2 == null || typeof error2 !== "object") return null;
|
|
1555
|
+
const e = error2;
|
|
1556
|
+
const replyProviderId = reply?.info?.providerID ?? null;
|
|
1557
|
+
const replyModelId = reply?.info?.modelID ?? null;
|
|
1558
|
+
if (e.name === "ProviderAuthError") {
|
|
1559
|
+
const data = e.data;
|
|
1560
|
+
const providerId = typeof data?.providerID === "string" && data.providerID || replyProviderId;
|
|
1561
|
+
return { kind: "model_auth", providerId, modelId: replyModelId, reason: "missing" };
|
|
1562
|
+
}
|
|
1563
|
+
if (e.name === "APIError") {
|
|
1564
|
+
const data = e.data;
|
|
1565
|
+
const statusCode = data?.statusCode;
|
|
1566
|
+
if (statusCode === 401 || statusCode === 403) {
|
|
1567
|
+
return {
|
|
1568
|
+
kind: "model_auth",
|
|
1569
|
+
providerId: replyProviderId,
|
|
1570
|
+
modelId: replyModelId,
|
|
1571
|
+
reason: "rejected"
|
|
1572
|
+
};
|
|
1573
|
+
}
|
|
1574
|
+
}
|
|
1575
|
+
return null;
|
|
1576
|
+
}
|
|
1577
|
+
function applyZeroProviderFallback(classified, hasConfiguredProvider, replyProviderId, replyModelId = null) {
|
|
1578
|
+
if (classified != null) return classified;
|
|
1579
|
+
if (hasConfiguredProvider !== false) return null;
|
|
1580
|
+
return {
|
|
1581
|
+
kind: "model_auth",
|
|
1582
|
+
providerId: replyProviderId,
|
|
1583
|
+
modelId: replyModelId,
|
|
1584
|
+
reason: "missing"
|
|
1585
|
+
};
|
|
1586
|
+
}
|
|
1481
1587
|
function hasRunningAssistantExcept(messages, exceptUserMessageId) {
|
|
1482
1588
|
if (!messages || messages.length === 0) return false;
|
|
1483
1589
|
return messages.some(
|
|
1484
1590
|
(m) => roleOf(m) === "assistant" && parentIdOf(m) !== exceptUserMessageId && isAssistantInFlight(m)
|
|
1485
1591
|
);
|
|
1486
1592
|
}
|
|
1593
|
+
async function hasAnyConfiguredProvider(port) {
|
|
1594
|
+
try {
|
|
1595
|
+
const res = await fetch(`${opencodeBase(port)}/config/providers`);
|
|
1596
|
+
if (!res.ok) {
|
|
1597
|
+
console.error(
|
|
1598
|
+
`[hasAnyConfiguredProvider] GET /config/providers returned HTTP ${res.status} (port ${port})`
|
|
1599
|
+
);
|
|
1600
|
+
return null;
|
|
1601
|
+
}
|
|
1602
|
+
const body = await res.json();
|
|
1603
|
+
if (!body || typeof body !== "object" || Array.isArray(body)) {
|
|
1604
|
+
console.error(
|
|
1605
|
+
`[hasAnyConfiguredProvider] GET /config/providers body was not a plain object (port ${port})`
|
|
1606
|
+
);
|
|
1607
|
+
return null;
|
|
1608
|
+
}
|
|
1609
|
+
const defaults2 = body.default;
|
|
1610
|
+
if (!defaults2 || typeof defaults2 !== "object" || Array.isArray(defaults2)) {
|
|
1611
|
+
console.error(
|
|
1612
|
+
`[hasAnyConfiguredProvider] GET /config/providers body had no \`default\` object (port ${port})`
|
|
1613
|
+
);
|
|
1614
|
+
return null;
|
|
1615
|
+
}
|
|
1616
|
+
return Object.keys(defaults2).length > 0;
|
|
1617
|
+
} catch (err) {
|
|
1618
|
+
console.error(
|
|
1619
|
+
`[hasAnyConfiguredProvider] GET /config/providers failed (port ${port}): ${err instanceof Error ? err.message : String(err)}`
|
|
1620
|
+
);
|
|
1621
|
+
return null;
|
|
1622
|
+
}
|
|
1623
|
+
}
|
|
1487
1624
|
|
|
1488
1625
|
// src/lib/opencode/session-cleanup.ts
|
|
1489
1626
|
var DURATION_UNIT_MS = {
|
|
@@ -1642,10 +1779,11 @@ var StreamForwarder = class {
|
|
|
1642
1779
|
* Abort every in-flight stream (e.g. on WebSocket close).
|
|
1643
1780
|
*/
|
|
1644
1781
|
abortAll() {
|
|
1645
|
-
for (const stream of this.inflight.
|
|
1782
|
+
for (const [sid, stream] of this.inflight.entries()) {
|
|
1646
1783
|
try {
|
|
1647
1784
|
stream.abort();
|
|
1648
|
-
} catch {
|
|
1785
|
+
} catch (err) {
|
|
1786
|
+
log("error", "forwarder_abort_failed", { sid, ...errorFields(err) });
|
|
1649
1787
|
}
|
|
1650
1788
|
}
|
|
1651
1789
|
this.inflight.clear();
|
|
@@ -1679,12 +1817,12 @@ var StreamForwarder = class {
|
|
|
1679
1817
|
let endBody;
|
|
1680
1818
|
if (has_body) {
|
|
1681
1819
|
const chunks = [];
|
|
1682
|
-
bodyPromise = new Promise((
|
|
1820
|
+
bodyPromise = new Promise((resolve3) => {
|
|
1683
1821
|
pushBody = (buf) => {
|
|
1684
1822
|
chunks.push(buf);
|
|
1685
1823
|
};
|
|
1686
1824
|
endBody = () => {
|
|
1687
|
-
|
|
1825
|
+
resolve3(Buffer.concat(chunks));
|
|
1688
1826
|
};
|
|
1689
1827
|
});
|
|
1690
1828
|
}
|
|
@@ -1795,31 +1933,20 @@ function connectTunnel(options) {
|
|
|
1795
1933
|
onConnected,
|
|
1796
1934
|
onDisconnected,
|
|
1797
1935
|
onError,
|
|
1798
|
-
onRequest,
|
|
1799
1936
|
onResponse,
|
|
1800
1937
|
onInfo,
|
|
1801
1938
|
onDrainPing
|
|
1802
1939
|
} = options;
|
|
1803
1940
|
const tunnelUrl = getTunnelUrlConfig();
|
|
1804
1941
|
const url = `${tunnelUrl}/tunnel/${agentId}/connect`;
|
|
1805
|
-
return new Promise((
|
|
1942
|
+
return new Promise((resolve3, reject) => {
|
|
1806
1943
|
const ws = new WebSocket2(url, {
|
|
1807
1944
|
headers: {
|
|
1808
1945
|
Authorization: authHeader
|
|
1809
1946
|
}
|
|
1810
1947
|
});
|
|
1811
|
-
const streamStartTimes = /* @__PURE__ */ new Map();
|
|
1812
1948
|
const forwarder = new StreamForwarder(ws, port, {
|
|
1813
|
-
|
|
1814
|
-
if (path === TUNNEL_DRAIN_PING_PATH) return;
|
|
1815
|
-
streamStartTimes.set(sid, Date.now());
|
|
1816
|
-
onRequest?.(method, path, sid);
|
|
1817
|
-
},
|
|
1818
|
-
onHead: (sid, status) => {
|
|
1819
|
-
const startedAt = streamStartTimes.get(sid);
|
|
1820
|
-
streamStartTimes.delete(sid);
|
|
1821
|
-
onResponse?.(status, startedAt ? Date.now() - startedAt : 0, sid);
|
|
1822
|
-
},
|
|
1949
|
+
onHead: () => onResponse?.(),
|
|
1823
1950
|
onDrainPing: () => onDrainPing?.()
|
|
1824
1951
|
});
|
|
1825
1952
|
const connectionTimeout = setTimeout(() => {
|
|
@@ -1867,7 +1994,7 @@ function connectTunnel(options) {
|
|
|
1867
1994
|
clearTimeout(connectionTimeout);
|
|
1868
1995
|
const connectedAgentId = message.agent_id ?? agentId;
|
|
1869
1996
|
onConnected?.(connectedAgentId);
|
|
1870
|
-
|
|
1997
|
+
resolve3({
|
|
1871
1998
|
ws,
|
|
1872
1999
|
close: () => ws.close(1e3, "CLI shutdown")
|
|
1873
2000
|
});
|
|
@@ -1895,7 +2022,6 @@ function connectTunnel(options) {
|
|
|
1895
2022
|
ws.on("close", (code, reason) => {
|
|
1896
2023
|
const reasonStr = reason.toString() || upgradeRejection || (code === 1006 ? "abnormal closure" : "No reason provided");
|
|
1897
2024
|
forwarder.abortAll();
|
|
1898
|
-
streamStartTimes.clear();
|
|
1899
2025
|
onDisconnected?.(code, reasonStr);
|
|
1900
2026
|
});
|
|
1901
2027
|
});
|
|
@@ -1930,7 +2056,11 @@ var RunnerConnection = class {
|
|
|
1930
2056
|
if (this.connection) {
|
|
1931
2057
|
try {
|
|
1932
2058
|
this.connection.close();
|
|
1933
|
-
} catch {
|
|
2059
|
+
} catch (err) {
|
|
2060
|
+
log("error", "runner_connection_close_failed", {
|
|
2061
|
+
agent_id: this.resolvedAgentId,
|
|
2062
|
+
...errorFields(err)
|
|
2063
|
+
});
|
|
1934
2064
|
}
|
|
1935
2065
|
this.connection = null;
|
|
1936
2066
|
}
|
|
@@ -1982,6 +2112,416 @@ var RunnerConnection = class {
|
|
|
1982
2112
|
}
|
|
1983
2113
|
};
|
|
1984
2114
|
|
|
2115
|
+
// src/lib/tunnel/ready-marker.ts
|
|
2116
|
+
import { writeFileSync } from "fs";
|
|
2117
|
+
function writeTunnelReadyMarker(path, agentId) {
|
|
2118
|
+
try {
|
|
2119
|
+
writeFileSync(path, `${agentId}
|
|
2120
|
+
`);
|
|
2121
|
+
return { ok: true };
|
|
2122
|
+
} catch (error2) {
|
|
2123
|
+
return { ok: false, error: error2 instanceof Error ? error2.message : String(error2) };
|
|
2124
|
+
}
|
|
2125
|
+
}
|
|
2126
|
+
|
|
2127
|
+
// src/lib/channels/driver.ts
|
|
2128
|
+
import { homedir } from "os";
|
|
2129
|
+
|
|
2130
|
+
// src/lib/file-push.ts
|
|
2131
|
+
import { randomUUID } from "crypto";
|
|
2132
|
+
import { chmod, mkdir, open as open2, realpath, rename, unlink } from "fs/promises";
|
|
2133
|
+
import { basename, dirname as dirname2, isAbsolute, join, relative, resolve as resolve2, sep } from "path";
|
|
2134
|
+
var FILE_MODE = 384;
|
|
2135
|
+
var DIRECTORY_MODE = 448;
|
|
2136
|
+
async function writePushedFile(request) {
|
|
2137
|
+
const { requestedPath, content, allowedDirectories, homeDir } = request;
|
|
2138
|
+
const bytes = content.byteLength;
|
|
2139
|
+
if (allowedDirectories.length === 0) {
|
|
2140
|
+
return refuse("file_sync_disabled", "File sync is not enabled on this runner.", {
|
|
2141
|
+
path: requestedPath,
|
|
2142
|
+
bytes
|
|
2143
|
+
});
|
|
2144
|
+
}
|
|
2145
|
+
if (bytes > MAX_FILE_PUSH_BYTES) {
|
|
2146
|
+
return refuse(
|
|
2147
|
+
"file_too_large",
|
|
2148
|
+
`File is ${bytes} bytes; the limit is ${MAX_FILE_PUSH_BYTES}.`,
|
|
2149
|
+
{
|
|
2150
|
+
path: requestedPath,
|
|
2151
|
+
bytes
|
|
2152
|
+
}
|
|
2153
|
+
);
|
|
2154
|
+
}
|
|
2155
|
+
const candidate = expandAndValidate(requestedPath, homeDir);
|
|
2156
|
+
if (candidate === null) {
|
|
2157
|
+
return refuse("invalid_path", "The requested path is not a valid absolute file path.", {
|
|
2158
|
+
path: requestedPath,
|
|
2159
|
+
bytes
|
|
2160
|
+
});
|
|
2161
|
+
}
|
|
2162
|
+
try {
|
|
2163
|
+
const { existingAncestor, missingSegments } = await resolveNearestExistingAncestor(
|
|
2164
|
+
dirname2(candidate)
|
|
2165
|
+
);
|
|
2166
|
+
const realTarget = join(existingAncestor, ...missingSegments, basename(candidate));
|
|
2167
|
+
const allowedDirectory = await findContainingAllowedDirectory(allowedDirectories, realTarget);
|
|
2168
|
+
if (allowedDirectory === null) {
|
|
2169
|
+
return refuse("path_not_allowed", "The runner does not allow writing to that location.", {
|
|
2170
|
+
path: realTarget,
|
|
2171
|
+
bytes
|
|
2172
|
+
});
|
|
2173
|
+
}
|
|
2174
|
+
if (missingSegments.length > 0) {
|
|
2175
|
+
await createMissingDirectories(existingAncestor, missingSegments);
|
|
2176
|
+
const realParent = await realpath(dirname2(realTarget));
|
|
2177
|
+
if (realParent !== dirname2(realTarget) || !contains(allowedDirectory, realTarget)) {
|
|
2178
|
+
return refuse("path_not_allowed", "The runner does not allow writing to that location.", {
|
|
2179
|
+
path: realTarget,
|
|
2180
|
+
bytes,
|
|
2181
|
+
reason: "parent_changed_after_create"
|
|
2182
|
+
});
|
|
2183
|
+
}
|
|
2184
|
+
}
|
|
2185
|
+
await writeAtomically(realTarget, content);
|
|
2186
|
+
log("info", "file_push_written", { path: realTarget, bytes });
|
|
2187
|
+
return { ok: true, path: realTarget };
|
|
2188
|
+
} catch (err) {
|
|
2189
|
+
const errno = err.code ?? "UNKNOWN";
|
|
2190
|
+
return refuse("write_failed", `The runner could not write the file (${errno}).`, {
|
|
2191
|
+
path: candidate,
|
|
2192
|
+
bytes,
|
|
2193
|
+
errno,
|
|
2194
|
+
...errorFields(err)
|
|
2195
|
+
});
|
|
2196
|
+
}
|
|
2197
|
+
}
|
|
2198
|
+
function expandAndValidate(requestedPath, homeDir) {
|
|
2199
|
+
if (requestedPath.trim() === "" || requestedPath.includes("\0")) {
|
|
2200
|
+
return null;
|
|
2201
|
+
}
|
|
2202
|
+
const expanded = requestedPath === "~" ? homeDir : requestedPath.startsWith("~/") ? join(homeDir, requestedPath.slice(2)) : requestedPath;
|
|
2203
|
+
if (expanded.split(/[/\\]/).includes("..")) {
|
|
2204
|
+
return null;
|
|
2205
|
+
}
|
|
2206
|
+
if (!isAbsolute(expanded)) {
|
|
2207
|
+
return null;
|
|
2208
|
+
}
|
|
2209
|
+
const candidate = resolve2(expanded);
|
|
2210
|
+
const name = basename(candidate);
|
|
2211
|
+
return name === "" || name === "." || name === ".." ? null : candidate;
|
|
2212
|
+
}
|
|
2213
|
+
async function resolveNearestExistingAncestor(directory) {
|
|
2214
|
+
const missingSegments = [];
|
|
2215
|
+
let current = directory;
|
|
2216
|
+
for (; ; ) {
|
|
2217
|
+
try {
|
|
2218
|
+
return { existingAncestor: await realpath(current), missingSegments };
|
|
2219
|
+
} catch (err) {
|
|
2220
|
+
const parent = dirname2(current);
|
|
2221
|
+
if (err.code !== "ENOENT" || parent === current) {
|
|
2222
|
+
throw err;
|
|
2223
|
+
}
|
|
2224
|
+
missingSegments.unshift(basename(current));
|
|
2225
|
+
current = parent;
|
|
2226
|
+
}
|
|
2227
|
+
}
|
|
2228
|
+
}
|
|
2229
|
+
async function findContainingAllowedDirectory(allowedDirectories, realTarget) {
|
|
2230
|
+
for (const directory of allowedDirectories) {
|
|
2231
|
+
if (!isAbsolute(directory)) {
|
|
2232
|
+
log("warn", "file_push_allowed_directory_skipped", { directory, reason: "not_absolute" });
|
|
2233
|
+
continue;
|
|
2234
|
+
}
|
|
2235
|
+
const realDirectory = await realpathCreatingIfMissing(directory);
|
|
2236
|
+
if (realDirectory !== null && contains(realDirectory, realTarget)) {
|
|
2237
|
+
return realDirectory;
|
|
2238
|
+
}
|
|
2239
|
+
}
|
|
2240
|
+
return null;
|
|
2241
|
+
}
|
|
2242
|
+
async function realpathCreatingIfMissing(directory) {
|
|
2243
|
+
try {
|
|
2244
|
+
return await realpath(directory);
|
|
2245
|
+
} catch (err) {
|
|
2246
|
+
if (err.code !== "ENOENT") {
|
|
2247
|
+
log("warn", "file_push_allowed_directory_skipped", {
|
|
2248
|
+
directory,
|
|
2249
|
+
reason: "unresolvable",
|
|
2250
|
+
...errorFields(err)
|
|
2251
|
+
});
|
|
2252
|
+
return null;
|
|
2253
|
+
}
|
|
2254
|
+
}
|
|
2255
|
+
try {
|
|
2256
|
+
await mkdir(directory, { recursive: true, mode: DIRECTORY_MODE });
|
|
2257
|
+
await chmod(directory, DIRECTORY_MODE);
|
|
2258
|
+
return await realpath(directory);
|
|
2259
|
+
} catch (err) {
|
|
2260
|
+
log("warn", "file_push_allowed_directory_skipped", {
|
|
2261
|
+
directory,
|
|
2262
|
+
reason: "create_failed",
|
|
2263
|
+
...errorFields(err)
|
|
2264
|
+
});
|
|
2265
|
+
return null;
|
|
2266
|
+
}
|
|
2267
|
+
}
|
|
2268
|
+
function contains(realDirectory, realTarget) {
|
|
2269
|
+
const rel = relative(realDirectory, realTarget);
|
|
2270
|
+
return rel !== "" && rel !== ".." && !rel.startsWith(`..${sep}`) && !isAbsolute(rel);
|
|
2271
|
+
}
|
|
2272
|
+
async function createMissingDirectories(existingAncestor, missingSegments) {
|
|
2273
|
+
let current = existingAncestor;
|
|
2274
|
+
for (const segment of missingSegments) {
|
|
2275
|
+
current = join(current, segment);
|
|
2276
|
+
await mkdir(current, { recursive: true, mode: DIRECTORY_MODE });
|
|
2277
|
+
await chmod(current, DIRECTORY_MODE);
|
|
2278
|
+
}
|
|
2279
|
+
}
|
|
2280
|
+
async function writeAtomically(realTarget, content) {
|
|
2281
|
+
const temporaryPath = join(dirname2(realTarget), `.evident-push-${randomUUID()}.tmp`);
|
|
2282
|
+
let handle;
|
|
2283
|
+
try {
|
|
2284
|
+
handle = await open2(temporaryPath, "wx", FILE_MODE);
|
|
2285
|
+
await handle.writeFile(content);
|
|
2286
|
+
await handle.chmod(FILE_MODE);
|
|
2287
|
+
await handle.close();
|
|
2288
|
+
handle = void 0;
|
|
2289
|
+
await rename(temporaryPath, realTarget);
|
|
2290
|
+
} catch (err) {
|
|
2291
|
+
await discardTemporaryFile(temporaryPath, handle);
|
|
2292
|
+
throw err;
|
|
2293
|
+
}
|
|
2294
|
+
}
|
|
2295
|
+
async function discardTemporaryFile(temporaryPath, handle) {
|
|
2296
|
+
try {
|
|
2297
|
+
await handle?.close();
|
|
2298
|
+
} catch (err) {
|
|
2299
|
+
log("warn", "file_push_temp_close_failed", { path: temporaryPath, ...errorFields(err) });
|
|
2300
|
+
}
|
|
2301
|
+
try {
|
|
2302
|
+
await unlink(temporaryPath);
|
|
2303
|
+
} catch (err) {
|
|
2304
|
+
const errno = err.code;
|
|
2305
|
+
if (errno !== "ENOENT" && errno !== "ENOTDIR") {
|
|
2306
|
+
log("warn", "file_push_temp_cleanup_failed", { path: temporaryPath, ...errorFields(err) });
|
|
2307
|
+
}
|
|
2308
|
+
}
|
|
2309
|
+
}
|
|
2310
|
+
function refuse(code, message, fields) {
|
|
2311
|
+
log(code === "write_failed" ? "error" : "warn", "file_push_refused", { code, ...fields });
|
|
2312
|
+
return { ok: false, code, message };
|
|
2313
|
+
}
|
|
2314
|
+
|
|
2315
|
+
// src/lib/runner-file-sync.ts
|
|
2316
|
+
var MAX_ACK_ATTEMPTS = 5;
|
|
2317
|
+
async function syncPendingRunnerFiles(options) {
|
|
2318
|
+
const pending = await listPendingFiles(options);
|
|
2319
|
+
const pendingIds = new Set(pending.map((file) => file.id));
|
|
2320
|
+
for (const id of options.ackFailures.keys()) {
|
|
2321
|
+
if (!pendingIds.has(id)) options.ackFailures.delete(id);
|
|
2322
|
+
}
|
|
2323
|
+
if (pending.length === 0) return 0;
|
|
2324
|
+
options.log({
|
|
2325
|
+
level: "info",
|
|
2326
|
+
message: `Runner file sync: ${pending.length} file(s) queued for this runner`
|
|
2327
|
+
});
|
|
2328
|
+
let applied = 0;
|
|
2329
|
+
for (const file of pending) {
|
|
2330
|
+
if ((options.ackFailures.get(file.id) ?? 0) >= MAX_ACK_ATTEMPTS) continue;
|
|
2331
|
+
if (await applyOne(options, file)) applied += 1;
|
|
2332
|
+
}
|
|
2333
|
+
return applied;
|
|
2334
|
+
}
|
|
2335
|
+
async function listPendingFiles(options) {
|
|
2336
|
+
let res;
|
|
2337
|
+
try {
|
|
2338
|
+
res = await options.fetchImpl(`${options.apiUrl}/runners/${options.agentId}/files/pending`, {
|
|
2339
|
+
headers: { Authorization: options.getAuthHeader() }
|
|
2340
|
+
});
|
|
2341
|
+
} catch (err) {
|
|
2342
|
+
options.log({
|
|
2343
|
+
level: "warn",
|
|
2344
|
+
message: `Could not list pending runner files \u2014 retrying on the next drain: ${describe(err)}`
|
|
2345
|
+
});
|
|
2346
|
+
return [];
|
|
2347
|
+
}
|
|
2348
|
+
if (!res.ok) {
|
|
2349
|
+
options.log({
|
|
2350
|
+
level: res.status === 404 ? "debug" : "warn",
|
|
2351
|
+
message: `Listing pending runner files returned HTTP ${res.status} \u2014 retrying on the next drain`
|
|
2352
|
+
});
|
|
2353
|
+
return [];
|
|
2354
|
+
}
|
|
2355
|
+
let body;
|
|
2356
|
+
try {
|
|
2357
|
+
body = await res.json();
|
|
2358
|
+
} catch (err) {
|
|
2359
|
+
options.log({
|
|
2360
|
+
level: "warn",
|
|
2361
|
+
message: `Pending runner file list was not readable JSON \u2014 retrying on the next drain: ${describe(err)}`
|
|
2362
|
+
});
|
|
2363
|
+
return [];
|
|
2364
|
+
}
|
|
2365
|
+
if (!Array.isArray(body)) {
|
|
2366
|
+
options.log({
|
|
2367
|
+
level: "warn",
|
|
2368
|
+
message: "Pending runner file list was not an array \u2014 ignoring it for this drain"
|
|
2369
|
+
});
|
|
2370
|
+
return [];
|
|
2371
|
+
}
|
|
2372
|
+
const files = [];
|
|
2373
|
+
for (const entry of body) {
|
|
2374
|
+
const file = asPendingFile(entry);
|
|
2375
|
+
if (file === null) {
|
|
2376
|
+
options.log({
|
|
2377
|
+
level: "warn",
|
|
2378
|
+
message: "Ignoring a malformed pending runner file entry (expected id, path and size)"
|
|
2379
|
+
});
|
|
2380
|
+
continue;
|
|
2381
|
+
}
|
|
2382
|
+
files.push(file);
|
|
2383
|
+
}
|
|
2384
|
+
return files;
|
|
2385
|
+
}
|
|
2386
|
+
function asPendingFile(entry) {
|
|
2387
|
+
if (entry === null || typeof entry !== "object") return null;
|
|
2388
|
+
const { id, path, size } = entry;
|
|
2389
|
+
if (typeof id !== "string" || id === "") return null;
|
|
2390
|
+
if (typeof path !== "string" || path === "") return null;
|
|
2391
|
+
if (typeof size !== "number" || !Number.isFinite(size) || size < 0) return null;
|
|
2392
|
+
return { id, path, size };
|
|
2393
|
+
}
|
|
2394
|
+
async function applyOne(options, file) {
|
|
2395
|
+
const label = `${file.id.slice(0, 8)} (${file.path})`;
|
|
2396
|
+
if (options.allowedDirectories.length === 0) {
|
|
2397
|
+
options.log({
|
|
2398
|
+
level: "warn",
|
|
2399
|
+
message: `Runner file ${label} rejected: file sync is not enabled on this runner (start it with --enable-file-sync-to)`
|
|
2400
|
+
});
|
|
2401
|
+
await ack(options, file, "rejected", "file_sync_disabled");
|
|
2402
|
+
return false;
|
|
2403
|
+
}
|
|
2404
|
+
if (file.size > MAX_FILE_PUSH_BYTES) {
|
|
2405
|
+
options.log({
|
|
2406
|
+
level: "warn",
|
|
2407
|
+
message: `Runner file ${label} rejected: declared ${file.size} bytes, the limit is ${MAX_FILE_PUSH_BYTES}`
|
|
2408
|
+
});
|
|
2409
|
+
await ack(options, file, "rejected", "file_too_large");
|
|
2410
|
+
return false;
|
|
2411
|
+
}
|
|
2412
|
+
const download = await downloadContent(options, file, label);
|
|
2413
|
+
if (!download.ok) {
|
|
2414
|
+
if (download.terminal) await ack(options, file, "rejected", download.code);
|
|
2415
|
+
return false;
|
|
2416
|
+
}
|
|
2417
|
+
let outcome;
|
|
2418
|
+
try {
|
|
2419
|
+
outcome = await writePushedFile({
|
|
2420
|
+
requestedPath: file.path,
|
|
2421
|
+
content: download.content,
|
|
2422
|
+
allowedDirectories: options.allowedDirectories,
|
|
2423
|
+
homeDir: options.homeDir
|
|
2424
|
+
});
|
|
2425
|
+
} catch (err) {
|
|
2426
|
+
options.log({
|
|
2427
|
+
level: "error",
|
|
2428
|
+
message: `Runner file ${label} could not be written: ${describe(err)}`
|
|
2429
|
+
});
|
|
2430
|
+
await ack(options, file, "rejected", "write_failed");
|
|
2431
|
+
return false;
|
|
2432
|
+
}
|
|
2433
|
+
if (!outcome.ok) {
|
|
2434
|
+
options.log({
|
|
2435
|
+
level: "warn",
|
|
2436
|
+
message: `Runner file ${label} rejected (${outcome.code}): ${outcome.message}`
|
|
2437
|
+
});
|
|
2438
|
+
await ack(options, file, "rejected", outcome.code);
|
|
2439
|
+
return false;
|
|
2440
|
+
}
|
|
2441
|
+
options.log({
|
|
2442
|
+
level: "info",
|
|
2443
|
+
message: `Runner file ${label} applied (${download.content.byteLength} bytes)`
|
|
2444
|
+
});
|
|
2445
|
+
await ack(options, file, "applied");
|
|
2446
|
+
return true;
|
|
2447
|
+
}
|
|
2448
|
+
function durableDownloadCode(status) {
|
|
2449
|
+
return status === 413 ? "file_too_large" : "write_failed";
|
|
2450
|
+
}
|
|
2451
|
+
async function downloadContent(options, file, label) {
|
|
2452
|
+
try {
|
|
2453
|
+
const res = await options.fetchImpl(
|
|
2454
|
+
`${options.apiUrl}/runners/${options.agentId}/files/${file.id}/content`,
|
|
2455
|
+
{ headers: { Authorization: options.getAuthHeader() } }
|
|
2456
|
+
);
|
|
2457
|
+
if (!res.ok) {
|
|
2458
|
+
const terminal = res.status >= 400 && res.status < 500 && res.status !== 401 && res.status !== 403 && res.status !== 408 && res.status !== 429;
|
|
2459
|
+
if (!terminal) {
|
|
2460
|
+
options.log({
|
|
2461
|
+
level: "warn",
|
|
2462
|
+
message: `Downloading runner file ${label} returned HTTP ${res.status} \u2014 retrying on the next drain`
|
|
2463
|
+
});
|
|
2464
|
+
return { ok: false, terminal: false };
|
|
2465
|
+
}
|
|
2466
|
+
const code = durableDownloadCode(res.status);
|
|
2467
|
+
options.log({
|
|
2468
|
+
level: "error",
|
|
2469
|
+
message: `Downloading runner file ${label} returned HTTP ${res.status} \u2014 rejecting it as ${code} (the bytes never reached the writer)`
|
|
2470
|
+
});
|
|
2471
|
+
return { ok: false, terminal: true, code };
|
|
2472
|
+
}
|
|
2473
|
+
return { ok: true, content: Buffer.from(await res.arrayBuffer()) };
|
|
2474
|
+
} catch (err) {
|
|
2475
|
+
options.log({
|
|
2476
|
+
level: "warn",
|
|
2477
|
+
message: `Downloading runner file ${label} failed \u2014 retrying on the next drain: ${describe(err)}`
|
|
2478
|
+
});
|
|
2479
|
+
return { ok: false, terminal: false };
|
|
2480
|
+
}
|
|
2481
|
+
}
|
|
2482
|
+
async function ack(options, file, status, reason) {
|
|
2483
|
+
const outcome = `${status}${reason ? ` (${reason})` : ""}`;
|
|
2484
|
+
try {
|
|
2485
|
+
const res = await options.fetchImpl(
|
|
2486
|
+
`${options.apiUrl}/runners/${options.agentId}/files/${file.id}/ack`,
|
|
2487
|
+
{
|
|
2488
|
+
method: "POST",
|
|
2489
|
+
headers: {
|
|
2490
|
+
Authorization: options.getAuthHeader(),
|
|
2491
|
+
"Content-Type": "application/json"
|
|
2492
|
+
},
|
|
2493
|
+
body: JSON.stringify(reason ? { status, reason } : { status })
|
|
2494
|
+
}
|
|
2495
|
+
);
|
|
2496
|
+
if (!res.ok) {
|
|
2497
|
+
recordAckFailure(
|
|
2498
|
+
options,
|
|
2499
|
+
file,
|
|
2500
|
+
`Acking runner file ${file.id.slice(0, 8)} as ${outcome} returned HTTP ${res.status}`
|
|
2501
|
+
);
|
|
2502
|
+
return;
|
|
2503
|
+
}
|
|
2504
|
+
options.ackFailures.delete(file.id);
|
|
2505
|
+
} catch (err) {
|
|
2506
|
+
recordAckFailure(
|
|
2507
|
+
options,
|
|
2508
|
+
file,
|
|
2509
|
+
`Acking runner file ${file.id.slice(0, 8)} as ${outcome} failed: ${describe(err)}`
|
|
2510
|
+
);
|
|
2511
|
+
}
|
|
2512
|
+
}
|
|
2513
|
+
function recordAckFailure(options, file, what) {
|
|
2514
|
+
const attempts = (options.ackFailures.get(file.id) ?? 0) + 1;
|
|
2515
|
+
options.ackFailures.set(file.id, attempts);
|
|
2516
|
+
options.log({
|
|
2517
|
+
level: "error",
|
|
2518
|
+
message: attempts >= MAX_ACK_ATTEMPTS ? `${what} \u2014 giving up after ${attempts} attempts. It stays pending until the server expires it; restart the runner to retry.` : `${what} \u2014 it stays pending until a later drain re-acks it (attempt ${attempts} of ${MAX_ACK_ATTEMPTS})`
|
|
2519
|
+
});
|
|
2520
|
+
}
|
|
2521
|
+
function describe(err) {
|
|
2522
|
+
return err instanceof Error ? err.message : String(err);
|
|
2523
|
+
}
|
|
2524
|
+
|
|
1985
2525
|
// src/lib/channels/driver.ts
|
|
1986
2526
|
function messageIdOf(m) {
|
|
1987
2527
|
if (!m || typeof m !== "object") return void 0;
|
|
@@ -2010,7 +2550,10 @@ var DEFAULT_PAUSED_MAX_WAIT_MS = 10 * 60 * 1e3;
|
|
|
2010
2550
|
var DEFAULT_STUCK_QUEUED_MS = 6e4;
|
|
2011
2551
|
var HEARTBEAT_MS = 6e4;
|
|
2012
2552
|
var ABSOLUTE_MAX_PROCESSING_MS = 6 * 60 * 60 * 1e3;
|
|
2553
|
+
var B2_ABANDONMENT_MIN_PINNED_MS = 3 * 6e4;
|
|
2554
|
+
var B2_ABANDONMENT_RECHECK_MS = HEARTBEAT_MS;
|
|
2013
2555
|
var POLL_MISS_GRACE_MS = HEARTBEAT_MS;
|
|
2556
|
+
var MAX_SUPERSEDED_CONVERSATIONS = 256;
|
|
2014
2557
|
var ChannelAuthError = class extends Error {
|
|
2015
2558
|
constructor(message) {
|
|
2016
2559
|
super(message);
|
|
@@ -2033,7 +2576,7 @@ function backoffDelay(attempt, policy) {
|
|
|
2033
2576
|
function isRetryableStatus(status) {
|
|
2034
2577
|
return status === 429 || status >= 500 && status <= 599;
|
|
2035
2578
|
}
|
|
2036
|
-
var ChannelDriver = class {
|
|
2579
|
+
var ChannelDriver = class _ChannelDriver {
|
|
2037
2580
|
agentId;
|
|
2038
2581
|
port;
|
|
2039
2582
|
apiUrl;
|
|
@@ -2047,8 +2590,38 @@ var ChannelDriver = class {
|
|
|
2047
2590
|
pausedMaxWaitMs;
|
|
2048
2591
|
stuckQueuedMs;
|
|
2049
2592
|
now;
|
|
2593
|
+
fileSyncDirectories;
|
|
2594
|
+
homeDir;
|
|
2050
2595
|
/** Cache of conversationId → opencode sessionId. */
|
|
2051
2596
|
sessions = /* @__PURE__ */ new Map();
|
|
2597
|
+
/**
|
|
2598
|
+
* conversationId → the opencode session this runner has ABANDONED as that
|
|
2599
|
+
* conversation's binding (#553), after a genuine (`sessionExists === true`)
|
|
2600
|
+
* dispatch failure: the session still exists but is wedged, so #485's self-heal
|
|
2601
|
+
* must bind a fresh one.
|
|
2602
|
+
*
|
|
2603
|
+
* Dropping the local binding + clearing the server row is not enough on its own:
|
|
2604
|
+
* a SIBLING message dispatched earlier in the same drain is still in-flight under
|
|
2605
|
+
* the same session, and its watcher's routine status writes carry
|
|
2606
|
+
* `opencode_session_id`, RESURRECTING the wedged id server-side after the clear —
|
|
2607
|
+
* and `ensureSession`'s persisted-id fallback then reuses it, defeating the
|
|
2608
|
+
* self-heal. This map makes the runner authoritative instead of racing those
|
|
2609
|
+
* writes: *`ensureSession` never reuses an abandoned id for that conversation,
|
|
2610
|
+
* whatever the server row says* — which holds even when the resurrecting write
|
|
2611
|
+
* is one we deliberately keep (see `markDone`).
|
|
2612
|
+
*
|
|
2613
|
+
* Bounded by construction, on both axes: keyed by CONVERSATION, so N failures on
|
|
2614
|
+
* one conversation hold ONE entry (the newest abandonment replaces the older), and
|
|
2615
|
+
* hard-capped at `MAX_SUPERSEDED_CONVERSATIONS` with FIFO eviction. Only the
|
|
2616
|
+
* NEWEST abandoned id per conversation is guarded: after a second abandonment a
|
|
2617
|
+
* late sibling of the FIRST session can write that id back and `ensureSession`
|
|
2618
|
+
* will reuse it — costing ONE repeat failure, which re-supersedes it. Deliberately
|
|
2619
|
+
* NOT dropped when the session's watcher tears down: `markDone` still writes the
|
|
2620
|
+
* abandoned id back (it must, or the reply is lost), so the guard has to outlive
|
|
2621
|
+
* the turn that resurrects it. In-memory only — a restart forgets it, at the same
|
|
2622
|
+
* bounded cost.
|
|
2623
|
+
*/
|
|
2624
|
+
supersededSessions = /* @__PURE__ */ new Map();
|
|
2052
2625
|
/**
|
|
2053
2626
|
* Per-opencode-session dispatch lock (Task 2.1a). `sendPromptAsync` is no
|
|
2054
2627
|
* longer idempotent (no caller-supplied `messageID`), and its read-back picks
|
|
@@ -2158,9 +2731,12 @@ var ChannelDriver = class {
|
|
|
2158
2731
|
sessionParents = /* @__PURE__ */ new Map();
|
|
2159
2732
|
/**
|
|
2160
2733
|
* Per-session OpenCode title cache (#310), keyed by sessionId. Only a resolved
|
|
2161
|
-
* NON-EMPTY name is stored (terminal — a real session name
|
|
2162
|
-
* so we do NOT re-GET `/session/:id` every tick.
|
|
2163
|
-
*
|
|
2734
|
+
* NON-EMPTY, non-placeholder name is stored (terminal — a real session name
|
|
2735
|
+
* won't later un-name), so we do NOT re-GET `/session/:id` every tick. "Non-empty"
|
|
2736
|
+
* excludes OpenCode's synchronous default title (see
|
|
2737
|
+
* `OPENCODE_DEFAULT_TITLE_PREFIX`, #549) — that placeholder is treated the same
|
|
2738
|
+
* as an empty title so it never latches. A missing entry = not yet resolved OR
|
|
2739
|
+
* resolved-but-still-empty/placeholder → re-fetch on next need, since OpenCode
|
|
2164
2740
|
* names sessions asynchronously mid-turn. Driver-level (not per-watcher) so both
|
|
2165
2741
|
* the watcher completion path AND the restart-recovery re-adopt path (which has
|
|
2166
2742
|
* no watcher) can resolve the title.
|
|
@@ -2168,6 +2744,24 @@ var ChannelDriver = class {
|
|
|
2168
2744
|
sessionTitles = /* @__PURE__ */ new Map();
|
|
2169
2745
|
/** Serialises drains so a reconnect during a drain doesn't double-process. */
|
|
2170
2746
|
draining = false;
|
|
2747
|
+
/**
|
|
2748
|
+
* Serialises runner-file syncs (#559) so the ~2s poll tick and a concurrent
|
|
2749
|
+
* drain ping don't download, write and ack the same file twice.
|
|
2750
|
+
*/
|
|
2751
|
+
syncingFiles = false;
|
|
2752
|
+
/**
|
|
2753
|
+
* Consecutive failed acks per pending file (#559). Lives on the driver so it
|
|
2754
|
+
* survives across drains — without it, a file whose ack keeps failing is
|
|
2755
|
+
* re-downloaded and re-written every ~2s until the server expires it.
|
|
2756
|
+
*/
|
|
2757
|
+
fileAckFailures = /* @__PURE__ */ new Map();
|
|
2758
|
+
/**
|
|
2759
|
+
* Monotonic count of files this runner has pulled and written (#559). Only
|
|
2760
|
+
* ever increases, so `run.ts` detects work by comparing it against the value
|
|
2761
|
+
* it saw on the previous cycle — including work that landed mid-sleep, the
|
|
2762
|
+
* same trick `lastProxiedActivityAt` uses.
|
|
2763
|
+
*/
|
|
2764
|
+
appliedFileCount = 0;
|
|
2171
2765
|
/**
|
|
2172
2766
|
* The currently-executing `drainPending()` promise, or null when idle. Lets a
|
|
2173
2767
|
* graceful shutdown (`waitForInFlight`) await an in-progress drain so a turn it
|
|
@@ -2198,6 +2792,8 @@ var ChannelDriver = class {
|
|
|
2198
2792
|
this.pausedMaxWaitMs = config2.pausedMaxWaitMs ?? DEFAULT_PAUSED_MAX_WAIT_MS;
|
|
2199
2793
|
this.stuckQueuedMs = config2.stuckQueuedMs ?? DEFAULT_STUCK_QUEUED_MS;
|
|
2200
2794
|
this.now = config2.now ?? (() => Date.now());
|
|
2795
|
+
this.fileSyncDirectories = config2.fileSyncDirectories ?? [];
|
|
2796
|
+
this.homeDir = config2.homeDir ?? homedir();
|
|
2201
2797
|
}
|
|
2202
2798
|
/** The IPv4-loopback base URL for the local `opencode serve`. */
|
|
2203
2799
|
get opencodeBase() {
|
|
@@ -2225,6 +2821,47 @@ var ChannelDriver = class {
|
|
|
2225
2821
|
);
|
|
2226
2822
|
return run2;
|
|
2227
2823
|
}
|
|
2824
|
+
/**
|
|
2825
|
+
* Pull-and-apply any files Evident has queued for this runner (#559), riding
|
|
2826
|
+
* the EXISTING drain cycle — `run.ts` calls it from the same ~2s channel poll
|
|
2827
|
+
* and drain ping that call `drainPending()`. There is deliberately no channel,
|
|
2828
|
+
* control frame or poll loop of its own: worst-case latency is one poll tick.
|
|
2829
|
+
*
|
|
2830
|
+
* NEVER throws and never surfaces a `ChannelAuthError`: a file failure must not
|
|
2831
|
+
* cost a conversation turn. Failures are logged and either acked as a terminal
|
|
2832
|
+
* outcome or left pending for the next drain (see `runner-file-sync.ts`).
|
|
2833
|
+
*
|
|
2834
|
+
* Re-entrant calls are skipped (the poll tick and a drain ping can overlap).
|
|
2835
|
+
*
|
|
2836
|
+
* @returns the number of files written to disk.
|
|
2837
|
+
*/
|
|
2838
|
+
async syncPendingFiles() {
|
|
2839
|
+
if (this.stopped) return 0;
|
|
2840
|
+
if (this.syncingFiles) return 0;
|
|
2841
|
+
this.syncingFiles = true;
|
|
2842
|
+
try {
|
|
2843
|
+
const applied = await syncPendingRunnerFiles({
|
|
2844
|
+
agentId: this.agentId,
|
|
2845
|
+
apiUrl: this.apiUrl,
|
|
2846
|
+
getAuthHeader: this.getAuthHeader,
|
|
2847
|
+
fetchImpl: this.fetchImpl,
|
|
2848
|
+
allowedDirectories: this.fileSyncDirectories,
|
|
2849
|
+
homeDir: this.homeDir,
|
|
2850
|
+
ackFailures: this.fileAckFailures,
|
|
2851
|
+
log: this.log
|
|
2852
|
+
});
|
|
2853
|
+
this.appliedFileCount += applied;
|
|
2854
|
+
return applied;
|
|
2855
|
+
} catch (err) {
|
|
2856
|
+
this.log({
|
|
2857
|
+
level: "error",
|
|
2858
|
+
message: `Runner file sync failed unexpectedly (message processing is unaffected): ${err instanceof Error ? err.message : String(err)}`
|
|
2859
|
+
});
|
|
2860
|
+
return 0;
|
|
2861
|
+
} finally {
|
|
2862
|
+
this.syncingFiles = false;
|
|
2863
|
+
}
|
|
2864
|
+
}
|
|
2228
2865
|
async runDrain() {
|
|
2229
2866
|
let dispatched = 0;
|
|
2230
2867
|
try {
|
|
@@ -2258,6 +2895,28 @@ var ChannelDriver = class {
|
|
|
2258
2895
|
}
|
|
2259
2896
|
return false;
|
|
2260
2897
|
}
|
|
2898
|
+
/**
|
|
2899
|
+
* File-pull work, for `run.ts`'s idle accounting (#559).
|
|
2900
|
+
*
|
|
2901
|
+
* Pulling a file is real work that `drainPending()` knows nothing about, so
|
|
2902
|
+
* without this a near-idle runner counts a credential pull as an empty tick
|
|
2903
|
+
* and `--idle-timeout` can `process.exit` mid-pull — leaving a
|
|
2904
|
+
* `.evident-push-*.tmp` behind — or immediately after the write, before the
|
|
2905
|
+
* browser has run the authorize/callback that activates it (the user then sees
|
|
2906
|
+
* `saved_not_activated` for a runner that was fine).
|
|
2907
|
+
*
|
|
2908
|
+
* Two signals because one cannot cover both cases: `inFlight` is the pull
|
|
2909
|
+
* happening RIGHT NOW (it may outlive the tick that started it), and
|
|
2910
|
+
* `appliedFiles` is monotonic so a pull that started AND finished between two
|
|
2911
|
+
* idle checks still shows up as an advance.
|
|
2912
|
+
*
|
|
2913
|
+
* CALLER CONTRACT: sample `inFlight` BEFORE calling `syncPendingFiles()` for
|
|
2914
|
+
* the cycle. `syncPendingFiles` sets the flag synchronously, so a caller that
|
|
2915
|
+
* samples afterwards reads `true` every single cycle and can never idle out.
|
|
2916
|
+
*/
|
|
2917
|
+
fileSyncActivity() {
|
|
2918
|
+
return { appliedFiles: this.appliedFileCount, inFlight: this.syncingFiles };
|
|
2919
|
+
}
|
|
2261
2920
|
/**
|
|
2262
2921
|
* OpenCode session ids the session-cleanup sweep (issue #190) must NOT delete:
|
|
2263
2922
|
* exactly those with a live (dispatched-but-not-done / paused) turn, i.e. a
|
|
@@ -2319,7 +2978,7 @@ var ChannelDriver = class {
|
|
|
2319
2978
|
await this.sleep(step);
|
|
2320
2979
|
}
|
|
2321
2980
|
}
|
|
2322
|
-
while (this.hasInFlightWatchers()) {
|
|
2981
|
+
while (this.hasInFlightWatchers() || this.syncingFiles) {
|
|
2323
2982
|
if (this.now() >= deadline) return false;
|
|
2324
2983
|
await this.sleep(step);
|
|
2325
2984
|
}
|
|
@@ -2354,10 +3013,15 @@ var ChannelDriver = class {
|
|
|
2354
3013
|
* @returns the count of messages NEWLY dispatched (not already in-flight).
|
|
2355
3014
|
*/
|
|
2356
3015
|
async processConversation(conv) {
|
|
2357
|
-
const sessionId = await this.ensureSession(conv);
|
|
3016
|
+
const { sessionId, refusedSessionId } = await this.ensureSession(conv);
|
|
2358
3017
|
const messages = await this.getPendingMessages(conv.id);
|
|
2359
3018
|
let dispatched = 0;
|
|
2360
3019
|
let skippedAlreadyDispatched = 0;
|
|
3020
|
+
if (refusedSessionId && messages.length > 0) {
|
|
3021
|
+
void this.postSignal(conv.id, messages[0].id, "session_superseded", {
|
|
3022
|
+
superseded_session_id: refusedSessionId
|
|
3023
|
+
});
|
|
3024
|
+
}
|
|
2361
3025
|
for (const message of messages) {
|
|
2362
3026
|
if (this.stopped) break;
|
|
2363
3027
|
if (this.dispatched.has(message.id)) {
|
|
@@ -2384,7 +3048,8 @@ var ChannelDriver = class {
|
|
|
2384
3048
|
} catch (err) {
|
|
2385
3049
|
if (err instanceof ChannelAuthError) throw err;
|
|
2386
3050
|
this.dispatched.delete(message.id);
|
|
2387
|
-
|
|
3051
|
+
const exists = await sessionExists(this.port, sessionId);
|
|
3052
|
+
if (exists === false) {
|
|
2388
3053
|
this.sessions.delete(conv.id);
|
|
2389
3054
|
this.log({
|
|
2390
3055
|
level: "warn",
|
|
@@ -2394,15 +3059,39 @@ var ChannelDriver = class {
|
|
|
2394
3059
|
});
|
|
2395
3060
|
break;
|
|
2396
3061
|
}
|
|
2397
|
-
|
|
3062
|
+
if (exists === null) {
|
|
3063
|
+
this.log({
|
|
3064
|
+
level: "warn",
|
|
3065
|
+
message: `Message ${message.id.slice(0, 8)} dispatch failed and session (${sessionId.slice(0, 8)}) existence could not be confirmed (opencode momentarily unreachable) \u2014 deferring this and later messages for conversation ${conv.id.slice(0, 8)} to the next tick rather than treating it as a genuine failure.`,
|
|
3066
|
+
conversation_id: conv.id,
|
|
3067
|
+
message_id: message.id
|
|
3068
|
+
});
|
|
3069
|
+
break;
|
|
3070
|
+
}
|
|
3071
|
+
const errorMessage = err instanceof Error ? err.message : String(err);
|
|
3072
|
+
this.sessions.delete(conv.id);
|
|
3073
|
+
this.supersede(conv.id, sessionId);
|
|
3074
|
+
this.log({
|
|
3075
|
+
level: "warn",
|
|
3076
|
+
message: `Abandoning OpenCode session ${sessionId.slice(0, 8)} as the binding for conversation ${conv.id.slice(0, 8)} (it exists but failed to run a turn) \u2014 a fresh session is created on the next tick, whatever the persisted binding says by then.`,
|
|
3077
|
+
conversation_id: conv.id,
|
|
3078
|
+
message_id: message.id
|
|
3079
|
+
});
|
|
3080
|
+
await this.markFailed(conv.id, message.id, null, errorMessage).catch((markErr) => {
|
|
3081
|
+
this.log({
|
|
3082
|
+
level: "warn",
|
|
3083
|
+
message: `markFailed PATCH for message ${message.id.slice(0, 8)} (conversation ${conv.id.slice(0, 8)}) failed (best-effort, not retried): ${markErr instanceof Error ? markErr.message : String(markErr)}`,
|
|
3084
|
+
conversation_id: conv.id,
|
|
3085
|
+
message_id: message.id
|
|
3086
|
+
});
|
|
2398
3087
|
});
|
|
2399
3088
|
this.log({
|
|
2400
3089
|
level: "error",
|
|
2401
|
-
message: `Message ${message.id.slice(0, 8)} dispatch failed: ${
|
|
3090
|
+
message: `Message ${message.id.slice(0, 8)} dispatch failed: ${errorMessage}`,
|
|
2402
3091
|
conversation_id: conv.id,
|
|
2403
3092
|
message_id: message.id
|
|
2404
3093
|
});
|
|
2405
|
-
|
|
3094
|
+
break;
|
|
2406
3095
|
}
|
|
2407
3096
|
if (opencodeMessageId === null) {
|
|
2408
3097
|
this.log({
|
|
@@ -2421,15 +3110,49 @@ var ChannelDriver = class {
|
|
|
2421
3110
|
if (messages.length > 0 && dispatched === 0 && skippedAlreadyDispatched === messages.length) {
|
|
2422
3111
|
this.log({
|
|
2423
3112
|
level: "warn",
|
|
2424
|
-
message: `Conversation ${conv.id.slice(0, 8)} has ${messages.length} pending message(s) but ALL are already marked dispatched locally (in-flight set: ${this.dispatched.size}) \u2014 none sent to OpenCode this tick. If this repeats, a message may be stuck acknowledged-but-never-dispatched (its watcher never settled).`,
|
|
3113
|
+
message: `Conversation ${conv.id.slice(0, 8)} has ${messages.length} pending message(s) but ALL are already marked dispatched locally (in-flight set: ${this.dispatched.size}) \u2014 none sent to OpenCode this tick. If this repeats, a message may be stuck acknowledged-but-never-dispatched (its watcher never settled).`,
|
|
3114
|
+
conversation_id: conv.id
|
|
3115
|
+
});
|
|
3116
|
+
}
|
|
3117
|
+
this.ensureWatcherRunning(sessionId);
|
|
3118
|
+
return dispatched;
|
|
3119
|
+
}
|
|
3120
|
+
/**
|
|
3121
|
+
* Record that `sessionId` is no longer a valid binding for `conversationId`
|
|
3122
|
+
* (#553). Keyed by conversation and hard-capped, so it cannot grow with the
|
|
3123
|
+
* number of failures — see the `supersededSessions` field doc.
|
|
3124
|
+
*/
|
|
3125
|
+
supersede(conversationId, sessionId) {
|
|
3126
|
+
this.supersededSessions.delete(conversationId);
|
|
3127
|
+
this.supersededSessions.set(conversationId, sessionId);
|
|
3128
|
+
while (this.supersededSessions.size > MAX_SUPERSEDED_CONVERSATIONS) {
|
|
3129
|
+
const oldest = this.supersededSessions.keys().next().value;
|
|
3130
|
+
if (oldest === void 0) return;
|
|
3131
|
+
this.supersededSessions.delete(oldest);
|
|
3132
|
+
}
|
|
3133
|
+
}
|
|
3134
|
+
/** Whether `sessionId` is the session this conversation has abandoned (#553). */
|
|
3135
|
+
isSuperseded(conversationId, sessionId) {
|
|
3136
|
+
return this.supersededSessions.get(conversationId) === sessionId;
|
|
3137
|
+
}
|
|
3138
|
+
/**
|
|
3139
|
+
* Resolve the opencode session to run this conversation's turns in.
|
|
3140
|
+
*
|
|
3141
|
+
* `refusedSessionId` is set when the #553 guard fired — i.e. the persisted
|
|
3142
|
+
* binding was an id this runner had abandoned, so a resurrection genuinely
|
|
3143
|
+
* happened and a fresh session was bound instead. The caller reports it.
|
|
3144
|
+
*/
|
|
3145
|
+
async ensureSession(conv) {
|
|
3146
|
+
const bound = this.sessions.get(conv.id) ?? conv.opencode_session_id ?? null;
|
|
3147
|
+
if (bound && this.isSuperseded(conv.id, bound)) {
|
|
3148
|
+
this.log({
|
|
3149
|
+
level: "warn",
|
|
3150
|
+
message: `OpenCode session ${bound.slice(0, 8)} was abandoned for conversation ${conv.id.slice(0, 8)} after a failed dispatch but is still bound to it (the persisted id was written back by a turn already in flight) \u2014 ignoring it and binding a fresh session.`,
|
|
2425
3151
|
conversation_id: conv.id
|
|
2426
3152
|
});
|
|
3153
|
+
this.sessions.delete(conv.id);
|
|
3154
|
+
return { sessionId: await this.createAndBindSession(conv.id), refusedSessionId: bound };
|
|
2427
3155
|
}
|
|
2428
|
-
this.ensureWatcherRunning(sessionId);
|
|
2429
|
-
return dispatched;
|
|
2430
|
-
}
|
|
2431
|
-
async ensureSession(conv) {
|
|
2432
|
-
const bound = this.sessions.get(conv.id) ?? conv.opencode_session_id ?? null;
|
|
2433
3156
|
if (bound) {
|
|
2434
3157
|
const exists = await sessionExists(this.port, bound);
|
|
2435
3158
|
if (exists === false) {
|
|
@@ -2439,12 +3162,12 @@ var ChannelDriver = class {
|
|
|
2439
3162
|
conversation_id: conv.id
|
|
2440
3163
|
});
|
|
2441
3164
|
this.sessions.delete(conv.id);
|
|
2442
|
-
return this.createAndBindSession(conv.id);
|
|
3165
|
+
return { sessionId: await this.createAndBindSession(conv.id) };
|
|
2443
3166
|
}
|
|
2444
3167
|
this.sessions.set(conv.id, bound);
|
|
2445
|
-
return bound;
|
|
3168
|
+
return { sessionId: bound };
|
|
2446
3169
|
}
|
|
2447
|
-
return this.createAndBindSession(conv.id);
|
|
3170
|
+
return { sessionId: await this.createAndBindSession(conv.id) };
|
|
2448
3171
|
}
|
|
2449
3172
|
/**
|
|
2450
3173
|
* Create a fresh OpenCode session for a conversation, cache the binding, and
|
|
@@ -2532,7 +3255,11 @@ var ChannelDriver = class {
|
|
|
2532
3255
|
* (not-owned / out-of-range / deleted-at-source / workspace gone) / 413
|
|
2533
3256
|
* (over-cap). On ANY non-2xx or thrown failure we return `null` so the caller
|
|
2534
3257
|
* OMITS that one image and the text turn still sends — NEVER throws the turn.
|
|
2535
|
-
*
|
|
3258
|
+
* A 404 body carrying `{ reason: 'needs_reauth' }` (#547 — the server CONFIRMED
|
|
3259
|
+
* a Slack `files:read` scope problem via `files.info`) instead resolves the
|
|
3260
|
+
* `AttachmentFetchNeedsReauth` sentinel, so the in-thread note can steer the
|
|
3261
|
+
* user to reconnect Slack instead of a generic "unavailable". Failures are
|
|
3262
|
+
* logged with context (no silent swallow).
|
|
2536
3263
|
*/
|
|
2537
3264
|
async fetchAttachmentDataUrl(messageId, index, mime) {
|
|
2538
3265
|
try {
|
|
@@ -2541,6 +3268,25 @@ var ChannelDriver = class {
|
|
|
2541
3268
|
{ headers: { Authorization: this.getAuthHeader() } }
|
|
2542
3269
|
);
|
|
2543
3270
|
if (!res.ok) {
|
|
3271
|
+
let reason;
|
|
3272
|
+
try {
|
|
3273
|
+
const body = await res.json();
|
|
3274
|
+
if (body && typeof body.reason === "string") reason = body.reason;
|
|
3275
|
+
} catch (parseErr) {
|
|
3276
|
+
this.log({
|
|
3277
|
+
level: "debug",
|
|
3278
|
+
message: `Attachment fetch for message ${messageId.slice(0, 8)} index ${index}: error body was not JSON (${parseErr instanceof Error ? parseErr.message : String(parseErr)}) \u2014 treating as a plain failure`,
|
|
3279
|
+
message_id: messageId
|
|
3280
|
+
});
|
|
3281
|
+
}
|
|
3282
|
+
if (reason === "needs_reauth") {
|
|
3283
|
+
this.log({
|
|
3284
|
+
level: "error",
|
|
3285
|
+
message: `Attachment fetch for message ${messageId.slice(0, 8)} index ${index} returned HTTP ${res.status} \u2014 server confirmed a Slack reauth/scope problem \u2014 omitting this image (text turn proceeds)`,
|
|
3286
|
+
message_id: messageId
|
|
3287
|
+
});
|
|
3288
|
+
return { needsReauth: true };
|
|
3289
|
+
}
|
|
2544
3290
|
this.log({
|
|
2545
3291
|
level: "error",
|
|
2546
3292
|
message: `Attachment fetch for message ${messageId.slice(0, 8)} index ${index} returned HTTP ${res.status} \u2014 omitting this image (text turn proceeds)`,
|
|
@@ -2580,6 +3326,9 @@ var ChannelDriver = class {
|
|
|
2580
3326
|
if (this.attachmentsSkippedSignalled.has(messageId)) return;
|
|
2581
3327
|
this.attachmentsSkippedSignalled.add(messageId);
|
|
2582
3328
|
const skippedReason = capabilityUnknown ? "unknown" : "unsupported";
|
|
3329
|
+
const failedReason = outcomes.some(
|
|
3330
|
+
(o) => o.status === "failed" && o.reason === "needs_reauth"
|
|
3331
|
+
) ? "needs_reauth" : void 0;
|
|
2583
3332
|
this.log({
|
|
2584
3333
|
level: "info",
|
|
2585
3334
|
message: `Message ${messageId.slice(0, 8)}: ${skipped} image(s) skipped (${capabilityUnknown ? "capability was unreadable \u2014 failed open to text-only" : "model not attachment-capable"}), ${failed} image(s) unavailable (deleted-at-source or fetch failure) \u2014 noting to Evident`,
|
|
@@ -2589,7 +3338,8 @@ var ChannelDriver = class {
|
|
|
2589
3338
|
void this.postSignal(conversationId, messageId, "attachments_skipped", {
|
|
2590
3339
|
skipped,
|
|
2591
3340
|
failed,
|
|
2592
|
-
...skipped > 0 ? { skipped_reason: skippedReason } : {}
|
|
3341
|
+
...skipped > 0 ? { skipped_reason: skippedReason } : {},
|
|
3342
|
+
...failedReason ? { failed_reason: failedReason } : {}
|
|
2593
3343
|
});
|
|
2594
3344
|
}
|
|
2595
3345
|
/** Register a freshly-dispatched message with its session's watcher state. */
|
|
@@ -2620,12 +3370,17 @@ var ChannelDriver = class {
|
|
|
2620
3370
|
stuckReported: false,
|
|
2621
3371
|
lastAliveAt: 0,
|
|
2622
3372
|
aliveInFlight: false,
|
|
3373
|
+
titleSynced: false,
|
|
3374
|
+
titleSyncInFlight: false,
|
|
2623
3375
|
awaitingHumanLatched: false,
|
|
2624
3376
|
pausedOnQuestion: false,
|
|
2625
3377
|
pausedOnPermission: false,
|
|
2626
3378
|
pausedClearConfirmed: false,
|
|
2627
3379
|
pausedInFlight: false,
|
|
2628
|
-
deliveryDeadlineAnchored: false
|
|
3380
|
+
deliveryDeadlineAnchored: false,
|
|
3381
|
+
b2PinnedSinceMs: 0,
|
|
3382
|
+
b2LastDescendantCheckMs: 0,
|
|
3383
|
+
b2AbandonedSignalled: false
|
|
2629
3384
|
});
|
|
2630
3385
|
}
|
|
2631
3386
|
/**
|
|
@@ -2693,12 +3448,17 @@ var ChannelDriver = class {
|
|
|
2693
3448
|
// with no extra `re_adopted` signal needed (folds old WI-6).
|
|
2694
3449
|
lastAliveAt: 0,
|
|
2695
3450
|
aliveInFlight: false,
|
|
3451
|
+
titleSynced: false,
|
|
3452
|
+
titleSyncInFlight: false,
|
|
2696
3453
|
awaitingHumanLatched: false,
|
|
2697
3454
|
pausedOnQuestion: false,
|
|
2698
3455
|
pausedOnPermission: false,
|
|
2699
3456
|
pausedClearConfirmed: false,
|
|
2700
3457
|
pausedInFlight: false,
|
|
2701
|
-
deliveryDeadlineAnchored: false
|
|
3458
|
+
deliveryDeadlineAnchored: false,
|
|
3459
|
+
b2PinnedSinceMs: 0,
|
|
3460
|
+
b2LastDescendantCheckMs: 0,
|
|
3461
|
+
b2AbandonedSignalled: false
|
|
2702
3462
|
});
|
|
2703
3463
|
}
|
|
2704
3464
|
/**
|
|
@@ -2860,58 +3620,7 @@ var ChannelDriver = class {
|
|
|
2860
3620
|
}
|
|
2861
3621
|
}
|
|
2862
3622
|
if (state === "done") {
|
|
2863
|
-
this.
|
|
2864
|
-
if (!inFlight.done) {
|
|
2865
|
-
this.log({
|
|
2866
|
-
level: "info",
|
|
2867
|
-
message: `Message ${inFlight.evidentMessageId.slice(0, 8)} completed \u2014 marking done`,
|
|
2868
|
-
conversation_id: conv.id,
|
|
2869
|
-
message_id: inFlight.evidentMessageId
|
|
2870
|
-
});
|
|
2871
|
-
const title = await this.resolveSessionTitle(sessionId, watcher.conv.id);
|
|
2872
|
-
const usage = messageUsage(messages, inFlight.opencodeMessageId);
|
|
2873
|
-
try {
|
|
2874
|
-
await this.markDone(
|
|
2875
|
-
conv.id,
|
|
2876
|
-
inFlight.evidentMessageId,
|
|
2877
|
-
sessionId,
|
|
2878
|
-
inFlight.opencodeMessageId,
|
|
2879
|
-
title,
|
|
2880
|
-
usage
|
|
2881
|
-
);
|
|
2882
|
-
} catch (err) {
|
|
2883
|
-
if (err instanceof ChannelAuthError) throw err;
|
|
2884
|
-
if (err instanceof ChannelTerminalError) {
|
|
2885
|
-
this.log({
|
|
2886
|
-
level: "warn",
|
|
2887
|
-
message: `Failed to mark message ${inFlight.evidentMessageId.slice(0, 8)} done (terminal HTTP ${err.status}) \u2014 leaving for the cron safety net: ${err.message}`,
|
|
2888
|
-
conversation_id: conv.id,
|
|
2889
|
-
message_id: inFlight.evidentMessageId
|
|
2890
|
-
});
|
|
2891
|
-
this.removeInFlight(watcher, inFlight.evidentMessageId);
|
|
2892
|
-
return;
|
|
2893
|
-
}
|
|
2894
|
-
if (this.now() >= inFlight.deadline) {
|
|
2895
|
-
this.log({
|
|
2896
|
-
level: "warn",
|
|
2897
|
-
message: `Failed to mark message ${inFlight.evidentMessageId.slice(0, 8)} done within the watch window \u2014 leaving for the cron safety net: ${err instanceof Error ? err.message : String(err)}`,
|
|
2898
|
-
conversation_id: conv.id,
|
|
2899
|
-
message_id: inFlight.evidentMessageId
|
|
2900
|
-
});
|
|
2901
|
-
this.removeInFlight(watcher, inFlight.evidentMessageId);
|
|
2902
|
-
return;
|
|
2903
|
-
}
|
|
2904
|
-
this.log({
|
|
2905
|
-
level: "warn",
|
|
2906
|
-
message: `Failed to mark message ${inFlight.evidentMessageId.slice(0, 8)} done (will retry next tick): ${err instanceof Error ? err.message : String(err)}`,
|
|
2907
|
-
conversation_id: conv.id,
|
|
2908
|
-
message_id: inFlight.evidentMessageId
|
|
2909
|
-
});
|
|
2910
|
-
return;
|
|
2911
|
-
}
|
|
2912
|
-
inFlight.done = true;
|
|
2913
|
-
}
|
|
2914
|
-
this.removeInFlight(watcher, inFlight.evidentMessageId);
|
|
3623
|
+
await this.settleMessageDone(sessionId, watcher, inFlight, messages);
|
|
2915
3624
|
return;
|
|
2916
3625
|
}
|
|
2917
3626
|
if (state === "failed") {
|
|
@@ -2925,8 +3634,16 @@ var ChannelDriver = class {
|
|
|
2925
3634
|
message_id: inFlight.evidentMessageId
|
|
2926
3635
|
});
|
|
2927
3636
|
const usage = messageUsage(messages, inFlight.opencodeMessageId);
|
|
3637
|
+
const failure = await this.classifyModelAuthFailure(messages, inFlight.opencodeMessageId);
|
|
2928
3638
|
try {
|
|
2929
|
-
await this.markFailed(
|
|
3639
|
+
await this.markFailed(
|
|
3640
|
+
conv.id,
|
|
3641
|
+
inFlight.evidentMessageId,
|
|
3642
|
+
sessionId,
|
|
3643
|
+
error2,
|
|
3644
|
+
usage,
|
|
3645
|
+
failure
|
|
3646
|
+
);
|
|
2930
3647
|
} catch (err) {
|
|
2931
3648
|
if (err instanceof ChannelAuthError) throw err;
|
|
2932
3649
|
if (err instanceof ChannelTerminalError) {
|
|
@@ -2971,6 +3688,44 @@ var ChannelDriver = class {
|
|
|
2971
3688
|
});
|
|
2972
3689
|
}
|
|
2973
3690
|
const activelyRunning = state === "running" && !awaitingHuman;
|
|
3691
|
+
const pinnedNow = activelyRunning && isPreamblePinnedRunning(messages, inFlight.opencodeMessageId);
|
|
3692
|
+
const snapshotReadable = messages != null && messages.length > 0;
|
|
3693
|
+
if (!pinnedNow) {
|
|
3694
|
+
if (snapshotReadable) {
|
|
3695
|
+
inFlight.b2PinnedSinceMs = 0;
|
|
3696
|
+
inFlight.b2LastDescendantCheckMs = 0;
|
|
3697
|
+
inFlight.b2AbandonedSignalled = false;
|
|
3698
|
+
}
|
|
3699
|
+
} else {
|
|
3700
|
+
if (inFlight.b2AbandonedSignalled) {
|
|
3701
|
+
await this.settleMessageDone(sessionId, watcher, inFlight, messages);
|
|
3702
|
+
return;
|
|
3703
|
+
}
|
|
3704
|
+
if (inFlight.b2PinnedSinceMs === 0) inFlight.b2PinnedSinceMs = this.now();
|
|
3705
|
+
const pinnedForMs = this.now() - inFlight.b2PinnedSinceMs;
|
|
3706
|
+
if (pinnedForMs >= B2_ABANDONMENT_MIN_PINNED_MS && this.now() - inFlight.b2LastDescendantCheckMs >= B2_ABANDONMENT_RECHECK_MS) {
|
|
3707
|
+
inFlight.b2LastDescendantCheckMs = this.now();
|
|
3708
|
+
const descendantOngoing = await this.isAnyDescendantSessionOngoing(sessionId);
|
|
3709
|
+
if (isB2AbandonmentConfirmed({
|
|
3710
|
+
pinnedForMs,
|
|
3711
|
+
minPinnedMs: B2_ABANDONMENT_MIN_PINNED_MS,
|
|
3712
|
+
descendantOngoing
|
|
3713
|
+
})) {
|
|
3714
|
+
inFlight.b2AbandonedSignalled = true;
|
|
3715
|
+
this.log({
|
|
3716
|
+
level: "warn",
|
|
3717
|
+
message: `Message ${id.slice(0, 8)} b2-pinned for ${Math.round(pinnedForMs / 1e3)}s with no ongoing descendant sub-agent session (status-map confirmed) \u2014 treating the delegated/tool turn as abandoned, resolving done`,
|
|
3718
|
+
conversation_id: conv.id,
|
|
3719
|
+
message_id: id
|
|
3720
|
+
});
|
|
3721
|
+
void this.postSignal(conv.id, id, "b2_abandoned_resolved", {
|
|
3722
|
+
watched_for_ms: pinnedForMs
|
|
3723
|
+
});
|
|
3724
|
+
await this.settleMessageDone(sessionId, watcher, inFlight, messages);
|
|
3725
|
+
return;
|
|
3726
|
+
}
|
|
3727
|
+
}
|
|
3728
|
+
}
|
|
2974
3729
|
if (activelyRunning && this.now() - inFlight.processingAnchorMs >= ABSOLUTE_MAX_PROCESSING_MS) {
|
|
2975
3730
|
this.log({
|
|
2976
3731
|
level: "warn",
|
|
@@ -2990,6 +3745,18 @@ var ChannelDriver = class {
|
|
|
2990
3745
|
inFlight.aliveInFlight = false;
|
|
2991
3746
|
if (ok) inFlight.lastAliveAt = this.now();
|
|
2992
3747
|
});
|
|
3748
|
+
if (!inFlight.titleSynced && !inFlight.titleSyncInFlight) {
|
|
3749
|
+
inFlight.titleSyncInFlight = true;
|
|
3750
|
+
void this.resolveSessionTitle(sessionId, conv.id).then(async (title) => {
|
|
3751
|
+
if (!title) {
|
|
3752
|
+
inFlight.titleSyncInFlight = false;
|
|
3753
|
+
return;
|
|
3754
|
+
}
|
|
3755
|
+
const ok = await this.patchConversationTitle(conv.id, title);
|
|
3756
|
+
inFlight.titleSyncInFlight = false;
|
|
3757
|
+
if (ok) inFlight.titleSynced = true;
|
|
3758
|
+
});
|
|
3759
|
+
}
|
|
2993
3760
|
}
|
|
2994
3761
|
if (awaitingHuman) {
|
|
2995
3762
|
if (!inFlight.awaitingHumanLatched) {
|
|
@@ -3027,6 +3794,70 @@ var ChannelDriver = class {
|
|
|
3027
3794
|
this.removeInFlight(watcher, inFlight.evidentMessageId);
|
|
3028
3795
|
}
|
|
3029
3796
|
}
|
|
3797
|
+
/**
|
|
3798
|
+
* Settle a message whose run-state has resolved `'done'` — extracted verbatim
|
|
3799
|
+
* (pure refactor, no behavior change) from `serviceInFlightMessage`'s former
|
|
3800
|
+
* inline `state === 'done'` branch body, so a SECOND caller (the #721
|
|
3801
|
+
* b2-abandonment resolution) can reach the exact same completion behavior
|
|
3802
|
+
* (delivery-deadline anchoring, title resolution, usage extraction, and
|
|
3803
|
+
* `markDone`'s auth/terminal/transient-retry discipline) without duplicating it
|
|
3804
|
+
* and risking the two copies silently drifting apart.
|
|
3805
|
+
*/
|
|
3806
|
+
async settleMessageDone(sessionId, watcher, inFlight, messages) {
|
|
3807
|
+
const conv = watcher.conv;
|
|
3808
|
+
this.anchorDeliveryDeadline(inFlight);
|
|
3809
|
+
if (!inFlight.done) {
|
|
3810
|
+
this.log({
|
|
3811
|
+
level: "info",
|
|
3812
|
+
message: `Message ${inFlight.evidentMessageId.slice(0, 8)} completed \u2014 marking done`,
|
|
3813
|
+
conversation_id: conv.id,
|
|
3814
|
+
message_id: inFlight.evidentMessageId
|
|
3815
|
+
});
|
|
3816
|
+
const title = await this.resolveSessionTitle(sessionId, watcher.conv.id);
|
|
3817
|
+
const usage = messageUsage(messages, inFlight.opencodeMessageId);
|
|
3818
|
+
try {
|
|
3819
|
+
await this.markDone(
|
|
3820
|
+
conv.id,
|
|
3821
|
+
inFlight.evidentMessageId,
|
|
3822
|
+
sessionId,
|
|
3823
|
+
inFlight.opencodeMessageId,
|
|
3824
|
+
title,
|
|
3825
|
+
usage
|
|
3826
|
+
);
|
|
3827
|
+
} catch (err) {
|
|
3828
|
+
if (err instanceof ChannelAuthError) throw err;
|
|
3829
|
+
if (err instanceof ChannelTerminalError) {
|
|
3830
|
+
this.log({
|
|
3831
|
+
level: "warn",
|
|
3832
|
+
message: `Failed to mark message ${inFlight.evidentMessageId.slice(0, 8)} done (terminal HTTP ${err.status}) \u2014 leaving for the cron safety net: ${err.message}`,
|
|
3833
|
+
conversation_id: conv.id,
|
|
3834
|
+
message_id: inFlight.evidentMessageId
|
|
3835
|
+
});
|
|
3836
|
+
this.removeInFlight(watcher, inFlight.evidentMessageId);
|
|
3837
|
+
return;
|
|
3838
|
+
}
|
|
3839
|
+
if (this.now() >= inFlight.deadline) {
|
|
3840
|
+
this.log({
|
|
3841
|
+
level: "warn",
|
|
3842
|
+
message: `Failed to mark message ${inFlight.evidentMessageId.slice(0, 8)} done within the watch window \u2014 leaving for the cron safety net: ${err instanceof Error ? err.message : String(err)}`,
|
|
3843
|
+
conversation_id: conv.id,
|
|
3844
|
+
message_id: inFlight.evidentMessageId
|
|
3845
|
+
});
|
|
3846
|
+
this.removeInFlight(watcher, inFlight.evidentMessageId);
|
|
3847
|
+
return;
|
|
3848
|
+
}
|
|
3849
|
+
this.log({
|
|
3850
|
+
level: "warn",
|
|
3851
|
+
message: `Failed to mark message ${inFlight.evidentMessageId.slice(0, 8)} done (will retry next tick): ${err instanceof Error ? err.message : String(err)}`,
|
|
3852
|
+
conversation_id: conv.id,
|
|
3853
|
+
message_id: inFlight.evidentMessageId
|
|
3854
|
+
});
|
|
3855
|
+
return;
|
|
3856
|
+
}
|
|
3857
|
+
inFlight.done = true;
|
|
3858
|
+
}
|
|
3859
|
+
this.removeInFlight(watcher, inFlight.evidentMessageId);
|
|
3860
|
+
}
|
|
3030
3861
|
// Restart recovery: re-adopt `processing` messages (ADR-0046, WI-3/4/5)
|
|
3031
3862
|
/**
|
|
3032
3863
|
* Re-adopt this agent's `processing` messages on drain (ADR-0046 Decision §1).
|
|
@@ -3193,6 +4024,7 @@ var ChannelDriver = class {
|
|
|
3193
4024
|
if (state === "failed") {
|
|
3194
4025
|
const error2 = messageError(messages, ocId ?? "") ?? void 0;
|
|
3195
4026
|
const usage = messageUsage(messages, ocId ?? "");
|
|
4027
|
+
const failure = await this.classifyModelAuthFailure(messages, ocId ?? "");
|
|
3196
4028
|
this.log({
|
|
3197
4029
|
level: "error",
|
|
3198
4030
|
message: `Re-adopt: message ${row.id.slice(0, 8)} errored while unwatched \u2014 marking failed: ${error2 ?? "(no error text)"}`,
|
|
@@ -3200,7 +4032,7 @@ var ChannelDriver = class {
|
|
|
3200
4032
|
message_id: row.id
|
|
3201
4033
|
});
|
|
3202
4034
|
try {
|
|
3203
|
-
await this.markFailed(row.conversation_id, row.id, sessionId, error2, usage);
|
|
4035
|
+
await this.markFailed(row.conversation_id, row.id, sessionId, error2, usage, failure);
|
|
3204
4036
|
} catch (err) {
|
|
3205
4037
|
if (err instanceof ChannelAuthError) throw err;
|
|
3206
4038
|
if (err instanceof ChannelTerminalError) {
|
|
@@ -3606,6 +4438,47 @@ var ChannelDriver = class {
|
|
|
3606
4438
|
}
|
|
3607
4439
|
return false;
|
|
3608
4440
|
}
|
|
4441
|
+
/**
|
|
4442
|
+
* Tri-state variant of the upward parentID membership walk (#721), used ONLY
|
|
4443
|
+
* by `isAnyDescendantSessionOngoing`. Walks the SAME cached
|
|
4444
|
+
* `resolveSessionParent` chain `sessionBelongsTo` uses above, but — unlike
|
|
4445
|
+
* `sessionBelongsTo`, which deliberately collapses "confirmed not a
|
|
4446
|
+
* descendant" and "the walk's fetch failed" into the same `false` (safe for
|
|
4447
|
+
* its OTHER callers: interaction attribution and the recovery-path
|
|
4448
|
+
* `isAnyDescendantSessionAlive`, both of which just retry next tick with no
|
|
4449
|
+
* safety consequence either way) — this variant keeps those two outcomes
|
|
4450
|
+
* SEPARATE, because `isAnyDescendantSessionOngoing`'s caller
|
|
4451
|
+
* (`isB2AbandonmentConfirmed`) must never treat "couldn't tell" as "confirmed
|
|
4452
|
+
* not ongoing".
|
|
4453
|
+
*
|
|
4454
|
+
* Return contract:
|
|
4455
|
+
* - `true` → the walk reached `rootSessionId` — `sessionId` IS a descendant.
|
|
4456
|
+
* - `false` → the walk reached a definitive, parent-less root session
|
|
4457
|
+
* WITHOUT ever matching `rootSessionId` — `sessionId` is
|
|
4458
|
+
* CONFIRMED NOT a descendant of it.
|
|
4459
|
+
* - `null` → INDETERMINATE: a `GET /session/:id` fetch failed partway
|
|
4460
|
+
* through the walk (`resolveSessionParent` returned `undefined`),
|
|
4461
|
+
* or the depth cap (32) was hit without a definitive answer (a
|
|
4462
|
+
* pathological/cyclic chain proves nothing either way). NEVER
|
|
4463
|
+
* treat this the same as `false` — see `sessionBelongsTo`'s own
|
|
4464
|
+
* doc comment above for why that collapse is safe THERE but not
|
|
4465
|
+
* here.
|
|
4466
|
+
*
|
|
4467
|
+
* `sessionBelongsTo` itself is UNCHANGED — this is an additive helper scoped
|
|
4468
|
+
* to the live-path descendant check, not a modification of shared code used
|
|
4469
|
+
* by interaction attribution or the recovery path.
|
|
4470
|
+
*/
|
|
4471
|
+
async resolveSessionMembership(sessionId, rootSessionId) {
|
|
4472
|
+
let current = sessionId;
|
|
4473
|
+
for (let depth = 0; current && depth < 32; depth++) {
|
|
4474
|
+
if (current === rootSessionId) return true;
|
|
4475
|
+
const parent = await this.resolveSessionParent(current);
|
|
4476
|
+
if (parent === void 0) return null;
|
|
4477
|
+
if (parent === null) return false;
|
|
4478
|
+
current = parent;
|
|
4479
|
+
}
|
|
4480
|
+
return null;
|
|
4481
|
+
}
|
|
3609
4482
|
/**
|
|
3610
4483
|
* Resolve (and cache) a session's `parentID` via `GET /session/:id`. Returns
|
|
3611
4484
|
* `null` for a root session (no parent) and `undefined` when opencode is
|
|
@@ -3628,19 +4501,36 @@ var ChannelDriver = class {
|
|
|
3628
4501
|
if (parent !== void 0) this.sessionParents.set(sessionId, parent);
|
|
3629
4502
|
return parent;
|
|
3630
4503
|
}
|
|
4504
|
+
/**
|
|
4505
|
+
* OpenCode's synchronous default session title (e.g.
|
|
4506
|
+
* `"New session - 1737800000000"`), assigned immediately when a session is
|
|
4507
|
+
* created — before OpenCode's async LLM-based auto-titling later renames it
|
|
4508
|
+
* mid-turn (#549). Matched by this literal, case-sensitive prefix only; the
|
|
4509
|
+
* timestamp suffix's exact format is deliberately NOT matched, since the prefix
|
|
4510
|
+
* alone is the stable, cheap signal and over-anchoring on the timestamp
|
|
4511
|
+
* representation risks silently breaking if OpenCode ever changes it. Accepted
|
|
4512
|
+
* trade-off: a genuine LLM-assigned title that happens to literally start with
|
|
4513
|
+
* this prefix would also fail to latch (see `resolveSessionTitle`) —
|
|
4514
|
+
* vanishingly unlikely in practice, and deliberately not engineered around.
|
|
4515
|
+
*/
|
|
4516
|
+
static OPENCODE_DEFAULT_TITLE_PREFIX = /^New session - /;
|
|
3631
4517
|
/**
|
|
3632
4518
|
* Resolve (and cache in `sessionTitles`) the OpenCode session TITLE (#310) so the
|
|
3633
4519
|
* status PATCH can carry it into the "Live sessions" list. Driver-level cache so
|
|
3634
4520
|
* BOTH the watcher completion path and the restart-recovery re-adopt path (which
|
|
3635
4521
|
* has no watcher) can use it. `conversationId` is passed only for log context.
|
|
3636
4522
|
* Best-effort:
|
|
3637
|
-
* - a resolved NON-EMPTY title
|
|
4523
|
+
* - a resolved NON-EMPTY title that does NOT match
|
|
4524
|
+
* `OPENCODE_DEFAULT_TITLE_PREFIX` is cached and terminal (a real session name
|
|
3638
4525
|
* won't later un-name), so we do NOT re-GET `/session/:id` every tick;
|
|
3639
|
-
* - while the title is still absent
|
|
3640
|
-
*
|
|
3641
|
-
*
|
|
3642
|
-
*
|
|
3643
|
-
*
|
|
4526
|
+
* - while the title is still absent, empty, or matches the OpenCode
|
|
4527
|
+
* placeholder prefix (#549) we do NOT latch it — OpenCode names sessions
|
|
4528
|
+
* asynchronously mid-turn, so an early call (e.g. at `processing`) must leave
|
|
4529
|
+
* the cache unresolved and re-fetch on the next need so a later call (e.g. at
|
|
4530
|
+
* `done`) picks up the name assigned in the meantime. Such a call returns
|
|
4531
|
+
* `null` (omit the title on THIS PATCH) without caching. If a session is
|
|
4532
|
+
* never renamed, the title is omitted forever rather than ever persisting
|
|
4533
|
+
* the placeholder as a last resort;
|
|
3644
4534
|
* - a failed request likewise leaves the cache unresolved (retry next need)
|
|
3645
4535
|
* and returns `null` — it must NEVER throw or block completion.
|
|
3646
4536
|
* A failure is logged with agent/session context (no silent catch).
|
|
@@ -3653,7 +4543,7 @@ var ChannelDriver = class {
|
|
|
3653
4543
|
if (res.ok) {
|
|
3654
4544
|
const body = await res.json();
|
|
3655
4545
|
const title = body && typeof body.title === "string" ? body.title.trim() : "";
|
|
3656
|
-
if (title.length > 0) {
|
|
4546
|
+
if (title.length > 0 && !_ChannelDriver.OPENCODE_DEFAULT_TITLE_PREFIX.test(title)) {
|
|
3657
4547
|
this.sessionTitles.set(sessionId, title);
|
|
3658
4548
|
return title;
|
|
3659
4549
|
}
|
|
@@ -3673,6 +4563,54 @@ var ChannelDriver = class {
|
|
|
3673
4563
|
}
|
|
3674
4564
|
return null;
|
|
3675
4565
|
}
|
|
4566
|
+
/**
|
|
4567
|
+
* Best-effort mid-turn title sync (#711 follow-up): PATCH a resolved OpenCode
|
|
4568
|
+
* session title onto the conversation via the PLAIN conversation-update
|
|
4569
|
+
* endpoint (`PATCH /runners/:agentId/conversations/:conversationId`) — NOT the
|
|
4570
|
+
* message-status endpoint `markProcessing`/`markDone` use. Deliberately a
|
|
4571
|
+
* separate, lighter call: it carries no `status`, so it cannot re-trigger the
|
|
4572
|
+
* `processing`/`done` transition side effects (Slack notices, activity-log
|
|
4573
|
+
* rows, delivery jobs) those PATCHes gate on `transitioned` — this call only
|
|
4574
|
+
* ever touches `conversations.title`. That route (`routes/conversations.ts`)
|
|
4575
|
+
* skips a title write matching the stored value, so a redundant call with the
|
|
4576
|
+
* same title is a real no-op — it does not bump `updated_at`, which the
|
|
4577
|
+
* conversation list sorts and paginates on. (Note this is a DIFFERENT guard
|
|
4578
|
+
* from `threads.ts`'s "non-empty AND changed" one, which only covers the
|
|
4579
|
+
* message-status PATCH; the non-empty half is enforced here instead, by
|
|
4580
|
+
* `resolveSessionTitle` never returning an empty/placeholder title.)
|
|
4581
|
+
*
|
|
4582
|
+
* Telemetry-only / never blocks the caller, mirroring `postSignal`: a failure
|
|
4583
|
+
* is logged and the title is simply retried on the next heartbeat tick (the
|
|
4584
|
+
* caller only latches `titleSynced` on `true`).
|
|
4585
|
+
*/
|
|
4586
|
+
async patchConversationTitle(conversationId, title) {
|
|
4587
|
+
try {
|
|
4588
|
+
const res = await this.fetchImpl(
|
|
4589
|
+
`${this.apiUrl}/runners/${this.agentId}/conversations/${conversationId}`,
|
|
4590
|
+
{
|
|
4591
|
+
method: "PATCH",
|
|
4592
|
+
headers: { Authorization: this.getAuthHeader(), "Content-Type": "application/json" },
|
|
4593
|
+
body: JSON.stringify({ title })
|
|
4594
|
+
}
|
|
4595
|
+
);
|
|
4596
|
+
if (!res.ok) {
|
|
4597
|
+
this.log({
|
|
4598
|
+
level: "debug",
|
|
4599
|
+
message: `Mid-turn title sync PATCH for conversation ${conversationId.slice(0, 8)} returned HTTP ${res.status} (best-effort, will retry next heartbeat)`,
|
|
4600
|
+
conversation_id: conversationId
|
|
4601
|
+
});
|
|
4602
|
+
return false;
|
|
4603
|
+
}
|
|
4604
|
+
return true;
|
|
4605
|
+
} catch (err) {
|
|
4606
|
+
this.log({
|
|
4607
|
+
level: "debug",
|
|
4608
|
+
message: `Best-effort mid-turn title sync PATCH failed for conversation ${conversationId.slice(0, 8)} (will retry next heartbeat): ${err instanceof Error ? err.message : String(err)}`,
|
|
4609
|
+
conversation_id: conversationId
|
|
4610
|
+
});
|
|
4611
|
+
return false;
|
|
4612
|
+
}
|
|
4613
|
+
}
|
|
3676
4614
|
/**
|
|
3677
4615
|
* DEFENSIVE cross-check for the restart-recovery path (WI-2): is any descendant
|
|
3678
4616
|
* (`task` sub-agent) session under `rootSessionId` still genuinely doing work?
|
|
@@ -3731,6 +4669,84 @@ var ChannelDriver = class {
|
|
|
3731
4669
|
}
|
|
3732
4670
|
return false;
|
|
3733
4671
|
}
|
|
4672
|
+
/**
|
|
4673
|
+
* LIVE-PATH descendant-liveness check (#721): is any descendant (`task`
|
|
4674
|
+
* sub-agent) session under `rootSessionId` currently ONGOING per OpenCode's own
|
|
4675
|
+
* in-memory status map (`isSessionOngoing` — `busy`/`retry`)?
|
|
4676
|
+
*
|
|
4677
|
+
* Deliberately NOT `isAnyDescendantSessionAlive` (the RECOVERY-path
|
|
4678
|
+
* cross-check above): that method judges liveness from the child's OWN
|
|
4679
|
+
* TRANSCRIPT (`isSessionActivelyGenerating`), which is the right (only) option
|
|
4680
|
+
* on the recovery path because a restart WIPES `SessionStatus`. On the LIVE
|
|
4681
|
+
* path the local opencode server IS running, so its in-memory status map is
|
|
4682
|
+
* live and authoritative — and per ADR-0047 §4a ("the child has its own entry
|
|
4683
|
+
* [in the map]"), a `task` descendant's OWN busy/retry entry reflects its
|
|
4684
|
+
* ENTIRE turn (including any tool call it is itself executing), not a
|
|
4685
|
+
* per-message transcript snapshot. This sidesteps the "child's own tool is
|
|
4686
|
+
* executing, between its step's completion and the next generation step"
|
|
4687
|
+
* transcript gap that a transcript-based check would need a second,
|
|
4688
|
+
* sustained-window bound to guard against — it is simply not derived from
|
|
4689
|
+
* message timestamps at all.
|
|
4690
|
+
*
|
|
4691
|
+
* Why not just check `isSessionOngoing(port, rootSessionId)` (the ROOT's own
|
|
4692
|
+
* status, as the recovery path does per §4a)? Because on the LIVE path the
|
|
4693
|
+
* root session can be shared: a SECOND, unrelated user message can land on the
|
|
4694
|
+
* SAME session (issue #721's own root cause) and keep the root `busy` for a
|
|
4695
|
+
* reason that has nothing to do with THIS message's delegation. A `task`
|
|
4696
|
+
* descendant session is spawned for exactly one delegated turn and never
|
|
4697
|
+
* reused, so its OWN status-map entry is unambiguous evidence about that one
|
|
4698
|
+
* delegation — which the root's status is not.
|
|
4699
|
+
*
|
|
4700
|
+
* Why membership is checked via `resolveSessionMembership`, NOT
|
|
4701
|
+
* `sessionBelongsTo`: `sessionBelongsTo` collapses a transient
|
|
4702
|
+
* `GET /session/:id` fetch failure into "not a descendant", which would
|
|
4703
|
+
* silently drop a genuinely-live candidate from consideration on the one
|
|
4704
|
+
* unlucky tick its membership-walk fetch hiccups (#721).
|
|
4705
|
+
* `resolveSessionMembership` keeps that failure mode as a distinct `null`
|
|
4706
|
+
* (indeterminate) so it is folded into THIS method's own `indeterminate` flag
|
|
4707
|
+
* instead.
|
|
4708
|
+
*
|
|
4709
|
+
* Return contract (note the DIFFERENT judge vs. `isAnyDescendantSessionAlive`):
|
|
4710
|
+
* - `true` → some descendant session is `busy`/`retry` (genuinely ongoing).
|
|
4711
|
+
* - `false` → enumeration succeeded, EVERY candidate's MEMBERSHIP was
|
|
4712
|
+
* confirmed either way (`resolveSessionMembership` never
|
|
4713
|
+
* returned `null`), and every CONFIRMED descendant's status read
|
|
4714
|
+
* succeeded and is not ongoing (includes "no descendant session
|
|
4715
|
+
* exists at all" — e.g. a plain, non-`task` tool call).
|
|
4716
|
+
* - `null` → INDETERMINATE: `listSessions` failed, OR at least one
|
|
4717
|
+
* candidate's MEMBERSHIP could not be confirmed
|
|
4718
|
+
* (`resolveSessionMembership` returned `null` — a fetch failure
|
|
4719
|
+
* or pathological chain partway through the parent walk), OR at
|
|
4720
|
+
* least one CONFIRMED descendant's `isSessionOngoing` read
|
|
4721
|
+
* failed — and no OTHER candidate was already confirmed `true`.
|
|
4722
|
+
* The caller MUST NOT treat `null` the same as `false` here
|
|
4723
|
+
* (unlike the recovery cross-check's contract) — see
|
|
4724
|
+
* `isB2AbandonmentConfirmed`.
|
|
4725
|
+
*/
|
|
4726
|
+
async isAnyDescendantSessionOngoing(rootSessionId) {
|
|
4727
|
+
const sessions = await listSessions(this.port);
|
|
4728
|
+
if (!sessions) {
|
|
4729
|
+
this.log({
|
|
4730
|
+
level: "warn",
|
|
4731
|
+
message: `Could not enumerate sessions to check descendant liveness for root ${rootSessionId} (listSessions failed) \u2014 treating descendant liveness as indeterminate`
|
|
4732
|
+
});
|
|
4733
|
+
return null;
|
|
4734
|
+
}
|
|
4735
|
+
let indeterminate = false;
|
|
4736
|
+
for (const candidate of sessions) {
|
|
4737
|
+
if (!candidate?.id || candidate.id === rootSessionId) continue;
|
|
4738
|
+
const membership = await this.resolveSessionMembership(candidate.id, rootSessionId);
|
|
4739
|
+
if (membership === null) {
|
|
4740
|
+
indeterminate = true;
|
|
4741
|
+
continue;
|
|
4742
|
+
}
|
|
4743
|
+
if (membership === false) continue;
|
|
4744
|
+
const ongoing = await isSessionOngoing(this.port, candidate.id);
|
|
4745
|
+
if (ongoing === true) return true;
|
|
4746
|
+
if (ongoing === null) indeterminate = true;
|
|
4747
|
+
}
|
|
4748
|
+
return indeterminate ? null : false;
|
|
4749
|
+
}
|
|
3734
4750
|
/**
|
|
3735
4751
|
* Cheap decision-telemetry label for a running row's LAST correlated reply
|
|
3736
4752
|
* (WI-2 Task 2.2): which running SHAPE it is, for the status-gated recovery log.
|
|
@@ -3859,6 +4875,32 @@ var ChannelDriver = class {
|
|
|
3859
4875
|
}
|
|
3860
4876
|
return messages;
|
|
3861
4877
|
}
|
|
4878
|
+
/**
|
|
4879
|
+
* The `opencode_session_id` fragment of a status PATCH body — `{}` when this
|
|
4880
|
+
* conversation has ABANDONED that session (#553). The field is optional
|
|
4881
|
+
* server-side and an absent one leaves the persisted binding untouched, so
|
|
4882
|
+
* omitting it is how a routine status write stops resurrecting it.
|
|
4883
|
+
*
|
|
4884
|
+
* ONLY for writes whose sole cost is a lost deep link. The `processing` notice
|
|
4885
|
+
* degrades to no "View in Evident" link (the reaction swap still fires) and the
|
|
4886
|
+
* turn-failure notice is built from the PATCH's own `error` text with a link off
|
|
4887
|
+
* the persisted row — neither loses content the user came for. `markDone`
|
|
4888
|
+
* deliberately does NOT use this helper: the server fetches the reply text
|
|
4889
|
+
* THROUGH the session id it is given, so suppressing there would replace the
|
|
4890
|
+
* agent's answer with a bare "✅ Done!" (the #183/#187 failure). The
|
|
4891
|
+
* `ensureSession` guard, not this suppression, is what makes the self-heal
|
|
4892
|
+
* stick.
|
|
4893
|
+
*/
|
|
4894
|
+
sessionIdBody(sessionId, conversationId, messageId, status) {
|
|
4895
|
+
if (!this.isSuperseded(conversationId, sessionId)) return { opencode_session_id: sessionId };
|
|
4896
|
+
this.log({
|
|
4897
|
+
level: "debug",
|
|
4898
|
+
message: `Omitting the abandoned OpenCode session ${sessionId.slice(0, 8)} from the '${status}' update for message ${messageId.slice(0, 8)} so it is not re-bound to conversation ${conversationId.slice(0, 8)}`,
|
|
4899
|
+
conversation_id: conversationId,
|
|
4900
|
+
message_id: messageId
|
|
4901
|
+
});
|
|
4902
|
+
return {};
|
|
4903
|
+
}
|
|
3862
4904
|
/**
|
|
3863
4905
|
* EXISTING combinedAuth route — now fired by the watcher on queued→running
|
|
3864
4906
|
* (Task 3.3), NOT at dispatch/claim time. `{status:'processing',
|
|
@@ -3888,7 +4930,7 @@ var ChannelDriver = class {
|
|
|
3888
4930
|
headers: { Authorization: this.getAuthHeader(), "Content-Type": "application/json" },
|
|
3889
4931
|
body: JSON.stringify({
|
|
3890
4932
|
status: "processing",
|
|
3891
|
-
|
|
4933
|
+
...this.sessionIdBody(sessionId, conversationId, messageId, "processing"),
|
|
3892
4934
|
...opencodeMessageId ? { opencode_message_id: opencodeMessageId } : {},
|
|
3893
4935
|
...title ? { title } : {}
|
|
3894
4936
|
})
|
|
@@ -3937,6 +4979,11 @@ var ChannelDriver = class {
|
|
|
3937
4979
|
headers: { Authorization: this.getAuthHeader(), "Content-Type": "application/json" },
|
|
3938
4980
|
body: JSON.stringify({
|
|
3939
4981
|
status: "done",
|
|
4982
|
+
// ALWAYS sent, even for a session this conversation has abandoned
|
|
4983
|
+
// (#553): the server reads the reply text back out of THIS session id
|
|
4984
|
+
// to deliver it. Omitting it would leave the user with "✅ Done!"
|
|
4985
|
+
// instead of the answer — a worse regression than the resurrection it
|
|
4986
|
+
// would prevent, which `ensureSession`'s guard handles anyway.
|
|
3940
4987
|
opencode_session_id: sessionId,
|
|
3941
4988
|
...opencodeMessageId ? { opencode_message_id: opencodeMessageId } : {},
|
|
3942
4989
|
...title ? { title } : {},
|
|
@@ -3953,16 +5000,31 @@ var ChannelDriver = class {
|
|
|
3953
5000
|
}
|
|
3954
5001
|
/**
|
|
3955
5002
|
* Mark a message `failed`. `sessionId` / `error` are threaded to the API ONLY
|
|
3956
|
-
* when provided (issue #182)
|
|
3957
|
-
* `
|
|
3958
|
-
*
|
|
3959
|
-
*
|
|
5003
|
+
* when provided (issue #182). Three states for `sessionId`:
|
|
5004
|
+
* - omitted (`undefined`) → don't send the field, leave the persisted
|
|
5005
|
+
* session untouched (unused today; kept for API symmetry).
|
|
5006
|
+
* - a real id (`string`) → send it, update the persisted session (the
|
|
5007
|
+
* turn-failure call sites: an errored OpenCode turn).
|
|
5008
|
+
* - explicit `null` → send it, CLEAR the persisted session (issue
|
|
5009
|
+
* #485's dispatch-handoff-failure call site: the session id still
|
|
5010
|
+
* exists but is wedged, so the next attempt must get a fresh one
|
|
5011
|
+
* instead of reusing it — see WI-1's server-side null-clearing PATCH).
|
|
3960
5012
|
*/
|
|
3961
|
-
async markFailed(conversationId, messageId, sessionId, error2, usage) {
|
|
5013
|
+
async markFailed(conversationId, messageId, sessionId, error2, usage, failure) {
|
|
3962
5014
|
const body = { status: "failed" };
|
|
3963
|
-
if (sessionId
|
|
5015
|
+
if (sessionId === null) {
|
|
5016
|
+
body.opencode_session_id = null;
|
|
5017
|
+
} else if (sessionId !== void 0) {
|
|
5018
|
+
Object.assign(body, this.sessionIdBody(sessionId, conversationId, messageId, "failed"));
|
|
5019
|
+
}
|
|
3964
5020
|
if (error2 !== void 0) body.error = error2;
|
|
3965
5021
|
if (usage) Object.assign(body, usage);
|
|
5022
|
+
if (failure) {
|
|
5023
|
+
body.failure_kind = failure.kind;
|
|
5024
|
+
body.failure_provider_id = failure.providerId;
|
|
5025
|
+
body.failure_model_id = failure.modelId;
|
|
5026
|
+
body.failure_reason = failure.reason;
|
|
5027
|
+
}
|
|
3966
5028
|
await this.callWithRetry(
|
|
3967
5029
|
"marking message as failed",
|
|
3968
5030
|
() => this.fetchImpl(
|
|
@@ -3975,6 +5037,29 @@ var ChannelDriver = class {
|
|
|
3975
5037
|
)
|
|
3976
5038
|
);
|
|
3977
5039
|
}
|
|
5040
|
+
/**
|
|
5041
|
+
* Classify an errored turn as a model-auth failure (#736 P1-4), for `markFailed`.
|
|
5042
|
+
*
|
|
5043
|
+
* `messageFailure` alone (structured OpenCode error → `model_auth`) covers
|
|
5044
|
+
* most cases; when it returns `null` on this ALREADY-FAILED turn, fall back
|
|
5045
|
+
* to the P1-2b zero-provider check — one extra loopback call to
|
|
5046
|
+
* `hasAnyConfiguredProvider`, only reached when the structured classifier
|
|
5047
|
+
* couldn't place it. Fails open (never throws): a fallback probe failure
|
|
5048
|
+
* (`null`/indeterminate) leaves the classification `null`, which produces
|
|
5049
|
+
* today's byte-identical PATCH body via `markFailed`'s `if (failure)` guard.
|
|
5050
|
+
*/
|
|
5051
|
+
async classifyModelAuthFailure(messages, userMessageId) {
|
|
5052
|
+
const classified = messageFailure(messages, userMessageId);
|
|
5053
|
+
if (classified != null) return classified;
|
|
5054
|
+
const reply = findLastAssistantReplyFor(messages, userMessageId);
|
|
5055
|
+
const hasProvider = await hasAnyConfiguredProvider(this.port);
|
|
5056
|
+
return applyZeroProviderFallback(
|
|
5057
|
+
classified,
|
|
5058
|
+
hasProvider,
|
|
5059
|
+
reply?.info?.providerID ?? null,
|
|
5060
|
+
reply?.info?.modelID ?? null
|
|
5061
|
+
);
|
|
5062
|
+
}
|
|
3978
5063
|
/**
|
|
3979
5064
|
* Best-effort, SINGLE-ATTEMPT runner→server telemetry ping
|
|
3980
5065
|
* (queued-followup-redrive). `POST .../messages/:id/signal {signal, ...extra}`
|
|
@@ -4151,7 +5236,7 @@ async function ensureOpenCodeRunning(ctx) {
|
|
|
4151
5236
|
console.log(chalk5.yellow("Tip: Run with the correct port:"));
|
|
4152
5237
|
console.log(
|
|
4153
5238
|
chalk5.dim(
|
|
4154
|
-
` ${getCliName()} run --
|
|
5239
|
+
` ${getCliName()} run --runner ${ctx.agentId} --port ${runningInstances[0].port}`
|
|
4155
5240
|
)
|
|
4156
5241
|
);
|
|
4157
5242
|
}
|
|
@@ -4281,19 +5366,21 @@ async function resolveAgentIdFromKey(authHeader) {
|
|
|
4281
5366
|
return { agent_id: data.agent_id };
|
|
4282
5367
|
}
|
|
4283
5368
|
return {
|
|
4284
|
-
error: "Cannot resolve runner ID: auth type is not agent_key. Please provide --
|
|
5369
|
+
error: "Cannot resolve runner ID: auth type is not agent_key. Please provide --runner explicitly."
|
|
4285
5370
|
};
|
|
4286
5371
|
} catch (error2) {
|
|
4287
5372
|
const message = error2 instanceof Error ? error2.message : "Unknown error";
|
|
4288
5373
|
return { error: `Failed to resolve runner from key: ${message}` };
|
|
4289
5374
|
}
|
|
4290
5375
|
}
|
|
5376
|
+
var BEST_EFFORT_NOTIFY_TIMEOUT_MS = 2e3;
|
|
4291
5377
|
async function notifyAgentDisconnected(agentId, authHeader) {
|
|
4292
5378
|
const apiUrl = getApiUrlConfig();
|
|
4293
5379
|
try {
|
|
4294
5380
|
const response = await fetch(`${apiUrl}/runners/${agentId}/disconnect`, {
|
|
4295
5381
|
method: "POST",
|
|
4296
|
-
headers: { Authorization: authHeader }
|
|
5382
|
+
headers: { Authorization: authHeader },
|
|
5383
|
+
signal: AbortSignal.timeout(BEST_EFFORT_NOTIFY_TIMEOUT_MS)
|
|
4297
5384
|
});
|
|
4298
5385
|
if (!response.ok) {
|
|
4299
5386
|
const serverMessage = await readErrorMessage(response);
|
|
@@ -4304,7 +5391,35 @@ async function notifyAgentDisconnected(agentId, authHeader) {
|
|
|
4304
5391
|
}
|
|
4305
5392
|
return { ok: true };
|
|
4306
5393
|
} catch (error2) {
|
|
4307
|
-
return { ok: false, error:
|
|
5394
|
+
return { ok: false, error: describeBestEffortError(error2) };
|
|
5395
|
+
}
|
|
5396
|
+
}
|
|
5397
|
+
function describeBestEffortError(error2) {
|
|
5398
|
+
const name = error2?.name;
|
|
5399
|
+
if (name === "TimeoutError" || name === "AbortError") {
|
|
5400
|
+
return `timed out after ${BEST_EFFORT_NOTIFY_TIMEOUT_MS}ms`;
|
|
5401
|
+
}
|
|
5402
|
+
return error2 instanceof Error ? error2.message : String(error2);
|
|
5403
|
+
}
|
|
5404
|
+
async function reportMicrovmId(agentId, authHeader, microvmId) {
|
|
5405
|
+
try {
|
|
5406
|
+
const apiUrl = getApiUrlConfig();
|
|
5407
|
+
const response = await fetch(`${apiUrl}/runners/${agentId}/microvm`, {
|
|
5408
|
+
method: "POST",
|
|
5409
|
+
headers: { Authorization: authHeader, "Content-Type": "application/json" },
|
|
5410
|
+
body: JSON.stringify({ microvm_id: microvmId }),
|
|
5411
|
+
signal: AbortSignal.timeout(BEST_EFFORT_NOTIFY_TIMEOUT_MS)
|
|
5412
|
+
});
|
|
5413
|
+
if (!response.ok) {
|
|
5414
|
+
const serverMessage = await readErrorMessage(response);
|
|
5415
|
+
return {
|
|
5416
|
+
ok: false,
|
|
5417
|
+
error: `HTTP ${response.status}${serverMessage ? `: ${serverMessage}` : ""}`
|
|
5418
|
+
};
|
|
5419
|
+
}
|
|
5420
|
+
return { ok: true };
|
|
5421
|
+
} catch (error2) {
|
|
5422
|
+
return { ok: false, error: describeBestEffortError(error2) };
|
|
4308
5423
|
}
|
|
4309
5424
|
}
|
|
4310
5425
|
async function getAgentInfo(agentId, authHeader) {
|
|
@@ -4354,6 +5469,7 @@ var MAX_ACTIVITY_LOG_ENTRIES = 10;
|
|
|
4354
5469
|
var CHANNEL_POLL_INTERVAL_MS = Number(process.env.EVIDENT_CHANNEL_POLL_INTERVAL_MS) || 2e3;
|
|
4355
5470
|
var CHANNEL_STUCK_QUEUED_MS = Number(process.env.EVIDENT_STUCK_QUEUED_MS) || void 0;
|
|
4356
5471
|
var SHUTDOWN_DRAIN_TIMEOUT_MS = Number(process.env.EVIDENT_SHUTDOWN_DRAIN_MS) || 25e3;
|
|
5472
|
+
var TELEMETRY_SHUTDOWN_TIMEOUT_MS = 5e3;
|
|
4357
5473
|
function resolveLogLevel(options) {
|
|
4358
5474
|
const accepted = Object.keys(LOG_LEVELS);
|
|
4359
5475
|
const validate = (value, source) => {
|
|
@@ -4377,6 +5493,34 @@ function resolveLogLevel(options) {
|
|
|
4377
5493
|
}
|
|
4378
5494
|
return "info";
|
|
4379
5495
|
}
|
|
5496
|
+
function resolveFileSyncDirectories(raw, homeDir) {
|
|
5497
|
+
const directories = [];
|
|
5498
|
+
for (const entry of raw ?? []) {
|
|
5499
|
+
const trimmed = entry.trim();
|
|
5500
|
+
if (trimmed === "") {
|
|
5501
|
+
throw new Error("--enable-file-sync-to requires a directory path (got an empty value)");
|
|
5502
|
+
}
|
|
5503
|
+
const expanded = trimmed === "~" ? homeDir : trimmed.startsWith("~/") ? join2(homeDir, trimmed.slice(2)) : trimmed;
|
|
5504
|
+
if (!isAbsolute2(expanded)) {
|
|
5505
|
+
throw new Error(`--enable-file-sync-to requires an absolute directory path; got "${entry}"`);
|
|
5506
|
+
}
|
|
5507
|
+
const normalized = resolvePath(expanded);
|
|
5508
|
+
if (parse(normalized).root === normalized) {
|
|
5509
|
+
throw new Error(
|
|
5510
|
+
`--enable-file-sync-to will not allow-list the filesystem root ("${entry}"); name the specific directory the credentials belong in (for example ~/.claude)`
|
|
5511
|
+
);
|
|
5512
|
+
}
|
|
5513
|
+
if (!directories.includes(normalized)) {
|
|
5514
|
+
directories.push(normalized);
|
|
5515
|
+
}
|
|
5516
|
+
}
|
|
5517
|
+
if (directories.length > MAX_FILE_SYNC_DIRECTORIES) {
|
|
5518
|
+
throw new Error(
|
|
5519
|
+
`--enable-file-sync-to accepts at most ${MAX_FILE_SYNC_DIRECTORIES} directories; got ${directories.length}`
|
|
5520
|
+
);
|
|
5521
|
+
}
|
|
5522
|
+
return directories;
|
|
5523
|
+
}
|
|
4380
5524
|
function meetsThreshold(state, level) {
|
|
4381
5525
|
return LOG_LEVELS[level] >= LOG_LEVELS[state.logLevel];
|
|
4382
5526
|
}
|
|
@@ -4498,18 +5642,29 @@ async function handleAuthError(state, error2) {
|
|
|
4498
5642
|
async function driveChannels(state, driver) {
|
|
4499
5643
|
let idlePolls = 0;
|
|
4500
5644
|
let lastSeenProxiedActivityAt = state.lastProxiedActivityAt;
|
|
5645
|
+
let lastSeenAppliedFiles = driver.fileSyncActivity().appliedFiles;
|
|
4501
5646
|
while (state.running) {
|
|
4502
5647
|
if (state.connection?.reconnecting && state.connection.reconnectPromise) {
|
|
4503
5648
|
logActivity(state, { type: "info", message: "Waiting for tunnel reconnection..." });
|
|
4504
5649
|
if (state.interactive) displayStatus(state);
|
|
4505
5650
|
await state.connection.reconnectPromise;
|
|
4506
5651
|
}
|
|
5652
|
+
const carriedOverFileSync = driver.fileSyncActivity().inFlight;
|
|
5653
|
+
void driver.syncPendingFiles().catch(
|
|
5654
|
+
(error2) => logActivity(state, {
|
|
5655
|
+
type: "error",
|
|
5656
|
+
error: `Runner file sync failed: ${error2 instanceof Error ? error2.message : String(error2)}`
|
|
5657
|
+
})
|
|
5658
|
+
);
|
|
4507
5659
|
try {
|
|
4508
5660
|
const processed = await driver.drainPending();
|
|
4509
5661
|
state.messageCount += processed;
|
|
4510
5662
|
const proxiedActivity = state.lastProxiedActivityAt !== lastSeenProxiedActivityAt;
|
|
4511
5663
|
lastSeenProxiedActivityAt = state.lastProxiedActivityAt;
|
|
4512
|
-
|
|
5664
|
+
const appliedFiles = driver.fileSyncActivity().appliedFiles;
|
|
5665
|
+
const fileActivity = carriedOverFileSync || appliedFiles !== lastSeenAppliedFiles;
|
|
5666
|
+
lastSeenAppliedFiles = appliedFiles;
|
|
5667
|
+
if (processed > 0 || driver.hasInFlightWatchers() || proxiedActivity || fileActivity) {
|
|
4513
5668
|
idlePolls = 0;
|
|
4514
5669
|
if (processed > 0 && state.interactive) displayStatus(state);
|
|
4515
5670
|
} else if (state.idleTimeout !== null) {
|
|
@@ -4538,7 +5693,7 @@ async function driveChannels(state, driver) {
|
|
|
4538
5693
|
logActivity(state, { type: "error", error: `Channel processing error: ${errorMessage}` });
|
|
4539
5694
|
if (state.interactive) displayStatus(state);
|
|
4540
5695
|
}
|
|
4541
|
-
await new Promise((
|
|
5696
|
+
await new Promise((resolve3) => setTimeout(resolve3, CHANNEL_POLL_INTERVAL_MS));
|
|
4542
5697
|
if (state.idleTimeout !== null && idlePolls >= 2) {
|
|
4543
5698
|
const idleMs = idlePolls * CHANNEL_POLL_INTERVAL_MS;
|
|
4544
5699
|
if (idleMs > state.idleTimeout * 1e3) {
|
|
@@ -4641,7 +5796,18 @@ async function notifyOffline(state) {
|
|
|
4641
5796
|
if (state.interactive) displayStatus(state);
|
|
4642
5797
|
}
|
|
4643
5798
|
}
|
|
5799
|
+
async function timeShutdownPhase(state, durations, name, run2) {
|
|
5800
|
+
const startedAt = Date.now();
|
|
5801
|
+
try {
|
|
5802
|
+
return await run2();
|
|
5803
|
+
} finally {
|
|
5804
|
+
const elapsedMs = Date.now() - startedAt;
|
|
5805
|
+
durations[name] = elapsedMs;
|
|
5806
|
+
log2(state, `Shutdown phase ${name}: ${elapsedMs}ms`);
|
|
5807
|
+
}
|
|
5808
|
+
}
|
|
4644
5809
|
async function cleanup(state, opts = {}) {
|
|
5810
|
+
const durations = {};
|
|
4645
5811
|
state.running = false;
|
|
4646
5812
|
for (const timer of state.sessionCleanupTimers) {
|
|
4647
5813
|
clearInterval(timer);
|
|
@@ -4655,7 +5821,13 @@ async function cleanup(state, opts = {}) {
|
|
|
4655
5821
|
logActivity(state, { type: "info", message: "Draining in-flight work before shutdown..." });
|
|
4656
5822
|
displayStatus(state);
|
|
4657
5823
|
}
|
|
4658
|
-
const
|
|
5824
|
+
const driver = state.channelDriver;
|
|
5825
|
+
const settled = await timeShutdownPhase(
|
|
5826
|
+
state,
|
|
5827
|
+
durations,
|
|
5828
|
+
"drain",
|
|
5829
|
+
() => driver.waitForInFlight(SHUTDOWN_DRAIN_TIMEOUT_MS)
|
|
5830
|
+
);
|
|
4659
5831
|
if (!settled) {
|
|
4660
5832
|
logActivity(state, {
|
|
4661
5833
|
type: "info",
|
|
@@ -4664,13 +5836,15 @@ async function cleanup(state, opts = {}) {
|
|
|
4664
5836
|
if (state.interactive) displayStatus(state);
|
|
4665
5837
|
}
|
|
4666
5838
|
}
|
|
4667
|
-
await notifyOffline(state);
|
|
5839
|
+
await timeShutdownPhase(state, durations, "offline_notify", () => notifyOffline(state));
|
|
4668
5840
|
if (state.connection) {
|
|
4669
|
-
state.connection
|
|
5841
|
+
const connection = state.connection;
|
|
5842
|
+
await timeShutdownPhase(state, durations, "tunnel_close", () => connection.close());
|
|
4670
5843
|
state.connection = null;
|
|
4671
5844
|
}
|
|
4672
5845
|
if (state.opencodeProcess) {
|
|
4673
|
-
|
|
5846
|
+
const opencodeProcess = state.opencodeProcess;
|
|
5847
|
+
await timeShutdownPhase(state, durations, "opencode_stop", () => stopOpenCode(opencodeProcess));
|
|
4674
5848
|
if (state.interactive) {
|
|
4675
5849
|
logActivity(state, { type: "info", message: "Stopped OpenCode process" });
|
|
4676
5850
|
displayStatus(state);
|
|
@@ -4679,12 +5853,15 @@ async function cleanup(state, opts = {}) {
|
|
|
4679
5853
|
}
|
|
4680
5854
|
state.opencodeProcess = null;
|
|
4681
5855
|
}
|
|
5856
|
+
return durations;
|
|
4682
5857
|
}
|
|
4683
5858
|
async function run(options) {
|
|
4684
5859
|
const interactive = isInteractive(options.json);
|
|
4685
5860
|
let logLevel;
|
|
5861
|
+
let fileSyncDirectories;
|
|
4686
5862
|
try {
|
|
4687
5863
|
logLevel = resolveLogLevel(options);
|
|
5864
|
+
fileSyncDirectories = resolveFileSyncDirectories(options.enableFileSyncTo, homedir2());
|
|
4688
5865
|
} catch (error2) {
|
|
4689
5866
|
const message = error2 instanceof Error ? error2.message : String(error2);
|
|
4690
5867
|
if (options.json) {
|
|
@@ -4719,6 +5896,11 @@ async function run(options) {
|
|
|
4719
5896
|
sessionCleanupTimers: [],
|
|
4720
5897
|
authHeader: ""
|
|
4721
5898
|
};
|
|
5899
|
+
if (fileSyncDirectories.length > 0) {
|
|
5900
|
+
log2(state, `File sync enabled for: ${fileSyncDirectories.join(", ")}`);
|
|
5901
|
+
} else {
|
|
5902
|
+
log2(state, "File sync is disabled (no --enable-file-sync-to given)", "debug");
|
|
5903
|
+
}
|
|
4722
5904
|
if (!options.runner && options.agent) {
|
|
4723
5905
|
telemetry.info(
|
|
4724
5906
|
EventTypes.DEPRECATED_AGENT_FLAG_USED,
|
|
@@ -4742,14 +5924,38 @@ async function run(options) {
|
|
|
4742
5924
|
const handleSignal = async () => {
|
|
4743
5925
|
if (state.shuttingDown) return;
|
|
4744
5926
|
state.shuttingDown = true;
|
|
5927
|
+
const shutdownStartedAt = Date.now();
|
|
4745
5928
|
if (state.interactive) {
|
|
4746
5929
|
logActivity(state, { type: "info", message: "Shutting down..." });
|
|
4747
5930
|
displayStatus(state);
|
|
4748
5931
|
} else {
|
|
4749
5932
|
log2(state, "Shutting down...");
|
|
4750
5933
|
}
|
|
4751
|
-
await cleanup(state, { graceful: true });
|
|
4752
|
-
|
|
5934
|
+
const durations = await cleanup(state, { graceful: true });
|
|
5935
|
+
const telemetryBudgetMs = Number(process.env.EVIDENT_TELEMETRY_SHUTDOWN_MS) || TELEMETRY_SHUTDOWN_TIMEOUT_MS;
|
|
5936
|
+
await timeShutdownPhase(state, durations, "telemetry_flush", async () => {
|
|
5937
|
+
let timer;
|
|
5938
|
+
const flushed = shutdownTelemetry().then(
|
|
5939
|
+
() => true,
|
|
5940
|
+
(error2) => {
|
|
5941
|
+
log2(
|
|
5942
|
+
state,
|
|
5943
|
+
`Telemetry flush failed during shutdown: ${error2 instanceof Error ? error2.message : String(error2)}`,
|
|
5944
|
+
"warn"
|
|
5945
|
+
);
|
|
5946
|
+
return true;
|
|
5947
|
+
}
|
|
5948
|
+
);
|
|
5949
|
+
const timedOut = new Promise((resolve3) => {
|
|
5950
|
+
timer = setTimeout(() => resolve3(false), telemetryBudgetMs);
|
|
5951
|
+
});
|
|
5952
|
+
if (!await Promise.race([flushed, timedOut])) {
|
|
5953
|
+
log2(state, `Telemetry flush exceeded ${telemetryBudgetMs}ms \u2014 exiting anyway`, "warn");
|
|
5954
|
+
}
|
|
5955
|
+
clearTimeout(timer);
|
|
5956
|
+
});
|
|
5957
|
+
const breakdown = Object.entries(durations).map(([phase, ms]) => `${phase}=${ms}ms`).join(" ");
|
|
5958
|
+
log2(state, `Shutdown complete in ${Date.now() - shutdownStartedAt}ms (${breakdown})`);
|
|
4753
5959
|
process.exit(0);
|
|
4754
5960
|
};
|
|
4755
5961
|
process.on("SIGINT", handleSignal);
|
|
@@ -4863,6 +6069,21 @@ async function run(options) {
|
|
|
4863
6069
|
}
|
|
4864
6070
|
spinner?.succeed(`Runner: ${validation.agent.name || state.agentId}`);
|
|
4865
6071
|
state.agentName = validation.agent.name;
|
|
6072
|
+
const microvmId = process.env.MICROVM_ID?.trim();
|
|
6073
|
+
if (microvmId) {
|
|
6074
|
+
const reported = await reportMicrovmId(state.agentId, state.authHeader, microvmId);
|
|
6075
|
+
if (reported.ok) {
|
|
6076
|
+
log2(state, "Reported MicroVM identity so this runner can be resumed rather than restarted");
|
|
6077
|
+
} else {
|
|
6078
|
+
const message = `Could not report MicroVM identity (future wakes will cold-start): ${reported.error}`;
|
|
6079
|
+
log2(state, message, "warn");
|
|
6080
|
+
if (state.interactive && !state.json) {
|
|
6081
|
+
logActivity(state, { type: "info", level: "warn", message });
|
|
6082
|
+
}
|
|
6083
|
+
}
|
|
6084
|
+
} else {
|
|
6085
|
+
log2(state, "Not running in a MicroVM (MICROVM_ID unset) \u2014 nothing to report", "debug");
|
|
6086
|
+
}
|
|
4866
6087
|
const ocSpinner = interactive && !state.json ? ora3("Checking OpenCode...").start() : null;
|
|
4867
6088
|
try {
|
|
4868
6089
|
const oc = await ensureOpenCodeRunning({
|
|
@@ -4884,6 +6105,21 @@ async function run(options) {
|
|
|
4884
6105
|
logActivity(state, { type: "info", level: "warn", message: versionWarning });
|
|
4885
6106
|
}
|
|
4886
6107
|
}
|
|
6108
|
+
const noProviderWarning = buildNoProviderWarning(await hasAnyConfiguredProvider(state.port));
|
|
6109
|
+
if (noProviderWarning) {
|
|
6110
|
+
log2(state, noProviderWarning, "warn");
|
|
6111
|
+
if (state.interactive && !state.json) {
|
|
6112
|
+
logActivity(state, { type: "info", level: "warn", message: noProviderWarning });
|
|
6113
|
+
blank();
|
|
6114
|
+
console.log(chalk6.yellow("\u26A0 No OpenCode model provider is configured."));
|
|
6115
|
+
console.log(
|
|
6116
|
+
chalk6.dim(
|
|
6117
|
+
`Run ${chalk6.cyan("opencode auth login")} to set one up \u2014 messages will fail until then.`
|
|
6118
|
+
)
|
|
6119
|
+
);
|
|
6120
|
+
blank();
|
|
6121
|
+
}
|
|
6122
|
+
}
|
|
4887
6123
|
} catch (error2) {
|
|
4888
6124
|
ocSpinner?.fail(error2.message);
|
|
4889
6125
|
throw error2;
|
|
@@ -4896,6 +6132,10 @@ async function run(options) {
|
|
|
4896
6132
|
getAuthHeader: () => state.authHeader,
|
|
4897
6133
|
conversationFilter: state.conversationFilter,
|
|
4898
6134
|
stuckQueuedMs: CHANNEL_STUCK_QUEUED_MS,
|
|
6135
|
+
// #559: the `--enable-file-sync-to` allow-list. Empty ⇒ pending files are
|
|
6136
|
+
// REJECTED with `file_sync_disabled` on the ack, not silently ignored.
|
|
6137
|
+
fileSyncDirectories,
|
|
6138
|
+
homeDir: homedir2(),
|
|
4899
6139
|
log: (entry) => (
|
|
4900
6140
|
// Thread the driver's real level straight through so `debug`/`warn`
|
|
4901
6141
|
// survive the sink filter (they no longer collapse to info). `type`
|
|
@@ -4922,6 +6162,18 @@ async function run(options) {
|
|
|
4922
6162
|
type: "info",
|
|
4923
6163
|
message: `Tunnel ${isReconnect ? "reconnected" : "connected"} (runner: ${agentId})`
|
|
4924
6164
|
});
|
|
6165
|
+
if (options.tunnelReadyFile) {
|
|
6166
|
+
const marker = writeTunnelReadyMarker(options.tunnelReadyFile, agentId);
|
|
6167
|
+
if (marker.ok) {
|
|
6168
|
+
log2(state, `Wrote tunnel readiness marker to ${options.tunnelReadyFile}`, "debug");
|
|
6169
|
+
} else {
|
|
6170
|
+
log2(
|
|
6171
|
+
state,
|
|
6172
|
+
`Failed to write tunnel readiness marker to ${options.tunnelReadyFile}: ${marker.error}`,
|
|
6173
|
+
"error"
|
|
6174
|
+
);
|
|
6175
|
+
}
|
|
6176
|
+
}
|
|
4925
6177
|
emitAgentConnected(state.agentId, {
|
|
4926
6178
|
port: state.port,
|
|
4927
6179
|
cli_version: getCliVersion(),
|
|
@@ -4977,6 +6229,12 @@ async function run(options) {
|
|
|
4977
6229
|
onDrainPing: () => {
|
|
4978
6230
|
if (!state.running) return;
|
|
4979
6231
|
logActivity(state, { type: "info", message: "Drain ping received \u2014 draining" });
|
|
6232
|
+
void channelDriver.syncPendingFiles().catch(
|
|
6233
|
+
(error2) => logActivity(state, {
|
|
6234
|
+
type: "error",
|
|
6235
|
+
error: `Runner file sync failed on ping: ${error2 instanceof Error ? error2.message : String(error2)}`
|
|
6236
|
+
})
|
|
6237
|
+
);
|
|
4980
6238
|
channelDriver.drainPending().then((processed) => {
|
|
4981
6239
|
if (processed > 0) {
|
|
4982
6240
|
state.messageCount += processed;
|
|
@@ -5060,7 +6318,10 @@ program.name("evident").description("Run OpenCode locally and connect it to Evid
|
|
|
5060
6318
|
program.command("login").description("Authenticate with Evident").option("--token", "Use token-based authentication (for CI/CD)").option("--no-browser", "Do not open the browser automatically").action(login);
|
|
5061
6319
|
program.command("logout").description("Remove stored credentials for the current endpoint").option("--all", "Remove stored credentials for all endpoints").action((options) => logout({ all: options.all }));
|
|
5062
6320
|
program.command("whoami").description("Show the currently logged in user").action(whoami);
|
|
5063
|
-
program.command("run").description("Connect to Evident and process messages").option("
|
|
6321
|
+
program.command("run").description("Connect to Evident and process messages").option("--runner [id]", "Runner ID to connect to (optional when EVIDENT_RUNNER_KEY is set)").option(
|
|
6322
|
+
"-a, --agent [id]",
|
|
6323
|
+
"Deprecated alias for --runner (still supported; --runner wins if both are given)"
|
|
6324
|
+
).option("-p, --port <port>", "OpenCode port (default: 4096)", "4096").option(
|
|
5064
6325
|
"--log-level <level>",
|
|
5065
6326
|
"Log verbosity: debug | info | warn | error (default: info). Env: EVIDENT_LOG_LEVEL"
|
|
5066
6327
|
).option("-v, --verbose", "Alias for --log-level debug (ignored if --log-level is set)").option("-c, --conversation <id>", "Process only this specific conversation").option("--idle-timeout <seconds>", "Exit after N seconds idle").option("--json", "Output in JSON format").option(
|
|
@@ -5072,6 +6333,14 @@ program.command("run").description("Connect to Evident and process messages").op
|
|
|
5072
6333
|
).option(
|
|
5073
6334
|
"--session-cleanup-interval <duration>",
|
|
5074
6335
|
"How often the cleanup sweep runs (default: 1h). Env: EVIDENT_SESSION_CLEANUP_INTERVAL"
|
|
6336
|
+
).option(
|
|
6337
|
+
"--enable-file-sync-to <dir>",
|
|
6338
|
+
"Allow Evident to write files into this directory (repeatable). Omit to disable file sync entirely.",
|
|
6339
|
+
(value, previous) => previous.concat([value]),
|
|
6340
|
+
[]
|
|
6341
|
+
).option(
|
|
6342
|
+
"--tunnel-ready-file <path>",
|
|
6343
|
+
"Path to write once the tunnel is connected (set by the MicroVM hooks; unused on a developer machine)"
|
|
5075
6344
|
).action(
|
|
5076
6345
|
(options) => {
|
|
5077
6346
|
run({
|
|
@@ -5088,7 +6357,11 @@ program.command("run").description("Connect to Evident and process messages").op
|
|
|
5088
6357
|
// Raw strings — the resolver in run.ts single-sources parsing (M1).
|
|
5089
6358
|
sessionCleanupMaxAge: options.sessionCleanupMaxAge,
|
|
5090
6359
|
sessionCleanupMaxCount: options.sessionCleanupMaxCount,
|
|
5091
|
-
sessionCleanupInterval: options.sessionCleanupInterval
|
|
6360
|
+
sessionCleanupInterval: options.sessionCleanupInterval,
|
|
6361
|
+
// Raw values — expansion/validation is single-sourced in run.ts's
|
|
6362
|
+
// resolveFileSyncDirectories.
|
|
6363
|
+
enableFileSyncTo: options.enableFileSyncTo,
|
|
6364
|
+
tunnelReadyFile: options.tunnelReadyFile
|
|
5092
6365
|
});
|
|
5093
6366
|
}
|
|
5094
6367
|
);
|