@progmruansilva/omp-web 1.202608.0

package/dist/server/sessions/editPreview.js

@@ -0,0 +1,196 @@
+import { access, readFile } from "node:fs/promises";
+import { constants } from "node:fs";
+import { isAbsolute, resolve } from "node:path";
+import { diffLines } from "diff";
+export async function computeEditPreview(path, edits, cwd) {
+    const absolutePath = isAbsolute(path) ? path : resolve(cwd, path);
+    try {
+        try {
+            await access(absolutePath, constants.R_OK);
+        }
+        catch (error) {
+            const message = error instanceof Error && "code" in error ? `Error code: ${String(error.code)}` : String(error);
+            return { error: `Could not edit file: ${path}. ${message}.` };
+        }
+        const rawContent = await readFile(absolutePath, "utf8");
+        const { text: content } = stripBom(rawContent);
+        const normalizedContent = normalizeToLF(content);
+        const { baseContent, newContent } = applyEditsToNormalizedContent(normalizedContent, edits, path);
+        return generateDiffString(baseContent, newContent);
+    }
+    catch (error) {
+        return { error: error instanceof Error ? error.message : String(error) };
+    }
+}
+function normalizeToLF(text) {
+    return text.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+}
+function stripBom(content) {
+    return content.startsWith("\uFEFF") ? { bom: "\uFEFF", text: content.slice(1) } : { bom: "", text: content };
+}
+function normalizeForFuzzyMatch(text) {
+    return text
+        .normalize("NFKC")
+        .split("\n")
+        .map((line) => line.trimEnd())
+        .join("\n")
+        .replace(/[\u2018\u2019\u201A\u201B]/g, "'")
+        .replace(/[\u201C\u201D\u201E\u201F]/g, '"')
+        .replace(/[\u2010\u2011\u2012\u2013\u2014\u2015\u2212]/g, "-")
+        .replace(/[\u00A0\u2002-\u200A\u202F\u205F\u3000]/g, " ");
+}
+function fuzzyFindText(content, oldText) {
+    const exactIndex = content.indexOf(oldText);
+    if (exactIndex !== -1)
+        return { found: true, index: exactIndex, matchLength: oldText.length, usedFuzzyMatch: false };
+    const fuzzyContent = normalizeForFuzzyMatch(content);
+    const fuzzyOldText = normalizeForFuzzyMatch(oldText);
+    const fuzzyIndex = fuzzyContent.indexOf(fuzzyOldText);
+    if (fuzzyIndex === -1)
+        return { found: false, index: -1, matchLength: 0, usedFuzzyMatch: false };
+    return { found: true, index: fuzzyIndex, matchLength: fuzzyOldText.length, usedFuzzyMatch: true };
+}
+function countOccurrences(content, oldText) {
+    const fuzzyContent = normalizeForFuzzyMatch(content);
+    const fuzzyOldText = normalizeForFuzzyMatch(oldText);
+    if (fuzzyOldText === "")
+        return 0;
+    return fuzzyContent.split(fuzzyOldText).length - 1;
+}
+function applyEditsToNormalizedContent(normalizedContent, edits, path) {
+    const normalizedEdits = edits.map((edit) => ({ oldText: normalizeToLF(edit.oldText), newText: normalizeToLF(edit.newText) }));
+    for (let index = 0; index < normalizedEdits.length; index++) {
+        if ((normalizedEdits[index]?.oldText ?? "") === "")
+            throw editError("empty", path, index, normalizedEdits.length);
+    }
+    const initialMatches = normalizedEdits.map((edit) => fuzzyFindText(normalizedContent, edit.oldText));
+    const baseContent = initialMatches.some((match) => match.usedFuzzyMatch) ? normalizeForFuzzyMatch(normalizedContent) : normalizedContent;
+    const matchedEdits = [];
+    for (let index = 0; index < normalizedEdits.length; index++) {
+        const edit = normalizedEdits[index];
+        if (edit === undefined)
+            continue;
+        const match = fuzzyFindText(baseContent, edit.oldText);
+        if (!match.found)
+            throw editError("missing", path, index, normalizedEdits.length);
+        const occurrences = countOccurrences(baseContent, edit.oldText);
+        if (occurrences > 1)
+            throw editError("duplicate", path, index, normalizedEdits.length, occurrences);
+        matchedEdits.push({ editIndex: index, matchIndex: match.index, matchLength: match.matchLength, newText: edit.newText });
+    }
+    matchedEdits.sort((a, b) => a.matchIndex - b.matchIndex);
+    for (let index = 1; index < matchedEdits.length; index++) {
+        const previous = matchedEdits[index - 1];
+        const current = matchedEdits[index];
+        if (previous !== undefined && current !== undefined && previous.matchIndex + previous.matchLength > current.matchIndex) {
+            throw new Error(`edits[${String(previous.editIndex)}] and edits[${String(current.editIndex)}] overlap in ${path}. Merge them into one edit or target disjoint regions.`);
+        }
+    }
+    let newContent = baseContent;
+    for (let index = matchedEdits.length - 1; index >= 0; index--) {
+        const edit = matchedEdits[index];
+        if (edit === undefined)
+            continue;
+        newContent = `${newContent.slice(0, edit.matchIndex)}${edit.newText}${newContent.slice(edit.matchIndex + edit.matchLength)}`;
+    }
+    if (baseContent === newContent)
+        throw editError("nochange", path, 0, normalizedEdits.length);
+    return { baseContent, newContent };
+}
+function editError(kind, path, editIndex, totalEdits, occurrences) {
+    const prefix = totalEdits === 1 ? "" : `edits[${String(editIndex)}].`;
+    if (kind === "empty")
+        return new Error(totalEdits === 1 ? `oldText must not be empty in ${path}.` : `${prefix}oldText must not be empty in ${path}.`);
+    if (kind === "missing")
+        return new Error(totalEdits === 1 ? `Could not find the exact text in ${path}. The old text must match exactly including all whitespace and newlines.` : `Could not find edits[${String(editIndex)}] in ${path}. The oldText must match exactly including all whitespace and newlines.`);
+    if (kind === "duplicate")
+        return new Error(totalEdits === 1 ? `Found ${String(occurrences)} occurrences of the text in ${path}. The text must be unique. Please provide more context to make it unique.` : `Found ${String(occurrences)} occurrences of edits[${String(editIndex)}] in ${path}. Each oldText must be unique. Please provide more context to make it unique.`);
+    return new Error(totalEdits === 1 ? `No changes made to ${path}. The replacement produced identical content.` : `No changes made to ${path}. The replacements produced identical content.`);
+}
+function generateDiffString(oldContent, newContent, contextLines = 4) {
+    const parts = diffLines(oldContent, newContent);
+    const output = [];
+    const oldLines = oldContent.split("\n");
+    const newLines = newContent.split("\n");
+    const maxLineNum = Math.max(oldLines.length, newLines.length);
+    const lineNumWidth = String(maxLineNum).length;
+    let oldLineNum = 1;
+    let newLineNum = 1;
+    let lastWasChange = false;
+    let firstChangedLine;
+    for (let index = 0; index < parts.length; index++) {
+        const part = parts[index];
+        if (part === undefined)
+            continue;
+        const raw = part.value.split("\n");
+        if (raw.at(-1) === "")
+            raw.pop();
+        if (part.added || part.removed) {
+            firstChangedLine ??= newLineNum;
+            for (const line of raw) {
+                if (part.added) {
+                    output.push(`+${String(newLineNum).padStart(lineNumWidth, " ")} ${line}`);
+                    newLineNum++;
+                }
+                else {
+                    output.push(`-${String(oldLineNum).padStart(lineNumWidth, " ")} ${line}`);
+                    oldLineNum++;
+                }
+            }
+            lastWasChange = true;
+            continue;
+        }
+        const nextPart = parts[index + 1];
+        const nextPartIsChange = (nextPart?.added ?? false) || (nextPart?.removed ?? false);
+        const hasLeadingChange = lastWasChange;
+        const hasTrailingChange = nextPartIsChange;
+        if (hasLeadingChange && hasTrailingChange) {
+            if (raw.length <= contextLines * 2) {
+                appendContextLines(output, raw, lineNumWidth, () => oldLineNum++, () => newLineNum++);
+            }
+            else {
+                const leadingLines = raw.slice(0, contextLines);
+                const trailingLines = raw.slice(raw.length - contextLines);
+                const skippedLines = raw.length - leadingLines.length - trailingLines.length;
+                appendContextLines(output, leadingLines, lineNumWidth, () => oldLineNum++, () => newLineNum++);
+                output.push(` ${"".padStart(lineNumWidth, " ")} ...`);
+                oldLineNum += skippedLines;
+                newLineNum += skippedLines;
+                appendContextLines(output, trailingLines, lineNumWidth, () => oldLineNum++, () => newLineNum++);
+            }
+        }
+        else if (hasLeadingChange) {
+            const shownLines = raw.slice(0, contextLines);
+            const skippedLines = raw.length - shownLines.length;
+            appendContextLines(output, shownLines, lineNumWidth, () => oldLineNum++, () => newLineNum++);
+            if (skippedLines > 0) {
+                output.push(` ${"".padStart(lineNumWidth, " ")} ...`);
+                oldLineNum += skippedLines;
+                newLineNum += skippedLines;
+            }
+        }
+        else if (hasTrailingChange) {
+            const skippedLines = Math.max(0, raw.length - contextLines);
+            if (skippedLines > 0) {
+                output.push(` ${"".padStart(lineNumWidth, " ")} ...`);
+                oldLineNum += skippedLines;
+                newLineNum += skippedLines;
+            }
+            appendContextLines(output, raw.slice(skippedLines), lineNumWidth, () => oldLineNum++, () => newLineNum++);
+        }
+        else {
+            oldLineNum += raw.length;
+            newLineNum += raw.length;
+        }
+        lastWasChange = false;
+    }
+    return { diff: output.join("\n"), ...(firstChangedLine === undefined ? {} : { firstChangedLine }) };
+}
+function appendContextLines(output, lines, lineNumWidth, nextOldLine, nextNewLine) {
+    for (const line of lines) {
+        const oldLine = nextOldLine();
+        nextNewLine();
+        output.push(` ${String(oldLine).padStart(lineNumWidth, " ")} ${line}`);
+    }
+}
+//# sourceMappingURL=editPreview.js.map

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

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

