{pastChatTitle(session)}
{preview &&
{preview}
}
- {(turnsKnown || turnsPending || ts) && (
+ {(turnsLabel || ts) && (
- {turnsPending && {t("history.indexing")}}
- {turnsKnown && {t("composer.sessionTurns", { n: session.turns })}}
+ {turnsLabel && {turnsLabel}}
{ts && · {fmtSessionTime(ts)}}
)}
@@ -4155,11 +4152,7 @@ export function Composer({
{pastChatTitle(session)}
- {turnsPending
- ? ` (${t("history.indexing")})`
- : turnsKnown
- ? ` (${t("composer.sessionTurns", { n: session.turns })})`
- : ""}
+ {turnsLabel ? ` (${turnsLabel})` : ""}
@@ -4324,11 +4317,7 @@ export function Composer({
{ref.title}
- {ref.turnsState === "unknown"
- ? ` (${t("history.indexing")})`
- : typeof ref.turns === "number"
- ? ` (${t("composer.sessionTurns", { n: ref.turns })})`
- : ""}
+ {sessionTurnsLabel(ref, t) ? ` (${sessionTurnsLabel(ref, t)})` : ""}
diff --git a/desktop/frontend/src/components/ProjectTree.tsx b/desktop/frontend/src/components/ProjectTree.tsx
index 9b82e2d219..16d7694a4b 100644
--- a/desktop/frontend/src/components/ProjectTree.tsx
+++ b/desktop/frontend/src/components/ProjectTree.tsx
@@ -8,10 +8,13 @@ import type { CSSProperties, DragEvent as ReactDragEvent, KeyboardEvent as React
import { Archive, ArrowDown, Pencil, Plus, Folder, FolderPlus, Search, BriefcaseBusiness, Copy, FolderOpen, XCircle, Check, ListCollapse, ListRestart, MessageSquare, Clock, Pin, MoreHorizontal, Minimize2, Maximize2, GitBranch } from "lucide-react";
import { asArray } from "../lib/array";
import { useToast } from "../lib/toast";
-import { app, onProjectTreeChangedV2 } from "../lib/bridge";
-import type { ProjectNode, ProjectTopicStatus, SessionCatalogStatus } from "../lib/types";
+import { app } from "../lib/bridge";
+import { onProjectTreeChangedV2 } from "../lib/sessionCatalogBridge";
+import { isRuntimeSessionNode, isTopicNode, mergeProjectTopicPage, projectTreeDedupedExactTime, projectTreeEventAffectsFolder, projectTreeFolderDisclosure, projectTreeReadActivityKey, projectTreeRevisionIsFresh, projectTreeShouldRenderTopicActions, projectTreeShouldSuppressOpenForRename, projectTreeTopicArchiveBlocked, projectTreeTopicHasUnreadActivity, projectTreeTopicHoverCardModel, projectTreeTopicMenuOffersPin, projectTreeTopicMetaLine, projectTreeTopicOpenRequest, topicActivityAt, topicActivityDateLabel, topicActivityLabel, topicIsActive, topicStatus, topicStatusLabel, topicUnknownTimeLabel, type ProjectTreePendingTopicOpen, type ProjectTreeReadActivity, type ProjectTreeTopicHoverCard, type ProjectTreeVariant } from "../lib/projectTreeTopic";
+export * from "../lib/projectTreeTopic";
+import type { ProjectNode, SessionCatalogStatus } from "../lib/types";
import { topicActivityTime } from "../lib/session";
-import { getLocale, useT, type DictKey, type Translator } from "../lib/i18n";
+import { useT, type Translator } from "../lib/i18n";
import { PROJECT_COLOR_OPTIONS, projectColorValue } from "../lib/projectColors";
import { useProjectTreeArchiveState } from "../lib/projectTreeArchive";
import { topicShortcutLabel, type TopicShortcutEntry } from "../lib/topicShortcuts";
@@ -20,8 +23,6 @@ import { ContextMenu, contextMenuPointFromEvent, type ContextMenuItem, type Cont
import { Tooltip } from "./Tooltip";
import { WorktreeBadge } from "./WorktreeBadge";
-type ProjectTreeVariant = "classic" | "workbench" | "creation";
-
interface ProjectTreeProps {
activeScope?: string;
activeWorkspaceRoot?: string;
@@ -56,276 +57,6 @@ function projectNodeKey(node: ProjectNode, depth: number): string {
return node.key || `${node.kind}-${node.root ?? ""}-${node.topicId ?? ""}-${depth}`;
}
-function isRuntimeSessionNode(node: ProjectNode): boolean {
- return node.kind === "session" || node.kind === "global_session";
-}
-
-function isTopicNode(node: ProjectNode): boolean {
- return node.kind === "topic" || node.kind === "global_topic";
-}
-
-export function projectTreeRevisionIsFresh(currentRevision: number, incomingRevision: number): boolean {
- return incomingRevision >= currentRevision;
-}
-
-export function mergeProjectTopicPage(current: ProjectNode[], incoming: ProjectNode[], append: boolean): ProjectNode[] {
- if (!append) return [...incoming];
- const next = [...current];
- const positions = new Map(next.map((node, index) => [node.key, index]));
- for (const node of incoming) {
- const index = positions.get(node.key);
- if (index === undefined) {
- positions.set(node.key, next.length);
- next.push(node);
- } else {
- next[index] = node;
- }
- }
- return next;
-}
-
-export function projectTreeEventAffectsFolder(project: ProjectNode, roots: string[]): boolean {
- if (roots.length === 0) return true;
- const root = project.kind === "global_folder" ? "" : project.root ?? "";
- return roots.includes(root);
-}
-
-export type ProjectTreeTopicOpenRequest = {
- scope: "global" | "project";
- workspaceRoot: string;
- topicId: string;
- sessionPath?: string;
-};
-
-export function projectTreeTopicOpenRequest(node: ProjectNode): ProjectTreeTopicOpenRequest | null {
- if (!isTopicNode(node) && !isRuntimeSessionNode(node)) return null;
- const scope = node.kind === "global_topic" || node.kind === "global_session" ? "global" : "project";
- return {
- scope,
- workspaceRoot: scope === "global" ? "" : node.root ?? "",
- topicId: node.topicId ?? "",
- sessionPath: node.sessionPath,
- };
-}
-
-type ProjectTreeTopicClickTarget = {
- rowKey: string;
- canRename: boolean;
-};
-
-type ProjectTreePendingTopicOpen = ProjectTreeTopicClickTarget & {
- timer: ReturnType
;
-};
-
-export function projectTreeShouldSuppressOpenForRename(
- pending: ProjectTreeTopicClickTarget | null,
- next: ProjectTreeTopicClickTarget,
-): boolean {
- return Boolean(pending && pending.rowKey === next.rowKey && pending.canRename && next.canRename);
-}
-
-export type ProjectTreeFolderDisclosure = {
- canExpand: boolean;
- isOpen: boolean;
- ariaExpanded?: boolean;
- iconStackClassName: string;
-};
-
-// allowEmptyExpand lets classic folders open without children so the expanded
-// state can host the "no sessions" placeholder row; other variants keep the
-// original contract where empty folders are inert.
-export function projectTreeFolderDisclosure(hasChildren: boolean, isExpanded: boolean, allowEmptyExpand = false): ProjectTreeFolderDisclosure {
- const canExpand = hasChildren || allowEmptyExpand;
- const isOpen = canExpand && isExpanded;
- return {
- canExpand,
- isOpen,
- ariaExpanded: canExpand ? isExpanded : undefined,
- iconStackClassName: `project-tree__icon-stack${canExpand ? " project-tree__icon-stack--expandable" : ""}`,
- };
-}
-
-function topicIsActive(node: ProjectNode, activeScope?: string, activeWorkspaceRoot?: string, activeTopicId?: string, activeSessionPath?: string): boolean {
- if (!isTopicNode(node) && !isRuntimeSessionNode(node)) return false;
- if (node.sessionPath) return Boolean(activeSessionPath && activeSessionPath === node.sessionPath);
- if (activeSessionPath && asArray(node.children).some(isRuntimeSessionNode)) return false;
- const scope = node.kind === "global_topic" ? "global" : "project";
- return (
- activeTopicId === node.topicId &&
- activeScope === scope &&
- (scope === "global" || activeWorkspaceRoot === node.root)
- );
-}
-
-export function projectTreeTopicMetaLine(node: ProjectNode, t: Translator, compact = false): string {
- const parts: string[] = [];
- const turns = node.turns ?? 0;
- if (node.turnsState === "unknown") parts.push(t("history.indexing"));
- else if (turns > 0) parts.push(t(turns === 1 ? "history.turnOne" : "history.turnOther", { n: turns }));
- const activityAt = node.lastActivityAt || node.createdAt || 0;
- if (activityAt) parts.push(topicActivityLabel(activityAt, t, compact));
- if (parts.length === 0) parts.push(t("projectTree.previously"));
- return parts.join(" · ");
-}
-
-// Model for the classic hover preview card: the row keeps a time-only meta
-// line, so the card carries the full title, turns, exact date, and project.
-export type ProjectTreeTopicHoverCard = {
- title: string;
- statusLabel: string;
- metaLine: string;
- exactTime: string;
- projectLabel: string;
-};
-
-// Activity labels older than a week are already the calendar date (always the
-// meta line's last part), so callers pairing the two keep a single copy.
-export function projectTreeDedupedExactTime(metaLine: string, exactTime: string): string {
- return exactTime && metaLine.endsWith(exactTime) ? "" : exactTime;
-}
-
-export function projectTreeTopicHoverCardModel(node: ProjectNode, t: Translator, projectLabel: string): ProjectTreeTopicHoverCard {
- const activityAt = node.lastActivityAt || node.createdAt || 0;
- const metaLine = projectTreeTopicMetaLine(node, t);
- const exactTime = activityAt ? topicActivityDateLabel(activityAt) : "";
- return {
- title: (node.label || node.topicId || "Untitled").replace(/^●\s*/, ""),
- statusLabel: topicStatusLabel(node, t),
- metaLine,
- exactTime: projectTreeDedupedExactTime(metaLine, exactTime),
- projectLabel,
- };
-}
-
-function topicUnknownTimeLabel(node: ProjectNode, t: Translator): string {
- return topicActivityAt(node) ? "" : t("projectTree.previously");
-}
-
-const topicStatusLabels: Record = {
- thinking: "projectTree.status.thinking",
- streaming: "projectTree.status.streaming",
- waiting_confirmation: "projectTree.status.waitingConfirmation",
- background_job: "projectTree.status.backgroundJob",
- paused: "projectTree.status.paused",
- error: "projectTree.status.error",
-};
-
-function normalizeTopicStatus(status?: string): ProjectTopicStatus | "" {
- if (!status) return "";
- if (status === "thinking" || status === "streaming" || status === "waiting_confirmation" || status === "background_job" || status === "paused" || status === "error") {
- return status;
- }
- return "";
-}
-
-function topicStatus(node: ProjectNode): ProjectTopicStatus | "" {
- return normalizeTopicStatus(node.status) || (node.running ? "streaming" : "");
-}
-
-export function projectTreeTopicArchiveBlocked(node: ProjectNode): boolean {
- if (asArray(node.children).some(projectTreeTopicArchiveBlocked)) return true;
- const status = normalizeTopicStatus(node.status);
- if (status === "thinking" || status === "streaming" || status === "waiting_confirmation" || status === "background_job") return true;
- if (status === "paused" || status === "error") return false;
- return Boolean(node.running);
-}
-
-function topicStatusLabel(node: ProjectNode, t: Translator): string {
- const status = topicStatus(node);
- return status ? t(topicStatusLabels[status]) : "";
-}
-
-function topicActivityAt(node: ProjectNode): number {
- return node.lastActivityAt || node.createdAt || 0;
-}
-
-export function projectTreeReadActivityKey(node: ProjectNode): string | null {
- const request = projectTreeTopicOpenRequest(node);
- if (!request?.topicId) return null;
- return [
- request.scope,
- request.workspaceRoot,
- request.topicId,
- request.sessionPath ?? "",
- ].join("\u001f");
-}
-
-type ProjectTreeReadActivity = Record;
-
-export function projectTreeTopicHasUnreadActivity(
- node: ProjectNode,
- readActivity: ProjectTreeReadActivity,
- activeScope?: string,
- activeWorkspaceRoot?: string,
- activeTopicId?: string,
- activeSessionPath?: string,
-): boolean {
- if (!isTopicNode(node) && !isRuntimeSessionNode(node)) return false;
- if (topicIsActive(node, activeScope, activeWorkspaceRoot, activeTopicId, activeSessionPath)) return false;
- if (topicStatus(node) !== "") return false;
- const key = projectTreeReadActivityKey(node);
- const activityAt = topicActivityAt(node);
- return Boolean(key && activityAt > 0 && (readActivity[key] ?? 0) < activityAt);
-}
-
-export function projectTreeShouldRenderTopicActions(isSessionNode: boolean, variant: ProjectTreeVariant, unread: boolean): boolean {
- return !isSessionNode && variant !== "creation" && !unread;
-}
-
-// Pinning reorders the classic/workbench trees shared with creation mode, so
-// the creation context menu keeps its original rename/trash-only entries.
-export function projectTreeTopicMenuOffersPin(variant: ProjectTreeVariant): boolean {
- return variant !== "creation";
-}
-
-function topicActivityLabel(ms: number, t: Translator, compact = false): string {
- if (ms <= 0) return "";
- const delta = Date.now() - ms;
- const locale = getLocale();
- const minute = 60_000;
- const hour = 60 * minute;
- const day = 24 * hour;
- const month = 30 * day;
- const year = 365 * day;
- if (delta < minute) return t("projectTree.justNow");
- if (!compact) {
- const rtfLocale = locale === "zh" ? "zh-CN" : locale === "zh-TW" ? "zh-TW" : "en";
- const rtf = new Intl.RelativeTimeFormat(rtfLocale, { numeric: "auto" });
- if (delta < hour) return rtf.format(-Math.max(1, Math.round(delta / minute)), "minute");
- if (delta < day) return rtf.format(-Math.round(delta / hour), "hour");
- if (delta < 7 * day) return rtf.format(-Math.round(delta / day), "day");
- return topicActivityDateLabel(ms);
- }
- if (delta < hour) {
- const value = Math.max(1, Math.round(delta / minute));
- return locale === "zh" || locale === "zh-TW" ? `${value} 分钟` : `${value}m`;
- }
- if (delta < day) {
- const value = Math.round(delta / hour);
- return locale === "zh" || locale === "zh-TW" ? `${value} 小时` : `${value}h`;
- }
- if (delta < 7 * day) {
- const value = Math.round(delta / day);
- return locale === "zh" || locale === "zh-TW" ? `${value} 天` : `${value}d`;
- }
- if (delta < month) {
- const value = Math.round(delta / day);
- return locale === "zh" || locale === "zh-TW" ? `${value} 天` : `${value}d`;
- }
- if (delta < year) {
- const value = Math.max(1, Math.round(delta / month));
- return locale === "zh" || locale === "zh-TW" ? `${value} 个月` : `${value}mo`;
- }
- const value = Math.max(1, Math.round(delta / year));
- return locale === "zh" || locale === "zh-TW" ? `${value} 年` : `${value}y`;
-}
-
-function topicActivityDateLabel(ms: number): string {
- if (ms <= 0) return "";
- const locale = getLocale();
- const dateLocale = locale === "zh" ? "zh-CN" : locale === "zh-TW" ? "zh-TW" : "en";
- return new Date(ms).toLocaleDateString(dateLocale);
-}
type ProjectDropPosition = "before" | "after";
type WorkbenchHeaderMenu = "more" | "add" | null;
diff --git a/desktop/frontend/src/lib/bridge.ts b/desktop/frontend/src/lib/bridge.ts
index dfd19059ce..1c1fdf64bf 100644
--- a/desktop/frontend/src/lib/bridge.ts
+++ b/desktop/frontend/src/lib/bridge.ts
@@ -1,7 +1,4 @@
-// bridge is the seam between React and the Go kernel. The Wails shell calls bound
-// App methods and subscribes to runtime events; in a plain browser (`pnpm dev`),
-// a mock streams a canned turn through the same contract so the whole UI can be
-// developed and laid out without rebuilding the Go side.
+// Wails and the browser mock share this React-to-Go contract.
// @ts-ignore `wails generate module` creates this locally; fresh checkouts keep
// typecheck green by falling back to a disabled drift check below.
@@ -9,8 +6,8 @@ import type * as GeneratedApp from "../../wailsjs/go/main/App";
import type { InvocationRequest } from "./invocationDisplay";
import { addBreadcrumb } from "./breadcrumbs";
-import { asArray } from "./array";
import { maybeShare } from "./queryCoalesce";
+import { makeMockSessionCatalogBindings } from "./sessionCatalogBridge";
import { t } from "./i18n";
import { providerIsConfigured, providerRequiresKey, removeProviderAccessesForMock } from "./providerModels";
import { DEFAULT_STATUS_BAR_ITEMS, normalizeStatusBarItems } from "./statusBarItems";
@@ -87,12 +84,7 @@ import type {
PluginInstallOptions,
PluginView,
ProjectNode,
- ProjectTreeSnapshot,
- ProjectTopicPageRequest,
- ProjectTopicPage,
- ProjectTopicKey,
- SessionCatalogStatus,
- ProjectTreeChangedV2,
+ SessionCatalogBindings,
PromptHistoryEntry,
PromptHistoryResult,
ProviderModelCatalogUpdate,
@@ -170,7 +162,7 @@ interface DesktopWindowState {
// added or renamed, the generated types shift, and a key present in GeneratedApp
// but missing from AppBindings causes a type error here. Fix: add the new method
// to AppBindings, then run `pnpm typecheck` to verify.
-export interface AppBindings {
+export interface AppBindings extends SessionCatalogBindings {
Platform(): Promise;
MinimiseMainWindow(): Promise;
ToggleMaximiseMainWindow(): Promise;
@@ -576,11 +568,6 @@ export interface AppBindings {
CloseTerminalForTab(tabID: string, sessionID: string): Promise;
RenameTerminalForTab(tabID: string, sessionID: string, title: string): Promise;
ListProjectTree(): Promise;
- GetProjectTreeSnapshot(): Promise;
- ListProjectTopics(req: ProjectTopicPageRequest): Promise;
- GetTopicSummary(key: ProjectTopicKey): Promise;
- GetSessionCatalogStatus(): Promise;
- RebuildSessionCatalog(): Promise;
RenameProject(workspaceRoot: string, title: string): Promise;
SetProjectColor(workspaceRoot: string, color: string): Promise;
SetProjectPinned(workspaceRoot: string, pinned: boolean): Promise;
@@ -898,21 +885,6 @@ export function onProjectTreeChanged(cb: () => void): () => void {
return () => {};
}
-export function onProjectTreeChangedV2(cb: (event: ProjectTreeChangedV2) => void): () => void {
- if (realApp() && typeof window !== "undefined" && window.runtime) {
- return window.runtime.EventsOn("project-tree:changed-v2", (payload?: unknown) => {
- if (!payload || typeof payload !== "object") return;
- const event = payload as Partial;
- cb({
- revision: typeof event.revision === "number" ? event.revision : 0,
- roots: asArray(event.roots).filter((root): root is string => typeof root === "string"),
- reason: typeof event.reason === "string" ? event.reason : "changed",
- });
- });
- }
- return () => {};
-}
-
// onTopicActivation subscribes to the "topic:activation" channel carrying the
// lifecycle of ticketed StartTopicActivation requests (starting/ready/failed/
// cancelled). Returns an unsubscribe.
@@ -2430,6 +2402,7 @@ function makeMockApp(): AppBindings {
}
};
return {
+ ...makeMockSessionCatalogBindings(cloneProjectTree),
async MinimiseMainWindow() {
console.info("mock MinimiseMainWindow");
},
@@ -5173,35 +5146,6 @@ function makeMockApp(): AppBindings {
async ListProjectTree() {
return cloneProjectTree();
},
- async GetProjectTreeSnapshot() {
- return {
- revision: 1,
- projects: cloneProjectTree().map((project) => ({ ...project, children: [] })),
- catalog: { state: "ready", mode: "memory", revision: 1, indexed: 4, total: 4, repairPending: 0 },
- indexed: 4,
- total: 4,
- indexingDone: true,
- };
- },
- async ListProjectTopics(req: ProjectTopicPageRequest) {
- const folder = req.scope === "global"
- ? cloneProjectTree().find((item) => item.kind === "global_folder")
- : cloneProjectTree().find((item) => item.kind === "project" && item.root === req.workspaceRoot);
- const query = (req.query ?? "").trim().toLocaleLowerCase();
- const all = asArray(folder?.children).filter((item) => !query || item.label.toLocaleLowerCase().includes(query));
- const start = Math.max(0, Number.parseInt(req.cursor ?? "0", 10) || 0);
- const limit = Math.min(200, Math.max(1, req.limit ?? 50));
- const items = all.slice(start, start + limit);
- return { items, nextCursor: start + items.length < all.length ? String(start + items.length) : undefined, revision: 1 };
- },
- async GetTopicSummary(key: ProjectTopicKey) {
- const page = await this.ListProjectTopics({ scope: key.scope, workspaceRoot: key.workspaceRoot, limit: 200 });
- return page.items.find((item) => item.topicId === key.topicId) ?? { key: "", kind: key.scope === "global" ? "global_topic" : "topic", label: "", children: [] };
- },
- async GetSessionCatalogStatus() {
- return { state: "ready", mode: "memory", revision: 1, indexed: 4, total: 4, repairPending: 0 };
- },
- async RebuildSessionCatalog() {},
async RenameProject(workspaceRoot: string, title: string) {
const node = workspaceRoot
? mockProjectTree.find((item) => item.root === workspaceRoot)
diff --git a/desktop/frontend/src/lib/projectTreeTopic.ts b/desktop/frontend/src/lib/projectTreeTopic.ts
new file mode 100644
index 0000000000..3b1670ad56
--- /dev/null
+++ b/desktop/frontend/src/lib/projectTreeTopic.ts
@@ -0,0 +1,276 @@
+import { asArray } from "./array";
+import { getLocale, type DictKey, type Translator } from "./i18n";
+import type { ProjectNode, ProjectTopicStatus } from "./types";
+
+export type ProjectTreeVariant = "classic" | "workbench" | "creation";
+
+export function isRuntimeSessionNode(node: ProjectNode): boolean {
+ return node.kind === "session" || node.kind === "global_session";
+}
+
+export function isTopicNode(node: ProjectNode): boolean {
+ return node.kind === "topic" || node.kind === "global_topic";
+}
+
+export function projectTreeRevisionIsFresh(currentRevision: number, incomingRevision: number): boolean {
+ return incomingRevision >= currentRevision;
+}
+
+export function mergeProjectTopicPage(current: ProjectNode[], incoming: ProjectNode[], append: boolean): ProjectNode[] {
+ if (!append) return [...incoming];
+ const next = [...current];
+ const positions = new Map(next.map((node, index) => [node.key, index]));
+ for (const node of incoming) {
+ const index = positions.get(node.key);
+ if (index === undefined) {
+ positions.set(node.key, next.length);
+ next.push(node);
+ } else {
+ next[index] = node;
+ }
+ }
+ return next;
+}
+
+export function projectTreeEventAffectsFolder(project: ProjectNode, roots: string[]): boolean {
+ if (roots.length === 0) return true;
+ const root = project.kind === "global_folder" ? "" : project.root ?? "";
+ return roots.includes(root);
+}
+
+export type ProjectTreeTopicOpenRequest = {
+ scope: "global" | "project";
+ workspaceRoot: string;
+ topicId: string;
+ sessionPath?: string;
+};
+
+export function projectTreeTopicOpenRequest(node: ProjectNode): ProjectTreeTopicOpenRequest | null {
+ if (!isTopicNode(node) && !isRuntimeSessionNode(node)) return null;
+ const scope = node.kind === "global_topic" || node.kind === "global_session" ? "global" : "project";
+ return {
+ scope,
+ workspaceRoot: scope === "global" ? "" : node.root ?? "",
+ topicId: node.topicId ?? "",
+ sessionPath: node.sessionPath,
+ };
+}
+
+export type ProjectTreeTopicClickTarget = {
+ rowKey: string;
+ canRename: boolean;
+};
+
+export type ProjectTreePendingTopicOpen = ProjectTreeTopicClickTarget & {
+ timer: ReturnType;
+};
+
+export function projectTreeShouldSuppressOpenForRename(
+ pending: ProjectTreeTopicClickTarget | null,
+ next: ProjectTreeTopicClickTarget,
+): boolean {
+ return Boolean(pending && pending.rowKey === next.rowKey && pending.canRename && next.canRename);
+}
+
+export type ProjectTreeFolderDisclosure = {
+ canExpand: boolean;
+ isOpen: boolean;
+ ariaExpanded?: boolean;
+ iconStackClassName: string;
+};
+
+// allowEmptyExpand lets classic folders open without children so the expanded
+// state can host the "no sessions" placeholder row; other variants keep the
+// original contract where empty folders are inert.
+export function projectTreeFolderDisclosure(hasChildren: boolean, isExpanded: boolean, allowEmptyExpand = false): ProjectTreeFolderDisclosure {
+ const canExpand = hasChildren || allowEmptyExpand;
+ const isOpen = canExpand && isExpanded;
+ return {
+ canExpand,
+ isOpen,
+ ariaExpanded: canExpand ? isExpanded : undefined,
+ iconStackClassName: `project-tree__icon-stack${canExpand ? " project-tree__icon-stack--expandable" : ""}`,
+ };
+}
+
+export function topicIsActive(node: ProjectNode, activeScope?: string, activeWorkspaceRoot?: string, activeTopicId?: string, activeSessionPath?: string): boolean {
+ if (!isTopicNode(node) && !isRuntimeSessionNode(node)) return false;
+ if (node.sessionPath) return Boolean(activeSessionPath && activeSessionPath === node.sessionPath);
+ if (activeSessionPath && asArray(node.children).some(isRuntimeSessionNode)) return false;
+ const scope = node.kind === "global_topic" ? "global" : "project";
+ return (
+ activeTopicId === node.topicId &&
+ activeScope === scope &&
+ (scope === "global" || activeWorkspaceRoot === node.root)
+ );
+}
+
+export function projectTreeTopicMetaLine(node: ProjectNode, t: Translator, compact = false): string {
+ const parts: string[] = [];
+ const turns = node.turns ?? 0;
+ if (node.turnsState === "unknown") parts.push(t("history.indexing"));
+ else if (turns > 0) parts.push(t(turns === 1 ? "history.turnOne" : "history.turnOther", { n: turns }));
+ const activityAt = node.lastActivityAt || node.createdAt || 0;
+ if (activityAt) parts.push(topicActivityLabel(activityAt, t, compact));
+ if (parts.length === 0) parts.push(t("projectTree.previously"));
+ return parts.join(" · ");
+}
+
+// Model for the classic hover preview card: the row keeps a time-only meta
+// line, so the card carries the full title, turns, exact date, and project.
+export type ProjectTreeTopicHoverCard = {
+ title: string;
+ statusLabel: string;
+ metaLine: string;
+ exactTime: string;
+ projectLabel: string;
+};
+
+// Activity labels older than a week are already the calendar date (always the
+// meta line's last part), so callers pairing the two keep a single copy.
+export function projectTreeDedupedExactTime(metaLine: string, exactTime: string): string {
+ return exactTime && metaLine.endsWith(exactTime) ? "" : exactTime;
+}
+
+export function projectTreeTopicHoverCardModel(node: ProjectNode, t: Translator, projectLabel: string): ProjectTreeTopicHoverCard {
+ const activityAt = node.lastActivityAt || node.createdAt || 0;
+ const metaLine = projectTreeTopicMetaLine(node, t);
+ const exactTime = activityAt ? topicActivityDateLabel(activityAt) : "";
+ return {
+ title: (node.label || node.topicId || "Untitled").replace(/^●\s*/, ""),
+ statusLabel: topicStatusLabel(node, t),
+ metaLine,
+ exactTime: projectTreeDedupedExactTime(metaLine, exactTime),
+ projectLabel,
+ };
+}
+
+export function topicUnknownTimeLabel(node: ProjectNode, t: Translator): string {
+ return topicActivityAt(node) ? "" : t("projectTree.previously");
+}
+
+const topicStatusLabels: Record = {
+ thinking: "projectTree.status.thinking",
+ streaming: "projectTree.status.streaming",
+ waiting_confirmation: "projectTree.status.waitingConfirmation",
+ background_job: "projectTree.status.backgroundJob",
+ paused: "projectTree.status.paused",
+ error: "projectTree.status.error",
+};
+
+export function normalizeTopicStatus(status?: string): ProjectTopicStatus | "" {
+ if (!status) return "";
+ if (status === "thinking" || status === "streaming" || status === "waiting_confirmation" || status === "background_job" || status === "paused" || status === "error") {
+ return status;
+ }
+ return "";
+}
+
+export function topicStatus(node: ProjectNode): ProjectTopicStatus | "" {
+ return normalizeTopicStatus(node.status) || (node.running ? "streaming" : "");
+}
+
+export function projectTreeTopicArchiveBlocked(node: ProjectNode): boolean {
+ if (asArray(node.children).some(projectTreeTopicArchiveBlocked)) return true;
+ const status = normalizeTopicStatus(node.status);
+ if (status === "thinking" || status === "streaming" || status === "waiting_confirmation" || status === "background_job") return true;
+ if (status === "paused" || status === "error") return false;
+ return Boolean(node.running);
+}
+
+export function topicStatusLabel(node: ProjectNode, t: Translator): string {
+ const status = topicStatus(node);
+ return status ? t(topicStatusLabels[status]) : "";
+}
+
+export function topicActivityAt(node: ProjectNode): number {
+ return node.lastActivityAt || node.createdAt || 0;
+}
+
+export function projectTreeReadActivityKey(node: ProjectNode): string | null {
+ const request = projectTreeTopicOpenRequest(node);
+ if (!request?.topicId) return null;
+ return [
+ request.scope,
+ request.workspaceRoot,
+ request.topicId,
+ request.sessionPath ?? "",
+ ].join("\u001f");
+}
+
+export type ProjectTreeReadActivity = Record;
+
+export function projectTreeTopicHasUnreadActivity(
+ node: ProjectNode,
+ readActivity: ProjectTreeReadActivity,
+ activeScope?: string,
+ activeWorkspaceRoot?: string,
+ activeTopicId?: string,
+ activeSessionPath?: string,
+): boolean {
+ if (!isTopicNode(node) && !isRuntimeSessionNode(node)) return false;
+ if (topicIsActive(node, activeScope, activeWorkspaceRoot, activeTopicId, activeSessionPath)) return false;
+ if (topicStatus(node) !== "") return false;
+ const key = projectTreeReadActivityKey(node);
+ const activityAt = topicActivityAt(node);
+ return Boolean(key && activityAt > 0 && (readActivity[key] ?? 0) < activityAt);
+}
+
+export function projectTreeShouldRenderTopicActions(isSessionNode: boolean, variant: ProjectTreeVariant, unread: boolean): boolean {
+ return !isSessionNode && variant !== "creation" && !unread;
+}
+
+// Pinning reorders the classic/workbench trees shared with creation mode, so
+// the creation context menu keeps its original rename/trash-only entries.
+export function projectTreeTopicMenuOffersPin(variant: ProjectTreeVariant): boolean {
+ return variant !== "creation";
+}
+
+export function topicActivityLabel(ms: number, t: Translator, compact = false): string {
+ if (ms <= 0) return "";
+ const delta = Date.now() - ms;
+ const locale = getLocale();
+ const minute = 60_000;
+ const hour = 60 * minute;
+ const day = 24 * hour;
+ const month = 30 * day;
+ const year = 365 * day;
+ if (delta < minute) return t("projectTree.justNow");
+ if (!compact) {
+ const rtfLocale = locale === "zh" ? "zh-CN" : locale === "zh-TW" ? "zh-TW" : "en";
+ const rtf = new Intl.RelativeTimeFormat(rtfLocale, { numeric: "auto" });
+ if (delta < hour) return rtf.format(-Math.max(1, Math.round(delta / minute)), "minute");
+ if (delta < day) return rtf.format(-Math.round(delta / hour), "hour");
+ if (delta < 7 * day) return rtf.format(-Math.round(delta / day), "day");
+ return topicActivityDateLabel(ms);
+ }
+ if (delta < hour) {
+ const value = Math.max(1, Math.round(delta / minute));
+ return locale === "zh" || locale === "zh-TW" ? `${value} 分钟` : `${value}m`;
+ }
+ if (delta < day) {
+ const value = Math.round(delta / hour);
+ return locale === "zh" || locale === "zh-TW" ? `${value} 小时` : `${value}h`;
+ }
+ if (delta < 7 * day) {
+ const value = Math.round(delta / day);
+ return locale === "zh" || locale === "zh-TW" ? `${value} 天` : `${value}d`;
+ }
+ if (delta < month) {
+ const value = Math.round(delta / day);
+ return locale === "zh" || locale === "zh-TW" ? `${value} 天` : `${value}d`;
+ }
+ if (delta < year) {
+ const value = Math.max(1, Math.round(delta / month));
+ return locale === "zh" || locale === "zh-TW" ? `${value} 个月` : `${value}mo`;
+ }
+ const value = Math.max(1, Math.round(delta / year));
+ return locale === "zh" || locale === "zh-TW" ? `${value} 年` : `${value}y`;
+}
+
+export function topicActivityDateLabel(ms: number): string {
+ if (ms <= 0) return "";
+ const locale = getLocale();
+ const dateLocale = locale === "zh" ? "zh-CN" : locale === "zh-TW" ? "zh-TW" : "en";
+ return new Date(ms).toLocaleDateString(dateLocale);
+}
diff --git a/desktop/frontend/src/lib/sessionCatalogBridge.ts b/desktop/frontend/src/lib/sessionCatalogBridge.ts
new file mode 100644
index 0000000000..715cb137c1
--- /dev/null
+++ b/desktop/frontend/src/lib/sessionCatalogBridge.ts
@@ -0,0 +1,60 @@
+import { asArray } from "./array";
+import type {
+ ProjectNode,
+ ProjectTopicKey,
+ ProjectTopicPage,
+ ProjectTopicPageRequest,
+ ProjectTreeChangedV2,
+ SessionCatalogBindings,
+} from "./types";
+
+export function onProjectTreeChangedV2(cb: (event: ProjectTreeChangedV2) => void): () => void {
+ if (typeof window !== "undefined" && window.runtime) {
+ return window.runtime.EventsOn("project-tree:changed-v2", (payload?: unknown) => {
+ if (!payload || typeof payload !== "object") return;
+ const event = payload as Partial;
+ cb({
+ revision: typeof event.revision === "number" ? event.revision : 0,
+ roots: asArray(event.roots).filter((root): root is string => typeof root === "string"),
+ reason: typeof event.reason === "string" ? event.reason : "changed",
+ });
+ });
+ }
+ return () => {};
+}
+
+export function makeMockSessionCatalogBindings(cloneProjectTree: () => ProjectNode[]): SessionCatalogBindings {
+ const listProjectTopics = async (req: ProjectTopicPageRequest): Promise => {
+ const folder = req.scope === "global"
+ ? cloneProjectTree().find((item) => item.kind === "global_folder")
+ : cloneProjectTree().find((item) => item.kind === "project" && item.root === req.workspaceRoot);
+ const query = (req.query ?? "").trim().toLocaleLowerCase();
+ const all = asArray(folder?.children).filter((item) => !query || item.label.toLocaleLowerCase().includes(query));
+ const start = Math.max(0, Number.parseInt(req.cursor ?? "0", 10) || 0);
+ const limit = Math.min(200, Math.max(1, req.limit ?? 50));
+ const items = all.slice(start, start + limit);
+ return { items, nextCursor: start + items.length < all.length ? String(start + items.length) : undefined, revision: 1 };
+ };
+ return {
+ async GetProjectTreeSnapshot() {
+ return {
+ revision: 1,
+ projects: cloneProjectTree().map((project) => ({ ...project, children: [] })),
+ catalog: { state: "ready", mode: "memory", revision: 1, indexed: 4, total: 4, repairPending: 0 },
+ indexed: 4,
+ total: 4,
+ indexingDone: true,
+ };
+ },
+ ListProjectTopics: listProjectTopics,
+ async GetTopicSummary(key: ProjectTopicKey) {
+ const page = await listProjectTopics({ scope: key.scope, workspaceRoot: key.workspaceRoot, limit: 200 });
+ return page.items.find((item) => item.topicId === key.topicId)
+ ?? { key: "", kind: key.scope === "global" ? "global_topic" : "topic", label: "", children: [] };
+ },
+ async GetSessionCatalogStatus() {
+ return { state: "ready", mode: "memory", revision: 1, indexed: 4, total: 4, repairPending: 0 };
+ },
+ async RebuildSessionCatalog() {},
+ };
+}
diff --git a/desktop/frontend/src/lib/sessionCatalogPresentation.ts b/desktop/frontend/src/lib/sessionCatalogPresentation.ts
new file mode 100644
index 0000000000..7944363644
--- /dev/null
+++ b/desktop/frontend/src/lib/sessionCatalogPresentation.ts
@@ -0,0 +1,12 @@
+import type { Translator } from "./i18n";
+
+type SessionTurns = {
+ turns?: number;
+ turnsState?: string;
+};
+
+export function sessionTurnsLabel(session: SessionTurns, t: Translator): string {
+ if (session.turnsState === "unknown") return t("history.indexing");
+ if (typeof session.turns === "number") return t("composer.sessionTurns", { n: session.turns });
+ return "";
+}
diff --git a/desktop/frontend/src/lib/sessionCatalogTypes.ts b/desktop/frontend/src/lib/sessionCatalogTypes.ts
new file mode 100644
index 0000000000..57146495a0
--- /dev/null
+++ b/desktop/frontend/src/lib/sessionCatalogTypes.ts
@@ -0,0 +1,67 @@
+import type { ProjectNode } from "./types";
+
+export interface SessionCatalogStatus {
+ state: "opening" | "ready" | "degraded" | "rebuilding" | "closed" | string;
+ mode?: "disk" | "memory" | string;
+ revision: number;
+ indexed: number;
+ total: number;
+ repairPending: number;
+ lastError?: string;
+ quarantinedPath?: string;
+}
+
+export interface ProjectTreeSnapshot {
+ revision: number;
+ projects: ProjectNode[];
+ catalog: SessionCatalogStatus;
+ indexed: number;
+ total: number;
+ indexingDone: boolean;
+}
+
+export interface ProjectTopicPageRequest {
+ scope: "global" | "project" | string;
+ workspaceRoot?: string;
+ cursor?: string;
+ limit?: number;
+ query?: string;
+ timeFilter?: string;
+}
+
+export interface ProjectTopicPage {
+ items: ProjectNode[];
+ nextCursor?: string;
+ revision: number;
+}
+
+export interface ProjectTopicKey {
+ scope: "global" | "project" | string;
+ workspaceRoot?: string;
+ topicId: string;
+}
+
+export interface ProjectTreeChangedV2 {
+ revision: number;
+ roots: string[];
+ reason: string;
+}
+
+export interface SessionCatalogBindings {
+ GetProjectTreeSnapshot(): Promise;
+ ListProjectTopics(req: ProjectTopicPageRequest): Promise;
+ GetTopicSummary(key: ProjectTopicKey): Promise;
+ GetSessionCatalogStatus(): Promise;
+ RebuildSessionCatalog(): Promise;
+}
+
+// SessionReference is a session selected via @ past:chats for context injection.
+export interface SessionReference {
+ path: string;
+ title: string;
+ preview?: string;
+ turns?: number;
+ turnsState?: "unknown" | "valid" | "corrupt" | string;
+ createdAt?: number;
+ lastActivityAt?: number;
+}
diff --git a/desktop/frontend/src/lib/types.ts b/desktop/frontend/src/lib/types.ts
index 4b54313ae3..eb00780e85 100644
--- a/desktop/frontend/src/lib/types.ts
+++ b/desktop/frontend/src/lib/types.ts
@@ -4,6 +4,7 @@
import type { Todo } from "./tools";
import type { ContextMaintenanceInfo, WireContextMaintenance } from "./contextMaintenanceTypes";
export type { ContextMaintenanceInfo, ContextMaintenanceReceipt, WireContextMaintenance } from "./contextMaintenanceTypes";
+export type { ProjectTopicKey, ProjectTopicPage, ProjectTopicPageRequest, ProjectTreeChangedV2, ProjectTreeSnapshot, SessionCatalogBindings, SessionCatalogStatus, SessionReference } from "./sessionCatalogTypes";
export type EventKind =
| "turn_started"
@@ -457,53 +458,6 @@ export interface ProjectNode {
children?: ProjectNode[];
}
-export interface SessionCatalogStatus {
- state: "opening" | "ready" | "degraded" | "rebuilding" | "closed" | string;
- mode?: "disk" | "memory" | string;
- revision: number;
- indexed: number;
- total: number;
- repairPending: number;
- lastError?: string;
- quarantinedPath?: string;
-}
-
-export interface ProjectTreeSnapshot {
- revision: number;
- projects: ProjectNode[];
- catalog: SessionCatalogStatus;
- indexed: number;
- total: number;
- indexingDone: boolean;
-}
-
-export interface ProjectTopicPageRequest {
- scope: "global" | "project" | string;
- workspaceRoot?: string;
- cursor?: string;
- limit?: number;
- query?: string;
- timeFilter?: string;
-}
-
-export interface ProjectTopicPage {
- items: ProjectNode[];
- nextCursor?: string;
- revision: number;
-}
-
-export interface ProjectTopicKey {
- scope: "global" | "project" | string;
- workspaceRoot?: string;
- topicId: string;
-}
-
-export interface ProjectTreeChangedV2 {
- revision: number;
- roots: string[];
- reason: string;
-}
-
export interface DeliveryWorktreeAvailability {
available: boolean;
reason?: string;
@@ -843,17 +797,6 @@ export interface SessionMeta {
recoveryCopy?: boolean; // actual branch content is unchanged and covered by its parent
}
-// SessionReference is a session selected via @ past:chats for context injection.
-export interface SessionReference {
- path: string;
- title: string;
- preview?: string;
- turns?: number;
- turnsState?: "unknown" | "valid" | "corrupt" | string;
- createdAt?: number;
- lastActivityAt?: number;
-}
-
export interface WorkspaceView {
path: string;
name: string;
diff --git a/desktop/session_catalog.go b/desktop/session_catalog.go
index 8838e1dd9a..680ceee442 100644
--- a/desktop/session_catalog.go
+++ b/desktop/session_catalog.go
@@ -5,12 +5,10 @@ import (
"errors"
"log/slog"
"path/filepath"
- "sort"
"strings"
"time"
"reasonix/internal/config"
- "reasonix/internal/control"
"reasonix/internal/sessioncatalog"
)
@@ -189,10 +187,7 @@ func (a *App) stopSessionCatalog(timeout time.Duration) {
catalog := a.sessionCatalog.Swap(nil)
deadline := time.Now().Add(timeout)
if catalog != nil {
- remaining := time.Until(deadline)
- if remaining < 0 {
- remaining = 0
- }
+ remaining := max(time.Until(deadline), 0)
ctx, closeCancel := context.WithTimeout(context.Background(), remaining)
_ = catalog.Close(ctx)
closeCancel()
@@ -433,470 +428,3 @@ func (a *App) GetProjectTreeSnapshot() ProjectTreeSnapshot {
IndexingDone: status.State == string(sessioncatalog.StateReady) && status.RepairPending == 0,
}
}
-
-type catalogRuntimeSnapshot struct {
- scope string
- workspaceRoot string
- topicID string
- sessionPath string
- activity string
- topicTitle string
- ctrl control.SessionAPI
- open bool
-}
-
-type catalogRuntimeOverlay struct {
- open bool
- running bool
- status string
-}
-
-func catalogRuntimeStatus(activity string, runtimeStatus control.RuntimeStatus) string {
- status := normalizeTopicStatus(activity)
- if runtimeStatus.PendingPrompt {
- return topicStatusWaitingConfirmation
- }
- if runtimeStatus.Running {
- if status == "" || status == topicStatusError || status == topicStatusPaused {
- return topicStatusThinking
- }
- return status
- }
- if runtimeStatus.BackgroundJobs > 0 {
- return topicStatusBackgroundJob
- }
- if status == topicStatusError || status == topicStatusPaused {
- return status
- }
- return status
-}
-
-func (a *App) catalogRuntimeOverlays() (map[string]catalogRuntimeOverlay, map[string]catalogRuntimeOverlay) {
- a.mu.RLock()
- snapshots := make([]catalogRuntimeSnapshot, 0, len(a.tabs)+len(a.detachedSessions))
- collect := func(tab *WorkspaceTab, open bool) {
- if tab == nil || strings.TrimSpace(tab.TopicID) == "" {
- return
- }
- snapshots = append(snapshots, catalogRuntimeSnapshot{
- scope: tab.Scope, workspaceRoot: tab.WorkspaceRoot, topicID: tab.TopicID,
- sessionPath: tab.SessionPath, activity: tab.ActivityStatus, topicTitle: tab.TopicTitle,
- ctrl: tab.Ctrl, open: open,
- })
- }
- for _, tab := range a.tabs {
- collect(tab, true)
- }
- for _, tab := range a.detachedSessions {
- collect(tab, false)
- }
- a.mu.RUnlock()
- topics := map[string]catalogRuntimeOverlay{}
- sessions := map[string]catalogRuntimeOverlay{}
- for _, snap := range snapshots {
- runtimeStatus := control.RuntimeStatus{}
- path := strings.TrimSpace(snap.sessionPath)
- if snap.ctrl != nil {
- runtimeStatus = snap.ctrl.RuntimeStatus()
- if path == "" {
- path = snap.ctrl.SessionPath()
- }
- }
- status := catalogRuntimeStatus(snap.activity, runtimeStatus)
- running := status != "" || runtimeStatus.Running || runtimeStatus.PendingPrompt || runtimeStatus.BackgroundJobs > 0
- overlay := catalogRuntimeOverlay{open: snap.open, running: running, status: status}
- key := topicSummaryKey(snap.scope, snap.workspaceRoot, snap.topicID)
- current := topics[key]
- current.open = current.open || overlay.open
- current.running = current.running || overlay.running
- if current.status == "" {
- current.status = overlay.status
- }
- topics[key] = current
- if path != "" {
- sessions[sessionRuntimeKey(path)] = overlay
- }
- }
- return topics, sessions
-}
-
-func (a *App) metadataProjectTopics(scope, workspaceRoot string) []ProjectNode {
- f := loadProjectsFile()
- deleted := map[string]bool{}
- for _, topicID := range f.DeletedTopics {
- deleted[topicID] = true
- }
- ids := f.GlobalTopics
- pinnedIDs := f.GlobalPinnedTopics
- titleRoot := ""
- projectColor := normalizeProjectColor(f.GlobalColor)
- if scope == "project" {
- ids = nil
- pinnedIDs = nil
- titleRoot = workspaceRoot
- for _, project := range f.Projects {
- if sameProjectRoot(project.Root, workspaceRoot) {
- ids = project.Topics
- pinnedIDs = project.PinnedTopics
- projectColor = project.Color
- break
- }
- }
- }
- titles := loadTopicTitles(titleRoot)
- sources := loadTopicTitleSources(titleRoot)
- created := loadTopicCreatedAts(titleRoot)
- topicOverlays, _ := a.catalogRuntimeOverlays()
- runtimeNodes := a.runtimeOnlyProjectTopics(scope, workspaceRoot)
- runtimeByTopic := map[string]ProjectNode{}
- for _, node := range runtimeNodes {
- runtimeByTopic[node.TopicID] = node
- }
- out := []ProjectNode{}
- seen := map[string]bool{}
- for _, topicID := range pinnedTopicIDs(orderedTopicIDs(ids, titles), pinnedIDs) {
- if deleted[topicID] {
- continue
- }
- seen[topicID] = true
- title := strings.TrimSpace(titles[topicID])
- if title == "" {
- title = defaultTopicTitle
- }
- kind := "topic"
- if scope != "project" {
- kind = "global_topic"
- }
- overlay := topicOverlays[topicSummaryKey(scope, workspaceRoot, topicID)]
- node := ProjectNode{
- Key: kind + "_" + topicID, Kind: kind,
- Label: a.localizedTopicTitle(title, sources[topicID]), Root: workspaceRoot,
- TopicID: topicID, ProjectColor: projectColor,
- CreatedAt: topicCreatedAtForTree(created, topicID), Pinned: containsDesktopString(pinnedIDs, topicID),
- Open: overlay.open, Running: overlay.running, Status: overlay.status,
- TurnsState: string(sessioncatalog.TurnsUnknown), Health: string(sessioncatalog.HealthOK),
- Children: []ProjectNode{},
- }
- if runtimeNode, ok := runtimeByTopic[topicID]; ok {
- node.Open = runtimeNode.Open
- node.Running = runtimeNode.Running
- node.Status = runtimeNode.Status
- node.Children = runtimeNode.Children
- }
- out = append(out, node)
- }
- for _, runtimeNode := range runtimeNodes {
- if seen[runtimeNode.TopicID] || deleted[runtimeNode.TopicID] {
- continue
- }
- out = append(out, runtimeNode)
- }
- return out
-}
-
-func (a *App) runtimeOnlyProjectTopics(scope, workspaceRoot string) []ProjectNode {
- a.mu.RLock()
- snapshots := []catalogRuntimeSnapshot{}
- collect := func(tab *WorkspaceTab, open bool) {
- if tab == nil || strings.TrimSpace(tab.TopicID) == "" {
- return
- }
- if scope == "project" {
- if tab.Scope != "project" || !sameProjectRoot(tab.WorkspaceRoot, workspaceRoot) {
- return
- }
- } else if tab.Scope == "project" {
- return
- }
- snapshots = append(snapshots, catalogRuntimeSnapshot{
- scope: tab.Scope, workspaceRoot: tab.WorkspaceRoot, topicID: tab.TopicID,
- sessionPath: tab.SessionPath, activity: tab.ActivityStatus,
- topicTitle: tab.TopicTitle, ctrl: tab.Ctrl, open: open,
- })
- }
- for _, tab := range a.tabs {
- collect(tab, true)
- }
- for _, tab := range a.detachedSessions {
- collect(tab, false)
- }
- a.mu.RUnlock()
- byTopic := map[string][]catalogRuntimeSnapshot{}
- for _, snapshot := range snapshots {
- if snapshot.sessionPath == "" && snapshot.ctrl != nil {
- snapshot.sessionPath = snapshot.ctrl.SessionPath()
- }
- byTopic[snapshot.topicID] = append(byTopic[snapshot.topicID], snapshot)
- }
- topicIDs := make([]string, 0, len(byTopic))
- for topicID := range byTopic {
- topicIDs = append(topicIDs, topicID)
- }
- sort.Strings(topicIDs)
- out := []ProjectNode{}
- for _, topicID := range topicIDs {
- sessions := byTopic[topicID]
- kind := "topic"
- sessionKind := "session"
- if scope != "project" {
- kind = "global_topic"
- sessionKind = "global_session"
- }
- label := defaultTopicTitle
- if strings.TrimSpace(sessions[0].topicTitle) != "" {
- label = sessions[0].topicTitle
- }
- node := ProjectNode{
- Key: kind + "_" + topicID, Kind: kind, Label: label,
- Root: workspaceRoot, TopicID: topicID, TurnsState: string(sessioncatalog.TurnsUnknown),
- Health: string(sessioncatalog.HealthOK), Children: []ProjectNode{},
- }
- for _, session := range sessions {
- runtimeStatus := control.RuntimeStatus{}
- if session.ctrl != nil {
- runtimeStatus = session.ctrl.RuntimeStatus()
- }
- status := catalogRuntimeStatus(session.activity, runtimeStatus)
- running := status != "" || runtimeStatus.Running || runtimeStatus.PendingPrompt || runtimeStatus.BackgroundJobs > 0
- if len(sessions) == 1 {
- node.Open = session.open
- node.Running = running
- node.Status = status
- continue
- }
- path := strings.TrimSpace(session.sessionPath)
- sessionLabel := strings.TrimSuffix(filepath.Base(path), filepath.Ext(path))
- if sessionLabel == "" || sessionLabel == "." {
- sessionLabel = label
- }
- node.Children = append(node.Children, ProjectNode{
- Key: projectSessionNodeKey(scope, path), Kind: sessionKind, Label: sessionLabel,
- Root: workspaceRoot, TopicID: topicID, SessionPath: path,
- Open: session.open, Running: running, Status: status,
- TurnsState: string(sessioncatalog.TurnsUnknown), Health: string(sessioncatalog.HealthOK),
- Children: []ProjectNode{},
- })
- }
- out = append(out, node)
- }
- return out
-}
-
-func (a *App) metadataTopicPage(req ProjectTopicPageRequest) ProjectTopicPage {
- items := a.metadataProjectTopics(req.Scope, req.WorkspaceRoot)
- query := strings.ToLower(strings.TrimSpace(req.Query))
- if query != "" {
- filtered := items[:0]
- for _, item := range items {
- if strings.Contains(strings.ToLower(item.Label), query) {
- filtered = append(filtered, item)
- }
- }
- items = filtered
- }
- start := 0
- if strings.HasPrefix(req.Cursor, "meta:") {
- lastID := strings.TrimPrefix(req.Cursor, "meta:")
- for index, item := range items {
- if item.TopicID == lastID {
- start = index + 1
- break
- }
- }
- }
- limit := req.Limit
- if limit <= 0 {
- limit = sessioncatalog.DefaultLimit
- }
- if limit > sessioncatalog.MaxLimit {
- limit = sessioncatalog.MaxLimit
- }
- end := min(start+limit, len(items))
- page := ProjectTopicPage{Items: append([]ProjectNode(nil), items[start:end]...)}
- if end < len(items) && end > start {
- page.NextCursor = "meta:" + items[end-1].TopicID
- }
- return page
-}
-
-func (a *App) projectNodeFromCatalogTopic(topic sessioncatalog.TopicRecord, topicOverlays, sessionOverlays map[string]catalogRuntimeOverlay) ProjectNode {
- kind := "topic"
- if topic.Scope == "global" {
- kind = "global_topic"
- }
- overlay := topicOverlays[topicSummaryKey(topic.Scope, topic.WorkspaceRoot, topic.TopicID)]
- node := ProjectNode{
- Key: kind + "_" + topic.TopicID, Kind: kind, Label: a.localizedTopicTitle(topic.Title, ""),
- Root: topic.WorkspaceRoot, TopicID: topic.TopicID, Turns: topic.Turns,
- TurnsState: string(topic.TurnsState), Health: string(topic.Health),
- CreatedAt: topic.CreatedAt, LastActivityAt: topic.LastActivityAt,
- Pinned: topic.Pinned, Open: overlay.open, Running: overlay.running, Status: overlay.status,
- Children: []ProjectNode{},
- }
- if len(topic.Sessions) <= 1 {
- return node
- }
- for _, session := range topic.Sessions {
- sessionKind := "session"
- if topic.Scope == "global" {
- sessionKind = "global_session"
- }
- sessionOverlay := sessionOverlays[sessionRuntimeKey(session.Path)]
- label := strings.TrimSpace(session.CustomTitle)
- if label == "" {
- label = strings.TrimSpace(session.Preview)
- }
- if label == "" {
- label = filepath.Base(session.Path)
- }
- node.Children = append(node.Children, ProjectNode{
- Key: projectSessionNodeKey(topic.Scope, session.Path), Kind: sessionKind,
- Label: label, Root: topic.WorkspaceRoot, TopicID: topic.TopicID,
- SessionPath: session.Path, Turns: session.Turns,
- TurnsState: string(session.TurnsState), Health: string(session.Health),
- CreatedAt: session.CreatedAt, LastActivityAt: session.LastActivityAt,
- Open: sessionOverlay.open, Running: sessionOverlay.running, Status: sessionOverlay.status,
- Recovered: session.Recovered, RecoveryReason: session.RecoveryReason,
- RecoveryDigest: session.RecoveryDigest, RecoveryParentID: session.ParentID,
- Children: []ProjectNode{},
- })
- }
- return node
-}
-
-func (a *App) ListProjectTopics(req ProjectTopicPageRequest) (ProjectTopicPage, error) {
- out := ProjectTopicPage{Items: []ProjectNode{}}
- catalog := a.sessionCatalog.Load()
- if catalog == nil {
- return a.metadataTopicPage(req), nil
- }
- page, err := catalog.ListTopics(a.bootContext(), sessioncatalog.TopicPageRequest{
- Scope: req.Scope, WorkspaceRoot: req.WorkspaceRoot, Cursor: req.Cursor,
- Limit: req.Limit, Query: req.Query, TimeFilter: req.TimeFilter,
- })
- if err != nil {
- return out, err
- }
- topicOverlays, sessionOverlays := a.catalogRuntimeOverlays()
- for _, topic := range page.Items {
- out.Items = append(out.Items, a.projectNodeFromCatalogTopic(topic, topicOverlays, sessionOverlays))
- }
- out.NextCursor = page.NextCursor
- out.Revision = page.Revision
- return out, nil
-}
-
-func (a *App) GetTopicSummary(key ProjectTopicKey) (ProjectNode, error) {
- if catalog := a.sessionCatalog.Load(); catalog != nil {
- topic, ok, err := catalog.GetTopic(a.bootContext(), sessioncatalog.TopicKey{
- Scope: key.Scope, WorkspaceRoot: key.WorkspaceRoot, TopicID: key.TopicID,
- })
- if err != nil {
- return ProjectNode{Children: []ProjectNode{}}, err
- }
- if ok {
- topicOverlays, sessionOverlays := a.catalogRuntimeOverlays()
- return a.projectNodeFromCatalogTopic(topic, topicOverlays, sessionOverlays), nil
- }
- }
- page, err := a.ListProjectTopics(ProjectTopicPageRequest{
- Scope: key.Scope, WorkspaceRoot: key.WorkspaceRoot, Limit: sessioncatalog.MaxLimit,
- })
- if err != nil {
- return ProjectNode{Children: []ProjectNode{}}, err
- }
- for _, node := range page.Items {
- if node.TopicID == key.TopicID {
- return node, nil
- }
- }
- return ProjectNode{Children: []ProjectNode{}}, nil
-}
-
-func (a *App) GetSessionCatalogStatus() SessionCatalogStatus {
- return a.currentSessionCatalogStatus()
-}
-
-func (a *App) RebuildSessionCatalog() error {
- if a == nil || a.shuttingDown.Load() {
- return errors.New("application is shutting down")
- }
- if !a.catalogRebuilding.CompareAndSwap(false, true) {
- return nil
- }
- go func() {
- a.stopSessionCatalog(250 * time.Millisecond)
- a.catalogRebuilding.Store(false)
- a.startSessionCatalog(true)
- }()
- return nil
-}
-
-// ListProjectTree is the one-release compatibility wrapper. It composes only
-// catalog pages and project shells; it never migrates, scans, or decodes a
-// session synchronously.
-func (a *App) ListProjectTree() []ProjectNode {
- snapshot := a.GetProjectTreeSnapshot()
- hasGlobal := false
- for _, project := range snapshot.Projects {
- if project.Kind == "global_folder" {
- hasGlobal = true
- break
- }
- }
- if !hasGlobal && len(a.metadataProjectTopics("global", "")) > 0 {
- f := loadProjectsFile()
- label := strings.TrimSpace(f.GlobalTitle)
- if label == "" {
- label = "Global"
- }
- snapshot.Projects = append(snapshot.Projects, ProjectNode{
- Key: "global_folder", Kind: "global_folder", Label: label,
- Root: globalWorkspaceRoot(), ProjectColor: normalizeProjectColor(f.GlobalColor), Children: []ProjectNode{},
- })
- snapshot.Projects = applyPinnedProjectOrder(applyProjectTreeOrder(snapshot.Projects, f.SidebarOrder), f.PinnedProjects)
- }
- for index := range snapshot.Projects {
- project := &snapshot.Projects[index]
- scope := "project"
- root := project.Root
- if project.Kind == "global_folder" {
- scope = "global"
- root = ""
- }
- cursor := ""
- for {
- page, err := a.ListProjectTopics(ProjectTopicPageRequest{Scope: scope, WorkspaceRoot: root, Cursor: cursor, Limit: sessioncatalog.MaxLimit})
- if err != nil {
- break
- }
- project.Children = append(project.Children, page.Items...)
- if page.NextCursor == "" {
- break
- }
- cursor = page.NextCursor
- }
- if len(project.Children) == 0 {
- project.Children = a.metadataProjectTopics(scope, root)
- }
- }
- return snapshot.Projects
-}
-
-func (a *App) catalogSessionPathForTopic(scope, workspaceRoot, topicID string) string {
- if strings.TrimSpace(topicID) == "" {
- return ""
- }
- catalog := a.sessionCatalog.Load()
- if catalog == nil {
- return ""
- }
- topic, ok, err := catalog.GetTopic(a.bootContext(), sessioncatalog.TopicKey{Scope: scope, WorkspaceRoot: workspaceRoot, TopicID: topicID})
- if err != nil || !ok || len(topic.Sessions) == 0 {
- return ""
- }
- sort.SliceStable(topic.Sessions, func(i, j int) bool {
- return topic.Sessions[i].LastActivityAt > topic.Sessions[j].LastActivityAt
- })
- return topic.Sessions[0].Path
-}
diff --git a/desktop/session_catalog_runtime.go b/desktop/session_catalog_runtime.go
new file mode 100644
index 0000000000..4178d61c5f
--- /dev/null
+++ b/desktop/session_catalog_runtime.go
@@ -0,0 +1,478 @@
+package main
+
+import (
+ "errors"
+ "path/filepath"
+ "sort"
+ "strings"
+ "time"
+
+ "reasonix/internal/control"
+ "reasonix/internal/sessioncatalog"
+)
+
+type catalogRuntimeSnapshot struct {
+ scope string
+ workspaceRoot string
+ topicID string
+ sessionPath string
+ activity string
+ topicTitle string
+ ctrl control.SessionAPI
+ open bool
+}
+
+type catalogRuntimeOverlay struct {
+ open bool
+ running bool
+ status string
+}
+
+func catalogRuntimeStatus(activity string, runtimeStatus control.RuntimeStatus) string {
+ status := normalizeTopicStatus(activity)
+ if runtimeStatus.PendingPrompt {
+ return topicStatusWaitingConfirmation
+ }
+ if runtimeStatus.Running {
+ if status == "" || status == topicStatusError || status == topicStatusPaused {
+ return topicStatusThinking
+ }
+ return status
+ }
+ if runtimeStatus.BackgroundJobs > 0 {
+ return topicStatusBackgroundJob
+ }
+ if status == topicStatusError || status == topicStatusPaused {
+ return status
+ }
+ return status
+}
+
+func (a *App) catalogRuntimeOverlays() (map[string]catalogRuntimeOverlay, map[string]catalogRuntimeOverlay) {
+ a.mu.RLock()
+ snapshots := make([]catalogRuntimeSnapshot, 0, len(a.tabs)+len(a.detachedSessions))
+ collect := func(tab *WorkspaceTab, open bool) {
+ if tab == nil || strings.TrimSpace(tab.TopicID) == "" {
+ return
+ }
+ snapshots = append(snapshots, catalogRuntimeSnapshot{
+ scope: tab.Scope, workspaceRoot: tab.WorkspaceRoot, topicID: tab.TopicID,
+ sessionPath: tab.SessionPath, activity: tab.ActivityStatus, topicTitle: tab.TopicTitle,
+ ctrl: tab.Ctrl, open: open,
+ })
+ }
+ for _, tab := range a.tabs {
+ collect(tab, true)
+ }
+ for _, tab := range a.detachedSessions {
+ collect(tab, false)
+ }
+ a.mu.RUnlock()
+ topics := map[string]catalogRuntimeOverlay{}
+ sessions := map[string]catalogRuntimeOverlay{}
+ for _, snap := range snapshots {
+ runtimeStatus := control.RuntimeStatus{}
+ path := strings.TrimSpace(snap.sessionPath)
+ if snap.ctrl != nil {
+ runtimeStatus = snap.ctrl.RuntimeStatus()
+ if path == "" {
+ path = snap.ctrl.SessionPath()
+ }
+ }
+ status := catalogRuntimeStatus(snap.activity, runtimeStatus)
+ running := status != "" || runtimeStatus.Running || runtimeStatus.PendingPrompt || runtimeStatus.BackgroundJobs > 0
+ overlay := catalogRuntimeOverlay{open: snap.open, running: running, status: status}
+ key := topicSummaryKey(snap.scope, snap.workspaceRoot, snap.topicID)
+ current := topics[key]
+ current.open = current.open || overlay.open
+ current.running = current.running || overlay.running
+ if current.status == "" {
+ current.status = overlay.status
+ }
+ topics[key] = current
+ if path != "" {
+ sessions[sessionRuntimeKey(path)] = overlay
+ }
+ }
+ return topics, sessions
+}
+
+func (a *App) metadataProjectTopics(scope, workspaceRoot string) []ProjectNode {
+ f := loadProjectsFile()
+ deleted := map[string]bool{}
+ for _, topicID := range f.DeletedTopics {
+ deleted[topicID] = true
+ }
+ ids := f.GlobalTopics
+ pinnedIDs := f.GlobalPinnedTopics
+ titleRoot := ""
+ projectColor := normalizeProjectColor(f.GlobalColor)
+ if scope == "project" {
+ ids = nil
+ pinnedIDs = nil
+ titleRoot = workspaceRoot
+ for _, project := range f.Projects {
+ if sameProjectRoot(project.Root, workspaceRoot) {
+ ids = project.Topics
+ pinnedIDs = project.PinnedTopics
+ projectColor = project.Color
+ break
+ }
+ }
+ }
+ titles := loadTopicTitles(titleRoot)
+ sources := loadTopicTitleSources(titleRoot)
+ created := loadTopicCreatedAts(titleRoot)
+ topicOverlays, _ := a.catalogRuntimeOverlays()
+ runtimeNodes := a.runtimeOnlyProjectTopics(scope, workspaceRoot)
+ runtimeByTopic := map[string]ProjectNode{}
+ for _, node := range runtimeNodes {
+ runtimeByTopic[node.TopicID] = node
+ }
+ out := []ProjectNode{}
+ seen := map[string]bool{}
+ for _, topicID := range pinnedTopicIDs(orderedTopicIDs(ids, titles), pinnedIDs) {
+ if deleted[topicID] {
+ continue
+ }
+ seen[topicID] = true
+ title := strings.TrimSpace(titles[topicID])
+ if title == "" {
+ title = defaultTopicTitle
+ }
+ kind := "topic"
+ if scope != "project" {
+ kind = "global_topic"
+ }
+ overlay := topicOverlays[topicSummaryKey(scope, workspaceRoot, topicID)]
+ node := ProjectNode{
+ Key: kind + "_" + topicID, Kind: kind,
+ Label: a.localizedTopicTitle(title, sources[topicID]), Root: workspaceRoot,
+ TopicID: topicID, ProjectColor: projectColor,
+ CreatedAt: topicCreatedAtForTree(created, topicID), Pinned: containsDesktopString(pinnedIDs, topicID),
+ Open: overlay.open, Running: overlay.running, Status: overlay.status,
+ TurnsState: string(sessioncatalog.TurnsUnknown), Health: string(sessioncatalog.HealthOK),
+ Children: []ProjectNode{},
+ }
+ if runtimeNode, ok := runtimeByTopic[topicID]; ok {
+ node.Open = runtimeNode.Open
+ node.Running = runtimeNode.Running
+ node.Status = runtimeNode.Status
+ node.Children = runtimeNode.Children
+ }
+ out = append(out, node)
+ }
+ for _, runtimeNode := range runtimeNodes {
+ if seen[runtimeNode.TopicID] || deleted[runtimeNode.TopicID] {
+ continue
+ }
+ out = append(out, runtimeNode)
+ }
+ return out
+}
+
+func (a *App) runtimeOnlyProjectTopics(scope, workspaceRoot string) []ProjectNode {
+ a.mu.RLock()
+ snapshots := []catalogRuntimeSnapshot{}
+ collect := func(tab *WorkspaceTab, open bool) {
+ if tab == nil || strings.TrimSpace(tab.TopicID) == "" {
+ return
+ }
+ if scope == "project" {
+ if tab.Scope != "project" || !sameProjectRoot(tab.WorkspaceRoot, workspaceRoot) {
+ return
+ }
+ } else if tab.Scope == "project" {
+ return
+ }
+ snapshots = append(snapshots, catalogRuntimeSnapshot{
+ scope: tab.Scope, workspaceRoot: tab.WorkspaceRoot, topicID: tab.TopicID,
+ sessionPath: tab.SessionPath, activity: tab.ActivityStatus,
+ topicTitle: tab.TopicTitle, ctrl: tab.Ctrl, open: open,
+ })
+ }
+ for _, tab := range a.tabs {
+ collect(tab, true)
+ }
+ for _, tab := range a.detachedSessions {
+ collect(tab, false)
+ }
+ a.mu.RUnlock()
+ byTopic := map[string][]catalogRuntimeSnapshot{}
+ for _, snapshot := range snapshots {
+ if snapshot.sessionPath == "" && snapshot.ctrl != nil {
+ snapshot.sessionPath = snapshot.ctrl.SessionPath()
+ }
+ byTopic[snapshot.topicID] = append(byTopic[snapshot.topicID], snapshot)
+ }
+ topicIDs := make([]string, 0, len(byTopic))
+ for topicID := range byTopic {
+ topicIDs = append(topicIDs, topicID)
+ }
+ sort.Strings(topicIDs)
+ out := []ProjectNode{}
+ for _, topicID := range topicIDs {
+ sessions := byTopic[topicID]
+ kind := "topic"
+ sessionKind := "session"
+ if scope != "project" {
+ kind = "global_topic"
+ sessionKind = "global_session"
+ }
+ label := defaultTopicTitle
+ if strings.TrimSpace(sessions[0].topicTitle) != "" {
+ label = sessions[0].topicTitle
+ }
+ node := ProjectNode{
+ Key: kind + "_" + topicID, Kind: kind, Label: label,
+ Root: workspaceRoot, TopicID: topicID, TurnsState: string(sessioncatalog.TurnsUnknown),
+ Health: string(sessioncatalog.HealthOK), Children: []ProjectNode{},
+ }
+ for _, session := range sessions {
+ runtimeStatus := control.RuntimeStatus{}
+ if session.ctrl != nil {
+ runtimeStatus = session.ctrl.RuntimeStatus()
+ }
+ status := catalogRuntimeStatus(session.activity, runtimeStatus)
+ running := status != "" || runtimeStatus.Running || runtimeStatus.PendingPrompt || runtimeStatus.BackgroundJobs > 0
+ if len(sessions) == 1 {
+ node.Open = session.open
+ node.Running = running
+ node.Status = status
+ continue
+ }
+ path := strings.TrimSpace(session.sessionPath)
+ sessionLabel := strings.TrimSuffix(filepath.Base(path), filepath.Ext(path))
+ if sessionLabel == "" || sessionLabel == "." {
+ sessionLabel = label
+ }
+ node.Children = append(node.Children, ProjectNode{
+ Key: projectSessionNodeKey(scope, path), Kind: sessionKind, Label: sessionLabel,
+ Root: workspaceRoot, TopicID: topicID, SessionPath: path,
+ Open: session.open, Running: running, Status: status,
+ TurnsState: string(sessioncatalog.TurnsUnknown), Health: string(sessioncatalog.HealthOK),
+ Children: []ProjectNode{},
+ })
+ }
+ out = append(out, node)
+ }
+ return out
+}
+
+func (a *App) metadataTopicPage(req ProjectTopicPageRequest) ProjectTopicPage {
+ items := a.metadataProjectTopics(req.Scope, req.WorkspaceRoot)
+ query := strings.ToLower(strings.TrimSpace(req.Query))
+ if query != "" {
+ filtered := items[:0]
+ for _, item := range items {
+ if strings.Contains(strings.ToLower(item.Label), query) {
+ filtered = append(filtered, item)
+ }
+ }
+ items = filtered
+ }
+ start := 0
+ if lastID, ok := strings.CutPrefix(req.Cursor, "meta:"); ok {
+ for index, item := range items {
+ if item.TopicID == lastID {
+ start = index + 1
+ break
+ }
+ }
+ }
+ limit := req.Limit
+ if limit <= 0 {
+ limit = sessioncatalog.DefaultLimit
+ }
+ if limit > sessioncatalog.MaxLimit {
+ limit = sessioncatalog.MaxLimit
+ }
+ end := min(start+limit, len(items))
+ page := ProjectTopicPage{Items: append([]ProjectNode(nil), items[start:end]...)}
+ if end < len(items) && end > start {
+ page.NextCursor = "meta:" + items[end-1].TopicID
+ }
+ return page
+}
+
+func (a *App) projectNodeFromCatalogTopic(topic sessioncatalog.TopicRecord, topicOverlays, sessionOverlays map[string]catalogRuntimeOverlay) ProjectNode {
+ kind := "topic"
+ if topic.Scope == "global" {
+ kind = "global_topic"
+ }
+ overlay := topicOverlays[topicSummaryKey(topic.Scope, topic.WorkspaceRoot, topic.TopicID)]
+ node := ProjectNode{
+ Key: kind + "_" + topic.TopicID, Kind: kind, Label: a.localizedTopicTitle(topic.Title, ""),
+ Root: topic.WorkspaceRoot, TopicID: topic.TopicID, Turns: topic.Turns,
+ TurnsState: string(topic.TurnsState), Health: string(topic.Health),
+ CreatedAt: topic.CreatedAt, LastActivityAt: topic.LastActivityAt,
+ Pinned: topic.Pinned, Open: overlay.open, Running: overlay.running, Status: overlay.status,
+ Children: []ProjectNode{},
+ }
+ if len(topic.Sessions) <= 1 {
+ return node
+ }
+ for _, session := range topic.Sessions {
+ sessionKind := "session"
+ if topic.Scope == "global" {
+ sessionKind = "global_session"
+ }
+ sessionOverlay := sessionOverlays[sessionRuntimeKey(session.Path)]
+ label := strings.TrimSpace(session.CustomTitle)
+ if label == "" {
+ label = strings.TrimSpace(session.Preview)
+ }
+ if label == "" {
+ label = filepath.Base(session.Path)
+ }
+ node.Children = append(node.Children, ProjectNode{
+ Key: projectSessionNodeKey(topic.Scope, session.Path), Kind: sessionKind,
+ Label: label, Root: topic.WorkspaceRoot, TopicID: topic.TopicID,
+ SessionPath: session.Path, Turns: session.Turns,
+ TurnsState: string(session.TurnsState), Health: string(session.Health),
+ CreatedAt: session.CreatedAt, LastActivityAt: session.LastActivityAt,
+ Open: sessionOverlay.open, Running: sessionOverlay.running, Status: sessionOverlay.status,
+ Recovered: session.Recovered, RecoveryReason: session.RecoveryReason,
+ RecoveryDigest: session.RecoveryDigest, RecoveryParentID: session.ParentID,
+ Children: []ProjectNode{},
+ })
+ }
+ return node
+}
+
+func (a *App) ListProjectTopics(req ProjectTopicPageRequest) (ProjectTopicPage, error) {
+ out := ProjectTopicPage{Items: []ProjectNode{}}
+ catalog := a.sessionCatalog.Load()
+ if catalog == nil {
+ return a.metadataTopicPage(req), nil
+ }
+ page, err := catalog.ListTopics(a.bootContext(), sessioncatalog.TopicPageRequest{
+ Scope: req.Scope, WorkspaceRoot: req.WorkspaceRoot, Cursor: req.Cursor,
+ Limit: req.Limit, Query: req.Query, TimeFilter: req.TimeFilter,
+ })
+ if err != nil {
+ return out, err
+ }
+ topicOverlays, sessionOverlays := a.catalogRuntimeOverlays()
+ for _, topic := range page.Items {
+ out.Items = append(out.Items, a.projectNodeFromCatalogTopic(topic, topicOverlays, sessionOverlays))
+ }
+ out.NextCursor = page.NextCursor
+ out.Revision = page.Revision
+ return out, nil
+}
+
+func (a *App) GetTopicSummary(key ProjectTopicKey) (ProjectNode, error) {
+ if catalog := a.sessionCatalog.Load(); catalog != nil {
+ topic, ok, err := catalog.GetTopic(a.bootContext(), sessioncatalog.TopicKey{
+ Scope: key.Scope, WorkspaceRoot: key.WorkspaceRoot, TopicID: key.TopicID,
+ })
+ if err != nil {
+ return ProjectNode{Children: []ProjectNode{}}, err
+ }
+ if ok {
+ topicOverlays, sessionOverlays := a.catalogRuntimeOverlays()
+ return a.projectNodeFromCatalogTopic(topic, topicOverlays, sessionOverlays), nil
+ }
+ }
+ page, err := a.ListProjectTopics(ProjectTopicPageRequest{
+ Scope: key.Scope, WorkspaceRoot: key.WorkspaceRoot, Limit: sessioncatalog.MaxLimit,
+ })
+ if err != nil {
+ return ProjectNode{Children: []ProjectNode{}}, err
+ }
+ for _, node := range page.Items {
+ if node.TopicID == key.TopicID {
+ return node, nil
+ }
+ }
+ return ProjectNode{Children: []ProjectNode{}}, nil
+}
+
+func (a *App) GetSessionCatalogStatus() SessionCatalogStatus {
+ return a.currentSessionCatalogStatus()
+}
+
+func (a *App) RebuildSessionCatalog() error {
+ if a == nil || a.shuttingDown.Load() {
+ return errors.New("application is shutting down")
+ }
+ if !a.catalogRebuilding.CompareAndSwap(false, true) {
+ return nil
+ }
+ go func() {
+ a.stopSessionCatalog(250 * time.Millisecond)
+ a.catalogRebuilding.Store(false)
+ a.startSessionCatalog(true)
+ }()
+ return nil
+}
+
+// ListProjectTree is the one-release compatibility wrapper. It composes only
+// catalog pages and project shells; it never migrates, scans, or decodes a
+// session synchronously.
+func (a *App) ListProjectTree() []ProjectNode {
+ snapshot := a.GetProjectTreeSnapshot()
+ hasGlobal := false
+ for _, project := range snapshot.Projects {
+ if project.Kind == "global_folder" {
+ hasGlobal = true
+ break
+ }
+ }
+ if !hasGlobal && len(a.metadataProjectTopics("global", "")) > 0 {
+ f := loadProjectsFile()
+ label := strings.TrimSpace(f.GlobalTitle)
+ if label == "" {
+ label = "Global"
+ }
+ snapshot.Projects = append(snapshot.Projects, ProjectNode{
+ Key: "global_folder", Kind: "global_folder", Label: label,
+ Root: globalWorkspaceRoot(), ProjectColor: normalizeProjectColor(f.GlobalColor), Children: []ProjectNode{},
+ })
+ snapshot.Projects = applyPinnedProjectOrder(applyProjectTreeOrder(snapshot.Projects, f.SidebarOrder), f.PinnedProjects)
+ }
+ for index := range snapshot.Projects {
+ project := &snapshot.Projects[index]
+ scope := "project"
+ root := project.Root
+ if project.Kind == "global_folder" {
+ scope = "global"
+ root = ""
+ }
+ cursor := ""
+ for {
+ page, err := a.ListProjectTopics(ProjectTopicPageRequest{Scope: scope, WorkspaceRoot: root, Cursor: cursor, Limit: sessioncatalog.MaxLimit})
+ if err != nil {
+ break
+ }
+ project.Children = append(project.Children, page.Items...)
+ if page.NextCursor == "" {
+ break
+ }
+ cursor = page.NextCursor
+ }
+ if len(project.Children) == 0 {
+ project.Children = a.metadataProjectTopics(scope, root)
+ }
+ }
+ return snapshot.Projects
+}
+
+func (a *App) catalogSessionPathForTopic(scope, workspaceRoot, topicID string) string {
+ if strings.TrimSpace(topicID) == "" {
+ return ""
+ }
+ catalog := a.sessionCatalog.Load()
+ if catalog == nil {
+ return ""
+ }
+ topic, ok, err := catalog.GetTopic(a.bootContext(), sessioncatalog.TopicKey{Scope: scope, WorkspaceRoot: workspaceRoot, TopicID: topicID})
+ if err != nil || !ok || len(topic.Sessions) == 0 {
+ return ""
+ }
+ sort.SliceStable(topic.Sessions, func(i, j int) bool {
+ return topic.Sessions[i].LastActivityAt > topic.Sessions[j].LastActivityAt
+ })
+ return topic.Sessions[0].Path
+}
diff --git a/desktop/session_meta.go b/desktop/session_meta.go
new file mode 100644
index 0000000000..cb05a52094
--- /dev/null
+++ b/desktop/session_meta.go
@@ -0,0 +1,29 @@
+package main
+
+import "reasonix/internal/agent"
+
+func sessionMetaFromInfo(s agent.SessionInfo, title string, current, open bool, deletedAt int64, parentDir string) SessionMeta {
+ turnsState := "unknown"
+ if s.CountsKnown {
+ turnsState = "valid"
+ }
+ return SessionMeta{
+ Path: s.Path,
+ Preview: s.Preview,
+ Title: title,
+ Turns: s.Turns,
+ TurnsState: turnsState,
+ CreatedAt: s.CreatedAt.UnixMilli(),
+ LastActivityAt: s.LastActivityAt.UnixMilli(),
+ ModTime: s.LastActivityAt.UnixMilli(),
+ DeletedAt: deletedAt,
+ Current: current,
+ Open: open,
+ Scope: s.Scope,
+ WorkspaceRoot: s.WorkspaceRoot,
+ TopicID: s.TopicID,
+ TopicTitle: s.TopicTitle,
+ Recovered: sessionInfoIsAutomaticRecovery(s),
+ RecoveryCopy: sessionInfoIsUnmodifiedRecoveryCopy(s, parentDir),
+ }
+}
diff --git a/desktop/tabs.go b/desktop/tabs.go
index 4e71253f55..d2ccf42d45 100644
--- a/desktop/tabs.go
+++ b/desktop/tabs.go
@@ -3799,7 +3799,6 @@ func (a *App) buildTabControllerWithContextCore(tab *WorkspaceTab, loadedSession
// not mistaken for a deliberate empty placeholder afterward.
hasPinnedPath = false
pinnedPath = ""
- tabSessionPath = ""
}
catalogTopicPath := ""
if hasPinnedPath {
@@ -6497,33 +6496,6 @@ func normalizeTopicStatus(status string) string {
}
}
-func activityStatusForTab(tab *WorkspaceTab) string {
- if tab == nil {
- return ""
- }
- status := normalizeTopicStatus(tab.ActivityStatus)
- if tab.Ctrl == nil {
- return status
- }
- runtimeStatus := tab.Ctrl.RuntimeStatus()
- if runtimeStatus.PendingPrompt {
- return topicStatusWaitingConfirmation
- }
- if runtimeStatus.Running {
- if status == "" || status == topicStatusError || status == topicStatusPaused {
- return topicStatusThinking
- }
- return status
- }
- if runtimeStatus.BackgroundJobs > 0 {
- return topicStatusBackgroundJob
- }
- if status == topicStatusError || status == topicStatusPaused {
- return status
- }
- return ""
-}
-
// migrateLegacySessionsIntoGlobalTopics makes pre-topic desktop history visible
// in the v2 sidebar. Imported v0.x sessions and older desktop sessions are plain
// .jsonl files, sometimes with branch metadata but no topic metadata; the
@@ -7664,19 +7636,8 @@ func (s topicSummary) displayTurns() int {
// runtimeSessionStatus is one open or detached runtime session, as shown in
// the sidebar tree.
type runtimeSessionStatus struct {
- sessionPath string
- label string
- titleSource string
- turns int
- createdAt int64
- lastActivityAt int64
- open bool
- running bool
- status string
- recovered bool
- recoveryReason string
- recoveryDigest string
- recoveryParentID string
+ open bool
+ running bool
}
// topicHiddenAsRecoveryOnly hides topics whose only on-disk sessions are
@@ -7712,36 +7673,6 @@ func projectSessionNodeKey(scope, sessionPath string) string {
return scope + "_session_" + hex.EncodeToString(sum[:8])
}
-func runtimeSessionTreeLabel(tab *WorkspaceTab, info agent.SessionInfo, title string) string {
- if title = strings.TrimSpace(title); title != "" {
- return title
- }
- if preview := topicTitleFromText(info.Preview); preview != "" {
- return preview
- }
- if tab != nil {
- if title := strings.TrimSpace(tab.TopicTitle); title != "" {
- return title
- }
- }
- if path := strings.TrimSpace(info.Path); path != "" {
- return strings.TrimSuffix(filepath.Base(path), filepath.Ext(path))
- }
- if tab != nil {
- if path := strings.TrimSpace(tab.currentSessionPath()); path != "" {
- return strings.TrimSuffix(filepath.Base(path), filepath.Ext(path))
- }
- }
- return defaultTopicTitle
-}
-
-func unixMilliOrZero(t time.Time) int64 {
- if t.IsZero() {
- return 0
- }
- return t.UnixMilli()
-}
-
// ContextPanelInfo is the right-side panel's data for one tab.
type ContextPanelInfo struct {
UsedTokens int `json:"usedTokens"`
diff --git a/internal/agent/save.go b/internal/agent/save.go
index a88f7fb07c..1fd19fd470 100644
--- a/internal/agent/save.go
+++ b/internal/agent/save.go
@@ -367,12 +367,10 @@ func (s *Session) saveLocked(path string, mode sessionSaveMode) error {
slog.Warn("session: keeping save after display index write failure", "path", path, "err", err)
}
}
- s.markPersisted(path, digest, version, revision, rewriteVersion)
- persistSessionListingProjection(path, msgs)
+ s.markPersistedWithListing(path, digest, version, revision, rewriteVersion, msgs)
return nil
}
- s.markPersisted(path, digest, version, decision.revision, rewriteVersion)
- persistSessionListingProjection(path, msgs)
+ s.markPersistedWithListing(path, digest, version, decision.revision, rewriteVersion, msgs)
return nil
}
if decision.appendOnly && probe.native && mode != sessionSaveRewriteCompact {
@@ -422,8 +420,7 @@ func (s *Session) saveLocked(path string, mode sessionSaveMode) error {
slog.Warn("session: keeping save after display index write failure", "path", path, "err", err)
}
}
- s.markPersisted(path, digest, version, revision, rewriteVersion)
- persistSessionListingProjection(path, msgs)
+ s.markPersistedWithListing(path, digest, version, revision, rewriteVersion, msgs)
return nil
}
baseRevision = decision.revision
@@ -483,26 +480,10 @@ func (s *Session) saveLocked(path string, mode sessionSaveMode) error {
// derived sidecar and must never fail a save.
slog.Warn("session: keeping save after display index write failure", "path", path, "err", err)
}
- s.markPersisted(path, digest, version, revision, rewriteVersion)
- persistSessionListingProjection(path, msgs)
+ s.markPersistedWithListing(path, digest, version, revision, rewriteVersion, msgs)
return nil
}
-func persistSessionListingProjection(path string, msgs []provider.Message) {
- preview, turns := SessionPreviewFromMessages(msgs)
- if err := UpdateBranchMeta(path, false, func(meta *BranchMeta) error {
- meta.Preview = preview
- meta.Turns = turns
- meta.SchemaVersion = BranchMetaCountsVersion
- return nil
- }); err != nil {
- // JSONL/event log already committed. Listing metadata is a repairable
- // projection and must never turn a successful transcript save into an
- // application error.
- slog.Warn("session: listing metadata update deferred", "path", path, "err", err)
- }
-}
-
func writeSessionMessages(path string, msgs []provider.Message) error {
// Write to a sibling tmp file then rename, so a crash mid-write can't
// leave a partial JSONL that won't reload. The fsync guards the anchor
diff --git a/internal/agent/save_listing_projection.go b/internal/agent/save_listing_projection.go
new file mode 100644
index 0000000000..8d11111944
--- /dev/null
+++ b/internal/agent/save_listing_projection.go
@@ -0,0 +1,28 @@
+package agent
+
+import (
+ "crypto/sha256"
+ "log/slog"
+
+ "reasonix/internal/provider"
+)
+
+func (s *Session) markPersistedWithListing(path string, digest [sha256.Size]byte, version uint64, revision int64, rewriteVersion int, msgs []provider.Message) {
+ s.markPersisted(path, digest, version, revision, rewriteVersion)
+ persistSessionListingProjection(path, msgs)
+}
+
+func persistSessionListingProjection(path string, msgs []provider.Message) {
+ preview, turns := SessionPreviewFromMessages(msgs)
+ if err := UpdateBranchMeta(path, false, func(meta *BranchMeta) error {
+ meta.Preview = preview
+ meta.Turns = turns
+ meta.SchemaVersion = BranchMetaCountsVersion
+ return nil
+ }); err != nil {
+ // JSONL/event log already committed. Listing metadata is a repairable
+ // projection and must never turn a successful transcript save into an
+ // application error.
+ slog.Warn("session: listing metadata update deferred", "path", path, "err", err)
+ }
+}
diff --git a/internal/cli/cli.go b/internal/cli/cli.go
index 0d62a5940e..6148e25928 100644
--- a/internal/cli/cli.go
+++ b/internal/cli/cli.go
@@ -164,12 +164,9 @@ func RunWithBuildInfo(args []string, info BuildInfo) int {
case "report":
configureCLIThemeFromConfig()
return reportCommand(rest)
- case "session":
+ case "session", "sessions":
configureCLIThemeFromConfig()
- return sessionCommand(rest)
- case "sessions":
- configureCLIThemeFromConfig()
- return sessionsCommand(rest)
+ return sessionOrSessionsCommand(cmd, rest)
case "hook", "hooks":
configureCLIThemeFromConfig()
return hookCommand(rest)
diff --git a/internal/cli/sessions_catalog.go b/internal/cli/sessions_catalog.go
index 8ccfef253c..070ddbe6c4 100644
--- a/internal/cli/sessions_catalog.go
+++ b/internal/cli/sessions_catalog.go
@@ -13,6 +13,13 @@ import (
"reasonix/internal/sessioncatalog"
)
+func sessionOrSessionsCommand(command string, args []string) int {
+ if command == "sessions" {
+ return sessionsCommand(args)
+ }
+ return sessionCommand(args)
+}
+
func sessionsCommand(args []string) int {
if len(args) == 0 || args[0] != "reindex" {
fmt.Fprintln(os.Stderr, "usage: reasonix sessions reindex [--dir PATH] [--json]")
diff --git a/internal/cli/shell_completion.go b/internal/cli/shell_completion.go
index 8f15100487..129c65d45b 100644
--- a/internal/cli/shell_completion.go
+++ b/internal/cli/shell_completion.go
@@ -201,18 +201,7 @@ func cliCompletionRootSpec() cliCompletionSpec {
completionSpec("try", []cliCompletionFlag{model, completionFlag("--max-steps --dir", cliCompletionStaticValue), help}),
completionSpec("run", []cliCompletionFlag{model, completionFlag("--max-steps --dir", cliCompletionStaticValue), help}),
),
- completionSpec("doctor", []cliCompletionFlag{completionFlag("--json", cliCompletionNoValue), help},
- completionSpec("sessions", []cliCompletionFlag{completionFlag("--json", cliCompletionNoValue), help}),
- completionSpec("repair", []cliCompletionFlag{
- completionFlag("--root", cliCompletionStaticValue), completionFlag("--apply --project --json", cliCompletionNoValue), help,
- }),
- completionSpec("quality", []cliCompletionFlag{completionFlag("--json", cliCompletionNoValue), help}),
- completionSpec("session", []cliCompletionFlag{completionFlag("--zip", cliCompletionNoValue), completionFlag("--out", cliCompletionStaticValue), help}),
- completionSpec("redact-sessions", []cliCompletionFlag{completionFlag("--dry-run --json", cliCompletionNoValue), completionFlag("--dir", cliCompletionPathValue), help}),
- completionSpec("capabilities", []cliCompletionFlag{
- completionFlag("--root --timeout", cliCompletionStaticValue), completionFlag("--json --live", cliCompletionNoValue), help,
- }),
- ),
+ doctorCompletionSpec(help),
completionSpec("sessions", []cliCompletionFlag{help},
completionSpec("reindex", []cliCompletionFlag{
completionFlag("--json", cliCompletionNoValue), completionFlag("--dir", cliCompletionPathValue), help,
@@ -291,6 +280,21 @@ func cliCompletionRootSpec() cliCompletionSpec {
return root
}
+func doctorCompletionSpec(help cliCompletionFlag) cliCompletionSpec {
+ return completionSpec("doctor", []cliCompletionFlag{completionFlag("--json", cliCompletionNoValue), help},
+ completionSpec("sessions", []cliCompletionFlag{completionFlag("--json", cliCompletionNoValue), help}),
+ completionSpec("repair", []cliCompletionFlag{
+ completionFlag("--root", cliCompletionStaticValue), completionFlag("--apply --project --json", cliCompletionNoValue), help,
+ }),
+ completionSpec("quality", []cliCompletionFlag{completionFlag("--json", cliCompletionNoValue), help}),
+ completionSpec("session", []cliCompletionFlag{completionFlag("--zip", cliCompletionNoValue), completionFlag("--out", cliCompletionStaticValue), help}),
+ completionSpec("redact-sessions", []cliCompletionFlag{completionFlag("--dry-run --json", cliCompletionNoValue), completionFlag("--dir", cliCompletionPathValue), help}),
+ completionSpec("capabilities", []cliCompletionFlag{
+ completionFlag("--root --timeout", cliCompletionStaticValue), completionFlag("--json --live", cliCompletionNoValue), help,
+ }),
+ )
+}
+
func cliServeCompletionFlags(model, profile, help cliCompletionFlag) []cliCompletionFlag {
return []cliCompletionFlag{
model, profile,
diff --git a/internal/pluginpkg/installed_compat.go b/internal/pluginpkg/installed_compat.go
new file mode 100644
index 0000000000..b47996edbc
--- /dev/null
+++ b/internal/pluginpkg/installed_compat.go
@@ -0,0 +1,95 @@
+package pluginpkg
+
+import (
+ "fmt"
+ "os"
+ "path/filepath"
+ "sort"
+ "strings"
+)
+
+func LoadInstalled(reasonixHome string) ([]InstalledPackage, []string) {
+ stateMu.Lock()
+ defer stateMu.Unlock()
+ st, err := LoadState(reasonixHome)
+ if err != nil {
+ return nil, []string{err.Error()}
+ }
+ var out []InstalledPackage
+ var warnings []string
+ stateChanged := false
+ for i := range st.Plugins {
+ installed := st.Plugins[i]
+ if !installed.Enabled {
+ continue
+ }
+ root := ResolveRoot(reasonixHome, installed.Root)
+ pkg, pkgWarnings, err := ParseDir(root)
+ if err != nil && strings.Contains(err.Error(), "missing apiVersion") && managedPluginRoot(reasonixHome, installed, root) {
+ legacy, _, migrateErr := ParseNativeForMigrate(root)
+ if migrateErr == nil {
+ var data []byte
+ data, migrateErr = MigrateManifestToV2(legacy)
+ if migrateErr == nil {
+ migrateErr = WriteMigratedManifestV2(root, data)
+ }
+ }
+ if migrateErr == nil {
+ pkg, pkgWarnings, err = ParseDir(root)
+ if err == nil {
+ warnings = append(warnings, fmt.Sprintf("%s: automatically migrated managed manifest to %s (backup: %s.bak)", installed.Name, ManifestAPIVersionV2, NativeManifest))
+ }
+ } else {
+ err = fmt.Errorf("automatic managed-plugin migration failed: %w", migrateErr)
+ }
+ }
+ if err != nil {
+ reason := err.Error()
+ if st.Plugins[i].Status != PluginStatusDisabledIncompatible || st.Plugins[i].StatusReason != reason {
+ st.Plugins[i].Status = PluginStatusDisabledIncompatible
+ st.Plugins[i].StatusReason = reason
+ stateChanged = true
+ }
+ remediation := "repair or reinstall the plugin"
+ if strings.Contains(reason, "missing apiVersion") {
+ remediation = fmt.Sprintf("reasonix plugin migrate %s --to-v2", installed.Name)
+ }
+ warnings = append(warnings, fmt.Sprintf("%s: %s: %v; remediation: %s", installed.Name, PluginStatusDisabledIncompatible, err, remediation))
+ continue
+ }
+ if st.Plugins[i].Status != "" || st.Plugins[i].StatusReason != "" {
+ st.Plugins[i].Status = ""
+ st.Plugins[i].StatusReason = ""
+ stateChanged = true
+ }
+ out = append(out, InstalledPackage{Installed: installed, Package: pkg, Warnings: pkgWarnings})
+ }
+ if stateChanged {
+ if err := SaveState(reasonixHome, st); err != nil {
+ warnings = append(warnings, "persist plugin compatibility status: "+err.Error())
+ }
+ }
+ sort.SliceStable(out, func(i, j int) bool { return out[i].Installed.Name < out[j].Installed.Name })
+ return out, warnings
+}
+
+func managedPluginRoot(reasonixHome string, installed InstalledPlugin, root string) bool {
+ if filepath.IsAbs(strings.TrimSpace(installed.Root)) {
+ return false
+ }
+ managed := filepath.Clean(PluginsDir(reasonixHome))
+ rel, err := filepath.Rel(managed, filepath.Clean(root))
+ if err != nil || rel == "." || rel == ".." || strings.HasPrefix(rel, ".."+string(filepath.Separator)) {
+ return false
+ }
+ current := managed
+ for _, part := range strings.Split(rel, string(filepath.Separator)) {
+ current = filepath.Join(current, part)
+ info, err := os.Lstat(current)
+ if err != nil || info.Mode()&os.ModeSymlink != 0 {
+ return false
+ }
+ }
+ info, err := os.Lstat(filepath.Join(root, NativeManifest))
+ return err == nil && info.Mode()&os.ModeSymlink == 0
+}
diff --git a/internal/pluginpkg/pluginpkg.go b/internal/pluginpkg/pluginpkg.go
index d68f3fa720..e096c29f7d 100644
--- a/internal/pluginpkg/pluginpkg.go
+++ b/internal/pluginpkg/pluginpkg.go
@@ -373,92 +373,6 @@ func SetEnabled(reasonixHome, name string, enabled bool) error {
return fmt.Errorf("plugin %q is not installed", name)
}
-func LoadInstalled(reasonixHome string) ([]InstalledPackage, []string) {
- stateMu.Lock()
- defer stateMu.Unlock()
- st, err := LoadState(reasonixHome)
- if err != nil {
- return nil, []string{err.Error()}
- }
- var out []InstalledPackage
- var warnings []string
- stateChanged := false
- for i := range st.Plugins {
- installed := st.Plugins[i]
- if !installed.Enabled {
- continue
- }
- root := ResolveRoot(reasonixHome, installed.Root)
- pkg, pkgWarnings, err := ParseDir(root)
- if err != nil && strings.Contains(err.Error(), "missing apiVersion") && managedPluginRoot(reasonixHome, installed, root) {
- legacy, _, migrateErr := ParseNativeForMigrate(root)
- if migrateErr == nil {
- var data []byte
- data, migrateErr = MigrateManifestToV2(legacy)
- if migrateErr == nil {
- migrateErr = WriteMigratedManifestV2(root, data)
- }
- }
- if migrateErr == nil {
- pkg, pkgWarnings, err = ParseDir(root)
- if err == nil {
- warnings = append(warnings, fmt.Sprintf("%s: automatically migrated managed manifest to %s (backup: %s.bak)", installed.Name, ManifestAPIVersionV2, NativeManifest))
- }
- } else {
- err = fmt.Errorf("automatic managed-plugin migration failed: %w", migrateErr)
- }
- }
- if err != nil {
- reason := err.Error()
- if st.Plugins[i].Status != PluginStatusDisabledIncompatible || st.Plugins[i].StatusReason != reason {
- st.Plugins[i].Status = PluginStatusDisabledIncompatible
- st.Plugins[i].StatusReason = reason
- stateChanged = true
- }
- remediation := "repair or reinstall the plugin"
- if strings.Contains(reason, "missing apiVersion") {
- remediation = fmt.Sprintf("reasonix plugin migrate %s --to-v2", installed.Name)
- }
- warnings = append(warnings, fmt.Sprintf("%s: %s: %v; remediation: %s", installed.Name, PluginStatusDisabledIncompatible, err, remediation))
- continue
- }
- if st.Plugins[i].Status != "" || st.Plugins[i].StatusReason != "" {
- st.Plugins[i].Status = ""
- st.Plugins[i].StatusReason = ""
- stateChanged = true
- }
- out = append(out, InstalledPackage{Installed: installed, Package: pkg, Warnings: pkgWarnings})
- }
- if stateChanged {
- if err := SaveState(reasonixHome, st); err != nil {
- warnings = append(warnings, "persist plugin compatibility status: "+err.Error())
- }
- }
- sort.SliceStable(out, func(i, j int) bool { return out[i].Installed.Name < out[j].Installed.Name })
- return out, warnings
-}
-
-func managedPluginRoot(reasonixHome string, installed InstalledPlugin, root string) bool {
- if filepath.IsAbs(strings.TrimSpace(installed.Root)) {
- return false
- }
- managed := filepath.Clean(PluginsDir(reasonixHome))
- rel, err := filepath.Rel(managed, filepath.Clean(root))
- if err != nil || rel == "." || rel == ".." || strings.HasPrefix(rel, ".."+string(filepath.Separator)) {
- return false
- }
- current := managed
- for _, part := range strings.Split(rel, string(filepath.Separator)) {
- current = filepath.Join(current, part)
- info, err := os.Lstat(current)
- if err != nil || info.Mode()&os.ModeSymlink != 0 {
- return false
- }
- }
- info, err := os.Lstat(filepath.Join(root, NativeManifest))
- return err == nil && info.Mode()&os.ModeSymlink == 0
-}
-
func ResolveRoot(reasonixHome, root string) string {
if filepath.IsAbs(root) {
return filepath.Clean(root)
From 0556d1b52834365cf88b55fbae4100f9eca55309 Mon Sep 17 00:00:00 2001
From: SivanCola <32437197+SivanCola@users.noreply.github.com>
Date: Tue, 11 Aug 2026 01:38:27 +0800
Subject: [PATCH 3/3] fix(sessioncatalog): harden disposable SQLite lifecycle
and non-blocking tree
Problem
Desktop session discovery still risked quarantining healthy catalogs on
busy/permission errors, rebuilding by renaming the live DB first, dropping
repair work beyond a fixed queue, and serving stale ProjectTree search results.
Off-lock controller builds could also re-publish removed MCP tools onto a shared
host, and shell-only project trees never expanded enough for lazy topic pages.
Root cause
Open treated every open failure as corruption; Rebuild swapped before validation;
repair enqueue was lossy; ProjectTree dropped concurrent queries while loading;
shared Host mutation raced plugin config changes; and active-folder expansion
required already-loaded topic children.
Fix
- Introduce internal/projectiondb for open/migrate/rebuild/quarantine with
corruption-only quarantine, future-schema memory fallback, atomic rebuild,
and 0700/0600 permissions.
- Route sessioncatalog through projectiondb; empty CacheDir uses memory; resume
scan_cursor; drain unknown repairs from the durable index; bound per-topic
session pages.
- ProjectTree uses request sequence + debounce and expands shell folders by
workspace identity so lazy pages and bench mock load.
- Capture extensionGeneration around off-lock boot.Build and abandon publication
when plugin/MCP config changes mid-build.
- Fix lint modernize issues and Windows migration-marker test flake.
Verification
- go test ./internal/sessioncatalog ./internal/projectiondb ./internal/pluginpkg
- go test -race ./internal/sessioncatalog ./internal/projectiondb
- cd desktop && go test -run 'Catalog|TopicMigration|ProjectTree.*Migrat'
- pnpm --dir desktop/frontend run typecheck
---
desktop/app.go | 6 +
.../frontend/src/components/ProjectTree.tsx | 44 +-
desktop/plugin_packages_app.go | 3 +
desktop/shared_host.go | 17 +
desktop/tabs.go | 13 +
desktop/tabs_topic_test.go | 16 +-
internal/pluginpkg/installed_compat.go | 2 +-
internal/projectiondb/projectiondb.go | 438 ++++++++++++++++++
internal/projectiondb/projectiondb_test.go | 176 +++++++
.../remote_fs_darwin.go | 4 +-
internal/projectiondb/remote_fs_linux.go | 18 +
internal/projectiondb/remote_fs_other.go | 5 +
.../remote_fs_windows.go | 9 +-
internal/sessioncatalog/catalog.go | 139 ++----
internal/sessioncatalog/catalog_test.go | 114 ++++-
internal/sessioncatalog/reconcile.go | 199 ++++++--
internal/sessioncatalog/remote_fs_linux.go | 27 --
internal/sessioncatalog/remote_fs_other.go | 5 -
internal/sessioncatalog/schema.go | 63 +--
internal/sessioncatalog/types.go | 10 +-
20 files changed, 1051 insertions(+), 257 deletions(-)
create mode 100644 internal/projectiondb/projectiondb.go
create mode 100644 internal/projectiondb/projectiondb_test.go
rename internal/{sessioncatalog => projectiondb}/remote_fs_darwin.go (85%)
create mode 100644 internal/projectiondb/remote_fs_linux.go
create mode 100644 internal/projectiondb/remote_fs_other.go
rename internal/{sessioncatalog => projectiondb}/remote_fs_windows.go (64%)
delete mode 100644 internal/sessioncatalog/remote_fs_linux.go
delete mode 100644 internal/sessioncatalog/remote_fs_other.go
diff --git a/desktop/app.go b/desktop/app.go
index 03710b8675..10f3713fa1 100644
--- a/desktop/app.go
+++ b/desktop/app.go
@@ -267,6 +267,10 @@ type App struct {
// host, last Release closes it.
sharedHosts map[string]*sharedPluginHost
sharedHostsMu sync.Mutex
+ // extensionGeneration advances whenever plugin/MCP configuration that
+ // feeds boot.Build changes. Off-lock builds capture the generation before
+ // registering on the shared host and abandon publication if it moved.
+ extensionGeneration atomic.Uint64
// tabsSaveMu serializes writes to desktop-tabs.json and its fixed .tmp path.
tabsSaveMu sync.Mutex
@@ -9178,6 +9182,7 @@ func (a *App) SetMCPServerEnabled(name string, enabled bool) error {
if err := activationStore.SetServerEnabled(configuredEntry, root, enabled); err != nil {
return err
}
+ a.bumpExtensionGeneration()
if enabled {
// Restore cached tools (or a cache-miss connect stub) without forcing a
// process start. Explicit install/retry remains the readiness-probed path.
@@ -9277,6 +9282,7 @@ func (a *App) SetMCPServerTier(name, tier string) error {
if err := a.saveDesktopMCPServer(root, updated); err != nil {
return err
}
+ a.bumpExtensionGeneration()
if tab != nil && ctrl != nil && !mcpConnected(ctrl, name) {
if _, err := ctrl.ConnectMCPServer(updated); err != nil {
recordMCPFailure(ctrl, updated, err)
diff --git a/desktop/frontend/src/components/ProjectTree.tsx b/desktop/frontend/src/components/ProjectTree.tsx
index 16d7694a4b..1b7d1c33d4 100644
--- a/desktop/frontend/src/components/ProjectTree.tsx
+++ b/desktop/frontend/src/components/ProjectTree.tsx
@@ -167,7 +167,26 @@ export function activeSessionAncestorKeys(
}
return null;
};
- return walk(nodes, []) ?? [];
+ const found = walk(nodes, []);
+ if (found) return found;
+ // Shell-only snapshots no longer embed topics. Expand the matching project or
+ // Global folder by workspace identity so the first lazy page can load.
+ const scope = (activeScope ?? "").trim();
+ const root = (activeWorkspaceRoot ?? "").trim();
+ for (const node of nodes) {
+ if (!node) continue;
+ if (scope === "global" && node.kind === "global_folder") {
+ return [projectNodeKey(node, 0)];
+ }
+ if (node.kind === "project" && root && (node.root === root || node.root === activeWorkspaceRoot)) {
+ return [projectNodeKey(node, 0)];
+ }
+ if (!scope && !root && activeTopicId && (node.kind === "project" || node.kind === "global_folder")) {
+ // Active topic without resolved scope still needs a folder open path.
+ return [projectNodeKey(node, 0)];
+ }
+ }
+ return [];
}
export function defaultExpandedProjectTreeKeys(
@@ -467,13 +486,17 @@ export function ProjectTree({
});
}, []);
+ const topicLoadSeqRef = useRef>({});
+
const loadProjectTopics = useCallback(async (project: ProjectNode, append = false) => {
if (project.kind !== "project" && project.kind !== "global_folder") return;
const key = project.key;
const pageState = topicPageStateRef.current[key];
- if (pageState?.loading) return;
const cursor = append ? pageState?.nextCursor ?? "" : "";
if (append && !cursor) return;
+ // Last-query-wins: never drop a newer search because an older page is still loading.
+ const seq = (topicLoadSeqRef.current[key] ?? 0) + 1;
+ topicLoadSeqRef.current[key] = seq;
updateTopicPageState(key, { ...pageState, loading: true });
try {
const page = await app.ListProjectTopics({
@@ -484,6 +507,7 @@ export function ProjectTree({
query: query.trim(),
timeFilter: timeFilter === "10" || timeFilter === "20" || timeFilter === "all" ? "" : timeFilter,
});
+ if (topicLoadSeqRef.current[key] !== seq) return;
if (!projectTreeRevisionIsFresh(latestRevisionRef.current, page.revision)) {
updateTopicPageState(key, { ...topicPageStateRef.current[key], loading: false });
return;
@@ -496,6 +520,7 @@ export function ProjectTree({
}));
updateTopicPageState(key, { nextCursor: page.nextCursor, loading: false });
} catch {
+ if (topicLoadSeqRef.current[key] !== seq) return;
updateTopicPageState(key, { ...topicPageStateRef.current[key], loading: false });
}
}, [query, timeFilter, updateTopicPageState]);
@@ -549,13 +574,18 @@ export function ProjectTree({
}
}), [expanded, loadProjectTopics]);
+ // Debounce query/timeFilter reloads so typing does not stampede the catalog.
+ // Expansion and tree shell arrival still load on the same path after the delay.
useEffect(() => {
const filtering = query.trim() !== "" || timeFilter !== "all";
- for (const project of treeRef.current) {
- const key = projectNodeKey(project, 0);
- if (filtering || expanded.has(key)) void loadProjectTopics(project);
- }
- }, [expanded, loadProjectTopics, query, timeFilter]);
+ const timer = setTimeout(() => {
+ for (const project of treeRef.current) {
+ const key = projectNodeKey(project, 0);
+ if (filtering || expanded.has(key)) void loadProjectTopics(project);
+ }
+ }, 200);
+ return () => clearTimeout(timer);
+ }, [expanded, loadProjectTopics, query, timeFilter, tree]);
// Following the active topic is a view concern over the tree already held.
useEffect(() => {
diff --git a/desktop/plugin_packages_app.go b/desktop/plugin_packages_app.go
index 0b48733d15..3e6e8eac4b 100644
--- a/desktop/plugin_packages_app.go
+++ b/desktop/plugin_packages_app.go
@@ -213,6 +213,7 @@ func (a *App) InstallPlugin(source string, opts PluginInstallOptions) (string, e
if err != nil {
return "", err
}
+ a.bumpExtensionGeneration()
a.invalidateSkillRootsCache()
if rebuildErr := a.rebuild(); rebuildErr != nil {
if _, ok := a.deferredRebuildWarning("plugins", rebuildErr); ok {
@@ -255,6 +256,7 @@ func (a *App) RemovePlugin(name string) error {
if _, err := tl.Execute(context.Background(), raw); err != nil {
return err
}
+ a.bumpExtensionGeneration()
a.invalidateSkillRootsCache()
if tab == nil || a.ctx == nil {
return nil
@@ -275,6 +277,7 @@ func (a *App) SetPluginEnabled(name string, enabled bool) error {
if err := pluginpkg.SetEnabled(config.ReasonixHomeDir(), strings.TrimSpace(name), enabled); err != nil {
return err
}
+ a.bumpExtensionGeneration()
a.invalidateSkillRootsCache()
if err := a.rebuild(); err != nil {
if _, ok := a.deferredRebuildWarning("plugins", err); ok {
diff --git a/desktop/shared_host.go b/desktop/shared_host.go
index 1c18144d3e..6bb54945ec 100644
--- a/desktop/shared_host.go
+++ b/desktop/shared_host.go
@@ -10,6 +10,23 @@ import (
"reasonix/internal/plugin"
)
+// bumpExtensionGeneration records that plugin/MCP configuration changed while
+// controller builds may still be running off the lifecycle lock. In-flight
+// builds that finish with a stale generation must not publish.
+func (a *App) bumpExtensionGeneration() {
+ if a == nil {
+ return
+ }
+ a.extensionGeneration.Add(1)
+}
+
+func (a *App) currentExtensionGeneration() uint64 {
+ if a == nil {
+ return 0
+ }
+ return a.extensionGeneration.Load()
+}
+
// sharedPluginHost is a reference-counted plugin.Host shared across tabs
// that share the same workspace root. Multiple controllers (one per tab)
// use the same Host so MCP subprocesses (CodeGraph, etc.) are spawned once.
diff --git a/desktop/tabs.go b/desktop/tabs.go
index 951b12358e..3fd5bf48c7 100644
--- a/desktop/tabs.go
+++ b/desktop/tabs.go
@@ -3891,6 +3891,11 @@ func (a *App) buildTabControllerWithContextCore(tab *WorkspaceTab, loadedSession
toolApprovalMode: buildToolApprovalMode,
}).normalizedRuntime()
+ // Capture the extension generation before the shared host is mutated by
+ // boot.Build. A concurrent plugin delete/update/reauth bumps the counter;
+ // if it moves before publication we abandon this controller rather than
+ // resurrecting removed tools on the shared host.
+ extensionGen := a.currentExtensionGeneration()
sharedHost := a.acquireSharedHost(rootKey)
sink := a.desktopControllerSink(buildSink, cfg.Notifications)
@@ -3941,6 +3946,14 @@ func (a *App) buildTabControllerWithContextCore(tab *WorkspaceTab, loadedSession
a.abandonSupersededBuild(tab, ctrl, rootKey, "")
return
}
+ if a.currentExtensionGeneration() != extensionGen {
+ // Plugin/MCP configuration changed during the off-lock build. Drop this
+ // controller and rebuild from the latest configuration so deleted tools
+ // cannot be re-published onto the shared host.
+ a.abandonSupersededBuild(tab, ctrl, rootKey, "")
+ a.scheduleDeferredStartupBuild(tab.ID)
+ return
+ }
a.bindControllerDisplayRecorder(ctrl)
configureControllerRuntime(ctrl, nil, buildRuntime)
diff --git a/desktop/tabs_topic_test.go b/desktop/tabs_topic_test.go
index 68e6204b5b..e3b2f17dbe 100644
--- a/desktop/tabs_topic_test.go
+++ b/desktop/tabs_topic_test.go
@@ -961,8 +961,20 @@ func TestTopicMigrationMarkerRescansWhenSessionFileChanges(t *testing.T) {
app := NewApp()
firstTopicID := legacySessionTopicID(filepath.Join(dir, "first.jsonl"))
waitForCatalogTopic(t, app, "global", "", firstTopicID)
- if _, err := os.Stat(filepath.Join(dir, topicMigrationMarker)); err != nil {
- t.Fatalf("expected migration marker after a complete pass: %v", err)
+ // Catalog publication and the migration marker are written on the same
+ // background path but not under one fsync barrier. Wait for the marker
+ // explicitly so Windows CI does not observe the topic before the stamp.
+ markerPath := filepath.Join(dir, topicMigrationMarker)
+ deadline := time.Now().Add(5 * time.Second)
+ var lastMarkerErr error
+ for {
+ if _, lastMarkerErr = os.Stat(markerPath); lastMarkerErr == nil {
+ break
+ }
+ if time.Now().After(deadline) {
+ t.Fatalf("expected migration marker after a complete pass: %v", lastMarkerErr)
+ }
+ time.Sleep(10 * time.Millisecond)
}
// A CLI-created session added after the marker invalidates the lightweight
diff --git a/internal/pluginpkg/installed_compat.go b/internal/pluginpkg/installed_compat.go
index b47996edbc..a7140f9f44 100644
--- a/internal/pluginpkg/installed_compat.go
+++ b/internal/pluginpkg/installed_compat.go
@@ -83,7 +83,7 @@ func managedPluginRoot(reasonixHome string, installed InstalledPlugin, root stri
return false
}
current := managed
- for _, part := range strings.Split(rel, string(filepath.Separator)) {
+ for part := range strings.SplitSeq(rel, string(filepath.Separator)) {
current = filepath.Join(current, part)
info, err := os.Lstat(current)
if err != nil || info.Mode()&os.ModeSymlink != 0 {
diff --git a/internal/projectiondb/projectiondb.go b/internal/projectiondb/projectiondb.go
new file mode 100644
index 0000000000..4e116bdfa7
--- /dev/null
+++ b/internal/projectiondb/projectiondb.go
@@ -0,0 +1,438 @@
+// Package projectiondb owns the lifecycle of disposable SQLite projections.
+// Business data must remain authoritative outside the database: callers are
+// expected to be able to discard and rebuild every database opened here.
+package projectiondb
+
+import (
+ "context"
+ "database/sql"
+ "errors"
+ "fmt"
+ "net/url"
+ "os"
+ "path/filepath"
+ "runtime"
+ "strings"
+ "time"
+
+ moderncsqlite "modernc.org/sqlite"
+ sqlite3 "modernc.org/sqlite/lib"
+)
+
+type Mode string
+
+const (
+ ModeDisk Mode = "disk"
+ ModeMemory Mode = "memory"
+)
+
+type State string
+
+const (
+ StateReady State = "ready"
+ StateDegraded State = "degraded"
+)
+
+type Status struct {
+ State State `json:"state"`
+ Mode Mode `json:"mode"`
+ Path string `json:"path,omitempty"`
+ Revision uint64 `json:"revision"`
+ Indexed int64 `json:"indexed"`
+ Total int64 `json:"total"`
+ Pending int64 `json:"pending"`
+ Failed int64 `json:"failed"`
+ LastError string `json:"lastError,omitempty"`
+ QuarantinedPath string `json:"quarantinedPath,omitempty"`
+}
+
+type Migration struct {
+ Version int
+ Apply func(context.Context, *sql.Tx) error
+}
+
+type OpenOptions struct {
+ Path string
+ MemoryName string
+ Migrations []Migration
+ InMemory bool
+ MaxOpenConns int
+ Now func() time.Time
+ SecureDelete bool
+ AutoVacuum bool
+}
+
+type Handle struct {
+ DB *sql.DB
+ Status Status
+}
+
+type FutureSchemaError struct {
+ Found int
+ Supported int
+}
+
+func (e *FutureSchemaError) Error() string {
+ return fmt.Sprintf("projection schema %d is newer than supported %d", e.Found, e.Supported)
+}
+
+func Open(ctx context.Context, opts OpenOptions) (*Handle, error) {
+ if opts.Now == nil {
+ opts.Now = time.Now
+ }
+ if opts.MemoryName == "" {
+ opts.MemoryName = "projection"
+ }
+ mode := ModeDisk
+ status := Status{State: StateReady, Mode: mode, Path: opts.Path}
+ useMemory := opts.InMemory || PathLooksRemote(opts.Path)
+ if !useMemory {
+ if err := os.MkdirAll(filepath.Dir(opts.Path), 0o700); err != nil {
+ useMemory = true
+ status.LastError = err.Error()
+ } else {
+ _ = os.Chmod(filepath.Dir(opts.Path), 0o700)
+ if filesystemRemote(filepath.Dir(opts.Path)) {
+ useMemory = true
+ status.LastError = "projection cache is on a remote filesystem; using memory"
+ }
+ }
+ }
+ if useMemory {
+ mode = ModeMemory
+ }
+
+ db, err := open(ctx, opts, mode)
+ if err != nil && mode == ModeDisk {
+ var future *FutureSchemaError
+ switch {
+ case errors.As(err, &future):
+ // A newer process wrote this projection. Keep the file intact and
+ // serve an empty memory projection so startup never quarantines a
+ // healthy future schema.
+ status.State = StateDegraded
+ status.LastError = err.Error()
+ mode = ModeMemory
+ db, err = open(ctx, opts, mode)
+ case isCorruptionError(err):
+ // Only integrity-level failures may rename the on-disk projection.
+ status.QuarantinedPath = Quarantine(opts.Path, opts.Now())
+ db, err = open(ctx, opts, mode)
+ if err != nil {
+ status.State = StateDegraded
+ status.LastError = err.Error()
+ mode = ModeMemory
+ db, err = open(ctx, opts, mode)
+ }
+ default:
+ // Busy, permission, IO, or transient open errors must never rename
+ // a healthy database. Fall back to memory for this process only.
+ status.State = StateDegraded
+ status.LastError = err.Error()
+ mode = ModeMemory
+ db, err = open(ctx, opts, mode)
+ }
+ }
+ if err != nil {
+ return nil, err
+ }
+ status.Mode = mode
+ if mode == ModeMemory {
+ status.Path = ""
+ }
+ return &Handle{DB: db, Status: status}, nil
+}
+
+func open(ctx context.Context, opts OpenOptions, mode Mode) (*sql.DB, error) {
+ var dsn string
+ if mode == ModeMemory {
+ dsn = fmt.Sprintf("file:reasonix-%s-%d?mode=memory&cache=shared", url.PathEscape(opts.MemoryName), opts.Now().UnixNano())
+ } else {
+ u := &url.URL{Scheme: "file", Path: opts.Path}
+ dsn = u.String() + "?_pragma=busy_timeout%28150%29&_pragma=foreign_keys%281%29"
+ }
+ db, err := sql.Open("sqlite", dsn)
+ if err != nil {
+ return nil, err
+ }
+ maxOpen := opts.MaxOpenConns
+ if maxOpen <= 0 {
+ maxOpen = 4
+ }
+ db.SetMaxOpenConns(maxOpen)
+ db.SetMaxIdleConns(min(maxOpen, 2))
+ fail := func(err error) (*sql.DB, error) {
+ _ = db.Close()
+ return nil, err
+ }
+ if err := db.PingContext(ctx); err != nil {
+ return fail(err)
+ }
+ if mode == ModeDisk {
+ if _, err := db.ExecContext(ctx, `PRAGMA journal_mode=WAL`); err != nil {
+ return fail(err)
+ }
+ }
+ for _, pragma := range []string{`PRAGMA synchronous=NORMAL`, `PRAGMA foreign_keys=ON`, `PRAGMA busy_timeout=150`} {
+ if _, err := db.ExecContext(ctx, pragma); err != nil {
+ return fail(err)
+ }
+ }
+ if opts.SecureDelete {
+ if _, err := db.ExecContext(ctx, `PRAGMA secure_delete=ON`); err != nil {
+ return fail(err)
+ }
+ }
+ if opts.AutoVacuum {
+ if _, err := db.ExecContext(ctx, `PRAGMA auto_vacuum=INCREMENTAL`); err != nil {
+ return fail(err)
+ }
+ }
+ var integrity string
+ if err := db.QueryRowContext(ctx, `PRAGMA integrity_check`).Scan(&integrity); err != nil {
+ return fail(err)
+ }
+ if integrity != "ok" {
+ return fail(fmt.Errorf("projection integrity check: %s", integrity))
+ }
+ if err := ApplyMigrations(ctx, db, opts.Migrations, opts.Now); err != nil {
+ return fail(err)
+ }
+ if mode == ModeDisk {
+ _ = os.Chmod(opts.Path, 0o600)
+ _ = os.Chmod(opts.Path+"-wal", 0o600)
+ _ = os.Chmod(opts.Path+"-shm", 0o600)
+ }
+ return db, nil
+}
+
+func ApplyMigrations(ctx context.Context, db *sql.DB, migrations []Migration, now func() time.Time) error {
+ if now == nil {
+ now = time.Now
+ }
+ if _, err := db.ExecContext(ctx, `CREATE TABLE IF NOT EXISTS schema_migrations (
+ version INTEGER PRIMARY KEY,
+ applied_at INTEGER NOT NULL
+ )`); err != nil {
+ return err
+ }
+ var current int
+ if err := db.QueryRowContext(ctx, `SELECT COALESCE(MAX(version), 0) FROM schema_migrations`).Scan(¤t); err != nil {
+ return err
+ }
+ supported := 0
+ for _, migration := range migrations {
+ if migration.Version > supported {
+ supported = migration.Version
+ }
+ }
+ if current > supported {
+ return &FutureSchemaError{Found: current, Supported: supported}
+ }
+ for _, migration := range migrations {
+ if migration.Version <= current {
+ continue
+ }
+ if migration.Version != current+1 || migration.Apply == nil {
+ return fmt.Errorf("projection migration gap after version %d", current)
+ }
+ tx, err := db.BeginTx(ctx, nil)
+ if err != nil {
+ return err
+ }
+ if err := migration.Apply(ctx, tx); err != nil {
+ _ = tx.Rollback()
+ return fmt.Errorf("apply projection migration %d: %w", migration.Version, err)
+ }
+ if _, err := tx.ExecContext(ctx, `INSERT INTO schema_migrations(version, applied_at) VALUES(?, ?)`, migration.Version, now().UnixMilli()); err != nil {
+ _ = tx.Rollback()
+ return err
+ }
+ if err := tx.Commit(); err != nil {
+ return err
+ }
+ current = migration.Version
+ }
+ return nil
+}
+
+type Inspection struct {
+ Exists bool `json:"exists"`
+ Path string `json:"path"`
+ Schema int `json:"schema"`
+ Integrity string `json:"integrity,omitempty"`
+ Size int64 `json:"size"`
+ Error string `json:"error,omitempty"`
+}
+
+// Inspect is deliberately read-only: it never creates, migrates, repairs, or
+// quarantines a database.
+func Inspect(ctx context.Context, path string) Inspection {
+ out := Inspection{Path: path}
+ info, err := os.Stat(path)
+ if errors.Is(err, os.ErrNotExist) {
+ return out
+ }
+ if err != nil {
+ out.Error = err.Error()
+ return out
+ }
+ out.Exists = true
+ out.Size = info.Size()
+ u := &url.URL{Scheme: "file", Path: path}
+ db, err := sql.Open("sqlite", u.String()+"?mode=ro&immutable=1")
+ if err != nil {
+ out.Error = err.Error()
+ return out
+ }
+ defer db.Close()
+ if err := db.QueryRowContext(ctx, `PRAGMA integrity_check`).Scan(&out.Integrity); err != nil {
+ out.Error = err.Error()
+ return out
+ }
+ if err := db.QueryRowContext(ctx, `SELECT COALESCE(MAX(version),0) FROM schema_migrations`).Scan(&out.Schema); err != nil {
+ out.Error = err.Error()
+ }
+ return out
+}
+
+func Quarantine(path string, now time.Time) string {
+ if strings.TrimSpace(path) == "" {
+ return ""
+ }
+ quarantined := fmt.Sprintf("%s.corrupt-%d", path, now.UnixMilli())
+ if err := os.Rename(path, quarantined); err != nil {
+ return ""
+ }
+ for _, suffix := range []string{"-wal", "-shm"} {
+ _ = os.Rename(path+suffix, quarantined+suffix)
+ }
+ return quarantined
+}
+
+// isCorruptionError reports whether err proves the on-disk projection is unsafe
+// to keep open. Temporary busy/permission/IO failures must return false so a
+// multi-process client never renames a healthy database out from under peers.
+func isCorruptionError(err error) bool {
+ if err == nil {
+ return false
+ }
+ var future *FutureSchemaError
+ if errors.As(err, &future) {
+ return false
+ }
+ var se *moderncsqlite.Error
+ if errors.As(err, &se) {
+ switch se.Code() & 0xff {
+ case sqlite3.SQLITE_CORRUPT, sqlite3.SQLITE_NOTADB:
+ return true
+ }
+ }
+ msg := strings.ToLower(err.Error())
+ return strings.Contains(msg, "integrity check") ||
+ strings.Contains(msg, "malformed") ||
+ strings.Contains(msg, "file is not a database") ||
+ strings.Contains(msg, "not a database")
+}
+
+func PathLooksRemote(path string) bool {
+ clean := filepath.Clean(path)
+ if runtime.GOOS == "windows" && strings.HasPrefix(clean, `\\`) {
+ return true
+ }
+ slash := filepath.ToSlash(clean)
+ return strings.HasPrefix(slash, "/net/") || strings.HasPrefix(slash, "/nfs/") || strings.HasPrefix(slash, "/afs/")
+}
+
+// Rebuild constructs and validates a replacement beside the live database,
+// then swaps it into place. The old projection remains untouched if building,
+// validation, or the platform rename fails (notably an open database on
+// Windows). Rebuild never touches authoritative business files.
+func Rebuild(ctx context.Context, opts OpenOptions, populate func(context.Context, *sql.DB) error) error {
+ if strings.TrimSpace(opts.Path) == "" || opts.InMemory {
+ return errors.New("projection rebuild requires a disk path")
+ }
+ if opts.Now == nil {
+ opts.Now = time.Now
+ }
+ temporary := fmt.Sprintf("%s.rebuild-%d", opts.Path, opts.Now().UnixNano())
+ replacement := opts
+ replacement.Path = temporary
+ replacement.InMemory = false
+ handle, err := Open(ctx, replacement)
+ if err != nil {
+ return fmt.Errorf("open projection replacement: %w", err)
+ }
+ cleanupTemporary := func() {
+ _ = os.Remove(temporary)
+ _ = os.Remove(temporary + "-wal")
+ _ = os.Remove(temporary + "-shm")
+ }
+ if handle.Status.Mode != ModeDisk {
+ _ = handle.DB.Close()
+ cleanupTemporary()
+ return errors.New("projection replacement could not use disk storage")
+ }
+ if populate != nil {
+ if err := populate(ctx, handle.DB); err != nil {
+ _ = handle.DB.Close()
+ cleanupTemporary()
+ return fmt.Errorf("populate projection replacement: %w", err)
+ }
+ }
+ var integrity string
+ if err := handle.DB.QueryRowContext(ctx, `PRAGMA integrity_check`).Scan(&integrity); err != nil || integrity != "ok" {
+ _ = handle.DB.Close()
+ cleanupTemporary()
+ if err != nil {
+ return fmt.Errorf("validate projection replacement: %w", err)
+ }
+ return fmt.Errorf("validate projection replacement: %s", integrity)
+ }
+ _, _ = handle.DB.ExecContext(ctx, `PRAGMA wal_checkpoint(TRUNCATE)`)
+ if err := handle.DB.Close(); err != nil {
+ cleanupTemporary()
+ return err
+ }
+
+ backup := fmt.Sprintf("%s.replaced-%d", opts.Path, opts.Now().UnixNano())
+ hadOld := false
+ if _, err := os.Stat(opts.Path); err == nil {
+ if err := os.Rename(opts.Path, backup); err != nil {
+ cleanupTemporary()
+ return fmt.Errorf("projection database is busy: %w", err)
+ }
+ hadOld = true
+ for _, suffix := range []string{"-wal", "-shm"} {
+ if err := os.Rename(opts.Path+suffix, backup+suffix); err != nil && !errors.Is(err, os.ErrNotExist) {
+ _ = os.Rename(backup, opts.Path)
+ for _, restored := range []string{"-wal", "-shm"} {
+ _ = os.Rename(backup+restored, opts.Path+restored)
+ }
+ cleanupTemporary()
+ return fmt.Errorf("projection database is busy: %w", err)
+ }
+ }
+ } else if !errors.Is(err, os.ErrNotExist) {
+ cleanupTemporary()
+ return err
+ }
+ if err := os.Rename(temporary, opts.Path); err != nil {
+ if hadOld {
+ _ = os.Rename(backup, opts.Path)
+ for _, suffix := range []string{"-wal", "-shm"} {
+ _ = os.Rename(backup+suffix, opts.Path+suffix)
+ }
+ }
+ cleanupTemporary()
+ return fmt.Errorf("install projection replacement: %w", err)
+ }
+ _ = os.Chmod(opts.Path, 0o600)
+ if hadOld {
+ _ = os.Remove(backup)
+ _ = os.Remove(backup + "-wal")
+ _ = os.Remove(backup + "-shm")
+ }
+ cleanupTemporary()
+ return nil
+}
diff --git a/internal/projectiondb/projectiondb_test.go b/internal/projectiondb/projectiondb_test.go
new file mode 100644
index 0000000000..3c3ef2a8a1
--- /dev/null
+++ b/internal/projectiondb/projectiondb_test.go
@@ -0,0 +1,176 @@
+package projectiondb
+
+import (
+ "context"
+ "database/sql"
+ "errors"
+ "os"
+ "path/filepath"
+ "testing"
+ "time"
+)
+
+func testMigrations() []Migration {
+ return []Migration{{Version: 1, Apply: func(ctx context.Context, tx *sql.Tx) error {
+ _, err := tx.ExecContext(ctx, `CREATE TABLE values_table(value TEXT NOT NULL)`)
+ return err
+ }}}
+}
+
+func TestOpenAppliesLedgerAndPrivatePermissions(t *testing.T) {
+ t.Parallel()
+ path := filepath.Join(t.TempDir(), "catalog", "v1.sqlite")
+ handle, err := Open(context.Background(), OpenOptions{Path: path, MemoryName: "test", Migrations: testMigrations()})
+ if err != nil {
+ t.Fatal(err)
+ }
+ t.Cleanup(func() { _ = handle.DB.Close() })
+ var version int
+ if err := handle.DB.QueryRow(`SELECT MAX(version) FROM schema_migrations`).Scan(&version); err != nil || version != 1 {
+ t.Fatalf("version=%d err=%v", version, err)
+ }
+ if info, err := os.Stat(path); err != nil || info.Mode().Perm()&0o077 != 0 {
+ t.Fatalf("database permissions=%v err=%v", info.Mode().Perm(), err)
+ }
+}
+
+func TestFutureSchemaIsPreservedAndFallsBackToMemory(t *testing.T) {
+ t.Parallel()
+ path := filepath.Join(t.TempDir(), "catalog.sqlite")
+ seed, err := Open(context.Background(), OpenOptions{Path: path, MemoryName: "seed", Migrations: testMigrations()})
+ if err != nil {
+ t.Fatal(err)
+ }
+ if _, err := seed.DB.Exec(`INSERT INTO schema_migrations(version, applied_at) VALUES(2, ?)`, time.Now().UnixMilli()); err != nil {
+ t.Fatal(err)
+ }
+ if err := seed.DB.Close(); err != nil {
+ t.Fatal(err)
+ }
+ handle, err := Open(context.Background(), OpenOptions{Path: path, MemoryName: "future", Migrations: testMigrations()})
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer handle.DB.Close()
+ if handle.Status.Mode != ModeMemory || handle.Status.State != StateDegraded || handle.Status.QuarantinedPath != "" {
+ t.Fatalf("status=%#v", handle.Status)
+ }
+ inspection := Inspect(context.Background(), path)
+ if !inspection.Exists || inspection.Schema != 2 {
+ t.Fatalf("inspection=%#v", inspection)
+ }
+}
+
+func TestInspectDoesNotCreateMissingDatabase(t *testing.T) {
+ t.Parallel()
+ path := filepath.Join(t.TempDir(), "missing.sqlite")
+ inspection := Inspect(context.Background(), path)
+ if inspection.Exists {
+ t.Fatalf("inspection=%#v", inspection)
+ }
+ if _, err := os.Stat(path); !os.IsNotExist(err) {
+ t.Fatalf("inspect created database: %v", err)
+ }
+}
+
+func TestRebuildPublishesOnlyValidatedReplacement(t *testing.T) {
+ t.Parallel()
+ path := filepath.Join(t.TempDir(), "catalog.sqlite")
+ opts := OpenOptions{Path: path, MemoryName: "rebuild", Migrations: testMigrations()}
+ seed, err := Open(context.Background(), opts)
+ if err != nil {
+ t.Fatal(err)
+ }
+ if _, err := seed.DB.Exec(`INSERT INTO values_table(value) VALUES('old')`); err != nil {
+ t.Fatal(err)
+ }
+ if err := seed.DB.Close(); err != nil {
+ t.Fatal(err)
+ }
+ if err := Rebuild(context.Background(), opts, func(ctx context.Context, db *sql.DB) error {
+ _, err := db.ExecContext(ctx, `INSERT INTO values_table(value) VALUES('new')`)
+ return err
+ }); err != nil {
+ t.Fatal(err)
+ }
+ rebuilt, err := Open(context.Background(), opts)
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer rebuilt.DB.Close()
+ var value string
+ if err := rebuilt.DB.QueryRow(`SELECT value FROM values_table`).Scan(&value); err != nil || value != "new" {
+ t.Fatalf("value=%q err=%v", value, err)
+ }
+}
+
+func TestBusyOpenDoesNotQuarantineHealthyDatabase(t *testing.T) {
+ t.Parallel()
+ path := filepath.Join(t.TempDir(), "catalog.sqlite")
+ opts := OpenOptions{Path: path, MemoryName: "busy", Migrations: testMigrations()}
+ seed, err := Open(context.Background(), opts)
+ if err != nil {
+ t.Fatal(err)
+ }
+ if _, err := seed.DB.Exec(`INSERT INTO values_table(value) VALUES('keep')`); err != nil {
+ t.Fatal(err)
+ }
+ // Hold the disk connection open so a second open that somehow fails still
+ // must not rename the healthy file. Force the memory path via empty-path
+ // corruption classifier: a future-schema-like non-corruption error.
+ if err := seed.DB.Close(); err != nil {
+ t.Fatal(err)
+ }
+ // Rename aside to simulate a permission/open failure without corruption.
+ locked := path + ".locked"
+ if err := os.Rename(path, locked); err != nil {
+ t.Fatal(err)
+ }
+ // Open with a path that fails because the file is missing mid-flight after
+ // we restore it — use InMemory true to prove non-corruption path. The
+ // classifier unit is covered by isCorruptionError via future schema test.
+ if isCorruptionError(errors.New("database is locked (5) (SQLITE_BUSY)")) {
+ t.Fatal("SQLITE_BUSY must not be treated as corruption")
+ }
+ if isCorruptionError(errors.New("unable to open database file")) {
+ t.Fatal("CANTOPEN must not be treated as corruption")
+ }
+ if !isCorruptionError(errors.New("projection integrity check: *** in database main ***")) {
+ t.Fatal("integrity failures must quarantine")
+ }
+ if err := os.Rename(locked, path); err != nil {
+ t.Fatal(err)
+ }
+ if matches, _ := filepath.Glob(path + ".corrupt-*"); len(matches) != 0 {
+ t.Fatalf("unexpected quarantine files: %v", matches)
+ }
+}
+
+func TestRebuildFailureKeepsOldDatabase(t *testing.T) {
+ t.Parallel()
+ path := filepath.Join(t.TempDir(), "catalog.sqlite")
+ opts := OpenOptions{Path: path, MemoryName: "rebuild-failure", Migrations: testMigrations()}
+ seed, err := Open(context.Background(), opts)
+ if err != nil {
+ t.Fatal(err)
+ }
+ if _, err := seed.DB.Exec(`INSERT INTO values_table(value) VALUES('old')`); err != nil {
+ t.Fatal(err)
+ }
+ if err := seed.DB.Close(); err != nil {
+ t.Fatal(err)
+ }
+ wantErr := errors.New("populate failed")
+ if err := Rebuild(context.Background(), opts, func(context.Context, *sql.DB) error { return wantErr }); !errors.Is(err, wantErr) {
+ t.Fatalf("Rebuild error=%v", err)
+ }
+ current, err := Open(context.Background(), opts)
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer current.DB.Close()
+ var value string
+ if err := current.DB.QueryRow(`SELECT value FROM values_table`).Scan(&value); err != nil || value != "old" {
+ t.Fatalf("value=%q err=%v", value, err)
+ }
+}
diff --git a/internal/sessioncatalog/remote_fs_darwin.go b/internal/projectiondb/remote_fs_darwin.go
similarity index 85%
rename from internal/sessioncatalog/remote_fs_darwin.go
rename to internal/projectiondb/remote_fs_darwin.go
index 50d90805ba..5cbdf0fa9d 100644
--- a/internal/sessioncatalog/remote_fs_darwin.go
+++ b/internal/projectiondb/remote_fs_darwin.go
@@ -1,13 +1,13 @@
//go:build darwin
-package sessioncatalog
+package projectiondb
import (
"strings"
"syscall"
)
-func catalogFilesystemRemote(path string) bool {
+func filesystemRemote(path string) bool {
var stat syscall.Statfs_t
if err := syscall.Statfs(path, &stat); err != nil {
return false
diff --git a/internal/projectiondb/remote_fs_linux.go b/internal/projectiondb/remote_fs_linux.go
new file mode 100644
index 0000000000..a814e8e048
--- /dev/null
+++ b/internal/projectiondb/remote_fs_linux.go
@@ -0,0 +1,18 @@
+//go:build linux
+
+package projectiondb
+
+import "syscall"
+
+func filesystemRemote(path string) bool {
+ var stat syscall.Statfs_t
+ if err := syscall.Statfs(path, &stat); err != nil {
+ return false
+ }
+ switch uint64(stat.Type) {
+ case 0x6969, 0x517B, 0xFF534D42, 0x6E667364, 0x00C36400, 0x0BD00BD0:
+ return true
+ default:
+ return false
+ }
+}
diff --git a/internal/projectiondb/remote_fs_other.go b/internal/projectiondb/remote_fs_other.go
new file mode 100644
index 0000000000..831f7f4103
--- /dev/null
+++ b/internal/projectiondb/remote_fs_other.go
@@ -0,0 +1,5 @@
+//go:build !darwin && !linux && !windows
+
+package projectiondb
+
+func filesystemRemote(string) bool { return false }
diff --git a/internal/sessioncatalog/remote_fs_windows.go b/internal/projectiondb/remote_fs_windows.go
similarity index 64%
rename from internal/sessioncatalog/remote_fs_windows.go
rename to internal/projectiondb/remote_fs_windows.go
index aa1781f5dc..9be1077214 100644
--- a/internal/sessioncatalog/remote_fs_windows.go
+++ b/internal/projectiondb/remote_fs_windows.go
@@ -1,6 +1,6 @@
//go:build windows
-package sessioncatalog
+package projectiondb
import (
"path/filepath"
@@ -9,7 +9,7 @@ import (
"golang.org/x/sys/windows"
)
-func catalogFilesystemRemote(path string) bool {
+func filesystemRemote(path string) bool {
volume := filepath.VolumeName(filepath.Clean(path))
if volume == "" {
return false
@@ -19,8 +19,5 @@ func catalogFilesystemRemote(path string) bool {
root += `\`
}
rootPtr, err := windows.UTF16PtrFromString(root)
- if err != nil {
- return false
- }
- return windows.GetDriveType(rootPtr) == windows.DRIVE_REMOTE
+ return err == nil && windows.GetDriveType(rootPtr) == windows.DRIVE_REMOTE
}
diff --git a/internal/sessioncatalog/catalog.go b/internal/sessioncatalog/catalog.go
index bd79714328..32bf3070cb 100644
--- a/internal/sessioncatalog/catalog.go
+++ b/internal/sessioncatalog/catalog.go
@@ -7,16 +7,14 @@ import (
"encoding/json"
"errors"
"fmt"
- "net/url"
"os"
"path/filepath"
- "runtime"
"strings"
"sync"
"sync/atomic"
"time"
- _ "modernc.org/sqlite"
+ "reasonix/internal/projectiondb"
)
const defaultMissingGrace = 30 * time.Second
@@ -72,6 +70,17 @@ func Open(ctx context.Context, opts Options) (*Catalog, error) {
if opts.QueueCapacity <= 0 {
opts.QueueCapacity = 1024
}
+ // An empty path (no cache dir) or explicit memory flag must never write a
+ // relative session-catalog file into the current project directory.
+ if strings.TrimSpace(opts.Path) == "" {
+ opts.Path = ""
+ opts.InMemory = true
+ }
+ if !opts.InMemory {
+ if env := strings.TrimSpace(os.Getenv("REASONIX_SESSION_CATALOG_MEMORY")); env == "1" {
+ opts.InMemory = true
+ }
+ }
c := &Catalog{
opts: opts,
@@ -84,42 +93,31 @@ func Open(ctx context.Context, opts Options) (*Catalog, error) {
stop: make(chan struct{}),
status: Status{State: StateOpening, Path: opts.Path},
}
- mode := ModeDisk
- useMemory := opts.InMemory || catalogPathLooksRemote(opts.Path)
- if !useMemory {
- if err := os.MkdirAll(filepath.Dir(opts.Path), 0o755); err != nil {
- useMemory = true
- c.status.LastError = err.Error()
- } else if catalogFilesystemRemote(filepath.Dir(opts.Path)) {
- useMemory = true
- c.status.LastError = "session catalog cache is on a remote filesystem; using memory"
- }
- }
- if useMemory {
- mode = ModeMemory
- }
- db, err := openDatabase(ctx, opts.Path, mode)
- if err != nil && mode == ModeDisk {
- quarantined := quarantineCatalog(opts.Path, opts.Now())
- c.status.QuarantinedPath = quarantined
- db, err = openDatabase(ctx, opts.Path, mode)
- }
- if err != nil && mode == ModeDisk {
- mode = ModeMemory
- c.status.LastError = err.Error()
- db, err = openDatabase(ctx, opts.Path, mode)
- }
+ handle, err := projectiondb.Open(ctx, projectiondb.OpenOptions{
+ Path: opts.Path,
+ MemoryName: "session-catalog",
+ Migrations: sessionMigrations(),
+ InMemory: opts.InMemory,
+ Now: opts.Now,
+ })
if err != nil {
return nil, err
}
- c.db = db
- c.status.Mode = mode
- c.status.State = StateReady
- if mode == ModeMemory {
- c.status.Path = ""
+ c.db = handle.DB
+ c.status.Mode = Mode(handle.Status.Mode)
+ c.status.State = State(handle.Status.State)
+ if c.status.State == "" {
+ c.status.State = StateReady
}
+ if c.status.Mode == ModeMemory {
+ c.status.Path = ""
+ } else {
+ c.status.Path = handle.Status.Path
+ }
+ c.status.LastError = handle.Status.LastError
+ c.status.QuarantinedPath = handle.Status.QuarantinedPath
if err := c.loadStatus(ctx); err != nil {
- _ = db.Close()
+ _ = c.db.Close()
return nil, err
}
c.workerCtx, c.workerCancel = context.WithCancel(context.Background())
@@ -137,75 +135,6 @@ func Open(ctx context.Context, opts Options) (*Catalog, error) {
return c, nil
}
-func openDatabase(ctx context.Context, path string, mode Mode) (*sql.DB, error) {
- dsn := ""
- if mode == ModeMemory {
- dsn = fmt.Sprintf("file:reasonix-session-catalog-%d?mode=memory&cache=shared", time.Now().UnixNano())
- } else {
- u := &url.URL{Scheme: "file", Path: path}
- dsn = u.String() + "?_pragma=busy_timeout%28150%29&_pragma=foreign_keys%281%29"
- }
- db, err := sql.Open("sqlite", dsn)
- if err != nil {
- return nil, err
- }
- db.SetMaxOpenConns(4)
- db.SetMaxIdleConns(2)
- if err := db.PingContext(ctx); err != nil {
- _ = db.Close()
- return nil, err
- }
- if mode == ModeDisk {
- if _, err := db.ExecContext(ctx, `PRAGMA journal_mode=WAL`); err != nil {
- _ = db.Close()
- return nil, err
- }
- }
- if _, err := db.ExecContext(ctx, `PRAGMA synchronous=NORMAL`); err != nil {
- _ = db.Close()
- return nil, err
- }
- var integrity string
- if err := db.QueryRowContext(ctx, `PRAGMA integrity_check`).Scan(&integrity); err != nil || integrity != "ok" {
- _ = db.Close()
- if err != nil {
- return nil, err
- }
- return nil, fmt.Errorf("session catalog integrity check: %s", integrity)
- }
- if err := migrateSchema(ctx, db); err != nil {
- _ = db.Close()
- return nil, err
- }
- return db, nil
-}
-
-func quarantineCatalog(path string, now time.Time) string {
- if strings.TrimSpace(path) == "" {
- return ""
- }
- quarantined := fmt.Sprintf("%s.corrupt-%d", path, now.UnixMilli())
- if err := os.Rename(path, quarantined); err != nil {
- return ""
- }
- for _, suffix := range []string{"-wal", "-shm"} {
- _ = os.Rename(path+suffix, quarantined+suffix)
- }
- return quarantined
-}
-
-func catalogPathLooksRemote(path string) bool {
- if os.Getenv("REASONIX_SESSION_CATALOG_MEMORY") == "1" {
- return true
- }
- clean := filepath.Clean(path)
- if runtime.GOOS == "windows" && strings.HasPrefix(clean, `\\`) {
- return true
- }
- slash := filepath.ToSlash(clean)
- return strings.HasPrefix(slash, "/net/") || strings.HasPrefix(slash, "/nfs/") || strings.HasPrefix(slash, "/afs/")
-}
-
func (c *Catalog) loadStatus(ctx context.Context) error {
var revision uint64
if err := c.db.QueryRowContext(ctx, `SELECT revision FROM catalog_state WHERE id=1`).Scan(&revision); err != nil {
@@ -644,12 +573,14 @@ func (c *Catalog) ListTopics(ctx context.Context, req TopicPageRequest) (TopicPa
}
func (c *Catalog) listTopicSessions(ctx context.Context, key TopicKey) ([]SessionRecord, error) {
+ // Bound per-topic payload size so a recovery-heavy topic cannot emit an
+ // unbounded Wails payload on a single page fetch.
rows, err := c.db.QueryContext(ctx, `SELECT path,directory,scope,workspace_root,topic_id,topic_title,
custom_title,created_at,last_activity_at,preview,turns,turns_state,recovered,
recovery_reason,recovery_digest,parent_id,content_fingerprint,meta_fingerprint,
health,missing_since FROM catalog_sessions
WHERE scope=? AND workspace_root=? AND topic_id=?
- ORDER BY last_activity_at DESC,path ASC`, key.Scope, key.WorkspaceRoot, key.TopicID)
+ ORDER BY last_activity_at DESC,path ASC LIMIT ?`, key.Scope, key.WorkspaceRoot, key.TopicID, MaxLimit)
if err != nil {
return nil, err
}
diff --git a/internal/sessioncatalog/catalog_test.go b/internal/sessioncatalog/catalog_test.go
index 6ea7a0ace1..e4e0b1ef09 100644
--- a/internal/sessioncatalog/catalog_test.go
+++ b/internal/sessioncatalog/catalog_test.go
@@ -5,6 +5,7 @@ import (
"fmt"
"os"
"path/filepath"
+ "strings"
"testing"
"time"
@@ -239,7 +240,7 @@ func TestDirectWriteDuringScanIsNotMarkedMissing(t *testing.T) {
}
t.Cleanup(func() { _ = catalog.Close(context.Background()) })
target := DirectoryTarget{Path: dir, Scope: "global"}
- generation, err := catalog.beginDirectoryScan(ctx, target, now.UnixMilli())
+ generation, _, err := catalog.beginDirectoryScan(ctx, target, "test", now.UnixMilli())
if err != nil {
t.Fatal(err)
}
@@ -409,7 +410,7 @@ func BenchmarkListTopicsWarmCatalog10K(b *testing.B) {
}
}
b.ResetTimer()
- for i := 0; i < b.N; i++ {
+ for range b.N {
page, err := catalog.ListTopics(ctx, TopicPageRequest{
Scope: "project", WorkspaceRoot: "/workspace", Limit: 50,
})
@@ -486,3 +487,112 @@ func TestOpenQuarantinesCorruptCatalogAndRebuildsProjection(t *testing.T) {
t.Fatalf("quarantined catalog: %v", err)
}
}
+
+func TestOpenBlankPathUsesMemoryWithoutWritingCWD(t *testing.T) {
+ // A blank path (CacheDir unavailable or caller override) must use memory
+ // and must not create a relative session-catalog file under cwd.
+ wd := t.TempDir()
+ t.Chdir(wd)
+ catalog, err := Open(context.Background(), Options{Path: " ", DisableRepair: true})
+ if err != nil {
+ t.Fatal(err)
+ }
+ t.Cleanup(func() { _ = catalog.Close(context.Background()) })
+ status := catalog.Status()
+ if status.Mode != ModeMemory {
+ t.Fatalf("status=%#v, want memory mode for blank path", status)
+ }
+ entries, err := os.ReadDir(wd)
+ if err != nil {
+ t.Fatal(err)
+ }
+ for _, entry := range entries {
+ if strings.Contains(entry.Name(), "session-catalog") || strings.HasSuffix(entry.Name(), ".sqlite") {
+ t.Fatalf("blank path wrote projection into cwd: %s", entry.Name())
+ }
+ }
+}
+
+func TestRebuildFailureKeepsExistingCatalog(t *testing.T) {
+ t.Parallel()
+ ctx := context.Background()
+ path := filepath.Join(t.TempDir(), "catalog.sqlite")
+ catalog, err := Open(ctx, Options{Path: path, DisableRepair: true})
+ if err != nil {
+ t.Fatal(err)
+ }
+ dir := t.TempDir()
+ session := filepath.Join(dir, "keep.jsonl")
+ if err := os.WriteFile(session, []byte(`{"role":"user","content":"hello"}`+"\n"), 0o600); err != nil {
+ t.Fatal(err)
+ }
+ if err := catalog.UpsertSession(ctx, SessionRecord{
+ Path: session, Directory: dir, Scope: "global", TopicID: "keep",
+ Turns: 1, TurnsState: TurnsValid, Health: HealthOK, Preview: "hello",
+ }); err != nil {
+ t.Fatal(err)
+ }
+ if err := catalog.Close(context.Background()); err != nil {
+ t.Fatal(err)
+ }
+ // ListSessionOrder on a regular file fails; Rebuild must keep the old DB.
+ fileTarget := filepath.Join(t.TempDir(), "not-a-dir")
+ if err := os.WriteFile(fileTarget, []byte("x"), 0o600); err != nil {
+ t.Fatal(err)
+ }
+ if _, err := Rebuild(ctx, path, []DirectoryTarget{{Path: fileTarget, Scope: "global"}}); err == nil {
+ t.Fatal("expected rebuild failure for file path")
+ }
+ restored, err := Open(ctx, Options{Path: path, DisableRepair: true})
+ if err != nil {
+ t.Fatal(err)
+ }
+ t.Cleanup(func() { _ = restored.Close(context.Background()) })
+ topic, ok, err := restored.GetTopic(ctx, TopicKey{Scope: "global", TopicID: "keep"})
+ if err != nil || !ok || len(topic.Sessions) != 1 {
+ t.Fatalf("rebuild failure lost catalog: ok=%v topic=%#v err=%v", ok, topic, err)
+ }
+}
+
+func TestRepairDrainEventuallyCompletesBeyondQueue(t *testing.T) {
+ t.Parallel()
+ ctx := context.Background()
+ dir := t.TempDir()
+ path := filepath.Join(t.TempDir(), "catalog.sqlite")
+ seed, err := Open(ctx, Options{Path: path, DisableRepair: true})
+ if err != nil {
+ t.Fatal(err)
+ }
+ const total = 8
+ for i := 0; i < total; i++ {
+ session := filepath.Join(dir, fmt.Sprintf("%02d.jsonl", i))
+ if err := os.WriteFile(session, []byte(`{"role":"user","content":"turn"}`+"\n"), 0o600); err != nil {
+ t.Fatal(err)
+ }
+ if err := seed.UpsertSession(ctx, SessionRecord{
+ Path: session, Directory: dir, Scope: "global", TopicID: fmt.Sprintf("t%d", i),
+ TurnsState: TurnsUnknown, Health: HealthOK, LastActivityAt: int64(i + 1),
+ }); err != nil {
+ t.Fatal(err)
+ }
+ }
+ if err := seed.Close(context.Background()); err != nil {
+ t.Fatal(err)
+ }
+ catalog, err := Open(ctx, Options{Path: path, QueueCapacity: 2, Now: time.Now})
+ if err != nil {
+ t.Fatal(err)
+ }
+ t.Cleanup(func() { _ = catalog.Close(context.Background()) })
+ deadline := time.Now().Add(15 * time.Second)
+ for {
+ status := catalog.Status()
+ if status.RepairPending == 0 {
+ return
+ }
+ if time.Now().After(deadline) {
+ t.Fatalf("repair pending stuck at %d", status.RepairPending)
+ }
+ time.Sleep(50 * time.Millisecond)
+ }
+}
diff --git a/internal/sessioncatalog/reconcile.go b/internal/sessioncatalog/reconcile.go
index 6d02ec9ca5..a3c6c08ecb 100644
--- a/internal/sessioncatalog/reconcile.go
+++ b/internal/sessioncatalog/reconcile.go
@@ -16,6 +16,7 @@ import (
"time"
"reasonix/internal/agent"
+ "reasonix/internal/projectiondb"
)
func (c *Catalog) ReconcileDirectory(ctx context.Context, target DirectoryTarget) error {
@@ -41,7 +42,7 @@ func (c *Catalog) ReconcileDirectory(ctx context.Context, target DirectoryTarget
return nil
}
now := c.opts.Now().UnixMilli()
- generation, err := c.beginDirectoryScan(ctx, target, now)
+ generation, resumeCursor, err := c.beginDirectoryScan(ctx, target, signature, now)
if err != nil {
return err
}
@@ -50,8 +51,19 @@ func (c *Catalog) ReconcileDirectory(ctx context.Context, target DirectoryTarget
c.failDirectoryScan(ctx, target.Path, err)
return err
}
- for start := 0; start < len(ordered); start += 64 {
+ start := 0
+ if resumeCursor != "" {
+ for i, info := range ordered {
+ if info.Path == resumeCursor {
+ start = i + 1
+ break
+ }
+ }
+ }
+ for ; start < len(ordered); start += 64 {
if err := ctx.Err(); err != nil {
+ // Preserve scan_cursor so the next process resumes instead of
+ // re-decoding the whole directory after a forced shutdown.
c.failDirectoryScan(context.Background(), target.Path, err)
return err
}
@@ -339,32 +351,58 @@ func fileFingerprint(path string) string {
return fmt.Sprintf("%d:%d", info.Size(), info.ModTime().UnixNano())
}
-func (c *Catalog) beginDirectoryScan(ctx context.Context, target DirectoryTarget, now int64) (int64, error) {
+// beginDirectoryScan starts or resumes a directory scan. When the previous
+// scan for the same signature was interrupted mid-way, the stored scan_cursor
+// is returned so ReconcileDirectory continues instead of restarting from 0.
+func (c *Catalog) beginDirectoryScan(ctx context.Context, target DirectoryTarget, signature string, now int64) (int64, string, error) {
tx, err := c.db.BeginTx(ctx, nil)
if err != nil {
- return 0, err
+ return 0, "", err
}
- if _, err := tx.ExecContext(ctx, `INSERT INTO catalog_directories(path,scope,workspace_root,state,error)
- VALUES(?,?,?,'scanning','') ON CONFLICT(path) DO UPDATE SET
- scope=excluded.scope,workspace_root=excluded.workspace_root,state='scanning',error='',
- scan_generation=catalog_directories.scan_generation+1,scan_cursor='',indexed=0`,
- target.Path, target.Scope, target.WorkspaceRoot); err != nil {
+ var previousSig, previousState, previousCursor string
+ var previousGeneration int64
+ err = tx.QueryRowContext(ctx, `SELECT signature,state,scan_cursor,scan_generation FROM catalog_directories WHERE path=?`,
+ target.Path).Scan(&previousSig, &previousState, &previousCursor, &previousGeneration)
+ resume := err == nil && previousState == "scanning" && previousSig == signature && strings.TrimSpace(previousCursor) != ""
+ if errors.Is(err, sql.ErrNoRows) {
+ err = nil
+ }
+ if err != nil {
_ = tx.Rollback()
- return 0, err
+ return 0, "", err
+ }
+ if resume {
+ if _, err := tx.ExecContext(ctx, `UPDATE catalog_directories SET scope=?,workspace_root=?,state='scanning',error='',signature=? WHERE path=?`,
+ target.Scope, target.WorkspaceRoot, signature, target.Path); err != nil {
+ _ = tx.Rollback()
+ return 0, "", err
+ }
+ if previousGeneration == 0 {
+ previousGeneration = 1
+ }
+ return previousGeneration, previousCursor, tx.Commit()
+ }
+ if _, err := tx.ExecContext(ctx, `INSERT INTO catalog_directories(path,scope,workspace_root,state,error,signature)
+ VALUES(?,?,?,'scanning','',?) ON CONFLICT(path) DO UPDATE SET
+ scope=excluded.scope,workspace_root=excluded.workspace_root,state='scanning',error='',
+ signature=excluded.signature,scan_generation=catalog_directories.scan_generation+1,scan_cursor='',indexed=0`,
+ target.Path, target.Scope, target.WorkspaceRoot, signature); err != nil {
+ _ = tx.Rollback()
+ return 0, "", err
}
var generation int64
if err := tx.QueryRowContext(ctx, `SELECT scan_generation FROM catalog_directories WHERE path=?`, target.Path).Scan(&generation); err != nil {
_ = tx.Rollback()
- return 0, err
+ return 0, "", err
}
if generation == 0 {
generation = 1
if _, err := tx.ExecContext(ctx, `UPDATE catalog_directories SET scan_generation=1 WHERE path=?`, target.Path); err != nil {
_ = tx.Rollback()
- return 0, err
+ return 0, "", err
}
}
- return generation, tx.Commit()
+ return generation, "", tx.Commit()
}
func (c *Catalog) finishDirectoryScan(ctx context.Context, target DirectoryTarget, signature string, generation, now int64, total int) error {
@@ -453,12 +491,28 @@ func (c *Catalog) enqueueRepair(path string) {
case <-c.stop:
c.repairQueued.Delete(path)
default:
+ // Channel pressure must never permanently drop unknown rows. Leave them
+ // in the DB and clear the in-memory marker so the drain ticker requeues.
c.repairQueued.Delete(path)
}
}
func (c *Catalog) enqueuePersistedRepairs(ctx context.Context) {
- rows, err := c.db.QueryContext(ctx, `SELECT path FROM catalog_sessions WHERE turns_state='unknown' ORDER BY last_activity_at DESC`)
+ c.drainUnknownRepairs(ctx, c.opts.QueueCapacity)
+}
+
+// drainUnknownRepairs pulls the next batch of turns_state=unknown paths from the
+// durable projection. Combined with the repair ticker this gives eventual
+// completeness even when more than QueueCapacity sessions need repair.
+func (c *Catalog) drainUnknownRepairs(ctx context.Context, limit int) {
+ if c == nil || c.db == nil || c.opts.DisableRepair || limit <= 0 {
+ return
+ }
+ if err := ctx.Err(); err != nil {
+ return
+ }
+ rows, err := c.db.QueryContext(ctx, `SELECT path FROM catalog_sessions
+ WHERE turns_state='unknown' ORDER BY last_activity_at DESC LIMIT ?`, limit)
if err != nil {
return
}
@@ -473,12 +527,17 @@ func (c *Catalog) enqueuePersistedRepairs(ctx context.Context) {
func (c *Catalog) repairLoop() {
defer c.workers.Done()
+ ticker := time.NewTicker(2 * time.Second)
+ defer ticker.Stop()
for {
select {
case path := <-c.repairCh:
c.repairSession(c.workerCtx, path)
c.repairQueued.Delete(path)
+ c.drainUnknownRepairs(c.workerCtx, 32)
runtime.Gosched()
+ case <-ticker.C:
+ c.drainUnknownRepairs(c.workerCtx, 64)
case <-c.stop:
return
}
@@ -486,10 +545,15 @@ func (c *Catalog) repairLoop() {
}
func (c *Catalog) repairSession(workerCtx context.Context, path string) {
+ if workerCtx.Err() != nil {
+ return
+ }
ctx, cancel := context.WithTimeout(workerCtx, 30*time.Second)
defer cancel()
+ // LoadSessionDisplayMessages is not yet context-aware; check cancellation
+ // before and after so shutdown can abandon the result without writing.
msgs, _, _, err := agent.LoadSessionDisplayMessages(path)
- if ctx.Err() != nil {
+ if ctx.Err() != nil || workerCtx.Err() != nil {
return
}
if err != nil {
@@ -506,6 +570,9 @@ func (c *Catalog) repairSession(workerCtx context.Context, path string) {
}); err != nil {
return
}
+ if ctx.Err() != nil || workerCtx.Err() != nil {
+ return
+ }
_, _ = c.db.ExecContext(ctx, `UPDATE catalog_sessions SET preview=?,turns=?,turns_state='valid',
health='ok',meta_fingerprint=? WHERE path=?`, preview, turns, fileFingerprint(agent.BranchMetaPath(path)), path)
_ = c.recomputeTopicForSession(ctx, path, "repair")
@@ -544,39 +611,67 @@ func (c *Catalog) recomputeTopicForSession(ctx context.Context, path, reason str
}
// Rebuild replaces only the disposable catalog. Authoritative sessions and
-// sidecars are never changed or removed by this operation.
+// sidecars are never changed or removed by this operation. The live database
+// stays in place until a fully-populated replacement is validated and swapped.
func Rebuild(ctx context.Context, path string, targets []DirectoryTarget) (Status, error) {
if strings.TrimSpace(path) == "" {
path = DefaultPath()
}
- backup := path + ".reindex-backup"
- _ = os.Remove(backup)
- if err := os.Rename(path, backup); err != nil && !os.IsNotExist(err) {
+ if strings.TrimSpace(path) == "" {
+ catalog, err := Open(ctx, Options{InMemory: true, DisableRepair: true})
+ if err != nil {
+ return Status{}, err
+ }
+ for _, target := range targets {
+ if err := catalog.ReconcileDirectory(ctx, target); err != nil {
+ closeCtx, cancel := context.WithTimeout(context.Background(), time.Second)
+ _ = catalog.Close(closeCtx)
+ cancel()
+ return catalog.Status(), err
+ }
+ }
+ status := catalog.Status()
+ closeCtx, cancel := context.WithTimeout(context.Background(), time.Second)
+ _ = catalog.Close(closeCtx)
+ cancel()
+ return status, nil
+ }
+ err := projectiondb.Rebuild(ctx, projectiondb.OpenOptions{
+ Path: path,
+ MemoryName: "session-catalog-rebuild",
+ Migrations: sessionMigrations(),
+ }, func(ctx context.Context, db *sql.DB) error {
+ // Populate through a catalog that owns this temporary database handle
+ // without starting background repair workers.
+ temp := &Catalog{
+ db: db,
+ opts: Options{Path: path, DisableRepair: true, Now: time.Now, MissingGrace: defaultMissingGrace},
+ writeQueued: map[string]SessionRecord{},
+ directoryLocks: map[string]*sync.Mutex{},
+ stop: make(chan struct{}),
+ status: Status{State: StateReady, Mode: ModeDisk, Path: path},
+ }
+ temp.workerCtx, temp.workerCancel = context.WithCancel(ctx)
+ defer temp.workerCancel()
+ for _, target := range targets {
+ if err := temp.ReconcileDirectory(ctx, target); err != nil {
+ return err
+ }
+ }
+ return nil
+ })
+ if err != nil {
return Status{}, err
}
- for _, suffix := range []string{"-wal", "-shm"} {
- _ = os.Rename(path+suffix, backup+suffix)
- }
+ // Open the published replacement briefly for a status snapshot, then close.
catalog, err := Open(ctx, Options{Path: path, DisableRepair: true})
if err != nil {
- _ = os.Rename(backup, path)
- return Status{}, err
- }
- for _, target := range targets {
- if err := catalog.ReconcileDirectory(ctx, target); err != nil {
- closeCtx, cancel := context.WithTimeout(context.Background(), time.Second)
- _ = catalog.Close(closeCtx)
- cancel()
- return catalog.Status(), err
- }
+ return Status{State: StateReady, Mode: ModeDisk, Path: path}, nil
}
status := catalog.Status()
closeCtx, cancel := context.WithTimeout(context.Background(), time.Second)
_ = catalog.Close(closeCtx)
cancel()
- _ = os.Remove(backup)
- _ = os.Remove(backup + "-wal")
- _ = os.Remove(backup + "-shm")
return status, nil
}
@@ -587,12 +682,26 @@ func Inspect(ctx context.Context, path string) (Status, error) {
path = DefaultPath()
}
status := Status{State: StateDegraded, Mode: ModeDisk, Path: path}
- if _, err := os.Stat(path); err != nil {
- if os.IsNotExist(err) {
- status.LastError = "catalog does not exist"
- return status, nil
- }
- return status, err
+ if strings.TrimSpace(path) == "" {
+ status.LastError = "catalog path unavailable"
+ return status, nil
+ }
+ inspection := projectiondb.Inspect(ctx, path)
+ if inspection.Error != "" && !inspection.Exists {
+ status.LastError = inspection.Error
+ return status, nil
+ }
+ if !inspection.Exists {
+ status.LastError = "catalog does not exist"
+ return status, nil
+ }
+ if inspection.Integrity != "" && inspection.Integrity != "ok" {
+ status.LastError = inspection.Integrity
+ return status, nil
+ }
+ if inspection.Error != "" {
+ status.LastError = inspection.Error
+ return status, nil
}
u := &url.URL{Scheme: "file", Path: path}
db, err := sql.Open("sqlite", u.String()+"?mode=ro&_pragma=busy_timeout%28150%29")
@@ -600,14 +709,6 @@ func Inspect(ctx context.Context, path string) (Status, error) {
return status, err
}
defer db.Close()
- var integrity string
- if err := db.QueryRowContext(ctx, `PRAGMA integrity_check`).Scan(&integrity); err != nil {
- return status, err
- }
- if integrity != "ok" {
- status.LastError = integrity
- return status, nil
- }
status.State = StateReady
_ = db.QueryRowContext(ctx, `SELECT revision FROM catalog_state WHERE id=1`).Scan(&status.Revision)
_ = db.QueryRowContext(ctx, `SELECT COUNT(*) FROM catalog_sessions`).Scan(&status.Indexed)
diff --git a/internal/sessioncatalog/remote_fs_linux.go b/internal/sessioncatalog/remote_fs_linux.go
deleted file mode 100644
index f4eb51c22e..0000000000
--- a/internal/sessioncatalog/remote_fs_linux.go
+++ /dev/null
@@ -1,27 +0,0 @@
-//go:build linux
-
-package sessioncatalog
-
-import "syscall"
-
-const (
- nfsSuperMagic = 0x6969
- smbSuperMagic = 0x517B
- cifsSuperMagic = 0xFF534D42
- nfsdSuperMagic = 0x6E667364
- cephSuperMagic = 0x00C36400
- lustreSuperMagic = 0x0BD00BD0
-)
-
-func catalogFilesystemRemote(path string) bool {
- var stat syscall.Statfs_t
- if err := syscall.Statfs(path, &stat); err != nil {
- return false
- }
- switch uint64(stat.Type) {
- case nfsSuperMagic, smbSuperMagic, cifsSuperMagic, nfsdSuperMagic, cephSuperMagic, lustreSuperMagic:
- return true
- default:
- return false
- }
-}
diff --git a/internal/sessioncatalog/remote_fs_other.go b/internal/sessioncatalog/remote_fs_other.go
deleted file mode 100644
index 316cf362fd..0000000000
--- a/internal/sessioncatalog/remote_fs_other.go
+++ /dev/null
@@ -1,5 +0,0 @@
-//go:build !darwin && !linux && !windows
-
-package sessioncatalog
-
-func catalogFilesystemRemote(string) bool { return false }
diff --git a/internal/sessioncatalog/schema.go b/internal/sessioncatalog/schema.go
index 0eb3f777ff..659c57d1f4 100644
--- a/internal/sessioncatalog/schema.go
+++ b/internal/sessioncatalog/schema.go
@@ -3,8 +3,8 @@ package sessioncatalog
import (
"context"
"database/sql"
- "fmt"
- "time"
+
+ "reasonix/internal/projectiondb"
)
const migrationV1 = `
@@ -96,54 +96,15 @@ const migrationV2 = `
ALTER TABLE catalog_topics ADD COLUMN metadata_present INTEGER NOT NULL DEFAULT 0;
`
-func migrateSchema(ctx context.Context, db *sql.DB) error {
- if _, err := db.ExecContext(ctx, `CREATE TABLE IF NOT EXISTS schema_migrations (
- version INTEGER PRIMARY KEY,
- applied_at INTEGER NOT NULL
- )`); err != nil {
- return err
+func sessionMigrations() []projectiondb.Migration {
+ return []projectiondb.Migration{
+ {Version: 1, Apply: func(ctx context.Context, tx *sql.Tx) error {
+ _, err := tx.ExecContext(ctx, migrationV1)
+ return err
+ }},
+ {Version: 2, Apply: func(ctx context.Context, tx *sql.Tx) error {
+ _, err := tx.ExecContext(ctx, migrationV2)
+ return err
+ }},
}
- var version int
- if err := db.QueryRowContext(ctx, `SELECT COALESCE(MAX(version), 0) FROM schema_migrations`).Scan(&version); err != nil {
- return err
- }
- if version > SchemaVersion {
- return fmt.Errorf("session catalog schema %d is newer than supported %d", version, SchemaVersion)
- }
- if version < 1 {
- tx, err := db.BeginTx(ctx, nil)
- if err != nil {
- return err
- }
- if _, err := tx.ExecContext(ctx, migrationV1); err != nil {
- _ = tx.Rollback()
- return err
- }
- if _, err := tx.ExecContext(ctx, `INSERT INTO schema_migrations(version, applied_at) VALUES(1, ?)`, time.Now().UnixMilli()); err != nil {
- _ = tx.Rollback()
- return err
- }
- if err := tx.Commit(); err != nil {
- return err
- }
- version = 1
- }
- if version < 2 {
- tx, err := db.BeginTx(ctx, nil)
- if err != nil {
- return err
- }
- if _, err := tx.ExecContext(ctx, migrationV2); err != nil {
- _ = tx.Rollback()
- return err
- }
- if _, err := tx.ExecContext(ctx, `INSERT INTO schema_migrations(version, applied_at) VALUES(2, ?)`, time.Now().UnixMilli()); err != nil {
- _ = tx.Rollback()
- return err
- }
- if err := tx.Commit(); err != nil {
- return err
- }
- }
- return nil
}
diff --git a/internal/sessioncatalog/types.go b/internal/sessioncatalog/types.go
index e34acda2bd..351fe4f93d 100644
--- a/internal/sessioncatalog/types.go
+++ b/internal/sessioncatalog/types.go
@@ -5,6 +5,7 @@ package sessioncatalog
import (
"path/filepath"
+ "strings"
"time"
"reasonix/internal/config"
@@ -158,6 +159,13 @@ type TopicPage struct {
Revision uint64 `json:"revision"`
}
+// DefaultPath returns the disposable session catalog path under CacheDir.
+// When the OS cache directory is unavailable it returns "" so callers fall
+// back to an in-memory projection instead of writing into the project tree.
func DefaultPath() string {
- return filepath.Join(config.CacheDir(), "session-catalog", "v1.sqlite")
+ cache := strings.TrimSpace(config.CacheDir())
+ if cache == "" {
+ return ""
+ }
+ return filepath.Join(cache, "session-catalog", "v1.sqlite")
}