@agentshouse/kit 0.2.1-alpha.17 → 0.2.1-alpha.18

package/dist/acp.js

@@ -9,7 +9,7 @@ export async function startAdapter(kind, cli, cwd, app, jobs = () => undefined,
     const adapter = CLIS[kind].adapter;
     const child = spawn(adapter === null ? cli : adapterCommand(kind), CLIS[kind].args, {
         cwd,
-        env: { ...withoutProxy(), ...(adapter === null ? {} : { [adapter.executable]: cli }), ...added },
+        env: { ...withoutProxy(), ...(adapter === null ? {} : { ...adapter.env, [adapter.executable]: cli }), ...added },
         stdio: ['pipe', 'pipe', 'pipe'],
         detached: true,
     });

package/dist/bootstrap.json

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

package/dist/bridge.js

@@ -4,9 +4,10 @@ import { setTimeout as delay } from 'node:timers/promises';
 import { mkdir } from 'node:fs/promises';
 import { createServer, request as httpRequest } from 'node:http';
 import { request as httpsRequest } from 'node:https';
-import { delimiter, join } from 'node:path';
+import { delimiter, dirname, join } from 'node:path';
 import { parse } from 'yaml';
 import { HouseRefusal, retryDelay } from './api.js';
+import { loginPath } from './clis.js';
 import { changedPaths, } from './copies.js';
 import { kitHome, readEnrolment } from './home.js';
 import { callHouse, mcpBody, rpc, UNREACHABLE } from './mcp.js';
@@ -85,6 +86,7 @@ function editAnswer(forwarded) {
     };
 }
 export async function openBridge(house, copies, conversationId, signal) {
+    const path = [join(kitHome(), 'shim'), dirname(process.execPath), await loginPath()].join(delimiter);
     const origin = (await readEnrolment()).house;
     const { credential } = await house.post(`/kit/conversations/${conversationId}/credential`, {}, signal);
     const closed = new AbortController();
@@ -221,7 +223,7 @@ export async function openBridge(house, copies, conversationId, signal) {
     return {
         env: {
             HOUSE_BRIDGE: socketPath,
-            PATH: `${join(kitHome(), 'shim')}${delimiter}${process.env.PATH ?? ''}`,
+            PATH: path,
             GIT_CONFIG_COUNT: '1',
             GIT_CONFIG_KEY_0: `url.${proxy}/app/.insteadOf`,
             GIT_CONFIG_VALUE_0: app,

package/dist/clis.js

@@ -34,7 +34,7 @@ export const CLIS = {
         bin: 'codex',
         minimum: '0.159.1',
         install: 'curl -fsSL https://chatgpt.com/codex/install.sh | sh',
-        adapter: { package: '@agentclientprotocol/codex-acp', bin: 'codex-acp', executable: 'CODEX_PATH' },
+        adapter: { package: '@agentclientprotocol/codex-acp', bin: 'codex-acp', executable: 'CODEX_PATH', env: {} },
         args: [],
         signedIn: { command: ['login', 'status'] },
         login: { args: ['login', '--device-auth'], code: 'show' },
@@ -52,6 +52,7 @@ export const CLIS = {
             package: '@agentclientprotocol/claude-agent-acp',
             bin: 'claude-agent-acp',
             executable: 'CLAUDE_CODE_EXECUTABLE',
+            env: { CLAUDE_CODE_ENTRYPOINT: 'claude-agent-acp' },
         },
         args: [],
         signedIn: { command: ['auth', 'status'] },
@@ -153,10 +154,19 @@ 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);
+}
 export async function locate(kind) {
-    const ran = await run(loginShell(), ['-l', '-i', '-c', `exec /bin/sh -c '${LOOKUP}' sh ${CLIS[kind].bin}`], READ_MS, true);
+    const ran = await inLoginShell(LOOKUP, CLIS[kind].bin);
     return ran.stdout.split('\n').findLast((line) => line.startsWith(FOUND))?.slice(FOUND.length) ?? null;
 }
+export async function loginPath() {
+    const marker = 'house-kit-path ';
+    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;
 }

package/package.json

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