@agentshouse/kit 0.2.1-caf3915e29919 → 0.2.1-caf8b8e5a324f
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 +24 -23
- package/dist/agents.js +74 -7
- package/dist/api.js +5 -1
- package/dist/app-git.js +10 -26
- package/dist/bootstrap.json +4 -4
- package/dist/bridge.js +2 -5
- package/dist/chatgpt.js +32 -0
- package/dist/clis.js +51 -9
- package/dist/conversations.js +85 -28
- package/dist/copies.js +62 -27
- package/dist/end.js +5 -0
- package/dist/events.js +3 -0
- package/dist/files.js +7 -1
- package/dist/git.js +10 -8
- package/dist/home.js +56 -5
- package/dist/house-cli.js +291 -0
- package/dist/house-main.js +7 -189
- package/dist/instructions.js +6 -30
- package/dist/kit-cli.js +68 -0
- package/dist/kit-main.js +8 -22
- package/dist/login.js +49 -14
- package/dist/logout.js +0 -2
- package/dist/parts.js +34 -16
- package/dist/placement.js +30 -0
- package/dist/relay.js +1 -1
- package/dist/resident.js +58 -13
- package/dist/skills.js +81 -12
- package/dist/stream.js +62 -13
- package/dist/transcription.js +3 -3
- package/dist/update.js +28 -6
- package/dist/wire.js +6 -0
- package/dist/work.js +3 -5
- package/how-we-work.md +13 -3
- package/package.json +2 -1
- package/skills/ask-matt/SKILL.md +17 -11
- package/skills/ask-matt/agents/openai.yaml +1 -0
- package/skills/code-review/SKILL.md +5 -5
- package/skills/codebase-design/DESIGN-IT-TWICE.md +1 -1
- package/skills/codebase-design/SKILL.md +0 -2
- package/skills/diagnosing-bugs/SKILL.md +2 -4
- package/skills/domain-modeling/{CONTEXT-FORMAT.md → GLOSSARY-FORMAT.md} +10 -10
- package/skills/domain-modeling/SKILL.md +12 -14
- package/skills/grill-me/SKILL.md +1 -2
- package/skills/grill-me/agents/openai.yaml +1 -0
- package/skills/grill-with-docs/SKILL.md +1 -2
- package/skills/grill-with-docs/agents/openai.yaml +1 -0
- package/skills/grilling/SKILL.md +2 -2
- package/skills/handoff/SKILL.md +2 -3
- package/skills/handoff/agents/openai.yaml +1 -0
- package/skills/implement/SKILL.md +5 -4
- package/skills/implement/agents/openai.yaml +1 -0
- package/skills/implement-spec/SKILL.md +40 -0
- package/skills/implement-spec/agents/openai.yaml +5 -0
- package/skills/improve-codebase-architecture/SKILL.md +6 -7
- package/skills/improve-codebase-architecture/agents/openai.yaml +1 -0
- package/skills/pr/CREDITS.md +3 -0
- package/skills/pr/LICENSE +21 -0
- package/skills/pr/SKILL.md +170 -0
- package/skills/pr/agents/openai.yaml +3 -0
- package/skills/prototype/SKILL.md +0 -2
- package/skills/research/SKILL.md +0 -2
- package/skills/retro/LICENSE +21 -0
- package/skills/retro/SKILL.md +44 -0
- package/skills/retro/agents/openai.yaml +5 -0
- package/skills/tdd/SKILL.md +2 -4
- package/skills/teach/SKILL.md +3 -4
- package/skills/teach/agents/openai.yaml +1 -0
- package/skills/to-questionnaire/SKILL.md +1 -2
- package/skills/to-questionnaire/agents/openai.yaml +1 -0
- package/skills/to-spec/SKILL.md +1 -2
- package/skills/to-spec/agents/openai.yaml +1 -0
- package/skills/to-tickets/SKILL.md +3 -4
- package/skills/to-tickets/agents/openai.yaml +1 -0
- package/skills/triage/AGENT-BRIEF.md +207 -0
- package/skills/triage/LICENSE +21 -0
- package/skills/triage/OUT-OF-SCOPE.md +105 -0
- package/skills/triage/SKILL.md +112 -0
- package/skills/triage/agents/openai.yaml +5 -0
- package/skills/wait-what/SKILL.md +2 -3
- package/skills/wait-what/agents/openai.yaml +1 -0
- package/skills/wayfinder/SKILL.md +5 -6
- package/skills/wayfinder/agents/openai.yaml +1 -0
- package/skills/wizard/LICENSE +21 -0
- package/skills/wizard/SKILL.md +44 -0
- package/skills/wizard/agents/openai.yaml +3 -0
- package/skills/wizard/template.sh +223 -0
- package/skills/writing-for-agents/SKILL.md +0 -2
- package/skills/resolving-merge-conflicts/SKILL.md +0 -16
- package/skills/resolving-merge-conflicts/agents/openai.yaml +0 -3
- /package/skills/{resolving-merge-conflicts → implement-spec}/LICENSE +0 -0
package/dist/kit-cli.js
ADDED
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import { setGlobalProxyFromEnv } from 'node:http';
|
|
2
|
+
import { parseArgs } from 'node:util';
|
|
3
|
+
import { answerGitCredential } from './app-git.js';
|
|
4
|
+
import { chatgpt } from './chatgpt.js';
|
|
5
|
+
import { login } from './login.js';
|
|
6
|
+
import { logout } from './logout.js';
|
|
7
|
+
import { resident } from './resident.js';
|
|
8
|
+
const USAGE = 'usage: kit <login|logout|resident|chatgpt>\n';
|
|
9
|
+
const COMMANDS = new Map([
|
|
10
|
+
[
|
|
11
|
+
'logout',
|
|
12
|
+
{
|
|
13
|
+
usage: 'usage: kit logout',
|
|
14
|
+
about: "disconnects this computer, stops House Kit and ends your own agent's connection",
|
|
15
|
+
operands: 0,
|
|
16
|
+
run: logout,
|
|
17
|
+
},
|
|
18
|
+
],
|
|
19
|
+
[
|
|
20
|
+
'resident',
|
|
21
|
+
{
|
|
22
|
+
usage: 'usage: kit resident',
|
|
23
|
+
about: "keeps this Environment connected; House Kit's service runs it",
|
|
24
|
+
operands: 0,
|
|
25
|
+
run: resident,
|
|
26
|
+
},
|
|
27
|
+
],
|
|
28
|
+
[
|
|
29
|
+
'git-credential',
|
|
30
|
+
{
|
|
31
|
+
usage: 'usage: kit git-credential <get|store|erase>',
|
|
32
|
+
about: "answers git with your own agent's House credential; git runs it",
|
|
33
|
+
operands: 1,
|
|
34
|
+
run: ([operation]) => answerGitCredential(operation),
|
|
35
|
+
},
|
|
36
|
+
],
|
|
37
|
+
]);
|
|
38
|
+
const [command, ...argv] = process.argv.slice(2);
|
|
39
|
+
setGlobalProxyFromEnv();
|
|
40
|
+
async function run() {
|
|
41
|
+
if (command === 'login')
|
|
42
|
+
return login(argv);
|
|
43
|
+
if (command === 'chatgpt')
|
|
44
|
+
return chatgpt(argv);
|
|
45
|
+
if (command === '--help') {
|
|
46
|
+
parseArgs({ args: argv });
|
|
47
|
+
process.stdout.write(USAGE);
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
const chosen = COMMANDS.get(command ?? '');
|
|
51
|
+
if (chosen === undefined) {
|
|
52
|
+
process.stderr.write(USAGE);
|
|
53
|
+
process.exitCode = 2;
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
const { values, positionals } = parseArgs({ args: argv, options: { help: { type: 'boolean', default: false } }, allowPositionals: true });
|
|
57
|
+
if (positionals.length > chosen.operands)
|
|
58
|
+
throw new Error(`unexpected argument ${positionals[chosen.operands]}; ${chosen.usage}`);
|
|
59
|
+
if (values.help) {
|
|
60
|
+
process.stdout.write(`${chosen.usage}\n ${chosen.about}\n`);
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
return chosen.run(positionals);
|
|
64
|
+
}
|
|
65
|
+
run().catch((error) => {
|
|
66
|
+
process.stderr.write(`kit: ${error instanceof Error ? error.message : String(error)}\n`);
|
|
67
|
+
process.exitCode = 1;
|
|
68
|
+
});
|
package/dist/kit-main.js
CHANGED
|
@@ -1,24 +1,10 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
import { logout } from './logout.js';
|
|
6
|
-
import { resident } from './resident.js';
|
|
7
|
-
const [command, ...argv] = process.argv.slice(2);
|
|
8
|
-
setGlobalProxyFromEnv();
|
|
9
|
-
async function run() {
|
|
10
|
-
if (command === 'login')
|
|
11
|
-
return login(argv);
|
|
12
|
-
if (command === 'logout')
|
|
13
|
-
return logout();
|
|
14
|
-
if (command === 'resident')
|
|
15
|
-
return resident();
|
|
16
|
-
if (command === 'git-credential')
|
|
17
|
-
return answerGitCredential(argv[0]);
|
|
18
|
-
process.stderr.write('usage: kit <login|logout|resident>\n');
|
|
19
|
-
process.exitCode = 2;
|
|
20
|
-
}
|
|
21
|
-
run().catch((error) => {
|
|
22
|
-
process.stderr.write(`kit: ${error instanceof Error ? error.message : String(error)}\n`);
|
|
2
|
+
const [major = 0, minor = 0] = process.versions.node.split('.').map(Number);
|
|
3
|
+
if (major < 24 || (major === 24 && minor < 14)) {
|
|
4
|
+
process.stderr.write(`kit: the Kit needs Node 24.14.0 or newer; this is ${process.versions.node}\n`);
|
|
23
5
|
process.exitCode = 1;
|
|
24
|
-
}
|
|
6
|
+
}
|
|
7
|
+
else {
|
|
8
|
+
await import('./kit-cli.js');
|
|
9
|
+
}
|
|
10
|
+
export {};
|
package/dist/login.js
CHANGED
|
@@ -2,13 +2,16 @@ import { spawn } from 'node:child_process';
|
|
|
2
2
|
import { createHash, randomBytes } from 'node:crypto';
|
|
3
3
|
import { hostname } from 'node:os';
|
|
4
4
|
import { parseArgs } from 'node:util';
|
|
5
|
-
import { post, retrying } from './api.js';
|
|
5
|
+
import { HouseRefusal, post, retrying } from './api.js';
|
|
6
6
|
import { placeAppGit } from './app-git.js';
|
|
7
|
-
import {
|
|
7
|
+
import { writeCodexRule } from './clis.js';
|
|
8
|
+
import { forgetDisconnected, forgetOwnAgent, readDisconnected, readEnrolment, readOwnAgent, writeEnrolment, writeOwnAgent, } from './home.js';
|
|
8
9
|
import { callHouse, rpc } from './mcp.js';
|
|
10
|
+
import { refusalOf } from './refusals.js';
|
|
9
11
|
import { selectRelay } from './relay.js';
|
|
10
12
|
import { startService } from './service.js';
|
|
11
|
-
|
|
13
|
+
import { placeSkillSet } from './skills.js';
|
|
14
|
+
export const DEFAULT_HOUSE = 'https://agents.house';
|
|
12
15
|
const OPENER = process.platform === 'darwin' ? 'open' : 'xdg-open';
|
|
13
16
|
// Polling every two seconds brings the User's confirmation to the waiting Kit moments after they give it.
|
|
14
17
|
const POLL_INTERVAL_MS = 2000;
|
|
@@ -17,7 +20,7 @@ function open(link) {
|
|
|
17
20
|
.on('error', () => undefined)
|
|
18
21
|
.unref();
|
|
19
22
|
}
|
|
20
|
-
async function accepted(house, credential) {
|
|
23
|
+
export async function accepted(house, credential) {
|
|
21
24
|
const checked = await callHouse(house, credential, rpc('tools/list', {}));
|
|
22
25
|
if (checked.status === 200)
|
|
23
26
|
return true;
|
|
@@ -25,13 +28,24 @@ async function accepted(house, credential) {
|
|
|
25
28
|
return false;
|
|
26
29
|
throw new Error(`House answered ${checked.status} when Kit checked this computer's own agent's connection: ${checked.text}`);
|
|
27
30
|
}
|
|
28
|
-
const USAGE = `usage: kit login [--house <origin>] [--environment <id>] [--rooms <ref>[,<ref>...] | --no-private]
|
|
31
|
+
const USAGE = `usage: kit login [--house <origin>] [--environment <id>] [--rooms <ref>[,<ref>...] | --no-private]
|
|
32
|
+
kit login [--house <origin>] --code <code>
|
|
29
33
|
--house <origin> the House to connect to, ${DEFAULT_HOUSE} unless one is stored
|
|
30
34
|
--environment <id> reconnect this Environment
|
|
31
35
|
--rooms <ref>[,<ref>...] give this Environment only these Rooms
|
|
32
36
|
--no-private give this Environment every Room but your Private Room
|
|
33
37
|
--code <code> connect this machine with a login code
|
|
34
38
|
`;
|
|
39
|
+
function connected(house, named, environment) {
|
|
40
|
+
if (named === undefined)
|
|
41
|
+
return `Environment ${environment} is connected to ${house}.\n`;
|
|
42
|
+
if (named === environment)
|
|
43
|
+
return `Environment ${environment} is reconnected to ${house}.\n`;
|
|
44
|
+
return `Environment ${named} stays with its account; this computer is connected to ${house} as new Environment ${environment} of the account that confirmed.\n`;
|
|
45
|
+
}
|
|
46
|
+
function gone(error) {
|
|
47
|
+
return error instanceof HouseRefusal && refusalOf(error.text)?.code === 'kit_environment_not_found';
|
|
48
|
+
}
|
|
35
49
|
function chosenRooms(rooms, noPrivate) {
|
|
36
50
|
if (rooms !== undefined && noPrivate)
|
|
37
51
|
throw new Error('--rooms and --no-private are two choices of Rooms; pass one');
|
|
@@ -70,9 +84,11 @@ export async function login(argv) {
|
|
|
70
84
|
selectRelay(relay);
|
|
71
85
|
const house = values.house ?? enrolled?.house ?? DEFAULT_HOUSE;
|
|
72
86
|
const replaces = process.env.HOUSE_KIT_REPLACES;
|
|
73
|
-
const
|
|
87
|
+
const remembered = replaces === undefined && values.environment === undefined && enrolled?.house === house ? enrolled.environment : undefined;
|
|
88
|
+
const environment = replaces === undefined ? (values.environment ?? remembered) : undefined;
|
|
74
89
|
const ownAgent = await readOwnAgent();
|
|
75
90
|
let held = false;
|
|
91
|
+
let named = environment;
|
|
76
92
|
let exchanged;
|
|
77
93
|
if (values.code !== undefined) {
|
|
78
94
|
exchanged = await post(house, '/kit/token', { code: values.code, label: hostname() });
|
|
@@ -80,33 +96,52 @@ export async function login(argv) {
|
|
|
80
96
|
else {
|
|
81
97
|
held = ownAgent !== null && ownAgent.house === house && (await accepted(house, ownAgent.credential));
|
|
82
98
|
const verifier = randomBytes(32).toString('base64url');
|
|
83
|
-
const
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
99
|
+
const start = () => retrying(() => post(house, '/kit', {
|
|
100
|
+
label: hostname(),
|
|
101
|
+
...(named === undefined
|
|
102
|
+
? { act: 'new_environment', ...(replaces === undefined ? {} : { replaces }) }
|
|
103
|
+
: { act: 'existing_environment', environment_id: named }),
|
|
87
104
|
...rooms,
|
|
88
105
|
code_challenge: createHash('sha256').update(verifier).digest('base64url'),
|
|
89
106
|
...(held ? {} : { headless: true }),
|
|
90
107
|
}));
|
|
108
|
+
let started;
|
|
109
|
+
try {
|
|
110
|
+
started = await start();
|
|
111
|
+
}
|
|
112
|
+
catch (error) {
|
|
113
|
+
if (remembered === undefined || !gone(error))
|
|
114
|
+
throw error;
|
|
115
|
+
await forgetDisconnected();
|
|
116
|
+
process.stdout.write(`House no longer holds Environment ${remembered}; connecting this computer as a new one.\n`);
|
|
117
|
+
named = undefined;
|
|
118
|
+
started = await start();
|
|
119
|
+
}
|
|
91
120
|
process.stdout.write(`Open this link and confirm: ${started.start_url}\n`);
|
|
92
121
|
open(started.start_url);
|
|
93
122
|
exchanged = await retrying(() => post(house, '/kit/token', { login: started.login, code_verifier: verifier }), undefined, () => POLL_INTERVAL_MS);
|
|
94
123
|
}
|
|
124
|
+
await placeSkillSet();
|
|
125
|
+
await writeCodexRule().catch((error) => process.stderr.write(`kit: ${error.message}\n`));
|
|
126
|
+
const relayRecord = relay === undefined ? {} : { relay };
|
|
95
127
|
await writeEnrolment({
|
|
96
128
|
house,
|
|
97
|
-
...
|
|
129
|
+
...relayRecord,
|
|
98
130
|
environment: exchanged.environment,
|
|
99
131
|
credential: exchanged.credential,
|
|
100
132
|
});
|
|
101
|
-
process.stdout.write(
|
|
133
|
+
process.stdout.write(connected(house, named, exchanged.environment));
|
|
102
134
|
if (exchanged.headless_credential !== undefined) {
|
|
103
|
-
await writeOwnAgent({ house, user: exchanged.user, credential: exchanged.headless_credential });
|
|
135
|
+
await writeOwnAgent({ house, ...relayRecord, user: exchanged.user, credential: exchanged.headless_credential });
|
|
104
136
|
}
|
|
105
137
|
else if (held && ownAgent !== null && ownAgent.user !== exchanged.user) {
|
|
106
138
|
await forgetOwnAgent();
|
|
107
139
|
process.stdout.write("This computer's own agent was another User's; run kit login again to connect it to you.\n");
|
|
108
140
|
}
|
|
109
|
-
|
|
141
|
+
else if (held && ownAgent !== null) {
|
|
142
|
+
await writeOwnAgent({ house, ...relayRecord, user: ownAgent.user, credential: ownAgent.credential });
|
|
143
|
+
}
|
|
144
|
+
await placeAppGit(await readOwnAgent()).catch((error) => process.stderr.write(`kit: ${error.message}\n`));
|
|
110
145
|
try {
|
|
111
146
|
startService();
|
|
112
147
|
}
|
package/dist/logout.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { HouseRefusal, post } from './api.js';
|
|
2
|
-
import { forgetAppGit } from './app-git.js';
|
|
3
2
|
import { forgetEnrolment, forgetOwnAgent, readEnrolment } from './home.js';
|
|
4
3
|
export async function logout() {
|
|
5
4
|
const enrolled = await readEnrolment();
|
|
@@ -13,7 +12,6 @@ export async function logout() {
|
|
|
13
12
|
}
|
|
14
13
|
await forgetEnrolment(enrolled);
|
|
15
14
|
}
|
|
16
|
-
await forgetAppGit();
|
|
17
15
|
await forgetOwnAgent();
|
|
18
16
|
process.stdout.write(enrolled === null
|
|
19
17
|
? 'This computer is not connected to House.\n'
|
package/dist/parts.js
CHANGED
|
@@ -2,7 +2,10 @@ export class Parts {
|
|
|
2
2
|
parts = [];
|
|
3
3
|
context = null;
|
|
4
4
|
emit;
|
|
5
|
+
made = [];
|
|
6
|
+
events = 0;
|
|
5
7
|
writing = null;
|
|
8
|
+
counting = null;
|
|
6
9
|
planned = null;
|
|
7
10
|
constructor(emit) {
|
|
8
11
|
this.emit = emit;
|
|
@@ -10,32 +13,34 @@ export class Parts {
|
|
|
10
13
|
write(type, id, text) {
|
|
11
14
|
if (text === '')
|
|
12
15
|
return;
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
part.text += text;
|
|
17
|
-
this.emit({ op: 'append', index: last, text });
|
|
16
|
+
if (this.writing?.type === type && this.writing.id === id) {
|
|
17
|
+
this.parts[this.writing.index].text += text;
|
|
18
|
+
this.emit({ op: 'append', index: this.writing.index, text });
|
|
18
19
|
return;
|
|
19
20
|
}
|
|
20
|
-
this.start({ type, text });
|
|
21
|
-
this.writing = { type, id };
|
|
21
|
+
this.writing = { type, id, index: this.start({ type, text }) };
|
|
22
22
|
}
|
|
23
23
|
command() {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
if (part?.type !== 'commands') {
|
|
27
|
-
this.start({ type: 'commands', count: 1 });
|
|
24
|
+
if (this.counting === null) {
|
|
25
|
+
this.counting = this.start({ type: 'commands', count: 1 });
|
|
28
26
|
return;
|
|
29
27
|
}
|
|
28
|
+
const part = this.parts[this.counting];
|
|
30
29
|
part.count++;
|
|
31
|
-
this.emit({ op: 'count', index:
|
|
30
|
+
this.emit({ op: 'count', index: this.counting, count: part.count });
|
|
32
31
|
}
|
|
33
32
|
start(part) {
|
|
34
33
|
this.writing = null;
|
|
35
|
-
this.
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
34
|
+
this.counting = null;
|
|
35
|
+
return this.add(part, ++this.events);
|
|
36
|
+
}
|
|
37
|
+
reserve() {
|
|
38
|
+
this.writing = null;
|
|
39
|
+
this.counting = null;
|
|
40
|
+
return ++this.events;
|
|
41
|
+
}
|
|
42
|
+
arrive(part, reserved) {
|
|
43
|
+
this.add(part, reserved);
|
|
39
44
|
}
|
|
40
45
|
done(index, result) {
|
|
41
46
|
const part = this.parts[index];
|
|
@@ -55,10 +60,23 @@ export class Parts {
|
|
|
55
60
|
this.context = context;
|
|
56
61
|
this.emit({ op: 'context', ...context });
|
|
57
62
|
}
|
|
63
|
+
saved() {
|
|
64
|
+
return this.parts
|
|
65
|
+
.map((part, index) => ({ part, made: this.made[index] }))
|
|
66
|
+
.sort((a, b) => a.made - b.made)
|
|
67
|
+
.map(({ part }) => part);
|
|
68
|
+
}
|
|
58
69
|
operations() {
|
|
59
70
|
return [
|
|
60
71
|
...this.parts.map((part, index) => ({ op: 'start', index, part })),
|
|
61
72
|
...(this.context === null ? [] : [{ op: 'context', ...this.context }]),
|
|
62
73
|
];
|
|
63
74
|
}
|
|
75
|
+
add(part, made) {
|
|
76
|
+
this.parts.push(part);
|
|
77
|
+
this.made.push(made);
|
|
78
|
+
const index = this.parts.length - 1;
|
|
79
|
+
this.emit({ op: 'start', index, part });
|
|
80
|
+
return index;
|
|
81
|
+
}
|
|
64
82
|
}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { readFileSync } from 'node:fs';
|
|
2
|
+
import { join } from 'node:path';
|
|
3
|
+
import { run } from './clis.js';
|
|
4
|
+
import { kitHome } from './home.js';
|
|
5
|
+
export function service() {
|
|
6
|
+
if (process.platform !== 'linux' || !process.env.INVOCATION_ID)
|
|
7
|
+
return null;
|
|
8
|
+
return process.env.MANAGERPID ? 'user' : 'system';
|
|
9
|
+
}
|
|
10
|
+
export function throughSudo() {
|
|
11
|
+
return service() === 'system' && process.getuid() !== 0;
|
|
12
|
+
}
|
|
13
|
+
export async function updatesItself() {
|
|
14
|
+
if (service() === null)
|
|
15
|
+
return false;
|
|
16
|
+
if (!throughSudo())
|
|
17
|
+
return true;
|
|
18
|
+
// sudo answers at once, so ten seconds only bounds a stuck sudo.
|
|
19
|
+
return (await run('sudo', ['-n', 'true'], 10_000)).status === 0;
|
|
20
|
+
}
|
|
21
|
+
export function installCommand() {
|
|
22
|
+
try {
|
|
23
|
+
return readFileSync(join(kitHome(), 'install-command'), 'utf8').trim();
|
|
24
|
+
}
|
|
25
|
+
catch (error) {
|
|
26
|
+
if (error.code === 'ENOENT')
|
|
27
|
+
return null;
|
|
28
|
+
throw error;
|
|
29
|
+
}
|
|
30
|
+
}
|
package/dist/relay.js
CHANGED
|
@@ -2,7 +2,7 @@ let selected;
|
|
|
2
2
|
export function selectRelay(relay) {
|
|
3
3
|
selected = relay === undefined || relay === '' ? null : relay;
|
|
4
4
|
}
|
|
5
|
-
function relayOrigin() {
|
|
5
|
+
export function relayOrigin() {
|
|
6
6
|
if (selected !== undefined)
|
|
7
7
|
return selected ?? undefined;
|
|
8
8
|
const ambient = process.env.HOUSE_KIT_RELAY;
|
package/dist/resident.js
CHANGED
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
import { once } from 'node:events';
|
|
2
2
|
import { watch } from 'node:fs';
|
|
3
3
|
import { mkdir, rm, writeFile } from 'node:fs/promises';
|
|
4
|
-
import { createServer } from 'node:http';
|
|
4
|
+
import { createServer, get } from 'node:http';
|
|
5
5
|
import { dirname, extname, join } from 'node:path';
|
|
6
|
+
import { DatabaseSync } from 'node:sqlite';
|
|
6
7
|
import { fileURLToPath } from 'node:url';
|
|
7
8
|
import { Agents } from './agents.js';
|
|
8
9
|
import { house } from './api.js';
|
|
9
10
|
import { received } from './bridge.js';
|
|
10
|
-
import { Conversations } from './conversations.js';
|
|
11
|
+
import { CONVERSATION_INPUTS, Conversations } from './conversations.js';
|
|
11
12
|
import { LocalCopies } from './copies.js';
|
|
12
13
|
import { restart } from './end.js';
|
|
13
|
-
import { agentBase, enrolled, forgetRestart, kitHome, restartAsked } from './home.js';
|
|
14
|
+
import { agentBase, enrolled, forgetRestart, kitHome, ownerLock, ownerSocket, restartAsked } from './home.js';
|
|
14
15
|
import { killDescendants } from './scope.js';
|
|
15
16
|
import { quoted } from './shell.js';
|
|
16
17
|
import { SignIns } from './sign-in.js';
|
|
@@ -29,13 +30,32 @@ async function installShim(path, module) {
|
|
|
29
30
|
await mkdir(dirname(path), { recursive: true });
|
|
30
31
|
await writeFile(path, `#!/bin/sh\nexec ${quoted(process.execPath)} ${quoted(main)} "$@"\n`, { mode: 0o755 });
|
|
31
32
|
}
|
|
33
|
+
function claimed(lock) {
|
|
34
|
+
try {
|
|
35
|
+
lock.exec('BEGIN EXCLUSIVE');
|
|
36
|
+
return true;
|
|
37
|
+
}
|
|
38
|
+
catch (error) {
|
|
39
|
+
if (error.errcode === 5)
|
|
40
|
+
return false;
|
|
41
|
+
throw error;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
32
44
|
async function serveOwner(copies) {
|
|
33
|
-
const
|
|
34
|
-
|
|
45
|
+
const lock = new DatabaseSync(ownerLock());
|
|
46
|
+
if (!claimed(lock)) {
|
|
47
|
+
lock.close();
|
|
48
|
+
const running = await runningResident();
|
|
49
|
+
throw new Error(`${running === null ? 'another Kit' : `Kit ${running}`} already runs this Environment from Kit home ${kitHome()}; stop it first to run another here`);
|
|
50
|
+
}
|
|
35
51
|
const server = createServer(async (request, response) => {
|
|
36
52
|
try {
|
|
37
53
|
const text = await received(request);
|
|
38
54
|
let answered;
|
|
55
|
+
if (request.url === '/resident') {
|
|
56
|
+
response.writeHead(200, { 'content-type': 'application/json' }).end(JSON.stringify({ pid: process.pid }));
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
39
59
|
if (request.url === '/git/fetch') {
|
|
40
60
|
answered = await copies.fetch();
|
|
41
61
|
}
|
|
@@ -53,9 +73,23 @@ async function serveOwner(copies) {
|
|
|
53
73
|
response.writeHead(502).end(error instanceof Error ? error.message : String(error));
|
|
54
74
|
}
|
|
55
75
|
});
|
|
56
|
-
server.
|
|
76
|
+
server.on('close', () => lock.close());
|
|
77
|
+
await rm(ownerSocket(), { force: true });
|
|
78
|
+
server.listen(ownerSocket());
|
|
57
79
|
await once(server, 'listening');
|
|
58
80
|
}
|
|
81
|
+
function runningResident() {
|
|
82
|
+
return new Promise((resolve, reject) => {
|
|
83
|
+
get({ socketPath: ownerSocket(), path: '/resident' }, (answer) => {
|
|
84
|
+
received(answer).then((text) => resolve(JSON.parse(text).pid), reject);
|
|
85
|
+
}).on('error', (error) => {
|
|
86
|
+
if (error.code === 'ENOENT' || error.code === 'ECONNREFUSED')
|
|
87
|
+
resolve(null);
|
|
88
|
+
else
|
|
89
|
+
reject(error);
|
|
90
|
+
});
|
|
91
|
+
});
|
|
92
|
+
}
|
|
59
93
|
function connected() {
|
|
60
94
|
return new Promise((resolve) => {
|
|
61
95
|
const watcher = watch(kitHome(), () => {
|
|
@@ -72,7 +106,7 @@ function connected() {
|
|
|
72
106
|
resolve();
|
|
73
107
|
});
|
|
74
108
|
}
|
|
75
|
-
|
|
109
|
+
async function started() {
|
|
76
110
|
await connected();
|
|
77
111
|
await forgetRestart();
|
|
78
112
|
watch(kitHome(), () => {
|
|
@@ -83,16 +117,23 @@ export async function resident() {
|
|
|
83
117
|
});
|
|
84
118
|
await placeSkillSet();
|
|
85
119
|
await mkdir(agentBase(), { recursive: true });
|
|
86
|
-
process.env.HOUSE_KIT_RESIDENT = String(process.pid);
|
|
87
|
-
const agents = new Agents(house);
|
|
88
|
-
const copies = new LocalCopies(house);
|
|
89
|
-
await copies.load();
|
|
90
120
|
await installShim(join(kitHome(), 'shim', 'git'), 'git-main');
|
|
91
121
|
await installShim(codexLauncher(), 'codex-main');
|
|
122
|
+
}
|
|
123
|
+
export async function resident() {
|
|
124
|
+
await mkdir(kitHome(), { recursive: true, mode: 0o700 });
|
|
125
|
+
const copies = new LocalCopies(house);
|
|
126
|
+
await copies.load();
|
|
92
127
|
await serveOwner(copies);
|
|
128
|
+
await started().catch((error) => {
|
|
129
|
+
report(error);
|
|
130
|
+
process.exit(1);
|
|
131
|
+
});
|
|
132
|
+
process.env.HOUSE_KIT_RESIDENT = String(process.pid);
|
|
133
|
+
const agents = new Agents(house, () => changed());
|
|
93
134
|
let stream = null;
|
|
94
135
|
let reported = false;
|
|
95
|
-
const idle = () => conversations.idle() && signIns.idle();
|
|
136
|
+
const idle = () => conversations.idle() && signIns.idle() && agents.idle();
|
|
96
137
|
const changed = () => {
|
|
97
138
|
if (!idle()) {
|
|
98
139
|
reported = false;
|
|
@@ -140,8 +181,12 @@ export async function resident() {
|
|
|
140
181
|
signIns.start(arrived);
|
|
141
182
|
else if (arrived.kind === 'update')
|
|
142
183
|
updates.start(arrived);
|
|
143
|
-
else
|
|
184
|
+
else if (CONVERSATION_INPUTS.has(arrived.kind))
|
|
144
185
|
conversations.input(arrived);
|
|
186
|
+
else {
|
|
187
|
+
const refused = { refused: `This Kit does not know ${arrived.kind}; update the Kit` };
|
|
188
|
+
logged(house.deliver(`/kit/inputs/${arrived.input_id}/ack`, refused).finally(changed));
|
|
189
|
+
}
|
|
145
190
|
}
|
|
146
191
|
},
|
|
147
192
|
});
|
package/dist/skills.js
CHANGED
|
@@ -1,17 +1,31 @@
|
|
|
1
|
+
import { createHash } from 'node:crypto';
|
|
1
2
|
import { readFileSync } from 'node:fs';
|
|
2
|
-
import { cp, lstat, mkdir, readdir, realpath, rm, symlink
|
|
3
|
+
import { cp, lstat, mkdir, readdir, realpath, rm, symlink } from 'node:fs/promises';
|
|
3
4
|
import { homedir } from 'node:os';
|
|
4
5
|
import { join, relative } from 'node:path';
|
|
5
6
|
import { fileURLToPath } from 'node:url';
|
|
7
|
+
import { parse } from 'yaml';
|
|
6
8
|
import { KIT_VERSION } from './clis.js';
|
|
7
9
|
import { kitHome, readConfiguration, readHome, writeHome } from './home.js';
|
|
8
10
|
import { refusalOf } from './refusals.js';
|
|
9
|
-
|
|
11
|
+
const HOW_WE_WORK = '/rooms/private/how-we-work.md';
|
|
10
12
|
const SKILL_SET = fileURLToPath(new URL('../skills/', import.meta.url));
|
|
11
13
|
const HOW_WE_WORK_TEXT = readFileSync(new URL('../how-we-work.md', import.meta.url), 'utf8');
|
|
14
|
+
const SHIPPED_HOW_WE_WORK = [
|
|
15
|
+
'ae4dda60da7b174f22dc5fa9bf07fc27c25864932a74230de4f9f509ddd91f41',
|
|
16
|
+
'0bdcd43e1603ba6673a3cae56d70bbf90657cbeefd124e91a47be2ca1cbd6c93',
|
|
17
|
+
'4106a87ec66da6f7b2a10e74d18e6559d68d5f4fe7415dae68f5c7bdb9081968',
|
|
18
|
+
'ac814a2197038f037b657bb719340395f89f319ac9fcdd386629c3fe2cec68f1',
|
|
19
|
+
'29951ee394aad9979eecfed3e5dc32c2c86e2226b6a380db5dbd4f305f4d1156',
|
|
20
|
+
];
|
|
12
21
|
const RECORD = 'skill-set.json';
|
|
13
|
-
const
|
|
22
|
+
const WRITTEN = 'how-we-work.json';
|
|
14
23
|
const UNWRITABLE = new Set(['room_not_found', 'operation_denied']);
|
|
24
|
+
const PRESENT = new Set(['path_exists']);
|
|
25
|
+
const CHANGED = new Set(['base_revision_stale', 'path_absent']);
|
|
26
|
+
const UNREADABLE = /^(?:\S+: )?(?:path_not_found|room_not_found|operation_denied)\b/;
|
|
27
|
+
const FAILED = /^exit: [1-9]\d*$/;
|
|
28
|
+
const CUT = /^stderr: shell: output_cut (\d+) of \d+ bytes; continue with: (.+)$/;
|
|
15
29
|
function skillsDirectory() {
|
|
16
30
|
return join(homedir(), '.agents', 'skills');
|
|
17
31
|
}
|
|
@@ -49,6 +63,14 @@ async function install() {
|
|
|
49
63
|
await writeHome(RECORD, { version: KIT_VERSION, names });
|
|
50
64
|
}
|
|
51
65
|
export async function placeSkillSet() {
|
|
66
|
+
try {
|
|
67
|
+
await replaceSkillSet();
|
|
68
|
+
}
|
|
69
|
+
catch (error) {
|
|
70
|
+
process.stderr.write(`kit: the skills could not be placed: ${error.message}\n`);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
async function replaceSkillSet() {
|
|
52
74
|
const accepted = (await readConfiguration()).skills;
|
|
53
75
|
const installed = await readHome(RECORD);
|
|
54
76
|
if (accepted && installed?.version === KIT_VERSION)
|
|
@@ -62,17 +84,64 @@ export async function placeSkillSet() {
|
|
|
62
84
|
else
|
|
63
85
|
await rm(join(kitHome(), RECORD), { force: true });
|
|
64
86
|
}
|
|
87
|
+
function sha256(text) {
|
|
88
|
+
return createHash('sha256').update(text).digest('hex');
|
|
89
|
+
}
|
|
90
|
+
function cutOf(lines) {
|
|
91
|
+
const cut = CUT.exec(lines[0] ?? '');
|
|
92
|
+
return cut !== null && Buffer.byteLength(lines.slice(1).join('\n')) === Number(cut[1]) ? cut : null;
|
|
93
|
+
}
|
|
94
|
+
export async function readHowWeWork(bridge) {
|
|
95
|
+
let document = '';
|
|
96
|
+
for (let command = `cat ${HOW_WE_WORK}`; command !== undefined;) {
|
|
97
|
+
const read = await bridge.tool('shell', { command });
|
|
98
|
+
const text = read.content.map((content) => content.text).join('\n');
|
|
99
|
+
const lines = text.split('\n');
|
|
100
|
+
if (read.isError === true || (FAILED.test(lines[0] ?? '') && lines[1]?.startsWith('stderr: '))) {
|
|
101
|
+
const refusal = read.isError === true ? text : lines.slice(1).join('\n').replace(/^stderr: /gm, '');
|
|
102
|
+
if (UNREADABLE.test(refusal))
|
|
103
|
+
return '';
|
|
104
|
+
throw new Error(refusal);
|
|
105
|
+
}
|
|
106
|
+
const cut = cutOf(lines);
|
|
107
|
+
document += lines.slice(cut === null ? 0 : 1).join('\n');
|
|
108
|
+
command = cut?.[2];
|
|
109
|
+
}
|
|
110
|
+
return document;
|
|
111
|
+
}
|
|
112
|
+
async function currentRevision(bridge) {
|
|
113
|
+
const inspected = await bridge.tool('inspect', { path: HOW_WE_WORK });
|
|
114
|
+
const text = inspected.content.map((content) => content.text).join('\n');
|
|
115
|
+
if (inspected.isError === true)
|
|
116
|
+
throw new Error(text);
|
|
117
|
+
return parse(text).revisions[0].revision;
|
|
118
|
+
}
|
|
119
|
+
async function edit(bridge, change, kept) {
|
|
120
|
+
const edited = await bridge.tool('edit', { changes: [{ ...change, path: HOW_WE_WORK, content: HOW_WE_WORK_TEXT }] });
|
|
121
|
+
if (edited.isError !== true)
|
|
122
|
+
return 'written';
|
|
123
|
+
const text = edited.content.map((content) => content.text).join('\n');
|
|
124
|
+
const refusal = refusalOf(text);
|
|
125
|
+
if (UNWRITABLE.has(refusal?.code ?? ''))
|
|
126
|
+
return 'unwritable';
|
|
127
|
+
if (refusal?.code === 'edit_conflict' && refusal.conflicts.some((conflict) => kept.has(conflict)))
|
|
128
|
+
return 'kept';
|
|
129
|
+
throw new Error(text);
|
|
130
|
+
}
|
|
65
131
|
export async function createHowWeWork(bridge) {
|
|
66
|
-
if ((await
|
|
132
|
+
if (!(await readConfiguration()).skills || (await readHome(RECORD))?.version === undefined)
|
|
133
|
+
return;
|
|
134
|
+
const current = sha256(HOW_WE_WORK_TEXT);
|
|
135
|
+
if ((await readHome(WRITTEN)) === current)
|
|
136
|
+
return;
|
|
137
|
+
const created = await edit(bridge, { op: 'create' }, PRESENT);
|
|
138
|
+
if (created === 'unwritable')
|
|
67
139
|
return;
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
const
|
|
71
|
-
|
|
72
|
-
if (UNWRITABLE.has(refusal?.code ?? ''))
|
|
140
|
+
if (created === 'kept') {
|
|
141
|
+
const base = await currentRevision(bridge);
|
|
142
|
+
const held = sha256(await readHowWeWork(bridge));
|
|
143
|
+
if (held !== current && SHIPPED_HOW_WE_WORK.includes(held) && (await edit(bridge, { op: 'replace', base }, CHANGED)) === 'unwritable')
|
|
73
144
|
return;
|
|
74
|
-
if (refusal?.code !== 'edit_conflict' || !refusal.conflicts.includes('path_exists'))
|
|
75
|
-
throw new Error(text);
|
|
76
145
|
}
|
|
77
|
-
await
|
|
146
|
+
await writeHome(WRITTEN, current);
|
|
78
147
|
}
|