@jmfederico/pi-web 1.202606.1 → 1.202606.3

package/dist/server/sessions/piSessionManagerGateway.js

@@ -0,0 +1,96 @@
+import { readdir } from "node:fs/promises";
+import { homedir } from "node:os";
+import { dirname, isAbsolute, join, resolve } from "node:path";
+import { getAgentDir, SessionManager, SettingsManager } from "@earendil-works/pi-coding-agent";
+import { canonicalizeStoredCwd, cwdPathsEqual } from "../workingDirectory.js";
+export const PI_SESSION_DIR_ENV = "PI_CODING_AGENT_SESSION_DIR";
+export class SessionDirResolver {
+    constructor(options = {}) {
+        this.agentDir = options.agentDir ?? getAgentDir();
+        this.env = options.env ?? process.env;
+    }
+    defaultSessionsRoot() {
+        return defaultPiSessionsRoot(this.agentDir);
+    }
+    resolve(cwd) {
+        const envSessionDir = this.env[PI_SESSION_DIR_ENV];
+        if (envSessionDir !== undefined && envSessionDir !== "") {
+            return { source: "env", sessionDir: resolveConfiguredPath(envSessionDir, cwd), usesConfiguredSessionDir: true };
+        }
+        const settingsSessionDir = SettingsManager.create(cwd, this.agentDir).getSessionDir();
+        if (settingsSessionDir !== undefined && settingsSessionDir !== "") {
+            return { source: "settings", sessionDir: resolveConfiguredPath(settingsSessionDir, cwd), usesConfiguredSessionDir: true };
+        }
+        return { source: "pi-default", sessionDir: defaultPiSessionDir(cwd, this.agentDir), usesConfiguredSessionDir: false };
+    }
+}
+export function createPiSessionManagerGateway(options = {}) {
+    return new SettingsAwarePiSessionManagerGateway(new SessionDirResolver(options));
+}
+class SettingsAwarePiSessionManagerGateway {
+    constructor(resolver) {
+        this.resolver = resolver;
+    }
+    async list(cwd) {
+        const resolution = this.resolver.resolve(cwd);
+        return filterSessionsForCwd(await listSessionsInDir(resolution.sessionDir), cwd);
+    }
+    create(cwd) {
+        const resolution = this.resolver.resolve(cwd);
+        return SessionManager.create(cwd, resolution.sessionDir);
+    }
+    listAll() {
+        return listSessionsInDefaultPiStore(this.resolver.defaultSessionsRoot());
+    }
+    open(path) {
+        return SessionManager.open(path, dirname(path));
+    }
+}
+export async function listSessionsInDir(sessionDir) {
+    // listAll(sessionDir) lists without the SDK's internal cwd filter, which would
+    // otherwise compare against this process's cwd and drop other projects' sessions.
+    // Cwd filtering is applied explicitly by filterSessionsForCwd where needed.
+    // Session file headers are written by external tools (Pi CLI, SDK consumers),
+    // so their cwd is canonicalized here before it enters pi-web.
+    const sessions = await SessionManager.listAll(sessionDir);
+    return sessions.map((session) => ({ ...session, cwd: canonicalizeStoredCwd(session.cwd) }));
+}
+export async function listSessionsInDefaultPiStore(storeRoot = defaultPiSessionsRoot()) {
+    let entries;
+    try {
+        entries = await readdir(storeRoot, { withFileTypes: true });
+    }
+    catch {
+        return [];
+    }
+    const sessionDirs = entries.filter((entry) => entry.isDirectory()).map((entry) => join(storeRoot, entry.name));
+    const sessions = (await Promise.all(sessionDirs.map((dir) => listSessionsInDir(dir)))).flat();
+    return sessions.sort((a, b) => b.modified.getTime() - a.modified.getTime());
+}
+export function filterSessionsForCwd(sessions, cwd) {
+    // Sessions with an empty cwd (old session files) are excluded: resolve("") would
+    // resolve to this process's cwd and produce false matches.
+    return sessions.filter((session) => session.cwd !== "" && cwdPathsEqual(session.cwd, cwd));
+}
+export function defaultPiSessionsRoot(agentDir = getAgentDir()) {
+    return join(agentDir, "sessions");
+}
+export function defaultPiSessionDir(cwd, agentDir = getAgentDir()) {
+    return sessionDirInDefaultPiStore(defaultPiSessionsRoot(agentDir), cwd);
+}
+export function sessionDirInDefaultPiStore(storeRoot, cwd) {
+    const safePath = `--${cwd.replace(/^[/\\]/u, "").replace(/[/\\:]/gu, "-")}--`;
+    return join(storeRoot, safePath);
+}
+export function resolveConfiguredPath(path, cwd) {
+    const expanded = expandTildePath(path);
+    return isAbsolute(expanded) ? expanded : resolve(cwd, expanded);
+}
+function expandTildePath(path) {
+    if (path === "~")
+        return homedir();
+    if (path.startsWith("~/"))
+        return join(homedir(), path.slice(2));
+    return path;
+}
+//# sourceMappingURL=piSessionManagerGateway.js.map

