@pi-unipi/unipi 2.6.1 → 2.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-unipi/unipi",
-  "version": "2.6.1",
+  "version": "2.6.3",
   "description": "All-in-one extension suite for Pi coding agent",
   "type": "module",
   "license": "MIT",
@@ -66,7 +66,6 @@
       "packages/milestone/skills",
       "packages/kanboard/skills",
       "packages/updater/skills",
-      "packages/cocoindex/skills",
       "packages/image/skills"
     ]
   },
@@ -95,8 +94,7 @@
     "@pi-unipi/workflow": "2.6.1",
     "@pi-unipi/footer": "2.6.1",
     "@pi-unipi/updater": "2.6.1",
-    "@pi-unipi/input-shortcuts": "2.6.1",
-    "@pi-unipi/cocoindex": "2.6.1"
+    "@pi-unipi/input-shortcuts": "2.6.1"
   },
   "devDependencies": {
     "@earendil-works/pi-agent-core": "^0.80.0",

package/packages/ask-user/settings-tui.ts

@@ -6,26 +6,13 @@
  */
 
 import type { Component } from "@earendil-works/pi-tui";
-import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import { adaptiveInnerWidth, normalizeWidth, safeRepeat, shouldRenderBorder } from "@pi-unipi/core";
+import { Key, matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { adaptiveInnerWidth, normalizeWidth, safeRepeat, shouldRenderBorder, ansi, TOGGLE_ON, TOGGLE_OFF } from "@pi-unipi/core";
 import { getAskUserSettings, saveAskUserSettings, type AskUserSettings } from "./config.js";
 
 /** ANSI escape codes */
-const ansi = {
-  reset: "\x1b[0m",
-  bold: "\x1b[1m",
-  dim: "\x1b[2m",
-  // Colors
-  cyan: "\x1b[36m",
-  green: "\x1b[32m",
-  yellow: "\x1b[33m",
-  red: "\x1b[31m",
-  gray: "\x1b[90m",
-};
 
 /** Toggle symbols */
-const TOGGLE_ON = `${ansi.green}●${ansi.reset}`;
-const TOGGLE_OFF = `${ansi.dim}○${ansi.reset}`;
 
 /** Setting items */
 interface SettingItem {
@@ -99,25 +86,22 @@ export class AskUserSettingsOverlay implements Component {
    * Handle keyboard input.
    */
   handleInput(data: string): void {
-    switch (data) {
-      case "\x1b[A": // Up
-      case "k":
-        this.selectedIndex = (this.selectedIndex - 1 + SETTINGS.length) % SETTINGS.length;
-        break;
-      case "\x1b[B": // Down
-      case "j":
-        this.selectedIndex = (this.selectedIndex + 1) % SETTINGS.length;
-        break;
-      case " ": // Space - toggle
-        this.toggleSetting(SETTINGS[this.selectedIndex].key);
-        break;
-      case "\r": // Enter - save and close
-        this.save();
-        this.onClose?.();
-        break;
-      case "\x1b": // Escape - close without saving
-        this.onClose?.();
-        break;
+    if (matchesKey(data, Key.up) || data === "k") {
+      // Up
+      this.selectedIndex = (this.selectedIndex - 1 + SETTINGS.length) % SETTINGS.length;
+    } else if (matchesKey(data, Key.down) || data === "j") {
+      // Down
+      this.selectedIndex = (this.selectedIndex + 1) % SETTINGS.length;
+    } else if (matchesKey(data, Key.space)) {
+      // Space - toggle
+      this.toggleSetting(SETTINGS[this.selectedIndex].key);
+    } else if (matchesKey(data, Key.enter)) {
+      // Enter - save and close
+      this.save();
+      this.onClose?.();
+    } else if (matchesKey(data, Key.escape)) {
+      // Escape - close without saving
+      this.onClose?.();
     }
   }
 

package/packages/autocomplete/src/constants.ts

@@ -33,7 +33,6 @@ export const PACKAGE_ORDER: string[] = [
   "footer",
   "updater",
   "input-shortcuts",
-  "cocoindex",
   "image",
 ];
 
@@ -56,7 +55,6 @@ export const PACKAGE_COLORS: Record<string, string> = {
   footer:    `${ESC}[34m`, // Blue
   updater:   `${ESC}[93m`, // Bright Yellow
   "input-shortcuts": `${ESC}[95m`, // Bright Magenta
-  cocoindex: `${ESC}[97m`, // Bright White
   image:     `${ESC}[35m`, // Magenta
 };
 
@@ -151,12 +149,6 @@ export const COMMAND_REGISTRY: Record<string, string> = {
   "unipi:compact-preset":  "compact",
   "unipi:compact-help":    "compact",
 
-  // cocoindex (5 commands)
-  "unipi:cocoindex-update":  "cocoindex",
-  "unipi:cocoindex-status":  "cocoindex",
-  "unipi:cocoindex-init":    "cocoindex",
-  "unipi:cocoindex-search":  "cocoindex",
-  "unipi:cocoindex-settings": "cocoindex",
 
   // milestone (2 commands)
   "unipi:milestone-onboard": "milestone",
@@ -271,12 +263,6 @@ export const COMMAND_DESCRIPTIONS: Record<string, string> = {
   "unipi:compact-settings": "Configure compaction settings",
   "unipi:compact-preset":   "Manage compaction presets",
   "unipi:compact-help":     "Show compactor command help",
-  "unipi:cocoindex-update":  "Run CocoIndex update to index project",
-  "unipi:cocoindex-status":  "Show CocoIndex indexing status",
-  "unipi:cocoindex-init":    "Initialize CocoIndex pipeline",
-  "unipi:cocoindex-search":  "Search indexed codebase semantically",
-  "unipi:cocoindex-settings": "Show CocoIndex configuration",
-
   "unipi:notify-settings":  "Configure notification platforms and events",
   "unipi:notify-set-gotify": "Set up Gotify push notifications",
   "unipi:notify-set-tg":    "Set up Telegram bot notifications",
@@ -318,6 +304,5 @@ export const PACKAGE_LABELS: Record<string, string> = {
   footer:    "footer",
   updater:   "updater",
   "input-shortcuts": "input-shortcuts",
-  cocoindex: "cocoindex",
   image:     "image",
 };

package/packages/autocomplete/src/provider.ts

@@ -11,7 +11,7 @@ import type {
   AutocompleteProvider,
   AutocompleteSuggestions,
 } from "@earendil-works/pi-tui";
-import { fuzzyFilter } from "@earendil-works/pi-tui";
+import { fuzzyMatch as piFuzzyMatch } from "@earendil-works/pi-tui";
 
 import {
   COMMAND_REGISTRY,
@@ -27,20 +27,6 @@ import {
 } from "./sorting.js";
 import type { TaggedItem } from "./sorting.js";
 
-// ─── Fuzzy matching ──────────────────────────────────────────────────
-
-/** Simple character-subsequence fuzzy match (case-insensitive) */
-function fuzzyMatch(text: string, query: string): boolean {
-  if (!query) return true;
-  const lower = text.toLowerCase();
-  const q = query.toLowerCase();
-  let qi = 0;
-  for (let i = 0; i < lower.length && qi < q.length; i++) {
-    if (lower[i] === q[qi]) qi++;
-  }
-  return qi === q.length;
-}
-
 // ─── Namespace detection ─────────────────────────────────────────────
 
 /**
@@ -131,9 +117,9 @@ function getEnhancedUnipiItems(
     //         commands surface when the user hasn't typed the full prefix.
     matched = entries.filter(([cmd]) => {
       if (isPastUnipiColon) {
-        return fuzzyMatch(cmd.replace("unipi:", "").toLowerCase(), query);
+        return piFuzzyMatch(query, cmd.replace("unipi:", "").toLowerCase()).matches;
       }
-      return fuzzyMatch(cmd.toLowerCase(), query);
+      return piFuzzyMatch(query, cmd.toLowerCase()).matches;
     });
   }
 

package/packages/btw/extensions/btw.ts

@@ -606,9 +606,8 @@ function applyAssistantMessageToTranscript(
   message: AssistantMessage,
   streaming: boolean,
 ): void {
-  const assistantMessage = message;
-  const thinking = extractThinking(assistantMessage);
-  const answer = extractMessageText(assistantMessage);
+  const thinking = extractThinking(message);
+  const answer = extractMessageText(message);
 
   if (thinking) {
     upsertTranscriptTextEntry(state, turnId, "thinking", thinking, streaming);
@@ -972,11 +971,6 @@ function getOverlayTitle(mode: BtwThreadMode): string {
 
 class BtwOverlayComponent extends Container implements Focusable {
   private readonly input: Input;
-  private readonly transcript: Container;
-  private readonly statusText: Text;
-  private readonly modeText: Text;
-  private readonly summaryText: Text;
-  private readonly hintsText: Text;
   private readonly readTranscriptEntries: () => BtwTranscript;
   private readonly getStatus: () => string | null;
   private readonly getMode: () => BtwThreadMode;
@@ -1025,11 +1019,6 @@ class BtwOverlayComponent extends Container implements Focusable {
     this.onDismissCallback = onDismiss;
     this.onUnfocusCallback = onUnfocus;
 
-    this.modeText = new Text("", 1, 0);
-    this.summaryText = new Text("", 1, 0);
-    this.transcript = new Container();
-    this.statusText = new Text("", 1, 0);
-
     this.input = new Input();
     this.input.onSubmit = (value) => {
       this.followTranscript = true;
@@ -1039,8 +1028,6 @@ class BtwOverlayComponent extends Container implements Focusable {
       this.onDismissCallback();
     };
 
-    this.hintsText = new Text("", 1, 0);
-
     const originalHandleInput = this.input.handleInput.bind(this.input);
     this.input.handleInput = (data: string) => {
       if (keybindings.matches(data, "tui.select.cancel")) {
@@ -1092,14 +1079,14 @@ class BtwOverlayComponent extends Container implements Focusable {
       return;
     }
 
-    if (matchesKey(data, Key.pageUp)) {
+    if (matchesKey(data, Key.pageUp) || matchesKey(data, Key.ctrl("pageUp")) || matchesKey(data, Key.alt("pageUp"))) {
       this.followTranscript = false;
       this.transcriptScrollOffset = Math.max(0, this.transcriptScrollOffset - Math.max(1, this.transcriptViewportHeight - 1));
       this.tui.requestRender();
       return;
     }
 
-    if (matchesKey(data, Key.pageDown)) {
+    if (matchesKey(data, Key.pageDown) || matchesKey(data, Key.ctrl("pageDown")) || matchesKey(data, Key.alt("pageDown"))) {
       this.transcriptScrollOffset += Math.max(1, this.transcriptViewportHeight - 1);
       this.tui.requestRender();
       return;
@@ -1182,30 +1169,18 @@ class BtwOverlayComponent extends Container implements Focusable {
     return this.input.getValue();
   }
 
-  getTranscriptEntries(): BtwTranscript {
-    return this.readTranscriptEntries().map((entry) => ({ ...entry }));
-  }
-
   refresh(): void {
     this.modeTextValue = `${getOverlayTitle(this.getMode())} · hidden thread preserved`;
-    this.modeText.setText(this.modeTextValue);
     const entries = this.readTranscriptEntries();
     const exchanges = getCompletedExchangeCount(entries);
     const active = hasStreamingTranscriptEntry(entries) ? " · streaming" : " · idle";
     this.summaryTextValue = `${exchanges} exchange${exchanges === 1 ? "" : "s"}${active}`;
-    this.summaryText.setText(this.summaryTextValue);
 
     this.transcriptLines = buildOverlayTranscript(entries, this.theme);
-    this.transcript.clear();
-    for (const line of this.transcriptLines) {
-      this.transcript.addChild(new Text(line, 1, 0));
-    }
 
     const status = this.getStatus() ?? "Ready. Enter submits; Escape dismisses without clearing.";
     this.statusTextValue = status;
-    this.statusText.setText(this.statusTextValue);
-    this.hintsTextValue = "Enter submit · Alt+/ toggle focus · Escape dismiss · PgUp/PgDn scroll";
-    this.hintsText.setText(this.hintsTextValue);
+    this.hintsTextValue = "Enter submit · Alt+/ toggle focus · Escape dismiss · PgUp/Ctrl+PgUp scroll up · PgDn/Ctrl+PgDn scroll down";
     this.tui.requestRender();
   }
 }
@@ -1498,7 +1473,7 @@ export default function (pi: ExtensionAPI) {
       });
   }
 
-  async function dispatchBtwCommand(name: string, args: string, ctx: ExtensionCommandContext): Promise<boolean> {
+  async function dispatchBtwCommand(name: string, args: string, ctx: ExtensionCommandContext): Promise<void> {
     const trimmedArgs = args.trim();
 
     if (name === "btw") {
@@ -1506,7 +1481,7 @@ export default function (pi: ExtensionAPI) {
       if (!question) {
         await ensureBtwSession(ctx, pendingMode);
         await ensureOverlay(ctx);
-        return true;
+        return;
       }
 
       if (pendingMode !== "contextual") {
@@ -1514,7 +1489,7 @@ export default function (pi: ExtensionAPI) {
       }
 
       await runBtw(ctx, question, save, "contextual");
-      return true;
+      return;
     }
 
     if (name === "btw:tangent") {
@@ -1526,11 +1501,11 @@ export default function (pi: ExtensionAPI) {
       if (!question) {
         await ensureBtwSession(ctx, "tangent");
         await ensureOverlay(ctx);
-        return true;
+        return;
       }
 
       await runBtw(ctx, question, save, "tangent");
-      return true;
+      return;
     }
 
     if (name === "btw:new") {
@@ -1544,20 +1519,20 @@ export default function (pi: ExtensionAPI) {
         await ensureOverlay(ctx);
         notify(ctx, "Started a fresh BTW thread.", "info");
       }
-      return true;
+      return;
     }
 
     if (name === "btw:clear") {
       await resetThread(ctx);
       dismissOverlay();
       notify(ctx, "Cleared BTW thread.", "info");
-      return true;
+      return;
     }
 
     if (name === "btw:inject") {
       if (pendingThread.length === 0) {
         notify(ctx, "No BTW thread to inject.", "warning");
-        return true;
+        return;
       }
 
       setOverlayStatus("⏳ injecting into the main session...", ctx);
@@ -1579,13 +1554,13 @@ export default function (pi: ExtensionAPI) {
         setOverlayStatus("Inject failed. Thread preserved for retry or summarize.", ctx);
         notify(ctx, error instanceof Error ? error.message : String(error), "error");
       }
-      return true;
+      return;
     }
 
     if (name === "btw:summarize") {
       if (pendingThread.length === 0) {
         notify(ctx, "No BTW thread to summarize.", "warning");
-        return true;
+        return;
       }
 
       setOverlayStatus("⏳ summarizing...", ctx);
@@ -1608,10 +1583,8 @@ export default function (pi: ExtensionAPI) {
         setOverlayStatus("Summarize failed. Thread preserved for retry or injection.", ctx);
         notify(ctx, error instanceof Error ? error.message : String(error), "error");
       }
-      return true;
+      return;
     }
-
-    return false;
   }
 
   function parseOverlayBtwCommand(value: string): { name: string; args: string } | null {
@@ -1817,7 +1790,7 @@ export default function (pi: ExtensionAPI) {
 
   async function getBtwHandoffThread(
     ctx: ExtensionCommandContext,
-  ): Promise<{ sessionRuntime: BtwSessionRuntime | null; thread: BtwHandoffExchange[] }> {
+  ): Promise<{ thread: BtwHandoffExchange[] }> {
     const sessionRuntime = activeBtwSession ?? (await ensureBtwSession(ctx, pendingMode));
     const thread = sessionRuntime ? extractBtwHandoffThread(sessionRuntime) : [];
     const resolvedThread = thread.length > 0 ? thread : getPendingThreadForHandoff();
@@ -1826,7 +1799,7 @@ export default function (pi: ExtensionAPI) {
       throw new Error("No BTW thread available for handoff.");
     }
 
-    return { sessionRuntime, thread: resolvedThread };
+    return { thread: resolvedThread };
   }
 
   async function summarizeThread(ctx: ExtensionCommandContext, thread: BtwHandoffExchange[]): Promise<string> {

package/packages/compactor/README.md

@@ -51,7 +51,7 @@ Per-project config is merged over global config when the current project directo
 | `/unipi:compact-preset <name>` | Applies a preset globally. | Names: `precise`, `balanced`, `thorough`, `lean`. Old names map to new ones: `opencode→precise`, `verbose→thorough`, `minimal→lean`. |
 | `/unipi:compact-help` | Shows compact help inside Pi. | Quick command reference. |
 
-Content/project indexing is handled by `@pi-unipi/cocoindex`, not this package. Use `/unipi:cocoindex-init`, `/unipi:cocoindex-update`, and `cocoindex_search` for indexed project search.
+Content/project indexing is not part of this package. Use `read`/`bash` (rg) for project search.
 
 ---
 
@@ -102,7 +102,7 @@ These settings control what is extracted into compaction summaries or how relate
 | `Session Continuity` | `full`, `off` | Controls XML-style resume snapshots. Off prevents snapshot creation and injection; Pi’s normal compaction summary still remains. |
 | `Sandbox Execution` | `all`, `off` | Controls sandbox tool registration. Changes require a session reload. Allowed languages and output limit are enforced from config. |
 
-Config-only legacy field: `fts5Index` remains in the schema for compatibility, but project indexing has moved to `@pi-unipi/cocoindex`. It is hidden from Compactor settings and presets. Legacy `sessionContinuity.mode: "essential-only"`, `eventCategories`, and `sandboxExecution.mode: "safe-only"` values remain loadable; essential-only behaves as full and safe-only behaves as enabled/all until explicit filtering/security policies are designed. Legacy `toolDisplay` and `showTruncationHints` fields also remain loadable but are deprecated and ignored; their profile names were never mapped to runtime renderer modes. Narrow-terminal diff clamping remains active as independent safety behavior.
+Config-only legacy field: `fts5Index` remains in the schema for compatibility. It is hidden from Compactor settings and presets. Legacy `sessionContinuity.mode: "essential-only"`, `eventCategories`, and `sandboxExecution.mode: "safe-only"` values remain loadable; essential-only behaves as full and safe-only behaves as enabled/all until explicit filtering/security policies are designed. Legacy `toolDisplay` and `showTruncationHints` fields also remain loadable but are deprecated and ignored; their profile names were never mapped to runtime renderer modes. Narrow-terminal diff clamping remains active as independent safety behavior.
 
 ### Auto tab
 

package/packages/compactor/skills/compactor/SKILL.md

@@ -12,7 +12,7 @@ description: Context management — compact session, recall history, run code, s
 
 ## Finding Past Work
 - `session_recall(query)` → search this session (BM25 or regex), including raw messages that may no longer be in live context after compaction.
-- For indexed project/file search, use the CocoIndex package (`cocoindex_search`) when installed; content indexing no longer lives in compactor.
+- For project/file search, use `read`/`bash` (rg) directly; content indexing is not part of compactor.
 
 ## Running Code
 - `sandbox(lang, code)` → single script. `sandbox_batch(items)` → atomic.

package/packages/compactor/skills/compactor-detail/SKILL.md

@@ -88,7 +88,7 @@ Estimate remaining context tokens and percent full. Uses Pi's live context usage
 ## Anti-Patterns
 
 1. **Don't compact in a tight loop.** Use `context_budget` first and compact at natural break points.
-2. **Don't use `session_recall` for project-wide code search.** It searches the conversation/session. Use CocoIndex (`cocoindex_search`) for indexed files when installed.
+2. **Don't use `session_recall` for project-wide code search.** It searches the conversation/session only — use `read`/`bash`(rg) for files.
 3. **Don't use `sandbox` for file operations.** Use normal file tools for reads/writes; sandbox is for computation or quick scripts.
 4. **Don't use empty or vague recall queries.** Search for specific filenames, issue numbers, commands, or decisions.
 5. **Don't compact mid-thought if avoidable.** Finish the current step, then compact.
@@ -112,7 +112,5 @@ Estimate remaining context tokens and percent full. Uses Pi's live context usage
 3. `compactor_stats` — confirm compactions/savings are recorded.
 
 ### Project Search
-Compactor no longer owns project content indexing. Use the CocoIndex package if installed:
-1. `/unipi:cocoindex-init`
-2. `/unipi:cocoindex-update`
-3. `cocoindex_search(query)`
+Compactor does not own project content indexing. For code search use `bash` with rg.
+1. `bash` with `rg` for code search

package/packages/compactor/skills/compactor-doctor/SKILL.md

@@ -68,4 +68,4 @@ python3 --version
 bash --version
 ```
 
-Project content indexing diagnostics live in the CocoIndex package, not compactor.
+Project content indexing is not part of compactor.

package/packages/compactor/skills/compactor-stats/SKILL.md

@@ -48,4 +48,4 @@ This means:
 - 3 compactions saved roughly 15K tokens.
 - 7 sandbox executions and 15 recall/search queries were recorded.
 
-Project content indexing stats are not owned by compactor anymore; use the CocoIndex package for indexed file search/status.
+Project content indexing stats are not owned by compactor; use `read`/`bash` (rg) for file search.

package/packages/compactor/src/commands/index.ts

@@ -8,13 +8,14 @@
 import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { loadConfig, saveConfig } from "../config/manager.js";
 import { applyPreset, parsePreset } from "../config/presets.js";
-import { COMPACTOR_INSTRUCTION } from "@pi-unipi/core";
-import { getLastCompactionStats } from "../compaction/hooks.js";
+import { COMPACTOR_INSTRUCTION, formatTokens } from "@pi-unipi/core";
+import { getLastCompactionStats, formatCompactionStats } from "../compaction/hooks.js";
 import { vccRecall } from "../tools/vcc-recall.js";
 import { ctxStats } from "../tools/ctx-stats.js";
 import { ctxDoctor } from "../tools/ctx-doctor.js";
 import { recallBlocksFromContext } from "../session/recall-blocks.js";
 import { filterNoise } from "../compaction/filter-noise.js";
+import { parseRecallScope } from "../compaction/recall-scope.js";
 import type { SessionDB } from "../session/db.js";
 import type { NormalizedBlock, RuntimeCounters } from "../types.js";
 
@@ -25,77 +26,55 @@ export interface CommandDeps {
   getCounters?: () => RuntimeCounters;
 }
 
-function deprecationLog(_oldName: string, _newName: string): void {
-  // Deprecation logging disabled — was writing to stdout causing TUI rendering issues.
-}
-
-const formatTokens = (n: number): string => {
-  if (n >= 1000) return `${(n / 1000).toFixed(1)}k`;
-  return String(n);
-};
-
 export function registerCommands(pi: ExtensionAPI, deps?: CommandDeps): void {
   // ── /unipi:lossless-compact ──────────────────────────
+  const losslessCompactHandler = async (_args: string, ctx: ExtensionCommandContext) => {
+    ctx.compact({
+      customInstructions: COMPACTOR_INSTRUCTION,
+      onComplete: () => {
+        const stats = getLastCompactionStats();
+        if (stats) {
+          ctx.ui.notify(formatCompactionStats(stats), "info");
+        } else {
+          ctx.ui.notify("Compaction completed.", "info");
+        }
+      },
+      onError: (err: Error) => {
+        if (err.message === "Compaction cancelled" || err.message === "Already compacted") {
+          ctx.ui.notify("Nothing to compact.", "info");
+        } else {
+          ctx.ui.notify(`Compaction failed: ${err.message}`, "error");
+        }
+      },
+    });
+  };
   pi.registerCommand("unipi:lossless-compact", {
     description: "Immediate zero-LLM compaction — structured summary with full recall",
-    handler: async (_args: string, ctx: ExtensionCommandContext) => {
-      ctx.compact({
-        customInstructions: COMPACTOR_INSTRUCTION,
-        onComplete: () => {
-          const stats = getLastCompactionStats();
-          if (stats) {
-            ctx.ui.notify(
-              `Compacted ${stats.totalMessages} messages (~${formatTokens(stats.tokensBefore)} tokens) → ${stats.kept} messages (~${formatTokens(stats.tokensAfterEst)} tokens)`,
-              "info",
-            );
-          } else {
-            ctx.ui.notify("Compaction completed.", "info");
-          }
-        },
-        onError: (err: Error) => {
-          if (err.message === "Compaction cancelled" || err.message === "Already compacted") {
-            ctx.ui.notify("Nothing to compact.", "info");
-          } else {
-            ctx.ui.notify(`Compaction failed: ${err.message}`, "error");
-          }
-        },
-      });
-    },
+    handler: losslessCompactHandler,
   });
-  // Deprecated alias — old name
   pi.registerCommand("unipi:compact", {
-    description: "(DEPRECATED) Use /unipi:lossless-compact instead",
-    handler: async (_args: string, ctx: ExtensionCommandContext) => {
-      deprecationLog("/unipi:compact", "/unipi:lossless-compact");
-      ctx.compact({
-        customInstructions: COMPACTOR_INSTRUCTION,
-        onComplete: () => {
-          const stats = getLastCompactionStats();
-          if (stats) {
-            ctx.ui.notify(
-              `Compacted ${stats.totalMessages} messages (~${formatTokens(stats.tokensBefore)} tokens) → ${stats.kept} messages (~${formatTokens(stats.tokensAfterEst)} tokens)`,
-              "info",
-            );
-          } else {
-            ctx.ui.notify("Compaction completed.", "info");
-          }
-        },
-        onError: (err: Error) => {
-          if (err.message === "Compaction cancelled" || err.message === "Already compacted") {
-            ctx.ui.notify("Nothing to compact.", "info");
-          } else {
-            ctx.ui.notify(`Compaction failed: ${err.message}`, "error");
-          }
-        },
-      });
-    },
+    description: "Alias for /unipi:lossless-compact",
+    handler: losslessCompactHandler,
   });
 
   // ── /unipi:session-recall (new) ─────────────────────
+  // pi-vcc parity: results are sent as a visible custom message AND fed to the
+  // agent as context (triggerTurn), so recall results drive the next turn.
   const sessionRecallHandler = async (args: string, ctx: ExtensionCommandContext, commandName = "/unipi:session-recall") => {
-    const query = args.trim();
+    const raw = args.trim();
+    const suffix = commandName === "/unipi:compact-recall" ? " (deprecated; use /unipi:session-recall <query>)" : "";
+    if (!raw) {
+      ctx.ui.notify(`Usage: ${commandName} <query>${suffix}`, "warning");
+      return;
+    }
+
+    // Parse scope:all and page:N inline (pi-vcc parity)
+    const parsed = parseRecallScope(raw);
+    const pageMatch = parsed.text.match(/\bpage:(\d+)\b/i);
+    const page = pageMatch ? Math.max(1, parseInt(pageMatch[1], 10)) : 1;
+    const query = parsed.text.replace(/\bpage:\d+\b/i, "").trim();
+
     if (!query) {
-      const suffix = commandName === "/unipi:compact-recall" ? " (deprecated; use /unipi:session-recall <query>)" : "";
       ctx.ui.notify(`Usage: ${commandName} <query>${suffix}`, "warning");
       return;
     }
@@ -109,25 +88,20 @@ export function registerCommands(pi: ExtensionAPI, deps?: CommandDeps): void {
       ctx.ui.notify("No session history available for search.", "warning");
       return;
     }
-    const result = vccRecall(blocks, { query, limit: 10 });
-    if (result.hits.length === 0) {
-      ctx.ui.notify(`No results for "${query}".`, "info");
-      return;
-    }
-    const lines = result.hits.map(
-      (h, i) => `[${i + 1}] score=${h.score.toFixed(2)} kind=${h.kind}\n${h.text.slice(0, 200)}`,
+    const result = vccRecall(blocks, { query, scope: parsed.scope, page });
+    pi.sendMessage(
+      { customType: "compactor-recall", content: result.text, display: true },
+      { triggerTurn: true },
     );
-    ctx.ui.notify(`Found ${result.total} results:\n${lines.join("\n\n")}`, "info");
   };
   pi.registerCommand("unipi:session-recall", {
-    description: "Search session history (BM25 or regex)",
+    description: "Recall earlier parts of this session. Plain keywords work best; add scope:all to reach edited or retried turns.",
     handler: sessionRecallHandler,
   });
   // Deprecated alias
   pi.registerCommand("unipi:compact-recall", {
     description: "(DEPRECATED) Search session history — use /unipi:session-recall instead",
     handler: async (args: string, ctx: ExtensionCommandContext) => {
-      deprecationLog("/unipi:compact-recall", "/unipi:session-recall");
       return sessionRecallHandler(args, ctx, "/unipi:compact-recall");
     },
   });
@@ -233,12 +207,7 @@ export function registerCommands(pi: ExtensionAPI, deps?: CommandDeps): void {
         "  /unipi:compact-preset <name> — apply preset\n" +
         "\n" +
         "Percentage trigger:\n" +
-        "  Disabled by default. Enable in /unipi:compact-settings to compact at a context % before Pi's reserve-token limit.\n" +
-        "\n" +
-        "Content indexing has moved to @pi-unipi/cocoindex:\n" +
-        "  /unipi:cocoindex-init — initialize pipeline\n" +
-        "  /unipi:cocoindex-update — index project files\n" +
-        "  cocoindex_search — search indexed content",
+        "  Disabled by default. Enable in /unipi:compact-settings to compact at a context % before Pi's reserve-token limit.",
         "info",
       );
     },