@agentshouse/kit 0.2.1-c30728be20485 → 0.2.1-c3304109525e3

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.
Files changed (134) hide show
  1. package/README.md +43 -42
  2. package/dist/acp.js +102 -108
  3. package/dist/agents.js +151 -54
  4. package/dist/api.js +10 -6
  5. package/dist/app-git.js +48 -0
  6. package/dist/authority-main.js +2 -2
  7. package/dist/bridge.js +15 -44
  8. package/dist/building.js +46 -0
  9. package/dist/calls.js +71 -0
  10. package/dist/chatgpt.js +32 -0
  11. package/dist/clis-main.js +2 -2
  12. package/dist/clis.js +162 -80
  13. package/dist/codex-main.js +58 -0
  14. package/dist/connection.js +116 -0
  15. package/dist/conversations.js +730 -332
  16. package/dist/copies.js +185 -123
  17. package/dist/end.js +30 -5
  18. package/dist/enrol-main.js +7 -1
  19. package/dist/events.js +546 -0
  20. package/dist/files.js +139 -17
  21. package/dist/git.js +13 -11
  22. package/dist/home.js +96 -7
  23. package/dist/house-cli.js +299 -0
  24. package/dist/house-main.js +7 -159
  25. package/dist/instructions.js +8 -10
  26. package/dist/kit-cli.js +68 -0
  27. package/dist/kit-main.js +8 -19
  28. package/dist/login.js +119 -104
  29. package/dist/logout.js +14 -13
  30. package/dist/mcp.js +6 -2
  31. package/dist/parts.js +82 -0
  32. package/dist/placement.js +39 -0
  33. package/dist/relay.js +33 -2
  34. package/dist/resident.js +118 -51
  35. package/dist/scope.js +206 -0
  36. package/dist/scripts.js +255 -0
  37. package/dist/service-main.js +9 -0
  38. package/dist/service.js +55 -0
  39. package/dist/shell.js +3 -0
  40. package/dist/sign-in.js +40 -33
  41. package/dist/silence.js +28 -0
  42. package/dist/skills.js +49 -35
  43. package/dist/transcription.js +129 -43
  44. package/dist/translate.js +2 -8
  45. package/dist/update.js +115 -53
  46. package/dist/wire.js +22 -0
  47. package/dist/work.js +346 -0
  48. package/package.json +20 -20
  49. package/dist/blocks.js +0 -51
  50. package/dist/bootstrap.json +0 -24
  51. package/dist/stream.js +0 -72
  52. package/how-we-work.md +0 -23
  53. package/skills/ask-matt/LICENSE +0 -21
  54. package/skills/ask-matt/PHASE-BOUNDARIES.md +0 -55
  55. package/skills/ask-matt/SKILL.md +0 -91
  56. package/skills/ask-matt/agents/openai.yaml +0 -4
  57. package/skills/code-review/LICENSE +0 -21
  58. package/skills/code-review/SKILL.md +0 -89
  59. package/skills/code-review/agents/openai.yaml +0 -3
  60. package/skills/codebase-design/DEEPENING.md +0 -37
  61. package/skills/codebase-design/DESIGN-IT-TWICE.md +0 -44
  62. package/skills/codebase-design/LICENSE +0 -21
  63. package/skills/codebase-design/SKILL.md +0 -116
  64. package/skills/codebase-design/agents/openai.yaml +0 -3
  65. package/skills/diagnosing-bugs/LICENSE +0 -21
  66. package/skills/diagnosing-bugs/SKILL.md +0 -140
  67. package/skills/diagnosing-bugs/agents/openai.yaml +0 -3
  68. package/skills/diagnosing-bugs/scripts/hitl-loop.template.sh +0 -44
  69. package/skills/domain-modeling/ADR-FORMAT.md +0 -47
  70. package/skills/domain-modeling/CONTEXT-FORMAT.md +0 -60
  71. package/skills/domain-modeling/LICENSE +0 -21
  72. package/skills/domain-modeling/SKILL.md +0 -76
  73. package/skills/domain-modeling/agents/openai.yaml +0 -3
  74. package/skills/grill-me/LICENSE +0 -21
  75. package/skills/grill-me/SKILL.md +0 -8
  76. package/skills/grill-me/agents/openai.yaml +0 -4
  77. package/skills/grill-with-docs/LICENSE +0 -21
  78. package/skills/grill-with-docs/SKILL.md +0 -8
  79. package/skills/grill-with-docs/agents/openai.yaml +0 -4
  80. package/skills/grilling/LICENSE +0 -21
  81. package/skills/grilling/SKILL.md +0 -30
  82. package/skills/grilling/agents/openai.yaml +0 -3
  83. package/skills/handoff/LICENSE +0 -21
  84. package/skills/handoff/SKILL.md +0 -17
  85. package/skills/handoff/agents/openai.yaml +0 -4
  86. package/skills/implement/LICENSE +0 -21
  87. package/skills/implement/SKILL.md +0 -16
  88. package/skills/implement/agents/openai.yaml +0 -4
  89. package/skills/improve-codebase-architecture/HTML-REPORT.md +0 -123
  90. package/skills/improve-codebase-architecture/LICENSE +0 -21
  91. package/skills/improve-codebase-architecture/SKILL.md +0 -72
  92. package/skills/improve-codebase-architecture/agents/openai.yaml +0 -4
  93. package/skills/prototype/LICENSE +0 -21
  94. package/skills/prototype/LOGIC.md +0 -67
  95. package/skills/prototype/SKILL.md +0 -28
  96. package/skills/prototype/UI.md +0 -112
  97. package/skills/prototype/agents/openai.yaml +0 -3
  98. package/skills/research/LICENSE +0 -21
  99. package/skills/research/SKILL.md +0 -14
  100. package/skills/research/agents/openai.yaml +0 -3
  101. package/skills/resolving-merge-conflicts/LICENSE +0 -21
  102. package/skills/resolving-merge-conflicts/SKILL.md +0 -16
  103. package/skills/resolving-merge-conflicts/agents/openai.yaml +0 -3
  104. package/skills/tdd/LICENSE +0 -21
  105. package/skills/tdd/SKILL.md +0 -40
  106. package/skills/tdd/agents/openai.yaml +0 -3
  107. package/skills/tdd/mocking.md +0 -59
  108. package/skills/tdd/tests.md +0 -77
  109. package/skills/teach/GLOSSARY-FORMAT.md +0 -35
  110. package/skills/teach/LEARNING-RECORD-FORMAT.md +0 -46
  111. package/skills/teach/LICENSE +0 -21
  112. package/skills/teach/MISSION-FORMAT.md +0 -31
  113. package/skills/teach/RESOURCES-FORMAT.md +0 -32
  114. package/skills/teach/SKILL.md +0 -141
  115. package/skills/teach/agents/openai.yaml +0 -4
  116. package/skills/to-questionnaire/LICENSE +0 -21
  117. package/skills/to-questionnaire/SKILL.md +0 -55
  118. package/skills/to-questionnaire/agents/openai.yaml +0 -4
  119. package/skills/to-spec/LICENSE +0 -21
  120. package/skills/to-spec/SKILL.md +0 -76
  121. package/skills/to-spec/agents/openai.yaml +0 -4
  122. package/skills/to-tickets/LICENSE +0 -21
  123. package/skills/to-tickets/SKILL.md +0 -106
  124. package/skills/to-tickets/agents/openai.yaml +0 -4
  125. package/skills/wait-what/LICENSE +0 -21
  126. package/skills/wait-what/SKILL.md +0 -8
  127. package/skills/wait-what/agents/openai.yaml +0 -4
  128. package/skills/wayfinder/LICENSE +0 -21
  129. package/skills/wayfinder/SKILL.md +0 -129
  130. package/skills/wayfinder/agents/openai.yaml +0 -4
  131. package/skills/writing-for-agents/LICENSE +0 -21
  132. package/skills/writing-for-agents/SKILL-MECHANICS.md +0 -22
  133. package/skills/writing-for-agents/SKILL.md +0 -83
  134. package/skills/writing-for-agents/agents/openai.yaml +0 -3
