@cloop/runner 0.3.67 → 0.3.69
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-NMG35YB2.js → box-UOJ6ET2B.js} +203 -522
- package/dist/{chunk-7LPSTDZE.js → chunk-4JTIWZHB.js} +1 -1
- package/dist/{chunk-IK7YYRMU.js → chunk-57E5WOOP.js} +574 -1673
- package/dist/{chunk-5RB7XKPB.js → chunk-AZQGERT7.js} +13 -1
- package/dist/{chunk-TCNIRZLU.js → chunk-CLOYOD2X.js} +10 -6
- package/dist/{chunk-6LYMSWSB.js → chunk-DN6TQALA.js} +265 -1961
- package/dist/{chunk-KYDTE53W.js → chunk-DTUNRKBC.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-7ZL3Z3IO.js → chunk-JI5FWLDU.js} +6 -6
- package/dist/chunk-JJWSPBM4.js +40 -0
- package/dist/{chunk-OIHUQBA4.js → chunk-KIYCULVE.js} +4 -2
- package/dist/{chunk-QKRGJKJN.js → chunk-SJAGZNFF.js} +3 -83
- package/dist/chunk-TPKYD3JF.js +43 -0
- package/dist/chunk-WCKW2Z2G.js +459 -0
- package/dist/chunk-ZHQSGJCE.js +85 -0
- package/dist/{connect-3GG5D7XC.js → connect-HVOAYXWM.js} +12 -48
- package/dist/disconnect-DQ6WSDR7.js +163 -0
- package/dist/existing-runner-BSSRQFFP.js +15 -0
- package/dist/index.js +14 -14
- package/dist/{login-COK223KI.js → login-4HWP4PF4.js} +3 -2
- package/dist/{mcp-server-5525QT5K.js → mcp-server-DTJVCFRG.js} +10 -10
- package/dist/{runner-NSFLXWNP.js → runner-4XWS2RJL.js} +4 -3
- package/dist/{runs-DOFU45TW.js → runs-TWUGWGNU.js} +4 -2
- package/dist/{statusline-QHEED6IO.js → statusline-C2FH3YQ4.js} +1 -1
- package/dist/{takeover-U2EHJ5GW.js → takeover-5QSP6YAG.js} +6 -4
- package/dist/{use-J6CNF6JU.js → use-U3E55XBK.js} +20 -13
- package/package.json +1 -1
- package/dist/disconnect-VK3CZIDQ.js +0 -30
- package/dist/existing-runner-NNXJGK2R.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-57E5WOOP.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-TPKYD3JF.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-IK7YYRMU.js";
|
|
44
|
-
import {
|
|
45
|
-
MeshSocket,
|
|
46
|
-
WAKE_TICK_MS,
|
|
47
|
-
buildDiag,
|
|
48
|
-
defaultSocketFactory,
|
|
49
|
-
runnerLog,
|
|
50
|
-
wakeWatch
|
|
51
|
-
} from "./chunk-5RB7XKPB.js";
|
|
63
|
+
unitFor
|
|
64
|
+
} from "./chunk-WCKW2Z2G.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-KIYCULVE.js";
|
|
119
|
+
import "./chunk-SJAGZNFF.js";
|
|
120
|
+
import "./chunk-ZHQSGJCE.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-DTUNRKBC.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 {
|
|
@@ -1935,369 +1934,6 @@ ${asked}` : AUTH_LOCK_CONTINUE;
|
|
|
1935
1934
|
}
|
|
1936
1935
|
};
|
|
1937
1936
|
|
|
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
1937
|
// src/last-known.ts
|
|
2302
1938
|
function lastKnown(read, initial, { ms, what, onFail }) {
|
|
2303
1939
|
let last = initial;
|
|
@@ -2371,7 +2007,7 @@ var ResultOutbox = class {
|
|
|
2371
2007
|
};
|
|
2372
2008
|
|
|
2373
2009
|
// src/setup-share.ts
|
|
2374
|
-
import { spawn as
|
|
2010
|
+
import { spawn as spawn2 } from "child_process";
|
|
2375
2011
|
import {
|
|
2376
2012
|
copyFileSync,
|
|
2377
2013
|
existsSync as existsSync2,
|
|
@@ -2383,12 +2019,21 @@ import {
|
|
|
2383
2019
|
rmSync as rmSync3,
|
|
2384
2020
|
symlinkSync
|
|
2385
2021
|
} from "fs";
|
|
2386
|
-
import { homedir, tmpdir
|
|
2387
|
-
import { join as
|
|
2022
|
+
import { homedir, tmpdir } from "os";
|
|
2023
|
+
import { join as join3 } from "path";
|
|
2024
|
+
|
|
2025
|
+
// ../clo0p-app/contracts/box-mcp.ts
|
|
2026
|
+
var BOX_MCP_NAME_MAX = 40;
|
|
2027
|
+
var BOX_MCP_NAME = new RegExp(`^[a-z0-9][a-z0-9-]{0,${BOX_MCP_NAME_MAX - 1}}$`);
|
|
2028
|
+
var BOX_MCP_MAX_SERVERS = 20;
|
|
2029
|
+
var BOX_BROWSER_MCP = "playwright";
|
|
2030
|
+
var BOX_CLOOP_MCP = "cloop";
|
|
2031
|
+
var BOX_SKILLS_CAP_BYTES = 25 * 1024 * 1024;
|
|
2032
|
+
|
|
2033
|
+
// src/setup-share.ts
|
|
2388
2034
|
var SKILL_DIRS = [".agents/skills", ".claude/skills", ".codex/skills"];
|
|
2389
2035
|
var GUIDE_FILES = [".agents/AGENTS.md", ".claude/CLAUDE.md", ".codex/AGENTS.md"];
|
|
2390
|
-
|
|
2391
|
-
function realpath2(path) {
|
|
2036
|
+
function realpath(path) {
|
|
2392
2037
|
try {
|
|
2393
2038
|
return realpathSync(path);
|
|
2394
2039
|
} catch {
|
|
@@ -2402,32 +2047,32 @@ function findSetup(home) {
|
|
|
2402
2047
|
for (const dir of SKILL_DIRS) {
|
|
2403
2048
|
let entries;
|
|
2404
2049
|
try {
|
|
2405
|
-
entries = readdirSync(
|
|
2050
|
+
entries = readdirSync(join3(home, dir)).sort();
|
|
2406
2051
|
} catch {
|
|
2407
2052
|
continue;
|
|
2408
2053
|
}
|
|
2409
2054
|
for (const name of entries) {
|
|
2410
|
-
const path =
|
|
2411
|
-
if (names.has(name) || !existsSync2(
|
|
2412
|
-
const real =
|
|
2055
|
+
const path = join3(home, dir, name);
|
|
2056
|
+
if (names.has(name) || !existsSync2(join3(path, "SKILL.md"))) continue;
|
|
2057
|
+
const real = realpath(path);
|
|
2413
2058
|
if (!real || reals.has(real)) continue;
|
|
2414
2059
|
names.add(name);
|
|
2415
2060
|
reals.add(real);
|
|
2416
2061
|
skills.push({ name, path: real });
|
|
2417
2062
|
}
|
|
2418
2063
|
}
|
|
2419
|
-
const guide = GUIDE_FILES.map((file) =>
|
|
2064
|
+
const guide = GUIDE_FILES.map((file) => realpath(join3(home, file))).find((p) => p !== null) ?? null;
|
|
2420
2065
|
return { skills, guide };
|
|
2421
2066
|
}
|
|
2422
2067
|
function stage(setup) {
|
|
2423
|
-
const dir = mkdtempSync(
|
|
2424
|
-
mkdirSync3(
|
|
2068
|
+
const dir = mkdtempSync(join3(tmpdir(), "cloop-setup-"));
|
|
2069
|
+
mkdirSync3(join3(dir, ".agents", "skills"), { recursive: true });
|
|
2425
2070
|
for (const skill of setup.skills)
|
|
2426
|
-
symlinkSync(skill.path,
|
|
2427
|
-
if (setup.guide) copyFileSync(setup.guide,
|
|
2071
|
+
symlinkSync(skill.path, join3(dir, ".agents", "skills", skill.name), "junction");
|
|
2072
|
+
if (setup.guide) copyFileSync(setup.guide, join3(dir, ".agents", "owner-guide.md"));
|
|
2428
2073
|
return dir;
|
|
2429
2074
|
}
|
|
2430
|
-
async function packSkills(home = homedir(), capBytes =
|
|
2075
|
+
async function packSkills(home = homedir(), capBytes = BOX_SKILLS_CAP_BYTES, tarBin = "tar") {
|
|
2431
2076
|
const setup = findSetup(home);
|
|
2432
2077
|
if (setup.skills.length === 0 && !setup.guide) return { ok: false, reason: "no_skills" };
|
|
2433
2078
|
let dir;
|
|
@@ -2437,7 +2082,7 @@ async function packSkills(home = homedir(), capBytes = SKILLS_CAP_BYTES, tarBin
|
|
|
2437
2082
|
return { ok: false, reason: "tar_failed" };
|
|
2438
2083
|
}
|
|
2439
2084
|
const packed = await new Promise((resolve) => {
|
|
2440
|
-
const child =
|
|
2085
|
+
const child = spawn2(
|
|
2441
2086
|
tarBin,
|
|
2442
2087
|
[
|
|
2443
2088
|
"-c",
|
|
@@ -2484,10 +2129,9 @@ async function packSkills(home = homedir(), capBytes = SKILLS_CAP_BYTES, tarBin
|
|
|
2484
2129
|
rmSync3(dir, { recursive: true, force: true });
|
|
2485
2130
|
return packed;
|
|
2486
2131
|
}
|
|
2487
|
-
var RESERVED_MCP = /* @__PURE__ */ new Set([
|
|
2488
|
-
var MAX_REMOTE_MCP = 20;
|
|
2132
|
+
var RESERVED_MCP = /* @__PURE__ */ new Set([BOX_CLOOP_MCP, BOX_BROWSER_MCP]);
|
|
2489
2133
|
function mcpName(raw) {
|
|
2490
|
-
const name = raw.toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/-{2,}/g, "-").replace(/^-+/, "").slice(0,
|
|
2134
|
+
const name = raw.toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/-{2,}/g, "-").replace(/^-+/, "").slice(0, BOX_MCP_NAME_MAX).replace(/-+$/, "");
|
|
2491
2135
|
return name && !RESERVED_MCP.has(name) ? name : null;
|
|
2492
2136
|
}
|
|
2493
2137
|
function urlCarriesSecret(url) {
|
|
@@ -2575,7 +2219,7 @@ function remoteMcp(found) {
|
|
|
2575
2219
|
if (seen) seen.keyed ||= entry.keyed;
|
|
2576
2220
|
else byUrl.set(url, { name, url, keyed: entry.keyed });
|
|
2577
2221
|
}
|
|
2578
|
-
return [...byUrl.values()].slice(0,
|
|
2222
|
+
return [...byUrl.values()].slice(0, BOX_MCP_MAX_SERVERS);
|
|
2579
2223
|
}
|
|
2580
2224
|
function readText(path) {
|
|
2581
2225
|
try {
|
|
@@ -2584,10 +2228,10 @@ function readText(path) {
|
|
|
2584
2228
|
return "";
|
|
2585
2229
|
}
|
|
2586
2230
|
}
|
|
2587
|
-
function readRemoteMcp(home = homedir(),
|
|
2231
|
+
function readRemoteMcp(home = homedir(), codexHome = process.env.CODEX_HOME || join3(home, ".codex")) {
|
|
2588
2232
|
return remoteMcp([
|
|
2589
|
-
...claudeRemoteMcp(readText(
|
|
2590
|
-
...codexRemoteMcp(readText(
|
|
2233
|
+
...claudeRemoteMcp(readText(join3(home, ".claude.json"))),
|
|
2234
|
+
...codexRemoteMcp(readText(join3(codexHome, "config.toml")))
|
|
2591
2235
|
]);
|
|
2592
2236
|
}
|
|
2593
2237
|
async function sendSkills(tar, deps) {
|
|
@@ -2674,16 +2318,39 @@ function isSettled(t) {
|
|
|
2674
2318
|
if (t.settledOverride === "unsettled") return false;
|
|
2675
2319
|
return typeof t.settledAt === "string";
|
|
2676
2320
|
}
|
|
2321
|
+
var ACTIVE_RUN = /* @__PURE__ */ new Set(["preparing", "queued", "starting", "running", "waiting"]);
|
|
2322
|
+
function awaitsBackground(tasks) {
|
|
2323
|
+
if (!Array.isArray(tasks)) return false;
|
|
2324
|
+
return tasks.some(
|
|
2325
|
+
(task) => Boolean(
|
|
2326
|
+
task && (task.awaited === true || task.kind === "subagent" || task.kind === "background_task")
|
|
2327
|
+
)
|
|
2328
|
+
);
|
|
2329
|
+
}
|
|
2330
|
+
function hostState(t) {
|
|
2331
|
+
if (t.pendingRuntimeRequest) return "your_turn";
|
|
2332
|
+
const status = t.activityRunStatus ?? t.status;
|
|
2333
|
+
if (status === "failed") return void 0;
|
|
2334
|
+
if (status === "running" && t.blockedOnThreadWait === true) return "waiting";
|
|
2335
|
+
if (awaitsBackground(t.pendingBackgroundTasks)) return "waiting";
|
|
2336
|
+
if (typeof status === "string" && ACTIVE_RUN.has(status)) return "working";
|
|
2337
|
+
return void 0;
|
|
2338
|
+
}
|
|
2339
|
+
function carriesState(t) {
|
|
2340
|
+
return Array.isArray(t.pendingBackgroundTasks) && typeof t.blockedOnThreadWait === "boolean";
|
|
2341
|
+
}
|
|
2677
2342
|
function facts(t) {
|
|
2678
2343
|
const parent = t.lineage?.parentThreadId;
|
|
2679
2344
|
const title = typeof t.title === "string" ? t.title.trim() : "";
|
|
2345
|
+
const state = hostState(t);
|
|
2680
2346
|
return {
|
|
2681
2347
|
host: "t3",
|
|
2682
2348
|
threadId: t.id.slice(0, HOST_ID_MAX),
|
|
2683
2349
|
...t.createdBy === "agent" && typeof parent === "string" && parent ? { parentId: parent.slice(0, HOST_ID_MAX) } : {},
|
|
2684
2350
|
...title ? { title: title.slice(0, TITLE_MAX) } : {},
|
|
2685
2351
|
delegated: t.createdBy === "agent",
|
|
2686
|
-
settled: isSettled(t)
|
|
2352
|
+
settled: isSettled(t),
|
|
2353
|
+
...state ? { state } : {}
|
|
2687
2354
|
};
|
|
2688
2355
|
}
|
|
2689
2356
|
function harnessKey(t) {
|
|
@@ -2732,6 +2399,8 @@ var T3Threads = class {
|
|
|
2732
2399
|
);
|
|
2733
2400
|
const known = /* @__PURE__ */ new Map();
|
|
2734
2401
|
for (const t of threads) known.set(t.id, facts(t));
|
|
2402
|
+
if (threads.length > 0 && !threads.some(carriesState))
|
|
2403
|
+
this.log(`[runner-threads:t3] t3_state_fields_missing threads=${threads.length}`);
|
|
2735
2404
|
const knownThreads = new Set(this.threadOf.values());
|
|
2736
2405
|
for (const id of knownThreads) {
|
|
2737
2406
|
const prior = this.facts.get(id);
|
|
@@ -2754,28 +2423,21 @@ var T3Threads = class {
|
|
|
2754
2423
|
for (const id of ids) this.threadOf.set(id, thread.id);
|
|
2755
2424
|
}
|
|
2756
2425
|
} catch (err) {
|
|
2757
|
-
const
|
|
2758
|
-
this.log(`[runner-threads:t3] t3_read_failed reason=${
|
|
2426
|
+
const reason = err instanceof Error ? err.message : String(err);
|
|
2427
|
+
this.log(`[runner-threads:t3] t3_read_failed reason=${reason.slice(0, 120)}`);
|
|
2759
2428
|
}
|
|
2760
2429
|
}
|
|
2761
2430
|
};
|
|
2762
2431
|
|
|
2763
2432
|
// 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";
|
|
2433
|
+
import { execFile as execFile2, spawn as spawn3 } from "child_process";
|
|
2434
|
+
import { closeSync, mkdirSync as mkdirSync4, openSync, readFileSync as readFileSync3, renameSync as renameSync3, writeFileSync as writeFileSync2 } from "fs";
|
|
2774
2435
|
import { homedir as homedir2 } from "os";
|
|
2775
|
-
import { dirname as dirname2, join as
|
|
2436
|
+
import { dirname as dirname2, join as join4 } from "path";
|
|
2776
2437
|
var REGISTRY_LATEST = "https://registry.npmjs.org/@cloop/runner/latest";
|
|
2777
2438
|
var FIRST_CHECK_MS = 10 * 6e4;
|
|
2778
2439
|
var CHECK_EVERY_MS = 6 * 36e5;
|
|
2440
|
+
var RETRY_MS = 15 * 6e4;
|
|
2779
2441
|
var ADOPT_WAIT_MS = 3e4;
|
|
2780
2442
|
var FETCH_WAIT_MS = 3 * 6e4;
|
|
2781
2443
|
var RELEASE = /^\d+\.\d+\.\d+(-[0-9A-Za-z.-]+)?$/;
|
|
@@ -2813,10 +2475,10 @@ function updateDir(env) {
|
|
|
2813
2475
|
return runnerPath(env, process.env.CLOOP_UPDATE_DIR, (dir) => dir);
|
|
2814
2476
|
}
|
|
2815
2477
|
function updateLogPath() {
|
|
2816
|
-
return
|
|
2478
|
+
return join4(updateDir(), "update.log");
|
|
2817
2479
|
}
|
|
2818
2480
|
function statePath(env) {
|
|
2819
|
-
return
|
|
2481
|
+
return join4(updateDir(env), "update.json");
|
|
2820
2482
|
}
|
|
2821
2483
|
function readFailed() {
|
|
2822
2484
|
try {
|
|
@@ -2864,7 +2526,7 @@ var adoptWords = (npx, to, kind) => [
|
|
|
2864
2526
|
kind
|
|
2865
2527
|
];
|
|
2866
2528
|
function adoptScriptPath() {
|
|
2867
|
-
return
|
|
2529
|
+
return join4(updateDir(), "adopt.cmd");
|
|
2868
2530
|
}
|
|
2869
2531
|
function adoptScript(npx, to, kind, log3) {
|
|
2870
2532
|
return [
|
|
@@ -2913,7 +2575,12 @@ function selfUpdate(kind, platform = process.platform, onFailed = () => {
|
|
|
2913
2575
|
let latest = null;
|
|
2914
2576
|
let handing = false;
|
|
2915
2577
|
let lastWhy = null;
|
|
2916
|
-
const state = {
|
|
2578
|
+
const state = {
|
|
2579
|
+
checked_at: null,
|
|
2580
|
+
latest: null,
|
|
2581
|
+
error: null,
|
|
2582
|
+
stay: null
|
|
2583
|
+
};
|
|
2917
2584
|
const fail = (error, version) => {
|
|
2918
2585
|
state.error = error;
|
|
2919
2586
|
onFailed(error, version);
|
|
@@ -2923,25 +2590,48 @@ function selfUpdate(kind, platform = process.platform, onFailed = () => {
|
|
|
2923
2590
|
const check = async () => {
|
|
2924
2591
|
state.checked_at = (/* @__PURE__ */ new Date()).toISOString();
|
|
2925
2592
|
const read = await readLatest();
|
|
2926
|
-
if (!read)
|
|
2593
|
+
if (!read) {
|
|
2594
|
+
fail("registry_unreachable");
|
|
2595
|
+
return false;
|
|
2596
|
+
}
|
|
2927
2597
|
state.latest = read;
|
|
2928
2598
|
state.error = null;
|
|
2929
|
-
if (read === latest || !olderThan(VERSION, read)
|
|
2599
|
+
if (read === latest || !olderThan(VERSION, read)) {
|
|
2600
|
+
latest = read;
|
|
2601
|
+
return true;
|
|
2602
|
+
}
|
|
2603
|
+
if (read === readFailed()) {
|
|
2604
|
+
latest = read;
|
|
2605
|
+
return true;
|
|
2606
|
+
}
|
|
2930
2607
|
const npx = findNpx();
|
|
2931
|
-
if (!npx)
|
|
2932
|
-
|
|
2933
|
-
|
|
2608
|
+
if (!npx) {
|
|
2609
|
+
fail("npx_missing", read);
|
|
2610
|
+
return true;
|
|
2611
|
+
}
|
|
2612
|
+
if (await fetchVersion(npx, read)) {
|
|
2613
|
+
latest = read;
|
|
2614
|
+
return true;
|
|
2615
|
+
}
|
|
2616
|
+
fail("fetch_failed", read);
|
|
2617
|
+
return false;
|
|
2934
2618
|
};
|
|
2935
|
-
setTimeout(() => {
|
|
2936
|
-
|
|
2937
|
-
|
|
2938
|
-
|
|
2619
|
+
const schedule = (ms) => setTimeout(async () => {
|
|
2620
|
+
let settled = false;
|
|
2621
|
+
try {
|
|
2622
|
+
settled = await check();
|
|
2623
|
+
} finally {
|
|
2624
|
+
schedule(settled ? CHECK_EVERY_MS : RETRY_MS);
|
|
2625
|
+
}
|
|
2626
|
+
}, ms).unref();
|
|
2627
|
+
schedule(FIRST_CHECK_MS);
|
|
2939
2628
|
const handOver = (to) => {
|
|
2940
2629
|
const npx = findNpx();
|
|
2941
2630
|
if (!npx) {
|
|
2942
2631
|
log(`npx is not on PATH, so ${to} cannot start`);
|
|
2943
2632
|
recordFailed(to);
|
|
2944
2633
|
fail("npx_missing", to);
|
|
2634
|
+
lastWhy = `failed_before:${to}`;
|
|
2945
2635
|
return;
|
|
2946
2636
|
}
|
|
2947
2637
|
const [command, ...args] = handOverCommand(platform, npx, to, kind);
|
|
@@ -2957,7 +2647,7 @@ function selfUpdate(kind, platform = process.platform, onFailed = () => {
|
|
|
2957
2647
|
}
|
|
2958
2648
|
handing = true;
|
|
2959
2649
|
log(`handing over ${VERSION} -> ${to}; its log is ${updateLogPath()}`);
|
|
2960
|
-
const child =
|
|
2650
|
+
const child = spawn3(
|
|
2961
2651
|
command,
|
|
2962
2652
|
args,
|
|
2963
2653
|
platform === "win32" ? { stdio: "ignore", windowsHide: true, env: windowsPowerShellEnv() } : { detached: true, stdio: ["ignore", fd, fd] }
|
|
@@ -2969,6 +2659,7 @@ function selfUpdate(kind, platform = process.platform, onFailed = () => {
|
|
|
2969
2659
|
log(`${to} did not take over (${why}); staying on ${VERSION}`);
|
|
2970
2660
|
recordFailed(to);
|
|
2971
2661
|
fail("handover_failed", to);
|
|
2662
|
+
lastWhy = `failed_before:${to}`;
|
|
2972
2663
|
};
|
|
2973
2664
|
child.on("error", (err) => failed(err.message));
|
|
2974
2665
|
child.on("exit", (code, signal) => {
|
|
@@ -2976,7 +2667,7 @@ function selfUpdate(kind, platform = process.platform, onFailed = () => {
|
|
|
2976
2667
|
});
|
|
2977
2668
|
};
|
|
2978
2669
|
return {
|
|
2979
|
-
state: () => ({ ...state }),
|
|
2670
|
+
state: () => ({ ...state, failed: readFailed() }),
|
|
2980
2671
|
beat({ running, inFlight }) {
|
|
2981
2672
|
if (handing) return;
|
|
2982
2673
|
const decision = updateDecision({
|
|
@@ -2991,13 +2682,16 @@ function selfUpdate(kind, platform = process.platform, onFailed = () => {
|
|
|
2991
2682
|
});
|
|
2992
2683
|
if (decision.kind === "hand_over") {
|
|
2993
2684
|
lastWhy = null;
|
|
2685
|
+
state.stay = null;
|
|
2994
2686
|
handOver(decision.to);
|
|
2995
2687
|
return;
|
|
2996
2688
|
}
|
|
2689
|
+
state.stay = decision.why;
|
|
2997
2690
|
const why = `${decision.why}:${latest}`;
|
|
2998
2691
|
if (why !== lastWhy && latest) {
|
|
2999
2692
|
log(`staying on ${VERSION}: ${decision.why}`);
|
|
3000
2693
|
if (decision.why === "not_our_service") fail("not_our_service", latest);
|
|
2694
|
+
if (decision.why === "failed_before") fail("handover_failed", latest);
|
|
3001
2695
|
}
|
|
3002
2696
|
lastWhy = why;
|
|
3003
2697
|
}
|
|
@@ -3053,12 +2747,7 @@ async function adopt(from, kind, { services: given, script = process.argv[1] ??
|
|
|
3053
2747
|
}
|
|
3054
2748
|
log(`adopt ${from} -> ${VERSION} failed: ${why}; putting ${from} back`);
|
|
3055
2749
|
try {
|
|
3056
|
-
if (legacy) {
|
|
3057
|
-
const added = installedService({ ...where, environment });
|
|
3058
|
-
if (!await stopService(added, run3)) throw new Error(`${added.path} did not stop`);
|
|
3059
|
-
rmSync4(added.path, { force: true });
|
|
3060
|
-
moveRunnerFiles(runnerDir(environment), runnerDir(was));
|
|
3061
|
-
}
|
|
2750
|
+
if (legacy) await moveLegacyStagingRunnerBack({ ...where, environment }, run3);
|
|
3062
2751
|
recordFailed(VERSION, was);
|
|
3063
2752
|
writeFileSync2(back.path, old);
|
|
3064
2753
|
await runSteps(back.start, run3);
|
|
@@ -3121,33 +2810,20 @@ function boxPresence(beat) {
|
|
|
3121
2810
|
};
|
|
3122
2811
|
}
|
|
3123
2812
|
async function machineHarnesses(cfg) {
|
|
3124
|
-
const
|
|
3125
|
-
|
|
3126
|
-
|
|
3127
|
-
|
|
3128
|
-
return ownHarnessFirst([claude, codex], cfg.driver);
|
|
2813
|
+
const reports = await Promise.all(
|
|
2814
|
+
LOCAL_AGENTS.map((agent) => agent.probe(configuredBin(cfg, agent)))
|
|
2815
|
+
);
|
|
2816
|
+
return ownHarnessFirst(reports, cfg.driver);
|
|
3129
2817
|
}
|
|
3130
2818
|
async function localDriver(cfg, name) {
|
|
3131
|
-
const
|
|
3132
|
-
const claude = async (at) => claudeDialect(
|
|
3133
|
-
at,
|
|
3134
|
-
cfg.fallbackModels ?? DEFAULT_FALLBACK_MODEL,
|
|
3135
|
-
cfg.askEverything,
|
|
3136
|
-
await probeClaudePermissions(at)
|
|
3137
|
-
);
|
|
2819
|
+
const agent = AGENTS[name];
|
|
3138
2820
|
const driver = new LocalDriver({
|
|
3139
|
-
dialect:
|
|
3140
|
-
fallbackHarness:
|
|
2821
|
+
dialect: await agent.dialect(cfg, configuredBin(cfg, agent)),
|
|
2822
|
+
fallbackHarness: await AGENTS[agent.handsOverTo].dialect(cfg),
|
|
3141
2823
|
repos: cfg.repos,
|
|
3142
2824
|
label: cfg.label,
|
|
3143
2825
|
harnesses: () => machineHarnesses(cfg),
|
|
3144
|
-
usage: new LocalUsage({
|
|
3145
|
-
probes: {
|
|
3146
|
-
"claude-code": () => probeClaudeQuota(cfg.driver === "claude-code" ? cfg.bin : void 0),
|
|
3147
|
-
codex: () => probeCodexQuota(cfg.driver === "codex" ? cfg.bin : void 0)
|
|
3148
|
-
},
|
|
3149
|
-
log: log2
|
|
3150
|
-
}),
|
|
2826
|
+
usage: new LocalUsage({ probes: quotaProbes(cfg), log: log2 }),
|
|
3151
2827
|
log: log2
|
|
3152
2828
|
});
|
|
3153
2829
|
driver.warmHarnesses();
|
|
@@ -3165,9 +2841,7 @@ async function run2() {
|
|
|
3165
2841
|
if (cfg && isHosted(cfg)) pinRunnerEnvironment(cfg.origin);
|
|
3166
2842
|
let token = cfg?.deviceToken ?? getToken();
|
|
3167
2843
|
if (!token || !cfg) {
|
|
3168
|
-
out(
|
|
3169
|
-
`${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."}`
|
|
3170
|
-
);
|
|
2844
|
+
out(`${red("\u2717")} ${legacyNotConnectedLine() ?? "Not connected. Run `cloop connect` first."}`);
|
|
3171
2845
|
process.exit(1);
|
|
3172
2846
|
}
|
|
3173
2847
|
if (!cfg.deviceToken) {
|
|
@@ -3195,29 +2869,27 @@ async function run2() {
|
|
|
3195
2869
|
out(`${red("\u2717")} Another \`cloop box run\` is running (pid ${lock.heldBy}). Stop it first.`);
|
|
3196
2870
|
process.exit(1);
|
|
3197
2871
|
}
|
|
2872
|
+
const hostedModels = hosted ? localAgent(hosted.harness)?.models : void 0;
|
|
3198
2873
|
const driver = hosted ? new CloudroomDriver({
|
|
3199
2874
|
core: new CoreClient(hosted.coreUrl, hosted.coreToken),
|
|
3200
2875
|
harness: hosted.harness,
|
|
3201
2876
|
label: hosted.label,
|
|
3202
2877
|
// The box's harnesses sign in as the agent this daemon runs as, so its probes read the owner's account.
|
|
3203
|
-
usage: new LocalUsage({
|
|
3204
|
-
probes: { "claude-code": () => probeClaudeQuota(), codex: () => probeCodexQuota() },
|
|
3205
|
-
log: log2
|
|
3206
|
-
}),
|
|
2878
|
+
usage: new LocalUsage({ probes: quotaProbes(), log: log2 }),
|
|
3207
2879
|
// The same account's catalog, for a run the account refuses its model.
|
|
3208
|
-
...
|
|
2880
|
+
...hostedModels ? { models: () => hostedModels() } : {},
|
|
3209
2881
|
// Beside the daemon's threads: the model a Task named, a run's move off a refused one, refusals and the last list.
|
|
3210
2882
|
runModels: fileRunModels(hostedRunModelsPath(hosted.harness)),
|
|
3211
2883
|
log: log2,
|
|
3212
2884
|
// A held run's lease keeps the box awake until the hold is due to settle.
|
|
3213
|
-
awakeDir:
|
|
2885
|
+
awakeDir: join5(homedir3(), ".cloop", "awake"),
|
|
3214
2886
|
// Called only once calls arrive, so the socket below exists by then.
|
|
3215
2887
|
followUpLost: ({ work, n, error }) => socket.send(runnerLog("followup_lost", { work, n, tool: "thread.send", error })),
|
|
3216
2888
|
// Watches start after the socket too: a held run's steps, for the hold monitor.
|
|
3217
2889
|
holdLog: (code, work, ms) => socket.send(runnerLog(code, { work, ms })),
|
|
3218
2890
|
// A Claude Code run that carries on past the OAuth refresh lock, or fails on it after its last try.
|
|
3219
2891
|
authLockLog: (code, work, n, ms) => socket.send(runnerLog(code, { work, n, ms }))
|
|
3220
|
-
}) : local && (name
|
|
2892
|
+
}) : local && isLocalDriver(name) ? await localDriver(local, name) : new T3Driver({
|
|
3221
2893
|
client: () => t3.client,
|
|
3222
2894
|
t3Bin: isT3(cfg) ? cfg.t3Bin : null,
|
|
3223
2895
|
scope: () => cfg && isT3(cfg) ? cfg.scope : void 0,
|
|
@@ -3232,7 +2904,7 @@ async function run2() {
|
|
|
3232
2904
|
deviceToken: () => token,
|
|
3233
2905
|
log: log2,
|
|
3234
2906
|
dir: runnerDir(),
|
|
3235
|
-
awakeDir: hosted ?
|
|
2907
|
+
awakeDir: hosted ? join5(homedir3(), ".cloop", "awake") : null
|
|
3236
2908
|
});
|
|
3237
2909
|
const previews = outputs.connector;
|
|
3238
2910
|
void previews.resume();
|
|
@@ -3285,7 +2957,13 @@ async function run2() {
|
|
|
3285
2957
|
(s) => s.harnesses,
|
|
3286
2958
|
() => []
|
|
3287
2959
|
),
|
|
3288
|
-
update: update?.state() ?? {
|
|
2960
|
+
update: update?.state() ?? {
|
|
2961
|
+
checked_at: null,
|
|
2962
|
+
latest: null,
|
|
2963
|
+
error: null,
|
|
2964
|
+
stay: null,
|
|
2965
|
+
failed: null
|
|
2966
|
+
},
|
|
3289
2967
|
unacked: outbox.size,
|
|
3290
2968
|
clockOffsetMs: socket.clockOffset(),
|
|
3291
2969
|
calls: recentCalls
|
|
@@ -3386,7 +3064,7 @@ async function run2() {
|
|
|
3386
3064
|
const readDriver = lastKnown(
|
|
3387
3065
|
async () => {
|
|
3388
3066
|
const shown = showsOtherThreads(readRunnerConfig());
|
|
3389
|
-
const own = shown && driver.name ===
|
|
3067
|
+
const own = shown && localAgent(driver.name)?.ownSessions === true;
|
|
3390
3068
|
const listed = await driver.listThreads({
|
|
3391
3069
|
scope: own ? "all" : "unsettled",
|
|
3392
3070
|
limit: own ? 200 : 1
|
|
@@ -3504,18 +3182,21 @@ async function run2() {
|
|
|
3504
3182
|
});
|
|
3505
3183
|
}
|
|
3506
3184
|
function hostedRunModelsPath(harness) {
|
|
3507
|
-
return
|
|
3185
|
+
return join5(dirname3(hostedThreadsFilePath(harness)), "run-models.json");
|
|
3508
3186
|
}
|
|
3509
3187
|
var MODEL_WAIT_MS = 8e3;
|
|
3510
3188
|
async function modelCommand(argv, deps = {}) {
|
|
3511
3189
|
const harness = flag(argv, "--harness");
|
|
3512
3190
|
const err = deps.err ?? ((line) => console.error(line));
|
|
3513
|
-
|
|
3514
|
-
|
|
3191
|
+
const models = localAgent(harness)?.models;
|
|
3192
|
+
if (!harness || !models) {
|
|
3193
|
+
err(
|
|
3194
|
+
`Usage: cloop box model --harness ${LOCAL_AGENTS.filter((agent) => agent.models).map((agent) => agent.id).join("|")}`
|
|
3195
|
+
);
|
|
3515
3196
|
return 1;
|
|
3516
3197
|
}
|
|
3517
3198
|
const pick = await boxModel({
|
|
3518
|
-
models: deps.models ?? (() =>
|
|
3199
|
+
models: deps.models ?? (() => models()),
|
|
3519
3200
|
store: fileRunModels(deps.file ?? hostedRunModelsPath(harness)),
|
|
3520
3201
|
now: deps.now ?? Date.now(),
|
|
3521
3202
|
waitMs: MODEL_WAIT_MS
|