pi-ui-extend 1.0.38 → 1.0.39

package/external/pi-tools-suite/src/dcp/pruner-nudge.ts

@@ -7,7 +7,7 @@ import type {
   NudgeThresholds,
 } from "./pruner-types.js";
 import { extractBlockId, messageText } from "./pruner-metadata.js";
-import { stableMessageId } from "./pruner-message-ids.js";
+import { stableMessageKeys } from "./pruner-message-ids.js";
 
 function coercePercentThreshold(value: number | string | undefined, fallback: number): number {
   if (typeof value === "number") return Number.isFinite(value) ? value : fallback;
@@ -56,6 +56,7 @@ function isRealAnchorCandidate(msg: any): boolean {
 }
 
 function findAnchorMessage(messages: any[]): { msg: any; index: number; stableId: string; timestamp: number; role: string } | null {
+  const stableKeys = stableMessageKeys(messages);
   // Prefer the latest real user message: it gives the reminder direct user-like
   // salience without creating a new synthetic message at the end of context.
   for (let i = messages.length - 1; i >= 0; i--) {
@@ -65,7 +66,7 @@ function findAnchorMessage(messages: any[]): { msg: any; index: number; stableId
     return {
       msg,
       index: i,
-      stableId: stableMessageId(msg, i),
+      stableId: stableKeys[i]!,
       timestamp: msg.timestamp,
       role: msg.role,
     };
@@ -79,7 +80,7 @@ function findAnchorMessage(messages: any[]): { msg: any; index: number; stableId
     return {
       msg,
       index: i,
-      stableId: stableMessageId(msg, i),
+      stableId: stableKeys[i]!,
       timestamp: msg.timestamp,
       role: msg.role,
     };
@@ -88,8 +89,8 @@ function findAnchorMessage(messages: any[]): { msg: any; index: number; stableId
   return null;
 }
 
-function anchorMatchesMessage(anchor: DcpNudgeAnchor, msg: any, index: number): boolean {
-  if (anchor.anchorStableId && stableMessageId(msg, index) === anchor.anchorStableId) return true;
+function anchorMatchesMessage(anchor: DcpNudgeAnchor, msg: any, stableKey: string): boolean {
+  if (anchor.anchorStableId && stableKey === anchor.anchorStableId) return true;
   return msg?.timestamp === anchor.anchorTimestamp;
 }
 
@@ -207,34 +208,33 @@ export function upsertNudgeAnchor(
   messages: any[],
   state: DcpState,
   type: DcpNudgeType,
-  options: { contextPercent?: number } = {},
+  options: { contextPercent?: number; renderedReminder?: string } = {},
 ): { anchor: DcpNudgeAnchor | null; created: boolean; updated: boolean } {
-  const target = findAnchorMessage(messages);
-  if (!target) {
-    // The caller will append one synthetic tail reminder. Drop persisted
-    // anchors first so applyAnchoredNudges cannot render a second reminder.
-    state.nudgeAnchors = [];
-    state.lastNudge = undefined;
-    return { anchor: null, created: false, updated: false };
-  }
-
-  const key = `${target.stableId}|${target.timestamp}`;
+  const stableKeys = stableMessageKeys(messages);
   let existing: DcpNudgeAnchor | null = null;
   for (const anchor of state.nudgeAnchors) {
-    const anchorKey = `${anchor.anchorStableId ?? ""}|${anchor.anchorTimestamp}`;
-    if (anchorKey !== key) continue;
+    const stillPresent = messages.some((message, index) =>
+      isRealAnchorCandidate(message) && anchorMatchesMessage(anchor, message, stableKeys[index]!),
+    );
+    if (!stillPresent) continue;
     if (!existing || isNewerAnchor(anchor, existing)) existing = anchor;
   }
 
   const now = Date.now();
   if (existing) {
-    // Older sidecars may contain several anchors. Keep only the anchor for the
-    // current target so every subsequent context pass has singleton state.
+    // Keep the original carrier and frozen text. Moving a reminder to the
+    // newest user message would remove bytes from an old provider-cache prefix.
     state.nudgeAnchors = [existing];
     const shouldUpgrade = typePriority(type) > typePriority(existing.type);
-    if (shouldUpgrade) existing.type = type;
-    existing.updatedAt = now;
-    existing.contextPercent = options.contextPercent ?? existing.contextPercent;
+    if (shouldUpgrade) {
+      existing.type = type;
+      existing.contextPercent = options.contextPercent ?? existing.contextPercent;
+      existing.renderedReminder = options.renderedReminder ?? existing.renderedReminder;
+      existing.updatedAt = now;
+    } else if (!existing.renderedReminder && options.renderedReminder) {
+      // One-time migration for anchors persisted before frozen rendering.
+      existing.renderedReminder = options.renderedReminder;
+    }
     state.lastNudge = {
       type: existing.type,
       anchorId: existing.id,
@@ -246,6 +246,15 @@ export function upsertNudgeAnchor(
     return { anchor: existing, created: false, updated: shouldUpgrade };
   }
 
+  const target = findAnchorMessage(messages);
+  if (!target) {
+    // The caller will append one synthetic tail reminder. Drop persisted
+    // anchors first so applyAnchoredNudges cannot render a second reminder.
+    state.nudgeAnchors = [];
+    state.lastNudge = undefined;
+    return { anchor: null, created: false, updated: false };
+  }
+
   const anchor: DcpNudgeAnchor = {
     id: state.nextNudgeAnchorId++,
     type,
@@ -254,6 +263,7 @@ export function upsertNudgeAnchor(
     anchorRole: target.role,
     turnIndex: state.currentTurn,
     contextPercent: options.contextPercent,
+    renderedReminder: options.renderedReminder,
     createdAt: now,
     updatedAt: now,
   };
@@ -275,12 +285,16 @@ export function applyAnchoredNudges(
   messages: any[],
   state: DcpState,
   render: (anchor: DcpNudgeAnchor) => string,
-): void {
-  if (state.nudgeAnchors.length === 0) return;
+): { rendered: boolean; stateChanged: boolean } {
+  if (state.nudgeAnchors.length === 0) return { rendered: false, stateChanged: false };
 
+  const stableKeys = stableMessageKeys(messages);
+  const priorAnchors = state.nudgeAnchors;
   let selected: { anchor: DcpNudgeAnchor; index: number } | null = null;
   for (const anchor of state.nudgeAnchors) {
-    const index = messages.findIndex((msg, messageIndex) => anchorMatchesMessage(anchor, msg, messageIndex));
+    const index = messages.findIndex((msg, messageIndex) =>
+      anchorMatchesMessage(anchor, msg, stableKeys[messageIndex]!),
+    );
     if (index === -1) continue;
     if (!selected || isNewerAnchor(anchor, selected.anchor)) {
       selected = { anchor, index };
@@ -290,7 +304,27 @@ export function applyAnchoredNudges(
   // Defensive migration for persisted pre-singleton state: render only the
   // newest valid anchor and discard every stale predecessor.
   state.nudgeAnchors = selected ? [selected.anchor] : [];
-  if (selected) appendTextToMessage(messages[selected.index], render(selected.anchor));
+  const anchorSetChanged = state.nudgeAnchors.length !== priorAnchors.length ||
+    state.nudgeAnchors.some((anchor, index) => anchor !== priorAnchors[index]);
+  if (!selected) return { rendered: false, stateChanged: anchorSetChanged };
+
+  const materializedReminder = selected.anchor.renderedReminder === undefined;
+  const reminder = selected.anchor.renderedReminder ?? render(selected.anchor);
+  if (materializedReminder) selected.anchor.renderedReminder = reminder;
+  const anchorMessage = messages[selected.index];
+  if (anchorMessage?.role === "assistant") {
+    messages.splice(selected.index + 1, 0, {
+      role: "user",
+      content: reminder,
+      timestamp: selected.anchor.createdAt,
+    });
+  } else {
+    appendTextToMessage(anchorMessage, reminder);
+  }
+  return {
+    rendered: true,
+    stateChanged: anchorSetChanged || materializedReminder,
+  };
 }
 
 export function clearDcpNudgeAnchors(state: DcpState): number {

package/external/pi-tools-suite/src/dcp/pruner.ts

@@ -1,7 +1,7 @@
 import type { DcpConfig } from "./config.js";
 import type { DcpState } from "./state.js";
 import { applyCompressionBlocks, repairOrphanedToolPairs, syncCompressionBlocks } from "./pruner-compression-blocks.js";
-import { stripStaleDcpMetadataFromAssistantMessage } from "./pruner-metadata.js";
+import { stripStaleDcpMetadataFromMessage } from "./pruner-metadata.js";
 import { injectMessageIds } from "./pruner-message-ids.js";
 import {
   applyAutoToolOutputPruning,
@@ -63,7 +63,7 @@ export function applyPruning(
         typeof contentBlock === "object" && contentBlock !== null ? { ...contentBlock } : contentBlock,
       );
     }
-    return stripStaleDcpMetadataFromAssistantMessage(clone);
+    return stripStaleDcpMetadataFromMessage(clone);
   });
 
   // 1. Count user turns → update state.currentTurn. Do this before inserting
@@ -79,21 +79,29 @@ export function applyPruning(
   // expansion logic could not catch (e.g. multi-block interactions, pre-broken state).
   repairOrphanedToolPairs(msgs);
 
-  // 3. Apply deduplication
-  applyDeduplication(msgs, state, config);
-
-  // 4. Apply error purging
-  applyErrorPurging(msgs, state, config);
-
-  // 5. Apply autonomous policy pruning for old/large/stale tool outputs
-  applyAutoToolOutputPruning(msgs, state, config);
+  // 3-5. Discover new automatic pruning decisions only at stable checkpoints.
+  // Rewriting an old result after every same-turn duplicate breaks provider
+  // continuation repeatedly. A new user turn or compression block already
+  // establishes a natural history boundary where one prefix rebuild is
+  // acceptable. Branches that move the turn count backwards also reopen the
+  // checkpoint instead of suppressing pruning indefinitely.
+  const newestBlockId = Math.max(0, state.nextBlockId - 1);
+  const automaticPruneCheckpoint =
+    state.currentTurn !== state.lastAutomaticPruneTurn ||
+    newestBlockId !== state.lastAutomaticPruneBlockId;
+  if (automaticPruneCheckpoint) {
+    applyDeduplication(msgs, state, config);
+    applyErrorPurging(msgs, state, config);
+    applyAutoToolOutputPruning(msgs, state, config);
+    state.lastAutomaticPruneTurn = state.currentTurn;
+    state.lastAutomaticPruneBlockId = newestBlockId;
+  }
 
   // 6. Apply explicit tool output pruning (prunedToolIds)
   applyToolOutputPruning(msgs, state);
 
-  // 7. Refresh message ID snapshots used by the compress tool. Markers are
-  // never injected into provider-visible content; the before_provider_request
-  // hook delivers the id map as a hidden control payload.
+  // 7. Refresh message ID snapshots and append stable distributed metadata to
+  // user/tool-result carriers. Assistant items remain byte-stable.
   injectMessageIds(msgs, state, { config });
 
   // 8. state.messageIdSnapshot/messageMetaSnapshot are already updated by injectMessageIds

package/external/pi-tools-suite/src/dcp/state.ts

@@ -119,6 +119,8 @@ export interface DcpNudgeAnchor {
   turnIndex: number
   /** Approximate context usage that triggered the reminder, as a 0-1 fraction. */
   contextPercent?: number
+  /** Frozen provider-visible reminder text for cache-stable reapplication. */
+  renderedReminder?: string
   /** Wall-clock creation time. */
   createdAt: number
   /** Wall-clock time of the latest re-application/update. */
@@ -166,6 +168,10 @@ export interface DcpState {
   messageIdSnapshot: Map<string, number>
   /** Extra metadata for the model-visible DCP message IDs in messageIdSnapshot. */
   messageMetaSnapshot: Map<string, MessageIdMeta>
+  /** Stable message identity → persistent model-visible mNNN assignment. */
+  messageIdsByStableId: Map<string, string>
+  /** Monotonic counter for persistent message IDs. */
+  nextMessageId: number
 
   // ── Turn tracking ──────────────────────────────────────────────────────────
   /**
@@ -174,6 +180,10 @@ export interface DcpState {
    * context array in the `context` event handler.
    */
   currentTurn: number
+  /** Last user-turn count at which automatic prune discovery ran. */
+  lastAutomaticPruneTurn: number
+  /** Highest created block ID at the last automatic-prune checkpoint. */
+  lastAutomaticPruneBlockId: number
 
   // ── Statistics ─────────────────────────────────────────────────────────────
   /** Running total of tokens estimated to have been saved by pruning/compression */
@@ -253,7 +263,11 @@ export function createState(): DcpState {
     nextBlockId: 1,
     messageIdSnapshot: new Map(),
     messageMetaSnapshot: new Map(),
+    messageIdsByStableId: new Map(),
+    nextMessageId: 1,
     currentTurn: 0,
+    lastAutomaticPruneTurn: -1,
+    lastAutomaticPruneBlockId: 0,
     tokensSaved: 0,
     totalPruneCount: 0,
     totalToolCallCount: 0,
@@ -285,7 +299,11 @@ export function resetState(state: DcpState): void {
   state.nextBlockId = 1
   state.messageIdSnapshot.clear()
   state.messageMetaSnapshot.clear()
+  state.messageIdsByStableId.clear()
+  state.nextMessageId = 1
   state.currentTurn = 0
+  state.lastAutomaticPruneTurn = -1
+  state.lastAutomaticPruneBlockId = 0
   state.tokensSaved = 0
   state.totalPruneCount = 0
   state.totalToolCallCount = 0
@@ -424,12 +442,18 @@ export interface SerializedDcpState {
   nudgeAnchors?: DcpNudgeAnchor[]
   nextNudgeAnchorId?: number
   lastNudge?: DcpLastNudge
+  /** Persistent stable-identity → mNNN assignments. */
+  messageIdsByStableId?: Array<[string, string]>
+  nextMessageId?: number
   /**
    * Persisted since v??. `context` events re-seed currentTurn from raw
    * messages, but keeping it across session restarts gives diagnostics and
    * telemetry a contiguous turn counter instead of resetting to 0.
    */
   currentTurn?: number
+  /** Automatic pruning runs only when one of these checkpoints changes. */
+  lastAutomaticPruneTurn?: number
+  lastAutomaticPruneBlockId?: number
   /**
    * Persisted since v?.?. Without persistence a pi process restart silently
    * reset the nudge cadence counter to 0, which could suppress the next
@@ -622,7 +646,11 @@ export function serializeState(state: DcpState): SerializedDcpState {
     nudgeAnchors: state.nudgeAnchors,
     nextNudgeAnchorId: state.nextNudgeAnchorId,
     lastNudge: state.lastNudge,
+    messageIdsByStableId: Array.from(state.messageIdsByStableId.entries()),
+    nextMessageId: state.nextMessageId,
     currentTurn: state.currentTurn,
+    lastAutomaticPruneTurn: state.lastAutomaticPruneTurn,
+    lastAutomaticPruneBlockId: state.lastAutomaticPruneBlockId,
     nudgeCounter: state.nudgeCounter,
     lastNudgeTurn: state.lastNudgeTurn,
     lastContextWindow: state.lastContextWindow,
@@ -776,6 +804,31 @@ export function restoreState(state: DcpState, data: unknown): void {
     state.lastNudge = saved.lastNudge
   }
 
+  if (Array.isArray(saved.messageIdsByStableId)) {
+    const usedIds = new Set<string>()
+    const usedStableKeys = new Set<string>()
+    state.messageIdsByStableId = new Map(
+      saved.messageIdsByStableId.filter(
+        (entry): entry is [string, string] => {
+          if (!Array.isArray(entry) || typeof entry[0] !== "string" || typeof entry[1] !== "string") return false
+          if (!entry[0] || !/^m\d+$/.test(entry[1]) || usedIds.has(entry[1]) || usedStableKeys.has(entry[0])) return false
+          usedIds.add(entry[1])
+          usedStableKeys.add(entry[0])
+          return true
+        },
+      ),
+    )
+  }
+  const highestRestoredMessageId = Math.max(
+    0,
+    ...Array.from(state.messageIdsByStableId.values()).map((id) => Number.parseInt(id.slice(1), 10) || 0),
+  )
+  if (typeof saved.nextMessageId === "number" && Number.isFinite(saved.nextMessageId) && saved.nextMessageId > 0) {
+    state.nextMessageId = Math.max(Math.floor(saved.nextMessageId), highestRestoredMessageId + 1)
+  } else {
+    state.nextMessageId = highestRestoredMessageId + 1
+  }
+
   // nudgeCounter: clamp to a non-negative integer so a corrupted payload
   // cannot stall reminders by going negative. Default 0 keeps older sessions
   // behaving like a fresh cadence on first post-restart context event.
@@ -793,6 +846,12 @@ export function restoreState(state: DcpState, data: unknown): void {
   if (typeof saved.currentTurn === "number" && Number.isFinite(saved.currentTurn) && saved.currentTurn >= 0) {
     state.currentTurn = Math.floor(saved.currentTurn)
   }
+  if (typeof saved.lastAutomaticPruneTurn === "number" && Number.isFinite(saved.lastAutomaticPruneTurn)) {
+    state.lastAutomaticPruneTurn = Math.floor(saved.lastAutomaticPruneTurn)
+  }
+  if (typeof saved.lastAutomaticPruneBlockId === "number" && Number.isFinite(saved.lastAutomaticPruneBlockId) && saved.lastAutomaticPruneBlockId >= 0) {
+    state.lastAutomaticPruneBlockId = Math.floor(saved.lastAutomaticPruneBlockId)
+  }
   if (typeof saved.lastContextWindow === "number" && Number.isFinite(saved.lastContextWindow) && saved.lastContextWindow > 0) {
     state.lastContextWindow = saved.lastContextWindow
   }

package/external/pi-tools-suite/src/default-pi-tools-suite-config.ts

@@ -329,6 +329,10 @@ export const DEFAULT_PI_TOOLS_SUITE_CONFIG_JSONC = String.raw`{
         "description": "Use when the sub-agent should make or plan code changes for a feature, bug fix, or refactor.",
         "model": "openai-codex/gpt-5.6-sol",
         "fallbackModels": ["zai/glm-5.3"],
+        "modelByParent": {
+          "openai-codex/gpt-5.6-luna*": { "model": "openai-codex/gpt-5.6-terra", "fallbackModels": ["zai/glm-5.3"] },
+          "openai-codex/gpt-5.6-sol*": { "model": "openai-codex/gpt-5.6-terra", "fallbackModels": ["zai/glm-5.3"] }
+        },
         "thinking": "high"
       },
       "deep": {

package/external/pi-tools-suite/src/lib/rpc-session-state.ts

@@ -0,0 +1,34 @@
+/** Reserved RPC widget key consumed by Pix ACP as a structured event envelope. */
+export const RPC_SESSION_STATE_WIDGET_KEY = "pix.session-state";
+export const RPC_SESSION_STATE_ENV = "PIX_ACP_SESSION_STATE_BRIDGE";
+
+export interface RpcSessionStateContext {
+	readonly mode?: unknown;
+	readonly ui?: {
+		setWidget?: (key: string, lines: string[] | undefined) => void;
+	};
+}
+
+/**
+ * Publish structured extension state through pi's supported RPC UI protocol.
+ *
+ * TUI/print/json modes keep using their native event consumers. Serialization
+ * is best-effort so an optional external UI can never break the source tool.
+ */
+export function publishRpcSessionState(
+	ctx: RpcSessionStateContext | undefined,
+	channel: string,
+	data: unknown,
+): void {
+	if (
+		process.env[RPC_SESSION_STATE_ENV] !== "1"
+		|| ctx?.mode !== "rpc"
+		|| !ctx.ui?.setWidget
+		|| !channel.trim()
+	) return;
+	try {
+		ctx.ui.setWidget(RPC_SESSION_STATE_WIDGET_KEY, [channel, JSON.stringify(data)]);
+	} catch {
+		// The event bus remains authoritative when RPC UI transport is absent.
+	}
+}

package/external/pi-tools-suite/src/todo/todo.ts

@@ -42,6 +42,7 @@ import {
 } from "./tool/types.js";
 import { formatCommandTaskLine } from "./view/format.js";
 import { formatStatusLabel } from "./view/labels.js";
+import { publishRpcSessionState, type RpcSessionStateContext } from "../lib/rpc-session-state.js";
 
 const SECTION_PENDING = "── Pending ──";
 const SECTION_IN_PROGRESS = "── In Progress ──";
@@ -96,7 +97,9 @@ interface TodoToolRegistrationOptions extends TodoToolHooks {
 	parameters?: typeof TodoParamsSchema;
 }
 
-type TodoStateEventContext = { sessionManager?: { getSessionFile?: () => unknown; getSessionId?: () => unknown } };
+type TodoStateEventContext = RpcSessionStateContext & {
+	sessionManager?: { getSessionFile?: () => unknown; getSessionId?: () => unknown };
+};
 type TodoStateEventEmitter = { events?: { emit?: (channel: string, data: unknown) => void } };
 type TodoStateEntryWriter = { appendEntry<T = unknown>(customType: string, data?: T): void };
 
@@ -225,7 +228,7 @@ export function publishTodoState(
 	const state = getState();
 	const sessionFile = sessionFileFromContext(ctx);
 	const sessionId = sessionIdFromContext(ctx);
-	pi.events?.emit?.(TODO_STATE_EVENT, {
+	const snapshot = {
 		version: 1,
 		details: {
 			action,
@@ -236,7 +239,9 @@ export function publishTodoState(
 		...(sessionFile ? { sessionFile } : {}),
 		...(sessionId ? { sessionId } : {}),
 		checkedAt: Date.now(),
-	});
+	};
+	pi.events?.emit?.(TODO_STATE_EVENT, snapshot);
+	publishRpcSessionState(ctx as TodoStateEventContext | undefined, TODO_STATE_EVENT, snapshot);
 }
 
 function appendTodoStateSnapshot(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-ui-extend",
-  "version": "1.0.38",
+  "version": "1.0.39",
   "description": "Pix: a workspace-first terminal UI for Pi with tabs, readable tool activity, voice input, and bundled agent tools.",
   "private": false,
   "repository": {
@@ -62,6 +62,9 @@
     "test:tools-suite": "npm --prefix external/pi-tools-suite test",
     "build:acp": "npm --prefix acp run build",
     "check:acp": "npm --prefix acp run check",
+    "dev:desktop": "npm --prefix desktop run dev",
+    "build:desktop": "npm --prefix desktop run build",
+    "check:desktop": "npm --prefix desktop run check",
     "test:browser-qa-e2e": "npm --prefix external/pi-tools-suite run test:browser-qa-e2e",
     "sync:pi-tools-suite": "node scripts/sync-pi-tools-suite.mjs",
     "sync:pi-tools-suite:check": "node scripts/sync-pi-tools-suite.mjs --check",
@@ -80,9 +83,10 @@
     "prepublishOnly": "npm run check && npm run build:pix && npm run generate-schemas"
   },
   "dependencies": {
-    "@earendil-works/pi-ai": "0.84.4",
-    "@earendil-works/pi-coding-agent": "0.84.4",
-    "@earendil-works/pi-tui": "0.84.4",
+    "@earendil-works/pi-ai": "0.85.0",
+    "@earendil-works/pi-coding-agent": "0.85.0",
+    "@earendil-works/pi-server": "0.85.0",
+    "@earendil-works/pi-tui": "0.85.0",
     "@mariozechner/clipboard": "^0.3.9",
     "grok-mermaid": "0.2.2",
     "jsonc-parser": "3.3.1",