@agentshouse/kit 0.2.1-cbdf76b9a90a3 → 0.2.1-cbff58027f078

package/dist/events.js

@@ -1,8 +1,17 @@
+const AUTONOMOUS_ORIGINS = new Set(['task-notification', 'peer', 'coordinator', 'observer', 'observer-activity']);
 const COMMAND = { shown: 'command' };
 const HIDDEN = { shown: 'hidden' };
 const FINISHED = new Set(['completed', 'failed']);
 export const RUNNING_JOB = new Set(['running', 'paused']);
-const ROUTINE_TARGETS = { send_routine_request: 'access', cancel_routine_request: 'request' };
+const MESSAGE_TARGETS = new Map([
+    ['send_agent_function_request', ['agent_function', 'agent']],
+    ['cancel_agent_function_request', ['request']],
+    ['send_mail', ['conversation', 'request']],
+]);
+function counted(reports) {
+    const whole = reports.every((tokens) => Object.values(tokens).every((count) => Number.isSafeInteger(count) && count >= 0));
+    return whole ? reports.map((tokens) => ({ kind: 'tokens', tokens })) : [];
+}
 function words(line) {
     const found = [];
     let word = null;
@@ -48,11 +57,13 @@ export function houseMessage(line) {
     catch {
         return null;
     }
-    const argument = ROUTINE_TARGETS[call.command];
-    if (argument === undefined)
+    if (call === null)
+        return null;
+    const targets = MESSAGE_TARGETS.get(call.command);
+    if (targets === undefined)
         return null;
-    const target = call.arguments?.[argument];
-    return { shown: 'message', command: call.command, target: typeof target === 'string' ? target : null };
+    const target = targets.map((argument) => call.arguments?.[argument]).find((value) => typeof value === 'string');
+    return { shown: 'message', command: call.command, target: target ?? null };
 }
 function decidedByLine(command, final) {
     const line = typeof command === 'string' ? command : Array.isArray(command) ? command.at(-1) : undefined;
@@ -269,6 +280,17 @@ class Reader {
 class ClaudeReader extends Reader {
     watchedOptions = { model: 'model' };
     tasks = new Map();
+    stop = null;
+    answered(result) {
+        const models = (result?._meta?.quota?.model_usage ?? []);
+        const spent = counted(models.map(({ token_count: count }) => ({
+            input: count?.inputTokens,
+            output: count?.outputTokens,
+            cache_read: count?.cachedInputTokens,
+            cache_write: count?.cachedWriteTokens,
+        })));
+        return [...spent, ...super.answered(result)];
+    }
     own(message) {
         if (message.params?.update?._meta?.claudeCode?.parentToolUseId !== undefined)
             return [];
@@ -276,7 +298,9 @@ class ClaudeReader extends Reader {
     }
     update(update) {
         if (update.sessionUpdate === 'usage_update' && update._meta?.['_claude/origin'] !== undefined) {
-            return [...super.update(update), { kind: 'ended' }];
+            const stop = this.stop;
+            this.stop = null;
+            return [...super.update(update), { kind: 'ended', stop }];
         }
         if (update.sessionUpdate === 'session_info_update' && update._meta?.jetbrains?.air?.sessionFailure !== undefined) {
             return [{ kind: 'marker', marker: 'retry', text: update._meta.jetbrains.air.sessionFailure.title }];
@@ -287,6 +311,13 @@ class ClaudeReader extends Reader {
         if (message.method !== '_claude/sdkMessage')
             return [];
         const sdk = message.params.message;
+        if (sdk.type === 'result') {
+            if (AUTONOMOUS_ORIGINS.has(sdk.origin?.kind))
+                this.stop = null;
+            else
+                this.stop = sdk.stop_reason === 'refusal' ? 'refusal' : sdk.is_error === true ? null : 'end_turn';
+            return [];
+        }
         switch (sdk.subtype) {
             case 'task_started':
                 if (sdk.tool_use_id !== undefined)
@@ -294,6 +325,10 @@ class ClaudeReader extends Reader {
                 return [];
             case 'task_notification':
                 return sdk.tool_use_id === undefined ? [] : this.finish(sdk.tool_use_id, sdk.summary ?? null);
+            case 'task_progress':
+                if (!this.subagents.has(sdk.tool_use_id) || this.done.has(sdk.tool_use_id) || typeof sdk.description !== 'string')
+                    return [];
+                return [{ kind: 'subagent-activity', id: sdk.tool_use_id, activity: sdk.description }];
             default:
                 return [];
         }
@@ -343,6 +378,20 @@ const COLLABORATION = new Set(['spawnAgent', 'sendInput', 'resumeAgent', 'wait',
 class CodexReader extends Reader {
     watchedOptions = { mode: 'mode', collaboration_mode: 'mode' };
     children = new Map();
+    answered(result) {
+        const usage = result?.usage;
+        const spent = usage === null || usage === undefined
+            ? []
+            : counted([
+                {
+                    input: usage.inputTokens,
+                    output: usage.outputTokens,
+                    cache_read: usage.cachedReadTokens,
+                    cache_write: usage.cachedWriteTokens,
+                },
+            ]);
+        return [...spent, ...super.answered(result)];
+    }
     own(message) {
         if (message.method === 'session/request_permission' && message.params.toolCall?.kind === 'switch_mode') {
             return [{ kind: 'started' }, { kind: 'marker', marker: 'mode', text: message.params.toolCall.title ?? '' }];
@@ -356,7 +405,7 @@ class CodexReader extends Reader {
                 if (codex?.threadStatus?.type === 'active')
                     return [{ kind: 'started' }];
                 if (codex?.threadStatus?.type === 'idle')
-                    return [{ kind: 'ended' }];
+                    return [{ kind: 'ended', stop: null }];
                 if (codex?.error !== undefined)
                     return [{ kind: 'marker', marker: 'retry', text: codex.error.message ?? '' }];
                 return [];
@@ -429,7 +478,9 @@ class GrokReader extends Reader {
             return (message.params.runningPromptId ?? null) !== null && session === this.session ? [{ kind: 'started' }] : [];
         }
         if (message.params?.update?.sessionUpdate === 'turn_completed') {
-            return session === this.session ? [{ kind: 'ended' }] : [];
+            if (session !== this.session)
+                return [];
+            return [...this.spent(message.params.update.usage), { kind: 'ended', stop: null }];
         }
         if (message.method === '_x.ai/models/update') {
             this.offered(message.params);
@@ -437,6 +488,13 @@ class GrokReader extends Reader {
         }
         return super.read(message);
     }
+    spent(usage) {
+        if (usage === null || usage === undefined)
+            return [];
+        const { inputTokens, outputTokens, cachedReadTokens, cacheCreationTokens } = usage;
+        const input = inputTokens - cachedReadTokens - cacheCreationTokens;
+        return counted([{ input, output: outputTokens, cache_read: cachedReadTokens, cache_write: cacheCreationTokens }]);
+    }
     offered(models) {
         this.models = models.availableModels ?? this.models;
         this.model = models.currentModelId ?? this.model;

package/dist/files.js

@@ -1,42 +1,144 @@
-import { createHash } from 'node:crypto';
-import { mkdir, writeFile } from 'node:fs/promises';
-import { join } from 'node:path';
-import { HouseRefusal, retrying } from './api.js';
+import { createHash, randomUUID } from 'node:crypto';
+import { createWriteStream } from 'node:fs';
+import { mkdir, rename, rm } from 'node:fs/promises';
+import { basename, dirname, join } from 'node:path';
+import { Readable, Transform } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
+import { parseDocument } from 'yaml';
+import { retryDelay } from './api.js';
+import { Unsettled } from './mcp.js';
 import { relayed } from './relay.js';
-export function verified(bytes, sha256, name) {
-    if (createHash('sha256').update(bytes).digest('hex') !== sha256)
-        throw new Error(`${name} did not arrive whole; download it again`);
-    return bytes;
-}
-export async function placeFiles(house, directory, files, signal) {
-    const paths = [];
-    for (const file of files) {
-        const original = await retrying(() => house.post('/kit/conversation/originals/get', { version: file.version, download: true }, signal), signal);
-        const answer = await fetch(relayed(original.download.url), { signal });
-        if (!answer.ok)
-            throw new Error(`${file.name} did not download: ${answer.status}`);
-        const folder = join(directory, '.house', 'files', original.message, file.version);
-        await mkdir(join(directory, '.house')).catch((error) => {
-            if (error.code !== 'EEXIST')
+const STALLED_ROUNDS = 8;
+const PART_CHECKSUM = 'x-amz-checksum-sha256';
+const LINK = /\]\((\/rooms\/[^/)\s]+\/[^)\s]+)\)/gu;
+export function linkedPaths(text) {
+    return [...new Set(Array.from(text.matchAll(LINK), (link) => link[1]))];
+}
+export function inspectedFile(answer) {
+    const document = parseDocument(answer);
+    if (document.errors.length > 0)
+        return null;
+    const inspected = document.toJS();
+    if (typeof inspected?.download !== 'string')
+        return null;
+    return {
+        download: inspected.download,
+        sha256: String(inspected.sha256),
+        media_type: typeof inspected.media_type === 'string' ? inspected.media_type : null,
+    };
+}
+export function paused(milliseconds) {
+    return new Promise((resolve) => setTimeout(resolve, milliseconds));
+}
+export function storeRefusal(act, status) {
+    return new Error(`the ${act} answered ${status}; ${act} the file again`);
+}
+async function partDigests(uploading, partBytes) {
+    const whole = createHash('sha256');
+    const digests = [];
+    for (let start = 0; digests.length === 0 || start < uploading.bytes; start += partBytes) {
+        const end = Math.min(start + partBytes, uploading.bytes);
+        const digest = createHash('sha256');
+        for await (const chunk of uploading.read(start, end)) {
+            digest.update(chunk);
+            whole.update(chunk);
+        }
+        digests.push(digest.digest());
+    }
+    if (whole.digest('hex') !== uploading.sha256)
+        throw new Error(`${uploading.name} changed while it was uploaded; upload it again`);
+    return digests;
+}
+export async function uploaded(declared, uploading) {
+    const partBytes = declared.part_bytes;
+    const digests = await partDigests(uploading, partBytes);
+    const partSha256 = digests.map((digest) => digest.toString('hex'));
+    let answer = await finishing(uploading, declared.id, partSha256);
+    let idle = 0;
+    let stalled = 0;
+    while ('upload' in answer) {
+        const { id, parts } = answer.upload;
+        let sent = 0;
+        let failure = null;
+        for (const { part, url } of parts ?? []) {
+            const start = (part - 1) * partBytes;
+            try {
+                await uploading.send(url, start, Math.min(start + partBytes, uploading.bytes), {
+                    [PART_CHECKSUM]: digests[part - 1].toString('base64'),
+                });
+                sent++;
+            }
+            catch (error) {
+                failure = error;
+                break;
+            }
+        }
+        if (sent > 0) {
+            idle = 0;
+            stalled = 0;
+        }
+        else {
+            if (failure !== null && ++stalled >= STALLED_ROUNDS)
+                throw failure;
+            // A round that sent no part, its store unreachable, is followed by the next finishing call on the jittered curve.
+            await paused(retryDelay(idle++));
+        }
+        answer = await finishing(uploading, id, partSha256);
+    }
+    return answer;
+}
+async function finishing(uploading, upload, partSha256) {
+    for (let unsettled = 1;; unsettled++) {
+        try {
+            return await uploading.finish(upload, partSha256);
+        }
+        catch (error) {
+            if (!(error instanceof Unsettled) || unsettled === STALLED_ROUNDS)
                 throw error;
-        });
-        await mkdir(folder, { recursive: true });
-        const path = join(folder, file.name);
-        await writeFile(path, verified(Buffer.from(await answer.arrayBuffer()), file.sha256, file.name));
-        paths.push(path);
+        }
+        // A finishing call House did not settle, unreached or refused short of final, is sent again on the jittered curve as a conversation resends it, so a dropped connection or a House restart resumes the upload instead of ending it.
+        await paused(retryDelay(unsettled - 1));
     }
-    return paths;
-}
-export function uploadBytes(upload, bytes) {
-    return retrying(async () => {
-        const answer = await fetch(relayed(upload.url), {
-            method: 'POST',
-            headers: { 'content-type': 'application/octet-stream', 'x-house-byte-operation': upload.operation },
-            body: bytes,
+}
+async function drained(body) {
+    for await (const _chunk of body)
+        ;
+}
+export async function downloaded(address, fetching, destination, name) {
+    for (let asked = 1;; asked++) {
+        const { download, sha256 } = await address();
+        const answer = await fetching(download);
+        if (answer.status === 403 && asked === 1) {
+            await drained(answer.body);
+            continue;
+        }
+        if (answer.status !== 200) {
+            await drained(answer.body);
+            throw storeRefusal('download', answer.status);
+        }
+        await mkdir(dirname(destination), { recursive: true });
+        const partial = join(dirname(destination), `.${basename(destination)}.${randomUUID()}`);
+        const digest = createHash('sha256');
+        const hashed = new Transform({
+            transform(chunk, _encoding, done) {
+                digest.update(chunk);
+                done(null, chunk);
+            },
         });
-        const text = await answer.text();
-        if (!answer.ok)
-            throw new HouseRefusal(upload.url, answer.status, text);
-        return JSON.parse(text);
-    });
+        try {
+            await pipeline(answer.body, hashed, createWriteStream(partial, { flags: 'wx' }));
+            if (digest.digest('hex') !== sha256)
+                throw new Error(`${name} did not arrive whole; download it again`);
+            await rename(partial, destination);
+        }
+        catch (error) {
+            await rm(partial, { force: true });
+            throw error;
+        }
+        return;
+    }
+}
+export async function fetched(url, signal) {
+    const answer = await fetch(relayed(url), { signal });
+    return { status: answer.status, body: answer.body === null ? Readable.from([]) : Readable.fromWeb(answer.body) };
 }

package/dist/git.js

@@ -2,16 +2,16 @@ import { spawn } from 'node:child_process';
 import { isUtf8 } from 'node:buffer';
 import { createHash } from 'node:crypto';
 import { join } from 'node:path';
-import { withoutProxy } from './clis.js';
 import { workspaceRoot } from './home.js';
+import { childEnvironment } from './relay.js';
 export function localCopies() {
     return join(workspaceRoot(), 'local-copies');
 }
 export const HOUSE_REF = 'refs/house/received';
-const COMMITTER = 'House Kit <house-kit@localhost>';
+const COMMITTER = 'Kit <house-kit@localhost>';
 export function run(cwd, args, input, env = {}) {
     return new Promise((resolve, reject) => {
-        const child = spawn('git', args, { cwd, env: { ...withoutProxy(), ...env } });
+        const child = spawn('git', args, { cwd, env: { ...childEnvironment(), ...env } });
         const stdout = [];
         let stderr = '';
         child.stdout.on('data', (chunk) => stdout.push(chunk));
@@ -70,18 +70,52 @@ function data(text) {
     const bytes = Buffer.from(text, 'utf8');
     return [Buffer.from(`data ${bytes.length}\n`), bytes, Buffer.from('\n')];
 }
-export async function importCommits(repository, commits) {
-    const stream = [];
+function written(stream, bytes) {
+    return new Promise((resolve, reject) => {
+        stream.write(bytes, (error) => (error ? reject(error) : resolve()));
+    });
+}
+async function imported(stream, commits) {
+    await written(stream, Buffer.from('feature done\n'));
     for (const [index, commit] of commits.entries()) {
-        stream.push(Buffer.from(`commit ${HOUSE_REF}\nmark :${index + 1}\ncommitter ${COMMITTER} ${Math.floor(Date.now() / 1000)} +0000\n`), ...data(commit.message), ...(commit.from === null ? [] : [Buffer.from(`from ${commit.from}\n`)]), ...(commit.merge === undefined ? [] : [Buffer.from(`merge ${commit.merge}\n`)]), ...(commit.replaces === true ? [Buffer.from('deleteall\n')] : []));
-        for (const [path, content] of commit.files) {
-            if (content === null)
-                stream.push(Buffer.from(`D ${quoted(path)}\n`));
-            else
-                stream.push(Buffer.from(`M 100644 inline ${quoted(path)}\n`), ...data(content));
+        await written(stream, Buffer.concat([
+            Buffer.from(`commit ${HOUSE_REF}\nmark :${index + 1}\ncommitter ${COMMITTER} ${Math.floor(Date.now() / 1000)} +0000\n`),
+            ...data(commit.message),
+            ...(commit.from === null ? [] : [Buffer.from(`from ${commit.from}\n`)]),
+            ...(commit.merge === undefined ? [] : [Buffer.from(`merge ${commit.merge}\n`)]),
+            ...(commit.replaces === true ? [Buffer.from('deleteall\n')] : []),
+        ]));
+        for await (const [path, content] of commit.files) {
+            await written(stream, content === null
+                ? Buffer.from(`D ${quoted(path)}\n`)
+                : Buffer.concat([Buffer.from(`M 100644 inline ${quoted(path)}\n`), ...data(content)]));
         }
-        stream.push(Buffer.from('\n'));
+        await written(stream, Buffer.from('\n'));
+    }
+    await written(stream, Buffer.from('done\n'));
+}
+export async function importCommits(repository, commits) {
+    const child = spawn('git', ['fast-import', '--quiet', '--force'], { cwd: repository, env: childEnvironment() });
+    let stderr = '';
+    child.stdout.resume();
+    child.stderr.on('data', (chunk) => {
+        stderr += chunk.toString('utf8');
+    });
+    child.stdin.on('error', () => undefined);
+    const closed = new Promise((resolve, reject) => {
+        child.on('error', reject);
+        child.on('close', resolve);
+    });
+    try {
+        await imported(child.stdin, commits);
+        child.stdin.end();
+    }
+    catch (error) {
+        child.stdin.destroy();
+        await closed;
+        throw error.code === 'EPIPE' ? new Error(`git fast-import failed: ${stderr.trim()}`) : error;
     }
-    await git(repository, ['fast-import', '--quiet', '--force'], Buffer.concat(stream));
+    if ((await closed) !== 0)
+        throw new Error(`git fast-import failed: ${stderr.trim()}`);
     return revision(repository, HOUSE_REF);
 }

package/dist/home.js

@@ -8,7 +8,6 @@ const ENROLMENT = 'credential.json';
 const DISCONNECTED = 'disconnected.json';
 const CONFIGURATION = 'kit.json';
 const OWN_AGENT = 'own-agent.json';
-const RESTART = 'restart';
 let defaulted;
 function writable(directory) {
     try {
@@ -132,12 +131,6 @@ export async function forgetRejected(rejected) {
 export function enrolled() {
     return existsSync(join(kitHome(), ENROLMENT));
 }
-export function restartAsked() {
-    return existsSync(join(kitHome(), RESTART));
-}
-export function forgetRestart() {
-    return rm(join(kitHome(), RESTART), { force: true });
-}
 export function readOwnAgent() {
     return readHome(OWN_AGENT);
 }