zelari-code 1.48.1 → 2.0.0-alpha.2

package/dist/cli/sessionSpine.js

@@ -0,0 +1,272 @@
+import { SessionLogWriter, SessionLogLockedError, resolveSessionsDir, readSessionLog, buildProjection, deriveMessages, } from '@zelari/core/session';
+import { ACTOR_AGENT, ACTOR_SYSTEM, ACTOR_USER } from '@zelari/core/session';
+import path from 'node:path';
+/** Kill switch — default ON in the 2.0 alpha. */
+export function spineEnabled() {
+    return process.env.ZELARI_SESSION_SPINE !== '0';
+}
+/** Map one BrainEvent onto a spine event; null when not spine-relevant. */
+export function mapBrainEventToSpine(ev) {
+    switch (ev.type) {
+        case 'tool_execution_start':
+            return {
+                kind: 'tool.call',
+                actor: ACTOR_AGENT,
+                data: { tool: ev.toolName, args: ev.args ?? {}, callId: ev.toolCallId },
+            };
+        case 'tool_execution_end':
+            return {
+                kind: 'tool.result',
+                actor: { type: 'tool' },
+                data: {
+                    callId: ev.toolCallId,
+                    output: ev.result,
+                    ok: !ev.isError,
+                    durationMs: ev.durationMs,
+                },
+            };
+        case 'session_compacted':
+            return {
+                kind: 'session.compacted',
+                actor: ACTOR_SYSTEM,
+                data: { summary: ev.summary ?? '' },
+            };
+        case 'agent_start':
+            return {
+                kind: 'note',
+                actor: ACTOR_SYSTEM,
+                data: {
+                    note: 'agent_start',
+                    model: ev.model,
+                    provider: ev.provider,
+                    ...(ev.memberName ? { member: ev.memberName } : {}),
+                },
+            };
+        default:
+            // message deltas are coalesced at message_end by the mirror;
+            // ui/progress/metrics events are not part of the spine vocabulary.
+            return null;
+    }
+}
+const MAX_STREAM_BUFFERS = 32;
+/**
+ * Owns the spine writer for one session. All appends are serialized; every
+ * public method swallows errors (degrade-and-stop) — the spine must never
+ * take the interactive loop down with it.
+ */
+export class SessionSpineMirror {
+    sessionId;
+    options;
+    writer = null;
+    chain = Promise.resolve();
+    streamBuffers = new Map();
+    warned = false;
+    status = 'disabled';
+    /** Seq the log continued from when adopting an existing session. */
+    resumedFromSeq;
+    sessionsDir;
+    constructor(sessionId, options) {
+        this.sessionId = sessionId;
+        this.options = options;
+        this.sessionsDir = resolveSessionsDir({ baseDir: options.baseDir });
+    }
+    /**
+     * Adopt a 1.x sessionId into the spine: continue the seq when the log
+     * already exists (resume), otherwise start fresh with `session.started`.
+     * Returns the mirror (never throws — check `.status`).
+     */
+    static async adopt(sessionId, options = {}) {
+        const mirror = new SessionSpineMirror(sessionId, options);
+        if (!spineEnabled())
+            return mirror;
+        try {
+            const sessionDir = path.join(mirror.sessionsDir, sessionId);
+            const report = await readSessionLog(path.join(sessionDir, 'events.jsonl'));
+            const existed = report.events.length > 0 || report.issues.length > 0;
+            const lastSeq = report.events[report.events.length - 1]?.seq ?? 0;
+            mirror.writer = await SessionLogWriter.open(sessionDir, sessionId, lastSeq + 1, {
+                now: options.now,
+            });
+            mirror.resumedFromSeq = existed ? lastSeq : undefined;
+            await mirror.append({
+                kind: existed ? 'session.resumed' : 'session.started',
+                actor: ACTOR_SYSTEM,
+                data: {
+                    reason: existed ? 'host-resume' : 'host-bootstrap',
+                    bridge: 'cli-dual-write',
+                    continuedFromSeq: existed ? lastSeq : undefined,
+                    replayIssues: report.issues.length || undefined,
+                    ...options.extraStarted,
+                },
+            });
+            mirror.status = 'active';
+        }
+        catch (err) {
+            if (err instanceof SessionLogLockedError) {
+                mirror.status = 'locked';
+            }
+            else {
+                mirror.status = 'degraded';
+                mirror.warnOnce(err);
+            }
+            mirror.writer = null;
+        }
+        return mirror;
+    }
+    /** Log the user prompt — the P1 gap the 1.x log never closed. */
+    userMessage(text) {
+        void this.append({ kind: 'user.message', actor: ACTOR_USER, data: { text } });
+    }
+    /** Mirror one BrainEvent (coalescing message deltas until message_end). */
+    mirrorBrainEvent(ev) {
+        if (this.status !== 'active' || !this.writer)
+            return;
+        if (ev.type === 'message_delta') {
+            const key = ev.messageId;
+            const prev = this.streamBuffers.get(key) ?? '';
+            this.streamBuffers.set(key, prev + ev.delta);
+            return;
+        }
+        if (ev.type === 'message_end') {
+            const text = this.streamBuffers.get(ev.messageId);
+            this.streamBuffers.delete(ev.messageId);
+            if (this.streamBuffers.size > MAX_STREAM_BUFFERS) {
+                this.streamBuffers.clear(); // defensive — bounded memory
+            }
+            // The buffered text is the full body; when the buffer is missing
+            // (e.g. mirror started mid-stream) fall back to nothing rather than
+            // logging a truncated claim.
+            if (text !== undefined && text.length > 0) {
+                void this.append({
+                    kind: 'assistant.message',
+                    actor: ACTOR_AGENT,
+                    data: {
+                        text,
+                        messageId: ev.messageId,
+                        finishReason: ev.finishReason,
+                        ...(ev.memberName ? { member: ev.memberName } : {}),
+                    },
+                });
+            }
+            return;
+        }
+        const mapped = mapBrainEventToSpine(ev);
+        if (mapped)
+            void this.append(mapped);
+    }
+    /** Append a `verification.run` event (machine-readable completion evidence). */
+    verificationRun(payload) {
+        void this.append({ kind: 'verification.run', actor: ACTOR_SYSTEM, data: payload });
+    }
+    /** Append a `mission.phase` transition (Fase 4 mission reliability). */
+    missionPhase(phase, note) {
+        void this.append({
+            kind: 'mission.phase',
+            actor: ACTOR_SYSTEM,
+            data: { phase, ...(note ? { note } : {}) },
+        });
+    }
+    note(text, data) {
+        void this.append({ kind: 'note', actor: ACTOR_SYSTEM, data: { note: text, ...data } });
+    }
+    append(input) {
+        if (!this.writer || this.status === 'closed')
+            return Promise.resolve();
+        this.chain = this.chain
+            .then(() => this.writer.append(input))
+            .then(() => undefined)
+            .catch((err) => {
+            this.status = 'degraded';
+            this.writer = null;
+            this.warnOnce(err);
+        });
+        return this.chain;
+    }
+    warnOnce(err) {
+        if (this.warned || this.options.quiet)
+            return;
+        this.warned = true;
+        const msg = err instanceof Error ? err.message : String(err);
+        try {
+            process.stderr.write(`[zelari] session spine degraded for ${this.sessionId.slice(0, 8)}…: ${msg} (transcript continues on the 1.x log)\n`);
+        }
+        catch {
+            /* stderr gone — nothing more to do */
+        }
+    }
+    /** Flush pending appends; append `session.ended` and release the lock. */
+    async close(reason = 'host-exit') {
+        if (this.status === 'active' && this.writer) {
+            await this.append({ kind: 'session.ended', actor: ACTOR_SYSTEM, data: { reason } });
+        }
+        await this.chain;
+        const writer = this.writer;
+        this.writer = null;
+        if (this.status !== 'closed')
+            this.status = 'closed';
+        if (writer)
+            await writer.close().catch(() => undefined);
+    }
+    /**
+     * Release the lock WITHOUT appending `session.ended`.
+     * Used on SIGINT / abort so deriveMissionState can project
+     * `interrupted: true` and a later adopt continues the seq.
+     */
+    async release() {
+        await this.chain;
+        const writer = this.writer;
+        this.writer = null;
+        if (this.status === 'active')
+            this.status = 'closed';
+        if (writer)
+            await writer.close().catch(() => undefined);
+    }
+}
+/** Writer that dual-writes: 1.x sidecar + spine mirror. */
+export class SpineMirroringWriter {
+    inner;
+    spine;
+    constructor(inner, spine) {
+        this.inner = inner;
+        this.spine = spine;
+    }
+    get path() {
+        return this.inner.path;
+    }
+    append(ev) {
+        const result = this.inner.append(ev);
+        this.spine?.mirrorBrainEvent(ev);
+        return result;
+    }
+    async flush() {
+        await this.inner.flush?.();
+    }
+    async close() {
+        await this.inner.close();
+        await this.spine?.close();
+    }
+}
+/**
+ * Bootstrap the dual-write writer for a TUI session: opens the spine mirror
+ * (best-effort) and wraps the 1.x writer so the chat loop needs no changes.
+ */
+export async function wrapSessionWriter(inner, sessionId, options = {}) {
+    const spine = await SessionSpineMirror.adopt(sessionId, options);
+    return new SpineMirroringWriter(inner, spine.status === 'active' ? spine : null);
+}
+/**
+ * Replay the spine for resume UX (headless + TUI status line). Returns null
+ * when the session has no spine log yet.
+ */
+export async function resumeSpineContext(sessionId, baseDir) {
+    const sessionsDir = resolveSessionsDir({ baseDir });
+    const eventsPath = path.join(sessionsDir, sessionId, 'events.jsonl');
+    const report = await readSessionLog(eventsPath).catch(() => null);
+    if (!report || (report.events.length === 0 && report.issues.length === 0))
+        return null;
+    return {
+        projection: buildProjection(report.events, report.issues),
+        derived: deriveMessages(report.events),
+    };
+}
+//# sourceMappingURL=sessionSpine.js.map

