cordisx 0.1.0-beta.30 → 0.1.0-beta.32
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/assets/launcher/native-agent-models-mcp.mjs +167 -0
- package/dist/assets/launcher/native-app-server-intermediary.mjs +67 -4
- package/dist/native/native-helper-artifact.json +1 -1
- package/dist/src/cli/production-host-bootstrap.d.ts.map +1 -1
- package/dist/src/cli/production-host-bootstrap.js +7 -3
- package/dist/src/cli/production-host-bootstrap.js.map +1 -1
- package/dist/src/cli/supervisor-state.d.ts.map +1 -1
- package/dist/src/cli/supervisor-state.js +3 -2
- package/dist/src/cli/supervisor-state.js.map +1 -1
- package/dist/src/launcher/native-agent-models.d.ts +32 -0
- package/dist/src/launcher/native-agent-models.d.ts.map +1 -0
- package/dist/src/launcher/native-agent-models.js +154 -0
- package/dist/src/launcher/native-agent-models.js.map +1 -0
- package/dist/src/launcher/native-agent-task-routing.d.ts +37 -0
- package/dist/src/launcher/native-agent-task-routing.d.ts.map +1 -0
- package/dist/src/launcher/native-agent-task-routing.js +136 -0
- package/dist/src/launcher/native-agent-task-routing.js.map +1 -0
- package/dist/src/launcher/native-agent-task-transform.d.ts +17 -0
- package/dist/src/launcher/native-agent-task-transform.d.ts.map +1 -0
- package/dist/src/launcher/native-agent-task-transform.js +121 -0
- package/dist/src/launcher/native-agent-task-transform.js.map +1 -0
- package/dist/src/launcher/native-agent-tasks.d.ts +28 -0
- package/dist/src/launcher/native-agent-tasks.d.ts.map +1 -0
- package/dist/src/launcher/native-agent-tasks.js +192 -0
- package/dist/src/launcher/native-agent-tasks.js.map +1 -0
- package/dist/src/launcher/native-app-resources.d.ts.map +1 -1
- package/dist/src/launcher/native-app-resources.js +1 -0
- package/dist/src/launcher/native-app-resources.js.map +1 -1
- package/dist/src/launcher/native-submission-cdp-channel.d.ts +11 -0
- package/dist/src/launcher/native-submission-cdp-channel.d.ts.map +1 -1
- package/dist/src/launcher/native-submission-cdp-channel.js +52 -1
- package/dist/src/launcher/native-submission-cdp-channel.js.map +1 -1
- package/dist/src/launcher/native-submission-composition.d.ts +3 -0
- package/dist/src/launcher/native-submission-composition.d.ts.map +1 -1
- package/dist/src/launcher/native-submission-composition.js +62 -3
- package/dist/src/launcher/native-submission-composition.js.map +1 -1
- package/dist/src/launcher/native-submission-control-server.d.ts +14 -0
- package/dist/src/launcher/native-submission-control-server.d.ts.map +1 -1
- package/dist/src/launcher/native-submission-control-server.js +37 -8
- package/dist/src/launcher/native-submission-control-server.js.map +1 -1
- package/dist/src/launcher/native-submission-controller.d.ts +1 -0
- package/dist/src/launcher/native-submission-controller.d.ts.map +1 -1
- package/dist/src/launcher/native-submission-controller.js +5 -1
- package/dist/src/launcher/native-submission-controller.js.map +1 -1
- package/dist/src/launcher/process-identity.d.ts.map +1 -1
- package/dist/src/launcher/process-identity.js +3 -1
- package/dist/src/launcher/process-identity.js.map +1 -1
- package/dist/src/launcher/process-start-identity.d.ts +5 -0
- package/dist/src/launcher/process-start-identity.d.ts.map +1 -0
- package/dist/src/launcher/process-start-identity.js +39 -0
- package/dist/src/launcher/process-start-identity.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,167 @@
|
|
|
1
|
+
import { readFile } from 'node:fs/promises'
|
|
2
|
+
import { connect } from 'node:net'
|
|
3
|
+
import { createInterface } from 'node:readline'
|
|
4
|
+
|
|
5
|
+
const bindingPath = process.argv[2]
|
|
6
|
+
const tools = [{
|
|
7
|
+
name: 'list_model_providers',
|
|
8
|
+
description:
|
|
9
|
+
'List configured CordisX model providers, exact model IDs, and provider-aware task creation availability in this app instance. This reuses the UI catalog and never returns credentials or changes defaults. Native OpenAI models remain in the native model tools. Use create_thread_with_provider only when threadCreation is available. Do not substitute a bootstrap message or an unregistered background thread.',
|
|
10
|
+
inputSchema: { type: 'object', additionalProperties: false, properties: {} },
|
|
11
|
+
}, {
|
|
12
|
+
name: 'select_thread_model_provider',
|
|
13
|
+
description:
|
|
14
|
+
'Select a configured CordisX provider and model for an existing idle conversation in this app instance, only when the user explicitly requests that change. Call list_model_providers first. Does not send a message, change global config, or interrupt a running conversation. A conversation not loaded in this backend must first be opened normally. Does not extend create_thread or change a new conversation before its first turn. Treat reconciliation-required as an uncertain result and inspect the conversation instead of retrying automatically.',
|
|
15
|
+
inputSchema: {
|
|
16
|
+
type: 'object',
|
|
17
|
+
additionalProperties: false,
|
|
18
|
+
properties: {
|
|
19
|
+
threadId: { type: 'string', minLength: 1, maxLength: 512 },
|
|
20
|
+
providerId: { type: 'string', minLength: 1, maxLength: 128 },
|
|
21
|
+
model: { type: 'string', minLength: 1, maxLength: 512 },
|
|
22
|
+
},
|
|
23
|
+
required: ['threadId', 'providerId', 'model'],
|
|
24
|
+
},
|
|
25
|
+
}, {
|
|
26
|
+
name: 'create_thread_with_provider',
|
|
27
|
+
description:
|
|
28
|
+
'Create a native user task whose first message uses an admitted CordisX provider/model, only when the user explicitly requests a new task and provider. Call list_model_providers first and require threadCreation available. Reuses native project/directory provisioning, permissions, sidebar registration and first send. Supports this app instance on the audited native build; remote/cloud targets are unavailable. Retain a unique operationId for the exact request. On timeout, pending, or reconciliation-required, reuse/read the same operationId; never repeat with a new ID automatically. Never supplies endpoints or secrets. Native create_thread remains unchanged.',
|
|
29
|
+
inputSchema: {
|
|
30
|
+
type: 'object',
|
|
31
|
+
additionalProperties: false,
|
|
32
|
+
properties: {
|
|
33
|
+
operationId: { type: 'string', minLength: 1, maxLength: 128 },
|
|
34
|
+
providerId: { type: 'string', minLength: 1, maxLength: 128 },
|
|
35
|
+
model: { type: 'string', minLength: 1, maxLength: 512 },
|
|
36
|
+
prompt: { type: 'string', minLength: 1, maxLength: 100000 },
|
|
37
|
+
title: { type: 'string', minLength: 1, maxLength: 512 },
|
|
38
|
+
target: {
|
|
39
|
+
type: 'object',
|
|
40
|
+
additionalProperties: false,
|
|
41
|
+
properties: {
|
|
42
|
+
type: { enum: ['project', 'projectless'] },
|
|
43
|
+
projectId: { type: 'string' },
|
|
44
|
+
directoryName: { type: 'string' },
|
|
45
|
+
environment: {
|
|
46
|
+
type: 'object',
|
|
47
|
+
properties: { type: { enum: ['local', 'worktree'] }, startingState: { type: 'object' } },
|
|
48
|
+
additionalProperties: false,
|
|
49
|
+
},
|
|
50
|
+
},
|
|
51
|
+
required: ['type'],
|
|
52
|
+
},
|
|
53
|
+
},
|
|
54
|
+
required: ['operationId', 'providerId', 'model', 'prompt', 'target'],
|
|
55
|
+
},
|
|
56
|
+
}]
|
|
57
|
+
|
|
58
|
+
async function invoke(operation, input, metadata) {
|
|
59
|
+
const binding = JSON.parse(await readFile(bindingPath, 'utf8'))
|
|
60
|
+
if (binding.version !== 1 || typeof binding.socketPath !== 'string' || typeof binding.token !== 'string') {
|
|
61
|
+
throw new Error('Native model tools unavailable')
|
|
62
|
+
}
|
|
63
|
+
return await new Promise((resolve, reject) => {
|
|
64
|
+
const socket = connect(binding.socketPath)
|
|
65
|
+
let buffer = ''
|
|
66
|
+
let settled = false
|
|
67
|
+
const finish = (error, value) => {
|
|
68
|
+
if (settled) return
|
|
69
|
+
settled = true
|
|
70
|
+
clearTimeout(timer)
|
|
71
|
+
socket.destroy()
|
|
72
|
+
error ? reject(error) : resolve(value)
|
|
73
|
+
}
|
|
74
|
+
const timer = setTimeout(() => finish(new Error('Native selection acknowledgement unavailable')), 45000)
|
|
75
|
+
socket.on('error', () => finish(new Error('Native model tools unavailable')))
|
|
76
|
+
socket.on('end', () => finish(new Error('Native selection acknowledgement unavailable')))
|
|
77
|
+
socket.on(
|
|
78
|
+
'connect',
|
|
79
|
+
() => socket.write(JSON.stringify({ token: binding.token, operation, input, metadata }) + '\n'),
|
|
80
|
+
)
|
|
81
|
+
socket.setEncoding('utf8')
|
|
82
|
+
socket.on('data', chunk => {
|
|
83
|
+
buffer += chunk
|
|
84
|
+
if (Buffer.byteLength(buffer) > 8 * 1024 * 1024) {
|
|
85
|
+
finish(new Error('Native model response too large'))
|
|
86
|
+
return
|
|
87
|
+
}
|
|
88
|
+
const newline = buffer.indexOf('\n')
|
|
89
|
+
if (newline < 0) return
|
|
90
|
+
try {
|
|
91
|
+
const response = JSON.parse(buffer.slice(0, newline))
|
|
92
|
+
response.ok === true ? finish(undefined, response.value) : finish(new Error('Native model tools unavailable'))
|
|
93
|
+
} catch {
|
|
94
|
+
finish(new Error('Invalid native model response'))
|
|
95
|
+
}
|
|
96
|
+
})
|
|
97
|
+
})
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
const reader = createInterface({ input: process.stdin, crlfDelay: Infinity })
|
|
101
|
+
let active = 0
|
|
102
|
+
reader.on('line', line => {
|
|
103
|
+
if (Buffer.byteLength(line) > 256 * 1024 || active >= 16) {
|
|
104
|
+
process.exitCode = 1
|
|
105
|
+
reader.close()
|
|
106
|
+
return
|
|
107
|
+
}
|
|
108
|
+
let request
|
|
109
|
+
try {
|
|
110
|
+
request = JSON.parse(line)
|
|
111
|
+
} catch {
|
|
112
|
+
return
|
|
113
|
+
}
|
|
114
|
+
if (request.id === undefined) return
|
|
115
|
+
active++
|
|
116
|
+
void (async () => {
|
|
117
|
+
try {
|
|
118
|
+
let result
|
|
119
|
+
if (request.method === 'initialize') {
|
|
120
|
+
result = {
|
|
121
|
+
protocolVersion: request.params?.protocolVersion ?? '2024-11-05',
|
|
122
|
+
capabilities: { tools: {} },
|
|
123
|
+
serverInfo: { name: 'cordisx-models', version: '1.0.0' },
|
|
124
|
+
}
|
|
125
|
+
} else if (request.method === 'tools/list') result = { tools }
|
|
126
|
+
else if (request.method === 'ping') result = {}
|
|
127
|
+
else if (request.method === 'resources/list') result = { resources: [] }
|
|
128
|
+
else if (request.method === 'resources/templates/list') result = { resourceTemplates: [] }
|
|
129
|
+
else if (request.method === 'tools/call') {
|
|
130
|
+
const operation = request.params?.name === 'list_model_providers'
|
|
131
|
+
? 'list'
|
|
132
|
+
: request.params?.name === 'select_thread_model_provider'
|
|
133
|
+
? 'select'
|
|
134
|
+
: request.params?.name === 'create_thread_with_provider'
|
|
135
|
+
? 'create'
|
|
136
|
+
: undefined
|
|
137
|
+
if (operation === undefined) throw new Error('Unknown native model tool')
|
|
138
|
+
const value = await invoke(operation, request.params.arguments ?? {}, {
|
|
139
|
+
...request.params._meta,
|
|
140
|
+
'cordisx/mcpRequestId': request.id,
|
|
141
|
+
})
|
|
142
|
+
result = {
|
|
143
|
+
content: [{ type: 'text', text: JSON.stringify(value) }],
|
|
144
|
+
isError: value?.status === 'rejected' || value?.status === 'reconciliation-required',
|
|
145
|
+
}
|
|
146
|
+
} else {
|
|
147
|
+
process.stdout.write(
|
|
148
|
+
JSON.stringify({ jsonrpc: '2.0', id: request.id, error: { code: -32601, message: 'Method not found' } })
|
|
149
|
+
+ '\n',
|
|
150
|
+
)
|
|
151
|
+
return
|
|
152
|
+
}
|
|
153
|
+
process.stdout.write(JSON.stringify({ jsonrpc: '2.0', id: request.id, result }) + '\n')
|
|
154
|
+
} catch {
|
|
155
|
+
const result = {
|
|
156
|
+
content: [{
|
|
157
|
+
type: 'text',
|
|
158
|
+
text: 'Native model tools unavailable; inspect the conversation before retrying a selection.',
|
|
159
|
+
}],
|
|
160
|
+
isError: true,
|
|
161
|
+
}
|
|
162
|
+
process.stdout.write(JSON.stringify({ jsonrpc: '2.0', id: request.id, result }) + '\n')
|
|
163
|
+
} finally {
|
|
164
|
+
active--
|
|
165
|
+
}
|
|
166
|
+
})()
|
|
167
|
+
})
|
|
@@ -1,11 +1,14 @@
|
|
|
1
|
-
#!/
|
|
1
|
+
#!/bin/sh
|
|
2
|
+
':' // ; exec "${CORDISX_NATIVE_NODE_PATH:-${CORDISX_NATIVE_REAL_CODEX_PATH%%/Contents/Resources/*}/Contents/Resources/cua_node/bin/node}" "$0" "$@"
|
|
2
3
|
import { spawn } from 'node:child_process'
|
|
3
4
|
import net from 'node:net'
|
|
5
|
+
import { fileURLToPath } from 'node:url'
|
|
4
6
|
import { NativeRequestTracker } from './native-request-tracker.mjs'
|
|
5
7
|
|
|
6
8
|
const socketPath = process.env.CORDISX_NATIVE_CONTROL_SOCKET
|
|
7
9
|
const nonce = process.env.CORDISX_NATIVE_CONTROL_NONCE
|
|
8
10
|
const executable = process.env.CORDISX_NATIVE_REAL_CODEX_PATH
|
|
11
|
+
const agentModelsBinding = process.env.CORDISX_NATIVE_AGENT_MODELS_BINDING
|
|
9
12
|
const marker = 'cordisx.operation_token'
|
|
10
13
|
// Native history and plugin catalogs can exceed the small private control-message budget.
|
|
11
14
|
const maxNativeLineBytes = 64 * 1024 * 1024
|
|
@@ -17,10 +20,26 @@ for (
|
|
|
17
20
|
'CORDISX_NATIVE_CONTROL_SOCKET',
|
|
18
21
|
'CORDISX_NATIVE_CONTROL_NONCE',
|
|
19
22
|
'CORDISX_NATIVE_REAL_CODEX_PATH',
|
|
23
|
+
'CORDISX_NATIVE_NODE_PATH',
|
|
24
|
+
'CORDISX_NATIVE_AGENT_MODELS_BINDING',
|
|
20
25
|
]
|
|
21
26
|
) delete process.env[key]
|
|
22
27
|
|
|
23
|
-
const
|
|
28
|
+
const nativeArgs = process.argv.slice(2)
|
|
29
|
+
if (agentModelsBinding && nativeArgs.includes('app-server')) {
|
|
30
|
+
nativeArgs.unshift(
|
|
31
|
+
'-c',
|
|
32
|
+
`mcp_servers.cordisx_models.command=${JSON.stringify(process.execPath)}`,
|
|
33
|
+
'-c',
|
|
34
|
+
`mcp_servers.cordisx_models.args=${
|
|
35
|
+
JSON.stringify([
|
|
36
|
+
fileURLToPath(new URL('./native-agent-models-mcp.mjs', import.meta.url)),
|
|
37
|
+
agentModelsBinding,
|
|
38
|
+
])
|
|
39
|
+
}`,
|
|
40
|
+
)
|
|
41
|
+
}
|
|
42
|
+
const child = spawn(executable, nativeArgs, { stdio: ['pipe', 'pipe', 'inherit'], env: process.env })
|
|
24
43
|
const control = net.connect(socketPath)
|
|
25
44
|
const controlCalls = new Map()
|
|
26
45
|
const privateCalls = new Map()
|
|
@@ -35,6 +54,7 @@ let lifecycleUncertain = false
|
|
|
35
54
|
const recoveringTurns = new Set()
|
|
36
55
|
const cancelledRecovery = new Set()
|
|
37
56
|
const firstTurns = new Map()
|
|
57
|
+
const agentFirstTurns = new Map()
|
|
38
58
|
const privatePrefix = `cordisx-private-${nonce}-`
|
|
39
59
|
let sequence = 0
|
|
40
60
|
let closed = false
|
|
@@ -74,6 +94,7 @@ function stop(reason = 'transport-closed') {
|
|
|
74
94
|
cancelledRecovery.clear()
|
|
75
95
|
lifecycleCalls.clear()
|
|
76
96
|
firstTurns.clear()
|
|
97
|
+
agentFirstTurns.clear()
|
|
77
98
|
control.destroy()
|
|
78
99
|
process.stdin.destroy()
|
|
79
100
|
child.stdin.destroy()
|
|
@@ -184,6 +205,16 @@ async function forward(line) {
|
|
|
184
205
|
return
|
|
185
206
|
}
|
|
186
207
|
const params = object(message?.params)
|
|
208
|
+
if (
|
|
209
|
+
message?.method === 'turn/start' && agentFirstTurns.has(params?.threadId)
|
|
210
|
+
&& params.config?.[marker] !== agentFirstTurns.get(params.threadId)
|
|
211
|
+
) {
|
|
212
|
+
await write(process.stdout, {
|
|
213
|
+
id: message.id,
|
|
214
|
+
error: { code: -32000, message: 'Native task first turn association unavailable' },
|
|
215
|
+
})
|
|
216
|
+
return
|
|
217
|
+
}
|
|
187
218
|
const config = object(params?.config)
|
|
188
219
|
const managed = config !== undefined && Object.hasOwn(config, marker)
|
|
189
220
|
if (message?.method === 'turn/interrupt' && typeof params?.threadId === 'string') {
|
|
@@ -282,8 +313,11 @@ async function forward(line) {
|
|
|
282
313
|
}
|
|
283
314
|
const authorized = await controlCall('authorize', { token, requestId: message.id })
|
|
284
315
|
if (authorized !== true) throw new Error('Managed request authorization expired')
|
|
285
|
-
desktopCalls.set(message.id, { token, method: message.method })
|
|
286
|
-
if (message.method === 'turn/start')
|
|
316
|
+
desktopCalls.set(message.id, { token, method: message.method, agentTask: dispatch.agentTask === true })
|
|
317
|
+
if (message.method === 'turn/start') {
|
|
318
|
+
firstTurns.delete(params.threadId)
|
|
319
|
+
agentFirstTurns.delete(params.threadId)
|
|
320
|
+
}
|
|
287
321
|
await write(child.stdin, JSON.stringify(message))
|
|
288
322
|
} catch {
|
|
289
323
|
desktopCalls.delete(message?.id)
|
|
@@ -481,12 +515,19 @@ readLines(child.stdout, line => {
|
|
|
481
515
|
operation.method === 'thread/start' && message.error === undefined && typeof message.result?.thread?.id === 'string'
|
|
482
516
|
) {
|
|
483
517
|
firstTurns.set(message.result.thread.id, operation.token)
|
|
518
|
+
if (operation.agentTask) agentFirstTurns.set(message.result.thread.id, operation.token)
|
|
484
519
|
}
|
|
485
520
|
void controlCall('complete', {
|
|
486
521
|
token: operation.token,
|
|
487
522
|
requestId: message.id,
|
|
488
523
|
succeeded: message.error === undefined,
|
|
489
524
|
...(typeof message.result?.thread?.id === 'string' ? { threadId: message.result.thread.id } : {}),
|
|
525
|
+
...(operation.agentTask && operation.method === 'thread/start'
|
|
526
|
+
? {
|
|
527
|
+
providerId: message.result?.modelProvider ?? message.result?.thread?.modelProvider,
|
|
528
|
+
model: message.result?.model ?? message.result?.thread?.model,
|
|
529
|
+
}
|
|
530
|
+
: {}),
|
|
490
531
|
}).then(() => write(process.stdout, line)).catch(stop)
|
|
491
532
|
})
|
|
492
533
|
|
|
@@ -500,6 +541,21 @@ readLines(control, line => {
|
|
|
500
541
|
return
|
|
501
542
|
}
|
|
502
543
|
if (settle(controlCalls, message, true)) return
|
|
544
|
+
if (message.type === 'task-create' && typeof message.id === 'string') {
|
|
545
|
+
void nativeCall('mcpServer/tool/call', {
|
|
546
|
+
server: 'codex_app',
|
|
547
|
+
threadId: message.sourceThreadId,
|
|
548
|
+
tool: 'create_thread',
|
|
549
|
+
arguments: message.arguments,
|
|
550
|
+
_meta: {
|
|
551
|
+
'openai/toolCallId': message.callId,
|
|
552
|
+
'openai/threadId': message.sourceThreadId,
|
|
553
|
+
'openai/turnId': message.sourceTurnId,
|
|
554
|
+
},
|
|
555
|
+
}).then(value => write(control, { id: message.id, ok: true, value }))
|
|
556
|
+
.catch(() => write(control, { id: message.id, ok: false }).catch(stop))
|
|
557
|
+
return
|
|
558
|
+
}
|
|
503
559
|
if (message.type === 'idle' && typeof message.id === 'string' && typeof message.threadId === 'string') {
|
|
504
560
|
void nativeCall('thread/read', { threadId: message.threadId, includeTurns: false }).then(result => {
|
|
505
561
|
const status = result?.thread?.status?.type
|
|
@@ -522,6 +578,13 @@ readLines(control, line => {
|
|
|
522
578
|
switching.add(message.threadId)
|
|
523
579
|
void (async () => {
|
|
524
580
|
try {
|
|
581
|
+
if (message.requireIdle === true) {
|
|
582
|
+
const before = await nativeCall('thread/read', { threadId: message.threadId, includeTurns: false })
|
|
583
|
+
if (before?.thread?.id !== message.threadId || before?.thread?.status?.type !== 'idle') {
|
|
584
|
+
await write(control, { id: message.id, ok: true, value: { status: 'rejected', reason: 'thread-not-idle' } })
|
|
585
|
+
return
|
|
586
|
+
}
|
|
587
|
+
}
|
|
525
588
|
await nativeCall('thread/unsubscribe', { threadId: message.threadId })
|
|
526
589
|
const result = await nativeCall('thread/resume', {
|
|
527
590
|
threadId: message.threadId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"production-host-bootstrap.d.ts","sourceRoot":"","sources":["../../../src/cli/production-host-bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAClE,OAAO,EACL,KAAK,yBAAyB,EAE/B,MAAM,8CAA8C,CAAA;AACrD,OAAO,EACL,8BAA8B,EAI9B,KAAK,oBAAoB,EAK1B,MAAM,wBAAwB,CAAA;AAE/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AACnE,OAAO,EAA2B,KAAK,iBAAiB,EAAsB,MAAM,kBAAkB,CAAA;AAKtG,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,IAAI,CAAC,EAAE,kBAAkB,CAAA;IAClC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,oBAAoB,CAAA;IACvC,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,8BAA8B,CAAC,CAAC,CAAA;IAClF,QAAQ,CAAC,yBAAyB,CAAC,EAAE,yBAAyB,CAAA;IAC9D,QAAQ,CAAC,2BAA2B,CAAC,EAAE,IAAI,CAAA;IAC3C,QAAQ,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC;QAAE,KAAK,EAAE,YAAY,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;KAAE,CAAC,CAAA;CAC9G;AAED,sFAAsF;AACtF,wBAAsB,8BAA8B,CAClD,QAAQ,EAAE,kBAAkB,EAC5B,OAAO,EAAE,iBAAiB,EAC1B,KAAK,EAAE,QAAQ,CAAC;IACd,SAAS,EAAE,OAAO,CAAA;IAClB,uBAAuB,EAAE,OAAO,CAAA;IAChC,aAAa,EAAE,OAAO,CAAA;IACtB,gBAAgB,CACd,GAAG,EAAE,MAAM,EACX,YAAY,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,EAC9B,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAA;CAC5C,CAAC,GACD,OAAO,CAAC,uBAAuB,CAAC,
|
|
1
|
+
{"version":3,"file":"production-host-bootstrap.d.ts","sourceRoot":"","sources":["../../../src/cli/production-host-bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAClE,OAAO,EACL,KAAK,yBAAyB,EAE/B,MAAM,8CAA8C,CAAA;AACrD,OAAO,EACL,8BAA8B,EAI9B,KAAK,oBAAoB,EAK1B,MAAM,wBAAwB,CAAA;AAE/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AACnE,OAAO,EAA2B,KAAK,iBAAiB,EAAsB,MAAM,kBAAkB,CAAA;AAKtG,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,IAAI,CAAC,EAAE,kBAAkB,CAAA;IAClC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,OAAO,CAAC,EAAE,oBAAoB,CAAA;IACvC,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,8BAA8B,CAAC,CAAC,CAAA;IAClF,QAAQ,CAAC,yBAAyB,CAAC,EAAE,yBAAyB,CAAA;IAC9D,QAAQ,CAAC,2BAA2B,CAAC,EAAE,IAAI,CAAA;IAC3C,QAAQ,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC;QAAE,KAAK,EAAE,YAAY,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;KAAE,CAAC,CAAA;CAC9G;AAED,sFAAsF;AACtF,wBAAsB,8BAA8B,CAClD,QAAQ,EAAE,kBAAkB,EAC5B,OAAO,EAAE,iBAAiB,EAC1B,KAAK,EAAE,QAAQ,CAAC;IACd,SAAS,EAAE,OAAO,CAAA;IAClB,uBAAuB,EAAE,OAAO,CAAA;IAChC,aAAa,EAAE,OAAO,CAAA;IACtB,gBAAgB,CACd,GAAG,EAAE,MAAM,EACX,YAAY,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,EAC9B,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAA;CAC5C,CAAC,GACD,OAAO,CAAC,uBAAuB,CAAC,CAkJlC"}
|
|
@@ -57,6 +57,8 @@ export async function prepareProductionHostBootstrap(prepared, runtime, input) {
|
|
|
57
57
|
? undefined
|
|
58
58
|
: await acquireCodexProfileLaunchLease(profile.userDataDir, { stdout });
|
|
59
59
|
await adapter.prepareLaunch(plan);
|
|
60
|
+
const configured = await loadHomeConfig(configPath);
|
|
61
|
+
const configuredEnvironment = hostModelServiceEnvironment(environment, configured.environmentVariables, plan.environment);
|
|
60
62
|
if (input.prepareNativeSubmission
|
|
61
63
|
&& shouldEnableNativeSubmission({
|
|
62
64
|
platform: runtime.internalNativeSubmissionPlatform ?? process.platform,
|
|
@@ -65,7 +67,10 @@ export async function prepareProductionHostBootstrap(prepared, runtime, input) {
|
|
|
65
67
|
})) {
|
|
66
68
|
try {
|
|
67
69
|
const cacheDirectory = (runtime.env ?? process.env).CORDISX_INTERNAL_NATIVE_SUBMISSION_CACHE_DIRECTORY;
|
|
68
|
-
nativeSubmissionBootstrap = await prepareNativeSubmissionBootstrap(plan.executable,
|
|
70
|
+
nativeSubmissionBootstrap = await prepareNativeSubmissionBootstrap(plan.executable, {
|
|
71
|
+
...(cacheDirectory === undefined ? {} : { cacheDirectory }),
|
|
72
|
+
environment: configuredEnvironment,
|
|
73
|
+
});
|
|
69
74
|
}
|
|
70
75
|
catch (error) {
|
|
71
76
|
nativeSubmissionUnavailable = true;
|
|
@@ -87,9 +92,8 @@ export async function prepareProductionHostBootstrap(prepared, runtime, input) {
|
|
|
87
92
|
stdout('[cordisx] same-window startup unavailable; using an ordinary isolated Host window');
|
|
88
93
|
}
|
|
89
94
|
stdout(`[cordisx] launching ${plan.executable} with CDP 127.0.0.1:${debugPort}`);
|
|
90
|
-
const configured = await loadHomeConfig(configPath);
|
|
91
95
|
const hostEnvironment = {
|
|
92
|
-
...
|
|
96
|
+
...configuredEnvironment,
|
|
93
97
|
...nativeSubmissionBootstrap?.environment,
|
|
94
98
|
};
|
|
95
99
|
const hiddenLaunch = mainInspector
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"production-host-bootstrap.js","sourceRoot":"","sources":["../../../src/cli/production-host-bootstrap.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"production-host-bootstrap.js","sourceRoot":"","sources":["../../../src/cli/production-host-bootstrap.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor-state.d.ts","sourceRoot":"","sources":["../../../src/cli/supervisor-state.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"supervisor-state.d.ts","sourceRoot":"","sources":["../../../src/cli/supervisor-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { createHash, randomBytes } from 'node:crypto';
|
|
|
2
2
|
import { chmod, lstat, mkdir, readFile, rename, rm, stat, writeFile } from 'node:fs/promises';
|
|
3
3
|
import { acquireKernelOperationLock, KernelOperationBusyError } from '../launcher/kernel-operation-lock.js';
|
|
4
4
|
import path from 'node:path';
|
|
5
|
+
import { compareProcessStartTimes, processIdentityEnvironment } from '../launcher/process-start-identity.js';
|
|
5
6
|
export function supervisorPaths(homeDir, appId, profileId) {
|
|
6
7
|
const directory = path.join(homeDir, 'run', appId, profileId);
|
|
7
8
|
return {
|
|
@@ -156,7 +157,7 @@ export async function processStartIdentity(pid) {
|
|
|
156
157
|
try {
|
|
157
158
|
const { execFile } = await import('node:child_process');
|
|
158
159
|
const output = await new Promise((resolve, reject) => {
|
|
159
|
-
execFile('ps', ['-o', 'lstart=', '-p', String(pid)], (error, stdout) => error === null ? resolve(stdout.trim()) : reject(error));
|
|
160
|
+
execFile('ps', ['-o', 'lstart=', '-p', String(pid)], { env: processIdentityEnvironment() }, (error, stdout) => error === null ? resolve(stdout.trim()) : reject(error));
|
|
160
161
|
});
|
|
161
162
|
return output === '' ? undefined : output;
|
|
162
163
|
}
|
|
@@ -180,7 +181,7 @@ export async function processIdentityStatus(pid, startedAt) {
|
|
|
180
181
|
const current = await processStartIdentity(pid);
|
|
181
182
|
if (current === undefined)
|
|
182
183
|
return 'unknown';
|
|
183
|
-
return current
|
|
184
|
+
return compareProcessStartTimes(current, startedAt);
|
|
184
185
|
}
|
|
185
186
|
export async function stateFileIsPrivate(paths) {
|
|
186
187
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor-state.js","sourceRoot":"","sources":["../../../src/cli/supervisor-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACrD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC7F,OAAO,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAA;AAC3G,OAAO,IAAI,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"supervisor-state.js","sourceRoot":"","sources":["../../../src/cli/supervisor-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import type { NativeModelProviderCatalogEntry } from './native-model-provider-catalog.js';
|
|
2
|
+
import type { NativeSubmissionController } from './native-submission-controller.js';
|
|
3
|
+
type Selection = Readonly<{
|
|
4
|
+
threadId: string;
|
|
5
|
+
providerId: string;
|
|
6
|
+
model: string;
|
|
7
|
+
}>;
|
|
8
|
+
export declare class NativeAgentModelSelectionRejected extends Error {
|
|
9
|
+
readonly reason = "thread-not-idle";
|
|
10
|
+
}
|
|
11
|
+
export interface NativeAgentModelsAuthority {
|
|
12
|
+
catalog(): Promise<readonly NativeModelProviderCatalogEntry[]>;
|
|
13
|
+
controller: Pick<NativeSubmissionController, 'prepareThreadResume' | 'completeThreadResume'>;
|
|
14
|
+
switchThread(input: Selection & {
|
|
15
|
+
configOverrides: Readonly<Record<string, unknown>>;
|
|
16
|
+
}): Promise<void>;
|
|
17
|
+
reserve(threadId: string): boolean;
|
|
18
|
+
commit(input: Selection): void;
|
|
19
|
+
release(threadId: string): void;
|
|
20
|
+
createTask?(input: unknown, metadata: unknown): Promise<unknown>;
|
|
21
|
+
taskCreationAvailable?(): Promise<boolean>;
|
|
22
|
+
}
|
|
23
|
+
/** Uses the UI's admitted catalog and credential leases; tool callers never supply a connection or secret. */
|
|
24
|
+
export declare function createNativeAgentModelsHandler(authority: NativeAgentModelsAuthority): (operation: unknown, input: unknown, metadata?: unknown) => Promise<unknown>;
|
|
25
|
+
/** One launch-scoped, owner-only endpoint shared by that app-server's MCP subprocesses. */
|
|
26
|
+
export declare function startNativeAgentModelsServer(): Promise<{
|
|
27
|
+
bindingPath: string;
|
|
28
|
+
bind(authority: NativeAgentModelsAuthority): void;
|
|
29
|
+
close(): Promise<void>;
|
|
30
|
+
}>;
|
|
31
|
+
export {};
|
|
32
|
+
//# sourceMappingURL=native-agent-models.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"native-agent-models.d.ts","sourceRoot":"","sources":["../../../src/launcher/native-agent-models.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,oCAAoC,CAAA;AACzF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAA;AAEnF,KAAK,SAAS,GAAG,QAAQ,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAAA;AAClF,qBAAa,iCAAkC,SAAQ,KAAK;IAC1D,QAAQ,CAAC,MAAM,qBAAoB;CACpC;AACD,MAAM,WAAW,0BAA0B;IACzC,OAAO,IAAI,OAAO,CAAC,SAAS,+BAA+B,EAAE,CAAC,CAAA;IAC9D,UAAU,EAAE,IAAI,CAAC,0BAA0B,EAAE,qBAAqB,GAAG,sBAAsB,CAAC,CAAA;IAC5F,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG;QAAE,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACtG,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IAClC,MAAM,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAA;IAC9B,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,UAAU,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAChE,qBAAqB,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAA;CAC3C;AAMD,8GAA8G;AAC9G,wBAAgB,8BAA8B,CAAC,SAAS,EAAE,0BAA0B,IACpE,WAAW,OAAO,EAAE,OAAO,OAAO,EAAE,WAAW,OAAO,KAAG,OAAO,CAAC,OAAO,CAAC,CA4DxF;AAED,2FAA2F;AAC3F,wBAAsB,4BAA4B;;oBAuD9B,0BAA0B;;GAY7C"}
|