@gricha/perry 0.3.0 → 0.3.2

package/README.md

@@ -6,6 +6,7 @@
 
 <p align="center">
   <a href="https://gricha.github.io/perry/"><img src="https://img.shields.io/badge/docs-docusaurus-blue" alt="Documentation"></a>
+  <a href="https://discord.gg/s2KX8kTvGX"><img src="https://img.shields.io/discord/1459251359164666064?color=5865F2&label=discord" alt="Discord"></a>
   <a href="https://github.com/gricha/perry/actions/workflows/test.yml"><img src="https://github.com/gricha/perry/actions/workflows/test.yml/badge.svg" alt="Tests"></a>
   <a href="https://github.com/gricha/perry/releases"><img src="https://img.shields.io/github/v/release/gricha/perry" alt="Release"></a>
   <a href="https://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/License-MIT-yellow.svg" alt="License: MIT"></a>

package/dist/client/docker-proxy.js

@@ -1,3 +1,5 @@
+import { parsePortForward, formatPortForwards } from './port-forward';
+export { parsePortForward, formatPortForwards };
 export async function startDockerProxy(options) {
     const { containerIp, forwards, onConnect, onError } = options;
     const servers = [];
@@ -85,19 +87,3 @@ export async function startDockerProxy(options) {
         }
     };
 }
-export function formatPortForwards(forwards) {
-    return forwards
-        .map((f) => f.localPort === f.remotePort ? String(f.localPort) : `${f.localPort}:${f.remotePort}`)
-        .join(', ');
-}
-export function parsePortForward(spec) {
-    if (spec.includes(':')) {
-        const [local, remote] = spec.split(':');
-        return {
-            localPort: parseInt(local, 10),
-            remotePort: parseInt(remote, 10),
-        };
-    }
-    const port = parseInt(spec, 10);
-    return { localPort: port, remotePort: port };
-}

package/dist/client/port-forward.js

@@ -0,0 +1,23 @@
+function validatePort(port, label) {
+    if (Number.isNaN(port) || port < 1 || port > 65535) {
+        throw new Error(`Invalid ${label}: must be a number between 1 and 65535`);
+    }
+}
+export function parsePortForward(spec) {
+    if (spec.includes(':')) {
+        const [local, remote] = spec.split(':');
+        const localPort = parseInt(local, 10);
+        const remotePort = parseInt(remote, 10);
+        validatePort(localPort, 'local port');
+        validatePort(remotePort, 'remote port');
+        return { localPort, remotePort };
+    }
+    const port = parseInt(spec, 10);
+    validatePort(port, 'port');
+    return { localPort: port, remotePort: port };
+}
+export function formatPortForwards(forwards) {
+    return forwards
+        .map((f) => f.localPort === f.remotePort ? String(f.localPort) : `${f.localPort}:${f.remotePort}`)
+        .join(', ');
+}

package/dist/client/proxy.js

@@ -1,15 +1,6 @@
 import { spawn } from 'child_process';
-export function parsePortForward(spec) {
-    if (spec.includes(':')) {
-        const [local, remote] = spec.split(':');
-        return {
-            localPort: parseInt(local, 10),
-            remotePort: parseInt(remote, 10),
-        };
-    }
-    const port = parseInt(spec, 10);
-    return { localPort: port, remotePort: port };
-}
+import { parsePortForward, formatPortForwards } from './port-forward';
+export { parsePortForward, formatPortForwards };
 export async function startProxy(options) {
     const { worker, sshPort, forwards, user = 'workspace', onConnect, onDisconnect, onError, } = options;
     const workerHost = worker.includes(':') ? worker.split(':')[0] : worker;
@@ -89,8 +80,3 @@ export async function startProxy(options) {
         });
     });
 }
-export function formatPortForwards(forwards) {
-    return forwards
-        .map((f) => f.localPort === f.remotePort ? String(f.localPort) : `${f.localPort}:${f.remotePort}`)
-        .join(', ');
-}

package/dist/config/loader.js

@@ -2,6 +2,8 @@ import { promises as fs } from 'fs';
 import path from 'path';
 import { DEFAULT_CONFIG_DIR, CONFIG_FILE } from '../shared/types';
 import { DEFAULT_AGENT_PORT } from '../shared/constants';
+import { expandPath } from '../shared/path-utils';
+export { expandPath };
 export function getConfigDir(configDir) {
     return configDir || process.env.WS_CONFIG_DIR || DEFAULT_CONFIG_DIR;
 }
