@agentshouse/kit 0.2.1-c15804a0fa28d → 0.2.1-c23bd93c02c83
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 +32 -31
- package/dist/acp.js +16 -93
- package/dist/agents.js +153 -44
- package/dist/api.js +34 -2
- package/dist/app-git.js +48 -0
- package/dist/bootstrap.json +4 -4
- package/dist/bridge.js +35 -56
- package/dist/chatgpt.js +32 -0
- package/dist/clis.js +137 -65
- package/dist/codex-main.js +58 -0
- package/dist/conversations.js +352 -244
- package/dist/copies.js +157 -116
- package/dist/end.js +23 -0
- package/dist/enrol-main.js +7 -1
- package/dist/events.js +524 -0
- package/dist/files.js +21 -1
- package/dist/git.js +10 -8
- package/dist/home.js +96 -7
- package/dist/house-cli.js +291 -0
- package/dist/house-main.js +7 -159
- package/dist/instructions.js +10 -32
- package/dist/kit-cli.js +68 -0
- package/dist/kit-main.js +8 -19
- package/dist/login.js +118 -103
- package/dist/logout.js +14 -13
- package/dist/parts.js +82 -0
- package/dist/placement.js +30 -0
- package/dist/refusals.js +12 -0
- package/dist/relay.js +12 -2
- package/dist/resident.js +84 -32
- 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 +87 -11
- package/dist/transcription.js +57 -9
- package/dist/update.js +30 -6
- package/dist/wire.js +6 -0
- package/dist/work.js +346 -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,26 +1,24 @@
|
|
|
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
|
|
10
|
-
Windows, and again to update; options follow `
|
|
11
|
-
installs House Kit natively under your own account, without an admin password,
|
|
12
|
-
|
|
13
|
-
your login shell's `PATH`, and your workspace is `~/AgentsHouse` unless you
|
|
8
|
+
Run `sh -c 'kit=$(curl -fsSL "$0") || { echo "House Kit could not be downloaded; run this command again." >&2; exit 1; }; eval "$kit"' agents.house/kit`,
|
|
9
|
+
or `& { try { $kit = irm agents.house/kit.ps1 } catch { throw 'House Kit could not be downloaded; run this command again.' }; & ([scriptblock]::Create($kit)) @args }` on Windows, which run nothing of a failed download, and again to update; options follow `agents.house/kit`.
|
|
10
|
+
On macOS and Linux it installs House Kit natively under your own account, without an admin password, as a service that runs
|
|
11
|
+
while you are logged in. `kit` and `house` are then on your login shell's `PATH`, and your workspace is `~/AgentsHouse` unless you
|
|
14
12
|
pass `--workspace <path>`.
|
|
15
13
|
|
|
16
14
|
Add `--container` to run House Kit in one Docker container instead, with your
|
|
17
15
|
workspace mounted at `/agents/house`; your Agents then reach only that
|
|
18
|
-
workspace. On Windows 11 the container is the one choice. Append a `kit` or
|
|
19
|
-
`house` command to the container's options to run it in that container.
|
|
16
|
+
workspace. On Windows 11 the container is the one choice. Append a `kit` or `house` command to the container's options to run it in that container.
|
|
20
17
|
Running the command for the other choice on a connected computer asks you to
|
|
21
|
-
confirm, then replaces its Environment, whose Agents end, with a new one.
|
|
18
|
+
confirm, then replaces its Environment, whose Agents end, with a new one. Running it with another `HOUSE_KIT_HOME`
|
|
19
|
+
than the installed Kit's asks you to confirm before it replaces that Kit, and leaves that Kit home as it was.
|
|
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, each through the Kit
|
|
41
|
+
home `$HOUSE_KIT_HOME` names where it runs, until you revoke that connection on Connections. `house help` lists the Tools. Codex sessions started after a
|
|
42
|
+
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,25 @@
|
|
|
1
1
|
import { client } from '@agentclientprotocol/sdk';
|
|
2
2
|
import { readFile, realpath } from 'node:fs/promises';
|
|
3
|
-
import {
|
|
3
|
+
import { setTimeout as delay } from 'node:timers/promises';
|
|
4
|
+
import { startAdapter } from './acp.js';
|
|
4
5
|
import { CLIS, KIT_VERSION, below, installAdapter, installCli, locate, run, versionOf } from './clis.js';
|
|
5
6
|
import { agentBase, kitHome } from './home.js';
|
|
6
|
-
|
|
7
|
+
import { updatesItself } from './placement.js';
|
|
8
|
+
import { killTree } from './scope.js';
|
|
9
|
+
import { holdTranscription, transcriptionReport } from './transcription.js';
|
|
10
|
+
import { KIT_WIRE } from './wire.js';
|
|
11
|
+
// Two quiet seconds let a fresh conversation start before background model discovery competes for its CPU.
|
|
12
|
+
const MODEL_PROBE_QUIET_MS = 2_000;
|
|
13
|
+
const SIGNED_OUT = { signed_in: false, models: [], modes: [] };
|
|
7
14
|
function select(options, category) {
|
|
8
15
|
const option = options.find((candidate) => candidate.category === category);
|
|
9
16
|
return option?.type === 'select' ? option : undefined;
|
|
10
17
|
}
|
|
18
|
+
function choices(options) {
|
|
19
|
+
return options.flatMap((entry) => ('group' in entry ? entry.options : [entry]));
|
|
20
|
+
}
|
|
11
21
|
function values(options) {
|
|
12
|
-
return
|
|
22
|
+
return choices(options).map((entry) => entry.value);
|
|
13
23
|
}
|
|
14
24
|
function causeOf(error) {
|
|
15
25
|
return error instanceof Error ? error.message : String(error);
|
|
@@ -17,13 +27,31 @@ function causeOf(error) {
|
|
|
17
27
|
function logged(error) {
|
|
18
28
|
process.stderr.write(`kit: ${causeOf(error)}\n`);
|
|
19
29
|
}
|
|
30
|
+
const LAPTOP_CHASSIS = new Set(['8', '9', '10', '14', '30', '31', '32']);
|
|
31
|
+
const DESKTOP_CHASSIS = new Set(['3', '4', '5', '6', '7', '15', '16']);
|
|
32
|
+
const SERVER_CHASSIS = new Set(['17', '18', '19', '20', '21', '22', '23', '24']);
|
|
33
|
+
export function chassisForm(value) {
|
|
34
|
+
const chassis = value.trim();
|
|
35
|
+
if (LAPTOP_CHASSIS.has(chassis))
|
|
36
|
+
return 'laptop';
|
|
37
|
+
if (DESKTOP_CHASSIS.has(chassis))
|
|
38
|
+
return 'desktop';
|
|
39
|
+
if (SERVER_CHASSIS.has(chassis))
|
|
40
|
+
return 'server';
|
|
41
|
+
return undefined;
|
|
42
|
+
}
|
|
43
|
+
export function hostVm(version) {
|
|
44
|
+
return /docker desktop|microsoft|wsl|linuxkit/i.test(version);
|
|
45
|
+
}
|
|
20
46
|
async function models(kind, adapter, known) {
|
|
21
47
|
const agent = adapter.connection.agent;
|
|
22
48
|
const opened = await agent.request('session/new', { cwd: kitHome(), mcpServers: [] });
|
|
23
49
|
let options = opened.configOptions ?? [];
|
|
50
|
+
const mode = select(options, 'mode');
|
|
51
|
+
const modes = mode === undefined ? [] : choices(mode.options).map(({ value, name }) => ({ mode: value, name }));
|
|
24
52
|
const model = select(options, 'model');
|
|
25
53
|
if (model === undefined)
|
|
26
|
-
return [];
|
|
54
|
+
return { models: [], modes };
|
|
27
55
|
const offered = [];
|
|
28
56
|
for (const value of values(model.options)) {
|
|
29
57
|
if (select(options, 'model')?.currentValue !== value) {
|
|
@@ -39,25 +67,46 @@ async function models(kind, adapter, known) {
|
|
|
39
67
|
const effort = select(options, 'thought_level');
|
|
40
68
|
offered.push({ model: value, efforts: effort === undefined ? [] : values(effort.options) });
|
|
41
69
|
}
|
|
42
|
-
return offered;
|
|
70
|
+
return { models: offered, modes };
|
|
43
71
|
}
|
|
44
|
-
async function
|
|
72
|
+
async function signedIn(kind, cli, known, signal) {
|
|
45
73
|
const probe = CLIS[kind].signedIn;
|
|
46
|
-
|
|
74
|
+
// A sign-in check that has not answered in half a minute counts as signed out rather than stalling the report.
|
|
75
|
+
if ('command' in probe)
|
|
76
|
+
return (await run(cli, probe.command, 30_000, false, signal)).status === 0;
|
|
77
|
+
return (await offer(kind, cli, known, signal)).signed_in;
|
|
78
|
+
}
|
|
79
|
+
function ended(signal) {
|
|
80
|
+
return new Promise((_, reject) => {
|
|
81
|
+
if (signal.aborted)
|
|
82
|
+
reject(signal.reason);
|
|
83
|
+
signal.addEventListener('abort', () => reject(signal.reason), { once: true });
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
async function offer(kind, cli, known, signal) {
|
|
87
|
+
const probe = CLIS[kind].signedIn;
|
|
88
|
+
// A sign-in check that has not answered in half a minute counts as signed out rather than stalling the report.
|
|
89
|
+
if ('command' in probe && (await run(cli, probe.command, 30_000, false, signal)).status !== 0)
|
|
47
90
|
return SIGNED_OUT;
|
|
48
91
|
let adapter;
|
|
49
92
|
try {
|
|
50
|
-
adapter = await startAdapter(kind, cli, kitHome(), client({ name: '@agentshouse/kit' }));
|
|
93
|
+
adapter = await startAdapter(kind, cli, kitHome(), client({ name: '@agentshouse/kit' }), () => undefined, {}, signal);
|
|
94
|
+
signal?.throwIfAborted();
|
|
51
95
|
if ('initializeMeta' in probe) {
|
|
52
96
|
const method = adapter.initialized._meta?.[probe.initializeMeta];
|
|
53
97
|
if (typeof method !== 'string' || method.length === 0)
|
|
54
98
|
return SIGNED_OUT;
|
|
55
99
|
}
|
|
56
|
-
return { signed_in: true,
|
|
100
|
+
return { signed_in: true, ...(await models(kind, adapter, known.models)) };
|
|
57
101
|
}
|
|
58
102
|
catch (error) {
|
|
59
|
-
|
|
60
|
-
|
|
103
|
+
if (!signal?.aborted)
|
|
104
|
+
process.stderr.write(`kit: ${kind} did not offer its models: ${causeOf(error)}\n`);
|
|
105
|
+
return {
|
|
106
|
+
signed_in: adapter === undefined && 'initializeMeta' in probe ? known.signed_in : true,
|
|
107
|
+
models: known.models,
|
|
108
|
+
modes: known.modes,
|
|
109
|
+
};
|
|
61
110
|
}
|
|
62
111
|
finally {
|
|
63
112
|
if (adapter !== undefined)
|
|
@@ -72,34 +121,62 @@ function reported(kind, reading) {
|
|
|
72
121
|
failure: reading.failure,
|
|
73
122
|
signed_in: reading.signed_in,
|
|
74
123
|
models: reading.models,
|
|
124
|
+
modes: reading.modes,
|
|
125
|
+
full_access: CLIS[kind].fullAccess,
|
|
75
126
|
};
|
|
76
127
|
}
|
|
128
|
+
const NOT_READY = "the Agent's CLI is not ready on this computer";
|
|
77
129
|
function tooOld(kind, release) {
|
|
78
130
|
const cli = CLIS[kind];
|
|
79
131
|
return `${cli.bin} ${release} is older than ${cli.minimum}, the oldest this Kit runs`;
|
|
80
132
|
}
|
|
81
133
|
async function sshHostKey() {
|
|
134
|
+
// Listing a local host key takes a moment, so ten seconds only bounds a stuck ssh-keygen.
|
|
82
135
|
const listed = await run('ssh-keygen', ['-l', '-E', 'sha256', '-f', '/etc/ssh/ssh_host_ed25519_key.pub'], 10_000);
|
|
83
136
|
return listed.status === 0 ? (/^\d+ (SHA256:\S+)/.exec(listed.output)?.[1] ?? null) : null;
|
|
84
137
|
}
|
|
85
138
|
async function operatingSystem() {
|
|
139
|
+
// sw_vers answers at once, so ten seconds only bounds a stuck call.
|
|
86
140
|
if (process.platform === 'darwin')
|
|
87
141
|
return `macOS ${(await run('sw_vers', ['-productVersion'], 10_000)).output.trim()}`;
|
|
88
142
|
const release = await readFile('/etc/os-release', 'utf8');
|
|
89
143
|
return /^PRETTY_NAME="?([^"\n]*)"?$/m.exec(release)?.[1] ?? release;
|
|
90
144
|
}
|
|
145
|
+
async function hostForm() {
|
|
146
|
+
if (process.platform === 'darwin') {
|
|
147
|
+
const battery = await run('pmset', ['-g', 'batt'], 10_000);
|
|
148
|
+
return battery.status === 0 && battery.output.includes('InternalBattery') ? 'laptop' : 'desktop';
|
|
149
|
+
}
|
|
150
|
+
if (process.platform !== 'linux')
|
|
151
|
+
return undefined;
|
|
152
|
+
const [container, version, chassis] = await Promise.all([
|
|
153
|
+
readFile('/.dockerenv', 'utf8').then(() => true).catch(() => false),
|
|
154
|
+
readFile('/proc/version', 'utf8').catch(() => ''),
|
|
155
|
+
readFile('/sys/class/dmi/id/chassis_type', 'utf8').catch(() => ''),
|
|
156
|
+
]);
|
|
157
|
+
if (container && hostVm(version))
|
|
158
|
+
return undefined;
|
|
159
|
+
return chassisForm(chassis);
|
|
160
|
+
}
|
|
91
161
|
export class Agents {
|
|
92
|
-
desired = { agents: [], routes: [] };
|
|
162
|
+
desired = { agents: [], routes: [], transcribe: false };
|
|
93
163
|
house;
|
|
94
164
|
reading = Promise.resolve();
|
|
95
165
|
queues = new Map();
|
|
96
166
|
installing = Promise.resolve();
|
|
97
167
|
readings = new Map();
|
|
98
168
|
reads = new Map();
|
|
169
|
+
starts = 0;
|
|
99
170
|
sending = Promise.resolve();
|
|
100
171
|
sent = null;
|
|
101
|
-
|
|
172
|
+
refreshing = 0;
|
|
173
|
+
changed;
|
|
174
|
+
constructor(house, changed = () => undefined) {
|
|
102
175
|
this.house = house;
|
|
176
|
+
this.changed = changed;
|
|
177
|
+
}
|
|
178
|
+
idle() {
|
|
179
|
+
return this.refreshing === 0;
|
|
103
180
|
}
|
|
104
181
|
read() {
|
|
105
182
|
return this.reading.then(() => undefined, () => undefined);
|
|
@@ -108,32 +185,45 @@ export class Agents {
|
|
|
108
185
|
return this.desired.routes.find((route) => route.agent_id === agentId);
|
|
109
186
|
}
|
|
110
187
|
refresh() {
|
|
188
|
+
this.refreshing++;
|
|
189
|
+
this.changed();
|
|
111
190
|
const reading = this.read().then(async () => {
|
|
112
191
|
this.desired = await this.house.deliver('/kit/agents/desired', {});
|
|
113
192
|
return this.desired;
|
|
114
193
|
});
|
|
115
194
|
this.reading = reading;
|
|
116
|
-
|
|
117
|
-
|
|
195
|
+
reading
|
|
196
|
+
.then(({ agents, transcribe }) => Promise.all([
|
|
197
|
+
holdTranscription(transcribe)
|
|
198
|
+
.then((changed) => (changed ? this.report() : undefined))
|
|
199
|
+
.catch(logged),
|
|
200
|
+
Promise.all(agents.map((kind) => this.load(kind)))
|
|
118
201
|
.then(() => this.report())
|
|
119
|
-
.catch(logged)
|
|
202
|
+
.catch(logged),
|
|
203
|
+
]))
|
|
204
|
+
.catch(() => undefined)
|
|
205
|
+
.finally(() => {
|
|
206
|
+
this.refreshing--;
|
|
207
|
+
this.changed();
|
|
120
208
|
});
|
|
209
|
+
return reading.then(() => undefined);
|
|
121
210
|
}
|
|
122
211
|
cli(kind) {
|
|
212
|
+
this.starts += 1;
|
|
123
213
|
return this.queue(kind, async () => {
|
|
124
214
|
const resolved = await this.resolve(kind);
|
|
125
215
|
if (!('cli' in resolved)) {
|
|
126
216
|
this.update(kind, resolved);
|
|
127
|
-
throw new Error(resolved.failure
|
|
217
|
+
throw new Error(resolved.failure === null ? tooOld(kind, resolved.release) : NOT_READY);
|
|
128
218
|
}
|
|
129
219
|
const { cli, release } = resolved;
|
|
130
220
|
const known = this.readings.get(kind);
|
|
131
221
|
const kept = known?.release === null || known?.minimum !== undefined ? SIGNED_OUT : (known ?? SIGNED_OUT);
|
|
132
222
|
if (known?.release !== release || known.minimum !== undefined) {
|
|
133
|
-
this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models });
|
|
223
|
+
this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models, modes: kept.modes });
|
|
134
224
|
}
|
|
135
225
|
const read = this.nextRead(kind);
|
|
136
|
-
|
|
226
|
+
this.quietOffer(kind, cli, kept)
|
|
137
227
|
.then((offered) => {
|
|
138
228
|
const current = this.readings.get(kind);
|
|
139
229
|
if (this.reads.get(kind) === read && current?.release === release)
|
|
@@ -143,16 +233,19 @@ export class Agents {
|
|
|
143
233
|
return cli;
|
|
144
234
|
});
|
|
145
235
|
}
|
|
146
|
-
located(kind) {
|
|
147
|
-
return this.queue(kind, () => this.ensure(kind));
|
|
236
|
+
located(kind, signal) {
|
|
237
|
+
return this.queue(kind, () => this.ensure(kind, signal), signal);
|
|
148
238
|
}
|
|
149
239
|
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
|
-
});
|
|
240
|
+
await this.examine(kind, this.readings.get(kind) ?? SIGNED_OUT, offer);
|
|
154
241
|
await this.report();
|
|
155
242
|
}
|
|
243
|
+
async recheck(kind, signal) {
|
|
244
|
+
const known = this.readings.get(kind) ?? SIGNED_OUT;
|
|
245
|
+
await this.examine(kind, known, async (kind, cli) => ((await signedIn(kind, cli, known, signal)) ? { ...known, signed_in: true } : SIGNED_OUT), signal);
|
|
246
|
+
if (!signal.aborted)
|
|
247
|
+
await this.report();
|
|
248
|
+
}
|
|
156
249
|
report() {
|
|
157
250
|
const sending = this.sending.catch(() => undefined).then(() => this.send());
|
|
158
251
|
this.sending = sending;
|
|
@@ -167,39 +260,42 @@ export class Agents {
|
|
|
167
260
|
this.readings.set(kind, reading);
|
|
168
261
|
this.report().catch(logged);
|
|
169
262
|
}
|
|
170
|
-
queue(kind, work) {
|
|
171
|
-
const queued = (this.queues.get(kind) ?? Promise.resolve()).then(
|
|
263
|
+
queue(kind, work, signal) {
|
|
264
|
+
const queued = (this.queues.get(kind) ?? Promise.resolve()).then(() => {
|
|
265
|
+
signal?.throwIfAborted();
|
|
266
|
+
return work();
|
|
267
|
+
});
|
|
172
268
|
this.queues.set(kind, queued.catch(() => undefined));
|
|
173
|
-
return queued;
|
|
269
|
+
return signal === undefined ? queued : Promise.race([queued, ended(signal)]);
|
|
174
270
|
}
|
|
175
|
-
async ensure(kind) {
|
|
176
|
-
const failed = await installAdapter(kind);
|
|
271
|
+
async ensure(kind, signal) {
|
|
272
|
+
const failed = await installAdapter(kind, signal);
|
|
177
273
|
if (failed !== null)
|
|
178
274
|
throw new Error(failed);
|
|
179
|
-
const found = await locate(kind);
|
|
275
|
+
const found = await locate(kind, signal);
|
|
180
276
|
if (found !== null)
|
|
181
277
|
return found;
|
|
182
|
-
const installing = this.installing.catch(() => undefined).then(() => installCli(kind));
|
|
278
|
+
const installing = this.installing.catch(() => undefined).then(() => installCli(kind, signal));
|
|
183
279
|
this.installing = installing;
|
|
184
280
|
const failure = await installing;
|
|
185
281
|
if (failure !== null)
|
|
186
282
|
throw new Error(failure);
|
|
187
|
-
const installed = await locate(kind);
|
|
283
|
+
const installed = await locate(kind, signal);
|
|
188
284
|
if (installed === null)
|
|
189
285
|
throw new Error(`the login shell does not find ${CLIS[kind].bin} after its install`);
|
|
190
286
|
return installed;
|
|
191
287
|
}
|
|
192
|
-
async resolve(kind) {
|
|
288
|
+
async resolve(kind, signal) {
|
|
193
289
|
let cli;
|
|
194
290
|
try {
|
|
195
|
-
cli = await realpath(await this.ensure(kind));
|
|
291
|
+
cli = await realpath(await this.ensure(kind, signal));
|
|
196
292
|
}
|
|
197
293
|
catch (error) {
|
|
198
294
|
const failure = causeOf(error);
|
|
199
295
|
process.stderr.write(`kit: ${kind} did not install: ${failure}\n`);
|
|
200
296
|
return { release: null, failure, ...SIGNED_OUT };
|
|
201
297
|
}
|
|
202
|
-
const release = await versionOf(cli);
|
|
298
|
+
const release = await versionOf(cli, signal);
|
|
203
299
|
if (release === null)
|
|
204
300
|
return { release: null, failure: `${cli} --version names no version`, ...SIGNED_OUT };
|
|
205
301
|
const minimum = CLIS[kind].minimum;
|
|
@@ -207,18 +303,26 @@ export class Agents {
|
|
|
207
303
|
return { release, minimum, failure: null, ...SIGNED_OUT };
|
|
208
304
|
return { cli, release };
|
|
209
305
|
}
|
|
210
|
-
async examine(kind, known) {
|
|
211
|
-
const
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
306
|
+
async examine(kind, known, read, signal) {
|
|
307
|
+
const current = this.nextRead(kind);
|
|
308
|
+
const resolved = await this.queue(kind, () => this.resolve(kind, signal), signal);
|
|
309
|
+
const reading = 'cli' in resolved ? { release: resolved.release, failure: null, ...(await read(kind, resolved.cli, known)) } : resolved;
|
|
310
|
+
if (this.reads.get(kind) === current && !signal?.aborted)
|
|
311
|
+
this.readings.set(kind, reading);
|
|
312
|
+
}
|
|
313
|
+
async quietOffer(kind, cli, known) {
|
|
314
|
+
for (let seen = -1; seen !== this.starts;) {
|
|
315
|
+
seen = this.starts;
|
|
316
|
+
await delay(MODEL_PROBE_QUIET_MS);
|
|
317
|
+
}
|
|
318
|
+
return offer(kind, cli, known);
|
|
215
319
|
}
|
|
216
320
|
async load(kind) {
|
|
217
321
|
const known = this.readings.get(kind);
|
|
218
|
-
if (known !== undefined && known.failure === null)
|
|
322
|
+
if (known !== undefined && known.failure === null && known.minimum === undefined)
|
|
219
323
|
return;
|
|
220
|
-
this.
|
|
221
|
-
|
|
324
|
+
await this.examine(kind, SIGNED_OUT, (kind, cli, known) => this.quietOffer(kind, cli, known));
|
|
325
|
+
await this.report();
|
|
222
326
|
}
|
|
223
327
|
async send() {
|
|
224
328
|
const agents = this.desired.agents.flatMap((kind) => {
|
|
@@ -226,11 +330,16 @@ export class Agents {
|
|
|
226
330
|
return reading === undefined ? [] : [reported(kind, reading)];
|
|
227
331
|
});
|
|
228
332
|
const hostKey = await sshHostKey();
|
|
333
|
+
const form = await hostForm();
|
|
229
334
|
const body = {
|
|
230
335
|
os: await operatingSystem(),
|
|
336
|
+
...(form === undefined ? {} : { form }),
|
|
231
337
|
kit_version: KIT_VERSION,
|
|
338
|
+
wire: KIT_WIRE,
|
|
339
|
+
updates_itself: await updatesItself(),
|
|
232
340
|
agent_base: agentBase(),
|
|
233
341
|
agents,
|
|
342
|
+
transcription: transcriptionReport(),
|
|
234
343
|
...(hostKey === null ? {} : { ssh_host_key: hostKey }),
|
|
235
344
|
};
|
|
236
345
|
const state = JSON.stringify(body);
|