@d3ara1n/pi-session-namer 0.2.0 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d3ara1n/pi-session-namer",
-  "version": "0.2.0",
+  "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

@@ -19,7 +19,6 @@ function getAgentDir(): string {
 
 function readSettingsFile(filePath: string): any {
   try {
-    if (!fs.existsSync(filePath)) return {};
     const content = fs.readFileSync(filePath, "utf-8");
     return JSON.parse(content);
   } catch {
@@ -27,30 +26,21 @@ function readSettingsFile(filePath: string): any {
   }
 }
 
-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 raw = settings?.sessionNamer;
+  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;
 
   return {

package/src/index.ts

@@ -17,14 +17,12 @@ 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) => {
     if (!_ctx.hasUI) return;
     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();
@@ -36,8 +34,6 @@ export default function sessionNamerExtension(pi: ExtensionAPI) {
   // ── before_agent_start: auto-name on first prompt ───────────────
   pi.on("before_agent_start", async (event, ctx) => {
     if (!ctx.hasUI) return;
-    // Always cache the latest prompt for /namer:rename, even if auto-naming is done
-    lastPrompt = event.prompt;
 
     if (!config.enabled || hasNamed) return;
 
@@ -57,8 +53,7 @@ export default function sessionNamerExtension(pi: ExtensionAPI) {
         return;
       }
 
-      const resolved = await rolesApi.resolveRoleAsync(config.sideAgentRole);
-      if (!resolved.model) {
+      if (!rolesApi.resolveRole(config.sideAgentRole).model) {
         console.warn(
           `[pi-session-namer] Side agent role "${config.sideAgentRole}" not available — skipping`,
         );
@@ -66,9 +61,8 @@ export default function sessionNamerExtension(pi: ExtensionAPI) {
       }
 
       const name = await generateSessionName(
-        resolved.model,
-        resolved.apiKey,
-        resolved.headers,
+        rolesApi,
+        config.sideAgentRole,
         config,
         event.prompt,
       );
@@ -111,7 +105,8 @@ export default function sessionNamerExtension(pi: ExtensionAPI) {
   pi.registerCommand("namer:rename", {
     description: "Regenerate session name from the last user prompt",
     handler: async (_args, ctx) => {
-      if (!lastPrompt?.trim()) {
+      const lastUserPrompt = getLastUserPrompt(ctx.sessionManager.getEntries());
+      if (!lastUserPrompt?.trim()) {
         ctx.ui.notify("No user prompt available to generate a name from.", "warning");
         return;
       }
@@ -124,8 +119,7 @@ export default function sessionNamerExtension(pi: ExtensionAPI) {
         return;
       }
 
-      const resolved = await rolesApi.resolveRoleAsync(config.sideAgentRole);
-      if (!resolved.model) {
+      if (!rolesApi.resolveRole(config.sideAgentRole).model) {
         ctx.ui.notify(
           `Side agent role "${config.sideAgentRole}" not available. Cannot rename.`,
           "error",
@@ -134,11 +128,10 @@ export default function sessionNamerExtension(pi: ExtensionAPI) {
       }
 
       const name = await generateSessionName(
-        resolved.model,
-        resolved.apiKey,
-        resolved.headers,
+        rolesApi,
+        config.sideAgentRole,
         config,
-        lastPrompt,
+        lastUserPrompt,
       );
 
       pi.setSessionName(name);
@@ -146,3 +139,33 @@ export default function sessionNamerExtension(pi: ExtensionAPI) {
     },
   });
 }
+
+/**
+ * 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,11 +1,11 @@
 /**
  * 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";
 
 /**
@@ -29,9 +29,8 @@ export function buildNamerSystemPrompt(maxLength: number): string {
  * Call the side agent to generate a session name.
  */
 export async function generateSessionName(
-  sideModel: any,
-  apiKey: string | undefined,
-  headers: Record<string, string> | undefined,
+  rolesApi: ModelRolesAPI,
+  roleName: string,
   config: SessionNamerConfig,
   userPrompt: string,
 ): Promise<string> {
@@ -40,21 +39,16 @@ export async function generateSessionName(
   // 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,
-  };
-
-  if (apiKey) options.apiKey = apiKey;
-  if (headers) options.headers = headers;
-
   try {
-    const result = await complete(
-      sideModel,
+    const result = await rolesApi.complete(
+      roleName,
       {
         systemPrompt,
         messages: [{ role: "user", content: truncatedPrompt, timestamp: Date.now() }],
       },
-      options,
+      // 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.
     );
 
     const raw =