@agentshouse/kit 0.2.1-c23b83622c698 → 0.2.1-c2997cbe74597

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 (101) hide show
  1. package/README.md +27 -26
  2. package/dist/acp.js +16 -93
  3. package/dist/agents.js +109 -32
  4. package/dist/api.js +34 -2
  5. package/dist/app-git.js +64 -0
  6. package/dist/bootstrap.json +4 -4
  7. package/dist/bridge.js +33 -51
  8. package/dist/chatgpt.js +32 -0
  9. package/dist/clis.js +118 -70
  10. package/dist/codex-main.js +58 -0
  11. package/dist/conversations.js +294 -237
  12. package/dist/copies.js +148 -115
  13. package/dist/end.js +22 -0
  14. package/dist/enrol-main.js +7 -1
  15. package/dist/events.js +521 -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 +109 -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/refusals.js +12 -0
  29. package/dist/relay.js +12 -2
  30. package/dist/resident.js +38 -27
  31. package/dist/scope.js +203 -0
  32. package/dist/secret-input.js +3 -2
  33. package/dist/service-main.js +9 -0
  34. package/dist/service.js +33 -0
  35. package/dist/shell.js +3 -0
  36. package/dist/sign-in.js +34 -10
  37. package/dist/skills.js +81 -12
  38. package/dist/stream.js +87 -11
  39. package/dist/transcription.js +57 -9
  40. package/dist/update.js +30 -6
  41. package/dist/wire.js +6 -0
  42. package/dist/work.js +348 -0
  43. package/how-we-work.md +13 -3
  44. package/package.json +3 -2
  45. package/skills/ask-matt/SKILL.md +17 -11
  46. package/skills/ask-matt/agents/openai.yaml +1 -0
  47. package/skills/code-review/SKILL.md +5 -5
  48. package/skills/codebase-design/DESIGN-IT-TWICE.md +1 -1
  49. package/skills/codebase-design/SKILL.md +0 -2
  50. package/skills/diagnosing-bugs/SKILL.md +2 -4
  51. package/skills/domain-modeling/{CONTEXT-FORMAT.md → GLOSSARY-FORMAT.md} +10 -10
  52. package/skills/domain-modeling/SKILL.md +12 -14
  53. package/skills/grill-me/SKILL.md +1 -2
  54. package/skills/grill-me/agents/openai.yaml +1 -0
  55. package/skills/grill-with-docs/SKILL.md +1 -2
  56. package/skills/grill-with-docs/agents/openai.yaml +1 -0
  57. package/skills/grilling/SKILL.md +2 -2
  58. package/skills/handoff/SKILL.md +2 -3
  59. package/skills/handoff/agents/openai.yaml +1 -0
  60. package/skills/implement/SKILL.md +5 -4
  61. package/skills/implement/agents/openai.yaml +1 -0
  62. package/skills/implement-spec/SKILL.md +40 -0
  63. package/skills/implement-spec/agents/openai.yaml +5 -0
  64. package/skills/improve-codebase-architecture/SKILL.md +6 -7
  65. package/skills/improve-codebase-architecture/agents/openai.yaml +1 -0
  66. package/skills/pr/CREDITS.md +3 -0
  67. package/skills/pr/LICENSE +21 -0
  68. package/skills/pr/SKILL.md +170 -0
  69. package/skills/pr/agents/openai.yaml +3 -0
  70. package/skills/prototype/SKILL.md +0 -2
  71. package/skills/research/SKILL.md +0 -2
  72. package/skills/retro/LICENSE +21 -0
  73. package/skills/retro/SKILL.md +44 -0
  74. package/skills/retro/agents/openai.yaml +5 -0
  75. package/skills/tdd/SKILL.md +2 -4
  76. package/skills/teach/SKILL.md +3 -4
  77. package/skills/teach/agents/openai.yaml +1 -0
  78. package/skills/to-questionnaire/SKILL.md +1 -2
  79. package/skills/to-questionnaire/agents/openai.yaml +1 -0
  80. package/skills/to-spec/SKILL.md +1 -2
  81. package/skills/to-spec/agents/openai.yaml +1 -0
  82. package/skills/to-tickets/SKILL.md +3 -4
  83. package/skills/to-tickets/agents/openai.yaml +1 -0
  84. package/skills/triage/AGENT-BRIEF.md +207 -0
  85. package/skills/triage/LICENSE +21 -0
  86. package/skills/triage/OUT-OF-SCOPE.md +105 -0
  87. package/skills/triage/SKILL.md +112 -0
  88. package/skills/triage/agents/openai.yaml +5 -0
  89. package/skills/wait-what/SKILL.md +2 -3
  90. package/skills/wait-what/agents/openai.yaml +1 -0
  91. package/skills/wayfinder/SKILL.md +5 -6
  92. package/skills/wayfinder/agents/openai.yaml +1 -0
  93. package/skills/wizard/LICENSE +21 -0
  94. package/skills/wizard/SKILL.md +44 -0
  95. package/skills/wizard/agents/openai.yaml +3 -0
  96. package/skills/wizard/template.sh +223 -0
  97. package/skills/writing-for-agents/SKILL.md +0 -2
  98. package/dist/blocks.js +0 -51
  99. package/skills/resolving-merge-conflicts/SKILL.md +0 -16
  100. package/skills/resolving-merge-conflicts/agents/openai.yaml +0 -3
  101. /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,12 @@
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 { startAdapter } from './acp.js';
4
4
  import { CLIS, KIT_VERSION, below, installAdapter, installCli, locate, run, versionOf } from './clis.js';
