@agentshouse/kit 0.2.1-cca496635583e → 0.2.1-ccb257fa8a318

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 (129) hide show
  1. package/README.md +36 -35
  2. package/dist/acp.js +85 -18
  3. package/dist/agents.js +110 -23
  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 +46 -0
  9. package/dist/calls.js +71 -0
  10. package/dist/chatgpt.js +32 -0
  11. package/dist/clis-main.js +2 -2
  12. package/dist/clis.js +87 -22
  13. package/dist/connection.js +116 -0
  14. package/dist/conversations.js +480 -159
  15. package/dist/copies.js +89 -52
  16. package/dist/end.js +11 -2
  17. package/dist/events.js +6 -2
  18. package/dist/files.js +139 -31
  19. package/dist/git.js +13 -11
  20. package/dist/home.js +56 -5
  21. package/dist/house-cli.js +299 -0
  22. package/dist/house-main.js +7 -189
  23. package/dist/instructions.js +7 -11
  24. package/dist/kit-cli.js +68 -0
  25. package/dist/kit-main.js +8 -22
  26. package/dist/login.js +50 -16
  27. package/dist/logout.js +0 -2
  28. package/dist/mcp.js +6 -2
  29. package/dist/parts.js +34 -16
  30. package/dist/placement.js +39 -0
  31. package/dist/relay.js +22 -1
  32. package/dist/resident.js +94 -34
  33. package/dist/scope.js +3 -0
  34. package/dist/scripts.js +255 -0
  35. package/dist/service.js +23 -1
  36. package/dist/sign-in.js +22 -39
  37. package/dist/silence.js +28 -0
  38. package/dist/skills.js +49 -35
  39. package/dist/transcription.js +85 -45
  40. package/dist/translate.js +2 -8
  41. package/dist/update.js +115 -53
  42. package/dist/wire.js +22 -0
  43. package/dist/work.js +3 -5
  44. package/package.json +20 -20
  45. package/dist/bootstrap.json +0 -24
  46. package/dist/stream.js +0 -74
  47. package/how-we-work.md +0 -23
  48. package/skills/ask-matt/LICENSE +0 -21
  49. package/skills/ask-matt/PHASE-BOUNDARIES.md +0 -55
  50. package/skills/ask-matt/SKILL.md +0 -91
  51. package/skills/ask-matt/agents/openai.yaml +0 -4
  52. package/skills/code-review/LICENSE +0 -21
  53. package/skills/code-review/SKILL.md +0 -89
  54. package/skills/code-review/agents/openai.yaml +0 -3
  55. package/skills/codebase-design/DEEPENING.md +0 -37
  56. package/skills/codebase-design/DESIGN-IT-TWICE.md +0 -44
  57. package/skills/codebase-design/LICENSE +0 -21
  58. package/skills/codebase-design/SKILL.md +0 -116
  59. package/skills/codebase-design/agents/openai.yaml +0 -3
  60. package/skills/diagnosing-bugs/LICENSE +0 -21
  61. package/skills/diagnosing-bugs/SKILL.md +0 -140
  62. package/skills/diagnosing-bugs/agents/openai.yaml +0 -3
  63. package/skills/diagnosing-bugs/scripts/hitl-loop.template.sh +0 -44
  64. package/skills/domain-modeling/ADR-FORMAT.md +0 -47
  65. package/skills/domain-modeling/CONTEXT-FORMAT.md +0 -60
  66. package/skills/domain-modeling/LICENSE +0 -21
  67. package/skills/domain-modeling/SKILL.md +0 -76
  68. package/skills/domain-modeling/agents/openai.yaml +0 -3
  69. package/skills/grill-me/LICENSE +0 -21
  70. package/skills/grill-me/SKILL.md +0 -8
  71. package/skills/grill-me/agents/openai.yaml +0 -4
  72. package/skills/grill-with-docs/LICENSE +0 -21
  73. package/skills/grill-with-docs/SKILL.md +0 -8
  74. package/skills/grill-with-docs/agents/openai.yaml +0 -4
  75. package/skills/grilling/LICENSE +0 -21
  76. package/skills/grilling/SKILL.md +0 -30
  77. package/skills/grilling/agents/openai.yaml +0 -3
  78. package/skills/handoff/LICENSE +0 -21
  79. package/skills/handoff/SKILL.md +0 -17
  80. package/skills/handoff/agents/openai.yaml +0 -4
  81. package/skills/implement/LICENSE +0 -21
  82. package/skills/implement/SKILL.md +0 -16
  83. package/skills/implement/agents/openai.yaml +0 -4
  84. package/skills/improve-codebase-architecture/HTML-REPORT.md +0 -123
  85. package/skills/improve-codebase-architecture/LICENSE +0 -21
  86. package/skills/improve-codebase-architecture/SKILL.md +0 -72
  87. package/skills/improve-codebase-architecture/agents/openai.yaml +0 -4
  88. package/skills/prototype/LICENSE +0 -21
  89. package/skills/prototype/LOGIC.md +0 -67
  90. package/skills/prototype/SKILL.md +0 -28
  91. package/skills/prototype/UI.md +0 -112
  92. package/skills/prototype/agents/openai.yaml +0 -3
  93. package/skills/research/LICENSE +0 -21
  94. package/skills/research/SKILL.md +0 -14
  95. package/skills/research/agents/openai.yaml +0 -3
  96. package/skills/resolving-merge-conflicts/LICENSE +0 -21
  97. package/skills/resolving-merge-conflicts/SKILL.md +0 -16
  98. package/skills/resolving-merge-conflicts/agents/openai.yaml +0 -3
  99. package/skills/tdd/LICENSE +0 -21
  100. package/skills/tdd/SKILL.md +0 -40
  101. package/skills/tdd/agents/openai.yaml +0 -3
  102. package/skills/tdd/mocking.md +0 -59
  103. package/skills/tdd/tests.md +0 -77
  104. package/skills/teach/GLOSSARY-FORMAT.md +0 -35
  105. package/skills/teach/LEARNING-RECORD-FORMAT.md +0 -46
  106. package/skills/teach/LICENSE +0 -21
  107. package/skills/teach/MISSION-FORMAT.md +0 -31
  108. package/skills/teach/RESOURCES-FORMAT.md +0 -32
  109. package/skills/teach/SKILL.md +0 -141
  110. package/skills/teach/agents/openai.yaml +0 -4
  111. package/skills/to-questionnaire/LICENSE +0 -21
  112. package/skills/to-questionnaire/SKILL.md +0 -55
  113. package/skills/to-questionnaire/agents/openai.yaml +0 -4
  114. package/skills/to-spec/LICENSE +0 -21
  115. package/skills/to-spec/SKILL.md +0 -76
  116. package/skills/to-spec/agents/openai.yaml +0 -4
  117. package/skills/to-tickets/LICENSE +0 -21
  118. package/skills/to-tickets/SKILL.md +0 -106
  119. package/skills/to-tickets/agents/openai.yaml +0 -4
  120. package/skills/wait-what/LICENSE +0 -21
  121. package/skills/wait-what/SKILL.md +0 -8
  122. package/skills/wait-what/agents/openai.yaml +0 -4
  123. package/skills/wayfinder/LICENSE +0 -21
  124. package/skills/wayfinder/SKILL.md +0 -129
  125. package/skills/wayfinder/agents/openai.yaml +0 -4
  126. package/skills/writing-for-agents/LICENSE +0 -21
  127. package/skills/writing-for-agents/SKILL-MECHANICS.md +0 -22
  128. package/skills/writing-for-agents/SKILL.md +0 -83
  129. 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
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
12
  pass `--workspace <path>`.
