@gricha/perry 0.1.1 → 0.1.3

package/dist/client/ws-shell.js

@@ -1,5 +1,6 @@
 import WebSocket from 'ws';
 import { spawn } from 'child_process';
+import { DEFAULT_AGENT_PORT } from '../shared/constants';
 export function isLocalWorker(worker) {
     const host = worker
         .replace(/^https?:\/\//, '')
@@ -125,6 +126,9 @@ export function getTerminalWSUrl(worker, workspaceName) {
         base = `http://${base}`;
     }
     const wsProtocol = base.startsWith('https://') ? 'wss://' : 'ws://';
-    const host = base.replace(/^https?:\/\//, '');
+    let host = base.replace(/^https?:\/\//, '');
+    if (!host.includes(':')) {
+        host = `${host}:${DEFAULT_AGENT_PORT}`;
+    }
     return `${wsProtocol}${host}/rpc/terminal/${encodeURIComponent(workspaceName)}`;
 }

package/dist/index.js

@@ -83,6 +83,10 @@ async function checkLocalAgent() {
     }
 }
 async function getClient() {
+    const worker = await getWorkerWithFallback();
+    return createApiClient(worker);
+}
+async function getWorkerWithFallback() {
     let worker = await getWorker();
     if (!worker) {
         const localRunning = await checkLocalAgent();
@@ -94,7 +98,7 @@ async function getClient() {
             process.exit(1);
         }
     }
-    return createApiClient(worker);
+    return worker;
 }
 program
     .command('list')
@@ -282,20 +286,6 @@ program
         handleError(err);
     }
 });
-async function getWorkerWithFallback() {
-    let worker = await getWorker();
-    if (!worker) {
-        const localRunning = await checkLocalAgent();
-        if (localRunning) {
-            worker = `localhost:${DEFAULT_AGENT_PORT}`;
-        }
-        else {
-            console.error('No worker configured. Run: perry config worker <hostname>');
-            process.exit(1);
-        }
-    }
-    return worker;
-}
 program
     .command('proxy <name> [ports...]')
     .description('Forward ports from workspace to local machine')

package/dist/sessions/agents/opencode.js

