@pellux/goodvibes-sdk 0.37.2 → 1.0.0

package/dist/platform/companion/companion-chat-manager.d.ts

@@ -19,10 +19,10 @@
  *   for that specific session — never the global TUI event feed.
  * - A GC sweep closes sessions that have been idle beyond the TTL.
  */
-import { Buffer } from 'node:buffer';
 import type { ProviderMessage } from '../providers/interface.js';
-import type { ArtifactDescriptor } from '../artifacts/index.js';
 import type { CompanionChatMessageAttachmentInput, CompanionChatMessage, CompanionChatSession, CreateCompanionChatSessionInput, UpdateCompanionChatSessionInput } from './companion-chat-types.js';
+import { type CompanionChatArtifactStore } from './companion-chat-attachments.js';
+import type { CompanionSessionBrokerBridge } from './companion-chat-broker-bridge.js';
 import type { CompanionChatRateLimiterOptions } from './companion-chat-rate-limiter.js';
 import type { ToolRegistry } from '../tools/registry.js';
 import type { ToolDefinition } from '../types/tools.js';
@@ -53,16 +53,7 @@ export interface CompanionLLMProvider {
 type HookDispatcherLike = {
     fire(event: HookEvent): Promise<HookResult>;
 };
-export interface CompanionChatArtifactStore {
-    get(artifactId: string): ArtifactDescriptor | null;
-    readContent(artifactId: string): Promise<{
-        readonly record: {
-            readonly mimeType: string;
-            readonly filename?: string | undefined;
-        };
-        readonly buffer: ArrayBuffer | Uint8Array | Buffer;
-    }>;
-}
+export type { CompanionChatArtifactStore } from './companion-chat-attachments.js';
 export interface CompanionChatEventPublisher {
     publishEvent(event: string, payload: unknown, filter?: {
         clientId?: string;
@@ -96,9 +87,28 @@ export interface CompanionChatManagerConfig {
     readonly artifactStore?: CompanionChatArtifactStore | null | undefined;
     /**
      * Directory under which session JSON files are persisted.
-     * Default: ~/.goodvibes/companion-chat/sessions/
+     * Default: `<homeDirectory>/.goodvibes/companion-chat/sessions/` when
+     * `homeDirectory` is provided, else the OS home. Prefer passing this (or
+     * `homeDirectory`) explicitly so an isolated-home daemon never touches the
+     * real `~/.goodvibes`.
      */
     readonly sessionsDir?: string | undefined;
+    /** Injected home dir; when `sessionsDir` is omitted, the persistence root is
+     * derived from THIS home (not the OS home) so an isolated-home daemon stays in. */
+    readonly homeDirectory?: string | undefined;
+    /**
+     * Optional bridge to the shared session broker. When supplied, companion
+     * sessions register INTO the broker at write time (create/close), so
+     * `/api/sessions` reflects companion activity immediately (same-process, no
+     * restart). The boot-time importer fold remains the reconciliation path.
+     */
+    readonly sessionBroker?: CompanionSessionBrokerBridge | null | undefined;
+    /** Age (ms past closedAt) at which a CLOSED session's heavy in-memory handles
+     * are evicted while its meta stays listable (bounds resident memory). Default 5 min. */
+    readonly closedSessionMemoryGraceMs?: number | undefined;
+    /** Age (ms past closedAt) at which a CLOSED session's persisted file is PERMANENTLY
+     * deleted. Closed sessions are HISTORY: default `undefined` = retain indefinitely. */
+    readonly closedSessionRetentionMs?: number | undefined;
     /**
      * Pass `false` to disable disk persistence entirely (useful in tests).
      * Default: true
@@ -126,6 +136,10 @@ export declare class CompanionChatManager {
     private readonly rateLimiter;
     private readonly idleActiveMs;
     private readonly idleEmptyMs;
+    private readonly closedMemoryGraceMs;
+    private readonly closedRetentionMs;
+    /** Live mirror of sessions into the shared broker store (S1 item D). */
+    private readonly _brokerSync;
     private gcTimer;
     /** Tracks whether the async init() has completed. */
     private initCompleted;
@@ -170,6 +184,23 @@ export declare class CompanionChatManager {
      * snapshot, or null if not found.
      */
     closeSession(sessionId: string): CompanionChatSession | null;
+    /**
+     * Permanently delete a session (W5-S1: `delete` is now a genuine removal,
+     * distinct from `closeSession` above). Aborts any in-flight turn, removes
+     * the on-disk record file, and drops the in-memory entry — reusing
+     * {@link _hardRemove}, the SAME primitive the GC 'delete-persistent' sweep
+     * action uses, so there is exactly one removal code path.
+     *
+     * Requires the session to already be closed: deleting a still-active
+     * session throws `{ code: 'SESSION_ACTIVE', status: 409 }` (the caller must
+     * close it first, mirroring the SESSION_CLOSED-throw convention elsewhere
+     * in this file). An unknown OR already-deleted id throws
+     * `{ code: 'SESSION_NOT_FOUND', status: 404 }` — delete is not a 200-noop.
+     */
+    deleteSession(sessionId: string): Promise<{
+        readonly sessionId: string;
+        readonly deleted: true;
+    }>;
     /**
      * Post a user message and start an async LLM turn. Returns the messageId.
      *
@@ -192,18 +223,35 @@ export declare class CompanionChatManager {
         readonly attachments?: readonly CompanionChatMessageAttachmentInput[] | undefined;
     }): Promise<CompanionChatReplyResult>;
     private _postMessageInternal;
-    private resolveAttachments;
-    private formatAttachmentSummary;
-    private buildReplayUserContent;
-    private isInlineTextAttachment;
-    private isInlineImageAttachment;
-    private buildProviderUserContent;
     dispose(): void;
     private _runTurn;
     private _finalizeAfterToolExhaustion;
     private _executeToolCalls;
+    /**
+     * Periodic GC sweep. Deletion authority is SPLIT (charter: closed sessions are
+     * HISTORY): close-idle closes an idle active session; evict-memory drops a
+     * long-closed session's in-memory handles (meta + on-disk copy kept);
+     * delete-persistent removes the file ONLY under an explicit finite retention
+     * window (default retains indefinitely — see {@link planCompanionSweep}).
+     */
     _gcSweep(): void;
     private _updateMeta;
+    /**
+     * Await all in-flight best-effort broker-sync operations. The daemon's
+     * companion HTTP routes call this before responding so `/api/sessions`
+     * reflects the change synchronously; tests use it to make the mirror
+     * deterministic. A no-op when no broker bridge is configured.
+     */
+    flushBrokerSync(): Promise<void>;
+    /**
+     * Hard-remove a session's persisted file and in-memory record. The ONE
+     * removal code path — shared by {@link deleteSession} and the GC
+     * 'delete-persistent' action. Never fork this. Order matters (Wave-5 F1):
+     * drop the map entry, drain any in-flight {@link _persist} save for this
+     * id, THEN unlink — else a save mid-write from {@link closeSession} can
+     * resurrect the file post-unlink.
+     */
+    private _hardRemove;
     /**
      * Schedule a persistence save for the given session.
      * Saves are serialized per-session: each new save waits for the prior one to
@@ -214,5 +262,4 @@ export declare class CompanionChatManager {
     private _doSave;
     private resolvePendingReply;
 }
-export {};
 //# sourceMappingURL=companion-chat-manager.d.ts.map

package/dist/platform/companion/companion-chat-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"companion-chat-manager.d.ts","sourceRoot":"","sources":["../../../src/platform/companion/companion-chat-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"companion-chat-manager.d.ts","sourceRoot":"","sources":["../../../src/platform/companion/companion-chat-manager.ts"],"names":[],"mappings":"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"}

package/dist/platform/companion/companion-chat-manager.js

@@ -19,10 +19,13 @@
  *   for that specific session — never the global TUI event feed.
  * - A GC sweep closes sessions that have been idle beyond the TTL.
  */
-import { Buffer } from 'node:buffer';
 import { randomUUID } from 'node:crypto';
+import { SDKErrorCodes } from '@pellux/goodvibes-errors';
 import { ConversationManager } from '../core/conversation.js';
 import { CompanionChatPersistence, defaultSessionsDir, } from './companion-chat-persistence.js';
+import { buildProviderUserContent, buildReplayUserContent, resolveAttachments, } from './companion-chat-attachments.js';
+import { planCompanionSweep } from './companion-chat-gc.js';
+import { CompanionBrokerSync } from './companion-chat-broker-sync.js';
 import { CompanionChatRateLimiter } from './companion-chat-rate-limiter.js';
 import { executeToolCalls as executeOrchestratorToolCalls } from '../core/orchestrator-tool-runtime.js';
 import { appendGoodVibesRuntimeAwarenessPrompt } from '../tools/goodvibes-runtime/index.js';
@@ -33,6 +36,7 @@ import { logger } from '../utils/logger.js';
 // ---------------------------------------------------------------------------
 const DEFAULT_IDLE_ACTIVE_MS = 30 * 60 * 1_000; // 30 minutes with messages
 const DEFAULT_IDLE_EMPTY_MS = 5 * 60 * 1_000; // 5 minutes empty session
+const DEFAULT_CLOSED_MEMORY_GRACE_MS = 5 * 60 * 1_000; // evict closed bodies from RAM after 5 min
 const GC_INTERVAL_MS = 60 * 1_000; // sweep every minute
 const MAX_TOOL_ROUNDS_PER_TURN = 8;
 const TOOL_EXHAUSTION_FINALIZER_PROMPT = [
@@ -42,16 +46,6 @@ const TOOL_EXHAUSTION_FINALIZER_PROMPT = [
     'If the available tool results are insufficient, say what is missing and ask one short follow-up '
         + 'question.',
 ].join(' ');
-const MAX_ATTACHMENTS_PER_MESSAGE = 8;
-const MAX_INLINE_IMAGE_ATTACHMENT_BYTES = 20 * 1024 * 1024;
-const MAX_INLINE_TEXT_ATTACHMENT_BYTES = 200 * 1024;
-function toNodeBuffer(buffer) {
-    if (Buffer.isBuffer(buffer))
-        return buffer;
-    if (buffer instanceof ArrayBuffer)
-        return Buffer.from(new Uint8Array(buffer));
-    return Buffer.from(buffer.buffer, buffer.byteOffset, buffer.byteLength);
-}
 function assertCompleteProviderModelRoute(input) {
     if ((input.model !== undefined) === (input.provider !== undefined))
         return;
@@ -73,6 +67,10 @@ export class CompanionChatManager {
     rateLimiter;
     idleActiveMs;
     idleEmptyMs;
+    closedMemoryGraceMs;
+    closedRetentionMs;
+    /** Live mirror of sessions into the shared broker store (S1 item D). */
+    _brokerSync;
     gcTimer = null;
     /** Tracks whether the async init() has completed. */
     initCompleted = false;
@@ -93,13 +91,17 @@ export class CompanionChatManager {
         this.artifactStore = config.artifactStore ?? null;
         this.idleActiveMs = config.idleActiveMs ?? DEFAULT_IDLE_ACTIVE_MS;
         this.idleEmptyMs = config.idleEmptyMs ?? DEFAULT_IDLE_EMPTY_MS;
+        this.closedMemoryGraceMs = config.closedSessionMemoryGraceMs ?? DEFAULT_CLOSED_MEMORY_GRACE_MS;
+        this.closedRetentionMs = config.closedSessionRetentionMs;
+        this._brokerSync = new CompanionBrokerSync(config.sessionBroker ?? null);
         // Persistence
         // Default is false — most callers (tests, downstream consumers) get the
         // safe no-write default. The daemon opts into persistence explicitly via
-        // persist: true in facade-composition.
+        // persist: true in facade-composition. When sessionsDir is omitted, derive
+        // the root from the INJECTED home so an isolated-home daemon stays inside it.
         const persist = config.persist === true;
         this.persistence = persist
-            ? new CompanionChatPersistence(config.sessionsDir ?? defaultSessionsDir())
+            ? new CompanionChatPersistence(config.sessionsDir ?? defaultSessionsDir(config.homeDirectory))
             : null;
         // Rate limiter
         this.rateLimiter =
@@ -130,18 +132,18 @@ export class CompanionChatManager {
         const stored = await this.persistence.loadAll();
         for (const { meta, messages } of stored) {
             const normalizedMessages = messages.map((message) => this.normalizeMessage(message));
-            // Skip sessions that were already closed before the restart — they are
-            // in a terminal state and don't need to be in memory.
-            if (meta.status === 'closed')
-                continue;
             const conversation = new ConversationManager();
-            // Replay messages into the conversation to restore LLM context
-            for (const msg of normalizedMessages) {
-                if (msg.role === 'user') {
-                    conversation.addUserMessage(this.buildReplayUserContent(msg));
-                }
-                else {
-                    conversation.addAssistantMessage(msg.content);
+            // Closed-skip fix: closed sessions load in a lightweight terminal state
+            // (meta + messages retained, listable/importable; no history replay). GC
+            // (_gcSweep) remains the sole deletion authority.
+            if (meta.status !== 'closed') {
+                for (const msg of normalizedMessages) {
+                    if (msg.role === 'user') {
+                        conversation.addUserMessage(buildReplayUserContent(msg));
+                    }
+                    else {
+                        conversation.addAssistantMessage(msg.content);
+                    }
                 }
             }
             this.sessions.set(meta.id, {
@@ -185,6 +187,9 @@ export class CompanionChatManager {
             subscriberClientId: null,
         });
         this._persist(id);
+        // Live spine: mirror the new session into the shared broker at write time so
+        // /api/sessions reflects it same-process (no restart). Best-effort.
+        this._brokerSync.track(meta.id, () => this._brokerSync.registerSession(meta));
         return meta;
     }
     getSession(sessionId) {
@@ -226,7 +231,7 @@ export class CompanionChatManager {
             throw Object.assign(new Error(`Session not found: ${sessionId}`), { code: 'SESSION_NOT_FOUND', status: 404 });
         }
         if (session.meta.status === 'closed') {
-            throw Object.assign(new Error(`Session is closed: ${sessionId}`), { code: 'SESSION_CLOSED', status: 409 });
+            throw Object.assign(new Error('Session is closed'), { code: SDKErrorCodes.SESSION_CLOSED, status: 409 });
         }
         const patch = { updatedAt: Date.now() };
         if (input.title !== undefined)
@@ -239,6 +244,9 @@ export class CompanionChatManager {
             patch.systemPrompt = input.systemPrompt;
         const updated = this._updateMeta(session, patch);
         this._persist(sessionId);
+        // Heartbeat the broker record (advances participant.lastSeenAt). Title is
+        // never overwritten by this path (broker treats register as a heartbeat).
+        this._brokerSync.track(updated.id, () => this._brokerSync.registerSession(updated));
         return updated;
     }
     /**
@@ -267,8 +275,37 @@ export class CompanionChatManager {
         const now = Date.now();
         const updated = this._updateMeta(session, { status: 'closed', closedAt: now, updatedAt: now });
         this._persist(sessionId);
+        // Live spine: flip the shared broker record to closed at write time.
+        this._brokerSync.track(sessionId, () => this._brokerSync.closeSession(sessionId));
         return updated;
     }
+    /**
+     * Permanently delete a session (W5-S1: `delete` is now a genuine removal,
+     * distinct from `closeSession` above). Aborts any in-flight turn, removes
+     * the on-disk record file, and drops the in-memory entry — reusing
+     * {@link _hardRemove}, the SAME primitive the GC 'delete-persistent' sweep
+     * action uses, so there is exactly one removal code path.
+     *
+     * Requires the session to already be closed: deleting a still-active
+     * session throws `{ code: 'SESSION_ACTIVE', status: 409 }` (the caller must
+     * close it first, mirroring the SESSION_CLOSED-throw convention elsewhere
+     * in this file). An unknown OR already-deleted id throws
+     * `{ code: 'SESSION_NOT_FOUND', status: 404 }` — delete is not a 200-noop.
+     */
+    async deleteSession(sessionId) {
+        const session = this.sessions.get(sessionId);
+        if (!session) {
+            throw Object.assign(new Error(`Session not found: ${sessionId}`), { code: 'SESSION_NOT_FOUND', status: 404 });
+        }
+        if (session.meta.status !== 'closed') {
+            throw Object.assign(new Error('Session is active — close it, then delete.'), { code: 'SESSION_ACTIVE', status: 409 });
+        }
+        session.abortController.abort();
+        await this._hardRemove(sessionId);
+        // Live spine: drop the mirrored shared broker record entirely (not just closed).
+        this._brokerSync.track(sessionId, () => this._brokerSync.deleteSession(sessionId));
+        return { sessionId, deleted: true };
+    }
     /**
      * Post a user message and start an async LLM turn. Returns the messageId.
      *
@@ -318,11 +355,11 @@ export class CompanionChatManager {
             throw Object.assign(new Error(`Session not found: ${sessionId}`), { code: 'SESSION_NOT_FOUND', status: 404 });
         }
         if (session.meta.status === 'closed') {
-            throw Object.assign(new Error(`Session is closed: ${sessionId}`), { code: 'SESSION_CLOSED', status: 409 });
+            throw Object.assign(new Error('Session is closed'), { code: SDKErrorCodes.SESSION_CLOSED, status: 409 });
         }
         // Rate-limit check (throws GoodVibesSdkError on violation)
         this.rateLimiter?.check(sessionId, clientId);
-        const attachments = this.resolveAttachments(options.attachments ?? []);
+        const attachments = resolveAttachments(options.attachments ?? [], this.artifactStore);
         if (!content.trim() && attachments.length === 0) {
             throw Object.assign(new Error('content or attachments are required'), { code: 'INVALID_INPUT', status: 400 });
         }
@@ -338,7 +375,7 @@ export class CompanionChatManager {
             createdAt: now,
         };
         session.messages.push(userMsg);
-        session.conversation.addUserMessage(await this.buildProviderUserContent(content, attachments));
+        session.conversation.addUserMessage(await buildProviderUserContent(content, attachments, this.artifactStore));
         session.lastActivityAt = now;
         this._updateMeta(session, {
             messageCount: session.messages.length,
@@ -357,106 +394,6 @@ export class CompanionChatManager {
         });
         return messageId;
     }
-    resolveAttachments(inputs) {
-        if (inputs.length === 0)
-            return [];
-        if (inputs.length > MAX_ATTACHMENTS_PER_MESSAGE) {
-            throw Object.assign(new Error(`A companion chat message can include at most ${MAX_ATTACHMENTS_PER_MESSAGE} attachments.`), { code: 'TOO_MANY_ATTACHMENTS', status: 400 });
-        }
-        if (!this.artifactStore) {
-            throw Object.assign(new Error('Companion chat attachments require an artifact store.'), { code: 'ATTACHMENTS_UNAVAILABLE', status: 501 });
-        }
-        return inputs.map((input) => {
-            const artifactId = input.artifactId.trim();
-            if (!artifactId) {
-                throw Object.assign(new Error('Attachment artifactId is required.'), {
-                    code: 'INVALID_ATTACHMENT',
-                    status: 400,
-                });
-            }
-            const artifact = this.artifactStore.get(artifactId);
-            if (!artifact) {
-                throw Object.assign(new Error(`Unknown attachment artifact: ${artifactId}`), {
-                    code: 'UNKNOWN_ARTIFACT',
-                    status: 404,
-                });
-            }
-            return {
-                ...artifact,
-                artifactId: artifact.id,
-                ...(input.label?.trim() ? { label: input.label.trim() } : {}),
-                metadata: {
-                    ...artifact.metadata,
-                    ...(input.metadata ?? {}),
-                },
-            };
-        });
-    }
-    formatAttachmentSummary(attachments) {
-        if (attachments.length === 0)
-            return '';
-        const lines = attachments.map((attachment, index) => {
-            const name = attachment.label ?? attachment.filename ?? attachment.artifactId;
-            return `${index + 1}. ${name} (${attachment.mimeType}, ${attachment.sizeBytes} bytes, artifact ${attachment.artifactId})`;
-        });
-        return `\n\nAttached file${attachments.length === 1 ? '' : 's'}:\n${lines.join('\n')}`;
-    }
-    buildReplayUserContent(message) {
-        return `${message.content}${this.formatAttachmentSummary(message.attachments ?? [])}`;
-    }
-    isInlineTextAttachment(attachment) {
-        const lower = attachment.mimeType.toLowerCase();
-        return attachment.sizeBytes <= MAX_INLINE_TEXT_ATTACHMENT_BYTES
-            && (lower.startsWith('text/')
-                || lower === 'application/json'
-                || lower === 'application/xml'
-                || lower === 'application/yaml'
-                || lower === 'text/csv');
-    }
-    isInlineImageAttachment(attachment) {
-        const lower = attachment.mimeType.toLowerCase();
-        return attachment.sizeBytes <= MAX_INLINE_IMAGE_ATTACHMENT_BYTES
-            && (lower === 'image/png'
-                || lower === 'image/jpeg'
-                || lower === 'image/gif'
-                || lower === 'image/webp');
-    }
-    async buildProviderUserContent(content, attachments) {
-        if (attachments.length === 0)
-            return content;
-        const textSections = [content.trim() ? content : 'Please review the attached file(s).'];
-        const imageParts = [];
-        for (const attachment of attachments) {
-            if (!this.artifactStore)
-                continue;
-            try {
-                if (this.isInlineTextAttachment(attachment)) {
-                    const { buffer } = await this.artifactStore.readContent(attachment.artifactId);
-                    const text = toNodeBuffer(buffer).toString('utf-8');
-                    textSections.push(`\n\n--- Attachment: ${attachment.label ?? attachment.filename ?? attachment.artifactId} ---\n${text}`);
-                    continue;
-                }
-                if (this.isInlineImageAttachment(attachment)) {
-                    const { buffer } = await this.artifactStore.readContent(attachment.artifactId);
-                    imageParts.push({
-                        type: 'image',
-                        mediaType: attachment.mimeType,
-                        data: toNodeBuffer(buffer).toString('base64'),
-                    });
-                }
-            }
-            catch (error) {
-                logger.warn('[companion-chat] failed to inline attachment for provider prompt', {
-                    artifactId: attachment.artifactId,
-                    error: summarizeError(error),
-                });
-            }
-        }
-        textSections.push(this.formatAttachmentSummary(attachments));
-        if (imageParts.length === 0)
-            return textSections.join('');
-        return [{ type: 'text', text: textSections.join('') }, ...imageParts];
-    }
     dispose() {
         if (this.gcTimer) {
             clearInterval(this.gcTimer);
@@ -706,30 +643,52 @@ export class CompanionChatManager {
     // ---------------------------------------------------------------------------
     // GC sweep
     // ---------------------------------------------------------------------------
+    /**
+     * Periodic GC sweep. Deletion authority is SPLIT (charter: closed sessions are
+     * HISTORY): close-idle closes an idle active session; evict-memory drops a
+     * long-closed session's in-memory handles (meta + on-disk copy kept);
+     * delete-persistent removes the file ONLY under an explicit finite retention
+     * window (default retains indefinitely — see {@link planCompanionSweep}).
+     */
     _gcSweep() {
         const now = Date.now();
         for (const [id, session] of this.sessions) {
-            if (session.meta.status === 'closed') {
-                // Remove already-closed sessions after a short grace period (5 min)
-                if (now - (session.meta.closedAt ?? now) > 5 * 60_000) {
-                    void this.persistence?.delete(id).catch((error) => {
+            const action = planCompanionSweep({
+                status: session.meta.status,
+                closedAt: session.meta.closedAt,
+                lastActivityAt: session.lastActivityAt,
+                hasMessagesInMemory: !session.messagesEvicted && session.messages.length > 0,
+                isEmpty: session.messages.length === 0,
+            }, {
+                now,
+                idleActiveMs: this.idleActiveMs,
+                idleEmptyMs: this.idleEmptyMs,
+                closedMemoryGraceMs: this.closedMemoryGraceMs,
+                closedRetentionMs: this.closedRetentionMs,
+            });
+            switch (action.kind) {
+                case 'close-idle':
+                    session.abortController.abort();
+                    this._updateMeta(session, { status: 'closed', closedAt: now, updatedAt: now });
+                    this._persist(id);
+                    this._brokerSync.track(id, () => this._brokerSync.closeSession(id));
+                    break;
+                case 'evict-memory':
+                    // Free heavy handles; keep meta (listable) and the persisted file.
+                    session.messages = [];
+                    session.conversation = new ConversationManager();
+                    session.messagesEvicted = true;
+                    break;
+                case 'delete-persistent':
+                    void this._hardRemove(id).catch((error) => {
                         logger.warn('[companion-chat] session delete failed', {
                             sessionId: id,
                             error: summarizeError(error),
                         });
                     });
-                    this.sessions.delete(id);
-                }
-                continue;
-            }
-            const idleMs = now - session.lastActivityAt;
-            const isEmpty = session.messages.length === 0;
-            const ttl = isEmpty ? this.idleEmptyMs : this.idleActiveMs;
-            if (idleMs >= ttl) {
-                // Close via GC
-                session.abortController.abort();
-                this._updateMeta(session, { status: 'closed', closedAt: now, updatedAt: now });
-                this._persist(id);
+                    break;
+                case 'retain':
+                    break;
             }
         }
     }
@@ -738,6 +697,33 @@ export class CompanionChatManager {
         session.meta = updated;
         return updated;
     }
+    // ---------------------------------------------------------------------------
+    // Live shared-broker registration (S1 item D) — see companion-chat-broker-sync.ts
+    // ---------------------------------------------------------------------------
+    /**
+     * Await all in-flight best-effort broker-sync operations. The daemon's
+     * companion HTTP routes call this before responding so `/api/sessions`
+     * reflects the change synchronously; tests use it to make the mirror
+     * deterministic. A no-op when no broker bridge is configured.
+     */
+    async flushBrokerSync() {
+        await this._brokerSync.flush();
+    }
+    /**
+     * Hard-remove a session's persisted file and in-memory record. The ONE
+     * removal code path — shared by {@link deleteSession} and the GC
+     * 'delete-persistent' action. Never fork this. Order matters (Wave-5 F1):
+     * drop the map entry, drain any in-flight {@link _persist} save for this
+     * id, THEN unlink — else a save mid-write from {@link closeSession} can
+     * resurrect the file post-unlink.
+     */
+    async _hardRemove(sessionId) {
+        this.sessions.delete(sessionId);
+        const pendingSave = this._pendingSaves.get(sessionId);
+        if (pendingSave)
+            await pendingSave.catch(() => { });
+        await this.persistence?.delete(sessionId);
+    }
     /**
      * Schedule a persistence save for the given session.
      * Saves are serialized per-session: each new save waits for the prior one to

package/dist/platform/companion/companion-chat-persistence.d.ts

@@ -16,7 +16,15 @@ export interface PersistedChatSession {
     readonly meta: CompanionChatSession;
     readonly messages: CompanionChatMessage[];
 }
-export declare function defaultSessionsDir(): string;
+/**
+ * Resolve the companion-chat sessions directory.
+ *
+ * Pass the runtime's INJECTED home directory so an isolated-home daemon never
+ * reads or writes the real `~/.goodvibes/companion-chat` — the rest of the
+ * runtime resolves paths from the injected home, and this must agree. The
+ * OS `homedir()` is used only as a last resort when nothing is injected.
+ */
+export declare function defaultSessionsDir(homeDirectory?: string): string;
 export declare class CompanionChatPersistence {
     private readonly sessionsDir;
     constructor(sessionsDir?: string);

package/dist/platform/companion/companion-chat-persistence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"companion-chat-persistence.d.ts","sourceRoot":"","sources":["../../../src/platform/companion/companion-chat-persistence.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAMH,OAAO,KAAK,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAQ5F,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC;IACpC,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,EAAE,CAAC;CAC3C;AAMD,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAMD,qBAAa,wBAAwB;IACnC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAEzB,WAAW,CAAC,EAAE,MAAM;IAIhC,4CAA4C;IAC5C,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,QAAQ;IAIhB,0FAA0F;IACpF,OAAO,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAoChD,iFAAiF;IAC3E,IAAI,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BxD,yGAAyG;IACnG,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAU/C"}
+{"version":3,"file":"companion-chat-persistence.d.ts","sourceRoot":"","sources":["../../../src/platform/companion/companion-chat-persistence.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAMH,OAAO,KAAK,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAQ5F,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC;IACpC,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,EAAE,CAAC;CAC3C;AAMD;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAEjE;AAMD,qBAAa,wBAAwB;IACnC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAEzB,WAAW,CAAC,EAAE,MAAM;IAIhC,4CAA4C;IAC5C,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,QAAQ;IAIhB,0FAA0F;IACpF,OAAO,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAoChD,iFAAiF;IAC3E,IAAI,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BxD,yGAAyG;IACnG,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAU/C"}

package/dist/platform/companion/companion-chat-persistence.js

@@ -20,8 +20,16 @@ import { summarizeError } from '../utils/error-display.js';
 // ---------------------------------------------------------------------------
 // Default path
 // ---------------------------------------------------------------------------
-export function defaultSessionsDir() {
-    return join(homedir(), '.goodvibes', 'companion-chat', 'sessions');
+/**
+ * Resolve the companion-chat sessions directory.
+ *
+ * Pass the runtime's INJECTED home directory so an isolated-home daemon never
+ * reads or writes the real `~/.goodvibes/companion-chat` — the rest of the
+ * runtime resolves paths from the injected home, and this must agree. The
+ * OS `homedir()` is used only as a last resort when nothing is injected.
+ */
+export function defaultSessionsDir(homeDirectory) {
+    return join(homeDirectory ?? homedir(), '.goodvibes', 'companion-chat', 'sessions');
 }
 // ---------------------------------------------------------------------------
 // CompanionChatPersistence

package/dist/platform/companion/companion-chat-routes.d.ts

@@ -7,7 +7,8 @@
  *   POST   /api/companion/chat/sessions
  *   GET    /api/companion/chat/sessions/:sessionId
  *   PATCH  /api/companion/chat/sessions/:sessionId
- *   DELETE /api/companion/chat/sessions/:sessionId
+ *   POST   /api/companion/chat/sessions/:sessionId/close   (soft close — history preserved)
+ *   DELETE /api/companion/chat/sessions/:sessionId         (hard delete — record permanently removed)
  *   POST   /api/companion/chat/sessions/:sessionId/messages
  *   GET    /api/companion/chat/sessions/:sessionId/messages
  *   GET    /api/companion/chat/sessions/:sessionId/events  (SSE)

package/dist/platform/companion/companion-chat-routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"companion-chat-routes.d.ts","sourceRoot":"","sources":["../../../src/platform/companion/companion-chat-routes.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AASH,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAMjF;;;GAGG;AACH,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAoD1B;AA8MD;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAMlF"}
+{"version":3,"file":"companion-chat-routes.d.ts","sourceRoot":"","sources":["../../../src/platform/companion/companion-chat-routes.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAUH,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAMjF;;;GAGG;AACH,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAyD1B;AAgPD;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAMlF"}