feat: add registry-driven Kimi provider
This commit is contained in:
tommy0103
+83
-157
@@ -10,6 +10,12 @@ import { createIndexerService } from './indexer-service.ts';
|
||||
import { createWorkerBuildIndex } from './indexer-worker-client.ts';
|
||||
import { buildRecapExportQuery } from './recap-capture-query.ts';
|
||||
import { acquireWriterLease, writerLockPathFor } from '../../../packages/core/src/writer-lease.ts';
|
||||
import { createBuiltinProviderRegistry } from '../../../packages/core/src/providers/builtins.ts';
|
||||
import {
|
||||
buildSourceCatalog,
|
||||
resolveProviderRoots,
|
||||
setPersistedSetting,
|
||||
} from './provider-settings.ts';
|
||||
import type {
|
||||
SessionPatchCursor,
|
||||
SessionPatchSnapshot,
|
||||
@@ -69,18 +75,18 @@ function acquireAppWriterLease(dbPath: string, waitMs = 0) {
|
||||
});
|
||||
}
|
||||
|
||||
function getConfiguredClaudeDir() {
|
||||
const persisted = loadPersistedSettings();
|
||||
return persisted.claudeDir || DEFAULT_CLAUDE_DIR;
|
||||
}
|
||||
|
||||
function getConfiguredCodexDir() {
|
||||
const persisted = loadPersistedSettings();
|
||||
return persisted.codexDir || DEFAULT_CODEX_DIR;
|
||||
}
|
||||
|
||||
function getPathsForClaudeDir(claudeDir = getConfiguredClaudeDir(), codexDir = getConfiguredCodexDir()) {
|
||||
function getRuntimePaths(persisted = loadPersistedSettings()) {
|
||||
const defaultRegistry = createBuiltinProviderRegistry({
|
||||
claude: DEFAULT_CLAUDE_DIR,
|
||||
codex: DEFAULT_CODEX_DIR,
|
||||
});
|
||||
const providerRoots = resolveProviderRoots(defaultRegistry, persisted);
|
||||
const providerRegistry = createBuiltinProviderRegistry(providerRoots);
|
||||
const claudeDir = providerRoots['claude'] ?? DEFAULT_CLAUDE_DIR;
|
||||
const codexDir = providerRoots['codex'] ?? DEFAULT_CODEX_DIR;
|
||||
return {
|
||||
providerRoots,
|
||||
providerRegistry,
|
||||
claudeDir,
|
||||
codexDir,
|
||||
dbPath: path.join(OBELISK_DIR, 'obelisk.sqlite'),
|
||||
@@ -89,7 +95,7 @@ function getPathsForClaudeDir(claudeDir = getConfiguredClaudeDir(), codexDir = g
|
||||
}
|
||||
|
||||
function migrateLegacyDbIfNeeded(
|
||||
paths = getPathsForClaudeDir(),
|
||||
paths = getRuntimePaths(),
|
||||
{ writerLeaseMode = 'acquire' }: { writerLeaseMode?: WriterLeaseMode } = {},
|
||||
) {
|
||||
if (fs.existsSync(paths.dbPath)) return;
|
||||
@@ -191,7 +197,7 @@ function closeDb() {
|
||||
}
|
||||
|
||||
function openDb(
|
||||
dbPath = getPathsForClaudeDir().dbPath,
|
||||
dbPath = getRuntimePaths().dbPath,
|
||||
{ writerLeaseMode = 'acquire' }: { writerLeaseMode?: WriterLeaseMode } = {},
|
||||
) {
|
||||
closeDb();
|
||||
@@ -212,7 +218,7 @@ function openDb(
|
||||
|
||||
function runAppDbWrite(work: () => void): boolean {
|
||||
if (!db) return false;
|
||||
const lease = acquireAppWriterLease(getPathsForClaudeDir().dbPath, 250);
|
||||
const lease = acquireAppWriterLease(getRuntimePaths().dbPath, 250);
|
||||
if (!lease) {
|
||||
throw new Error('Obelisk index writer is busy; memory change was not applied');
|
||||
}
|
||||
@@ -249,16 +255,16 @@ function appendWhere(sql, params, clause) {
|
||||
}
|
||||
|
||||
function startIndexerService({ buildOnStart = false } = {}) {
|
||||
const paths = getPathsForClaudeDir();
|
||||
const paths = getRuntimePaths();
|
||||
migrateLegacyDbIfNeeded(paths);
|
||||
const codexSessionsDir = path.join(paths.codexDir, 'sessions');
|
||||
indexerService = createIndexerService({
|
||||
projectsDir: paths.projectsDir,
|
||||
watchDirs: [paths.projectsDir, codexSessionsDir],
|
||||
watchDirs: paths.providerRegistry.watchRoots(paths.providerRoots),
|
||||
buildIndex: async ({ reason, changedPaths }) => {
|
||||
const result = await indexerWorker.buildIndex({
|
||||
reason,
|
||||
changedPaths,
|
||||
providerRoots: paths.providerRoots,
|
||||
claudeDir: paths.claudeDir,
|
||||
codexDir: paths.codexDir,
|
||||
projectsDir: paths.projectsDir,
|
||||
@@ -282,7 +288,7 @@ function startIndexerService({ buildOnStart = false } = {}) {
|
||||
|
||||
function startBackgroundResources({ runStartupBuild = false } = {}) {
|
||||
if (!indexerWorker) indexerWorker = createWorkerBuildIndex();
|
||||
const paths = getPathsForClaudeDir();
|
||||
const paths = getRuntimePaths();
|
||||
migrateLegacyDbIfNeeded(paths);
|
||||
openDb(paths.dbPath);
|
||||
if (!indexerService) {
|
||||
@@ -575,87 +581,25 @@ ipcMain.handle('db:getMemories', () => {
|
||||
|
||||
ipcMain.handle('db:getMessageFullText', (_, uuid) => {
|
||||
if (!db) return null;
|
||||
const msg = db.prepare('SELECT session_id, agent_id, source FROM messages WHERE uuid=?').get(uuid);
|
||||
const msg = db.prepare('SELECT * FROM messages WHERE uuid=?').get(uuid);
|
||||
if (!msg) return null;
|
||||
|
||||
if (msg.source === 'codex' || String(uuid).startsWith('codex:')) {
|
||||
const match = /^codex:([^:]+):(\d+)$/.exec(String(uuid));
|
||||
if (!match) return null;
|
||||
const rawThreadId = match[1];
|
||||
const targetLine = Number(match[2]);
|
||||
let jsonlPath: string | null = null;
|
||||
if (!msg.agent_id) {
|
||||
jsonlPath = db.prepare('SELECT jsonl_path FROM sessions WHERE id=?').get(msg.session_id)?.jsonl_path || null;
|
||||
}
|
||||
if (!jsonlPath) {
|
||||
jsonlPath = db.prepare(`
|
||||
SELECT jsonl_path FROM index_state
|
||||
WHERE jsonl_path LIKE ? AND jsonl_path LIKE '%.jsonl'
|
||||
ORDER BY length(jsonl_path) ASC
|
||||
LIMIT 1
|
||||
`).get(`%${rawThreadId}.jsonl`)?.jsonl_path || null;
|
||||
}
|
||||
if (!jsonlPath || !fs.existsSync(jsonlPath)) return null;
|
||||
const lines = fs.readFileSync(jsonlPath, 'utf-8').split('\n').filter(Boolean);
|
||||
const line = lines[targetLine - 1];
|
||||
if (!line) return null;
|
||||
try {
|
||||
const obj = JSON.parse(line);
|
||||
const payload = obj.payload || {};
|
||||
if (obj.type === 'event_msg') {
|
||||
if (typeof payload.message === 'string') return payload.message;
|
||||
if (typeof payload.text === 'string') return payload.text;
|
||||
}
|
||||
if (obj.type === 'response_item' && payload.type === 'message' && Array.isArray(payload.content)) {
|
||||
const parts = payload.content.map(b => b.text).filter(Boolean);
|
||||
return parts.join('\n') || null;
|
||||
}
|
||||
} catch {}
|
||||
return null;
|
||||
}
|
||||
|
||||
// Resolve JSONL path
|
||||
let jsonlPath: string | null = null;
|
||||
if (msg.agent_id) {
|
||||
const wa = db.prepare('SELECT agent_id, run_id, session_id FROM workflow_agents WHERE agent_id=?').get(msg.agent_id);
|
||||
if (wa) {
|
||||
const ses = db.prepare('SELECT jsonl_path FROM sessions WHERE id=?').get(wa.session_id);
|
||||
if (ses) jsonlPath = path.join(path.dirname(ses.jsonl_path), wa.session_id, 'subagents', 'workflows', wa.run_id, wa.agent_id + '.jsonl');
|
||||
}
|
||||
if (!jsonlPath) {
|
||||
const sa = db.prepare('SELECT agent_id, session_id FROM subagents WHERE agent_id=?').get(msg.agent_id);
|
||||
if (sa) {
|
||||
const ses = db.prepare('SELECT jsonl_path FROM sessions WHERE id=?').get(sa.session_id);
|
||||
if (ses) jsonlPath = path.join(path.dirname(ses.jsonl_path), sa.session_id, 'subagents', sa.agent_id + '.jsonl');
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!jsonlPath) {
|
||||
const ses = db.prepare('SELECT jsonl_path FROM sessions WHERE id=?').get(msg.session_id);
|
||||
if (ses) jsonlPath = ses.jsonl_path;
|
||||
}
|
||||
if (!jsonlPath || !fs.existsSync(jsonlPath)) return null;
|
||||
|
||||
// Scan JSONL for the message UUID and extract full text
|
||||
const data = fs.readFileSync(jsonlPath, 'utf-8');
|
||||
const lines = data.split('\n');
|
||||
for (const line of lines) {
|
||||
if (!line.includes(uuid)) continue;
|
||||
try {
|
||||
const obj = JSON.parse(line);
|
||||
if (obj.uuid !== uuid) continue;
|
||||
const content = obj.message?.content;
|
||||
if (typeof content === 'string') return content;
|
||||
if (!Array.isArray(content)) return null;
|
||||
const parts: string[] = [];
|
||||
for (const b of content) {
|
||||
if (b.type === 'text' && b.text) parts.push(b.text);
|
||||
else if (b.type === 'thinking' && b.thinking) parts.push(b.thinking);
|
||||
}
|
||||
return parts.join('\n') || null;
|
||||
} catch { continue; }
|
||||
}
|
||||
return null;
|
||||
const session = db.prepare('SELECT * FROM sessions WHERE id=?').get(msg.session_id) ?? null;
|
||||
const subagent = msg.agent_id
|
||||
? db.prepare('SELECT * FROM subagents WHERE agent_id=?').get(msg.agent_id) ?? null
|
||||
: null;
|
||||
const workflowAgent = msg.agent_id
|
||||
? db.prepare('SELECT * FROM workflow_agents WHERE agent_id=?').get(msg.agent_id) ?? null
|
||||
: null;
|
||||
const paths = getRuntimePaths();
|
||||
const raw = paths.providerRegistry.raw({
|
||||
source: msg.source || session?.source || 'claude',
|
||||
messageUuid: String(uuid),
|
||||
session,
|
||||
agentId: msg.agent_id || null,
|
||||
subagent,
|
||||
workflowAgent,
|
||||
});
|
||||
return raw?.messageText ?? msg.text ?? null;
|
||||
});
|
||||
|
||||
ipcMain.handle('db:readMemoryFile', (_, filePath) => {
|
||||
@@ -849,76 +793,59 @@ function savePersistedSettings(settings) {
|
||||
|
||||
ipcMain.handle('settings:get', () => {
|
||||
const persisted = loadPersistedSettings();
|
||||
const { claudeDir, codexDir, dbPath: dbFile } = getPathsForClaudeDir(
|
||||
persisted.claudeDir || DEFAULT_CLAUDE_DIR,
|
||||
persisted.codexDir || DEFAULT_CODEX_DIR,
|
||||
);
|
||||
const paths = getRuntimePaths(persisted);
|
||||
const { providerRoots, providerRegistry, claudeDir, codexDir, dbPath: dbFile } = paths;
|
||||
const recapDir = persisted.recapDir || RECAP_DIR;
|
||||
const claudeExists = fs.existsSync(claudeDir);
|
||||
const codexExists = fs.existsSync(codexDir);
|
||||
let claudeSessionCount = 0;
|
||||
let codexSessionCount = 0;
|
||||
let memoryCount = 0;
|
||||
let claudeLastIndexed = '';
|
||||
let codexLastIndexed = '';
|
||||
const sourceStats = new Map<string, { sessionCount: number; lastIndexed: string }>();
|
||||
|
||||
if (db) {
|
||||
try {
|
||||
claudeSessionCount = db.prepare("SELECT COUNT(*) as c FROM sessions WHERE COALESCE(source, 'claude') = 'claude'").get()?.c || 0;
|
||||
codexSessionCount = db.prepare("SELECT COUNT(*) as c FROM sessions WHERE source = 'codex'").get()?.c || 0;
|
||||
const rows = db.prepare(`
|
||||
SELECT COALESCE(source, 'claude') AS source,
|
||||
COUNT(*) AS session_count,
|
||||
MAX(started_at) AS last_indexed
|
||||
FROM sessions
|
||||
GROUP BY COALESCE(source, 'claude')
|
||||
`).all();
|
||||
for (const row of rows) {
|
||||
sourceStats.set(row.source, {
|
||||
sessionCount: row.session_count || 0,
|
||||
lastIndexed: row.last_indexed || '',
|
||||
});
|
||||
}
|
||||
memoryCount = db.prepare('SELECT COUNT(*) as c FROM memories WHERE deleted_at IS NULL').get()?.c || 0;
|
||||
const claudeLatest = db.prepare("SELECT MAX(started_at) as t FROM sessions WHERE COALESCE(source, 'claude') = 'claude'").get();
|
||||
claudeLastIndexed = claudeLatest?.t || '';
|
||||
const codexLatest = db.prepare("SELECT MAX(started_at) as t FROM sessions WHERE source = 'codex'").get();
|
||||
codexLastIndexed = codexLatest?.t || '';
|
||||
} catch {}
|
||||
}
|
||||
const sources = buildSourceCatalog({
|
||||
registry: providerRegistry,
|
||||
roots: providerRoots,
|
||||
stats: sourceStats,
|
||||
pathExists: fs.existsSync,
|
||||
});
|
||||
const sessionCount = sources.reduce((sum, source) => sum + source.sessionCount, 0);
|
||||
const lastIndexed = sources.map((source) => source.lastIndexed).filter(Boolean).sort().at(-1) || '';
|
||||
const connected = sources.some((source) => source.status !== 'error');
|
||||
|
||||
return {
|
||||
providerRoots,
|
||||
claudeDir,
|
||||
codexDir,
|
||||
dbPath: dbFile,
|
||||
recapDir,
|
||||
autoRefresh: persisted.autoRefresh !== false,
|
||||
sources: [
|
||||
{
|
||||
id: 'claude',
|
||||
name: 'Claude Code',
|
||||
vendor: 'Anthropic',
|
||||
path: claudeDir,
|
||||
exists: claudeExists,
|
||||
sessionCount: claudeSessionCount,
|
||||
lastIndexed: claudeLastIndexed,
|
||||
status: claudeExists ? 'ok' : 'error',
|
||||
statusText: claudeExists ? 'Connected' : 'Folder not found',
|
||||
},
|
||||
{
|
||||
id: 'codex',
|
||||
name: 'Codex',
|
||||
vendor: 'OpenAI',
|
||||
path: codexDir,
|
||||
exists: codexExists,
|
||||
sessionCount: codexSessionCount,
|
||||
lastIndexed: codexLastIndexed,
|
||||
status: codexExists ? (codexSessionCount > 0 ? 'ok' : 'warn') : 'error',
|
||||
statusText: codexExists ? (codexSessionCount > 0 ? 'Connected' : 'No sessions found') : 'Folder not found',
|
||||
},
|
||||
],
|
||||
sources,
|
||||
memoryCount,
|
||||
sessionCount: claudeSessionCount + codexSessionCount,
|
||||
lastIndexed: claudeLastIndexed,
|
||||
status: claudeExists ? 'ok' : 'error',
|
||||
statusText: claudeExists ? 'Connected' : 'Folder not found',
|
||||
sessionCount,
|
||||
lastIndexed,
|
||||
status: connected ? 'ok' : 'error',
|
||||
statusText: connected ? 'Connected' : 'No source folders found',
|
||||
};
|
||||
});
|
||||
|
||||
ipcMain.handle('settings:set', async (_, key, value) => {
|
||||
const persisted = loadPersistedSettings();
|
||||
if (value === null) {
|
||||
delete persisted[key];
|
||||
} else {
|
||||
persisted[key] = value;
|
||||
}
|
||||
const providerRootChanged = setPersistedSetting(persisted, key, value);
|
||||
savePersistedSettings(persisted);
|
||||
|
||||
if (key === 'autoRefresh') {
|
||||
@@ -930,12 +857,13 @@ ipcMain.handle('settings:set', async (_, key, value) => {
|
||||
}
|
||||
}
|
||||
|
||||
if (key === 'claudeDir' || key === 'codexDir') {
|
||||
const knownLegacyRootChanged = createBuiltinProviderRegistry({
|
||||
claude: DEFAULT_CLAUDE_DIR,
|
||||
codex: DEFAULT_CODEX_DIR,
|
||||
}).catalog().some((provider) => key === `${provider.id}Dir`);
|
||||
if (providerRootChanged || knownLegacyRootChanged) {
|
||||
await stopIndexerServiceAndWait();
|
||||
const paths = getPathsForClaudeDir(
|
||||
persisted.claudeDir || DEFAULT_CLAUDE_DIR,
|
||||
persisted.codexDir || DEFAULT_CODEX_DIR,
|
||||
);
|
||||
const paths = getRuntimePaths(persisted);
|
||||
migrateLegacyDbIfNeeded(paths);
|
||||
openDb(paths.dbPath);
|
||||
if (persisted.autoRefresh !== false) {
|
||||
@@ -951,7 +879,7 @@ ipcMain.handle('settings:browseFolder', async (event) => {
|
||||
if (!win) return null;
|
||||
const { filePaths } = await dialog.showOpenDialog(win, {
|
||||
properties: ['openDirectory'],
|
||||
title: 'Select Claude Code data folder',
|
||||
title: 'Select session data folder',
|
||||
});
|
||||
if (filePaths && filePaths[0]) return filePaths[0];
|
||||
return null;
|
||||
@@ -964,10 +892,7 @@ ipcMain.handle('settings:revealPath', (_, p) => {
|
||||
ipcMain.handle('settings:rebuildIndex', async () => {
|
||||
if (!indexerWorker) return null;
|
||||
const persisted = loadPersistedSettings();
|
||||
const paths = getPathsForClaudeDir(
|
||||
persisted.claudeDir || DEFAULT_CLAUDE_DIR,
|
||||
persisted.codexDir || DEFAULT_CODEX_DIR,
|
||||
);
|
||||
const paths = getRuntimePaths(persisted);
|
||||
const tempDbPath = rebuildTempDbPath(paths.dbPath);
|
||||
const shouldRestartWatcher = persisted.autoRefresh !== false;
|
||||
await stopIndexerServiceAndWait({ waitForIdle: false });
|
||||
@@ -1000,6 +925,7 @@ ipcMain.handle('settings:rebuildIndex', async () => {
|
||||
const result = await indexerWorker.buildIndex({
|
||||
reason: 'manual-rebuild',
|
||||
force: true,
|
||||
providerRoots: paths.providerRoots,
|
||||
claudeDir: paths.claudeDir,
|
||||
codexDir: paths.codexDir,
|
||||
projectsDir: paths.projectsDir,
|
||||
|
||||
@@ -74,11 +74,13 @@ function createIndexerService({
|
||||
const existingRoots = roots.filter(root => fs.existsSync(root));
|
||||
if (!existingRoots.length) return null;
|
||||
const watchers: any[] = [];
|
||||
const onFileChange = (filename) => {
|
||||
const name = filename ? String(filename) : '';
|
||||
if (!name || name.endsWith('.jsonl') || name.endsWith('.json')) onChange(name);
|
||||
};
|
||||
for (const root of existingRoots) {
|
||||
const onFileChange = (filename) => {
|
||||
const name = filename ? String(filename) : '';
|
||||
if (!name || name.endsWith('.jsonl') || name.endsWith('.json')) {
|
||||
onChange(name && !path.isAbsolute(name) ? path.join(root, name) : name);
|
||||
}
|
||||
};
|
||||
const watcher = (chokidar || chokidarModule).watch(root, {
|
||||
cwd: root,
|
||||
ignoreInitial: true,
|
||||
|
||||
+68
-318
@@ -3,12 +3,13 @@ import os from 'node:os';
|
||||
import path from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import Database from 'better-sqlite3';
|
||||
import { createBuiltinProviderRegistry } from '../../../packages/core/src/providers/builtins.ts';
|
||||
import type { ProviderRegistry } from '../../../packages/core/src/providers/registry.ts';
|
||||
import {
|
||||
CLAUDE_INPUT_TOKEN_SEMANTICS_MARKER,
|
||||
parse as claudeParse,
|
||||
} from '../../../packages/core/src/providers/claude.ts';
|
||||
import { parse as codexParse } from '../../../packages/core/src/providers/codex.ts';
|
||||
import { persist } from '../../../packages/core/src/persist.ts';
|
||||
createProviderIndexPlan,
|
||||
indexProviderPlan,
|
||||
writeProviderIndexMarkers,
|
||||
} from '../../../packages/core/src/provider-indexing.ts';
|
||||
import { runWriteTransaction, configureConnection, betterSqliteTransactionAdapter } from '../../../packages/core/src/tx.ts';
|
||||
import { acquireWriterLease, writerLockPathFor } from '../../../packages/core/src/writer-lease.ts';
|
||||
import { runRetryableWriteTransaction, isBeginBusyFailure, hasUnusableTransaction } from '../../../packages/core/src/write-coordinator.ts';
|
||||
@@ -17,9 +18,6 @@ import {
|
||||
isDir,
|
||||
readLines,
|
||||
codexDbId,
|
||||
codexRawId,
|
||||
codexParentThreadId,
|
||||
readCodexGuardianThreadInfo,
|
||||
} from '../../../packages/core/src/parsing.ts';
|
||||
|
||||
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
||||
@@ -31,16 +29,6 @@ const DEFAULT_DB_PATH = path.join(DEFAULT_OBELISK_DIR, 'obelisk.sqlite');
|
||||
const DEFAULT_PROJECTS_DIR = path.join(DEFAULT_CLAUDE_DIR, 'projects');
|
||||
const DEFAULT_HISTORY_PATH = path.join(DEFAULT_CLAUDE_DIR, 'history.jsonl');
|
||||
|
||||
interface FileInfo {
|
||||
path: string;
|
||||
sessionId?: string;
|
||||
project?: string;
|
||||
isSubagent?: boolean;
|
||||
agentId?: string;
|
||||
workflowRunId?: string;
|
||||
source?: string;
|
||||
}
|
||||
|
||||
function resolveSchemaPath() {
|
||||
const candidates = [
|
||||
path.join(__dirname, 'schema.sql'),
|
||||
@@ -119,54 +107,12 @@ function copyMemoriesFromDb(db, sourceDbPath) {
|
||||
}
|
||||
}
|
||||
|
||||
function discoverJsonlFiles({ projectsDir = DEFAULT_PROJECTS_DIR, changedPaths = undefined }: { projectsDir?: string; changedPaths?: string[] } = {}) {
|
||||
if (Array.isArray(changedPaths) && changedPaths.length) {
|
||||
const changedFiles = discoverJsonlFilesForChanges({ projectsDir, changedPaths });
|
||||
if (changedFiles.length) return changedFiles;
|
||||
}
|
||||
return discoverJsonlFilesFull({ projectsDir });
|
||||
}
|
||||
|
||||
function normalizeChangedPath(projectsDir, changedPath) {
|
||||
if (!changedPath) return null;
|
||||
const raw = String(changedPath);
|
||||
return path.isAbsolute(raw) ? path.normalize(raw) : path.normalize(path.join(projectsDir, raw));
|
||||
}
|
||||
|
||||
function jsonlFileInfoFromPath(projectsDir, changedPath) {
|
||||
let fp = normalizeChangedPath(projectsDir, changedPath);
|
||||
if (fp?.toLowerCase().endsWith('.meta.json')) {
|
||||
fp = fp.slice(0, -'.meta.json'.length) + '.jsonl';
|
||||
}
|
||||
if (!fp || !fp.endsWith('.jsonl')) return null;
|
||||
if (!fs.existsSync(fp)) return null;
|
||||
const rel = path.relative(projectsDir, fp);
|
||||
if (!rel || rel.startsWith('..') || path.isAbsolute(rel)) return null;
|
||||
const parts = rel.split(path.sep);
|
||||
const project = parts[0];
|
||||
if (!project) return null;
|
||||
if (parts.length === 2) {
|
||||
const filename = parts[1];
|
||||
return { path: fp, sessionId: filename.slice(0, -6), project, isSubagent: false };
|
||||
}
|
||||
if (parts.length === 4 && parts[2] === 'subagents') {
|
||||
const filename = parts[3];
|
||||
return { path: fp, sessionId: parts[1], project, isSubagent: true, agentId: filename.slice(0, -6) };
|
||||
}
|
||||
if (parts.length === 6 && parts[2] === 'subagents' && parts[3] === 'workflows') {
|
||||
const filename = parts[5];
|
||||
return {
|
||||
path: fp,
|
||||
sessionId: parts[1],
|
||||
project,
|
||||
isSubagent: true,
|
||||
agentId: filename.slice(0, -6),
|
||||
workflowRunId: parts[4],
|
||||
};
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
function sessionIdFromChangedPath(projectsDir, changedPath) {
|
||||
const fp = normalizeChangedPath(projectsDir, changedPath);
|
||||
if (!fp) return null;
|
||||
@@ -180,186 +126,6 @@ function sessionIdFromChangedPath(projectsDir, changedPath) {
|
||||
return null;
|
||||
}
|
||||
|
||||
function dedupeFileInfos(files) {
|
||||
const byPath = new Map();
|
||||
for (const file of files) byPath.set(file.path, file);
|
||||
return [...byPath.values()];
|
||||
}
|
||||
|
||||
function discoverJsonlFilesForChanges({ projectsDir = DEFAULT_PROJECTS_DIR, changedPaths = [] }: { projectsDir?: string; changedPaths?: string[] } = {}) {
|
||||
const files: FileInfo[] = [];
|
||||
for (const changedPath of changedPaths) {
|
||||
const info = jsonlFileInfoFromPath(projectsDir, changedPath);
|
||||
if (info) files.push(info);
|
||||
}
|
||||
return dedupeFileInfos(files);
|
||||
}
|
||||
|
||||
function discoverJsonlFilesFull({ projectsDir = DEFAULT_PROJECTS_DIR } = {}) {
|
||||
const files: FileInfo[] = [];
|
||||
if (!fs.existsSync(projectsDir)) return files;
|
||||
let projects;
|
||||
try { projects = fs.readdirSync(projectsDir); } catch { return files; }
|
||||
for (const proj of projects) {
|
||||
const projPath = path.join(projectsDir, proj);
|
||||
if (!isDir(projPath)) continue;
|
||||
let entries;
|
||||
try { entries = fs.readdirSync(projPath); } catch { continue; }
|
||||
for (const f of entries) {
|
||||
if (f.endsWith('.jsonl'))
|
||||
files.push({ path: path.join(projPath, f), sessionId: f.slice(0, -6), project: proj, isSubagent: false });
|
||||
}
|
||||
for (const sd of entries) {
|
||||
const saDir = path.join(projPath, sd, 'subagents');
|
||||
if (!isDir(saDir)) continue;
|
||||
let saEntries;
|
||||
try { saEntries = fs.readdirSync(saDir); } catch { continue; }
|
||||
for (const sf of saEntries) {
|
||||
if (sf.endsWith('.jsonl'))
|
||||
files.push({ path: path.join(saDir, sf), sessionId: sd, project: proj, isSubagent: true, agentId: sf.slice(0, -6) });
|
||||
}
|
||||
const wfRoot = path.join(saDir, 'workflows');
|
||||
if (!isDir(wfRoot)) continue;
|
||||
let wfDirs;
|
||||
try { wfDirs = fs.readdirSync(wfRoot); } catch { continue; }
|
||||
for (const wfDir of wfDirs) {
|
||||
const wfPath = path.join(wfRoot, wfDir);
|
||||
if (!isDir(wfPath)) continue;
|
||||
let wfEntries;
|
||||
try { wfEntries = fs.readdirSync(wfPath); } catch { continue; }
|
||||
for (const wf of wfEntries) {
|
||||
if (wf.endsWith('.jsonl'))
|
||||
files.push({ path: path.join(wfPath, wf), sessionId: sd, project: proj, isSubagent: true, agentId: wf.slice(0, -6), workflowRunId: wfDir });
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return files;
|
||||
}
|
||||
|
||||
function discoverCodexJsonlFiles({ codexDir = DEFAULT_CODEX_DIR, changedPaths = undefined }: { codexDir?: string; changedPaths?: string[] } = {}) {
|
||||
if (Array.isArray(changedPaths) && changedPaths.length) {
|
||||
const changedFiles = discoverCodexJsonlFilesForChanges({ codexDir, changedPaths });
|
||||
if (changedFiles.length) return changedFiles;
|
||||
return [];
|
||||
}
|
||||
return discoverCodexJsonlFilesFull({ codexDir });
|
||||
}
|
||||
|
||||
function codexSessionsDir(codexDir = DEFAULT_CODEX_DIR) {
|
||||
return path.join(codexDir, 'sessions');
|
||||
}
|
||||
|
||||
function normalizeChangedPathForRoot(rootDir, changedPath) {
|
||||
if (!changedPath) return null;
|
||||
const raw = String(changedPath);
|
||||
return path.isAbsolute(raw) ? path.normalize(raw) : path.normalize(path.join(rootDir, raw));
|
||||
}
|
||||
|
||||
function isPathInside(rootDir, candidate) {
|
||||
if (!rootDir || !candidate) return false;
|
||||
const rel = path.relative(rootDir, candidate);
|
||||
return !!rel && !rel.startsWith('..') && !path.isAbsolute(rel);
|
||||
}
|
||||
|
||||
function discoverCodexJsonlFilesForChanges({ codexDir = DEFAULT_CODEX_DIR, changedPaths = [] }: { codexDir?: string; changedPaths?: string[] } = {}) {
|
||||
const files: FileInfo[] = [];
|
||||
const sessionsDir = codexSessionsDir(codexDir);
|
||||
for (const changedPath of changedPaths) {
|
||||
const rootRelativePath = normalizeChangedPathForRoot(codexDir, changedPath);
|
||||
if (!rootRelativePath) continue;
|
||||
if (path.normalize(rootRelativePath) === path.join(codexDir, 'session_index.jsonl')) {
|
||||
return discoverCodexJsonlFilesFull({ codexDir });
|
||||
}
|
||||
const sessionRelativePath = normalizeChangedPathForRoot(sessionsDir, changedPath);
|
||||
const fp = isPathInside(sessionsDir, rootRelativePath) ? rootRelativePath : sessionRelativePath;
|
||||
if (!fp || !fp.endsWith(".jsonl") || !isPathInside(sessionsDir, fp)) continue;
|
||||
if (!fs.existsSync(fp)) continue;
|
||||
files.push({ path: fp, source: 'codex' });
|
||||
}
|
||||
return dedupeFileInfos(files);
|
||||
}
|
||||
|
||||
function discoverCodexJsonlFilesFull({ codexDir = DEFAULT_CODEX_DIR } = {}) {
|
||||
const root = codexSessionsDir(codexDir);
|
||||
const files: FileInfo[] = [];
|
||||
if (!fs.existsSync(root)) return files;
|
||||
const stack = [root];
|
||||
while (stack.length) {
|
||||
const current = stack.pop()!;
|
||||
let entries;
|
||||
try { entries = fs.readdirSync(current, { withFileTypes: true }); } catch { continue; }
|
||||
for (const entry of entries) {
|
||||
const fp = path.join(current, entry.name);
|
||||
if (entry.isDirectory()) {
|
||||
stack.push(fp);
|
||||
} else if (entry.isFile() && entry.name.endsWith('.jsonl')) {
|
||||
files.push({ path: fp, source: 'codex' });
|
||||
}
|
||||
}
|
||||
}
|
||||
return files.sort((a, b) => a.path.localeCompare(b.path));
|
||||
}
|
||||
|
||||
function needsReindex(db, fp) {
|
||||
const mt = fs.statSync(fp).mtimeMs;
|
||||
const row = db.prepare('SELECT mtime, lines_processed FROM index_state WHERE jsonl_path = ?').get(fp);
|
||||
if (!row) return { needed: true, skip: 0, mtime: mt };
|
||||
return mt > row.mtime ? { needed: true, skip: row.lines_processed, mtime: mt } : { needed: false, skip: 0, mtime: mt };
|
||||
}
|
||||
|
||||
// Index one Claude transcript via the shared provider + persist core.
|
||||
// Returns { sessionId, path } when reindexed, undefined when skipped.
|
||||
function indexClaudeFile(db, file, { forceFull = false } = {}) {
|
||||
const { needed, skip, mtime } = needsReindex(db, file.path);
|
||||
if (!needed && !forceFull) return undefined;
|
||||
const unit = {
|
||||
key: file.path,
|
||||
sessionId: file.sessionId,
|
||||
project: file.project,
|
||||
isSubagent: file.isSubagent,
|
||||
agentId: file.agentId,
|
||||
};
|
||||
const cursor = !forceFull && skip > 0 ? `${mtime}:${skip}` : null;
|
||||
persist(db, unit, claudeParse(unit, cursor));
|
||||
return { sessionId: file.sessionId, path: file.path };
|
||||
}
|
||||
|
||||
function codexSessionMeta(filePath) {
|
||||
let meta: any = null;
|
||||
readLines(filePath, (line) => {
|
||||
let obj;
|
||||
try { obj = JSON.parse(line); } catch { return; }
|
||||
if (obj?.type === 'session_meta' && obj.payload?.id) {
|
||||
meta = obj.payload;
|
||||
return false;
|
||||
}
|
||||
});
|
||||
return meta;
|
||||
}
|
||||
|
||||
// Index one Codex rollout via the shared provider + persist core (full reparse).
|
||||
// Returns { sessionId, path } when reindexed, undefined when skipped.
|
||||
function indexCodexFile(db, file) {
|
||||
const { needed } = needsReindex(db, file.path);
|
||||
const guardian = readCodexGuardianThreadInfo(file.path);
|
||||
if (!needed) {
|
||||
if (guardian) {
|
||||
persist(db, { key: file.path, sessionId: '' }, (function* () {
|
||||
yield { kind: "delete-session", sessionId: codexDbId(guardian.threadRawId) as string };
|
||||
return null;
|
||||
})());
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
const unit = { key: file.path, sessionId: '' };
|
||||
persist(db, unit, codexParse(unit, null));
|
||||
if (guardian) return undefined;
|
||||
const meta = codexSessionMeta(file.path);
|
||||
const sessionId = meta ? codexDbId(codexParentThreadId(meta) || codexRawId(meta.id)) : undefined;
|
||||
return { sessionId, path: file.path };
|
||||
}
|
||||
|
||||
function indexCodexSessionIndex(db, { codexDir = DEFAULT_CODEX_DIR } = {}) {
|
||||
const indexPath = path.join(codexDir, 'session_index.jsonl');
|
||||
if (!fs.existsSync(indexPath)) return;
|
||||
@@ -392,28 +158,6 @@ function refreshSessionProjectPaths(db) {
|
||||
}
|
||||
}
|
||||
|
||||
function indexSubagentMeta(db, fi) {
|
||||
if (!fi.isSubagent) return false;
|
||||
const mp = fi.path.replace('.jsonl', '.meta.json');
|
||||
if (!fs.existsSync(mp)) return false;
|
||||
let meta;
|
||||
try {
|
||||
meta = JSON.parse(fs.readFileSync(mp, 'utf8'));
|
||||
} catch (error) {
|
||||
console.warn(`Warning: failed to read subagent meta ${mp}: ${(error as Error).message}`);
|
||||
return false;
|
||||
}
|
||||
const tok = db.prepare('SELECT COALESCE(SUM(input_tokens),0)+COALESCE(SUM(output_tokens),0) as t FROM messages WHERE agent_id=?').get(fi.agentId);
|
||||
const ts = db.prepare('SELECT MIN(timestamp) as t0, MAX(timestamp) as t1 FROM messages WHERE agent_id=?').get(fi.agentId);
|
||||
const dur = ts?.t0 && ts?.t1 ? new Date(ts.t1).getTime() - new Date(ts.t0).getTime() : null;
|
||||
if (fi.workflowRunId) {
|
||||
db.prepare('INSERT OR REPLACE INTO workflow_agents (agent_id,run_id,session_id,agent_type,description) VALUES(?,?,?,?,?)').run(fi.agentId, fi.workflowRunId, fi.sessionId, meta.agentType||null, meta.description||null);
|
||||
} else {
|
||||
db.prepare('INSERT OR REPLACE INTO subagents VALUES(?,?,?,?,?,?,?)').run(fi.agentId, fi.sessionId, meta.toolUseId||null, meta.agentType||null, meta.description||null, dur, tok?.t||0);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function indexWorkflows(db, { projectsDir = DEFAULT_PROJECTS_DIR } = {}) {
|
||||
if (!fs.existsSync(projectsDir)) return;
|
||||
let projects;
|
||||
@@ -537,6 +281,8 @@ function writeHeartbeat({
|
||||
}
|
||||
|
||||
interface BuildIndexOptions {
|
||||
providerRoots?: Record<string, string>;
|
||||
providerRegistry?: ProviderRegistry;
|
||||
claudeDir?: string;
|
||||
codexDir?: string;
|
||||
projectsDir?: string;
|
||||
@@ -588,6 +334,8 @@ function deferredBuildResult(
|
||||
}
|
||||
|
||||
function buildIndex({
|
||||
providerRoots = {},
|
||||
providerRegistry,
|
||||
claudeDir = DEFAULT_CLAUDE_DIR,
|
||||
codexDir = path.join(path.dirname(claudeDir), '.codex'),
|
||||
projectsDir = path.join(claudeDir, 'projects'),
|
||||
@@ -620,30 +368,40 @@ function buildIndex({
|
||||
try {
|
||||
const db = openIndexDb({ dbPath, schemaPath, DatabaseImpl });
|
||||
const txDb = betterSqliteTransactionAdapter(db);
|
||||
const claudeInputMarkerMissing = !db.prepare(
|
||||
'SELECT jsonl_path FROM index_state WHERE jsonl_path = ?',
|
||||
).get(CLAUDE_INPUT_TOKEN_SEMANTICS_MARKER);
|
||||
const claudeInputSemanticsOutdated = claudeInputMarkerMissing && Boolean(db.prepare(`
|
||||
SELECT 1 FROM messages
|
||||
WHERE COALESCE(source, 'claude') = 'claude'
|
||||
AND (input_tokens IS NOT NULL OR output_tokens IS NOT NULL)
|
||||
LIMIT 1
|
||||
`).get());
|
||||
let messageFtsTriggersDropped = false;
|
||||
try {
|
||||
if (preserveDbPath && path.resolve(preserveDbPath) !== path.resolve(dbPath)) {
|
||||
copyMemoriesFromDb(db, preserveDbPath);
|
||||
}
|
||||
const files = [
|
||||
...discoverJsonlFiles({
|
||||
projectsDir,
|
||||
changedPaths: force || claudeInputSemanticsOutdated ? undefined : changedPaths,
|
||||
const defaultHome = os.homedir();
|
||||
const compatibilityHome = path.dirname(claudeDir);
|
||||
const relocatedDefaults = Object.fromEntries(
|
||||
createBuiltinProviderRegistry().catalog().map((descriptor) => {
|
||||
const relativeDefault = path.relative(defaultHome, descriptor.defaultRoot);
|
||||
const root = compatibilityHome !== defaultHome
|
||||
&& relativeDefault
|
||||
&& !relativeDefault.startsWith('..')
|
||||
&& !path.isAbsolute(relativeDefault)
|
||||
? path.join(compatibilityHome, relativeDefault)
|
||||
: descriptor.defaultRoot;
|
||||
return [descriptor.id, root];
|
||||
}),
|
||||
...discoverCodexJsonlFiles({ codexDir, changedPaths: force ? undefined : changedPaths }),
|
||||
];
|
||||
const latestSourceMtime = files.reduce((latest, file) => {
|
||||
);
|
||||
const roots = {
|
||||
...relocatedDefaults,
|
||||
claude: claudeDir,
|
||||
codex: codexDir,
|
||||
...providerRoots,
|
||||
};
|
||||
const registry = providerRegistry ?? createBuiltinProviderRegistry(roots);
|
||||
const providerPlan = createProviderIndexPlan(db, registry, { force, changedPaths });
|
||||
let latestSourceMtime = providerPlan.items.reduce((latest, { unit }) => {
|
||||
const providerCursor = (unit.meta as { currentCursor?: unknown } | undefined)?.currentCursor;
|
||||
if (typeof providerCursor === 'string') {
|
||||
return Math.max(latest, Number(providerCursor.split(':')[0]) || 0);
|
||||
}
|
||||
try {
|
||||
return Math.max(latest, fs.statSync(file.path).mtimeMs);
|
||||
return Math.max(latest, fs.statSync(unit.key).mtimeMs);
|
||||
} catch {
|
||||
return latest;
|
||||
}
|
||||
@@ -668,7 +426,7 @@ function buildIndex({
|
||||
} catch (error) {
|
||||
if (isBeginBusyFailure(error)) {
|
||||
return deferredBuildResult('database_busy', {
|
||||
files: files.length,
|
||||
files: providerPlan.items.length,
|
||||
latestSourceMtime,
|
||||
});
|
||||
}
|
||||
@@ -697,39 +455,34 @@ function buildIndex({
|
||||
}
|
||||
}
|
||||
const skipped: SkippedFile[] = [];
|
||||
let claudeInputMigrationFailed = false;
|
||||
for (const file of files) {
|
||||
try {
|
||||
// The write is committed before affectedSessionIds is updated, so a
|
||||
// failed/rolled-back file never reports a phantom updated session.
|
||||
const indexed = runRetryableWriteTransaction(txDb, () => {
|
||||
const result = file.source === 'codex'
|
||||
? indexCodexFile(db, file)
|
||||
: indexClaudeFile(db, file, { forceFull: claudeInputSemanticsOutdated });
|
||||
const metaIndexed = file.source !== 'codex' && indexSubagentMeta(db, file);
|
||||
if (!result?.sessionId && metaIndexed && changedMetaJsonlPaths.has(file.path)) {
|
||||
return { sessionId: file.sessionId, path: file.path };
|
||||
}
|
||||
return result;
|
||||
}, { label: `file:${file.path}` });
|
||||
if (indexed?.sessionId) affectedSessionIds.add(indexed.sessionId);
|
||||
} catch (error) {
|
||||
if (isBeginBusyFailure(error)) {
|
||||
return deferredBuildResult('database_busy', {
|
||||
files: files.length,
|
||||
latestSourceMtime,
|
||||
affectedSessionIds: [...affectedSessionIds],
|
||||
skipped: skipped.length,
|
||||
skippedFiles: skipped,
|
||||
});
|
||||
}
|
||||
const providerResult = indexProviderPlan({
|
||||
db,
|
||||
plan: providerPlan,
|
||||
runTransaction: (label, work) => runRetryableWriteTransaction(txDb, work, { label }),
|
||||
onCommitted: ({ unit }, nextCursor) => {
|
||||
if (nextCursor) latestSourceMtime = Math.max(latestSourceMtime, Number(nextCursor.split(':')[0]) || 0);
|
||||
if (unit.sessionId) affectedSessionIds.add(unit.sessionId);
|
||||
},
|
||||
onError: (error, { provider, unit }) => {
|
||||
if (isBeginBusyFailure(error)) return 'stop';
|
||||
if (hasUnusableTransaction(error)) throw error;
|
||||
if (claudeInputSemanticsOutdated && file.source !== 'codex') {
|
||||
claudeInputMigrationFailed = true;
|
||||
}
|
||||
skipped.push({ path: file.path, error: (error as Error).message, diagnostics: (error as { obelisk?: unknown }).obelisk });
|
||||
console.warn(`Warning: failed to index ${file.path}: ${(error as Error).message}`);
|
||||
}
|
||||
skipped.push({
|
||||
path: unit.key,
|
||||
error: (error as Error).message,
|
||||
diagnostics: (error as { obelisk?: unknown }).obelisk,
|
||||
});
|
||||
console.warn(`Warning: failed to index ${provider.name} unit ${unit.key}: ${(error as Error).message}`);
|
||||
return 'skip';
|
||||
},
|
||||
});
|
||||
if (providerResult.stopped) {
|
||||
return deferredBuildResult('database_busy', {
|
||||
files: providerPlan.items.length,
|
||||
latestSourceMtime,
|
||||
affectedSessionIds: [...affectedSessionIds],
|
||||
skipped: skipped.length,
|
||||
skippedFiles: skipped,
|
||||
});
|
||||
}
|
||||
let ftsRebuilt = false;
|
||||
// Finalize is one transaction; a failure here fails the whole build (the
|
||||
@@ -745,15 +498,13 @@ function buildIndex({
|
||||
writeIndexMarker(db, '__last_build__');
|
||||
writeIndexMarker(db, '__app_last_successful_build__');
|
||||
writeIndexMarker(db, '__indexer_owner_app__');
|
||||
if (!claudeInputSemanticsOutdated || !claudeInputMigrationFailed) {
|
||||
writeIndexMarker(db, CLAUDE_INPUT_TOKEN_SEMANTICS_MARKER);
|
||||
}
|
||||
writeProviderIndexMarkers(db, providerPlan, providerResult);
|
||||
if (latestSourceMtime) writeIndexMarker(db, '__last_source_mtime__', latestSourceMtime);
|
||||
}, { label: 'finalize' });
|
||||
} catch (error) {
|
||||
if (isBeginBusyFailure(error)) {
|
||||
return deferredBuildResult('database_busy', {
|
||||
files: files.length,
|
||||
files: providerPlan.items.length,
|
||||
latestSourceMtime,
|
||||
affectedSessionIds: [...affectedSessionIds],
|
||||
skipped: skipped.length,
|
||||
@@ -764,7 +515,7 @@ function buildIndex({
|
||||
}
|
||||
for (const sessionId of finalizeAffectedSessionIds) affectedSessionIds.add(sessionId);
|
||||
return {
|
||||
files: files.length,
|
||||
files: providerPlan.items.length,
|
||||
latestSourceMtime,
|
||||
affectedSessionIds: [...affectedSessionIds],
|
||||
ftsRebuilt,
|
||||
@@ -792,6 +543,5 @@ export {
|
||||
buildIndex,
|
||||
writeHeartbeat,
|
||||
openIndexDb,
|
||||
discoverJsonlFiles,
|
||||
inferProjectPath,
|
||||
};
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
import type { ProviderRegistry } from '../../../packages/core/src/providers/registry.ts';
|
||||
|
||||
type PersistedSettings = Record<string, unknown> & {
|
||||
providerRoots?: Record<string, unknown>;
|
||||
};
|
||||
|
||||
interface SourceStats {
|
||||
sessionCount: number;
|
||||
lastIndexed: string;
|
||||
}
|
||||
|
||||
interface BuildSourceCatalogOptions {
|
||||
registry: ProviderRegistry;
|
||||
roots: Readonly<Record<string, string>>;
|
||||
stats?: ReadonlyMap<string, SourceStats>;
|
||||
pathExists?: (path: string) => boolean;
|
||||
}
|
||||
|
||||
function configuredPath(value: unknown): string | null {
|
||||
return typeof value === 'string' && value.trim().length > 0 ? value : null;
|
||||
}
|
||||
|
||||
export function resolveProviderRoots(
|
||||
registry: ProviderRegistry,
|
||||
persisted: PersistedSettings = {},
|
||||
): Record<string, string> {
|
||||
const configured = persisted.providerRoots ?? {};
|
||||
return Object.fromEntries(registry.catalog().map((descriptor) => {
|
||||
const root = configuredPath(configured[descriptor.id])
|
||||
?? configuredPath(persisted[`${descriptor.id}Dir`])
|
||||
?? descriptor.defaultRoot;
|
||||
return [descriptor.id, root];
|
||||
}));
|
||||
}
|
||||
|
||||
export function setPersistedSetting(
|
||||
persisted: PersistedSettings,
|
||||
key: string,
|
||||
value: unknown,
|
||||
): boolean {
|
||||
const providerMatch = /^providerRoots\.(.+)$/.exec(key);
|
||||
if (providerMatch === null) {
|
||||
if (value === null) delete persisted[key];
|
||||
else persisted[key] = value;
|
||||
return false;
|
||||
}
|
||||
|
||||
const providerId = providerMatch[1]!;
|
||||
const roots = persisted.providerRoots && typeof persisted.providerRoots === 'object'
|
||||
? persisted.providerRoots
|
||||
: {};
|
||||
if (value === null) delete roots[providerId];
|
||||
else roots[providerId] = value;
|
||||
if (Object.keys(roots).length === 0) delete persisted.providerRoots;
|
||||
else persisted.providerRoots = roots;
|
||||
return true;
|
||||
}
|
||||
|
||||
export function buildSourceCatalog({
|
||||
registry,
|
||||
roots,
|
||||
stats = new Map(),
|
||||
pathExists = () => false,
|
||||
}: BuildSourceCatalogOptions) {
|
||||
return registry.catalog().map((descriptor) => {
|
||||
const path = roots[descriptor.id] ?? descriptor.defaultRoot;
|
||||
const exists = pathExists(path);
|
||||
const sourceStats = stats.get(descriptor.id) ?? { sessionCount: 0, lastIndexed: '' };
|
||||
const status = !exists ? 'error' : sourceStats.sessionCount > 0 ? 'ok' : 'warn';
|
||||
return {
|
||||
id: descriptor.id,
|
||||
name: descriptor.name,
|
||||
vendor: descriptor.vendor,
|
||||
color: descriptor.color,
|
||||
path,
|
||||
settingKey: `providerRoots.${descriptor.id}`,
|
||||
exists,
|
||||
sessionCount: sourceStats.sessionCount,
|
||||
lastIndexed: sourceStats.lastIndexed,
|
||||
status,
|
||||
statusText: !exists
|
||||
? 'Folder not found'
|
||||
: sourceStats.sessionCount > 0
|
||||
? 'Connected'
|
||||
: 'No sessions found',
|
||||
};
|
||||
});
|
||||
}
|
||||
@@ -17,6 +17,7 @@ import {
|
||||
import { formatProjectLabel } from './utils.js';
|
||||
import { buildSidebarProjects } from './sidebar-projects.mjs';
|
||||
import { resolveGlobalShortcut } from './keyboard-shortcuts.mjs';
|
||||
import { sourceLabel } from './source-catalog.mjs';
|
||||
|
||||
const router = useRouter();
|
||||
const route = useRoute();
|
||||
@@ -207,8 +208,9 @@ const showSourcePopover = ref(false);
|
||||
async function loadSourceDots() {
|
||||
if (!window.obelisk?.getSettings) return;
|
||||
const s = await window.obelisk.getSettings();
|
||||
sourceDots.value = (s.sources || []).map(src => ({ id: src.id, status: src.status }));
|
||||
sourceDots.value = (s.sources || []).map(src => ({ id: src.id, status: src.status, color: src.color }));
|
||||
sourceDetails.value = s.sources || [];
|
||||
state.sources = s.sources || [];
|
||||
}
|
||||
loadSourceDots();
|
||||
|
||||
@@ -223,7 +225,7 @@ const showSourceFilter = ref(false);
|
||||
const sourceFilterActive = computed(() => state.sourceFilter !== 'all' && state.sourceFilter !== undefined);
|
||||
const sourceFilterLabel = computed(() => {
|
||||
if (!state.sourceFilter || state.sourceFilter === 'all') return 'All sources';
|
||||
return state.sourceFilter === 'claude' ? 'Claude Code' : 'Codex';
|
||||
return sourceLabel(state.sourceFilter, state.sources);
|
||||
});
|
||||
function toggleSourceFilter() { showSourceFilter.value = !showSourceFilter.value; }
|
||||
function setSourceFilter(id) {
|
||||
@@ -271,13 +273,13 @@ provide('recapGenerateOpen', recapGenerateOpen);
|
||||
</svg>
|
||||
<span class="name">Obelisk</span>
|
||||
<button class="source-health" title="Connected sources" @click="showSourcePopover = !showSourcePopover">
|
||||
<span v-for="src in sourceDots" :key="src.id" class="h-dot" :class="src.id + '-' + src.status"></span>
|
||||
<span v-for="src in sourceDots" :key="src.id" class="h-dot" :class="src.status" :style="{ '--source-color': src.color }"></span>
|
||||
</button>
|
||||
<div class="sources-popover" :class="{ show: showSourcePopover }">
|
||||
<div class="sp-head">Connected sources</div>
|
||||
<div class="sp-list">
|
||||
<button v-for="src in sourceDetails" :key="src.id" class="sp-row" @click="router.push('/settings')">
|
||||
<span class="sp-dot" :class="src.id"></span>
|
||||
<span class="sp-dot" :style="{ '--source-color': src.color }"></span>
|
||||
<div class="sp-body">
|
||||
<div class="sp-name">{{ src.name }} <span class="sp-count" v-if="src.sessionCount">{{ src.sessionCount }} sessions</span></div>
|
||||
<div class="sp-meta" :class="src.status">{{ src.statusText }}</div>
|
||||
@@ -535,7 +537,7 @@ provide('recapGenerateOpen', recapGenerateOpen);
|
||||
<div class="fd-check">
|
||||
<svg viewBox="0 0 12 12" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2.5 6l2.5 2.5 4.5-5"/></svg>
|
||||
</div>
|
||||
<span class="fd-name">{{ src.id === 'claude' ? 'Claude Code' : 'Codex' }}</span>
|
||||
<span class="fd-name">{{ sourceLabel(src.id, sourceDetails) }}</span>
|
||||
</div>
|
||||
<div class="fd-divider"></div>
|
||||
<div class="fd-row" :class="{ checked: state.sourceFilter === 'all' }" @click.stop="setSourceFilter('all')">
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
import { sourceLabel } from './source-catalog.mjs';
|
||||
|
||||
export function activitySourceKey(session) {
|
||||
const source = typeof session?.source === 'string' ? session.source.trim().toLowerCase() : '';
|
||||
return source || 'claude';
|
||||
}
|
||||
|
||||
export function activitySourceLabel(session) {
|
||||
const source = activitySourceKey(session);
|
||||
if (source === 'codex') return 'Codex';
|
||||
if (source === 'claude') return 'Claude Code';
|
||||
return source.charAt(0).toUpperCase() + source.slice(1);
|
||||
export function activitySourceLabel(session, sourceCatalog = []) {
|
||||
return sourceLabel(activitySourceKey(session), sourceCatalog);
|
||||
}
|
||||
|
||||
export function activityGroupSessions(split) {
|
||||
@@ -22,9 +21,10 @@ export function activitySessionMetaParts(session, {
|
||||
mixedSources = false,
|
||||
projectLabel = '',
|
||||
includeProject = true,
|
||||
sourceCatalog = [],
|
||||
} = {}) {
|
||||
const parts = [];
|
||||
if (mixedSources) parts.push({ kind: 'source', text: activitySourceLabel(session) });
|
||||
if (mixedSources) parts.push({ kind: 'source', text: activitySourceLabel(session, sourceCatalog) });
|
||||
if (includeProject && projectLabel) parts.push({ kind: 'project', text: projectLabel });
|
||||
parts.push({
|
||||
kind: 'count',
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
import { computed } from 'vue';
|
||||
import { formatProjectLabel } from '../utils.js';
|
||||
import { activitySessionMetaParts } from '../activity-ledger.mjs';
|
||||
import { state } from '../store.js';
|
||||
|
||||
const props = defineProps({
|
||||
session: { type: Object, required: true },
|
||||
@@ -17,6 +18,7 @@ const metaParts = computed(() => activitySessionMetaParts(props.session, {
|
||||
mixedSources: props.mixedSources,
|
||||
projectLabel: formatProjectLabel(props.session.project) || '',
|
||||
includeProject: props.includeProject,
|
||||
sourceCatalog: state.sources,
|
||||
}));
|
||||
</script>
|
||||
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
const FALLBACK_COLOR = '#8b8b93';
|
||||
|
||||
function sourceId(value) {
|
||||
const normalized = typeof value === 'string' ? value.trim().toLowerCase() : '';
|
||||
return normalized || 'claude';
|
||||
}
|
||||
|
||||
function descriptorFor(source, catalog = []) {
|
||||
const id = sourceId(source);
|
||||
return catalog.find(candidate => candidate?.id === id) || null;
|
||||
}
|
||||
|
||||
function titleCaseId(id) {
|
||||
return id
|
||||
.split(/[-_]+/)
|
||||
.filter(Boolean)
|
||||
.map(part => part.charAt(0).toUpperCase() + part.slice(1))
|
||||
.join(' ');
|
||||
}
|
||||
|
||||
export function sourceLabel(source, catalog = []) {
|
||||
const id = sourceId(source);
|
||||
return descriptorFor(id, catalog)?.name || titleCaseId(id);
|
||||
}
|
||||
|
||||
export function sourceColor(source, catalog = []) {
|
||||
return descriptorFor(source, catalog)?.color || FALLBACK_COLOR;
|
||||
}
|
||||
@@ -8,6 +8,7 @@ export const state = reactive({
|
||||
sessions: [],
|
||||
sessionTitleOverrides: shallowReactive(new Map()),
|
||||
projects: [],
|
||||
sources: [],
|
||||
stats: {},
|
||||
view: 'active', // 'active' | 'archived'
|
||||
query: '',
|
||||
|
||||
@@ -23,6 +23,7 @@ import {
|
||||
fmtRelative,
|
||||
formatProjectLabel
|
||||
} from '../utils.js';
|
||||
import { sourceColor, sourceLabel } from '../source-catalog.mjs';
|
||||
|
||||
defineOptions({ name: 'SessionDetail' });
|
||||
const props = defineProps({ id: String });
|
||||
@@ -490,8 +491,8 @@ function navigateToSubagent(agentId) {
|
||||
<span class="sep">·</span>
|
||||
<span class="project-path">{{ session.project_path || '' }}</span>
|
||||
<span class="via">
|
||||
<span class="via-dot" :class="session.source || 'claude'"></span>
|
||||
via {{ (session.source || 'claude') === 'codex' ? 'Codex' : 'Claude Code' }}
|
||||
<span class="via-dot" :style="{ '--source-color': sourceColor(session.source, state.sources) }"></span>
|
||||
via {{ sourceLabel(session.source, state.sources) }}
|
||||
</span>
|
||||
</div>
|
||||
<div class="session-title">{{ session.title || '(untitled)' }}</div>
|
||||
|
||||
@@ -29,8 +29,7 @@ async function browseSourcePath(source) {
|
||||
if (!window.obelisk?.browseFolder) return;
|
||||
const result = await window.obelisk.browseFolder();
|
||||
if (result) {
|
||||
const key = source.id === 'claude' ? 'claudeDir' : 'codexDir';
|
||||
await saveSetting(key, result);
|
||||
await saveSetting(source.settingKey || `providerRoots.${source.id}`, result);
|
||||
await loadSettings();
|
||||
}
|
||||
}
|
||||
@@ -107,8 +106,8 @@ function fmtRelative(iso) {
|
||||
:class="{ error: src.status === 'error', warn: src.status === 'warn' }"
|
||||
>
|
||||
<div class="source-card-head">
|
||||
<div class="source-card-mark" :class="src.id">
|
||||
<span class="mark-dot"></span>
|
||||
<div class="source-card-mark">
|
||||
<span class="mark-dot" :style="{ background: src.color, boxShadow: `0 0 6px ${src.color}80` }"></span>
|
||||
</div>
|
||||
<div class="source-card-info">
|
||||
<div class="source-card-name">
|
||||
@@ -261,8 +260,6 @@ function fmtRelative(iso) {
|
||||
display: grid; place-items: center; flex-shrink: 0;
|
||||
}
|
||||
.source-card-mark .mark-dot { width: 8px; height: 8px; border-radius: 50%; }
|
||||
.source-card-mark.claude .mark-dot { background: #d97757; box-shadow: 0 0 6px rgba(217,119,87,0.5); }
|
||||
.source-card-mark.codex .mark-dot { background: #10a37f; box-shadow: 0 0 6px rgba(16,163,127,0.5); }
|
||||
.source-card-info { flex: 1; min-width: 0; }
|
||||
.source-card-name {
|
||||
font-size: 14px; color: var(--fg); font-weight: 600; letter-spacing: -0.005em;
|
||||
|
||||
@@ -434,8 +434,7 @@
|
||||
margin-left: 6px;
|
||||
}
|
||||
.session-eyebrow .via .via-dot { width: 4px; height: 4px; border-radius: 50%; }
|
||||
.session-eyebrow .via .via-dot.claude { background: #d97757; box-shadow: 0 0 4px rgba(217,119,87,0.5); }
|
||||
.session-eyebrow .via .via-dot.codex { background: #10a37f; box-shadow: 0 0 4px rgba(16,163,127,0.5); }
|
||||
.session-eyebrow .via .via-dot { background: var(--source-color); box-shadow: 0 0 4px var(--source-color); }
|
||||
.session-title {
|
||||
font-size: 22px; font-weight: 600; color: var(--fg);
|
||||
line-height: 1.3; margin-bottom: 14px; letter-spacing: -0.01em;
|
||||
|
||||
@@ -29,12 +29,9 @@
|
||||
.source-health .h-dot {
|
||||
width: 5px; height: 5px; border-radius: 50%; flex-shrink: 0;
|
||||
}
|
||||
.source-health .h-dot.claude-ok { background: #d97757; box-shadow: 0 0 4px rgba(217,119,87,0.6); }
|
||||
.source-health .h-dot.claude-warn { background: rgba(217,119,87,0.4); }
|
||||
.source-health .h-dot.claude-error { background: rgba(217,119,87,0.25); }
|
||||
.source-health .h-dot.codex-ok { background: #10a37f; box-shadow: 0 0 4px rgba(16,163,127,0.6); }
|
||||
.source-health .h-dot.codex-warn { background: rgba(16,163,127,0.4); }
|
||||
.source-health .h-dot.codex-error { background: rgba(16,163,127,0.25); }
|
||||
.source-health .h-dot.ok { background: var(--source-color); box-shadow: 0 0 4px var(--source-color); }
|
||||
.source-health .h-dot.warn { background: color-mix(in srgb, var(--source-color) 40%, transparent); }
|
||||
.source-health .h-dot.error { background: color-mix(in srgb, var(--source-color) 25%, transparent); }
|
||||
.source-health .h-dot.off { background: var(--muted-3); }
|
||||
|
||||
/* Sources popover */
|
||||
@@ -60,8 +57,7 @@
|
||||
}
|
||||
.sp-row:hover { background: rgba(255,255,255,0.03); }
|
||||
.sp-dot { width: 7px; height: 7px; border-radius: 50%; flex-shrink: 0; }
|
||||
.sp-dot.claude { background: #d97757; box-shadow: 0 0 6px rgba(217,119,87,0.5); }
|
||||
.sp-dot.codex { background: #10a37f; box-shadow: 0 0 6px rgba(16,163,127,0.5); }
|
||||
.sp-dot { background: var(--source-color); box-shadow: 0 0 6px var(--source-color); }
|
||||
.sp-dot.off { background: var(--muted-3); }
|
||||
.sp-body { flex: 1; min-width: 0; }
|
||||
.sp-name { font-size: 12.5px; color: var(--fg); font-weight: 500; display: flex; align-items: baseline; gap: 6px; }
|
||||
|
||||
Reference in New Issue
Block a user