greprag 5.53.0 → 5.54.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/codex-steering.js +33 -7
- package/dist/codex-steering.js.map +1 -1
- package/dist/commands/arm-reminder.js +1 -1
- package/dist/commands/arm-reminder.js.map +1 -1
- package/dist/commands/codex-delivery.d.ts +2 -1
- package/dist/commands/codex-delivery.js +130 -7
- package/dist/commands/codex-delivery.js.map +1 -1
- package/dist/commands/codex-doctor.js +28 -11
- package/dist/commands/codex-doctor.js.map +1 -1
- package/dist/commands/codex-supervisor.d.ts +6 -1
- package/dist/commands/codex-supervisor.js +37 -12
- package/dist/commands/codex-supervisor.js.map +1 -1
- package/dist/commands/codex-wake-test.d.ts +19 -0
- package/dist/commands/codex-wake-test.js +34 -0
- package/dist/commands/codex-wake-test.js.map +1 -1
- package/dist/commands/codex.js +46 -7
- package/dist/commands/codex.js.map +1 -1
- package/dist/commands/friction-reminder.d.ts +3 -4
- package/dist/commands/friction-reminder.js +42 -9
- package/dist/commands/friction-reminder.js.map +1 -1
- package/dist/commands/inbox-drain.js +9 -2
- package/dist/commands/inbox-drain.js.map +1 -1
- package/dist/commands/inbox-primer-reminder.d.ts +1 -1
- package/dist/commands/inbox-primer-reminder.js +3 -3
- package/dist/commands/inbox-primer-reminder.js.map +1 -1
- package/dist/commands/inbox-watch.d.ts +3 -0
- package/dist/commands/inbox-watch.js +9 -3
- package/dist/commands/inbox-watch.js.map +1 -1
- package/dist/commands/init.js +14 -0
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/mechanic-live.d.ts +12 -0
- package/dist/commands/mechanic-live.js +91 -0
- package/dist/commands/mechanic-live.js.map +1 -0
- package/dist/commands/mechanic-manifest.d.ts +16 -0
- package/dist/commands/mechanic-manifest.js +81 -0
- package/dist/commands/mechanic-manifest.js.map +1 -0
- package/dist/commands/mechanic.d.ts +3 -0
- package/dist/commands/mechanic.js +62 -7
- package/dist/commands/mechanic.js.map +1 -1
- package/dist/commands/opencode-relay.js +10 -1
- package/dist/commands/opencode-relay.js.map +1 -1
- package/dist/commands/reminder-types.d.ts +6 -0
- package/dist/commands/status.d.ts +1 -0
- package/dist/commands/status.js +2 -0
- package/dist/commands/status.js.map +1 -1
- package/dist/guard.d.ts +9 -2
- package/dist/guard.js +12 -5
- package/dist/guard.js.map +1 -1
- package/dist/harness.d.ts +6 -0
- package/dist/harness.js +47 -0
- package/dist/harness.js.map +1 -0
- package/dist/hook.js +81 -4
- package/dist/hook.js.map +1 -1
- package/dist/index.js +12 -1
- package/dist/index.js.map +1 -1
- package/dist/mechanic-friction.d.ts +99 -0
- package/dist/mechanic-friction.js +371 -0
- package/dist/mechanic-friction.js.map +1 -0
- package/dist/mechanic-role.d.ts +20 -0
- package/dist/mechanic-role.js +107 -0
- package/dist/mechanic-role.js.map +1 -0
- package/dist/opencode-plugin.bundle.js +49 -15
- package/dist/session-id.d.ts +1 -1
- package/dist/session-id.js +2 -2
- package/dist/session-id.js.map +1 -1
- package/package.json +1 -1
- package/skill/greprag/SKILL.md +1 -1
- package/skill/greprag/docs/inbox-watch.md +3 -0
- package/skill/mechanic/SKILL.md +22 -0
package/dist/codex-steering.js
CHANGED
|
@@ -107,12 +107,32 @@ function formatReplyHint(message) {
|
|
|
107
107
|
return `Reply with: greprag send "..." --to ${handle}`;
|
|
108
108
|
return null;
|
|
109
109
|
}
|
|
110
|
-
function
|
|
111
|
-
|
|
110
|
+
function deliverableMessages(messages, session8) {
|
|
111
|
+
return messages.filter(m => {
|
|
112
112
|
if (!m || typeof m.body !== 'string' || !m.body.trim())
|
|
113
113
|
return false;
|
|
114
|
+
if ((0, session_id_1.truncateSessionId)(m.to_session_id || undefined) !== session8)
|
|
115
|
+
return false;
|
|
114
116
|
return (0, session_id_1.truncateSessionId)(m.from?.session_id || undefined) !== session8;
|
|
115
117
|
});
|
|
118
|
+
}
|
|
119
|
+
async function markRead(apiUrl, apiKey, ids) {
|
|
120
|
+
const unique = Array.from(new Set(ids.filter(Boolean))).slice(0, 200);
|
|
121
|
+
if (unique.length === 0)
|
|
122
|
+
return;
|
|
123
|
+
try {
|
|
124
|
+
await fetch(`${apiUrl.replace(/\/+$/, '')}/v1/inbox/read`, {
|
|
125
|
+
method: 'POST',
|
|
126
|
+
headers: { 'Authorization': `Bearer ${apiKey}`, 'Content-Type': 'application/json' },
|
|
127
|
+
body: JSON.stringify({ ids: unique }),
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
catch {
|
|
131
|
+
// Best-effort. A failed mark-read may duplicate context, but must not block the hook.
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
function formatCodexInboxSteering(messages, session8) {
|
|
135
|
+
const unread = deliverableMessages(messages, session8);
|
|
116
136
|
if (unread.length === 0)
|
|
117
137
|
return null;
|
|
118
138
|
const parts = [
|
|
@@ -153,12 +173,13 @@ async function buildCodexInboxSteering(input, cfg, opts = {}) {
|
|
|
153
173
|
return null;
|
|
154
174
|
if (opts.debounce)
|
|
155
175
|
stampPoll(input.session_id || session8);
|
|
156
|
-
const
|
|
176
|
+
const base = cfg.apiUrl.replace(/\/+$/, '');
|
|
177
|
+
const url = new URL(`${base}/v1/inbox`);
|
|
157
178
|
url.searchParams.set('project_id', anchor.projectId);
|
|
158
179
|
url.searchParams.set('session_id', session8);
|
|
159
|
-
// Codex hooks
|
|
160
|
-
//
|
|
161
|
-
//
|
|
180
|
+
// Codex hooks inject additionalContext into the active turn. Treat that as
|
|
181
|
+
// delivery for inbound session-directed rows and mark those ids read below, so
|
|
182
|
+
// UserPromptSubmit/PostToolUse do not re-inject the same message every tool.
|
|
162
183
|
url.searchParams.set('peek', '1');
|
|
163
184
|
url.searchParams.set('unread_only', '1');
|
|
164
185
|
try {
|
|
@@ -168,7 +189,12 @@ async function buildCodexInboxSteering(input, cfg, opts = {}) {
|
|
|
168
189
|
if (!res.ok)
|
|
169
190
|
return null;
|
|
170
191
|
const data = await res.json();
|
|
171
|
-
|
|
192
|
+
const messages = data.messages || [];
|
|
193
|
+
const delivered = deliverableMessages(messages, session8);
|
|
194
|
+
const context = formatCodexInboxSteering(messages, session8);
|
|
195
|
+
if (context)
|
|
196
|
+
await markRead(base, cfg.apiKey, delivered.slice(0, 10).map(m => m.id));
|
|
197
|
+
return context;
|
|
172
198
|
}
|
|
173
199
|
catch {
|
|
174
200
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-steering.js","sourceRoot":"","sources":["../src/codex-steering.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"codex-steering.js","sourceRoot":"","sources":["../src/codex-steering.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,7 @@ function buildArmReminder(d, env) {
|
|
|
39
39
|
return null;
|
|
40
40
|
const unread = Number((d.detail && d.detail.unread) || 0);
|
|
41
41
|
const arm = env
|
|
42
|
-
? `ToolSearch select:Monitor → persistent Monitor (timeout_ms:3600000) command: \`${(0, session_id_1.armMonitorCommand)(env.short, env.ownerPid, env.assistant)}\``
|
|
42
|
+
? `ToolSearch select:Monitor → persistent Monitor (timeout_ms:3600000) command: \`${(0, session_id_1.armMonitorCommand)(env.short, env.ownerPid, env.assistant, env.mechanic)}\``
|
|
43
43
|
: `arm your Monitor inbox watcher`;
|
|
44
44
|
const grounded = `greprag reads your watcher as DOWN (isLocallyArmed=false — a real pidfile check on your session, NOT a timer; the hook CAN see your watcher)`;
|
|
45
45
|
if (unread > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arm-reminder.js","sourceRoot":"","sources":["../../src/commands/arm-reminder.ts"],"names":[],"mappings":";AAAA;;;;;uCAKuC;;;AAavC,8BAMC;AAWD,4CAWC;AAtCD,8CAAkD;AAElD,qFAAqF;AACrF,sFAAsF;AACtF,oFAAoF;AACpF,uFAAuF;AAEvF;;iFAEiF;AACjF,SAAgB,SAAS,CAAC,GAAgB;IACxC,IAAI,GAAG,CAAC,KAAK;QAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IACzC,MAAM,MAAM,GAAG,GAAG,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,OAAO,MAAM,GAAG,CAAC;QACf,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE;QACrC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;AAC/C,CAAC;AAED;;;;;;;;sFAQsF;AACtF,SAAgB,gBAAgB,CAAC,CAAY,EAAE,GAAiB;IAC9D,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IACrC,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,IAAK,CAAC,CAAC,MAA8B,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IACnF,MAAM,GAAG,GAAG,GAAG;QACb,CAAC,CAAC,kFAAkF,IAAA,8BAAiB,EAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"arm-reminder.js","sourceRoot":"","sources":["../../src/commands/arm-reminder.ts"],"names":[],"mappings":";AAAA;;;;;uCAKuC;;;AAavC,8BAMC;AAWD,4CAWC;AAtCD,8CAAkD;AAElD,qFAAqF;AACrF,sFAAsF;AACtF,oFAAoF;AACpF,uFAAuF;AAEvF;;iFAEiF;AACjF,SAAgB,SAAS,CAAC,GAAgB;IACxC,IAAI,GAAG,CAAC,KAAK;QAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IACzC,MAAM,MAAM,GAAG,GAAG,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,OAAO,MAAM,GAAG,CAAC;QACf,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE;QACrC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;AAC/C,CAAC;AAED;;;;;;;;sFAQsF;AACtF,SAAgB,gBAAgB,CAAC,CAAY,EAAE,GAAiB;IAC9D,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IACrC,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,IAAK,CAAC,CAAC,MAA8B,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IACnF,MAAM,GAAG,GAAG,GAAG;QACb,CAAC,CAAC,kFAAkF,IAAA,8BAAiB,EAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI;QAC/J,CAAC,CAAC,gCAAgC,CAAC;IACrC,MAAM,QAAQ,GAAG,8IAA8I,CAAC;IAChK,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;QACf,OAAO,0BAA0B,MAAM,eAAe,QAAQ,mEAAmE,GAAG,2BAA2B,CAAC;IAClK,CAAC;IACD,OAAO,eAAe,QAAQ,yGAAyG,GAAG,GAAG,CAAC;AAChJ,CAAC;AAED;;yFAEyF;AAC5E,QAAA,gBAAgB,GAAmB;IAC9C,EAAE,EAAE,aAAa;IACjB,MAAM,EAAE,SAAS;IACjB,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI;IACpB,QAAQ,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,EAAE,GAAG,CAAC;CAC/C,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type CodexAppServerLike, type CodexAppServerTransport } from './codex-app-server-client';
|
|
2
|
-
export type CodexDeliveryMode = 'auto' | 'exec' | 'app-server';
|
|
2
|
+
export type CodexDeliveryMode = 'auto' | 'exec' | 'app-server' | 'app-server-resume';
|
|
3
3
|
export interface CodexTurn {
|
|
4
4
|
id: string;
|
|
5
5
|
status?: string;
|
|
@@ -30,6 +30,7 @@ export interface DeliveryOptions {
|
|
|
30
30
|
export declare function findActiveTurn(turns: CodexTurn[]): CodexTurn | null;
|
|
31
31
|
export declare function resumeCodexExec(codexSession: string, prompt: string, cwd?: string): Promise<number>;
|
|
32
32
|
export declare function deliverViaLoadedAppServer(client: CodexAppServerLike, opts: DeliveryOptions): Promise<DeliveryResult>;
|
|
33
|
+
export declare function deliverViaResumedAppServer(client: CodexAppServerLike, opts: DeliveryOptions): Promise<DeliveryResult>;
|
|
33
34
|
export declare function deliverCodexPrompt(opts: DeliveryOptions): Promise<DeliveryResult>;
|
|
34
35
|
export declare function parseDeliveryMode(value?: string): CodexDeliveryMode;
|
|
35
36
|
export declare function parseTransport(value?: string): CodexAppServerTransport | undefined;
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.findActiveTurn = findActiveTurn;
|
|
4
4
|
exports.resumeCodexExec = resumeCodexExec;
|
|
5
5
|
exports.deliverViaLoadedAppServer = deliverViaLoadedAppServer;
|
|
6
|
+
exports.deliverViaResumedAppServer = deliverViaResumedAppServer;
|
|
6
7
|
exports.deliverCodexPrompt = deliverCodexPrompt;
|
|
7
8
|
exports.parseDeliveryMode = parseDeliveryMode;
|
|
8
9
|
exports.parseTransport = parseTransport;
|
|
@@ -10,6 +11,8 @@ const proc_1 = require("../proc");
|
|
|
10
11
|
const codex_app_server_client_1 = require("./codex-app-server-client");
|
|
11
12
|
let proxyUnavailableUntil = 0;
|
|
12
13
|
let proxyUnavailableDetail = '';
|
|
14
|
+
const RESUME_TURN_WAIT_MS = 60_000;
|
|
15
|
+
const RESUME_TURN_POLL_MS = 1_000;
|
|
13
16
|
function input(prompt) {
|
|
14
17
|
return [{ type: 'text', text: prompt }];
|
|
15
18
|
}
|
|
@@ -20,9 +23,49 @@ function detail(err) {
|
|
|
20
23
|
function findActiveTurn(turns) {
|
|
21
24
|
return turns.find(t => t.status === 'inProgress') || null;
|
|
22
25
|
}
|
|
26
|
+
function sleep(ms) {
|
|
27
|
+
return new Promise(resolve => setTimeout(resolve, ms));
|
|
28
|
+
}
|
|
29
|
+
async function waitForTurnToSettle(client, threadId, turnId, attempts) {
|
|
30
|
+
if (!turnId)
|
|
31
|
+
return;
|
|
32
|
+
const start = Date.now();
|
|
33
|
+
while (Date.now() - start < RESUME_TURN_WAIT_MS) {
|
|
34
|
+
await sleep(RESUME_TURN_POLL_MS);
|
|
35
|
+
try {
|
|
36
|
+
const res = await client.request('thread/turns/list', {
|
|
37
|
+
threadId,
|
|
38
|
+
limit: 5,
|
|
39
|
+
sortDirection: 'desc',
|
|
40
|
+
itemsView: 'notLoaded',
|
|
41
|
+
});
|
|
42
|
+
const turns = Array.isArray(res.data) ? res.data : [];
|
|
43
|
+
const turn = turns.find(t => t.id === turnId);
|
|
44
|
+
if (!turn)
|
|
45
|
+
continue;
|
|
46
|
+
if (turn.status && turn.status !== 'inProgress') {
|
|
47
|
+
attempts.push({ method: 'turn/wait', ok: true, detail: `${turnId} ${turn.status}` });
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
catch (err) {
|
|
52
|
+
attempts.push({ method: 'turn/wait', ok: false, detail: detail(err) });
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
attempts.push({ method: 'turn/wait', ok: false, detail: `${turnId} timed out` });
|
|
57
|
+
}
|
|
23
58
|
function metadata(messageId) {
|
|
24
59
|
return messageId ? { greprag_message_id: messageId, greprag_delivery: 'codex-app-server' } : undefined;
|
|
25
60
|
}
|
|
61
|
+
function turnBase(opts) {
|
|
62
|
+
return {
|
|
63
|
+
threadId: opts.codexSession,
|
|
64
|
+
input: input(opts.prompt),
|
|
65
|
+
clientUserMessageId: opts.messageId ? `greprag-${opts.messageId}` : undefined,
|
|
66
|
+
responsesapiClientMetadata: metadata(opts.messageId),
|
|
67
|
+
};
|
|
68
|
+
}
|
|
26
69
|
async function resumeCodexExec(codexSession, prompt, cwd) {
|
|
27
70
|
return new Promise((resolve) => {
|
|
28
71
|
const args = ['exec', 'resume', codexSession, '-'];
|
|
@@ -86,12 +129,7 @@ async function deliverViaLoadedAppServer(client, opts) {
|
|
|
86
129
|
catch (err) {
|
|
87
130
|
attempts.push({ method: 'thread/turns/list', ok: false, detail: detail(err) });
|
|
88
131
|
}
|
|
89
|
-
const base =
|
|
90
|
-
threadId: opts.codexSession,
|
|
91
|
-
input: input(opts.prompt),
|
|
92
|
-
clientUserMessageId: opts.messageId ? `greprag-${opts.messageId}` : undefined,
|
|
93
|
-
responsesapiClientMetadata: metadata(opts.messageId),
|
|
94
|
-
};
|
|
132
|
+
const base = turnBase(opts);
|
|
95
133
|
const active = findActiveTurn(turns);
|
|
96
134
|
if (active) {
|
|
97
135
|
try {
|
|
@@ -128,6 +166,87 @@ async function deliverViaLoadedAppServer(client, opts) {
|
|
|
128
166
|
};
|
|
129
167
|
}
|
|
130
168
|
}
|
|
169
|
+
async function deliverViaResumedAppServer(client, opts) {
|
|
170
|
+
const attempts = [];
|
|
171
|
+
try {
|
|
172
|
+
await client.initialize();
|
|
173
|
+
attempts.push({ method: 'app-server.initialize', ok: true });
|
|
174
|
+
}
|
|
175
|
+
catch (err) {
|
|
176
|
+
return {
|
|
177
|
+
ok: false,
|
|
178
|
+
method: 'app-server-resume',
|
|
179
|
+
reason: 'initialize-failed',
|
|
180
|
+
attempts: [{ method: 'app-server.initialize', ok: false, detail: detail(err) }],
|
|
181
|
+
};
|
|
182
|
+
}
|
|
183
|
+
try {
|
|
184
|
+
const res = await client.request('thread/resume', { threadId: opts.codexSession });
|
|
185
|
+
const status = res.thread?.status?.type;
|
|
186
|
+
attempts.push({ method: 'thread/resume', ok: true, detail: status ? `status=${status}` : undefined });
|
|
187
|
+
}
|
|
188
|
+
catch (err) {
|
|
189
|
+
return {
|
|
190
|
+
ok: false,
|
|
191
|
+
method: 'app-server-resume',
|
|
192
|
+
reason: 'resume-failed',
|
|
193
|
+
attempts: attempts.concat({ method: 'thread/resume', ok: false, detail: detail(err) }),
|
|
194
|
+
};
|
|
195
|
+
}
|
|
196
|
+
let turns = [];
|
|
197
|
+
try {
|
|
198
|
+
const res = await client.request('thread/turns/list', {
|
|
199
|
+
threadId: opts.codexSession,
|
|
200
|
+
limit: 5,
|
|
201
|
+
sortDirection: 'desc',
|
|
202
|
+
itemsView: 'notLoaded',
|
|
203
|
+
});
|
|
204
|
+
turns = Array.isArray(res.data) ? res.data : [];
|
|
205
|
+
attempts.push({ method: 'thread/turns/list', ok: true, detail: `${turns.length} turns` });
|
|
206
|
+
}
|
|
207
|
+
catch (err) {
|
|
208
|
+
attempts.push({ method: 'thread/turns/list', ok: false, detail: detail(err) });
|
|
209
|
+
}
|
|
210
|
+
const base = turnBase(opts);
|
|
211
|
+
const active = findActiveTurn(turns);
|
|
212
|
+
if (active) {
|
|
213
|
+
try {
|
|
214
|
+
const res = await client.request('turn/steer', { ...base, expectedTurnId: active.id });
|
|
215
|
+
await waitForTurnToSettle(client, opts.codexSession, res.turn?.id || active.id, attempts);
|
|
216
|
+
return {
|
|
217
|
+
ok: true,
|
|
218
|
+
method: 'app-server-resume-steer',
|
|
219
|
+
attempts: attempts.concat({ method: 'turn/steer', ok: true, detail: active.id }),
|
|
220
|
+
};
|
|
221
|
+
}
|
|
222
|
+
catch (err) {
|
|
223
|
+
return {
|
|
224
|
+
ok: false,
|
|
225
|
+
method: 'app-server-resume-steer',
|
|
226
|
+
reason: 'steer-failed',
|
|
227
|
+
attempts: attempts.concat({ method: 'turn/steer', ok: false, detail: detail(err) }),
|
|
228
|
+
};
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
try {
|
|
232
|
+
const res = await client.request('turn/start', opts.cwd ? { ...base, cwd: opts.cwd } : base);
|
|
233
|
+
const waitAttempts = [];
|
|
234
|
+
await waitForTurnToSettle(client, opts.codexSession, res.turn?.id, waitAttempts);
|
|
235
|
+
return {
|
|
236
|
+
ok: true,
|
|
237
|
+
method: 'app-server-resume-turn-start',
|
|
238
|
+
attempts: attempts.concat({ method: 'turn/start', ok: true }, waitAttempts),
|
|
239
|
+
};
|
|
240
|
+
}
|
|
241
|
+
catch (err) {
|
|
242
|
+
return {
|
|
243
|
+
ok: false,
|
|
244
|
+
method: 'app-server-resume-turn-start',
|
|
245
|
+
reason: 'turn-start-failed',
|
|
246
|
+
attempts: attempts.concat({ method: 'turn/start', ok: false, detail: detail(err) }),
|
|
247
|
+
};
|
|
248
|
+
}
|
|
249
|
+
}
|
|
131
250
|
async function deliverCodexPrompt(opts) {
|
|
132
251
|
const mode = opts.mode || 'auto';
|
|
133
252
|
if (mode === 'exec') {
|
|
@@ -153,7 +272,9 @@ async function deliverCodexPrompt(opts) {
|
|
|
153
272
|
});
|
|
154
273
|
let app;
|
|
155
274
|
try {
|
|
156
|
-
app =
|
|
275
|
+
app = mode === 'app-server-resume'
|
|
276
|
+
? await deliverViaResumedAppServer(client, opts)
|
|
277
|
+
: await deliverViaLoadedAppServer(client, opts);
|
|
157
278
|
}
|
|
158
279
|
finally {
|
|
159
280
|
if (ownsClient)
|
|
@@ -168,6 +289,8 @@ async function deliverCodexPrompt(opts) {
|
|
|
168
289
|
return app;
|
|
169
290
|
}
|
|
170
291
|
function parseDeliveryMode(value) {
|
|
292
|
+
if (value === 'resume' || value === 'app-server-resume')
|
|
293
|
+
return 'app-server-resume';
|
|
171
294
|
if (value === 'exec' || value === 'app-server' || value === 'auto')
|
|
172
295
|
return value;
|
|
173
296
|
return 'auto';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-delivery.js","sourceRoot":"","sources":["../../src/commands/codex-delivery.ts"],"names":[],"mappings":";;AAoDA,wCAEC;AAMD,0CAYC;AAED,8DA8FC;AAED,gDAsCC;AAED,8CAGC;AAED,wCAGC;AA1ND,kCAAoC;AACpC,uEAImC;AAmCnC,IAAI,qBAAqB,GAAG,CAAC,CAAC;AAC9B,IAAI,sBAAsB,GAAG,EAAE,CAAC;AAEhC,SAAS,KAAK,CAAC,MAAc;IAC3B,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,MAAM,CAAC,GAAY;IAC1B,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACjE,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;AAC7C,CAAC;AAED,SAAgB,cAAc,CAAC,KAAkB;IAC/C,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,YAAY,CAAC,IAAI,IAAI,CAAC;AAC5D,CAAC;AAED,SAAS,QAAQ,CAAC,SAAkB;IAClC,OAAO,SAAS,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,SAAS,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AACzG,CAAC;AAEM,KAAK,UAAU,eAAe,CAAC,YAAoB,EAAE,MAAc,EAAE,GAAY;IACtF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,IAAA,gBAAS,EAAC,OAAO,EAAE,IAAI,EAAE;YACrC,GAAG,EAAE,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE;YACzB,KAAK,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC;YACrC,KAAK,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO;SACpC,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QACpC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;QAC9C,KAAK,CAAC,KAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,yBAAyB,CAC7C,MAA0B,EAC1B,IAAqB;IAErB,MAAM,QAAQ,GAAsB,EAAE,CAAC;IACvC,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;QAC1B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,uBAAuB,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/D,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO;YACL,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,YAAY;YACpB,MAAM,EAAE,mBAAmB;YAC3B,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,uBAAuB,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;SAChF,CAAC;IACJ,CAAC;IAED,IAAI,MAAM,GAAa,EAAE,CAAC;IAC1B,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAwB,CAAC;QAC9F,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QACjD,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,oBAAoB,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,SAAS,EAAE,CAAC,CAAC;IAC/F,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO;YACL,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,YAAY;YACpB,MAAM,EAAE,oBAAoB;YAC5B,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,oBAAoB,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;SAC5F,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,OAAO;YACL,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,YAAY;YACpB,MAAM,EAAE,mBAAmB;YAC3B,QAAQ;SACT,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,GAAgB,EAAE,CAAC;IAC5B,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,mBAAmB,EAAE;YACpD,QAAQ,EAAE,IAAI,CAAC,YAAY;YAC3B,KAAK,EAAE,CAAC;YACR,aAAa,EAAE,MAAM;YACrB,SAAS,EAAE,WAAW;SACvB,CAA2B,CAAC;QAC7B,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,mBAAmB,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,QAAQ,EAAE,CAAC,CAAC;IAC5F,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,mBAAmB,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACjF,CAAC;IAED,MAAM,IAAI,GAAG;QACX,QAAQ,EAAE,IAAI,CAAC,YAAY;QAC3B,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;QACzB,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS;QAC7E,0BAA0B,EAAE,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC;KACrD,CAAC;IACF,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACrC,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,GAAG,IAAI,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3E,OAAO;gBACL,EAAE,EAAE,IAAI;gBACR,MAAM,EAAE,kBAAkB;gBAC1B,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;aACjF,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,MAAM,EAAE,kBAAkB;gBAC1B,MAAM,EAAE,cAAc;gBACtB,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;aACpF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACjF,OAAO;YACL,EAAE,EAAE,IAAI;YACR,MAAM,EAAE,uBAAuB;YAC/B,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;SAC9D,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO;YACL,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,uBAAuB;YAC/B,MAAM,EAAE,mBAAmB;YAC3B,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;SACpF,CAAC;IACJ,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,kBAAkB,CAAC,IAAqB;IAC5D,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC;IACjC,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,IAAI,eAAe,CAAC;QACnD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QACrE,OAAO,EAAE,EAAE,EAAE,IAAI,KAAK,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,EAAE,IAAI,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC;IAC1H,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,OAAO,CAAC;IAC5C,IAAI,IAAI,KAAK,MAAM,IAAI,SAAS,KAAK,OAAO,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,qBAAqB,EAAE,CAAC;QACnF,OAAO;YACL,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,YAAY;YACpB,MAAM,EAAE,0BAA0B;YAClC,QAAQ,EAAE;gBACR,EAAE,MAAM,EAAE,qCAAqC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,sBAAsB,EAAE;aAC7F;SACF,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC;IACzC,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,IAAI,IAAI,8CAAoB,CAAC;QAC9D,SAAS,EAAE,IAAI,CAAC,kBAAkB,IAAI,KAAK;QAC3C,SAAS;KACV,CAAC,CAAC;IACH,IAAI,GAAmB,CAAC;IACxB,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,yBAAyB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACtD,CAAC;YAAS,CAAC;QACT,IAAI,UAAU;YAAE,MAAM,CAAC,KAAK,EAAE,CAAC;IACjC,CAAC;IACD,IAAI,GAAG,CAAC,EAAE,IAAI,IAAI,KAAK,YAAY;QAAE,OAAO,GAAG,CAAC;IAChD,IAAI,SAAS,KAAK,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,KAAK,mBAAmB,IAAI,GAAG,CAAC,MAAM,KAAK,oBAAoB,CAAC,EAAE,CAAC;QACzG,qBAAqB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC;QAC5C,sBAAsB,GAAG,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;IACrF,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAgB,iBAAiB,CAAC,KAAc;IAC9C,IAAI,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,YAAY,IAAI,KAAK,KAAK,MAAM;QAAE,OAAO,KAAK,CAAC;IACjF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,cAAc,CAAC,KAAc;IAC3C,IAAI,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,OAAO;QAAE,OAAO,KAAK,CAAC;IACzD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
1
|
+
{"version":3,"file":"codex-delivery.js","sourceRoot":"","sources":["../../src/commands/codex-delivery.ts"],"names":[],"mappings":"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"}
|
|
@@ -83,7 +83,7 @@ function readCodexHooks() {
|
|
|
83
83
|
}
|
|
84
84
|
function hasHook(cfg, event, command) {
|
|
85
85
|
const hooks = cfg.hooks;
|
|
86
|
-
return (hooks?.[event] || []).some(entry => (entry.hooks || []).some(hook =>
|
|
86
|
+
return (hooks?.[event] || []).some(entry => (entry.hooks || []).some(hook => `${hook.command || ''}\n${hook.commandWindows || ''}`.includes(command)));
|
|
87
87
|
}
|
|
88
88
|
function runCodex(args) {
|
|
89
89
|
const result = (0, proc_1.safeSpawnSync)('codex', args, {
|
|
@@ -114,8 +114,8 @@ function runWakeActionProbe() {
|
|
|
114
114
|
}
|
|
115
115
|
else {
|
|
116
116
|
console.log(' Result: native Windows sandbox cannot spawn commands here.');
|
|
117
|
-
console.log('
|
|
118
|
-
console.log(' Unsafe bypass is intentionally not enabled by default.');
|
|
117
|
+
console.log(' This is a post-delivery action limit, not proof that Codex thread delivery failed.');
|
|
118
|
+
console.log(' Unsafe sandbox bypass is intentionally not enabled by default.');
|
|
119
119
|
}
|
|
120
120
|
}
|
|
121
121
|
async function runAppServerWakeProbe(codexSession) {
|
|
@@ -128,19 +128,35 @@ async function runAppServerWakeProbe(codexSession) {
|
|
|
128
128
|
const probe = await (0, codex_wake_test_1.probeCodexWakePath)({ codexSession, transport: 'proxy', timeoutMs: 5_000 });
|
|
129
129
|
if (!probe.initialize?.ok) {
|
|
130
130
|
console.log(` proxy initialize: failed (${probe.initialize?.detail || 'unknown error'})`);
|
|
131
|
-
console.log('
|
|
131
|
+
console.log(' proxy loaded-thread path: unavailable');
|
|
132
|
+
}
|
|
133
|
+
else {
|
|
134
|
+
console.log(' proxy initialize: ok');
|
|
135
|
+
console.log(` loaded threads: ${probe.loadedThreads?.length ?? 0}`);
|
|
136
|
+
console.log(` this thread: ${probe.targetLoaded ? 'loaded' : 'not loaded'}`);
|
|
137
|
+
if (probe.targetLoaded) {
|
|
138
|
+
console.log(` active turn: ${probe.activeTurnId || 'none'}`);
|
|
139
|
+
console.log(' proxy loaded-thread path: available for turn/start or turn/steer');
|
|
140
|
+
}
|
|
141
|
+
else {
|
|
142
|
+
console.log(' proxy loaded-thread path: unavailable for this thread');
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
const resume = await (0, codex_wake_test_1.probeCodexResumePath)({ codexSession, transport: 'stdio', timeoutMs: 5_000 });
|
|
146
|
+
if (!resume.initialize?.ok) {
|
|
147
|
+
console.log(` stdio initialize: failed (${resume.initialize?.detail || 'unknown error'})`);
|
|
132
148
|
console.log(' `--delivery exec` is diagnostic/history-only and is not counted as live breakthrough.');
|
|
133
149
|
return;
|
|
134
150
|
}
|
|
135
|
-
console.log('
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
console.log(
|
|
140
|
-
console.log(' Result: native app-server turn/start or turn/steer delivery is available.');
|
|
151
|
+
console.log(' stdio initialize: ok');
|
|
152
|
+
if (resume.resume?.ok) {
|
|
153
|
+
console.log(` thread/resume: ok${resume.resume.status ? ` (status=${resume.resume.status})` : ''}`);
|
|
154
|
+
console.log(' Result: app-server-resume delivery is available.');
|
|
155
|
+
console.log(' Startup watcher should use: --delivery app-server-resume --transport stdio');
|
|
141
156
|
}
|
|
142
157
|
else {
|
|
143
|
-
console.log(
|
|
158
|
+
console.log(` thread/resume: failed (${resume.resume?.detail || 'unknown error'})`);
|
|
159
|
+
console.log(' Result: no app-server thread delivery path is currently reachable.');
|
|
144
160
|
console.log(' `--delivery exec` is diagnostic/history-only and is not counted as live breakthrough.');
|
|
145
161
|
}
|
|
146
162
|
}
|
|
@@ -164,6 +180,7 @@ async function doctorCodex(args, deps) {
|
|
|
164
180
|
console.log(' Expected hooks:');
|
|
165
181
|
console.log(` SessionStart recap: ${hasHook(hooks, 'SessionStart', 'recap') ? 'yes' : 'no'}`);
|
|
166
182
|
console.log(` SessionStart session-id: ${hasHook(hooks, 'SessionStart', 'session-id') ? 'yes' : 'no'}`);
|
|
183
|
+
console.log(` SessionStart drain: ${hasHook(hooks, 'SessionStart', 'drain') ? 'yes' : 'no'}`);
|
|
167
184
|
console.log(` UserPromptSubmit notify: ${hasHook(hooks, 'UserPromptSubmit', 'codex-notify') ? 'yes' : 'no'}`);
|
|
168
185
|
console.log(` PostToolUse inbox: ${hasHook(hooks, 'PostToolUse', 'codex-inbox') ? 'yes' : 'no'}`);
|
|
169
186
|
console.log(` PermissionRequest ctx: ${hasHook(hooks, 'PermissionRequest', 'codex-permission-context') ? 'yes' : 'no'}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-doctor.js","sourceRoot":"","sources":["../../src/commands/codex-doctor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"codex-doctor.js","sourceRoot":"","sources":["../../src/commands/codex-doctor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+IA,kCAiDC;AAhMD,uCAAyB;AACzB,uCAAyB;AACzB,2CAA6B;AAC7B,kCAAwC;AACxC,8CAAkD;AAClD,uDAA6E;AAE7E,MAAM,eAAe,GAAG,yBAAyB,CAAC;AAclD,SAAS,IAAI;IACX,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;AACrE,CAAC;AAED,SAAS,WAAW,CAAC,QAAgB;IACnC,IAAI,CAAC;QACH,KAAK,MAAM,IAAI,IAAI,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YACrE,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YAC5B,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;gBAAE,SAAS;YAClD,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACjC,IAAI,GAAG,GAAG,CAAC;gBAAE,SAAS;YACtB,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YACzC,IAAI,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC1C,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBAC9C,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBAAE,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC/E,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAClD,CAAC;IACH,CAAC;IAAC,MAAM,CAAC,CAAC,sBAAsB,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,MAAM;IACb,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IACnD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe;QAAE,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;IAChF,OAAO;QACL,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,eAAe;QACtD,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,EAAE;KAC1C,CAAC;AACJ,CAAC;AAED,SAAS,cAAc;IACrB,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAA4B,CAAC;IACpH,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,OAAO,CAAC,GAA4B,EAAE,KAAa,EAAE,OAAe;IAC3E,MAAM,KAAK,GAAG,GAAG,CAAC,KAA4G,CAAC;IAC/H,OAAO,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CACzC,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,KAAK,IAAI,CAAC,cAAc,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAC1G,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,IAAc;IAC9B,MAAM,MAAM,GAAG,IAAA,oBAAa,EAAC,OAAO,EAAE,IAAI,EAAE;QAC1C,QAAQ,EAAE,MAAM;QAChB,KAAK,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO;QACnC,OAAO,EAAE,MAAM;KAChB,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;IACnE,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;AAC3C,CAAC;AAED,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,WAAW,CAAC;AAClG,CAAC;AAED,SAAS,kBAAkB;IACzB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACpC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,OAAO,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;QAChE,OAAO,CAAC,GAAG,CAAC,yEAAyE,CAAC,CAAC;QACvF,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,IAAI,EAAE,4BAA4B,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,2BAA2B,CAAC,CAAC,CAAC;IACxI,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,IAAI,EAAE,8BAA8B,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,6BAA6B,CAAC,CAAC,CAAC;IAC9I,OAAO,CAAC,GAAG,CAAC,2BAA2B,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IACtG,OAAO,CAAC,GAAG,CAAC,2BAA2B,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAE1G,IAAI,QAAQ,CAAC,EAAE,IAAI,UAAU,CAAC,EAAE,EAAE,CAAC;QACjC,OAAO,CAAC,GAAG,CAAC,wFAAwF,CAAC,CAAC;IACxG,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,gEAAgE,CAAC,CAAC;QAC9E,OAAO,CAAC,GAAG,CAAC,wFAAwF,CAAC,CAAC;QACtG,OAAO,CAAC,GAAG,CAAC,oEAAoE,CAAC,CAAC;IACpF,CAAC;AACH,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,YAA2B;IAC9D,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;IACxC,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;QACpD,OAAO;IACT,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,IAAA,oCAAkB,EAAC,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IAC/F,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,EAAE,CAAC;QAC1B,OAAO,CAAC,GAAG,CAAC,iCAAiC,KAAK,CAAC,UAAU,EAAE,MAAM,IAAI,eAAe,GAAG,CAAC,CAAC;QAC7F,OAAO,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC;IAC3D,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,0BAA0B,KAAK,CAAC,aAAa,EAAE,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1E,OAAO,CAAC,GAAG,CAAC,0BAA0B,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;QACtF,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,0BAA0B,KAAK,CAAC,YAAY,IAAI,MAAM,EAAE,CAAC,CAAC;YACtE,OAAO,CAAC,GAAG,CAAC,sEAAsE,CAAC,CAAC;QACtF,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,2DAA2D,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,sCAAoB,EAAC,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IAClG,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,EAAE,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,iCAAiC,MAAM,CAAC,UAAU,EAAE,MAAM,IAAI,eAAe,GAAG,CAAC,CAAC;QAC9F,OAAO,CAAC,GAAG,CAAC,2FAA2F,CAAC,CAAC;QACzG,OAAO;IACT,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;IACxC,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC;QACtB,OAAO,CAAC,GAAG,CAAC,4BAA4B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3G,OAAO,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAAC;QACpE,OAAO,CAAC,GAAG,CAAC,gFAAgF,CAAC,CAAC;IAChG,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,kCAAkC,MAAM,CAAC,MAAM,EAAE,MAAM,IAAI,eAAe,GAAG,CAAC,CAAC;QAC3F,OAAO,CAAC,GAAG,CAAC,wEAAwE,CAAC,CAAC;QACtF,OAAO,CAAC,GAAG,CAAC,2FAA2F,CAAC,CAAC;IAC3G,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,IAAc,EAAE,IAAgB;IAChE,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;IACrB,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IACnC,MAAM,YAAY,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAClD,MAAM,QAAQ,GAAG,IAAA,8BAAiB,EAAC,YAAY,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,cAAc,EAAE,CAAC;IAC/B,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;IACxC,MAAM,WAAW,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC;IAEpE,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAC9B,OAAO,CAAC,GAAG,CAAC,uBAAuB,WAAW,EAAE,CAAC,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,uBAAuB,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,yDAAyD,EAAE,CAAC,CAAC;IAC5H,OAAO,CAAC,GAAG,CAAC,uBAAuB,YAAY,CAAC,CAAC,CAAC,GAAG,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,8CAA8C,EAAE,CAAC,CAAC;IAC3J,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;IACvF,OAAO,CAAC,GAAG,CAAC,+FAA+F,CAAC,CAAC;IAC7G,OAAO,CAAC,GAAG,CAAC,uBAAuB,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,KAAK,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC;IAC1G,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACjC,OAAO,CAAC,GAAG,CAAC,iCAAiC,OAAO,CAAC,KAAK,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACvG,OAAO,CAAC,GAAG,CAAC,iCAAiC,OAAO,CAAC,KAAK,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5G,OAAO,CAAC,GAAG,CAAC,iCAAiC,OAAO,CAAC,KAAK,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACvG,OAAO,CAAC,GAAG,CAAC,iCAAiC,OAAO,CAAC,KAAK,EAAE,kBAAkB,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAClH,OAAO,CAAC,GAAG,CAAC,iCAAiC,OAAO,CAAC,KAAK,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5G,OAAO,CAAC,GAAG,CAAC,iCAAiC,OAAO,CAAC,KAAK,EAAE,mBAAmB,EAAE,0BAA0B,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/H,OAAO,CAAC,GAAG,CAAC,iCAAiC,OAAO,CAAC,KAAK,EAAE,eAAe,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACvH,OAAO,CAAC,GAAG,CAAC,iCAAiC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACrG,OAAO,CAAC,GAAG,CAAC,iCAAiC,OAAO,CAAC,KAAK,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAE3G,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QACjC,kBAAkB,EAAE,CAAC;QACrB,MAAM,qBAAqB,CAAC,YAAY,CAAC,CAAC;IAC5C,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,MAAM;QAAE,OAAO;IACxB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,oBAAoB,EAAE;YAC7E,OAAO,EAAE,EAAE,eAAe,EAAE,UAAU,GAAG,CAAC,MAAM,EAAE,EAAE;SACrD,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QACnD,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAA0D,CAAC;QACtF,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC;QACrC,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC9E,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,uBAAuB,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QACtD,IAAI,QAAQ;YAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB,KAAK,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,iCAAiC,EAAE,CAAC,CAAC;IAChI,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,oCAAqC,GAAa,CAAC,OAAO,GAAG,CAAC,CAAC;IAC7E,CAAC;AACH,CAAC"}
|
|
@@ -2,6 +2,11 @@ export interface RecentCodexSession {
|
|
|
2
2
|
id: string;
|
|
3
3
|
cwd?: string;
|
|
4
4
|
}
|
|
5
|
+
export interface CodexWatchAllOptions {
|
|
6
|
+
appServerTimeoutMs?: number;
|
|
7
|
+
delivery?: string;
|
|
8
|
+
transport?: string;
|
|
9
|
+
}
|
|
5
10
|
export declare function recentSessions(now?: number): RecentCodexSession[];
|
|
6
11
|
export declare function recentSessionIds(now?: number): string[];
|
|
7
|
-
export declare function runCodexWatchAll(): Promise<void>;
|
|
12
|
+
export declare function runCodexWatchAll(opts?: CodexWatchAllOptions): Promise<void>;
|
|
@@ -41,8 +41,10 @@ const os = __importStar(require("os"));
|
|
|
41
41
|
const path = __importStar(require("path"));
|
|
42
42
|
const proc_1 = require("../proc");
|
|
43
43
|
const session_id_1 = require("../session-id");
|
|
44
|
+
const project_anchor_1 = require("../project-anchor");
|
|
45
|
+
const mechanic_role_1 = require("../mechanic-role");
|
|
44
46
|
const POLL_MS = 15_000;
|
|
45
|
-
const DEFAULT_MAX_SESSIONS =
|
|
47
|
+
const DEFAULT_MAX_SESSIONS = 10;
|
|
46
48
|
const DEFAULT_MAX_SESSION_AGE_HOURS = 48;
|
|
47
49
|
const LOCK_STALE_MS = 24 * 60 * 60 * 1000;
|
|
48
50
|
const MAX_META_LINE_BYTES = 2 * 1024 * 1024;
|
|
@@ -215,7 +217,7 @@ function acquireSingletonLock() {
|
|
|
215
217
|
catch { /* best-effort cleanup */ }
|
|
216
218
|
};
|
|
217
219
|
}
|
|
218
|
-
function spawnWatcher(session) {
|
|
220
|
+
function spawnWatcher(session, opts = {}) {
|
|
219
221
|
const short = (0, session_id_1.truncateSessionId)(session.id) || session.id.slice(0, 8);
|
|
220
222
|
const logDir = path.join(home(), '.greprag', 'logs');
|
|
221
223
|
fs.mkdirSync(logDir, { recursive: true });
|
|
@@ -225,6 +227,12 @@ function spawnWatcher(session) {
|
|
|
225
227
|
const args = [cli, 'codex', 'watch', '--session', session.id];
|
|
226
228
|
if (session.cwd)
|
|
227
229
|
args.push('--cd', session.cwd);
|
|
230
|
+
if (opts.delivery)
|
|
231
|
+
args.push('--delivery', opts.delivery);
|
|
232
|
+
if (opts.transport)
|
|
233
|
+
args.push('--transport', opts.transport);
|
|
234
|
+
if (opts.appServerTimeoutMs)
|
|
235
|
+
args.push('--timeout-ms', String(opts.appServerTimeoutMs));
|
|
228
236
|
const child = (0, proc_1.safeSpawn)(process.execPath, args, {
|
|
229
237
|
cwd: session.cwd || undefined,
|
|
230
238
|
stdio: ['ignore', out, err],
|
|
@@ -239,7 +247,18 @@ function spawnWatcher(session) {
|
|
|
239
247
|
});
|
|
240
248
|
return child;
|
|
241
249
|
}
|
|
242
|
-
|
|
250
|
+
function watchRole(session) {
|
|
251
|
+
if (!session.cwd)
|
|
252
|
+
return 'normal';
|
|
253
|
+
try {
|
|
254
|
+
const anchor = (0, project_anchor_1.readAnchor)(session.cwd);
|
|
255
|
+
return (0, mechanic_role_1.isMechanicSession)(anchor, session.id) ? 'mechanic' : 'normal';
|
|
256
|
+
}
|
|
257
|
+
catch {
|
|
258
|
+
return 'normal';
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
async function runCodexWatchAll(opts = {}) {
|
|
243
262
|
const releaseLock = acquireSingletonLock();
|
|
244
263
|
if (!releaseLock) {
|
|
245
264
|
console.error('[greprag codex watch --all] another supervisor is already running');
|
|
@@ -249,28 +268,34 @@ async function runCodexWatchAll() {
|
|
|
249
268
|
const reconcile = () => {
|
|
250
269
|
const sessions = recentSessions();
|
|
251
270
|
const desired = new Set(sessions.map(session => (0, session_id_1.truncateSessionId)(session.id)).filter((id) => Boolean(id)));
|
|
252
|
-
|
|
253
|
-
|
|
271
|
+
const byShort = new Map(sessions
|
|
272
|
+
.map(session => [(0, session_id_1.truncateSessionId)(session.id), session])
|
|
273
|
+
.filter((entry) => Boolean(entry[0])));
|
|
274
|
+
for (const [short, entry] of children) {
|
|
275
|
+
const session = byShort.get(short);
|
|
276
|
+
const nextRole = session ? watchRole(session) : 'normal';
|
|
277
|
+
if (desired.has(short) && entry.role === nextRole)
|
|
254
278
|
continue;
|
|
255
|
-
console.error(`[greprag codex watch --all] disarming ${short}`);
|
|
279
|
+
console.error(`[greprag codex watch --all] disarming ${short}${desired.has(short) ? ` role ${entry.role}->${nextRole}` : ''}`);
|
|
256
280
|
children.delete(short);
|
|
257
|
-
child.kill();
|
|
281
|
+
entry.child.kill();
|
|
258
282
|
}
|
|
259
283
|
for (const session of sessions) {
|
|
260
284
|
const short = (0, session_id_1.truncateSessionId)(session.id);
|
|
261
285
|
if (!short || children.has(short))
|
|
262
286
|
continue;
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
287
|
+
const role = watchRole(session);
|
|
288
|
+
console.error(`[greprag codex watch --all] arming ${short}${role === 'mechanic' ? ' role=mechanic' : ''}${session.cwd ? ` cwd=${session.cwd}` : ''}`);
|
|
289
|
+
const child = spawnWatcher(session, opts);
|
|
290
|
+
children.set(short, { child, role });
|
|
266
291
|
child.on('exit', () => children.delete(short));
|
|
267
292
|
}
|
|
268
293
|
};
|
|
269
294
|
reconcile();
|
|
270
295
|
setInterval(reconcile, POLL_MS);
|
|
271
296
|
const shutdown = () => {
|
|
272
|
-
for (const
|
|
273
|
-
child.kill();
|
|
297
|
+
for (const entry of children.values())
|
|
298
|
+
entry.child.kill();
|
|
274
299
|
releaseLock();
|
|
275
300
|
};
|
|
276
301
|
process.once('exit', releaseLock);
|