feat(storage): make SQLite the default session metadata store#1372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
likun666661 merged 2 commits into from
Jul 23, 2026
Merged

feat(storage): make SQLite the default session metadata store #1372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0221a0
Make SQLite the default session metadata store
likun666661 Jul 23, 2026
93fd480
Fix SQLite session metadata CI regressions
likun666661 Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions apps/desktop/src/main/app-lifecycle.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import type { BotRegistry, SessionManager, ShellRunProcessManager } from '@maka/
import type { McpClientManager } from '@maka/mcp';
import type {
createConnectionStore,
createSessionStore,
createSettingsStore,
createTelemetryRepo,
openRuntimeEventPersistence,
Expand All@@ -15,7 +16,6 @@ import type { createFileCredentialStore } from './credential-store.js';
import { startConfigFileWatcher, type ConfigFileWatcher } from './config-file-watcher.js';
import { toContractNetworkSettings } from './network-settings-main.js';
import { importLegacyOAuthTokenFiles } from './oauth/shared-credential-bridge.js';
import { seedE2eFixture } from './e2e-fixture.js';
import type { resolveE2eFixture } from './e2e-fixture.js';
import type { OpenGatewayService } from './open-gateway.js';
import type { KeepSystemAwakeController } from './keep-system-awake.js';
Expand All@@ -35,6 +35,7 @@ export interface AppLifecycleDeps {
isIsolatedE2e: boolean;
e2eFixture: ReturnType<typeof resolveE2eFixture>;
workspaceRoot: string;
sessionStore: ReturnType<typeof createSessionStore>;
credentialStore: ReturnType<typeof createFileCredentialStore>;
connectionStore: ReturnType<typeof createConnectionStore>;
settingsStore: ReturnType<typeof createSettingsStore>;
Expand DownExpand Up@@ -84,6 +85,7 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
isIsolatedE2e,
e2eFixture,
workspaceRoot,
sessionStore,
credentialStore,
connectionStore,
settingsStore,
Expand DownExpand Up@@ -201,17 +203,9 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
// settled. Any state that background startup mutates is pushed to the
// renderer via the existing `sessions:changed` / `connections:event`
// / `settings:bots:statusChanged` channels, so the UI converges lazily.
// E2e-fixture mode wipes and reseeds the whole workspace
// (`rm -rf` first). That wipe must finish BEFORE the window opens and
// before background startup touches the workspace: createWindow reads
// the settings store, and a concurrent wipe lands inside the store's
// read-or-create write (mkdir → tmp → rename), rejecting createWindow
// so the window never appears. Fixture runs trade first-paint latency
// for determinism by definition; production launches skip this await.
if (e2eFixture) {
console.log(`[e2e-fixture] scenario=${e2eFixture.scenario} workspace=${workspaceRoot}`);
await seedE2eFixture({ workspaceRoot, fixture: e2eFixture, credentialStore });
}
// E2E fixture workspaces are wiped and seeded before stores open in
// main.ts. SQLite keeps live file handles, so resetting the workspace
// here after store construction would detach the canonical database.
await runCredentialStartup();
app.on('second-instance', focusOrCreateMainWindow);
app.on('activate', focusOrCreateMainWindow);
Expand DownExpand Up@@ -331,5 +325,6 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
if (result.status === 'rejected') console.error('[shutdown] cleanup failed:', result.reason);
}
runtimePersistence.close();
sessionStore.close?.();
}
}
12 changes: 9 additions & 3 deletions apps/desktop/src/main/main.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ import { bindOnboardingDeps, createOnboardingService } from './onboarding-servic
import { handleQuickChatStart as runQuickChatStart, type QuickChatResult } from './quick-chat.js';
import { createDailyReviewArchiveStore } from './daily-review-archive-store.js';
import { resolveDefaultPermissionMode } from './permission-mode-default.js';
import { resolveE2eFixture } from './e2e-fixture.js';
import { resolveE2eFixture, seedE2eFixture } from './e2e-fixture.js';
import { resolveBuildInfo } from './build-info.js';
import { OpenGatewayService } from './open-gateway.js';
import { LocalMemoryService } from './local-memory-service.js';
Expand DownExpand Up@@ -196,7 +196,13 @@ try {
throw error;
}
const workspaceRoot = join(app.getPath('userData'), 'workspaces', e2eFixture?.workspaceName ?? 'default');
await resolveStorageRoot({ path: workspaceRoot, kind: 'interactive' });
const credentialStore = createFileCredentialStore(workspaceRoot);
if (e2eFixture) {
console.log(`[e2e-fixture] scenario=${e2eFixture.scenario} workspace=${workspaceRoot}`);
await seedE2eFixture({ workspaceRoot, fixture: e2eFixture, credentialStore });
} else {
await resolveStorageRoot({ path: workspaceRoot, kind: 'interactive' });
}
// 保持系统唤醒 (settings.system.keepSystemAwake): holds an Electron
// `powerSaveBlocker` so in-process scheduled tasks keep firing while the
// machine would otherwise sleep. Injected with electron's blocker; the
Expand DownExpand Up@@ -233,7 +239,6 @@ const artifactStore = createArtifactStore(workspaceRoot);
const deepResearchStore = createDeepResearchStore(workspaceRoot);
const storeReadImage = createReadImageSnapshotter(artifactStore);
const attachmentApprovals = createAttachmentApprovalRegistry();
const credentialStore = createFileCredentialStore(workspaceRoot);
// PR-OAUTH-SUBSCRIPTION-0: Claude subscription OAuth service.
// Lives in main process only; renderer accesses via IPC. Tokens
// never cross the IPC boundary (xuan G-X3). Cloak path is dynamic-
Expand DownExpand Up@@ -1214,6 +1219,7 @@ wireAppLifecycle({
isIsolatedE2e,
e2eFixture,
workspaceRoot,
sessionStore: store,
credentialStore,
connectionStore,
settingsStore,
Expand Down
1 change: 1 addition & 0 deletions packages/cli/src/runtime-bootstrap.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -889,6 +889,7 @@ export async function createMakaCliRuntimeContext(
goalManager.dispose();
await shellRuns.terminateAll();
shellRunListeners.clear();
store.close?.();
runtimePersistence.close();
},
};
Expand Down
8 changes: 6 additions & 2 deletions packages/headless/src/__tests__/headless-storage-boundary.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -227,14 +227,18 @@ async function snapshotTree(path: string, label: string): Promise<ManifestEntry[
: stats.isSymbolicLink()
? 'symlink'
: 'other';
const isSqliteSharedMemory = type === 'file' && label.endsWith('.sqlite-shm');
const entry: ManifestEntry = {
path: label,
type,
mode: Number(stats.mode & 0o7777n),
size: stats.size.toString(),
mtimeNs: stats.mtimeNs.toString(),
// WAL readers update lock slots in the SQLite shared-memory sidecar.
// Those bytes and their timestamp are connection coordination, not
// durable storage mutation; the database and WAL remain fully compared.
...(isSqliteSharedMemory ? {} : { mtimeNs: stats.mtimeNs.toString() }),
};
if (type === 'file') {
if (type === 'file' && !isSqliteSharedMemory) {
entry.contentSha256 = createHash('sha256')
.update(await readFile(path))
.digest('hex');
Expand Down
35 changes: 33 additions & 2 deletions packages/storage/src/__tests__/session-metadata-transfer.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { join } from 'node:path';
import { describe, test } from 'node:test';
import type { CreateSessionInput } from '@maka/core';
import { importLegacySessionMetadataTree } from '../session-metadata-transfer.js';
import { createSessionStore } from '../session-store.js';
import { createLegacyFileSessionStore as createSessionStore } from '../session-store.js';
import { createSqliteSessionMetadataStore } from '../sqlite-session-metadata-store.js';

describe('legacy session metadata transfer', () => {
Expand DownExpand Up@@ -39,6 +39,7 @@ describe('legacy session metadata transfer', () => {
headersImported: 2,
headersExisting: 0,
sourcesAlreadyImported: 0,
sourcesTombstoned: 0,
});
assert.deepEqual((await sqlite.list()).map((record) => record.header.name).sort(), [
'First',
Expand DownExpand Up@@ -72,6 +73,7 @@ describe('legacy session metadata transfer', () => {
headersImported: 0,
headersExisting: 0,
sourcesAlreadyImported: 2,
sourcesTombstoned: 0,
});
assert.equal((await sqlite.read(first.id)).header.name, 'SQLite is canonical now');
} finally {
Expand DownExpand Up@@ -135,7 +137,7 @@ describe('legacy session metadata transfer', () => {

await assert.rejects(
() => importLegacySessionMetadataTree({ workspaceRoot: root, destination: sqlite }),
/Invalid session header/,
/Invalid legacy session header/,
);
await assert.rejects(() => sqlite.read(valid.id), /not found/);
assert.deepEqual(await sqlite.list(), []);
Expand All@@ -144,6 +146,35 @@ describe('legacy session metadata transfer', () => {
await rm(root, { recursive: true, force: true });
}
});

test('keeps canonical metadata readable when its optional transcript is missing', async () => {
const root = await mkdtemp(join(tmpdir(), 'maka-session-transfer-missing-transcript-'));
const legacy = createSessionStore(root);
const sqlite = createSqliteSessionMetadataStore(join(root, 'state.sqlite'));
try {
const created = await legacy.create(makeInput({ name: 'Canonical metadata' }));
await importLegacySessionMetadataTree({ workspaceRoot: root, destination: sqlite });
await rm(join(root, 'sessions', created.id, 'session.jsonl'));

const report = await importLegacySessionMetadataTree({
workspaceRoot: root,
destination: sqlite,
});

assert.deepEqual(report, {
filesScanned: 1,
headersRead: 0,
headersImported: 0,
headersExisting: 0,
sourcesAlreadyImported: 0,
sourcesTombstoned: 0,
});
assert.equal((await sqlite.read(created.id)).header.name, 'Canonical metadata');
} finally {
sqlite.close();
await rm(root, { recursive: true, force: true });
}
});
});

function makeInput(overrides: Partial<CreateSessionInput> = {}): CreateSessionInput {
Expand Down
2 changes: 1 addition & 1 deletion packages/storage/src/__tests__/session-store.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { join } from 'node:path';
import { tmpdir } from 'node:os';
import { describe, test } from 'node:test';
import type { CreateSessionInput, SessionHeader, StoredMessage } from '@maka/core';
import { createSessionStore } from '../session-store.js';
import { createLegacyFileSessionStore as createSessionStore } from '../session-store.js';

describe('FileSessionStore CRUD', () => {
test('list on a missing workspace is observational and does not create session storage', async () => {
Expand Down
18 changes: 15 additions & 3 deletions packages/storage/src/__tests__/sqlite-session-metadata-store.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ describe('SqliteSessionMetadataStore', () => {
try {
const store = createSqliteSessionMetadataStore(path, { now: () => 100 });
const header = fullHeader();
assert.equal(store.schemaVersion(), 1);
assert.equal(store.schemaVersion(), 2);
assert.equal(store.journalMode(), 'wal');
assert.deepEqual(await store.create(header), {
header,
Expand All@@ -29,7 +29,7 @@ describe('SqliteSessionMetadataStore', () => {

const reopened = createSqliteSessionMetadataStore(path, { now: () => 200 });
try {
assert.equal(reopened.schemaVersion(), 1);
assert.equal(reopened.schemaVersion(), 2);
assert.deepEqual(await reopened.read(header.id), {
header,
metadataVersion: 1,
Expand All@@ -50,7 +50,7 @@ describe('SqliteSessionMetadataStore', () => {
const metadata = createSqliteSessionMetadataStore(path);
try {
assert.equal(runtime.schemaVersion(), 4);
assert.equal(metadata.schemaVersion(), 1);
assert.equal(metadata.schemaVersion(), 2);
await metadata.create(fullHeader());
await runtime.appendRuntimeEvent('session-1', 'run-1', {
id: 'event-1',
Expand DownExpand Up@@ -205,10 +205,12 @@ describe('SqliteSessionMetadataStore', () => {
assert.deepEqual(await store.importEntries([entry]), {
created: [true],
sourcesAlreadyImported: 0,
sourcesTombstoned: 0,
});
assert.deepEqual(await store.importEntries([entry]), {
created: [],
sourcesAlreadyImported: 1,
sourcesTombstoned: 0,
});
await assert.rejects(
() =>
Expand DownExpand Up@@ -264,6 +266,16 @@ describe('SqliteSessionMetadataStore', () => {
assert.equal(await store.remove('session-1'), true);
assert.equal(await store.remove('session-1'), false);
assert.deepEqual(await store.list({ labelSlug: 'alpha' }), []);
assert.deepEqual(
await store.importEntries([
{
header: fullHeader(),
source: { path: '/session-1.jsonl', fingerprint: '1:1' },
},
]),
{ created: [], sourcesAlreadyImported: 0, sourcesTombstoned: 1 },
);
await assert.rejects(() => store.create(fullHeader()), /tombstoned/);
} finally {
store.close();
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat(storage): make SQLite the default session metadata store#1372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

likun666661
merged 2 commits into

from

Jul 23, 2026
 Merged


feat(storage): make SQLite the default session metadata store
#1372
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e0221a0

Make SQLite the default session metadata store


likun666661 Jul 23, 2026
93fd480

Fix SQLite session metadata CI regressions


likun666661 Jul 23, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 7 additions & 12 deletions
apps/desktop/src/main/app-lifecycle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import type { BotRegistry, SessionManager, ShellRunProcessManager } from '@maka/
import type { McpClientManager } from '@maka/mcp';
import type {
 createConnectionStore,
 createSessionStore,
 createSettingsStore,
 createTelemetryRepo,
 openRuntimeEventPersistence,
Expand All@@ -15,7 +16,6 @@ import type { createFileCredentialStore } from './credential-store.js';
import { startConfigFileWatcher, type ConfigFileWatcher } from './config-file-watcher.js';
import { toContractNetworkSettings } from './network-settings-main.js';
import { importLegacyOAuthTokenFiles } from './oauth/shared-credential-bridge.js';
import { seedE2eFixture } from './e2e-fixture.js';
import type { resolveE2eFixture } from './e2e-fixture.js';
import type { OpenGatewayService } from './open-gateway.js';
import type { KeepSystemAwakeController } from './keep-system-awake.js';
Expand All@@ -35,6 +35,7 @@ export interface AppLifecycleDeps {
 isIsolatedE2e: boolean;
 e2eFixture: ReturnType<typeof resolveE2eFixture>;
 workspaceRoot: string;
 sessionStore: ReturnType<typeof createSessionStore>;
 credentialStore: ReturnType<typeof createFileCredentialStore>;
 connectionStore: ReturnType<typeof createConnectionStore>;
 settingsStore: ReturnType<typeof createSettingsStore>;
Expand DownExpand Up@@ -84,6 +85,7 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 isIsolatedE2e,
 e2eFixture,
 workspaceRoot,
 sessionStore,
 credentialStore,
 connectionStore,
 settingsStore,
Expand DownExpand Up@@ -201,17 +203,9 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 // settled. Any state that background startup mutates is pushed to the
 // renderer via the existing `sessions:changed` / `connections:event`
 // / `settings:bots:statusChanged` channels, so the UI converges lazily.
 // E2e-fixture mode wipes and reseeds the whole workspace
 // (`rm -rf` first). That wipe must finish BEFORE the window opens and
 // before background startup touches the workspace: createWindow reads
 // the settings store, and a concurrent wipe lands inside the store's
 // read-or-create write (mkdir → tmp → rename), rejecting createWindow
 // so the window never appears. Fixture runs trade first-paint latency
 // for determinism by definition; production launches skip this await.
 if (e2eFixture) {
 console.log(`[e2e-fixture] scenario=${e2eFixture.scenario} workspace=${workspaceRoot}`);
 await seedE2eFixture({ workspaceRoot, fixture: e2eFixture, credentialStore });
 }
 // E2E fixture workspaces are wiped and seeded before stores open in
 // main.ts. SQLite keeps live file handles, so resetting the workspace
 // here after store construction would detach the canonical database.
 await runCredentialStartup();
 app.on('second-instance', focusOrCreateMainWindow);
 app.on('activate', focusOrCreateMainWindow);
Expand DownExpand Up@@ -331,5 +325,6 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 if (result.status === 'rejected') console.error('[shutdown] cleanup failed:', result.reason);
 }
 runtimePersistence.close();
 sessionStore.close?.();
 }
}

12 changes: 9 additions & 3 deletions
apps/desktop/src/main/main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ import { bindOnboardingDeps, createOnboardingService } from './onboarding-servic
import { handleQuickChatStart as runQuickChatStart, type QuickChatResult } from './quick-chat.js';
import { createDailyReviewArchiveStore } from './daily-review-archive-store.js';
import { resolveDefaultPermissionMode } from './permission-mode-default.js';
import { resolveE2eFixture } from './e2e-fixture.js';
import { resolveE2eFixture, seedE2eFixture } from './e2e-fixture.js';
import { resolveBuildInfo } from './build-info.js';
import { OpenGatewayService } from './open-gateway.js';
import { LocalMemoryService } from './local-memory-service.js';
Expand DownExpand Up@@ -196,7 +196,13 @@ try {
 throw error;
}
const workspaceRoot = join(app.getPath('userData'), 'workspaces', e2eFixture?.workspaceName ?? 'default');
await resolveStorageRoot({ path: workspaceRoot, kind: 'interactive' });
const credentialStore = createFileCredentialStore(workspaceRoot);
if (e2eFixture) {
 console.log(`[e2e-fixture] scenario=${e2eFixture.scenario} workspace=${workspaceRoot}`);
 await seedE2eFixture({ workspaceRoot, fixture: e2eFixture, credentialStore });
} else {
 await resolveStorageRoot({ path: workspaceRoot, kind: 'interactive' });
}
// 保持系统唤醒 (settings.system.keepSystemAwake): holds an Electron
// `powerSaveBlocker` so in-process scheduled tasks keep firing while the
// machine would otherwise sleep. Injected with electron's blocker; the
Expand DownExpand Up@@ -233,7 +239,6 @@ const artifactStore = createArtifactStore(workspaceRoot);
const deepResearchStore = createDeepResearchStore(workspaceRoot);
const storeReadImage = createReadImageSnapshotter(artifactStore);
const attachmentApprovals = createAttachmentApprovalRegistry();
const credentialStore = createFileCredentialStore(workspaceRoot);
// PR-OAUTH-SUBSCRIPTION-0: Claude subscription OAuth service.
// Lives in main process only; renderer accesses via IPC. Tokens
// never cross the IPC boundary (xuan G-X3). Cloak path is dynamic-
Expand DownExpand Up@@ -1214,6 +1219,7 @@ wireAppLifecycle({
 isIsolatedE2e,
 e2eFixture,
 workspaceRoot,
 sessionStore: store,
 credentialStore,
 connectionStore,
 settingsStore,
Expand Down

1 change: 1 addition & 0 deletions
packages/cli/src/runtime-bootstrap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -889,6 +889,7 @@ export async function createMakaCliRuntimeContext(
 goalManager.dispose();
 await shellRuns.terminateAll();
 shellRunListeners.clear();
 store.close?.();
 runtimePersistence.close();
 },
 };
Expand Down

8 changes: 6 additions & 2 deletions
packages/headless/src/__tests__/headless-storage-boundary.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,14 +227,18 @@ async function snapshotTree(path: string, label: string): Promise<ManifestEntry[
 : stats.isSymbolicLink()
 ? 'symlink'
 : 'other';
 const isSqliteSharedMemory = type === 'file' && label.endsWith('.sqlite-shm');
 const entry: ManifestEntry = {
 path: label,
 type,
 mode: Number(stats.mode & 0o7777n),
 size: stats.size.toString(),
 mtimeNs: stats.mtimeNs.toString(),
 // WAL readers update lock slots in the SQLite shared-memory sidecar.
 // Those bytes and their timestamp are connection coordination, not
 // durable storage mutation; the database and WAL remain fully compared.
 ...(isSqliteSharedMemory ? {} : { mtimeNs: stats.mtimeNs.toString() }),
 };
 if (type === 'file') {
 if (type === 'file' && !isSqliteSharedMemory) {
 entry.contentSha256 = createHash('sha256')
 .update(await readFile(path))
 .digest('hex');
Expand Down

35 changes: 33 additions & 2 deletions
packages/storage/src/__tests__/session-metadata-transfer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { join } from 'node:path';
import { describe, test } from 'node:test';
import type { CreateSessionInput } from '@maka/core';
import { importLegacySessionMetadataTree } from '../session-metadata-transfer.js';
import { createSessionStore } from '../session-store.js';
import { createLegacyFileSessionStore as createSessionStore } from '../session-store.js';
import { createSqliteSessionMetadataStore } from '../sqlite-session-metadata-store.js';

describe('legacy session metadata transfer', () => {
Expand DownExpand Up@@ -39,6 +39,7 @@ describe('legacy session metadata transfer', () => {
 headersImported: 2,
 headersExisting: 0,
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.deepEqual((await sqlite.list()).map((record) => record.header.name).sort(), [
 'First',
Expand DownExpand Up@@ -72,6 +73,7 @@ describe('legacy session metadata transfer', () => {
 headersImported: 0,
 headersExisting: 0,
 sourcesAlreadyImported: 2,
 sourcesTombstoned: 0,
 });
 assert.equal((await sqlite.read(first.id)).header.name, 'SQLite is canonical now');
 } finally {
Expand DownExpand Up@@ -135,7 +137,7 @@ describe('legacy session metadata transfer', () => {

 await assert.rejects(
 () => importLegacySessionMetadataTree({ workspaceRoot: root, destination: sqlite }),
 /Invalid session header/,
 /Invalid legacy session header/,
 );
 await assert.rejects(() => sqlite.read(valid.id), /not found/);
 assert.deepEqual(await sqlite.list(), []);
Expand All@@ -144,6 +146,35 @@ describe('legacy session metadata transfer', () => {
 await rm(root, { recursive: true, force: true });
 }
 });

 test('keeps canonical metadata readable when its optional transcript is missing', async () => {
 const root = await mkdtemp(join(tmpdir(), 'maka-session-transfer-missing-transcript-'));
 const legacy = createSessionStore(root);
 const sqlite = createSqliteSessionMetadataStore(join(root, 'state.sqlite'));
 try {
 const created = await legacy.create(makeInput({ name: 'Canonical metadata' }));
 await importLegacySessionMetadataTree({ workspaceRoot: root, destination: sqlite });
 await rm(join(root, 'sessions', created.id, 'session.jsonl'));

 const report = await importLegacySessionMetadataTree({
 workspaceRoot: root,
 destination: sqlite,
 });

 assert.deepEqual(report, {
 filesScanned: 1,
 headersRead: 0,
 headersImported: 0,
 headersExisting: 0,
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.equal((await sqlite.read(created.id)).header.name, 'Canonical metadata');
 } finally {
 sqlite.close();
 await rm(root, { recursive: true, force: true });
 }
 });
});

function makeInput(overrides: Partial<CreateSessionInput> = {}): CreateSessionInput {
Expand Down

2 changes: 1 addition & 1 deletion
packages/storage/src/__tests__/session-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { join } from 'node:path';
import { tmpdir } from 'node:os';
import { describe, test } from 'node:test';
import type { CreateSessionInput, SessionHeader, StoredMessage } from '@maka/core';
import { createSessionStore } from '../session-store.js';
import { createLegacyFileSessionStore as createSessionStore } from '../session-store.js';

describe('FileSessionStore CRUD', () => {
 test('list on a missing workspace is observational and does not create session storage', async () => {
Expand Down

18 changes: 15 additions & 3 deletions
packages/storage/src/__tests__/sqlite-session-metadata-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ describe('SqliteSessionMetadataStore', () => {
 try {
 const store = createSqliteSessionMetadataStore(path, { now: () => 100 });
 const header = fullHeader();
 assert.equal(store.schemaVersion(), 1);
 assert.equal(store.schemaVersion(), 2);
 assert.equal(store.journalMode(), 'wal');
 assert.deepEqual(await store.create(header), {
 header,
Expand All@@ -29,7 +29,7 @@ describe('SqliteSessionMetadataStore', () => {

 const reopened = createSqliteSessionMetadataStore(path, { now: () => 200 });
 try {
 assert.equal(reopened.schemaVersion(), 1);
 assert.equal(reopened.schemaVersion(), 2);
 assert.deepEqual(await reopened.read(header.id), {
 header,
 metadataVersion: 1,
Expand All@@ -50,7 +50,7 @@ describe('SqliteSessionMetadataStore', () => {
 const metadata = createSqliteSessionMetadataStore(path);
 try {
 assert.equal(runtime.schemaVersion(), 4);
 assert.equal(metadata.schemaVersion(), 1);
 assert.equal(metadata.schemaVersion(), 2);
 await metadata.create(fullHeader());
 await runtime.appendRuntimeEvent('session-1', 'run-1', {
 id: 'event-1',
Expand DownExpand Up@@ -205,10 +205,12 @@ describe('SqliteSessionMetadataStore', () => {
 assert.deepEqual(await store.importEntries([entry]), {
 created: [true],
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.deepEqual(await store.importEntries([entry]), {
 created: [],
 sourcesAlreadyImported: 1,
 sourcesTombstoned: 0,
 });
 await assert.rejects(
 () =>
Expand DownExpand Up@@ -264,6 +266,16 @@ describe('SqliteSessionMetadataStore', () => {
 assert.equal(await store.remove('session-1'), true);
 assert.equal(await store.remove('session-1'), false);
 assert.deepEqual(await store.list({ labelSlug: 'alpha' }), []);
 assert.deepEqual(
 await store.importEntries([
 {
 header: fullHeader(),
 source: { path: '/session-1.jsonl', fingerprint: '1:1' },
 },
 ]),
 { created: [], sourcesAlreadyImported: 0, sourcesTombstoned: 1 },
 );
 await assert.rejects(() => store.create(fullHeader()), /tombstoned/);
 } finally {
 store.close();
 }
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(storage): make SQLite the default session metadata store#1372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

likun666661
merged 2 commits into

from

Jul 23, 2026
 Merged


feat(storage): make SQLite the default session metadata store
#1372
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e0221a0

Make SQLite the default session metadata store


likun666661 Jul 23, 2026
93fd480

Fix SQLite session metadata CI regressions


likun666661 Jul 23, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 7 additions & 12 deletions
apps/desktop/src/main/app-lifecycle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import type { BotRegistry, SessionManager, ShellRunProcessManager } from '@maka/
import type { McpClientManager } from '@maka/mcp';
import type {
 createConnectionStore,
 createSessionStore,
 createSettingsStore,
 createTelemetryRepo,
 openRuntimeEventPersistence,
Expand All@@ -15,7 +16,6 @@ import type { createFileCredentialStore } from './credential-store.js';
import { startConfigFileWatcher, type ConfigFileWatcher } from './config-file-watcher.js';
import { toContractNetworkSettings } from './network-settings-main.js';
import { importLegacyOAuthTokenFiles } from './oauth/shared-credential-bridge.js';
import { seedE2eFixture } from './e2e-fixture.js';
import type { resolveE2eFixture } from './e2e-fixture.js';
import type { OpenGatewayService } from './open-gateway.js';
import type { KeepSystemAwakeController } from './keep-system-awake.js';
Expand All@@ -35,6 +35,7 @@ export interface AppLifecycleDeps {
 isIsolatedE2e: boolean;
 e2eFixture: ReturnType<typeof resolveE2eFixture>;
 workspaceRoot: string;
 sessionStore: ReturnType<typeof createSessionStore>;
 credentialStore: ReturnType<typeof createFileCredentialStore>;
 connectionStore: ReturnType<typeof createConnectionStore>;
 settingsStore: ReturnType<typeof createSettingsStore>;
Expand DownExpand Up@@ -84,6 +85,7 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 isIsolatedE2e,
 e2eFixture,
 workspaceRoot,
 sessionStore,
 credentialStore,
 connectionStore,
 settingsStore,
Expand DownExpand Up@@ -201,17 +203,9 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 // settled. Any state that background startup mutates is pushed to the
 // renderer via the existing `sessions:changed` / `connections:event`
 // / `settings:bots:statusChanged` channels, so the UI converges lazily.
 // E2e-fixture mode wipes and reseeds the whole workspace
 // (`rm -rf` first). That wipe must finish BEFORE the window opens and
 // before background startup touches the workspace: createWindow reads
 // the settings store, and a concurrent wipe lands inside the store's
 // read-or-create write (mkdir → tmp → rename), rejecting createWindow
 // so the window never appears. Fixture runs trade first-paint latency
 // for determinism by definition; production launches skip this await.
 if (e2eFixture) {
 console.log(`[e2e-fixture] scenario=${e2eFixture.scenario} workspace=${workspaceRoot}`);
 await seedE2eFixture({ workspaceRoot, fixture: e2eFixture, credentialStore });
 }
 // E2E fixture workspaces are wiped and seeded before stores open in
 // main.ts. SQLite keeps live file handles, so resetting the workspace
 // here after store construction would detach the canonical database.
 await runCredentialStartup();
 app.on('second-instance', focusOrCreateMainWindow);
 app.on('activate', focusOrCreateMainWindow);
Expand DownExpand Up@@ -331,5 +325,6 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 if (result.status === 'rejected') console.error('[shutdown] cleanup failed:', result.reason);
 }
 runtimePersistence.close();
 sessionStore.close?.();
 }
}

12 changes: 9 additions & 3 deletions
apps/desktop/src/main/main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ import { bindOnboardingDeps, createOnboardingService } from './onboarding-servic
import { handleQuickChatStart as runQuickChatStart, type QuickChatResult } from './quick-chat.js';
import { createDailyReviewArchiveStore } from './daily-review-archive-store.js';
import { resolveDefaultPermissionMode } from './permission-mode-default.js';
import { resolveE2eFixture } from './e2e-fixture.js';
import { resolveE2eFixture, seedE2eFixture } from './e2e-fixture.js';
import { resolveBuildInfo } from './build-info.js';
import { OpenGatewayService } from './open-gateway.js';
import { LocalMemoryService } from './local-memory-service.js';
Expand DownExpand Up@@ -196,7 +196,13 @@ try {
 throw error;
}
const workspaceRoot = join(app.getPath('userData'), 'workspaces', e2eFixture?.workspaceName ?? 'default');
await resolveStorageRoot({ path: workspaceRoot, kind: 'interactive' });
const credentialStore = createFileCredentialStore(workspaceRoot);
if (e2eFixture) {
 console.log(`[e2e-fixture] scenario=${e2eFixture.scenario} workspace=${workspaceRoot}`);
 await seedE2eFixture({ workspaceRoot, fixture: e2eFixture, credentialStore });
} else {
 await resolveStorageRoot({ path: workspaceRoot, kind: 'interactive' });
}
// 保持系统唤醒 (settings.system.keepSystemAwake): holds an Electron
// `powerSaveBlocker` so in-process scheduled tasks keep firing while the
// machine would otherwise sleep. Injected with electron's blocker; the
Expand DownExpand Up@@ -233,7 +239,6 @@ const artifactStore = createArtifactStore(workspaceRoot);
const deepResearchStore = createDeepResearchStore(workspaceRoot);
const storeReadImage = createReadImageSnapshotter(artifactStore);
const attachmentApprovals = createAttachmentApprovalRegistry();
const credentialStore = createFileCredentialStore(workspaceRoot);
// PR-OAUTH-SUBSCRIPTION-0: Claude subscription OAuth service.
// Lives in main process only; renderer accesses via IPC. Tokens
// never cross the IPC boundary (xuan G-X3). Cloak path is dynamic-
Expand DownExpand Up@@ -1214,6 +1219,7 @@ wireAppLifecycle({
 isIsolatedE2e,
 e2eFixture,
 workspaceRoot,
 sessionStore: store,
 credentialStore,
 connectionStore,
 settingsStore,
Expand Down

1 change: 1 addition & 0 deletions
packages/cli/src/runtime-bootstrap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -889,6 +889,7 @@ export async function createMakaCliRuntimeContext(
 goalManager.dispose();
 await shellRuns.terminateAll();
 shellRunListeners.clear();
 store.close?.();
 runtimePersistence.close();
 },
 };
Expand Down

8 changes: 6 additions & 2 deletions
packages/headless/src/__tests__/headless-storage-boundary.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,14 +227,18 @@ async function snapshotTree(path: string, label: string): Promise<ManifestEntry[
 : stats.isSymbolicLink()
 ? 'symlink'
 : 'other';
 const isSqliteSharedMemory = type === 'file' && label.endsWith('.sqlite-shm');
 const entry: ManifestEntry = {
 path: label,
 type,
 mode: Number(stats.mode & 0o7777n),
 size: stats.size.toString(),
 mtimeNs: stats.mtimeNs.toString(),
 // WAL readers update lock slots in the SQLite shared-memory sidecar.
 // Those bytes and their timestamp are connection coordination, not
 // durable storage mutation; the database and WAL remain fully compared.
 ...(isSqliteSharedMemory ? {} : { mtimeNs: stats.mtimeNs.toString() }),
 };
 if (type === 'file') {
 if (type === 'file' && !isSqliteSharedMemory) {
 entry.contentSha256 = createHash('sha256')
 .update(await readFile(path))
 .digest('hex');
Expand Down

35 changes: 33 additions & 2 deletions
packages/storage/src/__tests__/session-metadata-transfer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { join } from 'node:path';
import { describe, test } from 'node:test';
import type { CreateSessionInput } from '@maka/core';
import { importLegacySessionMetadataTree } from '../session-metadata-transfer.js';
import { createSessionStore } from '../session-store.js';
import { createLegacyFileSessionStore as createSessionStore } from '../session-store.js';
import { createSqliteSessionMetadataStore } from '../sqlite-session-metadata-store.js';

describe('legacy session metadata transfer', () => {
Expand DownExpand Up@@ -39,6 +39,7 @@ describe('legacy session metadata transfer', () => {
 headersImported: 2,
 headersExisting: 0,
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.deepEqual((await sqlite.list()).map((record) => record.header.name).sort(), [
 'First',
Expand DownExpand Up@@ -72,6 +73,7 @@ describe('legacy session metadata transfer', () => {
 headersImported: 0,
 headersExisting: 0,
 sourcesAlreadyImported: 2,
 sourcesTombstoned: 0,
 });
 assert.equal((await sqlite.read(first.id)).header.name, 'SQLite is canonical now');
 } finally {
Expand DownExpand Up@@ -135,7 +137,7 @@ describe('legacy session metadata transfer', () => {

 await assert.rejects(
 () => importLegacySessionMetadataTree({ workspaceRoot: root, destination: sqlite }),
 /Invalid session header/,
 /Invalid legacy session header/,
 );
 await assert.rejects(() => sqlite.read(valid.id), /not found/);
 assert.deepEqual(await sqlite.list(), []);
Expand All@@ -144,6 +146,35 @@ describe('legacy session metadata transfer', () => {
 await rm(root, { recursive: true, force: true });
 }
 });

 test('keeps canonical metadata readable when its optional transcript is missing', async () => {
 const root = await mkdtemp(join(tmpdir(), 'maka-session-transfer-missing-transcript-'));
 const legacy = createSessionStore(root);
 const sqlite = createSqliteSessionMetadataStore(join(root, 'state.sqlite'));
 try {
 const created = await legacy.create(makeInput({ name: 'Canonical metadata' }));
 await importLegacySessionMetadataTree({ workspaceRoot: root, destination: sqlite });
 await rm(join(root, 'sessions', created.id, 'session.jsonl'));

 const report = await importLegacySessionMetadataTree({
 workspaceRoot: root,
 destination: sqlite,
 });

 assert.deepEqual(report, {
 filesScanned: 1,
 headersRead: 0,
 headersImported: 0,
 headersExisting: 0,
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.equal((await sqlite.read(created.id)).header.name, 'Canonical metadata');
 } finally {
 sqlite.close();
 await rm(root, { recursive: true, force: true });
 }
 });
});

function makeInput(overrides: Partial<CreateSessionInput> = {}): CreateSessionInput {
Expand Down

2 changes: 1 addition & 1 deletion
packages/storage/src/__tests__/session-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { join } from 'node:path';
import { tmpdir } from 'node:os';
import { describe, test } from 'node:test';
import type { CreateSessionInput, SessionHeader, StoredMessage } from '@maka/core';
import { createSessionStore } from '../session-store.js';
import { createLegacyFileSessionStore as createSessionStore } from '../session-store.js';

describe('FileSessionStore CRUD', () => {
 test('list on a missing workspace is observational and does not create session storage', async () => {
Expand Down

18 changes: 15 additions & 3 deletions
packages/storage/src/__tests__/sqlite-session-metadata-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ describe('SqliteSessionMetadataStore', () => {
 try {
 const store = createSqliteSessionMetadataStore(path, { now: () => 100 });
 const header = fullHeader();
 assert.equal(store.schemaVersion(), 1);
 assert.equal(store.schemaVersion(), 2);
 assert.equal(store.journalMode(), 'wal');
 assert.deepEqual(await store.create(header), {
 header,
Expand All@@ -29,7 +29,7 @@ describe('SqliteSessionMetadataStore', () => {

 const reopened = createSqliteSessionMetadataStore(path, { now: () => 200 });
 try {
 assert.equal(reopened.schemaVersion(), 1);
 assert.equal(reopened.schemaVersion(), 2);
 assert.deepEqual(await reopened.read(header.id), {
 header,
 metadataVersion: 1,
Expand All@@ -50,7 +50,7 @@ describe('SqliteSessionMetadataStore', () => {
 const metadata = createSqliteSessionMetadataStore(path);
 try {
 assert.equal(runtime.schemaVersion(), 4);
 assert.equal(metadata.schemaVersion(), 1);
 assert.equal(metadata.schemaVersion(), 2);
 await metadata.create(fullHeader());
 await runtime.appendRuntimeEvent('session-1', 'run-1', {
 id: 'event-1',
Expand DownExpand Up@@ -205,10 +205,12 @@ describe('SqliteSessionMetadataStore', () => {
 assert.deepEqual(await store.importEntries([entry]), {
 created: [true],
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.deepEqual(await store.importEntries([entry]), {
 created: [],
 sourcesAlreadyImported: 1,
 sourcesTombstoned: 0,
 });
 await assert.rejects(
 () =>
Expand DownExpand Up@@ -264,6 +266,16 @@ describe('SqliteSessionMetadataStore', () => {
 assert.equal(await store.remove('session-1'), true);
 assert.equal(await store.remove('session-1'), false);
 assert.deepEqual(await store.list({ labelSlug: 'alpha' }), []);
 assert.deepEqual(
 await store.importEntries([
 {
 header: fullHeader(),
 source: { path: '/session-1.jsonl', fingerprint: '1:1' },
 },
 ]),
 { created: [], sourcesAlreadyImported: 0, sourcesTombstoned: 1 },
 );
 await assert.rejects(() => store.create(fullHeader()), /tombstoned/);
 } finally {
 store.close();
 }
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(storage): make SQLite the default session metadata store#1372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

likun666661
merged 2 commits into

from

Jul 23, 2026
 Merged


feat(storage): make SQLite the default session metadata store
#1372
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e0221a0

Make SQLite the default session metadata store


likun666661 Jul 23, 2026
93fd480

Fix SQLite session metadata CI regressions


likun666661 Jul 23, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 7 additions & 12 deletions
apps/desktop/src/main/app-lifecycle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import type { BotRegistry, SessionManager, ShellRunProcessManager } from '@maka/
import type { McpClientManager } from '@maka/mcp';
import type {
 createConnectionStore,
 createSessionStore,
 createSettingsStore,
 createTelemetryRepo,
 openRuntimeEventPersistence,
Expand All@@ -15,7 +16,6 @@ import type { createFileCredentialStore } from './credential-store.js';
import { startConfigFileWatcher, type ConfigFileWatcher } from './config-file-watcher.js';
import { toContractNetworkSettings } from './network-settings-main.js';
import { importLegacyOAuthTokenFiles } from './oauth/shared-credential-bridge.js';
import { seedE2eFixture } from './e2e-fixture.js';
import type { resolveE2eFixture } from './e2e-fixture.js';
import type { OpenGatewayService } from './open-gateway.js';
import type { KeepSystemAwakeController } from './keep-system-awake.js';
Expand All@@ -35,6 +35,7 @@ export interface AppLifecycleDeps {
 isIsolatedE2e: boolean;
 e2eFixture: ReturnType<typeof resolveE2eFixture>;
 workspaceRoot: string;
 sessionStore: ReturnType<typeof createSessionStore>;
 credentialStore: ReturnType<typeof createFileCredentialStore>;
 connectionStore: ReturnType<typeof createConnectionStore>;
 settingsStore: ReturnType<typeof createSettingsStore>;
Expand DownExpand Up@@ -84,6 +85,7 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 isIsolatedE2e,
 e2eFixture,
 workspaceRoot,
 sessionStore,
 credentialStore,
 connectionStore,
 settingsStore,
Expand DownExpand Up@@ -201,17 +203,9 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 // settled. Any state that background startup mutates is pushed to the
 // renderer via the existing `sessions:changed` / `connections:event`
 // / `settings:bots:statusChanged` channels, so the UI converges lazily.
 // E2e-fixture mode wipes and reseeds the whole workspace
 // (`rm -rf` first). That wipe must finish BEFORE the window opens and
 // before background startup touches the workspace: createWindow reads
 // the settings store, and a concurrent wipe lands inside the store's
 // read-or-create write (mkdir → tmp → rename), rejecting createWindow
 // so the window never appears. Fixture runs trade first-paint latency
 // for determinism by definition; production launches skip this await.
 if (e2eFixture) {
 console.log(`[e2e-fixture] scenario=${e2eFixture.scenario} workspace=${workspaceRoot}`);
 await seedE2eFixture({ workspaceRoot, fixture: e2eFixture, credentialStore });
 }
 // E2E fixture workspaces are wiped and seeded before stores open in
 // main.ts. SQLite keeps live file handles, so resetting the workspace
 // here after store construction would detach the canonical database.
 await runCredentialStartup();
 app.on('second-instance', focusOrCreateMainWindow);
 app.on('activate', focusOrCreateMainWindow);
Expand DownExpand Up@@ -331,5 +325,6 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 if (result.status === 'rejected') console.error('[shutdown] cleanup failed:', result.reason);
 }
 runtimePersistence.close();
 sessionStore.close?.();
 }
}

12 changes: 9 additions & 3 deletions
apps/desktop/src/main/main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ import { bindOnboardingDeps, createOnboardingService } from './onboarding-servic
import { handleQuickChatStart as runQuickChatStart, type QuickChatResult } from './quick-chat.js';
import { createDailyReviewArchiveStore } from './daily-review-archive-store.js';
import { resolveDefaultPermissionMode } from './permission-mode-default.js';
import { resolveE2eFixture } from './e2e-fixture.js';
import { resolveE2eFixture, seedE2eFixture } from './e2e-fixture.js';
import { resolveBuildInfo } from './build-info.js';
import { OpenGatewayService } from './open-gateway.js';
import { LocalMemoryService } from './local-memory-service.js';
Expand DownExpand Up@@ -196,7 +196,13 @@ try {
 throw error;
}
const workspaceRoot = join(app.getPath('userData'), 'workspaces', e2eFixture?.workspaceName ?? 'default');
await resolveStorageRoot({ path: workspaceRoot, kind: 'interactive' });
const credentialStore = createFileCredentialStore(workspaceRoot);
if (e2eFixture) {
 console.log(`[e2e-fixture] scenario=${e2eFixture.scenario} workspace=${workspaceRoot}`);
 await seedE2eFixture({ workspaceRoot, fixture: e2eFixture, credentialStore });
} else {
 await resolveStorageRoot({ path: workspaceRoot, kind: 'interactive' });
}
// 保持系统唤醒 (settings.system.keepSystemAwake): holds an Electron
// `powerSaveBlocker` so in-process scheduled tasks keep firing while the
// machine would otherwise sleep. Injected with electron's blocker; the
Expand DownExpand Up@@ -233,7 +239,6 @@ const artifactStore = createArtifactStore(workspaceRoot);
const deepResearchStore = createDeepResearchStore(workspaceRoot);
const storeReadImage = createReadImageSnapshotter(artifactStore);
const attachmentApprovals = createAttachmentApprovalRegistry();
const credentialStore = createFileCredentialStore(workspaceRoot);
// PR-OAUTH-SUBSCRIPTION-0: Claude subscription OAuth service.
// Lives in main process only; renderer accesses via IPC. Tokens
// never cross the IPC boundary (xuan G-X3). Cloak path is dynamic-
Expand DownExpand Up@@ -1214,6 +1219,7 @@ wireAppLifecycle({
 isIsolatedE2e,
 e2eFixture,
 workspaceRoot,
 sessionStore: store,
 credentialStore,
 connectionStore,
 settingsStore,
Expand Down

1 change: 1 addition & 0 deletions
packages/cli/src/runtime-bootstrap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -889,6 +889,7 @@ export async function createMakaCliRuntimeContext(
 goalManager.dispose();
 await shellRuns.terminateAll();
 shellRunListeners.clear();
 store.close?.();
 runtimePersistence.close();
 },
 };
Expand Down

8 changes: 6 additions & 2 deletions
packages/headless/src/__tests__/headless-storage-boundary.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,14 +227,18 @@ async function snapshotTree(path: string, label: string): Promise<ManifestEntry[
 : stats.isSymbolicLink()
 ? 'symlink'
 : 'other';
 const isSqliteSharedMemory = type === 'file' && label.endsWith('.sqlite-shm');
 const entry: ManifestEntry = {
 path: label,
 type,
 mode: Number(stats.mode & 0o7777n),
 size: stats.size.toString(),
 mtimeNs: stats.mtimeNs.toString(),
 // WAL readers update lock slots in the SQLite shared-memory sidecar.
 // Those bytes and their timestamp are connection coordination, not
 // durable storage mutation; the database and WAL remain fully compared.
 ...(isSqliteSharedMemory ? {} : { mtimeNs: stats.mtimeNs.toString() }),
 };
 if (type === 'file') {
 if (type === 'file' && !isSqliteSharedMemory) {
 entry.contentSha256 = createHash('sha256')
 .update(await readFile(path))
 .digest('hex');
Expand Down

35 changes: 33 additions & 2 deletions
packages/storage/src/__tests__/session-metadata-transfer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { join } from 'node:path';
import { describe, test } from 'node:test';
import type { CreateSessionInput } from '@maka/core';
import { importLegacySessionMetadataTree } from '../session-metadata-transfer.js';
import { createSessionStore } from '../session-store.js';
import { createLegacyFileSessionStore as createSessionStore } from '../session-store.js';
import { createSqliteSessionMetadataStore } from '../sqlite-session-metadata-store.js';

describe('legacy session metadata transfer', () => {
Expand DownExpand Up@@ -39,6 +39,7 @@ describe('legacy session metadata transfer', () => {
 headersImported: 2,
 headersExisting: 0,
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.deepEqual((await sqlite.list()).map((record) => record.header.name).sort(), [
 'First',
Expand DownExpand Up@@ -72,6 +73,7 @@ describe('legacy session metadata transfer', () => {
 headersImported: 0,
 headersExisting: 0,
 sourcesAlreadyImported: 2,
 sourcesTombstoned: 0,
 });
 assert.equal((await sqlite.read(first.id)).header.name, 'SQLite is canonical now');
 } finally {
Expand DownExpand Up@@ -135,7 +137,7 @@ describe('legacy session metadata transfer', () => {

 await assert.rejects(
 () => importLegacySessionMetadataTree({ workspaceRoot: root, destination: sqlite }),
 /Invalid session header/,
 /Invalid legacy session header/,
 );
 await assert.rejects(() => sqlite.read(valid.id), /not found/);
 assert.deepEqual(await sqlite.list(), []);
Expand All@@ -144,6 +146,35 @@ describe('legacy session metadata transfer', () => {
 await rm(root, { recursive: true, force: true });
 }
 });

 test('keeps canonical metadata readable when its optional transcript is missing', async () => {
 const root = await mkdtemp(join(tmpdir(), 'maka-session-transfer-missing-transcript-'));
 const legacy = createSessionStore(root);
 const sqlite = createSqliteSessionMetadataStore(join(root, 'state.sqlite'));
 try {
 const created = await legacy.create(makeInput({ name: 'Canonical metadata' }));
 await importLegacySessionMetadataTree({ workspaceRoot: root, destination: sqlite });
 await rm(join(root, 'sessions', created.id, 'session.jsonl'));

 const report = await importLegacySessionMetadataTree({
 workspaceRoot: root,
 destination: sqlite,
 });

 assert.deepEqual(report, {
 filesScanned: 1,
 headersRead: 0,
 headersImported: 0,
 headersExisting: 0,
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.equal((await sqlite.read(created.id)).header.name, 'Canonical metadata');
 } finally {
 sqlite.close();
 await rm(root, { recursive: true, force: true });
 }
 });
});

function makeInput(overrides: Partial<CreateSessionInput> = {}): CreateSessionInput {
Expand Down

2 changes: 1 addition & 1 deletion
packages/storage/src/__tests__/session-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { join } from 'node:path';
import { tmpdir } from 'node:os';
import { describe, test } from 'node:test';
import type { CreateSessionInput, SessionHeader, StoredMessage } from '@maka/core';
import { createSessionStore } from '../session-store.js';
import { createLegacyFileSessionStore as createSessionStore } from '../session-store.js';

describe('FileSessionStore CRUD', () => {
 test('list on a missing workspace is observational and does not create session storage', async () => {
Expand Down

18 changes: 15 additions & 3 deletions
packages/storage/src/__tests__/sqlite-session-metadata-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ describe('SqliteSessionMetadataStore', () => {
 try {
 const store = createSqliteSessionMetadataStore(path, { now: () => 100 });
 const header = fullHeader();
 assert.equal(store.schemaVersion(), 1);
 assert.equal(store.schemaVersion(), 2);
 assert.equal(store.journalMode(), 'wal');
 assert.deepEqual(await store.create(header), {
 header,
Expand All@@ -29,7 +29,7 @@ describe('SqliteSessionMetadataStore', () => {

 const reopened = createSqliteSessionMetadataStore(path, { now: () => 200 });
 try {
 assert.equal(reopened.schemaVersion(), 1);
 assert.equal(reopened.schemaVersion(), 2);
 assert.deepEqual(await reopened.read(header.id), {
 header,
 metadataVersion: 1,
Expand All@@ -50,7 +50,7 @@ describe('SqliteSessionMetadataStore', () => {
 const metadata = createSqliteSessionMetadataStore(path);
 try {
 assert.equal(runtime.schemaVersion(), 4);
 assert.equal(metadata.schemaVersion(), 1);
 assert.equal(metadata.schemaVersion(), 2);
 await metadata.create(fullHeader());
 await runtime.appendRuntimeEvent('session-1', 'run-1', {
 id: 'event-1',
Expand DownExpand Up@@ -205,10 +205,12 @@ describe('SqliteSessionMetadataStore', () => {
 assert.deepEqual(await store.importEntries([entry]), {
 created: [true],
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.deepEqual(await store.importEntries([entry]), {
 created: [],
 sourcesAlreadyImported: 1,
 sourcesTombstoned: 0,
 });
 await assert.rejects(
 () =>
Expand DownExpand Up@@ -264,6 +266,16 @@ describe('SqliteSessionMetadataStore', () => {
 assert.equal(await store.remove('session-1'), true);
 assert.equal(await store.remove('session-1'), false);
 assert.deepEqual(await store.list({ labelSlug: 'alpha' }), []);
 assert.deepEqual(
 await store.importEntries([
 {
 header: fullHeader(),
 source: { path: '/session-1.jsonl', fingerprint: '1:1' },
 },
 ]),
 { created: [], sourcesAlreadyImported: 0, sourcesTombstoned: 1 },
 );
 await assert.rejects(() => store.create(fullHeader()), /tombstoned/);
 } finally {
 store.close();
 }
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat(storage): make SQLite the default session metadata store#1372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

likun666661
merged 2 commits into

from

Jul 23, 2026
 Merged


feat(storage): make SQLite the default session metadata store
#1372
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e0221a0

Make SQLite the default session metadata store


likun666661 Jul 23, 2026
93fd480

Fix SQLite session metadata CI regressions


likun666661 Jul 23, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 7 additions & 12 deletions
apps/desktop/src/main/app-lifecycle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import type { BotRegistry, SessionManager, ShellRunProcessManager } from '@maka/
import type { McpClientManager } from '@maka/mcp';
import type {
 createConnectionStore,
 createSessionStore,
 createSettingsStore,
 createTelemetryRepo,
 openRuntimeEventPersistence,
Expand All@@ -15,7 +16,6 @@ import type { createFileCredentialStore } from './credential-store.js';
import { startConfigFileWatcher, type ConfigFileWatcher } from './config-file-watcher.js';
import { toContractNetworkSettings } from './network-settings-main.js';
import { importLegacyOAuthTokenFiles } from './oauth/shared-credential-bridge.js';
import { seedE2eFixture } from './e2e-fixture.js';
import type { resolveE2eFixture } from './e2e-fixture.js';
import type { OpenGatewayService } from './open-gateway.js';
import type { KeepSystemAwakeController } from './keep-system-awake.js';
Expand All@@ -35,6 +35,7 @@ export interface AppLifecycleDeps {
 isIsolatedE2e: boolean;
 e2eFixture: ReturnType<typeof resolveE2eFixture>;
 workspaceRoot: string;
 sessionStore: ReturnType<typeof createSessionStore>;
 credentialStore: ReturnType<typeof createFileCredentialStore>;
 connectionStore: ReturnType<typeof createConnectionStore>;
 settingsStore: ReturnType<typeof createSettingsStore>;
Expand DownExpand Up@@ -84,6 +85,7 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 isIsolatedE2e,
 e2eFixture,
 workspaceRoot,
 sessionStore,
 credentialStore,
 connectionStore,
 settingsStore,
Expand DownExpand Up@@ -201,17 +203,9 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 // settled. Any state that background startup mutates is pushed to the
 // renderer via the existing `sessions:changed` / `connections:event`
 // / `settings:bots:statusChanged` channels, so the UI converges lazily.
 // E2e-fixture mode wipes and reseeds the whole workspace
 // (`rm -rf` first). That wipe must finish BEFORE the window opens and
 // before background startup touches the workspace: createWindow reads
 // the settings store, and a concurrent wipe lands inside the store's
 // read-or-create write (mkdir → tmp → rename), rejecting createWindow
 // so the window never appears. Fixture runs trade first-paint latency
 // for determinism by definition; production launches skip this await.
 if (e2eFixture) {
 console.log(`[e2e-fixture] scenario=${e2eFixture.scenario} workspace=${workspaceRoot}`);
 await seedE2eFixture({ workspaceRoot, fixture: e2eFixture, credentialStore });
 }
 // E2E fixture workspaces are wiped and seeded before stores open in
 // main.ts. SQLite keeps live file handles, so resetting the workspace
 // here after store construction would detach the canonical database.
 await runCredentialStartup();
 app.on('second-instance', focusOrCreateMainWindow);
 app.on('activate', focusOrCreateMainWindow);
Expand DownExpand Up@@ -331,5 +325,6 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 if (result.status === 'rejected') console.error('[shutdown] cleanup failed:', result.reason);
 }
 runtimePersistence.close();
 sessionStore.close?.();
 }
}

12 changes: 9 additions & 3 deletions
apps/desktop/src/main/main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ import { bindOnboardingDeps, createOnboardingService } from './onboarding-servic
import { handleQuickChatStart as runQuickChatStart, type QuickChatResult } from './quick-chat.js';
import { createDailyReviewArchiveStore } from './daily-review-archive-store.js';
import { resolveDefaultPermissionMode } from './permission-mode-default.js';
import { resolveE2eFixture } from './e2e-fixture.js';
import { resolveE2eFixture, seedE2eFixture } from './e2e-fixture.js';
import { resolveBuildInfo } from './build-info.js';
import { OpenGatewayService } from './open-gateway.js';
import { LocalMemoryService } from './local-memory-service.js';
Expand DownExpand Up@@ -196,7 +196,13 @@ try {
 throw error;
}
const workspaceRoot = join(app.getPath('userData'), 'workspaces', e2eFixture?.workspaceName ?? 'default');
await resolveStorageRoot({ path: workspaceRoot, kind: 'interactive' });
const credentialStore = createFileCredentialStore(workspaceRoot);
if (e2eFixture) {
 console.log(`[e2e-fixture] scenario=${e2eFixture.scenario} workspace=${workspaceRoot}`);
 await seedE2eFixture({ workspaceRoot, fixture: e2eFixture, credentialStore });
} else {
 await resolveStorageRoot({ path: workspaceRoot, kind: 'interactive' });
}
// 保持系统唤醒 (settings.system.keepSystemAwake): holds an Electron
// `powerSaveBlocker` so in-process scheduled tasks keep firing while the
// machine would otherwise sleep. Injected with electron's blocker; the
Expand DownExpand Up@@ -233,7 +239,6 @@ const artifactStore = createArtifactStore(workspaceRoot);
const deepResearchStore = createDeepResearchStore(workspaceRoot);
const storeReadImage = createReadImageSnapshotter(artifactStore);
const attachmentApprovals = createAttachmentApprovalRegistry();
const credentialStore = createFileCredentialStore(workspaceRoot);
// PR-OAUTH-SUBSCRIPTION-0: Claude subscription OAuth service.
// Lives in main process only; renderer accesses via IPC. Tokens
// never cross the IPC boundary (xuan G-X3). Cloak path is dynamic-
Expand DownExpand Up@@ -1214,6 +1219,7 @@ wireAppLifecycle({
 isIsolatedE2e,
 e2eFixture,
 workspaceRoot,
 sessionStore: store,
 credentialStore,
 connectionStore,
 settingsStore,
Expand Down

1 change: 1 addition & 0 deletions
packages/cli/src/runtime-bootstrap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -889,6 +889,7 @@ export async function createMakaCliRuntimeContext(
 goalManager.dispose();
 await shellRuns.terminateAll();
 shellRunListeners.clear();
 store.close?.();
 runtimePersistence.close();
 },
 };
Expand Down

8 changes: 6 additions & 2 deletions
packages/headless/src/__tests__/headless-storage-boundary.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,14 +227,18 @@ async function snapshotTree(path: string, label: string): Promise<ManifestEntry[
 : stats.isSymbolicLink()
 ? 'symlink'
 : 'other';
 const isSqliteSharedMemory = type === 'file' && label.endsWith('.sqlite-shm');
 const entry: ManifestEntry = {
 path: label,
 type,
 mode: Number(stats.mode & 0o7777n),
 size: stats.size.toString(),
 mtimeNs: stats.mtimeNs.toString(),
 // WAL readers update lock slots in the SQLite shared-memory sidecar.
 // Those bytes and their timestamp are connection coordination, not
 // durable storage mutation; the database and WAL remain fully compared.
 ...(isSqliteSharedMemory ? {} : { mtimeNs: stats.mtimeNs.toString() }),
 };
 if (type === 'file') {
 if (type === 'file' && !isSqliteSharedMemory) {
 entry.contentSha256 = createHash('sha256')
 .update(await readFile(path))
 .digest('hex');
Expand Down

35 changes: 33 additions & 2 deletions
packages/storage/src/__tests__/session-metadata-transfer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { join } from 'node:path';
import { describe, test } from 'node:test';
import type { CreateSessionInput } from '@maka/core';
import { importLegacySessionMetadataTree } from '../session-metadata-transfer.js';
import { createSessionStore } from '../session-store.js';
import { createLegacyFileSessionStore as createSessionStore } from '../session-store.js';
import { createSqliteSessionMetadataStore } from '../sqlite-session-metadata-store.js';

describe('legacy session metadata transfer', () => {
Expand DownExpand Up@@ -39,6 +39,7 @@ describe('legacy session metadata transfer', () => {
 headersImported: 2,
 headersExisting: 0,
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.deepEqual((await sqlite.list()).map((record) => record.header.name).sort(), [
 'First',
Expand DownExpand Up@@ -72,6 +73,7 @@ describe('legacy session metadata transfer', () => {
 headersImported: 0,
 headersExisting: 0,
 sourcesAlreadyImported: 2,
 sourcesTombstoned: 0,
 });
 assert.equal((await sqlite.read(first.id)).header.name, 'SQLite is canonical now');
 } finally {
Expand DownExpand Up@@ -135,7 +137,7 @@ describe('legacy session metadata transfer', () => {

 await assert.rejects(
 () => importLegacySessionMetadataTree({ workspaceRoot: root, destination: sqlite }),
 /Invalid session header/,
 /Invalid legacy session header/,
 );
 await assert.rejects(() => sqlite.read(valid.id), /not found/);
 assert.deepEqual(await sqlite.list(), []);
Expand All@@ -144,6 +146,35 @@ describe('legacy session metadata transfer', () => {
 await rm(root, { recursive: true, force: true });
 }
 });

 test('keeps canonical metadata readable when its optional transcript is missing', async () => {
 const root = await mkdtemp(join(tmpdir(), 'maka-session-transfer-missing-transcript-'));
 const legacy = createSessionStore(root);
 const sqlite = createSqliteSessionMetadataStore(join(root, 'state.sqlite'));
 try {
 const created = await legacy.create(makeInput({ name: 'Canonical metadata' }));
 await importLegacySessionMetadataTree({ workspaceRoot: root, destination: sqlite });
 await rm(join(root, 'sessions', created.id, 'session.jsonl'));

 const report = await importLegacySessionMetadataTree({
 workspaceRoot: root,
 destination: sqlite,
 });

 assert.deepEqual(report, {
 filesScanned: 1,
 headersRead: 0,
 headersImported: 0,
 headersExisting: 0,
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.equal((await sqlite.read(created.id)).header.name, 'Canonical metadata');
 } finally {
 sqlite.close();
 await rm(root, { recursive: true, force: true });
 }
 });
});

function makeInput(overrides: Partial<CreateSessionInput> = {}): CreateSessionInput {
Expand Down

2 changes: 1 addition & 1 deletion
packages/storage/src/__tests__/session-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { join } from 'node:path';
import { tmpdir } from 'node:os';
import { describe, test } from 'node:test';
import type { CreateSessionInput, SessionHeader, StoredMessage } from '@maka/core';
import { createSessionStore } from '../session-store.js';
import { createLegacyFileSessionStore as createSessionStore } from '../session-store.js';

describe('FileSessionStore CRUD', () => {
 test('list on a missing workspace is observational and does not create session storage', async () => {
Expand Down

18 changes: 15 additions & 3 deletions
packages/storage/src/__tests__/sqlite-session-metadata-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ describe('SqliteSessionMetadataStore', () => {
 try {
 const store = createSqliteSessionMetadataStore(path, { now: () => 100 });
 const header = fullHeader();
 assert.equal(store.schemaVersion(), 1);
 assert.equal(store.schemaVersion(), 2);
 assert.equal(store.journalMode(), 'wal');
 assert.deepEqual(await store.create(header), {
 header,
Expand All@@ -29,7 +29,7 @@ describe('SqliteSessionMetadataStore', () => {

 const reopened = createSqliteSessionMetadataStore(path, { now: () => 200 });
 try {
 assert.equal(reopened.schemaVersion(), 1);
 assert.equal(reopened.schemaVersion(), 2);
 assert.deepEqual(await reopened.read(header.id), {
 header,
 metadataVersion: 1,
Expand All@@ -50,7 +50,7 @@ describe('SqliteSessionMetadataStore', () => {
 const metadata = createSqliteSessionMetadataStore(path);
 try {
 assert.equal(runtime.schemaVersion(), 4);
 assert.equal(metadata.schemaVersion(), 1);
 assert.equal(metadata.schemaVersion(), 2);
 await metadata.create(fullHeader());
 await runtime.appendRuntimeEvent('session-1', 'run-1', {
 id: 'event-1',
Expand DownExpand Up@@ -205,10 +205,12 @@ describe('SqliteSessionMetadataStore', () => {
 assert.deepEqual(await store.importEntries([entry]), {
 created: [true],
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.deepEqual(await store.importEntries([entry]), {
 created: [],
 sourcesAlreadyImported: 1,
 sourcesTombstoned: 0,
 });
 await assert.rejects(
 () =>
Expand DownExpand Up@@ -264,6 +266,16 @@ describe('SqliteSessionMetadataStore', () => {
 assert.equal(await store.remove('session-1'), true);
 assert.equal(await store.remove('session-1'), false);
 assert.deepEqual(await store.list({ labelSlug: 'alpha' }), []);
 assert.deepEqual(
 await store.importEntries([
 {
 header: fullHeader(),
 source: { path: '/session-1.jsonl', fingerprint: '1:1' },
 },
 ]),
 { created: [], sourcesAlreadyImported: 0, sourcesTombstoned: 1 },
 );
 await assert.rejects(() => store.create(fullHeader()), /tombstoned/);
 } finally {
 store.close();
 }
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(storage): make SQLite the default session metadata store#1372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

likun666661
merged 2 commits into

from

Jul 23, 2026
 Merged


feat(storage): make SQLite the default session metadata store
#1372
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e0221a0

Make SQLite the default session metadata store


likun666661 Jul 23, 2026
93fd480

Fix SQLite session metadata CI regressions


likun666661 Jul 23, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 7 additions & 12 deletions
apps/desktop/src/main/app-lifecycle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import type { BotRegistry, SessionManager, ShellRunProcessManager } from '@maka/
import type { McpClientManager } from '@maka/mcp';
import type {
 createConnectionStore,
 createSessionStore,
 createSettingsStore,
 createTelemetryRepo,
 openRuntimeEventPersistence,
Expand All@@ -15,7 +16,6 @@ import type { createFileCredentialStore } from './credential-store.js';
import { startConfigFileWatcher, type ConfigFileWatcher } from './config-file-watcher.js';
import { toContractNetworkSettings } from './network-settings-main.js';
import { importLegacyOAuthTokenFiles } from './oauth/shared-credential-bridge.js';
import { seedE2eFixture } from './e2e-fixture.js';
import type { resolveE2eFixture } from './e2e-fixture.js';
import type { OpenGatewayService } from './open-gateway.js';
import type { KeepSystemAwakeController } from './keep-system-awake.js';
Expand All@@ -35,6 +35,7 @@ export interface AppLifecycleDeps {
 isIsolatedE2e: boolean;
 e2eFixture: ReturnType<typeof resolveE2eFixture>;
 workspaceRoot: string;
 sessionStore: ReturnType<typeof createSessionStore>;
 credentialStore: ReturnType<typeof createFileCredentialStore>;
 connectionStore: ReturnType<typeof createConnectionStore>;
 settingsStore: ReturnType<typeof createSettingsStore>;
Expand DownExpand Up@@ -84,6 +85,7 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 isIsolatedE2e,
 e2eFixture,
 workspaceRoot,
 sessionStore,
 credentialStore,
 connectionStore,
 settingsStore,
Expand DownExpand Up@@ -201,17 +203,9 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 // settled. Any state that background startup mutates is pushed to the
 // renderer via the existing `sessions:changed` / `connections:event`
 // / `settings:bots:statusChanged` channels, so the UI converges lazily.
 // E2e-fixture mode wipes and reseeds the whole workspace
 // (`rm -rf` first). That wipe must finish BEFORE the window opens and
 // before background startup touches the workspace: createWindow reads
 // the settings store, and a concurrent wipe lands inside the store's
 // read-or-create write (mkdir → tmp → rename), rejecting createWindow
 // so the window never appears. Fixture runs trade first-paint latency
 // for determinism by definition; production launches skip this await.
 if (e2eFixture) {
 console.log(`[e2e-fixture] scenario=${e2eFixture.scenario} workspace=${workspaceRoot}`);
 await seedE2eFixture({ workspaceRoot, fixture: e2eFixture, credentialStore });
 }
 // E2E fixture workspaces are wiped and seeded before stores open in
 // main.ts. SQLite keeps live file handles, so resetting the workspace
 // here after store construction would detach the canonical database.
 await runCredentialStartup();
 app.on('second-instance', focusOrCreateMainWindow);
 app.on('activate', focusOrCreateMainWindow);
Expand DownExpand Up@@ -331,5 +325,6 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 if (result.status === 'rejected') console.error('[shutdown] cleanup failed:', result.reason);
 }
 runtimePersistence.close();
 sessionStore.close?.();
 }
}

12 changes: 9 additions & 3 deletions
apps/desktop/src/main/main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ import { bindOnboardingDeps, createOnboardingService } from './onboarding-servic
import { handleQuickChatStart as runQuickChatStart, type QuickChatResult } from './quick-chat.js';
import { createDailyReviewArchiveStore } from './daily-review-archive-store.js';
import { resolveDefaultPermissionMode } from './permission-mode-default.js';
import { resolveE2eFixture } from './e2e-fixture.js';
import { resolveE2eFixture, seedE2eFixture } from './e2e-fixture.js';
import { resolveBuildInfo } from './build-info.js';
import { OpenGatewayService } from './open-gateway.js';
import { LocalMemoryService } from './local-memory-service.js';
Expand DownExpand Up@@ -196,7 +196,13 @@ try {
 throw error;
}
const workspaceRoot = join(app.getPath('userData'), 'workspaces', e2eFixture?.workspaceName ?? 'default');
await resolveStorageRoot({ path: workspaceRoot, kind: 'interactive' });
const credentialStore = createFileCredentialStore(workspaceRoot);
if (e2eFixture) {
 console.log(`[e2e-fixture] scenario=${e2eFixture.scenario} workspace=${workspaceRoot}`);
 await seedE2eFixture({ workspaceRoot, fixture: e2eFixture, credentialStore });
} else {
 await resolveStorageRoot({ path: workspaceRoot, kind: 'interactive' });
}
// 保持系统唤醒 (settings.system.keepSystemAwake): holds an Electron
// `powerSaveBlocker` so in-process scheduled tasks keep firing while the
// machine would otherwise sleep. Injected with electron's blocker; the
Expand DownExpand Up@@ -233,7 +239,6 @@ const artifactStore = createArtifactStore(workspaceRoot);
const deepResearchStore = createDeepResearchStore(workspaceRoot);
const storeReadImage = createReadImageSnapshotter(artifactStore);
const attachmentApprovals = createAttachmentApprovalRegistry();
const credentialStore = createFileCredentialStore(workspaceRoot);
// PR-OAUTH-SUBSCRIPTION-0: Claude subscription OAuth service.
// Lives in main process only; renderer accesses via IPC. Tokens
// never cross the IPC boundary (xuan G-X3). Cloak path is dynamic-
Expand DownExpand Up@@ -1214,6 +1219,7 @@ wireAppLifecycle({
 isIsolatedE2e,
 e2eFixture,
 workspaceRoot,
 sessionStore: store,
 credentialStore,
 connectionStore,
 settingsStore,
Expand Down

1 change: 1 addition & 0 deletions
packages/cli/src/runtime-bootstrap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -889,6 +889,7 @@ export async function createMakaCliRuntimeContext(
 goalManager.dispose();
 await shellRuns.terminateAll();
 shellRunListeners.clear();
 store.close?.();
 runtimePersistence.close();
 },
 };
Expand Down

8 changes: 6 additions & 2 deletions
packages/headless/src/__tests__/headless-storage-boundary.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,14 +227,18 @@ async function snapshotTree(path: string, label: string): Promise<ManifestEntry[
 : stats.isSymbolicLink()
 ? 'symlink'
 : 'other';
 const isSqliteSharedMemory = type === 'file' && label.endsWith('.sqlite-shm');
 const entry: ManifestEntry = {
 path: label,
 type,
 mode: Number(stats.mode & 0o7777n),
 size: stats.size.toString(),
 mtimeNs: stats.mtimeNs.toString(),
 // WAL readers update lock slots in the SQLite shared-memory sidecar.
 // Those bytes and their timestamp are connection coordination, not
 // durable storage mutation; the database and WAL remain fully compared.
 ...(isSqliteSharedMemory ? {} : { mtimeNs: stats.mtimeNs.toString() }),
 };
 if (type === 'file') {
 if (type === 'file' && !isSqliteSharedMemory) {
 entry.contentSha256 = createHash('sha256')
 .update(await readFile(path))
 .digest('hex');
Expand Down

35 changes: 33 additions & 2 deletions
packages/storage/src/__tests__/session-metadata-transfer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { join } from 'node:path';
import { describe, test } from 'node:test';
import type { CreateSessionInput } from '@maka/core';
import { importLegacySessionMetadataTree } from '../session-metadata-transfer.js';
import { createSessionStore } from '../session-store.js';
import { createLegacyFileSessionStore as createSessionStore } from '../session-store.js';
import { createSqliteSessionMetadataStore } from '../sqlite-session-metadata-store.js';

describe('legacy session metadata transfer', () => {
Expand DownExpand Up@@ -39,6 +39,7 @@ describe('legacy session metadata transfer', () => {
 headersImported: 2,
 headersExisting: 0,
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.deepEqual((await sqlite.list()).map((record) => record.header.name).sort(), [
 'First',
Expand DownExpand Up@@ -72,6 +73,7 @@ describe('legacy session metadata transfer', () => {
 headersImported: 0,
 headersExisting: 0,
 sourcesAlreadyImported: 2,
 sourcesTombstoned: 0,
 });
 assert.equal((await sqlite.read(first.id)).header.name, 'SQLite is canonical now');
 } finally {
Expand DownExpand Up@@ -135,7 +137,7 @@ describe('legacy session metadata transfer', () => {

 await assert.rejects(
 () => importLegacySessionMetadataTree({ workspaceRoot: root, destination: sqlite }),
 /Invalid session header/,
 /Invalid legacy session header/,
 );
 await assert.rejects(() => sqlite.read(valid.id), /not found/);
 assert.deepEqual(await sqlite.list(), []);
Expand All@@ -144,6 +146,35 @@ describe('legacy session metadata transfer', () => {
 await rm(root, { recursive: true, force: true });
 }
 });

 test('keeps canonical metadata readable when its optional transcript is missing', async () => {
 const root = await mkdtemp(join(tmpdir(), 'maka-session-transfer-missing-transcript-'));
 const legacy = createSessionStore(root);
 const sqlite = createSqliteSessionMetadataStore(join(root, 'state.sqlite'));
 try {
 const created = await legacy.create(makeInput({ name: 'Canonical metadata' }));
 await importLegacySessionMetadataTree({ workspaceRoot: root, destination: sqlite });
 await rm(join(root, 'sessions', created.id, 'session.jsonl'));

 const report = await importLegacySessionMetadataTree({
 workspaceRoot: root,
 destination: sqlite,
 });

 assert.deepEqual(report, {
 filesScanned: 1,
 headersRead: 0,
 headersImported: 0,
 headersExisting: 0,
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.equal((await sqlite.read(created.id)).header.name, 'Canonical metadata');
 } finally {
 sqlite.close();
 await rm(root, { recursive: true, force: true });
 }
 });
});

function makeInput(overrides: Partial<CreateSessionInput> = {}): CreateSessionInput {
Expand Down

2 changes: 1 addition & 1 deletion
packages/storage/src/__tests__/session-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { join } from 'node:path';
import { tmpdir } from 'node:os';
import { describe, test } from 'node:test';
import type { CreateSessionInput, SessionHeader, StoredMessage } from '@maka/core';
import { createSessionStore } from '../session-store.js';
import { createLegacyFileSessionStore as createSessionStore } from '../session-store.js';

describe('FileSessionStore CRUD', () => {
 test('list on a missing workspace is observational and does not create session storage', async () => {
Expand Down

18 changes: 15 additions & 3 deletions
packages/storage/src/__tests__/sqlite-session-metadata-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ describe('SqliteSessionMetadataStore', () => {
 try {
 const store = createSqliteSessionMetadataStore(path, { now: () => 100 });
 const header = fullHeader();
 assert.equal(store.schemaVersion(), 1);
 assert.equal(store.schemaVersion(), 2);
 assert.equal(store.journalMode(), 'wal');
 assert.deepEqual(await store.create(header), {
 header,
Expand All@@ -29,7 +29,7 @@ describe('SqliteSessionMetadataStore', () => {

 const reopened = createSqliteSessionMetadataStore(path, { now: () => 200 });
 try {
 assert.equal(reopened.schemaVersion(), 1);
 assert.equal(reopened.schemaVersion(), 2);
 assert.deepEqual(await reopened.read(header.id), {
 header,
 metadataVersion: 1,
Expand All@@ -50,7 +50,7 @@ describe('SqliteSessionMetadataStore', () => {
 const metadata = createSqliteSessionMetadataStore(path);
 try {
 assert.equal(runtime.schemaVersion(), 4);
 assert.equal(metadata.schemaVersion(), 1);
 assert.equal(metadata.schemaVersion(), 2);
 await metadata.create(fullHeader());
 await runtime.appendRuntimeEvent('session-1', 'run-1', {
 id: 'event-1',
Expand DownExpand Up@@ -205,10 +205,12 @@ describe('SqliteSessionMetadataStore', () => {
 assert.deepEqual(await store.importEntries([entry]), {
 created: [true],
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.deepEqual(await store.importEntries([entry]), {
 created: [],
 sourcesAlreadyImported: 1,
 sourcesTombstoned: 0,
 });
 await assert.rejects(
 () =>
Expand DownExpand Up@@ -264,6 +266,16 @@ describe('SqliteSessionMetadataStore', () => {
 assert.equal(await store.remove('session-1'), true);
 assert.equal(await store.remove('session-1'), false);
 assert.deepEqual(await store.list({ labelSlug: 'alpha' }), []);
 assert.deepEqual(
 await store.importEntries([
 {
 header: fullHeader(),
 source: { path: '/session-1.jsonl', fingerprint: '1:1' },
 },
 ]),
 { created: [], sourcesAlreadyImported: 0, sourcesTombstoned: 1 },
 );
 await assert.rejects(() => store.create(fullHeader()), /tombstoned/);
 } finally {
 store.close();
 }
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(storage): make SQLite the default session metadata store#1372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

likun666661
merged 2 commits into

from

Jul 23, 2026
 Merged


feat(storage): make SQLite the default session metadata store
#1372
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e0221a0

Make SQLite the default session metadata store


likun666661 Jul 23, 2026
93fd480

Fix SQLite session metadata CI regressions


likun666661 Jul 23, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 7 additions & 12 deletions
apps/desktop/src/main/app-lifecycle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import type { BotRegistry, SessionManager, ShellRunProcessManager } from '@maka/
import type { McpClientManager } from '@maka/mcp';
import type {
 createConnectionStore,
 createSessionStore,
 createSettingsStore,
 createTelemetryRepo,
 openRuntimeEventPersistence,
Expand All@@ -15,7 +16,6 @@ import type { createFileCredentialStore } from './credential-store.js';
import { startConfigFileWatcher, type ConfigFileWatcher } from './config-file-watcher.js';
import { toContractNetworkSettings } from './network-settings-main.js';
import { importLegacyOAuthTokenFiles } from './oauth/shared-credential-bridge.js';
import { seedE2eFixture } from './e2e-fixture.js';
import type { resolveE2eFixture } from './e2e-fixture.js';
import type { OpenGatewayService } from './open-gateway.js';
import type { KeepSystemAwakeController } from './keep-system-awake.js';
Expand All@@ -35,6 +35,7 @@ export interface AppLifecycleDeps {
 isIsolatedE2e: boolean;
 e2eFixture: ReturnType<typeof resolveE2eFixture>;
 workspaceRoot: string;
 sessionStore: ReturnType<typeof createSessionStore>;
 credentialStore: ReturnType<typeof createFileCredentialStore>;
 connectionStore: ReturnType<typeof createConnectionStore>;
 settingsStore: ReturnType<typeof createSettingsStore>;
Expand DownExpand Up@@ -84,6 +85,7 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 isIsolatedE2e,
 e2eFixture,
 workspaceRoot,
 sessionStore,
 credentialStore,
 connectionStore,
 settingsStore,
Expand DownExpand Up@@ -201,17 +203,9 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 // settled. Any state that background startup mutates is pushed to the
 // renderer via the existing `sessions:changed` / `connections:event`
 // / `settings:bots:statusChanged` channels, so the UI converges lazily.
 // E2e-fixture mode wipes and reseeds the whole workspace
 // (`rm -rf` first). That wipe must finish BEFORE the window opens and
 // before background startup touches the workspace: createWindow reads
 // the settings store, and a concurrent wipe lands inside the store's
 // read-or-create write (mkdir → tmp → rename), rejecting createWindow
 // so the window never appears. Fixture runs trade first-paint latency
 // for determinism by definition; production launches skip this await.
 if (e2eFixture) {
 console.log(`[e2e-fixture] scenario=${e2eFixture.scenario} workspace=${workspaceRoot}`);
 await seedE2eFixture({ workspaceRoot, fixture: e2eFixture, credentialStore });
 }
 // E2E fixture workspaces are wiped and seeded before stores open in
 // main.ts. SQLite keeps live file handles, so resetting the workspace
 // here after store construction would detach the canonical database.
 await runCredentialStartup();
 app.on('second-instance', focusOrCreateMainWindow);
 app.on('activate', focusOrCreateMainWindow);
Expand DownExpand Up@@ -331,5 +325,6 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 if (result.status === 'rejected') console.error('[shutdown] cleanup failed:', result.reason);
 }
 runtimePersistence.close();
 sessionStore.close?.();
 }
}

12 changes: 9 additions & 3 deletions
apps/desktop/src/main/main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ import { bindOnboardingDeps, createOnboardingService } from './onboarding-servic
import { handleQuickChatStart as runQuickChatStart, type QuickChatResult } from './quick-chat.js';
import { createDailyReviewArchiveStore } from './daily-review-archive-store.js';
import { resolveDefaultPermissionMode } from './permission-mode-default.js';
import { resolveE2eFixture } from './e2e-fixture.js';
import { resolveE2eFixture, seedE2eFixture } from './e2e-fixture.js';
import { resolveBuildInfo } from './build-info.js';
import { OpenGatewayService } from './open-gateway.js';
import { LocalMemoryService } from './local-memory-service.js';
Expand DownExpand Up@@ -196,7 +196,13 @@ try {
 throw error;
}
const workspaceRoot = join(app.getPath('userData'), 'workspaces', e2eFixture?.workspaceName ?? 'default');
await resolveStorageRoot({ path: workspaceRoot, kind: 'interactive' });
const credentialStore = createFileCredentialStore(workspaceRoot);
if (e2eFixture) {
 console.log(`[e2e-fixture] scenario=${e2eFixture.scenario} workspace=${workspaceRoot}`);
 await seedE2eFixture({ workspaceRoot, fixture: e2eFixture, credentialStore });
} else {
 await resolveStorageRoot({ path: workspaceRoot, kind: 'interactive' });
}
// 保持系统唤醒 (settings.system.keepSystemAwake): holds an Electron
// `powerSaveBlocker` so in-process scheduled tasks keep firing while the
// machine would otherwise sleep. Injected with electron's blocker; the
Expand DownExpand Up@@ -233,7 +239,6 @@ const artifactStore = createArtifactStore(workspaceRoot);
const deepResearchStore = createDeepResearchStore(workspaceRoot);
const storeReadImage = createReadImageSnapshotter(artifactStore);
const attachmentApprovals = createAttachmentApprovalRegistry();
const credentialStore = createFileCredentialStore(workspaceRoot);
// PR-OAUTH-SUBSCRIPTION-0: Claude subscription OAuth service.
// Lives in main process only; renderer accesses via IPC. Tokens
// never cross the IPC boundary (xuan G-X3). Cloak path is dynamic-
Expand DownExpand Up@@ -1214,6 +1219,7 @@ wireAppLifecycle({
 isIsolatedE2e,
 e2eFixture,
 workspaceRoot,
 sessionStore: store,
 credentialStore,
 connectionStore,
 settingsStore,
Expand Down

1 change: 1 addition & 0 deletions
packages/cli/src/runtime-bootstrap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -889,6 +889,7 @@ export async function createMakaCliRuntimeContext(
 goalManager.dispose();
 await shellRuns.terminateAll();
 shellRunListeners.clear();
 store.close?.();
 runtimePersistence.close();
 },
 };
Expand Down

8 changes: 6 additions & 2 deletions
packages/headless/src/__tests__/headless-storage-boundary.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,14 +227,18 @@ async function snapshotTree(path: string, label: string): Promise<ManifestEntry[
 : stats.isSymbolicLink()
 ? 'symlink'
 : 'other';
 const isSqliteSharedMemory = type === 'file' && label.endsWith('.sqlite-shm');
 const entry: ManifestEntry = {
 path: label,
 type,
 mode: Number(stats.mode & 0o7777n),
 size: stats.size.toString(),
 mtimeNs: stats.mtimeNs.toString(),
 // WAL readers update lock slots in the SQLite shared-memory sidecar.
 // Those bytes and their timestamp are connection coordination, not
 // durable storage mutation; the database and WAL remain fully compared.
 ...(isSqliteSharedMemory ? {} : { mtimeNs: stats.mtimeNs.toString() }),
 };
 if (type === 'file') {
 if (type === 'file' && !isSqliteSharedMemory) {
 entry.contentSha256 = createHash('sha256')
 .update(await readFile(path))
 .digest('hex');
Expand Down

35 changes: 33 additions & 2 deletions
packages/storage/src/__tests__/session-metadata-transfer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { join } from 'node:path';
import { describe, test } from 'node:test';
import type { CreateSessionInput } from '@maka/core';
import { importLegacySessionMetadataTree } from '../session-metadata-transfer.js';
import { createSessionStore } from '../session-store.js';
import { createLegacyFileSessionStore as createSessionStore } from '../session-store.js';
import { createSqliteSessionMetadataStore } from '../sqlite-session-metadata-store.js';

describe('legacy session metadata transfer', () => {
Expand DownExpand Up@@ -39,6 +39,7 @@ describe('legacy session metadata transfer', () => {
 headersImported: 2,
 headersExisting: 0,
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.deepEqual((await sqlite.list()).map((record) => record.header.name).sort(), [
 'First',
Expand DownExpand Up@@ -72,6 +73,7 @@ describe('legacy session metadata transfer', () => {
 headersImported: 0,
 headersExisting: 0,
 sourcesAlreadyImported: 2,
 sourcesTombstoned: 0,
 });
 assert.equal((await sqlite.read(first.id)).header.name, 'SQLite is canonical now');
 } finally {
Expand DownExpand Up@@ -135,7 +137,7 @@ describe('legacy session metadata transfer', () => {

 await assert.rejects(
 () => importLegacySessionMetadataTree({ workspaceRoot: root, destination: sqlite }),
 /Invalid session header/,
 /Invalid legacy session header/,
 );
 await assert.rejects(() => sqlite.read(valid.id), /not found/);
 assert.deepEqual(await sqlite.list(), []);
Expand All@@ -144,6 +146,35 @@ describe('legacy session metadata transfer', () => {
 await rm(root, { recursive: true, force: true });
 }
 });

 test('keeps canonical metadata readable when its optional transcript is missing', async () => {
 const root = await mkdtemp(join(tmpdir(), 'maka-session-transfer-missing-transcript-'));
 const legacy = createSessionStore(root);
 const sqlite = createSqliteSessionMetadataStore(join(root, 'state.sqlite'));
 try {
 const created = await legacy.create(makeInput({ name: 'Canonical metadata' }));
 await importLegacySessionMetadataTree({ workspaceRoot: root, destination: sqlite });
 await rm(join(root, 'sessions', created.id, 'session.jsonl'));

 const report = await importLegacySessionMetadataTree({
 workspaceRoot: root,
 destination: sqlite,
 });

 assert.deepEqual(report, {
 filesScanned: 1,
 headersRead: 0,
 headersImported: 0,
 headersExisting: 0,
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.equal((await sqlite.read(created.id)).header.name, 'Canonical metadata');
 } finally {
 sqlite.close();
 await rm(root, { recursive: true, force: true });
 }
 });
});

function makeInput(overrides: Partial<CreateSessionInput> = {}): CreateSessionInput {
Expand Down

2 changes: 1 addition & 1 deletion
packages/storage/src/__tests__/session-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { join } from 'node:path';
import { tmpdir } from 'node:os';
import { describe, test } from 'node:test';
import type { CreateSessionInput, SessionHeader, StoredMessage } from '@maka/core';
import { createSessionStore } from '../session-store.js';
import { createLegacyFileSessionStore as createSessionStore } from '../session-store.js';

describe('FileSessionStore CRUD', () => {
 test('list on a missing workspace is observational and does not create session storage', async () => {
Expand Down

18 changes: 15 additions & 3 deletions
packages/storage/src/__tests__/sqlite-session-metadata-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ describe('SqliteSessionMetadataStore', () => {
 try {
 const store = createSqliteSessionMetadataStore(path, { now: () => 100 });
 const header = fullHeader();
 assert.equal(store.schemaVersion(), 1);
 assert.equal(store.schemaVersion(), 2);
 assert.equal(store.journalMode(), 'wal');
 assert.deepEqual(await store.create(header), {
 header,
Expand All@@ -29,7 +29,7 @@ describe('SqliteSessionMetadataStore', () => {

 const reopened = createSqliteSessionMetadataStore(path, { now: () => 200 });
 try {
 assert.equal(reopened.schemaVersion(), 1);
 assert.equal(reopened.schemaVersion(), 2);
 assert.deepEqual(await reopened.read(header.id), {
 header,
 metadataVersion: 1,
Expand All@@ -50,7 +50,7 @@ describe('SqliteSessionMetadataStore', () => {
 const metadata = createSqliteSessionMetadataStore(path);
 try {
 assert.equal(runtime.schemaVersion(), 4);
 assert.equal(metadata.schemaVersion(), 1);
 assert.equal(metadata.schemaVersion(), 2);
 await metadata.create(fullHeader());
 await runtime.appendRuntimeEvent('session-1', 'run-1', {
 id: 'event-1',
Expand DownExpand Up@@ -205,10 +205,12 @@ describe('SqliteSessionMetadataStore', () => {
 assert.deepEqual(await store.importEntries([entry]), {
 created: [true],
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.deepEqual(await store.importEntries([entry]), {
 created: [],
 sourcesAlreadyImported: 1,
 sourcesTombstoned: 0,
 });
 await assert.rejects(
 () =>
Expand DownExpand Up@@ -264,6 +266,16 @@ describe('SqliteSessionMetadataStore', () => {
 assert.equal(await store.remove('session-1'), true);
 assert.equal(await store.remove('session-1'), false);
 assert.deepEqual(await store.list({ labelSlug: 'alpha' }), []);
 assert.deepEqual(
 await store.importEntries([
 {
 header: fullHeader(),
 source: { path: '/session-1.jsonl', fingerprint: '1:1' },
 },
 ]),
 { created: [], sourcesAlreadyImported: 0, sourcesTombstoned: 1 },
 );
 await assert.rejects(() => store.create(fullHeader()), /tombstoned/);
 } finally {
 store.close();
 }
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat(storage): make SQLite the default session metadata store#1372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

likun666661
merged 2 commits into

from

Jul 23, 2026
 Merged


feat(storage): make SQLite the default session metadata store
#1372
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
e0221a0

Make SQLite the default session metadata store


likun666661 Jul 23, 2026
93fd480

Fix SQLite session metadata CI regressions


likun666661 Jul 23, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 7 additions & 12 deletions
apps/desktop/src/main/app-lifecycle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import type { BotRegistry, SessionManager, ShellRunProcessManager } from '@maka/
import type { McpClientManager } from '@maka/mcp';
import type {
 createConnectionStore,
 createSessionStore,
 createSettingsStore,
 createTelemetryRepo,
 openRuntimeEventPersistence,
Expand All@@ -15,7 +16,6 @@ import type { createFileCredentialStore } from './credential-store.js';
import { startConfigFileWatcher, type ConfigFileWatcher } from './config-file-watcher.js';
import { toContractNetworkSettings } from './network-settings-main.js';
import { importLegacyOAuthTokenFiles } from './oauth/shared-credential-bridge.js';
import { seedE2eFixture } from './e2e-fixture.js';
import type { resolveE2eFixture } from './e2e-fixture.js';
import type { OpenGatewayService } from './open-gateway.js';
import type { KeepSystemAwakeController } from './keep-system-awake.js';
Expand All@@ -35,6 +35,7 @@ export interface AppLifecycleDeps {
 isIsolatedE2e: boolean;
 e2eFixture: ReturnType<typeof resolveE2eFixture>;
 workspaceRoot: string;
 sessionStore: ReturnType<typeof createSessionStore>;
 credentialStore: ReturnType<typeof createFileCredentialStore>;
 connectionStore: ReturnType<typeof createConnectionStore>;
 settingsStore: ReturnType<typeof createSettingsStore>;
Expand DownExpand Up@@ -84,6 +85,7 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 isIsolatedE2e,
 e2eFixture,
 workspaceRoot,
 sessionStore,
 credentialStore,
 connectionStore,
 settingsStore,
Expand DownExpand Up@@ -201,17 +203,9 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 // settled. Any state that background startup mutates is pushed to the
 // renderer via the existing `sessions:changed` / `connections:event`
 // / `settings:bots:statusChanged` channels, so the UI converges lazily.
 // E2e-fixture mode wipes and reseeds the whole workspace
 // (`rm -rf` first). That wipe must finish BEFORE the window opens and
 // before background startup touches the workspace: createWindow reads
 // the settings store, and a concurrent wipe lands inside the store's
 // read-or-create write (mkdir → tmp → rename), rejecting createWindow
 // so the window never appears. Fixture runs trade first-paint latency
 // for determinism by definition; production launches skip this await.
 if (e2eFixture) {
 console.log(`[e2e-fixture] scenario=${e2eFixture.scenario} workspace=${workspaceRoot}`);
 await seedE2eFixture({ workspaceRoot, fixture: e2eFixture, credentialStore });
 }
 // E2E fixture workspaces are wiped and seeded before stores open in
 // main.ts. SQLite keeps live file handles, so resetting the workspace
 // here after store construction would detach the canonical database.
 await runCredentialStartup();
 app.on('second-instance', focusOrCreateMainWindow);
 app.on('activate', focusOrCreateMainWindow);
Expand DownExpand Up@@ -331,5 +325,6 @@ export function wireAppLifecycle(deps: AppLifecycleDeps): void {
 if (result.status === 'rejected') console.error('[shutdown] cleanup failed:', result.reason);
 }
 runtimePersistence.close();
 sessionStore.close?.();
 }
}

12 changes: 9 additions & 3 deletions
apps/desktop/src/main/main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ import { bindOnboardingDeps, createOnboardingService } from './onboarding-servic
import { handleQuickChatStart as runQuickChatStart, type QuickChatResult } from './quick-chat.js';
import { createDailyReviewArchiveStore } from './daily-review-archive-store.js';
import { resolveDefaultPermissionMode } from './permission-mode-default.js';
import { resolveE2eFixture } from './e2e-fixture.js';
import { resolveE2eFixture, seedE2eFixture } from './e2e-fixture.js';
import { resolveBuildInfo } from './build-info.js';
import { OpenGatewayService } from './open-gateway.js';
import { LocalMemoryService } from './local-memory-service.js';
Expand DownExpand Up@@ -196,7 +196,13 @@ try {
 throw error;
}
const workspaceRoot = join(app.getPath('userData'), 'workspaces', e2eFixture?.workspaceName ?? 'default');
await resolveStorageRoot({ path: workspaceRoot, kind: 'interactive' });
const credentialStore = createFileCredentialStore(workspaceRoot);
if (e2eFixture) {
 console.log(`[e2e-fixture] scenario=${e2eFixture.scenario} workspace=${workspaceRoot}`);
 await seedE2eFixture({ workspaceRoot, fixture: e2eFixture, credentialStore });
} else {
 await resolveStorageRoot({ path: workspaceRoot, kind: 'interactive' });
}
// 保持系统唤醒 (settings.system.keepSystemAwake): holds an Electron
// `powerSaveBlocker` so in-process scheduled tasks keep firing while the
// machine would otherwise sleep. Injected with electron's blocker; the
Expand DownExpand Up@@ -233,7 +239,6 @@ const artifactStore = createArtifactStore(workspaceRoot);
const deepResearchStore = createDeepResearchStore(workspaceRoot);
const storeReadImage = createReadImageSnapshotter(artifactStore);
const attachmentApprovals = createAttachmentApprovalRegistry();
const credentialStore = createFileCredentialStore(workspaceRoot);
// PR-OAUTH-SUBSCRIPTION-0: Claude subscription OAuth service.
// Lives in main process only; renderer accesses via IPC. Tokens
// never cross the IPC boundary (xuan G-X3). Cloak path is dynamic-
Expand DownExpand Up@@ -1214,6 +1219,7 @@ wireAppLifecycle({
 isIsolatedE2e,
 e2eFixture,
 workspaceRoot,
 sessionStore: store,
 credentialStore,
 connectionStore,
 settingsStore,
Expand Down

1 change: 1 addition & 0 deletions
packages/cli/src/runtime-bootstrap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -889,6 +889,7 @@ export async function createMakaCliRuntimeContext(
 goalManager.dispose();
 await shellRuns.terminateAll();
 shellRunListeners.clear();
 store.close?.();
 runtimePersistence.close();
 },
 };
Expand Down

8 changes: 6 additions & 2 deletions
packages/headless/src/__tests__/headless-storage-boundary.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -227,14 +227,18 @@ async function snapshotTree(path: string, label: string): Promise<ManifestEntry[
 : stats.isSymbolicLink()
 ? 'symlink'
 : 'other';
 const isSqliteSharedMemory = type === 'file' && label.endsWith('.sqlite-shm');
 const entry: ManifestEntry = {
 path: label,
 type,
 mode: Number(stats.mode & 0o7777n),
 size: stats.size.toString(),
 mtimeNs: stats.mtimeNs.toString(),
 // WAL readers update lock slots in the SQLite shared-memory sidecar.
 // Those bytes and their timestamp are connection coordination, not
 // durable storage mutation; the database and WAL remain fully compared.
 ...(isSqliteSharedMemory ? {} : { mtimeNs: stats.mtimeNs.toString() }),
 };
 if (type === 'file') {
 if (type === 'file' && !isSqliteSharedMemory) {
 entry.contentSha256 = createHash('sha256')
 .update(await readFile(path))
 .digest('hex');
Expand Down

35 changes: 33 additions & 2 deletions
packages/storage/src/__tests__/session-metadata-transfer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { join } from 'node:path';
import { describe, test } from 'node:test';
import type { CreateSessionInput } from '@maka/core';
import { importLegacySessionMetadataTree } from '../session-metadata-transfer.js';
import { createSessionStore } from '../session-store.js';
import { createLegacyFileSessionStore as createSessionStore } from '../session-store.js';
import { createSqliteSessionMetadataStore } from '../sqlite-session-metadata-store.js';

describe('legacy session metadata transfer', () => {
Expand DownExpand Up@@ -39,6 +39,7 @@ describe('legacy session metadata transfer', () => {
 headersImported: 2,
 headersExisting: 0,
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.deepEqual((await sqlite.list()).map((record) => record.header.name).sort(), [
 'First',
Expand DownExpand Up@@ -72,6 +73,7 @@ describe('legacy session metadata transfer', () => {
 headersImported: 0,
 headersExisting: 0,
 sourcesAlreadyImported: 2,
 sourcesTombstoned: 0,
 });
 assert.equal((await sqlite.read(first.id)).header.name, 'SQLite is canonical now');
 } finally {
Expand DownExpand Up@@ -135,7 +137,7 @@ describe('legacy session metadata transfer', () => {

 await assert.rejects(
 () => importLegacySessionMetadataTree({ workspaceRoot: root, destination: sqlite }),
 /Invalid session header/,
 /Invalid legacy session header/,
 );
 await assert.rejects(() => sqlite.read(valid.id), /not found/);
 assert.deepEqual(await sqlite.list(), []);
Expand All@@ -144,6 +146,35 @@ describe('legacy session metadata transfer', () => {
 await rm(root, { recursive: true, force: true });
 }
 });

 test('keeps canonical metadata readable when its optional transcript is missing', async () => {
 const root = await mkdtemp(join(tmpdir(), 'maka-session-transfer-missing-transcript-'));
 const legacy = createSessionStore(root);
 const sqlite = createSqliteSessionMetadataStore(join(root, 'state.sqlite'));
 try {
 const created = await legacy.create(makeInput({ name: 'Canonical metadata' }));
 await importLegacySessionMetadataTree({ workspaceRoot: root, destination: sqlite });
 await rm(join(root, 'sessions', created.id, 'session.jsonl'));

 const report = await importLegacySessionMetadataTree({
 workspaceRoot: root,
 destination: sqlite,
 });

 assert.deepEqual(report, {
 filesScanned: 1,
 headersRead: 0,
 headersImported: 0,
 headersExisting: 0,
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.equal((await sqlite.read(created.id)).header.name, 'Canonical metadata');
 } finally {
 sqlite.close();
 await rm(root, { recursive: true, force: true });
 }
 });
});

function makeInput(overrides: Partial<CreateSessionInput> = {}): CreateSessionInput {
Expand Down

2 changes: 1 addition & 1 deletion
packages/storage/src/__tests__/session-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { join } from 'node:path';
import { tmpdir } from 'node:os';
import { describe, test } from 'node:test';
import type { CreateSessionInput, SessionHeader, StoredMessage } from '@maka/core';
import { createSessionStore } from '../session-store.js';
import { createLegacyFileSessionStore as createSessionStore } from '../session-store.js';

describe('FileSessionStore CRUD', () => {
 test('list on a missing workspace is observational and does not create session storage', async () => {
Expand Down

18 changes: 15 additions & 3 deletions
packages/storage/src/__tests__/sqlite-session-metadata-store.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ describe('SqliteSessionMetadataStore', () => {
 try {
 const store = createSqliteSessionMetadataStore(path, { now: () => 100 });
 const header = fullHeader();
 assert.equal(store.schemaVersion(), 1);
 assert.equal(store.schemaVersion(), 2);
 assert.equal(store.journalMode(), 'wal');
 assert.deepEqual(await store.create(header), {
 header,
Expand All@@ -29,7 +29,7 @@ describe('SqliteSessionMetadataStore', () => {

 const reopened = createSqliteSessionMetadataStore(path, { now: () => 200 });
 try {
 assert.equal(reopened.schemaVersion(), 1);
 assert.equal(reopened.schemaVersion(), 2);
 assert.deepEqual(await reopened.read(header.id), {
 header,
 metadataVersion: 1,
Expand All@@ -50,7 +50,7 @@ describe('SqliteSessionMetadataStore', () => {
 const metadata = createSqliteSessionMetadataStore(path);
 try {
 assert.equal(runtime.schemaVersion(), 4);
 assert.equal(metadata.schemaVersion(), 1);
 assert.equal(metadata.schemaVersion(), 2);
 await metadata.create(fullHeader());
 await runtime.appendRuntimeEvent('session-1', 'run-1', {
 id: 'event-1',
Expand DownExpand Up@@ -205,10 +205,12 @@ describe('SqliteSessionMetadataStore', () => {
 assert.deepEqual(await store.importEntries([entry]), {
 created: [true],
 sourcesAlreadyImported: 0,
 sourcesTombstoned: 0,
 });
 assert.deepEqual(await store.importEntries([entry]), {
 created: [],
 sourcesAlreadyImported: 1,
 sourcesTombstoned: 0,
 });
 await assert.rejects(
 () =>
Expand DownExpand Up@@ -264,6 +266,16 @@ describe('SqliteSessionMetadataStore', () => {
 assert.equal(await store.remove('session-1'), true);
 assert.equal(await store.remove('session-1'), false);
 assert.deepEqual(await store.list({ labelSlug: 'alpha' }), []);
 assert.deepEqual(
 await store.importEntries([
 {
 header: fullHeader(),
 source: { path: '/session-1.jsonl', fingerprint: '1:1' },
 },
 ]),
 { created: [], sourcesAlreadyImported: 0, sourcesTombstoned: 1 },
 );
 await assert.rejects(() => store.create(fullHeader()), /tombstoned/);
 } finally {
 store.close();
 }
Expand Down
Loading
Loading