@agentshouse/kit 0.2.1-alpha.11 → 0.2.1-alpha.12

package/dist/agents.js

@@ -1,21 +1,64 @@
 import { client } from '@agentclientprotocol/sdk';
 import { readFile } from 'node:fs/promises';
-import { startAdapter } from './acp.js';
+import { killTree, startAdapter } from './acp.js';
 import { CLIS, KIT_VERSION, cliCommand, install, run } from './clis.js';
 import { kitHome } from './home.js';
-async function signedIn(kind) {
-    const probe = CLIS[kind].signedIn;
-    if ('command' in probe) {
-        return (await run(cliCommand(kind), probe.command, 30_000)).status === 0;
+const SIGNED_OUT = { signed_in: false, models: [] };
+function select(options, category) {
+    const option = options.find((candidate) => candidate.category === category);
+    return option?.type === 'select' ? option : undefined;
+}
+function values(options) {
+    return options.flatMap((entry) => ('group' in entry ? entry.options : [entry])).map((entry) => entry.value);
+}
+function causeOf(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+async function models(kind, adapter, known) {
+    const agent = adapter.connection.agent;
+    const opened = await agent.request('session/new', { cwd: kitHome(), mcpServers: [] });
+    let options = opened.configOptions ?? [];
+    const model = select(options, 'model');
+    if (model === undefined)
+        return [];
+    const offered = [];
+    for (const value of values(model.options)) {
+        if (select(options, 'model')?.currentValue !== value) {
+            try {
+                options = (await agent.request('session/set_config_option', { sessionId: opened.sessionId, configId: model.id, value })).configOptions;
+            }
+            catch (error) {
+                process.stderr.write(`kit: ${kind} refused its model ${value}: ${causeOf(error)}\n`);
+                offered.push({ model: value, efforts: known.find((entry) => entry.model === value)?.efforts ?? [] });
+                continue;
+            }
+        }
+        const effort = select(options, 'thought_level');
+        offered.push({ model: value, efforts: effort === undefined ? [] : values(effort.options) });
     }
+    return offered;
+}
+async function offer(kind, known) {
+    const probe = CLIS[kind].signedIn;
+    if ('command' in probe && (await run(cliCommand(kind), probe.command, 30_000)).status !== 0)
+        return SIGNED_OUT;
+    let adapter;
     try {
-        const adapter = await startAdapter(kind, kitHome(), client({ name: '@agentshouse/kit' }));
-        adapter.child.kill('SIGKILL');
-        const method = adapter.initialized._meta?.[probe.initializeMeta];
-        return typeof method === 'string' && method.length > 0;
+        adapter = await startAdapter(kind, kitHome(), client({ name: '@agentshouse/kit' }));
+        if ('initializeMeta' in probe) {
+            const method = adapter.initialized._meta?.[probe.initializeMeta];
+            if (typeof method !== 'string' || method.length === 0)
+                return SIGNED_OUT;
+        }
+        return { signed_in: true, models: await models(kind, adapter, known.models) };
+    }
+    catch (error) {
+        process.stderr.write(`kit: ${kind} did not offer its models: ${causeOf(error)}\n`);
+        return adapter === undefined && 'initializeMeta' in probe ? known : { signed_in: true, models: known.models };
     }
-    catch {
-        return false;
+    finally {
+        if (adapter !== undefined)
+            killTree(adapter.child);
     }
 }
 async function sshHostKey() {
@@ -31,9 +74,12 @@ export class Agents {
     house;
     reading = Promise.resolve();
     installing = Promise.resolve();
-    releases = new Map();
+    installs = new Map();
+    offers = new Map();
     reporting = null;
     again = false;
+    sending = Promise.resolve();
+    sent = null;
     constructor(house) {
         this.house = house;
     }
@@ -62,24 +108,36 @@ export class Agents {
             this.again = true;
         return Promise.all([installing, this.reporting]).then(() => undefined);
     }
-    async report() {
+    report() {
+        const sending = this.sending.catch(() => undefined).then(() => this.send());
+        this.sending = sending;
+        return sending;
+    }
+    async send() {
         const agents = [];
-        for (const [kind, release] of this.releases) {
-            agents.push({ kind, release, signed_in: release !== null && (await signedIn(kind)) });
+        for (const [kind, installed] of this.installs) {
+            const offered = installed.release === null ? SIGNED_OUT : await offer(kind, this.offers.get(kind) ?? SIGNED_OUT);
+            this.offers.set(kind, offered);
+            agents.push({ kind, ...installed, ...offered });
         }
         const hostKey = await sshHostKey();
-        await this.house.deliver('/kit/agents/report', {
+        const body = {
             os: await operatingSystem(),
             kit_version: KIT_VERSION,
             agents,
             ...(hostKey === null ? {} : { ssh_host_key: hostKey }),
-        });
+        };
+        const state = JSON.stringify(body);
+        if (state === this.sent)
+            return;
+        await this.house.deliver('/kit/agents/report', body);
+        this.sent = state;
     }
     async install(kinds) {
-        const releases = new Map();
+        const installs = new Map();
         for (const kind of kinds)
-            releases.set(kind, await install(kind));
-        this.releases = releases;
+            installs.set(kind, await install(kind));
+        this.installs = installs;
     }
     async reports() {
         try {

package/dist/bootstrap.json

@@ -1,12 +1,12 @@
 {
   "schemaVersion": 1,
-  "version": "0.2.1-alpha.11",
+  "version": "0.2.1-alpha.12",
   "hosts": {
     "linux": {
-      "command": "bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.2.1-alpha.11/connect-linux.sh)",
+      "command": "bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.2.1-alpha.12/connect-linux.sh)",
       "asset": {
         "name": "connect-linux.sh",
-        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-alpha.11/connect-linux.sh"
+        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-alpha.12/connect-linux.sh"
       },
       "workspace": {
         "argument": "--workspace",
@@ -14,10 +14,10 @@
       }
     },
     "windows": {
-      "command": "& ([scriptblock]::Create((irm https://github.com/agentshouse/kit/releases/download/v0.2.1-alpha.11/connect-windows.ps1)))",
+      "command": "& ([scriptblock]::Create((irm https://github.com/agentshouse/kit/releases/download/v0.2.1-alpha.12/connect-windows.ps1)))",
       "asset": {
         "name": "connect-windows.ps1",
-        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-alpha.11/connect-windows.ps1"
+        "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-alpha.12/connect-windows.ps1"
       },
       "workspace": {
         "argument": "--workspace",

package/dist/clis.js

@@ -115,11 +115,12 @@ export function run(command, args, timeoutMs) {
 export async function install(kind) {
     const release = pinned(kind);
     if ((await installedRelease(kind)) === release)
-        return release;
+        return { release, failure: null };
     const ran = await run('npm', ['install', '--prefix', prefix(kind), '--no-save', '--no-audit', '--no-fund', `${CLIS[kind].package}@${release}`], 15 * 60_000);
     if (ran.status !== 0) {
-        process.stderr.write(`kit: ${kind} did not install: ${ran.output.trim()}\n`);
-        return null;
+        const failure = ran.output.trim() || `npm exited with ${ran.status ?? 'a signal'}`;
+        process.stderr.write(`kit: ${kind} did not install: ${failure}\n`);
+        return { release: null, failure };
     }
-    return installedRelease(kind);
+    return { release: await installedRelease(kind), failure: null };
 }

package/dist/resident.js

@@ -14,6 +14,7 @@ import { SignIns } from './sign-in.js';
 import { placeSkillSet } from './skills.js';
 import { holdStream } from './stream.js';
 import { Updates } from './update.js';
+const AGENTS_REREAD_MS = 60 * 60_000;
 function report(error) {
     process.stderr.write(`kit: ${error instanceof Error ? error.message : String(error)}\n`);
 }
@@ -93,6 +94,7 @@ export async function resident() {
     await house.deliver('/kit/restarted', {}).catch(report);
     await updates.resumed().catch(report);
     logged(agents.refresh());
+    setInterval(() => logged(agents.refresh()), AGENTS_REREAD_MS);
     stream = holdStream({
         opened: () => {
             conversations.opened();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentshouse/kit",
-  "version": "0.2.1-alpha.11",
+  "version": "0.2.1-alpha.12",
   "description": "House Kit connects an Environment to agents.house.",
   "license": "MIT",
   "repository": {