@agentshouse/kit 0.2.1-c5883630417e1 → 0.2.1-c5cb352412cd2
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 +7 -7
- package/dist/agents.js +50 -3
- package/dist/api.js +1 -1
- package/dist/bootstrap.json +4 -4
- package/dist/bridge.js +2 -5
- package/dist/chatgpt.js +7 -1
- package/dist/conversations.js +53 -14
- package/dist/copies.js +16 -8
- package/dist/end.js +3 -2
- package/dist/events.js +3 -0
- package/dist/git.js +2 -3
- package/dist/home.js +22 -13
- package/dist/house-cli.js +291 -0
- package/dist/house-main.js +7 -289
- package/dist/kit-cli.js +68 -0
- package/dist/kit-main.js +8 -67
- package/dist/login.js +13 -4
- package/dist/placement.js +2 -20
- package/dist/resident.js +2 -2
- package/dist/stream.js +58 -12
- package/dist/work.js +3 -5
- package/package.json +1 -1
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
|
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,6 +166,7 @@ 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;
|
|
@@ -172,11 +209,12 @@ export class Agents {
|
|
|
172
209
|
return reading.then(() => undefined);
|
|
173
210
|
}
|
|
174
211
|
cli(kind) {
|
|
212
|
+
this.starts += 1;
|
|
175
213
|
return this.queue(kind, async () => {
|
|
176
214
|
const resolved = await this.resolve(kind);
|
|
177
215
|
if (!('cli' in resolved)) {
|
|
178
216
|
this.update(kind, resolved);
|
|
179
|
-
throw new Error(resolved.failure
|
|
217
|
+
throw new Error(resolved.failure === null ? tooOld(kind, resolved.release) : NOT_READY);
|
|
180
218
|
}
|
|
181
219
|
const { cli, release } = resolved;
|
|
182
220
|
const known = this.readings.get(kind);
|
|
@@ -185,7 +223,7 @@ export class Agents {
|
|
|
185
223
|
this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models, modes: kept.modes });
|
|
186
224
|
}
|
|
187
225
|
const read = this.nextRead(kind);
|
|
188
|
-
|
|
226
|
+
this.quietOffer(kind, cli, kept)
|
|
189
227
|
.then((offered) => {
|
|
190
228
|
const current = this.readings.get(kind);
|
|
191
229
|
if (this.reads.get(kind) === read && current?.release === release)
|
|
@@ -272,11 +310,18 @@ export class Agents {
|
|
|
272
310
|
if (this.reads.get(kind) === current && !signal?.aborted)
|
|
273
311
|
this.readings.set(kind, reading);
|
|
274
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
|
+
}
|
|
275
320
|
async load(kind) {
|
|
276
321
|
const known = this.readings.get(kind);
|
|
277
322
|
if (known !== undefined && known.failure === null && known.minimum === undefined)
|
|
278
323
|
return;
|
|
279
|
-
await this.examine(kind, SIGNED_OUT,
|
|
324
|
+
await this.examine(kind, SIGNED_OUT, (kind, cli, known) => this.quietOffer(kind, cli, known));
|
|
280
325
|
await this.report();
|
|
281
326
|
}
|
|
282
327
|
async send() {
|
|
@@ -285,8 +330,10 @@ export class Agents {
|
|
|
285
330
|
return reading === undefined ? [] : [reported(kind, reading)];
|
|
286
331
|
});
|
|
287
332
|
const hostKey = await sshHostKey();
|
|
333
|
+
const form = await hostForm();
|
|
288
334
|
const body = {
|
|
289
335
|
os: await operatingSystem(),
|
|
336
|
+
...(form === undefined ? {} : { form }),
|
|
290
337
|
kit_version: KIT_VERSION,
|
|
291
338
|
wire: KIT_WIRE,
|
|
292
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/bootstrap.json
CHANGED
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
{
|
|
2
2
|
"schemaVersion": 2,
|
|
3
|
-
"version": "0.2.1-
|
|
3
|
+
"version": "0.2.1-c5cb352412cd2",
|
|
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-c5cb352412cd2/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-c5cb352412cd2/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-c5cb352412cd2/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
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { parseArgs } from 'node:util';
|
|
2
|
+
import { placeAppGit } from './app-git.js';
|
|
2
3
|
import { kitHome, readOwnAgent, writeOwnAgent } from './home.js';
|
|
3
4
|
import { accepted, DEFAULT_HOUSE } from './login.js';
|
|
4
5
|
const KEY_SOURCE = 'New key for a script on Connections';
|
|
@@ -17,10 +18,15 @@ export async function chatgpt(argv) {
|
|
|
17
18
|
}
|
|
18
19
|
if (values.key === undefined)
|
|
19
20
|
throw new Error(`pass --key with a key from ${KEY_SOURCE}`);
|
|
20
|
-
const
|
|
21
|
+
const before = await readOwnAgent();
|
|
22
|
+
const house = values.house ?? before?.house ?? DEFAULT_HOUSE;
|
|
21
23
|
if (!(await accepted(house, values.key)))
|
|
22
24
|
throw new Error(`${house} does not accept this key; pass one from ${KEY_SOURCE}`);
|
|
23
25
|
const relay = process.env.HOUSE_KIT_RELAY || undefined;
|
|
24
26
|
await writeOwnAgent({ house, ...(relay === undefined ? {} : { relay }), credential: values.key });
|
|
27
|
+
await placeAppGit(before, 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
|
+
}
|
|
25
31
|
process.stdout.write(`house now calls ${house} as you, with the key kept in ${kitHome()}.\n`);
|
|
26
32
|
}
|
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
|
}
|
package/dist/copies.js
CHANGED
|
@@ -15,6 +15,9 @@ const IDENTITY = { GIT_COMMITTER_NAME: 'House Kit', GIT_COMMITTER_EMAIL: 'house-
|
|
|
15
15
|
function causeOf(error) {
|
|
16
16
|
return error instanceof Error ? error.message : String(error);
|
|
17
17
|
}
|
|
18
|
+
function houseCause(error) {
|
|
19
|
+
return error instanceof HouseRefusal ? (refusalOf(error.text)?.text ?? causeOf(error)) : causeOf(error);
|
|
20
|
+
}
|
|
18
21
|
function logged(error) {
|
|
19
22
|
process.stderr.write(`kit: ${causeOf(error)}\n`);
|
|
20
23
|
}
|
|
@@ -261,7 +264,7 @@ export class LocalCopies {
|
|
|
261
264
|
}
|
|
262
265
|
catch (error) {
|
|
263
266
|
refused = true;
|
|
264
|
-
said.push(
|
|
267
|
+
said.push(houseCause(error));
|
|
265
268
|
}
|
|
266
269
|
}
|
|
267
270
|
return { refused, text: said.length === 0 ? 'Nothing new from House.' : said.join('\n') };
|
|
@@ -549,7 +552,7 @@ export class LocalCopies {
|
|
|
549
552
|
changes = await this.derived(copy, base, commit);
|
|
550
553
|
}
|
|
551
554
|
catch (error) {
|
|
552
|
-
return { refused: true, text:
|
|
555
|
+
return { refused: true, text: houseCause(error) };
|
|
553
556
|
}
|
|
554
557
|
if (changes.length === 0)
|
|
555
558
|
return { refused: false, text: `Nothing to submit: ${short(commit)} matches House.` };
|
|
@@ -576,12 +579,17 @@ export class LocalCopies {
|
|
|
576
579
|
const after = await tree(copy.repository, commit);
|
|
577
580
|
const moved = movedPaths(copy.moves, before, after);
|
|
578
581
|
const arrived = new Set(moved.values());
|
|
579
|
-
const
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
|
|
582
|
+
const arriving = [...after].filter(([path, entry]) => before.get(path) !== entry);
|
|
583
|
+
if (arriving.length > 0) {
|
|
584
|
+
const { bounds } = await this.house.post('/kit/door/discover', { prefixes: [root] });
|
|
585
|
+
const binary = [];
|
|
586
|
+
for (const [path, entry] of arriving) {
|
|
587
|
+
if (!(await isText(copy.repository, entry, bounds.max_authored_file_bytes)))
|
|
588
|
+
binary.push(path);
|
|
589
|
+
}
|
|
590
|
+
if (binary.length > 0)
|
|
591
|
+
throw new Error(textOnly(binary));
|
|
592
|
+
}
|
|
585
593
|
const text = (entry) => blobText(copy.repository, entry);
|
|
586
594
|
const changes = [];
|
|
587
595
|
for (const path of [...new Set([...before.keys(), ...after.keys()])].sort()) {
|
package/dist/end.js
CHANGED
|
@@ -13,8 +13,9 @@ export function end(reason) {
|
|
|
13
13
|
export function restart(reason) {
|
|
14
14
|
exit(reason, 1);
|
|
15
15
|
}
|
|
16
|
-
export function updateRequired(
|
|
17
|
-
|
|
16
|
+
export function updateRequired() {
|
|
17
|
+
const command = installCommand();
|
|
18
|
+
end(command === null ? 'This Kit is too old for House; install it again.' : `This Kit is too old for House. Update it: ${command}`);
|
|
18
19
|
}
|
|
19
20
|
export async function signInAgain(rejected) {
|
|
20
21
|
await forgetRejected(rejected);
|
package/dist/events.js
CHANGED
|
@@ -512,6 +512,9 @@ class GrokReader extends Reader {
|
|
|
512
512
|
return [];
|
|
513
513
|
}
|
|
514
514
|
}
|
|
515
|
+
export function answeredFailure(answer) {
|
|
516
|
+
return answer._meta?.jetbrains?.air?.sessionFailure?.title ?? null;
|
|
517
|
+
}
|
|
515
518
|
export function readerFor(kind) {
|
|
516
519
|
if (kind === 'claude-agent-acp')
|
|
517
520
|
return new ClaudeReader();
|
package/dist/git.js
CHANGED
|
@@ -49,16 +49,15 @@ export async function tree(repository, commit) {
|
|
|
49
49
|
}
|
|
50
50
|
return entries;
|
|
51
51
|
}
|
|
52
|
-
const TEXT_MAX_BYTES = 16 * 1024 * 1024;
|
|
53
52
|
async function blob(repository, object) {
|
|
54
53
|
return (await run(repository, ['cat-file', 'blob', object])).stdout;
|
|
55
54
|
}
|
|
56
55
|
export async function blobText(repository, object) {
|
|
57
56
|
return (await blob(repository, object)).toString('utf8');
|
|
58
57
|
}
|
|
59
|
-
export async function isText(repository, object) {
|
|
58
|
+
export async function isText(repository, object, maxBytes) {
|
|
60
59
|
const bytes = await blob(repository, object);
|
|
61
|
-
return bytes.length <=
|
|
60
|
+
return bytes.length <= maxBytes && isUtf8(bytes) && !bytes.includes(0);
|
|
62
61
|
}
|
|
63
62
|
export function blobId(content) {
|
|
64
63
|
const bytes = Buffer.from(content, 'utf8');
|
package/dist/home.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { randomUUID } from 'node:crypto';
|
|
2
|
-
import { accessSync, chmodSync, constants, existsSync, linkSync, lstatSync, mkdirSync, readFileSync, renameSync, rmSync } from 'node:fs';
|
|
1
|
+
import { createHash, randomUUID } from 'node:crypto';
|
|
2
|
+
import { accessSync, chmodSync, constants, existsSync, linkSync, lstatSync, mkdirSync, readFileSync, realpathSync, renameSync, rmSync } from 'node:fs';
|
|
3
3
|
import { mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
|
|
4
4
|
import { homedir, tmpdir } from 'node:os';
|
|
5
|
-
import { join } from 'node:path';
|
|
5
|
+
import { join, resolve } from 'node:path';
|
|
6
6
|
import { selectRelay } from './relay.js';
|
|
7
7
|
const ENROLMENT = 'credential.json';
|
|
8
8
|
const DISCONNECTED = 'disconnected.json';
|
|
@@ -19,24 +19,26 @@ function writable(directory) {
|
|
|
19
19
|
return false;
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
|
-
function
|
|
23
|
-
const home = join(tmpdir(), `house-kit-${process.getuid()}`);
|
|
22
|
+
function privateDirectory(path) {
|
|
24
23
|
try {
|
|
25
|
-
mkdirSync(
|
|
24
|
+
mkdirSync(path, { mode: 0o700 });
|
|
26
25
|
}
|
|
27
26
|
catch (error) {
|
|
28
27
|
if (error.code !== 'EEXIST')
|
|
29
28
|
throw error;
|
|
30
29
|
}
|
|
31
|
-
const found = lstatSync(
|
|
30
|
+
const found = lstatSync(path);
|
|
32
31
|
if (found.isSymbolicLink())
|
|
33
|
-
throw new Error(`${
|
|
32
|
+
throw new Error(`${path} is a symbolic link`);
|
|
34
33
|
if (!found.isDirectory())
|
|
35
|
-
throw new Error(`${
|
|
36
|
-
if (found.uid !== process.
|
|
37
|
-
throw new Error(`${
|
|
38
|
-
chmodSync(
|
|
39
|
-
return
|
|
34
|
+
throw new Error(`${path} is not a directory`);
|
|
35
|
+
if (found.uid !== process.geteuid())
|
|
36
|
+
throw new Error(`${path} is not owned by this User`);
|
|
37
|
+
chmodSync(path, 0o700);
|
|
38
|
+
return path;
|
|
39
|
+
}
|
|
40
|
+
function ownTemporaryHome() {
|
|
41
|
+
return privateDirectory(join(tmpdir(), `house-kit-${process.getuid()}`));
|
|
40
42
|
}
|
|
41
43
|
function defaultHome() {
|
|
42
44
|
const home = join(homedir(), '.house-kit');
|
|
@@ -45,6 +47,13 @@ function defaultHome() {
|
|
|
45
47
|
export function kitHome() {
|
|
46
48
|
return process.env.HOUSE_KIT_HOME || (defaulted ??= defaultHome());
|
|
47
49
|
}
|
|
50
|
+
export function socketDirectory() {
|
|
51
|
+
const sockets = privateDirectory(join(realpathSync('/tmp'), `hk-${process.geteuid()}`));
|
|
52
|
+
return privateDirectory(join(sockets, createHash('sha256').update(resolve(kitHome())).digest('hex').slice(0, 12)));
|
|
53
|
+
}
|
|
54
|
+
export function ownerSocket() {
|
|
55
|
+
return join(socketDirectory(), 'owner.sock');
|
|
56
|
+
}
|
|
48
57
|
export function workspaceRoot() {
|
|
49
58
|
return process.env.HOUSE_KIT_WORKSPACE ?? '/agents/house';
|
|
50
59
|
}
|