@lll9p/pi-better-compaction 0.5.0 → 0.6.1

package/README.md

@@ -2,11 +2,10 @@
 
 English | [中文](README.zh-CN.md)
 
-A [pi](https://github.com/nicepkg/pi) extension that upgrades context compaction with three coordinated strategies:
+A [pi](https://github.com/nicepkg/pi) extension that upgrades context compaction with two coordinated strategies:
 
-1. An optional **mid-run guard** aborts an oversized tool loop, waits for `agent_settled`, compacts once, then resumes with a hidden custom message.
-2. **OpenAI Responses APIs** use the provider's native compaction endpoint, preserving opaque context that plain text summaries lose.
-3. **All other APIs** (Anthropic, Gemini, etc.) can run pi's built-in compaction with a **dedicated cheaper/faster model**, so summarization doesn't consume quota on your primary model.
+1. **OpenAI Responses APIs** use the provider's native compaction endpoint, preserving opaque context that plain text summaries lose.
+2. **All other APIs** (Anthropic, Gemini, etc.) can run pi's built-in compaction with a **dedicated cheaper/faster model**, so summarization doesn't consume quota on your primary model.
 
 Everything fails open — if any step cannot proceed, pi's default compaction takes over.
 
@@ -45,10 +44,6 @@ If the file doesn't exist, all defaults apply. The extension never creates this
 ```jsonc
 {
   "enabled": true,
-  "midRun": {
-    "enabled": false,
-    "thresholdPercent": 80
-  },
   "compactionVersion": "v2",
   "compactionModel": null,
   "compactionThinkingLevel": "off",
@@ -70,8 +65,6 @@ If the file doesn't exist, all defaults apply. The extension never creates this
 | Option | Type | Default | Description |
 |--------|------|---------|-------------|
 | `enabled` | `boolean` | `true` | Master switch. Set `false` to disable the extension entirely. |
-| `midRun.enabled` | `boolean` | `false` | Enable the mid-run guard. It may abort a long tool loop once context reaches the configured threshold. |
-| `midRun.thresholdPercent` | `number` | `80` | Context usage percentage that triggers the mid-run guard after a tool-bearing turn. Must be greater than 0 and at most 100. |
 | `compactionVersion` | `"v1" \| "v2"` | `"v2"` | Protocol for Responses-family APIs. **V2** (streaming, encrypted blob) is the current OpenAI default. **V1** uses the legacy `/responses/compact` endpoint. |
 | `compactionModel` | `string \| null` | `null` | Model for fallback compaction (non-Responses APIs, or when native compact fails). Format: `"provider/model-id"`, e.g. `"openai/gpt-5.1-mini"`. `null` = let pi use the current chat model. |
 | `compactionThinkingLevel` | `string` | `"off"` | Thinking level for the fallback compaction model. One of: `off`, `minimal`, `low`, `medium`, `high`, `xhigh`, `max`. |
@@ -84,17 +77,6 @@ If the file doesn't exist, all defaults apply. The extension never creates this
 | `redactSensitiveData` | `boolean` | `true` | Redact secrets in debug artifacts. |
 | `artifactRoot` | `string` | `"~/.pi/agent/artifacts/pi-better-compaction"` | Root directory for debug artifacts. Supports `~/` and relative paths (resolved against config dir). |
 
-### Example: enable mid-run compaction
-
-```json
-{
-  "midRun": {
-    "enabled": true,
-    "thresholdPercent": 80
-  }
-}
-```
-
 ### Example: use a cheap model for fallback compaction
 
 ```json
@@ -114,8 +96,6 @@ If the file doesn't exist, all defaults apply. The extension never creates this
 
 ## How it works
 
-With `midRun.enabled`, a completed tool-bearing `turn_end` above the threshold only calls `ctx.abort()`. After Pi emits `agent_settled`, the guard reuses any compaction Pi already completed during abort handling; otherwise it calls `ctx.compact()` exactly once. A successful or coalesced compaction triggers the next turn with a hidden custom message. Failed compaction does not resume, preventing a compact-fail-resume loop.
-
 When pi triggers compaction (`session_before_compact`):
 
 1. **Responses API detected** → run native compaction (V2 or V1 per config):

package/README.zh-CN.md

@@ -2,11 +2,10 @@
 
 [English](README.md) | 中文
 
-一个 [pi](https://github.com/nicepkg/pi) 扩展，通过三条协同策略提升上下文压缩效果：
+一个 [pi](https://github.com/nicepkg/pi) 扩展，通过两条协同策略提升上下文压缩效果：
 
-1. 可选的 **mid-run guard** 在工具循环占满上下文时先中止运行，等待 `agent_settled` 后只压缩一次，再通过隐藏消息继续任务。
-2. **OpenAI Responses 系列 API** 使用提供商原生压缩端点，保留纯文本摘要无法留存的不透明上下文。
-3. **其他所有 API**（Anthropic、Gemini 等）可用一个**独立的低成本模型**执行 pi 内置压缩，避免在主模型上消耗额度。
+1. **OpenAI Responses 系列 API** 使用提供商原生压缩端点，保留纯文本摘要无法留存的不透明上下文。
+2. **其他所有 API**（Anthropic、Gemini 等）可用一个**独立的低成本模型**执行 pi 内置压缩，避免在主模型上消耗额度。
 
 所有环节都安全降级——任何步骤无法执行时，pi 的默认压缩自动接管。
 
@@ -45,10 +44,6 @@ cd pi-better-compaction && pi install .
 ```jsonc
 {
   "enabled": true,
-  "midRun": {
-    "enabled": false,
-    "thresholdPercent": 80
-  },
   "compactionVersion": "v2",
   "compactionModel": null,
   "compactionThinkingLevel": "off",
@@ -70,8 +65,6 @@ cd pi-better-compaction && pi install .
 | 选项 | 类型 | 默认值 | 说明 |
 |------|------|--------|------|
 | `enabled` | `boolean` | `true` | 总开关。设为 `false` 完全禁用扩展。 |
-| `midRun.enabled` | `boolean` | `false` | 启用 mid-run guard。上下文达到阈值后，它可能主动中止长工具循环。 |
-| `midRun.thresholdPercent` | `number` | `80` | 工具型 turn 完成后触发 mid-run guard 的上下文占用百分比。必须大于 0 且不超过 100。 |
 | `compactionVersion` | `"v1" \| "v2"` | `"v2"` | Responses 系列 API 的压缩协议。**V2**（流式，加密 blob）是 OpenAI 当前默认协议；**V1** 使用旧版 `/responses/compact` 端点。 |
 | `compactionModel` | `string \| null` | `null` | 回退压缩使用的模型（用于非 Responses API，或原生压缩失败时）。格式：`"provider/model-id"`，如 `"openai/gpt-5.1-mini"`。`null` = 由 pi 使用当前对话模型。 |
 | `compactionThinkingLevel` | `string` | `"off"` | 回退压缩模型的思考级别。可选：`off`、`minimal`、`low`、`medium`、`high`、`xhigh`、`max`。 |
@@ -84,17 +77,6 @@ cd pi-better-compaction && pi install .
 | `redactSensitiveData` | `boolean` | `true` | 在调试文件中脱敏。 |
 | `artifactRoot` | `string` | `"~/.pi/agent/artifacts/pi-better-compaction"` | 调试文件根目录。支持 `~/` 和相对路径（相对于配置文件目录解析）。 |
 
-### 示例：启用 mid-run 压缩
-
-```json
-{
-  "midRun": {
-    "enabled": true,
-    "thresholdPercent": 80
-  }
-}
-```
-
 ### 示例：使用低成本模型做回退压缩
 
 ```json
@@ -114,8 +96,6 @@ cd pi-better-compaction && pi install .
 
 ## 工作原理
 
-启用 `midRun.enabled` 后，超过阈值的工具型 `turn_end` 只调用 `ctx.abort()`。Pi 发出 `agent_settled` 后，guard 会复用 abort 收尾阶段已经完成的压缩；如果没有，则只调用一次 `ctx.compact()`。压缩成功或竞争合并后，通过隐藏 custom message 触发下一轮。压缩失败时不会自动继续，避免进入“压缩失败—继续—再次失败”的循环。
-
 pi 触发压缩时（`session_before_compact`）：
 
 1. **检测到 Responses API** → 执行原生压缩（根据配置选择 V2 或 V1）：

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lll9p/pi-better-compaction",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "type": "module",
   "description": "Better compaction for pi: native /responses/compact replay for OpenAI Responses APIs, plus a configurable compaction model driving pi's native summarization everywhere else.",
   "author": "Lilin Lao",
@@ -38,7 +38,6 @@
     "src/debug.ts",
     "src/details-store.ts",
     "src/extension-runtime.ts",
-    "src/midrun.ts",
     "src/native-fallback.ts",
     "src/payload-rewrite.ts",
     "src/request-context-cache.ts",

package/src/compact-client-v2.ts

@@ -308,6 +308,7 @@ export async function executeV2Compaction(
 	const requestBody = {
 		...request,
 		input: [...request.input, { type: "compaction_trigger" }],
+		store: false,
 		stream: true,
 	};
 

package/src/config.ts

@@ -128,7 +128,6 @@ export function loadExtensionConfig(configPath: string = CONFIG_PATH): LoadedExt
 	const warnings: string[] = [];
 	const resolved: ExtensionConfig = {
 		...DEFAULT_EXTENSION_CONFIG,
-		midRun: { ...DEFAULT_EXTENSION_CONFIG.midRun },
 		responsesCompactApis: [...DEFAULT_EXTENSION_CONFIG.responsesCompactApis],
 	};
 	let source: string | undefined;
@@ -139,18 +138,6 @@ export function loadExtensionConfig(configPath: string = CONFIG_PATH): LoadedExt
 
 		resolved.enabled = toBoolean(raw.enabled, "enabled", warnings) ?? resolved.enabled;
 
-		if (raw.midRun === undefined) {
-			// Keep defaults.
-		} else if (isRecord(raw.midRun)) {
-			resolved.midRun.enabled =
-				toBoolean(raw.midRun.enabled, "midRun.enabled", warnings) ?? resolved.midRun.enabled;
-			resolved.midRun.thresholdPercent =
-				toThresholdPercent(raw.midRun.thresholdPercent, "midRun.thresholdPercent", warnings) ??
-				resolved.midRun.thresholdPercent;
-		} else {
-			warnings.push("Ignoring midRun: expected a JSON object.");
-		}
-
 		resolved.allowCompactionContinuityBreak =
 			toBoolean(raw.allowCompactionContinuityBreak, "allowCompactionContinuityBreak", warnings) ??
 			resolved.allowCompactionContinuityBreak;

package/src/extension-runtime.ts

@@ -10,7 +10,6 @@ import { executeV2Compaction } from "./compact-client-v2";
 import { loadExtensionConfig } from "./config";
 import { writeDebugArtifact } from "./debug";
 import { resolveLatestNativeCompactionEntry } from "./details-store";
-import { registerMidRunGuard } from "./midrun";
 import { runNativeFallbackCompaction } from "./native-fallback";
 import {
 	rewriteResponsesPayloadWithNativeReplay,
@@ -672,8 +671,6 @@ export function registerExtensionRuntime(
 	pi: ExtensionAPI,
 	dependencies: ExtensionRuntimeDependencies = DEFAULT_DEPENDENCIES,
 ): void {
-	registerMidRunGuard(pi, dependencies.loadExtensionConfig);
-
 	pi.on("session_start", (_event, ctx) => {
 		const { config, source, warnings } = dependencies.loadExtensionConfig();
 		if (!config.enabled) return;

package/src/runtime.ts

@@ -201,7 +201,16 @@ export async function resolveNativeCompactionEnvironment(
 		};
 	}
 
-	const currentModel = ctx.model;
+	let sessionModel: RuntimeModel | undefined;
+	const branch = ctx.sessionManager.getBranch();
+	for (let index = branch.length - 1; index >= 0; index -= 1) {
+		const entry = branch[index];
+		if (entry?.type === "model_change") {
+			sessionModel = ctx.modelRegistry.find(entry.provider, entry.modelId);
+			break;
+		}
+	}
+	const currentModel = ctx.model ?? sessionModel;
 	const descriptor = getRuntimeModelDescriptor(currentModel);
 	if (!currentModel || !descriptor.provider || !descriptor.api || !descriptor.model) {
 		return {

package/src/types.ts

@@ -33,14 +33,8 @@ export type DebugArtifactKind =
 	| "compaction-event"
 	| "lifecycle";
 
-export type MidRunConfig = {
-	enabled: boolean;
-	thresholdPercent: number;
-};
-
 export type ExtensionConfig = {
 	enabled: boolean;
-	midRun: MidRunConfig;
 	/**
 	 * Allow a Responses session whose latest compaction was not created by this extension
 	 * to restart native compaction from Pi's current serialized session context.
@@ -310,10 +304,6 @@ export function createNativeCompactionResult(
 
 export const DEFAULT_EXTENSION_CONFIG: ExtensionConfig = {
 	enabled: true,
-	midRun: {
-		enabled: false,
-		thresholdPercent: 80,
-	},
 	allowCompactionContinuityBreak: false,
 	compactionModel: undefined,
 	compactionThinkingLevel: "off",

package/src/midrun.ts

@@ -1,229 +0,0 @@
-import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { loadExtensionConfig } from "./config";
-import { writeDebugArtifact } from "./debug";
-import { EXTENSION_ID, type LoadedExtensionConfig } from "./types";
-
-type MidRunPhase = "idle" | "abort-pending" | "compacting" | "resume-pending" | "failed";
-
-type MidRunState = {
-	phase: MidRunPhase;
-	generation: number;
-	sessionId?: string;
-	baselineCompactionId?: string;
-	triggerTokens?: number;
-	triggerPercent?: number;
-	triggerContextWindow?: number;
-};
-
-type ConfigLoader = () => LoadedExtensionConfig;
-
-const RESUME_CUSTOM_TYPE = "pi-better-compaction-midrun-resume";
-const RESUME_PROMPT = `[pi-better-compaction/midrun]
-Context compaction completed. Continue the interrupted task from the exact point where execution stopped.`;
-const MIDRUN_COMPACTION_INSTRUCTIONS =
-	"Preserve the active task, completed work, decisions, changed files, failures, current tool-loop state, and exact next steps so execution can resume immediately after compaction.";
-
-function getSessionId(ctx: ExtensionContext): string | undefined {
-	try {
-		return ctx.sessionManager.getSessionId();
-	} catch {
-		return undefined;
-	}
-}
-
-function getLatestCompactionId(ctx: ExtensionContext): string | undefined {
-	const branch = ctx.sessionManager.getBranch();
-	for (let index = branch.length - 1; index >= 0; index--) {
-		const entry = branch[index];
-		if (entry?.type === "compaction") return entry.id;
-	}
-	return undefined;
-}
-
-function resetState(state: MidRunState): void {
-	state.phase = "idle";
-	state.generation += 1;
-	state.sessionId = undefined;
-	state.baselineCompactionId = undefined;
-	state.triggerTokens = undefined;
-	state.triggerPercent = undefined;
-	state.triggerContextWindow = undefined;
-}
-
-function sameSession(state: MidRunState, ctx: ExtensionContext): boolean {
-	return state.sessionId !== undefined && state.sessionId === getSessionId(ctx);
-}
-
-function notifyFailure(ctx: ExtensionContext, message: string): void {
-	if (ctx.hasUI) {
-		ctx.ui.notify(`${EXTENSION_ID}: ${message}`, "error");
-	}
-}
-
-function scheduleResume(
-	pi: ExtensionAPI,
-	ctx: ExtensionContext,
-	state: MidRunState,
-	generation: number,
-): void {
-	state.phase = "resume-pending";
-
-	setImmediate(() => {
-		if (
-			state.generation !== generation ||
-			state.phase !== "resume-pending" ||
-			!sameSession(state, ctx)
-		) {
-			return;
-		}
-
-		if (!ctx.isIdle() || ctx.hasPendingMessages()) {
-			resetState(state);
-			return;
-		}
-
-		resetState(state);
-		pi.sendMessage(
-			{
-				customType: RESUME_CUSTOM_TYPE,
-				content: RESUME_PROMPT,
-				display: false,
-				details: { source: "midrun-compaction" },
-			},
-			{ triggerTurn: true },
-		);
-	});
-}
-
-export function registerMidRunGuard(
-	pi: ExtensionAPI,
-	loadConfig: ConfigLoader = loadExtensionConfig,
-): void {
-	const state: MidRunState = { phase: "idle", generation: 0 };
-
-	pi.on("turn_end", (event, ctx) => {
-		const { config } = loadConfig();
-		if (!config.enabled || !config.midRun.enabled || state.phase !== "idle") return;
-		if (event.toolResults.length === 0 || ctx.hasPendingMessages()) return;
-
-		const usage = ctx.getContextUsage();
-		if (!usage || usage.tokens == null || usage.percent == null) return;
-		if (usage.percent < config.midRun.thresholdPercent) return;
-
-		const sessionId = getSessionId(ctx);
-		if (!sessionId) return;
-
-		state.phase = "abort-pending";
-		state.generation += 1;
-		state.sessionId = sessionId;
-		state.baselineCompactionId = getLatestCompactionId(ctx);
-		state.triggerTokens = usage.tokens;
-		state.triggerPercent = usage.percent;
-		state.triggerContextWindow = usage.contextWindow;
-
-		writeDebugArtifact(
-			"lifecycle",
-			{
-				event: "midrun.threshold",
-				turnIndex: event.turnIndex,
-				tokens: usage.tokens,
-				contextWindow: usage.contextWindow,
-				percent: usage.percent,
-				thresholdPercent: config.midRun.thresholdPercent,
-				baselineCompactionId: state.baselineCompactionId,
-			},
-			config,
-			ctx,
-		);
-
-		// Never compact while the agent run is active; let Pi settle first.
-		ctx.abort();
-	});
-
-	pi.on("agent_settled", (_event, ctx) => {
-		if (state.phase !== "abort-pending") return;
-		if (!sameSession(state, ctx)) {
-			resetState(state);
-			return;
-		}
-
-		// An earlier agent_settled handler may already have started or queued another run.
-		if (!ctx.isIdle() || ctx.hasPendingMessages()) {
-			resetState(state);
-			return;
-		}
-
-		const generation = state.generation;
-		const latestCompactionId = getLatestCompactionId(ctx);
-		if (latestCompactionId !== state.baselineCompactionId) {
-			const { config } = loadConfig();
-			writeDebugArtifact(
-				"lifecycle",
-				{
-					event: "midrun.coalesced",
-					reason: "compaction-already-occurred-during-abort",
-					baselineCompactionId: state.baselineCompactionId,
-					latestCompactionId,
-				},
-				config,
-				ctx,
-			);
-			scheduleResume(pi, ctx, state, generation);
-			return;
-		}
-
-		const { config } = loadConfig();
-		if (!config.enabled || !config.midRun.enabled) {
-			scheduleResume(pi, ctx, state, generation);
-			return;
-		}
-
-		const usage = ctx.getContextUsage();
-		if (usage?.percent != null && usage.percent < config.midRun.thresholdPercent) {
-			scheduleResume(pi, ctx, state, generation);
-			return;
-		}
-
-		state.phase = "compacting";
-		ctx.compact({
-			customInstructions: MIDRUN_COMPACTION_INSTRUCTIONS,
-			onComplete: () => {
-				if (
-					state.generation !== generation ||
-					state.phase !== "compacting" ||
-					!sameSession(state, ctx)
-				) {
-					return;
-				}
-				scheduleResume(pi, ctx, state, generation);
-			},
-			onError: (error) => {
-				if (state.generation !== generation || !sameSession(state, ctx)) return;
-
-				const latest = getLatestCompactionId(ctx);
-				if (/Already compacted/i.test(error.message) && latest !== state.baselineCompactionId) {
-					scheduleResume(pi, ctx, state, generation);
-					return;
-				}
-
-				state.phase = "failed";
-				writeDebugArtifact(
-					"lifecycle",
-					{
-						event: "midrun.failed",
-						errorMessage: error.message,
-						triggerTokens: state.triggerTokens,
-						triggerPercent: state.triggerPercent,
-						triggerContextWindow: state.triggerContextWindow,
-					},
-					config,
-					ctx,
-				);
-				notifyFailure(ctx, `mid-run compaction failed: ${error.message}`);
-			},
-		});
-	});
-
-	pi.on("session_start", () => resetState(state));
-	pi.on("session_shutdown", () => resetState(state));
-}