5
5
  import { agentBase, kitHome } from './home.js';
6
+ import { updatesItself } from './placement.js';
7
+ import { killTree } from './scope.js';
8
+ import { holdTranscription, transcriptionReport } from './transcription.js';
9
+ import { KIT_WIRE } from './wire.js';
6
10
  const SIGNED_OUT = { signed_in: false, models: [], modes: [] };
7
11
  function select(options, category) {
8
12
  const option = options.find((candidate) => candidate.category === category);
@@ -20,6 +24,22 @@ function causeOf(error) {
20
24
  function logged(error) {
21
25
  process.stderr.write(`kit: ${causeOf(error)}\n`);
22
26
  }
27
+ const LAPTOP_CHASSIS = new Set(['8', '9', '10', '14', '30', '31', '32']);
28
+ const DESKTOP_CHASSIS = new Set(['3', '4', '5', '6', '7', '15', '16']);
29
+ const SERVER_CHASSIS = new Set(['17', '18', '19', '20', '21', '22', '23', '24']);
30
+ export function chassisForm(value) {
31
+ const chassis = value.trim();
32
+ if (LAPTOP_CHASSIS.has(chassis))
33
+ return 'laptop';
34
+ if (DESKTOP_CHASSIS.has(chassis))
35
+ return 'desktop';
36
+ if (SERVER_CHASSIS.has(chassis))
37
+ return 'server';
38
+ return undefined;
39
+ }
40
+ export function hostVm(version) {
41
+ return /docker desktop|microsoft|wsl|linuxkit/i.test(version);
42
+ }
23
43
  async function models(kind, adapter, known) {
24
44
  const agent = adapter.connection.agent;
25
45
  const opened = await agent.request('session/new', { cwd: kitHome(), mcpServers: [] });
@@ -46,19 +66,29 @@ async function models(kind, adapter, known) {
46
66
  }
47
67
  return { models: offered, modes };
48
68
  }
49
- async function signedIn(kind, cli, known) {
69
+ async function signedIn(kind, cli, known, signal) {
50
70
  const probe = CLIS[kind].signedIn;
71
+ // A sign-in check that has not answered in half a minute counts as signed out rather than stalling the report.
51
72
  if ('command' in probe)
52
- return (await run(cli, probe.command, 30_000)).status === 0;
53
- return (await offer(kind, cli, known)).signed_in;
73
+ return (await run(cli, probe.command, 30_000, false, signal)).status === 0;
74
+ return (await offer(kind, cli, known, signal)).signed_in;
75
+ }
76
+ function ended(signal) {
77
+ return new Promise((_, reject) => {
78
+ if (signal.aborted)
79
+ reject(signal.reason);
80
+ signal.addEventListener('abort', () => reject(signal.reason), { once: true });
81
+ });
54
82
  }
55
- async function offer(kind, cli, known) {
83
+ async function offer(kind, cli, known, signal) {
56
84
  const probe = CLIS[kind].signedIn;
57
- if ('command' in probe && (await run(cli, probe.command, 30_000)).status !== 0)
85
+ // A sign-in check that has not answered in half a minute counts as signed out rather than stalling the report.
86
+ if ('command' in probe && (await run(cli, probe.command, 30_000, false, signal)).status !== 0)
58
87
  return SIGNED_OUT;
59
88
  let adapter;
60
89
  try {
61
- adapter = await startAdapter(kind, cli, kitHome(), client({ name: '@agentshouse/kit' }));
90
+ adapter = await startAdapter(kind, cli, kitHome(), client({ name: '@agentshouse/kit' }), () => undefined, {}, signal);
91
+ signal?.throwIfAborted();
62
92
  if ('initializeMeta' in probe) {
63
93
  const method = adapter.initialized._meta?.[probe.initializeMeta];
64
94
  if (typeof method !== 'string' || method.length === 0)
@@ -67,7 +97,8 @@ async function offer(kind, cli, known) {
67
97
  return { signed_in: true, ...(await models(kind, adapter, known.models)) };
68
98
  }
69
99
  catch (error) {
70
- process.stderr.write(`kit: ${kind} did not offer its models: ${causeOf(error)}\n`);
100
+ if (!signal?.aborted)
101
+ process.stderr.write(`kit: ${kind} did not offer its models: ${causeOf(error)}\n`);
71
102
  return {
72
103
  signed_in: adapter === undefined && 'initializeMeta' in probe ? known.signed_in : true,
73
104
  models: known.models,
@@ -96,17 +127,35 @@ function tooOld(kind, release) {
96
127
  return `${cli.bin} ${release} is older than ${cli.minimum}, the oldest this Kit runs`;
97
128
  }
98
129
  async function sshHostKey() {
130
+ // Listing a local host key takes a moment, so ten seconds only bounds a stuck ssh-keygen.
99
131
  const listed = await run('ssh-keygen', ['-l', '-E', 'sha256', '-f', '/etc/ssh/ssh_host_ed25519_key.pub'], 10_000);
100
132
  return listed.status === 0 ? (/^\d+ (SHA256:\S+)/.exec(listed.output)?.[1] ?? null) : null;
101
133
  }
102
134
  async function operatingSystem() {
135
+ // sw_vers answers at once, so ten seconds only bounds a stuck call.
103
136
  if (process.platform === 'darwin')
104
137
  return `macOS ${(await run('sw_vers', ['-productVersion'], 10_000)).output.trim()}`;
105
138
  const release = await readFile('/etc/os-release', 'utf8');
106
139
  return /^PRETTY_NAME="?([^"\n]*)"?$/m.exec(release)?.[1] ?? release;
107
140
  }
141
+ async function hostForm() {
142
+ if (process.platform === 'darwin') {
143
+ const battery = await run('pmset', ['-g', 'batt'], 10_000);
144
+ return battery.status === 0 && battery.output.includes('InternalBattery') ? 'laptop' : 'desktop';
145
+ }
146
+ if (process.platform !== 'linux')
147
+ return undefined;
148
+ const [container, version, chassis] = await Promise.all([
149
+ readFile('/.dockerenv', 'utf8').then(() => true).catch(() => false),
150
+ readFile('/proc/version', 'utf8').catch(() => ''),
151
+ readFile('/sys/class/dmi/id/chassis_type', 'utf8').catch(() => ''),
152
+ ]);
153
+ if (container && hostVm(version))
154
+ return undefined;
155
+ return chassisForm(chassis);
156
+ }
108
157
  export class Agents {
109
- desired = { agents: [], routes: [] };
158
+ desired = { agents: [], routes: [], transcribe: false };
110
159
  house;
111
160
  reading = Promise.resolve();
112
161
  queues = new Map();
@@ -115,8 +164,14 @@ export class Agents {
115
164
  reads = new Map();
116
165
  sending = Promise.resolve();
117
166
  sent = null;
118
- constructor(house) {
167
+ refreshing = 0;
168
+ changed;
169
+ constructor(house, changed = () => undefined) {
119
170
  this.house = house;
171
+ this.changed = changed;
172
+ }
173
+ idle() {
174
+ return this.refreshing === 0;
120
175
  }
121
176
  read() {
122
177
  return this.reading.then(() => undefined, () => undefined);
@@ -125,16 +180,28 @@ export class Agents {
125
180
  return this.desired.routes.find((route) => route.agent_id === agentId);
126
181
  }
127
182
  refresh() {
183
+ this.refreshing++;
184
+ this.changed();
128
185
  const reading = this.read().then(async () => {
129
186
  this.desired = await this.house.deliver('/kit/agents/desired', {});
130
187
  return this.desired;
131
188
  });
132
189
  this.reading = reading;
133
- return reading.then(({ agents }) => {
190
+ reading
191
+ .then(({ agents, transcribe }) => Promise.all([
192
+ holdTranscription(transcribe)
193
+ .then((changed) => (changed ? this.report() : undefined))
194
+ .catch(logged),
134
195
  Promise.all(agents.map((kind) => this.load(kind)))
135
196
  .then(() => this.report())
136
- .catch(logged);
197
+ .catch(logged),
198
+ ]))
199
+ .catch(() => undefined)
200
+ .finally(() => {
201
+ this.refreshing--;
202
+ this.changed();
137
203
  });
204
+ return reading.then(() => undefined);
138
205
  }
139
206
  cli(kind) {
140
207
  return this.queue(kind, async () => {
@@ -160,17 +227,18 @@ export class Agents {
160
227
  return cli;
161
228
  });
162
229
  }
163
- located(kind) {
164
- return this.queue(kind, () => this.ensure(kind));
230
+ located(kind, signal) {
231
+ return this.queue(kind, () => this.ensure(kind, signal), signal);
165
232
  }
166
233
  async reread(kind) {
167
234
  await this.examine(kind, this.readings.get(kind) ?? SIGNED_OUT, offer);
168
235
  await this.report();
169
236
  }
170
- async recheck(kind) {
237
+ async recheck(kind, signal) {
171
238
  const known = this.readings.get(kind) ?? SIGNED_OUT;
172
- await this.examine(kind, known, async (kind, cli) => (await signedIn(kind, cli, known)) ? { ...known, signed_in: true } : SIGNED_OUT);
173
- await this.report();
239
+ await this.examine(kind, known, async (kind, cli) => ((await signedIn(kind, cli, known, signal)) ? { ...known, signed_in: true } : SIGNED_OUT), signal);
240
+ if (!signal.aborted)
241
+ await this.report();
174
242
  }
175
243
  report() {
176
244
  const sending = this.sending.catch(() => undefined).then(() => this.send());
@@ -186,39 +254,42 @@ export class Agents {
186
254
  this.readings.set(kind, reading);
187
255
  this.report().catch(logged);
188
256
  }
189
- queue(kind, work) {
190
- const queued = (this.queues.get(kind) ?? Promise.resolve()).then(work);
257
+ queue(kind, work, signal) {
258
+ const queued = (this.queues.get(kind) ?? Promise.resolve()).then(() => {
259
+ signal?.throwIfAborted();
260
+ return work();
261
+ });
191
262
  this.queues.set(kind, queued.catch(() => undefined));
192
- return queued;
263
+ return signal === undefined ? queued : Promise.race([queued, ended(signal)]);
193
264
  }
194
- async ensure(kind) {
195
- const failed = await installAdapter(kind);
265
+ async ensure(kind, signal) {
266
+ const failed = await installAdapter(kind, signal);
196
267
  if (failed !== null)
197
268
  throw new Error(failed);
198
- const found = await locate(kind);
269
+ const found = await locate(kind, signal);
199
270
  if (found !== null)
200
271
  return found;
201
- const installing = this.installing.catch(() => undefined).then(() => installCli(kind));
272
+ const installing = this.installing.catch(() => undefined).then(() => installCli(kind, signal));
202
273
  this.installing = installing;
203
274
  const failure = await installing;
204
275
  if (failure !== null)
205
276
  throw new Error(failure);
206
- const installed = await locate(kind);
277
+ const installed = await locate(kind, signal);
207
278
  if (installed === null)
208
279
  throw new Error(`the login shell does not find ${CLIS[kind].bin} after its install`);
209
280
  return installed;
210
281
  }
211
- async resolve(kind) {
282
+ async resolve(kind, signal) {
212
283
  let cli;
213
284
  try {
214
- cli = await realpath(await this.ensure(kind));
285
+ cli = await realpath(await this.ensure(kind, signal));
215
286
  }
216
287
  catch (error) {
217
288
  const failure = causeOf(error);
218
289
  process.stderr.write(`kit: ${kind} did not install: ${failure}\n`);
219
290
  return { release: null, failure, ...SIGNED_OUT };
220
291
  }
221
- const release = await versionOf(cli);
292
+ const release = await versionOf(cli, signal);
222
293
  if (release === null)
223
294
  return { release: null, failure: `${cli} --version names no version`, ...SIGNED_OUT };
224
295
  const minimum = CLIS[kind].minimum;
@@ -226,18 +297,19 @@ export class Agents {
226
297
  return { release, minimum, failure: null, ...SIGNED_OUT };
227
298
  return { cli, release };
228
299
  }
229
- async examine(kind, known, read) {
300
+ async examine(kind, known, read, signal) {
230
301
  const current = this.nextRead(kind);
231
- const resolved = await this.queue(kind, () => this.resolve(kind));
302
+ const resolved = await this.queue(kind, () => this.resolve(kind, signal), signal);
232
303
  const reading = 'cli' in resolved ? { release: resolved.release, failure: null, ...(await read(kind, resolved.cli, known)) } : resolved;
233
- if (this.reads.get(kind) === current)
304
+ if (this.reads.get(kind) === current && !signal?.aborted)
234
305
  this.readings.set(kind, reading);
235
306
  }
236
307
  async load(kind) {
237
308
  const known = this.readings.get(kind);
238
- if (known !== undefined && known.failure === null)
309
+ if (known !== undefined && known.failure === null && known.minimum === undefined)
239
310
  return;
240
311
  await this.examine(kind, SIGNED_OUT, offer);
312
+ await this.report();
241
313
  }
242
314
  async send() {
243
315
  const agents = this.desired.agents.flatMap((kind) => {
@@ -245,11 +317,16 @@ export class Agents {
245
317
  return reading === undefined ? [] : [reported(kind, reading)];
246
318
  });
247
319
  const hostKey = await sshHostKey();
320
+ const form = await hostForm();
248
321
  const body = {
249
322
  os: await operatingSystem(),
323
+ ...(form === undefined ? {} : { form }),
250
324
  kit_version: KIT_VERSION,
325
+ wire: KIT_WIRE,
326
+ updates_itself: await updatesItself(),
251
327
  agent_base: agentBase(),
252
328
  agents,
329
+ transcription: transcriptionReport(),
253
330
  ...(hostKey === null ? {} : { ssh_host_key: hostKey }),
254
331
  };
255
332
  const state = JSON.stringify(body);
package/dist/api.js CHANGED
@@ -1,5 +1,9 @@
1
+ import { setTimeout as delay } from 'node:timers/promises';
2
+ import { signInAgain, updateRequired } from './end.js';
1
3
  import { readEnrolment } from './home.js';
4
+ import { retryable } from './refusals.js';
2
5
  import { relayed } from './relay.js';
6
+ import { KIT_WIRE, KIT_WIRE_HEADER, tooOld } from './wire.js';
3
7
  export class HouseRefusal extends Error {
4
8
  status;
5
9
  text;
@@ -9,27 +13,54 @@ export class HouseRefusal extends Error {
9
13
  this.text = text;
10
14
  }
11
15
  }
16
+ export function finalRefusal(error) {
17
+ return error instanceof HouseRefusal && retryable(error.text) === false;
18
+ }
12
19
  export function retryDelay(attempt) {
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.
13
21
  return Math.random() * Math.min(30_000, 1000 * 2 ** attempt);
14
22
  }
23
+ export async function retrying(sent, signal, pause = retryDelay) {
24
+ for (let attempt = 0;; attempt++) {
25
+ try {
26
+ return await sent();
27
+ }
28
+ catch (error) {
29
+ if (!(error instanceof HouseRefusal) || retryable(error.text) !== true)
30
+ throw error;
31
+ }
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 });
34
+ }
35
+ }
15
36
  export async function post(house, path, body, credential, signal) {
16
37
  const answer = await fetch(relayed(new URL(path, house)), {
17
38
  method: 'POST',
18
39
  headers: {
19
40
  'content-type': 'application/json',
41
+ [KIT_WIRE_HEADER]: String(KIT_WIRE),
20
42
  ...(credential === undefined ? {} : { authorization: `Bearer ${credential}` }),
21
43
  },
22
44
  body: JSON.stringify(body),
23
45
  signal,
24
46
  });
25
47
  const text = await answer.text();
48
+ if (!answer.ok && tooOld(text))
49
+ updateRequired(house);
26
50
  if (!answer.ok)
27
51
  throw new HouseRefusal(path, answer.status, text);
28
52
  return JSON.parse(text);
29
53
  }
30
54
  async function enrolledPost(path, body, signal) {
31
55
  const { house, credential } = (await readEnrolment());
32
- return post(house, path, body, credential, signal);
56
+ try {
57
+ return await post(house, path, body, credential, signal);
58
+ }
59
+ catch (error) {
60
+ if (error instanceof HouseRefusal && error.status === 401)
61
+ await signInAgain(credential);
62
+ throw error;
63
+ }
33
64
  }
34
65
  export const house = {
35
66
  post: enrolledPost,
@@ -39,9 +70,10 @@ export const house = {
39
70
  return await enrolledPost(path, body);
40
71
  }
41
72
  catch (error) {
42
- if (error instanceof HouseRefusal && error.status < 500)
73
+ if (finalRefusal(error))
43
74
  throw error;
44
75
  process.stderr.write(`kit: ${path} did not reach House: ${error.message}\n`);
76
+ // A delivery House did not take is sent again on the jittered curve for as long as it is still current.
45
77
  await new Promise((resolve) => setTimeout(resolve, retryDelay(attempt)));
46
78
  if (!current())
47
79
  throw error;
@@ -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
+ }