@agentshouse/kit 0.2.1-ca18b01951c3b → 0.2.1-ca1f38641026d
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 +31 -31
- package/dist/acp.js +90 -19
- package/dist/agents.js +61 -37
- package/dist/api.js +5 -5
- 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 +4 -1
- package/dist/clis-main.js +2 -2
- package/dist/clis.js +52 -16
- package/dist/{stream.js → connection.js} +45 -52
- package/dist/conversations.js +516 -175
- package/dist/copies.js +77 -50
- package/dist/end.js +15 -4
- package/dist/events.js +33 -8
- package/dist/files.js +139 -37
- package/dist/git.js +5 -6
- package/dist/home.js +27 -13
- package/dist/house-cli.js +299 -0
- package/dist/house-main.js +7 -289
- package/dist/instructions.js +29 -8
- package/dist/kit-cli.js +68 -0
- package/dist/kit-main.js +8 -67
- package/dist/login.js +18 -9
- package/dist/logout.js +0 -2
- package/dist/mcp.js +6 -2
- package/dist/placement.js +9 -18
- package/dist/relay.js +21 -0
- package/dist/resident.js +95 -39
- package/dist/scope.js +3 -0
- package/dist/scripts.js +255 -0
- package/dist/service.js +23 -1
- package/dist/sign-in.js +22 -39
- package/dist/silence.js +28 -0
- package/dist/skills.js +42 -97
- package/dist/transcription.js +83 -43
- package/dist/translate.js +2 -8
- package/dist/update.js +89 -49
- package/dist/wire.js +19 -3
- package/dist/work.js +3 -5
- package/package.json +20 -21
- package/dist/bootstrap.json +0 -24
- package/how-we-work.md +0 -33
- package/skills/ask-matt/LICENSE +0 -21
- package/skills/ask-matt/PHASE-BOUNDARIES.md +0 -55
- package/skills/ask-matt/SKILL.md +0 -97
- package/skills/ask-matt/agents/openai.yaml +0 -5
- 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 -114
- package/skills/codebase-design/agents/openai.yaml +0 -3
- package/skills/diagnosing-bugs/LICENSE +0 -21
- package/skills/diagnosing-bugs/SKILL.md +0 -138
- 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/GLOSSARY-FORMAT.md +0 -60
- package/skills/domain-modeling/LICENSE +0 -21
- package/skills/domain-modeling/SKILL.md +0 -74
- package/skills/domain-modeling/agents/openai.yaml +0 -3
- package/skills/grill-me/LICENSE +0 -21
- package/skills/grill-me/SKILL.md +0 -7
- package/skills/grill-me/agents/openai.yaml +0 -5
- package/skills/grill-with-docs/LICENSE +0 -21
- package/skills/grill-with-docs/SKILL.md +0 -7
- package/skills/grill-with-docs/agents/openai.yaml +0 -5
- 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 -16
- package/skills/handoff/agents/openai.yaml +0 -5
- package/skills/implement/LICENSE +0 -21
- package/skills/implement/SKILL.md +0 -17
- package/skills/implement/agents/openai.yaml +0 -5
- package/skills/implement-spec/LICENSE +0 -21
- package/skills/implement-spec/SKILL.md +0 -40
- package/skills/implement-spec/agents/openai.yaml +0 -5
- 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 -71
- package/skills/improve-codebase-architecture/agents/openai.yaml +0 -5
- package/skills/pr/CREDITS.md +0 -3
- package/skills/pr/LICENSE +0 -21
- package/skills/pr/SKILL.md +0 -170
- package/skills/pr/agents/openai.yaml +0 -3
- package/skills/prototype/LICENSE +0 -21
- package/skills/prototype/LOGIC.md +0 -67
- package/skills/prototype/SKILL.md +0 -26
- 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 -12
- package/skills/research/agents/openai.yaml +0 -3
- package/skills/retro/LICENSE +0 -21
- package/skills/retro/SKILL.md +0 -44
- package/skills/retro/agents/openai.yaml +0 -5
- package/skills/tdd/LICENSE +0 -21
- package/skills/tdd/SKILL.md +0 -38
- 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 -140
- package/skills/teach/agents/openai.yaml +0 -5
- package/skills/to-questionnaire/LICENSE +0 -21
- package/skills/to-questionnaire/SKILL.md +0 -54
- package/skills/to-questionnaire/agents/openai.yaml +0 -5
- package/skills/to-spec/LICENSE +0 -21
- package/skills/to-spec/SKILL.md +0 -75
- package/skills/to-spec/agents/openai.yaml +0 -5
- package/skills/to-tickets/LICENSE +0 -21
- package/skills/to-tickets/SKILL.md +0 -105
- package/skills/to-tickets/agents/openai.yaml +0 -5
- package/skills/triage/AGENT-BRIEF.md +0 -207
- package/skills/triage/LICENSE +0 -21
- package/skills/triage/OUT-OF-SCOPE.md +0 -105
- package/skills/triage/SKILL.md +0 -112
- package/skills/triage/agents/openai.yaml +0 -5
- package/skills/wait-what/LICENSE +0 -21
- package/skills/wait-what/SKILL.md +0 -7
- package/skills/wait-what/agents/openai.yaml +0 -5
- package/skills/wayfinder/LICENSE +0 -21
- package/skills/wayfinder/SKILL.md +0 -128
- package/skills/wayfinder/agents/openai.yaml +0 -5
- package/skills/wizard/LICENSE +0 -21
- package/skills/wizard/SKILL.md +0 -44
- package/skills/wizard/agents/openai.yaml +0 -3
- package/skills/wizard/template.sh +0 -223
- 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 -81
- package/skills/writing-for-agents/agents/openai.yaml +0 -3
package/README.md
CHANGED
|
@@ -1,33 +1,33 @@
|
|
|
1
|
-
#
|
|
1
|
+
# Kit
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
Kit connects an Environment, a Linux computer or server, to [agents.house](https://agents.house). It runs
|
|
4
4
|
your Agents' conversations through the agent CLIs you chose and gives each Agent the `house` command.
|
|
5
5
|
|
|
6
6
|
## Install
|
|
7
7
|
|
|
8
|
-
Run `curl -fsSL
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
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
|
|
12
12
|
pass `--workspace <path>`.
|
|
13
13
|
|
|
14
|
-
Add `--container` to run
|
|
14
|
+
Add `--container` to run Kit in one Docker container instead, with your
|
|
15
15
|
workspace mounted at `/agents/house`; your Agents then reach only that
|
|
16
|
-
workspace. On Windows
|
|
17
|
-
`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.
|
|
18
17
|
Running the command for the other choice on a connected computer asks you to
|
|
19
|
-
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.
|
|
20
20
|
|
|
21
|
-
On your own Linux server, run the Linux command with `--linux` to
|
|
22
|
-
install House Kit natively, with its workspace at `/agents/house`; `kit` and
|
|
23
|
-
`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`.
|
|
24
22
|
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
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.
|
|
31
31
|
|
|
32
32
|
## Commands
|
|
33
33
|
|
|
@@ -37,24 +37,24 @@ or another, continues on its own and keeps the Environment's credential in
|
|
|
37
37
|
reconnects an Environment you already have; `--rooms <ref>[,<ref>...]` gives it
|
|
38
38
|
only those Rooms and `--no-private` every Room but your Private Room; `--code <code>` connects immediately without a link.
|
|
39
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,
|
|
41
|
-
that connection on Connections. `house help` lists the Tools. Codex sessions started after a
|
|
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
42
|
login run a lone `house` command outside their sandbox. `kit logout` disconnects this
|
|
43
|
-
computer, stops
|
|
43
|
+
computer, stops the Kit process and ends your own agent's connection, so `house` and `git` no
|
|
44
44
|
longer act as you here; a later `kit login` reconnects the same Environment, or connects
|
|
45
45
|
this computer as a new one when House no longer holds it.
|
|
46
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
47
|
|
|
48
|
-
`kit resident` keeps the Environment connected and, as it connects, copies the text of each Room
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
`house push --owner` in the copy, through the install command in
|
|
52
|
-
both, without `--owner`. `house upload` and `house download` move a Room's other files.
|
|
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.
|
|
53
55
|
|
|
54
|
-
House Kit
|
|
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.
|
|
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.
|
|
57
57
|
|
|
58
58
|
## License
|
|
59
59
|
|
|
60
|
-
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,13 +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
7
|
import { updatesItself } from './placement.js';
|
|
7
|
-
import { killTree } from './scope.js';
|
|
8
8
|
import { holdTranscription, transcriptionReport } from './transcription.js';
|
|
9
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;
|
|
10
14
|
const SIGNED_OUT = { signed_in: false, models: [], modes: [] };
|
|
15
|
+
const INSTALLING = { release: null, failure: null, installing: true, ...SIGNED_OUT };
|
|
11
16
|
function select(options, category) {
|
|
12
17
|
const option = options.find((candidate) => candidate.category === category);
|
|
13
18
|
return option?.type === 'select' ? option : undefined;
|
|
@@ -66,13 +71,6 @@ async function models(kind, adapter, known) {
|
|
|
66
71
|
}
|
|
67
72
|
return { models: offered, modes };
|
|
68
73
|
}
|
|
69
|
-
async function signedIn(kind, cli, known, signal) {
|
|
70
|
-
const probe = CLIS[kind].signedIn;
|
|
71
|
-
// A sign-in check that has not answered in half a minute counts as signed out rather than stalling the report.
|
|
72
|
-
if ('command' in probe)
|
|
73
|
-
return (await run(cli, probe.command, 30_000, false, signal)).status === 0;
|
|
74
|
-
return (await offer(kind, cli, known, signal)).signed_in;
|
|
75
|
-
}
|
|
76
74
|
function ended(signal) {
|
|
77
75
|
return new Promise((_, reject) => {
|
|
78
76
|
if (signal.aborted)
|
|
@@ -99,6 +97,8 @@ async function offer(kind, cli, known, signal) {
|
|
|
99
97
|
catch (error) {
|
|
100
98
|
if (!signal?.aborted)
|
|
101
99
|
process.stderr.write(`kit: ${kind} did not offer its models: ${causeOf(error)}\n`);
|
|
100
|
+
if (signedOut(error))
|
|
101
|
+
return SIGNED_OUT;
|
|
102
102
|
return {
|
|
103
103
|
signed_in: adapter === undefined && 'initializeMeta' in probe ? known.signed_in : true,
|
|
104
104
|
models: known.models,
|
|
@@ -106,26 +106,24 @@ async function offer(kind, cli, known, signal) {
|
|
|
106
106
|
};
|
|
107
107
|
}
|
|
108
108
|
finally {
|
|
109
|
-
|
|
110
|
-
killTree(adapter.child);
|
|
109
|
+
adapter?.retire();
|
|
111
110
|
}
|
|
112
111
|
}
|
|
113
112
|
function reported(kind, reading) {
|
|
113
|
+
const { minimum, update } = CLIS[kind];
|
|
114
114
|
return {
|
|
115
115
|
kind,
|
|
116
116
|
release: reading.release,
|
|
117
|
-
...(reading.
|
|
117
|
+
...(reading.release !== null && below(reading.release, minimum) ? { minimum, update } : {}),
|
|
118
118
|
failure: reading.failure,
|
|
119
|
+
...(reading.installing === undefined ? {} : { installing: reading.installing }),
|
|
119
120
|
signed_in: reading.signed_in,
|
|
120
121
|
models: reading.models,
|
|
121
122
|
modes: reading.modes,
|
|
122
123
|
full_access: CLIS[kind].fullAccess,
|
|
123
124
|
};
|
|
124
125
|
}
|
|
125
|
-
|
|
126
|
-
const cli = CLIS[kind];
|
|
127
|
-
return `${cli.bin} ${release} is older than ${cli.minimum}, the oldest this Kit runs`;
|
|
128
|
-
}
|
|
126
|
+
const NOT_READY = "the Agent's CLI is not ready on this computer";
|
|
129
127
|
async function sshHostKey() {
|
|
130
128
|
// Listing a local host key takes a moment, so ten seconds only bounds a stuck ssh-keygen.
|
|
131
129
|
const listed = await run('ssh-keygen', ['-l', '-E', 'sha256', '-f', '/etc/ssh/ssh_host_ed25519_key.pub'], 10_000);
|
|
@@ -160,8 +158,10 @@ export class Agents {
|
|
|
160
158
|
reading = Promise.resolve();
|
|
161
159
|
queues = new Map();
|
|
162
160
|
installing = Promise.resolve();
|
|
161
|
+
installs = new Map();
|
|
163
162
|
readings = new Map();
|
|
164
163
|
reads = new Map();
|
|
164
|
+
starts = 0;
|
|
165
165
|
sending = Promise.resolve();
|
|
166
166
|
sent = null;
|
|
167
167
|
refreshing = 0;
|
|
@@ -204,20 +204,21 @@ export class Agents {
|
|
|
204
204
|
return reading.then(() => undefined);
|
|
205
205
|
}
|
|
206
206
|
cli(kind) {
|
|
207
|
+
this.starts += 1;
|
|
207
208
|
return this.queue(kind, async () => {
|
|
208
209
|
const resolved = await this.resolve(kind);
|
|
209
210
|
if (!('cli' in resolved)) {
|
|
210
211
|
this.update(kind, resolved);
|
|
211
|
-
throw new Error(
|
|
212
|
+
throw new Error(NOT_READY);
|
|
212
213
|
}
|
|
213
214
|
const { cli, release } = resolved;
|
|
214
215
|
const known = this.readings.get(kind);
|
|
215
|
-
const kept = known?.release === null
|
|
216
|
-
if (known?.release !== release ||
|
|
216
|
+
const kept = known?.release === null ? SIGNED_OUT : (known ?? SIGNED_OUT);
|
|
217
|
+
if (known?.release !== release || this.installs.has(kind)) {
|
|
217
218
|
this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models, modes: kept.modes });
|
|
218
219
|
}
|
|
219
220
|
const read = this.nextRead(kind);
|
|
220
|
-
|
|
221
|
+
this.quietOffer(kind, cli, kept)
|
|
221
222
|
.then((offered) => {
|
|
222
223
|
const current = this.readings.get(kind);
|
|
223
224
|
if (this.reads.get(kind) === read && current?.release === release)
|
|
@@ -228,7 +229,8 @@ export class Agents {
|
|
|
228
229
|
});
|
|
229
230
|
}
|
|
230
231
|
located(kind, signal) {
|
|
231
|
-
|
|
232
|
+
const owner = {};
|
|
233
|
+
return this.queue(kind, () => this.ensure(kind, signal, owner).finally(() => this.settle(kind, owner)), signal);
|
|
232
234
|
}
|
|
233
235
|
async reread(kind) {
|
|
234
236
|
await this.examine(kind, this.readings.get(kind) ?? SIGNED_OUT, offer);
|
|
@@ -236,7 +238,13 @@ export class Agents {
|
|
|
236
238
|
}
|
|
237
239
|
async recheck(kind, signal) {
|
|
238
240
|
const known = this.readings.get(kind) ?? SIGNED_OUT;
|
|
239
|
-
|
|
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
|
+
}
|
|
240
248
|
if (!signal.aborted)
|
|
241
249
|
await this.report();
|
|
242
250
|
}
|
|
@@ -250,8 +258,18 @@ export class Agents {
|
|
|
250
258
|
this.reads.set(kind, read);
|
|
251
259
|
return read;
|
|
252
260
|
}
|
|
253
|
-
|
|
261
|
+
hold(kind, reading) {
|
|
254
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);
|
|
255
273
|
this.report().catch(logged);
|
|
256
274
|
}
|
|
257
275
|
queue(kind, work, signal) {
|
|
@@ -262,13 +280,15 @@ export class Agents {
|
|
|
262
280
|
this.queues.set(kind, queued.catch(() => undefined));
|
|
263
281
|
return signal === undefined ? queued : Promise.race([queued, ended(signal)]);
|
|
264
282
|
}
|
|
265
|
-
async ensure(kind, signal) {
|
|
283
|
+
async ensure(kind, signal, owner = {}) {
|
|
266
284
|
const failed = await installAdapter(kind, signal);
|
|
267
285
|
if (failed !== null)
|
|
268
286
|
throw new Error(failed);
|
|
269
287
|
const found = await locate(kind, signal);
|
|
270
288
|
if (found !== null)
|
|
271
289
|
return found;
|
|
290
|
+
this.installs.set(kind, owner);
|
|
291
|
+
this.report().catch(logged);
|
|
272
292
|
const installing = this.installing.catch(() => undefined).then(() => installCli(kind, signal));
|
|
273
293
|
this.installing = installing;
|
|
274
294
|
const failure = await installing;
|
|
@@ -279,10 +299,10 @@ export class Agents {
|
|
|
279
299
|
throw new Error(`the login shell does not find ${CLIS[kind].bin} after its install`);
|
|
280
300
|
return installed;
|
|
281
301
|
}
|
|
282
|
-
async resolve(kind, signal) {
|
|
302
|
+
async resolve(kind, signal, owner) {
|
|
283
303
|
let cli;
|
|
284
304
|
try {
|
|
285
|
-
cli = await realpath(await this.ensure(kind, signal));
|
|
305
|
+
cli = await realpath(await this.ensure(kind, signal, owner));
|
|
286
306
|
}
|
|
287
307
|
catch (error) {
|
|
288
308
|
const failure = causeOf(error);
|
|
@@ -292,28 +312,32 @@ export class Agents {
|
|
|
292
312
|
const release = await versionOf(cli, signal);
|
|
293
313
|
if (release === null)
|
|
294
314
|
return { release: null, failure: `${cli} --version names no version`, ...SIGNED_OUT };
|
|
295
|
-
const minimum = CLIS[kind].minimum;
|
|
296
|
-
if (below(release, minimum))
|
|
297
|
-
return { release, minimum, failure: null, ...SIGNED_OUT };
|
|
298
315
|
return { cli, release };
|
|
299
316
|
}
|
|
300
|
-
async examine(kind, known, read, signal) {
|
|
317
|
+
async examine(kind, known, read, signal, owner) {
|
|
301
318
|
const current = this.nextRead(kind);
|
|
302
|
-
const resolved = await this.queue(kind, () => this.resolve(kind, signal), signal);
|
|
319
|
+
const resolved = await this.queue(kind, () => this.resolve(kind, signal, owner), signal);
|
|
303
320
|
const reading = 'cli' in resolved ? { release: resolved.release, failure: null, ...(await read(kind, resolved.cli, known)) } : resolved;
|
|
304
321
|
if (this.reads.get(kind) === current && !signal?.aborted)
|
|
305
|
-
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);
|
|
306
330
|
}
|
|
307
331
|
async load(kind) {
|
|
308
332
|
const known = this.readings.get(kind);
|
|
309
|
-
if (known !== undefined && known.failure === null
|
|
333
|
+
if (known !== undefined && known.failure === null)
|
|
310
334
|
return;
|
|
311
|
-
await this.examine(kind, SIGNED_OUT,
|
|
335
|
+
await this.examine(kind, SIGNED_OUT, (kind, cli, known) => this.quietOffer(kind, cli, known));
|
|
312
336
|
await this.report();
|
|
313
337
|
}
|
|
314
338
|
async send() {
|
|
315
339
|
const agents = this.desired.agents.flatMap((kind) => {
|
|
316
|
-
const reading = this.readings.get(kind);
|
|
340
|
+
const reading = this.installs.has(kind) ? INSTALLING : this.readings.get(kind);
|
|
317
341
|
return reading === undefined ? [] : [reported(kind, reading)];
|
|
318
342
|
});
|
|
319
343
|
const hostKey = await sshHostKey();
|
|
@@ -321,7 +345,7 @@ export class Agents {
|
|
|
321
345
|
const body = {
|
|
322
346
|
os: await operatingSystem(),
|
|
323
347
|
...(form === undefined ? {} : { form }),
|
|
324
|
-
|
|
348
|
+
kit_release: KIT_RELEASE,
|
|
325
349
|
wire: KIT_WIRE,
|
|
326
350
|
updates_itself: await updatesItself(),
|
|
327
351
|
agent_base: agentBase(),
|
package/dist/api.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { setTimeout as delay } from 'node:timers/promises';
|
|
2
|
-
import { signInAgain
|
|
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 { KIT_WIRE, KIT_WIRE_HEADER
|
|
6
|
+
import { endUnserved, KIT_WIRE, KIT_WIRE_HEADER } from './wire.js';
|
|
7
7
|
export class HouseRefusal extends Error {
|
|
8
8
|
status;
|
|
9
9
|
text;
|
|
@@ -17,7 +17,7 @@ export function finalRefusal(error) {
|
|
|
17
17
|
return error instanceof HouseRefusal && retryable(error.text) === false;
|
|
18
18
|
}
|
|
19
19
|
export function retryDelay(attempt) {
|
|
20
|
-
// 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.
|
|
21
21
|
return Math.random() * Math.min(30_000, 1000 * 2 ** attempt);
|
|
22
22
|
}
|
|
23
23
|
export async function retrying(sent, signal, pause = retryDelay) {
|
|
@@ -45,8 +45,8 @@ export async function post(house, path, body, credential, signal) {
|
|
|
45
45
|
signal,
|
|
46
46
|
});
|
|
47
47
|
const text = await answer.text();
|
|
48
|
-
if (!answer.ok
|
|
49
|
-
|
|
48
|
+
if (!answer.ok)
|
|
49
|
+
endUnserved(text);
|
|
50
50
|
if (!answer.ok)
|
|
51
51
|
throw new HouseRefusal(path, answer.status, text);
|
|
52
52
|
return JSON.parse(text);
|
package/dist/app-git.js
CHANGED
|
@@ -1,15 +1,9 @@
|
|
|
1
|
-
import { extname, resolve } from 'node:path';
|
|
2
|
-
import { fileURLToPath } from 'node:url';
|
|
3
1
|
import { run } from './git.js';
|
|
4
2
|
import { kitHome, readOwnAgent } from './home.js';
|
|
5
|
-
|
|
3
|
+
const HELPER = '!kit git-credential';
|
|
6
4
|
function section(house) {
|
|
7
5
|
return `credential.${new URL('/app/', house).href}`;
|
|
8
6
|
}
|
|
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
7
|
async function configured(args) {
|
|
14
8
|
try {
|
|
15
9
|
return await run(kitHome(), ['config', '--global', ...args]);
|
|
@@ -20,30 +14,18 @@ async function configured(args) {
|
|
|
20
14
|
throw error;
|
|
21
15
|
}
|
|
22
16
|
}
|
|
23
|
-
async function
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
const ran = await configured(['--add', `${section(house)}.helper`, value]);
|
|
17
|
+
export async function placeAppGit(ownAgent) {
|
|
18
|
+
if (ownAgent === null)
|
|
19
|
+
return;
|
|
20
|
+
await configured(['--remove-section', section(ownAgent.house)]);
|
|
21
|
+
for (const value of ['', HELPER]) {
|
|
22
|
+
const ran = await configured(['--add', `${section(ownAgent.house)}.helper`, value]);
|
|
30
23
|
if (ran === null)
|
|
31
24
|
return;
|
|
32
25
|
if (ran.status !== 0)
|
|
33
26
|
throw new Error(`git config failed: ${ran.stderr.trim()}`);
|
|
34
27
|
}
|
|
35
28
|
}
|
|
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
29
|
export async function answerGitCredential(operation) {
|
|
48
30
|
let asked = '';
|
|
49
31
|
for await (const chunk of process.stdin)
|
|
@@ -55,8 +37,10 @@ export async function answerGitCredential(operation) {
|
|
|
55
37
|
.filter((line) => line.includes('='))
|
|
56
38
|
.map((line) => [line.slice(0, line.indexOf('=')), line.slice(line.indexOf('=') + 1)]));
|
|
57
39
|
const ownAgent = await readOwnAgent();
|
|
58
|
-
if (ownAgent === null)
|
|
40
|
+
if (ownAgent === null) {
|
|
41
|
+
process.stderr.write(`kit: Kit home ${kitHome()} is not signed in; run kit login\n`);
|
|
59
42
|
return;
|
|
43
|
+
}
|
|
60
44
|
const house = new URL(ownAgent.house);
|
|
61
45
|
if (attributes.get('protocol') !== house.protocol.slice(0, -1) || attributes.get('host') !== house.host)
|
|
62
46
|
return;
|
package/dist/authority-main.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { setGlobalProxyFromEnv } from 'node:http';
|
|
2
1
|
import { HouseRefusal, post } from './api.js';
|
|
3
2
|
import { readEnrolment } from './home.js';
|
|
3
|
+
import { proxyUnlessRelayed } from './relay.js';
|
|
4
4
|
function unanswered(error) {
|
|
5
5
|
return error instanceof HouseRefusal ? error.status >= 500 : error instanceof TypeError && error.message === 'fetch failed';
|
|
6
6
|
}
|
|
7
|
-
|
|
7
|
+
proxyUnlessRelayed();
|
|
8
8
|
try {
|
|
9
9
|
const { house, credential } = (await readEnrolment());
|
|
10
10
|
try {
|
package/dist/bridge.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { createHash, randomUUID } from 'node:crypto';
|
|
2
2
|
import { once } from 'node:events';
|
|
3
3
|
import { setTimeout as delay } from 'node:timers/promises';
|
|
4
|
-
import { mkdir } from 'node:fs/promises';
|
|
5
4
|
import { createServer, request as httpRequest } from 'node:http';
|
|
6
5
|
import { request as httpsRequest } from 'node:https';
|
|
7
6
|
import { delimiter, dirname, join } from 'node:path';
|
|
@@ -9,12 +8,12 @@ import { parse } from 'yaml';
|
|
|
9
8
|
import { finalRefusal, HouseRefusal, retryDelay, retrying } from './api.js';
|
|
10
9
|
import { loginPath } from './clis.js';
|
|
11
10
|
import { changedPaths, } from './copies.js';
|
|
12
|
-
import { kitHome, readEnrolment } from './home.js';
|
|
11
|
+
import { kitHome, readEnrolment, socketDirectory } from './home.js';
|
|
13
12
|
import { callHouse, mcpBody, rpc, UNREACHABLE } from './mcp.js';
|
|
14
13
|
import { operationId } from './operation.js';
|
|
15
14
|
import { refusalOf, retryable } from './refusals.js';
|
|
16
15
|
import { relayed } from './relay.js';
|
|
17
|
-
const MCP_REQUEST_BYTES =
|
|
16
|
+
const MCP_REQUEST_BYTES = 4_000_000;
|
|
18
17
|
export async function received(request) {
|
|
19
18
|
let text = '';
|
|
20
19
|
request.setEncoding('utf8');
|
|
@@ -82,7 +81,7 @@ function editAnswer(forwarded) {
|
|
|
82
81
|
export async function openBridge(house, copies, conversationId, signal) {
|
|
83
82
|
const path = [join(kitHome(), 'shim'), dirname(process.execPath), await loginPath()].join(delimiter);
|
|
84
83
|
const origin = (await readEnrolment()).house;
|
|
85
|
-
const { credential } = await house.post(`/kit/conversations/${conversationId}/credential`, {}, signal);
|
|
84
|
+
const { credential } = await retrying(() => house.post(`/kit/conversations/${conversationId}/credential`, {}, signal), signal);
|
|
86
85
|
const closed = new AbortController();
|
|
87
86
|
const sent = (message, operation) => callHouse(origin, credential, message, operation, closed.signal);
|
|
88
87
|
const send = async (message, operation) => {
|
|
@@ -167,9 +166,7 @@ export async function openBridge(house, copies, conversationId, signal) {
|
|
|
167
166
|
}
|
|
168
167
|
return path === '/' ? forward(text) : { status: 404, text: '' };
|
|
169
168
|
};
|
|
170
|
-
const
|
|
171
|
-
await mkdir(sockets, { recursive: true, mode: 0o700 });
|
|
172
|
-
const socketPath = join(sockets, `${randomUUID()}.sock`);
|
|
169
|
+
const socketPath = join(socketDirectory(), `${randomUUID()}.sock`);
|
|
173
170
|
const bridge = createServer(async (request, response) => {
|
|
174
171
|
try {
|
|
175
172
|
const path = request.url ?? '';
|