@d3ara1n/pi-session-namer 0.1.3 → 0.2.1

package/README.md

@@ -49,7 +49,7 @@ Project-level `.pi/settings.json` overrides global settings.
 
 - [`@d3ara1n/pi-model-roles`](../pi-model-roles) — model role resolution
 
-## Install
+## Installation
 
 Add to `~/.pi/agent/settings.json`:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d3ara1n/pi-session-namer",
-  "version": "0.1.3",
+  "version": "0.2.1",
   "type": "module",
   "description": "Auto-name pi sessions using a cheap side agent — generates concise titles from the first user message",
   "main": "src/index.ts",

package/src/config.ts

@@ -12,52 +12,40 @@ import type { SessionNamerConfig } from "./types.ts";
 import { DEFAULT_CONFIG } from "./types.ts";
 
 function getAgentDir(): string {
-	const envDir = process.env.PI_AGENT_DIR;
-	if (envDir) return envDir;
-	return path.join(os.homedir(), ".pi", "agent");
+  const envDir = process.env.PI_AGENT_DIR;
+  if (envDir) return envDir;
+  return path.join(os.homedir(), ".pi", "agent");
 }
 
 function readSettingsFile(filePath: string): any {
-	try {
-		if (!fs.existsSync(filePath)) return {};
-		const content = fs.readFileSync(filePath, "utf-8");
-		return JSON.parse(content);
-	} catch {
-		return {};
-	}
+  try {
+    const content = fs.readFileSync(filePath, "utf-8");
+    return JSON.parse(content);
+  } catch {
+    return {};
+  }
 }
 
