@farmslot/agent-runtime 0.9.0 → 0.10.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/CHANGELOG.md +16 -1
- package/README.md +1 -1
- package/bin/farmslot-agent.mjs +1 -1
- package/dist/execution-template/create.d.ts.map +1 -1
- package/dist/execution-template/create.js +4 -9
- package/dist/execution-template/create.js.map +1 -1
- package/dist/execution-template/execution-template.test.js +85 -34
- package/dist/execution-template/execution-template.test.js.map +1 -1
- package/dist/execution-template/frontmatter.d.ts +6 -3
- package/dist/execution-template/frontmatter.d.ts.map +1 -1
- package/dist/execution-template/frontmatter.js +8 -10
- package/dist/execution-template/frontmatter.js.map +1 -1
- package/dist/execution-template/index.d.ts +2 -2
- package/dist/execution-template/index.d.ts.map +1 -1
- package/dist/execution-template/index.js +2 -2
- package/dist/execution-template/index.js.map +1 -1
- package/dist/execution-template/infer.d.ts +2 -3
- package/dist/execution-template/infer.d.ts.map +1 -1
- package/dist/execution-template/infer.js +2 -19
- package/dist/execution-template/infer.js.map +1 -1
- package/dist/execution-template/lint.d.ts.map +1 -1
- package/dist/execution-template/lint.js +12 -14
- package/dist/execution-template/lint.js.map +1 -1
- package/dist/execution-template/resolve.d.ts.map +1 -1
- package/dist/execution-template/resolve.js +0 -2
- package/dist/execution-template/resolve.js.map +1 -1
- package/dist/execution-template/select.d.ts.map +1 -1
- package/dist/execution-template/select.js +4 -8
- package/dist/execution-template/select.js.map +1 -1
- package/dist/execution-template/snapshot.d.ts.map +1 -1
- package/dist/execution-template/snapshot.js +0 -1
- package/dist/execution-template/snapshot.js.map +1 -1
- package/dist/execution-template/types.d.ts +10 -5
- package/dist/execution-template/types.d.ts.map +1 -1
- package/dist/execution-template/types.js.map +1 -1
- package/dist/native/account-claude.d.ts +5 -0
- package/dist/native/account-claude.d.ts.map +1 -0
- package/dist/native/account-claude.js +42 -0
- package/dist/native/account-claude.js.map +1 -0
- package/dist/native/account-codex.d.ts +4 -0
- package/dist/native/account-codex.d.ts.map +1 -0
- package/dist/native/account-codex.js +51 -0
- package/dist/native/account-codex.js.map +1 -0
- package/dist/native/account-common.d.ts +30 -0
- package/dist/native/account-common.d.ts.map +1 -0
- package/dist/native/account-common.js +155 -0
- package/dist/native/account-common.js.map +1 -0
- package/dist/native/account-cursor.d.ts +5 -0
- package/dist/native/account-cursor.d.ts.map +1 -0
- package/dist/native/account-cursor.js +48 -0
- package/dist/native/account-cursor.js.map +1 -0
- package/dist/native/account-grok.d.ts +4 -0
- package/dist/native/account-grok.d.ts.map +1 -0
- package/dist/native/account-grok.js +55 -0
- package/dist/native/account-grok.js.map +1 -0
- package/dist/native/account-observation.test.d.ts +2 -0
- package/dist/native/account-observation.test.d.ts.map +1 -0
- package/dist/native/account-observation.test.js +256 -0
- package/dist/native/account-observation.test.js.map +1 -0
- package/dist/native/account-profiles.d.ts +11 -0
- package/dist/native/account-profiles.d.ts.map +1 -0
- package/dist/native/account-profiles.js +172 -0
- package/dist/native/account-profiles.js.map +1 -0
- package/dist/native/account-profiles.test.d.ts +2 -0
- package/dist/native/account-profiles.test.d.ts.map +1 -0
- package/dist/native/account-profiles.test.js +172 -0
- package/dist/native/account-profiles.test.js.map +1 -0
- package/dist/native/account-types.d.ts +11 -0
- package/dist/native/account-types.d.ts.map +1 -0
- package/dist/native/account-types.js +2 -0
- package/dist/native/account-types.js.map +1 -0
- package/dist/native/acp-requests.d.ts +11 -0
- package/dist/native/acp-requests.d.ts.map +1 -0
- package/dist/native/acp-requests.js +109 -0
- package/dist/native/acp-requests.js.map +1 -0
- package/dist/native/acp-rpc.d.ts +15 -0
- package/dist/native/acp-rpc.d.ts.map +1 -0
- package/dist/native/acp-rpc.js +73 -0
- package/dist/native/acp-rpc.js.map +1 -0
- package/dist/native/acp.d.ts +15 -0
- package/dist/native/acp.d.ts.map +1 -0
- package/dist/native/acp.js +285 -0
- package/dist/native/acp.js.map +1 -0
- package/dist/native/acp.test.d.ts +2 -0
- package/dist/native/acp.test.d.ts.map +1 -0
- package/dist/native/acp.test.js +257 -0
- package/dist/native/acp.test.js.map +1 -0
- package/dist/native/claude.d.ts.map +1 -1
- package/dist/native/claude.js +14 -0
- package/dist/native/claude.js.map +1 -1
- package/dist/native/client.d.ts +13 -0
- package/dist/native/client.d.ts.map +1 -1
- package/dist/native/client.js +112 -1
- package/dist/native/client.js.map +1 -1
- package/dist/native/codex.d.ts.map +1 -1
- package/dist/native/codex.js +61 -3
- package/dist/native/codex.js.map +1 -1
- package/dist/native/cursor-model.d.ts +6 -0
- package/dist/native/cursor-model.d.ts.map +1 -0
- package/dist/native/cursor-model.js +74 -0
- package/dist/native/cursor-model.js.map +1 -0
- package/dist/native/cursor-model.test.d.ts +2 -0
- package/dist/native/cursor-model.test.d.ts.map +1 -0
- package/dist/native/cursor-model.test.js +40 -0
- package/dist/native/cursor-model.test.js.map +1 -0
- package/dist/native/cursor.d.ts +2 -0
- package/dist/native/cursor.d.ts.map +1 -0
- package/dist/native/cursor.js +30 -0
- package/dist/native/cursor.js.map +1 -0
- package/dist/native/durability.test.js +461 -1
- package/dist/native/durability.test.js.map +1 -1
- package/dist/native/filesystem-policy.test.d.ts +2 -0
- package/dist/native/filesystem-policy.test.d.ts.map +1 -0
- package/dist/native/filesystem-policy.test.js +136 -0
- package/dist/native/filesystem-policy.test.js.map +1 -0
- package/dist/native/grok.d.ts +2 -0
- package/dist/native/grok.d.ts.map +1 -0
- package/dist/native/grok.js +17 -0
- package/dist/native/grok.js.map +1 -0
- package/dist/native/host.js +39 -0
- package/dist/native/host.js.map +1 -1
- package/dist/native/index.d.ts +3 -0
- package/dist/native/index.d.ts.map +1 -1
- package/dist/native/index.js +3 -0
- package/dist/native/index.js.map +1 -1
- package/dist/native/ipc.d.ts +59 -0
- package/dist/native/ipc.d.ts.map +1 -1
- package/dist/native/ipc.js +76 -4
- package/dist/native/ipc.js.map +1 -1
- package/dist/native/manager.d.ts +22 -4
- package/dist/native/manager.d.ts.map +1 -1
- package/dist/native/manager.js +386 -46
- package/dist/native/manager.js.map +1 -1
- package/dist/native/process-tree.d.ts +11 -0
- package/dist/native/process-tree.d.ts.map +1 -1
- package/dist/native/process-tree.js +123 -20
- package/dist/native/process-tree.js.map +1 -1
- package/dist/native/process-tree.test.js +126 -1
- package/dist/native/process-tree.test.js.map +1 -1
- package/dist/native/process.d.ts +5 -1
- package/dist/native/process.d.ts.map +1 -1
- package/dist/native/process.js +36 -13
- package/dist/native/process.js.map +1 -1
- package/dist/native/process.test.d.ts +2 -0
- package/dist/native/process.test.d.ts.map +1 -0
- package/dist/native/process.test.js +56 -0
- package/dist/native/process.test.js.map +1 -0
- package/dist/native/profile-service.d.ts +5 -0
- package/dist/native/profile-service.d.ts.map +1 -0
- package/dist/native/profile-service.js +76 -0
- package/dist/native/profile-service.js.map +1 -0
- package/dist/native/registry.d.ts +20 -0
- package/dist/native/registry.d.ts.map +1 -0
- package/dist/native/registry.js +89 -0
- package/dist/native/registry.js.map +1 -0
- package/dist/native/registry.test.d.ts +2 -0
- package/dist/native/registry.test.d.ts.map +1 -0
- package/dist/native/registry.test.js +13 -0
- package/dist/native/registry.test.js.map +1 -0
- package/dist/native/review-sandbox.d.ts +12 -0
- package/dist/native/review-sandbox.d.ts.map +1 -0
- package/dist/native/review-sandbox.js +6 -0
- package/dist/native/review-sandbox.js.map +1 -0
- package/dist/native/review-sandbox.test.d.ts +2 -0
- package/dist/native/review-sandbox.test.d.ts.map +1 -0
- package/dist/native/review-sandbox.test.js +40 -0
- package/dist/native/review-sandbox.test.js.map +1 -0
- package/dist/native/service.d.ts.map +1 -1
- package/dist/native/service.js +42 -8
- package/dist/native/service.js.map +1 -1
- package/dist/native/supervisor.js +121 -33
- package/dist/native/supervisor.js.map +1 -1
- package/dist/native/types.d.ts +11 -1
- package/dist/native/types.d.ts.map +1 -1
- package/dist/native/worker-history.d.ts +16 -0
- package/dist/native/worker-history.d.ts.map +1 -0
- package/dist/native/worker-history.js +77 -0
- package/dist/native/worker-history.js.map +1 -0
- package/dist/native/worker-history.test.d.ts +2 -0
- package/dist/native/worker-history.test.d.ts.map +1 -0
- package/dist/native/worker-history.test.js +195 -0
- package/dist/native/worker-history.test.js.map +1 -0
- package/dist/native/worker-launch.d.ts +72 -0
- package/dist/native/worker-launch.d.ts.map +1 -0
- package/dist/native/worker-launch.js +134 -0
- package/dist/native/worker-launch.js.map +1 -0
- package/dist/native/worker-launch.test.d.ts +2 -0
- package/dist/native/worker-launch.test.d.ts.map +1 -0
- package/dist/native/worker-launch.test.js +61 -0
- package/dist/native/worker-launch.test.js.map +1 -0
- package/dist/native/worker-relocation.test.d.ts +2 -0
- package/dist/native/worker-relocation.test.d.ts.map +1 -0
- package/dist/native/worker-relocation.test.js +110 -0
- package/dist/native/worker-relocation.test.js.map +1 -0
- package/dist/native/worker-service.d.ts +4 -0
- package/dist/native/worker-service.d.ts.map +1 -0
- package/dist/native/worker-service.js +85 -0
- package/dist/native/worker-service.js.map +1 -0
- package/dist/task-init/index.d.ts +5 -1
- package/dist/task-init/index.d.ts.map +1 -1
- package/dist/task-init/index.js +7 -3
- package/dist/task-init/index.js.map +1 -1
- package/dist/task-init/task-document.d.ts.map +1 -1
- package/dist/task-init/task-document.js +2 -2
- package/dist/task-init/task-document.js.map +1 -1
- package/dist/task-init/write.d.ts +0 -6
- package/dist/task-init/write.d.ts.map +1 -1
- package/dist/task-init/write.js +1 -8
- package/dist/task-init/write.js.map +1 -1
- package/package.json +2 -2
- package/scripts/cursor-session-discovery.cjs +48 -0
- package/scripts/execution-template-cli.mjs +8 -11
- package/scripts/review-filesystem.cjs +39 -0
- package/scripts/review-session.cjs +45 -0
- package/scripts/review-terminal.cjs +134 -0
- package/scripts/task-init-cli.mjs +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/native/service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,GAGR,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAClG,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,OAAO,wBAAyB,SAAQ,KAAK;IACjD,YACW,IAA+C,EACxD,OAAe;QAEf,KAAK,CAAC,OAAO,CAAC,CAAC;QAHN,SAAI,GAAJ,IAAI,CAA2C;QAIxD,IAAI,CAAC,IAAI,GAAG,0BAA0B,CAAC;IACzC,CAAC;CACF;AAED,SAAS,MAAM,CAAC,MAA+B,EAAE,GAAW;IAC1D,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QAC5C,MAAM,IAAI,wBAAwB,CAAC,gBAAgB,EAAE,GAAG,GAAG,4BAA4B,CAAC,CAAC;IAC3F,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAA2B,EAC3B,SAAiB,EACjB,MAAc,EACd,KAAc;IAEd,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAC7D,MAAM,IAAI,wBAAwB,CAAC,gBAAgB,EAAE,oCAAoC,CAAC,CAAC;IAC7F,MAAM,CAAC,GAAG,KAAgC,CAAC;IAC3C,IAAI,CAAC,CAAC,eAAe,KAAK,SAAS,IAAI,CAAC,CAAC,eAAe,KAAK,MAAM,CAAC,eAAe;QACjF,MAAM,IAAI,wBAAwB,CAChC,gBAAgB,EAChB,+CAA+C,CAChD,CAAC;IACJ,IAAI,CAAC;QACH,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,OAAO,CAAC,6BAA6B,CAAC;YAC3C,KAAK,OAAO,CAAC,6BAA6B,CAAC;YAC3C,KAAK,OAAO,CAAC,gCAAgC,CAAC;YAC9C,KAAK,OAAO,CAAC,6BAA6B,CAAC,CAAC,CAAC;gBAC3C,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/native/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,6 +54,10 @@ const socket = join(socketDirectory(root), 's');
|
|
|
54
54
|
privateDirectory(socketDirectory(root));
|
|
55
55
|
durableWrite(join(root, 'host.json'), {
|
|
56
56
|
supportsEnsure: true,
|
|
57
|
+
supportsWorkers: true,
|
|
58
|
+
supportsWorkerResumeFence: true,
|
|
59
|
+
supportsWorkerRelocation: true,
|
|
60
|
+
supportsProfiles: true,
|
|
57
61
|
executionNodeId: process.env.FARMSLOT_NATIVE_EXECUTION_NODE_ID ?? 'local',
|
|
58
62
|
pid: process.pid,
|
|
59
63
|
token: randomBytes(32).toString('hex'),
|
|
@@ -63,65 +67,149 @@ const extension = import.meta.url.endsWith('.ts') ? 'ts' : 'js';
|
|
|
63
67
|
const child = fork(fileURLToPath(new URL(`./host.${extension}`, import.meta.url)), [root], {
|
|
64
68
|
stdio: ['ignore', 'inherit', 'inherit', 'ipc'],
|
|
65
69
|
});
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
70
|
+
let tree;
|
|
71
|
+
let stopObservingTree;
|
|
72
|
+
let hostReleased = false;
|
|
73
|
+
let stopping = false;
|
|
74
|
+
let settled = false;
|
|
75
|
+
let failure;
|
|
76
|
+
function stopHost(error) {
|
|
77
|
+
if (error !== undefined) {
|
|
78
|
+
failure = error instanceof Error ? error.message : String(error);
|
|
79
|
+
process.stderr.write(`Native supervisor stopping host: ${failure}\n`);
|
|
80
|
+
}
|
|
81
|
+
if (stopping)
|
|
82
|
+
return;
|
|
83
|
+
stopping = true;
|
|
84
|
+
stopObservingTree?.();
|
|
85
|
+
try {
|
|
86
|
+
rmSync(join(root, 'ready.json'), { force: true });
|
|
87
|
+
}
|
|
88
|
+
catch (error) {
|
|
89
|
+
// Stopping the child still takes precedence; cleanup retries the readiness removal.
|
|
90
|
+
failure = `${failure ?? 'Native stop'}; readiness removal: ${error.message}`;
|
|
91
|
+
}
|
|
92
|
+
if (child.pid)
|
|
93
|
+
child.kill(error === undefined ? 'SIGTERM' : 'SIGKILL');
|
|
94
|
+
}
|
|
95
|
+
// Register failure handlers before any post-fork filesystem or process probes.
|
|
73
96
|
child.on('message', (message) => {
|
|
74
|
-
if (message
|
|
97
|
+
if (message !== 'ready' || stopping)
|
|
98
|
+
return;
|
|
99
|
+
try {
|
|
75
100
|
durableWrite(join(root, 'ready.json'), { pid: child.pid });
|
|
101
|
+
}
|
|
102
|
+
catch (error) {
|
|
103
|
+
stopHost(error);
|
|
104
|
+
}
|
|
76
105
|
});
|
|
77
106
|
child.on('error', (error) => {
|
|
78
|
-
|
|
107
|
+
if (stopping) {
|
|
108
|
+
// A failed stop keeps the owner alive and readiness withdrawn. Never release its lock.
|
|
109
|
+
durableWrite(join(root, 'cleanup.json'), {
|
|
110
|
+
hostPid: child.pid,
|
|
111
|
+
state: 'unknown',
|
|
112
|
+
error: error.message,
|
|
113
|
+
});
|
|
114
|
+
process.stderr.write(`Native host stop failed: ${error.message}\n`);
|
|
115
|
+
}
|
|
116
|
+
else
|
|
117
|
+
stopHost(error);
|
|
79
118
|
});
|
|
80
|
-
|
|
119
|
+
function settle() {
|
|
120
|
+
if (settled)
|
|
121
|
+
return;
|
|
122
|
+
settled = true;
|
|
81
123
|
void cleanup().then(() => process.exit(1), (error) => {
|
|
82
124
|
durableWrite(join(root, 'cleanup.json'), {
|
|
83
125
|
hostPid: child.pid,
|
|
84
126
|
state: 'unknown',
|
|
85
127
|
error: error.message,
|
|
128
|
+
observedProcesses: tree?.snapshot(),
|
|
86
129
|
});
|
|
87
|
-
// Keep the ownership lock. Replacement must fail closed until cleanup is resolved.
|
|
88
130
|
process.stderr.write(`Native cleanup failed: ${error.message}\n`);
|
|
89
131
|
process.exit(1);
|
|
90
132
|
});
|
|
133
|
+
}
|
|
134
|
+
child.once('exit', settle);
|
|
135
|
+
// Spawn failure may emit close without exit; no PID means no host was released.
|
|
136
|
+
child.once('close', () => {
|
|
137
|
+
if (!child.pid)
|
|
138
|
+
settle();
|
|
91
139
|
});
|
|
140
|
+
for (const signal of ['SIGTERM', 'SIGINT'])
|
|
141
|
+
process.on(signal, () => stopHost());
|
|
142
|
+
try {
|
|
143
|
+
durableWrite(join(root, 'worker.json'), { pid: child.pid });
|
|
144
|
+
durableWrite(join(root, 'cleanup.json'), { hostPid: child.pid, state: 'pending' });
|
|
145
|
+
if (!child.pid)
|
|
146
|
+
throw new Error('Native host did not obtain a process identity');
|
|
147
|
+
tree = new NativeProcessTree(child.pid);
|
|
148
|
+
stopObservingTree = tree.observe(stopHost);
|
|
149
|
+
child.send('start', (error) => {
|
|
150
|
+
if (error)
|
|
151
|
+
stopHost(error);
|
|
152
|
+
});
|
|
153
|
+
hostReleased = true;
|
|
154
|
+
}
|
|
155
|
+
catch (error) {
|
|
156
|
+
stopHost(error);
|
|
157
|
+
}
|
|
92
158
|
async function cleanup() {
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
159
|
+
stopObservingTree?.();
|
|
160
|
+
const errors = [];
|
|
161
|
+
const attempt = (operation) => {
|
|
162
|
+
try {
|
|
163
|
+
operation();
|
|
164
|
+
}
|
|
165
|
+
catch (error) {
|
|
166
|
+
errors.push(error);
|
|
167
|
+
}
|
|
168
|
+
};
|
|
169
|
+
attempt(() => rmSync(join(root, 'ready.json'), { force: true }));
|
|
170
|
+
if (tree)
|
|
171
|
+
attempt(() => tree.stop());
|
|
172
|
+
else if (hostReleased)
|
|
173
|
+
errors.push(new Error('Released native host has no process census'));
|
|
96
174
|
const sessions = join(root, 'sessions');
|
|
97
175
|
const records = [];
|
|
176
|
+
// A census failure must not skip the independently recorded runner groups.
|
|
98
177
|
if (existsSync(sessions))
|
|
99
178
|
for (const name of readdirSync(sessions).filter((name) => name.endsWith('.journal'))) {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
const
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
179
|
+
attempt(() => {
|
|
180
|
+
const path = join(sessions, name);
|
|
181
|
+
for (const line of readJournal(path).reverse()) {
|
|
182
|
+
const entry = JSON.parse(line);
|
|
183
|
+
if (!entry.info)
|
|
184
|
+
continue;
|
|
185
|
+
const info = entry.info;
|
|
186
|
+
if (info.hostPid === child.pid && info.processPid && !info.processStopped) {
|
|
187
|
+
records.push({ path, info });
|
|
188
|
+
if (info.processIdentity && matchesProcess(info.processPid, info.processIdentity))
|
|
189
|
+
signalGroup(info.processPid, 'SIGKILL');
|
|
190
|
+
}
|
|
191
|
+
break;
|
|
110
192
|
}
|
|
111
|
-
|
|
112
|
-
}
|
|
193
|
+
});
|
|
113
194
|
}
|
|
114
|
-
const stopped = () => tree.empty() && records.every(({ info }) => !alive(-info.processPid));
|
|
195
|
+
const stopped = () => (!tree || tree.empty()) && records.every(({ info }) => !alive(-info.processPid));
|
|
115
196
|
const deadline = Date.now() + 5_000;
|
|
116
|
-
|
|
197
|
+
let confirmedStopped = stopped();
|
|
198
|
+
while (!confirmedStopped && Date.now() < deadline) {
|
|
117
199
|
await new Promise((resolve) => setTimeout(resolve, 25));
|
|
118
|
-
|
|
119
|
-
|
|
200
|
+
confirmedStopped = stopped();
|
|
201
|
+
}
|
|
202
|
+
if (!confirmedStopped)
|
|
203
|
+
errors.push(new Error('Native descendants remain alive; replacement owner is blocked'));
|
|
204
|
+
if (errors.length)
|
|
205
|
+
throw new AggregateError(errors, `Native cleanup is unconfirmed: ${errors.map((error) => (error instanceof Error ? error.message : String(error))).join('; ')}`);
|
|
120
206
|
for (const { path, info } of records)
|
|
121
207
|
appendDurable(path, { info: { ...info, processStopped: true } });
|
|
122
|
-
durableWrite(join(root, 'cleanup.json'), {
|
|
208
|
+
durableWrite(join(root, 'cleanup.json'), {
|
|
209
|
+
hostPid: child.pid,
|
|
210
|
+
state: 'complete',
|
|
211
|
+
...(failure ? { error: failure } : {}),
|
|
212
|
+
});
|
|
123
213
|
rmSync(lock, { recursive: true });
|
|
124
214
|
}
|
|
125
|
-
for (const signal of ['SIGTERM', 'SIGINT'])
|
|
126
|
-
process.on(signal, () => child.kill(signal));
|
|
127
215
|
//# sourceMappingURL=supervisor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../src/native/supervisor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../src/native/supervisor.ts"],"names":[],"mappings":"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"}
|
package/dist/native/types.d.ts
CHANGED
|
@@ -1,13 +1,20 @@
|
|
|
1
|
-
import type { NativeSessionCapabilities, NativeSessionEvent, NativeSessionResponse } from '@farmslot/protocol';
|
|
1
|
+
import type { NativeSessionCapabilities, NativeSessionEvent, NativeSessionResponse, SafetyTier } from '@farmslot/protocol';
|
|
2
|
+
import type { NativeProcessSandbox } from './review-sandbox.js';
|
|
3
|
+
import type { NativeWorkerFilesystemPolicy } from './worker-launch.js';
|
|
2
4
|
export type NativeEventInput = Omit<NativeSessionEvent, 'sequence' | 'at' | 'sessionId' | 'generation'>;
|
|
3
5
|
export interface NativeAdapterOptions {
|
|
4
6
|
cwd: string;
|
|
5
7
|
onSpawn?: (pid: number, identity: string) => void;
|
|
8
|
+
signal?: AbortSignal;
|
|
6
9
|
executable: string;
|
|
7
10
|
model?: string;
|
|
8
11
|
mode?: 'default' | 'plan';
|
|
9
12
|
resumeSessionId?: string;
|
|
10
13
|
env?: NodeJS.ProcessEnv;
|
|
14
|
+
effort?: string;
|
|
15
|
+
safetyTier?: SafetyTier;
|
|
16
|
+
filesystemPolicy?: NativeWorkerFilesystemPolicy;
|
|
17
|
+
processSandbox?: NativeProcessSandbox;
|
|
11
18
|
}
|
|
12
19
|
export interface NativeAdapterSession {
|
|
13
20
|
nativeSessionId: string;
|
|
@@ -19,7 +26,10 @@ export interface NativeAdapterSession {
|
|
|
19
26
|
}
|
|
20
27
|
export interface NativeAdapter {
|
|
21
28
|
capabilities: NativeSessionCapabilities;
|
|
29
|
+
/** A missing capability is unsupported, never a request for advisory prompt restrictions. */
|
|
30
|
+
filesystemPolicyUnavailableReason?: (version: string) => string | undefined;
|
|
22
31
|
/** Compatibility policy based on the native executable's version metadata. */
|
|
32
|
+
workspaceResumeUnavailableReason?: (version: string) => string | undefined;
|
|
23
33
|
resumeUnavailableReason?: (version: string) => string | undefined;
|
|
24
34
|
start(options: NativeAdapterOptions, emit: (event: NativeEventInput) => void): Promise<NativeAdapterSession>;
|
|
25
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/native/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,yBAAyB,EACzB,kBAAkB,EAClB,qBAAqB,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/native/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,yBAAyB,EACzB,kBAAkB,EAClB,qBAAqB,EACrB,UAAU,EACX,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAEvE,MAAM,MAAM,gBAAgB,GAAG,IAAI,CACjC,kBAAkB,EAClB,UAAU,GAAG,IAAI,GAAG,WAAW,GAAG,YAAY,CAC/C,CAAC;AACF,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAClD,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,gBAAgB,CAAC,EAAE,4BAA4B,CAAC;IAChD,cAAc,CAAC,EAAE,oBAAoB,CAAC;CACvC;AACD,MAAM,WAAW,oBAAoB;IACnC,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,yBAAyB,CAAC;IACzC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3E,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AACD,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,yBAAyB,CAAC;IACxC,6FAA6F;IAC7F,iCAAiC,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IAC5E,8EAA8E;IAC9E,gCAAgC,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IAC3E,uBAAuB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IAClE,KAAK,CACH,OAAO,EAAE,oBAAoB,EAC7B,IAAI,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,GACtC,OAAO,CAAC,oBAAoB,CAAC,CAAC;CAClC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { NativeCommandReceipt, NativeSessionEvent, NativeSessionInfo, NativeSessionReadResult } from '@farmslot/protocol';
|
|
2
|
+
/** Rebuilt from durable journal ordering, including lease claims made by cancellation. */
|
|
3
|
+
export declare class NativeWorkerHistory {
|
|
4
|
+
private windows;
|
|
5
|
+
private currentLease?;
|
|
6
|
+
private sequence;
|
|
7
|
+
private commands;
|
|
8
|
+
assertNewLease(leaseId: string): void;
|
|
9
|
+
observe(entry: {
|
|
10
|
+
info?: NativeSessionInfo;
|
|
11
|
+
event?: NativeSessionEvent;
|
|
12
|
+
commands?: NativeCommandReceipt[];
|
|
13
|
+
}): void;
|
|
14
|
+
read(leaseId: string, allEvents: NativeSessionEvent[], pending: NativeSessionEvent[], after?: number, limit?: number): NativeSessionReadResult;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=worker-history.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worker-history.d.ts","sourceRoot":"","sources":["../../src/native/worker-history.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,kBAAkB,EAClB,iBAAiB,EACjB,uBAAuB,EACxB,MAAM,oBAAoB,CAAC;AAS5B,0FAA0F;AAC1F,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,OAAO,CAAmC;IAClD,OAAO,CAAC,YAAY,CAAC,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAK;IACrB,OAAO,CAAC,QAAQ,CAA2C;IAE3D,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIrC,OAAO,CAAC,KAAK,EAAE;QACb,IAAI,CAAC,EAAE,iBAAiB,CAAC;QACzB,KAAK,CAAC,EAAE,kBAAkB,CAAC;QAC3B,QAAQ,CAAC,EAAE,oBAAoB,EAAE,CAAC;KACnC,GAAG,IAAI;IAuBR,IAAI,CACF,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,kBAAkB,EAAE,EAC/B,OAAO,EAAE,kBAAkB,EAAE,EAC7B,KAAK,CAAC,EAAE,MAAM,EACd,KAAK,SAAM,GACV,uBAAuB;CAuC3B"}
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
/** Rebuilt from durable journal ordering, including lease claims made by cancellation. */
|
|
2
|
+
export class NativeWorkerHistory {
|
|
3
|
+
constructor() {
|
|
4
|
+
this.windows = new Map();
|
|
5
|
+
this.sequence = 0;
|
|
6
|
+
this.commands = new Map();
|
|
7
|
+
}
|
|
8
|
+
assertNewLease(leaseId) {
|
|
9
|
+
if (this.windows.has(leaseId))
|
|
10
|
+
throw new Error('Native worker task lease cannot be reused');
|
|
11
|
+
}
|
|
12
|
+
observe(entry) {
|
|
13
|
+
const lease = entry.info?.workerLeaseId;
|
|
14
|
+
if (entry.info && lease !== this.currentLease) {
|
|
15
|
+
const previous = this.currentLease && this.windows.get(this.currentLease);
|
|
16
|
+
if (previous) {
|
|
17
|
+
previous.endAt = this.sequence;
|
|
18
|
+
previous.commands = [...this.commands.values()].map((command) => ({ ...command }));
|
|
19
|
+
}
|
|
20
|
+
if (lease) {
|
|
21
|
+
if (this.windows.has(lease))
|
|
22
|
+
throw new Error('Native worker task lease cannot be reused');
|
|
23
|
+
this.windows.set(lease, { startAfter: this.sequence, info: structuredClone(entry.info) });
|
|
24
|
+
}
|
|
25
|
+
this.currentLease = lease;
|
|
26
|
+
}
|
|
27
|
+
if (entry.info && lease)
|
|
28
|
+
this.windows.get(lease).info = structuredClone(entry.info);
|
|
29
|
+
for (const command of entry.commands ?? []) {
|
|
30
|
+
// Journal commands also carry private prompt text. Never retain it in public receipts.
|
|
31
|
+
const { generation, commandId, state, submitted, accepted, outcome } = command;
|
|
32
|
+
this.commands.set(commandId, { generation, commandId, state, submitted, accepted, outcome });
|
|
33
|
+
}
|
|
34
|
+
if (entry.event)
|
|
35
|
+
this.sequence = entry.event.sequence;
|
|
36
|
+
}
|
|
37
|
+
read(leaseId, allEvents, pending, after, limit = 200) {
|
|
38
|
+
const window = this.windows.get(leaseId);
|
|
39
|
+
if (!window)
|
|
40
|
+
throw new Error('Native worker history lease is unknown');
|
|
41
|
+
const endAt = window.endAt ?? this.sequence;
|
|
42
|
+
const cursor = after ?? window.startAfter;
|
|
43
|
+
if (!Number.isSafeInteger(cursor) || cursor < window.startAfter || cursor > endAt)
|
|
44
|
+
throw new Error('Invalid native worker history cursor');
|
|
45
|
+
if (!Number.isSafeInteger(limit) || limit < 1 || limit > 500)
|
|
46
|
+
throw new Error('Invalid native event limit');
|
|
47
|
+
const scopedEvents = allEvents.slice(window.startAfter, endAt);
|
|
48
|
+
const submitted = new Set(scopedEvents
|
|
49
|
+
.filter((event) => event.type === 'command.submitted')
|
|
50
|
+
.map((event) => event.commandId));
|
|
51
|
+
const events = [];
|
|
52
|
+
let bytes = 0;
|
|
53
|
+
for (const event of allEvents.slice(cursor, Math.min(cursor + limit, endAt))) {
|
|
54
|
+
const size = Buffer.byteLength(JSON.stringify(event));
|
|
55
|
+
if (events.length && bytes + size > 2 * 1024 * 1024)
|
|
56
|
+
break;
|
|
57
|
+
events.push(event);
|
|
58
|
+
bytes += size;
|
|
59
|
+
}
|
|
60
|
+
const released = window.endAt !== undefined;
|
|
61
|
+
return {
|
|
62
|
+
session: structuredClone(window.info),
|
|
63
|
+
events,
|
|
64
|
+
cursor: cursor + events.length,
|
|
65
|
+
hasMore: cursor + events.length < endAt,
|
|
66
|
+
commands: (window.commands ?? [...this.commands.values()])
|
|
67
|
+
.filter((command) => submitted.has(command.commandId))
|
|
68
|
+
.slice(-100)
|
|
69
|
+
.map((command) => ({ ...command })),
|
|
70
|
+
pendingRequests: released
|
|
71
|
+
? []
|
|
72
|
+
: pending.filter((event) => event.sequence > window.startAfter),
|
|
73
|
+
scope: { leaseId, startAfter: window.startAfter, endAt, released },
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
//# sourceMappingURL=worker-history.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worker-history.js","sourceRoot":"","sources":["../../src/native/worker-history.ts"],"names":[],"mappings":"AAcA,0FAA0F;AAC1F,MAAM,OAAO,mBAAmB;IAAhC;QACU,YAAO,GAAG,IAAI,GAAG,EAAwB,CAAC;QAE1C,aAAQ,GAAG,CAAC,CAAC;QACb,aAAQ,GAAG,IAAI,GAAG,EAAgC,CAAC;IA8E7D,CAAC;IA5EC,cAAc,CAAC,OAAe;QAC5B,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC9F,CAAC;IAED,OAAO,CAAC,KAIP;QACC,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,aAAa,CAAC;QACxC,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;YAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC1E,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC;gBAC/B,QAAQ,CAAC,QAAQ,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC;YACrF,CAAC;YACD,IAAI,KAAK,EAAE,CAAC;gBACV,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC;oBAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;gBAC1F,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC5F,CAAC;YACD,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC5B,CAAC;QACD,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK;YAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,IAAI,GAAG,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrF,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC;YAC3C,uFAAuF;YACvF,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;YAC/E,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAC/F,CAAC;QACD,IAAI,KAAK,CAAC,KAAK;YAAE,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC;IACxD,CAAC;IAED,IAAI,CACF,OAAe,EACf,SAA+B,EAC/B,OAA6B,EAC7B,KAAc,EACd,KAAK,GAAG,GAAG;QAEX,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QACvE,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC;QAC5C,MAAM,MAAM,GAAG,KAAK,IAAI,MAAM,CAAC,UAAU,CAAC;QAC1C,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,MAAM,CAAC,UAAU,IAAI,MAAM,GAAG,KAAK;YAC/E,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,GAAG;YAC1D,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAChD,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC/D,MAAM,SAAS,GAAG,IAAI,GAAG,CACvB,YAAY;aACT,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,mBAAmB,CAAC;aACrD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CACnC,CAAC;QACF,MAAM,MAAM,GAAyB,EAAE,CAAC;QACxC,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;YAC7E,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;YACtD,IAAI,MAAM,CAAC,MAAM,IAAI,KAAK,GAAG,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI;gBAAE,MAAM;YAC3D,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnB,KAAK,IAAI,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC;QAC5C,OAAO;YACL,OAAO,EAAE,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC;YACrC,MAAM;YACN,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM;YAC9B,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,GAAG,KAAK;YACvC,QAAQ,EAAE,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;iBACvD,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;iBACrD,KAAK,CAAC,CAAC,GAAG,CAAC;iBACX,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;YACrC,eAAe,EAAE,QAAQ;gBACvB,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC;YACjE,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE;SACnE,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worker-history.test.d.ts","sourceRoot":"","sources":["../../src/native/worker-history.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,195 @@
|
|
|
1
|
+
import assert from 'node:assert/strict';
|
|
2
|
+
import { randomUUID } from 'node:crypto';
|
|
3
|
+
import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
|
|
4
|
+
import { tmpdir } from 'node:os';
|
|
5
|
+
import { join } from 'node:path';
|
|
6
|
+
import test from 'node:test';
|
|
7
|
+
import { NativeSessionManager } from './manager.js';
|
|
8
|
+
import { routeNativeSession } from './service.js';
|
|
9
|
+
import { NativeWorkerHistory } from './worker-history.js';
|
|
10
|
+
import { nativeWorkerLaunchDigest } from './worker-launch.js';
|
|
11
|
+
const info = {
|
|
12
|
+
id: randomUUID(),
|
|
13
|
+
generation: 'generation',
|
|
14
|
+
hostPid: 123,
|
|
15
|
+
runner: 'codex',
|
|
16
|
+
nativeSessionId: 'conversation',
|
|
17
|
+
ownerPrincipalId: 'owner',
|
|
18
|
+
executionNodeId: 'local',
|
|
19
|
+
accountContextId: 'account',
|
|
20
|
+
cwd: '/tmp',
|
|
21
|
+
executable: '/bin/false',
|
|
22
|
+
version: '1',
|
|
23
|
+
mode: 'default',
|
|
24
|
+
accountMode: 'native',
|
|
25
|
+
workerManaged: true,
|
|
26
|
+
workerLeaseId: randomUUID(),
|
|
27
|
+
state: 'closed',
|
|
28
|
+
processStopped: true,
|
|
29
|
+
capabilities: {
|
|
30
|
+
modes: ['default'],
|
|
31
|
+
streaming: true,
|
|
32
|
+
tools: true,
|
|
33
|
+
approvals: true,
|
|
34
|
+
questions: true,
|
|
35
|
+
interrupt: true,
|
|
36
|
+
resume: true,
|
|
37
|
+
},
|
|
38
|
+
};
|
|
39
|
+
const receipt = (id) => ({
|
|
40
|
+
generation: 'generation',
|
|
41
|
+
commandId: id,
|
|
42
|
+
state: 'completed',
|
|
43
|
+
submitted: true,
|
|
44
|
+
accepted: true,
|
|
45
|
+
});
|
|
46
|
+
const event = (sequence, commandId) => ({
|
|
47
|
+
sessionId: info.id,
|
|
48
|
+
sequence,
|
|
49
|
+
generation: info.generation,
|
|
50
|
+
at: 'now',
|
|
51
|
+
type: 'command.submitted',
|
|
52
|
+
commandId,
|
|
53
|
+
text: commandId,
|
|
54
|
+
});
|
|
55
|
+
test('scoped task history preserves version-based recovery restrictions', () => {
|
|
56
|
+
for (const version of ['2.1.78 (Claude Code)', '2.1.269 (Claude Code)']) {
|
|
57
|
+
const root = mkdtempSync(join(tmpdir(), 'native-history-version-'));
|
|
58
|
+
try {
|
|
59
|
+
const saved = { ...info, runner: 'claude', version };
|
|
60
|
+
writeFileSync(join(root, `${info.id}.journal`), JSON.stringify({ info: saved, context: {} }) + '\n');
|
|
61
|
+
const manager = new NativeSessionManager(root);
|
|
62
|
+
const expected = manager.read('owner', info.id).session.capabilities;
|
|
63
|
+
const actual = manager.readWorker('owner', info.id, info.workerLeaseId).session.capabilities;
|
|
64
|
+
assert.deepEqual(actual, expected);
|
|
65
|
+
assert.equal(actual.resume, version.startsWith('2.1.269'));
|
|
66
|
+
}
|
|
67
|
+
finally {
|
|
68
|
+
rmSync(root, { recursive: true, force: true });
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
test('lease windows freeze metadata and receipts, filter before last100, and keep absolute pagination', () => {
|
|
73
|
+
const history = new NativeWorkerHistory();
|
|
74
|
+
const first = info.workerLeaseId;
|
|
75
|
+
const next = randomUUID();
|
|
76
|
+
history.observe({ info: { ...info, state: 'idle' } });
|
|
77
|
+
const events = [event(1, 'original')];
|
|
78
|
+
history.observe({ event: events[0], commands: [{ ...receipt('original'), state: 'unknown' }] });
|
|
79
|
+
history.observe({ info: { ...info, workerLeaseId: next } });
|
|
80
|
+
// A resumed successor can update global receipts without rewriting the prior task snapshot.
|
|
81
|
+
history.observe({
|
|
82
|
+
info: { ...info, workerLeaseId: next, generation: 'resumed' },
|
|
83
|
+
commands: [receipt('original')],
|
|
84
|
+
});
|
|
85
|
+
for (let sequence = 2; sequence <= 105; sequence++) {
|
|
86
|
+
events.push(event(sequence, `next-${sequence}`));
|
|
87
|
+
history.observe({ event: events.at(-1), commands: [receipt(`next-${sequence}`)] });
|
|
88
|
+
}
|
|
89
|
+
const prior = history.read(first, events, [events[104]]);
|
|
90
|
+
assert.deepEqual(prior.scope, { leaseId: first, startAfter: 0, endAt: 1, released: true });
|
|
91
|
+
assert.equal(prior.session.state, 'idle', 'Task release is not process closure');
|
|
92
|
+
assert.equal(prior.session.generation, 'generation');
|
|
93
|
+
assert.deepEqual(prior.commands, [
|
|
94
|
+
{ ...receipt('original'), state: 'unknown', outcome: undefined },
|
|
95
|
+
]);
|
|
96
|
+
assert.deepEqual(prior.pendingRequests, []);
|
|
97
|
+
assert.deepEqual(prior.events, [events[0]]);
|
|
98
|
+
const page = history.read(next, events, [], undefined, 2);
|
|
99
|
+
assert.deepEqual(page.events.map((item) => item.sequence), [2, 3]);
|
|
100
|
+
assert.equal(page.cursor, 3);
|
|
101
|
+
assert.equal(page.hasMore, true);
|
|
102
|
+
assert.equal(page.commands.length, 100);
|
|
103
|
+
assert.equal(page.commands[0].commandId, 'next-6');
|
|
104
|
+
assert.equal(page.session.generation, 'resumed');
|
|
105
|
+
assert.throws(() => history.read(next, events, [], 0), /cursor/);
|
|
106
|
+
assert.throws(() => history.read(first, events, [], 2), /cursor/);
|
|
107
|
+
assert.throws(() => history.read('unknown', events, []), /unknown/);
|
|
108
|
+
});
|
|
109
|
+
test('both worker transfer and cancellation lease claim retain the same history across host reload', async () => {
|
|
110
|
+
for (const cancellation of [false, true]) {
|
|
111
|
+
const root = mkdtempSync(join(tmpdir(), 'native-history-'));
|
|
112
|
+
try {
|
|
113
|
+
const next = randomUUID();
|
|
114
|
+
const launch = {
|
|
115
|
+
leaseId: next,
|
|
116
|
+
safetyTier: 'full-auto',
|
|
117
|
+
environment: { set: {}, unset: [] },
|
|
118
|
+
};
|
|
119
|
+
writeFileSync(join(root, `${info.id}.journal`), JSON.stringify({
|
|
120
|
+
info,
|
|
121
|
+
context: { workerLaunchDigest: nativeWorkerLaunchDigest(launch) },
|
|
122
|
+
event: event(1, 'original'),
|
|
123
|
+
commands: [{ ...receipt('original'), text: 'private prompt' }],
|
|
124
|
+
}) + '\n');
|
|
125
|
+
const manager = new NativeSessionManager(root);
|
|
126
|
+
if (cancellation)
|
|
127
|
+
await manager.cancelWorker('owner', info.id, next, info.generation, info.workerLeaseId);
|
|
128
|
+
else
|
|
129
|
+
manager.transferWorker('owner', info.id, info.generation, info.workerLeaseId, launch);
|
|
130
|
+
const expected = manager.readWorker('owner', info.id, info.workerLeaseId);
|
|
131
|
+
assert.equal(expected.scope?.released, true);
|
|
132
|
+
assert.equal(expected.scope.endAt, 1);
|
|
133
|
+
assert.equal(expected.commands.length, 1);
|
|
134
|
+
assert.equal('text' in expected.commands[0], false);
|
|
135
|
+
const loaded = new NativeSessionManager(root);
|
|
136
|
+
assert.deepEqual(loaded.readWorker('owner', info.id, info.workerLeaseId), expected);
|
|
137
|
+
const successor = loaded.readWorker('owner', info.id, next);
|
|
138
|
+
assert.deepEqual(successor.scope, {
|
|
139
|
+
leaseId: next,
|
|
140
|
+
startAfter: 1,
|
|
141
|
+
endAt: 1,
|
|
142
|
+
released: false,
|
|
143
|
+
});
|
|
144
|
+
assert.deepEqual(successor.events, []);
|
|
145
|
+
assert.deepEqual(successor.commands, []);
|
|
146
|
+
assert.throws(() => loaded.readWorker('other-owner', info.id, info.workerLeaseId), /principal/);
|
|
147
|
+
}
|
|
148
|
+
finally {
|
|
149
|
+
rmSync(root, { recursive: true, force: true });
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
});
|
|
153
|
+
test('worker workspace reads require a pin and refuse results when the lease transfers during the read', async () => {
|
|
154
|
+
const root = mkdtempSync(join(tmpdir(), 'native-history-files-'));
|
|
155
|
+
try {
|
|
156
|
+
writeFileSync(join(root, 'file.txt'), 'task file');
|
|
157
|
+
let calls = 0;
|
|
158
|
+
let transfer = false;
|
|
159
|
+
const client = {
|
|
160
|
+
executionNodeId: 'local',
|
|
161
|
+
async read() {
|
|
162
|
+
calls++;
|
|
163
|
+
return {
|
|
164
|
+
session: {
|
|
165
|
+
...info,
|
|
166
|
+
cwd: root,
|
|
167
|
+
state: 'idle',
|
|
168
|
+
workerLeaseId: transfer && calls > 1 ? 'successor' : info.workerLeaseId,
|
|
169
|
+
},
|
|
170
|
+
};
|
|
171
|
+
},
|
|
172
|
+
};
|
|
173
|
+
const params = { sessionId: info.id, path: 'file.txt' };
|
|
174
|
+
await assert.rejects(routeNativeSession(client, 'owner', 'native.session.workspace.read', params), /pinned/);
|
|
175
|
+
const pinned = {
|
|
176
|
+
...params,
|
|
177
|
+
worker: {
|
|
178
|
+
runId: 'run',
|
|
179
|
+
contextId: 'context',
|
|
180
|
+
generation: info.generation,
|
|
181
|
+
leaseId: info.workerLeaseId,
|
|
182
|
+
},
|
|
183
|
+
};
|
|
184
|
+
calls = 0;
|
|
185
|
+
assert.deepEqual(await routeNativeSession(client, 'owner', 'native.session.workspace.read', pinned), { path: 'file.txt', content: 'task file' });
|
|
186
|
+
assert.equal(calls, 2);
|
|
187
|
+
calls = 0;
|
|
188
|
+
transfer = true;
|
|
189
|
+
await assert.rejects(routeNativeSession(client, 'owner', 'native.session.workspace.read', pinned), /transferred/);
|
|
190
|
+
}
|
|
191
|
+
finally {
|
|
192
|
+
rmSync(root, { recursive: true, force: true });
|
|
193
|
+
}
|
|
194
|
+
});
|
|
195
|
+
//# sourceMappingURL=worker-history.test.js.map
|