package/dist/cli/sessionSpine.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sessionSpine.js","sourceRoot":"","sources":["../../src/cli/sessionSpine.ts"],"names":[],"mappings":"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"}

package/dist/cli/sessionSpine.test.js

@@ -0,0 +1,171 @@
+/**
+ * sessionSpine tests — dual-write bridge onto the 2.0 session spine.
+ *
+ * Covers: BrainEvent→spine mapping, adopt/resume seq continuation, ownership
+ * lock, message-delta coalescing, user.message logging (the P1 gap), the
+ * declared-discrete-fallback degradation, and the kill switch.
+ */
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { promises as fs } from 'node:fs';
+import path from 'node:path';
+import os from 'node:os';
+import { SessionSpineMirror, mapBrainEventToSpine, resumeSpineContext, spineEnabled, } from './sessionSpine.js';
+import { readSessionLog } from '@zelari/core/session';
+let tmp;
+beforeEach(async () => {
+    tmp = await fs.mkdtemp(path.join(os.tmpdir(), 'zelari-spine-'));
+});
+afterEach(async () => {
+    await fs.rm(tmp, { recursive: true, force: true });
+});
+function ev(type, rest = {}) {
+    return { type, id: `id-${type}`, ts: 1_755_000_000_000, sessionId: 's1', ...rest };
+}
+describe('mapBrainEventToSpine', () => {
+    it('maps tool_execution_start → tool.call with tool/args/callId', () => {
+        const mapped = mapBrainEventToSpine(ev('tool_execution_start', { toolCallId: 'c1', toolName: 'bash', args: { command: 'ls' } }));
+        expect(mapped).not.toBeNull();
+        expect(mapped.kind).toBe('tool.call');
+        expect(mapped.data).toMatchObject({ tool: 'bash', callId: 'c1' });
+    });
+    it('maps tool_execution_end → tool.result with ok inverted from isError', () => {
+        const mapped = mapBrainEventToSpine(ev('tool_execution_end', { toolCallId: 'c1', result: 'err', isError: true, durationMs: 5 }));
+        expect(mapped.kind).toBe('tool.result');
+        expect(mapped.data).toMatchObject({ callId: 'c1', ok: false });
+    });
+    it('drops ui/progress events (queue_update, message_start, thinking_delta)', () => {
+        expect(mapBrainEventToSpine(ev('queue_update', { queuedCount: 1 }))).toBeNull();
+        expect(mapBrainEventToSpine(ev('message_start', { messageId: 'm', role: 'assistant' }))).toBeNull();
+        expect(mapBrainEventToSpine(ev('thinking_delta', { messageId: 'm', delta: 'x' }))).toBeNull();
+    });
+});
+describe('SessionSpineMirror.adopt', () => {
+    it('bootstraps a fresh session with session.started at seq 1', async () => {
+        const mirror = await SessionSpineMirror.adopt('sess-a', { baseDir: tmp, quiet: true });
+        expect(mirror.status).toBe('active');
+        await mirror.close();
+        const report = await readSessionLog(path.join(tmp, 'sess-a', 'events.jsonl'));
+        expect(report.events.map((e) => e.kind)).toEqual(['session.started', 'session.ended']);
+        expect(report.events[0].seq).toBe(1);
+    });
+    it('resumes an existing session: session.resumed + seq continues after lastSeq', async () => {
+        const first = await SessionSpineMirror.adopt('sess-b', { baseDir: tmp, quiet: true });
+        first.userMessage('hello');
+        await first.close();
+        const second = await SessionSpineMirror.adopt('sess-b', { baseDir: tmp, quiet: true });
+        second.userMessage('again');
+        await second.close('done');
+        const report = await readSessionLog(path.join(tmp, 'sess-b', 'events.jsonl'));
+        const kinds = report.events.map((e) => e.kind);
+        expect(kinds).toEqual([
+            'session.started',
+            'user.message',
+            'session.ended',
+            'session.resumed',
+            'user.message',
+            'session.ended',
+        ]);
+        // seq must be monotonic and gap-free across the reopen
+        report.events.forEach((e, i) => expect(e.seq).toBe(i + 1));
+    });
+    it('a second live writer is rejected as locked (ownership)', async () => {
+        const first = await SessionSpineMirror.adopt('sess-c', { baseDir: tmp, quiet: true });
+        const second = await SessionSpineMirror.adopt('sess-c', { baseDir: tmp, quiet: true });
+        expect(second.status).toBe('locked');
+        // the locked mirror is inert, the first keeps writing
+        first.userMessage('still mine');
+        await first.close();
+        const report = await readSessionLog(path.join(tmp, 'sess-c', 'events.jsonl'));
+        expect(report.events.some((e) => e.kind === 'user.message')).toBe(true);
+    });
+    it('degrades silently when the sessions dir cannot be created', async () => {
+        // a FILE at the path where the directory should go → mkdir fails
+        const blocker = path.join(tmp, 'blocker');
+        await fs.writeFile(blocker, 'x', 'utf-8');
+        const mirror = await SessionSpineMirror.adopt('sess-d', { baseDir: blocker, quiet: true });
+        expect(mirror.status).toBe('degraded');
+        // never throws, stays inert
+        expect(() => mirror.userMessage('nope')).not.toThrow();
+        await mirror.close();
+    });
+    it('ZELARI_SESSION_SPINE=0 disables the mirror entirely', async () => {
+        const prev = process.env.ZELARI_SESSION_SPINE;
+        process.env.ZELARI_SESSION_SPINE = '0';
+        try {
+            expect(spineEnabled()).toBe(false);
+            const mirror = await SessionSpineMirror.adopt('sess-e', { baseDir: tmp, quiet: true });
+            expect(mirror.status).toBe('disabled');
+            await mirror.close();
+            await expect(fs.access(path.join(tmp, 'sess-e'))).rejects.toThrow();
+        }
+        finally {
+            if (prev === undefined)
+                delete process.env.ZELARI_SESSION_SPINE;
+            else
+                process.env.ZELARI_SESSION_SPINE = prev;
+        }
+    });
+});
+describe('SessionSpineMirror.mirrorBrainEvent', () => {
+    it('coalesces message_delta into ONE assistant.message at message_end', async () => {
+        const mirror = await SessionSpineMirror.adopt('sess-f', { baseDir: tmp, quiet: true });
+        mirror.mirrorBrainEvent(ev('message_start', { messageId: 'm1', role: 'assistant' }));
+        mirror.mirrorBrainEvent(ev('message_delta', { messageId: 'm1', delta: 'Hello ' }));
+        mirror.mirrorBrainEvent(ev('message_delta', { messageId: 'm1', delta: 'world' }));
+        mirror.mirrorBrainEvent(ev('message_end', { messageId: 'm1', totalLength: 11, finishReason: 'stop' }));
+        await mirror.close();
+        const report = await readSessionLog(path.join(tmp, 'sess-f', 'events.jsonl'));
+        const assistant = report.events.filter((e) => e.kind === 'assistant.message');
+        expect(assistant).toHaveLength(1);
+        expect(assistant[0].data.text).toBe('Hello world');
+    });
+    it('message_end without buffered deltas logs nothing (no truncated claim)', async () => {
+        const mirror = await SessionSpineMirror.adopt('sess-g', { baseDir: tmp, quiet: true });
+        mirror.mirrorBrainEvent(ev('message_end', { messageId: 'orphan', totalLength: 0, finishReason: 'stop' }));
+        await mirror.close();
+        const report = await readSessionLog(path.join(tmp, 'sess-g', 'events.jsonl'));
+        expect(report.events.filter((e) => e.kind === 'assistant.message')).toHaveLength(0);
+    });
+    it('mirrors tool call+result pair', async () => {
+        const mirror = await SessionSpineMirror.adopt('sess-h', { baseDir: tmp, quiet: true });
+        mirror.mirrorBrainEvent(ev('tool_execution_start', { toolCallId: 'c9', toolName: 'bash', args: {} }));
+        mirror.mirrorBrainEvent(ev('tool_execution_end', { toolCallId: 'c9', result: 'ok', isError: false, durationMs: 12 }));
+        await mirror.close();
+        const report = await readSessionLog(path.join(tmp, 'sess-h', 'events.jsonl'));
+        const kinds = report.events.map((e) => e.kind);
+        expect(kinds).toContain('tool.call');
+        expect(kinds).toContain('tool.result');
+    });
+});
+describe('resumeSpineContext', () => {
+    it('returns null for an unknown session and a projection for a logged one', async () => {
+        expect(await resumeSpineContext('nope', tmp)).toBeNull();
+        const mirror = await SessionSpineMirror.adopt('sess-i', { baseDir: tmp, quiet: true });
+        mirror.userMessage('write a test');
+        mirror.mirrorBrainEvent(ev('message_end', { messageId: 'm', totalLength: 2, finishReason: 'stop' }));
+        // note: no deltas buffered → no assistant message; add one properly
+        mirror.mirrorBrainEvent(ev('message_delta', { messageId: 'm2', delta: 'done' }));
+        mirror.mirrorBrainEvent(ev('message_end', { messageId: 'm2', totalLength: 4, finishReason: 'stop' }));
+        await mirror.close();
+        const ctx = await resumeSpineContext('sess-i', tmp);
+        expect(ctx).not.toBeNull();
+        expect(ctx.derived.map((m) => m.role)).toEqual(['user', 'assistant']);
+        expect(ctx.derived[0].content).toBe('write a test');
+        expect(ctx.projection.lastSeq).toBeGreaterThan(2);
+    });
+});
+describe('SessionSpineMirror.release', () => {
+    it('leaves the log without session.ended so resume can continue the seq', async () => {
+        const mirror = await SessionSpineMirror.adopt('sess-int', { baseDir: tmp, quiet: true });
+        mirror.userMessage('partial');
+        await mirror.release();
+        const { readSessionLog } = await import('@zelari/core/session');
+        const report = await readSessionLog(path.join(tmp, 'sess-int', 'events.jsonl'));
+        expect(report.events.some((e) => e.kind === 'session.ended')).toBe(false);
+        const again = await SessionSpineMirror.adopt('sess-int', { baseDir: tmp, quiet: true });
+        expect(again.status).toBe('active');
+        expect(again.resumedFromSeq).toBeGreaterThan(0);
+        await again.close('done');
+    });
+});
+//# sourceMappingURL=sessionSpine.test.js.map

