@agentshouse/kit 0.2.1-c2c600f2d2b30 → 0.2.1-c2fb1c24bcdd5

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 (135) hide show
  1. package/README.md +42 -41
  2. package/dist/acp.js +50 -106
  3. package/dist/agents.js +149 -43
  4. package/dist/api.js +26 -4
  5. package/dist/app-git.js +48 -0
  6. package/dist/authority-main.js +2 -2
  7. package/dist/bridge.js +37 -59
  8. package/dist/building.js +46 -0
  9. package/dist/calls.js +63 -0
  10. package/dist/chatgpt.js +32 -0
  11. package/dist/clis-main.js +2 -2
  12. package/dist/clis.js +156 -78
  13. package/dist/codex-main.js +58 -0
  14. package/dist/connection.js +126 -0
  15. package/dist/conversations.js +623 -325
  16. package/dist/copies.js +188 -126
  17. package/dist/end.js +24 -5
  18. package/dist/enrol-main.js +7 -1
  19. package/dist/events.js +525 -0
  20. package/dist/files.js +139 -17
  21. package/dist/git.js +13 -11
  22. package/dist/home.js +96 -7
  23. package/dist/house-cli.js +299 -0
  24. package/dist/house-main.js +7 -159
  25. package/dist/instructions.js +7 -9
  26. package/dist/kit-cli.js +68 -0
  27. package/dist/kit-main.js +8 -19
  28. package/dist/login.js +117 -104
  29. package/dist/logout.js +14 -13
  30. package/dist/mcp.js +4 -2
  31. package/dist/parts.js +82 -0
  32. package/dist/placement.js +39 -0
  33. package/dist/refusals.js +12 -0
  34. package/dist/relay.js +33 -2
  35. package/dist/resident.js +112 -50
  36. package/dist/scope.js +206 -0
  37. package/dist/secret-input.js +2 -2
  38. package/dist/service-main.js +9 -0
  39. package/dist/service.js +55 -0
  40. package/dist/shell.js +3 -0
  41. package/dist/sign-in.js +40 -33
  42. package/dist/skills.js +20 -32
  43. package/dist/transcription.js +129 -43
  44. package/dist/translate.js +2 -8
  45. package/dist/update.js +98 -53
  46. package/dist/web-wizard.js +101 -0
  47. package/dist/wire.js +22 -0
  48. package/dist/work.js +346 -0
  49. package/package.json +15 -15
  50. package/dist/blocks.js +0 -51
  51. package/dist/bootstrap.json +0 -24
  52. package/dist/stream.js +0 -72
  53. package/how-we-work.md +0 -23
  54. package/skills/ask-matt/LICENSE +0 -21
  55. package/skills/ask-matt/PHASE-BOUNDARIES.md +0 -55
  56. package/skills/ask-matt/SKILL.md +0 -91
  57. package/skills/ask-matt/agents/openai.yaml +0 -4
  58. package/skills/code-review/LICENSE +0 -21
  59. package/skills/code-review/SKILL.md +0 -89
  60. package/skills/code-review/agents/openai.yaml +0 -3
  61. package/skills/codebase-design/DEEPENING.md +0 -37
  62. package/skills/codebase-design/DESIGN-IT-TWICE.md +0 -44
  63. package/skills/codebase-design/LICENSE +0 -21
  64. package/skills/codebase-design/SKILL.md +0 -116
  65. package/skills/codebase-design/agents/openai.yaml +0 -3
  66. package/skills/diagnosing-bugs/LICENSE +0 -21
  67. package/skills/diagnosing-bugs/SKILL.md +0 -140
  68. package/skills/diagnosing-bugs/agents/openai.yaml +0 -3
  69. package/skills/diagnosing-bugs/scripts/hitl-loop.template.sh +0 -44
  70. package/skills/domain-modeling/ADR-FORMAT.md +0 -47
  71. package/skills/domain-modeling/CONTEXT-FORMAT.md +0 -60
  72. package/skills/domain-modeling/LICENSE +0 -21
  73. package/skills/domain-modeling/SKILL.md +0 -76
  74. package/skills/domain-modeling/agents/openai.yaml +0 -3
  75. package/skills/grill-me/LICENSE +0 -21
  76. package/skills/grill-me/SKILL.md +0 -8
  77. package/skills/grill-me/agents/openai.yaml +0 -4
  78. package/skills/grill-with-docs/LICENSE +0 -21
  79. package/skills/grill-with-docs/SKILL.md +0 -8
  80. package/skills/grill-with-docs/agents/openai.yaml +0 -4
  81. package/skills/grilling/LICENSE +0 -21
  82. package/skills/grilling/SKILL.md +0 -30
  83. package/skills/grilling/agents/openai.yaml +0 -3
  84. package/skills/handoff/LICENSE +0 -21
  85. package/skills/handoff/SKILL.md +0 -17
  86. package/skills/handoff/agents/openai.yaml +0 -4
  87. package/skills/implement/LICENSE +0 -21
  88. package/skills/implement/SKILL.md +0 -16
  89. package/skills/implement/agents/openai.yaml +0 -4
  90. package/skills/improve-codebase-architecture/HTML-REPORT.md +0 -123
  91. package/skills/improve-codebase-architecture/LICENSE +0 -21
  92. package/skills/improve-codebase-architecture/SKILL.md +0 -72
  93. package/skills/improve-codebase-architecture/agents/openai.yaml +0 -4
  94. package/skills/prototype/LICENSE +0 -21
  95. package/skills/prototype/LOGIC.md +0 -67
  96. package/skills/prototype/SKILL.md +0 -28
  97. package/skills/prototype/UI.md +0 -112
  98. package/skills/prototype/agents/openai.yaml +0 -3
  99. package/skills/research/LICENSE +0 -21
  100. package/skills/research/SKILL.md +0 -14
  101. package/skills/research/agents/openai.yaml +0 -3
  102. package/skills/resolving-merge-conflicts/LICENSE +0 -21
  103. package/skills/resolving-merge-conflicts/SKILL.md +0 -16
  104. package/skills/resolving-merge-conflicts/agents/openai.yaml +0 -3
  105. package/skills/tdd/LICENSE +0 -21
  106. package/skills/tdd/SKILL.md +0 -40
  107. package/skills/tdd/agents/openai.yaml +0 -3
  108. package/skills/tdd/mocking.md +0 -59
  109. package/skills/tdd/tests.md +0 -77
  110. package/skills/teach/GLOSSARY-FORMAT.md +0 -35
  111. package/skills/teach/LEARNING-RECORD-FORMAT.md +0 -46
  112. package/skills/teach/LICENSE +0 -21
  113. package/skills/teach/MISSION-FORMAT.md +0 -31
  114. package/skills/teach/RESOURCES-FORMAT.md +0 -32
  115. package/skills/teach/SKILL.md +0 -141
  116. package/skills/teach/agents/openai.yaml +0 -4
  117. package/skills/to-questionnaire/LICENSE +0 -21
  118. package/skills/to-questionnaire/SKILL.md +0 -55
  119. package/skills/to-questionnaire/agents/openai.yaml +0 -4
  120. package/skills/to-spec/LICENSE +0 -21
  121. package/skills/to-spec/SKILL.md +0 -76
  122. package/skills/to-spec/agents/openai.yaml +0 -4
  123. package/skills/to-tickets/LICENSE +0 -21
  124. package/skills/to-tickets/SKILL.md +0 -106
  125. package/skills/to-tickets/agents/openai.yaml +0 -4
  126. package/skills/wait-what/LICENSE +0 -21
  127. package/skills/wait-what/SKILL.md +0 -8
  128. package/skills/wait-what/agents/openai.yaml +0 -4
  129. package/skills/wayfinder/LICENSE +0 -21
  130. package/skills/wayfinder/SKILL.md +0 -129
  131. package/skills/wayfinder/agents/openai.yaml +0 -4
  132. package/skills/writing-for-agents/LICENSE +0 -21
  133. package/skills/writing-for-agents/SKILL-MECHANICS.md +0 -22
  134. package/skills/writing-for-agents/SKILL.md +0 -83
  135. package/skills/writing-for-agents/agents/openai.yaml +0 -3
