@agentshouse/kit 0.2.1-cd9cbd8b6428c → 0.2.1-ce0af1aee9a57

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 (138) hide show
  1. package/README.md +46 -46
  2. package/dist/acp.js +102 -108
  3. package/dist/afk.js +17 -0
  4. package/dist/agents.js +218 -63
  5. package/dist/api.js +34 -2
  6. package/dist/app-git.js +48 -0
  7. package/dist/authority-main.js +3 -3
  8. package/dist/bridge.js +42 -62
  9. package/dist/building.js +50 -0
  10. package/dist/calls.js +71 -0
  11. package/dist/chunks.js +49 -0
  12. package/dist/clis.js +169 -95
  13. package/dist/codex-main.js +58 -0
  14. package/dist/connection.js +120 -0
  15. package/dist/content.js +63 -0
  16. package/dist/conversations.js +853 -333
  17. package/dist/copies.js +451 -251
  18. package/dist/end.js +33 -0
  19. package/dist/enrol-main.js +7 -1
  20. package/dist/events.js +1057 -0
  21. package/dist/files.js +139 -17
  22. package/dist/git.js +57 -21
  23. package/dist/grok.js +39 -0
  24. package/dist/home.js +89 -7
  25. package/dist/house-cli.js +299 -0
  26. package/dist/house-main.js +7 -159
  27. package/dist/instructions.js +7 -11
  28. package/dist/kit-cli.js +65 -0
  29. package/dist/kit-main.js +8 -19
  30. package/dist/login.js +117 -102
  31. package/dist/logout.js +14 -13
  32. package/dist/mcp.js +6 -2
  33. package/dist/placement.js +31 -0
  34. package/dist/refusals.js +12 -0
  35. package/dist/relay.js +33 -2
  36. package/dist/resident.js +138 -61
  37. package/dist/scope.js +214 -0
  38. package/dist/scripts.js +255 -0
  39. package/dist/secret-input.js +5 -2
  40. package/dist/service-main.js +9 -0
  41. package/dist/service.js +55 -0
  42. package/dist/shell.js +3 -0
  43. package/dist/sign-in.js +40 -32
  44. package/dist/silence.js +28 -0
  45. package/dist/skills.js +49 -35
  46. package/dist/transcription.js +131 -40
  47. package/dist/translate.js +19 -16
  48. package/dist/update.js +113 -103
  49. package/dist/wire.js +40 -0
  50. package/dist/work.js +353 -0
  51. package/package.json +22 -20
  52. package/dist/blocks.js +0 -51
  53. package/dist/bootstrap.json +0 -24
  54. package/dist/clis-main.js +0 -23
  55. package/dist/stream.js +0 -47
  56. package/how-we-work.md +0 -23
  57. package/skills/ask-matt/LICENSE +0 -21
  58. package/skills/ask-matt/PHASE-BOUNDARIES.md +0 -55
  59. package/skills/ask-matt/SKILL.md +0 -91
  60. package/skills/ask-matt/agents/openai.yaml +0 -4
  61. package/skills/code-review/LICENSE +0 -21
  62. package/skills/code-review/SKILL.md +0 -89
  63. package/skills/code-review/agents/openai.yaml +0 -3
  64. package/skills/codebase-design/DEEPENING.md +0 -37
  65. package/skills/codebase-design/DESIGN-IT-TWICE.md +0 -44
  66. package/skills/codebase-design/LICENSE +0 -21
  67. package/skills/codebase-design/SKILL.md +0 -116
  68. package/skills/codebase-design/agents/openai.yaml +0 -3
  69. package/skills/diagnosing-bugs/LICENSE +0 -21
  70. package/skills/diagnosing-bugs/SKILL.md +0 -140
  71. package/skills/diagnosing-bugs/agents/openai.yaml +0 -3
  72. package/skills/diagnosing-bugs/scripts/hitl-loop.template.sh +0 -44
  73. package/skills/domain-modeling/ADR-FORMAT.md +0 -47
  74. package/skills/domain-modeling/CONTEXT-FORMAT.md +0 -60
  75. package/skills/domain-modeling/LICENSE +0 -21
  76. package/skills/domain-modeling/SKILL.md +0 -76
  77. package/skills/domain-modeling/agents/openai.yaml +0 -3
  78. package/skills/grill-me/LICENSE +0 -21
  79. package/skills/grill-me/SKILL.md +0 -8
  80. package/skills/grill-me/agents/openai.yaml +0 -4
  81. package/skills/grill-with-docs/LICENSE +0 -21
  82. package/skills/grill-with-docs/SKILL.md +0 -8
  83. package/skills/grill-with-docs/agents/openai.yaml +0 -4
  84. package/skills/grilling/LICENSE +0 -21
  85. package/skills/grilling/SKILL.md +0 -30
  86. package/skills/grilling/agents/openai.yaml +0 -3
  87. package/skills/handoff/LICENSE +0 -21
  88. package/skills/handoff/SKILL.md +0 -17
  89. package/skills/handoff/agents/openai.yaml +0 -4
  90. package/skills/implement/LICENSE +0 -21
  91. package/skills/implement/SKILL.md +0 -16
  92. package/skills/implement/agents/openai.yaml +0 -4
  93. package/skills/improve-codebase-architecture/HTML-REPORT.md +0 -123
  94. package/skills/improve-codebase-architecture/LICENSE +0 -21
  95. package/skills/improve-codebase-architecture/SKILL.md +0 -72
  96. package/skills/improve-codebase-architecture/agents/openai.yaml +0 -4
  97. package/skills/prototype/LICENSE +0 -21
  98. package/skills/prototype/LOGIC.md +0 -67
  99. package/skills/prototype/SKILL.md +0 -28
  100. package/skills/prototype/UI.md +0 -112
  101. package/skills/prototype/agents/openai.yaml +0 -3
  102. package/skills/research/LICENSE +0 -21
  103. package/skills/research/SKILL.md +0 -14
  104. package/skills/research/agents/openai.yaml +0 -3
  105. package/skills/resolving-merge-conflicts/LICENSE +0 -21
  106. package/skills/resolving-merge-conflicts/SKILL.md +0 -16
  107. package/skills/resolving-merge-conflicts/agents/openai.yaml +0 -3
  108. package/skills/tdd/LICENSE +0 -21
  109. package/skills/tdd/SKILL.md +0 -40
  110. package/skills/tdd/agents/openai.yaml +0 -3
  111. package/skills/tdd/mocking.md +0 -59
  112. package/skills/tdd/tests.md +0 -77
  113. package/skills/teach/GLOSSARY-FORMAT.md +0 -35
  114. package/skills/teach/LEARNING-RECORD-FORMAT.md +0 -46
  115. package/skills/teach/LICENSE +0 -21
  116. package/skills/teach/MISSION-FORMAT.md +0 -31
  117. package/skills/teach/RESOURCES-FORMAT.md +0 -32
  118. package/skills/teach/SKILL.md +0 -141
  119. package/skills/teach/agents/openai.yaml +0 -4
  120. package/skills/to-questionnaire/LICENSE +0 -21
  121. package/skills/to-questionnaire/SKILL.md +0 -55
  122. package/skills/to-questionnaire/agents/openai.yaml +0 -4
  123. package/skills/to-spec/LICENSE +0 -21
  124. package/skills/to-spec/SKILL.md +0 -76
  125. package/skills/to-spec/agents/openai.yaml +0 -4
  126. package/skills/to-tickets/LICENSE +0 -21
  127. package/skills/to-tickets/SKILL.md +0 -106
  128. package/skills/to-tickets/agents/openai.yaml +0 -4
  129. package/skills/wait-what/LICENSE +0 -21
  130. package/skills/wait-what/SKILL.md +0 -8
  131. package/skills/wait-what/agents/openai.yaml +0 -4
  132. package/skills/wayfinder/LICENSE +0 -21
  133. package/skills/wayfinder/SKILL.md +0 -129
  134. package/skills/wayfinder/agents/openai.yaml +0 -4
  135. package/skills/writing-for-agents/LICENSE +0 -21
  136. package/skills/writing-for-agents/SKILL-MECHANICS.md +0 -22
  137. package/skills/writing-for-agents/SKILL.md +0 -83
  138. package/skills/writing-for-agents/agents/openai.yaml +0 -3