package/dist/cli/sessionSpine.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sessionSpine.test.js","sourceRoot":"","sources":["../../src/cli/sessionSpine.test.ts"],"names":[],"mappings":"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"}

package/dist/cli/toolRegistry.js

@@ -25,6 +25,7 @@ import { assertShellAllowed, ShellBlockedError } from './safety/shellBlocklist.j
 import { AuditLogger } from './safety/auditLogger.js';
 import { runDiagnosticsForFile, formatDiagnostics } from './diagnostics/engine.js';
 import { createTaskTool } from './tools/taskTool.js';
+import { createKrakenSelectTool } from './tools/krakenSelectTool.js';
 import { createAskUserTool } from './tools/askUser.js';
 import { createSkillTool } from './tools/skillTool.js';
 import { createTodoReadTool, createTodoWriteTool } from './tools/todoTools.js';
@@ -41,6 +42,7 @@ import { createSshTools } from './ssh/tools.js';
 import { createWorldModelTools } from './workspace/worldModel.js';
 import { providerFromEnv, providerConfigFor, } from './provider/openai-compatible.js';
 import { buildProviderStream } from './provider/resolveStream.js';
+import { getKrakenVerifierOverride } from './providerConfig.js';
 import { defaultPermissionPolicy, resolveToolPermission, } from './safety/toolPermissions.js';
 import { createDefaultLifecycleHooks } from './safety/lifecycleHooks.js';
 import { withResultCache } from './toolResultCache.js';
