@agentshouse/kit 0.2.1-cd646adba3f64 → 0.2.1-cde47fd72fe59

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 (100) hide show
  1. package/README.md +30 -28
  2. package/dist/acp.js +46 -103
  3. package/dist/agents.js +142 -41
  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 +14 -43
  8. package/dist/chatgpt.js +32 -0
  9. package/dist/clis.js +124 -69
  10. package/dist/codex-main.js +58 -0
  11. package/dist/conversations.js +385 -277
  12. package/dist/copies.js +195 -119
  13. package/dist/end.js +19 -4
  14. package/dist/enrol-main.js +7 -1
  15. package/dist/events.js +525 -0
  16. package/dist/files.js +22 -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 -159
  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 +82 -0
  28. package/dist/placement.js +30 -0
  29. package/dist/relay.js +12 -2
  30. package/dist/resident.js +91 -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 +34 -28
  35. package/dist/skills.js +81 -12
  36. package/dist/stream.js +68 -17
  37. package/dist/transcription.js +3 -3
  38. package/dist/translate.js +2 -8
  39. package/dist/update.js +48 -29
  40. package/dist/wire.js +6 -0
  41. package/dist/work.js +346 -0
  42. package/how-we-work.md +13 -3
  43. package/package.json +3 -2
  44. package/skills/ask-matt/SKILL.md +17 -11
  45. package/skills/ask-matt/agents/openai.yaml +1 -0
  46. package/skills/code-review/SKILL.md +5 -5
  47. package/skills/codebase-design/DESIGN-IT-TWICE.md +1 -1
  48. package/skills/codebase-design/SKILL.md +0 -2
  49. package/skills/diagnosing-bugs/SKILL.md +2 -4
  50. package/skills/domain-modeling/{CONTEXT-FORMAT.md → GLOSSARY-FORMAT.md} +10 -10
  51. package/skills/domain-modeling/SKILL.md +12 -14
  52. package/skills/grill-me/SKILL.md +1 -2
  53. package/skills/grill-me/agents/openai.yaml +1 -0
  54. package/skills/grill-with-docs/SKILL.md +1 -2
  55. package/skills/grill-with-docs/agents/openai.yaml +1 -0
  56. package/skills/grilling/SKILL.md +2 -2
  57. package/skills/handoff/SKILL.md +2 -3
  58. package/skills/handoff/agents/openai.yaml +1 -0
  59. package/skills/implement/SKILL.md +5 -4
  60. package/skills/implement/agents/openai.yaml +1 -0
  61. package/skills/implement-spec/SKILL.md +40 -0
  62. package/skills/implement-spec/agents/openai.yaml +5 -0
  63. package/skills/improve-codebase-architecture/SKILL.md +6 -7
  64. package/skills/improve-codebase-architecture/agents/openai.yaml +1 -0
  65. package/skills/pr/CREDITS.md +3 -0
  66. package/skills/pr/LICENSE +21 -0
  67. package/skills/pr/SKILL.md +170 -0
  68. package/skills/pr/agents/openai.yaml +3 -0
  69. package/skills/prototype/SKILL.md +0 -2
  70. package/skills/research/SKILL.md +0 -2
  71. package/skills/retro/LICENSE +21 -0
  72. package/skills/retro/SKILL.md +44 -0
  73. package/skills/retro/agents/openai.yaml +5 -0
  74. package/skills/tdd/SKILL.md +2 -4
  75. package/skills/teach/SKILL.md +3 -4
  76. package/skills/teach/agents/openai.yaml +1 -0
  77. package/skills/to-questionnaire/SKILL.md +1 -2
  78. package/skills/to-questionnaire/agents/openai.yaml +1 -0
  79. package/skills/to-spec/SKILL.md +1 -2
  80. package/skills/to-spec/agents/openai.yaml +1 -0
  81. package/skills/to-tickets/SKILL.md +3 -4
  82. package/skills/to-tickets/agents/openai.yaml +1 -0
  83. package/skills/triage/AGENT-BRIEF.md +207 -0
  84. package/skills/triage/LICENSE +21 -0
  85. package/skills/triage/OUT-OF-SCOPE.md +105 -0
  86. package/skills/triage/SKILL.md +112 -0
  87. package/skills/triage/agents/openai.yaml +5 -0
  88. package/skills/wait-what/SKILL.md +2 -3
  89. package/skills/wait-what/agents/openai.yaml +1 -0
  90. package/skills/wayfinder/SKILL.md +5 -6
  91. package/skills/wayfinder/agents/openai.yaml +1 -0
  92. package/skills/wizard/LICENSE +21 -0
  93. package/skills/wizard/SKILL.md +44 -0
  94. package/skills/wizard/agents/openai.yaml +3 -0
  95. package/skills/wizard/template.sh +223 -0
  96. package/skills/writing-for-agents/SKILL.md +0 -2
  97. package/dist/blocks.js +0 -51
  98. package/skills/resolving-merge-conflicts/SKILL.md +0 -16
  99. package/skills/resolving-merge-conflicts/agents/openai.yaml +0 -3
  100. /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,48 +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 const TURN_STARTED = 'kit/turn_started';