package/README.md CHANGED
@@ -1,59 +1,60 @@
1
- # House Kit
1
+ # 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
+ 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 "Kit could not be downloaded; run this command again." >&2; exit 1; }; eval "$kit"' agents.house/kit`,
9
+ or `& { try { $kit = irm agents.house/kit.ps1 } catch { throw 'Kit could not be downloaded; run this command again.' }; & ([scriptblock]::Create($kit)) @args }` on Windows, which run nothing of a failed download, and again to update; options follow `agents.house/kit`.
10
+ On macOS and Linux it installs Kit natively under your own account, without an admin password, as a service that runs
11
+ while you are logged in. `kit` and `house` are then on your login shell's `PATH`, and your workspace is `~/AgentsHouse` unless you
14
12
  pass `--workspace <path>`.
15
13
 
16
- Add `--container` to run House Kit in one Docker container instead, with your
14
+ Add `--container` to run Kit in one Docker container instead, with your
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 a different `HOUSE_KIT_HOME`
19
+ from the running Kit process asks you to confirm before it replaces that process, and leaves the earlier Kit home as it was.
22
20
 
23
- On your own Ubuntu 26.04 server, run the Linux command with `--linux` to
24
- install House Kit natively, with its workspace at `/agents/house`; `kit` and
21
+ On your own Linux server, run the Linux command with `--linux` to
22
+ install Kit natively, with its workspace at `/agents/house`; `kit` and
25
23
  `house` are then on the server's `PATH`.