@@ -85,9 +87,3 @@ export async function saveAgentConfig(config, configDir) {
     const configPath = path.join(dir, CONFIG_FILE);
     await fs.writeFile(configPath, JSON.stringify(config, null, 2), 'utf-8');
 }
-export function expandPath(filePath) {
-    if (filePath.startsWith('~/')) {
-        return path.join(process.env.HOME || '', filePath.slice(2));
-    }
-    return filePath;
-}

package/dist/index.js

@@ -14,6 +14,7 @@ import { buildImage } from './docker';
 import { DEFAULT_AGENT_PORT, WORKSPACE_IMAGE_LOCAL } from './shared/constants';
 import { checkForUpdates } from './update-checker';
 import { discoverSSHKeys } from './ssh';
+import { formatUptime } from './shared/format-utils';
 const program = new Command();
 program
     .name('perry')
@@ -658,6 +659,19 @@ sshCmd
     }
     await saveAgentConfig(config, configDir);
 });
+program
+    .command('update')
+    .description('Update Perry to the latest version')
+    .action(async () => {
+    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',
+    });
+    child.on('close', (code) => {
+        process.exit(code ?? 0);
+    });
+});
 program
     .command('build')
     .description('Build the workspace Docker image')
@@ -742,20 +756,5 @@ function handleError(err) {
     }
     process.exit(1);
 }
-function formatUptime(seconds) {
-    const days = Math.floor(seconds / 86400);
-    const hours = Math.floor((seconds % 86400) / 3600);
-    const minutes = Math.floor((seconds % 3600) / 60);
-    const parts = [];
-    if (days > 0)
-        parts.push(`${days}d`);
-    if (hours > 0)
-        parts.push(`${hours}h`);
-    if (minutes > 0)
-        parts.push(`${minutes}m`);
-    if (parts.length === 0)
-        parts.push(`${seconds}s`);
-    return parts.join(' ');
-}
 checkForUpdates(pkg.version);
 program.parse();

package/dist/sessions/agents/utils.js

@@ -21,11 +21,15 @@ export function extractClaudeSessionName(content) {
     return null;
 }
 export function extractContent(content) {
+    if (!content)
+        return null;
     if (typeof content === 'string')
         return content;
     if (Array.isArray(content)) {
-        const text = content.find((c) => c.type === 'text')?.text;
-        return typeof text === 'string' ? text : null;
+        const textParts = content
+            .filter((c) => c.type === 'text' && c.text)
+            .map((c) => c.text);
+        return textParts.join('\n') || null;
     }
     return null;
 }

package/dist/sessions/parser.js

@@ -1,19 +1,9 @@
 import { readdir, readFile, stat } from 'fs/promises';
 import { join, basename } from 'path';
+import { extractContent } from './agents/utils';
 function decodeProjectPath(encoded) {
     return encoded.replace(/-/g, '/');
 }