13
13
 
14
- 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
15
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.
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.
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
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
22
+ install Kit natively, with its workspace at `/agents/house`; `kit` and
23
23
  `house` are then on the server's `PATH`.
24
24
 
25
- 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
26
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.
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.
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,
42
- until you revoke that connection on Connections. `house help` lists the Tools.
43
- `kit logout` disconnects this computer, stops House Kit and ends your own
44
- agent's connection, so `house` and `git` no longer act as you here; a later
45
- `kit login` reconnects the same Environment.
46
-
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`.
52
-
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.
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. 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,109 @@
1
1
  import { ndJsonStream, PROTOCOL_VERSION, } 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
+ // 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.
10
+ export const CLI_SILENCE_MS = 30 * 60_000;
11
+ const SILENT = `the CLI sent nothing for ${CLI_SILENCE_MS / 60_000} minutes`;
6
12
  export async function startAdapter(kind, cli, cwd, app, events = () => undefined, added = {}, signal, scope = null) {
7
13
  const adapter = CLIS[kind].adapter;
8
14
  const started = [adapter === null ? cli : adapterCommand(kind), CLIS[kind].args];
9
15
  const [command, args] = scope?.command(...started) ?? started;
10
16
  const child = spawn(command, args, {
11
17
  cwd,
12
- env: { ...withoutProxy(), ...(adapter === null ? {} : { ...adapter.env, [adapter.executable]: cli }), ...added },
18
+ env: { ...childEnvironment(), ...(adapter === null ? {} : { ...adapter.env, [adapter.executable]: cli }), ...added },
13
19
  stdio: ['pipe', 'pipe', 'pipe'],
14
20
  detached: true,
15
21
  });
16
- const stop = () => killTree(child);
17
- signal?.addEventListener('abort', stop, { once: true });
18
- child.on('exit', () => signal?.removeEventListener('abort', stop));
22
+ let owned = true;
23
+ let retired = false;
24
+ let silent = false;
25
+ let over = false;
26
+ let open = false;
19
27
  let stderr = '';
28
+ const owed = new Set();
29
+ const asked = new Set();
30
+ const silence = new Silence(CLI_SILENCE_MS, () => {
31
+ silent = true;
32
+ connection.close(new Error(SILENT));
33
+ if (child.pid !== undefined)
34
+ killTree(child);
35
+ });
36
+ const watch = () => (!over && (owed.size > 0 || open) && asked.size === 0 ? silence.heard() : silence.stop());
20
37
  child.stderr.on('data', (chunk) => {
21
38
  stderr = (stderr + chunk.toString('utf8')).slice(-4000);
22
39
  });
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
40
  const stream = ndJsonStream(Writable.toWeb(child.stdin), Readable.toWeb(child.stdout));
41
+ const output = stream.writable.getWriter();
31
42
  const connection = app.connect({
32
- writable: stream.writable,
43
+ writable: new WritableStream({
44
+ write(message) {
45
+ const sent = message;
46
+ if (sent.id !== undefined) {
47
+ if (sent.method === undefined)
48
+ asked.delete(sent.id);
49
+ else
50
+ owed.add(sent.id);
51
+ watch();
52
+ }
53
+ return output.write(message);
54
+ },
55
+ close: () => output.close(),
56
+ abort: (reason) => output.abort(reason),
57
+ }),
33
58
  readable: stream.readable.pipeThrough(new TransformStream({
34
59
  transform(message, controller) {
35
60
  const read = message;
36
- events(read);
61
+ if (read.id !== undefined) {
62
+ if (read.method === undefined)
63
+ owed.delete(read.id);
64
+ else
65
+ asked.add(read.id);
66
+ }
67
+ watch();
68
+ if (owned)
69
+ events(read);
37
70
  if (read.id !== undefined || (read.method !== 'session/update' && !read.method.startsWith('_'))) {
38
71
  controller.enqueue(message);
39
72
  }
40
73
  },
41
74
  })),
42
75
  });
43
- void exited.then((cause) => connection.close(new Error(cause)));
76
+ const { promise: lost, resolve: lose } = Promise.withResolvers();
77
+ const exited = new Promise((resolve) => {
78
+ const end = (cause) => {
79
+ over = true;
80
+ silence.stop();
81
+ if (owned)
82
+ lose(cause);
83
+ owned = false;
84
+ connection.close(new Error(cause));
85
+ resolve(cause);
86
+ };
87
+ child.on('error', (error) => end(`the CLI did not start: ${error.message}`));
88
+ child.on('exit', (code, signal) => {
89
+ const last = stderr.trim().split('\n').at(-1);
90
+ end(silent ? SILENT : `the CLI exited with ${code ?? signal}${last ? `: ${last}` : ''}`);
91
+ });
92
+ });
93
+ const retire = () => {
94
+ owned = false;
95
+ over = true;
96
+ silence.stop();
97
+ if (retired)
98
+ return;
99
+ retired = true;
100
+ if (child.pid !== undefined)
101
+ killTree(child);
102
+ scope?.kill();
103
+ connection.close(new Error(RETIRED));
104
+ };
105
+ signal?.addEventListener('abort', retire, { once: true });
106
+ child.on('exit', () => signal?.removeEventListener('abort', retire));
44
107
  try {
45
108
  const initialized = await connection.agent.request('initialize', {
46
109
  protocolVersion: PROTOCOL_VERSION,
@@ -51,13 +114,17 @@ export async function startAdapter(kind, cli, cwd, app, events = () => undefined
51
114
  session: { compaction: {}, notices: {} },
52
115
  _meta: { jetbrains: { air: { version: 1, capabilities: CLIS[kind].air } } },
53
116
  },
54
- clientInfo: { name: '@agentshouse/kit', version: KIT_VERSION },
117
+ clientInfo: { name: '@agentshouse/kit', version: KIT_RELEASE },
55
118
  });
56
119
  scope?.entered(child.pid);
57
- return { child, connection, initialized, exited };
120
+ const turn = (opened) => {
121
+ open = opened;
122
+ watch();
123
+ };
124
+ return { connection, initialized, exited, lost, silent: () => silent, turn, retire };
58
125
  }
59
126
  catch (error) {
60
- child.kill('SIGKILL');
127
+ retire();
61
128
  throw error;
62
129
  }
63
130
  }
package/dist/agents.js CHANGED
@@ -1,11 +1,16 @@
1
1
  import { client } from '@agentclientprotocol/sdk';
2
2
  import { readFile, realpath } from 'node:fs/promises';
3
+ import { setTimeout as delay } from 'node:timers/promises';
3
4
  import { startAdapter } from './acp.js';
4
- import { CLIS, KIT_VERSION, below, installAdapter, installCli, locate, run, versionOf } from './clis.js';
5
+ import { CLIS, KIT_RELEASE, below, installAdapter, installCli, locate, run, versionOf } from './clis.js';
5
6
  import { agentBase, kitHome } from './home.js';
6
- import { killTree } from './scope.js';
7
+ import { updatesItself } from './placement.js';
7
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;
8
12
  const SIGNED_OUT = { signed_in: false, models: [], modes: [] };
13
+ const INSTALLING = { release: null, failure: null, installing: true, ...SIGNED_OUT };
9
14
  function select(options, category) {
10
15
  const option = options.find((candidate) => candidate.category === category);
11
16
  return option?.type === 'select' ? option : undefined;
@@ -22,6 +27,22 @@ function causeOf(error) {
22
27
  function logged(error) {
23
28
  process.stderr.write(`kit: ${causeOf(error)}\n`);
24
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
+ }
25
46
  async function models(kind, adapter, known) {
26
47
  const agent = adapter.connection.agent;
27
48
  const opened = await agent.request('session/new', { cwd: kitHome(), mcpServers: [] });
@@ -88,8 +109,7 @@ async function offer(kind, cli, known, signal) {
88
109
  };
89
110
  }
90
111
  finally {
91
- if (adapter !== undefined)
92
- killTree(adapter.child);
112
+ adapter?.retire();
93
113
  }
94
114
  }
95
115
  function reported(kind, reading) {
@@ -98,12 +118,14 @@ function reported(kind, reading) {
98
118
  release: reading.release,
99
119
  ...(reading.minimum === undefined ? {} : { minimum: reading.minimum }),
100
120
  failure: reading.failure,
121
+ ...(reading.installing === undefined ? {} : { installing: reading.installing }),
101
122
  signed_in: reading.signed_in,
102
123
  models: reading.models,
103
124
  modes: reading.modes,
104
125
  full_access: CLIS[kind].fullAccess,
105
126
  };
106
127
  }
128
+ const NOT_READY = "the Agent's CLI is not ready on this computer";
107
129
  function tooOld(kind, release) {
108
130
  const cli = CLIS[kind];
109
131
  return `${cli.bin} ${release} is older than ${cli.minimum}, the oldest this Kit runs`;
@@ -120,18 +142,42 @@ async function operatingSystem() {
120
142
  const release = await readFile('/etc/os-release', 'utf8');
121
143
  return /^PRETTY_NAME="?([^"\n]*)"?$/m.exec(release)?.[1] ?? release;
122
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
+ }
123
161
  export class Agents {
124
162
  desired = { agents: [], routes: [], transcribe: false };
125
163
  house;
126
164
  reading = Promise.resolve();
127
165
  queues = new Map();
128
166
  installing = Promise.resolve();
167
+ installs = new Map();
129
168
  readings = new Map();
130
169
  reads = new Map();
170
+ starts = 0;
131
171
  sending = Promise.resolve();
132
172
  sent = null;
133
- constructor(house) {
173
+ refreshing = 0;
174
+ changed;
175
+ constructor(house, changed = () => undefined) {
134
176
  this.house = house;
177
+ this.changed = changed;
178
+ }
179
+ idle() {
180
+ return this.refreshing === 0;
135
181
  }
136
182
  read() {
137
183
  return this.reading.then(() => undefined, () => undefined);
@@ -140,35 +186,45 @@ export class Agents {
140
186
  return this.desired.routes.find((route) => route.agent_id === agentId);
141
187
  }
142
188
  refresh() {
189
+ this.refreshing++;
190
+ this.changed();
143
191
  const reading = this.read().then(async () => {
144
192
  this.desired = await this.house.deliver('/kit/agents/desired', {});
145
193
  return this.desired;
146
194
  });
147
195
  this.reading = reading;
148
- return reading.then(({ agents, transcribe }) => {
196
+ reading
197
+ .then(({ agents, transcribe }) => Promise.all([
149
198
  holdTranscription(transcribe)
150
199
  .then((changed) => (changed ? this.report() : undefined))
151
- .catch(logged);
200
+ .catch(logged),
152
201
  Promise.all(agents.map((kind) => this.load(kind)))
153
202
  .then(() => this.report())
154
- .catch(logged);
203
+ .catch(logged),
204
+ ]))
205
+ .catch(() => undefined)
206
+ .finally(() => {
207
+ this.refreshing--;
208
+ this.changed();
155
209
  });
210
+ return reading.then(() => undefined);
156
211
  }
157
212
  cli(kind) {
213
+ this.starts += 1;
158
214
  return this.queue(kind, async () => {
159
215
  const resolved = await this.resolve(kind);
160
216
  if (!('cli' in resolved)) {
161
217
  this.update(kind, resolved);
162
- throw new Error(resolved.failure ?? tooOld(kind, resolved.release));
218
+ throw new Error(resolved.failure === null ? tooOld(kind, resolved.release) : NOT_READY);
163
219
  }
164
220
  const { cli, release } = resolved;
165
221
  const known = this.readings.get(kind);
166
222
  const kept = known?.release === null || known?.minimum !== undefined ? SIGNED_OUT : (known ?? SIGNED_OUT);
167
- if (known?.release !== release || known.minimum !== undefined) {
223
+ if (known?.release !== release || known.minimum !== undefined || this.installs.has(kind)) {
168
224
  this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models, modes: kept.modes });
169
225
  }
170
226
  const read = this.nextRead(kind);
171
- offer(kind, cli, kept)
227
+ this.quietOffer(kind, cli, kept)
172
228
  .then((offered) => {
173
229
  const current = this.readings.get(kind);
174
230
  if (this.reads.get(kind) === read && current?.release === release)
@@ -179,7 +235,8 @@ export class Agents {
179
235
  });
180
236
  }
181
237
  located(kind, signal) {
182
- return this.queue(kind, () => this.ensure(kind, signal), signal);
238
+ const owner = {};
239
+ return this.queue(kind, () => this.ensure(kind, signal, owner).finally(() => this.settle(kind, owner)), signal);
183
240
  }
184
241
  async reread(kind) {
185
242
  await this.examine(kind, this.readings.get(kind) ?? SIGNED_OUT, offer);
@@ -187,7 +244,13 @@ export class Agents {
187
244
  }
188
245
  async recheck(kind, signal) {
189
246
  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);
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
+ }
191
254
  if (!signal.aborted)
192
255
  await this.report();
193
256
  }
@@ -201,8 +264,18 @@ export class Agents {
201
264
  this.reads.set(kind, read);
202
265
  return read;
203
266
  }
204
- update(kind, reading) {
267
+ hold(kind, reading) {
205
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);
206
279
  this.report().catch(logged);
207
280
  }
208
281
  queue(kind, work, signal) {
@@ -213,13 +286,15 @@ export class Agents {
213
286
  this.queues.set(kind, queued.catch(() => undefined));
214
287
  return signal === undefined ? queued : Promise.race([queued, ended(signal)]);
215
288
  }
216
- async ensure(kind, signal) {
289
+ async ensure(kind, signal, owner = {}) {
217
290
  const failed = await installAdapter(kind, signal);
218
291
  if (failed !== null)
219
292
  throw new Error(failed);
220
293
  const found = await locate(kind, signal);
221
294
  if (found !== null)
222
295
  return found;
296
+ this.installs.set(kind, owner);
297
+ this.report().catch(logged);
223
298
  const installing = this.installing.catch(() => undefined).then(() => installCli(kind, signal));
224
299
  this.installing = installing;
225
300
  const failure = await installing;
@@ -230,10 +305,10 @@ export class Agents {
230
305
  throw new Error(`the login shell does not find ${CLIS[kind].bin} after its install`);
231
306
  return installed;
232
307
  }
233
- async resolve(kind, signal) {
308
+ async resolve(kind, signal, owner) {
234
309
  let cli;
235
310
  try {
236
- cli = await realpath(await this.ensure(kind, signal));
311
+ cli = await realpath(await this.ensure(kind, signal, owner));
237
312
  }
238
313
  catch (error) {
239
314
  const failure = causeOf(error);
@@ -248,28 +323,40 @@ export class Agents {
248
323
  return { release, minimum, failure: null, ...SIGNED_OUT };
249
324
  return { cli, release };
250
325
  }
251
- async examine(kind, known, read, signal) {
326
+ async examine(kind, known, read, signal, owner) {
252
327
  const current = this.nextRead(kind);
253
- const resolved = await this.queue(kind, () => this.resolve(kind, signal), signal);
328
+ const resolved = await this.queue(kind, () => this.resolve(kind, signal, owner), signal);
254
329
  const reading = 'cli' in resolved ? { release: resolved.release, failure: null, ...(await read(kind, resolved.cli, known)) } : resolved;
255
330
  if (this.reads.get(kind) === current && !signal?.aborted)
256
- this.readings.set(kind, reading);
331
+ this.hold(kind, reading);
332
+ }
333
+ async quietOffer(kind, cli, known) {
334
+ for (let seen = -1; seen !== this.starts;) {
335
+ seen = this.starts;
336
+ await delay(MODEL_PROBE_QUIET_MS);
337
+ }
338
+ return offer(kind, cli, known);
257
339
  }
258
340
  async load(kind) {
259
341
  const known = this.readings.get(kind);
260
342
  if (known !== undefined && known.failure === null && known.minimum === undefined)
261
343
  return;
262
- 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();
263
346
  }
264
347
  async send() {
265
348
  const agents = this.desired.agents.flatMap((kind) => {
266
- const reading = this.readings.get(kind);
349
+ const reading = this.installs.has(kind) ? INSTALLING : this.readings.get(kind);
267
350
  return reading === undefined ? [] : [reported(kind, reading)];
268
351
  });
269
352
  const hostKey = await sshHostKey();
353
+ const form = await hostForm();
270
354
  const body = {
271
355
  os: await operatingSystem(),
272
- kit_version: KIT_VERSION,
356
+ ...(form === undefined ? {} : { form }),
357
+ kit_release: KIT_RELEASE,
358
+ wire: KIT_WIRE,
359
+ updates_itself: await updatesItself(),
273
360
  agent_base: agentBase(),
274
361
  agents,
275
362
  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);
package/dist/app-git.js CHANGED
@@ -1,15 +1,9 @@
1
- import { extname, resolve } from 'node:path';
2
- import { fileURLToPath } from 'node:url';
3
1
  import { run } from './git.js';
4
2
  import { kitHome, readOwnAgent } from './home.js';
5
- import { quoted } from './shell.js';
3
+ const HELPER = '!kit git-credential';
6
4
  function section(house) {
7
5
  return `credential.${new URL('/app/', house).href}`;
8
6
  }
9
- function helper() {
10
- const main = fileURLToPath(new URL(`./kit-main${extname(fileURLToPath(import.meta.url))}`, import.meta.url));
11
- return `!HOUSE_KIT_HOME=${quoted(resolve(kitHome()))} ${quoted(process.execPath)} ${quoted(main)} git-credential`;
12
- }
13
7
  async function configured(args) {
14
8
  try {
15
9
  return await run(kitHome(), ['config', '--global', ...args]);
@@ -20,30 +14,18 @@ async function configured(args) {
20
14
  throw error;
21
15
  }
22
16
  }
23
- async function forget(house) {
24
- await configured(['--remove-section', section(house)]);
25
- }
26
- async function register(house) {
27
- await forget(house);
28
- for (const value of ['', helper()]) {
29
- const ran = await configured(['--add', `${section(house)}.helper`, value]);
17
+ export async function placeAppGit(ownAgent) {
18
+ if (ownAgent === null)
19
+ return;
20
+ await configured(['--remove-section', section(ownAgent.house)]);
21
+ for (const value of ['', HELPER]) {
22
+ const ran = await configured(['--add', `${section(ownAgent.house)}.helper`, value]);
30
23
  if (ran === null)
31
24
  return;
32
25
  if (ran.status !== 0)
33
26
  throw new Error(`git config failed: ${ran.stderr.trim()}`);
34
27
  }
35
28
  }
36
- export async function placeAppGit(before, after) {
37
- if (before !== null && before.house !== after?.house)
38
- await forget(before.house);
39
- if (after !== null)
40
- await register(after.house);
41
- }
42
- export async function forgetAppGit() {
43
- const ownAgent = await readOwnAgent();
44
- if (ownAgent !== null)
45
- await forget(ownAgent.house);
46
- }
47
29
  export async function answerGitCredential(operation) {
48
30
  let asked = '';
49
31
  for await (const chunk of process.stdin)
@@ -55,8 +37,10 @@ export async function answerGitCredential(operation) {
55
37
  .filter((line) => line.includes('='))
56
38
  .map((line) => [line.slice(0, line.indexOf('=')), line.slice(line.indexOf('=') + 1)]));
57
39
  const ownAgent = await readOwnAgent();
58
- if (ownAgent === null)
40
+ if (ownAgent === null) {
41
+ process.stderr.write(`kit: Kit home ${kitHome()} is not signed in; run kit login\n`);
59
42
  return;
43
+ }
60
44
  const house = new URL(ownAgent.house);
61
45
  if (attributes.get('protocol') !== house.protocol.slice(0, -1) || attributes.get('host') !== house.host)
62
46
  return;
@@ -1,10 +1,10 @@
1
- import { setGlobalProxyFromEnv } from 'node:http';
2
1
  import { HouseRefusal, post } from './api.js';
3
2
  import { readEnrolment } from './home.js';
3
+ import { proxyUnlessRelayed } from './relay.js';
4
4
  function unanswered(error) {
5
5
  return error instanceof HouseRefusal ? error.status >= 500 : error instanceof TypeError && error.message === 'fetch failed';
6
6
  }
7
- setGlobalProxyFromEnv();
7
+ proxyUnlessRelayed();
8
8
  try {
9
9
  const { house, credential } = (await readEnrolment());
10
10
  try {