pi-sessions 0.5.1 → 0.7.0

package/extensions/session-ask.ts

@@ -1,22 +1,14 @@
-import type { Message } from "@earendil-works/pi-ai";
-import { complete } from "@earendil-works/pi-ai/compat";
 import type { ExtensionAPI, Theme } from "@earendil-works/pi-coding-agent";
-import { Text } from "@earendil-works/pi-tui";
+import { getKeybindings, type Keybinding, Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
-import { type RenderedSessionTree, renderSessionTreeMarkdown } from "./session-search/extract.js";
+import { runSessionAskAgent } from "./session-ask/agent.ts";
 import {
-  getIndexStatus,
   getSessionById,
-  INDEX_SCHEMA_VERSION,
-  openIndexDatabase,
   type SessionLineageRow,
-} from "./shared/session-index/index.js";
-import { formatSessionTitleOrShortId, isExactSessionId } from "./shared/session-ui.js";
-import { loadSettings } from "./shared/settings.js";
-
-const SESSION_ASK_SYSTEM_PROMPT = `You are analyzing a Pi coding session transcript. The transcript includes the entire session tree, including abandoned branches and summaries.
-
-Answer the user's question using only the session contents. Be specific and concise. Include exact file paths, decisions, and outcomes when present. If the answer is not in the session, say so clearly.`;
+  withSessionIndex,
+} from "./shared/session-index/index.ts";
+import { formatSessionTitleOrShortId, isExactSessionId } from "./shared/session-ui.ts";
+import { loadSettings } from "./shared/settings.ts";
 
 const COLLAPSED_ANSWER_PREVIEW_ROWS = 6;
 
@@ -25,21 +17,21 @@ interface SessionAskToolParams {
   question: string;
 }
 
+interface SessionAskRelevantFile {
+  path: string;
+  reason: string;
+}
+
 interface SessionAskToolDetails {
-  cancelled?: boolean | undefined;
-  error?: boolean | undefined;
   answer?: string | undefined;
+  debugSessionPath?: string | undefined;
   question?: string | undefined;
+  relevantFiles?: SessionAskRelevantFile[] | undefined;
   sessionId?: string | undefined;
   sessionName?: string | undefined;
   sessionPath?: string | undefined;
 }
 
