@agentshouse/kit 0.2.1-c3e4a20bb3183 → 0.2.1-cb0bd1cadcfed
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 +20 -20
- package/dist/agents.js +49 -21
- package/dist/api.js +32 -3
- package/dist/bootstrap.json +10 -17
- package/dist/bridge.js +29 -19
- package/dist/clis.js +21 -4
- package/dist/conversations.js +12 -8
- package/dist/copies.js +34 -41
- package/dist/end.js +8 -0
- package/dist/files.js +2 -1
- package/dist/home.js +15 -2
- package/dist/house-main.js +11 -12
- package/dist/instructions.js +2 -2
- package/dist/kit-main.js +4 -1
- package/dist/login.js +2 -2
- package/dist/logout.js +18 -0
- package/dist/mcp.js +2 -1
- package/dist/refusals.js +12 -0
- package/dist/relay.js +10 -0
- package/dist/resident.js +25 -6
- package/dist/secret-input.js +4 -1
- package/dist/sign-in.js +2 -1
- package/dist/skills.js +1 -1
- package/dist/stream.js +31 -5
- package/dist/transcription.js +54 -6
- package/dist/update.js +2 -0
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -6,17 +6,17 @@ through the agent CLIs you chose and gives each Agent the `house` command.
|
|
|
6
6
|
|
|
7
7
|
## Install
|
|
8
8
|
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
9
|
+
Run `curl -fsSL agents.house/kit | sh`, or `irm agents.house/kit.ps1 | iex` on
|
|
10
|
+
Windows, and again to update; options follow `sh -s --`. On macOS and Linux it
|
|
11
|
+
installs House Kit natively under your own account, without an admin password,
|
|
12
|
+
as a service that runs while you are logged in. `kit` and `house` are then on
|
|
13
|
+
your login shell's `PATH`, and your workspace is `~/AgentsHouse` unless you
|
|
14
|
+
pass `--workspace <path>`.
|
|
15
15
|
|
|
16
16
|
Add `--container` to run House Kit in one Docker container instead, with your
|
|
17
17
|
workspace mounted at `/agents/house`; your Agents then reach only that
|
|
18
18
|
workspace. On Windows 11 the container is the one choice. Append a `kit` or
|
|
19
|
-
`house` command to the container's
|
|
19
|
+
`house` command to the container's options to run it in that container.
|
|
20
20
|
Running the command for the other choice on a connected computer asks you to
|
|
21
21
|
confirm, then replaces its Environment, whose Agents end, with a new one.
|
|
22
22
|
|
|
@@ -24,14 +24,12 @@ On your own Ubuntu 26.04 server, run the Linux command with `--linux` to
|
|
|
24
24
|
install House Kit natively, with its workspace at `/agents/house`; `kit` and
|
|
25
25
|
`house` are then on the server's `PATH`.
|
|
26
26
|
|
|
27
|
-
House Kit runs the agent CLIs your login shell finds and installs a missing
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
`--no-skills` to the command to leave them out; running it again without the
|
|
34
|
-
flag brings them back.
|
|
27
|
+
House Kit runs the agent CLIs your login shell finds and installs a missing one
|
|
28
|
+
through that CLI's own installer. Running the command again offers to update
|
|
29
|
+
each CLI older than House Kit needs; add `--update-clis` to update every one to
|
|
30
|
+
its latest release without asking. House Kit also gives every Agent on the
|
|
31
|
+
Environment a set of agent skills. Add `--no-skills` to the command to leave
|
|
32
|
+
them out; running it again without the flag brings them back.
|
|
35
33
|
|
|
36
34
|
## Commands
|
|
37
35
|
|
|
@@ -40,17 +38,19 @@ Environment's credential in `~/.house-kit`, or in `$HOUSE_KIT_HOME` when it is
|
|
|
40
38
|
set. Pass `--manual` to paste the code by hand on a machine without a browser,
|
|
41
39
|
and `--environment <id>` to reconnect an Environment you already have. It also
|
|
42
40
|
connects your own agent: `house <tool>` run outside an Agent conversation calls
|
|
43
|
-
House as you, until you revoke that connection on Connections.
|
|
41
|
+
House as you, until you revoke that connection on Connections. `house help`
|
|
42
|
+
lists the Tools. `kit logout` disconnects this computer and stops House Kit; a
|
|
43
|
+
later `kit login` reconnects the same Environment.
|
|
44
44
|
|
|
45
45
|
`kit resident` keeps the Environment connected, and keeps the Rooms you chose
|
|
46
46
|
for this Environment as Git repositories under `local-copies` in the
|
|
47
|
-
workspace. Commit in one and run `house
|
|
47
|
+
workspace. Commit in one and run `house push --owner` there to send the
|
|
48
48
|
commit to House; in the container, run it through the install command from the
|
|
49
|
-
copy's directory. Inside an Agent conversation the Agent runs `house
|
|
49
|
+
copy's directory. Inside an Agent conversation the Agent runs `house push`.
|
|
50
50
|
|
|
51
51
|
House Kit turns each audio file of your message to an Agent into text on this
|
|
52
|
-
computer before the Agent reads
|
|
53
|
-
|
|
52
|
+
computer before the Agent reads it. While transcription is on, the speech
|
|
53
|
+
engine and model use about 425 MB in `~/.house-kit`; turning it off deletes them.
|
|
54
54
|
|
|
55
55
|
## License
|
|
56
56
|
|
package/dist/agents.js
CHANGED
|
@@ -3,13 +3,17 @@ import { readFile, realpath } from 'node:fs/promises';
|
|
|
3
3
|
import { killTree, startAdapter } from './acp.js';
|
|
4
4
|
import { CLIS, KIT_VERSION, below, installAdapter, installCli, locate, run, versionOf } from './clis.js';
|
|
5
5
|
import { agentBase, kitHome } from './home.js';
|
|
6
|
-
|
|
6
|
+
import { holdTranscription, transcriptionReport } from './transcription.js';
|
|
7
|
+
const SIGNED_OUT = { signed_in: false, models: [], modes: [] };
|
|
7
8
|
function select(options, category) {
|
|
8
9
|
const option = options.find((candidate) => candidate.category === category);
|
|
9
10
|
return option?.type === 'select' ? option : undefined;
|
|
10
11
|
}
|
|
12
|
+
function choices(options) {
|
|
13
|
+
return options.flatMap((entry) => ('group' in entry ? entry.options : [entry]));
|
|
14
|
+
}
|
|
11
15
|
function values(options) {
|
|
12
|
-
return
|
|
16
|
+
return choices(options).map((entry) => entry.value);
|
|
13
17
|
}
|
|
14
18
|
function causeOf(error) {
|
|
15
19
|
return error instanceof Error ? error.message : String(error);
|
|
@@ -21,9 +25,11 @@ async function models(kind, adapter, known) {
|
|
|
21
25
|
const agent = adapter.connection.agent;
|
|
22
26
|
const opened = await agent.request('session/new', { cwd: kitHome(), mcpServers: [] });
|
|
23
27
|
let options = opened.configOptions ?? [];
|
|
28
|
+
const mode = select(options, 'mode');
|
|
29
|
+
const modes = mode === undefined ? [] : choices(mode.options).map(({ value, name }) => ({ mode: value, name }));
|
|
24
30
|
const model = select(options, 'model');
|
|
25
31
|
if (model === undefined)
|
|
26
|
-
return [];
|
|
32
|
+
return { models: [], modes };
|
|
27
33
|
const offered = [];
|
|
28
34
|
for (const value of values(model.options)) {
|
|
29
35
|
if (select(options, 'model')?.currentValue !== value) {
|
|
@@ -39,10 +45,18 @@ async function models(kind, adapter, known) {
|
|
|
39
45
|
const effort = select(options, 'thought_level');
|
|
40
46
|
offered.push({ model: value, efforts: effort === undefined ? [] : values(effort.options) });
|
|
41
47
|
}
|
|
42
|
-
return offered;
|
|
48
|
+
return { models: offered, modes };
|
|
49
|
+
}
|
|
50
|
+
async function signedIn(kind, cli, known) {
|
|
51
|
+
const probe = CLIS[kind].signedIn;
|
|
52
|
+
// A sign-in check that has not answered in half a minute counts as signed out rather than stalling the report.
|
|
53
|
+
if ('command' in probe)
|
|
54
|
+
return (await run(cli, probe.command, 30_000)).status === 0;
|
|
55
|
+
return (await offer(kind, cli, known)).signed_in;
|
|
43
56
|
}
|
|
44
57
|
async function offer(kind, cli, known) {
|
|
45
58
|
const probe = CLIS[kind].signedIn;
|
|
59
|
+
// A sign-in check that has not answered in half a minute counts as signed out rather than stalling the report.
|
|
46
60
|
if ('command' in probe && (await run(cli, probe.command, 30_000)).status !== 0)
|
|
47
61
|
return SIGNED_OUT;
|
|
48
62
|
let adapter;
|
|
@@ -53,11 +67,15 @@ async function offer(kind, cli, known) {
|
|
|
53
67
|
if (typeof method !== 'string' || method.length === 0)
|
|
54
68
|
return SIGNED_OUT;
|
|
55
69
|
}
|
|
56
|
-
return { signed_in: true,
|
|
70
|
+
return { signed_in: true, ...(await models(kind, adapter, known.models)) };
|
|
57
71
|
}
|
|
58
72
|
catch (error) {
|
|
59
73
|
process.stderr.write(`kit: ${kind} did not offer its models: ${causeOf(error)}\n`);
|
|
60
|
-
return {
|
|
74
|
+
return {
|
|
75
|
+
signed_in: adapter === undefined && 'initializeMeta' in probe ? known.signed_in : true,
|
|
76
|
+
models: known.models,
|
|
77
|
+
modes: known.modes,
|
|
78
|
+
};
|
|
61
79
|
}
|
|
62
80
|
finally {
|
|
63
81
|
if (adapter !== undefined)
|
|
@@ -72,6 +90,8 @@ function reported(kind, reading) {
|
|
|
72
90
|
failure: reading.failure,
|
|
73
91
|
signed_in: reading.signed_in,
|
|
74
92
|
models: reading.models,
|
|
93
|
+
modes: reading.modes,
|
|
94
|
+
full_access: CLIS[kind].fullAccess,
|
|
75
95
|
};
|
|
76
96
|
}
|
|
77
97
|
function tooOld(kind, release) {
|
|
@@ -79,17 +99,19 @@ function tooOld(kind, release) {
|
|
|
79
99
|
return `${cli.bin} ${release} is older than ${cli.minimum}, the oldest this Kit runs`;
|
|
80
100
|
}
|
|
81
101
|
async function sshHostKey() {
|
|
102
|
+
// Listing a local host key takes a moment, so ten seconds only bounds a stuck ssh-keygen.
|
|
82
103
|
const listed = await run('ssh-keygen', ['-l', '-E', 'sha256', '-f', '/etc/ssh/ssh_host_ed25519_key.pub'], 10_000);
|
|
83
104
|
return listed.status === 0 ? (/^\d+ (SHA256:\S+)/.exec(listed.output)?.[1] ?? null) : null;
|
|
84
105
|
}
|
|
85
106
|
async function operatingSystem() {
|
|
107
|
+
// sw_vers answers at once, so ten seconds only bounds a stuck call.
|
|
86
108
|
if (process.platform === 'darwin')
|
|
87
109
|
return `macOS ${(await run('sw_vers', ['-productVersion'], 10_000)).output.trim()}`;
|
|
88
110
|
const release = await readFile('/etc/os-release', 'utf8');
|
|
89
111
|
return /^PRETTY_NAME="?([^"\n]*)"?$/m.exec(release)?.[1] ?? release;
|
|
90
112
|
}
|
|
91
113
|
export class Agents {
|
|
92
|
-
desired = { agents: [], routes: [] };
|
|
114
|
+
desired = { agents: [], routes: [], transcribe: false };
|
|
93
115
|
house;
|
|
94
116
|
reading = Promise.resolve();
|
|
95
117
|
queues = new Map();
|
|
@@ -113,8 +135,11 @@ export class Agents {
|
|
|
113
135
|
return this.desired;
|
|
114
136
|
});
|
|
115
137
|
this.reading = reading;
|
|
116
|
-
return reading.then(({ agents }) => {
|
|
117
|
-
|
|
138
|
+
return reading.then(({ agents, transcribe }) => {
|
|
139
|
+
holdTranscription(transcribe)
|
|
140
|
+
.then((changed) => (changed ? this.report() : undefined))
|
|
141
|
+
.catch(logged);
|
|
142
|
+
Promise.all(agents.map((kind) => this.load(kind)))
|
|
118
143
|
.then(() => this.report())
|
|
119
144
|
.catch(logged);
|
|
120
145
|
});
|
|
@@ -130,7 +155,7 @@ export class Agents {
|
|
|
130
155
|
const known = this.readings.get(kind);
|
|
131
156
|
const kept = known?.release === null || known?.minimum !== undefined ? SIGNED_OUT : (known ?? SIGNED_OUT);
|
|
132
157
|
if (known?.release !== release || known.minimum !== undefined) {
|
|
133
|
-
this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models });
|
|
158
|
+
this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models, modes: kept.modes });
|
|
134
159
|
}
|
|
135
160
|
const read = this.nextRead(kind);
|
|
136
161
|
offer(kind, cli, kept)
|
|
@@ -147,10 +172,12 @@ export class Agents {
|
|
|
147
172
|
return this.queue(kind, () => this.ensure(kind));
|
|
148
173
|
}
|
|
149
174
|
async reread(kind) {
|
|
150
|
-
await this.
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
175
|
+
await this.examine(kind, this.readings.get(kind) ?? SIGNED_OUT, offer);
|
|
176
|
+
await this.report();
|
|
177
|
+
}
|
|
178
|
+
async recheck(kind) {
|
|
179
|
+
const known = this.readings.get(kind) ?? SIGNED_OUT;
|
|
180
|
+
await this.examine(kind, known, async (kind, cli) => (await signedIn(kind, cli, known)) ? { ...known, signed_in: true } : SIGNED_OUT);
|
|
154
181
|
await this.report();
|
|
155
182
|
}
|
|
156
183
|
report() {
|
|
@@ -207,18 +234,18 @@ export class Agents {
|
|
|
207
234
|
return { release, minimum, failure: null, ...SIGNED_OUT };
|
|
208
235
|
return { cli, release };
|
|
209
236
|
}
|
|
210
|
-
async examine(kind, known) {
|
|
211
|
-
const
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
237
|
+
async examine(kind, known, read) {
|
|
238
|
+
const current = this.nextRead(kind);
|
|
239
|
+
const resolved = await this.queue(kind, () => this.resolve(kind));
|
|
240
|
+
const reading = 'cli' in resolved ? { release: resolved.release, failure: null, ...(await read(kind, resolved.cli, known)) } : resolved;
|
|
241
|
+
if (this.reads.get(kind) === current)
|
|
242
|
+
this.readings.set(kind, reading);
|
|
215
243
|
}
|
|
216
244
|
async load(kind) {
|
|
217
245
|
const known = this.readings.get(kind);
|
|
218
246
|
if (known !== undefined && known.failure === null)
|
|
219
247
|
return;
|
|
220
|
-
this.
|
|
221
|
-
this.readings.set(kind, await this.examine(kind, SIGNED_OUT));
|
|
248
|
+
await this.examine(kind, SIGNED_OUT, offer);
|
|
222
249
|
}
|
|
223
250
|
async send() {
|
|
224
251
|
const agents = this.desired.agents.flatMap((kind) => {
|
|
@@ -231,6 +258,7 @@ export class Agents {
|
|
|
231
258
|
kit_version: KIT_VERSION,
|
|
232
259
|
agent_base: agentBase(),
|
|
233
260
|
agents,
|
|
261
|
+
transcription: transcriptionReport(),
|
|
234
262
|
...(hostKey === null ? {} : { ssh_host_key: hostKey }),
|
|
235
263
|
};
|
|
236
264
|
const state = JSON.stringify(body);
|
package/dist/api.js
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
|
+
import { setTimeout as delay } from 'node:timers/promises';
|
|
2
|
+
import { end, SIGN_IN_AGAIN } from './end.js';
|
|
1
3
|
import { readEnrolment } from './home.js';
|
|
4
|
+
import { retryable } from './refusals.js';
|
|
5
|
+
import { relayed } from './relay.js';
|
|
2
6
|
export class HouseRefusal extends Error {
|
|
3
7
|
status;
|
|
4
8
|
text;
|
|
@@ -8,11 +12,28 @@ export class HouseRefusal extends Error {
|
|
|
8
12
|
this.text = text;
|
|
9
13
|
}
|
|
10
14
|
}
|
|
15
|
+
export function finalRefusal(error) {
|
|
16
|
+
return error instanceof HouseRefusal && retryable(error.text) === false;
|
|
17
|
+
}
|
|
11
18
|
export function retryDelay(attempt) {
|
|
19
|
+
// Full jitter, doubling from one second to a 30-second cap, spreads the Kits one outage dropped and retries within half a minute of House's return.
|
|
12
20
|
return Math.random() * Math.min(30_000, 1000 * 2 ** attempt);
|
|
13
21
|
}
|
|
22
|
+
export async function retrying(sent, signal) {
|
|
23
|
+
for (let attempt = 0;; attempt++) {
|
|
24
|
+
try {
|
|
25
|
+
return await sent();
|
|
26
|
+
}
|
|
27
|
+
catch (error) {
|
|
28
|
+
if (!(error instanceof HouseRefusal) || retryable(error.text) !== true)
|
|
29
|
+
throw error;
|
|
30
|
+
}
|
|
31
|
+
// A request House refused as retryable is sent again on the jittered curve.
|
|
32
|
+
await delay(retryDelay(attempt), undefined, { signal });
|
|
33
|
+
}
|
|
34
|
+
}
|
|
14
35
|
export async function post(house, path, body, credential, signal) {
|
|
15
|
-
const answer = await fetch(new URL(path, house), {
|
|
36
|
+
const answer = await fetch(relayed(new URL(path, house)), {
|
|
16
37
|
method: 'POST',
|
|
17
38
|
headers: {
|
|
18
39
|
'content-type': 'application/json',
|
|
@@ -28,7 +49,14 @@ export async function post(house, path, body, credential, signal) {
|
|
|
28
49
|
}
|
|
29
50
|
async function enrolledPost(path, body, signal) {
|
|
30
51
|
const { house, credential } = (await readEnrolment());
|
|
31
|
-
|
|
52
|
+
try {
|
|
53
|
+
return await post(house, path, body, credential, signal);
|
|
54
|
+
}
|
|
55
|
+
catch (error) {
|
|
56
|
+
if (error instanceof HouseRefusal && error.status === 401)
|
|
57
|
+
end(SIGN_IN_AGAIN);
|
|
58
|
+
throw error;
|
|
59
|
+
}
|
|
32
60
|
}
|
|
33
61
|
export const house = {
|
|
34
62
|
post: enrolledPost,
|
|
@@ -38,9 +66,10 @@ export const house = {
|
|
|
38
66
|
return await enrolledPost(path, body);
|
|
39
67
|
}
|
|
40
68
|
catch (error) {
|
|
41
|
-
if (error
|
|
69
|
+
if (finalRefusal(error))
|
|
42
70
|
throw error;
|
|
43
71
|
process.stderr.write(`kit: ${path} did not reach House: ${error.message}\n`);
|
|
72
|
+
// A delivery House did not take is sent again on the jittered curve for as long as it is still current.
|
|
44
73
|
await new Promise((resolve) => setTimeout(resolve, retryDelay(attempt)));
|
|
45
74
|
if (!current())
|
|
46
75
|
throw error;
|
package/dist/bootstrap.json
CHANGED
|
@@ -1,30 +1,23 @@
|
|
|
1
1
|
{
|
|
2
|
-
"schemaVersion":
|
|
3
|
-
"version": "0.2.1-
|
|
2
|
+
"schemaVersion": 2,
|
|
3
|
+
"version": "0.2.1-cb0bd1cadcfed",
|
|
4
4
|
"hosts": {
|
|
5
|
+
"macos": {
|
|
6
|
+
"asset": {
|
|
7
|
+
"name": "connect-linux.sh",
|
|
8
|
+
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-cb0bd1cadcfed/connect-linux.sh"
|
|
9
|
+
}
|
|
10
|
+
},
|
|
5
11
|
"linux": {
|
|
6
|
-
"command": "bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.2.1-c3e4a20bb3183/connect-linux.sh)",
|
|
7
12
|
"asset": {
|
|
8
13
|
"name": "connect-linux.sh",
|
|
9
|
-
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-
|
|
10
|
-
},
|
|
11
|
-
"workspace": {
|
|
12
|
-
"argument": "--workspace",
|
|
13
|
-
"quoting": "posix"
|
|
14
|
-
},
|
|
15
|
-
"container": {
|
|
16
|
-
"argument": "--container"
|
|
14
|
+
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-cb0bd1cadcfed/connect-linux.sh"
|
|
17
15
|
}
|
|
18
16
|
},
|
|
19
17
|
"windows": {
|
|
20
|
-
"command": "& ([scriptblock]::Create((irm https://github.com/agentshouse/kit/releases/download/v0.2.1-c3e4a20bb3183/connect-windows.ps1)))",
|
|
21
18
|
"asset": {
|
|
22
19
|
"name": "connect-windows.ps1",
|
|
23
|
-
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-
|
|
24
|
-
},
|
|
25
|
-
"workspace": {
|
|
26
|
-
"argument": "--workspace",
|
|
27
|
-
"quoting": "powershell"
|
|
20
|
+
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-cb0bd1cadcfed/connect-windows.ps1"
|
|
28
21
|
}
|
|
29
22
|
}
|
|
30
23
|
}
|
package/dist/bridge.js
CHANGED
|
@@ -6,13 +6,14 @@ import { createServer, request as httpRequest } from 'node:http';
|
|
|
6
6
|
import { request as httpsRequest } from 'node:https';
|
|
7
7
|
import { delimiter, dirname, join } from 'node:path';
|
|
8
8
|
import { parse } from 'yaml';
|
|
9
|
-
import { HouseRefusal, retryDelay } from './api.js';
|
|
9
|
+
import { finalRefusal, HouseRefusal, retryDelay, retrying } from './api.js';
|
|
10
10
|
import { loginPath } from './clis.js';
|
|
11
11
|
import { changedPaths, } from './copies.js';
|
|
12
12
|
import { kitHome, readEnrolment } from './home.js';
|
|
13
13
|
import { callHouse, mcpBody, rpc, UNREACHABLE } from './mcp.js';
|
|
14
14
|
import { operationId, uuidOf } from './operation.js';
|
|
15
|
-
import { refusalOf } from './refusals.js';
|
|
15
|
+
import { refusalOf, retryable } from './refusals.js';
|
|
16
|
+
import { relayed } from './relay.js';
|
|
16
17
|
const MCP_REQUEST_BYTES = 4 * 1024 * 1024;
|
|
17
18
|
const ATTACHMENTS = '/kit/attachments/upload';
|
|
18
19
|
export async function received(request) {
|
|
@@ -22,7 +23,8 @@ export async function received(request) {
|
|
|
22
23
|
text += chunk;
|
|
23
24
|
return text;
|
|
24
25
|
}
|
|
25
|
-
function relay(request, response,
|
|
26
|
+
function relay(request, response, house, authorization) {
|
|
27
|
+
const target = relayed(house);
|
|
26
28
|
const send = target.protocol === 'https:' ? httpsRequest : httpRequest;
|
|
27
29
|
const forwarded = send(target, {
|
|
28
30
|
method: request.method,
|
|
@@ -38,8 +40,6 @@ function refusalIn(text, status) {
|
|
|
38
40
|
return refusalOf(text) ?? { code: '', text: text === '' ? `House refused it with ${status}` : text, conflicts: [] };
|
|
39
41
|
}
|
|
40
42
|
function answered(forwarded) {
|
|
41
|
-
if (forwarded.status >= 500)
|
|
42
|
-
throw new HouseRefusal('/', forwarded.status, forwarded.text);
|
|
43
43
|
if (forwarded.status !== 200)
|
|
44
44
|
return { refused: refusalIn(forwarded.text, forwarded.status) };
|
|
45
45
|
const answer = JSON.parse(forwarded.text);
|
|
@@ -63,8 +63,8 @@ function pendingSeconds(forwarded) {
|
|
|
63
63
|
function resendAfter(forwarded, attempt) {
|
|
64
64
|
if (forwarded === null)
|
|
65
65
|
return retryDelay(attempt);
|
|
66
|
-
if (forwarded.status
|
|
67
|
-
return
|
|
66
|
+
if (forwarded.status !== 200)
|
|
67
|
+
return retryable(forwarded.text) === false ? null : retryDelay(attempt);
|
|
68
68
|
const seconds = pendingSeconds(forwarded);
|
|
69
69
|
return seconds === null ? null : seconds * 1000;
|
|
70
70
|
}
|
|
@@ -103,6 +103,7 @@ export async function openBridge(house, copies, conversationId, signal) {
|
|
|
103
103
|
const after = resendAfter(forwarded, attempt);
|
|
104
104
|
if (after === null)
|
|
105
105
|
return forwarded;
|
|
106
|
+
// A write House did not settle is sent again on the jittered curve, or after the wait House names for a pending one.
|
|
106
107
|
await delay(after, undefined, { signal: closed.signal });
|
|
107
108
|
}
|
|
108
109
|
};
|
|
@@ -117,17 +118,26 @@ export async function openBridge(house, copies, conversationId, signal) {
|
|
|
117
118
|
if ('refused' in prepared)
|
|
118
119
|
return prepared;
|
|
119
120
|
const { transfer } = parse(prepared.text);
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
121
|
+
let text;
|
|
122
|
+
try {
|
|
123
|
+
text = await retrying(async () => {
|
|
124
|
+
const posted = await fetch(relayed(transfer.url), {
|
|
125
|
+
method: 'POST',
|
|
126
|
+
headers: { 'content-type': 'text/plain; charset=utf-8' },
|
|
127
|
+
body: Buffer.concat([Buffer.from(`${transfer.operation}\n`), bytes]),
|
|
128
|
+
signal: closed.signal,
|
|
129
|
+
});
|
|
130
|
+
const answer = await posted.text();
|
|
131
|
+
if (!posted.ok)
|
|
132
|
+
throw new HouseRefusal('/', posted.status, answer);
|
|
133
|
+
return answer;
|
|
134
|
+
}, closed.signal);
|
|
135
|
+
}
|
|
136
|
+
catch (error) {
|
|
137
|
+
if (!finalRefusal(error))
|
|
138
|
+
throw error;
|
|
139
|
+
return { refused: refusalIn(error.text, error.status) };
|
|
140
|
+
}
|
|
131
141
|
const held = JSON.parse(text).transfer;
|
|
132
142
|
return { url: held.url, operation: held.operation, bytes: bytes.length, sha256 };
|
|
133
143
|
};
|
|
@@ -150,7 +160,7 @@ export async function openBridge(house, copies, conversationId, signal) {
|
|
|
150
160
|
const tool = message.method === 'tools/call' ? String(message.params.name) : null;
|
|
151
161
|
return send(message, tool !== null && (await writes(tool)) ? operationId() : null);
|
|
152
162
|
}
|
|
153
|
-
const answer = await fetch(new URL(path, origin), {
|
|
163
|
+
const answer = await fetch(relayed(new URL(path, origin)), {
|
|
154
164
|
method: 'POST',
|
|
155
165
|
headers: { 'content-type': 'application/json', authorization: `Bearer ${credential}` },
|
|
156
166
|
body: versioned(conversationId, text),
|
package/dist/clis.js
CHANGED
|
@@ -1,10 +1,16 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
2
|
import { readFileSync } from 'node:fs';
|
|
3
|
-
import { readFile } from 'node:fs/promises';
|
|
4
|
-
import { userInfo } from 'node:os';
|
|
3
|
+
import { mkdir, readFile, writeFile } from 'node:fs/promises';
|
|
4
|
+
import { homedir, userInfo } from 'node:os';
|
|
5
5
|
import { join } from 'node:path';
|
|
6
6
|
import { kitHome } from './home.js';
|
|
7
7
|
const RUNNING_JOB = new Set(['running', 'paused']);
|
|
8
|
+
async function allowHouseInCodex() {
|
|
9
|
+
const rules = join(process.env.CODEX_HOME || join(homedir(), '.codex'), 'rules');
|
|
10
|
+
await mkdir(rules, { recursive: true });
|
|
11
|
+
await writeFile(join(rules, 'house.rules'), 'prefix_rule(pattern = ["house"], decision = "allow")\n');
|
|
12
|
+
}
|
|
13
|
+
async function nothing() { }
|
|
8
14
|
function threadStatus({ method, params }) {
|
|
9
15
|
if (method !== 'session/update' || params?.update?.sessionUpdate !== 'session_info_update')
|
|
10
16
|
return undefined;
|
|
@@ -36,6 +42,9 @@ export const CLIS = {
|
|
|
36
42
|
install: 'curl -fsSL https://chatgpt.com/codex/install.sh | sh',
|
|
37
43
|
adapter: { package: '@agentclientprotocol/codex-acp', bin: 'codex-acp', executable: 'CODEX_PATH', env: {} },
|
|
38
44
|
args: [],
|
|
45
|
+
fullAccess: 'agent-full-access',
|
|
46
|
+
sessionMeta: {},
|
|
47
|
+
allowHouse: allowHouseInCodex,
|
|
39
48
|
signedIn: { command: ['login', 'status'] },
|
|
40
49
|
login: { args: ['login', '--device-auth'], code: 'show' },
|
|
41
50
|
queues: false,
|
|
@@ -52,9 +61,12 @@ export const CLIS = {
|
|
|
52
61
|
package: '@agentclientprotocol/claude-agent-acp',
|
|
53
62
|
bin: 'claude-agent-acp',
|
|
54
63
|
executable: 'CLAUDE_CODE_EXECUTABLE',
|
|
55
|
-
env: { CLAUDE_CODE_ENTRYPOINT: 'claude-agent-acp' },
|
|
64
|
+
env: { CLAUDE_CODE_ENTRYPOINT: 'claude-agent-acp', IS_SANDBOX: '1' },
|
|
56
65
|
},
|
|
57
66
|
args: [],
|
|
67
|
+
fullAccess: 'bypassPermissions',
|
|
68
|
+
sessionMeta: { claudeCode: { options: { allowedTools: ['Bash(house:*)'] } } },
|
|
69
|
+
allowHouse: nothing,
|
|
58
70
|
signedIn: { command: ['auth', 'status'] },
|
|
59
71
|
login: { args: ['auth', 'login', '--claudeai'], code: 'collect', rejected: 'Invalid code' },
|
|
60
72
|
queues: false,
|
|
@@ -70,7 +82,10 @@ export const CLIS = {
|
|
|
70
82
|
minimum: '1.0.46',
|
|
71
83
|
install: 'curl -fsSL https://x.ai/cli/install.sh | bash',
|
|
72
84
|
adapter: null,
|
|
73
|
-
args: ['agent', '--no-leader', 'stdio'],
|
|
85
|
+
args: ['agent', '--always-approve', '--no-leader', 'stdio'],
|
|
86
|
+
fullAccess: null,
|
|
87
|
+
sessionMeta: {},
|
|
88
|
+
allowHouse: nothing,
|
|
74
89
|
signedIn: { initializeMeta: 'defaultAuthMethodId' },
|
|
75
90
|
login: { args: ['login', '--device-auth'], code: 'show' },
|
|
76
91
|
queues: true,
|
|
@@ -90,7 +105,9 @@ const KIT_PACKAGE = JSON.parse(readFileSync(new URL('../package.json', import.me
|
|
|
90
105
|
export const KIT_VERSION = KIT_PACKAGE.version;
|
|
91
106
|
const PROXY = /^https?_proxy$/i;
|
|
92
107
|
const VERSION = /\d+\.\d+\.\d+(?:-[0-9A-Za-z.]+)?/;
|
|
108
|
+
// An install still running after fifteen minutes is ended and reported as failed, so a hung download cannot hold its CLI's report.
|
|
93
109
|
const INSTALL_MS = 15 * 60_000;
|
|
110
|
+
// A login shell or a version read is ended after half a minute, so a profile that waits for input cannot stall the report.
|
|
94
111
|
const READ_MS = 30_000;
|
|
95
112
|
const CAUSE_CHARACTERS = 4000;
|
|
96
113
|
function prefix(kind) {
|
package/dist/conversations.js
CHANGED
|
@@ -209,7 +209,7 @@ export class Conversations {
|
|
|
209
209
|
continue;
|
|
210
210
|
try {
|
|
211
211
|
const text = await transcribe(path, AbortSignal.any([conversation.killed.signal, conversation.interrupted.signal]));
|
|
212
|
-
if (text !== '')
|
|
212
|
+
if (text !== null && text !== '')
|
|
213
213
|
lines.push(`Transcript: ${text}`);
|
|
214
214
|
}
|
|
215
215
|
catch (error) {
|
|
@@ -285,13 +285,15 @@ export class Conversations {
|
|
|
285
285
|
conversation.opening = bridge;
|
|
286
286
|
try {
|
|
287
287
|
await unlessAborted(createHowWeWork(bridge), conversation.killed.signal);
|
|
288
|
+
await CLIS[route.kind].allowHouse();
|
|
288
289
|
const adapter = await startAdapter(route.kind, cli, route.working_directory, app, (job) => this.job(conversation, job), bridge.env);
|
|
289
290
|
void adapter.exited.then(() => bridge.close());
|
|
290
291
|
const agent = adapter.connection.agent;
|
|
291
292
|
const cwd = route.working_directory;
|
|
293
|
+
const _meta = CLIS[route.kind].sessionMeta;
|
|
292
294
|
const opened = sessionId === null
|
|
293
|
-
? await agent.request('session/new', { cwd, mcpServers: [] })
|
|
294
|
-
: { ...(await agent.request('session/resume', { sessionId, cwd, mcpServers: [] })), sessionId };
|
|
295
|
+
? await agent.request('session/new', { cwd, mcpServers: [], _meta })
|
|
296
|
+
: { ...(await agent.request('session/resume', { sessionId, cwd, mcpServers: [], _meta })), sessionId };
|
|
295
297
|
const running = {
|
|
296
298
|
adapter,
|
|
297
299
|
bridge,
|
|
@@ -321,6 +323,7 @@ export class Conversations {
|
|
|
321
323
|
async launchSettings(running, route, offered) {
|
|
322
324
|
let options = offered;
|
|
323
325
|
const settings = [
|
|
326
|
+
['mode', route.mode ?? CLIS[route.kind].fullAccess],
|
|
324
327
|
['model', route.model],
|
|
325
328
|
['thought_level', route.effort],
|
|
326
329
|
];
|
|
@@ -389,10 +392,8 @@ export class Conversations {
|
|
|
389
392
|
turn.admitted = true;
|
|
390
393
|
for (const note of turn.notes.splice(0))
|
|
391
394
|
this.kit.send(note);
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
this.draft(conversation, turn);
|
|
395
|
-
}
|
|
395
|
+
turn.unsentFrom = 0;
|
|
396
|
+
this.draft(conversation, turn);
|
|
396
397
|
if (turn.entries !== null)
|
|
397
398
|
this.plan(conversation, turn);
|
|
398
399
|
}
|
|
@@ -442,8 +443,11 @@ export class Conversations {
|
|
|
442
443
|
this.attach(conversation.turn ?? this.begin(conversation), sent);
|
|
443
444
|
}
|
|
444
445
|
running.adapter.connection.agent.request('session/prompt', { sessionId: running.sessionId, prompt }).then(() => this.answered(conversation, sent, null), async (error) => {
|
|
445
|
-
if (!running.adapter.connection.signal.aborted)
|
|
446
|
+
if (!running.adapter.connection.signal.aborted) {
|
|
446
447
|
this.answered(conversation, sent, causeOf(error));
|
|
448
|
+
if (conversation.open === 0 && conversation.running === running)
|
|
449
|
+
stop(running.bridge);
|
|
450
|
+
}
|
|
447
451
|
else if (sent.turn !== null) {
|
|
448
452
|
this.end(conversation, sent.turn, { failed: running.killed ? KILLED : await running.adapter.exited });
|
|
449
453
|
}
|