@agentshouse/kit 0.2.1-c3cf4b145dcda → 0.2.1-c3d0b9ac4a82a

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 (132) hide show
  1. package/README.md +42 -40
  2. package/dist/acp.js +92 -115
  3. package/dist/agents.js +112 -24
  4. package/dist/api.js +10 -6
  5. package/dist/app-git.js +10 -26
  6. package/dist/authority-main.js +2 -2
  7. package/dist/bridge.js +15 -44
  8. package/dist/building.js +46 -0
  9. package/dist/calls.js +63 -0
  10. package/dist/chatgpt.js +32 -0
  11. package/dist/clis-main.js +2 -2
  12. package/dist/clis.js +131 -27
  13. package/dist/codex-main.js +58 -0
  14. package/dist/connection.js +116 -0
  15. package/dist/conversations.js +456 -200
  16. package/dist/copies.js +185 -123
  17. package/dist/end.js +24 -5
  18. package/dist/enrol-main.js +7 -1
  19. package/dist/events.js +16 -78
  20. package/dist/files.js +139 -31
  21. package/dist/git.js +13 -11
  22. package/dist/home.js +96 -7
  23. package/dist/house-cli.js +299 -0
  24. package/dist/house-main.js +7 -162
  25. package/dist/instructions.js +8 -10
  26. package/dist/kit-cli.js +68 -0
  27. package/dist/kit-main.js +8 -22
  28. package/dist/login.js +118 -107
  29. package/dist/logout.js +14 -16
  30. package/dist/mcp.js +6 -2
  31. package/dist/parts.js +34 -16
  32. package/dist/placement.js +39 -0
  33. package/dist/relay.js +33 -2
  34. package/dist/resident.js +116 -51
  35. package/dist/scope.js +206 -0
  36. package/dist/service-main.js +9 -0
  37. package/dist/service.js +55 -0
  38. package/dist/sign-in.js +23 -40
  39. package/dist/silence.js +28 -0
  40. package/dist/skills.js +49 -35
  41. package/dist/transcription.js +85 -45
  42. package/dist/translate.js +2 -8
  43. package/dist/update.js +115 -53
  44. package/dist/web-wizard.js +101 -0
  45. package/dist/wire.js +22 -0
  46. package/dist/work.js +346 -0
  47. package/package.json +20 -20
  48. package/dist/bootstrap.json +0 -24
  49. package/dist/stream.js +0 -72
  50. package/how-we-work.md +0 -23
  51. package/skills/ask-matt/LICENSE +0 -21
  52. package/skills/ask-matt/PHASE-BOUNDARIES.md +0 -55
  53. package/skills/ask-matt/SKILL.md +0 -91
  54. package/skills/ask-matt/agents/openai.yaml +0 -4
  55. package/skills/code-review/LICENSE +0 -21
  56. package/skills/code-review/SKILL.md +0 -89
  57. package/skills/code-review/agents/openai.yaml +0 -3
  58. package/skills/codebase-design/DEEPENING.md +0 -37
  59. package/skills/codebase-design/DESIGN-IT-TWICE.md +0 -44
  60. package/skills/codebase-design/LICENSE +0 -21
  61. package/skills/codebase-design/SKILL.md +0 -116
  62. package/skills/codebase-design/agents/openai.yaml +0 -3
  63. package/skills/diagnosing-bugs/LICENSE +0 -21
  64. package/skills/diagnosing-bugs/SKILL.md +0 -140
  65. package/skills/diagnosing-bugs/agents/openai.yaml +0 -3
  66. package/skills/diagnosing-bugs/scripts/hitl-loop.template.sh +0 -44
  67. package/skills/domain-modeling/ADR-FORMAT.md +0 -47
  68. package/skills/domain-modeling/CONTEXT-FORMAT.md +0 -60
  69. package/skills/domain-modeling/LICENSE +0 -21
  70. package/skills/domain-modeling/SKILL.md +0 -76
  71. package/skills/domain-modeling/agents/openai.yaml +0 -3
  72. package/skills/grill-me/LICENSE +0 -21
  73. package/skills/grill-me/SKILL.md +0 -8
  74. package/skills/grill-me/agents/openai.yaml +0 -4
  75. package/skills/grill-with-docs/LICENSE +0 -21
  76. package/skills/grill-with-docs/SKILL.md +0 -8
  77. package/skills/grill-with-docs/agents/openai.yaml +0 -4
  78. package/skills/grilling/LICENSE +0 -21
  79. package/skills/grilling/SKILL.md +0 -30
  80. package/skills/grilling/agents/openai.yaml +0 -3
  81. package/skills/handoff/LICENSE +0 -21
  82. package/skills/handoff/SKILL.md +0 -17
  83. package/skills/handoff/agents/openai.yaml +0 -4
  84. package/skills/implement/LICENSE +0 -21
  85. package/skills/implement/SKILL.md +0 -16
  86. package/skills/implement/agents/openai.yaml +0 -4
  87. package/skills/improve-codebase-architecture/HTML-REPORT.md +0 -123
  88. package/skills/improve-codebase-architecture/LICENSE +0 -21
  89. package/skills/improve-codebase-architecture/SKILL.md +0 -72
  90. package/skills/improve-codebase-architecture/agents/openai.yaml +0 -4
  91. package/skills/prototype/LICENSE +0 -21
  92. package/skills/prototype/LOGIC.md +0 -67
  93. package/skills/prototype/SKILL.md +0 -28
  94. package/skills/prototype/UI.md +0 -112
  95. package/skills/prototype/agents/openai.yaml +0 -3
  96. package/skills/research/LICENSE +0 -21
  97. package/skills/research/SKILL.md +0 -14
  98. package/skills/research/agents/openai.yaml +0 -3
  99. package/skills/resolving-merge-conflicts/LICENSE +0 -21
  100. package/skills/resolving-merge-conflicts/SKILL.md +0 -16
  101. package/skills/resolving-merge-conflicts/agents/openai.yaml +0 -3
  102. package/skills/tdd/LICENSE +0 -21
  103. package/skills/tdd/SKILL.md +0 -40
  104. package/skills/tdd/agents/openai.yaml +0 -3
  105. package/skills/tdd/mocking.md +0 -59
  106. package/skills/tdd/tests.md +0 -77
  107. package/skills/teach/GLOSSARY-FORMAT.md +0 -35
  108. package/skills/teach/LEARNING-RECORD-FORMAT.md +0 -46
  109. package/skills/teach/LICENSE +0 -21
  110. package/skills/teach/MISSION-FORMAT.md +0 -31
  111. package/skills/teach/RESOURCES-FORMAT.md +0 -32
  112. package/skills/teach/SKILL.md +0 -141
  113. package/skills/teach/agents/openai.yaml +0 -4
  114. package/skills/to-questionnaire/LICENSE +0 -21
  115. package/skills/to-questionnaire/SKILL.md +0 -55
  116. package/skills/to-questionnaire/agents/openai.yaml +0 -4
  117. package/skills/to-spec/LICENSE +0 -21
  118. package/skills/to-spec/SKILL.md +0 -76
  119. package/skills/to-spec/agents/openai.yaml +0 -4
  120. package/skills/to-tickets/LICENSE +0 -21
  121. package/skills/to-tickets/SKILL.md +0 -106
  122. package/skills/to-tickets/agents/openai.yaml +0 -4
  123. package/skills/wait-what/LICENSE +0 -21
  124. package/skills/wait-what/SKILL.md +0 -8
  125. package/skills/wait-what/agents/openai.yaml +0 -4
  126. package/skills/wayfinder/LICENSE +0 -21
  127. package/skills/wayfinder/SKILL.md +0 -129
  128. package/skills/wayfinder/agents/openai.yaml +0 -4
  129. package/skills/writing-for-agents/LICENSE +0 -21
  130. package/skills/writing-for-agents/SKILL-MECHANICS.md +0 -22
  131. package/skills/writing-for-agents/SKILL.md +0 -83
  132. package/skills/writing-for-agents/agents/openai.yaml +0 -3
