thatgfsj-code 3.0.4 → 3.0.6

package/dist/session/compactor.d.ts

@@ -1,16 +1,20 @@
 /**
  * Context Compactor - Progressive compression for conversation history
- * Migrated from old src/core/context-compactor.ts
  *
- * Strategy:
- * 1. Within limit: no compression
- * 2. Beyond limit: keep system + recent N turns + summarize middle
+ * v3.0.5: compression now respects TOOL-CALL ATOMICITY. OpenAI and
+ * Anthropic both reject a request where an assistant message carrying
+ * tool_calls is not immediately followed by its tool result messages (and
+ * vice versa). The previous implementation sliced by raw message count and
+ * happily cut right through a call/result pair, producing 400s from that
+ * point on. Messages are now grouped first — an assistant message with
+ * tool_calls plus all of its following tool messages form one atomic
+ * group — and only whole groups are summarized away.
  */
 import type { ChatMessage } from '../types.js';
 export interface CompactorConfig {
     /** Max messages before compression kicks in */
     maxMessages?: number;
-    /** How many recent turns to always preserve */
+    /** Approximate message budget to preserve for recent context */
     preserveRecent?: number;
 }
 export interface CompressionResult {
@@ -18,12 +22,28 @@ export interface CompressionResult {
     compactedCount: number;
     removedCount: number;
 }
+/** A group of messages that must be kept together (or dropped together). */
+export interface MessageGroup {
+    messages: ChatMessage[];
+}
+/**
+ * Split non-system messages into atomic groups.
+ *
+ * Rules:
+ * - a `tool` message always joins the group before it (its assistant
+ *   tool_calls carrier)
+ * - an assistant message with tool_calls starts a new group (its results
+ *   will follow inside the same group)
+ * - a user or plain assistant message starts a new group
+ */
+export declare function splitIntoGroups(messages: ChatMessage[]): MessageGroup[];
 export declare class ContextCompactor {
     private maxMessages;
     private preserveRecent;
     constructor(config?: CompactorConfig);
     /**
-     * Compact messages if needed
+     * Compact messages if needed. Returns the input unchanged when under the
+     * limit or when nothing can be removed.
      */
     compact(messages: ChatMessage[]): {
         compacted: ChatMessage[];
@@ -41,7 +61,7 @@ export declare class ContextCompactor {
      */
     estimateTokens(messages: ChatMessage[]): number;
     /**
-     * Extract topic summary from messages
+     * Extract a short topic list from the middle groups (their user prompts).
      */
     private extractTopics;
 }

package/dist/session/compactor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compactor.d.ts","sourceRoot":"","sources":["../../src/session/compactor.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,WAAW,eAAe;IAC9B,+CAA+C;IAC/C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,+CAA+C;IAC/C,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,iBAAiB;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,cAAc,CAAS;gBAEnB,MAAM,GAAE,eAAoB;IAKxC;;OAEG;IACH,OAAO,CAAC,QAAQ,EAAE,WAAW,EAAE,GAAG;QAAE,SAAS,EAAE,WAAW,EAAE,CAAC;QAAC,MAAM,EAAE,iBAAiB,CAAA;KAAE;IA0CzF;;OAEG;IACH,WAAW,CAAC,QAAQ,EAAE,WAAW,EAAE,GAAG;QAAE,SAAS,EAAE,WAAW,EAAE,CAAC;QAAC,MAAM,EAAE,iBAAiB,CAAA;KAAE;IAI7F;;OAEG;IACH,cAAc,CAAC,QAAQ,EAAE,WAAW,EAAE,GAAG,MAAM;IAI/C;;OAEG;IACH,OAAO,CAAC,aAAa;CAOtB"}
+{"version":3,"file":"compactor.d.ts","sourceRoot":"","sources":["../../src/session/compactor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,WAAW,eAAe;IAC9B,+CAA+C;IAC/C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gEAAgE;IAChE,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,iBAAiB;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,4EAA4E;AAC5E,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,WAAW,EAAE,CAAC;CACzB;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,WAAW,EAAE,GAAG,YAAY,EAAE,CAkBvE;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,cAAc,CAAS;gBAEnB,MAAM,GAAE,eAAoB;IAKxC;;;OAGG;IACH,OAAO,CAAC,QAAQ,EAAE,WAAW,EAAE,GAAG;QAAE,SAAS,EAAE,WAAW,EAAE,CAAC;QAAC,MAAM,EAAE,iBAAiB,CAAA;KAAE;IAyDzF;;OAEG;IACH,WAAW,CAAC,QAAQ,EAAE,WAAW,EAAE,GAAG;QAAE,SAAS,EAAE,WAAW,EAAE,CAAC;QAAC,MAAM,EAAE,iBAAiB,CAAA;KAAE;IAI7F;;OAEG;IACH,cAAc,CAAC,QAAQ,EAAE,WAAW,EAAE,GAAG,MAAM;IAM/C;;OAEG;IACH,OAAO,CAAC,aAAa;CAYtB"}

package/dist/session/compactor.js

@@ -1,11 +1,43 @@
 /**
  * Context Compactor - Progressive compression for conversation history
- * Migrated from old src/core/context-compactor.ts
  *
- * Strategy:
- * 1. Within limit: no compression
- * 2. Beyond limit: keep system + recent N turns + summarize middle
+ * v3.0.5: compression now respects TOOL-CALL ATOMICITY. OpenAI and
+ * Anthropic both reject a request where an assistant message carrying
+ * tool_calls is not immediately followed by its tool result messages (and
+ * vice versa). The previous implementation sliced by raw message count and
+ * happily cut right through a call/result pair, producing 400s from that
+ * point on. Messages are now grouped first — an assistant message with
+ * tool_calls plus all of its following tool messages form one atomic
+ * group — and only whole groups are summarized away.
  */
+/**
+ * Split non-system messages into atomic groups.
+ *
+ * Rules:
+ * - a `tool` message always joins the group before it (its assistant
+ *   tool_calls carrier)
+ * - an assistant message with tool_calls starts a new group (its results
+ *   will follow inside the same group)
+ * - a user or plain assistant message starts a new group
+ */
+export function splitIntoGroups(messages) {
+    const groups = [];
+    for (const m of messages) {
+        if (m.role === 'tool') {
+            if (groups.length > 0) {
+                groups[groups.length - 1].messages.push(m);
+            }
+            else {
+                // Orphaned tool result (malformed history) — keep it isolated so we
+                // don't attach it to an unrelated pair.
+                groups.push({ messages: [m] });
+            }
+            continue;
+        }
+        groups.push({ messages: [m] });
+    }
+    return groups;
+}
 export class ContextCompactor {
     maxMessages;
     preserveRecent;
@@ -14,7 +46,8 @@ export class ContextCompactor {
         this.preserveRecent = config.preserveRecent ?? 10;
     }
     /**
-     * Compact messages if needed
+     * Compact messages if needed. Returns the input unchanged when under the
+     * limit or when nothing can be removed.
      */
     compact(messages) {
         if (messages.length <= this.maxMessages) {
@@ -23,25 +56,40 @@ export class ContextCompactor {
                 result: { originalCount: messages.length, compactedCount: messages.length, removedCount: 0 },
             };
         }
-        const systemMsg = messages.find(m => m.role === 'system');
+        const systemMsgs = messages.filter(m => m.role === 'system');
         const others = messages.filter(m => m.role !== 'system');
-        if (others.length <= this.preserveRecent) {
+        const groups = splitIntoGroups(others);
+        if (groups.length <= 1) {
+            // Nothing compressible — a single group must stay atomic.
+            return {
+                compacted: messages,
+                result: { originalCount: messages.length, compactedCount: messages.length, removedCount: 0 },
+            };
+        }
+        // Pick trailing groups whose combined size fits the recent budget
+        // (always keep at least one group).
+        const recent = [];
+        let recentSize = 0;
+        for (let i = groups.length - 1; i >= 0; i--) {
+            const size = groups[i].messages.length;
+            if (recentSize + size > this.preserveRecent && recent.length > 0)
+                break;
+            recent.unshift(groups[i]);
+            recentSize += size;
+        }
+        const middle = groups.slice(0, groups.length - recent.length);
+        if (middle.length === 0) {
             return {
                 compacted: messages,
                 result: { originalCount: messages.length, compactedCount: messages.length, removedCount: 0 },
             };
         }
-        // Keep recent N turns
-        const recent = others.slice(-this.preserveRecent);
-        // Summarize the middle portion
-        const middle = others.slice(0, -this.preserveRecent);
         const summary = {
             role: 'system',
-            content: `[Earlier conversation summary: ${middle.length} messages covering ${this.extractTopics(middle)}]`,
+            content: `[Earlier conversation summary: ${middle.reduce((n, g) => n + g.messages.length, 0)} messages covering ${this.extractTopics(middle)}]`,
         };
-        const compacted = systemMsg
-            ? [systemMsg, summary, ...recent]
-            : [summary, ...recent];
+        const recentMsgs = recent.flatMap(g => g.messages);
+        const compacted = [...systemMsgs, summary, ...recentMsgs];
         return {
             compacted,
             result: {
@@ -61,17 +109,24 @@ export class ContextCompactor {
      * Estimate token count (rough: ~4 chars per token)
      */
     estimateTokens(messages) {
-        return messages.reduce((sum, m) => sum + Math.ceil(m.content.length / 4) + 10, 0);
+        const size = (m) => (typeof m.content === 'string' ? m.content.length : JSON.stringify(m.content).length);
+        return messages.reduce((sum, m) => sum + Math.ceil(size(m) / 4) + 10, 0);
     }
     /**
-     * Extract topic summary from messages
+     * Extract a short topic list from the middle groups (their user prompts).
      */
-    extractTopics(msgs) {
-        const topics = msgs
-            .filter(m => m.role === 'user')
-            .map(m => m.content.slice(0, 30))
-            .slice(0, 3);
-        return topics.join(', ') || 'various topics';
+    extractTopics(groups) {
+        const topics = [];
+        for (const g of groups) {
+            for (const m of g.messages) {
+                if (m.role === 'user' && typeof m.content === 'string') {
+                    topics.push(m.content.slice(0, 60).replace(/\s+/g, ' '));
+                    if (topics.length >= 5)
+                        return topics.join(' | ');
+                }
+            }
+        }
+        return topics.join(' | ') || 'various topics';
     }
 }
 //# sourceMappingURL=compactor.js.map

package/dist/session/compactor.js.map

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

package/dist/session/index.d.ts

@@ -1,63 +1,112 @@
 /**
  * Session Manager - Manages conversation history with auto-compaction
+ *
+ * v3.0.5 additions:
+ *   - Disk persistence: every completed round can be persisted to
+ *     ~/.thatgfsj/sessions/<id>.json, and /resume restores a previous
+ *     session. Files are validated on load (dangling tool_calls are
+ *     stripped) so a restored history can never produce a provider 400.
+ *   - reset(): starts a fresh conversation while KEEPING the system prompt
+ *     (the old clear() dropped it, leaving every later request unprompted).
+ *   - autoCompact: when history exceeds maxMessages it is compacted once
+ *     (atomic tool groups, see compactor.ts) instead of being silently
+ *     truncated every round. The TUI is notified via onAutoCompact.
  */
 import type { ChatMessage } from '../types.js';
+export interface SessionFile {
+    version: 1;
+    id: string;
+    createdAt: string;
+    updatedAt: string;
+    provider?: string;
+    model?: string;
+    messages: ChatMessage[];
+}
+export interface SessionSummary {
+    id: string;
+    updatedAt: Date;
+    messageCount: number;
+    /** First user message, trimmed — the human-readable "what was this about". */
+    preview: string;
+}
+export declare function sessionsDir(): string;
+/**
+ * v3.0.5: shared load-time sanitizer. A restored history must never carry a
+ * tool_calls block without its results, or the next provider request 400s:
+ * - drop orphaned 'tool' messages (no preceding assistant tool_calls)
+ * - strip tool_calls from an assistant message whose results were lost
+ */
+export declare function sanitizeLoadedMessages(messages: ChatMessage[]): ChatMessage[];
 export declare class SessionManager {
     private messages;
     private sessionId;
     private createdAt;
     private compactor;
     private maxMessages;
-    /** v2.2.4: counter for messages dropped by the pollution filter. */
     private droppedCount;
+    /** Whether history was compacted and the new-context toast not yet surfaced. */
+    private lastCompaction;
+    /** Extra metadata recorded in the session file. */
+    meta?: {
+        provider?: string;
+        model?: string;
+    };
     /**
-     * v3.0.0: callback invoked when the message count exceeds maxMessages.
-     * Reasonix principle: do not mutate messages to compact; instead, signal
-     * the TUI to suggest the user call /new (start a fresh session) so that
-     * the upstream prompt cache keeps a stable prefix. NWT auto-logs every
-     * meaningful event, so no history is lost — it just moves out of the
-     * live cache window.
+     * Called after history exceeded maxMessages and was compacted once.
+     * The TUI surfaces a toast; nobody is required to act.
      */
-    onSuggestNewSession?: (info: {
-        currentLength: number;
-        max: number;
+    onAutoCompact?: (info: {
+        before: number;
+        after: number;
     }) => void;
     constructor(maxMessages?: number, options?: {
-        onSuggestNewSession?: SessionManager['onSuggestNewSession'];
+        onAutoCompact?: SessionManager['onAutoCompact'];
     });
     addMessage(role: ChatMessage['role'], content: string, extras?: Partial<ChatMessage>): void;
     /**
-     * v2.2.4 (port from v2.1.0): same as addMessage but returns false
-     * (and skips the push) if the message content matches a known
-     * truncation/abort pollution pattern. Use this for assistant
-     * messages whose stream might have been aborted.
+     * Same as addMessage but returns false (and skips the push) if the message
+     * content matches a known truncation/abort pollution pattern.
      */
     addMessageSafe(role: ChatMessage['role'], content: string, extras?: Partial<ChatMessage>): boolean;
-    /** v2.2.4: total messages dropped by addMessageSafe since session start. */
+    /** Total messages dropped by addMessageSafe since session start. */
     getDroppedCount(): number;
     getMessages(): ChatMessage[];
     getMessageCount(): number;
+    /**
+     * v3.0.5: fresh conversation that KEEPS the system prompt. The previous
+     * clear() removed it, so every later request ran without the identity /
+     * tool / skills instructions until the process restarted.
+     */
+    reset(): void;
+    /**
+     * v3.0.5: replace in-memory history (used by /resume). Input is sanitized
+     * so a malformed file can not poison the next request.
+     */
+    restore(messages: ChatMessage[], meta?: {
+        id?: string;
+        createdAt?: string;
+        provider?: string;
+        model?: string;
+    }): void;
     clear(): void;
     /**
-     * v3.0.0: "auto-compact" is now a no-op on `messages`. We instead invoke
-     * the registered `onSuggestNewSession` callback (if any) so the TUI can
-     * surface a "context is getting long, consider /new" hint. This keeps
-     * the messages array byte-stable across rounds, which is critical for
-     * prompt-cache hit-rate: any reordering or summary insertion would
-     * invalidate every cache breakpoint the upstream provider has set.
-     *
-     * Rationale (Reasonix-style): when context exceeds the model window or
-     * the configured maxMessages threshold, the right action is to start a
-     * NEW session, not to silently truncate or summarize. NWT auto-logs
-     * every meaningful event, so the user does not lose context — it just
-     * moves out of the live cache window. If the user wants a longer
-     * session, they can bump maxMessages in `~/.thatgfsj/config.json`.
-     *
-     * The original "fake compact" logic (insert `[Earlier conversation...]`
-     * summary) is preserved as `truncate()` for callers that explicitly
-     * want to compact (e.g. /new command hard-reset).
+     * v3.0.5: replace the (first) system prompt in place — used when tools or
+     * the permission mode change and the prompt must be rebuilt without
+     * resetting the conversation.
+     */
+    replaceSystemMessage(content: string): void;
+    /**
+     * Compact when over the limit — once per crossing, atomic groups (v3.0.5).
+     * The previous design only suggested /new and never touched history, which
+     * let sessions grow unbounded (and the /compact path silently rewrote
+     * history every round). Now: compact at the threshold, notify once.
      */
     private autoCompact;
+    /** v3.0.5: explicit compaction (the /compact command). */
+    compactNow(): {
+        before: number;
+        after: number;
+    } | null;
     truncate(maxMessages?: number): void;
     getId(): string;
     getInfo(): {
@@ -65,6 +114,20 @@ export declare class SessionManager {
         messageCount: number;
         createdAt: Date;
     };
+    /**
+     * Write the current history to ~/.thatgfsj/sessions/<id>.json and prune
+     * old sessions. Fire-and-forget friendly: errors are swallowed by the
+     * caller — a full disk must never kill a chat round.
+     */
+    persist(): void;
+    /**
+     * Restore a previously persisted session into THIS manager (in place).
+     */
+    loadFrom(file: SessionFile): void;
+    /** List the most recent persisted sessions, newest first. */
+    static list(limit?: number): SessionSummary[];
+    /** Load a persisted session file by id (or filename). */
+    static load(id: string): SessionFile | null;
 }
 export { ContextCompactor } from './compactor.js';
 export type { CompactorConfig, CompressionResult } from './compactor.js';

package/dist/session/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/session/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAqD/C,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAqB;IACrC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,SAAS,CAAO;IACxB,OAAO,CAAC,SAAS,CAAmB;IACpC,OAAO,CAAC,WAAW,CAAS;IAC5B,oEAAoE;IACpE,OAAO,CAAC,YAAY,CAAa;IACjC;;;;;;;OAOG;IACI,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;gBAExE,WAAW,SAAK,EAAE,OAAO,CAAC,EAAE;QAAE,mBAAmB,CAAC,EAAE,cAAc,CAAC,qBAAqB,CAAC,CAAA;KAAE;IAQvG,UAAU,CAAC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI;IAK3F;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,OAAO;IASlG,4EAA4E;IAC5E,eAAe,IAAI,MAAM;IAIzB,WAAW,IAAI,WAAW,EAAE;IAI5B,eAAe,IAAI,MAAM;IAIzB,KAAK,IAAI,IAAI;IAIb;;;;;;;;;;;;;;;;;;OAkBG;IACH,OAAO,CAAC,WAAW;IAiBnB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI;IASpC,KAAK,IAAI,MAAM;IAIf,OAAO,IAAI;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,IAAI,CAAA;KAAE;CAOjE;AAED,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,YAAY,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACzE,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/session/index.ts"],"names":[],"mappings":"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"}