@agentshouse/kit 0.2.1-c30728be20485 → 0.2.1-c35516351ef49

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 (99) hide show
  1. package/README.md +27 -26
  2. package/dist/acp.js +16 -93
  3. package/dist/agents.js +119 -34
  4. package/dist/api.js +9 -5
  5. package/dist/app-git.js +64 -0
  6. package/dist/bootstrap.json +4 -4
  7. package/dist/bridge.js +11 -37
  8. package/dist/chatgpt.js +32 -0
  9. package/dist/clis.js +116 -70
  10. package/dist/codex-main.js +58 -0
  11. package/dist/conversations.js +301 -237
  12. package/dist/copies.js +145 -110
  13. package/dist/end.js +18 -4
  14. package/dist/enrol-main.js +7 -1
  15. package/dist/events.js +524 -0
  16. package/dist/files.js +21 -1
  17. package/dist/git.js +11 -8
  18. package/dist/home.js +81 -6
  19. package/dist/house-cli.js +291 -0
  20. package/dist/house-main.js +7 -159
  21. package/dist/instructions.js +9 -32
  22. package/dist/kit-cli.js +68 -0
  23. package/dist/kit-main.js +8 -19
  24. package/dist/login.js +118 -103
  25. package/dist/logout.js +16 -13
  26. package/dist/parts.js +82 -0
  27. package/dist/placement.js +48 -0
  28. package/dist/relay.js +12 -2
  29. package/dist/resident.js +38 -27
  30. package/dist/scope.js +203 -0
  31. package/dist/service-main.js +9 -0
  32. package/dist/service.js +33 -0
  33. package/dist/shell.js +3 -0
  34. package/dist/sign-in.js +34 -10
  35. package/dist/skills.js +81 -12
  36. package/dist/stream.js +66 -15
  37. package/dist/transcription.js +57 -11
  38. package/dist/update.js +28 -6
  39. package/dist/wire.js +6 -0
  40. package/dist/work.js +348 -0
  41. package/how-we-work.md +13 -3
  42. package/package.json +3 -2
  43. package/skills/ask-matt/SKILL.md +17 -11
  44. package/skills/ask-matt/agents/openai.yaml +1 -0
  45. package/skills/code-review/SKILL.md +5 -5
  46. package/skills/codebase-design/DESIGN-IT-TWICE.md +1 -1
  47. package/skills/codebase-design/SKILL.md +0 -2
  48. package/skills/diagnosing-bugs/SKILL.md +2 -4
  49. package/skills/domain-modeling/{CONTEXT-FORMAT.md → GLOSSARY-FORMAT.md} +10 -10
  50. package/skills/domain-modeling/SKILL.md +12 -14
  51. package/skills/grill-me/SKILL.md +1 -2
  52. package/skills/grill-me/agents/openai.yaml +1 -0
  53. package/skills/grill-with-docs/SKILL.md +1 -2
  54. package/skills/grill-with-docs/agents/openai.yaml +1 -0
  55. package/skills/grilling/SKILL.md +2 -2
  56. package/skills/handoff/SKILL.md +2 -3
  57. package/skills/handoff/agents/openai.yaml +1 -0
  58. package/skills/implement/SKILL.md +5 -4
  59. package/skills/implement/agents/openai.yaml +1 -0
  60. package/skills/implement-spec/SKILL.md +40 -0
  61. package/skills/implement-spec/agents/openai.yaml +5 -0
  62. package/skills/improve-codebase-architecture/SKILL.md +6 -7
  63. package/skills/improve-codebase-architecture/agents/openai.yaml +1 -0
  64. package/skills/pr/CREDITS.md +3 -0
  65. package/skills/pr/LICENSE +21 -0
  66. package/skills/pr/SKILL.md +170 -0
  67. package/skills/pr/agents/openai.yaml +3 -0
  68. package/skills/prototype/SKILL.md +0 -2
  69. package/skills/research/SKILL.md +0 -2
  70. package/skills/retro/LICENSE +21 -0
  71. package/skills/retro/SKILL.md +44 -0
  72. package/skills/retro/agents/openai.yaml +5 -0
  73. package/skills/tdd/SKILL.md +2 -4
  74. package/skills/teach/SKILL.md +3 -4
  75. package/skills/teach/agents/openai.yaml +1 -0
  76. package/skills/to-questionnaire/SKILL.md +1 -2
  77. package/skills/to-questionnaire/agents/openai.yaml +1 -0
  78. package/skills/to-spec/SKILL.md +1 -2
  79. package/skills/to-spec/agents/openai.yaml +1 -0
  80. package/skills/to-tickets/SKILL.md +3 -4
  81. package/skills/to-tickets/agents/openai.yaml +1 -0
  82. package/skills/triage/AGENT-BRIEF.md +207 -0
  83. package/skills/triage/LICENSE +21 -0
  84. package/skills/triage/OUT-OF-SCOPE.md +105 -0
  85. package/skills/triage/SKILL.md +112 -0
  86. package/skills/triage/agents/openai.yaml +5 -0
  87. package/skills/wait-what/SKILL.md +2 -3
  88. package/skills/wait-what/agents/openai.yaml +1 -0
  89. package/skills/wayfinder/SKILL.md +5 -6
  90. package/skills/wayfinder/agents/openai.yaml +1 -0
  91. package/skills/wizard/LICENSE +21 -0
  92. package/skills/wizard/SKILL.md +44 -0
  93. package/skills/wizard/agents/openai.yaml +3 -0
  94. package/skills/wizard/template.sh +223 -0
  95. package/skills/writing-for-agents/SKILL.md +0 -2
  96. package/dist/blocks.js +0 -51
  97. package/skills/resolving-merge-conflicts/SKILL.md +0 -16
  98. package/skills/resolving-merge-conflicts/agents/openai.yaml +0 -3
  99. /package/skills/{resolving-merge-conflicts → implement-spec}/LICENSE +0 -0
