@agentshouse/kit 0.2.1-c5262a8cc063d → 0.2.1-c5883630417e1
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 +27 -26
- package/dist/acp.js +16 -93
- package/dist/agents.js +104 -42
- package/dist/api.js +36 -3
- package/dist/app-git.js +64 -0
- package/dist/bootstrap.json +4 -4
- package/dist/bridge.js +36 -52
- package/dist/chatgpt.js +26 -0
- package/dist/clis.js +128 -65
- package/dist/codex-main.js +58 -0
- package/dist/conversations.js +288 -236
- package/dist/copies.js +167 -139
- package/dist/end.js +22 -0
- package/dist/enrol-main.js +7 -1
- package/dist/events.js +521 -0
- package/dist/files.js +23 -2
- package/dist/git.js +11 -8
- package/dist/home.js +81 -6
- package/dist/house-main.js +186 -56
- package/dist/instructions.js +9 -32
- package/dist/kit-main.js +54 -6
- package/dist/login.js +109 -103
- package/dist/logout.js +16 -13
- package/dist/mcp.js +2 -1
- package/dist/parts.js +82 -0
- package/dist/placement.js +48 -0
- package/dist/refusals.js +12 -0
- package/dist/relay.js +20 -0
- package/dist/resident.js +38 -27
- package/dist/scope.js +203 -0
- package/dist/secret-input.js +4 -1
- package/dist/service-main.js +9 -0
- package/dist/service.js +33 -0
- package/dist/shell.js +3 -0
- package/dist/sign-in.js +34 -9
- package/dist/skills.js +81 -12
- package/dist/stream.js +37 -6
- package/dist/transcription.js +57 -9
- package/dist/update.js +30 -6
- package/dist/wire.js +6 -0
- package/dist/work.js +348 -0
- package/how-we-work.md +13 -3
- package/package.json +3 -2
- 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/blocks.js +0 -51
- 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
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
# House Kit
|
|
2
2
|
|
|
3
|
-
House Kit connects an Environment, a Linux computer or server, to
|
|
4
|
-
|
|
5
|
-
through the agent CLIs you chose and gives each Agent the `house` command.
|
|
3
|
+
House Kit connects an Environment, a Linux computer or server, to [agents.house](https://agents.house). It runs
|
|
4
|
+
your Agents' conversations through the agent CLIs you chose and gives each Agent the `house` command.
|
|
6
5
|
|
|
7
6
|
## Install
|
|
8
7
|
|
|
9
|
-
Run `curl -fsSL agents.house/kit | sh`, or `irm agents.house/kit.ps1 | iex` on
|
|
10
|
-
|
|
11
|
-
installs House Kit natively under your own account, without an admin password,
|
|
8
|
+
Run `curl -fsSL agents.house/kit | sh`, or `irm agents.house/kit.ps1 | iex` on Windows, and again to update;
|
|
9
|
+
options follow `sh -s --`. On macOS and Linux it installs House Kit natively under your own account, without an admin password,
|
|
12
10
|
as a service that runs while you are logged in. `kit` and `house` are then on
|
|
13
11
|
your login shell's `PATH`, and your workspace is `~/AgentsHouse` unless you
|
|
14
12
|
pass `--workspace <path>`.
|
|
@@ -20,7 +18,7 @@ workspace. On Windows 11 the container is the one choice. Append a `kit` or
|
|
|
20
18
|
Running the command for the other choice on a connected computer asks you to
|
|
21
19
|
confirm, then replaces its Environment, whose Agents end, with a new one.
|
|
22
20
|
|
|
23
|
-
On your own
|
|
21
|
+
On your own Linux server, run the Linux command with `--linux` to
|
|
24
22
|
install House Kit natively, with its workspace at `/agents/house`; `kit` and
|
|
25
23
|
`house` are then on the server's `PATH`.
|
|
26
24
|
|
|
@@ -33,27 +31,30 @@ them out; running it again without the flag brings them back.
|
|
|
33
31
|
|
|
34
32
|
## Commands
|
|
35
33
|
|
|
36
|
-
`kit login` opens a link you confirm in
|
|
37
|
-
|
|
38
|
-
set
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
34
|
+
`kit login` opens or prints a link you confirm in any browser, on this computer
|
|
35
|
+
or another, continues on its own and keeps the Environment's credential 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
|
+
reconnects an Environment you already have; `--rooms <ref>[,<ref>...]` gives it
|
|
38
|
+
only those Rooms and `--no-private` every Room but your Private Room; `--code <code>` connects immediately without a link.
|
|
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, until you revoke
|
|
41
|
+
that connection on Connections. `house help` lists the Tools. Codex sessions started after a
|
|
42
|
+
login run a lone `house` command outside their sandbox. `kit logout` disconnects this
|
|
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, 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.
|
|
47
|
+
|
|
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.
|
|
50
53
|
|
|
51
54
|
House Kit turns each audio file of your message to an Agent into text on this
|
|
52
|
-
computer before the Agent reads
|
|
53
|
-
|
|
55
|
+
computer before the Agent reads it. While transcription is on, the speech
|
|
56
|
+
engine and model use about 425 MB beside the Environment's credential; turning it off deletes them.
|
|
54
57
|
|
|
55
58
|
## License
|
|
56
59
|
|
|
57
|
-
MIT
|
|
58
|
-
|
|
59
|
-
The skills come from [mattpocock/skills](https://github.com/mattpocock/skills); thank you, Matt Pocock.
|
|
60
|
+
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,22 @@
|
|
|
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 { updatesItself } from './placement.js';
|
|
7
|
+
import { killTree } from './scope.js';
|
|
8
|
+
import { holdTranscription, transcriptionReport } from './transcription.js';
|
|
9
|
+
import { KIT_WIRE } from './wire.js';
|
|
10
|
+
const SIGNED_OUT = { signed_in: false, models: [], modes: [] };
|
|
7
11
|
function select(options, category) {
|
|
8
12
|
const option = options.find((candidate) => candidate.category === category);
|
|
9
13
|
return option?.type === 'select' ? option : undefined;
|
|
10
14
|
}
|
|
15
|
+
function choices(options) {
|
|
16
|
+
return options.flatMap((entry) => ('group' in entry ? entry.options : [entry]));
|
|
17
|
+
}
|
|
11
18
|
function values(options) {
|
|
12
|
-
return
|
|
19
|
+
return choices(options).map((entry) => entry.value);
|
|
13
20
|
}
|
|
14
21
|
function causeOf(error) {
|
|
15
22
|
return error instanceof Error ? error.message : String(error);
|
|
@@ -21,9 +28,11 @@ async function models(kind, adapter, known) {
|
|
|
21
28
|
const agent = adapter.connection.agent;
|
|
22
29
|
const opened = await agent.request('session/new', { cwd: kitHome(), mcpServers: [] });
|
|
23
30
|
let options = opened.configOptions ?? [];
|
|
31
|
+
const mode = select(options, 'mode');
|
|
32
|
+
const modes = mode === undefined ? [] : choices(mode.options).map(({ value, name }) => ({ mode: value, name }));
|
|
24
33
|
const model = select(options, 'model');
|
|
25
34
|
if (model === undefined)
|
|
26
|
-
return [];
|
|
35
|
+
return { models: [], modes };
|
|
27
36
|
const offered = [];
|
|
28
37
|
for (const value of values(model.options)) {
|
|
29
38
|
if (select(options, 'model')?.currentValue !== value) {
|
|
@@ -39,25 +48,46 @@ async function models(kind, adapter, known) {
|
|
|
39
48
|
const effort = select(options, 'thought_level');
|
|
40
49
|
offered.push({ model: value, efforts: effort === undefined ? [] : values(effort.options) });
|
|
41
50
|
}
|
|
42
|
-
return offered;
|
|
51
|
+
return { models: offered, modes };
|
|
52
|
+
}
|
|
53
|
+
async function signedIn(kind, cli, known, signal) {
|
|
54
|
+
const probe = CLIS[kind].signedIn;
|
|
55
|
+
// A sign-in check that has not answered in half a minute counts as signed out rather than stalling the report.
|
|
56
|
+
if ('command' in probe)
|
|
57
|
+
return (await run(cli, probe.command, 30_000, false, signal)).status === 0;
|
|
58
|
+
return (await offer(kind, cli, known, signal)).signed_in;
|
|
43
59
|
}
|
|
44
|
-
|
|
60
|
+
function ended(signal) {
|
|
61
|
+
return new Promise((_, reject) => {
|
|
62
|
+
if (signal.aborted)
|
|
63
|
+
reject(signal.reason);
|
|
64
|
+
signal.addEventListener('abort', () => reject(signal.reason), { once: true });
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
async function offer(kind, cli, known, signal) {
|
|
45
68
|
const probe = CLIS[kind].signedIn;
|
|
46
|
-
|
|
69
|
+
// A sign-in check that has not answered in half a minute counts as signed out rather than stalling the report.
|
|
70
|
+
if ('command' in probe && (await run(cli, probe.command, 30_000, false, signal)).status !== 0)
|
|
47
71
|
return SIGNED_OUT;
|
|
48
72
|
let adapter;
|
|
49
73
|
try {
|
|
50
|
-
adapter = await startAdapter(kind, cli, kitHome(), client({ name: '@agentshouse/kit' }));
|
|
74
|
+
adapter = await startAdapter(kind, cli, kitHome(), client({ name: '@agentshouse/kit' }), () => undefined, {}, signal);
|
|
75
|
+
signal?.throwIfAborted();
|
|
51
76
|
if ('initializeMeta' in probe) {
|
|
52
77
|
const method = adapter.initialized._meta?.[probe.initializeMeta];
|
|
53
78
|
if (typeof method !== 'string' || method.length === 0)
|
|
54
79
|
return SIGNED_OUT;
|
|
55
80
|
}
|
|
56
|
-
return { signed_in: true,
|
|
81
|
+
return { signed_in: true, ...(await models(kind, adapter, known.models)) };
|
|
57
82
|
}
|
|
58
83
|
catch (error) {
|
|
59
|
-
|
|
60
|
-
|
|
84
|
+
if (!signal?.aborted)
|
|
85
|
+
process.stderr.write(`kit: ${kind} did not offer its models: ${causeOf(error)}\n`);
|
|
86
|
+
return {
|
|
87
|
+
signed_in: adapter === undefined && 'initializeMeta' in probe ? known.signed_in : true,
|
|
88
|
+
models: known.models,
|
|
89
|
+
modes: known.modes,
|
|
90
|
+
};
|
|
61
91
|
}
|
|
62
92
|
finally {
|
|
63
93
|
if (adapter !== undefined)
|
|
@@ -72,6 +102,8 @@ function reported(kind, reading) {
|
|
|
72
102
|
failure: reading.failure,
|
|
73
103
|
signed_in: reading.signed_in,
|
|
74
104
|
models: reading.models,
|
|
105
|
+
modes: reading.modes,
|
|
106
|
+
full_access: CLIS[kind].fullAccess,
|
|
75
107
|
};
|
|
76
108
|
}
|
|
77
109
|
function tooOld(kind, release) {
|
|
@@ -79,17 +111,19 @@ function tooOld(kind, release) {
|
|
|
79
111
|
return `${cli.bin} ${release} is older than ${cli.minimum}, the oldest this Kit runs`;
|
|
80
112
|
}
|
|
81
113
|
async function sshHostKey() {
|
|
114
|
+
// Listing a local host key takes a moment, so ten seconds only bounds a stuck ssh-keygen.
|
|
82
115
|
const listed = await run('ssh-keygen', ['-l', '-E', 'sha256', '-f', '/etc/ssh/ssh_host_ed25519_key.pub'], 10_000);
|
|
83
116
|
return listed.status === 0 ? (/^\d+ (SHA256:\S+)/.exec(listed.output)?.[1] ?? null) : null;
|
|
84
117
|
}
|
|
85
118
|
async function operatingSystem() {
|
|
119
|
+
// sw_vers answers at once, so ten seconds only bounds a stuck call.
|
|
86
120
|
if (process.platform === 'darwin')
|
|
87
121
|
return `macOS ${(await run('sw_vers', ['-productVersion'], 10_000)).output.trim()}`;
|
|
88
122
|
const release = await readFile('/etc/os-release', 'utf8');
|
|
89
123
|
return /^PRETTY_NAME="?([^"\n]*)"?$/m.exec(release)?.[1] ?? release;
|
|
90
124
|
}
|
|
91
125
|
export class Agents {
|
|
92
|
-
desired = { agents: [], routes: [] };
|
|
126
|
+
desired = { agents: [], routes: [], transcribe: false };
|
|
93
127
|
house;
|
|
94
128
|
reading = Promise.resolve();
|
|
95
129
|
queues = new Map();
|
|
@@ -98,8 +132,14 @@ export class Agents {
|
|
|
98
132
|
reads = new Map();
|
|
99
133
|
sending = Promise.resolve();
|
|
100
134
|
sent = null;
|
|
101
|
-
|
|
135
|
+
refreshing = 0;
|
|
136
|
+
changed;
|
|
137
|
+
constructor(house, changed = () => undefined) {
|
|
102
138
|
this.house = house;
|
|
139
|
+
this.changed = changed;
|
|
140
|
+
}
|
|
141
|
+
idle() {
|
|
142
|
+
return this.refreshing === 0;
|
|
103
143
|
}
|
|
104
144
|
read() {
|
|
105
145
|
return this.reading.then(() => undefined, () => undefined);
|
|
@@ -108,16 +148,28 @@ export class Agents {
|
|
|
108
148
|
return this.desired.routes.find((route) => route.agent_id === agentId);
|
|
109
149
|
}
|
|
110
150
|
refresh() {
|
|
151
|
+
this.refreshing++;
|
|
152
|
+
this.changed();
|
|
111
153
|
const reading = this.read().then(async () => {
|
|
112
154
|
this.desired = await this.house.deliver('/kit/agents/desired', {});
|
|
113
155
|
return this.desired;
|
|
114
156
|
});
|
|
115
157
|
this.reading = reading;
|
|
116
|
-
|
|
117
|
-
|
|
158
|
+
reading
|
|
159
|
+
.then(({ agents, transcribe }) => Promise.all([
|
|
160
|
+
holdTranscription(transcribe)
|
|
161
|
+
.then((changed) => (changed ? this.report() : undefined))
|
|
162
|
+
.catch(logged),
|
|
163
|
+
Promise.all(agents.map((kind) => this.load(kind)))
|
|
118
164
|
.then(() => this.report())
|
|
119
|
-
.catch(logged)
|
|
165
|
+
.catch(logged),
|
|
166
|
+
]))
|
|
167
|
+
.catch(() => undefined)
|
|
168
|
+
.finally(() => {
|
|
169
|
+
this.refreshing--;
|
|
170
|
+
this.changed();
|
|
120
171
|
});
|
|
172
|
+
return reading.then(() => undefined);
|
|
121
173
|
}
|
|
122
174
|
cli(kind) {
|
|
123
175
|
return this.queue(kind, async () => {
|
|
@@ -130,7 +182,7 @@ export class Agents {
|
|
|
130
182
|
const known = this.readings.get(kind);
|
|
131
183
|
const kept = known?.release === null || known?.minimum !== undefined ? SIGNED_OUT : (known ?? SIGNED_OUT);
|
|
132
184
|
if (known?.release !== release || known.minimum !== undefined) {
|
|
133
|
-
this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models });
|
|
185
|
+
this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models, modes: kept.modes });
|
|
134
186
|
}
|
|
135
187
|
const read = this.nextRead(kind);
|
|
136
188
|
offer(kind, cli, kept)
|
|
@@ -143,16 +195,19 @@ export class Agents {
|
|
|
143
195
|
return cli;
|
|
144
196
|
});
|
|
145
197
|
}
|
|
146
|
-
located(kind) {
|
|
147
|
-
return this.queue(kind, () => this.ensure(kind));
|
|
198
|
+
located(kind, signal) {
|
|
199
|
+
return this.queue(kind, () => this.ensure(kind, signal), signal);
|
|
148
200
|
}
|
|
149
201
|
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
|
-
});
|
|
202
|
+
await this.examine(kind, this.readings.get(kind) ?? SIGNED_OUT, offer);
|
|
154
203
|
await this.report();
|
|
155
204
|
}
|
|
205
|
+
async recheck(kind, signal) {
|
|
206
|
+
const known = this.readings.get(kind) ?? SIGNED_OUT;
|
|
207
|
+
await this.examine(kind, known, async (kind, cli) => ((await signedIn(kind, cli, known, signal)) ? { ...known, signed_in: true } : SIGNED_OUT), signal);
|
|
208
|
+
if (!signal.aborted)
|
|
209
|
+
await this.report();
|
|
210
|
+
}
|
|
156
211
|
report() {
|
|
157
212
|
const sending = this.sending.catch(() => undefined).then(() => this.send());
|
|
158
213
|
this.sending = sending;
|
|
@@ -167,39 +222,42 @@ export class Agents {
|
|
|
167
222
|
this.readings.set(kind, reading);
|
|
168
223
|
this.report().catch(logged);
|
|
169
224
|
}
|
|
170
|
-
queue(kind, work) {
|
|
171
|
-
const queued = (this.queues.get(kind) ?? Promise.resolve()).then(
|
|
225
|
+
queue(kind, work, signal) {
|
|
226
|
+
const queued = (this.queues.get(kind) ?? Promise.resolve()).then(() => {
|
|
227
|
+
signal?.throwIfAborted();
|
|
228
|
+
return work();
|
|
229
|
+
});
|
|
172
230
|
this.queues.set(kind, queued.catch(() => undefined));
|
|
173
|
-
return queued;
|
|
231
|
+
return signal === undefined ? queued : Promise.race([queued, ended(signal)]);
|
|
174
232
|
}
|
|
175
|
-
async ensure(kind) {
|
|
176
|
-
const failed = await installAdapter(kind);
|
|
233
|
+
async ensure(kind, signal) {
|
|
234
|
+
const failed = await installAdapter(kind, signal);
|
|
177
235
|
if (failed !== null)
|
|
178
236
|
throw new Error(failed);
|
|
179
|
-
const found = await locate(kind);
|
|
237
|
+
const found = await locate(kind, signal);
|
|
180
238
|
if (found !== null)
|
|
181
239
|
return found;
|
|
182
|
-
const installing = this.installing.catch(() => undefined).then(() => installCli(kind));
|
|
240
|
+
const installing = this.installing.catch(() => undefined).then(() => installCli(kind, signal));
|
|
183
241
|
this.installing = installing;
|
|
184
242
|
const failure = await installing;
|
|
185
243
|
if (failure !== null)
|
|
186
244
|
throw new Error(failure);
|
|
187
|
-
const installed = await locate(kind);
|
|
245
|
+
const installed = await locate(kind, signal);
|
|
188
246
|
if (installed === null)
|
|
189
247
|
throw new Error(`the login shell does not find ${CLIS[kind].bin} after its install`);
|
|
190
248
|
return installed;
|
|
191
249
|
}
|
|
192
|
-
async resolve(kind) {
|
|
250
|
+
async resolve(kind, signal) {
|
|
193
251
|
let cli;
|
|
194
252
|
try {
|
|
195
|
-
cli = await realpath(await this.ensure(kind));
|
|
253
|
+
cli = await realpath(await this.ensure(kind, signal));
|
|
196
254
|
}
|
|
197
255
|
catch (error) {
|
|
198
256
|
const failure = causeOf(error);
|
|
199
257
|
process.stderr.write(`kit: ${kind} did not install: ${failure}\n`);
|
|
200
258
|
return { release: null, failure, ...SIGNED_OUT };
|
|
201
259
|
}
|
|
202
|
-
const release = await versionOf(cli);
|
|
260
|
+
const release = await versionOf(cli, signal);
|
|
203
261
|
if (release === null)
|
|
204
262
|
return { release: null, failure: `${cli} --version names no version`, ...SIGNED_OUT };
|
|
205
263
|
const minimum = CLIS[kind].minimum;
|
|
@@ -207,18 +265,19 @@ export class Agents {
|
|
|
207
265
|
return { release, minimum, failure: null, ...SIGNED_OUT };
|
|
208
266
|
return { cli, release };
|
|
209
267
|
}
|
|
210
|
-
async examine(kind, known) {
|
|
211
|
-
const
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
268
|
+
async examine(kind, known, read, signal) {
|
|
269
|
+
const current = this.nextRead(kind);
|
|
270
|
+
const resolved = await this.queue(kind, () => this.resolve(kind, signal), signal);
|
|
271
|
+
const reading = 'cli' in resolved ? { release: resolved.release, failure: null, ...(await read(kind, resolved.cli, known)) } : resolved;
|
|
272
|
+
if (this.reads.get(kind) === current && !signal?.aborted)
|
|
273
|
+
this.readings.set(kind, reading);
|
|
215
274
|
}
|
|
216
275
|
async load(kind) {
|
|
217
276
|
const known = this.readings.get(kind);
|
|
218
|
-
if (known !== undefined && known.failure === null)
|
|
277
|
+
if (known !== undefined && known.failure === null && known.minimum === undefined)
|
|
219
278
|
return;
|
|
220
|
-
this.
|
|
221
|
-
|
|
279
|
+
await this.examine(kind, SIGNED_OUT, offer);
|
|
280
|
+
await this.report();
|
|
222
281
|
}
|
|
223
282
|
async send() {
|
|
224
283
|
const agents = this.desired.agents.flatMap((kind) => {
|
|
@@ -229,8 +288,11 @@ export class Agents {
|
|
|
229
288
|
const body = {
|
|
230
289
|
os: await operatingSystem(),
|
|
231
290
|
kit_version: KIT_VERSION,
|
|
291
|
+
wire: KIT_WIRE,
|
|
292
|
+
updates_itself: await updatesItself(),
|
|
232
293
|
agent_base: agentBase(),
|
|
233
294
|
agents,
|
|
295
|
+
transcription: transcriptionReport(),
|
|
234
296
|
...(hostKey === null ? {} : { ssh_host_key: hostKey }),
|
|
235
297
|
};
|
|
236
298
|
const state = JSON.stringify(body);
|
package/dist/api.js
CHANGED
|
@@ -1,4 +1,9 @@
|
|
|
1
|
+
import { setTimeout as delay } from 'node:timers/promises';
|
|
2
|
+
import { signInAgain, updateRequired } from './end.js';
|
|
1
3
|
import { readEnrolment } from './home.js';
|
|
4
|
+
import { retryable } from './refusals.js';
|
|
5
|
+
import { relayed } from './relay.js';
|
|
6
|
+
import { KIT_WIRE, KIT_WIRE_HEADER, tooOld } from './wire.js';
|
|
2
7
|
export class HouseRefusal extends Error {
|
|
3
8
|
status;
|
|
4
9
|
text;
|
|
@@ -8,27 +13,54 @@ export class HouseRefusal extends Error {
|
|
|
8
13
|
this.text = text;
|
|
9
14
|
}
|
|
10
15
|
}
|
|
16
|
+
export function finalRefusal(error) {
|
|
17
|
+
return error instanceof HouseRefusal && retryable(error.text) === false;
|
|
18
|
+
}
|
|
11
19
|
export function retryDelay(attempt) {
|
|
20
|
+
// 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
21
|
return Math.random() * Math.min(30_000, 1000 * 2 ** attempt);
|
|
13
22
|
}
|
|
23
|
+
export async function retrying(sent, signal, pause = retryDelay) {
|
|
24
|
+
for (let attempt = 0;; attempt++) {
|
|
25
|
+
try {
|
|
26
|
+
return await sent();
|
|
27
|
+
}
|
|
28
|
+
catch (error) {
|
|
29
|
+
if (!(error instanceof HouseRefusal) || retryable(error.text) !== true)
|
|
30
|
+
throw error;
|
|
31
|
+
}
|
|
32
|
+
// A request House refused as retryable is sent again after the caller's pause, the jittered curve unless it names its own.
|
|
33
|
+
await delay(pause(attempt), undefined, { signal });
|
|
34
|
+
}
|
|
35
|
+
}
|
|
14
36
|
export async function post(house, path, body, credential, signal) {
|
|
15
|
-
const answer = await fetch(new URL(path, house), {
|
|
37
|
+
const answer = await fetch(relayed(new URL(path, house)), {
|
|
16
38
|
method: 'POST',
|
|
17
39
|
headers: {
|
|
18
40
|
'content-type': 'application/json',
|
|
41
|
+
[KIT_WIRE_HEADER]: String(KIT_WIRE),
|
|
19
42
|
...(credential === undefined ? {} : { authorization: `Bearer ${credential}` }),
|
|
20
43
|
},
|
|
21
44
|
body: JSON.stringify(body),
|
|
22
45
|
signal,
|
|
23
46
|
});
|
|
24
47
|
const text = await answer.text();
|
|
48
|
+
if (!answer.ok && tooOld(text))
|
|
49
|
+
updateRequired(house);
|
|
25
50
|
if (!answer.ok)
|
|
26
51
|
throw new HouseRefusal(path, answer.status, text);
|
|
27
52
|
return JSON.parse(text);
|
|
28
53
|
}
|
|
29
54
|
async function enrolledPost(path, body, signal) {
|
|
30
55
|
const { house, credential } = (await readEnrolment());
|
|
31
|
-
|
|
56
|
+
try {
|
|
57
|
+
return await post(house, path, body, credential, signal);
|
|
58
|
+
}
|
|
59
|
+
catch (error) {
|
|
60
|
+
if (error instanceof HouseRefusal && error.status === 401)
|
|
61
|
+
await signInAgain(credential);
|
|
62
|
+
throw error;
|
|
63
|
+
}
|
|
32
64
|
}
|
|
33
65
|
export const house = {
|
|
34
66
|
post: enrolledPost,
|
|
@@ -38,9 +70,10 @@ export const house = {
|
|
|
38
70
|
return await enrolledPost(path, body);
|
|
39
71
|
}
|
|
40
72
|
catch (error) {
|
|
41
|
-
if (error
|
|
73
|
+
if (finalRefusal(error))
|
|
42
74
|
throw error;
|
|
43
75
|
process.stderr.write(`kit: ${path} did not reach House: ${error.message}\n`);
|
|
76
|
+
// A delivery House did not take is sent again on the jittered curve for as long as it is still current.
|
|
44
77
|
await new Promise((resolve) => setTimeout(resolve, retryDelay(attempt)));
|
|
45
78
|
if (!current())
|
|
46
79
|
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
|
+
}
|