@agentshouse/kit 0.2.1-alpha.4 → 0.2.1-alpha.5

package/dist/acp.js

@@ -2,13 +2,13 @@ import { ndJsonStream, PROTOCOL_VERSION, } from '@agentclientprotocol/sdk';
 import { spawn } from 'node:child_process';
 import { readdirSync, readFileSync } from 'node:fs';
 import { Readable, Writable } from 'node:stream';
-import { CLIS, KIT_VERSION, cliCommand } from './clis.js';
+import { CLIS, KIT_VERSION, cliCommand, withoutProxy } from './clis.js';
 export const TURN_STARTED = 'kit/turn_started';
 export const TURN_ENDED = 'kit/turn_ended';
-export async function startAdapter(kind, cwd, app, jobs = () => undefined, env = process.env) {
+export async function startAdapter(kind, cwd, app, jobs = () => undefined, added = {}) {
     const child = spawn(cliCommand(kind), CLIS[kind].args, {
         cwd,
-        env,
+        env: { ...withoutProxy(), ...added },
         stdio: ['pipe', 'pipe', 'pipe'],
         detached: true,
     });

package/dist/bridge.js

@@ -23,6 +23,18 @@ async function received(request) {
         text += chunk;
     return text;
 }
+function relay(request, response, target, authorization) {
+    const send = target.protocol === 'https:' ? httpsRequest : httpRequest;
+    const forwarded = send(target, {
+        method: request.method,
+        headers: { ...request.headers, host: target.host, ...(authorization === undefined ? {} : { authorization }) },
+    }, (answer) => {
+        response.writeHead(answer.statusCode, answer.headers);
+        answer.pipe(response);
+    });
+    forwarded.on('error', () => response.destroy());
+    request.pipe(forwarded);
+}
 export async function openBridge(house, conversationId, signal) {
     const origin = (await readEnrolment()).house;
     const { credential } = await house.post(`/kit/conversations/${conversationId}/credential`, {}, signal);
@@ -69,6 +81,10 @@ export async function openBridge(house, conversationId, signal) {
     const bridge = createServer(async (request, response) => {
         try {
             const path = request.url ?? '';
+            if (URL.canParse(path)) {
+                relay(request, response, new URL(path));
+                return;
+            }
             const forwarded = FORWARDED.has(path) ? await forward(path, await received(request)) : { status: 404, text: '' };
             response.writeHead(forwarded.status, { 'content-type': 'application/json' }).end(forwarded.text);
         }
@@ -86,13 +102,7 @@ export async function openBridge(house, conversationId, signal) {
             response.writeHead(404).end();
             return;
         }
-        const send = target.protocol === 'https:' ? httpsRequest : httpRequest;
-        const forwarded = send(target, { method: request.method, headers: { ...request.headers, host: target.host, authorization } }, (answer) => {
-            response.writeHead(answer.statusCode, answer.headers);
-            answer.pipe(response);
-        });
-        forwarded.on('error', () => response.destroy());
-        request.pipe(forwarded);
+        relay(request, response, target, authorization);
     });
     git.listen(0, '127.0.0.1');
     await once(git, 'listening');

package/dist/clis.js

@@ -65,6 +65,7 @@ export const CLIS = {
 };
 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;
 export function pinned(kind) {
     return KIT_PACKAGE.peerDependencies[CLIS[kind].package];
 }
@@ -83,9 +84,12 @@ export async function installedRelease(kind) {
         return null;
     }
 }
+export function withoutProxy() {
+    return Object.fromEntries(Object.entries(process.env).filter(([name]) => !PROXY.test(name)));
+}
 export function run(command, args, timeoutMs) {
     return new Promise((resolve) => {
-        const child = spawn(command, args, { stdio: ['ignore', 'pipe', 'pipe'], timeout: timeoutMs });
+        const child = spawn(command, args, { stdio: ['ignore', 'pipe', 'pipe'], timeout: timeoutMs, env: withoutProxy() });
         let output = '';
         child.stdout.on('data', (chunk) => {
             output += chunk.toString('utf8');

package/dist/conversations.js

@@ -254,7 +254,7 @@ export class Conversations {
         }
         conversation.opening = bridge;
         try {
-            const adapter = await startAdapter(route.kind, route.working_directory, app, (job) => this.job(conversation, job), { ...process.env, ...bridge.env });
+            const adapter = await startAdapter(route.kind, route.working_directory, app, (job) => this.job(conversation, job), bridge.env);
             void adapter.exited.then(() => bridge.close());
             const agent = adapter.connection.agent;
             const cwd = route.working_directory;

package/dist/house-main.js

@@ -5,9 +5,9 @@ import { request } from 'node:http';
 import { basename } from 'node:path';
 const USAGE = "usage: house <tool> ['<arguments as JSON>']";
 const socketPath = process.env.HOUSE_BRIDGE;
-function bridged(path, body) {
+function bridged(path, body, headers = { 'content-type': 'application/json' }) {
     return new Promise((resolve, reject) => {
-        const sent = request({ socketPath, path, method: 'POST', headers: { 'content-type': 'application/json' } }, (answer) => {
+        const sent = request({ socketPath, path, method: 'POST', headers }, (answer) => {
             let text = '';
             answer.setEncoding('utf8');
             answer.on('data', (chunk) => {
@@ -21,7 +21,7 @@ function bridged(path, body) {
             });
         });
         sent.on('error', reject);
-        sent.end(JSON.stringify(body));
+        sent.end(body instanceof Buffer ? body : JSON.stringify(body));
     });
 }
 async function mcp(method, params) {
@@ -42,15 +42,10 @@ async function upload(path, roomRef) {
         bytes: bytes.length,
         sha256: createHash('sha256').update(bytes).digest('hex'),
     }));
-    const answer = await fetch(declared.upload.url, {
-        method: 'POST',
-        headers: { 'content-type': 'application/octet-stream', 'x-house-byte-operation': declared.upload.operation },
-        body: bytes,
+    return bridged(declared.upload.url, bytes, {
+        'content-type': 'application/octet-stream',
+        'x-house-byte-operation': declared.upload.operation,
     });
-    const text = await answer.text();
-    if (!answer.ok)
-        throw new Error(`House refused the bytes of ${path} with ${answer.status}: ${text}`);
-    return text;
 }
 async function house([verb, argument]) {
     if (verb === undefined || verb === '--help') {

package/dist/kit-main.js

@@ -1,7 +1,9 @@
 #!/usr/bin/env node
+import { setGlobalProxyFromEnv } from 'node:http';
 import { login } from './login.js';
 import { resident } from './resident.js';
 const [command, ...argv] = process.argv.slice(2);
+setGlobalProxyFromEnv();
 async function run() {
     if (command === 'login')
         return login(argv);

package/dist/sign-in.js

@@ -1,7 +1,7 @@
 import { spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';
 import { killTree } from './acp.js';
-import { CLIS, cliCommand } from './clis.js';
+import { CLIS, cliCommand, withoutProxy } from './clis.js';
 import { holdSecretInput } from './secret-input.js';
 const ESCAPE = /\u001b\[[\d;]*m/g;
 const LINK = /https:\/\/\S+/;
@@ -39,7 +39,11 @@ export class SignIns {
     async login(input) {
         await this.agents.installed();
         const login = CLIS[input.cli].login;
-        const child = spawn(cliCommand(input.cli), login.args, { stdio: ['pipe', 'pipe', 'pipe'], detached: true });
+        const child = spawn(cliCommand(input.cli), login.args, {
+            stdio: ['pipe', 'pipe', 'pipe'],
+            detached: true,
+            env: withoutProxy(),
+        });
         const running = () => child.exitCode === null && child.signalCode === null;
         let link;
         let code;

package/package.json

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