@agentshouse/kit 0.2.1-cca9e1f43de44 → 0.2.1-ccf188e02985d

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 (98) hide show
  1. package/README.md +30 -28
  2. package/dist/acp.js +41 -111
  3. package/dist/agents.js +110 -22
  4. package/dist/api.js +9 -5
  5. package/dist/app-git.js +10 -26
  6. package/dist/bootstrap.json +4 -4
  7. package/dist/bridge.js +10 -24
  8. package/dist/chatgpt.js +32 -0
  9. package/dist/clis.js +95 -14
  10. package/dist/codex-main.js +58 -0
  11. package/dist/conversations.js +181 -114
  12. package/dist/copies.js +188 -119
  13. package/dist/end.js +19 -4
  14. package/dist/enrol-main.js +7 -1
  15. package/dist/events.js +14 -76
  16. package/dist/files.js +8 -2
  17. package/dist/git.js +10 -8
  18. package/dist/home.js +96 -7
  19. package/dist/house-cli.js +291 -0
  20. package/dist/house-main.js +7 -177
  21. package/dist/inputs.js +37 -0
  22. package/dist/instructions.js +10 -32
  23. package/dist/kit-cli.js +68 -0
  24. package/dist/kit-main.js +8 -22
  25. package/dist/login.js +117 -106
  26. package/dist/logout.js +14 -16
  27. package/dist/parts.js +34 -16
  28. package/dist/placement.js +30 -0
  29. package/dist/relay.js +12 -2
  30. package/dist/resident.js +89 -33
  31. package/dist/scope.js +203 -0
  32. package/dist/service-main.js +9 -0
  33. package/dist/service.js +55 -0
  34. package/dist/sign-in.js +6 -24
  35. package/dist/skills.js +81 -12
  36. package/dist/stream.js +68 -17
  37. package/dist/transcription.js +3 -3
  38. package/dist/update.js +48 -29
  39. package/dist/wire.js +6 -0
  40. package/dist/work.js +346 -0
  41. package/how-we-work.md +13 -3
  42. package/package.json +3 -2
  43. package/skills/ask-matt/SKILL.md +17 -11
  44. package/skills/ask-matt/agents/openai.yaml +1 -0
  45. package/skills/code-review/SKILL.md +5 -5
  46. package/skills/codebase-design/DESIGN-IT-TWICE.md +1 -1
  47. package/skills/codebase-design/SKILL.md +0 -2
  48. package/skills/diagnosing-bugs/SKILL.md +2 -4
  49. package/skills/domain-modeling/{CONTEXT-FORMAT.md → GLOSSARY-FORMAT.md} +10 -10
  50. package/skills/domain-modeling/SKILL.md +12 -14
  51. package/skills/grill-me/SKILL.md +1 -2
  52. package/skills/grill-me/agents/openai.yaml +1 -0
  53. package/skills/grill-with-docs/SKILL.md +1 -2
  54. package/skills/grill-with-docs/agents/openai.yaml +1 -0
  55. package/skills/grilling/SKILL.md +2 -2
  56. package/skills/handoff/SKILL.md +2 -3
  57. package/skills/handoff/agents/openai.yaml +1 -0
  58. package/skills/implement/SKILL.md +5 -4
  59. package/skills/implement/agents/openai.yaml +1 -0
  60. package/skills/implement-spec/SKILL.md +40 -0
  61. package/skills/implement-spec/agents/openai.yaml +5 -0
  62. package/skills/improve-codebase-architecture/SKILL.md +6 -7
  63. package/skills/improve-codebase-architecture/agents/openai.yaml +1 -0
  64. package/skills/pr/CREDITS.md +3 -0
  65. package/skills/pr/LICENSE +21 -0
  66. package/skills/pr/SKILL.md +170 -0
  67. package/skills/pr/agents/openai.yaml +3 -0
  68. package/skills/prototype/SKILL.md +0 -2
  69. package/skills/research/SKILL.md +0 -2
  70. package/skills/retro/LICENSE +21 -0
  71. package/skills/retro/SKILL.md +44 -0
  72. package/skills/retro/agents/openai.yaml +5 -0
  73. package/skills/tdd/SKILL.md +2 -4
  74. package/skills/teach/SKILL.md +3 -4
  75. package/skills/teach/agents/openai.yaml +1 -0
  76. package/skills/to-questionnaire/SKILL.md +1 -2
  77. package/skills/to-questionnaire/agents/openai.yaml +1 -0
  78. package/skills/to-spec/SKILL.md +1 -2
  79. package/skills/to-spec/agents/openai.yaml +1 -0
  80. package/skills/to-tickets/SKILL.md +3 -4
  81. package/skills/to-tickets/agents/openai.yaml +1 -0
  82. package/skills/triage/AGENT-BRIEF.md +207 -0
  83. package/skills/triage/LICENSE +21 -0
  84. package/skills/triage/OUT-OF-SCOPE.md +105 -0
  85. package/skills/triage/SKILL.md +112 -0
  86. package/skills/triage/agents/openai.yaml +5 -0
  87. package/skills/wait-what/SKILL.md +2 -3
  88. package/skills/wait-what/agents/openai.yaml +1 -0
  89. package/skills/wayfinder/SKILL.md +5 -6
  90. package/skills/wayfinder/agents/openai.yaml +1 -0
  91. package/skills/wizard/LICENSE +21 -0
  92. package/skills/wizard/SKILL.md +44 -0
  93. package/skills/wizard/agents/openai.yaml +3 -0
  94. package/skills/wizard/template.sh +223 -0
  95. package/skills/writing-for-agents/SKILL.md +0 -2
  96. package/skills/resolving-merge-conflicts/SKILL.md +0 -16
  97. package/skills/resolving-merge-conflicts/agents/openai.yaml +0 -3
  98. /package/skills/{resolving-merge-conflicts → implement-spec}/LICENSE +0 -0
