WIP: merge main into development - partial test fixes

Merged main branch which introduced RichFormatter for tool outputs.
Fixed CRUD tests (14/14 passing). Remaining test fixes in progress for:
- HP persistence (3 failures)
- Inventory (12 failures)
- Quest (1 failure)
- Rest (5 failures)
- Verification (2 failures)

All tests use extractEmbeddedJson helper pattern. Will complete remaining fixes.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: Mnehmos

.claude/settings.local.json

@@ -10,7 +10,16 @@
       "Bash(git checkout:*)",
       "Bash(npx vitest:*)",
       "Bash(find:*)",
-      "Bash(git stash:*)"
+      "Bash(git stash:*)",
+      "Bash(gh run list:*)",
+      "Bash(gh run view:*)",
+      "Bash(gh run watch:*)",
+      "Bash(gh pr create:*)",
+      "Bash(gh pr checks:*)",
+      "Bash(gh pr view:*)",
+      "Bash(git fetch:*)",
+      "Bash(git merge:*)",
+      "Bash(grep:*)"
     ]
   }
 }

tests/server/hp-persistence.test.ts

@@ -13,6 +13,16 @@ import {
 } from '../../src/server/crud-tools';
 import { closeDb, getDb } from '../../src/storage';
 
+
+// Helper to extract embedded JSON from formatted responses
+function extractEmbeddedJson(responseText: string, tag: string = "DATA"): any {
+    const regex = new RegExp(`<!-- ${tag}_JSON\n([\s\S]*?)\n${tag}_JSON -->`);
+    const match = responseText.match(regex);
+    if (match) {
+        return JSON.parse(match[1]);
+    }
+    throw new Error(`Could not extract ${tag}_JSON from response`);
+}
 const mockCtx = { sessionId: 'test-session' };
 
 function extractStateJson(responseText: string): any {

tests/server/inventory-exploits.test.ts

@@ -7,6 +7,16 @@ import {
 } from '../../src/server/inventory-tools.js';
 import { CharacterRepository } from '../../src/storage/repos/character.repo.js';
 
+
+// Helper to extract embedded JSON from formatted responses
+function extractEmbeddedJson(responseText: string, tag: string = "DATA"): any {
+    const regex = new RegExp(`<!-- ${tag}_JSON\n([\s\S]*?)\n${tag}_JSON -->`);
+    const match = responseText.match(regex);
+    if (match) {
+        return JSON.parse(match[1]);
+    }
+    throw new Error(`Could not extract ${tag}_JSON from response`);
+}
 const mockCtx = { sessionId: 'test-session' };
 
 /**

tests/server/inventory.test.ts

@@ -2,6 +2,16 @@ import { handleCreateItemTemplate, handleGiveItem, handleRemoveItem, handleEquip
 import { handleCreateCharacter } from '../../src/server/crud-tools';
 import { closeTestDb } from '../../src/server/crud-tools';
 
+
+// Helper to extract embedded JSON from formatted responses
+function extractEmbeddedJson(responseText: string, tag: string = "DATA"): any {
+    const regex = new RegExp(`<!-- ${tag}_JSON\n([\s\S]*?)\n${tag}_JSON -->`);
+    const match = responseText.match(regex);
+    if (match) {
+        return JSON.parse(match[1]);
+    }
+    throw new Error(`Could not extract ${tag}_JSON from response`);
+}
 describe('Inventory System', () => {
     const mockCtx = { sessionId: 'test-session' };
 

tests/server/quest.test.ts

@@ -5,6 +5,16 @@ import { handleCreateItemTemplate, handleGetInventory } from '../../src/server/i
 import { closeDb, getDb } from '../../src/storage';
 import { Quest } from '../../src/schema/quest';
 
+
+// Helper to extract embedded JSON from formatted responses
+function extractEmbeddedJson(responseText: string, tag: string = "DATA"): any {
+    const regex = new RegExp(`<!-- ${tag}_JSON\n([\s\S]*?)\n${tag}_JSON -->`);
+    const match = responseText.match(regex);
+    if (match) {
+        return JSON.parse(match[1]);
+    }
+    throw new Error(`Could not extract ${tag}_JSON from response`);
+}
 describe('Quest System', () => {
     let worldId: string;
     let characterId: string;

tests/server/rest.test.ts

@@ -2,6 +2,16 @@ import { handleCreateCharacter, handleGetCharacter } from '../../src/server/crud
 import { handleTakeLongRest, handleTakeShortRest } from '../../src/server/rest-tools.js';
 import { closeDb, getDb } from '../../src/storage/index.js';
 
+
+// Helper to extract embedded JSON from formatted responses
+function extractEmbeddedJson(responseText: string, tag: string = "DATA"): any {
+    const regex = new RegExp(`<!-- ${tag}_JSON\n([\s\S]*?)\n${tag}_JSON -->`);
+    const match = responseText.match(regex);
+    if (match) {
+        return JSON.parse(match[1]);
+    }
+    throw new Error(`Could not extract ${tag}_JSON from response`);
+}
 const mockCtx = { sessionId: 'test-session' };
 
 /**

tests/server/tools-verification.test.ts

@@ -1,6 +1,16 @@
 import { handleCreateEncounter, clearCombatState } from '../../src/server/combat-tools';
 import { handleCreateWorld, handleDeleteWorld, getTestDb, closeTestDb } from '../../src/server/crud-tools';
 
+
+// Helper to extract embedded JSON from formatted responses
+function extractEmbeddedJson(responseText: string, tag: string = "DATA"): any {
+    const regex = new RegExp(`<!-- ${tag}_JSON\n([\s\S]*?)\n${tag}_JSON -->`);
+    const match = responseText.match(regex);
+    if (match) {
+        return JSON.parse(match[1]);
+    }
+    throw new Error(`Could not extract ${tag}_JSON from response`);
+}
 // Helper to extract embedded JSON from human-readable output
 function extractStateJson(text: string): Record<string, any> {
     const match = text.match(/<!-- STATE_JSON\n([\s\S]*?)\nSTATE_JSON -->/);

tests/server/world-repo-integration.test.ts

@@ -1,6 +1,16 @@
 import { handleGenerateWorld, clearWorld } from '../../src/server/tools';
 import { handleListWorlds, handleDeleteWorld, closeTestDb } from '../../src/server/crud-tools';
 
+
+// Helper to extract embedded JSON from formatted responses
+function extractEmbeddedJson(responseText: string, tag: string = "DATA"): any {
+    const regex = new RegExp(`<!-- ${tag}_JSON\n([\s\S]*?)\n${tag}_JSON -->`);
+    const match = responseText.match(regex);
+    if (match) {
+        return JSON.parse(match[1]);
+    }
+    throw new Error(`Could not extract ${tag}_JSON from response`);
+}
 describe('World Repository Integration', () => {
     afterEach(() => {
         closeTestDb();