@xopcai/xopc 0.0.170 → 0.0.172

package/dist/src/knowledge/types.d.ts

@@ -8,6 +8,7 @@ export type KnowledgeChangeKind = 'added' | 'modified' | 'deleted';
 export interface KnowledgeSourceItem {
     id: string;
     sourceInstanceId: string;
+    collectionScope: string;
     externalId: string;
     itemType: string;
     authorRole?: KnowledgeAuthorRole;
@@ -42,6 +43,7 @@ export interface KnowledgeSourceChange {
 export interface KnowledgeSourceItemInput {
     id?: string;
     sourceInstanceId: string;
+    collectionScope: string;
     externalId: string;
     itemType: string;
     authorRole?: KnowledgeAuthorRole;
@@ -73,6 +75,7 @@ export interface KnowledgeSyncRun {
 }
 export interface KnowledgePullInput {
     instanceId: string;
+    collectionScope: string;
     cursor?: string;
     windowStart?: string;
     signal: AbortSignal;

package/dist/src/providers/xopc-cloud-account-service.d.ts

@@ -0,0 +1,40 @@
+import { z } from 'zod';
+import { type CredentialResolver } from '../auth/credentials.js';
+declare const accountSummarySchema: z.ZodObject<{
+    balance: z.ZodObject<{
+        credits: z.ZodNumber;
+        updatedAt: z.ZodString;
+    }, z.core.$strip>;
+    usage: z.ZodObject<{
+        days: z.ZodUnion<readonly [z.ZodLiteral<1>, z.ZodLiteral<7>, z.ZodLiteral<30>]>;
+        requests: z.ZodNumber;
+        inputTokens: z.ZodNumber;
+        outputTokens: z.ZodNumber;
+        totalTokens: z.ZodNumber;
+        errors: z.ZodNumber;
+        averageLatencyMs: z.ZodNumber;
+        chargedCredits: z.ZodNumber;
+    }, z.core.$strip>;
+    links: z.ZodObject<{
+        details: z.ZodString;
+        purchase: z.ZodString;
+    }, z.core.$strip>;
+}, z.core.$strip>;
+export type XopcCloudAccountSummary = z.infer<typeof accountSummarySchema>;
+export declare class XopcCloudAccountError extends Error {
+    readonly status: number;
+    readonly code?: string;
+    constructor(message: string, status: number, code?: string);
+}
+export declare class XopcCloudAccountService {
+    private readonly fetchImpl;
+    private readonly routerUrl;
+    private readonly credentials;
+    constructor(options?: {
+        fetchImpl?: typeof fetch;
+        routerUrl?: string;
+        credentials?: Pick<CredentialResolver, 'resolveApiKey'>;
+    });
+    getSummary(days?: 1 | 7 | 30): Promise<XopcCloudAccountSummary | null>;
+}
+export {};

package/dist/src/providers/xopc-cloud-account-service.js

@@ -0,0 +1,65 @@
+import { getCredentialResolver, init_credentials } from "../auth/credentials.js";
+import { z } from "zod";
+//#region src/providers/xopc-cloud-account-service.ts
+init_credentials();
+const DEFAULT_ROUTER_URL = "https://router.xopc.ai/v1";
+const accountSummarySchema = z.object({
+	balance: z.object({
+		credits: z.number().int().nonnegative(),
+		updatedAt: z.string().datetime()
+	}),
+	usage: z.object({
+		days: z.union([
+			z.literal(1),
+			z.literal(7),
+			z.literal(30)
+		]),
+		requests: z.number().int().nonnegative(),
+		inputTokens: z.number().int().nonnegative(),
+		outputTokens: z.number().int().nonnegative(),
+		totalTokens: z.number().int().nonnegative(),
+		errors: z.number().int().nonnegative(),
+		averageLatencyMs: z.number().nonnegative(),
+		chargedCredits: z.number().int().nonnegative()
+	}),
+	links: z.object({
+		details: z.string().url(),
+		purchase: z.string().url()
+	})
+});
+var XopcCloudAccountError = class extends Error {
+	constructor(message, status, code) {
+		super(message);
+		this.status = status;
+		this.code = code;
+		this.name = "XopcCloudAccountError";
+	}
+};
+var XopcCloudAccountService = class {
+	fetchImpl;
+	routerUrl;
+	credentials;
+	constructor(options = {}) {
+		this.fetchImpl = options.fetchImpl ?? fetch;
+		this.routerUrl = (options.routerUrl ?? process.env.XOPC_MODEL_ROUTER_URL ?? DEFAULT_ROUTER_URL).replace(/\/+$/, "");
+		this.credentials = options.credentials ?? getCredentialResolver();
+	}
+	async getSummary(days = 7) {
+		const accessToken = await this.credentials.resolveApiKey("xopc-cloud");
+		if (!accessToken) return null;
+		const response = await this.fetchImpl(`${this.routerUrl}/account/summary?days=${days}`, {
+			headers: {
+				authorization: `Bearer ${accessToken}`,
+				accept: "application/json"
+			},
+			signal: AbortSignal.timeout(3e4)
+		});
+		const body = await response.json().catch(() => null);
+		if (!response.ok) throw new XopcCloudAccountError(typeof body?.error?.message === "string" ? body.error.message : `XOPC account summary failed (${response.status})`, response.status, typeof body?.error?.code === "string" ? body.error.code : void 0);
+		const parsed = accountSummarySchema.safeParse(body);
+		if (!parsed.success) throw new XopcCloudAccountError("XOPC account summary returned an invalid response", response.status, "invalid_response");
+		return parsed.data;
+	}
+};
+//#endregion
+export { XopcCloudAccountError, XopcCloudAccountService };

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

@@ -6,8 +6,7 @@ export { SessionConfigStore, resolveThinkingLevel, resolveReasoningLevel, resolv
 export { resolveEffectiveThinkingLevel, resolveEffectiveReasoningLevel } from './thinking-resolve.js';
 export type { SessionAgentConfig } from './config-types.js';
 export { normalizeWorkingDirectoryInput, effectiveWorkspacePathForSession, projectWorkspacePath, } from './session-workspace.js';
-export { SessionStatus, type SessionMetadata, type SessionDetail, type SessionListQuery, type PaginatedResult, type SessionStats, type ExportFormat, type SessionExport, type SessionTranscriptSummary, type CompactionCheckpointSummary, type CompactionCheckpointDetail, } from './types.js';
-export { normalizeCompactionCheckpointId } from './compaction-checkpoints.js';
+export { SessionStatus, type SessionMetadata, type SessionDetail, type SessionListQuery, type PaginatedResult, type SessionStats, type ExportFormat, type SessionExport, type SessionTranscriptSummary, type CompactionBoundarySummary, } from './types.js';
 export { shouldSkipWebchatInboundByAbortCutoff } from './abort-cutoff.js';
 export { DEFAULT_RESET_AT_HOUR, DEFAULT_RESET_MODE, DEFAULT_IDLE_MINUTES, evaluateSessionFreshness, resolveDailyResetAtMs, resolveSessionResetPolicy, type SessionFreshness, type SessionResetConfig, type SessionResetMode, type SessionResetPolicy, type SessionResetType, } from './reset-policy.js';
 export { resolveChannelResetConfig, resolveSessionResetType, } from './reset-type.js';

package/dist/src/session/index.js

@@ -3,7 +3,6 @@ import { buildSessionContextForLlm, isTranscriptContextEntry, mergeLlmMessagesPr
 import { effectiveWorkspacePathForSession, normalizeWorkingDirectoryInput, projectWorkspacePath } from "./session-workspace.js";
 import { emitSessionTranscriptUpdate, onSessionTranscriptUpdate } from "./transcript-events.js";
 import { fallbackTitleFromMessages, generateSessionTitleFromMessages, getSessionTitleSource, isWebchatSessionKey, maybeRefineSessionTitleWithLlm, maybeSetProvisionalSessionTitle, provisionalTitleFromUserText, sanitizeGeneratedSessionTitle, sanitizeSessionTitle, shouldAutoTitleSessionKey, shouldRefineSessionTitleWithLlm } from "./session-title.js";
-import { normalizeCompactionCheckpointId } from "./compaction-checkpoints.js";
 import { flattenMessageContent, messagesToClientHistory } from "./client-history.js";
 import { SessionStore } from "./store.js";
 import { applySessionPatchToMetadata } from "./patch-metadata.js";
@@ -18,4 +17,4 @@ import { resolveSession, resolveSessionKeyForRequest } from "./resolve-session.j
 import { DEFAULT_RESET_TRIGGERS, RESET_OVERLAP_COMMANDS, bareResetAckMessage, matchResetTriggers, resolveResetTriggers, shouldSkipResetOverlapCommand, stripLeadingEnvelopeTimestamp } from "./reset-triggers.js";
 import { initSessionTurn } from "./init-session-turn.js";
 import { CURRENT_SESSION_TRANSCRIPT_VERSION, XOPC_SESSION_TRANSCRIPT_TYPE } from "./transcript-format.js";
-export { CURRENT_SESSION_TRANSCRIPT_VERSION, DEFAULT_IDLE_MINUTES, DEFAULT_RESET_AT_HOUR, DEFAULT_RESET_MODE, DEFAULT_RESET_TRIGGERS, RESET_OVERLAP_COMMANDS, SessionConfigStore, SessionIndex, SessionStatus, SessionStore, XOPC_SESSION_TRANSCRIPT_TYPE, applySessionPatchToMetadata, bareResetAckMessage, buildSessionContextForLlm, effectiveWorkspacePathForSession, emitSessionTranscriptUpdate, evaluateSessionFreshness, fallbackTitleFromMessages, flattenMessageContent, generateSessionTitleFromMessages, getSessionTitleSource, initSessionTurn, isTranscriptContextEntry, isWebchatSessionKey, matchResetTriggers, maybeRefineSessionTitleWithLlm, maybeSetProvisionalSessionTitle, mergeLlmMessagesPreservingContextRows, messagesToClientHistory, normalizeCompactionCheckpointId, normalizeWorkingDirectoryInput, onSessionTranscriptUpdate, projectWorkspacePath, provisionalTitleFromUserText, resolveChannelResetConfig, resolveDailyResetAtMs, resolveEffectiveReasoningLevel, resolveEffectiveThinkingLevel, resolveReasoningLevel, resolveResetTriggers, resolveSession, resolveSessionKeyForRequest, resolveSessionLifecycleTimestamps, resolveSessionResetPolicy, resolveSessionResetType, resolveThinkingLevel, resolveVerboseLevel, sanitizeGeneratedSessionTitle, sanitizeSessionTitle, shouldAutoTitleSessionKey, shouldRefineSessionTitleWithLlm, shouldSkipResetOverlapCommand, shouldSkipWebchatInboundByAbortCutoff, stripLeadingEnvelopeTimestamp, transcriptRowsFromJsonArray };
+export { CURRENT_SESSION_TRANSCRIPT_VERSION, DEFAULT_IDLE_MINUTES, DEFAULT_RESET_AT_HOUR, DEFAULT_RESET_MODE, DEFAULT_RESET_TRIGGERS, RESET_OVERLAP_COMMANDS, SessionConfigStore, SessionIndex, SessionStatus, SessionStore, XOPC_SESSION_TRANSCRIPT_TYPE, applySessionPatchToMetadata, bareResetAckMessage, buildSessionContextForLlm, effectiveWorkspacePathForSession, emitSessionTranscriptUpdate, evaluateSessionFreshness, fallbackTitleFromMessages, flattenMessageContent, generateSessionTitleFromMessages, getSessionTitleSource, initSessionTurn, isTranscriptContextEntry, isWebchatSessionKey, matchResetTriggers, maybeRefineSessionTitleWithLlm, maybeSetProvisionalSessionTitle, mergeLlmMessagesPreservingContextRows, messagesToClientHistory, normalizeWorkingDirectoryInput, onSessionTranscriptUpdate, projectWorkspacePath, provisionalTitleFromUserText, resolveChannelResetConfig, resolveDailyResetAtMs, resolveEffectiveReasoningLevel, resolveEffectiveThinkingLevel, resolveReasoningLevel, resolveResetTriggers, resolveSession, resolveSessionKeyForRequest, resolveSessionLifecycleTimestamps, resolveSessionResetPolicy, resolveSessionResetType, resolveThinkingLevel, resolveVerboseLevel, sanitizeGeneratedSessionTitle, sanitizeSessionTitle, shouldAutoTitleSessionKey, shouldRefineSessionTitleWithLlm, shouldSkipResetOverlapCommand, shouldSkipWebchatInboundByAbortCutoff, stripLeadingEnvelopeTimestamp, transcriptRowsFromJsonArray };

package/dist/src/session/init-session-turn.d.ts

@@ -19,6 +19,5 @@ export type InitSessionTurnOptions = {
     sessionKey: string;
     body?: string;
     resetSession: SessionResetFn;
-    skipImplicitExpiry?: boolean;
 };
 export declare function initSessionTurn(opts: InitSessionTurnOptions): Promise<InitSessionTurnResult>;

package/dist/src/session/init-session-turn.js

@@ -50,8 +50,7 @@ async function initSessionTurn(opts) {
 		now,
 		policy: resetPolicy
 	}) : { fresh: false };
-	const skipImplicit = opts.skipImplicitExpiry ?? false;
-	const staleRollover = Boolean(sessionMetadata && !skipImplicit && !freshness.fresh);
+	const staleRollover = Boolean(sessionMetadata && resetPolicy.configured === true && !freshness.fresh);
 	const needsRollover = triggerMatch.resetTriggered || staleRollover;
 	let sessionId = sessionMetadata?.sessionId;
 	let previousSessionId;

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

@@ -1,9 +1,10 @@
 import EventEmitter from 'events';
+import type { Api, Model } from '@earendil-works/pi-ai/compat';
 import { SessionStore } from './store.js';
 import type { SessionMetadata, SessionDetail, SessionListQuery, PaginatedResult, GlobalSessionStats, ExportFormat, SessionStatus } from './types.js';
 import type { SessionMetadataSeed } from '../storage/sqlite/index.js';
 import type { Message } from './types.js';
-import type { CompactionConfig, CompactionResult } from '../agent/memory/compaction.js';
+import type { CompactionConfig, CompactionExecutionOptions, CompactionResult } from '../agent/memory/compaction.js';
 import type { XopcSessionTranscriptV1 } from './transcript-format.js';
 import type { XopcTranscriptContextEntry } from './session-context-for-llm.js';
 import { type SessionPatchBody } from './patch-metadata.js';
@@ -129,6 +130,11 @@ export declare class SessionIndex extends EventEmitter {
     saveMessages(key: string, messages: any[], options?: {
         metadata?: SessionMetadataSeed;
     }): Promise<void>;
+    deleteUserRound(key: string, userRoundIndex: number): Promise<{
+        deleted: number;
+        removedMessages: import("@earendil-works/pi-agent-core").AgentMessage[];
+        remainingMessages: import("@earendil-works/pi-agent-core").AgentMessage[];
+    }>;
     /**
      * Append `kind: 'context'` transcript row (persisted, excluded from {@link loadMessages} / LLM).
      */
@@ -172,29 +178,17 @@ export declare class SessionIndex extends EventEmitter {
         tool: number;
         needsTrim: boolean;
     };
-    /** Prepare compaction run */
-    prepareCompaction(key: string, messages: any[], contextWindow: number): {
-        needsCompaction: boolean;
-        messages: import("@earendil-works/pi-agent-core").AgentMessage[];
-        stats: {
-            needed: boolean;
-            reason: string;
-            usagePercent?: number;
-        };
-    };
     /** Compact session messages */
-    compact(key: string, messages: any[], contextWindow: number, instructions?: string, force?: boolean): Promise<CompactionResult>;
+    compact(key: string, messages: any[], model: Model<Api>, instructions?: string, force?: boolean, executionOptions?: CompactionExecutionOptions): Promise<CompactionResult>;
     /** Compaction stats for a session */
     getCompactionStats(key: string): Promise<{
         compactionCount: number;
         totalTokensBefore: number;
         totalTokensAfter: number;
-        lastCompactionAt: any;
+        lastCompactionAt: string;
     }>;
-    /** List pre-compaction transcript snapshots (newest first). */
-    listCompactionCheckpoints(key: string): Promise<import("./types.js").CompactionCheckpointSummary[]>;
-    getCompactionCheckpointDetail(key: string, checkpointId: string): Promise<import("./types.js").CompactionCheckpointDetail>;
-    restoreCompactionCheckpoint(key: string, checkpointId: string): Promise<void>;
+    listCompactionBoundaries(key: string): Promise<import("./types.js").CompactionBoundarySummary[]>;
+    restoreBeforeCompactionBoundary(key: string, compactionId: string): Promise<void>;
     /** Estimate token usage for messages */
     estimateTokenUsage(key: string, messages: any[]): Promise<number>;
 }

package/dist/src/session/manager.js

@@ -224,6 +224,11 @@ var SessionIndex = class extends EventEmitter$1 {
 	async saveMessages(key, messages, options) {
 		return this.store.saveMessages(key, messages, options);
 	}
+	async deleteUserRound(key, userRoundIndex) {
+		const result = await this.store.deleteUserRound(key, userRoundIndex);
+		if (result) this.emit("sessionUpdated", { key });
+		return result;
+	}
 	/**
 	* Append `kind: 'context'` transcript row (persisted, excluded from {@link loadMessages} / LLM).
 	*/
@@ -261,27 +266,19 @@ var SessionIndex = class extends EventEmitter$1 {
 	getWindowStats(messages) {
 		return this.store.getWindowStats(messages);
 	}
-	/** Prepare compaction run */
-	prepareCompaction(key, messages, contextWindow) {
-		return this.store.prepareCompaction(key, messages, contextWindow);
-	}
 	/** Compact session messages */
-	compact(key, messages, contextWindow, instructions, force) {
-		return this.store.compact(key, messages, contextWindow, instructions, force);
+	compact(key, messages, model, instructions, force, executionOptions) {
+		return this.store.compact(key, messages, model, instructions, force, executionOptions);
 	}
 	/** Compaction stats for a session */
 	async getCompactionStats(key) {
 		return this.store.getCompactionStats(key);
 	}
-	/** List pre-compaction transcript snapshots (newest first). */
-	listCompactionCheckpoints(key) {
-		return this.store.listCompactionCheckpoints(key);
-	}
-	getCompactionCheckpointDetail(key, checkpointId) {
-		return this.store.getCompactionCheckpointDetail(key, checkpointId);
+	listCompactionBoundaries(key) {
+		return this.store.listCompactionBoundaries(key);
 	}
-	restoreCompactionCheckpoint(key, checkpointId) {
-		return this.store.restoreCompactionCheckpoint(key, checkpointId);
+	restoreBeforeCompactionBoundary(key, compactionId) {
+		return this.store.restoreBeforeCompactionBoundary(key, compactionId);
 	}
 	/** Estimate token usage for messages */
 	async estimateTokenUsage(key, messages) {

package/dist/src/session/session-context-for-llm.d.ts

@@ -68,6 +68,21 @@ export interface XopcTranscriptCompactionSummaryEntry {
     tokensBefore?: number;
     timestamp?: string | number;
 }
+/** Append-only compaction boundary containing the exact LLM context at that point. */
+export interface XopcTranscriptCompactionEntry {
+    type: 'compaction';
+    at: string;
+    baseSeq: number;
+    plannerVersion: number;
+    summaryModelRef: string;
+    qualityAudit: 'passed' | 'disabled';
+    summary: string;
+    messages: AgentMessage[];
+    firstKeptIndex: number;
+    tokensBefore: number;
+    tokensAfter: number;
+    restoredFromCompactionId?: string;
+}
 /** Persisted label change for a transcript entry. */
 export interface XopcTranscriptLabelEntry {
     type: 'label';
@@ -102,14 +117,17 @@ export interface XopcTranscriptSessionInfoEntry {
     name?: string;
     timestamp?: string | number;
 }
-export type TranscriptStoredRow = AgentMessage | XopcTranscriptContextEntry | XopcTranscriptBashExecutionEntry | XopcTranscriptCustomMessageEntry | XopcTranscriptCustomMessageFileEntry | XopcTranscriptCustomStateEntry | XopcTranscriptBranchSummaryEntry | XopcTranscriptCompactionSummaryEntry | XopcTranscriptLabelEntry | XopcTranscriptThinkingLevelChangeEntry | XopcTranscriptModelChangeEntry | XopcTranscriptSessionInfoEntry;
+export type TranscriptStoredRow = AgentMessage | XopcTranscriptContextEntry | XopcTranscriptBashExecutionEntry | XopcTranscriptCustomMessageEntry | XopcTranscriptCustomMessageFileEntry | XopcTranscriptCustomStateEntry | XopcTranscriptBranchSummaryEntry | XopcTranscriptCompactionSummaryEntry | XopcTranscriptCompactionEntry | XopcTranscriptLabelEntry | XopcTranscriptThinkingLevelChangeEntry | XopcTranscriptModelChangeEntry | XopcTranscriptSessionInfoEntry;
 export declare function isTranscriptContextEntry(x: unknown): x is XopcTranscriptContextEntry;
 export declare function isTranscriptBashExecutionEntry(x: unknown): x is XopcTranscriptBashExecutionEntry;
 export declare function isTranscriptCustomMessageEntry(x: unknown): x is XopcTranscriptCustomMessageEntry | XopcTranscriptCustomMessageFileEntry;
 export declare function isTranscriptCustomStateEntry(x: unknown): x is XopcTranscriptCustomStateEntry;
 export declare function isTranscriptSummaryMessageEntry(x: unknown): x is XopcTranscriptBranchSummaryEntry | XopcTranscriptCompactionSummaryEntry;
+export declare function isTranscriptCompactionEntry(x: unknown): x is XopcTranscriptCompactionEntry;
 export declare function isTranscriptLabelEntry(x: unknown): x is XopcTranscriptLabelEntry;
 export declare function isTranscriptMetadataEntry(x: unknown): x is XopcTranscriptThinkingLevelChangeEntry | XopcTranscriptModelChangeEntry | XopcTranscriptSessionInfoEntry;
+/** Runtime-derived messages are never authoritative transcript rows. */
+export declare function isRuntimeOnlyTranscriptMessage(x: unknown): boolean;
 /**
  * Normalize a JSON array from on-disk transcript into stored rows (drops unrecognized objects).
  */

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 };