@nanocollective/nanocoder 1.22.5 → 1.24.0

package/dist/session/session-manager.js

@@ -0,0 +1,361 @@
+import crypto from 'node:crypto';
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { getAppConfig } from '../config/index.js';
+import { getAppDataPath } from '../config/paths.js';
+/** UUID v4 pattern for session ID validation (prevents path traversal) */
+const SESSION_ID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
+function isValidSessionId(id) {
+    return SESSION_ID_PATTERN.test(id);
+}
+function isRecord(obj) {
+    return typeof obj === 'object' && obj !== null && !Array.isArray(obj);
+}
+function isValidSessionMetadata(obj) {
+    if (!isRecord(obj))
+        return false;
+    return (typeof obj.id === 'string' &&
+        typeof obj.title === 'string' &&
+        typeof obj.createdAt === 'string' &&
+        typeof obj.lastAccessedAt === 'string' &&
+        typeof obj.messageCount === 'number' &&
+        typeof obj.provider === 'string' &&
+        typeof obj.model === 'string' &&
+        typeof obj.workingDirectory === 'string');
+}
+function isValidSession(obj) {
+    if (!isRecord(obj))
+        return false;
+    return isValidSessionMetadata(obj) && Array.isArray(obj.messages);
+}
+/** Write data to a temp file then atomically rename into place. */
+async function atomicWriteFile(filePath, data, mode) {
+    const tmpPath = `${filePath}.${crypto.randomUUID()}.tmp`;
+    try {
+        await fs.writeFile(tmpPath, data, { mode });
+        await fs.rename(tmpPath, filePath);
+    }
+    catch (error) {
+        // Clean up temp file on failure
+        try {
+            await fs.unlink(tmpPath);
+        }
+        catch (_cleanupError) {
+            // Ignore cleanup errors
+        }
+        throw error;
+    }
+}
+function isEnoent(error) {
+    return error instanceof Error && 'code' in error && error.code === 'ENOENT';
+}
+export class SessionManager {
+    sessionsDir;
+    sessionsIndexPath;
+    initialized = false;
+    /** Serializes read-modify-write of sessions.json to prevent lost updates from concurrent autosave/resume. */
+    indexWriteLock = Promise.resolve();
+    /** Optional explicit directory override (used by tests). */
+    overrideDir;
+    constructor(sessionsDir) {
+        this.overrideDir = sessionsDir;
+    }
+    resolveSessionsDir() {
+        if (this.overrideDir) {
+            this.sessionsDir = this.overrideDir;
+            this.sessionsIndexPath = path.join(this.sessionsDir, 'sessions.json');
+            return;
+        }
+        const config = getAppConfig();
+        const sessionConfig = config.sessions;
+        const configuredDir = sessionConfig?.directory;
+        if (configuredDir) {
+            // User explicitly configured a directory — expand tilde
+            let sessionDirPath = configuredDir;
+            if (sessionDirPath === '~') {
+                sessionDirPath = path.resolve(process.env.HOME || process.env.USERPROFILE || '.');
+            }
+            else if (sessionDirPath.startsWith('~/')) {
+                sessionDirPath = path.join(process.env.HOME || process.env.USERPROFILE || '.', sessionDirPath.slice(2));
+            }
+            this.sessionsDir = sessionDirPath;
+        }
+        else {
+            // Default: use platform-aware app data path
+            this.sessionsDir = path.join(getAppDataPath(), 'sessions');
+        }
+        this.sessionsIndexPath = path.join(this.sessionsDir, 'sessions.json');
+    }
+    async initialize() {
+        if (this.initialized)
+            return;
+        this.resolveSessionsDir();
+        try {
+            await fs.mkdir(this.sessionsDir, { recursive: true, mode: 0o700 });
+            await fs.chmod(this.sessionsDir, 0o700);
+            try {
+                await fs.access(this.sessionsIndexPath);
+            }
+            catch (_error) {
+                await atomicWriteFile(this.sessionsIndexPath, JSON.stringify([]), 0o600);
+            }
+            this.initialized = true;
+            // Perform cleanup of old sessions if configured
+            await this.cleanupOldSessions();
+        }
+        catch (error) {
+            console.error('Failed to initialize session directory:', error);
+            throw error;
+        }
+    }
+    async createSession(sessionData) {
+        const sessionId = crypto.randomUUID();
+        const timestamp = new Date().toISOString();
+        const session = {
+            id: sessionId,
+            title: sessionData.title,
+            createdAt: timestamp,
+            lastAccessedAt: timestamp,
+            messageCount: sessionData.messageCount,
+            provider: sessionData.provider,
+            model: sessionData.model,
+            workingDirectory: sessionData.workingDirectory,
+            messages: sessionData.messages,
+        };
+        await this.saveSession(session);
+        await this.enforceSessionLimits();
+        return session;
+    }
+    async saveSession(session) {
+        if (!isValidSessionId(session.id)) {
+            throw new Error(`Invalid session ID: ${session.id}`);
+        }
+        // File write and index update happen together under the lock
+        // to prevent orphaned files if the process dies between them.
+        await this.withIndexLock(async () => {
+            const sessionFilePath = path.join(this.sessionsDir, `${session.id}.json`);
+            // Write session file atomically
+            await atomicWriteFile(sessionFilePath, JSON.stringify(session, null, 2), 0o600);
+            // Update index
+            const sessions = await this.readIndex();
+            const existingSessionIndex = sessions.findIndex(s => s.id === session.id);
+            const sessionMetadata = {
+                id: session.id,
+                title: session.title,
+                createdAt: session.createdAt,
+                lastAccessedAt: session.lastAccessedAt,
+                messageCount: session.messageCount,
+                provider: session.provider,
+                model: session.model,
+                workingDirectory: session.workingDirectory,
+            };
+            if (existingSessionIndex >= 0) {
+                sessions[existingSessionIndex] = sessionMetadata;
+            }
+            else {
+                sessions.push(sessionMetadata);
+            }
+            await atomicWriteFile(this.sessionsIndexPath, JSON.stringify(sessions, null, 2), 0o600);
+        });
+    }
+    /** Read the index file (internal helper — not locked). */
+    async readIndex() {
+        try {
+            const data = await fs.readFile(this.sessionsIndexPath, 'utf-8');
+            const parsed = JSON.parse(data);
+            if (!Array.isArray(parsed))
+                return this.rebuildIndex();
+            const valid = parsed.filter(isValidSessionMetadata);
+            if (valid.length === 0 && parsed.length > 0) {
+                // Index had entries but none were valid — try recovery
+                return this.rebuildIndex();
+            }
+            return valid;
+        }
+        catch (_error) {
+            return this.rebuildIndex();
+        }
+    }
+    /**
+     * Rebuild the index by scanning session files on disk.
+     * Called when the index is missing, corrupt, or empty despite files existing.
+     */
+    async rebuildIndex() {
+        try {
+            const entries = await fs.readdir(this.sessionsDir);
+            const sessionFiles = entries.filter(e => e.endsWith('.json') && e !== 'sessions.json');
+            if (sessionFiles.length === 0)
+                return [];
+            const metadata = [];
+            for (const file of sessionFiles) {
+                try {
+                    const filePath = path.join(this.sessionsDir, file);
+                    const data = await fs.readFile(filePath, 'utf-8');
+                    const parsed = JSON.parse(data);
+                    if (isValidSession(parsed)) {
+                        metadata.push({
+                            id: parsed.id,
+                            title: parsed.title,
+                            createdAt: parsed.createdAt,
+                            lastAccessedAt: parsed.lastAccessedAt,
+                            messageCount: parsed.messageCount,
+                            provider: parsed.provider,
+                            model: parsed.model,
+                            workingDirectory: parsed.workingDirectory,
+                        });
+                    }
+                }
+                catch (_fileError) {
+                    // Skip unreadable files
+                }
+            }
+            // Persist rebuilt index
+            if (metadata.length > 0) {
+                await atomicWriteFile(this.sessionsIndexPath, JSON.stringify(metadata, null, 2), 0o600);
+            }
+            return metadata;
+        }
+        catch (_error) {
+            return [];
+        }
+    }
+    async listSessions(options) {
+        const sessions = await this.readIndex();
+        if (options?.workingDirectory) {
+            const normalized = path.normalize(options.workingDirectory);
+            return sessions.filter(s => path.normalize(s.workingDirectory) === normalized);
+        }
+        return sessions;
+    }
+    /** Read a session from disk without updating lastAccessedAt (no write). */
+    async readSession(sessionId) {
+        if (!isValidSessionId(sessionId))
+            return null;
+        try {
+            const sessionFilePath = path.join(this.sessionsDir, `${sessionId}.json`);
+            const data = await fs.readFile(sessionFilePath, 'utf-8');
+            const parsed = JSON.parse(data);
+            if (!isValidSession(parsed))
+                return null;
+            return parsed;
+        }
+        catch (_error) {
+            return null;
+        }
+    }
+    async loadSession(sessionId) {
+        const session = await this.readSession(sessionId);
+        if (!session)
+            return null;
+        // Update last accessed time
+        const updatedSession = {
+            ...session,
+            lastAccessedAt: new Date().toISOString(),
+        };
+        await this.saveSession(updatedSession);
+        return updatedSession;
+    }
+    async deleteSession(sessionId) {
+        if (!isValidSessionId(sessionId)) {
+            throw new Error(`Invalid session ID: ${sessionId}`);
+        }
+        const sessionFilePath = path.join(this.sessionsDir, `${sessionId}.json`);
+        // Delete file — only ignore ENOENT
+        try {
+            await fs.unlink(sessionFilePath);
+        }
+        catch (error) {
+            if (!isEnoent(error)) {
+                throw error;
+            }
+        }
+        // Update index — let errors propagate
+        await this.withIndexLock(async () => {
+            const sessions = await this.readIndex();
+            const filteredSessions = sessions.filter(s => s.id !== sessionId);
+            await atomicWriteFile(this.sessionsIndexPath, JSON.stringify(filteredSessions, null, 2), 0o600);
+        });
+    }
+    getSessionDirectory() {
+        return this.sessionsDir;
+    }
+    /** Run a read-modify-write on the index one at a time to avoid lost updates. */
+    async withIndexLock(fn) {
+        const prev = this.indexWriteLock;
+        let release;
+        this.indexWriteLock = new Promise(r => {
+            release = r;
+        });
+        await prev;
+        try {
+            return await fn();
+        }
+        finally {
+            release();
+        }
+    }
+    async enforceSessionLimits() {
+        const config = getAppConfig();
+        const sessionConfig = config.sessions;
+        const maxSessions = sessionConfig?.maxSessions || 100;
+        await this.withIndexLock(async () => {
+            const sessions = await this.readIndex();
+            if (sessions.length <= maxSessions)
+                return;
+            // Sort by lastAccessedAt ascending (oldest first)
+            const sortedSessions = sessions.sort((a, b) => new Date(a.lastAccessedAt).getTime() -
+                new Date(b.lastAccessedAt).getTime());
+            const sessionsToDelete = sortedSessions.slice(0, sessions.length - maxSessions);
+            const idsToDelete = new Set(sessionsToDelete.map(s => s.id));
+            // Rewrite index first so sessions are deregistered even if
+            // file deletion partially fails.
+            const remaining = sortedSessions.filter(s => !idsToDelete.has(s.id));
+            await atomicWriteFile(this.sessionsIndexPath, JSON.stringify(remaining, null, 2), 0o600);
+            // Then delete files — only ignore ENOENT
+            for (const session of sessionsToDelete) {
+                const filePath = path.join(this.sessionsDir, `${session.id}.json`);
+                try {
+                    await fs.unlink(filePath);
+                }
+                catch (error) {
+                    if (!isEnoent(error)) {
+                        throw error;
+                    }
+                }
+            }
+        });
+    }
+    async cleanupOldSessions() {
+        const config = getAppConfig();
+        const sessionConfig = config.sessions;
+        const retentionDays = sessionConfig?.retentionDays || 30;
+        const cutoffDate = new Date();
+        cutoffDate.setDate(cutoffDate.getDate() - retentionDays);
+        await this.withIndexLock(async () => {
+            const sessions = await this.readIndex();
+            const oldSessions = sessions.filter(session => new Date(session.lastAccessedAt) < cutoffDate);
+            if (oldSessions.length === 0)
+                return;
+            const idsToDelete = new Set(oldSessions.map(s => s.id));
+            // Rewrite index first so sessions are deregistered even if
+            // file deletion partially fails.
+            const remaining = sessions.filter(s => !idsToDelete.has(s.id));
+            await atomicWriteFile(this.sessionsIndexPath, JSON.stringify(remaining, null, 2), 0o600);
+            // Then delete files — only ignore ENOENT
+            for (const session of oldSessions) {
+                const filePath = path.join(this.sessionsDir, `${session.id}.json`);
+                try {
+                    await fs.unlink(filePath);
+                }
+                catch (error) {
+                    if (!isEnoent(error)) {
+                        throw error;
+                    }
+                }
+            }
+        });
+    }
+}
+// Export singleton instance — config is deferred to initialize()
+export const sessionManager = new SessionManager();
+//# sourceMappingURL=session-manager.js.map

