@modelprofile.com/mcp-crossharness 5.5.0 → 5.7.0
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_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.codexappserverclient.d.ts +6 -0
- package/dist_ts/classes.codexappserverclient.js +36 -1
- package/dist_ts/functions.codexversion.d.ts +39 -0
- package/dist_ts/functions.codexversion.js +70 -0
- package/dist_ts/index.d.ts +1 -0
- package/dist_ts/index.js +2 -1
- package/package.json +4 -4
- package/readme.md +45 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.codexappserverclient.ts +36 -0
- package/ts/functions.codexversion.ts +88 -0
- package/ts/index.ts +1 -0
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@modelprofile.com/mcp-crossharness',
|
|
6
|
-
version: '5.
|
|
6
|
+
version: '5.7.0',
|
|
7
7
|
description: 'Connection-first MCP server for explicit OpenCode HTTP and Codex WebSocket session servers'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxvQ0FBb0M7SUFDMUMsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLDRGQUE0RjtDQUMxRyxDQUFBIn0=
|
|
@@ -50,6 +50,12 @@ export declare class CodexAppServerClient {
|
|
|
50
50
|
private readonly options;
|
|
51
51
|
state: 'connecting' | 'connected' | 'closed';
|
|
52
52
|
serverVersion?: string;
|
|
53
|
+
/** The server's absolute `$CODEX_HOME`; undefined when the server does not report it (Codex before 0.120). */
|
|
54
|
+
serverCodexHome?: string;
|
|
55
|
+
/** The server's Rust platform family, for example `unix` or `windows`; undefined before Codex 0.115. */
|
|
56
|
+
serverPlatformFamily?: string;
|
|
57
|
+
/** The server's Rust operating system, for example `linux`, `macos` or `windows`; undefined before Codex 0.115. */
|
|
58
|
+
serverPlatformOs?: string;
|
|
53
59
|
private socket?;
|
|
54
60
|
private started;
|
|
55
61
|
private requestCounter;
|
|
@@ -11,11 +11,40 @@ export class CodexAppServerRequestError extends Error {
|
|
|
11
11
|
this.name = 'CodexAppServerRequestError';
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
|
+
const invalidInitialize = (fieldArg) => new Error(`Codex server returned an invalid initialize ${fieldArg}`);
|
|
15
|
+
/** Codex reports Rust's `std::env::consts::FAMILY` and `OS`: short lowercase identifiers. */
|
|
16
|
+
const readPlatformName = (valueArg, fieldArg) => {
|
|
17
|
+
if (valueArg === undefined)
|
|
18
|
+
return undefined;
|
|
19
|
+
if (typeof valueArg !== 'string' || !/^[a-z][a-z0-9_]{0,63}$/.test(valueArg))
|
|
20
|
+
throw invalidInitialize(fieldArg);
|
|
21
|
+
return valueArg;
|
|
22
|
+
};
|
|
23
|
+
/** Codex reports `$CODEX_HOME` as an absolute path of the server's own platform. */
|
|
24
|
+
const readCodexHome = (valueArg, platformFamilyArg) => {
|
|
25
|
+
if (valueArg === undefined)
|
|
26
|
+
return undefined;
|
|
27
|
+
if (typeof valueArg !== 'string'
|
|
28
|
+
|| !valueArg.isWellFormed()
|
|
29
|
+
|| /[\u0000-\u001f\u007f-\u009f]/.test(valueArg)
|
|
30
|
+
|| Buffer.byteLength(valueArg, 'utf8') > 4096
|
|
31
|
+
// Windows: a drive root (`C:\`), a UNC share or a verbatim prefix (`\\server\`, `\\?\`).
|
|
32
|
+
|| !(platformFamilyArg === 'windows' ? /^(?:[A-Za-z]:[\\/]|\\\\)/ : /^\//).test(valueArg)) {
|
|
33
|
+
throw invalidInitialize('codexHome');
|
|
34
|
+
}
|
|
35
|
+
return valueArg;
|
|
36
|
+
};
|
|
14
37
|
/** Connection-scoped app-server protocol client. Process and approval policy belong to the caller. */
|
|
15
38
|
export class CodexAppServerClient {
|
|
16
39
|
options;
|
|
17
40
|
state = 'connecting';
|
|
18
41
|
serverVersion;
|
|
42
|
+
/** The server's absolute `$CODEX_HOME`; undefined when the server does not report it (Codex before 0.120). */
|
|
43
|
+
serverCodexHome;
|
|
44
|
+
/** The server's Rust platform family, for example `unix` or `windows`; undefined before Codex 0.115. */
|
|
45
|
+
serverPlatformFamily;
|
|
46
|
+
/** The server's Rust operating system, for example `linux`, `macos` or `windows`; undefined before Codex 0.115. */
|
|
47
|
+
serverPlatformOs;
|
|
19
48
|
socket;
|
|
20
49
|
started = false;
|
|
21
50
|
requestCounter = 0;
|
|
@@ -105,7 +134,13 @@ export class CodexAppServerClient {
|
|
|
105
134
|
if (!helpers.isRecord(initialized) || typeof initialized.userAgent !== 'string') {
|
|
106
135
|
throw new Error('Codex server returned an invalid initialize response');
|
|
107
136
|
}
|
|
137
|
+
const platformFamily = readPlatformName(initialized.platformFamily, 'platformFamily');
|
|
138
|
+
const platformOs = readPlatformName(initialized.platformOs, 'platformOs');
|
|
139
|
+
const codexHome = readCodexHome(initialized.codexHome, platformFamily);
|
|
108
140
|
this.serverVersion = initialized.userAgent.match(/\/(\d+\.\d+\.\d+[^\s]*)/)?.[1];
|
|
141
|
+
this.serverCodexHome = codexHome;
|
|
142
|
+
this.serverPlatformFamily = platformFamily;
|
|
143
|
+
this.serverPlatformOs = platformOs;
|
|
109
144
|
this.sendFrame({ method: 'initialized' });
|
|
110
145
|
this.assertOpen();
|
|
111
146
|
this.state = 'connected';
|
|
@@ -311,4 +346,4 @@ export class CodexAppServerClient {
|
|
|
311
346
|
return new CodexAppServerRequestError(signalArg.reason instanceof Error ? signalArg.reason.message : 'operation cancelled', dispatchedArg, undefined, { cause: signalArg.reason });
|
|
312
347
|
}
|
|
313
348
|
}
|
|
314
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.codexappserverclient.js","sourceRoot":"","sources":["../ts/classes.codexappserverclient.ts"],"names":[],"mappings":"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"}
|
|
349
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.codexappserverclient.js","sourceRoot":"","sources":["../ts/classes.codexappserverclient.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The first Codex release whose `app-server --listen unix://PATH` publishes the alias
|
|
3
|
+
* `codexUnixSocketTarget` and `observeCodexUnixSocket` verify. Earlier releases bind PATH
|
|
4
|
+
* directly, which this package refuses, so a consumer that relies on that contract refuses
|
|
5
|
+
* them up front, by version.
|
|
6
|
+
*/
|
|
7
|
+
export declare const CODEX_UNIX_SOCKET_MINIMUM_VERSION = "0.156.0";
|
|
8
|
+
/** A Codex release number as Codex prints it: `MAJOR.MINOR.PATCH` with an optional prerelease. */
|
|
9
|
+
export interface ICodexVersion {
|
|
10
|
+
major: number;
|
|
11
|
+
minor: number;
|
|
12
|
+
patch: number;
|
|
13
|
+
/** The prerelease after `-`, such as `alpha.2`, or null for a release. */
|
|
14
|
+
prerelease: string | null;
|
|
15
|
+
/** The exact text that was parsed. */
|
|
16
|
+
text: string;
|
|
17
|
+
}
|
|
18
|
+
/** `unreadable`: not a Codex release number. `below_minimum`: older than the required release. */
|
|
19
|
+
export type TCodexVersionUnsupportedReason = 'unreadable' | 'below_minimum';
|
|
20
|
+
/** A Codex whose version cannot be read, or is older than the release a consumer requires. */
|
|
21
|
+
export declare class CodexVersionUnsupportedError extends Error {
|
|
22
|
+
readonly reason: TCodexVersionUnsupportedReason;
|
|
23
|
+
/** The version text that was checked; null when none was reported. */
|
|
24
|
+
readonly version: string | null;
|
|
25
|
+
readonly minimum: string;
|
|
26
|
+
constructor(reasonArg: TCodexVersionUnsupportedReason, versionArg: string | null, minimumArg: string);
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Parses exactly one Codex release number, such as `0.157.1` or `0.158.0-alpha.2`. Anything else
|
|
30
|
+
* returns null: a prefix such as `codex-cli `, surrounding whitespace, build metadata, leading
|
|
31
|
+
* zeros or components beyond the safe integer range.
|
|
32
|
+
*/
|
|
33
|
+
export declare const parseCodexVersion: (textArg: string) => ICodexVersion | null;
|
|
34
|
+
/**
|
|
35
|
+
* Returns the parsed version when it is `minimumArg` or newer, and throws
|
|
36
|
+
* `CodexVersionUnsupportedError` otherwise. A prerelease of a newer release is accepted; a
|
|
37
|
+
* prerelease of the minimum itself is older than the minimum. The minimum must be a release.
|
|
38
|
+
*/
|
|
39
|
+
export declare const requireCodexVersion: (versionArg: string | null | undefined, minimumArg?: string) => ICodexVersion;
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The first Codex release whose `app-server --listen unix://PATH` publishes the alias
|
|
3
|
+
* `codexUnixSocketTarget` and `observeCodexUnixSocket` verify. Earlier releases bind PATH
|
|
4
|
+
* directly, which this package refuses, so a consumer that relies on that contract refuses
|
|
5
|
+
* them up front, by version.
|
|
6
|
+
*/
|
|
7
|
+
export const CODEX_UNIX_SOCKET_MINIMUM_VERSION = '0.156.0';
|
|
8
|
+
/** A Codex whose version cannot be read, or is older than the release a consumer requires. */
|
|
9
|
+
export class CodexVersionUnsupportedError extends Error {
|
|
10
|
+
reason;
|
|
11
|
+
/** The version text that was checked; null when none was reported. */
|
|
12
|
+
version;
|
|
13
|
+
minimum;
|
|
14
|
+
constructor(reasonArg, versionArg, minimumArg) {
|
|
15
|
+
super(reasonArg === 'unreadable'
|
|
16
|
+
? `Codex did not report a readable version; Codex ${minimumArg} or newer is required`
|
|
17
|
+
: `Codex ${versionArg} is older than the required Codex ${minimumArg}`);
|
|
18
|
+
this.name = 'CodexVersionUnsupportedError';
|
|
19
|
+
this.reason = reasonArg;
|
|
20
|
+
this.version = versionArg;
|
|
21
|
+
this.minimum = minimumArg;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
const maximumVersionLength = 64;
|
|
25
|
+
const numericPart = '(0|[1-9]\\d*)';
|
|
26
|
+
const prereleasePart = '(?:0|[1-9]\\d*|\\d*[A-Za-z-][0-9A-Za-z-]*)';
|
|
27
|
+
const versionPattern = new RegExp(`^${numericPart}\\.${numericPart}\\.${numericPart}(?:-(${prereleasePart}(?:\\.${prereleasePart})*))?$`);
|
|
28
|
+
/**
|
|
29
|
+
* Parses exactly one Codex release number, such as `0.157.1` or `0.158.0-alpha.2`. Anything else
|
|
30
|
+
* returns null: a prefix such as `codex-cli `, surrounding whitespace, build metadata, leading
|
|
31
|
+
* zeros or components beyond the safe integer range.
|
|
32
|
+
*/
|
|
33
|
+
export const parseCodexVersion = (textArg) => {
|
|
34
|
+
if (typeof textArg !== 'string' || textArg.length > maximumVersionLength)
|
|
35
|
+
return null;
|
|
36
|
+
const match = versionPattern.exec(textArg);
|
|
37
|
+
if (!match)
|
|
38
|
+
return null;
|
|
39
|
+
const [major, minor, patch] = [match[1], match[2], match[3]].map(Number);
|
|
40
|
+
if (![major, minor, patch].every(Number.isSafeInteger))
|
|
41
|
+
return null;
|
|
42
|
+
return { major, minor, patch, prerelease: match[4] ?? null, text: textArg };
|
|
43
|
+
};
|
|
44
|
+
/** Orders by release number; a prerelease precedes the release of the same number. */
|
|
45
|
+
const isBelow = (versionArg, minimumArg) => {
|
|
46
|
+
for (const key of ['major', 'minor', 'patch']) {
|
|
47
|
+
if (versionArg[key] !== minimumArg[key])
|
|
48
|
+
return versionArg[key] < minimumArg[key];
|
|
49
|
+
}
|
|
50
|
+
return versionArg.prerelease !== null;
|
|
51
|
+
};
|
|
52
|
+
/**
|
|
53
|
+
* Returns the parsed version when it is `minimumArg` or newer, and throws
|
|
54
|
+
* `CodexVersionUnsupportedError` otherwise. A prerelease of a newer release is accepted; a
|
|
55
|
+
* prerelease of the minimum itself is older than the minimum. The minimum must be a release.
|
|
56
|
+
*/
|
|
57
|
+
export const requireCodexVersion = (versionArg, minimumArg = CODEX_UNIX_SOCKET_MINIMUM_VERSION) => {
|
|
58
|
+
const minimum = parseCodexVersion(minimumArg);
|
|
59
|
+
if (!minimum || minimum.prerelease !== null) {
|
|
60
|
+
throw new Error('Codex minimum version must be a release number such as 0.156.0');
|
|
61
|
+
}
|
|
62
|
+
const reported = typeof versionArg === 'string' ? versionArg : null;
|
|
63
|
+
const version = reported === null ? null : parseCodexVersion(reported);
|
|
64
|
+
if (!version)
|
|
65
|
+
throw new CodexVersionUnsupportedError('unreadable', reported, minimumArg);
|
|
66
|
+
if (isBelow(version, minimum))
|
|
67
|
+
throw new CodexVersionUnsupportedError('below_minimum', reported, minimumArg);
|
|
68
|
+
return version;
|
|
69
|
+
};
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25zLmNvZGV4dmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2Z1bmN0aW9ucy5jb2RleHZlcnNpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7O0dBS0c7QUFDSCxNQUFNLENBQUMsTUFBTSxpQ0FBaUMsR0FBRyxTQUFTLENBQUM7QUFnQjNELDhGQUE4RjtBQUM5RixNQUFNLE9BQU8sNEJBQTZCLFNBQVEsS0FBSztJQUNyQyxNQUFNLENBQWlDO0lBQ3ZELHNFQUFzRTtJQUN0RCxPQUFPLENBQWdCO0lBQ3ZCLE9BQU8sQ0FBUztJQUVoQyxZQUFZLFNBQXlDLEVBQUUsVUFBeUIsRUFBRSxVQUFrQjtRQUNsRyxLQUFLLENBQUMsU0FBUyxLQUFLLFlBQVk7WUFDOUIsQ0FBQyxDQUFDLGtEQUFrRCxVQUFVLHVCQUF1QjtZQUNyRixDQUFDLENBQUMsU0FBUyxVQUFVLHFDQUFxQyxVQUFVLEVBQUUsQ0FBQyxDQUFDO1FBQzFFLElBQUksQ0FBQyxJQUFJLEdBQUcsOEJBQThCLENBQUM7UUFDM0MsSUFBSSxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUM7UUFDeEIsSUFBSSxDQUFDLE9BQU8sR0FBRyxVQUFVLENBQUM7UUFDMUIsSUFBSSxDQUFDLE9BQU8sR0FBRyxVQUFVLENBQUM7SUFDNUIsQ0FBQztDQUNGO0FBRUQsTUFBTSxvQkFBb0IsR0FBRyxFQUFFLENBQUM7QUFDaEMsTUFBTSxXQUFXLEdBQUcsZUFBZSxDQUFDO0FBQ3BDLE1BQU0sY0FBYyxHQUFHLDRDQUE0QyxDQUFDO0FBQ3BFLE1BQU0sY0FBYyxHQUFHLElBQUksTUFBTSxDQUMvQixJQUFJLFdBQVcsTUFBTSxXQUFXLE1BQU0sV0FBVyxRQUFRLGNBQWMsU0FBUyxjQUFjLFFBQVEsQ0FDdkcsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FBRyxDQUFDLE9BQWUsRUFBd0IsRUFBRTtJQUN6RSxJQUFJLE9BQU8s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
|
package/dist_ts/index.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export * from './interfaces.js';
|
|
2
2
|
export * from './classes.codexappserverclient.js';
|
|
3
3
|
export * from './functions.codexunixsocket.js';
|
|
4
|
+
export * from './functions.codexversion.js';
|
|
4
5
|
export * from './classes.connectionregistry.js';
|
|
5
6
|
export * from './classes.dispatchregistry.js';
|
|
6
7
|
export * from './classes.mcptoolregistrar.js';
|
package/dist_ts/index.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export * from './interfaces.js';
|
|
2
2
|
export * from './classes.codexappserverclient.js';
|
|
3
3
|
export * from './functions.codexunixsocket.js';
|
|
4
|
+
export * from './functions.codexversion.js';
|
|
4
5
|
export * from './classes.connectionregistry.js';
|
|
5
6
|
export * from './classes.dispatchregistry.js';
|
|
6
7
|
export * from './classes.mcptoolregistrar.js';
|
|
@@ -9,4 +10,4 @@ import { CrossHarnessMcpServer } from './classes.mcpserver.js';
|
|
|
9
10
|
export const runCli = async () => {
|
|
10
11
|
await new CrossHarnessMcpServer().start();
|
|
11
12
|
};
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsbUNBQW1DLENBQUM7QUFDbEQsY0FBYyxnQ0FBZ0MsQ0FBQztBQUMvQyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsaUNBQWlDLENBQUM7QUFDaEQsY0FBYywrQkFBK0IsQ0FBQztBQUM5QyxjQUFjLCtCQUErQixDQUFDO0FBQzlDLGNBQWMsd0JBQXdCLENBQUM7QUFFdkMsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFL0QsTUFBTSxDQUFDLE1BQU0sTUFBTSxHQUFHLEtBQUssSUFBbUIsRUFBRTtJQUM5QyxNQUFNLElBQUkscUJBQXFCLEVBQUUsQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUM1QyxDQUFDLENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@modelprofile.com/mcp-crossharness",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.7.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Connection-first MCP server for explicit OpenCode HTTP and Codex WebSocket session servers",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -24,9 +24,9 @@
|
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
26
|
"@git.zone/tsbuild": "^5.0.0",
|
|
27
|
-
"@git.zone/tsrun": "^3.0.
|
|
28
|
-
"@git.zone/tstest": "^6.2
|
|
29
|
-
"@types/node": "^26.6.
|
|
27
|
+
"@git.zone/tsrun": "^3.0.1",
|
|
28
|
+
"@git.zone/tstest": "^6.3.2",
|
|
29
|
+
"@types/node": "^26.6.2",
|
|
30
30
|
"@types/ws": "^8.18.1"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
package/readme.md
CHANGED
|
@@ -189,6 +189,19 @@ Outgoing buffers are capped at 4 MiB and pending requests at 256 in each directi
|
|
|
189
189
|
as integer milliseconds from 1 to 120,000; each defaults to 5,000. For a cold local
|
|
190
190
|
subprocess, set `initializeTimeoutMs: 30000`. Expiry closes the connection without retrying.
|
|
191
191
|
|
|
192
|
+
After `connect()`, the client exposes what the server reported in its initialize response:
|
|
193
|
+
`serverVersion` (parsed from its user agent), `serverCodexHome` (the server's absolute
|
|
194
|
+
`$CODEX_HOME`), `serverPlatformFamily` (for example `unix` or `windows`) and `serverPlatformOs`
|
|
195
|
+
(for example `linux`, `macos` or `windows`). Each is undefined when the server omits it:
|
|
196
|
+
Codex before 0.115 reports no platform and Codex before 0.120 no `codexHome`. A consumer
|
|
197
|
+
that rejoins a restarted daemon can compare `serverCodexHome` with the value it saw before
|
|
198
|
+
to confirm the same thread store. The client compares nothing itself. A reported but
|
|
199
|
+
malformed value closes the connection and rejects `connect()` with
|
|
200
|
+
`Codex server returned an invalid initialize <field>`. `codexHome` must be absolute on the
|
|
201
|
+
reported platform family (`/…`, or for `windows` a drive, UNC or verbatim prefix), well-formed
|
|
202
|
+
Unicode without control characters, and at most 4096 UTF-8 bytes. The platform fields must be
|
|
203
|
+
lowercase identifiers of at most 64 characters.
|
|
204
|
+
|
|
192
205
|
Server request handlers return immediately so notifications continue during human input.
|
|
193
206
|
Each request carries an `AbortSignal`, aborted when it is answered, resolved by the server,
|
|
194
207
|
or disconnected. `respond(id, result)` and `rejectRequest(id, code, message)` return false
|
|
@@ -247,6 +260,38 @@ plain `Error`s with these exact messages:
|
|
|
247
260
|
|
|
248
261
|
Filesystem errors other than a missing path propagate unchanged.
|
|
249
262
|
|
|
263
|
+
### Codex version floor
|
|
264
|
+
|
|
265
|
+
A consumer that relies on the alias contract refuses an older Codex by version before it
|
|
266
|
+
starts one. `CODEX_UNIX_SOCKET_MINIMUM_VERSION` is `'0.156.0'`, the first release that
|
|
267
|
+
publishes the alias, and `requireCodexVersion` checks a version against it:
|
|
268
|
+
|
|
269
|
+
```typescript
|
|
270
|
+
import { CodexVersionUnsupportedError, requireCodexVersion } from '@modelprofile.com/mcp-crossharness';
|
|
271
|
+
|
|
272
|
+
await client.connect();
|
|
273
|
+
requireCodexVersion(client.serverVersion); // throws CodexVersionUnsupportedError below 0.156.0
|
|
274
|
+
```
|
|
275
|
+
|
|
276
|
+
`parseCodexVersion(text)` reads exactly one release number, `MAJOR.MINOR.PATCH` with an
|
|
277
|
+
optional prerelease such as `0.158.0-alpha.2`, and returns `{ major, minor, patch, prerelease, text }`,
|
|
278
|
+
or `null` for anything else: a prefix such as `codex-cli `, surrounding whitespace, build
|
|
279
|
+
metadata, leading zeros or a component beyond the safe integer range. Strip Codex's own
|
|
280
|
+
prefix before parsing.
|
|
281
|
+
|
|
282
|
+
`requireCodexVersion(version, minimum?)` returns the parsed version when it is the minimum or
|
|
283
|
+
newer. The minimum defaults to `CODEX_UNIX_SOCKET_MINIMUM_VERSION`; a consumer that needs a
|
|
284
|
+
later release for its own reasons passes that release, which must be a release number and not
|
|
285
|
+
a prerelease. A prerelease of a newer release is accepted; a prerelease of the minimum itself
|
|
286
|
+
is older than the minimum. Otherwise it throws `CodexVersionUnsupportedError`, whose `reason`
|
|
287
|
+
is `'unreadable'` (no version, or not a release number) or `'below_minimum'`, with the checked
|
|
288
|
+
`version` (null when none was reported) and the `minimum`:
|
|
289
|
+
|
|
290
|
+
| Message | Reason |
|
|
291
|
+
| --- | --- |
|
|
292
|
+
| `Codex did not report a readable version; Codex <minimum> or newer is required` | `unreadable` |
|
|
293
|
+
| `Codex <version> is older than the required Codex <minimum>` | `below_minimum` |
|
|
294
|
+
|
|
250
295
|
### Composable tool registration
|
|
251
296
|
|
|
252
297
|
`CrossHarnessMcpToolRegistrar` registers the same nine Crossharness tools used by the standalone
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -55,10 +55,40 @@ export class CodexAppServerRequestError extends Error {
|
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
57
|
|
|
58
|
+
const invalidInitialize = (fieldArg: string): Error =>
|
|
59
|
+
new Error(`Codex server returned an invalid initialize ${fieldArg}`);
|
|
60
|
+
|
|
61
|
+
/** Codex reports Rust's `std::env::consts::FAMILY` and `OS`: short lowercase identifiers. */
|
|
62
|
+
const readPlatformName = (valueArg: unknown, fieldArg: 'platformFamily' | 'platformOs'): string | undefined => {
|
|
63
|
+
if (valueArg === undefined) return undefined;
|
|
64
|
+
if (typeof valueArg !== 'string' || !/^[a-z][a-z0-9_]{0,63}$/.test(valueArg)) throw invalidInitialize(fieldArg);
|
|
65
|
+
return valueArg;
|
|
66
|
+
};
|
|
67
|
+
|
|
68
|
+
/** Codex reports `$CODEX_HOME` as an absolute path of the server's own platform. */
|
|
69
|
+
const readCodexHome = (valueArg: unknown, platformFamilyArg: string | undefined): string | undefined => {
|
|
70
|
+
if (valueArg === undefined) return undefined;
|
|
71
|
+
if (typeof valueArg !== 'string'
|
|
72
|
+
|| !valueArg.isWellFormed()
|
|
73
|
+
|| /[\u0000-\u001f\u007f-\u009f]/.test(valueArg)
|
|
74
|
+
|| Buffer.byteLength(valueArg, 'utf8') > 4096
|
|
75
|
+
// Windows: a drive root (`C:\`), a UNC share or a verbatim prefix (`\\server\`, `\\?\`).
|
|
76
|
+
|| !(platformFamilyArg === 'windows' ? /^(?:[A-Za-z]:[\\/]|\\\\)/ : /^\//).test(valueArg)) {
|
|
77
|
+
throw invalidInitialize('codexHome');
|
|
78
|
+
}
|
|
79
|
+
return valueArg;
|
|
80
|
+
};
|
|
81
|
+
|
|
58
82
|
/** Connection-scoped app-server protocol client. Process and approval policy belong to the caller. */
|
|
59
83
|
export class CodexAppServerClient {
|
|
60
84
|
public state: 'connecting' | 'connected' | 'closed' = 'connecting';
|
|
61
85
|
public serverVersion?: string;
|
|
86
|
+
/** The server's absolute `$CODEX_HOME`; undefined when the server does not report it (Codex before 0.120). */
|
|
87
|
+
public serverCodexHome?: string;
|
|
88
|
+
/** The server's Rust platform family, for example `unix` or `windows`; undefined before Codex 0.115. */
|
|
89
|
+
public serverPlatformFamily?: string;
|
|
90
|
+
/** The server's Rust operating system, for example `linux`, `macos` or `windows`; undefined before Codex 0.115. */
|
|
91
|
+
public serverPlatformOs?: string;
|
|
62
92
|
private socket?: InstanceType<typeof plugins.WsWebSocket>;
|
|
63
93
|
private started = false;
|
|
64
94
|
private requestCounter = 0;
|
|
@@ -149,7 +179,13 @@ export class CodexAppServerClient {
|
|
|
149
179
|
if (!helpers.isRecord(initialized) || typeof initialized.userAgent !== 'string') {
|
|
150
180
|
throw new Error('Codex server returned an invalid initialize response');
|
|
151
181
|
}
|
|
182
|
+
const platformFamily = readPlatformName(initialized.platformFamily, 'platformFamily');
|
|
183
|
+
const platformOs = readPlatformName(initialized.platformOs, 'platformOs');
|
|
184
|
+
const codexHome = readCodexHome(initialized.codexHome, platformFamily);
|
|
152
185
|
this.serverVersion = initialized.userAgent.match(/\/(\d+\.\d+\.\d+[^\s]*)/)?.[1];
|
|
186
|
+
this.serverCodexHome = codexHome;
|
|
187
|
+
this.serverPlatformFamily = platformFamily;
|
|
188
|
+
this.serverPlatformOs = platformOs;
|
|
153
189
|
this.sendFrame({ method: 'initialized' });
|
|
154
190
|
this.assertOpen();
|
|
155
191
|
this.state = 'connected';
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The first Codex release whose `app-server --listen unix://PATH` publishes the alias
|
|
3
|
+
* `codexUnixSocketTarget` and `observeCodexUnixSocket` verify. Earlier releases bind PATH
|
|
4
|
+
* directly, which this package refuses, so a consumer that relies on that contract refuses
|
|
5
|
+
* them up front, by version.
|
|
6
|
+
*/
|
|
7
|
+
export const CODEX_UNIX_SOCKET_MINIMUM_VERSION = '0.156.0';
|
|
8
|
+
|
|
9
|
+
/** A Codex release number as Codex prints it: `MAJOR.MINOR.PATCH` with an optional prerelease. */
|
|
10
|
+
export interface ICodexVersion {
|
|
11
|
+
major: number;
|
|
12
|
+
minor: number;
|
|
13
|
+
patch: number;
|
|
14
|
+
/** The prerelease after `-`, such as `alpha.2`, or null for a release. */
|
|
15
|
+
prerelease: string | null;
|
|
16
|
+
/** The exact text that was parsed. */
|
|
17
|
+
text: string;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
/** `unreadable`: not a Codex release number. `below_minimum`: older than the required release. */
|
|
21
|
+
export type TCodexVersionUnsupportedReason = 'unreadable' | 'below_minimum';
|
|
22
|
+
|
|
23
|
+
/** A Codex whose version cannot be read, or is older than the release a consumer requires. */
|
|
24
|
+
export class CodexVersionUnsupportedError extends Error {
|
|
25
|
+
public readonly reason: TCodexVersionUnsupportedReason;
|
|
26
|
+
/** The version text that was checked; null when none was reported. */
|
|
27
|
+
public readonly version: string | null;
|
|
28
|
+
public readonly minimum: string;
|
|
29
|
+
|
|
30
|
+
constructor(reasonArg: TCodexVersionUnsupportedReason, versionArg: string | null, minimumArg: string) {
|
|
31
|
+
super(reasonArg === 'unreadable'
|
|
32
|
+
? `Codex did not report a readable version; Codex ${minimumArg} or newer is required`
|
|
33
|
+
: `Codex ${versionArg} is older than the required Codex ${minimumArg}`);
|
|
34
|
+
this.name = 'CodexVersionUnsupportedError';
|
|
35
|
+
this.reason = reasonArg;
|
|
36
|
+
this.version = versionArg;
|
|
37
|
+
this.minimum = minimumArg;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
const maximumVersionLength = 64;
|
|
42
|
+
const numericPart = '(0|[1-9]\\d*)';
|
|
43
|
+
const prereleasePart = '(?:0|[1-9]\\d*|\\d*[A-Za-z-][0-9A-Za-z-]*)';
|
|
44
|
+
const versionPattern = new RegExp(
|
|
45
|
+
`^${numericPart}\\.${numericPart}\\.${numericPart}(?:-(${prereleasePart}(?:\\.${prereleasePart})*))?$`,
|
|
46
|
+
);
|
|
47
|
+
|
|
48
|
+
/**
|
|
49
|
+
* Parses exactly one Codex release number, such as `0.157.1` or `0.158.0-alpha.2`. Anything else
|
|
50
|
+
* returns null: a prefix such as `codex-cli `, surrounding whitespace, build metadata, leading
|
|
51
|
+
* zeros or components beyond the safe integer range.
|
|
52
|
+
*/
|
|
53
|
+
export const parseCodexVersion = (textArg: string): ICodexVersion | null => {
|
|
54
|
+
if (typeof textArg !== 'string' || textArg.length > maximumVersionLength) return null;
|
|
55
|
+
const match = versionPattern.exec(textArg);
|
|
56
|
+
if (!match) return null;
|
|
57
|
+
const [major, minor, patch] = [match[1], match[2], match[3]].map(Number);
|
|
58
|
+
if (![major, minor, patch].every(Number.isSafeInteger)) return null;
|
|
59
|
+
return { major, minor, patch, prerelease: match[4] ?? null, text: textArg };
|
|
60
|
+
};
|
|
61
|
+
|
|
62
|
+
/** Orders by release number; a prerelease precedes the release of the same number. */
|
|
63
|
+
const isBelow = (versionArg: ICodexVersion, minimumArg: ICodexVersion): boolean => {
|
|
64
|
+
for (const key of ['major', 'minor', 'patch'] as const) {
|
|
65
|
+
if (versionArg[key] !== minimumArg[key]) return versionArg[key] < minimumArg[key];
|
|
66
|
+
}
|
|
67
|
+
return versionArg.prerelease !== null;
|
|
68
|
+
};
|
|
69
|
+
|
|
70
|
+
/**
|
|
71
|
+
* Returns the parsed version when it is `minimumArg` or newer, and throws
|
|
72
|
+
* `CodexVersionUnsupportedError` otherwise. A prerelease of a newer release is accepted; a
|
|
73
|
+
* prerelease of the minimum itself is older than the minimum. The minimum must be a release.
|
|
74
|
+
*/
|
|
75
|
+
export const requireCodexVersion = (
|
|
76
|
+
versionArg: string | null | undefined,
|
|
77
|
+
minimumArg: string = CODEX_UNIX_SOCKET_MINIMUM_VERSION,
|
|
78
|
+
): ICodexVersion => {
|
|
79
|
+
const minimum = parseCodexVersion(minimumArg);
|
|
80
|
+
if (!minimum || minimum.prerelease !== null) {
|
|
81
|
+
throw new Error('Codex minimum version must be a release number such as 0.156.0');
|
|
82
|
+
}
|
|
83
|
+
const reported = typeof versionArg === 'string' ? versionArg : null;
|
|
84
|
+
const version = reported === null ? null : parseCodexVersion(reported);
|
|
85
|
+
if (!version) throw new CodexVersionUnsupportedError('unreadable', reported, minimumArg);
|
|
86
|
+
if (isBelow(version, minimum)) throw new CodexVersionUnsupportedError('below_minimum', reported, minimumArg);
|
|
87
|
+
return version;
|
|
88
|
+
};
|
package/ts/index.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export * from './interfaces.js';
|
|
2
2
|
export * from './classes.codexappserverclient.js';
|
|
3
3
|
export * from './functions.codexunixsocket.js';
|
|
4
|
+
export * from './functions.codexversion.js';
|
|
4
5
|
export * from './classes.connectionregistry.js';
|
|
5
6
|
export * from './classes.dispatchregistry.js';
|
|
6
7
|
export * from './classes.mcptoolregistrar.js';
|