package/README.md CHANGED
@@ -1,26 +1,24 @@
1
1
  # House Kit
2
2
 
3
- House Kit connects an Environment, a Linux computer or server, to
4
- [agents.house](https://agents.house). It runs your Agents' conversations
5
- through the agent CLIs you chose and gives each Agent the `house` command.
3
+ House Kit connects an Environment, a Linux computer or server, to [agents.house](https://agents.house). It runs
4
+ your Agents' conversations through the agent CLIs you chose and gives each Agent the `house` command.
6
5
 
7
6
  ## Install
8
7
 
9
- Run `curl -fsSL agents.house/kit | sh`, or `irm agents.house/kit.ps1 | iex` on
10
- Windows, and again to update; options follow `sh -s --`. On macOS and Linux it
11
- installs House Kit natively under your own account, without an admin password,
12
- as a service that runs while you are logged in. `kit` and `house` are then on
13
- your login shell's `PATH`, and your workspace is `~/AgentsHouse` unless you
8
+ Run `sh -c 'kit=$(curl -fsSL "$0") || { echo "House Kit could not be downloaded; run this command again." >&2; exit 1; }; eval "$kit"' agents.house/kit`,
9
+ or `& { try { $kit = irm agents.house/kit.ps1 } catch { throw 'House Kit could not be downloaded; run this command again.' }; & ([scriptblock]::Create($kit)) @args }` on Windows, which run nothing of a failed download, and again to update; options follow `agents.house/kit`.
10
+ On macOS and Linux it installs House Kit natively under your own account, without an admin password, as a service that runs
11
+ while you are logged in. `kit` and `house` are then on your login shell's `PATH`, and your workspace is `~/AgentsHouse` unless you
14
12
  pass `--workspace <path>`.
15
13
 
16
14
  Add `--container` to run House Kit in one Docker container instead, with your
17
15
  workspace mounted at `/agents/house`; your Agents then reach only that
18
- workspace. On Windows 11 the container is the one choice. Append a `kit` or
19
- `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.
20
17
  Running the command for the other choice on a connected computer asks you to
21
- confirm, then replaces its Environment, whose Agents end, with a new one.
18
+ confirm, then replaces its Environment, whose Agents end, with a new one. Running it with another `HOUSE_KIT_HOME`
19
+ than the installed Kit's asks you to confirm before it replaces that Kit, and leaves that Kit home as it was.
22
20
 
23
- On your own Ubuntu 26.04 server, run the Linux command with `--linux` to
21
+ On your own Linux server, run the Linux command with `--linux` to
24
22
  install House Kit natively, with its workspace at `/agents/house`; `kit` and
25
23
  `house` are then on the server's `PATH`.
26
24
 
@@ -33,25 +31,29 @@ them out; running it again without the flag brings them back.
33
31
 
34
32
  ## Commands
35
33
 
36
- `kit login` opens a link you confirm in your browser and keeps the
37
- Environment's credential in `~/.house-kit`, or in `$HOUSE_KIT_HOME` when it is
38
- set. Pass `--manual` to paste the code by hand on a machine without a browser,
39
- and `--environment <id>` to reconnect an Environment you already have. It also
40
- connects your own agent: outside an Agent conversation, `house <tool>` calls
41
- House as you and `git` clones and pushes your Apps at `<house>/app/` as you,
42
- until you revoke that connection on Connections. `house help` lists the Tools.
43
- `kit logout` disconnects this computer, stops House Kit and ends that Git
44
- access; a later `kit login` reconnects the same Environment.
45
-
46
- `kit resident` keeps the Environment connected, and keeps the Rooms you chose
47
- for this Environment as Git repositories under `local-copies` in the
48
- workspace. Commit in one and run `house push --owner` there to send the
49
- commit to House; in the container, run it through the install command from the
50
- copy's directory. Inside an Agent conversation the Agent runs `house push`.
34
+ `kit login` opens or prints a link you confirm in any browser, on this computer
35
+ or another, continues on its own and keeps the Environment's credential in
36
+ `$HOUSE_KIT_HOME` when it is set, else in `~/.house-kit`, or in `house-kit-<uid>` under the temporary directory when your home is read-only. `--environment <id>`
37
+ reconnects an Environment you already have; `--rooms <ref>[,<ref>...]` gives it
38
+ only those Rooms and `--no-private` every Room but your Private Room; `--code <code>` connects immediately without a link.
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, 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
+ 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, or connects
45
+ this computer as a new one when House no longer holds it.
46
+ In a container you do not control, such as ChatGPT's, `npm i -g @agentshouse/kit` and `kit chatgpt --key <key>` with a key made on Connections let `house <tool>` act as you, starting and configuring nothing else.
47
+
48
+ `kit resident` keeps the Environment connected and, as it connects, copies the text of each Room you chose for it as a
49
+ Git repository in the workspace's `local-copies`, and erases a Room's copy, unpushed commits included, once the Room
50
+ may no longer be copied here. `house fetch` does the same and records House's changes on each copy's
51
+ `refs/house/received`; rebase onto it, commit and run `house push --owner` in the copy, through the install command in
52
+ the container. An Agent runs both, without `--owner`. `house upload` and `house download` move a Room's other files.
51
53
 
52
54
  House Kit turns each audio file of your message to an Agent into text on this
53
55
  computer before the Agent reads it. While transcription is on, the speech
54
- engine and model use about 425 MB in `~/.house-kit`; turning it off deletes them.
56
+ engine and model use about 425 MB beside the Environment's credential; turning it off deletes them.
55
57
 
56
58
  ## License
57
59
 
package/dist/acp.js CHANGED
@@ -1,44 +1,66 @@
1
1
  import { ndJsonStream, PROTOCOL_VERSION, } from '@agentclientprotocol/sdk';
2
- import { execFileSync, spawn } from 'node:child_process';
3
- import { readdirSync, readFileSync } from 'node:fs';
2
+ import { spawn } from 'node:child_process';
4
3
  import { Readable, Writable } from 'node:stream';
5
4
  import { CLIS, KIT_VERSION, adapterCommand, withoutProxy } from './clis.js';
6
- export async function startAdapter(kind, cli, cwd, app, events = () => undefined, added = {}, signal) {
5
+ import { killTree } from './scope.js';
6
+ const RETIRED = 'the CLI was retired';
7
+ export async function startAdapter(kind, cli, cwd, app, events = () => undefined, added = {}, signal, scope = null) {
7
8
  const adapter = CLIS[kind].adapter;
8
- const child = spawn(adapter === null ? cli : adapterCommand(kind), CLIS[kind].args, {
9
+ const started = [adapter === null ? cli : adapterCommand(kind), CLIS[kind].args];
10
+ const [command, args] = scope?.command(...started) ?? started;
11
+ const child = spawn(command, args, {
9
12
  cwd,
10
13
  env: { ...withoutProxy(), ...(adapter === null ? {} : { ...adapter.env, [adapter.executable]: cli }), ...added },
11
14
  stdio: ['pipe', 'pipe', 'pipe'],
12
15
  detached: true,
13
16
  });
14
- const stop = () => killTree(child);
15
- signal?.addEventListener('abort', stop, { once: true });
16
- child.on('exit', () => signal?.removeEventListener('abort', stop));
17
+ let owned = true;
18
+ let retired = false;
17
19
  let stderr = '';
18
20
  child.stderr.on('data', (chunk) => {
19
21
  stderr = (stderr + chunk.toString('utf8')).slice(-4000);
20
22
  });
21
- const exited = new Promise((resolve) => {
22
- child.on('error', (error) => resolve(`the CLI did not start: ${error.message}`));
23
- child.on('exit', (code, signal) => {
24
- const last = stderr.trim().split('\n').at(-1);
25
- resolve(`the CLI exited with ${code ?? signal}${last ? `: ${last}` : ''}`);
26
- });
27
- });
28
23
  const stream = ndJsonStream(Writable.toWeb(child.stdin), Readable.toWeb(child.stdout));
29
24
  const connection = app.connect({
30
25
  writable: stream.writable,
31
26
  readable: stream.readable.pipeThrough(new TransformStream({
32
27
  transform(message, controller) {
33
28
  const read = message;
34
- events(read);
29
+ if (owned)
30
+ events(read);
35
31
  if (read.id !== undefined || (read.method !== 'session/update' && !read.method.startsWith('_'))) {
36
32
  controller.enqueue(message);
37
33
  }
38
34
  },
39
35
  })),
40
36
  });
41
- 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));
42
64
  try {
43
65
  const initialized = await connection.agent.request('initialize', {
44
66
  protocolVersion: PROTOCOL_VERSION,
@@ -51,103 +73,11 @@ export async function startAdapter(kind, cli, cwd, app, events = () => undefined
51
73
  },
52
74
  clientInfo: { name: '@agentshouse/kit', version: KIT_VERSION },
53
75
  });
54
- return { child, connection, initialized, exited };
76
+ scope?.entered(child.pid);
77
+ return { connection, initialized, exited, lost, retire };
55
78
  }
56
79
  catch (error) {
57
- child.kill('SIGKILL');
80
+ retire();
58
81
  throw error;
59
82
  }
60
83
  }
61
- const LISTING_BYTES = 1 << 28;
62
- function listed(options) {
63
- return execFileSync('ps', [options, '-o', 'pid=,ppid=,command='], { encoding: 'utf8', maxBuffer: LISTING_BYTES })
64
- .split('\n')
65
- .flatMap((line) => {
66
- const fields = /^\s*(\d+)\s+(\d+)\s?(.*)$/.exec(line);
67
- return fields === null ? [] : [[Number(fields[1]), Number(fields[2]), fields[3]]];
68
- });
69
- }
70
- function parents() {
71
- const children = new Map();
72
- const adopt = (pid, parent) => children.set(parent, [...(children.get(parent) ?? []), pid]);
73
- if (process.platform === 'darwin') {
74
- for (const [pid, parent] of listed('-Aww'))
75
- adopt(pid, parent);
76
- return children;
77
- }
78
- for (const entry of readdirSync('/proc')) {
79
- if (!/^\d+$/.test(entry))
80
- continue;
81
- try {
82
- const stat = readFileSync(`/proc/${entry}/stat`, 'utf8');
83
- adopt(Number(entry), Number(stat.slice(stat.lastIndexOf(')') + 2).split(' ')[1]));
84
- }
85
- catch { }
86
- }
87
- return children;
88
- }
89
- function descendants(roots) {
90
- const children = parents();
91
- const tree = [];
92
- const pending = roots.flatMap((root) => children.get(root) ?? []);
93
- while (pending.length > 0) {
94
- const pid = pending.pop();
95
- tree.push(pid);
96
- pending.push(...(children.get(pid) ?? []));
97
- }
98
- return tree;
99
- }
100
- function killAll(pids) {
101
- for (const pid of pids) {
102
- for (const target of [-pid, pid]) {
103
- try {
104
- process.kill(target, 'SIGKILL');
105
- }
106
- catch { }
107
- }
108
- }
109
- }
110
- function marked(marker) {
111
- if (process.platform === 'darwin') {
112
- return listed('-AEww')
113
- .filter(([, , command]) => ` ${command} `.includes(` ${marker} `))
114
- .map(([pid]) => pid);
115
- }
116
- return readdirSync('/proc')
117
- .filter((entry) => {
118
- try {
119
- return /^\d+$/.test(entry) && readFileSync(`/proc/${entry}/environ`, 'utf8').split('\0').includes(marker);
120
- }
121
- catch {
122
- return false;
123
- }
124
- })
125
- .map(Number);
126
- }
127
- function commandLine(pid) {
128
- try {
129
- return readFileSync(`/proc/${pid}/cmdline`, 'utf8').split('\0').join(' ').trim();
130
- }
131
- catch {
132
- return '';
133
- }
134
- }
135
- export function processes(marker) {
136
- const pids = marked(marker);
137
- const tree = [...pids, ...descendants(pids)];
138
- const commands = process.platform === 'darwin'
139
- ? new Map(listed('-Aww').map(([pid, , command]) => [pid, command]))
140
- : new Map(tree.map((pid) => [pid, commandLine(pid)]));
141
- return new Set(tree.flatMap((pid) => (commands.get(pid) ? [`${pid} ${commands.get(pid)}`] : [])));
142
- }
143
- export function killTree(child) {
144
- killAll([child.pid, ...descendants([child.pid])]);
145
- }
146
- export function killMarked(marker) {
147
- const pids = marked(marker);
148
- killAll([...pids, ...descendants(pids)]);
149
- }
150
- export function killDescendants() {
151
- const pids = marked(`HOUSE_KIT_RESIDENT=${process.pid}`);
152
- killAll([...pids, ...descendants([process.pid, ...pids])]);
153
- }
package/dist/agents.js CHANGED
@@ -1,10 +1,16 @@
1
1
  import { client } from '@agentclientprotocol/sdk';
2
2
  import { readFile, realpath } from 'node:fs/promises';
3
- import { killTree, startAdapter } from './acp.js';
3
+ import { setTimeout as delay } from 'node:timers/promises';
4
+ import { startAdapter } from './acp.js';
4
5
  import { CLIS, KIT_VERSION, below, installAdapter, installCli, locate, run, versionOf } from './clis.js';
5
6
  import { agentBase, kitHome } from './home.js';
7
+ import { updatesItself } from './placement.js';
6
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;
7
12
  const SIGNED_OUT = { signed_in: false, models: [], modes: [] };
13
+ const INSTALLING = { release: null, failure: null, installing: true, ...SIGNED_OUT };
8
14
  function select(options, category) {
9
15
  const option = options.find((candidate) => candidate.category === category);
10
16
  return option?.type === 'select' ? option : undefined;
@@ -21,6 +27,22 @@ function causeOf(error) {
21
27
  function logged(error) {
22
28
  process.stderr.write(`kit: ${causeOf(error)}\n`);
23
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
+ }
24
46
  async function models(kind, adapter, known) {
25
47
  const agent = adapter.connection.agent;
26
48
  const opened = await agent.request('session/new', { cwd: kitHome(), mcpServers: [] });
@@ -87,8 +109,7 @@ async function offer(kind, cli, known, signal) {
87
109
  };
88
110
  }
89
111
  finally {
90
- if (adapter !== undefined)
91
- killTree(adapter.child);
112
+ adapter?.retire();
92
113
  }
93
114
  }
94
115
  function reported(kind, reading) {
@@ -97,12 +118,14 @@ function reported(kind, reading) {
97
118
  release: reading.release,
98
119
  ...(reading.minimum === undefined ? {} : { minimum: reading.minimum }),
99
120
  failure: reading.failure,
121
+ ...(reading.installing === undefined ? {} : { installing: reading.installing }),
100
122
  signed_in: reading.signed_in,
101
123
  models: reading.models,
102
124
  modes: reading.modes,
103
125
  full_access: CLIS[kind].fullAccess,
104
126
  };
105
127
  }
128
+ const NOT_READY = "the Agent's CLI is not ready on this computer";
106
129
  function tooOld(kind, release) {
107
130
  const cli = CLIS[kind];
108
131
  return `${cli.bin} ${release} is older than ${cli.minimum}, the oldest this Kit runs`;
@@ -119,18 +142,42 @@ async function operatingSystem() {
119
142
  const release = await readFile('/etc/os-release', 'utf8');
120
143
  return /^PRETTY_NAME="?([^"\n]*)"?$/m.exec(release)?.[1] ?? release;
121
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
+ }
122
161
  export class Agents {
123
162
  desired = { agents: [], routes: [], transcribe: false };
124
163
  house;
125
164
  reading = Promise.resolve();
126
165
  queues = new Map();
127
166
  installing = Promise.resolve();
167
+ installs = new Map();
128
168
  readings = new Map();
129
169
  reads = new Map();
170
+ starts = 0;
130
171
  sending = Promise.resolve();
131
172
  sent = null;
132
- constructor(house) {
173
+ refreshing = 0;
174
+ changed;
175
+ constructor(house, changed = () => undefined) {
133
176
  this.house = house;
177
+ this.changed = changed;
178
+ }
179
+ idle() {
180
+ return this.refreshing === 0;
134
181
  }
135
182
  read() {
136
183
  return this.reading.then(() => undefined, () => undefined);
@@ -139,35 +186,45 @@ export class Agents {
139
186
  return this.desired.routes.find((route) => route.agent_id === agentId);
140
187
  }
141
188
  refresh() {
189
+ this.refreshing++;
190
+ this.changed();
142
191
  const reading = this.read().then(async () => {
143
192
  this.desired = await this.house.deliver('/kit/agents/desired', {});
144
193
  return this.desired;
145
194
  });
146
195
  this.reading = reading;
147
- return reading.then(({ agents, transcribe }) => {
196
+ reading
197
+ .then(({ agents, transcribe }) => Promise.all([
148
198
  holdTranscription(transcribe)
149
199
  .then((changed) => (changed ? this.report() : undefined))
150
- .catch(logged);
200
+ .catch(logged),
151
201
  Promise.all(agents.map((kind) => this.load(kind)))
152
202
  .then(() => this.report())
153
- .catch(logged);
203
+ .catch(logged),
204
+ ]))
205
+ .catch(() => undefined)
206
+ .finally(() => {
207
+ this.refreshing--;
208
+ this.changed();
154
209
  });
210
+ return reading.then(() => undefined);
155
211
  }
156
212
  cli(kind) {
213
+ this.starts += 1;
157
214
  return this.queue(kind, async () => {
158
215
  const resolved = await this.resolve(kind);
159
216
  if (!('cli' in resolved)) {
160
217
  this.update(kind, resolved);
161
- throw new Error(resolved.failure ?? tooOld(kind, resolved.release));
218
+ throw new Error(resolved.failure === null ? tooOld(kind, resolved.release) : NOT_READY);
162
219
  }
163
220
  const { cli, release } = resolved;
164
221
  const known = this.readings.get(kind);
165
222
  const kept = known?.release === null || known?.minimum !== undefined ? SIGNED_OUT : (known ?? SIGNED_OUT);
166
- if (known?.release !== release || known.minimum !== undefined) {
223
+ if (known?.release !== release || known.minimum !== undefined || this.installs.has(kind)) {
167
224
  this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models, modes: kept.modes });
168
225
  }
169
226
  const read = this.nextRead(kind);
170
- offer(kind, cli, kept)
227
+ this.quietOffer(kind, cli, kept)
171
228
  .then((offered) => {
172
229
  const current = this.readings.get(kind);
173
230
  if (this.reads.get(kind) === read && current?.release === release)
@@ -178,7 +235,8 @@ export class Agents {
178
235
  });
179
236
  }
180
237
  located(kind, signal) {
181
- 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);
182
240
  }
183
241
  async reread(kind) {
184
242
  await this.examine(kind, this.readings.get(kind) ?? SIGNED_OUT, offer);
@@ -186,7 +244,13 @@ export class Agents {
186
244
  }
187
245
  async recheck(kind, signal) {
188
246
  const known = this.readings.get(kind) ?? SIGNED_OUT;
189
- 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
+ }
190
254
  if (!signal.aborted)
191
255
  await this.report();
192
256
  }
@@ -200,8 +264,18 @@ export class Agents {
200
264
  this.reads.set(kind, read);
201
265
  return read;
202
266
  }
203
- update(kind, reading) {
267
+ hold(kind, reading) {
204
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);
205
279
  this.report().catch(logged);
206
280
  }
207
281
  queue(kind, work, signal) {
@@ -212,13 +286,15 @@ export class Agents {
212
286
  this.queues.set(kind, queued.catch(() => undefined));
213
287
  return signal === undefined ? queued : Promise.race([queued, ended(signal)]);
214
288
  }
215
- async ensure(kind, signal) {
289
+ async ensure(kind, signal, owner = {}) {
216
290
  const failed = await installAdapter(kind, signal);
217
291
  if (failed !== null)
218
292
  throw new Error(failed);
219
293
  const found = await locate(kind, signal);
220
294
  if (found !== null)
221
295
  return found;
296
+ this.installs.set(kind, owner);
297
+ this.report().catch(logged);
222
298
  const installing = this.installing.catch(() => undefined).then(() => installCli(kind, signal));
223
299
  this.installing = installing;
224
300
  const failure = await installing;
@@ -229,10 +305,10 @@ export class Agents {
229
305
  throw new Error(`the login shell does not find ${CLIS[kind].bin} after its install`);
230
306
  return installed;
231
307
  }
232
- async resolve(kind, signal) {
308
+ async resolve(kind, signal, owner) {
233
309
  let cli;
234
310
  try {
235
- cli = await realpath(await this.ensure(kind, signal));
311
+ cli = await realpath(await this.ensure(kind, signal, owner));
236
312
  }
237
313
  catch (error) {
238
314
  const failure = causeOf(error);
@@ -247,28 +323,40 @@ export class Agents {
247
323
  return { release, minimum, failure: null, ...SIGNED_OUT };
248
324
  return { cli, release };
249
325
  }
250
- async examine(kind, known, read, signal) {
326
+ async examine(kind, known, read, signal, owner) {
251
327
  const current = this.nextRead(kind);
252
- const resolved = await this.queue(kind, () => this.resolve(kind, signal), signal);
328
+ const resolved = await this.queue(kind, () => this.resolve(kind, signal, owner), signal);
253
329
  const reading = 'cli' in resolved ? { release: resolved.release, failure: null, ...(await read(kind, resolved.cli, known)) } : resolved;
254
330
  if (this.reads.get(kind) === current && !signal?.aborted)
255
- 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);
256
339
  }
257
340
  async load(kind) {
258
341
  const known = this.readings.get(kind);
259
- if (known !== undefined && known.failure === null)
342
+ if (known !== undefined && known.failure === null && known.minimum === undefined)
260
343
  return;
261
- 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();
262
346
  }
263
347
  async send() {
264
348
  const agents = this.desired.agents.flatMap((kind) => {
265
- const reading = this.readings.get(kind);
349
+ const reading = this.installs.has(kind) ? INSTALLING : this.readings.get(kind);
266
350
  return reading === undefined ? [] : [reported(kind, reading)];
267
351
  });
268
352
  const hostKey = await sshHostKey();
353
+ const form = await hostForm();
269
354
  const body = {
270
355
  os: await operatingSystem(),
356
+ ...(form === undefined ? {} : { form }),
271
357
  kit_version: KIT_VERSION,
358
+ wire: KIT_WIRE,
359
+ updates_itself: await updatesItself(),
272
360
  agent_base: agentBase(),
273
361
  agents,
274
362
  transcription: transcriptionReport(),
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, updateRequired } 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
7
  export class HouseRefusal extends Error {
7
8
  status;
8
9
  text;
@@ -19,7 +20,7 @@ export function retryDelay(attempt) {
19
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
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 && tooOld(text))
49
+ updateRequired();
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
  }