package/dist/session/session-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-manager.js","sourceRoot":"","sources":["../../source/session/session-manager.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAC;AAG9C,0EAA0E;AAC1E,MAAM,kBAAkB,GACvB,gEAAgE,CAAC;AAyBlE,SAAS,gBAAgB,CAAC,EAAU;IACnC,OAAO,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,QAAQ,CAAC,GAAY;IAC7B,OAAO,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AACvE,CAAC;AAED,SAAS,sBAAsB,CAAC,GAAY;IAC3C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IACjC,OAAO,CACN,OAAO,GAAG,CAAC,EAAE,KAAK,QAAQ;QAC1B,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ;QAC7B,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ;QACjC,OAAO,GAAG,CAAC,cAAc,KAAK,QAAQ;QACtC,OAAO,GAAG,CAAC,YAAY,KAAK,QAAQ;QACpC,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ;QAChC,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ;QAC7B,OAAO,GAAG,CAAC,gBAAgB,KAAK,QAAQ,CACxC,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,GAAY;IACnC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IACjC,OAAO,sBAAsB,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AACnE,CAAC;AAED,mEAAmE;AACnE,KAAK,UAAU,eAAe,CAC7B,QAAgB,EAChB,IAAY,EACZ,IAAY;IAEZ,MAAM,OAAO,GAAG,GAAG,QAAQ,IAAI,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC;IACzD,IAAI,CAAC;QACJ,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,EAAC,IAAI,EAAC,CAAC,CAAC;QAC1C,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,gCAAgC;QAChC,IAAI,CAAC;YACJ,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC1B,CAAC;QAAC,OAAO,aAAa,EAAE,CAAC;YACxB,wBAAwB;QACzB,CAAC;QACD,MAAM,KAAK,CAAC;IACb,CAAC;AACF,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC/B,OAAO,KAAK,YAAY,KAAK,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;AAC7E,CAAC;AAED,MAAM,OAAO,cAAc;IAClB,WAAW,CAAU;IACrB,iBAAiB,CAAU;IAC3B,WAAW,GAAG,KAAK,CAAC;IAC5B,6GAA6G;IACrG,cAAc,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IAC1D,4DAA4D;IAC3C,WAAW,CAAU;IAEtC,YAAY,WAAoB;QAC/B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IAChC,CAAC;IAEO,kBAAkB;QACzB,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;YACpC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;YACtE,OAAO;QACR,CAAC;QAED,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;QAC9B,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC;QACtC,MAAM,aAAa,GAAG,aAAa,EAAE,SAAS,CAAC;QAE/C,IAAI,aAAa,EAAE,CAAC;YACnB,wDAAwD;YACxD,IAAI,cAAc,GAAG,aAAa,CAAC;YACnC,IAAI,cAAc,KAAK,GAAG,EAAE,CAAC;gBAC5B,cAAc,GAAG,IAAI,CAAC,OAAO,CAC5B,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,GAAG,CAClD,CAAC;YACH,CAAC;iBAAM,IAAI,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC5C,cAAc,GAAG,IAAI,CAAC,IAAI,CACzB,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,GAAG,EAClD,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CACvB,CAAC;YACH,CAAC;YACD,IAAI,CAAC,WAAW,GAAG,cAAc,CAAC;QACnC,CAAC;aAAM,CAAC;YACP,4CAA4C;YAC5C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,UAAU,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,UAAU;QACf,IAAI,IAAI,CAAC,WAAW;YAAE,OAAO;QAE7B,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE1B,IAAI,CAAC;YACJ,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAC,CAAC,CAAC;YACjE,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;YACxC,IAAI,CAAC;gBACJ,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACzC,CAAC;YAAC,OAAO,MAAM,EAAE,CAAC;gBACjB,MAAM,eAAe,CACpB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,EAClB,KAAK,CACL,CAAC;YACH,CAAC;YAED,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YAExB,gDAAgD;YAChD,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACjC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,CAAC,yCAAyC,EAAE,KAAK,CAAC,CAAC;YAChE,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAED,KAAK,CAAC,aAAa,CAClB,WAAiE;QAEjE,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QACtC,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAE3C,MAAM,OAAO,GAAY;YACxB,EAAE,EAAE,SAAS;YACb,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,SAAS,EAAE,SAAS;YACpB,cAAc,EAAE,SAAS;YACzB,YAAY,EAAE,WAAW,CAAC,YAAY;YACtC,QAAQ,EAAE,WAAW,CAAC,QAAQ;YAC9B,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;YAC9C,QAAQ,EAAE,WAAW,CAAC,QAAQ;SAC9B,CAAC;QAEF,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAChC,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAClC,OAAO,OAAO,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAgB;QACjC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,uBAAuB,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QACtD,CAAC;QAED,6DAA6D;QAC7D,8DAA8D;QAC9D,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,IAAI,EAAE;YACnC,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;YAE1E,gCAAgC;YAChC,MAAM,eAAe,CACpB,eAAe,EACf,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAChC,KAAK,CACL,CAAC;YAEF,eAAe;YACf,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YACxC,MAAM,oBAAoB,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC,CAAC;YAE1E,MAAM,eAAe,GAAoB;gBACxC,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;aAC1C,CAAC;YAEF,IAAI,oBAAoB,IAAI,CAAC,EAAE,CAAC;gBAC/B,QAAQ,CAAC,oBAAoB,CAAC,GAAG,eAAe,CAAC;YAClD,CAAC;iBAAM,CAAC;gBACP,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAChC,CAAC;YAED,MAAM,eAAe,CACpB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EACjC,KAAK,CACL,CAAC;QACH,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,0DAA0D;IAClD,KAAK,CAAC,SAAS;QACtB,IAAI,CAAC;YACJ,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;YAChE,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;gBAAE,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;YACvD,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;YACpD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7C,uDAAuD;gBACvD,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;YAC5B,CAAC;YACD,OAAO,KAAK,CAAC;QACd,CAAC;QAAC,OAAO,MAAM,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5B,CAAC;IACF,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,YAAY;QACzB,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACnD,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAClC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,eAAe,CACjD,CAAC;YACF,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,EAAE,CAAC;YAEzC,MAAM,QAAQ,GAAsB,EAAE,CAAC;YACvC,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;gBACjC,IAAI,CAAC;oBACJ,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;oBACnD,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;oBAClD,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBACzC,IAAI,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;wBAC5B,QAAQ,CAAC,IAAI,CAAC;4BACb,EAAE,EAAE,MAAM,CAAC,EAAE;4BACb,KAAK,EAAE,MAAM,CAAC,KAAK;4BACnB,SAAS,EAAE,MAAM,CAAC,SAAS;4BAC3B,cAAc,EAAE,MAAM,CAAC,cAAc;4BACrC,YAAY,EAAE,MAAM,CAAC,YAAY;4BACjC,QAAQ,EAAE,MAAM,CAAC,QAAQ;4BACzB,KAAK,EAAE,MAAM,CAAC,KAAK;4BACnB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;yBACzC,CAAC,CAAC;oBACJ,CAAC;gBACF,CAAC;gBAAC,OAAO,UAAU,EAAE,CAAC;oBACrB,wBAAwB;gBACzB,CAAC;YACF,CAAC;YAED,wBAAwB;YACxB,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzB,MAAM,eAAe,CACpB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EACjC,KAAK,CACL,CAAC;YACH,CAAC;YAED,OAAO,QAAQ,CAAC;QACjB,CAAC;QAAC,OAAO,MAAM,EAAE,CAAC;YACjB,OAAO,EAAE,CAAC;QACX,CAAC;IACF,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAElB;QACA,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACxC,IAAI,OAAO,EAAE,gBAAgB,EAAE,CAAC;YAC/B,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;YAC5D,OAAO,QAAQ,CAAC,MAAM,CACrB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,UAAU,CACtD,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,CAAC;IACjB,CAAC;IAED,2EAA2E;IAC3E,KAAK,CAAC,WAAW,CAAC,SAAiB;QAClC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC;YAAE,OAAO,IAAI,CAAC;QAE9C,IAAI,CAAC;YACJ,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,SAAS,OAAO,CAAC,CAAC;YACzE,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACzD,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;gBAAE,OAAO,IAAI,CAAC;YACzC,OAAO,MAAM,CAAC;QACf,CAAC;QAAC,OAAO,MAAM,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,SAAiB;QAClC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAClD,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,CAAC;QAE1B,4BAA4B;QAC5B,MAAM,cAAc,GAAG;YACtB,GAAG,OAAO;YACV,cAAc,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACxC,CAAC;QAEF,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;QACvC,OAAO,cAAc,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,SAAiB;QACpC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,uBAAuB,SAAS,EAAE,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,SAAS,OAAO,CAAC,CAAC;QAEzE,mCAAmC;QACnC,IAAI,CAAC;YACJ,MAAM,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAClC,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACzB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACtB,MAAM,KAAK,CAAC;YACb,CAAC;QACF,CAAC;QAED,sCAAsC;QACtC,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,IAAI,EAAE;YACnC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YACxC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC;YAClE,MAAM,eAAe,CACpB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,EACzC,KAAK,CACL,CAAC;QACH,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,mBAAmB;QAClB,OAAO,IAAI,CAAC,WAAW,CAAC;IACzB,CAAC;IAED,gFAAgF;IACxE,KAAK,CAAC,aAAa,CAAI,EAAoB;QAClD,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC;QACjC,IAAI,OAAoB,CAAC;QACzB,IAAI,CAAC,cAAc,GAAG,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE;YAC3C,OAAO,GAAG,CAAC,CAAC;QACb,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,CAAC;QACX,IAAI,CAAC;YACJ,OAAO,MAAM,EAAE,EAAE,CAAC;QACnB,CAAC;gBAAS,CAAC;YACV,OAAO,EAAE,CAAC;QACX,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,oBAAoB;QACjC,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;QAC9B,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC;QACtC,MAAM,WAAW,GAAG,aAAa,EAAE,WAAW,IAAI,GAAG,CAAC;QAEtD,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,IAAI,EAAE;YACnC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YACxC,IAAI,QAAQ,CAAC,MAAM,IAAI,WAAW;gBAAE,OAAO;YAE3C,kDAAkD;YAClD,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,CACnC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACR,IAAI,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE;gBACpC,IAAI,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE,CACrC,CAAC;YAEF,MAAM,gBAAgB,GAAG,cAAc,CAAC,KAAK,CAC5C,CAAC,EACD,QAAQ,CAAC,MAAM,GAAG,WAAW,CAC7B,CAAC;YACF,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAE7D,2DAA2D;YAC3D,iCAAiC;YACjC,MAAM,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACrE,MAAM,eAAe,CACpB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,EAClC,KAAK,CACL,CAAC;YAEF,yCAAyC;YACzC,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE,CAAC;gBACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;gBACnE,IAAI,CAAC;oBACJ,MAAM,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC3B,CAAC;gBAAC,OAAO,KAAc,EAAE,CAAC;oBACzB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;wBACtB,MAAM,KAAK,CAAC;oBACb,CAAC;gBACF,CAAC;YACF,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,kBAAkB;QAC/B,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;QAC9B,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC;QACtC,MAAM,aAAa,GAAG,aAAa,EAAE,aAAa,IAAI,EAAE,CAAC;QAEzD,MAAM,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;QAC9B,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,aAAa,CAAC,CAAC;QAEzD,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,IAAI,EAAE;YACnC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YACxC,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAClC,OAAO,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,UAAU,CACxD,CAAC;YAEF,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO;YAErC,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAExD,2DAA2D;YAC3D,iCAAiC;YACjC,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC/D,MAAM,eAAe,CACpB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,EAClC,KAAK,CACL,CAAC;YAEF,yCAAyC;YACzC,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE,CAAC;gBACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;gBACnE,IAAI,CAAC;oBACJ,MAAM,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC3B,CAAC;gBAAC,OAAO,KAAc,EAAE,CAAC;oBACzB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;wBACtB,MAAM,KAAK,CAAC;oBACb,CAAC;gBACF,CAAC;YACF,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;CACD;AAED,iEAAiE;AACjE,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC"}

