@agentshouse/kit 0.2.1-c53a84236c3d9 → 0.2.1-c57b73ff93a76
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 +44 -43
- package/dist/acp.js +90 -19
- package/dist/agents.js +118 -40
- package/dist/api.js +7 -3
- package/dist/app-git.js +10 -26
- package/dist/authority-main.js +2 -2
- package/dist/bridge.js +4 -7
- package/dist/building.js +46 -0
- package/dist/calls.js +71 -0
- package/dist/chatgpt.js +32 -0
- package/dist/clis-main.js +2 -2
- package/dist/clis.js +92 -23
- package/dist/connection.js +116 -0
- package/dist/conversations.js +531 -177
- package/dist/copies.js +91 -54
- package/dist/end.js +29 -4
- package/dist/enrol-main.js +7 -1
- package/dist/events.js +33 -8
- package/dist/files.js +139 -31
- package/dist/git.js +13 -11
- package/dist/home.js +96 -7
- package/dist/house-cli.js +299 -0
- package/dist/house-main.js +7 -188
- package/dist/instructions.js +7 -10
- package/dist/kit-cli.js +68 -0
- package/dist/kit-main.js +8 -22
- package/dist/login.js +113 -23
- package/dist/logout.js +0 -2
- package/dist/mcp.js +6 -2
- package/dist/parts.js +34 -16
- package/dist/placement.js +39 -0
- package/dist/relay.js +33 -2
- package/dist/resident.js +99 -34
- package/dist/scope.js +3 -0
- package/dist/scripts.js +255 -0
- package/dist/service-main.js +9 -0
- package/dist/service.js +55 -0
- package/dist/sign-in.js +22 -39
- package/dist/silence.js +28 -0
- package/dist/skills.js +49 -35
- package/dist/transcription.js +85 -45
- package/dist/translate.js +2 -8
- package/dist/update.js +115 -53
- package/dist/wire.js +22 -0
- package/dist/work.js +3 -5
- package/package.json +20 -20
- package/dist/bootstrap.json +0 -24
- package/dist/stream.js +0 -72
- package/how-we-work.md +0 -23
- package/skills/ask-matt/LICENSE +0 -21
- package/skills/ask-matt/PHASE-BOUNDARIES.md +0 -55
- package/skills/ask-matt/SKILL.md +0 -91
- package/skills/ask-matt/agents/openai.yaml +0 -4
- package/skills/code-review/LICENSE +0 -21
- package/skills/code-review/SKILL.md +0 -89
- package/skills/code-review/agents/openai.yaml +0 -3
- package/skills/codebase-design/DEEPENING.md +0 -37
- package/skills/codebase-design/DESIGN-IT-TWICE.md +0 -44
- package/skills/codebase-design/LICENSE +0 -21
- package/skills/codebase-design/SKILL.md +0 -116
- package/skills/codebase-design/agents/openai.yaml +0 -3
- package/skills/diagnosing-bugs/LICENSE +0 -21
- package/skills/diagnosing-bugs/SKILL.md +0 -140
- package/skills/diagnosing-bugs/agents/openai.yaml +0 -3
- package/skills/diagnosing-bugs/scripts/hitl-loop.template.sh +0 -44
- package/skills/domain-modeling/ADR-FORMAT.md +0 -47
- package/skills/domain-modeling/CONTEXT-FORMAT.md +0 -60
- package/skills/domain-modeling/LICENSE +0 -21
- package/skills/domain-modeling/SKILL.md +0 -76
- package/skills/domain-modeling/agents/openai.yaml +0 -3
- package/skills/grill-me/LICENSE +0 -21
- package/skills/grill-me/SKILL.md +0 -8
- package/skills/grill-me/agents/openai.yaml +0 -4
- package/skills/grill-with-docs/LICENSE +0 -21
- package/skills/grill-with-docs/SKILL.md +0 -8
- package/skills/grill-with-docs/agents/openai.yaml +0 -4
- package/skills/grilling/LICENSE +0 -21
- package/skills/grilling/SKILL.md +0 -30
- package/skills/grilling/agents/openai.yaml +0 -3
- package/skills/handoff/LICENSE +0 -21
- package/skills/handoff/SKILL.md +0 -17
- package/skills/handoff/agents/openai.yaml +0 -4
- package/skills/implement/LICENSE +0 -21
- package/skills/implement/SKILL.md +0 -16
- package/skills/implement/agents/openai.yaml +0 -4
- package/skills/improve-codebase-architecture/HTML-REPORT.md +0 -123
- package/skills/improve-codebase-architecture/LICENSE +0 -21
- package/skills/improve-codebase-architecture/SKILL.md +0 -72
- package/skills/improve-codebase-architecture/agents/openai.yaml +0 -4
- package/skills/prototype/LICENSE +0 -21
- package/skills/prototype/LOGIC.md +0 -67
- package/skills/prototype/SKILL.md +0 -28
- package/skills/prototype/UI.md +0 -112
- package/skills/prototype/agents/openai.yaml +0 -3
- package/skills/research/LICENSE +0 -21
- package/skills/research/SKILL.md +0 -14
- package/skills/research/agents/openai.yaml +0 -3
- package/skills/resolving-merge-conflicts/LICENSE +0 -21
- package/skills/resolving-merge-conflicts/SKILL.md +0 -16
- package/skills/resolving-merge-conflicts/agents/openai.yaml +0 -3
- package/skills/tdd/LICENSE +0 -21
- package/skills/tdd/SKILL.md +0 -40
- package/skills/tdd/agents/openai.yaml +0 -3
- package/skills/tdd/mocking.md +0 -59
- package/skills/tdd/tests.md +0 -77
- package/skills/teach/GLOSSARY-FORMAT.md +0 -35
- package/skills/teach/LEARNING-RECORD-FORMAT.md +0 -46
- package/skills/teach/LICENSE +0 -21
- package/skills/teach/MISSION-FORMAT.md +0 -31
- package/skills/teach/RESOURCES-FORMAT.md +0 -32
- package/skills/teach/SKILL.md +0 -141
- package/skills/teach/agents/openai.yaml +0 -4
- package/skills/to-questionnaire/LICENSE +0 -21
- package/skills/to-questionnaire/SKILL.md +0 -55
- package/skills/to-questionnaire/agents/openai.yaml +0 -4
- package/skills/to-spec/LICENSE +0 -21
- package/skills/to-spec/SKILL.md +0 -76
- package/skills/to-spec/agents/openai.yaml +0 -4
- package/skills/to-tickets/LICENSE +0 -21
- package/skills/to-tickets/SKILL.md +0 -106
- package/skills/to-tickets/agents/openai.yaml +0 -4
- package/skills/wait-what/LICENSE +0 -21
- package/skills/wait-what/SKILL.md +0 -8
- package/skills/wait-what/agents/openai.yaml +0 -4
- package/skills/wayfinder/LICENSE +0 -21
- package/skills/wayfinder/SKILL.md +0 -129
- package/skills/wayfinder/agents/openai.yaml +0 -4
- package/skills/writing-for-agents/LICENSE +0 -21
- package/skills/writing-for-agents/SKILL-MECHANICS.md +0 -22
- package/skills/writing-for-agents/SKILL.md +0 -83
- package/skills/writing-for-agents/agents/openai.yaml +0 -3
package/README.md
CHANGED
|
@@ -1,59 +1,60 @@
|
|
|
1
|
-
#
|
|
1
|
+
# Kit
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
through the agent CLIs you chose and gives each Agent the `house` command.
|
|
3
|
+
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
|
|
12
|
-
|
|
13
|
-
your login shell's `PATH`, and your workspace is `~/AgentsHouse` unless you
|
|
8
|
+
Run `sh -c 'kit=$(curl -fsSL "$0") || { echo "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 '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 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
|
-
Add `--container` to run
|
|
14
|
+
Add `--container` to run 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
|
|
19
|
-
`house` command to the container's options to run it in that container.
|
|
16
|
+
workspace. On Windows 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 a different `HOUSE_KIT_HOME`
|
|
19
|
+
from the running Kit process asks you to confirm before it replaces that process, and leaves the earlier Kit home as it was.
|
|
22
20
|
|
|
23
|
-
On your own
|
|
24
|
-
install House Kit natively, with its workspace at `/agents/house`; `kit` and
|
|
25
|
-
`house` are then on the server's `PATH`.
|
|
21
|
+
On your own Linux server, run the Linux command with `--linux` to install Kit natively, with its workspace at `/agents/house` and a missing `ca-certificates`, `curl` or `git` installed through apt; `kit` and `house` are then on the server's `PATH`.
|
|
26
22
|
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
23
|
+
Kit is built for macOS 27 on Apple silicon, Ubuntu 26.04 LTS on amd64 and Windows 11 on amd64. On another release, distribution or architecture the command prints one warning line, such as `Warning: macOS 26.7.1 is outdated; update to macOS 27.`, and installs anyway. It refuses only an architecture other than amd64 and arm64, and a native install on a Linux without glibc, where `--container` still runs Kit. On a Linux without systemd it installs and connects Kit but starts nothing: run the `kit resident` command it prints under your own service manager, restarting it whenever it ends with a failure. `--container` installs Docker Engine on Ubuntu and Debian; another Linux needs a working Docker Engine first.
|
|
24
|
+
|
|
25
|
+
Kit runs the agent CLIs your login shell finds and installs a missing one
|
|
26
|
+
through that CLI's own installer. A CLI older than the oldest release Kit is built for still runs, though its conversations may fail: Kit tells House its version, that oldest release and the CLI's own update command, such as `claude update`. Running the command again offers to update
|
|
27
|
+
each CLI older than Kit needs; add `--update-clis` to update every one to
|
|
28
|
+
its latest release without asking. Kit also gives every Agent on the
|
|
29
|
+
Environment the agent skills of `@agentshouse/skills`, at the version each Kit
|
|
30
|
+
release installs. Add `--no-skills` to the command to leave them out; running it again without the flag brings them back.
|
|
33
31
|
|
|
34
32
|
## Commands
|
|
35
33
|
|
|
36
|
-
`kit login` opens or prints a link you confirm in any browser, on this
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
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 the Kit process 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 you chose for it as a
|
|
49
|
+
Git repository in the workspace's `local-copies`, and keeps a Room's copy as it is, no longer refreshing it, once the
|
|
50
|
+
Room may no longer be copied here. `house fetch` does the same and records House's changes on each copy's
|
|
51
|
+
`refs/house/received`; rebase onto it, commit and run `house push --owner` in the copy, through the install command in
|
|
52
|
+
the container. An Agent runs both, without `--owner`. `house upload` and `house download` move a Room's other files straight between disk and House's store, and a broken upload resumes on its own.
|
|
53
|
+
|
|
54
|
+
Kit turns each audio file your message to an Agent links into text on this computer before the Agent reads it, and keeps a message whose audio it cannot turn into text from starting. While transcription is on, the speech engine and model use about 425 MB beside the Environment's credential; turning it off deletes them.
|
|
55
|
+
|
|
56
|
+
When you press Run on a Web Wizard's page, Kit runs its script with `bash` in a terminal on this computer, as you, in the home and directory it runs agent CLIs from, with your login shell's `PATH`; the page shows that terminal and takes your typing, and closing the page, or Kit losing its connection to House, ends the script and its child processes. Kit keeps nothing the script prints or you type. A script you keep as a function from a Web Wizard runs as you, from the same home, directory and `PATH`, when a Trigger of your Private Room or your agent runs it, with no terminal and nothing on its standard input, and when you press Run now on its page, in a terminal you can type into. Kit writes the run's input as JSON to a file only you can read, whose path is in `HOUSE_INPUT`, and deletes it when the run ends; it ends the script and its child processes at the run's time limit or when it loses its connection to House, and sends House the end of what the script printed, up to the run's output limit, without any line that holds a line you typed.
|
|
56
57
|
|
|
57
58
|
## License
|
|
58
59
|
|
|
59
|
-
MIT.
|
|
60
|
+
MIT.
|
package/dist/acp.js
CHANGED
|
@@ -1,46 +1,113 @@
|
|
|
1
|
-
import { ndJsonStream, PROTOCOL_VERSION, } from '@agentclientprotocol/sdk';
|
|
1
|
+
import { ndJsonStream, PROTOCOL_VERSION, RequestError, } from '@agentclientprotocol/sdk';
|
|
2
2
|
import { spawn } from 'node:child_process';
|
|
3
3
|
import { Readable, Writable } from 'node:stream';
|
|
4
|
-
import { CLIS,
|
|
4
|
+
import { CLIS, KIT_RELEASE, adapterCommand } from './clis.js';
|
|
5
|
+
import { childEnvironment } from './relay.js';
|
|
5
6
|
import { killTree } from './scope.js';
|
|
7
|
+
import { Silence } from './silence.js';
|
|
8
|
+
const RETIRED = 'the CLI was retired';
|
|
9
|
+
const SIGNED_OUT = RequestError.authRequired().code;
|
|
10
|
+
export function signedOut(error) {
|
|
11
|
+
return typeof error === 'object' && error !== null && error.code === SIGNED_OUT;
|
|
12
|
+
}
|
|
13
|
+
// Claude Code ends a shell command or a model request after ten minutes, so a CLI that owes the Kit an answer and sends nothing for half an hour has hung.
|
|
14
|
+
export const CLI_SILENCE_MS = 30 * 60_000;
|
|
15
|
+
const SILENT = `the CLI sent nothing for ${CLI_SILENCE_MS / 60_000} minutes`;
|
|
6
16
|
export async function startAdapter(kind, cli, cwd, app, events = () => undefined, added = {}, signal, scope = null) {
|
|
7
17
|
const adapter = CLIS[kind].adapter;
|
|
8
18
|
const started = [adapter === null ? cli : adapterCommand(kind), CLIS[kind].args];
|
|
9
19
|
const [command, args] = scope?.command(...started) ?? started;
|
|
10
20
|
const child = spawn(command, args, {
|
|
11
21
|
cwd,
|
|
12
|
-
env: { ...
|
|
22
|
+
env: { ...childEnvironment(), ...(adapter === null ? {} : { ...adapter.env, [adapter.executable]: cli }), ...added },
|
|
13
23
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
14
24
|
detached: true,
|
|
15
25
|
});
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
26
|
+
let owned = true;
|
|
27
|
+
let retired = false;
|
|
28
|
+
let silent = false;
|
|
29
|
+
let over = false;
|
|
30
|
+
let open = false;
|
|
19
31
|
let stderr = '';
|
|
32
|
+
const owed = new Set();
|
|
33
|
+
const asked = new Set();
|
|
34
|
+
const silence = new Silence(CLI_SILENCE_MS, () => {
|
|
35
|
+
silent = true;
|
|
36
|
+
connection.close(new Error(SILENT));
|
|
37
|
+
if (child.pid !== undefined)
|
|
38
|
+
killTree(child);
|
|
39
|
+
});
|
|
40
|
+
const watch = () => (!over && (owed.size > 0 || open) && asked.size === 0 ? silence.heard() : silence.stop());
|
|
20
41
|
child.stderr.on('data', (chunk) => {
|
|
21
42
|
stderr = (stderr + chunk.toString('utf8')).slice(-4000);
|
|
22
43
|
});
|
|
23
|
-
const exited = new Promise((resolve) => {
|
|
24
|
-
child.on('error', (error) => resolve(`the CLI did not start: ${error.message}`));
|
|
25
|
-
child.on('exit', (code, signal) => {
|
|
26
|
-
const last = stderr.trim().split('\n').at(-1);
|
|
27
|
-
resolve(`the CLI exited with ${code ?? signal}${last ? `: ${last}` : ''}`);
|
|
28
|
-
});
|
|
29
|
-
});
|
|
30
44
|
const stream = ndJsonStream(Writable.toWeb(child.stdin), Readable.toWeb(child.stdout));
|
|
45
|
+
const output = stream.writable.getWriter();
|
|
31
46
|
const connection = app.connect({
|
|
32
|
-
writable:
|
|
47
|
+
writable: new WritableStream({
|
|
48
|
+
write(message) {
|
|
49
|
+
const sent = message;
|
|
50
|
+
if (sent.id !== undefined) {
|
|
51
|
+
if (sent.method === undefined)
|
|
52
|
+
asked.delete(sent.id);
|
|
53
|
+
else
|
|
54
|
+
owed.add(sent.id);
|
|
55
|
+
watch();
|
|
56
|
+
}
|
|
57
|
+
return output.write(message);
|
|
58
|
+
},
|
|
59
|
+
close: () => output.close(),
|
|
60
|
+
abort: (reason) => output.abort(reason),
|
|
61
|
+
}),
|
|
33
62
|
readable: stream.readable.pipeThrough(new TransformStream({
|
|
34
63
|
transform(message, controller) {
|
|
35
64
|
const read = message;
|
|
36
|
-
|
|
65
|
+
if (read.id !== undefined) {
|
|
66
|
+
if (read.method === undefined)
|
|
67
|
+
owed.delete(read.id);
|
|
68
|
+
else
|
|
69
|
+
asked.add(read.id);
|
|
70
|
+
}
|
|
71
|
+
watch();
|
|
72
|
+
if (owned)
|
|
73
|
+
events(read);
|
|
37
74
|
if (read.id !== undefined || (read.method !== 'session/update' && !read.method.startsWith('_'))) {
|
|
38
75
|
controller.enqueue(message);
|
|
39
76
|
}
|
|
40
77
|
},
|
|
41
78
|
})),
|
|
42
79
|
});
|
|
43
|
-
|
|
80
|
+
const { promise: lost, resolve: lose } = Promise.withResolvers();
|
|
81
|
+
const exited = new Promise((resolve) => {
|
|
82
|
+
const end = (cause) => {
|
|
83
|
+
over = true;
|
|
84
|
+
silence.stop();
|
|
85
|
+
if (owned)
|
|
86
|
+
lose(cause);
|
|
87
|
+
owned = false;
|
|
88
|
+
connection.close(new Error(cause));
|
|
89
|
+
resolve(cause);
|
|
90
|
+
};
|
|
91
|
+
child.on('error', (error) => end(`the CLI did not start: ${error.message}`));
|
|
92
|
+
child.on('exit', (code, signal) => {
|
|
93
|
+
const last = stderr.trim().split('\n').at(-1);
|
|
94
|
+
end(silent ? SILENT : `the CLI exited with ${code ?? signal}${last ? `: ${last}` : ''}`);
|
|
95
|
+
});
|
|
96
|
+
});
|
|
97
|
+
const retire = () => {
|
|
98
|
+
owned = false;
|
|
99
|
+
over = true;
|
|
100
|
+
silence.stop();
|
|
101
|
+
if (retired)
|
|
102
|
+
return;
|
|
103
|
+
retired = true;
|
|
104
|
+
if (child.pid !== undefined)
|
|
105
|
+
killTree(child);
|
|
106
|
+
scope?.kill();
|
|
107
|
+
connection.close(new Error(RETIRED));
|
|
108
|
+
};
|
|
109
|
+
signal?.addEventListener('abort', retire, { once: true });
|
|
110
|
+
child.on('exit', () => signal?.removeEventListener('abort', retire));
|
|
44
111
|
try {
|
|
45
112
|
const initialized = await connection.agent.request('initialize', {
|
|
46
113
|
protocolVersion: PROTOCOL_VERSION,
|
|
@@ -51,13 +118,17 @@ export async function startAdapter(kind, cli, cwd, app, events = () => undefined
|
|
|
51
118
|
session: { compaction: {}, notices: {} },
|
|
52
119
|
_meta: { jetbrains: { air: { version: 1, capabilities: CLIS[kind].air } } },
|
|
53
120
|
},
|
|
54
|
-
clientInfo: { name: '@agentshouse/kit', version:
|
|
121
|
+
clientInfo: { name: '@agentshouse/kit', version: KIT_RELEASE },
|
|
55
122
|
});
|
|
56
123
|
scope?.entered(child.pid);
|
|
57
|
-
|
|
124
|
+
const turn = (opened) => {
|
|
125
|
+
open = opened;
|
|
126
|
+
watch();
|
|
127
|
+
};
|
|
128
|
+
return { connection, initialized, exited, lost, silent: () => silent, turn, retire };
|
|
58
129
|
}
|
|
59
130
|
catch (error) {
|
|
60
|
-
|
|
131
|
+
retire();
|
|
61
132
|
throw error;
|
|
62
133
|
}
|
|
63
134
|
}
|
package/dist/agents.js
CHANGED
|
@@ -1,11 +1,18 @@
|
|
|
1
1
|
import { client } from '@agentclientprotocol/sdk';
|
|
2
2
|
import { readFile, realpath } from 'node:fs/promises';
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
3
|
+
import { setTimeout as delay } from 'node:timers/promises';
|
|
4
|
+
import { signedOut, startAdapter } from './acp.js';
|
|
5
|
+
import { CLIS, KIT_RELEASE, below, installAdapter, installCli, locate, run, versionOf } from './clis.js';
|
|
5
6
|
import { agentBase, kitHome } from './home.js';
|
|
6
|
-
import {
|
|
7
|
+
import { updatesItself } from './placement.js';
|
|
7
8
|
import { holdTranscription, transcriptionReport } from './transcription.js';
|
|
9
|
+
import { KIT_WIRE } from './wire.js';
|
|
10
|
+
// Two quiet seconds let a fresh conversation start before background model discovery competes for its CPU.
|
|
11
|
+
const MODEL_PROBE_QUIET_MS = 2_000;
|
|
12
|
+
// A sign-in's model read that has not answered in ten seconds leaves its sign-in to the status check, so a hung CLI never holds the sign-in's result.
|
|
13
|
+
const SIGNED_IN_READ_MS = 10_000;
|
|
8
14
|
const SIGNED_OUT = { signed_in: false, models: [], modes: [] };
|
|
15
|
+
const INSTALLING = { release: null, failure: null, installing: true, ...SIGNED_OUT };
|
|
9
16
|
function select(options, category) {
|
|
10
17
|
const option = options.find((candidate) => candidate.category === category);
|
|
11
18
|
return option?.type === 'select' ? option : undefined;
|
|
@@ -22,6 +29,22 @@ function causeOf(error) {
|
|
|
22
29
|
function logged(error) {
|
|
23
30
|
process.stderr.write(`kit: ${causeOf(error)}\n`);
|
|
24
31
|
}
|
|
32
|
+
const LAPTOP_CHASSIS = new Set(['8', '9', '10', '14', '30', '31', '32']);
|
|
33
|
+
const DESKTOP_CHASSIS = new Set(['3', '4', '5', '6', '7', '15', '16']);
|
|
34
|
+
const SERVER_CHASSIS = new Set(['17', '18', '19', '20', '21', '22', '23', '24']);
|
|
35
|
+
export function chassisForm(value) {
|
|
36
|
+
const chassis = value.trim();
|
|
37
|
+
if (LAPTOP_CHASSIS.has(chassis))
|
|
38
|
+
return 'laptop';
|
|
39
|
+
if (DESKTOP_CHASSIS.has(chassis))
|
|
40
|
+
return 'desktop';
|
|
41
|
+
if (SERVER_CHASSIS.has(chassis))
|
|
42
|
+
return 'server';
|
|
43
|
+
return undefined;
|
|
44
|
+
}
|
|
45
|
+
export function hostVm(version) {
|
|
46
|
+
return /docker desktop|microsoft|wsl|linuxkit/i.test(version);
|
|
47
|
+
}
|
|
25
48
|
async function models(kind, adapter, known) {
|
|
26
49
|
const agent = adapter.connection.agent;
|
|
27
50
|
const opened = await agent.request('session/new', { cwd: kitHome(), mcpServers: [] });
|
|
@@ -48,13 +71,6 @@ async function models(kind, adapter, known) {
|
|
|
48
71
|
}
|
|
49
72
|
return { models: offered, modes };
|
|
50
73
|
}
|
|
51
|
-
async function signedIn(kind, cli, known, signal) {
|
|
52
|
-
const probe = CLIS[kind].signedIn;
|
|
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
74
|
function ended(signal) {
|
|
59
75
|
return new Promise((_, reject) => {
|
|
60
76
|
if (signal.aborted)
|
|
@@ -81,6 +97,8 @@ async function offer(kind, cli, known, signal) {
|
|
|
81
97
|
catch (error) {
|
|
82
98
|
if (!signal?.aborted)
|
|
83
99
|
process.stderr.write(`kit: ${kind} did not offer its models: ${causeOf(error)}\n`);
|
|
100
|
+
if (signedOut(error))
|
|
101
|
+
return SIGNED_OUT;
|
|
84
102
|
return {
|
|
85
103
|
signed_in: adapter === undefined && 'initializeMeta' in probe ? known.signed_in : true,
|
|
86
104
|
models: known.models,
|
|
@@ -88,26 +106,24 @@ async function offer(kind, cli, known, signal) {
|
|
|
88
106
|
};
|
|
89
107
|
}
|
|
90
108
|
finally {
|
|
91
|
-
|
|
92
|
-
killTree(adapter.child);
|
|
109
|
+
adapter?.retire();
|
|
93
110
|
}
|
|
94
111
|
}
|
|
95
112
|
function reported(kind, reading) {
|
|
113
|
+
const { minimum, update } = CLIS[kind];
|
|
96
114
|
return {
|
|
97
115
|
kind,
|
|
98
116
|
release: reading.release,
|
|
99
|
-
...(reading.
|
|
117
|
+
...(reading.release !== null && below(reading.release, minimum) ? { minimum, update } : {}),
|
|
100
118
|
failure: reading.failure,
|
|
119
|
+
...(reading.installing === undefined ? {} : { installing: reading.installing }),
|
|
101
120
|
signed_in: reading.signed_in,
|
|
102
121
|
models: reading.models,
|
|
103
122
|
modes: reading.modes,
|
|
104
123
|
full_access: CLIS[kind].fullAccess,
|
|
105
124
|
};
|
|
106
125
|
}
|
|
107
|
-
|
|
108
|
-
const cli = CLIS[kind];
|
|
109
|
-
return `${cli.bin} ${release} is older than ${cli.minimum}, the oldest this Kit runs`;
|
|
110
|
-
}
|
|
126
|
+
const NOT_READY = "the Agent's CLI is not ready on this computer";
|
|
111
127
|
async function sshHostKey() {
|
|
112
128
|
// Listing a local host key takes a moment, so ten seconds only bounds a stuck ssh-keygen.
|
|
113
129
|
const listed = await run('ssh-keygen', ['-l', '-E', 'sha256', '-f', '/etc/ssh/ssh_host_ed25519_key.pub'], 10_000);
|
|
@@ -120,18 +136,42 @@ async function operatingSystem() {
|
|
|
120
136
|
const release = await readFile('/etc/os-release', 'utf8');
|
|
121
137
|
return /^PRETTY_NAME="?([^"\n]*)"?$/m.exec(release)?.[1] ?? release;
|
|
122
138
|
}
|
|
139
|
+
async function hostForm() {
|
|
140
|
+
if (process.platform === 'darwin') {
|
|
141
|
+
const battery = await run('pmset', ['-g', 'batt'], 10_000);
|
|
142
|
+
return battery.status === 0 && battery.output.includes('InternalBattery') ? 'laptop' : 'desktop';
|
|
143
|
+
}
|
|
144
|
+
if (process.platform !== 'linux')
|
|
145
|
+
return undefined;
|
|
146
|
+
const [container, version, chassis] = await Promise.all([
|
|
147
|
+
readFile('/.dockerenv', 'utf8').then(() => true).catch(() => false),
|
|
148
|
+
readFile('/proc/version', 'utf8').catch(() => ''),
|
|
149
|
+
readFile('/sys/class/dmi/id/chassis_type', 'utf8').catch(() => ''),
|
|
150
|
+
]);
|
|
151
|
+
if (container && hostVm(version))
|
|
152
|
+
return undefined;
|
|
153
|
+
return chassisForm(chassis);
|
|
154
|
+
}
|
|
123
155
|
export class Agents {
|
|
124
156
|
desired = { agents: [], routes: [], transcribe: false };
|
|
125
157
|
house;
|
|
126
158
|
reading = Promise.resolve();
|
|
127
159
|
queues = new Map();
|
|
128
160
|
installing = Promise.resolve();
|
|
161
|
+
installs = new Map();
|
|
129
162
|
readings = new Map();
|
|
130
163
|
reads = new Map();
|
|
164
|
+
starts = 0;
|
|
131
165
|
sending = Promise.resolve();
|
|
132
166
|
sent = null;
|
|
133
|
-
|
|
167
|
+
refreshing = 0;
|
|
168
|
+
changed;
|
|
169
|
+
constructor(house, changed = () => undefined) {
|
|
134
170
|
this.house = house;
|
|
171
|
+
this.changed = changed;
|
|
172
|
+
}
|
|
173
|
+
idle() {
|
|
174
|
+
return this.refreshing === 0;
|
|
135
175
|
}
|
|
136
176
|
read() {
|
|
137
177
|
return this.reading.then(() => undefined, () => undefined);
|
|
@@ -140,35 +180,45 @@ export class Agents {
|
|
|
140
180
|
return this.desired.routes.find((route) => route.agent_id === agentId);
|
|
141
181
|
}
|
|
142
182
|
refresh() {
|
|
183
|
+
this.refreshing++;
|
|
184
|
+
this.changed();
|
|
143
185
|
const reading = this.read().then(async () => {
|
|
144
186
|
this.desired = await this.house.deliver('/kit/agents/desired', {});
|
|
145
187
|
return this.desired;
|
|
146
188
|
});
|
|
147
189
|
this.reading = reading;
|
|
148
|
-
|
|
190
|
+
reading
|
|
191
|
+
.then(({ agents, transcribe }) => Promise.all([
|
|
149
192
|
holdTranscription(transcribe)
|
|
150
193
|
.then((changed) => (changed ? this.report() : undefined))
|
|
151
|
-
.catch(logged)
|
|
194
|
+
.catch(logged),
|
|
152
195
|
Promise.all(agents.map((kind) => this.load(kind)))
|
|
153
196
|
.then(() => this.report())
|
|
154
|
-
.catch(logged)
|
|
197
|
+
.catch(logged),
|
|
198
|
+
]))
|
|
199
|
+
.catch(() => undefined)
|
|
200
|
+
.finally(() => {
|
|
201
|
+
this.refreshing--;
|
|
202
|
+
this.changed();
|
|
155
203
|
});
|
|
204
|
+
return reading.then(() => undefined);
|
|
156
205
|
}
|
|
157
206
|
cli(kind) {
|
|
207
|
+
this.starts += 1;
|
|
158
208
|
return this.queue(kind, async () => {
|
|
159
209
|
const resolved = await this.resolve(kind);
|
|
160
210
|
if (!('cli' in resolved)) {
|
|
161
211
|
this.update(kind, resolved);
|
|
162
|
-
throw new Error(
|
|
212
|
+
throw new Error(NOT_READY);
|
|
163
213
|
}
|
|
164
214
|
const { cli, release } = resolved;
|
|
165
215
|
const known = this.readings.get(kind);
|
|
166
|
-
const kept = known?.release === null
|
|
167
|
-
if (known?.release !== release ||
|
|
216
|
+
const kept = known?.release === null ? SIGNED_OUT : (known ?? SIGNED_OUT);
|
|
217
|
+
if (known?.release !== release || this.installs.has(kind)) {
|
|
168
218
|
this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models, modes: kept.modes });
|
|
169
219
|
}
|
|
170
220
|
const read = this.nextRead(kind);
|
|
171
|
-
|
|
221
|
+
this.quietOffer(kind, cli, kept)
|
|
172
222
|
.then((offered) => {
|
|
173
223
|
const current = this.readings.get(kind);
|
|
174
224
|
if (this.reads.get(kind) === read && current?.release === release)
|
|
@@ -179,7 +229,8 @@ export class Agents {
|
|
|
179
229
|
});
|
|
180
230
|
}
|
|
181
231
|
located(kind, signal) {
|
|
182
|
-
|
|
232
|
+
const owner = {};
|
|
233
|
+
return this.queue(kind, () => this.ensure(kind, signal, owner).finally(() => this.settle(kind, owner)), signal);
|
|
183
234
|
}
|
|
184
235
|
async reread(kind) {
|
|
185
236
|
await this.examine(kind, this.readings.get(kind) ?? SIGNED_OUT, offer);
|
|
@@ -187,7 +238,13 @@ export class Agents {
|
|
|
187
238
|
}
|
|
188
239
|
async recheck(kind, signal) {
|
|
189
240
|
const known = this.readings.get(kind) ?? SIGNED_OUT;
|
|
190
|
-
|
|
241
|
+
const owner = {};
|
|
242
|
+
try {
|
|
243
|
+
await this.examine(kind, known, (kind, cli) => offer(kind, cli, known, AbortSignal.any([signal, AbortSignal.timeout(SIGNED_IN_READ_MS)])), signal, owner);
|
|
244
|
+
}
|
|
245
|
+
finally {
|
|
246
|
+
this.settle(kind, owner);
|
|
247
|
+
}
|
|
191
248
|
if (!signal.aborted)
|
|
192
249
|
await this.report();
|
|
193
250
|
}
|
|
@@ -201,8 +258,18 @@ export class Agents {
|
|
|
201
258
|
this.reads.set(kind, read);
|
|
202
259
|
return read;
|
|
203
260
|
}
|
|
204
|
-
|
|
261
|
+
hold(kind, reading) {
|
|
205
262
|
this.readings.set(kind, reading);
|
|
263
|
+
this.installs.delete(kind);
|
|
264
|
+
}
|
|
265
|
+
update(kind, reading) {
|
|
266
|
+
this.hold(kind, reading);
|
|
267
|
+
this.report().catch(logged);
|
|
268
|
+
}
|
|
269
|
+
settle(kind, owner) {
|
|
270
|
+
if (this.installs.get(kind) !== owner)
|
|
271
|
+
return;
|
|
272
|
+
this.installs.delete(kind);
|
|
206
273
|
this.report().catch(logged);
|
|
207
274
|
}
|
|
208
275
|
queue(kind, work, signal) {
|
|
@@ -213,13 +280,15 @@ export class Agents {
|
|
|
213
280
|
this.queues.set(kind, queued.catch(() => undefined));
|
|
214
281
|
return signal === undefined ? queued : Promise.race([queued, ended(signal)]);
|
|
215
282
|
}
|
|
216
|
-
async ensure(kind, signal) {
|
|
283
|
+
async ensure(kind, signal, owner = {}) {
|
|
217
284
|
const failed = await installAdapter(kind, signal);
|
|
218
285
|
if (failed !== null)
|
|
219
286
|
throw new Error(failed);
|
|
220
287
|
const found = await locate(kind, signal);
|
|
221
288
|
if (found !== null)
|
|
222
289
|
return found;
|
|
290
|
+
this.installs.set(kind, owner);
|
|
291
|
+
this.report().catch(logged);
|
|
223
292
|
const installing = this.installing.catch(() => undefined).then(() => installCli(kind, signal));
|
|
224
293
|
this.installing = installing;
|
|
225
294
|
const failure = await installing;
|
|
@@ -230,10 +299,10 @@ export class Agents {
|
|
|
230
299
|
throw new Error(`the login shell does not find ${CLIS[kind].bin} after its install`);
|
|
231
300
|
return installed;
|
|
232
301
|
}
|
|
233
|
-
async resolve(kind, signal) {
|
|
302
|
+
async resolve(kind, signal, owner) {
|
|
234
303
|
let cli;
|
|
235
304
|
try {
|
|
236
|
-
cli = await realpath(await this.ensure(kind, signal));
|
|
305
|
+
cli = await realpath(await this.ensure(kind, signal, owner));
|
|
237
306
|
}
|
|
238
307
|
catch (error) {
|
|
239
308
|
const failure = causeOf(error);
|
|
@@ -243,33 +312,42 @@ export class Agents {
|
|
|
243
312
|
const release = await versionOf(cli, signal);
|
|
244
313
|
if (release === null)
|
|
245
314
|
return { release: null, failure: `${cli} --version names no version`, ...SIGNED_OUT };
|
|
246
|
-
const minimum = CLIS[kind].minimum;
|
|
247
|
-
if (below(release, minimum))
|
|
248
|
-
return { release, minimum, failure: null, ...SIGNED_OUT };
|
|
249
315
|
return { cli, release };
|
|
250
316
|
}
|
|
251
|
-
async examine(kind, known, read, signal) {
|
|
317
|
+
async examine(kind, known, read, signal, owner) {
|
|
252
318
|
const current = this.nextRead(kind);
|
|
253
|
-
const resolved = await this.queue(kind, () => this.resolve(kind, signal), signal);
|
|
319
|
+
const resolved = await this.queue(kind, () => this.resolve(kind, signal, owner), signal);
|
|
254
320
|
const reading = 'cli' in resolved ? { release: resolved.release, failure: null, ...(await read(kind, resolved.cli, known)) } : resolved;
|
|
255
321
|
if (this.reads.get(kind) === current && !signal?.aborted)
|
|
256
|
-
this.
|
|
322
|
+
this.hold(kind, reading);
|
|
323
|
+
}
|
|
324
|
+
async quietOffer(kind, cli, known) {
|
|
325
|
+
for (let seen = -1; seen !== this.starts;) {
|
|
326
|
+
seen = this.starts;
|
|
327
|
+
await delay(MODEL_PROBE_QUIET_MS);
|
|
328
|
+
}
|
|
329
|
+
return offer(kind, cli, known);
|
|
257
330
|
}
|
|
258
331
|
async load(kind) {
|
|
259
332
|
const known = this.readings.get(kind);
|
|
260
333
|
if (known !== undefined && known.failure === null)
|
|
261
334
|
return;
|
|
262
|
-
await this.examine(kind, SIGNED_OUT,
|
|
335
|
+
await this.examine(kind, SIGNED_OUT, (kind, cli, known) => this.quietOffer(kind, cli, known));
|
|
336
|
+
await this.report();
|
|
263
337
|
}
|
|
264
338
|
async send() {
|
|
265
339
|
const agents = this.desired.agents.flatMap((kind) => {
|
|
266
|
-
const reading = this.readings.get(kind);
|
|
340
|
+
const reading = this.installs.has(kind) ? INSTALLING : this.readings.get(kind);
|
|
267
341
|
return reading === undefined ? [] : [reported(kind, reading)];
|
|
268
342
|
});
|
|
269
343
|
const hostKey = await sshHostKey();
|
|
344
|
+
const form = await hostForm();
|
|
270
345
|
const body = {
|
|
271
346
|
os: await operatingSystem(),
|
|
272
|
-
|
|
347
|
+
...(form === undefined ? {} : { form }),
|
|
348
|
+
kit_release: KIT_RELEASE,
|
|
349
|
+
wire: KIT_WIRE,
|
|
350
|
+
updates_itself: await updatesItself(),
|
|
273
351
|
agent_base: agentBase(),
|
|
274
352
|
agents,
|
|
275
353
|
transcription: transcriptionReport(),
|
package/dist/api.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { setTimeout as delay } from 'node:timers/promises';
|
|
2
|
-
import {
|
|
2
|
+
import { signInAgain } from './end.js';
|
|
3
3
|
import { readEnrolment } from './home.js';
|
|
4
4
|
import { retryable } from './refusals.js';
|
|
5
5
|
import { relayed } from './relay.js';
|
|
6
|
+
import { endUnserved, KIT_WIRE, KIT_WIRE_HEADER } from './wire.js';
|
|
6
7
|
export class HouseRefusal extends Error {
|
|
7
8
|
status;
|
|
8
9
|
text;
|
|
@@ -16,7 +17,7 @@ export function finalRefusal(error) {
|
|
|
16
17
|
return error instanceof HouseRefusal && retryable(error.text) === false;
|
|
17
18
|
}
|
|
18
19
|
export function retryDelay(attempt) {
|
|
19
|
-
// Full jitter, doubling from one second to a 30-second cap, spreads the
|
|
20
|
+
// Full jitter, doubling from one second to a 30-second cap, spreads the Kit processes one outage dropped and retries within half a minute of House's return.
|
|
20
21
|
return Math.random() * Math.min(30_000, 1000 * 2 ** attempt);
|
|
21
22
|
}
|
|
22
23
|
export async function retrying(sent, signal, pause = retryDelay) {
|
|
@@ -37,12 +38,15 @@ export async function post(house, path, body, credential, signal) {
|
|
|
37
38
|
method: 'POST',
|
|
38
39
|
headers: {
|
|
39
40
|
'content-type': 'application/json',
|
|
41
|
+
[KIT_WIRE_HEADER]: String(KIT_WIRE),
|
|
40
42
|
...(credential === undefined ? {} : { authorization: `Bearer ${credential}` }),
|
|
41
43
|
},
|
|
42
44
|
body: JSON.stringify(body),
|
|
43
45
|
signal,
|
|
44
46
|
});
|
|
45
47
|
const text = await answer.text();
|
|
48
|
+
if (!answer.ok)
|
|
49
|
+
endUnserved(text);
|
|
46
50
|
if (!answer.ok)
|
|
47
51
|
throw new HouseRefusal(path, answer.status, text);
|
|
48
52
|
return JSON.parse(text);
|
|
@@ -54,7 +58,7 @@ async function enrolledPost(path, body, signal) {
|
|
|
54
58
|
}
|
|
55
59
|
catch (error) {
|
|
56
60
|
if (error instanceof HouseRefusal && error.status === 401)
|
|
57
|
-
|
|
61
|
+
await signInAgain(credential);
|
|
58
62
|
throw error;
|
|
59
63
|
}
|
|
60
64
|
}
|