26
24
 
27
- House Kit runs the agent CLIs your login shell finds and installs a missing one
25
+ Kit runs the agent CLIs your login shell finds and installs a missing one
28
26
  through that CLI's own installer. Running the command again offers to update
29
- each CLI older than House Kit needs; add `--update-clis` to update every one to
30
- its latest release without asking. House Kit also gives every Agent on the
31
- Environment a set of agent skills. Add `--no-skills` to the command to leave
32
- them out; running it again without the flag brings them back.
27
+ each CLI older than Kit needs; add `--update-clis` to update every one to
28
+ its latest release without asking. Kit also gives every Agent on the
29
+ Environment the agent skills of `@agentshouse/skills`, at the version each Kit
30
+ release installs. Add `--no-skills` to the command to leave 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: `house <tool>` run outside an Agent conversation calls
41
- House as you, until you revoke that connection on Connections. `house help`
42
- lists the Tools. `kit logout` disconnects this computer and stops House Kit; a
43
- later `kit login` reconnects the same Environment.
44
-
45
- `kit resident` keeps the Environment connected, and keeps the Rooms you chose
46
- for this Environment as Git repositories under `local-copies` in the
47
- workspace. Commit in one and run `house push --owner` there to send the
48
- commit to House; in the container, run it through the install command from the
49
- copy's directory. Inside an Agent conversation the Agent runs `house push`.
50
-
51
- House Kit turns each audio file of your message to an Agent into text on this
52
- computer before the Agent reads the message. The first audio file downloads the
53
- speech engine and model, about 425 MB, into `~/.house-kit`.
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 the Kit process and ends your own agent's connection, so `house` and `git` no
44
+ longer act as you here; a later `kit login` reconnects the same Environment, or connects
45
+ this computer as a new one when House no longer holds it.
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 keeps a Room's copy as it is, no longer refreshing it, once the
50
+ Room may no longer be copied here. `house fetch` does the same and records House's changes on each copy's
51
+ `refs/house/received`; rebase onto it, commit and run `house push --owner` in the copy, through the install command in
52
+ the container. An Agent runs both, without `--owner`. `house upload` and `house download` move a Room's other files straight between disk and House's store, and a broken upload resumes on its own.
53
+
54
+ Kit turns each audio file your message to an Agent links into text on this computer before the Agent reads it, and keeps a message whose audio it cannot turn into text from starting. While transcription is on, the speech engine and model use about 425 MB beside the Environment's credential; turning it off deletes them.
55
+
56
+ When you press Run on a Web Wizard's page, Kit runs its script with `bash` in a terminal on this computer, as you, in the home and directory it runs agent CLIs from, with your login shell's `PATH`; the page shows that terminal and takes your typing, and closing the page, or Kit losing its connection to House, ends the script and its child processes. Kit keeps nothing the script prints or you type.
54
57
 
55
58
  ## License
56
59
 