package/dist/server/sessions/messagePaging.js

@@ -0,0 +1,41 @@
+import { isRecord } from "../utils.js";
+const DEFAULT_LIMIT = 100;
+const MAX_LIMIT = 500;
+export function pageMessagesAtSafeBoundary(messages, page) {
+    if (page?.before === undefined && page?.limit === undefined)
+        return messages;
+    const total = messages.length;
+    const before = clampInteger(page.before ?? total, 0, total);
+    const limit = clampInteger(page.limit ?? DEFAULT_LIMIT, 1, MAX_LIMIT);
+    const requestedStart = Math.max(0, before - limit);
+    const start = expandStartToSafeBoundary(messages, requestedStart);
+    return { messages: messages.slice(start, before), start, total };
+}
+export function expandStartToSafeBoundary(messages, requestedStart) {
+    const start = clampInteger(requestedStart, 0, messages.length);
+    if (start === 0 || isTurnBoundary(messages[start]))
+        return start;
+    for (let index = start - 1; index >= 0; index -= 1) {
+        if (isTurnBoundary(messages[index]))
+            return index;
+    }
+    return 0;
+}
+function isTurnBoundary(message) {
+    return getString(message, "role") === "user";
+}
+function getProperty(value, key) {
+    if (!isRecord(value))
+        return undefined;
+    return value[key];
+}
+function getString(value, key) {
+    const property = getProperty(value, key);
+    return typeof property === "string" ? property : undefined;
+}
+function clampInteger(value, min, max) {
+    if (!Number.isFinite(value))
+        return max;
+    return Math.max(min, Math.min(max, Math.floor(value)));
+}
+//# sourceMappingURL=messagePaging.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"messagePaging.js","sourceRoot":"","sources":["../../../src/server/sessions/messagePaging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,MAAM,aAAa,GAAG,GAAG,CAAC;AAC1B,MAAM,SAAS,GAAG,GAAG,CAAC;AAatB,MAAM,UAAU,0BAA0B,CAAI,QAAa,EAAE,IAAyB;IACpF,IAAI,IAAI,EAAE,MAAM,KAAK,SAAS,IAAI,IAAI,EAAE,KAAK,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IAC7E,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC;IAC9B,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,IAAI,KAAK,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,IAAI,aAAa,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;IACtE,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,yBAAyB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IAClE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,QAAmB,EAAE,cAAsB;IACnF,MAAM,KAAK,GAAG,YAAY,CAAC,cAAc,EAAE,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC/D,IAAI,KAAK,KAAK,CAAC,IAAI,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACjE,KAAK,IAAI,KAAK,GAAG,KAAK,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACnD,IAAI,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;IACpD,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,SAAS,cAAc,CAAC,OAAgB;IACtC,OAAO,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,MAAM,CAAC;AAC/C,CAAC;AAED,SAAS,WAAW,CAAC,KAAc,EAAE,GAAW;IAC9C,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACvC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;AACpB,CAAC;AAGD,SAAS,SAAS,CAAC,KAAc,EAAE,GAAW;IAC5C,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACzC,OAAO,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7D,CAAC;AAED,SAAS,YAAY,CAAC,KAAa,EAAE,GAAW,EAAE,GAAW;IAC3D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,GAAG,CAAC;IACxC,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACzD,CAAC"}