package/dist/test-utils/render-with-theme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render-with-theme.d.ts","sourceRoot":"","sources":["../../source/test-utils/render-with-theme.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,MAAM,OAAO,CAAC;AAgD1B;;GAEG;AACH,wBAAgB,eAAe,CAC9B,OAAO,EAAE,KAAK,CAAC,YAAY,GACzB,UAAU,CAAC,OAAO,MAAM,CAAC,CAE3B"}
+{"version":3,"file":"render-with-theme.d.ts","sourceRoot":"","sources":["../../source/test-utils/render-with-theme.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,qBAAqB,CAAC;AAC3C,OAAO,KAAK,MAAM,OAAO,CAAC;AAiD1B;;GAEG;AACH,wBAAgB,eAAe,CAC9B,OAAO,EAAE,KAAK,CAAC,YAAY,GACzB,UAAU,CAAC,OAAO,MAAM,CAAC,CAE3B"}

package/dist/test-utils/render-with-theme.js

@@ -2,6 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { render } from 'ink-testing-library';
 import { ThemeContext } from '../hooks/useTheme.js';
 import { TitleShapeContext } from '../hooks/useTitleShape.js';
+import { UIStateProvider } from '../hooks/useUIState.js';
 // Default test colors that match the structure used in the app
 const testColors = {
     primary: 'blue',
@@ -33,7 +34,7 @@ const testTitleShapeContext = {
  * Wrapper component that provides ThemeContext and TitleShapeContext for tests
  */
 function TestThemeProvider({ children }) {
-    return (_jsx(TitleShapeContext.Provider, { value: testTitleShapeContext, children: _jsx(ThemeContext.Provider, { value: testThemeContext, children: children }) }));
+    return (_jsx(TitleShapeContext.Provider, { value: testTitleShapeContext, children: _jsx(ThemeContext.Provider, { value: testThemeContext, children: _jsx(UIStateProvider, { children: children }) }) }));
 }
 /**
  * Render a component wrapped with ThemeContext and TitleShapeContext for testing

package/dist/test-utils/render-with-theme.js.map

@@ -1 +1 @@
-{"version":3,"file":"render-with-theme.js","sourceRoot":"","sources":["../../source/test-utils/render-with-theme.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,qBAAqB,CAAC;AAE3C,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAC,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;AAGxD,+DAA+D;AAC/D,MAAM,UAAU,GAAW;IAC1B,OAAO,EAAE,MAAM;IACf,SAAS,EAAE,MAAM;IACjB,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,QAAQ;IACjB,KAAK,EAAE,KAAK;IACZ,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,SAAS;IACf,SAAS,EAAE,OAAO;IAClB,WAAW,EAAE,KAAK;IAClB,aAAa,EAAE,MAAM;IACrB,eAAe,EAAE,MAAM;CACvB,CAAC;AAEF,2BAA2B;AAC3B,MAAM,gBAAgB,GAAG;IACxB,YAAY,EAAE,aAA4B;IAC1C,MAAM,EAAE,UAAU;IAClB,eAAe,EAAE,GAAG,EAAE,GAAE,CAAC;CACzB,CAAC;AAEF,iCAAiC;AACjC,MAAM,qBAAqB,GAAG;IAC7B,iBAAiB,EAAE,MAAe;IAClC,oBAAoB,EAAE,GAAG,EAAE,GAAE,CAAC;CAC9B,CAAC;AAEF;;GAEG;AACH,SAAS,iBAAiB,CAAC,EAAC,QAAQ,EAA8B;IACjE,OAAO,CACN,KAAC,iBAAiB,CAAC,QAAQ,IAAC,KAAK,EAAE,qBAAqB,YACvD,KAAC,YAAY,CAAC,QAAQ,IAAC,KAAK,EAAE,gBAAgB,YAC5C,QAAQ,GACc,GACI,CAC7B,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAC9B,OAA2B;IAE3B,OAAO,MAAM,CAAC,KAAC,iBAAiB,cAAE,OAAO,GAAqB,CAAC,CAAC;AACjE,CAAC"}
+{"version":3,"file":"render-with-theme.js","sourceRoot":"","sources":["../../source/test-utils/render-with-theme.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,qBAAqB,CAAC;AAE3C,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAC,iBAAiB,EAAC,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AAGnD,+DAA+D;AAC/D,MAAM,UAAU,GAAW;IAC1B,OAAO,EAAE,MAAM;IACf,SAAS,EAAE,MAAM;IACjB,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,QAAQ;IACjB,KAAK,EAAE,KAAK;IACZ,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,SAAS;IACf,SAAS,EAAE,OAAO;IAClB,WAAW,EAAE,KAAK;IAClB,aAAa,EAAE,MAAM;IACrB,eAAe,EAAE,MAAM;CACvB,CAAC;AAEF,2BAA2B;AAC3B,MAAM,gBAAgB,GAAG;IACxB,YAAY,EAAE,aAA4B;IAC1C,MAAM,EAAE,UAAU;IAClB,eAAe,EAAE,GAAG,EAAE,GAAE,CAAC;CACzB,CAAC;AAEF,iCAAiC;AACjC,MAAM,qBAAqB,GAAG;IAC7B,iBAAiB,EAAE,MAAe;IAClC,oBAAoB,EAAE,GAAG,EAAE,GAAE,CAAC;CAC9B,CAAC;AAEF;;GAEG;AACH,SAAS,iBAAiB,CAAC,EAAC,QAAQ,EAA8B;IACjE,OAAO,CACN,KAAC,iBAAiB,CAAC,QAAQ,IAAC,KAAK,EAAE,qBAAqB,YACvD,KAAC,YAAY,CAAC,QAAQ,IAAC,KAAK,EAAE,gBAAgB,YAC7C,KAAC,eAAe,cAAE,QAAQ,GAAmB,GACtB,GACI,CAC7B,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAC9B,OAA2B;IAE3B,OAAO,MAAM,CAAC,KAAC,iBAAiB,cAAE,OAAO,GAAqB,CAAC,CAAC;AACjE,CAAC"}

package/dist/tool-calling/tool-parser.d.ts

@@ -12,9 +12,10 @@ type ParseResult = {
     examples: string;
 };
 /**
- * Unified tool call parser that tries XML first, then falls back to JSON
- * Returns errors for malformed tool calls instead of silently failing
+ * Parses XML tool calls from content (used for non-tool-calling models).
+ * Only runs on the XML fallback path when native tool calling is disabled.
+ * Type-preserving: Accepts unknown type, converts to string for processing.
  */
-export declare function parseToolCalls(content: string): ParseResult;
+export declare function parseToolCalls(content: unknown): ParseResult;
 export {};
 //# sourceMappingURL=tool-parser.d.ts.map

package/dist/tool-calling/tool-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-parser.d.ts","sourceRoot":"","sources":["../../source/tool-calling/tool-parser.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAkC5C;;GAEG;AACH,KAAK,WAAW,GACb;IACA,OAAO,EAAE,IAAI,CAAC;IACd,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;CACtB,GACD;IACA,OAAO,EAAE,KAAK,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAChB,CAAC;AAEL;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,CA4D3D"}
+{"version":3,"file":"tool-parser.d.ts","sourceRoot":"","sources":["../../source/tool-calling/tool-parser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAmC5C;;GAEG;AACH,KAAK,WAAW,GACb;IACA,OAAO,EAAE,IAAI,CAAC;IACd,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;CACtB,GACD;IACA,OAAO,EAAE,KAAK,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAChB,CAAC;AAEL;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,WAAW,CAyC5D"}

package/dist/tool-calling/tool-parser.js

@@ -1,11 +1,11 @@
-import { cleanJSONToolCalls, detectMalformedJSONToolCall, parseJSONToolCalls, } from '../tool-calling/json-parser.js';
 import { XMLToolCallParser } from '../tool-calling/xml-parser.js';
+import { ensureString } from '../utils/type-helpers.js';
 /**
- * Strip <think>...</think> tags from content (some models output thinking that shouldn't be shown)
+ * Strip  tags from content (some models output thinking that shouldn't be shown)
  */
 function stripThinkTags(content) {
     return (content
-        // Strip complete <think>...</think> blocks
+        // Strip complete  blocks
         .replace(/<think>[\s\S]*?<\/think>/gi, '')
         // Strip orphaned/incomplete think tags
         .replace(/<think>[\s\S]*$/gi, '')
@@ -27,22 +27,16 @@ function normalizeWhitespace(content) {
         .trim());
 }
 /**
- * Unified tool call parser that tries XML first, then falls back to JSON
- * Returns errors for malformed tool calls instead of silently failing
+ * Parses XML tool calls from content (used for non-tool-calling models).
+ * Only runs on the XML fallback path when native tool calling is disabled.
+ * Type-preserving: Accepts unknown type, converts to string for processing.
  */
 export function parseToolCalls(content) {
-    // Strip <think> tags first - some models (like GLM-4) emit these for chain-of-thought
-    const strippedContent = stripThinkTags(content);
-    // 1. Check for malformed XML patterns first (before validating with hasToolCalls)
-    const xmlMalformed = XMLToolCallParser.detectMalformedToolCall(strippedContent);
-    if (xmlMalformed) {
-        return {
-            success: false,
-            error: xmlMalformed.error,
-            examples: xmlMalformed.examples,
-        };
-    }
-    // 2. Try XML parser for valid tool calls
+    // 1. Safety Coercion
+    const contentStr = ensureString(content);
+    // Strip tags first - some models (like GLM-4) emit these for chain-of-thought
+    const strippedContent = stripThinkTags(contentStr);
+    // 2. Try XML parser for valid tool calls (OPTIMISTIC: Success first!)
     if (XMLToolCallParser.hasToolCalls(strippedContent)) {
         // Parse valid XML tool calls
         const parsedCalls = XMLToolCallParser.parseToolCalls(strippedContent);
@@ -56,27 +50,16 @@ export function parseToolCalls(content) {
             };
         }
     }
-    // 3. Fall back to JSON parser
-    // Check for malformed JSON tool calls
-    const jsonMalformed = detectMalformedJSONToolCall(strippedContent);
-    if (jsonMalformed) {
+    // 3. Check for malformed XML patterns (DEFENSIVE: Error second!)
+    const xmlMalformed = XMLToolCallParser.detectMalformedToolCall(strippedContent);
+    if (xmlMalformed) {
         return {
             success: false,
-            error: jsonMalformed.error,
-            examples: jsonMalformed.examples,
-        };
-    }
-    // Parse valid JSON tool calls
-    const jsonCalls = parseJSONToolCalls(strippedContent);
-    if (jsonCalls.length > 0) {
-        const cleanedContent = cleanJSONToolCalls(strippedContent, jsonCalls);
-        return {
-            success: true,
-            toolCalls: jsonCalls,
-            cleanedContent,
+            error: xmlMalformed.error,
+            examples: xmlMalformed.examples,
         };
     }
-    // 4. No tool calls found - still normalize whitespace in content
+    // 4. No tool calls found - normalize whitespace in content
     return {
         success: true,
         toolCalls: [],

package/dist/tool-calling/tool-parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-parser.js","sourceRoot":"","sources":["../../source/tool-calling/tool-parser.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,kBAAkB,EAClB,2BAA2B,EAC3B,kBAAkB,GAClB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAC,iBAAiB,EAAC,MAAM,2BAA2B,CAAC;AAG5D;;GAEG;AACH,SAAS,cAAc,CAAC,OAAe;IACtC,OAAO,CACN,OAAO;QACN,2CAA2C;SAC1C,OAAO,CAAC,4BAA4B,EAAE,EAAE,CAAC;QAC1C,uCAAuC;SACtC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC;SAChC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAC5B,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,mBAAmB,CAAC,OAAe;IAC3C,OAAO,CACN,OAAO;QACN,4CAA4C;SAC3C,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;QACzB,sEAAsE;SACrE,OAAO,CAAC,kBAAkB,EAAE,KAAK,CAAC;QACnC,wCAAwC;SACvC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;QAC1B,iEAAiE;SAChE,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC;SAC1B,IAAI,EAAE,CACR,CAAC;AACH,CAAC;AAiBD;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,OAAe;IAC7C,sFAAsF;IACtF,MAAM,eAAe,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IAEhD,kFAAkF;IAClF,MAAM,YAAY,GACjB,iBAAiB,CAAC,uBAAuB,CAAC,eAAe,CAAC,CAAC;IAC5D,IAAI,YAAY,EAAE,CAAC;QAClB,OAAO;YACN,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,YAAY,CAAC,KAAK;YACzB,QAAQ,EAAE,YAAY,CAAC,QAAQ;SAC/B,CAAC;IACH,CAAC;IAED,yCAAyC;IACzC,IAAI,iBAAiB,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE,CAAC;QACrD,6BAA6B;QAC7B,MAAM,WAAW,GAAG,iBAAiB,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;QACtE,MAAM,cAAc,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAEzE,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,cAAc,GACnB,iBAAiB,CAAC,0BAA0B,CAAC,eAAe,CAAC,CAAC;YAC/D,OAAO;gBACN,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,cAAc;gBACzB,cAAc;aACd,CAAC;QACH,CAAC;IACF,CAAC;IAED,8BAA8B;IAC9B,sCAAsC;IACtC,MAAM,aAAa,GAAG,2BAA2B,CAAC,eAAe,CAAC,CAAC;IACnE,IAAI,aAAa,EAAE,CAAC;QACnB,OAAO;YACN,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,aAAa,CAAC,KAAK;YAC1B,QAAQ,EAAE,aAAa,CAAC,QAAQ;SAChC,CAAC;IACH,CAAC;IAED,8BAA8B;IAC9B,MAAM,SAAS,GAAG,kBAAkB,CAAC,eAAe,CAAC,CAAC;IACtD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,MAAM,cAAc,GAAG,kBAAkB,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;QACtE,OAAO;YACN,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,SAAS;YACpB,cAAc;SACd,CAAC;IACH,CAAC;IAED,iEAAiE;IACjE,OAAO;QACN,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,EAAE;QACb,cAAc,EAAE,mBAAmB,CAAC,eAAe,CAAC;KACpD,CAAC;AACH,CAAC"}
+{"version":3,"file":"tool-parser.js","sourceRoot":"","sources":["../../source/tool-calling/tool-parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAElD;;GAEG;AACH,SAAS,cAAc,CAAC,OAAe;IACtC,OAAO,CACN,OAAO;QACN,yBAAyB;SACxB,OAAO,CAAC,4BAA4B,EAAE,EAAE,CAAC;QAC1C,uCAAuC;SACtC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC;SAChC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAC5B,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,mBAAmB,CAAC,OAAe;IAC3C,OAAO,CACN,OAAO;QACN,4CAA4C;SAC3C,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;QACzB,sEAAsE;SACrE,OAAO,CAAC,kBAAkB,EAAE,KAAK,CAAC;QACnC,wCAAwC;SACvC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;QAC1B,iEAAiE;SAChE,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC;SAC1B,IAAI,EAAE,CACR,CAAC;AACH,CAAC;AAiBD;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,OAAgB;IAC9C,qBAAqB;IACrB,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IAEzC,8EAA8E;IAC9E,MAAM,eAAe,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;IAEnD,sEAAsE;IACtE,IAAI,iBAAiB,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE,CAAC;QACrD,6BAA6B;QAC7B,MAAM,WAAW,GAAG,iBAAiB,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;QACtE,MAAM,cAAc,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAEzE,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,cAAc,GACnB,iBAAiB,CAAC,0BAA0B,CAAC,eAAe,CAAC,CAAC;YAC/D,OAAO;gBACN,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,cAAc;gBACzB,cAAc;aACd,CAAC;QACH,CAAC;IACF,CAAC;IAED,iEAAiE;IACjE,MAAM,YAAY,GACjB,iBAAiB,CAAC,uBAAuB,CAAC,eAAe,CAAC,CAAC;IAC5D,IAAI,YAAY,EAAE,CAAC;QAClB,OAAO;YACN,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,YAAY,CAAC,KAAK;YACzB,QAAQ,EAAE,YAAY,CAAC,QAAQ;SAC/B,CAAC;IACH,CAAC;IAED,2DAA2D;IAC3D,OAAO;QACN,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,EAAE;QACb,cAAc,EAAE,mBAAmB,CAAC,eAAe,CAAC;KACpD,CAAC;AACH,CAAC"}

package/dist/tool-calling/xml-parser.d.ts

@@ -12,8 +12,9 @@ export declare class XMLToolCallParser {
     private static readonly PARAMETER_REGEX;
     /**
      * Extracts tool calls from text content containing XML-formatted tool calls
+     * Type-preserving: Accepts unknown type, converts to string for processing
      */
-    static parseToolCalls(content: string): ParsedToolCall[];
+    static parseToolCalls(content: unknown): ParsedToolCall[];
     /**
      * Validates that a matched string is a proper tool call
      * Rejects partial matches, malformed syntax, and invalid structures
@@ -29,17 +30,20 @@ export declare class XMLToolCallParser {
     static convertToToolCalls(parsedCalls: ParsedToolCall[]): ToolCall[];
     /**
      * Removes XML tool call blocks from content, leaving only the text
+     * Type-preserving: Accepts unknown type, converts to string for processing
      */
-    static removeToolCallsFromContent(content: string): string;
+    static removeToolCallsFromContent(content: unknown): string;
     /**
      * Checks if content contains XML-formatted tool calls
+     * Type-preserving: Accepts unknown type, converts to string for processing
      */
-    static hasToolCalls(content: string): boolean;
+    static hasToolCalls(content: unknown): boolean;
     /**
      * Detects malformed XML tool call attempts and returns error details
      * Returns null if no malformed tool calls detected
+     * Type-preserving: Accepts unknown type, converts to string for processing
      */
-    static detectMalformedToolCall(content: string): {
+    static detectMalformedToolCall(content: unknown): {
         error: string;
         examples: string;
     } | null;

package/dist/tool-calling/xml-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xml-parser.d.ts","sourceRoot":"","sources":["../../source/tool-calling/xml-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAE5C,UAAU,cAAc;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED;;;GAGG;AACH,qBAAa,iBAAiB;IAC7B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAA0B;IACjE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAA0B;IAEjE;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,cAAc,EAAE;IAwCxD;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAyE9B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAyB9B;;OAEG;IACH,MAAM,CAAC,kBAAkB,CAAC,WAAW,EAAE,cAAc,EAAE,GAAG,QAAQ,EAAE;IAUpE;;OAEG;IACH,MAAM,CAAC,0BAA0B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IA0C1D;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAM7C;;;OAGG;IACH,MAAM,CAAC,uBAAuB,CAC7B,OAAO,EAAE,MAAM,GACb;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,GAAG,IAAI;IA8C3C;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,wBAAwB;CAGvC"}
+{"version":3,"file":"xml-parser.d.ts","sourceRoot":"","sources":["../../source/tool-calling/xml-parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAG5C,UAAU,cAAc;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED;;;GAGG;AACH,qBAAa,iBAAiB;IAC7B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAA0B;IACjE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAA0B;IAEjE;;;OAGG;IACH,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,cAAc,EAAE;IA0CzD;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAyE9B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAyB9B;;OAEG;IACH,MAAM,CAAC,kBAAkB,CAAC,WAAW,EAAE,cAAc,EAAE,GAAG,QAAQ,EAAE;IAUpE;;;OAGG;IACH,MAAM,CAAC,0BAA0B,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM;IA4C3D;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO;IAM9C;;;;OAIG;IACH,MAAM,CAAC,uBAAuB,CAC7B,OAAO,EAAE,OAAO,GACd;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,GAAG,IAAI;IAiD3C;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,wBAAwB;CAGvC"}

package/dist/tool-calling/xml-parser.js

@@ -1,3 +1,4 @@
+import { ensureString } from '../utils/type-helpers.js';
 /**
  * Parses XML-formatted tool calls from non-function-calling models
  * Expected format: <tool_name><param1>value1</param1><param2>value2</param2></tool_name>
@@ -7,13 +8,14 @@ export class XMLToolCallParser {
     static PARAMETER_REGEX = /<(\w+)>(.*?)<\/\1>/gs;
     /**
      * Extracts tool calls from text content containing XML-formatted tool calls
+     * Type-preserving: Accepts unknown type, converts to string for processing
      */
     static parseToolCalls(content) {
         const toolCalls = [];
         let match;
         // Handle content that might be wrapped in markdown code blocks
-        let processedContent = content;
-        const codeBlockMatch = content.match(/```(?:\w+)?\s*\n?([\s\S]*?)\n?```/);
+        let processedContent = ensureString(content);
+        const codeBlockMatch = processedContent.match(/```(?:\w+)?\s*\n?([\s\S]*?)\n?```/);
         if (codeBlockMatch && codeBlockMatch[1]) {
             processedContent = codeBlockMatch[1].trim();
         }
@@ -142,15 +144,18 @@ export class XMLToolCallParser {
     }
     /**
      * Removes XML tool call blocks from content, leaving only the text
+     * Type-preserving: Accepts unknown type, converts to string for processing
      */
     static removeToolCallsFromContent(content) {
-        let cleanedContent = content;
+        let cleanedContent = ensureString(content);
         // Remove all markdown code blocks that contain XML tool calls (using global flag)
         cleanedContent = cleanedContent.replace(/```(?:\w+)?\s*\n?([\s\S]*?)\n?```/g, (match, blockContent) => {
             if (blockContent) {
                 // Reset regex and check if this block contains XML tool calls
                 this.TOOL_CALL_REGEX.lastIndex = 0;
-                if (this.TOOL_CALL_REGEX.test(blockContent)) {
+                const testResult = this.TOOL_CALL_REGEX.test(blockContent);
+                this.TOOL_CALL_REGEX.lastIndex = 0; // Reset again after test
+                if (testResult) {
                     // This code block contains XML tool calls, remove it entirely
                     return '';
                 }
@@ -178,6 +183,7 @@ export class XMLToolCallParser {
     }
     /**
      * Checks if content contains XML-formatted tool calls
+     * Type-preserving: Accepts unknown type, converts to string for processing
      */
     static hasToolCalls(content) {
         // Use parseToolCalls with validation to ensure we only detect valid tool calls
@@ -187,8 +193,12 @@ export class XMLToolCallParser {
     /**
      * Detects malformed XML tool call attempts and returns error details
      * Returns null if no malformed tool calls detected
+     * Type-preserving: Accepts unknown type, converts to string for processing
      */
     static detectMalformedToolCall(content) {
+        // Type guard: ensure content is string for processing operations
+        // BUT original type is preserved in memory via the ToolCall structure
+        const contentStr = ensureString(content);
         // Common malformed patterns
         const patterns = [
             {
@@ -218,7 +228,7 @@ export class XMLToolCallParser {
             },
         ];
         for (const pattern of patterns) {
-            const match = content.match(pattern.regex);
+            const match = contentStr.match(pattern.regex);
             if (match) {
                 return {
                     error: pattern.error,