pi-sessions 0.2.2 → 0.3.1

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

@@ -1,10 +1,4 @@
-import {
-  type Api,
-  completeSimple,
-  type Model,
-  type TextContent,
-  type UserMessage,
-} from "@earendil-works/pi-ai";
+import type { Api, Model } from "@earendil-works/pi-ai";
 import type {
   ExtensionAPI,
   ExtensionCommandContext,
@@ -13,27 +7,19 @@ import type {
 } from "@earendil-works/pi-coding-agent";
 import { SessionManager } from "@earendil-works/pi-coding-agent";
 import type { RetitleMode, RetitleScope } from "./command.js";
-import { type AutoTitleContext, buildAutoTitleContext } from "./context.js";
-import type {
-  AutoTitleFailure,
-  AutoTitleTriggerPlan,
-  SessionAutoTitleController,
-} from "./controller.js";
+import { buildAutoTitleContext } from "./context.js";
+import type { AutoTitleTriggerPlan, SessionAutoTitleController } from "./controller.js";
 import {
-  AUTO_TITLE_SYSTEM_PROMPT,
-  buildAutoTitlePrompt,
-  normalizeGeneratedAutoTitle,
-} from "./prompt.js";
+  type AutoTitleGenerationResult,
+  createAutoTitleFailure,
+  generateAutoTitle,
+} from "./generate.js";
 import {
   AUTO_TITLE_STATE_CUSTOM_TYPE,
   type AutoTitlePersistedState,
-  type AutoTitleTrigger,
   createAutoTitleState,
 } from "./state.js";
 
