@agentshouse/kit 0.2.1-c62e8a5e845ed → 0.2.1-c64c31420c9bf
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 +19 -18
- package/dist/agents.js +70 -7
- package/dist/api.js +1 -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 +4 -3
- package/dist/conversations.js +53 -14
- package/dist/copies.js +28 -10
- package/dist/end.js +3 -2
- 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 -228
- package/dist/instructions.js +2 -27
- package/dist/kit-cli.js +68 -0
- package/dist/kit-main.js +8 -67
- package/dist/login.js +40 -16
- package/dist/logout.js +0 -2
- package/dist/placement.js +2 -20
- package/dist/resident.js +52 -11
- package/dist/skills.js +81 -12
- package/dist/stream.js +58 -12
- package/dist/transcription.js +3 -3
- package/dist/update.js +1 -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/dist/codex.js +0 -61
- 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/README.md
CHANGED
|
@@ -5,18 +5,18 @@ your Agents' conversations through the agent CLIs you chose and gives each Agent
|
|
|
5
5
|
|
|
6
6
|
## Install
|
|
7
7
|
|
|
8
|
-
Run `curl -fsSL
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
your login shell's `PATH`, and your workspace is `~/AgentsHouse` unless you
|
|
8
|
+
Run `sh -c 'kit=$(curl -fsSL "$0") || { echo "House Kit could not be downloaded; run this command again." >&2; exit 1; }; eval "$kit"' agents.house/kit`,
|
|
9
|
+
or `& { try { $kit = irm agents.house/kit.ps1 } catch { throw 'House Kit could not be downloaded; run this command again.' }; & ([scriptblock]::Create($kit)) @args }` on Windows, which run nothing of a failed download, and again to update; options follow `agents.house/kit`.
|
|
10
|
+
On macOS and Linux it installs House Kit natively under your own account, without an admin password, as a service that runs
|
|
11
|
+
while you are logged in. `kit` and `house` are then on your login shell's `PATH`, and your workspace is `~/AgentsHouse` unless you
|
|
12
12
|
pass `--workspace <path>`.
|
|
13
13
|
|
|
14
14
|
Add `--container` to run House Kit in one Docker container instead, with your
|
|
15
15
|
workspace mounted at `/agents/house`; your Agents then reach only that
|
|
16
|
-
workspace. On Windows 11 the container is the one choice. Append a `kit` or
|
|
17
|
-
`house` command to the container's options to run it in that container.
|
|
16
|
+
workspace. On Windows 11 the container is the one choice. Append a `kit` or `house` command to the container's options to run it in that container.
|
|
18
17
|
Running the command for the other choice on a connected computer asks you to
|
|
19
|
-
confirm, then replaces its Environment, whose Agents end, with a new one.
|
|
18
|
+
confirm, then replaces its Environment, whose Agents end, with a new one. Running it with another `HOUSE_KIT_HOME`
|
|
19
|
+
than the installed Kit's asks you to confirm before it replaces that Kit, and leaves that Kit home as it was.
|
|
20
20
|
|
|
21
21
|
On your own Linux server, run the Linux command with `--linux` to
|
|
22
22
|
install House Kit natively, with its workspace at `/agents/house`; `kit` and
|
|
@@ -33,26 +33,27 @@ them out; running it again without the flag brings them back.
|
|
|
33
33
|
|
|
34
34
|
`kit login` opens or prints a link you confirm in any browser, on this computer
|
|
35
35
|
or another, continues on its own and keeps the Environment's credential in
|
|
36
|
-
`~/.house-kit`, or in
|
|
36
|
+
`$HOUSE_KIT_HOME` when it is set, else in `~/.house-kit`, or in `house-kit-<uid>` under the temporary directory when your home is read-only. `--environment <id>`
|
|
37
37
|
reconnects an Environment you already have; `--rooms <ref>[,<ref>...]` gives it
|
|
38
38
|
only those Rooms and `--no-private` every Room but your Private Room; `--code <code>` connects immediately without a link.
|
|
39
39
|
A login also connects your own agent: outside an Agent conversation, `house <tool>` calls
|
|
40
|
-
House as you and `git` clones and pushes your Apps at `<house>/app/` as you,
|
|
41
|
-
that connection on Connections. `house help` lists the Tools. Codex sessions started after a
|
|
40
|
+
House as you and `git` clones and pushes your Apps at `<house>/app/` as you, each through the Kit
|
|
41
|
+
home `$HOUSE_KIT_HOME` names where it runs, until you revoke that connection on Connections. `house help` lists the Tools. Codex sessions started after a
|
|
42
42
|
login run a lone `house` command outside their sandbox. `kit logout` disconnects this
|
|
43
43
|
computer, stops House Kit and ends your own agent's connection, so `house` and `git` no
|
|
44
|
-
longer act as you here; a later `kit login` reconnects the same Environment
|
|
45
|
-
|
|
44
|
+
longer act as you here; a later `kit login` reconnects the same Environment, or connects
|
|
45
|
+
this computer as a new one when House no longer holds it.
|
|
46
|
+
In a container you do not control, such as ChatGPT's, `npm i -g @agentshouse/kit` and `kit chatgpt --key <key>` with a key made on Connections let `house <tool>` act as you, starting and configuring nothing else.
|
|
46
47
|
|
|
47
|
-
`kit resident` keeps the Environment connected and, as it connects, copies each
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
48
|
+
`kit resident` keeps the Environment connected and, as it connects, copies the text of each Room
|
|
49
|
+
you chose for it as a Git repository in the workspace's `local-copies`. `house fetch` records
|
|
50
|
+
House's changes on each copy's `refs/house/received`; rebase onto it, commit and run
|
|
51
|
+
`house push --owner` in the copy, through the install command in the container. An Agent runs
|
|
52
|
+
both, without `--owner`. `house upload` and `house download` move a Room's other files.
|
|
52
53
|
|
|
53
54
|
House Kit turns each audio file of your message to an Agent into text on this
|
|
54
55
|
computer before the Agent reads it. While transcription is on, the speech
|
|
55
|
-
engine and model use about 425 MB
|
|
56
|
+
engine and model use about 425 MB beside the Environment's credential; turning it off deletes them.
|
|
56
57
|
|
|
57
58
|
## License
|
|
58
59
|
|
package/dist/agents.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { client } from '@agentclientprotocol/sdk';
|
|
2
2
|
import { readFile, realpath } from 'node:fs/promises';
|
|
3
|
+
import { setTimeout as delay } from 'node:timers/promises';
|
|
3
4
|
import { startAdapter } from './acp.js';
|
|
4
5
|
import { CLIS, KIT_VERSION, below, installAdapter, installCli, locate, run, versionOf } from './clis.js';
|
|
5
6
|
import { agentBase, kitHome } from './home.js';
|
|
@@ -7,6 +8,8 @@ import { updatesItself } from './placement.js';
|
|
|
7
8
|
import { killTree } from './scope.js';
|
|
8
9
|
import { holdTranscription, transcriptionReport } from './transcription.js';
|
|
9
10
|
import { KIT_WIRE } from './wire.js';
|
|
11
|
+
// Two quiet seconds let a fresh conversation start before background model discovery competes for its CPU.
|
|
12
|
+
const MODEL_PROBE_QUIET_MS = 2_000;
|
|
10
13
|
const SIGNED_OUT = { signed_in: false, models: [], modes: [] };
|
|
11
14
|
function select(options, category) {
|
|
12
15
|
const option = options.find((candidate) => candidate.category === category);
|
|
@@ -24,6 +27,22 @@ function causeOf(error) {
|
|
|
24
27
|
function logged(error) {
|
|
25
28
|
process.stderr.write(`kit: ${causeOf(error)}\n`);
|
|
26
29
|
}
|
|
30
|
+
const LAPTOP_CHASSIS = new Set(['8', '9', '10', '14', '30', '31', '32']);
|
|
31
|
+
const DESKTOP_CHASSIS = new Set(['3', '4', '5', '6', '7', '15', '16']);
|
|
32
|
+
const SERVER_CHASSIS = new Set(['17', '18', '19', '20', '21', '22', '23', '24']);
|
|
33
|
+
export function chassisForm(value) {
|
|
34
|
+
const chassis = value.trim();
|
|
35
|
+
if (LAPTOP_CHASSIS.has(chassis))
|
|
36
|
+
return 'laptop';
|
|
37
|
+
if (DESKTOP_CHASSIS.has(chassis))
|
|
38
|
+
return 'desktop';
|
|
39
|
+
if (SERVER_CHASSIS.has(chassis))
|
|
40
|
+
return 'server';
|
|
41
|
+
return undefined;
|
|
42
|
+
}
|
|
43
|
+
export function hostVm(version) {
|
|
44
|
+
return /docker desktop|microsoft|wsl|linuxkit/i.test(version);
|
|
45
|
+
}
|
|
27
46
|
async function models(kind, adapter, known) {
|
|
28
47
|
const agent = adapter.connection.agent;
|
|
29
48
|
const opened = await agent.request('session/new', { cwd: kitHome(), mcpServers: [] });
|
|
@@ -106,6 +125,7 @@ function reported(kind, reading) {
|
|
|
106
125
|
full_access: CLIS[kind].fullAccess,
|
|
107
126
|
};
|
|
108
127
|
}
|
|
128
|
+
const NOT_READY = "the Agent's CLI is not ready on this computer";
|
|
109
129
|
function tooOld(kind, release) {
|
|
110
130
|
const cli = CLIS[kind];
|
|
111
131
|
return `${cli.bin} ${release} is older than ${cli.minimum}, the oldest this Kit runs`;
|
|
@@ -122,6 +142,22 @@ async function operatingSystem() {
|
|
|
122
142
|
const release = await readFile('/etc/os-release', 'utf8');
|
|
123
143
|
return /^PRETTY_NAME="?([^"\n]*)"?$/m.exec(release)?.[1] ?? release;
|
|
124
144
|
}
|
|
145
|
+
async function hostForm() {
|
|
146
|
+
if (process.platform === 'darwin') {
|
|
147
|
+
const battery = await run('pmset', ['-g', 'batt'], 10_000);
|
|
148
|
+
return battery.status === 0 && battery.output.includes('InternalBattery') ? 'laptop' : 'desktop';
|
|
149
|
+
}
|
|
150
|
+
if (process.platform !== 'linux')
|
|
151
|
+
return undefined;
|
|
152
|
+
const [container, version, chassis] = await Promise.all([
|
|
153
|
+
readFile('/.dockerenv', 'utf8').then(() => true).catch(() => false),
|
|
154
|
+
readFile('/proc/version', 'utf8').catch(() => ''),
|
|
155
|
+
readFile('/sys/class/dmi/id/chassis_type', 'utf8').catch(() => ''),
|
|
156
|
+
]);
|
|
157
|
+
if (container && hostVm(version))
|
|
158
|
+
return undefined;
|
|
159
|
+
return chassisForm(chassis);
|
|
160
|
+
}
|
|
125
161
|
export class Agents {
|
|
126
162
|
desired = { agents: [], routes: [], transcribe: false };
|
|
127
163
|
house;
|
|
@@ -130,10 +166,17 @@ export class Agents {
|
|
|
130
166
|
installing = Promise.resolve();
|
|
131
167
|
readings = new Map();
|
|
132
168
|
reads = new Map();
|
|
169
|
+
starts = 0;
|
|
133
170
|
sending = Promise.resolve();
|
|
134
171
|
sent = null;
|
|
135
|
-
|
|
172
|
+
refreshing = 0;
|
|
173
|
+
changed;
|
|
174
|
+
constructor(house, changed = () => undefined) {
|
|
136
175
|
this.house = house;
|
|
176
|
+
this.changed = changed;
|
|
177
|
+
}
|
|
178
|
+
idle() {
|
|
179
|
+
return this.refreshing === 0;
|
|
137
180
|
}
|
|
138
181
|
read() {
|
|
139
182
|
return this.reading.then(() => undefined, () => undefined);
|
|
@@ -142,26 +185,36 @@ export class Agents {
|
|
|
142
185
|
return this.desired.routes.find((route) => route.agent_id === agentId);
|
|
143
186
|
}
|
|
144
187
|
refresh() {
|
|
188
|
+
this.refreshing++;
|
|
189
|
+
this.changed();
|
|
145
190
|
const reading = this.read().then(async () => {
|
|
146
191
|
this.desired = await this.house.deliver('/kit/agents/desired', {});
|
|
147
192
|
return this.desired;
|
|
148
193
|
});
|
|
149
194
|
this.reading = reading;
|
|
150
|
-
|
|
195
|
+
reading
|
|
196
|
+
.then(({ agents, transcribe }) => Promise.all([
|
|
151
197
|
holdTranscription(transcribe)
|
|
152
198
|
.then((changed) => (changed ? this.report() : undefined))
|
|
153
|
-
.catch(logged)
|
|
199
|
+
.catch(logged),
|
|
154
200
|
Promise.all(agents.map((kind) => this.load(kind)))
|
|
155
201
|
.then(() => this.report())
|
|
156
|
-
.catch(logged)
|
|
202
|
+
.catch(logged),
|
|
203
|
+
]))
|
|
204
|
+
.catch(() => undefined)
|
|
205
|
+
.finally(() => {
|
|
206
|
+
this.refreshing--;
|
|
207
|
+
this.changed();
|
|
157
208
|
});
|
|
209
|
+
return reading.then(() => undefined);
|
|
158
210
|
}
|
|
159
211
|
cli(kind) {
|
|
212
|
+
this.starts += 1;
|
|
160
213
|
return this.queue(kind, async () => {
|
|
161
214
|
const resolved = await this.resolve(kind);
|
|
162
215
|
if (!('cli' in resolved)) {
|
|
163
216
|
this.update(kind, resolved);
|
|
164
|
-
throw new Error(resolved.failure
|
|
217
|
+
throw new Error(resolved.failure === null ? tooOld(kind, resolved.release) : NOT_READY);
|
|
165
218
|
}
|
|
166
219
|
const { cli, release } = resolved;
|
|
167
220
|
const known = this.readings.get(kind);
|
|
@@ -170,7 +223,7 @@ export class Agents {
|
|
|
170
223
|
this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models, modes: kept.modes });
|
|
171
224
|
}
|
|
172
225
|
const read = this.nextRead(kind);
|
|
173
|
-
|
|
226
|
+
this.quietOffer(kind, cli, kept)
|
|
174
227
|
.then((offered) => {
|
|
175
228
|
const current = this.readings.get(kind);
|
|
176
229
|
if (this.reads.get(kind) === read && current?.release === release)
|
|
@@ -257,11 +310,19 @@ export class Agents {
|
|
|
257
310
|
if (this.reads.get(kind) === current && !signal?.aborted)
|
|
258
311
|
this.readings.set(kind, reading);
|
|
259
312
|
}
|
|
313
|
+
async quietOffer(kind, cli, known) {
|
|
314
|
+
for (let seen = -1; seen !== this.starts;) {
|
|
315
|
+
seen = this.starts;
|
|
316
|
+
await delay(MODEL_PROBE_QUIET_MS);
|
|
317
|
+
}
|
|
318
|
+
return offer(kind, cli, known);
|
|
319
|
+
}
|
|
260
320
|
async load(kind) {
|
|
261
321
|
const known = this.readings.get(kind);
|
|
262
322
|
if (known !== undefined && known.failure === null && known.minimum === undefined)
|
|
263
323
|
return;
|
|
264
|
-
await this.examine(kind, SIGNED_OUT,
|
|
324
|
+
await this.examine(kind, SIGNED_OUT, (kind, cli, known) => this.quietOffer(kind, cli, known));
|
|
325
|
+
await this.report();
|
|
265
326
|
}
|
|
266
327
|
async send() {
|
|
267
328
|
const agents = this.desired.agents.flatMap((kind) => {
|
|
@@ -269,8 +330,10 @@ export class Agents {
|
|
|
269
330
|
return reading === undefined ? [] : [reported(kind, reading)];
|
|
270
331
|
});
|
|
271
332
|
const hostKey = await sshHostKey();
|
|
333
|
+
const form = await hostForm();
|
|
272
334
|
const body = {
|
|
273
335
|
os: await operatingSystem(),
|
|
336
|
+
...(form === undefined ? {} : { form }),
|
|
274
337
|
kit_version: KIT_VERSION,
|
|
275
338
|
wire: KIT_WIRE,
|
|
276
339
|
updates_itself: await updatesItself(),
|
package/dist/api.js
CHANGED
|
@@ -46,7 +46,7 @@ export async function post(house, path, body, credential, signal) {
|
|
|
46
46
|
});
|
|
47
47
|
const text = await answer.text();
|
|
48
48
|
if (!answer.ok && tooOld(text))
|
|
49
|
-
updateRequired(
|
|
49
|
+
updateRequired();
|
|
50
50
|
if (!answer.ok)
|
|
51
51
|
throw new HouseRefusal(path, answer.status, text);
|
|
52
52
|
return JSON.parse(text);
|
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/bootstrap.json
CHANGED
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
{
|
|
2
2
|
"schemaVersion": 2,
|
|
3
|
-
"version": "0.2.1-
|
|
3
|
+
"version": "0.2.1-c64c31420c9bf",
|
|
4
4
|
"hosts": {
|
|
5
5
|
"macos": {
|
|
6
6
|
"asset": {
|
|
7
7
|
"name": "connect-linux.sh",
|
|
8
|
-
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-
|
|
8
|
+
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c64c31420c9bf/connect-linux.sh"
|
|
9
9
|
}
|
|
10
10
|
},
|
|
11
11
|
"linux": {
|
|
12
12
|
"asset": {
|
|
13
13
|
"name": "connect-linux.sh",
|
|
14
|
-
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-
|
|
14
|
+
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c64c31420c9bf/connect-linux.sh"
|
|
15
15
|
}
|
|
16
16
|
},
|
|
17
17
|
"windows": {
|
|
18
18
|
"asset": {
|
|
19
19
|
"name": "connect-windows.ps1",
|
|
20
|
-
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-
|
|
20
|
+
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c64c31420c9bf/connect-windows.ps1"
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
}
|
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,7 +8,7 @@ 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';
|
|
@@ -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/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,4 +1,5 @@
|
|
|
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';
|
|
@@ -17,7 +18,7 @@ const RAW_SUBTYPES = [
|
|
|
17
18
|
'hook_started',
|
|
18
19
|
'hook_response',
|
|
19
20
|
];
|
|
20
|
-
|
|
21
|
+
async function executable(path) {
|
|
21
22
|
try {
|
|
22
23
|
await access(path, constants.X_OK);
|
|
23
24
|
return true;
|
|
@@ -54,7 +55,7 @@ export async function allowHouseInCodex(path) {
|
|
|
54
55
|
houses.push(house);
|
|
55
56
|
}
|
|
56
57
|
await mkdir(rules, { recursive: true });
|
|
57
|
-
const temporary = `${file}.${
|
|
58
|
+
const temporary = `${file}.${randomUUID()}`;
|
|
58
59
|
await writeFile(temporary, houseRule(houses));
|
|
59
60
|
await rename(temporary, file);
|
|
60
61
|
}
|
|
@@ -199,7 +200,7 @@ export async function installAdapter(kind, signal) {
|
|
|
199
200
|
const release = KIT_PACKAGE.peerDependencies[adapter.package];
|
|
200
201
|
if ((await installedAdapter(kind)) === release)
|
|
201
202
|
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
|
+
const ran = await run('npm', ['install', '--prefix', prefix(kind), '--cache', join(kitHome(), 'npm-cache'), '--no-save', '--no-audit', '--no-fund', '--omit=optional', `${adapter.package}@${release}`], INSTALL_MS, true, signal);
|
|
203
204
|
return ran.status === 0 ? null : failureOf(ran, 'npm');
|
|
204
205
|
}
|
|
205
206
|
export async function installCli(kind, signal) {
|
package/dist/conversations.js
CHANGED
|
@@ -6,7 +6,7 @@ import { unlessAborted } from './abort.js';
|
|
|
6
6
|
import { startAdapter } from './acp.js';
|
|
7
7
|
import { openBridge } from './bridge.js';
|
|
8
8
|
import { CLIS } from './clis.js';
|
|
9
|
-
import { readerFor } from './events.js';
|
|
9
|
+
import { answeredFailure, readerFor } from './events.js';
|
|
10
10
|
import { placeFiles, uploadBytes } from './files.js';
|
|
11
11
|
import { agentBase } from './home.js';
|
|
12
12
|
import { instructions } from './instructions.js';
|
|
@@ -17,6 +17,30 @@ import { createHowWeWork } from './skills.js';
|
|
|
17
17
|
import { transcribe } from './transcription.js';
|
|
18
18
|
import { workFor } from './work.js';
|
|
19
19
|
const KILLED = 'the conversation was killed';
|
|
20
|
+
const REFUSED = 'the CLI refused the prompt';
|
|
21
|
+
const NO_CONNECTION = "the Kit could not open this conversation's connection";
|
|
22
|
+
const NO_START = "the Agent's CLI did not start";
|
|
23
|
+
const NO_SESSION = "the Agent's CLI did not open a session";
|
|
24
|
+
const NO_RESUME = "the Agent's CLI could not resume this conversation";
|
|
25
|
+
const NO_SETTINGS = "the Agent's CLI refused the Agent's model, mode or effort";
|
|
26
|
+
class NotStarted extends Error {
|
|
27
|
+
}
|
|
28
|
+
async function step(reason, work) {
|
|
29
|
+
try {
|
|
30
|
+
return await work;
|
|
31
|
+
}
|
|
32
|
+
catch (error) {
|
|
33
|
+
throw new NotStarted(reason, { cause: error });
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
const EXIT_PLAN_MODE = {
|
|
37
|
+
parse(value) {
|
|
38
|
+
if (typeof value !== 'object' || value === null || Array.isArray(value)) {
|
|
39
|
+
throw new Error('_x.ai/exit_plan_mode needs an object');
|
|
40
|
+
}
|
|
41
|
+
return value;
|
|
42
|
+
},
|
|
43
|
+
};
|
|
20
44
|
export const CONVERSATION_INPUTS = new Set(['open', 'message', 'interrupt', 'kill', 'option', 'answer']);
|
|
21
45
|
function causeOf(error) {
|
|
22
46
|
return error instanceof Error ? error.message : String(error);
|
|
@@ -27,6 +51,13 @@ function answerMessage(request, response) {
|
|
|
27
51
|
function logged(error) {
|
|
28
52
|
process.stderr.write(`kit: ${causeOf(error)}\n`);
|
|
29
53
|
}
|
|
54
|
+
function refusal(conversation, error) {
|
|
55
|
+
if (conversation.kills > 0)
|
|
56
|
+
return KILLED;
|
|
57
|
+
const cause = error instanceof NotStarted ? `${error.message}: ${causeOf(error.cause)}` : causeOf(error);
|
|
58
|
+
logged(new Error(`conversation ${conversation.id} did not start: ${cause}`));
|
|
59
|
+
return causeOf(error);
|
|
60
|
+
}
|
|
30
61
|
function marker(bridge) {
|
|
31
62
|
return `HOUSE_BRIDGE=${bridge.env.HOUSE_BRIDGE}`;
|
|
32
63
|
}
|
|
@@ -203,7 +234,7 @@ export class Conversations {
|
|
|
203
234
|
return { provider_session_id: await this.start(conversation, await this.route(conversation, input.agent_id), null) };
|
|
204
235
|
}
|
|
205
236
|
catch (error) {
|
|
206
|
-
return { refused:
|
|
237
|
+
return { refused: refusal(conversation, error) };
|
|
207
238
|
}
|
|
208
239
|
}
|
|
209
240
|
async message(conversation, input) {
|
|
@@ -220,7 +251,7 @@ export class Conversations {
|
|
|
220
251
|
throw new Error(KILLED);
|
|
221
252
|
}
|
|
222
253
|
catch (error) {
|
|
223
|
-
return { ack: Promise.resolve({ refused: conversation
|
|
254
|
+
return { ack: Promise.resolve({ refused: refusal(conversation, error) }) };
|
|
224
255
|
}
|
|
225
256
|
return {
|
|
226
257
|
ack: new Promise((settle) => {
|
|
@@ -265,7 +296,7 @@ export class Conversations {
|
|
|
265
296
|
conversation.session = null;
|
|
266
297
|
await this.kill(conversation);
|
|
267
298
|
}
|
|
268
|
-
waiting.settle({ refused: conversation
|
|
299
|
+
waiting.settle({ refused: refusal(conversation, error) });
|
|
269
300
|
return;
|
|
270
301
|
}
|
|
271
302
|
this.prompt(conversation, [...prompt, ...waiting.content]);
|
|
@@ -348,9 +379,10 @@ export class Conversations {
|
|
|
348
379
|
reader.session = sessionId;
|
|
349
380
|
const app = client({ name: '@agentshouse/kit' })
|
|
350
381
|
.onRequest('session/request_permission', ({ params, signal }) => this.ask(conversation, 'session/request_permission', params, false, signal))
|
|
351
|
-
.onRequest('elicitation/create', ({ params, signal }) => this.ask(conversation, 'elicitation/create', params, asksSecret(params), signal))
|
|
382
|
+
.onRequest('elicitation/create', ({ params, signal }) => this.ask(conversation, 'elicitation/create', params, asksSecret(params), signal))
|
|
383
|
+
.onRequest('_x.ai/exit_plan_mode', EXIT_PLAN_MODE, ({ params, signal }) => this.ask(conversation, '_x.ai/exit_plan_mode', params, false, signal));
|
|
352
384
|
const cli = await unlessAborted(this.kit.agents.cli(route.kind), conversation.killed.signal);
|
|
353
|
-
const bridge = await openBridge(this.kit.house, this.kit.copies, conversation.id, conversation.killed.signal);
|
|
385
|
+
const bridge = await step(NO_CONNECTION, openBridge(this.kit.house, this.kit.copies, conversation.id, conversation.killed.signal));
|
|
354
386
|
if (conversation.kills > 0) {
|
|
355
387
|
bridge.close();
|
|
356
388
|
throw new Error(KILLED);
|
|
@@ -361,24 +393,25 @@ export class Conversations {
|
|
|
361
393
|
try {
|
|
362
394
|
await unlessAborted(createHowWeWork(bridge), conversation.killed.signal);
|
|
363
395
|
await CLIS[route.kind].allowHouse(bridge.env.PATH);
|
|
364
|
-
const
|
|
396
|
+
const streamed = await step(NO_CONNECTION, work.open(cli));
|
|
397
|
+
const adapter = await step(NO_START, startAdapter(route.kind, cli, route.working_directory, app, (message) => {
|
|
365
398
|
work.read(message);
|
|
366
399
|
this.read(conversation, reader, message);
|
|
367
|
-
}, { ...bridge.env, ...
|
|
400
|
+
}, { ...bridge.env, ...streamed }, undefined, scope));
|
|
368
401
|
void adapter.exited.then(() => bridge.close());
|
|
369
402
|
const agent = adapter.connection.agent;
|
|
370
403
|
const cwd = route.working_directory;
|
|
371
404
|
const _meta = CLIS[route.kind].sessionMeta(bridge.env.HOUSE_BRIDGE, conversation.id);
|
|
372
405
|
const opened = sessionId === null
|
|
373
|
-
? await agent.request('session/new', { cwd, mcpServers: [], _meta })
|
|
374
|
-
: { ...(await agent.request('session/resume', { sessionId, cwd, mcpServers: [], _meta })), sessionId };
|
|
406
|
+
? await step(NO_SESSION, agent.request('session/new', { cwd, mcpServers: [], _meta }))
|
|
407
|
+
: { ...(await step(NO_RESUME, agent.request('session/resume', { sessionId, cwd, mcpServers: [], _meta }))), sessionId };
|
|
375
408
|
reader.session = opened.sessionId;
|
|
376
409
|
if (sessionId === null && CLIS[route.kind].renames) {
|
|
377
410
|
const prompt = [{ type: 'text', text: `/rename ${conversation.id}` }];
|
|
378
|
-
await agent.request('session/prompt', { sessionId: opened.sessionId, prompt });
|
|
411
|
+
await step(NO_SESSION, agent.request('session/prompt', { sessionId: opened.sessionId, prompt }));
|
|
379
412
|
}
|
|
380
413
|
const running = { adapter, bridge, sessionId: opened.sessionId, killed: false, reader, work, scope };
|
|
381
|
-
const options = await this.launchSettings(running, route, opened.configOptions ?? []);
|
|
414
|
+
const options = await step(NO_SETTINGS, this.launchSettings(running, route, opened.configOptions ?? []));
|
|
382
415
|
void work.settled().then(() => scope.record());
|
|
383
416
|
conversation.running = running;
|
|
384
417
|
conversation.session = running.sessionId;
|
|
@@ -491,13 +524,15 @@ export class Conversations {
|
|
|
491
524
|
this.kit.changed();
|
|
492
525
|
return turn;
|
|
493
526
|
}
|
|
494
|
-
end(conversation, turn, failed) {
|
|
527
|
+
end(conversation, turn, failed, notice = null) {
|
|
495
528
|
if (turn.ended)
|
|
496
529
|
return;
|
|
497
530
|
if (conversation.turn === turn) {
|
|
498
531
|
for (const event of conversation.running?.reader.closeTurn() ?? [])
|
|
499
532
|
this.apply(conversation, turn, event);
|
|
500
533
|
}
|
|
534
|
+
if (notice !== null)
|
|
535
|
+
turn.parts.start({ type: 'marker', marker: 'retry', text: notice });
|
|
501
536
|
turn.ended = true;
|
|
502
537
|
conversation.open--;
|
|
503
538
|
if (conversation.turn === turn)
|
|
@@ -515,7 +550,11 @@ export class Conversations {
|
|
|
515
550
|
const running = conversation.running;
|
|
516
551
|
const turn = this.begin(conversation);
|
|
517
552
|
turn.prompted = true;
|
|
518
|
-
running.adapter.connection.agent.request('session/prompt', { sessionId: running.sessionId, prompt }).then(() =>
|
|
553
|
+
running.adapter.connection.agent.request('session/prompt', { sessionId: running.sessionId, prompt }).then((answer) => {
|
|
554
|
+
const notice = answeredFailure(answer);
|
|
555
|
+
const failed = notice ?? (answer.stopReason === 'refusal' ? REFUSED : null);
|
|
556
|
+
this.end(conversation, turn, failed === null ? null : { failed }, notice);
|
|
557
|
+
}, async (error) => {
|
|
519
558
|
if (running.adapter.connection.signal.aborted) {
|
|
520
559
|
this.end(conversation, turn, { failed: running.killed ? KILLED : await running.adapter.exited });
|
|
521
560
|
}
|