@agentshouse/kit 0.2.1-c2c600f2d2b30 → 0.2.1-c2eef9f27f3ab
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 +42 -41
- package/dist/acp.js +50 -106
- package/dist/agents.js +149 -43
- package/dist/api.js +26 -4
- package/dist/app-git.js +48 -0
- package/dist/authority-main.js +2 -2
- package/dist/bridge.js +37 -59
- package/dist/building.js +46 -0
- package/dist/calls.js +63 -0
- package/dist/chatgpt.js +32 -0
- package/dist/clis-main.js +2 -2
- package/dist/clis.js +156 -78
- package/dist/codex-main.js +58 -0
- package/dist/connection.js +126 -0
- package/dist/conversations.js +623 -325
- package/dist/copies.js +188 -126
- package/dist/end.js +24 -5
- package/dist/enrol-main.js +7 -1
- package/dist/events.js +525 -0
- package/dist/files.js +139 -17
- package/dist/git.js +13 -11
- package/dist/home.js +96 -7
- package/dist/house-cli.js +299 -0
- package/dist/house-main.js +7 -159
- package/dist/instructions.js +7 -9
- package/dist/kit-cli.js +68 -0
- package/dist/kit-main.js +8 -19
- package/dist/login.js +117 -104
- package/dist/logout.js +14 -13
- package/dist/mcp.js +4 -2
- package/dist/parts.js +82 -0
- package/dist/placement.js +39 -0
- package/dist/refusals.js +12 -0
- package/dist/relay.js +33 -2
- package/dist/resident.js +112 -50
- package/dist/scope.js +206 -0
- package/dist/secret-input.js +2 -2
- package/dist/service-main.js +9 -0
- package/dist/service.js +55 -0
- package/dist/shell.js +3 -0
- package/dist/sign-in.js +40 -33
- package/dist/skills.js +20 -32
- package/dist/transcription.js +129 -43
- package/dist/translate.js +2 -8
- package/dist/update.js +98 -53
- package/dist/web-wizard.js +101 -0
- package/dist/wire.js +22 -0
- package/dist/work.js +346 -0
- package/package.json +16 -16
- package/dist/blocks.js +0 -51
- package/dist/bootstrap.json +0 -24
- package/dist/stream.js +0 -72
- package/how-we-work.md +0 -23
- package/skills/ask-matt/LICENSE +0 -21
- package/skills/ask-matt/PHASE-BOUNDARIES.md +0 -55
- package/skills/ask-matt/SKILL.md +0 -91
- package/skills/ask-matt/agents/openai.yaml +0 -4
- 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 -116
- package/skills/codebase-design/agents/openai.yaml +0 -3
- package/skills/diagnosing-bugs/LICENSE +0 -21
- package/skills/diagnosing-bugs/SKILL.md +0 -140
- 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/CONTEXT-FORMAT.md +0 -60
- package/skills/domain-modeling/LICENSE +0 -21
- package/skills/domain-modeling/SKILL.md +0 -76
- package/skills/domain-modeling/agents/openai.yaml +0 -3
- package/skills/grill-me/LICENSE +0 -21
- package/skills/grill-me/SKILL.md +0 -8
- package/skills/grill-me/agents/openai.yaml +0 -4
- package/skills/grill-with-docs/LICENSE +0 -21
- package/skills/grill-with-docs/SKILL.md +0 -8
- package/skills/grill-with-docs/agents/openai.yaml +0 -4
- 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 -17
- package/skills/handoff/agents/openai.yaml +0 -4
- package/skills/implement/LICENSE +0 -21
- package/skills/implement/SKILL.md +0 -16
- package/skills/implement/agents/openai.yaml +0 -4
- 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 -72
- package/skills/improve-codebase-architecture/agents/openai.yaml +0 -4
- package/skills/prototype/LICENSE +0 -21
- package/skills/prototype/LOGIC.md +0 -67
- package/skills/prototype/SKILL.md +0 -28
- 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 -14
- package/skills/research/agents/openai.yaml +0 -3
- package/skills/resolving-merge-conflicts/LICENSE +0 -21
- package/skills/resolving-merge-conflicts/SKILL.md +0 -16
- package/skills/resolving-merge-conflicts/agents/openai.yaml +0 -3
- package/skills/tdd/LICENSE +0 -21
- package/skills/tdd/SKILL.md +0 -40
- 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 -141
- package/skills/teach/agents/openai.yaml +0 -4
- package/skills/to-questionnaire/LICENSE +0 -21
- package/skills/to-questionnaire/SKILL.md +0 -55
- package/skills/to-questionnaire/agents/openai.yaml +0 -4
- package/skills/to-spec/LICENSE +0 -21
- package/skills/to-spec/SKILL.md +0 -76
- package/skills/to-spec/agents/openai.yaml +0 -4
- package/skills/to-tickets/LICENSE +0 -21
- package/skills/to-tickets/SKILL.md +0 -106
- package/skills/to-tickets/agents/openai.yaml +0 -4
- package/skills/wait-what/LICENSE +0 -21
- package/skills/wait-what/SKILL.md +0 -8
- package/skills/wait-what/agents/openai.yaml +0 -4
- package/skills/wayfinder/LICENSE +0 -21
- package/skills/wayfinder/SKILL.md +0 -129
- package/skills/wayfinder/agents/openai.yaml +0 -4
- 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 -83
- package/skills/writing-for-agents/agents/openai.yaml +0 -3
package/dist/skills.js
CHANGED
|
@@ -1,17 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { cp, lstat, mkdir, readdir, realpath, rm, symlink, writeFile } from 'node:fs/promises';
|
|
1
|
+
import { cp, lstat, mkdir, realpath, rm, symlink } from 'node:fs/promises';
|
|
3
2
|
import { homedir } from 'node:os';
|
|
4
3
|
import { join, relative } from 'node:path';
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
4
|
+
import { listSkills } from '@agentshouse/skills';
|
|
5
|
+
import { KIT_RELEASE } from './clis.js';
|
|
7
6
|
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
7
|
const RECORD = 'skill-set.json';
|
|
13
|
-
const CREATED = 'how-we-work-created';
|
|
14
|
-
const UNWRITABLE = new Set(['room_not_found', 'operation_denied']);
|
|
15
8
|
function skillsDirectory() {
|
|
16
9
|
return join(homedir(), '.agents', 'skills');
|
|
17
10
|
}
|
|
@@ -30,28 +23,37 @@ async function present(path) {
|
|
|
30
23
|
}
|
|
31
24
|
}
|
|
32
25
|
async function install() {
|
|
33
|
-
const
|
|
34
|
-
for (const
|
|
35
|
-
if (!(await present(join(skillsDirectory(), name))) && !(await present(join(claudeDirectory(), name)))) {
|
|
36
|
-
|
|
26
|
+
const placed = [];
|
|
27
|
+
for (const skill of listSkills()) {
|
|
28
|
+
if (!(await present(join(skillsDirectory(), skill.name))) && !(await present(join(claudeDirectory(), skill.name)))) {
|
|
29
|
+
placed.push(skill);
|
|
37
30
|
}
|
|
38
31
|
}
|
|
32
|
+
const names = placed.map((skill) => skill.name);
|
|
39
33
|
await writeHome(RECORD, { names });
|
|
40
34
|
await mkdir(skillsDirectory(), { recursive: true });
|
|
41
35
|
await mkdir(claudeDirectory(), { recursive: true });
|
|
42
36
|
const skills = await realpath(skillsDirectory());
|
|
43
37
|
const claude = await realpath(claudeDirectory());
|
|
44
|
-
for (const name of
|
|
45
|
-
await cp(
|
|
38
|
+
for (const { name, directory } of placed) {
|
|
39
|
+
await cp(directory, join(skillsDirectory(), name), { recursive: true });
|
|
46
40
|
if (claude !== skills)
|
|
47
41
|
await symlink(relative(claude, join(skills, name)), join(claudeDirectory(), name));
|
|
48
42
|
}
|
|
49
|
-
await writeHome(RECORD, { version:
|
|
43
|
+
await writeHome(RECORD, { version: KIT_RELEASE, names });
|
|
50
44
|
}
|
|
51
45
|
export async function placeSkillSet() {
|
|
46
|
+
try {
|
|
47
|
+
await replaceSkillSet();
|
|
48
|
+
}
|
|
49
|
+
catch (error) {
|
|
50
|
+
process.stderr.write(`kit: the skills could not be placed: ${error.message}\n`);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
async function replaceSkillSet() {
|
|
52
54
|
const accepted = (await readConfiguration()).skills;
|
|
53
55
|
const installed = await readHome(RECORD);
|
|
54
|
-
if (accepted && installed?.version ===
|
|
56
|
+
if (accepted && installed?.version === KIT_RELEASE)
|
|
55
57
|
return;
|
|
56
58
|
for (const name of installed?.names ?? []) {
|
|
57
59
|
await rm(join(claudeDirectory(), name), { recursive: true, force: true });
|
|
@@ -62,17 +64,3 @@ export async function placeSkillSet() {
|
|
|
62
64
|
else
|
|
63
65
|
await rm(join(kitHome(), RECORD), { force: true });
|
|
64
66
|
}
|
|
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
|
-
}
|
package/dist/transcription.js
CHANGED
|
@@ -1,34 +1,44 @@
|
|
|
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();
|
|
38
|
+
let holding = Promise.resolve();
|
|
39
|
+
let setting = null;
|
|
40
|
+
let downloading = null;
|
|
41
|
+
let readiness = { installed: false, failure: null };
|
|
32
42
|
function directory() {
|
|
33
43
|
return join(kitHome(), 'transcription');
|
|
34
44
|
}
|
|
@@ -36,7 +46,7 @@ function installed(artifact) {
|
|
|
36
46
|
return join(directory(), artifact.sha256);
|
|
37
47
|
}
|
|
38
48
|
async function executed(command, args, signal) {
|
|
39
|
-
// 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.
|
|
40
50
|
const ran = await run(command, args, 0, false, signal);
|
|
41
51
|
if (ran.status !== 0)
|
|
42
52
|
throw new Error(failureOf(ran, basename(command)));
|
|
@@ -45,15 +55,49 @@ async function executed(command, args, signal) {
|
|
|
45
55
|
function present(path) {
|
|
46
56
|
return stat(path).then(() => true, () => false);
|
|
47
57
|
}
|
|
48
|
-
async function
|
|
58
|
+
async function threads() {
|
|
49
59
|
const [quota, period] = (await readFile('/sys/fs/cgroup/cpu.max', 'utf8').catch(() => 'max')).split(' ');
|
|
50
60
|
const allowed = quota === 'max' ? Infinity : Math.ceil(Number(quota) / Number(period));
|
|
51
|
-
return Math.min(availableParallelism(), allowed);
|
|
61
|
+
return Math.max(1, Math.floor(Math.min(availableParallelism(), allowed) / 2));
|
|
52
62
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
63
|
+
function causeOf(error) {
|
|
64
|
+
return error instanceof Error ? error.message : String(error);
|
|
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
|
+
}
|
|
80
|
+
function pinnedHere() {
|
|
81
|
+
return ENGINES[`${process.platform}-${process.arch}`];
|
|
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
|
+
}
|
|
57
101
|
}
|
|
58
102
|
async function install(artifacts, signal) {
|
|
59
103
|
await mkdir(directory(), { recursive: true });
|
|
@@ -67,13 +111,8 @@ async function install(artifacts, signal) {
|
|
|
67
111
|
if (!(await present(installed(artifact))))
|
|
68
112
|
missing.push(artifact);
|
|
69
113
|
try {
|
|
70
|
-
for (const artifact of missing)
|
|
71
|
-
|
|
72
|
-
// Three retries carry a large download past a dropped connection before the transcription fails.
|
|
73
|
-
await executed('curl', ['-fsSL', '--retry', '3', '-o', part, artifact.url], signal);
|
|
74
|
-
if ((await sha256(part)) !== artifact.sha256)
|
|
75
|
-
throw new Error(`${artifact.url} does not match its sha256`);
|
|
76
|
-
}
|
|
114
|
+
for (const artifact of missing)
|
|
115
|
+
await downloadedAgain(artifact, signal);
|
|
77
116
|
for (const artifact of missing) {
|
|
78
117
|
if (artifact.executable)
|
|
79
118
|
await chmod(`${installed(artifact)}.part`, 0o755);
|
|
@@ -85,29 +124,61 @@ async function install(artifacts, signal) {
|
|
|
85
124
|
await rm(`${installed(artifact)}.part`, { force: true });
|
|
86
125
|
}
|
|
87
126
|
}
|
|
88
|
-
|
|
89
|
-
const
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
127
|
+
function reported(next) {
|
|
128
|
+
const changed = next.installed !== readiness.installed || next.failure !== readiness.failure;
|
|
129
|
+
readiness = next;
|
|
130
|
+
return changed;
|
|
131
|
+
}
|
|
132
|
+
async function settle(transcribe) {
|
|
133
|
+
if (transcribe === setting)
|
|
134
|
+
return false;
|
|
135
|
+
setting = transcribe;
|
|
136
|
+
if (!transcribe) {
|
|
137
|
+
await rm(directory(), { recursive: true, force: true });
|
|
138
|
+
return reported({ installed: false, failure: null });
|
|
139
|
+
}
|
|
140
|
+
const download = new AbortController();
|
|
141
|
+
downloading = download;
|
|
95
142
|
try {
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
.filter((line) => line !== '')
|
|
104
|
-
.join(' ');
|
|
143
|
+
const pinned = pinnedHere();
|
|
144
|
+
await install([pinned.decoder, pinned.engine, MODEL], download.signal);
|
|
145
|
+
return reported({ installed: true, failure: null });
|
|
146
|
+
}
|
|
147
|
+
catch (error) {
|
|
148
|
+
await rm(directory(), { recursive: true, force: true });
|
|
149
|
+
return reported({ installed: false, failure: download.signal.aborted ? null : causeOf(error) });
|
|
105
150
|
}
|
|
106
151
|
finally {
|
|
107
|
-
|
|
152
|
+
downloading = null;
|
|
108
153
|
}
|
|
109
154
|
}
|
|
110
|
-
export
|
|
155
|
+
export function holdTranscription(transcribe) {
|
|
156
|
+
if (!transcribe)
|
|
157
|
+
downloading?.abort();
|
|
158
|
+
const settled = holding.then(() => settle(transcribe));
|
|
159
|
+
holding = settled.catch(() => undefined);
|
|
160
|
+
return settled;
|
|
161
|
+
}
|
|
162
|
+
export function transcriptionReport() {
|
|
163
|
+
return readiness;
|
|
164
|
+
}
|
|
165
|
+
async function transcribed(audio, parts, signal) {
|
|
166
|
+
const pinned = pinnedHere();
|
|
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;
|
|
180
|
+
}
|
|
181
|
+
async function alone(work, signal) {
|
|
111
182
|
const before = held;
|
|
112
183
|
let release;
|
|
113
184
|
const mine = new Promise((resolve) => {
|
|
@@ -116,9 +187,24 @@ export async function transcribe(path, signal) {
|
|
|
116
187
|
held = Promise.all([before, mine]);
|
|
117
188
|
try {
|
|
118
189
|
await unlessAborted(before, signal);
|
|
119
|
-
return await
|
|
190
|
+
return await work();
|
|
120
191
|
}
|
|
121
192
|
finally {
|
|
122
193
|
release();
|
|
123
194
|
}
|
|
124
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
|
@@ -4,11 +4,12 @@ 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
|
-
|
|
9
|
-
|
|
10
|
-
|
|
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;
|
|
12
13
|
function directory() {
|
|
13
14
|
return join(kitHome(), 'update');
|
|
14
15
|
}
|
|
@@ -18,10 +19,25 @@ function pending() {
|
|
|
18
19
|
function outcome() {
|
|
19
20
|
return join(directory(), 'outcome');
|
|
20
21
|
}
|
|
21
|
-
function unit(
|
|
22
|
-
return `house-kit-update-${
|
|
22
|
+
function unit(callId) {
|
|
23
|
+
return `house-kit-update-${callId}`;
|
|
24
|
+
}
|
|
25
|
+
function manager() {
|
|
26
|
+
return service() === 'user' ? ['--user'] : [];
|
|
27
|
+
}
|
|
28
|
+
function elevated() {
|
|
29
|
+
return throughSudo() ? ['sudo', '-n'] : [];
|
|
30
|
+
}
|
|
31
|
+
function account() {
|
|
32
|
+
return throughSudo() ? [`--uid=${process.getuid()}`, `--gid=${process.getgid()}`] : [];
|
|
23
33
|
}
|
|
24
|
-
|
|
34
|
+
function placement() {
|
|
35
|
+
return service() === 'user' ? ['--workspace', workspaceRoot()] : ['--linux'];
|
|
36
|
+
}
|
|
37
|
+
function record() {
|
|
38
|
+
return `outcome=$1; shift; bash "$0" "$@"; printf %s "$?" > "$outcome"; ${[...elevated(), 'systemctl', ...manager(), 'start', 'house-kit.service'].join(' ')}`;
|
|
39
|
+
}
|
|
40
|
+
async function pendingCall() {
|
|
25
41
|
try {
|
|
26
42
|
return JSON.parse(await readFile(pending(), 'utf8')).input_id;
|
|
27
43
|
}
|
|
@@ -35,85 +51,114 @@ async function recorded() {
|
|
|
35
51
|
return null;
|
|
36
52
|
return status.trim() === '0' ? {} : { refused: `the Kit bootstrap exited with ${status.trim()}` };
|
|
37
53
|
}
|
|
38
|
-
async function
|
|
54
|
+
async function forget(callId) {
|
|
55
|
+
if ((await pendingCall()) !== callId)
|
|
56
|
+
return;
|
|
57
|
+
await rm(pending(), { force: true });
|
|
58
|
+
await rm(outcome(), { force: true });
|
|
59
|
+
}
|
|
60
|
+
async function finished(callId) {
|
|
39
61
|
for (;;) {
|
|
40
|
-
const
|
|
41
|
-
if (
|
|
42
|
-
return
|
|
62
|
+
const result = await recorded();
|
|
63
|
+
if (result !== null)
|
|
64
|
+
return result;
|
|
43
65
|
// systemctl answers at once, so ten seconds only bounds a stuck service manager.
|
|
44
|
-
if ((await run('systemctl', ['is-active', '--quiet', unit(
|
|
66
|
+
if ((await run('systemctl', [...manager(), 'is-active', '--quiet', unit(callId)], 10_000)).status !== 0) {
|
|
45
67
|
return (await recorded()) ?? { refused: 'the Kit bootstrap did not finish' };
|
|
46
68
|
}
|
|
47
69
|
// The bootstrap runs for minutes, so checking each second sees its outcome within a second at little cost.
|
|
48
70
|
await new Promise((resolve) => setTimeout(resolve, 1000));
|
|
49
71
|
}
|
|
50
72
|
}
|
|
51
|
-
function
|
|
73
|
+
async function bounded(body, most) {
|
|
74
|
+
const chunks = [];
|
|
75
|
+
let bytes = 0;
|
|
76
|
+
for await (const chunk of body ?? []) {
|
|
77
|
+
bytes += chunk.length;
|
|
78
|
+
if (bytes > most)
|
|
79
|
+
return null;
|
|
80
|
+
chunks.push(chunk);
|
|
81
|
+
}
|
|
82
|
+
return Buffer.concat(chunks, bytes);
|
|
83
|
+
}
|
|
84
|
+
function rerun(script, callId, flags) {
|
|
52
85
|
return new Promise((resolve) => {
|
|
53
|
-
const
|
|
86
|
+
const [command, ...args] = [
|
|
87
|
+
...elevated(),
|
|
88
|
+
'systemd-run',
|
|
89
|
+
...manager(),
|
|
90
|
+
...account(),
|
|
54
91
|
'--wait',
|
|
55
92
|
'--collect',
|
|
56
93
|
'--quiet',
|
|
57
|
-
`--unit=${unit(
|
|
94
|
+
`--unit=${unit(callId)}`,
|
|
58
95
|
`--setenv=HOME=${homedir()}`,
|
|
96
|
+
`--setenv=HOUSE_KIT_HOME=${kitHome()}`,
|
|
59
97
|
'/bin/sh',
|
|
60
98
|
'-c',
|
|
61
|
-
|
|
99
|
+
record(),
|
|
62
100
|
script,
|
|
63
101
|
outcome(),
|
|
102
|
+
...placement(),
|
|
64
103
|
...flags,
|
|
65
|
-
]
|
|
66
|
-
child
|
|
104
|
+
];
|
|
105
|
+
const child = spawn(command, args, { stdio: ['ignore', 'ignore', 'inherit'] });
|
|
106
|
+
child.on('error', () => resolve({ refused: 'no service manager runs this Kit process' }));
|
|
67
107
|
child.on('close', () => resolve(null));
|
|
68
108
|
});
|
|
69
109
|
}
|
|
70
|
-
export class
|
|
71
|
-
|
|
72
|
-
held = new Set();
|
|
110
|
+
export class KitUpdate {
|
|
111
|
+
calls;
|
|
73
112
|
queue = Promise.resolve();
|
|
74
|
-
constructor(
|
|
75
|
-
this.
|
|
113
|
+
constructor(calls) {
|
|
114
|
+
this.calls = calls;
|
|
76
115
|
}
|
|
77
116
|
async resumed() {
|
|
78
|
-
const
|
|
79
|
-
if (
|
|
117
|
+
const callId = await pendingCall();
|
|
118
|
+
if (callId === null)
|
|
80
119
|
return;
|
|
81
|
-
await this.
|
|
120
|
+
await this.enqueue(callId, () => finished(callId));
|
|
82
121
|
}
|
|
83
|
-
start(
|
|
84
|
-
|
|
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));
|
|
122
|
+
start(call) {
|
|
123
|
+
void this.enqueue(call.input_id, () => this.carry(call));
|
|
92
124
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
125
|
+
enqueue(callId, work) {
|
|
126
|
+
const before = this.queue;
|
|
127
|
+
const carried = this.calls.carry(callId, async () => {
|
|
128
|
+
await before;
|
|
129
|
+
return { result: await work(), returned: () => forget(callId) };
|
|
130
|
+
});
|
|
131
|
+
this.queue = before.then(() => carried);
|
|
132
|
+
return carried;
|
|
133
|
+
}
|
|
134
|
+
async carry(call) {
|
|
135
|
+
if ((await pendingCall()) === call.input_id)
|
|
136
|
+
return finished(call.input_id);
|
|
137
|
+
const deadline = AbortSignal.timeout(BOOTSTRAP_MS);
|
|
138
|
+
let script;
|
|
139
|
+
try {
|
|
140
|
+
const answer = await fetch(relayed(call.bootstrap), { signal: deadline });
|
|
141
|
+
if (!answer.ok)
|
|
142
|
+
return { refused: `the Kit bootstrap could not be downloaded: ${answer.status}` };
|
|
143
|
+
script = await bounded(answer.body, BOOTSTRAP_BYTES);
|
|
144
|
+
}
|
|
145
|
+
catch (error) {
|
|
146
|
+
if (!deadline.aborted)
|
|
147
|
+
throw error;
|
|
148
|
+
return { refused: `the Kit bootstrap did not arrive within ${BOOTSTRAP_MS / 1000} seconds` };
|
|
149
|
+
}
|
|
150
|
+
if (script === null)
|
|
151
|
+
return { refused: `the Kit bootstrap is larger than ${BOOTSTRAP_BYTES} bytes` };
|
|
152
|
+
if (createHash('sha256').update(script).digest('hex') !== call.sha256) {
|
|
101
153
|
return { refused: 'the Kit bootstrap does not match its sha256' };
|
|
102
154
|
}
|
|
103
155
|
await mkdir(directory(), { recursive: true, mode: 0o700 });
|
|
104
156
|
const path = join(directory(), 'connect-linux.sh');
|
|
105
157
|
await writeFile(path, script, { mode: 0o700 });
|
|
106
158
|
await rm(outcome(), { force: true });
|
|
107
|
-
await writeFile(pending(), `${JSON.stringify({ input_id:
|
|
108
|
-
return (await rerun(path,
|
|
159
|
+
await writeFile(pending(), `${JSON.stringify({ input_id: call.input_id })}\n`, { mode: 0o600 });
|
|
160
|
+
return (await rerun(path, call.input_id, call.update_clis ? ['--update-clis'] : [])) ?? (await recorded()) ?? {
|
|
109
161
|
refused: 'the Kit bootstrap did not finish',
|
|
110
162
|
};
|
|
111
163
|
}
|
|
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
164
|
}
|
|
@@ -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
|
+
}
|