@tianshu-ai/tianshu 0.65.0 → 0.66.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tianshu-ai/tianshu",
-  "version": "0.65.0",
+  "version": "0.66.0",
   "description": "An open AI agent platform with a sidecar browser. Built in public.",
   "license": "Apache-2.0",
   "homepage": "https://github.com/tianshu-ai/tianshu",
@@ -69,8 +69,8 @@
   "dependencies": {
     "@andresaya/edge-tts": "^1.8.0",
     "@clack/prompts": "^1.5.1",
-    "@earendil-works/pi-agent-core": "^0.85.1",
-    "@earendil-works/pi-ai": "^0.85.1",
+    "@earendil-works/pi-agent-core": "^0.87.1",
+    "@earendil-works/pi-ai": "^0.87.1",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@tianshu-ai/plugin-sdk": "*",
     "better-sqlite3": "^13.0.3",

package/packages/server/dist/chat/compact-decision.d.ts

@@ -74,6 +74,11 @@ export interface AutoCompactDecision {
      */
     reason?: "compacted" | "below_threshold" | "nothing_to_compact" | "error";
 }
+/** pi 0.80's `harness.compact()` message when `prepareCompaction`
+ *  yields no cut point. Matched loosely (case-insensitive substring)
+ *  so a future rephrasing of the harness error doesn't silently break
+ *  the fallback path. */
+export declare function isNothingToCompact(err: unknown): boolean;
 export declare function tryAutoCompact(args: {
     piSession: PiSession;
     harness: AgentHarness;

package/packages/server/dist/chat/compact-decision.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compact-decision.d.ts","sourceRoot":"","sources":["../../src/chat/compact-decision.ts"],"names":[],"mappings":"AAsBA,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,SAAS,EAEd,KAAK,kBAAkB,EACvB,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,OAAO,IAAI,SAAS,EAC1B,MAAM,+BAA+B,CAAC;AAuBvC,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,EAAE,kBAAkB,CAAC;CAC/B;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,wBAAwB,GAC9B,OAAO,CAoBT;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IAChD,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC,GAAG,OAAO,CAAC,OAAO,CAAC,CASnB;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iDAAiD;IACjD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oDAAoD;IACpD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;;;;;;;;;;;;OAgBG;IACH,MAAM,CAAC,EACH,WAAW,GACX,iBAAiB,GACjB,oBAAoB,GACpB,OAAO,CAAC;CACb;AAWD,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,YAAY,CAAC;IACtB,gEAAgE;IAChE,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,EAAE,kBAAkB,CAAC;CAC/B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CA6D/B"}
+{"version":3,"file":"compact-decision.d.ts","sourceRoot":"","sources":["../../src/chat/compact-decision.ts"],"names":[],"mappings":"AAsBA,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,SAAS,EAEd,KAAK,kBAAkB,EACvB,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,OAAO,IAAI,SAAS,EAC1B,MAAM,+BAA+B,CAAC;AAuBvC,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,EAAE,kBAAkB,CAAC;CAC/B;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,wBAAwB,GAC9B,OAAO,CAoBT;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IAChD,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC,GAAG,OAAO,CAAC,OAAO,CAAC,CASnB;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iDAAiD;IACjD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oDAAoD;IACpD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;;;;;;;;;;;;OAgBG;IACH,MAAM,CAAC,EACH,WAAW,GACX,iBAAiB,GACjB,oBAAoB,GACpB,OAAO,CAAC;CACb;AAED;;;yBAGyB;AACzB,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAGxD;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,YAAY,CAAC;IACtB,gEAAgE;IAChE,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,EAAE,kBAAkB,CAAC;CAC/B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CA6D/B"}

package/packages/server/dist/chat/compact-decision.js

@@ -76,7 +76,7 @@ export async function branchStillOverWindow(args) {
  *  yields no cut point. Matched loosely (case-insensitive substring)
  *  so a future rephrasing of the harness error doesn't silently break
  *  the fallback path. */
-function isNothingToCompact(err) {
+export function isNothingToCompact(err) {
     const msg = err instanceof Error ? err.message : String(err);
     return /nothing to compact/i.test(msg);
 }

package/packages/server/dist/chat/compact-decision.js.map

@@ -1 +1 @@
-{"version":3,"file":"compact-decision.js","sourceRoot":"","sources":["../../src/chat/compact-decision.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compact-decision.js","sourceRoot":"","sources":["../../src/chat/compact-decision.ts"],"names":[],"mappings":"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"}

package/packages/server/dist/chat/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/chat/handler.ts"],"names":[],"mappings":"AAqDA,OAAO,EACL,mBAAmB,EACnB,cAAc,EAEd,KAAK,mBAAmB,EACxB,KAAK,wBAAwB,EAC9B,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EACL,mBAAmB,EACnB,cAAc,EACd,KAAK,mBAAmB,EACxB,KAAK,wBAAwB,GAC9B,CAAC;AAGF,OAAO,EACL,mBAAmB,EACnB,0BAA0B,EAC1B,wBAAwB,EACxB,2BAA2B,EAC3B,wBAAwB,EACxB,2BAA2B,EAC3B,yBAAyB,EACzB,6BAA6B,EAC7B,2BAA2B,EAC3B,4BAA4B,EAC5B,KAAK,oBAAoB,GAC1B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAQL,KAAK,aAAa,EACnB,MAAM,kBAAkB,CAAC;AA6B1B,OAAO,EAGL,KAAK,WAAW,EACjB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAOL,KAAK,WAAW,EAEjB,MAAM,eAAe,CAAC;AAWvB,OAAO,EAGL,KAAK,SAAS,EAEd,KAAK,cAAc,EAEpB,MAAM,kBAAkB,CAAC;AA6B1B,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,aAAa,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,CAAC;IAClB;;;;;OAKG;IACH,cAAc,CAAC,EAAE,OAAO,6BAA6B,EAAE,cAAc,CAAC;IACtE,+DAA+D;IAC/D,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,CAkQ7D;AAED,UAAU,aAAa;IACrB,GAAG,EAAE,aAAa,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,MAAM,EAAE,WAAW,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,6BAA6B,EAAE,cAAc,CAAC;IACtE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;4BAGwB;IACxB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;;;;;OAQG;IACH,OAAO,CAAC,EAAE,OAAO,eAAe,EAAE,WAAW,CAAC;IAC9C;;;;;;OAMG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAguClE;AAsWD,wBAAgB,uBAAuB,CACrC,oBAAoB,EAAE,WAAW,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,EAC3D,2BAA2B,CAAC,EAAE,MAAM,GACnC,MAAM,CAuCR;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,oBAAoB,EAAE,MAAM,GAAG,MAAM,EAAE,CAgB3E;AA0ED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,MAAM,GAChB,MAAM,GAAG,IAAI,CA0Ef;AAgRD,wBAAgB,cAAc,IAAI,WAAW,EAAE,CAkC9C;AAGD,YAAY,EAAE,WAAW,EAAE,CAAC"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/chat/handler.ts"],"names":[],"mappings":"AAqDA,OAAO,EACL,mBAAmB,EACnB,cAAc,EAGd,KAAK,mBAAmB,EACxB,KAAK,wBAAwB,EAC9B,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EACL,mBAAmB,EACnB,cAAc,EACd,KAAK,mBAAmB,EACxB,KAAK,wBAAwB,GAC9B,CAAC;AAGF,OAAO,EACL,mBAAmB,EACnB,0BAA0B,EAC1B,wBAAwB,EACxB,2BAA2B,EAC3B,wBAAwB,EACxB,2BAA2B,EAC3B,yBAAyB,EACzB,6BAA6B,EAC7B,2BAA2B,EAC3B,4BAA4B,EAC5B,KAAK,oBAAoB,GAC1B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAQL,KAAK,aAAa,EACnB,MAAM,kBAAkB,CAAC;AA6B1B,OAAO,EAGL,KAAK,WAAW,EACjB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAOL,KAAK,WAAW,EAEjB,MAAM,eAAe,CAAC;AAYvB,OAAO,EAGL,KAAK,SAAS,EAEd,KAAK,cAAc,EAEpB,MAAM,kBAAkB,CAAC;AA6B1B,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,aAAa,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,CAAC;IAClB;;;;;OAKG;IACH,cAAc,CAAC,EAAE,OAAO,6BAA6B,EAAE,cAAc,CAAC;IACtE,+DAA+D;IAC/D,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,CAkQ7D;AAED,UAAU,aAAa;IACrB,GAAG,EAAE,aAAa,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,MAAM,EAAE,WAAW,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,6BAA6B,EAAE,cAAc,CAAC;IACtE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;4BAGwB;IACxB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;;;;;OAQG;IACH,OAAO,CAAC,EAAE,OAAO,eAAe,EAAE,WAAW,CAAC;IAC9C;;;;;;OAMG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAwvClE;AAsWD,wBAAgB,uBAAuB,CACrC,oBAAoB,EAAE,WAAW,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,EAC3D,2BAA2B,CAAC,EAAE,MAAM,GACnC,MAAM,CAuCR;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,oBAAoB,EAAE,MAAM,GAAG,MAAM,EAAE,CAgB3E;AA0ED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,MAAM,GAChB,MAAM,GAAG,IAAI,CA0Ef;AA2XD,wBAAgB,cAAc,IAAI,WAAW,EAAE,CAkC9C;AAGD,YAAY,EAAE,WAAW,EAAE,CAAC"}

package/packages/server/dist/chat/handler.js

@@ -22,7 +22,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { requireHomeDir } from "./require-home-dir.js";
 import { defaultSystemPrompt, } from "./system-prompt.js";
-import { shouldCompactBranch, tryAutoCompact, branchStillOverWindow, } from "./compact-decision.js";
+import { shouldCompactBranch, tryAutoCompact, branchStillOverWindow, isNothingToCompact, } from "./compact-decision.js";
 // Re-export the compaction-decision API at the handler boundary so
 // callers that imported it from handler.ts (agent-loop.ts, tests)
 // keep working without churn.
@@ -54,6 +54,7 @@ import { getUserStore } from "../core/auth/user-store.js";
 import { resolveTenantRole } from "../core/auth/identity.js";
 import { buildHostTools, buildRecallHostTools, getCompactRef } from "./host-tools.js";
 import { progressiveHistoryTransform } from "./progressive-history.js";
+import { installStructuredCompactionHook } from "./structured-compaction.js";
 import { toWire, } from "./ws-protocol.js";
 import { cacheGet, cachePut, fitToLimit, imageFitCacheKey, } from "./image-fit.js";
 const MAX_TURNS = 9999;
@@ -692,6 +693,21 @@ export async function runPrompt(args) {
     // compact, followUp, etc.) moved from harness onto AgentLane. Use
     // one "main" lane for the whole chat session.
     const lane = await harness.lane("main", piContext);
+    // Structured compaction: intercept pi's default free-form summary
+    // with a turn-numbered markdown block that lets the model use
+    // recall_range(A, B) against exact session turns. Falls through
+    // to pi's default summarizer on any hook failure; unsubscribed
+    // in the finally block below (see hookUnsubscribes).
+    const unsubStructuredCompaction = installStructuredCompactionHook({
+        harness,
+        session: { id: session.id },
+        db: ctx.db,
+        model: piModel,
+        apiKey,
+        onFallback: (reason) => {
+            log.warn(`structured_compaction fallback session=${session.id} reason=${reason}`);
+        },
+    });
     // Tool-result aging + progressive-history stubbing are now handled
     // inside `toProviderMessages` above (pi 0.85 removed the `context`
     // hook + `entryTransforms`); no separate unsubscribe needed.
@@ -1297,6 +1313,7 @@ export async function runPrompt(args) {
         }
         outstandingToolCalls.clear();
         unsubscribe();
+        unsubStructuredCompaction();
         unregisterHarness();
         signal.removeEventListener("abort", onAbort);
         if (storage)
@@ -1409,7 +1426,12 @@ export async function runPrompt(args) {
             send({ type: "stream_end", message: lastWire });
         }
         else {
-            // Synthetic placeholder so the UI doesn't get stuck.
+            // Synthetic placeholder so the UI doesn't get stuck. The id
+            // prefix `msg_empty_` is the sentinel chat-store.ts's
+            // stream_end handler matches on to *skip* appending this row
+            // to the transcript (see `isSyntheticEmpty` there). Real
+            // persisted rows use UUIDv7 ids (01a0…), so the prefix check
+            // is unambiguous. Keep both sides in sync when renaming.
             send({
                 type: "stream_end",
                 message: toWire({
@@ -2064,45 +2086,122 @@ async function runManualCompact(args) {
     const modelInfo = (modelId ? findModel(ctx.config, modelId) : undefined) ??
         getDefaultModel(ctx.config);
     if (!modelInfo) {
-        send({
-            type: "stream_error",
-            reason: "no models configured",
-        });
+        send({ type: "stream_error", reason: "no models configured" });
         return;
     }
-    const { messages, rows } = loadAgentHistoryForSession(ctx, session.id, {
-        api: modelInfo.api,
-        provider: modelInfo.providerId,
-        model: modelInfo.modelId,
-    });
-    if (messages.length === 0) {
-        send({
-            type: "stream_error",
-            reason: "nothing to compact (no messages yet)",
-        });
+    // Route manual /compact through pi's harness.compact() so the
+    // before_compaction hook fires (see structured-compaction.ts).
+    // Historically /compact went through the legacy fork+summarise
+    // path in compact.ts; that path never triggered pi hooks and
+    // therefore skipped the turn-numbered structured summary.
+    //
+    // We build a minimal, single-purpose harness here — no tools,
+    // no progressive-history, no active-harness registration — just
+    // enough to call `lane.compact()`. See runPrompt for the full
+    // harness setup used during real turns; this deliberately mirrors
+    // only the pieces compact needs (piStorage / piSession / piContext
+    // / harness / lane) so future pi API changes are easy to trace.
+    const piStorage = new SqliteStorage(ctx.db, session.id);
+    // Build a minimal SessionMetadata by hand rather than instantiating
+    // SqliteSessionStorage (which needs a real userHome for image
+    // inflation — not relevant to compaction). Only pi's storageVersion
+    // + id + createdAt are consulted by StorageBackedSession; the rest
+    // are optional and let pi thread parent-session pointers when they
+    // exist.
+    const sessionRow = ctx.db
+        .prepare(`SELECT created_at, parent_id FROM sessions WHERE id = ?`)
+        .get(session.id);
+    if (!sessionRow) {
+        send({ type: "stream_error", reason: `compact: session not found: ${session.id}` });
         return;
     }
+    const piSessionMetadata = {
+        id: session.id,
+        createdAt: sessionRow.created_at,
+        storageVersion: 2, // matches migration 015-pi-storage-v2
+        parentSessionId: sessionRow.parent_id ?? undefined,
+    };
+    const piSession = new StorageBackedSession(piSessionMetadata, piStorage);
+    const piModel = buildModel(modelInfo);
+    const apiKey = resolveApiKey(modelInfo);
+    const piContext = withAbortSignal(signal, BACKGROUND_CONTEXT);
+    let harness;
+    let unsubStructuredCompaction;
+    const t0 = Date.now();
     try {
-        const result = await compactSession({
-            ctx,
-            userId,
-            oldSession: session,
-            pi: messages,
-            rows,
-            modelInfo,
-            signal,
+        const created = await AgentHarness.create({
+            session: piSession,
+            tools: undefined,
+            model: piModel,
+            models: buildModels(piModel, apiKey, {
+                resilience: ctx.config.models?.resilience,
+                reResolveApiKey: () => resolveApiKey(modelInfo),
+                additionalModels: listModels(ctx.config)
+                    .filter((m) => !(m.modelId === modelInfo.modelId && m.providerId === modelInfo.providerId))
+                    .map((m) => ({ model: buildModel(m), apiKey: resolveApiKey(m) })),
+            }),
+        }, piContext);
+        harness = created.harness;
+        const lane = await harness.lane("main", piContext);
+        unsubStructuredCompaction = installStructuredCompactionHook({
+            harness,
+            session: { id: session.id },
+            db: ctx.db,
+            model: piModel,
+            apiKey,
+            onFallback: (reason) => {
+                log.warn(`structured_compaction fallback session=${session.id} reason=${reason} (manual)`);
+            },
         });
+        // Snapshot pre-compaction message count so we can report
+        // summarisedCount/keptCount without re-reading model context.
+        const branchBefore = await piSession.findEntries(undefined, piContext);
+        const msgsBefore = branchBefore.filter((e) => e.type === "message").length;
+        if (msgsBefore === 0) {
+            send({
+                type: "stream_error",
+                reason: "nothing to compact (no messages yet)",
+            });
+            return;
+        }
+        // pi 0.85+: lane.compact() returns Result<{compaction, run?}, err>.
+        // NothingToCompact means the tail is already a compaction entry
+        // — nothing new to fold in.
+        const result = await lane.compact(undefined, piContext);
+        if (!result.ok) {
+            const errTag = result.error._tag;
+            if (errTag === "NothingToCompact") {
+                send({
+                    type: "stream_error",
+                    reason: "nothing to compact (nothing new since last compaction)",
+                });
+                return;
+            }
+            send({
+                type: "stream_error",
+                reason: `compact failed: ${result.error.message ?? String(result.error)}`,
+            });
+            return;
+        }
+        const branchAfter = await piSession.findEntries(undefined, piContext);
+        const msgsAfter = branchAfter.filter((e) => e.type === "message").length;
+        const summarisedCount = Math.max(0, msgsBefore - msgsAfter);
+        const keptCount = msgsAfter;
+        const durationMs = Date.now() - t0;
+        // Manual /compact used to fork a new session; pi 0.87 writes the
+        // compaction entry into the SAME session. Send old==new here —
+        // chat-store.ts:698 already handles this shape (see the auto-
+        // compact path which has done old==new since the pi 0.85 migration).
         send({
             type: "history_compacted",
             reason: "manual",
-            oldSessionId: result.oldSessionId,
-            newSessionId: result.newSession.id,
-            summarisedCount: result.summarisedCount,
-            keptCount: result.keptCount,
-            durationMs: result.durationMs,
+            oldSessionId: session.id,
+            newSessionId: session.id,
+            summarisedCount,
+            keptCount,
+            durationMs,
         });
-        // Push a refreshed history so the UI swaps to the new session
-        // immediately (the fork ack + summary stub plus any kept tail).
+        // Refresh so the UI drops any stale streaming placeholder.
         const page = listMessagesForUserPage(ctx, userId);
         send({
             type: "history",
@@ -2111,8 +2210,11 @@ async function runManualCompact(args) {
         });
     }
     catch (err) {
-        if (err instanceof CompactSkippedError) {
-            send({ type: "stream_error", reason: `compact skipped: ${err.message}` });
+        if (isNothingToCompact(err)) {
+            send({
+                type: "stream_error",
+                reason: "nothing to compact (nothing new since last compaction)",
+            });
             return;
         }
         send({
@@ -2120,6 +2222,17 @@ async function runManualCompact(args) {
             reason: `compact failed: ${err instanceof Error ? err.message : String(err)}`,
         });
     }
+    finally {
+        unsubStructuredCompaction?.();
+        if (harness) {
+            try {
+                await harness.close(piContext);
+            }
+            catch (closeErr) {
+                log.warn(`runManualCompact: harness.close failed session=${session.id}: ${closeErr instanceof Error ? closeErr.message : String(closeErr)}`);
+            }
+        }
+    }
 }
 /**
  * Load skills shipped with the host repo (under `<repoRoot>/skills/`).