package/dist/agents.js CHANGED
@@ -1,15 +1,28 @@
1
1
  import { client } from '@agentclientprotocol/sdk';
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';
2
+ import { readFile } from 'node:fs/promises';
3
+ import { setTimeout as delay } from 'node:timers/promises';
4
+ import { signedOut, startAdapter } from './acp.js';
5
+ import { CLIS, KIT_RELEASE, below, installCli, locate, run, updateCli, versionOf } from './clis.js';
5
6
  import { agentBase, kitHome } from './home.js';
6
- const SIGNED_OUT = { signed_in: false, models: [] };
7
+ import { holdTranscription, transcriptionReport } from './transcription.js';
8
+ import { KIT_WIRE } from './wire.js';
9
+ // Two quiet seconds let a fresh conversation start before background model discovery competes for its CPU.
10
+ const MODEL_PROBE_QUIET_MS = 2_000;
11
+ // A CLI's maker can publish several releases a day, so running each chosen CLI's update command hourly brings a new one to the next conversation within the hour for one small check.
12
+ export const CLI_UPDATE_MS = 60 * 60_000;
13
+ // 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.
14
+ const SIGNED_IN_READ_MS = 10_000;
15
+ const SIGNED_OUT = { signed_in: false, models: [], modes: [] };
16
+ const INSTALLING = { release: null, failure: null, installing: true, ...SIGNED_OUT };
7
17
  function select(options, category) {
8
18
  const option = options.find((candidate) => candidate.category === category);
9
19
  return option?.type === 'select' ? option : undefined;
10
20
  }
