@agentshouse/kit 0.2.1-cc719fffeec71 → 0.2.1-cc813e0274de8

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 (146) hide show
  1. package/README.md +28 -28
  2. package/dist/acp.js +59 -8
  3. package/dist/afk.js +17 -0
  4. package/dist/agents.js +59 -33
  5. package/dist/api.js +5 -5
  6. package/dist/authority-main.js +3 -3
  7. package/dist/bridge.js +5 -5
  8. package/dist/building.js +50 -0
  9. package/dist/calls.js +71 -0
  10. package/dist/chunks.js +49 -0
  11. package/dist/clis.js +46 -40
  12. package/dist/{stream.js → connection.js} +31 -49
  13. package/dist/conversations.js +471 -150
  14. package/dist/copies.js +290 -153
  15. package/dist/end.js +14 -4
  16. package/dist/events.js +76 -8
  17. package/dist/files.js +139 -37
  18. package/dist/git.js +47 -13
  19. package/dist/grok.js +39 -0
  20. package/dist/home.js +0 -7
  21. package/dist/house-cli.js +95 -87
  22. package/dist/house-main.js +3 -3
  23. package/dist/instructions.js +29 -9
  24. package/dist/kit-cli.js +4 -4
  25. package/dist/kit-main.js +3 -3
  26. package/dist/login.js +4 -4
  27. package/dist/logout.js +1 -1
  28. package/dist/mcp.js +6 -2
  29. package/dist/parts.js +10 -0
  30. package/dist/placement.js +21 -20
  31. package/dist/relay.js +21 -0
  32. package/dist/resident.js +51 -40
  33. package/dist/scope.js +15 -4
  34. package/dist/scripts.js +255 -0
  35. package/dist/secret-input.js +1 -1
  36. package/dist/service.js +1 -1
  37. package/dist/sign-in.js +22 -21
  38. package/dist/silence.js +28 -0
  39. package/dist/skills.js +42 -97
  40. package/dist/transcription.js +88 -44
  41. package/dist/translate.js +2 -8
  42. package/dist/update.js +113 -124
  43. package/dist/wire.js +37 -3
  44. package/package.json +20 -21
  45. package/dist/bootstrap.json +0 -24
  46. package/dist/clis-main.js +0 -23
  47. package/dist/inputs.js +0 -37
  48. package/how-we-work.md +0 -33
  49. package/skills/ask-matt/LICENSE +0 -21
  50. package/skills/ask-matt/PHASE-BOUNDARIES.md +0 -55
  51. package/skills/ask-matt/SKILL.md +0 -97
  52. package/skills/ask-matt/agents/openai.yaml +0 -5
  53. package/skills/code-review/LICENSE +0 -21
  54. package/skills/code-review/SKILL.md +0 -89
  55. package/skills/code-review/agents/openai.yaml +0 -3
  56. package/skills/codebase-design/DEEPENING.md +0 -37
  57. package/skills/codebase-design/DESIGN-IT-TWICE.md +0 -44
  58. package/skills/codebase-design/LICENSE +0 -21
  59. package/skills/codebase-design/SKILL.md +0 -114
  60. package/skills/codebase-design/agents/openai.yaml +0 -3
  61. package/skills/diagnosing-bugs/LICENSE +0 -21
  62. package/skills/diagnosing-bugs/SKILL.md +0 -138
  63. package/skills/diagnosing-bugs/agents/openai.yaml +0 -3
  64. package/skills/diagnosing-bugs/scripts/hitl-loop.template.sh +0 -44
  65. package/skills/domain-modeling/ADR-FORMAT.md +0 -47
  66. package/skills/domain-modeling/GLOSSARY-FORMAT.md +0 -60
  67. package/skills/domain-modeling/LICENSE +0 -21
  68. package/skills/domain-modeling/SKILL.md +0 -74
  69. package/skills/domain-modeling/agents/openai.yaml +0 -3
  70. package/skills/grill-me/LICENSE +0 -21
  71. package/skills/grill-me/SKILL.md +0 -7
  72. package/skills/grill-me/agents/openai.yaml +0 -5
  73. package/skills/grill-with-docs/LICENSE +0 -21
  74. package/skills/grill-with-docs/SKILL.md +0 -7
  75. package/skills/grill-with-docs/agents/openai.yaml +0 -5
  76. package/skills/grilling/LICENSE +0 -21
  77. package/skills/grilling/SKILL.md +0 -30
  78. package/skills/grilling/agents/openai.yaml +0 -3
  79. package/skills/handoff/LICENSE +0 -21
  80. package/skills/handoff/SKILL.md +0 -16
  81. package/skills/handoff/agents/openai.yaml +0 -5
  82. package/skills/implement/LICENSE +0 -21
  83. package/skills/implement/SKILL.md +0 -17
  84. package/skills/implement/agents/openai.yaml +0 -5
  85. package/skills/implement-spec/LICENSE +0 -21
  86. package/skills/implement-spec/SKILL.md +0 -40
  87. package/skills/implement-spec/agents/openai.yaml +0 -5
  88. package/skills/improve-codebase-architecture/HTML-REPORT.md +0 -123
  89. package/skills/improve-codebase-architecture/LICENSE +0 -21
  90. package/skills/improve-codebase-architecture/SKILL.md +0 -71
  91. package/skills/improve-codebase-architecture/agents/openai.yaml +0 -5
  92. package/skills/pr/CREDITS.md +0 -3
  93. package/skills/pr/LICENSE +0 -21
  94. package/skills/pr/SKILL.md +0 -170
  95. package/skills/pr/agents/openai.yaml +0 -3
  96. package/skills/prototype/LICENSE +0 -21
  97. package/skills/prototype/LOGIC.md +0 -67
  98. package/skills/prototype/SKILL.md +0 -26
  99. package/skills/prototype/UI.md +0 -112
  100. package/skills/prototype/agents/openai.yaml +0 -3
  101. package/skills/research/LICENSE +0 -21
  102. package/skills/research/SKILL.md +0 -12
  103. package/skills/research/agents/openai.yaml +0 -3
  104. package/skills/retro/LICENSE +0 -21
  105. package/skills/retro/SKILL.md +0 -44
  106. package/skills/retro/agents/openai.yaml +0 -5
  107. package/skills/tdd/LICENSE +0 -21
  108. package/skills/tdd/SKILL.md +0 -38
  109. package/skills/tdd/agents/openai.yaml +0 -3
  110. package/skills/tdd/mocking.md +0 -59
  111. package/skills/tdd/tests.md +0 -77
  112. package/skills/teach/GLOSSARY-FORMAT.md +0 -35
  113. package/skills/teach/LEARNING-RECORD-FORMAT.md +0 -46
  114. package/skills/teach/LICENSE +0 -21
  115. package/skills/teach/MISSION-FORMAT.md +0 -31
  116. package/skills/teach/RESOURCES-FORMAT.md +0 -32
  117. package/skills/teach/SKILL.md +0 -140
  118. package/skills/teach/agents/openai.yaml +0 -5
  119. package/skills/to-questionnaire/LICENSE +0 -21
  120. package/skills/to-questionnaire/SKILL.md +0 -54
  121. package/skills/to-questionnaire/agents/openai.yaml +0 -5
  122. package/skills/to-spec/LICENSE +0 -21
  123. package/skills/to-spec/SKILL.md +0 -75
  124. package/skills/to-spec/agents/openai.yaml +0 -5
  125. package/skills/to-tickets/LICENSE +0 -21
  126. package/skills/to-tickets/SKILL.md +0 -105
  127. package/skills/to-tickets/agents/openai.yaml +0 -5
  128. package/skills/triage/AGENT-BRIEF.md +0 -207
  129. package/skills/triage/LICENSE +0 -21
  130. package/skills/triage/OUT-OF-SCOPE.md +0 -105
  131. package/skills/triage/SKILL.md +0 -112
  132. package/skills/triage/agents/openai.yaml +0 -5
  133. package/skills/wait-what/LICENSE +0 -21
  134. package/skills/wait-what/SKILL.md +0 -7
  135. package/skills/wait-what/agents/openai.yaml +0 -5
  136. package/skills/wayfinder/LICENSE +0 -21
  137. package/skills/wayfinder/SKILL.md +0 -128
  138. package/skills/wayfinder/agents/openai.yaml +0 -5
  139. package/skills/wizard/LICENSE +0 -21
  140. package/skills/wizard/SKILL.md +0 -44
  141. package/skills/wizard/agents/openai.yaml +0 -3
  142. package/skills/wizard/template.sh +0 -223
  143. package/skills/writing-for-agents/LICENSE +0 -21
  144. package/skills/writing-for-agents/SKILL-MECHANICS.md +0 -22
  145. package/skills/writing-for-agents/SKILL.md +0 -81
  146. package/skills/writing-for-agents/agents/openai.yaml +0 -3
