prism-mcp-server 19.2.8 → 19.3.0

package/dist/tools/__tests__/ledgerHandlers.test.js

@@ -54,6 +54,7 @@ vi.mock("../../../src/config.js", () => ({
     PRISM_GRAPH_PRUNE_MAX_PROJECTS_PER_SWEEP: 25,
     PRISM_ACTR_ENABLED: false,
     PRISM_ACTR_ACCESS_LOG_RETENTION_DAYS: 90,
+    SYNALUX_CONFIGURED: false,
 }));
 vi.mock("../../../src/utils/logger.js", () => ({
     debugLog: vi.fn(),
@@ -120,6 +121,19 @@ vi.mock("../../../src/utils/cognitiveMemory.js", () => ({
     computeEffectiveImportance: vi.fn((imp) => imp),
     recordMemoryAccess: vi.fn(),
 }));
+// Session context gate — default to "pass" (null) so existing tests are unaffected.
+// Gate-blocking behaviour is tested explicitly in the "context gate" sections below.
+vi.mock("../../../src/session/sessionContext.js", () => ({
+    markContextLoaded: vi.fn(),
+    requireContextLoaded: vi.fn(() => null),
+    noteInferenceForSession: vi.fn(),
+    getSessionState: vi.fn(() => null),
+}));
+// Boundaries — return minimal stubs so load-context tests don't depend on exact text.
+vi.mock("../../../src/boundaries/boundaries.js", () => ({
+    BOUNDARIES_VERSION: "test",
+    BOUNDARIES_TEXT: "# BOUNDARIES STUB",
+}));
 vi.mock("../../../src/tools/commonHelpers.js", () => ({
     redactSettings: vi.fn((s) => s),
     toMarkdown: vi.fn(() => "# Markdown Export"),
@@ -132,6 +146,7 @@ vi.mock("../../../src/utils/vaultExporter.js", () => ({
 // ======================================================================
 import { getStorage } from "../../../src/storage/index.js";
 import { getSetting, getAllSettings } from "../../../src/storage/configStorage.js";
+import { requireContextLoaded, markContextLoaded } from "../../../src/session/sessionContext.js";
 import { sessionSaveLedgerHandler, sessionSaveHandoffHandler, sessionLoadContextHandler, sessionForgetMemoryHandler, sessionExportMemoryHandler, memoryHistoryHandler, sessionSaveImageHandler, sessionViewImageHandler, sanitizeMemoryInput, } from "../../../src/tools/ledgerHandlers.js";
 const mockGetStorage = vi.mocked(getStorage);
 const mockGetSetting = vi.mocked(getSetting);
@@ -328,6 +343,36 @@ describe("ledgerHandlers", () => {
             storage.saveLedger.mockRejectedValue(new Error("DB write failed"));
             await expect(sessionSaveLedgerHandler(validArgs)).rejects.toThrow("DB write failed");
         });
+        // --- Context gate ---
+        it("blocks save and returns structured error when context not loaded", async () => {
+            vi.mocked(requireContextLoaded).mockReturnValueOnce({
+                blocked: true,
+                error: "context_not_loaded: call session_load_context first.",
+            });
+            const result = await sessionSaveLedgerHandler(validArgs);
+            expect(result.isError).toBe(true);
+            expect(result.content[0].text).toContain("context_not_loaded");
+            expect(storage.saveLedger).not.toHaveBeenCalled();
+        });
+        it("passes through to storage when context is loaded (gate returns null)", async () => {
+            vi.mocked(requireContextLoaded).mockReturnValueOnce(null);
+            const result = await sessionSaveLedgerHandler(validArgs);
+            expect(result.isError).toBe(false);
+            expect(storage.saveLedger).toHaveBeenCalledTimes(1);
+        });
+        it("proceeds and prepends warning when gate returns { blocked: false, warning } (version drift)", async () => {
+            vi.mocked(requireContextLoaded).mockReturnValueOnce({
+                blocked: false,
+                warning: "[advisory] Operating boundaries updated. Call session_load_context again.",
+            });
+            const result = await sessionSaveLedgerHandler(validArgs);
+            // Must NOT block — write proceeds
+            expect(result.isError).toBe(false);
+            expect(storage.saveLedger).toHaveBeenCalledTimes(1);
+            // Warning is prepended to the success text
+            expect(result.content[0].text).toContain("[advisory] Operating boundaries updated");
+            expect(result.content[0].text).toContain("✅ Session ledger saved");
+        });
     });
     // ====================================================================
     // 3. sessionLoadContextHandler
@@ -427,7 +472,7 @@ describe("ledgerHandlers", () => {
             });
             const text = result.content[0].text;
             // With 100 tokens * 4 chars = 400 char budget, the 5000-char summary gets truncated
-            expect(text).toContain("truncated to fit token budget");
+            expect(text).toContain("Sections omitted to fit token budget");
         });
         it("includes recent sessions in formatted output", async () => {
             storage.loadContext.mockResolvedValue({
@@ -472,6 +517,24 @@ describe("ledgerHandlers", () => {
             storage.loadContext.mockRejectedValue(new Error("Connection timeout"));
             await expect(sessionLoadContextHandler(validArgs)).rejects.toThrow("Connection timeout");
         });
+        // --- conversation_id / markContextLoaded ---
+        it("calls markContextLoaded when conversation_id is provided", async () => {
+            storage.loadContext.mockResolvedValue(null);
+            await sessionLoadContextHandler({ project: "test-project", conversation_id: "conv-xyz" });
+            expect(vi.mocked(markContextLoaded)).toHaveBeenCalledWith("conv-xyz", "test-project", "test");
+        });
+        it("does not call markContextLoaded when conversation_id is absent", async () => {
+            storage.loadContext.mockResolvedValue(null);
+            await sessionLoadContextHandler({ project: "test-project" });
+            expect(vi.mocked(markContextLoaded)).not.toHaveBeenCalled();
+        });
+        it("prepends BOUNDARIES header to every response", async () => {
+            storage.loadContext.mockResolvedValue(null);
+            const result = await sessionLoadContextHandler(validArgs);
+            const text = result.content[0].text;
+            expect(text).toContain("OPERATING BOUNDARIES");
+            expect(text).toContain("BOUNDARIES STUB");
+        });
     });
     // ====================================================================
     // 4. sessionSaveHandoffHandler
@@ -605,6 +668,38 @@ describe("ledgerHandlers", () => {
             storage.saveHandoff.mockRejectedValue(new Error("Write conflict"));
             await expect(sessionSaveHandoffHandler(validArgs)).rejects.toThrow("Write conflict");
         });
+        // --- Context gate ---
+        it("blocks handoff save and returns structured error when context not loaded", async () => {
+            vi.mocked(requireContextLoaded).mockReturnValueOnce({
+                blocked: true,
+                error: "context_not_loaded: call session_load_context first.",
+            });
+            const result = await sessionSaveHandoffHandler(validArgs);
+            expect(result.isError).toBe(true);
+            expect(result.content[0].text).toContain("context_not_loaded");
+            expect(storage.saveHandoff).not.toHaveBeenCalled();
+        });
+        it("passes through to storage when context is loaded (gate returns null)", async () => {
+            storage.saveHandoff.mockResolvedValue({ status: "created", version: 1 });
+            vi.mocked(requireContextLoaded).mockReturnValueOnce(null);
+            const result = await sessionSaveHandoffHandler(validArgs);
+            expect(result.isError).toBe(false);
+            expect(storage.saveHandoff).toHaveBeenCalledTimes(1);
+        });
+        it("proceeds and prepends warning when gate returns { blocked: false, warning } (version drift)", async () => {
+            storage.saveHandoff.mockResolvedValue({ status: "created", version: 1 });
+            vi.mocked(requireContextLoaded).mockReturnValueOnce({
+                blocked: false,
+                warning: "[advisory] Operating boundaries updated. Call session_load_context again.",
+            });
+            const result = await sessionSaveHandoffHandler(validArgs);
+            // Must NOT block — write proceeds
+            expect(result.isError).toBe(false);
+            expect(storage.saveHandoff).toHaveBeenCalledTimes(1);
+            // Warning is prepended to the success text
+            expect(result.content[0].text).toContain("[advisory] Operating boundaries updated");
+            expect(result.content[0].text).toContain("✅ Handoff");
+        });
     });
     // ====================================================================
     // 5. memoryHistoryHandler
@@ -677,36 +772,36 @@ describe("ledgerHandlers", () => {
     describe("sessionForgetMemoryHandler", () => {
         it("soft-deletes a memory entry by default", async () => {
             const result = await sessionForgetMemoryHandler({
-                memory_id: "uuid-123",
+                memory_id: "550e8400-e29b-41d4-a716-446655440123",
             });
             expect(result.isError).toBe(false);
             expect(result.content[0].text).toContain("Soft Deleted");
-            expect(result.content[0].text).toContain("uuid-123");
-            expect(storage.softDeleteLedger).toHaveBeenCalledWith("uuid-123", "test-user-id", undefined);
+            expect(result.content[0].text).toContain("550e8400-e29b-41d4-a716-446655440123");
+            expect(storage.softDeleteLedger).toHaveBeenCalledWith("550e8400-e29b-41d4-a716-446655440123", "test-user-id", undefined);
         });
         it("soft-deletes with reason for audit trail", async () => {
             const result = await sessionForgetMemoryHandler({
-                memory_id: "uuid-456",
+                memory_id: "550e8400-e29b-41d4-a716-446655440456",
                 reason: "GDPR Article 17 request",
             });
             expect(result.isError).toBe(false);
             expect(result.content[0].text).toContain("Reason");
             expect(result.content[0].text).toContain("GDPR Article 17 request");
-            expect(storage.softDeleteLedger).toHaveBeenCalledWith("uuid-456", "test-user-id", "GDPR Article 17 request");
+            expect(storage.softDeleteLedger).toHaveBeenCalledWith("550e8400-e29b-41d4-a716-446655440456", "test-user-id", "GDPR Article 17 request");
         });
         it("hard-deletes when hard_delete is true", async () => {
             const result = await sessionForgetMemoryHandler({
-                memory_id: "uuid-789",
+                memory_id: "550e8400-e29b-41d4-a716-446655440789",
                 hard_delete: true,
             });
             expect(result.isError).toBe(false);
             expect(result.content[0].text).toContain("Hard Deleted");
             expect(result.content[0].text).toContain("permanently removed");
-            expect(storage.hardDeleteLedger).toHaveBeenCalledWith("uuid-789", "test-user-id");
+            expect(storage.hardDeleteLedger).toHaveBeenCalledWith("550e8400-e29b-41d4-a716-446655440789", "test-user-id");
         });
         it("does not call hardDeleteLedger when hard_delete is false", async () => {
             await sessionForgetMemoryHandler({
-                memory_id: "uuid-aaa",
+                memory_id: "550e8400-e29b-41d4-a716-446655440aaa",
                 hard_delete: false,
             });
             expect(storage.hardDeleteLedger).not.toHaveBeenCalled();
@@ -731,7 +826,7 @@ describe("ledgerHandlers", () => {
         it("catches storage errors and returns isError (never throws)", async () => {
             storage.softDeleteLedger.mockRejectedValue(new Error("Entry not found"));
             const result = await sessionForgetMemoryHandler({
-                memory_id: "nonexistent-uuid",
+                memory_id: "550e8400-e29b-41d4-a716-446655440f99",
             });
             expect(result.isError).toBe(true);
             expect(result.content[0].text).toContain("Entry not found");
@@ -739,7 +834,7 @@ describe("ledgerHandlers", () => {
         it("catches hard_delete storage errors gracefully", async () => {
             storage.hardDeleteLedger.mockRejectedValue(new Error("FK constraint"));
             const result = await sessionForgetMemoryHandler({
-                memory_id: "uuid-fail",
+                memory_id: "550e8400-e29b-41d4-a716-446655440f11",
                 hard_delete: true,
             });
             expect(result.isError).toBe(true);
@@ -753,6 +848,7 @@ describe("ledgerHandlers", () => {
         let tempDir;
         beforeEach(async () => {
             tempDir = await mkdtemp(join(tmpdir(), "prism-handler-export-"));
+            process.env.PRISM_EXPORT_ROOT = tempDir;
             storage.listProjects.mockResolvedValue(["test-project"]);
             storage.getLedgerEntries.mockResolvedValue([
                 { id: "entry-1", summary: "Session 1", importance: 3 },
@@ -763,6 +859,7 @@ describe("ledgerHandlers", () => {
             });
         });
         afterEach(async () => {
+            delete process.env.PRISM_EXPORT_ROOT;
             await rm(tempDir, { recursive: true, force: true });
         });
         it("exports JSON file for a single project", async () => {
@@ -832,7 +929,7 @@ describe("ledgerHandlers", () => {
         });
         afterEach(async () => {
             // Clean up vault directory if created
-            const vaultDir = join(os.homedir(), ".prism-mcp", "media", "test-project");
+            const vaultDir = join(os.homedir(), ".prism-mcp", "media", "__test-img__");
             if (fs.existsSync(vaultDir)) {
                 await rm(vaultDir, { recursive: true, force: true });
             }
@@ -840,7 +937,7 @@ describe("ledgerHandlers", () => {
         });
         it("saves an image and returns success with image ID", async () => {
             const result = await sessionSaveImageHandler({
-                project: "test-project",
+                project: "__test-img__",
                 file_path: testImagePath,
                 description: "Dashboard screenshot",
             });
@@ -851,7 +948,7 @@ describe("ledgerHandlers", () => {
         });
         it("updates handoff metadata with visual memory entry", async () => {
             await sessionSaveImageHandler({
-                project: "test-project",
+                project: "__test-img__",
                 file_path: testImagePath,
                 description: "UI mockup",
             });
@@ -862,8 +959,8 @@ describe("ledgerHandlers", () => {
         });
         it("returns error for non-existent file", async () => {
             const result = await sessionSaveImageHandler({
-                project: "test-project",
-                file_path: "/nonexistent/path/image.png",
+                project: "__test-img__",
+                file_path: join(tempDir, "does-not-exist.png"),
                 description: "Missing image",
             });
             expect(result.isError).toBe(true);
@@ -873,7 +970,7 @@ describe("ledgerHandlers", () => {
             const bmpPath = join(tempDir, "test.bmp");
             fs.writeFileSync(bmpPath, Buffer.from([0x42, 0x4d]));
             const result = await sessionSaveImageHandler({
-                project: "test-project",
+                project: "__test-img__",
                 file_path: bmpPath,
                 description: "BMP image",
             });
@@ -883,7 +980,7 @@ describe("ledgerHandlers", () => {
         it("returns error when no active context exists", async () => {
             storage.loadContext.mockResolvedValue(null);
             const result = await sessionSaveImageHandler({
-                project: "test-project",
+                project: "__test-img__",
                 file_path: testImagePath,
                 description: "No context image",
             });
@@ -893,7 +990,7 @@ describe("ledgerHandlers", () => {
         // --- Input Validation ---
         it("returns error for invalid args (missing required fields)", async () => {
             const result = await sessionSaveImageHandler({
-                project: "test-project",
+                project: "__test-img__",
             });
             expect(result.isError).toBe(true);
             expect(result.content[0].text).toContain("Invalid arguments");
@@ -912,7 +1009,7 @@ describe("ledgerHandlers", () => {
         let vaultImagePath;
         beforeEach(async () => {
             tempDir = await mkdtemp(join(tmpdir(), "prism-view-image-test-"));
-            vaultDir = join(os.homedir(), ".prism-mcp", "media", "test-project");
+            vaultDir = join(os.homedir(), ".prism-mcp", "media", "__test-img__");
             fs.mkdirSync(vaultDir, { recursive: true });
             // Create a test image in the vault
             vaultImagePath = join(vaultDir, "abc12345.png");
@@ -941,7 +1038,7 @@ describe("ledgerHandlers", () => {
                 },
             });
             const result = await sessionViewImageHandler({
-                project: "test-project",
+                project: "__test-img__",
                 image_id: "abc12345",
             });
             expect(result.isError).toBe(false);
@@ -964,7 +1061,7 @@ describe("ledgerHandlers", () => {
                 },
             });
             const result = await sessionViewImageHandler({
-                project: "test-project",
+                project: "__test-img__",
                 image_id: "nonexistent",
             });
             expect(result.isError).toBe(true);
@@ -976,7 +1073,7 @@ describe("ledgerHandlers", () => {
                 metadata: {},
             });
             const result = await sessionViewImageHandler({
-                project: "test-project",
+                project: "__test-img__",
                 image_id: "any-id",
             });
             expect(result.isError).toBe(true);
@@ -997,7 +1094,7 @@ describe("ledgerHandlers", () => {
                 },
             });
             const result = await sessionViewImageHandler({
-                project: "test-project",
+                project: "__test-img__",
                 image_id: "abc12345",
             });
             expect(result.isError).toBe(true);
@@ -1018,7 +1115,7 @@ describe("ledgerHandlers", () => {
                 },
             });
             const result = await sessionViewImageHandler({
-                project: "test-project",
+                project: "__test-img__",
                 image_id: "abc12345",
             });
             expect(result.isError).toBe(false);
@@ -1028,7 +1125,7 @@ describe("ledgerHandlers", () => {
         // --- Input Validation ---
         it("returns error for invalid args (missing image_id)", async () => {
             const result = await sessionViewImageHandler({
-                project: "test-project",
+                project: "__test-img__",
             });
             expect(result.isError).toBe(true);
         });
@@ -1154,13 +1251,13 @@ describe("ledgerHandlers", () => {
         });
         it("sessionForgetMemoryHandler includes 'tombstoned' in soft-delete response", async () => {
             const result = await sessionForgetMemoryHandler({
-                memory_id: "uuid-test",
+                memory_id: "550e8400-e29b-41d4-a716-446655440001",
             });
             expect(result.content[0].text).toContain("tombstoned");
         });
         it("sessionForgetMemoryHandler mentions hard_delete option in soft-delete response", async () => {
             const result = await sessionForgetMemoryHandler({
-                memory_id: "uuid-test",
+                memory_id: "550e8400-e29b-41d4-a716-446655440001",
             });
             expect(result.content[0].text).toContain("hard_delete: true");
         });

package/dist/tools/ledgerHandlers.js

@@ -89,11 +89,24 @@ const MEMORY_BOUNDARY_SUFFIX = '\n</prism_memory>';
  * After saving, generates an embedding vector for the entry via fire-and-forget.
  */
 import { computeEffectiveImportance, recordMemoryAccess } from "../utils/cognitiveMemory.js";
-import { formatInferenceMetrics, resetInferenceMetrics } from "../utils/inferenceMetrics.js";
+import { formatInferenceMetrics, resetInferenceMetrics, getInferenceSnapshot } from "../utils/inferenceMetrics.js";
 export async function sessionSaveLedgerHandler(args) {
     if (!isSessionSaveLedgerArgs(args)) {
         throw new Error("Invalid arguments for session_save_ledger");
     }
+    // Host-agnostic context gate: any host that calls save_ledger without first
+    // loading context (on any host type) gets a structured error instead of a
+    // silently wrong write. Does NOT gate safety — prism_infer handles that.
+    let _saveLedgerGateWarning;
+    {
+        const { requireContextLoaded } = await import("../session/sessionContext.js");
+        const gate = requireContextLoaded(args.conversation_id);
+        if (gate !== null && gate.blocked) {
+            return { content: [{ type: "text", text: gate.error }], isError: true };
+        }
+        if (gate !== null && !gate.blocked)
+            _saveLedgerGateWarning = gate.warning;
+    }
     // SECURITY: Sanitize all text fields to prevent stored prompt injection
     let project = args.project;
     const conversation_id = args.conversation_id;
@@ -234,7 +247,8 @@ export async function sessionSaveLedgerHandler(args) {
     return {
         content: [{
                 type: "text",
-                text: `✅ Session ledger saved for project "${project}"\n` +
+                text: (_saveLedgerGateWarning ? `⚠️ ${_saveLedgerGateWarning}\n\n` : "") +
+                    `✅ Session ledger saved for project "${project}"\n` +
                     `Summary: ${summary}\n` +
                     (todos?.length ? `TODOs: ${todos.length} items\n` : "") +
                     (files_changed?.length ? `Files changed: ${files_changed.length}\n` : "") +
@@ -250,6 +264,16 @@ export async function sessionSaveHandoffHandler(args, server) {
     if (!isSessionSaveHandoffArgs(args)) {
         throw new Error("Invalid arguments for session_save_handoff");
     }
+    let _saveHandoffGateWarning;
+    {
+        const { requireContextLoaded } = await import("../session/sessionContext.js");
+        const gate = requireContextLoaded(args.conversation_id);
+        if (gate !== null && gate.blocked) {
+            return { content: [{ type: "text", text: gate.error }], isError: true };
+        }
+        if (gate !== null && !gate.blocked)
+            _saveHandoffGateWarning = gate.warning;
+    }
     // SECURITY: Sanitize all text fields to prevent stored prompt injection
     const project = args.project;
     const expected_version = args.expected_version;
@@ -553,22 +577,23 @@ export async function sessionSaveHandoffHandler(args, server) {
     }
     const metricsBlock = formatInferenceMetrics();
     // Build response text based on whether a CRDT merge occurred
-    const responseText = isMerged
-        ? `🔄 Auto-merged conflict for "${project}" (v${expected_version} → v${newVersion})\n` +
-            `Strategy: ${JSON.stringify(mergeStrategy)}\n` +
-            (last_summary ? `Summary: ${last_summary}\n` : "") +
-            metricsBlock +
-            `\n🔑 Remember: pass expected_version: ${newVersion} on your next save ` +
-            `to maintain concurrency control.`
-        : `✅ Handoff ${data.status || "saved"} for project "${project}" ` +
-            `(version: ${newVersion})\n` +
-            (last_summary ? `Last summary: ${last_summary}\n` : "") +
-            (open_todos?.length ? `Open TODOs: ${open_todos.length} items\n` : "") +
-            (active_branch ? `Active branch: ${active_branch}\n` : "") +
-            `📊 Embedding generation queued for semantic search.\n` +
-            metricsBlock +
-            `\n🔑 Remember: pass expected_version: ${newVersion} on your next save ` +
-            `to maintain concurrency control.`;
+    const responseText = (_saveHandoffGateWarning ? `⚠️ ${_saveHandoffGateWarning}\n\n` : "") +
+        (isMerged
+            ? `🔄 Auto-merged conflict for "${project}" (v${expected_version} → v${newVersion})\n` +
+                `Strategy: ${JSON.stringify(mergeStrategy)}\n` +
+                (last_summary ? `Summary: ${last_summary}\n` : "") +
+                metricsBlock +
+                `\n🔑 Remember: pass expected_version: ${newVersion} on your next save ` +
+                `to maintain concurrency control.`
+            : `✅ Handoff ${data.status || "saved"} for project "${project}" ` +
+                `(version: ${newVersion})\n` +
+                (last_summary ? `Last summary: ${last_summary}\n` : "") +
+                (open_todos?.length ? `Open TODOs: ${open_todos.length} items\n` : "") +
+                (active_branch ? `Active branch: ${active_branch}\n` : "") +
+                `📊 Embedding generation queued for semantic search.\n` +
+                metricsBlock +
+                `\n🔑 Remember: pass expected_version: ${newVersion} on your next save ` +
+                `to maintain concurrency control.`);
     return {
         content: [{
                 type: "text",
@@ -581,10 +606,17 @@ export async function sessionLoadContextHandler(args) {
     if (!isSessionLoadContextArgs(args)) {
         throw new Error("Invalid arguments for session_load_context");
     }
-    resetInferenceMetrics();
-    const { project, level = "standard", role } = args;
-    const maxTokens = args.max_tokens
-        || parseInt(await getSetting("max_tokens", "0"), 10) || undefined; // v4.0: arg > dashboard setting > none
+    // T3 fix: only reset metrics at true session start (totalCalls==0), not on GATE 5 mid-session
+    // reloads. Resetting on every call wipes accumulated delegation metrics right before
+    // session_save_ledger renders them, making the 📊 block show near-zero after any reload.
+    if (getInferenceSnapshot().totalCalls === 0) {
+        resetInferenceMetrics();
+    }
+    const { project, level = "standard", role, conversation_id: convId } = args;
+    // T6 fix: explicit Number() coercion prevents string "2000" from later concatenating instead of adding
+    const _maxTokensArg = Number(args.max_tokens);
+    const _maxTokensSetting = parseInt(await getSetting("max_tokens", "0"), 10);
+    const maxTokens = (_maxTokensArg > 0 ? _maxTokensArg : undefined) ?? (_maxTokensSetting > 0 ? _maxTokensSetting : undefined);
     const agentName = await getSetting("agent_name", "");
     const validLevels = ["quick", "standard", "deep"];
     if (!validLevels.includes(level)) {
@@ -600,12 +632,41 @@ export async function sessionLoadContextHandler(args) {
     const storage = await getStorage();
     const effectiveRole = role || await getSetting("default_role", "") || undefined;
     const data = await storage.loadContext(project, level, PRISM_USER_ID, effectiveRole); // v3.0: role with dashboard fallback
+    // F4 fix: inject protected skills even for fresh projects.
+    // Previously this returned before skill injection, leaving new projects with zero
+    // behavioral guardrails for the entire session. Now protected skills always load.
     if (!data) {
+        let freshSkillBlock = "";
+        try {
+            const { resolveSkillsForProject: resolveForFresh } = await import("./skillRouting.js");
+            const freshResolved = await resolveForFresh(project);
+            for (const entry of freshResolved.skills.filter(e => e.protected)) {
+                const content = await getSetting(`skill:${entry.name}`, "");
+                if (!content?.trim())
+                    continue;
+                freshSkillBlock += `\n\n[📜 SKILL: ${entry.name}]\n${content.trim()}`;
+            }
+        }
+        catch {
+            debugLog(`[session_load_context] Fresh project skill injection failed — continuing without`);
+        }
+        if (convId) {
+            const { markContextLoaded } = await import("../session/sessionContext.js");
+            const { BOUNDARIES_VERSION } = await import("../boundaries/boundaries.js");
+            markContextLoaded(convId, project, BOUNDARIES_VERSION);
+        }
+        const { BOUNDARIES_TEXT: BT0, BOUNDARIES_VERSION: BV0 } = await import("../boundaries/boundaries.js");
+        const boundariesHeader0 = `# OPERATING BOUNDARIES (v${BV0}) — enforced server-side, shown for transparency\n` +
+            BT0 + "\n\n" +
+            `# NOTE FOR NON-CLAUDE HOSTS: these boundaries run in code on every prism_infer call.\n` +
+            `# Reserved-category requests are routed to cloud or refused — not by instruction.\n\n---\n\n`;
         return {
             content: [{
                     type: "text",
-                    text: `No session context found for project "${project}" at level ${level}.\n` +
-                        `This project has no previous session history. Starting fresh.`,
+                    text: boundariesHeader0 +
+                        `No session context found for project "${project}" at level ${level}.\n` +
+                        `This project has no previous session history. Starting fresh.` +
+                        freshSkillBlock,
                 }],
             isError: false,
         };
@@ -855,6 +916,10 @@ export async function sessionLoadContextHandler(args) {
     const resolved = await resolveSkillsForProject(project);
     const sortedSkills = resolved.skills;
     const userLocalPolicy = resolved.user_local;
+    // F5: surface offline routing to the agent so it knows project/keyword skills may be missing
+    if (resolved.isOffline) {
+        skillBlock += `\n\n[⚠️ OFFLINE ROUTING: synalux.ai unreachable — using stale or fallback routing table. Project-specific and keyword-triggered skills may be missing. Universal protected skills still load.]`;
+    }
     let synaluxContent = {};
     if (SYNALUX_CONFIGURED && storage && typeof storage.fetchSkillContent === "function") {
         const missing = sortedSkills.map(s => s.name).filter(n => !loadedSkills.includes(n));
@@ -994,12 +1059,8 @@ export async function sessionLoadContextHandler(args) {
             behavWarnings.map(w => `- ${w.summary} (importance: ${w.importance})`).join("\n");
         behavBlock = [...rawBlock].slice(0, 2000).join('');
     }
-    let responseText = `${MEMORY_BOUNDARY_PREFIX}📋 Session context for "${project}" (${level}):\n\n${formattedContext.trim()}${splitBrainWarning}${driftReport}${briefingBlock}${sdmRecallBlock}${greetingBlock}${visualMemoryBlock}${behavBlock}${skillBlock}${versionNote}`;
     // ─── v9.4.7: ABA Precision Protocol (foundational) ────────
-    // Injected into EVERY session load so the agent always operates
-    // under these behavioral rules. Never truncated (placed before
-    // token budget check).
-    responseText += `\n\n[🧠 ABA PRECISION PROTOCOL]\n` +
+    const abaProtocol = `\n\n[🧠 ABA PRECISION PROTOCOL]\n` +
         `Rule 1 — Observable Goals: Every task must have a measurable, verifiable outcome. State the specific result.\n` +
         `Rule 2 — Precise Execution: One step at a time. Verify each step. If it fails → STOP → fix → verify → then continue.\n` +
         `Rule 3 — No Reinforcement of Errors: Never repeat the same mistake twice. When the user says something is wrong, read the actual code/data FIRST before forming an opinion.\n` +
@@ -1007,17 +1068,79 @@ export async function sessionLoadContextHandler(args) {
         `Rule 5 — Fix Without Asking: When you see a bug, fix it immediately. Do NOT ask "would you like me to fix that?" — just fix it.\n` +
         `Rule 6 — Action Intent: When user says "fix/run/open/deploy", they want ACTION not a tutorial. Ask for specific info needed in 1-2 sentences, or act directly.\n` +
         `Rule 7 — Tool Redirect: When user asks to "open browser"/"run terminal"/"git push" — output ONLY the URL or command. No follow-up. No explanations. Example: "open browser" → "https://synalux.ai/dashboard"`;
-    // ─── v4.0: Token Budget Truncation ─────────────────────────
-    // 1 token ≈ 4 chars heuristic. Truncate if response exceeds budget.
+    // T5 structural truncation: assemble sections in priority order so budget truncation
+    // drops the LEAST critical sections first (session history), never skills.
+    // Priority high→low: ABA | skills | behavioral warnings | version | drift | briefing | SDM | history
+    // The header + critical rules are always at the top; history is appended last.
+    const criticalPrefix = `${MEMORY_BOUNDARY_PREFIX}📋 Session context for "${project}" (${level}):\n\n` +
+        abaProtocol +
+        behavBlock +
+        skillBlock +
+        versionNote +
+        greetingBlock +
+        splitBrainWarning;
+    const lowerPriority = driftReport +
+        briefingBlock +
+        sdmRecallBlock +
+        visualMemoryBlock;
+    const historySection = formattedContext.trim()
+        ? `\n\n---\n\n📋 Historical Context:\n${formattedContext.trim()}`
+        : "";
+    // ─── v4.0: Token Budget Truncation (T5 structural version) ──
+    // Drops low-priority sections whole (no mid-slice) before falling back
+    // to trimming the history block. Protected sections (skills, ABA) always survive.
+    // T1: use ~3.5 chars/token (better for emoji+code payload) instead of flat 4.
     if (maxTokens && maxTokens > 0) {
-        const maxChars = maxTokens * 4;
+        const maxChars = Math.floor(maxTokens * 3.5);
+        const droppedSections = [];
+        let responseText = criticalPrefix + lowerPriority + historySection;
         if (responseText.length > maxChars) {
-            responseText = responseText.slice(0, maxChars) + "\n\n[… truncated to fit token budget]";
-            debugLog(`[session_load_context] Truncated response to ${maxTokens} tokens (${maxChars} chars)`);
+            // Drop low-priority sections first (SDM recall, briefing, drift)
+            responseText = criticalPrefix + historySection;
+            droppedSections.push("briefing", "drift-report", "sdm-recall");
+            debugLog(`[session_load_context] T5: dropped low-priority sections (${droppedSections.join(", ")})`);
+            if (responseText.length > maxChars) {
+                // History too long — trim it, preserving all critical sections
+                const histAllowed = Math.max(0, maxChars - criticalPrefix.length - 200);
+                const trimmedHistory = histAllowed > 0
+                    ? `\n\n---\n\n📋 Historical Context (trimmed):\n${formattedContext.trim().slice(0, histAllowed)}…`
+                    : "";
+                droppedSections.push("partial-history");
+                responseText = criticalPrefix + trimmedHistory;
+                debugLog(`[session_load_context] T5: trimmed history to ${histAllowed} chars`);
+            }
+        }
+        if (droppedSections.length > 0) {
+            responseText += `\n\n[ℹ️ Sections omitted to fit token budget (${maxTokens} tokens): ${droppedSections.join(", ")}. Skills and behavioral rules were preserved.]`;
         }
+        if (convId) {
+            const { markContextLoaded } = await import("../session/sessionContext.js");
+            const { BOUNDARIES_VERSION } = await import("../boundaries/boundaries.js");
+            markContextLoaded(convId, project, BOUNDARIES_VERSION);
+        }
+        const { BOUNDARIES_TEXT, BOUNDARIES_VERSION: BV } = await import("../boundaries/boundaries.js");
+        const boundariesHeader = `# OPERATING BOUNDARIES (v${BV}) — enforced server-side, shown for transparency\n` +
+            BOUNDARIES_TEXT + "\n\n" +
+            `# NOTE FOR NON-CLAUDE HOSTS: these boundaries run in code on every prism_infer call.\n` +
+            `# Reserved-category requests are routed to cloud or refused — not by instruction.\n\n---\n\n`;
+        return {
+            content: [{ type: "text", text: boundariesHeader + responseText + MEMORY_BOUNDARY_SUFFIX }],
+            isError: false,
+        };
     }
+    let responseText = criticalPrefix + lowerPriority + historySection;
+    if (convId) {
+        const { markContextLoaded } = await import("../session/sessionContext.js");
+        const { BOUNDARIES_VERSION } = await import("../boundaries/boundaries.js");
+        markContextLoaded(convId, project, BOUNDARIES_VERSION);
+    }
+    const { BOUNDARIES_TEXT, BOUNDARIES_VERSION: BV2 } = await import("../boundaries/boundaries.js");
+    const boundariesHeader2 = `# OPERATING BOUNDARIES (v${BV2}) — enforced server-side, shown for transparency\n` +
+        BOUNDARIES_TEXT + "\n\n" +
+        `# NOTE FOR NON-CLAUDE HOSTS: these boundaries run in code on every prism_infer call.\n` +
+        `# Reserved-category requests are routed to cloud or refused — not by instruction.\n\n---\n\n`;
     return {
-        content: [{ type: "text", text: responseText + MEMORY_BOUNDARY_SUFFIX }],
+        content: [{ type: "text", text: boundariesHeader2 + responseText + MEMORY_BOUNDARY_SUFFIX }],
         isError: false,
     };
 }