@agentshouse/kit 0.2.1-cd9cbd8b6428c → 0.2.1-cfe564e35b4a5
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 -19
- package/dist/acp.js +16 -93
- package/dist/agents.js +81 -39
- package/dist/api.js +30 -2
- package/dist/app-git.js +64 -0
- package/dist/bootstrap.json +4 -4
- package/dist/bridge.js +35 -52
- package/dist/clis.js +95 -65
- package/dist/codex-main.js +58 -0
- package/dist/conversations.js +284 -236
- package/dist/copies.js +146 -129
- package/dist/end.js +8 -0
- package/dist/events.js +521 -0
- package/dist/files.js +14 -0
- package/dist/house-main.js +41 -12
- package/dist/instructions.js +4 -3
- package/dist/kit-main.js +3 -0
- package/dist/login.js +23 -98
- package/dist/logout.js +16 -13
- package/dist/parts.js +64 -0
- package/dist/refusals.js +12 -0
- package/dist/resident.js +24 -22
- package/dist/scope.js +203 -0
- package/dist/secret-input.js +4 -1
- package/dist/shell.js +3 -0
- package/dist/sign-in.js +34 -9
- package/dist/skills.js +1 -1
- package/dist/stream.js +29 -4
- package/dist/transcription.js +54 -6
- package/dist/update.js +2 -0
- package/dist/work.js +348 -0
- package/package.json +2 -2
- package/dist/blocks.js +0 -51
package/README.md
CHANGED
|
@@ -33,27 +33,27 @@ them out; running it again without the flag brings them back.
|
|
|
33
33
|
|
|
34
34
|
## Commands
|
|
35
35
|
|
|
36
|
-
`kit login` opens a link you confirm in
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
connects your own agent:
|
|
41
|
-
House as you
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
`kit
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
36
|
+
`kit login` opens or prints a link you confirm in any browser, on this
|
|
37
|
+
computer or another, continues on its own and keeps the Environment's
|
|
38
|
+
credential in `~/.house-kit`, or in `$HOUSE_KIT_HOME` when it is set. Pass
|
|
39
|
+
`--environment <id>` to reconnect an Environment you already have. It also
|
|
40
|
+
connects your own agent: outside an Agent conversation, `house <tool>` calls
|
|
41
|
+
House as you and `git` clones and pushes your Apps at `<house>/app/` as you,
|
|
42
|
+
until you revoke that connection on Connections. `house help` lists the Tools.
|
|
43
|
+
`kit logout` disconnects this computer, stops House Kit and ends your own
|
|
44
|
+
agent's connection, so `house` and `git` no longer act as you here; a later
|
|
45
|
+
`kit login` reconnects the same Environment.
|
|
46
|
+
|
|
47
|
+
`kit resident` keeps the Environment connected and, as it connects, copies each
|
|
48
|
+
Room you may sync here as a Git repository in the workspace's `local-copies`.
|
|
49
|
+
`house fetch` records House's changes on each copy's `refs/house/received`;
|
|
50
|
+
rebase onto it, commit and run `house push --owner` in the copy, through the
|
|
51
|
+
install command in the container. An Agent runs both, without `--owner`.
|
|
50
52
|
|
|
51
53
|
House Kit turns each audio file of your message to an Agent into text on this
|
|
52
|
-
computer before the Agent reads
|
|
53
|
-
|
|
54
|
+
computer before the Agent reads it. While transcription is on, the speech
|
|
55
|
+
engine and model use about 425 MB in `~/.house-kit`; turning it off deletes them.
|
|
54
56
|
|
|
55
57
|
## License
|
|
56
58
|
|
|
57
|
-
MIT
|
|
58
|
-
|
|
59
|
-
The skills come from [mattpocock/skills](https://github.com/mattpocock/skills); thank you, Matt Pocock.
|
|
59
|
+
MIT. The skills come from [mattpocock/skills](https://github.com/mattpocock/skills); thank you, Matt Pocock.
|
package/dist/acp.js
CHANGED
|
@@ -1,18 +1,21 @@
|
|
|
1
1
|
import { ndJsonStream, PROTOCOL_VERSION, } from '@agentclientprotocol/sdk';
|
|
2
|
-
import {
|
|
3
|
-
import { readdirSync, readFileSync } from 'node:fs';
|
|
2
|
+
import { spawn } from 'node:child_process';
|
|
4
3
|
import { Readable, Writable } from 'node:stream';
|
|
5
4
|
import { CLIS, KIT_VERSION, adapterCommand, withoutProxy } from './clis.js';
|
|
6
|
-
|
|
7
|
-
export
|
|
8
|
-
export async function startAdapter(kind, cli, cwd, app, jobs = () => undefined, added = {}) {
|
|
5
|
+
import { killTree } from './scope.js';
|
|
6
|
+
export async function startAdapter(kind, cli, cwd, app, events = () => undefined, added = {}, signal, scope = null) {
|
|
9
7
|
const adapter = CLIS[kind].adapter;
|
|
10
|
-
const
|
|
8
|
+
const started = [adapter === null ? cli : adapterCommand(kind), CLIS[kind].args];
|
|
9
|
+
const [command, args] = scope?.command(...started) ?? started;
|
|
10
|
+
const child = spawn(command, args, {
|
|
11
11
|
cwd,
|
|
12
12
|
env: { ...withoutProxy(), ...(adapter === null ? {} : { ...adapter.env, [adapter.executable]: cli }), ...added },
|
|
13
13
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
14
14
|
detached: true,
|
|
15
15
|
});
|
|
16
|
+
const stop = () => killTree(child);
|
|
17
|
+
signal?.addEventListener('abort', stop, { once: true });
|
|
18
|
+
child.on('exit', () => signal?.removeEventListener('abort', stop));
|
|
16
19
|
let stderr = '';
|
|
17
20
|
child.stderr.on('data', (chunk) => {
|
|
18
21
|
stderr = (stderr + chunk.toString('utf8')).slice(-4000);
|
|
@@ -29,16 +32,11 @@ export async function startAdapter(kind, cli, cwd, app, jobs = () => undefined,
|
|
|
29
32
|
writable: stream.writable,
|
|
30
33
|
readable: stream.readable.pipeThrough(new TransformStream({
|
|
31
34
|
transform(message, controller) {
|
|
32
|
-
const
|
|
33
|
-
|
|
34
|
-
if (
|
|
35
|
-
jobs(job);
|
|
36
|
-
if (!notice.params?.update?.sessionUpdate?.startsWith('async_task_'))
|
|
35
|
+
const read = message;
|
|
36
|
+
events(read);
|
|
37
|
+
if (read.id !== undefined || (read.method !== 'session/update' && !read.method.startsWith('_'))) {
|
|
37
38
|
controller.enqueue(message);
|
|
38
|
-
|
|
39
|
-
controller.enqueue({ jsonrpc: '2.0', method: TURN_STARTED });
|
|
40
|
-
if (CLIS[kind].turnEnded(notice))
|
|
41
|
-
controller.enqueue({ jsonrpc: '2.0', method: TURN_ENDED });
|
|
39
|
+
}
|
|
42
40
|
},
|
|
43
41
|
})),
|
|
44
42
|
});
|
|
@@ -50,10 +48,12 @@ export async function startAdapter(kind, cli, cwd, app, jobs = () => undefined,
|
|
|
50
48
|
fs: { readTextFile: false, writeTextFile: false },
|
|
51
49
|
terminal: false,
|
|
52
50
|
elicitation: { form: {} },
|
|
53
|
-
|
|
51
|
+
session: { compaction: {}, notices: {} },
|
|
52
|
+
_meta: { jetbrains: { air: { version: 1, capabilities: CLIS[kind].air } } },
|
|
54
53
|
},
|
|
55
54
|
clientInfo: { name: '@agentshouse/kit', version: KIT_VERSION },
|
|
56
55
|
});
|
|
56
|
+
scope?.entered(child.pid);
|
|
57
57
|
return { child, connection, initialized, exited };
|
|
58
58
|
}
|
|
59
59
|
catch (error) {
|
|
@@ -61,80 +61,3 @@ export async function startAdapter(kind, cli, cwd, app, jobs = () => undefined,
|
|
|
61
61
|
throw error;
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
|
-
const LISTING_BYTES = 1 << 28;
|
|
65
|
-
function listed(options) {
|
|
66
|
-
return execFileSync('ps', [options, '-o', 'pid=,ppid=,command='], { encoding: 'utf8', maxBuffer: LISTING_BYTES })
|
|
67
|
-
.split('\n')
|
|
68
|
-
.flatMap((line) => {
|
|
69
|
-
const fields = /^\s*(\d+)\s+(\d+)\s?(.*)$/.exec(line);
|
|
70
|
-
return fields === null ? [] : [[Number(fields[1]), Number(fields[2]), fields[3]]];
|
|
71
|
-
});
|
|
72
|
-
}
|
|
73
|
-
function parents() {
|
|
74
|
-
const children = new Map();
|
|
75
|
-
const adopt = (pid, parent) => children.set(parent, [...(children.get(parent) ?? []), pid]);
|
|
76
|
-
if (process.platform === 'darwin') {
|
|
77
|
-
for (const [pid, parent] of listed('-Aww'))
|
|
78
|
-
adopt(pid, parent);
|
|
79
|
-
return children;
|
|
80
|
-
}
|
|
81
|
-
for (const entry of readdirSync('/proc')) {
|
|
82
|
-
if (!/^\d+$/.test(entry))
|
|
83
|
-
continue;
|
|
84
|
-
try {
|
|
85
|
-
const stat = readFileSync(`/proc/${entry}/stat`, 'utf8');
|
|
86
|
-
adopt(Number(entry), Number(stat.slice(stat.lastIndexOf(')') + 2).split(' ')[1]));
|
|
87
|
-
}
|
|
88
|
-
catch { }
|
|
89
|
-
}
|
|
90
|
-
return children;
|
|
91
|
-
}
|
|
92
|
-
function descendants(roots) {
|
|
93
|
-
const children = parents();
|
|
94
|
-
const tree = [];
|
|
95
|
-
const pending = roots.flatMap((root) => children.get(root) ?? []);
|
|
96
|
-
while (pending.length > 0) {
|
|
97
|
-
const pid = pending.pop();
|
|
98
|
-
tree.push(pid);
|
|
99
|
-
pending.push(...(children.get(pid) ?? []));
|
|
100
|
-
}
|
|
101
|
-
return tree;
|
|
102
|
-
}
|
|
103
|
-
function killAll(pids) {
|
|
104
|
-
for (const pid of pids) {
|
|
105
|
-
for (const target of [-pid, pid]) {
|
|
106
|
-
try {
|
|
107
|
-
process.kill(target, 'SIGKILL');
|
|
108
|
-
}
|
|
109
|
-
catch { }
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
function marked(marker) {
|
|
114
|
-
if (process.platform === 'darwin') {
|
|
115
|
-
return listed('-AEww')
|
|
116
|
-
.filter(([, , command]) => ` ${command} `.includes(` ${marker} `))
|
|
117
|
-
.map(([pid]) => pid);
|
|
118
|
-
}
|
|
119
|
-
return readdirSync('/proc')
|
|
120
|
-
.filter((entry) => {
|
|
121
|
-
try {
|
|
122
|
-
return /^\d+$/.test(entry) && readFileSync(`/proc/${entry}/environ`, 'utf8').split('\0').includes(marker);
|
|
123
|
-
}
|
|
124
|
-
catch {
|
|
125
|
-
return false;
|
|
126
|
-
}
|
|
127
|
-
})
|
|
128
|
-
.map(Number);
|
|
129
|
-
}
|
|
130
|
-
export function killTree(child) {
|
|
131
|
-
killAll([child.pid, ...descendants([child.pid])]);
|
|
132
|
-
}
|
|
133
|
-
export function killMarked(marker) {
|
|
134
|
-
const pids = marked(marker);
|
|
135
|
-
killAll([...pids, ...descendants(pids)]);
|
|
136
|
-
}
|
|
137
|
-
export function killDescendants() {
|
|
138
|
-
const pids = marked(`HOUSE_KIT_RESIDENT=${process.pid}`);
|
|
139
|
-
killAll([...pids, ...descendants([process.pid, ...pids])]);
|
|
140
|
-
}
|
package/dist/agents.js
CHANGED
|
@@ -1,15 +1,20 @@
|
|
|
1
1
|
import { client } from '@agentclientprotocol/sdk';
|
|
2
2
|
import { readFile, realpath } from 'node:fs/promises';
|
|
3
|
-
import {
|
|
3
|
+
import { 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 { killTree } from './scope.js';
|
|
7
|
+
import { holdTranscription, transcriptionReport } from './transcription.js';
|
|
8
|
+
const SIGNED_OUT = { signed_in: false, models: [], modes: [] };
|
|
7
9
|
function select(options, category) {
|
|
8
10
|
const option = options.find((candidate) => candidate.category === category);
|
|
9
11
|
return option?.type === 'select' ? option : undefined;
|
|
10
12
|
}
|
|
13
|
+
function choices(options) {
|
|
14
|
+
return options.flatMap((entry) => ('group' in entry ? entry.options : [entry]));
|
|
15
|
+
}
|
|
11
16
|
function values(options) {
|
|
12
|
-
return
|
|
17
|
+
return choices(options).map((entry) => entry.value);
|
|
13
18
|
}
|
|
14
19
|
function causeOf(error) {
|
|
15
20
|
return error instanceof Error ? error.message : String(error);
|
|
@@ -21,9 +26,11 @@ async function models(kind, adapter, known) {
|
|
|
21
26
|
const agent = adapter.connection.agent;
|
|
22
27
|
const opened = await agent.request('session/new', { cwd: kitHome(), mcpServers: [] });
|
|
23
28
|
let options = opened.configOptions ?? [];
|
|
29
|
+
const mode = select(options, 'mode');
|
|
30
|
+
const modes = mode === undefined ? [] : choices(mode.options).map(({ value, name }) => ({ mode: value, name }));
|
|
24
31
|
const model = select(options, 'model');
|
|
25
32
|
if (model === undefined)
|
|
26
|
-
return [];
|
|
33
|
+
return { models: [], modes };
|
|
27
34
|
const offered = [];
|
|
28
35
|
for (const value of values(model.options)) {
|
|
29
36
|
if (select(options, 'model')?.currentValue !== value) {
|
|
@@ -39,25 +46,46 @@ async function models(kind, adapter, known) {
|
|
|
39
46
|
const effort = select(options, 'thought_level');
|
|
40
47
|
offered.push({ model: value, efforts: effort === undefined ? [] : values(effort.options) });
|
|
41
48
|
}
|
|
42
|
-
return offered;
|
|
49
|
+
return { models: offered, modes };
|
|
43
50
|
}
|
|
44
|
-
async function
|
|
51
|
+
async function signedIn(kind, cli, known, signal) {
|
|
45
52
|
const probe = CLIS[kind].signedIn;
|
|
46
|
-
|
|
53
|
+
// A sign-in check that has not answered in half a minute counts as signed out rather than stalling the report.
|
|
54
|
+
if ('command' in probe)
|
|
55
|
+
return (await run(cli, probe.command, 30_000, false, signal)).status === 0;
|
|
56
|
+
return (await offer(kind, cli, known, signal)).signed_in;
|
|
57
|
+
}
|
|
58
|
+
function ended(signal) {
|
|
59
|
+
return new Promise((_, reject) => {
|
|
60
|
+
if (signal.aborted)
|
|
61
|
+
reject(signal.reason);
|
|
62
|
+
signal.addEventListener('abort', () => reject(signal.reason), { once: true });
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
async function offer(kind, cli, known, signal) {
|
|
66
|
+
const probe = CLIS[kind].signedIn;
|
|
67
|
+
// A sign-in check that has not answered in half a minute counts as signed out rather than stalling the report.
|
|
68
|
+
if ('command' in probe && (await run(cli, probe.command, 30_000, false, signal)).status !== 0)
|
|
47
69
|
return SIGNED_OUT;
|
|
48
70
|
let adapter;
|
|
49
71
|
try {
|
|
50
|
-
adapter = await startAdapter(kind, cli, kitHome(), client({ name: '@agentshouse/kit' }));
|
|
72
|
+
adapter = await startAdapter(kind, cli, kitHome(), client({ name: '@agentshouse/kit' }), () => undefined, {}, signal);
|
|
73
|
+
signal?.throwIfAborted();
|
|
51
74
|
if ('initializeMeta' in probe) {
|
|
52
75
|
const method = adapter.initialized._meta?.[probe.initializeMeta];
|
|
53
76
|
if (typeof method !== 'string' || method.length === 0)
|
|
54
77
|
return SIGNED_OUT;
|
|
55
78
|
}
|
|
56
|
-
return { signed_in: true,
|
|
79
|
+
return { signed_in: true, ...(await models(kind, adapter, known.models)) };
|
|
57
80
|
}
|
|
58
81
|
catch (error) {
|
|
59
|
-
|
|
60
|
-
|
|
82
|
+
if (!signal?.aborted)
|
|
83
|
+
process.stderr.write(`kit: ${kind} did not offer its models: ${causeOf(error)}\n`);
|
|
84
|
+
return {
|
|
85
|
+
signed_in: adapter === undefined && 'initializeMeta' in probe ? known.signed_in : true,
|
|
86
|
+
models: known.models,
|
|
87
|
+
modes: known.modes,
|
|
88
|
+
};
|
|
61
89
|
}
|
|
62
90
|
finally {
|
|
63
91
|
if (adapter !== undefined)
|
|
@@ -72,6 +100,8 @@ function reported(kind, reading) {
|
|
|
72
100
|
failure: reading.failure,
|
|
73
101
|
signed_in: reading.signed_in,
|
|
74
102
|
models: reading.models,
|
|
103
|
+
modes: reading.modes,
|
|
104
|
+
full_access: CLIS[kind].fullAccess,
|
|
75
105
|
};
|
|
76
106
|
}
|
|
77
107
|
function tooOld(kind, release) {
|
|
@@ -79,17 +109,19 @@ function tooOld(kind, release) {
|
|
|
79
109
|
return `${cli.bin} ${release} is older than ${cli.minimum}, the oldest this Kit runs`;
|
|
80
110
|
}
|
|
81
111
|
async function sshHostKey() {
|
|
112
|
+
// Listing a local host key takes a moment, so ten seconds only bounds a stuck ssh-keygen.
|
|
82
113
|
const listed = await run('ssh-keygen', ['-l', '-E', 'sha256', '-f', '/etc/ssh/ssh_host_ed25519_key.pub'], 10_000);
|
|
83
114
|
return listed.status === 0 ? (/^\d+ (SHA256:\S+)/.exec(listed.output)?.[1] ?? null) : null;
|
|
84
115
|
}
|
|
85
116
|
async function operatingSystem() {
|
|
117
|
+
// sw_vers answers at once, so ten seconds only bounds a stuck call.
|
|
86
118
|
if (process.platform === 'darwin')
|
|
87
119
|
return `macOS ${(await run('sw_vers', ['-productVersion'], 10_000)).output.trim()}`;
|
|
88
120
|
const release = await readFile('/etc/os-release', 'utf8');
|
|
89
121
|
return /^PRETTY_NAME="?([^"\n]*)"?$/m.exec(release)?.[1] ?? release;
|
|
90
122
|
}
|
|
91
123
|
export class Agents {
|
|
92
|
-
desired = { agents: [], routes: [] };
|
|
124
|
+
desired = { agents: [], routes: [], transcribe: false };
|
|
93
125
|
house;
|
|
94
126
|
reading = Promise.resolve();
|
|
95
127
|
queues = new Map();
|
|
@@ -113,8 +145,11 @@ export class Agents {
|
|
|
113
145
|
return this.desired;
|
|
114
146
|
});
|
|
115
147
|
this.reading = reading;
|
|
116
|
-
return reading.then(({ agents }) => {
|
|
117
|
-
|
|
148
|
+
return reading.then(({ agents, transcribe }) => {
|
|
149
|
+
holdTranscription(transcribe)
|
|
150
|
+
.then((changed) => (changed ? this.report() : undefined))
|
|
151
|
+
.catch(logged);
|
|
152
|
+
Promise.all(agents.map((kind) => this.load(kind)))
|
|
118
153
|
.then(() => this.report())
|
|
119
154
|
.catch(logged);
|
|
120
155
|
});
|
|
@@ -130,7 +165,7 @@ export class Agents {
|
|
|
130
165
|
const known = this.readings.get(kind);
|
|
131
166
|
const kept = known?.release === null || known?.minimum !== undefined ? SIGNED_OUT : (known ?? SIGNED_OUT);
|
|
132
167
|
if (known?.release !== release || known.minimum !== undefined) {
|
|
133
|
-
this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models });
|
|
168
|
+
this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models, modes: kept.modes });
|
|
134
169
|
}
|
|
135
170
|
const read = this.nextRead(kind);
|
|
136
171
|
offer(kind, cli, kept)
|
|
@@ -143,16 +178,19 @@ export class Agents {
|
|
|
143
178
|
return cli;
|
|
144
179
|
});
|
|
145
180
|
}
|
|
146
|
-
located(kind) {
|
|
147
|
-
return this.queue(kind, () => this.ensure(kind));
|
|
181
|
+
located(kind, signal) {
|
|
182
|
+
return this.queue(kind, () => this.ensure(kind, signal), signal);
|
|
148
183
|
}
|
|
149
184
|
async reread(kind) {
|
|
150
|
-
await this.
|
|
151
|
-
this.nextRead(kind);
|
|
152
|
-
this.readings.set(kind, await this.examine(kind, this.readings.get(kind) ?? SIGNED_OUT));
|
|
153
|
-
});
|
|
185
|
+
await this.examine(kind, this.readings.get(kind) ?? SIGNED_OUT, offer);
|
|
154
186
|
await this.report();
|
|
155
187
|
}
|
|
188
|
+
async recheck(kind, signal) {
|
|
189
|
+
const known = this.readings.get(kind) ?? SIGNED_OUT;
|
|
190
|
+
await this.examine(kind, known, async (kind, cli) => ((await signedIn(kind, cli, known, signal)) ? { ...known, signed_in: true } : SIGNED_OUT), signal);
|
|
191
|
+
if (!signal.aborted)
|
|
192
|
+
await this.report();
|
|
193
|
+
}
|
|
156
194
|
report() {
|
|
157
195
|
const sending = this.sending.catch(() => undefined).then(() => this.send());
|
|
158
196
|
this.sending = sending;
|
|
@@ -167,39 +205,42 @@ export class Agents {
|
|
|
167
205
|
this.readings.set(kind, reading);
|
|
168
206
|
this.report().catch(logged);
|
|
169
207
|
}
|
|
170
|
-
queue(kind, work) {
|
|
171
|
-
const queued = (this.queues.get(kind) ?? Promise.resolve()).then(
|
|
208
|
+
queue(kind, work, signal) {
|
|
209
|
+
const queued = (this.queues.get(kind) ?? Promise.resolve()).then(() => {
|
|
210
|
+
signal?.throwIfAborted();
|
|
211
|
+
return work();
|
|
212
|
+
});
|
|
172
213
|
this.queues.set(kind, queued.catch(() => undefined));
|
|
173
|
-
return queued;
|
|
214
|
+
return signal === undefined ? queued : Promise.race([queued, ended(signal)]);
|
|
174
215
|
}
|
|
175
|
-
async ensure(kind) {
|
|
176
|
-
const failed = await installAdapter(kind);
|
|
216
|
+
async ensure(kind, signal) {
|
|
217
|
+
const failed = await installAdapter(kind, signal);
|
|
177
218
|
if (failed !== null)
|
|
178
219
|
throw new Error(failed);
|
|
179
|
-
const found = await locate(kind);
|
|
220
|
+
const found = await locate(kind, signal);
|
|
180
221
|
if (found !== null)
|
|
181
222
|
return found;
|
|
182
|
-
const installing = this.installing.catch(() => undefined).then(() => installCli(kind));
|
|
223
|
+
const installing = this.installing.catch(() => undefined).then(() => installCli(kind, signal));
|
|
183
224
|
this.installing = installing;
|
|
184
225
|
const failure = await installing;
|
|
185
226
|
if (failure !== null)
|
|
186
227
|
throw new Error(failure);
|
|
187
|
-
const installed = await locate(kind);
|
|
228
|
+
const installed = await locate(kind, signal);
|
|
188
229
|
if (installed === null)
|
|
189
230
|
throw new Error(`the login shell does not find ${CLIS[kind].bin} after its install`);
|
|
190
231
|
return installed;
|
|
191
232
|
}
|
|
192
|
-
async resolve(kind) {
|
|
233
|
+
async resolve(kind, signal) {
|
|
193
234
|
let cli;
|
|
194
235
|
try {
|
|
195
|
-
cli = await realpath(await this.ensure(kind));
|
|
236
|
+
cli = await realpath(await this.ensure(kind, signal));
|
|
196
237
|
}
|
|
197
238
|
catch (error) {
|
|
198
239
|
const failure = causeOf(error);
|
|
199
240
|
process.stderr.write(`kit: ${kind} did not install: ${failure}\n`);
|
|
200
241
|
return { release: null, failure, ...SIGNED_OUT };
|
|
201
242
|
}
|
|
202
|
-
const release = await versionOf(cli);
|
|
243
|
+
const release = await versionOf(cli, signal);
|
|
203
244
|
if (release === null)
|
|
204
245
|
return { release: null, failure: `${cli} --version names no version`, ...SIGNED_OUT };
|
|
205
246
|
const minimum = CLIS[kind].minimum;
|
|
@@ -207,18 +248,18 @@ export class Agents {
|
|
|
207
248
|
return { release, minimum, failure: null, ...SIGNED_OUT };
|
|
208
249
|
return { cli, release };
|
|
209
250
|
}
|
|
210
|
-
async examine(kind, known) {
|
|
211
|
-
const
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
251
|
+
async examine(kind, known, read, signal) {
|
|
252
|
+
const current = this.nextRead(kind);
|
|
253
|
+
const resolved = await this.queue(kind, () => this.resolve(kind, signal), signal);
|
|
254
|
+
const reading = 'cli' in resolved ? { release: resolved.release, failure: null, ...(await read(kind, resolved.cli, known)) } : resolved;
|
|
255
|
+
if (this.reads.get(kind) === current && !signal?.aborted)
|
|
256
|
+
this.readings.set(kind, reading);
|
|
215
257
|
}
|
|
216
258
|
async load(kind) {
|
|
217
259
|
const known = this.readings.get(kind);
|
|
218
260
|
if (known !== undefined && known.failure === null)
|
|
219
261
|
return;
|
|
220
|
-
this.
|
|
221
|
-
this.readings.set(kind, await this.examine(kind, SIGNED_OUT));
|
|
262
|
+
await this.examine(kind, SIGNED_OUT, offer);
|
|
222
263
|
}
|
|
223
264
|
async send() {
|
|
224
265
|
const agents = this.desired.agents.flatMap((kind) => {
|
|
@@ -231,6 +272,7 @@ export class Agents {
|
|
|
231
272
|
kit_version: KIT_VERSION,
|
|
232
273
|
agent_base: agentBase(),
|
|
233
274
|
agents,
|
|
275
|
+
transcription: transcriptionReport(),
|
|
234
276
|
...(hostKey === null ? {} : { ssh_host_key: hostKey }),
|
|
235
277
|
};
|
|
236
278
|
const state = JSON.stringify(body);
|
package/dist/api.js
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
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';
|
|
2
5
|
import { relayed } from './relay.js';
|
|
3
6
|
export class HouseRefusal extends Error {
|
|
4
7
|
status;
|
|
@@ -9,9 +12,26 @@ export class HouseRefusal extends Error {
|
|
|
9
12
|
this.text = text;
|
|
10
13
|
}
|
|
11
14
|
}
|
|
15
|
+
export function finalRefusal(error) {
|
|
16
|
+
return error instanceof HouseRefusal && retryable(error.text) === false;
|
|
17
|
+
}
|
|
12
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.
|
|
13
20
|
return Math.random() * Math.min(30_000, 1000 * 2 ** attempt);
|
|
14
21
|
}
|
|
22
|
+
export async function retrying(sent, signal, pause = retryDelay) {
|
|
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 after the caller's pause, the jittered curve unless it names its own.
|
|
32
|
+
await delay(pause(attempt), undefined, { signal });
|
|
33
|
+
}
|
|
34
|
+
}
|
|
15
35
|
export async function post(house, path, body, credential, signal) {
|
|
16
36
|
const answer = await fetch(relayed(new URL(path, house)), {
|
|
17
37
|
method: 'POST',
|
|
@@ -29,7 +49,14 @@ export async function post(house, path, body, credential, signal) {
|
|
|
29
49
|
}
|
|
30
50
|
async function enrolledPost(path, body, signal) {
|
|
31
51
|
const { house, credential } = (await readEnrolment());
|
|
32
|
-
|
|
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
|
+
}
|
|
33
60
|
}
|
|
34
61
|
export const house = {
|
|
35
62
|
post: enrolledPost,
|
|
@@ -39,9 +66,10 @@ export const house = {
|
|
|
39
66
|
return await enrolledPost(path, body);
|
|
40
67
|
}
|
|
41
68
|
catch (error) {
|
|
42
|
-
if (error
|
|
69
|
+
if (finalRefusal(error))
|
|
43
70
|
throw error;
|
|
44
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.
|
|
45
73
|
await new Promise((resolve) => setTimeout(resolve, retryDelay(attempt)));
|
|
46
74
|
if (!current())
|
|
47
75
|
throw error;
|
package/dist/app-git.js
ADDED
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { extname, resolve } from 'node:path';
|
|
2
|
+
import { fileURLToPath } from 'node:url';
|
|
3
|
+
import { run } from './git.js';
|
|
4
|
+
import { kitHome, readOwnAgent } from './home.js';
|
|
5
|
+
import { quoted } from './shell.js';
|
|
6
|
+
function section(house) {
|
|
7
|
+
return `credential.${new URL('/app/', house).href}`;
|
|
8
|
+
}
|
|
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
|
+
async function configured(args) {
|
|
14
|
+
try {
|
|
15
|
+
return await run(kitHome(), ['config', '--global', ...args]);
|
|
16
|
+
}
|
|
17
|
+
catch (error) {
|
|
18
|
+
if (error.code === 'ENOENT')
|
|
19
|
+
return null;
|
|
20
|
+
throw error;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
async function forget(house) {
|
|
24
|
+
await configured(['--remove-section', section(house)]);
|
|
25
|
+
}
|
|
26
|
+
async function register(house) {
|
|
27
|
+
await forget(house);
|
|
28
|
+
for (const value of ['', helper()]) {
|
|
29
|
+
const ran = await configured(['--add', `${section(house)}.helper`, value]);
|
|
30
|
+
if (ran === null)
|
|
31
|
+
return;
|
|
32
|
+
if (ran.status !== 0)
|
|
33
|
+
throw new Error(`git config failed: ${ran.stderr.trim()}`);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
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
|
+
export async function answerGitCredential(operation) {
|
|
48
|
+
let asked = '';
|
|
49
|
+
for await (const chunk of process.stdin)
|
|
50
|
+
asked += String(chunk);
|
|
51
|
+
if (operation !== 'get')
|
|
52
|
+
return;
|
|
53
|
+
const attributes = new Map(asked
|
|
54
|
+
.split('\n')
|
|
55
|
+
.filter((line) => line.includes('='))
|
|
56
|
+
.map((line) => [line.slice(0, line.indexOf('=')), line.slice(line.indexOf('=') + 1)]));
|
|
57
|
+
const ownAgent = await readOwnAgent();
|
|
58
|
+
if (ownAgent === null)
|
|
59
|
+
return;
|
|
60
|
+
const house = new URL(ownAgent.house);
|
|
61
|
+
if (attributes.get('protocol') !== house.protocol.slice(0, -1) || attributes.get('host') !== house.host)
|
|
62
|
+
return;
|
|
63
|
+
process.stdout.write(`username=house\npassword=${ownAgent.credential}\n`);
|
|
64
|
+
}
|
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-cfe564e35b4a5",
|
|
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-cfe564e35b4a5/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-cfe564e35b4a5/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-cfe564e35b4a5/connect-windows.ps1"
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
}
|