-function merge(target: any, source: any): any {
-	if (!source || typeof source !== "object") return target;
-	if (!target || typeof target !== "object") return source;
-	const result = { ...target };
-	for (const key of Object.keys(source)) {
-		if (source[key] && typeof source[key] === "object" && !Array.isArray(source[key])) {
-			result[key] = merge(result[key], source[key]);
-		} else {
-			result[key] = source[key];
-		}
-	}
-	return result;
+/** Read the `sessionNamer` block from a settings file. */
+function readNamer(filePath: string): Record<string, any> | undefined {
+  const raw = readSettingsFile(filePath)?.sessionNamer;
+  return raw && typeof raw === "object" ? raw : undefined;
 }
 
 /**
- * Load session-namer config from merged settings.
+ * Load session-namer config. Project overrides global wholesale; per-field
+ * `?? DEFAULT` fills any gap. (No field-level merge — project replaces global.)
  * @param cwd - Project working directory
  */
 export function loadNamerConfig(cwd?: string): SessionNamerConfig {
-	const globalSettings = readSettingsFile(path.join(getAgentDir(), "settings.json"));
-	const projectSettings = cwd
-		? readSettingsFile(path.join(cwd, ".pi", "settings.json"))
-		: {};
-	const settings = merge(globalSettings, projectSettings);
+  const globalRaw = readNamer(path.join(getAgentDir(), "settings.json"));
+  const projectRaw = cwd ? readNamer(path.join(cwd, ".pi", "settings.json")) : undefined;
+  const raw = projectRaw ?? globalRaw;
+  if (!raw) return DEFAULT_CONFIG;
 
-	const raw = settings?.sessionNamer;
-	if (!raw) return DEFAULT_CONFIG;
-
-	return {
-		enabled: raw.enabled ?? DEFAULT_CONFIG.enabled,
-		sideAgentRole: raw.sideAgentRole ?? DEFAULT_CONFIG.sideAgentRole,
-		maxLength: raw.maxLength ?? DEFAULT_CONFIG.maxLength,
-	};
+  return {
+    enabled: raw.enabled ?? DEFAULT_CONFIG.enabled,
+    sideAgentRole: raw.sideAgentRole ?? DEFAULT_CONFIG.sideAgentRole,
+    maxLength: raw.maxLength ?? DEFAULT_CONFIG.maxLength,
+  };
 }

package/src/index.ts

@@ -8,136 +8,164 @@
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { getModelRolesAPI } from "@d3ara1n/pi-model-roles";
+import type { ModelRolesAPI } from "@d3ara1n/pi-model-roles";
 import { DEFAULT_CONFIG } from "./types.ts";
 import type { SessionNamerConfig } from "./types.ts";
 import { loadNamerConfig } from "./config.ts";
 import { generateSessionName } from "./namer.ts";
 
 export default function sessionNamerExtension(pi: ExtensionAPI) {
-	let config: SessionNamerConfig = DEFAULT_CONFIG;
-	let hasNamed = false;
-	let lastPrompt = "";
-
-	// ── session_start: load config, reset flag ──────────────────────
-	pi.on("session_start", async (_event, _ctx) => {
-		config = loadNamerConfig(_ctx.cwd);
-		hasNamed = false;
-		lastPrompt = "";
-
-		// If the session already has a name (resume/fork/user-set), don't auto-name
-		const existingName = pi.getSessionName();
-		if (existingName) {
-			hasNamed = true;
-		}
-	});
-
-	// ── before_agent_start: auto-name on first prompt ───────────────
-	pi.on("before_agent_start", async (event, ctx) => {
-		// Always cache the latest prompt for /namer:rename, even if auto-naming is done
-		lastPrompt = event.prompt;
-
-		if (!config.enabled || hasNamed) return;
-
-		// Skip empty prompts (e.g. image-only messages)
-		if (!event.prompt?.trim()) return;
-
-		// Mark as handled (no retry regardless of subsequent success/failure)
-		hasNamed = true;
-
-		// Name asynchronously so we don't block the main agent startup
-		(async () => {
-			let rolesApi;
-			try {
-				rolesApi = getModelRolesAPI();
-			} catch {
-				console.warn("[pi-session-namer] pi-model-roles not initialized — skipping");
-				return;
-			}
-
-			const resolved = await rolesApi.resolveRoleAsync(config.sideAgentRole);
-			if (!resolved.model) {
-				console.warn(`[pi-session-namer] Side agent role "${config.sideAgentRole}" not available — skipping`);
-				return;
-			}
-
-			const name = await generateSessionName(
-				resolved.model,
-				resolved.apiKey,
-				resolved.headers,
-				config,
-				event.prompt,
-			);
-
-			pi.setSessionName(name);
-		})().catch((err) => console.warn("[pi-session-namer] naming failed:", err));
-	});
-
-	// ── /namer — show status ────────────────────────────────────────
-	pi.registerCommand("namer", {
-		description: "Show session namer status and config",
-		handler: async (args, ctx) => {
-			const value = (args ?? "").trim().toLowerCase();
-
-			// Handle on/off toggles
-			if (value === "on") {
-				config.enabled = true;
-				ctx.ui.notify("Session Namer: enabled", "info");
-				return;
-			}
-			if (value === "off") {
-				config.enabled = false;
-				ctx.ui.notify("Session Namer: disabled", "info");
-				return;
-			}
-
-			const currentName = pi.getSessionName();
-			const lines = [
-				`Session Namer: ${config.enabled ? "enabled" : "disabled"}`,
-				`Side agent role: ${config.sideAgentRole}`,
-				`Max length: ${config.maxLength}`,
-				`Current name: ${currentName ?? "(none)"}`,
-				`Has auto-named: ${hasNamed}`,
-			];
-			ctx.ui.notify(lines.join("\n"), "info");
-		},
-	});
-
-	// ── /namer:rename — force regenerate ────────────────────────────
-	pi.registerCommand("namer:rename", {
-		description: "Regenerate session name from the last user prompt",
-		handler: async (_args, ctx) => {
-			if (!lastPrompt?.trim()) {
-				ctx.ui.notify("No user prompt available to generate a name from.", "warning");
-				return;
-			}
-
-			let rolesApi;
-			try {
-				rolesApi = getModelRolesAPI();
-			} catch {
-				ctx.ui.notify("pi-model-roles not initialized. Cannot rename.", "error");
-				return;
-			}
-
-			const resolved = await rolesApi.resolveRoleAsync(config.sideAgentRole);
-			if (!resolved.model) {
-				ctx.ui.notify(
-					`Side agent role "${config.sideAgentRole}" not available. Cannot rename.`,
-					"error",
-				);
-				return;
-			}
-
-			const name = await generateSessionName(
-				resolved.model,
-				resolved.apiKey,
-				resolved.headers,
-				config,
-				lastPrompt,
-			);
-
-			pi.setSessionName(name);
-			ctx.ui.notify(`Session renamed: ${name}`, "info");
-		},
-	});
+  let config: SessionNamerConfig = DEFAULT_CONFIG;
+  let hasNamed = false;
+
+  // ── session_start: load config, reset flag ──────────────────────
+  pi.on("session_start", async (_event, _ctx) => {
+    if (!_ctx.hasUI) return;
+    config = loadNamerConfig(_ctx.cwd);
+    hasNamed = false;
+
+    // If the session already has a name (resume/fork/user-set), don't auto-name
+    const existingName = pi.getSessionName();
+    if (existingName) {
+      hasNamed = true;
+    }
+  });
+
+  // ── before_agent_start: auto-name on first prompt ───────────────
+  pi.on("before_agent_start", async (event, ctx) => {
+    if (!ctx.hasUI) return;
+
+    if (!config.enabled || hasNamed) return;
+
+    // Skip empty prompts (e.g. image-only messages)
+    if (!event.prompt?.trim()) return;
+
+    // Mark as handled (no retry regardless of subsequent success/failure)
+    hasNamed = true;
+
+    // Name asynchronously so we don't block the main agent startup
+    (async () => {
+      let rolesApi: ModelRolesAPI;
+      try {
+        rolesApi = getModelRolesAPI();
+      } catch {
+        console.warn("[pi-session-namer] pi-model-roles not initialized — skipping");
+        return;
+      }
+
+      if (!rolesApi.resolveRole(config.sideAgentRole).model) {
+        console.warn(
+          `[pi-session-namer] Side agent role "${config.sideAgentRole}" not available — skipping`,
+        );
+        return;
+      }
+
+      const name = await generateSessionName(
+        rolesApi,
+        config.sideAgentRole,
+        config,
+        event.prompt,
+      );
+
+      pi.setSessionName(name);
+    })().catch((err) => console.warn("[pi-session-namer] naming failed:", err));
+  });
+
+  // ── /namer — show status ────────────────────────────────────────
+  pi.registerCommand("namer", {
+    description: "Show session namer status and config",
+    handler: async (args, ctx) => {
+      const value = (args ?? "").trim().toLowerCase();
+
+      // Handle on/off toggles
+      if (value === "on") {
+        config.enabled = true;
+        ctx.ui.notify("Session Namer: enabled", "info");
+        return;
+      }
+      if (value === "off") {
+        config.enabled = false;
+        ctx.ui.notify("Session Namer: disabled", "info");
+        return;
+      }
+
+      const currentName = pi.getSessionName();
+      const lines = [
+        `Session Namer: ${config.enabled ? "enabled" : "disabled"}`,
+        `Side agent role: ${config.sideAgentRole}`,
+        `Max length: ${config.maxLength}`,
+        `Current name: ${currentName ?? "(none)"}`,
+        `Has auto-named: ${hasNamed}`,
+      ];
+      ctx.ui.notify(lines.join("\n"), "info");
+    },
+  });
+
+  // ── /namer:rename — force regenerate ────────────────────────────
+  pi.registerCommand("namer:rename", {
+    description: "Regenerate session name from the last user prompt",
+    handler: async (_args, ctx) => {
+      const lastUserPrompt = getLastUserPrompt(ctx.sessionManager.getEntries());
+      if (!lastUserPrompt?.trim()) {
+        ctx.ui.notify("No user prompt available to generate a name from.", "warning");
+        return;
+      }
+
+      let rolesApi: ModelRolesAPI;
+      try {
+        rolesApi = getModelRolesAPI();
+      } catch {
+        ctx.ui.notify("pi-model-roles not initialized. Cannot rename.", "error");
+        return;
+      }
+
+      if (!rolesApi.resolveRole(config.sideAgentRole).model) {
+        ctx.ui.notify(
+          `Side agent role "${config.sideAgentRole}" not available. Cannot rename.`,
+          "error",
+        );
+        return;
+      }
+
+      const name = await generateSessionName(
+        rolesApi,
+        config.sideAgentRole,
+        config,
+        lastUserPrompt,
+      );
+
+      pi.setSessionName(name);
+      ctx.ui.notify(`Session renamed: ${name}`, "info");
+    },
+  });
+}
+
+/**
+ * Extract the most recent user message text from session entries.
+ *
+ * Read live from the session manager rather than a cached variable, so it
+ * survives extension reloads (which reset closure state).
+ */
+function getLastUserPrompt(entries: unknown[]): string | undefined {
+  for (let i = entries.length - 1; i >= 0; i--) {
+    const entry = entries[i] as any;
+    if (entry?.type !== "message") continue;
+    const msg = entry.message;
+    if (msg?.role !== "user") continue;
+    const text = extractEntryText(msg.content);
+    if (text.trim()) return text;
+  }
+  return undefined;
+}
+
+/** Pull text out of a content field that may be a string or a ContentBlock[]. */
+function extractEntryText(content: unknown): string {
+  if (typeof content === "string") return content;
+  if (Array.isArray(content)) {
+    return content
+      .filter((b: any) => b?.type === "text" && typeof b.text === "string")
+      .map((b: any) => b.text)
+      .join("");
+  }
+  return "";
 }

package/src/namer.ts

@@ -1,96 +1,93 @@
 /**
  * Side agent invocation for session naming.
  *
- * Calls the side agent model using pi-ai's complete() function
+ * Calls the side agent via model-roles' complete() (auth resolved internally)
  * and returns a cleaned session name string.
  */
 
-import { complete } from "@earendil-works/pi-ai";
+import type { ModelRolesAPI } from "@d3ara1n/pi-model-roles";
 import type { SessionNamerConfig } from "./types.ts";
 
 /**
  * Build the system prompt for the naming side agent.
  */
 export function buildNamerSystemPrompt(maxLength: number): string {
-	return [
-		`You are a session naming assistant. Generate a concise title for a coding session based on the user's first message.`,
-		``,
-		`Rules:`,
-		`- Output in the SAME language as the user's message`,
-		`- Maximum ${maxLength} characters`,
-		`- Output ONLY the title, no quotes, no prefix, no explanation`,
-		`- Summarize intent, do not copy the original message verbatim`,
-		`- If the message mentions specific files, modules, or functions, keep those names`,
-		`- Be specific: "Fix auth token refresh bug" is better than "Fix a bug"`,
-	].join("\n");
+  return [
+    `You are a session naming assistant. Generate a concise title for a coding session based on the user's first message.`,
+    ``,
+    `Rules:`,
+    `- Output in the SAME language as the user's message`,
+    `- Maximum ${maxLength} characters`,
+    `- Output ONLY the title, no quotes, no prefix, no explanation`,
+    `- Summarize intent, do not copy the original message verbatim`,
+    `- If the message mentions specific files, modules, or functions, keep those names`,
+    `- Be specific: "Fix auth token refresh bug" is better than "Fix a bug"`,
+  ].join("\n");
 }
 
 /**
  * Call the side agent to generate a session name.
  */
 export async function generateSessionName(
-	sideModel: any,
-	apiKey: string | undefined,
-	headers: Record<string, string> | undefined,
-	config: SessionNamerConfig,
-	userPrompt: string,
+  rolesApi: ModelRolesAPI,
+  roleName: string,
+  config: SessionNamerConfig,
+  userPrompt: string,
 ): Promise<string> {
-	const systemPrompt = buildNamerSystemPrompt(config.maxLength);
+  const systemPrompt = buildNamerSystemPrompt(config.maxLength);
 
-	// Truncate very long prompts to avoid wasting tokens
-	const truncatedPrompt = userPrompt.length > 2000
-		? userPrompt.slice(0, 2000) + "..."
-		: userPrompt;
+  // Truncate very long prompts to avoid wasting tokens
+  const truncatedPrompt = userPrompt.length > 2000 ? userPrompt.slice(0, 2000) + "..." : userPrompt;
 
-	const options: Record<string, any> = {
-		maxTokens: 64,
-	};
+  try {
+    const result = await rolesApi.complete(
+      roleName,
+      {
+        systemPrompt,
+        messages: [{ role: "user", content: truncatedPrompt, timestamp: Date.now() }],
+      },
+      // No maxTokens: cost is controlled by the role's thinking level.
+      // The namer side-agent role (utility, thinking:off) skips reasoning,
+      // so a short title needs only ~dozens of tokens.
+    );
 
-	if (apiKey) options.apiKey = apiKey;
-	if (headers) options.headers = headers;
+    const raw =
+      result.content
+        ?.filter((block: any) => block.type === "text")
+        ?.map((block: any) => block.text)
+        ?.join("")
+        ?.trim() ?? "";
 
-	try {
-		const result = await complete(sideModel, {
-			systemPrompt,
-			messages: [{ role: "user", content: truncatedPrompt, timestamp: Date.now() }],
-		}, options);
-
-		const raw = result.content
-			?.filter((block: any) => block.type === "text")
-			?.map((block: any) => block.text)
-			?.join("")
-			?.trim() ?? "";
-
-		return cleanSessionName(raw, config.maxLength);
-	} catch (err) {
-		console.warn("[pi-session-namer] Side agent call failed:", err);
-		// Fallback: truncate user prompt as name
-		return userPrompt.slice(0, config.maxLength).replace(/\n/g, " ").trim();
-	}
+    return cleanSessionName(raw, config.maxLength);
+  } catch (err) {
+    console.warn("[pi-session-namer] Side agent call failed:", err);
+    // Fallback: truncate user prompt as name
+    return userPrompt.slice(0, config.maxLength).replace(/\n/g, " ").trim();
+  }
 }
 
 /**
  * Clean and truncate the generated name.
  */
 function cleanSessionName(raw: string, maxLength: number): string {
-	let name = raw.trim();
+  let name = raw.trim();
 
-	// Strip surrounding quotes if present
-	if (
-		(name.startsWith('"') && name.endsWith('"')) ||
-		(name.startsWith("'") && name.endsWith("'")) ||
-		(name.startsWith("「") && name.endsWith("」"))
-	) {
-		name = name.slice(1, -1);
-	}
+  // Strip surrounding quotes if present
+  if (
+    (name.startsWith('"') && name.endsWith('"')) ||
+    (name.startsWith("'") && name.endsWith("'")) ||
+    (name.startsWith("「") && name.endsWith("」"))
+  ) {
+    name = name.slice(1, -1);
+  }
 
-	// Remove newlines
-	name = name.replace(/\n/g, " ").trim();
+  // Remove newlines
+  name = name.replace(/\n/g, " ").trim();
 
-	// Truncate
-	if (name.length > maxLength) {
-		name = name.slice(0, maxLength - 3) + "...";
-	}
+  // Truncate
+  if (name.length > maxLength) {
+    name = name.slice(0, maxLength - 3) + "...";
+  }
 
-	return name || "New session";
+  return name || "New session";
 }