@openchambery/web 2.0.0-beta.4 → 2.0.0-beta.6

package/server/lib/session-metadata/opencode-session-record.test.js

@@ -0,0 +1,242 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import { createSessionArchiveService } from './session-archive.js';
+import { createSessionMetadataStore } from './session-metadata-store.js';
+import {
+  createHttpSessionRecordClient,
+  mergeOwnedMetadata,
+  migrateLoadedSideStore,
+  readSessionRecordViaClient,
+  retainOpenCodeSessions,
+  writeSessionRecordViaClient,
+} from './opencode-session-record.js';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+
+const makeDataDir = () => fs.mkdtempSync(path.join(os.tmpdir(), 'openchamber-record-'));
+
+describe('OpenCode session record ownership', () => {
+  it('keeps title and archive on the OpenCode record across archive and restore', async () => {
+    const dataDir = makeDataDir();
+    const records = new Map([
+      ['ses_1', {
+        id: 'ses_1',
+        title: 'Keep me',
+        metadata: { openchamber: { goal: { status: 'active' }, assistant: { assistantID: 'ast_1' } } },
+        time: { created: 1, updated: 2 },
+      }],
+    ]);
+    const writes = [];
+    const store = createSessionMetadataStore({
+      dataDir,
+      recordReader: async (sessionID) => records.get(sessionID) ?? null,
+      recordWriter: async (sessionID, metadata) => {
+        const current = records.get(sessionID);
+        if (!current) {
+          const error = new Error('missing');
+          error.status = 404;
+          throw error;
+        }
+        writes.push({ sessionID, metadata, title: current.title });
+        records.set(sessionID, { ...current, metadata });
+      },
+    });
+    const archive = createSessionArchiveService({
+      sessionMetadataStore: store,
+      fetchUpstreamSession: async ({ sessionID }) => records.get(sessionID) ?? null,
+    });
+
+    const archived = await archive.setArchive({ sessionID: 'ses_1', archivedAt: 50, directory: '/repo' });
+    expect(archived.session.title).toBe('Keep me');
+    expect(archived.session.time.archived).toBe(50);
+    expect(records.get('ses_1').title).toBe('Keep me');
+    expect(records.get('ses_1').metadata.openchamber.archive.archivedAt).toBe(50);
+    expect(records.get('ses_1').metadata.openchamber.goal.status).toBe('active');
+    expect(records.get('ses_1').metadata.openchamber.assistant.assistantID).toBe('ast_1');
+    expect(writes.at(-1).metadata.openchamber.assistant.assistantID).toBe('ast_1');
+
+    const restored = await archive.setArchive({ sessionID: 'ses_1', archivedAt: 0 });
+    expect(restored.session.title).toBe('Keep me');
+    expect(restored.session.time.archived).toBeUndefined();
+    expect(records.get('ses_1').title).toBe('Keep me');
+    expect(records.get('ses_1').metadata.openchamber.archive.archivedAt).toBe(0);
+    expect(records.get('ses_1').metadata.openchamber.goal.status).toBe('active');
+
+    const restarted = createSessionMetadataStore({
+      dataDir: makeDataDir(),
+      recordReader: async (sessionID) => records.get(sessionID) ?? null,
+      recordWriter: async () => undefined,
+    });
+    await expect(restarted.get('ses_1')).resolves.toMatchObject({
+      openchamber: {
+        archive: { archivedAt: 0 },
+        goal: { status: 'active' },
+        assistant: { assistantID: 'ast_1' },
+      },
+    });
+    const visible = retainOpenCodeSessions([records.get('ses_1')], {});
+    expect(visible).toHaveLength(1);
+    expect(visible[0].title).toBe('Keep me');
+    expect(visible[0].time.archived).toBeUndefined();
+  });
+
+  it('does not drop an OpenCode session when the side store has no row', () => {
+    const visible = retainOpenCodeSessions([
+      {
+        id: 'ses_1',
+        title: 'Still here',
+        metadata: { openchamber: { archive: { archivedAt: 9 } } },
+        time: { created: 1, updated: 2 },
+      },
+      { id: 'ses_2', title: 'Also here', time: { created: 1, updated: 2 } },
+    ], {});
+
+    expect(visible.map((session) => session.id)).toEqual(['ses_1', 'ses_2']);
+    expect(visible[0].title).toBe('Still here');
+    expect(visible[0].time.archived).toBe(9);
+    expect(visible[1].title).toBe('Also here');
+  });
+
+  it('does not treat an unread side store as an empty catalog', () => {
+    expect(() => retainOpenCodeSessions([{ id: 'ses_1', title: 'Stay' }], null)).toThrow(/unavailable/);
+    expect(() => retainOpenCodeSessions(null, {})).toThrow(/unavailable/);
+  });
+
+  it('does not treat a failed side-store load as an authoritative empty migration', async () => {
+    const writes = [];
+    const records = {
+      ses_1: { id: 'ses_1', title: 'Stay', metadata: { openchamber: { goal: { id: 'g1' } } } },
+    };
+    const result = await migrateLoadedSideStore({
+      loadResult: { ok: false, entries: {} },
+      readSession: async (id) => records[id] ?? null,
+      writeMetadata: async (id, metadata) => {
+        writes.push(id);
+        records[id] = { ...records[id], metadata };
+      },
+    });
+
+    expect(result.status).toBe('unavailable');
+    expect(writes).toEqual([]);
+    expect(records.ses_1.title).toBe('Stay');
+    expect(records.ses_1.metadata.openchamber.goal.id).toBe('g1');
+  });
+
+  it('keeps other sessions when one migration write fails', async () => {
+    const records = {
+      ses_ok: { id: 'ses_ok', title: 'Ok', metadata: {} },
+      ses_bad: { id: 'ses_bad', title: 'Bad', metadata: { openchamber: { llm: { purpose: 'keep' } } } },
+      ses_only_opencode: { id: 'ses_only_opencode', title: 'Stay', metadata: { fromOpenCode: true } },
+    };
+    const side = {
+      ses_ok: { openchamber: { goal: { id: 'g1' } } },
+      ses_bad: { openchamber: { assistant: { assistantID: 'ast_1' } } },
+    };
+
+    const result = await migrateLoadedSideStore({
+      loadResult: { ok: true, entries: side },
+      readSession: async (id) => records[id] ?? null,
+      writeMetadata: async (id, metadata) => {
+        if (id === 'ses_bad') throw new Error('write failed');
+        records[id] = { ...records[id], metadata };
+      },
+    });
+
+    expect(result.status).toBe('partial');
+    expect(result.migrated).toEqual(['ses_ok']);
+    expect(result.failed).toEqual([{ id: 'ses_bad', error: 'write failed' }]);
+    expect(records.ses_ok.metadata.openchamber.goal.id).toBe('g1');
+    expect(records.ses_ok.title).toBe('Ok');
+    expect(records.ses_bad.title).toBe('Bad');
+    expect(records.ses_bad.metadata.openchamber.llm.purpose).toBe('keep');
+    expect(records.ses_bad.metadata.openchamber.assistant).toBeUndefined();
+    expect(records.ses_only_opencode).toEqual({
+      id: 'ses_only_opencode',
+      title: 'Stay',
+      metadata: { fromOpenCode: true },
+    });
+    expect(side.ses_bad.openchamber.assistant.assistantID).toBe('ast_1');
+  });
+
+  it('fills side-store gaps without letting an empty side row wipe OpenCode fields', () => {
+    expect(mergeOwnedMetadata(
+      { openchamber: { goal: { status: 'paused' } }, fromOpenCode: true },
+      { openchamber: { goal: { id: 'g1' }, archive: { archivedAt: 4 } } },
+    )).toEqual({
+      fromOpenCode: true,
+      openchamber: { goal: { id: 'g1', status: 'paused' }, archive: { archivedAt: 4 } },
+    });
+    expect(mergeOwnedMetadata({ keep: true }, {})).toEqual({ keep: true });
+    expect(mergeOwnedMetadata({ keep: true }, null)).toEqual({ keep: true });
+  });
+
+  it('throws when the installed client has no session.update instead of writing nothing', async () => {
+    await expect(writeSessionRecordViaClient({ session: {} }, {
+      sessionID: 'ses_1',
+      metadata: { openchamber: { archive: { archivedAt: 1 } } },
+    })).rejects.toThrow(/session\.update is unavailable/);
+  });
+
+  it('writes metadata through session.update without sending title', async () => {
+    const update = vi.fn(async () => undefined);
+    await writeSessionRecordViaClient({ session: { update } }, {
+      sessionID: 'ses_1',
+      metadata: { openchamber: { archive: { archivedAt: 3 } } },
+    });
+    expect(update).toHaveBeenCalledWith({
+      sessionID: 'ses_1',
+      metadata: { openchamber: { archive: { archivedAt: 3 } } },
+    }, undefined);
+    expect(update.mock.calls[0][0].title).toBeUndefined();
+  });
+
+  it('reads a missing session as not-found and a transport failure as failure', async () => {
+    const missing = Object.assign(new Error('gone'), { status: 404 });
+    await expect(readSessionRecordViaClient({
+      session: { get: async () => { throw missing; } },
+    }, { sessionID: 'ses_1' })).resolves.toBeNull();
+
+    const down = Object.assign(new Error('down'), { status: 503 });
+    await expect(readSessionRecordViaClient({
+      session: { get: async () => { throw down; } },
+    }, { sessionID: 'ses_1' })).rejects.toThrow(/down/);
+  });
+
+  it('patches the session record over HTTP and does not turn a failed read into an empty session', async () => {
+    const calls = [];
+    const fetchFn = vi.fn(async (url, init) => {
+      calls.push({ url, method: init.method, body: init.body ? JSON.parse(init.body) : undefined });
+      if (init.method === 'PATCH' && String(url).includes('ses_ok')) {
+        return { ok: true, status: 204, json: async () => null };
+      }
+      if (String(url).includes('ses_missing')) {
+        return { ok: false, status: 404, json: async () => ({}) };
+      }
+      if (String(url).includes('ses_down')) {
+        return { ok: false, status: 503, json: async () => ({}) };
+      }
+      return {
+        ok: true,
+        status: 200,
+        json: async () => ({ id: 'ses_ok', title: 'Keep', metadata: { fromOpenCode: true } }),
+      };
+    });
+    const client = createHttpSessionRecordClient({
+      buildSessionUrl: (sessionID) => `http://opencode.local/api/session/${sessionID}`,
+      fetchFn,
+    });
+
+    await expect(client.read('ses_ok')).resolves.toMatchObject({ id: 'ses_ok', title: 'Keep' });
+    await expect(client.read('ses_missing')).resolves.toBeNull();
+    await expect(client.read('ses_down')).rejects.toThrow(/503/);
+    await client.write({
+      sessionID: 'ses_ok',
+      metadata: { openchamber: { archive: { archivedAt: 8 } } },
+    });
+
+    const patch = calls.find((call) => call.method === 'PATCH');
+    expect(patch.body).toEqual({ metadata: { openchamber: { archive: { archivedAt: 8 } } } });
+    expect(patch.body.title).toBeUndefined();
+  });
+});