-interface TextContentBlock {
-  type: "text";
-  text: string;
-}
-
 export default function sessionAskExtension(pi: ExtensionAPI): void {
   const settings = loadSettings();
 
@@ -61,32 +53,17 @@ export default function sessionAskExtension(pi: ExtensionAPI): void {
     async execute(_toolCallId, params: SessionAskToolParams, signal, onUpdate, ctx) {
       const sessionId = params.session.trim();
       if (!sessionId) {
-        return errorResult("session_ask requires a session id.", { error: true });
+        throw new Error("session_ask requires a session id.");
       }
 
       const question = params.question.trim();
       if (!question) {
-        return errorResult("session_ask requires a question.", { error: true, sessionId });
+        throw new Error("session_ask requires a question.");
       }
 
       const resolvedTarget = resolveSessionAskTarget(sessionId, settings.index.path);
       if (!resolvedTarget.resolved) {
-        return errorResult(resolvedTarget.error ?? "Unable to resolve session id.", {
-          error: true,
-          sessionId,
-          question,
-        });
-      }
-
-      if (!ctx.model) {
-        return errorResult("No active model is available for session_ask.", { error: true });
-      }
-
-      const auth = await ctx.modelRegistry.getApiKeyAndHeaders(ctx.model);
-      if (!auth.ok || !auth.apiKey) {
-        return errorResult(`No API key is available for ${ctx.model.provider}/${ctx.model.id}.`, {
-          error: true,
-        });
+        throw new Error(resolvedTarget.error ?? "Unable to resolve session id.");
       }
 
       const progressDetails: SessionAskToolDetails = {
@@ -100,68 +77,41 @@ export default function sessionAskExtension(pi: ExtensionAPI): void {
         details: progressDetails,
       });
 
-      let rendered: RenderedSessionTree;
-      try {
-        rendered = renderSessionTreeMarkdown(resolvedTarget.resolved.sessionPath);
-      } catch (error) {
-        return errorResult(formatSessionAskLoadError(resolvedTarget.resolved.sessionPath, error), {
-          error: true,
-          sessionId,
-          sessionPath: resolvedTarget.resolved.sessionPath,
-          question,
-        });
-      }
-
-      const loadedDetails: SessionAskToolDetails = {
-        question,
-        sessionId: rendered.sessionId,
-        sessionName: rendered.sessionName,
-        sessionPath: resolvedTarget.resolved.sessionPath,
-      };
       onUpdate?.({
         content: [
           {
             type: "text",
-            text: formatSessionAskHeader(rendered.sessionId, rendered.sessionName, question),
+            text: formatSessionAskHeader(
+              resolvedTarget.resolved.sessionId,
+              resolvedTarget.resolved.sessionName,
+              question,
+            ),
           },
         ],
-        details: loadedDetails,
+        details: progressDetails,
       });
 
-      const userMessage: Message = {
-        role: "user",
-        content: [
-          {
-            type: "text",
-            text: [`## Session`, rendered.markdown, "", "## Question", question].join("\n"),
-          },
-        ],
-        timestamp: Date.now(),
-      };
-
-      const response = await complete(
-        ctx.model,
-        { systemPrompt: SESSION_ASK_SYSTEM_PROMPT, messages: [userMessage] },
-        signal
-          ? {
-              apiKey: auth.apiKey,
-              ...(auth.headers ? { headers: auth.headers } : {}),
-              signal,
-            }
-          : {
-              apiKey: auth.apiKey,
-              ...(auth.headers ? { headers: auth.headers } : {}),
-            },
-      );
+      const agentResult = await runSessionAskAgent({
+        ctx,
+        target: resolvedTarget.resolved,
+        question,
+        indexPath: settings.index.path,
+        askSettings: settings.ask,
+        thinkingLevel: pi.getThinkingLevel(),
+        signal,
+      });
 
-      if (response.stopReason === "aborted") {
-        return errorResult("Session ask was cancelled.", { cancelled: true });
+      if (signal?.aborted) {
+        throw new Error("Session ask was cancelled.");
       }
 
-      const answer = collectTextBlocks(response.content).join("\n").trim();
+      const answer = agentResult?.answer || "Could not determine an answer from the session.";
+      const relevantFiles = agentResult?.relevantFiles ?? [];
 
       const details: SessionAskToolDetails = {
         answer,
+        debugSessionPath: agentResult?.debugSessionPath,
+        relevantFiles,
         sessionId: resolvedTarget.resolved.sessionId,
         sessionName: resolvedTarget.resolved.sessionName,
         sessionPath: resolvedTarget.resolved.sessionPath,
@@ -172,21 +122,29 @@ export default function sessionAskExtension(pi: ExtensionAPI): void {
           {
             type: "text",
             text: [
-              formatSessionAskHeader(rendered.sessionId, rendered.sessionName, question),
-              answer || "No answer generated.",
+              formatSessionAskHeader(
+                resolvedTarget.resolved.sessionId,
+                resolvedTarget.resolved.sessionName,
+                question,
+              ),
+              formatSessionAskAnswer(answer, relevantFiles, agentResult?.debugSessionPath),
             ].join("\n\n"),
           },
         ],
         details,
       };
     },
-    renderResult(result, { expanded, isPartial }, theme) {
+    renderResult(result, { expanded, isPartial }, theme, context) {
       const details = result.details as SessionAskToolDetails | undefined;
       const content = result.content[0];
       if (content?.type !== "text") {
         return new Text(theme.fg("error", "No session output"), 0, 0);
       }
 
+      if (context.isError) {
+        return new Text(theme.fg("error", content.text), 0, 0);
+      }
+
       if (isPartial) {
         const lines = [theme.bold(theme.fg("warning", "Reading session..."))];
         if (details?.sessionId || details?.sessionName) {
@@ -199,14 +157,6 @@ export default function sessionAskExtension(pi: ExtensionAPI): void {
         return new Text(lines.join("\n"), 0, 0);
       }
 
-      if (details?.cancelled) {
-        return new Text(theme.fg("warning", content.text), 0, 0);
-      }
-
-      if (details?.error) {
-        return new Text(theme.fg("error", content.text), 0, 0);
-      }
-
       const answer = (details?.answer ?? "").trim() || "No answer generated.";
       const identity = formatSessionTitleOrShortId(details?.sessionName, details?.sessionId);
       const lines = [`title: ${theme.bold(identity)}`];
@@ -234,30 +184,20 @@ function resolveSessionAskTarget(
     };
   }
 
-  const status = getIndexStatus(indexPath);
-  if (!status.exists || status.schemaVersion !== INDEX_SCHEMA_VERSION) {
-    return {
-      error: `Session index missing or incompatible at ${indexPath}. Run /session-index and press r to rebuild it.`,
-    };
-  }
-
-  const db = openIndexDatabase(status.dbPath, { create: false });
   try {
-    const row = getSessionById(db, sessionId);
-    if (!row) {
-      return { error: `No indexed session found for id: ${sessionId}` };
-    }
+    return withSessionIndex(indexPath, { mode: "read", required: true }, ({ db }) => {
+      const row = getSessionById(db, sessionId);
+      if (!row) {
+        return { error: `No indexed session found for id: ${sessionId}` };
+      }
 
-    return { resolved: row };
-  } finally {
-    db.close();
+      return { resolved: row };
+    });
+  } catch (error) {
+    return { error: error instanceof Error ? error.message : String(error) };
   }
 }
 
-function collectTextBlocks(content: Array<{ type: string; text?: string }>): string[] {
-  return content.filter(isTextContentBlock).map((block) => block.text);
-}
-
 function formatSessionAskHeader(sessionId: string, sessionName: string, question: string): string {
   return [
     `session: ${sessionId}`,
@@ -266,14 +206,20 @@ function formatSessionAskHeader(sessionId: string, sessionName: string, question
   ].join("\n");
 }
 
-function errorResult(
-  text: string,
-  details: SessionAskToolDetails,
-): { content: Array<{ type: "text"; text: string }>; details: SessionAskToolDetails } {
-  return {
-    content: [{ type: "text", text }],
-    details,
-  };
+function formatSessionAskAnswer(
+  answer: string,
+  relevantFiles: SessionAskRelevantFile[],
+  debugSessionPath: string | undefined,
+): string {
+  const lines = [answer || "No answer generated."];
+  if (relevantFiles.length > 0) {
+    lines.push("", "Relevant files:");
+    lines.push(...relevantFiles.map((file) => `- ${file.path}: ${file.reason}`));
+  }
+  if (debugSessionPath) {
+    lines.push("", `debug_session: ${debugSessionPath}`);
+  }
+  return lines.join("\n");
 }
 
 function formatSessionAskAnswerPreview(answer: string, expanded: boolean, theme: Theme): string[] {
@@ -282,17 +228,19 @@ function formatSessionAskAnswerPreview(answer: string, expanded: boolean, theme:
     return lines;
   }
 
-  return [...lines.slice(0, COLLAPSED_ANSWER_PREVIEW_ROWS), theme.fg("dim", "...")];
+  return [
+    ...lines.slice(0, COLLAPSED_ANSWER_PREVIEW_ROWS),
+    formatOverflowHint(lines.length - COLLAPSED_ANSWER_PREVIEW_ROWS, lines.length, theme),
+  ];
 }
 
-function formatSessionAskLoadError(sessionPath: string, error: unknown): string {
-  if (error instanceof Error && "code" in error && error.code === "ENOENT") {
-    return `Session file not found: ${sessionPath}`;
-  }
-
-  return `Unable to load session file: ${sessionPath}`;
+function formatOverflowHint(remaining: number, total: number, theme: Theme): string {
+  return `${theme.fg("muted", `... (${remaining} more lines, ${total} total,`)} ${theme.fg(
+    "dim",
+    formatKeyHint("app.tools.expand"),
+  )}${theme.fg("muted", " to expand)")}`;
 }
 
-function isTextContentBlock(content: { type: string; text?: string }): content is TextContentBlock {
-  return content.type === "text" && typeof content.text === "string";
+function formatKeyHint(keybinding: Keybinding): string {
+  return getKeybindings().getKeys(keybinding).join("/");
 }

package/extensions/session-auto-title/command.ts

@@ -1,6 +1,6 @@
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import type { AutocompleteItem } from "@earendil-works/pi-tui";
-import { isTuiMode } from "../shared/pi-mode.js";
+import { isTuiMode } from "../shared/pi-mode.ts";
 
 export const TITLE_USAGE = "Usage: /title [this|folder|pi] [-f]";
 

package/extensions/session-auto-title/controller.ts

@@ -1,13 +1,13 @@
 import { buildSessionContext, type ExtensionContext } from "@earendil-works/pi-coding-agent";
-import type { AutoTitleSettings } from "../shared/settings.js";
-import type { AutoTitleFailure } from "./generate.js";
+import type { AutoTitleSettings } from "../shared/settings.ts";
+import type { AutoTitleFailure } from "./generate.ts";
 import {
   type AutoTitleMode,
   type AutoTitlePersistedState,
   type AutoTitleTrigger,
   createAutoTitleState,
   getLatestAutoTitleState,
-} from "./state.js";
+} from "./state.ts";
 
 export interface SessionAutoTitleStateSnapshot {
   currentSessionFile: string | undefined;

package/extensions/session-auto-title/generate.ts

@@ -4,8 +4,8 @@ import { join } from "node:path";
 import type { Api, Model, TextContent, UserMessage } from "@earendil-works/pi-ai";
 import { completeSimple } from "@earendil-works/pi-ai/compat";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import type { AutoTitleContext } from "./context.js";
-import type { AutoTitleTrigger } from "./state.js";
+import type { AutoTitleContext } from "./context.ts";
+import type { AutoTitleTrigger } from "./state.ts";
 
 const AUTO_TITLE_REQUEST_TIMEOUT_MS = 15_000;
 const AUTO_TITLE_MAX_TOKENS = 64;

package/extensions/session-auto-title/model.ts

@@ -1,6 +1,7 @@
 import type { Api, Model } from "@earendil-works/pi-ai";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { ModelReference } from "../shared/settings.js";
+import { findModelByReference } from "../shared/model.ts";
+import { ModelReference } from "../shared/settings.ts";
 
 const DEFAULT_AUTO_TITLE_FALLBACK_MODELS: readonly ModelReference[] = [
   new ModelReference("google", "gemini-flash-lite-latest"),
@@ -22,7 +23,7 @@ export function resolveAutoTitleModel(
   const availableModels = ctx.modelRegistry.getAvailable();
 
   if (configuredModel) {
-    const configuredMatch = findMatchingModel(availableModels, configuredModel);
+    const configuredMatch = findModelByReference(availableModels, configuredModel);
     if (configuredMatch) {
       return {
         model: configuredMatch,
@@ -32,7 +33,7 @@ export function resolveAutoTitleModel(
   }
 
   for (const fallbackReference of DEFAULT_AUTO_TITLE_FALLBACK_MODELS) {
-    const fallbackMatch = findMatchingModel(availableModels, fallbackReference);
+    const fallbackMatch = findModelByReference(availableModels, fallbackReference);
     if (fallbackMatch) {
       return {
         model: fallbackMatch,
@@ -50,12 +51,3 @@ export function resolveAutoTitleModel(
     source: "current",
   };
 }
-
-function findMatchingModel(
-  availableModels: Model<Api>[],
-  reference: ModelReference,
-): Model<Api> | undefined {
-  return availableModels.find(
-    (model) => model.provider === reference.provider && model.id === reference.modelId,
-  );
-}

package/extensions/session-auto-title/retitle.ts

@@ -6,19 +6,19 @@ import type {
   SessionInfo,
 } from "@earendil-works/pi-coding-agent";
 import { SessionManager } from "@earendil-works/pi-coding-agent";
-import type { RetitleMode, RetitleScope } from "./command.js";
-import { buildAutoTitleContext } from "./context.js";
-import type { AutoTitleTriggerPlan, SessionAutoTitleController } from "./controller.js";
+import type { RetitleMode, RetitleScope } from "./command.ts";
+import { buildAutoTitleContext } from "./context.ts";
+import type { AutoTitleTriggerPlan, SessionAutoTitleController } from "./controller.ts";
 import {
   type AutoTitleGenerationResult,
   createAutoTitleFailure,
   generateAutoTitle,
-} from "./generate.js";
+} from "./generate.ts";
 import {
   AUTO_TITLE_STATE_CUSTOM_TYPE,
   type AutoTitlePersistedState,
   createAutoTitleState,
-} from "./state.js";
+} from "./state.ts";
 
 export interface RetitleScopeScan {
   scope: Exclude<RetitleScope, "this">;

package/extensions/session-auto-title/state.ts

@@ -1,6 +1,6 @@
 import type { SessionEntry } from "@earendil-works/pi-coding-agent";
 import { type Static, Type } from "typebox";
-import { safeParseTypeBoxValue } from "../shared/typebox.js";
+import { safeParseTypeBoxValue } from "../shared/typebox.ts";
 
 export const AUTO_TITLE_STATE_CUSTOM_TYPE = "pi-sessions.auto-title";
 export const AUTO_TITLE_STATE_VERSION = 1;

package/extensions/session-auto-title/wizard.ts

@@ -7,9 +7,9 @@ import {
 } from "@earendil-works/pi-coding-agent";
 import type { Focusable, TUI } from "@earendil-works/pi-tui";
 import { matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import type { RetitleCommandOutcome, RetitleMode, RetitleScope } from "./command.js";
-import type { AutoRetitleStatus, SessionAutoTitleController } from "./controller.js";
-import type { AutoTitleFailure } from "./generate.js";
+import type { RetitleCommandOutcome, RetitleMode, RetitleScope } from "./command.ts";
+import type { AutoRetitleStatus, SessionAutoTitleController } from "./controller.ts";
+import type { AutoTitleFailure } from "./generate.ts";
 import {
   buildBulkRetitleMessage,
   buildRetitleScopeScan,
@@ -20,7 +20,7 @@ import {
   type RetitleScopeScan,
   runBulkRetitle,
   runRetitlePlan,
-} from "./retitle.js";
+} from "./retitle.ts";
 
 interface RetitleWizardOptions {
   initialInvocation?: {

package/extensions/session-auto-title.ts

@@ -11,29 +11,29 @@ import {
   getRetitleArgumentCompletions,
   type RetitleCommandInvocation,
   type RetitleCommandOutcome,
-} from "./session-auto-title/command.js";
+} from "./session-auto-title/command.ts";
 import {
   createSessionAutoTitleController,
   type SessionAutoTitleController,
-} from "./session-auto-title/controller.js";
-import { resolveAutoTitleModel } from "./session-auto-title/model.js";
+} from "./session-auto-title/controller.ts";
+import { resolveAutoTitleModel } from "./session-auto-title/model.ts";
 import {
   buildRetitleScopeScan,
   notifyBulkRetitleResult,
   persistAutoTitleState,
   runBulkRetitle,
   runRetitlePlan,
-} from "./session-auto-title/retitle.js";
-import { showRetitleWizard } from "./session-auto-title/wizard.js";
-import { isTuiMode } from "./shared/pi-mode.js";
-import { loadSettings } from "./shared/settings.js";
+} from "./session-auto-title/retitle.ts";
+import { showRetitleWizard } from "./session-auto-title/wizard.ts";
+import { isTuiMode } from "./shared/pi-mode.ts";
+import { loadSettings } from "./shared/settings.ts";
 
 export {
   createSessionAutoTitleCommandHandler,
   getRetitleArgumentCompletions,
   parseRetitleCommand,
   TITLE_USAGE,
-} from "./session-auto-title/command.js";
+} from "./session-auto-title/command.ts";
 
 interface TitleRunState {
   controller: SessionAutoTitleController;

package/extensions/session-handoff/extract.ts

@@ -19,7 +19,7 @@ import {
   serializeConversation,
 } from "@earendil-works/pi-coding-agent";
 import { type Static, Type } from "typebox";
-import { parseTypeBoxValue } from "../shared/typebox.js";
+import { parseTypeBoxValue } from "../shared/typebox.ts";
 
 const MAX_RELEVANT_FILES = 12;
 const MAX_OPEN_QUESTIONS = 8;
@@ -88,6 +88,7 @@ export async function generateHandoffDraft(
   goal: string,
   thinkingLevel: ThinkingLevel | undefined,
   signal?: AbortSignal,
+  requestResponse = false,
 ): Promise<HandoffDraftResult | undefined> {
   if (!ctx.model) {
     throw new Error("No model is available for handoff.");
@@ -99,6 +100,7 @@ export async function generateHandoffDraft(
     goal,
     thinkingLevel,
     signal,
+    requestResponse,
   );
 }
 
@@ -108,6 +110,7 @@ export async function generateHandoffDraftFromSessionManager(
   goal: string,
   thinkingLevel: ThinkingLevel | undefined,
   signal?: AbortSignal,
+  requestResponse = false,
 ): Promise<HandoffDraftResult | undefined> {
   if (!ctx.model) {
     throw new Error("No model is available for handoff.");
@@ -139,7 +142,7 @@ export async function generateHandoffDraftFromSessionManager(
   const sessionPath = sourceSessionManager.getSessionFile();
 
   return {
-    draft: assembleHandoffDraft(sessionId, sessionPath, handoffContext, goal),
+    draft: assembleHandoffDraft(sessionId, sessionPath, handoffContext, goal, requestResponse),
     context: handoffContext,
     sessionId,
     sessionPath,
@@ -241,8 +244,9 @@ export function assembleHandoffDraft(
   sessionPath: string | undefined,
   handoffContext: HandoffContext,
   goal: string,
+  requestResponse = false,
 ): string {
-  const sections = [buildContinuityLine(sessionId, sessionPath)];
+  const sections = [buildContinuityLine(sessionId, sessionPath, requestResponse)];
   const nextTask = handoffContext.nextTask.trim() || goal.trim();
 
   if (nextTask) {
@@ -326,8 +330,17 @@ function extractHandoffContextFromArguments(
   };
 }
 
-function buildContinuityLine(sessionId: string, _sessionPath: string | undefined): string {
-  return `Continuing work from session ${sessionId}. When you lack specific information you can use session_ask.`;
+function buildContinuityLine(
+  sessionId: string,
+  _sessionPath: string | undefined,
+  requestResponse: boolean,
+): string {
+  const base = `Continuing work from session ${sessionId}. When you lack specific information you can use session_ask.`;
+  if (!requestResponse) {
+    return base;
+  }
+
+  return `${base} When this work is complete, send that session a completion report with session_send_message.`;
 }
 
 function normalizeStringArray(value: unknown, limit: number): string[] {

package/extensions/session-handoff/metadata.ts

@@ -1,7 +1,7 @@
 import { Buffer } from "node:buffer";
 import type { CustomEntry, SessionEntry } from "@earendil-works/pi-coding-agent";
 import { type Static, Type } from "typebox";
-import { safeParseTypeBoxValue } from "../shared/typebox.js";
+import { safeParseTypeBoxValue } from "../shared/typebox.ts";
 
 export const HANDOFF_METADATA_CUSTOM_TYPE = "pi-sessions.handoff";
 export const HANDOFF_BOOTSTRAP_ENV = "PI_SESSIONS_HANDOFF_BOOTSTRAP";
@@ -30,6 +30,7 @@ export const CHILD_GENERATED_HANDOFF_BOOTSTRAP_SCHEMA = Type.Object({
   goal: Type.String(),
   title: Type.String(),
   parentSessionFile: Type.String(),
+  requestResponse: Type.Optional(Type.Boolean()),
 });
 
 export const HANDOFF_BOOTSTRAP_SCHEMA = Type.Union([
@@ -80,6 +81,7 @@ export function createChildGeneratedHandoffBootstrap(options: {
   goal: string;
   title: string;
   parentSessionFile: string;
+  requestResponse?: boolean | undefined;
 }): ChildGeneratedHandoffBootstrap {
   return {
     mode: "generate",
@@ -87,6 +89,7 @@ export function createChildGeneratedHandoffBootstrap(options: {
     goal: options.goal.trim(),
     title: options.title.trim(),
     parentSessionFile: options.parentSessionFile,
+    ...(options.requestResponse === undefined ? {} : { requestResponse: options.requestResponse }),
   };
 }