@agentshouse/kit 0.2.1-c2fb1c24bcdd5 → 0.2.1-c3304109525e3

package/dist/scripts.js

@@ -0,0 +1,255 @@
+import { spawn as spawnPiped } from 'node:child_process';
+import { randomUUID } from 'node:crypto';
+import { once } from 'node:events';
+import { rmSync } from 'node:fs';
+import { mkdir, rm, writeFile } from 'node:fs/promises';
+import { constants } from 'node:os';
+import { join } from 'node:path';
+import { loginPath, onLoginPath } from './clis.js';
+import { kitHome } from './home.js';
+import { childEnvironment } from './relay.js';
+import { killTree } from './scope.js';
+const TERMINAL = 'xterm-256color';
+const FIRST_SIZE = { cols: 80, rows: 24 };
+const SIGNALLED = 128;
+const NEWLINE = 0x0a;
+const NO_BASH = "bash is not on the login shell's PATH";
+const LOST = { refused: 'the Kit lost its connection to House' };
+function causeOf(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+function failed(plan, cause) {
+    process.stderr.write(`kit: ${plan.named} could not start: ${cause}\n`);
+    return { refused: `the script could not start: ${cause}` };
+}
+function planned(call) {
+    if (call.kind === 'run_wizard')
+        return { named: 'a Web Wizard', script: call.script, terminal: 'page', function: null };
+    return {
+        named: 'an Environment function',
+        script: call.script,
+        terminal: call.terminal ? 'at once' : null,
+        function: { input: call.input, timeCap: call.time_cap, outputCap: call.output_cap },
+    };
+}
+function inputs() {
+    return join(kitHome(), 'inputs');
+}
+async function inputFile(value) {
+    await mkdir(inputs(), { recursive: true, mode: 0o700 });
+    const path = join(inputs(), `${randomUUID()}.json`);
+    await writeFile(path, JSON.stringify(value), { mode: 0o600, flag: 'wx' });
+    return path;
+}
+export function removeInputs() {
+    rmSync(inputs(), { recursive: true, force: true });
+}
+function struck(line, typed) {
+    return typed.some((typedLine) => line.includes(typedLine));
+}
+class KeptOutput {
+    cap;
+    typedText = '';
+    text = '';
+    bytes = 0;
+    line = '';
+    lineBytes = 0;
+    dropping = false;
+    cut = false;
+    constructor(cap) {
+        this.cap = cap;
+    }
+    typed(data) {
+        this.typedText += data;
+    }
+    add(data) {
+        const pieces = data.split('\n');
+        const rest = pieces.pop();
+        for (const piece of pieces)
+            this.ended(piece);
+        this.extend(rest);
+    }
+    kept() {
+        const typed = this.typedLines(true);
+        this.text = [...this.text.split(/(?<=\n)/), this.line].filter((line) => line !== '' && !struck(line, typed)).join('');
+        this.bytes = Buffer.byteLength(this.text);
+        this.trim();
+        return { output: this.text, cut: this.cut };
+    }
+    typedLines(all) {
+        const lines = this.typedText.split(/\r\n|\r|\n/);
+        if (!all)
+            lines.pop();
+        return lines.filter((line) => line !== '');
+    }
+    ended(piece) {
+        const line = `${this.line}${piece}\n`;
+        const dropped = this.dropping;
+        this.line = '';
+        this.lineBytes = 0;
+        this.dropping = false;
+        if (dropped || struck(line, this.typedLines(false)))
+            return;
+        this.text += line;
+        this.bytes += Buffer.byteLength(line);
+        if (this.bytes > 2 * this.cap)
+            this.trim();
+    }
+    extend(piece) {
+        if (this.dropping)
+            return;
+        this.line += piece;
+        this.lineBytes += Buffer.byteLength(piece);
+        if (this.lineBytes <= this.cap)
+            return;
+        this.text = '';
+        this.bytes = 0;
+        this.line = '';
+        this.lineBytes = 0;
+        this.dropping = true;
+        this.cut = true;
+    }
+    trim() {
+        if (this.bytes <= this.cap)
+            return;
+        const bytes = Buffer.from(this.text);
+        const start = bytes.indexOf(NEWLINE, bytes.length - this.cap - 1) + 1;
+        this.text = bytes.subarray(start).toString('utf8');
+        this.bytes = bytes.length - start;
+        this.cut = true;
+    }
+}
+export class Scripts {
+    calls;
+    send;
+    runs = new Map();
+    constructor(calls, send) {
+        this.calls = calls;
+        this.send = send;
+    }
+    start(call) {
+        void this.calls.carry(call.input_id, () => this.run(call.input_id, planned(call)));
+    }
+    notified(notification) {
+        const run = this.runs.get(String(notification.wizard));
+        if (run === undefined)
+            return;
+        if (notification.type === 'wizard_input')
+            this.typed(run, String(notification.data));
+        if (notification.type === 'wizard_size')
+            this.resized(run, { cols: Number(notification.cols), rows: Number(notification.rows) });
+        if (notification.type === 'wizard_end' && run.plan.terminal === 'page')
+            this.end(run, {});
+    }
+    disconnected() {
+        for (const run of this.runs.values())
+            this.end(run, LOST);
+    }
+    async run(id, plan) {
+        const size = plan.terminal === 'page' ? null : FIRST_SIZE;
+        const output = plan.function === null ? null : new KeptOutput(plan.function.outputCap);
+        const run = { plan, input: null, output, process: null, pipes: [], terminal: null, size, typed: [], ended: null, sized: Promise.withResolvers() };
+        if (size !== null)
+            run.sized.resolve();
+        this.runs.set(id, run);
+        try {
+            return { result: await this.ran(id, run), release: plan.function !== null };
+        }
+        finally {
+            this.runs.delete(id);
+            if (run.input !== null)
+                await rm(run.input, { force: true });
+        }
+    }
+    async ran(id, run) {
+        const { plan, output } = run;
+        let exited;
+        try {
+            const { spawn } = await import('@lydell/node-pty');
+            const shell = await onLoginPath('bash');
+            if (shell === null)
+                return failed(plan, NO_BASH);
+            const path = await loginPath();
+            await run.sized.promise;
+            if (plan.function !== null)
+                run.input = await inputFile(plan.function.input);
+            if (run.ended !== null)
+                return run.ended;
+            const environment = { ...childEnvironment(), PATH: path, ...(run.input === null ? {} : { HOUSE_INPUT: run.input }) };
+            if (plan.terminal === null) {
+                ({ exited } = await this.piped(plan.script, shell, environment, run));
+            }
+            else {
+                const terminal = spawn(shell, ['-c', plan.script], { name: TERMINAL, ...run.size, cwd: process.cwd(), env: environment });
+                run.process = terminal;
+                run.terminal = terminal;
+                terminal.onData((data) => {
+                    this.send({ type: 'wizard_output', wizard: id, data });
+                    output?.add(data);
+                });
+                for (const data of run.typed.splice(0))
+                    terminal.write(data);
+                exited = new Promise((resolve) => terminal.onExit(({ exitCode, signal }) => resolve(signal ? SIGNALLED + signal : exitCode)));
+            }
+        }
+        catch (error) {
+            return failed(plan, causeOf(error));
+        }
+        let timedOut = false;
+        // House sends a function run's time cap in seconds, and a run still going at its cap ends with its process group and the output pipes it holds.
+        const capped = plan.function === null ? undefined : setTimeout(() => {
+            timedOut = true;
+            this.stop(run);
+        }, plan.function.timeCap * 1000);
+        const code = await exited;
+        clearTimeout(capped);
+        if (run.ended !== null)
+            return run.ended;
+        if (output === null)
+            return { exit_code: code };
+        const kept = output.kept();
+        return timedOut ? { timed_out: true, ...kept } : { exit_code: code, ...kept };
+    }
+    async piped(script, shell, environment, run) {
+        const child = spawnPiped(shell, ['-c', script], { cwd: process.cwd(), env: environment, detached: true, stdio: ['ignore', 'pipe', 'pipe'] });
+        const exited = new Promise((resolve) => child.once('close', (code, signal) => resolve(signal === null ? code : SIGNALLED + constants.signals[signal])));
+        await once(child, 'spawn');
+        run.process = { pid: child.pid };
+        run.pipes = [child.stdout, child.stderr];
+        for (const pipe of run.pipes) {
+            pipe.setEncoding('utf8');
+            pipe.on('data', (data) => run.output.add(data));
+        }
+        if (run.ended !== null)
+            this.stop(run);
+        return { exited };
+    }
+    typed(run, data) {
+        run.output?.typed(data);
+        if (run.terminal === null)
+            run.typed.push(data);
+        else
+            run.terminal.write(data);
+    }
+    resized(run, size) {
+        run.size = size;
+        run.sized.resolve();
+        try {
+            run.terminal?.resize(size.cols, size.rows);
+        }
+        catch { }
+    }
+    end(run, result) {
+        if (run.ended !== null)
+            return;
+        run.ended = result;
+        run.sized.resolve();
+        this.stop(run);
+    }
+    stop(run) {
+        if (run.process !== null)
+            killTree(run.process);
+        for (const pipe of run.pipes)
+            pipe.destroy();
+    }
+}

package/dist/silence.js

@@ -0,0 +1,28 @@
+const SYSTEM_CLOCK = {
+    later: (delay, callback) => setTimeout(callback, delay),
+    clear: (timer) => clearTimeout(timer),
+};
+export class Silence {
+    timer = null;
+    interval;
+    silent;
+    clock;
+    constructor(interval, silent, clock = SYSTEM_CLOCK) {
+        this.interval = interval;
+        this.silent = silent;
+        this.clock = clock;
+    }
+    heard() {
+        this.stop();
+        this.timer = this.clock.later(this.interval, () => {
+            this.timer = null;
+            this.silent();
+        });
+    }
+    stop() {
+        if (this.timer === null)
+            return;
+        this.clock.clear(this.timer);
+        this.timer = null;
+    }
+}

package/dist/skills.js

@@ -1,10 +1,14 @@
-import { cp, lstat, mkdir, realpath, rm, symlink } from 'node:fs/promises';
+import { cp, lstat, mkdir, realpath, rm, symlink, writeFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { join, relative } from 'node:path';
-import { listSkills } from '@agentshouse/skills';
+import { GUIDE, listSkills } from '@agentshouse/skills';
+import { parse } from 'yaml';
 import { KIT_RELEASE } from './clis.js';
 import { kitHome, readConfiguration, readHome, writeHome } from './home.js';
 const RECORD = 'skill-set.json';
+const ENTRY = 'SKILL.md';
+const FRONTMATTER = /^---\n([\s\S]*?)\n---\n/u;
+const ORIGIN = '<origin>';
 function skillsDirectory() {
     return join(homedir(), '.agents', 'skills');
 }
@@ -22,9 +26,31 @@ async function present(path) {
         throw error;
     }
 }
-async function install() {
+function skillName(text) {
+    const front = FRONTMATTER.exec(text);
+    const fields = (front === null ? null : parse(front[1]));
+    return typeof fields?.name === 'string' && typeof fields.description === 'string' ? fields.name : undefined;
+}
+function skillSet(origin) {
+    const upstream = listSkills().map(({ name, directory }) => ({
+        name,
+        place: (destination) => cp(directory, destination, { recursive: true }),
+    }));
+    const pages = GUIDE.flatMap(({ text }) => {
+        const name = skillName(text);
+        if (name === undefined)
+            return [];
+        const place = async (destination) => {
+            await mkdir(destination);
+            await writeFile(join(destination, ENTRY), text.replaceAll(ORIGIN, origin));
+        };
+        return [{ name, place }];
+    });
+    return [...upstream, ...pages].sort((left, right) => (left.name < right.name ? -1 : 1));
+}
+async function install(origin) {
     const placed = [];
-    for (const skill of listSkills()) {
+    for (const skill of skillSet(origin)) {
         if (!(await present(join(skillsDirectory(), skill.name))) && !(await present(join(claudeDirectory(), skill.name)))) {
             placed.push(skill);
         }
@@ -35,32 +61,32 @@ async function install() {
     await mkdir(claudeDirectory(), { recursive: true });
     const skills = await realpath(skillsDirectory());
     const claude = await realpath(claudeDirectory());
-    for (const { name, directory } of placed) {
-        await cp(directory, join(skillsDirectory(), name), { recursive: true });
+    for (const { name, place } of placed) {
+        await place(join(skillsDirectory(), name));
         if (claude !== skills)
             await symlink(relative(claude, join(skills, name)), join(claudeDirectory(), name));
     }
-    await writeHome(RECORD, { version: KIT_RELEASE, names });
+    await writeHome(RECORD, { version: KIT_RELEASE, origin, names });
 }
-export async function placeSkillSet() {
+export async function placeSkillSet(origin) {
     try {
-        await replaceSkillSet();
+        await replaceSkillSet(origin);
     }
     catch (error) {
         process.stderr.write(`kit: the skills could not be placed: ${error.message}\n`);
     }
 }
-async function replaceSkillSet() {
+async function replaceSkillSet(origin) {
     const accepted = (await readConfiguration()).skills;
     const installed = await readHome(RECORD);
-    if (accepted && installed?.version === KIT_RELEASE)
+    if (accepted && installed?.version === KIT_RELEASE && installed.origin === origin)
         return;
     for (const name of installed?.names ?? []) {
         await rm(join(claudeDirectory(), name), { recursive: true, force: true });
         await rm(join(skillsDirectory(), name), { recursive: true, force: true });
     }
     if (accepted)
-        await install();
+        await install(origin);
     else
         await rm(join(kitHome(), RECORD), { force: true });
 }

package/dist/update.js

@@ -10,6 +10,9 @@ import { relayed } from './relay.js';
 const BOOTSTRAP_BYTES = 1_000_000;
 // 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.
 const BOOTSTRAP_MS = 120_000;
+// 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.
+const RERUN_MS = 60 * 60_000;
+const TIMED_OUT = '124';
 function directory() {
     return join(kitHome(), 'update');
 }
@@ -35,7 +38,7 @@ function placement() {
     return service() === 'user' ? ['--workspace', workspaceRoot()] : ['--linux'];
 }
 function record() {
-    return `outcome=$1; shift; bash "$0" "$@"; printf %s "$?" > "$outcome"; ${[...elevated(), 'systemctl', ...manager(), 'start', 'house-kit.service'].join(' ')}`;
+    return `outcome=$1; shift; timeout ${RERUN_MS / 1000} bash "$0" "$@"; printf %s "$?" > "$outcome"; ${[...elevated(), 'systemctl', ...manager(), 'start', 'house-kit.service'].join(' ')}`;
 }
 async function pendingCall() {
     try {
@@ -49,6 +52,8 @@ async function recorded() {
     const status = await readFile(outcome(), 'utf8').catch(() => null);
     if (status === null)
         return null;
+    if (status.trim() === TIMED_OUT)
+        return { refused: `the Kit bootstrap did not finish within ${RERUN_MS / 1000} seconds` };
     return status.trim() === '0' ? {} : { refused: `the Kit bootstrap exited with ${status.trim()}` };
 }
 async function forget(callId) {
@@ -109,9 +114,12 @@ function rerun(script, callId, flags) {
 }
 export class KitUpdate {
     calls;
+    changed;
+    waiting = new Map();
     queue = Promise.resolve();
-    constructor(calls) {
+    constructor(calls, changed) {
         this.calls = calls;
+        this.changed = changed;
     }
     async resumed() {
         const callId = await pendingCall();
@@ -119,8 +127,17 @@ export class KitUpdate {
             return;
         await this.enqueue(callId, () => finished(callId));
     }
-    start(call) {
-        void this.enqueue(call.input_id, () => this.carry(call));
+    hold(call) {
+        this.waiting.set(call.input_id, call);
+        this.changed();
+    }
+    held() {
+        return this.waiting.size > 0;
+    }
+    apply(resume) {
+        const held = [...this.waiting.values()];
+        this.waiting.clear();
+        void Promise.all(held.map((call) => this.enqueue(call.input_id, () => this.carry(call)))).then(resume);
     }
     enqueue(callId, work) {
         const before = this.queue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentshouse/kit",
-  "version": "0.2.1-c2fb1c24bcdd5",
+  "version": "0.2.1-c3304109525e3",
   "description": "Kit connects an Environment to agents.house.",
   "license": "MIT",
   "repository": {
@@ -24,15 +24,15 @@
     "test": "tsc -p tsconfig.json && vitest run"
   },
   "dependencies": {
-    "@agentclientprotocol/sdk": "1.7.0",
-    "@agentshouse/mdmodel": "0.1.0-cabd61587647f",
-    "@agentshouse/skills": "0.1.0-c34ad2b295b4a",
+    "@agentclientprotocol/sdk": "2.0.1",
+    "@agentshouse/mdmodel": "0.1.0-c4f4d37bc9d6a",
+    "@agentshouse/skills": "0.1.0-c1884c2b56810",
     "@lydell/node-pty": "1.2.0-beta.15",
     "yaml": "2.9.1"
   },
   "peerDependencies": {
-    "@agentclientprotocol/claude-agent-acp": "0.85.1",
-    "@agentclientprotocol/codex-acp": "2.1.1"
+    "@agentclientprotocol/claude-agent-acp": "0.94.0",
+    "@agentclientprotocol/codex-acp": "2.2.2"
   },
   "peerDependenciesMeta": {
     "@agentclientprotocol/claude-agent-acp": {
@@ -43,10 +43,10 @@
     }
   },
   "devDependencies": {
-    "@types/node": "24.13.6",
+    "@types/node": "24.19.2",
     "@types/ws": "8.18.2",
     "typescript": "7.0.2",
-    "vitest": "5.0.1",
+    "vitest": "5.0.5",
     "ws": "8.22.0"
   },
   "packageManager": "npm@11.19.1",

package/dist/web-wizard.js

@@ -1,101 +0,0 @@
-import { loginPath, onLoginPath } from './clis.js';
-import { childEnvironment } from './relay.js';
-import { killTree } from './scope.js';
-const TERMINAL = 'xterm-256color';
-const SIGNALLED = 128;
-const NO_BASH = "bash is not on the login shell's PATH";
-const LOST = { refused: 'the Kit lost its connection to House' };
-function causeOf(error) {
-    return error instanceof Error ? error.message : String(error);
-}
-function failed(cause) {
-    process.stderr.write(`kit: a Web Wizard could not start: ${cause}\n`);
-    return { refused: `the script could not start: ${cause}` };
-}
-export class WebWizards {
-    calls;
-    send;
-    runs = new Map();
-    constructor(calls, send) {
-        this.calls = calls;
-        this.send = send;
-    }
-    start(call) {
-        void this.calls.carry(call.input_id, () => this.run(call));
-    }
-    notified(notification) {
-        const run = this.runs.get(String(notification.wizard));
-        if (run === undefined)
-            return;
-        if (notification.type === 'wizard_input')
-            this.typed(run, String(notification.data));
-        if (notification.type === 'wizard_size')
-            this.resized(run, { cols: Number(notification.cols), rows: Number(notification.rows) });
-        if (notification.type === 'wizard_end')
-            this.end(run, {});
-    }
-    disconnected() {
-        for (const run of this.runs.values())
-            this.end(run, LOST);
-    }
-    async run(call) {
-        const run = { terminal: null, size: null, typed: [], ended: null, sized: Promise.withResolvers() };
-        this.runs.set(call.input_id, run);
-        try {
-            return { result: await this.ran(call.input_id, call.script, run) };
-        }
-        finally {
-            this.runs.delete(call.input_id);
-        }
-    }
-    async ran(wizard, script, run) {
-        let terminal;
-        try {
-            const { spawn } = await import('@lydell/node-pty');
-            const shell = await onLoginPath('bash');
-            if (shell === null)
-                return failed(NO_BASH);
-            const path = await loginPath();
-            await run.sized.promise;
-            if (run.ended !== null)
-                return run.ended;
-            terminal = spawn(shell, ['-c', script], {
-                name: TERMINAL,
-                ...run.size,
-                cwd: process.cwd(),
-                env: { ...childEnvironment(), PATH: path },
-            });
-        }
-        catch (error) {
-            return failed(causeOf(error));
-        }
-        run.terminal = terminal;
-        terminal.onData((data) => this.send({ type: 'wizard_output', wizard, data }));
-        for (const data of run.typed.splice(0))
-            terminal.write(data);
-        const exited = await new Promise((resolve) => terminal.onExit(resolve));
-        return run.ended ?? { exit_code: exited.signal ? SIGNALLED + exited.signal : exited.exitCode };
-    }
-    typed(run, data) {
-        if (run.terminal === null)
-            run.typed.push(data);
-        else
-            run.terminal.write(data);
-    }
-    resized(run, size) {
-        run.size = size;
-        run.sized.resolve();
-        try {
-            run.terminal?.resize(size.cols, size.rows);
-        }
-        catch { }
-    }
-    end(run, result) {
-        if (run.ended !== null)
-            return;
-        run.ended = result;
-        run.sized.resolve();
-        if (run.terminal !== null)
-            killTree(run.terminal);
-    }
-}