package/dist/server/sessions/oauthLoginFlowService.js

@@ -0,0 +1,136 @@
+import crypto from "node:crypto";
+const DEFAULT_RUNNING_TTL_MS = 600_000; // 10 minutes
+const DEFAULT_TERMINAL_TTL_MS = 60_000; // 1 minute
+function makeView(state) {
+    return {
+        status: state.status,
+        flowId: state.flowId,
+        progress: state.progress,
+        ...(state.prompt !== undefined ? { prompt: state.prompt } : {}),
+        ...(state.select !== undefined ? { select: state.select } : {}),
+        ...(state.auth !== undefined ? { auth: state.auth } : {}),
+        ...(state.error !== undefined ? { error: state.error } : {}),
+    };
+}
+export class OAuthLoginFlowService {
+    #flows = new Map();
+    constructor(options = {}) {
+        this.runningTtlMs = options.runningTtlMs ?? DEFAULT_RUNNING_TTL_MS;
+        this.terminalTtlMs = options.terminalTtlMs ?? DEFAULT_TERMINAL_TTL_MS;
+    }
+    start(options) {
+        const flowId = crypto.randomUUID();
+        const requestId = crypto.randomUUID();
+        const state = {
+            flowId,
+            providerId: options.providerId,
+            providerName: options.providerName,
+            status: "running",
+            progress: [`Authenticating with ${options.providerName}…`],
+            prompt: { requestId, kind: "prompt", message: `Authenticating with ${options.providerName}…` },
+            timeouts: [],
+        };
+        this.#flows.set(flowId, state);
+        const runningTimeout = setTimeout(() => {
+            this.#setError(flowId, "Login timed out");
+        }, options.runningTtlMs ?? this.runningTtlMs);
+        state.timeouts.push(runningTimeout);
+        void this.#runLogin(flowId, options, state);
+        return makeView(state);
+    }
+    respond(flowId, requestId, value) {
+        const state = this.#flows.get(flowId);
+        if (!state)
+            return { status: "cancelled", flowId: "", progress: [] };
+        if (state.pendingResolve && state.prompt?.requestId === requestId) {
+            state.pendingResolve(value);
+            state.pendingResolve = undefined;
+            delete state.prompt;
+        }
+        return makeView(state);
+    }
+    cancel(flowId) {
+        const state = this.#flows.get(flowId);
+        if (!state)
+            return;
+        state.pendingReject?.(new Error("Login cancelled"));
+        state.pendingResolve = undefined;
+        state.pendingReject = undefined;
+        state.rejectedLogin?.(new Error("Login cancelled"));
+    }
+    get(flowId) {
+        const state = this.#flows.get(flowId);
+        if (!state)
+            return { status: "cancelled", flowId: "", progress: [] };
+        return makeView(state);
+    }
+    dispose() {
+        this.#flows.forEach((state) => {
+            state.timeouts.forEach(clearTimeout);
+        });
+        this.#flows.clear();
+    }
+    async #runLogin(flowId, options, state) {
+        try {
+            state.resolvedLogin = undefined;
+            state.rejectedLogin = undefined;
+            await new Promise((resolve, reject) => {
+                state.resolvedLogin = resolve;
+                state.rejectedLogin = reject;
+                options.authStorage.login(options.providerId, {
+                    signal: new AbortController().signal,
+                    onAuth: (info) => {
+                        if (typeof info.url === "string" && info.url !== "") {
+                            const auth = { url: info.url };
+                            if (info.instructions !== undefined)
+                                auth.instructions = info.instructions;
+                            state.auth = auth;
+                        }
+                    },
+                    onPrompt: async (prompt) => {
+                        const reqId = crypto.randomUUID();
+                        const result = new Promise((res, rej) => {
+                            state.pendingResolve = res;
+                            state.pendingReject = rej;
+                        });
+                        const promptView = {
+                            requestId: reqId,
+                            kind: "prompt",
+                            message: prompt.message,
+                        };
+                        if (prompt.placeholder !== undefined)
+                            promptView.placeholder = prompt.placeholder;
+                        state.prompt = promptView;
+                        return result;
+                    },
+                }).then(() => {
+                    resolve();
+                }, (error) => {
+                    reject(error instanceof Error ? error : new Error(String(error)));
+                });
+            });
+            state.status = "complete";
+            state.progress.push("Login complete");
+            this.#scheduleEvict(state);
+        }
+        catch (error) {
+            this.#setError(flowId, error instanceof Error ? error.message : String(error));
+        }
+    }
+    #scheduleEvict(state) {
+        const timeout = setTimeout(() => {
+            state.timeouts.forEach(clearTimeout);
+            this.#flows.delete(state.flowId);
+        }, this.terminalTtlMs);
+        state.timeouts.push(timeout);
+    }
+    #setError(flowId, message) {
+        const state = this.#flows.get(flowId);
+        if (!state)
+            return;
+        state.status = "error";
+        state.error = message;
+        this.#scheduleEvict(state);
+    }
+}
+//# sourceMappingURL=oauthLoginFlowService.js.map

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

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

package/dist/server/sessions/piSessionManagerGateway.js

@@ -0,0 +1,97 @@
+import { readdir } from "node:fs/promises";
+import { homedir } from "node:os";
+import { dirname, isAbsolute, join, resolve } from "node:path";
+import { getAgentDir, SessionManager } from "@oh-my-pi/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);
+    }
+    globalEnvSessionDir() {
+        const envSessionDir = this.env[PI_SESSION_DIR_ENV];
+        if (envSessionDir === undefined || envSessionDir === "")
+            return undefined;
+        const expanded = expandTildePath(envSessionDir);
+        return isAbsolute(expanded) ? expanded : undefined;
+    }
+    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 = SessionManager.getDefaultSessionDir(cwd, this.agentDir);
+        if (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);
+    }
+    async open(path) {
+        return SessionManager.open(path, dirname(path));
+    }
+}
+export async function listSessionsInDir(sessionDir) {
+    // Use SessionManager.list() which lists by cwd but also accepts an explicit
+    // sessionDir so we only discover sessions stored in the given directory.
+    const sessions = await SessionManager.list("", 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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"}