7
- export const TURN_ENDED = 'kit/turn_ended';
8
- export async function startAdapter(kind, cli, cwd, app, jobs = () => undefined, added = {}) {
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) {
9
8
  const adapter = CLIS[kind].adapter;
10
- 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, {
11
12
  cwd,
12
13
  env: { ...withoutProxy(), ...(adapter === null ? {} : { ...adapter.env, [adapter.executable]: cli }), ...added },
13
14
  stdio: ['pipe', 'pipe', 'pipe'],
14
15
  detached: true,
15
16
  });
17
+ let owned = true;
18
+ let retired = false;
16
19
  let stderr = '';
17
20
  child.stderr.on('data', (chunk) => {
18
21
  stderr = (stderr + chunk.toString('utf8')).slice(-4000);
19
22
  });
20
- const exited = new Promise((resolve) => {
21
- child.on('error', (error) => resolve(`the CLI did not start: ${error.message}`));
22
- child.on('exit', (code, signal) => {
23
- const last = stderr.trim().split('\n').at(-1);
24
- resolve(`the CLI exited with ${code ?? signal}${last ? `: ${last}` : ''}`);
25
- });
26
- });
27
23
  const stream = ndJsonStream(Writable.toWeb(child.stdin), Readable.toWeb(child.stdout));
28
24
  const connection = app.connect({
29
25
  writable: stream.writable,
30
26
  readable: stream.readable.pipeThrough(new TransformStream({
31
27
  transform(message, controller) {
32
- const notice = message;
33
- const job = CLIS[kind].job(notice);
34
- if (job !== null)
35
- jobs(job);
36
- if (!notice.params?.update?.sessionUpdate?.startsWith('async_task_'))
28
+ const read = message;
29
+ if (owned)
30
+ events(read);
31
+ if (read.id !== undefined || (read.method !== 'session/update' && !read.method.startsWith('_'))) {
37
32
  controller.enqueue(message);
38
- if (CLIS[kind].turnStarted(notice))
39
- controller.enqueue({ jsonrpc: '2.0', method: TURN_STARTED });
40
- if (CLIS[kind].turnEnded(notice))
41
- controller.enqueue({ jsonrpc: '2.0', method: TURN_ENDED });
33
+ }
42
34
  },
43
35
  })),
44
36
  });
45
- 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));
46
64
  try {
47
65
  const initialized = await connection.agent.request('initialize', {
48
66
  protocolVersion: PROTOCOL_VERSION,
@@ -50,91 +68,16 @@ export async function startAdapter(kind, cli, cwd, app, jobs = () => undefined,
50
68
  fs: { readTextFile: false, writeTextFile: false },
51
69
  terminal: false,
52
70
  elicitation: { form: {} },
53
- _meta: { jetbrains: { air: { version: 1, capabilities: ['asyncTasks'] } } },
71
+ session: { compaction: {}, notices: {} },
72
+ _meta: { jetbrains: { air: { version: 1, capabilities: CLIS[kind].air } } },
54
73
  },
55
74
  clientInfo: { name: '@agentshouse/kit', version: KIT_VERSION },
56
75
  });
57
- return { child, connection, initialized, exited };
76
+ scope?.entered(child.pid);
77
+ return { connection, initialized, exited, lost, retire };
58
78
  }