@@ -275,17 +277,26 @@ export function createBuiltinToolRegistry(options = {}) {
             });
         }
     }
-    // The `task` sub-agent tool — parent full registry only (not plan/explore/verify/general).
-    // Sub-agents get a profile-specific registry and never nest another `task`.
+    // The `task` sub-agent tool — parent full registry only (not explore/verify/general
+    // sub-agents). Sub-agents get a profile-specific registry and never nest another
+    // `task`. Fase 1 (ADR-0020): PLAN keeps the `task` tool restricted to
+    // explore-only (plan-safe) tentacles unless planExploreTask=false; the explore
+    // profile is read-only, so PLAN gains parallel research without write/execute reach.
     const enableTask = options.enableTask !== false &&
-        !readOnly &&
+        options.readOnly !== true &&
         !verifyMode &&
         profile === 'full' &&
-        !options.planMode;
+        (!options.planMode || options.planExploreTask !== false);
     if (enableTask) {
         const taskTool = createTaskTool({
-            createSubAgentContext: createKrakenSubAgentContextFactory({ root, audit, sessionId }),
-        });
+            createSubAgentContext: createKrakenSubAgentContextFactory({
+                root,
+                audit,
+                sessionId,
+                ...(options.subAgentProvider ? { provider: options.subAgentProvider } : {}),
+                ...(options.subAgentModel ? { model: options.subAgentModel } : {}),
+            }),
+        }, options.planMode === true ? { allowedAgents: ['explore'] } : undefined);
         registry.register(withPerm(taskTool));
         tools.push({
             name: taskTool.name,
@@ -293,6 +304,39 @@ export function createBuiltinToolRegistry(options = {}) {
             permissions: taskTool.permissions ?? [],
         });
     }
