@herbertgao/pi-extensions 2026.9.15 → 2026.9.17

package/README.md

@@ -29,6 +29,7 @@ The package bundles 6 active `@herbertgao/*` child packages—`pi-bark`, `pi-cc-
 - `pi-mcp-adapter@2.31.0`
 - `pi-typesafe@0.7.1`
 - `pi-multi-account@1.23.2`
+- `pi-next-cue@1.0.7`
 - `pi-footer@0.5.1`
 - `pi-jev-auto-mode@0.5.0`
 - `pi-lens@4.2.1`
@@ -49,6 +50,10 @@ Pi loads their extensions and skills through `node_modules/` paths inside one pa
 
 `pi-stash` is no longer bundled: `/btw` already preserves the main editor draft while handling side questions outside the main conversation. Prior `@herbertgao/pi-stash` releases remain available but are no longer maintained here.
 
+### Next-cue suggestions
+
+`pi-next-cue@1.0.7` predicts a short next prompt after each completed agent turn. In the empty editor, `Tab` fills the suggestion and `Enter` sends it. Each settled turn can make one extra model request using recent conversation text, recent tool names/results, and the configured active or explicitly selected model. It is TUI-only and wraps the prompt editor, so do not enable another custom-editor extension that also owns the editor slot.
+
 If `pi-footer` was installed separately before upgrading to an aggregate release that includes it, remove the standalone source shown by `pi list` so only the bundled copy loads. For the pinned standalone install used while preparing this integration:
 
 ```bash

package/THIRD_PARTY_NOTICES.md