package/dist/server/sessions/piSessionManagerGateway.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"piSessionManagerGateway.js","sourceRoot":"","sources":["../../../src/server/sessions/piSessionManagerGateway.ts"],"names":[],"mappings":"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"}

package/dist/server/sessions/piSessionService.js

@@ -7,12 +7,23 @@ import { SessionArchiveStore } from "./sessionArchiveStore.js";
 import { findArchiveCandidateByIdOrPrefix, planSessionArchiveTree } from "./sessionArchiveTree.js";
 import { fallbackSessionName, generateShortSessionName } from "./sessionNameGenerator.js";
 import { computeEditPreview } from "./editPreview.js";
+import { createPiSessionManagerGateway } from "./piSessionManagerGateway.js";
+import { cwdPathsEqual } from "../workingDirectory.js";
 function noop() {
     // Intentionally empty default unsubscribe callback.
 }
 function authLossWarningKey(sessionId, provider, modelId) {
     return `${sessionId}:${provider}/${modelId}`;
 }
+function sessionIdFromLookup(ref) {
+    return typeof ref === "string" ? ref : ref.id;
+}
+function isPiSessionRef(ref) {
+    return typeof ref !== "string";
+}
+function lookupMatchesActiveSession(ref, active) {
+    return !isPiSessionRef(ref) || cwdPathsEqual(active.runtime.cwd, ref.cwd);
+}
 function requirePromptText(value) {
     if (typeof value !== "string")
         throw new Error("Prompt text is required");
@@ -72,7 +83,7 @@ export class PiSessionService {
         this.authLossWarnings = new Set();
         this.archiveStore = deps.archiveStore ?? new SessionArchiveStore();
         this.agentDir = deps.agentDir ?? getAgentDir();
-        this.sessionManager = deps.sessionManager ?? SessionManager;
+        this.sessionManager = deps.sessionManager ?? createPiSessionManagerGateway({ agentDir: this.agentDir });
         this.modelRegistry = deps.modelRegistry ?? ModelRegistry.create(AuthStorage.create());
         this.createRuntime = deps.createRuntime ?? createDefaultRuntimeFactory(this.modelRegistry.authStorage, this.modelRegistry);
         this.createAgentRuntime = deps.createAgentRuntime ?? defaultCreateAgentRuntime;
@@ -135,24 +146,24 @@ export class PiSessionService {
             firstMessage: "",
         };
     }
-    async messages(sessionId, page) {
-        const session = await this.getOrOpen(sessionId);
+    async messages(ref, page) {
+        const session = await this.getOrOpen(ref);
         return pageMessagesAtSafeBoundary(historyMessages(session), page);
     }
-    async status(sessionId) {
-        return this.statusFromSession(await this.getOrOpen(sessionId));
+    async status(ref) {
+        return this.statusFromSession(await this.getOrOpen(ref));
     }
-    async availableModels(sessionId) {
-        const session = await this.getOrOpen(sessionId);
+    async availableModels(ref) {
+        const session = await this.getOrOpen(ref);
         session.modelRegistry.refresh();
         const models = session.scopedModels.length > 0
             ? session.scopedModels.map((scoped) => scoped.model)
             : session.modelRegistry.getAvailable();
         return models.map(modelToClientModel);
     }
-    async setModel(sessionId, provider, modelId) {
-        await this.assertWritable(sessionId);
-        const session = await this.getOrOpen(sessionId);
+    async setModel(ref, provider, modelId) {
+        await this.assertWritable(ref);
+        const session = await this.getOrOpen(ref);
         session.modelRegistry.refresh();
         const candidates = session.scopedModels.length > 0
             ? session.scopedModels.map((scoped) => scoped.model)
@@ -166,9 +177,9 @@ export class PiSessionService {
         this.publishStatus(session);
         return this.statusFromSession(session);
     }
-    async cycleModel(sessionId, direction) {
-        await this.assertWritable(sessionId);
-        const session = await this.getOrOpen(sessionId);
+    async cycleModel(ref, direction) {
+        await this.assertWritable(ref);
+        const session = await this.getOrOpen(ref);
         const result = await session.cycleModel(direction);
         if (result === undefined)
             throw new Error(session.scopedModels.length > 0 ? "Only one model in scope" : "Only one model available");
@@ -176,21 +187,21 @@ export class PiSessionService {
         this.publishStatus(session);
         return this.statusFromSession(session);
     }
-    async availableThinkingLevels(sessionId) {
-        const session = await this.getOrOpen(sessionId);
+    async availableThinkingLevels(ref) {
+        const session = await this.getOrOpen(ref);
         return session.getAvailableThinkingLevels();
     }
-    async setThinkingLevel(sessionId, level) {
-        await this.assertWritable(sessionId);
-        const session = await this.getOrOpen(sessionId);
+    async setThinkingLevel(ref, level) {
+        await this.assertWritable(ref);
+        const session = await this.getOrOpen(ref);
         session.setThinkingLevel(level);
         this.publishActivity(session, `thinking: ${session.thinkingLevel}`, "idle");
         this.publishStatus(session);
         return this.statusFromSession(session);
     }
-    async cycleThinkingLevel(sessionId) {
-        await this.assertWritable(sessionId);
-        const session = await this.getOrOpen(sessionId);
+    async cycleThinkingLevel(ref) {
+        await this.assertWritable(ref);
+        const session = await this.getOrOpen(ref);
         const level = session.cycleThinkingLevel();
         if (level === undefined)
             throw new Error("Current model does not support thinking");
@@ -198,8 +209,8 @@ export class PiSessionService {
         this.publishStatus(session);
         return this.statusFromSession(session);
     }
-    async commands(sessionId) {
-        const session = await this.getOrOpen(sessionId);
+    async commands(ref) {
+        const session = await this.getOrOpen(ref);
         const commands = [...BUILTIN_COMMANDS];
         for (const command of session.extensionRunner.getRegisteredCommands()) {
             commands.push({ name: command.invocationName, ...(command.description === undefined ? {} : { description: command.description }), source: "extension" });
@@ -212,11 +223,11 @@ export class PiSessionService {
         }
         return commands.sort((a, b) => a.name.localeCompare(b.name));
     }
-    async prompt(sessionId, text, streamingBehavior) {
+    async prompt(ref, text, streamingBehavior) {
         const promptText = requirePromptText(text);
         const requestedBehavior = parsePromptStreamingBehavior(streamingBehavior);
-        await this.assertWritable(sessionId);
-        const session = await this.getOrOpen(sessionId);
+        await this.assertWritable(ref);
+        const session = await this.getOrOpen(ref);
         this.maybeGenerateSessionName(session, promptText);
         const isQueued = session.isStreaming || session.isCompacting;
         const behavior = isQueued ? requestedBehavior ?? "followUp" : undefined;
@@ -250,9 +261,9 @@ export class PiSessionService {
         this.publishActivity(session, "message queued during compaction", "active");
         this.publishStatus(session);
     }
-    async shell(sessionId, text) {
-        await this.assertWritable(sessionId);
-        const active = await this.getActive(sessionId);
+    async shell(ref, text) {
+        await this.assertWritable(ref);
+        const active = await this.getActive(ref);
         const { session } = active.runtime;
         const isExcluded = text.startsWith("!!");
         const command = (isExcluded ? text.slice(2) : text.slice(1)).trim();
@@ -285,24 +296,26 @@ export class PiSessionService {
             this.publishStatus(session);
         });
     }
-    async runCommand(sessionId, text) {
-        await this.assertWritable(sessionId);
-        return this.commandService.run(sessionId, text);
+    async runCommand(ref, text) {
+        await this.assertWritable(ref);
+        const active = await this.getActive(ref);
+        return this.commandService.run(active.runtime.session.sessionId, text);
     }
-    async respondToCommand(sessionId, requestId, value) {
-        await this.assertWritable(sessionId);
-        return this.commandService.respond(sessionId, requestId, value);
+    async respondToCommand(ref, requestId, value) {
+        await this.assertWritable(ref);
+        const active = await this.getActive(ref);
+        return this.commandService.respond(active.runtime.session.sessionId, requestId, value);
     }
-    async archive(sessionId) {
-        const session = await this.getOrOpen(sessionId);
+    async archive(ref) {
+        const session = await this.getOrOpen(ref);
         if (this.hasActiveWork(session))
             throw new Error("Stop current session activity before archiving");
         const archiveInput = await this.archiveInputForSession(session);
         await this.closeActive(session.sessionId);
         await this.archiveStore.archive(archiveInput);
     }
-    async archiveTree(sessionId) {
-        const session = await this.getOrOpen(sessionId);
+    async archiveTree(ref) {
+        const session = await this.getOrOpen(ref);
         const catalog = await this.workspaceArchiveCandidates(session.sessionManager.getCwd());
         const root = findArchiveCandidateByIdOrPrefix(catalog, session.sessionId) ?? archiveCandidateFromActiveSession(session, false);
         const plan = planSessionArchiveTree(root, catalog);
@@ -321,29 +334,47 @@ export class PiSessionService {
             skippedAlreadyArchivedCount: plan.skippedAlreadyArchivedCount,
         };
     }
-    async restore(sessionId) {
-        await this.closeActive(sessionId);
-        await this.archiveStore.restore(sessionId);
-    }
-    async detachParent(sessionId) {
-        const session = await this.getOrOpen(sessionId);
+    async restore(ref) {
+        const archived = await this.getArchived(ref);
+        if (archived === undefined)
+            throw new Error("Session not found");
+        await this.closeActive(archived.sessionId);
+        await this.archiveStore.restore(archived.sessionId);
+    }
+    async deleteArchived(ref) {
+        const record = await this.getArchived(ref);
+        if (record === undefined)
+            throw new Error("Archived session not found");
+        if (this.archiveStore.deleteArchived === undefined)
+            throw new Error("Archive store does not support deletion");
+        await this.closeActive(record.sessionId);
+        if (record.archivePath === undefined)
+            await this.ensureArchivedRecordMoved(record);
+        await this.archiveStore.deleteArchived(record.sessionId);
+    }
+    async detachParent(ref) {
+        const session = await this.getOrOpen(ref);
         const sessionFile = session.sessionFile;
         if (sessionFile === undefined || sessionFile === "")
             throw new Error("Session is not persisted");
         await clearParentSession(sessionFile);
     }
-    async abort(sessionId) {
-        const active = this.active.get(sessionId);
-        if (!active)
+    async abort(ref) {
+        const active = this.activeForLookup(ref);
+        if (active === undefined)
             return;
+        const sessionId = active.runtime.session.sessionId;
         this.clearCompactionPromptQueue(sessionId);
         clearSessionQueue(active.runtime.session);
         await active.runtime.session.abort();
         this.publishActivity(active.runtime.session, "stopped", "idle");
         this.publishStatus(active.runtime.session);
     }
-    stop(sessionId) {
-        void this.closeActive(sessionId).catch(() => {
+    stop(ref) {
+        const active = this.activeForLookup(ref);
+        if (active === undefined)
+            return;
+        void this.closeActive(active.runtime.session.sessionId).catch(() => {
             // Best-effort shutdown; callers that need errors await closeActive directly.
         });
     }
@@ -366,6 +397,12 @@ export class PiSessionService {
             return record;
         }
     }
+    async ensureArchivedRecordMoved(record) {
+        const session = (await this.sessionManager.list(record.cwd)).find((candidate) => candidate.id === record.sessionId);
+        if (session === undefined)
+            return record;
+        return this.archiveStore.archive(archiveInputFromListEntry(session));
+    }
     async archiveInputForSession(session) {
         const cwd = session.sessionManager.getCwd();
         const sessionFile = session.sessionFile;
@@ -444,37 +481,68 @@ export class PiSessionService {
             await active.runtime.dispose();
         }
     }
-    async assertWritable(sessionId) {
-        if (await this.archiveStore.isArchived(sessionId))
+    async assertWritable(ref) {
+        if (await this.getArchived(ref) !== undefined)
             throw new Error("Archived sessions are read-only. Restore the session to continue.");
     }
-    async getOrOpen(sessionId) {
-        return (await this.getActive(sessionId)).runtime.session;
+    async getOrOpen(ref) {
+        return (await this.getActive(ref)).runtime.session;
     }
-    async getActive(sessionId) {
-        const active = this.active.get(sessionId);
-        if (active)
+    async getActive(ref) {
+        const active = this.activeForLookup(ref);
+        if (active !== undefined)
             return active;
-        const archived = await this.archiveStore.get(sessionId);
+        const archived = await this.getArchived(ref);
         if (archived?.archivePath !== undefined)
             return this.create(this.sessionManager.open(archived.archivePath), archived.cwd);
-        const match = (await this.sessionManager.listAll()).find((s) => s.id === sessionId || s.id.startsWith(sessionId));
+        const match = isPiSessionRef(ref)
+            ? (await this.sessionManager.list(ref.cwd)).find((s) => s.id === ref.id || s.id.startsWith(ref.id))
+            : (await this.sessionManager.listAll?.() ?? []).find((s) => s.id === ref || s.id.startsWith(ref));
         if (!match)
             throw new Error("Session not found");
         return this.create(this.sessionManager.open(match.path), match.cwd);
     }
+    async getArchived(ref) {
+        const archived = await this.archiveStore.get(sessionIdFromLookup(ref));
+        if (archived === undefined)
+            return undefined;
+        if (isPiSessionRef(ref) && archived.cwd !== ref.cwd)
+            return undefined;
+        return archived;
+    }
+    activeForLookup(ref) {
+        const sessionId = sessionIdFromLookup(ref);
+        const exact = this.active.get(sessionId);
+        if (exact !== undefined && lookupMatchesActiveSession(ref, exact))
+            return exact;
+        for (const [candidateId, active] of this.active.entries()) {
+            if (candidateId.startsWith(sessionId) && lookupMatchesActiveSession(ref, active))
+                return active;
+        }
+        return undefined;
+    }
     async create(sessionManager, cwd) {
         const runtime = await this.createAgentRuntime(this.createRuntime, { cwd, agentDir: this.agentDir, sessionManager });
+        await this.bindSessionExtensions(runtime.session);
         const active = { runtime, unsubscribe: noop };
         this.bindRuntime(active);
-        runtime.setRebindSession(() => {
+        runtime.setRebindSession(async (session) => {
+            await this.bindSessionExtensions(session);
             this.bindRuntime(active);
-            return Promise.resolve();
         });
         this.active.set(runtime.session.sessionId, active);
         this.publishStatus(runtime.session);
         return active;
     }
+    async bindSessionExtensions(session) {
+        await session.bindExtensions({
+            onError: (error) => {
+                const message = `${error.extensionPath}: ${error.error}`;
+                this.publishActivity(session, "extension error", "error", message);
+                this.events.publish(session.sessionId, { type: "session.error", message });
+            },
+        });
+    }
     bindRuntime(active) {
         active.unsubscribe();
         const { session } = active.runtime;