package/dist/agents.js CHANGED
@@ -1,9 +1,18 @@
1
1
  import { client } from '@agentclientprotocol/sdk';
2
2
  import { readFile, realpath } from 'node:fs/promises';
3
- import { killTree, startAdapter } from './acp.js';
4
- import { CLIS, KIT_VERSION, below, installAdapter, installCli, locate, run, versionOf } from './clis.js';
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';
7
+ import { updatesItself } from './placement.js';
8
+ import { holdTranscription, transcriptionReport } from './transcription.js';
9
+ import { KIT_WIRE } from './wire.js';
10
+ // Two quiet seconds let a fresh conversation start before background model discovery competes for its CPU.
11
+ const MODEL_PROBE_QUIET_MS = 2_000;
12
+ // A sign-in's model read that has not answered in ten seconds leaves its sign-in to the status check, so a hung CLI never holds the sign-in's result.
13
+ const SIGNED_IN_READ_MS = 10_000;
6
14
  const SIGNED_OUT = { signed_in: false, models: [], modes: [] };
15
+ const INSTALLING = { release: null, failure: null, installing: true, ...SIGNED_OUT };
7
16
  function select(options, category) {
8
17
  const option = options.find((candidate) => candidate.category === category);
9
18
  return option?.type === 'select' ? option : undefined;
@@ -20,6 +29,22 @@ function causeOf(error) {
20
29
  function logged(error) {
21
30
  process.stderr.write(`kit: ${causeOf(error)}\n`);
22
31
  }
32
+ const LAPTOP_CHASSIS = new Set(['8', '9', '10', '14', '30', '31', '32']);
33
+ const DESKTOP_CHASSIS = new Set(['3', '4', '5', '6', '7', '15', '16']);
34
+ const SERVER_CHASSIS = new Set(['17', '18', '19', '20', '21', '22', '23', '24']);
35
+ export function chassisForm(value) {
36
+ const chassis = value.trim();
37
+ if (LAPTOP_CHASSIS.has(chassis))
38
+ return 'laptop';
39
+ if (DESKTOP_CHASSIS.has(chassis))
40
+ return 'desktop';
41
+ if (SERVER_CHASSIS.has(chassis))
42
+ return 'server';
43
+ return undefined;
44
+ }
45
+ export function hostVm(version) {
46
+ return /docker desktop|microsoft|wsl|linuxkit/i.test(version);
47
+ }
23
48
  async function models(kind, adapter, known) {
24
49
  const agent = adapter.connection.agent;
25
50
  const opened = await agent.request('session/new', { cwd: kitHome(), mcpServers: [] });
@@ -46,21 +71,22 @@ async function models(kind, adapter, known) {
46
71
  }
47
72
  return { models: offered, modes };
48
73
  }
49
- async function signedIn(kind, cli, known) {
50
- const probe = CLIS[kind].signedIn;
51
- // A sign-in check that has not answered in half a minute counts as signed out rather than stalling the report.
52
- if ('command' in probe)
53
- return (await run(cli, probe.command, 30_000)).status === 0;
54
- return (await offer(kind, cli, known)).signed_in;
74
+ function ended(signal) {
75
+ return new Promise((_, reject) => {
76
+ if (signal.aborted)
77
+ reject(signal.reason);
78
+ signal.addEventListener('abort', () => reject(signal.reason), { once: true });
79
+ });
55
80
  }
56
- async function offer(kind, cli, known) {
81
+ async function offer(kind, cli, known, signal) {
57
82
  const probe = CLIS[kind].signedIn;
58
83
  // A sign-in check that has not answered in half a minute counts as signed out rather than stalling the report.
59
- if ('command' in probe && (await run(cli, probe.command, 30_000)).status !== 0)
84
+ if ('command' in probe && (await run(cli, probe.command, 30_000, false, signal)).status !== 0)
60
85
  return SIGNED_OUT;
61
86
  let adapter;
62
87
  try {
63
- adapter = await startAdapter(kind, cli, kitHome(), client({ name: '@agentshouse/kit' }));
88
+ adapter = await startAdapter(kind, cli, kitHome(), client({ name: '@agentshouse/kit' }), () => undefined, {}, signal);
89
+ signal?.throwIfAborted();
64
90
  if ('initializeMeta' in probe) {
65
91
  const method = adapter.initialized._meta?.[probe.initializeMeta];
66
92
  if (typeof method !== 'string' || method.length === 0)
@@ -69,7 +95,10 @@ async function offer(kind, cli, known) {
69
95
  return { signed_in: true, ...(await models(kind, adapter, known.models)) };
70
96
  }
71
97
  catch (error) {
72
- process.stderr.write(`kit: ${kind} did not offer its models: ${causeOf(error)}\n`);
98
+ if (!signal?.aborted)
99
+ process.stderr.write(`kit: ${kind} did not offer its models: ${causeOf(error)}\n`);
100
+ if (signedOut(error))
101
+ return SIGNED_OUT;
73
102
  return {
74
103
  signed_in: adapter === undefined && 'initializeMeta' in probe ? known.signed_in : true,
75
104
  models: known.models,
@@ -77,26 +106,24 @@ async function offer(kind, cli, known) {
77
106
  };
78
107
  }
79
108
  finally {
80
- if (adapter !== undefined)
81
- killTree(adapter.child);
109
+ adapter?.retire();
82
110
  }
83
111
  }
84
112
  function reported(kind, reading) {
113
+ const { minimum, update } = CLIS[kind];
85
114
  return {
86
115
  kind,
87
116
  release: reading.release,
88
- ...(reading.minimum === undefined ? {} : { minimum: reading.minimum }),
117
+ ...(reading.release !== null && below(reading.release, minimum) ? { minimum, update } : {}),
89
118
  failure: reading.failure,
119
+ ...(reading.installing === undefined ? {} : { installing: reading.installing }),
90
120
  signed_in: reading.signed_in,
91
121
  models: reading.models,
92
122
  modes: reading.modes,
93
123
  full_access: CLIS[kind].fullAccess,
94
124
  };
95
125
  }
96
- function tooOld(kind, release) {
97
- const cli = CLIS[kind];
98
- return `${cli.bin} ${release} is older than ${cli.minimum}, the oldest this Kit runs`;
99
- }
126
+ const NOT_READY = "the Agent's CLI is not ready on this computer";
100
127
  async function sshHostKey() {
101
128
  // Listing a local host key takes a moment, so ten seconds only bounds a stuck ssh-keygen.
102
129
  const listed = await run('ssh-keygen', ['-l', '-E', 'sha256', '-f', '/etc/ssh/ssh_host_ed25519_key.pub'], 10_000);
@@ -109,18 +136,42 @@ async function operatingSystem() {
109
136
  const release = await readFile('/etc/os-release', 'utf8');
110
137
  return /^PRETTY_NAME="?([^"\n]*)"?$/m.exec(release)?.[1] ?? release;
111
138
  }
139
+ async function hostForm() {
140
+ if (process.platform === 'darwin') {
141
+ const battery = await run('pmset', ['-g', 'batt'], 10_000);
142
+ return battery.status === 0 && battery.output.includes('InternalBattery') ? 'laptop' : 'desktop';
143
+ }
144
+ if (process.platform !== 'linux')
145
+ return undefined;
146
+ const [container, version, chassis] = await Promise.all([
147
+ readFile('/.dockerenv', 'utf8').then(() => true).catch(() => false),
148
+ readFile('/proc/version', 'utf8').catch(() => ''),
149
+ readFile('/sys/class/dmi/id/chassis_type', 'utf8').catch(() => ''),
150
+ ]);
151
+ if (container && hostVm(version))
152
+ return undefined;
153
+ return chassisForm(chassis);
154
+ }
112
155
  export class Agents {
113
- desired = { agents: [], routes: [] };
156
+ desired = { agents: [], routes: [], transcribe: false };
114
157
  house;
115
158
  reading = Promise.resolve();
116
159
  queues = new Map();
117
160
  installing = Promise.resolve();
161
+ installs = new Map();
118
162
  readings = new Map();
119
163
  reads = new Map();
164
+ starts = 0;
120
165
  sending = Promise.resolve();
121
166
  sent = null;
122
- constructor(house) {
167
+ refreshing = 0;
168
+ changed;
169
+ constructor(house, changed = () => undefined) {
123
170
  this.house = house;
171
+ this.changed = changed;
172
+ }
173
+ idle() {
174
+ return this.refreshing === 0;
124
175
  }
125
176
  read() {
126
177
  return this.reading.then(() => undefined, () => undefined);
@@ -129,32 +180,45 @@ export class Agents {
129
180
  return this.desired.routes.find((route) => route.agent_id === agentId);
130
181
  }
131
182
  refresh() {
183
+ this.refreshing++;
184
+ this.changed();
132
185
  const reading = this.read().then(async () => {
133
186
  this.desired = await this.house.deliver('/kit/agents/desired', {});
134
187
  return this.desired;
135
188
  });
136
189
  this.reading = reading;
137
- return reading.then(({ agents }) => {
190
+ reading
191
+ .then(({ agents, transcribe }) => Promise.all([
192
+ holdTranscription(transcribe)
193
+ .then((changed) => (changed ? this.report() : undefined))
194
+ .catch(logged),
138
195
  Promise.all(agents.map((kind) => this.load(kind)))
139
196
  .then(() => this.report())
140
- .catch(logged);
197
+ .catch(logged),
198
+ ]))
199
+ .catch(() => undefined)
200
+ .finally(() => {
201
+ this.refreshing--;
202
+ this.changed();
141
203
  });
204
+ return reading.then(() => undefined);
142
205
  }
143
206
  cli(kind) {
207
+ this.starts += 1;
144
208
  return this.queue(kind, async () => {
145
209
  const resolved = await this.resolve(kind);
146
210
  if (!('cli' in resolved)) {
147
211
  this.update(kind, resolved);
148
- throw new Error(resolved.failure ?? tooOld(kind, resolved.release));
212
+ throw new Error(NOT_READY);
149
213
  }
150
214
  const { cli, release } = resolved;
151
215
  const known = this.readings.get(kind);
152
- const kept = known?.release === null || known?.minimum !== undefined ? SIGNED_OUT : (known ?? SIGNED_OUT);
153
- if (known?.release !== release || known.minimum !== undefined) {
216
+ const kept = known?.release === null ? SIGNED_OUT : (known ?? SIGNED_OUT);
217
+ if (known?.release !== release || this.installs.has(kind)) {
154
218
  this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models, modes: kept.modes });
155
219
  }
156
220
  const read = this.nextRead(kind);
157
- offer(kind, cli, kept)
221
+ this.quietOffer(kind, cli, kept)
158
222
  .then((offered) => {
159
223
  const current = this.readings.get(kind);
160
224
  if (this.reads.get(kind) === read && current?.release === release)
@@ -164,17 +228,25 @@ export class Agents {
164
228
  return cli;
165
229
  });
166
230
  }
167
- located(kind) {
168
- return this.queue(kind, () => this.ensure(kind));
231
+ located(kind, signal) {
232
+ const owner = {};
233
+ return this.queue(kind, () => this.ensure(kind, signal, owner).finally(() => this.settle(kind, owner)), signal);
169
234
  }
170
235
  async reread(kind) {
171
236
  await this.examine(kind, this.readings.get(kind) ?? SIGNED_OUT, offer);
172
237
  await this.report();
173
238
  }
174
- async recheck(kind) {
239
+ async recheck(kind, signal) {
175
240
  const known = this.readings.get(kind) ?? SIGNED_OUT;
176
- await this.examine(kind, known, async (kind, cli) => (await signedIn(kind, cli, known)) ? { ...known, signed_in: true } : SIGNED_OUT);
177
- await this.report();
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
+ }
248
+ if (!signal.aborted)
249
+ await this.report();
178
250
  }
179
251
  report() {
180
252
  const sending = this.sending.catch(() => undefined).then(() => this.send());
@@ -186,74 +258,99 @@ export class Agents {
186
258
  this.reads.set(kind, read);
187
259
  return read;
188
260
  }
189
- update(kind, reading) {
261
+ hold(kind, reading) {
190
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);
191
273
  this.report().catch(logged);
192
274
  }
193
- queue(kind, work) {
194
- const queued = (this.queues.get(kind) ?? Promise.resolve()).then(work);
275
+ queue(kind, work, signal) {
276
+ const queued = (this.queues.get(kind) ?? Promise.resolve()).then(() => {
277
+ signal?.throwIfAborted();
278
+ return work();
279
+ });
195
280
  this.queues.set(kind, queued.catch(() => undefined));
196
- return queued;
281
+ return signal === undefined ? queued : Promise.race([queued, ended(signal)]);
197
282
  }
198
- async ensure(kind) {
199
- const failed = await installAdapter(kind);
283
+ async ensure(kind, signal, owner = {}) {
284
+ const failed = await installAdapter(kind, signal);
200
285
  if (failed !== null)
201
286
  throw new Error(failed);
202
- const found = await locate(kind);
287
+ const found = await locate(kind, signal);
203
288
  if (found !== null)
204
289
  return found;
205
- const installing = this.installing.catch(() => undefined).then(() => installCli(kind));
290
+ this.installs.set(kind, owner);
291
+ this.report().catch(logged);
292
+ const installing = this.installing.catch(() => undefined).then(() => installCli(kind, signal));
206
293
  this.installing = installing;
207
294
  const failure = await installing;
208
295
  if (failure !== null)
209
296
  throw new Error(failure);
210
- const installed = await locate(kind);
297
+ const installed = await locate(kind, signal);
211
298
  if (installed === null)
212
299
  throw new Error(`the login shell does not find ${CLIS[kind].bin} after its install`);
213
300
  return installed;
214
301
  }
215
- async resolve(kind) {
302
+ async resolve(kind, signal, owner) {
216
303
  let cli;
217
304
  try {
218
- cli = await realpath(await this.ensure(kind));
305
+ cli = await realpath(await this.ensure(kind, signal, owner));
219
306
  }
220
307
  catch (error) {
221
308
  const failure = causeOf(error);
222
309
  process.stderr.write(`kit: ${kind} did not install: ${failure}\n`);
223
310
  return { release: null, failure, ...SIGNED_OUT };
224
311
  }
225
- const release = await versionOf(cli);
312
+ const release = await versionOf(cli, signal);
226
313
  if (release === null)
227
314
  return { release: null, failure: `${cli} --version names no version`, ...SIGNED_OUT };
228
- const minimum = CLIS[kind].minimum;
229
- if (below(release, minimum))
230
- return { release, minimum, failure: null, ...SIGNED_OUT };
231
315
  return { cli, release };
232
316
  }
233
- async examine(kind, known, read) {
317
+ async examine(kind, known, read, signal, owner) {
234
318
  const current = this.nextRead(kind);
235
- const resolved = await this.queue(kind, () => this.resolve(kind));
319
+ const resolved = await this.queue(kind, () => this.resolve(kind, signal, owner), signal);
236
320
  const reading = 'cli' in resolved ? { release: resolved.release, failure: null, ...(await read(kind, resolved.cli, known)) } : resolved;
237
- if (this.reads.get(kind) === current)
238
- this.readings.set(kind, reading);
321
+ if (this.reads.get(kind) === current && !signal?.aborted)
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);
239
330
  }
240
331
  async load(kind) {
241
332
  const known = this.readings.get(kind);
242
333
  if (known !== undefined && known.failure === null)
243
334
  return;
244
- await this.examine(kind, SIGNED_OUT, offer);
335
+ await this.examine(kind, SIGNED_OUT, (kind, cli, known) => this.quietOffer(kind, cli, known));
336
+ await this.report();
245
337
  }
246
338
  async send() {
247
339
  const agents = this.desired.agents.flatMap((kind) => {
248
- const reading = this.readings.get(kind);
340
+ const reading = this.installs.has(kind) ? INSTALLING : this.readings.get(kind);
249
341
  return reading === undefined ? [] : [reported(kind, reading)];
250
342
  });
251
343
  const hostKey = await sshHostKey();
344
+ const form = await hostForm();
252
345
  const body = {
253
346
  os: await operatingSystem(),
254
- kit_version: KIT_VERSION,
347
+ ...(form === undefined ? {} : { form }),
348
+ kit_release: KIT_RELEASE,
349
+ wire: KIT_WIRE,
350
+ updates_itself: await updatesItself(),
255
351
  agent_base: agentBase(),
256
352
  agents,
353
+ transcription: transcriptionReport(),
257
354
  ...(hostKey === null ? {} : { ssh_host_key: hostKey }),
258
355
  };
259
356
  const state = JSON.stringify(body);
package/dist/api.js CHANGED
@@ -1,8 +1,9 @@
1
1
  import { setTimeout as delay } from 'node:timers/promises';
2
- import { end, SIGN_IN_AGAIN } 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 { endUnserved, KIT_WIRE, KIT_WIRE_HEADER } from './wire.js';
6
7
  export class HouseRefusal extends Error {
7
8
  status;
8
9
  text;
@@ -16,10 +17,10 @@ export function finalRefusal(error) {
16
17
  return error instanceof HouseRefusal && retryable(error.text) === false;
17
18
  }
18
19
  export function retryDelay(attempt) {
19
- // Full jitter, doubling from one second to a 30-second cap, spreads the 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.
20
21
  return Math.random() * Math.min(30_000, 1000 * 2 ** attempt);
21
22
  }
22
- export async function retrying(sent, signal) {
23
+ export async function retrying(sent, signal, pause = retryDelay) {
23
24
  for (let attempt = 0;; attempt++) {
24
25
  try {
25
26
  return await sent();
@@ -28,8 +29,8 @@ export async function retrying(sent, signal) {
28
29
  if (!(error instanceof HouseRefusal) || retryable(error.text) !== true)
29
30
  throw error;
30
31
  }
31
- // A request House refused as retryable is sent again on the jittered curve.
32
- await delay(retryDelay(attempt), undefined, { signal });
32
+ // A request House refused as retryable is sent again after the caller's pause, the jittered curve unless it names its own.
33
+ await delay(pause(attempt), undefined, { signal });
33
34
  }
34
35
  }
35
36
  export async function post(house, path, body, credential, signal) {
@@ -37,12 +38,15 @@ export async function post(house, path, body, credential, signal) {
37
38
  method: 'POST',
38
39
  headers: {
39
40
  'content-type': 'application/json',
41
+ [KIT_WIRE_HEADER]: String(KIT_WIRE),
40
42
  ...(credential === undefined ? {} : { authorization: `Bearer ${credential}` }),
41
43
  },
42
44
  body: JSON.stringify(body),
43
45
  signal,
44
46
  });
45
47
  const text = await answer.text();
48
+ if (!answer.ok)
49
+ endUnserved(text);
46
50
  if (!answer.ok)
47
51
  throw new HouseRefusal(path, answer.status, text);
48
52
  return JSON.parse(text);
@@ -54,7 +58,7 @@ async function enrolledPost(path, body, signal) {
54
58
  }
55
59
  catch (error) {
56
60
  if (error instanceof HouseRefusal && error.status === 401)
57
- end(SIGN_IN_AGAIN);
61
+ await signInAgain(credential);
58
62
  throw error;
59
63
  }
60
64
  }
@@ -0,0 +1,48 @@
1
+ import { run } from './git.js';
2
+ import { kitHome, readOwnAgent } from './home.js';
3
+ const HELPER = '!kit git-credential';
4
+ function section(house) {
5
+ return `credential.${new URL('/app/', house).href}`;
6
+ }
7
+ async function configured(args) {
8
+ try {
9
+ return await run(kitHome(), ['config', '--global', ...args]);
10
+ }
11
+ catch (error) {
12
+ if (error.code === 'ENOENT')
13
+ return null;
14
+ throw error;
15
+ }
16
+ }
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]);
23
+ if (ran === null)
24
+ return;
25
+ if (ran.status !== 0)
26
+ throw new Error(`git config failed: ${ran.stderr.trim()}`);
27
+ }
28
+ }
29
+ export async function answerGitCredential(operation) {
30
+ let asked = '';
31
+ for await (const chunk of process.stdin)
32
+ asked += String(chunk);
33
+ if (operation !== 'get')
34
+ return;
35
+ const attributes = new Map(asked
36
+ .split('\n')
37
+ .filter((line) => line.includes('='))
38
+ .map((line) => [line.slice(0, line.indexOf('=')), line.slice(line.indexOf('=') + 1)]));
39
+ const ownAgent = await readOwnAgent();
40
+ if (ownAgent === null) {
41
+ process.stderr.write(`kit: Kit home ${kitHome()} is not signed in; run kit login\n`);
42
+ return;
43
+ }
44
+ const house = new URL(ownAgent.house);
45
+ if (attributes.get('protocol') !== house.protocol.slice(0, -1) || attributes.get('host') !== house.host)
46
+ return;
47
+ process.stdout.write(`username=house\npassword=${ownAgent.credential}\n`);
48
+ }
@@ -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
- setGlobalProxyFromEnv();
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,13 +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
- import { operationId, uuidOf } from './operation.js';
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 = 4 * 1024 * 1024;
18
- const ATTACHMENTS = '/kit/attachments/upload';
16
+ const MCP_REQUEST_BYTES = 4_000_000;
19
17
  export async function received(request) {
20
18
  let text = '';
21
19
  request.setEncoding('utf8');
@@ -68,11 +66,6 @@ function resendAfter(forwarded, attempt) {
68
66
  const seconds = pendingSeconds(forwarded);
69
67
  return seconds === null ? null : seconds * 1000;
70
68
  }
71
- function versioned(conversationId, text) {
72
- const file = JSON.parse(text);
73
- const identity = JSON.stringify([conversationId, file.room_ref ?? null, file.name, file.sha256]);
74
- return JSON.stringify({ ...file, version: uuidOf(createHash('sha256').update(identity).digest(), 8) });
75
- }
76
69
  function editAnswer(forwarded) {
77
70
  const answer = answered(forwarded);
78
71
  if ('refused' in answer)
@@ -88,7 +81,7 @@ function editAnswer(forwarded) {
88
81
  export async function openBridge(house, copies, conversationId, signal) {
89
82
  const path = [join(kitHome(), 'shim'), dirname(process.execPath), await loginPath()].join(delimiter);
90
83
  const origin = (await readEnrolment()).house;
91
- const { credential } = await house.post(`/kit/conversations/${conversationId}/credential`, {}, signal);
84
+ const { credential } = await retrying(() => house.post(`/kit/conversations/${conversationId}/credential`, {}, signal), signal);
92
85
  const closed = new AbortController();
93
86
  const sent = (message, operation) => callHouse(origin, credential, message, operation, closed.signal);
94
87
  const send = async (message, operation) => {
@@ -103,7 +96,7 @@ export async function openBridge(house, copies, conversationId, signal) {
103
96
  const after = resendAfter(forwarded, attempt);
104
97
  if (after === null)
105
98
  return forwarded;
106
- // A write House did not settle is sent again on the jittered curve, or after the wait House names for a pending one.
99
+ // A Tool call House did not settle is sent again on the jittered curve, or after the wait House names for a pending one.
107
100
  await delay(after, undefined, { signal: closed.signal });
108
101
  }
109
102
  };
@@ -141,32 +134,9 @@ export async function openBridge(house, copies, conversationId, signal) {
141
134
  const held = JSON.parse(text).transfer;
142
135
  return { url: held.url, operation: held.operation, bytes: bytes.length, sha256 };
143
136
  };
144
- let mutations = null;
145
- const writes = async (tool) => {
146
- mutations ??= house
147
- .post('/kit/tools/mutations', {}, closed.signal)
148
- .then(({ tools }) => new Set(tools.filter((listed) => listed.writes).map((listed) => listed.name)));
149
- try {
150
- return (await mutations).has(tool);
151
- }
152
- catch (error) {
153
- mutations = null;
154
- throw error;
155
- }
156
- };
157
- const forward = async (path, text) => {
158
- if (path === '/') {
159
- const message = JSON.parse(text);
160
- const tool = message.method === 'tools/call' ? String(message.params.name) : null;
161
- return send(message, tool !== null && (await writes(tool)) ? operationId() : null);
162
- }
163
- const answer = await fetch(relayed(new URL(path, origin)), {
164
- method: 'POST',
165
- headers: { 'content-type': 'application/json', authorization: `Bearer ${credential}` },
166
- body: versioned(conversationId, text),
167
- signal: closed.signal,
168
- });
169
- return { status: answer.status, text: await answer.text() };
137
+ const forward = (text) => {
138
+ const message = JSON.parse(text);
139
+ return send(message, message.method === 'tools/call' ? operationId() : null);
170
140
  };
171
141
  const caller = {
172
142
  key: `conversation:${conversationId}`,
@@ -188,15 +158,15 @@ export async function openBridge(house, copies, conversationId, signal) {
188
158
  const { cwd, commit } = JSON.parse(text);
189
159
  return { status: 200, text: JSON.stringify(await copies.push(cwd, commit, caller)) };
190
160
  }
161
+ if (path === '/git/fetch')
162
+ return { status: 200, text: JSON.stringify(await copies.fetch()) };
191
163
  if (path === '/git/observed') {
192
164
  await copies.observed(JSON.parse(text));
193
165
  return { status: 200, text: '{}' };
194
166
  }
195
- return path === '/' || path === ATTACHMENTS ? forward(path, text) : { status: 404, text: '' };
167
+ return path === '/' ? forward(text) : { status: 404, text: '' };
196
168
  };
197
- const sockets = join(kitHome(), 'bridges');
198
- await mkdir(sockets, { recursive: true, mode: 0o700 });
199
- const socketPath = join(sockets, `${randomUUID()}.sock`);
169
+ const socketPath = join(socketDirectory(), `${randomUUID()}.sock`);
200
170
  const bridge = createServer(async (request, response) => {
201
171
  try {
202
172
  const path = request.url ?? '';
@@ -212,7 +182,8 @@ export async function openBridge(house, copies, conversationId, signal) {
212
182
  response.writeHead(error.status, { 'content-type': 'application/json' }).end(error.text);
213
183
  return;
214
184
  }
215
- response.writeHead(502).end(request.url === '/git/push' && error instanceof Error ? error.message : UNREACHABLE);
185
+ const verb = request.url === '/git/push' || request.url === '/git/fetch';
186
+ response.writeHead(502).end(verb && error instanceof Error ? error.message : UNREACHABLE);
216
187
  }
217
188
  });
218
189
  bridge.listen(socketPath);
@@ -239,7 +210,7 @@ export async function openBridge(house, copies, conversationId, signal) {
239
210
  GIT_CONFIG_VALUE_0: app,
240
211
  },
241
212
  tool: async (name, args) => {
242
- const forwarded = await forward('/', JSON.stringify(call(name, args)));
213
+ const forwarded = await forward(JSON.stringify(call(name, args)));
243
214
  if (forwarded.status !== 200)
244
215
  throw new Error(`House refused ${name} with ${forwarded.status}: ${forwarded.text}`);
245
216
  const answer = JSON.parse(forwarded.text);
@@ -0,0 +1,46 @@
1
+ import { createHash } from 'node:crypto';
2
+ import { createWriteStream } from 'node:fs';
3
+ import { rm } from 'node:fs/promises';
4
+ import { Transform } from 'node:stream';
5
+ import { pipeline } from 'node:stream/promises';
6
+ import { readEnrolment } from './home.js';
7
+ import { relayed } from './relay.js';
8
+ const MANIFEST = 'bootstrap.json';
9
+ async function served(name, signal) {
10
+ const enrolment = await readEnrolment();
11
+ if (enrolment === null)
12
+ throw new Error('this Kit is connected to no House');
13
+ const answer = await fetch(relayed(new URL(`/kit-installer/${encodeURIComponent(name)}`, enrolment.house)), { signal });
14
+ if (answer.status === 200 && answer.body !== null)
15
+ return answer;
16
+ await answer.body?.cancel();
17
+ throw new Error(`House answered ${answer.status} for ${name}`);
18
+ }
19
+ export async function servedDigest(name, signal) {
20
+ const manifest = (await (await served(MANIFEST, signal)).json());
21
+ const sha256 = manifest.files?.[name]?.sha256;
22
+ return typeof sha256 === 'string' ? sha256 : null;
23
+ }
24
+ export async function downloadServed(name, sha256, destination, signal, most = Infinity) {
25
+ const answer = await served(name, signal);
26
+ const digest = createHash('sha256');
27
+ let bytes = 0;
28
+ const hashed = new Transform({
29
+ transform(chunk, _encoding, done) {
30
+ bytes += chunk.length;
31
+ if (bytes > most)
32
+ return done(new Error(`${name} is larger than its pinned ${most} bytes`));
33
+ digest.update(chunk);
34
+ done(null, chunk);
35
+ },
36
+ });
37
+ try {
38
+ await pipeline(answer.body, hashed, createWriteStream(destination), { signal });
39
+ if (digest.digest('hex') !== sha256)
40
+ throw new Error(`${name} does not match its sha256`);
41
+ }
42
+ catch (error) {
43
+ await rm(destination, { force: true });
44
+ throw error;
45
+ }
46
+ }