57
- MIT
58
-
59
- The skills come from [mattpocock/skills](https://github.com/mattpocock/skills); thank you, Matt Pocock.
60
+ MIT.
package/dist/acp.js CHANGED
@@ -1,48 +1,67 @@
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
- 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 = {}) {
4
+ import { CLIS, KIT_RELEASE, adapterCommand } from './clis.js';
5
+ import { childEnvironment } from './relay.js';
6
+ import { killTree } from './scope.js';
7
+ const RETIRED = 'the CLI was retired';
8
+ export async function startAdapter(kind, cli, cwd, app, events = () => undefined, added = {}, signal, scope = null) {
9
9
  const adapter = CLIS[kind].adapter;
10
- const child = spawn(adapter === null ? cli : adapterCommand(kind), CLIS[kind].args, {
10
+ const started = [adapter === null ? cli : adapterCommand(kind), CLIS[kind].args];
11
+ const [command, args] = scope?.command(...started) ?? started;
12
+ const child = spawn(command, args, {
11
13
  cwd,
12
- env: { ...withoutProxy(), ...(adapter === null ? {} : { ...adapter.env, [adapter.executable]: cli }), ...added },
14
+ env: { ...childEnvironment(), ...(adapter === null ? {} : { ...adapter.env, [adapter.executable]: cli }), ...added },
13
15
  stdio: ['pipe', 'pipe', 'pipe'],
14
16
  detached: true,
15
17
  });
18
+ let owned = true;
19
+ let retired = false;
16
20
  let stderr = '';
17
21
  child.stderr.on('data', (chunk) => {
18
22
  stderr = (stderr + chunk.toString('utf8')).slice(-4000);
19
23
  });
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
24
  const stream = ndJsonStream(Writable.toWeb(child.stdin), Readable.toWeb(child.stdout));
28
25
  const connection = app.connect({
29
26
  writable: stream.writable,
30
27
  readable: stream.readable.pipeThrough(new TransformStream({
31
28
  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_'))
29
+ const read = message;
30
+ if (owned)
31
+ events(read);
32
+ if (read.id !== undefined || (read.method !== 'session/update' && !read.method.startsWith('_'))) {
37
33
  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 });
34
+ }
42
35
  },
43
36
  })),
44
37
  });
45
- void exited.then((cause) => connection.close(new Error(cause)));
38
+ const { promise: lost, resolve: lose } = Promise.withResolvers();
39
+ const exited = new Promise((resolve) => {
40
+ const end = (cause) => {
41
+ if (owned)
42
+ lose(cause);
43
+ owned = false;
44
+ connection.close(new Error(cause));
45
+ resolve(cause);
46
+ };
47
+ child.on('error', (error) => end(`the CLI did not start: ${error.message}`));
48
+ child.on('exit', (code, signal) => {
49
+ const last = stderr.trim().split('\n').at(-1);
50
+ end(`the CLI exited with ${code ?? signal}${last ? `: ${last}` : ''}`);
51
+ });
52
+ });
53
+ const retire = () => {
54
+ owned = false;
55
+ if (retired)
56
+ return;
57
+ retired = true;
58
+ if (child.pid !== undefined)
59
+ killTree(child);
60
+ scope?.kill();
61
+ connection.close(new Error(RETIRED));
62
+ };
63
+ signal?.addEventListener('abort', retire, { once: true });
64
+ child.on('exit', () => signal?.removeEventListener('abort', retire));
46
65
  try {
47
66
  const initialized = await connection.agent.request('initialize', {
48
67
  protocolVersion: PROTOCOL_VERSION,
@@ -50,91 +69,16 @@ export async function startAdapter(kind, cli, cwd, app, jobs = () => undefined,
50
69
  fs: { readTextFile: false, writeTextFile: false },
51
70
  terminal: false,
52
71
  elicitation: { form: {} },
53
- _meta: { jetbrains: { air: { version: 1, capabilities: ['asyncTasks'] } } },
72
+ session: { compaction: {}, notices: {} },
73
+ _meta: { jetbrains: { air: { version: 1, capabilities: CLIS[kind].air } } },
54
74
  },
55
- clientInfo: { name: '@agentshouse/kit', version: KIT_VERSION },
75
+ clientInfo: { name: '@agentshouse/kit', version: KIT_RELEASE },
56
76
  });
57
- return { child, connection, initialized, exited };
77
+ scope?.entered(child.pid);
78
+ return { connection, initialized, exited, lost, retire };
58
79
  }
59
80
  catch (error) {
60
- child.kill('SIGKILL');
81
+ retire();
61
82
  throw error;
62
83
  }
63
84
  }
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,9 +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';
4
- import { CLIS, KIT_VERSION, below, installAdapter, installCli, locate, run, versionOf } from './clis.js';
3
+ import { setTimeout as delay } from 'node:timers/promises';
4
+ import { startAdapter } from './acp.js';
5
+ import { CLIS, KIT_RELEASE, below, installAdapter, installCli, locate, run, versionOf } from './clis.js';
5
6
  import { agentBase, kitHome } from './home.js';