@@ -186,3 +186,29 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+
+## `pi-next-cue`
+
+The aggregate bundles [`pi-next-cue`](https://github.com/ouzhenkun/pi-next-cue) version 1.0.7 under its original MIT license. The imported npm package corresponds to upstream commit [`015a595c6751d50889b3a6937ba4816dfe92adc1`](https://github.com/ouzhenkun/pi-next-cue/commit/015a595c6751d50889b3a6937ba4816dfe92adc1).
+
+MIT License
+
+Copyright (c) 2025 ouzhenkun
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

package/node_modules/@herbertgao/pi-cc-extensions/package.json

@@ -70,7 +70,7 @@
 	"x-upstream": {
 		"package": "pi-cc-extensions",
 		"version": "0.8.71",
-		"reviewedVersion": "0.9.2",
+		"reviewedVersion": "0.9.5",
 		"repository": "https://github.com/minuque/pi-cc-extensions",
 		"commit": "e43e0041b59f5d7f03be9b9d103a5f9e954e4c11"
 	}

package/node_modules/@herbertgao/sol-pi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herbertgao/sol-pi",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Token-efficient context and tool extensions for Pi, maintained from NVlabs/SoL-Pi.",
   "keywords": [
     "pi-package",

package/node_modules/@herbertgao/sol-pi/src/sol-pi/extensions/online-context-compact/extension.ts

@@ -49,7 +49,6 @@ export type OnlineContextCompactOptions = {
 type PendingBoundary = { readonly toolCallId: string };
 type SelectedCompaction = { readonly decision: CompactionDecision };
 type CacheDebt = { readonly debtTokens: number; readonly repaymentTokens: number };
-type PendingContinuation = { readonly promise: Promise<void>; readonly resolve: () => void };
 
 const SUBAGENTS_MANAGER_KEY = Symbol.for("pi-subagents:manager");
 
@@ -197,10 +196,6 @@ function restoreCompactionThinking(pi: ExtensionAPI, override: CompactionThinkin
 	}
 }
 
-function releaseParentContinuation(continuation: PendingContinuation | undefined): void {
-	if (continuation) setTimeout(continuation.resolve, 0);
-}
-
 export function createOnlineContextCompactExtension(options: OnlineContextCompactOptions = {}): ExtensionFactory {
 	const keepRecentTokens = resolveKeepRecentTokens(options.keepRecentTokens);
 	const cacheWriteReadRatio = resolveCacheWriteReadRatio(options.cacheWriteReadRatio);
@@ -212,17 +207,10 @@ export function createOnlineContextCompactExtension(options: OnlineContextCompac
 		let pendingBoundary: PendingBoundary | undefined;
 		let selected: SelectedCompaction | undefined;
 		let activeDebt: CacheDebt | undefined;
-		let nextContinuation: PendingContinuation | undefined;
 		let compactionInFlight = false;
 		let compactionThinkingOverride: CompactionThinkingOverride | undefined;
 
-		const releaseContinuation = (): void => {
-			const continuation = nextContinuation;
-			nextContinuation = undefined;
-			continuation?.resolve();
-		};
 		const restore = (context: ExtensionContext): void => {
-			releaseContinuation();
 			state = restoreOnlineState(context.sessionManager.getBranch());
 			restored = true;
 			observedMessages = buildSessionContext(
@@ -358,21 +346,13 @@ export function createOnlineContextCompactExtension(options: OnlineContextCompac
 		});
 
 		pi.on("agent_settled", async (_event, context) => {
-			// sendMessage() starts a turn without returning its promise. Capture the
-			// child settlement so print/JSON mode cannot dispose while it is running.
-			const parentContinuation = nextContinuation;
-			nextContinuation = undefined;
 			const pending = selected;
 			selected = undefined;
 			if (!context.isIdle()) {
 				selected = pending;
-				nextContinuation = parentContinuation;
-				return;
-			}
-			if (!pending || hasRunningSubagents()) {
-				releaseParentContinuation(parentContinuation);
 				return;
 			}
+			if (!pending || hasRunningSubagents()) return;
 
 			activeDebt = {
 				debtTokens: pending.decision.writeTokens * (pending.decision.incrementalCacheCostRatio ?? 0),
@@ -428,43 +408,22 @@ export function createOnlineContextCompactExtension(options: OnlineContextCompac
 				}
 
 				if (compacted) {
-					let resolveContinuation!: () => void;
-					const continuation: PendingContinuation = {
-						promise: new Promise<void>((resolve) => {
-							resolveContinuation = resolve;
-						}),
-						resolve: () => resolveContinuation(),
-					};
-					nextContinuation = continuation;
-					try {
-						pi.sendMessage(
-							{
-								customType: "sol-pi-online-context-compact",
-								content: POST_COMPACTION_PLAN_REMINDER,
-								display: false,
-							},
-							{ triggerTurn: true },
-						);
-					} catch (error) {
-						if (nextContinuation === continuation) nextContinuation = undefined;
-						continuation.resolve();
-						throw error;
-					}
-					// triggerTurn starts on the next event-loop turn; checking immediately is racy.
-					await new Promise<void>((resolve) => setTimeout(resolve, 0));
-					if (context.isIdle() && nextContinuation === continuation) {
-						nextContinuation = undefined;
-						continuation.resolve();
-						throw new Error("Online context compact continuation did not start");
-					}
-					await continuation.promise;
+					// Pi >=0.87 defers this turn until agent_settled handlers finish and
+					// awaits it before prompt() resolves, so print/JSON mode stays alive.
+					pi.sendMessage(
+						{
+							customType: "sol-pi-online-context-compact",
+							content: POST_COMPACTION_PLAN_REMINDER,
+							display: false,
+						},
+						{ triggerTurn: true },
+					);
 				}
 			} finally {
 				restoreCompactionThinking(pi, compactionThinkingOverride);
 				compactionThinkingOverride = undefined;
 				compactionInFlight = false;
 				activeDebt = undefined;
-				releaseParentContinuation(parentContinuation);
 			}
 		});
 
@@ -487,7 +446,6 @@ export function createOnlineContextCompactExtension(options: OnlineContextCompac
 		pi.on("session_shutdown", () => {
 			restoreCompactionThinking(pi, compactionThinkingOverride);
 			compactionThinkingOverride = undefined;
-			releaseContinuation();
 			pendingBoundary = undefined;
 			selected = undefined;
 			activeDebt = undefined;

package/node_modules/@narumitw/pi-btw/dist/index.ts

@@ -746,16 +746,17 @@ import {
 } from "@earendil-works/pi-tui";
 
 // src/settings.ts
-import { randomUUID } from "node:crypto";
+import { randomUUID as randomUUID2 } from "node:crypto";
 import { constants } from "node:fs";
 import { mkdir, open, rename, rm, writeFile } from "node:fs/promises";
 import { basename, dirname, join } from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
 
 // src/side-thread.ts
+import { randomUUID } from "node:crypto";
 var BTW_THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh", "max"];
 function createSideThread(conversationContext) {
-  return { conversationContext, turns: [] };
+  return { conversationContext, turns: [], routingSessionId: randomUUID() };
 }
 function buildSideThreadMessages(thread, question) {
   const answeredTurns = thread.turns.filter(
@@ -791,7 +792,7 @@ async function completeSideThreadTurn({
       { systemPrompt: SYSTEM_PROMPT, messages: buildSideThreadMessages(thread, question) },
       buildStreamOptions(
         auth,
-        { thinkingLevel, signal, model, sessionId },
+        { thinkingLevel, signal, model, sessionId, routingSessionId: thread.routingSessionId },
         completeSimple.appliesRequestHeaderTransforms === true
       )
     );
@@ -854,13 +855,16 @@ function mergeSessionHeaders(authHeaders, sessionHeaders) {
   if (!sessionHeaders && !authHeaders) return void 0;
   return { ...sessionHeaders, ...authHeaders };
 }
-function buildStreamOptions(auth, { thinkingLevel, signal, model, sessionId }, applyRequestHeaderTransforms) {
+function buildStreamOptions(auth, { thinkingLevel, signal, model, sessionId, routingSessionId }, applyRequestHeaderTransforms) {
   const sessionHeaders = model ? getOpencodeSessionHeaders(model, sessionId) : void 0;
   const options = {
     apiKey: auth?.apiKey,
     headers: applyRequestHeaderTransforms ? auth?.headers : mergeSessionHeaders(auth?.headers, sessionHeaders),
     env: auth?.env,
-    signal
+    signal,
+    // Pi documents sessionId as optional, but providers use it for request routing and
+    // some provider overrides require it. Pi core also mints a fresh ID for one-off requests.
+    sessionId: routingSessionId
   };
   if (applyRequestHeaderTransforms && sessionHeaders) {
     options.transformHeaders = (headers) => mergeSessionHeaders(headers, sessionHeaders) ?? {};
@@ -1059,7 +1063,7 @@ async function publishSettings(settingsPath, document, signal, beforeRename) {
   const directory = dirname(settingsPath);
   await mkdir(directory, { recursive: true });
   signal?.throwIfAborted();
-  const temporaryPath = join(directory, `.${basename(settingsPath)}.${process.pid}.${randomUUID()}.tmp`);
+  const temporaryPath = join(directory, `.${basename(settingsPath)}.${process.pid}.${randomUUID2()}.tmp`);
   try {
     await writeFile(temporaryPath, contents, {
       encoding: "utf8",
@@ -3138,6 +3142,8 @@ function sanitizeEntryForDisplay(entry) {
       return { ...entry, thinkingLevel: sanitizeSingleLine(entry.thinkingLevel) };
     case "custom":
       return { ...entry, customType: sanitizeSingleLine(entry.customType) };
+    case "context_edit":
+      return { ...entry, targetId: sanitizeSingleLine(entry.targetId) };
     case "label":
       return {
         ...entry,