@xopcai/xopc 0.0.169 → 0.0.171

package/dist/src/session/session-context-for-llm.js

@@ -21,6 +21,11 @@ function isTranscriptSummaryMessageEntry(x) {
 	const role = x.role;
 	return role === "branchSummary" || role === "compactionSummary";
 }
+function isTranscriptCompactionEntry(x) {
+	if (!x || typeof x !== "object") return false;
+	const row = x;
+	return row.type === "compaction" && typeof row.at === "string" && typeof row.baseSeq === "number" && Number.isInteger(row.baseSeq) && typeof row.plannerVersion === "number" && Number.isInteger(row.plannerVersion) && typeof row.summaryModelRef === "string" && (row.qualityAudit === "passed" || row.qualityAudit === "disabled") && typeof row.summary === "string" && Array.isArray(row.messages) && typeof row.firstKeptIndex === "number" && typeof row.tokensBefore === "number" && typeof row.tokensAfter === "number";
+}
 function isTranscriptLabelEntry(x) {
 	if (!x || typeof x !== "object") return false;
 	return x.type === "label";
@@ -37,13 +42,15 @@ const LLM_ROLES = new Set([
 	"tool",
 	"toolResult"
 ]);
-const CODING_CONTEXT_LOOKBACK = 80;
-const CODING_CONTEXT_MAX_LINES = 24;
 function isLikelyAgentMessage(x) {
 	if (!x || typeof x !== "object") return false;
 	const role = x.role;
 	return typeof role === "string" && LLM_ROLES.has(role);
 }
+/** Runtime-derived messages are never authoritative transcript rows. */
+function isRuntimeOnlyTranscriptMessage(x) {
+	return isLikelyAgentMessage(x) && x.droppable === true;
+}
 function parseTimestampValue(timestamp) {
 	if (typeof timestamp === "number") return Number.isFinite(timestamp) ? timestamp : void 0;
 	if (typeof timestamp !== "string") return;
@@ -93,33 +100,6 @@ function asRecord(value) {
 function stringValue(value) {
 	return typeof value === "string" ? value : void 0;
 }
-function parseJsonRecord(value) {
-	if (typeof value !== "string" || !value.trim()) return null;
-	try {
-		return asRecord(JSON.parse(value));
-	} catch {
-		return null;
-	}
-}
-function textFromContent(content) {
-	if (typeof content === "string") return content;
-	if (!Array.isArray(content)) return "";
-	return content.map((part) => {
-		if (typeof part === "string") return part;
-		const rec = asRecord(part);
-		if (!rec) return "";
-		if (rec.type === "text" && typeof rec.text === "string") return rec.text;
-		return "";
-	}).filter(Boolean).join("");
-}
-function toolNameFromBlock(block) {
-	const fn = asRecord(block.function);
-	return stringValue(block.name) ?? stringValue(block.toolName) ?? stringValue(fn?.name) ?? "tool";
-}
-function toolArgsFromBlock(block) {
-	const fn = asRecord(block.function);
-	return asRecord(block.arguments) ?? asRecord(block.args) ?? asRecord(block.input) ?? asRecord(fn?.arguments) ?? parseJsonRecord(block.arguments) ?? parseJsonRecord(block.args) ?? parseJsonRecord(block.input) ?? parseJsonRecord(fn?.arguments) ?? {};
-}
 function toolCallIdFromBlock(block) {
 	return stringValue(block.id) ?? stringValue(block.toolCallId) ?? stringValue(block.tool_call_id) ?? stringValue(block.tool_call_id$);
 }
@@ -127,112 +107,84 @@ function toolResultId(row) {
 	const rec = row;
 	return stringValue(rec.toolCallId) ?? stringValue(rec.tool_call_id) ?? stringValue(rec.tool_call_id$);
 }
-function extractResultDetails(row) {
-	if (!row) return null;
-	const topLevelDetails = asRecord(row.details);
-	if (topLevelDetails) return topLevelDetails;
-	const contentText = textFromContent(row.content);
-	if (!contentText.trim()) return null;
-	try {
-		const rec = asRecord(JSON.parse(contentText));
-		return asRecord(rec?.details) ?? rec;
-	} catch {
-		return null;
-	}
-}
-function collectToolResults(messages) {
-	const results = /* @__PURE__ */ new Map();
-	for (const message of messages) {
-		const role = message.role;
-		if (role !== "tool" && role !== "toolResult") continue;
-		const id = toolResultId(message);
-		if (id) results.set(id, message);
-	}
-	return results;
-}
-function extractToolCalls(message) {
+function toolCallIds(message) {
+	if (message.role !== "assistant") return [];
+	const ids = [];
 	const content = message.content;
-	const calls = [];
 	if (Array.isArray(content)) for (const block of content) {
 		const rec = asRecord(block);
 		const type = rec ? stringValue(rec.type) : void 0;
 		if (!rec || type !== "toolCall" && type !== "tool_use" && type !== "tool_call") continue;
-		calls.push({
-			id: toolCallIdFromBlock(rec),
-			name: toolNameFromBlock(rec),
-			args: toolArgsFromBlock(rec)
-		});
+		const id = toolCallIdFromBlock(rec);
+		if (id) ids.push(id);
 	}
-	const toolCalls = message.tool_calls;
-	if (Array.isArray(toolCalls)) for (const call of toolCalls) {
-		const rec = asRecord(call);
-		const fn = asRecord(rec?.function);
-		const name = stringValue(fn?.name) ?? stringValue(rec?.name);
-		if (!rec || !name) continue;
-		calls.push({
-			id: stringValue(rec.id),
-			name,
-			args: parseJsonRecord(fn?.arguments) ?? asRecord(fn?.arguments) ?? {}
-		});
+	const calls = message.tool_calls;
+	if (Array.isArray(calls)) for (const call of calls) {
+		const id = stringValue(asRecord(call)?.id);
+		if (id) ids.push(id);
 	}
-	return calls;
-}
-function summarizePlan(details) {
-	const lines = (Array.isArray(details.plan) ? details.plan : []).map((item) => {
-		const rec = asRecord(item);
-		const step = stringValue(rec?.step)?.trim();
-		const status = stringValue(rec?.status)?.trim();
-		return step && status ? `${status}: ${step}` : "";
-	}).filter(Boolean).slice(0, 8);
-	if (lines.length === 0) return void 0;
-	const explanation = stringValue(details.explanation)?.trim();
-	return `Plan${explanation ? ` (${explanation})` : ""}: ${lines.join(" | ")}`;
-}
-function summarizeCommand(args, details) {
-	const command = stringValue(details?.command) ?? stringValue(args.cmd) ?? stringValue(args.command) ?? "";
-	const status = stringValue(details?.status) ?? (details?.exitCode === 0 ? "success" : "unknown");
-	const exitCode = typeof details?.exitCode === "number" ? details.exitCode : void 0;
-	const hint = stringValue(details?.failureHint);
-	return [
-		`Command ${status}: ${command || "(unknown command)"}`,
-		exitCode !== void 0 ? `exit=${exitCode}` : "",
-		hint ? `hint=${hint}` : ""
-	].filter(Boolean).join(" ");
+	return ids;
 }
-function summarizePatch(details) {
-	if (!details) return void 0;
-	const files = Array.isArray(details.files) ? details.files.filter((file) => typeof file === "string" && file.trim().length > 0) : [];
-	const added = typeof details.added === "number" ? details.added : 0;
-	const removed = typeof details.removed === "number" ? details.removed : 0;
-	const summary = stringValue(details.summary)?.trim();
-	return `Patch applied: ${files.length ? files.join(", ") : summary || "(files unknown)"} (+${added}/-${removed})`;
+function filterAssistantToolCalls(message, pairedIds) {
+	const record = message;
+	const content = record.content;
+	const filteredContent = Array.isArray(content) ? content.filter((block) => {
+		const rec = asRecord(block);
+		const type = rec ? stringValue(rec.type) : void 0;
+		if (!rec || type !== "toolCall" && type !== "tool_use" && type !== "tool_call") return true;
+		const id = toolCallIdFromBlock(rec);
+		return id !== void 0 && pairedIds.has(id);
+	}) : content;
+	const toolCalls = record.tool_calls;
+	const filteredToolCalls = Array.isArray(toolCalls) ? toolCalls.filter((call) => {
+		const id = stringValue(asRecord(call)?.id);
+		return id !== void 0 && pairedIds.has(id);
+	}) : toolCalls;
+	const hadArrayContent = Array.isArray(content);
+	const hadToolCalls = Array.isArray(toolCalls);
+	const hasContent = Array.isArray(filteredContent) ? filteredContent.length > 0 : typeof filteredContent === "string" ? filteredContent.trim().length > 0 : filteredContent !== void 0 && filteredContent !== null;
+	const hasToolCalls = Array.isArray(filteredToolCalls) && filteredToolCalls.length > 0;
+	if (!hasContent && !hasToolCalls) return null;
+	return {
+		...record,
+		...hadArrayContent ? { content: filteredContent } : {},
+		...hadToolCalls ? { tool_calls: filteredToolCalls } : {}
+	};
 }
-function buildCodingContextMessage(messages) {
-	const recent = messages.slice(-CODING_CONTEXT_LOOKBACK);
-	const results = collectToolResults(recent);
-	const lines = [];
-	for (const message of recent) {
-		if (message.role !== "assistant") continue;
-		for (const call of extractToolCalls(message)) {
-			if (call.name !== "update_plan" && call.name !== "exec_command" && call.name !== "apply_patch") continue;
-			const details = extractResultDetails(call.id ? results.get(call.id) : void 0);
-			const line = call.name === "update_plan" ? summarizePlan(details ?? call.args) : call.name === "exec_command" ? summarizeCommand(call.args, details) : summarizePatch(details);
-			if (line) lines.push(line);
+/** Providers require every retained tool call and result to form an ordered pair. */
+function sanitizeToolPairs(messages) {
+	const callIndex = /* @__PURE__ */ new Map();
+	const resultIndex = /* @__PURE__ */ new Map();
+	for (let index = 0; index < messages.length; index += 1) {
+		const message = messages[index];
+		for (const id of toolCallIds(message)) if (!callIndex.has(id)) callIndex.set(id, index);
+		const role = String(message.role ?? "");
+		if (role === "tool" || role === "toolResult") {
+			const id = toolResultId(message);
+			if (id && !resultIndex.has(id)) resultIndex.set(id, index);
 		}
 	}
-	const uniqueLines = [...new Set(lines)].slice(-CODING_CONTEXT_MAX_LINES);
-	if (uniqueLines.length === 0) return null;
-	return {
-		role: "user",
-		content: [{
-			type: "text",
-			text: [
-				"<coding_context>",
-				...uniqueLines.map((line) => `- ${line}`),
-				"</coding_context>"
-			].join("\n")
-		}]
-	};
+	const pairedIds = /* @__PURE__ */ new Set();
+	for (const [id, callAt] of callIndex) {
+		const resultAt = resultIndex.get(id);
+		if (resultAt !== void 0 && resultAt > callAt) pairedIds.add(id);
+	}
+	const out = [];
+	for (const message of messages) {
+		const role = String(message.role ?? "");
+		if (role === "tool" || role === "toolResult") {
+			const id = toolResultId(message);
+			if (id && pairedIds.has(id)) out.push(message);
+			continue;
+		}
+		if (message.role === "assistant") {
+			const filtered = filterAssistantToolCalls(message, pairedIds);
+			if (filtered) out.push(filtered);
+			continue;
+		}
+		out.push(message);
+	}
+	return out;
 }
 /**
 * Normalize a JSON array from on-disk transcript into stored rows (drops unrecognized objects).
@@ -260,6 +212,10 @@ function transcriptRowsFromJsonArray(arr) {
 			out.push(x);
 			continue;
 		}
+		if (isTranscriptCompactionEntry(x)) {
+			out.push(x);
+			continue;
+		}
 		if (isTranscriptLabelEntry(x)) {
 			out.push(x);
 			continue;
@@ -276,8 +232,12 @@ function transcriptRowsFromJsonArray(arr) {
 function buildSessionContextForLlm(rows) {
 	const out = [];
 	for (const r of rows) {
+		if (isTranscriptCompactionEntry(r)) {
+			out.length = 0;
+			out.push(...r.messages);
+			continue;
+		}
 		if (isTranscriptContextEntry(r)) continue;
-		if (r.type === "compaction") continue;
 		if (isTranscriptBashExecutionEntry(r)) {
 			const msg = bashExecutionRowToLlmMessage(r);
 			if (msg) out.push(msg);
@@ -289,9 +249,7 @@ function buildSessionContextForLlm(rows) {
 		}
 		if (isLikelyAgentMessage(r)) out.push(r);
 	}
-	const codingContext = buildCodingContextMessage(out);
-	if (codingContext) out.push(codingContext);
-	return out;
+	return sanitizeToolPairs(out);
 }
 /** Visible chat messages only - no LLM-only audit/context expansion. */
 function buildSessionDisplayMessages(rows) {
@@ -326,4 +284,4 @@ function mergeLlmMessagesPreservingContextRows(prevRows, llmMessages) {
 	return out;
 }
 //#endregion
-export { buildSessionContextForLlm, buildSessionDisplayMessages, isTranscriptBashExecutionEntry, isTranscriptContextEntry, isTranscriptCustomMessageEntry, isTranscriptCustomStateEntry, isTranscriptLabelEntry, isTranscriptMetadataEntry, isTranscriptSummaryMessageEntry, mergeLlmMessagesPreservingContextRows, transcriptRowsFromJsonArray };
+export { buildSessionContextForLlm, buildSessionDisplayMessages, isRuntimeOnlyTranscriptMessage, isTranscriptBashExecutionEntry, isTranscriptCompactionEntry, isTranscriptContextEntry, isTranscriptCustomMessageEntry, isTranscriptCustomStateEntry, isTranscriptLabelEntry, isTranscriptMetadataEntry, isTranscriptSummaryMessageEntry, mergeLlmMessagesPreservingContextRows, transcriptRowsFromJsonArray };

package/dist/src/session/store.d.ts

@@ -1,22 +1,39 @@
 import type { AgentMessage } from '@earendil-works/pi-agent-core';
+import type { Api, Model } from '@earendil-works/pi-ai/compat';
 import type { Config } from '../config/schema.js';
-import { type CompactionConfig, type CompactionResult } from '../agent/memory/compaction.js';
+import { type CompactionConfig, type CompactionExecutionOptions, type CompactionResult } from '../agent/memory/compaction.js';
 import { type WindowConfig } from '../agent/memory/window.js';
 import { type SessionMetadataSeed } from '../storage/sqlite/index.js';
 import type { XopcSessionTranscriptV1 } from './transcript-format.js';
 import { type TranscriptStoredRow, type XopcTranscriptContextEntry } from './session-context-for-llm.js';
-import type { SessionMetadata, SessionDetail, SessionListQuery, PaginatedResult, GlobalSessionStats, ExportFormat, CompactionCheckpointSummary, CompactionCheckpointDetail } from './types.js';
+import type { SessionMetadata, SessionDetail, SessionListQuery, PaginatedResult, GlobalSessionStats, ExportFormat, CompactionBoundarySummary } from './types.js';
 import { SessionStatus } from './types.js';
 import type { Message } from './types.js';
 import type { SessionTranscriptUpdate } from './transcript-events.js';
 export interface SessionStoreOptions {
     config: Config;
 }
+export interface SessionCompactionHooks {
+    before?: (event: {
+        sessionKey: string;
+        messageCount: number;
+        tokenCount: number;
+    }) => Promise<void> | void;
+    after?: (event: {
+        sessionKey: string;
+        messageCount: number;
+        tokenCount: number;
+        compactedCount: number;
+    }) => Promise<void> | void;
+}
 export declare class SessionStore {
     private options;
     private window;
     private compactor;
+    private compactionHooks;
     constructor(options: SessionStoreOptions, windowConfig?: Partial<WindowConfig>, compactionConfig?: Partial<CompactionConfig>);
+    setCompactionHooks(hooks: SessionCompactionHooks): void;
+    private runCompactionHook;
     private resolveWorkspaceCwd;
     private runStoreMutation;
     initialize(): Promise<void>;
@@ -60,6 +77,7 @@ export declare class SessionStore {
     } | null>;
     private buildSessionDetail;
     loadTranscriptRows(key: string): Promise<TranscriptStoredRow[]>;
+    loadTranscriptHistoryRows(key: string): Promise<TranscriptStoredRow[]>;
     getMetadata(key: string): Promise<SessionMetadata | null>;
     resolveKeyBySessionId(sessionId: string): Promise<string | null>;
     updateMetadata(key: string, updates: Partial<SessionMetadata>): Promise<void>;
@@ -109,6 +127,11 @@ export declare class SessionStore {
     saveMessages(key: string, messages: AgentMessage[], options?: {
         metadata?: SessionMetadataSeed;
     }): Promise<void>;
+    deleteUserRound(key: string, userRoundIndex: number): Promise<{
+        deleted: number;
+        removedMessages: AgentMessage[];
+        remainingMessages: AgentMessage[];
+    } | null>;
     getWindowStats(messages: AgentMessage[]): {
         total: number;
         system: number;
@@ -117,31 +140,16 @@ export declare class SessionStore {
         tool: number;
         needsTrim: boolean;
     };
-    needsCompaction(key: string, messages: AgentMessage[], contextWindow: number): {
-        needed: boolean;
-        reason: string;
-        usagePercent?: number;
-    };
-    prepareCompaction(key: string, messages: AgentMessage[], contextWindow: number): {
-        needsCompaction: boolean;
-        messages: AgentMessage[];
-        stats: {
-            needed: boolean;
-            reason: string;
-            usagePercent?: number;
-        };
-    };
     applyCompaction(key: string, messages: AgentMessage[], result: CompactionResult): Promise<AgentMessage[]>;
-    compact(key: string, messages: AgentMessage[], contextWindow: number, instructions?: string, force?: boolean): Promise<CompactionResult>;
+    compact(key: string, messages: AgentMessage[], model: Model<Api>, instructions?: string, force?: boolean, executionOptions?: CompactionExecutionOptions): Promise<CompactionResult>;
     getCompactionStats(key: string): Promise<{
         compactionCount: number;
         totalTokensBefore: number;
         totalTokensAfter: number;
-        lastCompactionAt: any;
+        lastCompactionAt: string;
     }>;
-    listCompactionCheckpoints(key: string): Promise<CompactionCheckpointSummary[]>;
-    getCompactionCheckpointDetail(key: string, checkpointId: string): Promise<CompactionCheckpointDetail | null>;
-    restoreCompactionCheckpoint(key: string, checkpointId: string): Promise<void>;
+    listCompactionBoundaries(key: string): Promise<CompactionBoundarySummary[]>;
+    restoreBeforeCompactionBoundary(key: string, compactionId: string): Promise<void>;
     deleteSession(key: string): Promise<boolean>;
     load(key: string, options?: {
         fromArchive?: boolean;
@@ -168,9 +176,7 @@ export declare class SessionStore {
     estimateTokens(messages: AgentMessage[]): number;
     private loadDisplayMessages;
     private paginateDisplayMessages;
-    private displayMessageIdentity;
     private messageContent;
-    private isCompactionSummaryMessage;
     private extractTextContent;
     private injectPostCompactionContext;
     private convertMessages;