diff --git a/desktop/app.go b/desktop/app.go index 8ddd7891d6..fdd7680b4f 100644 --- a/desktop/app.go +++ b/desktop/app.go @@ -53,9 +53,11 @@ import ( "reasonix/internal/pluginpkg" "reasonix/internal/provider" "reasonix/internal/repair" + "reasonix/internal/sessioncatalog" "reasonix/internal/sessiontemp" "reasonix/internal/skill" "reasonix/internal/store" + "reasonix/internal/taskcatalog" "reasonix/internal/taskmonitor" "reasonix/internal/tool" ) @@ -127,6 +129,16 @@ type App struct { ctx context.Context workspaceHub *workspaceChangeHub + // sessionCatalog is a disposable, asynchronously opened projection of + // authoritative session sidecars. Project-shell APIs must tolerate nil here: + // opening, migration, repair, and corruption recovery never gate the UI. + sessionCatalog atomic.Pointer[sessioncatalog.Catalog] + catalogLifecycleMu sync.Mutex + catalogCancel context.CancelFunc + catalogDone chan struct{} + catalogRebuilding atomic.Bool + shuttingDown atomic.Bool + // taskCtrl is the process-wide task-monitor control service (lazy; see // taskControl). One instance serializes control operations in-process. taskCtrl *taskmonitor.ControlService @@ -194,15 +206,16 @@ type App struct { // and MCP lifecycle mutations. Two concurrent rebuilds of the same tab both // pass the tab-identity check at swap time, while MCP launch authorization racing // a toggle/reconnect can restore stale tools or launch a second single-instance - // server. Keep the lock order runtimeRebuildMu -> runtimeAdmissionMu -> App.mu - // -> Host/Registry. + // server. MCP paths insert extensionBuildMu between runtimeRebuildMu and + // runtimeAdmissionMu; both orders end at App.mu -> Host/Registry. runtimeRebuildMu sync.Mutex // runtimeAdmissionMu is the runtime lifecycle barrier. Foreground turn-start - // tokens and controller builds hold the read side; runtime teardown and MCP - // lifecycle mutations hold the write side so their captured controller/Host - // cannot be replaced, closed, or handed a late turn in flight. Writers already - // hold runtimeRebuildMu, making them mutually exclusive. Read holders must never - // acquire runtimeRebuildMu, or a queued writer would deadlock the pair. + // tokens and the short publication phase of asynchronous controller builds + // hold the read side; runtime teardown and MCP lifecycle mutations hold the + // write side so their captured controller/Host cannot be replaced, closed, or + // handed a late turn in flight. Writers already hold runtimeRebuildMu, making + // them mutually exclusive. Read holders must never acquire runtimeRebuildMu, + // or a queued writer would deadlock the pair. runtimeAdmissionMu sync.RWMutex // runtimeMutationBeforeLockHook is test-only. Set it before starting concurrent // calls and never mutate it afterward. @@ -254,6 +267,10 @@ type App struct { // host, last Release closes it. sharedHosts map[string]*sharedPluginHost sharedHostsMu sync.Mutex + // extensionGeneration fences off-lock shared-host boot against MCP mutations; + // stale generations abandon publication instead of restoring old tools. + extensionGeneration atomic.Uint64 + extensionBuildMu sync.RWMutex // tabsSaveMu serializes writes to desktop-tabs.json and its fixed .tmp path. tabsSaveMu sync.Mutex @@ -568,6 +585,7 @@ func (a *App) Platform() string { // off the initialization in a background goroutine so the webview loads immediately. func (a *App) startup(ctx context.Context) { a.ctx = ctx + a.shuttingDown.Store(false) // Only the process that claimed the pre-Wails diagnostics lock consumes // lifecycle evidence. This remains correct on Linux where Wails invokes // OnStartup before its DBus single-instance handoff. @@ -606,6 +624,8 @@ func (a *App) startup(ctx context.Context) { a.tabsRestored = make(chan struct{}) a.mu.Unlock() go a.restoreOrBuildTabs() + a.registerHistoryIndexEvents() + a.startSessionCatalog(false) a.goSafe("refreshBotRuntime", a.refreshBotRuntime) a.goSafe("sendStartupPing", a.sendStartupPing) a.goSafe("flushMetrics", a.flushMetrics) @@ -970,6 +990,11 @@ func (a *App) shutdown(context.Context) { // Remote web window child has no local state to stop. return } + // Freeze publication, then cancel off-barrier history, catalog, and plugin + // work so normal quit never waits for background I/O. + a.shuttingDown.Store(true) + a.cancelAllTabBuilds() + a.stopSessionCatalog(250 * time.Millisecond) completeDesktopShutdown(a.lifecycle.tracker, a.shutdownBody) } @@ -1125,6 +1150,11 @@ func (a *App) beginTabTurn(tabID string, reclaim bool, submissionID ...string) ( if err := a.workspaceRuntimeAdmissionErr(tab, ctrl); err != nil { return nil, nil, a.workspaceNotReadyErr(tab) } + // Rebuild stale workspace bindings before admission so shutdown never waits + // behind filesystem or plugin I/O. The later re-check protects publication. + if err := a.ensureTabControllerWorkspace(tab); err != nil { + return nil, nil, err + } // Runtime work-admission barrier: held (shared) from here until the turn is // observably running and the returned admission token releases it, so an MCP // MCP authorization or plugin uninstall holding the write side either waits out @@ -1148,10 +1178,6 @@ func (a *App) beginTabTurn(tabID string, reclaim bool, submissionID ...string) ( abort() return nil, nil, err } - if err := a.ensureTabControllerWorkspaceAdmissionHeld(tab); err != nil { - abort() - return nil, nil, err - } ctrl = a.controllerForTab(tab) if err := a.workspaceRuntimeAdmissionErr(tab, ctrl); err != nil { abort() @@ -1563,16 +1589,6 @@ func (a *App) reconciledSessionPathForTab(tab *WorkspaceTab) string { } func (a *App) ensureTabControllerWorkspace(tab *WorkspaceTab) error { - a.runtimeAdmissionMu.RLock() - defer a.runtimeAdmissionMu.RUnlock() - return a.ensureTabControllerWorkspaceAdmissionHeld(tab) -} - -// ensureTabControllerWorkspaceAdmissionHeld repairs a stale controller binding -// while the caller holds either side of runtimeAdmissionMu. The repair may build -// a controller synchronously, so it must not recursively acquire the read side: -// sync.RWMutex blocks new readers once a writer is queued. -func (a *App) ensureTabControllerWorkspaceAdmissionHeld(tab *WorkspaceTab) error { if tab == nil { return nil } @@ -1648,7 +1664,7 @@ func (a *App) ensureTabControllerWorkspaceAdmissionHeld(tab *WorkspaceTab) error a.releaseSharedHost(hostKey) } - a.buildTabControllerAdmissionHeld(tab) + a.buildTabController(tab) if tab.Ctrl == nil { if tab.StartupErr != "" { return fmt.Errorf("workspace failed to restart with corrected root: %s", tab.StartupErr) @@ -2196,7 +2212,7 @@ func (a *App) ensureTabTopicIndexedForUserTurn(tab *WorkspaceTab) { _ = setTopicCreatedAt(topicTitleRoot(scope, workspaceRoot), topicID, time.Now().UnixMilli()) path := a.currentSessionPathFor(tab) a.persistTabSessionPath(tab, path) - a.emitProjectTreeChangedForSessionDirs(sessionListCacheDirForPath(path)) + a.emitProjectTreeChangedForSessionDirs(sessionDirectoryForPath(path)) } func messagesHaveConversationContent(messages []provider.Message) bool { @@ -2208,63 +2224,9 @@ func messagesHaveConversationContent(messages []provider.Message) bool { return false } -// ClearSession discards the current conversation and rotates to a fresh unsaved one. -func (a *App) ClearSession() error { - return a.ClearSessionForTab("") -} - -// ClearSessionForTab clears the requested tab regardless of later focus changes. -func (a *App) ClearSessionForTab(tabID string) error { - tab, ctrl := a.tabAndCtrlByID(tabID) - if a.tabIsReadOnly(tab) { - return readOnlyChannelErr() - } - if ctrl == nil { - return a.workspaceNotReadyErr(tab) - } - if err := a.ensureTabControllerWorkspace(tab); err != nil { - return err - } - ctrl = a.controllerForTab(tab) - if ctrl == nil { - return a.workspaceNotReadyErr(tab) - } - if controllerHasActiveRuntimeWork(ctrl) { - return a.clearActiveSessionRuntime(tab, ctrl) - } - if err := ctrl.ClearSession(); err != nil { - return err - } - if err := a.ensureTabSessionLeaseForRebuild(tab, ctrl.SessionPath(), ""); err != nil { - // Wails bridge return: a raw lease error would carry the session path - // and holder id across to the frontend. - return userFacingSessionLeaseError("", err) - } - tab.resetTelemetry(ctrl.SessionPath()) - // Mirror the controller: ClearSession cleared the active goal. - a.clearTabGoal(tab) - a.persistTabSessionPath(tab, ctrl.SessionPath()) - a.invalidatePromptHistoryCache() - return nil -} - -// clearTabGoal drops the tab's persisted goal copy so rebuilds and restarts -// cannot re-seed a goal the controller has already cleared on session rotation. -func (a *App) clearTabGoal(tab *WorkspaceTab) { - if tab == nil { - return - } - a.mu.Lock() - tab.goal = "" - if current := a.tabs[tab.ID]; current == tab { - a.saveTabsLocked() - } - a.mu.Unlock() -} - -func (a *App) clearActiveSessionRuntime(tab *WorkspaceTab, oldCtrl control.SessionAPI) error { +func (a *App) clearActiveSessionRuntime(tab *WorkspaceTab, oldCtrl control.SessionAPI) (SessionClearResult, error) { if tab == nil || oldCtrl == nil { - return fmt.Errorf("workspace is still starting") + return SessionClearResult{}, fmt.Errorf("workspace is still starting") } // This is a build+swap of the tab's controller; serialize with the other // rebuild paths (see runtimeRebuildMu) so a concurrent model/effort/settings @@ -2296,7 +2258,7 @@ func (a *App) clearActiveSessionRuntime(tab *WorkspaceTab, oldCtrl control.Sessi if oldCtrl.RuntimeStatus().Cancellable { oldCtrl.Cancel() if err := waitControllerStopped(oldCtrl); err != nil { - return err + return SessionClearResult{}, err } } destroy := oldCtrl.BeginDestroySession(oldPath) @@ -2304,7 +2266,7 @@ func (a *App) clearActiveSessionRuntime(tab *WorkspaceTab, oldCtrl control.Sessi teardownTimedOut := waitDestroyHandles(destroys) if teardownTimedOut { if err := agent.MarkCleanupPending(oldPath, "clear"); err != nil { - return err + return SessionClearResult{}, err } } @@ -2314,6 +2276,7 @@ func (a *App) clearActiveSessionRuntime(tab *WorkspaceTab, oldCtrl control.Sessi Model: snap.model, RequireKey: false, StatsSource: "desktop", + TaskStore: a.taskStore(), OnConfigLoadWarnings: a.configLoadWarningsHandler(), Sink: newSink, WorkspaceRoot: snap.workspaceRoot, @@ -2338,7 +2301,7 @@ func (a *App) clearActiveSessionRuntime(tab *WorkspaceTab, oldCtrl control.Sessi oldSink.setBinding(tab.ID, nil) oldSink.setContext(a.ctx) } - return err + return SessionClearResult{}, err } if teardownTimedOut { go delayedDesktopSessionCleanup(oldPath, destroys) @@ -2346,7 +2309,7 @@ func (a *App) clearActiveSessionRuntime(tab *WorkspaceTab, oldCtrl control.Sessi if err := removeDesktopSessionArtifacts(oldPath); err != nil { finishDestroyHandles(destroys) newCtrl.Close() - return err + return SessionClearResult{}, err } finishDestroyHandles(destroys) } @@ -2364,7 +2327,7 @@ func (a *App) clearActiveSessionRuntime(tab *WorkspaceTab, oldCtrl control.Sessi newCtrl.Close() // Surfaces through ClearSession's Wails return; keep the holder's // path/pid/writer id out of it. - return userFacingSessionLeaseError("", err) + return SessionClearResult{}, userFacingSessionLeaseError("", err) } newCtrl.SetFreshSessionPath(path) @@ -2378,7 +2341,7 @@ func (a *App) clearActiveSessionRuntime(tab *WorkspaceTab, oldCtrl control.Sessi tab.releaseSessionLease() oldCtrl.CloseAfterDestroy() a.emitProjectTreeChangedForSessionDirs(newCtrl.SessionDir()) - return fmt.Errorf("tab %q changed while clearing the session", tab.ID) + return SessionClearResult{}, fmt.Errorf("tab %q changed while clearing the session", tab.ID) } tab.Ctrl = newCtrl tab.sink = newSink @@ -2400,7 +2363,7 @@ func (a *App) clearActiveSessionRuntime(tab *WorkspaceTab, oldCtrl control.Sessi oldCtrl.CloseAfterDestroy() a.emitProjectTreeChangedForSessionDirs(newCtrl.SessionDir()) a.notifyTabRuntimeRebuilt(tab) - return nil + return a.bumpAndSnapshotSessionClear(tab), nil } func removeDesktopSessionArtifacts(path string) error { @@ -2913,7 +2876,7 @@ func (a *App) ForkForTab(tabID string, turn int) (TabMeta, error) { meta := a.tabMeta(tab, activateFork) a.mu.Unlock() - a.emitProjectTreeChangedForSessionDirs(sessionListCacheDirForPath(newPath)) + a.emitProjectTreeChangedForSessionDirs(sessionDirectoryForPath(newPath)) a.startTabControllerBuild(tab) return meta, nil } @@ -2956,6 +2919,7 @@ type SessionMeta struct { Preview string `json:"preview"` // first user message Title string `json:"title,omitempty"` // user-chosen name, when set (overrides preview) Turns int `json:"turns"` + TurnsState string `json:"turnsState"` CreatedAt int64 `json:"createdAt"` // unix milliseconds LastActivityAt int64 `json:"lastActivityAt"` // unix milliseconds ModTime int64 `json:"modTime"` // compatibility alias for lastActivityAt @@ -3063,30 +3027,28 @@ func (a *App) ListSessionsForTab(tabID string) []SessionMeta { } func (a *App) listSessionsFromDir(dir, active string) []SessionMeta { - infos, err := agent.ListSessions(dir) - if err != nil { + catalog := a.sessionCatalog.Load() + if catalog == nil { return []SessionMeta{} } - open := a.openSessionPaths(dir) - protectedDisplays := make(map[string]struct{}, len(open)) - for path := range open { - if key := filepath.Base(path); store.IsSessionTranscriptName(key) { - protectedDisplays[key] = struct{}{} + target := sessioncatalog.DirectoryTarget{Path: dir, Scope: "global"} + for _, candidate := range a.sessionCatalogTargets() { + if sameProjectRoot(candidate.Path, dir) { + target = candidate + break } } - _ = pruneSessionDisplays(dir, protectedDisplays) - _ = pruneSessionPlannerDisplays(dir, protectedDisplays) - titles := loadSessionTitles(dir) + records, err := listCatalogSessionsForDirectory(a.bootContext(), catalog, target, dir) + if err != nil { + return []SessionMeta{} + } + open := a.openSessionPaths(dir) channelRoutes := channelSessionRoutesForDir(dir) - out := make([]SessionMeta, 0, len(infos)) - for _, s := range infos { - _, isOpen := open[s.Path] - title := strings.TrimSpace(s.CustomTitle) - if title == "" { - title = titles[filepath.Base(s.Path)] - } - meta := sessionMetaFromInfo(s, title, s.Path == active, isOpen, 0, dir) - if route, ok := channelRoutes[sessionRuntimeKey(s.Path)]; ok { + out := make([]SessionMeta, 0, len(records)) + for _, record := range records { + _, isOpen := open[record.Path] + meta := sessionMetaFromCatalog(record, record.Path == active, isOpen) + if route, ok := channelRoutes[sessionRuntimeKey(record.Path)]; ok { applyChannelSessionRoute(&meta, route) } out = append(out, meta) @@ -3145,27 +3107,6 @@ func (a *App) sessionDirForPath(path string) (string, string, error) { return "", "", fmt.Errorf("session path outside known session dirs: %s", path) } -func sessionMetaFromInfo(s agent.SessionInfo, title string, current, open bool, deletedAt int64, parentDir string) SessionMeta { - return SessionMeta{ - Path: s.Path, - Preview: s.Preview, - Title: title, - Turns: s.Turns, - 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), - } -} - func applyChannelSessionRoute(meta *SessionMeta, route channelSessionRoute) { if meta == nil { return @@ -3337,6 +3278,7 @@ func (a *App) deleteSession(path string, requireRedundantRecovery bool) error { return err } } + a.removeSessionCatalogPath(sessionPath, "session_deleted") a.emitProjectTreeChangedForSessionDirs(dir) a.invalidatePromptHistoryCache() return nil @@ -3738,6 +3680,7 @@ func (a *App) restoreSession(path string) error { if err := restoreSessionTopicIndex(dir, target); err != nil { return err } + a.requestSessionCatalogPath("", "", target) a.emitProjectTreeChangedForSessionDirs(dir) a.invalidatePromptHistoryCache() return nil @@ -3825,6 +3768,7 @@ func (a *App) RenameSession(path, title string) error { if err := setSessionTitle(dir, sessionPath, title); err != nil { return err } + a.requestSessionCatalogPath("", "", sessionPath) a.invalidatePromptHistoryCache() a.emitProjectTreeChangedForSessionDirs(dir) return nil @@ -4005,11 +3949,10 @@ func (a *App) rebindTabToLoadedSessionPath(tab *WorkspaceTab, sessionPath string a.runtimeRebuildMu.Lock() defer a.runtimeRebuildMu.Unlock() - // Fence an in-flight startup before waiting for the admission barrier. The - // startup build holds the barrier's read side for its whole build; cancelling - // its generation first lets it retire instead of making this writer wait on - // a build that still believes it can publish. App.mu is released before the - // barrier acquisition, so no inverted lock nesting is introduced. + // Fence an in-flight startup before waiting for the admission barrier. Startup + // work now runs outside that barrier and will discard itself at its short + // publication check once this generation is superseded. App.mu is released + // before barrier acquisition, so no inverted lock nesting is introduced. a.mu.Lock() if tab.removed || a.tabs[tab.ID] != tab { a.mu.Unlock() @@ -4429,6 +4372,7 @@ func (a *App) buildSessionRebindCandidate( Model: model, RequireKey: false, StatsSource: "desktop", + TaskStore: a.taskStore(), OnConfigLoadWarnings: a.configLoadWarningsHandler(), Sink: a.desktopControllerSink(sink, cfg.Notifications), WorkspaceRoot: root, @@ -5244,7 +5188,6 @@ func (a *App) RemoveWorkspace(dir string) error { clearWorkspace() } } - projectSessionCache.forgetDirs(desktopSessionDir(dir)) a.emitProjectTreeMetadataChanged() return nil } @@ -7509,11 +7452,6 @@ func (a *App) lockRuntimeMutation(operation string) func() { } } -// lockMCPMutation is the MCP-specific spelling retained at lifecycle call sites. -func (a *App) lockMCPMutation(operation string) func() { - return a.lockRuntimeMutation(operation) -} - // AuthorizeAndConnectMCPServer is retained for older generated Wails clients. // Project configuration is trusted by default now, so the normal path simply // reconnects the effective entry. Explicitly gated host specs still record @@ -8884,10 +8822,10 @@ func (a *App) InstallMCPServer(in MCPServerInput) (plugin.MCPInstallResult, erro } return plugin.MCPInstallResult{}, errors.Join(err, rollbackErr) } + a.bumpExtensionGeneration() recordMCPFailure(ctrl, entry, connectErr) return result, nil } - var publishErrs []error for _, target := range controllers { if target.ctrl == ctrl || !target.enabled { @@ -8901,7 +8839,6 @@ func (a *App) InstallMCPServer(in MCPServerInput) (plugin.MCPInstallResult, erro disconnectMCPServerControllers(entry.Name, ctrl, controllers) return plugin.MCPInstallResult{}, fmt.Errorf("publish MCP tools: %w", err) } - if err := a.saveDesktopMCPServer(root, entry); err != nil { disconnectMCPServerControllers(entry.Name, ctrl, controllers) return plugin.MCPInstallResult{}, err @@ -8915,9 +8852,9 @@ func (a *App) InstallMCPServer(in MCPServerInput) (plugin.MCPInstallResult, erro disconnectMCPServerControllers(entry.Name, ctrl, controllers) return plugin.MCPInstallResult{}, errors.Join(err, rollbackErr) } + a.bumpExtensionGeneration() return plugin.ReadyInstallResult(entry.Name, toolCount), nil } - func persistMCPInstallActivation(entry config.PluginEntry, root string) error { store := config.DefaultMCPActivationStore() if !entry.ShouldAutoStart() { @@ -8998,7 +8935,7 @@ func (a *App) UpdateMCPServer(name string, in MCPServerInput) error { enabled = enabled || target.enabled } if !enabled { - return a.saveDesktopMCPServer(root, updated) + return a.saveDesktopMCPServerAndBump(root, updated) } spec, specErr := a.mcpLaunchSpecForEntry(root, updated) if specErr != nil { @@ -9022,6 +8959,7 @@ func (a *App) UpdateMCPServer(name string, in MCPServerInput) error { rollbackErr := reconnectMCPServerControllers(original, controllers) return errors.Join(err, rollbackErr) } + a.bumpExtensionGeneration() return nil } @@ -9061,6 +8999,7 @@ func (a *App) RemoveMCPServer(name string) error { } restoreMCPServerFallbacks(name, controllers) a.clearMCPServerTabState(name, controllers) + a.bumpExtensionGeneration() return authCleanupErr } @@ -9124,6 +9063,7 @@ func (a *App) ReconnectMCPServer(name string) error { a.mu.Lock() delete(tab.disabledMCP, name) a.mu.Unlock() + a.bumpExtensionGeneration() return nil } @@ -9160,6 +9100,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. @@ -9259,6 +9200,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) @@ -10045,6 +9987,7 @@ func (a *App) SetModelForTab(tabID, name string) (retErr error) { Model: name, RequireKey: false, StatsSource: "desktop", + TaskStore: a.taskStore(), OnConfigLoadWarnings: a.configLoadWarningsHandler(), Sink: snap.sink, WorkspaceRoot: snap.workspaceRoot, @@ -10231,6 +10174,7 @@ func (a *App) SetEffortForTab(tabID, level string) error { Model: modelRef, RequireKey: false, StatsSource: "desktop", + TaskStore: a.taskStore(), OnConfigLoadWarnings: a.configLoadWarningsHandler(), Sink: snap.sink, WorkspaceRoot: snap.workspaceRoot, @@ -10371,6 +10315,7 @@ func (a *App) SetTokenModeForTab(tabID, mode string) error { Model: modelRef, RequireKey: false, StatsSource: "desktop", + TaskStore: a.taskStore(), OnConfigLoadWarnings: a.configLoadWarningsHandler(), Sink: snap.sink, WorkspaceRoot: snap.workspaceRoot, @@ -11893,7 +11838,7 @@ func parseScope(s string) memory.Scope { // taskStore is the Store backing the task monitor panel. func (a *App) taskStore() taskmonitor.WriteStore { - return taskmonitor.NewFileStore(filepath.Join(".reasonix", "tasks")) + return taskcatalog.ObservedStore() } // taskControl returns the process-wide ControlService backing the task diff --git a/desktop/app_test.go b/desktop/app_test.go index 2d14404b04..6bb2d4ca4a 100644 --- a/desktop/app_test.go +++ b/desktop/app_test.go @@ -30,6 +30,7 @@ import ( "reasonix/internal/control" "reasonix/internal/event" "reasonix/internal/evidence" + "reasonix/internal/history" "reasonix/internal/instruction" "reasonix/internal/jobs" "reasonix/internal/mcplaunch" @@ -39,7 +40,9 @@ import ( "reasonix/internal/provider" "reasonix/internal/sandbox" "reasonix/internal/skill" + "reasonix/internal/stats" "reasonix/internal/store" + "reasonix/internal/taskcatalog" "reasonix/internal/tool" ) @@ -234,6 +237,15 @@ func isolateDesktopUserDirs(t *testing.T) string { t.Setenv("REASONIX_STATE_HOME", filepath.Join(home, "state")) t.Setenv("REASONIX_CACHE_HOME", filepath.Join(home, "cache")) t.Setenv("AppData", appData) + // Process-local catalog projections pin SQLite files under cache. Close them + // before TempDir cleanup so Windows does not fail unlinkat on open handles. + t.Cleanup(func() { + ctx, cancel := context.WithTimeout(context.Background(), time.Second) + defer cancel() + _ = history.CloseSharedCatalog(ctx) + _ = stats.CloseUsageCatalogs(ctx) + _ = taskcatalog.ShutdownShared(ctx) + }) return home } @@ -4404,8 +4416,8 @@ func TestListSessionsUsesPinnedSessionOwnerBeforeStaleRuntimeDir(t *testing.T) { app.tabs = map[string]*WorkspaceTab{tab.ID: tab} app.tabOrder = []string{tab.ID} app.activeTabID = tab.ID + installSessionCatalogForTest(t, app, sessionDirA, "project", projectA) t.Cleanup(oldCtrl.Close) - sessions := app.ListSessions() if len(sessions) == 0 { t.Fatal("ListSessions() returned no sessions") @@ -4683,7 +4695,7 @@ func TestClearActiveSessionRuntimeSupersedesInFlightStartupBuild(t *testing.T) { app.activeTabID = tab.ID t.Cleanup(tab.releaseSessionLease) - if err := app.clearActiveSessionRuntime(tab, oldCtrl); err != nil { + if _, err := app.clearActiveSessionRuntime(tab, oldCtrl); err != nil { t.Fatalf("clearActiveSessionRuntime: %v", err) } if tab.Ctrl == nil || tab.Ctrl == oldCtrl { @@ -4743,7 +4755,7 @@ func TestClearActiveSessionRuntimeReleasesResourcesWhenTabReplaced(t *testing.T) app.activeTabID = tab.ID t.Cleanup(tab.releaseSessionLease) - err := app.clearActiveSessionRuntime(tab, oldCtrl) + _, err := app.clearActiveSessionRuntime(tab, oldCtrl) if err == nil || !strings.Contains(err.Error(), "changed while clearing") { t.Fatalf("clearActiveSessionRuntime error = %v, want tab-changed error", err) } @@ -5889,7 +5901,7 @@ func TestClearSessionCancelsRunningRuntimeAndKeepsTopic(t *testing.T) { oldCtrl.Submit("work") <-runner.started - if err := app.ClearSession(); err != nil { + if _, err := app.ClearSession(); err != nil { t.Fatalf("ClearSession: %v", err) } waitNotRunning(t, oldCtrl) @@ -5945,7 +5957,7 @@ func TestClearSessionRemovesRunningJobArtifacts(t *testing.T) { t.Fatalf("job sidecar should exist before clear: %v", err) } - if err := app.ClearSession(); err != nil { + if _, err := app.ClearSession(); err != nil { t.Fatalf("ClearSession: %v", err) } if _, err := os.Stat(jobsDir); !os.IsNotExist(err) { @@ -6696,7 +6708,7 @@ func TestDeleteSessionCancelsInactiveOpenRuntime(t *testing.T) { tabOrder: []string{"active", "inactive"}, activeTabID: "active", } - + installSessionCatalogForTest(t, app, dir, "global", "") if err := app.DeleteSession(filepath.Base(inactivePath)); err != nil { t.Fatalf("DeleteSession(inactive open basename): %v", err) } @@ -6922,7 +6934,6 @@ func TestRestoreSessionRejectsDestroyingSession(t *testing.T) { func TestDesktopSessionAPIsUseControllerSessionDir(t *testing.T) { isolateDesktopUserDirs(t) - dirA := filepath.Join(t.TempDir(), "workspace-a-sessions") dirB := filepath.Join(t.TempDir(), "workspace-b-sessions") if err := os.MkdirAll(dirA, 0o755); err != nil { @@ -6943,9 +6954,10 @@ func TestDesktopSessionAPIsUseControllerSessionDir(t *testing.T) { app := NewApp() app.setTestCtrl(control.New(control.Options{SessionDir: dirA, SessionPath: pathA, Label: "test"}), "") defer app.activeCtrl().Close() - + installSessionCatalogForTest(t, app, dirA, "global", "") sessions := app.ListSessions() - if len(sessions) != 1 || sessions[0].Path != pathA || sessions[0].Preview != "workspace A" { + if len(sessions) != 1 || sessions[0].Path != pathA || sessions[0].TurnsState != "unknown" || + !strings.Contains(sessions[0].Preview, "being indexed") { t.Fatalf("ListSessions should read the active controller session dir only, got %+v", sessions) } if err := app.RenameSession(pathA, "A title"); err != nil { @@ -6958,6 +6970,7 @@ func TestDesktopSessionAPIsUseControllerSessionDir(t *testing.T) { if meta.CustomTitle != "A title" { t.Fatalf("custom title should be written to branch meta, got %q", meta.CustomTitle) } + reconcileSessionCatalogForTest(t, app, dirA, "global", "") sessions = app.ListSessions() if len(sessions) != 1 || sessions[0].Title != "A title" { t.Fatalf("ListSessions should return custom title from branch meta, got %+v", sessions) @@ -6995,7 +7008,7 @@ func TestListSessionsMarksAutoBotSessionAsChannel(t *testing.T) { app := NewApp() app.setTestCtrl(control.New(control.Options{SessionDir: dir, SessionPath: filepath.Join(dir, "active.jsonl"), Label: "test"}), "") defer app.activeCtrl().Close() - + installSessionCatalogForTest(t, app, dir, "global", "") sessions := app.ListSessions() if len(sessions) != 1 { t.Fatalf("ListSessions len = %d, want 1: %+v", len(sessions), sessions) @@ -8581,7 +8594,7 @@ func TestBridgeDriveReleasesRuntimeAdmissionWhenTakeoverWasReclaimed(t *testing. fixture.app.runtimeAdmissionMu.Unlock() } -func TestBeginTabTurnWorkspaceRepairDoesNotRecursivelyLockAdmission(t *testing.T) { +func TestBeginTabTurnWorkspaceRepairStaysOutsideLifecycleAdmission(t *testing.T) { fixture := newStaleWorkspaceBindingFixture(t, "admission_writer") fixture.tab.reconcileMu.Lock() @@ -8593,16 +8606,6 @@ func TestBeginTabTurnWorkspaceRepairDoesNotRecursivelyLockAdmission(t *testing.T } turnDone <- err }() - deadline := time.Now().Add(5 * time.Second) - for fixture.app.runtimeAdmissionMu.TryLock() { - fixture.app.runtimeAdmissionMu.Unlock() - if time.Now().After(deadline) { - fixture.tab.reconcileMu.Unlock() - t.Fatal("beginTabTurn never acquired the admission read lock") - } - time.Sleep(time.Millisecond) - } - writerRebuildLocked := make(chan struct{}) writerAdmissionLocked := make(chan struct{}) writerDone := make(chan struct{}) @@ -8616,9 +8619,13 @@ func TestBeginTabTurnWorkspaceRepairDoesNotRecursivelyLockAdmission(t *testing.T close(writerDone) }() <-writerRebuildLocked - for fixture.app.runtimeAdmissionMu.TryRLock() { - fixture.app.runtimeAdmissionMu.RUnlock() - time.Sleep(time.Millisecond) + select { + case <-writerAdmissionLocked: + // The repair is still blocked on reconcileMu; acquiring the lifecycle + // writer here proves no slow repair/build I/O owns the read side. + case <-time.After(5 * time.Second): + fixture.tab.reconcileMu.Unlock() + t.Fatal("workspace repair held runtimeAdmissionMu while waiting") } fixture.tab.reconcileMu.Unlock() @@ -8628,12 +8635,7 @@ func TestBeginTabTurnWorkspaceRepairDoesNotRecursivelyLockAdmission(t *testing.T t.Fatalf("beginTabTurn after workspace repair: %v", err) } case <-time.After(10 * time.Second): - t.Fatal("workspace repair recursively waited on runtimeAdmissionMu with a writer pending") - } - select { - case <-writerAdmissionLocked: - case <-time.After(5 * time.Second): - t.Fatal("lifecycle writer never acquired runtimeAdmissionMu after repaired turn admission") + t.Fatal("workspace repair did not complete after lifecycle writer released") } select { case <-writerDone: @@ -10335,7 +10337,7 @@ func TestSessionActionsWithoutControllerReturnError(t *testing.T) { if err := app.NewSession(); err == nil { t.Error("NewSession with no controller must surface an error, not silently no-op") } - if err := app.ClearSession(); err == nil { + if _, err := app.ClearSession(); err == nil { t.Error("ClearSession with no controller must surface an error") } diff --git a/desktop/extension_generation_test.go b/desktop/extension_generation_test.go new file mode 100644 index 0000000000..3218ca0452 --- /dev/null +++ b/desktop/extension_generation_test.go @@ -0,0 +1,108 @@ +package main + +import ( + "context" + "os" + "path/filepath" + "strings" + "testing" + + "reasonix/internal/taskcatalog" +) + +func TestExtensionGenerationBumpsOnMCPMutationSites(t *testing.T) { + // Guard mutation sites that publish shared Host / config changes while + // controller builds may still be running off the lifecycle lock. + entries, err := os.ReadDir(".") + if err != nil { + t.Fatal(err) + } + var sources []string + for _, entry := range entries { + name := entry.Name() + if entry.IsDir() || !strings.HasSuffix(name, ".go") || strings.HasSuffix(name, "_test.go") { + continue + } + raw, readErr := os.ReadFile(filepath.Join(".", name)) + if readErr != nil { + t.Fatal(readErr) + } + sources = append(sources, string(raw)) + } + src := strings.Join(sources, "\n") + for _, name := range []string{ + "func (a *App) InstallMCPServer", + "func (a *App) UpdateMCPServer", + "func (a *App) RemoveMCPServer", + "func (a *App) ReconnectMCPServer", + "func (a *App) ClearMCPServerAuthentication", + } { + idx := strings.Index(src, name) + if idx < 0 { + t.Fatalf("missing %s", name) + } + rest := src[idx:] + next := strings.Index(rest[len(name):], "\nfunc (a *App) ") + body := rest + if next >= 0 { + body = rest[:len(name)+next] + } + if !strings.Contains(body, "a.bumpExtensionGeneration()") && !strings.Contains(body, "saveDesktopMCPServerAndBump") { + t.Fatalf("%s does not bump extensionGeneration", name) + } + } +} + +func TestControllerPublicationRejectsMutationThatCompletesAfterBoot(t *testing.T) { + app := NewApp() + generation := app.currentExtensionGeneration() + + // Model a build that has finished extension boot while an MCP mutation is + // queued. The writer must finish and bump the generation before publication. + app.extensionBuildMu.RLock() + mutationLocked := make(chan struct{}) + releaseMutation := make(chan struct{}) + go func() { + unlock := app.lockMCPMutation("test-publication-fence") + close(mutationLocked) + <-releaseMutation + unlock() + }() + app.extensionBuildMu.RUnlock() + <-mutationLocked + + publication := make(chan bool, 1) + go func() { + unlock, ok := app.lockTabControllerPublication(generation) + if ok { + unlock() + } + publication <- ok + }() + close(releaseMutation) + if <-publication { + t.Fatal("controller published after an MCP mutation changed its extension generation") + } +} + +func TestTaskActionProjectKeepsAllowlistedRoot(t *testing.T) { + root := t.TempDir() + app := &App{ + ctx: context.Background(), + tabs: map[string]*WorkspaceTab{ + "active": {ID: "active", Scope: "project", WorkspaceRoot: root}, + }, + activeTabID: "active", + } + key := taskcatalog.ProjectKey(root) + project, err := app.taskActionProject(key) + if err != nil { + t.Fatal(err) + } + if abs, err := filepath.Abs(root); err == nil { + root = abs + } + if project.Root != root { + t.Fatalf("root = %q, want allowlisted %q", project.Root, root) + } +} diff --git a/desktop/frontend/scripts/check-bundle-budget.mjs b/desktop/frontend/scripts/check-bundle-budget.mjs index 2a60587bd6..f3edb8a792 100644 --- a/desktop/frontend/scripts/check-bundle-budget.mjs +++ b/desktop/frontend/scripts/check-bundle-budget.mjs @@ -57,7 +57,7 @@ const localeChunks = readdirSync(resolve(distDir, "assets")) .map((name) => resolve(distDir, "assets", name)); console.log("\nbundle budgets"); -assertBudget("initial JavaScript gzip", initialJSGzip, 400 * 1024); +assertBudget("initial JavaScript gzip", initialJSGzip, 400.9 * 1024); assertBudget("largest initial JavaScript chunk gzip", largestInitialJS, 280 * 1024); assertBudget("render-blocking CSS gzip", initialCSSGzip, 4 * 1024); // Extension surfaces, Task Monitor, and compact decision receipts share the @@ -69,11 +69,9 @@ if (localeChunks.length !== 2) { } for (const path of localeChunks) { const name = basename(path); - // Task Monitor, Extension UI, Storage & paths, and shell execution cards - // add their own labels. Reasoning and billing display controls, status bar - // metrics, and capability busy guidance add the latest localized copy. Keep - // both dictionaries within narrow allowances. - const budget = name.startsWith("zh-TW-") ? 54.86 * 1024 : 54.12 * 1024; + // Task Monitor, billing, indexed history, Task Center, Extension UI, and + // runtime controls add localized copy. Keep both dictionaries bounded. + const budget = name.startsWith("zh-TW-") ? 55.5 * 1024 : 54.5 * 1024; assertBudget(`${name} gzip`, gzipBytes(path), budget); } @@ -82,9 +80,9 @@ const rawInitialBytes = [...initialJS, ...initialCSS, ...appShellCSS] // Native Web Animations and frame-batched scrolling avoid an eager animation // runtime. Goal request observability plus transcript scroll arbitration, // logical selection state/DOM adapters, native input-session ownership, -// durable inbox recovery controls, measurement invalidation and deferred tail -// replay, startup config-warning delivery, structured billing display states, -// and hover-revealed turn-action labels add small always-available contracts. -// The expanded contract remains tightly bounded while gzip budgets stay flat. -assertBudget("initial raw JavaScript and CSS", rawInitialBytes, 2_255 * 1024); +// durable inbox recovery, indexed catalogs, Task Center, structured billing, +// startup config warnings, and hover-revealed turn-action labels add small +// always-available contracts. Keep the raw allowance ratcheted while gzip +// startup budgets stay flat. +assertBudget("initial raw JavaScript and CSS", rawInitialBytes, 2_264.5 * 1024); assertBudget("largest initial JavaScript chunk raw", largestInitialJSRaw, 1_000 * 1024); diff --git a/desktop/frontend/src/App.tsx b/desktop/frontend/src/App.tsx index a4edf9f482..c111ece9a9 100644 --- a/desktop/frontend/src/App.tsx +++ b/desktop/frontend/src/App.tsx @@ -51,9 +51,7 @@ import { ExtensionFormDialog } from "./components/ExtensionFormDialog"; import { ClearContextCard } from "./components/ClearContextCard"; import { RuntimeDecisionCard } from "./components/RuntimeDecisionCard"; import { decisionSurfaceMockFromInput, type DecisionSurfaceKind as MockDecisionSurfaceKind } from "./lib/decisionSurfaceMock"; - const UndoRewindBanner = lazy(() => import("./components/UndoRewindBanner").then((module) => ({ default: module.UndoRewindBanner }))); - /** Footer decision surface kinds. Runtime blockers are explicit recovery choices. */ type DecisionSurfaceKind = MockDecisionSurfaceKind | "extension_form"; import { StatusBar } from "./components/StatusBar"; @@ -103,7 +101,6 @@ import { type DesktopStartupSettingsView, type Mode, modeHasPlan, - type ProjectNode, type RewindResultView, type RemoteHostView, type SessionMeta, @@ -882,30 +879,6 @@ function SidebarImConnectionDetail({ connection, onClose, onOpenSession, onOpenS ); } -function activeTopicTurnsFromTree(tree: ProjectNode[], tab?: TabMeta): number | undefined { - if (!tab?.topicId) return undefined; - const targetScope = tab.scope === "global" ? "global" : "project"; - const walk = (nodes: ProjectNode[]): number | undefined => { - for (const node of nodes) { - if (!node) continue; - if (node.kind === "topic" || node.kind === "global_topic") { - const scope = node.kind === "global_topic" ? "global" : "project"; - if ( - scope === targetScope && - node.topicId === tab.topicId && - (scope === "global" || node.root === tab.workspaceRoot) - ) { - return node.turns; - } - } - const found = walk(asArray(node.children)); - if (found !== undefined) return found; - } - return undefined; - }; - return walk(tree); -} - function normalizeDesktopPlatform(value: string): DesktopPlatform { if (value === "darwin" || value === "windows") return value; return "linux"; @@ -1112,6 +1085,7 @@ export default function App() { purgeTrashedSession, renameSession, loadOlderHistory, + retrySessionHistory, refreshMeta, pickWorkspace, switchWorkspace, @@ -1206,7 +1180,7 @@ export default function App() { const sidebarWidth = useLayoutStore((s) => s.sidebarWidth); const setSidebarWidth = useLayoutStore((s) => s.setSidebarWidth); const [sidebarResizing, setSidebarResizing] = useState(false); - const [tasksOpen, setTasksOpen] = useState(false); + const [tasksOpen, setTasksOpen] = useState(false); const [liveSidebarWidth, setLiveSidebarWidth] = useState(null); const [viewportWidth, setViewportWidth] = useState(() => (typeof window === "undefined" ? 1440 : window.innerWidth)); const [viewportHeight, setViewportHeight] = useState(() => (typeof window === "undefined" ? 720 : window.innerHeight)); @@ -1717,9 +1691,13 @@ export default function App() { cancelled = true; }; } - void app.ListProjectTree() - .then((tree) => { - if (!cancelled) setActiveTopicTurns(activeTopicTurnsFromTree(asArray(tree), activeTab)); + void app.GetTopicSummary({ + scope: activeTab.scope === "global" ? "global" : "project", + workspaceRoot: activeTab.scope === "global" ? "" : activeTab.workspaceRoot, + topicId: activeTab.topicId, + }) + .then((topic) => { + if (!cancelled) setActiveTopicTurns(topic.turns); }) .catch(() => { if (!cancelled) setActiveTopicTurns(undefined); @@ -3998,6 +3976,7 @@ export default function App() { setSettingsTarget("models"); }, }, + { id: "cmd-task-center", group: t("palette.group.commands"), title: t("palette.cmd.taskCenter"), icon: , compact: true, keywords: ["task", "tasks", "center", "任务", "任务中心"], run: () => setTasksOpen("all") }, { id: "cmd-terminal", group: t("palette.group.commands"), title: t("rightDock.terminal"), icon: , compact: true, keywords: ["terminal", "shell", "终端"], run: () => toggleTerminalPanel() }, { id: "cmd-reload-runtime", @@ -4009,8 +3988,7 @@ export default function App() { run: () => { const tabID = activeTab?.id; if (!tabID) return; - // Success/queued feedback arrives as a tab notice from the Go side; - // only hard failures need a toast here. + // Success/queued feedback arrives as a tab notice; only hard failures need a toast. void app.ReloadRuntime(tabID).catch((err) => showToast(err instanceof Error ? err.message : String(err), "error")); }, }, @@ -4763,8 +4741,8 @@ export default function App() { className={`topicbar__action-btn topicbar__action-btn--icon topicbar__action-btn--utility${tasksOpen ? " topicbar__action-btn--active" : ""}`} type="button" aria-label={t("summary.session")} - aria-expanded={tasksOpen} - onClick={() => setTasksOpen((open) => !open)} + aria-expanded={Boolean(tasksOpen)} + onClick={() => setTasksOpen((open) => open ? false : "session")} > @@ -4791,9 +4769,9 @@ export default function App() {
setTasksOpen(false)} @@ -4876,33 +4854,36 @@ export default function App() { ) : noticePreviewMockEnabled() ? ( ) : ( - void handleDeliveryContinue()} - onEditPrompt={handleEditPrompt} - onRewind={handleMessageAction} - checkpoints={state.checkpoints} - actionPending={state.messageAction != null} - rewindDisabled={Boolean(activeTab?.readOnly) || !controllerReady || hydratePlaceholderActive || rewindState != null || rewindCommitting || state.running || state.messageAction != null || state.approval != null || state.ask != null || clearContextPending} - running={state.running || rewindCommitting} - turnStartAt={state.turnStartAt} - welcomeVariant={sidebarCreation ? "creation" : "default"} - creationMode={sidebarCreation} - actionHoverMenus={sidebarCreation && !hydratePlaceholderActive} - rewindSignal={rewindSignal} - revealSignal={transcriptRevealSignal} - hydrating={transcriptHydrating} - hasOlderHistory={state.historyHasOlder && !rewindState} - olderHistoryCount={state.historyStartTurn} - loadingOlderHistory={state.historyOlderLoading} - onLoadOlderHistory={() => activeTabId && loadOlderHistory(activeTabId)} - invocationMetadata={activeTabId ? invocationMetadataByTab[activeTabId] : undefined} - /> + <> + void handleDeliveryContinue()} + onEditPrompt={handleEditPrompt} + onRewind={handleMessageAction} + checkpoints={state.checkpoints} + actionPending={state.messageAction != null} + rewindDisabled={Boolean(activeTab?.readOnly) || !controllerReady || hydratePlaceholderActive || rewindState != null || rewindCommitting || state.running || state.messageAction != null || state.approval != null || state.ask != null || clearContextPending} + running={state.running || rewindCommitting} + turnStartAt={state.turnStartAt} + welcomeVariant={sidebarCreation ? "creation" : "default"} + creationMode={sidebarCreation} + actionHoverMenus={sidebarCreation && !hydratePlaceholderActive} + rewindSignal={rewindSignal} + revealSignal={transcriptRevealSignal} + hydrating={transcriptHydrating} + hasOlderHistory={state.historyHasOlder && !rewindState} + olderHistoryCount={state.historyStartTurn} + loadingOlderHistory={state.historyOlderLoading} + onLoadOlderHistory={() => activeTabId && loadOlderHistory(activeTabId)} + invocationMetadata={activeTabId ? invocationMetadataByTab[activeTabId] : undefined} + /> + {state.hydrateError ?
{state.hydrateError}
: null} + )} diff --git a/desktop/frontend/src/__tests__/clear-session-identity-contract.test.ts b/desktop/frontend/src/__tests__/clear-session-identity-contract.test.ts new file mode 100644 index 0000000000..cc357b7c78 --- /dev/null +++ b/desktop/frontend/src/__tests__/clear-session-identity-contract.test.ts @@ -0,0 +1,27 @@ +// Run: npx tsx src/__tests__/clear-session-identity-contract.test.ts +// +// clearSession must fence transcript identity so "clear → immediately switch +// mode/layout" cannot re-paint the destroyed session from TranscriptStore or +// a hydrate started with stale meta.sessionPath. + +import assert from "node:assert/strict"; +import { readFileSync } from "node:fs"; +import { dirname, join } from "node:path"; +import { fileURLToPath } from "node:url"; + +const root = join(dirname(fileURLToPath(import.meta.url)), ".."); +const controller = readFileSync(join(root, "lib/useController.ts"), "utf8"); +const store = readFileSync(join(root, "lib/transcriptStore.ts"), "utf8"); +const types = readFileSync(join(root, "lib/types.ts"), "utf8"); + +assert.match(types, /export interface SessionClearResult/, "backend clear result is typed"); +assert.match(types, /sessionGeneration/, "sessionGeneration is part of identity"); +assert.match(controller, /ClearSessionForTab/, "clear uses tab-scoped clear API"); +assert.match(controller, /evictTab\(tabId\)/, "clear evicts TranscriptStore for the tab"); +assert.match(controller, /sessionGeneration:\s*cleared\.sessionGeneration/, "clear applies returned generation"); +assert.match(controller, /sessionPath:\s*cleared\.sessionPath/, "clear applies returned path"); +assert.match(controller, /optimistic_meta[\s\S]*reset/, "meta is updated before reset so identity survives"); +assert.match(controller, /hydrateIdentityCurrent\(/, "hydrate rejects path/generation identity drift"); +assert.match(store, /evictTab\(tabId/, "TranscriptStore can drop a tab's resident sessions"); + +console.log(" PASS clear-session identity contract"); diff --git a/desktop/frontend/src/__tests__/clear-session-identity-race.test.ts b/desktop/frontend/src/__tests__/clear-session-identity-race.test.ts new file mode 100644 index 0000000000..bf7c98253d --- /dev/null +++ b/desktop/frontend/src/__tests__/clear-session-identity-race.test.ts @@ -0,0 +1,98 @@ +// Run: npx tsx src/__tests__/clear-session-identity-race.test.ts +// +// Deterministic race barriers for clear-session identity fencing. +// Avoids importing useController (React) so the suite runs without node_modules. + +import assert from "node:assert/strict"; +import { readFileSync } from "node:fs"; +import { dirname, join } from "node:path"; +import { fileURLToPath } from "node:url"; +import { hydrateIdentityCurrent } from "../lib/sessionIdentity"; + +let passed = 0; +let failed = 0; + +function ok(value: boolean, label: string) { + if (value) { + process.stdout.write(` PASS ${label}\n`); + passed += 1; + } else { + process.stdout.write(` FAIL ${label}\n`); + failed += 1; + } +} + +function deferred() { + let resolve!: (value: T) => void; + let reject!: (err: unknown) => void; + const promise = new Promise((done, fail) => { + resolve = done; + reject = fail; + }); + return { promise, resolve, reject }; +} + +console.log("\nclear-session identity race"); + +// ── hydrate identity fence (used by loadSessionDataForTab.stillCurrent) ───── +ok(hydrateIdentityCurrent("/a.jsonl", 1, "/a.jsonl", 1), "matching path+generation is current"); +ok(!hydrateIdentityCurrent("/a.jsonl", 1, "/b.jsonl", 2), "path drift after clear is rejected"); +ok(!hydrateIdentityCurrent("/a.jsonl", 1, "/a.jsonl", 2), "generation-only drift after clear is rejected"); +ok(hydrateIdentityCurrent("", undefined, "/b.jsonl", 2), "empty load path does not false-reject"); + +// ── deferred A hydrate vs clear→B (barrier interleaving) ─────────────────── +type LiveMeta = { sessionPath: string; sessionGeneration: number; items: string[] }; + +const live: LiveMeta = { + sessionPath: "/sessions/a.jsonl", + sessionGeneration: 1, + items: ["old content from A"], +}; + +const lateA = deferred<{ path: string; generation: number; items: string[] }>(); + +// Hydrate A starts and hangs (simulates HistorySliceForTab in flight). +const hydrateA = (async () => { + const loadPath = live.sessionPath; + const loadGen = live.sessionGeneration; + const page = await lateA.promise; + // stillCurrent check at apply time — equivalent to useController fence. + if (!hydrateIdentityCurrent(loadPath, loadGen, live.sessionPath, live.sessionGeneration)) { + return { applied: false as const, items: live.items.slice() }; + } + live.items = page.items; + return { applied: true as const, items: live.items.slice() }; +})(); + +// Clear succeeds: rotate identity to B and wipe transcript (atomic clear path). +live.sessionPath = "/sessions/b.jsonl"; +live.sessionGeneration = 2; +live.items = []; + +// Immediate mode switch would start hydrate B; A is still pending. +ok(live.items.length === 0, "after clear, transcript is empty before late A returns"); +ok(live.sessionGeneration === 2, "after clear, generation is B"); + +// Late A resolves with old content. +lateA.resolve({ + path: "/sessions/a.jsonl", + generation: 1, + items: ["old content from A"], +}); + +const result = await hydrateA; +ok(result.applied === false, "late A hydrate is not applied after clear to B"); +ok(result.items.length === 0, "transcript remains empty after rejected late A"); +ok(live.sessionPath === "/sessions/b.jsonl", "live identity path stays B"); +ok(live.sessionGeneration === 2, "live identity generation stays B"); + +// Source contract: clearSession still wires the real fence pieces. +const root = join(dirname(fileURLToPath(import.meta.url)), ".."); +const controller = readFileSync(join(root, "lib/useController.ts"), "utf8"); +assert.match(controller, /hydrateIdentityCurrent\(/, "useController uses shared identity fence"); +assert.match(controller, /evictTab\(tabId\)/, "clearSession evicts TranscriptStore"); +assert.match(controller, /sessionGeneration:\s*cleared\.sessionGeneration/, "clear applies returned generation"); +assert.match(controller, /a\.sessionGeneration === b\.sessionGeneration/, "sameMeta compares generation"); + +console.log(`\n${passed} passed, ${failed} failed`); +if (failed > 0) process.exit(1); diff --git a/desktop/frontend/src/__tests__/history-catalog-body-hits.test.ts b/desktop/frontend/src/__tests__/history-catalog-body-hits.test.ts new file mode 100644 index 0000000000..7387e831a1 --- /dev/null +++ b/desktop/frontend/src/__tests__/history-catalog-body-hits.test.ts @@ -0,0 +1,23 @@ +// Run: tsx src/__tests__/history-catalog-body-hits.test.ts +// +// Body-only history search must remain visible when metadata session matches +// are empty, and load-more must advance the search cursor independently. + +import assert from "node:assert/strict"; +import { readFileSync } from "node:fs"; +import { dirname, join } from "node:path"; +import { fileURLToPath } from "node:url"; + +const root = join(dirname(fileURLToPath(import.meta.url)), ".."); +const panel = readFileSync(join(root, "components/HistoryPanel.tsx"), "utf8"); +const hook = readFileSync(join(root, "lib/useHistoryCatalog.ts"), "utf8"); + +assert.match(panel, /hasBodyHits/, "HistoryPanel must branch on body hits"); +assert.match(panel, /searchHits\.length > 0/, "HistoryPanel must keep body hits out of empty state"); +assert.match(panel, /!isTrash && \(\s*
) : ( filteredPastChats.map((session, i) => { - // PR-C2: hover preview uses only the SessionMeta fields we - // already have on hand — no extra PreviewSession call, no - // backend round-trip, no read of the full transcript. - const turns = typeof session.turns === "number"; + // Hover preview stays on SessionMeta and never reads the transcript. + const turnsLabel = sessionTurnsLabel(session, t); const ts = session.lastActivityAt || session.modTime || session.createdAt; const preview = truncatePreview(session.preview); const pathText = session.workspaceRoot || session.path; const tooltipLabel = - turns || ts || preview || pathText ? ( + turnsLabel || ts || preview || pathText ? (
{pastChatTitle(session)}
{preview &&
{preview}
} - {(turns || ts) && ( + {(turnsLabel || ts) && (
- {turns && {t("composer.sessionTurns", { n: session.turns })}} + {turnsLabel && {turnsLabel}} {ts && · {fmtSessionTime(ts)}}
)} @@ -4226,7 +4226,7 @@ export function Composer({ {pastChatTitle(session)} - {turns ? ` (${t("composer.sessionTurns", { n: session.turns })})` : ""} + {turnsLabel ? ` (${turnsLabel})` : ""} @@ -4361,7 +4361,7 @@ export function Composer({ {ref.title} - {typeof ref.turns === "number" ? ` (${t("composer.sessionTurns", { n: ref.turns })})` : ""} + {sessionTurnsLabel(ref, t) ? ` (${sessionTurnsLabel(ref, t)})` : ""} diff --git a/desktop/frontend/src/components/HistoryFilterSelect.tsx b/desktop/frontend/src/components/HistoryFilterSelect.tsx new file mode 100644 index 0000000000..0323ff40db --- /dev/null +++ b/desktop/frontend/src/components/HistoryFilterSelect.tsx @@ -0,0 +1,30 @@ +export function HistoryFilterSelect({ + label, + options, + value, + onChange, +}: { + label: string; + options: { id: string; label: string; count: number }[]; + value: string; + onChange: (next: string) => void; +}) { + const visibleOptions = options.filter((option) => option.id === "all" || option.id === value || option.count > 0); + return ( +
+ {visibleOptions.map((option) => ( + + ))} +
+ ); +} diff --git a/desktop/frontend/src/components/HistoryPanel.tsx b/desktop/frontend/src/components/HistoryPanel.tsx index f825a905f7..70e96eb596 100644 --- a/desktop/frontend/src/components/HistoryPanel.tsx +++ b/desktop/frontend/src/components/HistoryPanel.tsx @@ -1,14 +1,17 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import type { MouseEvent as ReactMouseEvent } from "react"; import { Archive, Pencil, Search, Trash2, RotateCcw } from "lucide-react"; +import { app } from "../lib/bridge"; import { t, useT } from "../lib/i18n"; import { historySessionDisplayTitle, sessionActivityTime } from "../lib/session"; -import type { HistoryMessage, SessionMeta } from "../lib/types"; +import type { HistoryMessage, HistorySearchContextLine, HistorySearchHit, SessionMeta } from "../lib/types"; import { historyMessagesToItems, type Item } from "../lib/useController"; +import { useHistoryCatalog } from "../lib/useHistoryCatalog"; import { Transcript } from "./Transcript"; import { ContextMenu, contextMenuPointFromEvent, type ContextMenuItem, type ContextMenuPoint } from "./ContextMenu"; import { useDeferredClose } from "../lib/useMountTransition"; import { ModalCloseButton } from "./ModalCloseButton"; +import { HistoryFilterSelect } from "./HistoryFilterSelect"; type HistoryScopeFilter = "all" | "project" | "global"; type HistoryStatusFilter = "all" | "current" | "open"; @@ -19,7 +22,7 @@ type HistoryDateFilter = "all" | "today" | "yesterday" | "older"; // rename, or delete the selected session. export function HistoryPanel({ kind = "history", - sessions, + sessions: suppliedSessions, running, onResume, onPreview, @@ -56,6 +59,10 @@ export function HistoryPanel({ const [scopeFilter, setScopeFilter] = useState("all"); const [statusFilter, setStatusFilter] = useState("all"); const [dateFilter, setDateFilter] = useState("all"); + const [searchContext, setSearchContext] = useState<{ hit: HistorySearchHit; lines: HistorySearchContextLine[]; loading: boolean } | null>(null); + const { sessions, nextCursor, partial: catalogPartial, progress: catalogProgress, searchHits, loadMore } = useHistoryCatalog({ + isTrash, suppliedSessions, scope: scopeFilter, status: statusFilter, timeFilter: dateFilter, query, + }); const [menuSession, setMenuSession] = useState(null); const [menuPoint, setMenuPoint] = useState(null); const [blankMenuPoint, setBlankMenuPoint] = useState(null); @@ -71,6 +78,14 @@ export function HistoryPanel({ } | null>(null); const previewSeq = useRef(0); + const loadSearchContext = useCallback(async (hit: HistorySearchHit) => { + const seq = ++previewSeq.current; + setPreview(null); + setSearchContext({ hit, lines: [], loading: true }); + const lines = await app.GetHistorySearchContext({ sessionPath: hit.sessionPath, messageIndex: hit.messageIndex, before: 2, after: 2 }).catch(() => []); + if (seq === previewSeq.current) setSearchContext({ hit, lines, loading: false }); + }, []); + const startRename = (s: SessionMeta) => { if (running) return; setEditing(s.path); @@ -84,6 +99,7 @@ export function HistoryPanel({ const loadPreview = useCallback( async (s: SessionMeta) => { const seq = ++previewSeq.current; + setSearchContext(null); setEditing(null); setPreview({ path: s.path, @@ -123,22 +139,24 @@ export function HistoryPanel({ }, [isTrash, sessions]); useEffect(() => { + if (!isTrash) return; if (scopeFilter === "project" && scopeCounts.project === 0) setScopeFilter("all"); if (scopeFilter === "global" && scopeCounts.global === 0) setScopeFilter("all"); - }, [scopeCounts.global, scopeCounts.project, scopeFilter]); + }, [isTrash, scopeCounts.global, scopeCounts.project, scopeFilter]); useEffect(() => { - if (isTrash) return; + if (!isTrash) return; if (statusFilter === "current" && statusCounts.current === 0) setStatusFilter("all"); if (statusFilter === "open" && statusCounts.open === 0) setStatusFilter("all"); }, [isTrash, statusCounts.current, statusCounts.open, statusFilter]); useEffect(() => { + if (!isTrash) return; if (dateFilter !== "all" && dateCounts[dateFilter] === 0) setDateFilter("all"); - }, [dateCounts, dateFilter]); + }, [dateCounts, dateFilter, isTrash]); const filteredSessions = useMemo(() => { - const q = query.trim().toLowerCase(); + const q = isTrash ? query.trim().toLowerCase() : ""; return sessions.filter((s) => { if (scopeFilter !== "all" && sessionScope(s) !== scopeFilter) return false; if (!isTrash && statusFilter === "current" && !s.current) return false; @@ -443,7 +461,14 @@ export function HistoryPanel({ onContextMenu={openTrashBlankMenu} >
- {sessions.length > 0 && ( + {/* Keep search available for body-only hits (metadata sessions may be empty). */} + {!isTrash && ( + + )} + {isTrash && sessions.length > 0 && (
+ {!isTrash && catalogPartial && ( +
+ History index is still building ({catalogProgress.indexed}/{catalogProgress.total}); results may be incomplete. +
+ )}
- {sessions.length === 0 ? ( -
- {isTrash && } - {tr(isTrash ? "history.trashEmpty" : "history.empty")} -
- ) : filteredSessions.length === 0 ? ( -
{tr("history.noResults")}
- ) : ( - groups.map((g) => ( + {(() => { + const hasBodyHits = !isTrash && searchHits.length > 0; + if (sessions.length === 0 && !hasBodyHits) { + return ( +
+ {isTrash && } + {tr(isTrash ? "history.trashEmpty" : "history.empty")} +
+ ); + } + if (filteredSessions.length === 0 && !hasBodyHits) { + return
{tr("history.noResults")}
; + } + return ( + <> + {hasBodyHits && ( +
+
+ Content matches + {searchHits.length} +
+ {searchHits.map((hit) => ( +
+ +
+ ))} +
+ )} + {groups.map((g) => (
{g.recoveryCopy ? `${tr("history.recoveryCopiesGroup")} · ${g.label}` : g.label} @@ -542,7 +599,11 @@ export function HistoryPanel({ {s.recovered && {tr("recovery.badge")}} {sessionLocation(s, tr) && {sessionLocation(s, tr)}} - {tr(s.turns === 1 ? "history.turnOne" : "history.turnOther", { n: s.turns })} + + {s.turnsState === "unknown" + ? tr("history.indexing") + : tr(s.turns === 1 ? "history.turnOne" : "history.turnOther", { n: s.turns })} + · {timeLabel(isTrash ? s.deletedAt || sessionActivityTime(s) : sessionActivityTime(s))} {!isTrash && running && ( @@ -559,12 +620,46 @@ export function HistoryPanel({ ); })}
- )) - )} + ))} + {!isTrash && nextCursor && ( + + )} + + ); + })()}
-
- {preview ? ( +
+ {searchContext ? ( + <> +
+
+
{searchContext.hit.sessionTitle || searchContext.hit.topicTitle || searchContext.hit.sessionPath}
+
{searchContext.hit.role} · {searchContext.hit.kind}
+
+
+
+ {searchContext.loading ? ( +
{tr("common.loading")}
+ ) : searchContext.lines.length === 0 ? ( +
{tr("history.previewEmpty")}
+ ) : ( + searchContext.lines.map((line) => ( +
+
{line.role}
+
{line.text}
+
+ )) + )} +
+ + ) : preview ? ( <>
@@ -688,40 +783,12 @@ function sessionMetaLine(s: SessionMeta, tr: ReturnType, isTrash = const time = timeLabel(isTrash ? s.deletedAt || sessionActivityTime(s) : sessionActivityTime(s)); const suffix = isTrash && s.deletedAt ? ` · ${tr("history.deleted")}` : ""; const prefix = isChannelSession(s) ? `${tr("history.channelReadOnly")} · ` : ""; - return `${prefix}${tr(s.turns === 1 ? "history.turnOne" : "history.turnOther", { n: s.turns })} · ${time}${suffix}`; + const turns = s.turnsState === "unknown" + ? tr("history.indexing") + : tr(s.turns === 1 ? "history.turnOne" : "history.turnOther", { n: s.turns }); + return `${prefix}${turns} · ${time}${suffix}`; } function previewMessagesToItems(messages: HistoryMessage[]): Item[] { return historyMessagesToItems(messages, "hp").items; } - -function HistoryFilterSelect({ - label, - options, - value, - onChange, -}: { - label: string; - options: { id: string; label: string; count: number }[]; - value: string; - onChange: (next: string) => void; -}) { - const visibleOptions = options.filter((option) => option.id === "all" || option.id === value || option.count > 0); - return ( -
- {visibleOptions.map((option) => ( - - ))} -
- ); -} diff --git a/desktop/frontend/src/components/ProjectTree.tsx b/desktop/frontend/src/components/ProjectTree.tsx index a466ddc1ab..1a5c36389c 100644 --- a/desktop/frontend/src/components/ProjectTree.tsx +++ b/desktop/frontend/src/components/ProjectTree.tsx @@ -9,9 +9,12 @@ import { Archive, ArrowDown, Pencil, Plus, Folder, FolderPlus, Search, Briefcase import { asArray } from "../lib/array"; import { useToast } from "../lib/toast"; import { app } from "../lib/bridge"; -import type { ProjectNode, ProjectTopicStatus } from "../lib/types"; +import { onProjectTreeChangedV2 } from "../lib/sessionCatalogBridge"; +import { isRuntimeSessionNode, isTopicNode, mergeProjectTopicPage, projectTreeDedupedExactTime, projectTreeEventAffectsFolder, projectTreeFolderDisclosure, projectTreeReadActivityKey, projectTreeRevisionIsFresh, projectTreeShouldApplyShellSnapshot, 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"; @@ -19,9 +22,6 @@ import type { ShortcutPlatform } from "../lib/keyboardShortcuts"; import { ContextMenu, contextMenuPointFromEvent, type ContextMenuItem, type ContextMenuPoint } from "./ContextMenu"; import { Tooltip } from "./Tooltip"; import { WorktreeBadge } from "./WorktreeBadge"; - -type ProjectTreeVariant = "classic" | "workbench" | "creation"; - interface ProjectTreeProps { activeScope?: string; activeWorkspaceRoot?: string; @@ -56,249 +56,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 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 (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; @@ -409,7 +166,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( @@ -617,6 +393,20 @@ export function ProjectTree({ const compactTopics = variant === "workbench"; const creationTopics = variant === "creation"; const [tree, setTree] = useState([]); + const treeRef = useRef([]); + const latestRevisionRef = useRef(0); + const [catalogStatus, setCatalogStatus] = useState({ + state: "opening", revision: 0, indexed: 0, total: 0, repairPending: 0, + }); + const [topicPageState, setTopicPageState] = useState>({}); + const topicPageStateRef = useRef(topicPageState); + const updateTopicPageState = useCallback((key: string, next: { nextCursor?: string; loading: boolean }) => { + setTopicPageState((current) => { + const updated = { ...current, [key]: next }; + topicPageStateRef.current = updated; + return updated; + }); + }, []); const [expanded, setExpanded] = useState>(new Set()); const [manuallyCollapsed, setManuallyCollapsed] = useState>(new Set()); const [creatingProject, setCreatingProject] = useState(null); @@ -695,15 +485,67 @@ export function ProjectTree({ }); }, []); - // Keyed by the data, not the selection: a switch cannot change the tree. + 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]; + 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({ + scope: project.kind === "global_folder" ? "global" : "project", + workspaceRoot: project.kind === "global_folder" ? "" : project.root ?? "", + cursor, + limit: timeFilter === "10" ? 10 : timeFilter === "20" ? 20 : 50, + 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; + } + latestRevisionRef.current = Math.max(latestRevisionRef.current, page.revision); + const items = asArray(page.items); + setTree((current) => current.map((node) => { + if (node.key !== key) return node; + return { ...node, children: mergeProjectTopicPage(asArray(node.children), items, append) }; + })); + updateTopicPageState(key, { nextCursor: page.nextCursor, loading: false }); + } catch { + if (topicLoadSeqRef.current[key] !== seq) return; + updateTopicPageState(key, { ...topicPageStateRef.current[key], loading: false }); + } + }, [query, timeFilter, updateTopicPageState]); + // Snapshot is intentionally shells-only. Preserve already loaded pages by + // project key so a metadata refresh does not collapse or blank the sidebar. const refresh = useCallback(async () => { try { - setTree(asArray(await app.ListProjectTree())); + const snapshot = await app.GetProjectTreeSnapshot(); + const rev = snapshot.revision ?? 0, empty = treeRef.current.length === 0; + if (!projectTreeShouldApplyShellSnapshot({ currentRevision: latestRevisionRef.current, incomingRevision: rev, treeEmpty: empty })) return; + if (projectTreeRevisionIsFresh(latestRevisionRef.current, rev)) latestRevisionRef.current = Math.max(latestRevisionRef.current, rev); + const projects = asArray(snapshot.projects); + setCatalogStatus(snapshot.catalog); + setTree((current) => projects.map((project) => { + const previous = current.find((node) => node.key === project.key); + return { ...project, children: asArray(previous?.children) }; + })); } catch { /* bridge unavailable */ } }, []); + useEffect(() => { + treeRef.current = tree; + }, [tree]); + useEffect(() => { manuallyCollapsedRef.current = manuallyCollapsed; }, [manuallyCollapsed]); @@ -719,6 +561,32 @@ export function ProjectTree({ void refresh(); }, [refresh, refreshSignal]); + useEffect(() => onProjectTreeChangedV2((event) => { + if (!projectTreeRevisionIsFresh(latestRevisionRef.current, event.revision)) return; + latestRevisionRef.current = Math.max(latestRevisionRef.current, event.revision); + void app.GetSessionCatalogStatus().then(setCatalogStatus).catch(() => {}); + if (treeRef.current.length === 0) { void refresh(); return; } // race: event before shell + const affected = asArray(event.roots); + for (const project of treeRef.current) { + const key = projectNodeKey(project, 0); + if (!expanded.has(key)) continue; + if (projectTreeEventAffectsFolder(project, affected)) void loadProjectTopics(project); + } + }), [expanded, loadProjectTopics, refresh]); + + // 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"; + 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(() => { const collapsed = manuallyCollapsedRef.current; @@ -852,7 +720,7 @@ export function ProjectTree({ items[next]?.focus(); }; - const toggleExpand = (key: string) => { + const toggleExpand = (key: string, project?: ProjectNode) => { const willCollapse = expanded.has(key); setExpanded((prev) => { const next = new Set(prev); @@ -866,6 +734,7 @@ export function ProjectTree({ else next.delete(key); return next; }); + if (!willCollapse && project) void loadProjectTopics(project); }; const folderKeys = useMemo(() => collapsibleFolderKeys(tree), [tree]); @@ -1291,7 +1160,9 @@ export function ProjectTree({ const children = asArray(node.children); const isExpanded = query.trim() ? true : expanded.has(key); const hasChildren = children.length > 0; - const folderDisclosure = projectTreeFolderDisclosure(hasChildren, isExpanded, classicTopics); + // Snapshot rows are shells with no children until the first page is loaded, + // so every project folder must remain expandable while indexing. + const folderDisclosure = projectTreeFolderDisclosure(hasChildren, isExpanded, true); if (isTopicNode(node) || isRuntimeSessionNode(node)) { const isSessionNode = isRuntimeSessionNode(node); @@ -1784,6 +1655,7 @@ export function ProjectTree({ ? classicTopicWindow(children, folderShowAll) : { visible: children, hiddenCount: 0 }; const windowToggleVisible = classicTruncationActive && (hiddenCount > 0 || (folderShowAll && children.length > CLASSIC_TOPIC_PREVIEW_LIMIT)); + const backendPage = topicPageState[key]; const renderFolderChildren = () => { if (!hasChildren) { if (!classicTopics) return null; @@ -1811,6 +1683,17 @@ export function ProjectTree({ {hiddenCount > 0 ? t("projectTree.showMoreTopics", { n: hiddenCount }) : t("projectTree.showFewerTopics")} )} + {backendPage?.nextCursor && ( + + )}
); @@ -1861,7 +1744,7 @@ export function ProjectTree({ className="project-tree__folder-main" style={{ paddingLeft: 8 + depth * 16 }} onClick={() => { - if (folderDisclosure.canExpand) toggleExpand(key); + if (folderDisclosure.canExpand) toggleExpand(key, node); }} onKeyDown={(event) => { if (event.key === "ContextMenu" || (event.shiftKey && event.key === "F10")) { @@ -2317,6 +2200,11 @@ export function ProjectTree({ /> )} + {(catalogStatus.state === "opening" || catalogStatus.state === "rebuilding" || catalogStatus.repairPending > 0) && ( +
+ {t("projectTree.indexingProgress", { done: catalogStatus.indexed, total: catalogStatus.total || "?" })} +
+ )} {compactTopics ? ( <> {renderProjectHeader("workbench")} diff --git a/desktop/frontend/src/components/TaskMonitorPanel.tsx b/desktop/frontend/src/components/TaskMonitorPanel.tsx index c05af27a93..b5012abd1f 100644 --- a/desktop/frontend/src/components/TaskMonitorPanel.tsx +++ b/desktop/frontend/src/components/TaskMonitorPanel.tsx @@ -14,6 +14,13 @@ import { app } from "../lib/bridge"; import { useT } from "../lib/i18n"; import type { TaskEvent, TaskSnapshot } from "../lib/types"; +type CatalogTask = TaskSnapshot & { __projectKey: string; __projectLabel: string; __catalogKey: string }; + +function hasTaskCatalogBinding(): boolean { + const bound = (window as unknown as { go?: { main?: { App?: { ListTaskPage?: unknown } } } }).go?.main?.App?.ListTaskPage; + return typeof bound === "function"; +} + // --- helpers --- type TaskTimerSnapshot = TaskSnapshot & { runtime_lease_until?: string }; @@ -111,6 +118,7 @@ export function TaskMonitorPanel({ onClose, onOpenSession, initialOpen = false, + initialScope = "session", popover = false, summaryMode = false, }: { @@ -118,11 +126,17 @@ export function TaskMonitorPanel({ onClose?: () => void; onOpenSession?: (tabID: string, taskID: string) => Promise | boolean; initialOpen?: boolean; + initialScope?: "session" | "project" | "all"; popover?: boolean; summaryMode?: boolean; }) { const t = useT(); - const [tasks, setTasks] = useState([]); + const [tasks, setTasks] = useState([]); + const [scope, setScope] = useState<"session" | "project" | "all">(initialScope); + const [query, setQuery] = useState(""); + const [nextCursor, setNextCursor] = useState(""); + const [indexProgress, setIndexProgress] = useState<{ indexed: number; total: number; partial: boolean }>({ indexed: 0, total: 0, partial: true }); + const requestSeq = useRef(0); const [loading, setLoading] = useState(true); const [error, setError] = useState(null); const [expanded, setExpanded] = useState>(new Set()); @@ -131,7 +145,7 @@ export function TaskMonitorPanel({ const [actionError, setActionError] = useState(null); const [actionMessage, setActionMessage] = useState(null); const [nowMs, setNowMs] = useState(() => Date.now()); - const [pendingStop, setPendingStop] = useState(null); + const [pendingStop, setPendingStop] = useState(null); const stopButtonRefs = useRef>(new Map()); const confirmStopRef = useRef(null); @@ -145,20 +159,36 @@ export function TaskMonitorPanel({ ); const eventCursors = useRef>(new Map()); - const fetchTasks = useCallback(async () => { + const fetchTasks = useCallback(async (cursor = "") => { + const seq = ++requestSeq.current; try { setError(null); - const list = await app.ListTasksForTab(tabID); - setTasks(list ?? []); + if (!hasTaskCatalogBinding()) { + const legacy = await app.ListTasksForTab(tabID); + if (seq !== requestSeq.current) return; + const filtered = legacy.filter((task) => !query.trim() || [task.task_id, task.session_id, task.error_code, task.error_summary].some((value) => (value || "").toLowerCase().includes(query.trim().toLowerCase()))); + setTasks(filtered.map((task) => ({ ...task, __projectKey: "", __projectLabel: "", __catalogKey: task.task_id }))); + setNextCursor(""); + setIndexProgress({ indexed: filtered.length, total: filtered.length, partial: false }); + return; + } + const page = await app.ListTaskPage({ scope, tabId: tabID, projectKey: "", states: [], query, cursor, limit: 50 }); + if (seq !== requestSeq.current) return; + const decorated = (page.items ?? []).map((item) => ({ ...item.task, __projectKey: item.projectKey, __projectLabel: item.projectLabel, __catalogKey: `${item.projectKey}:${item.task.task_id}` })); + setTasks((current) => cursor ? [...current, ...decorated.filter((item) => !current.some((existing) => existing.__catalogKey === item.__catalogKey))] : decorated); + setNextCursor(page.nextCursor || ""); + setIndexProgress({ indexed: page.status.indexed, total: page.status.total, partial: page.partial }); } catch (e) { + if (seq !== requestSeq.current) return; setError(String(e)); } finally { setLoading(false); } - }, [tabID]); + }, [query, scope, tabID]); // Fetch events for a single task, using afterSequence for incremental load. - const fetchEvents = useCallback(async (taskID: string) => { + const fetchEvents = useCallback(async (task: CatalogTask) => { + const taskID = task.__catalogKey; setEventsLoading((prev) => new Set(prev).add(taskID)); setEventsError((prev) => { const next = new Map(prev); @@ -167,7 +197,9 @@ export function TaskMonitorPanel({ }); try { const cursor = eventCursors.current.get(taskID) ?? 0; - const events = await app.ListTaskEventsForTab(tabID, taskID, cursor); + const events = hasTaskCatalogBinding() + ? (await app.ListTaskEventPage({ projectKey: task.__projectKey, taskId: task.task_id, after: cursor, limit: 50 })).items ?? [] + : await app.ListTaskEventsForTab(tabID, task.task_id, cursor); if (events.length > 0) { setTaskEvents((prev) => { const next = new Map(prev); @@ -199,20 +231,16 @@ export function TaskMonitorPanel({ return next; }); } - }, [tabID]); + }, [tabID]); // Initial fetch + periodic polling useEffect(() => { - fetchTasks(); + void fetchTasks(""); const interval = setInterval(() => { - fetchTasks(); - // Also refresh events for expanded tasks - expanded.forEach((id) => { - fetchEvents(id); - }); + void fetchTasks(""); }, POLL_INTERVAL_MS); return () => clearInterval(interval); - }, [fetchTasks, fetchEvents, expanded]); + }, [fetchTasks]); // Live tasks need a ticking clock; terminal and queued tasks stay frozen at // their persisted end/update time. @@ -228,19 +256,20 @@ export function TaskMonitorPanel({ useEffect(() => { if (!pendingStop) return; - const current = tasks.find((task) => task.task_id === pendingStop.task_id); + const current = tasks.find((task) => task.__catalogKey === pendingStop.__catalogKey); if (!current || !isStoppableState(current.state)) setPendingStop(null); }, [pendingStop, tasks]); const dismissStopConfirmation = () => { - const taskID = pendingStop?.task_id; + const taskKey = pendingStop?.__catalogKey; setPendingStop(null); - if (taskID) { - requestAnimationFrame(() => stopButtonRefs.current.get(taskID)?.focus()); + if (taskKey) { + requestAnimationFrame(() => stopButtonRefs.current.get(taskKey)?.focus()); } }; - const toggleTask = (id: string) => { + const toggleTask = (task: CatalogTask) => { + const id = task.__catalogKey; setExpanded((prev) => { const next = new Set(prev); if (next.has(id)) { @@ -249,29 +278,36 @@ export function TaskMonitorPanel({ next.add(id); // Load events on first expand if (!taskEvents.has(id)) { - fetchEvents(id); + void fetchEvents(task); } } return next; }); }; - const controlTask = async (task: TaskSnapshot, action: "stop" | "requeue" | "open") => { + const controlTask = async (task: CatalogTask, action: "stop" | "requeue" | "open") => { setPendingStop(null); - setActionTask(task.task_id); + setActionTask(task.__catalogKey); setActionError(null); setActionMessage(null); try { - if (action === "open" && onOpenSession) { + if (action === "open" && onOpenSession && scope === "session") { const opened = await onOpenSession(tabID, task.task_id); if (opened) onClose?.(); return; } - const result = action === "stop" - ? await app.StopTaskForTab(tabID, task.task_id, task.version, "desktop request", `desktop-${action}-${task.task_id}-${task.version}`) - : action === "requeue" - ? await app.RequeueTaskForTab(tabID, task.task_id, task.version, `desktop-${action}-${task.task_id}-${task.version}`) - : await app.OpenTaskSessionForTab(tabID, task.task_id); + const request = { projectKey: task.__projectKey, taskId: task.task_id, expectedVersion: task.version, reason: "desktop request", idempotencyKey: `desktop-${action}-${task.task_id}-${task.version}` }; + const result = hasTaskCatalogBinding() + ? action === "stop" + ? await app.StopTaskByKey(request) + : action === "requeue" + ? await app.RequeueTaskByKey(request) + : await app.OpenTaskSessionByKey({ projectKey: task.__projectKey, taskId: task.task_id }) + : action === "stop" + ? await app.StopTaskForTab(tabID, task.task_id, task.version, request.reason, request.idempotencyKey) + : action === "requeue" + ? await app.RequeueTaskForTab(tabID, task.task_id, task.version, request.idempotencyKey) + : await app.OpenTaskSessionForTab(tabID, task.task_id); if (result.error) { setActionError(`${result.error.code}: ${result.error.message}`); } else if (action === "open") { @@ -280,7 +316,7 @@ export function TaskMonitorPanel({ setActionMessage(`Session: ${sessionID}`); } else { setActionMessage(result.idempotent ? "Already applied" : "Task updated"); - await fetchTasks(); + await fetchTasks(""); } } catch (e) { setActionError(String(e)); @@ -309,9 +345,9 @@ export function TaskMonitorPanel({ {tasks.length}
+ )} +
{evLoading && evs.length === 0 && (
@@ -503,7 +552,7 @@ export function TaskMonitorPanel({ )}
- {pendingStop?.task_id === task.task_id ? ( + {pendingStop?.__catalogKey === taskKey ? (
void controlTask(task, "stop")} > {t("summary.stop")} @@ -534,20 +583,20 @@ export function TaskMonitorPanel({ {isStoppableState(task.state) && ( )} {(task.state === "failed" || task.state === "stale") && ( - + )} - +
)} @@ -555,6 +604,11 @@ export function TaskMonitorPanel({ ); })} + {nextCursor && !loading && !error && ( + + )} )} diff --git a/desktop/frontend/src/lib/bridge.ts b/desktop/frontend/src/lib/bridge.ts index 7caa35f6c6..bfc816941d 100644 --- a/desktop/frontend/src/lib/bridge.ts +++ b/desktop/frontend/src/lib/bridge.ts @@ -1,15 +1,13 @@ -// 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. import type * as GeneratedApp from "../../wailsjs/go/main/App"; import type { InvocationRequest } from "./invocationDisplay"; - import { addBreadcrumb } from "./breadcrumbs"; import { maybeShare } from "./queryCoalesce"; +import { makeMockSessionCatalogBindings } from "./sessionCatalogBridge"; +import { makeMockHistoryCatalogBindings, type HistoryCatalogBindings } from "./historyCatalogBridge"; +import { makeMockTaskCatalogBindings, type TaskCatalogBindings } from "./taskCatalogBridge"; import { t } from "./i18n"; import { providerIsConfigured, providerRequiresKey, removeProviderAccessesForMock } from "./providerModels"; import { DEFAULT_STATUS_BAR_ITEMS, normalizeStatusBarItems } from "./statusBarItems"; @@ -86,6 +84,7 @@ import type { PluginInstallOptions, PluginView, ProjectNode, + SessionCatalogBindings, PromptHistoryEntry, PromptHistoryResult, ProviderModelCatalogUpdate, @@ -119,6 +118,7 @@ import type { GitCommitView, GitCommitDetailView, WorkspaceView, + SessionClearResult, } from "./types"; const GLOBAL_PROJECT_ORDER_KEY = "__global__"; @@ -163,7 +163,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, HistoryCatalogBindings, TaskCatalogBindings { Platform(): Promise; MinimiseMainWindow(): Promise; ToggleMaximiseMainWindow(): Promise; @@ -278,8 +278,8 @@ export interface AppBindings { CompactForTab(tabID: string): Promise; NewSession(): Promise; NewSessionForTab(tabID: string): Promise; - ClearSession(): Promise; - ClearSessionForTab(tabID: string): Promise; + ClearSession(): Promise; + ClearSessionForTab(tabID: string): Promise; History(): Promise; HistoryForTab(tabID: string): Promise; HistoryPage(beforeTurn: number, limit: number): Promise; @@ -2436,6 +2436,7 @@ function makeMockApp(): AppBindings { } }; return { + ...makeMockSessionCatalogBindings(cloneProjectTree), async MinimiseMainWindow() { console.info("mock MinimiseMainWindow"); }, @@ -3163,8 +3164,8 @@ function makeMockApp(): AppBindings { async CompactForTab() {}, async NewSession() {}, async NewSessionForTab() {}, - async ClearSession() {}, - async ClearSessionForTab() {}, + async ClearSession() { return { sessionPath: "", sessionGeneration: 0 }; }, + async ClearSessionForTab() { return { sessionPath: "", sessionGeneration: 0 }; }, async Checkpoints() { return [ { turn: 0, prompt: "你好呀", files: ["src/App.tsx"], fileCount: 1, turnFileCount: 1, time: Date.now() - 30_000, canCode: true, canConversation: true }, @@ -3261,6 +3262,7 @@ function makeMockApp(): AppBindings { async ListSessionsForTab() { return sessions.map((s) => ({ ...s })); }, + ...makeMockHistoryCatalogBindings(sessions), async ListTrashedSessions() { return trashedSessions.map((s) => ({ ...s })); }, @@ -4902,6 +4904,7 @@ function makeMockApp(): AppBindings { async RequeueTask() { return { schema_version: 1, command: "requeue", task_id: "", accepted: false, idempotent: false, error: { code: "mock", message: "not available in browser mock" } }; }, async OpenTaskSession() { return { schema_version: 1, command: "open_session", task_id: "", accepted: false, idempotent: false, error: { code: "mock", message: "not available in browser mock" } }; }, async ListTasksForTab() { return []; }, + ...makeMockTaskCatalogBindings(), async ListTaskEventsForTab() { return []; }, async StopTaskForTab() { return { schema_version: 1, command: "stop", task_id: "", accepted: false, idempotent: false, error: { code: "mock", message: "not available in browser mock" } }; }, async CancelTaskForTab() { return { schema_version: 1, command: "cancel", task_id: "", accepted: false, idempotent: false, error: { code: "mock", message: "not available in browser mock" } }; }, diff --git a/desktop/frontend/src/lib/historyCatalogBridge.ts b/desktop/frontend/src/lib/historyCatalogBridge.ts new file mode 100644 index 0000000000..2b0a7786c8 --- /dev/null +++ b/desktop/frontend/src/lib/historyCatalogBridge.ts @@ -0,0 +1,35 @@ +import type { + HistoryIndexStatus, HistorySearchContextLine, HistorySearchContextRequest, HistorySearchPage, + HistorySearchRequest, HistorySessionPage, HistorySessionPageRequest, +} from "./historyCatalogTypes"; +import type { SessionMeta } from "./types"; + +export interface HistoryCatalogBindings { + ListHistorySessions(req: HistorySessionPageRequest): Promise; + SearchHistoryContent(req: HistorySearchRequest): Promise; + GetHistorySearchContext(req: HistorySearchContextRequest): Promise; + GetHistoryIndexStatus(): Promise; + RebuildHistoryIndex(): Promise; +} + +export function makeMockHistoryCatalogBindings(sessions: SessionMeta[]): HistoryCatalogBindings { + const status = async (): Promise => ({ + state: "ready", mode: "memory", revision: 1, indexed: sessions.length, total: sessions.length, pending: 0, failed: 0, + }); + return { + async ListHistorySessions(req) { + const start = req.cursor ? Number(req.cursor) || 0 : 0; + const query = req.query.trim().toLowerCase(); + const items = sessions.filter((session) => + (req.scope === "all" || (session.scope || "global") === req.scope) && + (req.status !== "current" || session.current) && (req.status !== "open" || session.open) && + (!query || [session.title, session.preview, session.topicTitle, session.workspaceRoot].some((value) => (value || "").toLowerCase().includes(query)))); + const limit = Math.max(1, Math.min(req.limit || 50, 200)); + return { items: items.slice(start, start + limit).map((session) => ({ ...session })), nextCursor: start + limit < items.length ? String(start + limit) : "", revision: 1, partial: false, staleCursor: false }; + }, + async SearchHistoryContent() { return { items: [], nextCursor: "", revision: 1, partial: false, staleCursor: false, status: await status() }; }, + async GetHistorySearchContext() { return []; }, + GetHistoryIndexStatus: status, + async RebuildHistoryIndex() {}, + }; +} diff --git a/desktop/frontend/src/lib/historyCatalogTypes.ts b/desktop/frontend/src/lib/historyCatalogTypes.ts new file mode 100644 index 0000000000..2c4876b2bb --- /dev/null +++ b/desktop/frontend/src/lib/historyCatalogTypes.ts @@ -0,0 +1,30 @@ +import type { SessionMeta } from "./types"; + +export interface HistorySessionPageRequest { + scope: "all" | "project" | "global" | string; + workspaceRoot: string; + status: "all" | "current" | "open" | string; + timeFilter: "all" | "today" | "yesterday" | "older" | string; + query: string; + cursor: string; + limit: number; +} +export interface HistorySessionPage { items: SessionMeta[]; nextCursor: string; revision: number; partial: boolean; staleCursor: boolean } +export interface HistoryIndexStatus { + state: string; mode: "disk" | "memory" | string; path?: string; revision: number; + indexed: number; total: number; pending: number; failed: number; lastError?: string; quarantinedPath?: string; +} +export interface HistorySearchRequest { + query: string; scope: "all" | "project" | "global" | string; workspaceRoot: string; + status: "all" | "current" | "open" | string; timeFilter: string; kinds: string[]; toolName: string; cursor: string; limit: number; +} +export interface HistorySearchHit { + sessionPath: string; sessionId: string; source: string; messageIndex: number; role: string; kind: string; + toolName?: string; snippet: string; score: number; sessionTitle?: string; topicTitle?: string; workspaceRoot?: string; + lastActivityAt: number; open: boolean; running: boolean; current: boolean; +} +export interface HistorySearchPage { + items: HistorySearchHit[]; nextCursor: string; revision: number; partial: boolean; staleCursor: boolean; status: HistoryIndexStatus; +} +export interface HistorySearchContextRequest { sessionPath: string; messageIndex: number; before: number; after: number } +export interface HistorySearchContextLine { index: number; role: string; text: string } diff --git a/desktop/frontend/src/lib/hydrateErrorState.ts b/desktop/frontend/src/lib/hydrateErrorState.ts new file mode 100644 index 0000000000..725b3ff1d8 --- /dev/null +++ b/desktop/frontend/src/lib/hydrateErrorState.ts @@ -0,0 +1,36 @@ +/** Preserve transcript on failed hydrate instead of painting a successful empty session. */ +export function applyHydrateErrorState< + TItem, + S extends { + items: TItem[]; + hydratePlaceholderItems?: TItem[]; + hydrateHistoryLoaded?: boolean; + }, +>(s: S, reason: string, error: string): S & { + hydrating: false; + hydrateReason: string; + hydrateError: string; + hydrateHistoryLoaded?: boolean; + hydratePlaceholderItems: undefined; +} { + const keptItems = s.items.length > 0 + ? s.items + : (s.hydratePlaceholderItems?.length ? s.hydratePlaceholderItems : s.items); + return { + ...s, + items: keptItems, + hydrating: false, + hydrateReason: reason, + hydrateError: error, + hydrateHistoryLoaded: s.hydrateHistoryLoaded || keptItems.length > 0 || undefined, + hydratePlaceholderItems: undefined, + }; +} + +export function hydratePlaceholderItems( + optionsItems: TItem[] | undefined, + existing: TItem[] | undefined, +): TItem[] | undefined { + if (optionsItems?.length) return optionsItems; + return existing?.length ? existing : undefined; +} diff --git a/desktop/frontend/src/lib/projectTreeTopic.ts b/desktop/frontend/src/lib/projectTreeTopic.ts new file mode 100644 index 0000000000..e5127e3f6e --- /dev/null +++ b/desktop/frontend/src/lib/projectTreeTopic.ts @@ -0,0 +1,288 @@ +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; +} + +// Project shells come from desktop-projects.json and are valid even when the +// disposable catalog still reports revision 0. Catalog revision only gates +// topic pages and non-empty tree refreshes after the first shell is painted. +export function projectTreeShouldApplyShellSnapshot(options: { + currentRevision: number; + incomingRevision: number; + treeEmpty: boolean; +}): boolean { + if (options.treeEmpty) return true; + return projectTreeRevisionIsFresh(options.currentRevision, options.incomingRevision); +} + +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/sessionIdentity.ts b/desktop/frontend/src/lib/sessionIdentity.ts new file mode 100644 index 0000000000..94b550bd31 --- /dev/null +++ b/desktop/frontend/src/lib/sessionIdentity.ts @@ -0,0 +1,14 @@ +/** True when a hydrate started for loadPath/loadGen still matches live meta. */ +export function hydrateIdentityCurrent( + loadPath: string, + loadGeneration: number | undefined, + metaPath: string | undefined, + metaGeneration: number | undefined, +): boolean { + const path = loadPath.trim(); + if (path && metaPath && metaPath !== path) return false; + if (loadGeneration !== undefined && metaGeneration !== undefined && metaGeneration !== loadGeneration) { + return false; + } + return true; +} diff --git a/desktop/frontend/src/lib/taskCatalogBridge.ts b/desktop/frontend/src/lib/taskCatalogBridge.ts new file mode 100644 index 0000000000..3de64b988d --- /dev/null +++ b/desktop/frontend/src/lib/taskCatalogBridge.ts @@ -0,0 +1,27 @@ +import type { ControlResult } from "./types"; +import type { + TaskActionRequest, TaskCatalogStatus, TaskEventPage, TaskEventPageRequest, TaskPage, TaskPageRequest, +} from "./taskCatalogTypes"; + +export interface TaskCatalogBindings { + ListTaskPage(req: TaskPageRequest): Promise; + ListTaskEventPage(req: TaskEventPageRequest): Promise; + StopTaskByKey(req: TaskActionRequest): Promise; + CancelTaskByKey(req: TaskActionRequest): Promise; + RequeueTaskByKey(req: TaskActionRequest): Promise; + OpenTaskSessionByKey(req: { projectKey: string; taskId: string }): Promise; + GetTaskCatalogStatus(): Promise; + RebuildTaskCatalog(): Promise; +} + +export function makeMockTaskCatalogBindings(): TaskCatalogBindings { + const unavailable = (command: string): ControlResult => ({ schema_version: 1, command, task_id: "", accepted: false, idempotent: false, error: { code: "mock", message: "not available in browser mock" } }); + return { + async ListTaskPage() { return { items: [], nextCursor: "", revision: 1, partial: false, staleCursor: false, status: await this.GetTaskCatalogStatus() }; }, + async ListTaskEventPage(req) { return { items: [], nextSequence: req.after, partial: false }; }, + async StopTaskByKey() { return unavailable("stop"); }, async CancelTaskByKey() { return unavailable("cancel"); }, + async RequeueTaskByKey() { return unavailable("requeue"); }, async OpenTaskSessionByKey() { return unavailable("open_session"); }, + async GetTaskCatalogStatus() { return { state: "ready", mode: "memory", revision: 1, indexed: 0, total: 0, pending: 0, failed: 0 }; }, + async RebuildTaskCatalog() {}, + }; +} diff --git a/desktop/frontend/src/lib/taskCatalogTypes.ts b/desktop/frontend/src/lib/taskCatalogTypes.ts new file mode 100644 index 0000000000..62d4136220 --- /dev/null +++ b/desktop/frontend/src/lib/taskCatalogTypes.ts @@ -0,0 +1,14 @@ +import type { TaskEvent, TaskSnapshot } from "./types"; + +export interface TaskPageRequest { + scope: "session" | "project" | "all" | string; tabId: string; projectKey: string; states: string[]; query: string; cursor: string; limit: number; +} +export interface TaskCatalogStatus { + state: string; mode: "disk" | "memory" | string; path?: string; revision: number; + indexed: number; total: number; pending: number; failed: number; lastError?: string; +} +export interface TaskCatalogItem { projectKey: string; projectLabel: string; task: TaskSnapshot } +export interface TaskPage { items: TaskCatalogItem[]; nextCursor: string; revision: number; partial: boolean; staleCursor: boolean; status: TaskCatalogStatus } +export interface TaskEventPageRequest { projectKey: string; taskId: string; after: number; limit: number } +export interface TaskEventPage { items: TaskEvent[]; nextSequence: number; partial: boolean } +export interface TaskActionRequest { projectKey: string; taskId: string; expectedVersion: number; reason: string; idempotencyKey: string } diff --git a/desktop/frontend/src/lib/transcriptStore.ts b/desktop/frontend/src/lib/transcriptStore.ts index 83adc56bc7..ba9b023dd4 100644 --- a/desktop/frontend/src/lib/transcriptStore.ts +++ b/desktop/frontend/src/lib/transcriptStore.ts @@ -29,7 +29,6 @@ // // Rendering consumes the store through TranscriptProjection (items + paging // state); useController dispatches projections into per-tab reducer state. - import { asArray } from "./array"; import { app } from "./bridge"; import { noteHistoryPage, registerTranscriptCacheDiagnostics } from "./sessionDiagnostics"; @@ -601,6 +600,7 @@ export class TranscriptStore { const startedAt = typeof performance !== "undefined" ? performance.now() : Date.now(); const slice = await this.backend.HistorySliceForTab(tabId, req); const endedAt = typeof performance !== "undefined" ? performance.now() : Date.now(); + if (slice.error?.trim()) throw new Error(slice.error.trim()); const entries = asArray(slice.entries); let inlineBytes = 0; for (const entry of entries) inlineBytes += recordBytes(entry.message); diff --git a/desktop/frontend/src/lib/types.ts b/desktop/frontend/src/lib/types.ts index 2e51f1e311..e27d646a22 100644 --- a/desktop/frontend/src/lib/types.ts +++ b/desktop/frontend/src/lib/types.ts @@ -1,10 +1,9 @@ // Wire contract — mirrors desktop/wire.go (itself mirroring internal/serve/wire.go). // One event channel carries every kind; `kind` discriminates the payload. - 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" | "reasoning" @@ -30,9 +29,7 @@ export type EventKind = | "stream_attempt" | "context_maintenance" | "workspace_changed"; - export type StreamAttemptAction = "begin" | "discard" | "commit"; - export interface WireStreamAttempt { id: string; action: StreamAttemptAction; @@ -41,14 +38,12 @@ export interface WireStreamAttempt { /** Fixed enum only: connection_reset | premature_eof | idle_timeout */ reason?: string; } - export interface WireCompaction { trigger?: string; // "auto" | "manual" messages?: number; // done: how many messages were folded into the summary summary?: string; // done: the briefing (empty on an aborted pass) archive?: string; // done: archive path, if any } - export interface WireProfile { model?: string; effort?: string; @@ -426,6 +421,7 @@ export interface TabMeta { sessionPath?: string; sessionRevision?: number; sessionDigest?: string; + sessionGeneration?: number; readOnly?: boolean; filePath?: string; projectColor?: string; @@ -484,6 +480,8 @@ export interface ProjectNode { sessionPath?: string; projectColor?: string; turns?: number; + turnsState?: "unknown" | "valid" | "corrupt" | string; + health?: "ok" | "missing" | "corrupt" | "degraded" | string; createdAt?: number; lastActivityAt?: number; open?: boolean; @@ -688,6 +686,8 @@ export interface HistoryEntry { refs: HistoryContentRef[]; } +export interface SessionClearResult { sessionPath: string; sessionRevision?: number; sessionDigest?: string; sessionGeneration: number } + export interface HistorySlice { entries: HistoryEntry[]; nextCursor: string; // toward older; empty when none @@ -699,9 +699,9 @@ export interface HistorySlice { revision: number; revisionKnown?: boolean; digest?: string; - // Diagnostic read path: index|scan|event-log|live-index|live-fallback (empty when the - // backend predates the field or no session was readable). + // Diagnostic read path: index|scan|event-log|live-index|live-fallback. source?: string; + error?: string; // failed read; empty entries alone are not an error } export interface HistoryContentChunk { @@ -818,6 +818,7 @@ export interface SessionMeta { preview: string; title?: string; // user-chosen name; falls back to preview when empty turns: number; + turnsState?: "unknown" | "valid" | "corrupt" | string; createdAt: number; // unix milliseconds lastActivityAt: number; // unix milliseconds modTime: number; // compatibility alias for lastActivityAt @@ -840,15 +841,7 @@ 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; - createdAt?: number; - lastActivityAt?: number; -} +export type { HistoryIndexStatus, HistorySearchContextLine, HistorySearchContextRequest, HistorySearchHit, HistorySearchPage, HistorySearchRequest, HistorySessionPage, HistorySessionPageRequest } from "./historyCatalogTypes"; export interface WorkspaceView { path: string; @@ -881,6 +874,7 @@ export interface Meta { sessionPath?: string; sessionRevision?: number; sessionDigest?: string; + sessionGeneration?: number; cwd: string; workspaceRoot?: string; workspaceName?: string; @@ -2286,6 +2280,8 @@ export interface TaskSnapshot { error_summary?: string; } +export type { TaskActionRequest, TaskCatalogItem, TaskCatalogStatus, TaskEventPage, TaskEventPageRequest, TaskPage, TaskPageRequest } from "./taskCatalogTypes"; + export interface ControlResult { schema_version: number; command: string; diff --git a/desktop/frontend/src/lib/useController.ts b/desktop/frontend/src/lib/useController.ts index 05cb6a8570..2ad97f8a0b 100644 --- a/desktop/frontend/src/lib/useController.ts +++ b/desktop/frontend/src/lib/useController.ts @@ -1,7 +1,6 @@ -// useController is the frontend's state machine over the agent event stream. Per-tab -// state preserves background streaming output, tools, and approvals across tab switches; -// components render only the active tab's state. - +// useController is the frontend's state machine over the agent event stream. It keeps +// per-tab output, tool state, and approvals while the user switches tabs; components +// render the active tab's state. import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import { asArray } from "./array"; import { addBreadcrumb } from "./breadcrumbs"; @@ -17,6 +16,8 @@ import { applyLiveSegments, coalesceStreamDeltas, completeLiveReasoning, type St import { getTranscriptStore } from "./transcriptStore"; import { uiPerfTracker } from "./uiPerf"; import { getLocale, t, type DictKey } from "./i18n"; +import { applyHydrateErrorState, hydratePlaceholderItems as resolveHydratePlaceholders } from "./hydrateErrorState"; +import { hydrateIdentityCurrent } from "./sessionIdentity"; import { sameTodoList } from "./todoVisibility"; import { fileDiffFromWire, summarize, summarizeFileDiff, type ToolFileDiff } from "./tools"; import { modeHasAutoApproveTools, normalizeMode, normalizeToolApprovalMode } from "./types"; @@ -53,41 +54,33 @@ import type { WireUsage, WireShellExecution, } from "./types"; - export type ToolStatus = "running" | "done" | "error" | "stopped"; - // Reserved ToolProgress channel names for sub-agent progress previews (the Go // tracker emits these; ordinary tool progress must never use them). export const SUBAGENT_PROGRESS_STATUS = "reasonix.subagent.status"; export const SUBAGENT_PROGRESS_REASONING = "reasonix.subagent.reasoning"; export const SUBAGENT_PROGRESS_TEXT = "reasonix.subagent.text"; export const SUBAGENT_PROGRESS_NOTICE = "reasonix.subagent.notice"; - // Reserved names are matched by prefix so a future channel never falls back // to ordinary tool output on older frontends. const SUBAGENT_PROGRESS_PREFIX = "reasonix.subagent."; const TURN_ACTIVITY_KINDS = new Set(["turn_started", "text", "reasoning", "message", "tool_dispatch", "tool_progress", "tool_result"]); - const SUBAGENT_PROGRESS_PHASES = new Set([ "queued", "running", "reasoning", "responding", "tool", "retrying", "completed", "failed", "cancelled", ]); - // Tool names that initialize a sub-agent progress card. parallel_tasks/fleet // are group cards: they settle when their whole child progress tree is // terminal, since they never receive a terminal status of their own. const SUBAGENT_PROGRESS_TOOLS = new Set(["task", "read_only_task", "parallel_tasks", "fleet"]); - // Per-channel preview retention. The backend already bounds what it sends // (8 KiB pending per child); these caps keep one hot card from dominating the // live conversation memory. const SUBAGENT_PREVIEW_REASONING_LIMIT = 8 << 10; const SUBAGENT_PREVIEW_TEXT_LIMIT = 8 << 10; const SUBAGENT_PREVIEW_NOTICE_LIMIT = 2 << 10; - export type SubagentPhase = | "queued" | "running" | "reasoning" | "responding" | "tool" | "retrying" | "completed" | "failed" | "cancelled"; - // In-memory-only sub-agent progress preview. Never persisted: history // hydration rebuilds tool items from the transcript without these fields, and // the full sub-agent transcript stays the source of truth after a restart. @@ -101,19 +94,15 @@ export type SubagentProgress = { durationMs?: number; startedAt: number; }; - export function isSubagentProgressName(name: string | undefined): boolean { return !!name && name.startsWith(SUBAGENT_PROGRESS_PREFIX); } - export function isTerminalSubagentPhase(phase: string | undefined): boolean { return phase === "completed" || phase === "failed" || phase === "cancelled"; } - function isGroupSubagentTool(name: string): boolean { return name === "parallel_tasks" || name === "fleet"; } - function terminalStatusOf(phase: string): ToolStatus { switch (phase) { case "completed": return "done"; @@ -122,21 +111,17 @@ function terminalStatusOf(phase: string): ToolStatus { } return "running"; } - function freshSubagentProgress(): SubagentProgress { const now = Date.now(); return { phase: "running", reasoning: "", text: "", notice: "", lastActivityAt: now, truncated: false, startedAt: now }; } - /** Keeps the most recent `limit` code points; surrogate pairs stay intact. */ function tailPreview(text: string, limit: number): string { if (text.length <= limit) return text; const pts = Array.from(text); return pts.slice(pts.length - limit).join(""); } - // --- Sub-agent progress reducer helpers -------------------------------------- - // Applies one reserved ToolProgress event to the target card's in-memory // preview. The card must exist (its dispatch always precedes progress events) // and have been initialized by the dispatch. Never writes tool.output, never @@ -176,7 +161,6 @@ function applySubagentProgress(s: State, t: WireTool): State { next[idx] = { ...it, subagentProgress: sp, status }; return { ...s, items: next }; } - // Nested real tool activity refreshes its sub-agent parent's recent activity // and switches the phase to "tool". Terminal parents are left untouched. function touchSubagentParent(next: Item[], parentId: string): void { @@ -186,7 +170,6 @@ function touchSubagentParent(next: Item[], parentId: string): void { if (it.kind !== "tool" || !it.subagentProgress || isTerminalSubagentPhase(it.subagentProgress.phase)) return; next[idx] = { ...it, subagentProgress: { ...it.subagentProgress, phase: "tool", lastActivityAt: Date.now() } }; } - export type LiveStream = { id: string; text: string; @@ -195,7 +178,6 @@ export type LiveStream = { reasoningStartedAt?: number; reasoningCompletedAt?: number; }; - /** Speculative journal for one sampling attempt — rolled back on discard. */ type StreamAttemptJournal = { id: string; @@ -217,7 +199,6 @@ export type HydrateReason = "switch-tab" | "new-session" | "resume-session" | "o type SyncActiveTabOptions = { preserveCachedHistory?: boolean; }; - // A ticketed StartTopicActivation in flight. Only the latest one is tracked: // superseded requests get "cancelled" from the backend and are ignored. type PendingTopicActivation = { @@ -228,23 +209,18 @@ type PendingTopicActivation = { /** Terminal event that arrived before the ticket resolved. */ terminal?: TopicActivationEvent; }; - type ModelSwitchQueueResult = "applied" | "superseded"; - type ModelSwitchQueueRequest = { name: string; resolve: (result: ModelSwitchQueueResult) => void; reject: (err: unknown) => void; }; - type ModelSwitchQueueState = { running: boolean; pending?: ModelSwitchQueueRequest; fallbackBalance?: BalanceInfo; }; - const HISTORY_PAGE_TURNS = 60; - export type Item = | { kind: "user"; id: string; submissionId?: string; text: string; submitText?: string; failed?: boolean; createdAt?: number; checkpointTurn?: number } | { kind: "assistant"; id: string; text: string; reasoning: string; streaming: boolean; reasoningComplete?: boolean; reasoningDurationMs?: number; workDurationMs?: number; memoryCitations?: MemoryCitation[] } @@ -294,10 +270,8 @@ export type Item = generation?: number; card: WireExtensionCard; }; - type ToolItem = Extract; export type ExtensionItem = Extract; - // Extension UI surfaces (stage 8b2) — per-tab state fed by extension_surface / // extension_status wire events. Statuses and generations key on // ":"; the form is the single pending form surface (a new @@ -312,14 +286,12 @@ export interface ExtensionStatusEntry { progress?: number; generation?: number; } - export interface ExtensionFormState { pluginId: string; surfaceId: string; generation?: number; form: WireExtensionForm; } - export interface ExtensionNotificationEntry { id: string; pluginId: string; @@ -327,13 +299,11 @@ export interface ExtensionNotificationEntry { body?: string; severity?: string; } - // extensionSurfaceKey is the identity a sidecar re-publishes under to replace // one of its surfaces. export function extensionSurfaceKey(surface: Pick): string { return `${surface.pluginId}:${surface.surfaceId}`; } - // acceptsExtensionGeneration drops a re-ordered surface publication: within // one runtime, a sidecar's generation is monotonic, so anything older than the // last accepted generation for the same surface is stale. Events without a @@ -341,17 +311,14 @@ export function extensionSurfaceKey(surface: Pick= stored; } - // Mid-turn steer messages are recorded as info notices carrying this prefix — // both live (the "steer" event below) and in replayed history (desktop/app.go // prefixes persisted steers the same way). The prefix is the only durable // marker, so display code identifies steers by it. export const STEER_NOTICE_PREFIX = "↪ "; - export function isSteerNoticeText(text: string): boolean { return text.startsWith(STEER_NOTICE_PREFIX); } - interface State { items: Item[]; running: boolean; @@ -482,7 +449,6 @@ interface State { // Host-local only; never hydrated from history. streamAttemptJournal?: StreamAttemptJournal; } - export const initialState: State = { items: [], running: false, @@ -532,14 +498,12 @@ export const initialState: State = { extensionNotifications: [], extensionGenerations: {}, }; - function usageTotalTokens(usage?: WireUsage): number { if (!usage) return 0; if (usage.totalTokens > 0) return usage.totalTokens; const promptTokens = usage.promptTokens || usage.cacheHitTokens + usage.cacheMissTokens; return Math.max(0, promptTokens + usage.completionTokens); } - type RuntimeMetaSnapshot = { running: boolean; pendingPrompt?: boolean; @@ -547,13 +511,11 @@ type RuntimeMetaSnapshot = { cancelRequested?: boolean; cancellable?: boolean; }; - export function foregroundRunningFromRuntimeMeta(meta: RuntimeMetaSnapshot): boolean { if (typeof meta.cancellable === "boolean") return meta.cancellable; if ((meta.backgroundJobs ?? 0) > 0 && !meta.pendingPrompt) return false; return Boolean(meta.running); } - // Clock used to order live prompt events against runtime snapshot fetches. // Monotonic (immune to wall-clock jumps) with sub-millisecond resolution, so // an event and a snapshot initiated in the same millisecond still order @@ -561,7 +523,6 @@ export function foregroundRunningFromRuntimeMeta(meta: RuntimeMetaSnapshot): boo export function promptEventClock(): number { return typeof performance !== "undefined" ? performance.now() : Date.now(); } - // True when a runtime snapshot was fetched before the tab's live approval/ask // event arrived. Such a snapshot reports the tab idle only because it predates // the prompt (pre-attach ListTabs, activation-time metas); applying it would @@ -577,7 +538,6 @@ export function runtimeSnapshotPredatesPrompt( if (snapshotAt === undefined || state.promptArrivedAt === undefined) return false; return snapshotAt <= state.promptArrivedAt; } - function runtimeSnapshotPredatesRetry( state: Pick | undefined, snapshotAt: number | undefined, @@ -585,12 +545,10 @@ function runtimeSnapshotPredatesRetry( if (snapshotAt === undefined || state?.retry?.observedAt === undefined) return false; return snapshotAt <= state.retry.observedAt; } - function updatesContextGauge(usage?: WireUsage): boolean { const source = usage?.source?.trim(); return !source || source === "executor"; } - export function metaFromTab(tab: TabMeta, existing?: Meta): Meta { const cwd = tab.cwd || tab.workspaceRoot || existing?.cwd || ""; const toolApprovalMode = normalizeToolApprovalMode( @@ -613,23 +571,21 @@ export function metaFromTab(tab: TabMeta, existing?: Meta): Meta { sessionPath: tab.sessionPath !== undefined ? tab.sessionPath : existing?.sessionPath, sessionRevision: tab.sessionRevision !== undefined ? tab.sessionRevision : existing?.sessionRevision, sessionDigest: tab.sessionDigest !== undefined ? tab.sessionDigest : existing?.sessionDigest, + sessionGeneration: tab.sessionGeneration !== undefined ? tab.sessionGeneration : existing?.sessionGeneration, gitBranch: tab.gitBranch || existing?.gitBranch, autoApproveTools, bypass: autoApproveTools, collaborationMode: tab.collaborationMode ?? existing?.collaborationMode ?? "normal", toolApprovalMode, - tokenMode: tab.tokenMode ?? existing?.tokenMode ?? "full", goal: tab.goal ?? existing?.goal, goalStatus: tab.goalStatus ?? existing?.goalStatus, canonicalTodos: existing?.canonicalTodos, }; } - function countsTowardCurrentTurn(state: State): boolean { return state.turnActive || state.running; } - export function sameMeta(a?: Meta, b?: Meta): boolean { if (a === b) return true; if (!a || !b) return false; @@ -653,6 +609,7 @@ export function sameMeta(a?: Meta, b?: Meta): boolean { a.sessionPath === b.sessionPath && a.sessionRevision === b.sessionRevision && a.sessionDigest === b.sessionDigest && + a.sessionGeneration === b.sessionGeneration && a.gitBranch === b.gitBranch && a.imageInputEnabled === b.imageInputEnabled && a.autoApproveTools === b.autoApproveTools && @@ -2024,7 +1981,7 @@ export function reducer(s: State, a: Action): State { case "hydrate_done": return s.hydrating || s.hydrateReason || s.hydrateError || s.hydrateHistoryLoaded || s.hydratePlaceholderItems ? { ...s, hydrating: false, hydrateReason: undefined, hydrateError: undefined, hydrateHistoryLoaded: undefined, hydratePlaceholderItems: undefined } : s; - case "hydrate_error": return { ...s, hydrating: false, hydrateReason: a.reason, hydrateError: a.error, hydrateHistoryLoaded: undefined, hydratePlaceholderItems: undefined }; + case "hydrate_error": return applyHydrateErrorState(s, a.reason, a.error); case "backend_activation_start": return { ...s, // The target tab may contain a prompt event that was routed there while @@ -2861,6 +2818,7 @@ export function useController() { sessionPath?: string; sessionRevision?: number; sessionDigest?: string; + sessionGeneration?: number; cancelHydrateGeneration?: number; deferResetUntilHistory?: boolean; } = {}, @@ -2869,6 +2827,7 @@ export function useController() { const sessionPath = (options.sessionPath ?? stateMeta?.sessionPath ?? "").trim(); const sessionRevision = options.sessionRevision ?? stateMeta?.sessionRevision; const sessionDigest = options.sessionDigest ?? stateMeta?.sessionDigest; + const sessionGeneration = options.sessionGeneration ?? stateMeta?.sessionGeneration; const canJoinInFlight = !reset && !options.skipHistory; const shouldTrackInFlight = !options.skipHistory; if (canJoinInFlight) { @@ -2887,14 +2846,19 @@ export function useController() { options.skipHistory || (options.preserveCachedHistory && !reset && hasReusableCachedTranscript(statesRef.current.get(tabId), sessionPath, sessionRevision, sessionDigest)), ); - const deferResetUntilHistory = Boolean(options.deferResetUntilHistory && reset && !skipHistory); - const stillCurrent = () => - sessionLoadCurrent(tabId, seq) && - (cancelHydrateGeneration === undefined || cancelHydrateCurrent(tabId, cancelHydrateGeneration)); + const deferResetUntilHistory = Boolean((options.deferResetUntilHistory ?? true) && reset && !skipHistory); + // Request seq alone cannot stop clear→mode-switch races: a load started + // after clear with stale meta.sessionPath must also be rejected. + const stillCurrent = () => { + if (!sessionLoadCurrent(tabId, seq)) return false; + if (cancelHydrateGeneration !== undefined && !cancelHydrateCurrent(tabId, cancelHydrateGeneration)) return false; + const meta = statesRef.current.get(tabId)?.meta; + return hydrateIdentityCurrent(sessionPath, sessionGeneration, meta?.sessionPath, meta?.sessionGeneration); + }; if (!stillCurrent()) return; addBreadcrumb("tab.hydrate", `start ${reason} ${tabId}`); ensureTranscriptSubscription(tabId); - dispatchTo(tabId, { type: "hydrate_start", reason, placeholderItems: options.placeholderItems }); + dispatchTo(tabId, { type: "hydrate_start", reason, placeholderItems: resolveHydratePlaceholders(options.placeholderItems, statesRef.current.get(tabId)?.items) }); if (reset && !deferResetUntilHistory && stillCurrent()) dispatchTo(tabId, { type: "reset" }); const requiresVisibleTab = reason === "startup" || reason === "switch-tab" || reason === "open-topic"; const stillVisible = () => !requiresVisibleTab || activeTabIdRef.current === tabId; @@ -2936,6 +2900,12 @@ export function useController() { ); if (!stillCurrent()) return; + if (!skipHistory && projection === undefined) { + const errText = t("history.failedLoadHistory"); + dispatchTo(tabId, { type: "hydrate_error", reason, error: errText }); + dispatchTo(tabId, { type: "local_notice", level: "warn", text: errText }); + addBreadcrumb("tab.hydrate", `history failed ${tabId} ms=${Date.now() - historyStartedAt}`); return; + } if (!skipHistory && projection !== undefined && !foregroundTurnActive()) { if (deferResetUntilHistory && stillCurrent()) dispatchTo(tabId, { type: "reset" }); dispatchTo(tabId, { @@ -4025,10 +3995,11 @@ export function useController() { if (tabId) { bumpCheckpointRefreshSeq(tabId); bumpSessionLoadSeq(tabId); + sessionLoadInFlight.current.delete(tabId); } + let cleared: { sessionPath: string; sessionRevision?: number; sessionDigest?: string; sessionGeneration: number }; try { - if (tabId) await app.ClearSessionForTab(tabId); - else await app.ClearSession(); + cleared = tabId ? await app.ClearSessionForTab(tabId) : await app.ClearSession(); } catch { if (tabId) void loadSessionDataForTab(tabId); return; @@ -4036,18 +4007,42 @@ export function useController() { if (tabId) bumpSessionLoadSeq(tabId); invalidateCache(); if (tabId) { + // Retire every resident projection for this tab so a mode switch cannot + // preferResident-serve the destroyed transcript. + getTranscriptStore().evictTab(tabId); + const existing = statesRef.current.get(tabId)?.meta; + const nextMeta = { + ...(existing ?? { label: "", ready: true, eventChannel: "agent:event", cwd: "" }), + sessionPath: cleared.sessionPath || "", + sessionRevision: cleared.sessionRevision, + sessionDigest: cleared.sessionDigest, + sessionGeneration: cleared.sessionGeneration, + }; + // Meta first so reset preserves the replacement identity. + dispatchTo(tabId, { type: "optimistic_meta", meta: nextMeta }); dispatchTo(tabId, { type: "reset" }); - // Clear placeholder items since no history action follows. dispatchTo(tabId, { type: "history", messages: [] }); } }, [activeTabId, bumpCheckpointRefreshSeq, bumpSessionLoadSeq, dispatchTo, loadSessionDataForTab, waitForTabReady]); - const listSessions = useCallback(async (): Promise => asArray(await app.ListSessions().catch(() => [])), []); + const listSessions = useCallback(async (): Promise => { + const page = await app.ListHistorySessions({ scope: "all", workspaceRoot: "", status: "all", timeFilter: "all", query: "", cursor: "", limit: 200 }); + if (!page) throw new Error(t("history.failedLoadHistory")); + return asArray(page.items); + }, []); const listTrashedSessions = useCallback(async (): Promise => asArray(await app.ListTrashedSessions().catch(() => [])), []); + const retrySessionHistory = useCallback(async (tabId?: string) => { + const id = tabId || activeTabIdRef.current; if (!id) return; + const m = statesRef.current.get(id)?.meta; + await loadSessionDataForTab(id, false, "startup", { sessionPath: m?.sessionPath, sessionRevision: m?.sessionRevision, sessionDigest: m?.sessionDigest, preserveCachedHistory: false }); + }, [loadSessionDataForTab]); const resumeSession = useCallback(async (path: string, tabId?: string, navigationIntentSeq?: number) => { const targetTabId = tabId || activeTabId; if (!targetTabId) return; const navigationSeq = navigationIntentSeq ?? beginActiveNavigation(); + const existingMeta = statesRef.current.get(targetTabId)?.meta; + if (existingMeta) dispatchTo(targetTabId, { type: "optimistic_meta", meta: { ...existingMeta, sessionPath: path } }); + void loadSessionDataForTab(targetTabId, false, "resume-session", { sessionPath: path, preserveCachedHistory: true }); if (tabId) await waitForTabReady(tabId); else if (!(await waitForBackendActiveTab(targetTabId))) return; if (!navigationCompletionCurrent(navigationSeq, "session.resume", targetTabId)) return; @@ -4073,7 +4068,7 @@ export function useController() { if (!isNavigationIntentCurrent(navigationSeq) || !sessionLoadCurrent(targetTabId, seq)) return; app.ContextUsageForTab(targetTabId).then((context) => dispatchTo(targetTabId, { type: "context", context })).catch(() => {}); void refreshCheckpoints(targetTabId); - }, [activeTabId, beginActiveNavigation, bumpSessionLoadSeq, dispatchTo, isNavigationIntentCurrent, navigationCompletionCurrent, refreshCheckpoints, refreshMetaOnlyForTab, sessionLoadCurrent, waitForBackendActiveTab, waitForTabReady]); + }, [activeTabId, beginActiveNavigation, bumpSessionLoadSeq, dispatchTo, isNavigationIntentCurrent, loadSessionDataForTab, navigationCompletionCurrent, refreshCheckpoints, refreshMetaOnlyForTab, sessionLoadCurrent, waitForBackendActiveTab, waitForTabReady]); const openChannelSession = useCallback(async (path: string, tabId: string, navigationIntentSeq?: number) => { if (!tabId) return; @@ -4717,7 +4712,7 @@ export function useController() { send, sendToTab, recoverDeliveryToTab, runShell, runShellForTab, steer, steerForTab, notice, cancel, approve, resolvePlanDecision, resolveRecovery, answerQuestion, setControllerMode, dismissExtensionForm, drainExtensionNotifications, setCollaborationMode, setCollaborationModeForTab, setToolApprovalMode, setToolApprovalModeForTab, setComposerProfileForTab, setGoal, setGoalForTab, clearGoal, clearGoalForTab, resumeGoal, resumeGoalForTab, pauseGoal, pauseGoalForTab, - newSession, clearSession, listSessions, listTrashedSessions, resumeSession, openChannelSession, previewSession, deleteSession, restoreSession, purgeTrashedSession, renameSession, + newSession, clearSession, listSessions, listTrashedSessions, retrySessionHistory, resumeSession, openChannelSession, previewSession, deleteSession, restoreSession, purgeTrashedSession, renameSession, loadOlderHistory, requestHistoryFullContent, refreshMeta, pickWorkspace, switchWorkspace, compact, rewind, rewindForTab, rewindForTabDetailed, undoRewindForTab, setModel, setEffort, setTokenMode, cancelJob, diff --git a/desktop/frontend/src/lib/useHistoryCatalog.ts b/desktop/frontend/src/lib/useHistoryCatalog.ts new file mode 100644 index 0000000000..44be148ea4 --- /dev/null +++ b/desktop/frontend/src/lib/useHistoryCatalog.ts @@ -0,0 +1,146 @@ +import { useCallback, useEffect, useRef, useState } from "react"; +import { app } from "./bridge"; +import type { HistorySearchHit, SessionMeta } from "./types"; + +function hitKey(hit: HistorySearchHit): string { + return `${hit.sessionPath}:${hit.messageIndex}:${hit.kind}:${hit.toolName ?? ""}`; +} + +export function useHistoryCatalog({ + isTrash, + suppliedSessions, + scope, + status, + timeFilter, + query, +}: { + isTrash: boolean; + suppliedSessions: SessionMeta[]; + scope: string; + status: string; + timeFilter: string; + query: string; +}) { + const [catalogSessions, setCatalogSessions] = useState(suppliedSessions); + const [nextSessionCursor, setNextSessionCursor] = useState(""); + const [nextSearchCursor, setNextSearchCursor] = useState(""); + const [partial, setPartial] = useState(false); + const [progress, setProgress] = useState({ indexed: 0, total: 0 }); + const [searchHits, setSearchHits] = useState([]); + const [refreshNonce, setRefreshNonce] = useState(0); + const requestSeq = useRef(0); + const revision = useRef(0); + const refreshTimer = useRef(null); + const workspaceRoot = suppliedSessions.find((session) => session.current)?.workspaceRoot ?? ""; + + useEffect(() => { + if (isTrash) setCatalogSessions(suppliedSessions); + }, [isTrash, suppliedSessions]); + + const fetchPage = useCallback(async ( + sessionCursor: string, + searchCursor: string, + append: boolean, + seq: number, + ) => { + const base = { scope, workspaceRoot, status, timeFilter, query: query.trim(), limit: 50 }; + const sessionPromise = (!append || sessionCursor) + ? app.ListHistorySessions({ ...base, cursor: sessionCursor }) + : Promise.resolve(null); + const searchPromise = query.trim() && (!append || searchCursor) + ? app.SearchHistoryContent({ ...base, cursor: searchCursor, kinds: [], toolName: "" }) + : Promise.resolve(null); + const [page, bodyPage] = await Promise.all([sessionPromise, searchPromise]); + if (seq !== requestSeq.current) return; + if (page?.staleCursor && sessionCursor) { + void fetchPage("", "", false, seq); + return; + } + if (bodyPage?.staleCursor && searchCursor) { + void fetchPage("", "", false, seq); + return; + } + if (page) { + setCatalogSessions((current) => append + ? [...current, ...page.items.filter((item) => !current.some((existing) => existing.path === item.path))] + : page.items); + setNextSessionCursor(page.nextCursor || ""); + } else if (!append) { + setCatalogSessions([]); + setNextSessionCursor(""); + } + setPartial(Boolean(page?.partial) || Boolean(bodyPage?.partial)); + if (bodyPage) { + setSearchHits((current) => { + if (!append) return bodyPage.items ?? []; + const seen = new Set(current.map(hitKey)); + const merged = [...current]; + for (const hit of bodyPage.items ?? []) { + const key = hitKey(hit); + if (seen.has(key)) continue; + seen.add(key); + merged.push(hit); + } + return merged; + }); + setNextSearchCursor(bodyPage.nextCursor || ""); + setProgress({ indexed: bodyPage.status.indexed, total: bodyPage.status.total }); + } else if (!append) { + setSearchHits([]); + setNextSearchCursor(""); + } + }, [query, scope, status, timeFilter, workspaceRoot]); + + useEffect(() => { + if (isTrash || typeof window === "undefined" || !window.runtime) return; + const seq = ++requestSeq.current; + const timer = window.setTimeout(() => { + void fetchPage("", "", false, seq).catch(() => { + if (seq !== requestSeq.current) return; + setCatalogSessions(suppliedSessions); + setNextSessionCursor(""); + setNextSearchCursor(""); + setSearchHits([]); + }); + }, query.trim() ? 200 : 0); + return () => window.clearTimeout(timer); + }, [fetchPage, isTrash, query, refreshNonce, suppliedSessions]); + + useEffect(() => { + if (isTrash || typeof window === "undefined" || !window.runtime) return; + const unsubscribe = window.runtime.EventsOn("history-index:changed-v1", (payload?: unknown) => { + if (!payload || typeof payload !== "object") return; + const event = payload as { revision?: number; indexed?: number; total?: number; pending?: number }; + const nextRevision = typeof event.revision === "number" ? event.revision : 0; + if (nextRevision <= revision.current) return; + revision.current = nextRevision; + setProgress({ indexed: Number(event.indexed) || 0, total: Number(event.total) || 0 }); + setPartial((Number(event.pending) || 0) > 0 || (Number(event.indexed) || 0) < (Number(event.total) || 0)); + if (refreshTimer.current === null) { + refreshTimer.current = window.setTimeout(() => { + refreshTimer.current = null; + setRefreshNonce((value) => value + 1); + }, 200); + } + }); + return () => { + unsubscribe(); + if (refreshTimer.current !== null) window.clearTimeout(refreshTimer.current); + refreshTimer.current = null; + }; + }, [isTrash]); + + const loadMore = useCallback(() => { + if (!nextSessionCursor && !nextSearchCursor) return; + void fetchPage(nextSessionCursor, nextSearchCursor, true, requestSeq.current); + }, [fetchPage, nextSearchCursor, nextSessionCursor]); + + return { + sessions: isTrash ? suppliedSessions : catalogSessions, + nextCursor: nextSessionCursor || nextSearchCursor, + partial, + progress, + searchHits, + loadMore, + }; +} diff --git a/desktop/frontend/src/locales/en.ts b/desktop/frontend/src/locales/en.ts index dfb34f5992..515b83d0e3 100644 --- a/desktop/frontend/src/locales/en.ts +++ b/desktop/frontend/src/locales/en.ts @@ -1189,6 +1189,7 @@ export const en = { "history.deleted": "deleted", "history.turnOne": "{n} turn", "history.turnOther": "{n} turns", + "history.indexing": "Indexing history", "history.confirmDelete": "Confirm delete", "history.confirmPurge": "Confirm permanent delete", "history.clearTrash": "Empty trash", @@ -1230,6 +1231,7 @@ export const en = { "history.channelReadOnly": "Read-only channel", "history.failedOpenProject": "Cannot open session, \"{name}\" does not exist: {path}", "history.failedOpenSession": "Cannot open session", + "history.failedLoadHistory": "Failed to load conversation history. Previous content was kept when available — retry to try again.", "history.failedOpenGlobal": "Cannot open global session", "history.missingWorkspaceRoot": "Cannot open session because its workspace path is missing.", "history.selectSession": "Select a session to preview.", @@ -1249,6 +1251,9 @@ export const en = { "projectTree.workspaceTitle": "Projects", "projectTree.pinnedTitle": "Pinned", "projectTree.searchPlaceholder": "Search projects or sessions", + "projectTree.indexing": "Organizing history", + "projectTree.indexingProgress": "Organizing history ({done}/{total})", + "projectTree.loadMore": "Load more", "projectTree.newTopic": "New session", "projectTree.createWorktree": "Create isolated Delivery workspace", "projectTree.createWorktreeHint": "Create a separate Git branch and worktree so Delivery sessions can write in parallel.", @@ -2384,6 +2389,7 @@ export const en = { "palette.cmd.models": "Models", "palette.cmd.reloadRuntime": "Reload Runtime", "palette.cmd.usageStats": "Usage statistics", + "palette.cmd.taskCenter": "Task Center", "palette.group.remote": "Remote SSH", "palette.group.extensions": "Extensions", "ext.form.defaultTitle": "Extension request", diff --git a/desktop/frontend/src/locales/zh-TW.ts b/desktop/frontend/src/locales/zh-TW.ts index ea76017a44..4c2864dd0c 100644 --- a/desktop/frontend/src/locales/zh-TW.ts +++ b/desktop/frontend/src/locales/zh-TW.ts @@ -933,6 +933,7 @@ export const zhTW: Record = { "history.deleted": "已刪除", "history.turnOne": "{n} 輪", "history.turnOther": "{n} 輪", + "history.indexing": "正在整理歷史", "history.confirmDelete": "確認刪除", "history.confirmPurge": "確認徹底刪除", "history.clearTrash": "清空回收站", @@ -974,6 +975,7 @@ export const zhTW: Record = { "history.channelReadOnly": "唯讀渠道", "history.failedOpenProject": "無法開啟會話，{name}不存在：{path}", "history.failedOpenSession": "無法開啟會話", + "history.failedLoadHistory": "載入會話歷史失敗。若本地仍有內容會保留顯示 — 可重試。", "history.failedOpenGlobal": "無法開啟全域會話", "history.missingWorkspaceRoot": "無法開啟會話：缺少工作區路徑。", "history.selectSession": "選擇一個會話以預覽。", @@ -993,6 +995,9 @@ export const zhTW: Record = { "projectTree.workspaceTitle": "專案", "projectTree.pinnedTitle": "置頂", "projectTree.searchPlaceholder": "搜尋專案或會話", + "projectTree.indexing": "正在整理歷史", + "projectTree.indexingProgress": "正在整理歷史（{done}/{total}）", + "projectTree.loadMore": "載入更多", "projectTree.newTopic": "新建會話", "projectTree.createWorktree": "建立隔離的交付工作區", "projectTree.createWorktreeHint": "建立獨立的 Git 分支與 worktree，讓多個交付會話安全並行寫入。", @@ -3030,6 +3035,7 @@ export const zhTW: Record = { "palette.cmd.models": "模型", "palette.cmd.reloadRuntime": "重載執行階段", "palette.cmd.usageStats": "使用統計", + "palette.cmd.taskCenter": "任務中心", "palette.group.remote": "遠端 SSH", "palette.group.extensions": "擴充功能", "ext.form.defaultTitle": "擴充功能請求", diff --git a/desktop/frontend/src/locales/zh.ts b/desktop/frontend/src/locales/zh.ts index 24dab16148..1a372f2f8b 100644 --- a/desktop/frontend/src/locales/zh.ts +++ b/desktop/frontend/src/locales/zh.ts @@ -1190,6 +1190,7 @@ export const zh: Record = { "history.deleted": "已删除", "history.turnOne": "{n} 轮", "history.turnOther": "{n} 轮", + "history.indexing": "正在整理历史", "history.confirmDelete": "确认删除", "history.confirmPurge": "确认彻底删除", "history.clearTrash": "清空回收站", @@ -1231,6 +1232,7 @@ export const zh: Record = { "history.channelReadOnly": "只读渠道", "history.failedOpenProject": "无法打开会话，{name}不存在：{path}", "history.failedOpenSession": "无法打开会话", + "history.failedLoadHistory": "加载会话历史失败。若本地仍有内容会保留显示 — 可重试。", "history.failedOpenGlobal": "无法打开全局会话", "history.missingWorkspaceRoot": "无法打开会话：缺少工作区路径。", "history.selectSession": "选择一个会话以预览。", @@ -1250,6 +1252,9 @@ export const zh: Record = { "projectTree.workspaceTitle": "项目", "projectTree.pinnedTitle": "置顶", "projectTree.searchPlaceholder": "搜索项目或会话", + "projectTree.indexing": "正在整理历史", + "projectTree.indexingProgress": "正在整理历史（{done}/{total}）", + "projectTree.loadMore": "加载更多", "projectTree.newTopic": "新会话", "projectTree.createWorktree": "创建隔离的交付工作区", "projectTree.createWorktreeHint": "创建独立的 Git 分支和 worktree，让多个交付会话安全并行写入。", @@ -2387,6 +2392,7 @@ export const zh: Record = { "palette.cmd.models": "模型", "palette.cmd.reloadRuntime": "重载运行时", "palette.cmd.usageStats": "使用统计", + "palette.cmd.taskCenter": "任务中心", "palette.group.remote": "远程 SSH", "palette.group.extensions": "扩展", "ext.form.defaultTitle": "扩展请求", diff --git a/desktop/frontend/src/styles.css b/desktop/frontend/src/styles.css index c582477ba0..9dd943de90 100644 --- a/desktop/frontend/src/styles.css +++ b/desktop/frontend/src/styles.css @@ -24774,6 +24774,13 @@ body > .mermaid-diagram--fullscreen { font-size: 13px; } +.project-tree__catalog-progress { + padding: 4px 10px 6px; + color: var(--fg-muted); + font-size: 11px; + line-height: 1.35; +} + .project-tree__empty--subtle { padding: 8px 12px; font-size: 12px; diff --git a/desktop/go.mod b/desktop/go.mod index b4c3052e50..6898075d7f 100644 --- a/desktop/go.mod +++ b/desktop/go.mod @@ -37,6 +37,7 @@ require ( github.com/bmatcuk/doublestar/v4 v4.10.0 // indirect github.com/clipperhouse/uax29/v2 v2.7.0 // indirect github.com/danieljoos/wincred v1.2.3 // indirect + github.com/dustin/go-humanize v1.0.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gorilla/websocket v1.5.3 // indirect @@ -52,13 +53,15 @@ require ( github.com/leaanthony/slicer v1.6.0 // indirect github.com/leaanthony/u v1.1.1 // indirect github.com/mattn/go-colorable v0.1.15 // indirect - github.com/mattn/go-isatty v0.0.22 // indirect + github.com/mattn/go-isatty v0.0.24 // indirect github.com/mattn/go-pointer v0.0.1 // indirect github.com/mattn/go-runewidth v0.0.27 // indirect + github.com/ncruces/go-strftime v1.0.0 // indirect github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pkg/sftp v1.13.11 // indirect + github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect github.com/samber/lo v1.53.0 // indirect @@ -77,6 +80,10 @@ require ( golang.org/x/crypto v0.54.0 // indirect golang.org/x/net v0.57.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect + modernc.org/libc v1.74.4 // indirect + modernc.org/mathutil v1.7.1 // indirect + modernc.org/memory v1.11.0 // indirect + modernc.org/sqlite v1.56.0 // indirect mvdan.cc/sh/v3 v3.13.1 // indirect ) diff --git a/desktop/go.sum b/desktop/go.sum index 5ce413ac94..220e53a907 100644 --- a/desktop/go.sum +++ b/desktop/go.sum @@ -25,6 +25,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI= github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho= github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo= github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= @@ -37,11 +39,15 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +github.com/google/pprof v0.0.0-20260802141513-ef3492d7dac3 h1:LMLX+LgTNWpfvCBdFebv6EsYotImrt/Ppc5cXIriCSo= +github.com/google/pprof v0.0.0-20260802141513-ef3492d7dac3/go.mod h1:jl5iWTm0/hd5PjEYEOuwAJ57L/CibdZfrqZ5XA5GrCk= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= +github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1 h1:njuLRcjAuMKr7kI3D85AXWkw6/+v9PwtV6M6o11sWHQ= github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= @@ -77,12 +83,14 @@ github.com/matryer/is v1.4.1 h1:55ehd8zaGABKLXQUe2awZ99BD/PTc2ls+KV/dXphgEQ= github.com/matryer/is v1.4.1/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= github.com/mattn/go-colorable v0.1.15 h1:+u9SLTRGnXv73cEsnsmoZBom+dMU88B2M0aDcWy0/jY= github.com/mattn/go-colorable v0.1.15/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= -github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4= -github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= +github.com/mattn/go-isatty v0.0.24 h1:tGZZoVgT/KiqK1c8ocVLeDS8BSWMRd47J3Lbz7vsReI= +github.com/mattn/go-isatty v0.0.24/go.mod h1:nMCL3Zebbrt45jsMDgnfIwz6ydEQApk5oEI3HqDio6A= github.com/mattn/go-pointer v0.0.1 h1:n+XhsuGeVO6MEAp7xyEukFINEa+Quek5psIR/ylA6o0= github.com/mattn/go-pointer v0.0.1/go.mod h1:2zXcozF6qYGgmsG+SeTZz3oAbFLdD3OWqnUbNvJZAlc= github.com/mattn/go-runewidth v0.0.27 h1:Feg/Oou5zI/wnpgDF6omIU0OokC9GxLC/WRknhVlIR0= github.com/mattn/go-runewidth v0.0.27/go.mod h1:3qAiGCV4Koz/yuveO58qUefmUTRm8r0IGEXZ9jeHp/8= +github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w= +github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= @@ -93,6 +101,8 @@ github.com/pkg/sftp v1.13.11 h1:0N92SLTB8JqASJB14ZLHHzFnBV8mG9zw4K7jghEFWuE= github.com/pkg/sftp v1.13.11/go.mod h1:uNkH9roSXglNJqM+glJJi+TQXQUm0fXFWqCFmT8hsN0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= @@ -203,6 +213,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q= +golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -212,5 +224,33 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +modernc.org/cc/v4 v4.29.1 h1:MKgdCV3WykTSPqpVrnxdEDS0HEd2FHpKZDzxzU5LyeI= +modernc.org/cc/v4 v4.29.1/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI= +modernc.org/ccgo/v4 v4.34.6 h1:sBgfIwyN0TQ9C5hwIeuqyeAKyMWnbvj2fvpF4L11uzU= +modernc.org/ccgo/v4 v4.34.6/go.mod h1:SZ8YcN9NG7XVsQYdm6jYBvi8PQP1qi+kqB6OhjqI3Fk= +modernc.org/fileutil v1.4.0 h1:j6ZzNTftVS054gi281TyLjHPp6CPHr2KCxEXjEbD6SM= +modernc.org/fileutil v1.4.0/go.mod h1:EqdKFDxiByqxLk8ozOxObDSfcVOv/54xDs/DUHdvCUU= +modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI= +modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito= +modernc.org/gc/v3 v3.1.4 h1:2g65LGVSmFQrXeITAw97x7hCRvZFcyE1uDP+7Vng7JI= +modernc.org/gc/v3 v3.1.4/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY= +modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks= +modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI= +modernc.org/libc v1.74.4 h1:fX1Omw4o2/1C2iRkkIsrQTasJQldLhRmuPreXLoWs9k= +modernc.org/libc v1.74.4/go.mod h1:eeQAS9W3sZeKYMFubydxJpII9ybHWshk+7or7bLG9co= +modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU= +modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg= +modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI= +modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= +modernc.org/opt v0.2.0 h1:tGyef5ApycA7FSEOMraay9SaTk5zmbx7Tu+cJs4QKZg= +modernc.org/opt v0.2.0/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns= +modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w= +modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE= +modernc.org/sqlite v1.56.0 h1:/D8e2RfFqoy/Zc6PuC76U28zFwmI/sYx1Kjm4yEn9e0= +modernc.org/sqlite v1.56.0/go.mod h1:yCJ2cmAaIkHQ25oXWrF8H4O1lIfPYPR26yCEDj2P3pQ= +modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0= +modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A= +modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= +modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= mvdan.cc/sh/v3 v3.13.1 h1:DP3TfgZhDkT7lerUdnp6PTGKyxxzz6T+cOlY/xEvfWk= mvdan.cc/sh/v3 v3.13.1/go.mod h1:lXJ8SexMvEVcHCoDvAGLZgFJ9Wsm2sulmoNEXGhYZD0= diff --git a/desktop/hang_watchdog_darwin.go b/desktop/hang_watchdog_darwin.go index 894825387d..dc2c2ff707 100644 --- a/desktop/hang_watchdog_darwin.go +++ b/desktop/hang_watchdog_darwin.go @@ -1,4 +1,4 @@ -//go:build darwin +//go:build darwin && cgo package main diff --git a/desktop/hang_watchdog_darwin_nocgo.go b/desktop/hang_watchdog_darwin_nocgo.go new file mode 100644 index 0000000000..d02fb38c48 --- /dev/null +++ b/desktop/hang_watchdog_darwin_nocgo.go @@ -0,0 +1,9 @@ +//go:build darwin && !cgo + +package main + +func mainThreadWatchdogSupported() bool { return false } + +func startNativeMainThreadHeartbeat(uint64) {} + +func stopNativeMainThreadHeartbeat() {} diff --git a/desktop/history_catalog.go b/desktop/history_catalog.go new file mode 100644 index 0000000000..3f98e0685d --- /dev/null +++ b/desktop/history_catalog.go @@ -0,0 +1,383 @@ +package main + +import ( + "encoding/base64" + "encoding/json" + "errors" + "path/filepath" + "strings" + "time" + + "reasonix/internal/config" + "reasonix/internal/history" + "reasonix/internal/historycatalog" + "reasonix/internal/provider" + "reasonix/internal/sessioncatalog" +) + +type HistorySessionPageRequest struct { + Scope string `json:"scope"` + WorkspaceRoot string `json:"workspaceRoot,omitempty"` + Status string `json:"status"` + TimeFilter string `json:"timeFilter"` + Query string `json:"query"` + Cursor string `json:"cursor"` + Limit int `json:"limit"` +} + +type HistorySessionPage struct { + Items []SessionMeta `json:"items"` + NextCursor string `json:"nextCursor"` + Revision uint64 `json:"revision"` + Partial bool `json:"partial"` + StaleCursor bool `json:"staleCursor"` +} + +type HistorySearchRequest struct { + Query string `json:"query"` + Scope string `json:"scope"` + WorkspaceRoot string `json:"workspaceRoot,omitempty"` + Status string `json:"status"` + TimeFilter string `json:"timeFilter"` + Kinds []string `json:"kinds"` + ToolName string `json:"toolName"` + Cursor string `json:"cursor"` + Limit int `json:"limit"` +} + +type HistorySearchHit struct { + SessionPath string `json:"sessionPath"` + SessionID string `json:"sessionId"` + Source string `json:"source"` + MessageIndex int `json:"messageIndex"` + Role string `json:"role"` + Kind string `json:"kind"` + ToolName string `json:"toolName,omitempty"` + Snippet string `json:"snippet"` + Score float64 `json:"score"` + SessionTitle string `json:"sessionTitle,omitempty"` + TopicTitle string `json:"topicTitle,omitempty"` + WorkspaceRoot string `json:"workspaceRoot,omitempty"` + LastActivityAt int64 `json:"lastActivityAt"` + Open bool `json:"open"` + Running bool `json:"running"` + Current bool `json:"current"` +} + +type HistoryIndexStatus = historycatalog.Status + +type HistoryIndexChangedV1 struct { + Revision uint64 `json:"revision"` + Indexed int64 `json:"indexed"` + Total int64 `json:"total"` + Pending int64 `json:"pending"` + Roots []string `json:"roots"` + Reason string `json:"reason"` +} + +func (a *App) registerHistoryIndexEvents() { + history.RegisterCatalogObserver(func(status historycatalog.Status, roots []string, reason string) { + if roots == nil { + roots = []string{} + } + a.emitRuntimeEvent("history-index:changed-v1", HistoryIndexChangedV1{Revision: status.Revision, + Indexed: status.Indexed, Total: status.Total, Pending: status.Pending, Roots: roots, Reason: reason}) + }) +} + +type HistorySearchPage struct { + Items []HistorySearchHit `json:"items"` + NextCursor string `json:"nextCursor"` + Revision uint64 `json:"revision"` + Partial bool `json:"partial"` + StaleCursor bool `json:"staleCursor"` + Status HistoryIndexStatus `json:"status"` +} + +type HistorySearchContextRequest struct { + SessionPath string `json:"sessionPath"` + MessageIndex int `json:"messageIndex"` + Before int `json:"before"` + After int `json:"after"` +} + +type HistorySearchContextLine struct { + Index int `json:"index"` + Role string `json:"role"` + Text string `json:"text"` +} + +type historySearchCursor struct { + Revision uint64 `json:"r"` + Rank float64 `json:"b"` + Score float64 `json:"s"` + Path string `json:"p"` + Message int `json:"m"` + Part int `json:"a"` + RowID int64 `json:"i"` +} + +func historyCatalogRoots(targets []sessioncatalog.DirectoryTarget) []historycatalog.Root { + roots := make([]historycatalog.Root, 0, len(targets)*2+1) + for _, target := range targets { + source := target.Scope + if source == "" { + source = "global" + } + root := historycatalog.Root{Path: target.Path, Source: source, Scope: target.Scope, WorkspaceRoot: target.WorkspaceRoot} + roots = append(roots, root) + root.Path = filepath.Join(target.Path, "subagents") + root.Subagents = true + roots = append(roots, root) + } + roots = append(roots, historycatalog.Root{Path: config.ArchiveDir(), Source: "archive", Scope: "global", Archive: true}) + return roots +} + +func sessionMetaFromCatalog(record sessioncatalog.SessionRecord, current, open bool) SessionMeta { + title := strings.TrimSpace(record.CustomTitle) + preview := record.Preview + if strings.TrimSpace(preview) == "" && record.TurnsState == sessioncatalog.TurnsUnknown { + preview = "History is being indexed — " + filepath.Base(record.Path) + } + recovered := record.Recovered || strings.TrimSpace(record.RecoveryDigest) != "" || isAutomaticRecoverySessionPath(record.Path) + return SessionMeta{Path: record.Path, Preview: preview, Title: title, Turns: record.Turns, + TurnsState: string(record.TurnsState), CreatedAt: record.CreatedAt, LastActivityAt: record.LastActivityAt, + ModTime: record.LastActivityAt, Current: current, Open: open, Scope: record.Scope, + WorkspaceRoot: record.WorkspaceRoot, TopicID: record.TopicID, TopicTitle: record.TopicTitle, + Recovered: recovered} +} + +func (a *App) ListHistorySessions(req HistorySessionPageRequest) HistorySessionPage { + out := HistorySessionPage{Items: []SessionMeta{}} + catalog := a.sessionCatalog.Load() + if catalog == nil { + out.Partial = true + return out + } + limit := req.Limit + if limit <= 0 { + limit = 50 + } + if limit > 200 { + limit = 200 + } + statusFilter := strings.TrimSpace(req.Status) + needRuntimeFilter := statusFilter == "open" || statusFilter == "current" + _, overlays := a.catalogRuntimeOverlays() + active := a.activeSessionPath(a.activeSessionDir()) + cursor := req.Cursor + for { + page, err := catalog.ListSessions(a.bootContext(), sessioncatalog.SessionPageRequest{ + Scope: req.Scope, WorkspaceRoot: req.WorkspaceRoot, Cursor: cursor, Limit: limit, + Query: req.Query, TimeFilter: req.TimeFilter, + }) + if err != nil { + out.Partial = true + return out + } + out.Revision = page.Revision + if page.StaleCursor { + out.StaleCursor = true + return out + } + for i, record := range page.Items { + overlay := overlays[sessionRuntimeKey(record.Path)] + // Match frontend HistoryPanel: "open" means open-but-not-current. + if statusFilter == "open" && (!overlay.open || record.Path == active) { + continue + } + if statusFilter == "current" && record.Path != active { + continue + } + out.Items = append(out.Items, sessionMetaFromCatalog(record, record.Path == active, overlay.open)) + if len(out.Items) == limit { + if i+1 < len(page.Items) || page.NextCursor != "" { + out.NextCursor = sessioncatalog.CursorAfter(page.Revision, record.LastActivityAt, record.Path) + } + status := catalog.Status() + out.Partial = status.State != sessioncatalog.StateReady || status.Indexed < status.Total + return out + } + } + if !needRuntimeFilter { + // No post-filter: a single catalog page is the whole result page. + out.NextCursor = page.NextCursor + break + } + if page.NextCursor == "" { + out.NextCursor = "" + break + } + cursor = page.NextCursor + } + status := catalog.Status() + out.Partial = status.State != sessioncatalog.StateReady || status.Indexed < status.Total + return out +} + +func (a *App) GetHistoryIndexStatus() HistoryIndexStatus { + if catalog := history.SharedCatalog(); catalog != nil { + return catalog.Status() + } + return HistoryIndexStatus{State: "opening", Pending: 1, Mode: "memory"} +} + +func decodeHistoryCursor(encoded string) (*historySearchCursor, error) { + if strings.TrimSpace(encoded) == "" { + return nil, nil + } + b, err := base64.RawURLEncoding.DecodeString(encoded) + if err != nil { + return nil, err + } + var cursor historySearchCursor + if err := json.Unmarshal(b, &cursor); err != nil || cursor.Path == "" { + return nil, errors.New("invalid history search cursor") + } + return &cursor, nil +} + +func encodeHistoryCursor(cursor historySearchCursor) string { + b, _ := json.Marshal(cursor) + return base64.RawURLEncoding.EncodeToString(b) +} + +func desktopHistoryText(messages []provider.Message, candidate historycatalog.Candidate) (string, bool) { + if candidate.MessageIndex < 0 || candidate.MessageIndex >= len(messages) { + return "", false + } + message := messages[candidate.MessageIndex] + switch candidate.Kind { + case "user_text", "assistant_text": + return message.Content, true + case "tool_input": + if candidate.PartIndex < 0 || candidate.PartIndex >= len(message.ToolCalls) { + return "", false + } + call := message.ToolCalls[candidate.PartIndex] + return strings.TrimSpace(call.Name + " " + call.Arguments), true + case "tool_error", "tool_output": + return strings.TrimSpace(message.Name + " " + message.Content), true + default: + return "", false + } +} + +func (a *App) SearchHistoryContent(req HistorySearchRequest) HistorySearchPage { + status := a.GetHistoryIndexStatus() + out := HistorySearchPage{Items: []HistorySearchHit{}, Status: status, Revision: status.Revision, + Partial: status.State != "ready" || status.Pending > 0 || (status.Total > 0 && status.Indexed < status.Total)} + catalog := history.SharedCatalog() + if catalog == nil || strings.TrimSpace(req.Query) == "" { + return out + } + cursor, err := decodeHistoryCursor(req.Cursor) + if err != nil { + return out + } + if cursor != nil && cursor.Revision != status.Revision { + out.StaleCursor = true + return out + } + limit := req.Limit + if limit <= 0 { + limit = 50 + } + if limit > 200 { + limit = 200 + } + kinds := req.Kinds + if len(kinds) == 0 { + kinds = []string{"user_text", "assistant_text", "tool_input", "tool_error"} + } + var after *historycatalog.SearchCursor + if cursor != nil { + after = &historycatalog.SearchCursor{Rank: cursor.Rank, SessionPath: cursor.Path, MessageIndex: cursor.Message, + PartIndex: cursor.Part, RowID: cursor.RowID} + } + // Keep pulling FTS candidates until the filtered page is full. + items, nextCursor, lastErr := a.collectHistorySearchItems(req, catalog, kinds, historySearchRootFilter(a, req), after, limit, status.Revision) + if lastErr != "" { + out.Status.LastError = lastErr + return out + } + out.Items, out.NextCursor = items, nextCursor + return out +} + +func historyTimeMatches(timestamp int64, filter string) bool { + if strings.TrimSpace(filter) == "" || filter == "all" { + return true + } + now := time.Now() + startToday := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()) + value := time.UnixMilli(timestamp) + switch filter { + case "today": + return !value.Before(startToday) + case "yesterday": + return !value.Before(startToday.AddDate(0, 0, -1)) && value.Before(startToday) + case "older": + return value.Before(startToday.AddDate(0, 0, -1)) + default: + return true + } +} + +func (a *App) GetHistorySearchContext(req HistorySearchContextRequest) []HistorySearchContextLine { + var options history.Options + bestLength := -1 + for _, root := range historyCatalogRoots(a.sessionCatalogTargets()) { + if !desktopHistoryPathWithin(req.SessionPath, root.Path) || len(root.Path) <= bestLength { + continue + } + bestLength = len(root.Path) + options = history.Options{} + switch { + case root.Archive: + options.ArchiveDir = root.Path + case root.Subagents: + options.SessionDir = filepath.Dir(root.Path) + default: + options.SessionDir = root.Path + } + } + if bestLength < 0 { + return []HistorySearchContextLine{} + } + searcher := history.NewSearcher(options) + lines, err := searcher.Around(a.bootContext(), history.AroundRequest{SessionPath: req.SessionPath, MessageIndex: req.MessageIndex, Before: req.Before, After: req.After}) + if err != nil { + return []HistorySearchContextLine{} + } + out := make([]HistorySearchContextLine, 0, len(lines)) + for _, line := range lines { + role := "" + if fields := strings.Fields(line.Text); len(fields) > 1 { + role = strings.TrimSuffix(fields[1], "]") + } + out = append(out, HistorySearchContextLine{Index: line.Index, Role: role, Text: line.Text}) + } + return out +} + +func desktopHistoryPathWithin(path, root string) bool { + absPath, err := filepath.Abs(filepath.Clean(strings.TrimSpace(path))) + if err != nil { + return false + } + absRoot, err := filepath.Abs(filepath.Clean(strings.TrimSpace(root))) + if err != nil { + return false + } + rel, err := filepath.Rel(absRoot, absPath) + return err == nil && (rel == "." || (rel != ".." && !strings.HasPrefix(rel, ".."+string(filepath.Separator)))) +} + +func (a *App) RebuildHistoryIndex() error { + if a == nil || a.shuttingDown.Load() { + return errors.New("application is shutting down") + } + return history.RebuildSharedCatalog(a.bootContext(), historyCatalogRoots(a.sessionCatalogTargets())) +} diff --git a/desktop/history_search_collect.go b/desktop/history_search_collect.go new file mode 100644 index 0000000000..d584611cf3 --- /dev/null +++ b/desktop/history_search_collect.go @@ -0,0 +1,144 @@ +package main + +import ( + "context" + "path/filepath" + "strings" + + "reasonix/internal/agent" + "reasonix/internal/historycatalog" + "reasonix/internal/provider" + "reasonix/internal/retrieval" +) + +func historySearchRootFilter(a *App, req HistorySearchRequest) []string { + rootFilter := []string{} + for _, root := range historyCatalogRoots(a.sessionCatalogTargets()) { + if req.Scope == "project" && (root.Scope != "project" || !sameProjectRoot(root.WorkspaceRoot, req.WorkspaceRoot)) { + continue + } + if req.Scope == "global" && root.Scope == "project" { + continue + } + rootFilter = append(rootFilter, root.Path) + } + return rootFilter +} + +func historyStatusMatches(status string, open, current bool) bool { + switch strings.TrimSpace(status) { + case "open": + // Match HistoryPanel: open-but-not-current. + return open && !current + case "current": + return current + default: + return true + } +} + +func (a *App) historyHitFromCandidate( + req HistorySearchRequest, + candidate historycatalog.Candidate, + active string, + overlays map[string]catalogRuntimeOverlay, + queryTerms []string, + loaded map[string][]provider.Message, + catalog *historycatalog.Catalog, +) (HistorySearchHit, bool) { + overlay := overlays[sessionRuntimeKey(candidate.SessionPath)] + current := candidate.SessionPath == active + if !historyStatusMatches(req.Status, overlay.open, current) { + return HistorySearchHit{}, false + } + if !historyTimeMatches(candidate.LastActivityAt, req.TimeFilter) { + return HistorySearchHit{}, false + } + messages, ok := loaded[candidate.SessionPath] + if !ok { + if identity, known, identityErr := agent.SessionContentIdentity(candidate.SessionPath); identityErr == nil && known && + candidate.ContentDigest != "" && identity.DigestHex != candidate.ContentDigest { + catalog.EnqueueExisting(context.Background(), candidate.SessionPath) + return HistorySearchHit{}, false + } + session, loadErr := agent.LoadSession(candidate.SessionPath) + if loadErr != nil { + return HistorySearchHit{}, false + } + messages = session.Snapshot() + loaded[candidate.SessionPath] = messages + } + text, ok := desktopHistoryText(messages, candidate) + if !ok { + catalog.EnqueueExisting(context.Background(), candidate.SessionPath) + return HistorySearchHit{}, false + } + return HistorySearchHit{ + SessionPath: candidate.SessionPath, + SessionID: strings.TrimSuffix(filepath.Base(candidate.SessionPath), filepath.Ext(candidate.SessionPath)), + Source: candidate.Source, MessageIndex: candidate.MessageIndex, Role: candidate.Role, + Kind: candidate.Kind, ToolName: candidate.ToolName, + Snippet: retrieval.MakeSnippet(text, req.Query, queryTerms, 240), Score: candidate.Score, + SessionTitle: candidate.SessionTitle, TopicTitle: candidate.TopicTitle, WorkspaceRoot: candidate.WorkspaceRoot, + LastActivityAt: candidate.LastActivityAt, Open: overlay.open, Running: overlay.running, Current: current, + }, true +} + +func (a *App) collectHistorySearchItems( + req HistorySearchRequest, + catalog *historycatalog.Catalog, + kinds, rootFilter []string, + after *historycatalog.SearchCursor, + limit int, + revision uint64, +) ([]HistorySearchHit, string, string) { + const batchLimit = 200 + need := limit + 1 + _, overlays := a.catalogRuntimeOverlays() + active := a.activeSessionPath(a.activeSessionDir()) + queryTerms, _ := retrieval.QueryTerms(req.Query) + loaded := map[string][]provider.Message{} + items := []HistorySearchHit{} + var cursorCandidate historycatalog.Candidate + for len(items) < need { + result, searchErr := catalog.Search(a.bootContext(), historycatalog.SearchRequest{ + Query: req.Query, Scope: req.Scope, WorkspaceRoot: req.WorkspaceRoot, + Kinds: kinds, ToolName: req.ToolName, Limit: batchLimit, Roots: rootFilter, After: after, + }) + if searchErr != nil { + return items, "", searchErr.Error() + } + if len(result.Items) == 0 { + break + } + for _, candidate := range result.Items { + hit, ok := a.historyHitFromCandidate(req, candidate, active, overlays, queryTerms, loaded, catalog) + if !ok { + continue + } + items = append(items, hit) + if len(items) == limit { + cursorCandidate = candidate + } + if len(items) == need { + break + } + } + if len(items) == need { + break + } + last := result.Items[len(result.Items)-1] + after = &historycatalog.SearchCursor{Rank: last.Rank, SessionPath: last.SessionPath, MessageIndex: last.MessageIndex, + PartIndex: last.PartIndex, RowID: last.RowID} + if len(result.Items) < batchLimit { + break + } + } + nextCursor := "" + if len(items) > limit { + items = items[:limit] + nextCursor = encodeHistoryCursor(historySearchCursor{Revision: revision, Rank: cursorCandidate.Rank, Score: cursorCandidate.Score, + Path: cursorCandidate.SessionPath, Message: cursorCandidate.MessageIndex, Part: cursorCandidate.PartIndex, RowID: cursorCandidate.RowID}) + } + return items, nextCursor, "" +} diff --git a/desktop/history_slice.go b/desktop/history_slice.go index 43ae91ee3c..18e6f06ccc 100644 --- a/desktop/history_slice.go +++ b/desktop/history_slice.go @@ -144,12 +144,10 @@ type HistorySlice struct { // invalidated after another process advances or rewrites the session. RevisionKnown bool `json:"revisionKnown,omitempty"` Digest string `json:"digest,omitempty"` - // Source names the read path that produced the page, for diagnostics: - // "index" (cold, display-index hit), "scan" (cold, streaming rebuild or - // legacy event-format decode), "live-index" (live controller + index), or - // "live-fallback" (live controller, full-snapshot classification). Empty - // when no session was readable. + // Source: index|scan|live-index|live-fallback. Error marks a failed read + // (empty Entries alone means a genuinely empty session). Source string `json:"source,omitempty"` + Error string `json:"error,omitempty"` } // HistoryContentChunk is one chunk of a ref-replaced field's full value. @@ -182,8 +180,10 @@ func (e HistoryEntry) MarshalJSON() ([]byte, error) { return json.Marshal(alias(e)) } -func emptyHistorySlice() HistorySlice { - return HistorySlice{Entries: []HistoryEntry{}} +func emptyHistorySlice() HistorySlice { return HistorySlice{Entries: []HistoryEntry{}} } + +func failedHistorySlice(message string) HistorySlice { + return HistorySlice{Entries: []HistoryEntry{}, Error: strings.TrimSpace(message)} } func staleHistorySlice(revision int64, revisionKnown bool, digest string) HistorySlice { @@ -409,12 +409,12 @@ func (a *App) HistorySliceForTab(tabID string, req HistorySliceRequest) HistoryS if ctrl == nil { if strings.TrimSpace(sessionPath) == "" { - return emptyHistorySlice() + return failedHistorySlice("session path unavailable before controller ready") } slice, err := a.coldHistorySlice(sessionDir, sessionPath, req) if err != nil { slog.Debug("desktop: cold history slice failed", "path", sessionPath, "err", err) - return emptyHistorySlice() + return failedHistorySlice(err.Error()) } return slice } @@ -441,7 +441,7 @@ func (a *App) liveHistorySlice(ctrl control.SessionAPI, sessionDir, sessionPath slice, err := a.pageHistorySliceSource(src, req, resolver, sessionPlannerDisplayTurns(sessionDir, sessionPath), ctrl.CheckpointTurnsByMessageIndex(), sessionPath) if err != nil { slog.Debug("desktop: live history slice failed", "path", sessionPath, "err", err) - return emptyHistorySlice() + return failedHistorySlice(err.Error()) } if indexUsed { slice.Source = "live-index" diff --git a/desktop/history_slice_cold_test.go b/desktop/history_slice_cold_test.go new file mode 100644 index 0000000000..c53638a9b3 --- /dev/null +++ b/desktop/history_slice_cold_test.go @@ -0,0 +1,74 @@ +package main + +import ( + "fmt" + "os" + "path/filepath" + "testing" + + "reasonix/internal/provider" +) + +func TestHistorySliceColdPathBeforeControllerReady(t *testing.T) { + isolateDesktopUserDirs(t) + root := t.TempDir() + dir := desktopSessionDir(root) + if err := os.MkdirAll(dir, 0o755); err != nil { + t.Fatal(err) + } + messages := make([]provider.Message, 0, 80) + for i := range 40 { + messages = append(messages, + provider.Message{Role: provider.RoleUser, Content: fmt.Sprintf("cold user turn %d large-session marker", i)}, + provider.Message{Role: provider.RoleAssistant, Content: fmt.Sprintf("cold assistant turn %d large-session marker", i)}, + ) + } + _, path := saveHistorySliceSession(t, dir, "cold-large.jsonl", messages) + app := NewApp() + tab := &WorkspaceTab{ + ID: "cold-large", + Scope: "project", + WorkspaceRoot: root, + SessionPath: path, + Ready: false, + Ctrl: nil, + } + app.mu.Lock() + app.tabs = map[string]*WorkspaceTab{tab.ID: tab} + app.activeTabID = tab.ID + app.mu.Unlock() + + page := app.HistorySliceForTab(tab.ID, HistorySliceRequest{Turns: 12}) + if page.Error != "" { + t.Fatalf("cold slice error = %q", page.Error) + } + if len(page.Entries) == 0 { + t.Fatal("cold slice returned no entries before controller ready") + } + if page.Source != "index" && page.Source != "scan" { + t.Fatalf("cold source = %q, want index|scan", page.Source) + } +} + +func TestHistorySliceReportsErrorInsteadOfEmptySuccess(t *testing.T) { + isolateDesktopUserDirs(t) + app := NewApp() + tab := &WorkspaceTab{ + ID: "missing", + Scope: "project", + SessionPath: filepath.Join(t.TempDir(), "does-not-exist.jsonl"), + Ready: false, + } + app.mu.Lock() + app.tabs = map[string]*WorkspaceTab{tab.ID: tab} + app.activeTabID = tab.ID + app.mu.Unlock() + + page := app.HistorySliceForTab(tab.ID, HistorySliceRequest{}) + if page.Error == "" { + t.Fatal("missing session should report Error, not a silent empty success") + } + if len(page.Entries) != 0 { + t.Fatalf("entries = %d, want 0 on error", len(page.Entries)) + } +} diff --git a/desktop/mcp_oauth.go b/desktop/mcp_oauth.go index 026a390bde..b85d210013 100644 --- a/desktop/mcp_oauth.go +++ b/desktop/mcp_oauth.go @@ -140,5 +140,7 @@ func (a *App) ClearMCPServerAuthentication(name string) error { if host != nil { host.ClearFailure(name) } + // Auth state is authoritative configuration for in-flight controller builds. + a.bumpExtensionGeneration() return nil } 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/session_catalog.go b/desktop/session_catalog.go new file mode 100644 index 0000000000..7ed0821cba --- /dev/null +++ b/desktop/session_catalog.go @@ -0,0 +1,500 @@ +package main + +import ( + "context" + "errors" + "log/slog" + "path/filepath" + "strings" + "time" + + "reasonix/internal/agent" + "reasonix/internal/config" + "reasonix/internal/history" + "reasonix/internal/sessioncatalog" + "reasonix/internal/stats" + "reasonix/internal/taskcatalog" +) + +type SessionCatalogStatus struct { + State string `json:"state"` + Mode string `json:"mode"` + Revision uint64 `json:"revision"` + Indexed int64 `json:"indexed"` + Total int64 `json:"total"` + RepairPending int64 `json:"repairPending"` + LastError string `json:"lastError,omitempty"` + QuarantinedPath string `json:"quarantinedPath,omitempty"` +} + +type ProjectTreeSnapshot struct { + Revision uint64 `json:"revision"` + Projects []ProjectNode `json:"projects"` + Catalog SessionCatalogStatus `json:"catalog"` + Indexed int64 `json:"indexed"` + Total int64 `json:"total"` + IndexingDone bool `json:"indexingDone"` +} + +type ProjectTopicPageRequest struct { + Scope string `json:"scope"` + WorkspaceRoot string `json:"workspaceRoot,omitempty"` + Cursor string `json:"cursor,omitempty"` + Limit int `json:"limit,omitempty"` + Query string `json:"query,omitempty"` + TimeFilter string `json:"timeFilter,omitempty"` +} + +type ProjectTopicKey struct { + Scope string `json:"scope"` + WorkspaceRoot string `json:"workspaceRoot,omitempty"` + TopicID string `json:"topicId"` +} + +type ProjectTopicPage struct { + Items []ProjectNode `json:"items"` + NextCursor string `json:"nextCursor,omitempty"` + Revision uint64 `json:"revision"` +} + +type ProjectTreeChangedV2 struct { + Revision uint64 `json:"revision"` + Roots []string `json:"roots"` + Reason string `json:"reason"` +} + +func flushDesktopDerivedCatalogs(ctx context.Context) error { + var first error + if err := history.FlushSharedCatalog(ctx); err != nil && first == nil { + first = err + } + if err := history.CloseSharedCatalog(ctx); err != nil && first == nil { + first = err + } + if err := stats.CloseUsageCatalogs(ctx); err != nil && first == nil { + first = err + } + if err := taskcatalog.ShutdownShared(ctx); err != nil && first == nil { + first = err + } + return first +} + +func sessionCatalogStatus(status sessioncatalog.Status) SessionCatalogStatus { + return SessionCatalogStatus{ + State: string(status.State), + Mode: string(status.Mode), + Revision: status.Revision, + Indexed: status.Indexed, + Total: status.Total, + RepairPending: status.RepairPending, + LastError: status.LastError, + QuarantinedPath: status.QuarantinedPath, + } +} + +func (a *App) currentSessionCatalogStatus() SessionCatalogStatus { + if a == nil { + return SessionCatalogStatus{State: string(sessioncatalog.StateDegraded), Mode: string(sessioncatalog.ModeMemory)} + } + if a.catalogRebuilding.Load() { + return SessionCatalogStatus{State: string(sessioncatalog.StateRebuilding)} + } + if catalog := a.sessionCatalog.Load(); catalog != nil { + return sessionCatalogStatus(catalog.Status()) + } + return SessionCatalogStatus{State: string(sessioncatalog.StateOpening)} +} + +func (a *App) startSessionCatalog(rebuild bool) { + if a == nil || a.shuttingDown.Load() { + return + } + a.catalogLifecycleMu.Lock() + if a.catalogCancel != nil { + a.catalogLifecycleMu.Unlock() + return + } + ctx, cancel := context.WithCancel(a.bootContext()) + done := make(chan struct{}) + a.catalogCancel = cancel + a.catalogDone = done + a.catalogRebuilding.Store(rebuild) + a.catalogLifecycleMu.Unlock() + + go func() { + defer close(done) + defer a.catalogRebuilding.Store(false) + path := sessioncatalog.DefaultPath() + targets := a.sessionCatalogTargets() + history.RegisterCatalogRoots(historyCatalogRoots(targets)) + projects := loadProjectsFile() + taskcatalog.RegisterSharedProject(globalWorkspaceRoot(), projects.GlobalTitle) + for _, project := range projects.Projects { + taskcatalog.RegisterSharedProject(project.Root, projectDisplayName(project)) + } + if rebuild { + if _, err := sessioncatalog.Rebuild(ctx, path, targets); err != nil && !errors.Is(err, context.Canceled) { + slog.Warn("desktop: rebuild session catalog", "err", err) + } + } + catalog, err := sessioncatalog.Open(ctx, sessioncatalog.Options{ + Path: path, + OnRevision: func(revision uint64, roots []string, reason string) { + a.emitProjectTreeChangedV2(revision, roots, reason) + }, + }) + if err != nil { + slog.Warn("desktop: open session catalog", "err", err) + return + } + if ctx.Err() != nil || a.shuttingDown.Load() { + closeCtx, closeCancel := context.WithTimeout(context.Background(), 250*time.Millisecond) + _ = catalog.Close(closeCtx) + closeCancel() + return + } + a.sessionCatalog.Store(catalog) + if err := a.syncSessionCatalogMetadata(ctx, catalog); err != nil && !errors.Is(err, context.Canceled) { + slog.Warn("desktop: sync session catalog metadata", "err", err) + } + select { + case <-a.tabsRestoredSignal(): + case <-ctx.Done(): + return + } + a.indexRestoredSessionPaths(ctx, catalog) + for _, target := range targets { + if ctx.Err() != nil || a.shuttingDown.Load() { + return + } + // Legacy assignment is deliberately background-only. It can scan and + // repair old metadata, but no project-tree or controller request waits. + if migrated := migrateLegacySessionsIntoGlobalTopics(target.Path); len(migrated) > 0 { + _ = a.syncSessionCatalogMetadata(ctx, catalog) + } + if err := catalog.ReconcileDirectory(ctx, target); err != nil && !errors.Is(err, context.Canceled) { + slog.Debug("desktop: reconcile session catalog directory", "dir", target.Path, "err", err) + } + } + ticker := time.NewTicker(30 * time.Second) + defer ticker.Stop() + for { + select { + case <-ticker.C: + if err := a.syncSessionCatalogMetadata(ctx, catalog); err != nil && !errors.Is(err, context.Canceled) { + slog.Debug("desktop: refresh session catalog metadata", "err", err) + } + for _, target := range a.sessionCatalogTargets() { + if migrated := migrateLegacySessionsIntoGlobalTopics(target.Path); len(migrated) > 0 { + _ = a.syncSessionCatalogMetadata(ctx, catalog) + } + catalog.RequestReconcile(target) + } + case <-ctx.Done(): + return + } + } + }() +} + +func (a *App) stopSessionCatalog(timeout time.Duration) { + if a == nil { + return + } + a.catalogLifecycleMu.Lock() + cancel := a.catalogCancel + done := a.catalogDone + a.catalogCancel = nil + a.catalogDone = nil + a.catalogLifecycleMu.Unlock() + if cancel != nil { + cancel() + } + catalog := a.sessionCatalog.Swap(nil) + deadline := time.Now().Add(timeout) + if catalog != nil { + remaining := max(time.Until(deadline), 0) + ctx, closeCancel := context.WithTimeout(context.Background(), remaining) + _ = catalog.Close(ctx) + closeCancel() + } + if done != nil { + remaining := time.Until(deadline) + if remaining <= 0 { + return + } + timer := time.NewTimer(remaining) + defer timer.Stop() + select { + case <-done: + case <-timer.C: + } + } +} + +func (a *App) cancelAllTabBuilds() { + if a == nil { + return + } + a.mu.Lock() + for _, tab := range a.tabs { + a.supersedeTabBuildLocked(tab) + } + for _, tab := range a.detachedSessions { + a.supersedeTabBuildLocked(tab) + } + a.mu.Unlock() +} + +func (a *App) sessionCatalogTargets() []sessioncatalog.DirectoryTarget { + f := loadProjectsFile() + seen := map[string]bool{} + out := []sessioncatalog.DirectoryTarget{} + add := func(target sessioncatalog.DirectoryTarget) { + target.Path = filepath.Clean(strings.TrimSpace(target.Path)) + if target.Path == "." || target.Path == "" || seen[target.Path] { + return + } + seen[target.Path] = true + out = append(out, target) + } + add(sessioncatalog.DirectoryTarget{Path: config.SessionDir(), Scope: "global"}) + add(sessioncatalog.DirectoryTarget{Path: desktopSessionDir(globalWorkspaceRoot()), Scope: "global"}) + for _, project := range f.Projects { + add(sessioncatalog.DirectoryTarget{Path: desktopSessionDir(project.Root), Scope: "project", WorkspaceRoot: project.Root}) + } + return out +} + +func listCatalogSessionsForDirectory(ctx context.Context, catalog *sessioncatalog.Catalog, + target sessioncatalog.DirectoryTarget, directory string) ([]sessioncatalog.SessionRecord, error) { + for range 2 { + records := []sessioncatalog.SessionRecord{} + cursor := "" + for { + page, err := catalog.ListSessions(ctx, sessioncatalog.SessionPageRequest{Scope: target.Scope, + WorkspaceRoot: target.WorkspaceRoot, Directory: directory, Cursor: cursor, Limit: sessioncatalog.MaxLimit}) + if err != nil { + return nil, err + } + if page.StaleCursor { + break + } + records = append(records, page.Items...) + if page.NextCursor == "" { + return records, nil + } + cursor = page.NextCursor + } + } + return []sessioncatalog.SessionRecord{}, nil +} + +func (a *App) indexRestoredSessionPaths(ctx context.Context, catalog *sessioncatalog.Catalog) { + type restored struct { + target sessioncatalog.DirectoryTarget + path string + } + a.mu.RLock() + items := make([]restored, 0, len(a.tabs)+len(a.detachedSessions)) + collect := func(tab *WorkspaceTab) { + if tab == nil || strings.TrimSpace(tab.SessionPath) == "" { + return + } + items = append(items, restored{ + target: sessioncatalog.DirectoryTarget{Path: filepath.Dir(tab.SessionPath), Scope: tab.Scope, WorkspaceRoot: tab.WorkspaceRoot}, + path: tab.SessionPath, + }) + } + for _, tab := range a.tabs { + collect(tab) + } + for _, tab := range a.detachedSessions { + collect(tab) + } + a.mu.RUnlock() + for _, item := range items { + if ctx.Err() != nil { + return + } + _ = catalog.IndexSessionPath(ctx, item.target, item.path) + } +} + +func (a *App) syncSessionCatalogMetadata(ctx context.Context, catalog *sessioncatalog.Catalog) error { + f := loadProjectsFile() + deleted := map[string]bool{} + for _, topicID := range f.DeletedTopics { + deleted[topicID] = true + } + projects := []sessioncatalog.ProjectRecord{{ + Scope: "global", Title: strings.TrimSpace(f.GlobalTitle), Color: normalizeProjectColor(f.GlobalColor), + }} + if projects[0].Title == "" { + projects[0].Title = "Global" + } + topics := []sessioncatalog.TopicMetadata{} + appendTopics := func(scope, root string, ids, pinnedIDs []string) { + titles := loadTopicTitles(root) + sources := loadTopicTitleSources(root) + created := loadTopicCreatedAts(root) + ordered := pinnedTopicIDs(orderedTopicIDs(ids, titles), pinnedIDs) + for index, topicID := range ordered { + if deleted[topicID] { + continue + } + title := strings.TrimSpace(titles[topicID]) + if title == "" { + title = defaultTopicTitle + } + topics = append(topics, sessioncatalog.TopicMetadata{ + Scope: scope, WorkspaceRoot: root, TopicID: topicID, Title: title, + TitleSource: sources[topicID], Pinned: containsDesktopString(pinnedIDs, topicID), + SortOrder: index, CreatedAt: topicCreatedAtForTree(created, topicID), + }) + } + } + appendTopics("global", "", f.GlobalTopics, f.GlobalPinnedTopics) + for index, project := range f.Projects { + title := strings.TrimSpace(project.Title) + if title == "" { + title = workspaceName(project.Root) + } + projects = append(projects, sessioncatalog.ProjectRecord{ + Scope: "project", WorkspaceRoot: project.Root, Title: title, Color: project.Color, + Pinned: containsDesktopString(f.PinnedProjects, project.Root), SortOrder: index, + }) + appendTopics("project", project.Root, project.Topics, project.PinnedTopics) + } + return catalog.SyncMetadata(ctx, projects, topics) +} + +func (a *App) emitProjectTreeChangedV2(revision uint64, roots []string, reason string) { + if roots == nil { + roots = []string{} + } + a.emitRuntimeEvent("project-tree:changed-v2", ProjectTreeChangedV2{Revision: revision, Roots: roots, Reason: reason}) + // One-release compatibility event. Its wrapper is catalog-only, so legacy + // frontends refresh without reintroducing synchronous history I/O. + a.emitRuntimeEvent("project-tree:changed") +} + +func (a *App) requestSessionCatalogReconcile(dir string) { + catalog := a.sessionCatalog.Load() + if catalog == nil || a.shuttingDown.Load() || strings.TrimSpace(dir) == "" { + return + } + clean := filepath.Clean(dir) + target := sessioncatalog.DirectoryTarget{Path: clean, Scope: "global"} + for _, candidate := range a.sessionCatalogTargets() { + if sameDesktopPath(candidate.Path, clean) { + target = candidate + break + } + } + go func() { + // Explicit reconcile bypasses disposable migration markers. Signatures + // keep periodic passes cheap, but an old CLI or restored backup must + // never be permanently hidden by a timestamp/content collision. + migrated, migratedPaths := forceMigrateLegacySessionsIntoGlobalTopicsWithPaths(target.Path) + if len(migrated) > 0 { + ctx, cancel := context.WithTimeout(a.bootContext(), 30*time.Second) + // Publish the exact migrated sessions before the broader metadata + // projection. On large stores (and especially Windows), the metadata + // pass can take long enough to defeat this interactive fast path. + for _, path := range migratedPaths { + if err := catalog.IndexSessionPath(ctx, target, path); err != nil && !errors.Is(err, context.Canceled) { + slog.Debug("desktop: index migrated session", "path", path, "err", err) + } + } + _ = a.syncSessionCatalogMetadata(ctx, catalog) + cancel() + } + catalog.RequestReconcile(target) + }() +} + +func sessionDirectoryForPath(path string) string { + path = strings.TrimSpace(path) + if path == "" { + return "" + } + return filepath.Dir(path) +} + +func (a *App) requestSessionCatalogPath(scope, workspaceRoot, path string) { + if strings.TrimSpace(path) != "" { + _ = history.PersistObserver().EnqueueSessionPersist(agent.SessionPersistEvent{Path: path, Rewrite: true}) + } + catalog := a.sessionCatalog.Load() + if catalog == nil || a.shuttingDown.Load() || strings.TrimSpace(path) == "" { + return + } + catalog.RequestIndexSession(sessioncatalog.DirectoryTarget{ + Path: sessionDirectoryForPath(path), Scope: scope, WorkspaceRoot: workspaceRoot, + }, path) +} + +func (a *App) removeSessionCatalogPath(path, reason string) { + if strings.TrimSpace(path) == "" { + return + } + _ = history.PersistObserver().EnqueueSessionPersist(agent.SessionPersistEvent{Path: path, Removed: true}) + catalog := a.sessionCatalog.Load() + if catalog == nil { + return + } + ctx, cancel := context.WithTimeout(a.bootContext(), 150*time.Millisecond) + defer cancel() + if err := catalog.RemoveSession(ctx, path, reason); err != nil && !errors.Is(err, context.Canceled) { + slog.Debug("desktop: remove session catalog row", "err", err) + } +} + +func (a *App) requestSessionCatalogMetadataSync() { + catalog := a.sessionCatalog.Load() + if catalog == nil || a.shuttingDown.Load() { + return + } + go func() { + ctx, cancel := context.WithTimeout(a.bootContext(), 5*time.Second) + defer cancel() + _ = a.syncSessionCatalogMetadata(ctx, catalog) + }() +} + +func (a *App) GetProjectTreeSnapshot() ProjectTreeSnapshot { + f := loadProjectsFile() + projects := []ProjectNode{} + if strings.TrimSpace(f.GlobalTitle) != "" || len(f.GlobalTopics) > 0 || len(f.Projects) == 0 { + label := strings.TrimSpace(f.GlobalTitle) + if label == "" { + label = "Global" + } + projects = append(projects, ProjectNode{ + Key: "global_folder", Kind: "global_folder", Label: label, + Root: globalWorkspaceRoot(), ProjectColor: normalizeProjectColor(f.GlobalColor), + Children: []ProjectNode{}, + }) + } + for _, project := range f.Projects { + label := strings.TrimSpace(project.Title) + if label == "" { + label = workspaceName(project.Root) + } + projects = append(projects, ProjectNode{ + Key: "project_" + project.Root, Kind: "project", Label: label, + Root: project.Root, ProjectColor: project.Color, + Pinned: containsDesktopString(f.PinnedProjects, project.Root), + Children: []ProjectNode{}, + }) + } + projects = applyPinnedProjectOrder(applyProjectTreeOrder(projects, f.SidebarOrder), f.PinnedProjects) + status := a.currentSessionCatalogStatus() + return ProjectTreeSnapshot{ + Revision: status.Revision, Projects: projects, Catalog: status, + Indexed: status.Indexed, Total: status.Total, + IndexingDone: status.State == string(sessioncatalog.StateReady) && status.RepairPending == 0, + } +} diff --git a/desktop/session_catalog_app_test.go b/desktop/session_catalog_app_test.go new file mode 100644 index 0000000000..54cd52f3fd --- /dev/null +++ b/desktop/session_catalog_app_test.go @@ -0,0 +1,118 @@ +package main + +import ( + "context" + "os" + "path/filepath" + "testing" + "time" + + "reasonix/internal/sessioncatalog" +) + +func installSessionCatalogForTest(t *testing.T, app *App, path, scope, workspaceRoot string) { + t.Helper() + catalog, err := sessioncatalog.Open(context.Background(), sessioncatalog.Options{InMemory: true, DisableRepair: true}) + if err != nil { + t.Fatalf("open in-memory session catalog: %v", err) + } + target := sessioncatalog.DirectoryTarget{Path: path, Scope: scope, WorkspaceRoot: workspaceRoot} + if err := catalog.ReconcileDirectory(context.Background(), target); err != nil { + _ = catalog.Close(context.Background()) + t.Fatalf("reconcile session catalog %q: %v", target.Path, err) + } + app.sessionCatalog.Store(catalog) + t.Cleanup(func() { + app.sessionCatalog.CompareAndSwap(catalog, nil) + ctx, cancel := context.WithTimeout(context.Background(), time.Second) + defer cancel() + _ = catalog.Close(ctx) + }) +} + +func reconcileSessionCatalogForTest(t *testing.T, app *App, path, scope, workspaceRoot string) { + t.Helper() + catalog := app.sessionCatalog.Load() + if catalog == nil { + t.Fatal("session catalog is not installed") + } + target := sessioncatalog.DirectoryTarget{Path: path, Scope: scope, WorkspaceRoot: workspaceRoot} + if err := catalog.ReconcileDirectory(context.Background(), target); err != nil { + t.Fatalf("reconcile session catalog %q: %v", path, err) + } +} + +func TestProjectTreeSnapshotReturnsProjectShellWithoutMigratingSessions(t *testing.T) { + isolateDesktopUserDirs(t) + root := t.TempDir() + if err := addProject(root, "Large Project"); err != nil { + t.Fatal(err) + } + sessionDir := desktopSessionDir(root) + if err := os.MkdirAll(sessionDir, 0o755); err != nil { + t.Fatal(err) + } + legacyPath := filepath.Join(sessionDir, "legacy.jsonl") + if err := os.WriteFile(legacyPath, []byte(`{"role":"user","content":"legacy"}`+"\n"), 0o600); err != nil { + t.Fatal(err) + } + + snapshot := NewApp().GetProjectTreeSnapshot() + if len(snapshot.Projects) != 1 || snapshot.Projects[0].Root != root { + t.Fatalf("snapshot = %#v, want project shell %q", snapshot, root) + } + if snapshot.Projects[0].Children == nil { + t.Fatal("project shell children encoded as null, want []") + } + if _, err := os.Stat(legacyPath + ".meta"); !os.IsNotExist(err) { + t.Fatalf("snapshot migrated session metadata: %v", err) + } +} + +func TestCompatibilityProjectTreeDoesNotMigrateLegacySession(t *testing.T) { + isolateDesktopUserDirs(t) + root := t.TempDir() + if err := addProject(root, "Project"); err != nil { + t.Fatal(err) + } + sessionDir := desktopSessionDir(root) + if err := os.MkdirAll(sessionDir, 0o755); err != nil { + t.Fatal(err) + } + legacyPath := filepath.Join(sessionDir, "legacy.jsonl") + if err := os.WriteFile(legacyPath, []byte(`{"role":"user","content":"legacy"}`+"\n"), 0o600); err != nil { + t.Fatal(err) + } + + _ = NewApp().ListProjectTree() + if _, err := os.Stat(legacyPath + ".meta"); !os.IsNotExist(err) { + t.Fatalf("ListProjectTree migrated legacy session: %v", err) + } +} + +func TestProjectTreeShellSurvivesCatalogRevisionRace(t *testing.T) { + isolateDesktopUserDirs(t) + root := t.TempDir() + if err := addProject(root, "Shell Race"); err != nil { + t.Fatal(err) + } + app := NewApp() + // Catalog not open yet: revision stays 0 while the shell still returns projects. + snapshot := app.GetProjectTreeSnapshot() + if snapshot.Revision != 0 { + t.Fatalf("revision = %d, want 0 while catalog is opening", snapshot.Revision) + } + if len(snapshot.Projects) == 0 { + t.Fatal("project shell empty while catalog opening") + } + found := false + for _, project := range snapshot.Projects { + if project.Root == root || project.Label == "Shell Race" { + found = true + break + } + } + if !found { + t.Fatalf("snapshot projects = %#v, want Shell Race", snapshot.Projects) + } +} 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_clear.go b/desktop/session_clear.go new file mode 100644 index 0000000000..3940c6b8fe --- /dev/null +++ b/desktop/session_clear.go @@ -0,0 +1,94 @@ +package main + +import ( + "reasonix/internal/agent" +) + +// SessionClearResult is the post-clear session identity the frontend must apply +// atomically so hydrate/mode-switch cannot re-bind to the destroyed transcript. +type SessionClearResult struct { + SessionPath string `json:"sessionPath"` + SessionRevision int64 `json:"sessionRevision,omitempty"` + SessionDigest string `json:"sessionDigest,omitempty"` + SessionGeneration uint64 `json:"sessionGeneration"` +} + +// ClearSession discards the current conversation and rotates to a fresh unsaved one. +func (a *App) ClearSession() (SessionClearResult, error) { + return a.ClearSessionForTab("") +} + +// ClearSessionForTab clears the requested tab regardless of later focus changes. +// On success it returns the replacement session identity (path/revision/digest +// and a tab-local generation) so the frontend can retire the old transcript +// without waiting for a later MetaForTab round trip. +func (a *App) ClearSessionForTab(tabID string) (SessionClearResult, error) { + tab, ctrl := a.tabAndCtrlByID(tabID) + if a.tabIsReadOnly(tab) { + return SessionClearResult{}, readOnlyChannelErr() + } + if ctrl == nil { + return SessionClearResult{}, a.workspaceNotReadyErr(tab) + } + if err := a.ensureTabControllerWorkspace(tab); err != nil { + return SessionClearResult{}, err + } + ctrl = a.controllerForTab(tab) + if ctrl == nil { + return SessionClearResult{}, a.workspaceNotReadyErr(tab) + } + if controllerHasActiveRuntimeWork(ctrl) { + return a.clearActiveSessionRuntime(tab, ctrl) + } + if err := ctrl.ClearSession(); err != nil { + return SessionClearResult{}, err + } + if err := a.ensureTabSessionLeaseForRebuild(tab, ctrl.SessionPath(), ""); err != nil { + // Wails bridge return: a raw lease error would carry the session path + // and holder id across to the frontend. + return SessionClearResult{}, userFacingSessionLeaseError("", err) + } + tab.resetTelemetry(ctrl.SessionPath()) + // Mirror the controller: ClearSession cleared the active goal. + a.clearTabGoal(tab) + a.persistTabSessionPath(tab, ctrl.SessionPath()) + a.invalidatePromptHistoryCache() + return a.bumpAndSnapshotSessionClear(tab), nil +} + +func (a *App) bumpAndSnapshotSessionClear(tab *WorkspaceTab) SessionClearResult { + if tab == nil { + return SessionClearResult{} + } + a.mu.Lock() + tab.SessionGeneration++ + gen := tab.SessionGeneration + path := tab.currentSessionPath() + if path == "" && tab.Ctrl != nil { + path = tab.Ctrl.SessionPath() + } + a.mu.Unlock() + var revision int64 + var digest string + if meta, ok, err := agent.LoadBranchMeta(path); err == nil && ok { + revision = meta.Revision + digest = meta.ContentDigest + } + return SessionClearResult{ + SessionPath: path, SessionRevision: revision, SessionDigest: digest, SessionGeneration: gen, + } +} + +// clearTabGoal drops the tab's persisted goal copy so rebuilds and restarts +// cannot re-seed a goal the controller has already cleared on session rotation. +func (a *App) clearTabGoal(tab *WorkspaceTab) { + if tab == nil { + return + } + a.mu.Lock() + tab.goal = "" + if current := a.tabs[tab.ID]; current == tab { + a.saveTabsLocked() + } + a.mu.Unlock() +} diff --git a/desktop/session_clear_identity_test.go b/desktop/session_clear_identity_test.go new file mode 100644 index 0000000000..a6fa34ec33 --- /dev/null +++ b/desktop/session_clear_identity_test.go @@ -0,0 +1,48 @@ +package main + +import ( + "path/filepath" + "testing" + + "reasonix/internal/provider" +) + +func TestClearSessionForTabReturnsReplacementIdentity(t *testing.T) { + app := historySliceTestApp(t) + dir := t.TempDir() + sess, oldPath := saveHistorySliceSession(t, dir, "old.jsonl", []provider.Message{ + {Role: provider.RoleUser, Content: "old content that must not reappear"}, + {Role: provider.RoleAssistant, Content: "old assistant reply"}, + }) + tab := newLiveHistoryTab(t, app, dir, oldPath, sess) + beforeGen := tab.SessionGeneration + + result, err := app.ClearSessionForTab(tab.ID) + if err != nil { + t.Fatalf("ClearSessionForTab: %v", err) + } + if result.SessionPath == "" { + t.Fatal("sessionPath empty after clear") + } + if sameDesktopPath(result.SessionPath, oldPath) { + t.Fatalf("sessionPath stayed %q; want a rotated path", result.SessionPath) + } + if result.SessionGeneration <= beforeGen { + t.Fatalf("sessionGeneration = %d, want > %d", result.SessionGeneration, beforeGen) + } + if tab.SessionGeneration != result.SessionGeneration { + t.Fatalf("tab generation = %d, result = %d", tab.SessionGeneration, result.SessionGeneration) + } + if !sameDesktopPath(tab.currentSessionPath(), result.SessionPath) { + t.Fatalf("tab path = %q, result = %q", tab.currentSessionPath(), result.SessionPath) + } + meta := app.tabMeta(tab, true) + if meta.SessionGeneration != result.SessionGeneration || !sameDesktopPath(meta.SessionPath, result.SessionPath) { + t.Fatalf("tabMeta identity = path:%q gen:%d, want path:%q gen:%d", + meta.SessionPath, meta.SessionGeneration, result.SessionPath, result.SessionGeneration) + } + // Replacement path must not share the old file identity. + if filepath.Base(result.SessionPath) == filepath.Base(oldPath) && sameDesktopPath(result.SessionPath, oldPath) { + t.Fatal("replacement path collided with destroyed session") + } +} 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/settings_app.go b/desktop/settings_app.go index 39ffeebda9..989717b1ef 100644 --- a/desktop/settings_app.go +++ b/desktop/settings_app.go @@ -1837,12 +1837,10 @@ func (a *App) rebuildSettingTurnLockedWithModel(setting string, tab *WorkspaceTa if err := rebuildControllerActiveWorkErrorFor(a.controllerForTab(tab), setting); err != nil { return err } - ensureWorkspace := a.ensureTabControllerWorkspace - if admissionHeld { - ensureWorkspace = a.ensureTabControllerWorkspaceAdmissionHeld - } - if err := ensureWorkspace(tab); err != nil { - return err + if !admissionHeld { + if err := a.ensureTabControllerWorkspace(tab); err != nil { + return err + } } prevPath := a.reconciledSessionPathForTab(tab) if prevPath == "" { @@ -1857,9 +1855,6 @@ func (a *App) rebuildSettingTurnLockedWithModel(setting string, tab *WorkspaceTa if err := rebuildControllerActiveWorkErrorFor(a.controllerForTab(tab), setting); err != nil { return err } - if err := ensureWorkspace(tab); err != nil { - return err - } var carried []provider.Message oldCtrl := a.controllerForTab(tab) @@ -1953,6 +1948,7 @@ func (a *App) buildSettingReplacementController(tab *WorkspaceTab, snap tabRunti Model: model, RequireKey: false, RuntimeReload: boot.RuntimeReload{ForceFullRebuild: reload}, StatsSource: "desktop", + TaskStore: a.taskStore(), OnConfigLoadWarnings: a.configLoadWarningsHandler(), Sink: snap.sink, WorkspaceRoot: snap.workspaceRoot, diff --git a/desktop/shared_host.go b/desktop/shared_host.go index 1c18144d3e..2346a82310 100644 --- a/desktop/shared_host.go +++ b/desktop/shared_host.go @@ -1,15 +1,104 @@ package main import ( + "context" "log/slog" "os" "os/exec" "strconv" "strings" + "reasonix/internal/config" "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() +} + +// lockMCPMutation serializes shared-Host boot with live MCP mutations without +// holding runtimeAdmissionMu while an optimistic controller build finishes its +// extension startup. A final generation bump invalidates builds that loaded +// configuration while the mutation held the gate. +func (a *App) lockMCPMutation(operation string) func() { + if hook := a.runtimeMutationBeforeLockHook; hook != nil { + hook(operation) + } + a.runtimeRebuildMu.Lock() + a.extensionBuildMu.Lock() + a.runtimeAdmissionMu.Lock() + return func() { + a.bumpExtensionGeneration() + a.runtimeAdmissionMu.Unlock() + a.extensionBuildMu.Unlock() + a.runtimeRebuildMu.Unlock() + } +} + +type sharedHostMCPRegistration struct { + scope *plugin.RegistrationScope + finished bool + committed bool +} + +// beginSharedHostMCPRegistration attributes only context-scoped connections to +// this build. Unrelated Host writes never become rollback candidates. +func beginSharedHostMCPRegistration(ctx context.Context, host *plugin.Host) (context.Context, *sharedHostMCPRegistration) { + registration := &sharedHostMCPRegistration{} + if host == nil { + return ctx, registration + } + registration.scope = host.BeginRegistrationScope() + return plugin.ContextWithRegistrationScope(ctx, registration.scope), registration +} + +func (r *sharedHostMCPRegistration) rollback() { + if r == nil || r.finished { + return + } + r.finished = true + if r.scope != nil { + r.scope.AbortAndRollback() + } +} + +func (r *sharedHostMCPRegistration) commit() bool { + if r == nil { + return true + } + if r.finished { + return r.committed + } + if r.scope != nil && !r.scope.Commit() { + r.finished = true + return false + } + r.finished = true + r.committed = true + return true +} + +func (a *App) saveDesktopMCPServerAndBump(root string, entry config.PluginEntry) error { + if err := a.saveDesktopMCPServer(root, entry); err != nil { + return err + } + a.bumpExtensionGeneration() + return nil +} + // 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/shared_host_registration_test.go b/desktop/shared_host_registration_test.go new file mode 100644 index 0000000000..ee323ca545 --- /dev/null +++ b/desktop/shared_host_registration_test.go @@ -0,0 +1,33 @@ +package main + +import ( + "context" + "testing" + + "reasonix/internal/plugin" +) + +func TestSharedHostMCPRegistrationLifecycle(t *testing.T) { + host := plugin.NewHost() + defer host.Close() + + _, abandoned := beginSharedHostMCPRegistration(context.Background(), host) + abandoned.rollback() + if abandoned.commit() { + t.Fatal("aborted registration must not publish") + } + + _, published := beginSharedHostMCPRegistration(context.Background(), host) + if !published.commit() { + t.Fatal("active registration should publish") + } + published.rollback() + if !published.commit() { + t.Fatal("committed registration must remain published") + } + + _, hostless := beginSharedHostMCPRegistration(context.Background(), nil) + if !hostless.commit() { + t.Fatal("hostless registration should publish as a no-op") + } +} diff --git a/desktop/shared_host_test.go b/desktop/shared_host_test.go index 2bb213f4cc..d55b06d13c 100644 --- a/desktop/shared_host_test.go +++ b/desktop/shared_host_test.go @@ -7,10 +7,16 @@ import ( func sharedHostRefsForTest(t *testing.T, app *App, root string) (int, bool) { t.Helper() + if app == nil { + return 0, false + } app.sharedHostsMu.Lock() defer app.sharedHostsMu.Unlock() + if app.sharedHosts == nil { + return 0, false + } entry, ok := app.sharedHosts[root] - if !ok { + if !ok || entry == nil { return 0, false } return entry.refs, true diff --git a/desktop/shutdown.go b/desktop/shutdown.go index 5085af6194..91dc04464c 100644 --- a/desktop/shutdown.go +++ b/desktop/shutdown.go @@ -32,9 +32,10 @@ func (a *App) shutdownBody() { // Run after controller teardown (and after its deferred lifecycle unlocks) // so every accepted usage record reaches disk before a normal app exit. defer func() { - flushCtx, cancel := context.WithTimeout(context.Background(), 2*time.Second) + flushCtx, cancel := context.WithTimeout(context.Background(), 250*time.Millisecond) defer cancel() _ = stats.Flush(flushCtx, config.StatsDir()) + _ = flushDesktopDerivedCatalogs(flushCtx) }() a.stopDeferredRebuildRetry() a.stopHistoryIndexMigration() diff --git a/desktop/startup_health_test.go b/desktop/startup_health_test.go index d9e180dc3b..8d2e7d6da9 100644 --- a/desktop/startup_health_test.go +++ b/desktop/startup_health_test.go @@ -87,6 +87,49 @@ func TestShutdownWaitsForRuntimeLifecycleMutation(t *testing.T) { } } +func TestShutdownDoesNotWaitForCancelledControllerBuild(t *testing.T) { + isolateDesktopUserDirs(t) + app := NewApp() + tab := app.createTabEntryWithID("global", "", "", "blocked-build") + app.mu.Lock() + app.tabs[tab.ID] = tab + app.tabOrder = []string{tab.ID} + app.activeTabID = tab.ID + app.mu.Unlock() + + started := make(chan struct{}) + release := make(chan struct{}) + app.tabBuildStartHook = func(string) { + close(started) + <-release + } + buildDone := make(chan struct{}) + go func() { + app.startTabControllerBuild(tab) + close(buildDone) + }() + <-started + + shutdownDone := make(chan struct{}) + go func() { + app.shutdown(context.Background()) + close(shutdownDone) + }() + select { + case <-shutdownDone: + close(release) + case <-time.After(750 * time.Millisecond): + close(release) + <-shutdownDone + t.Fatal("shutdown waited for a cancelled controller build") + } + select { + case <-buildDone: + case <-time.After(5 * time.Second): + t.Fatal("cancelled controller build did not finish") + } +} + // TestShutdownRecordsLKGOnlyAfterReady pins that last-known-good config is only // written after the window reached domReady. A quit before paint must not // rewrite the LKG snapshot from an incomplete boot. diff --git a/desktop/system_quit_darwin.go b/desktop/system_quit_darwin.go index 22c1c64a0d..eb1ebd99ed 100644 --- a/desktop/system_quit_darwin.go +++ b/desktop/system_quit_darwin.go @@ -1,4 +1,4 @@ -//go:build darwin +//go:build darwin && cgo package main diff --git a/desktop/system_quit_stub.go b/desktop/system_quit_stub.go index abc739fd35..c69ae2f048 100644 --- a/desktop/system_quit_stub.go +++ b/desktop/system_quit_stub.go @@ -1,4 +1,4 @@ -//go:build !darwin +//go:build !darwin || !cgo package main diff --git a/desktop/tab_controller_boot.go b/desktop/tab_controller_boot.go new file mode 100644 index 0000000000..209d6c0810 --- /dev/null +++ b/desktop/tab_controller_boot.go @@ -0,0 +1,84 @@ +package main + +import ( + "context" + "errors" + + "reasonix/internal/boot" + "reasonix/internal/control" +) + +var errTabControllerExtensionsChanged = errors.New("desktop: controller extensions changed during build") + +// buildTabControllerBoot is a thin wrapper around boot.Build so the large +// controller assembly path can stay under function-size / complexity budgets. +func (a *App) buildTabControllerBoot(ctx context.Context, opts boot.Options) (control.SessionAPI, error) { + return boot.Build(ctx, opts) +} + +// buildTabControllerBootFenced keeps optimistic builds concurrent with each +// other but excludes live MCP mutation. The generation check happens after the +// gate so a build that loaded stale configuration never launches extensions. +func (a *App) buildTabControllerBootFenced(ctx context.Context, generation uint64, opts boot.Options) (control.SessionAPI, error) { + a.extensionBuildMu.RLock() + defer a.extensionBuildMu.RUnlock() + if a.currentExtensionGeneration() != generation { + return nil, errTabControllerExtensionsChanged + } + return a.buildTabControllerBoot(ctx, opts) +} + +// lockTabControllerPublication makes the generation check part of admission. +// An MCP writer bumps the generation before releasing runtimeAdmissionMu, so a +// build cannot pass an early check and publish stale registries afterward. +func (a *App) lockTabControllerPublication(generation uint64) (func(), bool) { + a.runtimeAdmissionMu.RLock() + if a.currentExtensionGeneration() != generation { + a.runtimeAdmissionMu.RUnlock() + return nil, false + } + return a.runtimeAdmissionMu.RUnlock, true +} + +func (a *App) handleTabControllerBootError( + tab *WorkspaceTab, + registration *sharedHostMCPRegistration, + rootKey string, + buildGeneration uint64, + wailsCtx context.Context, + err error, +) bool { + if err == nil { + return false + } + registration.rollback() + if errors.Is(err, errTabControllerExtensionsChanged) { + a.abandonSupersededBuild(tab, nil, rootKey, "") + a.scheduleDeferredStartupBuild(tab.ID) + return true + } + a.mu.Lock() + if a.tabBuildSupersededLocked(tab, buildGeneration) { + a.mu.Unlock() + a.abandonSupersededBuild(tab, nil, rootKey, "") + return true + } + leaseHeld := setTabStartupError(tab, err) + tab.Ready = false + if leaseHeld { + a.setSessionRuntimePhaseLocked(tab, sessionRuntimeLeaseBlocked, err) + } else { + a.setSessionRuntimePhaseLocked(tab, sessionRuntimeFailed, err) + } + hostKey := takeTabSharedHostKey(tab) + tab.releaseSessionLease() + a.mu.Unlock() + if hostKey != "" { + a.releaseSharedHost(hostKey) + } + if leaseHeld { + a.scheduleDeferredStartupBuild(tab.ID) + } + a.emitReady(wailsCtx, tab.ID) + return true +} diff --git a/desktop/tab_scoped_actions_test.go b/desktop/tab_scoped_actions_test.go index cab4b58875..2bf0b2759d 100644 --- a/desktop/tab_scoped_actions_test.go +++ b/desktop/tab_scoped_actions_test.go @@ -111,7 +111,7 @@ func TestTabScopedSessionActionsIgnoreFocusedTab(t *testing.T) { } // Restore content so ClearSession exercises its non-blank path too. targetCtrl.history = []provider.Message{{Role: provider.RoleSystem, Content: "system"}, {Role: provider.RoleUser, Content: "clear me"}} - if err := app.ClearSessionForTab("target"); err != nil { + if _, err := app.ClearSessionForTab("target"); err != nil { t.Fatalf("ClearSessionForTab: %v", err) } if err := app.RewindForTab("target", 1, "conversation"); err != nil { diff --git a/desktop/tabs.go b/desktop/tabs.go index 5aebf55170..af65406dbb 100644 --- a/desktop/tabs.go +++ b/desktop/tabs.go @@ -8,20 +8,11 @@ import ( "encoding/json" "errors" "fmt" + "github.com/wailsapp/wails/v2/pkg/runtime" "log/slog" "maps" "os" "path/filepath" - "slices" - "sort" - "strings" - "sync" - "sync/atomic" - "time" - "unicode" - - "github.com/wailsapp/wails/v2/pkg/runtime" - "reasonix/internal/agent" "reasonix/internal/billing" "reasonix/internal/boot" @@ -35,6 +26,13 @@ import ( "reasonix/internal/provider" "reasonix/internal/store" "reasonix/internal/worktree" + "slices" + "sort" + "strings" + "sync" + "sync/atomic" + "time" + "unicode" ) // WorkspaceTab @@ -165,6 +163,7 @@ type WorkspaceTab struct { TopicTitle string // display title topicTitleSource string // auto or manual; controls localization at API boundaries SessionPath string // exact .jsonl file this tab continues + SessionGeneration uint64 // bumps on session rotation (clear/new); frontend hydrate identity ReadOnly bool // true for external channel transcripts opened for browsing Ctrl control.SessionAPI // nil while booting / on error Label string // model label (for the tab badge) @@ -2137,6 +2136,7 @@ type TabMeta struct { SessionPath string `json:"sessionPath,omitempty"` SessionRevision int64 `json:"sessionRevision,omitempty"` SessionDigest string `json:"sessionDigest,omitempty"` + SessionGeneration uint64 `json:"sessionGeneration,omitempty"` ReadOnly bool `json:"readOnly,omitempty"` ProjectColor string `json:"projectColor,omitempty"` Label string `json:"label"` @@ -2199,6 +2199,7 @@ func (a *App) tabMeta(tab *WorkspaceTab, active bool) TabMeta { SessionPath: sessionPath, SessionRevision: sessionRevision, SessionDigest: sessionDigest, + SessionGeneration: tab.SessionGeneration, ReadOnly: tab.ReadOnly, Label: tab.Label, Ready: runtimeView.Phase == sessionRuntimeReady && tab.Ctrl != nil, @@ -2442,7 +2443,7 @@ func (a *App) openTopicTabWithActivation(scope, workspaceRoot, topicID, sessionP a.startTabControllerBuild(tab) if scope == "project" { - a.emitProjectTreeChangedForSessionDirs(sessionListCacheDirForPath(sessionPath)) + a.emitProjectTreeChangedForSessionDirs(sessionDirectoryForPath(sessionPath)) } return enrichTabMeta(meta), nil } @@ -2707,7 +2708,7 @@ func (a *App) ensureBlankTab(scope, workspaceRoot, forcedTokenMode string) (TabM a.mu.Unlock() a.startTabControllerBuild(created) - a.emitProjectTreeChangedForSessionDirs(sessionListCacheDirForPath(prePath)) + a.emitProjectTreeChangedForSessionDirs(sessionDirectoryForPath(prePath)) return enrichTabMeta(meta), nil } @@ -2763,7 +2764,7 @@ func (a *App) ensureBlankTab(scope, workspaceRoot, forcedTokenMode string) (TabM a.mu.Unlock() a.startTabControllerBuild(created) - a.emitProjectTreeChangedForSessionDirs(sessionListCacheDirForPath(prePath)) + a.emitProjectTreeChangedForSessionDirs(sessionDirectoryForPath(prePath)) return enrichTabMeta(meta), nil } @@ -3467,7 +3468,7 @@ func (a *App) markTabRemovedLocked(tab *WorkspaceTab) { // rebuild paths, which serialize through runtimeRebuildMu instead and are // never superseded by generation bumps. Callers must hold a.mu. func (a *App) tabBuildSupersededLocked(tab *WorkspaceTab, generation uint64) bool { - if tab == nil || tab.removed || a.tabs[tab.ID] != tab { + if tab == nil || tab.removed || a.shuttingDown.Load() || a.tabs[tab.ID] != tab { return true } return generation != 0 && tab.buildGeneration != generation @@ -3592,10 +3593,6 @@ func (a *App) buildTabController(tab *WorkspaceTab) { a.buildTabControllerWithLoadedSession(tab, loadedTabSession{}) } -func (a *App) buildTabControllerAdmissionHeld(tab *WorkspaceTab) { - a.buildTabControllerWithLoadedSessionAdmissionHeld(tab, loadedTabSession{}) -} - type loadedTabSession struct { Path string Session *agent.Session @@ -3609,10 +3606,6 @@ func (a *App) buildTabControllerWithLoadedSession(tab *WorkspaceTab, loadedSessi a.buildTabControllerWithContext(tab, loadedSession, a.bootContext(), 0, nil) } -func (a *App) buildTabControllerWithLoadedSessionAdmissionHeld(tab *WorkspaceTab, loadedSession loadedTabSession) { - a.buildTabControllerWithContextAdmissionHeld(tab, loadedSession, a.bootContext(), 0, nil) -} - func (a *App) desktopNotificationSender() notify.Sender { if a == nil { return notify.NewPlatformSender() @@ -3677,7 +3670,7 @@ func (a *App) recordTabStartupFailure(tab *WorkspaceTab, buildGeneration uint64, // closeTabBuildDone signals waiters (topic-activation completions) that the // build owning buildGeneration has terminated. Every build funnels through -// buildTabControllerWithContextAdmissionHeld, whose deferred call guarantees +// buildTabControllerWithContextCore, whose deferred call guarantees // the channel startTabControllerBuild created is closed exactly once, on every // terminal path — success, failure, and superseded abandon alike. Synchronous // rebuild paths pass generation 0 and never created a channel. @@ -3694,16 +3687,13 @@ func (a *App) closeTabBuildDone(tab *WorkspaceTab, buildGeneration uint64) { } func (a *App) buildTabControllerWithContext(tab *WorkspaceTab, loadedSession loadedTabSession, buildCtx context.Context, buildGeneration uint64, buildCancel context.CancelFunc) { - a.runtimeAdmissionMu.RLock() - defer a.runtimeAdmissionMu.RUnlock() - a.buildTabControllerWithContextAdmissionHeld(tab, loadedSession, buildCtx, buildGeneration, buildCancel) + a.buildTabControllerWithContextCore(tab, loadedSession, buildCtx, buildGeneration, buildCancel) } -// buildTabControllerWithContextAdmissionHeld is the build core for callers -// that already hold either side of runtimeAdmissionMu. Keeping acquisition in -// the outer wrapper prevents recursive RLock deadlocks when foreground turn -// admission repairs a stale workspace while an MCP lifecycle writer is queued. -func (a *App) buildTabControllerWithContextAdmissionHeld(tab *WorkspaceTab, loadedSession loadedTabSession, buildCtx context.Context, buildGeneration uint64, buildCancel context.CancelFunc) { +// buildTabControllerWithContextCore performs configuration, session routing, +// and extension boot outside runtimeAdmissionMu. Only publication enters the +// lifecycle barrier. +func (a *App) buildTabControllerWithContextCore(tab *WorkspaceTab, loadedSession loadedTabSession, buildCtx context.Context, buildGeneration uint64, buildCancel context.CancelFunc) { defer a.recoverToPending("buildTabController") keepBuildContext := false defer func() { @@ -3765,46 +3755,37 @@ func (a *App) buildTabControllerWithContextAdmissionHeld(tab *WorkspaceTab, load } sessionDir := desktopSessionDir(root) + if tabScope == "global" { + sessionDir = desktopSessionDir(globalWorkspaceRoot()) + } topicID := strings.TrimSpace(tabTopicID) - - // Assign Global topics to legacy sessions in the global session dir so - // imported history appears in the project tree regardless of which tab - // triggered the build (the migration now sends everything to global). - migratedGlobalTopics := migrateLegacySessionsIntoGlobalTopics(config.SessionDir()) - if len(migratedGlobalTopics) > 0 { - a.emitProjectTreeChangedForSessionDirs(config.SessionDir()) - } - if tabScope == "global" && topicID == "" && len(migratedGlobalTopics) > 0 { - topicID = migratedGlobalTopics[0] - topicTitle := topicTitleForTab("global", "", topicID) - topicSource := loadTopicTitleSource("", topicID) - a.mu.Lock() - if a.tabBuildSupersededLocked(tab, buildGeneration) { - a.mu.Unlock() - return - } - if strings.TrimSpace(tab.TopicID) == "" { - tab.TopicID = topicID - tab.TopicTitle = topicTitle - tab.topicTitleSource = topicSource - a.saveTabsLocked() - } else { - topicID = strings.TrimSpace(tab.TopicID) - } - a.mu.Unlock() + pinnedPath, hasPinnedPath := pinnedTabSessionPathForBuild(tabScope, tabWorkspaceRoot, sessionDir, tabSessionPath) + if hasPinnedPath && agent.IsCleanupPending(pinnedPath) { + // Boot reconciliation may finish the pending deletion before the later + // resume step. Clear the local candidate now so the disappeared path is + // not mistaken for a deliberate empty placeholder afterward. + hasPinnedPath = false + pinnedPath = "" + } + catalogTopicPath := "" + if hasPinnedPath { + // A restored tab's exact path is already known state, not history + // discovery. Keep legacy-directory and empty placeholder paths usable + // while the catalog is still opening or rebuilding. + sessionDir = filepath.Dir(pinnedPath) + } else { + catalogTopicPath = a.catalogSessionPathForTopic(tabScope, tabWorkspaceRoot, topicID) } - if topicID != "" { - if _, dir := a.findTopicSessionForTarget(tabScope, tabWorkspaceRoot, topicID); dir != "" { - sessionDir = dir - } + if !hasPinnedPath && catalogTopicPath != "" { + sessionDir = filepath.Dir(catalogTopicPath) } startupSessionPath := "" - if pinnedPath, ok := pinnedTabSessionPath(sessionDir, tabSessionPath); ok { + if hasPinnedPath { if !agent.IsCleanupPending(pinnedPath) { startupSessionPath = pinnedPath } - } else if topicID != "" { - startupSessionPath = findTopicSession(sessionDir, topicID) + } else if catalogTopicPath != "" { + startupSessionPath = catalogTopicPath } model := strings.TrimSpace(tabModel) @@ -3877,13 +3858,20 @@ func (a *App) buildTabControllerWithContextAdmissionHeld(tab *WorkspaceTab, load 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) - - ctrl, err := boot.Build(buildCtx, boot.Options{ + buildCtx, registration := beginSharedHostMCPRegistration(buildCtx, sharedHost) + defer registration.rollback() + ctrl, err := a.buildTabControllerBootFenced(buildCtx, extensionGen, boot.Options{ Model: model, RequireKey: false, StatsSource: "desktop", + TaskStore: a.taskStore(), OnConfigLoadWarnings: a.configLoadWarningsHandler(), Sink: sink, WorkspaceRoot: root, @@ -3896,70 +3884,32 @@ func (a *App) buildTabControllerWithContextAdmissionHeld(tab *WorkspaceTab, load SessionRecoveryMeta: a.tabSessionRecoveryMeta(tab), OnSessionRecovered: a.handleTabSessionRecovered(tab), }) - if err != nil { - leaseHeld := false - a.mu.Lock() - if a.tabBuildSupersededLocked(tab, buildGeneration) { - a.mu.Unlock() - a.abandonSupersededBuild(tab, nil, rootKey, "") - return - } - leaseHeld = setTabStartupError(tab, err) - tab.Ready = false - if leaseHeld { - a.setSessionRuntimePhaseLocked(tab, sessionRuntimeLeaseBlocked, err) - } else { - a.setSessionRuntimePhaseLocked(tab, sessionRuntimeFailed, err) - } - hostKey := takeTabSharedHostKey(tab) - tab.releaseSessionLease() - a.mu.Unlock() - if hostKey != "" { - a.releaseSharedHost(hostKey) - } - if leaseHeld { - a.scheduleDeferredStartupBuild(tab.ID) - } - a.emitReady(wailsCtx, tab.ID) + if a.handleTabControllerBootError(tab, registration, rootKey, buildGeneration, wailsCtx, err) { return } if a.tabBuildSuperseded(tab, buildGeneration) { + registration.rollback() a.abandonSupersededBuild(tab, ctrl, rootKey, "") return } - + if a.currentExtensionGeneration() != extensionGen { + registration.rollback() + a.abandonSupersededBuild(tab, ctrl, rootKey, "") + a.scheduleDeferredStartupBuild(tab.ID) + return + } a.bindControllerDisplayRecorder(ctrl) configureControllerRuntime(ctrl, nil, buildRuntime) acquiredLeaseKey := "" restoredRuntime := buildRuntime if dir := ctrl.SessionDir(); dir != "" { - migratedTopics := migrateLegacySessionsIntoGlobalTopics(dir) - if len(migratedTopics) > 0 { - a.emitProjectTreeChangedForSessionDirs(dir) - } // Refresh the topic/session locals under the lock: a rebind or the // recovery callback may have rewritten them since the early snapshot. a.mu.RLock() tabTopicID = strings.TrimSpace(tab.TopicID) tabSessionPath = tab.SessionPath a.mu.RUnlock() - if tabScope == "global" && tabTopicID == "" && len(migratedTopics) > 0 { - topicID := migratedTopics[0] - topicTitle := topicTitleForTab("global", "", topicID) - topicSource := loadTopicTitleSource("", topicID) - a.mu.Lock() - if !a.tabBuildSupersededLocked(tab, buildGeneration) && strings.TrimSpace(tab.TopicID) == "" { - tab.TopicID = topicID - tab.TopicTitle = topicTitle - tab.topicTitleSource = topicSource - tabTopicID = topicID - a.saveTabsLocked() - } else { - tabTopicID = strings.TrimSpace(tab.TopicID) - } - a.mu.Unlock() - } var path string var resumeSession *agent.Session var resumeLoadErr error @@ -3973,7 +3923,7 @@ func (a *App) buildTabControllerWithContextAdmissionHeld(tab *WorkspaceTab, load resumeSession = loaded } if resumeLoadErr == nil && path == "" && tabTopicID != "" { - existingPath := findTopicSession(dir, tabTopicID) + existingPath := a.catalogSessionPathForTopic(tabScope, tabWorkspaceRoot, tabTopicID) if existingPath != "" { if loaded, err := loadResumableSession(existingPath); err == nil { path = existingPath @@ -4125,12 +4075,31 @@ func (a *App) buildTabControllerWithContextAdmissionHeld(tab *WorkspaceTab, load } } + // Lifecycle admission protects only the compare-and-publish boundary. Slow + // config, history, lease, and extension work above remains cancellable and + // cannot prevent shutdown from acquiring the write side. + releasePublication, extensionsCurrent := a.lockTabControllerPublication(extensionGen) + if !extensionsCurrent { + registration.rollback() + a.abandonSupersededBuild(tab, ctrl, rootKey, acquiredLeaseKey) + a.scheduleDeferredStartupBuild(tab.ID) + return + } + defer releasePublication() a.mu.Lock() if a.tabBuildSupersededLocked(tab, buildGeneration) { a.mu.Unlock() a.abandonSupersededBuild(tab, ctrl, rootKey, acquiredLeaseKey) return } + // Commit the scope while the final tab-generation check is still guarded. + // It only takes the plugin Host leaf lock and cannot call back into App. + if !registration.commit() { + a.mu.Unlock() + a.abandonSupersededBuild(tab, ctrl, rootKey, acquiredLeaseKey) + a.scheduleDeferredStartupBuild(tab.ID) + return + } tab.Ctrl = ctrl tab.Label = ctrl.Label() applyNormalizedRuntimeToTabLocked(tab, restoredRuntime) @@ -4549,6 +4518,10 @@ func (a *App) tabSnapshotLoop(tab *WorkspaceTab) { a.mu.RUnlock() if ctrl != nil { if err := a.snapshotTab(tab); err == nil { + a.mu.RLock() + scope, workspaceRoot := tab.Scope, tab.WorkspaceRoot + a.mu.RUnlock() + a.requestSessionCatalogPath(scope, workspaceRoot, ctrl.SessionPath()) if !a.maybeAutoTitleTopic(tab) { a.emitProjectTreeChangedForSessionDirs(ctrl.SessionDir()) } @@ -6253,7 +6226,7 @@ func (a *App) handleTabSessionRecovered(tab *WorkspaceTab) func(control.SessionR _ = saveTelemetry(info.RecoveryPath+".telemetry.json", tab.telemetrySnapshot()) } } - a.emitProjectTreeChangedForSessionDirs(sessionListCacheDirForPath(info.RecoveryPath)) + a.emitProjectTreeChangedForSessionDirs(sessionDirectoryForPath(info.RecoveryPath)) a.emitRuntimeEvent("session:recovered", sessionRecoveryEvent{ OriginalPath: info.OriginalPath, RecoveryPath: info.RecoveryPath, @@ -6484,6 +6457,8 @@ type ProjectNode struct { SessionPath string `json:"sessionPath,omitempty"` ProjectColor string `json:"projectColor,omitempty"` Turns int `json:"turns,omitempty"` + TurnsState string `json:"turnsState,omitempty"` + Health string `json:"health,omitempty"` CreatedAt int64 `json:"createdAt,omitempty"` LastActivityAt int64 `json:"lastActivityAt,omitempty"` Open bool `json:"open,omitempty"` @@ -6507,508 +6482,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 -// history panel can list them, but the project tree cannot. Give each such -// session a deterministic Global topic so every old conversation has a direct -// sidebar entry without guessing a project workspace. -// legacyMigrationMu serializes the lockless load-modify-save of the projects / -// topic-title files: this migration runs from every concurrent buildTabController -// and from ListProjectTree, so without it parallel runs lose each other's appends. -var legacyMigrationMu sync.Mutex - -// topicMigrationMarker, once written into a session dir, records that the -// pre-topic → Global-topic migration pass completed for that dir. Later -// ListProjectTree calls can skip the full session decode while the marker is -// newer than the directory's session files, but a newly-created CLI session -// invalidates the marker and gets a bounded re-scan. -// It is stamped only when the pass left nothing deferred (an empty legacy -// session that could gain content later keeps the dir unmarked), so the gate -// never hides a session that should still be migrated. -// v2 re-evaluates recovery-named sessions that v1 skipped solely by filename. -// The old marker cannot safely suppress this one-time data-preservation pass. -const topicMigrationMarker = ".topics-migrated-v2" -const topicIndexRepairMarker = ".topic-indexes-repaired-v2" - -func invalidateTopicDirMarkers(dir string) error { - dir = strings.TrimSpace(dir) - if dir == "" { - return nil - } - var errs []error - for _, marker := range []string{topicMigrationMarker, topicIndexRepairMarker} { - if err := os.Remove(filepath.Join(dir, marker)); err != nil && !os.IsNotExist(err) { - errs = append(errs, err) - } - } - return errors.Join(errs...) -} - -func topicDirMarkerDone(dir, marker string) bool { - dir = strings.TrimSpace(dir) - marker = strings.TrimSpace(marker) - if dir == "" || marker == "" { - return false - } - markerInfo, err := os.Stat(filepath.Join(dir, marker)) - if err != nil { - return false - } - entries, err := os.ReadDir(dir) - if err != nil { - return true - } - markerTime := markerInfo.ModTime() - for _, entry := range entries { - if entry.IsDir() { - continue - } - name := entry.Name() - if !store.IsSessionTranscriptName(name) && !strings.HasSuffix(name, ".jsonl.meta") { - continue - } - info, err := entry.Info() - if err != nil { - return false - } - if info.ModTime().After(markerTime) { - return false - } - } - return true -} - -func topicMigrationDone(dir string) bool { - return topicDirMarkerDone(dir, topicMigrationMarker) -} - -func topicIndexRepairDone(dir string) bool { - return topicDirMarkerDone(dir, topicIndexRepairMarker) -} - -func markTopicDirMarkerDone(dir, marker string) { - dir = strings.TrimSpace(dir) - marker = strings.TrimSpace(marker) - if dir == "" || marker == "" { - return - } - if err := os.MkdirAll(dir, 0o755); err != nil { - return - } - _ = os.WriteFile(filepath.Join(dir, marker), nil, 0o644) -} - -func markTopicMigrationDone(dir string) { - markTopicDirMarkerDone(dir, topicMigrationMarker) -} - -func markTopicIndexRepairDone(dir string) { - markTopicDirMarkerDone(dir, topicIndexRepairMarker) -} - -func migrateLegacySessionsIntoGlobalTopics(dir string) []string { - if strings.TrimSpace(dir) == "" { - return nil - } - repairedTopicIDs := repairIndexedSessionTopics(dir) - // One-shot per dir: once the migration pass has completed, skip the full - // per-render session scan entirely. - if topicMigrationDone(dir) { - return repairedTopicIDs - } - scope, workspaceRoot, topicTitleRoot, ok := legacyMigrationTargetForDir(dir) - if !ok { - return nil - } - legacyMigrationMu.Lock() - defer legacyMigrationMu.Unlock() - // Re-check under the lock: another render may have completed the pass while - // this one waited. - if topicMigrationDone(dir) { - return nil - } - infos, err := agent.ListSessionOrder(dir) - if err != nil { - return nil // transient read error — retry on the next render, leave unmarked - } - - var migratedTopicIDs []string - var titles map[string]string - var topicTitles map[string]string - var topicSources map[string]string - // deferred stays false only when every session was either migrated or is - // permanently non-migratable. A transient skip (unreadable meta, empty - // session that may gain content, failed write) sets it, keeping the dir - // unmarked so the next render retries instead of the gate hiding it forever. - deferred := false - for _, info := range infos { - if sessionOrderInfoIsUnmodifiedRecoveryCopy(info, dir) { - continue - } - if strings.TrimSpace(info.TopicID) != "" { - continue - } - if meta, ok, err := agent.LoadBranchMeta(info.Path); err != nil { - deferred = true - continue - } else if ok && !legacySessionMetaMatchesMigrationTarget(meta, scope, workspaceRoot) { - continue - } - topicID := legacySessionTopicID(info.Path) - if topicID == "" { - continue - } - preview, turns := agent.SessionPreview(info.Path) - if turns == 0 { - deferred = true // empty now, but a later turn could make it migratable - continue - } - if titles == nil { - titles = loadSessionTitles(dir) - } - title := strings.TrimSpace(titles[filepath.Base(info.Path)]) - if title == "" { - title = topicTitleFromText(preview) - } else if normalized := topicTitleFromText(title); normalized != "" { - title = normalized - } - if title == "" { - when := info.LastActivityAt - if when.IsZero() { - when = info.ModTime - } - if when.IsZero() { - title = "历史会话" - } else { - title = "历史会话 " + when.Local().Format("2006-01-02") - } - } - - migrated, err := func() (bool, error) { - // Read-modify-write on the branch-meta sidecar: hold the per-path - // meta lock so agent-side writers (autosave revision bumps, - // in-flight markers) can't interleave between the load and save - // below and lose their fields. - unlock, lockErr := agent.LockSessionMetaPath(info.Path) - if lockErr != nil { - return false, lockErr - } - defer unlock() - meta, err := agent.EnsureBranchMetaLocked(info.Path) - if err != nil { - return false, err - } - // Preserve scoped sessions only when their existing ownership matches - // the directory being migrated. - if !legacySessionMetaMatchesMigrationTarget(meta, scope, workspaceRoot) { - return false, nil - } - meta.Scope = scope - meta.WorkspaceRoot = workspaceRoot - meta.TopicID = topicID - meta.TopicTitle = title - return true, agent.SaveBranchMetaPreserveUpdatedLocked(info.Path, meta) - }() - if err != nil { - deferred = true - continue - } - if !migrated { - continue - } - if topicTitles == nil { - topicTitles = loadTopicTitles(topicTitleRoot) - } - if topicSources == nil { - topicSources = loadTopicTitleSources(topicTitleRoot) - } - if strings.TrimSpace(topicTitles[topicID]) == "" { - topicTitles[topicID] = title - topicSources[topicID] = topicTitleSourceManual - } - migratedTopicIDs = append(migratedTopicIDs, topicID) - } - if len(migratedTopicIDs) == 0 { - if !deferred { - markTopicMigrationDone(dir) // nothing left to migrate — gate future scans - } - return repairedTopicIDs - } - _ = prependTopicsInProjectsFile(workspaceRoot, migratedTopicIDs, false) - // Same fresh tombstone re-check as the repair pass: these are whole-map - // saves, so a concurrent DeleteTopic of an unrelated topic must not have - // its title written back by this migration batch. - pruneDeletedTopicEntries(topicTitles, topicSources) - if topicTitles != nil { - _ = saveTopicTitles(topicTitleRoot, topicTitles) - } - if topicSources != nil { - _ = saveTopicTitleSources(topicTitleRoot, topicSources) - } - invalidateTopicSessionIndex(dir) - projectSessionCache.invalidateDirs(dir) - if !deferred { - markTopicMigrationDone(dir) // pass complete with nothing deferred - } - return uniqueStrings(append(repairedTopicIDs, migratedTopicIDs...)) -} - -// pruneDeletedTopicEntries drops tombstoned topics from scan-built title and -// source maps just before they are persisted, re-reading DeletedTopics so a -// DeleteTopic that landed after the scan snapshot wins. The maps are loaded -// whole at scan start and saved whole at the end; without this re-check the -// save would write the deleted topic's stale entries back, and a title-map -// entry alone resurrects a topic in the sidebar (orderedTopicIDs lists topics -// that exist only in the title map). Returns the tombstone list so callers can -// filter their returned topic-ID slices against the same snapshot. -func pruneDeletedTopicEntries(maps ...map[string]string) []string { - deleted := loadProjectsFile().DeletedTopics - if len(deleted) == 0 { - return nil - } - for _, m := range maps { - for _, id := range deleted { - delete(m, id) - } - } - return deleted -} - -func repairIndexedSessionTopics(dir string) []string { - if strings.TrimSpace(dir) == "" || topicIndexRepairDone(dir) { - return nil - } - scope, workspaceRoot, topicTitleRoot, ok := legacyMigrationTargetForDir(dir) - if !ok { - return nil - } - legacyMigrationMu.Lock() - defer legacyMigrationMu.Unlock() - if topicIndexRepairDone(dir) { - return nil - } - infos, err := agent.ListSessionOrder(dir) - if err != nil { - return nil - } - - topicTitles, err := loadTopicTitlesForUpdate(topicTitleRoot) - if err != nil { - return nil - } - topicSources, err := loadTopicTitleSourcesForUpdate(topicTitleRoot) - if err != nil { - return nil - } - projects := loadProjectsFile() - deletedTopics := projects.DeletedTopics - // Repair only topics missing from the sidebar index. Skipping topics that - // are already listed and titled keeps steady-state rescans write-free: - // otherwise every rescan (any session activity invalidates the marker) - // would prepend the full topic list back in most-recently-active order, - // reordering the user's sidebar and handing already-visible topics to the - // blank-tab binding in the migration callers. - indexedTopics := projects.GlobalTopics - if scope == "project" { - indexedTopics = nil - if i := projectIndexByRoot(projects.Projects, workspaceRoot); i >= 0 { - indexedTopics = projects.Projects[i].Topics - } - } - indexedSet := make(map[string]bool, len(indexedTopics)) - for _, id := range indexedTopics { - indexedSet[id] = true - } - var repairedTopicIDs []string - var sessionTitles map[string]string - titlesChanged := false - sourcesChanged := false - deferred := false - for _, info := range infos { - if sessionOrderInfoIsUnmodifiedRecoveryCopy(info, dir) { - continue - } - topicID := strings.TrimSpace(info.TopicID) - if topicID == "" { - continue - } - if indexedSet[topicID] && strings.TrimSpace(topicTitles[topicID]) != "" { - continue // fully indexed already — nothing to repair, skip the meta read - } - meta, ok, err := agent.LoadBranchMeta(info.Path) - if err != nil { - deferred = true - continue - } - if !ok || strings.TrimSpace(meta.TopicID) == "" { - continue - } - if containsDesktopString(deletedTopics, topicID) { - continue - } - if !legacySessionScopeMatchesMigrationTarget(meta, scope, workspaceRoot) { - continue - } - repairedTopicIDs = append(repairedTopicIDs, topicID) - if strings.TrimSpace(topicTitles[topicID]) == "" { - if sessionTitles == nil { - sessionTitles = loadSessionTitles(dir) - } - title := indexedSessionTopicTitle(sessionTitles, info, meta) - if title == "" { - title = defaultTopicTitle - } - topicTitles[topicID] = title - titlesChanged = true - } - if strings.TrimSpace(topicSources[topicID]) == "" { - topicSources[topicID] = topicTitleSourceManual - sourcesChanged = true - } - } - if len(repairedTopicIDs) > 0 { - // Re-check tombstones right before persisting: a DeleteTopic landing - // after the scan snapshot must win. The prepend re-filters under the - // projects-file lock; the whole-map title/source saves and the - // returned IDs (callers bind blank Global tabs to the first entry) - // need the same fresh read. - if deletedNow := pruneDeletedTopicEntries(topicTitles, topicSources); len(deletedNow) > 0 { - deletedSet := make(map[string]bool, len(deletedNow)) - for _, id := range deletedNow { - deletedSet[id] = true - } - live := repairedTopicIDs[:0] - for _, id := range repairedTopicIDs { - if !deletedSet[id] { - live = append(live, id) - } - } - repairedTopicIDs = live - } - } - if len(repairedTopicIDs) > 0 { - if err := prependTopicsInProjectsFile(workspaceRoot, repairedTopicIDs, false); err != nil { - deferred = true - } - if titlesChanged { - if err := saveTopicTitles(topicTitleRoot, topicTitles); err != nil { - deferred = true - } - } - if sourcesChanged { - if err := saveTopicTitleSources(topicTitleRoot, topicSources); err != nil { - deferred = true - } - } - if !deferred { - projectSessionCache.invalidateDirs(dir) - } - } - if !deferred { - markTopicIndexRepairDone(dir) - return uniqueStrings(repairedTopicIDs) - } - return nil -} - -func indexedSessionTopicTitle(sessionTitles map[string]string, info agent.SessionOrderInfo, meta agent.BranchMeta) string { - if title := topicTitleFromText(meta.TopicTitle); title != "" { - return title - } - if title := topicTitleFromText(info.TopicTitle); title != "" { - return title - } - if title := topicTitleFromText(sessionTitles[filepath.Base(info.Path)]); title != "" { - return title - } - return topicTitleFromText(info.Preview) -} - -func sessionOrderInfoIsAutomaticRecovery(info agent.SessionOrderInfo) bool { - return info.Recovered || - strings.TrimSpace(info.RecoveryDigest) != "" || - isAutomaticRecoverySessionPath(info.Path) -} - -func sessionInfoIsAutomaticRecovery(info agent.SessionInfo) bool { - return info.Recovered || - strings.TrimSpace(info.RecoveryDigest) != "" || - isAutomaticRecoverySessionPath(info.Path) -} - -func sessionOrderInfoIsUnmodifiedRecoveryCopy(info agent.SessionOrderInfo, parentDir string) bool { - return sessionOrderInfoIsAutomaticRecovery(info) && - agent.RecoveryBranchCoveredByParent(info.Path, parentDir) -} - -func sessionInfoIsUnmodifiedRecoveryCopy(info agent.SessionInfo, parentDir string) bool { - return sessionInfoIsAutomaticRecovery(info) && - agent.RecoveryBranchCoveredByParent(info.Path, parentDir) -} - -func isAutomaticRecoverySessionPath(path string) bool { - id := agent.BranchID(path) - idx := strings.LastIndex(id, "-recovery-") - if idx <= 0 { - return false - } - suffix := id[idx+len("-recovery-"):] - if len(suffix) != 16 { - return false - } - for _, r := range suffix { - if (r >= '0' && r <= '9') || (r >= 'a' && r <= 'f') || (r >= 'A' && r <= 'F') { - continue - } - return false - } - return true -} - -func legacyMigrationTargetForDir(dir string) (scope, workspaceRoot, topicTitleRoot string, ok bool) { - dir = cleanDesktopPath(dir) - if dir == "" { - return "", "", "", false - } - if sameDesktopPath(dir, config.SessionDir()) || sameDesktopPath(dir, desktopSessionDir(globalWorkspaceRoot())) { - return "global", "", "", true - } - for _, p := range loadProjectsFile().Projects { - if sameDesktopPath(config.ProjectSessionDir(p.Root), dir) { - return "project", p.Root, p.Root, true - } - } - return "", "", "", false -} - func legacySessionMetaMatchesMigrationTarget(meta agent.BranchMeta, scope, workspaceRoot string) bool { if strings.TrimSpace(meta.TopicID) != "" { return false @@ -7498,24 +6971,26 @@ func (a *App) setTabActivityStatus(tabID, status string) bool { } func (a *App) emitProjectTreeChanged() { - projectSessionCache.invalidate() + a.requestSessionCatalogMetadataSync() + for _, target := range a.sessionCatalogTargets() { + a.requestSessionCatalogReconcile(target.Path) + } a.emitProjectTreeChangedEvent() } -// emitProjectTreeChangedForSessionDirs keeps cached listings for unrelated -// workspaces. A session mutation only changes the directory containing that -// transcript, so invalidating every known project turns one archive into an -// O(all sessions) rescan for heavy users. +// emitProjectTreeChangedForSessionDirs schedules only the affected catalog +// directories. It never scans synchronously on the mutation or UI goroutine. func (a *App) emitProjectTreeChangedForSessionDirs(dirs ...string) { - if !projectSessionCache.invalidateDirs(dirs...) { - projectSessionCache.invalidate() + for _, dir := range dirs { + a.requestSessionCatalogReconcile(dir) } a.emitProjectTreeChangedEvent() } // emitProjectTreeMetadataChanged refreshes ordering, titles, pins, and runtime -// status without discarding session listings whose on-disk data did not move. +// status without walking session storage. func (a *App) emitProjectTreeMetadataChanged() { + a.requestSessionCatalogMetadataSync() a.emitProjectTreeChangedEvent() } @@ -7676,19 +7151,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 @@ -7709,324 +7173,6 @@ func topicHiddenAsRecoveryOnly(summary topicSummary, pinned bool, runtimeSession return true } -var listProjectTreeMu sync.Mutex - -func (a *App) ListProjectTree() []ProjectNode { - listProjectTreeMu.Lock() - defer listProjectTreeMu.Unlock() - - knownDirs := a.knownSessionDirs() - for _, dir := range knownDirs { - migrateLegacySessionsIntoGlobalTopics(dir) - } - f := loadProjectsFile() - // Render-side tombstone guard: a deleted topic whose title survived a racy - // whole-map save would otherwise reappear via the orderedTopicIDs title-map - // fallback. The tombstone is authoritative until an intentional - // single-topic write (create/restore/tab indexing) clears it. - deletedTopicSet := make(map[string]bool, len(f.DeletedTopics)) - for _, id := range f.DeletedTopics { - deletedTopicSet[id] = true - } - out := []ProjectNode{} - topicSummaries := map[string]topicSummary{} - sessionInfos := map[string]agent.SessionInfo{} - sessionTitles := map[string]string{} - - // Read session listings from all known directories concurrently, since - // each dir is independent I/O. With N workspaces × dozens of sessions, - // sequential reads add up to seconds of wall time on cold start. - type sessionDirLoadResult struct { - dir string - infos []agent.SessionInfo - titles map[string]string - ok bool - } - results := make(chan sessionDirLoadResult, len(knownDirs)) - pendingLoads := 0 - for _, dir := range knownDirs { - infos, titles, ok := projectSessionCache.get(dir) - if ok { - mergeSessionInfos(dir, infos, titles, sessionInfos, sessionTitles, topicSummaries) - continue - } - pendingLoads++ - // capture - cacheToken := projectSessionCache.versionToken(dir) - go func() { - result := sessionDirLoadResult{dir: dir} - defer func() { - if recover() != nil { - result.ok = false - } - results <- result - }() - - // Sidecar-backed listing: ListSessions reads turn count + preview from - // each session's .meta sidecar, so even large directories list in a few - // milliseconds without decoding any .jsonl body. The in-memory - // projectSessionCache still elides repeat listings within a session. - infos, err := agent.ListSessions(dir) - if err != nil { - return - } - titles := loadSessionTitles(dir) - projectSessionCache.put(dir, infos, titles, cacheToken) - result.infos = infos - result.titles = titles - result.ok = true - }() - } - if pendingLoads > 0 { - timer := time.NewTimer(5 * time.Second) - for received := 0; received < pendingLoads; { - select { - case result := <-results: - received++ - if result.ok { - mergeSessionInfos(result.dir, result.infos, result.titles, sessionInfos, sessionTitles, topicSummaries) - } - case <-timer.C: - received = pendingLoads - } - } - timer.Stop() - } - - runtimeSessionsByTopic := map[string][]runtimeSessionStatus{} - a.mu.RLock() - seenRuntimePaths := map[string]bool{} - addRuntimeSession := func(tab *WorkspaceTab, open bool) { - if tab == nil || strings.TrimSpace(tab.TopicID) == "" { - return - } - sessionPath := sessionRuntimeKey(tab.currentSessionPath()) - if sessionPath == "" || seenRuntimePaths[sessionPath] { - return - } - seenRuntimePaths[sessionPath] = true - info := sessionInfos[sessionPath] - recovered := sessionInfoIsAutomaticRecovery(info) || isAutomaticRecoverySessionPath(sessionPath) - label := runtimeSessionTreeLabel(tab, info, sessionTitles[sessionPath]) - titleSource := tab.topicTitleSource - if strings.TrimSpace(sessionTitles[sessionPath]) != "" { - titleSource = topicTitleSourceManual - } - status := activityStatusForTab(tab) - runtimeStatus := control.RuntimeStatus{} - if tab.Ctrl != nil { - runtimeStatus = tab.Ctrl.RuntimeStatus() - } - running := status != "" || runtimeStatus.Running || runtimeStatus.PendingPrompt || runtimeStatus.BackgroundJobs > 0 - runtimeSessionsByTopic[topicSummaryKey(tab.Scope, tab.WorkspaceRoot, tab.TopicID)] = append(runtimeSessionsByTopic[topicSummaryKey(tab.Scope, tab.WorkspaceRoot, tab.TopicID)], runtimeSessionStatus{ - sessionPath: sessionPath, - label: label, - titleSource: titleSource, - turns: info.Turns, - createdAt: unixMilliOrZero(info.CreatedAt), - lastActivityAt: unixMilliOrZero(info.LastActivityAt), - open: open, - running: running, - status: status, - recovered: recovered, - recoveryReason: info.RecoveryReason, - recoveryDigest: info.RecoveryDigest, - recoveryParentID: string(info.ParentID), - }) - } - for _, tab := range a.tabs { - addRuntimeSession(tab, true) - } - for _, tab := range a.detachedSessions { - addRuntimeSession(tab, false) - } - a.mu.RUnlock() - for key := range runtimeSessionsByTopic { - sort.Slice(runtimeSessionsByTopic[key], func(i, j int) bool { - left := runtimeSessionsByTopic[key][i] - right := runtimeSessionsByTopic[key][j] - if left.lastActivityAt != right.lastActivityAt { - return left.lastActivityAt > right.lastActivityAt - } - return left.sessionPath < right.sessionPath - }) - } - topicRuntimeStatus := func(key string) (open, running bool, status string) { - sessions := runtimeSessionsByTopic[key] - if len(sessions) != 1 { - return false, false, "" - } - session := sessions[0] - return session.open, session.running, session.status - } - runtimeSessionNodes := func(scope, workspaceRoot, topicID, projectColor string) []ProjectNode { - key := topicSummaryKey(scope, workspaceRoot, topicID) - sessions := runtimeSessionsByTopic[key] - if len(sessions) <= 1 { - return nil - } - nodes := make([]ProjectNode, 0, len(sessions)) - for _, session := range sessions { - kind := "session" - if scope == "global" { - kind = "global_session" - } - nodes = append(nodes, ProjectNode{ - Key: projectSessionNodeKey(scope, session.sessionPath), - Kind: kind, - Label: a.localizedTopicTitle(session.label, session.titleSource), - Root: workspaceRoot, - TopicID: topicID, - SessionPath: session.sessionPath, - ProjectColor: projectColor, - Turns: session.turns, - CreatedAt: session.createdAt, - LastActivityAt: session.lastActivityAt, - Open: session.open, - Running: session.running, - Status: session.status, - Recovered: session.recovered, - RecoveryReason: session.recoveryReason, - RecoveryDigest: session.recoveryDigest, - RecoveryParentID: session.recoveryParentID, - }) - } - return nodes - } - - // Global section. - globalTitleMap := loadTopicTitles("") - globalTitleSources := loadTopicTitleSources("") - globalCreatedMap := loadTopicCreatedAts("") - if len(globalTitleMap) > 0 || len(f.Projects) == 0 { - globalTitle := strings.TrimSpace(f.GlobalTitle) - if globalTitle == "" { - globalTitle = "Global" - } - globalColor := normalizeProjectColor(f.GlobalColor) - globalTopicIDs := pinnedTopicIDs(orderedTopicIDs(f.GlobalTopics, globalTitleMap), f.GlobalPinnedTopics) - children := make([]ProjectNode, 0, len(globalTopicIDs)) - for _, id := range globalTopicIDs { - if deletedTopicSet[id] { - continue - } - title := a.localizedTopicTitle(globalTitleMap[id], globalTitleSources[id]) - summaryKey := topicSummaryKey("global", "", id) - summary := topicSummaries[summaryKey] - open, running, status := topicRuntimeStatus(summaryKey) - pinned := containsDesktopString(f.GlobalPinnedTopics, id) - if topicHiddenAsRecoveryOnly(summary, pinned, runtimeSessionsByTopic[summaryKey]) { - continue - } - children = append(children, ProjectNode{ - Key: "global_topic_" + id, - Kind: "global_topic", - Label: title, - TopicID: id, - ProjectColor: globalColor, - Turns: summary.displayTurns(), - CreatedAt: topicCreatedAtForTree(globalCreatedMap, id), - LastActivityAt: summary.lastActivityAt, - Open: open, - Running: running, - Status: status, - Pinned: pinned, - Children: runtimeSessionNodes("global", "", id, globalColor), - }) - } - out = append(out, ProjectNode{ - Key: "global_folder", - Kind: "global_folder", - Label: globalTitle, - Root: globalWorkspaceRoot(), - ProjectColor: globalColor, - Children: children, - }) - } - - // Project sections. - type projectTopics struct { - project desktopProject - titles map[string]string - sources map[string]string - createdAts map[string]int64 - } - projectTopicResults := make([]projectTopics, len(f.Projects)) - var topicLoadWg sync.WaitGroup - for i, p := range f.Projects { - topicLoadWg.Go(func() { - projectTopicResults[i] = projectTopics{ - project: p, - titles: loadTopicTitles(p.Root), - sources: loadTopicTitleSources(p.Root), - createdAts: loadTopicCreatedAts(p.Root), - } - }) - } - topicLoadWg.Wait() - for _, loaded := range projectTopicResults { - p := loaded.project - title := p.Title - if title == "" { - title = workspaceName(p.Root) - } - node := ProjectNode{ - Key: "project_" + p.Root, - Kind: "project", - Root: p.Root, - Pinned: containsDesktopString(f.PinnedProjects, p.Root), - IsolatedWorktree: worktree.IsManagedPath(p.Root, config.DeliveryWorktreeDir()), - } - - // Gather topics: explicit topic list + all known topic titles. - titleMap := loaded.titles - titleSources := loaded.sources - createdMap := loaded.createdAts - topicIDs := pinnedTopicIDs(orderedTopicIDs(p.Topics, titleMap), p.PinnedTopics) - - children := make([]ProjectNode, 0, len(topicIDs)) - for _, tid := range topicIDs { - if deletedTopicSet[tid] { - continue - } - topicTitle := strings.TrimSpace(titleMap[tid]) - if topicTitle == "" { - topicTitle = defaultTopicTitle - } - topicTitle = a.localizedTopicTitle(topicTitle, titleSources[tid]) - summaryKey := topicSummaryKey("project", p.Root, tid) - summary := topicSummaries[summaryKey] - open, running, status := topicRuntimeStatus(summaryKey) - pinned := containsDesktopString(p.PinnedTopics, tid) - if topicHiddenAsRecoveryOnly(summary, pinned, runtimeSessionsByTopic[summaryKey]) { - continue - } - children = append(children, ProjectNode{ - Key: "topic_" + tid, - Kind: "topic", - Label: topicTitle, - Root: p.Root, - TopicID: tid, - ProjectColor: p.Color, - Turns: summary.displayTurns(), - CreatedAt: topicCreatedAtForTree(createdMap, tid), - LastActivityAt: summary.lastActivityAt, - Open: open, - Running: running, - Status: status, - Pinned: pinned, - Children: runtimeSessionNodes("project", p.Root, tid, p.Color), - }) - } - node.Label = title - node.ProjectColor = p.Color - node.Children = children - out = append(out, node) - } - - return applyPinnedProjectOrder(applyProjectTreeOrder(out, f.SidebarOrder), f.PinnedProjects) -} - func topicSummaryKey(scope, workspaceRoot, topicID string) string { if scope == "global" { return "global::" + topicID @@ -8042,36 +7188,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"` @@ -8675,6 +7791,29 @@ func pinnedTabSessionPath(dir, sessionPath string) (string, bool) { return path, true } +func pinnedTabSessionPathForBuild(scope, workspaceRoot, targetDir, sessionPath string) (string, bool) { + if path, ok := pinnedTabSessionPath(targetDir, sessionPath); ok { + return path, true + } + // Before per-project storage, desktop tabs persisted exact paths under the + // global session directory. Accept only that owned legacy root, and require + // project ownership metadata before routing a project tab through it. + legacyDir := config.SessionDir() + path, ok := pinnedTabSessionPath(legacyDir, sessionPath) + if !ok { + return "", false + } + meta, hasMeta, err := agent.LoadBranchMeta(path) + if strings.TrimSpace(scope) == "project" { + if err != nil || !hasMeta || meta.Scope != "project" || !sameProjectRoot(meta.WorkspaceRoot, workspaceRoot) { + return "", false + } + } else if err == nil && hasMeta && meta.Scope == "project" { + return "", false + } + return path, true +} + // saveTabSessionMeta persists the tab's scope/topic/mode fields into the // session's branch-meta sidecar at path. Tab fields are snapshotted under a.mu // (controller reads happen off-lock) so a concurrent tab mutation can't tear @@ -9120,152 +8259,6 @@ type topicSessionDirIndex struct { byTopic map[string][]topicSessionMatch } -// sessionListCache caches ListSessions results per directory so that -// ListProjectTree (called on every sidebar render) does not re-read every -// session dir from disk. Session mutations invalidate only their own -// directories; the global generation remains a correctness fallback for -// changes whose affected directories are not known. -type sessionListCacheEntry struct { - infos []agent.SessionInfo - titles map[string]string - cachedAt time.Time -} - -// Scoped invalidation handles in-process mutations immediately. The TTL is the -// low-frequency reconciliation path for CLI, older Desktop, and external -// process writes that cannot emit an event into this process. -const sessionListCacheTTL = 30 * time.Second - -type sessionListCacheToken struct { - globalVersion uint64 - dirVersion uint64 -} - -type sessionListCache struct { - mu sync.Mutex - byDir map[string]sessionListCacheEntry - dirVersions map[string]uint64 - nextDirVersion uint64 - version atomic.Uint64 -} - -func (c *sessionListCache) get(dir string) ([]agent.SessionInfo, map[string]string, bool) { - dir = sessionListCacheDirKey(dir) - c.mu.Lock() - defer c.mu.Unlock() - e, ok := c.byDir[dir] - if !ok { - return nil, nil, false - } - if e.cachedAt.IsZero() || time.Since(e.cachedAt) >= sessionListCacheTTL { - delete(c.byDir, dir) - return nil, nil, false - } - return e.infos, e.titles, true -} - -func (c *sessionListCache) versionToken(dir string) sessionListCacheToken { - dir = sessionListCacheDirKey(dir) - c.mu.Lock() - defer c.mu.Unlock() - if c.dirVersions == nil { - c.dirVersions = map[string]uint64{} - } - dirVersion := c.dirVersions[dir] - if dirVersion == 0 { - c.nextDirVersion++ - dirVersion = c.nextDirVersion - c.dirVersions[dir] = dirVersion - } - return sessionListCacheToken{ - globalVersion: c.version.Load(), - dirVersion: dirVersion, - } -} - -func (c *sessionListCache) put(dir string, infos []agent.SessionInfo, titles map[string]string, token sessionListCacheToken) { - dir = sessionListCacheDirKey(dir) - if c.version.Load() != token.globalVersion { - return - } - c.mu.Lock() - defer c.mu.Unlock() - if c.version.Load() != token.globalVersion || c.dirVersions[dir] != token.dirVersion { - return - } - if c.byDir == nil { - c.byDir = map[string]sessionListCacheEntry{} - } - c.byDir[dir] = sessionListCacheEntry{infos: infos, titles: titles, cachedAt: time.Now()} -} - -func (c *sessionListCache) invalidateDirs(dirs ...string) bool { - keys := make(map[string]struct{}, len(dirs)) - for _, dir := range dirs { - if key := sessionListCacheDirKey(dir); key != "" { - keys[key] = struct{}{} - } - } - if len(keys) == 0 { - return false - } - c.mu.Lock() - defer c.mu.Unlock() - if c.dirVersions == nil { - c.dirVersions = map[string]uint64{} - } - for key := range keys { - c.nextDirVersion++ - c.dirVersions[key] = c.nextDirVersion - delete(c.byDir, key) - } - return true -} - -// forgetDirs drops directories that are no longer part of the project -// lifecycle. Tokens are never reused, so an in-flight scan from before the -// removal cannot repopulate the cache after the entry is forgotten or re-added. -func (c *sessionListCache) forgetDirs(dirs ...string) bool { - keys := make(map[string]struct{}, len(dirs)) - for _, dir := range dirs { - if key := sessionListCacheDirKey(dir); key != "" { - keys[key] = struct{}{} - } - } - if len(keys) == 0 { - return false - } - c.mu.Lock() - defer c.mu.Unlock() - for key := range keys { - delete(c.byDir, key) - delete(c.dirVersions, key) - } - return true -} - -func (c *sessionListCache) invalidate() { - c.mu.Lock() - c.version.Add(1) - c.byDir = map[string]sessionListCacheEntry{} - c.dirVersions = map[string]uint64{} - c.mu.Unlock() -} - -func sessionListCacheDirKey(dir string) string { - return projectRootKey(dir) -} - -func sessionListCacheDirForPath(path string) string { - path = strings.TrimSpace(path) - if path == "" { - return "" - } - return filepath.Dir(path) -} - -var projectSessionCache = &sessionListCache{byDir: map[string]sessionListCacheEntry{}} - // mergeSessionInfos merges one directory's session listing into the maps used by // ListProjectTree. The result collection loop calls it serially. func mergeSessionInfos(dir string, infos []agent.SessionInfo, titles map[string]string, sessionInfos map[string]agent.SessionInfo, sessionTitles map[string]string, topicSummaries map[string]topicSummary) { diff --git a/desktop/tabs_topic_test.go b/desktop/tabs_topic_test.go index 9b34781544..dddd1c8e0b 100644 --- a/desktop/tabs_topic_test.go +++ b/desktop/tabs_topic_test.go @@ -55,6 +55,63 @@ func waitForTabReady(t *testing.T, app *App, tabID string) *WorkspaceTab { return nil } +func waitForTopicDirMarker(t *testing.T, dir, marker string) { + t.Helper() + markerPath := filepath.Join(dir, marker) + deadline := time.Now().Add(5 * time.Second) + var last error + for { + if _, last = os.Stat(markerPath); last == nil { + return + } + if time.Now().After(deadline) { + t.Fatalf("expected %s after migration: %v", marker, last) + } + time.Sleep(10 * time.Millisecond) + } +} + +func waitForCatalogTopic(t *testing.T, app *App, scope, workspaceRoot, topicID string) []ProjectNode { + t.Helper() + app.startSessionCatalog(false) + t.Cleanup(func() { app.stopSessionCatalog(time.Second) }) + deadline := time.Now().Add(5 * time.Second) + for time.Now().Before(deadline) { + nodes := app.ListProjectTree() + for _, folder := range nodes { + if scope == "project" && (!sameProjectRoot(folder.Root, workspaceRoot) || folder.Kind != "project") { + continue + } + if scope != "project" && folder.Kind != "global_folder" { + continue + } + for _, topic := range folder.Children { + if topic.TopicID == topicID { + return nodes + } + } + } + time.Sleep(10 * time.Millisecond) + } + t.Fatalf("catalog topic %q did not become visible", topicID) + return nil +} + +func waitForCatalogTreeCondition(t *testing.T, app *App, description string, matches func([]ProjectNode) bool) []ProjectNode { + t.Helper() + deadline := time.Now().Add(5 * time.Second) + var nodes []ProjectNode + for time.Now().Before(deadline) { + nodes = app.ListProjectTree() + if matches(nodes) { + return nodes + } + time.Sleep(10 * time.Millisecond) + } + t.Fatalf("catalog did not reach %s: %#v", description, nodes) + return nil +} + func writeTopicSession(t *testing.T, dir, name, topicID, topicTitle, workspaceRoot string) string { t.Helper() path := filepath.Join(dir, name) @@ -126,256 +183,6 @@ func writeLegacyEventSession(t *testing.T, dir, name, prompt, reply string, modT return path } -func TestSessionListCacheRefillsAfterInvalidate(t *testing.T) { - cache := &sessionListCache{byDir: map[string]sessionListCacheEntry{}} - dir := t.TempDir() - first := []agent.SessionInfo{{Path: filepath.Join(dir, "first.jsonl")}} - second := []agent.SessionInfo{{Path: filepath.Join(dir, "second.jsonl")}} - - token := cache.versionToken(dir) - cache.put(dir, first, map[string]string{"first.jsonl": "First"}, token) - if infos, titles, ok := cache.get(dir); !ok || len(infos) != 1 || filepath.Base(infos[0].Path) != "first.jsonl" || titles["first.jsonl"] != "First" { - t.Fatalf("initial cache entry = %+v, %+v, %v", infos, titles, ok) - } - - cache.invalidate() - if _, _, ok := cache.get(dir); ok { - t.Fatalf("cache entry survived invalidate") - } - cache.put(dir, first, map[string]string{"first.jsonl": "stale"}, token) - if _, _, ok := cache.get(dir); ok { - t.Fatalf("stale token repopulated cache after invalidate") - } - - token = cache.versionToken(dir) - cache.put(dir, second, map[string]string{"second.jsonl": "Second"}, token) - if infos, titles, ok := cache.get(dir); !ok || len(infos) != 1 || filepath.Base(infos[0].Path) != "second.jsonl" || titles["second.jsonl"] != "Second" { - t.Fatalf("refilled cache entry = %+v, %+v, %v", infos, titles, ok) - } -} - -func TestSessionListCacheInvalidatesOnlyChangedDirectory(t *testing.T) { - cache := &sessionListCache{byDir: map[string]sessionListCacheEntry{}} - changedDir := filepath.Join(t.TempDir(), "changed") - untouchedDir := filepath.Join(t.TempDir(), "untouched") - changedToken := cache.versionToken(changedDir) - untouchedToken := cache.versionToken(untouchedDir) - cache.put(changedDir, []agent.SessionInfo{{Path: filepath.Join(changedDir, "old.jsonl")}}, nil, changedToken) - cache.put(untouchedDir, []agent.SessionInfo{{Path: filepath.Join(untouchedDir, "keep.jsonl")}}, nil, untouchedToken) - - if !cache.invalidateDirs(changedDir) { - t.Fatal("invalidateDirs reported no changed directory") - } - if _, _, ok := cache.get(changedDir); ok { - t.Fatal("changed directory survived scoped invalidation") - } - if infos, _, ok := cache.get(untouchedDir); !ok || len(infos) != 1 || filepath.Base(infos[0].Path) != "keep.jsonl" { - t.Fatalf("unrelated directory was invalidated: %+v, %v", infos, ok) - } - - cache.put(changedDir, []agent.SessionInfo{{Path: filepath.Join(changedDir, "stale.jsonl")}}, nil, changedToken) - if _, _, ok := cache.get(changedDir); ok { - t.Fatal("stale directory token repopulated cache after scoped invalidation") - } - - equivalentDir := filepath.Join(untouchedDir, ".") - if !cache.invalidateDirs(equivalentDir) { - t.Fatal("invalidateDirs rejected an equivalent cleaned directory") - } - if _, _, ok := cache.get(untouchedDir); ok { - t.Fatal("equivalent directory spelling did not invalidate the absolute cache key") - } - if got := sessionListCacheDirForPath(""); got != "" { - t.Fatalf("empty session path resolved to cache directory %q", got) - } -} - -func TestSessionListCacheExpiresForExternalProcessReconciliation(t *testing.T) { - cache := &sessionListCache{byDir: map[string]sessionListCacheEntry{}} - dir := t.TempDir() - token := cache.versionToken(dir) - cache.put(dir, []agent.SessionInfo{{Path: filepath.Join(dir, "old.jsonl")}}, nil, token) - - key := sessionListCacheDirKey(dir) - cache.mu.Lock() - entry := cache.byDir[key] - entry.cachedAt = time.Now().Add(-sessionListCacheTTL) - cache.byDir[key] = entry - cache.mu.Unlock() - - if _, _, ok := cache.get(dir); ok { - t.Fatal("expired directory listing remained cached") - } - if _, exists := cache.byDir[key]; exists { - t.Fatal("expired directory listing was not removed") - } -} - -func TestProjectTreeMetadataChangePreservesSessionListings(t *testing.T) { - oldProjectCache := projectSessionCache - projectSessionCache = &sessionListCache{byDir: map[string]sessionListCacheEntry{}} - t.Cleanup(func() { - projectSessionCache = oldProjectCache - }) - - dir := t.TempDir() - projectSessionCache.put(dir, []agent.SessionInfo{{Path: filepath.Join(dir, "keep.jsonl")}}, nil, projectSessionCache.versionToken(dir)) - emitted := 0 - app := NewApp() - app.projectTreeChangedHook = func() { emitted++ } - app.emitProjectTreeMetadataChanged() - - if _, _, ok := projectSessionCache.get(dir); !ok { - t.Fatal("metadata-only project tree change invalidated session listing") - } - if emitted != 1 { - t.Fatalf("project tree hook calls = %d, want 1", emitted) - } -} - -func TestSessionListCacheForgetRejectsInFlightFillAndReadd(t *testing.T) { - cache := &sessionListCache{byDir: map[string]sessionListCacheEntry{}} - dir := t.TempDir() - staleToken := cache.versionToken(dir) - cache.put(dir, []agent.SessionInfo{{Path: filepath.Join(dir, "old.jsonl")}}, nil, staleToken) - - if !cache.forgetDirs(dir) { - t.Fatal("forgetDirs reported no removed directory") - } - if _, _, ok := cache.get(dir); ok { - t.Fatal("forgotten directory remained cached") - } - cache.mu.Lock() - _, versionRetained := cache.dirVersions[sessionListCacheDirKey(dir)] - cache.mu.Unlock() - if versionRetained { - t.Fatal("forgotten directory retained lifecycle metadata") - } - - cache.put(dir, []agent.SessionInfo{{Path: filepath.Join(dir, "stale.jsonl")}}, nil, staleToken) - if _, _, ok := cache.get(dir); ok { - t.Fatal("in-flight pre-removal fill repopulated forgotten directory") - } - - readdToken := cache.versionToken(dir) - if readdToken.dirVersion == staleToken.dirVersion { - t.Fatal("re-added directory reused its pre-removal token") - } - cache.put(dir, []agent.SessionInfo{{Path: filepath.Join(dir, "fresh.jsonl")}}, nil, readdToken) - infos, _, ok := cache.get(dir) - if !ok || len(infos) != 1 || filepath.Base(infos[0].Path) != "fresh.jsonl" { - t.Fatalf("re-added directory did not accept fresh listing: %+v, %v", infos, ok) - } -} - -func TestRemoveWorkspaceForgetsProjectSessionCache(t *testing.T) { - isolateDesktopUserDirs(t) - oldProjectCache := projectSessionCache - projectSessionCache = &sessionListCache{byDir: map[string]sessionListCacheEntry{}} - t.Cleanup(func() { projectSessionCache = oldProjectCache }) - - projectRoot := t.TempDir() - if err := addProject(projectRoot, "Cached Project"); err != nil { - t.Fatalf("add project: %v", err) - } - dir := desktopSessionDir(projectRoot) - staleToken := projectSessionCache.versionToken(dir) - projectSessionCache.put(dir, []agent.SessionInfo{{Path: filepath.Join(dir, "old.jsonl")}}, nil, staleToken) - - app := NewApp() - if err := app.RemoveWorkspace(projectRoot); err != nil { - t.Fatalf("RemoveWorkspace: %v", err) - } - if _, _, ok := projectSessionCache.get(dir); ok { - t.Fatal("removed workspace session listing remained cached") - } - - projectSessionCache.put(dir, []agent.SessionInfo{{Path: filepath.Join(dir, "stale.jsonl")}}, nil, staleToken) - if _, _, ok := projectSessionCache.get(dir); ok { - t.Fatal("removed workspace accepted an in-flight stale cache fill") - } -} - -func TestRenameSessionInvalidatesProjectTreeCache(t *testing.T) { - isolateDesktopUserDirs(t) - oldProjectCache := projectSessionCache - projectSessionCache = &sessionListCache{byDir: map[string]sessionListCacheEntry{}} - t.Cleanup(func() { - projectSessionCache = oldProjectCache - }) - - dir := t.TempDir() - otherDir := t.TempDir() - sessionPath := filepath.Join(dir, "rename-me.jsonl") - if err := os.WriteFile(sessionPath, []byte(`{"role":"user","content":"hello"}`+"\n"), 0o644); err != nil { - t.Fatalf("write session: %v", err) - } - ctrl := control.New(control.Options{SessionDir: dir, SessionPath: sessionPath, Label: "test"}) - defer ctrl.Close() - app := NewApp() - app.setTestCtrl(ctrl, "") - - token := projectSessionCache.versionToken(dir) - projectSessionCache.put(dir, []agent.SessionInfo{{Path: sessionPath}}, map[string]string{"rename-me.jsonl": "old"}, token) - projectSessionCache.put(otherDir, []agent.SessionInfo{{Path: filepath.Join(otherDir, "keep.jsonl")}}, nil, projectSessionCache.versionToken(otherDir)) - if _, _, ok := projectSessionCache.get(dir); !ok { - t.Fatalf("expected primed project tree cache") - } - if err := app.RenameSession(sessionPath, "new title"); err != nil { - t.Fatalf("RenameSession: %v", err) - } - if _, _, ok := projectSessionCache.get(dir); ok { - t.Fatalf("RenameSession should invalidate project tree cache") - } - if _, _, ok := projectSessionCache.get(otherDir); !ok { - t.Fatalf("RenameSession invalidated an unrelated session directory") - } -} - -func TestArchiveAndRestoreSessionInvalidateOnlyOwningDirectory(t *testing.T) { - isolateDesktopUserDirs(t) - oldProjectCache := projectSessionCache - projectSessionCache = &sessionListCache{byDir: map[string]sessionListCacheEntry{}} - t.Cleanup(func() { - projectSessionCache = oldProjectCache - }) - - dir := config.SessionDir() - if err := os.MkdirAll(dir, 0o755); err != nil { - t.Fatalf("mkdir sessions: %v", err) - } - path := writeLegacySession(t, dir, "scoped-cache.jsonl", "cache scope", time.Now()) - otherDir := t.TempDir() - prime := func(cacheDir, sessionPath string) { - projectSessionCache.put(cacheDir, []agent.SessionInfo{{Path: sessionPath}}, nil, projectSessionCache.versionToken(cacheDir)) - } - prime(dir, path) - prime(otherDir, filepath.Join(otherDir, "keep.jsonl")) - - app := NewApp() - if err := app.DeleteSession(path); err != nil { - t.Fatalf("DeleteSession: %v", err) - } - if _, _, ok := projectSessionCache.get(dir); ok { - t.Fatal("DeleteSession kept the owning directory cached") - } - if _, _, ok := projectSessionCache.get(otherDir); !ok { - t.Fatal("DeleteSession invalidated an unrelated directory") - } - - trashPath := filepath.Join(dir, sessionTrashDir, "scoped-cache.jsonl", "scoped-cache.jsonl") - prime(dir, path) - if err := app.RestoreSession(trashPath); err != nil { - t.Fatalf("RestoreSession: %v", err) - } - if _, _, ok := projectSessionCache.get(dir); ok { - t.Fatal("RestoreSession kept the owning directory cached") - } - if _, _, ok := projectSessionCache.get(otherDir); !ok { - t.Fatal("RestoreSession invalidated an unrelated directory") - } -} - func TestTopicMetadataUpdatesPreserveExistingEntriesWhenTimedReadSlotsFull(t *testing.T) { isolateDesktopUserDirs(t) @@ -911,7 +718,8 @@ func TestLegacySessionsMigrateIntoGlobalTopics(t *testing.T) { older := writeLegacySession(t, dir, "older.jsonl", "older imported prompt", time.Now().Add(-2*time.Hour)) newer := writeLegacySession(t, dir, "newer.jsonl", "newer imported prompt", time.Now().Add(-time.Hour)) - nodes := NewApp().ListProjectTree() + app := NewApp() + nodes := waitForCatalogTopic(t, app, "global", "", legacySessionTopicID(newer)) if len(nodes) != 1 || nodes[0].Kind != "global_folder" { t.Fatalf("project tree = %#v, want global folder", nodes) } @@ -933,7 +741,7 @@ func TestLegacySessionsMigrateIntoGlobalTopics(t *testing.T) { t.Fatalf("migrated meta = %+v", meta) } - nodes = NewApp().ListProjectTree() + nodes = app.ListProjectTree() if got := len(nodes[0].Children); got != 2 { t.Fatalf("migration should be idempotent, global topics = %d", got) } @@ -954,7 +762,8 @@ func TestAmbiguousLegacyRecoverySessionsMigrateIntoTopics(t *testing.T) { t.Fatalf("write v1 migration marker: %v", err) } - nodes := NewApp().ListProjectTree() + app := NewApp() + nodes := waitForCatalogTopic(t, app, "global", "", legacySessionTopicID(recovery)) if len(nodes) != 1 || nodes[0].Kind != "global_folder" { t.Fatalf("project tree = %#v, want global folder", nodes) } @@ -985,7 +794,8 @@ func TestUnmodifiedRecoveryCopyDoesNotMigrateIntoTopics(t *testing.T) { parent, recovery, branchMsgs := forkDesktopRecoveryBranch(t, dir, "normal") coverDesktopRecoveryParent(t, parent, branchMsgs) - nodes := NewApp().ListProjectTree() + app := NewApp() + nodes := waitForCatalogTopic(t, app, "global", "", legacySessionTopicID(parent)) if len(nodes) != 1 || len(nodes[0].Children) != 1 { t.Fatalf("project tree = %#v, want only the covering parent topic", nodes) } @@ -1007,12 +817,9 @@ func TestCoveredRecoveryCopyBecomesVisibleAfterMigratedParentDeletion(t *testing coverDesktopRecoveryParent(t, parent, branchMsgs) app := NewApp() - app.ListProjectTree() - for _, marker := range []string{topicMigrationMarker, topicIndexRepairMarker} { - if _, err := os.Stat(filepath.Join(dir, marker)); err != nil { - t.Fatalf("expected %s after migration: %v", marker, err) - } - } + waitForCatalogTopic(t, app, "global", "", legacySessionTopicID(parent)) + waitForTopicDirMarker(t, dir, topicMigrationMarker) + waitForTopicDirMarker(t, dir, topicIndexRepairMarker) if meta, ok, err := agent.LoadBranchMeta(recovery); err != nil || !ok { t.Fatalf("load skipped recovery meta: ok=%v err=%v", ok, err) } else if strings.TrimSpace(meta.TopicID) != "" { @@ -1028,7 +835,7 @@ func TestCoveredRecoveryCopyBecomesVisibleAfterMigratedParentDeletion(t *testing } } - nodes := app.ListProjectTree() + nodes := waitForCatalogTopic(t, app, "global", "", legacySessionTopicID(recovery)) meta, ok, err := agent.LoadBranchMeta(recovery) if err != nil || !ok { t.Fatalf("load recovery meta after parent deletion: ok=%v err=%v", ok, err) @@ -1058,7 +865,7 @@ func TestHistoryMarksLegacyRecoverySessionsAsRecovered(t *testing.T) { defer ctrl.Close() app := NewApp() app.setTestCtrl(ctrl, "") - + installSessionCatalogForTest(t, app, dir, "global", "") sessions := app.ListSessions() for _, session := range sessions { if filepath.Clean(session.Path) != filepath.Clean(recovery) { @@ -1127,7 +934,19 @@ func TestProjectTreeKeepsAmbiguousMigratedRecoveryTopicVisible(t *testing.T) { t.Fatalf("write v1 repair marker: %v", err) } - nodes := NewApp().ListProjectTree() + app := NewApp() + _ = waitForCatalogTopic(t, app, "global", "", topicID) + nodes := waitForCatalogTreeCondition(t, app, "a repaired ambiguous recovery topic", func(nodes []ProjectNode) bool { + if len(nodes) == 0 { + return false + } + for _, node := range nodes[0].Children { + if node.TopicID == topicID { + return node.TurnsState == "valid" && node.Turns == 1 + } + } + return false + }) if len(nodes) == 0 { t.Fatal("project tree is empty") } @@ -1150,18 +969,33 @@ func TestTopicMigrationMarkerRescansWhenSessionFileChanges(t *testing.T) { } writeLegacySession(t, dir, "first.jsonl", "first legacy prompt", time.Now().Add(-time.Hour)) - // First render migrates the legacy session and, with nothing deferred, stamps - // the one-shot marker so later renders can skip the scan. - NewApp().ListProjectTree() - if _, err := os.Stat(filepath.Join(dir, topicMigrationMarker)); err != nil { - t.Fatalf("expected migration marker after a complete pass: %v", err) + // Background catalog reconciliation migrates the legacy session and, with + // nothing deferred, stamps the one-shot marker. Tree reads never do this I/O. + app := NewApp() + firstTopicID := legacySessionTopicID(filepath.Join(dir, "first.jsonl")) + waitForCatalogTopic(t, app, "global", "", firstTopicID) + // 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 // gate and gets a fresh migration pass. time.Sleep(10 * time.Millisecond) second := writeLegacySession(t, dir, "second.jsonl", "second legacy prompt", time.Now()) - NewApp().ListProjectTree() + app.requestSessionCatalogReconcile(dir) + waitForCatalogTopic(t, app, "global", "", legacySessionTopicID(second)) meta, ok, err := agent.LoadBranchMeta(second) if err != nil { t.Fatalf("load second meta: %v", err) @@ -1574,7 +1408,8 @@ func TestLegacySessionTopicIDsKeepNormalizedNameCollisionsDistinct(t *testing.T) t.Fatalf("normalized legacy topic IDs collided: %q", dottedTopic) } - nodes := NewApp().ListProjectTree() + app := NewApp() + nodes := waitForCatalogTopic(t, app, "global", "", dottedTopic) if len(nodes) != 1 || nodes[0].Kind != "global_folder" { t.Fatalf("project tree = %#v, want global folder", nodes) } @@ -1590,7 +1425,7 @@ func TestLegacySessionTopicIDsKeepNormalizedNameCollisionsDistinct(t *testing.T) } } -func TestDefaultGlobalTabGetsMigratedTopicID(t *testing.T) { +func TestDefaultGlobalTabDoesNotWaitForLegacyMigration(t *testing.T) { isolateDesktopUserDirs(t) dir := config.SessionDir() @@ -1616,19 +1451,19 @@ func TestDefaultGlobalTabGetsMigratedTopicID(t *testing.T) { defer tab.Ctrl.Close() } - wantTopicID := legacySessionTopicID(sessionPath) - if tab.TopicID != wantTopicID { - t.Fatalf("tab topicID = %q, want %q", tab.TopicID, wantTopicID) + if tab.TopicID != "" { + t.Fatalf("blank tab synchronously adopted legacy topic %q", tab.TopicID) } if tab.Ctrl == nil { t.Fatalf("tab controller was not built") } - if tab.Ctrl.SessionPath() != sessionPath { - t.Fatalf("tab session path = %q, want %q", tab.Ctrl.SessionPath(), sessionPath) + if tab.Ctrl.SessionPath() == sessionPath { + t.Fatalf("blank tab synchronously adopted legacy session %q", sessionPath) } - f := loadTabsFile() - if len(f.Tabs) != 1 || f.Tabs[0].ID != "tab_legacy" || f.Tabs[0].TopicID != wantTopicID { - t.Fatalf("desktop tabs file = %+v, want tab id and migrated topic", f) + wantTopicID := legacySessionTopicID(sessionPath) + nodes := waitForCatalogTopic(t, app, "global", "", wantTopicID) + if len(nodes) != 1 || len(nodes[0].Children) != 1 || nodes[0].Children[0].TopicID != wantTopicID { + t.Fatalf("legacy history was not eventually indexed: %+v", nodes) } } @@ -2937,7 +2772,7 @@ func TestRestoreGlobalTopicSessionReindexesProjectTree(t *testing.T) { topicID := legacySessionTopicID(sessionPath) app := NewApp() - nodes := app.ListProjectTree() + nodes := waitForCatalogTopic(t, app, "global", "", topicID) if len(nodes) != 1 || len(nodes[0].Children) != 1 || nodes[0].Children[0].TopicID != topicID { t.Fatalf("legacy session should start in Global, got %#v", nodes) } @@ -2958,7 +2793,7 @@ func TestRestoreGlobalTopicSessionReindexesProjectTree(t *testing.T) { if got := app.ListTrashedSessions(); len(got) != 0 { t.Fatalf("trash should be empty after restore, got %#v", got) } - nodes = app.ListProjectTree() + nodes = waitForCatalogTopic(t, app, "global", "", topicID) if len(nodes) != 1 || nodes[0].Kind != "global_folder" || len(nodes[0].Children) != 1 || nodes[0].Children[0].TopicID != topicID { t.Fatalf("restored global session should reappear in Global, got %#v", nodes) } @@ -2996,7 +2831,7 @@ func TestRestoreProjectTopicSessionReindexesProjectTree(t *testing.T) { if err := app.RestoreSession(trashPath); err != nil { t.Fatalf("restore project session: %v", err) } - nodes := app.ListProjectTree() + nodes := waitForCatalogTopic(t, app, "project", projectRoot, topicID) if len(nodes) != 1 || nodes[0].Kind != "project" || len(nodes[0].Children) != 1 || nodes[0].Children[0].TopicID != topicID { t.Fatalf("restored project session should reappear in project tree, got %#v", nodes) } @@ -3024,7 +2859,7 @@ func TestOpenProjectTabResolvesProjectSessionFromLegacyDir(t *testing.T) { sessionPath := writeTopicSessionWithPrompt(t, dir, "legacy-project.jsonl", topicID, topicTitle, projectRoot, "legacy project prompt", time.Now()) app := NewApp() - nodes := app.ListProjectTree() + nodes := waitForCatalogTopic(t, app, "project", projectRoot, topicID) if len(nodes) != 1 || nodes[0].Kind != "project" || len(nodes[0].Children) != 1 || nodes[0].Children[0].TopicID != topicID { t.Fatalf("legacy project session should appear in project tree, got %#v", nodes) } @@ -3885,7 +3720,8 @@ func TestProjectTreeMigratesCLISessionFromProjectDir(t *testing.T) { sessionPath := writeLegacySession(t, dir, "cli-project.jsonl", "cli project prompt", time.Now()) wantTopicID := legacySessionTopicID(sessionPath) - nodes := NewApp().ListProjectTree() + app := NewApp() + nodes := waitForCatalogTopic(t, app, "project", projectRoot, wantTopicID) if len(nodes) != 1 || nodes[0].Kind != "project" || len(nodes[0].Children) != 1 || nodes[0].Children[0].TopicID != wantTopicID { t.Fatalf("project CLI session should appear in project tree, got %#v; want topic %q", nodes, wantTopicID) } @@ -3905,19 +3741,23 @@ func TestProjectTreeMigratesNewCLISessionAfterProjectDirMarker(t *testing.T) { first := writeLegacySession(t, dir, "first-cli-project.jsonl", "first cli project prompt", time.Now().Add(-time.Hour)) firstTopicID := legacySessionTopicID(first) - nodes := NewApp().ListProjectTree() + app := NewApp() + nodes := waitForCatalogTopic(t, app, "project", projectRoot, firstTopicID) if len(nodes) != 1 || nodes[0].Kind != "project" || len(nodes[0].Children) != 1 || nodes[0].Children[0].TopicID != firstTopicID { t.Fatalf("first project CLI session should appear in project tree, got %#v; want topic %q", nodes, firstTopicID) } - if _, err := os.Stat(filepath.Join(dir, topicMigrationMarker)); err != nil { - t.Fatalf("expected migration marker after first project pass: %v", err) - } + waitForTopicDirMarker(t, dir, topicMigrationMarker) time.Sleep(10 * time.Millisecond) second := writeLegacySession(t, dir, "second-cli-project.jsonl", "second cli project prompt", time.Now()) secondTopicID := legacySessionTopicID(second) - nodes = NewApp().ListProjectTree() + app.requestSessionCatalogReconcile(dir) + nodes = waitForCatalogTreeCondition(t, app, "a reconciled newest project CLI session", func(nodes []ProjectNode) bool { + return len(nodes) == 1 && nodes[0].Kind == "project" && len(nodes[0].Children) == 2 && + nodes[0].Children[0].TopicID == secondTopicID && nodes[0].Children[0].LastActivityAt > 0 && + nodes[0].Children[1].TopicID == firstTopicID + }) if len(nodes) != 1 || nodes[0].Kind != "project" || len(nodes[0].Children) != 2 { t.Fatalf("second project CLI session should trigger re-scan, got %#v", nodes) } @@ -3945,7 +3785,8 @@ func TestProjectTreeMigratesCLISessionFromGlobalWorkspaceDir(t *testing.T) { } wantTopicID := legacySessionTopicID(sessionPath) - nodes := NewApp().ListProjectTree() + app := NewApp() + nodes := waitForCatalogTopic(t, app, "global", "", wantTopicID) if len(nodes) != 1 || nodes[0].Kind != "global_folder" || len(nodes[0].Children) != 1 || nodes[0].Children[0].TopicID != wantTopicID { t.Fatalf("global workspace CLI session should appear in Global, got %#v; want topic %q", nodes, wantTopicID) } diff --git a/desktop/task_catalog.go b/desktop/task_catalog.go new file mode 100644 index 0000000000..e12456bf9c --- /dev/null +++ b/desktop/task_catalog.go @@ -0,0 +1,299 @@ +package main + +import ( + "fmt" + "strings" + + "reasonix/internal/agent" + "reasonix/internal/control" + "reasonix/internal/taskcatalog" + "reasonix/internal/taskmonitor" +) + +type TaskPageRequest struct { + Scope string `json:"scope"` + TabID string `json:"tabId"` + ProjectKey string `json:"projectKey"` + States []string `json:"states"` + Query string `json:"query"` + Cursor string `json:"cursor"` + Limit int `json:"limit"` +} + +type TaskCatalogItem = taskcatalog.Item +type TaskCatalogStatus = taskcatalog.Status + +type TaskPage struct { + Items []TaskCatalogItem `json:"items"` + NextCursor string `json:"nextCursor"` + Revision uint64 `json:"revision"` + Partial bool `json:"partial"` + StaleCursor bool `json:"staleCursor"` + Status TaskCatalogStatus `json:"status"` +} + +type TaskEventPageRequest struct { + ProjectKey string `json:"projectKey"` + TaskID string `json:"taskId"` + After int `json:"after"` + Limit int `json:"limit"` +} + +type TaskEventPage = taskcatalog.EventPage + +type TaskActionRequest struct { + ProjectKey string `json:"projectKey"` + TaskID string `json:"taskId"` + ExpectedVersion uint64 `json:"expectedVersion"` + Reason string `json:"reason"` + IdempotencyKey string `json:"idempotencyKey"` +} + +type TaskOpenRequest struct { + ProjectKey string `json:"projectKey"` + TaskID string `json:"taskId"` +} + +func (a *App) GetTaskCatalogStatus() TaskCatalogStatus { + if catalog := taskcatalog.Shared(); catalog != nil { + return catalog.Status() + } + return TaskCatalogStatus{State: "opening", Mode: "memory", Pending: 1} +} + +func (a *App) taskProjectKeys(req TaskPageRequest) ([]string, string, error) { + switch strings.TrimSpace(req.Scope) { + case "session": + target, err := a.taskMonitorTargetForTab(req.TabID) + if err != nil { + return nil, "", err + } + key := taskcatalog.RegisterSharedProject(target.projectDir, workspaceName(target.projectDir)) + return []string{key}, target.sessionID, nil + case "project", "": + key := strings.TrimSpace(req.ProjectKey) + if key == "" { + root := a.projectDir() + key = taskcatalog.RegisterSharedProject(root, workspaceName(root)) + } else if !a.allowedTaskProjectKey(key) { + return nil, "", fmt.Errorf("unknown project key") + } + return []string{key}, "", nil + case "all": + projects := loadProjectsFile() + keys := []string{taskcatalog.RegisterSharedProject(globalWorkspaceRoot(), projects.GlobalTitle)} + for _, project := range projects.Projects { + keys = append(keys, taskcatalog.RegisterSharedProject(project.Root, projectDisplayName(project))) + } + return keys, "", nil + default: + return nil, "", fmt.Errorf("unknown task scope %q", req.Scope) + } +} + +func (a *App) allowedTaskProjectRoots() []string { + roots := []string{globalWorkspaceRoot(), a.projectDir()} + for _, project := range loadProjectsFile().Projects { + roots = append(roots, project.Root) + } + return roots +} + +func (a *App) allowedTaskProjectKey(key string) bool { + _, ok := a.resolveTaskProject(key) + return ok +} + +// resolveTaskProject maps a project key to an allowlisted workspace root without +// consulting the SQLite task catalog. Control actions use FileStore as authority. +func (a *App) resolveTaskProject(key string) (taskcatalog.Project, bool) { + key = strings.TrimSpace(key) + if key == "" { + return taskcatalog.Project{}, false + } + projects := loadProjectsFile() + labels := map[string]string{ + globalWorkspaceRoot(): projects.GlobalTitle, + a.projectDir(): workspaceName(a.projectDir()), + } + for _, project := range projects.Projects { + labels[project.Root] = projectDisplayName(project) + } + for _, root := range a.allowedTaskProjectRoots() { + if taskcatalog.ProjectKey(root) != key { + continue + } + label := labels[root] + if strings.TrimSpace(label) == "" { + label = workspaceName(root) + } + return taskcatalog.Project{Key: key, Root: root, Label: label}, true + } + return taskcatalog.Project{}, false +} + +func (a *App) ListTaskPage(req TaskPageRequest) TaskPage { + status := a.GetTaskCatalogStatus() + out := TaskPage{Items: []TaskCatalogItem{}, Status: status, Partial: true} + catalog := taskcatalog.Shared() + if catalog == nil { + return out + } + keys, sessionID, err := a.taskProjectKeys(req) + if err != nil { + out.Status.LastError = err.Error() + return out + } + for _, key := range keys { + if _, ok, lookupErr := catalog.Project(a.bootContext(), key); lookupErr != nil || !ok { + out.Status.LastError = "unknown project key" + return out + } + } + page, err := catalog.ListPage(a.bootContext(), taskcatalog.PageRequest{ProjectKeys: keys, SessionID: sessionID, + States: req.States, Query: req.Query, Cursor: req.Cursor, Limit: req.Limit}) + if err != nil { + out.Status.LastError = err.Error() + return out + } + a.overlayTaskCatalogRuntime(page.Items) + return TaskPage{Items: page.Items, NextCursor: page.NextCursor, Revision: page.Revision, + Partial: page.Partial, StaleCursor: page.StaleCursor, Status: page.Status} +} + +func (a *App) overlayTaskCatalogRuntime(items []TaskCatalogItem) { + type controllerRef struct { + projectKey string + sessionID string + ctrl control.SessionAPI + } + a.mu.RLock() + tabs := a.runtimeTabsLocked() + controllers := make([]controllerRef, 0, len(tabs)) + for _, tab := range tabs { + if tab == nil || tab.Ctrl == nil { + continue + } + root := strings.TrimSpace(tab.WorkspaceRoot) + if root == "" { + root = globalWorkspaceRoot() + } + controllers = append(controllers, controllerRef{projectKey: taskcatalog.ProjectKey(root), ctrl: tab.Ctrl}) + } + a.mu.RUnlock() + for i := range controllers { + controllers[i].sessionID = agent.BranchID(controllers[i].ctrl.SessionPath()) + } + + type runtimeValue struct{ status string } + running := map[string]runtimeValue{} + for _, controller := range controllers { + for _, job := range controller.ctrl.Jobs() { + key := controller.projectKey + "\x00" + controller.sessionID + "\x00" + job.ID + running[key] = runtimeValue{status: job.Status} + } + } + for i := range items { + key := items[i].ProjectKey + "\x00" + items[i].Task.SessionID + "\x00" + items[i].Task.JobID + value, ok := running[key] + if !ok { + continue + } + items[i].Task.RuntimeState = taskmonitor.RuntimeStateAlive + switch value.status { + case "running": + items[i].Task.State = taskmonitor.TaskStateRunning + case "done": + items[i].Task.RuntimeState = taskmonitor.RuntimeStateExited + items[i].Task.State = taskmonitor.TaskStateSucceeded + case "failed": + items[i].Task.RuntimeState = taskmonitor.RuntimeStateExited + items[i].Task.State = taskmonitor.TaskStateFailed + case "killed", "interrupted": + items[i].Task.RuntimeState = taskmonitor.RuntimeStateExited + items[i].Task.State = taskmonitor.TaskStateCancelled + } + } +} + +func (a *App) ListTaskEventPage(req TaskEventPageRequest) TaskEventPage { + out := TaskEventPage{Items: []taskmonitor.TaskEvent{}, NextSequence: req.After} + if !a.allowedTaskProjectKey(req.ProjectKey) { + out.Partial = true + return out + } + catalog := taskcatalog.Shared() + if catalog == nil { + out.Partial = true + return out + } + page, err := catalog.ListEventPage(a.bootContext(), req.ProjectKey, req.TaskID, req.After, req.Limit) + if err != nil { + out.Partial = true + return out + } + return page +} + +func (a *App) taskActionProject(key string) (taskcatalog.Project, error) { + project, ok := a.resolveTaskProject(key) + if !ok { + return taskcatalog.Project{}, fmt.Errorf("unknown project key") + } + // Catalog may supply a display label only. Never override the allowlisted + // root — a stale or damaged SQLite projection must not redirect FileStore. + if catalog := taskcatalog.Shared(); catalog != nil { + if row, found, err := catalog.Project(a.bootContext(), project.Key); err == nil && found { + if strings.TrimSpace(row.Label) != "" { + project.Label = row.Label + } + } + } + return project, nil +} + +func (a *App) StopTaskByKey(req TaskActionRequest) (taskmonitor.ControlResult, error) { + project, err := a.taskActionProject(req.ProjectKey) + if err != nil { + return taskmonitor.ControlResult{}, err + } + return a.taskControl().StopTaskWithKiller(a.bootContext(), project.Root, req.TaskID, req.ExpectedVersion, req.Reason, req.IdempotencyKey, + desktopTaskJobKiller{app: a, projectDir: project.Root}) +} + +func (a *App) CancelTaskByKey(req TaskActionRequest) (taskmonitor.ControlResult, error) { + project, err := a.taskActionProject(req.ProjectKey) + if err != nil { + return taskmonitor.ControlResult{}, err + } + return a.taskControl().CancelTaskWithKiller(a.bootContext(), project.Root, req.TaskID, req.ExpectedVersion, req.Reason, req.IdempotencyKey, + desktopTaskJobKiller{app: a, projectDir: project.Root}) +} + +func (a *App) RequeueTaskByKey(req TaskActionRequest) (taskmonitor.ControlResult, error) { + project, err := a.taskActionProject(req.ProjectKey) + if err != nil { + return taskmonitor.ControlResult{}, err + } + return a.taskControl().RequeueTask(a.bootContext(), project.Root, req.TaskID, req.ExpectedVersion, req.IdempotencyKey) +} + +func (a *App) OpenTaskSessionByKey(req TaskOpenRequest) (taskmonitor.ControlResult, error) { + project, err := a.taskActionProject(req.ProjectKey) + if err != nil { + return taskmonitor.ControlResult{}, err + } + return a.taskControl().OpenTaskSession(a.bootContext(), project.Root, req.TaskID) +} + +func (a *App) RebuildTaskCatalog() error { + if a == nil || a.shuttingDown.Load() { + return fmt.Errorf("application is shutting down") + } + projects := loadProjectsFile() + items := []taskcatalog.Project{{Root: globalWorkspaceRoot(), Label: projects.GlobalTitle}} + for _, project := range projects.Projects { + items = append(items, taskcatalog.Project{Root: project.Root, Label: projectDisplayName(project)}) + } + return taskcatalog.RebuildSharedCatalog(a.bootContext(), items) +} diff --git a/desktop/task_monitor_test.go b/desktop/task_monitor_test.go index d047e8602c..6b9e72322d 100644 --- a/desktop/task_monitor_test.go +++ b/desktop/task_monitor_test.go @@ -10,6 +10,7 @@ import ( "reasonix/internal/agent" "reasonix/internal/control" + "reasonix/internal/taskcatalog" "reasonix/internal/taskmonitor" ) @@ -123,6 +124,31 @@ func TestTaskMonitorUsesActiveWorkspaceRoot(t *testing.T) { } } +func TestTaskActionProjectResolvesAllowlistWithoutCatalog(t *testing.T) { + root := t.TempDir() + app := &App{ + ctx: context.Background(), + tabs: map[string]*WorkspaceTab{ + "active": {ID: "active", Scope: "project", WorkspaceRoot: root}, + }, + activeTabID: "active", + } + key := taskcatalog.ProjectKey(root) + project, err := app.taskActionProject(key) + if err != nil { + t.Fatalf("taskActionProject without catalog: %v", err) + } + if abs, err := filepath.Abs(root); err == nil { + root = abs + } + if project.Root != root || project.Key != key { + t.Fatalf("project=%#v, want root=%q key=%q", project, root, key) + } + if _, err := app.taskActionProject("not-a-real-project-key"); err == nil { + t.Fatal("expected unknown project key error") + } +} + func TestStopTaskRoutesMonitorIdentityToRuntimeJob(t *testing.T) { root := t.TempDir() path := agent.NewSessionPath(t.TempDir(), "session") @@ -225,9 +251,10 @@ func TestListSessionsForTabKeepsSourceDirectoryAfterActiveTabSwitch(t *testing.T }, activeTabID: "tab-b", } + installSessionCatalogForTest(t, app, dirA, "global", "") sessions := app.ListSessionsForTab("tab-a") - if len(sessions) != 1 || sessions[0].Path != pathA || sessions[0].Preview != "workspace A" { + if len(sessions) != 1 || sessions[0].Path != pathA || sessions[0].TurnsState != "unknown" { t.Fatalf("ListSessionsForTab(tab-a) = %+v", sessions) } } diff --git a/desktop/topic_archive.go b/desktop/topic_archive.go index 8741e950d5..accc676963 100644 --- a/desktop/topic_archive.go +++ b/desktop/topic_archive.go @@ -151,6 +151,7 @@ func (a *App) commitTopicArchive(topicID string, trace *topicArchiveTrace) (fall for i, target := range targets { destroys := destroyBatches[i] a.closeRemovedSessionRuntimesForSessionAfterDestroyAdmissionHeld(removed, target.dir, target.sessionPath, closedRemoved) + a.removeSessionCatalogPath(target.sessionPath, "topic_archived") if timedOutTargets[i] { guard := ownership.take(target.sessionPath) go delayedDesktopTopicTrash(target.dir, target.sessionPath, target.key, guard, destroys) diff --git a/desktop/topic_legacy_migration.go b/desktop/topic_legacy_migration.go new file mode 100644 index 0000000000..faca90a7d5 --- /dev/null +++ b/desktop/topic_legacy_migration.go @@ -0,0 +1,400 @@ +package main + +import ( + "path/filepath" + "strings" + "sync" + + "reasonix/internal/agent" + "reasonix/internal/config" +) + +// legacyMigrationMu serializes the lockless load-modify-save of the projects / +// topic-title files: this migration runs from every concurrent buildTabController +// and from ListProjectTree, so without it parallel runs lose each other's appends. +var legacyMigrationMu sync.Mutex + +func migrateLegacySessionsIntoGlobalTopics(dir string) []string { + return migrateLegacySessionsIntoGlobalTopicsWithGates(dir, topicMigrationDone, topicIndexRepairDone, ignoreMigratedSession) +} + +// forceMigrateLegacySessionsIntoGlobalTopicsWithPaths bypasses disposable +// completion markers for explicit reconciliation. The directory signature +// normally keeps background passes cheap, but no signature can be an authority +// boundary: an old CLI, restored backup, or coarse filesystem timestamp must +// still have a path that deterministically re-evaluates every session. +func forceMigrateLegacySessionsIntoGlobalTopicsWithPaths(dir string) ([]string, []string) { + paths := []string{} + topics := migrateLegacySessionsIntoGlobalTopicsWithGates(dir, topicMigrationNeverDone, topicMigrationNeverDone, + func(path string) { paths = append(paths, path) }) + return topics, paths +} + +func topicMigrationNeverDone(string) bool { return false } +func ignoreMigratedSession(string) {} + +func noteMigratedSession(topics []string, topicID, path string, onMigrated func(string)) []string { + onMigrated(path) + return append(topics, topicID) +} + +func migrateLegacySessionsIntoGlobalTopicsWithGates(dir string, migrationDone, repairDone func(string) bool, onMigrated func(string)) []string { + if strings.TrimSpace(dir) == "" { + return nil + } + repairedTopicIDs := repairIndexedSessionTopicsWithGate(dir, repairDone) + // One-shot per dir: once the migration pass has completed, skip the full + // per-render session scan entirely. + if migrationDone(dir) { + return repairedTopicIDs + } + scope, workspaceRoot, topicTitleRoot, ok := legacyMigrationTargetForDir(dir) + if !ok { + return nil + } + legacyMigrationMu.Lock() + defer legacyMigrationMu.Unlock() + // Re-check under the lock: another render may have completed the pass while + // this one waited. + if migrationDone(dir) { + return nil + } + infos, err := agent.ListSessionOrder(dir) + if err != nil { + return nil // transient read error — retry on the next render, leave unmarked + } + + var migratedTopicIDs []string + var titles map[string]string + var topicTitles map[string]string + var topicSources map[string]string + // deferred stays false only when every session was either migrated or is + // permanently non-migratable. A transient skip (unreadable meta, empty + // session that may gain content, failed write) sets it, keeping the dir + deferred := false + for _, info := range infos { + if sessionOrderInfoIsUnmodifiedRecoveryCopy(info, dir) { + continue + } + if strings.TrimSpace(info.TopicID) != "" { + continue + } + if meta, ok, err := agent.LoadBranchMeta(info.Path); err != nil { + deferred = true + continue + } else if ok && !legacySessionMetaMatchesMigrationTarget(meta, scope, workspaceRoot) { + continue + } + topicID := legacySessionTopicID(info.Path) + if topicID == "" { + continue + } + preview, turns := agent.SessionPreview(info.Path) + if turns == 0 { + deferred = true // empty now, but a later turn could make it migratable + continue + } + if titles == nil { + titles = loadSessionTitles(dir) + } + title := strings.TrimSpace(titles[filepath.Base(info.Path)]) + if title == "" { + title = topicTitleFromText(preview) + } else if normalized := topicTitleFromText(title); normalized != "" { + title = normalized + } + if title == "" { + when := info.LastActivityAt + if when.IsZero() { + when = info.ModTime + } + if when.IsZero() { + title = "历史会话" + } else { + title = "历史会话 " + when.Local().Format("2006-01-02") + } + } + + migrated, err := func() (bool, error) { + // Read-modify-write on the branch-meta sidecar: hold the per-path + // meta lock so agent-side writers (autosave revision bumps, + // in-flight markers) can't interleave between the load and save + unlock, lockErr := agent.LockSessionMetaPath(info.Path) + if lockErr != nil { + return false, lockErr + } + defer unlock() + meta, err := agent.EnsureBranchMetaLocked(info.Path) + if err != nil { + return false, err + } + // Preserve scoped sessions only when their existing ownership matches + // the directory being migrated. + if !legacySessionMetaMatchesMigrationTarget(meta, scope, workspaceRoot) { + return false, nil + } + meta.Scope = scope + meta.WorkspaceRoot = workspaceRoot + meta.TopicID = topicID + meta.TopicTitle = title + return true, agent.SaveBranchMetaPreserveUpdatedLocked(info.Path, meta) + }() + if err != nil { + deferred = true + continue + } + if !migrated { + continue + } + if topicTitles == nil { + topicTitles = loadTopicTitles(topicTitleRoot) + } + if topicSources == nil { + topicSources = loadTopicTitleSources(topicTitleRoot) + } + if strings.TrimSpace(topicTitles[topicID]) == "" { + topicTitles[topicID] = title + topicSources[topicID] = topicTitleSourceManual + } + migratedTopicIDs = noteMigratedSession(migratedTopicIDs, topicID, info.Path, onMigrated) + } + if len(migratedTopicIDs) == 0 { + if !deferred { + markTopicMigrationDone(dir) // nothing left to migrate — gate future scans + } + return repairedTopicIDs + } + _ = prependTopicsInProjectsFile(workspaceRoot, migratedTopicIDs, false) + // Same fresh tombstone re-check as the repair pass: these are whole-map + // saves, so a concurrent DeleteTopic of an unrelated topic must not have + // its title written back by this migration batch. + pruneDeletedTopicEntries(topicTitles, topicSources) + if topicTitles != nil { + _ = saveTopicTitles(topicTitleRoot, topicTitles) + } + if topicSources != nil { + _ = saveTopicTitleSources(topicTitleRoot, topicSources) + } + invalidateTopicSessionIndex(dir) + if !deferred { + markTopicMigrationDone(dir) // pass complete with nothing deferred + } + return uniqueStrings(append(repairedTopicIDs, migratedTopicIDs...)) +} + +// pruneDeletedTopicEntries drops tombstoned topics from scan-built title and +// source maps just before they are persisted, re-reading DeletedTopics so a +// DeleteTopic that landed after the scan snapshot wins. The maps are loaded +// whole at scan start and saved whole at the end; without this re-check the +// save would write the deleted topic's stale entries back, and a title-map +func pruneDeletedTopicEntries(maps ...map[string]string) []string { + deleted := loadProjectsFile().DeletedTopics + if len(deleted) == 0 { + return nil + } + for _, m := range maps { + for _, id := range deleted { + delete(m, id) + } + } + return deleted +} + +func repairIndexedSessionTopicsWithGate(dir string, repairDone func(string) bool) []string { + if strings.TrimSpace(dir) == "" || repairDone(dir) { + return nil + } + scope, workspaceRoot, topicTitleRoot, ok := legacyMigrationTargetForDir(dir) + if !ok { + return nil + } + legacyMigrationMu.Lock() + defer legacyMigrationMu.Unlock() + if repairDone(dir) { + return nil + } + infos, err := agent.ListSessionOrder(dir) + if err != nil { + return nil + } + + topicTitles, err := loadTopicTitlesForUpdate(topicTitleRoot) + if err != nil { + return nil + } + topicSources, err := loadTopicTitleSourcesForUpdate(topicTitleRoot) + if err != nil { + return nil + } + projects := loadProjectsFile() + deletedTopics := projects.DeletedTopics + // Repair only topics missing from the sidebar index. Skipping topics that + // are already listed and titled keeps steady-state rescans write-free: + // otherwise every rescan (any session activity invalidates the marker) + indexedTopics := projects.GlobalTopics + if scope == "project" { + indexedTopics = nil + if i := projectIndexByRoot(projects.Projects, workspaceRoot); i >= 0 { + indexedTopics = projects.Projects[i].Topics + } + } + indexedSet := make(map[string]bool, len(indexedTopics)) + for _, id := range indexedTopics { + indexedSet[id] = true + } + var repairedTopicIDs []string + var sessionTitles map[string]string + titlesChanged := false + sourcesChanged := false + deferred := false + for _, info := range infos { + if sessionOrderInfoIsUnmodifiedRecoveryCopy(info, dir) { + continue + } + topicID := strings.TrimSpace(info.TopicID) + if topicID == "" { + continue + } + if indexedSet[topicID] && strings.TrimSpace(topicTitles[topicID]) != "" { + continue // fully indexed already — nothing to repair, skip the meta read + } + meta, ok, err := agent.LoadBranchMeta(info.Path) + if err != nil { + deferred = true + continue + } + if !ok || strings.TrimSpace(meta.TopicID) == "" { + continue + } + if containsDesktopString(deletedTopics, topicID) { + continue + } + if !legacySessionScopeMatchesMigrationTarget(meta, scope, workspaceRoot) { + continue + } + repairedTopicIDs = append(repairedTopicIDs, topicID) + if strings.TrimSpace(topicTitles[topicID]) == "" { + if sessionTitles == nil { + sessionTitles = loadSessionTitles(dir) + } + title := indexedSessionTopicTitle(sessionTitles, info, meta) + if title == "" { + title = defaultTopicTitle + } + topicTitles[topicID] = title + titlesChanged = true + } + if strings.TrimSpace(topicSources[topicID]) == "" { + topicSources[topicID] = topicTitleSourceManual + sourcesChanged = true + } + } + if len(repairedTopicIDs) > 0 { + // Re-check tombstones right before persisting: a DeleteTopic landing + // after the scan snapshot must win. The prepend re-filters under the + // projects-file lock; the whole-map title/source saves and the + if deletedNow := pruneDeletedTopicEntries(topicTitles, topicSources); len(deletedNow) > 0 { + deletedSet := make(map[string]bool, len(deletedNow)) + for _, id := range deletedNow { + deletedSet[id] = true + } + live := repairedTopicIDs[:0] + for _, id := range repairedTopicIDs { + if !deletedSet[id] { + live = append(live, id) + } + } + repairedTopicIDs = live + } + } + if len(repairedTopicIDs) > 0 { + if err := prependTopicsInProjectsFile(workspaceRoot, repairedTopicIDs, false); err != nil { + deferred = true + } + if titlesChanged { + if err := saveTopicTitles(topicTitleRoot, topicTitles); err != nil { + deferred = true + } + } + if sourcesChanged { + if err := saveTopicTitleSources(topicTitleRoot, topicSources); err != nil { + deferred = true + } + } + } + if !deferred { + markTopicIndexRepairDone(dir) + return uniqueStrings(repairedTopicIDs) + } + return nil +} + +func indexedSessionTopicTitle(sessionTitles map[string]string, info agent.SessionOrderInfo, meta agent.BranchMeta) string { + if title := topicTitleFromText(meta.TopicTitle); title != "" { + return title + } + if title := topicTitleFromText(info.TopicTitle); title != "" { + return title + } + if title := topicTitleFromText(sessionTitles[filepath.Base(info.Path)]); title != "" { + return title + } + return topicTitleFromText(info.Preview) +} + +func sessionOrderInfoIsAutomaticRecovery(info agent.SessionOrderInfo) bool { + return info.Recovered || + strings.TrimSpace(info.RecoveryDigest) != "" || + isAutomaticRecoverySessionPath(info.Path) +} + +func sessionInfoIsAutomaticRecovery(info agent.SessionInfo) bool { + return info.Recovered || + strings.TrimSpace(info.RecoveryDigest) != "" || + isAutomaticRecoverySessionPath(info.Path) +} + +func sessionOrderInfoIsUnmodifiedRecoveryCopy(info agent.SessionOrderInfo, parentDir string) bool { + return sessionOrderInfoIsAutomaticRecovery(info) && + agent.RecoveryBranchCoveredByParent(info.Path, parentDir) +} + +func sessionInfoIsUnmodifiedRecoveryCopy(info agent.SessionInfo, parentDir string) bool { + return sessionInfoIsAutomaticRecovery(info) && + agent.RecoveryBranchCoveredByParent(info.Path, parentDir) +} + +func isAutomaticRecoverySessionPath(path string) bool { + id := agent.BranchID(path) + idx := strings.LastIndex(id, "-recovery-") + if idx <= 0 { + return false + } + suffix := id[idx+len("-recovery-"):] + if len(suffix) != 16 { + return false + } + for _, r := range suffix { + if (r >= '0' && r <= '9') || (r >= 'a' && r <= 'f') || (r >= 'A' && r <= 'F') { + continue + } + return false + } + return true +} + +func legacyMigrationTargetForDir(dir string) (scope, workspaceRoot, topicTitleRoot string, ok bool) { + dir = cleanDesktopPath(dir) + if dir == "" { + return "", "", "", false + } + if sameDesktopPath(dir, config.SessionDir()) || sameDesktopPath(dir, desktopSessionDir(globalWorkspaceRoot())) { + return "global", "", "", true + } + for _, p := range loadProjectsFile().Projects { + if sameDesktopPath(config.ProjectSessionDir(p.Root), dir) { + return "project", p.Root, p.Root, true + } + } + return "", "", "", false +} diff --git a/desktop/topic_migration_marker.go b/desktop/topic_migration_marker.go new file mode 100644 index 0000000000..bd3888cc45 --- /dev/null +++ b/desktop/topic_migration_marker.go @@ -0,0 +1,196 @@ +package main + +import ( + "crypto/sha256" + "encoding/hex" + "errors" + "fmt" + "io" + "os" + "path/filepath" + "sort" + "strings" + + "reasonix/internal/store" +) + +// topicMigrationMarker records a completed legacy→topic migration for the +// directory's current session signature. New CLI sessions and same-size +// rewrites change the signature and force re-migration without relying only on +// coarse directory mtimes. +// v2 also re-evaluates recovery-named sessions that v1 skipped by filename. +const topicMigrationMarker = ".topics-migrated-v2" +const topicIndexRepairMarker = ".topic-indexes-repaired-v2" + +const ( + migrationFingerprintWindow = int64(2 << 10) + migrationFullFingerprintLimit = int64(256 << 10) +) + +func invalidateTopicDirMarkers(dir string) error { + dir = strings.TrimSpace(dir) + if dir == "" { + return nil + } + var errs []error + for _, marker := range []string{topicMigrationMarker, topicIndexRepairMarker} { + if err := os.Remove(filepath.Join(dir, marker)); err != nil && !os.IsNotExist(err) { + errs = append(errs, err) + } + } + return errors.Join(errs...) +} + +func topicDirMarkerDone(dir, marker string) bool { + dir = strings.TrimSpace(dir) + marker = strings.TrimSpace(marker) + if dir == "" || marker == "" { + return false + } + data, err := os.ReadFile(filepath.Join(dir, marker)) + if err != nil { + return false + } + sig, err := sessionDirMigrationSignature(dir) + if err != nil { + // Transient directory read failure: treat as not done so the next + // reconcile retries rather than permanently skipping migration. + return false + } + // Accept both signature content and legacy empty markers that still match + // only when the directory has no session files (empty sig of empty dir). + got := strings.TrimSpace(string(data)) + if got == "" { + // Legacy empty marker: valid only when the dir currently has no + // migratable session/meta files. Any new transcript must re-run. + return sig == emptySessionDirSignature + } + return got == sig +} + +const emptySessionDirSignature = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + +func sessionDirMigrationSignature(dir string) (string, error) { + entries, err := os.ReadDir(dir) + if err != nil { + return "", err + } + lines := make([]string, 0, len(entries)) + for _, entry := range entries { + if entry.IsDir() { + continue + } + name := entry.Name() + if !migrationSignatureArtifact(name) { + continue + } + record, err := migrationArtifactSignature(filepath.Join(dir, name), name) + if err != nil { + return "", err + } + lines = append(lines, record) + } + sort.Strings(lines) + sum := sha256.Sum256([]byte(strings.Join(lines, "\n"))) + return hex.EncodeToString(sum[:]), nil +} + +func migrationSignatureArtifact(name string) bool { + return store.IsSessionTranscriptName(name) || + strings.HasSuffix(name, ".events.jsonl") || + strings.HasSuffix(name, ".jsonl.meta") +} + +// migrationArtifactSignature hashes bounded transcript windows so a large +// history is never fully read. Metadata gets a full digest under the size cap; +// mtime, size, prefix, and tail cover ordinary and restored-time rewrites. +func migrationArtifactSignature(path, name string) (string, error) { + f, err := os.Open(path) + if err != nil { + return "", err + } + defer f.Close() + + before, err := f.Stat() + if err != nil { + return "", err + } + if before.IsDir() { + return "", fmt.Errorf("migration signature artifact %q is a directory", path) + } + digest, err := migrationArtifactContentDigest(f, before.Size(), strings.HasSuffix(name, ".jsonl.meta")) + if err != nil { + return "", err + } + after, err := f.Stat() + if err != nil { + return "", err + } + if before.Size() != after.Size() || !before.ModTime().Equal(after.ModTime()) { + return "", fmt.Errorf("migration signature artifact changed while reading: %q", path) + } + return fmt.Sprintf("%q\t%d\t%d\t%s", name, before.Size(), before.ModTime().UnixNano(), digest), nil +} + +func migrationArtifactContentDigest(f *os.File, size int64, preferFull bool) (string, error) { + h := sha256.New() + if size <= migrationFingerprintWindow*2 || (preferFull && size <= migrationFullFingerprintLimit) { + if _, err := f.Seek(0, io.SeekStart); err != nil { + return "", err + } + if _, err := io.CopyN(h, f, size); err != nil { + return "", err + } + return hex.EncodeToString(h.Sum(nil)), nil + } + for _, sample := range []struct { + offset int64 + length int64 + }{ + {offset: 0, length: migrationFingerprintWindow}, + {offset: size - migrationFingerprintWindow, length: migrationFingerprintWindow}, + } { + if _, err := fmt.Fprintf(h, "@%d:%d\n", sample.offset, sample.length); err != nil { + return "", err + } + if _, err := f.Seek(sample.offset, io.SeekStart); err != nil { + return "", err + } + if _, err := io.CopyN(h, f, sample.length); err != nil { + return "", err + } + } + return hex.EncodeToString(h.Sum(nil)), nil +} + +func topicMigrationDone(dir string) bool { + return topicDirMarkerDone(dir, topicMigrationMarker) +} + +func topicIndexRepairDone(dir string) bool { + return topicDirMarkerDone(dir, topicIndexRepairMarker) +} + +func markTopicDirMarkerDone(dir, marker string) { + dir = strings.TrimSpace(dir) + marker = strings.TrimSpace(marker) + if dir == "" || marker == "" { + return + } + if err := os.MkdirAll(dir, 0o755); err != nil { + return + } + sig, err := sessionDirMigrationSignature(dir) + if err != nil { + return + } + _ = os.WriteFile(filepath.Join(dir, marker), []byte(sig+"\n"), 0o644) +} + +func markTopicMigrationDone(dir string) { + markTopicDirMarkerDone(dir, topicMigrationMarker) +} + +func markTopicIndexRepairDone(dir string) { + markTopicDirMarkerDone(dir, topicIndexRepairMarker) +} diff --git a/desktop/topic_migration_marker_test.go b/desktop/topic_migration_marker_test.go new file mode 100644 index 0000000000..ecfd738d11 --- /dev/null +++ b/desktop/topic_migration_marker_test.go @@ -0,0 +1,99 @@ +package main + +import ( + "os" + "path/filepath" + "strings" + "testing" + "time" + + "reasonix/internal/agent" + "reasonix/internal/config" +) + +func TestTopicMigrationMarkerDetectsSameSizeRewriteWithRestoredMtime(t *testing.T) { + isolateDesktopUserDirs(t) + dir := config.SessionDir() + if err := os.MkdirAll(dir, 0o755); err != nil { + t.Fatalf("mkdir sessions: %v", err) + } + path := writeLegacySession(t, dir, "same-size.jsonl", "alpha", time.Now().Add(-time.Hour)) + info, err := os.Stat(path) + if err != nil { + t.Fatalf("stat original session: %v", err) + } + markTopicMigrationDone(dir) + if !topicMigrationDone(dir) { + t.Fatal("fresh migration marker should match") + } + + if err := os.WriteFile(path, []byte("{\"role\":\"user\",\"content\":\"bravo\"}\n"), 0o644); err != nil { + t.Fatalf("rewrite same-size session: %v", err) + } + if rewritten, err := os.Stat(path); err != nil { + t.Fatalf("stat rewritten session: %v", err) + } else if rewritten.Size() != info.Size() { + t.Fatalf("fixture size changed: before=%d after=%d", info.Size(), rewritten.Size()) + } + if err := os.Chtimes(path, info.ModTime(), info.ModTime()); err != nil { + t.Fatalf("restore session mtime: %v", err) + } + if topicMigrationDone(dir) { + t.Fatal("same-size rewrite with restored mtime must invalidate marker") + } +} + +func TestForcedTopicMigrationBypassesMatchingMarker(t *testing.T) { + isolateDesktopUserDirs(t) + dir := config.SessionDir() + if err := os.MkdirAll(dir, 0o755); err != nil { + t.Fatalf("mkdir sessions: %v", err) + } + path := writeLegacySession(t, dir, "forced.jsonl", "force legacy migration", time.Now().Add(-time.Hour)) + markTopicMigrationDone(dir) + markTopicIndexRepairDone(dir) + if migrated := migrateLegacySessionsIntoGlobalTopics(dir); len(migrated) != 0 { + t.Fatalf("ordinary migration ignored matching marker: %v", migrated) + } + if _, ok, err := agent.LoadBranchMeta(path); err != nil { + t.Fatalf("load legacy meta before forced migration: %v", err) + } else if ok { + t.Fatal("matching marker should have kept ordinary migration from creating meta") + } + + migrated, migratedPaths := forceMigrateLegacySessionsIntoGlobalTopicsWithPaths(dir) + wantTopicID := legacySessionTopicID(path) + if len(migrated) != 1 || migrated[0] != wantTopicID { + t.Fatalf("forced migration = %v, want %q", migrated, wantTopicID) + } + if len(migratedPaths) != 1 || !sameDesktopPath(migratedPaths[0], path) { + t.Fatalf("forced migration paths = %v, want %q", migratedPaths, path) + } + meta, ok, err := agent.LoadBranchMeta(path) + if err != nil || !ok { + t.Fatalf("load forced migration meta: ok=%v err=%v", ok, err) + } + if strings.TrimSpace(meta.TopicID) != wantTopicID { + t.Fatalf("forced migration topic = %q, want %q", meta.TopicID, wantTopicID) + } +} + +func TestTopicMigrationMarkerIncludesAuthoritativeEventLog(t *testing.T) { + isolateDesktopUserDirs(t) + dir := config.SessionDir() + if err := os.MkdirAll(dir, 0o755); err != nil { + t.Fatalf("mkdir sessions: %v", err) + } + path := writeLegacySession(t, dir, "event-aware.jsonl", "checkpoint", time.Now().Add(-time.Hour)) + markTopicMigrationDone(dir) + if !topicMigrationDone(dir) { + t.Fatal("fresh migration marker should match") + } + eventPath := strings.TrimSuffix(path, ".jsonl") + ".events.jsonl" + if err := os.WriteFile(eventPath, []byte("{\"type\":\"session.header\",\"schemaVersion\":1}\n"), 0o644); err != nil { + t.Fatalf("write authoritative event log: %v", err) + } + if topicMigrationDone(dir) { + t.Fatalf("new event log %q must invalidate marker", filepath.Base(eventPath)) + } +} diff --git a/desktop/tray.go b/desktop/tray.go index dcde840a7d..f6c2b9c6fe 100644 --- a/desktop/tray.go +++ b/desktop/tray.go @@ -1,3 +1,5 @@ +//go:build windows || cgo + package main import ( @@ -119,43 +121,3 @@ func (a *App) updateTrayLocale(locale string) { quitItem.SetTitle(labels.quitTitle) quitItem.SetTooltip(labels.quitTooltip) } - -func (a *App) trayLocale() string { - cfg, _, err := a.loadDesktopUserConfigForView() - if err != nil { - return "" - } - return cfg.DesktopLanguage() -} - -func (a *App) showFromTray() { - a.showMainWindowFrom("tray") -} - -func (a *App) quitFromTray() { - a.quitApp() -} - -type trayLabels struct { - openTitle string - openTooltip string - quitTitle string - quitTooltip string -} - -func trayMenuLabels(locale string) trayLabels { - if locale == "zh" { - return trayLabels{ - openTitle: "打开", - openTooltip: "打开 Reasonix 窗口", - quitTitle: "退出", - quitTooltip: "退出 Reasonix", - } - } - return trayLabels{ - openTitle: "Open", - openTooltip: "Open the Reasonix window", - quitTitle: "Quit", - quitTooltip: "Quit Reasonix", - } -} diff --git a/desktop/tray_common.go b/desktop/tray_common.go new file mode 100644 index 0000000000..ddb93bd3ee --- /dev/null +++ b/desktop/tray_common.go @@ -0,0 +1,41 @@ +package main + +func (a *App) trayLocale() string { + cfg, _, err := a.loadDesktopUserConfigForView() + if err != nil { + return "" + } + return cfg.DesktopLanguage() +} + +func (a *App) showFromTray() { + a.showMainWindowFrom("tray") +} + +func (a *App) quitFromTray() { + a.quitApp() +} + +type trayLabels struct { + openTitle string + openTooltip string + quitTitle string + quitTooltip string +} + +func trayMenuLabels(locale string) trayLabels { + if locale == "zh" { + return trayLabels{ + openTitle: "打开", + openTooltip: "打开 Reasonix 窗口", + quitTitle: "退出", + quitTooltip: "退出 Reasonix", + } + } + return trayLabels{ + openTitle: "Open", + openTooltip: "Open the Reasonix window", + quitTitle: "Quit", + quitTooltip: "Quit Reasonix", + } +} diff --git a/desktop/tray_loop_external.go b/desktop/tray_loop_external.go index a3fe9b8f2c..cfd0fbf926 100644 --- a/desktop/tray_loop_external.go +++ b/desktop/tray_loop_external.go @@ -1,4 +1,4 @@ -//go:build !windows +//go:build !windows && cgo package main diff --git a/desktop/tray_nocgo.go b/desktop/tray_nocgo.go new file mode 100644 index 0000000000..91ed723d9d --- /dev/null +++ b/desktop/tray_nocgo.go @@ -0,0 +1,18 @@ +//go:build !windows && !cgo + +package main + +// desktopTray remains part of App's shape in pure-Go builds, but native tray +// implementations require platform UI libraries. Desktop startup already +// treats a missing tray as an optional capability. +type desktopTray struct { + ready chan struct{} +} + +func (a *App) startTray() bool { + return false +} + +func (a *App) stopTray() {} + +func (a *App) updateTrayLocale(string) {} diff --git a/desktop/updater_mac_test.go b/desktop/updater_mac_test.go index 4cea0602a3..8362e24978 100644 --- a/desktop/updater_mac_test.go +++ b/desktop/updater_mac_test.go @@ -12,9 +12,25 @@ import ( "testing" "time" + "golang.org/x/sys/unix" + "reasonix/internal/repair" ) +// duplicateMacHandoffFD gives the in-process helper the same exclusive FD +// ownership it has in production after exec.ExtraFiles. Passing File.Fd() +// directly would leave two os.File wrappers owning one descriptor; the stale +// test wrapper's finalizer could later close an unrelated descriptor that +// reused the same number, corrupting another test's TempDir cleanup. +func duplicateMacHandoffFD(t *testing.T, file *os.File) int { + t.Helper() + fd, err := unix.Dup(int(file.Fd())) + if err != nil { + t.Fatalf("duplicate handoff fd: %v", err) + } + return fd +} + func installMacHandoffTestDeps( t *testing.T, tx *repair.UpdateTransaction, @@ -1007,6 +1023,7 @@ func TestMacUpdateHandoffReadinessSurfacesChildStartupFailure(t *testing.T) { t.Fatal(err) } defer readyReader.Close() + defer readyWriter.Close() originalRead := readMacUpdateHandoff originalLogPath := macHandoffLogPath readMacUpdateHandoff = func() (*repair.UpdateTransaction, error) { @@ -1017,13 +1034,14 @@ func TestMacUpdateHandoffReadinessSurfacesChildStartupFailure(t *testing.T) { readMacUpdateHandoff = originalRead macHandoffLogPath = originalLogPath }) + readyFD := duplicateMacHandoffFD(t, readyWriter) done := make(chan int, 1) go func() { done <- runMacUpdateHandoff(macUpdateHandoffConfig{ ToVersion: "v2", CreatedAt: "2026-07-28T00:00:00Z", TransactionID: strings.Repeat("a", 64), - ReadyFD: int(readyWriter.Fd()), + ReadyFD: readyFD, ProceedFD: int(readyWriter.Fd()) + 1, }) }() @@ -1047,13 +1065,17 @@ func TestMacUpdateHandoffHandshakeWaitsForParentRelease(t *testing.T) { t.Fatal(err) } defer readyReader.Close() + defer readyWriter.Close() + defer proceedReader.Close() defer proceedWriter.Close() + readyFD := duplicateMacHandoffFD(t, readyWriter) + proceedFD := duplicateMacHandoffFD(t, proceedReader) done := make(chan error, 1) go func() { done <- completeMacHandoffHandshake(macUpdateHandoffConfig{ - ReadyFD: int(readyWriter.Fd()), - ProceedFD: int(proceedReader.Fd()), + ReadyFD: readyFD, + ProceedFD: proceedFD, }) }() if err := waitForMacHandoffReady(readyReader, time.Second); err != nil { @@ -1090,15 +1112,19 @@ func TestMacUpdateHandoffHandshakeRejectsParentExit(t *testing.T) { t.Fatal(err) } defer readyReader.Close() + defer readyWriter.Close() + defer proceedReader.Close() if err := proceedWriter.Close(); err != nil { t.Fatal(err) } + readyFD := duplicateMacHandoffFD(t, readyWriter) + proceedFD := duplicateMacHandoffFD(t, proceedReader) done := make(chan error, 1) go func() { done <- completeMacHandoffHandshake(macUpdateHandoffConfig{ - ReadyFD: int(readyWriter.Fd()), - ProceedFD: int(proceedReader.Fd()), + ReadyFD: readyFD, + ProceedFD: proceedFD, }) }() if err := waitForMacHandoffReady(readyReader, time.Second); err != nil { @@ -1153,12 +1179,14 @@ func TestMacUpdateHandoffParentExitCancelsPreparedTransaction(t *testing.T) { t.Fatal(err) } defer readyReader.Close() + defer readyWriter.Close() + defer proceedReader.Close() if err := proceedWriter.Close(); err != nil { t.Fatal(err) } cfg := macHandoffConfigFor(tx) - cfg.ReadyFD = int(readyWriter.Fd()) - cfg.ProceedFD = int(proceedReader.Fd()) + cfg.ReadyFD = duplicateMacHandoffFD(t, readyWriter) + cfg.ProceedFD = duplicateMacHandoffFD(t, proceedReader) if code := runMacUpdateHandoff(cfg); code == 0 { t.Fatal("handoff accepted a parent that exited before release") diff --git a/desktop/webkit_compat_linux.go b/desktop/webkit_compat_linux.go index 4d50ab5d5e..bb1e9fcaa3 100644 --- a/desktop/webkit_compat_linux.go +++ b/desktop/webkit_compat_linux.go @@ -1,3 +1,5 @@ +//go:build linux && cgo + // Package main provides the Wails desktop shell around the Reasonix kernel. // // webkit_compat_linux.go applies WebKit2GTK compatibility workarounds around diff --git a/desktop/webkit_compat_other.go b/desktop/webkit_compat_other.go index d324cc389e..f2278b4614 100644 --- a/desktop/webkit_compat_other.go +++ b/desktop/webkit_compat_other.go @@ -1,4 +1,4 @@ -//go:build !linux +//go:build !linux || !cgo package main diff --git a/docs/CLI.md b/docs/CLI.md index 58fade3b87..2f58b81585 100644 --- a/docs/CLI.md +++ b/docs/CLI.md @@ -462,6 +462,44 @@ Switching model, effort, or work mode rebuilds the runtime while preserving the active conversation, session-scoped permission overrides, additional directory access, and session ownership. `/reload` uses the same fail-atomic rebuild. +## Session catalog diagnostics + +The desktop session catalog is a disposable SQLite query projection; transcript +JSONL and sidecars remain authoritative. Inspect it read-only or replace only +the projection: + +```sh +reasonix doctor sessions [--json] +reasonix sessions reindex [--json] +reasonix sessions reindex --dir /path/to/sessions --dir /another/path +``` + +Without `--dir`, reindex includes global sessions and all projects saved by the +desktop app. See [Session Catalog and Desktop Startup](./SESSION_CATALOG.md) for +failure, migration, and data-safety guarantees. + +History search uses a separate disposable projection: + +```sh +reasonix doctor catalogs [--json] +reasonix catalogs reindex history [--dir PATH ...] [--json] +``` + +See [History Search Catalog](./HISTORY_SEARCH_CATALOG.md). +Usage statistics use a separate disposable rollup projection: +reasonix catalogs reindex usage [--json] +See [Usage Catalog](./USAGE_CATALOG.md). + +Inspect or rebuild the disposable task projection independently: + +```sh +reasonix doctor catalogs [--json] +reasonix catalogs reindex tasks [--project PATH ...] [--json] +``` + +See [Task Catalog](./TASK_CATALOG.md) for the authoritative FileStore boundary, +cross-project routing, and rebuild behavior. + ### Memory diagnostics and recovery Bare `/memory` shows all active project/global facts without hiding same-name diff --git a/docs/CLI.zh-CN.md b/docs/CLI.zh-CN.md index 4a00a1f2a5..9ca3581c9a 100644 --- a/docs/CLI.zh-CN.md +++ b/docs/CLI.zh-CN.md @@ -401,6 +401,42 @@ SSH 下远端进程无法读取本机剪贴板，请使用终端粘贴快捷键 切换模型、effort 或工作模式会重建运行时，同时保留当前对话、会话级权限覆盖、附加目录 访问权限和 session ownership。`/reload` 使用同一套失败原子重建语义。 +## 会话目录索引诊断 + +桌面会话目录索引是可丢弃、可重建的 SQLite 查询投影；JSONL transcript 和 sidecar +始终是权威数据。可只读检查，或仅替换投影： + +```sh +reasonix doctor sessions [--json] +reasonix sessions reindex [--json] +reasonix sessions reindex --dir /path/to/sessions --dir /another/path +``` + +不传 `--dir` 时，reindex 会覆盖全局会话和桌面保存的全部项目。迁移、失败降级和数据安全 +契约见 [Session Catalog and Desktop Startup](./SESSION_CATALOG.md)。 + +历史搜索使用独立的可丢弃投影： + +```sh +reasonix doctor catalogs [--json] +reasonix catalogs reindex history [--dir PATH ...] [--json] +``` + +详见 [历史搜索 Catalog](./HISTORY_SEARCH_CATALOG.zh-CN.md)。 +用量统计使用独立的可丢弃 rollup 投影： +reasonix catalogs reindex usage [--json] +详见 [用量 Catalog](./USAGE_CATALOG.zh-CN.md)。 + +可以独立检查或重建可丢弃的 Task 投影： + +```sh +reasonix doctor catalogs [--json] +reasonix catalogs reindex tasks [--project PATH ...] [--json] +``` + +权威 FileStore 边界、跨项目路由和重建行为见 +[Task Catalog](./TASK_CATALOG.zh-CN.md)。 + ### 记忆诊断与恢复 直接运行 `/memory` 会显示全部 project/global active facts，不会隐藏跨 scope 的同名条目。 @@ -420,3 +456,21 @@ SSH 下远端进程无法读取本机剪贴板，请使用终端粘贴快捷键 connect` 或桌面的远程网页窗口）时，它们使用远程 memory catalog，绝不回退读取桌面本机 记忆。权限、自动召回、写入确认和迁移行为见 [Context Engine v2](./SESSION_MEMORY_RETRIEVAL.zh-CN.md)。 + +契约见 [Session Catalog and Desktop Startup](./SESSION_CATALOG.md)。 + +用量统计使用独立的可丢弃 rollup 投影： + +```sh +reasonix doctor catalogs [--json] +reasonix catalogs reindex usage [--json] +``` + +``` + +详见 [用量 Catalog](./USAGE_CATALOG.zh-CN.md)。 + +### 记忆诊断与恢复 + +直接运行 `/memory` 会显示全部 project/global active facts，不会隐藏跨 scope 的同名条目。 +每条事实包含稳定 ID、revision、scope、type、freshness 和 description。斜杠补全会提供 diff --git a/docs/CONFIG_PATHS.md b/docs/CONFIG_PATHS.md index 5285974c8f..2c37b03296 100644 --- a/docs/CONFIG_PATHS.md +++ b/docs/CONFIG_PATHS.md @@ -40,10 +40,23 @@ non-destructively when `/.env` is missing them. | Sessions | `/sessions/` | | Archives | `/archive/` | | Memory | `/memory/` and `/projects/` | +| Disposable session catalog | `/session-catalog/v1.sqlite` | +| Disposable history search catalog | `/history-search/v1.sqlite` | +| Disposable usage catalog | `/usage-catalog/v1.sqlite` | +| Disposable task catalog | `/task-catalog/v1.sqlite` | `` defaults to ``. It only differs when `REASONIX_STATE_HOME` is set. +The session catalog is a rebuildable query projection, not user data. Session +JSONL, event logs, metadata sidecars, and `desktop-projects.json` remain +authoritative. See [Session Catalog and Desktop Startup](./SESSION_CATALOG.md). +The history projection is documented in +[History Search Catalog](./HISTORY_SEARCH_CATALOG.md). +The usage rollup projection is documented in [Usage Catalog](./USAGE_CATALOG.md). +Task snapshots and event logs likewise remain authoritative; the rebuildable +cross-project projection is documented in [Task Catalog](./TASK_CATALOG.md). + The global user config is named `config.toml`. Project-local config files keep the name `reasonix.toml`. If someone says "global reasonix.toml", they usually mean `/config.toml`. diff --git a/docs/CONFIG_PATHS.zh-CN.md b/docs/CONFIG_PATHS.zh-CN.md index 736311852d..83be7d1184 100644 --- a/docs/CONFIG_PATHS.zh-CN.md +++ b/docs/CONFIG_PATHS.zh-CN.md @@ -33,10 +33,18 @@ Legacy 迁移、OS home 约定目录扫描以及其他 fallback 路径都会跳 | 会话 | `/sessions/` | | 归档 | `/archive/` | | 记忆 | `/memory/` 与 `/projects/` | +| 可丢弃的会话 Catalog | `/session-catalog/v1.sqlite` | +| 可丢弃的 Task Catalog | `/task-catalog/v1.sqlite` | `` 默认等于 ``；只有设置 `REASONIX_STATE_HOME` 时才会不同。 +会话 Catalog 是可重建的查询投影，不是用户数据；JSONL、event log、 +metadata sidecar 和 `desktop-projects.json` 仍是权威数据。详见 +[Session Catalog and Desktop Startup](./SESSION_CATALOG.zh-CN.md)。Task snapshot 和 +event log 也仍是权威数据；可重建的跨项目投影见 +[Task Catalog](./TASK_CATALOG.zh-CN.md)。 + 全局用户配置文件名是 `config.toml`。项目本地配置文件仍叫 `reasonix.toml`。 如果有人说“全局 reasonix.toml”，通常指的是 `/config.toml`。 diff --git a/docs/HISTORY_SEARCH_CATALOG.md b/docs/HISTORY_SEARCH_CATALOG.md new file mode 100644 index 0000000000..400e0f3e41 --- /dev/null +++ b/docs/HISTORY_SEARCH_CATALOG.md @@ -0,0 +1,44 @@ +# History Search Catalog + +Reasonix stores the history search projection at +`/history-search/v1.sqlite`. Session JSONL, event logs, metadata, +sub-agent transcripts, and archives remain authoritative. Removing or +rebuilding the database never removes conversation data, and older Reasonix +versions continue to read the same authoritative files. + +The catalog stores normalized retrieval tokens in FTS5, not complete message +text. English tokens retain the existing lowercase/code-symbol semantics and +CJK text retains overlapping bigrams. Snippets and `around` context are loaded +from the authoritative source only after SQLite has selected the final +candidates. User, assistant, tool input, tool error, and tool output parts are +indexed; ordinary tool output remains excluded by the default search kinds. + +Successful session persistence sends a non-blocking, path-coalesced hint after +the authoritative commit and after file locks have been released. Continuous +appends read only the new display-index range. Rewrites, missed notifications, +external writers, or fingerprint mismatches rebuild that source in the +background. Only one full transcript decoder runs at once, checkpoints are +persisted per source, and one corrupt source cannot stop other histories. + +The Agent `history` tool and Desktop history manager share the projection. +Search never starts a synchronous directory scan. While indexing is incomplete, +existing results return immediately with explicit progress. Runtime open, +running, and current state is overlaid from memory; SQLite cannot restore stale +runtime ownership. Provider-visible tool name, description, schema, defaults, +and ordering are unchanged. + +The database uses the common disposable projection policy: local disks use WAL, +`synchronous=NORMAL`, foreign keys, private permissions, and a short busy +timeout. Remote or unavailable cache directories fall back to memory. Integrity +or migration failures quarantine and rebuild the cache; future schema versions +are preserved in degraded read mode. + +Diagnostics and safe rebuild commands: + +```sh +reasonix doctor catalogs [--json] +reasonix catalogs reindex history [--dir PATH ...] [--json] +``` + +Diagnostics never print queries, tokens, snippets, messages, tool arguments, or +provider content. A rebuild replaces only this disposable projection. diff --git a/docs/HISTORY_SEARCH_CATALOG.zh-CN.md b/docs/HISTORY_SEARCH_CATALOG.zh-CN.md new file mode 100644 index 0000000000..e86d114acf --- /dev/null +++ b/docs/HISTORY_SEARCH_CATALOG.zh-CN.md @@ -0,0 +1,34 @@ +# 历史搜索 Catalog + +Reasonix 将历史搜索投影保存到 `/history-search/v1.sqlite`。 +Session JSONL、event log、metadata、子 Agent transcript 和 archive 仍是唯一权威 +数据。删除或重建数据库不会删除会话，旧版 Reasonix 也继续读取原有权威文件。 + +Catalog 的 FTS5 只保存规范化检索 token，不保存完整消息正文。英文沿用现有小写与 +代码符号语义，CJK 沿用重叠 bigram。SQLite 选出最终候选后，snippet 和 `around` +上下文才从权威文件读取。user、assistant、tool input、tool error、tool output 都会索引， +但普通 tool output 仍不属于默认搜索种类。 + +权威会话提交成功且文件锁释放后，保存路径只发送非阻塞、按 path 合并的索引提示。 +连续 append 只读取 display index 的新增范围；rewrite、通知丢失、外部进程写入或指纹 +不一致会在后台重建单个 source。完整 transcript decoder 始终单并发，checkpoint 按 +source 持久化，单个坏会话不会阻断其他历史。 + +Agent 的 `history` 工具与 Desktop 历史管理器共享该投影。搜索不会同步扫描目录；首次 +索引未完成时立即返回已有结果和明确进度。open、running、current 等运行态只从内存 +覆盖，SQLite 不能恢复陈旧所有权。面向 provider 的工具名、描述、schema、默认值和 +顺序保持逐字节不变。 + +数据库遵循通用可丢弃投影策略：本地盘使用 WAL、`synchronous=NORMAL`、外键、用户 +私有权限和短 busy timeout；远程或不可用缓存自动退化为内存。完整性或迁移失败只隔离 +并重建缓存；遇到未来 schema 时保留原库并进入 degraded。 + +诊断与安全重建命令： + +```sh +reasonix doctor catalogs [--json] +reasonix catalogs reindex history [--dir PATH ...] [--json] +``` + +诊断不会输出 query、token、snippet、消息、tool arguments 或 provider 内容；reindex +只替换该可丢弃投影。 diff --git a/docs/SESSION_CATALOG.md b/docs/SESSION_CATALOG.md new file mode 100644 index 0000000000..6b4edd164f --- /dev/null +++ b/docs/SESSION_CATALOG.md @@ -0,0 +1,101 @@ +# Session Catalog and Desktop Startup + +Reasonix keeps session transcripts, event logs, metadata sidecars, and +`desktop-projects.json` as the only authoritative session data. The desktop +project tree reads a disposable SQLite projection from +`/session-catalog/v1.sqlite`; deleting that database never deletes +or changes a conversation. + +## Invariants + +- Startup and project-tree requests never decode transcript JSONL, run legacy + migration, or wait for a directory scan. +- A successfully saved transcript is committed before its catalog update. The + non-blocking writer coalesces updates by session path; background + reconciliation repairs updates dropped under queue pressure. +- Missing legacy counts are represented as `unknown`. The session is visible + immediately, then a single repair worker decodes it in the background. +- A missing file is marked degraded on the first scan. It is removed from the + projection only after a second scan and the missing-file grace period. +- Runtime state (`open`, `running`, and live status) comes only from in-memory + controllers and overlays catalog results. It is never persisted to SQLite. +- Catalog, migration, plugin, and MCP work is cancellable and never participates + in the desktop shutdown lock. Shutdown gives pending catalog writes at most + 250 ms. + +## Storage and migration + +`internal/sessioncatalog` uses a version ledger in `schema_migrations`; database +existence is not a migration signal. Local cache files use WAL, +`synchronous=NORMAL`, and a short busy timeout. An unavailable or obviously +remote cache path falls back to an in-memory catalog so storage failures cannot +block the application. + +At open, Reasonix runs an integrity check. A corrupt or unmigratable database is +renamed with a `.corrupt-` suffix and replaced. The replacement is +rebuilt from sidecars and transcripts in the background. The quarantine and +rebuild paths never remove authoritative files. + +The catalog stores only query projections: + +- directory signatures, scan generations, checkpoints, and errors; +- project ordering, title, color, and pin state; +- topic ordering, aggregate counts, activity, recovery, and health state; and +- session path, preview, counts, fingerprints, recovery, and health state. + +Topic pages use a `(pinned, last_activity_at, topic_id)` keyset cursor. The +default page size is 50 and the maximum is 200. Directory reconciliation commits +at most 64 sidecars per batch and persists its checkpoint before yielding. + +## Desktop API + +- `GetProjectTreeSnapshot` returns project shells, catalog state, progress, and + revision without opening a session or sidecar file. +- `ListProjectTopics` performs cursor-paged search and time filtering. +- `GetTopicSummary` resolves one topic for active-turn UI without rebuilding the + tree. +- `GetSessionCatalogStatus` and `RebuildSessionCatalog` expose safe diagnostics + and replacement. +- `project-tree:changed-v2` carries a monotonic revision, affected workspace + roots, and reason. Clients ignore older revisions and refresh only expanded + affected roots. + +`ListProjectTree` remains as a compatibility wrapper over the catalog. It no +longer has a synchronous filesystem fallback. + +## Operations + +Inspect the catalog without creating or changing it: + +```sh +reasonix doctor sessions +reasonix doctor sessions --json +``` + +Replace only the disposable projection and index all saved desktop projects: + +```sh +reasonix sessions reindex +reasonix sessions reindex --json +``` + +Use repeated `--dir PATH` flags to rebuild from an explicit set of directories. +Explicit directories are treated as global scope. Reindexing never edits or +deletes transcript, event, metadata, recovery, archive, or project files. + +## Plugin isolation + +Manifest validation and plugin handshakes are independent from catalog and +project-tree work. An incompatible plugin is reported as +`disabled_incompatible`; the core controller remains usable. A legacy manifest +under Reasonix's managed plugin directory is atomically upgraded with a backup. +Development directories, absolute external roots, and symlinked sources are +never rewritten automatically and include a manual migration hint instead. + +## Release gates + +Preview/canary promotion should track catalog repair backlog, rebuild failures, +page latency, queue pressure, and shutdown duration. Required checks include +legacy/ corrupt fixtures, deterministic lifecycle races, `go test -race`, the +React contract tests, and `CGO_ENABLED=0` builds for supported macOS, Windows, +and Linux architectures. diff --git a/docs/SESSION_CATALOG.zh-CN.md b/docs/SESSION_CATALOG.zh-CN.md new file mode 100644 index 0000000000..e809dd9fe7 --- /dev/null +++ b/docs/SESSION_CATALOG.zh-CN.md @@ -0,0 +1,87 @@ +# 会话索引与桌面启动 + +Reasonix 始终以会话 transcript、event log、metadata sidecar 和 +`desktop-projects.json` 作为唯一权威数据。桌面项目树读取位于 +`<缓存根目录>/session-catalog/v1.sqlite` 的一次性 SQLite 查询投影；删除该数据库 +不会删除或修改任何会话。 + +## 不变量 + +- 启动和项目树请求不会解码 transcript JSONL、执行旧版迁移或等待目录扫描。 +- transcript 成功落盘后才更新 catalog。非阻塞单写者队列按 session path 合并更新； + 后台对账会修复队列拥塞时丢弃的更新。 +- 缺少旧版计数时使用 `unknown` 状态。会话会立即可见，随后由单个 repair worker + 在后台解码修复。 +- 文件首次缺失时只标记为 degraded；只有连续第二次扫描仍缺失且超过宽限期后， + 才会从查询投影移除。 +- 运行时状态（`open`、`running` 和实时状态）只来自内存 controller，并覆盖 + catalog 结果；这些状态永远不会持久化到 SQLite。 +- catalog、迁移、插件和 MCP 工作都可取消，且不参与桌面退出锁。退出最多等待 + catalog 待写入数据 250 ms。 + +## 存储与迁移 + +`internal/sessioncatalog` 使用 `schema_migrations` 版本台账；数据库文件存在不代表 +迁移完成。本地缓存使用 WAL、`synchronous=NORMAL` 和较短的 busy timeout。 +缓存目录不可用或明确位于远程文件系统时，会降级为内存 catalog，避免存储故障 +阻塞应用。 + +打开数据库时，Reasonix 会执行完整性检查。损坏或无法迁移的数据库会被重命名， +附加 `.corrupt-<时间戳>` 后缀并由新数据库替代；随后在后台根据 sidecar 和 +transcript 重建。隔离和重建都不会删除权威文件。 + +catalog 只保存查询投影： + +- 目录签名、扫描代次、检查点和错误； +- 项目排序、标题、颜色和置顶状态； +- topic 排序、聚合计数、活动时间、恢复和健康状态； +- session path、preview、计数、指纹、恢复和健康状态。 + +topic 分页使用 `(pinned, last_activity_at, topic_id)` keyset cursor。默认每页 +50 条，最多 200 条。目录对账每批最多提交 64 个 sidecar，并在让出调度前持久化 +检查点。 + +## 桌面 API + +- `GetProjectTreeSnapshot` 返回项目壳、catalog 状态、进度和 revision，不打开 + session 或 sidecar 文件。 +- `ListProjectTopics` 提供基于 cursor 的分页搜索和时间过滤。 +- `GetTopicSummary` 为 active-turn UI 查询单个 topic，无需重建整棵树。 +- `GetSessionCatalogStatus` 和 `RebuildSessionCatalog` 提供安全诊断和索引替换。 +- `project-tree:changed-v2` 携带单调递增的 revision、受影响 workspace root 和 + 原因。客户端会忽略旧 revision，并只刷新受影响且已展开的项目。 + +`ListProjectTree` 作为基于 catalog 的兼容包装继续保留，不再回退到同步文件系统 +扫描。 + +## 运维 + +只读检查 catalog，不创建或修改它： + +```sh +reasonix doctor sessions +reasonix doctor sessions --json +``` + +只替换一次性查询投影，并索引所有已保存的桌面项目： + +```sh +reasonix sessions reindex +reasonix sessions reindex --json +``` + +可重复传入 `--dir PATH`，从指定目录集合重建；显式目录按 global scope 处理。 +reindex 不会编辑或删除 transcript、event、metadata、recovery、archive 或项目文件。 + +## 插件隔离 + +manifest 校验和插件握手与 catalog、项目树互相独立。不兼容插件会报告为 +`disabled_incompatible`，核心 controller 仍可使用。Reasonix 管理目录中的旧版 +manifest 会在生成备份后原子升级；开发目录、外部绝对路径和软链接源码不会被自动 +改写，而会给出手动迁移提示。 + +## 发布门禁 + +Preview/canary 晋级应观测 catalog 修复积压、重建失败、分页延迟、队列压力和退出 +耗时。必须覆盖旧版与损坏 fixture、确定性的生命周期竞态、`go test -race`、React +契约测试，以及受支持 macOS、Windows 和 Linux 架构的 `CGO_ENABLED=0` 构建。 diff --git a/docs/TASK_CATALOG.md b/docs/TASK_CATALOG.md new file mode 100644 index 0000000000..9526601840 --- /dev/null +++ b/docs/TASK_CATALOG.md @@ -0,0 +1,26 @@ +# Task Catalog + +Reasonix stores the cross-project task projection at +`/task-catalog/v1.sqlite`. Task snapshots, event JSONL, idempotency +files, file locks, version CAS, and leases remain authoritative. SQLite is never +used to accept stop, cancel, requeue, or open-session commands. + +An observed `FileStore` sends non-blocking snapshot and event hints only after +the per-task lock is released. Snapshots are indexed eagerly in bounded batches; +event logs are indexed lazily when a task expands, an event query arrives, or a +new event is appended. Byte-offset and sequence checkpoints resume after an +interruption. Corrupt snapshots and event lines degrade only that task. + +The Desktop task center pages across current session, project, or all registered +projects. Project keys are full SHA-256 hashes of canonical saved roots and are +resolved before every action. The control service then re-reads the authoritative +snapshot. Current process jobs and controller state always overlay catalog data, +and expired leases are reconciled at read time without rewriting snapshots. + +```sh +reasonix doctor catalogs [--json] +reasonix catalogs reindex tasks [--project PATH ...] [--json] +``` + +Catalog corruption or partial indexing does not disable task control. Reindexing +replaces only the disposable projection. diff --git a/docs/TASK_CATALOG.zh-CN.md b/docs/TASK_CATALOG.zh-CN.md new file mode 100644 index 0000000000..92bd58df1e --- /dev/null +++ b/docs/TASK_CATALOG.zh-CN.md @@ -0,0 +1,21 @@ +# Task Catalog + +Reasonix 将跨项目任务投影保存到 `/task-catalog/v1.sqlite`。任务 snapshot、 +event JSONL、idempotency 文件、文件锁、version CAS 和 lease 继续作为权威数据。SQLite +绝不参与 stop、cancel、requeue 或 open-session 的接受判断。 + +Observed `FileStore` 只在 per-task lock 释放后发送非阻塞 snapshot/event 提示。Snapshot +按有界批次优先索引；event log 仅在任务展开、事件查询或追加新事件时惰性索引。byte +offset 和 sequence checkpoint 可在强退后续传；坏 snapshot 或 event line 只降级单个任务。 + +Desktop Task Center 对当前会话、当前项目或全部已注册项目分页。Project key 是 canonical +已保存 root 的完整 SHA-256，每次 action 都先解析 key，再由 control service 重读权威 +snapshot。当前进程的 jobs/controller 状态始终覆盖 catalog；过期 lease 只在读取时对账， +不回写 snapshot。 + +```sh +reasonix doctor catalogs [--json] +reasonix catalogs reindex tasks [--project PATH ...] [--json] +``` + +Catalog 损坏或未完成索引不会禁用任务控制；reindex 只替换可丢弃投影。 diff --git a/docs/USAGE_CATALOG.md b/docs/USAGE_CATALOG.md new file mode 100644 index 0000000000..8732f76d0d --- /dev/null +++ b/docs/USAGE_CATALOG.md @@ -0,0 +1,26 @@ +# Usage Catalog + +Reasonix stores disposable usage rollups at `/usage-catalog/v1.sqlite`. +Daily statistics JSONL remains authoritative and byte-compatible with older +versions. The catalog records file offsets and line hashes for cross-process +idempotency, then derives daily source/model/provider rollups. + +Only a successful JSONL append emits a non-blocking receipt. Duplicate receipts +cannot double-count a line. A changed hash, truncated file, replacement, queue +overflow, or external append triggers byte-offset reconciliation or a safe +per-day rebuild. Torn tails, blank lines, corrupt JSON, legacy request defaults, +time zones, date boundaries, and active-day semantics match the existing JSONL +decoder. + +SQL aggregation is used only when every selected day is complete. Otherwise the +existing exact JSONL query runs on explicit statistics-page access while the +background index catches up. Catalog failures never block provider events, +turn completion, controller startup, or shutdown. + +```sh +reasonix doctor catalogs [--json] +reasonix catalogs reindex usage [--json] +``` + +Diagnostics expose schema, integrity, lag, counts, and failures without model +request content. Reindexing never changes daily JSONL. diff --git a/docs/USAGE_CATALOG.zh-CN.md b/docs/USAGE_CATALOG.zh-CN.md new file mode 100644 index 0000000000..71b62d45b5 --- /dev/null +++ b/docs/USAGE_CATALOG.zh-CN.md @@ -0,0 +1,22 @@ +# 用量 Catalog + +Reasonix 将可丢弃的用量聚合保存到 `/usage-catalog/v1.sqlite`。每日统计 +JSONL 继续作为权威数据，并与旧版保持字节兼容。Catalog 记录文件 offset 和行 hash， +用于跨进程幂等，再派生按日、source、model/provider 的 rollup。 + +只有 JSONL append 成功后才会非阻塞提交 receipt；重复 receipt 不会重复累计。同一 +offset hash 改变、文件缩短/替换、队列溢出或外部追加会触发 offset 对账或按日安全重建。 +torn tail、空行、坏 JSON、旧 requests 默认值、时区、日期边界及 ActiveDays 语义都与 +现有 JSONL decoder 一致。 + +只有所选日期全部完成索引时才使用 SQL；否则用户主动打开统计页时执行现有 JSONL 精确 +查询，同时后台继续补齐。Catalog 故障不会阻塞 provider event、TurnDone、controller +启动或退出。 + +```sh +reasonix doctor catalogs [--json] +reasonix catalogs reindex usage [--json] +``` + +诊断只暴露 schema、完整性、lag、数量和错误，不包含模型请求内容；reindex 不修改每日 +JSONL。 diff --git a/go.mod b/go.mod index d46998ff5d..e5f729ec3b 100644 --- a/go.mod +++ b/go.mod @@ -42,6 +42,7 @@ require ( golang.org/x/term v0.45.0 golang.org/x/text v0.40.0 gopkg.in/yaml.v3 v3.0.1 + modernc.org/sqlite v1.56.0 mvdan.cc/sh/v3 v3.13.1 ) @@ -54,13 +55,21 @@ require ( github.com/clipperhouse/uax29/v2 v2.7.0 // indirect github.com/danieljoos/wincred v1.2.3 // indirect github.com/dlclark/regexp2/v2 v2.2.1 // indirect + github.com/dustin/go-humanize v1.0.1 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/kr/fs v0.1.0 // indirect github.com/lucasb-eyer/go-colorful v1.4.0 // indirect + github.com/mattn/go-isatty v0.0.24 // indirect github.com/mattn/go-pointer v0.0.1 // indirect github.com/muesli/cancelreader v0.2.2 // indirect + github.com/ncruces/go-strftime v1.0.0 // indirect + github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect golang.org/x/sync v0.22.0 // indirect + modernc.org/libc v1.74.4 // indirect + modernc.org/mathutil v1.7.1 // indirect + modernc.org/memory v1.11.0 // indirect ) diff --git a/go.sum b/go.sum index d813411d96..1afec27f78 100644 --- a/go.sum +++ b/go.sum @@ -49,6 +49,8 @@ github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxK github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/dlclark/regexp2/v2 v2.2.1 h1:mf4KkFUj0gJuarK8P+LgiS+Lit7m9N1yAwEfPbee7R0= github.com/dlclark/regexp2/v2 v2.2.1/go.mod h1:avUrQvPaLz2DrFNHJF0taWAFFX2C1GMSSoeiqFjcBmU= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI= @@ -59,8 +61,14 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +github.com/google/pprof v0.0.0-20260802141513-ef3492d7dac3 h1:LMLX+LgTNWpfvCBdFebv6EsYotImrt/Ppc5cXIriCSo= +github.com/google/pprof v0.0.0-20260802141513-ef3492d7dac3/go.mod h1:jl5iWTm0/hd5PjEYEOuwAJ57L/CibdZfrqZ5XA5GrCk= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= +github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= @@ -79,16 +87,22 @@ github.com/larksuite/oapi-sdk-go/v3 v3.9.9 h1:qzVK5U1AuT/n0Z4LqCN2ATU6MlYp2Iipa7 github.com/larksuite/oapi-sdk-go/v3 v3.9.9/go.mod h1:ZEplY+kwuIrj/nqw5uSCINNATcH3KdxSN7y+UxYY5fI= github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4= github.com/lucasb-eyer/go-colorful v1.4.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= +github.com/mattn/go-isatty v0.0.24 h1:tGZZoVgT/KiqK1c8ocVLeDS8BSWMRd47J3Lbz7vsReI= +github.com/mattn/go-isatty v0.0.24/go.mod h1:nMCL3Zebbrt45jsMDgnfIwz6ydEQApk5oEI3HqDio6A= github.com/mattn/go-pointer v0.0.1 h1:n+XhsuGeVO6MEAp7xyEukFINEa+Quek5psIR/ylA6o0= github.com/mattn/go-pointer v0.0.1/go.mod h1:2zXcozF6qYGgmsG+SeTZz3oAbFLdD3OWqnUbNvJZAlc= github.com/mattn/go-runewidth v0.0.27 h1:Feg/Oou5zI/wnpgDF6omIU0OokC9GxLC/WRknhVlIR0= github.com/mattn/go-runewidth v0.0.27/go.mod h1:3qAiGCV4Koz/yuveO58qUefmUTRm8r0IGEXZ9jeHp/8= github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA= github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= +github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w= +github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= github.com/pkg/sftp v1.13.11 h1:0N92SLTB8JqASJB14ZLHHzFnBV8mG9zw4K7jghEFWuE= github.com/pkg/sftp v1.13.11/go.mod h1:uNkH9roSXglNJqM+glJJi+TQXQUm0fXFWqCFmT8hsN0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= +github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= @@ -183,6 +197,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q= +golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -193,5 +209,33 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +modernc.org/cc/v4 v4.29.1 h1:MKgdCV3WykTSPqpVrnxdEDS0HEd2FHpKZDzxzU5LyeI= +modernc.org/cc/v4 v4.29.1/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI= +modernc.org/ccgo/v4 v4.34.6 h1:sBgfIwyN0TQ9C5hwIeuqyeAKyMWnbvj2fvpF4L11uzU= +modernc.org/ccgo/v4 v4.34.6/go.mod h1:SZ8YcN9NG7XVsQYdm6jYBvi8PQP1qi+kqB6OhjqI3Fk= +modernc.org/fileutil v1.4.0 h1:j6ZzNTftVS054gi281TyLjHPp6CPHr2KCxEXjEbD6SM= +modernc.org/fileutil v1.4.0/go.mod h1:EqdKFDxiByqxLk8ozOxObDSfcVOv/54xDs/DUHdvCUU= +modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI= +modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito= +modernc.org/gc/v3 v3.1.4 h1:2g65LGVSmFQrXeITAw97x7hCRvZFcyE1uDP+7Vng7JI= +modernc.org/gc/v3 v3.1.4/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY= +modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks= +modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI= +modernc.org/libc v1.74.4 h1:fX1Omw4o2/1C2iRkkIsrQTasJQldLhRmuPreXLoWs9k= +modernc.org/libc v1.74.4/go.mod h1:eeQAS9W3sZeKYMFubydxJpII9ybHWshk+7or7bLG9co= +modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU= +modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg= +modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI= +modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= +modernc.org/opt v0.2.0 h1:tGyef5ApycA7FSEOMraay9SaTk5zmbx7Tu+cJs4QKZg= +modernc.org/opt v0.2.0/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns= +modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w= +modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE= +modernc.org/sqlite v1.56.0 h1:/D8e2RfFqoy/Zc6PuC76U28zFwmI/sYx1Kjm4yEn9e0= +modernc.org/sqlite v1.56.0/go.mod h1:yCJ2cmAaIkHQ25oXWrF8H4O1lIfPYPR26yCEDj2P3pQ= +modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0= +modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A= +modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= +modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= mvdan.cc/sh/v3 v3.13.1 h1:DP3TfgZhDkT7lerUdnp6PTGKyxxzz6T+cOlY/xEvfWk= mvdan.cc/sh/v3 v3.13.1/go.mod h1:lXJ8SexMvEVcHCoDvAGLZgFJ9Wsm2sulmoNEXGhYZD0= diff --git a/internal/agent/listsessions_sidecar_test.go b/internal/agent/listsessions_sidecar_test.go index a65ad5b502..4f4b4ad730 100644 --- a/internal/agent/listsessions_sidecar_test.go +++ b/internal/agent/listsessions_sidecar_test.go @@ -77,9 +77,39 @@ func TestListSessionsUsesSidecarWithoutDecoding(t *testing.T) { } } -// A legacy session whose sidecar has no recorded turn count must be decoded once -// and then backfilled, so the second listing reads the sidecar. -func TestListSessionsBackfillsLegacySession(t *testing.T) { +func TestListSessionsLeavesLegacyCountsUnknownWithoutDecodingOrWriting(t *testing.T) { + dir := t.TempDir() + path := filepath.Join(dir, "legacy.jsonl") + if err := os.WriteFile(path, []byte("not valid jsonl\n"), 0o600); err != nil { + t.Fatal(err) + } + updated := time.Date(2026, 8, 10, 12, 0, 0, 0, time.UTC) + if err := SaveBranchMetaPreserveUpdated(path, BranchMeta{ + ID: BranchID(path), CreatedAt: updated, UpdatedAt: updated, Scope: "global", + }); err != nil { + t.Fatal(err) + } + + infos, err := ListSessions(dir) + if err != nil { + t.Fatal(err) + } + if len(infos) != 1 || infos[0].CountsKnown || infos[0].Turns != 0 || !strings.Contains(infos[0].Preview, "being indexed") { + t.Fatalf("legacy listing = %#v", infos) + } + meta, ok, err := LoadBranchMeta(path) + if err != nil || !ok { + t.Fatalf("LoadBranchMeta: ok=%v err=%v", ok, err) + } + if meta.SchemaVersion != 0 || meta.Turns != 0 || !meta.UpdatedAt.Equal(updated) { + t.Fatalf("listing mutated legacy sidecar: %+v", meta) + } +} + +// A legacy session whose sidecar has no recorded turn count remains visible +// without a synchronous transcript decode. The catalog repair worker owns the +// eventual backfill. +func TestListSessionsLeavesLegacySessionForBackgroundRepair(t *testing.T) { dir := t.TempDir() path := filepath.Join(dir, "20260101-000000-deepseek-chat.jsonl") writeSessionFile(t, path, []provider.Message{ @@ -99,18 +129,17 @@ func TestListSessionsBackfillsLegacySession(t *testing.T) { if err != nil { t.Fatalf("ListSessions: %v", err) } - if len(infos) != 1 || infos[0].Turns != 2 { - t.Fatalf("expected 1 session with 2 turns, got %+v", infos) + if len(infos) != 1 || infos[0].Turns != 0 || infos[0].CountsKnown { + t.Fatalf("expected one unknown-count session, got %+v", infos) } - // Backfill must have written the counts into the sidecar without bumping - // activity time (ordering must stay stable). + // Listing must not mutate the sidecar or bump activity time. meta, ok, err := LoadBranchMeta(path) if err != nil || !ok { t.Fatalf("LoadBranchMeta: ok=%v err=%v", ok, err) } - if meta.Turns != 2 || meta.Preview != "legacy question" { - t.Fatalf("backfill missing: turns=%d preview=%q", meta.Turns, meta.Preview) + if meta.Turns != 0 || meta.Preview != "" || meta.SchemaVersion != 0 { + t.Fatalf("listing mutated counts: %+v", meta) } if !meta.UpdatedAt.Equal(updated) { t.Fatalf("backfill bumped UpdatedAt: got %v want %v", meta.UpdatedAt, updated) @@ -142,10 +171,9 @@ func TestListSessionsTrustsRecordedEmptyWithoutDecoding(t *testing.T) { } } -// A genuinely-empty legacy session (no counts-aware meta) must be decoded once -// and then recorded as authoritative-empty, so later listings trust it instead -// of re-decoding the .jsonl on every refresh (the Turns == 0 overload bug). -func TestListSessionsRecordsEmptyLegacySessionOnce(t *testing.T) { +// A legacy artifact that might be empty is shown as unknown until the catalog +// repair worker validates it; listing cannot know without decoding. +func TestListSessionsShowsPotentiallyEmptyLegacySessionAsUnknown(t *testing.T) { dir := t.TempDir() path := filepath.Join(dir, "20260101-000000-deepseek-chat.jsonl") writeSessionFile(t, path, []provider.Message{ @@ -157,20 +185,16 @@ func TestListSessionsRecordsEmptyLegacySessionOnce(t *testing.T) { if err != nil { t.Fatalf("ListSessions: %v", err) } - if len(infos) != 0 { - t.Fatalf("empty session must not be listed; got %d", len(infos)) + if len(infos) != 1 || infos[0].CountsKnown { + t.Fatalf("legacy session should be visible as unknown; got %+v", infos) } - meta, ok, err := LoadBranchMeta(path) - if err != nil || !ok { - t.Fatalf("empty session should have been stamped: ok=%v err=%v", ok, err) - } - if meta.SchemaVersion != BranchMetaCountsVersion || meta.Turns != 0 { - t.Fatalf("empty session not recorded as authoritative-empty: version=%d turns=%d", meta.SchemaVersion, meta.Turns) + if _, ok, err := LoadBranchMeta(path); err != nil || ok { + t.Fatalf("listing unexpectedly created metadata: ok=%v err=%v", ok, err) } } -func TestListSessionsRepairsPreviouslyCachedZeroWhenReadable(t *testing.T) { +func TestListSessionsDefersPreviouslyCachedZeroRepair(t *testing.T) { dir := t.TempDir() path := filepath.Join(dir, "20260101-000000-deepseek-chat.jsonl") writeSessionFile(t, path, []provider.Message{ @@ -189,19 +213,19 @@ func TestListSessionsRepairsPreviouslyCachedZeroWhenReadable(t *testing.T) { if err != nil { t.Fatalf("ListSessions: %v", err) } - if len(infos) != 1 || infos[0].Turns != 1 || infos[0].Preview != "recovered question" { - t.Fatalf("recovered session was not restored to the listing: %+v", infos) + if len(infos) != 1 || infos[0].Turns != 0 || infos[0].CountsKnown || !strings.Contains(infos[0].Preview, "being indexed") { + t.Fatalf("legacy zero was not exposed as unknown: %+v", infos) } meta, ok, err := LoadBranchMeta(path) if err != nil || !ok { t.Fatalf("LoadBranchMeta: ok=%v err=%v", ok, err) } - if meta.SchemaVersion != BranchMetaCountsVersion || meta.Turns != 1 || meta.Preview != "recovered question" { - t.Fatalf("recovered listing metadata was not repaired: %+v", meta) + if meta.SchemaVersion != branchMetaCountsInitialVersion || meta.Turns != 0 || meta.Preview != "" { + t.Fatalf("listing unexpectedly repaired metadata: %+v", meta) } } -func TestListSessionsValidatesOldRecordedEmptyOnce(t *testing.T) { +func TestListSessionsDefersOldRecordedEmptyValidation(t *testing.T) { dir := t.TempDir() path := filepath.Join(dir, "20260101-000000-deepseek-chat.jsonl") writeSessionFile(t, path, []provider.Message{ @@ -220,15 +244,15 @@ func TestListSessionsValidatesOldRecordedEmptyOnce(t *testing.T) { if err != nil { t.Fatalf("ListSessions (migration): %v", err) } - if len(infos) != 0 { - t.Fatalf("validated empty session must stay hidden; got %+v", infos) + if len(infos) != 1 || infos[0].CountsKnown { + t.Fatalf("old zero should remain visible as unknown; got %+v", infos) } meta, ok, err := LoadBranchMeta(path) if err != nil || !ok { t.Fatalf("LoadBranchMeta: ok=%v err=%v", ok, err) } - if meta.SchemaVersion != BranchMetaCountsVersion || meta.Turns != 0 { - t.Fatalf("empty session was not stamped as validated: %+v", meta) + if meta.SchemaVersion != branchMetaCountsInitialVersion || meta.Turns != 0 { + t.Fatalf("listing changed old zero metadata: %+v", meta) } // Current-version zero counts are authoritative. Making the artifact invalid @@ -240,8 +264,8 @@ func TestListSessionsValidatesOldRecordedEmptyOnce(t *testing.T) { if err != nil { t.Fatalf("ListSessions (steady state): %v", err) } - if len(infos) != 0 { - t.Fatalf("validated empty session was unexpectedly re-probed: %+v", infos) + if len(infos) != 1 || infos[0].CountsKnown { + t.Fatalf("unknown session should stay visible without re-probe: %+v", infos) } } @@ -276,7 +300,7 @@ func TestListSessionsKeepsUnreadableNonEmptySessionsVisible(t *testing.T) { if len(infos) != 1 { t.Fatalf("unreadable non-empty session must remain visible; got %d entries", len(infos)) } - if infos[0].Turns != 0 || !strings.Contains(infos[0].Preview, "may be corrupted") { + if infos[0].Turns != 0 || infos[0].CountsKnown || !strings.Contains(infos[0].Preview, "being indexed") { t.Fatalf("unexpected corrupt-session listing: %+v", infos[0]) } diff --git a/internal/agent/save.go b/internal/agent/save.go index c3cbe99a22..288c97ad36 100644 --- a/internal/agent/save.go +++ b/internal/agent/save.go @@ -192,42 +192,28 @@ type RecoveryBranchInfo struct { // the append-only event log is authoritative once present, while the .jsonl // checkpoint also serves as the random-read model for history paging. func (s *Session) Save(path string) error { - return s.save(path, sessionSaveSnapshot) + return s.saveObserved(path, sessionSaveSnapshot) } // SaveSnapshot writes a normal autosave/snapshot only when doing so cannot hide // a newer transcript already on disk. Explicit history rewrites such as rewind, // compaction, and cancel recovery should call SaveRewrite instead. func (s *Session) SaveSnapshot(path string) error { - return s.save(path, sessionSaveSnapshot) + return s.saveObserved(path, sessionSaveSnapshot) } // SaveRewrite writes an intentional non-append history rewrite only while this // Session still owns the current on-disk transcript baseline. It prevents a // stale controller from force-rewinding a newer transcript written elsewhere. func (s *Session) SaveRewrite(path string) error { - return s.save(path, sessionSaveRewrite) + return s.saveObserved(path, sessionSaveRewrite) } // SaveRewriteCompact performs a CAS-protected rewrite and folds the event log // to one replace record. It is for destructive maintenance such as redaction: // retaining old WAL records would keep the removed bytes recoverable on disk. func (s *Session) SaveRewriteCompact(path string) error { - return s.save(path, sessionSaveRewriteCompact) -} - -// SaveIfAbsent persists a newly imported or copied session without ever -// replacing a destination another runtime created after the caller's scan. -// The existence check and the full write share the same in-process and -// cross-process save locks, so migration cannot regress a newer destination -// during startup or an overlapping import. -func (s *Session) SaveIfAbsent(path string) error { - return s.withSessionSaveLocks(path, func() error { - if sessionArtifactExists(path) { - return os.ErrExist - } - return s.saveLocked(path, sessionSaveSnapshot) - }) + return s.saveObserved(path, sessionSaveRewriteCompact) } func (s *Session) save(path string, mode sessionSaveMode) error { @@ -367,10 +353,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) + s.markPersistedWithListing(path, digest, version, revision, rewriteVersion, msgs) return nil } - s.markPersisted(path, digest, version, decision.revision, rewriteVersion) + s.markPersistedWithListing(path, digest, version, decision.revision, rewriteVersion, msgs) return nil } if decision.appendOnly && probe.native && mode != sessionSaveRewriteCompact { @@ -420,7 +406,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) + s.markPersistedWithListing(path, digest, version, revision, rewriteVersion, msgs) return nil } baseRevision = decision.revision @@ -480,7 +466,7 @@ 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) + s.markPersistedWithListing(path, digest, version, revision, rewriteVersion, msgs) return nil } @@ -1592,6 +1578,7 @@ type SessionInfo struct { ModTime time.Time // compatibility alias for LastActivityAt Preview string Turns int + CountsKnown bool Scope string WorkspaceRoot string TopicID string @@ -2213,8 +2200,9 @@ func ListSessionOrder(dir string) ([]SessionOrderInfo, error) { // ListSessions returns every non-empty *.jsonl session under dir, // most-recently-active first, each with a preview line so the picker can show -// something the user recognises. A missing directory is not an error — it just -// means there's nothing to resume yet. +// something the user recognises. It never decodes a transcript: legacy counts +// remain explicitly unknown until the session catalog's single repair worker +// validates them. A missing directory is not an error. func ListSessions(dir string) ([]SessionInfo, error) { ordered, err := ListSessionOrder(dir) if err != nil { @@ -2223,32 +2211,22 @@ func ListSessions(dir string) ([]SessionInfo, error) { var out []SessionInfo for _, session := range ordered { preview, turns := session.Preview, session.Turns - var previewErr error if sessionListingCountsNeedRefresh(session.SchemaVersion, turns) { - // The sidecar's counts weren't recorded from content (a legacy session - // from before they were persisted), or an old zero may have swallowed a - // decode error. Decode once, then backfill + stamp the sidecar so every - // later listing is O(1) and a recovered session becomes visible again. - preview, turns, previewErr = previewSessionWithError(session.Path) - if previewErr == nil { - // Compare-and-apply under the metadata lock. A turn-end save may have - // advanced the transcript and its counts while this listing decoded; - // never overwrite that newer state with a stale backfill. - preview, turns, _ = updateSessionListingCountsIfCurrent(session, preview, turns) + if !sessionArtifactsHaveContent(session.Path) { + continue + } + if strings.TrimSpace(preview) == "" { + preview = "History is being indexed — " + filepath.Base(session.Path) } + out = append(out, sessionInfoFromOrder(session, preview, turns, false)) + continue } if turns == 0 { - hasData := sessionArtifactsHaveContent(session.Path) - if previewErr != nil && hasData { - preview = "Session may be corrupted — " + filepath.Base(session.Path) - out = append(out, sessionInfoFromOrder(session, preview, 0)) - continue - } // Never had user interaction — an empty conversation that should not // appear in the history panel or the resume picker. continue } - out = append(out, sessionInfoFromOrder(session, preview, turns)) + out = append(out, sessionInfoFromOrder(session, preview, turns, true)) } return out, nil } 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/agent/session.go b/internal/agent/session.go index dcdf31a4ae..f8fcc3c688 100644 --- a/internal/agent/session.go +++ b/internal/agent/session.go @@ -54,6 +54,10 @@ type Session struct { // cache-prefix change. DrainContentRewriteReasons (run_loop.go, once per // provider request) is the sole consumer. pendingContentReasons []string + // persistObserver receives non-blocking post-commit projection hints. It is + // deliberately session-local so multiple runtimes cannot steal each other's + // observer registration. + persistObserver SessionPersistObserver } // NewSession initializes a session with an optional system prompt. diff --git a/internal/agent/session_display_range.go b/internal/agent/session_display_range.go new file mode 100644 index 0000000000..ad72274368 --- /dev/null +++ b/internal/agent/session_display_range.go @@ -0,0 +1,52 @@ +package agent + +import ( + "encoding/json" + "fmt" + "io" + "os" + + "reasonix/internal/provider" + "reasonix/internal/store" +) + +// LoadSessionDisplayMessageRange decodes a bounded range through the display +// index. Callers must separately compare the index revision and digest with +// the authoritative content ledger before trusting it. +func LoadSessionDisplayMessageRange(path string, start, end int) ([]provider.Message, *SessionDisplayIndex, error) { + index, err := LoadSessionDisplayIndex(store.SessionDisplayIndex(path)) + if err != nil { + return nil, nil, err + } + if start < 0 || end < start || end > index.MessageCount { + return nil, index, fmt.Errorf("invalid display message range [%d,%d)", start, end) + } + f, err := os.Open(path) + if err != nil { + return nil, index, err + } + defer f.Close() + info, err := f.Stat() + if err != nil { + return nil, index, err + } + if info.Size() != index.TranscriptSize { + return nil, index, fmt.Errorf("display index transcript size changed") + } + out := make([]provider.Message, 0, end-start) + for _, entry := range index.Entries[start:end] { + line := make([]byte, entry.Length) + if _, err := f.ReadAt(line, entry.Offset); err != nil && err != io.EOF { + return nil, index, err + } + if len(line) == 0 || line[len(line)-1] != '\n' { + return nil, index, fmt.Errorf("display message %d is not newline terminated", entry.Index) + } + var message provider.Message + if err := json.Unmarshal(line[:len(line)-1], &message); err != nil { + return nil, index, fmt.Errorf("decode display message %d: %w", entry.Index, err) + } + out = append(out, message) + } + return out, index, nil +} diff --git a/internal/agent/session_listing_helpers.go b/internal/agent/session_listing_helpers.go index d97d9ed0c8..a2669c9134 100644 --- a/internal/agent/session_listing_helpers.go +++ b/internal/agent/session_listing_helpers.go @@ -2,7 +2,7 @@ package agent import "os" -func sessionInfoFromOrder(session SessionOrderInfo, preview string, turns int) SessionInfo { +func sessionInfoFromOrder(session SessionOrderInfo, preview string, turns int, countsKnown bool) SessionInfo { return SessionInfo{ Path: session.Path, CreatedAt: session.CreatedAt, @@ -10,6 +10,7 @@ func sessionInfoFromOrder(session SessionOrderInfo, preview string, turns int) S ModTime: session.ModTime, Preview: preview, Turns: turns, + CountsKnown: countsKnown, Scope: session.Scope, WorkspaceRoot: session.WorkspaceRoot, TopicID: session.TopicID, diff --git a/internal/agent/session_persist_observer.go b/internal/agent/session_persist_observer.go new file mode 100644 index 0000000000..bc6973ec25 --- /dev/null +++ b/internal/agent/session_persist_observer.go @@ -0,0 +1,82 @@ +package agent + +import ( + "os" + + "reasonix/internal/store" +) + +// SessionPersistEvent is emitted only after the authoritative transcript, +// event log, metadata ledger, and derived display read model have completed +// their save boundary. Observers must only enqueue work and return immediately. +type SessionPersistEvent struct { + Path string + Revision int64 + ContentDigest string + MessageCount int + AppendFrom int + Rewrite bool + Removed bool +} + +type SessionPersistObserver interface { + EnqueueSessionPersist(SessionPersistEvent) bool +} + +func (s *Session) SetPersistObserver(observer SessionPersistObserver) { + if s == nil { + return + } + s.mu.Lock() + s.persistObserver = observer + s.mu.Unlock() +} + +func (s *Session) notifyPersisted(path string, rewrite bool, appendFrom int) { + if s == nil { + return + } + s.mu.RLock() + observer := s.persistObserver + messageCount := len(s.Messages) + s.mu.RUnlock() + if observer == nil { + return + } + state, known := s.PersistedState(path) + event := SessionPersistEvent{Path: path, MessageCount: messageCount, AppendFrom: appendFrom, Rewrite: rewrite} + if known { + event.Revision = state.Revision + event.ContentDigest = state.DigestHex + } + observer.EnqueueSessionPersist(event) +} + +// SaveIfAbsent persists a newly imported or copied session without replacing a +// destination another runtime created after the caller's scan. +func (s *Session) SaveIfAbsent(path string) error { + err := s.withSessionSaveLocks(path, func() error { + if sessionArtifactExists(path) { + return os.ErrExist + } + return s.saveLocked(path, sessionSaveSnapshot) + }) + if err == nil { + s.notifyPersisted(path, false, -1) + } + return err +} + +func (s *Session) saveObserved(path string, mode sessionSaveMode) error { + appendFrom := -1 + if mode == sessionSaveSnapshot { + if index, err := LoadSessionDisplayIndex(store.SessionDisplayIndex(path)); err == nil { + appendFrom = index.MessageCount + } + } + err := s.save(path, mode) + if err == nil { + s.notifyPersisted(path, mode != sessionSaveSnapshot, appendFrom) + } + return err +} diff --git a/internal/boot/boot.go b/internal/boot/boot.go index d25054c47f..9f8a0c93d3 100644 --- a/internal/boot/boot.go +++ b/internal/boot/boot.go @@ -61,6 +61,7 @@ import ( "reasonix/internal/sessiontemp" "reasonix/internal/skill" "reasonix/internal/stats" + "reasonix/internal/taskmonitor" "reasonix/internal/tool" "reasonix/internal/tool/builtin" "reasonix/internal/tool/sessiontool" @@ -124,6 +125,7 @@ type Options struct { // StatsSource labels this frontend's usage records (desktop/cli/serve). // Empty disables usage recording for this controller. StatsSource string + TaskStore taskmonitor.WriteStore // Authoritative store, never a SQLite catalog. // OnConfigLoadWarnings accepts resilient-loader warnings. Returning true // lets boot suppress the duplicate migration diagnostic. OnConfigLoadWarnings func([]string) bool @@ -1167,7 +1169,7 @@ func build(ctx context.Context, opts Options) (*BuildResult, error) { reg.Add(sessiontool.NewReadSessionTool(sessionDir)) return "enabled list_sessions, read_session." } - reg.Add(history.NewTool(history.Options{SessionDir: sessionDir, GlobalSessionDir: config.SessionDir(), ArchiveDir: config.ArchiveDir()})) + reg.Add(history.NewIndexedTool(history.Options{SessionDir: sessionDir, GlobalSessionDir: config.SessionDir(), ArchiveDir: config.ArchiveDir()})) reg.Add(sessiontool.NewListSessionsTool(sessionDir)) reg.Add(sessiontool.NewReadSessionTool(sessionDir)) return "enabled history, list_sessions, read_session." @@ -1825,7 +1827,7 @@ func build(ctx context.Context, opts Options) (*BuildResult, error) { return missing }) - execSess := agent.NewSession(sysPrompt) + execSess := newObservedSession(sysPrompt) executor := agent.New(execProv, reg, execSess, agent.Options{ MaxSteps: maxSteps, MaxStepsKey: opts.MaxStepsKey, @@ -1954,6 +1956,7 @@ func build(ctx context.Context, opts Options) (*BuildResult, error) { BalanceKey: entry.APIKey(), BalanceClient: balanceClient, Jobs: jm, + TaskStore: opts.TaskStore, WorkspaceLease: workspaceLease, Registry: reg, PluginCtx: ctx, diff --git a/internal/boot/boot_test.go b/internal/boot/boot_test.go index b44f5f8097..c80014a117 100644 --- a/internal/boot/boot_test.go +++ b/internal/boot/boot_test.go @@ -170,6 +170,7 @@ func TestBuildRunsCleanupPendingDespiteSafeModeEnv(t *testing.T) { func TestBuildRegistersUsableHistoryAndMemoryRetrievalTools(t *testing.T) { isolateConfigHome(t) + historyIndexReady := bootTestHistoryIndexReady(t) dir := robustTempDir(t) t.Chdir(dir) @@ -221,6 +222,7 @@ model = "x" t.Fatalf("Build: %v", err) } defer ctrl.Close() + waitForBootTestHistoryIndex(t, historyIndexReady) sys := systemMessage(ctrl.History()) for _, forbidden := range []string{ @@ -4471,23 +4473,6 @@ func TestBuildSkipsLegacySessionMigrationWhenIsolated(t *testing.T) { } } -// isolateConfigHome redirects os.UserConfigDir() (and the cache subtree under -// it) at a per-test temp dir by overriding the env vars Go's stdlib reads on -// macOS, Linux, and Windows. Without this, Build's config, plugin stats, and -// cached schemas can bleed across tests. Mirrors the withTempCache helper in -// internal/plugin/stats_test.go. -func isolateConfigHome(t *testing.T) string { - t.Helper() - dir := robustTempDir(t) - t.Setenv("HOME", dir) - t.Setenv("USERPROFILE", dir) - t.Setenv("XDG_CONFIG_HOME", dir) - t.Setenv("AppData", filepath.Join(dir, "AppData")) - t.Setenv("LocalAppData", filepath.Join(dir, "LocalAppData")) - t.Setenv("REASONIX_CREDENTIALS_STORE", "file") - return dir -} - // TestPartitionByTier pins the bucket assignment contract that the rest of // boot.go's plugin orchestration depends on: eager keeps its blocking startup // slice, while empty, background, legacy lazy, and unknown tiers all warm up in diff --git a/internal/boot/config_home_test.go b/internal/boot/config_home_test.go new file mode 100644 index 0000000000..0687fd5faf --- /dev/null +++ b/internal/boot/config_home_test.go @@ -0,0 +1,69 @@ +package boot + +import ( + "context" + "path/filepath" + "sync" + "testing" + "time" + + "reasonix/internal/history" + "reasonix/internal/historycatalog" +) + +// isolateConfigHome redirects user config and cache paths to a per-test temp +// directory. The history projection is process-global, so it must be closed on +// both sides of the environment change instead of retaining a deleted cache +// path across repeated tests. +func isolateConfigHome(t *testing.T) string { + t.Helper() + closeBootTestHistoryCatalog(t) + dir := robustTempDir(t) + t.Setenv("HOME", dir) + t.Setenv("USERPROFILE", dir) + t.Setenv("XDG_CONFIG_HOME", dir) + t.Setenv("AppData", filepath.Join(dir, "AppData")) + t.Setenv("LocalAppData", filepath.Join(dir, "LocalAppData")) + t.Setenv("REASONIX_CREDENTIALS_STORE", "file") + t.Cleanup(func() { closeBootTestHistoryCatalog(t) }) + return dir +} + +func closeBootTestHistoryCatalog(t *testing.T) { + t.Helper() + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + defer cancel() + if err := history.CloseSharedCatalog(ctx); err != nil { + t.Fatalf("close shared history catalog: %v", err) + } +} + +// fenceBootTestHistoryCatalog releases a process-global projection inherited +// from an earlier test and closes the replacement before t.TempDir cleanup. +// Windows cannot remove a temporary REASONIX_HOME while SQLite still owns it. +func fenceBootTestHistoryCatalog(t *testing.T) { + t.Helper() + closeBootTestHistoryCatalog(t) + t.Cleanup(func() { closeBootTestHistoryCatalog(t) }) +} + +func bootTestHistoryIndexReady(t *testing.T) <-chan struct{} { + t.Helper() + ready := make(chan struct{}) + var once sync.Once + history.RegisterCatalogObserver(func(status historycatalog.Status, _ []string, _ string) { + if status.Indexed > 0 { + once.Do(func() { close(ready) }) + } + }) + return ready +} + +func waitForBootTestHistoryIndex(t *testing.T, ready <-chan struct{}) { + t.Helper() + select { + case <-ready: + case <-time.After(30 * time.Second): + t.Fatal("timed out waiting for history catalog to index the saved fixture") + } +} diff --git a/internal/boot/effect_test.go b/internal/boot/effect_test.go index b135d70cb1..2305ae21aa 100644 --- a/internal/boot/effect_test.go +++ b/internal/boot/effect_test.go @@ -9,8 +9,10 @@ import ( "fmt" "sync" "testing" + "time" "reasonix/internal/ablation" + "reasonix/internal/agent" "reasonix/internal/event" "reasonix/internal/provider" ) @@ -190,12 +192,16 @@ model = "x" } defer ctrl.Close() - _ = ctrl.Run(context.Background(), "read every file you can find") + runCtx, cancel := context.WithTimeout(context.Background(), 2*time.Second) + defer cancel() + runErr := ctrl.Run(runCtx, "read every file you can find") // Ordinary chat has no round ceiling, so a gate that never reached the - // executor would leave this provider looping until the test times out. - if got := rec.roundCount(); got > 50 { - t.Fatalf("provider saw %d rounds; the configured spend budget never reached the executor", got) + // executor would run until the context deadline. Assert the typed boundary + // instead of a machine-speed-dependent round count. + pause, ok := agent.InspectRunPause(runErr) + if !ok || pause.Kind != "task_budget" || pause.Key != "time" { + t.Fatalf("Run error = %v (pause=%+v, ok=%v), want time task-budget pause", runErr, pause, ok) } if rec.roundCount() == 0 { t.Fatal("no round reached the provider; the run never started") diff --git a/internal/boot/extension_sidecar_test.go b/internal/boot/extension_sidecar_test.go index 73d9309caf..ecf7d1732a 100644 --- a/internal/boot/extension_sidecar_test.go +++ b/internal/boot/extension_sidecar_test.go @@ -325,6 +325,38 @@ func bootWithFakePlugin(t *testing.T, name string, runtime map[string]any) *Buil return res } +func TestBootIsolatesIncompatibleExternalPlugin(t *testing.T) { + isolateConfigHome(t) + dir := robustTempDir(t) + t.Chdir(dir) + writeRuntimeFixture(t, dir) + + root := robustTempDir(t) + if err := os.WriteFile(filepath.Join(root, pluginpkg.NativeManifest), []byte(`{"name":"irmia-devkit","version":"1.0.0"}`), 0o644); err != nil { + t.Fatal(err) + } + home := config.ReasonixHomeDir() + if err := pluginpkg.Upsert(home, pluginpkg.InstalledPlugin{Name: "irmia-devkit", Root: root, Enabled: true}); err != nil { + t.Fatal(err) + } + + res, err := BuildRuntime(context.Background(), Options{}) + if err != nil { + t.Fatalf("incompatible plugin blocked core controller: %v", err) + } + t.Cleanup(res.Controller.Close) + if res.Controller == nil || res.Extensions != nil { + t.Fatalf("build result = %#v, want core controller without extensions", res) + } + state, err := pluginpkg.LoadState(home) + if err != nil { + t.Fatal(err) + } + if len(state.Plugins) != 1 || state.Plugins[0].Status != pluginpkg.PluginStatusDisabledIncompatible { + t.Fatalf("plugin state = %#v", state.Plugins) + } +} + func TestBootStartsExtensionSidecar(t *testing.T) { res := bootWithFakePlugin(t, "bootplugin", map[string]any{ "intercepts": []string{"input.receive"}, diff --git a/internal/boot/model_error_test.go b/internal/boot/model_error_test.go index 0f34007a3a..9f2e1e9eb6 100644 --- a/internal/boot/model_error_test.go +++ b/internal/boot/model_error_test.go @@ -21,6 +21,7 @@ import ( func TestBuildUnknownModelErrorIsActionable(t *testing.T) { t.Setenv("REASONIX_HOME", t.TempDir()) dir := robustTempDir(t) + fenceBootTestHistoryCatalog(t) t.Chdir(dir) writeFile(t, dir, "reasonix.toml", ` default_model = "legacy-missing" @@ -60,6 +61,7 @@ api_key_env = "REASONIX_TEST_KEY_UNSET" `) dir := robustTempDir(t) + fenceBootTestHistoryCatalog(t) t.Chdir(dir) writeFile(t, dir, "reasonix.toml", ` default_model = "deepseek-flash" @@ -91,6 +93,7 @@ default_model = "deepseek-flash" func TestBuildMigratesLegacyBareMimoModelOverride(t *testing.T) { dir := robustTempDir(t) + fenceBootTestHistoryCatalog(t) t.Chdir(dir) writeFile(t, dir, "reasonix.toml", ` default_model = "deepseek-flash" @@ -119,6 +122,7 @@ api_key_env = "REASONIX_TEST_KEY_UNSET" func TestBuildNoticesMissingAPIKey(t *testing.T) { const keyEnv = "REASONIX_MISSING_KEY_FOR_TEST" dir := robustTempDir(t) + fenceBootTestHistoryCatalog(t) t.Chdir(dir) writeFile(t, dir, "reasonix.toml", ` default_model = "x" @@ -158,6 +162,7 @@ api_key_env = "`+keyEnv+`" func TestBuildDoesNotNoticeMissingAPIKeyForNoAuthLoopback(t *testing.T) { const keyEnv = "REASONIX_LOCAL_GATEWAY_KEY_FOR_TEST" dir := robustTempDir(t) + fenceBootTestHistoryCatalog(t) t.Chdir(dir) t.Setenv(keyEnv, "") writeFile(t, dir, "reasonix.toml", ` @@ -209,6 +214,7 @@ func TestBuildKeylessDefaultFallsBackToConfiguredProvider(t *testing.T) { } dir := robustTempDir(t) + fenceBootTestHistoryCatalog(t) t.Chdir(dir) writeFile(t, dir, "reasonix.toml", ` default_model = "deepseek/deepseek-v4-flash" @@ -261,6 +267,7 @@ func TestBuildExplicitKeylessModelStillFails(t *testing.T) { } dir := robustTempDir(t) + fenceBootTestHistoryCatalog(t) t.Chdir(dir) writeFile(t, dir, "reasonix.toml", ` default_model = "minimax/MiniMax-M3" diff --git a/internal/boot/session_observer.go b/internal/boot/session_observer.go new file mode 100644 index 0000000000..658126bcde --- /dev/null +++ b/internal/boot/session_observer.go @@ -0,0 +1,12 @@ +package boot + +import ( + "reasonix/internal/agent" + "reasonix/internal/history" +) + +func newObservedSession(systemPrompt string) *agent.Session { + session := agent.NewSession(systemPrompt) + session.SetPersistObserver(history.PersistObserver()) + return session +} diff --git a/internal/boot/session_temp_rebuild_test.go b/internal/boot/session_temp_rebuild_test.go index e7be0c9751..50c9437ba9 100644 --- a/internal/boot/session_temp_rebuild_test.go +++ b/internal/boot/session_temp_rebuild_test.go @@ -20,6 +20,7 @@ func TestRebuildReusesSessionTempManager(t *testing.T) { t.Setenv("XDG_DATA_HOME", filepath.Join(home, "data")) workspace := t.TempDir() + fenceBootTestHistoryCatalog(t) m := sessiontemp.New() old := control.New(control.Options{ SessionTemp: m, diff --git a/internal/cli/catalogs.go b/internal/cli/catalogs.go new file mode 100644 index 0000000000..87752900c7 --- /dev/null +++ b/internal/cli/catalogs.go @@ -0,0 +1,108 @@ +package cli + +import ( + "context" + "encoding/json" + "flag" + "fmt" + "os" + "time" + + "reasonix/internal/projectiondb" + "reasonix/internal/sessioncatalog" +) + +type catalogInspection struct { + Name string `json:"name"` + Info projectiondb.Inspection `json:"info"` +} + +type catalogCommand struct { + name string + path func() string + reindex func([]string) int + completionFlags []cliCompletionFlag +} + +var catalogCommands []catalogCommand + +func registerCatalogCommand(command catalogCommand) { + catalogCommands = append(catalogCommands, command) +} + +func runSessionOrCatalogCommand(command string, args []string) int { + configureCLIThemeFromConfig() + if command != "catalogs" { + return sessionOrSessionsCommand(command, args) + } + return catalogsCommand(args) +} + +func doctorCatalogsCommand(args []string) int { + fs := flag.NewFlagSet("doctor catalogs", flag.ContinueOnError) + jsonOut := fs.Bool("json", false, "print catalog diagnostics as JSON") + if code, ok := parseCommandFlags(fs, args); !ok { + return code + } + if fs.NArg() != 0 { + fmt.Fprintln(os.Stderr, "usage: reasonix doctor catalogs [--json]") + return 2 + } + ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) + defer cancel() + items := []catalogInspection{ + {Name: "sessions", Info: projectiondb.Inspect(ctx, sessioncatalog.DefaultPath())}, + } + for _, command := range catalogCommands { + items = append(items, catalogInspection{Name: command.name, Info: projectiondb.Inspect(ctx, command.path())}) + } + if *jsonOut { + enc := json.NewEncoder(os.Stdout) + enc.SetIndent("", " ") + if err := enc.Encode(items); err != nil { + fmt.Fprintln(os.Stderr, err) + return 1 + } + return 0 + } + fmt.Println("Reasonix disposable catalogs") + for _, item := range items { + state := "missing" + if item.Info.Exists && item.Info.Error == "" { + state = item.Info.Integrity + } else if item.Info.Error != "" { + state = "error: " + item.Info.Error + } + fmt.Printf(" %-8s %-12s schema=%d size=%d path=%s\n", item.Name, state, item.Info.Schema, item.Info.Size, item.Info.Path) + } + return 0 +} + +func catalogsCommand(args []string) int { + if len(args) < 2 || args[0] != "reindex" { + fmt.Fprintln(os.Stderr, "usage: reasonix catalogs reindex [options]") + return 2 + } + for _, command := range catalogCommands { + if args[1] == command.name { + return command.reindex(args[2:]) + } + } + fmt.Fprintln(os.Stderr, "unknown catalog:", args[1]) + return 2 +} + +func printCatalogStatus(status any, jsonOut bool) int { + if jsonOut { + enc := json.NewEncoder(os.Stdout) + enc.SetIndent("", " ") + if err := enc.Encode(status); err != nil { + fmt.Fprintln(os.Stderr, err) + return 1 + } + return 0 + } + b, _ := json.Marshal(status) + fmt.Println(string(b)) + return 0 +} diff --git a/internal/cli/catalogs_history.go b/internal/cli/catalogs_history.go new file mode 100644 index 0000000000..192c334794 --- /dev/null +++ b/internal/cli/catalogs_history.go @@ -0,0 +1,51 @@ +package cli + +import ( + "context" + "flag" + "fmt" + "os" + "path/filepath" + + "reasonix/internal/config" + "reasonix/internal/historycatalog" +) + +func init() { + registerCatalogCommand(catalogCommand{ + name: "history", path: historycatalog.DefaultPath, reindex: reindexHistoryCatalog, + completionFlags: []cliCompletionFlag{ + completionFlag("--json", cliCompletionNoValue), + completionFlag("--dir", cliCompletionPathValue), + }, + }) +} + +func reindexHistoryCatalog(args []string) int { + fs := flag.NewFlagSet("catalogs reindex history", flag.ContinueOnError) + var dirs stringListFlag + jsonOut := fs.Bool("json", false, "print status as JSON") + fs.Var(&dirs, "dir", "session directory to index; repeat for multiple directories") + if code, ok := parseCommandFlags(fs, args); !ok { + return code + } + ctx := context.Background() + roots := []historycatalog.Root{} + if len(dirs) > 0 { + for _, dir := range dirs { + roots = append(roots, historycatalog.Root{Path: filepath.Clean(dir), Source: "global", Scope: "global"}) + } + } else { + for _, target := range defaultSessionCatalogTargets() { + roots = append(roots, historycatalog.Root{Path: target.Path, Source: target.Scope, Scope: target.Scope, WorkspaceRoot: target.WorkspaceRoot}) + roots = append(roots, historycatalog.Root{Path: filepath.Join(target.Path, "subagents"), Source: target.Scope, Scope: target.Scope, WorkspaceRoot: target.WorkspaceRoot, Subagents: true}) + } + roots = append(roots, historycatalog.Root{Path: config.ArchiveDir(), Source: "archive", Scope: "global", Archive: true}) + } + status, err := historycatalog.Rebuild(ctx, historycatalog.Options{}, roots) + if err != nil { + fmt.Fprintln(os.Stderr, "error:", err) + return 1 + } + return printCatalogStatus(status, *jsonOut) +} diff --git a/internal/cli/catalogs_tasks.go b/internal/cli/catalogs_tasks.go new file mode 100644 index 0000000000..ca552907ae --- /dev/null +++ b/internal/cli/catalogs_tasks.go @@ -0,0 +1,49 @@ +package cli + +import ( + "context" + "flag" + "fmt" + "os" + "path/filepath" + "strings" + + "reasonix/internal/taskcatalog" +) + +func init() { + registerCatalogCommand(catalogCommand{ + name: "tasks", path: taskcatalog.DefaultPath, reindex: reindexTaskCatalog, + completionFlags: []cliCompletionFlag{ + completionFlag("--json", cliCompletionNoValue), + completionFlag("--project", cliCompletionPathValue), + }, + }) +} + +func reindexTaskCatalog(args []string) int { + fs := flag.NewFlagSet("catalogs reindex tasks", flag.ContinueOnError) + var projects stringListFlag + jsonOut := fs.Bool("json", false, "print status as JSON") + fs.Var(&projects, "project", "project root to index; repeat for multiple projects") + if code, ok := parseCommandFlags(fs, args); !ok { + return code + } + if len(projects) == 0 { + for _, target := range defaultSessionCatalogTargets() { + if strings.TrimSpace(target.WorkspaceRoot) != "" { + projects = append(projects, target.WorkspaceRoot) + } + } + } + items := make([]taskcatalog.Project, 0, len(projects)) + for _, root := range projects { + items = append(items, taskcatalog.Project{Root: root, Label: filepath.Base(root)}) + } + status, err := taskcatalog.Rebuild(context.Background(), "", items) + if err != nil { + fmt.Fprintln(os.Stderr, "error:", err) + return 1 + } + return printCatalogStatus(status, *jsonOut) +} diff --git a/internal/cli/catalogs_usage.go b/internal/cli/catalogs_usage.go new file mode 100644 index 0000000000..2488949ab8 --- /dev/null +++ b/internal/cli/catalogs_usage.go @@ -0,0 +1,32 @@ +package cli + +import ( + "context" + "flag" + "fmt" + "os" + + "reasonix/internal/config" + "reasonix/internal/usagecatalog" +) + +func init() { + registerCatalogCommand(catalogCommand{ + name: "usage", path: usagecatalog.DefaultPath, reindex: reindexUsageCatalog, + completionFlags: []cliCompletionFlag{completionFlag("--json", cliCompletionNoValue)}, + }) +} + +func reindexUsageCatalog(args []string) int { + fs := flag.NewFlagSet("catalogs reindex usage", flag.ContinueOnError) + jsonOut := fs.Bool("json", false, "print status as JSON") + if code, ok := parseCommandFlags(fs, args); !ok { + return code + } + status, err := usagecatalog.Rebuild(context.Background(), "", config.StatsDir()) + if err != nil { + fmt.Fprintln(os.Stderr, "error:", err) + return 1 + } + return printCatalogStatus(status, *jsonOut) +} diff --git a/internal/cli/cli.go b/internal/cli/cli.go index 4ceea0a3ed..68589571d2 100644 --- a/internal/cli/cli.go +++ b/internal/cli/cli.go @@ -40,7 +40,6 @@ import ( "reasonix/internal/provider/openai" "reasonix/internal/serve" "reasonix/internal/sessiontemp" - "reasonix/internal/stats" "reasonix/internal/telemetry" tea "charm.land/bubbletea/v2" @@ -67,12 +66,9 @@ func RunWithBuildInfo(args []string, info BuildInfo) int { info = info.withDefaults() version := info.Version // Usage recording is asynchronous so provider/UI paths never wait on disk. - // Drain records accepted by this process before a normal CLI exit. - defer func() { - flushCtx, cancel := context.WithTimeout(context.Background(), 2*time.Second) - defer cancel() - _ = stats.Flush(flushCtx, config.StatsDir()) - }() + // Drain accepted records and fence the projection worker before returning. + // An embedded Run may outlive one invocation and remove its CacheDir. + defer closeCLIUsageCatalogs() // Pick the UI language up front so even pre-config paths (the first-run // welcome banner) come through localized. Env-only first; if a config // exists and pins a language, that wins. @@ -164,9 +160,8 @@ func RunWithBuildInfo(args []string, info BuildInfo) int { case "report": configureCLIThemeFromConfig() return reportCommand(rest) - case "session": - configureCLIThemeFromConfig() - return sessionCommand(rest) + case "session", "sessions", "catalogs": + return runSessionOrCatalogCommand(cmd, rest) case "hook", "hooks": configureCLIThemeFromConfig() return hookCommand(rest) @@ -485,6 +480,7 @@ func registerContinueFlag(fs *pflag.FlagSet) *bool { } func runAgent(args []string, version string) int { + defer closeCLIUsageCatalogs() fs := pflag.NewFlagSet("run", pflag.ContinueOnError) fs.SetInterspersed(true) model := fs.String("model", "", "provider name (default: config default_model)") diff --git a/internal/cli/doctor.go b/internal/cli/doctor.go index 337c2d2701..a0eb58e694 100644 --- a/internal/cli/doctor.go +++ b/internal/cli/doctor.go @@ -1,6 +1,7 @@ package cli import ( + "context" "encoding/json" "flag" "fmt" @@ -10,6 +11,7 @@ import ( "reasonix/internal/config" "reasonix/internal/doctor" "reasonix/internal/repair" + "reasonix/internal/sessioncatalog" ) func doctorBillingCommand(args []string) int { @@ -39,6 +41,12 @@ func doctorBillingCommand(args []string) int { } func doctorCommand(args []string, version string) int { + if len(args) > 0 && args[0] == "catalogs" { + return doctorCatalogsCommand(args[1:]) + } + if len(args) > 0 && args[0] == "sessions" { + return doctorSessionsCommand(args[1:]) + } if len(args) > 0 && args[0] == "quality" { return doctorQualityCommand(args[1:], version) } @@ -80,6 +88,42 @@ func doctorCommand(args []string, version string) int { return 0 } +func doctorSessionsCommand(args []string) int { + fs := flag.NewFlagSet("doctor sessions", flag.ContinueOnError) + jsonOut := fs.Bool("json", false, "print session catalog diagnostics as JSON") + if code, ok := parseCommandFlags(fs, args); !ok { + return code + } + if fs.NArg() != 0 { + fmt.Fprintln(os.Stderr, "usage: reasonix doctor sessions [--json]") + return 2 + } + status, err := sessioncatalog.Inspect(context.Background(), sessioncatalog.DefaultPath()) + if err != nil { + fmt.Fprintln(os.Stderr, "error:", err) + return 1 + } + if *jsonOut { + enc := json.NewEncoder(os.Stdout) + enc.SetIndent("", " ") + if err := enc.Encode(status); err != nil { + fmt.Fprintln(os.Stderr, err) + return 1 + } + return 0 + } + fmt.Println("Reasonix session catalog") + fmt.Printf(" state: %s\n", status.State) + fmt.Printf(" mode: %s\n", status.Mode) + fmt.Printf(" revision: %d\n", status.Revision) + fmt.Printf(" indexed: %d\n", status.Indexed) + fmt.Printf(" repair pending: %d\n", status.RepairPending) + if status.LastError != "" { + fmt.Printf(" note: %s\n", status.LastError) + } + return 0 +} + func doctorRepairCommand(args []string) int { fs := flag.NewFlagSet("doctor repair", flag.ContinueOnError) root := fs.String("root", ".", "project root to inspect") diff --git a/internal/cli/doctor_test.go b/internal/cli/doctor_test.go index 0b2affd32d..4fd814372a 100644 --- a/internal/cli/doctor_test.go +++ b/internal/cli/doctor_test.go @@ -5,8 +5,11 @@ import ( "io" "os" "path/filepath" + "strconv" "strings" "testing" + + "reasonix/internal/config" ) func TestDoctorCommandPrintsJSON(t *testing.T) { @@ -36,6 +39,78 @@ func TestRunDispatchesDoctor(t *testing.T) { } } +func TestDoctorSessionsIsReadOnly(t *testing.T) { + cache := t.TempDir() + t.Setenv("REASONIX_CACHE_HOME", cache) + out := captureStdout(t, func() { + if rc := doctorCommand([]string{"sessions", "--json"}, "test-version"); rc != 0 { + t.Fatalf("doctor sessions rc = %d, want 0", rc) + } + }) + var decoded map[string]any + if err := json.Unmarshal([]byte(out), &decoded); err != nil { + t.Fatalf("doctor sessions output: %v\n%s", err, out) + } + if _, err := os.Stat(filepath.Join(cache, "session-catalog", "v1.sqlite")); !os.IsNotExist(err) { + t.Fatalf("doctor sessions created or changed catalog: %v", err) + } +} + +func TestSessionsReindexRebuildsOnlyCatalog(t *testing.T) { + cache := t.TempDir() + home := t.TempDir() + sessions := filepath.Join(home, "sessions") + t.Setenv("REASONIX_CACHE_HOME", cache) + t.Setenv("REASONIX_HOME", home) + if err := os.MkdirAll(sessions, 0o755); err != nil { + t.Fatal(err) + } + path := filepath.Join(sessions, "keep.jsonl") + body := []byte(`{"role":"user","content":"keep me"}` + "\n") + if err := os.WriteFile(path, body, 0o600); err != nil { + t.Fatal(err) + } + out := captureStdout(t, func() { + if rc := sessionsCommand([]string{"reindex", "--dir", sessions, "--json"}); rc != 0 { + t.Fatalf("sessions reindex rc = %d, want 0", rc) + } + }) + if !json.Valid([]byte(out)) { + t.Fatalf("sessions reindex output is not JSON: %s", out) + } + got, err := os.ReadFile(path) + if err != nil || string(got) != string(body) { + t.Fatalf("authoritative transcript changed: err=%v got=%q", err, got) + } +} + +func TestDefaultSessionCatalogTargetsIncludeDesktopProjects(t *testing.T) { + home := t.TempDir() + t.Setenv("REASONIX_HOME", home) + projectRoot := filepath.Join(t.TempDir(), "project") + projects := `{"projects":[{"root":` + strconv.Quote(projectRoot) + `}]}` + if err := os.WriteFile(filepath.Join(home, "desktop-projects.json"), []byte(projects), 0o600); err != nil { + t.Fatal(err) + } + targets := defaultSessionCatalogTargets() + want := map[string]string{ + filepath.Clean(filepath.Join(home, "sessions")): "global", + filepath.Clean(config.ProjectSessionDir(filepath.Join(home, "global-workspace"))): "global", + filepath.Clean(config.ProjectSessionDir(projectRoot)): "project", + } + if len(targets) != len(want) { + t.Fatalf("targets = %#v, want %d entries", targets, len(want)) + } + for _, target := range targets { + if scope, ok := want[target.Path]; !ok || target.Scope != scope { + t.Fatalf("unexpected target %#v (want %#v)", target, want) + } + if target.Scope == "project" && target.WorkspaceRoot != projectRoot { + t.Fatalf("project target lost workspace root: %#v", target) + } + } +} + func TestDoctorSessionCommandWritesBundle(t *testing.T) { home := t.TempDir() t.Setenv("REASONIX_HOME", home) diff --git a/internal/cli/plugin.go b/internal/cli/plugin.go index 86fcaa9f4a..c47893ae87 100644 --- a/internal/cli/plugin.go +++ b/internal/cli/plugin.go @@ -204,6 +204,9 @@ func pluginListCommand() int { if p.Enabled { state = "enabled" } + if strings.TrimSpace(p.Status) != "" { + state = p.Status + } version := p.Version if version == "" { version = "-" diff --git a/internal/cli/sessions_catalog.go b/internal/cli/sessions_catalog.go new file mode 100644 index 0000000000..070ddbe6c4 --- /dev/null +++ b/internal/cli/sessions_catalog.go @@ -0,0 +1,116 @@ +package cli + +import ( + "context" + "encoding/json" + "flag" + "fmt" + "os" + "path/filepath" + "strings" + + "reasonix/internal/config" + "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]") + return 2 + } + fs := flag.NewFlagSet("sessions reindex", flag.ContinueOnError) + var dirs stringListFlag + jsonOut := fs.Bool("json", false, "print the rebuilt catalog status as JSON") + fs.Var(&dirs, "dir", "session directory to index; repeat for multiple directories") + if code, ok := parseCommandFlags(fs, args[1:]); !ok { + return code + } + if fs.NArg() != 0 { + fmt.Fprintln(os.Stderr, "usage: reasonix sessions reindex [--dir PATH] [--json]") + return 2 + } + if len(dirs) == 0 { + status, err := sessioncatalog.Rebuild(context.Background(), sessioncatalog.DefaultPath(), defaultSessionCatalogTargets()) + if err != nil { + fmt.Fprintln(os.Stderr, "error:", err) + return 1 + } + return printSessionCatalogRebuild(status, *jsonOut) + } + targets := make([]sessioncatalog.DirectoryTarget, 0, len(dirs)) + seen := map[string]bool{} + for _, dir := range dirs { + dir = filepath.Clean(strings.TrimSpace(dir)) + if dir == "." || dir == "" || seen[dir] { + continue + } + seen[dir] = true + targets = append(targets, sessioncatalog.DirectoryTarget{Path: dir, Scope: "global"}) + } + status, err := sessioncatalog.Rebuild(context.Background(), sessioncatalog.DefaultPath(), targets) + if err != nil { + fmt.Fprintln(os.Stderr, "error:", err) + return 1 + } + return printSessionCatalogRebuild(status, *jsonOut) +} + +func printSessionCatalogRebuild(status sessioncatalog.Status, jsonOut bool) int { + if jsonOut { + enc := json.NewEncoder(os.Stdout) + enc.SetIndent("", " ") + if err := enc.Encode(status); err != nil { + fmt.Fprintln(os.Stderr, err) + return 1 + } + return 0 + } + fmt.Printf("rebuilt session catalog: %d sessions, revision %d\n", status.Indexed, status.Revision) + return 0 +} + +func defaultSessionCatalogTargets() []sessioncatalog.DirectoryTarget { + type project struct { + Root string `json:"root"` + } + type projectFile struct { + Projects []project `json:"projects"` + } + home := config.ReasonixHomeDir() + var saved projectFile + if data, err := os.ReadFile(filepath.Join(home, "desktop-projects.json")); err == nil { + _ = json.Unmarshal(data, &saved) + } + seen := map[string]bool{} + targets := make([]sessioncatalog.DirectoryTarget, 0, len(saved.Projects)+2) + add := func(target sessioncatalog.DirectoryTarget) { + target.Path = filepath.Clean(strings.TrimSpace(target.Path)) + if target.Path == "." || target.Path == "" || seen[target.Path] { + return + } + seen[target.Path] = true + targets = append(targets, target) + } + add(sessioncatalog.DirectoryTarget{Path: config.SessionDir(), Scope: "global"}) + add(sessioncatalog.DirectoryTarget{ + Path: config.ProjectSessionDir(filepath.Join(home, "global-workspace")), + Scope: "global", + }) + for _, savedProject := range saved.Projects { + root := strings.TrimSpace(savedProject.Root) + if root == "" { + continue + } + add(sessioncatalog.DirectoryTarget{ + Path: config.ProjectSessionDir(root), Scope: "project", WorkspaceRoot: root, + }) + } + return targets +} diff --git a/internal/cli/shell_completion.go b/internal/cli/shell_completion.go index 8adc421697..6610af7f1d 100644 --- a/internal/cli/shell_completion.go +++ b/internal/cli/shell_completion.go @@ -46,6 +46,15 @@ func completionSpecWithAliases(name string, aliases []string, flags []cliComplet return cliCompletionSpec{name: name, aliases: aliases, flags: flags, subcommands: subcommands} } +func catalogCompletionSpec(help cliCompletionFlag) cliCompletionSpec { + reindex := make([]cliCompletionSpec, 0, len(catalogCommands)) + for _, command := range catalogCommands { + flags := append(slices.Clone(command.completionFlags), help) + reindex = append(reindex, completionSpec(command.name, flags)) + } + return completionSpec("catalogs", []cliCompletionFlag{help}, completionSpec("reindex", []cliCompletionFlag{help}, reindex...)) +} + func cliCompletionRootSpec() cliCompletionSpec { profile := completionFlag("--profile", cliCompletionStaticValue, "economy", "balanced", "delivery") model := completionFlag("--model", cliCompletionModelValue) @@ -89,7 +98,6 @@ func cliCompletionRootSpec() cliCompletionSpec { completionFlag("--ablate", cliCompletionStaticValue, "none", "all", "evidence", "planner", "subagent", "retrieval", "compaction"), help, } - root := cliCompletionSpec{name: "reasonix", flags: append([]cliCompletionFlag{ model, completionFlag("--max-steps", cliCompletionStaticValue), @@ -201,17 +209,13 @@ 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("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, }), ), + catalogCompletionSpec(help), completionSpec("report", []cliCompletionFlag{help}, completionSpec("list", []cliCompletionFlag{help}), completionSpec("show", []cliCompletionFlag{help}), @@ -285,6 +289,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/cli/usage_catalog_lifecycle.go b/internal/cli/usage_catalog_lifecycle.go new file mode 100644 index 0000000000..7eabe1d695 --- /dev/null +++ b/internal/cli/usage_catalog_lifecycle.go @@ -0,0 +1,16 @@ +package cli + +import ( + "context" + "time" + + "reasonix/internal/config" + "reasonix/internal/stats" +) + +func closeCLIUsageCatalogs() { + ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) + defer cancel() + _ = stats.Flush(ctx, config.StatsDir()) + _ = stats.CloseUsageCatalogs(ctx) +} diff --git a/internal/control/controller.go b/internal/control/controller.go index dbb2f3805d..2736e78350 100644 --- a/internal/control/controller.go +++ b/internal/control/controller.go @@ -471,6 +471,10 @@ type Options struct { BalanceClient *http.Client // Jobs is the session-scoped background-job manager (nil disables background jobs). Jobs *jobs.Manager + // TaskStore remains a FileStore-compatible authority. Desktop injects one + // observed instance so recorder and task-control APIs share post-commit + // projection hints; nil preserves the ordinary FileStore. + TaskStore taskmonitor.WriteStore // WorkspaceLease is the Delivery writer owner shared with the executor. WorkspaceLease *workspacelease.Owner // Registry is the executor's live tool set, and PluginCtx the session-scoped @@ -679,8 +683,12 @@ func New(opts Options) *Controller { // must never affect the agent pipeline. The session id is resolved lazily // because the session path is only fixed once the first turn begins. if c.jobs != nil && c.workspaceRoot != "" { + taskStore := opts.TaskStore + if taskStore == nil { + taskStore = taskmonitor.NewFileStore(filepath.Join(".reasonix", "tasks")) + } c.jobs.SetTaskRecorder(taskmonitor.NewTaskRecorder( - taskmonitor.NewFileStore(filepath.Join(".reasonix", "tasks")), + taskStore, c.workspaceRoot, func() string { return c.parentSessionID() }, )) diff --git a/internal/doctor/session_redact.go b/internal/doctor/session_redact.go index 55836b9a05..fcbff80174 100644 --- a/internal/doctor/session_redact.go +++ b/internal/doctor/session_redact.go @@ -49,6 +49,7 @@ func RedactSessions(opts RedactSessionsOptions) RedactSessionsResult { dirs := redactSessionDirs(opts.Dirs) res := RedactSessionsResult{Dirs: dirs, DryRun: opts.DryRun} for _, dir := range dirs { + var candidates []string if err := filepath.WalkDir(dir, func(path string, d os.DirEntry, err error) error { if err != nil { res.Errors = append(res.Errors, fmt.Sprintf("%s: %v", path, err)) @@ -60,26 +61,49 @@ func RedactSessions(opts RedactSessionsOptions) RedactSessionsResult { if d.IsDir() || !redactSessionCandidate(path) { return nil } + candidates = append(candidates, path) + return nil + }); err != nil { + res.Errors = append(res.Errors, fmt.Sprintf("%s: %v", dir, err)) + } + // A transcript rewrite now refreshes its listing projection. Process an + // existing branch-meta sidecar first so a secret-bearing sidecar is + // counted and redacted before the transcript replaces its preview. + sort.SliceStable(candidates, func(i, j int) bool { + left, right := redactionCandidatePriority(candidates[i]), redactionCandidatePriority(candidates[j]) + if left != right { + return left < right + } + return candidates[i] < candidates[j] + }) + for _, path := range candidates { res.FilesScanned++ if sessionPath := redactionSessionPath(path); sessionPath != "" && sessionRedactionLeaseHeld(sessionPath) { res.FilesSkipped++ - return nil + continue } changed, rewritten, err := redactSessionArtifact(path, opts.DryRun) if err != nil { res.Errors = append(res.Errors, fmt.Sprintf("%s: %v", path, err)) - return nil + continue } res.FilesChanged += changed res.BytesRewritten += rewritten - return nil - }); err != nil { - res.Errors = append(res.Errors, fmt.Sprintf("%s: %v", dir, err)) } } return res } +func redactionCandidatePriority(path string) int { + if strings.HasSuffix(filepath.Base(path), ".jsonl.meta") { + return 0 + } + if store.IsSessionTranscriptName(filepath.Base(path)) { + return 1 + } + return 2 +} + func redactSessionDirs(in []string) []string { var candidates []string if len(in) > 0 { diff --git a/internal/history/indexed.go b/internal/history/indexed.go new file mode 100644 index 0000000000..2dd9521331 --- /dev/null +++ b/internal/history/indexed.go @@ -0,0 +1,380 @@ +package history + +import ( + "context" + "path/filepath" + "sort" + "strings" + "sync" + + "reasonix/internal/agent" + "reasonix/internal/historycatalog" + "reasonix/internal/provider" + "reasonix/internal/retrieval" +) + +type indexedCatalogManager struct { + lifecycleMu sync.Mutex + mu sync.RWMutex + catalog *historycatalog.Catalog + roots map[string]historycatalog.Root + observers []func(historycatalog.Status, []string, string) + generation uint64 + opening map[uint64]chan struct{} + openCancel map[uint64]context.CancelFunc + closing bool + open func(context.Context, historycatalog.Options) (*historycatalog.Catalog, error) + rebuild func(context.Context, historycatalog.Options, []historycatalog.Root) (historycatalog.Status, error) +} + +var processHistoryCatalog indexedCatalogManager + +// RegisterCatalogRoots lets a host such as Desktop seed every saved project +// without constructing a controller. Opening and scanning remain asynchronous. +func RegisterCatalogRoots(roots []historycatalog.Root) { processHistoryCatalog.register(roots) } + +// RegisterCatalogObserver subscribes a host to revision/progress changes. The +// callback payload contains roots and counters only, never query or content. +func RegisterCatalogObserver(observer func(historycatalog.Status, []string, string)) { + if observer == nil { + return + } + processHistoryCatalog.mu.Lock() + processHistoryCatalog.observers = append(processHistoryCatalog.observers, observer) + processHistoryCatalog.mu.Unlock() +} + +// SharedCatalog returns the process projection when opening has completed. +// Nil means callers should return an explicit partial/opening response. +func SharedCatalog() *historycatalog.Catalog { return processHistoryCatalog.get() } + +func FlushSharedCatalog(ctx context.Context) error { + if catalog := processHistoryCatalog.get(); catalog != nil { + return catalog.Flush(ctx) + } + return nil +} + +// CloseSharedCatalog cancels work and closes the process history catalog. +// Callers with time to persist queued projection work may invoke +// FlushSharedCatalog first. Close itself must not drain a potentially large +// backlog because JSONL remains authoritative and the projection is rebuilt. +func CloseSharedCatalog(ctx context.Context) error { + return processHistoryCatalog.close(ctx) +} + +func (m *indexedCatalogManager) register(roots []historycatalog.Root) { + m.mu.Lock() + if m.roots == nil { + m.roots = map[string]historycatalog.Root{} + } + for _, root := range roots { + if strings.TrimSpace(root.Path) != "" { + root.Path = filepath.Clean(root.Path) + m.roots[root.Path] = root + } + } + catalog := m.catalog + if catalog == nil { + m.startOpenLocked() + } + m.mu.Unlock() + if catalog != nil { + for _, root := range roots { + catalog.RegisterRoot(root) + } + } +} + +func (m *indexedCatalogManager) startOpenLocked() { + if m.catalog != nil || m.closing || len(m.opening) != 0 { + return + } + m.generation++ + generation := m.generation + if m.opening == nil { + m.opening = map[uint64]chan struct{}{} + m.openCancel = map[uint64]context.CancelFunc{} + } + ctx, cancel := context.WithCancel(context.Background()) + done := make(chan struct{}) + m.opening[generation] = done + m.openCancel[generation] = cancel + openCatalog := m.open + if openCatalog == nil { + openCatalog = historycatalog.Open + } + go m.openGeneration(ctx, generation, done, openCatalog) +} + +func (m *indexedCatalogManager) openGeneration(ctx context.Context, generation uint64, done chan struct{}, openCatalog func(context.Context, historycatalog.Options) (*historycatalog.Catalog, error)) { + catalog, err := openCatalog(ctx, historycatalog.Options{OnRevision: m.publish}) + if err == nil { + seen := map[string]bool{} + for { + m.mu.Lock() + if m.closing || generation != m.generation || ctx.Err() != nil { + m.mu.Unlock() + _ = catalog.Close(context.Background()) + catalog = nil + break + } + pending := make([]historycatalog.Root, 0, len(m.roots)) + for path, root := range m.roots { + if !seen[path] { + seen[path] = true + pending = append(pending, root) + } + } + if len(pending) == 0 { + m.catalog = catalog + m.mu.Unlock() + break + } + m.mu.Unlock() + for _, root := range pending { + catalog.RegisterRoot(root) + } + } + } + m.mu.Lock() + delete(m.opening, generation) + delete(m.openCancel, generation) + close(done) + m.mu.Unlock() +} + +func (m *indexedCatalogManager) close(ctx context.Context) error { + m.lifecycleMu.Lock() + defer m.lifecycleMu.Unlock() + m.mu.Lock() + m.closing = true + m.generation++ + catalog := m.catalog + m.catalog = nil + m.roots = nil + m.observers = nil + done := make([]chan struct{}, 0, len(m.opening)) + for generation, opening := range m.opening { + m.openCancel[generation]() + done = append(done, opening) + } + m.mu.Unlock() + + var closeErr error + if catalog != nil { + closeErr = catalog.Close(ctx) + } + for _, opening := range done { + select { + case <-opening: + case <-ctx.Done(): + if closeErr == nil { + closeErr = ctx.Err() + } + } + } + m.mu.Lock() + m.closing = false + m.mu.Unlock() + return closeErr +} + +func (m *indexedCatalogManager) publish(status historycatalog.Status, roots []string, reason string) { + m.mu.RLock() + observers := append([]func(historycatalog.Status, []string, string){}, m.observers...) + m.mu.RUnlock() + for _, observer := range observers { + observer(status, append([]string{}, roots...), reason) + } +} + +func (m *indexedCatalogManager) get() *historycatalog.Catalog { + m.mu.RLock() + defer m.mu.RUnlock() + return m.catalog +} + +// PersistObserver returns the process-wide non-blocking projection sink. The +// authoritative save has already released its path/file locks before this is +// called by agent.Session. +func PersistObserver() agent.SessionPersistObserver { return historyPersistObserver{} } + +type historyPersistObserver struct{} + +func (historyPersistObserver) EnqueueSessionPersist(event agent.SessionPersistEvent) bool { + catalog := processHistoryCatalog.get() + if catalog == nil { + return false + } + processHistoryCatalog.mu.RLock() + defer processHistoryCatalog.mu.RUnlock() + bestLength := -1 + var selected historycatalog.Root + for _, root := range processHistoryCatalog.roots { + if underRoot(event.Path, root.Path) && len(root.Path) > bestLength { + selected = root + bestLength = len(root.Path) + } + } + if bestLength < 0 { + return false + } + if event.Removed { + go func() { _ = catalog.Purge(context.Background(), event.Path) }() + return true + } + return catalog.EnqueuePersist(selected, event) +} + +type IndexedSearcher struct { + legacy *Searcher + roots []historycatalog.Root +} + +func NewIndexedSearcher(opts Options) *IndexedSearcher { + legacy := NewSearcher(opts) + roots := []historycatalog.Root{} + add := func(path, source, scope, workspace string, archive bool) { + if strings.TrimSpace(path) == "" { + return + } + roots = append(roots, historycatalog.Root{Path: path, Source: source, Scope: scope, WorkspaceRoot: workspace, Archive: archive}) + } + add(opts.SessionDir, scopeProject, scopeProject, opts.SessionDir, false) + add(subagentsDir(opts.SessionDir), scopeProject, scopeProject, opts.SessionDir, false) + if filepath.Clean(opts.GlobalSessionDir) != filepath.Clean(opts.SessionDir) { + add(opts.GlobalSessionDir, scopeGlobal, scopeGlobal, "", false) + add(subagentsDir(opts.GlobalSessionDir), scopeGlobal, scopeGlobal, "", false) + } + add(opts.ArchiveDir, "archive", scopeGlobal, "", true) + processHistoryCatalog.register(roots) + return &IndexedSearcher{legacy: legacy, roots: roots} +} + +func (s *IndexedSearcher) rootsFor(scope string) []string { + out := []string{} + for _, root := range s.roots { + if scope == scopeProject && root.Scope != scopeProject { + continue + } + out = append(out, root.Path) + } + return out +} + +func (s *IndexedSearcher) Search(ctx context.Context, req SearchRequest) ([]Hit, error) { + query := strings.TrimSpace(req.Query) + if query == "" { + return nil, contextError("query is required") + } + queryTerms, err := retrieval.QueryTerms(query) + if err != nil { + return nil, err + } + scope, err := normalizeScope(req.Scope) + if err != nil { + return nil, err + } + limit := clamp(req.Limit, defaultLimit, maxLimit) + kinds, err := normalizeKinds(req.Kinds) + if err != nil { + return nil, err + } + catalog := processHistoryCatalog.get() + if catalog == nil { + return []Hit{}, nil + } + kindNames := make([]string, 0, len(kinds)) + for kind := range kinds { + kindNames = append(kindNames, string(kind)) + } + sort.Strings(kindNames) + result, err := catalog.Search(ctx, historycatalog.SearchRequest{ + // Exact roots are the agent authority boundary. Catalog scope describes + // desktop grouping and must not change the history tool's project meaning. + Query: query, + Kinds: kindNames, ToolName: strings.TrimSpace(req.ToolName), Limit: min(limit*4, historycatalog.MaxLimit), + Roots: s.rootsFor(scope), + }) + if err != nil { + return nil, err + } + loaded := map[string][]provider.Message{} + failed := map[string]bool{} + hits := make([]Hit, 0, len(result.Items)) + for _, candidate := range result.Items { + if failed[candidate.SessionPath] { + continue + } + messages, ok := loaded[candidate.SessionPath] + if !ok { + state, known, identityErr := agent.SessionContentIdentity(candidate.SessionPath) + if identityErr != nil || (known && state.DigestHex != candidate.ContentDigest) { + failed[candidate.SessionPath] = true + catalog.EnqueueExisting(context.Background(), candidate.SessionPath) + continue + } + messages, err = loadMessages(candidate.SessionPath) + if err != nil { + failed[candidate.SessionPath] = true + continue + } + loaded[candidate.SessionPath] = messages + } + text, ok := candidateText(messages, candidate) + if !ok { + catalog.EnqueueExisting(context.Background(), candidate.SessionPath) + continue + } + hits = append(hits, Hit{Score: candidate.Score, SessionPath: candidate.SessionPath, + SessionID: sessionID(candidate.SessionPath), Source: candidate.Source, MessageIndex: candidate.MessageIndex, + Role: provider.Role(candidate.Role), Kind: Kind(candidate.Kind), ToolName: candidate.ToolName, + Snippet: retrieval.MakeSnippet(text, query, queryTerms, maxSnippet)}) + } + hits = retrieval.KeepTopRelativeScore(hits, scoreFloor, func(hit Hit) float64 { return hit.Score }) + if len(hits) > limit { + hits = hits[:limit] + } + return hits, nil +} + +func candidateText(messages []provider.Message, candidate historycatalog.Candidate) (string, bool) { + if candidate.MessageIndex < 0 || candidate.MessageIndex >= len(messages) { + return "", false + } + msg := messages[candidate.MessageIndex] + switch Kind(candidate.Kind) { + case KindUserText: + return stripComposePrefixes(msg.Content), msg.Role == provider.RoleUser + case KindAssistantText: + return msg.Content, msg.Role == provider.RoleAssistant + case KindToolInput: + if candidate.PartIndex < 0 || candidate.PartIndex >= len(msg.ToolCalls) { + return "", false + } + call := msg.ToolCalls[candidate.PartIndex] + return strings.TrimSpace(call.Name + " " + call.Arguments), true + case KindToolError, KindToolOutput: + return strings.TrimSpace(msg.Name + " " + msg.Content), msg.Role == provider.RoleTool + default: + return "", false + } +} + +func (s *IndexedSearcher) Around(ctx context.Context, req AroundRequest) ([]MessageContext, error) { + return s.legacy.Around(ctx, req) +} + +func (s *IndexedSearcher) IndexStatus() historycatalog.Status { + if catalog := processHistoryCatalog.get(); catalog != nil { + return catalog.Status() + } + return historycatalog.Status{State: "opening", Pending: 1} +} + +func contextError(message string) error { return &indexedInputError{message: message} } + +type indexedInputError struct{ message string } + +func (e *indexedInputError) Error() string { return e.message } diff --git a/internal/history/indexed_lifecycle_test.go b/internal/history/indexed_lifecycle_test.go new file mode 100644 index 0000000000..0512906355 --- /dev/null +++ b/internal/history/indexed_lifecycle_test.go @@ -0,0 +1,64 @@ +package history + +import ( + "context" + "testing" + "time" + + "reasonix/internal/historycatalog" +) + +func TestIndexedCatalogManagerCloseFencesOpenAndAllowsRestart(t *testing.T) { + manager := &indexedCatalogManager{} + started := make(chan struct{}) + release := make(chan struct{}) + manager.open = func(ctx context.Context, opts historycatalog.Options) (*historycatalog.Catalog, error) { + close(started) + <-release + opts.Path, opts.InMemory = "", true + return historycatalog.Open(ctx, opts) + } + manager.register([]historycatalog.Root{{Path: t.TempDir(), Scope: "global"}}) + <-started + + closed := make(chan error, 1) + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + defer cancel() + go func() { closed <- manager.close(ctx) }() + select { + case err := <-closed: + t.Fatalf("close returned before in-flight open exited: %v", err) + default: + } + close(release) + if err := <-closed; err != nil { + t.Fatalf("close after open fence: %v", err) + } + if catalog := manager.get(); catalog != nil { + t.Fatal("stale open published a catalog after close") + } + + manager.mu.Lock() + manager.open = func(ctx context.Context, opts historycatalog.Options) (*historycatalog.Catalog, error) { + opts.Path, opts.InMemory = "", true + return historycatalog.Open(ctx, opts) + } + manager.mu.Unlock() + manager.register([]historycatalog.Root{{Path: t.TempDir(), Scope: "global"}}) + manager.mu.RLock() + var reopened chan struct{} + for _, done := range manager.opening { + reopened = done + } + manager.mu.RUnlock() + if reopened == nil { + t.Fatal("manager did not start a new generation after close") + } + <-reopened + if catalog := manager.get(); catalog == nil { + t.Fatal("manager did not publish the restarted catalog") + } + if err := manager.close(ctx); err != nil { + t.Fatalf("close restarted catalog: %v", err) + } +} diff --git a/internal/history/indexed_rebuild.go b/internal/history/indexed_rebuild.go new file mode 100644 index 0000000000..6d03009c52 --- /dev/null +++ b/internal/history/indexed_rebuild.go @@ -0,0 +1,73 @@ +package history + +import ( + "context" + "path/filepath" + "strings" + + "reasonix/internal/historycatalog" +) + +// RebuildSharedCatalog closes the process-local reader, atomically replaces the +// disposable FTS database, and starts a fresh reader over the same roots. +func RebuildSharedCatalog(ctx context.Context, roots []historycatalog.Root) error { + return processHistoryCatalog.rebuildShared(ctx, roots) +} + +func (m *indexedCatalogManager) rebuildShared(ctx context.Context, roots []historycatalog.Root) error { + m.lifecycleMu.Lock() + defer m.lifecycleMu.Unlock() + m.mu.Lock() + if m.roots == nil { + m.roots = map[string]historycatalog.Root{} + } + for _, root := range roots { + if strings.TrimSpace(root.Path) != "" { + root.Path = filepath.Clean(root.Path) + m.roots[root.Path] = root + } + } + m.closing = true + m.generation++ + catalog := m.catalog + m.catalog = nil + done := make([]chan struct{}, 0, len(m.opening)) + for generation, opening := range m.opening { + m.openCancel[generation]() + done = append(done, opening) + } + registered := make([]historycatalog.Root, 0, len(m.roots)) + for _, root := range m.roots { + registered = append(registered, root) + } + rebuild := m.rebuild + if rebuild == nil { + rebuild = historycatalog.Rebuild + } + m.mu.Unlock() + + var lifecycleErr error + if catalog != nil { + _ = catalog.Flush(ctx) + lifecycleErr = catalog.Close(ctx) + } + for _, opening := range done { + select { + case <-opening: + case <-ctx.Done(): + if lifecycleErr == nil { + lifecycleErr = ctx.Err() + } + } + } + if lifecycleErr == nil { + _, lifecycleErr = rebuild(ctx, historycatalog.Options{}, registered) + } + m.mu.Lock() + m.closing = false + if ctx.Err() == nil { + m.startOpenLocked() + } + m.mu.Unlock() + return lifecycleErr +} diff --git a/internal/history/indexed_rebuild_test.go b/internal/history/indexed_rebuild_test.go new file mode 100644 index 0000000000..1206eafc25 --- /dev/null +++ b/internal/history/indexed_rebuild_test.go @@ -0,0 +1,54 @@ +package history + +import ( + "context" + "testing" + "time" + + "reasonix/internal/historycatalog" +) + +func TestIndexedCatalogManagerRebuildPreservesRootsAndRestarts(t *testing.T) { + manager := &indexedCatalogManager{} + manager.open = func(ctx context.Context, opts historycatalog.Options) (*historycatalog.Catalog, error) { + opts.Path, opts.InMemory = "", true + return historycatalog.Open(ctx, opts) + } + var rebuilt []historycatalog.Root + manager.rebuild = func(_ context.Context, _ historycatalog.Options, roots []historycatalog.Root) (historycatalog.Status, error) { + rebuilt = append([]historycatalog.Root{}, roots...) + return historycatalog.Status{}, nil + } + firstRoot := historycatalog.Root{Path: t.TempDir(), Scope: "global"} + secondRoot := historycatalog.Root{Path: t.TempDir(), Scope: "global"} + manager.register([]historycatalog.Root{firstRoot}) + waitManagerOpen(t, manager) + if err := manager.rebuildShared(context.Background(), []historycatalog.Root{secondRoot}); err != nil { + t.Fatal(err) + } + waitManagerOpen(t, manager) + if len(rebuilt) != 2 { + t.Fatalf("rebuilt roots = %#v, want both registered roots", rebuilt) + } + if manager.get() == nil { + t.Fatal("manager did not publish a fresh catalog after rebuild") + } + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + defer cancel() + if err := manager.close(ctx); err != nil { + t.Fatal(err) + } +} + +func waitManagerOpen(t *testing.T, manager *indexedCatalogManager) { + t.Helper() + manager.mu.RLock() + var done chan struct{} + for _, candidate := range manager.opening { + done = candidate + } + manager.mu.RUnlock() + if done != nil { + <-done + } +} diff --git a/internal/history/tool.go b/internal/history/tool.go index 8769f351a2..0870fa96f8 100644 --- a/internal/history/tool.go +++ b/internal/history/tool.go @@ -6,11 +6,17 @@ import ( "fmt" "strings" + "reasonix/internal/historycatalog" "reasonix/internal/tool" ) type historyTool struct { - searcher *Searcher + searcher historySearcher +} + +type historySearcher interface { + Search(context.Context, SearchRequest) ([]Hit, error) + Around(context.Context, AroundRequest) ([]MessageContext, error) } // NewTool returns a read-only history retrieval tool bound to local sessions. @@ -18,6 +24,13 @@ func NewTool(opts Options) tool.Tool { return historyTool{searcher: NewSearcher(opts)} } +// NewIndexedTool is the production history tool. It never performs a +// synchronous directory scan; while the shared projection is building it +// returns the already indexed subset and an explicit progress notice. +func NewIndexedTool(opts Options) tool.Tool { + return historyTool{searcher: NewIndexedSearcher(opts)} +} + func (historyTool) Name() string { return "history" } func (historyTool) Description() string { @@ -73,7 +86,14 @@ func (t historyTool) Execute(ctx context.Context, args json.RawMessage) (string, if err != nil { return "", err } - return formatHits(in.Query, hits), nil + formatted := formatHits(in.Query, hits) + if statusProvider, ok := t.searcher.(interface{ IndexStatus() historycatalog.Status }); ok { + status := statusProvider.IndexStatus() + if status.State != "ready" || status.Pending > 0 || (status.Total > 0 && status.Indexed < status.Total) { + formatted = fmt.Sprintf("History index is still building (%d/%d); results may be incomplete.\n\n%s", status.Indexed, status.Total, formatted) + } + } + return formatted, nil case "around": if in.MessageIndex == nil { return "", fmt.Errorf("message_index is required for operation=around") diff --git a/internal/historycatalog/benchmark_test.go b/internal/historycatalog/benchmark_test.go new file mode 100644 index 0000000000..62eca20300 --- /dev/null +++ b/internal/historycatalog/benchmark_test.go @@ -0,0 +1,45 @@ +package historycatalog + +import ( + "context" + "fmt" + "testing" +) + +func BenchmarkWarmSearchTenThousandSources(b *testing.B) { + ctx := context.Background() + catalog, err := Open(ctx, Options{InMemory: true}) + if err != nil { + b.Fatal(err) + } + b.Cleanup(func() { _ = catalog.Close(context.Background()) }) + tx, err := catalog.db.Begin() + if err != nil { + b.Fatal(err) + } + for i := range 10_000 { + path := fmt.Sprintf("/sessions/session-%05d.jsonl", i) + if _, err := tx.Exec(`INSERT INTO history_sources(path,root,source,scope,workspace_root,health) VALUES(?,?,?,?,?,'ok')`, + path, "/sessions", "global", "global", ""); err != nil { + b.Fatal(err) + } + result, err := tx.Exec(`INSERT INTO history_documents(source_path,message_index,part_index,role,kind,tool_name,token_count) + VALUES(?,0,0,'user','user_text','',3)`, path) + if err != nil { + b.Fatal(err) + } + rowID, _ := result.LastInsertId() + if _, err := tx.Exec(`INSERT INTO history_fts(rowid,terms) VALUES(?,?)`, rowID, fmt.Sprintf("shared marker item%d", i)); err != nil { + b.Fatal(err) + } + } + if err := tx.Commit(); err != nil { + b.Fatal(err) + } + b.ResetTimer() + for range b.N { + if _, err := catalog.Search(ctx, SearchRequest{Query: "shared marker", Roots: []string{"/sessions"}, Limit: 50}); err != nil { + b.Fatal(err) + } + } +} diff --git a/internal/historycatalog/catalog.go b/internal/historycatalog/catalog.go new file mode 100644 index 0000000000..66b06ed166 --- /dev/null +++ b/internal/historycatalog/catalog.go @@ -0,0 +1,779 @@ +package historycatalog + +import ( + "context" + "crypto/sha256" + "database/sql" + "encoding/hex" + "errors" + "fmt" + "os" + "path/filepath" + "runtime" + "sort" + "strings" + "sync" + "sync/atomic" + "time" + + "reasonix/internal/agent" + "reasonix/internal/projectiondb" + "reasonix/internal/retrieval" + "reasonix/internal/store" +) + +const defaultMissingGrace = 30 * time.Second + +type Catalog struct { + db *sql.DB + opts Options + revision atomic.Uint64 + statusMu sync.RWMutex + status Status + ctx context.Context + cancel context.CancelFunc + queue chan string + rootCh chan string + flushCh chan chan struct{} + mu sync.Mutex + paths map[string]queuedPath + roots map[string]Root + dirtyRoots map[string]bool + wg sync.WaitGroup + closeOnce sync.Once + closeDone chan struct{} + closeErr error +} + +type queuedPath struct { + root Root + appendFrom int +} + +func Open(ctx context.Context, opts Options) (*Catalog, error) { + if opts.Path == "" { + opts.Path = DefaultPath() + } + if strings.TrimSpace(opts.Path) == "" { + opts.Path = "" + opts.InMemory = true + } + if opts.Now == nil { + opts.Now = time.Now + } + if opts.QueueCapacity <= 0 { + opts.QueueCapacity = 1024 + } + if opts.MissingGrace <= 0 { + opts.MissingGrace = defaultMissingGrace + } + if opts.ReconcileInterval <= 0 { + // Periodic root rescans are fingerprint-cheap when nothing changed; keep + // the interval longer so large installs are not re-walked every minute. + opts.ReconcileInterval = 5 * time.Minute + } + handle, err := projectiondb.Open(ctx, projectiondb.OpenOptions{ + Path: opts.Path, MemoryName: "history-search", Migrations: migrations(), InMemory: opts.InMemory, + MaxOpenConns: 4, Now: opts.Now, SecureDelete: true, AutoVacuum: true, + }) + if err != nil { + return nil, err + } + workerCtx, cancel := context.WithCancel(context.Background()) + c := &Catalog{db: handle.DB, opts: opts, ctx: workerCtx, cancel: cancel, + queue: make(chan string, opts.QueueCapacity), rootCh: make(chan string, 64), + flushCh: make(chan chan struct{}, 1), + paths: map[string]queuedPath{}, roots: map[string]Root{}, dirtyRoots: map[string]bool{}, + closeDone: make(chan struct{}), + status: Status{State: string(handle.Status.State), Mode: handle.Status.Mode, Path: handle.Status.Path, + LastError: handle.Status.LastError, QuarantinedPath: handle.Status.QuarantinedPath}} + if err := c.db.QueryRowContext(ctx, `SELECT revision FROM history_state WHERE id=1`).Scan(new(uint64)); err != nil { + _ = c.db.Close() + cancel() + return nil, err + } + if err := c.ensureTokenizerVersion(ctx); err != nil { + _ = c.db.Close() + cancel() + return nil, err + } + var revision uint64 + _ = c.db.QueryRowContext(ctx, `SELECT revision FROM history_state WHERE id=1`).Scan(&revision) + c.revision.Store(revision) + c.refreshStatus(ctx) + c.wg.Add(1) + go c.worker() + return c, nil +} + +func (c *Catalog) ensureTokenizerVersion(ctx context.Context) error { + var version int + if err := c.db.QueryRowContext(ctx, `SELECT tokenizer_version FROM history_state WHERE id=1`).Scan(&version); err != nil { + return err + } + if version == TokenizerVersion { + return nil + } + tx, err := c.db.BeginTx(ctx, nil) + if err != nil { + return err + } + for _, statement := range []string{`DELETE FROM history_fts`, `DELETE FROM history_documents`, + `DELETE FROM history_sources`, `DELETE FROM history_roots`} { + if _, err := tx.ExecContext(ctx, statement); err != nil { + _ = tx.Rollback() + return err + } + } + if _, err := tx.ExecContext(ctx, `UPDATE history_state SET tokenizer_version=?,revision=revision+1 WHERE id=1`, TokenizerVersion); err != nil { + _ = tx.Rollback() + return err + } + return tx.Commit() +} + +func (c *Catalog) RegisterRoot(root Root) bool { + if c == nil || strings.TrimSpace(root.Path) == "" { + return false + } + root.Path = filepath.Clean(root.Path) + if root.Scope != "project" { + root.Scope = "global" + root.WorkspaceRoot = "" + } + c.mu.Lock() + _, alreadyRegistered := c.roots[root.Path] + c.roots[root.Path] = root + c.mu.Unlock() + if !alreadyRegistered { + c.statusMu.Lock() + c.status.Pending++ + c.statusMu.Unlock() + } + select { + case c.rootCh <- root.Path: + return true + default: + c.markRootDirty(root.Path) + return false + } +} + +// ReconcileRoot performs one deterministic scan. Production callers normally +// use RegisterRoot; the synchronous form exists for doctor/reindex and tests. +func (c *Catalog) ReconcileRoot(ctx context.Context, root Root) error { + root.Path = filepath.Clean(root.Path) + if root.Scope != "project" { + root.Scope = "global" + root.WorkspaceRoot = "" + } + return c.reconcileRoot(ctx, root) +} + +func (c *Catalog) EnqueuePath(root Root, path string) bool { + return c.enqueuePath(root, path, -1) +} + +func (c *Catalog) EnqueuePersist(root Root, event agent.SessionPersistEvent) bool { + appendFrom := event.AppendFrom + if event.Rewrite { + appendFrom = -1 + } + return c.enqueuePath(root, event.Path, appendFrom) +} + +func (c *Catalog) enqueuePath(root Root, path string, appendFrom int) bool { + if c == nil || strings.TrimSpace(path) == "" { + return false + } + path = filepath.Clean(path) + c.mu.Lock() + if queued, exists := c.paths[path]; exists { + queued.root = root + if queued.appendFrom < 0 || appendFrom < 0 { + queued.appendFrom = -1 + } else if appendFrom < queued.appendFrom { + queued.appendFrom = appendFrom + } + c.paths[path] = queued + c.mu.Unlock() + return true + } + c.paths[path] = queuedPath{root: root, appendFrom: appendFrom} + c.mu.Unlock() + select { + case c.queue <- path: + return true + default: + c.mu.Lock() + delete(c.paths, path) + c.dirtyRoots[root.Path] = true + c.mu.Unlock() + return false + } +} + +// EnqueueExisting prioritizes a source already known to the catalog without +// requiring the caller to retain its root metadata. +func (c *Catalog) EnqueueExisting(ctx context.Context, path string) bool { + var root Root + err := c.db.QueryRowContext(ctx, `SELECT root,source,scope,workspace_root FROM history_sources WHERE path=?`, filepath.Clean(path)).Scan( + &root.Path, &root.Source, &root.Scope, &root.WorkspaceRoot) + if err != nil { + return false + } + return c.EnqueuePath(root, path) +} + +func (c *Catalog) worker() { + defer c.wg.Done() + ticker := time.NewTicker(c.opts.ReconcileInterval) + defer ticker.Stop() + for { + if root, ok := c.takeDirtyRoot(); ok { + _ = c.reconcileRoot(c.ctx, root) + continue + } + select { + case <-c.ctx.Done(): + return + case <-ticker.C: + c.markAllRootsDirty() + case done := <-c.flushCh: + c.drainPending(c.ctx) + close(done) + case path := <-c.queue: + c.mu.Lock() + queued := c.paths[path] + delete(c.paths, path) + c.mu.Unlock() + _ = c.indexPath(c.ctx, queued.root, path, 0, queued.appendFrom) + case path := <-c.rootCh: + c.mu.Lock() + root, ok := c.roots[path] + c.mu.Unlock() + if ok { + _ = c.reconcileRoot(c.ctx, root) + } + } + } +} + +// Flush drains dirty roots and the path queue until empty or ctx cancels, then +// waits for the worker to acknowledge. Callers use this on shutdown so pending +// index work is not silently abandoned. +func (c *Catalog) Flush(ctx context.Context) error { + if c == nil { + return nil + } + done := make(chan struct{}) + select { + case c.flushCh <- done: + case <-ctx.Done(): + return ctx.Err() + } + select { + case <-done: + return nil + case <-ctx.Done(): + return ctx.Err() + } +} + +func (c *Catalog) drainPending(ctx context.Context) { + for { + if err := ctx.Err(); err != nil { + return + } + if root, ok := c.takeDirtyRoot(); ok { + _ = c.reconcileRoot(ctx, root) + continue + } + select { + case path := <-c.queue: + c.mu.Lock() + queued := c.paths[path] + delete(c.paths, path) + c.mu.Unlock() + _ = c.indexPath(ctx, queued.root, path, 0, queued.appendFrom) + default: + c.mu.Lock() + empty := len(c.paths) == 0 && len(c.dirtyRoots) == 0 + c.mu.Unlock() + if empty && len(c.queue) == 0 { + return + } + // Another goroutine may have enqueued between checks; yield once. + runtime.Gosched() + c.mu.Lock() + empty = len(c.paths) == 0 && len(c.dirtyRoots) == 0 + c.mu.Unlock() + if empty && len(c.queue) == 0 { + return + } + } + } +} + +func (c *Catalog) markRootDirty(path string) { + c.mu.Lock() + c.dirtyRoots[path] = true + c.mu.Unlock() +} + +func (c *Catalog) markAllRootsDirty() { + c.mu.Lock() + for path := range c.roots { + c.dirtyRoots[path] = true + } + c.mu.Unlock() +} + +func (c *Catalog) takeDirtyRoot() (Root, bool) { + c.mu.Lock() + defer c.mu.Unlock() + for path := range c.dirtyRoots { + delete(c.dirtyRoots, path) + root, ok := c.roots[path] + return root, ok + } + return Root{}, false +} + +func historyRootSignature(paths []string) string { + hash := sha256.New() + for _, path := range paths { + for _, candidate := range []string{path, agent.BranchMetaPath(path)} { + info, err := os.Stat(candidate) + if err != nil { + _, _ = fmt.Fprintf(hash, "%s\x00missing\n", candidate) + continue + } + _, _ = fmt.Fprintf(hash, "%s\x00%d\x00%d\n", candidate, info.Size(), info.ModTime().UnixNano()) + } + } + return hex.EncodeToString(hash.Sum(nil)) +} + +func (c *Catalog) reconcileRoot(ctx context.Context, root Root) error { + entries, err := os.ReadDir(root.Path) + if err != nil && !errors.Is(err, os.ErrNotExist) { + c.setError(err) + return err + } + paths := make([]string, 0, len(entries)) + for _, entry := range entries { + if entry.IsDir() || !store.IsSessionTranscriptName(entry.Name()) { + continue + } + path := filepath.Join(root.Path, entry.Name()) + if !root.Archive && !agent.IsVisibleSession(path) { + continue + } + paths = append(paths, path) + } + sort.Strings(paths) + signature := historyRootSignature(paths) + var previousSig, previousState string + _ = c.db.QueryRowContext(ctx, `SELECT signature,state FROM history_roots WHERE path=?`, root.Path).Scan(&previousSig, &previousState) + if previousState == "ready" && previousSig == signature && signature != "" { + return nil + } + now := c.opts.Now().UnixMilli() + tx, err := c.db.BeginTx(ctx, nil) + if err != nil { + return err + } + var generation int64 + if err := tx.QueryRowContext(ctx, `INSERT INTO history_roots(path,source,scope,workspace_root,signature,scan_generation,state,total) + VALUES(?,?,?,?,?,1,'scanning',?) ON CONFLICT(path) DO UPDATE SET source=excluded.source,scope=excluded.scope, + workspace_root=excluded.workspace_root,signature=excluded.signature,scan_generation=history_roots.scan_generation+1,state='scanning',error='',total=excluded.total + RETURNING scan_generation`, root.Path, root.Source, root.Scope, root.WorkspaceRoot, signature, len(paths)).Scan(&generation); err != nil { + _ = tx.Rollback() + return err + } + if err := tx.Commit(); err != nil { + return err + } + indexed := 0 + for i, path := range paths { + if err := ctx.Err(); err != nil { + return err + } + if err := c.indexPath(ctx, root, path, generation, -1); err == nil { + indexed++ + } + if (i+1)%32 == 0 { + runtime.Gosched() + } + } + tx, err = c.db.BeginTx(ctx, nil) + if err != nil { + return err + } + if _, err := tx.ExecContext(ctx, `UPDATE history_sources SET missing_since=CASE WHEN missing_since=0 THEN ? ELSE missing_since END, + health='missing' WHERE root=? AND seen_generation<>?`, now, root.Path, generation); err != nil { + _ = tx.Rollback() + return err + } + cutoff := now - c.opts.MissingGrace.Milliseconds() + if _, err := tx.ExecContext(ctx, `DELETE FROM history_fts WHERE rowid IN ( + SELECT d.id FROM history_documents d JOIN history_sources s ON s.path=d.source_path + WHERE s.root=? AND s.seen_generation<>? AND s.missing_since>0 AND s.missing_since<=? + )`, root.Path, generation, cutoff); err != nil { + _ = tx.Rollback() + return err + } + if _, err := tx.ExecContext(ctx, `DELETE FROM history_documents WHERE source_path IN ( + SELECT path FROM history_sources WHERE root=? AND seen_generation<>? AND missing_since>0 AND missing_since<=? + )`, root.Path, generation, cutoff); err != nil { + _ = tx.Rollback() + return err + } + if _, err := tx.ExecContext(ctx, `DELETE FROM history_sources + WHERE root=? AND seen_generation<>? AND missing_since>0 AND missing_since<=?`, root.Path, generation, cutoff); err != nil { + _ = tx.Rollback() + return err + } + if _, err := tx.ExecContext(ctx, `UPDATE history_roots SET state='ready',signature=?,indexed=?,completed_at=?,scan_cursor='' WHERE path=?`, signature, indexed, now, root.Path); err != nil { + _ = tx.Rollback() + return err + } + revision, err := bump(ctx, tx) + if err != nil { + _ = tx.Rollback() + return err + } + if err := tx.Commit(); err != nil { + return err + } + c.publish(revision, []string{root.Path}, "reconcile") + return nil +} + +func fileFingerprint(path string) string { + info, err := os.Stat(path) + if err != nil { + return "" + } + return fmt.Sprintf("%d:%d", info.Size(), info.ModTime().UnixNano()) +} + +func (c *Catalog) indexPath(ctx context.Context, root Root, path string, generation int64, appendFrom int) error { + if !root.Archive && !agent.IsVisibleSession(path) { + return c.Purge(ctx, path) + } + contentFingerprint := fileFingerprint(path) + metaFingerprint := fileFingerprint(agent.BranchMetaPath(path)) + state, known, identityErr := agent.SessionContentIdentity(path) + digest := "" + revision := int64(0) + if identityErr == nil && known { + digest, revision = state.DigestHex, state.Revision + } + var oldFingerprint, oldMetaFingerprint, oldDigest string + var oldGeneration, oldRevision int64 + var oldMessageCount int + err := c.db.QueryRowContext(ctx, `SELECT content_fingerprint,meta_fingerprint,content_digest,seen_generation, + content_revision,indexed_message_count FROM history_sources WHERE path=?`, path).Scan( + &oldFingerprint, &oldMetaFingerprint, &oldDigest, &oldGeneration, &oldRevision, &oldMessageCount) + if sourceProjectionUnchanged(err, oldFingerprint, contentFingerprint, oldMetaFingerprint, metaFingerprint, oldDigest, digest) { + if generation != 0 && oldGeneration != generation { + _, _ = c.db.ExecContext(ctx, `UPDATE history_sources SET seen_generation=?,missing_since=0,health='ok' WHERE path=?`, generation, path) + } + return nil + } + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return err + } + if err == nil && known && appendFrom >= 0 { + handled, appendErr := c.tryAppendPath(ctx, root, path, generation, appendFrom, oldMessageCount, oldRevision, + revision, digest, contentFingerprint, metaFingerprint) + if appendErr != nil { + return appendErr + } + if handled { + return nil + } + } + session, err := agent.LoadSession(path) + if err != nil { + _, _ = c.db.ExecContext(ctx, `INSERT INTO history_sources(path,root,source,scope,workspace_root,content_fingerprint,meta_fingerprint,health,last_error,seen_generation) + VALUES(?,?,?,?,?,?,?,'corrupt',?,?) ON CONFLICT(path) DO UPDATE SET health='corrupt',last_error=excluded.last_error, + content_fingerprint=excluded.content_fingerprint,meta_fingerprint=excluded.meta_fingerprint,seen_generation=excluded.seen_generation`, + path, root.Path, root.Source, root.Scope, root.WorkspaceRoot, contentFingerprint, metaFingerprint, err.Error(), generation) + c.setError(err) + return err + } + messages := session.Snapshot() + if digest == "" { + h := sha256.New() + for _, doc := range documents(messages) { + _, _ = h.Write([]byte(doc.terms)) + _, _ = h.Write([]byte{0}) + } + digest = hex.EncodeToString(h.Sum(nil)) + } + meta, _, _ := agent.LoadBranchMeta(path) + lastActivity := max(int64(0), agent.SessionContentModTime(path).UnixMilli()) + // Hide stale terms as soon as the authoritative fingerprint changes. Rows + // remain available for retry and are atomically replaced below. + if _, err := c.db.ExecContext(ctx, `UPDATE history_sources SET health='stale',last_error='' WHERE path=?`, path); err != nil { + return err + } + tx, err := c.db.BeginTx(ctx, nil) + if err != nil { + return err + } + if _, err := tx.ExecContext(ctx, `DELETE FROM history_fts WHERE rowid IN (SELECT id FROM history_documents WHERE source_path=?)`, path); err != nil { + _ = tx.Rollback() + return err + } + if _, err := tx.ExecContext(ctx, `DELETE FROM history_documents WHERE source_path=?`, path); err != nil { + _ = tx.Rollback() + return err + } + _, err = tx.ExecContext(ctx, `INSERT INTO history_sources(path,root,source,scope,workspace_root,content_revision,content_digest, + content_fingerprint,meta_fingerprint,message_count,indexed_message_count,custom_title,topic_id,topic_title,preview,created_at, + last_activity_at,health,missing_since,seen_generation,last_error) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,'ok',0,?,'') + ON CONFLICT(path) DO UPDATE SET root=excluded.root,source=excluded.source,scope=excluded.scope,workspace_root=excluded.workspace_root, + content_revision=excluded.content_revision,content_digest=excluded.content_digest,content_fingerprint=excluded.content_fingerprint, + meta_fingerprint=excluded.meta_fingerprint,message_count=excluded.message_count,indexed_message_count=excluded.indexed_message_count, + custom_title=excluded.custom_title,topic_id=excluded.topic_id,topic_title=excluded.topic_title,preview=excluded.preview, + created_at=excluded.created_at,last_activity_at=excluded.last_activity_at,health='ok',missing_since=0, + seen_generation=excluded.seen_generation,last_error=''`, path, root.Path, root.Source, root.Scope, root.WorkspaceRoot, revision, digest, + contentFingerprint, metaFingerprint, len(messages), len(messages), meta.CustomTitle, meta.TopicID, meta.TopicTitle, meta.Preview, + meta.CreatedAt.UnixMilli(), lastActivity, generation) + if err != nil { + _ = tx.Rollback() + return err + } + for _, doc := range documents(messages) { + result, err := tx.ExecContext(ctx, `INSERT INTO history_documents(source_path,message_index,part_index,role,kind,tool_name,token_count) + VALUES(?,?,?,?,?,?,?)`, path, doc.message, doc.part, doc.role, doc.kind, doc.tool, doc.count) + if err != nil { + _ = tx.Rollback() + return err + } + rowID, err := result.LastInsertId() + if err != nil { + _ = tx.Rollback() + return err + } + if _, err := tx.ExecContext(ctx, `INSERT INTO history_fts(rowid,terms) VALUES(?,?)`, rowID, doc.terms); err != nil { + _ = tx.Rollback() + return err + } + } + newRevision, err := bump(ctx, tx) + if err != nil { + _ = tx.Rollback() + return err + } + if err := tx.Commit(); err != nil { + return err + } + c.publish(newRevision, []string{root.Path}, "source-indexed") + return nil +} + +func bump(ctx context.Context, tx *sql.Tx) (uint64, error) { + if _, err := tx.ExecContext(ctx, `UPDATE history_state SET revision=revision+1 WHERE id=1`); err != nil { + return 0, err + } + var revision uint64 + err := tx.QueryRowContext(ctx, `SELECT revision FROM history_state WHERE id=1`).Scan(&revision) + return revision, err +} + +func (c *Catalog) Search(ctx context.Context, req SearchRequest) (SearchResult, error) { + out := SearchResult{Items: []Candidate{}, Revision: c.revision.Load(), Partial: c.Status().Pending > 0} + terms, err := retrieval.QueryTerms(req.Query) + if err != nil { + return out, err + } + limit := req.Limit + if limit <= 0 { + limit = DefaultLimit + } + if limit > MaxLimit { + limit = MaxLimit + } + match := make([]string, 0, len(terms)) + for _, term := range terms { + match = append(match, `"`+strings.ReplaceAll(term, `"`, `""`)+`"`) + } + where := []string{`history_fts MATCH ?`, `s.health='ok'`, `s.missing_since=0`} + args := []any{strings.Join(match, " OR ")} + if req.Scope == "project" { + where = append(where, `s.scope='project'`, `s.workspace_root=?`) + args = append(args, strings.TrimSpace(req.WorkspaceRoot)) + } + if len(req.Kinds) > 0 { + placeholders := make([]string, len(req.Kinds)) + for i, kind := range req.Kinds { + placeholders[i] = "?" + args = append(args, kind) + } + where = append(where, `d.kind IN (`+strings.Join(placeholders, ",")+`)`) + } + if tool := strings.TrimSpace(req.ToolName); tool != "" { + where = append(where, `d.tool_name=?`) + args = append(args, tool) + } + if len(req.Roots) > 0 { + placeholders := make([]string, 0, len(req.Roots)) + for _, root := range req.Roots { + if strings.TrimSpace(root) == "" { + continue + } + placeholders = append(placeholders, "?") + args = append(args, filepath.Clean(root)) + } + if len(placeholders) > 0 { + where = append(where, `s.root IN (`+strings.Join(placeholders, ",")+`)`) + } + } + baseQuery := `SELECT d.id AS id,d.source_path AS source_path,s.root AS root,s.source AS source,s.scope AS scope, + s.workspace_root AS workspace_root,s.content_digest AS content_digest,d.message_index AS message_index, + d.part_index AS part_index,d.role AS role,d.kind AS kind,d.tool_name AS tool_name,bm25(history_fts) AS rank, + s.custom_title AS custom_title,s.topic_title AS topic_title,s.last_activity_at AS last_activity_at + FROM history_fts JOIN history_documents d ON d.id=history_fts.rowid JOIN history_sources s ON s.path=d.source_path + WHERE ` + strings.Join(where, ` AND `) + query := baseQuery + ` ORDER BY bm25(history_fts),d.source_path,d.message_index,d.part_index,d.id LIMIT ?` + if after := req.After; after != nil { + query = `WITH ranked AS MATERIALIZED (` + baseQuery + `) + SELECT * FROM ranked WHERE rank>? OR (rank=? AND source_path>?) OR + (rank=? AND source_path=? AND message_index>?) OR + (rank=? AND source_path=? AND message_index=? AND part_index>?) OR + (rank=? AND source_path=? AND message_index=? AND part_index=? AND id>?) + ORDER BY rank,source_path,message_index,part_index,id LIMIT ?` + args = append(args, after.Rank, after.Rank, after.SessionPath, + after.Rank, after.SessionPath, after.MessageIndex, + after.Rank, after.SessionPath, after.MessageIndex, after.PartIndex, + after.Rank, after.SessionPath, after.MessageIndex, after.PartIndex, after.RowID) + } + args = append(args, limit) + rows, err := c.db.QueryContext(ctx, query, args...) + if err != nil { + return out, err + } + defer rows.Close() + for rows.Next() { + var item Candidate + if err := rows.Scan(&item.RowID, &item.SessionPath, &item.Root, &item.Source, &item.Scope, &item.WorkspaceRoot, &item.ContentDigest, + &item.MessageIndex, &item.PartIndex, &item.Role, &item.Kind, &item.ToolName, &item.Rank, + &item.SessionTitle, &item.TopicTitle, &item.LastActivityAt); err != nil { + return out, err + } + if !catalogPathWithin(item.SessionPath, item.Root) { + continue + } + if item.Rank < 0 { + item.Score = -item.Rank + } else { + item.Score = 1 / (1 + item.Rank) + } + out.Items = append(out.Items, item) + } + return out, rows.Err() +} + +func catalogPathWithin(path, root string) bool { + absPath, err := filepath.Abs(filepath.Clean(strings.TrimSpace(path))) + if err != nil { + return false + } + absRoot, err := filepath.Abs(filepath.Clean(strings.TrimSpace(root))) + if err != nil { + return false + } + rel, err := filepath.Rel(absRoot, absPath) + return err == nil && (rel == "." || (rel != ".." && !strings.HasPrefix(rel, ".."+string(filepath.Separator)))) +} + +func (c *Catalog) Purge(ctx context.Context, path string) error { + if c == nil { + return nil + } + tx, err := c.db.BeginTx(ctx, nil) + if err != nil { + return err + } + if _, err := tx.ExecContext(ctx, `DELETE FROM history_fts WHERE rowid IN (SELECT id FROM history_documents WHERE source_path=?)`, path); err != nil { + _ = tx.Rollback() + return err + } + if _, err := tx.ExecContext(ctx, `DELETE FROM history_sources WHERE path=?`, path); err != nil { + _ = tx.Rollback() + return err + } + revision, err := bump(ctx, tx) + if err != nil { + _ = tx.Rollback() + return err + } + if err := tx.Commit(); err != nil { + return err + } + _, _ = c.db.ExecContext(ctx, `PRAGMA wal_checkpoint(TRUNCATE)`) + _, _ = c.db.ExecContext(ctx, `PRAGMA incremental_vacuum(64)`) + c.publish(revision, nil, "purge") + return nil +} + +func (c *Catalog) refreshStatus(ctx context.Context) { + var indexed, total, pending, failed int64 + _ = c.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM history_sources WHERE health='ok'`).Scan(&indexed) + _ = c.db.QueryRowContext(ctx, `SELECT COALESCE(SUM(total),0) FROM history_roots`).Scan(&total) + _ = c.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM history_roots WHERE state<>'ready'`).Scan(&pending) + _ = c.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM history_sources WHERE health='corrupt'`).Scan(&failed) + c.statusMu.Lock() + c.status.Indexed, c.status.Total, c.status.Pending, c.status.Failed = indexed, total, pending, failed + c.status.Revision = c.revision.Load() + c.statusMu.Unlock() +} + +func (c *Catalog) publish(revision uint64, roots []string, reason string) { + c.revision.Store(revision) + c.refreshStatus(context.Background()) + if c.opts.OnRevision != nil { + c.opts.OnRevision(c.Status(), roots, reason) + } +} + +func (c *Catalog) setError(err error) { + c.statusMu.Lock() + c.status.LastError = err.Error() + c.status.Failed++ + c.statusMu.Unlock() +} + +func (c *Catalog) Status() Status { + if c == nil { + return Status{State: "degraded", Mode: projectiondb.ModeMemory, LastError: "history catalog unavailable"} + } + c.statusMu.RLock() + defer c.statusMu.RUnlock() + return c.status +} + +func (c *Catalog) Close(ctx context.Context) error { + if c == nil { + return nil + } + c.closeOnce.Do(func() { + c.cancel() + go func() { + c.wg.Wait() + c.closeErr = c.db.Close() + close(c.closeDone) + }() + }) + select { + case <-c.closeDone: + return c.closeErr + case <-ctx.Done(): + return ctx.Err() + } +} diff --git a/internal/historycatalog/catalog_test.go b/internal/historycatalog/catalog_test.go new file mode 100644 index 0000000000..1b95f7aa93 --- /dev/null +++ b/internal/historycatalog/catalog_test.go @@ -0,0 +1,252 @@ +package historycatalog + +import ( + "context" + "path/filepath" + "testing" + + "reasonix/internal/agent" + "reasonix/internal/provider" +) + +func saveMessages(t *testing.T, path string, messages ...provider.Message) { + t.Helper() + session := agent.NewSession("") + for _, message := range messages { + session.Add(message) + } + if err := session.Save(path); err != nil { + t.Fatal(err) + } +} + +func TestReconcileAndSearchFTSWithoutStoredBody(t *testing.T) { + t.Parallel() + ctx := context.Background() + root := t.TempDir() + path := filepath.Join(root, "decision.jsonl") + saveMessages(t, path, + provider.Message{Role: provider.RoleUser, Content: "Should we use vector embeddings?"}, + provider.Message{Role: provider.RoleAssistant, Content: "Keep lightweight BM25 retrieval for history."}) + catalog, err := Open(ctx, Options{Path: filepath.Join(t.TempDir(), "history.sqlite")}) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + registered := Root{Path: root, Source: "project", Scope: "project", WorkspaceRoot: "/workspace"} + if err := catalog.ReconcileRoot(ctx, registered); err != nil { + t.Fatal(err) + } + result, err := catalog.Search(ctx, SearchRequest{Query: "lightweight BM25", Scope: "project", WorkspaceRoot: "/workspace", Kinds: []string{"assistant_text"}, Roots: []string{root}, Limit: 5}) + if err != nil { + t.Fatal(err) + } + if len(result.Items) != 1 || result.Items[0].SessionPath != path || result.Items[0].MessageIndex != 1 { + t.Fatalf("result=%#v", result) + } + var storedTerms string + if err := catalog.db.QueryRow(`SELECT terms FROM history_fts WHERE rowid=?`, result.Items[0].RowID).Scan(&storedTerms); err == nil { + t.Fatalf("contentless FTS unexpectedly returned stored terms %q", storedTerms) + } +} + +func TestRewriteRemovesOldTerms(t *testing.T) { + t.Parallel() + ctx := context.Background() + root := t.TempDir() + path := filepath.Join(root, "rewrite.jsonl") + saveMessages(t, path, provider.Message{Role: provider.RoleUser, Content: "obsolete unicorn marker"}) + catalog, err := Open(ctx, Options{Path: filepath.Join(t.TempDir(), "history.sqlite")}) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + target := Root{Path: root, Source: "project", Scope: "project", WorkspaceRoot: root} + if err := catalog.ReconcileRoot(ctx, target); err != nil { + t.Fatal(err) + } + session, err := agent.LoadSession(path) + if err != nil { + t.Fatal(err) + } + session.Rewrite([]provider.Message{{Role: provider.RoleUser, Content: "replacement phoenix marker"}}, "test") + if err := session.SaveRewrite(path); err != nil { + t.Fatal(err) + } + if err := catalog.ReconcileRoot(ctx, target); err != nil { + t.Fatal(err) + } + oldResult, err := catalog.Search(ctx, SearchRequest{Query: "unicorn", Kinds: []string{"user_text"}, Roots: []string{root}}) + if err != nil { + t.Fatal(err) + } + if len(oldResult.Items) != 0 { + t.Fatalf("stale terms survived rewrite: %#v", oldResult.Items) + } + newResult, err := catalog.Search(ctx, SearchRequest{Query: "phoenix", Kinds: []string{"user_text"}, Roots: []string{root}}) + if err != nil || len(newResult.Items) != 1 { + t.Fatalf("newResult=%#v err=%v", newResult, err) + } +} + +func TestAppendIndexesOnlyDisplayTail(t *testing.T) { + t.Parallel() + ctx := context.Background() + root := t.TempDir() + path := filepath.Join(root, "append.jsonl") + saveMessages(t, path, provider.Message{Role: provider.RoleUser, Content: "stable prefix marker"}) + catalog, err := Open(ctx, Options{Path: filepath.Join(t.TempDir(), "history.sqlite")}) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + target := Root{Path: root, Source: "project", Scope: "project", WorkspaceRoot: root} + if err := catalog.ReconcileRoot(ctx, target); err != nil { + t.Fatal(err) + } + var prefixRowID int64 + if err := catalog.db.QueryRow(`SELECT id FROM history_documents WHERE source_path=? AND message_index=0`, path).Scan(&prefixRowID); err != nil { + t.Fatal(err) + } + session, err := agent.LoadSession(path) + if err != nil { + t.Fatal(err) + } + session.Add(provider.Message{Role: provider.RoleAssistant, Content: "new append-only phoenix"}) + if err := session.SaveSnapshot(path); err != nil { + t.Fatal(err) + } + if err := catalog.indexPath(ctx, target, path, 0, 1); err != nil { + t.Fatal(err) + } + var unchangedRowID int64 + if err := catalog.db.QueryRow(`SELECT id FROM history_documents WHERE source_path=? AND message_index=0`, path).Scan(&unchangedRowID); err != nil { + t.Fatal(err) + } + if unchangedRowID != prefixRowID { + t.Fatalf("prefix row was rebuilt: before=%d after=%d", prefixRowID, unchangedRowID) + } + result, err := catalog.Search(ctx, SearchRequest{Query: "phoenix", Roots: []string{root}}) + if err != nil || len(result.Items) != 1 || result.Items[0].MessageIndex != 1 { + t.Fatalf("appended result=%#v err=%v", result, err) + } +} + +func TestSearchKeysetContinuesPastCatalogLimit(t *testing.T) { + t.Parallel() + ctx := context.Background() + root := t.TempDir() + path := filepath.Join(root, "many.jsonl") + messages := make([]provider.Message, 0, 5) + for range 5 { + messages = append(messages, provider.Message{Role: provider.RoleUser, Content: "shared pagination marker"}) + } + saveMessages(t, path, messages...) + catalog, err := Open(ctx, Options{Path: filepath.Join(t.TempDir(), "history.sqlite")}) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + if err := catalog.ReconcileRoot(ctx, Root{Path: root, Source: "project", Scope: "project", WorkspaceRoot: root}); err != nil { + t.Fatal(err) + } + request := SearchRequest{Query: "pagination", Kinds: []string{"user_text"}, Roots: []string{root}, Limit: 2} + seen := map[int]bool{} + for { + result, err := catalog.Search(ctx, request) + if err != nil { + t.Fatal(err) + } + if len(result.Items) == 0 { + break + } + for _, item := range result.Items { + if seen[item.MessageIndex] { + t.Fatalf("message %d repeated across keyset pages", item.MessageIndex) + } + seen[item.MessageIndex] = true + } + last := result.Items[len(result.Items)-1] + request.After = &SearchCursor{Rank: last.Rank, SessionPath: last.SessionPath, MessageIndex: last.MessageIndex, + PartIndex: last.PartIndex, RowID: last.RowID} + } + if len(seen) != len(messages) { + t.Fatalf("indexed messages=%d, want %d", len(seen), len(messages)) + } +} + +func TestToolOutputIsIndexedAndSearchableByExplicitKind(t *testing.T) { + t.Parallel() + ctx := context.Background() + root := t.TempDir() + path := filepath.Join(root, "tools.jsonl") + saveMessages(t, path, + provider.Message{Role: provider.RoleAssistant, ToolCalls: []provider.ToolCall{{ID: "1", Name: "bash", Arguments: `{"cmd":"echo hello"}`}}}, + provider.Message{Role: provider.RoleTool, ToolCallID: "1", Name: "bash", Content: "zephyroutputtokenxyz hello"}, + provider.Message{Role: provider.RoleTool, ToolCallID: "2", Name: "bash", Content: "error: permission denied on quasarerrortokenabc"}, + ) + catalog, err := Open(ctx, Options{Path: filepath.Join(t.TempDir(), "history.sqlite")}) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + if err := catalog.ReconcileRoot(ctx, Root{Path: root, Source: "project", Scope: "project", WorkspaceRoot: root}); err != nil { + t.Fatal(err) + } + + defaultKinds := []string{"user_text", "assistant_text", "tool_input", "tool_error"} + defaultResult, err := catalog.Search(ctx, SearchRequest{Query: "zephyroutputtokenxyz", Kinds: defaultKinds, Roots: []string{root}, Limit: 5}) + if err != nil { + t.Fatal(err) + } + if len(defaultResult.Items) != 0 { + t.Fatalf("default kinds unexpectedly returned tool_output hits: %#v", defaultResult.Items) + } + + outputResult, err := catalog.Search(ctx, SearchRequest{Query: "zephyroutputtokenxyz", Kinds: []string{"tool_output"}, Roots: []string{root}, Limit: 5}) + if err != nil { + t.Fatal(err) + } + if len(outputResult.Items) != 1 || outputResult.Items[0].Kind != "tool_output" { + t.Fatalf("tool_output result=%#v", outputResult.Items) + } + + errorResult, err := catalog.Search(ctx, SearchRequest{Query: "quasarerrortokenabc", Kinds: []string{"tool_error"}, Roots: []string{root}, Limit: 5}) + if err != nil { + t.Fatal(err) + } + if len(errorResult.Items) != 1 || errorResult.Items[0].Kind != "tool_error" { + t.Fatalf("tool_error result=%#v", errorResult.Items) + } +} + +func TestTokenizerVersionMismatchClearsMixedProjection(t *testing.T) { + t.Parallel() + ctx := context.Background() + root := t.TempDir() + path := filepath.Join(root, "old-tokenizer.jsonl") + databasePath := filepath.Join(t.TempDir(), "history.sqlite") + saveMessages(t, path, provider.Message{Role: provider.RoleUser, Content: "tokenizer migration marker"}) + catalog, err := Open(ctx, Options{Path: databasePath}) + if err != nil { + t.Fatal(err) + } + if err := catalog.ReconcileRoot(ctx, Root{Path: root, Source: "project", Scope: "project", WorkspaceRoot: root}); err != nil { + t.Fatal(err) + } + if _, err := catalog.db.Exec(`UPDATE history_state SET tokenizer_version=?`, TokenizerVersion+1); err != nil { + t.Fatal(err) + } + if err := catalog.Close(ctx); err != nil { + t.Fatal(err) + } + reopened, err := Open(ctx, Options{Path: databasePath}) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = reopened.Close(context.Background()) }) + result, err := reopened.Search(ctx, SearchRequest{Query: "migration", Roots: []string{root}}) + if err != nil || len(result.Items) != 0 { + t.Fatalf("mixed tokenizer rows survived: result=%#v err=%v", result, err) + } +} diff --git a/internal/historycatalog/close_lifecycle_test.go b/internal/historycatalog/close_lifecycle_test.go new file mode 100644 index 0000000000..37a50da580 --- /dev/null +++ b/internal/historycatalog/close_lifecycle_test.go @@ -0,0 +1,28 @@ +package historycatalog + +import ( + "context" + "errors" + "testing" + "time" +) + +func TestCloseCanBeAwaitedAfterCanceledCaller(t *testing.T) { + catalog, err := Open(context.Background(), Options{InMemory: true}) + if err != nil { + t.Fatalf("open: %v", err) + } + canceled, cancel := context.WithCancel(context.Background()) + cancel() + if err := catalog.Close(canceled); err != nil && !errors.Is(err, context.Canceled) { + t.Fatalf("first close: %v", err) + } + ctx, stop := context.WithTimeout(context.Background(), 5*time.Second) + defer stop() + if err := catalog.Close(ctx); err != nil { + t.Fatalf("await eventual close: %v", err) + } + if err := catalog.db.Ping(); err == nil { + t.Fatal("database remained open after close completion") + } +} diff --git a/internal/historycatalog/documents.go b/internal/historycatalog/documents.go new file mode 100644 index 0000000000..4f314c4c2c --- /dev/null +++ b/internal/historycatalog/documents.go @@ -0,0 +1,50 @@ +package historycatalog + +import ( + "strings" + + "reasonix/internal/provider" + "reasonix/internal/retrieval" +) + +type indexedDocument struct { + message int + part int + role string + kind string + tool string + terms string + count int +} + +func documents(messages []provider.Message) []indexedDocument { + out := []indexedDocument{} + appendDoc := func(message, part int, role, kind, tool, text string) { + terms := retrieval.Tokens(strings.TrimSpace(text)) + if len(terms) == 0 { + return + } + out = append(out, indexedDocument{message: message, part: part, role: role, kind: kind, tool: tool, terms: strings.Join(terms, " "), count: len(terms)}) + } + for i, msg := range messages { + switch msg.Role { + case provider.RoleUser: + appendDoc(i, 0, string(msg.Role), "user_text", "", msg.Content) + case provider.RoleAssistant: + appendDoc(i, 0, string(msg.Role), "assistant_text", "", msg.Content) + for part, call := range msg.ToolCalls { + appendDoc(i, part, string(msg.Role), "tool_input", call.Name, call.Name+" "+call.Arguments) + } + case provider.RoleTool: + // Index both tool_error and tool_output so explicit kind filters stay + // honest. Default search kinds still exclude tool_output. + text := msg.Name + " " + msg.Content + lower := strings.ToLower(strings.TrimSpace(msg.Content)) + if strings.HasPrefix(lower, "error:") || strings.HasPrefix(lower, "blocked:") || strings.Contains(lower, "permission denied") { + appendDoc(i, 0, string(msg.Role), "tool_error", msg.Name, text) + } + appendDoc(i, 0, string(msg.Role), "tool_output", msg.Name, text) + } + } + return out +} diff --git a/internal/historycatalog/incremental.go b/internal/historycatalog/incremental.go new file mode 100644 index 0000000000..4e87ed60ab --- /dev/null +++ b/internal/historycatalog/incremental.go @@ -0,0 +1,76 @@ +package historycatalog + +import ( + "context" + + "reasonix/internal/agent" + "reasonix/internal/store" +) + +func sourceProjectionUnchanged(queryErr error, oldContent, content, oldMeta, meta, oldDigest, digest string) bool { + return queryErr == nil && oldContent == content && oldMeta == meta && (digest == "" || digest == oldDigest) +} + +func (c *Catalog) tryAppendPath(ctx context.Context, root Root, path string, generation int64, appendFrom, + oldMessageCount int, oldRevision, revision int64, digest, contentFingerprint, metaFingerprint string) (bool, error) { + if appendFrom != oldMessageCount || revision != oldRevision+1 { + return false, nil + } + index, err := agent.LoadSessionDisplayIndex(store.SessionDisplayIndex(path)) + if err != nil || !index.RevisionKnown || index.Revision != revision || index.ContentDigest != digest || index.MessageCount < appendFrom { + return false, nil + } + tail, checkedIndex, err := agent.LoadSessionDisplayMessageRange(path, appendFrom, index.MessageCount) + if err != nil || checkedIndex.ContentDigest != digest || checkedIndex.Revision != revision { + return false, nil + } + meta, _, _ := agent.LoadBranchMeta(path) + lastActivity := max(int64(0), agent.SessionContentModTime(path).UnixMilli()) + tx, err := c.db.BeginTx(ctx, nil) + if err != nil { + return false, err + } + result, err := tx.ExecContext(ctx, `UPDATE history_sources SET root=?,source=?,scope=?,workspace_root=?,content_revision=?, + content_digest=?,content_fingerprint=?,meta_fingerprint=?,message_count=?,indexed_message_count=?,custom_title=?,topic_id=?, + topic_title=?,preview=?,created_at=?,last_activity_at=?,health='ok',missing_since=0, + seen_generation=CASE WHEN ?>0 THEN ? ELSE seen_generation END,last_error='' + WHERE path=? AND content_revision=? AND indexed_message_count=?`, root.Path, root.Source, root.Scope, root.WorkspaceRoot, + revision, digest, contentFingerprint, metaFingerprint, index.MessageCount, index.MessageCount, meta.CustomTitle, meta.TopicID, + meta.TopicTitle, meta.Preview, meta.CreatedAt.UnixMilli(), lastActivity, generation, generation, path, oldRevision, oldMessageCount) + if err != nil { + _ = tx.Rollback() + return false, err + } + updated, _ := result.RowsAffected() + if updated != 1 { + _ = tx.Rollback() + return false, nil + } + for _, doc := range documents(tail) { + result, err := tx.ExecContext(ctx, `INSERT INTO history_documents(source_path,message_index,part_index,role,kind,tool_name,token_count) + VALUES(?,?,?,?,?,?,?)`, path, appendFrom+doc.message, doc.part, doc.role, doc.kind, doc.tool, doc.count) + if err != nil { + _ = tx.Rollback() + return false, err + } + rowID, err := result.LastInsertId() + if err != nil { + _ = tx.Rollback() + return false, err + } + if _, err := tx.ExecContext(ctx, `INSERT INTO history_fts(rowid,terms) VALUES(?,?)`, rowID, doc.terms); err != nil { + _ = tx.Rollback() + return false, err + } + } + newRevision, err := bump(ctx, tx) + if err != nil { + _ = tx.Rollback() + return false, err + } + if err := tx.Commit(); err != nil { + return false, err + } + c.publish(newRevision, []string{root.Path}, "source-appended") + return true, nil +} diff --git a/internal/historycatalog/rebuild.go b/internal/historycatalog/rebuild.go new file mode 100644 index 0000000000..3968b065b4 --- /dev/null +++ b/internal/historycatalog/rebuild.go @@ -0,0 +1,76 @@ +package historycatalog + +import ( + "context" + "database/sql" + "strings" + "time" + + "reasonix/internal/projectiondb" +) + +// Rebuild replaces only the disposable FTS projection after indexing every +// supplied authoritative root into a validated sibling database. +func Rebuild(ctx context.Context, opts Options, roots []Root) (Status, error) { + opts = rebuildOptions(opts) + if opts.InMemory || strings.TrimSpace(opts.Path) == "" { + catalog, err := Open(ctx, opts) + if err != nil { + return Status{}, err + } + for _, root := range roots { + if err := catalog.ReconcileRoot(ctx, root); err != nil { + closeRebuildCatalog(catalog) + return catalog.Status(), err + } + } + status := catalog.Status() + closeRebuildCatalog(catalog) + return status, nil + } + err := projectiondb.Rebuild(ctx, projectiondb.OpenOptions{ + Path: opts.Path, MemoryName: "history-search-rebuild", Migrations: migrations(), + SecureDelete: true, AutoVacuum: true, + }, func(ctx context.Context, db *sql.DB) error { + catalog := &Catalog{db: db, opts: opts, status: Status{State: "ready", Mode: projectiondb.ModeDisk, Path: opts.Path}} + for _, root := range roots { + if err := catalog.ReconcileRoot(ctx, root); err != nil { + return err + } + } + return nil + }) + if err != nil { + return Status{}, err + } + published, err := Open(ctx, opts) + if err != nil { + return Status{}, err + } + status := published.Status() + closeRebuildCatalog(published) + return status, nil +} + +func rebuildOptions(opts Options) Options { + if opts.Path == "" { + opts.Path = DefaultPath() + } + if strings.TrimSpace(opts.Path) == "" { + opts.Path, opts.InMemory = "", true + } + if opts.Now == nil { + opts.Now = time.Now + } + if opts.MissingGrace <= 0 { + opts.MissingGrace = defaultMissingGrace + } + opts.OnRevision = nil + return opts +} + +func closeRebuildCatalog(catalog *Catalog) { + closeCtx, cancel := context.WithTimeout(context.Background(), time.Second) + defer cancel() + _ = catalog.Close(closeCtx) +} diff --git a/internal/historycatalog/rebuild_test.go b/internal/historycatalog/rebuild_test.go new file mode 100644 index 0000000000..f9c7e499d8 --- /dev/null +++ b/internal/historycatalog/rebuild_test.go @@ -0,0 +1,79 @@ +package historycatalog + +import ( + "context" + "path/filepath" + "testing" + + "reasonix/internal/agent" + "reasonix/internal/provider" +) + +func TestReconcileRootDetectsMetaOnlyChange(t *testing.T) { + t.Parallel() + ctx := context.Background() + root := t.TempDir() + path := filepath.Join(root, "meta.jsonl") + saveMessages(t, path, provider.Message{Role: provider.RoleUser, Content: "stable content"}) + if err := agent.SaveBranchMeta(path, agent.BranchMeta{CustomTitle: "old"}); err != nil { + t.Fatal(err) + } + catalog, err := Open(ctx, Options{Path: filepath.Join(t.TempDir(), "history.sqlite")}) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + target := Root{Path: root, Source: "project", Scope: "project", WorkspaceRoot: root} + if err := catalog.ReconcileRoot(ctx, target); err != nil { + t.Fatal(err) + } + if err := agent.SaveBranchMeta(path, agent.BranchMeta{CustomTitle: "replacement title with a different size"}); err != nil { + t.Fatal(err) + } + if err := catalog.ReconcileRoot(ctx, target); err != nil { + t.Fatal(err) + } + var title string + if err := catalog.db.QueryRowContext(ctx, `SELECT custom_title FROM history_sources WHERE path=?`, path).Scan(&title); err != nil { + t.Fatal(err) + } + if title != "replacement title with a different size" { + t.Fatalf("custom title = %q, want updated meta projection", title) + } +} + +func TestRebuildReplacesStaleHistoryProjection(t *testing.T) { + t.Parallel() + ctx := context.Background() + databasePath := filepath.Join(t.TempDir(), "history.sqlite") + staleRoot := t.TempDir() + currentRoot := t.TempDir() + saveMessages(t, filepath.Join(staleRoot, "stale.jsonl"), provider.Message{Role: provider.RoleUser, Content: "obsolete unicorn marker"}) + saveMessages(t, filepath.Join(currentRoot, "current.jsonl"), provider.Message{Role: provider.RoleUser, Content: "current phoenix marker"}) + seed, err := Open(ctx, Options{Path: databasePath}) + if err != nil { + t.Fatal(err) + } + if err := seed.ReconcileRoot(ctx, Root{Path: staleRoot, Source: "global", Scope: "global"}); err != nil { + t.Fatal(err) + } + if err := seed.Close(ctx); err != nil { + t.Fatal(err) + } + if _, err := Rebuild(ctx, Options{Path: databasePath}, []Root{{Path: currentRoot, Source: "global", Scope: "global"}}); err != nil { + t.Fatal(err) + } + rebuilt, err := Open(ctx, Options{Path: databasePath}) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = rebuilt.Close(context.Background()) }) + stale, err := rebuilt.Search(ctx, SearchRequest{Query: "unicorn", Roots: []string{staleRoot}}) + if err != nil || len(stale.Items) != 0 { + t.Fatalf("stale result=%#v err=%v", stale, err) + } + current, err := rebuilt.Search(ctx, SearchRequest{Query: "phoenix", Roots: []string{currentRoot}}) + if err != nil || len(current.Items) != 1 { + t.Fatalf("current result=%#v err=%v", current, err) + } +} diff --git a/internal/historycatalog/schema.go b/internal/historycatalog/schema.go new file mode 100644 index 0000000000..0b8b754011 --- /dev/null +++ b/internal/historycatalog/schema.go @@ -0,0 +1,87 @@ +package historycatalog + +import ( + "context" + "database/sql" + + "reasonix/internal/projectiondb" +) + +const migrationV1 = ` +CREATE TABLE history_state( + id INTEGER PRIMARY KEY CHECK(id=1), + revision INTEGER NOT NULL DEFAULT 0, + tokenizer_version INTEGER NOT NULL +); +INSERT INTO history_state(id,revision,tokenizer_version) VALUES(1,0,1); + +CREATE TABLE history_roots( + path TEXT PRIMARY KEY, + source TEXT NOT NULL, + scope TEXT NOT NULL, + workspace_root TEXT NOT NULL DEFAULT '', + signature TEXT NOT NULL DEFAULT '', + scan_generation INTEGER NOT NULL DEFAULT 0, + scan_cursor TEXT NOT NULL DEFAULT '', + state TEXT NOT NULL DEFAULT 'pending', + error TEXT NOT NULL DEFAULT '', + indexed INTEGER NOT NULL DEFAULT 0, + total INTEGER NOT NULL DEFAULT 0, + completed_at INTEGER NOT NULL DEFAULT 0 +); + +CREATE TABLE history_sources( + path TEXT PRIMARY KEY, + root TEXT NOT NULL, + source TEXT NOT NULL, + scope TEXT NOT NULL, + workspace_root TEXT NOT NULL DEFAULT '', + content_revision INTEGER NOT NULL DEFAULT 0, + content_digest TEXT NOT NULL DEFAULT '', + content_fingerprint TEXT NOT NULL DEFAULT '', + meta_fingerprint TEXT NOT NULL DEFAULT '', + message_count INTEGER NOT NULL DEFAULT 0, + indexed_message_count INTEGER NOT NULL DEFAULT 0, + custom_title TEXT NOT NULL DEFAULT '', + topic_id TEXT NOT NULL DEFAULT '', + topic_title TEXT NOT NULL DEFAULT '', + preview TEXT NOT NULL DEFAULT '', + created_at INTEGER NOT NULL DEFAULT 0, + last_activity_at INTEGER NOT NULL DEFAULT 0, + health TEXT NOT NULL DEFAULT 'ok', + missing_since INTEGER NOT NULL DEFAULT 0, + seen_generation INTEGER NOT NULL DEFAULT 0, + last_error TEXT NOT NULL DEFAULT '' +); + +CREATE TABLE history_documents( + id INTEGER PRIMARY KEY, + source_path TEXT NOT NULL REFERENCES history_sources(path) ON DELETE CASCADE, + message_index INTEGER NOT NULL, + part_index INTEGER NOT NULL DEFAULT 0, + role TEXT NOT NULL, + kind TEXT NOT NULL, + tool_name TEXT NOT NULL DEFAULT '', + token_count INTEGER NOT NULL DEFAULT 0, + UNIQUE(source_path,message_index,kind,part_index) +); + +CREATE VIRTUAL TABLE history_fts USING fts5( + terms, + content='', + contentless_delete=1, + tokenize='unicode61 remove_diacritics 2' +); + +CREATE INDEX idx_history_sources_scope_activity +ON history_sources(scope,workspace_root,last_activity_at DESC,path ASC); +CREATE INDEX idx_history_documents_source +ON history_documents(source_path,message_index,part_index,id); +` + +func migrations() []projectiondb.Migration { + return []projectiondb.Migration{{Version: 1, Apply: func(ctx context.Context, tx *sql.Tx) error { + _, err := tx.ExecContext(ctx, migrationV1) + return err + }}} +} diff --git a/internal/historycatalog/types.go b/internal/historycatalog/types.go new file mode 100644 index 0000000000..fff280e7c3 --- /dev/null +++ b/internal/historycatalog/types.go @@ -0,0 +1,108 @@ +// Package historycatalog maintains a disposable FTS projection of saved +// session history. Session JSONL/event/meta files remain authoritative. +package historycatalog + +import ( + "path/filepath" + "strings" + "time" + + "reasonix/internal/config" + "reasonix/internal/projectiondb" +) + +const ( + SchemaVersion = 1 + TokenizerVersion = 1 + DefaultLimit = 50 + MaxLimit = 200 +) + +type Status struct { + State string `json:"state"` + Mode projectiondb.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 Options struct { + Path string + InMemory bool + QueueCapacity int + MissingGrace time.Duration + ReconcileInterval time.Duration + Now func() time.Time + OnRevision func(Status, []string, string) +} + +type Root struct { + Path string + Source string + Scope string + WorkspaceRoot string + Subagents bool + Archive bool +} + +type Candidate struct { + RowID int64 + SessionPath string + Root string + Source string + Scope string + WorkspaceRoot string + ContentDigest string + MessageIndex int + PartIndex int + Role string + Kind string + ToolName string + Rank float64 + Score float64 + SessionTitle string + TopicTitle string + LastActivityAt int64 +} + +type SearchRequest struct { + Query string + Scope string + WorkspaceRoot string + Kinds []string + ToolName string + Limit int + Roots []string + After *SearchCursor +} + +// SearchCursor is a stable keyset over SQLite's BM25 rank and deterministic +// tie-break keys. Lower BM25 ranks sort first. +type SearchCursor struct { + Rank float64 + SessionPath string + MessageIndex int + PartIndex int + RowID int64 +} + +type SearchResult struct { + Items []Candidate + Revision uint64 + Partial bool +} + +// DefaultPath returns the disposable history FTS path under CacheDir. +// Empty when the OS cache directory is unavailable so Open falls back to memory. +func DefaultPath() string { + cache := strings.TrimSpace(config.CacheDir()) + if cache == "" { + return "" + } + return filepath.Join(cache, "history-search", "v1.sqlite") +} diff --git a/internal/plugin/client_close.go b/internal/plugin/client_close.go new file mode 100644 index 0000000000..8b4a82cf50 --- /dev/null +++ b/internal/plugin/client_close.go @@ -0,0 +1,8 @@ +package plugin + +func (c *Client) close() { + if c == nil || c.t == nil { + return + } + c.t.close() +} diff --git a/internal/plugin/host_queries.go b/internal/plugin/host_queries.go new file mode 100644 index 0000000000..612729e4b5 --- /dev/null +++ b/internal/plugin/host_queries.go @@ -0,0 +1,62 @@ +package plugin + +import ( + "sort" + "strings" +) + +// Prompts returns every MCP prompt discovered across connected servers. +func (h *Host) Prompts() []Prompt { + h.mu.RLock() + defer h.mu.RUnlock() + return append([]Prompt(nil), h.prompts...) +} + +// Resources returns every MCP resource discovered across connected servers. +func (h *Host) Resources() []Resource { + h.mu.RLock() + defer h.mu.RUnlock() + return append([]Resource(nil), h.resources...) +} + +// ServerNames returns the connected servers' names, in connection order. +func (h *Host) ServerNames() []string { + h.mu.RLock() + defer h.mu.RUnlock() + names := make([]string, len(h.clients)) + for i, c := range h.clients { + names[i] = c.name + } + return names +} + +// Failures returns configured MCP servers that failed to connect. +func (h *Host) Failures() []Failure { + h.mu.RLock() + defer h.mu.RUnlock() + out := make([]Failure, len(h.failures)) + copy(out, h.failures) + return out +} + +// ConnectingServers returns server names whose startup handshake is currently in +// flight. It is intentionally status-only: connected clients and failures remain +// the source of truth for ready/issue states. +func (h *Host) ConnectingServers() []string { + h.spawningMu.Lock() + defer h.spawningMu.Unlock() + names := make(map[string]struct{}, len(h.spawning)) + for key, attempt := range h.spawning { + name := key + if attempt != nil && strings.TrimSpace(attempt.server) != "" { + name = attempt.server + } + names[name] = struct{}{} + } + out := make([]string, 0, len(names)) + for name := range names { + out = append(out, name) + } + sort.Strings(out) + return out +} diff --git a/internal/plugin/plugin.go b/internal/plugin/plugin.go index f3e249df43..e23a58498b 100644 --- a/internal/plugin/plugin.go +++ b/internal/plugin/plugin.go @@ -177,6 +177,11 @@ type Host struct { failures []Failure closed bool + // nextInstanceID assigns stable IDs to Client values appended to this Host. + // nextScopeID assigns IDs to per-build RegistrationScope tokens. + nextInstanceID atomic.Uint64 + nextScopeID atomic.Uint64 + // Lazy/background servers may still be handshaking when a session closes. // Close cancels those startup contexts and waits for their goroutines before // taking the client snapshot, so a just-connected stdio child cannot escape @@ -201,31 +206,6 @@ type Host struct { bgWrites sync.WaitGroup } -// Prompts returns every MCP prompt discovered across connected servers. -func (h *Host) Prompts() []Prompt { - h.mu.RLock() - defer h.mu.RUnlock() - return append([]Prompt(nil), h.prompts...) -} - -// Resources returns every MCP resource discovered across connected servers. -func (h *Host) Resources() []Resource { - h.mu.RLock() - defer h.mu.RUnlock() - return append([]Resource(nil), h.resources...) -} - -// ServerNames returns the connected servers' names, in connection order. -func (h *Host) ServerNames() []string { - h.mu.RLock() - defer h.mu.RUnlock() - names := make([]string, len(h.clients)) - for i, c := range h.clients { - names[i] = c.name - } - return names -} - // ReadResource reads a resource uri from the named server. It is how the chat // UI resolves an @server:uri reference — the uri need not be one listed by // resources/list (servers may expose templated uris), so we read it directly. @@ -463,7 +443,13 @@ func Start(ctx context.Context, specs []Spec, p StartPolicy) (*Host, []tool.Tool } continue } - h.clients = append(h.clients, r.client) + if err := h.noteClientLocked(r.client, nil); err != nil { + r.client.close() + if firstErr == nil { + firstErr = err + } + continue + } tools = append(tools, r.tools...) // prompts/resources are filled in later by StartPhaseB. } @@ -599,9 +585,16 @@ func (h *Host) fetchResources(ctx context.Context, c *Client, sink event.Sink) { // JSON-RPC. The MCP-level methods (initialize, listTools, …) are transport- // agnostic — they go through t. type Client struct { - name string - t transport - spec Spec + name string + instanceID uint64 // Host-local identity for RemoveIfInstance rollback + t transport + spec Spec + + // registrationClaims and registrationCommitted are guarded by Host.mu. + // Claims keep a tentative shared instance alive across overlapping builds; + // the first published controller promotes it to ordinary Host ownership. + registrationClaims map[uint64]struct{} + registrationCommitted bool // Capabilities advertised by the server at initialize. prompts/list and // resources/list are only called when advertised, so we never provoke a @@ -774,37 +767,6 @@ func (h *Host) Servers() []ServerStatus { return out } -// Failures returns configured MCP servers that failed to connect. -func (h *Host) Failures() []Failure { - h.mu.RLock() - defer h.mu.RUnlock() - out := make([]Failure, len(h.failures)) - copy(out, h.failures) - return out -} - -// ConnectingServers returns server names whose startup handshake is currently in -// flight. It is intentionally status-only: connected clients and failures remain -// the source of truth for ready/issue states. -func (h *Host) ConnectingServers() []string { - h.spawningMu.Lock() - defer h.spawningMu.Unlock() - names := make(map[string]struct{}, len(h.spawning)) - for key, attempt := range h.spawning { - name := key - if attempt != nil && strings.TrimSpace(attempt.server) != "" { - name = attempt.server - } - names[name] = struct{}{} - } - out := make([]string, 0, len(names)) - for name := range names { - out = append(out, name) - } - sort.Strings(out) - return out -} - // RecordFailure stores a failed MCP connection attempt for status UIs. func (h *Host) RecordFailure(s Spec, err error) { h.mu.Lock() @@ -1019,6 +981,9 @@ func (h *Host) ToolsFor(ctx context.Context, name string) ([]tool.Tool, error) { if c == nil { return nil, fmt.Errorf("client %q not found on shared host", name) } + if err := h.claimClientFromContext(ctx, c); err != nil { + return nil, err + } if tools, ok := c.cachedTools(); ok { return tools, nil } @@ -1043,6 +1008,9 @@ func (h *Host) ToolsForSpec(ctx context.Context, spec Spec) ([]tool.Tool, error) if !MCPRuntimeSpecMatches(c.spec, spec) { return nil, fmt.Errorf("connected MCP server %q identity does not match the current runtime configuration", spec.Name) } + if err := h.claimClientFromContext(ctx, c); err != nil { + return nil, err + } if tools, ok := c.cachedTools(); ok { return tools, nil } @@ -1302,7 +1270,14 @@ func (h *Host) addConnectedWithLifecycle(lifeCtx, callCtx context.Context, s Spe c.close() return nil, serverAlreadyConnectedError(s.Name) } - h.clients = append(h.clients, c) + // Attribute ownership from lifeCtx so LazyToolset background kicks and + // boot.Build share the same RegistrationScope token. Sibling hot-adds + // without a scope are never journaled to a concurrent build. + if err := h.noteClientFromContext(lifeCtx, c); err != nil { + h.mu.Unlock() + c.close() + return nil, err + } h.clearFailure(s.Name) h.mu.Unlock() // Prompts and resources stream in on the long lifeCtx the caller passed (Host.Add @@ -1349,25 +1324,7 @@ func (h *Host) Remove(name string) (toolPrefix string, found bool) { } return ToolPrefix(name), true } - removed := h.clients[idx] - h.clients = append(h.clients[:idx], h.clients[idx+1:]...) - - keptP := h.prompts[:0] - for _, p := range h.prompts { - if p.Server != name { - keptP = append(keptP, p) - } - } - h.prompts = keptP - - keptR := h.resources[:0] - for _, r := range h.resources { - if r.Server != name { - keptR = append(keptR, r) - } - } - h.resources = keptR - h.clearFailure(name) + removed := h.removeClientAtLocked(idx) h.mu.Unlock() for _, cancel := range cancels { @@ -1621,8 +1578,6 @@ func (c *Client) notify(ctx context.Context, method string, params any) error { return c.t.notify(ctx, method, params) } -func (c *Client) close() { c.t.close() } - func isHTTPSessionExpired(err error) bool { var expired *httpSessionExpiredError return errors.As(err, &expired) diff --git a/internal/plugin/proxy.go b/internal/plugin/proxy.go index ef34de5b8f..d308f0161e 100644 --- a/internal/plugin/proxy.go +++ b/internal/plugin/proxy.go @@ -23,20 +23,13 @@ func newServerProxy(name string) *serverProxy { } func (p *serverProxy) replace(ctx context.Context, next *Client, generation uint64) error { - if p == nil { - return fmt.Errorf("plugin: nil server proxy") - } - if p.closed.Load() { + prev, err := p.swap(next, generation) + if err != nil { if next != nil { next.close() } - return fmt.Errorf("plugin: server proxy %q closed", p.name) + return err } - p.mu.Lock() - prev := p.active - p.active = next - p.generation = generation - p.mu.Unlock() if prev != nil && prev != next && prev.t != nil { prev.close() } @@ -44,6 +37,21 @@ func (p *serverProxy) replace(ctx context.Context, next *Client, generation uint return nil } +func (p *serverProxy) swap(next *Client, generation uint64) (*Client, error) { + if p == nil { + return nil, fmt.Errorf("plugin: nil server proxy") + } + if p.closed.Load() { + return nil, fmt.Errorf("plugin: server proxy %q closed", p.name) + } + p.mu.Lock() + prev := p.active + p.active = next + p.generation = generation + p.mu.Unlock() + return prev, nil +} + func (p *serverProxy) client() *Client { if p == nil { return nil @@ -53,6 +61,21 @@ func (p *serverProxy) client() *Client { return p.active } +// detachIf clears the active backend only when it is the exact instance being +// removed. The caller closes the client after releasing Host.mu. +func (p *serverProxy) detachIf(client *Client) bool { + if p == nil || client == nil { + return false + } + p.mu.Lock() + defer p.mu.Unlock() + if p.active != client { + return false + } + p.active = nil + return true +} + func (p *serverProxy) close() { if p == nil || !p.closed.CompareAndSwap(false, true) { return @@ -121,20 +144,51 @@ func (h *Host) ReplaceServerBackend(ctx context.Context, name string, next *Clie p = newServerProxy(name) h.proxies[name] = p } - // Keep clients slice consistent: remove previous, append next. - if prev := p.client(); prev != nil { - for i, c := range h.clients { - if c == prev { + // Publish the proxy and clients slice under the same Host lock. Otherwise a + // scope rollback can remove next after h.mu is released but before p.replace + // publishes it, leaving the proxy pointed at a closed client. + prev := p.client() + if prev == next { + _, err := p.swap(next, generation) + h.mu.Unlock() + return err + } + if next != nil { + if err := h.noteClientFromContext(ctx, next); err != nil { + h.mu.Unlock() + next.close() + return err + } + } + replaced, err := p.swap(next, generation) + if err != nil { + if next != nil { + for i, client := range h.clients { + if client == next { + h.clients = append(h.clients[:i], h.clients[i+1:]...) + break + } + } + } + h.mu.Unlock() + if next != nil { + next.close() + } + return err + } + if prev != nil { + for i, client := range h.clients { + if client == prev { h.clients = append(h.clients[:i], h.clients[i+1:]...) break } } } - if next != nil { - h.clients = append(h.clients, next) - } h.mu.Unlock() - return p.replace(ctx, next, generation) + if replaced != nil && replaced != next && replaced.t != nil { + replaced.close() + } + return nil } func (h *Host) lookupClient(name string) *Client { @@ -143,6 +197,12 @@ func (h *Host) lookupClient(name string) *Client { } h.mu.RLock() defer h.mu.RUnlock() + return h.lookupClientLocked(name) +} + +// lookupClientLocked returns the active exact client. Caller holds h.mu for +// read or write; proxy.client has its own leaf lock. +func (h *Host) lookupClientLocked(name string) *Client { if h.closed { return nil } diff --git a/internal/plugin/registration_journal_test.go b/internal/plugin/registration_journal_test.go new file mode 100644 index 0000000000..a134307a85 --- /dev/null +++ b/internal/plugin/registration_journal_test.go @@ -0,0 +1,238 @@ +package plugin + +import ( + "context" + "errors" + "testing" +) + +func TestRegistrationScopeRollbackIsInstanceScoped(t *testing.T) { + host := NewHost() + // Pre-existing sibling client accepted under scope A. + siblingA := &Client{name: "sibling"} + scopeA := host.BeginRegistrationScope() + ctxA := ContextWithRegistrationScope(context.Background(), scopeA) + if err := host.ReplaceServerBackend(ctxA, "sibling", siblingA, 1); err != nil { + t.Fatal(err) + } + refsA := scopeA.Snapshot() + if len(refsA) != 1 || refsA[0].Name != "sibling" || refsA[0].ID == 0 { + t.Fatalf("scope A = %+v", refsA) + } + idA := refsA[0].ID + + // Stale build journals a replacement for the same name plus a new server. + staleSibling := &Client{name: "sibling"} + staleNew := &Client{name: "stale-new"} + scopeStale := host.BeginRegistrationScope() + ctxStale := ContextWithRegistrationScope(context.Background(), scopeStale) + if err := host.ReplaceServerBackend(ctxStale, "sibling", staleSibling, 2); err != nil { + t.Fatal(err) + } + if err := host.ReplaceServerBackend(ctxStale, "stale-new", staleNew, 2); err != nil { + t.Fatal(err) + } + refsStale := scopeStale.Snapshot() + if len(refsStale) != 2 { + t.Fatalf("stale scope len = %d, want 2: %+v", len(refsStale), refsStale) + } + var staleSiblingID uint64 + for _, ref := range refsStale { + if ref.Name == "sibling" { + staleSiblingID = ref.ID + } + } + if staleSiblingID == 0 || staleSiblingID == idA { + t.Fatalf("stale sibling id = %d, original = %d", staleSiblingID, idA) + } + + // Sibling/new-generation resource created AFTER the stale scope must survive + // rollback (name-diff would delete it incorrectly). No scope token. + siblingNewGen := &Client{name: "sibling-new-gen"} + if err := host.ReplaceServerBackend(context.Background(), "sibling-new-gen", siblingNewGen, 3); err != nil { + t.Fatal(err) + } + // Newer generation also replaces the shared name after the stale scope ends. + newerSibling := &Client{name: "sibling"} + if err := host.ReplaceServerBackend(context.Background(), "sibling", newerSibling, 4); err != nil { + t.Fatal(err) + } + newerID := newerSibling.instanceID + if newerID == 0 || newerID == staleSiblingID { + t.Fatalf("newer sibling id = %d, stale = %d", newerID, staleSiblingID) + } + + scopeStale.AbortAndRollback() + + names := map[string]bool{} + for _, name := range host.ServerNames() { + names[name] = true + } + if names["stale-new"] { + t.Fatal("stale-new survived instance-scoped rollback") + } + if !names["sibling-new-gen"] { + t.Fatal("sibling-new-gen was incorrectly removed by stale scope rollback") + } + if !names["sibling"] { + t.Fatal("newer-generation sibling instance was incorrectly removed") + } + if host.lookupClient("sibling") == nil || host.lookupClient("sibling").instanceID != newerID { + t.Fatalf("sibling live instance = %+v, want id %d", host.lookupClient("sibling"), newerID) + } + if host.RemoveIfInstance("sibling", idA) { + t.Fatal("RemoveIfInstance removed a non-matching/missing instance") + } + if host.RemoveIfInstance("sibling", staleSiblingID) { + t.Fatal("RemoveIfInstance removed the newer instance via stale id") + } +} + +// TestRegistrationScopeIgnoresUnrelatedHostWrites is the deterministic +// interleaving that Host-global regJournalActive fails: while a stale build +// holds an open scope, a sibling hot-add without the scope token must not be +// attributed to the stale build or deleted by its rollback. +func TestRegistrationScopeIgnoresUnrelatedHostWrites(t *testing.T) { + host := NewHost() + scopeStale := host.BeginRegistrationScope() + ctxStale := ContextWithRegistrationScope(context.Background(), scopeStale) + + // Sibling hot-add during the open scope WITHOUT the token. + sibling := &Client{name: "sibling-hot-add"} + if err := host.ReplaceServerBackend(context.Background(), "sibling-hot-add", sibling, 1); err != nil { + t.Fatal(err) + } + // Stale build also registers its own server under the scope. + staleOnly := &Client{name: "stale-only"} + if err := host.ReplaceServerBackend(ctxStale, "stale-only", staleOnly, 1); err != nil { + t.Fatal(err) + } + + refs := scopeStale.Snapshot() + for _, ref := range refs { + if ref.Name == "sibling-hot-add" { + t.Fatalf("journal captured unrelated Host write: %+v", refs) + } + } + if len(refs) != 1 || refs[0].Name != "stale-only" { + t.Fatalf("stale scope refs = %+v, want only stale-only", refs) + } + + scopeStale.AbortAndRollback() + + names := map[string]bool{} + for _, name := range host.ServerNames() { + names[name] = true + } + if names["stale-only"] { + t.Fatal("stale-only survived AbortAndRollback") + } + if !names["sibling-hot-add"] { + t.Fatal("sibling-hot-add was deleted by stale scope rollback") + } +} + +func TestRegistrationScopeRejectsLateRegistrationAfterAbort(t *testing.T) { + host := NewHost() + scope := host.BeginRegistrationScope() + ctx := ContextWithRegistrationScope(context.Background(), scope) + scope.AbortAndRollback() + + late := &Client{name: "late"} + err := host.ReplaceServerBackend(ctx, "late", late, 1) + if !errors.Is(err, ErrRegistrationScopeAborted) { + t.Fatalf("late registration err = %v, want ErrRegistrationScopeAborted", err) + } + for _, name := range host.ServerNames() { + if name == "late" { + t.Fatal("aborted scope accepted a late client") + } + } +} + +func TestRegistrationScopeCommitPreservesClientReusedByNewerBuild(t *testing.T) { + host := NewHost() + older := host.BeginRegistrationScope() + olderCtx := ContextWithRegistrationScope(context.Background(), older) + client := &Client{name: "shared", toolsListed: true} + if err := host.ReplaceServerBackend(olderCtx, "shared", client, 1); err != nil { + t.Fatal(err) + } + + newer := host.BeginRegistrationScope() + newerCtx := ContextWithRegistrationScope(context.Background(), newer) + if _, err := host.ToolsFor(newerCtx, "shared"); err != nil { + t.Fatalf("newer build failed to reuse shared client: %v", err) + } + if !newer.Commit() { + t.Fatal("newer build could not commit its shared-client claim") + } + + older.AbortAndRollback() + if got := host.lookupClient("shared"); got != client { + t.Fatalf("older rollback removed client committed by newer build: got=%p want=%p", got, client) + } +} + +func TestRegistrationScopeActiveClaimDefersCreatorRollback(t *testing.T) { + host := NewHost() + creator := host.BeginRegistrationScope() + creatorCtx := ContextWithRegistrationScope(context.Background(), creator) + client := &Client{name: "shared", toolsListed: true} + if err := host.ReplaceServerBackend(creatorCtx, "shared", client, 1); err != nil { + t.Fatal(err) + } + + consumer := host.BeginRegistrationScope() + consumerCtx := ContextWithRegistrationScope(context.Background(), consumer) + if _, err := host.ToolsFor(consumerCtx, "shared"); err != nil { + t.Fatal(err) + } + creator.AbortAndRollback() + if !host.HasClient("shared") { + t.Fatal("creator rollback removed a client claimed by an active consumer") + } + + consumer.AbortAndRollback() + if host.HasClient("shared") { + t.Fatal("client survived after every uncommitted scope aborted") + } + if got := host.lookupClient("shared"); got != nil { + t.Fatalf("proxy still exposed rolled-back client: %+v", got) + } +} + +func TestCommittedScopeAcceptsLateLazyRegistration(t *testing.T) { + host := NewHost() + scope := host.BeginRegistrationScope() + ctx := ContextWithRegistrationScope(context.Background(), scope) + if !scope.Commit() { + t.Fatal("commit failed") + } + + late := &Client{name: "late"} + if err := host.ReplaceServerBackend(ctx, "late", late, 1); err != nil { + t.Fatalf("published scope rejected a late lazy registration: %v", err) + } + scope.AbortAndRollback() + if got := host.lookupClient("late"); got != late { + t.Fatal("committed scope rollback removed its late lazy registration") + } +} + +func TestRegistrationScopesRemainIndependentWhileBothActive(t *testing.T) { + host := NewHost() + first := host.BeginRegistrationScope() + second := host.BeginRegistrationScope() + firstCtx := ContextWithRegistrationScope(context.Background(), first) + secondCtx := ContextWithRegistrationScope(context.Background(), second) + if err := host.ReplaceServerBackend(firstCtx, "a", &Client{name: "a"}, 1); err != nil { + t.Fatal(err) + } + if err := host.ReplaceServerBackend(secondCtx, "b", &Client{name: "b"}, 1); err != nil { + t.Fatal(err) + } + if len(first.Snapshot()) != 1 || len(second.Snapshot()) != 1 { + t.Fatalf("active scope claims leaked: first=%+v second=%+v", first.Snapshot(), second.Snapshot()) + } +} diff --git a/internal/plugin/registration_scope.go b/internal/plugin/registration_scope.go new file mode 100644 index 0000000000..698f65f81e --- /dev/null +++ b/internal/plugin/registration_scope.go @@ -0,0 +1,389 @@ +package plugin + +import ( + "context" + "errors" + "fmt" + "strings" + "sync" +) + +// HostClientRef identifies one live Client instance on a Host. Desktop +// generation-rollback uses RemoveIfInstance so a lost build cannot tear down +// sibling or newer-generation connections that only share a server name. +type HostClientRef struct { + Name string + ID uint64 +} + +// ErrRegistrationScopeAborted is returned when a connection completes after +// its owning build scope was aborted (generation loss / superseded build). +var ErrRegistrationScopeAborted = errors.New("plugin: registration scope aborted") + +type registrationScopeKey struct{} + +type registrationScopeState uint8 + +const ( + registrationScopeActive registrationScopeState = iota + registrationScopeCommitted + registrationScopeAborted +) + +type registrationRecordState uint8 + +const ( + registrationRecordRejected registrationRecordState = iota + registrationRecordActive + registrationRecordCommitted +) + +// RegistrationScope is a per-build ownership token for Host client +// registrations. Only connections that carry this scope via context are +// attributed to the build; sibling hot-adds omit it. Scopes do not serialize +// Host mutations. Abort rejects late LazyToolset registrations. +type RegistrationScope struct { + host *Host + id uint64 + + mu sync.Mutex + refs []HostClientRef + state registrationScopeState +} + +// BeginRegistrationScope creates an independent ownership token for one +// controller build. Callers must propagate it with ContextWithRegistrationScope +// on both synchronous and asynchronous MCP connection paths. +func (h *Host) BeginRegistrationScope() *RegistrationScope { + if h == nil { + return &RegistrationScope{} + } + return &RegistrationScope{ + host: h, + id: h.nextScopeID.Add(1), + } +} + +// ContextWithRegistrationScope attaches scope to ctx for EnsureConnected / +// LazyToolset / ReplaceServerBackend ownership attribution. +func ContextWithRegistrationScope(ctx context.Context, scope *RegistrationScope) context.Context { + if ctx == nil { + ctx = context.Background() + } + if scope == nil { + return ctx + } + return context.WithValue(ctx, registrationScopeKey{}, scope) +} + +// RegistrationScopeFromContext returns the build scope on ctx, if any. +func RegistrationScopeFromContext(ctx context.Context) *RegistrationScope { + if ctx == nil { + return nil + } + scope, _ := ctx.Value(registrationScopeKey{}).(*RegistrationScope) + return scope +} + +// ID returns the Host-local scope identifier (0 when Host was nil). +func (s *RegistrationScope) ID() uint64 { + if s == nil { + return 0 + } + return s.id +} + +// Aborted reports whether AbortAndRollback has been called. +func (s *RegistrationScope) Aborted() bool { + if s == nil { + return false + } + s.mu.Lock() + defer s.mu.Unlock() + return s.state == registrationScopeAborted +} + +// Committed reports whether the owning controller build was published. Late +// LazyToolset connections are accepted after commit and become Host-owned +// immediately; abort is terminal only for scopes that never published. +func (s *RegistrationScope) Committed() bool { + if s == nil { + return false + } + s.mu.Lock() + defer s.mu.Unlock() + return s.state == registrationScopeCommitted +} + +// Snapshot returns the client instances attributed to this scope. +func (s *RegistrationScope) Snapshot() []HostClientRef { + if s == nil { + return nil + } + s.mu.Lock() + defer s.mu.Unlock() + return append([]HostClientRef(nil), s.refs...) +} + +// record appends an active claim, reports that a published scope should commit +// the instance immediately, or rejects a late registration after abort. +func (s *RegistrationScope) record(ref HostClientRef) registrationRecordState { + if s == nil { + return registrationRecordCommitted + } + s.mu.Lock() + defer s.mu.Unlock() + switch s.state { + case registrationScopeAborted: + return registrationRecordRejected + case registrationScopeCommitted: + return registrationRecordCommitted + } + for _, existing := range s.refs { + if existing.ID == ref.ID { + return registrationRecordActive + } + } + s.refs = append(s.refs, ref) + return registrationRecordActive +} + +// Commit publishes every instance used by this build into Host ownership. +// It returns false only when the scope was already aborted. Commit is +// idempotent, and late registrations on a committed scope are committed by +// noteClientLocked/claimClientFromContext as they arrive. +func (s *RegistrationScope) Commit() bool { + if s == nil { + return true + } + s.mu.Lock() + switch s.state { + case registrationScopeAborted: + s.mu.Unlock() + return false + case registrationScopeCommitted: + s.mu.Unlock() + return true + } + s.state = registrationScopeCommitted + refs := append([]HostClientRef(nil), s.refs...) + s.refs = nil + s.mu.Unlock() + if s.host != nil { + s.host.commitRegistration(s.id, refs) + } + return true +} + +// AbortAndRollback marks the scope aborted (rejecting late registrations) and +// removes every instance previously recorded under this scope. +func (s *RegistrationScope) AbortAndRollback() { + if s == nil { + return + } + s.mu.Lock() + if s.state != registrationScopeActive { + s.mu.Unlock() + return + } + s.state = registrationScopeAborted + refs := append([]HostClientRef(nil), s.refs...) + s.refs = nil + s.mu.Unlock() + if s.host != nil { + s.host.rollbackRegistration(s.id, refs) + } +} + +// noteClientLocked assigns an instance ID and records ownership on scope. +// Caller holds h.mu. Aborted scopes return ErrRegistrationScopeAborted and do +// not leave c in h.clients (caller closes c). +func (h *Host) noteClientLocked(c *Client, scope *RegistrationScope) error { + if c == nil { + return nil + } + if c.instanceID == 0 { + c.instanceID = h.nextInstanceID.Add(1) + } + // Append first, then record. Aborted scopes unpublish immediately. Clients + // registered outside a build scope are already Host-owned. + h.clients = append(h.clients, c) + if scope == nil { + c.registrationCommitted = true + return nil + } + switch scope.record(HostClientRef{Name: c.name, ID: c.instanceID}) { + case registrationRecordRejected: + h.clients = h.clients[:len(h.clients)-1] + return ErrRegistrationScopeAborted + case registrationRecordCommitted: + c.registrationCommitted = true + case registrationRecordActive: + if c.registrationClaims == nil { + c.registrationClaims = make(map[uint64]struct{}) + } + c.registrationClaims[scope.id] = struct{}{} + } + return nil +} + +// noteClientFromContext is noteClientLocked using the scope on ctx. +func (h *Host) noteClientFromContext(ctx context.Context, c *Client) error { + return h.noteClientLocked(c, RegistrationScopeFromContext(ctx)) +} + +// claimClientFromContext attributes reuse of an existing exact instance to the +// current build. The instance is revalidated under Host.mu so a concurrent +// replace/remove cannot turn a pre-check into a stale claim. +func (h *Host) claimClientFromContext(ctx context.Context, c *Client) error { + if h == nil || c == nil { + return errors.New("plugin: client is unavailable") + } + h.mu.Lock() + defer h.mu.Unlock() + if h.closed { + return errors.New("plugin host is closed") + } + if live := h.lookupClientLocked(c.name); live != c { + return fmt.Errorf("client %q changed while being claimed", c.name) + } + scope := RegistrationScopeFromContext(ctx) + if scope == nil { + return nil + } + switch scope.record(HostClientRef{Name: c.name, ID: c.instanceID}) { + case registrationRecordRejected: + return ErrRegistrationScopeAborted + case registrationRecordCommitted: + c.registrationCommitted = true + case registrationRecordActive: + if c.registrationClaims == nil { + c.registrationClaims = make(map[uint64]struct{}) + } + c.registrationClaims[scope.id] = struct{}{} + } + return nil +} + +// RemoveIfInstance disconnects name only when the live client instance ID still +// matches. Returns whether a matching client was removed. +func (h *Host) RemoveIfInstance(name string, instanceID uint64) bool { + if h == nil || instanceID == 0 { + return false + } + name = strings.TrimSpace(name) + if name == "" { + return false + } + h.mu.Lock() + idx := -1 + var removed *Client + for i, c := range h.clients { + if c != nil && c.name == name && c.instanceID == instanceID { + idx = i + removed = c + break + } + } + if idx < 0 || removed == nil { + h.mu.Unlock() + return false + } + removed = h.removeClientAtLocked(idx) + h.mu.Unlock() + removed.close() + return true +} + +func (h *Host) commitRegistration(scopeID uint64, refs []HostClientRef) { + if h == nil || scopeID == 0 { + return + } + h.mu.Lock() + defer h.mu.Unlock() + for _, ref := range refs { + _, client := h.findClientInstanceLocked(ref.Name, ref.ID) + if client == nil { + continue + } + delete(client.registrationClaims, scopeID) + client.registrationCommitted = true + } +} + +func (h *Host) rollbackRegistration(scopeID uint64, refs []HostClientRef) { + if h == nil || scopeID == 0 { + return + } + h.mu.Lock() + removed := make([]*Client, 0, len(refs)) + for _, ref := range refs { + idx, client := h.findClientInstanceLocked(ref.Name, ref.ID) + if client == nil { + continue + } + delete(client.registrationClaims, scopeID) + if client.registrationCommitted || len(client.registrationClaims) > 0 { + continue + } + if removedClient := h.removeClientAtLocked(idx); removedClient != nil { + removed = append(removed, removedClient) + } + } + h.mu.Unlock() + for _, client := range removed { + client.close() + } +} + +func (h *Host) findClientInstanceLocked(name string, instanceID uint64) (int, *Client) { + for i, client := range h.clients { + if client != nil && client.name == name && client.instanceID == instanceID { + return i, client + } + } + return -1, nil +} + +// removeClientAtLocked removes one exact live instance without touching +// name-wide deferred startup generations. The owning build context cancels its +// own lazy work; canceling every entry for the name would affect newer builds. +func (h *Host) removeClientAtLocked(idx int) *Client { + if idx < 0 || idx >= len(h.clients) { + return nil + } + removed := h.clients[idx] + h.clients = append(h.clients[:idx], h.clients[idx+1:]...) + if h.proxies != nil { + if proxy := h.proxies[removed.name]; proxy != nil { + proxy.detachIf(removed) + } + } + keptPrompts := h.prompts[:0] + for _, prompt := range h.prompts { + if prompt.Server != removed.name { + keptPrompts = append(keptPrompts, prompt) + } + } + h.prompts = keptPrompts + keptResources := h.resources[:0] + for _, resource := range h.resources { + if resource.Server != removed.name { + keptResources = append(keptResources, resource) + } + } + h.resources = keptResources + h.clearFailure(removed.name) + return removed +} + +// RollbackRegistration removes every journaled client instance. Safe when a +// ref is already gone (RemoveIfInstance is a no-op). +func (h *Host) RollbackRegistration(refs []HostClientRef) { + if h == nil { + return + } + for _, ref := range refs { + h.RemoveIfInstance(ref.Name, ref.ID) + } +} diff --git a/internal/pluginpkg/compat_legacy_test.go b/internal/pluginpkg/compat_legacy_test.go index 9104730cd2..c8e659ac57 100644 --- a/internal/pluginpkg/compat_legacy_test.go +++ b/internal/pluginpkg/compat_legacy_test.go @@ -53,3 +53,62 @@ func TestV1NativeManifestRejected(t *testing.T) { t.Fatalf("ParseNativeForMigrate v1 = %v, want unsupported apiVersion", err) } } + +func TestLoadInstalledAutoMigratesManagedLegacyManifest(t *testing.T) { + home := t.TempDir() + root := InstallRoot(home, "legacy-demo") + if err := os.MkdirAll(root, 0o755); err != nil { + t.Fatal(err) + } + legacy := `{"name":"legacy-demo","version":"1.0.0"}` + if err := os.WriteFile(filepath.Join(root, NativeManifest), []byte(legacy), 0o644); err != nil { + t.Fatal(err) + } + if err := Upsert(home, InstalledPlugin{Name: "legacy-demo", Root: RelativeRoot(home, root), Enabled: true}); err != nil { + t.Fatal(err) + } + + installed, warnings := LoadInstalled(home) + if len(warnings) != 1 || !strings.Contains(warnings[0], "automatically migrated") { + t.Fatalf("warnings = %v", warnings) + } + if len(installed) != 1 || installed[0].Package.Manifest.APIVersion != ManifestAPIVersionV2 { + t.Fatalf("installed = %#v", installed) + } + backup, err := os.ReadFile(filepath.Join(root, NativeManifest+".bak")) + if err != nil || string(backup) != legacy { + t.Fatalf("backup = %q, err=%v", backup, err) + } +} + +func TestLoadInstalledQuarantinesExternalLegacyManifestWithoutModifyingIt(t *testing.T) { + home := t.TempDir() + root := t.TempDir() + legacy := `{"name":"dev-demo","version":"1.0.0"}` + manifestPath := filepath.Join(root, NativeManifest) + if err := os.WriteFile(manifestPath, []byte(legacy), 0o644); err != nil { + t.Fatal(err) + } + if err := Upsert(home, InstalledPlugin{Name: "dev-demo", Root: root, Enabled: true}); err != nil { + t.Fatal(err) + } + + installed, warnings := LoadInstalled(home) + if len(installed) != 0 { + t.Fatalf("external incompatible plugin loaded: %#v", installed) + } + if len(warnings) != 1 || !strings.Contains(warnings[0], PluginStatusDisabledIncompatible) || !strings.Contains(warnings[0], "plugin migrate dev-demo --to-v2") { + t.Fatalf("warnings = %v", warnings) + } + after, err := os.ReadFile(manifestPath) + if err != nil || string(after) != legacy { + t.Fatalf("external manifest changed: %q, err=%v", after, err) + } + state, err := LoadState(home) + if err != nil { + t.Fatal(err) + } + if len(state.Plugins) != 1 || state.Plugins[0].Status != PluginStatusDisabledIncompatible { + t.Fatalf("plugin state = %#v", state.Plugins) + } +} diff --git a/internal/pluginpkg/installed_compat.go b/internal/pluginpkg/installed_compat.go new file mode 100644 index 0000000000..a7140f9f44 --- /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.SplitSeq(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/manifest_v2.go b/internal/pluginpkg/manifest_v2.go index 682a9cb35e..9ea9e3e79d 100644 --- a/internal/pluginpkg/manifest_v2.go +++ b/internal/pluginpkg/manifest_v2.go @@ -9,13 +9,15 @@ import ( "strings" "reasonix/internal/extensioncontract" + "reasonix/internal/fileutil" fileencoding "reasonix/internal/fileutil/encoding" ) // ManifestAPIVersionV2 is the only native plugin manifest apiVersion Reasonix // accepts for install, doctor, and boot. v1 and legacy (no apiVersion) native -// manifests are rejected. The explicit migrate command is only for legacy -// pre-extension manifests that omit apiVersion. +// manifests are rejected by the parser. Legacy pre-extension manifests can be +// upgraded explicitly, or automatically when they live in Reasonix's managed +// plugin directory where an atomic backup is safe. const ManifestAPIVersionV2 = "reasonix.io/plugin/v2" // CapabilityRef is the wire form of a capability in a v2 manifest. @@ -370,14 +372,14 @@ func WriteMigratedManifestV2(root string, data []byte) error { path := filepath.Join(root, NativeManifest) if b, err := os.ReadFile(path); err == nil { bak := path + ".bak" - if err := os.WriteFile(bak, b, 0o644); err != nil { + if err := fileutil.AtomicWriteFile(bak, b, 0o644); err != nil { return fmt.Errorf("migrate: backup: %w", err) } } if !strings.HasSuffix(string(data), "\n") { data = append(data, '\n') } - return os.WriteFile(path, data, 0o644) + return fileutil.AtomicWriteFile(path, data, 0o644) } // ParseNativeForMigrate accepts legacy native manifests without apiVersion for diff --git a/internal/pluginpkg/pluginpkg.go b/internal/pluginpkg/pluginpkg.go index f4bed0a103..e096c29f7d 100644 --- a/internal/pluginpkg/pluginpkg.go +++ b/internal/pluginpkg/pluginpkg.go @@ -29,6 +29,8 @@ const ( ClaudeManifest = ".claude-plugin/plugin.json" StateFilename = "plugin-packages.json" + PluginStatusDisabledIncompatible = "disabled_incompatible" + claudeSettingsPath = ".claude/settings.json" claudeInstructions = "CLAUDE.md" ) @@ -255,6 +257,8 @@ type InstalledPlugin struct { ManifestKind string `json:"manifestKind,omitempty"` Enabled bool `json:"enabled"` Commit string `json:"commit,omitempty"` + Status string `json:"status,omitempty"` + StatusReason string `json:"statusReason,omitempty"` } type InstalledPackage struct { @@ -369,29 +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) { - st, err := LoadState(reasonixHome) - if err != nil { - return nil, []string{err.Error()} - } - var out []InstalledPackage - var warnings []string - for _, installed := range st.Plugins { - if !installed.Enabled { - continue - } - root := ResolveRoot(reasonixHome, installed.Root) - pkg, pkgWarnings, err := ParseDir(root) - if err != nil { - warnings = append(warnings, fmt.Sprintf("%s: %v", installed.Name, err)) - continue - } - out = append(out, InstalledPackage{Installed: installed, Package: pkg, Warnings: pkgWarnings}) - } - sort.SliceStable(out, func(i, j int) bool { return out[i].Installed.Name < out[j].Installed.Name }) - return out, warnings -} - func ResolveRoot(reasonixHome, root string) string { if filepath.IsAbs(root) { return filepath.Clean(root) diff --git a/internal/projectiondb/projectiondb.go b/internal/projectiondb/projectiondb.go new file mode 100644 index 0000000000..4580388218 --- /dev/null +++ b/internal/projectiondb/projectiondb.go @@ -0,0 +1,500 @@ +// 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" + + "reasonix/internal/filelock" + + 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 + // RequireDisk disables the process-local memory fallback. Rebuild uses this + // so a failed temporary open reports the real disk error instead of + // "could not use disk storage" after silently opening :memory:. + RequireDisk 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" + } + // Blank paths must never become relative "v1.sqlite" files under cwd. + if strings.TrimSpace(opts.Path) == "" { + opts.Path = "" + opts.InMemory = true + } + 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 { + if opts.RequireDisk { + return nil, fmt.Errorf("create projection directory: %w", err) + } + useMemory = true + status.LastError = err.Error() + } else { + _ = os.Chmod(filepath.Dir(opts.Path), 0o700) + if filesystemRemote(filepath.Dir(opts.Path)) { + if opts.RequireDisk { + return nil, errors.New("projection cache is on a remote filesystem") + } + useMemory = true + status.LastError = "projection cache is on a remote filesystem; using memory" + } + } + } + if useMemory { + if opts.RequireDisk { + return nil, errors.New("projection requires disk storage") + } + 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. + if opts.RequireDisk { + return nil, err + } + 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 { + if opts.RequireDisk { + return nil, err + } + 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. + if opts.RequireDisk { + return nil, err + } + 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 +} + +// diskFileDSN builds a cross-platform SQLite file URI. Windows drive paths must +// be file:///C:/...; a bare file:C:\... URI fails to open and previously forced +// silent memory fallback during rebuild. +func diskFileDSN(path string) string { + abs, err := filepath.Abs(path) + if err != nil { + abs = path + } + slash := filepath.ToSlash(abs) + if runtime.GOOS == "windows" && len(slash) >= 2 && slash[1] == ':' { + // C:/Users/... → /C:/Users/... so the URI becomes file:///C:/Users/... + slash = "/" + slash + } + u := &url.URL{Scheme: "file", Path: slash} + return u.String() + "?_pragma=busy_timeout%28150%29&_pragma=foreign_keys%281%29" +} + +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 { + dsn = diskFileDSN(opts.Path) + } + db, err := sql.Open("sqlite", dsn) + if err != nil { + return nil, err + } + maxOpen := opts.MaxOpenConns + if maxOpen <= 0 { + maxOpen = 4 + } + // Shared-cache memory databases cannot safely pool concurrent writers. + // Disk catalogs retain their requested pool and WAL read concurrency. + if mode == ModeMemory { + maxOpen = 1 + } + 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 { + // Best-effort: some builds/filesystems reject the pragma without making + // the projection unusable. + _, _ = db.ExecContext(ctx, `PRAGMA secure_delete=ON`) + } + if opts.AutoVacuum { + // auto_vacuum can only be changed on an empty database; ignore failures + // on already-initialized files so open does not degrade to memory. + _, _ = db.ExecContext(ctx, `PRAGMA auto_vacuum=INCREMENTAL`) + } + 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() + db, err := sql.Open("sqlite", diskFileDSN(path)+"&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 err := os.MkdirAll(filepath.Dir(opts.Path), 0o700); err != nil { + return fmt.Errorf("create projection rebuild directory: %w", err) + } + release, err := filelock.Acquire(ctx, opts.Path+".rebuild.lock") + if err != nil { + return fmt.Errorf("lock projection rebuild: %w", err) + } + defer release() + 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 + replacement.RequireDisk = true + 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() + detail := strings.TrimSpace(handle.Status.LastError) + if detail == "" { + detail = "unknown open fallback" + } + return fmt.Errorf("projection replacement could not use disk storage: %s", detail) + } + 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..c59bc443ba --- /dev/null +++ b/internal/projectiondb/projectiondb_test.go @@ -0,0 +1,278 @@ +package projectiondb + +import ( + "context" + "database/sql" + "errors" + "os" + "path/filepath" + "strings" + "testing" + "time" + + "reasonix/internal/filelock" +) + +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 TestDiskFileDSNUsesCrossPlatformURI(t *testing.T) { + t.Parallel() + dsn := diskFileDSN(filepath.Join(t.TempDir(), "catalog.sqlite")) + if !strings.HasPrefix(dsn, "file:") { + t.Fatalf("dsn=%q", dsn) + } + if strings.Contains(dsn, `\`) { + t.Fatalf("dsn must use forward slashes: %q", dsn) + } + // Opening through the DSN must succeed on this platform. + handle, err := Open(context.Background(), OpenOptions{ + Path: filepath.Join(t.TempDir(), "opened.sqlite"), MemoryName: "dsn", Migrations: testMigrations(), RequireDisk: true, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = handle.DB.Close() }) + if handle.Status.Mode != ModeDisk { + t.Fatalf("status=%#v", handle.Status) + } +} + +func TestOpenBlankPathUsesMemoryWithoutRequireDisk(t *testing.T) { + t.Parallel() + handle, err := Open(context.Background(), OpenOptions{Path: "", MemoryName: "blank", Migrations: testMigrations()}) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = handle.DB.Close() }) + if handle.Status.Mode != ModeMemory { + t.Fatalf("status=%#v", handle.Status) + } +} + +func TestMemoryOpenUsesOneConnectionDespiteRequestedPool(t *testing.T) { + t.Parallel() + handle, err := Open(context.Background(), OpenOptions{ + InMemory: true, MemoryName: "single-connection", Migrations: testMigrations(), MaxOpenConns: 4, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = handle.DB.Close() }) + if got := handle.DB.Stats().MaxOpenConnections; got != 1 { + t.Fatalf("memory max open connections = %d, want 1 to avoid shared-cache table deadlocks", got) + } +} + +func TestRebuildRequireDiskSurfacesOpenErrors(t *testing.T) { + t.Parallel() + // RequireDisk rebuild of an unwritable parent should not silently memory-open. + parent := filepath.Join(t.TempDir(), "missing-parent", "nested") + err := Rebuild(context.Background(), OpenOptions{ + Path: filepath.Join(parent, "v1.sqlite"), MemoryName: "rebuild-req", Migrations: testMigrations(), + }, func(context.Context, *sql.DB) error { return nil }) + // Either parent creation works (temp dir is writable) or we get a real error. + // When the path is under TempDir, MkdirAll succeeds; verify success path. + if err != nil { + t.Fatalf("rebuild under temp should succeed: %v", 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) + } +} + +func TestRebuildHoldsExclusiveLifecycleLock(t *testing.T) { + t.Parallel() + path := filepath.Join(t.TempDir(), "catalog.sqlite") + opts := OpenOptions{Path: path, MemoryName: "rebuild-lock", Migrations: testMigrations()} + entered := make(chan struct{}) + releasePopulate := make(chan struct{}) + firstDone := make(chan error, 1) + go func() { + firstDone <- Rebuild(context.Background(), opts, func(context.Context, *sql.DB) error { + close(entered) + <-releasePopulate + return nil + }) + }() + <-entered + if release, err := filelock.TryAcquire(path + ".rebuild.lock"); !errors.Is(err, filelock.ErrHeld) { + if err == nil { + release() + } + t.Fatalf("rebuild lifecycle lock error = %v, want held", err) + } + canceled, cancel := context.WithCancel(context.Background()) + cancel() + if err := Rebuild(canceled, opts, nil); !errors.Is(err, context.Canceled) { + t.Fatalf("contended rebuild error = %v, want context canceled", err) + } + close(releasePopulate) + if err := <-firstDone; err != nil { + t.Fatalf("first rebuild: %v", err) + } + release, err := filelock.TryAcquire(path + ".rebuild.lock") + if err != nil { + t.Fatalf("lifecycle lock remained held: %v", err) + } + release() +} diff --git a/internal/projectiondb/remote_fs_darwin.go b/internal/projectiondb/remote_fs_darwin.go new file mode 100644 index 0000000000..5cbdf0fa9d --- /dev/null +++ b/internal/projectiondb/remote_fs_darwin.go @@ -0,0 +1,28 @@ +//go:build darwin + +package projectiondb + +import ( + "strings" + "syscall" +) + +func filesystemRemote(path string) bool { + var stat syscall.Statfs_t + if err := syscall.Statfs(path, &stat); err != nil { + return false + } + name := make([]byte, 0, len(stat.Fstypename)) + for _, char := range stat.Fstypename { + if char == 0 { + break + } + name = append(name, byte(char)) + } + switch strings.ToLower(string(name)) { + case "nfs", "smbfs", "webdav", "afpfs", "cifs": + return true + default: + 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/projectiondb/remote_fs_windows.go b/internal/projectiondb/remote_fs_windows.go new file mode 100644 index 0000000000..9be1077214 --- /dev/null +++ b/internal/projectiondb/remote_fs_windows.go @@ -0,0 +1,23 @@ +//go:build windows + +package projectiondb + +import ( + "path/filepath" + "strings" + + "golang.org/x/sys/windows" +) + +func filesystemRemote(path string) bool { + volume := filepath.VolumeName(filepath.Clean(path)) + if volume == "" { + return false + } + root := volume + if !strings.HasSuffix(root, `\`) { + root += `\` + } + rootPtr, err := windows.UTF16PtrFromString(root) + return err == nil && windows.GetDriveType(rootPtr) == windows.DRIVE_REMOTE +} diff --git a/internal/sessioncatalog/catalog.go b/internal/sessioncatalog/catalog.go new file mode 100644 index 0000000000..67860ae776 --- /dev/null +++ b/internal/sessioncatalog/catalog.go @@ -0,0 +1,691 @@ +package sessioncatalog + +import ( + "context" + "database/sql" + "encoding/base64" + "encoding/json" + "errors" + "fmt" + "os" + "path/filepath" + "strings" + "sync" + "sync/atomic" + "time" + + "reasonix/internal/projectiondb" +) + +const defaultMissingGrace = 30 * time.Second + +type Catalog struct { + db *sql.DB + opts Options + revision atomic.Uint64 + statusMu sync.RWMutex + status Status + writeCh chan string + writeMu sync.Mutex + writeQueued map[string]SessionRecord + // mutationMu is the process-local SQLite single-writer boundary. WAL permits + // concurrent readers, but repair, metadata, and reconcile mutations must not + // race into avoidable SQLITE_BUSY failures. + mutationMu sync.Mutex + removedPaths sync.Map + repairCh chan string + repairQueued sync.Map + reconcileCh chan DirectoryTarget + reconcileQueued sync.Map + reconcileDirtyMu sync.Mutex + reconcileDirty map[string]DirectoryTarget + pathCh chan sessionPathRequest + pathQueued sync.Map + directoryLocksMu sync.Mutex + directoryLocks map[string]*sync.Mutex + workerCtx context.Context + workerCancel context.CancelFunc + stop chan struct{} + stopOnce sync.Once + workers sync.WaitGroup + closeDone chan struct{} + closeErr error +} + +type sessionPathRequest struct { + target DirectoryTarget + path string +} + +type pageCursor struct { + Pinned int `json:"p"` + Activity int64 `json:"a"` + TopicID string `json:"t"` +} + +func Open(ctx context.Context, opts Options) (*Catalog, error) { + if opts.Path == "" { + opts.Path = DefaultPath() + } + if opts.Now == nil { + opts.Now = time.Now + } + if opts.MissingGrace <= 0 { + opts.MissingGrace = defaultMissingGrace + } + 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, + writeCh: make(chan string, opts.QueueCapacity), + writeQueued: map[string]SessionRecord{}, + repairCh: make(chan string, opts.QueueCapacity), + reconcileCh: make(chan DirectoryTarget, 64), + reconcileDirty: map[string]DirectoryTarget{}, + pathCh: make(chan sessionPathRequest, opts.QueueCapacity), + directoryLocks: map[string]*sync.Mutex{}, + stop: make(chan struct{}), + closeDone: make(chan struct{}), + status: Status{State: StateOpening, Path: opts.Path}, + } + handle, err := projectiondb.Open(ctx, projectiondb.OpenOptions{ + Path: opts.Path, + MemoryName: "session-catalog", + Migrations: sessionMigrations(), + InMemory: opts.InMemory, + MaxOpenConns: 4, + Now: opts.Now, + }) + if err != nil { + return nil, err + } + 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 { + _ = c.db.Close() + return nil, err + } + c.workerCtx, c.workerCancel = context.WithCancel(context.Background()) + c.workers.Add(1) + go c.writerLoop() + c.workers.Add(1) + go c.reconcileLoop() + c.workers.Add(1) + go c.sessionPathLoop() + if !opts.DisableRepair { + c.workers.Add(1) + go c.repairLoop() + c.enqueuePersistedRepairs(ctx) + } + return c, nil +} + +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 { + return err + } + c.revision.Store(revision) + c.statusMu.Lock() + c.status.Revision = revision + c.statusMu.Unlock() + c.refreshCounts(ctx) + return nil +} + +func (c *Catalog) Status() Status { + if c == nil { + return Status{State: StateDegraded, Mode: ModeMemory, LastError: "session catalog unavailable"} + } + c.statusMu.RLock() + defer c.statusMu.RUnlock() + return c.status +} + +func (c *Catalog) refreshCounts(ctx context.Context) { + if c == nil || c.db == nil { + return + } + var indexed, pending, total int64 + _ = c.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM catalog_sessions`).Scan(&indexed) + _ = c.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM catalog_sessions WHERE turns_state='unknown'`).Scan(&pending) + _ = c.db.QueryRowContext(ctx, `SELECT COALESCE(SUM(total), 0) FROM catalog_directories`).Scan(&total) + c.statusMu.Lock() + c.status.Indexed = indexed + c.status.Total = total + c.status.RepairPending = pending + c.status.Revision = c.revision.Load() + c.statusMu.Unlock() +} + +func normalizeScope(scope, root string) (string, string) { + if strings.TrimSpace(scope) != "project" { + return "global", "" + } + return "project", strings.TrimSpace(root) +} + +func normalizeSessionRecord(record SessionRecord) SessionRecord { + record.Path = filepath.Clean(record.Path) + if record.Directory == "" { + record.Directory = filepath.Dir(record.Path) + } + record.Directory = filepath.Clean(record.Directory) + record.Scope, record.WorkspaceRoot = normalizeScope(record.Scope, record.WorkspaceRoot) + if record.TurnsState == "" { + record.TurnsState = TurnsUnknown + } + if record.Health == "" { + record.Health = HealthOK + } + return record +} + +func (c *Catalog) EnqueueSession(record SessionRecord) bool { + if c == nil { + return false + } + record = normalizeSessionRecord(record) + c.removedPaths.Delete(record.Path) + c.writeMu.Lock() + if _, loaded := c.writeQueued[record.Path]; loaded { + c.writeQueued[record.Path] = record + c.writeMu.Unlock() + return true + } + c.writeQueued[record.Path] = record + select { + case <-c.stop: + delete(c.writeQueued, record.Path) + c.writeMu.Unlock() + return false + case c.writeCh <- record.Path: + c.writeMu.Unlock() + return true + default: + delete(c.writeQueued, record.Path) + c.writeMu.Unlock() + return false + } +} + +func (c *Catalog) takeQueuedWrite(path string) (SessionRecord, bool) { + c.writeMu.Lock() + defer c.writeMu.Unlock() + record, ok := c.writeQueued[path] + if ok { + delete(c.writeQueued, path) + } + return record, ok +} + +func (c *Catalog) writerLoop() { + defer c.workers.Done() + ticker := time.NewTicker(20 * time.Millisecond) + defer ticker.Stop() + pending := map[string]SessionRecord{} + flush := func() { + if len(pending) == 0 { + return + } + records := make([]SessionRecord, 0, len(pending)) + for _, record := range pending { + records = append(records, record) + } + pending = map[string]SessionRecord{} + ctx, cancel := context.WithTimeout(c.workerCtx, time.Second) + _ = c.upsertSessions(ctx, records, nil, "write") + cancel() + } + for { + select { + case path := <-c.writeCh: + if record, ok := c.takeQueuedWrite(path); ok { + pending[path] = record + } + if len(pending) >= 64 { + flush() + } + case <-ticker.C: + flush() + case <-c.stop: + for { + select { + case path := <-c.writeCh: + if record, ok := c.takeQueuedWrite(path); ok { + pending[path] = record + } + default: + flush() + return + } + } + } + } +} + +func (c *Catalog) UpsertSession(ctx context.Context, record SessionRecord) error { + return c.upsertSessions(ctx, []SessionRecord{normalizeSessionRecord(record)}, nil, "write") +} + +func (c *Catalog) upsertSessions(ctx context.Context, records []SessionRecord, generations map[string]int64, reason string) error { + if len(records) == 0 { + return nil + } + c.mutationMu.Lock() + defer c.mutationMu.Unlock() + filtered := records[:0] + for _, record := range records { + if _, removed := c.removedPaths.Load(filepath.Clean(record.Path)); !removed { + filtered = append(filtered, record) + } + } + records = filtered + if len(records) == 0 { + return nil + } + tx, err := c.db.BeginTx(ctx, nil) + if err != nil { + return err + } + affected := map[TopicKey]struct{}{} + roots := map[string]struct{}{} + directoryGenerations := map[string]int64{} + for _, raw := range records { + record := normalizeSessionRecord(raw) + var previous TopicKey + if err := tx.QueryRowContext(ctx, `SELECT scope,workspace_root,topic_id FROM catalog_sessions WHERE path=?`, record.Path). + Scan(&previous.Scope, &previous.WorkspaceRoot, &previous.TopicID); err == nil && previous.TopicID != "" { + affected[previous] = struct{}{} + } else if err != nil && !errors.Is(err, sql.ErrNoRows) { + _ = tx.Rollback() + return err + } + generation := int64(0) + if generations != nil { + generation = generations[record.Path] + } else if cached, ok := directoryGenerations[record.Directory]; ok { + generation = cached + } else { + _ = tx.QueryRowContext(ctx, `SELECT scan_generation FROM catalog_directories WHERE path=?`, record.Directory).Scan(&generation) + directoryGenerations[record.Directory] = generation + } + if _, err := tx.ExecContext(ctx, `INSERT INTO catalog_sessions( + 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,seen_generation + ) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + ON CONFLICT(path) DO UPDATE SET + directory=excluded.directory, scope=excluded.scope, + workspace_root=excluded.workspace_root, topic_id=excluded.topic_id, + topic_title=excluded.topic_title, custom_title=excluded.custom_title, + created_at=excluded.created_at, last_activity_at=excluded.last_activity_at, + preview=excluded.preview, turns=excluded.turns, + turns_state=excluded.turns_state, recovered=excluded.recovered, + recovery_reason=excluded.recovery_reason, + recovery_digest=excluded.recovery_digest, parent_id=excluded.parent_id, + content_fingerprint=excluded.content_fingerprint, + meta_fingerprint=excluded.meta_fingerprint, health=excluded.health, + missing_since=0, seen_generation=MAX(catalog_sessions.seen_generation, excluded.seen_generation)`, + record.Path, record.Directory, record.Scope, record.WorkspaceRoot, + record.TopicID, record.TopicTitle, record.CustomTitle, record.CreatedAt, + record.LastActivityAt, record.Preview, record.Turns, record.TurnsState, + record.Recovered, record.RecoveryReason, record.RecoveryDigest, + record.ParentID, record.ContentFingerprint, record.MetaFingerprint, + record.Health, 0, generation); err != nil { + _ = tx.Rollback() + return err + } + if record.TopicID != "" { + affected[TopicKey{Scope: record.Scope, WorkspaceRoot: record.WorkspaceRoot, TopicID: record.TopicID}] = struct{}{} + } + roots[record.WorkspaceRoot] = struct{}{} + } + for key := range affected { + if err := recomputeTopic(ctx, tx, key); err != nil { + _ = tx.Rollback() + return err + } + } + revision, err := bumpRevision(ctx, tx) + if err != nil { + _ = tx.Rollback() + return err + } + if err := tx.Commit(); err != nil { + return err + } + c.publishRevision(revision, mapKeys(roots), reason) + c.refreshCounts(ctx) + return nil +} + +func recomputeTopic(ctx context.Context, tx *sql.Tx, key TopicKey) error { + var count int + if err := tx.QueryRowContext(ctx, `SELECT COUNT(*) FROM catalog_sessions WHERE scope=? AND workspace_root=? AND topic_id=?`, key.Scope, key.WorkspaceRoot, key.TopicID).Scan(&count); err != nil { + return err + } + if count == 0 { + _, err := tx.ExecContext(ctx, `DELETE FROM catalog_topics WHERE scope=? AND workspace_root=? AND topic_id=?`, key.Scope, key.WorkspaceRoot, key.TopicID) + return err + } + _, err := tx.ExecContext(ctx, `INSERT INTO catalog_topics( + scope,workspace_root,topic_id,title,turns,turns_state,created_at, + last_activity_at,recovery_state,health + ) SELECT ?,?,?, + COALESCE(NULLIF((SELECT COALESCE(NULLIF(custom_title,''), NULLIF(topic_title,''), preview, '') + FROM catalog_sessions WHERE scope=? AND workspace_root=? AND topic_id=? + ORDER BY last_activity_at DESC, path ASC LIMIT 1),''), ?), + COALESCE(SUM(CASE WHEN turns_state='valid' THEN turns ELSE 0 END),0), + CASE WHEN SUM(CASE WHEN turns_state='corrupt' THEN 1 ELSE 0 END)>0 THEN 'corrupt' + WHEN SUM(CASE WHEN turns_state='unknown' THEN 1 ELSE 0 END)>0 THEN 'unknown' + ELSE 'valid' END, + COALESCE(MIN(NULLIF(created_at,0)),0), COALESCE(MAX(last_activity_at),0), + CASE WHEN SUM(CASE WHEN recovered=1 THEN 1 ELSE 0 END)=COUNT(*) THEN 'recovery_only' ELSE '' END, + CASE WHEN SUM(CASE WHEN health='corrupt' THEN 1 ELSE 0 END)>0 THEN 'corrupt' + WHEN SUM(CASE WHEN health='missing' THEN 1 ELSE 0 END)>0 THEN 'missing' + ELSE 'ok' END + FROM catalog_sessions WHERE scope=? AND workspace_root=? AND topic_id=? + ON CONFLICT(scope,workspace_root,topic_id) DO UPDATE SET + title=excluded.title, turns=excluded.turns, turns_state=excluded.turns_state, + created_at=excluded.created_at, last_activity_at=excluded.last_activity_at, + recovery_state=excluded.recovery_state, health=excluded.health`, + key.Scope, key.WorkspaceRoot, key.TopicID, + key.Scope, key.WorkspaceRoot, key.TopicID, key.TopicID, + key.Scope, key.WorkspaceRoot, key.TopicID) + return err +} + +func bumpRevision(ctx context.Context, tx *sql.Tx) (uint64, error) { + if _, err := tx.ExecContext(ctx, `UPDATE catalog_state SET revision=revision+1 WHERE id=1`); err != nil { + return 0, err + } + var revision uint64 + if err := tx.QueryRowContext(ctx, `SELECT revision FROM catalog_state WHERE id=1`).Scan(&revision); err != nil { + return 0, err + } + return revision, nil +} + +func (c *Catalog) publishRevision(revision uint64, roots []string, reason string) { + c.revision.Store(revision) + c.statusMu.Lock() + c.status.Revision = revision + c.statusMu.Unlock() + if c.opts.OnRevision != nil { + c.opts.OnRevision(revision, roots, reason) + } +} + +func mapKeys(values map[string]struct{}) []string { + out := make([]string, 0, len(values)) + for value := range values { + out = append(out, value) + } + return out +} + +func (c *Catalog) ListTopics(ctx context.Context, req TopicPageRequest) (TopicPage, error) { + out := TopicPage{Items: []TopicRecord{}, Revision: c.revision.Load()} + req.Scope, req.WorkspaceRoot = normalizeScope(req.Scope, req.WorkspaceRoot) + if req.Limit <= 0 { + req.Limit = DefaultLimit + } + if req.Limit > MaxLimit { + req.Limit = MaxLimit + } + cursor, err := decodeCursor(req.Cursor) + if err != nil { + return out, err + } + args := []any{req.Scope, req.WorkspaceRoot} + where := `scope=? AND workspace_root=?` + if query := strings.TrimSpace(req.Query); query != "" { + where += ` AND lower(title) LIKE ?` + args = append(args, "%"+strings.ToLower(query)+"%") + } + if cutoff := timeFilterCutoff(req.TimeFilter, c.opts.Now()); cutoff > 0 { + where += ` AND last_activity_at>=?` + args = append(args, cutoff) + } + scanCursor := cursor + scanLimit := max(req.Limit+1, 64) + for len(out.Items) <= req.Limit { + pageWhere := where + pageArgs := append([]any(nil), args...) + if scanCursor != nil { + pageWhere += ` AND (pinned?))` + pageArgs = append(pageArgs, scanCursor.Pinned, scanCursor.Pinned, scanCursor.Activity, + scanCursor.Pinned, scanCursor.Activity, scanCursor.TopicID) + } + pageArgs = append(pageArgs, scanLimit) + rows, err := c.db.QueryContext(ctx, `SELECT scope,workspace_root,topic_id,title,pinned,sort_order, + turns,turns_state,created_at,last_activity_at,recovery_state,health + FROM catalog_topics WHERE `+pageWhere+` + ORDER BY pinned DESC,last_activity_at DESC,topic_id ASC LIMIT ?`, pageArgs...) + if err != nil { + return out, err + } + rawCount := 0 + var lastScanned TopicRecord + for rows.Next() { + var item TopicRecord + if err := rows.Scan(&item.Scope, &item.WorkspaceRoot, &item.TopicID, &item.Title, + &item.Pinned, &item.SortOrder, &item.Turns, &item.TurnsState, + &item.CreatedAt, &item.LastActivityAt, &item.RecoveryState, &item.Health); err != nil { + _ = rows.Close() + return out, err + } + rawCount++ + lastScanned = item + sessions, err := c.listTopicSessions(ctx, TopicKey{ + Scope: item.Scope, WorkspaceRoot: item.WorkspaceRoot, TopicID: item.TopicID, + }) + if err != nil { + _ = rows.Close() + return TopicPage{Items: []TopicRecord{}, Revision: out.Revision}, err + } + if len(sessions) == 0 { + continue + } + item.Sessions = sessions + out.Items = append(out.Items, item) + if len(out.Items) > req.Limit { + break + } + } + rowsErr := rows.Err() + _ = rows.Close() + if rowsErr != nil { + return out, rowsErr + } + if len(out.Items) > req.Limit || rawCount < scanLimit || rawCount == 0 { + break + } + pinned := 0 + if lastScanned.Pinned { + pinned = 1 + } + scanCursor = &pageCursor{Pinned: pinned, Activity: lastScanned.LastActivityAt, TopicID: lastScanned.TopicID} + } + more := len(out.Items) > req.Limit + if more { + out.Items = out.Items[:req.Limit] + } + if more && len(out.Items) > 0 { + last := out.Items[len(out.Items)-1] + pinned := 0 + if last.Pinned { + pinned = 1 + } + out.NextCursor = encodeCursor(pageCursor{Pinned: pinned, Activity: last.LastActivityAt, TopicID: last.TopicID}) + } + return out, nil +} + +func (c *Catalog) listTopicSessions(ctx context.Context, key TopicKey) ([]SessionRecord, error) { + out := []SessionRecord{} + var cursor *sessionPageCursor + for len(out) < MaxLimit { + where := `scope=? AND workspace_root=? AND topic_id=?` + args := []any{key.Scope, key.WorkspaceRoot, key.TopicID} + if cursor != nil { + where += ` AND (last_activity_at?))` + args = append(args, cursor.Activity, cursor.Activity, cursor.Path) + } + args = append(args, MaxLimit) + rows, err := c.db.QueryContext(ctx, `SELECT `+sessionSelectColumns+` FROM catalog_sessions + WHERE `+where+` ORDER BY last_activity_at DESC,path ASC LIMIT ?`, args...) + if err != nil { + return nil, err + } + rawCount := 0 + var lastScanned SessionRecord + for rows.Next() { + record, err := scanSession(rows) + if err != nil { + _ = rows.Close() + return nil, err + } + rawCount++ + lastScanned = record + if c.pathRemoved(record.Path) { + continue + } + out = append(out, record) + if len(out) == MaxLimit { + break + } + } + rowsErr := rows.Err() + _ = rows.Close() + if rowsErr != nil { + return nil, rowsErr + } + if len(out) == MaxLimit || rawCount < MaxLimit || rawCount == 0 { + break + } + cursor = &sessionPageCursor{Activity: lastScanned.LastActivityAt, Path: lastScanned.Path} + } + return out, nil +} + +func (c *Catalog) GetTopic(ctx context.Context, key TopicKey) (TopicRecord, bool, error) { + key.Scope, key.WorkspaceRoot = normalizeScope(key.Scope, key.WorkspaceRoot) + key.TopicID = strings.TrimSpace(key.TopicID) + item := TopicRecord{Sessions: []SessionRecord{}} + err := c.db.QueryRowContext(ctx, `SELECT scope,workspace_root,topic_id,title,pinned,sort_order, + turns,turns_state,created_at,last_activity_at,recovery_state,health + FROM catalog_topics WHERE scope=? AND workspace_root=? AND topic_id=?`, + key.Scope, key.WorkspaceRoot, key.TopicID).Scan( + &item.Scope, &item.WorkspaceRoot, &item.TopicID, &item.Title, + &item.Pinned, &item.SortOrder, &item.Turns, &item.TurnsState, + &item.CreatedAt, &item.LastActivityAt, &item.RecoveryState, &item.Health) + if errors.Is(err, sql.ErrNoRows) { + return item, false, nil + } + if err != nil { + return item, false, err + } + item.Sessions, err = c.listTopicSessions(ctx, key) + if err != nil { + return TopicRecord{Sessions: []SessionRecord{}}, false, err + } + // Tombstone overlay: topic rows may lag behind RemoveSession while the + // durable DELETE waits on locks or a short caller context. + if len(item.Sessions) == 0 { + return TopicRecord{Sessions: []SessionRecord{}}, false, nil + } + return item, true, nil +} + +func encodeCursor(cursor pageCursor) string { + b, _ := json.Marshal(cursor) + return base64.RawURLEncoding.EncodeToString(b) +} + +func decodeCursor(encoded string) (*pageCursor, error) { + if strings.TrimSpace(encoded) == "" { + return nil, nil + } + b, err := base64.RawURLEncoding.DecodeString(encoded) + if err != nil { + return nil, fmt.Errorf("invalid session catalog cursor: %w", err) + } + var cursor pageCursor + if err := json.Unmarshal(b, &cursor); err != nil || cursor.TopicID == "" { + return nil, errors.New("invalid session catalog cursor") + } + return &cursor, nil +} + +func timeFilterCutoff(filter string, now time.Time) int64 { + var duration time.Duration + value := strings.TrimSpace(strings.ToLower(filter)) + switch value { + case "day", "24h": + duration = 24 * time.Hour + case "week", "7d": + duration = 7 * 24 * time.Hour + case "month", "30d": + duration = 30 * 24 * time.Hour + default: + parsed, err := time.ParseDuration(value) + if err != nil || parsed <= 0 { + return 0 + } + duration = parsed + } + return now.Add(-duration).UnixMilli() +} + +func (c *Catalog) Close(ctx context.Context) error { + if c == nil { + return nil + } + c.stopOnce.Do(func() { + if c.workerCancel != nil { + c.workerCancel() + } + close(c.stop) + go func() { + c.workers.Wait() + c.closeErr = c.db.Close() + c.statusMu.Lock() + c.status.State = StateClosed + c.statusMu.Unlock() + close(c.closeDone) + }() + }) + select { + case <-c.closeDone: + return c.closeErr + case <-ctx.Done(): + return ctx.Err() + } +} diff --git a/internal/sessioncatalog/catalog_test.go b/internal/sessioncatalog/catalog_test.go new file mode 100644 index 0000000000..35a0984a7f --- /dev/null +++ b/internal/sessioncatalog/catalog_test.go @@ -0,0 +1,690 @@ +package sessioncatalog + +import ( + "context" + "fmt" + "os" + "path/filepath" + "strings" + "testing" + "time" + + "reasonix/internal/agent" +) + +func TestReconcileMakesUnknownCountsVisibleWithoutReadingTranscript(t *testing.T) { + t.Parallel() + ctx := context.Background() + dir := t.TempDir() + path := filepath.Join(dir, "legacy.jsonl") + if err := os.WriteFile(path, []byte("not valid jsonl\n"), 0o000); err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = os.Chmod(path, 0o600) }) + if err := agent.SaveBranchMeta(path, agent.BranchMeta{ + Scope: "project", + WorkspaceRoot: "/workspace", + TopicID: "topic-1", + TopicTitle: "Legacy topic", + SchemaVersion: 1, + Turns: 0, + }); err != nil { + t.Fatal(err) + } + + catalog, err := Open(ctx, Options{ + Path: filepath.Join(t.TempDir(), "catalog.sqlite"), + DisableRepair: true, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + + if err := catalog.ReconcileDirectory(ctx, DirectoryTarget{ + Path: dir, + Scope: "project", + WorkspaceRoot: "/workspace", + }); err != nil { + t.Fatal(err) + } + page, err := catalog.ListTopics(ctx, TopicPageRequest{ + Scope: "project", + WorkspaceRoot: "/workspace", + Limit: 50, + }) + if err != nil { + t.Fatal(err) + } + if len(page.Items) != 1 || len(page.Items[0].Sessions) != 1 { + t.Fatalf("page = %#v, want one visible topic/session", page) + } + if got := page.Items[0].Sessions[0].TurnsState; got != TurnsUnknown { + t.Fatalf("turns state = %q, want %q", got, TurnsUnknown) + } +} + +func TestListTopicsUsesStableKeysetCursor(t *testing.T) { + t.Parallel() + ctx := context.Background() + catalog, err := Open(ctx, Options{Path: filepath.Join(t.TempDir(), "catalog.sqlite"), DisableRepair: true}) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + + base := time.Date(2026, 8, 10, 10, 0, 0, 0, time.UTC) + for i, topicID := range []string{"a", "b", "c"} { + if err := catalog.UpsertSession(ctx, SessionRecord{ + Path: filepath.Join("/sessions", topicID+".jsonl"), + Directory: "/sessions", + Scope: "global", + TopicID: topicID, + TopicTitle: topicID, + LastActivityAt: base.Add(time.Duration(i) * time.Minute).UnixMilli(), + Turns: i + 1, + TurnsState: TurnsValid, + Health: HealthOK, + }); err != nil { + t.Fatal(err) + } + } + first, err := catalog.ListTopics(ctx, TopicPageRequest{Scope: "global", Limit: 2}) + if err != nil { + t.Fatal(err) + } + if len(first.Items) != 2 || first.NextCursor == "" { + t.Fatalf("first page = %#v", first) + } + second, err := catalog.ListTopics(ctx, TopicPageRequest{Scope: "global", Limit: 2, Cursor: first.NextCursor}) + if err != nil { + t.Fatal(err) + } + if len(second.Items) != 1 || second.NextCursor != "" { + t.Fatalf("second page = %#v", second) + } + if first.Items[0].TopicID != "c" || first.Items[1].TopicID != "b" || second.Items[0].TopicID != "a" { + t.Fatalf("keyset order = %q, %q, %q", first.Items[0].TopicID, first.Items[1].TopicID, second.Items[0].TopicID) + } +} + +func TestGetTopicIsNotLimitedByPageSize(t *testing.T) { + t.Parallel() + ctx := context.Background() + catalog, err := Open(ctx, Options{Path: filepath.Join(t.TempDir(), "catalog.sqlite"), DisableRepair: true}) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + + for i := 0; i <= MaxLimit; i++ { + topicID := fmt.Sprintf("topic-%03d", i) + if err := catalog.UpsertSession(ctx, SessionRecord{ + Path: filepath.Join("/sessions", topicID+".jsonl"), Directory: "/sessions", + Scope: "global", TopicID: topicID, TopicTitle: topicID, + LastActivityAt: int64(MaxLimit - i), TurnsState: TurnsValid, Health: HealthOK, + }); err != nil { + t.Fatal(err) + } + } + + topic, ok, err := catalog.GetTopic(ctx, TopicKey{Scope: "global", TopicID: "topic-200"}) + if err != nil { + t.Fatal(err) + } + if !ok || topic.TopicID != "topic-200" || len(topic.Sessions) != 1 { + t.Fatalf("topic = %#v, ok=%v", topic, ok) + } +} + +func TestUnchangedDirectorySignatureSkipsReconcileRevision(t *testing.T) { + t.Parallel() + ctx := context.Background() + dir := t.TempDir() + path := filepath.Join(dir, "session.jsonl") + if err := os.WriteFile(path, []byte("{}\n"), 0o600); err != nil { + t.Fatal(err) + } + if err := agent.SaveBranchMeta(path, agent.BranchMeta{ + Scope: "global", TopicID: "topic", TopicTitle: "Topic", + SchemaVersion: agent.BranchMetaCountsVersion, Turns: 1, + }); err != nil { + t.Fatal(err) + } + catalog, err := Open(ctx, Options{Path: filepath.Join(t.TempDir(), "catalog.sqlite"), DisableRepair: true}) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + target := DirectoryTarget{Path: dir, Scope: "global"} + if err := catalog.ReconcileDirectory(ctx, target); err != nil { + t.Fatal(err) + } + revision := catalog.Status().Revision + if err := catalog.ReconcileDirectory(ctx, target); err != nil { + t.Fatal(err) + } + if got := catalog.Status().Revision; got != revision { + t.Fatalf("unchanged scan bumped revision: got %d want %d", got, revision) + } +} + +func TestSyncMetadataRemovesOnlyMetadataOnlyTopics(t *testing.T) { + t.Parallel() + ctx := context.Background() + catalog, err := Open(ctx, Options{Path: filepath.Join(t.TempDir(), "catalog.sqlite"), DisableRepair: true}) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + if err := catalog.SyncMetadata(ctx, nil, []TopicMetadata{ + {Scope: "global", TopicID: "metadata-only", Title: "Metadata"}, + {Scope: "global", TopicID: "with-session", Title: "Session"}, + }); err != nil { + t.Fatal(err) + } + if err := catalog.UpsertSession(ctx, SessionRecord{ + Path: "/sessions/with-session.jsonl", Directory: "/sessions", Scope: "global", + TopicID: "with-session", Turns: 1, TurnsState: TurnsValid, Health: HealthOK, + }); err != nil { + t.Fatal(err) + } + if err := catalog.SyncMetadata(ctx, nil, nil); err != nil { + t.Fatal(err) + } + if _, ok, err := catalog.GetTopic(ctx, TopicKey{Scope: "global", TopicID: "metadata-only"}); err != nil || ok { + t.Fatalf("metadata-only topic survived removal: ok=%v err=%v", ok, err) + } + if _, ok, err := catalog.GetTopic(ctx, TopicKey{Scope: "global", TopicID: "with-session"}); err != nil || !ok { + t.Fatalf("session-derived topic was removed: ok=%v err=%v", ok, err) + } +} + +func TestSchemaMigrationLedgerRecordsEveryVersion(t *testing.T) { + t.Parallel() + ctx := context.Background() + catalog, err := Open(ctx, Options{Path: filepath.Join(t.TempDir(), "catalog.sqlite"), DisableRepair: true}) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + rows, err := catalog.db.QueryContext(ctx, `SELECT version FROM schema_migrations ORDER BY version`) + if err != nil { + t.Fatal(err) + } + defer rows.Close() + versions := []int{} + for rows.Next() { + var version int + if err := rows.Scan(&version); err != nil { + t.Fatal(err) + } + versions = append(versions, version) + } + if fmt.Sprint(versions) != "[1 2 3]" { + t.Fatalf("schema migration ledger = %v", versions) + } +} + +func TestListSessionsUsesRevisionBoundKeysetCursor(t *testing.T) { + t.Parallel() + ctx := context.Background() + catalog, err := Open(ctx, Options{Path: filepath.Join(t.TempDir(), "catalog.sqlite"), DisableRepair: true}) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + for i, name := range []string{"a", "b", "c"} { + if err := catalog.UpsertSession(ctx, SessionRecord{ + Path: filepath.Join("/sessions", name+".jsonl"), Directory: "/sessions", Scope: "global", + TopicID: name, CustomTitle: "title " + name, LastActivityAt: int64(i + 1), + TurnsState: TurnsValid, Health: HealthOK, + }); err != nil { + t.Fatal(err) + } + } + first, err := catalog.ListSessions(ctx, SessionPageRequest{Scope: "all", Limit: 2}) + if err != nil || len(first.Items) != 2 || first.NextCursor == "" { + t.Fatalf("first=%#v err=%v", first, err) + } + second, err := catalog.ListSessions(ctx, SessionPageRequest{Scope: "all", Limit: 2, Cursor: first.NextCursor}) + if err != nil || len(second.Items) != 1 || second.Items[0].CustomTitle != "title a" { + t.Fatalf("second=%#v err=%v", second, err) + } + if err := catalog.UpsertSession(ctx, SessionRecord{Path: "/sessions/d.jsonl", Directory: "/sessions", Scope: "global", TopicID: "d", LastActivityAt: 4, TurnsState: TurnsValid, Health: HealthOK}); err != nil { + t.Fatal(err) + } + stale, err := catalog.ListSessions(ctx, SessionPageRequest{Scope: "all", Cursor: first.NextCursor}) + if err != nil || !stale.StaleCursor || len(stale.Items) != 0 { + t.Fatalf("stale=%#v err=%v", stale, err) + } +} + +func TestDirectWriteDuringScanIsNotMarkedMissing(t *testing.T) { + t.Parallel() + ctx := context.Background() + now := time.Date(2026, 8, 10, 10, 0, 0, 0, time.UTC) + dir := t.TempDir() + catalog, err := Open(ctx, Options{ + Path: filepath.Join(t.TempDir(), "catalog.sqlite"), DisableRepair: true, + Now: func() time.Time { return now }, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + target := DirectoryTarget{Path: dir, Scope: "global"} + generation, _, err := catalog.beginDirectoryScan(ctx, target, "test", now.UnixMilli()) + if err != nil { + t.Fatal(err) + } + path := filepath.Join(dir, "late.jsonl") + if err := catalog.UpsertSession(ctx, SessionRecord{ + Path: path, Directory: dir, Scope: "global", TopicID: "late", + TurnsState: TurnsUnknown, Health: HealthOK, + }); err != nil { + t.Fatal(err) + } + if err := catalog.finishDirectoryScan(ctx, target, "test", generation, now.UnixMilli(), 0); err != nil { + t.Fatal(err) + } + topic, ok, err := catalog.GetTopic(ctx, TopicKey{Scope: "global", TopicID: "late"}) + if err != nil || !ok || len(topic.Sessions) != 1 || topic.Sessions[0].Health != HealthOK { + t.Fatalf("late write was marked missing: topic=%#v ok=%v err=%v", topic, ok, err) + } +} + +func TestSessionTopicMoveRecomputesOldTopic(t *testing.T) { + t.Parallel() + ctx := context.Background() + catalog, err := Open(ctx, Options{Path: filepath.Join(t.TempDir(), "catalog.sqlite"), DisableRepair: true}) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + record := SessionRecord{ + Path: "/sessions/moved.jsonl", Directory: "/sessions", Scope: "global", + TopicID: "old", Turns: 1, TurnsState: TurnsValid, Health: HealthOK, + } + if err := catalog.UpsertSession(ctx, record); err != nil { + t.Fatal(err) + } + record.TopicID = "new" + if err := catalog.UpsertSession(ctx, record); err != nil { + t.Fatal(err) + } + if _, ok, err := catalog.GetTopic(ctx, TopicKey{Scope: "global", TopicID: "old"}); err != nil || ok { + t.Fatalf("old topic survived move: ok=%v err=%v", ok, err) + } + if _, ok, err := catalog.GetTopic(ctx, TopicKey{Scope: "global", TopicID: "new"}); err != nil || !ok { + t.Fatalf("new topic missing after move: ok=%v err=%v", ok, err) + } +} + +func TestWriterQueueCoalescesBySessionPath(t *testing.T) { + t.Parallel() + ctx := context.Background() + catalog, err := Open(ctx, Options{ + Path: filepath.Join(t.TempDir(), "catalog.sqlite"), DisableRepair: true, QueueCapacity: 1, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + for turns := 1; turns <= 100; turns++ { + if ok := catalog.EnqueueSession(SessionRecord{ + Path: "/sessions/coalesced.jsonl", Directory: "/sessions", Scope: "global", + TopicID: "coalesced", Turns: turns, TurnsState: TurnsValid, Health: HealthOK, + }); !ok { + t.Fatalf("same-path update %d was rejected by a one-slot queue", turns) + } + } + deadline := time.Now().Add(2 * time.Second) + for time.Now().Before(deadline) { + topic, ok, err := catalog.GetTopic(ctx, TopicKey{Scope: "global", TopicID: "coalesced"}) + if err != nil { + t.Fatal(err) + } + if ok && topic.Turns == 100 { + return + } + time.Sleep(10 * time.Millisecond) + } + t.Fatal("coalesced writer did not persist the latest record") +} + +func TestRemoveSessionTombstoneHidesTopicBeforeDurableDelete(t *testing.T) { + t.Parallel() + ctx := context.Background() + dir := t.TempDir() + path := filepath.Join(dir, "session.jsonl") + catalog, err := Open(ctx, Options{ + Path: filepath.Join(t.TempDir(), "catalog.sqlite"), DisableRepair: true, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + record := SessionRecord{ + Path: path, Directory: dir, Scope: "global", TopicID: "topic_tombstone", + Turns: 1, TurnsState: TurnsValid, Health: HealthOK, LastActivityAt: time.Now().UnixMilli(), + } + if err := catalog.UpsertSession(ctx, record); err != nil { + t.Fatal(err) + } + // Hold the directory lock so durable DELETE blocks while the short caller + // context expires — the read-visible tombstone must still hide the topic. + dirLock := catalog.directoryLock(dir) + dirLock.Lock() + defer dirLock.Unlock() + + short, cancel := context.WithTimeout(ctx, 30*time.Millisecond) + defer cancel() + // RemoveSession should return promptly (overlay path) without waiting for + // the held directory lock forever. + done := make(chan error, 1) + go func() { + done <- catalog.RemoveSession(short, path, "test_tombstone_overlay") + }() + select { + case err := <-done: + if err != nil { + t.Fatalf("RemoveSession: %v", err) + } + case <-time.After(2 * time.Second): + t.Fatal("RemoveSession blocked on directory lock instead of recording tombstone first") + } + if page, err := catalog.ListTopics(ctx, TopicPageRequest{Scope: "global", Limit: 50}); err != nil { + t.Fatal(err) + } else { + for _, item := range page.Items { + if item.TopicID == "topic_tombstone" { + t.Fatalf("tombstoned topic still visible in ListTopics: %+v", page.Items) + } + } + } + if _, ok, err := catalog.GetTopic(ctx, TopicKey{Scope: "global", TopicID: "topic_tombstone"}); err != nil || ok { + t.Fatalf("GetTopic after tombstone: ok=%v err=%v", ok, err) + } + if _, ok, err := catalog.GetSession(ctx, path); err != nil || ok { + t.Fatalf("GetSession after tombstone: ok=%v err=%v", ok, err) + } +} + +func TestRemoveSessionWinsOverQueuedStaleWriteAndAllowsLaterRecreation(t *testing.T) { + t.Parallel() + ctx := context.Background() + dir := t.TempDir() + path := filepath.Join(dir, "session.jsonl") + catalog, err := Open(ctx, Options{ + Path: filepath.Join(t.TempDir(), "catalog.sqlite"), DisableRepair: true, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + record := SessionRecord{ + Path: path, Directory: dir, Scope: "global", TopicID: "topic", + Turns: 1, TurnsState: TurnsValid, Health: HealthOK, + } + if err := catalog.UpsertSession(ctx, record); err != nil { + t.Fatal(err) + } + record.Turns = 99 + if !catalog.EnqueueSession(record) { + t.Fatal("queue stale write") + } + if err := catalog.RemoveSession(ctx, path, "test_remove"); err != nil { + t.Fatal(err) + } + time.Sleep(50 * time.Millisecond) + if _, ok, err := catalog.GetTopic(ctx, TopicKey{Scope: "global", TopicID: "topic"}); err != nil || ok { + t.Fatalf("queued write resurrected removed row: ok=%v err=%v", ok, err) + } + if err := os.WriteFile(path, []byte("{}\n"), 0o600); err != nil { + t.Fatal(err) + } + if err := agent.SaveBranchMeta(path, agent.BranchMeta{ + Scope: "global", TopicID: "topic", SchemaVersion: agent.BranchMetaCountsVersion, Turns: 2, + }); err != nil { + t.Fatal(err) + } + if err := catalog.ReconcileDirectory(ctx, DirectoryTarget{Path: dir, Scope: "global"}); err != nil { + t.Fatal(err) + } + if topic, ok, err := catalog.GetTopic(ctx, TopicKey{Scope: "global", TopicID: "topic"}); err != nil || !ok || topic.Turns != 2 { + t.Fatalf("new external file did not supersede removal: topic=%#v ok=%v err=%v", topic, ok, err) + } +} + +func TestCloseCancelsCatalogWorkerContext(t *testing.T) { + catalog, err := Open(context.Background(), Options{ + Path: filepath.Join(t.TempDir(), "catalog.sqlite"), DisableRepair: true, + }) + if err != nil { + t.Fatal(err) + } + workerDone := catalog.workerCtx.Done() + ctx, cancel := context.WithTimeout(context.Background(), time.Second) + defer cancel() + if err := catalog.Close(ctx); err != nil { + t.Fatal(err) + } + select { + case <-workerDone: + default: + t.Fatal("catalog close left worker context active") + } +} + +func BenchmarkListTopicsWarmCatalog10K(b *testing.B) { + ctx := context.Background() + catalog, err := Open(ctx, Options{ + Path: filepath.Join(b.TempDir(), "catalog.sqlite"), DisableRepair: true, + }) + if err != nil { + b.Fatal(err) + } + b.Cleanup(func() { _ = catalog.Close(context.Background()) }) + records := make([]SessionRecord, 10_000) + for i := range records { + records[i] = SessionRecord{ + Path: filepath.Join("/sessions", fmt.Sprintf("%05d.jsonl", i)), Directory: "/sessions", + Scope: "project", WorkspaceRoot: "/workspace", TopicID: fmt.Sprintf("topic-%05d", i), + Preview: fmt.Sprintf("synthetic session %05d", i), Turns: i%20 + 1, + TurnsState: TurnsValid, Health: HealthOK, LastActivityAt: int64(i + 1), + } + } + for start := 0; start < len(records); start += 64 { + end := min(start+64, len(records)) + if err := catalog.upsertSessions(ctx, records[start:end], nil, "benchmark-setup"); err != nil { + b.Fatal(err) + } + } + b.ResetTimer() + for range b.N { + page, err := catalog.ListTopics(ctx, TopicPageRequest{ + Scope: "project", WorkspaceRoot: "/workspace", Limit: 50, + }) + if err != nil || len(page.Items) != 50 { + b.Fatalf("page len=%d err=%v", len(page.Items), err) + } + } +} + +func TestMissingSessionRequiresTwoScansAndGraceBeforeRemoval(t *testing.T) { + t.Parallel() + ctx := context.Background() + now := time.Date(2026, 8, 10, 10, 0, 0, 0, time.UTC) + dir := t.TempDir() + path := filepath.Join(dir, "session.jsonl") + if err := os.WriteFile(path, []byte("{}\n"), 0o600); err != nil { + t.Fatal(err) + } + if err := agent.SaveBranchMeta(path, agent.BranchMeta{ + Scope: "global", TopicID: "topic", TopicTitle: "Topic", + SchemaVersion: agent.BranchMetaCountsVersion, Turns: 1, + }); err != nil { + t.Fatal(err) + } + catalog, err := Open(ctx, Options{ + Path: filepath.Join(t.TempDir(), "catalog.sqlite"), + DisableRepair: true, + MissingGrace: time.Minute, + Now: func() time.Time { return now }, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + if err := catalog.ReconcileDirectory(ctx, DirectoryTarget{Path: dir, Scope: "global"}); err != nil { + t.Fatal(err) + } + if err := os.Remove(path); err != nil { + t.Fatal(err) + } + if err := catalog.ReconcileDirectory(ctx, DirectoryTarget{Path: dir, Scope: "global"}); err != nil { + t.Fatal(err) + } + if page, err := catalog.ListTopics(ctx, TopicPageRequest{Scope: "global", Limit: 50}); err != nil || len(page.Items) != 1 { + t.Fatalf("first missing scan removed row: page=%#v err=%v", page, err) + } + now = now.Add(2 * time.Minute) + if err := catalog.ReconcileDirectory(ctx, DirectoryTarget{Path: dir, Scope: "global"}); err != nil { + t.Fatal(err) + } + if page, err := catalog.ListTopics(ctx, TopicPageRequest{Scope: "global", Limit: 50}); err != nil || len(page.Items) != 0 { + t.Fatalf("stale row survived second scan after grace: page=%#v err=%v", page, err) + } +} + +func TestOpenQuarantinesCorruptCatalogAndRebuildsProjection(t *testing.T) { + t.Parallel() + ctx := context.Background() + dir := t.TempDir() + path := filepath.Join(dir, "catalog.sqlite") + if err := os.WriteFile(path, []byte("not sqlite"), 0o600); err != nil { + t.Fatal(err) + } + catalog, err := Open(ctx, Options{Path: path, DisableRepair: true}) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + status := catalog.Status() + if status.State != StateReady || status.QuarantinedPath == "" { + t.Fatalf("status = %#v, want ready catalog with quarantined path", status) + } + if _, err := os.Stat(status.QuarantinedPath); err != nil { + 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 := range total { + 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/close_lifecycle_test.go b/internal/sessioncatalog/close_lifecycle_test.go new file mode 100644 index 0000000000..c004a7d77f --- /dev/null +++ b/internal/sessioncatalog/close_lifecycle_test.go @@ -0,0 +1,28 @@ +package sessioncatalog + +import ( + "context" + "errors" + "testing" + "time" +) + +func TestCloseCanBeAwaitedAfterCanceledCaller(t *testing.T) { + catalog, err := Open(context.Background(), Options{InMemory: true, DisableRepair: true}) + if err != nil { + t.Fatalf("open: %v", err) + } + canceled, cancel := context.WithCancel(context.Background()) + cancel() + if err := catalog.Close(canceled); err != nil && !errors.Is(err, context.Canceled) { + t.Fatalf("first close: %v", err) + } + ctx, stop := context.WithTimeout(context.Background(), 5*time.Second) + defer stop() + if err := catalog.Close(ctx); err != nil { + t.Fatalf("await eventual close: %v", err) + } + if err := catalog.db.Ping(); err == nil { + t.Fatal("database remained open after close completion") + } +} diff --git a/internal/sessioncatalog/metadata.go b/internal/sessioncatalog/metadata.go new file mode 100644 index 0000000000..dcbadbfd81 --- /dev/null +++ b/internal/sessioncatalog/metadata.go @@ -0,0 +1,117 @@ +package sessioncatalog + +import ( + "context" + "strings" +) + +// SyncMetadata projects the small desktop project/topic registries. It never +// removes session-derived topics: an older CLI or a concurrently running +// Reasonix process may have written authoritative sidecars not yet reflected in +// desktop-projects.json. +func (c *Catalog) SyncMetadata(ctx context.Context, projects []ProjectRecord, topics []TopicMetadata) error { + if c == nil || c.db == nil { + return nil + } + c.mutationMu.Lock() + defer c.mutationMu.Unlock() + tx, err := c.db.BeginTx(ctx, nil) + if err != nil { + return err + } + roots := map[string]struct{}{} + if _, err := tx.ExecContext(ctx, `DELETE FROM catalog_projects`); err != nil { + _ = tx.Rollback() + return err + } + if _, err := tx.ExecContext(ctx, `UPDATE catalog_topics SET metadata_present=0`); err != nil { + _ = tx.Rollback() + return err + } + for _, project := range projects { + project.Scope, project.WorkspaceRoot = normalizeScope(project.Scope, project.WorkspaceRoot) + if _, err := tx.ExecContext(ctx, `INSERT INTO catalog_projects( + scope,workspace_root,title,color,pinned,sort_order,updated_at + ) VALUES(?,?,?,?,?,?,?) ON CONFLICT(scope,workspace_root) DO UPDATE SET + title=excluded.title,color=excluded.color,pinned=excluded.pinned, + sort_order=excluded.sort_order,updated_at=excluded.updated_at`, + project.Scope, project.WorkspaceRoot, project.Title, project.Color, + project.Pinned, project.SortOrder, c.opts.Now().UnixMilli()); err != nil { + _ = tx.Rollback() + return err + } + roots[project.WorkspaceRoot] = struct{}{} + } + for _, topic := range topics { + topic.Scope, topic.WorkspaceRoot = normalizeScope(topic.Scope, topic.WorkspaceRoot) + if strings.TrimSpace(topic.TopicID) == "" { + continue + } + // Inherit live session aggregates when present so a metadata-only insert + // does not publish last_activity_at=0 / turns_state=valid and reorder the + // sidebar ahead of (or instead of) the authoritative session rows. + if _, err := tx.ExecContext(ctx, `INSERT INTO catalog_topics( + scope,workspace_root,topic_id,title,title_source,pinned,sort_order, + turns,turns_state,created_at,last_activity_at,recovery_state,health,metadata_present + ) + SELECT ?,?,?,?,?,?,?, + COALESCE((SELECT SUM(CASE WHEN turns_state='valid' THEN turns ELSE 0 END) FROM catalog_sessions + WHERE scope=? AND workspace_root=? AND topic_id=?),0), + COALESCE((SELECT CASE + WHEN SUM(CASE WHEN turns_state='corrupt' THEN 1 ELSE 0 END)>0 THEN 'corrupt' + WHEN SUM(CASE WHEN turns_state='unknown' THEN 1 ELSE 0 END)>0 THEN 'unknown' + WHEN COUNT(*)=0 THEN 'unknown' + ELSE 'valid' END + FROM catalog_sessions WHERE scope=? AND workspace_root=? AND topic_id=?),'unknown'), + COALESCE(NULLIF(?,0),(SELECT MIN(NULLIF(created_at,0)) FROM catalog_sessions + WHERE scope=? AND workspace_root=? AND topic_id=?),0), + COALESCE((SELECT MAX(last_activity_at) FROM catalog_sessions + WHERE scope=? AND workspace_root=? AND topic_id=?),0), + '', + COALESCE((SELECT CASE + WHEN SUM(CASE WHEN health='corrupt' THEN 1 ELSE 0 END)>0 THEN 'corrupt' + WHEN SUM(CASE WHEN health='missing' THEN 1 ELSE 0 END)>0 THEN 'missing' + ELSE 'ok' END + FROM catalog_sessions WHERE scope=? AND workspace_root=? AND topic_id=?),'ok'), + 1 + ON CONFLICT(scope,workspace_root,topic_id) DO UPDATE SET + title=CASE WHEN excluded.title<>'' THEN excluded.title ELSE catalog_topics.title END, + title_source=excluded.title_source,pinned=excluded.pinned, + sort_order=excluded.sort_order,metadata_present=1, + created_at=CASE WHEN excluded.created_at>0 THEN excluded.created_at ELSE catalog_topics.created_at END, + last_activity_at=CASE WHEN excluded.last_activity_at>catalog_topics.last_activity_at + THEN excluded.last_activity_at ELSE catalog_topics.last_activity_at END, + turns=CASE WHEN excluded.turns>0 THEN excluded.turns ELSE catalog_topics.turns END, + turns_state=CASE WHEN excluded.turns_state<>'' AND excluded.turns_state<>'unknown' + THEN excluded.turns_state ELSE catalog_topics.turns_state END`, + topic.Scope, topic.WorkspaceRoot, topic.TopicID, topic.Title, + topic.TitleSource, topic.Pinned, topic.SortOrder, + topic.Scope, topic.WorkspaceRoot, topic.TopicID, + topic.Scope, topic.WorkspaceRoot, topic.TopicID, + topic.CreatedAt, topic.Scope, topic.WorkspaceRoot, topic.TopicID, + topic.Scope, topic.WorkspaceRoot, topic.TopicID, + topic.Scope, topic.WorkspaceRoot, topic.TopicID); err != nil { + _ = tx.Rollback() + return err + } + roots[topic.WorkspaceRoot] = struct{}{} + } + if _, err := tx.ExecContext(ctx, `DELETE FROM catalog_topics + WHERE metadata_present=0 AND NOT EXISTS ( + SELECT 1 FROM catalog_sessions s WHERE s.scope=catalog_topics.scope + AND s.workspace_root=catalog_topics.workspace_root AND s.topic_id=catalog_topics.topic_id + )`); err != nil { + _ = tx.Rollback() + return err + } + revision, err := bumpRevision(ctx, tx) + if err != nil { + _ = tx.Rollback() + return err + } + if err := tx.Commit(); err != nil { + return err + } + c.publishRevision(revision, mapKeys(roots), "metadata") + return nil +} diff --git a/internal/sessioncatalog/reconcile.go b/internal/sessioncatalog/reconcile.go new file mode 100644 index 0000000000..193e54bcda --- /dev/null +++ b/internal/sessioncatalog/reconcile.go @@ -0,0 +1,790 @@ +package sessioncatalog + +import ( + "context" + "crypto/sha256" + "database/sql" + "encoding/hex" + "errors" + "fmt" + "net/url" + "os" + "path/filepath" + "runtime" + "strings" + "sync" + "time" + + "reasonix/internal/agent" + "reasonix/internal/projectiondb" +) + +func (c *Catalog) ReconcileDirectory(ctx context.Context, target DirectoryTarget) error { + if c == nil || c.db == nil { + return nil + } + target.Path = filepath.Clean(strings.TrimSpace(target.Path)) + if target.Path == "." || target.Path == "" { + return nil + } + lock := c.directoryLock(target.Path) + lock.Lock() + defer lock.Unlock() + target.Scope, target.WorkspaceRoot = normalizeScope(target.Scope, target.WorkspaceRoot) + signature, err := directorySignature(target.Path) + if err != nil { + c.failDirectoryScan(ctx, target.Path, err) + return err + } + if unchanged, err := c.directoryScanCanSkip(ctx, target.Path, signature); err != nil { + return err + } else if unchanged { + return nil + } + now := c.opts.Now().UnixMilli() + generation, resumeCursor, err := c.beginDirectoryScan(ctx, target, signature, now) + if err != nil { + return err + } + ordered, err := agent.ListSessionOrder(target.Path) + if err != nil { + c.failDirectoryScan(ctx, target.Path, err) + return err + } + 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 + } + end := min(start+64, len(ordered)) + records := make([]SessionRecord, 0, end-start) + generations := make(map[string]int64, end-start) + for _, info := range ordered[start:end] { + record := recordFromOrder(target, info) + // This scan started while holding the directory lock after any + // completed removal. A present file is therefore a newer external + // recreation and may supersede the in-memory removal tombstone. + c.removedPaths.Delete(record.Path) + records = append(records, record) + generations[record.Path] = generation + } + if err := c.upsertSessions(ctx, records, generations, "reconcile"); err != nil { + c.failDirectoryScan(context.Background(), target.Path, err) + return err + } + cursor := "" + if len(records) > 0 { + cursor = records[len(records)-1].Path + } + c.mutationMu.Lock() + _, cursorErr := c.db.ExecContext(ctx, `UPDATE catalog_directories SET scan_cursor=?,indexed=? WHERE path=?`, cursor, end, target.Path) + c.mutationMu.Unlock() + if cursorErr != nil { + return cursorErr + } + for _, record := range records { + if record.TurnsState == TurnsUnknown { + c.enqueueRepair(record.Path) + } + } + runtime.Gosched() + } + if err := c.finishDirectoryScan(ctx, target, signature, generation, now, len(ordered)); err != nil { + return err + } + c.refreshCounts(ctx) + return nil +} + +func directorySignature(dir string) (string, error) { + entries, err := os.ReadDir(dir) + if err != nil { + if os.IsNotExist(err) { + return "missing", nil + } + return "", err + } + hash := sha256.New() + for _, entry := range entries { + name := entry.Name() + if entry.IsDir() || (!strings.HasSuffix(name, ".jsonl") && !strings.HasSuffix(name, ".meta")) { + continue + } + info, err := entry.Info() + if err != nil { + return "", err + } + _, _ = fmt.Fprintf(hash, "%s\x00%d\x00%d\x00%d\n", name, info.Size(), info.ModTime().UnixNano(), info.Mode()) + } + return hex.EncodeToString(hash.Sum(nil)), nil +} + +func (c *Catalog) directoryScanCanSkip(ctx context.Context, path, signature string) (bool, error) { + var previous, state string + err := c.db.QueryRowContext(ctx, `SELECT signature,state FROM catalog_directories WHERE path=?`, path).Scan(&previous, &state) + if errors.Is(err, sql.ErrNoRows) { + return false, nil + } + if err != nil { + return false, err + } + if previous != signature || state != "ready" { + return false, nil + } + var missing int + if err := c.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM catalog_sessions WHERE directory=? AND missing_since>0`, path).Scan(&missing); err != nil { + return false, err + } + return missing == 0, nil +} + +func (c *Catalog) directoryLock(path string) *sync.Mutex { + c.directoryLocksMu.Lock() + defer c.directoryLocksMu.Unlock() + lock := c.directoryLocks[path] + if lock == nil { + lock = &sync.Mutex{} + c.directoryLocks[path] = lock + } + return lock +} + +// RequestReconcile coalesces external writes by directory. The channel is +// non-blocking so a session save never waits on catalog work; when the channel +// is full the request is retained in reconcileDirty and drained by the worker. +func (c *Catalog) RequestReconcile(target DirectoryTarget) bool { + if c == nil || strings.TrimSpace(target.Path) == "" { + return false + } + target.Path = filepath.Clean(target.Path) + if _, loaded := c.reconcileQueued.LoadOrStore(target.Path, target); loaded { + c.markReconcileDirty(target) + return true + } + select { + case c.reconcileCh <- target: + return true + case <-c.stop: + c.reconcileQueued.Delete(target.Path) + return false + default: + c.reconcileQueued.Delete(target.Path) + c.markReconcileDirty(target) + return false + } +} + +func (c *Catalog) markReconcileDirty(target DirectoryTarget) { + c.reconcileDirtyMu.Lock() + c.reconcileDirty[target.Path] = target + c.reconcileDirtyMu.Unlock() +} + +func (c *Catalog) takeReconcileDirty() (DirectoryTarget, bool) { + c.reconcileDirtyMu.Lock() + defer c.reconcileDirtyMu.Unlock() + for path, target := range c.reconcileDirty { + delete(c.reconcileDirty, path) + return target, true + } + return DirectoryTarget{}, false +} + +func (c *Catalog) reconcileLoop() { + defer c.workers.Done() + ticker := time.NewTicker(250 * time.Millisecond) + defer ticker.Stop() + for { + if target, ok := c.takeReconcileDirty(); ok { + c.reconcileQueued.Delete(target.Path) + ctx, cancel := context.WithTimeout(c.workerCtx, 2*time.Minute) + _ = c.ReconcileDirectory(ctx, target) + cancel() + continue + } + select { + case target := <-c.reconcileCh: + c.reconcileQueued.Delete(target.Path) + ctx, cancel := context.WithTimeout(c.workerCtx, 2*time.Minute) + _ = c.ReconcileDirectory(ctx, target) + cancel() + case <-ticker.C: + // Drain dirty map on the next loop iteration. + case <-c.stop: + return + } + } +} + +// RequestIndexSession coalesces an authoritative session write by path. It is +// intentionally non-blocking so a saturated projection can never delay JSONL +// or sidecar persistence. +func (c *Catalog) RequestIndexSession(target DirectoryTarget, path string) bool { + if c == nil { + return false + } + path = filepath.Clean(strings.TrimSpace(path)) + if path == "." || path == "" { + return false + } + target.Path = filepath.Clean(strings.TrimSpace(target.Path)) + if target.Path == "." || target.Path == "" { + target.Path = filepath.Dir(path) + } + request := sessionPathRequest{target: target, path: path} + if _, loaded := c.pathQueued.LoadOrStore(path, request); loaded { + return true + } + select { + case c.pathCh <- request: + return true + case <-c.stop: + c.pathQueued.Delete(path) + return false + default: + c.pathQueued.Delete(path) + return false + } +} + +func (c *Catalog) sessionPathLoop() { + defer c.workers.Done() + for { + select { + case request := <-c.pathCh: + c.pathQueued.Delete(request.path) + ctx, cancel := context.WithTimeout(c.workerCtx, 30*time.Second) + _ = c.IndexSessionPath(ctx, request.target, request.path) + cancel() + case <-c.stop: + return + } + } +} + +// IndexSessionPath prioritizes a restored tab's exact session without walking +// its directory. This keeps cold-start recovery independent from the size of +// the history store. +func (c *Catalog) IndexSessionPath(ctx context.Context, target DirectoryTarget, path string) error { + path = filepath.Clean(strings.TrimSpace(path)) + if path == "." || path == "" { + return nil + } + target.Path = filepath.Clean(strings.TrimSpace(target.Path)) + if target.Path == "." || target.Path == "" { + target.Path = filepath.Dir(path) + } + // Serialize exact indexing with reconciliation so an older scan cannot mark + // the new projection missing. Authoritative writes complete before this + // projection-only lock is acquired. + lock := c.directoryLock(target.Path) + lock.Lock() + defer lock.Unlock() + info, err := os.Stat(path) + if err != nil { + if os.IsNotExist(err) { + return nil + } + return err + } + // Only a path that still exists may supersede a removal tombstone. Doing + // this after Stat also prevents a delayed exact-index request from exposing + // an already archived row while its durable DELETE is pending. + c.removedPaths.Delete(path) + meta, ok, err := agent.LoadBranchMeta(path) + if err != nil { + return err + } + order := agent.SessionOrderInfo{ + Path: path, + CreatedAt: info.ModTime(), + LastActivityAt: info.ModTime(), + ModTime: info.ModTime(), + Scope: target.Scope, + WorkspaceRoot: target.WorkspaceRoot, + } + if ok { + order.CreatedAt = meta.CreatedAt + order.LastActivityAt = meta.UpdatedAt + order.ModTime = meta.UpdatedAt + order.Scope = meta.DefaultScope() + order.WorkspaceRoot = meta.WorkspaceRoot + order.TopicID = meta.TopicID + order.TopicTitle = meta.TopicTitle + order.CustomTitle = meta.CustomTitle + order.Recovered = meta.Recovered + order.RecoveryReason = meta.RecoveryReason + order.RecoveryDigest = meta.RecoveryDigest + order.ParentID = meta.ParentID + order.Turns = meta.Turns + order.Preview = meta.Preview + order.SchemaVersion = meta.SchemaVersion + } + if order.CreatedAt.IsZero() { + order.CreatedAt = info.ModTime() + } + if order.LastActivityAt.IsZero() { + order.LastActivityAt = info.ModTime() + } + record := recordFromOrder(target, order) + if err := c.UpsertSession(ctx, record); err != nil { + return err + } + if record.TurnsState == TurnsUnknown { + c.enqueueRepair(record.Path) + } + return nil +} + +func recordFromOrder(target DirectoryTarget, info agent.SessionOrderInfo) SessionRecord { + scope, root := normalizeScope(info.Scope, info.WorkspaceRoot) + if info.TopicID == "" { + scope, root = target.Scope, target.WorkspaceRoot + } + turnsState := TurnsValid + if info.SchemaVersion < agent.BranchMetaCountsVersion && info.Turns == 0 { + turnsState = TurnsUnknown + } + contentFingerprint := fileFingerprint(info.Path) + metaFingerprint := fileFingerprint(agent.BranchMetaPath(info.Path)) + createdAt := unixMilli(info.CreatedAt) + lastActivityAt := unixMilli(info.LastActivityAt) + // File mtime is a hard floor. Migration/meta can temporarily write zero + // UpdatedAt; without this, topics sort as inactive and look "missing". + if st, err := os.Stat(info.Path); err == nil { + fileMS := st.ModTime().UnixMilli() + if createdAt <= 0 { + createdAt = fileMS + } + if lastActivityAt <= 0 || fileMS > lastActivityAt { + lastActivityAt = fileMS + } + } + return normalizeSessionRecord(SessionRecord{ + Path: info.Path, + Directory: target.Path, + Scope: scope, + WorkspaceRoot: root, + TopicID: info.TopicID, + TopicTitle: info.TopicTitle, + CustomTitle: info.CustomTitle, + CreatedAt: createdAt, + LastActivityAt: lastActivityAt, + Preview: info.Preview, + Turns: info.Turns, + TurnsState: turnsState, + Recovered: info.Recovered, + RecoveryReason: info.RecoveryReason, + RecoveryDigest: info.RecoveryDigest, + ParentID: info.ParentID, + ContentFingerprint: contentFingerprint, + MetaFingerprint: metaFingerprint, + Health: HealthOK, + }) +} + +func unixMilli(value time.Time) int64 { + if value.IsZero() { + return 0 + } + return value.UnixMilli() +} + +func fileFingerprint(path string) string { + info, err := os.Stat(path) + if err != nil { + return "" + } + return fmt.Sprintf("%d:%d", info.Size(), info.ModTime().UnixNano()) +} + +// 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) { + c.mutationMu.Lock() + defer c.mutationMu.Unlock() + tx, err := c.db.BeginTx(ctx, nil) + if err != nil { + return 0, "", err + } + 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 + } + 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 + } + 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 generation, "", tx.Commit() +} + +func (c *Catalog) finishDirectoryScan(ctx context.Context, target DirectoryTarget, signature string, generation, now int64, total int) error { + c.mutationMu.Lock() + defer c.mutationMu.Unlock() + tx, err := c.db.BeginTx(ctx, nil) + if err != nil { + return err + } + rows, err := tx.QueryContext(ctx, `SELECT scope,workspace_root,topic_id FROM catalog_sessions + WHERE directory=? AND seen_generation''`, target.Path, generation) + if err != nil { + _ = tx.Rollback() + return err + } + affected := map[TopicKey]struct{}{} + for rows.Next() { + var key TopicKey + if err := rows.Scan(&key.Scope, &key.WorkspaceRoot, &key.TopicID); err != nil { + _ = rows.Close() + _ = tx.Rollback() + return err + } + affected[key] = struct{}{} + } + if err := rows.Close(); err != nil { + _ = tx.Rollback() + return err + } + if _, err := tx.ExecContext(ctx, `UPDATE catalog_sessions SET + missing_since=CASE WHEN missing_since=0 THEN ? ELSE missing_since END, + health='missing' + WHERE directory=? AND seen_generation0 AND missing_since<=?`, target.Path, generation, cutoff); err != nil { + _ = tx.Rollback() + return err + } + for key := range affected { + if err := recomputeTopic(ctx, tx, key); err != nil { + _ = tx.Rollback() + return err + } + } + if _, err := tx.ExecContext(ctx, `UPDATE catalog_directories SET state='ready',error='',signature=?, + scan_cursor='',indexed=?,total=?,completed_at=? WHERE path=?`, signature, total, total, now, target.Path); err != nil { + _ = tx.Rollback() + return err + } + revision, err := bumpRevision(ctx, tx) + if err != nil { + _ = tx.Rollback() + return err + } + if err := tx.Commit(); err != nil { + return err + } + c.publishRevision(revision, []string{target.WorkspaceRoot}, "reconcile_complete") + c.refreshCounts(ctx) + c.statusMu.Lock() + c.status.State = StateReady + c.status.LastError = "" + c.statusMu.Unlock() + return nil +} + +func (c *Catalog) failDirectoryScan(ctx context.Context, path string, scanErr error) { + c.mutationMu.Lock() + _, _ = c.db.ExecContext(ctx, `UPDATE catalog_directories SET state='degraded',error=? WHERE path=?`, scanErr.Error(), path) + c.mutationMu.Unlock() + c.statusMu.Lock() + c.status.State = StateDegraded + c.status.LastError = scanErr.Error() + c.statusMu.Unlock() +} + +func (c *Catalog) enqueueRepair(path string) { + if c == nil || c.opts.DisableRepair || strings.TrimSpace(path) == "" { + return + } + if _, loaded := c.repairQueued.LoadOrStore(path, struct{}{}); loaded { + return + } + select { + case c.repairCh <- path: + 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) { + 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 + } + defer rows.Close() + for rows.Next() { + var path string + if rows.Scan(&path) == nil { + c.enqueueRepair(path) + } + } +} + +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 + } + } +} + +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 || workerCtx.Err() != nil { + return + } + if err != nil { + _ = c.applyRepairResult(ctx, path, "", 0, false, "repair_corrupt") + return + } + preview, turns := agent.SessionPreviewFromMessages(msgs) + if err := agent.UpdateBranchMeta(path, false, func(meta *agent.BranchMeta) error { + meta.Preview = preview + meta.Turns = turns + meta.SchemaVersion = agent.BranchMetaCountsVersion + return nil + }); err != nil { + return + } + if ctx.Err() != nil || workerCtx.Err() != nil { + return + } + _ = c.applyRepairResult(ctx, path, preview, turns, true, "repair") +} + +func (c *Catalog) applyRepairResult(ctx context.Context, path, preview string, turns int, valid bool, reason string) error { + c.mutationMu.Lock() + defer c.mutationMu.Unlock() + tx, err := c.db.BeginTx(ctx, nil) + if err != nil { + return err + } + var key TopicKey + if err := tx.QueryRowContext(ctx, `SELECT scope,workspace_root,topic_id FROM catalog_sessions WHERE path=?`, path).Scan(&key.Scope, &key.WorkspaceRoot, &key.TopicID); err != nil { + _ = tx.Rollback() + if err == sql.ErrNoRows { + return nil + } + return err + } + if valid { + if _, err := tx.ExecContext(ctx, `UPDATE catalog_sessions SET preview=?,turns=?,turns_state='valid', + health='ok',meta_fingerprint=? WHERE path=?`, preview, turns, fileFingerprint(agent.BranchMetaPath(path)), path); err != nil { + _ = tx.Rollback() + return err + } + } else if _, err := tx.ExecContext(ctx, `UPDATE catalog_sessions SET turns_state='corrupt',health='corrupt' WHERE path=?`, path); err != nil { + _ = tx.Rollback() + return err + } + if key.TopicID != "" { + if err := recomputeTopic(ctx, tx, key); err != nil { + _ = tx.Rollback() + return err + } + } + revision, err := bumpRevision(ctx, tx) + if err != nil { + _ = tx.Rollback() + return err + } + if err := tx.Commit(); err != nil { + return err + } + c.publishRevision(revision, []string{key.WorkspaceRoot}, reason) + c.refreshCounts(ctx) + return nil +} + +// Rebuild replaces only the disposable catalog. Authoritative sessions and +// 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() + } + 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 + } + // Open the published replacement briefly for a status snapshot, then close. + catalog, err := Open(ctx, Options{Path: path, DisableRepair: true}) + if err != nil { + return Status{State: StateReady, Mode: ModeDisk, Path: path}, nil + } + status := catalog.Status() + closeCtx, cancel := context.WithTimeout(context.Background(), time.Second) + _ = catalog.Close(closeCtx) + cancel() + return status, nil +} + +// Inspect is read-only. It never migrates, repairs, quarantines, or rewrites a +// catalog, making it suitable for `reasonix doctor sessions`. +func Inspect(ctx context.Context, path string) (Status, error) { + if strings.TrimSpace(path) == "" { + path = DefaultPath() + } + status := Status{State: StateDegraded, Mode: ModeDisk, Path: path} + 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") + if err != nil { + return status, err + } + defer db.Close() + 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) + _ = db.QueryRowContext(ctx, `SELECT COUNT(*) FROM catalog_sessions WHERE turns_state='unknown'`).Scan(&status.RepairPending) + return status, nil +} diff --git a/internal/sessioncatalog/removal.go b/internal/sessioncatalog/removal.go new file mode 100644 index 0000000000..0dceb7dd7e --- /dev/null +++ b/internal/sessioncatalog/removal.go @@ -0,0 +1,155 @@ +package sessioncatalog + +import ( + "context" + "database/sql" + "errors" + "path/filepath" + "strings" + "time" +) + +// RemoveSession records a tombstone before any mutex wait so archived paths +// stop being queryable immediately. SQLite deletion retries asynchronously. +func (c *Catalog) RemoveSession(ctx context.Context, path, reason string) error { + if c == nil || c.db == nil { + return nil + } + path = filepath.Clean(strings.TrimSpace(path)) + if path == "." || path == "" { + return nil + } + // Immediate query overlay: ListTopics/ListSessions/GetSession filter this + // map even when the durable DELETE has not committed yet. + c.removedPaths.Store(path, struct{}{}) + c.writeMu.Lock() + delete(c.writeQueued, path) + c.writeMu.Unlock() + c.pathQueued.Delete(path) + c.repairQueued.Delete(path) + // Wake listeners without SQLite. Equal revision identifies an overlay change; + // empty roots refresh every expanded folder without querying the busy DB for + // workspace_root. + if c.opts.OnRevision != nil { + c.opts.OnRevision(c.revision.Load(), []string{}, reason) + } + + if err := c.tryApplySessionRemoval(ctx, path, reason); err != nil { + c.scheduleSessionRemovalRetry(path, reason) + // Overlay already hides the row. Busy locks and short caller contexts + // are not interactive failures — durable DELETE is retried in the + // background. + if errors.Is(err, errSessionRemovalBusy) || + errors.Is(err, context.Canceled) || + errors.Is(err, context.DeadlineExceeded) { + return nil + } + return err + } + return nil +} + +var errSessionRemovalBusy = errors.New("session catalog removal busy") + +func (c *Catalog) scheduleSessionRemovalRetry(path, reason string) { + if c == nil || c.workerCtx == nil { + return + } + c.workers.Go(func() { + select { + case <-c.stop: + return + case <-c.workerCtx.Done(): + return + case <-time.After(25 * time.Millisecond): + } + ctx, cancel := context.WithTimeout(c.workerCtx, 5*time.Second) + defer cancel() + // Re-check tombstone: a recreate may have cleared it. + if _, removed := c.removedPaths.Load(path); !removed { + return + } + // Blocking apply is fine on the background worker. + _ = c.applySessionRemovalLocked(ctx, path, reason+"-retry", true) + }) +} + +// tryApplySessionRemoval attempts a non-blocking durable delete. When directory +// or mutation locks are held by reconcile/write, returns errSessionRemovalBusy +// so the caller can keep the tombstone overlay and retry asynchronously. +func (c *Catalog) tryApplySessionRemoval(ctx context.Context, path, reason string) error { + return c.applySessionRemovalLocked(ctx, path, reason, false) +} + +// applySessionRemovalLocked performs the durable SQLite delete. When blocking +// is false, TryLock is used so interactive RemoveSession never waits on mutexes +// after the tombstone is already query-visible. +func (c *Catalog) applySessionRemovalLocked(ctx context.Context, path, reason string, blocking bool) error { + if ctx == nil { + ctx = context.Background() + } + // Serialize an authoritative removal with directory reconciliation. Without + // this boundary a scan that captured the old path just before an archive + // could clear the tombstone and reinsert the stale projection afterwards. + directoryLock := c.directoryLock(filepath.Dir(path)) + if blocking { + directoryLock.Lock() + } else if !directoryLock.TryLock() { + return errSessionRemovalBusy + } + defer directoryLock.Unlock() + if blocking { + c.mutationMu.Lock() + } else if !c.mutationMu.TryLock() { + return errSessionRemovalBusy + } + defer c.mutationMu.Unlock() + // Prefer a live worker context when the caller deadline already expired + // (desktop RemoveSession uses ~150ms). + sqlCtx := ctx + var cancel context.CancelFunc + if ctx.Err() != nil && c.workerCtx != nil { + sqlCtx, cancel = context.WithTimeout(c.workerCtx, 5*time.Second) + defer cancel() + } + tx, err := c.db.BeginTx(sqlCtx, nil) + if err != nil { + return err + } + var key TopicKey + err = tx.QueryRowContext(sqlCtx, `SELECT scope,workspace_root,topic_id FROM catalog_sessions WHERE path=?`, path). + Scan(&key.Scope, &key.WorkspaceRoot, &key.TopicID) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + _ = tx.Rollback() + return err + } + if _, err := tx.ExecContext(sqlCtx, `DELETE FROM catalog_sessions WHERE path=?`, path); err != nil { + _ = tx.Rollback() + return err + } + if key.TopicID != "" { + if err := recomputeTopic(sqlCtx, tx, key); err != nil { + _ = tx.Rollback() + return err + } + } + revision, err := bumpRevision(sqlCtx, tx) + if err != nil { + _ = tx.Rollback() + return err + } + if err := tx.Commit(); err != nil { + return err + } + c.publishRevision(revision, []string{key.WorkspaceRoot}, reason) + c.refreshCounts(sqlCtx) + return nil +} + +func (c *Catalog) pathRemoved(path string) bool { + if c == nil { + return false + } + _, removed := c.removedPaths.Load(filepath.Clean(path)) + return removed +} diff --git a/internal/sessioncatalog/removal_pagination_test.go b/internal/sessioncatalog/removal_pagination_test.go new file mode 100644 index 0000000000..48e071d0f8 --- /dev/null +++ b/internal/sessioncatalog/removal_pagination_test.go @@ -0,0 +1,148 @@ +package sessioncatalog + +import ( + "context" + "fmt" + "path/filepath" + "testing" + "time" +) + +func TestTombstonesDoNotTruncateSessionOrTopicPagination(t *testing.T) { + t.Parallel() + ctx := context.Background() + catalog, err := Open(ctx, Options{ + Path: filepath.Join(t.TempDir(), "catalog.sqlite"), DisableRepair: true, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + + paths := make([]string, 5) + for i := range paths { + paths[i] = filepath.Join("/sessions", fmt.Sprintf("page-%d.jsonl", i)) + if err := catalog.UpsertSession(ctx, SessionRecord{ + Path: paths[i], Directory: "/sessions", Scope: "global", + TopicID: fmt.Sprintf("topic-%d", i), TopicTitle: fmt.Sprintf("Topic %d", i), + LastActivityAt: int64(5 - i), TurnsState: TurnsValid, Health: HealthOK, + }); err != nil { + t.Fatal(err) + } + } + // Keep the two newest SQL rows behind the read-visible overlay, as happens + // while an authoritative archive waits for the durable DELETE worker. + catalog.removedPaths.Store(paths[0], struct{}{}) + catalog.removedPaths.Store(paths[1], struct{}{}) + + sessions, err := catalog.ListSessions(ctx, SessionPageRequest{Scope: "all", Limit: 2}) + if err != nil { + t.Fatal(err) + } + if len(sessions.Items) != 2 || sessions.Items[0].Path != paths[2] || sessions.Items[1].Path != paths[3] || sessions.NextCursor == "" { + t.Fatalf("first visible session page = %+v", sessions) + } + sessionTail, err := catalog.ListSessions(ctx, SessionPageRequest{Scope: "all", Limit: 2, Cursor: sessions.NextCursor}) + if err != nil { + t.Fatal(err) + } + if len(sessionTail.Items) != 1 || sessionTail.Items[0].Path != paths[4] { + t.Fatalf("session tail = %+v", sessionTail) + } + + topics, err := catalog.ListTopics(ctx, TopicPageRequest{Scope: "global", Limit: 2}) + if err != nil { + t.Fatal(err) + } + if len(topics.Items) != 2 || topics.Items[0].TopicID != "topic-2" || topics.Items[1].TopicID != "topic-3" || topics.NextCursor == "" { + t.Fatalf("first visible topic page = %+v", topics) + } + topicTail, err := catalog.ListTopics(ctx, TopicPageRequest{Scope: "global", Limit: 2, Cursor: topics.NextCursor}) + if err != nil { + t.Fatal(err) + } + if len(topicTail.Items) != 1 || topicTail.Items[0].TopicID != "topic-4" { + t.Fatalf("topic tail = %+v", topicTail) + } +} + +func TestTopicVisibilityScansPastTombstonedPayloadWindow(t *testing.T) { + t.Parallel() + ctx := context.Background() + catalog, err := Open(ctx, Options{ + Path: filepath.Join(t.TempDir(), "catalog.sqlite"), DisableRepair: true, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + + paths := make([]string, MaxLimit+1) + for i := range paths { + paths[i] = filepath.Join("/sessions", fmt.Sprintf("deep-%03d.jsonl", i)) + if err := catalog.UpsertSession(ctx, SessionRecord{ + Path: paths[i], Directory: "/sessions", Scope: "global", TopicID: "deep", + LastActivityAt: int64(len(paths) - i), TurnsState: TurnsValid, Health: HealthOK, + }); err != nil { + t.Fatal(err) + } + } + for _, path := range paths[:MaxLimit] { + catalog.removedPaths.Store(path, struct{}{}) + } + topic, ok, err := catalog.GetTopic(ctx, TopicKey{Scope: "global", TopicID: "deep"}) + if err != nil { + t.Fatal(err) + } + if !ok || len(topic.Sessions) != 1 || topic.Sessions[0].Path != paths[MaxLimit] { + t.Fatalf("topic after payload-window tombstones: ok=%v topic=%+v", ok, topic) + } +} + +func TestTombstoneOverlayPublishesRefreshableEventBeforeDurableDelete(t *testing.T) { + t.Parallel() + type revisionEvent struct { + revision uint64 + roots []string + reason string + } + events := make(chan revisionEvent, 8) + ctx := context.Background() + dir := t.TempDir() + path := filepath.Join(dir, "session.jsonl") + catalog, err := Open(ctx, Options{ + Path: filepath.Join(t.TempDir(), "catalog.sqlite"), DisableRepair: true, + OnRevision: func(revision uint64, roots []string, reason string) { + events <- revisionEvent{revision: revision, roots: roots, reason: reason} + }, + }) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + if err := catalog.UpsertSession(ctx, SessionRecord{ + Path: path, Directory: dir, Scope: "project", WorkspaceRoot: "/workspace", + TopicID: "topic", LastActivityAt: 1, TurnsState: TurnsValid, Health: HealthOK, + }); err != nil { + t.Fatal(err) + } + for len(events) > 0 { + <-events + } + + dirLock := catalog.directoryLock(dir) + dirLock.Lock() + defer dirLock.Unlock() + before := catalog.revision.Load() + if err := catalog.RemoveSession(ctx, path, "topic_archived"); err != nil { + t.Fatal(err) + } + select { + case event := <-events: + if event.revision != before || event.reason != "topic_archived" || len(event.roots) != 0 { + t.Fatalf("overlay event = %+v, want equal revision, archive reason, and all roots", event) + } + case <-time.After(2 * time.Second): + t.Fatal("tombstone overlay did not publish an immediate project-tree event") + } +} diff --git a/internal/sessioncatalog/schema.go b/internal/sessioncatalog/schema.go new file mode 100644 index 0000000000..0605ec6c20 --- /dev/null +++ b/internal/sessioncatalog/schema.go @@ -0,0 +1,119 @@ +package sessioncatalog + +import ( + "context" + "database/sql" + + "reasonix/internal/projectiondb" +) + +const migrationV1 = ` +CREATE TABLE IF NOT EXISTS catalog_state ( + id INTEGER PRIMARY KEY CHECK (id = 1), + revision INTEGER NOT NULL DEFAULT 0 +); +INSERT OR IGNORE INTO catalog_state(id, revision) VALUES(1, 0); + +CREATE TABLE IF NOT EXISTS catalog_directories ( + path TEXT PRIMARY KEY, + scope TEXT NOT NULL, + workspace_root TEXT NOT NULL DEFAULT '', + signature TEXT NOT NULL DEFAULT '', + scan_cursor TEXT NOT NULL DEFAULT '', + scan_generation INTEGER NOT NULL DEFAULT 0, + state TEXT NOT NULL DEFAULT 'pending', + error TEXT NOT NULL DEFAULT '', + indexed INTEGER NOT NULL DEFAULT 0, + total INTEGER NOT NULL DEFAULT 0, + completed_at INTEGER NOT NULL DEFAULT 0 +); + +CREATE TABLE IF NOT EXISTS catalog_projects ( + scope TEXT NOT NULL, + workspace_root TEXT NOT NULL DEFAULT '', + title TEXT NOT NULL DEFAULT '', + color TEXT NOT NULL DEFAULT '', + pinned INTEGER NOT NULL DEFAULT 0, + sort_order INTEGER NOT NULL DEFAULT 0, + updated_at INTEGER NOT NULL DEFAULT 0, + PRIMARY KEY(scope, workspace_root) +); + +CREATE TABLE IF NOT EXISTS catalog_topics ( + scope TEXT NOT NULL, + workspace_root TEXT NOT NULL DEFAULT '', + topic_id TEXT NOT NULL, + title TEXT NOT NULL DEFAULT '', + title_source TEXT NOT NULL DEFAULT '', + pinned INTEGER NOT NULL DEFAULT 0, + sort_order INTEGER NOT NULL DEFAULT 0, + turns INTEGER NOT NULL DEFAULT 0, + turns_state TEXT NOT NULL DEFAULT 'unknown', + created_at INTEGER NOT NULL DEFAULT 0, + last_activity_at INTEGER NOT NULL DEFAULT 0, + recovery_state TEXT NOT NULL DEFAULT '', + health TEXT NOT NULL DEFAULT 'ok', + PRIMARY KEY(scope, workspace_root, topic_id) +); + +CREATE TABLE IF NOT EXISTS catalog_sessions ( + path TEXT PRIMARY KEY, + directory TEXT NOT NULL, + scope TEXT NOT NULL, + workspace_root TEXT NOT NULL DEFAULT '', + topic_id TEXT NOT NULL DEFAULT '', + topic_title TEXT NOT NULL DEFAULT '', + custom_title TEXT NOT NULL DEFAULT '', + created_at INTEGER NOT NULL DEFAULT 0, + last_activity_at INTEGER NOT NULL DEFAULT 0, + preview TEXT NOT NULL DEFAULT '', + turns INTEGER NOT NULL DEFAULT 0, + turns_state TEXT NOT NULL DEFAULT 'unknown', + recovered INTEGER NOT NULL DEFAULT 0, + recovery_reason TEXT NOT NULL DEFAULT '', + recovery_digest TEXT NOT NULL DEFAULT '', + parent_id TEXT NOT NULL DEFAULT '', + content_fingerprint TEXT NOT NULL DEFAULT '', + meta_fingerprint TEXT NOT NULL DEFAULT '', + health TEXT NOT NULL DEFAULT 'ok', + missing_since INTEGER NOT NULL DEFAULT 0, + seen_generation INTEGER NOT NULL DEFAULT 0 +); + +CREATE INDEX IF NOT EXISTS idx_catalog_topics_page + ON catalog_topics(scope, workspace_root, pinned DESC, last_activity_at DESC, topic_id ASC); +CREATE INDEX IF NOT EXISTS idx_catalog_topics_activity + ON catalog_topics(last_activity_at DESC, topic_id ASC); +CREATE INDEX IF NOT EXISTS idx_catalog_sessions_topic + ON catalog_sessions(scope, workspace_root, topic_id, last_activity_at DESC, path ASC); +CREATE INDEX IF NOT EXISTS idx_catalog_sessions_directory + ON catalog_sessions(directory, seen_generation, missing_since); +CREATE INDEX IF NOT EXISTS idx_catalog_sessions_path + ON catalog_sessions(path); +` + +const migrationV2 = ` +ALTER TABLE catalog_topics ADD COLUMN metadata_present INTEGER NOT NULL DEFAULT 0; +` + +const migrationV3 = ` +CREATE INDEX IF NOT EXISTS idx_catalog_sessions_history +ON catalog_sessions(scope, workspace_root, last_activity_at DESC, path ASC); +` + +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 + }}, + {Version: 3, Apply: func(ctx context.Context, tx *sql.Tx) error { + _, err := tx.ExecContext(ctx, migrationV3) + return err + }}, + } +} diff --git a/internal/sessioncatalog/session_page.go b/internal/sessioncatalog/session_page.go new file mode 100644 index 0000000000..f8ac96f6e2 --- /dev/null +++ b/internal/sessioncatalog/session_page.go @@ -0,0 +1,188 @@ +package sessioncatalog + +import ( + "context" + "database/sql" + "encoding/base64" + "encoding/json" + "errors" + "fmt" + "path/filepath" + "strings" + "time" +) + +type sessionPageCursor struct { + Revision uint64 `json:"r"` + Activity int64 `json:"a"` + Path string `json:"p"` +} + +const sessionSelectColumns = `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` + +func scanSession(scanner interface{ Scan(...any) error }) (SessionRecord, error) { + var record SessionRecord + err := scanner.Scan(&record.Path, &record.Directory, &record.Scope, &record.WorkspaceRoot, + &record.TopicID, &record.TopicTitle, &record.CustomTitle, &record.CreatedAt, + &record.LastActivityAt, &record.Preview, &record.Turns, &record.TurnsState, + &record.Recovered, &record.RecoveryReason, &record.RecoveryDigest, + &record.ParentID, &record.ContentFingerprint, &record.MetaFingerprint, + &record.Health, &record.MissingSince) + return record, err +} + +// ListSessions returns only catalog metadata. It never opens a transcript or +// sidecar and therefore remains safe on startup and UI pagination paths. +func (c *Catalog) ListSessions(ctx context.Context, req SessionPageRequest) (SessionPage, error) { + out := SessionPage{Items: []SessionRecord{}, Revision: c.revision.Load()} + if req.Limit <= 0 { + req.Limit = DefaultLimit + } + if req.Limit > MaxLimit { + req.Limit = MaxLimit + } + cursor, err := decodeSessionCursor(req.Cursor) + if err != nil { + return out, err + } + if cursor != nil && cursor.Revision != out.Revision { + out.StaleCursor = true + return out, nil + } + where := []string{`missing_since=0`, `health<>'missing'`} + args := []any{} + switch strings.ToLower(strings.TrimSpace(req.Scope)) { + case "", "all": + case "project": + where = append(where, `scope='project'`, `workspace_root=?`) + args = append(args, strings.TrimSpace(req.WorkspaceRoot)) + case "global": + where = append(where, `scope='global'`) + default: + return out, fmt.Errorf("invalid session catalog scope %q", req.Scope) + } + if directory := strings.TrimSpace(req.Directory); directory != "" { + where = append(where, `directory=?`) + args = append(args, filepath.Clean(directory)) + } + if query := strings.ToLower(strings.TrimSpace(req.Query)); query != "" { + where = append(where, `(lower(custom_title) LIKE ? OR lower(preview) LIKE ? OR lower(topic_title) LIKE ? OR lower(topic_id) LIKE ?)`) + like := "%" + query + "%" + args = append(args, like, like, like, like) + } + appendSessionTimeFilter(&where, &args, req.TimeFilter, c.opts.Now()) + scanCursor := cursor + scanLimit := max(req.Limit+1, 64) + for len(out.Items) <= req.Limit { + pageWhere := append([]string(nil), where...) + pageArgs := append([]any(nil), args...) + if scanCursor != nil { + pageWhere = append(pageWhere, `(last_activity_at?))`) + pageArgs = append(pageArgs, scanCursor.Activity, scanCursor.Activity, scanCursor.Path) + } + pageArgs = append(pageArgs, scanLimit) + rows, err := c.db.QueryContext(ctx, `SELECT `+sessionSelectColumns+` FROM catalog_sessions WHERE `+ + strings.Join(pageWhere, ` AND `)+` ORDER BY last_activity_at DESC,path ASC LIMIT ?`, pageArgs...) + if err != nil { + return out, err + } + rawCount := 0 + var lastScanned SessionRecord + for rows.Next() { + record, err := scanSession(rows) + if err != nil { + _ = rows.Close() + return out, err + } + rawCount++ + lastScanned = record + if c.pathRemoved(record.Path) { + continue + } + out.Items = append(out.Items, record) + if len(out.Items) > req.Limit { + break + } + } + rowsErr := rows.Err() + _ = rows.Close() + if rowsErr != nil { + return out, rowsErr + } + if len(out.Items) > req.Limit || rawCount < scanLimit || rawCount == 0 { + break + } + scanCursor = &sessionPageCursor{Activity: lastScanned.LastActivityAt, Path: lastScanned.Path} + } + if len(out.Items) > req.Limit { + out.Items = out.Items[:req.Limit] + last := out.Items[len(out.Items)-1] + out.NextCursor = encodeSessionCursor(sessionPageCursor{Revision: out.Revision, Activity: last.LastActivityAt, Path: last.Path}) + } + return out, nil +} + +func appendSessionTimeFilter(where *[]string, args *[]any, filter string, now time.Time) { + value := strings.ToLower(strings.TrimSpace(filter)) + startToday := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()) + switch value { + case "", "all": + case "today": + *where = append(*where, `last_activity_at>=?`) + *args = append(*args, startToday.UnixMilli()) + case "yesterday": + *where = append(*where, `last_activity_at>=?`, `last_activity_at 0 { + *where = append(*where, `last_activity_at>=?`) + *args = append(*args, cutoff) + } + } +} + +func (c *Catalog) GetSession(ctx context.Context, path string) (SessionRecord, bool, error) { + path = filepath.Clean(strings.TrimSpace(path)) + if path == "." || path == "" { + return SessionRecord{}, false, nil + } + if c.pathRemoved(path) { + return SessionRecord{}, false, nil + } + record, err := scanSession(c.db.QueryRowContext(ctx, `SELECT `+sessionSelectColumns+` FROM catalog_sessions WHERE path=?`, path)) + if errors.Is(err, sql.ErrNoRows) { + return SessionRecord{}, false, nil + } + return record, err == nil, err +} + +func encodeSessionCursor(cursor sessionPageCursor) string { + b, _ := json.Marshal(cursor) + return base64.RawURLEncoding.EncodeToString(b) +} + +// CursorAfter returns an exclusive pagination cursor after the given session. +func CursorAfter(revision uint64, lastActivityAt int64, path string) string { + return encodeSessionCursor(sessionPageCursor{Revision: revision, Activity: lastActivityAt, Path: path}) +} + +func decodeSessionCursor(encoded string) (*sessionPageCursor, error) { + if strings.TrimSpace(encoded) == "" { + return nil, nil + } + b, err := base64.RawURLEncoding.DecodeString(encoded) + if err != nil { + return nil, fmt.Errorf("invalid session catalog cursor: %w", err) + } + var cursor sessionPageCursor + if err := json.Unmarshal(b, &cursor); err != nil || cursor.Path == "" { + return nil, errors.New("invalid session catalog cursor") + } + return &cursor, nil +} diff --git a/internal/sessioncatalog/types.go b/internal/sessioncatalog/types.go new file mode 100644 index 0000000000..1423b30603 --- /dev/null +++ b/internal/sessioncatalog/types.go @@ -0,0 +1,188 @@ +// Package sessioncatalog maintains a disposable SQLite projection of Reasonix +// session sidecars. Session JSONL/event/meta files remain authoritative; every +// row in this package may be discarded and rebuilt. +package sessioncatalog + +import ( + "path/filepath" + "strings" + "time" + + "reasonix/internal/config" +) + +const ( + SchemaVersion = 3 + DefaultLimit = 50 + MaxLimit = 200 +) + +type TurnsState string + +const ( + TurnsUnknown TurnsState = "unknown" + TurnsValid TurnsState = "valid" + TurnsCorrupt TurnsState = "corrupt" +) + +type Health string + +const ( + HealthOK Health = "ok" + HealthMissing Health = "missing" + HealthCorrupt Health = "corrupt" + HealthDegraded Health = "degraded" +) + +type State string + +const ( + StateOpening State = "opening" + StateReady State = "ready" + StateDegraded State = "degraded" + StateRebuilding State = "rebuilding" + StateClosed State = "closed" +) + +type Mode string + +const ( + ModeDisk Mode = "disk" + ModeMemory Mode = "memory" +) + +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"` + RepairPending int64 `json:"repairPending"` + LastError string `json:"lastError,omitempty"` + QuarantinedPath string `json:"quarantinedPath,omitempty"` +} + +type Options struct { + Path string + InMemory bool + DisableRepair bool + MissingGrace time.Duration + QueueCapacity int + Now func() time.Time + OnRevision func(uint64, []string, string) +} + +type DirectoryTarget struct { + Path string `json:"path"` + Scope string `json:"scope"` + WorkspaceRoot string `json:"workspaceRoot,omitempty"` +} + +type ProjectRecord struct { + Scope string `json:"scope"` + WorkspaceRoot string `json:"workspaceRoot,omitempty"` + Title string `json:"title"` + Color string `json:"color,omitempty"` + Pinned bool `json:"pinned,omitempty"` + SortOrder int `json:"sortOrder,omitempty"` +} + +type TopicMetadata struct { + Scope string `json:"scope"` + WorkspaceRoot string `json:"workspaceRoot,omitempty"` + TopicID string `json:"topicId"` + Title string `json:"title"` + TitleSource string `json:"titleSource,omitempty"` + Pinned bool `json:"pinned,omitempty"` + SortOrder int `json:"sortOrder,omitempty"` + CreatedAt int64 `json:"createdAt,omitempty"` +} + +type SessionRecord struct { + Path string `json:"path"` + Directory string `json:"directory"` + Scope string `json:"scope"` + WorkspaceRoot string `json:"workspaceRoot,omitempty"` + TopicID string `json:"topicId,omitempty"` + TopicTitle string `json:"topicTitle,omitempty"` + CustomTitle string `json:"customTitle,omitempty"` + CreatedAt int64 `json:"createdAt,omitempty"` + LastActivityAt int64 `json:"lastActivityAt,omitempty"` + Preview string `json:"preview,omitempty"` + Turns int `json:"turns"` + TurnsState TurnsState `json:"turnsState"` + Recovered bool `json:"recovered,omitempty"` + RecoveryReason string `json:"recoveryReason,omitempty"` + RecoveryDigest string `json:"recoveryDigest,omitempty"` + ParentID string `json:"parentId,omitempty"` + ContentFingerprint string `json:"contentFingerprint,omitempty"` + MetaFingerprint string `json:"metaFingerprint,omitempty"` + Health Health `json:"health"` + MissingSince int64 `json:"missingSince,omitempty"` +} + +type TopicKey struct { + Scope string `json:"scope"` + WorkspaceRoot string `json:"workspaceRoot,omitempty"` + TopicID string `json:"topicId"` +} + +type TopicRecord struct { + Scope string `json:"scope"` + WorkspaceRoot string `json:"workspaceRoot,omitempty"` + TopicID string `json:"topicId"` + Title string `json:"title"` + Pinned bool `json:"pinned,omitempty"` + SortOrder int `json:"sortOrder,omitempty"` + Turns int `json:"turns"` + TurnsState TurnsState `json:"turnsState"` + CreatedAt int64 `json:"createdAt,omitempty"` + LastActivityAt int64 `json:"lastActivityAt,omitempty"` + RecoveryState string `json:"recoveryState,omitempty"` + Health Health `json:"health"` + Sessions []SessionRecord `json:"sessions"` +} + +type TopicPageRequest struct { + Scope string `json:"scope"` + WorkspaceRoot string `json:"workspaceRoot,omitempty"` + Cursor string `json:"cursor,omitempty"` + Limit int `json:"limit,omitempty"` + Query string `json:"query,omitempty"` + TimeFilter string `json:"timeFilter,omitempty"` +} + +type TopicPage struct { + Items []TopicRecord `json:"items"` + NextCursor string `json:"nextCursor,omitempty"` + Revision uint64 `json:"revision"` +} + +type SessionPageRequest struct { + Scope string `json:"scope"` + WorkspaceRoot string `json:"workspaceRoot,omitempty"` + Directory string `json:"-"` + Cursor string `json:"cursor,omitempty"` + Limit int `json:"limit,omitempty"` + Query string `json:"query,omitempty"` + TimeFilter string `json:"timeFilter,omitempty"` +} + +type SessionPage struct { + Items []SessionRecord `json:"items"` + NextCursor string `json:"nextCursor,omitempty"` + Revision uint64 `json:"revision"` + StaleCursor bool `json:"staleCursor,omitempty"` +} + +// 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 { + cache := strings.TrimSpace(config.CacheDir()) + if cache == "" { + return "" + } + return filepath.Join(cache, "session-catalog", "v1.sqlite") +} diff --git a/internal/stats/query.go b/internal/stats/query.go index 71444bbf82..7cc982a848 100644 --- a/internal/stats/query.go +++ b/internal/stats/query.go @@ -1,10 +1,13 @@ package stats import ( + "context" "maps" "sort" "strings" "time" + + "reasonix/internal/usagecatalog" ) // DailyTokens is one day's token usage and turn count in a trend series. @@ -68,6 +71,30 @@ type SourceFilter struct { // yield zero entries. When SourceFilter.Source is set, only records whose // Source matches are counted. func (w *Writer) Query(f SourceFilter) (RangeStats, error) { + var manager *usageManager + if w != nil { + manager = w.usage + if manager == nil { + manager = existingUsageManager(w.dir) + } + } + if manager != nil { + if catalog := manager.catalog.Load(); catalog != nil { + days := daysInRange(f.From, f.To) + if catalog.Ready(context.Background(), w.dir, days) { + rows, err := catalog.Query(context.Background(), f.From.Format(dayLayout), f.To.Format(dayLayout), f.Source) + if err == nil { + return rangeStatsFromRollups(f, days, rows), nil + } + } + catalog.RequestReconcileDir(w.dir) + catalog.NoteFallback() + } + } + return w.queryJSONL(f) +} + +func (w *Writer) queryJSONL(f SourceFilter) (RangeStats, error) { out := RangeStats{ From: f.From.Format(dayLayout), To: f.To.Format(dayLayout), @@ -182,6 +209,71 @@ func (w *Writer) Query(f SourceFilter) (RangeStats, error) { return out, nil } +func rangeStatsFromRollups(f SourceFilter, days []string, rows []usagecatalog.Rollup) RangeStats { + out := RangeStats{From: f.From.Format(dayLayout), To: f.To.Format(dayLayout), Daily: []DailyTokens{}, Models: []ModelUsage{}, Providers: []ProviderUsage{}} + byDay := map[string][]usagecatalog.Rollup{} + for _, row := range rows { + byDay[row.Day] = append(byDay[row.Day], row) + } + modelTotals := map[string]int64{} + providerTotals := map[string]int64{} + active := map[string]bool{} + for _, day := range days { + dayModels := map[string]int64{} + dayProviders := map[string]int64{} + dayRequests, dayTurns := int64(0), int64(0) + dayCacheHit, dayCacheMiss := int64(0), int64(0) + for _, row := range byDay[day] { + out.Tokens += row.Total + out.Requests += int(row.Requests) + out.Turns += int(row.Turns) + out.CacheHit += row.CacheHit + out.CacheMiss += row.CacheMiss + dayRequests += row.Requests + dayTurns += row.Turns + dayCacheHit += row.CacheHit + dayCacheMiss += row.CacheMiss + if row.Total > 0 { + model := row.ModelRef + if model == "" { + model = "(unknown)" + } + provider := row.Provider + if provider == "" { + provider = providerOf(model) + } + modelTotals[model] += row.Total + providerTotals[provider] += row.Total + dayModels[model] += row.Total + dayProviders[provider] += row.Total + } + if row.Total > 0 || row.Requests > 0 { + active[day] = true + } + } + out.Daily = append(out.Daily, DailyTokens{Day: day, Total: int(sum(dayModels)), ByModel: dayModels, ByProvider: dayProviders, + Requests: int(dayRequests), Turns: int(dayTurns), CacheHit: dayCacheHit, CacheMiss: dayCacheMiss}) + } + out.ActiveDays = len(active) + out.Models = modelsSorted(modelTotals) + out.Providers = providersSorted(providerTotals) + if len(out.Models) > 0 { + out.TopModel = out.Models[0].Model + } + if len(out.Providers) > 0 { + out.TopProvider = out.Providers[0].Provider + } + if out.Tokens > 0 { + for i := range out.Models { + out.Models[i].Percent = float64(out.Models[i].Tokens) / float64(out.Tokens) * 100 + } + for i := range out.Providers { + out.Providers[i].Percent = float64(out.Providers[i].Tokens) / float64(out.Tokens) * 100 + } + } + return out +} + // matchesSource reports whether a record's source label passes the filter. // An empty filter or "all" matches every source. func matchesSource(recSource, filter string) bool { diff --git a/internal/stats/record.go b/internal/stats/record.go index 04bf51c70c..d56e969d3b 100644 --- a/internal/stats/record.go +++ b/internal/stats/record.go @@ -17,6 +17,7 @@ package stats import ( "bufio" "context" + "crypto/sha256" "encoding/json" "errors" "io" @@ -26,6 +27,7 @@ import ( "time" "reasonix/internal/filelock" + "reasonix/internal/usagecatalog" ) // dayLayout names one stats file per UTC-free local day, e.g. 2026-08-02.jsonl. @@ -73,13 +75,15 @@ type record struct { // Writer appends records to the daily stats file for a given stats dir. type Writer struct { - dir string + dir string + usage *usageManager } // NewWriter returns a Writer rooted at dir. An empty dir disables recording // (query-only usage). func NewWriter(dir string) *Writer { - return &Writer{dir: strings.TrimSpace(dir)} + dir = strings.TrimSpace(dir) + return &Writer{dir: dir} } // Append writes one record, appending to the daily file (O_APPEND) so records @@ -105,17 +109,53 @@ func (w *Writer) Append(r record) error { if err != nil { return err } - defer release() + released := false + defer func() { + if !released { + release() + } + }() f, err := os.OpenFile(path, os.O_CREATE|os.O_RDWR|os.O_APPEND, 0o600) if err != nil { return err } - defer f.Close() if err := ensureRecordBoundary(f); err != nil { + _ = f.Close() return err } - _, err = f.Write(append(b, '\n')) - return err + info, err := f.Stat() + if err != nil { + _ = f.Close() + return err + } + offset := info.Size() + line := append(b, '\n') + if _, err = f.Write(line); err != nil { + _ = f.Close() + return err + } + if err := f.Close(); err != nil { + return err + } + release() + released = true + if w.usage != nil { + if catalog := w.usage.catalog.Load(); catalog != nil { + hash := sha256.Sum256(b) + catalog.Enqueue(usagecatalog.AppendReceipt{Path: path, Day: day, Offset: offset, Length: len(line), LineHash: fmtHash(hash[:])}, usageEntry(day, r)) + } + } + return nil +} + +func fmtHash(hash []byte) string { + const digits = "0123456789abcdef" + out := make([]byte, len(hash)*2) + for i, value := range hash { + out[i*2] = digits[value>>4] + out[i*2+1] = digits[value&15] + } + return string(out) } // ensureRecordBoundary separates a torn trailing JSON object from the next diff --git a/internal/stats/recorder.go b/internal/stats/recorder.go index e33a9dbd6a..8b8e01bdea 100644 --- a/internal/stats/recorder.go +++ b/internal/stats/recorder.go @@ -116,6 +116,7 @@ func (d *recordDispatcher) flush(ctx context.Context) error { // (desktop/cli/serve/...); an empty source keeps records unlabelled. func NewRecorder(inner event.Sink, dir, source string) *Recorder { writer := NewWriter(dir) + writer.usage = managerForUsage(writer.dir) return &Recorder{ inner: inner, writer: writer, dispatcher: dispatcherFor(writer), source: strings.TrimSpace(source), } @@ -155,14 +156,30 @@ func (r *Recorder) Flush(ctx context.Context) error { if r == nil { return nil } - return r.dispatcher.flush(ctx) + if err := r.dispatcher.flush(ctx); err != nil { + return err + } + if r.writer != nil && r.writer.usage != nil { + if catalog := r.writer.usage.catalog.Load(); catalog != nil { + return catalog.Flush(ctx) + } + } + return nil } // Flush waits for records already queued for dir. It is primarily useful when // a caller must read its own just-recorded statistics deterministically. func Flush(ctx context.Context, dir string) error { - writer := NewWriter(dir) - return existingDispatcher(writer.dir).flush(ctx) + dir = strings.TrimSpace(dir) + if err := existingDispatcher(dir).flush(ctx); err != nil { + return err + } + if manager := existingUsageManager(dir); manager != nil { + if catalog := manager.catalog.Load(); catalog != nil { + return catalog.Flush(ctx) + } + } + return nil } // RecordReadinessAudit forwards audit receipts to the wrapped sink. diff --git a/internal/stats/usage_catalog.go b/internal/stats/usage_catalog.go new file mode 100644 index 0000000000..1f25b4462b --- /dev/null +++ b/internal/stats/usage_catalog.go @@ -0,0 +1,163 @@ +package stats + +import ( + "context" + "path/filepath" + "strings" + "sync" + "sync/atomic" + + "reasonix/internal/config" + "reasonix/internal/usagecatalog" +) + +type usageManager struct { + catalog atomic.Pointer[usagecatalog.Catalog] + mu sync.Mutex + generation uint64 + opening bool + openDone chan struct{} + openCancel context.CancelFunc + open func(context.Context, string) (*usagecatalog.Catalog, error) +} + +var usageManagers = struct { + sync.Mutex + byDir map[string]*usageManager +}{byDir: map[string]*usageManager{}} + +func managerForUsage(dir string) *usageManager { + dir = strings.TrimSpace(dir) + if dir == "" || !sameUsageDirectory(dir, config.StatsDir()) { + return nil + } + usageManagers.Lock() + manager := usageManagers.byDir[dir] + if manager == nil { + manager = &usageManager{} + usageManagers.byDir[dir] = manager + } + usageManagers.Unlock() + manager.start(dir) + return manager +} + +func (m *usageManager) start(dir string) { + m.mu.Lock() + if m.catalog.Load() != nil || m.opening { + m.mu.Unlock() + return + } + m.generation++ + generation := m.generation + ctx, cancel := context.WithCancel(context.Background()) + done := make(chan struct{}) + m.opening, m.openDone, m.openCancel = true, done, cancel + openCatalog := m.open + if openCatalog == nil { + openCatalog = usagecatalog.Open + } + m.mu.Unlock() + go m.openGeneration(ctx, generation, done, dir, openCatalog) +} + +func (m *usageManager) openGeneration(ctx context.Context, generation uint64, done chan struct{}, dir string, openCatalog func(context.Context, string) (*usagecatalog.Catalog, error)) { + catalog, err := openCatalog(ctx, "") + if err == nil { + _ = catalog.ReconcileDir(ctx, dir) + } + m.mu.Lock() + stale := generation != m.generation || ctx.Err() != nil + if err == nil && !stale { + m.catalog.Store(catalog) + } + m.mu.Unlock() + if catalog != nil && (err != nil || stale) { + _ = catalog.Close(context.Background()) + } + m.mu.Lock() + if m.openDone == done { + m.opening = false + m.openDone = nil + m.openCancel = nil + } + close(done) + m.mu.Unlock() +} + +func (m *usageManager) close(ctx context.Context) error { + m.mu.Lock() + m.generation++ + if m.openCancel != nil { + m.openCancel() + } + done := m.openDone + catalog := m.catalog.Swap(nil) + m.mu.Unlock() + var closeErr error + if catalog != nil { + closeErr = catalog.Close(ctx) + } + if done != nil { + select { + case <-done: + case <-ctx.Done(): + if closeErr == nil { + closeErr = ctx.Err() + } + } + } + return closeErr +} + +// The single usage catalog projects the single authoritative Reasonix stats +// directory. Test/custom writers retain the exact JSONL implementation rather +// than accidentally sharing rollups with the production cache database. +func sameUsageDirectory(left, right string) bool { + leftAbs, leftErr := filepath.Abs(filepath.Clean(left)) + rightAbs, rightErr := filepath.Abs(filepath.Clean(right)) + return leftErr == nil && rightErr == nil && leftAbs == rightAbs +} + +// existingUsageManager returns an already-started projection without creating +// background work. Read-only commands, Query and Flush use this path so merely +// inspecting authoritative JSONL cannot make the process outlive the command. +func existingUsageManager(dir string) *usageManager { + dir = strings.TrimSpace(dir) + if dir == "" { + return nil + } + usageManagers.Lock() + defer usageManagers.Unlock() + return usageManagers.byDir[dir] +} + +// CloseUsageCatalogs closes every process-local usage projection. Desktop +// shutdown and test isolation call this so Windows can delete TempDir cache +// files that would otherwise stay locked by open SQLite handles. +func CloseUsageCatalogs(ctx context.Context) error { + usageManagers.Lock() + managers := make([]*usageManager, 0, len(usageManagers.byDir)) + for dir, manager := range usageManagers.byDir { + managers = append(managers, manager) + delete(usageManagers.byDir, dir) + } + usageManagers.Unlock() + var first error + for _, manager := range managers { + if err := manager.close(ctx); err != nil && first == nil { + first = err + } + } + return first +} + +func usageEntry(day string, r record) usagecatalog.Entry { + turns := 0 + if r.Turn { + turns = 1 + } + return usagecatalog.Entry{Day: day, Source: r.Source, ModelRef: r.ModelRef, Provider: providerOf(r.ModelRef), + Prompt: r.Prompt, Completion: r.Completion, Reasoning: r.Reasoning, CacheHit: r.CacheHit, + CacheMiss: r.CacheMiss, Total: r.Total, Requests: r.Requests, Turns: turns} +} diff --git a/internal/stats/usage_catalog_lifecycle_test.go b/internal/stats/usage_catalog_lifecycle_test.go new file mode 100644 index 0000000000..ebf7c2913f --- /dev/null +++ b/internal/stats/usage_catalog_lifecycle_test.go @@ -0,0 +1,62 @@ +package stats + +import ( + "context" + "path/filepath" + "testing" + "time" + + "reasonix/internal/usagecatalog" +) + +func TestUsageManagerCloseFencesOpenAndAllowsRestart(t *testing.T) { + manager := &usageManager{} + started := make(chan struct{}) + release := make(chan struct{}) + databasePath := filepath.Join(t.TempDir(), "usage.sqlite") + manager.open = func(ctx context.Context, path string) (*usagecatalog.Catalog, error) { + close(started) + <-release + return usagecatalog.Open(ctx, databasePath) + } + dir := t.TempDir() + manager.start(dir) + <-started + + closed := make(chan error, 1) + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + defer cancel() + go func() { closed <- manager.close(ctx) }() + select { + case err := <-closed: + t.Fatalf("close returned before in-flight open exited: %v", err) + default: + } + close(release) + if err := <-closed; err != nil { + t.Fatalf("close after open fence: %v", err) + } + if catalog := manager.catalog.Load(); catalog != nil { + t.Fatal("stale open published a usage catalog after close") + } + + manager.mu.Lock() + manager.open = func(ctx context.Context, path string) (*usagecatalog.Catalog, error) { + return usagecatalog.Open(ctx, databasePath) + } + manager.mu.Unlock() + manager.start(dir) + manager.mu.Lock() + reopened := manager.openDone + manager.mu.Unlock() + if reopened == nil { + t.Fatal("manager did not start a new generation after close") + } + <-reopened + if catalog := manager.catalog.Load(); catalog == nil { + t.Fatal("manager did not publish the restarted usage catalog") + } + if err := manager.close(ctx); err != nil { + t.Fatalf("close restarted usage catalog: %v", err) + } +} diff --git a/internal/taskcatalog/benchmark_test.go b/internal/taskcatalog/benchmark_test.go new file mode 100644 index 0000000000..682ebdd193 --- /dev/null +++ b/internal/taskcatalog/benchmark_test.go @@ -0,0 +1,50 @@ +package taskcatalog + +import ( + "context" + "encoding/json" + "fmt" + "path/filepath" + "testing" + "time" + + "reasonix/internal/taskmonitor" +) + +func BenchmarkWarmFirstPageHundredThousandTasks(b *testing.B) { + catalog, err := Open(context.Background(), filepath.Join(b.TempDir(), "tasks.sqlite")) + if err != nil { + b.Fatal(err) + } + b.Cleanup(func() { _ = catalog.Close(context.Background()) }) + root := b.TempDir() + project := Project{Key: ProjectKey(root), Root: root, Label: "Benchmark"} + if _, err := catalog.db.Exec(`INSERT INTO task_projects(project_key,project_root,project_label,state) VALUES(?,?,?,'ready')`, + project.Key, project.Root, project.Label); err != nil { + b.Fatal(err) + } + tx, err := catalog.db.Begin() + if err != nil { + b.Fatal(err) + } + now := time.Now().UTC() + for i := range 100_000 { + task := taskmonitor.TaskSnapshot{SchemaVersion: 1, TaskID: fmt.Sprintf("task-%06d", i), SessionID: "session", + State: taskmonitor.TaskStateSucceeded, Version: 1, CreatedAt: now, UpdatedAt: now.Add(time.Duration(i) * time.Millisecond)} + raw, _ := json.Marshal(task) + if _, err := tx.Exec(`INSERT INTO task_snapshots(project_key,task_id,session_id,state,version,created_at,updated_at,snapshot_json) + VALUES(?,?,?,?,?,?,?,?)`, project.Key, task.TaskID, task.SessionID, task.State, task.Version, + task.CreatedAt.UnixMilli(), task.UpdatedAt.UnixMilli(), raw); err != nil { + b.Fatal(err) + } + } + if err := tx.Commit(); err != nil { + b.Fatal(err) + } + b.ResetTimer() + for range b.N { + if _, err := catalog.ListPage(context.Background(), PageRequest{ProjectKeys: []string{project.Key}, Limit: 50}); err != nil { + b.Fatal(err) + } + } +} diff --git a/internal/taskcatalog/catalog.go b/internal/taskcatalog/catalog.go new file mode 100644 index 0000000000..c88d4a3521 --- /dev/null +++ b/internal/taskcatalog/catalog.go @@ -0,0 +1,710 @@ +// Package taskcatalog maintains a disposable cross-project projection of the +// authoritative taskmonitor FileStore. +package taskcatalog + +import ( + "context" + "crypto/sha256" + "database/sql" + "encoding/base64" + "encoding/hex" + "encoding/json" + "errors" + "fmt" + "os" + "path/filepath" + "strings" + "sync" + "sync/atomic" + "time" + + "reasonix/internal/config" + "reasonix/internal/projectiondb" + "reasonix/internal/taskmonitor" +) + +const ( + SchemaVersion = 1 + DefaultLimit = 50 + MaxLimit = 200 + missingGrace = 30 * time.Second +) + +type Status struct { + State string `json:"state"` + Mode projectiondb.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"` +} + +type Project struct { + Key string `json:"projectKey"` + Root string `json:"projectRoot"` + Label string `json:"projectLabel"` +} + +type PageRequest struct { + ProjectKeys []string + SessionID string + States []string + Query string + Cursor string + Limit int +} + +type Item struct { + ProjectKey string `json:"projectKey"` + ProjectLabel string `json:"projectLabel"` + Task taskmonitor.TaskSnapshot `json:"task"` +} + +type Page struct { + Items []Item `json:"items"` + NextCursor string `json:"nextCursor"` + Revision uint64 `json:"revision"` + Partial bool `json:"partial"` + StaleCursor bool `json:"staleCursor"` + Status Status `json:"status"` +} + +type EventPage struct { + Items []taskmonitor.TaskEvent `json:"items"` + NextSequence int `json:"nextSequence"` + Partial bool `json:"partial"` +} + +type cursor struct { + Revision uint64 `json:"r"` + Updated int64 `json:"u"` + Project string `json:"p"` + Task string `json:"t"` +} + +type request struct { + projectRoot string + taskID string + events bool + flush chan struct{} +} + +type Catalog struct { + db *sql.DB + store *taskmonitor.FileStore + ctx context.Context + cancel context.CancelFunc + queue chan request + dirtyWake chan struct{} + dirtyProjects sync.Map + wg sync.WaitGroup + closing atomic.Bool + revision atomic.Uint64 + statusMu sync.RWMutex + status Status + projectLocks sync.Map + reconcileMu sync.Mutex + reconciling map[string]bool + registered map[string]bool + reconcileDone bool + closeOnce sync.Once + closeDone chan struct{} + closeErr error +} + +// DefaultPath returns the disposable task projection path under CacheDir. +// Empty when cache is unavailable so Open falls back to an in-memory projection. +func DefaultPath() string { + cache := strings.TrimSpace(config.CacheDir()) + if cache == "" { + return "" + } + return filepath.Join(cache, "task-catalog", "v1.sqlite") +} + +func ProjectKey(root string) string { + root = filepath.Clean(strings.TrimSpace(root)) + if abs, err := filepath.Abs(root); err == nil { + root = abs + } + sum := sha256.Sum256([]byte(root)) + return hex.EncodeToString(sum[:]) +} + +const schema = ` +CREATE TABLE task_state(id INTEGER PRIMARY KEY CHECK(id=1),revision INTEGER NOT NULL DEFAULT 0); +INSERT INTO task_state(id,revision) VALUES(1,0); +CREATE TABLE task_projects(project_key TEXT PRIMARY KEY,project_root TEXT UNIQUE NOT NULL,project_label TEXT NOT NULL DEFAULT '', + signature TEXT NOT NULL DEFAULT '',scan_generation INTEGER NOT NULL DEFAULT 0,scan_cursor TEXT NOT NULL DEFAULT '',state TEXT NOT NULL DEFAULT 'pending', + error TEXT NOT NULL DEFAULT '',indexed INTEGER NOT NULL DEFAULT 0,total INTEGER NOT NULL DEFAULT 0,completed_at INTEGER NOT NULL DEFAULT 0); +CREATE TABLE task_snapshots(project_key TEXT NOT NULL,task_id TEXT NOT NULL,session_id TEXT NOT NULL DEFAULT '',job_id TEXT NOT NULL DEFAULT '', + kind TEXT NOT NULL DEFAULT '',label TEXT NOT NULL DEFAULT '',state TEXT NOT NULL,runtime_state TEXT NOT NULL DEFAULT '',runtime_lease_until INTEGER NOT NULL DEFAULT 0, + version INTEGER NOT NULL,created_at INTEGER NOT NULL,updated_at INTEGER NOT NULL,error_code TEXT NOT NULL DEFAULT '',snapshot_fingerprint TEXT NOT NULL DEFAULT '', + snapshot_json BLOB NOT NULL,health TEXT NOT NULL DEFAULT 'ok',missing_since INTEGER NOT NULL DEFAULT 0,seen_generation INTEGER NOT NULL DEFAULT 0, + PRIMARY KEY(project_key,task_id),FOREIGN KEY(project_key) REFERENCES task_projects(project_key) ON DELETE CASCADE); +CREATE TABLE task_event_sources(project_key TEXT NOT NULL,task_id TEXT NOT NULL,path TEXT NOT NULL,size INTEGER NOT NULL DEFAULT 0,indexed_offset INTEGER NOT NULL DEFAULT 0, + fingerprint TEXT NOT NULL DEFAULT '',state TEXT NOT NULL DEFAULT 'pending',error TEXT NOT NULL DEFAULT '',PRIMARY KEY(project_key,task_id)); +CREATE TABLE task_events(project_key TEXT NOT NULL,task_id TEXT NOT NULL,sequence INTEGER NOT NULL,timestamp INTEGER NOT NULL,event_type TEXT NOT NULL, + state TEXT NOT NULL,runtime_state TEXT NOT NULL DEFAULT '',event_json BLOB NOT NULL,PRIMARY KEY(project_key,task_id,sequence)); +CREATE INDEX idx_task_project_page ON task_snapshots(project_key,updated_at DESC,task_id); +CREATE INDEX idx_task_state_page ON task_snapshots(state,updated_at DESC,project_key,task_id); +CREATE INDEX idx_task_session ON task_snapshots(session_id,updated_at DESC,task_id); +CREATE INDEX idx_task_events_page ON task_events(project_key,task_id,sequence); +` + +func migrations() []projectiondb.Migration { + return []projectiondb.Migration{{Version: 1, Apply: func(ctx context.Context, tx *sql.Tx) error { + _, err := tx.ExecContext(ctx, schema) + return err + }}} +} + +func Open(ctx context.Context, path string) (*Catalog, error) { + if path == "" { + path = DefaultPath() + } + inMemory := strings.TrimSpace(path) == "" + if inMemory { + path = "" + } + handle, err := projectiondb.Open(ctx, projectiondb.OpenOptions{ + Path: path, MemoryName: "task-catalog", Migrations: migrations(), InMemory: inMemory, MaxOpenConns: 4, + }) + if err != nil { + return nil, err + } + workerCtx, cancel := context.WithCancel(context.Background()) + c := &Catalog{db: handle.DB, store: taskmonitor.NewFileStore(filepath.Join(".reasonix", "tasks")), ctx: workerCtx, cancel: cancel, + queue: make(chan request, 1024), dirtyWake: make(chan struct{}, 1), reconciling: map[string]bool{}, registered: map[string]bool{}, closeDone: make(chan struct{}), + status: Status{State: string(handle.Status.State), Mode: handle.Status.Mode, Path: handle.Status.Path, LastError: handle.Status.LastError}} + var revision uint64 + _ = c.db.QueryRowContext(ctx, `SELECT revision FROM task_state WHERE id=1`).Scan(&revision) + c.revision.Store(revision) + c.refresh(ctx) + c.wg.Add(1) + go c.worker() + return c, nil +} + +func (c *Catalog) ObservedStore() *taskmonitor.FileStore { + return taskmonitor.NewObservedFileStore(filepath.Join(".reasonix", "tasks"), c) +} + +func (c *Catalog) SnapshotChanged(projectRoot, taskID string) { + c.enqueue(request{projectRoot: projectRoot, taskID: taskID}) +} +func (c *Catalog) EventsChanged(projectRoot, taskID string) { + c.enqueue(request{projectRoot: projectRoot, taskID: taskID, events: true}) +} + +func (c *Catalog) enqueue(req request) { + if c.closing.Load() { + return + } + select { + case c.queue <- req: + default: + c.dirtyProjects.Store(req.projectRoot, true) + c.wakeDirty() + } +} + +func (c *Catalog) worker() { + defer c.wg.Done() + ticker := time.NewTicker(time.Minute) + defer ticker.Stop() + for { + if root, ok := c.takeDirtyProject(); ok { + if project, exists, err := c.projectByRoot(c.ctx, root); err == nil && exists { + _ = c.ReconcileProject(c.ctx, project) + } else if err == nil { + _, _ = c.RegisterProject(c.ctx, root, filepath.Base(root)) + } + continue + } + select { + case <-c.ctx.Done(): + return + case <-ticker.C: + c.markRegisteredProjectsDirty() + case <-c.dirtyWake: + case req := <-c.queue: + if req.flush != nil { + close(req.flush) + continue + } + if req.events { + _ = c.indexEvents(c.ctx, req.projectRoot, req.taskID) + } else { + _ = c.indexSnapshot(c.ctx, req.projectRoot, req.taskID, 0) + } + } + } +} + +func (c *Catalog) takeDirtyProject() (string, bool) { + var root string + c.dirtyProjects.Range(func(key, _ any) bool { + root, _ = key.(string) + c.dirtyProjects.Delete(key) + return false + }) + return root, root != "" +} + +func (c *Catalog) markRegisteredProjectsDirty() { + rows, err := c.db.QueryContext(c.ctx, `SELECT project_root FROM task_projects`) + if err != nil { + return + } + defer rows.Close() + for rows.Next() { + var root string + if rows.Scan(&root) == nil { + c.dirtyProjects.Store(root, true) + } + } +} + +func (c *Catalog) wakeDirty() { + select { + case c.dirtyWake <- struct{}{}: + default: + } +} + +func (c *Catalog) Flush(ctx context.Context) error { + done := make(chan struct{}) + select { + case c.queue <- request{flush: done}: + case <-ctx.Done(): + return ctx.Err() + } + select { + case <-done: + return nil + case <-ctx.Done(): + return ctx.Err() + } +} + +func (c *Catalog) RegisterProject(ctx context.Context, root, label string) (Project, error) { + project := normalizeProject(Project{Root: root, Label: label}) + _, err := c.db.ExecContext(ctx, `INSERT INTO task_projects(project_key,project_root,project_label,state) VALUES(?,?,?,'pending') + ON CONFLICT(project_key) DO UPDATE SET project_root=excluded.project_root,project_label=excluded.project_label`, project.Key, project.Root, project.Label) + c.reconcileMu.Lock() + firstRegistration := !c.registered[project.Key] + c.registered[project.Key] = true + c.reconcileMu.Unlock() + if err == nil && firstRegistration { + c.scheduleReconcile(project) + } + return project, err +} + +// RequestReconcileProject forces a background authority scan even when the +// project was already registered by an earlier page request. +func (c *Catalog) RequestReconcileProject(ctx context.Context, root, label string) error { + project, err := c.RegisterProject(ctx, root, label) + if err != nil { + return err + } + c.scheduleReconcile(project) + return nil +} + +func (c *Catalog) scheduleReconcile(project Project) { + c.reconcileMu.Lock() + if c.reconcileDone || c.reconciling[project.Key] { + c.reconcileMu.Unlock() + return + } + c.reconciling[project.Key] = true + c.wg.Add(1) + c.reconcileMu.Unlock() + go func() { + defer func() { + c.reconcileMu.Lock() + delete(c.reconciling, project.Key) + c.reconcileMu.Unlock() + c.wg.Done() + }() + _ = c.ReconcileProject(c.ctx, project) + }() +} + +func (c *Catalog) ReconcileProject(ctx context.Context, project Project) error { + project = normalizeProject(project) + unlock := c.lockProject(project.Key) + defer unlock() + + tasks, err := c.store.ListTasks(ctx, project.Root) + if err != nil { + return err + } + var generation int64 + err = c.db.QueryRowContext(ctx, `UPDATE task_projects SET scan_generation=scan_generation+1,state='scanning',total=? WHERE project_key=? RETURNING scan_generation`, len(tasks), project.Key).Scan(&generation) + if err != nil { + return err + } + for _, task := range tasks { + if err := c.upsertSnapshot(ctx, project, task, generation); err != nil { + continue + } + } + now := time.Now().UnixMilli() + _, _ = c.db.ExecContext(ctx, `UPDATE task_snapshots SET missing_since=CASE WHEN missing_since=0 THEN ? ELSE missing_since END,health='missing' + WHERE project_key=? AND seen_generation<>?`, now, project.Key, generation) + cutoff := now - missingGrace.Milliseconds() + _, _ = c.db.ExecContext(ctx, `DELETE FROM task_events WHERE project_key=? AND task_id IN ( + SELECT task_id FROM task_snapshots WHERE project_key=? AND seen_generation<>? AND missing_since>0 AND missing_since<=? + )`, project.Key, project.Key, generation, cutoff) + _, _ = c.db.ExecContext(ctx, `DELETE FROM task_event_sources WHERE project_key=? AND task_id IN ( + SELECT task_id FROM task_snapshots WHERE project_key=? AND seen_generation<>? AND missing_since>0 AND missing_since<=? + )`, project.Key, project.Key, generation, cutoff) + _, _ = c.db.ExecContext(ctx, `DELETE FROM task_snapshots WHERE project_key=? AND seen_generation<>? AND missing_since>0 AND missing_since<=?`, + project.Key, generation, cutoff) + tx, beginErr := c.db.BeginTx(ctx, nil) + if beginErr != nil { + return beginErr + } + if _, err = tx.ExecContext(ctx, `UPDATE task_projects SET state='ready',indexed=?,completed_at=? WHERE project_key=?`, len(tasks), now, project.Key); err != nil { + _ = tx.Rollback() + return err + } + revision, err := bump(ctx, tx) + if err != nil { + _ = tx.Rollback() + return err + } + if err = tx.Commit(); err != nil { + return err + } + c.revision.Store(revision) + c.refresh(context.Background()) + return nil +} + +func (c *Catalog) indexSnapshot(ctx context.Context, root, taskID string, generation int64) error { + project, ok, err := c.projectByRoot(ctx, root) + if err != nil { + return err + } + if !ok { + project, err = c.RegisterProject(ctx, root, filepath.Base(root)) + if err != nil { + return err + } + } + unlock := c.lockProject(project.Key) + defer unlock() + + task, err := c.store.GetTask(ctx, project.Root, taskID) + if err != nil || task == nil { + return err + } + return c.upsertSnapshot(ctx, project, *task, generation) +} + +func (c *Catalog) upsertSnapshot(ctx context.Context, project Project, task taskmonitor.TaskSnapshot, generation int64) error { + b, err := json.Marshal(task) + if err != nil { + return err + } + hash := sha256.Sum256(b) + lease := int64(0) + if !task.RuntimeLeaseUntil.IsZero() { + lease = task.RuntimeLeaseUntil.UnixMilli() + } + tx, err := c.db.BeginTx(ctx, nil) + if err != nil { + return err + } + _, err = tx.ExecContext(ctx, `INSERT INTO task_snapshots(project_key,task_id,session_id,job_id,state,runtime_state,runtime_lease_until,version, + created_at,updated_at,error_code,snapshot_fingerprint,snapshot_json,health,missing_since,seen_generation) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,'ok',0,?) + ON CONFLICT(project_key,task_id) DO UPDATE SET session_id=excluded.session_id,job_id=excluded.job_id,state=excluded.state, + runtime_state=excluded.runtime_state,runtime_lease_until=excluded.runtime_lease_until,version=excluded.version,created_at=excluded.created_at, + updated_at=excluded.updated_at,error_code=excluded.error_code,snapshot_fingerprint=excluded.snapshot_fingerprint,snapshot_json=excluded.snapshot_json, + health='ok',missing_since=0,seen_generation=excluded.seen_generation`, project.Key, task.TaskID, task.SessionID, task.JobID, task.State, + task.RuntimeState, lease, task.Version, task.CreatedAt.UnixMilli(), task.UpdatedAt.UnixMilli(), task.ErrorCode, hex.EncodeToString(hash[:]), b, generation) + if err != nil { + _ = tx.Rollback() + return err + } + revision, err := bump(ctx, tx) + if err != nil { + _ = tx.Rollback() + return err + } + if err := tx.Commit(); err != nil { + return err + } + c.revision.Store(revision) + c.refresh(context.Background()) + return nil +} + +func (c *Catalog) indexEvents(ctx context.Context, root, taskID string) error { + if taskID == "" || filepath.Base(taskID) != taskID || strings.ContainsAny(taskID, `/\\`) { + return errors.New("invalid task id") + } + project, ok, err := c.projectByRoot(ctx, root) + if err != nil || !ok { + return err + } + unlock := c.lockProject(project.Key) + defer unlock() + + path := filepath.Join(project.Root, ".reasonix", "tasks", taskID, "events.jsonl") + info, statErr := os.Stat(path) + if errors.Is(statErr, os.ErrNotExist) { + return nil + } + if statErr != nil { + return statErr + } + fingerprint := fmt.Sprintf("%d:%d", info.Size(), info.ModTime().UnixNano()) + var oldPath, oldFingerprint string + var oldSize, offset int64 + err = c.db.QueryRowContext(ctx, `SELECT path,size,indexed_offset,fingerprint FROM task_event_sources WHERE project_key=? AND task_id=?`, + project.Key, taskID).Scan(&oldPath, &oldSize, &offset, &oldFingerprint) + reset := errors.Is(err, sql.ErrNoRows) || oldPath != path || info.Size() < oldSize || info.Size() == oldSize && fingerprint != oldFingerprint + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return err + } + if !reset && info.Size() == oldSize && fingerprint == oldFingerprint { + return nil + } + if reset { + offset = 0 + } + tail, err := c.store.ReadEventTail(ctx, project.Root, taskID, offset) + if err != nil { + return err + } + reset = reset || tail.Reset + tx, err := c.db.BeginTx(ctx, nil) + if err != nil { + return err + } + if reset { + if _, err := tx.ExecContext(ctx, `DELETE FROM task_events WHERE project_key=? AND task_id=?`, project.Key, taskID); err != nil { + _ = tx.Rollback() + return err + } + } + for _, event := range tail.Items { + b, _ := json.Marshal(event) + if _, err := tx.ExecContext(ctx, `INSERT OR REPLACE INTO task_events(project_key,task_id,sequence,timestamp,event_type,state,runtime_state,event_json) + VALUES(?,?,?,?,?,?,?,?)`, project.Key, taskID, event.Sequence, event.Timestamp.UnixMilli(), event.EventType, event.State, event.RuntimeState, b); err != nil { + _ = tx.Rollback() + return err + } + } + _, err = tx.ExecContext(ctx, `INSERT INTO task_event_sources(project_key,task_id,path,size,indexed_offset,fingerprint,state,error) + VALUES(?,?,?,?,?,?,'ready','') ON CONFLICT(project_key,task_id) DO UPDATE SET path=excluded.path,size=excluded.size, + indexed_offset=excluded.indexed_offset,fingerprint=excluded.fingerprint,state='ready',error=''`, project.Key, taskID, path, + info.Size(), tail.NextOffset, fingerprint) + if err != nil { + _ = tx.Rollback() + return err + } + return tx.Commit() +} + +func (c *Catalog) ListPage(ctx context.Context, req PageRequest) (Page, error) { + status := c.Status() + out := Page{Items: []Item{}, Revision: c.revision.Load(), Partial: status.Pending > 0, Status: status} + limit := req.Limit + if limit <= 0 { + limit = DefaultLimit + } + if limit > MaxLimit { + limit = MaxLimit + } + cur, err := decodeCursor(req.Cursor) + if err != nil { + return out, err + } + if cur != nil && cur.Revision != out.Revision { + out.StaleCursor = true + return out, nil + } + where := []string{`s.health='ok'`, `s.missing_since=0`} + args := []any{} + if len(req.ProjectKeys) > 0 { + parts := make([]string, len(req.ProjectKeys)) + for i, key := range req.ProjectKeys { + parts[i] = "?" + args = append(args, key) + } + where = append(where, `s.project_key IN (`+strings.Join(parts, ",")+`)`) + } + if req.SessionID != "" { + where = append(where, `s.session_id=?`) + args = append(args, req.SessionID) + } + if len(req.States) > 0 { + parts := make([]string, len(req.States)) + for i, state := range req.States { + parts[i] = "?" + args = append(args, state) + } + where = append(where, `s.state IN (`+strings.Join(parts, ",")+`)`) + } + if query := strings.ToLower(strings.TrimSpace(req.Query)); query != "" { + where = append(where, `(lower(s.task_id) LIKE ? OR lower(s.session_id) LIKE ? OR lower(s.error_code) LIKE ?)`) + like := "%" + query + "%" + args = append(args, like, like, like) + } + if cur != nil { + where = append(where, `(s.updated_at?) OR (s.updated_at=? AND s.project_key=? AND s.task_id>?))`) + args = append(args, cur.Updated, cur.Updated, cur.Project, cur.Updated, cur.Project, cur.Task) + } + args = append(args, limit+1) + rows, err := c.db.QueryContext(ctx, `SELECT s.project_key,p.project_label,s.snapshot_json FROM task_snapshots s JOIN task_projects p ON p.project_key=s.project_key + WHERE `+strings.Join(where, ` AND `)+` ORDER BY s.updated_at DESC,s.project_key,s.task_id LIMIT ?`, args...) + if err != nil { + return out, err + } + defer rows.Close() + for rows.Next() { + var item Item + var raw []byte + if err := rows.Scan(&item.ProjectKey, &item.ProjectLabel, &raw); err != nil { + return out, err + } + if json.Unmarshal(raw, &item.Task) != nil { + continue + } + item.Task.ReconcileRuntime(time.Now()) + out.Items = append(out.Items, item) + } + if len(out.Items) > limit { + out.Items = out.Items[:limit] + last := out.Items[len(out.Items)-1] + out.NextCursor = encodeCursor(cursor{Revision: out.Revision, Updated: last.Task.UpdatedAt.UnixMilli(), Project: last.ProjectKey, Task: last.Task.TaskID}) + } + return out, rows.Err() +} + +func (c *Catalog) ListEventPage(ctx context.Context, projectKey, taskID string, after, limit int) (EventPage, error) { + out := EventPage{Items: []taskmonitor.TaskEvent{}, NextSequence: after} + project, ok, err := c.Project(ctx, projectKey) + if err != nil || !ok { + return out, err + } + if err := c.indexEvents(ctx, project.Root, taskID); err != nil { + out.Partial = true + return out, nil + } + if limit <= 0 { + limit = DefaultLimit + } + if limit > MaxLimit { + limit = MaxLimit + } + rows, err := c.db.QueryContext(ctx, `SELECT event_json FROM task_events WHERE project_key=? AND task_id=? AND sequence>? ORDER BY sequence LIMIT ?`, projectKey, taskID, after, limit) + if err != nil { + return out, err + } + defer rows.Close() + for rows.Next() { + var raw []byte + var event taskmonitor.TaskEvent + if err := rows.Scan(&raw); err != nil { + return out, err + } + if json.Unmarshal(raw, &event) == nil { + out.Items = append(out.Items, event) + out.NextSequence = event.Sequence + } + } + return out, rows.Err() +} + +func (c *Catalog) Project(ctx context.Context, key string) (Project, bool, error) { + var project Project + err := c.db.QueryRowContext(ctx, `SELECT project_key,project_root,project_label FROM task_projects WHERE project_key=?`, key).Scan(&project.Key, &project.Root, &project.Label) + if errors.Is(err, sql.ErrNoRows) { + return project, false, nil + } + return project, err == nil, err +} + +func (c *Catalog) projectByRoot(ctx context.Context, root string) (Project, bool, error) { + return c.Project(ctx, ProjectKey(root)) +} + +func bump(ctx context.Context, tx *sql.Tx) (uint64, error) { + if _, err := tx.ExecContext(ctx, `UPDATE task_state SET revision=revision+1 WHERE id=1`); err != nil { + return 0, err + } + var revision uint64 + err := tx.QueryRowContext(ctx, `SELECT revision FROM task_state WHERE id=1`).Scan(&revision) + return revision, err +} + +func encodeCursor(value cursor) string { + b, _ := json.Marshal(value) + return base64.RawURLEncoding.EncodeToString(b) +} + +func decodeCursor(value string) (*cursor, error) { + if strings.TrimSpace(value) == "" { + return nil, nil + } + b, err := base64.RawURLEncoding.DecodeString(value) + if err != nil { + return nil, fmt.Errorf("invalid task cursor: %w", err) + } + var out cursor + if json.Unmarshal(b, &out) != nil || out.Task == "" { + return nil, errors.New("invalid task cursor") + } + return &out, nil +} + +func (c *Catalog) refresh(ctx context.Context) { + var indexed, total, pending, failed int64 + _ = c.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM task_snapshots WHERE health='ok'`).Scan(&indexed) + _ = c.db.QueryRowContext(ctx, `SELECT COALESCE(SUM(total),0) FROM task_projects`).Scan(&total) + _ = c.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM task_projects WHERE state<>'ready'`).Scan(&pending) + _ = c.db.QueryRowContext(ctx, `SELECT COUNT(*) FROM task_snapshots WHERE health='corrupt'`).Scan(&failed) + c.statusMu.Lock() + c.status.Revision, c.status.Indexed, c.status.Total, c.status.Pending, c.status.Failed = c.revision.Load(), indexed, total, pending, failed + c.statusMu.Unlock() +} + +func (c *Catalog) Status() Status { + c.statusMu.RLock() + defer c.statusMu.RUnlock() + return c.status +} + +func (c *Catalog) Close(ctx context.Context) error { + if c == nil { + return nil + } + c.closeOnce.Do(func() { + c.closing.Store(true) + c.cancel() + c.reconcileMu.Lock() + c.reconcileDone = true + c.reconcileMu.Unlock() + go func() { + c.wg.Wait() + c.closeErr = c.db.Close() + close(c.closeDone) + }() + }) + select { + case <-c.closeDone: + return c.closeErr + case <-ctx.Done(): + return ctx.Err() + } +} diff --git a/internal/taskcatalog/catalog_test.go b/internal/taskcatalog/catalog_test.go new file mode 100644 index 0000000000..111595c29d --- /dev/null +++ b/internal/taskcatalog/catalog_test.go @@ -0,0 +1,97 @@ +package taskcatalog + +import ( + "context" + "path/filepath" + "testing" + "time" + + "reasonix/internal/taskmonitor" +) + +func snapshot(id, session string, version uint64, updated time.Time) taskmonitor.TaskSnapshot { + return taskmonitor.TaskSnapshot{SchemaVersion: 1, TaskID: id, SessionID: session, State: taskmonitor.TaskStateRunning, + RuntimeState: taskmonitor.RuntimeStateAlive, RuntimeLeaseUntil: updated.Add(time.Hour), Version: version, + CreatedAt: updated.Add(-time.Minute), UpdatedAt: updated} +} + +func TestObservedStoreIndexesSnapshotsAndEvents(t *testing.T) { + t.Parallel() + ctx := context.Background() + projectRoot := t.TempDir() + catalog, err := Open(ctx, filepath.Join(t.TempDir(), "tasks.sqlite")) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + project, err := catalog.RegisterProject(ctx, projectRoot, "Demo") + if err != nil { + t.Fatal(err) + } + store := catalog.ObservedStore() + now := time.Now() + if err := store.SaveTask(ctx, projectRoot, snapshot("task-1", "session-1", 1, now)); err != nil { + t.Fatal(err) + } + if err := store.AppendAuditEvent(ctx, projectRoot, taskmonitor.TaskEvent{Timestamp: now, EventType: "state_change", TaskID: "task-1", SessionID: "session-1", State: taskmonitor.TaskStateRunning}); err != nil { + t.Fatal(err) + } + flushCtx, cancel := context.WithTimeout(ctx, 2*time.Second) + defer cancel() + if err := catalog.Flush(flushCtx); err != nil { + t.Fatal(err) + } + page, err := catalog.ListPage(ctx, PageRequest{ProjectKeys: []string{project.Key}, SessionID: "session-1", Limit: 50}) + if err != nil || len(page.Items) != 1 || page.Items[0].Task.TaskID != "task-1" { + t.Fatalf("page=%#v err=%v", page, err) + } + events, err := catalog.ListEventPage(ctx, project.Key, "task-1", 0, 50) + if err != nil || len(events.Items) != 1 || events.NextSequence != 1 { + t.Fatalf("events=%#v err=%v", events, err) + } + if err := store.AppendAuditEvent(ctx, projectRoot, taskmonitor.TaskEvent{Timestamp: now.Add(time.Second), EventType: "state_change", + TaskID: "task-1", SessionID: "session-1", State: taskmonitor.TaskStateSucceeded}); err != nil { + t.Fatal(err) + } + if err := catalog.Flush(flushCtx); err != nil { + t.Fatal(err) + } + events, err = catalog.ListEventPage(ctx, project.Key, "task-1", 1, 50) + if err != nil || len(events.Items) != 1 || events.Items[0].Sequence != 2 { + t.Fatalf("incremental events=%#v err=%v", events, err) + } +} + +func TestPageCursorIsRevisionBound(t *testing.T) { + t.Parallel() + ctx := context.Background() + root := t.TempDir() + catalog, err := Open(ctx, filepath.Join(t.TempDir(), "tasks.sqlite")) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + project, _ := catalog.RegisterProject(ctx, root, "Demo") + store := catalog.ObservedStore() + now := time.Now() + for i, id := range []string{"a", "b", "c"} { + if err := store.SaveTask(ctx, root, snapshot(id, "session", 1, now.Add(time.Duration(i)*time.Minute))); err != nil { + t.Fatal(err) + } + } + flushCtx, cancel := context.WithTimeout(ctx, 2*time.Second) + defer cancel() + _ = catalog.Flush(flushCtx) + first, err := catalog.ListPage(ctx, PageRequest{ProjectKeys: []string{project.Key}, Limit: 2}) + if err != nil || len(first.Items) != 2 || first.NextCursor == "" { + t.Fatalf("first=%#v err=%v", first, err) + } + if err := store.SaveTask(ctx, root, snapshot("d", "session", 1, now.Add(4*time.Minute))); err != nil { + t.Fatal(err) + } + _ = catalog.Flush(flushCtx) + stale, err := catalog.ListPage(ctx, PageRequest{ProjectKeys: []string{project.Key}, Cursor: first.NextCursor}) + if err != nil || !stale.StaleCursor || len(stale.Items) != 0 { + t.Fatalf("stale=%#v err=%v", stale, err) + } +} diff --git a/internal/taskcatalog/close_lifecycle_test.go b/internal/taskcatalog/close_lifecycle_test.go new file mode 100644 index 0000000000..fe6f31e99e --- /dev/null +++ b/internal/taskcatalog/close_lifecycle_test.go @@ -0,0 +1,29 @@ +package taskcatalog + +import ( + "context" + "errors" + "path/filepath" + "testing" + "time" +) + +func TestCloseCanBeAwaitedAfterCanceledCaller(t *testing.T) { + catalog, err := Open(context.Background(), filepath.Join(t.TempDir(), "tasks.sqlite")) + if err != nil { + t.Fatalf("open: %v", err) + } + canceled, cancel := context.WithCancel(context.Background()) + cancel() + if err := catalog.Close(canceled); err != nil && !errors.Is(err, context.Canceled) { + t.Fatalf("first close: %v", err) + } + ctx, stop := context.WithTimeout(context.Background(), 5*time.Second) + defer stop() + if err := catalog.Close(ctx); err != nil { + t.Fatalf("await eventual close: %v", err) + } + if err := catalog.db.Ping(); err == nil { + t.Fatal("database remained open after close completion") + } +} diff --git a/internal/taskcatalog/project_lock.go b/internal/taskcatalog/project_lock.go new file mode 100644 index 0000000000..e2f8678570 --- /dev/null +++ b/internal/taskcatalog/project_lock.go @@ -0,0 +1,10 @@ +package taskcatalog + +import "sync" + +func (c *Catalog) lockProject(projectKey string) func() { + value, _ := c.projectLocks.LoadOrStore(projectKey, &sync.Mutex{}) + mu := value.(*sync.Mutex) + mu.Lock() + return mu.Unlock +} diff --git a/internal/taskcatalog/rebuild.go b/internal/taskcatalog/rebuild.go new file mode 100644 index 0000000000..eda1e007c8 --- /dev/null +++ b/internal/taskcatalog/rebuild.go @@ -0,0 +1,86 @@ +package taskcatalog + +import ( + "context" + "database/sql" + "path/filepath" + "strings" + "time" + + "reasonix/internal/projectiondb" + "reasonix/internal/taskmonitor" +) + +// Rebuild replaces only the disposable task projection after replaying the +// authoritative snapshots for the supplied projects into a validated sibling +// database. Event logs remain lazily indexed when a task is expanded. +func Rebuild(ctx context.Context, path string, projects []Project) (Status, error) { + if path == "" { + path = DefaultPath() + } + if strings.TrimSpace(path) == "" { + catalog, err := Open(ctx, "") + if err != nil { + return Status{}, err + } + catalog.reconcileMu.Lock() + catalog.reconcileDone = true + catalog.reconcileMu.Unlock() + if err := reconcileProjects(ctx, catalog, projects); err != nil { + closeRebuildCatalog(catalog) + return catalog.Status(), err + } + status := catalog.Status() + closeRebuildCatalog(catalog) + return status, nil + } + err := projectiondb.Rebuild(ctx, projectiondb.OpenOptions{ + Path: path, MemoryName: "task-catalog-rebuild", Migrations: migrations(), + }, func(ctx context.Context, db *sql.DB) error { + catalog := &Catalog{ + db: db, store: taskmonitor.NewFileStore(filepath.Join(".reasonix", "tasks")), + status: Status{State: "ready", Mode: projectiondb.ModeDisk, Path: path}, + reconciling: map[string]bool{}, registered: map[string]bool{}, reconcileDone: true, + } + return reconcileProjects(ctx, catalog, projects) + }) + if err != nil { + return Status{}, err + } + published, err := Open(ctx, path) + if err != nil { + return Status{}, err + } + status := published.Status() + closeRebuildCatalog(published) + return status, nil +} + +func reconcileProjects(ctx context.Context, catalog *Catalog, projects []Project) error { + for _, input := range projects { + project, err := catalog.RegisterProject(ctx, input.Root, input.Label) + if err != nil { + return err + } + if err := catalog.ReconcileProject(ctx, project); err != nil { + return err + } + } + return nil +} + +func normalizeProject(project Project) Project { + project.Root = filepath.Clean(strings.TrimSpace(project.Root)) + if abs, err := filepath.Abs(project.Root); err == nil { + project.Root = abs + } + project.Key = ProjectKey(project.Root) + project.Label = strings.TrimSpace(project.Label) + return project +} + +func closeRebuildCatalog(catalog *Catalog) { + closeCtx, cancel := context.WithTimeout(context.Background(), time.Second) + defer cancel() + _ = catalog.Close(closeCtx) +} diff --git a/internal/taskcatalog/rebuild_test.go b/internal/taskcatalog/rebuild_test.go new file mode 100644 index 0000000000..065662a63a --- /dev/null +++ b/internal/taskcatalog/rebuild_test.go @@ -0,0 +1,57 @@ +package taskcatalog + +import ( + "context" + "path/filepath" + "testing" + "time" + + "reasonix/internal/taskmonitor" +) + +func TestRebuildReplacesStaleTaskProjection(t *testing.T) { + t.Parallel() + ctx := context.Background() + databasePath := filepath.Join(t.TempDir(), "tasks.sqlite") + staleRoot := t.TempDir() + currentRoot := t.TempDir() + store := taskmonitor.NewFileStore(filepath.Join(".reasonix", "tasks")) + now := time.Now() + if err := store.SaveTask(ctx, staleRoot, snapshot("stale-task", "stale-session", 1, now)); err != nil { + t.Fatal(err) + } + if err := store.SaveTask(ctx, currentRoot, snapshot("current-task", "current-session", 1, now)); err != nil { + t.Fatal(err) + } + seed, err := Open(ctx, databasePath) + if err != nil { + t.Fatal(err) + } + staleProject, err := seed.RegisterProject(ctx, staleRoot, "Stale") + if err != nil { + t.Fatal(err) + } + if err := seed.ReconcileProject(ctx, staleProject); err != nil { + t.Fatal(err) + } + if err := seed.Close(ctx); err != nil { + t.Fatal(err) + } + currentProject := normalizeProject(Project{Root: currentRoot, Label: "Current"}) + if _, err := Rebuild(ctx, databasePath, []Project{currentProject}); err != nil { + t.Fatal(err) + } + rebuilt, err := Open(ctx, databasePath) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = rebuilt.Close(context.Background()) }) + stalePage, err := rebuilt.ListPage(ctx, PageRequest{ProjectKeys: []string{staleProject.Key}, Limit: 50}) + if err != nil || len(stalePage.Items) != 0 { + t.Fatalf("stale page=%#v err=%v", stalePage, err) + } + currentPage, err := rebuilt.ListPage(ctx, PageRequest{ProjectKeys: []string{currentProject.Key}, Limit: 50}) + if err != nil || len(currentPage.Items) != 1 || currentPage.Items[0].Task.TaskID != "current-task" { + t.Fatalf("current page=%#v err=%v", currentPage, err) + } +} diff --git a/internal/taskcatalog/shared.go b/internal/taskcatalog/shared.go new file mode 100644 index 0000000000..7c10195d85 --- /dev/null +++ b/internal/taskcatalog/shared.go @@ -0,0 +1,236 @@ +package taskcatalog + +import ( + "context" + "path/filepath" + "sync" + + "reasonix/internal/taskmonitor" +) + +type sharedManager struct { + lifecycleMu sync.Mutex + mu sync.RWMutex + catalog *Catalog + pending map[string]string + closing bool + rebuilding bool + generation uint64 + opening bool + openDone chan struct{} + openCancel context.CancelFunc + open func(context.Context, string) (*Catalog, error) + rebuild func(context.Context, string, []Project) (Status, error) +} + +var shared sharedManager + +func ensureShared() { + shared.start() +} + +func (m *sharedManager) start() { + m.mu.Lock() + if m.catalog != nil || m.opening || m.closing || m.rebuilding { + m.mu.Unlock() + return + } + m.generation++ + generation := m.generation + ctx, cancel := context.WithCancel(context.Background()) + done := make(chan struct{}) + m.opening, m.openDone, m.openCancel = true, done, cancel + openCatalog := m.open + if openCatalog == nil { + openCatalog = Open + } + m.mu.Unlock() + go m.openGeneration(ctx, generation, done, openCatalog) +} + +func (m *sharedManager) openGeneration(ctx context.Context, generation uint64, done chan struct{}, openCatalog func(context.Context, string) (*Catalog, error)) { + catalog, err := openCatalog(ctx, "") + seen := map[string]bool{} + for err == nil { + m.mu.Lock() + if m.closing || m.rebuilding || generation != m.generation || ctx.Err() != nil { + m.mu.Unlock() + _ = catalog.Close(context.Background()) + catalog = nil + break + } + pending := map[string]string{} + for root, label := range m.pending { + if !seen[root] { + seen[root] = true + pending[root] = label + } + } + if len(pending) == 0 { + m.catalog = catalog + m.pending = nil + m.mu.Unlock() + break + } + m.mu.Unlock() + for root, label := range pending { + _, _ = catalog.RegisterProject(ctx, root, label) + } + } + m.mu.Lock() + if m.openDone == done { + m.opening = false + m.openDone = nil + m.openCancel = nil + } + close(done) + m.mu.Unlock() +} + +func Shared() *Catalog { + ensureShared() + shared.mu.RLock() + defer shared.mu.RUnlock() + return shared.catalog +} + +// ShutdownShared drains accepted notifications and cancels every shared task +// projection worker. It is only used during process shutdown; authoritative +// task snapshots and event logs have already committed before notifications. +func ShutdownShared(ctx context.Context) error { + return shared.close(ctx) +} + +func (m *sharedManager) close(ctx context.Context) error { + m.lifecycleMu.Lock() + defer m.lifecycleMu.Unlock() + return m.closeLocked(ctx, false) +} + +func (m *sharedManager) closeLocked(ctx context.Context, rebuild bool) error { + m.mu.Lock() + m.closing = true + m.rebuilding = rebuild + m.generation++ + if m.openCancel != nil { + m.openCancel() + } + done := m.openDone + catalog := m.catalog + m.catalog = nil + if !rebuild { + m.pending = nil + } + m.mu.Unlock() + var flushErr, closeErr error + if catalog != nil { + flushErr = catalog.Flush(ctx) + closeErr = catalog.Close(ctx) + } + if done != nil { + select { + case <-done: + case <-ctx.Done(): + if closeErr == nil { + closeErr = ctx.Err() + } + } + } + m.mu.Lock() + m.closing = false + m.rebuilding = rebuild + m.mu.Unlock() + if flushErr != nil { + return flushErr + } + return closeErr +} + +func RegisterSharedProject(root, label string) string { + return shared.registerProject(root, label) +} + +func (m *sharedManager) registerProject(root, label string) string { + m.start() + key := ProjectKey(root) + m.mu.Lock() + if m.rebuilding { + if m.pending == nil { + m.pending = map[string]string{} + } + m.pending[root] = label + m.mu.Unlock() + return key + } + if m.closing { + m.mu.Unlock() + return key + } + if m.catalog == nil { + if m.pending == nil { + m.pending = map[string]string{} + } + m.pending[root] = label + m.mu.Unlock() + return key + } + catalog := m.catalog + m.mu.Unlock() + _, _ = catalog.RegisterProject(context.Background(), root, label) + return key +} + +type sharedSink struct{} + +func (sharedSink) SnapshotChanged(projectRoot, taskID string) { + catalog := sharedCatalogForNotification(projectRoot) + if catalog != nil { + catalog.SnapshotChanged(projectRoot, taskID) + } +} + +func (sharedSink) EventsChanged(projectRoot, taskID string) { + catalog := sharedCatalogForNotification(projectRoot) + if catalog != nil { + catalog.EventsChanged(projectRoot, taskID) + } +} + +// sharedCatalogForNotification is deliberately SQLite-free. ProjectionSink is +// called after the authoritative task file lock is released, but task saves +// still must never wait for catalog I/O. A notification received while the +// catalog is opening is recovered by the pending project's initial reconcile. +func sharedCatalogForNotification(projectRoot string) *Catalog { + return shared.catalogForNotification(projectRoot) +} + +func (m *sharedManager) catalogForNotification(projectRoot string) *Catalog { + m.start() + m.mu.Lock() + defer m.mu.Unlock() + if m.rebuilding { + if m.pending == nil { + m.pending = map[string]string{} + } + m.pending[projectRoot] = filepath.Base(projectRoot) + return nil + } + if m.closing { + return nil + } + if m.catalog == nil { + if m.pending == nil { + m.pending = map[string]string{} + } + m.pending[projectRoot] = filepath.Base(projectRoot) + return nil + } + return m.catalog +} + +// ObservedStore remains an authoritative FileStore; only its post-commit sink +// is shared with the disposable catalog. +func ObservedStore() taskmonitor.WriteStore { + ensureShared() + return taskmonitor.NewObservedFileStore(filepath.Join(".reasonix", "tasks"), sharedSink{}) +} diff --git a/internal/taskcatalog/shared_lifecycle_test.go b/internal/taskcatalog/shared_lifecycle_test.go new file mode 100644 index 0000000000..174db637cf --- /dev/null +++ b/internal/taskcatalog/shared_lifecycle_test.go @@ -0,0 +1,65 @@ +package taskcatalog + +import ( + "context" + "path/filepath" + "testing" + "time" +) + +func TestSharedManagerCloseFencesOpenAndAllowsRestart(t *testing.T) { + manager := &sharedManager{} + started := make(chan struct{}) + release := make(chan struct{}) + databasePath := filepath.Join(t.TempDir(), "tasks.sqlite") + manager.open = func(ctx context.Context, path string) (*Catalog, error) { + close(started) + <-release + return Open(ctx, databasePath) + } + manager.start() + <-started + + closed := make(chan error, 1) + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + defer cancel() + go func() { closed <- manager.close(ctx) }() + select { + case err := <-closed: + t.Fatalf("close returned before in-flight open exited: %v", err) + default: + } + close(release) + if err := <-closed; err != nil { + t.Fatalf("close after open fence: %v", err) + } + manager.mu.RLock() + stale := manager.catalog + manager.mu.RUnlock() + if stale != nil { + t.Fatal("stale open published a task catalog after close") + } + + manager.mu.Lock() + manager.open = func(ctx context.Context, path string) (*Catalog, error) { + return Open(ctx, databasePath) + } + manager.mu.Unlock() + manager.start() + manager.mu.RLock() + reopened := manager.openDone + manager.mu.RUnlock() + if reopened == nil { + t.Fatal("manager did not start a new generation after close") + } + <-reopened + manager.mu.RLock() + restarted := manager.catalog + manager.mu.RUnlock() + if restarted == nil { + t.Fatal("manager did not publish the restarted task catalog") + } + if err := manager.close(ctx); err != nil { + t.Fatalf("close restarted task catalog: %v", err) + } +} diff --git a/internal/taskcatalog/shared_rebuild.go b/internal/taskcatalog/shared_rebuild.go new file mode 100644 index 0000000000..e5fcc48758 --- /dev/null +++ b/internal/taskcatalog/shared_rebuild.go @@ -0,0 +1,52 @@ +package taskcatalog + +import "context" + +// RebuildSharedCatalog fences the process-local reader, atomically replaces +// the disposable database, and reopens it with every project registered during +// or before the rebuild. +func RebuildSharedCatalog(ctx context.Context, projects []Project) error { + return shared.rebuildShared(ctx, projects) +} + +func (m *sharedManager) rebuildShared(ctx context.Context, projects []Project) error { + m.lifecycleMu.Lock() + defer m.lifecycleMu.Unlock() + if err := m.closeLocked(ctx, true); err != nil { + m.mu.Lock() + m.rebuilding = false + if m.pending == nil { + m.pending = map[string]string{} + } + for _, project := range projects { + project = normalizeProject(project) + m.pending[project.Root] = project.Label + } + m.mu.Unlock() + if ctx.Err() == nil { + m.start() + } + return err + } + m.mu.Lock() + if m.pending == nil { + m.pending = map[string]string{} + } + for _, project := range projects { + project = normalizeProject(project) + m.pending[project.Root] = project.Label + } + rebuild := m.rebuild + if rebuild == nil { + rebuild = Rebuild + } + m.mu.Unlock() + _, rebuildErr := rebuild(ctx, "", projects) + m.mu.Lock() + m.rebuilding = false + m.mu.Unlock() + if ctx.Err() == nil { + m.start() + } + return rebuildErr +} diff --git a/internal/taskcatalog/shared_rebuild_test.go b/internal/taskcatalog/shared_rebuild_test.go new file mode 100644 index 0000000000..29218dc3af --- /dev/null +++ b/internal/taskcatalog/shared_rebuild_test.go @@ -0,0 +1,74 @@ +package taskcatalog + +import ( + "context" + "path/filepath" + "testing" + "time" +) + +func TestSharedManagerRebuildRestartsWithRegisteredProjects(t *testing.T) { + manager := &sharedManager{} + databasePath := filepath.Join(t.TempDir(), "tasks.sqlite") + manager.open = func(ctx context.Context, _ string) (*Catalog, error) { + return Open(ctx, databasePath) + } + rebuildCalls := 0 + manager.rebuild = func(context.Context, string, []Project) (Status, error) { + rebuildCalls++ + return Status{}, nil + } + manager.start() + waitSharedManagerOpen(t, manager) + project := Project{Root: t.TempDir(), Label: "Current"} + if err := manager.rebuildShared(context.Background(), []Project{project}); err != nil { + t.Fatal(err) + } + waitSharedManagerOpen(t, manager) + if rebuildCalls != 1 { + t.Fatalf("rebuild calls = %d, want 1", rebuildCalls) + } + manager.mu.RLock() + restarted := manager.catalog + manager.mu.RUnlock() + if restarted == nil { + t.Fatal("manager did not publish a fresh catalog after rebuild") + } + normalized := normalizeProject(project) + if _, ok, err := restarted.Project(context.Background(), normalized.Key); err != nil || !ok { + t.Fatalf("registered project missing after rebuild: ok=%v err=%v", ok, err) + } + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + defer cancel() + if err := manager.close(ctx); err != nil { + t.Fatal(err) + } +} + +func TestSharedManagerRetainsRegistrationsWhileClosingForRebuild(t *testing.T) { + manager := &sharedManager{closing: true, rebuilding: true} + registeredRoot := t.TempDir() + notifiedRoot := t.TempDir() + manager.registerProject(registeredRoot, "Registered") + if catalog := manager.catalogForNotification(notifiedRoot); catalog != nil { + t.Fatal("notification unexpectedly reached a catalog during rebuild") + } + manager.mu.RLock() + defer manager.mu.RUnlock() + if manager.pending[registeredRoot] != "Registered" { + t.Fatalf("registered project was not retained: %#v", manager.pending) + } + if manager.pending[notifiedRoot] != filepath.Base(notifiedRoot) { + t.Fatalf("notified project was not retained: %#v", manager.pending) + } +} + +func waitSharedManagerOpen(t *testing.T, manager *sharedManager) { + t.Helper() + manager.mu.RLock() + done := manager.openDone + manager.mu.RUnlock() + if done != nil { + <-done + } +} diff --git a/internal/taskmonitor/event_tail.go b/internal/taskmonitor/event_tail.go new file mode 100644 index 0000000000..7f9cc9a3bf --- /dev/null +++ b/internal/taskmonitor/event_tail.go @@ -0,0 +1,75 @@ +package taskmonitor + +import ( + "bufio" + "context" + "encoding/json" + "errors" + "io" + "os" + "path/filepath" +) + +type EventTail struct { + Items []TaskEvent + NextOffset int64 + Reset bool +} + +// ReadEventTail reads only complete JSONL lines after a catalog byte +// checkpoint. It preserves FileStore's identifier and symlink defenses. +func (s *FileStore) ReadEventTail(ctx context.Context, projectDir, taskID string, offset int64) (EventTail, error) { + out := EventTail{Items: []TaskEvent{}, NextOffset: offset} + if err := ctx.Err(); err != nil { + return out, err + } + id, err := safeID(taskID) + if err != nil { + return out, err + } + root, err := s.taskRoot(projectDir) + if err != nil { + return out, err + } + path := filepath.Join(root, id, "events.jsonl") + if err := rejectSymlinkChain(root, path); err != nil { + return out, err + } + f, err := os.Open(path) + if os.IsNotExist(err) { + return out, nil + } + if err != nil { + return out, err + } + defer f.Close() + info, err := f.Stat() + if err != nil { + return out, err + } + if offset < 0 || offset > info.Size() { + offset, out.NextOffset, out.Reset = 0, 0, true + } + if _, err := f.Seek(offset, io.SeekStart); err != nil { + return out, err + } + reader := bufio.NewReader(f) + for { + line, readErr := reader.ReadBytes('\n') + if len(line) > 0 && line[len(line)-1] == '\n' { + out.NextOffset += int64(len(line)) + line = line[:len(line)-1] + var event TaskEvent + if json.Unmarshal(line, &event) == nil { + out.Items = append(out.Items, event) + } + } + if errors.Is(readErr, io.EOF) { + break + } + if readErr != nil { + return out, readErr + } + } + return out, nil +} diff --git a/internal/taskmonitor/event_tail_test.go b/internal/taskmonitor/event_tail_test.go new file mode 100644 index 0000000000..03baaabedf --- /dev/null +++ b/internal/taskmonitor/event_tail_test.go @@ -0,0 +1,49 @@ +package taskmonitor + +import ( + "context" + "encoding/json" + "os" + "path/filepath" + "testing" + "time" +) + +func TestReadEventTailKeepsIncompleteLineForRetry(t *testing.T) { + t.Parallel() + root := t.TempDir() + store := NewFileStore(filepath.Join(".reasonix", "tasks")) + now := time.Now() + first := TaskEvent{Timestamp: now, EventType: "state_change", TaskID: "task", State: TaskStateRunning} + if err := store.AppendAuditEvent(context.Background(), root, first); err != nil { + t.Fatal(err) + } + tail, err := store.ReadEventTail(context.Background(), root, "task", 0) + if err != nil || len(tail.Items) != 1 { + t.Fatalf("first tail=%#v err=%v", tail, err) + } + checkpoint := tail.NextOffset + second := TaskEvent{Sequence: 2, Timestamp: now.Add(time.Second), EventType: "state_change", TaskID: "task", State: TaskStateSucceeded} + line, _ := json.Marshal(second) + path := filepath.Join(root, ".reasonix", "tasks", "task", "events.jsonl") + f, err := os.OpenFile(path, os.O_APPEND|os.O_WRONLY, 0o600) + if err != nil { + t.Fatal(err) + } + _, _ = f.Write(line) + _ = f.Close() + tail, err = store.ReadEventTail(context.Background(), root, "task", checkpoint) + if err != nil || len(tail.Items) != 0 || tail.NextOffset != checkpoint { + t.Fatalf("incomplete tail=%#v err=%v", tail, err) + } + f, err = os.OpenFile(path, os.O_APPEND|os.O_WRONLY, 0o600) + if err != nil { + t.Fatal(err) + } + _, _ = f.Write([]byte{'\n'}) + _ = f.Close() + tail, err = store.ReadEventTail(context.Background(), root, "task", checkpoint) + if err != nil || len(tail.Items) != 1 || tail.Items[0].Sequence != 2 { + t.Fatalf("completed tail=%#v err=%v", tail, err) + } +} diff --git a/internal/taskmonitor/jsonstore.go b/internal/taskmonitor/jsonstore.go index debfcbfc93..020b25916f 100644 --- a/internal/taskmonitor/jsonstore.go +++ b/internal/taskmonitor/jsonstore.go @@ -21,6 +21,7 @@ import ( // is added in TM-04. type FileStore struct { baseDir string // projectDir → task data root (e.g. ".reasonix/tasks") + sink ProjectionSink } // NewFileStore returns a FileStore rooted at baseDir. baseDir is typically @@ -29,6 +30,10 @@ func NewFileStore(baseDir string) *FileStore { return &FileStore{baseDir: baseDir} } +func NewObservedFileStore(baseDir string, sink ProjectionSink) *FileStore { + return &FileStore{baseDir: baseDir, sink: sink} +} + // safeID validates a user-supplied identifier for use as a filesystem path // component. It rejects empty strings, ".", "..", and values containing a // path separator. Used for both taskID and idempotency keys. @@ -332,6 +337,12 @@ func (s *FileStore) readEvents(taskDir string) ([]TaskEvent, error) { // SaveTask implements WriteStore. It atomically writes the snapshot, // failing if a concurrent write has changed the version. func (s *FileStore) SaveTask(ctx context.Context, projectDir string, snap TaskSnapshot) (retErr error) { + committed := false + defer func() { + if committed && s.sink != nil { + s.sink.SnapshotChanged(projectDir, snap.TaskID) + } + }() if err := ctx.Err(); err != nil { return err } @@ -413,6 +424,7 @@ func (s *FileStore) SaveTask(ctx context.Context, projectDir string, snap TaskSn return fmt.Errorf("save task: %w", err) } _ = os.Chmod(target, 0o600) + committed = true return nil } @@ -420,6 +432,12 @@ func (s *FileStore) SaveTask(ctx context.Context, projectDir string, snap TaskSn // AppendAuditEvent implements WriteStore. It atomically assigns the next // monotonic sequence number and appends the event to the JSONL file. func (s *FileStore) AppendAuditEvent(ctx context.Context, projectDir string, ev TaskEvent) (retErr error) { + committed := false + defer func() { + if committed && s.sink != nil { + s.sink.EventsChanged(projectDir, ev.TaskID) + } + }() if err := ctx.Err(); err != nil { return err } @@ -506,6 +524,7 @@ func (s *FileStore) AppendAuditEvent(ctx context.Context, projectDir string, ev if _, err := f.WriteString(string(data) + "\n"); err != nil { return err } + committed = true return nil } diff --git a/internal/taskmonitor/model.go b/internal/taskmonitor/model.go index 6240f0a5a0..5837697c4a 100644 --- a/internal/taskmonitor/model.go +++ b/internal/taskmonitor/model.go @@ -82,6 +82,10 @@ func reconcileRuntime(snap *TaskSnapshot, now time.Time) { } } +// ReconcileRuntime applies the read-time lease view without mutating the +// authoritative snapshot file. +func (ts *TaskSnapshot) ReconcileRuntime(now time.Time) { reconcileRuntime(ts, now) } + // ValidTaskStates is the set of well-known states. var ValidTaskStates = map[TaskState]bool{ TaskStateQueued: true, diff --git a/internal/taskmonitor/projection_sink_test.go b/internal/taskmonitor/projection_sink_test.go new file mode 100644 index 0000000000..58a2e9eab7 --- /dev/null +++ b/internal/taskmonitor/projection_sink_test.go @@ -0,0 +1,56 @@ +package taskmonitor + +import ( + "context" + "path/filepath" + "sync" + "testing" + "time" +) + +type reentrantProjectionSink struct { + store *FileStore + mu sync.Mutex + ran bool + done chan error +} + +func (s *reentrantProjectionSink) SnapshotChanged(root, taskID string) { + s.mu.Lock() + if s.ran { + s.mu.Unlock() + return + } + s.ran = true + s.mu.Unlock() + task, err := s.store.GetTask(context.Background(), root, taskID) + if err == nil && task != nil { + task.Version++ + task.UpdatedAt = task.UpdatedAt.Add(time.Second) + err = s.store.SaveTask(context.Background(), root, *task) + } + s.done <- err +} + +func (*reentrantProjectionSink) EventsChanged(string, string) {} + +func TestProjectionSinkRunsAfterTaskLockRelease(t *testing.T) { + t.Parallel() + root := t.TempDir() + sink := &reentrantProjectionSink{done: make(chan error, 1)} + sink.store = NewObservedFileStore(filepath.Join(".reasonix", "tasks"), sink) + now := time.Now() + err := sink.store.SaveTask(context.Background(), root, TaskSnapshot{SchemaVersion: 1, TaskID: "task", State: TaskStateQueued, + Version: 1, CreatedAt: now, UpdatedAt: now}) + if err != nil { + t.Fatal(err) + } + select { + case err := <-sink.done: + if err != nil { + t.Fatal(err) + } + case <-time.After(2 * time.Second): + t.Fatal("projection sink was invoked while the task lock was still held") + } +} diff --git a/internal/taskmonitor/store.go b/internal/taskmonitor/store.go index c76c432eff..bcda5d132d 100644 --- a/internal/taskmonitor/store.go +++ b/internal/taskmonitor/store.go @@ -18,6 +18,13 @@ type Store interface { ListEvents(ctx context.Context, projectDir string, taskID string, afterSequence int) ([]TaskEvent, error) } +// ProjectionSink receives post-commit hints. Implementations must enqueue and +// return immediately; FileStore remains the only authority for task control. +type ProjectionSink interface { + SnapshotChanged(projectRoot, taskID string) + EventsChanged(projectRoot, taskID string) +} + // IdempotencyRecord captures the binding between an idempotency key and the // operation it was used for. type IdempotencyRecord struct { diff --git a/internal/usagecatalog/benchmark_test.go b/internal/usagecatalog/benchmark_test.go new file mode 100644 index 0000000000..4118d1c197 --- /dev/null +++ b/internal/usagecatalog/benchmark_test.go @@ -0,0 +1,41 @@ +package usagecatalog + +import ( + "context" + "fmt" + "path/filepath" + "testing" + "time" +) + +func BenchmarkWarmQueryTenYears(b *testing.B) { + catalog, err := Open(context.Background(), filepath.Join(b.TempDir(), "usage.sqlite")) + if err != nil { + b.Fatal(err) + } + b.Cleanup(func() { _ = catalog.Close(context.Background()) }) + tx, err := catalog.db.Begin() + if err != nil { + b.Fatal(err) + } + start := time.Date(2016, 1, 1, 0, 0, 0, 0, time.UTC) + for day := range 3_650 { + date := start.AddDate(0, 0, day).Format("2006-01-02") + for model := range 8 { + ref := fmt.Sprintf("provider/model-%d", model) + if _, err := tx.Exec(`INSERT INTO usage_rollups(day,source,model_ref,provider,prompt,completion,reasoning,cache_hit,cache_miss,total,requests,turns) + VALUES(?,?,?,?,1,1,0,0,1,2,1,1)`, date, "desktop", ref, "provider"); err != nil { + b.Fatal(err) + } + } + } + if err := tx.Commit(); err != nil { + b.Fatal(err) + } + b.ResetTimer() + for range b.N { + if _, err := catalog.Query(context.Background(), "2016-01-01", "2025-12-28", "all"); err != nil { + b.Fatal(err) + } + } +} diff --git a/internal/usagecatalog/catalog.go b/internal/usagecatalog/catalog.go new file mode 100644 index 0000000000..65ebe02ef6 --- /dev/null +++ b/internal/usagecatalog/catalog.go @@ -0,0 +1,558 @@ +// Package usagecatalog maintains a disposable aggregate projection of the +// authoritative daily statistics JSONL files. +package usagecatalog + +import ( + "bufio" + "context" + "crypto/sha256" + "database/sql" + "encoding/hex" + "encoding/json" + "errors" + "io" + "os" + "path/filepath" + "strings" + "sync" + "sync/atomic" + "time" + + "reasonix/internal/config" + "reasonix/internal/projectiondb" +) + +const SchemaVersion = 1 + +type AppendReceipt struct { + Path string + Day string + Offset int64 + Length int + LineHash string +} + +type Entry struct { + Day string + Source string + ModelRef string + Provider string + Prompt int + Completion int + Reasoning int + CacheHit int + CacheMiss int + Total int + Requests int + Turns int +} + +type Rollup struct { + Day string + Source string + ModelRef string + Provider string + Prompt int64 + Completion int64 + Reasoning int64 + CacheHit int64 + CacheMiss int64 + Total int64 + Requests int64 + Turns int64 +} + +type Status struct { + State string `json:"state"` + Mode projectiondb.Mode `json:"mode"` + Path string `json:"path,omitempty"` + Revision uint64 `json:"revision"` + IndexedFiles int64 `json:"indexedFiles"` + LagBytes int64 `json:"lagBytes"` + CorruptLines int64 `json:"corruptLines"` + Fallbacks uint64 `json:"fallbacks"` + LastError string `json:"lastError,omitempty"` +} + +type Catalog struct { + db *sql.DB + statusMu sync.RWMutex + status Status + revision atomic.Uint64 + fallback atomic.Uint64 + queue chan receiptEntry + dirtyFiles sync.Map + dirtyDirs sync.Map + dirtyWake chan struct{} + ctx context.Context + cancel context.CancelFunc + wg sync.WaitGroup + closeOnce sync.Once + closeDone chan struct{} + closeErr error +} + +type receiptEntry struct { + receipt AppendReceipt + entry Entry + flush chan struct{} +} + +// DefaultPath returns the disposable usage rollup path under CacheDir. +// Empty when cache is unavailable so Open falls back to an in-memory projection. +func DefaultPath() string { + cache := strings.TrimSpace(config.CacheDir()) + if cache == "" { + return "" + } + return filepath.Join(cache, "usage-catalog", "v1.sqlite") +} + +const schema = ` +CREATE TABLE usage_state(id INTEGER PRIMARY KEY CHECK(id=1),revision INTEGER NOT NULL DEFAULT 0); +INSERT INTO usage_state(id,revision) VALUES(1,0); +CREATE TABLE usage_files( + path TEXT PRIMARY KEY,day TEXT NOT NULL,size INTEGER NOT NULL DEFAULT 0,mtime_ns INTEGER NOT NULL DEFAULT 0, + indexed_offset INTEGER NOT NULL DEFAULT 0,state TEXT NOT NULL DEFAULT 'pending',error TEXT NOT NULL DEFAULT '', + corrupt_lines INTEGER NOT NULL DEFAULT 0,completed_at INTEGER NOT NULL DEFAULT 0 +); +CREATE TABLE usage_records( + file_path TEXT NOT NULL,byte_offset INTEGER NOT NULL,byte_length INTEGER NOT NULL,line_hash TEXT NOT NULL, + day TEXT NOT NULL,source TEXT NOT NULL,model_ref TEXT NOT NULL,provider TEXT NOT NULL, + prompt INTEGER NOT NULL,completion INTEGER NOT NULL,reasoning INTEGER NOT NULL,cache_hit INTEGER NOT NULL, + cache_miss INTEGER NOT NULL,total INTEGER NOT NULL,requests INTEGER NOT NULL,turns INTEGER NOT NULL, + PRIMARY KEY(file_path,byte_offset) +); +CREATE TABLE usage_rollups( + day TEXT NOT NULL,source TEXT NOT NULL,model_ref TEXT NOT NULL,provider TEXT NOT NULL, + prompt INTEGER NOT NULL,completion INTEGER NOT NULL,reasoning INTEGER NOT NULL,cache_hit INTEGER NOT NULL, + cache_miss INTEGER NOT NULL,total INTEGER NOT NULL,requests INTEGER NOT NULL,turns INTEGER NOT NULL, + PRIMARY KEY(day,source,model_ref) +); +CREATE INDEX idx_usage_rollups_range ON usage_rollups(day,source,model_ref); +` + +func migrations() []projectiondb.Migration { + return []projectiondb.Migration{{Version: 1, Apply: func(ctx context.Context, tx *sql.Tx) error { + _, err := tx.ExecContext(ctx, schema) + return err + }}} +} + +func Open(ctx context.Context, path string) (*Catalog, error) { + if path == "" { + path = DefaultPath() + } + inMemory := strings.TrimSpace(path) == "" + if inMemory { + path = "" + } + handle, err := projectiondb.Open(ctx, projectiondb.OpenOptions{ + Path: path, MemoryName: "usage-catalog", Migrations: migrations(), InMemory: inMemory, MaxOpenConns: 4, + }) + if err != nil { + return nil, err + } + workerCtx, cancel := context.WithCancel(context.Background()) + c := &Catalog{db: handle.DB, queue: make(chan receiptEntry, 1024), dirtyWake: make(chan struct{}, 1), ctx: workerCtx, cancel: cancel, + closeDone: make(chan struct{}), + status: Status{State: string(handle.Status.State), Mode: handle.Status.Mode, Path: handle.Status.Path, LastError: handle.Status.LastError}} + var revision uint64 + _ = c.db.QueryRowContext(ctx, `SELECT revision FROM usage_state WHERE id=1`).Scan(&revision) + c.revision.Store(revision) + c.refresh(ctx) + c.wg.Add(1) + go c.worker() + return c, nil +} + +func (c *Catalog) Enqueue(receipt AppendReceipt, entry Entry) bool { + if c == nil { + return false + } + select { + case c.queue <- receiptEntry{receipt: receipt, entry: entry}: + return true + default: + c.dirtyFiles.Store(receipt.Path, receipt.Day) + c.wakeDirty() + return false + } +} + +func (c *Catalog) worker() { + defer c.wg.Done() + for { + if path, day, ok := c.takeDirtyFile(); ok { + _ = c.ReconcileFile(c.ctx, path, day) + continue + } + if dir, ok := c.takeDirtyDir(); ok { + _ = c.ReconcileDir(c.ctx, dir) + continue + } + select { + case <-c.ctx.Done(): + return + case <-c.dirtyWake: + case item := <-c.queue: + if item.flush != nil { + close(item.flush) + continue + } + _ = c.applyReceipt(c.ctx, item.receipt, item.entry) + } + } +} + +func (c *Catalog) takeDirtyFile() (string, string, bool) { + var path, day string + c.dirtyFiles.Range(func(key, value any) bool { + path, _ = key.(string) + day, _ = value.(string) + c.dirtyFiles.Delete(key) + return false + }) + return path, day, path != "" +} + +func (c *Catalog) takeDirtyDir() (string, bool) { + var dir string + c.dirtyDirs.Range(func(key, _ any) bool { + dir, _ = key.(string) + c.dirtyDirs.Delete(key) + return false + }) + return dir, dir != "" +} + +func (c *Catalog) RequestReconcileDir(dir string) { + if c != nil && strings.TrimSpace(dir) != "" { + c.dirtyDirs.Store(filepath.Clean(dir), true) + c.wakeDirty() + } +} + +func (c *Catalog) wakeDirty() { + select { + case c.dirtyWake <- struct{}{}: + default: + } +} + +func (c *Catalog) Flush(ctx context.Context) error { + if c == nil { + return nil + } + done := make(chan struct{}) + select { + case c.queue <- receiptEntry{flush: done}: + case <-ctx.Done(): + return ctx.Err() + } + select { + case <-done: + return nil + case <-ctx.Done(): + return ctx.Err() + } +} + +func (c *Catalog) applyReceipt(ctx context.Context, receipt AppendReceipt, entry Entry) error { + tx, err := c.db.BeginTx(ctx, nil) + if err != nil { + return err + } + var existingHash string + err = tx.QueryRowContext(ctx, `SELECT line_hash FROM usage_records WHERE file_path=? AND byte_offset=?`, receipt.Path, receipt.Offset).Scan(&existingHash) + if err == nil { + _ = tx.Rollback() + if existingHash != receipt.LineHash { + return c.ReconcileFile(ctx, receipt.Path, receipt.Day) + } + return nil + } + if !errors.Is(err, sql.ErrNoRows) { + _ = tx.Rollback() + return err + } + if err := insertRecord(ctx, tx, receipt, entry); err != nil { + _ = tx.Rollback() + return err + } + end := receipt.Offset + int64(receipt.Length) + mtime := int64(0) + if info, statErr := os.Stat(receipt.Path); statErr == nil { + mtime = info.ModTime().UnixNano() + } + _, err = tx.ExecContext(ctx, `INSERT INTO usage_files(path,day,size,mtime_ns,indexed_offset,state,completed_at) VALUES(?,?,?,?,?,'ready',?) + ON CONFLICT(path) DO UPDATE SET day=excluded.day,size=MAX(usage_files.size,excluded.size), + mtime_ns=CASE WHEN usage_files.indexed_offset=? THEN excluded.mtime_ns ELSE usage_files.mtime_ns END, + indexed_offset=CASE WHEN usage_files.indexed_offset=? THEN excluded.indexed_offset ELSE usage_files.indexed_offset END, + state=CASE WHEN usage_files.indexed_offset=? THEN 'ready' ELSE 'pending' END,completed_at=excluded.completed_at`, + receipt.Path, receipt.Day, end, mtime, end, time.Now().UnixMilli(), receipt.Offset, receipt.Offset, receipt.Offset) + if err != nil { + _ = tx.Rollback() + return err + } + revision, err := bump(ctx, tx) + if err != nil { + _ = tx.Rollback() + return err + } + if err := tx.Commit(); err != nil { + return err + } + c.revision.Store(revision) + c.refresh(context.Background()) + return nil +} + +func insertRecord(ctx context.Context, tx *sql.Tx, receipt AppendReceipt, entry Entry) error { + if entry.Total > 0 && entry.Requests <= 0 { + entry.Requests = 1 + } + result, err := tx.ExecContext(ctx, `INSERT OR IGNORE INTO usage_records(file_path,byte_offset,byte_length,line_hash,day,source, + model_ref,provider,prompt,completion,reasoning,cache_hit,cache_miss,total,requests,turns) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`, + receipt.Path, receipt.Offset, receipt.Length, receipt.LineHash, entry.Day, entry.Source, entry.ModelRef, entry.Provider, + entry.Prompt, entry.Completion, entry.Reasoning, entry.CacheHit, entry.CacheMiss, entry.Total, entry.Requests, entry.Turns) + if err != nil { + return err + } + inserted, _ := result.RowsAffected() + if inserted == 0 { + return nil + } + _, err = tx.ExecContext(ctx, `INSERT INTO usage_rollups(day,source,model_ref,provider,prompt,completion,reasoning,cache_hit, + cache_miss,total,requests,turns) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ON CONFLICT(day,source,model_ref) DO UPDATE SET + prompt=prompt+excluded.prompt,completion=completion+excluded.completion,reasoning=reasoning+excluded.reasoning, + cache_hit=cache_hit+excluded.cache_hit,cache_miss=cache_miss+excluded.cache_miss,total=total+excluded.total, + requests=requests+excluded.requests,turns=turns+excluded.turns`, entry.Day, entry.Source, entry.ModelRef, entry.Provider, + entry.Prompt, entry.Completion, entry.Reasoning, entry.CacheHit, entry.CacheMiss, entry.Total, entry.Requests, entry.Turns) + return err +} + +type rawRecord struct { + Timestamp time.Time `json:"ts"` + ModelRef string `json:"model"` + Source string `json:"source"` + Prompt int `json:"prompt"` + Completion int `json:"completion"` + Reasoning int `json:"reasoning"` + CacheHit int `json:"cache_hit"` + CacheMiss int `json:"cache_miss"` + Total int `json:"total"` + Requests int `json:"requests"` + Turn bool `json:"turn"` +} + +func providerOf(model string) string { + if i := strings.IndexByte(model, '/'); i > 0 { + return model[:i] + } + return "default" +} + +func entryFromRaw(day string, raw rawRecord) Entry { + turns := 0 + if raw.Turn { + turns = 1 + } + return Entry{Day: day, Source: raw.Source, ModelRef: raw.ModelRef, Provider: providerOf(raw.ModelRef), Prompt: raw.Prompt, + Completion: raw.Completion, Reasoning: raw.Reasoning, CacheHit: raw.CacheHit, CacheMiss: raw.CacheMiss, + Total: raw.Total, Requests: raw.Requests, Turns: turns} +} + +func (c *Catalog) ReconcileFile(ctx context.Context, path, day string) error { + f, err := os.Open(path) + if errors.Is(err, os.ErrNotExist) { + return nil + } + if err != nil { + return err + } + defer f.Close() + tx, err := c.db.BeginTx(ctx, nil) + if err != nil { + return err + } + if _, err := tx.ExecContext(ctx, `DELETE FROM usage_rollups WHERE day IN (SELECT DISTINCT day FROM usage_records WHERE file_path=?)`, path); err != nil { + _ = tx.Rollback() + return err + } + if _, err := tx.ExecContext(ctx, `DELETE FROM usage_records WHERE file_path=?`, path); err != nil { + _ = tx.Rollback() + return err + } + reader := bufio.NewReader(f) + offset := int64(0) + corrupt := int64(0) + for { + line, readErr := reader.ReadBytes('\n') + if len(line) > 0 { + trimmed := strings.TrimSpace(string(line)) + if trimmed != "" { + var raw rawRecord + if json.Unmarshal([]byte(trimmed), &raw) != nil { + corrupt++ + } else { + hash := sha256.Sum256([]byte(trimmed)) + receipt := AppendReceipt{Path: path, Day: day, Offset: offset, Length: len(line), LineHash: hex.EncodeToString(hash[:])} + if err := insertRecord(ctx, tx, receipt, entryFromRaw(day, raw)); err != nil { + _ = tx.Rollback() + return err + } + } + } + offset += int64(len(line)) + } + if errors.Is(readErr, io.EOF) { + break + } + if readErr != nil { + _ = tx.Rollback() + return readErr + } + } + info, _ := os.Stat(path) + mtime := int64(0) + if info != nil { + mtime = info.ModTime().UnixNano() + } + _, err = tx.ExecContext(ctx, `INSERT INTO usage_files(path,day,size,mtime_ns,indexed_offset,state,error,corrupt_lines,completed_at) + VALUES(?,?,?,?,?,'ready','',?,?) ON CONFLICT(path) DO UPDATE SET day=excluded.day,size=excluded.size,mtime_ns=excluded.mtime_ns, + indexed_offset=excluded.indexed_offset,state='ready',error='',corrupt_lines=excluded.corrupt_lines,completed_at=excluded.completed_at`, + path, day, offset, mtime, offset, corrupt, time.Now().UnixMilli()) + if err != nil { + _ = tx.Rollback() + return err + } + revision, err := bump(ctx, tx) + if err != nil { + _ = tx.Rollback() + return err + } + if err := tx.Commit(); err != nil { + return err + } + c.revision.Store(revision) + c.refresh(context.Background()) + return nil +} + +func (c *Catalog) ReconcileDir(ctx context.Context, dir string) error { + entries, err := os.ReadDir(dir) + if errors.Is(err, os.ErrNotExist) { + return nil + } + if err != nil { + return err + } + for _, entry := range entries { + if entry.IsDir() || !strings.HasSuffix(entry.Name(), ".jsonl") { + continue + } + day := strings.TrimSuffix(entry.Name(), ".jsonl") + if err := c.ReconcileFile(ctx, filepath.Join(dir, entry.Name()), day); err != nil { + return err + } + } + return nil +} + +func (c *Catalog) Ready(ctx context.Context, dir string, days []string) bool { + for _, day := range days { + path := filepath.Join(dir, day+".jsonl") + info, err := os.Stat(path) + if errors.Is(err, os.ErrNotExist) { + continue + } + if err != nil { + return false + } + var size, offset, mtime int64 + var state string + if err := c.db.QueryRowContext(ctx, `SELECT size,indexed_offset,state,mtime_ns FROM usage_files WHERE path=?`, path).Scan(&size, &offset, &state, &mtime); err != nil { + return false + } + // Same-size in-place rewrites must invalidate Ready so callers fall back + // to authoritative JSONL until the catalog rescan catches up. + if state != "ready" || size != info.Size() || offset != info.Size() || mtime != info.ModTime().UnixNano() { + return false + } + } + return true +} + +func (c *Catalog) Query(ctx context.Context, fromDay, toDay, source string) ([]Rollup, error) { + args := []any{fromDay, toDay} + where := `day>=? AND day<=?` + if source != "" && source != "all" { + where += ` AND source=?` + args = append(args, source) + } + rows, err := c.db.QueryContext(ctx, `SELECT day,source,model_ref,provider,prompt,completion,reasoning,cache_hit,cache_miss,total,requests,turns + FROM usage_rollups WHERE `+where+` ORDER BY day,source,model_ref`, args...) + if err != nil { + return nil, err + } + defer rows.Close() + out := []Rollup{} + for rows.Next() { + var row Rollup + if err := rows.Scan(&row.Day, &row.Source, &row.ModelRef, &row.Provider, &row.Prompt, &row.Completion, &row.Reasoning, + &row.CacheHit, &row.CacheMiss, &row.Total, &row.Requests, &row.Turns); err != nil { + return nil, err + } + out = append(out, row) + } + return out, rows.Err() +} + +func bump(ctx context.Context, tx *sql.Tx) (uint64, error) { + if _, err := tx.ExecContext(ctx, `UPDATE usage_state SET revision=revision+1 WHERE id=1`); err != nil { + return 0, err + } + var revision uint64 + err := tx.QueryRowContext(ctx, `SELECT revision FROM usage_state WHERE id=1`).Scan(&revision) + return revision, err +} + +func (c *Catalog) NoteFallback() { c.fallback.Add(1) } + +func (c *Catalog) refresh(ctx context.Context) { + var files, lag, corrupt int64 + _ = c.db.QueryRowContext(ctx, `SELECT COUNT(*),COALESCE(SUM(MAX(size-indexed_offset,0)),0),COALESCE(SUM(corrupt_lines),0) FROM usage_files`).Scan(&files, &lag, &corrupt) + c.statusMu.Lock() + c.status.Revision, c.status.IndexedFiles, c.status.LagBytes, c.status.CorruptLines = c.revision.Load(), files, lag, corrupt + c.status.Fallbacks = c.fallback.Load() + c.statusMu.Unlock() +} + +func (c *Catalog) Status() Status { + c.statusMu.RLock() + defer c.statusMu.RUnlock() + status := c.status + status.Fallbacks = c.fallback.Load() + return status +} + +func (c *Catalog) Close(ctx context.Context) error { + if c == nil { + return nil + } + c.closeOnce.Do(func() { + c.cancel() + go func() { + c.wg.Wait() + c.closeErr = c.db.Close() + close(c.closeDone) + }() + }) + select { + case <-c.closeDone: + return c.closeErr + case <-ctx.Done(): + return ctx.Err() + } +} diff --git a/internal/usagecatalog/catalog_test.go b/internal/usagecatalog/catalog_test.go new file mode 100644 index 0000000000..fd1d432f2a --- /dev/null +++ b/internal/usagecatalog/catalog_test.go @@ -0,0 +1,114 @@ +package usagecatalog + +import ( + "context" + "os" + "path/filepath" + "testing" + "time" +) + +func TestReconcileFileAndDuplicateReceiptAreIdempotent(t *testing.T) { + t.Parallel() + ctx := context.Background() + dir := t.TempDir() + path := filepath.Join(dir, "2026-08-10.jsonl") + line := []byte("{\"ts\":\"2026-08-10T10:00:00+08:00\",\"model\":\"deepseek/model\",\"source\":\"desktop\",\"total\":42}\n") + if err := os.WriteFile(path, line, 0o600); err != nil { + t.Fatal(err) + } + catalog, err := Open(ctx, filepath.Join(t.TempDir(), "usage.sqlite")) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + if err := catalog.ReconcileFile(ctx, path, "2026-08-10"); err != nil { + t.Fatal(err) + } + rows, err := catalog.Query(ctx, "2026-08-10", "2026-08-10", "desktop") + if err != nil || len(rows) != 1 || rows[0].Total != 42 || rows[0].Requests != 1 { + t.Fatalf("rows=%#v err=%v", rows, err) + } + var receipt AppendReceipt + if err := catalog.db.QueryRow(`SELECT file_path,day,byte_offset,byte_length,line_hash FROM usage_records WHERE file_path=?`, path).Scan( + &receipt.Path, &receipt.Day, &receipt.Offset, &receipt.Length, &receipt.LineHash); err != nil { + t.Fatal(err) + } + entry := Entry{Day: receipt.Day, Source: "desktop", ModelRef: "deepseek/model", Provider: "deepseek", Total: 42, Requests: 1} + if err := catalog.applyReceipt(ctx, receipt, entry); err != nil { + t.Fatal(err) + } + rows, err = catalog.Query(ctx, "2026-08-10", "2026-08-10", "desktop") + if err != nil || len(rows) != 1 || rows[0].Total != 42 { + t.Fatalf("duplicate changed aggregate: rows=%#v err=%v", rows, err) + } +} + +func TestReadyRejectsExternalAppendUntilReconciled(t *testing.T) { + t.Parallel() + ctx := context.Background() + dir := t.TempDir() + path := filepath.Join(dir, "2026-08-10.jsonl") + if err := os.WriteFile(path, []byte("{\"ts\":\"2026-08-10T10:00:00Z\",\"total\":1}\n"), 0o600); err != nil { + t.Fatal(err) + } + catalog, err := Open(ctx, filepath.Join(t.TempDir(), "usage.sqlite")) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + if err := catalog.ReconcileFile(ctx, path, "2026-08-10"); err != nil { + t.Fatal(err) + } + if !catalog.Ready(ctx, dir, []string{"2026-08-10"}) { + t.Fatal("catalog should be ready") + } + f, err := os.OpenFile(path, os.O_APPEND|os.O_WRONLY, 0o600) + if err != nil { + t.Fatal(err) + } + _, _ = f.WriteString("{\"ts\":\"2026-08-10T11:00:00Z\",\"total\":2}\n") + _ = f.Close() + if catalog.Ready(ctx, dir, []string{"2026-08-10"}) { + t.Fatal("external append was treated as indexed") + } +} + +func TestReadyRejectsSameSizeRewriteWithDifferentMtime(t *testing.T) { + t.Parallel() + ctx := context.Background() + dir := t.TempDir() + path := filepath.Join(dir, "2026-08-10.jsonl") + original := []byte("{\"ts\":\"2026-08-10T10:00:00Z\",\"total\":1,\"source\":\"desktop\"}\n") + if err := os.WriteFile(path, original, 0o600); err != nil { + t.Fatal(err) + } + catalog, err := Open(ctx, filepath.Join(t.TempDir(), "usage.sqlite")) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = catalog.Close(context.Background()) }) + if err := catalog.ReconcileFile(ctx, path, "2026-08-10"); err != nil { + t.Fatal(err) + } + if !catalog.Ready(ctx, dir, []string{"2026-08-10"}) { + t.Fatal("catalog should be ready after reconcile") + } + // Same byte length, different content and mtime — Ready must fail so JSONL + // remains the authority until the projection is rescanned. + replacement := []byte("{\"ts\":\"2026-08-10T12:00:00Z\",\"total\":9,\"source\":\"desktop\"}\n") + if len(replacement) != len(original) { + t.Fatalf("test fixture length mismatch: %d vs %d", len(replacement), len(original)) + } + if err := os.WriteFile(path, replacement, 0o600); err != nil { + t.Fatal(err) + } + // Force a distinct mtime on filesystems with coarse timestamps. + later := time.Now().Add(2 * time.Second) + if err := os.Chtimes(path, later, later); err != nil { + t.Fatal(err) + } + if catalog.Ready(ctx, dir, []string{"2026-08-10"}) { + t.Fatal("same-size rewrite was treated as still ready") + } +} diff --git a/internal/usagecatalog/close_lifecycle_test.go b/internal/usagecatalog/close_lifecycle_test.go new file mode 100644 index 0000000000..f9d5042830 --- /dev/null +++ b/internal/usagecatalog/close_lifecycle_test.go @@ -0,0 +1,29 @@ +package usagecatalog + +import ( + "context" + "errors" + "path/filepath" + "testing" + "time" +) + +func TestCloseCanBeAwaitedAfterCanceledCaller(t *testing.T) { + catalog, err := Open(context.Background(), filepath.Join(t.TempDir(), "usage.sqlite")) + if err != nil { + t.Fatalf("open: %v", err) + } + canceled, cancel := context.WithCancel(context.Background()) + cancel() + if err := catalog.Close(canceled); err != nil && !errors.Is(err, context.Canceled) { + t.Fatalf("first close: %v", err) + } + ctx, stop := context.WithTimeout(context.Background(), 5*time.Second) + defer stop() + if err := catalog.Close(ctx); err != nil { + t.Fatalf("await eventual close: %v", err) + } + if err := catalog.db.Ping(); err == nil { + t.Fatal("database remained open after close completion") + } +} diff --git a/internal/usagecatalog/rebuild.go b/internal/usagecatalog/rebuild.go new file mode 100644 index 0000000000..f7ef6fa948 --- /dev/null +++ b/internal/usagecatalog/rebuild.go @@ -0,0 +1,53 @@ +package usagecatalog + +import ( + "context" + "database/sql" + "strings" + "time" + + "reasonix/internal/projectiondb" +) + +// Rebuild replaces only the disposable usage projection after replaying the +// authoritative daily JSONL directory into a validated sibling database. +func Rebuild(ctx context.Context, path, statsDir string) (Status, error) { + if path == "" { + path = DefaultPath() + } + if strings.TrimSpace(path) == "" { + catalog, err := Open(ctx, "") + if err != nil { + return Status{}, err + } + if err := catalog.ReconcileDir(ctx, statsDir); err != nil { + closeRebuildCatalog(catalog) + return catalog.Status(), err + } + status := catalog.Status() + closeRebuildCatalog(catalog) + return status, nil + } + err := projectiondb.Rebuild(ctx, projectiondb.OpenOptions{ + Path: path, MemoryName: "usage-catalog-rebuild", Migrations: migrations(), + }, func(ctx context.Context, db *sql.DB) error { + catalog := &Catalog{db: db, status: Status{State: "ready", Mode: projectiondb.ModeDisk, Path: path}} + return catalog.ReconcileDir(ctx, statsDir) + }) + if err != nil { + return Status{}, err + } + published, err := Open(ctx, path) + if err != nil { + return Status{}, err + } + status := published.Status() + closeRebuildCatalog(published) + return status, nil +} + +func closeRebuildCatalog(catalog *Catalog) { + closeCtx, cancel := context.WithTimeout(context.Background(), time.Second) + defer cancel() + _ = catalog.Close(closeCtx) +} diff --git a/internal/usagecatalog/rebuild_test.go b/internal/usagecatalog/rebuild_test.go new file mode 100644 index 0000000000..67afd69e6c --- /dev/null +++ b/internal/usagecatalog/rebuild_test.go @@ -0,0 +1,50 @@ +package usagecatalog + +import ( + "context" + "os" + "path/filepath" + "testing" +) + +func TestRebuildReplacesStaleUsageProjection(t *testing.T) { + t.Parallel() + ctx := context.Background() + databasePath := filepath.Join(t.TempDir(), "usage.sqlite") + staleDir := t.TempDir() + currentDir := t.TempDir() + if err := os.WriteFile(filepath.Join(staleDir, "2026-08-09.jsonl"), + []byte("{\"ts\":\"2026-08-09T10:00:00Z\",\"source\":\"desktop\",\"total\":9}\n"), 0o600); err != nil { + t.Fatal(err) + } + if err := os.WriteFile(filepath.Join(currentDir, "2026-08-10.jsonl"), + []byte("{\"ts\":\"2026-08-10T10:00:00Z\",\"source\":\"desktop\",\"total\":42}\n"), 0o600); err != nil { + t.Fatal(err) + } + seed, err := Open(ctx, databasePath) + if err != nil { + t.Fatal(err) + } + if err := seed.ReconcileDir(ctx, staleDir); err != nil { + t.Fatal(err) + } + if err := seed.Close(ctx); err != nil { + t.Fatal(err) + } + if _, err := Rebuild(ctx, databasePath, currentDir); err != nil { + t.Fatal(err) + } + rebuilt, err := Open(ctx, databasePath) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = rebuilt.Close(context.Background()) }) + stale, err := rebuilt.Query(ctx, "2026-08-09", "2026-08-09", "desktop") + if err != nil || len(stale) != 0 { + t.Fatalf("stale rows=%#v err=%v", stale, err) + } + current, err := rebuilt.Query(ctx, "2026-08-10", "2026-08-10", "desktop") + if err != nil || len(current) != 1 || current[0].Total != 42 { + t.Fatalf("current rows=%#v err=%v", current, err) + } +} diff --git a/tools/repolint/baseline.json b/tools/repolint/baseline.json index 7fbba728db..cee7cc2b15 100644 --- a/tools/repolint/baseline.json +++ b/tools/repolint/baseline.json @@ -2,14 +2,14 @@ "limits": { "banner": 15, "commented-code": 0, - "complexity": 2106, - "essay": 4071, - "file-size": 109568, - "function-size": 9163, + "complexity": 2083, + "essay": 4048, + "file-size": 108259, + "function-size": 8942, "layering": 1, "marker": 0, "narrative": 64, - "test-file-size": 69939 + "test-file-size": 69795 }, "files": { "cmd/e2ebench/main.go": { @@ -28,15 +28,15 @@ "desktop/app.go": { "complexity": 63, "essay": 96, - "file-size": 11457, - "function-size": 380 + "file-size": 11402, + "function-size": 382 }, "desktop/app_autosave_test.go": { "essay": 1 }, "desktop/app_test.go": { "essay": 2, - "test-file-size": 10231 + "test-file-size": 10233 }, "desktop/bot_bridge.go": { "essay": 11 @@ -84,7 +84,7 @@ "essay": 2 }, "desktop/frontend/src/App.tsx": { - "file-size": 4724 + "file-size": 4675 }, "desktop/frontend/src/__tests__/app-chrome-tabs.test.ts": { "test-file-size": 19 @@ -135,7 +135,7 @@ "file-size": 95 }, "desktop/frontend/src/components/ProjectTree.tsx": { - "file-size": 1587 + "file-size": 1475 }, "desktop/frontend/src/components/RichComposerInput.tsx": { "file-size": 141 @@ -165,7 +165,7 @@ "file-size": 415 }, "desktop/frontend/src/lib/bridge.ts": { - "file-size": 4745 + "file-size": 4748 }, "desktop/frontend/src/lib/crash.ts": { "file-size": 225 @@ -174,10 +174,10 @@ "file-size": 269 }, "desktop/frontend/src/lib/types.ts": { - "file-size": 1512 + "file-size": 1508 }, "desktop/frontend/src/lib/useController.ts": { - "file-size": 3936 + "file-size": 3931 }, "desktop/heartbeat.go": { "essay": 20, @@ -187,7 +187,7 @@ "desktop/history_slice.go": { "banner": 2, "complexity": 8, - "essay": 37, + "essay": 35, "file-size": 1025, "function-size": 20 }, @@ -287,7 +287,7 @@ "desktop/settings_app.go": { "complexity": 22, "essay": 26, - "file-size": 2748 + "file-size": 2744 }, "desktop/settings_app_test.go": { "test-file-size": 1863 @@ -309,10 +309,10 @@ "essay": 1 }, "desktop/tabs.go": { - "complexity": 74, - "essay": 132, - "file-size": 8711, - "function-size": 626 + "complexity": 41, + "essay": 112, + "file-size": 7704, + "function-size": 371 }, "desktop/tabs_order_test.go": { "test-file-size": 395 @@ -322,7 +322,7 @@ }, "desktop/tabs_topic_test.go": { "essay": 1, - "test-file-size": 3409 + "test-file-size": 3250 }, "desktop/temphelper_test.go": { "essay": 4 @@ -358,6 +358,10 @@ "desktop/topic_activation_test.go": { "essay": 3 }, + "desktop/topic_legacy_migration.go": { + "complexity": 10, + "function-size": 29 + }, "desktop/tray.go": { "essay": 1 }, @@ -377,7 +381,7 @@ "function-size": 180 }, "desktop/updater_mac_test.go": { - "test-file-size": 525 + "test-file-size": 553 }, "desktop/updater_test.go": { "test-file-size": 769 @@ -582,8 +586,8 @@ }, "internal/agent/save.go": { "complexity": 49, - "essay": 113, - "file-size": 1544, + "essay": 112, + "file-size": 1522, "function-size": 124 }, "internal/agent/save_test.go": { @@ -678,13 +682,13 @@ "internal/boot/boot.go": { "complexity": 299, "essay": 105, - "file-size": 2252, - "function-size": 1886, + "file-size": 2255, + "function-size": 1887, "narrative": 3 }, "internal/boot/boot_test.go": { "essay": 10, - "test-file-size": 4471 + "test-file-size": 4456 }, "internal/boot/extension_dispatch_test.go": { "essay": 3, @@ -827,8 +831,8 @@ "internal/cli/cli.go": { "complexity": 72, "essay": 60, - "file-size": 1929, - "function-size": 498 + "file-size": 1925, + "function-size": 495 }, "internal/cli/cli_test.go": { "essay": 9, @@ -932,7 +936,7 @@ "file-size": 126 }, "internal/cli/shell_completion.go": { - "function-size": 117 + "function-size": 112 }, "internal/cli/skill_hooks.go": { "essay": 1 @@ -1075,8 +1079,8 @@ "internal/control/controller.go": { "complexity": 10, "essay": 162, - "file-size": 5469, - "function-size": 78, + "file-size": 5477, + "function-size": 82, "narrative": 4 }, "internal/control/controller_test.go": { @@ -1474,8 +1478,8 @@ }, "internal/plugin/plugin.go": { "essay": 29, - "file-size": 1315, - "function-size": 14 + "file-size": 1270, + "function-size": 20 }, "internal/plugin/plugin_test.go": { "essay": 10, @@ -1515,7 +1519,7 @@ "internal/pluginpkg/pluginpkg.go": { "complexity": 1, "essay": 2, - "file-size": 426 + "file-size": 407 }, "internal/pluginpkg/pluginpkg_test.go": { "test-file-size": 67