@agentshouse/kit 0.2.1-cb6679d048e60 → 0.2.1-cca9e1f43de44

package/dist/clis.js

@@ -1,34 +1,15 @@
 import { spawn } from 'node:child_process';
 import { readFileSync } from 'node:fs';
-import { readFile } from 'node:fs/promises';
-import { userInfo } from 'node:os';
+import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import { homedir, userInfo } from 'node:os';
 import { join } from 'node:path';
 import { kitHome } from './home.js';
-const RUNNING_JOB = new Set(['running', 'paused']);
-function threadStatus({ method, params }) {
-    if (method !== 'session/update' || params?.update?.sessionUpdate !== 'session_info_update')
-        return undefined;
-    return params.update._meta?.codex?.threadStatus?.type;
-}
-function asyncTask({ method, params }) {
-    const update = params?.update;
-    if (method !== 'session/update' || update?.asyncTaskId === undefined)
-        return null;
-    if (update.sessionUpdate === 'async_task_spawned')
-        return { id: update.asyncTaskId, running: true };
-    if (update.sessionUpdate === 'async_task_state_update' && !RUNNING_JOB.has(update.state ?? '')) {
-        return { id: update.asyncTaskId, running: false };
-    }
-    return null;
-}
-function airPhase({ _meta }) {
-    const phase = _meta?.jetbrains?.air?.phase;
-    if (phase === 'commentary')
-        return 'note';
-    if (phase === 'final_answer')
-        return 'answer';
-    return null;
+async function allowHouseInCodex() {
+    const rules = join(process.env.CODEX_HOME || join(homedir(), '.codex'), 'rules');
+    await mkdir(rules, { recursive: true });
+    await writeFile(join(rules, 'house.rules'), 'prefix_rule(pattern = ["house"], decision = "allow")\n');
 }
+async function nothing() { }
 export const CLIS = {
     'codex-acp': {
         bin: 'codex',
@@ -36,13 +17,12 @@ export const CLIS = {
         install: 'curl -fsSL https://chatgpt.com/codex/install.sh | sh',
         adapter: { package: '@agentclientprotocol/codex-acp', bin: 'codex-acp', executable: 'CODEX_PATH', env: {} },
         args: [],
+        fullAccess: 'agent-full-access',
+        sessionMeta: {},
+        allowHouse: allowHouseInCodex,
         signedIn: { command: ['login', 'status'] },
         login: { args: ['login', '--device-auth'], code: 'show' },
-        queues: false,
-        turnStarted: (notice) => threadStatus(notice) === 'active',
-        turnEnded: (notice) => threadStatus(notice) === 'idle',
-        job: asyncTask,
-        phase: airPhase,
+        air: ['asyncTasks', 'nativeSubagentSessions'],
     },
     'claude-agent-acp': {
         bin: 'claude',
@@ -52,45 +32,42 @@ export const CLIS = {
             package: '@agentclientprotocol/claude-agent-acp',
             bin: 'claude-agent-acp',
             executable: 'CLAUDE_CODE_EXECUTABLE',
-            env: { CLAUDE_CODE_ENTRYPOINT: 'claude-agent-acp' },
+            env: { CLAUDE_CODE_ENTRYPOINT: 'claude-agent-acp', IS_SANDBOX: '1' },
         },
         args: [],
+        fullAccess: 'bypassPermissions',
+        sessionMeta: {
+            claudeCode: {
+                options: { allowedTools: ['Bash(house:*)'] },
+                emitRawSDKMessages: ['background_tasks_changed', 'session_state_changed', 'task_started', 'task_notification'].map((subtype) => ({ type: 'system', subtype })),
+            },
+        },
+        allowHouse: nothing,
         signedIn: { command: ['auth', 'status'] },
         login: { args: ['auth', 'login', '--claudeai'], code: 'collect', rejected: 'Invalid code' },
-        queues: false,
-        turnStarted: () => false,
-        turnEnded: ({ method, params }) => method === 'session/update' &&
-            params?.update?.sessionUpdate === 'usage_update' &&
-            params.update._meta?.['_claude/origin'] !== undefined,
-        job: asyncTask,
-        phase: () => null,
+        air: ['asyncTasks', 'sessionFailure'],
     },
     'grok-build': {
         bin: 'grok',
         minimum: '1.0.46',
         install: 'curl -fsSL https://x.ai/cli/install.sh | bash',
         adapter: null,
-        args: ['agent', '--no-leader', 'stdio'],
+        args: ['agent', '--always-approve', '--no-leader', 'stdio'],
+        fullAccess: null,
+        sessionMeta: {},
+        allowHouse: nothing,
         signedIn: { initializeMeta: 'defaultAuthMethodId' },
         login: { args: ['login', '--device-auth'], code: 'show' },
-        queues: true,
-        turnStarted: ({ method, params }) => method === '_x.ai/queue/changed' && params?.runningPromptId !== undefined,
-        turnEnded: ({ method, params }) => method === '_x.ai/session_notification' && params?.update?.sessionUpdate === 'turn_completed',
-        job: ({ method, params }) => {
-            if (method === '_x.ai/task_backgrounded')
-                return { id: params.update.task_id, running: true };
-            if (method === '_x.ai/task_completed')
-                return { id: params.update.task_snapshot.task_id, running: false };
-            return null;
-        },
-        phase: () => null,
+        air: ['asyncTasks'],
     },
 };
 const KIT_PACKAGE = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
 export const KIT_VERSION = KIT_PACKAGE.version;
 const PROXY = /^https?_proxy$/i;
 const VERSION = /\d+\.\d+\.\d+(?:-[0-9A-Za-z.]+)?/;
+// An install still running after fifteen minutes is ended and reported as failed, so a hung download cannot hold its CLI's report.
 const INSTALL_MS = 15 * 60_000;
+// A login shell or a version read is ended after half a minute, so a profile that waits for input cannot stall the report.
 const READ_MS = 30_000;
 const CAUSE_CHARACTERS = 4000;
 function prefix(kind) {
@@ -118,8 +95,22 @@ export function run(command, args, timeoutMs, detached = false, signal) {
             timeout: timeoutMs,
             env: withoutProxy(),
             detached,
-            signal,
+            signal: detached ? undefined : signal,
         });
+        const stop = () => {
+            try {
+                process.kill(-child.pid, 'SIGKILL');
+            }
+            catch { }
+        };
+        if (detached && signal?.aborted)
+            stop();
+        if (detached)
+            signal?.addEventListener('abort', stop, { once: true });
+        const ended = (ran) => {
+            signal?.removeEventListener('abort', stop);
+            resolve(ran);
+        };
         let stdout = '';
         let output = '';
         child.stdout.setEncoding('utf8').on('data', (chunk) => {
@@ -129,25 +120,25 @@ export function run(command, args, timeoutMs, detached = false, signal) {
         child.stderr.setEncoding('utf8').on('data', (chunk) => {
             output += chunk;
         });
-        child.on('error', (error) => resolve({ status: null, stdout, output: error.message }));
-        child.on('close', (status) => resolve({ status, stdout, output }));
+        child.on('error', (error) => ended({ status: null, stdout, output: error.message }));
+        child.on('close', (status) => ended({ status, stdout, output }));
     });
 }
 export function failureOf(ran, program) {
     return ran.output.trim().slice(-CAUSE_CHARACTERS) || `${program} exited with ${ran.status ?? 'a signal'}`;
 }
-export async function installAdapter(kind) {
+export async function installAdapter(kind, signal) {
     const adapter = CLIS[kind].adapter;
     if (adapter === null)
         return null;
     const release = KIT_PACKAGE.peerDependencies[adapter.package];
     if ((await installedAdapter(kind)) === release)
         return null;
-    const ran = await run('npm', ['install', '--prefix', prefix(kind), '--no-save', '--no-audit', '--no-fund', '--omit=optional', `${adapter.package}@${release}`], INSTALL_MS);
+    const ran = await run('npm', ['install', '--prefix', prefix(kind), '--no-save', '--no-audit', '--no-fund', '--omit=optional', `${adapter.package}@${release}`], INSTALL_MS, true, signal);
     return ran.status === 0 ? null : failureOf(ran, 'npm');
 }
-export async function installCli(kind) {
-    const ran = await run('bash', ['-o', 'pipefail', '-c', CLIS[kind].install], INSTALL_MS, true);
+export async function installCli(kind, signal) {
+    const ran = await run('bash', ['-o', 'pipefail', '-c', CLIS[kind].install], INSTALL_MS, true, signal);
     return ran.status === 0 ? null : failureOf(ran, 'the install');
 }
 function loginShell() {
@@ -156,11 +147,11 @@ function loginShell() {
 const FOUND = 'house-kit-cli ';
 const LOOKUP = `found=$(command -v "$1") || exit 0; case $found in /*) ;; *) found=$(pwd -P)/$found ;; esac; printf "${FOUND}%s\\n" "$found"`;
 const USER_BIN = 'case ":$PATH:" in *":$HOME/.local/bin:"*) ;; *) PATH="$PATH:$HOME/.local/bin" ;; esac; export PATH';
-function inLoginShell(script, argument = '') {
-    return run(loginShell(), ['-l', '-i', '-c', `exec /bin/sh -c '${USER_BIN}; ${script}' sh ${argument}`], READ_MS, true);
+function inLoginShell(script, argument = '', signal) {
+    return run(loginShell(), ['-l', '-i', '-c', `exec /bin/sh -c '${USER_BIN}; ${script}' sh ${argument}`], READ_MS, true, signal);
 }
-export async function locate(kind) {
-    const ran = await inLoginShell(LOOKUP, CLIS[kind].bin);
+export async function locate(kind, signal) {
+    const ran = await inLoginShell(LOOKUP, CLIS[kind].bin, signal);
     return ran.stdout.split('\n').findLast((line) => line.startsWith(FOUND))?.slice(FOUND.length) ?? null;
 }
 export async function loginPath() {
@@ -168,8 +159,8 @@ export async function loginPath() {
     const ran = await inLoginShell(`printf "${marker}%s\\n" "$PATH"`);
     return ran.stdout.split('\n').findLast((line) => line.startsWith(marker)).slice(marker.length);
 }
-export async function versionOf(path) {
-    return VERSION.exec((await run(path, ['--version'], READ_MS)).stdout)?.[0] ?? null;
+export async function versionOf(path, signal) {
+    return VERSION.exec((await run(path, ['--version'], READ_MS, false, signal)).stdout)?.[0] ?? null;
 }
 function numbers(version) {
     return version.split(/[.-]/, 3).map(Number);