-const AUTO_TITLE_REQUEST_TIMEOUT_MS = 15_000;
-const AUTO_TITLE_MAX_TOKENS = 64;
-
 export interface RetitleScopeScan {
   scope: Exclude<RetitleScope, "this">;
   sessions: SessionInfo[];
@@ -71,6 +57,7 @@ export async function runBulkRetitle(
   scan: RetitleScopeScan,
   mode: RetitleMode,
   getSessionEpoch: () => number,
+  systemPrompt: string,
 ): Promise<BulkRetitleResult> {
   const result: BulkRetitleResult = {
     attempted: 0,
@@ -97,6 +84,7 @@ export async function runBulkRetitle(
         ctx,
         model,
         isManual: true,
+        systemPrompt,
         getSessionEpoch,
         notifyOnSuccess: false,
       });
@@ -104,7 +92,7 @@ export async function runBulkRetitle(
       continue;
     }
 
-    const outcome = await retitleStoredSession(ctx, model, session.path);
+    const outcome = await retitleStoredSession(ctx, model, session.path, systemPrompt);
     result[outcome] += 1;
   }
 
@@ -176,23 +164,17 @@ export interface RetitlePlanOptions {
   ctx: ExtensionContext;
   model: Model<Api> | undefined;
   isManual: boolean;
+  systemPrompt: string;
   existingPlan?: AutoTitleTriggerPlan;
   getSessionEpoch?: () => number;
   notifyOnSuccess?: boolean;
 }
 
-export type RetitlePlanResult =
-  | {
-      ok: true;
-      title: string;
-    }
-  | {
-      ok: false;
-      failure: AutoTitleFailure;
-    };
-
-export async function runRetitlePlan(options: RetitlePlanOptions): Promise<RetitlePlanResult> {
-  const { pi, controller, ctx, model, isManual, existingPlan, getSessionEpoch } = options;
+export async function runRetitlePlan(
+  options: RetitlePlanOptions,
+): Promise<AutoTitleGenerationResult> {
+  const { pi, controller, ctx, model, isManual, systemPrompt, existingPlan, getSessionEpoch } =
+    options;
   const notifyOnSuccess = options.notifyOnSuccess ?? isManual;
 
   const plan = existingPlan ?? controller.handleManualRetitle(ctx);
@@ -215,7 +197,21 @@ export async function runRetitlePlan(options: RetitlePlanOptions): Promise<Retit
   }
 
   const currentEpoch = getSessionEpoch?.();
-  const generatedTitle = await generateAutoTitle(ctx, plan, model);
+  const titleContext = buildAutoTitleContext(
+    ctx.sessionManager.getEntries(),
+    ctx.sessionManager.getLeafId(),
+    {
+      cwd: ctx.cwd,
+      currentTitle: plan.currentTitle,
+    },
+  );
+  const generatedTitle = await generateAutoTitle(
+    ctx,
+    model,
+    titleContext,
+    plan.reason,
+    systemPrompt,
+  );
   if (!generatedTitle.ok) {
     return generatedTitle;
   }
@@ -260,6 +256,7 @@ async function retitleStoredSession(
   ctx: ExtensionContext,
   model: Model<Api>,
   sessionPath: string,
+  systemPrompt: string,
 ): Promise<"retitled" | "unchanged" | "failed"> {
   const sessionManager = SessionManager.open(sessionPath);
   const currentTitle = sessionManager.getSessionName();
@@ -276,7 +273,13 @@ async function retitleStoredSession(
     userTurnCount: titleContext.userTurnCount,
     currentTitle,
   };
-  const generatedTitle = await generateAutoTitleFromContext(ctx, plan, model, titleContext);
+  const generatedTitle = await generateAutoTitle(
+    ctx,
+    model,
+    titleContext,
+    plan.reason,
+    systemPrompt,
+  );
   if (!generatedTitle.ok) {
     return "failed";
   }
@@ -300,342 +303,3 @@ async function retitleStoredSession(
 function hasSessionTitle(name: string | undefined): boolean {
   return Boolean(name?.trim());
 }
-
-async function generateAutoTitle(
-  ctx: ExtensionContext,
-  plan: AutoTitleTriggerPlan,
-  model: Model<Api>,
-): Promise<RetitlePlanResult> {
-  const titleContext = buildAutoTitleContext(
-    ctx.sessionManager.getEntries(),
-    ctx.sessionManager.getLeafId(),
-    {
-      cwd: ctx.cwd,
-      currentTitle: plan.currentTitle,
-    },
-  );
-  return generateAutoTitleFromContext(ctx, plan, model, titleContext);
-}
-
-async function generateAutoTitleFromContext(
-  ctx: ExtensionContext,
-  plan: AutoTitleTriggerPlan,
-  model: Model<Api>,
-  titleContext: AutoTitleContext,
-): Promise<RetitlePlanResult> {
-  if (!titleContext.conversationText) {
-    return {
-      ok: false,
-      failure: createAutoTitleFailure(
-        plan.reason,
-        model,
-        "No conversation available for auto-title generation.",
-      ),
-    };
-  }
-
-  const auth = await ctx.modelRegistry.getApiKeyAndHeaders(model);
-  if (!auth.ok) {
-    return {
-      ok: false,
-      failure: createAutoTitleFailure(
-        plan.reason,
-        model,
-        "Failed to authenticate auto-title model.",
-      ),
-    };
-  }
-
-  const message: UserMessage = {
-    role: "user",
-    content: [{ type: "text", text: buildAutoTitlePrompt(titleContext, plan.reason) }],
-    timestamp: Date.now(),
-  };
-
-  const abortController = new AbortController();
-  const timeoutId = setTimeout(() => abortController.abort(), AUTO_TITLE_REQUEST_TIMEOUT_MS);
-
-  try {
-    const response = await completeSimple(
-      model,
-      {
-        systemPrompt: AUTO_TITLE_SYSTEM_PROMPT,
-        messages: [message],
-      },
-      {
-        ...(auth.apiKey && { apiKey: auth.apiKey }),
-        ...(auth.headers && { headers: auth.headers }),
-        maxTokens: AUTO_TITLE_MAX_TOKENS,
-        signal: abortController.signal,
-      },
-    );
-
-    if (response.stopReason === "error" || response.stopReason === "aborted") {
-      const fallbackMessage =
-        response.stopReason === "aborted" ? "Request was aborted." : "Provider returned an error.";
-      const failureDetails = extractFailureDetails(
-        response.errorMessage || fallbackMessage,
-        response,
-      );
-      return {
-        ok: false,
-        failure: createAutoTitleFailure(
-          plan.reason,
-          model,
-          failureDetails.message,
-          failureDetails.status,
-        ),
-      };
-    }
-
-    const responseText = response.content
-      .filter((part): part is TextContent => part.type === "text")
-      .map((part) => part.text)
-      .join("\n");
-    const normalizedTitle = normalizeGeneratedAutoTitle(responseText);
-    if (!normalizedTitle) {
-      return {
-        ok: false,
-        failure: createAutoTitleFailure(plan.reason, model, "Model returned an empty title."),
-      };
-    }
-
-    return {
-      ok: true,
-      title: normalizedTitle,
-    };
-  } catch (error) {
-    const failureDetails = extractFailureDetails(error);
-    return {
-      ok: false,
-      failure: createAutoTitleFailure(
-        plan.reason,
-        model,
-        failureDetails.message,
-        failureDetails.status,
-      ),
-    };
-  } finally {
-    clearTimeout(timeoutId);
-  }
-}
-
-function createAutoTitleFailure(
-  trigger: AutoTitleTrigger,
-  model: Model<Api> | undefined,
-  message: string,
-  status?: number,
-): AutoTitleFailure {
-  return {
-    at: new Date().toISOString(),
-    trigger,
-    model: formatModelLabel(model),
-    message,
-    ...(status !== undefined ? { status } : {}),
-  };
-}
-
-function formatModelLabel(model: Model<Api> | undefined): string {
-  if (!model) {
-    return "(no model resolved)";
-  }
-
-  return `${model.provider}/${model.id}`;
-}
-
-function extractFailureDetails(
-  primary: unknown,
-  secondary?: unknown,
-): { message: string; status?: number } {
-  const structured =
-    parseStructuredProviderError(primary) ??
-    parseStructuredProviderError(secondary) ??
-    parseEmbeddedErrorFromObject(primary);
-  if (structured) {
-    return structured;
-  }
-
-  const message =
-    extractStringMessage(primary) || extractStringMessage(secondary) || "Unknown provider error.";
-  const status = extractStatus(primary) ?? extractStatus(secondary);
-  return {
-    message,
-    ...(status !== undefined ? { status } : {}),
-  };
-}
-
-function parseEmbeddedErrorFromObject(
-  value: unknown,
-): { message: string; status?: number } | undefined {
-  if (!isObject(value) && !(value instanceof Error)) {
-    return undefined;
-  }
-
-  const embedded = extractStringMessage(value);
-  return embedded ? parseStructuredProviderError(embedded) : undefined;
-}
-
-function parseStructuredProviderError(
-  value: unknown,
-): { message: string; status?: number } | undefined {
-  const json = parseJsonObjectCandidate(value);
-  if (!json) {
-    return undefined;
-  }
-
-  const topError = isObject(json.error) ? json.error : undefined;
-  const status =
-    readNumericStatus(json) ??
-    readNumericStatus(topError) ??
-    (typeof topError?.code === "number" ? topError.code : undefined);
-  const rawMessage =
-    readString(topError?.message) ?? readString(json.message) ?? readString(json.errorMessage);
-  if (!rawMessage) {
-    return undefined;
-  }
-
-  const labels = collectProviderErrorLabels(json, topError);
-  return {
-    message: formatStructuredErrorMessage(labels, rawMessage),
-    ...(status !== undefined ? { status } : {}),
-  };
-}
-
-function collectProviderErrorLabels(
-  root: Record<string, unknown>,
-  nestedError: Record<string, unknown> | undefined,
-): string[] {
-  const labels: string[] = [];
-  const candidates = [
-    readString(nestedError?.status),
-    readString(nestedError?.type),
-    readString(nestedError?.code),
-    readString(root.status),
-    readString(root.type),
-    readString(root.code),
-  ];
-
-  for (const candidate of candidates) {
-    if (!candidate) {
-      continue;
-    }
-
-    const normalized = candidate.trim();
-    if (!normalized || normalized === "error") {
-      continue;
-    }
-
-    if (!labels.includes(normalized)) {
-      labels.push(normalized);
-    }
-  }
-
-  return labels;
-}
-
-function formatStructuredErrorMessage(labels: string[], rawMessage: string): string {
-  const cleanedMessage = stripRedundantErrorPrefix(rawMessage);
-  return labels.length > 0 ? `${labels.join(" · ")} · ${cleanedMessage}` : cleanedMessage;
-}
-
-function stripRedundantErrorPrefix(message: string): string {
-  return message
-    .replace(/^Unauthorized:\s*/i, "")
-    .replace(/^Authentication (?:error|failed):\s*/i, "")
-    .trim();
-}
-
-function parseJsonObjectCandidate(value: unknown): Record<string, unknown> | undefined {
-  if (isObject(value)) {
-    return value;
-  }
-
-  const text = extractStringMessage(value);
-  if (!text) {
-    return undefined;
-  }
-
-  const startIndex = text.indexOf("{");
-  const endIndex = text.lastIndexOf("}");
-  if (startIndex < 0 || endIndex <= startIndex) {
-    return undefined;
-  }
-
-  try {
-    const parsed = JSON.parse(text.slice(startIndex, endIndex + 1));
-    return isObject(parsed) ? parsed : undefined;
-  } catch {
-    return undefined;
-  }
-}
-
-function extractStringMessage(value: unknown): string | undefined {
-  if (typeof value === "string" && value.trim()) {
-    return value.trim();
-  }
-
-  if (value instanceof Error && value.message.trim()) {
-    return value.message.trim();
-  }
-
-  if (!isObject(value)) {
-    return undefined;
-  }
-
-  const directMessage = readString(value.message) ?? readString(value.errorMessage);
-  if (directMessage) {
-    return directMessage;
-  }
-
-  return undefined;
-}
-
-function extractStatus(error: unknown): number | undefined {
-  const candidates = [
-    error,
-    isObject(error) ? error.error : undefined,
-    isObject(error) ? error.response : undefined,
-    isObject(error) && isObject(error.error) ? error.error.response : undefined,
-    parseJsonObjectCandidate(error),
-  ];
-
-  for (const candidate of candidates) {
-    const status = readNumericStatus(candidate);
-    if (status !== undefined) {
-      return status;
-    }
-  }
-
-  return undefined;
-}
-
-function readNumericStatus(value: unknown): number | undefined {
-  if (!isObject(value)) {
-    return undefined;
-  }
-
-  const directStatus = value.status;
-  if (typeof directStatus === "number") {
-    return directStatus;
-  }
-
-  const statusCode = value.statusCode;
-  if (typeof statusCode === "number") {
-    return statusCode;
-  }
-
-  const code = value.code;
-  if (typeof code === "number") {
-    return code;
-  }
-
-  return undefined;
-}
-
-function readString(value: unknown): string | undefined {
-  return typeof value === "string" && value.trim() ? value.trim() : undefined;
-}
-
-function isObject(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null;
-}

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

@@ -8,12 +8,8 @@ import {
 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,
-  type AutoTitleFailure,
-  formatAutoTitleFailureSummary,
-  type SessionAutoTitleController,
-} from "./controller.js";
+import type { AutoRetitleStatus, SessionAutoTitleController } from "./controller.js";
+import type { AutoTitleFailure } from "./generate.js";
 import {
   buildBulkRetitleMessage,
   buildRetitleScopeScan,
@@ -60,6 +56,7 @@ export async function showRetitleWizard(
   ctx: ExtensionCommandContext,
   model: Model<Api> | undefined,
   getSessionEpoch: () => number,
+  systemPrompt: string,
   options?: RetitleWizardOptions,
 ): Promise<RetitleCommandOutcome> {
   return ctx.ui.custom<RetitleCommandOutcome>(
@@ -72,6 +69,7 @@ export async function showRetitleWizard(
         ctx,
         model,
         getSessionEpoch,
+        systemPrompt,
         done,
         options,
       ),
@@ -100,6 +98,7 @@ class RetitleWizardPanel implements Focusable {
     private readonly ctx: ExtensionCommandContext,
     private readonly model: Model<Api> | undefined,
     private readonly getSessionEpoch: () => number,
+    private readonly systemPrompt: string,
     private readonly done: (result: RetitleCommandOutcome) => void,
     options?: RetitleWizardOptions,
   ) {
@@ -250,6 +249,7 @@ class RetitleWizardPanel implements Focusable {
       ctx: this.ctx,
       model: this.model,
       isManual: true,
+      systemPrompt: this.systemPrompt,
       getSessionEpoch: this.getSessionEpoch,
     });
     if (result.ok) {
@@ -309,6 +309,7 @@ class RetitleWizardPanel implements Focusable {
       scan,
       mode,
       this.getSessionEpoch,
+      this.systemPrompt,
     );
     notifyBulkRetitleResult(this.ctx, scan, mode, result);
     this.done(
@@ -468,11 +469,7 @@ class RetitleWizardPanel implements Focusable {
       return this.renderRow(innerWidth, left);
     }
 
-    const summaryText = truncateToWidth(
-      formatAutoTitleFailureSummary(failure),
-      maxSummaryWidth,
-      "…",
-    );
+    const summaryText = truncateToWidth(failure.message, maxSummaryWidth, "…");
     const right = ` ${this.theme.fg("dim", summaryText)}`;
     const gap = Math.max(1, innerWidth - visibleWidth(left) - visibleWidth(right));
     return this.renderRow(innerWidth, `${left}${" ".repeat(gap)}${right}`);
@@ -523,7 +520,6 @@ function formatAutoRetitleStatusLine(theme: Theme, status: AutoRetitleStatus): s
 function formatFailureClipboardText(failure: AutoTitleFailure): string {
   const lines = [
     `model: ${failure.model}`,
-    ...(failure.status !== undefined ? [`status: ${failure.status}`] : []),
     `trigger: ${failure.trigger}`,
     `time: ${failure.at}`,
     `error: ${failure.message}`,

package/extensions/session-auto-title.ts

@@ -14,7 +14,6 @@ import {
 } from "./session-auto-title/command.js";
 import {
   createSessionAutoTitleController,
-  formatAutoTitleFailureSummary,
   type SessionAutoTitleController,
 } from "./session-auto-title/controller.js";
 import { resolveAutoTitleModel } from "./session-auto-title/model.js";
@@ -26,6 +25,7 @@ import {
   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";
 
 export {
@@ -74,6 +74,7 @@ export default function sessionAutoTitleExtension(pi: ExtensionAPI): void {
           ctx,
           model,
           invocation,
+          settings.autoTitle.prompt,
         );
       },
     ),
@@ -102,6 +103,7 @@ export default function sessionAutoTitleExtension(pi: ExtensionAPI): void {
       existingPlan: result.plan,
       getSessionEpoch: () => sessionEpoch,
       notifyOnSuccess: false,
+      systemPrompt: settings.autoTitle.prompt,
     })
       .then((outcome) => {
         if (outcome.ok) {
@@ -111,7 +113,7 @@ export default function sessionAutoTitleExtension(pi: ExtensionAPI): void {
         const shouldNotify = controller.handleTitleFailed(ctx, outcome.failure);
         if (shouldNotify && ctx.hasUI) {
           ctx.ui.notify(
-            `Auto-title failed: ${formatAutoTitleFailureSummary(outcome.failure)}. Open /title for details.`,
+            `Auto-title failed: ${outcome.failure.message}. Open /title for details.`,
             "warning",
           );
         }
@@ -136,6 +138,7 @@ async function handleTitleInvocation(
   ctx: ExtensionCommandContext,
   model: Model<Api> | undefined,
   invocation: RetitleCommandInvocation,
+  systemPrompt: string,
 ): Promise<RetitleCommandOutcome> {
   const retitleOpts = {
     pi,
@@ -143,6 +146,7 @@ async function handleTitleInvocation(
     ctx,
     model,
     isManual: true,
+    systemPrompt,
     getSessionEpoch: state.getSessionEpoch,
   };
 
@@ -157,24 +161,32 @@ async function handleTitleInvocation(
   };
 
   if (invocation.kind === "open-pane") {
-    if (!ctx.hasUI) {
+    if (!isTuiMode(ctx)) {
       return retitleCurrentSession();
     }
 
-    return showRetitleWizard(pi, state.controller, ctx, model, state.getSessionEpoch);
+    return showRetitleWizard(pi, state.controller, ctx, model, state.getSessionEpoch, systemPrompt);
   }
 
   if (invocation.scope === "this") {
     return runWithInFlightTracking(state, retitleCurrentSession);
   }
 
-  if (ctx.hasUI && !invocation.force) {
-    return showRetitleWizard(pi, state.controller, ctx, model, state.getSessionEpoch, {
-      initialInvocation: {
-        scope: invocation.scope,
-        mode: invocation.mode ?? "backfill",
+  if (isTuiMode(ctx) && !invocation.force) {
+    return showRetitleWizard(
+      pi,
+      state.controller,
+      ctx,
+      model,
+      state.getSessionEpoch,
+      systemPrompt,
+      {
+        initialInvocation: {
+          scope: invocation.scope,
+          mode: invocation.mode ?? "backfill",
+        },
       },
-    });
+    );
   }
 
   const scan = await buildRetitleScopeScan(ctx, invocation.scope);
@@ -188,6 +200,7 @@ async function handleTitleInvocation(
       scan,
       mode,
       state.getSessionEpoch,
+      systemPrompt,
     );
     notifyBulkRetitleResult(ctx, scan, mode, result);
     return "success";