package/dist/calls.js ADDED
@@ -0,0 +1,71 @@
1
+ import { existsSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
2
+ import { join } from 'node:path';
3
+ import { kitHome } from './home.js';
4
+ function logged(error) {
5
+ process.stderr.write(`kit: ${error instanceof Error ? error.message : String(error)}\n`);
6
+ }
7
+ export class Calls {
8
+ house;
9
+ changed;
10
+ carried = new Map();
11
+ path = join(kitHome(), 'call-results.json');
12
+ results;
13
+ returned = new Set();
14
+ released = new Set();
15
+ open = 0;
16
+ constructor(house, changed) {
17
+ this.house = house;
18
+ this.changed = changed;
19
+ this.results = new Map(existsSync(this.path) ? Object.entries(JSON.parse(readFileSync(this.path, 'utf8'))) : []);
20
+ }
21
+ keepResult(callId, result) {
22
+ if (this.returned.has(callId))
23
+ return;
24
+ this.results.set(callId, result);
25
+ this.save();
26
+ }
27
+ idle() {
28
+ return this.open === 0;
29
+ }
30
+ carry(callId, work) {
31
+ if (this.released.has(callId))
32
+ return Promise.resolve();
33
+ const known = this.carried.get(callId);
34
+ const result = this.results.get(callId);
35
+ const carried = known ?? (result === undefined ? work() : Promise.resolve({ result }));
36
+ if (known === undefined) {
37
+ this.carried.set(callId, carried);
38
+ carried.catch(() => this.carried.delete(callId));
39
+ }
40
+ this.open++;
41
+ this.changed();
42
+ return carried
43
+ .then(async ({ result, returned, release }) => {
44
+ try {
45
+ await this.house.deliver('/kit/kit-calls/results/return', { call: callId, ...result });
46
+ }
47
+ finally {
48
+ this.returned.add(callId);
49
+ if (this.results.delete(callId))
50
+ this.save();
51
+ }
52
+ if (known !== undefined)
53
+ return;
54
+ if (release) {
55
+ this.carried.delete(callId);
56
+ this.released.add(callId);
57
+ }
58
+ await returned?.();
59
+ })
60
+ .catch(logged)
61
+ .finally(() => {
62
+ this.open--;
63
+ this.changed();
64
+ });
65
+ }
66
+ save() {
67
+ const temporary = `${this.path}.${process.pid}`;
68
+ writeFileSync(temporary, JSON.stringify(Object.fromEntries(this.results)), { mode: 0o600 });
69
+ renameSync(temporary, this.path);
70
+ }
71
+ }
package/dist/chunks.js ADDED
@@ -0,0 +1,49 @@
1
+ import { readFile, rm } from 'node:fs/promises';
2
+ import { join } from 'node:path';
3
+ import { downloaded, fetched } from './files.js';
4
+ const DOWNLOADS_AT_ONCE = 6;
5
+ // A chunk is about one megabyte, so a download still unfinished after two minutes holds every Room behind it on a dead connection.
6
+ const CHUNK_DOWNLOAD_MS = 120_000;
7
+ class AddressExpired extends Error {
8
+ constructor() {
9
+ super("House's store refused every chunk it asked for");
10
+ }
11
+ }
12
+ function once(chunk) {
13
+ let asked = false;
14
+ return async () => {
15
+ if (asked)
16
+ throw new AddressExpired();
17
+ asked = true;
18
+ return { download: chunk.download, sha256: chunk.hash };
19
+ };
20
+ }
21
+ export async function stagedChunks(directory, chunks) {
22
+ let next = 0;
23
+ let failure;
24
+ const downloading = async () => {
25
+ while (next < chunks.length && failure === undefined) {
26
+ const chunk = chunks[next++];
27
+ const reading = (url) => fetched(url, AbortSignal.timeout(CHUNK_DOWNLOAD_MS));
28
+ await downloaded(once(chunk), reading, join(directory, chunk.hash), 'A Room chunk').catch((error) => {
29
+ failure ??= error;
30
+ });
31
+ }
32
+ };
33
+ await Promise.all(Array.from({ length: DOWNLOADS_AT_ONCE }, downloading));
34
+ return failure;
35
+ }
36
+ export async function* chunkTexts(directory, chunks, models) {
37
+ yield* models;
38
+ for (const { hash } of chunks) {
39
+ const file = join(directory, hash);
40
+ for (const line of (await readFile(file, 'utf8')).split('\n')) {
41
+ if (line === '')
42
+ continue;
43
+ const entry = JSON.parse(line);
44
+ if (entry.content !== undefined)
45
+ yield entry;
46
+ }
47
+ await rm(file);
48
+ }
49
+ }
package/dist/clis.js CHANGED
@@ -4,7 +4,8 @@ import { constants, readFileSync } from 'node:fs';
4
4
  import { access, mkdir, readFile, rename, writeFile } from 'node:fs/promises';
5
5
  import { homedir, userInfo } from 'node:os';
6
6
  import { delimiter, dirname, isAbsolute, join } from 'node:path';
7
- import { kitHome } from './home.js';
7
+ import { releaseDirectory } from './placement.js';
8
+ import { childEnvironment } from './relay.js';
8
9
  const HOUSE_EXECUTABLES = /^host_executable\(name = "house", paths = (\[.*\])\)$/m;
9
10
  function houseRule(houses) {
10
11
  return `prefix_rule(pattern = ["house"], decision = "allow")\nhost_executable(name = "house", paths = ${JSON.stringify(houses)})\n`;
@@ -14,10 +15,12 @@ const RAW_SUBTYPES = [
14
15
  'task_started',
15
16
  'task_updated',
16
17
  'task_notification',
18
+ 'task_progress',
17
19
  'session_state_changed',
18
20
  'hook_started',
19
21
  'hook_response',
20
22
  ];
23
+ const RAW_TYPES = ['result', 'user', 'assistant', 'rate_limit_event', 'prompt_suggestion'];
21
24
  async function executable(path) {
22
25
  try {
23
26
  await access(path, constants.X_OK);
@@ -60,6 +63,14 @@ export async function allowHouseInCodex(path) {
60
63
  await rename(temporary, file);
61
64
  }
62
65
  async function nothing() { }
66
+ function claudeQuestionFields(request) {
67
+ const properties = request.requestedSchema?.properties ?? {};
68
+ return Object.keys(properties).filter((name) => properties[name]._meta?.jetbrains?.air?.customAnswer !== undefined);
69
+ }
70
+ function codexQuestionFields(request) {
71
+ const { _meta, requestedSchema } = request;
72
+ return _meta?.codex === undefined ? [] : (requestedSchema?.required ?? []);
73
+ }
63
74
  function answered(error) {
64
75
  return typeof error === 'object' && error !== null ? error : {};
65
76
  }
@@ -69,8 +80,9 @@ function bridgeInClaudeSandbox(bridge) {
69
80
  export const CLIS = {
70
81
  'codex-acp': {
71
82
  bin: 'codex',
72
- minimum: '0.159.1',
83
+ minimum: '0.165.0',
73
84
  install: 'curl -fsSL https://chatgpt.com/codex/install.sh | sh',
85
+ update: 'codex update',
74
86
  adapter: {
75
87
  package: '@agentclientprotocol/codex-acp',
76
88
  bin: 'codex-acp',
@@ -86,14 +98,16 @@ export const CLIS = {
86
98
  },
87
99
  renames: true,
88
100
  allowHouse: allowHouseInCodex,
101
+ questionFields: codexQuestionFields,
89
102
  signedIn: { command: ['login', 'status'] },
90
103
  login: { args: ['login', '--device-auth'], code: 'show' },
91
104
  air: ['asyncTasks', 'nativeSubagentSessions'],
92
105
  },
93
106
  'claude-agent-acp': {
94
107
  bin: 'claude',
95
- minimum: '2.1.286',
108
+ minimum: '2.1.316',
96
109
  install: 'curl -fsSL https://claude.ai/install.sh | bash',
110
+ update: 'claude update',
97
111
  adapter: {
98
112
  package: '@agentclientprotocol/claude-agent-acp',
99
113
  bin: 'claude-agent-acp',
@@ -110,12 +124,13 @@ export const CLIS = {
110
124
  title,
111
125
  settings: { sandbox: { network: bridgeInClaudeSandbox(bridge) } },
112
126
  },
113
- emitRawSDKMessages: RAW_SUBTYPES.map((subtype) => ({ type: 'system', subtype })),
127
+ emitRawSDKMessages: [...RAW_SUBTYPES.map((subtype) => ({ type: 'system', subtype })), ...RAW_TYPES.map((type) => ({ type }))],
114
128
  },
115
129
  }),
116
130
  unknownSession: (error) => answered(error).code === -32002,
117
131
  renames: false,
118
132
  allowHouse: nothing,
133
+ questionFields: claudeQuestionFields,
119
134
  signedIn: { command: ['auth', 'status'] },
120
135
  login: { args: ['auth', 'login', '--claudeai'], code: 'collect', rejected: 'Invalid code' },
121
136
  air: ['asyncTasks', 'sessionFailure'],
@@ -124,6 +139,7 @@ export const CLIS = {
124
139
  bin: 'grok',
125
140
  minimum: '1.0.46',
126
141
  install: 'curl -fsSL https://x.ai/cli/install.sh | bash',
142
+ update: 'grok update',
127
143
  adapter: null,
128
144
  args: ['--sandbox', 'off', 'agent', '--always-approve', '--no-leader', 'stdio'],
129
145
  fullAccess: null,
@@ -131,44 +147,29 @@ export const CLIS = {
131
147
  unknownSession: (error) => answered(error).data?.code === 'FS_NOT_FOUND',
132
148
  renames: false,
133
149
  allowHouse: nothing,
150
+ questionFields: () => [],
134
151
  signedIn: { initializeMeta: 'defaultAuthMethodId' },
135
152
  login: { args: ['login', '--device-auth'], code: 'show' },
136
153
  air: ['asyncTasks'],
137
154
  },
138
155
  };
139
156
  const KIT_PACKAGE = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
140
- export const KIT_VERSION = KIT_PACKAGE.version;
141
- const PROXY = /^https?_proxy$/i;
157
+ export const KIT_RELEASE = KIT_PACKAGE.version;
142
158
  const VERSION = /\d+\.\d+\.\d+(?:-[0-9A-Za-z.]+)?/;
143
- // An install still running after fifteen minutes is ended and reported as failed, so a hung download cannot hold its CLI's report.
159
+ // An install or update still running after fifteen minutes is ended as failed, so a hung download can neither hold its CLI's report nor keep the Kit busy.
144
160
  const INSTALL_MS = 15 * 60_000;
145
161
  // A login shell or a version read is ended after half a minute, so a profile that waits for input cannot stall the report.
146
162
  const READ_MS = 30_000;
147
163
  const CAUSE_CHARACTERS = 4000;
148
- function prefix(kind) {
149
- return join(kitHome(), 'agents', kind);
150
- }
151
164
  export function adapterCommand(kind) {
152
- return join(prefix(kind), 'node_modules', '.bin', CLIS[kind].adapter.bin);
153
- }
154
- async function installedAdapter(kind) {
155
- try {
156
- const manifest = join(prefix(kind), 'node_modules', CLIS[kind].adapter.package, 'package.json');
157
- return JSON.parse(await readFile(manifest, 'utf8')).version;
158
- }
159
- catch {
160
- return null;
161
- }
162
- }
163
- export function withoutProxy() {
164
- return Object.fromEntries(Object.entries(process.env).filter(([name]) => !PROXY.test(name)));
165
+ return join(releaseDirectory(KIT_RELEASE), 'adapters', kind, 'node_modules', '.bin', CLIS[kind].adapter.bin);
165
166
  }
166
167
  export function run(command, args, timeoutMs, detached = false, signal) {
167
168
  return new Promise((resolve) => {
168
169
  const child = spawn(command, args, {
169
170
  stdio: ['ignore', 'pipe', 'pipe'],
170
171
  timeout: timeoutMs,
171
- env: withoutProxy(),
172
+ env: childEnvironment(),
172
173
  detached,
173
174
  signal: detached ? undefined : signal,
174
175
  });
@@ -202,19 +203,18 @@ export function run(command, args, timeoutMs, detached = false, signal) {
202
203
  export function failureOf(ran, program) {
203
204
  return ran.output.trim().slice(-CAUSE_CHARACTERS) || `${program} exited with ${ran.status ?? 'a signal'}`;
204
205
  }
205
- export async function installAdapter(kind, signal) {
206
- const adapter = CLIS[kind].adapter;
207
- if (adapter === null)
208
- return null;
209
- const release = KIT_PACKAGE.peerDependencies[adapter.package];
210
- if ((await installedAdapter(kind)) === release)
211
- return null;
212
- const ran = await run('npm', ['install', '--prefix', prefix(kind), '--cache', join(kitHome(), 'npm-cache'), '--no-save', '--no-audit', '--no-fund', '--omit=optional', `${adapter.package}@${release}`], INSTALL_MS, true, signal);
213
- return ran.status === 0 ? null : failureOf(ran, 'npm');
206
+ export function adapterArchive(kind) {
207
+ return `${kind}-${KIT_PACKAGE.peerDependencies[CLIS[kind].adapter.package]}.tar.gz`;
214
208
  }
215
- export async function installCli(kind, signal) {
216
- const ran = await run('bash', ['-o', 'pipefail', '-c', CLIS[kind].install], INSTALL_MS, true, signal);
217
- return ran.status === 0 ? null : failureOf(ran, 'the install');
209
+ async function bounded(program, work, signal) {
210
+ const deadline = AbortSignal.timeout(INSTALL_MS);
211
+ const ran = await work(signal === undefined ? deadline : AbortSignal.any([signal, deadline]));
212
+ if (deadline.aborted && signal?.aborted !== true)
213
+ return `${program} did not end within ${INSTALL_MS / 1000} seconds`;
214
+ return ran.status === 0 ? null : failureOf(ran, program);
215
+ }
216
+ export function installCli(kind, signal) {
217
+ return bounded('the install', (within) => run('bash', ['-o', 'pipefail', '-c', CLIS[kind].install], INSTALL_MS, true, within), signal);
218
218
  }
219
219
  function loginShell() {
220
220
  return process.env.SHELL || userInfo().shell;
@@ -222,13 +222,19 @@ function loginShell() {
222
222
  const FOUND = 'house-kit-cli ';
223
223
  const LOOKUP = `found=$(command -v "$1") || exit 0; case $found in /*) ;; *) found=$(pwd -P)/$found ;; esac; printf "${FOUND}%s\\n" "$found"`;
224
224
  const USER_BIN = 'case ":$PATH:" in *":$HOME/.local/bin:"*) ;; *) PATH="$PATH:$HOME/.local/bin" ;; esac; export PATH';
225
- function inLoginShell(script, argument = '', signal) {
226
- return run(loginShell(), ['-l', '-i', '-c', `exec /bin/sh -c '${USER_BIN}; ${script}' sh ${argument}`], READ_MS, true, signal);
225
+ function inLoginShell(script, argument = '', signal, timeoutMs = READ_MS) {
226
+ return run(loginShell(), ['-l', '-i', '-c', `exec /bin/sh -c '${USER_BIN}; ${script}' sh ${argument}`], timeoutMs, true, signal);
227
227
  }
228
- export async function locate(kind, signal) {
229
- const ran = await inLoginShell(LOOKUP, CLIS[kind].bin, signal);
228
+ export async function onLoginPath(program, signal) {
229
+ const ran = await inLoginShell(LOOKUP, program, signal);
230
230
  return ran.stdout.split('\n').findLast((line) => line.startsWith(FOUND))?.slice(FOUND.length) ?? null;
231
231
  }
232
+ export function locate(kind, signal) {
233
+ return onLoginPath(CLIS[kind].bin, signal);
234
+ }
235
+ export function updateCli(kind) {
236
+ return bounded('the update', (within) => inLoginShell(CLIS[kind].update, '', within, INSTALL_MS));
237
+ }
232
238
  export async function loginPath() {
233
239
  const marker = 'house-kit-path ';
234
240
  const ran = await inLoginShell(`printf "${marker}%s\\n" "$PATH"`);
@@ -1,43 +1,16 @@
1
1
  import { subscribe } from 'node:diagnostics_channel';
2
2
  import { HouseRefusal, retryDelay } from './api.js';
3
- import { end, REPLACED, signInAgain, updateRequired } from './end.js';
3
+ import { end, REPLACED, signInAgain } from './end.js';
4
4
  import { readEnrolment } from './home.js';
5
5
  import { relayed } from './relay.js';
6
- import { KIT_WIRE, tooOld } from './wire.js';
6
+ import { Silence } from './silence.js';
7
+ import { endUnserved, KIT_WIRE, unserved } from './wire.js';
7
8
  const PATH = '/kit/stream';
8
9
  const SUBPROTOCOL = `house.kit.stream.${KIT_WIRE}`;
9
10
  const REFUSAL_HEADER = 'x-house-refusal';
10
- // House beats each stream every thirty seconds, so two silent beats mean this Kit cannot hear House.
11
- export const STREAM_SILENCE_MS = 60_000;
12
- const SYSTEM_STREAM_CLOCK = {
13
- later: (delay, callback) => setTimeout(callback, delay),
14
- clear: (timer) => clearTimeout(timer),
15
- };
16
- export class StreamSilence {
17
- timer = null;
18
- silent;
19
- clock;
20
- interval;
21
- constructor(silent, clock = SYSTEM_STREAM_CLOCK, interval = STREAM_SILENCE_MS) {
22
- this.silent = silent;
23
- this.clock = clock;
24
- this.interval = interval;
25
- }
26
- heard() {
27
- this.stop();
28
- this.timer = this.clock.later(this.interval, () => {
29
- this.timer = null;
30
- this.silent();
31
- });
32
- }
33
- stop() {
34
- if (this.timer === null)
35
- return;
36
- this.clock.clear(this.timer);
37
- this.timer = null;
38
- }
39
- }
40
- function streamUrl(house) {
11
+ // House beats each Kit connection every thirty seconds, so two silent beats mean this Kit process cannot hear House.
12
+ export const CONNECTION_SILENCE_MS = 60_000;
13
+ function connectionUrl(house) {
41
14
  const url = new URL(PATH, house);
42
15
  url.protocol = url.protocol === 'https:' ? 'wss:' : 'ws:';
43
16
  return url;
@@ -56,16 +29,20 @@ subscribe('undici:request:headers', (message) => {
56
29
  return;
57
30
  refused = new HouseRefusal(PATH, response.statusCode, header(response.headers, REFUSAL_HEADER) || response.statusText);
58
31
  });
59
- export function holdStream(handlers) {
32
+ export function holdConnection(handlers) {
33
+ let connection = null;
60
34
  let socket = null;
61
35
  let failures = 0;
62
36
  const connect = async () => {
63
37
  const { house, credential } = (await readEnrolment());
38
+ if (socket !== null || unserved())
39
+ return;
64
40
  refused = null;
65
- const opening = new WebSocket(relayed(streamUrl(house)), {
41
+ const opening = new WebSocket(relayed(connectionUrl(house)), {
66
42
  protocols: [SUBPROTOCOL],
67
43
  headers: { authorization: `Bearer ${credential}` },
68
44
  });
45
+ socket = opening;
69
46
  let opened = false;
70
47
  let silence = null;
71
48
  const closed = (event) => {
@@ -73,28 +50,31 @@ export function holdStream(handlers) {
73
50
  silence = null;
74
51
  if (socket === opening)
75
52
  socket = null;
76
- process.stderr.write(`kit: control stream closed ${event.code} ${event.reason}\n`);
53
+ if (connection === opening)
54
+ connection = null;
55
+ handlers.closed();
56
+ process.stderr.write(`kit: connection closed ${event.code} ${event.reason}\n`);
77
57
  if (event.reason === 'replaced')
78
58
  end(REPLACED);
79
59
  if (event.reason === 'credential_rejected' || refused?.status === 401) {
80
60
  void signInAgain(credential);
81
61
  return;
82
62
  }
83
- if (refused !== null && tooOld(refused.text))
84
- updateRequired();
63
+ if (refused !== null)
64
+ endUnserved(refused.text);
85
65
  if (!opened && refused !== null)
86
66
  process.stderr.write(`kit: ${refused.message}\n`);
87
- // A closed socket reopens in one to three seconds, spread so Kits one restart closed return apart; an opening House refused or left unanswered backs off on the jittered curve, retryable or not, since a resident outlives a House deploy.
67
+ // A closed connection reopens in one to three seconds, spread so Kit processes one restart closed return apart; an opening House refused or left unanswered backs off on the jittered curve, retryable or not, since a resident outlives a House deploy.
88
68
  setTimeout(() => void connect(), opened ? 1000 + Math.random() * 2000 : retryDelay(failures++));
89
69
  };
90
70
  opening.onopen = () => {
91
71
  opened = true;
92
72
  failures = 0;
93
- socket = opening;
94
- silence = new StreamSilence(() => {
95
- if (socket !== opening)
73
+ connection = opening;
74
+ silence = new Silence(CONNECTION_SILENCE_MS, () => {
75
+ if (connection !== opening)
96
76
  return;
97
- socket = null;
77
+ connection = null;
98
78
  opening.onclose = null;
99
79
  opening.close();
100
80
  closed(new CloseEvent('close', { code: 1006, reason: 'heartbeat_missed' }));
@@ -104,19 +84,21 @@ export function holdStream(handlers) {
104
84
  };
105
85
  opening.onmessage = (event) => {
106
86
  silence?.heard();
107
- const frame = JSON.parse(String(event.data));
108
- if (frame.type !== 'beat')
109
- handlers.frame(frame);
87
+ const arrived = JSON.parse(String(event.data));
88
+ if (arrived.type === 'input')
89
+ handlers.call(arrived);
90
+ else if (arrived.type !== 'beat')
91
+ handlers.oneWayCall(arrived);
110
92
  };
111
93
  opening.onerror = () => undefined;
112
94
  opening.onclose = closed;
113
95
  };
114
96
  void connect();
115
97
  return {
116
- send(frame) {
117
- if (socket === null || socket.readyState !== WebSocket.OPEN)
98
+ send(oneWayCall) {
99
+ if (connection === null || connection.readyState !== WebSocket.OPEN)
118
100
  return false;
119
- socket.send(JSON.stringify(frame));
101
+ connection.send(JSON.stringify(oneWayCall));
120
102
  return true;
121
103
  },
122
104
  };