package/README.md CHANGED
@@ -1,14 +1,12 @@
1
1
  # House Kit
2
2
 
3
- House Kit connects an Environment, a Linux computer or server, to
4
- [agents.house](https://agents.house). It runs your Agents' conversations
5
- through the agent CLIs you chose and gives each Agent the `house` command.
3
+ House Kit connects an Environment, a Linux computer or server, to [agents.house](https://agents.house). It runs
4
+ your Agents' conversations through the agent CLIs you chose and gives each Agent the `house` command.
6
5
 
7
6
  ## Install
8
7
 
9
- Run `curl -fsSL agents.house/kit | sh`, or `irm agents.house/kit.ps1 | iex` on
10
- Windows, and again to update; options follow `sh -s --`. On macOS and Linux it
11
- installs House Kit natively under your own account, without an admin password,
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,
12
10
  as a service that runs while you are logged in. `kit` and `house` are then on
13
11
  your login shell's `PATH`, and your workspace is `~/AgentsHouse` unless you
14
12
  pass `--workspace <path>`.
@@ -20,7 +18,7 @@ workspace. On Windows 11 the container is the one choice. Append a `kit` or
20
18
  Running the command for the other choice on a connected computer asks you to
21
19
  confirm, then replaces its Environment, whose Agents end, with a new one.
22
20
 
23
- On your own Ubuntu 26.04 server, run the Linux command with `--linux` to
21
+ On your own Linux server, run the Linux command with `--linux` to
24
22
  install House Kit natively, with its workspace at `/agents/house`; `kit` and
25
23
  `house` are then on the server's `PATH`.
26
24
 
@@ -33,27 +31,30 @@ 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`.
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, until you revoke
41
+ that connection on Connections. `house help` lists the Tools. Codex sessions started after a
42
+ login run a lone `house` command outside their sandbox. `kit logout` disconnects this
43
+ computer, stops House Kit and ends your own agent's connection, so `house` and `git` no
44
+ longer act as you here; a later `kit login` reconnects the same Environment, or connects
45
+ this computer as a new one when House no longer holds it.
46
+ In a container you do not control, such as ChatGPT's, `npm i -g @agentshouse/kit` and `kit chatgpt --key <key>` with a key made on Connections let `house <tool>` act as you, starting and configuring nothing else.
47
+
48
+ `kit resident` keeps the Environment connected and, as it connects, copies the text of each Room
49
+ you chose for it as a Git repository in the workspace's `local-copies`. `house fetch` records
50
+ House's changes on each copy's `refs/house/received`; rebase onto it, commit and run
51
+ `house push --owner` in the copy, through the install command in the container. An Agent runs
52
+ both, without `--owner`. `house upload` and `house download` move a Room's other files.
50
53
 
51
54
  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`.
55
+ computer before the Agent reads it. While transcription is on, the speech
56
+ engine and model use about 425 MB beside the Environment's credential; turning it off deletes them.
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. The skills come from [mattpocock/skills](https://github.com/mattpocock/skills); thank you, Matt Pocock.
package/dist/acp.js CHANGED
@@ -1,18 +1,21 @@
1
1
  import { ndJsonStream, PROTOCOL_VERSION, } from '@agentclientprotocol/sdk';
2
- import { execFileSync, spawn } from 'node:child_process';
3
- import { readdirSync, readFileSync } from 'node:fs';
2
+ import { spawn } from 'node:child_process';
4
3
  import { Readable, Writable } from 'node:stream';
5
4
  import { CLIS, KIT_VERSION, adapterCommand, withoutProxy } from './clis.js';
6
- export const TURN_STARTED = 'kit/turn_started';
7
- export const TURN_ENDED = 'kit/turn_ended';
8
- export async function startAdapter(kind, cli, cwd, app, jobs = () => undefined, added = {}) {
5
+ import { killTree } from './scope.js';
6
+ export async function startAdapter(kind, cli, cwd, app, events = () => undefined, added = {}, signal, scope = null) {
9
7
  const adapter = CLIS[kind].adapter;
10
- const child = spawn(adapter === null ? cli : adapterCommand(kind), CLIS[kind].args, {
8
+ const started = [adapter === null ? cli : adapterCommand(kind), CLIS[kind].args];
9
+ const [command, args] = scope?.command(...started) ?? started;
10
+ const child = spawn(command, args, {
11
11
  cwd,
12
12
  env: { ...withoutProxy(), ...(adapter === null ? {} : { ...adapter.env, [adapter.executable]: cli }), ...added },
13
13
  stdio: ['pipe', 'pipe', 'pipe'],
14
14
  detached: true,
15
15
  });
16
+ const stop = () => killTree(child);
17
+ signal?.addEventListener('abort', stop, { once: true });
18
+ child.on('exit', () => signal?.removeEventListener('abort', stop));
16
19
  let stderr = '';
17
20
  child.stderr.on('data', (chunk) => {
18
21
  stderr = (stderr + chunk.toString('utf8')).slice(-4000);
@@ -29,16 +32,11 @@ export async function startAdapter(kind, cli, cwd, app, jobs = () => undefined,
29
32
  writable: stream.writable,
30
33
  readable: stream.readable.pipeThrough(new TransformStream({
31
34
  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_'))
35
+ const read = message;
36
+ events(read);
37
+ if (read.id !== undefined || (read.method !== 'session/update' && !read.method.startsWith('_'))) {
37
38
  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 });
39
+ }
42
40
  },
43
41
  })),
44
42
  });
@@ -50,10 +48,12 @@ export async function startAdapter(kind, cli, cwd, app, jobs = () => undefined,
50
48
  fs: { readTextFile: false, writeTextFile: false },
51
49
  terminal: false,
52
50
  elicitation: { form: {} },
53
- _meta: { jetbrains: { air: { version: 1, capabilities: ['asyncTasks'] } } },
51
+ session: { compaction: {}, notices: {} },
52
+ _meta: { jetbrains: { air: { version: 1, capabilities: CLIS[kind].air } } },
54
53
  },
55
54
  clientInfo: { name: '@agentshouse/kit', version: KIT_VERSION },
56
55
  });
56
+ scope?.entered(child.pid);
57
57
  return { child, connection, initialized, exited };
58
58
  }
59
59
  catch (error) {
@@ -61,80 +61,3 @@ export async function startAdapter(kind, cli, cwd, app, jobs = () => undefined,
61
61
  throw error;
62
62
  }
63
63
  }
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,8 +1,15 @@
1
1
  import { client } from '@agentclientprotocol/sdk';
2
2
  import { readFile, realpath } from 'node:fs/promises';
3
- import { killTree, startAdapter } from './acp.js';
3
+ import { setTimeout as delay } from 'node:timers/promises';
4
+ import { startAdapter } from './acp.js';
4
5
  import { CLIS, KIT_VERSION, below, installAdapter, installCli, locate, run, versionOf } from './clis.js';
5
6
  import { agentBase, kitHome } from './home.js';
7
+ import { updatesItself } from './placement.js';
8
+ import { killTree } from './scope.js';
9
+ import { holdTranscription, transcriptionReport } from './transcription.js';
10
+ import { KIT_WIRE } from './wire.js';
11
+ // Two quiet seconds let a fresh conversation start before background model discovery competes for its CPU.
12
+ const MODEL_PROBE_QUIET_MS = 2_000;
6
13
  const SIGNED_OUT = { signed_in: false, models: [], modes: [] };
7
14
  function select(options, category) {
8
15
  const option = options.find((candidate) => candidate.category === category);
@@ -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,
@@ -109,18 +141,41 @@ async function operatingSystem() {
109
141
  const release = await readFile('/etc/os-release', 'utf8');
110
142
  return /^PRETTY_NAME="?([^"\n]*)"?$/m.exec(release)?.[1] ?? release;
111
143
  }
144
+ async function hostForm() {
145
+ if (process.platform === 'darwin') {
146
+ const battery = await run('pmset', ['-g', 'batt'], 10_000);
147
+ return battery.status === 0 && battery.output.includes('InternalBattery') ? 'laptop' : 'desktop';
148
+ }
149
+ if (process.platform !== 'linux')
150
+ return undefined;
151
+ const [container, version, chassis] = await Promise.all([
152
+ readFile('/.dockerenv', 'utf8').then(() => true).catch(() => false),
153
+ readFile('/proc/version', 'utf8').catch(() => ''),
154
+ readFile('/sys/class/dmi/id/chassis_type', 'utf8').catch(() => ''),
155
+ ]);
156
+ if (container && hostVm(version))
157
+ return undefined;
158
+ return chassisForm(chassis);
159
+ }
112
160
  export class Agents {
113
- desired = { agents: [], routes: [] };
161
+ desired = { agents: [], routes: [], transcribe: false };
114
162
  house;
115
163
  reading = Promise.resolve();
116
164
  queues = new Map();
117
165
  installing = Promise.resolve();
118
166
  readings = new Map();
119
167
  reads = new Map();
168
+ starts = 0;
120
169
  sending = Promise.resolve();
121
170
  sent = null;
122
- constructor(house) {
171
+ refreshing = 0;
172
+ changed;
173
+ constructor(house, changed = () => undefined) {
123
174
  this.house = house;
175
+ this.changed = changed;
176
+ }
177
+ idle() {
178
+ return this.refreshing === 0;
124
179
  }
125
180
  read() {
126
181
  return this.reading.then(() => undefined, () => undefined);
@@ -129,18 +184,31 @@ export class Agents {
129
184
  return this.desired.routes.find((route) => route.agent_id === agentId);
130
185
  }
131
186
  refresh() {
187
+ this.refreshing++;
188
+ this.changed();
132
189
  const reading = this.read().then(async () => {
133
190
  this.desired = await this.house.deliver('/kit/agents/desired', {});
134
191
  return this.desired;
135
192
  });
136
193
  this.reading = reading;
137
- return reading.then(({ agents }) => {
194
+ reading
195
+ .then(({ agents, transcribe }) => Promise.all([
196
+ holdTranscription(transcribe)
197
+ .then((changed) => (changed ? this.report() : undefined))
198
+ .catch(logged),
138
199
  Promise.all(agents.map((kind) => this.load(kind)))
139
200
  .then(() => this.report())
140
- .catch(logged);
201
+ .catch(logged),
202
+ ]))
203
+ .catch(() => undefined)
204
+ .finally(() => {
205
+ this.refreshing--;
206
+ this.changed();
141
207
  });
208
+ return reading.then(() => undefined);
142
209
  }
143
210
  cli(kind) {
211
+ this.starts += 1;
144
212
  return this.queue(kind, async () => {
145
213
  const resolved = await this.resolve(kind);
146
214
  if (!('cli' in resolved)) {
@@ -154,7 +222,7 @@ export class Agents {
154
222
  this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models, modes: kept.modes });
155
223
  }
156
224
  const read = this.nextRead(kind);
157
- offer(kind, cli, kept)
225
+ this.quietOffer(kind, cli, kept)
158
226
  .then((offered) => {
159
227
  const current = this.readings.get(kind);
160
228
  if (this.reads.get(kind) === read && current?.release === release)
@@ -164,17 +232,18 @@ export class Agents {
164
232
  return cli;
165
233
  });
166
234
  }
167
- located(kind) {
168
- return this.queue(kind, () => this.ensure(kind));
235
+ located(kind, signal) {
236
+ return this.queue(kind, () => this.ensure(kind, signal), signal);
169
237
  }
170
238
  async reread(kind) {
171
239
  await this.examine(kind, this.readings.get(kind) ?? SIGNED_OUT, offer);
172
240
  await this.report();
173
241
  }
174
- async recheck(kind) {
242
+ async recheck(kind, signal) {
175
243
  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();
244
+ await this.examine(kind, known, async (kind, cli) => ((await signedIn(kind, cli, known, signal)) ? { ...known, signed_in: true } : SIGNED_OUT), signal);
245
+ if (!signal.aborted)
246
+ await this.report();
178
247
  }
179
248
  report() {
180
249
  const sending = this.sending.catch(() => undefined).then(() => this.send());
@@ -190,39 +259,42 @@ export class Agents {
190
259
  this.readings.set(kind, reading);
191
260
  this.report().catch(logged);
192
261
  }
193
- queue(kind, work) {
194
- const queued = (this.queues.get(kind) ?? Promise.resolve()).then(work);
262
+ queue(kind, work, signal) {
263
+ const queued = (this.queues.get(kind) ?? Promise.resolve()).then(() => {
264
+ signal?.throwIfAborted();
265
+ return work();
266
+ });
195
267
  this.queues.set(kind, queued.catch(() => undefined));
196
- return queued;
268
+ return signal === undefined ? queued : Promise.race([queued, ended(signal)]);
197
269
  }
198
- async ensure(kind) {
199
- const failed = await installAdapter(kind);
270
+ async ensure(kind, signal) {
271
+ const failed = await installAdapter(kind, signal);
200
272
  if (failed !== null)
201
273
  throw new Error(failed);
202
- const found = await locate(kind);
274
+ const found = await locate(kind, signal);
203
275
  if (found !== null)
204
276
  return found;
205
- const installing = this.installing.catch(() => undefined).then(() => installCli(kind));
277
+ const installing = this.installing.catch(() => undefined).then(() => installCli(kind, signal));
206
278
  this.installing = installing;
207
279
  const failure = await installing;
208
280
  if (failure !== null)
209
281
  throw new Error(failure);
210
- const installed = await locate(kind);
282
+ const installed = await locate(kind, signal);
211
283
  if (installed === null)
212
284
  throw new Error(`the login shell does not find ${CLIS[kind].bin} after its install`);
213
285
  return installed;
214
286
  }
215
- async resolve(kind) {
287
+ async resolve(kind, signal) {
216
288
  let cli;
217
289
  try {
218
- cli = await realpath(await this.ensure(kind));
290
+ cli = await realpath(await this.ensure(kind, signal));
219
291
  }
220
292
  catch (error) {
221
293
  const failure = causeOf(error);
222
294
  process.stderr.write(`kit: ${kind} did not install: ${failure}\n`);
223
295
  return { release: null, failure, ...SIGNED_OUT };
224
296
  }
225
- const release = await versionOf(cli);
297
+ const release = await versionOf(cli, signal);
226
298
  if (release === null)
227
299
  return { release: null, failure: `${cli} --version names no version`, ...SIGNED_OUT };
228
300
  const minimum = CLIS[kind].minimum;
@@ -230,18 +302,26 @@ export class Agents {
230
302
  return { release, minimum, failure: null, ...SIGNED_OUT };
231
303
  return { cli, release };
232
304
  }
233
- async examine(kind, known, read) {
305
+ async examine(kind, known, read, signal) {
234
306
  const current = this.nextRead(kind);
235
- const resolved = await this.queue(kind, () => this.resolve(kind));
307
+ const resolved = await this.queue(kind, () => this.resolve(kind, signal), signal);
236
308
  const reading = 'cli' in resolved ? { release: resolved.release, failure: null, ...(await read(kind, resolved.cli, known)) } : resolved;
237
- if (this.reads.get(kind) === current)
309
+ if (this.reads.get(kind) === current && !signal?.aborted)
238
310
  this.readings.set(kind, reading);
239
311
  }
312
+ async quietOffer(kind, cli, known) {
313
+ for (let seen = -1; seen !== this.starts;) {
314
+ seen = this.starts;
315
+ await delay(MODEL_PROBE_QUIET_MS);
316
+ }
317
+ return offer(kind, cli, known);
318
+ }
240
319
  async load(kind) {
241
320
  const known = this.readings.get(kind);
242
- if (known !== undefined && known.failure === null)
321
+ if (known !== undefined && known.failure === null && known.minimum === undefined)
243
322
  return;
244
- await this.examine(kind, SIGNED_OUT, offer);
323
+ await this.examine(kind, SIGNED_OUT, (kind, cli, known) => this.quietOffer(kind, cli, known));
324
+ await this.report();
245
325
  }
246
326
  async send() {
247
327
  const agents = this.desired.agents.flatMap((kind) => {
@@ -249,11 +329,16 @@ export class Agents {
249
329
  return reading === undefined ? [] : [reported(kind, reading)];
250
330
  });
251
331
  const hostKey = await sshHostKey();
332
+ const form = await hostForm();
252
333
  const body = {
253
334
  os: await operatingSystem(),
335
+ ...(form === undefined ? {} : { form }),
254
336
  kit_version: KIT_VERSION,
337
+ wire: KIT_WIRE,
338
+ updates_itself: await updatesItself(),
255
339
  agent_base: agentBase(),
256
340
  agents,
341
+ transcription: transcriptionReport(),
257
342
  ...(hostKey === null ? {} : { ssh_host_key: hostKey }),
258
343
  };
259
344
  const state = JSON.stringify(body);
package/dist/api.js CHANGED
@@ -1,8 +1,9 @@
1
1
  import { setTimeout as delay } from 'node:timers/promises';
2
- import { end, SIGN_IN_AGAIN } from './end.js';
2
+ import { signInAgain, updateRequired } from './end.js';
3
3
  import { readEnrolment } from './home.js';
4
4
  import { retryable } from './refusals.js';
5
5
  import { relayed } from './relay.js';
6
+ import { KIT_WIRE, KIT_WIRE_HEADER, tooOld } from './wire.js';
6
7
  export class HouseRefusal extends Error {
7
8
  status;
8
9
  text;
@@ -19,7 +20,7 @@ export function retryDelay(attempt) {
19
20
  // Full jitter, doubling from one second to a 30-second cap, spreads the Kits one outage dropped and retries within half a minute of House's return.
20
21
  return Math.random() * Math.min(30_000, 1000 * 2 ** attempt);
21
22
  }
22
- export async function retrying(sent, signal) {
23
+ export async function retrying(sent, signal, pause = retryDelay) {
23
24
  for (let attempt = 0;; attempt++) {
24
25
  try {
25
26
  return await sent();
@@ -28,8 +29,8 @@ export async function retrying(sent, signal) {
28
29
  if (!(error instanceof HouseRefusal) || retryable(error.text) !== true)
29
30
  throw error;
30
31
  }
31
- // A request House refused as retryable is sent again on the jittered curve.
32
- await delay(retryDelay(attempt), undefined, { signal });
32
+ // A request House refused as retryable is sent again after the caller's pause, the jittered curve unless it names its own.
33
+ await delay(pause(attempt), undefined, { signal });
33
34
  }
34
35
  }
35
36
  export async function post(house, path, body, credential, signal) {
@@ -37,12 +38,15 @@ export async function post(house, path, body, credential, signal) {
37
38
  method: 'POST',
38
39
  headers: {
39
40
  'content-type': 'application/json',
41
+ [KIT_WIRE_HEADER]: String(KIT_WIRE),
40
42
  ...(credential === undefined ? {} : { authorization: `Bearer ${credential}` }),
41
43
  },
42
44
  body: JSON.stringify(body),
43
45
  signal,
44
46
  });
45
47
  const text = await answer.text();
48
+ if (!answer.ok && tooOld(text))
49
+ updateRequired(house);
46
50
  if (!answer.ok)
47
51
  throw new HouseRefusal(path, answer.status, text);
48
52
  return JSON.parse(text);
@@ -54,7 +58,7 @@ async function enrolledPost(path, body, signal) {
54
58
  }
55
59
  catch (error) {
56
60
  if (error instanceof HouseRefusal && error.status === 401)
57
- end(SIGN_IN_AGAIN);
61
+ await signInAgain(credential);
58
62
  throw error;
59
63
  }
60
64
  }
@@ -0,0 +1,64 @@
1
+ import { extname, resolve } from 'node:path';
2
+ import { fileURLToPath } from 'node:url';
3
+ import { run } from './git.js';
4
+ import { kitHome, readOwnAgent } from './home.js';
5
+ import { quoted } from './shell.js';
6
+ function section(house) {
7
+ return `credential.${new URL('/app/', house).href}`;
8
+ }
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
+ async function configured(args) {
14
+ try {
15
+ return await run(kitHome(), ['config', '--global', ...args]);
16
+ }
17
+ catch (error) {
18
+ if (error.code === 'ENOENT')
19
+ return null;
20
+ throw error;
21
+ }
22
+ }
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]);
30
+ if (ran === null)
31
+ return;
32
+ if (ran.status !== 0)
33
+ throw new Error(`git config failed: ${ran.stderr.trim()}`);
34
+ }
35
+ }
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
+ export async function answerGitCredential(operation) {
48
+ let asked = '';
49
+ for await (const chunk of process.stdin)
50
+ asked += String(chunk);
51
+ if (operation !== 'get')
52
+ return;
53
+ const attributes = new Map(asked
54
+ .split('\n')
55
+ .filter((line) => line.includes('='))
56
+ .map((line) => [line.slice(0, line.indexOf('=')), line.slice(line.indexOf('=') + 1)]));
57
+ const ownAgent = await readOwnAgent();
58
+ if (ownAgent === null)
59
+ return;
60
+ const house = new URL(ownAgent.house);
61
+ if (attributes.get('protocol') !== house.protocol.slice(0, -1) || attributes.get('host') !== house.host)
62
+ return;
63
+ process.stdout.write(`username=house\npassword=${ownAgent.credential}\n`);
64
+ }