-function extractContent(content) {
-    if (!content)
-        return null;
-    if (typeof content === 'string')
-        return content;
-    if (Array.isArray(content)) {
-        const textParts = content.filter((c) => c.type === 'text' && c.text).map((c) => c.text);
-        return textParts.join('\n') || null;
-    }
-    return null;
-}
 function extractInterleavedContent(content) {
     const messages = [];
     for (const part of content) {

package/dist/shared/format-utils.js

@@ -0,0 +1,15 @@
+export function formatUptime(seconds) {
+    const days = Math.floor(seconds / 86400);
+    const hours = Math.floor((seconds % 86400) / 3600);
+    const minutes = Math.floor((seconds % 3600) / 60);
+    const parts = [];
+    if (days > 0)
+        parts.push(`${days}d`);
+    if (hours > 0)
+        parts.push(`${hours}h`);
+    if (minutes > 0)
+        parts.push(`${minutes}m`);
+    if (parts.length === 0)
+        parts.push(`${seconds}s`);
+    return parts.join(' ');
+}

package/dist/shared/path-utils.js

@@ -0,0 +1,8 @@
+import { homedir } from 'os';
+import { join } from 'path';
+export function expandPath(filePath) {
+    if (filePath.startsWith('~/')) {
+        return join(homedir(), filePath.slice(2));
+    }
+    return filePath;
+}

package/dist/ssh/sync.js

@@ -1,7 +1,6 @@
 import { readFile } from 'fs/promises';
-import { join } from 'path';
-import { homedir } from 'os';
 import { discoverSSHKeys, readPublicKey } from './discovery';
+import { expandPath } from '../shared/path-utils';
 export function getEffectiveSSHConfig(settings, workspaceName) {
     const global = settings.global;
     if (!workspaceName) {
@@ -72,9 +71,3 @@ export async function collectCopyKeys(settings, workspaceName) {
     }
     return result;
 }
-function expandPath(filePath) {
-    if (filePath.startsWith('~/')) {
-        return join(homedir(), filePath.slice(2));
-    }
-    return filePath;
-}

package/dist/update-checker.js

@@ -73,10 +73,7 @@ export async function checkForUpdates(currentVersion) {
         }
         if (latestVersion && compareVersions(currentVersion, latestVersion) > 0) {
             console.log('');
-            console.log(`\x1b[33m╭──────────────────────────────────────────────────────────────────────────────────╮\x1b[0m`);
-            console.log(`\x1b[33m│\x1b[0m  Update available: \x1b[90m${currentVersion}\x1b[0m → \x1b[32m${latestVersion}\x1b[0m                                                  \x1b[33m│\x1b[0m`);
-            console.log(`\x1b[33m│\x1b[0m  Run: \x1b[36mcurl -fsSL https://raw.githubusercontent.com/${GITHUB_REPO}/main/install.sh | bash\x1b[0m  \x1b[33m│\x1b[0m`);
-            console.log(`\x1b[33m╰──────────────────────────────────────────────────────────────────────────────────╯\x1b[0m`);
+            console.log(`\x1b[33mUpdate available: \x1b[90m${currentVersion}\x1b[0m → \x1b[32m${latestVersion}\x1b[0m  \x1b[33mRun: \x1b[36mperry update\x1b[0m`);
             console.log('');
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gricha/perry",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Self-contained CLI for spinning up Docker-in-Docker development environments with SSH and proxy helpers.",
   "type": "module",
   "bin": {
@@ -10,17 +10,14 @@
     "dist"
   ],
   "scripts": {
+    "dev": "trap 'kill 0' EXIT; (cd web && bunx vite build --watch) & bun --watch src/index.ts agent run --port 7391",
     "build": "rm -rf ./dist && bun run build:ts && bun run build:worker && bun run build:web && bun link",
     "build:ts": "tsc && chmod +x dist/index.js",
     "build:worker": "bun build src/index.ts --compile --outfile dist/perry-worker --target=bun",
-    "build:web": "cd web && bun run build && cp -r dist ../dist/agent/web",
+    "build:web": "cd web && bun run build",
     "test": "vitest run",
     "test:web": "playwright test",
-    "test:tui": "vitest run --config vitest.tui.config.js",
-    "test:watch": "vitest",
-    "lint": "oxlint --deny-warnings src/ mobile/src/",
-    "lint:fix": "oxlint --fix src/ mobile/src/",
-    "format": "oxfmt --write src/ test/",
+    "lint": "oxlint src/ mobile/src/",
     "format:check": "oxfmt --check src/ test/",
     "check": "bun run lint && bun run format:check && bun x tsc --noEmit",
     "lint:web": "cd web && bun run lint",

package/dist/chat/base-chat-websocket.js

@@ -1,86 +0,0 @@
-import { BaseWebSocketServer, safeSend } from '../shared/base-websocket';
-import { getContainerName } from '../docker';
-import { HOST_WORKSPACE_NAME } from '../shared/client-types';
-export class BaseChatWebSocketServer extends BaseWebSocketServer {
-    isHostAccessAllowed;
-    constructor(options) {
-        super(options);
-        this.isHostAccessAllowed = options.isHostAccessAllowed || (() => false);
-    }
-    handleConnection(ws, workspaceName) {
-        const isHostMode = workspaceName === HOST_WORKSPACE_NAME;
-        if (isHostMode && !this.isHostAccessAllowed()) {
-            ws.close(4003, 'Host access is disabled');
-            return;
-        }
-        const connection = this.createConnection(ws, workspaceName);
-        this.connections.set(ws, connection);
-        const connectedMessage = {
-            type: 'connected',
-            workspaceName,
-            timestamp: new Date().toISOString(),
-        };
-        if (this.agentType) {
-            connectedMessage.agentType = this.agentType;
-        }
-        safeSend(ws, JSON.stringify(connectedMessage));
-        ws.on('message', async (data) => {
-            const str = typeof data === 'string' ? data : data.toString();
-            try {
-                const message = JSON.parse(str);
-                if (message.type === 'interrupt') {
-                    if (connection.session) {
-                        await connection.session.interrupt();
-                        connection.session = null;
-                    }
-                    return;
-                }
-                if (message.type === 'message' && message.content) {
-                    const onMessage = (chatMessage) => {
-                        safeSend(ws, JSON.stringify(chatMessage));
-                    };
-                    if (!connection.session) {
-                        if (isHostMode) {
-                            connection.session = this.createHostSession(message.sessionId, onMessage, message.model, message.projectPath);
-                        }
-                        else {
-                            const containerName = getContainerName(workspaceName);
-                            connection.session = this.createContainerSession(containerName, message.sessionId, onMessage, message.model);
-                        }
-                    }
-                    else if (message.model && connection.session.setModel) {
-                        connection.session.setModel(message.model);
-                    }
-                    await connection.session.sendMessage(message.content);
-                }
-            }
-            catch (err) {
-                safeSend(ws, JSON.stringify({
-                    type: 'error',
-                    content: err.message,
-                    timestamp: new Date().toISOString(),
-                }));
-            }
-        });
-        ws.on('close', () => {
-            const conn = this.connections.get(ws);
-            if (conn?.session) {
-                conn.session.interrupt().catch(() => { });
-            }
-            this.connections.delete(ws);
-        });
-        ws.on('error', (err) => {
-            console.error(`${this.agentType || 'Chat'} WebSocket error:`, err);
-            const conn = this.connections.get(ws);
-            if (conn?.session) {
-                conn.session.interrupt().catch(() => { });
-            }
-            this.connections.delete(ws);
-        });
-    }
-    cleanupConnection(connection) {
-        if (connection.session) {
-            connection.session.interrupt().catch(() => { });
-        }
-    }
-}

package/dist/chat/base-claude-session.js

@@ -1,215 +0,0 @@
-import { DEFAULT_CLAUDE_MODEL } from '../shared/constants';
-import { SessionMonitor, MONITOR_PRESETS, formatErrorMessage } from './session-monitor';
-export class BaseClaudeSession {
-    process = null;
-    sessionId;
-    model;
-    sessionModel;
-    onMessage;
-    buffer = '';
-    monitor = null;
-    constructor(sessionId, model, onMessage) {
-        this.sessionId = sessionId;
-        this.model = model || DEFAULT_CLAUDE_MODEL;
-        this.sessionModel = this.model;
-        this.onMessage = onMessage;
-    }
-    async sendMessage(userMessage) {
-        const logPrefix = this.getLogPrefix();
-        const { command, options } = this.getSpawnConfig(userMessage);
-        console.log(`[${logPrefix}] Running:`, command.join(' '));
-        this.onMessage({
-            type: 'system',
-            content: 'Processing your message...',
-            timestamp: new Date().toISOString(),
-        });
-        // Create monitor with activity tracking to detect frozen subprocesses
-        this.monitor = new SessionMonitor({
-            ...MONITOR_PRESETS.claudeCode,
-            activityTimeout: 60000, // Detect if no output for 60s
-        }, {
-            onError: this.onMessage,
-            onTimeout: () => {
-                if (this.process) {
-                    console.warn(`[${logPrefix}] Killing process due to timeout`);
-                    this.process.kill();
-                }
-            },
-            onActivityTimeout: () => {
-                if (this.process) {
-                    console.warn(`[${logPrefix}] Killing process due to inactivity`);
-                    this.process.kill();
-                }
-            },
-        });
-        this.monitor.start();
-        try {
-            const proc = Bun.spawn(command, {
-                stdin: 'ignore',
-                stdout: 'pipe',
-                stderr: 'pipe',
-                ...options,
-            });
-            this.process = proc;
-            if (!proc.stdout || !proc.stderr) {
-                throw new Error('Failed to get process streams');
-            }
-            console.log(`[${logPrefix}] Process spawned, waiting for output...`);
-            const stderrPromise = new Response(proc.stderr).text();
-            const decoder = new TextDecoder();
-            let receivedAnyOutput = false;
-            for await (const chunk of proc.stdout) {
-                // Mark activity so monitor knows subprocess is alive
-                if (this.monitor) {
-                    this.monitor.markActivity();
-                }
-                const text = decoder.decode(chunk);
-                console.log(`[${logPrefix}] Received chunk:`, text.length, 'bytes');
-                receivedAnyOutput = true;
-                this.buffer += text;
-                this.processBuffer();
-                // Check if monitor has timed out
-                if (this.monitor?.isCompleted()) {
-                    console.warn(`[${logPrefix}] Monitor timeout, breaking from output loop`);
-                    proc.kill();
-                    break;
-                }
-            }
-            const exitCode = await proc.exited;
-            console.log(`[${logPrefix}] Process exited with code:`, exitCode, 'receivedOutput:', receivedAnyOutput);
-            // Stop monitoring before handling results
-            if (this.monitor && !this.monitor.isCompleted()) {
-                this.monitor.complete();
-            }
-            const stderrText = await stderrPromise;
-            if (stderrText) {
-                console.error(`[${logPrefix}] stderr:`, stderrText);
-            }
-            // Don't send error if monitor already sent one
-            if (this.monitor?.isCompleted()) {
-                return;
-            }
-            if (exitCode !== 0) {
-                this.onMessage({
-                    type: 'error',
-                    content: formatErrorMessage(new Error(stderrText || `Claude exited with code ${exitCode}`), 'Claude Code'),
-                    timestamp: new Date().toISOString(),
-                });
-                return;
-            }
-            if (!receivedAnyOutput) {
-                this.onMessage({
-                    type: 'error',
-                    content: this.getNoOutputErrorMessage(),
-                    timestamp: new Date().toISOString(),
-                });
-                return;
-            }
-            this.onMessage({
-                type: 'done',
-                content: 'Response complete',
-                timestamp: new Date().toISOString(),
-            });
-        }
-        catch (err) {
-            console.error(`[${logPrefix}] Error:`, err);
-            this.onMessage({
-                type: 'error',
-                content: formatErrorMessage(err, 'Claude Code'),
-                timestamp: new Date().toISOString(),
-            });
-        }
-        finally {
-            if (this.monitor) {
-                this.monitor.complete();
-            }
-            this.process = null;
-        }
-    }
-    getNoOutputErrorMessage() {
-        return 'No response from Claude. Check if Claude is authenticated.';
-    }
-    processBuffer() {
-        const lines = this.buffer.split('\n');
-        this.buffer = lines.pop() || '';
-        for (const line of lines) {
-            if (!line.trim())
-                continue;
-            try {
-                const msg = JSON.parse(line);
-                this.handleStreamMessage(msg);
-            }
-            catch {
-                console.error(`[${this.getLogPrefix()}] Failed to parse:`, line);
-            }
-        }
-    }
-    handleStreamMessage(msg) {
-        const timestamp = new Date().toISOString();
-        if (msg.type === 'system' && msg.subtype === 'init') {
-            this.sessionId = msg.session_id;
-            this.sessionModel = this.model;
-            this.onMessage({
-                type: 'system',
-                content: `Session started: ${msg.session_id?.slice(0, 8)}...`,
-                timestamp,
-            });
-            return;
-        }
-        if (msg.type === 'assistant' && msg.message?.content) {
-            for (const block of msg.message.content) {
-                if (block.type === 'tool_use') {
-                    this.onMessage({
-                        type: 'tool_use',
-                        content: JSON.stringify(block.input, null, 2),
-                        toolName: block.name,
-                        toolId: block.id,
-                        timestamp,
-                    });
-                }
-            }
-            return;
-        }
-        if (msg.type === 'stream_event' && msg.event?.type === 'content_block_delta') {
-            const delta = msg.event?.delta;
-            if (delta?.type === 'text_delta' && delta?.text) {
-                this.onMessage({
-                    type: 'assistant',
-                    content: delta.text,
-                    timestamp,
-                });
-            }
-            return;
-        }
-    }
-    async interrupt() {
-        if (this.monitor) {
-            this.monitor.complete();
-        }
-        if (this.process) {
-            this.process.kill();
-            this.process = null;
-            this.onMessage({
-                type: 'system',
-                content: 'Chat interrupted',
-                timestamp: new Date().toISOString(),
-            });
-        }
-    }
-    setModel(model) {
-        if (this.model !== model) {
-            this.model = model;
-            if (this.sessionModel !== model) {
-                this.sessionId = undefined;
-                this.onMessage({
-                    type: 'system',
-                    content: `Switching to model: ${model}`,
-                    timestamp: new Date().toISOString(),
-                });
-            }
-        }
-    }
-    getSessionId() {
-        return this.sessionId;
-    }
-}