@gricha/perry 0.3.12 → 0.3.14

package/dist/agent/router.js

@@ -11,6 +11,7 @@ import { setSessionName, getSessionNamesForWorkspace, deleteSessionName, } from
 import * as sessionRegistry from '../sessions/registry';
 import { discoverSSHKeys } from '../ssh/discovery';
 import { discoverAllSessions, getSessionDetails as getAgentSessionDetails, getSessionMessages, findSessionMessages, deleteSession as deleteSessionFromProvider, searchSessions as searchSessionsInContainer, } from '../sessions/agents';
+import { decodeClaudeProjectPath } from '../sessions/agents/utils';
 import { discoverClaudeCodeModels, discoverHostOpencodeModels, discoverContainerOpencodeModels, } from '../models/discovery';
 import { deleteOpencodeSession } from '../sessions/agents/opencode-storage';
 import { SessionIndex } from '../worker/session-index';
@@ -435,6 +436,34 @@ export function createRouter(ctx) {
     });
     const hostSessionIndex = new SessionIndex();
     let hostSessionIndexInitialized = false;
+    function toRegistryAgentType(agentType) {
+        return agentType === 'claude-code' ? 'claude' : agentType;
+    }
+    function toClientAgentType(agentType) {
+        return agentType === 'claude' ? 'claude-code' : agentType;
+    }
+    async function ensureRegistrySession(workspaceName, agentType, agentSessionId, options) {
+        const existing = await sessionRegistry.findByAgentSessionId(ctx.stateDir, agentSessionId);
+        if (existing) {
+            return existing;
+        }
+        return sessionRegistry.importExternalSession(ctx.stateDir, {
+            perrySessionId: `imported-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`,
+            workspaceName,
+            agentType: toRegistryAgentType(agentType),
+            agentSessionId,
+            projectPath: options?.projectPath ?? null,
+            createdAt: options?.createdAt,
+            lastActivity: options?.lastActivity,
+        });
+    }
+    async function resolveSessionRecord(sessionId) {
+        const byPerry = await sessionRegistry.getSession(ctx.stateDir, sessionId);
+        if (byPerry) {
+            return byPerry;
+        }
+        return sessionRegistry.findByAgentSessionId(ctx.stateDir, sessionId);
+    }
     async function listHostSessions(input) {
         if (!hostSessionIndexInitialized) {
             await hostSessionIndex.initialize();
@@ -450,14 +479,27 @@ export function createRouter(ctx) {
         }
         const nonEmptySessions = sessions.filter((s) => s.messageCount > 0);
         const sessionNames = await getSessionNamesForWorkspace(ctx.configDir, HOST_WORKSPACE_NAME);
-        const paginatedSessions = nonEmptySessions.slice(offset, offset + limit).map((s) => ({
-            id: s.id,
-            name: sessionNames[s.id] || null,
-            agentType: (s.agentType === 'claude' ? 'claude-code' : s.agentType),
-            projectPath: s.directory,
-            messageCount: s.messageCount,
-            lastActivity: new Date(s.lastActivity).toISOString(),
-            firstPrompt: s.firstPrompt,
+        const paginatedRaw = nonEmptySessions.slice(offset, offset + limit);
+        const paginatedSessions = await Promise.all(paginatedRaw.map(async (session) => {
+            const projectPath = session.agentType === 'claude'
+                ? decodeClaudeProjectPath(session.directory)
+                : session.directory;
+            const record = await ensureRegistrySession(HOST_WORKSPACE_NAME, session.agentType, session.id, {
+                projectPath,
+                createdAt: new Date(session.lastActivity).toISOString(),
+                lastActivity: new Date(session.lastActivity).toISOString(),
+            });
+            const name = sessionNames[record.perrySessionId] || sessionNames[session.id] || null;
+            return {
+                id: record.perrySessionId,
+                agentSessionId: session.id,
+                name,
+                agentType: toClientAgentType(session.agentType),
+                projectPath,
+                messageCount: session.messageCount,
+                lastActivity: new Date(session.lastActivity).toISOString(),
+                firstPrompt: session.firstPrompt,
+            };
         }));
         return {
             sessions: paginatedSessions,
@@ -471,12 +513,14 @@ export function createRouter(ctx) {
             hostSessionIndex.startWatchers();
             hostSessionIndexInitialized = true;
         }
-        const session = hostSessionIndex.get(sessionId);
+        const record = await resolveSessionRecord(sessionId);
+        const agentSessionId = record?.agentSessionId || sessionId;
+        const session = hostSessionIndex.get(agentSessionId);
         if (!session) {
             return { id: sessionId, messages: [] };
         }
-        const result = await hostSessionIndex.getMessages(sessionId, { limit: 10000, offset: 0 });
-        const agentType = session.agentType === 'claude' ? 'claude-code' : session.agentType;
+        const result = await hostSessionIndex.getMessages(agentSessionId, { limit: 10000, offset: 0 });
+        const agentType = toClientAgentType(session.agentType);
         const messages = result.messages.map((m) => ({
             type: m.type,
             content: m.content,
@@ -485,7 +529,13 @@ export function createRouter(ctx) {
             toolInput: m.toolInput,
             timestamp: m.timestamp,
         }));
-        return { id: sessionId, agentType, messages };
+        const ensured = record ||
+            (await ensureRegistrySession(HOST_WORKSPACE_NAME, session.agentType, agentSessionId, {
+                projectPath: session.agentType === 'claude'
+                    ? decodeClaudeProjectPath(session.directory)
+                    : session.directory,
+            }));
+        return { id: ensured.perrySessionId, agentType, messages, agentSessionId };
     }
     async function listSessionsCore(input) {
         const limit = input.limit ?? 50;
@@ -508,20 +558,13 @@ export function createRouter(ctx) {
         const containerName = `workspace-${input.workspaceName}`;
         const rawSessions = await discoverAllSessions(containerName, execInContainer);
         const customNames = await getSessionNamesForWorkspace(ctx.stateDir, input.workspaceName);
-        const registrySessions = await sessionRegistry.getSessionsForWorkspace(ctx.stateDir, input.workspaceName);
-        const trackedAgentIds = new Set(registrySessions.filter((s) => s.agentSessionId).map((s) => s.agentSessionId));
+        const registryByAgentId = new Map();
         for (const raw of rawSessions) {
-            if (!trackedAgentIds.has(raw.id)) {
-                const agentType = raw.agentType === 'claude-code' ? 'claude' : raw.agentType;
-                await sessionRegistry.importExternalSession(ctx.stateDir, {
-                    perrySessionId: `imported-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`,
-                    workspaceName: input.workspaceName,
-                    agentType: agentType,
-                    agentSessionId: raw.id,
-                    createdAt: new Date(raw.mtime).toISOString(),
-                    lastActivity: new Date(raw.mtime).toISOString(),
-                });
-            }
+            const record = await ensureRegistrySession(input.workspaceName, raw.agentType, raw.id, {
+                createdAt: new Date(raw.mtime).toISOString(),
+                lastActivity: new Date(raw.mtime).toISOString(),
+            });
+            registryByAgentId.set(raw.id, record);
         }
         const filteredSessions = rawSessions
             .filter((s) => !input.agentType || s.agentType === input.agentType)
@@ -530,10 +573,21 @@ export function createRouter(ctx) {
         const detailsResults = await Promise.all(paginatedRawSessions.map((rawSession) => getAgentSessionDetails(containerName, rawSession, execInContainer)));
         const sessions = detailsResults
             .filter((details) => details !== null)
-            .map((details) => ({
-            ...details,
-            name: customNames[details.id] || details.name,
-        }));
+            .map((details) => {
+            const record = registryByAgentId.get(details.id);
+            const perryId = record?.perrySessionId || details.id;
+            const name = customNames[perryId] || customNames[details.id] || details.name;
+            const projectPath = details.agentType === 'claude-code'
+                ? decodeClaudeProjectPath(details.projectPath)
+                : details.projectPath;
+            return {
+                ...details,
+                id: perryId,
+                agentSessionId: details.id,
+                name,
+                projectPath,
+            };
+        });
         return {
             sessions,
             total: filteredSessions.length,
@@ -578,9 +632,35 @@ export function createRouter(ctx) {
                 throw new ORPCError('PRECONDITION_FAILED', { message: 'Workspace is not running' });
             }
             const containerName = `workspace-${input.workspaceName}`;
-            result = input.agentType
-                ? await getSessionMessages(containerName, input.sessionId, input.agentType, execInContainer, input.projectPath)
-                : await findSessionMessages(containerName, input.sessionId, execInContainer);
+            const record = await resolveSessionRecord(input.sessionId);
+            if (record && !record.agentSessionId) {
+                throw new ORPCError('NOT_FOUND', { message: 'Session not found' });
+            }
+            const agentSessionId = record?.agentSessionId || input.sessionId;
+            const resolvedAgentType = record?.agentType
+                ? toClientAgentType(record.agentType)
+                : input.agentType;
+            result = resolvedAgentType
+                ? await getSessionMessages(containerName, agentSessionId, resolvedAgentType, execInContainer, input.projectPath)
+                : await findSessionMessages(containerName, agentSessionId, execInContainer);
+            if (result && !record) {
+                const agentType = toRegistryAgentType(result.agentType || resolvedAgentType);
+                const created = await ensureRegistrySession(input.workspaceName, agentType, result.id, {
+                    projectPath: input.projectPath,
+                });
+                result = {
+                    ...result,
+                    id: created.perrySessionId,
+                    agentSessionId: result.id,
+                };
+            }
+            else if (result && record) {
+                result = {
+                    ...result,
+                    id: record.perrySessionId,
+                    agentSessionId: record.agentSessionId || agentSessionId,
+                };
+            }
         }
         if (!result) {
             throw new ORPCError('NOT_FOUND', { message: 'Session not found' });
@@ -651,14 +731,18 @@ export function createRouter(ctx) {
             if (!config.allowHostAccess) {
                 throw new ORPCError('PRECONDITION_FAILED', { message: 'Host access is disabled' });
             }
-            const result = await deleteHostSession(input.sessionId, input.agentType);
+            const record = await resolveSessionRecord(input.sessionId);
+            const agentSessionId = record?.agentSessionId || input.sessionId;
+            const agentType = record?.agentType ? toClientAgentType(record.agentType) : input.agentType;
+            const result = await deleteHostSession(agentSessionId, agentType);
             if (!result.success) {
                 throw new ORPCError('INTERNAL_SERVER_ERROR', {
                     message: result.error || 'Failed to delete session',
                 });
             }
-            await deleteSessionName(ctx.stateDir, input.workspaceName, input.sessionId);
-            await ctx.sessionsCache.removeSession(input.workspaceName, input.sessionId);
+            const perryId = record?.perrySessionId || input.sessionId;
+            await deleteSessionName(ctx.stateDir, input.workspaceName, perryId);
+            await ctx.sessionsCache.removeSession(input.workspaceName, perryId);
             return { success: true };
         }
         const workspace = await ctx.workspaces.get(input.workspaceName);
@@ -669,14 +753,18 @@ export function createRouter(ctx) {
             throw new ORPCError('PRECONDITION_FAILED', { message: 'Workspace is not running' });
         }
         const containerName = `workspace-${input.workspaceName}`;
-        const result = await deleteSessionFromProvider(containerName, input.sessionId, input.agentType, execInContainer);
+        const record = await resolveSessionRecord(input.sessionId);
+        const agentSessionId = record?.agentSessionId || input.sessionId;
+        const agentType = record?.agentType ? toClientAgentType(record.agentType) : input.agentType;
+        const result = await deleteSessionFromProvider(containerName, agentSessionId, agentType, execInContainer);
         if (!result.success) {
             throw new ORPCError('INTERNAL_SERVER_ERROR', {
                 message: result.error || 'Failed to delete session',
             });
         }
-        await deleteSessionName(ctx.stateDir, input.workspaceName, input.sessionId);
-        await ctx.sessionsCache.removeSession(input.workspaceName, input.sessionId);
+        const perryId = record?.perrySessionId || input.sessionId;
+        await deleteSessionName(ctx.stateDir, input.workspaceName, perryId);
+        await ctx.sessionsCache.removeSession(input.workspaceName, perryId);
         return { success: true };
     });
     const searchSessions = os
@@ -702,7 +790,15 @@ export function createRouter(ctx) {
             throw new ORPCError('PRECONDITION_FAILED', { message: 'Workspace is not running' });
         }
         const containerName = `workspace-${input.workspaceName}`;
-        const results = await searchSessionsInContainer(containerName, input.query, execInContainer);
+        const rawResults = await searchSessionsInContainer(containerName, input.query, execInContainer);
+        const results = await Promise.all(rawResults.map(async (result) => {
+            const record = await ensureRegistrySession(input.workspaceName, result.agentType, result.sessionId);
+            return {
+                ...result,
+                sessionId: record.perrySessionId,
+                agentSessionId: result.sessionId,
+            };
+        }));
         return { results };
     });
     async function searchHostSessions(query) {
@@ -759,7 +855,13 @@ export function createRouter(ctx) {
                     }
                 }
                 if (sessionId && agentType) {
-                    results.push({ sessionId, agentType, matchCount: 1 });
+                    const record = await ensureRegistrySession(HOST_WORKSPACE_NAME, agentType, sessionId);
+                    results.push({
+                        sessionId: record.perrySessionId,
+                        agentSessionId: sessionId,
+                        agentType,
+                        matchCount: 1,
+                    });
                 }
             }
             return results;