@@ -1,168 +1,70 @@
-import { extractContent } from './utils';
 export const opencodeProvider = {
     async discoverSessions(containerName, exec) {
-        const result = await exec(containerName, [
-            'sh',
-            '-c',
-            'find /home/workspace/.local/share/opencode/storage/session -name "ses_*.json" -type f 2>/dev/null || true',
-        ], { user: 'workspace' });
-        const sessions = [];
-        if (result.exitCode === 0 && result.stdout.trim()) {
-            const files = result.stdout.trim().split('\n').filter(Boolean);
-            const catAll = await exec(containerName, ['sh', '-c', `cat ${files.map((f) => `"${f}"`).join(' ')} 2>/dev/null | jq -s '.'`], { user: 'workspace' });
-            if (catAll.exitCode === 0) {
-                try {
-                    const sessionData = JSON.parse(catAll.stdout);
-                    for (let i = 0; i < sessionData.length; i++) {
-                        const data = sessionData[i];
-                        const file = files[i];
-                        const id = data.id || file.split('/').pop()?.replace('.json', '') || '';
-                        const mtime = Math.floor((data.time?.updated || 0) / 1000);
-                        sessions.push({
-                            id,
-                            agentType: 'opencode',
-                            projectPath: data.directory || '',
-                            mtime,
-                            name: data.title || undefined,
-                            filePath: file,
-                        });
-                    }
-                }
-                catch {
-                    // Skip on parse error
-                }
-            }
+        const result = await exec(containerName, ['perry-session-reader', 'list'], {
+            user: 'workspace',
+        });
+        if (result.exitCode !== 0) {
+            return [];
+        }
+        try {
+            const sessionData = JSON.parse(result.stdout);
+            return sessionData.map((data) => ({
+                id: data.id,
+                agentType: 'opencode',
+                projectPath: data.directory || '',
+                mtime: Math.floor(data.mtime / 1000),
+                name: data.title || undefined,
+                filePath: data.file,
+            }));
+        }
+        catch {
+            return [];
         }
-        return sessions;
     },
     async getSessionDetails(containerName, rawSession, exec) {
-        const msgDir = `/home/workspace/.local/share/opencode/storage/message/${rawSession.id}`;
-        const listMsgsResult = await exec(containerName, ['bash', '-c', `ls -1 "${msgDir}"/msg_*.json 2>/dev/null | sort`], { user: 'workspace' });
-        const messages = [];
-        if (listMsgsResult.exitCode === 0 && listMsgsResult.stdout.trim()) {
-            const msgFiles = listMsgsResult.stdout.trim().split('\n').filter(Boolean);
-            for (const msgFile of msgFiles) {
-                const msgResult = await exec(containerName, ['cat', msgFile], {
-                    user: 'workspace',
-                });
-                if (msgResult.exitCode !== 0)
-                    continue;
-                try {
-                    const msg = JSON.parse(msgResult.stdout);
-                    if (msg.role === 'user' || msg.role === 'assistant') {
-                        const content = extractContent(msg.content);
-                        messages.push({ type: msg.role, content: content || undefined });
-                    }
-                }
-                catch {
-                    continue;
-                }
+        const result = await exec(containerName, ['perry-session-reader', 'messages', rawSession.id], {
+            user: 'workspace',
+        });
+        if (result.exitCode !== 0) {
+            return null;
+        }
+        try {
+            const data = JSON.parse(result.stdout);
+            if (data.messages.length === 0) {
+                return null;
             }
+            const messages = data.messages.filter((m) => m.type === 'user' || m.type === 'assistant');
+            const firstPrompt = messages.find((msg) => msg.type === 'user' && msg.content && msg.content.trim().length > 0)?.content;
+            return {
+                id: rawSession.id,
+                name: rawSession.name || null,
+                agentType: rawSession.agentType,
+                projectPath: rawSession.projectPath,
+                messageCount: messages.length,
+                lastActivity: new Date(rawSession.mtime * 1000).toISOString(),
+                firstPrompt: firstPrompt ? firstPrompt.slice(0, 200) : null,
+            };
         }
-        const firstPrompt = messages.find((msg) => msg.type === 'user' && msg.content && msg.content.trim().length > 0)?.content;
-        if (messages.length === 0) {
+        catch {
             return null;
         }
-        return {
-            id: rawSession.id,
-            name: rawSession.name || null,
-            agentType: rawSession.agentType,
-            projectPath: rawSession.projectPath,
-            messageCount: messages.length,
-            lastActivity: new Date(rawSession.mtime * 1000).toISOString(),
-            firstPrompt: firstPrompt ? firstPrompt.slice(0, 200) : null,
-        };
     },
     async getSessionMessages(containerName, sessionId, exec) {
-        const findResult = await exec(containerName, [
-            'bash',
-            '-c',
-            `find /home/workspace/.local/share/opencode/storage/session -name "${sessionId}.json" -type f 2>/dev/null | head -1`,
-        ], { user: 'workspace' });
-        if (findResult.exitCode !== 0 || !findResult.stdout.trim()) {
-            return null;
-        }
-        const filePath = findResult.stdout.trim();
-        const catResult = await exec(containerName, ['cat', filePath], {
+        const result = await exec(containerName, ['perry-session-reader', 'messages', sessionId], {
             user: 'workspace',
         });
-        if (catResult.exitCode !== 0) {
+        if (result.exitCode !== 0) {
             return null;
         }
-        let internalId;
         try {
-            const session = JSON.parse(catResult.stdout);
-            internalId = session.id;
+            const data = JSON.parse(result.stdout);
+            return {
+                id: sessionId,
+                messages: data.messages,
+            };
         }
         catch {
             return null;
         }
-        const msgDir = `/home/workspace/.local/share/opencode/storage/message/${internalId}`;
-        const partDir = `/home/workspace/.local/share/opencode/storage/part`;
-        const listMsgsResult = await exec(containerName, ['bash', '-c', `ls -1 "${msgDir}"/msg_*.json 2>/dev/null | sort`], { user: 'workspace' });
-        if (listMsgsResult.exitCode !== 0 || !listMsgsResult.stdout.trim()) {
-            return { id: sessionId, messages: [] };
-        }
-        const messages = [];
-        const msgFiles = listMsgsResult.stdout.trim().split('\n').filter(Boolean);
-        for (const msgFile of msgFiles) {
-            const msgResult = await exec(containerName, ['cat', msgFile], {
-                user: 'workspace',
-            });
-            if (msgResult.exitCode !== 0)
-                continue;
-            try {
-                const msg = JSON.parse(msgResult.stdout);
-                if (!msg.id || (msg.role !== 'user' && msg.role !== 'assistant'))
-                    continue;
-                const timestamp = msg.time?.created ? new Date(msg.time.created).toISOString() : undefined;
-                const listPartsResult = await exec(containerName, ['bash', '-c', `ls -1 "${partDir}/${msg.id}"/prt_*.json 2>/dev/null | sort`], { user: 'workspace' });
-                if (listPartsResult.exitCode === 0 && listPartsResult.stdout.trim()) {
-                    const partFiles = listPartsResult.stdout.trim().split('\n').filter(Boolean);
-                    for (const partFile of partFiles) {
-                        const partResult = await exec(containerName, ['cat', partFile], {
-                            user: 'workspace',
-                        });
-                        if (partResult.exitCode !== 0)
-                            continue;
-                        try {
-                            const part = JSON.parse(partResult.stdout);
-                            if (part.type === 'text' && part.text) {
-                                messages.push({
-                                    type: msg.role,
-                                    content: part.text,
-                                    timestamp,
-                                });
-                            }
-                            else if (part.type === 'tool' && part.tool) {
-                                messages.push({
-                                    type: 'tool_use',
-                                    content: undefined,
-                                    toolName: part.state?.title || part.tool,
-                                    toolId: part.callID || part.id,
-                                    toolInput: JSON.stringify(part.state?.input, null, 2),
-                                    timestamp,
-                                });
-                                if (part.state?.output) {
-                                    messages.push({
-                                        type: 'tool_result',
-                                        content: part.state.output,
-                                        toolId: part.callID || part.id,
-                                        timestamp,
-                                    });
-                                }
-                            }
-                        }
-                        catch {
-                            continue;
-                        }
-                    }
-                }
-            }
-            catch {
-                continue;
-            }
-        }
-        return { id: sessionId, messages };
     },
 };

package/package.json

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