@agentshouse/kit 0.2.1-cf110d15f69c8 → 0.2.1-cf268dff1869b
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 +38 -37
- package/dist/acp.js +90 -19
- package/dist/agents.js +155 -45
- package/dist/api.js +5 -1
- package/dist/app-git.js +10 -26
- package/dist/authority-main.js +2 -2
- package/dist/bridge.js +4 -7
- package/dist/building.js +50 -0
- package/dist/calls.js +71 -0
- package/dist/chatgpt.js +32 -0
- package/dist/clis.js +52 -42
- package/dist/connection.js +105 -0
- package/dist/conversations.js +526 -175
- package/dist/copies.js +89 -52
- package/dist/end.js +17 -2
- 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 -206
- package/dist/instructions.js +7 -11
- package/dist/kit-cli.js +68 -0
- package/dist/kit-main.js +8 -22
- package/dist/login.js +49 -31
- package/dist/logout.js +0 -2
- package/dist/mcp.js +6 -2
- package/dist/placement.js +31 -0
- package/dist/relay.js +22 -1
- package/dist/resident.js +97 -38
- 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 +113 -105
- package/dist/wire.js +40 -0
- 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 -74
- 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,50 @@
|
|
|
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 servedRelease(signal) {
|
|
20
|
+
const manifest = (await (await served(MANIFEST, signal)).json());
|
|
21
|
+
const installer = manifest.hosts?.linux;
|
|
22
|
+
const sha256 = typeof installer === 'string' ? manifest.files?.[installer]?.sha256 : undefined;
|
|
23
|
+
if (typeof manifest.version !== 'string' || typeof installer !== 'string' || typeof sha256 !== 'string') {
|
|
24
|
+
throw new Error(`House serves no Kit release in ${MANIFEST}`);
|
|
25
|
+
}
|
|
26
|
+
return { version: manifest.version, installer, sha256 };
|
|
27
|
+
}
|
|
28
|
+
export async function downloadServed(name, sha256, destination, signal, most = Infinity) {
|
|
29
|
+
const answer = await served(name, signal);
|
|
30
|
+
const digest = createHash('sha256');
|
|
31
|
+
let bytes = 0;
|
|
32
|
+
const hashed = new Transform({
|
|
33
|
+
transform(chunk, _encoding, done) {
|
|
34
|
+
bytes += chunk.length;
|
|
35
|
+
if (bytes > most)
|
|
36
|
+
return done(new Error(`${name} is larger than its pinned ${most} bytes`));
|
|
37
|
+
digest.update(chunk);
|
|
38
|
+
done(null, chunk);
|
|
39
|
+
},
|
|
40
|
+
});
|
|
41
|
+
try {
|
|
42
|
+
await pipeline(answer.body, hashed, createWriteStream(destination), { signal });
|
|
43
|
+
if (digest.digest('hex') !== sha256)
|
|
44
|
+
throw new Error(`${name} does not match its sha256`);
|
|
45
|
+
}
|
|
46
|
+
catch (error) {
|
|
47
|
+
await rm(destination, { force: true });
|
|
48
|
+
throw error;
|
|
49
|
+
}
|
|
50
|
+
}
|
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
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.js
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
|
+
import { randomUUID } from 'node:crypto';
|
|
2
3
|
import { constants, readFileSync } from 'node:fs';
|
|
3
4
|
import { access, mkdir, readFile, rename, writeFile } from 'node:fs/promises';
|
|
4
5
|
import { homedir, userInfo } from 'node:os';
|
|
5
|
-
import { delimiter, isAbsolute, join } from 'node:path';
|
|
6
|
-
import {
|
|
6
|
+
import { delimiter, dirname, isAbsolute, join } from 'node:path';
|
|
7
|
+
import { releaseDirectory } from './placement.js';
|
|
8
|
+
import { childEnvironment } from './relay.js';
|
|
7
9
|
const HOUSE_EXECUTABLES = /^host_executable\(name = "house", paths = (\[.*\])\)$/m;
|
|
8
10
|
function houseRule(houses) {
|
|
9
11
|
return `prefix_rule(pattern = ["house"], decision = "allow")\nhost_executable(name = "house", paths = ${JSON.stringify(houses)})\n`;
|
|
@@ -13,6 +15,7 @@ const RAW_SUBTYPES = [
|
|
|
13
15
|
'task_started',
|
|
14
16
|
'task_updated',
|
|
15
17
|
'task_notification',
|
|
18
|
+
'task_progress',
|
|
16
19
|
'session_state_changed',
|
|
17
20
|
'hook_started',
|
|
18
21
|
'hook_response',
|
|
@@ -54,19 +57,23 @@ export async function allowHouseInCodex(path) {
|
|
|
54
57
|
houses.push(house);
|
|
55
58
|
}
|
|
56
59
|
await mkdir(rules, { recursive: true });
|
|
57
|
-
const temporary = `${file}.${
|
|
60
|
+
const temporary = `${file}.${randomUUID()}`;
|
|
58
61
|
await writeFile(temporary, houseRule(houses));
|
|
59
62
|
await rename(temporary, file);
|
|
60
63
|
}
|
|
61
64
|
async function nothing() { }
|
|
65
|
+
function answered(error) {
|
|
66
|
+
return typeof error === 'object' && error !== null ? error : {};
|
|
67
|
+
}
|
|
62
68
|
function bridgeInClaudeSandbox(bridge) {
|
|
63
69
|
return process.platform === 'darwin' ? { allowUnixSockets: [bridge] } : { allowAllUnixSockets: true };
|
|
64
70
|
}
|
|
65
71
|
export const CLIS = {
|
|
66
72
|
'codex-acp': {
|
|
67
73
|
bin: 'codex',
|
|
68
|
-
minimum: '0.
|
|
74
|
+
minimum: '0.160.1',
|
|
69
75
|
install: 'curl -fsSL https://chatgpt.com/codex/install.sh | sh',
|
|
76
|
+
update: 'codex update',
|
|
70
77
|
adapter: {
|
|
71
78
|
package: '@agentclientprotocol/codex-acp',
|
|
72
79
|
bin: 'codex-acp',
|
|
@@ -76,6 +83,10 @@ export const CLIS = {
|
|
|
76
83
|
args: [],
|
|
77
84
|
fullAccess: 'agent-full-access',
|
|
78
85
|
sessionMeta: () => ({}),
|
|
86
|
+
unknownSession: (error) => {
|
|
87
|
+
const { code, data } = answered(error);
|
|
88
|
+
return code === -32603 && typeof data?.details === 'string' && data.details.startsWith('no rollout found');
|
|
89
|
+
},
|
|
79
90
|
renames: true,
|
|
80
91
|
allowHouse: allowHouseInCodex,
|
|
81
92
|
signedIn: { command: ['login', 'status'] },
|
|
@@ -84,8 +95,9 @@ export const CLIS = {
|
|
|
84
95
|
},
|
|
85
96
|
'claude-agent-acp': {
|
|
86
97
|
bin: 'claude',
|
|
87
|
-
minimum: '2.1.
|
|
98
|
+
minimum: '2.1.303',
|
|
88
99
|
install: 'curl -fsSL https://claude.ai/install.sh | bash',
|
|
100
|
+
update: 'claude update',
|
|
89
101
|
adapter: {
|
|
90
102
|
package: '@agentclientprotocol/claude-agent-acp',
|
|
91
103
|
bin: 'claude-agent-acp',
|
|
@@ -102,9 +114,10 @@ export const CLIS = {
|
|
|
102
114
|
title,
|
|
103
115
|
settings: { sandbox: { network: bridgeInClaudeSandbox(bridge) } },
|
|
104
116
|
},
|
|
105
|
-
emitRawSDKMessages: RAW_SUBTYPES.map((subtype) => ({ type: 'system', subtype })),
|
|
117
|
+
emitRawSDKMessages: [...RAW_SUBTYPES.map((subtype) => ({ type: 'system', subtype })), { type: 'result' }],
|
|
106
118
|
},
|
|
107
119
|
}),
|
|
120
|
+
unknownSession: (error) => answered(error).code === -32002,
|
|
108
121
|
renames: false,
|
|
109
122
|
allowHouse: nothing,
|
|
110
123
|
signedIn: { command: ['auth', 'status'] },
|
|
@@ -115,10 +128,12 @@ export const CLIS = {
|
|
|
115
128
|
bin: 'grok',
|
|
116
129
|
minimum: '1.0.46',
|
|
117
130
|
install: 'curl -fsSL https://x.ai/cli/install.sh | bash',
|
|
131
|
+
update: 'grok update',
|
|
118
132
|
adapter: null,
|
|
119
133
|
args: ['--sandbox', 'off', 'agent', '--always-approve', '--no-leader', 'stdio'],
|
|
120
134
|
fullAccess: null,
|
|
121
135
|
sessionMeta: () => ({}),
|
|
136
|
+
unknownSession: (error) => answered(error).data?.code === 'FS_NOT_FOUND',
|
|
122
137
|
renames: false,
|
|
123
138
|
allowHouse: nothing,
|
|
124
139
|
signedIn: { initializeMeta: 'defaultAuthMethodId' },
|
|
@@ -127,38 +142,22 @@ export const CLIS = {
|
|
|
127
142
|
},
|
|
128
143
|
};
|
|
129
144
|
const KIT_PACKAGE = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
|
|
130
|
-
export const
|
|
131
|
-
const PROXY = /^https?_proxy$/i;
|
|
145
|
+
export const KIT_RELEASE = KIT_PACKAGE.version;
|
|
132
146
|
const VERSION = /\d+\.\d+\.\d+(?:-[0-9A-Za-z.]+)?/;
|
|
133
|
-
// An install still running after fifteen minutes is ended
|
|
147
|
+
// 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
148
|
const INSTALL_MS = 15 * 60_000;
|
|
135
149
|
// 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
150
|
const READ_MS = 30_000;
|
|
137
151
|
const CAUSE_CHARACTERS = 4000;
|
|
138
|
-
function prefix(kind) {
|
|
139
|
-
return join(kitHome(), 'agents', kind);
|
|
140
|
-
}
|
|
141
152
|
export function adapterCommand(kind) {
|
|
142
|
-
return join(
|
|
143
|
-
}
|
|
144
|
-
async function installedAdapter(kind) {
|
|
145
|
-
try {
|
|
146
|
-
const manifest = join(prefix(kind), 'node_modules', CLIS[kind].adapter.package, 'package.json');
|
|
147
|
-
return JSON.parse(await readFile(manifest, 'utf8')).version;
|
|
148
|
-
}
|
|
149
|
-
catch {
|
|
150
|
-
return null;
|
|
151
|
-
}
|
|
152
|
-
}
|
|
153
|
-
export function withoutProxy() {
|
|
154
|
-
return Object.fromEntries(Object.entries(process.env).filter(([name]) => !PROXY.test(name)));
|
|
153
|
+
return join(releaseDirectory(KIT_RELEASE), 'adapters', kind, 'node_modules', '.bin', CLIS[kind].adapter.bin);
|
|
155
154
|
}
|
|
156
155
|
export function run(command, args, timeoutMs, detached = false, signal) {
|
|
157
156
|
return new Promise((resolve) => {
|
|
158
157
|
const child = spawn(command, args, {
|
|
159
158
|
stdio: ['ignore', 'pipe', 'pipe'],
|
|
160
159
|
timeout: timeoutMs,
|
|
161
|
-
env:
|
|
160
|
+
env: childEnvironment(),
|
|
162
161
|
detached,
|
|
163
162
|
signal: detached ? undefined : signal,
|
|
164
163
|
});
|
|
@@ -192,19 +191,18 @@ export function run(command, args, timeoutMs, detached = false, signal) {
|
|
|
192
191
|
export function failureOf(ran, program) {
|
|
193
192
|
return ran.output.trim().slice(-CAUSE_CHARACTERS) || `${program} exited with ${ran.status ?? 'a signal'}`;
|
|
194
193
|
}
|
|
195
|
-
export
|
|
196
|
-
|
|
197
|
-
if (adapter === null)
|
|
198
|
-
return null;
|
|
199
|
-
const release = KIT_PACKAGE.peerDependencies[adapter.package];
|
|
200
|
-
if ((await installedAdapter(kind)) === release)
|
|
201
|
-
return null;
|
|
202
|
-
const ran = await run('npm', ['install', '--prefix', prefix(kind), '--no-save', '--no-audit', '--no-fund', '--omit=optional', `${adapter.package}@${release}`], INSTALL_MS, true, signal);
|
|
203
|
-
return ran.status === 0 ? null : failureOf(ran, 'npm');
|
|
194
|
+
export function adapterArchive(kind) {
|
|
195
|
+
return `${kind}-${KIT_PACKAGE.peerDependencies[CLIS[kind].adapter.package]}.tar.gz`;
|
|
204
196
|
}
|
|
205
|
-
|
|
206
|
-
const
|
|
207
|
-
|
|
197
|
+
async function bounded(program, work, signal) {
|
|
198
|
+
const deadline = AbortSignal.timeout(INSTALL_MS);
|
|
199
|
+
const ran = await work(signal === undefined ? deadline : AbortSignal.any([signal, deadline]));
|
|
200
|
+
if (deadline.aborted && signal?.aborted !== true)
|
|
201
|
+
return `${program} did not end within ${INSTALL_MS / 1000} seconds`;
|
|
202
|
+
return ran.status === 0 ? null : failureOf(ran, program);
|
|
203
|
+
}
|
|
204
|
+
export function installCli(kind, signal) {
|
|
205
|
+
return bounded('the install', (within) => run('bash', ['-o', 'pipefail', '-c', CLIS[kind].install], INSTALL_MS, true, within), signal);
|
|
208
206
|
}
|
|
209
207
|
function loginShell() {
|
|
210
208
|
return process.env.SHELL || userInfo().shell;
|
|
@@ -212,18 +210,30 @@ function loginShell() {
|
|
|
212
210
|
const FOUND = 'house-kit-cli ';
|
|
213
211
|
const LOOKUP = `found=$(command -v "$1") || exit 0; case $found in /*) ;; *) found=$(pwd -P)/$found ;; esac; printf "${FOUND}%s\\n" "$found"`;
|
|
214
212
|
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}`],
|
|
213
|
+
function inLoginShell(script, argument = '', signal, timeoutMs = READ_MS) {
|
|
214
|
+
return run(loginShell(), ['-l', '-i', '-c', `exec /bin/sh -c '${USER_BIN}; ${script}' sh ${argument}`], timeoutMs, true, signal);
|
|
217
215
|
}
|
|
218
|
-
export async function
|
|
219
|
-
const ran = await inLoginShell(LOOKUP,
|
|
216
|
+
export async function onLoginPath(program, signal) {
|
|
217
|
+
const ran = await inLoginShell(LOOKUP, program, signal);
|
|
220
218
|
return ran.stdout.split('\n').findLast((line) => line.startsWith(FOUND))?.slice(FOUND.length) ?? null;
|
|
221
219
|
}
|
|
220
|
+
export function locate(kind, signal) {
|
|
221
|
+
return onLoginPath(CLIS[kind].bin, signal);
|
|
222
|
+
}
|
|
223
|
+
export function updateCli(kind) {
|
|
224
|
+
return bounded('the update', (within) => inLoginShell(CLIS[kind].update, '', within, INSTALL_MS));
|
|
225
|
+
}
|
|
222
226
|
export async function loginPath() {
|
|
223
227
|
const marker = 'house-kit-path ';
|
|
224
228
|
const ran = await inLoginShell(`printf "${marker}%s\\n" "$PATH"`);
|
|
225
229
|
return ran.stdout.split('\n').findLast((line) => line.startsWith(marker)).slice(marker.length);
|
|
226
230
|
}
|
|
231
|
+
export async function writeCodexRule() {
|
|
232
|
+
const shell = await loginPath().catch(() => '');
|
|
233
|
+
await allowHouseInCodex([dirname(process.execPath), process.env.PATH ?? '', shell].join(delimiter)).catch((error) => {
|
|
234
|
+
throw new Error(`Codex's rule for house could not be written: ${error.message}`);
|
|
235
|
+
});
|
|
236
|
+
}
|
|
227
237
|
export async function versionOf(path, signal) {
|
|
228
238
|
return VERSION.exec((await run(path, ['--version'], READ_MS, false, signal)).stdout)?.[0] ?? null;
|
|
229
239
|
}
|
|
@@ -0,0 +1,105 @@
|
|
|
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, unserved } 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 failures = 0;
|
|
36
|
+
const connect = async () => {
|
|
37
|
+
const { house, credential } = (await readEnrolment());
|
|
38
|
+
if (socket !== null || unserved())
|
|
39
|
+
return;
|
|
40
|
+
refused = null;
|
|
41
|
+
const opening = new WebSocket(relayed(connectionUrl(house)), {
|
|
42
|
+
protocols: [SUBPROTOCOL],
|
|
43
|
+
headers: { authorization: `Bearer ${credential}` },
|
|
44
|
+
});
|
|
45
|
+
socket = opening;
|
|
46
|
+
let opened = false;
|
|
47
|
+
let silence = null;
|
|
48
|
+
const closed = (event) => {
|
|
49
|
+
silence?.stop();
|
|
50
|
+
silence = null;
|
|
51
|
+
if (socket === opening)
|
|
52
|
+
socket = null;
|
|
53
|
+
if (connection === opening)
|
|
54
|
+
connection = null;
|
|
55
|
+
handlers.closed();
|
|
56
|
+
process.stderr.write(`kit: connection closed ${event.code} ${event.reason}\n`);
|
|
57
|
+
if (event.reason === 'replaced')
|
|
58
|
+
end(REPLACED);
|
|
59
|
+
if (event.reason === 'credential_rejected' || refused?.status === 401) {
|
|
60
|
+
void signInAgain(credential);
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
if (refused !== null)
|
|
64
|
+
endUnserved(refused.text);
|
|
65
|
+
if (!opened && refused !== null)
|
|
66
|
+
process.stderr.write(`kit: ${refused.message}\n`);
|
|
67
|
+
// 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.
|
|
68
|
+
setTimeout(() => void connect(), opened ? 1000 + Math.random() * 2000 : retryDelay(failures++));
|
|
69
|
+
};
|
|
70
|
+
opening.onopen = () => {
|
|
71
|
+
opened = true;
|
|
72
|
+
failures = 0;
|
|
73
|
+
connection = opening;
|
|
74
|
+
silence = new Silence(CONNECTION_SILENCE_MS, () => {
|
|
75
|
+
if (connection !== opening)
|
|
76
|
+
return;
|
|
77
|
+
connection = null;
|
|
78
|
+
opening.onclose = null;
|
|
79
|
+
opening.close();
|
|
80
|
+
closed(new CloseEvent('close', { code: 1006, reason: 'heartbeat_missed' }));
|
|
81
|
+
});
|
|
82
|
+
silence.heard();
|
|
83
|
+
handlers.opened();
|
|
84
|
+
};
|
|
85
|
+
opening.onmessage = (event) => {
|
|
86
|
+
silence?.heard();
|
|
87
|
+
const arrived = JSON.parse(String(event.data));
|
|
88
|
+
if (arrived.type === 'input')
|
|
89
|
+
handlers.call(arrived);
|
|
90
|
+
else if (arrived.type !== 'beat')
|
|
91
|
+
handlers.notification(arrived);
|
|
92
|
+
};
|
|
93
|
+
opening.onerror = () => undefined;
|
|
94
|
+
opening.onclose = closed;
|
|
95
|
+
};
|
|
96
|
+
void connect();
|
|
97
|
+
return {
|
|
98
|
+
send(notification) {
|
|
99
|
+
if (connection === null || connection.readyState !== WebSocket.OPEN)
|
|
100
|
+
return false;
|
|
101
|
+
connection.send(JSON.stringify(notification));
|
|
102
|
+
return true;
|
|
103
|
+
},
|
|
104
|
+
};
|
|
105
|
+
}
|