@agentshouse/kit 0.2.1-cf110d15f69c8 → 0.2.1-cf268dff1869b

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 (128) hide show
  1. package/README.md +38 -37
  2. package/dist/acp.js +90 -19
  3. package/dist/agents.js +155 -45
  4. package/dist/api.js +5 -1
  5. package/dist/app-git.js +10 -26
  6. package/dist/authority-main.js +2 -2
  7. package/dist/bridge.js +4 -7
  8. package/dist/building.js +50 -0
  9. package/dist/calls.js +71 -0
  10. package/dist/chatgpt.js +32 -0
  11. package/dist/clis.js +52 -42
  12. package/dist/connection.js +105 -0
  13. package/dist/conversations.js +526 -175
  14. package/dist/copies.js +89 -52
  15. package/dist/end.js +17 -2
  16. package/dist/events.js +33 -8
  17. package/dist/files.js +139 -31
  18. package/dist/git.js +13 -11
  19. package/dist/home.js +56 -12
  20. package/dist/house-cli.js +299 -0
  21. package/dist/house-main.js +7 -206
  22. package/dist/instructions.js +7 -11
  23. package/dist/kit-cli.js +68 -0
  24. package/dist/kit-main.js +8 -22
  25. package/dist/login.js +49 -31
  26. package/dist/logout.js +0 -2
  27. package/dist/mcp.js +6 -2
  28. package/dist/placement.js +31 -0
  29. package/dist/relay.js +22 -1
  30. package/dist/resident.js +97 -38
  31. package/dist/scope.js +15 -4
  32. package/dist/scripts.js +255 -0
  33. package/dist/service.js +23 -1
  34. package/dist/sign-in.js +22 -39
  35. package/dist/silence.js +28 -0
  36. package/dist/skills.js +49 -35
  37. package/dist/transcription.js +85 -45
  38. package/dist/translate.js +2 -8
  39. package/dist/update.js +113 -105
  40. package/dist/wire.js +40 -0
  41. package/dist/work.js +3 -5
  42. package/package.json +20 -20
  43. package/dist/bootstrap.json +0 -24
  44. package/dist/clis-main.js +0 -23
  45. package/dist/stream.js +0 -74
  46. package/how-we-work.md +0 -23
  47. package/skills/ask-matt/LICENSE +0 -21
  48. package/skills/ask-matt/PHASE-BOUNDARIES.md +0 -55
  49. package/skills/ask-matt/SKILL.md +0 -91
  50. package/skills/ask-matt/agents/openai.yaml +0 -4
  51. package/skills/code-review/LICENSE +0 -21
  52. package/skills/code-review/SKILL.md +0 -89
  53. package/skills/code-review/agents/openai.yaml +0 -3
  54. package/skills/codebase-design/DEEPENING.md +0 -37
  55. package/skills/codebase-design/DESIGN-IT-TWICE.md +0 -44
  56. package/skills/codebase-design/LICENSE +0 -21
  57. package/skills/codebase-design/SKILL.md +0 -116
  58. package/skills/codebase-design/agents/openai.yaml +0 -3
  59. package/skills/diagnosing-bugs/LICENSE +0 -21
  60. package/skills/diagnosing-bugs/SKILL.md +0 -140
  61. package/skills/diagnosing-bugs/agents/openai.yaml +0 -3
  62. package/skills/diagnosing-bugs/scripts/hitl-loop.template.sh +0 -44
  63. package/skills/domain-modeling/ADR-FORMAT.md +0 -47
  64. package/skills/domain-modeling/CONTEXT-FORMAT.md +0 -60
  65. package/skills/domain-modeling/LICENSE +0 -21
  66. package/skills/domain-modeling/SKILL.md +0 -76
  67. package/skills/domain-modeling/agents/openai.yaml +0 -3
  68. package/skills/grill-me/LICENSE +0 -21
  69. package/skills/grill-me/SKILL.md +0 -8
  70. package/skills/grill-me/agents/openai.yaml +0 -4
  71. package/skills/grill-with-docs/LICENSE +0 -21
  72. package/skills/grill-with-docs/SKILL.md +0 -8
  73. package/skills/grill-with-docs/agents/openai.yaml +0 -4
  74. package/skills/grilling/LICENSE +0 -21
  75. package/skills/grilling/SKILL.md +0 -30
  76. package/skills/grilling/agents/openai.yaml +0 -3
  77. package/skills/handoff/LICENSE +0 -21
  78. package/skills/handoff/SKILL.md +0 -17
  79. package/skills/handoff/agents/openai.yaml +0 -4
  80. package/skills/implement/LICENSE +0 -21
  81. package/skills/implement/SKILL.md +0 -16
  82. package/skills/implement/agents/openai.yaml +0 -4
  83. package/skills/improve-codebase-architecture/HTML-REPORT.md +0 -123
  84. package/skills/improve-codebase-architecture/LICENSE +0 -21
  85. package/skills/improve-codebase-architecture/SKILL.md +0 -72
  86. package/skills/improve-codebase-architecture/agents/openai.yaml +0 -4
  87. package/skills/prototype/LICENSE +0 -21
  88. package/skills/prototype/LOGIC.md +0 -67
  89. package/skills/prototype/SKILL.md +0 -28
  90. package/skills/prototype/UI.md +0 -112
  91. package/skills/prototype/agents/openai.yaml +0 -3
  92. package/skills/research/LICENSE +0 -21
  93. package/skills/research/SKILL.md +0 -14
  94. package/skills/research/agents/openai.yaml +0 -3
  95. package/skills/resolving-merge-conflicts/LICENSE +0 -21
  96. package/skills/resolving-merge-conflicts/SKILL.md +0 -16
  97. package/skills/resolving-merge-conflicts/agents/openai.yaml +0 -3
  98. package/skills/tdd/LICENSE +0 -21
  99. package/skills/tdd/SKILL.md +0 -40
  100. package/skills/tdd/agents/openai.yaml +0 -3
  101. package/skills/tdd/mocking.md +0 -59
  102. package/skills/tdd/tests.md +0 -77
  103. package/skills/teach/GLOSSARY-FORMAT.md +0 -35
  104. package/skills/teach/LEARNING-RECORD-FORMAT.md +0 -46
  105. package/skills/teach/LICENSE +0 -21
  106. package/skills/teach/MISSION-FORMAT.md +0 -31
  107. package/skills/teach/RESOURCES-FORMAT.md +0 -32
  108. package/skills/teach/SKILL.md +0 -141
  109. package/skills/teach/agents/openai.yaml +0 -4
  110. package/skills/to-questionnaire/LICENSE +0 -21
  111. package/skills/to-questionnaire/SKILL.md +0 -55
  112. package/skills/to-questionnaire/agents/openai.yaml +0 -4
  113. package/skills/to-spec/LICENSE +0 -21
  114. package/skills/to-spec/SKILL.md +0 -76
  115. package/skills/to-spec/agents/openai.yaml +0 -4
  116. package/skills/to-tickets/LICENSE +0 -21
  117. package/skills/to-tickets/SKILL.md +0 -106
  118. package/skills/to-tickets/agents/openai.yaml +0 -4
  119. package/skills/wait-what/LICENSE +0 -21
  120. package/skills/wait-what/SKILL.md +0 -8
  121. package/skills/wait-what/agents/openai.yaml +0 -4
  122. package/skills/wayfinder/LICENSE +0 -21
  123. package/skills/wayfinder/SKILL.md +0 -129
  124. package/skills/wayfinder/agents/openai.yaml +0 -4
  125. package/skills/writing-for-agents/LICENSE +0 -21
  126. package/skills/writing-for-agents/SKILL-MECHANICS.md +0 -22
  127. package/skills/writing-for-agents/SKILL.md +0 -83
  128. 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 [agents.house](https://agents.house). It runs
3
+ Kit connects an Environment, a Linux computer or server, to [agents.house](https://agents.house). It runs
4
4
  your Agents' conversations through the agent CLIs you chose and gives each Agent the `house` command.
5
5
 
6
6
  ## Install
7
7
 
8
- Run `curl -fsSL agents.house/kit | sh`, or `irm agents.house/kit.ps1 | iex` on Windows, and again to update;
9
- options follow `sh -s --`. On macOS and Linux it installs House Kit natively under your own account, without an admin password,
10
- as a service that runs while you are logged in. `kit` and `house` are then on
11
- your login shell's `PATH`, and your workspace is `~/AgentsHouse` unless you
12
- pass `--workspace <path>`.
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
12
+ pass `--workspace <path>`. Every run places the Kit release your Building serves, with the Node.js and agent adapters it runs on, in a directory of its own beside the one that runs, then starts it; the earlier one stays until the next release. Kit also updates itself: when your Building takes another release, Kit places it the same way and, once no turn is open, ends so its service, or the container's restart policy, starts it. When House refuses the Kit that runs as too old or too new, Kit places your Building's release at once, ending any running turn, and ends the same way; while it cannot, it stays offline, prints why with the command that installs it again, and tries again regularly.
13
13
 
14
- Add `--container` to run House Kit in one Docker container instead, with your
15
- workspace mounted at `/agents/house`; your Agents then reach only that
16
- workspace. On Windows 11 the container is the one choice. Append a `kit` or
17
- `house` command to the container's options to run it in that container.
14
+ Add `--container` to run Kit in one Docker container instead, with your workspace mounted at `/agents/house`; your Agents then reach only that
15
+ workspace. The container's image holds no Kit release and no Node.js: every run places them in Kit home's `kit` folder, which a container created again keeps. On Windows,
16
+ Kit home is the Docker volume `house-kit-home` and the container is the one choice. Append a `kit` or `house` command to the container's options to run it in that container.
18
17
  Running the command for the other choice on a connected computer asks you to
19
- 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.
20
20
 
21
- On your own Linux server, run the Linux command with `--linux` to
22
- install House Kit natively, with its workspace at `/agents/house`; `kit` and
23
- `house` are then on the server's `PATH`.
21
+ On your own Linux server, run the Linux command with `--linux` to install Kit natively, with its workspace at `/agents/house` and a missing `ca-certificates`, `curl` or `git` installed through apt; `kit` and `house` are then on the server's `PATH`.
24
22
 
25
- House Kit runs the agent CLIs your login shell finds and installs a missing one
26
- through that CLI's own installer. Running the command again offers to update
27
- each CLI older than House Kit needs; add `--update-clis` to update every one to
28
- its latest release without asking. House Kit also gives every Agent on the
29
- Environment a set of agent skills. Add `--no-skills` to the command to leave
30
- them out; running it again without the flag brings them back.
23
+ Kit is built for macOS 27 on Apple silicon, Ubuntu 26.04 LTS on amd64 and Windows 11 on amd64. On another release, distribution or architecture the command prints one warning line, such as `Warning: macOS 26.7.1 is outdated; update to macOS 27.`, and installs anyway. It refuses only an architecture other than amd64 and arm64, and a native install on a Linux without glibc, where `--container` still runs Kit. On a Linux without systemd it installs and connects Kit but starts nothing: run the `kit resident` command it prints under your own service manager, restarting it whenever it ends with a failure. `--container` installs Docker Engine on Ubuntu and Debian; another Linux needs a working Docker Engine first.
24
+
25
+ Kit runs each agent CLI through the link your login shell finds and installs a missing one through that CLI's own
26
+ installer. When it starts and regularly after, Kit runs each CLI's own update command, such as `claude update`, beside
27
+ your conversations: a running conversation keeps its version and the next one runs the new release. A CLI older than
28
+ the oldest release Kit is built for still runs, though its conversations may fail: Kit tells House its version, that
29
+ oldest release and its update command. Kit also gives every Agent on the Environment the agent skills of
30
+ `@agentshouse/skills`, at the version each Kit release installs. Add `--no-skills` to the command to leave them out; running it again without the flag brings them back.
31
31
 
32
32
  ## Commands
33
33
 
34
34
  `kit login` opens or prints a link you confirm in any browser, on this computer
35
35
  or another, continues on its own and keeps the Environment's credential in
36
- `~/.house-kit`, or in `$HOUSE_KIT_HOME` when it is set. `--environment <id>`
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
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;
39
- `--code <code>` connects immediately without a link.
38
+ only those Rooms and `--no-private` every Room but your Private Room; `--code <code>` connects immediately without a link.
40
39
  A login also 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, until you revoke
42
- that connection on Connections. `house help` lists the Tools. Codex sessions started after a
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
43
42
  login run a lone `house` command outside their sandbox. `kit logout` disconnects this
44
- computer, stops House Kit and ends your own agent's connection, so `house` and `git` no
45
- longer act as you here; a later `kit login` reconnects the same Environment.
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.
46
53
 
47
- `kit resident` keeps the Environment connected and, as it connects, copies each
48
- Room you chose for it as a Git repository in the workspace's `local-copies`.
49
- `house fetch` records House's changes on each copy's `refs/house/received`;
50
- rebase onto it, commit and run `house push --owner` in the copy, through the
51
- install command in the container. An Agent runs both, without `--owner`.
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.
52
55
 
53
- House Kit turns each audio file of your message to an Agent into text on this
54
- computer before the Agent reads it. While transcription is on, the speech
55
- engine and model use about 425 MB in `~/.house-kit`; turning it off deletes them.
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. A script you keep as a function from a Web Wizard runs as you, from the same home, directory and `PATH`, when a Trigger of your Private Room or your agent runs it, with no terminal and nothing on its standard input, and when you press Run now on its page, in a terminal you can type into. Kit writes the run's input as JSON to a file only you can read, whose path is in `HOUSE_INPUT`, and deletes it when the run ends; it ends the script and its child processes at the run's time limit or when it loses its connection to House, and sends House the end of what the script printed, up to the run's output limit, without any line that holds a line you typed.
56
57
 
57
58
  ## License
58
59
 
59
- MIT. The skills come from [mattpocock/skills](https://github.com/mattpocock/skills); thank you, Matt Pocock.
60
+ MIT.
package/dist/acp.js CHANGED
@@ -1,46 +1,113 @@
1
- import { ndJsonStream, PROTOCOL_VERSION, } from '@agentclientprotocol/sdk';
1
+ import { ndJsonStream, PROTOCOL_VERSION, RequestError, } from '@agentclientprotocol/sdk';
2
2
  import { spawn } from 'node:child_process';
3
3
  import { Readable, Writable } from 'node:stream';
4
- import { CLIS, KIT_VERSION, adapterCommand, withoutProxy } from './clis.js';
4
+ import { CLIS, KIT_RELEASE, adapterCommand } from './clis.js';
5
+ import { childEnvironment } from './relay.js';
5
6
  import { killTree } from './scope.js';
7
+ import { Silence } from './silence.js';
8
+ const RETIRED = 'the CLI was retired';
9
+ const SIGNED_OUT = RequestError.authRequired().code;
10
+ export function signedOut(error) {
11
+ return typeof error === 'object' && error !== null && error.code === SIGNED_OUT;
12
+ }
13
+ // Claude Code ends a shell command or a model request after ten minutes, so a CLI that owes the Kit an answer and sends nothing for half an hour has hung.
14
+ export const CLI_SILENCE_MS = 30 * 60_000;
15
+ const SILENT = `the CLI sent nothing for ${CLI_SILENCE_MS / 60_000} minutes`;
6
16
  export async function startAdapter(kind, cli, cwd, app, events = () => undefined, added = {}, signal, scope = null) {
7
17
  const adapter = CLIS[kind].adapter;
8
18
  const started = [adapter === null ? cli : adapterCommand(kind), CLIS[kind].args];
9
19
  const [command, args] = scope?.command(...started) ?? started;
10
20
  const child = spawn(command, args, {
11
21
  cwd,
12
- env: { ...withoutProxy(), ...(adapter === null ? {} : { ...adapter.env, [adapter.executable]: cli }), ...added },
22
+ env: { ...childEnvironment(), ...(adapter === null ? {} : { ...adapter.env, [adapter.executable]: cli }), ...added },
13
23
  stdio: ['pipe', 'pipe', 'pipe'],
14
24
  detached: true,
15
25
  });
16
- const stop = () => killTree(child);
17
- signal?.addEventListener('abort', stop, { once: true });
18
- child.on('exit', () => signal?.removeEventListener('abort', stop));
26
+ let owned = true;
27
+ let retired = false;
28
+ let silent = false;
29
+ let over = false;
30
+ let open = false;
19
31
  let stderr = '';
32
+ const owed = new Set();
33
+ const asked = new Set();
34
+ const silence = new Silence(CLI_SILENCE_MS, () => {
35
+ silent = true;
36
+ connection.close(new Error(SILENT));
37
+ if (child.pid !== undefined)
38
+ killTree(child);
39
+ });
40
+ const watch = () => (!over && (owed.size > 0 || open) && asked.size === 0 ? silence.heard() : silence.stop());
20
41
  child.stderr.on('data', (chunk) => {
21
42
  stderr = (stderr + chunk.toString('utf8')).slice(-4000);
22
43
  });
23
- const exited = new Promise((resolve) => {
24
- child.on('error', (error) => resolve(`the CLI did not start: ${error.message}`));
25
- child.on('exit', (code, signal) => {
26
- const last = stderr.trim().split('\n').at(-1);
27
- resolve(`the CLI exited with ${code ?? signal}${last ? `: ${last}` : ''}`);
28
- });
29
- });
30
44
  const stream = ndJsonStream(Writable.toWeb(child.stdin), Readable.toWeb(child.stdout));
45
+ const output = stream.writable.getWriter();
31
46
  const connection = app.connect({
32
- writable: stream.writable,
47
+ writable: new WritableStream({
48
+ write(message) {
49
+ const sent = message;
50
+ if (sent.id !== undefined) {
51
+ if (sent.method === undefined)
52
+ asked.delete(sent.id);
53
+ else
54
+ owed.add(sent.id);
55
+ watch();
56
+ }
57
+ return output.write(message);
58
+ },
59
+ close: () => output.close(),
60
+ abort: (reason) => output.abort(reason),
61
+ }),
33
62
  readable: stream.readable.pipeThrough(new TransformStream({
34
63
  transform(message, controller) {
35
64
  const read = message;
36
- events(read);
65
+ if (read.id !== undefined) {
66
+ if (read.method === undefined)
67
+ owed.delete(read.id);
68
+ else
69
+ asked.add(read.id);
70
+ }
71
+ watch();
72
+ if (owned)
73
+ events(read);
37
74
  if (read.id !== undefined || (read.method !== 'session/update' && !read.method.startsWith('_'))) {
38
75
  controller.enqueue(message);
39
76
  }
40
77
  },
41
78
  })),
42
79
  });
43
- void exited.then((cause) => connection.close(new Error(cause)));
80
+ const { promise: lost, resolve: lose } = Promise.withResolvers();
81
+ const exited = new Promise((resolve) => {
82
+ const end = (cause) => {
83
+ over = true;
84
+ silence.stop();
85
+ if (owned)
86
+ lose(cause);
87
+ owned = false;
88
+ connection.close(new Error(cause));
89
+ resolve(cause);
90
+ };
91
+ child.on('error', (error) => end(`the CLI did not start: ${error.message}`));
92
+ child.on('exit', (code, signal) => {
93
+ const last = stderr.trim().split('\n').at(-1);
94
+ end(silent ? SILENT : `the CLI exited with ${code ?? signal}${last ? `: ${last}` : ''}`);
95
+ });
96
+ });
97
+ const retire = () => {
98
+ owned = false;
99
+ over = true;
100
+ silence.stop();
101
+ if (retired)
102
+ return;
103
+ retired = true;
104
+ if (child.pid !== undefined)
105
+ killTree(child);
106
+ scope?.kill();
107
+ connection.close(new Error(RETIRED));
108
+ };
109
+ signal?.addEventListener('abort', retire, { once: true });
110
+ child.on('exit', () => signal?.removeEventListener('abort', retire));
44
111
  try {
45
112
  const initialized = await connection.agent.request('initialize', {
46
113
  protocolVersion: PROTOCOL_VERSION,
@@ -51,13 +118,17 @@ export async function startAdapter(kind, cli, cwd, app, events = () => undefined
51
118
  session: { compaction: {}, notices: {} },
52
119
  _meta: { jetbrains: { air: { version: 1, capabilities: CLIS[kind].air } } },
53
120
  },
54
- clientInfo: { name: '@agentshouse/kit', version: KIT_VERSION },
121
+ clientInfo: { name: '@agentshouse/kit', version: KIT_RELEASE },
55
122
  });
56
123
  scope?.entered(child.pid);
57
- return { child, connection, initialized, exited };
124
+ const turn = (opened) => {
125
+ open = opened;
126
+ watch();
127
+ };
128
+ return { connection, initialized, exited, lost, silent: () => silent, turn, retire };
58
129
  }
59
130
  catch (error) {
60
- child.kill('SIGKILL');
131
+ retire();
61
132
  throw error;
62
133
  }
63
134
  }
package/dist/agents.js CHANGED
@@ -1,11 +1,19 @@
1
1
  import { client } from '@agentclientprotocol/sdk';
2
- import { readFile, realpath } from 'node:fs/promises';
3
- import { startAdapter } from './acp.js';
4
- import { CLIS, KIT_VERSION, below, installAdapter, installCli, locate, run, versionOf } from './clis.js';
2
+ import { readFile } from 'node:fs/promises';
3
+ import { setTimeout as delay } from 'node:timers/promises';
4
+ import { signedOut, startAdapter } from './acp.js';
5
+ import { CLIS, KIT_RELEASE, below, installCli, locate, run, updateCli, versionOf } from './clis.js';
5
6
  import { agentBase, kitHome } from './home.js';
6
- import { killTree } from './scope.js';
7
7
  import { holdTranscription, transcriptionReport } from './transcription.js';
8
+ import { KIT_WIRE } from './wire.js';
9
+ // Two quiet seconds let a fresh conversation start before background model discovery competes for its CPU.
10
+ const MODEL_PROBE_QUIET_MS = 2_000;
11
+ // A CLI's maker can publish several releases a day, so running each chosen CLI's update command hourly brings a new one to the next conversation within the hour for one small check.
12
+ export const CLI_UPDATE_MS = 60 * 60_000;
13
+ // A sign-in's model read that has not answered in ten seconds leaves its sign-in to the status check, so a hung CLI never holds the sign-in's result.
14
+ const SIGNED_IN_READ_MS = 10_000;
8
15
  const SIGNED_OUT = { signed_in: false, models: [], modes: [] };
16
+ const INSTALLING = { release: null, failure: null, installing: true, ...SIGNED_OUT };
9
17
  function select(options, category) {
10
18
  const option = options.find((candidate) => candidate.category === category);
11
19
  return option?.type === 'select' ? option : undefined;
@@ -22,6 +30,22 @@ function causeOf(error) {
22
30
  function logged(error) {
23
31
  process.stderr.write(`kit: ${causeOf(error)}\n`);
24
32
  }
33
+ const LAPTOP_CHASSIS = new Set(['8', '9', '10', '14', '30', '31', '32']);
34
+ const DESKTOP_CHASSIS = new Set(['3', '4', '5', '6', '7', '15', '16']);
35
+ const SERVER_CHASSIS = new Set(['17', '18', '19', '20', '21', '22', '23', '24']);
36
+ export function chassisForm(value) {
37
+ const chassis = value.trim();
38
+ if (LAPTOP_CHASSIS.has(chassis))
39
+ return 'laptop';
40
+ if (DESKTOP_CHASSIS.has(chassis))
41
+ return 'desktop';
42
+ if (SERVER_CHASSIS.has(chassis))
43
+ return 'server';
44
+ return undefined;
45
+ }
46
+ export function hostVm(version) {
47
+ return /docker desktop|microsoft|wsl|linuxkit/i.test(version);
48
+ }
25
49
  async function models(kind, adapter, known) {
26
50
  const agent = adapter.connection.agent;
27
51
  const opened = await agent.request('session/new', { cwd: kitHome(), mcpServers: [] });
@@ -48,13 +72,6 @@ async function models(kind, adapter, known) {
48
72
  }
49
73
  return { models: offered, modes };
50
74
  }
51
- async function signedIn(kind, cli, known, signal) {
52
- const probe = CLIS[kind].signedIn;
53
- // A sign-in check that has not answered in half a minute counts as signed out rather than stalling the report.
54
- if ('command' in probe)
55
- return (await run(cli, probe.command, 30_000, false, signal)).status === 0;
56
- return (await offer(kind, cli, known, signal)).signed_in;
57
- }
58
75
  function ended(signal) {
59
76
  return new Promise((_, reject) => {
60
77
  if (signal.aborted)
@@ -81,6 +98,8 @@ async function offer(kind, cli, known, signal) {
81
98
  catch (error) {
82
99
  if (!signal?.aborted)
83
100
  process.stderr.write(`kit: ${kind} did not offer its models: ${causeOf(error)}\n`);
101
+ if (signedOut(error))
102
+ return SIGNED_OUT;
84
103
  return {
85
104
  signed_in: adapter === undefined && 'initializeMeta' in probe ? known.signed_in : true,
86
105
  models: known.models,
@@ -88,26 +107,24 @@ async function offer(kind, cli, known, signal) {
88
107
  };
89
108
  }
90
109
  finally {
91
- if (adapter !== undefined)
92
- killTree(adapter.child);
110
+ adapter?.retire();
93
111
  }
94
112
  }
95
113
  function reported(kind, reading) {
114
+ const { minimum, update } = CLIS[kind];
96
115
  return {
97
116
  kind,
98
117
  release: reading.release,
99
- ...(reading.minimum === undefined ? {} : { minimum: reading.minimum }),
118
+ ...(reading.release !== null && below(reading.release, minimum) ? { minimum, update } : {}),
100
119
  failure: reading.failure,
120
+ ...(reading.installing === undefined ? {} : { installing: reading.installing }),
101
121
  signed_in: reading.signed_in,
102
122
  models: reading.models,
103
123
  modes: reading.modes,
104
124
  full_access: CLIS[kind].fullAccess,
105
125
  };
106
126
  }
107
- function tooOld(kind, release) {
108
- const cli = CLIS[kind];
109
- return `${cli.bin} ${release} is older than ${cli.minimum}, the oldest this Kit runs`;
110
- }
127
+ const NOT_READY = "the Agent's CLI is not ready on this computer";
111
128
  async function sshHostKey() {
112
129
  // Listing a local host key takes a moment, so ten seconds only bounds a stuck ssh-keygen.
113
130
  const listed = await run('ssh-keygen', ['-l', '-E', 'sha256', '-f', '/etc/ssh/ssh_host_ed25519_key.pub'], 10_000);
@@ -120,18 +137,44 @@ async function operatingSystem() {
120
137
  const release = await readFile('/etc/os-release', 'utf8');
121
138
  return /^PRETTY_NAME="?([^"\n]*)"?$/m.exec(release)?.[1] ?? release;
122
139
  }
140
+ async function hostForm() {
141
+ if (process.platform === 'darwin') {
142
+ const battery = await run('pmset', ['-g', 'batt'], 10_000);
143
+ return battery.status === 0 && battery.output.includes('InternalBattery') ? 'laptop' : 'desktop';
144
+ }
145
+ if (process.platform !== 'linux')
146
+ return undefined;
147
+ const [container, version, chassis] = await Promise.all([
148
+ readFile('/.dockerenv', 'utf8').then(() => true).catch(() => false),
149
+ readFile('/proc/version', 'utf8').catch(() => ''),
150
+ readFile('/sys/class/dmi/id/chassis_type', 'utf8').catch(() => ''),
151
+ ]);
152
+ if (container && hostVm(version))
153
+ return undefined;
154
+ return chassisForm(chassis);
155
+ }
123
156
  export class Agents {
124
157
  desired = { agents: [], routes: [], transcribe: false };
125
158
  house;
126
159
  reading = Promise.resolve();
127
160
  queues = new Map();
128
161
  installing = Promise.resolve();
162
+ installs = new Map();
129
163
  readings = new Map();
130
164
  reads = new Map();
165
+ starts = 0;
131
166
  sending = Promise.resolve();
132
167
  sent = null;
133
- constructor(house) {
168
+ refreshing = 0;
169
+ loaded = Promise.resolve();
170
+ updating = null;
171
+ changed;
172
+ constructor(house, changed = () => undefined) {
134
173
  this.house = house;
174
+ this.changed = changed;
175
+ }
176
+ idle() {
177
+ return this.refreshing === 0 && this.updating === null;
135
178
  }
136
179
  read() {
137
180
  return this.reading.then(() => undefined, () => undefined);
@@ -140,35 +183,49 @@ export class Agents {
140
183
  return this.desired.routes.find((route) => route.agent_id === agentId);
141
184
  }
142
185
  refresh() {
186
+ this.refreshing++;
187
+ this.changed();
143
188
  const reading = this.read().then(async () => {
144
189
  this.desired = await this.house.deliver('/kit/agents/desired', {});
145
190
  return this.desired;
146
191
  });
147
192
  this.reading = reading;
148
- return reading.then(({ agents, transcribe }) => {
193
+ this.loaded = reading
194
+ .then(({ agents, transcribe }) => Promise.all([
149
195
  holdTranscription(transcribe)
150
196
  .then((changed) => (changed ? this.report() : undefined))
151
- .catch(logged);
197
+ .catch(logged),
152
198
  Promise.all(agents.map((kind) => this.load(kind)))
153
199
  .then(() => this.report())
154
- .catch(logged);
200
+ .catch(logged),
201
+ ]))
202
+ .catch(() => undefined)
203
+ .finally(() => {
204
+ this.refreshing--;
205
+ this.changed();
155
206
  });
207
+ return reading.then(() => undefined);
208
+ }
209
+ keepCurrent() {
210
+ this.updateAll(this.loaded);
211
+ setInterval(() => this.updateAll(Promise.resolve()), CLI_UPDATE_MS);
156
212
  }
157
213
  cli(kind) {
214
+ this.starts += 1;
158
215
  return this.queue(kind, async () => {
159
216
  const resolved = await this.resolve(kind);
160
217
  if (!('cli' in resolved)) {
161
218
  this.update(kind, resolved);
162
- throw new Error(resolved.failure ?? tooOld(kind, resolved.release));
219
+ throw new Error(NOT_READY);
163
220
  }
164
221
  const { cli, release } = resolved;
165
222
  const known = this.readings.get(kind);
166
- const kept = known?.release === null || known?.minimum !== undefined ? SIGNED_OUT : (known ?? SIGNED_OUT);
167
- if (known?.release !== release || known.minimum !== undefined) {
223
+ const kept = known?.release === null ? SIGNED_OUT : (known ?? SIGNED_OUT);
224
+ if (known?.release !== release || this.installs.has(kind)) {
168
225
  this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models, modes: kept.modes });
169
226
  }
170
227
  const read = this.nextRead(kind);
171
- offer(kind, cli, kept)
228
+ this.quietOffer(kind, cli, kept)
172
229
  .then((offered) => {
173
230
  const current = this.readings.get(kind);
174
231
  if (this.reads.get(kind) === read && current?.release === release)
@@ -179,7 +236,8 @@ export class Agents {
179
236
  });
180
237
  }
181
238
  located(kind, signal) {
182
- return this.queue(kind, () => this.ensure(kind, signal), signal);
239
+ const owner = {};
240
+ return this.queue(kind, () => this.ensure(kind, signal, owner).finally(() => this.settle(kind, owner)), signal);
183
241
  }
184
242
  async reread(kind) {
185
243
  await this.examine(kind, this.readings.get(kind) ?? SIGNED_OUT, offer);
@@ -187,7 +245,13 @@ export class Agents {
187
245
  }
188
246
  async recheck(kind, signal) {
189
247
  const known = this.readings.get(kind) ?? SIGNED_OUT;
190
- await this.examine(kind, known, async (kind, cli) => ((await signedIn(kind, cli, known, signal)) ? { ...known, signed_in: true } : SIGNED_OUT), signal);
248
+ const owner = {};
249
+ try {
250
+ await this.examine(kind, known, (kind, cli) => offer(kind, cli, known, AbortSignal.any([signal, AbortSignal.timeout(SIGNED_IN_READ_MS)])), signal, owner);
251
+ }
252
+ finally {
253
+ this.settle(kind, owner);
254
+ }
191
255
  if (!signal.aborted)
192
256
  await this.report();
193
257
  }
@@ -201,8 +265,18 @@ export class Agents {
201
265
  this.reads.set(kind, read);
202
266
  return read;
203
267
  }
204
- update(kind, reading) {
268
+ hold(kind, reading) {
205
269
  this.readings.set(kind, reading);
270
+ this.installs.delete(kind);
271
+ }
272
+ update(kind, reading) {
273
+ this.hold(kind, reading);
274
+ this.report().catch(logged);
275
+ }
276
+ settle(kind, owner) {
277
+ if (this.installs.get(kind) !== owner)
278
+ return;
279
+ this.installs.delete(kind);
206
280
  this.report().catch(logged);
207
281
  }
208
282
  queue(kind, work, signal) {
@@ -213,13 +287,12 @@ export class Agents {
213
287
  this.queues.set(kind, queued.catch(() => undefined));
214
288
  return signal === undefined ? queued : Promise.race([queued, ended(signal)]);
215
289
  }
216
- async ensure(kind, signal) {
217
- const failed = await installAdapter(kind, signal);
218
- if (failed !== null)
219
- throw new Error(failed);
290
+ async ensure(kind, signal, owner = {}) {
220
291
  const found = await locate(kind, signal);
221
292
  if (found !== null)
222
293
  return found;
294
+ this.installs.set(kind, owner);
295
+ this.report().catch(logged);
223
296
  const installing = this.installing.catch(() => undefined).then(() => installCli(kind, signal));
224
297
  this.installing = installing;
225
298
  const failure = await installing;
@@ -230,10 +303,10 @@ export class Agents {
230
303
  throw new Error(`the login shell does not find ${CLIS[kind].bin} after its install`);
231
304
  return installed;
232
305
  }
233
- async resolve(kind, signal) {
306
+ async resolve(kind, signal, owner) {
234
307
  let cli;
235
308
  try {
236
- cli = await realpath(await this.ensure(kind, signal));
309
+ cli = await this.ensure(kind, signal, owner);
237
310
  }
238
311
  catch (error) {
239
312
  const failure = causeOf(error);
@@ -243,33 +316,70 @@ export class Agents {
243
316
  const release = await versionOf(cli, signal);
244
317
  if (release === null)
245
318
  return { release: null, failure: `${cli} --version names no version`, ...SIGNED_OUT };
246
- const minimum = CLIS[kind].minimum;
247
- if (below(release, minimum))
248
- return { release, minimum, failure: null, ...SIGNED_OUT };
249
319
  return { cli, release };
250
320
  }
251
- async examine(kind, known, read, signal) {
321
+ async examine(kind, known, read, signal, owner) {
252
322
  const current = this.nextRead(kind);
253
- const resolved = await this.queue(kind, () => this.resolve(kind, signal), signal);
323
+ const resolved = await this.queue(kind, () => this.resolve(kind, signal, owner), signal);
254
324
  const reading = 'cli' in resolved ? { release: resolved.release, failure: null, ...(await read(kind, resolved.cli, known)) } : resolved;
255
325
  if (this.reads.get(kind) === current && !signal?.aborted)
256
- this.readings.set(kind, reading);
326
+ this.hold(kind, reading);
327
+ }
328
+ updateAll(after) {
329
+ if (this.updating !== null)
330
+ return;
331
+ this.updating = after
332
+ .then(async () => {
333
+ for (const kind of this.desired.agents) {
334
+ if (this.installs.has(kind) || !this.readings.get(kind)?.release)
335
+ continue;
336
+ const failure = await updateCli(kind);
337
+ if (failure !== null)
338
+ process.stderr.write(`kit: ${kind} did not update: ${failure}\n`);
339
+ await this.readVersion(kind);
340
+ }
341
+ })
342
+ .catch(logged)
343
+ .finally(() => {
344
+ this.updating = null;
345
+ this.changed();
346
+ });
347
+ this.changed();
348
+ }
349
+ async readVersion(kind) {
350
+ const cli = await locate(kind);
351
+ const release = cli === null ? null : await versionOf(cli);
352
+ const current = this.readings.get(kind);
353
+ if (release === null || !current?.release || current.release === release)
354
+ return;
355
+ this.update(kind, { ...current, release });
356
+ }
357
+ async quietOffer(kind, cli, known) {
358
+ for (let seen = -1; seen !== this.starts;) {
359
+ seen = this.starts;
360
+ await delay(MODEL_PROBE_QUIET_MS);
361
+ }
362
+ return offer(kind, cli, known);
257
363
  }
258
364
  async load(kind) {
259
365
  const known = this.readings.get(kind);
260
- if (known !== undefined && known.failure === null && known.minimum === undefined)
366
+ if (known !== undefined && known.failure === null)
261
367
  return;
262
- await this.examine(kind, SIGNED_OUT, offer);
368
+ await this.examine(kind, SIGNED_OUT, (kind, cli, known) => this.quietOffer(kind, cli, known));
369
+ await this.report();
263
370
  }
264
371
  async send() {
265
372
  const agents = this.desired.agents.flatMap((kind) => {
266
- const reading = this.readings.get(kind);
373
+ const reading = this.installs.has(kind) ? INSTALLING : this.readings.get(kind);
267
374
  return reading === undefined ? [] : [reported(kind, reading)];
268
375
  });
269
376
  const hostKey = await sshHostKey();
377
+ const form = await hostForm();
270
378
  const body = {
271
379
  os: await operatingSystem(),
272
- kit_version: KIT_VERSION,
380
+ ...(form === undefined ? {} : { form }),
381
+ kit_release: KIT_RELEASE,
382
+ wire: KIT_WIRE,
273
383
  agent_base: agentBase(),
274
384
  agents,
275
385
  transcription: transcriptionReport(),
package/dist/api.js CHANGED
@@ -3,6 +3,7 @@ import { signInAgain } from './end.js';
3
3
  import { readEnrolment } from './home.js';
4
4
  import { retryable } from './refusals.js';
5
5
  import { relayed } from './relay.js';
6
+ import { endUnserved, KIT_WIRE, KIT_WIRE_HEADER } from './wire.js';
6
7
  export class HouseRefusal extends Error {
7
8
  status;
8
9
  text;
@@ -16,7 +17,7 @@ export function finalRefusal(error) {
16
17
  return error instanceof HouseRefusal && retryable(error.text) === false;
17
18
  }
18
19
  export function retryDelay(attempt) {
19
- // Full jitter, doubling from one second to a 30-second cap, spreads the Kits one outage dropped and retries within half a minute of House's return.
20
+ // Full jitter, doubling from one second to a 30-second cap, spreads the Kit processes one outage dropped and retries within half a minute of House's return.
20
21
  return Math.random() * Math.min(30_000, 1000 * 2 ** attempt);
21
22
  }
22
23
  export async function retrying(sent, signal, pause = retryDelay) {
@@ -37,12 +38,15 @@ export async function post(house, path, body, credential, signal) {
37
38
  method: 'POST',
38
39
  headers: {
39
40
  'content-type': 'application/json',
41
+ [KIT_WIRE_HEADER]: String(KIT_WIRE),
40
42
  ...(credential === undefined ? {} : { authorization: `Bearer ${credential}` }),
41
43
  },
42
44
  body: JSON.stringify(body),
43
45
  signal,
44
46
  });
45
47
  const text = await answer.text();
48
+ if (!answer.ok)
49
+ endUnserved(text);
46
50
  if (!answer.ok)
47
51
  throw new HouseRefusal(path, answer.status, text);
48
52
  return JSON.parse(text);