@omniaseo/cli 0.1.0 → 0.1.1
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/README.md +4 -2
- package/dist/codex/config.d.ts +2 -0
- package/dist/codex/config.d.ts.map +1 -1
- package/dist/codex/config.js +82 -8
- package/dist/codex/config.js.map +1 -1
- package/dist/commands/connect.d.ts.map +1 -1
- package/dist/commands/connect.js +26 -42
- package/dist/commands/connect.js.map +1 -1
- package/dist/commands/doctor.js +1 -1
- package/dist/index.js +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -5,7 +5,7 @@ Node 24 CLI for initializing a non-secret Omnia Connect workspace and connecting
|
|
|
5
5
|
With Node 24 and Codex CLI installed, run the ready-to-use connection command from the Omniaseo Connect page. It downloads this CLI automatically, opens the native browser authorization and checks a workspace read; no manual OAuth settings are required. The command pins the release, for example:
|
|
6
6
|
|
|
7
7
|
```bash
|
|
8
|
-
npx --yes @omniaseo/cli@0.1.
|
|
8
|
+
npx --yes @omniaseo/cli@0.1.1 connect codex --url https://connect.example.com/mcp --resource https://connect.example.com
|
|
9
9
|
```
|
|
10
10
|
|
|
11
11
|
Use the command supplied by your workspace so its server addresses are correct. Already-open Codex applications must restart after setup to load the connection settings.
|
|
@@ -30,6 +30,8 @@ Offline consent is separate from tool permissions. The Omnia issuer keeps access
|
|
|
30
30
|
|
|
31
31
|
`omnia connect codex` checks the installed Codex feature capabilities before changing configuration or starting OAuth. For compatible versions it enables coordinated OAuth renewal automatically, with a backup of the existing config and preservation of unrelated settings and comments. Customers do not need to edit flags. Restart already-open Codex applications after setup so their existing connections adopt the setting. An unsupported Codex version receives an update instruction; an explicit conflicting preference is left unchanged and reported before login.
|
|
32
32
|
|
|
33
|
-
The setting is Codex-wide (`features.mcp_oauth_refresh_coordination = true`), not limited to the Omniaseo server. Upstream still marks it experimental. Windows Codex `0.155.0-alpha.9.2` passed two real access-token expiry/renewal cycles, process restart and revocation with this setting; this is not a compatibility claim for every Codex release or other MCP hosts. The installer checks support rather than assuming it from a version number.
|
|
33
|
+
The setting is Codex-wide (`features.mcp_oauth_refresh_coordination = true`), not limited to the Omniaseo server. Upstream still marks it experimental. Windows Codex `0.155.0-alpha.9.2` passed two real access-token expiry/renewal cycles, process restart and revocation with this setting; this is not a compatibility claim for every Codex release or other MCP hosts. The installer checks support rather than assuming it from a version number. The immediate read-only smoke uses the same effective user and project configuration as setup, without feature or server overrides. This detects configuration conflicts but does not replace the timed renewal acceptance test. A reported stable capability is accepted without matching a release number; an absent capability is not assumed safe.
|
|
34
34
|
|
|
35
35
|
The CLI archive bundles its private contract dependency so installation does not require a repository checkout. Codex retains custody of all OAuth credentials; this compatibility setup changes only non-secret configuration. Public distribution does not establish compatibility with untested clients or authorize production promotion.
|
|
36
|
+
|
|
37
|
+
Existing connections are migrated in place only when their endpoint and authorization settings agree. A missing OAuth resource is added without replacing the table, its comments or other MCP servers. Disabled connections, incompatible tool filters, different resources and existing authentication headers require resolving the conflict or choosing a separate connection name; setup does not widen those preferences. Every changed file has a backup.
|
package/dist/codex/config.d.ts
CHANGED
|
@@ -4,6 +4,8 @@ export type CodexServerConfig = {
|
|
|
4
4
|
resource: string;
|
|
5
5
|
};
|
|
6
6
|
export declare const CODEX_REFRESH_FEATURE = "mcp_oauth_refresh_coordination";
|
|
7
|
+
/** Validate only the requested connection; never widen user-owned access settings. */
|
|
8
|
+
export declare function validateCodexServer(value: unknown, server: CodexServerConfig): void;
|
|
7
9
|
export declare function mergeCodexServerConfig(server: CodexServerConfig, env?: NodeJS.ProcessEnv, options?: {
|
|
8
10
|
refreshCoordination?: boolean;
|
|
9
11
|
preserveExistingServer?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/codex/config.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,qBAAqB,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/codex/config.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,qBAAqB,mCAAmC,CAAC;AA2CtE,sFAAsF;AACtF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAqBnF;AAuCD,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,iBAAiB,EACzB,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAAC,sBAAsB,CAAC,EAAE,OAAO,CAAA;CAAO,GAChF,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA0C5C"}
|
package/dist/codex/config.js
CHANGED
|
@@ -30,9 +30,6 @@ function enableRefreshCoordination(original) {
|
|
|
30
30
|
return false;
|
|
31
31
|
}
|
|
32
32
|
};
|
|
33
|
-
const prefixed = `features.${assignment}${newline}${original}`;
|
|
34
|
-
if (matchesExpected(prefixed))
|
|
35
|
-
return prefixed;
|
|
36
33
|
const headers = /^\s*\[\s*(?:features|"features"|'features')\s*\][^\r\n]*(?:\r?\n|$)/gmu;
|
|
37
34
|
for (const match of original.matchAll(headers)) {
|
|
38
35
|
const position = match.index + match[0].length;
|
|
@@ -50,8 +47,82 @@ function enableRefreshCoordination(original) {
|
|
|
50
47
|
return candidate;
|
|
51
48
|
}
|
|
52
49
|
}
|
|
50
|
+
// A dotted key may only introduce the table when no explicit/inline table
|
|
51
|
+
// was found. Prepending it before [features] redefines the table in Rust TOML.
|
|
52
|
+
const prefixed = `features.${assignment}${newline}${original}`;
|
|
53
|
+
if (matchesExpected(prefixed))
|
|
54
|
+
return prefixed;
|
|
53
55
|
throw new Error('Codex compatibility settings could not be added without changing existing configuration');
|
|
54
56
|
}
|
|
57
|
+
/** Validate only the requested connection; never widen user-owned access settings. */
|
|
58
|
+
export function validateCodexServer(value, server) {
|
|
59
|
+
if (!value || typeof value !== 'object' || Array.isArray(value))
|
|
60
|
+
throw new Error('Codex connection is not a table');
|
|
61
|
+
const entry = value;
|
|
62
|
+
const transport = entry.transport && typeof entry.transport === 'object'
|
|
63
|
+
? entry.transport : entry;
|
|
64
|
+
if (transport.url !== server.url)
|
|
65
|
+
throw new Error('Codex connection already points to a different URL');
|
|
66
|
+
const resource = entry.oauth_resource ?? transport.oauth_resource;
|
|
67
|
+
if (resource !== undefined && resource !== null && resource !== server.resource)
|
|
68
|
+
throw new Error('Codex connection has a conflicting OAuth resource');
|
|
69
|
+
if (entry.enabled === false)
|
|
70
|
+
throw new Error('This Codex connection is disabled. Enable it in Codex before connecting again');
|
|
71
|
+
if (entry.enabled_tools != null && (!Array.isArray(entry.enabled_tools) || !entry.enabled_tools.includes('omnia_workspace_get_context'))) {
|
|
72
|
+
throw new Error('The existing allowed tools exclude the connection check. Review this connection in Codex');
|
|
73
|
+
}
|
|
74
|
+
if (entry.disabled_tools != null && (!Array.isArray(entry.disabled_tools) || entry.disabled_tools.includes('omnia_workspace_get_context'))) {
|
|
75
|
+
throw new Error('The existing blocked tools exclude the connection check. Review this connection in Codex');
|
|
76
|
+
}
|
|
77
|
+
for (const field of ['bearer_token', 'bearer_token_env_var', 'http_headers', 'env_http_headers']) {
|
|
78
|
+
const configured = entry[field] ?? transport[field];
|
|
79
|
+
if (configured != null && configured !== '' && (typeof configured !== 'object' || Object.keys(configured).length > 0)) {
|
|
80
|
+
throw new Error('This connection uses existing authentication settings. Use a separate connection name to preserve them');
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
function migrateExistingServer(original, server) {
|
|
85
|
+
const parsed = TOML.parse(original);
|
|
86
|
+
const servers = parsed.mcp_servers;
|
|
87
|
+
const current = servers?.[server.name];
|
|
88
|
+
if (!current)
|
|
89
|
+
return original;
|
|
90
|
+
validateCodexServer(current, server);
|
|
91
|
+
if (current.oauth_resource === server.resource)
|
|
92
|
+
return original;
|
|
93
|
+
const expected = { ...parsed, mcp_servers: { ...servers, [server.name]: { ...current, oauth_resource: server.resource } } };
|
|
94
|
+
const newline = original.includes('\r\n') ? '\r\n' : '\n';
|
|
95
|
+
const assignment = `oauth_resource = ${JSON.stringify(server.resource)}`;
|
|
96
|
+
const matches = (candidate) => {
|
|
97
|
+
try {
|
|
98
|
+
return isDeepStrictEqual(TOML.parse(candidate), expected);
|
|
99
|
+
}
|
|
100
|
+
catch {
|
|
101
|
+
return false;
|
|
102
|
+
}
|
|
103
|
+
};
|
|
104
|
+
// Exact document comparison makes these insertions safe for quoted, dotted,
|
|
105
|
+
// inline and commented TOML while retaining every unrelated byte.
|
|
106
|
+
for (const match of original.matchAll(/^.*\][^\r\n]*(?:\r?\n|$)/gmu)) {
|
|
107
|
+
const position = match.index + match[0].length;
|
|
108
|
+
const candidate = `${original.slice(0, position)}${match[0].endsWith('\n') ? '' : newline}${assignment}${newline}${original.slice(position)}`;
|
|
109
|
+
if (matches(candidate))
|
|
110
|
+
return candidate;
|
|
111
|
+
}
|
|
112
|
+
for (const match of original.matchAll(/\}/gu)) {
|
|
113
|
+
for (const separator of ['', ', ']) {
|
|
114
|
+
const candidate = `${original.slice(0, match.index)}${separator}${assignment}${original.slice(match.index)}`;
|
|
115
|
+
if (matches(candidate))
|
|
116
|
+
return candidate;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
// Keep dotted-only configurations dotted, but prefer insertion into an
|
|
120
|
+
// existing table: dotted prefixes followed by [table] are invalid TOML.
|
|
121
|
+
const prefixed = `mcp_servers.${JSON.stringify(server.name)}.${assignment}${newline}${original}`;
|
|
122
|
+
if (matches(prefixed))
|
|
123
|
+
return prefixed;
|
|
124
|
+
throw new Error('The existing connection could not be updated safely. Use a separate connection name');
|
|
125
|
+
}
|
|
55
126
|
function configPath(env) {
|
|
56
127
|
return join(env.CODEX_HOME ?? join(homedir(), '.codex'), 'config.toml');
|
|
57
128
|
}
|
|
@@ -68,13 +139,13 @@ export async function mergeCodexServerConfig(server, env = process.env, options
|
|
|
68
139
|
throw new CliError('Codex config.toml is invalid; refusing to rewrite it', 'CODEX_CONFIG_INVALID', EXIT.CONFIG_CONFLICT);
|
|
69
140
|
}
|
|
70
141
|
const unmanagedHeader = `[mcp_servers.${server.name}]`;
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
}
|
|
142
|
+
const parsed = TOML.parse(original || '# empty\n');
|
|
143
|
+
const existingServer = parsed.mcp_servers?.[server.name];
|
|
74
144
|
let merged;
|
|
75
145
|
try {
|
|
76
|
-
const
|
|
77
|
-
|
|
146
|
+
const migrated = existingServer === undefined ? original : migrateExistingServer(original, server);
|
|
147
|
+
const configured = options.refreshCoordination ? enableRefreshCoordination(migrated) : migrated;
|
|
148
|
+
merged = existingServer !== undefined
|
|
78
149
|
? { content: configured, changed: configured !== original }
|
|
79
150
|
: mergeManagedBlock(configured, `mcp-${server.name}`, [
|
|
80
151
|
unmanagedHeader,
|
|
@@ -90,6 +161,9 @@ export async function mergeCodexServerConfig(server, env = process.env, options
|
|
|
90
161
|
}
|
|
91
162
|
if (!merged.changed)
|
|
92
163
|
return { path };
|
|
164
|
+
if ((await readText(path) ?? '') !== original) {
|
|
165
|
+
throw new CliError('Codex settings changed during setup. Run setup again', 'CODEX_CONFIG_CONFLICT', EXIT.CONFIG_CONFLICT);
|
|
166
|
+
}
|
|
93
167
|
const saved = await backup(path, join(env.CODEX_HOME ?? join(homedir(), '.codex'), 'backups'));
|
|
94
168
|
await atomicWrite(path, merged.content, 0o600);
|
|
95
169
|
return { path, ...(saved ? { backup: saved } : {}) };
|
package/dist/codex/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/codex/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAQnF,MAAM,CAAC,MAAM,qBAAqB,GAAG,gCAAgC,CAAC;AAEtE,SAAS,yBAAyB,CAAC,QAAgB;IACjD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,WAAW,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IACjC,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,QAAQ,KAAK,IAAI,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,YAAY,IAAI,CAAC,EAAE,CAAC;QACzI,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;IACjE,CAAC;IACD,MAAM,OAAO,GAAG,QAAQ,EAAE,CAAC,qBAAqB,CAAC,CAAC;IAClD,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO,QAAQ,CAAC;IACtC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,qHAAqH,CAAC,CAAC;IACzI,CAAC;IACD,MAAM,QAAQ,GAAG,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,EAAE,GAAG,QAAQ,EAAE,CAAC,qBAAqB,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC;IACzF,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1D,MAAM,UAAU,GAAG,GAAG,qBAAqB,SAAS,CAAC;IACrD,8EAA8E;IAC9E,2EAA2E;IAC3E,MAAM,eAAe,GAAG,CAAC,SAAiB,EAAW,EAAE;QACrD,IAAI,CAAC;YAAC,OAAO,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC;YAAC,OAAO,KAAK,CAAC;QAAC,CAAC;IAC5F,CAAC,CAAC;IACF,MAAM,QAAQ,GAAG,YAAY,UAAU,GAAG,OAAO,GAAG,QAAQ,EAAE,CAAC;IAC/D,IAAI,eAAe,CAAC,QAAQ,CAAC;QAAE,OAAO,QAAQ,CAAC;IAC/C,MAAM,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/codex/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../src/commands/connect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAiB,aAAa,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../src/commands/connect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAiB,aAAa,EAAE,MAAM,sBAAsB,CAAC;AA0EzE,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,aAAa,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,qBAAqB,GAAG,UAAU,CAAC;IACjD,KAAK,EAAE,WAAW,CAAC;IACnB,KAAK,EAAE,QAAQ,GAAG,0BAA0B,CAAC;IAC7C,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,wBAAsB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA8F5F;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAY9F;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAS/F"}
|
package/dist/commands/connect.js
CHANGED
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import { CliError, EXIT } from '../errors.js';
|
|
2
|
-
import { CODEX_REFRESH_FEATURE, mergeCodexServerConfig } from '../codex/config.js';
|
|
2
|
+
import { CODEX_REFRESH_FEATURE, mergeCodexServerConfig, validateCodexServer } from '../codex/config.js';
|
|
3
3
|
import { WORKSPACE_CONTEXT_ACTION } from '../contracts.js';
|
|
4
|
-
import { mkdtemp, rm } from 'node:fs/promises';
|
|
5
|
-
import { tmpdir } from 'node:os';
|
|
6
|
-
import { join } from 'node:path';
|
|
7
4
|
function endpoint(value) {
|
|
8
5
|
let parsed;
|
|
9
6
|
try {
|
|
@@ -40,19 +37,7 @@ function resourceUrl(value) {
|
|
|
40
37
|
}
|
|
41
38
|
return parsed;
|
|
42
39
|
}
|
|
43
|
-
function
|
|
44
|
-
if (!value || typeof value !== 'object')
|
|
45
|
-
return undefined;
|
|
46
|
-
for (const [key, child] of Object.entries(value)) {
|
|
47
|
-
if (key === 'url' && typeof child === 'string')
|
|
48
|
-
return child;
|
|
49
|
-
const nested = findUrl(child);
|
|
50
|
-
if (nested)
|
|
51
|
-
return nested;
|
|
52
|
-
}
|
|
53
|
-
return undefined;
|
|
54
|
-
}
|
|
55
|
-
function completedMcpCall(event) {
|
|
40
|
+
function completedMcpCall(event, serverName) {
|
|
56
41
|
if (!event || typeof event !== 'object')
|
|
57
42
|
return undefined;
|
|
58
43
|
const envelope = event;
|
|
@@ -64,7 +49,8 @@ function completedMcpCall(event) {
|
|
|
64
49
|
const action = Object.values(item).find((value) => typeof value === 'string' && value.startsWith('omnia_'));
|
|
65
50
|
if (!action)
|
|
66
51
|
return undefined;
|
|
67
|
-
const failed = item.
|
|
52
|
+
const failed = item.server !== serverName
|
|
53
|
+
|| item.isError === true
|
|
68
54
|
|| item.error !== undefined && item.error !== null
|
|
69
55
|
|| typeof item.status === 'string' && ['failed', 'error', 'cancelled'].includes(item.status.toLowerCase());
|
|
70
56
|
const result = item.result ?? item.output ?? item.content;
|
|
@@ -73,13 +59,13 @@ function completedMcpCall(event) {
|
|
|
73
59
|
const contextShape = /organization/iu.test(serialized) && /v[1-9][0-9]*\.[A-Za-z0-9_-]{8,120}/u.test(serialized);
|
|
74
60
|
return { action, successful: !failed && !resultFailed && contextShape };
|
|
75
61
|
}
|
|
76
|
-
function smokePassed(result) {
|
|
62
|
+
function smokePassed(result, serverName) {
|
|
77
63
|
if (result.status !== 0)
|
|
78
64
|
return false;
|
|
79
65
|
const calls = [];
|
|
80
66
|
for (const line of result.stdout.split('\n').filter(Boolean)) {
|
|
81
67
|
try {
|
|
82
|
-
const call = completedMcpCall(JSON.parse(line));
|
|
68
|
+
const call = completedMcpCall(JSON.parse(line), serverName);
|
|
83
69
|
if (call)
|
|
84
70
|
calls.push(call);
|
|
85
71
|
}
|
|
@@ -111,13 +97,11 @@ export async function connectCodex(options) {
|
|
|
111
97
|
let configPath;
|
|
112
98
|
const existing = options.runner.run('codex', ['mcp', 'get', options.name, '--json']);
|
|
113
99
|
if (existing.status === 0) {
|
|
114
|
-
let configuredUrl;
|
|
115
100
|
try {
|
|
116
|
-
|
|
101
|
+
validateCodexServer(JSON.parse(existing.stdout), { name: options.name, url, resource });
|
|
117
102
|
}
|
|
118
|
-
catch {
|
|
119
|
-
|
|
120
|
-
throw new CliError(`Codex MCP server ${options.name} already points to a different URL`, 'CODEX_SERVER_CONFLICT', EXIT.CONFIG_CONFLICT);
|
|
103
|
+
catch (error) {
|
|
104
|
+
throw new CliError(error instanceof Error ? error.message : 'Codex connection settings cannot be verified', 'CODEX_SERVER_CONFLICT', EXIT.CONFIG_CONFLICT);
|
|
121
105
|
}
|
|
122
106
|
registration = 'existing';
|
|
123
107
|
}
|
|
@@ -136,6 +120,15 @@ export async function connectCodex(options) {
|
|
|
136
120
|
if (effectiveFeatures.status !== 0 || !enabled) {
|
|
137
121
|
throw new CliError('Codex is not applying the saved automatic renewal configuration. Resolve conflicting project or profile settings and rerun setup; OAuth login was not started.', 'CODEX_REFRESH_CONFIG_UNVERIFIED', EXIT.CONFIG_CONFLICT);
|
|
138
122
|
}
|
|
123
|
+
const effective = options.runner.run('codex', ['mcp', 'get', options.name, '--json']);
|
|
124
|
+
try {
|
|
125
|
+
if (effective.status !== 0)
|
|
126
|
+
throw new Error('Codex cannot read the saved connection');
|
|
127
|
+
validateCodexServer(JSON.parse(effective.stdout), { name: options.name, url, resource });
|
|
128
|
+
}
|
|
129
|
+
catch (error) {
|
|
130
|
+
throw new CliError(error instanceof Error ? error.message : 'Codex settings cannot be verified', 'CODEX_CONFIG_UNVERIFIED', EXIT.CONFIG_CONFLICT);
|
|
131
|
+
}
|
|
139
132
|
const loginArgs = ['mcp', 'login', options.name];
|
|
140
133
|
const requestedScopes = [...new Set([...options.scopes, 'offline_access'])];
|
|
141
134
|
loginArgs.push('--scopes', requestedScopes.join(','));
|
|
@@ -153,23 +146,14 @@ export async function connectCodex(options) {
|
|
|
153
146
|
oauth: 'completed', smoke: 'blocked_by_explicit_skip', ...(configPath ? { configPath } : {}),
|
|
154
147
|
};
|
|
155
148
|
}
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
'-c', `mcp_servers.${options.name}.oauth_resource=${JSON.stringify(resource)}`,
|
|
165
|
-
'-c', `mcp_servers.${options.name}.required=true`,
|
|
166
|
-
`Call ${options.name}.${WORKSPACE_CONTEXT_ACTION.slug} exactly once. Use tool discovery if needed to find this MCP tool. Do not use shell, other MCP servers, or write tools. Return only its organization name and opaque ID.`,
|
|
167
|
-
], { cwd: smokeDirectory });
|
|
168
|
-
}
|
|
169
|
-
finally {
|
|
170
|
-
await rm(smokeDirectory, { recursive: true, force: true });
|
|
171
|
-
}
|
|
172
|
-
if (!smokePassed(smoke)) {
|
|
149
|
+
// Use the same effective user/project configuration as setup and normal use.
|
|
150
|
+
// Overrides here would conceal disabled servers, filters and renewal conflicts.
|
|
151
|
+
const smoke = options.runner.run('codex', [
|
|
152
|
+
'exec', '--sandbox', 'read-only', '--ephemeral', '--json', '--ignore-rules',
|
|
153
|
+
'--skip-git-repo-check',
|
|
154
|
+
`Call ${options.name}.${WORKSPACE_CONTEXT_ACTION.slug} exactly once. Use tool discovery if needed to find this MCP tool. Do not use shell, other MCP servers, or write tools. Return only its organization name and opaque ID.`,
|
|
155
|
+
]);
|
|
156
|
+
if (!smokePassed(smoke, options.name)) {
|
|
173
157
|
throw new CliError('Codex read-only MCP smoke did not produce a verified tool-call event', 'CODEX_SMOKE_BLOCKED', EXIT.AUTH_BLOCKED);
|
|
174
158
|
}
|
|
175
159
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../src/commands/connect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../src/commands/connect.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/doctor.js
CHANGED
|
@@ -5,7 +5,7 @@ export async function doctor(options) {
|
|
|
5
5
|
const checks = [];
|
|
6
6
|
const workspace = resolve(options.workspace);
|
|
7
7
|
const version = options.nodeVersion ?? process.version;
|
|
8
|
-
checks.push({ name: 'cli_version', status: 'pass', detail: '@omniaseo/cli 0.1.
|
|
8
|
+
checks.push({ name: 'cli_version', status: 'pass', detail: '@omniaseo/cli 0.1.1' });
|
|
9
9
|
checks.push({
|
|
10
10
|
name: 'node',
|
|
11
11
|
status: version.replace(/^v/u, '').startsWith('24.') ? 'pass' : 'fail',
|
package/dist/index.js
CHANGED
|
@@ -75,7 +75,7 @@ export async function main(argv = process.argv) {
|
|
|
75
75
|
program
|
|
76
76
|
.name('omnia')
|
|
77
77
|
.description('Omnia Connect workspace and MCP host setup')
|
|
78
|
-
.version('0.1.
|
|
78
|
+
.version('0.1.1')
|
|
79
79
|
.option('--json', 'emit machine-readable JSON')
|
|
80
80
|
.option('--profile <profile>', 'OS-keychain credential profile', 'default')
|
|
81
81
|
.showHelpAfterError()
|