@agentshouse/kit 0.2.1-c7252abc8a583 → 0.2.1-c7a397cb0cce7
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 +20 -19
- package/dist/acp.js +34 -14
- package/dist/agents.js +104 -21
- package/dist/api.js +1 -1
- package/dist/app-git.js +10 -26
- package/dist/bootstrap.json +4 -4
- package/dist/bridge.js +3 -6
- package/dist/chatgpt.js +32 -0
- package/dist/clis.js +19 -3
- package/dist/conversations.js +280 -94
- package/dist/copies.js +98 -47
- package/dist/end.js +3 -2
- package/dist/events.js +4 -0
- package/dist/files.js +8 -2
- package/dist/git.js +10 -8
- package/dist/home.js +56 -5
- package/dist/house-cli.js +291 -0
- package/dist/house-main.js +7 -228
- package/dist/inputs.js +63 -0
- package/dist/instructions.js +4 -28
- package/dist/kit-cli.js +68 -0
- package/dist/kit-main.js +8 -64
- package/dist/login.js +44 -27
- package/dist/logout.js +0 -2
- package/dist/placement.js +2 -20
- package/dist/resident.js +60 -15
- package/dist/scope.js +3 -0
- package/dist/service.js +22 -0
- package/dist/sign-in.js +5 -23
- package/dist/skills.js +81 -12
- package/dist/stream.js +62 -16
- package/dist/transcription.js +3 -3
- package/dist/translate.js +2 -8
- package/dist/update.js +21 -23
- package/dist/wire.js +1 -1
- package/dist/work.js +3 -5
- 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/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
|
@@ -5,18 +5,18 @@ your Agents' conversations through the agent CLIs you chose and gives each Agent
|
|
|
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 "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
|
|
12
12
|
pass `--workspace <path>`.
|
|
13
13
|
|
|
14
14
|
Add `--container` to run House 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 11 the container is the one choice. Append a `kit` or
|
|
17
|
-
`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.
|
|
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 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.
|
|
20
20
|
|
|
21
21
|
On your own Linux server, run the Linux command with `--linux` to
|
|
22
22
|
install House Kit natively, with its workspace at `/agents/house`; `kit` and
|
|
@@ -33,26 +33,27 @@ them out; running it again without the flag brings them back.
|
|
|
33
33
|
|
|
34
34
|
`kit login` opens or prints a link you confirm in any browser, on this computer
|
|
35
35
|
or another, continues on its own and keeps the Environment's credential in
|
|
36
|
-
`~/.house-kit`, or 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
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;
|
|
39
|
-
`--code <code>` connects immediately without a link.
|
|
38
|
+
only those Rooms and `--no-private` every Room but your Private Room; `--code <code>` connects immediately without a link.
|
|
40
39
|
A login also connects your own agent: outside an Agent conversation, `house <tool>` calls
|
|
41
|
-
House as you and `git` clones and pushes your Apps at `<house>/app/` as you,
|
|
42
|
-
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
|
|
43
42
|
login run a lone `house` command outside their sandbox. `kit logout` disconnects this
|
|
44
43
|
computer, stops House Kit and ends your own agent's connection, so `house` and `git` no
|
|
45
|
-
longer act as you here; a later `kit login` reconnects the same Environment
|
|
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.
|
|
46
47
|
|
|
47
|
-
`kit resident` keeps the Environment connected and, as it connects, copies each
|
|
48
|
-
|
|
49
|
-
`house fetch` records House's changes on each copy's
|
|
50
|
-
rebase onto it, commit and run `house push --owner` in the copy, through the
|
|
51
|
-
|
|
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 erases a Room's copy, unpushed commits included, once the Room
|
|
50
|
+
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.
|
|
52
53
|
|
|
53
54
|
House Kit turns each audio file of your message to an Agent into text on this
|
|
54
55
|
computer before the Agent reads it. While transcription is on, the speech
|
|
55
|
-
engine and model use about 425 MB
|
|
56
|
+
engine and model use about 425 MB beside the Environment's credential; turning it off deletes them.
|
|
56
57
|
|
|
57
58
|
## License
|
|
58
59
|
|
package/dist/acp.js
CHANGED
|
@@ -3,6 +3,7 @@ import { spawn } from 'node:child_process';
|
|
|
3
3
|
import { Readable, Writable } from 'node:stream';
|
|
4
4
|
import { CLIS, KIT_VERSION, adapterCommand, withoutProxy } from './clis.js';
|
|
5
5
|
import { killTree } from './scope.js';
|
|
6
|
+
const RETIRED = 'the CLI was retired';
|
|
6
7
|
export async function startAdapter(kind, cli, cwd, app, events = () => undefined, added = {}, signal, scope = null) {
|
|
7
8
|
const adapter = CLIS[kind].adapter;
|
|
8
9
|
const started = [adapter === null ? cli : adapterCommand(kind), CLIS[kind].args];
|
|
@@ -13,34 +14,53 @@ export async function startAdapter(kind, cli, cwd, app, events = () => undefined
|
|
|
13
14
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
14
15
|
detached: true,
|
|
15
16
|
});
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
child.on('exit', () => signal?.removeEventListener('abort', stop));
|
|
17
|
+
let owned = true;
|
|
18
|
+
let retired = false;
|
|
19
19
|
let stderr = '';
|
|
20
20
|
child.stderr.on('data', (chunk) => {
|
|
21
21
|
stderr = (stderr + chunk.toString('utf8')).slice(-4000);
|
|
22
22
|
});
|
|
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
23
|
const stream = ndJsonStream(Writable.toWeb(child.stdin), Readable.toWeb(child.stdout));
|
|
31
24
|
const connection = app.connect({
|
|
32
25
|
writable: stream.writable,
|
|
33
26
|
readable: stream.readable.pipeThrough(new TransformStream({
|
|
34
27
|
transform(message, controller) {
|
|
35
28
|
const read = message;
|
|
36
|
-
|
|
29
|
+
if (owned)
|
|
30
|
+
events(read);
|
|
37
31
|
if (read.id !== undefined || (read.method !== 'session/update' && !read.method.startsWith('_'))) {
|
|
38
32
|
controller.enqueue(message);
|
|
39
33
|
}
|
|
40
34
|
},
|
|
41
35
|
})),
|
|
42
36
|
});
|
|
43
|
-
|
|
37
|
+
const { promise: lost, resolve: lose } = Promise.withResolvers();
|
|
38
|
+
const exited = new Promise((resolve) => {
|
|
39
|
+
const end = (cause) => {
|
|
40
|
+
if (owned)
|
|
41
|
+
lose(cause);
|
|
42
|
+
owned = false;
|
|
43
|
+
connection.close(new Error(cause));
|
|
44
|
+
resolve(cause);
|
|
45
|
+
};
|
|
46
|
+
child.on('error', (error) => end(`the CLI did not start: ${error.message}`));
|
|
47
|
+
child.on('exit', (code, signal) => {
|
|
48
|
+
const last = stderr.trim().split('\n').at(-1);
|
|
49
|
+
end(`the CLI exited with ${code ?? signal}${last ? `: ${last}` : ''}`);
|
|
50
|
+
});
|
|
51
|
+
});
|
|
52
|
+
const retire = () => {
|
|
53
|
+
owned = false;
|
|
54
|
+
if (retired)
|
|
55
|
+
return;
|
|
56
|
+
retired = true;
|
|
57
|
+
if (child.pid !== undefined)
|
|
58
|
+
killTree(child);
|
|
59
|
+
scope?.kill();
|
|
60
|
+
connection.close(new Error(RETIRED));
|
|
61
|
+
};
|
|
62
|
+
signal?.addEventListener('abort', retire, { once: true });
|
|
63
|
+
child.on('exit', () => signal?.removeEventListener('abort', retire));
|
|
44
64
|
try {
|
|
45
65
|
const initialized = await connection.agent.request('initialize', {
|
|
46
66
|
protocolVersion: PROTOCOL_VERSION,
|
|
@@ -54,10 +74,10 @@ export async function startAdapter(kind, cli, cwd, app, events = () => undefined
|
|
|
54
74
|
clientInfo: { name: '@agentshouse/kit', version: KIT_VERSION },
|
|
55
75
|
});
|
|
56
76
|
scope?.entered(child.pid);
|
|
57
|
-
return {
|
|
77
|
+
return { connection, initialized, exited, lost, retire };
|
|
58
78
|
}
|
|
59
79
|
catch (error) {
|
|
60
|
-
|
|
80
|
+
retire();
|
|
61
81
|
throw error;
|
|
62
82
|
}
|
|
63
83
|
}
|
package/dist/agents.js
CHANGED
|
@@ -1,13 +1,16 @@
|
|
|
1
1
|
import { client } from '@agentclientprotocol/sdk';
|
|
2
2
|
import { readFile, realpath } from 'node:fs/promises';
|
|
3
|
+
import { setTimeout as delay } from 'node:timers/promises';
|
|
3
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';
|
|
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;
|
|
10
12
|
const SIGNED_OUT = { signed_in: false, models: [], modes: [] };
|
|
13
|
+
const INSTALLING = { release: null, failure: null, installing: true, ...SIGNED_OUT };
|
|
11
14
|
function select(options, category) {
|
|
12
15
|
const option = options.find((candidate) => candidate.category === category);
|
|
13
16
|
return option?.type === 'select' ? option : undefined;
|
|
@@ -24,6 +27,22 @@ function causeOf(error) {
|
|
|
24
27
|
function logged(error) {
|
|
25
28
|
process.stderr.write(`kit: ${causeOf(error)}\n`);
|
|
26
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
|
+
}
|
|
27
46
|
async function models(kind, adapter, known) {
|
|
28
47
|
const agent = adapter.connection.agent;
|
|
29
48
|
const opened = await agent.request('session/new', { cwd: kitHome(), mcpServers: [] });
|
|
@@ -90,8 +109,7 @@ async function offer(kind, cli, known, signal) {
|
|
|
90
109
|
};
|
|
91
110
|
}
|
|
92
111
|
finally {
|
|
93
|
-
|
|
94
|
-
killTree(adapter.child);
|
|
112
|
+
adapter?.retire();
|
|
95
113
|
}
|
|
96
114
|
}
|
|
97
115
|
function reported(kind, reading) {
|
|
@@ -100,12 +118,14 @@ function reported(kind, reading) {
|
|
|
100
118
|
release: reading.release,
|
|
101
119
|
...(reading.minimum === undefined ? {} : { minimum: reading.minimum }),
|
|
102
120
|
failure: reading.failure,
|
|
121
|
+
...(reading.installing === undefined ? {} : { installing: reading.installing }),
|
|
103
122
|
signed_in: reading.signed_in,
|
|
104
123
|
models: reading.models,
|
|
105
124
|
modes: reading.modes,
|
|
106
125
|
full_access: CLIS[kind].fullAccess,
|
|
107
126
|
};
|
|
108
127
|
}
|
|
128
|
+
const NOT_READY = "the Agent's CLI is not ready on this computer";
|
|
109
129
|
function tooOld(kind, release) {
|
|
110
130
|
const cli = CLIS[kind];
|
|
111
131
|
return `${cli.bin} ${release} is older than ${cli.minimum}, the oldest this Kit runs`;
|
|
@@ -122,18 +142,42 @@ async function operatingSystem() {
|
|
|
122
142
|
const release = await readFile('/etc/os-release', 'utf8');
|
|
123
143
|
return /^PRETTY_NAME="?([^"\n]*)"?$/m.exec(release)?.[1] ?? release;
|
|
124
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
|
+
}
|
|
125
161
|
export class Agents {
|
|
126
162
|
desired = { agents: [], routes: [], transcribe: false };
|
|
127
163
|
house;
|
|
128
164
|
reading = Promise.resolve();
|
|
129
165
|
queues = new Map();
|
|
130
166
|
installing = Promise.resolve();
|
|
167
|
+
installs = new Map();
|
|
131
168
|
readings = new Map();
|
|
132
169
|
reads = new Map();
|
|
170
|
+
starts = 0;
|
|
133
171
|
sending = Promise.resolve();
|
|
134
172
|
sent = null;
|
|
135
|
-
|
|
173
|
+
refreshing = 0;
|
|
174
|
+
changed;
|
|
175
|
+
constructor(house, changed = () => undefined) {
|
|
136
176
|
this.house = house;
|
|
177
|
+
this.changed = changed;
|
|
178
|
+
}
|
|
179
|
+
idle() {
|
|
180
|
+
return this.refreshing === 0;
|
|
137
181
|
}
|
|
138
182
|
read() {
|
|
139
183
|
return this.reading.then(() => undefined, () => undefined);
|
|
@@ -142,35 +186,45 @@ export class Agents {
|
|
|
142
186
|
return this.desired.routes.find((route) => route.agent_id === agentId);
|
|
143
187
|
}
|
|
144
188
|
refresh() {
|
|
189
|
+
this.refreshing++;
|
|
190
|
+
this.changed();
|
|
145
191
|
const reading = this.read().then(async () => {
|
|
146
192
|
this.desired = await this.house.deliver('/kit/agents/desired', {});
|
|
147
193
|
return this.desired;
|
|
148
194
|
});
|
|
149
195
|
this.reading = reading;
|
|
150
|
-
|
|
196
|
+
reading
|
|
197
|
+
.then(({ agents, transcribe }) => Promise.all([
|
|
151
198
|
holdTranscription(transcribe)
|
|
152
199
|
.then((changed) => (changed ? this.report() : undefined))
|
|
153
|
-
.catch(logged)
|
|
200
|
+
.catch(logged),
|
|
154
201
|
Promise.all(agents.map((kind) => this.load(kind)))
|
|
155
202
|
.then(() => this.report())
|
|
156
|
-
.catch(logged)
|
|
203
|
+
.catch(logged),
|
|
204
|
+
]))
|
|
205
|
+
.catch(() => undefined)
|
|
206
|
+
.finally(() => {
|
|
207
|
+
this.refreshing--;
|
|
208
|
+
this.changed();
|
|
157
209
|
});
|
|
210
|
+
return reading.then(() => undefined);
|
|
158
211
|
}
|
|
159
212
|
cli(kind) {
|
|
213
|
+
this.starts += 1;
|
|
160
214
|
return this.queue(kind, async () => {
|
|
161
215
|
const resolved = await this.resolve(kind);
|
|
162
216
|
if (!('cli' in resolved)) {
|
|
163
217
|
this.update(kind, resolved);
|
|
164
|
-
throw new Error(resolved.failure
|
|
218
|
+
throw new Error(resolved.failure === null ? tooOld(kind, resolved.release) : NOT_READY);
|
|
165
219
|
}
|
|
166
220
|
const { cli, release } = resolved;
|
|
167
221
|
const known = this.readings.get(kind);
|
|
168
222
|
const kept = known?.release === null || known?.minimum !== undefined ? SIGNED_OUT : (known ?? SIGNED_OUT);
|
|
169
|
-
if (known?.release !== release || known.minimum !== undefined) {
|
|
223
|
+
if (known?.release !== release || known.minimum !== undefined || this.installs.has(kind)) {
|
|
170
224
|
this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models, modes: kept.modes });
|
|
171
225
|
}
|
|
172
226
|
const read = this.nextRead(kind);
|
|
173
|
-
|
|
227
|
+
this.quietOffer(kind, cli, kept)
|
|
174
228
|
.then((offered) => {
|
|
175
229
|
const current = this.readings.get(kind);
|
|
176
230
|
if (this.reads.get(kind) === read && current?.release === release)
|
|
@@ -181,7 +235,8 @@ export class Agents {
|
|
|
181
235
|
});
|
|
182
236
|
}
|
|
183
237
|
located(kind, signal) {
|
|
184
|
-
|
|
238
|
+
const owner = {};
|
|
239
|
+
return this.queue(kind, () => this.ensure(kind, signal, owner).finally(() => this.settle(kind, owner)), signal);
|
|
185
240
|
}
|
|
186
241
|
async reread(kind) {
|
|
187
242
|
await this.examine(kind, this.readings.get(kind) ?? SIGNED_OUT, offer);
|
|
@@ -189,7 +244,13 @@ export class Agents {
|
|
|
189
244
|
}
|
|
190
245
|
async recheck(kind, signal) {
|
|
191
246
|
const known = this.readings.get(kind) ?? SIGNED_OUT;
|
|
192
|
-
|
|
247
|
+
const owner = {};
|
|
248
|
+
try {
|
|
249
|
+
await this.examine(kind, known, async (kind, cli) => ((await signedIn(kind, cli, known, signal)) ? { ...known, signed_in: true } : SIGNED_OUT), signal, owner);
|
|
250
|
+
}
|
|
251
|
+
finally {
|
|
252
|
+
this.settle(kind, owner);
|
|
253
|
+
}
|
|
193
254
|
if (!signal.aborted)
|
|
194
255
|
await this.report();
|
|
195
256
|
}
|
|
@@ -203,8 +264,18 @@ export class Agents {
|
|
|
203
264
|
this.reads.set(kind, read);
|
|
204
265
|
return read;
|
|
205
266
|
}
|
|
206
|
-
|
|
267
|
+
hold(kind, reading) {
|
|
207
268
|
this.readings.set(kind, reading);
|
|
269
|
+
this.installs.delete(kind);
|
|
270
|
+
}
|
|
271
|
+
update(kind, reading) {
|
|
272
|
+
this.hold(kind, reading);
|
|
273
|
+
this.report().catch(logged);
|
|
274
|
+
}
|
|
275
|
+
settle(kind, owner) {
|
|
276
|
+
if (this.installs.get(kind) !== owner)
|
|
277
|
+
return;
|
|
278
|
+
this.installs.delete(kind);
|
|
208
279
|
this.report().catch(logged);
|
|
209
280
|
}
|
|
210
281
|
queue(kind, work, signal) {
|
|
@@ -215,13 +286,15 @@ export class Agents {
|
|
|
215
286
|
this.queues.set(kind, queued.catch(() => undefined));
|
|
216
287
|
return signal === undefined ? queued : Promise.race([queued, ended(signal)]);
|
|
217
288
|
}
|
|
218
|
-
async ensure(kind, signal) {
|
|
289
|
+
async ensure(kind, signal, owner = {}) {
|
|
219
290
|
const failed = await installAdapter(kind, signal);
|
|
220
291
|
if (failed !== null)
|
|
221
292
|
throw new Error(failed);
|
|
222
293
|
const found = await locate(kind, signal);
|
|
223
294
|
if (found !== null)
|
|
224
295
|
return found;
|
|
296
|
+
this.installs.set(kind, owner);
|
|
297
|
+
this.report().catch(logged);
|
|
225
298
|
const installing = this.installing.catch(() => undefined).then(() => installCli(kind, signal));
|
|
226
299
|
this.installing = installing;
|
|
227
300
|
const failure = await installing;
|
|
@@ -232,10 +305,10 @@ export class Agents {
|
|
|
232
305
|
throw new Error(`the login shell does not find ${CLIS[kind].bin} after its install`);
|
|
233
306
|
return installed;
|
|
234
307
|
}
|
|
235
|
-
async resolve(kind, signal) {
|
|
308
|
+
async resolve(kind, signal, owner) {
|
|
236
309
|
let cli;
|
|
237
310
|
try {
|
|
238
|
-
cli = await realpath(await this.ensure(kind, signal));
|
|
311
|
+
cli = await realpath(await this.ensure(kind, signal, owner));
|
|
239
312
|
}
|
|
240
313
|
catch (error) {
|
|
241
314
|
const failure = causeOf(error);
|
|
@@ -250,27 +323,37 @@ export class Agents {
|
|
|
250
323
|
return { release, minimum, failure: null, ...SIGNED_OUT };
|
|
251
324
|
return { cli, release };
|
|
252
325
|
}
|
|
253
|
-
async examine(kind, known, read, signal) {
|
|
326
|
+
async examine(kind, known, read, signal, owner) {
|
|
254
327
|
const current = this.nextRead(kind);
|
|
255
|
-
const resolved = await this.queue(kind, () => this.resolve(kind, signal), signal);
|
|
328
|
+
const resolved = await this.queue(kind, () => this.resolve(kind, signal, owner), signal);
|
|
256
329
|
const reading = 'cli' in resolved ? { release: resolved.release, failure: null, ...(await read(kind, resolved.cli, known)) } : resolved;
|
|
257
330
|
if (this.reads.get(kind) === current && !signal?.aborted)
|
|
258
|
-
this.
|
|
331
|
+
this.hold(kind, reading);
|
|
332
|
+
}
|
|
333
|
+
async quietOffer(kind, cli, known) {
|
|
334
|
+
for (let seen = -1; seen !== this.starts;) {
|
|
335
|
+
seen = this.starts;
|
|
336
|
+
await delay(MODEL_PROBE_QUIET_MS);
|
|
337
|
+
}
|
|
338
|
+
return offer(kind, cli, known);
|
|
259
339
|
}
|
|
260
340
|
async load(kind) {
|
|
261
341
|
const known = this.readings.get(kind);
|
|
262
342
|
if (known !== undefined && known.failure === null && known.minimum === undefined)
|
|
263
343
|
return;
|
|
264
|
-
await this.examine(kind, SIGNED_OUT,
|
|
344
|
+
await this.examine(kind, SIGNED_OUT, (kind, cli, known) => this.quietOffer(kind, cli, known));
|
|
345
|
+
await this.report();
|
|
265
346
|
}
|
|
266
347
|
async send() {
|
|
267
348
|
const agents = this.desired.agents.flatMap((kind) => {
|
|
268
|
-
const reading = this.readings.get(kind);
|
|
349
|
+
const reading = this.installs.has(kind) ? INSTALLING : this.readings.get(kind);
|
|
269
350
|
return reading === undefined ? [] : [reported(kind, reading)];
|
|
270
351
|
});
|
|
271
352
|
const hostKey = await sshHostKey();
|
|
353
|
+
const form = await hostForm();
|
|
272
354
|
const body = {
|
|
273
355
|
os: await operatingSystem(),
|
|
356
|
+
...(form === undefined ? {} : { form }),
|
|
274
357
|
kit_version: KIT_VERSION,
|
|
275
358
|
wire: KIT_WIRE,
|
|
276
359
|
updates_itself: await updatesItself(),
|
package/dist/api.js
CHANGED
|
@@ -46,7 +46,7 @@ export async function post(house, path, body, credential, signal) {
|
|
|
46
46
|
});
|
|
47
47
|
const text = await answer.text();
|
|
48
48
|
if (!answer.ok && tooOld(text))
|
|
49
|
-
updateRequired(
|
|
49
|
+
updateRequired();
|
|
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/bootstrap.json
CHANGED
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
{
|
|
2
2
|
"schemaVersion": 2,
|
|
3
|
-
"version": "0.2.1-
|
|
3
|
+
"version": "0.2.1-c7a397cb0cce7",
|
|
4
4
|
"hosts": {
|
|
5
5
|
"macos": {
|
|
6
6
|
"asset": {
|
|
7
7
|
"name": "connect-linux.sh",
|
|
8
|
-
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-
|
|
8
|
+
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c7a397cb0cce7/connect-linux.sh"
|
|
9
9
|
}
|
|
10
10
|
},
|
|
11
11
|
"linux": {
|
|
12
12
|
"asset": {
|
|
13
13
|
"name": "connect-linux.sh",
|
|
14
|
-
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-
|
|
14
|
+
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c7a397cb0cce7/connect-linux.sh"
|
|
15
15
|
}
|
|
16
16
|
},
|
|
17
17
|
"windows": {
|
|
18
18
|
"asset": {
|
|
19
19
|
"name": "connect-windows.ps1",
|
|
20
|
-
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-
|
|
20
|
+
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c7a397cb0cce7/connect-windows.ps1"
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
}
|
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,7 +8,7 @@ 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';
|
|
@@ -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 ?? '';
|
package/dist/chatgpt.js
ADDED
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { parseArgs } from 'node:util';
|
|
2
|
+
import { placeAppGit } from './app-git.js';
|
|
3
|
+
import { kitHome, readOwnAgent, writeOwnAgent } from './home.js';
|
|
4
|
+
import { accepted, DEFAULT_HOUSE } from './login.js';
|
|
5
|
+
const KEY_SOURCE = 'New key for a script on Connections';
|
|
6
|
+
const USAGE = `usage: kit chatgpt --key <key> [--house <origin>]
|
|
7
|
+
--key <key> a key from ${KEY_SOURCE}
|
|
8
|
+
--house <origin> the House of the key, ${DEFAULT_HOUSE} unless one is stored
|
|
9
|
+
`;
|
|
10
|
+
export async function chatgpt(argv) {
|
|
11
|
+
const { values } = parseArgs({
|
|
12
|
+
args: argv,
|
|
13
|
+
options: { key: { type: 'string' }, house: { type: 'string' }, help: { type: 'boolean', default: false } },
|
|
14
|
+
});
|
|
15
|
+
if (values.help) {
|
|
16
|
+
process.stdout.write(USAGE);
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
if (values.key === undefined)
|
|
20
|
+
throw new Error(`pass --key with a key from ${KEY_SOURCE}`);
|
|
21
|
+
const before = await readOwnAgent();
|
|
22
|
+
const house = values.house ?? before?.house ?? DEFAULT_HOUSE;
|
|
23
|
+
if (!(await accepted(house, values.key)))
|
|
24
|
+
throw new Error(`${house} does not accept this key; pass one from ${KEY_SOURCE}`);
|
|
25
|
+
const relay = process.env.HOUSE_KIT_RELAY || undefined;
|
|
26
|
+
await writeOwnAgent({ house, ...(relay === undefined ? {} : { relay }), credential: values.key });
|
|
27
|
+
await placeAppGit(await readOwnAgent()).catch((error) => process.stderr.write(`kit: ${error.message}\n`));
|
|
28
|
+
if (before !== null && before.credential !== values.key) {
|
|
29
|
+
process.stdout.write('This replaced the key this Kit home held; give each session its own HOUSE_KIT_HOME to keep its own key.\n');
|
|
30
|
+
}
|
|
31
|
+
process.stdout.write(`house now calls ${house} as you, with the key kept in ${kitHome()}.\n`);
|
|
32
|
+
}
|