+    // Fase 4 (ADR-0020): `kraken_select` — parent Kraken ONLY. Gated on
+    // enableTask (full profile, not read-only, not verifyMode) AND the
+    // explicit krakenSelect option, so tentacles/council/zelari never see
+    // it. The verifier defaults to the EXACT parent provider/model
+    // (subAgentProvider/subAgentModel of this turn/run).
+    if (options.krakenSelect === true && enableTask) {
+        const selectTool = createKrakenSelectTool({
+            loadParentIdentity: async () => {
+                const cfg = options.subAgentProvider
+                    ? await providerConfigFor(options.subAgentProvider)
+                    : await providerFromEnv();
+                if (!cfg)
+                    return null;
+                return {
+                    provider: cfg.providerId,
+                    model: options.subAgentModel || cfg.model,
+                };
+            },
+            loadStream: async (provider) => {
+                const cfg = await providerConfigFor(provider);
+                return cfg ? buildProviderStream(cfg) : null;
+            },
+            // Fase 9 (ADR-0020): persisted verifier override (provider.json
+            // `krakenVerifier`). undefined = inherit the EXACT parent model.
+            loadVerifierOverride: () => getKrakenVerifierOverride(),
+        });
+        registry.register(withPerm(selectTool));
+        tools.push({
+            name: selectTool.name,
+            description: selectTool.description,
+            permissions: selectTool.permissions ?? [],
+        });
+    }
     // LSP navigation tools (go_to_definition, find_references, hover_type,
     // document_symbols, rename_symbol). Full + plan (read-only) registry,
     // gated by ZELARI_LSP. All five tools are permissions: ['read']