59
79
  catch (error) {
60
- child.kill('SIGKILL');
80
+ retire();
61
81
  throw error;
62
82
  }
63
83
  }
64
- const LISTING_BYTES = 1 << 28;
65
- function listed(options) {
66
- return execFileSync('ps', [options, '-o', 'pid=,ppid=,command='], { encoding: 'utf8', maxBuffer: LISTING_BYTES })
67
- .split('\n')
68
- .flatMap((line) => {
69
- const fields = /^\s*(\d+)\s+(\d+)\s?(.*)$/.exec(line);
70
- return fields === null ? [] : [[Number(fields[1]), Number(fields[2]), fields[3]]];
71
- });
72
- }
73
- function parents() {
74
- const children = new Map();
75
- const adopt = (pid, parent) => children.set(parent, [...(children.get(parent) ?? []), pid]);
76
- if (process.platform === 'darwin') {
77
- for (const [pid, parent] of listed('-Aww'))
78
- adopt(pid, parent);
79
- return children;
80
- }
81
- for (const entry of readdirSync('/proc')) {
82
- if (!/^\d+$/.test(entry))
83
- continue;
84
- try {
85
- const stat = readFileSync(`/proc/${entry}/stat`, 'utf8');
86
- adopt(Number(entry), Number(stat.slice(stat.lastIndexOf(')') + 2).split(' ')[1]));
87
- }
88
- catch { }
89
- }
90
- return children;
91
- }
92
- function descendants(roots) {
93
- const children = parents();
94
- const tree = [];
95
- const pending = roots.flatMap((root) => children.get(root) ?? []);
96
- while (pending.length > 0) {
97
- const pid = pending.pop();
98
- tree.push(pid);
99
- pending.push(...(children.get(pid) ?? []));
100
- }
101
- return tree;
102
- }
103
- function killAll(pids) {
104
- for (const pid of pids) {
105
- for (const target of [-pid, pid]) {
106
- try {
107
- process.kill(target, 'SIGKILL');
108
- }
109
- catch { }
110
- }
111
- }
112
- }
113
- function marked(marker) {
114
- if (process.platform === 'darwin') {
115
- return listed('-AEww')
116
- .filter(([, , command]) => ` ${command} `.includes(` ${marker} `))
117
- .map(([pid]) => pid);
118
- }
119
- return readdirSync('/proc')
120
- .filter((entry) => {
121
- try {
122
- return /^\d+$/.test(entry) && readFileSync(`/proc/${entry}/environ`, 'utf8').split('\0').includes(marker);
123
- }
124
- catch {
125
- return false;
126
- }
127
- })
128
- .map(Number);
129
- }
130
- export function killTree(child) {
131
- killAll([child.pid, ...descendants([child.pid])]);
132
- }
133
- export function killMarked(marker) {
134
- const pids = marked(marker);
135
- killAll([...pids, ...descendants(pids)]);
136
- }
137
- export function killDescendants() {
138
- const pids = marked(`HOUSE_KIT_RESIDENT=${process.pid}`);
139
- killAll([...pids, ...descendants([process.pid, ...pids])]);
140
- }
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: [] });
@@ -47,21 +69,29 @@ async function models(kind, adapter, known) {
47
69
  }
48
70
  return { models: offered, modes };
49
71
  }
