## Summary CLI commands, daemon/dashboard startup, packaged desktop startup, and live-data maintenance scripts now share the mandatory PostgreSQL lifecycle. Operators no longer risk a command silently reading or writing a disconnected SQLite shadow when PostgreSQL setup fails. ## Design decisions - Every startup owner retains and awaits its PostgreSQL shutdown callback, including partial-startup failure paths. - CLI project context and lock-retry flows resolve through asynchronous project stores. - Maintenance scripts use the shared backend helper; explicit database migration/inspection remains the only CLI surface allowed to read legacy SQLite sources. ## Validation - CLI and Desktop typechecks pass on the stacked branch. - `pnpm test:gate` passes all 478 gate tests. - This PR changes 54 files. ## Stack - Depends on #2109, which depends on #2108. - Bundled plugins and docs/release follow in later PRs. Related: #2105 <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * PostgreSQL is now the authoritative store for structured project and task metadata. * Projects can be recognized and initialized using `.fusion/project.json`, without creating a legacy SQLite database. * CLI commands now retry transient PostgreSQL contention errors. * **Bug Fixes** * Improved cleanup when commands complete, fail, or run in the background, preventing lingering resources. * Improved desktop, server, and session shutdown reliability. * **Documentation** * Updated storage and standalone binary guidance to reflect PostgreSQL and legacy SQLite compatibility. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
483 lines
17 KiB
TypeScript
483 lines
17 KiB
TypeScript
/**
|
|
* Project context resolution utilities for multi-project CLI operations.
|
|
*
|
|
* Provides project detection, resolution, and TaskStore management
|
|
* for operating on tasks across multiple registered projects.
|
|
*/
|
|
|
|
import { createTaskStoreForBackend, type AsyncDataLayer, type RegisteredProject, type TaskStore, CentralCore, GlobalSettingsStore, hasProjectIdentity, isValidSqliteDatabaseFile } from "@fusion/core";
|
|
import { resolve, dirname, basename } from "node:path";
|
|
|
|
/** Project context for CLI operations */
|
|
export interface ProjectContext {
|
|
/** Project ID */
|
|
projectId: string;
|
|
/** Absolute path to project directory */
|
|
projectPath: string;
|
|
/** Project name */
|
|
projectName: string;
|
|
/** Whether the project is registered in the central registry */
|
|
isRegistered: boolean;
|
|
/** TaskStore instance for this project */
|
|
store: TaskStore;
|
|
}
|
|
|
|
/** Cache of TaskStore instances by project ID to avoid re-initialization */
|
|
const storeCache = new Map<string, TaskStore>();
|
|
interface ProjectStoreOwner {
|
|
backendShutdown: () => Promise<void>;
|
|
central?: CentralCore;
|
|
closePromise?: Promise<void>;
|
|
}
|
|
const storeOwners = new WeakMap<TaskStore, ProjectStoreOwner>();
|
|
const closedProjectStores = new WeakSet<TaskStore>();
|
|
|
|
async function closeOwnedProjectStore(store: TaskStore): Promise<void> {
|
|
if (closedProjectStores.has(store)) return;
|
|
const owner = storeOwners.get(store);
|
|
if (!owner) {
|
|
await store.close();
|
|
closedProjectStores.add(store);
|
|
return;
|
|
}
|
|
if (!owner.closePromise) {
|
|
/*
|
|
FNXC:PostgresCliLifecycle 2026-07-14-19:10:
|
|
A layerless CentralCore can own the embedded postmaster that a subsequently-created project TaskStore only observes. Teardown must attempt both retained owners even if the first rejects. Failed cleanup remains retryable; only a completely successful attempt evicts ownership and marks the store closed.
|
|
*/
|
|
owner.closePromise = (async () => {
|
|
const failures: unknown[] = [];
|
|
try {
|
|
await owner.backendShutdown();
|
|
} catch (error) {
|
|
failures.push(error);
|
|
}
|
|
try {
|
|
await owner.central?.close();
|
|
} catch (error) {
|
|
failures.push(error);
|
|
}
|
|
if (failures.length === 1) throw failures[0];
|
|
if (failures.length > 1) throw new AggregateError(failures, "Failed to close project PostgreSQL owners");
|
|
})();
|
|
}
|
|
try {
|
|
await owner.closePromise;
|
|
storeOwners.delete(store);
|
|
closedProjectStores.add(store);
|
|
} catch (error) {
|
|
owner.closePromise = undefined;
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Resolve a project from explicit name flag, default project, or CWD detection.
|
|
*
|
|
* Resolution order:
|
|
* 1. If `projectNameFlag` provided: look up by name (case-insensitive) or ID (exact)
|
|
* 2. Else if default project set in global settings: use that project
|
|
* 3. Else: auto-detect from CWD using `.fusion/project.json` (or a legacy
|
|
* SQLite database only as migration input)
|
|
*
|
|
* @param projectNameFlag - Optional explicit project name/ID from --project flag
|
|
* @param cwd - Current working directory for CWD detection (default: process.cwd())
|
|
* @returns ProjectContext with resolved project and initialized TaskStore
|
|
* @throws Error if project not found or no project detected from CWD
|
|
*/
|
|
export async function resolveProject(
|
|
projectNameFlag?: string,
|
|
cwd: string = process.cwd(),
|
|
globalDir?: string,
|
|
): Promise<ProjectContext> {
|
|
const central = new CentralCore(globalDir);
|
|
await central.init();
|
|
let centralRetained = false;
|
|
|
|
try {
|
|
let project: RegisteredProject | undefined;
|
|
|
|
// 1. Explicit --project flag
|
|
if (projectNameFlag) {
|
|
project = await findProjectByNameOrId(central, projectNameFlag);
|
|
if (!project) {
|
|
throw new Error(
|
|
`Project '${projectNameFlag}' not found. Run 'fusion project list' to see registered projects.`
|
|
);
|
|
}
|
|
}
|
|
|
|
// 2. Default project from global settings
|
|
if (!project) {
|
|
const defaultProject = await getDefaultProject(globalDir);
|
|
if (defaultProject) {
|
|
project = await central.getProject(defaultProject.id);
|
|
// If default project was deleted from registry, clear it
|
|
if (!project) {
|
|
await clearDefaultProject(globalDir);
|
|
}
|
|
}
|
|
}
|
|
|
|
// 3. Auto-detect from CWD
|
|
if (!project) {
|
|
const detected = await detectProjectFromCwd(cwd, central);
|
|
if (!detected) {
|
|
throw new Error(
|
|
`No fusion project found in current directory. Use --project or run from a project directory.`
|
|
);
|
|
}
|
|
|
|
const isRegistered = Boolean(detected.id);
|
|
const store = isRegistered
|
|
? await getStoreForProject(detected.id, detected.path, globalDir)
|
|
: await createLocalStore(detected.path, globalDir);
|
|
|
|
// For unregistered projects, use the path as the project ID
|
|
const projectId = isRegistered ? detected.id : detected.path;
|
|
|
|
const owner = storeOwners.get(store);
|
|
if (owner && !owner.central) {
|
|
owner.central = central;
|
|
centralRetained = true;
|
|
}
|
|
|
|
return {
|
|
projectId,
|
|
projectPath: detected.path,
|
|
projectName: detected.name,
|
|
isRegistered,
|
|
store,
|
|
};
|
|
}
|
|
|
|
const store = await getStoreForProject(project.id, project.path, globalDir);
|
|
const owner = storeOwners.get(store);
|
|
if (owner && !owner.central) {
|
|
owner.central = central;
|
|
centralRetained = true;
|
|
}
|
|
|
|
return {
|
|
projectId: project.id,
|
|
projectPath: project.path,
|
|
projectName: project.name,
|
|
isRegistered: true,
|
|
store,
|
|
};
|
|
} finally {
|
|
if (!centralRetained) await central.close();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Get the default project from global settings.
|
|
* Returns undefined if no default is set or if the project no longer exists.
|
|
*/
|
|
export async function getDefaultProject(globalDir?: string): Promise<RegisteredProject | undefined> {
|
|
const globalStore = new GlobalSettingsStore(globalDir);
|
|
await globalStore.init();
|
|
|
|
const settings = await globalStore.getSettings();
|
|
if (!settings.defaultProjectId) {
|
|
return undefined;
|
|
}
|
|
|
|
const central = new CentralCore(globalDir);
|
|
await central.init();
|
|
try {
|
|
return await central.getProject(settings.defaultProjectId);
|
|
} finally {
|
|
await central.close();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Set the default project in global settings.
|
|
* @param projectId - Project ID to set as default
|
|
* @throws Error if project not found
|
|
*/
|
|
export async function setDefaultProject(projectId: string, globalDir?: string): Promise<void> {
|
|
// Verify project exists
|
|
const central = new CentralCore(globalDir);
|
|
await central.init();
|
|
try {
|
|
const project = await central.getProject(projectId);
|
|
if (!project) {
|
|
throw new Error(`Project '${projectId}' not found.`);
|
|
}
|
|
} finally {
|
|
await central.close();
|
|
}
|
|
|
|
const globalStore = new GlobalSettingsStore(globalDir);
|
|
await globalStore.init();
|
|
await globalStore.updateSettings({ defaultProjectId: projectId });
|
|
}
|
|
|
|
/**
|
|
* Clear the default project setting.
|
|
*/
|
|
export async function clearDefaultProject(globalDir?: string): Promise<void> {
|
|
const globalStore = new GlobalSettingsStore(globalDir);
|
|
await globalStore.init();
|
|
const current = await globalStore.getSettings();
|
|
|
|
const { defaultProjectId: _, ...rest } = current;
|
|
await globalStore.updateSettings(rest as Record<string, unknown>);
|
|
}
|
|
|
|
/**
|
|
* Detect a project from the current working directory by walking up
|
|
* the directory tree looking for a PostgreSQL-era project identity marker.
|
|
*
|
|
* @param cwd - Starting directory (typically process.cwd())
|
|
* @param central - Initialized CentralCore instance
|
|
* @returns Registered project if found, undefined otherwise
|
|
*/
|
|
export async function detectProjectFromCwd(
|
|
cwd: string,
|
|
central: CentralCore
|
|
): Promise<RegisteredProject | { id: string; name: string; path: string } | undefined> {
|
|
const startDir = resolve(cwd);
|
|
let currentDir = startDir;
|
|
|
|
// Walk up the directory tree
|
|
while (true) {
|
|
// FNXC:ProjectIdentityMarker 2026-07-14-17:20: CWD discovery is marker-first;
|
|
// an openable fusion.db remains recognized only to migrate older projects.
|
|
const fusionDir = resolve(currentDir, ".fusion");
|
|
const legacyDbPath = resolve(fusionDir, "fusion.db");
|
|
if (hasProjectIdentity(fusionDir) || isValidSqliteDatabaseFile(legacyDbPath)) {
|
|
// Found a fn project - check if it's registered
|
|
const project = await central.getProjectByPath(currentDir);
|
|
if (project) {
|
|
return project;
|
|
}
|
|
|
|
// For unregistered projects, only accept an exact CWD match.
|
|
// This preserves legacy single-project behavior without accidentally
|
|
// resolving unrelated parent directories higher in the filesystem.
|
|
if (currentDir === startDir) {
|
|
return {
|
|
id: "",
|
|
name: basename(currentDir) || "current-project",
|
|
path: currentDir,
|
|
};
|
|
}
|
|
}
|
|
|
|
// Move up to parent
|
|
const parentDir = dirname(currentDir);
|
|
if (parentDir === currentDir) {
|
|
// Reached root, stop
|
|
break;
|
|
}
|
|
currentDir = parentDir;
|
|
}
|
|
|
|
return undefined;
|
|
}
|
|
|
|
/**
|
|
* Find a project by name (case-insensitive) or ID (exact match).
|
|
*/
|
|
async function findProjectByNameOrId(
|
|
central: CentralCore,
|
|
nameOrId: string
|
|
): Promise<RegisteredProject | undefined> {
|
|
// First try exact ID match
|
|
const byId = await central.getProject(nameOrId);
|
|
if (byId) {
|
|
return byId;
|
|
}
|
|
|
|
// Then try case-insensitive name match
|
|
const allProjects = await central.listProjects();
|
|
const lowerName = nameOrId.toLowerCase();
|
|
return allProjects.find((p) => p.name.toLowerCase() === lowerName);
|
|
}
|
|
|
|
/**
|
|
* Get or create a TaskStore for a project.
|
|
* Stores are cached by project ID to avoid re-initialization.
|
|
*
|
|
* @param projectId - Project ID for cache key
|
|
* @param projectPath - Absolute path to project directory
|
|
* @returns Initialized TaskStore
|
|
*/
|
|
export async function getStoreForProject(
|
|
projectId: string,
|
|
projectPath: string,
|
|
globalSettingsDir?: string,
|
|
): Promise<TaskStore> {
|
|
// Check cache first
|
|
const cached = storeCache.get(projectId);
|
|
if (cached) {
|
|
return cached;
|
|
}
|
|
|
|
// FNXC:PostgresCutover 2026-07-04: delegate construction to createLocalStore,
|
|
// which boots the PostgreSQL backend via createTaskStoreForBackend (embedded
|
|
// by default, external via DATABASE_URL) instead of a legacy SQLite TaskStore
|
|
// whose runtime was removed under VAL-REMOVAL-005. Caching the resulting store
|
|
// keeps a single connection pool per project for the CLI process lifetime.
|
|
const store = await createLocalStore(projectPath, globalSettingsDir);
|
|
|
|
// Cache it
|
|
storeCache.set(projectId, store);
|
|
return store;
|
|
}
|
|
|
|
/**
|
|
* Clear the store cache. Useful for testing or memory management.
|
|
*/
|
|
export async function clearStoreCache(): Promise<void> {
|
|
const stores = [...storeCache.values()];
|
|
storeCache.clear();
|
|
await Promise.allSettled(stores.map(async (store) => {
|
|
await closeOwnedProjectStore(store);
|
|
}));
|
|
}
|
|
|
|
export async function createLocalStore(
|
|
projectPath: string,
|
|
globalSettingsDir?: string,
|
|
): Promise<TaskStore> {
|
|
// FNXC:PostgresCutover 2026-07-04: route through createTaskStoreForBackend so
|
|
// standalone CLI commands (and resolveProject().store) boot PostgreSQL instead
|
|
// of the removed SQLite runtime.
|
|
// FNXC:PostgresCutover 2026-07-05-12:00: exported so CLI command
|
|
// catch-fallbacks (task/pr/backup/memory-backup/branch-group/mcp) boot their
|
|
// cwd-rooted store through the same factory instead of constructing a legacy
|
|
// SQLite TaskStore directly (its runtime throws in backend mode).
|
|
const boot = await createTaskStoreForBackend({ rootDir: projectPath, globalSettingsDir });
|
|
/* FNXC:PostgresCliLifecycle 2026-07-14-18:07: CLI project contexts return only TaskStore, so retain the factory owner handle in a WeakMap and release it whenever closeProjectStore closes that context. */
|
|
storeOwners.set(boot.taskStore, { backendShutdown: boot.shutdown });
|
|
return boot.taskStore;
|
|
}
|
|
|
|
/**
|
|
* Format a project for display in CLI output.
|
|
*
|
|
* @param project - Registered project
|
|
* @param isDefault - Whether this is the default project
|
|
* @returns Formatted string like "* my-app /path/to/project [active]"
|
|
*/
|
|
export function formatProjectLine(project: RegisteredProject, isDefault: boolean): string {
|
|
const marker = isDefault ? "* " : " ";
|
|
const status = project.status;
|
|
const name = project.name;
|
|
const path = project.path;
|
|
return `${marker}${name} ${path} [${status}]`;
|
|
}
|
|
|
|
/**
|
|
* Get a TaskStore for a project specified by name or the current directory.
|
|
* This is a convenience function for commands that need a store.
|
|
*
|
|
* @param projectName - Optional project name/ID from --project flag
|
|
* @param cwd - Current working directory
|
|
* @returns Initialized TaskStore
|
|
*/
|
|
export async function getStore(
|
|
projectName?: string,
|
|
cwd: string = process.cwd(),
|
|
globalDir?: string,
|
|
): Promise<TaskStore> {
|
|
const context = await resolveProject(projectName, cwd, globalDir);
|
|
return context.store;
|
|
}
|
|
|
|
/**
|
|
* Resolve the AgentStore rootDir + backend AsyncDataLayer for agent CLI commands.
|
|
*
|
|
* FNXC:PostgresCutover 2026-07-04: agent commands (stop/start, export, import)
|
|
* must construct AgentStore in backend mode so agent data lives in PostgreSQL,
|
|
* not the removed SQLite runtime (VAL-REMOVAL-005). The asyncLayer is borrowed
|
|
* from the resolved project's TaskStore (same connection pool), mirroring the
|
|
* extension.ts getAgentStore injection. Resolution and PostgreSQL failures are
|
|
* surfaced to the command; a layerless SQLite AgentStore is never constructed.
|
|
*/
|
|
export async function resolveAgentStoreBase(
|
|
projectName?: string,
|
|
): Promise<{ rootDir: string; asyncLayer: AsyncDataLayer; cleanup: () => Promise<void> }> {
|
|
/* FNXC:PostgresCliLifecycle 2026-07-14-19:10: Agent, message, and chat commands must surface project/PostgreSQL resolution failures and borrow a non-null layer only while retaining an explicit asynchronous owner cleanup. */
|
|
const context = await resolveProject(projectName);
|
|
const asyncLayer = context.store.getAsyncLayer();
|
|
if (!asyncLayer) {
|
|
await closeProjectStore(context);
|
|
throw new Error(`PostgreSQL AsyncDataLayer unavailable for ${context.projectPath}`);
|
|
}
|
|
return {
|
|
rootDir: context.projectPath,
|
|
asyncLayer,
|
|
cleanup: () => closeProjectStore(context),
|
|
};
|
|
}
|
|
|
|
/**
|
|
* FNXC:CliAgentControl 2026-07-08-00:00:
|
|
* Close a resolved project's `TaskStore` and evict it from `storeCache` when
|
|
* it is that store's owner. `resolveProject()` always constructs (and, for
|
|
* registered/CWD-detected projects, caches) a `TaskStore` even when a caller
|
|
* only needs the resolved `projectPath` — e.g. `fn agent stop/start`
|
|
* (packages/cli/src/commands/agent.ts) never touches `context.store` at all.
|
|
* An unclosed cached store keeps the underlying SQLite connection (and any
|
|
* handles it owns) alive, which can keep the CLI process's event loop alive
|
|
* past the point where the command's real work is done — the process never
|
|
* exits on its own, so a caller bounding the subprocess with a timeout (e.g.
|
|
* a recovery watcher) sees a false "hang" until it force-kills at its own
|
|
* deadline. Close+evict is best-effort and idempotent so it is safe even if
|
|
* another in-process caller already holds/closed the same cached instance.
|
|
*/
|
|
export async function closeProjectStore(context: ProjectContext): Promise<void> {
|
|
await closeOwnedProjectStore(context.store);
|
|
if (storeCache.get(context.projectId) === context.store) {
|
|
storeCache.delete(context.projectId);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* FNXC:CliAgentControl 2026-07-08-00:00:
|
|
* Resolve only the project PATH without leaking the `TaskStore` that
|
|
* `resolveProject()` constructs internally. Use this instead of
|
|
* `resolveProject()` when a command has no use for `context.store` (see
|
|
* `closeProjectStore` above for the underlying leak this avoids).
|
|
*/
|
|
export async function resolveProjectPathOnly(
|
|
projectNameFlag?: string,
|
|
cwd: string = process.cwd(),
|
|
globalDir?: string,
|
|
): Promise<string> {
|
|
const context = await resolveProject(projectNameFlag, cwd, globalDir);
|
|
await closeProjectStore(context);
|
|
return context.projectPath;
|
|
}
|
|
|
|
/**
|
|
* FNXC:CliBoardMutation 2026-07-09-00:00:
|
|
* Wrap an already-constructed, UNCACHED local `TaskStore` (the CWD-fallback
|
|
* branch several board command files build directly via
|
|
* `new TaskStore(process.cwd())` when `resolveProject` throws — e.g.
|
|
* `getBranchGroupContext`/`getPrContext` in `packages/cli/src/commands/
|
|
* branch-group.ts`/`pr.ts`, FN-7738) as a well-formed `ProjectContext` so
|
|
* `closeProjectStore` can close+evict it the same way it handles a cached
|
|
* context, even though `storeCache` holds no matching entry for it (eviction
|
|
* is then a harmless no-op; the `.close()` call is what matters). Mirrors
|
|
* `packages/cli/src/commands/task.ts`'s private `asLocalProjectContext`
|
|
* helper (kept private there per FN-7734/FN-7738 scope boundaries — this
|
|
* export exists so `branch-group.ts`/`pr.ts` do not need to fork a second
|
|
* copy).
|
|
*/
|
|
export function asLocalProjectContext(store: TaskStore): ProjectContext {
|
|
const cwd = process.cwd();
|
|
return {
|
|
projectId: cwd,
|
|
projectPath: cwd,
|
|
projectName: basename(cwd) || "current-project",
|
|
isRegistered: false,
|
|
store,
|
|
};
|
|
}
|