@agentshouse/kit 0.2.1-c4ea88ba9424e → 0.2.1-c534eec03292e
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 +44 -42
- package/dist/acp.js +102 -111
- package/dist/agents.js +156 -40
- package/dist/api.js +10 -6
- package/dist/app-git.js +10 -26
- package/dist/authority-main.js +2 -2
- package/dist/bridge.js +15 -44
- package/dist/building.js +46 -0
- package/dist/calls.js +71 -0
- package/dist/chatgpt.js +32 -0
- package/dist/clis.js +153 -76
- package/dist/codex-main.js +58 -0
- package/dist/connection.js +116 -0
- package/dist/conversations.js +730 -332
- package/dist/copies.js +185 -123
- package/dist/end.js +30 -5
- package/dist/enrol-main.js +7 -1
- package/dist/events.js +546 -0
- package/dist/files.js +139 -17
- package/dist/git.js +13 -11
- package/dist/home.js +89 -7
- package/dist/house-cli.js +299 -0
- package/dist/house-main.js +7 -159
- package/dist/instructions.js +8 -10
- package/dist/kit-cli.js +68 -0
- package/dist/kit-main.js +8 -22
- package/dist/login.js +118 -107
- package/dist/logout.js +14 -16
- package/dist/mcp.js +6 -2
- package/dist/parts.js +82 -0
- package/dist/placement.js +39 -0
- package/dist/relay.js +33 -2
- package/dist/resident.js +115 -49
- package/dist/scope.js +214 -0
- package/dist/scripts.js +255 -0
- package/dist/service-main.js +9 -0
- package/dist/service.js +55 -0
- package/dist/sign-in.js +23 -40
- 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 +115 -54
- package/dist/wire.js +22 -0
- package/dist/work.js +346 -0
- package/package.json +20 -20
- package/dist/blocks.js +0 -51
- package/dist/bootstrap.json +0 -24
- package/dist/clis-main.js +0 -23
- 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/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,62 +1,104 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { randomUUID } from 'node:crypto';
|
|
3
|
+
import { constants, readFileSync } from 'node:fs';
|
|
4
|
+
import { access, mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
|
|
4
5
|
import { homedir, userInfo } from 'node:os';
|
|
5
|
-
import { 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';
|
|
7
|
-
|
|
8
|
-
|
|
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
|
+
}
|
|
14
|
+
const RAW_SUBTYPES = [
|
|
15
|
+
'background_tasks_changed',
|
|
16
|
+
'task_started',
|
|
17
|
+
'task_updated',
|
|
18
|
+
'task_notification',
|
|
19
|
+
'task_progress',
|
|
20
|
+
'session_state_changed',
|
|
21
|
+
'hook_started',
|
|
22
|
+
'hook_response',
|
|
23
|
+
];
|
|
24
|
+
async function executable(path) {
|
|
25
|
+
try {
|
|
26
|
+
await access(path, constants.X_OK);
|
|
27
|
+
return true;
|
|
28
|
+
}
|
|
29
|
+
catch {
|
|
30
|
+
return false;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
async function listedHouses(file) {
|
|
34
|
+
let text;
|
|
35
|
+
try {
|
|
36
|
+
text = await readFile(file, 'utf8');
|
|
37
|
+
}
|
|
38
|
+
catch (error) {
|
|
39
|
+
if (error.code === 'ENOENT')
|
|
40
|
+
return [];
|
|
41
|
+
throw error;
|
|
42
|
+
}
|
|
43
|
+
try {
|
|
44
|
+
const listed = JSON.parse(HOUSE_EXECUTABLES.exec(text)?.[1] ?? '[]');
|
|
45
|
+
return Array.isArray(listed) ? listed.filter((house) => typeof house === 'string') : [];
|
|
46
|
+
}
|
|
47
|
+
catch {
|
|
48
|
+
return [];
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
export async function allowHouseInCodex(path) {
|
|
52
|
+
const candidates = [...new Set(path.split(delimiter).filter((directory) => isAbsolute(directory)))].map((directory) => join(directory, 'house'));
|
|
9
53
|
const rules = join(process.env.CODEX_HOME || join(homedir(), '.codex'), 'rules');
|
|
54
|
+
const file = join(rules, 'house.rules');
|
|
55
|
+
const houses = [];
|
|
56
|
+
for (const house of [...(await listedHouses(file)), ...candidates]) {
|
|
57
|
+
if (!houses.includes(house) && (await executable(house)))
|
|
58
|
+
houses.push(house);
|
|
59
|
+
}
|
|
10
60
|
await mkdir(rules, { recursive: true });
|
|
11
|
-
|
|
61
|
+
const temporary = `${file}.${randomUUID()}`;
|
|
62
|
+
await writeFile(temporary, houseRule(houses));
|
|
63
|
+
await rename(temporary, file);
|
|
12
64
|
}
|
|
13
65
|
async function nothing() { }
|
|
14
|
-
function
|
|
15
|
-
|
|
16
|
-
return undefined;
|
|
17
|
-
return params.update._meta?.codex?.threadStatus?.type;
|
|
18
|
-
}
|
|
19
|
-
function asyncTask({ method, params }) {
|
|
20
|
-
const update = params?.update;
|
|
21
|
-
if (method !== 'session/update' || update?.asyncTaskId === undefined)
|
|
22
|
-
return null;
|
|
23
|
-
if (update.sessionUpdate === 'async_task_spawned')
|
|
24
|
-
return { id: update.asyncTaskId, running: true };
|
|
25
|
-
if (update.sessionUpdate === 'async_task_state_update' && !RUNNING_JOB.has(update.state ?? '')) {
|
|
26
|
-
return { id: update.asyncTaskId, running: false };
|
|
27
|
-
}
|
|
28
|
-
return null;
|
|
66
|
+
function answered(error) {
|
|
67
|
+
return typeof error === 'object' && error !== null ? error : {};
|
|
29
68
|
}
|
|
30
|
-
function
|
|
31
|
-
|
|
32
|
-
if (phase === 'commentary')
|
|
33
|
-
return 'note';
|
|
34
|
-
if (phase === 'final_answer')
|
|
35
|
-
return 'answer';
|
|
36
|
-
return null;
|
|
69
|
+
function bridgeInClaudeSandbox(bridge) {
|
|
70
|
+
return process.platform === 'darwin' ? { allowUnixSockets: [bridge] } : { allowAllUnixSockets: true };
|
|
37
71
|
}
|
|
38
72
|
export const CLIS = {
|
|
39
73
|
'codex-acp': {
|
|
40
74
|
bin: 'codex',
|
|
41
|
-
minimum: '0.
|
|
75
|
+
minimum: '0.160.1',
|
|
42
76
|
install: 'curl -fsSL https://chatgpt.com/codex/install.sh | sh',
|
|
43
|
-
|
|
77
|
+
update: 'codex update',
|
|
78
|
+
adapter: {
|
|
79
|
+
package: '@agentclientprotocol/codex-acp',
|
|
80
|
+
bin: 'codex-acp',
|
|
81
|
+
executable: 'CODEX_PATH',
|
|
82
|
+
env: { CODEX_CONFIG: JSON.stringify({ features: { shell_zsh_fork: true } }) },
|
|
83
|
+
},
|
|
44
84
|
args: [],
|
|
45
85
|
fullAccess: 'agent-full-access',
|
|
46
|
-
sessionMeta: {},
|
|
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
|
+
},
|
|
91
|
+
renames: true,
|
|
47
92
|
allowHouse: allowHouseInCodex,
|
|
48
93
|
signedIn: { command: ['login', 'status'] },
|
|
49
94
|
login: { args: ['login', '--device-auth'], code: 'show' },
|
|
50
|
-
|
|
51
|
-
turnStarted: (notice) => threadStatus(notice) === 'active',
|
|
52
|
-
turnEnded: (notice) => threadStatus(notice) === 'idle',
|
|
53
|
-
job: asyncTask,
|
|
54
|
-
phase: airPhase,
|
|
95
|
+
air: ['asyncTasks', 'nativeSubagentSessions'],
|
|
55
96
|
},
|
|
56
97
|
'claude-agent-acp': {
|
|
57
98
|
bin: 'claude',
|
|
58
|
-
minimum: '2.1.
|
|
99
|
+
minimum: '2.1.303',
|
|
59
100
|
install: 'curl -fsSL https://claude.ai/install.sh | bash',
|
|
101
|
+
update: 'claude update',
|
|
60
102
|
adapter: {
|
|
61
103
|
package: '@agentclientprotocol/claude-agent-acp',
|
|
62
104
|
bin: 'claude-agent-acp',
|
|
@@ -65,47 +107,45 @@ export const CLIS = {
|
|
|
65
107
|
},
|
|
66
108
|
args: [],
|
|
67
109
|
fullAccess: 'bypassPermissions',
|
|
68
|
-
sessionMeta:
|
|
110
|
+
sessionMeta: (bridge, title) => ({
|
|
111
|
+
claudeCode: {
|
|
112
|
+
options: {
|
|
113
|
+
allowedTools: ['Bash(house:*)'],
|
|
114
|
+
includeHookEvents: true,
|
|
115
|
+
title,
|
|
116
|
+
settings: { sandbox: { network: bridgeInClaudeSandbox(bridge) } },
|
|
117
|
+
},
|
|
118
|
+
emitRawSDKMessages: [...RAW_SUBTYPES.map((subtype) => ({ type: 'system', subtype })), { type: 'result' }],
|
|
119
|
+
},
|
|
120
|
+
}),
|
|
121
|
+
unknownSession: (error) => answered(error).code === -32002,
|
|
122
|
+
renames: false,
|
|
69
123
|
allowHouse: nothing,
|
|
70
124
|
signedIn: { command: ['auth', 'status'] },
|
|
71
125
|
login: { args: ['auth', 'login', '--claudeai'], code: 'collect', rejected: 'Invalid code' },
|
|
72
|
-
|
|
73
|
-
turnStarted: () => false,
|
|
74
|
-
turnEnded: ({ method, params }) => method === 'session/update' &&
|
|
75
|
-
params?.update?.sessionUpdate === 'usage_update' &&
|
|
76
|
-
params.update._meta?.['_claude/origin'] !== undefined,
|
|
77
|
-
job: asyncTask,
|
|
78
|
-
phase: () => null,
|
|
126
|
+
air: ['asyncTasks', 'sessionFailure'],
|
|
79
127
|
},
|
|
80
128
|
'grok-build': {
|
|
81
129
|
bin: 'grok',
|
|
82
130
|
minimum: '1.0.46',
|
|
83
131
|
install: 'curl -fsSL https://x.ai/cli/install.sh | bash',
|
|
132
|
+
update: 'grok update',
|
|
84
133
|
adapter: null,
|
|
85
|
-
args: ['agent', '--always-approve', '--no-leader', 'stdio'],
|
|
134
|
+
args: ['--sandbox', 'off', 'agent', '--always-approve', '--no-leader', 'stdio'],
|
|
86
135
|
fullAccess: null,
|
|
87
|
-
sessionMeta: {},
|
|
136
|
+
sessionMeta: () => ({}),
|
|
137
|
+
unknownSession: (error) => answered(error).data?.code === 'FS_NOT_FOUND',
|
|
138
|
+
renames: false,
|
|
88
139
|
allowHouse: nothing,
|
|
89
140
|
signedIn: { initializeMeta: 'defaultAuthMethodId' },
|
|
90
141
|
login: { args: ['login', '--device-auth'], code: 'show' },
|
|
91
|
-
|
|
92
|
-
turnStarted: ({ method, params }) => method === '_x.ai/queue/changed' && params?.runningPromptId !== undefined,
|
|
93
|
-
turnEnded: ({ method, params }) => method === '_x.ai/session_notification' && params?.update?.sessionUpdate === 'turn_completed',
|
|
94
|
-
job: ({ method, params }) => {
|
|
95
|
-
if (method === '_x.ai/task_backgrounded')
|
|
96
|
-
return { id: params.update.task_id, running: true };
|
|
97
|
-
if (method === '_x.ai/task_completed')
|
|
98
|
-
return { id: params.update.task_snapshot.task_id, running: false };
|
|
99
|
-
return null;
|
|
100
|
-
},
|
|
101
|
-
phase: () => null,
|
|
142
|
+
air: ['asyncTasks'],
|
|
102
143
|
},
|
|
103
144
|
};
|
|
104
145
|
const KIT_PACKAGE = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
|
|
105
|
-
export const
|
|
106
|
-
const PROXY = /^https?_proxy$/i;
|
|
146
|
+
export const KIT_RELEASE = KIT_PACKAGE.version;
|
|
107
147
|
const VERSION = /\d+\.\d+\.\d+(?:-[0-9A-Za-z.]+)?/;
|
|
108
|
-
// 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.
|
|
109
149
|
const INSTALL_MS = 15 * 60_000;
|
|
110
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.
|
|
111
151
|
const READ_MS = 30_000;
|
|
@@ -125,15 +165,12 @@ async function installedAdapter(kind) {
|
|
|
125
165
|
return null;
|
|
126
166
|
}
|
|
127
167
|
}
|
|
128
|
-
export function withoutProxy() {
|
|
129
|
-
return Object.fromEntries(Object.entries(process.env).filter(([name]) => !PROXY.test(name)));
|
|
130
|
-
}
|
|
131
168
|
export function run(command, args, timeoutMs, detached = false, signal) {
|
|
132
169
|
return new Promise((resolve) => {
|
|
133
170
|
const child = spawn(command, args, {
|
|
134
171
|
stdio: ['ignore', 'pipe', 'pipe'],
|
|
135
172
|
timeout: timeoutMs,
|
|
136
|
-
env:
|
|
173
|
+
env: childEnvironment(),
|
|
137
174
|
detached,
|
|
138
175
|
signal: detached ? undefined : signal,
|
|
139
176
|
});
|
|
@@ -167,19 +204,47 @@ export function run(command, args, timeoutMs, detached = false, signal) {
|
|
|
167
204
|
export function failureOf(ran, program) {
|
|
168
205
|
return ran.output.trim().slice(-CAUSE_CHARACTERS) || `${program} exited with ${ran.status ?? 'a signal'}`;
|
|
169
206
|
}
|
|
207
|
+
export function adapterArchive(kind) {
|
|
208
|
+
return `${kind}-${KIT_PACKAGE.peerDependencies[CLIS[kind].adapter.package]}.tar.gz`;
|
|
209
|
+
}
|
|
170
210
|
export async function installAdapter(kind, signal) {
|
|
171
211
|
const adapter = CLIS[kind].adapter;
|
|
172
212
|
if (adapter === null)
|
|
173
213
|
return null;
|
|
174
|
-
|
|
175
|
-
if ((await installedAdapter(kind)) === release)
|
|
214
|
+
if ((await installedAdapter(kind)) === KIT_PACKAGE.peerDependencies[adapter.package])
|
|
176
215
|
return null;
|
|
177
|
-
const
|
|
178
|
-
|
|
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
|
+
}
|
|
238
|
+
}
|
|
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);
|
|
179
245
|
}
|
|
180
|
-
export
|
|
181
|
-
|
|
182
|
-
return ran.status === 0 ? null : failureOf(ran, 'the install');
|
|
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);
|
|
183
248
|
}
|
|
184
249
|
function loginShell() {
|
|
185
250
|
return process.env.SHELL || userInfo().shell;
|
|
@@ -187,18 +252,30 @@ function loginShell() {
|
|
|
187
252
|
const FOUND = 'house-kit-cli ';
|
|
188
253
|
const LOOKUP = `found=$(command -v "$1") || exit 0; case $found in /*) ;; *) found=$(pwd -P)/$found ;; esac; printf "${FOUND}%s\\n" "$found"`;
|
|
189
254
|
const USER_BIN = 'case ":$PATH:" in *":$HOME/.local/bin:"*) ;; *) PATH="$PATH:$HOME/.local/bin" ;; esac; export PATH';
|
|
190
|
-
function inLoginShell(script, argument = '', signal) {
|
|
191
|
-
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);
|
|
192
257
|
}
|
|
193
|
-
export async function
|
|
194
|
-
const ran = await inLoginShell(LOOKUP,
|
|
258
|
+
export async function onLoginPath(program, signal) {
|
|
259
|
+
const ran = await inLoginShell(LOOKUP, program, signal);
|
|
195
260
|
return ran.stdout.split('\n').findLast((line) => line.startsWith(FOUND))?.slice(FOUND.length) ?? null;
|
|
196
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
|
+
}
|
|
197
268
|
export async function loginPath() {
|
|
198
269
|
const marker = 'house-kit-path ';
|
|
199
270
|
const ran = await inLoginShell(`printf "${marker}%s\\n" "$PATH"`);
|
|
200
271
|
return ran.stdout.split('\n').findLast((line) => line.startsWith(marker)).slice(marker.length);
|
|
201
272
|
}
|
|
273
|
+
export async function writeCodexRule() {
|
|
274
|
+
const shell = await loginPath().catch(() => '');
|
|
275
|
+
await allowHouseInCodex([dirname(process.execPath), process.env.PATH ?? '', shell].join(delimiter)).catch((error) => {
|
|
276
|
+
throw new Error(`Codex's rule for house could not be written: ${error.message}`);
|
|
277
|
+
});
|
|
278
|
+
}
|
|
202
279
|
export async function versionOf(path, signal) {
|
|
203
280
|
return VERSION.exec((await run(path, ['--version'], READ_MS, false, signal)).stdout)?.[0] ?? null;
|
|
204
281
|
}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
import { spawn } from 'node:child_process';
|
|
3
|
+
import { connect } from 'node:net';
|
|
4
|
+
const KIT_ANSWER = '"house-kit-';
|
|
5
|
+
const SYNC = 'house-kit/sync';
|
|
6
|
+
function lines(each) {
|
|
7
|
+
let buffer = '';
|
|
8
|
+
return (chunk) => {
|
|
9
|
+
buffer += chunk;
|
|
10
|
+
for (let index = buffer.indexOf('\n'); index >= 0; index = buffer.indexOf('\n')) {
|
|
11
|
+
each(buffer.slice(0, index + 1));
|
|
12
|
+
buffer = buffer.slice(index + 1);
|
|
13
|
+
}
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
function answersKit(line) {
|
|
17
|
+
if (!line.includes(KIT_ANSWER))
|
|
18
|
+
return false;
|
|
19
|
+
try {
|
|
20
|
+
const message = JSON.parse(line);
|
|
21
|
+
return message.method === undefined && typeof message.id === 'string' && message.id.startsWith(KIT_ANSWER.slice(1));
|
|
22
|
+
}
|
|
23
|
+
catch {
|
|
24
|
+
return false;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
const args = process.argv.slice(2);
|
|
28
|
+
const serving = args[0] === 'app-server';
|
|
29
|
+
if (process.env.HOUSE_KIT_SANDBOX === '1' && serving)
|
|
30
|
+
args.push('--disable', 'memories');
|
|
31
|
+
const codex = spawn(process.env.HOUSE_KIT_CODEX, args, { stdio: ['pipe', 'pipe', 'inherit'] });
|
|
32
|
+
const stream = serving ? connect(process.env.HOUSE_KIT_CODEX_STREAM) : null;
|
|
33
|
+
stream?.on('error', () => undefined);
|
|
34
|
+
process.stdin.setEncoding('utf8').on('data', lines((line) => codex.stdin.write(line)));
|
|
35
|
+
process.stdin.on('end', () => codex.stdin.end());
|
|
36
|
+
stream?.setEncoding('utf8').on('data', lines((line) => {
|
|
37
|
+
const message = JSON.parse(line);
|
|
38
|
+
if (message.method === SYNC)
|
|
39
|
+
stream.write(`${JSON.stringify({ jsonrpc: '2.0', id: message.id, result: {} })}\n`);
|
|
40
|
+
else
|
|
41
|
+
codex.stdin.write(line);
|
|
42
|
+
}));
|
|
43
|
+
codex.stdout.setEncoding('utf8').on('data', lines((line) => {
|
|
44
|
+
stream?.write(line);
|
|
45
|
+
if (answersKit(line) || process.stdout.write(line))
|
|
46
|
+
return;
|
|
47
|
+
codex.stdout.pause();
|
|
48
|
+
process.stdout.once('drain', () => codex.stdout.resume());
|
|
49
|
+
}));
|
|
50
|
+
codex.stdin.on('error', () => undefined);
|
|
51
|
+
for (const signal of ['SIGTERM', 'SIGINT', 'SIGHUP'])
|
|
52
|
+
process.on(signal, () => codex.kill(signal));
|
|
53
|
+
codex.on('exit', (code, signal) => {
|
|
54
|
+
if (signal === null)
|
|
55
|
+
process.exit(code ?? 1);
|
|
56
|
+
process.removeAllListeners(signal);
|
|
57
|
+
process.kill(process.pid, signal);
|
|
58
|
+
});
|
|
@@ -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
|
+
}
|