@cloop/runner 0.3.68 → 0.3.71
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/{box-YFGM56QY.js → box-N5NOCXH3.js} +194 -522
- package/dist/{chunk-7LPSTDZE.js → chunk-4JTIWZHB.js} +1 -1
- package/dist/{chunk-TCNIRZLU.js → chunk-CLOYOD2X.js} +10 -6
- package/dist/{chunk-6LYMSWSB.js → chunk-DN6TQALA.js} +265 -1961
- package/dist/{chunk-HWNRORIZ.js → chunk-EE7PMIGC.js} +1 -1
- package/dist/chunk-EEG5JOZ7.js +939 -0
- package/dist/chunk-GAEZIKCK.js +626 -0
- package/dist/chunk-HIBAH65V.js +1178 -0
- package/dist/chunk-JDGGRIS3.js +43 -0
- package/dist/{chunk-7ZL3Z3IO.js → chunk-JI5FWLDU.js} +6 -6
- package/dist/chunk-JJWSPBM4.js +40 -0
- package/dist/{chunk-L7D3ANPW.js → chunk-KUGUMEYC.js} +4 -2
- package/dist/{chunk-BVPS6DCH.js → chunk-MUFILIJS.js} +574 -1673
- package/dist/chunk-PQURJJOD.js +459 -0
- package/dist/{chunk-34VZ5LZI.js → chunk-UX4D6FY7.js} +3 -83
- package/dist/chunk-VB4V65JR.js +85 -0
- package/dist/{connect-D2SXLADA.js → connect-5D5CIC4V.js} +11 -47
- package/dist/disconnect-CQXE6ZNH.js +163 -0
- package/dist/existing-runner-4QQYKV7I.js +15 -0
- package/dist/index.js +14 -14
- package/dist/{login-VNDFCJD4.js → login-KHJQD25C.js} +3 -2
- package/dist/{mcp-server-XPHCDBFR.js → mcp-server-4D476KMH.js} +10 -10
- package/dist/{runner-A3HFZ727.js → runner-6GIMXVD5.js} +4 -3
- package/dist/{runs-DOFU45TW.js → runs-TWUGWGNU.js} +4 -2
- package/dist/{statusline-VA2DSWVT.js → statusline-3TZ26LKY.js} +1 -1
- package/dist/{takeover-U2EHJ5GW.js → takeover-5QSP6YAG.js} +6 -4
- package/dist/{use-7D5GQFGB.js → use-HY5BO4BW.js} +20 -13
- package/package.json +1 -1
- package/dist/disconnect-7SJKPYIN.js +0 -30
- package/dist/existing-runner-XT3HLIPM.js +0 -20
|
@@ -1,54 +1,67 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
AGENTS,
|
|
4
|
+
LOCAL_AGENTS,
|
|
5
|
+
LocalUsage,
|
|
6
|
+
SUBSCRIPTIONS,
|
|
7
|
+
answerCall,
|
|
8
|
+
classifyError,
|
|
9
|
+
configuredBin,
|
|
10
|
+
connectCommand,
|
|
11
|
+
localAgent,
|
|
12
|
+
mintSession,
|
|
13
|
+
quotaProbes
|
|
14
|
+
} from "./chunk-MUFILIJS.js";
|
|
6
15
|
import {
|
|
7
16
|
CAPTURE_TICK_MS,
|
|
8
|
-
DEFAULT_FALLBACK_MODEL,
|
|
9
17
|
HOST_ID_MAX,
|
|
10
|
-
SUBSCRIPTIONS,
|
|
11
18
|
TITLE_MAX,
|
|
12
19
|
ThreadCapture,
|
|
13
|
-
|
|
20
|
+
captureCursorPath
|
|
21
|
+
} from "./chunk-EEG5JOZ7.js";
|
|
22
|
+
import "./chunk-JJWSPBM4.js";
|
|
23
|
+
import {
|
|
24
|
+
serveTakeovers
|
|
25
|
+
} from "./chunk-JI5FWLDU.js";
|
|
26
|
+
import "./chunk-CLOYOD2X.js";
|
|
27
|
+
import {
|
|
28
|
+
LocalDriver,
|
|
29
|
+
failedEnd,
|
|
30
|
+
listOutsideSessions
|
|
31
|
+
} from "./chunk-HIBAH65V.js";
|
|
32
|
+
import {
|
|
33
|
+
STOPPED_SUMMARY,
|
|
34
|
+
T3Client,
|
|
35
|
+
T3Driver,
|
|
36
|
+
attachedLine,
|
|
37
|
+
delivery,
|
|
38
|
+
fetchImages,
|
|
39
|
+
orderThreads,
|
|
40
|
+
saveImages
|
|
41
|
+
} from "./chunk-DN6TQALA.js";
|
|
42
|
+
import {
|
|
43
|
+
olderThan
|
|
44
|
+
} from "./chunk-365HFCQQ.js";
|
|
45
|
+
import {
|
|
46
|
+
pinExistingRunner
|
|
47
|
+
} from "./chunk-JDGGRIS3.js";
|
|
48
|
+
import {
|
|
14
49
|
awaitDaemon,
|
|
15
|
-
captureCursorPath,
|
|
16
|
-
classifyError,
|
|
17
|
-
claudeDialect,
|
|
18
|
-
claudeHome,
|
|
19
50
|
cmdWord,
|
|
20
|
-
codexDialect,
|
|
21
|
-
codexHome,
|
|
22
|
-
codexModels,
|
|
23
|
-
connectCommand,
|
|
24
51
|
findNpx,
|
|
25
52
|
installedService,
|
|
26
53
|
isRelease,
|
|
54
|
+
legacyNotConnectedLine,
|
|
27
55
|
legacyStagingRunner,
|
|
28
|
-
mintSession,
|
|
29
56
|
moveLegacyStagingRunner,
|
|
30
|
-
|
|
31
|
-
pinExistingRunner,
|
|
32
|
-
probeClaude,
|
|
33
|
-
probeClaudePermissions,
|
|
34
|
-
probeCodex,
|
|
57
|
+
moveLegacyStagingRunnerBack,
|
|
35
58
|
programFor,
|
|
36
59
|
psQuote,
|
|
37
60
|
runSteps,
|
|
38
61
|
serviceEnv,
|
|
39
|
-
stopService,
|
|
40
62
|
systemServices,
|
|
41
|
-
unitFor
|
|
42
|
-
|
|
43
|
-
} from "./chunk-BVPS6DCH.js";
|
|
44
|
-
import {
|
|
45
|
-
MeshSocket,
|
|
46
|
-
WAKE_TICK_MS,
|
|
47
|
-
buildDiag,
|
|
48
|
-
defaultSocketFactory,
|
|
49
|
-
runnerLog,
|
|
50
|
-
wakeWatch
|
|
51
|
-
} from "./chunk-AZQGERT7.js";
|
|
63
|
+
unitFor
|
|
64
|
+
} from "./chunk-PQURJJOD.js";
|
|
52
65
|
import {
|
|
53
66
|
BoxWatch,
|
|
54
67
|
hostedThreadsFilePath,
|
|
@@ -58,42 +71,25 @@ import {
|
|
|
58
71
|
runnerStatePath,
|
|
59
72
|
threadsFilePath,
|
|
60
73
|
writeRunnerState
|
|
61
|
-
} from "./chunk-
|
|
74
|
+
} from "./chunk-4JTIWZHB.js";
|
|
62
75
|
import {
|
|
63
|
-
BackgroundReading,
|
|
64
76
|
BoxToolError,
|
|
65
77
|
CLAUDE_AUTH_LOCKED,
|
|
66
78
|
HARNESS_LIMIT,
|
|
67
|
-
HARNESS_STALE_MS,
|
|
68
79
|
IDLE_SETTLE_MS,
|
|
69
|
-
LocalDriver,
|
|
70
80
|
MACHINE_RESULT_INSTRUCTION,
|
|
71
81
|
RUN_TEXT_MAX,
|
|
72
|
-
STOPPED_SUMMARY,
|
|
73
|
-
T3Client,
|
|
74
|
-
T3Driver,
|
|
75
|
-
TOKEN_DAYS,
|
|
76
|
-
TOKEN_SCOPE,
|
|
77
|
-
TOKEN_TTL_MS,
|
|
78
|
-
addTokens,
|
|
79
|
-
attachedLine,
|
|
80
82
|
commandFor,
|
|
81
|
-
delivery,
|
|
82
|
-
failedEnd,
|
|
83
|
-
fetchImages,
|
|
84
83
|
finalWords,
|
|
85
84
|
hasResultBlock,
|
|
86
85
|
holdsForNextTurn,
|
|
87
86
|
isHosted,
|
|
88
87
|
isLocal,
|
|
88
|
+
isLocalDriver,
|
|
89
89
|
isT3,
|
|
90
|
-
listOutsideSessions,
|
|
91
90
|
nextModel,
|
|
92
91
|
nextProgress,
|
|
93
|
-
orderThreads,
|
|
94
92
|
ownHarnessFirst,
|
|
95
|
-
quotaFromClaude,
|
|
96
|
-
quotaFromCodex,
|
|
97
93
|
readRunResult,
|
|
98
94
|
readRunnerConfig,
|
|
99
95
|
refusedModel,
|
|
@@ -104,27 +100,30 @@ import {
|
|
|
104
100
|
runnerDir,
|
|
105
101
|
runnerEnvironment,
|
|
106
102
|
runnerPath,
|
|
107
|
-
saveImages,
|
|
108
103
|
showsOtherThreads,
|
|
109
|
-
|
|
110
|
-
sourceKey,
|
|
111
|
-
utcWindow,
|
|
104
|
+
which,
|
|
112
105
|
windowsPowerShellEnv,
|
|
113
106
|
writeBoxConfig
|
|
114
|
-
} from "./chunk-
|
|
115
|
-
import "./chunk-VK6GV757.js";
|
|
107
|
+
} from "./chunk-GAEZIKCK.js";
|
|
116
108
|
import {
|
|
117
|
-
|
|
118
|
-
|
|
109
|
+
MeshSocket,
|
|
110
|
+
WAKE_TICK_MS,
|
|
111
|
+
buildDiag,
|
|
112
|
+
defaultSocketFactory,
|
|
113
|
+
runnerLog,
|
|
114
|
+
wakeWatch
|
|
115
|
+
} from "./chunk-AZQGERT7.js";
|
|
116
|
+
import "./chunk-VK6GV757.js";
|
|
119
117
|
import "./chunk-PKIEWBR7.js";
|
|
120
|
-
import "./chunk-
|
|
121
|
-
import "./chunk-
|
|
118
|
+
import "./chunk-KUGUMEYC.js";
|
|
119
|
+
import "./chunk-UX4D6FY7.js";
|
|
120
|
+
import "./chunk-VB4V65JR.js";
|
|
122
121
|
import {
|
|
123
122
|
getMachine
|
|
124
123
|
} from "./chunk-SBYSVZ7J.js";
|
|
125
124
|
import {
|
|
126
125
|
VERSION
|
|
127
|
-
} from "./chunk-
|
|
126
|
+
} from "./chunk-EE7PMIGC.js";
|
|
128
127
|
import {
|
|
129
128
|
getMeshUrl,
|
|
130
129
|
getOrigin,
|
|
@@ -135,7 +134,7 @@ import {
|
|
|
135
134
|
|
|
136
135
|
// src/commands/box.ts
|
|
137
136
|
import { homedir as homedir3 } from "os";
|
|
138
|
-
import { dirname as dirname3, join as
|
|
137
|
+
import { dirname as dirname3, join as join5 } from "path";
|
|
139
138
|
|
|
140
139
|
// src/cloudroom-core.ts
|
|
141
140
|
var CoreError = class extends Error {
|
|
@@ -421,6 +420,19 @@ async function withLock(file, fn) {
|
|
|
421
420
|
await exited;
|
|
422
421
|
}
|
|
423
422
|
}
|
|
423
|
+
var ADD_WORKTREE = ["-c", "core.hooksPath=/dev/null", "worktree", "add", "--quiet"];
|
|
424
|
+
async function startClean(path) {
|
|
425
|
+
let sparse = 0;
|
|
426
|
+
if (await git(path, ["config", "--get", "core.sparseCheckout"]).catch(() => "") === "true") {
|
|
427
|
+
sparse = (await git(path, ["ls-files", "-t"])).split("\n").filter((line) => line.startsWith("S ")).length;
|
|
428
|
+
await git(path, ["sparse-checkout", "disable"]);
|
|
429
|
+
}
|
|
430
|
+
const left = await git(path, ["status", "--porcelain", "--untracked-files=all", "--ignored"]);
|
|
431
|
+
if (!left) return { sparse, dirty: 0 };
|
|
432
|
+
await git(path, ["reset", "--hard", "--quiet", "HEAD"]);
|
|
433
|
+
await git(path, ["clean", "-fdxq"]);
|
|
434
|
+
return { sparse, dirty: left.split("\n").length };
|
|
435
|
+
}
|
|
424
436
|
var Repos = class {
|
|
425
437
|
constructor(root = REPOS_ROOT) {
|
|
426
438
|
this.root = root;
|
|
@@ -471,18 +483,21 @@ var Repos = class {
|
|
|
471
483
|
* filled; a folder that is already the worktree is left as it is. The run's
|
|
472
484
|
* branch is the local one when there is one, else the one it pushed, else
|
|
473
485
|
* a new one from the remote's default branch. Call under the clone's lock.
|
|
486
|
+
* Returns what a new worktree held that its commit does not, which it
|
|
487
|
+
* dropped: none for a clean start or a worktree already there.
|
|
474
488
|
*/
|
|
475
489
|
async ensureWorktree(clone, branch, path) {
|
|
476
490
|
const dir = this.cloneDir(clone);
|
|
477
491
|
await git(dir, ["worktree", "prune"]);
|
|
478
|
-
if (await this.listed(dir, path)) return;
|
|
492
|
+
if (await this.listed(dir, path)) return { sparse: 0, dirty: 0 };
|
|
479
493
|
if (await gitOk(dir, ["rev-parse", "--verify", "--quiet", `refs/heads/${branch}`]))
|
|
480
|
-
await git(dir, [
|
|
494
|
+
await git(dir, [...ADD_WORKTREE, path, branch]);
|
|
481
495
|
else {
|
|
482
496
|
const pushed = `refs/remotes/origin/${branch}`;
|
|
483
497
|
const base = await gitOk(dir, ["rev-parse", "--verify", "--quiet", pushed]) ? pushed : "origin/HEAD";
|
|
484
|
-
await git(dir, [
|
|
498
|
+
await git(dir, [...ADD_WORKTREE, "--no-track", "-b", branch, path, base]);
|
|
485
499
|
}
|
|
500
|
+
return startClean(path);
|
|
486
501
|
}
|
|
487
502
|
/** What is in the worktree at `path`. Call under the clone's lock. */
|
|
488
503
|
async facts(clone, branch, path, busy2) {
|
|
@@ -1221,11 +1236,7 @@ var CloudroomDriver = class {
|
|
|
1221
1236
|
}
|
|
1222
1237
|
}
|
|
1223
1238
|
if (place.kind === "worktree")
|
|
1224
|
-
await this.
|
|
1225
|
-
place.clone,
|
|
1226
|
-
place.branch,
|
|
1227
|
-
folder(existing2 ?? await this.session(thread))
|
|
1228
|
-
);
|
|
1239
|
+
await this.worktree(place, thread, folder(existing2 ?? await this.session(thread)));
|
|
1229
1240
|
if (this.stopped.has(thread)) throw STOPPED_IN_PREPARATION;
|
|
1230
1241
|
const photoLine = (await photosOnce()).line;
|
|
1231
1242
|
const held = this.foldEarly(thread);
|
|
@@ -1369,10 +1380,20 @@ var CloudroomDriver = class {
|
|
|
1369
1380
|
const tree = worktreeOf(s.workspace);
|
|
1370
1381
|
if (!tree) return deliver();
|
|
1371
1382
|
return this.repos.locked(tree.clone, async () => {
|
|
1372
|
-
await this.
|
|
1383
|
+
await this.worktree(tree, a.thread_id, folder(s));
|
|
1373
1384
|
return deliver();
|
|
1374
1385
|
});
|
|
1375
1386
|
}
|
|
1387
|
+
/** The run's worktree, there and on its branch; a new one that was not clean is logged. Call under the clone's lock. */
|
|
1388
|
+
async worktree(tree, thread, path) {
|
|
1389
|
+
const start = await this.repos.ensureWorktree(tree.clone, tree.branch, path);
|
|
1390
|
+
if (!start.sparse && !start.dirty) return;
|
|
1391
|
+
const work = workOf(thread);
|
|
1392
|
+
this.log(
|
|
1393
|
+
`worktree dirty start work=${work} thread=${thread} sparse=${start.sparse} dirty=${start.dirty}`
|
|
1394
|
+
);
|
|
1395
|
+
if (work) this.deps.dirtyStartLog?.(work, start);
|
|
1396
|
+
}
|
|
1376
1397
|
/**
|
|
1377
1398
|
* When a run ends, its worktree goes if nothing in it would be lost, and
|
|
1378
1399
|
* the report says where the work is when it stays. Under the clone's lock,
|
|
@@ -1935,369 +1956,6 @@ ${asked}` : AUTH_LOCK_CONTINUE;
|
|
|
1935
1956
|
}
|
|
1936
1957
|
};
|
|
1937
1958
|
|
|
1938
|
-
// src/drivers/local-usage.ts
|
|
1939
|
-
import { spawn as spawn2 } from "child_process";
|
|
1940
|
-
import { createReadStream } from "fs";
|
|
1941
|
-
import { readdir, realpath, stat } from "fs/promises";
|
|
1942
|
-
import { hostname, tmpdir } from "os";
|
|
1943
|
-
import { join as join3 } from "path";
|
|
1944
|
-
import { createInterface } from "readline";
|
|
1945
|
-
var PROBE_TIMEOUT_MS = 1e4;
|
|
1946
|
-
var isObject = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
|
|
1947
|
-
var count = (v) => typeof v === "number" && Number.isFinite(v) && v > 0 ? v : 0;
|
|
1948
|
-
var parse = (line) => {
|
|
1949
|
-
try {
|
|
1950
|
-
return JSON.parse(line);
|
|
1951
|
-
} catch {
|
|
1952
|
-
return void 0;
|
|
1953
|
-
}
|
|
1954
|
-
};
|
|
1955
|
-
function askHarness(bin, args, requests, answer, timeoutMs = PROBE_TIMEOUT_MS) {
|
|
1956
|
-
const command = commandFor(bin, args);
|
|
1957
|
-
return new Promise((resolve, reject) => {
|
|
1958
|
-
const child = spawn2(command.file, command.args, {
|
|
1959
|
-
cwd: tmpdir(),
|
|
1960
|
-
stdio: ["pipe", "pipe", "ignore"],
|
|
1961
|
-
env: process.env,
|
|
1962
|
-
windowsHide: true,
|
|
1963
|
-
...command.windowsVerbatimArguments ? { windowsVerbatimArguments: true } : {}
|
|
1964
|
-
});
|
|
1965
|
-
let settled = false;
|
|
1966
|
-
const finish = (err, value) => {
|
|
1967
|
-
if (settled) return;
|
|
1968
|
-
settled = true;
|
|
1969
|
-
clearTimeout(timer);
|
|
1970
|
-
child.stdin?.end();
|
|
1971
|
-
child.kill();
|
|
1972
|
-
setTimeout(() => {
|
|
1973
|
-
if (child.exitCode === null && child.signalCode === null) child.kill("SIGKILL");
|
|
1974
|
-
}, 2e3).unref();
|
|
1975
|
-
if (err) reject(err);
|
|
1976
|
-
else resolve(value);
|
|
1977
|
-
};
|
|
1978
|
-
const timer = setTimeout(
|
|
1979
|
-
() => finish(new Error(`no answer in ${timeoutMs / 1e3} s`)),
|
|
1980
|
-
timeoutMs
|
|
1981
|
-
);
|
|
1982
|
-
child.on("error", (err) => finish(err));
|
|
1983
|
-
child.on("close", () => finish(new Error("it exited before it answered")));
|
|
1984
|
-
child.stdin?.on("error", () => {
|
|
1985
|
-
});
|
|
1986
|
-
createInterface({ input: child.stdout }).on("line", (line) => {
|
|
1987
|
-
const msg = parse(line);
|
|
1988
|
-
const value = isObject(msg) ? answer(msg) : void 0;
|
|
1989
|
-
if (value !== void 0) finish(null, value);
|
|
1990
|
-
});
|
|
1991
|
-
child.stdin?.write(requests.map((r) => `${JSON.stringify(r)}
|
|
1992
|
-
`).join(""));
|
|
1993
|
-
});
|
|
1994
|
-
}
|
|
1995
|
-
var reason = (err) => err?.message ?? "the probe failed";
|
|
1996
|
-
async function probeClaudeQuota(bin = "claude", timeoutMs = PROBE_TIMEOUT_MS) {
|
|
1997
|
-
const args = [
|
|
1998
|
-
"--print",
|
|
1999
|
-
"--verbose",
|
|
2000
|
-
"--output-format",
|
|
2001
|
-
"stream-json",
|
|
2002
|
-
"--input-format",
|
|
2003
|
-
"stream-json",
|
|
2004
|
-
"--settings",
|
|
2005
|
-
JSON.stringify({ disableAllHooks: true }),
|
|
2006
|
-
"--strict-mcp-config",
|
|
2007
|
-
"--no-session-persistence",
|
|
2008
|
-
"--disable-slash-commands"
|
|
2009
|
-
];
|
|
2010
|
-
const request = (id, request2) => ({
|
|
2011
|
-
type: "control_request",
|
|
2012
|
-
request_id: id,
|
|
2013
|
-
request: request2
|
|
2014
|
-
});
|
|
2015
|
-
try {
|
|
2016
|
-
const response = await askHarness(
|
|
2017
|
-
bin,
|
|
2018
|
-
args,
|
|
2019
|
-
[
|
|
2020
|
-
request("cloop-init", { subtype: "initialize" }),
|
|
2021
|
-
request("cloop-usage", { subtype: "get_usage", skip_behaviors: true })
|
|
2022
|
-
],
|
|
2023
|
-
(msg) => {
|
|
2024
|
-
const r = msg.type === "control_response" ? msg.response : void 0;
|
|
2025
|
-
return isObject(r) && r.request_id === "cloop-usage" ? r : void 0;
|
|
2026
|
-
},
|
|
2027
|
-
timeoutMs
|
|
2028
|
-
);
|
|
2029
|
-
return quotaFromClaude(response, (/* @__PURE__ */ new Date()).toISOString());
|
|
2030
|
-
} catch (err) {
|
|
2031
|
-
return quotaFromClaude({ subtype: "error", error: reason(err) }, (/* @__PURE__ */ new Date()).toISOString());
|
|
2032
|
-
}
|
|
2033
|
-
}
|
|
2034
|
-
async function probeCodexQuota(bin = "codex", timeoutMs = PROBE_TIMEOUT_MS) {
|
|
2035
|
-
try {
|
|
2036
|
-
const answer = await askHarness(
|
|
2037
|
-
bin,
|
|
2038
|
-
["app-server"],
|
|
2039
|
-
[
|
|
2040
|
-
{
|
|
2041
|
-
id: 1,
|
|
2042
|
-
method: "initialize",
|
|
2043
|
-
params: { clientInfo: { name: "cloop-runner", version: VERSION } }
|
|
2044
|
-
},
|
|
2045
|
-
{ method: "initialized" },
|
|
2046
|
-
{ id: 2, method: "account/rateLimits/read" }
|
|
2047
|
-
],
|
|
2048
|
-
(msg) => msg.id === 2 ? msg : void 0,
|
|
2049
|
-
timeoutMs
|
|
2050
|
-
);
|
|
2051
|
-
return quotaFromCodex(answer, (/* @__PURE__ */ new Date()).toISOString());
|
|
2052
|
-
} catch (err) {
|
|
2053
|
-
return quotaFromCodex({ error: { message: reason(err) } }, (/* @__PURE__ */ new Date()).toISOString());
|
|
2054
|
-
}
|
|
2055
|
-
}
|
|
2056
|
-
async function listLogs(dir, depth, match, found) {
|
|
2057
|
-
for (const entry of await readdir(dir, { withFileTypes: true })) {
|
|
2058
|
-
const path = join3(dir, entry.name);
|
|
2059
|
-
if (entry.isFile() && match(entry.name)) found.files.push(path);
|
|
2060
|
-
else if (entry.isDirectory() && depth > 1)
|
|
2061
|
-
await listLogs(path, depth - 1, match, found).catch(() => {
|
|
2062
|
-
found.skipped++;
|
|
2063
|
-
});
|
|
2064
|
-
}
|
|
2065
|
-
}
|
|
2066
|
-
async function readLines(file, read) {
|
|
2067
|
-
let malformed = 0;
|
|
2068
|
-
let lastBad = false;
|
|
2069
|
-
const lines = createInterface({
|
|
2070
|
-
input: createReadStream(file, "utf-8"),
|
|
2071
|
-
crlfDelay: Number.POSITIVE_INFINITY
|
|
2072
|
-
});
|
|
2073
|
-
for await (const line of lines) {
|
|
2074
|
-
lastBad = !read(line);
|
|
2075
|
-
if (lastBad) malformed++;
|
|
2076
|
-
}
|
|
2077
|
-
return lastBad ? malformed - 1 : malformed;
|
|
2078
|
-
}
|
|
2079
|
-
function dayOf(v) {
|
|
2080
|
-
const ms = typeof v === "string" ? Date.parse(v) : Number.NaN;
|
|
2081
|
-
return Number.isFinite(ms) ? new Date(ms).toISOString().slice(0, 10) : null;
|
|
2082
|
-
}
|
|
2083
|
-
var inWindow = (day, w) => day >= w.sinceDay && day <= w.untilDay;
|
|
2084
|
-
function claudeReader(window, days) {
|
|
2085
|
-
const calls = /* @__PURE__ */ new Map();
|
|
2086
|
-
return {
|
|
2087
|
-
read: (line) => {
|
|
2088
|
-
if (!line.includes('"assistant"')) return true;
|
|
2089
|
-
const d = parse(line);
|
|
2090
|
-
if (d === void 0) return false;
|
|
2091
|
-
if (!isObject(d) || d.type !== "assistant") return true;
|
|
2092
|
-
const m = d.message;
|
|
2093
|
-
const u = isObject(m) ? m.usage : void 0;
|
|
2094
|
-
if (!isObject(m) || !isObject(u) || m.model === "<synthetic>") return true;
|
|
2095
|
-
const day = dayOf(d.timestamp);
|
|
2096
|
-
if (!day) return false;
|
|
2097
|
-
if (!inWindow(day, window)) return true;
|
|
2098
|
-
const details = isObject(u.output_tokens_details) ? u.output_tokens_details : {};
|
|
2099
|
-
const call = {
|
|
2100
|
-
day,
|
|
2101
|
-
uncached: count(u.input_tokens),
|
|
2102
|
-
cached: count(u.cache_read_input_tokens),
|
|
2103
|
-
creation: count(u.cache_creation_input_tokens),
|
|
2104
|
-
output: count(u.output_tokens),
|
|
2105
|
-
reasoning: count(details.thinking_tokens),
|
|
2106
|
-
records: 1
|
|
2107
|
-
};
|
|
2108
|
-
if (typeof m.id !== "string") addTokens(days, day, "claude", call);
|
|
2109
|
-
else {
|
|
2110
|
-
const key = `${m.id} ${String(d.requestId ?? "")}`;
|
|
2111
|
-
const seen = calls.get(key);
|
|
2112
|
-
if (!seen || call.output >= seen.output) calls.set(key, call);
|
|
2113
|
-
}
|
|
2114
|
-
return true;
|
|
2115
|
-
},
|
|
2116
|
-
finish: () => {
|
|
2117
|
-
for (const call of calls.values()) addTokens(days, call.day, "claude", call);
|
|
2118
|
-
}
|
|
2119
|
-
};
|
|
2120
|
-
}
|
|
2121
|
-
function codexReader(window, days) {
|
|
2122
|
-
return () => {
|
|
2123
|
-
let prev = { input: 0, cached: 0, write: 0, output: 0, reasoning: 0 };
|
|
2124
|
-
return (line) => {
|
|
2125
|
-
if (!line.includes('"token_count"')) return true;
|
|
2126
|
-
const d = parse(line);
|
|
2127
|
-
if (d === void 0) return false;
|
|
2128
|
-
const p = isObject(d) ? d.payload : void 0;
|
|
2129
|
-
if (!isObject(p) || p.type !== "token_count") return true;
|
|
2130
|
-
if (p.info === null || p.info === void 0) return true;
|
|
2131
|
-
const t = isObject(p.info) ? p.info.total_token_usage : void 0;
|
|
2132
|
-
const day = isObject(d) ? dayOf(d.timestamp) : null;
|
|
2133
|
-
if (!isObject(t) || !day) return false;
|
|
2134
|
-
const cur = {
|
|
2135
|
-
input: count(t.input_tokens),
|
|
2136
|
-
cached: count(t.cached_input_tokens),
|
|
2137
|
-
write: count(t.cache_write_input_tokens),
|
|
2138
|
-
output: count(t.output_tokens),
|
|
2139
|
-
reasoning: count(t.reasoning_output_tokens)
|
|
2140
|
-
};
|
|
2141
|
-
if (cur.input + cur.output <= prev.input + prev.output) return true;
|
|
2142
|
-
const rise = (k) => Math.max(0, cur[k] - prev[k]);
|
|
2143
|
-
if (inWindow(day, window))
|
|
2144
|
-
addTokens(days, day, "codex", {
|
|
2145
|
-
uncached: Math.max(0, rise("input") - rise("cached") - rise("write")),
|
|
2146
|
-
cached: rise("cached"),
|
|
2147
|
-
creation: rise("write"),
|
|
2148
|
-
output: rise("output"),
|
|
2149
|
-
reasoning: rise("reasoning"),
|
|
2150
|
-
records: 1
|
|
2151
|
-
});
|
|
2152
|
-
prev = cur;
|
|
2153
|
-
return true;
|
|
2154
|
-
};
|
|
2155
|
-
};
|
|
2156
|
-
}
|
|
2157
|
-
async function scanSource(source, sinceMs) {
|
|
2158
|
-
const key = sourceKey([
|
|
2159
|
-
hostname(),
|
|
2160
|
-
source.provider,
|
|
2161
|
-
await realpath(source.home).catch(() => source.home)
|
|
2162
|
-
]);
|
|
2163
|
-
const base = { source_key: key, provider: source.provider };
|
|
2164
|
-
const found = { files: [], skipped: 0 };
|
|
2165
|
-
for (const [i, root] of source.roots.entries()) {
|
|
2166
|
-
try {
|
|
2167
|
-
await listLogs(root.dir, root.depth, source.match, found);
|
|
2168
|
-
} catch (err) {
|
|
2169
|
-
const code = err.code;
|
|
2170
|
-
if (i > 0 && code === "ENOENT") continue;
|
|
2171
|
-
const empty = { scanned_files: 0, skipped_files: 0, malformed_records: 0 };
|
|
2172
|
-
return code === "ENOENT" ? { ...base, status: "missing", ...empty } : {
|
|
2173
|
-
...base,
|
|
2174
|
-
status: "failed",
|
|
2175
|
-
...empty,
|
|
2176
|
-
message: `The log folder could not be read (${code ?? "error"}).`
|
|
2177
|
-
};
|
|
2178
|
-
}
|
|
2179
|
-
}
|
|
2180
|
-
let scanned = 0;
|
|
2181
|
-
let skipped = found.skipped;
|
|
2182
|
-
let malformed = 0;
|
|
2183
|
-
for (const file of found.files) {
|
|
2184
|
-
try {
|
|
2185
|
-
if ((await stat(file)).mtimeMs < sinceMs) continue;
|
|
2186
|
-
malformed += await readLines(file, source.reader());
|
|
2187
|
-
scanned++;
|
|
2188
|
-
} catch {
|
|
2189
|
-
skipped++;
|
|
2190
|
-
}
|
|
2191
|
-
}
|
|
2192
|
-
return {
|
|
2193
|
-
...base,
|
|
2194
|
-
status: skipped || malformed ? "partial" : "ok",
|
|
2195
|
-
scanned_files: scanned,
|
|
2196
|
-
skipped_files: skipped,
|
|
2197
|
-
malformed_records: malformed
|
|
2198
|
-
};
|
|
2199
|
-
}
|
|
2200
|
-
async function scanTokenUsage(opts = {}) {
|
|
2201
|
-
const window = utcWindow(opts.now ?? Date.now(), TOKEN_DAYS);
|
|
2202
|
-
const sinceMs = Date.parse(`${window.sinceDay}T00:00:00Z`);
|
|
2203
|
-
const days = /* @__PURE__ */ new Map();
|
|
2204
|
-
const claudeHome2 = opts.claudeHome ?? claudeHome();
|
|
2205
|
-
const codexHome2 = opts.codexHome ?? codexHome();
|
|
2206
|
-
const claude = claudeReader(window, days);
|
|
2207
|
-
const sources = [
|
|
2208
|
-
await scanSource(
|
|
2209
|
-
{
|
|
2210
|
-
provider: "claude",
|
|
2211
|
-
home: claudeHome2,
|
|
2212
|
-
// projects/<project>/<session>.jsonl and projects/<project>/<session>/subagents/agent-*.jsonl
|
|
2213
|
-
roots: [{ dir: join3(claudeHome2, "projects"), depth: 4 }],
|
|
2214
|
-
match: (name) => name.endsWith(".jsonl"),
|
|
2215
|
-
reader: () => claude.read
|
|
2216
|
-
},
|
|
2217
|
-
sinceMs
|
|
2218
|
-
),
|
|
2219
|
-
await scanSource(
|
|
2220
|
-
{
|
|
2221
|
-
provider: "codex",
|
|
2222
|
-
home: codexHome2,
|
|
2223
|
-
roots: [
|
|
2224
|
-
{ dir: join3(codexHome2, "sessions"), depth: 4 },
|
|
2225
|
-
{ dir: join3(codexHome2, "archived_sessions"), depth: 1 }
|
|
2226
|
-
],
|
|
2227
|
-
match: (name) => name.startsWith("rollout-") && name.endsWith(".jsonl"),
|
|
2228
|
-
reader: codexReader(window, days)
|
|
2229
|
-
},
|
|
2230
|
-
sinceMs
|
|
2231
|
-
)
|
|
2232
|
-
];
|
|
2233
|
-
claude.finish();
|
|
2234
|
-
const partial = sources.some((s) => s.status === "partial" || s.status === "failed");
|
|
2235
|
-
return {
|
|
2236
|
-
status: partial ? "partial" : "ok",
|
|
2237
|
-
scope: TOKEN_SCOPE,
|
|
2238
|
-
window: { since_day: window.sinceDay, until_day: window.untilDay, time_zone: "UTC" },
|
|
2239
|
-
read_at: (/* @__PURE__ */ new Date()).toISOString(),
|
|
2240
|
-
by_day: sortedDays(days),
|
|
2241
|
-
sources
|
|
2242
|
-
};
|
|
2243
|
-
}
|
|
2244
|
-
var LocalUsage = class {
|
|
2245
|
-
constructor(deps) {
|
|
2246
|
-
this.deps = deps;
|
|
2247
|
-
this.tokens = new BackgroundReading({
|
|
2248
|
-
ttlMs: TOKEN_TTL_MS,
|
|
2249
|
-
read: () => this.scan(),
|
|
2250
|
-
now: deps.now
|
|
2251
|
-
});
|
|
2252
|
-
}
|
|
2253
|
-
deps;
|
|
2254
|
-
quotas = /* @__PURE__ */ new Map();
|
|
2255
|
-
tokens;
|
|
2256
|
-
/** The quota of a signed-in harness, probed at most once per harness check period. */
|
|
2257
|
-
quota(harness) {
|
|
2258
|
-
const probe = this.deps.probes[harness];
|
|
2259
|
-
if (!probe) return { status: "not_reported" };
|
|
2260
|
-
let reading = this.quotas.get(harness);
|
|
2261
|
-
if (!reading) {
|
|
2262
|
-
reading = new BackgroundReading({
|
|
2263
|
-
ttlMs: HARNESS_STALE_MS,
|
|
2264
|
-
read: async () => {
|
|
2265
|
-
const q = await probe();
|
|
2266
|
-
if (q.status === "probe_failed")
|
|
2267
|
-
this.deps.log?.(`quota probe failed harness=${harness}: ${q.message ?? ""}`);
|
|
2268
|
-
return q;
|
|
2269
|
-
},
|
|
2270
|
-
now: this.deps.now
|
|
2271
|
-
});
|
|
2272
|
-
this.quotas.set(harness, reading);
|
|
2273
|
-
}
|
|
2274
|
-
return reading.get();
|
|
2275
|
-
}
|
|
2276
|
-
/** Each report with its quota. A signed-out harness has no account to ask. */
|
|
2277
|
-
withQuota(harnesses) {
|
|
2278
|
-
return harnesses.map((h) => ({
|
|
2279
|
-
...h,
|
|
2280
|
-
quota: h.signedIn ? this.quota(h.id) : { status: "not_reported" }
|
|
2281
|
-
}));
|
|
2282
|
-
}
|
|
2283
|
-
/** Token counts from the last log scan, rescanned at most every TOKEN_TTL_MS. */
|
|
2284
|
-
tokenUsage() {
|
|
2285
|
-
return this.tokens.get();
|
|
2286
|
-
}
|
|
2287
|
-
async scan() {
|
|
2288
|
-
const now = this.deps.now ?? Date.now;
|
|
2289
|
-
const started = now();
|
|
2290
|
-
try {
|
|
2291
|
-
const usage = await (this.deps.scan ?? scanTokenUsage)();
|
|
2292
|
-
this.deps.log?.(`token scan took ${now() - started} ms status=${usage.status}`);
|
|
2293
|
-
return usage;
|
|
2294
|
-
} catch (err) {
|
|
2295
|
-
this.deps.log?.(`token scan failed: ${err?.message}`);
|
|
2296
|
-
return { status: "unavailable", reason: "The agent logs could not be read" };
|
|
2297
|
-
}
|
|
2298
|
-
}
|
|
2299
|
-
};
|
|
2300
|
-
|
|
2301
1959
|
// src/last-known.ts
|
|
2302
1960
|
function lastKnown(read, initial, { ms, what, onFail }) {
|
|
2303
1961
|
let last = initial;
|
|
@@ -2371,7 +2029,7 @@ var ResultOutbox = class {
|
|
|
2371
2029
|
};
|
|
2372
2030
|
|
|
2373
2031
|
// src/setup-share.ts
|
|
2374
|
-
import { spawn as
|
|
2032
|
+
import { spawn as spawn2 } from "child_process";
|
|
2375
2033
|
import {
|
|
2376
2034
|
copyFileSync,
|
|
2377
2035
|
existsSync as existsSync2,
|
|
@@ -2383,12 +2041,21 @@ import {
|
|
|
2383
2041
|
rmSync as rmSync3,
|
|
2384
2042
|
symlinkSync
|
|
2385
2043
|
} from "fs";
|
|
2386
|
-
import { homedir, tmpdir
|
|
2387
|
-
import { join as
|
|
2044
|
+
import { homedir, tmpdir } from "os";
|
|
2045
|
+
import { join as join3 } from "path";
|
|
2046
|
+
|
|
2047
|
+
// ../clo0p-app/contracts/box-mcp.ts
|
|
2048
|
+
var BOX_MCP_NAME_MAX = 40;
|
|
2049
|
+
var BOX_MCP_NAME = new RegExp(`^[a-z0-9][a-z0-9-]{0,${BOX_MCP_NAME_MAX - 1}}$`);
|
|
2050
|
+
var BOX_MCP_MAX_SERVERS = 20;
|
|
2051
|
+
var BOX_BROWSER_MCP = "playwright";
|
|
2052
|
+
var BOX_CLOOP_MCP = "cloop";
|
|
2053
|
+
var BOX_SKILLS_CAP_BYTES = 25 * 1024 * 1024;
|
|
2054
|
+
|
|
2055
|
+
// src/setup-share.ts
|
|
2388
2056
|
var SKILL_DIRS = [".agents/skills", ".claude/skills", ".codex/skills"];
|
|
2389
2057
|
var GUIDE_FILES = [".agents/AGENTS.md", ".claude/CLAUDE.md", ".codex/AGENTS.md"];
|
|
2390
|
-
|
|
2391
|
-
function realpath2(path) {
|
|
2058
|
+
function realpath(path) {
|
|
2392
2059
|
try {
|
|
2393
2060
|
return realpathSync(path);
|
|
2394
2061
|
} catch {
|
|
@@ -2402,32 +2069,32 @@ function findSetup(home) {
|
|
|
2402
2069
|
for (const dir of SKILL_DIRS) {
|
|
2403
2070
|
let entries;
|
|
2404
2071
|
try {
|
|
2405
|
-
entries = readdirSync(
|
|
2072
|
+
entries = readdirSync(join3(home, dir)).sort();
|
|
2406
2073
|
} catch {
|
|
2407
2074
|
continue;
|
|
2408
2075
|
}
|
|
2409
2076
|
for (const name of entries) {
|
|
2410
|
-
const path =
|
|
2411
|
-
if (names.has(name) || !existsSync2(
|
|
2412
|
-
const real =
|
|
2077
|
+
const path = join3(home, dir, name);
|
|
2078
|
+
if (names.has(name) || !existsSync2(join3(path, "SKILL.md"))) continue;
|
|
2079
|
+
const real = realpath(path);
|
|
2413
2080
|
if (!real || reals.has(real)) continue;
|
|
2414
2081
|
names.add(name);
|
|
2415
2082
|
reals.add(real);
|
|
2416
2083
|
skills.push({ name, path: real });
|
|
2417
2084
|
}
|
|
2418
2085
|
}
|
|
2419
|
-
const guide = GUIDE_FILES.map((file) =>
|
|
2086
|
+
const guide = GUIDE_FILES.map((file) => realpath(join3(home, file))).find((p) => p !== null) ?? null;
|
|
2420
2087
|
return { skills, guide };
|
|
2421
2088
|
}
|
|
2422
2089
|
function stage(setup) {
|
|
2423
|
-
const dir = mkdtempSync(
|
|
2424
|
-
mkdirSync3(
|
|
2090
|
+
const dir = mkdtempSync(join3(tmpdir(), "cloop-setup-"));
|
|
2091
|
+
mkdirSync3(join3(dir, ".agents", "skills"), { recursive: true });
|
|
2425
2092
|
for (const skill of setup.skills)
|
|
2426
|
-
symlinkSync(skill.path,
|
|
2427
|
-
if (setup.guide) copyFileSync(setup.guide,
|
|
2093
|
+
symlinkSync(skill.path, join3(dir, ".agents", "skills", skill.name), "junction");
|
|
2094
|
+
if (setup.guide) copyFileSync(setup.guide, join3(dir, ".agents", "owner-guide.md"));
|
|
2428
2095
|
return dir;
|
|
2429
2096
|
}
|
|
2430
|
-
async function packSkills(home = homedir(), capBytes =
|
|
2097
|
+
async function packSkills(home = homedir(), capBytes = BOX_SKILLS_CAP_BYTES, tarBin = "tar") {
|
|
2431
2098
|
const setup = findSetup(home);
|
|
2432
2099
|
if (setup.skills.length === 0 && !setup.guide) return { ok: false, reason: "no_skills" };
|
|
2433
2100
|
let dir;
|
|
@@ -2437,7 +2104,7 @@ async function packSkills(home = homedir(), capBytes = SKILLS_CAP_BYTES, tarBin
|
|
|
2437
2104
|
return { ok: false, reason: "tar_failed" };
|
|
2438
2105
|
}
|
|
2439
2106
|
const packed = await new Promise((resolve) => {
|
|
2440
|
-
const child =
|
|
2107
|
+
const child = spawn2(
|
|
2441
2108
|
tarBin,
|
|
2442
2109
|
[
|
|
2443
2110
|
"-c",
|
|
@@ -2484,10 +2151,9 @@ async function packSkills(home = homedir(), capBytes = SKILLS_CAP_BYTES, tarBin
|
|
|
2484
2151
|
rmSync3(dir, { recursive: true, force: true });
|
|
2485
2152
|
return packed;
|
|
2486
2153
|
}
|
|
2487
|
-
var RESERVED_MCP = /* @__PURE__ */ new Set([
|
|
2488
|
-
var MAX_REMOTE_MCP = 20;
|
|
2154
|
+
var RESERVED_MCP = /* @__PURE__ */ new Set([BOX_CLOOP_MCP, BOX_BROWSER_MCP]);
|
|
2489
2155
|
function mcpName(raw) {
|
|
2490
|
-
const name = raw.toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/-{2,}/g, "-").replace(/^-+/, "").slice(0,
|
|
2156
|
+
const name = raw.toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/-{2,}/g, "-").replace(/^-+/, "").slice(0, BOX_MCP_NAME_MAX).replace(/-+$/, "");
|
|
2491
2157
|
return name && !RESERVED_MCP.has(name) ? name : null;
|
|
2492
2158
|
}
|
|
2493
2159
|
function urlCarriesSecret(url) {
|
|
@@ -2575,7 +2241,7 @@ function remoteMcp(found) {
|
|
|
2575
2241
|
if (seen) seen.keyed ||= entry.keyed;
|
|
2576
2242
|
else byUrl.set(url, { name, url, keyed: entry.keyed });
|
|
2577
2243
|
}
|
|
2578
|
-
return [...byUrl.values()].slice(0,
|
|
2244
|
+
return [...byUrl.values()].slice(0, BOX_MCP_MAX_SERVERS);
|
|
2579
2245
|
}
|
|
2580
2246
|
function readText(path) {
|
|
2581
2247
|
try {
|
|
@@ -2584,10 +2250,10 @@ function readText(path) {
|
|
|
2584
2250
|
return "";
|
|
2585
2251
|
}
|
|
2586
2252
|
}
|
|
2587
|
-
function readRemoteMcp(home = homedir(),
|
|
2253
|
+
function readRemoteMcp(home = homedir(), codexHome = process.env.CODEX_HOME || join3(home, ".codex")) {
|
|
2588
2254
|
return remoteMcp([
|
|
2589
|
-
...claudeRemoteMcp(readText(
|
|
2590
|
-
...codexRemoteMcp(readText(
|
|
2255
|
+
...claudeRemoteMcp(readText(join3(home, ".claude.json"))),
|
|
2256
|
+
...codexRemoteMcp(readText(join3(codexHome, "config.toml")))
|
|
2591
2257
|
]);
|
|
2592
2258
|
}
|
|
2593
2259
|
async function sendSkills(tar, deps) {
|
|
@@ -2674,16 +2340,39 @@ function isSettled(t) {
|
|
|
2674
2340
|
if (t.settledOverride === "unsettled") return false;
|
|
2675
2341
|
return typeof t.settledAt === "string";
|
|
2676
2342
|
}
|
|
2343
|
+
var ACTIVE_RUN = /* @__PURE__ */ new Set(["preparing", "queued", "starting", "running", "waiting"]);
|
|
2344
|
+
function awaitsBackground(tasks) {
|
|
2345
|
+
if (!Array.isArray(tasks)) return false;
|
|
2346
|
+
return tasks.some(
|
|
2347
|
+
(task) => Boolean(
|
|
2348
|
+
task && (task.awaited === true || task.kind === "subagent" || task.kind === "background_task")
|
|
2349
|
+
)
|
|
2350
|
+
);
|
|
2351
|
+
}
|
|
2352
|
+
function hostState(t) {
|
|
2353
|
+
if (t.pendingRuntimeRequest) return "your_turn";
|
|
2354
|
+
const status = t.activityRunStatus ?? t.status;
|
|
2355
|
+
if (status === "failed") return void 0;
|
|
2356
|
+
if (status === "running" && t.blockedOnThreadWait === true) return "waiting";
|
|
2357
|
+
if (awaitsBackground(t.pendingBackgroundTasks)) return "waiting";
|
|
2358
|
+
if (typeof status === "string" && ACTIVE_RUN.has(status)) return "working";
|
|
2359
|
+
return void 0;
|
|
2360
|
+
}
|
|
2361
|
+
function carriesState(t) {
|
|
2362
|
+
return Array.isArray(t.pendingBackgroundTasks) && typeof t.blockedOnThreadWait === "boolean";
|
|
2363
|
+
}
|
|
2677
2364
|
function facts(t) {
|
|
2678
2365
|
const parent = t.lineage?.parentThreadId;
|
|
2679
2366
|
const title = typeof t.title === "string" ? t.title.trim() : "";
|
|
2367
|
+
const state = hostState(t);
|
|
2680
2368
|
return {
|
|
2681
2369
|
host: "t3",
|
|
2682
2370
|
threadId: t.id.slice(0, HOST_ID_MAX),
|
|
2683
2371
|
...t.createdBy === "agent" && typeof parent === "string" && parent ? { parentId: parent.slice(0, HOST_ID_MAX) } : {},
|
|
2684
2372
|
...title ? { title: title.slice(0, TITLE_MAX) } : {},
|
|
2685
2373
|
delegated: t.createdBy === "agent",
|
|
2686
|
-
settled: isSettled(t)
|
|
2374
|
+
settled: isSettled(t),
|
|
2375
|
+
...state ? { state } : {}
|
|
2687
2376
|
};
|
|
2688
2377
|
}
|
|
2689
2378
|
function harnessKey(t) {
|
|
@@ -2732,6 +2421,8 @@ var T3Threads = class {
|
|
|
2732
2421
|
);
|
|
2733
2422
|
const known = /* @__PURE__ */ new Map();
|
|
2734
2423
|
for (const t of threads) known.set(t.id, facts(t));
|
|
2424
|
+
if (threads.length > 0 && !threads.some(carriesState))
|
|
2425
|
+
this.log(`[runner-threads:t3] t3_state_fields_missing threads=${threads.length}`);
|
|
2735
2426
|
const knownThreads = new Set(this.threadOf.values());
|
|
2736
2427
|
for (const id of knownThreads) {
|
|
2737
2428
|
const prior = this.facts.get(id);
|
|
@@ -2739,7 +2430,7 @@ var T3Threads = class {
|
|
|
2739
2430
|
}
|
|
2740
2431
|
this.facts = known;
|
|
2741
2432
|
const ask = threads.filter(
|
|
2742
|
-
(t) => this.resolvedAt.get(t.id) !== harnessKey(t) && typeof t.updatedAt === "string" && now - Date.parse(t.updatedAt) <= LOOKBACK_MS
|
|
2433
|
+
(t) => this.resolvedAt.get(t.id) !== harnessKey(t) && typeof t.updatedAt === "string" && (now - Date.parse(t.updatedAt) <= LOOKBACK_MS || hostState(t) === "waiting")
|
|
2743
2434
|
).sort((a, b) => String(b.updatedAt).localeCompare(String(a.updatedAt))).slice(0, PROJECTIONS_PER_READ);
|
|
2744
2435
|
for (const thread of ask) {
|
|
2745
2436
|
const projection = await t3.rpc("orchestration.getThreadProjection", {
|
|
@@ -2754,25 +2445,17 @@ var T3Threads = class {
|
|
|
2754
2445
|
for (const id of ids) this.threadOf.set(id, thread.id);
|
|
2755
2446
|
}
|
|
2756
2447
|
} catch (err) {
|
|
2757
|
-
const
|
|
2758
|
-
this.log(`[runner-threads:t3] t3_read_failed reason=${
|
|
2448
|
+
const reason = err instanceof Error ? err.message : String(err);
|
|
2449
|
+
this.log(`[runner-threads:t3] t3_read_failed reason=${reason.slice(0, 120)}`);
|
|
2759
2450
|
}
|
|
2760
2451
|
}
|
|
2761
2452
|
};
|
|
2762
2453
|
|
|
2763
2454
|
// src/update.ts
|
|
2764
|
-
import { execFile as execFile2, spawn as
|
|
2765
|
-
import {
|
|
2766
|
-
closeSync,
|
|
2767
|
-
mkdirSync as mkdirSync4,
|
|
2768
|
-
openSync,
|
|
2769
|
-
readFileSync as readFileSync3,
|
|
2770
|
-
renameSync as renameSync3,
|
|
2771
|
-
rmSync as rmSync4,
|
|
2772
|
-
writeFileSync as writeFileSync2
|
|
2773
|
-
} from "fs";
|
|
2455
|
+
import { execFile as execFile2, spawn as spawn3 } from "child_process";
|
|
2456
|
+
import { closeSync, mkdirSync as mkdirSync4, openSync, readFileSync as readFileSync3, renameSync as renameSync3, writeFileSync as writeFileSync2 } from "fs";
|
|
2774
2457
|
import { homedir as homedir2 } from "os";
|
|
2775
|
-
import { dirname as dirname2, join as
|
|
2458
|
+
import { dirname as dirname2, join as join4 } from "path";
|
|
2776
2459
|
var REGISTRY_LATEST = "https://registry.npmjs.org/@cloop/runner/latest";
|
|
2777
2460
|
var FIRST_CHECK_MS = 10 * 6e4;
|
|
2778
2461
|
var CHECK_EVERY_MS = 6 * 36e5;
|
|
@@ -2814,10 +2497,10 @@ function updateDir(env) {
|
|
|
2814
2497
|
return runnerPath(env, process.env.CLOOP_UPDATE_DIR, (dir) => dir);
|
|
2815
2498
|
}
|
|
2816
2499
|
function updateLogPath() {
|
|
2817
|
-
return
|
|
2500
|
+
return join4(updateDir(), "update.log");
|
|
2818
2501
|
}
|
|
2819
2502
|
function statePath(env) {
|
|
2820
|
-
return
|
|
2503
|
+
return join4(updateDir(env), "update.json");
|
|
2821
2504
|
}
|
|
2822
2505
|
function readFailed() {
|
|
2823
2506
|
try {
|
|
@@ -2865,7 +2548,7 @@ var adoptWords = (npx, to, kind) => [
|
|
|
2865
2548
|
kind
|
|
2866
2549
|
];
|
|
2867
2550
|
function adoptScriptPath() {
|
|
2868
|
-
return
|
|
2551
|
+
return join4(updateDir(), "adopt.cmd");
|
|
2869
2552
|
}
|
|
2870
2553
|
function adoptScript(npx, to, kind, log3) {
|
|
2871
2554
|
return [
|
|
@@ -2935,7 +2618,10 @@ function selfUpdate(kind, platform = process.platform, onFailed = () => {
|
|
|
2935
2618
|
}
|
|
2936
2619
|
state.latest = read;
|
|
2937
2620
|
state.error = null;
|
|
2938
|
-
if (read === latest || !olderThan(VERSION, read))
|
|
2621
|
+
if (read === latest || !olderThan(VERSION, read)) {
|
|
2622
|
+
latest = read;
|
|
2623
|
+
return true;
|
|
2624
|
+
}
|
|
2939
2625
|
if (read === readFailed()) {
|
|
2940
2626
|
latest = read;
|
|
2941
2627
|
return true;
|
|
@@ -2983,7 +2669,7 @@ function selfUpdate(kind, platform = process.platform, onFailed = () => {
|
|
|
2983
2669
|
}
|
|
2984
2670
|
handing = true;
|
|
2985
2671
|
log(`handing over ${VERSION} -> ${to}; its log is ${updateLogPath()}`);
|
|
2986
|
-
const child =
|
|
2672
|
+
const child = spawn3(
|
|
2987
2673
|
command,
|
|
2988
2674
|
args,
|
|
2989
2675
|
platform === "win32" ? { stdio: "ignore", windowsHide: true, env: windowsPowerShellEnv() } : { detached: true, stdio: ["ignore", fd, fd] }
|
|
@@ -3083,12 +2769,7 @@ async function adopt(from, kind, { services: given, script = process.argv[1] ??
|
|
|
3083
2769
|
}
|
|
3084
2770
|
log(`adopt ${from} -> ${VERSION} failed: ${why}; putting ${from} back`);
|
|
3085
2771
|
try {
|
|
3086
|
-
if (legacy) {
|
|
3087
|
-
const added = installedService({ ...where, environment });
|
|
3088
|
-
if (!await stopService(added, run3)) throw new Error(`${added.path} did not stop`);
|
|
3089
|
-
rmSync4(added.path, { force: true });
|
|
3090
|
-
moveRunnerFiles(runnerDir(environment), runnerDir(was));
|
|
3091
|
-
}
|
|
2772
|
+
if (legacy) await moveLegacyStagingRunnerBack({ ...where, environment }, run3);
|
|
3092
2773
|
recordFailed(VERSION, was);
|
|
3093
2774
|
writeFileSync2(back.path, old);
|
|
3094
2775
|
await runSteps(back.start, run3);
|
|
@@ -3151,33 +2832,20 @@ function boxPresence(beat) {
|
|
|
3151
2832
|
};
|
|
3152
2833
|
}
|
|
3153
2834
|
async function machineHarnesses(cfg) {
|
|
3154
|
-
const
|
|
3155
|
-
|
|
3156
|
-
|
|
3157
|
-
|
|
3158
|
-
return ownHarnessFirst([claude, codex], cfg.driver);
|
|
2835
|
+
const reports = await Promise.all(
|
|
2836
|
+
LOCAL_AGENTS.map((agent) => agent.probe(configuredBin(cfg, agent)))
|
|
2837
|
+
);
|
|
2838
|
+
return ownHarnessFirst(reports, cfg.driver);
|
|
3159
2839
|
}
|
|
3160
2840
|
async function localDriver(cfg, name) {
|
|
3161
|
-
const
|
|
3162
|
-
const claude = async (at) => claudeDialect(
|
|
3163
|
-
at,
|
|
3164
|
-
cfg.fallbackModels ?? DEFAULT_FALLBACK_MODEL,
|
|
3165
|
-
cfg.askEverything,
|
|
3166
|
-
await probeClaudePermissions(at)
|
|
3167
|
-
);
|
|
2841
|
+
const agent = AGENTS[name];
|
|
3168
2842
|
const driver = new LocalDriver({
|
|
3169
|
-
dialect:
|
|
3170
|
-
fallbackHarness:
|
|
2843
|
+
dialect: await agent.dialect(cfg, configuredBin(cfg, agent)),
|
|
2844
|
+
fallbackHarness: await AGENTS[agent.handsOverTo].dialect(cfg),
|
|
3171
2845
|
repos: cfg.repos,
|
|
3172
2846
|
label: cfg.label,
|
|
3173
2847
|
harnesses: () => machineHarnesses(cfg),
|
|
3174
|
-
usage: new LocalUsage({
|
|
3175
|
-
probes: {
|
|
3176
|
-
"claude-code": () => probeClaudeQuota(cfg.driver === "claude-code" ? cfg.bin : void 0),
|
|
3177
|
-
codex: () => probeCodexQuota(cfg.driver === "codex" ? cfg.bin : void 0)
|
|
3178
|
-
},
|
|
3179
|
-
log: log2
|
|
3180
|
-
}),
|
|
2848
|
+
usage: new LocalUsage({ probes: quotaProbes(cfg), log: log2 }),
|
|
3181
2849
|
log: log2
|
|
3182
2850
|
});
|
|
3183
2851
|
driver.warmHarnesses();
|
|
@@ -3195,9 +2863,7 @@ async function run2() {
|
|
|
3195
2863
|
if (cfg && isHosted(cfg)) pinRunnerEnvironment(cfg.origin);
|
|
3196
2864
|
let token = cfg?.deviceToken ?? getToken();
|
|
3197
2865
|
if (!token || !cfg) {
|
|
3198
|
-
out(
|
|
3199
|
-
`${red("\u2717")} ${legacyStagingRunner() ? "This staging machine is still in ~/.cloop from before 0.3.9. Run `cloop connect --staging` to move it to ~/.cloop/staging." : "Not connected. Run `cloop connect` first."}`
|
|
3200
|
-
);
|
|
2866
|
+
out(`${red("\u2717")} ${legacyNotConnectedLine() ?? "Not connected. Run `cloop connect` first."}`);
|
|
3201
2867
|
process.exit(1);
|
|
3202
2868
|
}
|
|
3203
2869
|
if (!cfg.deviceToken) {
|
|
@@ -3225,29 +2891,32 @@ async function run2() {
|
|
|
3225
2891
|
out(`${red("\u2717")} Another \`cloop box run\` is running (pid ${lock.heldBy}). Stop it first.`);
|
|
3226
2892
|
process.exit(1);
|
|
3227
2893
|
}
|
|
2894
|
+
const hostedModels = hosted ? localAgent(hosted.harness)?.models : void 0;
|
|
3228
2895
|
const driver = hosted ? new CloudroomDriver({
|
|
3229
2896
|
core: new CoreClient(hosted.coreUrl, hosted.coreToken),
|
|
3230
2897
|
harness: hosted.harness,
|
|
3231
2898
|
label: hosted.label,
|
|
3232
2899
|
// The box's harnesses sign in as the agent this daemon runs as, so its probes read the owner's account.
|
|
3233
|
-
usage: new LocalUsage({
|
|
3234
|
-
probes: { "claude-code": () => probeClaudeQuota(), codex: () => probeCodexQuota() },
|
|
3235
|
-
log: log2
|
|
3236
|
-
}),
|
|
2900
|
+
usage: new LocalUsage({ probes: quotaProbes(), log: log2 }),
|
|
3237
2901
|
// The same account's catalog, for a run the account refuses its model.
|
|
3238
|
-
...
|
|
2902
|
+
...hostedModels ? { models: () => hostedModels() } : {},
|
|
3239
2903
|
// Beside the daemon's threads: the model a Task named, a run's move off a refused one, refusals and the last list.
|
|
3240
2904
|
runModels: fileRunModels(hostedRunModelsPath(hosted.harness)),
|
|
3241
2905
|
log: log2,
|
|
3242
2906
|
// A held run's lease keeps the box awake until the hold is due to settle.
|
|
3243
|
-
awakeDir:
|
|
2907
|
+
awakeDir: join5(homedir3(), ".cloop", "awake"),
|
|
3244
2908
|
// Called only once calls arrive, so the socket below exists by then.
|
|
3245
2909
|
followUpLost: ({ work, n, error }) => socket.send(runnerLog("followup_lost", { work, n, tool: "thread.send", error })),
|
|
3246
2910
|
// Watches start after the socket too: a held run's steps, for the hold monitor.
|
|
3247
2911
|
holdLog: (code, work, ms) => socket.send(runnerLog(code, { work, ms })),
|
|
3248
2912
|
// A Claude Code run that carries on past the OAuth refresh lock, or fails on it after its last try.
|
|
3249
|
-
authLockLog: (code, work, n, ms) => socket.send(runnerLog(code, { work, n, ms }))
|
|
3250
|
-
|
|
2913
|
+
authLockLog: (code, work, n, ms) => socket.send(runnerLog(code, { work, n, ms })),
|
|
2914
|
+
// A repository run whose new worktree was not clean, by cause: `n` files a sparse checkout hid, or paths dropped.
|
|
2915
|
+
dirtyStartLog: (work, { sparse, dirty }) => {
|
|
2916
|
+
if (sparse) socket.send(runnerLog("worktree_sparse", { work, n: sparse }));
|
|
2917
|
+
if (dirty) socket.send(runnerLog("worktree_dirty", { work, n: dirty }));
|
|
2918
|
+
}
|
|
2919
|
+
}) : local && isLocalDriver(name) ? await localDriver(local, name) : new T3Driver({
|
|
3251
2920
|
client: () => t3.client,
|
|
3252
2921
|
t3Bin: isT3(cfg) ? cfg.t3Bin : null,
|
|
3253
2922
|
scope: () => cfg && isT3(cfg) ? cfg.scope : void 0,
|
|
@@ -3262,7 +2931,7 @@ async function run2() {
|
|
|
3262
2931
|
deviceToken: () => token,
|
|
3263
2932
|
log: log2,
|
|
3264
2933
|
dir: runnerDir(),
|
|
3265
|
-
awakeDir: hosted ?
|
|
2934
|
+
awakeDir: hosted ? join5(homedir3(), ".cloop", "awake") : null
|
|
3266
2935
|
});
|
|
3267
2936
|
const previews = outputs.connector;
|
|
3268
2937
|
void previews.resume();
|
|
@@ -3422,7 +3091,7 @@ async function run2() {
|
|
|
3422
3091
|
const readDriver = lastKnown(
|
|
3423
3092
|
async () => {
|
|
3424
3093
|
const shown = showsOtherThreads(readRunnerConfig());
|
|
3425
|
-
const own = shown && driver.name ===
|
|
3094
|
+
const own = shown && localAgent(driver.name)?.ownSessions === true;
|
|
3426
3095
|
const listed = await driver.listThreads({
|
|
3427
3096
|
scope: own ? "all" : "unsettled",
|
|
3428
3097
|
limit: own ? 200 : 1
|
|
@@ -3540,18 +3209,21 @@ async function run2() {
|
|
|
3540
3209
|
});
|
|
3541
3210
|
}
|
|
3542
3211
|
function hostedRunModelsPath(harness) {
|
|
3543
|
-
return
|
|
3212
|
+
return join5(dirname3(hostedThreadsFilePath(harness)), "run-models.json");
|
|
3544
3213
|
}
|
|
3545
3214
|
var MODEL_WAIT_MS = 8e3;
|
|
3546
3215
|
async function modelCommand(argv, deps = {}) {
|
|
3547
3216
|
const harness = flag(argv, "--harness");
|
|
3548
3217
|
const err = deps.err ?? ((line) => console.error(line));
|
|
3549
|
-
|
|
3550
|
-
|
|
3218
|
+
const models = localAgent(harness)?.models;
|
|
3219
|
+
if (!harness || !models) {
|
|
3220
|
+
err(
|
|
3221
|
+
`Usage: cloop box model --harness ${LOCAL_AGENTS.filter((agent) => agent.models).map((agent) => agent.id).join("|")}`
|
|
3222
|
+
);
|
|
3551
3223
|
return 1;
|
|
3552
3224
|
}
|
|
3553
3225
|
const pick = await boxModel({
|
|
3554
|
-
models: deps.models ?? (() =>
|
|
3226
|
+
models: deps.models ?? (() => models()),
|
|
3555
3227
|
store: fileRunModels(deps.file ?? hostedRunModelsPath(harness)),
|
|
3556
3228
|
now: deps.now ?? Date.now(),
|
|
3557
3229
|
waitMs: MODEL_WAIT_MS
|