pi: make /drop transparent to /fold so fold summarizes across drops

Author: juanibiapina

dotfiles/pi/.pi/agent/extensions/drop.ts

@@ -6,8 +6,9 @@
  *           using the last message as the branch summary instead of
  *           generating one with the LLM.
  *
- * This is a fast, zero-cost alternative to /fold. Compatible with fold's
- * anchor system (uses the same "fold" label).
+ * This is a fast, zero-cost alternative to /fold. Does not create a fold
+ * marker, so the next /fold will reach back past the drop point and include
+ * the drop's branch summary in its summarization.
  *
  * Usage:
  *   /drop
@@ -94,7 +95,6 @@ export default function (pi: ExtensionAPI) {
 			// Navigate tree back to anchor with the last message as summary
 			const navResult = await ctx.navigateTree(anchorId, {
 				summarize: true,
-				label: "fold",
 			});
 
 			if (navResult.cancelled) {

dotfiles/pi/.pi/agent/extensions/fold.ts

@@ -88,9 +88,23 @@ export default function (pi: ExtensionAPI) {
 			// Gather messages after anchor for summarization
 			const anchorIndex = branch.findIndex((e) => e.id === anchorId);
 			const entriesAfterAnchor = branch.slice(anchorIndex + 1);
-			const messages = entriesAfterAnchor
-				.filter((entry): entry is SessionEntry & { type: "message" } => entry.type === "message")
-				.map((entry) => entry.message);
+			const messages: Parameters<typeof convertToLlm>[0] = [];
+			for (const entry of entriesAfterAnchor) {
+				if (entry.type === "message") {
+					messages.push(entry.message);
+				} else if (entry.type === "branch_summary") {
+					// Include drop summaries (unlabeled) but skip fold summaries (labeled "fold")
+					const label = ctx.sessionManager.getLabel(entry.id);
+					if (label !== "fold") {
+						messages.push({
+							role: "branchSummary" as const,
+							summary: entry.summary,
+							fromId: entry.fromId,
+							timestamp: Date.parse(entry.timestamp),
+						});
+					}
+				}
+			}
 
 			if (messages.length === 0) {
 				ctx.ui.notify("No conversation to fold", "error");