@agentshouse/kit 0.2.1-c681dfca497a8 → 0.2.1-c6ec4d4d781e7

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 CHANGED
@@ -1,31 +1,31 @@
1
- # House Kit
1
+ # Kit
2
2
 
3
- House Kit connects an Environment, a Linux computer or server, to [agents.house](https://agents.house). It runs
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 agents.house/kit | sh`, or `irm agents.house/kit.ps1 | iex` on Windows, and again to update;
9
- options follow `sh -s --`. On macOS and Linux it installs House Kit natively under your own account, without an admin password,
10
- as a service that runs while you are logged in. `kit` and `house` are then on
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 House Kit in one Docker container instead, with your
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 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 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
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
22
+ install Kit natively, with its workspace at `/agents/house`; `kit` and
23
23
  `house` are then on the server's `PATH`.
24
24
 
25
- House Kit runs the agent CLIs your login shell finds and installs a missing one
25
+ Kit runs the agent CLIs your login shell finds and installs a missing one
26
26
  through that CLI's own installer. Running the command again offers to update
27
- each CLI older than House Kit needs; add `--update-clis` to update every one to
28
- its latest release without asking. House Kit also gives every Agent on the
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
29
  Environment a set of agent skills. Add `--no-skills` to the command to leave
30
30
  them out; running it again without the flag brings them back.
31
31
 
@@ -37,21 +37,22 @@ 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, until you revoke
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 House Kit and ends your own agent's connection, so `house` and `git` no
44
- longer act as you here; a later `kit login` reconnects the same Environment.
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.
45
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 the text of each Room
48
- you chose for it as a Git repository in the workspace's `local-copies`. `house fetch` records
49
- House's changes on each copy's `refs/house/received`; rebase onto it, commit and run
50
- `house push --owner` in the copy, through the install command in the container. An Agent runs
51
- 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.
52
53
 
53
- House Kit turns each audio file of your message to an Agent into text on this
54
- computer before the Agent reads it. While transcription is on, the speech
54
+ Kit turns each audio file your message to an Agent links into text on this
55
+ 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
55
56
  engine and model use about 425 MB beside the Environment's credential; turning it off deletes them.
56
57
 
57
58
  ## License
package/dist/acp.js CHANGED
@@ -1,8 +1,9 @@
1
1
  import { ndJsonStream, PROTOCOL_VERSION, } from '@agentclientprotocol/sdk';
2
2
  import { spawn } from 'node:child_process';
3
3
  import { Readable, Writable } from 'node:stream';
4
- import { CLIS, KIT_VERSION, adapterCommand, withoutProxy } from './clis.js';
4
+ import { CLIS, KIT_RELEASE, 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
- const stop = () => killTree(child);
17
- signal?.addEventListener('abort', stop, { once: true });
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
- events(read);
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
- void exited.then((cause) => connection.close(new Error(cause)));
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,
@@ -51,13 +71,13 @@ export async function startAdapter(kind, cli, cwd, app, events = () => undefined
51
71
  session: { compaction: {}, notices: {} },
52
72
  _meta: { jetbrains: { air: { version: 1, capabilities: CLIS[kind].air } } },
53
73
  },
54
- clientInfo: { name: '@agentshouse/kit', version: KIT_VERSION },
74
+ clientInfo: { name: '@agentshouse/kit', version: KIT_RELEASE },
55
75
  });
56
76
  scope?.entered(child.pid);
57
- return { child, connection, initialized, exited };
77
+ return { connection, initialized, exited, lost, retire };
58
78
  }
59
79
  catch (error) {
60
- child.kill('SIGKILL');
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
- import { CLIS, KIT_VERSION, below, installAdapter, installCli, locate, run, versionOf } from './clis.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;
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
- if (adapter !== undefined)
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,14 +142,32 @@ 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;
@@ -172,20 +210,21 @@ export class Agents {
172
210
  return reading.then(() => undefined);
173
211
  }
174
212
  cli(kind) {
213
+ this.starts += 1;
175
214
  return this.queue(kind, async () => {
176
215
  const resolved = await this.resolve(kind);
177
216
  if (!('cli' in resolved)) {
178
217
  this.update(kind, resolved);
179
- throw new Error(resolved.failure ?? tooOld(kind, resolved.release));
218
+ throw new Error(resolved.failure === null ? tooOld(kind, resolved.release) : NOT_READY);
180
219
  }
181
220
  const { cli, release } = resolved;
182
221
  const known = this.readings.get(kind);
183
222
  const kept = known?.release === null || known?.minimum !== undefined ? SIGNED_OUT : (known ?? SIGNED_OUT);
184
- if (known?.release !== release || known.minimum !== undefined) {
223
+ if (known?.release !== release || known.minimum !== undefined || this.installs.has(kind)) {
185
224
  this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models, modes: kept.modes });
186
225
  }
187
226
  const read = this.nextRead(kind);
188
- offer(kind, cli, kept)
227
+ this.quietOffer(kind, cli, kept)
189
228
  .then((offered) => {
190
229
  const current = this.readings.get(kind);
191
230
  if (this.reads.get(kind) === read && current?.release === release)
@@ -196,7 +235,8 @@ export class Agents {
196
235
  });
197
236
  }
198
237
  located(kind, signal) {
199
- return this.queue(kind, () => this.ensure(kind, signal), signal);
238
+ const owner = {};
239
+ return this.queue(kind, () => this.ensure(kind, signal, owner).finally(() => this.settle(kind, owner)), signal);
200
240
  }
201
241
  async reread(kind) {
202
242
  await this.examine(kind, this.readings.get(kind) ?? SIGNED_OUT, offer);
@@ -204,7 +244,13 @@ export class Agents {
204
244
  }
205
245
  async recheck(kind, signal) {
206
246
  const known = this.readings.get(kind) ?? SIGNED_OUT;
207
- await this.examine(kind, known, async (kind, cli) => ((await signedIn(kind, cli, known, signal)) ? { ...known, signed_in: true } : SIGNED_OUT), signal);
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
+ }
208
254
  if (!signal.aborted)
209
255
  await this.report();
210
256
  }
@@ -218,8 +264,18 @@ export class Agents {
218
264
  this.reads.set(kind, read);
219
265
  return read;
220
266
  }
221
- update(kind, reading) {
267
+ hold(kind, reading) {
222
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);
223
279
  this.report().catch(logged);
224
280
  }
225
281
  queue(kind, work, signal) {
@@ -230,13 +286,15 @@ export class Agents {
230
286
  this.queues.set(kind, queued.catch(() => undefined));
231
287
  return signal === undefined ? queued : Promise.race([queued, ended(signal)]);
232
288
  }
233
- async ensure(kind, signal) {
289
+ async ensure(kind, signal, owner = {}) {
234
290
  const failed = await installAdapter(kind, signal);
235
291
  if (failed !== null)
236
292
  throw new Error(failed);
237
293
  const found = await locate(kind, signal);
238
294
  if (found !== null)
239
295
  return found;
296
+ this.installs.set(kind, owner);
297
+ this.report().catch(logged);
240
298
  const installing = this.installing.catch(() => undefined).then(() => installCli(kind, signal));
241
299
  this.installing = installing;
242
300
  const failure = await installing;
@@ -247,10 +305,10 @@ export class Agents {
247
305
  throw new Error(`the login shell does not find ${CLIS[kind].bin} after its install`);
248
306
  return installed;
249
307
  }
250
- async resolve(kind, signal) {
308
+ async resolve(kind, signal, owner) {
251
309
  let cli;
252
310
  try {
253
- cli = await realpath(await this.ensure(kind, signal));
311
+ cli = await realpath(await this.ensure(kind, signal, owner));
254
312
  }
255
313
  catch (error) {
256
314
  const failure = causeOf(error);
@@ -265,28 +323,38 @@ export class Agents {
265
323
  return { release, minimum, failure: null, ...SIGNED_OUT };
266
324
  return { cli, release };
267
325
  }
268
- async examine(kind, known, read, signal) {
326
+ async examine(kind, known, read, signal, owner) {
269
327
  const current = this.nextRead(kind);
270
- const resolved = await this.queue(kind, () => this.resolve(kind, signal), signal);
328
+ const resolved = await this.queue(kind, () => this.resolve(kind, signal, owner), signal);
271
329
  const reading = 'cli' in resolved ? { release: resolved.release, failure: null, ...(await read(kind, resolved.cli, known)) } : resolved;
272
330
  if (this.reads.get(kind) === current && !signal?.aborted)
273
- this.readings.set(kind, reading);
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);
274
339
  }
275
340
  async load(kind) {
276
341
  const known = this.readings.get(kind);
277
342
  if (known !== undefined && known.failure === null && known.minimum === undefined)
278
343
  return;
279
- await this.examine(kind, SIGNED_OUT, offer);
344
+ await this.examine(kind, SIGNED_OUT, (kind, cli, known) => this.quietOffer(kind, cli, known));
345
+ await this.report();
280
346
  }
281
347
  async send() {
282
348
  const agents = this.desired.agents.flatMap((kind) => {
283
- const reading = this.readings.get(kind);
349
+ const reading = this.installs.has(kind) ? INSTALLING : this.readings.get(kind);
284
350
  return reading === undefined ? [] : [reported(kind, reading)];
285
351
  });
286
352
  const hostKey = await sshHostKey();
353
+ const form = await hostForm();
287
354
  const body = {
288
355
  os: await operatingSystem(),
289
- kit_version: KIT_VERSION,
356
+ ...(form === undefined ? {} : { form }),
357
+ kit_release: KIT_RELEASE,
290
358
  wire: KIT_WIRE,
291
359
  updates_itself: await updatesItself(),
292
360
  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, updateRequired } from './end.js';
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, tooOld } from './wire.js';
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 Kits one outage dropped and retries within half a minute of House's return.
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 && tooOld(text))
49
- updateRequired(house);
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
- import { quoted } from './shell.js';
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 forget(house) {
24
- await configured(['--remove-section', section(house)]);
25
- }
26
- async function register(house) {
27
- await forget(house);
28
- for (const value of ['', helper()]) {
29
- const ran = await configured(['--add', `${section(house)}.helper`, value]);
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;
@@ -1,23 +1,23 @@
1
1
  {
2
2
  "schemaVersion": 2,
3
- "version": "0.2.1-c681dfca497a8",
3
+ "version": "0.2.1-c6ec4d4d781e7",
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-c681dfca497a8/connect-linux.sh"
8
+ "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c6ec4d4d781e7/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-c681dfca497a8/connect-linux.sh"
14
+ "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c6ec4d4d781e7/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-c681dfca497a8/connect-windows.ps1"
20
+ "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-c6ec4d4d781e7/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 sockets = join(kitHome(), 'bridges');
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/calls.js ADDED
@@ -0,0 +1,63 @@
1
+ import { existsSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
2
+ import { join } from 'node:path';
3
+ import { kitHome } from './home.js';
4
+ function logged(error) {
5
+ process.stderr.write(`kit: ${error instanceof Error ? error.message : String(error)}\n`);
6
+ }
7
+ export class Calls {
8
+ house;
9
+ changed;
10
+ carried = new Map();
11
+ path = join(kitHome(), 'call-results.json');
12
+ results;
13
+ returned = new Set();
14
+ open = 0;
15
+ constructor(house, changed) {
16
+ this.house = house;
17
+ this.changed = changed;
18
+ this.results = new Map(existsSync(this.path) ? Object.entries(JSON.parse(readFileSync(this.path, 'utf8'))) : []);
19
+ }
20
+ keepResult(callId, result) {
21
+ if (this.returned.has(callId))
22
+ return;
23
+ this.results.set(callId, result);
24
+ this.save();
25
+ }
26
+ idle() {
27
+ return this.open === 0;
28
+ }
29
+ carry(callId, work) {
30
+ const known = this.carried.get(callId);
31
+ const result = this.results.get(callId);
32
+ const carried = known ?? (result === undefined ? work() : Promise.resolve({ result }));
33
+ if (known === undefined) {
34
+ this.carried.set(callId, carried);
35
+ carried.catch(() => this.carried.delete(callId));
36
+ }
37
+ this.open++;
38
+ this.changed();
39
+ return carried
40
+ .then(async ({ result, returned }) => {
41
+ try {
42
+ await this.house.deliver(`/kit/inputs/${callId}/ack`, result);
43
+ }
44
+ finally {
45
+ this.returned.add(callId);
46
+ if (this.results.delete(callId))
47
+ this.save();
48
+ }
49
+ if (known === undefined)
50
+ await returned?.();
51
+ })
52
+ .catch(logged)
53
+ .finally(() => {
54
+ this.open--;
55
+ this.changed();
56
+ });
57
+ }
58
+ save() {
59
+ const temporary = `${this.path}.${process.pid}`;
60
+ writeFileSync(temporary, JSON.stringify(Object.fromEntries(this.results)), { mode: 0o600 });
61
+ renameSync(temporary, this.path);
62
+ }
63
+ }