@gricha/perry 0.3.3 → 0.3.5

package/dist/index.js

@@ -662,9 +662,24 @@ sshCmd
 program
     .command('update')
     .description('Update Perry to the latest version')
-    .action(async () => {
+    .option('-f, --force', 'Force update even if already on latest version')
+    .action(async (options) => {
+    const { fetchLatestVersion, compareVersions } = await import('./update-checker.js');
+    const currentVersion = pkg.version;
+    console.log(`Current version: ${currentVersion}`);
+    console.log('Checking for updates...');
+    const latestVersion = await fetchLatestVersion();
+    if (!latestVersion) {
+        console.error('Failed to fetch latest version. Please try again later.');
+        process.exit(1);
+    }
+    console.log(`Latest version: ${latestVersion}`);
+    if (compareVersions(currentVersion, latestVersion) <= 0 && !options.force) {
+        console.log('Already up to date.');
+        process.exit(0);
+    }
+    console.log(`Updating Perry from ${currentVersion} to ${latestVersion}...`);
     const { spawn } = await import('child_process');
-    console.log('Updating Perry...');
     const child = spawn('bash', ['-c', 'curl -fsSL https://raw.githubusercontent.com/gricha/perry/main/install.sh | bash'], {
         stdio: 'inherit',
     });

package/dist/session-manager/adapters/opencode.js

@@ -3,6 +3,9 @@ const MESSAGE_TIMEOUT_MS = 30000;
 const SSE_TIMEOUT_MS = 120000;
 const serverPorts = new Map();
 const serverStarting = new Map();
+let hostServerPort = null;
+let hostServerStarting = null;
+let hostServerProcess = null;
 async function findAvailablePort(containerName) {
     const script = `import socket; s=socket.socket(); s.bind(('', 0)); print(s.getsockname()[1]); s.close()`;
     const result = await execInContainer(containerName, ['python3', '-c', script], {
@@ -70,6 +73,7 @@ export class OpenCodeAdapter {
     model;
     status = 'idle';
     port;
+    isHost = false;
     sseProcess = null;
     messageCallback;
     statusCallback;
@@ -84,14 +88,17 @@ export class OpenCodeAdapter {
         this.errorCallback = callback;
     }
     async start(options) {
-        if (options.isHost) {
-            throw new Error('OpenCode adapter does not support host mode');
-        }
+        this.isHost = options.isHost;
         this.containerName = options.containerName;
         this.agentSessionId = options.agentSessionId;
         this.model = options.model;
         try {
-            this.port = await startServer(this.containerName);
+            if (this.isHost) {
+                this.port = await this.startServerHost();
+            }
+            else {
+                this.port = await startServer(this.containerName);
+            }
             this.setStatus('idle');
         }
         catch (err) {
@@ -99,8 +106,61 @@ export class OpenCodeAdapter {
             throw err;
         }
     }
+    async startServerHost() {
+        if (hostServerPort && (await this.isServerRunningHost(hostServerPort))) {
+            return hostServerPort;
+        }
+        if (hostServerStarting) {
+            return hostServerStarting;
+        }
+        const startPromise = (async () => {
+            const port = await this.findAvailablePortHost();
+            console.log(`[opencode] Starting server on port ${port} on host`);
+            hostServerProcess = Bun.spawn(['opencode', 'serve', '--port', String(port), '--hostname', '127.0.0.1'], {
+                stdin: 'ignore',
+                stdout: 'pipe',
+                stderr: 'pipe',
+            });
+            for (let i = 0; i < 30; i++) {
+                await new Promise((resolve) => setTimeout(resolve, 500));
+                if (await this.isServerRunningHost(port)) {
+                    console.log(`[opencode] Server ready on port ${port}`);
+                    hostServerPort = port;
+                    hostServerStarting = null;
+                    return port;
+                }
+            }
+            hostServerStarting = null;
+            if (hostServerProcess) {
+                hostServerProcess.kill();
+                await hostServerProcess.exited;
+                hostServerProcess = null;
+            }
+            throw new Error('Failed to start OpenCode server on host');
+        })();
+        hostServerStarting = startPromise;
+        return startPromise;
+    }
+    async findAvailablePortHost() {
+        const server = Bun.serve({
+            port: 0,
+            fetch: () => new Response(''),
+        });
+        const port = server.port;
+        server.stop();
+        return port;
+    }
+    async isServerRunningHost(port) {
+        try {
+            const response = await fetch(`http://localhost:${port}/session`, { method: 'GET' });
+            return response.ok;
+        }
+        catch {
+            return false;
+        }
+    }
     async sendMessage(message) {
-        if (!this.containerName || !this.port) {
+        if (!this.port) {
             const err = new Error('Adapter not started');
             this.emitError(err);
             throw err;
@@ -131,7 +191,20 @@ export class OpenCodeAdapter {
         }
     }
     async createSession(baseUrl) {
-        const payload = this.model ? JSON.stringify({ model: this.model }) : '{}';
+        const payload = this.model ? { model: this.model } : {};
+        if (this.isHost) {
+            const response = await fetch(`${baseUrl}/session`, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify(payload),
+                signal: AbortSignal.timeout(MESSAGE_TIMEOUT_MS),
+            });
+            if (!response.ok) {
+                throw new Error(`Failed to create session: ${response.statusText}`);
+            }
+            const session = await response.json();
+            return session.id;
+        }
         const result = await execInContainer(this.containerName, [
             'curl',
             '-s',
@@ -144,7 +217,7 @@ export class OpenCodeAdapter {
             '-H',
             'Content-Type: application/json',
             '-d',
-            payload,
+            JSON.stringify(payload),
         ], { user: 'workspace' });
         if (result.exitCode !== 0) {
             throw new Error(`Failed to create session: ${result.stderr || 'Unknown error'}`);
@@ -155,23 +228,36 @@ export class OpenCodeAdapter {
     async sendAndStream(baseUrl, message) {
         const sseReady = this.startSSEStream();
         await new Promise((resolve) => setTimeout(resolve, 100));
-        const payload = JSON.stringify({ parts: [{ type: 'text', text: message }] });
-        const result = await execInContainer(this.containerName, [
-            'curl',
-            '-s',
-            '-f',
-            '--max-time',
-            String(MESSAGE_TIMEOUT_MS / 1000),
-            '-X',
-            'POST',
-            `${baseUrl}/session/${this.agentSessionId}/message`,
-            '-H',
-            'Content-Type: application/json',
-            '-d',
-            payload,
-        ], { user: 'workspace' });
-        if (result.exitCode !== 0) {
-            throw new Error(`Failed to send message: ${result.stderr || 'Connection failed'}`);
+        const payload = { parts: [{ type: 'text', text: message }] };
+        if (this.isHost) {
+            const response = await fetch(`${baseUrl}/session/${this.agentSessionId}/message`, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify(payload),
+                signal: AbortSignal.timeout(MESSAGE_TIMEOUT_MS),
+            });
+            if (!response.ok) {
+                throw new Error(`Failed to send message: ${response.statusText}`);
+            }
+        }
+        else {
+            const result = await execInContainer(this.containerName, [
+                'curl',
+                '-s',
+                '-f',
+                '--max-time',
+                String(MESSAGE_TIMEOUT_MS / 1000),
+                '-X',
+                'POST',
+                `${baseUrl}/session/${this.agentSessionId}/message`,
+                '-H',
+                'Content-Type: application/json',
+                '-d',
+                JSON.stringify(payload),
+            ], { user: 'workspace' });
+            if (result.exitCode !== 0) {
+                throw new Error(`Failed to send message: ${result.stderr || 'Connection failed'}`);
+            }
         }
         await sseReady;
     }
@@ -180,18 +266,18 @@ export class OpenCodeAdapter {
             const seenTools = new Set();
             let resolved = false;
             let receivedIdle = false;
-            const proc = Bun.spawn([
-                'docker',
-                'exec',
-                '-i',
-                this.containerName,
+            const curlArgs = [
                 'curl',
                 '-s',
                 '-N',
                 '--max-time',
                 String(SSE_TIMEOUT_MS / 1000),
                 `http://localhost:${this.port}/event`,
-            ], { stdin: 'ignore', stdout: 'pipe', stderr: 'pipe' });
+            ];
+            const spawnArgs = this.isHost
+                ? curlArgs
+                : ['docker', 'exec', '-i', this.containerName, ...curlArgs];
+            const proc = Bun.spawn(spawnArgs, { stdin: 'ignore', stdout: 'pipe', stderr: 'pipe' });
             this.sseProcess = proc;
             const decoder = new TextDecoder();
             let buffer = '';

package/dist/update-checker.js

@@ -27,7 +27,7 @@ async function writeCache(cache) {
         // Ignore cache write errors
     }
 }
-async function fetchLatestVersion() {
+export async function fetchLatestVersion() {
     try {
         const response = await fetch(`https://api.github.com/repos/${GITHUB_REPO}/releases/latest`, {
             signal: AbortSignal.timeout(3000),
@@ -46,7 +46,7 @@ async function fetchLatestVersion() {
         return null;
     }
 }
-function compareVersions(current, latest) {
+export function compareVersions(current, latest) {
     const currentParts = current.split('.').map(Number);
     const latestParts = latest.split('.').map(Number);
     for (let i = 0; i < Math.max(currentParts.length, latestParts.length); i++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gricha/perry",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "Self-contained CLI for spinning up Docker-in-Docker development environments with SSH and proxy helpers.",
   "type": "module",
   "bin": {