7
+ import { updatesItself } from './placement.js';
8
+ import { holdTranscription, transcriptionReport } from './transcription.js';
9
+ import { KIT_WIRE } from './wire.js';
10
+ // Two quiet seconds let a fresh conversation start before background model discovery competes for its CPU.
11
+ const MODEL_PROBE_QUIET_MS = 2_000;
6
12
  const SIGNED_OUT = { signed_in: false, models: [], modes: [] };
13
+ const INSTALLING = { release: null, failure: null, installing: true, ...SIGNED_OUT };
7
14
  function select(options, category) {
8
15
  const option = options.find((candidate) => candidate.category === category);
9
16
  return option?.type === 'select' ? option : undefined;
@@ -20,6 +27,22 @@ function causeOf(error) {
20
27
  function logged(error) {
21
28
  process.stderr.write(`kit: ${causeOf(error)}\n`);
22
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
+ }
23
46
  async function models(kind, adapter, known) {
24
47
  const agent = adapter.connection.agent;
25
48
  const opened = await agent.request('session/new', { cwd: kitHome(), mcpServers: [] });
@@ -46,21 +69,29 @@ async function models(kind, adapter, known) {
46
69
  }
47
70
  return { models: offered, modes };
48
71
  }
49
- async function signedIn(kind, cli, known) {
72
+ async function signedIn(kind, cli, known, signal) {
50
73
  const probe = CLIS[kind].signedIn;
51
74
  // A sign-in check that has not answered in half a minute counts as signed out rather than stalling the report.
52
75
  if ('command' in probe)
53
- return (await run(cli, probe.command, 30_000)).status === 0;
54
- 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
+ });
55
85
  }
56
- async function offer(kind, cli, known) {
86
+ async function offer(kind, cli, known, signal) {
57
87
  const probe = CLIS[kind].signedIn;
58
88
  // A sign-in check that has not answered in half a minute counts as signed out rather than stalling the report.
59
- if ('command' in probe && (await run(cli, probe.command, 30_000)).status !== 0)
89
+ if ('command' in probe && (await run(cli, probe.command, 30_000, false, signal)).status !== 0)
60
90
  return SIGNED_OUT;
61
91
  let adapter;
62
92
  try {
63
- 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();
64
95
  if ('initializeMeta' in probe) {
65
96
  const method = adapter.initialized._meta?.[probe.initializeMeta];
66
97
  if (typeof method !== 'string' || method.length === 0)
@@ -69,7 +100,8 @@ async function offer(kind, cli, known) {
69
100
  return { signed_in: true, ...(await models(kind, adapter, known.models)) };
70
101
  }
71
102
  catch (error) {
72
- 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`);
73
105
  return {
74
106
  signed_in: adapter === undefined && 'initializeMeta' in probe ? known.signed_in : true,
75
107
  models: known.models,
@@ -77,8 +109,7 @@ async function offer(kind, cli, known) {
77
109
  };
78
110
  }
79
111
  finally {
80
- if (adapter !== undefined)
81
- killTree(adapter.child);
112
+ adapter?.retire();
82
113
  }
83
114
  }
84
115
  function reported(kind, reading) {
@@ -87,12 +118,14 @@ function reported(kind, reading) {
87
118
  release: reading.release,
88
119
  ...(reading.minimum === undefined ? {} : { minimum: reading.minimum }),
89
120
  failure: reading.failure,
121
+ ...(reading.installing === undefined ? {} : { installing: reading.installing }),
90
122
  signed_in: reading.signed_in,
91
123
  models: reading.models,
92
124
  modes: reading.modes,
93
125
  full_access: CLIS[kind].fullAccess,
94
126
  };
95
127
  }
128
+ const NOT_READY = "the Agent's CLI is not ready on this computer";
96
129
  function tooOld(kind, release) {
97
130
  const cli = CLIS[kind];
98
131
  return `${cli.bin} ${release} is older than ${cli.minimum}, the oldest this Kit runs`;
@@ -109,18 +142,42 @@ async function operatingSystem() {
109
142
  const release = await readFile('/etc/os-release', 'utf8');
110
143
  return /^PRETTY_NAME="?([^"\n]*)"?$/m.exec(release)?.[1] ?? release;
111
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
+ }
112
161
  export class Agents {
113
- desired = { agents: [], routes: [] };
162
+ desired = { agents: [], routes: [], transcribe: false };
114
163
  house;
115
164
  reading = Promise.resolve();
116
165
  queues = new Map();
117
166
  installing = Promise.resolve();
167
+ installs = new Map();
118
168
  readings = new Map();
119
169
  reads = new Map();
170
+ starts = 0;
120
171
  sending = Promise.resolve();
121
172
  sent = null;
122
- constructor(house) {
173
+ refreshing = 0;
174
+ changed;
175
+ constructor(house, changed = () => undefined) {
123
176
  this.house = house;
177
+ this.changed = changed;
178
+ }
179
+ idle() {
180
+ return this.refreshing === 0;
124
181
  }
125
182
  read() {
126
183
  return this.reading.then(() => undefined, () => undefined);
@@ -129,32 +186,45 @@ export class Agents {
129
186
  return this.desired.routes.find((route) => route.agent_id === agentId);
130
187
  }
131
188
  refresh() {
189
+ this.refreshing++;
190
+ this.changed();
132
191
  const reading = this.read().then(async () => {
133
192
  this.desired = await this.house.deliver('/kit/agents/desired', {});
134
193
  return this.desired;
135
194
  });
136
195
  this.reading = reading;
137
- return reading.then(({ agents }) => {
196
+ reading
197
+ .then(({ agents, transcribe }) => Promise.all([
198
+ holdTranscription(transcribe)
199
+ .then((changed) => (changed ? this.report() : undefined))
200
+ .catch(logged),
138
201
  Promise.all(agents.map((kind) => this.load(kind)))
139
202
  .then(() => this.report())
140
- .catch(logged);
203
+ .catch(logged),
204
+ ]))
205
+ .catch(() => undefined)
206
+ .finally(() => {
207
+ this.refreshing--;
208
+ this.changed();
141
209
  });
210
+ return reading.then(() => undefined);
142
211
  }
143
212
  cli(kind) {
213
+ this.starts += 1;
144
214
  return this.queue(kind, async () => {
145
215
  const resolved = await this.resolve(kind);
146
216
  if (!('cli' in resolved)) {
147
217
  this.update(kind, resolved);
148
- throw new Error(resolved.failure ?? tooOld(kind, resolved.release));
218
+ throw new Error(resolved.failure === null ? tooOld(kind, resolved.release) : NOT_READY);
149
219
  }
150
220
  const { cli, release } = resolved;
151
221
  const known = this.readings.get(kind);
152
222
  const kept = known?.release === null || known?.minimum !== undefined ? SIGNED_OUT : (known ?? SIGNED_OUT);
153
- if (known?.release !== release || known.minimum !== undefined) {
223
+ if (known?.release !== release || known.minimum !== undefined || this.installs.has(kind)) {
154
224
  this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models, modes: kept.modes });
155
225
  }
156
226
  const read = this.nextRead(kind);
157
- offer(kind, cli, kept)
227
+ this.quietOffer(kind, cli, kept)
158
228
  .then((offered) => {
159
229
  const current = this.readings.get(kind);
160
230
  if (this.reads.get(kind) === read && current?.release === release)
@@ -164,17 +234,25 @@ export class Agents {
164
234
  return cli;
165
235
  });
166
236
  }
167
- located(kind) {
168
- 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);
169
240
  }
170
241
  async reread(kind) {
171
242
  await this.examine(kind, this.readings.get(kind) ?? SIGNED_OUT, offer);
172
243
  await this.report();
173
244
  }
174
- async recheck(kind) {
245
+ async recheck(kind, signal) {
175
246
  const known = this.readings.get(kind) ?? SIGNED_OUT;
176
- await this.examine(kind, known, async (kind, cli) => (await signedIn(kind, cli, known)) ? { ...known, signed_in: true } : SIGNED_OUT);
177
- await this.report();
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();
178
256
  }
179
257
  report() {
180
258
  const sending = this.sending.catch(() => undefined).then(() => this.send());
@@ -186,43 +264,58 @@ export class Agents {
186
264
  this.reads.set(kind, read);
187
265
  return read;
188
266
  }
189
- update(kind, reading) {
267
+ hold(kind, reading) {
190
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);
191
279
  this.report().catch(logged);
192
280
  }
193
- queue(kind, work) {
194
- 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
+ });
195
286
  this.queues.set(kind, queued.catch(() => undefined));
196
- return queued;
287
+ return signal === undefined ? queued : Promise.race([queued, ended(signal)]);
197
288
  }
198
- async ensure(kind) {
199
- const failed = await installAdapter(kind);
289
+ async ensure(kind, signal, owner = {}) {
290
+ const failed = await installAdapter(kind, signal);
200
291
  if (failed !== null)
201
292
  throw new Error(failed);
202
- const found = await locate(kind);
293
+ const found = await locate(kind, signal);
203
294
  if (found !== null)
204
295
  return found;
205
- 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));
206
299
  this.installing = installing;
207
300
  const failure = await installing;
208
301
  if (failure !== null)
209
302
  throw new Error(failure);
210
- const installed = await locate(kind);
303
+ const installed = await locate(kind, signal);
211
304
  if (installed === null)
212
305
  throw new Error(`the login shell does not find ${CLIS[kind].bin} after its install`);
213
306
  return installed;
214
307
  }
215
- async resolve(kind) {
308
+ async resolve(kind, signal, owner) {
216
309
  let cli;
217
310
  try {
218
- cli = await realpath(await this.ensure(kind));
311
+ cli = await realpath(await this.ensure(kind, signal, owner));
219
312
  }
220
313
  catch (error) {
221
314
  const failure = causeOf(error);
222
315
  process.stderr.write(`kit: ${kind} did not install: ${failure}\n`);
223
316
  return { release: null, failure, ...SIGNED_OUT };
224
317
  }
225
- const release = await versionOf(cli);
318
+ const release = await versionOf(cli, signal);
226
319
  if (release === null)
227
320
  return { release: null, failure: `${cli} --version names no version`, ...SIGNED_OUT };
228
321
  const minimum = CLIS[kind].minimum;
@@ -230,30 +323,43 @@ export class Agents {
230
323
  return { release, minimum, failure: null, ...SIGNED_OUT };
231
324
  return { cli, release };
232
325
  }
233
- async examine(kind, known, read) {
326
+ async examine(kind, known, read, signal, owner) {
234
327
  const current = this.nextRead(kind);
235
- const resolved = await this.queue(kind, () => this.resolve(kind));
328
+ const resolved = await this.queue(kind, () => this.resolve(kind, signal, owner), signal);
236
329
  const reading = 'cli' in resolved ? { release: resolved.release, failure: null, ...(await read(kind, resolved.cli, known)) } : resolved;
237
- if (this.reads.get(kind) === current)
238
- this.readings.set(kind, reading);
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);
239
339
  }
240
340
  async load(kind) {
241
341
  const known = this.readings.get(kind);
242
- if (known !== undefined && known.failure === null)
342
+ if (known !== undefined && known.failure === null && known.minimum === undefined)
243
343
  return;
244
- 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();
245
346
  }
246
347
  async send() {
247
348
  const agents = this.desired.agents.flatMap((kind) => {
248
- const reading = this.readings.get(kind);
349
+ const reading = this.installs.has(kind) ? INSTALLING : this.readings.get(kind);
249
350
  return reading === undefined ? [] : [reported(kind, reading)];
250
351
  });
251
352
  const hostKey = await sshHostKey();
353
+ const form = await hostForm();
252
354
  const body = {
253
355
  os: await operatingSystem(),
254
- kit_version: KIT_VERSION,
356
+ ...(form === undefined ? {} : { form }),
357
+ kit_release: KIT_RELEASE,
358
+ wire: KIT_WIRE,
359
+ updates_itself: await updatesItself(),
255
360
  agent_base: agentBase(),
256
361
  agents,
362
+ transcription: transcriptionReport(),
257
363
  ...(hostKey === null ? {} : { ssh_host_key: hostKey }),
258
364
  };
259
365
  const state = JSON.stringify(body);