package/dist/skills.js CHANGED
@@ -1,17 +1,14 @@
1
- import { readFileSync } from 'node:fs';
2
- import { cp, lstat, mkdir, readdir, realpath, rm, symlink, writeFile } from 'node:fs/promises';
1
+ import { cp, lstat, mkdir, realpath, rm, symlink, writeFile } from 'node:fs/promises';
3
2
  import { homedir } from 'node:os';
4
3
  import { join, relative } from 'node:path';
5
- import { fileURLToPath } from 'node:url';
6
- import { KIT_VERSION } from './clis.js';
4
+ import { GUIDE, listSkills } from '@agentshouse/skills';
5
+ import { parse } from 'yaml';
6
+ import { KIT_RELEASE } from './clis.js';
7
7
  import { kitHome, readConfiguration, readHome, writeHome } from './home.js';
8
- import { refusalOf } from './refusals.js';
9
- export const HOW_WE_WORK = '/rooms/private/how-we-work.md';
10
- const SKILL_SET = fileURLToPath(new URL('../skills/', import.meta.url));
11
- const HOW_WE_WORK_TEXT = readFileSync(new URL('../how-we-work.md', import.meta.url), 'utf8');
12
8
  const RECORD = 'skill-set.json';
13
- const CREATED = 'how-we-work-created';
14
- const UNWRITABLE = new Set(['room_not_found', 'operation_denied']);
9
+ const ENTRY = 'SKILL.md';
10
+ const FRONTMATTER = /^---\n([\s\S]*?)\n---\n/u;
11
+ const ORIGIN = '<origin>';
15
12
  function skillsDirectory() {
16
13
  return join(homedir(), '.agents', 'skills');
17
14
  }
@@ -29,50 +26,67 @@ async function present(path) {
29
26
  throw error;
30
27
  }
31
28
  }