21
+ function choices(options) {
22
+ return options.flatMap((entry) => ('group' in entry ? entry.options : [entry]));
23
+ }
11
24
  function values(options) {
12
- return options.flatMap((entry) => ('group' in entry ? entry.options : [entry])).map((entry) => entry.value);
25
+ return choices(options).map((entry) => entry.value);
13
26
  }
14
27
  function causeOf(error) {
15
28
  return error instanceof Error ? error.message : String(error);
@@ -17,13 +30,31 @@ function causeOf(error) {
17
30
  function logged(error) {
18
31
  process.stderr.write(`kit: ${causeOf(error)}\n`);
19
32
  }
33
+ const LAPTOP_CHASSIS = new Set(['8', '9', '10', '14', '30', '31', '32']);
34
+ const DESKTOP_CHASSIS = new Set(['3', '4', '5', '6', '7', '15', '16']);
35
+ const SERVER_CHASSIS = new Set(['17', '18', '19', '20', '21', '22', '23', '24']);
36
+ export function chassisForm(value) {
37
+ const chassis = value.trim();
38
+ if (LAPTOP_CHASSIS.has(chassis))
39
+ return 'laptop';
40
+ if (DESKTOP_CHASSIS.has(chassis))
41
+ return 'desktop';
42
+ if (SERVER_CHASSIS.has(chassis))
43
+ return 'server';
44
+ return undefined;
45
+ }
46
+ export function hostVm(version) {
47
+ return /docker desktop|microsoft|wsl|linuxkit/i.test(version);
48
+ }
20
49
  async function models(kind, adapter, known) {
21
50
  const agent = adapter.connection.agent;
22
51
  const opened = await agent.request('session/new', { cwd: kitHome(), mcpServers: [] });
23
52
  let options = opened.configOptions ?? [];
53
+ const mode = select(options, 'mode');
54
+ const modes = mode === undefined ? [] : choices(mode.options).map(({ value, name }) => ({ mode: value, name }));
24
55
  const model = select(options, 'model');
25
56
  if (model === undefined)
26
- return [];
57
+ return { models: [], modes };
27
58
  const offered = [];
28
59
  for (const value of values(model.options)) {
29
60
  if (select(options, 'model')?.currentValue !== value) {
@@ -39,67 +70,111 @@ async function models(kind, adapter, known) {
39
70
  const effort = select(options, 'thought_level');
40
71
  offered.push({ model: value, efforts: effort === undefined ? [] : values(effort.options) });
41
72
  }
42
- return offered;
73
+ return { models: offered, modes };
43
74
  }
44
- async function offer(kind, cli, known) {
75
+ function ended(signal) {
76
+ return new Promise((_, reject) => {
77
+ if (signal.aborted)
78
+ reject(signal.reason);
79
+ signal.addEventListener('abort', () => reject(signal.reason), { once: true });
80
+ });
81
+ }
82
+ async function offer(kind, cli, known, signal) {
45
83
  const probe = CLIS[kind].signedIn;
46
- if ('command' in probe && (await run(cli, probe.command, 30_000)).status !== 0)
84
+ // A sign-in check that has not answered in half a minute counts as signed out rather than stalling the report.
85
+ if ('command' in probe && (await run(cli, probe.command, 30_000, false, signal)).status !== 0)
47
86
  return SIGNED_OUT;
48
87
  let adapter;
49
88
  try {
50
- adapter = await startAdapter(kind, cli, kitHome(), client({ name: '@agentshouse/kit' }));
89
+ adapter = await startAdapter(kind, cli, kitHome(), client({ name: '@agentshouse/kit' }), () => undefined, {}, signal);
90
+ signal?.throwIfAborted();
51
91
  if ('initializeMeta' in probe) {
52
92
  const method = adapter.initialized._meta?.[probe.initializeMeta];
53
93
  if (typeof method !== 'string' || method.length === 0)
54
94
  return SIGNED_OUT;
55
95
  }
56
- return { signed_in: true, models: await models(kind, adapter, known.models) };
96
+ return { signed_in: true, ...(await models(kind, adapter, known.models)) };
57
97
  }
58
98
  catch (error) {
59
- process.stderr.write(`kit: ${kind} did not offer its models: ${causeOf(error)}\n`);
60
- return { signed_in: adapter === undefined && 'initializeMeta' in probe ? known.signed_in : true, models: known.models };
99
+ if (!signal?.aborted)
100
+ process.stderr.write(`kit: ${kind} did not offer its models: ${causeOf(error)}\n`);
101
+ if (signedOut(error))
102
+ return SIGNED_OUT;
103
+ return {
104
+ signed_in: adapter === undefined && 'initializeMeta' in probe ? known.signed_in : true,
105
+ models: known.models,
106
+ modes: known.modes,
107
+ };
61
108
  }
62
109
  finally {
63
- if (adapter !== undefined)
64
- killTree(adapter.child);
110
+ adapter?.retire();
65
111
  }
66
112
  }
67
113
  function reported(kind, reading) {
114
+ const { minimum, update } = CLIS[kind];
68
115
  return {
69
116
  kind,
70
117
  release: reading.release,
71
- ...(reading.minimum === undefined ? {} : { minimum: reading.minimum }),
118
+ ...(reading.release !== null && below(reading.release, minimum) ? { minimum, update } : {}),
72
119
  failure: reading.failure,
120
+ ...(reading.installing === undefined ? {} : { installing: reading.installing }),
73
121
  signed_in: reading.signed_in,
74
122
  models: reading.models,
123
+ modes: reading.modes,
124
+ full_access: CLIS[kind].fullAccess,
75
125
  };
76
126
  }
77
- function tooOld(kind, release) {
78
- const cli = CLIS[kind];
79
- return `${cli.bin} ${release} is older than ${cli.minimum}, the oldest this Kit runs`;
80
- }
127
+ const NOT_READY = "the Agent's CLI is not ready on this computer";
81
128
  async function sshHostKey() {
129
+ // Listing a local host key takes a moment, so ten seconds only bounds a stuck ssh-keygen.
82
130
  const listed = await run('ssh-keygen', ['-l', '-E', 'sha256', '-f', '/etc/ssh/ssh_host_ed25519_key.pub'], 10_000);
83
131
  return listed.status === 0 ? (/^\d+ (SHA256:\S+)/.exec(listed.output)?.[1] ?? null) : null;
84
132
  }
85
133
  async function operatingSystem() {
134
+ // sw_vers answers at once, so ten seconds only bounds a stuck call.
86
135
  if (process.platform === 'darwin')
87
136
  return `macOS ${(await run('sw_vers', ['-productVersion'], 10_000)).output.trim()}`;
88
137
  const release = await readFile('/etc/os-release', 'utf8');
89
138
  return /^PRETTY_NAME="?([^"\n]*)"?$/m.exec(release)?.[1] ?? release;
90
139
  }
140
+ async function hostForm() {
141
+ if (process.platform === 'darwin') {
142
+ const battery = await run('pmset', ['-g', 'batt'], 10_000);
143
+ return battery.status === 0 && battery.output.includes('InternalBattery') ? 'laptop' : 'desktop';
144
+ }
145
+ if (process.platform !== 'linux')
146
+ return undefined;
147
+ const [container, version, chassis] = await Promise.all([
148
+ readFile('/.dockerenv', 'utf8').then(() => true).catch(() => false),
149
+ readFile('/proc/version', 'utf8').catch(() => ''),
150
+ readFile('/sys/class/dmi/id/chassis_type', 'utf8').catch(() => ''),
151
+ ]);
152
+ if (container && hostVm(version))
153
+ return undefined;
154
+ return chassisForm(chassis);
155
+ }
91
156
  export class Agents {
92
- desired = { agents: [], routes: [] };
157
+ desired = { agents: [], routes: [], transcribe: false };
93
158
  house;
94
159
  reading = Promise.resolve();
95
160
  queues = new Map();
96
161
  installing = Promise.resolve();
162
+ installs = new Map();
97
163
  readings = new Map();
98
164
  reads = new Map();
165
+ starts = 0;
99
166
  sending = Promise.resolve();
100
167
  sent = null;
101
- constructor(house) {
168
+ refreshing = 0;
169
+ loaded = Promise.resolve();
170
+ updating = null;
171
+ changed;
172
+ constructor(house, changed = () => undefined) {
102
173
  this.house = house;
174
+ this.changed = changed;
175
+ }
176
+ idle() {
177
+ return this.refreshing === 0 && this.updating === null;
103
178
  }
104
179
  read() {
105
180
  return this.reading.then(() => undefined, () => undefined);
@@ -108,32 +183,52 @@ export class Agents {
108
183
  return this.desired.routes.find((route) => route.agent_id === agentId);
109
184
  }
110
185
  refresh() {
186
+ this.refreshing++;
187
+ this.changed();
111
188
  const reading = this.read().then(async () => {
112
- this.desired = await this.house.deliver('/kit/agents/desired', {});
189
+ this.desired = await this.house.deliver('/kit/agents/desired/list', {});
113
190
  return this.desired;
114
191
  });
115
192
  this.reading = reading;
116
- return reading.then(({ agents }) => {
117
- Promise.all(agents.map((kind) => this.queue(kind, () => this.load(kind))))
193
+ this.loaded = reading
194
+ .then(({ agents, transcribe }) => Promise.all([
195
+ holdTranscription(transcribe)
196
+ .then((changed) => (changed ? this.report() : undefined))
197
+ .catch(logged),
198
+ Promise.all(agents.map((kind) => this.load(kind)))
118
199
  .then(() => this.report())
119
- .catch(logged);
200
+ .catch(logged),
201
+ ]))
202
+ .catch(() => undefined)
203
+ .finally(() => {
204
+ this.refreshing--;
205
+ this.changed();
120
206
  });
207
+ return reading.then(() => undefined);
208
+ }
209
+ keepCurrent(stopping) {
210
+ this.updateAll(this.loaded);
211
+ setInterval(() => {
212
+ if (!stopping())
213
+ this.updateAll(Promise.resolve());
214
+ }, CLI_UPDATE_MS);
121
215
  }
122
216
  cli(kind) {
217
+ this.starts += 1;
123
218
  return this.queue(kind, async () => {
124
219
  const resolved = await this.resolve(kind);
125
220
  if (!('cli' in resolved)) {
126
221
  this.update(kind, resolved);
127
- throw new Error(resolved.failure ?? tooOld(kind, resolved.release));
222
+ throw new Error(NOT_READY);
128
223
  }
129
224
  const { cli, release } = resolved;
130
225
  const known = this.readings.get(kind);
131
- const kept = known?.release === null || known?.minimum !== undefined ? SIGNED_OUT : (known ?? SIGNED_OUT);
132
- if (known?.release !== release || known.minimum !== undefined) {
133
- this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models });
226
+ const kept = known?.release === null ? SIGNED_OUT : (known ?? SIGNED_OUT);
227
+ if (known?.release !== release || this.installs.has(kind)) {
228
+ this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models, modes: kept.modes });
134
229
  }
135
230
  const read = this.nextRead(kind);
136
- offer(kind, cli, kept)
231
+ this.quietOffer(kind, cli, kept)
137
232
  .then((offered) => {
138
233
  const current = this.readings.get(kind);
139
234
  if (this.reads.get(kind) === read && current?.release === release)
@@ -143,16 +238,26 @@ export class Agents {
143
238
  return cli;
144
239
  });
145
240
  }
146
- located(kind) {
147
- return this.queue(kind, () => this.ensure(kind));
241
+ located(kind, signal) {
242
+ const owner = {};
243
+ return this.queue(kind, () => this.ensure(kind, signal, owner).finally(() => this.settle(kind, owner)), signal);
148
244
  }
149
245
  async reread(kind) {
150
- await this.queue(kind, async () => {
151
- this.nextRead(kind);
152
- this.readings.set(kind, await this.examine(kind, this.readings.get(kind) ?? SIGNED_OUT));
153
- });
246
+ await this.examine(kind, this.readings.get(kind) ?? SIGNED_OUT, offer);
154
247
  await this.report();
155
248
  }
249
+ async recheck(kind, signal) {
250
+ const known = this.readings.get(kind) ?? SIGNED_OUT;
251
+ const owner = {};
252
+ try {
253
+ await this.examine(kind, known, (kind, cli) => offer(kind, cli, known, AbortSignal.any([signal, AbortSignal.timeout(SIGNED_IN_READ_MS)])), signal, owner);
254
+ }
255
+ finally {
256
+ this.settle(kind, owner);
257
+ }
258
+ if (!signal.aborted)
259
+ await this.report();
260
+ }
156
261
  report() {
157
262
  const sending = this.sending.catch(() => undefined).then(() => this.send());
158
263
  this.sending = sending;
@@ -163,74 +268,124 @@ export class Agents {
163
268
  this.reads.set(kind, read);
164
269
  return read;
165
270
  }
166
- update(kind, reading) {
271
+ hold(kind, reading) {
167
272
  this.readings.set(kind, reading);
273
+ this.installs.delete(kind);
274
+ }
275
+ update(kind, reading) {
276
+ this.hold(kind, reading);
277
+ this.report().catch(logged);
278
+ }
279
+ settle(kind, owner) {
280
+ if (this.installs.get(kind) !== owner)
281
+ return;
282
+ this.installs.delete(kind);
168
283
  this.report().catch(logged);
169
284
  }
170
- queue(kind, work) {
171
- const queued = (this.queues.get(kind) ?? Promise.resolve()).then(work);
285
+ queue(kind, work, signal) {
286
+ const queued = (this.queues.get(kind) ?? Promise.resolve()).then(() => {
287
+ signal?.throwIfAborted();
288
+ return work();
289
+ });
172
290
  this.queues.set(kind, queued.catch(() => undefined));
173
- return queued;
291
+ return signal === undefined ? queued : Promise.race([queued, ended(signal)]);
174
292
  }
175
- async ensure(kind) {
176
- const failed = await installAdapter(kind);
177
- if (failed !== null)
178
- throw new Error(failed);
179
- const found = await locate(kind);
293
+ async ensure(kind, signal, owner = {}) {
294
+ const found = await locate(kind, signal);
180
295
  if (found !== null)
181
296
  return found;
182
- const installing = this.installing.catch(() => undefined).then(() => installCli(kind));
297
+ this.installs.set(kind, owner);
298
+ this.report().catch(logged);
299
+ const installing = this.installing.catch(() => undefined).then(() => installCli(kind, signal));
183
300
  this.installing = installing;
184
301
  const failure = await installing;
185
302
  if (failure !== null)
186
303
  throw new Error(failure);
187
- const installed = await locate(kind);
304
+ const installed = await locate(kind, signal);
188
305
  if (installed === null)
189
306
  throw new Error(`the login shell does not find ${CLIS[kind].bin} after its install`);
190
307
  return installed;
191
308
  }
192
- async resolve(kind) {
309
+ async resolve(kind, signal, owner) {
193
310
  let cli;
194
311
  try {
195
- cli = await realpath(await this.ensure(kind));
312
+ cli = await this.ensure(kind, signal, owner);
196
313
  }
197
314
  catch (error) {
198
315
  const failure = causeOf(error);
199
316
  process.stderr.write(`kit: ${kind} did not install: ${failure}\n`);
200
317
  return { release: null, failure, ...SIGNED_OUT };
201
318
  }
202
- const release = await versionOf(cli);
319
+ const release = await versionOf(cli, signal);
203
320
  if (release === null)
204
321
  return { release: null, failure: `${cli} --version names no version`, ...SIGNED_OUT };
205
- const minimum = CLIS[kind].minimum;
206
- if (below(release, minimum))
207
- return { release, minimum, failure: null, ...SIGNED_OUT };
208
322
  return { cli, release };
209
323
  }
210
- async examine(kind, known) {
211
- const resolved = await this.resolve(kind);
212
- if (!('cli' in resolved))
213
- return resolved;
214
- return { release: resolved.release, failure: null, ...(await offer(kind, resolved.cli, known)) };
324
+ async examine(kind, known, read, signal, owner) {
325
+ const current = this.nextRead(kind);
326
+ const resolved = await this.queue(kind, () => this.resolve(kind, signal, owner), signal);
327
+ const reading = 'cli' in resolved ? { release: resolved.release, failure: null, ...(await read(kind, resolved.cli, known)) } : resolved;
328
+ if (this.reads.get(kind) === current && !signal?.aborted)
329
+ this.hold(kind, reading);
330
+ }
331
+ updateAll(after) {
332
+ if (this.updating !== null)
333
+ return;
334
+ this.updating = after
335
+ .then(async () => {
336
+ for (const kind of this.desired.agents) {
337
+ if (this.installs.has(kind) || !this.readings.get(kind)?.release)
338
+ continue;
339
+ const failure = await updateCli(kind);
340
+ if (failure !== null)
341
+ process.stderr.write(`kit: ${kind} did not update: ${failure}\n`);
342
+ await this.readVersion(kind);
343
+ }
344
+ })
345
+ .catch(logged)
346
+ .finally(() => {
347
+ this.updating = null;
348
+ this.changed();
349
+ });
350
+ this.changed();
351
+ }
352
+ async readVersion(kind) {
353
+ const cli = await locate(kind);
354
+ const release = cli === null ? null : await versionOf(cli);
355
+ const current = this.readings.get(kind);
356
+ if (release === null || !current?.release || current.release === release)
357
+ return;
358
+ this.update(kind, { ...current, release });
359
+ }
360
+ async quietOffer(kind, cli, known) {
361
+ for (let seen = -1; seen !== this.starts;) {
362
+ seen = this.starts;
363
+ await delay(MODEL_PROBE_QUIET_MS);
364
+ }
365
+ return offer(kind, cli, known);
215
366
  }
216
367
  async load(kind) {
217
368
  const known = this.readings.get(kind);
218
369
  if (known !== undefined && known.failure === null)
219
370
  return;
220
- this.nextRead(kind);
221
- this.readings.set(kind, await this.examine(kind, SIGNED_OUT));
371
+ await this.examine(kind, SIGNED_OUT, (kind, cli, known) => this.quietOffer(kind, cli, known));
372
+ await this.report();
222
373
  }
223
374
  async send() {
224
375
  const agents = this.desired.agents.flatMap((kind) => {
225
- const reading = this.readings.get(kind);
376
+ const reading = this.installs.has(kind) ? INSTALLING : this.readings.get(kind);
226
377
  return reading === undefined ? [] : [reported(kind, reading)];
227
378
  });
228
379
  const hostKey = await sshHostKey();
380
+ const form = await hostForm();
229
381
  const body = {
230
382
  os: await operatingSystem(),
231
- kit_version: KIT_VERSION,
383
+ ...(form === undefined ? {} : { form }),
384
+ kit_release: KIT_RELEASE,
385
+ wire: KIT_WIRE,
232
386
  agent_base: agentBase(),
233
387
  agents,
388
+ transcription: transcriptionReport(),
234
389
  ...(hostKey === null ? {} : { ssh_host_key: hostKey }),
235
390
  };
236
391
  const state = JSON.stringify(body);
package/dist/api.js CHANGED
@@ -1,5 +1,9 @@
1
+ import { setTimeout as delay } from 'node:timers/promises';
2
+ import { signInAgain } from './end.js';
1
3
  import { readEnrolment } from './home.js';
4
+ import { retryable } from './refusals.js';
2
5
  import { relayed } from './relay.js';
6
+ import { endUnserved, KIT_WIRE, KIT_WIRE_HEADER } from './wire.js';
3
7
  export class HouseRefusal extends Error {
4
8
  status;
5
9
  text;
@@ -9,27 +13,54 @@ export class HouseRefusal extends Error {
9
13
  this.text = text;
10
14
  }
11
15
  }
16
+ export function finalRefusal(error) {
17
+ return error instanceof HouseRefusal && retryable(error.text) === false;
18
+ }
12
19
  export function retryDelay(attempt) {
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.
13
21
  return Math.random() * Math.min(30_000, 1000 * 2 ** attempt);
14
22
  }
23
+ export async function retrying(sent, signal, pause = retryDelay) {
24
+ for (let attempt = 0;; attempt++) {
25
+ try {
26
+ return await sent();
27
+ }
28
+ catch (error) {
29
+ if (!(error instanceof HouseRefusal) || retryable(error.text) !== true)
30
+ throw error;
31
+ }
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 });
34
+ }
35
+ }
15
36
  export async function post(house, path, body, credential, signal) {
16
37
  const answer = await fetch(relayed(new URL(path, house)), {
17
38
  method: 'POST',
18
39
  headers: {
19
40
  'content-type': 'application/json',
41
+ [KIT_WIRE_HEADER]: String(KIT_WIRE),
20
42
  ...(credential === undefined ? {} : { authorization: `Bearer ${credential}` }),
21
43
  },
22
44
  body: JSON.stringify(body),
23
45
  signal,
24
46
  });
25
47
  const text = await answer.text();
48
+ if (!answer.ok)
49
+ endUnserved(text);
26
50
  if (!answer.ok)
27
51
  throw new HouseRefusal(path, answer.status, text);
28
52
  return JSON.parse(text);
29
53
  }
30
54
  async function enrolledPost(path, body, signal) {
31
55
  const { house, credential } = (await readEnrolment());
32
- return post(house, path, body, credential, signal);
56
+ try {
57
+ return await post(house, path, body, credential, signal);
58
+ }
59
+ catch (error) {
60
+ if (error instanceof HouseRefusal && error.status === 401)
61
+ await signInAgain(credential);
62
+ throw error;
63
+ }
33
64
  }
34
65
  export const house = {
35
66
  post: enrolledPost,
@@ -39,9 +70,10 @@ export const house = {
39
70
  return await enrolledPost(path, body);
40
71
  }
41
72
  catch (error) {
42
- if (error instanceof HouseRefusal && error.status < 500)
73
+ if (finalRefusal(error))
43
74
  throw error;
44
75
  process.stderr.write(`kit: ${path} did not reach House: ${error.message}\n`);
76
+ // A delivery House did not take is sent again on the jittered curve for as long as it is still current.
45
77
  await new Promise((resolve) => setTimeout(resolve, retryDelay(attempt)));
46
78
  if (!current())
47
79
  throw error;
@@ -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,14 +1,14 @@
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 {
11
- await post(house, '/kit/agents/desired', {}, credential);
11
+ await post(house, '/kit/agents/desired/list', {}, credential);
12
12
  }
13
13
  catch (error) {
14
14
  if (!unanswered(error))