@agentshouse/kit 0.2.1-c87bb54c0a0ce → 0.2.1-c8850697c8230
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 +36 -35
- package/dist/acp.js +90 -19
- package/dist/agents.js +153 -42
- package/dist/api.js +5 -5
- package/dist/app-git.js +10 -26
- package/dist/authority-main.js +2 -2
- package/dist/bridge.js +4 -7
- package/dist/building.js +46 -0
- package/dist/calls.js +71 -0
- package/dist/chatgpt.js +9 -2
- package/dist/clis.js +69 -23
- package/dist/connection.js +116 -0
- package/dist/conversations.js +526 -176
- package/dist/copies.js +89 -52
- package/dist/end.js +15 -4
- package/dist/events.js +33 -8
- package/dist/files.js +139 -31
- package/dist/git.js +13 -11
- package/dist/home.js +56 -12
- package/dist/house-cli.js +299 -0
- package/dist/house-main.js +7 -228
- package/dist/instructions.js +7 -11
- package/dist/kit-cli.js +68 -0
- package/dist/kit-main.js +8 -67
- package/dist/login.js +43 -19
- package/dist/logout.js +0 -2
- package/dist/mcp.js +6 -2
- package/dist/placement.js +9 -18
- package/dist/relay.js +21 -0
- package/dist/resident.js +95 -42
- package/dist/scope.js +15 -4
- package/dist/scripts.js +255 -0
- package/dist/service.js +23 -1
- package/dist/sign-in.js +22 -39
- package/dist/silence.js +28 -0
- package/dist/skills.js +49 -35
- package/dist/transcription.js +85 -45
- package/dist/translate.js +2 -8
- package/dist/update.js +90 -50
- package/dist/wire.js +19 -3
- package/dist/work.js +3 -5
- package/package.json +20 -20
- package/dist/bootstrap.json +0 -24
- package/dist/clis-main.js +0 -23
- package/dist/stream.js +0 -77
- 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/app-git.js
CHANGED
|
@@ -1,15 +1,9 @@
|
|
|
1
|
-
import { extname, resolve } from 'node:path';
|
|
2
|
-
import { fileURLToPath } from 'node:url';
|
|
3
1
|
import { run } from './git.js';
|
|
4
2
|
import { kitHome, readOwnAgent } from './home.js';
|
|
5
|
-
|
|
3
|
+
const HELPER = '!kit git-credential';
|
|
6
4
|
function section(house) {
|
|
7
5
|
return `credential.${new URL('/app/', house).href}`;
|
|
8
6
|
}
|
|
9
|
-
function helper() {
|
|
10
|
-
const main = fileURLToPath(new URL(`./kit-main${extname(fileURLToPath(import.meta.url))}`, import.meta.url));
|
|
11
|
-
return `!HOUSE_KIT_HOME=${quoted(resolve(kitHome()))} ${quoted(process.execPath)} ${quoted(main)} git-credential`;
|
|
12
|
-
}
|
|
13
7
|
async function configured(args) {
|
|
14
8
|
try {
|
|
15
9
|
return await run(kitHome(), ['config', '--global', ...args]);
|
|
@@ -20,30 +14,18 @@ async function configured(args) {
|
|
|
20
14
|
throw error;
|
|
21
15
|
}
|
|
22
16
|
}
|
|
23
|
-
async function
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
const ran = await configured(['--add', `${section(house)}.helper`, value]);
|
|
17
|
+
export async function placeAppGit(ownAgent) {
|
|
18
|
+
if (ownAgent === null)
|
|
19
|
+
return;
|
|
20
|
+
await configured(['--remove-section', section(ownAgent.house)]);
|
|
21
|
+
for (const value of ['', HELPER]) {
|
|
22
|
+
const ran = await configured(['--add', `${section(ownAgent.house)}.helper`, value]);
|
|
30
23
|
if (ran === null)
|
|
31
24
|
return;
|
|
32
25
|
if (ran.status !== 0)
|
|
33
26
|
throw new Error(`git config failed: ${ran.stderr.trim()}`);
|
|
34
27
|
}
|
|
35
28
|
}
|
|
36
|
-
export async function placeAppGit(before, after) {
|
|
37
|
-
if (before !== null && before.house !== after?.house)
|
|
38
|
-
await forget(before.house);
|
|
39
|
-
if (after !== null)
|
|
40
|
-
await register(after.house);
|
|
41
|
-
}
|
|
42
|
-
export async function forgetAppGit() {
|
|
43
|
-
const ownAgent = await readOwnAgent();
|
|
44
|
-
if (ownAgent !== null)
|
|
45
|
-
await forget(ownAgent.house);
|
|
46
|
-
}
|
|
47
29
|
export async function answerGitCredential(operation) {
|
|
48
30
|
let asked = '';
|
|
49
31
|
for await (const chunk of process.stdin)
|
|
@@ -55,8 +37,10 @@ export async function answerGitCredential(operation) {
|
|
|
55
37
|
.filter((line) => line.includes('='))
|
|
56
38
|
.map((line) => [line.slice(0, line.indexOf('=')), line.slice(line.indexOf('=') + 1)]));
|
|
57
39
|
const ownAgent = await readOwnAgent();
|
|
58
|
-
if (ownAgent === null)
|
|
40
|
+
if (ownAgent === null) {
|
|
41
|
+
process.stderr.write(`kit: Kit home ${kitHome()} is not signed in; run kit login\n`);
|
|
59
42
|
return;
|
|
43
|
+
}
|
|
60
44
|
const house = new URL(ownAgent.house);
|
|
61
45
|
if (attributes.get('protocol') !== house.protocol.slice(0, -1) || attributes.get('host') !== house.host)
|
|
62
46
|
return;
|
package/dist/authority-main.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { setGlobalProxyFromEnv } from 'node:http';
|
|
2
1
|
import { HouseRefusal, post } from './api.js';
|
|
3
2
|
import { readEnrolment } from './home.js';
|
|
3
|
+
import { proxyUnlessRelayed } from './relay.js';
|
|
4
4
|
function unanswered(error) {
|
|
5
5
|
return error instanceof HouseRefusal ? error.status >= 500 : error instanceof TypeError && error.message === 'fetch failed';
|
|
6
6
|
}
|
|
7
|
-
|
|
7
|
+
proxyUnlessRelayed();
|
|
8
8
|
try {
|
|
9
9
|
const { house, credential } = (await readEnrolment());
|
|
10
10
|
try {
|
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) => {
|
|
@@ -167,9 +166,7 @@ export async function openBridge(house, copies, conversationId, signal) {
|
|
|
167
166
|
}
|
|
168
167
|
return path === '/' ? forward(text) : { status: 404, text: '' };
|
|
169
168
|
};
|
|
170
|
-
const
|
|
171
|
-
await mkdir(sockets, { recursive: true, mode: 0o700 });
|
|
172
|
-
const socketPath = join(sockets, `${randomUUID()}.sock`);
|
|
169
|
+
const socketPath = join(socketDirectory(), `${randomUUID()}.sock`);
|
|
173
170
|
const bridge = createServer(async (request, response) => {
|
|
174
171
|
try {
|
|
175
172
|
const path = request.url ?? '';
|
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,71 @@
|
|
|
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
|
+
released = new Set();
|
|
15
|
+
open = 0;
|
|
16
|
+
constructor(house, changed) {
|
|
17
|
+
this.house = house;
|
|
18
|
+
this.changed = changed;
|
|
19
|
+
this.results = new Map(existsSync(this.path) ? Object.entries(JSON.parse(readFileSync(this.path, 'utf8'))) : []);
|
|
20
|
+
}
|
|
21
|
+
keepResult(callId, result) {
|
|
22
|
+
if (this.returned.has(callId))
|
|
23
|
+
return;
|
|
24
|
+
this.results.set(callId, result);
|
|
25
|
+
this.save();
|
|
26
|
+
}
|
|
27
|
+
idle() {
|
|
28
|
+
return this.open === 0;
|
|
29
|
+
}
|
|
30
|
+
carry(callId, work) {
|
|
31
|
+
if (this.released.has(callId))
|
|
32
|
+
return Promise.resolve();
|
|
33
|
+
const known = this.carried.get(callId);
|
|
34
|
+
const result = this.results.get(callId);
|
|
35
|
+
const carried = known ?? (result === undefined ? work() : Promise.resolve({ result }));
|
|
36
|
+
if (known === undefined) {
|
|
37
|
+
this.carried.set(callId, carried);
|
|
38
|
+
carried.catch(() => this.carried.delete(callId));
|
|
39
|
+
}
|
|
40
|
+
this.open++;
|
|
41
|
+
this.changed();
|
|
42
|
+
return carried
|
|
43
|
+
.then(async ({ result, returned, release }) => {
|
|
44
|
+
try {
|
|
45
|
+
await this.house.deliver(`/kit/inputs/${callId}/ack`, result);
|
|
46
|
+
}
|
|
47
|
+
finally {
|
|
48
|
+
this.returned.add(callId);
|
|
49
|
+
if (this.results.delete(callId))
|
|
50
|
+
this.save();
|
|
51
|
+
}
|
|
52
|
+
if (known !== undefined)
|
|
53
|
+
return;
|
|
54
|
+
if (release) {
|
|
55
|
+
this.carried.delete(callId);
|
|
56
|
+
this.released.add(callId);
|
|
57
|
+
}
|
|
58
|
+
await returned?.();
|
|
59
|
+
})
|
|
60
|
+
.catch(logged)
|
|
61
|
+
.finally(() => {
|
|
62
|
+
this.open--;
|
|
63
|
+
this.changed();
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
save() {
|
|
67
|
+
const temporary = `${this.path}.${process.pid}`;
|
|
68
|
+
writeFileSync(temporary, JSON.stringify(Object.fromEntries(this.results)), { mode: 0o600 });
|
|
69
|
+
renameSync(temporary, this.path);
|
|
70
|
+
}
|
|
71
|
+
}
|
package/dist/chatgpt.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { parseArgs } from 'node:util';
|
|
2
|
+
import { placeAppGit } from './app-git.js';
|
|
2
3
|
import { kitHome, readOwnAgent, writeOwnAgent } from './home.js';
|
|
3
4
|
import { accepted, DEFAULT_HOUSE } from './login.js';
|
|
4
5
|
const KEY_SOURCE = 'New key for a script on Connections';
|
|
@@ -17,9 +18,15 @@ export async function chatgpt(argv) {
|
|
|
17
18
|
}
|
|
18
19
|
if (values.key === undefined)
|
|
19
20
|
throw new Error(`pass --key with a key from ${KEY_SOURCE}`);
|
|
20
|
-
const
|
|
21
|
+
const before = await readOwnAgent();
|
|
22
|
+
const house = values.house ?? before?.house ?? DEFAULT_HOUSE;
|
|
21
23
|
if (!(await accepted(house, values.key)))
|
|
22
24
|
throw new Error(`${house} does not accept this key; pass one from ${KEY_SOURCE}`);
|
|
23
|
-
|
|
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
|
+
}
|
|
24
31
|
process.stdout.write(`house now calls ${house} as you, with the key kept in ${kitHome()}.\n`);
|
|
25
32
|
}
|
package/dist/clis.js
CHANGED
|
@@ -1,9 +1,12 @@
|
|
|
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, rename, 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
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';
|
|
7
10
|
const HOUSE_EXECUTABLES = /^host_executable\(name = "house", paths = (\[.*\])\)$/m;
|
|
8
11
|
function houseRule(houses) {
|
|
9
12
|
return `prefix_rule(pattern = ["house"], decision = "allow")\nhost_executable(name = "house", paths = ${JSON.stringify(houses)})\n`;
|
|
@@ -13,6 +16,7 @@ const RAW_SUBTYPES = [
|
|
|
13
16
|
'task_started',
|
|
14
17
|
'task_updated',
|
|
15
18
|
'task_notification',
|
|
19
|
+
'task_progress',
|
|
16
20
|
'session_state_changed',
|
|
17
21
|
'hook_started',
|
|
18
22
|
'hook_response',
|
|
@@ -54,19 +58,23 @@ export async function allowHouseInCodex(path) {
|
|
|
54
58
|
houses.push(house);
|
|
55
59
|
}
|
|
56
60
|
await mkdir(rules, { recursive: true });
|
|
57
|
-
const temporary = `${file}.${
|
|
61
|
+
const temporary = `${file}.${randomUUID()}`;
|
|
58
62
|
await writeFile(temporary, houseRule(houses));
|
|
59
63
|
await rename(temporary, file);
|
|
60
64
|
}
|
|
61
65
|
async function nothing() { }
|
|
66
|
+
function answered(error) {
|
|
67
|
+
return typeof error === 'object' && error !== null ? error : {};
|
|
68
|
+
}
|
|
62
69
|
function bridgeInClaudeSandbox(bridge) {
|
|
63
70
|
return process.platform === 'darwin' ? { allowUnixSockets: [bridge] } : { allowAllUnixSockets: true };
|
|
64
71
|
}
|
|
65
72
|
export const CLIS = {
|
|
66
73
|
'codex-acp': {
|
|
67
74
|
bin: 'codex',
|
|
68
|
-
minimum: '0.
|
|
75
|
+
minimum: '0.160.1',
|
|
69
76
|
install: 'curl -fsSL https://chatgpt.com/codex/install.sh | sh',
|
|
77
|
+
update: 'codex update',
|
|
70
78
|
adapter: {
|
|
71
79
|
package: '@agentclientprotocol/codex-acp',
|
|
72
80
|
bin: 'codex-acp',
|
|
@@ -76,6 +84,10 @@ export const CLIS = {
|
|
|
76
84
|
args: [],
|
|
77
85
|
fullAccess: 'agent-full-access',
|
|
78
86
|
sessionMeta: () => ({}),
|
|
87
|
+
unknownSession: (error) => {
|
|
88
|
+
const { code, data } = answered(error);
|
|
89
|
+
return code === -32603 && typeof data?.details === 'string' && data.details.startsWith('no rollout found');
|
|
90
|
+
},
|
|
79
91
|
renames: true,
|
|
80
92
|
allowHouse: allowHouseInCodex,
|
|
81
93
|
signedIn: { command: ['login', 'status'] },
|
|
@@ -84,8 +96,9 @@ export const CLIS = {
|
|
|
84
96
|
},
|
|
85
97
|
'claude-agent-acp': {
|
|
86
98
|
bin: 'claude',
|
|
87
|
-
minimum: '2.1.
|
|
99
|
+
minimum: '2.1.303',
|
|
88
100
|
install: 'curl -fsSL https://claude.ai/install.sh | bash',
|
|
101
|
+
update: 'claude update',
|
|
89
102
|
adapter: {
|
|
90
103
|
package: '@agentclientprotocol/claude-agent-acp',
|
|
91
104
|
bin: 'claude-agent-acp',
|
|
@@ -102,9 +115,10 @@ export const CLIS = {
|
|
|
102
115
|
title,
|
|
103
116
|
settings: { sandbox: { network: bridgeInClaudeSandbox(bridge) } },
|
|
104
117
|
},
|
|
105
|
-
emitRawSDKMessages: RAW_SUBTYPES.map((subtype) => ({ type: 'system', subtype })),
|
|
118
|
+
emitRawSDKMessages: [...RAW_SUBTYPES.map((subtype) => ({ type: 'system', subtype })), { type: 'result' }],
|
|
106
119
|
},
|
|
107
120
|
}),
|
|
121
|
+
unknownSession: (error) => answered(error).code === -32002,
|
|
108
122
|
renames: false,
|
|
109
123
|
allowHouse: nothing,
|
|
110
124
|
signedIn: { command: ['auth', 'status'] },
|
|
@@ -115,10 +129,12 @@ export const CLIS = {
|
|
|
115
129
|
bin: 'grok',
|
|
116
130
|
minimum: '1.0.46',
|
|
117
131
|
install: 'curl -fsSL https://x.ai/cli/install.sh | bash',
|
|
132
|
+
update: 'grok update',
|
|
118
133
|
adapter: null,
|
|
119
134
|
args: ['--sandbox', 'off', 'agent', '--always-approve', '--no-leader', 'stdio'],
|
|
120
135
|
fullAccess: null,
|
|
121
136
|
sessionMeta: () => ({}),
|
|
137
|
+
unknownSession: (error) => answered(error).data?.code === 'FS_NOT_FOUND',
|
|
122
138
|
renames: false,
|
|
123
139
|
allowHouse: nothing,
|
|
124
140
|
signedIn: { initializeMeta: 'defaultAuthMethodId' },
|
|
@@ -127,10 +143,9 @@ export const CLIS = {
|
|
|
127
143
|
},
|
|
128
144
|
};
|
|
129
145
|
const KIT_PACKAGE = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
|
|
130
|
-
export const
|
|
131
|
-
const PROXY = /^https?_proxy$/i;
|
|
146
|
+
export const KIT_RELEASE = KIT_PACKAGE.version;
|
|
132
147
|
const VERSION = /\d+\.\d+\.\d+(?:-[0-9A-Za-z.]+)?/;
|
|
133
|
-
// An install still running after fifteen minutes is ended
|
|
148
|
+
// An install or update still running after fifteen minutes is ended as failed, so a hung download can neither hold its CLI's report nor keep the Kit busy.
|
|
134
149
|
const INSTALL_MS = 15 * 60_000;
|
|
135
150
|
// A login shell or a version read is ended after half a minute, so a profile that waits for input cannot stall the report.
|
|
136
151
|
const READ_MS = 30_000;
|
|
@@ -150,15 +165,12 @@ async function installedAdapter(kind) {
|
|
|
150
165
|
return null;
|
|
151
166
|
}
|
|
152
167
|
}
|
|
153
|
-
export function withoutProxy() {
|
|
154
|
-
return Object.fromEntries(Object.entries(process.env).filter(([name]) => !PROXY.test(name)));
|
|
155
|
-
}
|
|
156
168
|
export function run(command, args, timeoutMs, detached = false, signal) {
|
|
157
169
|
return new Promise((resolve) => {
|
|
158
170
|
const child = spawn(command, args, {
|
|
159
171
|
stdio: ['ignore', 'pipe', 'pipe'],
|
|
160
172
|
timeout: timeoutMs,
|
|
161
|
-
env:
|
|
173
|
+
env: childEnvironment(),
|
|
162
174
|
detached,
|
|
163
175
|
signal: detached ? undefined : signal,
|
|
164
176
|
});
|
|
@@ -192,19 +204,47 @@ export function run(command, args, timeoutMs, detached = false, signal) {
|
|
|
192
204
|
export function failureOf(ran, program) {
|
|
193
205
|
return ran.output.trim().slice(-CAUSE_CHARACTERS) || `${program} exited with ${ran.status ?? 'a signal'}`;
|
|
194
206
|
}
|
|
207
|
+
export function adapterArchive(kind) {
|
|
208
|
+
return `${kind}-${KIT_PACKAGE.peerDependencies[CLIS[kind].adapter.package]}.tar.gz`;
|
|
209
|
+
}
|
|
195
210
|
export async function installAdapter(kind, signal) {
|
|
196
211
|
const adapter = CLIS[kind].adapter;
|
|
197
212
|
if (adapter === null)
|
|
198
213
|
return null;
|
|
199
|
-
|
|
200
|
-
if ((await installedAdapter(kind)) === release)
|
|
214
|
+
if ((await installedAdapter(kind)) === KIT_PACKAGE.peerDependencies[adapter.package])
|
|
201
215
|
return null;
|
|
202
|
-
const
|
|
203
|
-
|
|
216
|
+
const name = adapterArchive(kind);
|
|
217
|
+
const archive = `${prefix(kind)}.tar.gz`;
|
|
218
|
+
const deadline = AbortSignal.timeout(INSTALL_MS);
|
|
219
|
+
const bounded = signal === undefined ? deadline : AbortSignal.any([signal, deadline]);
|
|
220
|
+
try {
|
|
221
|
+
const sha256 = await servedDigest(name, bounded);
|
|
222
|
+
if (sha256 === null)
|
|
223
|
+
return `House serves no ${name}`;
|
|
224
|
+
await rm(prefix(kind), { recursive: true, force: true });
|
|
225
|
+
await mkdir(prefix(kind), { recursive: true });
|
|
226
|
+
await downloadServed(name, sha256, archive, bounded);
|
|
227
|
+
const ran = await run('tar', ['-xzf', archive, '-C', prefix(kind)], INSTALL_MS, true, signal);
|
|
228
|
+
return ran.status === 0 ? null : failureOf(ran, 'tar');
|
|
229
|
+
}
|
|
230
|
+
catch (error) {
|
|
231
|
+
if (deadline.aborted && signal?.aborted !== true)
|
|
232
|
+
return `${name} did not arrive within ${INSTALL_MS / 1000} seconds`;
|
|
233
|
+
return error instanceof Error ? error.message : String(error);
|
|
234
|
+
}
|
|
235
|
+
finally {
|
|
236
|
+
await rm(archive, { force: true });
|
|
237
|
+
}
|
|
204
238
|
}
|
|
205
|
-
|
|
206
|
-
const
|
|
207
|
-
|
|
239
|
+
async function bounded(program, work, signal) {
|
|
240
|
+
const deadline = AbortSignal.timeout(INSTALL_MS);
|
|
241
|
+
const ran = await work(signal === undefined ? deadline : AbortSignal.any([signal, deadline]));
|
|
242
|
+
if (deadline.aborted && signal?.aborted !== true)
|
|
243
|
+
return `${program} did not end within ${INSTALL_MS / 1000} seconds`;
|
|
244
|
+
return ran.status === 0 ? null : failureOf(ran, program);
|
|
245
|
+
}
|
|
246
|
+
export function installCli(kind, signal) {
|
|
247
|
+
return bounded('the install', (within) => run('bash', ['-o', 'pipefail', '-c', CLIS[kind].install], INSTALL_MS, true, within), signal);
|
|
208
248
|
}
|
|
209
249
|
function loginShell() {
|
|
210
250
|
return process.env.SHELL || userInfo().shell;
|
|
@@ -212,13 +252,19 @@ function loginShell() {
|
|
|
212
252
|
const FOUND = 'house-kit-cli ';
|
|
213
253
|
const LOOKUP = `found=$(command -v "$1") || exit 0; case $found in /*) ;; *) found=$(pwd -P)/$found ;; esac; printf "${FOUND}%s\\n" "$found"`;
|
|
214
254
|
const USER_BIN = 'case ":$PATH:" in *":$HOME/.local/bin:"*) ;; *) PATH="$PATH:$HOME/.local/bin" ;; esac; export PATH';
|
|
215
|
-
function inLoginShell(script, argument = '', signal) {
|
|
216
|
-
return run(loginShell(), ['-l', '-i', '-c', `exec /bin/sh -c '${USER_BIN}; ${script}' sh ${argument}`],
|
|
255
|
+
function inLoginShell(script, argument = '', signal, timeoutMs = READ_MS) {
|
|
256
|
+
return run(loginShell(), ['-l', '-i', '-c', `exec /bin/sh -c '${USER_BIN}; ${script}' sh ${argument}`], timeoutMs, true, signal);
|
|
217
257
|
}
|
|
218
|
-
export async function
|
|
219
|
-
const ran = await inLoginShell(LOOKUP,
|
|
258
|
+
export async function onLoginPath(program, signal) {
|
|
259
|
+
const ran = await inLoginShell(LOOKUP, program, signal);
|
|
220
260
|
return ran.stdout.split('\n').findLast((line) => line.startsWith(FOUND))?.slice(FOUND.length) ?? null;
|
|
221
261
|
}
|
|
262
|
+
export function locate(kind, signal) {
|
|
263
|
+
return onLoginPath(CLIS[kind].bin, signal);
|
|
264
|
+
}
|
|
265
|
+
export function updateCli(kind) {
|
|
266
|
+
return bounded('the update', (within) => inLoginShell(CLIS[kind].update, '', within, INSTALL_MS));
|
|
267
|
+
}
|
|
222
268
|
export async function loginPath() {
|
|
223
269
|
const marker = 'house-kit-path ';
|
|
224
270
|
const ran = await inLoginShell(`printf "${marker}%s\\n" "$PATH"`);
|
|
@@ -0,0 +1,116 @@
|
|
|
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 { Silence } from './silence.js';
|
|
7
|
+
import { endUnserved, KIT_WIRE } from './wire.js';
|
|
8
|
+
const PATH = '/kit/stream';
|
|
9
|
+
const SUBPROTOCOL = `house.kit.stream.${KIT_WIRE}`;
|
|
10
|
+
const REFUSAL_HEADER = 'x-house-refusal';
|
|
11
|
+
// House beats each Kit connection every thirty seconds, so two silent beats mean this Kit process cannot hear House.
|
|
12
|
+
export const CONNECTION_SILENCE_MS = 60_000;
|
|
13
|
+
function connectionUrl(house) {
|
|
14
|
+
const url = new URL(PATH, house);
|
|
15
|
+
url.protocol = url.protocol === 'https:' ? 'wss:' : 'ws:';
|
|
16
|
+
return url;
|
|
17
|
+
}
|
|
18
|
+
function header(headers, name) {
|
|
19
|
+
for (let index = 0; index < headers.length; index += 2) {
|
|
20
|
+
if (headers[index].toString('latin1').toLowerCase() === name)
|
|
21
|
+
return headers[index + 1].toString('latin1');
|
|
22
|
+
}
|
|
23
|
+
return '';
|
|
24
|
+
}
|
|
25
|
+
let refused = null;
|
|
26
|
+
subscribe('undici:request:headers', (message) => {
|
|
27
|
+
const { request, response } = message;
|
|
28
|
+
if (!request.path.endsWith(PATH))
|
|
29
|
+
return;
|
|
30
|
+
refused = new HouseRefusal(PATH, response.statusCode, header(response.headers, REFUSAL_HEADER) || response.statusText);
|
|
31
|
+
});
|
|
32
|
+
export function holdConnection(handlers) {
|
|
33
|
+
let connection = null;
|
|
34
|
+
let socket = null;
|
|
35
|
+
let paused = false;
|
|
36
|
+
let failures = 0;
|
|
37
|
+
const connect = async () => {
|
|
38
|
+
const { house, credential } = (await readEnrolment());
|
|
39
|
+
if (paused || socket !== null)
|
|
40
|
+
return;
|
|
41
|
+
refused = null;
|
|
42
|
+
const opening = new WebSocket(relayed(connectionUrl(house)), {
|
|
43
|
+
protocols: [SUBPROTOCOL],
|
|
44
|
+
headers: { authorization: `Bearer ${credential}` },
|
|
45
|
+
});
|
|
46
|
+
socket = opening;
|
|
47
|
+
let opened = false;
|
|
48
|
+
let silence = null;
|
|
49
|
+
const closed = (event) => {
|
|
50
|
+
silence?.stop();
|
|
51
|
+
silence = null;
|
|
52
|
+
if (socket === opening)
|
|
53
|
+
socket = null;
|
|
54
|
+
if (connection === opening)
|
|
55
|
+
connection = null;
|
|
56
|
+
handlers.closed();
|
|
57
|
+
process.stderr.write(`kit: connection closed ${event.code} ${event.reason}\n`);
|
|
58
|
+
if (event.reason === 'replaced')
|
|
59
|
+
end(REPLACED);
|
|
60
|
+
if (event.reason === 'credential_rejected' || refused?.status === 401) {
|
|
61
|
+
void signInAgain(credential);
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
if (refused !== null)
|
|
65
|
+
endUnserved(refused.text);
|
|
66
|
+
if (!opened && refused !== null)
|
|
67
|
+
process.stderr.write(`kit: ${refused.message}\n`);
|
|
68
|
+
if (paused)
|
|
69
|
+
return;
|
|
70
|
+
// 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.
|
|
71
|
+
setTimeout(() => void connect(), opened ? 1000 + Math.random() * 2000 : retryDelay(failures++));
|
|
72
|
+
};
|
|
73
|
+
opening.onopen = () => {
|
|
74
|
+
opened = true;
|
|
75
|
+
failures = 0;
|
|
76
|
+
connection = opening;
|
|
77
|
+
silence = new Silence(CONNECTION_SILENCE_MS, () => {
|
|
78
|
+
if (connection !== opening)
|
|
79
|
+
return;
|
|
80
|
+
connection = null;
|
|
81
|
+
opening.onclose = null;
|
|
82
|
+
opening.close();
|
|
83
|
+
closed(new CloseEvent('close', { code: 1006, reason: 'heartbeat_missed' }));
|
|
84
|
+
});
|
|
85
|
+
silence.heard();
|
|
86
|
+
handlers.opened();
|
|
87
|
+
};
|
|
88
|
+
opening.onmessage = (event) => {
|
|
89
|
+
silence?.heard();
|
|
90
|
+
const arrived = JSON.parse(String(event.data));
|
|
91
|
+
if (arrived.type === 'input')
|
|
92
|
+
handlers.call(arrived);
|
|
93
|
+
else if (arrived.type !== 'beat')
|
|
94
|
+
handlers.notification(arrived);
|
|
95
|
+
};
|
|
96
|
+
opening.onerror = () => undefined;
|
|
97
|
+
opening.onclose = closed;
|
|
98
|
+
};
|
|
99
|
+
void connect();
|
|
100
|
+
return {
|
|
101
|
+
send(notification) {
|
|
102
|
+
if (connection === null || connection.readyState !== WebSocket.OPEN)
|
|
103
|
+
return false;
|
|
104
|
+
connection.send(JSON.stringify(notification));
|
|
105
|
+
return true;
|
|
106
|
+
},
|
|
107
|
+
pause() {
|
|
108
|
+
paused = true;
|
|
109
|
+
socket?.close();
|
|
110
|
+
return () => {
|
|
111
|
+
paused = false;
|
|
112
|
+
void connect();
|
|
113
|
+
};
|
|
114
|
+
},
|
|
115
|
+
};
|
|
116
|
+
}
|