32
- async function install() {
33
- const names = [];
34
- for (const name of (await readdir(SKILL_SET)).sort()) {
35
- if (!(await present(join(skillsDirectory(), name))) && !(await present(join(claudeDirectory(), name)))) {
36
- names.push(name);
29
+ function skillName(text) {
30
+ const front = FRONTMATTER.exec(text);
31
+ const fields = (front === null ? null : parse(front[1]));
32
+ return typeof fields?.name === 'string' && typeof fields.description === 'string' ? fields.name : undefined;
33
+ }
34
+ function skillSet(origin) {
35
+ const upstream = listSkills().map(({ name, directory }) => ({
36
+ name,
37
+ place: (destination) => cp(directory, destination, { recursive: true }),
38
+ }));
39
+ const pages = GUIDE.flatMap(({ text }) => {
40
+ const name = skillName(text);
41
+ if (name === undefined)
42
+ return [];
43
+ const place = async (destination) => {
44
+ await mkdir(destination);
45
+ await writeFile(join(destination, ENTRY), text.replaceAll(ORIGIN, origin));
46
+ };
47
+ return [{ name, place }];
48
+ });
49
+ return [...upstream, ...pages].sort((left, right) => (left.name < right.name ? -1 : 1));
50
+ }
51
+ async function install(origin) {
52
+ const placed = [];
53
+ for (const skill of skillSet(origin)) {
54
+ if (!(await present(join(skillsDirectory(), skill.name))) && !(await present(join(claudeDirectory(), skill.name)))) {
55
+ placed.push(skill);
37
56
  }
38
57
  }
58
+ const names = placed.map((skill) => skill.name);
39
59
  await writeHome(RECORD, { names });
40
60
  await mkdir(skillsDirectory(), { recursive: true });
41
61
  await mkdir(claudeDirectory(), { recursive: true });
42
62
  const skills = await realpath(skillsDirectory());
43
63
  const claude = await realpath(claudeDirectory());
44
- for (const name of names) {
45
- await cp(join(SKILL_SET, name), join(skillsDirectory(), name), { recursive: true });
64
+ for (const { name, place } of placed) {
65
+ await place(join(skillsDirectory(), name));
46
66
  if (claude !== skills)
47
67
  await symlink(relative(claude, join(skills, name)), join(claudeDirectory(), name));
48
68
  }
49
- await writeHome(RECORD, { version: KIT_VERSION, names });
69
+ await writeHome(RECORD, { version: KIT_RELEASE, origin, names });
70
+ }
71
+ export async function placeSkillSet(origin) {
72
+ try {
73
+ await replaceSkillSet(origin);
74
+ }
75
+ catch (error) {
76
+ process.stderr.write(`kit: the skills could not be placed: ${error.message}\n`);
77
+ }
50
78
  }
51
- export async function placeSkillSet() {
79
+ async function replaceSkillSet(origin) {
52
80
  const accepted = (await readConfiguration()).skills;
53
81
  const installed = await readHome(RECORD);
54
- if (accepted && installed?.version === KIT_VERSION)
82
+ if (accepted && installed?.version === KIT_RELEASE && installed.origin === origin)
55
83
  return;
56
84
  for (const name of installed?.names ?? []) {
57
85
  await rm(join(claudeDirectory(), name), { recursive: true, force: true });
58
86
  await rm(join(skillsDirectory(), name), { recursive: true, force: true });
59
87
  }
60
88
  if (accepted)
61
- await install();
89
+ await install(origin);
62
90
  else
63
91
  await rm(join(kitHome(), RECORD), { force: true });
64
92
  }
65
- export async function createHowWeWork(bridge) {
66
- if ((await readHome(RECORD)) === null || (await present(join(kitHome(), CREATED))))
67
- return;
68
- const created = await bridge.tool('edit', { changes: [{ op: 'create', path: HOW_WE_WORK, content: HOW_WE_WORK_TEXT }] });
69
- if (created.isError === true) {
70
- const text = created.content.map((content) => content.text).join('\n');
71
- const refusal = refusalOf(text);
72
- if (UNWRITABLE.has(refusal?.code ?? ''))
73
- return;
74
- if (refusal?.code !== 'edit_conflict' || !refusal.conflicts.includes('path_exists'))
75
- throw new Error(text);
76
- }
77
- await writeFile(join(kitHome(), CREATED), '');
78
- }
@@ -1,33 +1,39 @@
1
- import { createHash } from 'node:crypto';
2
- import { createReadStream } from 'node:fs';
3
1
  import { chmod, mkdir, mkdtemp, readdir, readFile, rename, rm, stat } from 'node:fs/promises';
4
2
  import { availableParallelism, tmpdir } from 'node:os';
5
3
  import { basename, join } from 'node:path';
6
- import { pipeline } from 'node:stream/promises';
7
4
  import { unlessAborted } from './abort.js';
5
+ import { downloadServed } from './building.js';
8
6
  import { failureOf, run } from './clis.js';
7
+ import { downloaded, fetched } from './files.js';
9
8
  import { kitHome } from './home.js';
10
9
  const RELEASE = 'https://github.com/agentshouse/kit/releases/download/engine-2';
11
10
  export const MODEL = {
12
- url: 'https://huggingface.co/ggml-org/parakeet-GGUF/resolve/35156454d1a39de06863303dd209fd2bed6ee079/ggml-parakeet-tdt-0.6b-v3-q4_k.bin',
11
+ name: 'ggml-parakeet-tdt-0.6b-v3-q4_k.bin',
12
+ from: 'https://huggingface.co/ggml-org/parakeet-GGUF/resolve/35156454d1a39de06863303dd209fd2bed6ee079/ggml-parakeet-tdt-0.6b-v3-q4_k.bin',
13
13
  sha256: '8b205b8b39c6535e153de6fb11c51db46125d45c4f16ba496fe41a0fe71b885e',
14
+ bytes: 415_611_879,
14
15
  executable: false,
15
16
  };
16
17
  export const ENGINES = {
17
18
  'linux-x64': {
18
- decoder: { url: `${RELEASE}/ffmpeg-linux-x86_64`, sha256: '1f8235d206428305afb89c6e8ab99d100425a0ba61e22bb4c7aff017db8c8de5', executable: true },
19
- engine: { url: `${RELEASE}/parakeet-cli-linux-x86_64`, sha256: 'bb2585695992fe1927a33960002cdf51b8a90a96ad65593c3d0a9f1fbc0865c2', executable: true },
19
+ decoder: { name: 'ffmpeg-linux-x86_64', from: `${RELEASE}/ffmpeg-linux-x86_64`, sha256: '1f8235d206428305afb89c6e8ab99d100425a0ba61e22bb4c7aff017db8c8de5', bytes: 5_175_832, executable: true },
20
+ engine: { name: 'parakeet-cli-linux-x86_64', from: `${RELEASE}/parakeet-cli-linux-x86_64`, sha256: 'bb2585695992fe1927a33960002cdf51b8a90a96ad65593c3d0a9f1fbc0865c2', bytes: 3_801_616, executable: true },
20
21
  },
21
22
  'linux-arm64': {
22
- decoder: { url: `${RELEASE}/ffmpeg-linux-aarch64`, sha256: 'a7e08a0fae0179d1078312f6bb13d2a9aa4d4c71a1d82a022953f25dee452f5e', executable: true },
23
- engine: { url: `${RELEASE}/parakeet-cli-linux-aarch64`, sha256: 'cbc0bedc8daae97f1ef9dcee4200c06226218e300e0fd62ead1306d22742b7ed', executable: true },
23
+ decoder: { name: 'ffmpeg-linux-aarch64', from: `${RELEASE}/ffmpeg-linux-aarch64`, sha256: 'a7e08a0fae0179d1078312f6bb13d2a9aa4d4c71a1d82a022953f25dee452f5e', bytes: 4_590_208, executable: true },
24
+ engine: { name: 'parakeet-cli-linux-aarch64', from: `${RELEASE}/parakeet-cli-linux-aarch64`, sha256: 'cbc0bedc8daae97f1ef9dcee4200c06226218e300e0fd62ead1306d22742b7ed', bytes: 3_477_624, executable: true },
24
25
  },
25
26
  'darwin-arm64': {
26
- decoder: { url: `${RELEASE}/ffmpeg-darwin-arm64`, sha256: '7abe154aaed3d6b49f5167ca7221bb66bed51388925d99a7e4261a41fe52fba6', executable: true },
27
- engine: { url: `${RELEASE}/parakeet-cli-darwin-arm64`, sha256: '9a2aafc0922ad7c0b6db6eff1641e96572ba32ac40bf995a1df242ed2febf297', executable: true },
27
+ decoder: { name: 'ffmpeg-darwin-arm64', from: `${RELEASE}/ffmpeg-darwin-arm64`, sha256: '7abe154aaed3d6b49f5167ca7221bb66bed51388925d99a7e4261a41fe52fba6', bytes: 3_696_768, executable: true },
28
+ engine: { name: 'parakeet-cli-darwin-arm64', from: `${RELEASE}/parakeet-cli-darwin-arm64`, sha256: '9a2aafc0922ad7c0b6db6eff1641e96572ba32ac40bf995a1df242ed2febf297', bytes: 1_939_728, executable: true },
28
29
  },
29
30
  };
30
31
  const CHUNK_SECONDS = 20;
32
+ const OFF = "transcription is off on the Agent's Environment, so this message's audio has no text; turn it on or write instead";
33
+ const NOT_INSTALLED = "the speech engine is not installed on the Agent's Environment, so this message's audio has no text";
34
+ const NOT_DOWNLOADED = 'an audio file this message links could not be downloaded; send the message again';
35
+ const UNDECODABLE = 'an audio file this message links could not be decoded';
36
+ const UNTRANSCRIBED = 'an audio file this message links could not be transcribed';
31
37
  let held = Promise.resolve();
32
38
  let holding = Promise.resolve();
33
39
  let setting = null;
@@ -40,7 +46,7 @@ function installed(artifact) {
40
46
  return join(directory(), artifact.sha256);
41
47
  }
42
48
  async function executed(command, args, signal) {
43
- // A download or a transcription runs as long as its size needs; the setting turning off or the turn's interrupt or end aborts it instead.
49
+ // A decode or a transcription runs as long as its audio needs; the setting turning off or the turn's interrupt or end aborts it instead.
44
50
  const ran = await run(command, args, 0, false, signal);
45
51
  if (ran.status !== 0)
46
52
  throw new Error(failureOf(ran, basename(command)));
@@ -49,22 +55,50 @@ async function executed(command, args, signal) {
49
55
  function present(path) {
50
56
  return stat(path).then(() => true, () => false);
51
57
  }
52
- async function cpus() {
58
+ async function threads() {
53
59
  const [quota, period] = (await readFile('/sys/fs/cgroup/cpu.max', 'utf8').catch(() => 'max')).split(' ');
54
60
  const allowed = quota === 'max' ? Infinity : Math.ceil(Number(quota) / Number(period));
55
- return Math.min(availableParallelism(), allowed);
56
- }
57
- async function sha256(path) {
58
- const hash = createHash('sha256');
59
- await pipeline(createReadStream(path), hash);
60
- return hash.digest('hex');
61
+ return Math.max(1, Math.floor(Math.min(availableParallelism(), allowed) / 2));
61
62
  }
62
63
  function causeOf(error) {
63
64
  return error instanceof Error ? error.message : String(error);
64
65
  }
66
+ async function failing(reason, work) {
67
+ try {
68
+ return await work;
69
+ }
70
+ catch (error) {
71
+ throw new Error(reason, { cause: error });
72
+ }
73
+ }
74
+ function ready() {
75
+ if (setting !== true)
76
+ throw new Error(OFF);
77
+ if (!readiness.installed)
78
+ throw new Error(NOT_INSTALLED);
79
+ }
65
80
  function pinnedHere() {
66
81
  return ENGINES[`${process.platform}-${process.arch}`];
67
82
  }
83
+ const DOWNLOADS = 3;
84
+ async function downloadedAgain(artifact, signal) {
85
+ // An artifact arrives at a hundred kilobytes a second or its download ends, so a stalled Building cannot hold the install open.
86
+ const deadlineMs = Math.ceil(artifact.bytes / 100);
87
+ const deadline = AbortSignal.timeout(deadlineMs);
88
+ for (let attempt = 1;; attempt++) {
89
+ try {
90
+ return await downloadServed(artifact.name, artifact.sha256, `${installed(artifact)}.part`, AbortSignal.any([signal, deadline]), artifact.bytes);
91
+ }
92
+ catch (error) {
93
+ if (signal.aborted)
94
+ throw error;
95
+ if (deadline.aborted)
96
+ throw new Error(`${artifact.name} did not arrive within ${Math.ceil(deadlineMs / 1000)} seconds`);
97
+ if (attempt === DOWNLOADS)
98
+ throw error;
99
+ }
100
+ }
101
+ }
68
102
  async function install(artifacts, signal) {
69
103
  await mkdir(directory(), { recursive: true });
70
104
  const pinned = new Set(artifacts.map((artifact) => artifact.sha256));
@@ -77,13 +111,8 @@ async function install(artifacts, signal) {
77
111
  if (!(await present(installed(artifact))))
78
112
  missing.push(artifact);
79
113
  try {
80
- for (const artifact of missing) {
81
- const part = `${installed(artifact)}.part`;
82
- // Three retries carry a large download past a dropped connection before the download fails.
83
- await executed('curl', ['-fsSL', '--retry', '3', '-o', part, artifact.url], signal);
84
- if ((await sha256(part)) !== artifact.sha256)
85
- throw new Error(`${artifact.url} does not match its sha256`);
86
- }
114
+ for (const artifact of missing)
115
+ await downloadedAgain(artifact, signal);
87
116
  for (const artifact of missing) {
88
117
  if (artifact.executable)
89
118
  await chmod(`${installed(artifact)}.part`, 0o755);
@@ -133,27 +162,23 @@ export function holdTranscription(transcribe) {
133
162
  export function transcriptionReport() {
134
163
  return readiness;
135
164
  }
136
- async function transcribed(path, signal) {
165
+ async function transcribed(audio, parts, signal) {
137
166
  const pinned = pinnedHere();
138
- const work = await mkdtemp(join(tmpdir(), 'kit-transcription-'));
139
- try {
140
- await executed(installed(pinned.decoder), ['-nostdin', '-hide_banner', '-loglevel', 'error', '-i', path, '-ar', '16000', '-ac', '1', '-c:a', 'pcm_s16le',
141
- '-f', 'segment', '-segment_time', String(CHUNK_SECONDS), join(work, '%05d.wav')], signal);
142
- const parts = (await readdir(work)).sort().flatMap((part) => ['-f', join(work, part)]);
143
- const text = await executed(installed(pinned.engine), ['-t', String(await cpus()), '-np', '-m', installed(MODEL), ...parts], signal);
144
- return text
145
- .split('\n')
146
- .map((line) => line.trim())
147
- .filter((line) => line !== '')
148
- .join(' ');
149
- }
150
- finally {
151
- await rm(work, { recursive: true, force: true });
152
- }
167
+ await mkdir(parts);
168
+ await failing(UNDECODABLE, executed(installed(pinned.decoder), ['-nostdin', '-hide_banner', '-loglevel', 'error', '-i', audio, '-ar', '16000', '-ac', '1', '-c:a', 'pcm_s16le',
169
+ '-f', 'segment', '-segment_time', String(CHUNK_SECONDS), join(parts, '%05d.wav')], signal));
170
+ const segments = (await readdir(parts)).sort().flatMap((part) => ['-f', join(parts, part)]);
171
+ const said = await failing(UNTRANSCRIBED, executed(installed(pinned.engine), ['-t', String(await threads()), '-np', '-m', installed(MODEL), ...segments], signal));
172
+ const text = said
173
+ .split('\n')
174
+ .map((line) => line.trim())
175
+ .filter((line) => line !== '')
176
+ .join(' ');
177
+ if (text === '')
178
+ throw new Error(UNTRANSCRIBED);
179
+ return text;
153
180
  }
154
- export async function transcribe(path, signal) {
155
- if (!readiness.installed)
156
- return null;
181
+ async function alone(work, signal) {
157
182
  const before = held;
158
183
  let release;
159
184
  const mine = new Promise((resolve) => {
@@ -162,9 +187,24 @@ export async function transcribe(path, signal) {
162
187
  held = Promise.all([before, mine]);
163
188
  try {
164
189
  await unlessAborted(before, signal);
165
- return readiness.installed ? await transcribed(path, signal) : null;
190
+ return await work();
166
191
  }
167
192
  finally {
168
193
  release();
169
194
  }
170
195
  }
196
+ export async function transcribe(address, signal) {
197
+ ready();
198
+ const work = await mkdtemp(join(tmpdir(), 'kit-transcription-'));
199
+ try {
200
+ const audio = join(work, 'audio');
201
+ await failing(NOT_DOWNLOADED, downloaded(address, (url) => fetched(url, signal), audio, 'audio'));
202
+ return await alone(() => {
203
+ ready();
204
+ return transcribed(audio, join(work, 'parts'), signal);
205
+ }, signal);
206
+ }
207
+ finally {
208
+ await rm(work, { recursive: true, force: true });
209
+ }
210
+ }
package/dist/translate.js CHANGED
@@ -3,14 +3,8 @@ function same(left, right) {
3
3
  return JSON.stringify(left) === JSON.stringify(right);
4
4
  }
5
5
  function applied(document, changes) {
6
- let current = document;
7
- for (const change of changes) {
8
- const result = apply(current, change);
9
- if (result.outcome !== 'applied')
10
- return null;
11
- current = result.document;
12
- }
13
- return serialize(current);
6
+ const result = apply(document, changes);
7
+ return result.outcome === 'applied' ? serialize(result.document) : null;
14
8
  }
15
9
  function components(path, before, after, text) {
16
10
  const edits = [];
package/dist/update.js CHANGED
@@ -4,11 +4,15 @@ import { mkdir, readFile, rm, writeFile } from 'node:fs/promises';
4
4
  import { homedir } from 'node:os';
5
5
  import { join } from 'node:path';
6
6
  import { run } from './clis.js';
7
- import { kitHome } from './home.js';
8
- const RECORD = 'outcome=$1; shift; bash "$0" --linux "$@"; printf %s "$?" > "$outcome"; systemctl start house-kit.service';
9
- function logged(error) {
10
- process.stderr.write(`kit: ${error instanceof Error ? error.message : String(error)}\n`);
11
- }
7
+ import { kitHome, workspaceRoot } from './home.js';
8
+ import { service, throughSudo } from './placement.js';
9
+ import { relayed } from './relay.js';
10
+ const BOOTSTRAP_BYTES = 1_000_000;
11
+ // A bootstrap is at most a million bytes, so two minutes carry it over ten kilobytes a second and no stalled host holds the update queue.
12
+ const BOOTSTRAP_MS = 120_000;
13
+ // A bootstrap's downloads and CLI updates take minutes, so one still running after an hour has hung and is ended before it keeps the Kit offline.
14
+ const RERUN_MS = 60 * 60_000;
15
+ const TIMED_OUT = '124';
12
16
  function directory() {
13
17
  return join(kitHome(), 'update');
14
18
  }
@@ -18,10 +22,25 @@ function pending() {
18
22
  function outcome() {
19
23
  return join(directory(), 'outcome');
20
24
  }
21
- function unit(inputId) {
22
- return `house-kit-update-${inputId}`;
25
+ function unit(callId) {
26
+ return `house-kit-update-${callId}`;
27
+ }
28
+ function manager() {
29
+ return service() === 'user' ? ['--user'] : [];
30
+ }
31
+ function elevated() {
32
+ return throughSudo() ? ['sudo', '-n'] : [];
33
+ }
34
+ function account() {
35
+ return throughSudo() ? [`--uid=${process.getuid()}`, `--gid=${process.getgid()}`] : [];
36
+ }
37
+ function placement() {
38
+ return service() === 'user' ? ['--workspace', workspaceRoot()] : ['--linux'];
23
39
  }
24
- async function pendingInput() {
40
+ function record() {
41
+ return `outcome=$1; shift; timeout ${RERUN_MS / 1000} bash "$0" "$@"; printf %s "$?" > "$outcome"; ${[...elevated(), 'systemctl', ...manager(), 'start', 'house-kit.service'].join(' ')}`;
42
+ }
43
+ async function pendingCall() {
25
44
  try {
26
45
  return JSON.parse(await readFile(pending(), 'utf8')).input_id;
27
46
  }
@@ -33,87 +52,130 @@ async function recorded() {
33
52
  const status = await readFile(outcome(), 'utf8').catch(() => null);
34
53
  if (status === null)
35
54
  return null;
55
+ if (status.trim() === TIMED_OUT)
56
+ return { refused: `the Kit bootstrap did not finish within ${RERUN_MS / 1000} seconds` };
36
57
  return status.trim() === '0' ? {} : { refused: `the Kit bootstrap exited with ${status.trim()}` };
37
58
  }
38
- async function finished(inputId) {
59
+ async function forget(callId) {
60
+ if ((await pendingCall()) !== callId)
61
+ return;
62
+ await rm(pending(), { force: true });
63
+ await rm(outcome(), { force: true });
64
+ }
65
+ async function finished(callId) {
39
66
  for (;;) {
40
- const ack = await recorded();
41
- if (ack !== null)
42
- return ack;
67
+ const result = await recorded();
68
+ if (result !== null)
69
+ return result;
43
70
  // systemctl answers at once, so ten seconds only bounds a stuck service manager.
44
- if ((await run('systemctl', ['is-active', '--quiet', unit(inputId)], 10_000)).status !== 0) {
71
+ if ((await run('systemctl', [...manager(), 'is-active', '--quiet', unit(callId)], 10_000)).status !== 0) {
45
72
  return (await recorded()) ?? { refused: 'the Kit bootstrap did not finish' };
46
73
  }
47
74
  // The bootstrap runs for minutes, so checking each second sees its outcome within a second at little cost.
48
75
  await new Promise((resolve) => setTimeout(resolve, 1000));
49
76
  }
50
77
  }
51
- function rerun(script, inputId, flags) {
78
+ async function bounded(body, most) {
79
+ const chunks = [];
80
+ let bytes = 0;
81
+ for await (const chunk of body ?? []) {
82
+ bytes += chunk.length;
83
+ if (bytes > most)
84
+ return null;
85
+ chunks.push(chunk);
86
+ }
87
+ return Buffer.concat(chunks, bytes);
88
+ }
89
+ function rerun(script, callId, flags) {
52
90
  return new Promise((resolve) => {
53
- const child = spawn('systemd-run', [
91
+ const [command, ...args] = [
92
+ ...elevated(),
93
+ 'systemd-run',
94
+ ...manager(),
95
+ ...account(),
54
96
  '--wait',
55
97
  '--collect',
56
98
  '--quiet',
57
- `--unit=${unit(inputId)}`,
99
+ `--unit=${unit(callId)}`,
58
100
  `--setenv=HOME=${homedir()}`,
101
+ `--setenv=HOUSE_KIT_HOME=${kitHome()}`,
59
102
  '/bin/sh',
60
103
  '-c',
61
- RECORD,
104
+ record(),
62
105
  script,
63
106
  outcome(),
107
+ ...placement(),
64
108
  ...flags,
65
- ], { stdio: ['ignore', 'ignore', 'inherit'] });
66
- child.on('error', () => resolve({ refused: 'no service manager runs this Kit' }));
109
+ ];
110
+ const child = spawn(command, args, { stdio: ['ignore', 'ignore', 'inherit'] });
111
+ child.on('error', () => resolve({ refused: 'no service manager runs this Kit process' }));
67
112
  child.on('close', () => resolve(null));
68
113
  });
69
114
  }
70
- export class Updates {
71
- house;
72
- held = new Set();
115
+ export class KitUpdate {
116
+ calls;
117
+ changed;
118
+ waiting = new Map();
73
119
  queue = Promise.resolve();
74
- constructor(house) {
75
- this.house = house;
120
+ constructor(calls, changed) {
121
+ this.calls = calls;
122
+ this.changed = changed;
76
123
  }
77
124
  async resumed() {
78
- const inputId = await pendingInput();
79
- if (inputId === null)
125
+ const callId = await pendingCall();
126
+ if (callId === null)
80
127
  return;
81
- await this.acknowledge(inputId, await finished(inputId));
128
+ await this.enqueue(callId, () => finished(callId));
82
129
  }
83
- start(input) {
84
- if (this.held.has(input.input_id))
85
- return;
86
- this.held.add(input.input_id);
87
- this.queue = this.queue
88
- .then(() => this.carry(input))
89
- .then((ack) => this.acknowledge(input.input_id, ack))
90
- .catch(logged)
91
- .finally(() => this.held.delete(input.input_id));
130
+ hold(call) {
131
+ this.waiting.set(call.input_id, call);
132
+ this.changed();
133
+ }
134
+ held() {
135
+ return this.waiting.size > 0;
136
+ }
137
+ apply(resume) {
138
+ const held = [...this.waiting.values()];
139
+ this.waiting.clear();
140
+ void Promise.all(held.map((call) => this.enqueue(call.input_id, () => this.carry(call)))).then(resume);
92
141
  }
93
- async carry(input) {
94
- if ((await pendingInput()) === input.input_id)
95
- return finished(input.input_id);
96
- const answer = await fetch(input.bootstrap);
97
- if (!answer.ok)
98
- return { refused: `the Kit bootstrap could not be downloaded: ${answer.status}` };
99
- const script = Buffer.from(await answer.arrayBuffer());
100
- if (createHash('sha256').update(script).digest('hex') !== input.sha256) {
142
+ enqueue(callId, work) {
143
+ const before = this.queue;
144
+ const carried = this.calls.carry(callId, async () => {
145
+ await before;
146
+ return { result: await work(), returned: () => forget(callId) };
147
+ });
148
+ this.queue = before.then(() => carried);
149
+ return carried;
150
+ }
151
+ async carry(call) {
152
+ if ((await pendingCall()) === call.input_id)
153
+ return finished(call.input_id);
154
+ const deadline = AbortSignal.timeout(BOOTSTRAP_MS);
155
+ let script;
156
+ try {
157
+ const answer = await fetch(relayed(call.bootstrap), { signal: deadline });
158
+ if (!answer.ok)
159
+ return { refused: `the Kit bootstrap could not be downloaded: ${answer.status}` };
160
+ script = await bounded(answer.body, BOOTSTRAP_BYTES);
161
+ }
162
+ catch (error) {
163
+ if (!deadline.aborted)
164
+ throw error;
165
+ return { refused: `the Kit bootstrap did not arrive within ${BOOTSTRAP_MS / 1000} seconds` };
166
+ }
167
+ if (script === null)
168
+ return { refused: `the Kit bootstrap is larger than ${BOOTSTRAP_BYTES} bytes` };
169
+ if (createHash('sha256').update(script).digest('hex') !== call.sha256) {
101
170
  return { refused: 'the Kit bootstrap does not match its sha256' };
102
171
  }
103
172
  await mkdir(directory(), { recursive: true, mode: 0o700 });
104
173
  const path = join(directory(), 'connect-linux.sh');
105
174
  await writeFile(path, script, { mode: 0o700 });
106
175
  await rm(outcome(), { force: true });
107
- await writeFile(pending(), `${JSON.stringify({ input_id: input.input_id })}\n`, { mode: 0o600 });
108
- return (await rerun(path, input.input_id, input.update_clis ? ['--update-clis'] : [])) ?? (await recorded()) ?? {
176
+ await writeFile(pending(), `${JSON.stringify({ input_id: call.input_id })}\n`, { mode: 0o600 });
177
+ return (await rerun(path, call.input_id, call.update_clis ? ['--update-clis'] : [])) ?? (await recorded()) ?? {
109
178
  refused: 'the Kit bootstrap did not finish',
110
179
  };
111
180
  }
112
- async acknowledge(inputId, ack) {
113
- await this.house.deliver(`/kit/inputs/${inputId}/ack`, ack);
114
- if ((await pendingInput()) !== inputId)
115
- return;
116
- await rm(pending(), { force: true });
117
- await rm(outcome(), { force: true });
118
- }
119
181
  }
@@ -0,0 +1,101 @@
1
+ import { loginPath, onLoginPath } from './clis.js';
2
+ import { childEnvironment } from './relay.js';
3
+ import { killTree } from './scope.js';
4
+ const TERMINAL = 'xterm-256color';
5
+ const SIGNALLED = 128;
6
+ const NO_BASH = "bash is not on the login shell's PATH";
7
+ const LOST = { refused: 'the Kit lost its connection to House' };
8
+ function causeOf(error) {
9
+ return error instanceof Error ? error.message : String(error);
10
+ }
11
+ function failed(cause) {
12
+ process.stderr.write(`kit: a Web Wizard could not start: ${cause}\n`);
13
+ return { refused: `the script could not start: ${cause}` };
14
+ }
15
+ export class WebWizards {
16
+ calls;
17
+ send;
18
+ runs = new Map();
19
+ constructor(calls, send) {
20
+ this.calls = calls;
21
+ this.send = send;
22
+ }
23
+ start(call) {
24
+ void this.calls.carry(call.input_id, () => this.run(call));
25
+ }
26
+ notified(notification) {
27
+ const run = this.runs.get(String(notification.wizard));
28
+ if (run === undefined)
29
+ return;
30
+ if (notification.type === 'wizard_input')
31
+ this.typed(run, String(notification.data));
32
+ if (notification.type === 'wizard_size')
33
+ this.resized(run, { cols: Number(notification.cols), rows: Number(notification.rows) });
34
+ if (notification.type === 'wizard_end')
35
+ this.end(run, {});
36
+ }
37
+ disconnected() {
38
+ for (const run of this.runs.values())
39
+ this.end(run, LOST);
40
+ }
41
+ async run(call) {
42
+ const run = { terminal: null, size: null, typed: [], ended: null, sized: Promise.withResolvers() };
43
+ this.runs.set(call.input_id, run);
44
+ try {
45
+ return { result: await this.ran(call.input_id, call.script, run) };
46
+ }
47
+ finally {
48
+ this.runs.delete(call.input_id);
49
+ }
50
+ }
51
+ async ran(wizard, script, run) {
52
+ let terminal;
53
+ try {
54
+ const { spawn } = await import('@lydell/node-pty');
55
+ const shell = await onLoginPath('bash');
56
+ if (shell === null)
57
+ return failed(NO_BASH);
58
+ const path = await loginPath();
59
+ await run.sized.promise;
60
+ if (run.ended !== null)
61
+ return run.ended;
62
+ terminal = spawn(shell, ['-c', script], {
63
+ name: TERMINAL,
64
+ ...run.size,
65
+ cwd: process.cwd(),
66
+ env: { ...childEnvironment(), PATH: path },
67
+ });
68
+ }
69
+ catch (error) {
70
+ return failed(causeOf(error));
71
+ }
72
+ run.terminal = terminal;
73
+ terminal.onData((data) => this.send({ type: 'wizard_output', wizard, data }));
74
+ for (const data of run.typed.splice(0))
75
+ terminal.write(data);
76
+ const exited = await new Promise((resolve) => terminal.onExit(resolve));
77
+ return run.ended ?? { exit_code: exited.signal ? SIGNALLED + exited.signal : exited.exitCode };
78
+ }
79
+ typed(run, data) {
80
+ if (run.terminal === null)
81
+ run.typed.push(data);
82
+ else
83
+ run.terminal.write(data);
84
+ }
85
+ resized(run, size) {
86
+ run.size = size;
87
+ run.sized.resolve();
88
+ try {
89
+ run.terminal?.resize(size.cols, size.rows);
90
+ }
91
+ catch { }
92
+ }
93
+ end(run, result) {
94
+ if (run.ended !== null)
95
+ return;
96
+ run.ended = result;
97
+ run.sized.resolve();
98
+ if (run.terminal !== null)
99
+ killTree(run.terminal);
100
+ }
101
+ }