@raidiant/notifai 11.6.1-beta.5 → 11.6.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/CHANGELOG.md +13 -35
- package/dist/attendant-update.d.ts +15 -0
- package/dist/attendant-update.js +96 -0
- package/dist/attendant-update.js.map +1 -0
- package/dist/codex-native-turn.d.ts +19 -0
- package/dist/codex-native-turn.js +113 -0
- package/dist/codex-native-turn.js.map +1 -0
- package/dist/commands-doctor.js +10 -1
- package/dist/commands-doctor.js.map +1 -1
- package/dist/commands-hook-attend.d.ts +7 -0
- package/dist/commands-hook-attend.js +94 -23
- package/dist/commands-hook-attend.js.map +1 -1
- package/dist/commands-update-resume.js +11 -1
- package/dist/commands-update-resume.js.map +1 -1
- package/dist/hook-question-lock.d.ts +4 -0
- package/dist/hook-question-lock.js +21 -0
- package/dist/hook-question-lock.js.map +1 -1
- package/dist/hook-types.d.ts +8 -0
- package/dist/program.js +4 -0
- package/dist/program.js.map +1 -1
- package/dist/readiness.js +2 -0
- package/dist/readiness.js.map +1 -1
- package/dist/session-attendant-state.d.ts +5 -0
- package/dist/session-attendant-state.js +48 -1
- package/dist/session-attendant-state.js.map +1 -1
- package/dist/skill-source/manifest.json +1 -1
- package/dist/update-handoff.js +5 -3
- package/dist/update-handoff.js.map +1 -1
- package/package.json +2 -2
|
@@ -6,6 +6,7 @@ import { type ProcessIdentity } from './process-identity.js';
|
|
|
6
6
|
import { type AttendantClock, type AttendantResult, type GateResult } from './session-attendant.js';
|
|
7
7
|
import { type ClaudeProbeAdapters } from './session-attendant-probe.js';
|
|
8
8
|
import type { DeliveryLease } from './session-delivery.js';
|
|
9
|
+
export declare const attendantRuntimeRevision: string;
|
|
9
10
|
/** Test seams; production reads the real harness, clocks, and signals. */
|
|
10
11
|
export interface AttendantSeams {
|
|
11
12
|
harnessProcess?: ProcessIdentity;
|
|
@@ -35,6 +36,12 @@ export declare function attendHook(deps: CommandDeps, input: {
|
|
|
35
36
|
cwd: string;
|
|
36
37
|
invokedAt: LifecycleStamp;
|
|
37
38
|
logger: Logger;
|
|
39
|
+
/** Explicit updater recovery, never a fabricated native hook invocation. */
|
|
40
|
+
recovery?: {
|
|
41
|
+
key: string;
|
|
42
|
+
harnessProcess: ProcessIdentity;
|
|
43
|
+
transcriptPath: string;
|
|
44
|
+
};
|
|
38
45
|
}): Promise<number>;
|
|
39
46
|
/**
|
|
40
47
|
* Record the Codex turn this prompt starts. Called from the synchronous
|
|
@@ -8,14 +8,16 @@ import { hasSessionInputs, stageSessionMessages, wakeSessionInputs } from './ses
|
|
|
8
8
|
* never delays: the harness does not wait for an async handler), and on
|
|
9
9
|
* UserPromptSubmit and Stop to re-arm a session whose attendant died.
|
|
10
10
|
*/
|
|
11
|
-
import { existsSync, readFileSync, realpathSync } from 'node:fs';
|
|
11
|
+
import { existsSync, readFileSync, realpathSync, readdirSync } from 'node:fs';
|
|
12
12
|
import path from 'node:path';
|
|
13
|
+
import { createHash } from 'node:crypto';
|
|
14
|
+
import { fileURLToPath } from 'node:url';
|
|
13
15
|
import { EXIT, makeClient } from './commands-core.js';
|
|
14
16
|
import { claudeSessionPid } from './commands-harness-context.js';
|
|
15
17
|
import { loadConfig } from './config.js';
|
|
16
18
|
import { inspectHookAdapter, isNpxAdapterTarget } from './hook-adapter.js';
|
|
17
|
-
import { acquireClaimFile, claimHolderMayRun, readClaimFile, releaseClaimFile } from './hook-question-lock.js';
|
|
18
|
-
import { beginSessionIncarnation, endsIncarnation, readSessionEndMarker, readSessionIncarnation, readSessionState, refreshSessionMarkers, rotateSessionIncarnation, sessionNotified, } from './hook-session-state.js';
|
|
19
|
+
import { acquireClaimFile, claimHolderMayRun, readClaimFile, releaseClaimFile, requestClaimHandoff } from './hook-question-lock.js';
|
|
20
|
+
import { beginSessionIncarnation, endsIncarnation, readSessionEndMarker, readSessionIncarnation, readSessionState, refreshSessionMarkers, rotateSessionIncarnation, sessionNotified, sessionHasEnded, updateSessionState, happenedBefore, } from './hook-session-state.js';
|
|
19
21
|
import { findInstallations, findLegacyProjectInstallations, handlerEvent } from './install-hooks.js';
|
|
20
22
|
import { logSettingsFrom } from './logging.js';
|
|
21
23
|
import { processExecutableName, processStartTime } from './process-identity.js';
|
|
@@ -23,7 +25,7 @@ import { projectBinding, projectEnabled } from './project-enablement.js';
|
|
|
23
25
|
import { packageVersion } from './release.js';
|
|
24
26
|
import { runSessionAttendant, systemAttendantClock, } from './session-attendant.js';
|
|
25
27
|
import { attendantSupport, claudeAttendanceProbe, codexAttendanceProbe, openclawAttendanceProbe, systemClaudeProbeAdapters, } from './session-attendant-probe.js';
|
|
26
|
-
import { attendantClaimPath, attendantStatusPath, readTurnActivity, recordTurnEnd, recordTurnStart, turnActivityPath, writeAttendantStatus, } from './session-attendant-state.js';
|
|
28
|
+
import { attendantClaimPath, attendantStatusPath, readTurnActivity, recordTurnEnd, recordTurnStart, reconcileNativeTurn, turnActivityPath, writeAttendantStatus, } from './session-attendant-state.js';
|
|
27
29
|
import { CLI_PACKAGE_NAME } from './cli-contract.js';
|
|
28
30
|
import { inspectClaudeInbox, systemClaudeWakeAdapters } from './claude-wake.js';
|
|
29
31
|
import { currentProcessIdentity } from './process-identity.js';
|
|
@@ -34,6 +36,18 @@ import { compareVersions } from './version.js';
|
|
|
34
36
|
import { readOpenclawGeneration } from './openclaw-generation.js';
|
|
35
37
|
import { integrationFaultNotice } from './integration-health.js';
|
|
36
38
|
import { openclawBridgeActivity, openclawMessageBridge, openclawMessageBridgeAvailable } from './openclaw-message-bridge.js';
|
|
39
|
+
import { readNativeTurnSnapshot } from './codex-native-turn.js';
|
|
40
|
+
// Captured when this module loads, so an in-place build cannot make a resident
|
|
41
|
+
// writer mistake the replacement files for its own loaded implementation.
|
|
42
|
+
export const attendantRuntimeRevision = (() => {
|
|
43
|
+
const file = fileURLToPath(import.meta.url), extension = path.extname(file), directory = path.dirname(file);
|
|
44
|
+
const hash = createHash('sha256');
|
|
45
|
+
for (const name of readdirSync(directory).filter(name => name.endsWith(extension) &&
|
|
46
|
+
!name.endsWith('.d.ts') && !name.endsWith('.test.ts')).sort()) {
|
|
47
|
+
hash.update(name).update('\0').update(readFileSync(path.join(directory, name)));
|
|
48
|
+
}
|
|
49
|
+
return hash.digest('hex');
|
|
50
|
+
})();
|
|
37
51
|
const SUPERSEDED_OWNER_WAIT_MS = 6_000;
|
|
38
52
|
/**
|
|
39
53
|
* Bound on Codex SessionEnd's `ended` report. Codex allows SessionEnd at most
|
|
@@ -44,7 +58,10 @@ export async function attendHook(deps, input) {
|
|
|
44
58
|
const { envelope, harness, cwd, logger } = input;
|
|
45
59
|
const seams = deps.attendant ?? {};
|
|
46
60
|
const end = (outcome, data = {}) => {
|
|
47
|
-
|
|
61
|
+
if (input.recovery !== undefined)
|
|
62
|
+
logger.info('attendant.state', { source: 'update-resume', outcome, ...data });
|
|
63
|
+
else
|
|
64
|
+
logger.info('hook.end', { hook: 'attend', outcome, decided: false, ...data });
|
|
48
65
|
return EXIT.ok;
|
|
49
66
|
};
|
|
50
67
|
// Read once, now: an in-place reinstall replaces the manifest on disk, and
|
|
@@ -61,22 +78,60 @@ export async function attendHook(deps, input) {
|
|
|
61
78
|
}
|
|
62
79
|
const starting = envelope.hook_event_name === 'SessionStart' || envelope.source !== undefined;
|
|
63
80
|
const claimFile = attendantClaimPath(sessionId, deps.env);
|
|
64
|
-
// Codex has no session descriptor: its activity is this thread's own turn
|
|
65
|
-
// boundaries. The synchronous prompt hook records each start in order; the
|
|
66
|
-
// turn-end and interrupt copies record ends here, before anything else.
|
|
67
|
-
if (harness === 'codex')
|
|
68
|
-
recordCodexTurnEnd(envelope, sessionId, deps.env);
|
|
69
|
-
// Codex allows Interrupt three seconds: that copy records the turn's end and
|
|
70
|
-
// never becomes the attendant.
|
|
71
|
-
if (envelope.hook_event_name === 'Interrupt')
|
|
72
|
-
return end('recorded');
|
|
73
81
|
// The hook adapter names the harness process that ran it. Claude Code also
|
|
74
82
|
// names itself; Codex is only ever the declared parent.
|
|
75
|
-
const pid = harness === 'codex' || harness === 'openclaw'
|
|
83
|
+
const pid = input.recovery?.harnessProcess.pid ?? (harness === 'codex' || harness === 'openclaw'
|
|
76
84
|
? declaredHookSourcePid(deps.env)
|
|
77
|
-
: declaredHookSourcePid(deps.env) ?? claudeSessionPid(deps.env);
|
|
85
|
+
: declaredHookSourcePid(deps.env) ?? claudeSessionPid(deps.env));
|
|
78
86
|
if (pid === undefined)
|
|
79
87
|
return end('ignored', { reason: 'harness-process-unproven' });
|
|
88
|
+
const nativeOwner = harness === 'codex'
|
|
89
|
+
? seams.harnessProcess ?? (() => {
|
|
90
|
+
const start = processStartTime(pid);
|
|
91
|
+
return start === null ? null : { pid, start };
|
|
92
|
+
})()
|
|
93
|
+
: null;
|
|
94
|
+
const ownsNative = (key) => {
|
|
95
|
+
const current = readSessionIncarnation(sessionId, deps.env);
|
|
96
|
+
return nativeOwner !== null && current?.key === key &&
|
|
97
|
+
envelope.agent_id === undefined && envelope.agent_type === undefined &&
|
|
98
|
+
current.harness_process?.pid === nativeOwner.pid && current.harness_process.start === nativeOwner.start &&
|
|
99
|
+
(input.recovery === undefined || current.key === input.recovery.key) &&
|
|
100
|
+
!happenedBefore(input.invokedAt, current.start) && !sessionHasEnded(sessionId, deps.env);
|
|
101
|
+
};
|
|
102
|
+
const observeNative = (key, initial = false) => {
|
|
103
|
+
if (!ownsNative(key))
|
|
104
|
+
return;
|
|
105
|
+
if (envelope.hook_event_name === 'Stop' || envelope.hook_event_name === 'Interrupt') {
|
|
106
|
+
recordCodexTurnEnd(envelope, sessionId, deps.env);
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
109
|
+
if (!initial && envelope.hook_event_name !== 'UserPromptSubmit' && input.recovery === undefined)
|
|
110
|
+
return;
|
|
111
|
+
const native = readNativeTurnSnapshot(input.recovery?.transcriptPath ?? envelope.transcript_path, sessionId, deps.env);
|
|
112
|
+
const turnId = envelope.turn_id ?? (initial || input.recovery !== undefined ? native?.latest.id : undefined);
|
|
113
|
+
if (native === null || turnId === undefined)
|
|
114
|
+
return;
|
|
115
|
+
try {
|
|
116
|
+
if (reconcileNativeTurn(sessionId, deps.env, key, turnId, native, () => ownsNative(key), initial)) {
|
|
117
|
+
updateSessionState(sessionId, deps.env, state => ({ ...state, codex_native_turn: {
|
|
118
|
+
key, turn_id: turnId, transcript_path: native.file,
|
|
119
|
+
} }));
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
catch { /* A busy observation lock must not cost this session its attendant. */ }
|
|
123
|
+
};
|
|
124
|
+
if (harness === 'codex') {
|
|
125
|
+
const current = readSessionIncarnation(sessionId, deps.env);
|
|
126
|
+
if (input.recovery !== undefined && (current === null || !ownsNative(current.key))) {
|
|
127
|
+
return end('ignored', { reason: 'recovery-owner-changed' });
|
|
128
|
+
}
|
|
129
|
+
if (current !== null)
|
|
130
|
+
observeNative(current.key);
|
|
131
|
+
}
|
|
132
|
+
// Interrupt is a bounded observation, never a replacement attendant.
|
|
133
|
+
if (envelope.hook_event_name === 'Interrupt')
|
|
134
|
+
return end('recorded');
|
|
80
135
|
if (!starting) {
|
|
81
136
|
// Re-arm fast path, before any configuration or gate work: this runs on
|
|
82
137
|
// every prompt and every turn end, and almost always finds its owner.
|
|
@@ -86,7 +141,17 @@ export async function attendHook(deps, input) {
|
|
|
86
141
|
current.harness_process?.pid === (seams.harnessProcess?.pid ?? pid) &&
|
|
87
142
|
holder?.['incarnation'] === current.incarnation &&
|
|
88
143
|
claimHolderMayRun(holder)) {
|
|
89
|
-
|
|
144
|
+
// An authenticated native event can hand the resident writer over to
|
|
145
|
+
// installed code. The old owner exits through claim-lost, not SessionEnd.
|
|
146
|
+
const upgrade = harness === 'codex' && ownsNative(current.key) &&
|
|
147
|
+
runningVersion !== null && (holder['runtime_version'] !== runningVersion ||
|
|
148
|
+
holder['runtime_revision'] !== attendantRuntimeRevision) && holder['pid'] !== process.pid &&
|
|
149
|
+
(seams.gates ?? (() => attendantGates(deps, cwd, sessionId, harness, runningVersion)))().ok &&
|
|
150
|
+
(holder['handoff'] === true || (typeof holder['token'] === 'string' &&
|
|
151
|
+
requestClaimHandoff(claimFile, holder['token'], current.incarnation)));
|
|
152
|
+
if (!upgrade)
|
|
153
|
+
return end('owner-present', { same_incarnation: true, holder_alive: true });
|
|
154
|
+
logger.info('attendant.state', { reason: 'installed-runtime-changed', phase: 'handoff' });
|
|
90
155
|
}
|
|
91
156
|
}
|
|
92
157
|
const assessGates = seams.gates ?? (() => attendantGates(deps, cwd, sessionId, harness, runningVersion));
|
|
@@ -131,36 +196,42 @@ export async function attendHook(deps, input) {
|
|
|
131
196
|
return end('ignored', { reason: 'stale-openclaw-generation' });
|
|
132
197
|
}
|
|
133
198
|
const clock = seams.clock ?? systemAttendantClock;
|
|
134
|
-
let record = await withLockRetry(clock, () => beginSessionIncarnation(sessionId, deps.env, {
|
|
199
|
+
let record = input.recovery !== undefined ? readSessionIncarnation(sessionId, deps.env) : await withLockRetry(clock, () => beginSessionIncarnation(sessionId, deps.env, {
|
|
135
200
|
stamp: input.invokedAt,
|
|
136
201
|
harnessProcess,
|
|
137
202
|
clearEarlierEnd: starting,
|
|
138
203
|
...(openclawGeneration === null ? {} : { openclawGeneration: openclawGeneration.id }),
|
|
139
204
|
}));
|
|
205
|
+
if (record === null || (input.recovery !== undefined && !ownsNative(record.key)))
|
|
206
|
+
return end('ignored', { reason: 'recovery-owner-changed' });
|
|
207
|
+
if (harness === 'codex' && starting)
|
|
208
|
+
observeNative(record.key, true);
|
|
140
209
|
// One live attendant per session. A holder serving an older incarnation of
|
|
141
210
|
// this session (an in-process resume moments after a clear) steps aside
|
|
142
211
|
// within one probe; a holder serving this one is healthy, so this exits.
|
|
143
212
|
const waitUntil = clock.monotonic() + (seams.supersededOwnerWaitMs ?? SUPERSEDED_OWNER_WAIT_MS);
|
|
144
213
|
let token = null;
|
|
145
214
|
while (true) {
|
|
146
|
-
token = acquireClaimFile(claimFile, { incarnation: record.incarnation }, clock.wall());
|
|
215
|
+
token = acquireClaimFile(claimFile, { incarnation: record.incarnation, runtime_version: runningVersion, runtime_revision: attendantRuntimeRevision }, clock.wall());
|
|
147
216
|
if (token !== null)
|
|
148
217
|
break;
|
|
149
218
|
const holder = readClaimFile(claimFile);
|
|
150
|
-
if (holder?.['incarnation'] === record.incarnation || clock.monotonic() >= waitUntil) {
|
|
219
|
+
if ((holder?.['incarnation'] === record.incarnation && holder['handoff'] !== true) || clock.monotonic() >= waitUntil) {
|
|
151
220
|
return end('owner-present', {
|
|
152
221
|
same_incarnation: holder?.['incarnation'] === record.incarnation,
|
|
153
222
|
holder_alive: claimHolderMayRun(holder),
|
|
154
223
|
});
|
|
155
224
|
}
|
|
156
225
|
await clock.sleep(250, new AbortController().signal).catch(() => undefined);
|
|
226
|
+
if (input.recovery !== undefined && !ownsNative(record.key))
|
|
227
|
+
return end('ignored', { reason: 'recovery-owner-changed' });
|
|
157
228
|
record = readSessionIncarnation(sessionId, deps.env) ?? record;
|
|
158
229
|
}
|
|
159
|
-
logger.info('hook.end', {
|
|
230
|
+
logger.info(input.recovery === undefined ? 'hook.end' : 'attendant.state', {
|
|
160
231
|
hook: 'attend',
|
|
161
232
|
outcome: 'attending',
|
|
162
233
|
decided: false,
|
|
163
|
-
source: envelope.source ?? envelope.hook_event_name ?? null,
|
|
234
|
+
source: input.recovery === undefined ? envelope.source ?? envelope.hook_event_name ?? null : 'update-resume',
|
|
164
235
|
});
|
|
165
236
|
const served = record;
|
|
166
237
|
const probeAdapters = seams.probeAdapters ?? systemClaudeProbeAdapters(deps.env);
|
|
@@ -216,7 +287,7 @@ export async function attendHook(deps, input) {
|
|
|
216
287
|
return null;
|
|
217
288
|
// Keep the claim naming the incarnation it serves.
|
|
218
289
|
releaseClaimFile(claimFile, token);
|
|
219
|
-
token = acquireClaimFile(claimFile, { incarnation: next.incarnation }, clock.wall());
|
|
290
|
+
token = acquireClaimFile(claimFile, { incarnation: next.incarnation, runtime_version: runningVersion, runtime_revision: attendantRuntimeRevision }, clock.wall());
|
|
220
291
|
return token === null ? null : next.incarnation;
|
|
221
292
|
},
|
|
222
293
|
probe,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands-hook-attend.js","sourceRoot":"","sources":["../src/commands-hook-attend.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"commands-hook-attend.js","sourceRoot":"","sources":["../src/commands-hook-attend.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ import { isSemVer } from './version.js';
|
|
|
15
15
|
import { isHookInstallableHarness, questionRoutingCapability } from './harnesses.js';
|
|
16
16
|
import { sameLocalPath } from './local-path.js';
|
|
17
17
|
import { codexToolHookReady } from './codex-tool-messages.js';
|
|
18
|
+
import { activateInstalledAttendants } from './attendant-update.js';
|
|
18
19
|
/** Never replace package files while this exact owner still owes an answer. */
|
|
19
20
|
export function updateWorkPending(deps) {
|
|
20
21
|
const active = resolveActiveHarness(deps.env, deps.cwd, (deps.now ?? Date.now)());
|
|
@@ -36,10 +37,11 @@ export async function updateResumeCommand(deps, flags) {
|
|
|
36
37
|
}
|
|
37
38
|
const pending = [];
|
|
38
39
|
const changed = [];
|
|
40
|
+
let attendants = [];
|
|
39
41
|
const report = (filesComplete) => {
|
|
40
42
|
const complete = filesComplete && pending.length === 0;
|
|
41
43
|
const result = { ok: filesComplete, read_only: false, running_version: packageVersion(),
|
|
42
|
-
files_complete: filesComplete, migration_complete: complete, pending_actions: pending, changed,
|
|
44
|
+
files_complete: filesComplete, migration_complete: complete, pending_actions: pending, changed, attendants,
|
|
43
45
|
resume_command: 'notifai update --resume --json', changelog: installedChangelog(packageVersion(), flags.from),
|
|
44
46
|
next_step: 'Read this package’s SKILL.md and references/updates.md, then run notifai guidance in the active Agent Session. Preserve outstanding work and existing User deferrals.' };
|
|
45
47
|
if (flags.json === true || deps.io.interactive !== true)
|
|
@@ -123,6 +125,14 @@ export async function updateResumeCommand(deps, flags) {
|
|
|
123
125
|
pending.push('Tool-boundary Notes are not yet verified in this exact Agent Session; ordinary queue delivery remains available. Check the next tool callback before considering an approved fresh session.');
|
|
124
126
|
}
|
|
125
127
|
}
|
|
128
|
+
if (assessment.faults.length === 0) {
|
|
129
|
+
attendants = await activateInstalledAttendants(deps, effective.artifact_path);
|
|
130
|
+
if (attendants.some(entry => entry.state === 'activated'))
|
|
131
|
+
changed.push('resident-attendants');
|
|
132
|
+
const unresolved = attendants.filter(entry => entry.state === 'pending' || !entry.native_activity);
|
|
133
|
+
if (unresolved.length > 0)
|
|
134
|
+
pending.push(`${unresolved.length} existing Codex session(s) still need native activity or resident activation verification; keep their Agent Sessions and pending inputs intact.`);
|
|
135
|
+
}
|
|
126
136
|
return report(repairFaults.length === 0);
|
|
127
137
|
}
|
|
128
138
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands-update-resume.js","sourceRoot":"","sources":["../src/commands-update-resume.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,IAAI,EAAoB,MAAM,oBAAoB,CAAA;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAA;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAC/D,OAAO,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAC1H,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AACvE,OAAO,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAA;AACxF,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAA;AACpF,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;
|
|
1
|
+
{"version":3,"file":"commands-update-resume.js","sourceRoot":"","sources":["../src/commands-update-resume.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,10 @@ export declare function readClaimFile(file: string): Record<string, unknown> | n
|
|
|
17
17
|
export declare function claimHolderMayRun(held: Record<string, unknown> | null, now?: number): boolean;
|
|
18
18
|
/** Remove a claim file only while it still carries this holder's token. */
|
|
19
19
|
export declare function releaseClaimFile(file: string, token: string): void;
|
|
20
|
+
/** Fence the exact resident writer; its ordinary claim-lost path cancels writes.
|
|
21
|
+
* Keep its process identity until it exits, so a successor cannot overlap it.
|
|
22
|
+
*/
|
|
23
|
+
export declare function requestClaimHandoff(file: string, expectedToken: string, incarnation: string): boolean;
|
|
20
24
|
/** True only when the live owner could not have snapshotted this unpushed ask. */
|
|
21
25
|
export declare function claimHandoffState(sessionId: string, env: NodeJS.ProcessEnv): {
|
|
22
26
|
hasNewQuestion: boolean;
|
|
@@ -6,6 +6,7 @@ import { sanitizeSessionId, stateDir } from './config.js';
|
|
|
6
6
|
import { pendingList, readSessionState } from './hook-session-state.js';
|
|
7
7
|
import { currentProcessIdentity, pidExists, processIdentityLiveness } from './process-identity.js';
|
|
8
8
|
import { LEGACY_QUESTION_CLAIM_TTL_SECONDS } from './question-timing.js';
|
|
9
|
+
import { atomicWriteFileSync } from './atomic-file.js';
|
|
9
10
|
/**
|
|
10
11
|
* One question, one push, even with two Stop hooks racing.
|
|
11
12
|
*
|
|
@@ -133,6 +134,26 @@ export function releaseClaimFile(file, token) {
|
|
|
133
134
|
rmSync(guard, { force: true });
|
|
134
135
|
}
|
|
135
136
|
}
|
|
137
|
+
/** Fence the exact resident writer; its ordinary claim-lost path cancels writes.
|
|
138
|
+
* Keep its process identity until it exits, so a successor cannot overlap it.
|
|
139
|
+
*/
|
|
140
|
+
export function requestClaimHandoff(file, expectedToken, incarnation) {
|
|
141
|
+
const guard = `${file}.guard`;
|
|
142
|
+
if (!acquireClaimGuard(guard))
|
|
143
|
+
return false;
|
|
144
|
+
try {
|
|
145
|
+
const holder = readClaimFile(file);
|
|
146
|
+
if (holder?.['token'] !== expectedToken || holder['incarnation'] !== incarnation ||
|
|
147
|
+
typeof holder['pid'] !== 'number' || typeof holder['start'] !== 'string' ||
|
|
148
|
+
processIdentityLiveness({ pid: holder['pid'], start: holder['start'] }) !== 'alive')
|
|
149
|
+
return false;
|
|
150
|
+
atomicWriteFileSync(file, `${JSON.stringify({ ...holder, token: randomBytes(12).toString('base64url'), handoff: true })}\n`);
|
|
151
|
+
return true;
|
|
152
|
+
}
|
|
153
|
+
finally {
|
|
154
|
+
rmSync(guard, { force: true });
|
|
155
|
+
}
|
|
156
|
+
}
|
|
136
157
|
function claimQuestionIdentity(entry) {
|
|
137
158
|
return entry.question_id ?? `${entry.asked_at ?? 'legacy'}\u0000${entry.question}`;
|
|
138
159
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hook-question-lock.js","sourceRoot":"","sources":["../src/hook-question-lock.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"hook-question-lock.js","sourceRoot":"","sources":["../src/hook-question-lock.ts"],"names":[],"mappings":"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"}
|
package/dist/hook-types.d.ts
CHANGED
|
@@ -51,11 +51,19 @@ export interface HookEnvelope {
|
|
|
51
51
|
prompt?: string;
|
|
52
52
|
/** Codex's exact turn id on prompt, tool, Stop and Interrupt callbacks. */
|
|
53
53
|
turn_id?: string;
|
|
54
|
+
/** Native Codex transcript; only typed lifecycle records are consumed. */
|
|
55
|
+
transcript_path?: string;
|
|
54
56
|
/** Codex child hooks carry the root session_id but name the child here. */
|
|
55
57
|
agent_id?: string;
|
|
56
58
|
agent_type?: string;
|
|
57
59
|
}
|
|
58
60
|
export interface SessionState {
|
|
61
|
+
/** Content-free native lifecycle proof, scoped to the current owner. */
|
|
62
|
+
codex_native_turn?: {
|
|
63
|
+
key: string;
|
|
64
|
+
turn_id: string;
|
|
65
|
+
transcript_path: string;
|
|
66
|
+
};
|
|
59
67
|
/** Exact incarnation observed executing the currently trusted Codex tool hook. */
|
|
60
68
|
codex_tool_hook?: {
|
|
61
69
|
incarnation: string;
|
package/dist/program.js
CHANGED
|
@@ -7,6 +7,7 @@ import { GROUP, SEND_GROUP, helpConfiguration, rootHelpFooter } from './ui/help.
|
|
|
7
7
|
import { readStdinWithTimeout } from './hook-input.js';
|
|
8
8
|
import { argvFlagNames } from './logging.js';
|
|
9
9
|
import { QUESTION_SETTLEMENT_INPUT_ENV } from './question-settlement-process.js';
|
|
10
|
+
import { resumeAttendantCommand } from './attendant-update.js';
|
|
10
11
|
/**
|
|
11
12
|
* One source of truth for the version: the manifest npm actually published.
|
|
12
13
|
*
|
|
@@ -226,6 +227,9 @@ export function buildProgram(deps, options = {}) {
|
|
|
226
227
|
}
|
|
227
228
|
exit(opts.resume ? await runners.updateResume(deps, opts) : opts.refreshSkill ? await runners.updateSkill(deps, opts) : opts.check ? await runners.updateCheck(deps, opts) : runners.update(deps, opts));
|
|
228
229
|
});
|
|
230
|
+
// Owned updater subprocess; never an agent-facing lifecycle or session-creation API.
|
|
231
|
+
program.command('attendant-resume <session-id> <incarnation-key>', { hidden: true })
|
|
232
|
+
.action(async (sessionId, key) => { exit(await resumeAttendantCommand(deps, sessionId, key)); });
|
|
229
233
|
const project = program
|
|
230
234
|
.command('project')
|
|
231
235
|
.helpGroup(GROUP.daily)
|