@agentshouse/kit 0.2.1-c84a4fccf2835 → 0.2.1-c8850697c8230
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.
- package/README.md +28 -28
- package/dist/acp.js +90 -19
- package/dist/agents.js +86 -38
- package/dist/api.js +5 -5
- package/dist/authority-main.js +2 -2
- package/dist/bridge.js +1 -1
- package/dist/building.js +46 -0
- package/dist/calls.js +71 -0
- package/dist/clis.js +58 -22
- package/dist/{stream.js → connection.js} +45 -52
- package/dist/conversations.js +429 -147
- package/dist/copies.js +53 -51
- package/dist/end.js +14 -4
- package/dist/events.js +29 -8
- package/dist/files.js +139 -37
- package/dist/git.js +3 -3
- package/dist/home.js +0 -7
- package/dist/house-cli.js +95 -87
- package/dist/house-main.js +3 -3
- package/dist/instructions.js +29 -9
- package/dist/kit-cli.js +4 -4
- package/dist/kit-main.js +3 -3
- package/dist/login.js +4 -4
- package/dist/mcp.js +6 -2
- package/dist/placement.js +11 -2
- package/dist/relay.js +21 -0
- package/dist/resident.js +46 -38
- package/dist/scope.js +15 -4
- package/dist/scripts.js +255 -0
- package/dist/service.js +23 -1
- package/dist/sign-in.js +22 -21
- package/dist/silence.js +28 -0
- package/dist/skills.js +42 -97
- package/dist/transcription.js +83 -43
- package/dist/translate.js +2 -8
- package/dist/update.js +79 -37
- package/dist/wire.js +19 -3
- package/package.json +20 -21
- package/dist/bootstrap.json +0 -24
- package/dist/clis-main.js +0 -23
- package/dist/inputs.js +0 -37
- package/how-we-work.md +0 -33
- package/skills/ask-matt/LICENSE +0 -21
- package/skills/ask-matt/PHASE-BOUNDARIES.md +0 -55
- package/skills/ask-matt/SKILL.md +0 -97
- package/skills/ask-matt/agents/openai.yaml +0 -5
- package/skills/code-review/LICENSE +0 -21
- package/skills/code-review/SKILL.md +0 -89
- package/skills/code-review/agents/openai.yaml +0 -3
- package/skills/codebase-design/DEEPENING.md +0 -37
- package/skills/codebase-design/DESIGN-IT-TWICE.md +0 -44
- package/skills/codebase-design/LICENSE +0 -21
- package/skills/codebase-design/SKILL.md +0 -114
- package/skills/codebase-design/agents/openai.yaml +0 -3
- package/skills/diagnosing-bugs/LICENSE +0 -21
- package/skills/diagnosing-bugs/SKILL.md +0 -138
- package/skills/diagnosing-bugs/agents/openai.yaml +0 -3
- package/skills/diagnosing-bugs/scripts/hitl-loop.template.sh +0 -44
- package/skills/domain-modeling/ADR-FORMAT.md +0 -47
- package/skills/domain-modeling/GLOSSARY-FORMAT.md +0 -60
- package/skills/domain-modeling/LICENSE +0 -21
- package/skills/domain-modeling/SKILL.md +0 -74
- package/skills/domain-modeling/agents/openai.yaml +0 -3
- package/skills/grill-me/LICENSE +0 -21
- package/skills/grill-me/SKILL.md +0 -7
- package/skills/grill-me/agents/openai.yaml +0 -5
- package/skills/grill-with-docs/LICENSE +0 -21
- package/skills/grill-with-docs/SKILL.md +0 -7
- package/skills/grill-with-docs/agents/openai.yaml +0 -5
- package/skills/grilling/LICENSE +0 -21
- package/skills/grilling/SKILL.md +0 -30
- package/skills/grilling/agents/openai.yaml +0 -3
- package/skills/handoff/LICENSE +0 -21
- package/skills/handoff/SKILL.md +0 -16
- package/skills/handoff/agents/openai.yaml +0 -5
- package/skills/implement/LICENSE +0 -21
- package/skills/implement/SKILL.md +0 -17
- package/skills/implement/agents/openai.yaml +0 -5
- package/skills/implement-spec/LICENSE +0 -21
- package/skills/implement-spec/SKILL.md +0 -40
- package/skills/implement-spec/agents/openai.yaml +0 -5
- package/skills/improve-codebase-architecture/HTML-REPORT.md +0 -123
- package/skills/improve-codebase-architecture/LICENSE +0 -21
- package/skills/improve-codebase-architecture/SKILL.md +0 -71
- package/skills/improve-codebase-architecture/agents/openai.yaml +0 -5
- package/skills/pr/CREDITS.md +0 -3
- package/skills/pr/LICENSE +0 -21
- package/skills/pr/SKILL.md +0 -170
- package/skills/pr/agents/openai.yaml +0 -3
- package/skills/prototype/LICENSE +0 -21
- package/skills/prototype/LOGIC.md +0 -67
- package/skills/prototype/SKILL.md +0 -26
- package/skills/prototype/UI.md +0 -112
- package/skills/prototype/agents/openai.yaml +0 -3
- package/skills/research/LICENSE +0 -21
- package/skills/research/SKILL.md +0 -12
- package/skills/research/agents/openai.yaml +0 -3
- package/skills/retro/LICENSE +0 -21
- package/skills/retro/SKILL.md +0 -44
- package/skills/retro/agents/openai.yaml +0 -5
- package/skills/tdd/LICENSE +0 -21
- package/skills/tdd/SKILL.md +0 -38
- package/skills/tdd/agents/openai.yaml +0 -3
- package/skills/tdd/mocking.md +0 -59
- package/skills/tdd/tests.md +0 -77
- package/skills/teach/GLOSSARY-FORMAT.md +0 -35
- package/skills/teach/LEARNING-RECORD-FORMAT.md +0 -46
- package/skills/teach/LICENSE +0 -21
- package/skills/teach/MISSION-FORMAT.md +0 -31
- package/skills/teach/RESOURCES-FORMAT.md +0 -32
- package/skills/teach/SKILL.md +0 -140
- package/skills/teach/agents/openai.yaml +0 -5
- package/skills/to-questionnaire/LICENSE +0 -21
- package/skills/to-questionnaire/SKILL.md +0 -54
- package/skills/to-questionnaire/agents/openai.yaml +0 -5
- package/skills/to-spec/LICENSE +0 -21
- package/skills/to-spec/SKILL.md +0 -75
- package/skills/to-spec/agents/openai.yaml +0 -5
- package/skills/to-tickets/LICENSE +0 -21
- package/skills/to-tickets/SKILL.md +0 -105
- package/skills/to-tickets/agents/openai.yaml +0 -5
- package/skills/triage/AGENT-BRIEF.md +0 -207
- package/skills/triage/LICENSE +0 -21
- package/skills/triage/OUT-OF-SCOPE.md +0 -105
- package/skills/triage/SKILL.md +0 -112
- package/skills/triage/agents/openai.yaml +0 -5
- package/skills/wait-what/LICENSE +0 -21
- package/skills/wait-what/SKILL.md +0 -7
- package/skills/wait-what/agents/openai.yaml +0 -5
- package/skills/wayfinder/LICENSE +0 -21
- package/skills/wayfinder/SKILL.md +0 -128
- package/skills/wayfinder/agents/openai.yaml +0 -5
- package/skills/wizard/LICENSE +0 -21
- package/skills/wizard/SKILL.md +0 -44
- package/skills/wizard/agents/openai.yaml +0 -3
- package/skills/wizard/template.sh +0 -223
- package/skills/writing-for-agents/LICENSE +0 -21
- package/skills/writing-for-agents/SKILL-MECHANICS.md +0 -22
- package/skills/writing-for-agents/SKILL.md +0 -81
- package/skills/writing-for-agents/agents/openai.yaml +0 -3
package/dist/skills.js
CHANGED
|
@@ -1,31 +1,14 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { readFileSync } from 'node:fs';
|
|
3
|
-
import { cp, lstat, mkdir, readdir, realpath, rm, symlink } from 'node:fs/promises';
|
|
1
|
+
import { cp, lstat, mkdir, realpath, rm, symlink, writeFile } from 'node:fs/promises';
|
|
4
2
|
import { homedir } from 'node:os';
|
|
5
3
|
import { join, relative } from 'node:path';
|
|
6
|
-
import {
|
|
4
|
+
import { GUIDE, listSkills } from '@agentshouse/skills';
|
|
7
5
|
import { parse } from 'yaml';
|
|
8
|
-
import {
|
|
6
|
+
import { KIT_RELEASE } from './clis.js';
|
|
9
7
|
import { kitHome, readConfiguration, readHome, writeHome } from './home.js';
|
|
10
|
-
import { refusalOf } from './refusals.js';
|
|
11
|
-
const HOW_WE_WORK = '/rooms/private/how-we-work.md';
|
|
12
|
-
const SKILL_SET = fileURLToPath(new URL('../skills/', import.meta.url));
|
|
13
|
-
const HOW_WE_WORK_TEXT = readFileSync(new URL('../how-we-work.md', import.meta.url), 'utf8');
|
|
14
|
-
const SHIPPED_HOW_WE_WORK = [
|
|
15
|
-
'ae4dda60da7b174f22dc5fa9bf07fc27c25864932a74230de4f9f509ddd91f41',
|
|
16
|
-
'0bdcd43e1603ba6673a3cae56d70bbf90657cbeefd124e91a47be2ca1cbd6c93',
|
|
17
|
-
'4106a87ec66da6f7b2a10e74d18e6559d68d5f4fe7415dae68f5c7bdb9081968',
|
|
18
|
-
'ac814a2197038f037b657bb719340395f89f319ac9fcdd386629c3fe2cec68f1',
|
|
19
|
-
'29951ee394aad9979eecfed3e5dc32c2c86e2226b6a380db5dbd4f305f4d1156',
|
|
20
|
-
];
|
|
21
8
|
const RECORD = 'skill-set.json';
|
|
22
|
-
const
|
|
23
|
-
const
|
|
24
|
-
const
|
|
25
|
-
const CHANGED = new Set(['base_revision_stale', 'path_absent']);
|
|
26
|
-
const UNREADABLE = /^(?:\S+: )?(?:path_not_found|room_not_found|operation_denied)\b/;
|
|
27
|
-
const FAILED = /^exit: [1-9]\d*$/;
|
|
28
|
-
const CUT = /^stderr: shell: output_cut (\d+) of \d+ bytes; continue with: (.+)$/;
|
|
9
|
+
const ENTRY = 'SKILL.md';
|
|
10
|
+
const FRONTMATTER = /^---\n([\s\S]*?)\n---\n/u;
|
|
11
|
+
const ORIGIN = '<origin>';
|
|
29
12
|
function skillsDirectory() {
|
|
30
13
|
return join(homedir(), '.agents', 'skills');
|
|
31
14
|
}
|
|
@@ -43,105 +26,67 @@ async function present(path) {
|
|
|
43
26
|
throw error;
|
|
44
27
|
}
|
|
45
28
|
}
|
|
46
|
-
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
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);
|
|
51
56
|
}
|
|
52
57
|
}
|
|
58
|
+
const names = placed.map((skill) => skill.name);
|
|
53
59
|
await writeHome(RECORD, { names });
|
|
54
60
|
await mkdir(skillsDirectory(), { recursive: true });
|
|
55
61
|
await mkdir(claudeDirectory(), { recursive: true });
|
|
56
62
|
const skills = await realpath(skillsDirectory());
|
|
57
63
|
const claude = await realpath(claudeDirectory());
|
|
58
|
-
for (const name of
|
|
59
|
-
await
|
|
64
|
+
for (const { name, place } of placed) {
|
|
65
|
+
await place(join(skillsDirectory(), name));
|
|
60
66
|
if (claude !== skills)
|
|
61
67
|
await symlink(relative(claude, join(skills, name)), join(claudeDirectory(), name));
|
|
62
68
|
}
|
|
63
|
-
await writeHome(RECORD, { version:
|
|
69
|
+
await writeHome(RECORD, { version: KIT_RELEASE, origin, names });
|
|
64
70
|
}
|
|
65
|
-
export async function placeSkillSet() {
|
|
71
|
+
export async function placeSkillSet(origin) {
|
|
66
72
|
try {
|
|
67
|
-
await replaceSkillSet();
|
|
73
|
+
await replaceSkillSet(origin);
|
|
68
74
|
}
|
|
69
75
|
catch (error) {
|
|
70
76
|
process.stderr.write(`kit: the skills could not be placed: ${error.message}\n`);
|
|
71
77
|
}
|
|
72
78
|
}
|
|
73
|
-
async function replaceSkillSet() {
|
|
79
|
+
async function replaceSkillSet(origin) {
|
|
74
80
|
const accepted = (await readConfiguration()).skills;
|
|
75
81
|
const installed = await readHome(RECORD);
|
|
76
|
-
if (accepted && installed?.version ===
|
|
82
|
+
if (accepted && installed?.version === KIT_RELEASE && installed.origin === origin)
|
|
77
83
|
return;
|
|
78
84
|
for (const name of installed?.names ?? []) {
|
|
79
85
|
await rm(join(claudeDirectory(), name), { recursive: true, force: true });
|
|
80
86
|
await rm(join(skillsDirectory(), name), { recursive: true, force: true });
|
|
81
87
|
}
|
|
82
88
|
if (accepted)
|
|
83
|
-
await install();
|
|
89
|
+
await install(origin);
|
|
84
90
|
else
|
|
85
91
|
await rm(join(kitHome(), RECORD), { force: true });
|
|
86
92
|
}
|
|
87
|
-
function sha256(text) {
|
|
88
|
-
return createHash('sha256').update(text).digest('hex');
|
|
89
|
-
}
|
|
90
|
-
function cutOf(lines) {
|
|
91
|
-
const cut = CUT.exec(lines[0] ?? '');
|
|
92
|
-
return cut !== null && Buffer.byteLength(lines.slice(1).join('\n')) === Number(cut[1]) ? cut : null;
|
|
93
|
-
}
|
|
94
|
-
export async function readHowWeWork(bridge) {
|
|
95
|
-
let document = '';
|
|
96
|
-
for (let command = `cat ${HOW_WE_WORK}`; command !== undefined;) {
|
|
97
|
-
const read = await bridge.tool('shell', { command });
|
|
98
|
-
const text = read.content.map((content) => content.text).join('\n');
|
|
99
|
-
const lines = text.split('\n');
|
|
100
|
-
if (read.isError === true || (FAILED.test(lines[0] ?? '') && lines[1]?.startsWith('stderr: '))) {
|
|
101
|
-
const refusal = read.isError === true ? text : lines.slice(1).join('\n').replace(/^stderr: /gm, '');
|
|
102
|
-
if (UNREADABLE.test(refusal))
|
|
103
|
-
return '';
|
|
104
|
-
throw new Error(refusal);
|
|
105
|
-
}
|
|
106
|
-
const cut = cutOf(lines);
|
|
107
|
-
document += lines.slice(cut === null ? 0 : 1).join('\n');
|
|
108
|
-
command = cut?.[2];
|
|
109
|
-
}
|
|
110
|
-
return document;
|
|
111
|
-
}
|
|
112
|
-
async function currentRevision(bridge) {
|
|
113
|
-
const inspected = await bridge.tool('inspect', { path: HOW_WE_WORK });
|
|
114
|
-
const text = inspected.content.map((content) => content.text).join('\n');
|
|
115
|
-
if (inspected.isError === true)
|
|
116
|
-
throw new Error(text);
|
|
117
|
-
return parse(text).revisions[0].revision;
|
|
118
|
-
}
|
|
119
|
-
async function edit(bridge, change, kept) {
|
|
120
|
-
const edited = await bridge.tool('edit', { changes: [{ ...change, path: HOW_WE_WORK, content: HOW_WE_WORK_TEXT }] });
|
|
121
|
-
if (edited.isError !== true)
|
|
122
|
-
return 'written';
|
|
123
|
-
const text = edited.content.map((content) => content.text).join('\n');
|
|
124
|
-
const refusal = refusalOf(text);
|
|
125
|
-
if (UNWRITABLE.has(refusal?.code ?? ''))
|
|
126
|
-
return 'unwritable';
|
|
127
|
-
if (refusal?.code === 'edit_conflict' && refusal.conflicts.some((conflict) => kept.has(conflict)))
|
|
128
|
-
return 'kept';
|
|
129
|
-
throw new Error(text);
|
|
130
|
-
}
|
|
131
|
-
export async function createHowWeWork(bridge) {
|
|
132
|
-
if (!(await readConfiguration()).skills || (await readHome(RECORD))?.version === undefined)
|
|
133
|
-
return;
|
|
134
|
-
const current = sha256(HOW_WE_WORK_TEXT);
|
|
135
|
-
if ((await readHome(WRITTEN)) === current)
|
|
136
|
-
return;
|
|
137
|
-
const created = await edit(bridge, { op: 'create' }, PRESENT);
|
|
138
|
-
if (created === 'unwritable')
|
|
139
|
-
return;
|
|
140
|
-
if (created === 'kept') {
|
|
141
|
-
const base = await currentRevision(bridge);
|
|
142
|
-
const held = sha256(await readHowWeWork(bridge));
|
|
143
|
-
if (held !== current && SHIPPED_HOW_WE_WORK.includes(held) && (await edit(bridge, { op: 'replace', base }, CHANGED)) === 'unwritable')
|
|
144
|
-
return;
|
|
145
|
-
}
|
|
146
|
-
await writeHome(WRITTEN, current);
|
|
147
|
-
}
|
package/dist/transcription.js
CHANGED
|
@@ -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
|
-
|
|
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: {
|
|
19
|
-
engine: {
|
|
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: {
|
|
23
|
-
engine: {
|
|
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: {
|
|
27
|
-
engine: {
|
|
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
|
|
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)));
|
|
@@ -54,17 +60,45 @@ async function threads() {
|
|
|
54
60
|
const allowed = quota === 'max' ? Infinity : Math.ceil(Number(quota) / Number(period));
|
|
55
61
|
return Math.max(1, Math.floor(Math.min(availableParallelism(), allowed) / 2));
|
|
56
62
|
}
|
|
57
|
-
async function sha256(path) {
|
|
58
|
-
const hash = createHash('sha256');
|
|
59
|
-
await pipeline(createReadStream(path), hash);
|
|
60
|
-
return hash.digest('hex');
|
|
61
|
-
}
|
|
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
|
-
|
|
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(
|
|
165
|
+
async function transcribed(audio, parts, signal) {
|
|
137
166
|
const pinned = pinnedHere();
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
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
|
-
|
|
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
|
|
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
|
-
|
|
7
|
-
|
|
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
|
@@ -6,6 +6,13 @@ import { join } from 'node:path';
|
|
|
6
6
|
import { run } from './clis.js';
|
|
7
7
|
import { kitHome, workspaceRoot } from './home.js';
|
|
8
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 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';
|
|
9
16
|
function directory() {
|
|
10
17
|
return join(kitHome(), 'update');
|
|
11
18
|
}
|
|
@@ -15,8 +22,8 @@ function pending() {
|
|
|
15
22
|
function outcome() {
|
|
16
23
|
return join(directory(), 'outcome');
|
|
17
24
|
}
|
|
18
|
-
function unit(
|
|
19
|
-
return `house-kit-update-${
|
|
25
|
+
function unit(callId) {
|
|
26
|
+
return `house-kit-update-${callId}`;
|
|
20
27
|
}
|
|
21
28
|
function manager() {
|
|
22
29
|
return service() === 'user' ? ['--user'] : [];
|
|
@@ -31,9 +38,9 @@ function placement() {
|
|
|
31
38
|
return service() === 'user' ? ['--workspace', workspaceRoot()] : ['--linux'];
|
|
32
39
|
}
|
|
33
40
|
function record() {
|
|
34
|
-
return `outcome=$1; shift; bash "$0" "$@"; printf %s "$?" > "$outcome"; ${[...elevated(), 'systemctl', ...manager(), 'start', 'house-kit.service'].join(' ')}`;
|
|
41
|
+
return `outcome=$1; shift; timeout ${RERUN_MS / 1000} bash "$0" "$@"; printf %s "$?" > "$outcome"; ${[...elevated(), 'systemctl', ...manager(), 'start', 'house-kit.service'].join(' ')}`;
|
|
35
42
|
}
|
|
36
|
-
async function
|
|
43
|
+
async function pendingCall() {
|
|
37
44
|
try {
|
|
38
45
|
return JSON.parse(await readFile(pending(), 'utf8')).input_id;
|
|
39
46
|
}
|
|
@@ -45,28 +52,41 @@ async function recorded() {
|
|
|
45
52
|
const status = await readFile(outcome(), 'utf8').catch(() => null);
|
|
46
53
|
if (status === null)
|
|
47
54
|
return null;
|
|
55
|
+
if (status.trim() === TIMED_OUT)
|
|
56
|
+
return { refused: `the Kit bootstrap did not finish within ${RERUN_MS / 1000} seconds` };
|
|
48
57
|
return status.trim() === '0' ? {} : { refused: `the Kit bootstrap exited with ${status.trim()}` };
|
|
49
58
|
}
|
|
50
|
-
async function forget(
|
|
51
|
-
if ((await
|
|
59
|
+
async function forget(callId) {
|
|
60
|
+
if ((await pendingCall()) !== callId)
|
|
52
61
|
return;
|
|
53
62
|
await rm(pending(), { force: true });
|
|
54
63
|
await rm(outcome(), { force: true });
|
|
55
64
|
}
|
|
56
|
-
async function finished(
|
|
65
|
+
async function finished(callId) {
|
|
57
66
|
for (;;) {
|
|
58
|
-
const
|
|
59
|
-
if (
|
|
60
|
-
return
|
|
67
|
+
const result = await recorded();
|
|
68
|
+
if (result !== null)
|
|
69
|
+
return result;
|
|
61
70
|
// systemctl answers at once, so ten seconds only bounds a stuck service manager.
|
|
62
|
-
if ((await run('systemctl', [...manager(), 'is-active', '--quiet', unit(
|
|
71
|
+
if ((await run('systemctl', [...manager(), 'is-active', '--quiet', unit(callId)], 10_000)).status !== 0) {
|
|
63
72
|
return (await recorded()) ?? { refused: 'the Kit bootstrap did not finish' };
|
|
64
73
|
}
|
|
65
74
|
// The bootstrap runs for minutes, so checking each second sees its outcome within a second at little cost.
|
|
66
75
|
await new Promise((resolve) => setTimeout(resolve, 1000));
|
|
67
76
|
}
|
|
68
77
|
}
|
|
69
|
-
function
|
|
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) {
|
|
70
90
|
return new Promise((resolve) => {
|
|
71
91
|
const [command, ...args] = [
|
|
72
92
|
...elevated(),
|
|
@@ -76,7 +96,7 @@ function rerun(script, inputId, flags) {
|
|
|
76
96
|
'--wait',
|
|
77
97
|
'--collect',
|
|
78
98
|
'--quiet',
|
|
79
|
-
`--unit=${unit(
|
|
99
|
+
`--unit=${unit(callId)}`,
|
|
80
100
|
`--setenv=HOME=${homedir()}`,
|
|
81
101
|
`--setenv=HOUSE_KIT_HOME=${kitHome()}`,
|
|
82
102
|
'/bin/sh',
|
|
@@ -85,53 +105,75 @@ function rerun(script, inputId, flags) {
|
|
|
85
105
|
script,
|
|
86
106
|
outcome(),
|
|
87
107
|
...placement(),
|
|
88
|
-
...flags,
|
|
89
108
|
];
|
|
90
109
|
const child = spawn(command, args, { stdio: ['ignore', 'ignore', 'inherit'] });
|
|
91
|
-
child.on('error', () => resolve({ refused: 'no service manager runs this Kit' }));
|
|
110
|
+
child.on('error', () => resolve({ refused: 'no service manager runs this Kit process' }));
|
|
92
111
|
child.on('close', () => resolve(null));
|
|
93
112
|
});
|
|
94
113
|
}
|
|
95
|
-
export class
|
|
96
|
-
|
|
114
|
+
export class KitUpdate {
|
|
115
|
+
calls;
|
|
116
|
+
changed;
|
|
117
|
+
waiting = new Map();
|
|
97
118
|
queue = Promise.resolve();
|
|
98
|
-
constructor(
|
|
99
|
-
this.
|
|
119
|
+
constructor(calls, changed) {
|
|
120
|
+
this.calls = calls;
|
|
121
|
+
this.changed = changed;
|
|
100
122
|
}
|
|
101
123
|
async resumed() {
|
|
102
|
-
const
|
|
103
|
-
if (
|
|
124
|
+
const callId = await pendingCall();
|
|
125
|
+
if (callId === null)
|
|
104
126
|
return;
|
|
105
|
-
await this.enqueue(
|
|
127
|
+
await this.enqueue(callId, () => finished(callId));
|
|
128
|
+
}
|
|
129
|
+
hold(call) {
|
|
130
|
+
this.waiting.set(call.input_id, call);
|
|
131
|
+
this.changed();
|
|
106
132
|
}
|
|
107
|
-
|
|
108
|
-
|
|
133
|
+
held() {
|
|
134
|
+
return this.waiting.size > 0;
|
|
109
135
|
}
|
|
110
|
-
|
|
136
|
+
apply(resume) {
|
|
137
|
+
const held = [...this.waiting.values()];
|
|
138
|
+
this.waiting.clear();
|
|
139
|
+
void Promise.all(held.map((call) => this.enqueue(call.input_id, () => this.carry(call)))).then(resume);
|
|
140
|
+
}
|
|
141
|
+
enqueue(callId, work) {
|
|
111
142
|
const before = this.queue;
|
|
112
|
-
const carried = this.
|
|
143
|
+
const carried = this.calls.carry(callId, async () => {
|
|
113
144
|
await before;
|
|
114
|
-
return {
|
|
145
|
+
return { result: await work(), returned: () => forget(callId) };
|
|
115
146
|
});
|
|
116
147
|
this.queue = before.then(() => carried);
|
|
117
148
|
return carried;
|
|
118
149
|
}
|
|
119
|
-
async carry(
|
|
120
|
-
if ((await
|
|
121
|
-
return finished(
|
|
122
|
-
const
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
150
|
+
async carry(call) {
|
|
151
|
+
if ((await pendingCall()) === call.input_id)
|
|
152
|
+
return finished(call.input_id);
|
|
153
|
+
const deadline = AbortSignal.timeout(BOOTSTRAP_MS);
|
|
154
|
+
let script;
|
|
155
|
+
try {
|
|
156
|
+
const answer = await fetch(relayed(call.bootstrap), { signal: deadline });
|
|
157
|
+
if (!answer.ok)
|
|
158
|
+
return { refused: `the Kit bootstrap could not be downloaded: ${answer.status}` };
|
|
159
|
+
script = await bounded(answer.body, BOOTSTRAP_BYTES);
|
|
160
|
+
}
|
|
161
|
+
catch (error) {
|
|
162
|
+
if (!deadline.aborted)
|
|
163
|
+
throw error;
|
|
164
|
+
return { refused: `the Kit bootstrap did not arrive within ${BOOTSTRAP_MS / 1000} seconds` };
|
|
165
|
+
}
|
|
166
|
+
if (script === null)
|
|
167
|
+
return { refused: `the Kit bootstrap is larger than ${BOOTSTRAP_BYTES} bytes` };
|
|
168
|
+
if (createHash('sha256').update(script).digest('hex') !== call.sha256) {
|
|
127
169
|
return { refused: 'the Kit bootstrap does not match its sha256' };
|
|
128
170
|
}
|
|
129
171
|
await mkdir(directory(), { recursive: true, mode: 0o700 });
|
|
130
172
|
const path = join(directory(), 'connect-linux.sh');
|
|
131
173
|
await writeFile(path, script, { mode: 0o700 });
|
|
132
174
|
await rm(outcome(), { force: true });
|
|
133
|
-
await writeFile(pending(), `${JSON.stringify({ input_id:
|
|
134
|
-
return (await rerun(path,
|
|
175
|
+
await writeFile(pending(), `${JSON.stringify({ input_id: call.input_id })}\n`, { mode: 0o600 });
|
|
176
|
+
return (await rerun(path, call.input_id)) ?? (await recorded()) ?? {
|
|
135
177
|
refused: 'the Kit bootstrap did not finish',
|
|
136
178
|
};
|
|
137
179
|
}
|
package/dist/wire.js
CHANGED
|
@@ -1,6 +1,22 @@
|
|
|
1
|
+
import { newerThanHouse, updateRequired } from './end.js';
|
|
2
|
+
import { machine } from './placement.js';
|
|
1
3
|
import { refusalOf } from './refusals.js';
|
|
2
|
-
export const KIT_WIRE =
|
|
4
|
+
export const KIT_WIRE = 3;
|
|
3
5
|
export const KIT_WIRE_HEADER = 'x-house-kit-wire';
|
|
4
|
-
|
|
5
|
-
|
|
6
|
+
function newer(text) {
|
|
7
|
+
let body;
|
|
8
|
+
try {
|
|
9
|
+
body = JSON.parse(text);
|
|
10
|
+
}
|
|
11
|
+
catch {
|
|
12
|
+
return null;
|
|
13
|
+
}
|
|
14
|
+
return body?.error?.code === 'kit_newer_than_house' ? body.error : null;
|
|
15
|
+
}
|
|
16
|
+
export function endUnserved(text) {
|
|
17
|
+
if (refusalOf(text)?.code === 'kit_update_required')
|
|
18
|
+
updateRequired();
|
|
19
|
+
const refused = newer(text);
|
|
20
|
+
if (refused !== null)
|
|
21
|
+
newerThanHouse(refused.release, refused.commands[machine()]);
|
|
6
22
|
}
|