package/server/lib/session-metadata/routes.js

@@ -83,13 +83,17 @@ export const registerSessionMetadataRoutes = (app, deps = {}) => {
               },
             },
           };
+        }, {
+          directory: asNonEmptyString(body.directory) || undefined,
         });
         if (!result?.committed) {
           throw new Error(result?.reason || 'session metadata mutate was rejected');
         }
         metadata = result.metadata;
       } else {
-        metadata = await sessionMetadataStore.setSessionMetadata(sessionId, patch);
+        metadata = await sessionMetadataStore.setSessionMetadata(sessionId, patch, {
+          directory: asNonEmptyString(body.directory) || undefined,
+        });
       }
       const directory = asNonEmptyString(body.directory) || '';
       if (typeof onMetadataWritten === 'function') {

package/server/lib/session-metadata/session-archive.js

@@ -451,7 +451,7 @@ export const createSessionArchiveService = (deps = {}) => {
     const metadata = await sessionMetadataStore.setSessionMetadata(
       sessionID,
       { openchamber: { archive: { archivedAt } } },
-      { allowArchive: true },
+      { allowArchive: true, directory: upstreamDirectory || directoryHint },
     );
 
     // New Host mutation wins: bump generation and cancel older repair timers

package/server/lib/session-metadata/session-metadata-store.d.ts

@@ -33,4 +33,6 @@ export function createSessionMetadataStore(options: {
   fsPromises?: typeof import('node:fs').promises;
   path?: typeof import('node:path');
   now?: () => number;
+  recordReader?: (sessionID: string, directory?: string | null) => Promise<object | null>;
+  recordWriter?: (sessionID: string, metadata: object, directory?: string | null) => Promise<void>;
 }): SessionMetadataStore;

package/server/lib/session-metadata/session-metadata-store.js

@@ -1,26 +1,28 @@
 /**
- * OpenChamber-owned session metadata.
+ * OpenChamber session metadata cache and migration source.
  *
- * OpenCode 2.x accepts `metadata` only when a session is created; the v1
- * `PATCH /session/{id}` route is gone and nothing replaces it. Session goal
- * progress (and later assist / pinned notes) live here: one JSON file per data
- * dir, `{ [sessionID]: metadata }`, folded back onto the sessions the proxy
- * serves so clients keep reading `session.metadata` where they always did.
+ * The OpenCode session record is the durable authority for title, archive, and
+ * other OpenChamber metadata (`opencode-session-record.js`). This JSON file
+ * remains the cache and the pre-migration source. A failed or corrupt read is
+ * never empty success: the store stays unwritable and does not overwrite
+ * unknown disk state or the OpenCode record.
  *
  * Writes are a JSON Merge Patch (RFC 7386): nested objects merge key by key and
- * a `null` deletes. That is what the old PATCH did, and it is what keeps two
- * features writing into the same `openchamber` namespace from erasing each
- * other — goal mode saving progress must not drop an assist recap.
+ * a `null` deletes. That keeps two features writing into the same `openchamber`
+ * namespace from erasing each other — goal mode saving progress must not drop
+ * an assist recap. When a record reader and writer are wired, the merged object
+ * is written onto the OpenCode session before the local cache commits. A failed
+ * record read is not treated as empty metadata.
  *
  * Mutations are fully serialized. Committed `entries` update only after a
  * successful persist so concurrent readers never observe uncommitted drafts.
- * A failed or corrupt file read is never empty success: the store stays
- * unwritable and reports the error instead of overwriting unknown disk state.
  */
 
 import fsDefault from 'node:fs';
 import pathDefault from 'node:path';
 
+import { mergeOwnedMetadata } from './opencode-session-record.js';
+
 const METADATA_FILE_NAME = 'sessions-metadata.json';
 const HOST_ARCHIVE_KEY = 'archive';
 
@@ -103,13 +105,22 @@ const applyReservedArchiveProtection = (previous, patch, merged, { allowArchive
  * @param {typeof fsDefault.promises} [options.fsPromises]
  * @param {typeof pathDefault} [options.path]
  * @param {() => number} [options.now]
+ * @param {(sessionID: string, directory?: string | null) => Promise<object | null>} [options.recordReader]
+ *   OpenCode session read. Null means the session is gone. Any other failure throws.
+ * @param {(sessionID: string, metadata: object, directory?: string | null) => Promise<void>} [options.recordWriter]
+ *   Writes the full merged metadata onto the OpenCode session record. Must not send title.
  */
 export const createSessionMetadataStore = ({
   dataDir,
   fsPromises = fsDefault.promises,
   path = pathDefault,
   now = Date.now,
+  recordReader = null,
+  recordWriter = null,
 }) => {
+  if (typeof recordWriter === 'function' && typeof recordReader !== 'function') {
+    throw new Error('session record writer requires a record reader');
+  }
   const filePath = path.join(dataDir, METADATA_FILE_NAME);
 
   /** sessionID → metadata. Committed only — never holds an in-flight draft. */
@@ -218,11 +229,27 @@ export const createSessionMetadataStore = ({
     return next;
   };
 
-  const get = async (sessionID) => {
+  const readRecordMetadata = async (id, directory) => {
+    if (typeof recordReader !== 'function') return undefined;
+    try {
+      const record = await recordReader(id, directory);
+      if (record == null) return null;
+      return isPlainObject(record.metadata) ? record.metadata : {};
+    } catch (error) {
+      if (entries.has(id)) return undefined;
+      throw error;
+    }
+  };
+
+  const get = async (sessionID, options = {}) => {
     const id = asNonEmptyString(sessionID);
     if (!id) return {};
     await ensureReadable();
-    return entries.get(id) ?? {};
+    const side = entries.get(id);
+    const fromRecord = await readRecordMetadata(id, options.directory);
+    if (fromRecord === undefined) return side ?? {};
+    if (fromRecord === null) return side ?? {};
+    return mergeOwnedMetadata(fromRecord, side);
   };
 
   const has = async (sessionID) => {
@@ -243,16 +270,36 @@ export const createSessionMetadataStore = ({
    */
   const commitMergedPatch = async (id, previous, patch, options = {}) => {
     const allowArchive = options.allowArchive === true;
+    let base = previous;
+    if (typeof recordReader === 'function') {
+      let record;
+      try {
+        record = await recordReader(id, options.directory);
+      } catch (error) {
+        // A failed read is not an empty record. Do not replace metadata we could not see.
+        throw error;
+      }
+      if (record == null) {
+        const error = new Error(`session ${id} was not found`);
+        error.status = 404;
+        throw error;
+      }
+      base = mergeOwnedMetadata(record.metadata, previous);
+    }
     const effectivePatch = allowArchive ? patch : stripArchiveFromMetadataPatch(patch);
 
-    let merged = mergeMetadataPatch(previous, effectivePatch);
-    merged = applyReservedArchiveProtection(previous, patch, merged, { allowArchive });
+    let merged = mergeMetadataPatch(base, effectivePatch);
+    merged = applyReservedArchiveProtection(base, patch, merged, { allowArchive });
+
+    if (typeof recordWriter === 'function') {
+      await recordWriter(id, merged, options.directory);
+    }
 
     const nextMap = new Map(entries);
     if (Object.keys(merged).length === 0) nextMap.delete(id);
     else nextMap.set(id, merged);
 
-    // Persist draft snapshot first; publish to committed entries only on success.
+    // OpenCode write already landed. Publish the local cache only after its persist succeeds.
     await persistMap(nextMap);
 
     if (Object.keys(merged).length === 0) entries.delete(id);

package/server/lib/session-metadata/session-projection.js

@@ -168,6 +168,30 @@ export const projectSessionWithHostMetadata = (session, hostMetadata) => {
   return next;
 };
 
+/**
+ * OpenCode record keys win. Side-store keys the record does not have yet are
+ * filled in. A missing or empty side row does not wipe the record.
+ *
+ * @param {unknown} openCodeMetadata
+ * @param {unknown} sideMetadata
+ */
+export const mergeOwnedMetadata = (openCodeMetadata, sideMetadata) => {
+  const openCode = isPlainObject(openCodeMetadata) ? openCodeMetadata : {};
+  if (!isPlainObject(sideMetadata) || Object.keys(sideMetadata).length === 0) {
+    return { ...openCode };
+  }
+  return mergeMetadataPatch(sideMetadata, openCode);
+};
+
+const projectRecordMetadata = (session, sideMetadata) => {
+  const metadata = mergeOwnedMetadata(session.metadata, sideMetadata);
+  const hadMetadata = isPlainObject(session.metadata);
+  const withRecord = Object.keys(metadata).length === 0 && !hadMetadata
+    ? session
+    : { ...session, metadata };
+  return projectSessionWithHostMetadata(withRecord, null);
+};
+
 /**
  * @param {object | null | undefined} session
  * @param {Record<string, object> | null | undefined} storedBySessionId
@@ -178,7 +202,7 @@ export const projectSessionWithStoredMap = (session, storedBySessionId) => {
     return projectSessionWithHostMetadata(session, null);
   }
   const host = storedBySessionId[session.id];
-  return projectSessionWithHostMetadata(session, isPlainObject(host) ? host : null);
+  return projectRecordMetadata(session, isPlainObject(host) ? host : null);
 };
 
 const projectLifecycleInner = (payload, readHostMetadata) => {
@@ -196,7 +220,7 @@ const projectLifecycleInner = (payload, readHostMetadata) => {
       host = null;
     }
   }
-  const projected = projectSessionWithHostMetadata(info, isPlainObject(host) ? host : null);
+  const projected = projectRecordMetadata(info, isPlainObject(host) ? host : null);
   if (projected === info) return payload;
 
   const next = { ...payload };

package/server/lib/session-title/runtime.js

@@ -122,8 +122,8 @@ const buildTitleSystemPrompt = () => [
   'Name the main subject of the work.',
   'Keep that subject across follow-ups, polish, commit, push, tidy, and review.',
   'Switch only when the user clearly starts a different topic.',
-  'One line, ≤50 characters, no explanation.',
-  'Prefer ≤6 words or ≤6 CJK characters. No modifiers. No verbs.',
+  'One line, no explanation.',
+  'Hard limit: never exceed 6 CJK characters (or 6 words for English). No modifiers. No verbs.',
   'Use the language of the user messages.',
   'Keep technical terms, numbers, filenames, and HTTP codes exact.',
   'Never include tool names, summarizing, or generating.',