@agentshouse/kit 0.2.1-cbabe8ad337ff → 0.2.1-cc6246211e00c
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +42 -41
- package/dist/acp.js +38 -17
- package/dist/agents.js +111 -24
- package/dist/api.js +7 -3
- package/dist/app-git.js +10 -26
- package/dist/authority-main.js +2 -2
- package/dist/bridge.js +11 -25
- package/dist/building.js +46 -0
- package/dist/calls.js +63 -0
- package/dist/chatgpt.js +32 -0
- package/dist/clis-main.js +2 -2
- package/dist/clis.js +87 -22
- package/dist/connection.js +126 -0
- package/dist/conversations.js +410 -156
- package/dist/copies.js +185 -123
- package/dist/end.js +23 -4
- package/dist/enrol-main.js +7 -1
- package/dist/events.js +6 -2
- package/dist/files.js +139 -31
- package/dist/git.js +13 -11
- package/dist/home.js +96 -7
- package/dist/house-cli.js +299 -0
- package/dist/house-main.js +7 -177
- package/dist/instructions.js +8 -10
- package/dist/kit-cli.js +68 -0
- package/dist/kit-main.js +8 -22
- package/dist/login.js +111 -23
- package/dist/logout.js +0 -2
- package/dist/mcp.js +4 -2
- package/dist/parts.js +34 -16
- package/dist/placement.js +39 -0
- package/dist/relay.js +33 -2
- package/dist/resident.js +106 -44
- package/dist/scope.js +3 -0
- package/dist/service-main.js +9 -0
- package/dist/service.js +55 -0
- package/dist/sign-in.js +22 -39
- package/dist/skills.js +49 -35
- package/dist/transcription.js +85 -45
- package/dist/translate.js +2 -8
- package/dist/update.js +98 -53
- package/dist/web-wizard.js +101 -0
- package/dist/wire.js +22 -0
- package/dist/work.js +3 -5
- package/package.json +20 -20
- package/dist/bootstrap.json +0 -24
- package/dist/stream.js +0 -72
- package/how-we-work.md +0 -23
- package/skills/ask-matt/LICENSE +0 -21
- package/skills/ask-matt/PHASE-BOUNDARIES.md +0 -55
- package/skills/ask-matt/SKILL.md +0 -91
- package/skills/ask-matt/agents/openai.yaml +0 -4
- package/skills/code-review/LICENSE +0 -21
- package/skills/code-review/SKILL.md +0 -89
- package/skills/code-review/agents/openai.yaml +0 -3
- package/skills/codebase-design/DEEPENING.md +0 -37
- package/skills/codebase-design/DESIGN-IT-TWICE.md +0 -44
- package/skills/codebase-design/LICENSE +0 -21
- package/skills/codebase-design/SKILL.md +0 -116
- package/skills/codebase-design/agents/openai.yaml +0 -3
- package/skills/diagnosing-bugs/LICENSE +0 -21
- package/skills/diagnosing-bugs/SKILL.md +0 -140
- package/skills/diagnosing-bugs/agents/openai.yaml +0 -3
- package/skills/diagnosing-bugs/scripts/hitl-loop.template.sh +0 -44
- package/skills/domain-modeling/ADR-FORMAT.md +0 -47
- package/skills/domain-modeling/CONTEXT-FORMAT.md +0 -60
- package/skills/domain-modeling/LICENSE +0 -21
- package/skills/domain-modeling/SKILL.md +0 -76
- package/skills/domain-modeling/agents/openai.yaml +0 -3
- package/skills/grill-me/LICENSE +0 -21
- package/skills/grill-me/SKILL.md +0 -8
- package/skills/grill-me/agents/openai.yaml +0 -4
- package/skills/grill-with-docs/LICENSE +0 -21
- package/skills/grill-with-docs/SKILL.md +0 -8
- package/skills/grill-with-docs/agents/openai.yaml +0 -4
- package/skills/grilling/LICENSE +0 -21
- package/skills/grilling/SKILL.md +0 -30
- package/skills/grilling/agents/openai.yaml +0 -3
- package/skills/handoff/LICENSE +0 -21
- package/skills/handoff/SKILL.md +0 -17
- package/skills/handoff/agents/openai.yaml +0 -4
- package/skills/implement/LICENSE +0 -21
- package/skills/implement/SKILL.md +0 -16
- package/skills/implement/agents/openai.yaml +0 -4
- package/skills/improve-codebase-architecture/HTML-REPORT.md +0 -123
- package/skills/improve-codebase-architecture/LICENSE +0 -21
- package/skills/improve-codebase-architecture/SKILL.md +0 -72
- package/skills/improve-codebase-architecture/agents/openai.yaml +0 -4
- package/skills/prototype/LICENSE +0 -21
- package/skills/prototype/LOGIC.md +0 -67
- package/skills/prototype/SKILL.md +0 -28
- package/skills/prototype/UI.md +0 -112
- package/skills/prototype/agents/openai.yaml +0 -3
- package/skills/research/LICENSE +0 -21
- package/skills/research/SKILL.md +0 -14
- package/skills/research/agents/openai.yaml +0 -3
- package/skills/resolving-merge-conflicts/LICENSE +0 -21
- package/skills/resolving-merge-conflicts/SKILL.md +0 -16
- package/skills/resolving-merge-conflicts/agents/openai.yaml +0 -3
- package/skills/tdd/LICENSE +0 -21
- package/skills/tdd/SKILL.md +0 -40
- package/skills/tdd/agents/openai.yaml +0 -3
- package/skills/tdd/mocking.md +0 -59
- package/skills/tdd/tests.md +0 -77
- package/skills/teach/GLOSSARY-FORMAT.md +0 -35
- package/skills/teach/LEARNING-RECORD-FORMAT.md +0 -46
- package/skills/teach/LICENSE +0 -21
- package/skills/teach/MISSION-FORMAT.md +0 -31
- package/skills/teach/RESOURCES-FORMAT.md +0 -32
- package/skills/teach/SKILL.md +0 -141
- package/skills/teach/agents/openai.yaml +0 -4
- package/skills/to-questionnaire/LICENSE +0 -21
- package/skills/to-questionnaire/SKILL.md +0 -55
- package/skills/to-questionnaire/agents/openai.yaml +0 -4
- package/skills/to-spec/LICENSE +0 -21
- package/skills/to-spec/SKILL.md +0 -76
- package/skills/to-spec/agents/openai.yaml +0 -4
- package/skills/to-tickets/LICENSE +0 -21
- package/skills/to-tickets/SKILL.md +0 -106
- package/skills/to-tickets/agents/openai.yaml +0 -4
- package/skills/wait-what/LICENSE +0 -21
- package/skills/wait-what/SKILL.md +0 -8
- package/skills/wait-what/agents/openai.yaml +0 -4
- package/skills/wayfinder/LICENSE +0 -21
- package/skills/wayfinder/SKILL.md +0 -129
- package/skills/wayfinder/agents/openai.yaml +0 -4
- package/skills/writing-for-agents/LICENSE +0 -21
- package/skills/writing-for-agents/SKILL-MECHANICS.md +0 -22
- package/skills/writing-for-agents/SKILL.md +0 -83
- package/skills/writing-for-agents/agents/openai.yaml +0 -3
package/dist/bridge.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { createHash, randomUUID } from 'node:crypto';
|
|
2
2
|
import { once } from 'node:events';
|
|
3
3
|
import { setTimeout as delay } from 'node:timers/promises';
|
|
4
|
-
import { mkdir } from 'node:fs/promises';
|
|
5
4
|
import { createServer, request as httpRequest } from 'node:http';
|
|
6
5
|
import { request as httpsRequest } from 'node:https';
|
|
7
6
|
import { delimiter, dirname, join } from 'node:path';
|
|
@@ -9,12 +8,12 @@ import { parse } from 'yaml';
|
|
|
9
8
|
import { finalRefusal, HouseRefusal, retryDelay, retrying } from './api.js';
|
|
10
9
|
import { loginPath } from './clis.js';
|
|
11
10
|
import { changedPaths, } from './copies.js';
|
|
12
|
-
import { kitHome, readEnrolment } from './home.js';
|
|
11
|
+
import { kitHome, readEnrolment, socketDirectory } from './home.js';
|
|
13
12
|
import { callHouse, mcpBody, rpc, UNREACHABLE } from './mcp.js';
|
|
14
13
|
import { operationId } from './operation.js';
|
|
15
14
|
import { refusalOf, retryable } from './refusals.js';
|
|
16
15
|
import { relayed } from './relay.js';
|
|
17
|
-
const MCP_REQUEST_BYTES =
|
|
16
|
+
const MCP_REQUEST_BYTES = 4_000_000;
|
|
18
17
|
export async function received(request) {
|
|
19
18
|
let text = '';
|
|
20
19
|
request.setEncoding('utf8');
|
|
@@ -82,7 +81,7 @@ function editAnswer(forwarded) {
|
|
|
82
81
|
export async function openBridge(house, copies, conversationId, signal) {
|
|
83
82
|
const path = [join(kitHome(), 'shim'), dirname(process.execPath), await loginPath()].join(delimiter);
|
|
84
83
|
const origin = (await readEnrolment()).house;
|
|
85
|
-
const { credential } = await house.post(`/kit/conversations/${conversationId}/credential`, {}, signal);
|
|
84
|
+
const { credential } = await retrying(() => house.post(`/kit/conversations/${conversationId}/credential`, {}, signal), signal);
|
|
86
85
|
const closed = new AbortController();
|
|
87
86
|
const sent = (message, operation) => callHouse(origin, credential, message, operation, closed.signal);
|
|
88
87
|
const send = async (message, operation) => {
|
|
@@ -97,7 +96,7 @@ export async function openBridge(house, copies, conversationId, signal) {
|
|
|
97
96
|
const after = resendAfter(forwarded, attempt);
|
|
98
97
|
if (after === null)
|
|
99
98
|
return forwarded;
|
|
100
|
-
// A
|
|
99
|
+
// A Tool call House did not settle is sent again on the jittered curve, or after the wait House names for a pending one.
|
|
101
100
|
await delay(after, undefined, { signal: closed.signal });
|
|
102
101
|
}
|
|
103
102
|
};
|
|
@@ -135,23 +134,9 @@ export async function openBridge(house, copies, conversationId, signal) {
|
|
|
135
134
|
const held = JSON.parse(text).transfer;
|
|
136
135
|
return { url: held.url, operation: held.operation, bytes: bytes.length, sha256 };
|
|
137
136
|
};
|
|
138
|
-
|
|
139
|
-
const writes = async (tool) => {
|
|
140
|
-
mutations ??= house
|
|
141
|
-
.post('/kit/tools/mutations', {}, closed.signal)
|
|
142
|
-
.then(({ tools }) => new Set(tools.filter((listed) => listed.writes).map((listed) => listed.name)));
|
|
143
|
-
try {
|
|
144
|
-
return (await mutations).has(tool);
|
|
145
|
-
}
|
|
146
|
-
catch (error) {
|
|
147
|
-
mutations = null;
|
|
148
|
-
throw error;
|
|
149
|
-
}
|
|
150
|
-
};
|
|
151
|
-
const forward = async (text) => {
|
|
137
|
+
const forward = (text) => {
|
|
152
138
|
const message = JSON.parse(text);
|
|
153
|
-
|
|
154
|
-
return send(message, tool !== null && (await writes(tool)) ? operationId() : null);
|
|
139
|
+
return send(message, message.method === 'tools/call' ? operationId() : null);
|
|
155
140
|
};
|
|
156
141
|
const caller = {
|
|
157
142
|
key: `conversation:${conversationId}`,
|
|
@@ -173,15 +158,15 @@ export async function openBridge(house, copies, conversationId, signal) {
|
|
|
173
158
|
const { cwd, commit } = JSON.parse(text);
|
|
174
159
|
return { status: 200, text: JSON.stringify(await copies.push(cwd, commit, caller)) };
|
|
175
160
|
}
|
|
161
|
+
if (path === '/git/fetch')
|
|
162
|
+
return { status: 200, text: JSON.stringify(await copies.fetch()) };
|
|
176
163
|
if (path === '/git/observed') {
|
|
177
164
|
await copies.observed(JSON.parse(text));
|
|
178
165
|
return { status: 200, text: '{}' };
|
|
179
166
|
}
|
|
180
167
|
return path === '/' ? forward(text) : { status: 404, text: '' };
|
|
181
168
|
};
|
|
182
|
-
const
|
|
183
|
-
await mkdir(sockets, { recursive: true, mode: 0o700 });
|
|
184
|
-
const socketPath = join(sockets, `${randomUUID()}.sock`);
|
|
169
|
+
const socketPath = join(socketDirectory(), `${randomUUID()}.sock`);
|
|
185
170
|
const bridge = createServer(async (request, response) => {
|
|
186
171
|
try {
|
|
187
172
|
const path = request.url ?? '';
|
|
@@ -197,7 +182,8 @@ export async function openBridge(house, copies, conversationId, signal) {
|
|
|
197
182
|
response.writeHead(error.status, { 'content-type': 'application/json' }).end(error.text);
|
|
198
183
|
return;
|
|
199
184
|
}
|
|
200
|
-
|
|
185
|
+
const verb = request.url === '/git/push' || request.url === '/git/fetch';
|
|
186
|
+
response.writeHead(502).end(verb && error instanceof Error ? error.message : UNREACHABLE);
|
|
201
187
|
}
|
|
202
188
|
});
|
|
203
189
|
bridge.listen(socketPath);
|
package/dist/building.js
ADDED
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import { createHash } from 'node:crypto';
|
|
2
|
+
import { createWriteStream } from 'node:fs';
|
|
3
|
+
import { rm } from 'node:fs/promises';
|
|
4
|
+
import { Transform } from 'node:stream';
|
|
5
|
+
import { pipeline } from 'node:stream/promises';
|
|
6
|
+
import { readEnrolment } from './home.js';
|
|
7
|
+
import { relayed } from './relay.js';
|
|
8
|
+
const MANIFEST = 'bootstrap.json';
|
|
9
|
+
async function served(name, signal) {
|
|
10
|
+
const enrolment = await readEnrolment();
|
|
11
|
+
if (enrolment === null)
|
|
12
|
+
throw new Error('this Kit is connected to no House');
|
|
13
|
+
const answer = await fetch(relayed(new URL(`/kit-installer/${encodeURIComponent(name)}`, enrolment.house)), { signal });
|
|
14
|
+
if (answer.status === 200 && answer.body !== null)
|
|
15
|
+
return answer;
|
|
16
|
+
await answer.body?.cancel();
|
|
17
|
+
throw new Error(`House answered ${answer.status} for ${name}`);
|
|
18
|
+
}
|
|
19
|
+
export async function servedDigest(name, signal) {
|
|
20
|
+
const manifest = (await (await served(MANIFEST, signal)).json());
|
|
21
|
+
const sha256 = manifest.files?.[name]?.sha256;
|
|
22
|
+
return typeof sha256 === 'string' ? sha256 : null;
|
|
23
|
+
}
|
|
24
|
+
export async function downloadServed(name, sha256, destination, signal, most = Infinity) {
|
|
25
|
+
const answer = await served(name, signal);
|
|
26
|
+
const digest = createHash('sha256');
|
|
27
|
+
let bytes = 0;
|
|
28
|
+
const hashed = new Transform({
|
|
29
|
+
transform(chunk, _encoding, done) {
|
|
30
|
+
bytes += chunk.length;
|
|
31
|
+
if (bytes > most)
|
|
32
|
+
return done(new Error(`${name} is larger than its pinned ${most} bytes`));
|
|
33
|
+
digest.update(chunk);
|
|
34
|
+
done(null, chunk);
|
|
35
|
+
},
|
|
36
|
+
});
|
|
37
|
+
try {
|
|
38
|
+
await pipeline(answer.body, hashed, createWriteStream(destination), { signal });
|
|
39
|
+
if (digest.digest('hex') !== sha256)
|
|
40
|
+
throw new Error(`${name} does not match its sha256`);
|
|
41
|
+
}
|
|
42
|
+
catch (error) {
|
|
43
|
+
await rm(destination, { force: true });
|
|
44
|
+
throw error;
|
|
45
|
+
}
|
|
46
|
+
}
|
package/dist/calls.js
ADDED
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { existsSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
|
|
2
|
+
import { join } from 'node:path';
|
|
3
|
+
import { kitHome } from './home.js';
|
|
4
|
+
function logged(error) {
|
|
5
|
+
process.stderr.write(`kit: ${error instanceof Error ? error.message : String(error)}\n`);
|
|
6
|
+
}
|
|
7
|
+
export class Calls {
|
|
8
|
+
house;
|
|
9
|
+
changed;
|
|
10
|
+
carried = new Map();
|
|
11
|
+
path = join(kitHome(), 'call-results.json');
|
|
12
|
+
results;
|
|
13
|
+
returned = new Set();
|
|
14
|
+
open = 0;
|
|
15
|
+
constructor(house, changed) {
|
|
16
|
+
this.house = house;
|
|
17
|
+
this.changed = changed;
|
|
18
|
+
this.results = new Map(existsSync(this.path) ? Object.entries(JSON.parse(readFileSync(this.path, 'utf8'))) : []);
|
|
19
|
+
}
|
|
20
|
+
keepResult(callId, result) {
|
|
21
|
+
if (this.returned.has(callId))
|
|
22
|
+
return;
|
|
23
|
+
this.results.set(callId, result);
|
|
24
|
+
this.save();
|
|
25
|
+
}
|
|
26
|
+
idle() {
|
|
27
|
+
return this.open === 0;
|
|
28
|
+
}
|
|
29
|
+
carry(callId, work) {
|
|
30
|
+
const known = this.carried.get(callId);
|
|
31
|
+
const result = this.results.get(callId);
|
|
32
|
+
const carried = known ?? (result === undefined ? work() : Promise.resolve({ result }));
|
|
33
|
+
if (known === undefined) {
|
|
34
|
+
this.carried.set(callId, carried);
|
|
35
|
+
carried.catch(() => this.carried.delete(callId));
|
|
36
|
+
}
|
|
37
|
+
this.open++;
|
|
38
|
+
this.changed();
|
|
39
|
+
return carried
|
|
40
|
+
.then(async ({ result, returned }) => {
|
|
41
|
+
try {
|
|
42
|
+
await this.house.deliver(`/kit/inputs/${callId}/ack`, result);
|
|
43
|
+
}
|
|
44
|
+
finally {
|
|
45
|
+
this.returned.add(callId);
|
|
46
|
+
if (this.results.delete(callId))
|
|
47
|
+
this.save();
|
|
48
|
+
}
|
|
49
|
+
if (known === undefined)
|
|
50
|
+
await returned?.();
|
|
51
|
+
})
|
|
52
|
+
.catch(logged)
|
|
53
|
+
.finally(() => {
|
|
54
|
+
this.open--;
|
|
55
|
+
this.changed();
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
save() {
|
|
59
|
+
const temporary = `${this.path}.${process.pid}`;
|
|
60
|
+
writeFileSync(temporary, JSON.stringify(Object.fromEntries(this.results)), { mode: 0o600 });
|
|
61
|
+
renameSync(temporary, this.path);
|
|
62
|
+
}
|
|
63
|
+
}
|
package/dist/chatgpt.js
ADDED
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { parseArgs } from 'node:util';
|
|
2
|
+
import { placeAppGit } from './app-git.js';
|
|
3
|
+
import { kitHome, readOwnAgent, writeOwnAgent } from './home.js';
|
|
4
|
+
import { accepted, DEFAULT_HOUSE } from './login.js';
|
|
5
|
+
const KEY_SOURCE = 'New key for a script on Connections';
|
|
6
|
+
const USAGE = `usage: kit chatgpt --key <key> [--house <origin>]
|
|
7
|
+
--key <key> a key from ${KEY_SOURCE}
|
|
8
|
+
--house <origin> the House of the key, ${DEFAULT_HOUSE} unless one is stored
|
|
9
|
+
`;
|
|
10
|
+
export async function chatgpt(argv) {
|
|
11
|
+
const { values } = parseArgs({
|
|
12
|
+
args: argv,
|
|
13
|
+
options: { key: { type: 'string' }, house: { type: 'string' }, help: { type: 'boolean', default: false } },
|
|
14
|
+
});
|
|
15
|
+
if (values.help) {
|
|
16
|
+
process.stdout.write(USAGE);
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
if (values.key === undefined)
|
|
20
|
+
throw new Error(`pass --key with a key from ${KEY_SOURCE}`);
|
|
21
|
+
const before = await readOwnAgent();
|
|
22
|
+
const house = values.house ?? before?.house ?? DEFAULT_HOUSE;
|
|
23
|
+
if (!(await accepted(house, values.key)))
|
|
24
|
+
throw new Error(`${house} does not accept this key; pass one from ${KEY_SOURCE}`);
|
|
25
|
+
const relay = process.env.HOUSE_KIT_RELAY || undefined;
|
|
26
|
+
await writeOwnAgent({ house, ...(relay === undefined ? {} : { relay }), credential: values.key });
|
|
27
|
+
await placeAppGit(await readOwnAgent()).catch((error) => process.stderr.write(`kit: ${error.message}\n`));
|
|
28
|
+
if (before !== null && before.credential !== values.key) {
|
|
29
|
+
process.stdout.write('This replaced the key this Kit home held; give each session its own HOUSE_KIT_HOME to keep its own key.\n');
|
|
30
|
+
}
|
|
31
|
+
process.stdout.write(`house now calls ${house} as you, with the key kept in ${kitHome()}.\n`);
|
|
32
|
+
}
|
package/dist/clis-main.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { setGlobalProxyFromEnv } from 'node:http';
|
|
2
1
|
import { post } from './api.js';
|
|
3
2
|
import { CLIS, below, locate, versionOf } from './clis.js';
|
|
4
3
|
import { readEnrolment } from './home.js';
|
|
5
|
-
|
|
4
|
+
import { proxyUnlessRelayed } from './relay.js';
|
|
5
|
+
proxyUnlessRelayed();
|
|
6
6
|
try {
|
|
7
7
|
const { house, credential } = (await readEnrolment());
|
|
8
8
|
const { agents } = await post(house, '/kit/agents/desired', {}, credential);
|
package/dist/clis.js
CHANGED
|
@@ -1,9 +1,16 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
|
+
import { randomUUID } from 'node:crypto';
|
|
2
3
|
import { constants, readFileSync } from 'node:fs';
|
|
3
|
-
import { access, mkdir, readFile, writeFile } from 'node:fs/promises';
|
|
4
|
+
import { access, mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
|
|
4
5
|
import { homedir, userInfo } from 'node:os';
|
|
5
|
-
import { delimiter, isAbsolute, join } from 'node:path';
|
|
6
|
+
import { delimiter, dirname, isAbsolute, join } from 'node:path';
|
|
7
|
+
import { downloadServed, servedDigest } from './building.js';
|
|
6
8
|
import { kitHome } from './home.js';
|
|
9
|
+
import { childEnvironment } from './relay.js';
|
|
10
|
+
const HOUSE_EXECUTABLES = /^host_executable\(name = "house", paths = (\[.*\])\)$/m;
|
|
11
|
+
function houseRule(houses) {
|
|
12
|
+
return `prefix_rule(pattern = ["house"], decision = "allow")\nhost_executable(name = "house", paths = ${JSON.stringify(houses)})\n`;
|
|
13
|
+
}
|
|
7
14
|
const RAW_SUBTYPES = [
|
|
8
15
|
'background_tasks_changed',
|
|
9
16
|
'task_started',
|
|
@@ -22,24 +29,49 @@ async function executable(path) {
|
|
|
22
29
|
return false;
|
|
23
30
|
}
|
|
24
31
|
}
|
|
25
|
-
async function
|
|
32
|
+
async function listedHouses(file) {
|
|
33
|
+
let text;
|
|
34
|
+
try {
|
|
35
|
+
text = await readFile(file, 'utf8');
|
|
36
|
+
}
|
|
37
|
+
catch (error) {
|
|
38
|
+
if (error.code === 'ENOENT')
|
|
39
|
+
return [];
|
|
40
|
+
throw error;
|
|
41
|
+
}
|
|
42
|
+
try {
|
|
43
|
+
const listed = JSON.parse(HOUSE_EXECUTABLES.exec(text)?.[1] ?? '[]');
|
|
44
|
+
return Array.isArray(listed) ? listed.filter((house) => typeof house === 'string') : [];
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
return [];
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
export async function allowHouseInCodex(path) {
|
|
26
51
|
const candidates = [...new Set(path.split(delimiter).filter((directory) => isAbsolute(directory)))].map((directory) => join(directory, 'house'));
|
|
27
|
-
const houses = [];
|
|
28
|
-
for (const candidate of candidates)
|
|
29
|
-
if (await executable(candidate))
|
|
30
|
-
houses.push(candidate);
|
|
31
52
|
const rules = join(process.env.CODEX_HOME || join(homedir(), '.codex'), 'rules');
|
|
53
|
+
const file = join(rules, 'house.rules');
|
|
54
|
+
const houses = [];
|
|
55
|
+
for (const house of [...(await listedHouses(file)), ...candidates]) {
|
|
56
|
+
if (!houses.includes(house) && (await executable(house)))
|
|
57
|
+
houses.push(house);
|
|
58
|
+
}
|
|
32
59
|
await mkdir(rules, { recursive: true });
|
|
33
|
-
|
|
60
|
+
const temporary = `${file}.${randomUUID()}`;
|
|
61
|
+
await writeFile(temporary, houseRule(houses));
|
|
62
|
+
await rename(temporary, file);
|
|
34
63
|
}
|
|
35
64
|
async function nothing() { }
|
|
65
|
+
function answered(error) {
|
|
66
|
+
return typeof error === 'object' && error !== null ? error : {};
|
|
67
|
+
}
|
|
36
68
|
function bridgeInClaudeSandbox(bridge) {
|
|
37
69
|
return process.platform === 'darwin' ? { allowUnixSockets: [bridge] } : { allowAllUnixSockets: true };
|
|
38
70
|
}
|
|
39
71
|
export const CLIS = {
|
|
40
72
|
'codex-acp': {
|
|
41
73
|
bin: 'codex',
|
|
42
|
-
minimum: '0.
|
|
74
|
+
minimum: '0.160.1',
|
|
43
75
|
install: 'curl -fsSL https://chatgpt.com/codex/install.sh | sh',
|
|
44
76
|
adapter: {
|
|
45
77
|
package: '@agentclientprotocol/codex-acp',
|
|
@@ -50,6 +82,10 @@ export const CLIS = {
|
|
|
50
82
|
args: [],
|
|
51
83
|
fullAccess: 'agent-full-access',
|
|
52
84
|
sessionMeta: () => ({}),
|
|
85
|
+
unknownSession: (error) => {
|
|
86
|
+
const { code, data } = answered(error);
|
|
87
|
+
return code === -32603 && typeof data?.details === 'string' && data.details.startsWith('no rollout found');
|
|
88
|
+
},
|
|
53
89
|
renames: true,
|
|
54
90
|
allowHouse: allowHouseInCodex,
|
|
55
91
|
signedIn: { command: ['login', 'status'] },
|
|
@@ -58,7 +94,7 @@ export const CLIS = {
|
|
|
58
94
|
},
|
|
59
95
|
'claude-agent-acp': {
|
|
60
96
|
bin: 'claude',
|
|
61
|
-
minimum: '2.1.
|
|
97
|
+
minimum: '2.1.303',
|
|
62
98
|
install: 'curl -fsSL https://claude.ai/install.sh | bash',
|
|
63
99
|
adapter: {
|
|
64
100
|
package: '@agentclientprotocol/claude-agent-acp',
|
|
@@ -79,6 +115,7 @@ export const CLIS = {
|
|
|
79
115
|
emitRawSDKMessages: RAW_SUBTYPES.map((subtype) => ({ type: 'system', subtype })),
|
|
80
116
|
},
|
|
81
117
|
}),
|
|
118
|
+
unknownSession: (error) => answered(error).code === -32002,
|
|
82
119
|
renames: false,
|
|
83
120
|
allowHouse: nothing,
|
|
84
121
|
signedIn: { command: ['auth', 'status'] },
|
|
@@ -93,6 +130,7 @@ export const CLIS = {
|
|
|
93
130
|
args: ['--sandbox', 'off', 'agent', '--always-approve', '--no-leader', 'stdio'],
|
|
94
131
|
fullAccess: null,
|
|
95
132
|
sessionMeta: () => ({}),
|
|
133
|
+
unknownSession: (error) => answered(error).data?.code === 'FS_NOT_FOUND',
|
|
96
134
|
renames: false,
|
|
97
135
|
allowHouse: nothing,
|
|
98
136
|
signedIn: { initializeMeta: 'defaultAuthMethodId' },
|
|
@@ -101,8 +139,7 @@ export const CLIS = {
|
|
|
101
139
|
},
|
|
102
140
|
};
|
|
103
141
|
const KIT_PACKAGE = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
|
|
104
|
-
export const
|
|
105
|
-
const PROXY = /^https?_proxy$/i;
|
|
142
|
+
export const KIT_RELEASE = KIT_PACKAGE.version;
|
|
106
143
|
const VERSION = /\d+\.\d+\.\d+(?:-[0-9A-Za-z.]+)?/;
|
|
107
144
|
// An install still running after fifteen minutes is ended and reported as failed, so a hung download cannot hold its CLI's report.
|
|
108
145
|
const INSTALL_MS = 15 * 60_000;
|
|
@@ -124,15 +161,12 @@ async function installedAdapter(kind) {
|
|
|
124
161
|
return null;
|
|
125
162
|
}
|
|
126
163
|
}
|
|
127
|
-
export function withoutProxy() {
|
|
128
|
-
return Object.fromEntries(Object.entries(process.env).filter(([name]) => !PROXY.test(name)));
|
|
129
|
-
}
|
|
130
164
|
export function run(command, args, timeoutMs, detached = false, signal) {
|
|
131
165
|
return new Promise((resolve) => {
|
|
132
166
|
const child = spawn(command, args, {
|
|
133
167
|
stdio: ['ignore', 'pipe', 'pipe'],
|
|
134
168
|
timeout: timeoutMs,
|
|
135
|
-
env:
|
|
169
|
+
env: childEnvironment(),
|
|
136
170
|
detached,
|
|
137
171
|
signal: detached ? undefined : signal,
|
|
138
172
|
});
|
|
@@ -166,15 +200,37 @@ export function run(command, args, timeoutMs, detached = false, signal) {
|
|
|
166
200
|
export function failureOf(ran, program) {
|
|
167
201
|
return ran.output.trim().slice(-CAUSE_CHARACTERS) || `${program} exited with ${ran.status ?? 'a signal'}`;
|
|
168
202
|
}
|
|
203
|
+
export function adapterArchive(kind) {
|
|
204
|
+
return `${kind}-${KIT_PACKAGE.peerDependencies[CLIS[kind].adapter.package]}.tar.gz`;
|
|
205
|
+
}
|
|
169
206
|
export async function installAdapter(kind, signal) {
|
|
170
207
|
const adapter = CLIS[kind].adapter;
|
|
171
208
|
if (adapter === null)
|
|
172
209
|
return null;
|
|
173
|
-
|
|
174
|
-
if ((await installedAdapter(kind)) === release)
|
|
210
|
+
if ((await installedAdapter(kind)) === KIT_PACKAGE.peerDependencies[adapter.package])
|
|
175
211
|
return null;
|
|
176
|
-
const
|
|
177
|
-
|
|
212
|
+
const name = adapterArchive(kind);
|
|
213
|
+
const archive = `${prefix(kind)}.tar.gz`;
|
|
214
|
+
const deadline = AbortSignal.timeout(INSTALL_MS);
|
|
215
|
+
const bounded = signal === undefined ? deadline : AbortSignal.any([signal, deadline]);
|
|
216
|
+
try {
|
|
217
|
+
const sha256 = await servedDigest(name, bounded);
|
|
218
|
+
if (sha256 === null)
|
|
219
|
+
return `House serves no ${name}`;
|
|
220
|
+
await rm(prefix(kind), { recursive: true, force: true });
|
|
221
|
+
await mkdir(prefix(kind), { recursive: true });
|
|
222
|
+
await downloadServed(name, sha256, archive, bounded);
|
|
223
|
+
const ran = await run('tar', ['-xzf', archive, '-C', prefix(kind)], INSTALL_MS, true, signal);
|
|
224
|
+
return ran.status === 0 ? null : failureOf(ran, 'tar');
|
|
225
|
+
}
|
|
226
|
+
catch (error) {
|
|
227
|
+
if (deadline.aborted && signal?.aborted !== true)
|
|
228
|
+
return `${name} did not arrive within ${INSTALL_MS / 1000} seconds`;
|
|
229
|
+
return error instanceof Error ? error.message : String(error);
|
|
230
|
+
}
|
|
231
|
+
finally {
|
|
232
|
+
await rm(archive, { force: true });
|
|
233
|
+
}
|
|
178
234
|
}
|
|
179
235
|
export async function installCli(kind, signal) {
|
|
180
236
|
const ran = await run('bash', ['-o', 'pipefail', '-c', CLIS[kind].install], INSTALL_MS, true, signal);
|
|
@@ -189,15 +245,24 @@ const USER_BIN = 'case ":$PATH:" in *":$HOME/.local/bin:"*) ;; *) PATH="$PATH:$H
|
|
|
189
245
|
function inLoginShell(script, argument = '', signal) {
|
|
190
246
|
return run(loginShell(), ['-l', '-i', '-c', `exec /bin/sh -c '${USER_BIN}; ${script}' sh ${argument}`], READ_MS, true, signal);
|
|
191
247
|
}
|
|
192
|
-
export async function
|
|
193
|
-
const ran = await inLoginShell(LOOKUP,
|
|
248
|
+
export async function onLoginPath(program, signal) {
|
|
249
|
+
const ran = await inLoginShell(LOOKUP, program, signal);
|
|
194
250
|
return ran.stdout.split('\n').findLast((line) => line.startsWith(FOUND))?.slice(FOUND.length) ?? null;
|
|
195
251
|
}
|
|
252
|
+
export function locate(kind, signal) {
|
|
253
|
+
return onLoginPath(CLIS[kind].bin, signal);
|
|
254
|
+
}
|
|
196
255
|
export async function loginPath() {
|
|
197
256
|
const marker = 'house-kit-path ';
|
|
198
257
|
const ran = await inLoginShell(`printf "${marker}%s\\n" "$PATH"`);
|
|
199
258
|
return ran.stdout.split('\n').findLast((line) => line.startsWith(marker)).slice(marker.length);
|
|
200
259
|
}
|
|
260
|
+
export async function writeCodexRule() {
|
|
261
|
+
const shell = await loginPath().catch(() => '');
|
|
262
|
+
await allowHouseInCodex([dirname(process.execPath), process.env.PATH ?? '', shell].join(delimiter)).catch((error) => {
|
|
263
|
+
throw new Error(`Codex's rule for house could not be written: ${error.message}`);
|
|
264
|
+
});
|
|
265
|
+
}
|
|
201
266
|
export async function versionOf(path, signal) {
|
|
202
267
|
return VERSION.exec((await run(path, ['--version'], READ_MS, false, signal)).stdout)?.[0] ?? null;
|
|
203
268
|
}
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
import { subscribe } from 'node:diagnostics_channel';
|
|
2
|
+
import { HouseRefusal, retryDelay } from './api.js';
|
|
3
|
+
import { end, REPLACED, signInAgain } from './end.js';
|
|
4
|
+
import { readEnrolment } from './home.js';
|
|
5
|
+
import { relayed } from './relay.js';
|
|
6
|
+
import { endUnserved, KIT_WIRE } from './wire.js';
|
|
7
|
+
const PATH = '/kit/stream';
|
|
8
|
+
const SUBPROTOCOL = `house.kit.stream.${KIT_WIRE}`;
|
|
9
|
+
const REFUSAL_HEADER = 'x-house-refusal';
|
|
10
|
+
// House beats each Kit connection every thirty seconds, so two silent beats mean this Kit process cannot hear House.
|
|
11
|
+
export const CONNECTION_SILENCE_MS = 60_000;
|
|
12
|
+
const SYSTEM_CONNECTION_CLOCK = {
|
|
13
|
+
later: (delay, callback) => setTimeout(callback, delay),
|
|
14
|
+
clear: (timer) => clearTimeout(timer),
|
|
15
|
+
};
|
|
16
|
+
export class ConnectionSilence {
|
|
17
|
+
timer = null;
|
|
18
|
+
silent;
|
|
19
|
+
clock;
|
|
20
|
+
interval;
|
|
21
|
+
constructor(silent, clock = SYSTEM_CONNECTION_CLOCK, interval = CONNECTION_SILENCE_MS) {
|
|
22
|
+
this.silent = silent;
|
|
23
|
+
this.clock = clock;
|
|
24
|
+
this.interval = interval;
|
|
25
|
+
}
|
|
26
|
+
heard() {
|
|
27
|
+
this.stop();
|
|
28
|
+
this.timer = this.clock.later(this.interval, () => {
|
|
29
|
+
this.timer = null;
|
|
30
|
+
this.silent();
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
stop() {
|
|
34
|
+
if (this.timer === null)
|
|
35
|
+
return;
|
|
36
|
+
this.clock.clear(this.timer);
|
|
37
|
+
this.timer = null;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
function connectionUrl(house) {
|
|
41
|
+
const url = new URL(PATH, house);
|
|
42
|
+
url.protocol = url.protocol === 'https:' ? 'wss:' : 'ws:';
|
|
43
|
+
return url;
|
|
44
|
+
}
|
|
45
|
+
function header(headers, name) {
|
|
46
|
+
for (let index = 0; index < headers.length; index += 2) {
|
|
47
|
+
if (headers[index].toString('latin1').toLowerCase() === name)
|
|
48
|
+
return headers[index + 1].toString('latin1');
|
|
49
|
+
}
|
|
50
|
+
return '';
|
|
51
|
+
}
|
|
52
|
+
let refused = null;
|
|
53
|
+
subscribe('undici:request:headers', (message) => {
|
|
54
|
+
const { request, response } = message;
|
|
55
|
+
if (!request.path.endsWith(PATH))
|
|
56
|
+
return;
|
|
57
|
+
refused = new HouseRefusal(PATH, response.statusCode, header(response.headers, REFUSAL_HEADER) || response.statusText);
|
|
58
|
+
});
|
|
59
|
+
export function holdConnection(handlers) {
|
|
60
|
+
let connection = null;
|
|
61
|
+
let failures = 0;
|
|
62
|
+
const connect = async () => {
|
|
63
|
+
const { house, credential } = (await readEnrolment());
|
|
64
|
+
refused = null;
|
|
65
|
+
const opening = new WebSocket(relayed(connectionUrl(house)), {
|
|
66
|
+
protocols: [SUBPROTOCOL],
|
|
67
|
+
headers: { authorization: `Bearer ${credential}` },
|
|
68
|
+
});
|
|
69
|
+
let opened = false;
|
|
70
|
+
let silence = null;
|
|
71
|
+
const closed = (event) => {
|
|
72
|
+
silence?.stop();
|
|
73
|
+
silence = null;
|
|
74
|
+
if (connection === opening)
|
|
75
|
+
connection = null;
|
|
76
|
+
handlers.closed();
|
|
77
|
+
process.stderr.write(`kit: connection closed ${event.code} ${event.reason}\n`);
|
|
78
|
+
if (event.reason === 'replaced')
|
|
79
|
+
end(REPLACED);
|
|
80
|
+
if (event.reason === 'credential_rejected' || refused?.status === 401) {
|
|
81
|
+
void signInAgain(credential);
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
if (refused !== null)
|
|
85
|
+
endUnserved(refused.text);
|
|
86
|
+
if (!opened && refused !== null)
|
|
87
|
+
process.stderr.write(`kit: ${refused.message}\n`);
|
|
88
|
+
// A closed connection reopens in one to three seconds, spread so Kit processes one restart closed return apart; an opening House refused or left unanswered backs off on the jittered curve, retryable or not, since a resident outlives a House deploy.
|
|
89
|
+
setTimeout(() => void connect(), opened ? 1000 + Math.random() * 2000 : retryDelay(failures++));
|
|
90
|
+
};
|
|
91
|
+
opening.onopen = () => {
|
|
92
|
+
opened = true;
|
|
93
|
+
failures = 0;
|
|
94
|
+
connection = opening;
|
|
95
|
+
silence = new ConnectionSilence(() => {
|
|
96
|
+
if (connection !== opening)
|
|
97
|
+
return;
|
|
98
|
+
connection = null;
|
|
99
|
+
opening.onclose = null;
|
|
100
|
+
opening.close();
|
|
101
|
+
closed(new CloseEvent('close', { code: 1006, reason: 'heartbeat_missed' }));
|
|
102
|
+
});
|
|
103
|
+
silence.heard();
|
|
104
|
+
handlers.opened();
|
|
105
|
+
};
|
|
106
|
+
opening.onmessage = (event) => {
|
|
107
|
+
silence?.heard();
|
|
108
|
+
const arrived = JSON.parse(String(event.data));
|
|
109
|
+
if (arrived.type === 'input')
|
|
110
|
+
handlers.call(arrived);
|
|
111
|
+
else if (arrived.type !== 'beat')
|
|
112
|
+
handlers.notification(arrived);
|
|
113
|
+
};
|
|
114
|
+
opening.onerror = () => undefined;
|
|
115
|
+
opening.onclose = closed;
|
|
116
|
+
};
|
|
117
|
+
void connect();
|
|
118
|
+
return {
|
|
119
|
+
send(notification) {
|
|
120
|
+
if (connection === null || connection.readyState !== WebSocket.OPEN)
|
|
121
|
+
return false;
|
|
122
|
+
connection.send(JSON.stringify(notification));
|
|
123
|
+
return true;
|
|
124
|
+
},
|
|
125
|
+
};
|
|
126
|
+
}
|