mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-10-06 23:49:41 +02:00
Backs the welcome-screen "Resume Conversation" list with the new GET /api/sessions/unified endpoint instead of /api/history/sessions, so it shows the COMPLETE set (live + persisted + non-Claude + closed history) newest-first with richer context, rather than only Claude transcripts. - terminal-ui.js: new _fetchUnifiedSessions(); loadHistorySessions() now uses it. _buildHistoryItem upgraded to the unified shape (kept backward-compatible with the folder-modal's old shape): title = name || firstPrompt || dir; a mode badge + a LIVE badge (sources includes 'live'); timestamp from lastActivityAt (falls back to lastModified); size only when present; detail panel + "View all in this folder" preserved (gated on projectKey). Resume branches: an open live session selects its tab, a closed one resumes. - unified-session-service.ts + endpoint: pass projectKey through the history source so the folder drill-down survives. - styles.css: .history-item-badges / -badge / -badge-live pills. Verified: tsc 0, lint 0, frontend-syntax + public-asset format clean, service tests 13/13 (+projectKey), route tests 4/4. Playwright on an isolated beta: the welcome list renders real items from /api/sessions/unified, and the renderer produces the tab-name title + codex mode badge + visible LIVE badge, omits LIVE on closed items, keeps "View all in folder", and routes resume correctly (open->select tab, closed->resume). Persistent panel + live SSE status are later units.
261 lines
9.0 KiB
TypeScript
261 lines
9.0 KiB
TypeScript
/**
|
|
* @fileoverview Pure merge/filter logic for the unified session list (COD-121).
|
|
*
|
|
* Combines four read-only views of a session — live (in-memory `Session`),
|
|
* persisted (`state.json`), transcript history (`~/.claude/projects`), and the
|
|
* lifecycle audit log — plus mux process stats, into one de-duplicated list
|
|
* keyed by sessionId. Transcript-history rows are keyed by the Claude
|
|
* conversation UUID (the `.jsonl` filename stem), which diverges from the
|
|
* Codeman id for resumed sessions — an alias map (claudeSessionId → Codeman id,
|
|
* built from the live/persisted views) folds them into the owning session item.
|
|
* Higher-precedence sources overwrite scalar fields when present
|
|
* (history < lifecycle < persisted < live), while the `sources` array
|
|
* always accumulates every contributing view. A "meaningfulness floor" drops
|
|
* noise (bare lifecycle/mux-only rows with no name and no first prompt).
|
|
*
|
|
* PURE: no fs/IO and no node imports. All IO happens in the route that feeds
|
|
* this module its inputs, which keeps the merge/sort/filter behavior unit-testable.
|
|
*/
|
|
|
|
export type UnifiedSessionItem = {
|
|
sessionId: string;
|
|
name?: string;
|
|
mode?: string;
|
|
status?: string;
|
|
isWorking?: boolean;
|
|
workingDir?: string;
|
|
createdAt?: number;
|
|
lastActivityAt?: number;
|
|
claudeSessionId?: string;
|
|
firstPrompt?: string;
|
|
sizeBytes?: number;
|
|
projectKey?: string;
|
|
remote?: boolean;
|
|
sources: string[];
|
|
stats?: { memoryMB: number; cpuPercent: number };
|
|
};
|
|
|
|
/** Live in-memory session view (subset of `Session.toState()`). */
|
|
export type LiveSessionInput = {
|
|
id: string;
|
|
name?: string;
|
|
mode?: string;
|
|
status?: string;
|
|
isWorking?: boolean;
|
|
workingDir?: string;
|
|
createdAt?: number;
|
|
lastActivityAt?: number;
|
|
claudeSessionId?: string;
|
|
};
|
|
|
|
/** Persisted session view (subset of `SessionState`). */
|
|
export type PersistedSessionInput = {
|
|
id: string;
|
|
name?: string;
|
|
mode?: string;
|
|
status?: string;
|
|
workingDir?: string;
|
|
createdAt?: number;
|
|
lastActivityAt?: number;
|
|
/** Claude conversation ID this session resumes (`SessionState.resumeSessionId`). */
|
|
claudeSessionId?: string;
|
|
};
|
|
|
|
/** Lifecycle audit-log view. Entries are expected NEWEST-first (the order `SessionLifecycleLog.query()` returns). */
|
|
export type LifecycleInput = {
|
|
sessionId: string;
|
|
name?: string;
|
|
mode?: string;
|
|
ts: number;
|
|
event?: string;
|
|
};
|
|
|
|
/** Transcript-history view (one `.jsonl` per session). */
|
|
export type HistoryInput = {
|
|
sessionId: string;
|
|
workingDir: string;
|
|
sizeBytes: number;
|
|
lastModified: string;
|
|
firstPrompt?: string;
|
|
projectKey?: string;
|
|
};
|
|
|
|
/** Mux process-stat view. */
|
|
export type MuxStatInput = {
|
|
sessionId: string;
|
|
muxName?: string;
|
|
mode?: string;
|
|
stats?: { memoryMB: number; cpuPercent: number };
|
|
remote?: boolean;
|
|
};
|
|
|
|
export type UnifiedSources = {
|
|
live?: LiveSessionInput[];
|
|
persisted?: PersistedSessionInput[];
|
|
lifecycle?: LifecycleInput[];
|
|
history?: HistoryInput[];
|
|
mux?: MuxStatInput[];
|
|
};
|
|
|
|
/** Push a source tag onto an item exactly once. */
|
|
function addSource(item: UnifiedSessionItem, source: string): void {
|
|
if (!item.sources.includes(source)) item.sources.push(source);
|
|
}
|
|
|
|
/** Get-or-create the accumulator item for a sessionId. */
|
|
function ensureItem(map: Map<string, UnifiedSessionItem>, sessionId: string): UnifiedSessionItem {
|
|
let item = map.get(sessionId);
|
|
if (!item) {
|
|
item = { sessionId, sources: [] };
|
|
map.set(sessionId, item);
|
|
}
|
|
return item;
|
|
}
|
|
|
|
/** Overwrite a scalar field only when the incoming value is defined. */
|
|
function overwrite<K extends keyof UnifiedSessionItem>(
|
|
item: UnifiedSessionItem,
|
|
key: K,
|
|
value: UnifiedSessionItem[K] | undefined
|
|
): void {
|
|
if (value !== undefined) item[key] = value;
|
|
}
|
|
|
|
/**
|
|
* Merge all source views into one list, applying precedence
|
|
* (history → lifecycle → persisted → live) and the meaningfulness floor.
|
|
*/
|
|
export function mergeUnifiedSessions(sources: UnifiedSources): UnifiedSessionItem[] {
|
|
const map = new Map<string, UnifiedSessionItem>();
|
|
|
|
// Alias map: Claude conversation UUID → owning Codeman session id. Resumed
|
|
// (claudeSessionId = resumeSessionId != id) and /clear-respawned sessions
|
|
// would otherwise surface twice — once as a live/persisted row and once as a
|
|
// separate history-only row keyed by the conversation UUID. Live wins over
|
|
// persisted on conflicting entries (registered last).
|
|
const aliasToOwner = new Map<string, string>();
|
|
for (const p of sources.persisted ?? []) {
|
|
if (p.claudeSessionId !== undefined && p.claudeSessionId !== p.id) aliasToOwner.set(p.claudeSessionId, p.id);
|
|
}
|
|
for (const v of sources.live ?? []) {
|
|
if (v.claudeSessionId !== undefined && v.claudeSessionId !== v.id) aliasToOwner.set(v.claudeSessionId, v.id);
|
|
}
|
|
const resolveId = (sessionId: string): string => aliasToOwner.get(sessionId) ?? sessionId;
|
|
|
|
// 1) history (lowest precedence; keys resolve through the alias map)
|
|
for (const h of sources.history ?? []) {
|
|
const item = ensureItem(map, resolveId(h.sessionId));
|
|
addSource(item, 'history');
|
|
overwrite(item, 'workingDir', h.workingDir);
|
|
overwrite(item, 'sizeBytes', h.sizeBytes);
|
|
overwrite(item, 'firstPrompt', h.firstPrompt);
|
|
overwrite(item, 'projectKey', h.projectKey);
|
|
const ms = Date.parse(h.lastModified);
|
|
if (!Number.isNaN(ms) && item.lastActivityAt === undefined) item.lastActivityAt = ms;
|
|
}
|
|
|
|
// 2) lifecycle — entries arrive NEWEST-first, so first-seen wins for
|
|
// name/mode (mirrors the lastActivityAt guard); unconditional overwrites
|
|
// would leave the OLDEST entry in the window (stale name/mode) standing.
|
|
for (const l of sources.lifecycle ?? []) {
|
|
const item = ensureItem(map, resolveId(l.sessionId));
|
|
addSource(item, 'lifecycle');
|
|
if (item.name === undefined) overwrite(item, 'name', l.name);
|
|
if (item.mode === undefined) overwrite(item, 'mode', l.mode);
|
|
if (item.lastActivityAt === undefined && typeof l.ts === 'number') item.lastActivityAt = l.ts;
|
|
}
|
|
|
|
// 3) persisted
|
|
for (const p of sources.persisted ?? []) {
|
|
const item = ensureItem(map, p.id);
|
|
addSource(item, 'persisted');
|
|
overwrite(item, 'name', p.name);
|
|
overwrite(item, 'mode', p.mode);
|
|
overwrite(item, 'status', p.status);
|
|
overwrite(item, 'workingDir', p.workingDir);
|
|
overwrite(item, 'createdAt', p.createdAt);
|
|
overwrite(item, 'lastActivityAt', p.lastActivityAt);
|
|
}
|
|
|
|
// 4) live (highest precedence)
|
|
for (const v of sources.live ?? []) {
|
|
const item = ensureItem(map, v.id);
|
|
addSource(item, 'live');
|
|
overwrite(item, 'name', v.name);
|
|
overwrite(item, 'mode', v.mode);
|
|
overwrite(item, 'status', v.status);
|
|
overwrite(item, 'isWorking', v.isWorking);
|
|
overwrite(item, 'workingDir', v.workingDir);
|
|
overwrite(item, 'createdAt', v.createdAt);
|
|
overwrite(item, 'lastActivityAt', v.lastActivityAt);
|
|
overwrite(item, 'claudeSessionId', v.claudeSessionId);
|
|
}
|
|
|
|
// 5) mux stats + remote flag (create item if mux-only)
|
|
for (const m of sources.mux ?? []) {
|
|
const item = ensureItem(map, m.sessionId);
|
|
addSource(item, 'mux');
|
|
overwrite(item, 'mode', m.mode);
|
|
if (m.stats) item.stats = m.stats;
|
|
if (m.remote !== undefined) item.remote = m.remote;
|
|
}
|
|
|
|
// Meaningfulness floor: keep real rows, drop bare lifecycle/mux-only noise.
|
|
const kept: UnifiedSessionItem[] = [];
|
|
for (const item of map.values()) {
|
|
const isReal =
|
|
item.sources.includes('live') ||
|
|
item.sources.includes('persisted') ||
|
|
item.sources.includes('history') ||
|
|
(item.firstPrompt !== undefined && item.firstPrompt !== '');
|
|
if (isReal) kept.push(item);
|
|
}
|
|
|
|
// Stable sort: lastActivityAt desc (undefined last), createdAt desc, sessionId asc.
|
|
kept.sort((a, b) => {
|
|
const la = a.lastActivityAt;
|
|
const lb = b.lastActivityAt;
|
|
if (la !== lb) {
|
|
if (la === undefined) return 1;
|
|
if (lb === undefined) return -1;
|
|
return lb - la;
|
|
}
|
|
const ca = a.createdAt;
|
|
const cb = b.createdAt;
|
|
if (ca !== cb) {
|
|
if (ca === undefined) return 1;
|
|
if (cb === undefined) return -1;
|
|
return cb - ca;
|
|
}
|
|
return a.sessionId < b.sessionId ? -1 : a.sessionId > b.sessionId ? 1 : 0;
|
|
});
|
|
|
|
return kept;
|
|
}
|
|
|
|
/**
|
|
* Case-insensitive substring filter (name + firstPrompt + workingDir + sessionId)
|
|
* with offset/limit paging. `total` is the filtered count BEFORE paging.
|
|
*/
|
|
export function filterAndPaginate(
|
|
items: UnifiedSessionItem[],
|
|
opts: { q?: string; offset?: number; limit?: number }
|
|
): { sessions: UnifiedSessionItem[]; total: number } {
|
|
const q = (opts.q ?? '').trim().toLowerCase();
|
|
const filtered = q
|
|
? items.filter((it) => {
|
|
const hay = [it.name, it.firstPrompt, it.workingDir, it.sessionId]
|
|
.filter((v): v is string => typeof v === 'string')
|
|
.join(' ')
|
|
.toLowerCase();
|
|
return hay.includes(q);
|
|
})
|
|
: items;
|
|
|
|
const total = filtered.length;
|
|
const offset = Math.max(0, Math.floor(opts.offset ?? 0));
|
|
const limit = Math.min(500, Math.max(1, Math.floor(opts.limit ?? 100)));
|
|
const sessions = filtered.slice(offset, offset + limit);
|
|
return { sessions, total };
|
|
}
|