talentos 1.4.1 → 1.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -15,34 +15,28 @@ import { ROOM_LOCAL_TOOLS, ROOM_TOOLS } from "../codex-policy.js";
|
|
|
15
15
|
// generation, goals, tool search, request_user_input, multi-agent), so the
|
|
16
16
|
// session's whole tool list is exactly the allowlist below.
|
|
17
17
|
export const ROOM_SERVER = "talentos_room";
|
|
18
|
-
// R2 (#10987):
|
|
19
|
-
//
|
|
20
|
-
//
|
|
21
|
-
//
|
|
22
|
-
// EXACT npm version strings probed (`codex --version`'s numeric form parses the
|
|
23
|
-
// alpha to 0.164.0). 0.162.1 also passes the fence but stays below the pin.
|
|
24
|
-
// Enforced by the claim/gate (slice 2).
|
|
25
|
-
export const CODEX_FENCE_MIN_VERSION = "0.163.0";
|
|
26
|
-
export const CODEX_FENCE_TESTED = ["0.163.0", "0.164.0-alpha.3"];
|
|
18
|
+
// R2 (#10987): the exact Codex versions allowed full setup live on the server
|
|
19
|
+
// (convex/externalAgents/codexFence.model.ts) and arrive with each heartbeat and each
|
|
20
|
+
// native claim; the CLI keeps no list of its own, so removing a version there
|
|
21
|
+
// reaches every computer at its next claim.
|
|
27
22
|
// The FULL version including any prerelease: `codex --version` prints
|
|
28
23
|
// "codex-cli 0.164.0-alpha.3", and dropping "-alpha.3" would both fail to match
|
|
29
24
|
// a tested alpha and wrongly admit an untested stable 0.164.0. The gate
|
|
30
|
-
// exact-matches this against the
|
|
31
|
-
// including a newer stable — stays room-only
|
|
25
|
+
// exact-matches this against the server's list, so a version we have not
|
|
26
|
+
// verified — including a newer stable — stays room-only.
|
|
32
27
|
const CODEX_VERSION_FULL = /(\d+\.\d+\.\d+(?:-[0-9A-Za-z.]+)?)/u;
|
|
33
28
|
export function codexFenceVersion(versionOutput) {
|
|
34
29
|
return CODEX_VERSION_FULL.exec(versionOutput)?.[1];
|
|
35
30
|
}
|
|
36
|
-
/** What `talentos agent native enable` tells the owner about an
|
|
37
|
-
export function codexUnsupportedMessage(versionOutput) {
|
|
31
|
+
/** What `talentos agent native enable` tells the owner about an unlisted Codex. */
|
|
32
|
+
export function codexUnsupportedMessage(versionOutput, tested) {
|
|
38
33
|
const version = codexFenceVersion(versionOutput) ?? "unknown version";
|
|
39
|
-
return `Your Codex (${version}) isn't verified for full setup yet, so it works room-only. Works with: ${
|
|
34
|
+
return `Your Codex (${version}) isn't verified for full setup yet, so it works room-only. Works with: ${tested.join(", ")}. Install one of those, then run talentos agent native enable again.`;
|
|
40
35
|
}
|
|
41
|
-
/** Whether this exact Codex version
|
|
42
|
-
export function codexFenceEligible(versionOutput) {
|
|
36
|
+
/** Whether this exact Codex version is on the server's tested list (R2). */
|
|
37
|
+
export function codexFenceEligible(versionOutput, tested) {
|
|
43
38
|
const version = codexFenceVersion(versionOutput);
|
|
44
|
-
return
|
|
45
|
-
CODEX_FENCE_TESTED.includes(version));
|
|
39
|
+
return version !== undefined && tested.includes(version);
|
|
46
40
|
}
|
|
47
41
|
/**
|
|
48
42
|
* The session's complete tool surface in an owner-native Codex job. The gate
|
|
@@ -30,6 +30,10 @@ export const LOCAL_BASE = "Couldn't get the latest code, so I started from your
|
|
|
30
30
|
*/
|
|
31
31
|
export class NativeGate {
|
|
32
32
|
probe = "none";
|
|
33
|
+
codexIssue;
|
|
34
|
+
// The server's exact list of Codex versions allowed full setup, from the
|
|
35
|
+
// last heartbeat. Until it arrives, a Codex is never probed or reported ready.
|
|
36
|
+
codexTested;
|
|
33
37
|
retryAt = 0;
|
|
34
38
|
env;
|
|
35
39
|
agent;
|
|
@@ -44,6 +48,22 @@ export class NativeGate {
|
|
|
44
48
|
optedIn() {
|
|
45
49
|
return existsSync(join(this.directory, NATIVE_FILE));
|
|
46
50
|
}
|
|
51
|
+
/** The server's tested Codex list, from each heartbeat (absent = unknown). */
|
|
52
|
+
setCodexTested(tested) {
|
|
53
|
+
const changed = tested?.join("\n") !== this.codexTested?.join("\n");
|
|
54
|
+
this.codexTested = tested;
|
|
55
|
+
if (changed && this.probe !== "pending") {
|
|
56
|
+
// A version may have just been verified or withdrawn: stop reporting
|
|
57
|
+
// ready on the old list and re-check now (a cached fence pass makes the
|
|
58
|
+
// re-check one `codex --version`).
|
|
59
|
+
this.probe = "none";
|
|
60
|
+
this.retryAt = 0;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
/** Why an opted-in computer can't use full setup, for the heartbeat. */
|
|
64
|
+
issue() {
|
|
65
|
+
return this.optedIn() ? this.codexIssue : undefined;
|
|
66
|
+
}
|
|
47
67
|
/** Whether to tell the plane this computer is ready (heartbeat). */
|
|
48
68
|
reportable() {
|
|
49
69
|
return this.probe === "ok" && this.optedIn();
|
|
@@ -52,6 +72,7 @@ export class NativeGate {
|
|
|
52
72
|
refresh() {
|
|
53
73
|
if (process.platform === "win32" ||
|
|
54
74
|
!this.optedIn() ||
|
|
75
|
+
(this.agent.provider === "codex" && this.codexTested === undefined) ||
|
|
55
76
|
this.probe === "pending" ||
|
|
56
77
|
this.probe === "ok" ||
|
|
57
78
|
(this.probe === "failed" && Date.now() < this.retryAt)) {
|
|
@@ -61,9 +82,17 @@ export class NativeGate {
|
|
|
61
82
|
return;
|
|
62
83
|
}
|
|
63
84
|
this.probe = "pending";
|
|
85
|
+
// The list this probe judged against: if the server's list changes before
|
|
86
|
+
// it finishes, the result is for an old list and must not become "ready".
|
|
87
|
+
const listAtStart = this.codexTested?.join("\n");
|
|
88
|
+
const stale = () => this.codexTested?.join("\n") !== listAtStart;
|
|
64
89
|
this.runProbe().then(() => {
|
|
65
|
-
this.probe = "ok";
|
|
90
|
+
this.probe = stale() ? "none" : "ok";
|
|
66
91
|
}, () => {
|
|
92
|
+
if (stale()) {
|
|
93
|
+
this.probe = "none";
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
67
96
|
this.probe = "failed";
|
|
68
97
|
// A failing provider is not re-probed on every heartbeat.
|
|
69
98
|
this.retryAt = Date.now() + RETRY_MS;
|
|
@@ -77,16 +106,30 @@ export class NativeGate {
|
|
|
77
106
|
timeout: 5000,
|
|
78
107
|
});
|
|
79
108
|
if (this.agent.provider === "codex") {
|
|
80
|
-
// The exact version (with prerelease) must be
|
|
81
|
-
// newer or stable-but-
|
|
82
|
-
|
|
83
|
-
|
|
109
|
+
// The exact version (with prerelease) must be on the server's list, so a
|
|
110
|
+
// newer or stable-but-unverified Codex stays room-only. Without the list
|
|
111
|
+
// (`native enable` runs offline) the probe still proves this binary; the
|
|
112
|
+
// list is checked again at every claim.
|
|
113
|
+
const version = codexFenceVersion(stdout);
|
|
114
|
+
if (this.codexTested && !codexFenceEligible(stdout, this.codexTested)) {
|
|
115
|
+
this.codexIssue = untestedCodex(version, this.codexTested);
|
|
116
|
+
throw new Error(codexUnsupportedMessage(stdout, this.codexTested));
|
|
84
117
|
}
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
118
|
+
try {
|
|
119
|
+
await ensureCodexFenceProbe({
|
|
120
|
+
binary,
|
|
121
|
+
cachePath: join(this.directory, "codex-fence-probe.json"),
|
|
122
|
+
version: version ?? "unknown",
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
catch (error) {
|
|
126
|
+
this.codexIssue = {
|
|
127
|
+
code: "codex_checks",
|
|
128
|
+
...(version ? { version } : {}),
|
|
129
|
+
};
|
|
130
|
+
throw error;
|
|
131
|
+
}
|
|
132
|
+
this.codexIssue = undefined;
|
|
90
133
|
return;
|
|
91
134
|
}
|
|
92
135
|
await ensureOwnerNativeProbe({
|
|
@@ -120,7 +163,9 @@ export class NativeGate {
|
|
|
120
163
|
}
|
|
121
164
|
const env = await this.loginEnv();
|
|
122
165
|
// Codex: the per-job fence checks come before any workspace is created.
|
|
123
|
-
const codex = this.agent.provider === "codex"
|
|
166
|
+
const codex = this.agent.provider === "codex"
|
|
167
|
+
? await this.codexReady(env, job.codexTested)
|
|
168
|
+
: undefined;
|
|
124
169
|
if (this.agent.provider === "codex" && !codex) {
|
|
125
170
|
return;
|
|
126
171
|
}
|
|
@@ -181,7 +226,12 @@ export class NativeGate {
|
|
|
181
226
|
};
|
|
182
227
|
}
|
|
183
228
|
/** Per Codex owner job: the binary, its catalog and ~/.codex, or undefined. */
|
|
184
|
-
async codexReady(env) {
|
|
229
|
+
async codexReady(env, tested) {
|
|
230
|
+
// Fail closed: a claim without the server's list (an older server) never
|
|
231
|
+
// runs Codex with the owner's setup.
|
|
232
|
+
if (!tested) {
|
|
233
|
+
return;
|
|
234
|
+
}
|
|
185
235
|
const binary = resolveProviderBinary("codex", this.agent.providerPath);
|
|
186
236
|
const probeEnv = { ...env, PATH: providerPathEnv(binary, this.home) };
|
|
187
237
|
// Per job, never trusting the background probe's last word: the binary
|
|
@@ -194,8 +244,13 @@ export class NativeGate {
|
|
|
194
244
|
timeout: 5000,
|
|
195
245
|
}).then(({ stdout }) => stdout, () => "");
|
|
196
246
|
const version = codexFenceVersion(versionOutput);
|
|
247
|
+
if (!codexFenceEligible(versionOutput, tested)) {
|
|
248
|
+
// Updated in place onto an unlisted version since the probe passed, or
|
|
249
|
+
// the server just removed this one.
|
|
250
|
+
this.codexIssue = untestedCodex(version, tested);
|
|
251
|
+
}
|
|
197
252
|
if (!(version &&
|
|
198
|
-
codexFenceEligible(versionOutput) &&
|
|
253
|
+
codexFenceEligible(versionOutput, tested) &&
|
|
199
254
|
(await codexFenceProbeCached({
|
|
200
255
|
binary,
|
|
201
256
|
cachePath: fenceCache,
|
|
@@ -232,3 +287,10 @@ export class NativeGate {
|
|
|
232
287
|
}
|
|
233
288
|
}
|
|
234
289
|
}
|
|
290
|
+
function untestedCodex(version, tested) {
|
|
291
|
+
return {
|
|
292
|
+
code: "codex_version",
|
|
293
|
+
supported: [...tested],
|
|
294
|
+
...(version ? { version } : {}),
|
|
295
|
+
};
|
|
296
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export const ROOM_ONLY_STATUS = "Codex is answering room-only: full setup isn't available on that computer right now.";
|
package/dist/agent/serve.js
CHANGED
|
@@ -9,6 +9,7 @@ import { runProvider } from "./adapters.js";
|
|
|
9
9
|
import { AgentGateway, GatewayError } from "./gateway.js";
|
|
10
10
|
import { ApprovalBridge } from "./native/approvals.js";
|
|
11
11
|
import { NativeGate } from "./native/gate.js";
|
|
12
|
+
import { ROOM_ONLY_STATUS } from "./native/native-issue.js";
|
|
12
13
|
import { ProjectRequests } from "./native/project-requests.js";
|
|
13
14
|
import { mirrorOf } from "./native/projects.js";
|
|
14
15
|
import { SessionMap } from "./sessions.js";
|
|
@@ -18,6 +19,8 @@ const LEASE_SAFETY_MS = 55_000;
|
|
|
18
19
|
const NATIVE_RENEW_MS = 10_000;
|
|
19
20
|
const NATIVE_SAFETY_MS = 25_000;
|
|
20
21
|
const IDLE_MS = 30 * 60_000;
|
|
22
|
+
// The room-only reason stays up this long before progress lines resume.
|
|
23
|
+
const FALLBACK_HOLD_MS = 5000;
|
|
21
24
|
export function needsUpdate(current, minimum) {
|
|
22
25
|
if (compareGatewayVersions(minimum, minimum) === undefined) {
|
|
23
26
|
return false;
|
|
@@ -71,6 +74,7 @@ export async function serveAgent(config, directory, version, stop, verify, optio
|
|
|
71
74
|
const deviceId = randomUUID();
|
|
72
75
|
const gate = options.gate ??
|
|
73
76
|
new NativeGate({ agent: config, directory, home: homeDir() });
|
|
77
|
+
const fallbackHoldMs = options.fallbackHoldMs ?? FALLBACK_HOLD_MS;
|
|
74
78
|
const service = new AbortController();
|
|
75
79
|
const signal = AbortSignal.any([stop, service.signal]);
|
|
76
80
|
let wakeResolve, wakePending = true;
|
|
@@ -100,13 +104,20 @@ export async function serveAgent(config, directory, version, stop, verify, optio
|
|
|
100
104
|
.then(mirrorOf)
|
|
101
105
|
.catch(() => undefined)
|
|
102
106
|
: undefined;
|
|
107
|
+
const issue = gate.issue?.();
|
|
103
108
|
const response = await gateway.request("/agent-gateway/heartbeat", {
|
|
104
109
|
cliVersion: version,
|
|
105
110
|
nativeOptIn: gate.reportable(),
|
|
106
111
|
...(mirror ? { projects: mirror } : {}),
|
|
112
|
+
// Why an opted-in computer can't use full setup (an untested Codex),
|
|
113
|
+
// so the owner sees it in the Access menu.
|
|
114
|
+
...(issue ? { nativeIssue: issue } : {}),
|
|
107
115
|
}, signal);
|
|
108
116
|
if (response) {
|
|
109
117
|
minimum = response.cliMinVersion;
|
|
118
|
+
// The server's exact list of Codex versions allowed full setup; the
|
|
119
|
+
// background probe waits for it.
|
|
120
|
+
gate.setCodexTested?.(response.codexFenceTested);
|
|
110
121
|
if (response.pendingJobs > 0 || needsUpdate(version, minimum)) {
|
|
111
122
|
wake();
|
|
112
123
|
}
|
|
@@ -249,6 +260,8 @@ export async function serveAgent(config, directory, version, stop, verify, optio
|
|
|
249
260
|
};
|
|
250
261
|
active = current;
|
|
251
262
|
let lastStatusAt = 0;
|
|
263
|
+
// Until then, room progress lines wait so the room-only reason is read.
|
|
264
|
+
let reasonUntil = 0;
|
|
252
265
|
// Monotonic, so a wall-clock change cannot corrupt the marks.
|
|
253
266
|
const receivedAt = performance.now();
|
|
254
267
|
const timings = {};
|
|
@@ -267,6 +280,7 @@ export async function serveAgent(config, directory, version, stop, verify, optio
|
|
|
267
280
|
gateway.request(`/agent-gateway/jobs/${job.jobId}/native-confirm`, { leaseToken: job.leaseToken }, signal),
|
|
268
281
|
gate
|
|
269
282
|
.prepare(job.packet.thread.id, {
|
|
283
|
+
codexTested: job.native.codexFenceTested,
|
|
270
284
|
projectId: job.native.projectId,
|
|
271
285
|
status: (line) => {
|
|
272
286
|
lastStatusAt = Date.now();
|
|
@@ -277,6 +291,14 @@ export async function serveAgent(config, directory, version, stop, verify, optio
|
|
|
277
291
|
]);
|
|
278
292
|
owner = prepared;
|
|
279
293
|
current.owner = Boolean(owner);
|
|
294
|
+
// The owner asked for their setup and this computer can't give
|
|
295
|
+
// it: say so in the room (neutral, no version), hold that line a
|
|
296
|
+
// moment, then let progress resume. The owner's Access menu has
|
|
297
|
+
// the detail.
|
|
298
|
+
if (!owner && gate.issue?.()) {
|
|
299
|
+
post(ROOM_ONLY_STATUS);
|
|
300
|
+
reasonUntil = Date.now() + fallbackHoldMs;
|
|
301
|
+
}
|
|
280
302
|
// In a room with other people the server holds what the job
|
|
281
303
|
// posts unless this computer affirms it started clean: none of
|
|
282
304
|
// the owner's own context loaded, every touch reported. Unknown
|
|
@@ -348,7 +370,8 @@ export async function serveAgent(config, directory, version, stop, verify, optio
|
|
|
348
370
|
timings[`${name}Ms`] = Math.round(performance.now() - receivedAt);
|
|
349
371
|
},
|
|
350
372
|
status: (line) => {
|
|
351
|
-
if (Date.now()
|
|
373
|
+
if (Date.now() < reasonUntil ||
|
|
374
|
+
Date.now() - lastStatusAt < 1000) {
|
|
352
375
|
return;
|
|
353
376
|
}
|
|
354
377
|
lastStatusAt = Date.now();
|
|
@@ -60,7 +60,9 @@ export async function runAgentNative(parsed, home = homeDir()) {
|
|
|
60
60
|
}
|
|
61
61
|
// The folder it was enabled in is one of its projects (project #1 if first).
|
|
62
62
|
await registerRoot(directory, config);
|
|
63
|
-
emit(`I'll work in ${shown(config.root, home)}${config.kind === "repo" ? " (each room thread gets its own copy of the branch)" : ""}. TalentOS will ask you to confirm once
|
|
63
|
+
emit(`I'll work in ${shown(config.root, home)}${config.kind === "repo" ? " (each room thread gets its own copy of the branch)" : ""}. TalentOS will ask you to confirm once.${agent.provider === "codex"
|
|
64
|
+
? " Your Codex passed the safety checks on this computer; full setup turns on if TalentOS has verified this Codex version (the Access menu says which)."
|
|
65
|
+
: ""}`);
|
|
64
66
|
}
|
|
65
67
|
// `talentos agent project add | list | remove` (#10987): the escape hatch for a
|
|
66
68
|
// repo the Projects dialog does not list. Same checks and registry as a pick;
|
package/package.json
CHANGED