talentos 1.4.3 → 1.4.4
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/agent/adapters.js +18 -1
- package/dist/agent/codex-policy.js +6 -0
- package/dist/agent/codex-probe.js +10 -4
- package/dist/agent/native/codex-fence-probe.js +5 -4
- package/dist/agent/native/codex-fence.js +4 -0
- package/dist/agent/native/codex-launch.js +6 -19
- package/dist/agent/serve.js +9 -3
- package/dist/agent-http.js +45 -5
- package/package.json +1 -1
package/dist/agent/adapters.js
CHANGED
|
@@ -33,6 +33,8 @@ const CHILD_ENV = [
|
|
|
33
33
|
const CLAUDE_VERSION = /^\d+\.\d+\.\d+/u;
|
|
34
34
|
const CODEX_VERSION = /\b\d+\.\d+\.\d+\b/u;
|
|
35
35
|
const DONT_ASK = /\bdontAsk\b/u;
|
|
36
|
+
// What Codex prints when the required room server never listed its tools.
|
|
37
|
+
const ROOM_SERVER_FAILED = /required MCP servers failed to initialize/u;
|
|
36
38
|
const CLAUDE_TOOLS = ROOM_TOOLS.map((tool) => `mcp__talentos__${tool}`).join(",");
|
|
37
39
|
export function childEnvironment(source = process.env, binary) {
|
|
38
40
|
return {
|
|
@@ -142,6 +144,12 @@ async function codexRoomCatalog(binary) {
|
|
|
142
144
|
throw new Error("Update Codex to a version supporting a local room-only model catalog.");
|
|
143
145
|
}
|
|
144
146
|
}
|
|
147
|
+
/** Codex could not start its room tools, so the job fails with that reason. */
|
|
148
|
+
export class RoomToolsUnavailableError extends Error {
|
|
149
|
+
constructor() {
|
|
150
|
+
super("Codex couldn't reach its room tools. Try again.");
|
|
151
|
+
}
|
|
152
|
+
}
|
|
145
153
|
export function readProviderEvent(provider, value) {
|
|
146
154
|
if (!value || typeof value !== "object") {
|
|
147
155
|
return {};
|
|
@@ -303,7 +311,8 @@ export async function runProvider(input) {
|
|
|
303
311
|
.join(delimiter),
|
|
304
312
|
}
|
|
305
313
|
: childEnvironment(process.env, binary),
|
|
306
|
-
|
|
314
|
+
// Codex's stderr is matched, never forwarded: it can hold login details.
|
|
315
|
+
stdio: ["ignore", "pipe", config.provider === "codex" ? "pipe" : "ignore"],
|
|
307
316
|
detached: process.platform !== "win32",
|
|
308
317
|
});
|
|
309
318
|
const marked = new Set();
|
|
@@ -314,6 +323,11 @@ export async function runProvider(input) {
|
|
|
314
323
|
}
|
|
315
324
|
};
|
|
316
325
|
child.once("spawn", () => mark("spawn"));
|
|
326
|
+
// The last 8 kB is enough for Codex's closing error line.
|
|
327
|
+
let stderrTail = "";
|
|
328
|
+
child.stderr?.on("data", (chunk) => {
|
|
329
|
+
stderrTail = (stderrTail + chunk.toString()).slice(-8192);
|
|
330
|
+
});
|
|
317
331
|
let killTimer;
|
|
318
332
|
const stop = () => {
|
|
319
333
|
const pid = child.pid;
|
|
@@ -385,6 +399,9 @@ export async function runProvider(input) {
|
|
|
385
399
|
}
|
|
386
400
|
}
|
|
387
401
|
const code = await ended;
|
|
402
|
+
if (code !== 0 && !signal.aborted && ROOM_SERVER_FAILED.test(stderrTail)) {
|
|
403
|
+
throw new RoomToolsUnavailableError();
|
|
404
|
+
}
|
|
388
405
|
if (code !== 0 || failed || !sawResult || signal.aborted) {
|
|
389
406
|
throw new Error("Provider could not finish this turn. Check its login and quota.");
|
|
390
407
|
}
|
|
@@ -61,6 +61,12 @@ export function codexRoomArgs(input) {
|
|
|
61
61
|
`model_catalog_json=${JSON.stringify(catalogPath)}`,
|
|
62
62
|
"-c",
|
|
63
63
|
`mcp_servers.talentos.enabled_tools=${JSON.stringify(ROOM_TOOLS)}`,
|
|
64
|
+
// Codex >= 0.147 runs the turn without an optional MCP server that has not
|
|
65
|
+
// listed its tools within ~1 s; our proxy needs several round trips to
|
|
66
|
+
// /mcp first, so the model got no room tools (#12225). A required server is
|
|
67
|
+
// awaited, and one that cannot start fails the turn instead.
|
|
68
|
+
"-c",
|
|
69
|
+
"mcp_servers.talentos.required=true",
|
|
64
70
|
"-c",
|
|
65
71
|
`mcp_servers.talentos.command=${JSON.stringify(mcpCommand)}`,
|
|
66
72
|
"-c",
|
|
@@ -11,7 +11,12 @@ import { ProviderBinaryError, providerPathEnv } from "../provider-binary.js";
|
|
|
11
11
|
import { codexRoomArgs, ROOM_TOOLS } from "./codex-policy.js";
|
|
12
12
|
const PROBE_MS = 30_000;
|
|
13
13
|
const MAX_BYTES = 4_000_000;
|
|
14
|
-
const PROBE_REVISION =
|
|
14
|
+
const PROBE_REVISION = 3;
|
|
15
|
+
// Codex >= 0.147 gives an optional MCP server ~1 s to list its tools, then runs
|
|
16
|
+
// the turn without them (#12225). The real room proxy needs several round trips
|
|
17
|
+
// to /mcp, so the stand-in lists later than that: only a launch that makes Codex
|
|
18
|
+
// wait for the room server passes.
|
|
19
|
+
export const SLOW_LIST_MS = 1500;
|
|
15
20
|
const RESOURCE_REFUSAL = /Method not found|unknown MCP server/u;
|
|
16
21
|
const INPUT_TYPES = new Set([
|
|
17
22
|
"message",
|
|
@@ -255,7 +260,7 @@ async function proveCodexBoundary(binary, version, catalog, stop) {
|
|
|
255
260
|
import {StdioServerTransport} from ${JSON.stringify(import.meta.resolve("@modelcontextprotocol/sdk/server/stdio.js"))};
|
|
256
261
|
import {ListToolsRequestSchema,CallToolRequestSchema} from ${JSON.stringify(import.meta.resolve("@modelcontextprotocol/sdk/types.js"))};
|
|
257
262
|
const server=new Server({name:'talentos',version:'probe'},{capabilities:{tools:{}}});
|
|
258
|
-
server.setRequestHandler(ListToolsRequestSchema,async()=>({tools:${JSON.stringify([...ROOM_TOOLS, "search_memory", "run_routine"].map((name) => ({ name, description: name, inputSchema: { type: "object", properties: {} }, annotations: { readOnlyHint: true, destructiveHint: false, openWorldHint: false } })))}})
|
|
263
|
+
server.setRequestHandler(ListToolsRequestSchema,async()=>{await new Promise(r=>setTimeout(r,Number(process.argv[2])));return {tools:${JSON.stringify([...ROOM_TOOLS, "search_memory", "run_routine"].map((name) => ({ name, description: name, inputSchema: { type: "object", properties: {} }, annotations: { readOnlyHint: true, destructiveHint: false, openWorldHint: false } })))}};});
|
|
259
264
|
server.setRequestHandler(CallToolRequestSchema,async r=>({content:[{type:'text',text:r.params.name==='read_room'?${JSON.stringify(marker)}:'private-tool-refused'}]}));
|
|
260
265
|
await server.connect(new StdioServerTransport());`, { mode: 0o600 });
|
|
261
266
|
server.on("request", async (request, response) => {
|
|
@@ -383,7 +388,8 @@ await server.connect(new StdioServerTransport());`, { mode: 0o600 });
|
|
|
383
388
|
const args = codexRoomArgs({
|
|
384
389
|
catalogPath,
|
|
385
390
|
mcpCommand: process.execPath,
|
|
386
|
-
|
|
391
|
+
// One slow listing is enough to prove Codex waits; keep resume quick.
|
|
392
|
+
mcpArgs: [mcp, String(turn === 0 ? SLOW_LIST_MS : 0)],
|
|
387
393
|
prompt: "Verify the room boundary.",
|
|
388
394
|
sessionId: session,
|
|
389
395
|
});
|
|
@@ -392,7 +398,7 @@ await server.connect(new StdioServerTransport());`, { mode: 0o600 });
|
|
|
392
398
|
if (failure ||
|
|
393
399
|
!finished[turn] ||
|
|
394
400
|
calls[turn]?.length !== turnSteps[turn]?.length ||
|
|
395
|
-
!observations[turn]?.has(
|
|
401
|
+
!ROOM_TOOLS.every((name) => observations[turn]?.has(`mcp__talentos.${name}`))) {
|
|
396
402
|
throw new Error("Incomplete boundary proof");
|
|
397
403
|
}
|
|
398
404
|
const events = output
|
|
@@ -7,7 +7,7 @@ import { tmpdir } from "node:os";
|
|
|
7
7
|
import { join } from "node:path";
|
|
8
8
|
import { writePrivateFile } from "../../agent-config.js";
|
|
9
9
|
import { ROOM_LOCAL_TOOLS } from "../codex-policy.js";
|
|
10
|
-
import { probeResponse } from "../codex-probe.js";
|
|
10
|
+
import { probeResponse, SLOW_LIST_MS } from "../codex-probe.js";
|
|
11
11
|
import { codexOwnerArgs, ownerCatalog, ownerToolAllowlist, } from "./codex-fence.js";
|
|
12
12
|
import { codexHookArgs, trustHookArgs } from "./codex-owner.js";
|
|
13
13
|
// The GATE probe for Codex owner-native (#10987 slice 1). codex-owner-probe.ts
|
|
@@ -69,7 +69,7 @@ process.stdin.on("end", () => {
|
|
|
69
69
|
// calls, and returns ok. run_command execution and classification live in
|
|
70
70
|
// codex-run-command.ts and its test; here we only prove the tool is exposed and
|
|
71
71
|
// the exact command string reaches the proxy (so the approval shows what runs).
|
|
72
|
-
function roomServerSource(recordPath) {
|
|
72
|
+
function roomServerSource(recordPath, listDelayMs) {
|
|
73
73
|
const all = [...STANDIN_ROOM_TOOLS, ...ROOM_LOCAL_TOOLS];
|
|
74
74
|
return `import {Server} from ${JSON.stringify(import.meta.resolve("@modelcontextprotocol/sdk/server/index.js"))};
|
|
75
75
|
import {StdioServerTransport} from ${JSON.stringify(import.meta.resolve("@modelcontextprotocol/sdk/server/stdio.js"))};
|
|
@@ -77,7 +77,7 @@ import {ListToolsRequestSchema,CallToolRequestSchema} from ${JSON.stringify(impo
|
|
|
77
77
|
import {appendFileSync} from "node:fs";
|
|
78
78
|
const tools=${JSON.stringify(all)}.map((n)=>({name:n,description:n,inputSchema:{type:"object",properties:{command:{type:"string"}},additionalProperties:true}}));
|
|
79
79
|
const s=new Server({name:"talentos_room",version:"1"},{capabilities:{tools:{}}});
|
|
80
|
-
s.setRequestHandler(ListToolsRequestSchema,async()=>({
|
|
80
|
+
s.setRequestHandler(ListToolsRequestSchema,async()=>{await new Promise((r)=>setTimeout(r,${listDelayMs}));return {tools};});
|
|
81
81
|
s.setRequestHandler(CallToolRequestSchema,async(r)=>{appendFileSync(${JSON.stringify(recordPath)},JSON.stringify({name:r.params.name,arguments:r.params.arguments})+"\\n");return {content:[{type:"text",text:"ok"}]};});
|
|
82
82
|
await s.connect(new StdioServerTransport());`;
|
|
83
83
|
}
|
|
@@ -91,7 +91,7 @@ async function runCell(binary, root, options, signal) {
|
|
|
91
91
|
const hook = join(root, "hook.js");
|
|
92
92
|
writeFileSync(hook, HOOK, { mode: 0o700 });
|
|
93
93
|
const roomServer = join(root, `room-${createHash("sha1").update(work).digest("hex")}.mjs`);
|
|
94
|
-
writeFileSync(roomServer, roomServerSource(roomRec));
|
|
94
|
+
writeFileSync(roomServer, roomServerSource(roomRec, options.slowList ? SLOW_LIST_MS : 0));
|
|
95
95
|
const jobDir = join(root, `job-${createHash("sha1").update(home).digest("hex")}`);
|
|
96
96
|
mkdirSync(jobDir, { recursive: true });
|
|
97
97
|
writeFileSync(join(jobDir, "context.json"), JSON.stringify({ home, writeRoots: [work] }));
|
|
@@ -321,6 +321,7 @@ export async function probeCodexFence(binary, version, signal = AbortSignal.time
|
|
|
321
321
|
await cell("tool_list", async () => {
|
|
322
322
|
const run = await runCell(binary, root, {
|
|
323
323
|
script: "text(JSON.stringify(Object.keys(tools).sort()))",
|
|
324
|
+
slowList: true,
|
|
324
325
|
}, signal);
|
|
325
326
|
const out = lastText(run);
|
|
326
327
|
if (!out) {
|
|
@@ -133,6 +133,10 @@ export function codexOwnerArgs(input) {
|
|
|
133
133
|
...ROOM_TOOLS,
|
|
134
134
|
...ROOM_LOCAL_TOOLS,
|
|
135
135
|
])}`,
|
|
136
|
+
// Wait for the room server's tools rather than run without them (#12225,
|
|
137
|
+
// see codexRoomArgs).
|
|
138
|
+
"-c",
|
|
139
|
+
`mcp_servers.${ROOM_SERVER}.required=true`,
|
|
136
140
|
// Our PreToolUse hook is the gate, so Codex must not add its own approval
|
|
137
141
|
// prompt in front of the room server (under workspace-write an MCP call
|
|
138
142
|
// would otherwise be refused as "requires approval, but policy is never").
|
|
@@ -1,30 +1,17 @@
|
|
|
1
1
|
import { mkdir, rm } from "node:fs/promises";
|
|
2
2
|
import { join } from "node:path";
|
|
3
|
-
import { fileURLToPath } from "node:url";
|
|
4
3
|
import { writePrivateFile } from "../../agent-config.js";
|
|
5
|
-
import { gatewayLauncherPath } from "../../gateway-install.js";
|
|
6
4
|
import { codexOwnerArgs, ownerCatalog } from "./codex-fence.js";
|
|
7
5
|
import { codexHookArgs, trustHookArgs } from "./codex-owner.js";
|
|
8
|
-
import { HOOK_ENTRY, ownerRules } from "./launch.js";
|
|
6
|
+
import { HOOK_ENTRY, ownerRules, roomMcpEntry } from "./launch.js";
|
|
9
7
|
/** The room MCP proxy command for a Codex owner job: adds the owner job dir. */
|
|
10
8
|
export function codexRoomMcpEntry(input) {
|
|
11
|
-
|
|
12
|
-
const
|
|
9
|
+
// Claude's entry, so both fall back to the CLI when no launcher is installed.
|
|
10
|
+
const entry = roomMcpEntry(input.agentId, input.home, input.uploadRoot);
|
|
13
11
|
return {
|
|
14
|
-
command:
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
? []
|
|
18
|
-
: [fileURLToPath(new URL("../../index.js", import.meta.url))]),
|
|
19
|
-
"agent",
|
|
20
|
-
"mcp",
|
|
21
|
-
"--agent",
|
|
22
|
-
input.agentId,
|
|
23
|
-
...(input.uploadRoot ? ["--upload-root", input.uploadRoot] : []),
|
|
24
|
-
// Turns on run_command, served and gated by the proxy for this job only.
|
|
25
|
-
"--owner-job-dir",
|
|
26
|
-
input.jobDir,
|
|
27
|
-
],
|
|
12
|
+
command: entry.command,
|
|
13
|
+
// Turns on run_command, served and gated by the proxy for this job only.
|
|
14
|
+
args: [...entry.args, "--owner-job-dir", input.jobDir],
|
|
28
15
|
};
|
|
29
16
|
}
|
|
30
17
|
export async function prepareCodexOwnerLaunch(input) {
|
package/dist/agent/serve.js
CHANGED
|
@@ -5,7 +5,7 @@ import { setTimeout as delay } from "node:timers/promises";
|
|
|
5
5
|
import { installSharedGateway, newerInstalledVersion, } from "../gateway-install.js";
|
|
6
6
|
import { compareGatewayVersions } from "../gateway-version.js";
|
|
7
7
|
import { homeDir } from "../install.js";
|
|
8
|
-
import { runProvider } from "./adapters.js";
|
|
8
|
+
import { RoomToolsUnavailableError, 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";
|
|
@@ -398,10 +398,16 @@ export async function serveAgent(config, directory, version, stop, verify, optio
|
|
|
398
398
|
}
|
|
399
399
|
}
|
|
400
400
|
}
|
|
401
|
-
catch {
|
|
401
|
+
catch (error) {
|
|
402
402
|
if (!(signal.aborted || cancel.signal.aborted)) {
|
|
403
403
|
await gateway
|
|
404
|
-
.request(`/agent-gateway/jobs/${job.jobId}/fail`, {
|
|
404
|
+
.request(`/agent-gateway/jobs/${job.jobId}/fail`, {
|
|
405
|
+
leaseToken: job.leaseToken,
|
|
406
|
+
// A fixed code; the server owns the room's wording.
|
|
407
|
+
...(error instanceof RoomToolsUnavailableError
|
|
408
|
+
? { reason: "room_tools" }
|
|
409
|
+
: {}),
|
|
410
|
+
}, signal)
|
|
405
411
|
.catch(failService);
|
|
406
412
|
}
|
|
407
413
|
}
|
package/dist/agent-http.js
CHANGED
|
@@ -4,13 +4,26 @@ import { isSecureUrl, } from "./agent-link.js";
|
|
|
4
4
|
import { resolveProviderBinary } from "./provider-binary.js";
|
|
5
5
|
const REQUEST_TIMEOUT_MS = 10_000;
|
|
6
6
|
const HEARTBEAT_WINDOW_MS = 60_000;
|
|
7
|
+
// A refusal sentence longer than this, or on more than one line, is not one
|
|
8
|
+
// the server wrote for people; the generic hedge is printed instead.
|
|
9
|
+
const REFUSAL_MAX_LENGTH = 300;
|
|
10
|
+
const ONE_LINE = /^[^\p{Cc}]+$/u;
|
|
11
|
+
const NEW_PROMPT_STEP = "Ask for a new setup prompt.";
|
|
12
|
+
// The server's code for a used or expired link: that link can never work.
|
|
13
|
+
const DEAD_LINK_CODES = new Set(["link_expired", "link_used"]);
|
|
7
14
|
export class AgentHttpError extends Error {
|
|
8
15
|
status;
|
|
9
16
|
retryAfterMs;
|
|
10
|
-
constructor(operation, response) {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
17
|
+
constructor(operation, response, refusal) {
|
|
18
|
+
let message = `${operation} (HTTP ${response.status}). Ask for a fresh setup prompt if this link expired.`;
|
|
19
|
+
if (response.status === 426) {
|
|
20
|
+
message =
|
|
21
|
+
"Update TalentOS CLI: run npx --yes --prefer-online talentos@latest agent link again with your setup URL.";
|
|
22
|
+
}
|
|
23
|
+
else if (refusal) {
|
|
24
|
+
message = `${refusal.sentence}\n${refusal.dead ? "This link won't work again. " : ""}${NEW_PROMPT_STEP}`;
|
|
25
|
+
}
|
|
26
|
+
super(message);
|
|
14
27
|
this.status = response.status;
|
|
15
28
|
const seconds = Number(response.headers.get("Retry-After"));
|
|
16
29
|
this.retryAfterMs = Number.isFinite(seconds)
|
|
@@ -88,7 +101,9 @@ export async function redeemAgent(apiUrl, body) {
|
|
|
88
101
|
body: JSON.stringify(body),
|
|
89
102
|
});
|
|
90
103
|
if (!response.ok) {
|
|
91
|
-
throw new AgentHttpError("Could not redeem this link", response
|
|
104
|
+
throw new AgentHttpError("Could not redeem this link", response, response.status === 400
|
|
105
|
+
? await linkRefusal(response, body.token)
|
|
106
|
+
: undefined);
|
|
92
107
|
}
|
|
93
108
|
const value = await readJson(response);
|
|
94
109
|
if (!value ||
|
|
@@ -178,6 +193,31 @@ async function safeFetch(url, init = {}) {
|
|
|
178
193
|
throw new Error("Could not reach TalentOS. Check the network and try again.");
|
|
179
194
|
}
|
|
180
195
|
}
|
|
196
|
+
// The server's sentence for a refused link (#12215): why, and where to make a
|
|
197
|
+
// new one. Never a body that echoes the token.
|
|
198
|
+
async function linkRefusal(response, token) {
|
|
199
|
+
let value;
|
|
200
|
+
try {
|
|
201
|
+
value = await response.json();
|
|
202
|
+
}
|
|
203
|
+
catch {
|
|
204
|
+
return;
|
|
205
|
+
}
|
|
206
|
+
if (!value || typeof value !== "object") {
|
|
207
|
+
return;
|
|
208
|
+
}
|
|
209
|
+
const sentence = "error" in value ? value.error : undefined;
|
|
210
|
+
const code = "code" in value ? value.code : undefined;
|
|
211
|
+
return typeof sentence === "string" &&
|
|
212
|
+
sentence.length <= REFUSAL_MAX_LENGTH &&
|
|
213
|
+
ONE_LINE.test(sentence) &&
|
|
214
|
+
!sentence.includes(token)
|
|
215
|
+
? {
|
|
216
|
+
dead: typeof code === "string" && DEAD_LINK_CODES.has(code),
|
|
217
|
+
sentence,
|
|
218
|
+
}
|
|
219
|
+
: undefined;
|
|
220
|
+
}
|
|
181
221
|
async function readJson(response) {
|
|
182
222
|
try {
|
|
183
223
|
return await response.json();
|
package/package.json
CHANGED