50
- async function signedIn(kind, cli, known) {
72
+ async function signedIn(kind, cli, known, signal) {
51
73
  const probe = CLIS[kind].signedIn;
52
74
  // A sign-in check that has not answered in half a minute counts as signed out rather than stalling the report.
53
75
  if ('command' in probe)
54
- return (await run(cli, probe.command, 30_000)).status === 0;
55
- return (await offer(kind, cli, known)).signed_in;
76
+ return (await run(cli, probe.command, 30_000, false, signal)).status === 0;
77
+ return (await offer(kind, cli, known, signal)).signed_in;
78
+ }
79
+ function ended(signal) {
80
+ return new Promise((_, reject) => {
81
+ if (signal.aborted)
82
+ reject(signal.reason);
83
+ signal.addEventListener('abort', () => reject(signal.reason), { once: true });
84
+ });
56
85
  }
57
- async function offer(kind, cli, known) {
86
+ async function offer(kind, cli, known, signal) {
58
87
  const probe = CLIS[kind].signedIn;
59
88
  // A sign-in check that has not answered in half a minute counts as signed out rather than stalling the report.
60
- if ('command' in probe && (await run(cli, probe.command, 30_000)).status !== 0)
89
+ if ('command' in probe && (await run(cli, probe.command, 30_000, false, signal)).status !== 0)
61
90
  return SIGNED_OUT;
62
91
  let adapter;
63
92
  try {
64
- adapter = await startAdapter(kind, cli, kitHome(), client({ name: '@agentshouse/kit' }));
93
+ adapter = await startAdapter(kind, cli, kitHome(), client({ name: '@agentshouse/kit' }), () => undefined, {}, signal);
94
+ signal?.throwIfAborted();
65
95
  if ('initializeMeta' in probe) {
66
96
  const method = adapter.initialized._meta?.[probe.initializeMeta];
67
97
  if (typeof method !== 'string' || method.length === 0)
@@ -70,7 +100,8 @@ async function offer(kind, cli, known) {
70
100
  return { signed_in: true, ...(await models(kind, adapter, known.models)) };
71
101
  }
72
102
  catch (error) {
73
- process.stderr.write(`kit: ${kind} did not offer its models: ${causeOf(error)}\n`);
103
+ if (!signal?.aborted)
104
+ process.stderr.write(`kit: ${kind} did not offer its models: ${causeOf(error)}\n`);
74
105
  return {
75
106
  signed_in: adapter === undefined && 'initializeMeta' in probe ? known.signed_in : true,
76
107
  models: known.models,
@@ -78,8 +109,7 @@ async function offer(kind, cli, known) {
78
109
  };
79
110
  }
80
111
  finally {
81
- if (adapter !== undefined)
82
- killTree(adapter.child);
112
+ adapter?.retire();
83
113
  }
84
114
  }
85
115
  function reported(kind, reading) {
@@ -88,12 +118,14 @@ function reported(kind, reading) {
88
118
  release: reading.release,
89
119
  ...(reading.minimum === undefined ? {} : { minimum: reading.minimum }),
90
120
  failure: reading.failure,
121
+ ...(reading.installing === undefined ? {} : { installing: reading.installing }),
91
122
  signed_in: reading.signed_in,
92
123
  models: reading.models,
93
124
  modes: reading.modes,
94
125
  full_access: CLIS[kind].fullAccess,
95
126
  };
96
127
  }
128
+ const NOT_READY = "the Agent's CLI is not ready on this computer";
97
129
  function tooOld(kind, release) {
98
130
  const cli = CLIS[kind];
99
131
  return `${cli.bin} ${release} is older than ${cli.minimum}, the oldest this Kit runs`;
@@ -110,18 +142,42 @@ async function operatingSystem() {
110
142
  const release = await readFile('/etc/os-release', 'utf8');
111
143
  return /^PRETTY_NAME="?([^"\n]*)"?$/m.exec(release)?.[1] ?? release;
112
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
+ }
113
161
  export class Agents {
114
162
  desired = { agents: [], routes: [], transcribe: false };
115
163
  house;
116
164
  reading = Promise.resolve();
117
165
  queues = new Map();
118
166
  installing = Promise.resolve();
167
+ installs = new Map();
119
168
  readings = new Map();
120
169
  reads = new Map();
170
+ starts = 0;
121
171
  sending = Promise.resolve();
122
172
  sent = null;
123
- constructor(house) {
173
+ refreshing = 0;
174
+ changed;
175
+ constructor(house, changed = () => undefined) {
124
176
  this.house = house;
177
+ this.changed = changed;
178
+ }
179
+ idle() {
180
+ return this.refreshing === 0;
125
181
  }
126
182
  read() {
127
183
  return this.reading.then(() => undefined, () => undefined);
@@ -130,35 +186,45 @@ export class Agents {
130
186
  return this.desired.routes.find((route) => route.agent_id === agentId);
131
187
  }
132
188
  refresh() {
189
+ this.refreshing++;
190
+ this.changed();
133
191
  const reading = this.read().then(async () => {
134
192
  this.desired = await this.house.deliver('/kit/agents/desired', {});
135
193
  return this.desired;
136
194
  });
137
195
  this.reading = reading;
138
- return reading.then(({ agents, transcribe }) => {
196
+ reading
197
+ .then(({ agents, transcribe }) => Promise.all([
139
198
  holdTranscription(transcribe)
140
199
  .then((changed) => (changed ? this.report() : undefined))
141
- .catch(logged);
200
+ .catch(logged),
142
201
  Promise.all(agents.map((kind) => this.load(kind)))
143
202
  .then(() => this.report())
144
- .catch(logged);
203
+ .catch(logged),
204
+ ]))
205
+ .catch(() => undefined)
206
+ .finally(() => {
207
+ this.refreshing--;
208
+ this.changed();
145
209
  });
210
+ return reading.then(() => undefined);
146
211
  }
147
212
  cli(kind) {
213
+ this.starts += 1;
148
214
  return this.queue(kind, async () => {
149
215
  const resolved = await this.resolve(kind);
150
216
  if (!('cli' in resolved)) {
151
217
  this.update(kind, resolved);
152
- throw new Error(resolved.failure ?? tooOld(kind, resolved.release));
218
+ throw new Error(resolved.failure === null ? tooOld(kind, resolved.release) : NOT_READY);
153
219
  }
154
220
  const { cli, release } = resolved;
155
221
  const known = this.readings.get(kind);
156
222
  const kept = known?.release === null || known?.minimum !== undefined ? SIGNED_OUT : (known ?? SIGNED_OUT);
157
- if (known?.release !== release || known.minimum !== undefined) {
223
+ if (known?.release !== release || known.minimum !== undefined || this.installs.has(kind)) {
158
224
  this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models, modes: kept.modes });
159
225
  }
160
226
  const read = this.nextRead(kind);
161
- offer(kind, cli, kept)
227
+ this.quietOffer(kind, cli, kept)
162
228
  .then((offered) => {
163
229
  const current = this.readings.get(kind);
164
230
  if (this.reads.get(kind) === read && current?.release === release)
@@ -168,17 +234,25 @@ export class Agents {
168
234
  return cli;
169
235
  });
170
236
  }
171
- located(kind) {
172
- return this.queue(kind, () => this.ensure(kind));
237
+ located(kind, signal) {
238
+ const owner = {};
239
+ return this.queue(kind, () => this.ensure(kind, signal, owner).finally(() => this.settle(kind, owner)), signal);
173
240
  }
174
241
  async reread(kind) {
175
242
  await this.examine(kind, this.readings.get(kind) ?? SIGNED_OUT, offer);
176
243
  await this.report();
177
244
  }
178
- async recheck(kind) {
245
+ async recheck(kind, signal) {
179
246
  const known = this.readings.get(kind) ?? SIGNED_OUT;
180
- await this.examine(kind, known, async (kind, cli) => (await signedIn(kind, cli, known)) ? { ...known, signed_in: true } : SIGNED_OUT);
181
- await this.report();
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
+ }
254
+ if (!signal.aborted)
255
+ await this.report();
182
256
  }
183
257
  report() {
184
258
  const sending = this.sending.catch(() => undefined).then(() => this.send());
@@ -190,43 +264,58 @@ export class Agents {
190
264
  this.reads.set(kind, read);
191
265
  return read;
192
266
  }
193
- update(kind, reading) {
267
+ hold(kind, reading) {
194
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);
195
279
  this.report().catch(logged);
196
280
  }
197
- queue(kind, work) {
198
- const queued = (this.queues.get(kind) ?? Promise.resolve()).then(work);
281
+ queue(kind, work, signal) {
282
+ const queued = (this.queues.get(kind) ?? Promise.resolve()).then(() => {
283
+ signal?.throwIfAborted();
284
+ return work();
285
+ });
199
286
  this.queues.set(kind, queued.catch(() => undefined));
200
- return queued;
287
+ return signal === undefined ? queued : Promise.race([queued, ended(signal)]);
201
288
  }
202
- async ensure(kind) {
203
- const failed = await installAdapter(kind);
289
+ async ensure(kind, signal, owner = {}) {
290
+ const failed = await installAdapter(kind, signal);
204
291
  if (failed !== null)
205
292
  throw new Error(failed);
206
- const found = await locate(kind);
293
+ const found = await locate(kind, signal);
207
294
  if (found !== null)
208
295
  return found;
209
- const installing = this.installing.catch(() => undefined).then(() => installCli(kind));
296
+ this.installs.set(kind, owner);
297
+ this.report().catch(logged);
298
+ const installing = this.installing.catch(() => undefined).then(() => installCli(kind, signal));
210
299
  this.installing = installing;
211
300
  const failure = await installing;
212
301
  if (failure !== null)
213
302
  throw new Error(failure);
214
- const installed = await locate(kind);
303
+ const installed = await locate(kind, signal);
215
304
  if (installed === null)
216
305
  throw new Error(`the login shell does not find ${CLIS[kind].bin} after its install`);
217
306
  return installed;
218
307
  }
219
- async resolve(kind) {
308
+ async resolve(kind, signal, owner) {
220
309
  let cli;
221
310
  try {
222
- cli = await realpath(await this.ensure(kind));
311
+ cli = await realpath(await this.ensure(kind, signal, owner));
223
312
  }
224
313
  catch (error) {
225
314
  const failure = causeOf(error);
226
315
  process.stderr.write(`kit: ${kind} did not install: ${failure}\n`);
227
316
  return { release: null, failure, ...SIGNED_OUT };
228
317
  }
229
- const release = await versionOf(cli);
318
+ const release = await versionOf(cli, signal);
230
319
  if (release === null)
231
320
  return { release: null, failure: `${cli} --version names no version`, ...SIGNED_OUT };
232
321
  const minimum = CLIS[kind].minimum;
@@ -234,28 +323,40 @@ export class Agents {
234
323
  return { release, minimum, failure: null, ...SIGNED_OUT };
235
324
  return { cli, release };
236
325
  }
237
- async examine(kind, known, read) {
326
+ async examine(kind, known, read, signal, owner) {
238
327
  const current = this.nextRead(kind);
239
- const resolved = await this.queue(kind, () => this.resolve(kind));
328
+ const resolved = await this.queue(kind, () => this.resolve(kind, signal, owner), signal);
240
329
  const reading = 'cli' in resolved ? { release: resolved.release, failure: null, ...(await read(kind, resolved.cli, known)) } : resolved;
241
- if (this.reads.get(kind) === current)
242
- this.readings.set(kind, reading);
330
+ if (this.reads.get(kind) === current && !signal?.aborted)
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);
243
339
  }
244
340
  async load(kind) {
245
341
  const known = this.readings.get(kind);
246
- if (known !== undefined && known.failure === null)
342
+ if (known !== undefined && known.failure === null && known.minimum === undefined)
247
343
  return;
248
- 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();
249
346
  }
250
347
  async send() {
251
348
  const agents = this.desired.agents.flatMap((kind) => {
252
- const reading = this.readings.get(kind);
349
+ const reading = this.installs.has(kind) ? INSTALLING : this.readings.get(kind);
253
350
  return reading === undefined ? [] : [reported(kind, reading)];
254
351
  });
255
352
  const hostKey = await sshHostKey();
353
+ const form = await hostForm();
256
354
  const body = {
257
355
  os: await operatingSystem(),
356
+ ...(form === undefined ? {} : { form }),
258
357
  kit_version: KIT_VERSION,
358
+ wire: KIT_WIRE,
359
+ updates_itself: await updatesItself(),
259
360
  agent_base: agentBase(),
260
361
  agents,
261
362
  transcription: transcriptionReport(),