mercury-agent 0.5.17 → 0.5.18-beta.3

package/examples/extensions/napkin/index.ts

@@ -11,6 +11,7 @@ import {
 import { createRequire } from "node:module";
 import { homedir, tmpdir } from "node:os";
 import { delimiter, dirname, join } from "node:path";
+import { getApiKeyFromPiAuthFile } from "mercury-agent/storage/pi-auth";
 
 const KNOWLEDGE_DIR = "knowledge";
 const VAULT_DIRS = ["people", "projects", "references", "daily", "episodes", "weekly", "monthly", "templates"];
@@ -175,6 +176,7 @@ function runPromptAgent(
   vaultDir: string,
   promptPath: string,
   instruction: string,
+  extraEnv?: Record<string, string>,
 ): Promise<{ ok: boolean; detail?: string }> {
   let promptText: string;
   try {
@@ -206,7 +208,7 @@ function runPromptAgent(
       ],
       {
         cwd: vaultDir,
-        env: envWithPiOnPath(),
+        env: { ...envWithPiOnPath(), ...extraEnv },
         // Capture stderr (a background job has no console to inherit usefully):
         // the captured tail is what makes a non-zero exit diagnosable in logs.
         stdio: ["ignore", "inherit", "pipe"],
@@ -236,11 +238,13 @@ function runPromptAgent(
 function runDistiller(
   vaultDir: string,
   dateFile: string,
+  extraEnv?: Record<string, string>,
 ): Promise<{ ok: boolean; detail?: string }> {
   return runPromptAgent(
     vaultDir,
     KB_DISTILLER_PROMPT_PATH,
     `Distill knowledge from: ${dateFile}`,
+    extraEnv,
   );
 }
 
@@ -399,6 +403,38 @@ export default function (mercury: {
     };
   });
 
+  // ---------------------------------------------------------------------------
+  // LLM credential resolution for host-side pi spawns
+  // ---------------------------------------------------------------------------
+
+  async function resolvePiAuthEnv(config: {
+    authPath?: string;
+    globalDir: string;
+    modelProvider: string;
+  }): Promise<Record<string, string>> {
+    const env: Record<string, string> = {};
+
+    // 1. Explicit env vars (strip MERCURY_ prefix, matching container-runner)
+    if (process.env.MERCURY_ANTHROPIC_API_KEY) {
+      env.ANTHROPIC_API_KEY = process.env.MERCURY_ANTHROPIC_API_KEY;
+    }
+    if (process.env.MERCURY_ANTHROPIC_OAUTH_TOKEN) {
+      env.ANTHROPIC_API_KEY = process.env.MERCURY_ANTHROPIC_OAUTH_TOKEN;
+    }
+
+    // 2. Fall back to Mercury's auth.json (OAuth token refresh)
+    if (!env.ANTHROPIC_API_KEY) {
+      const authPath = config.authPath ?? join(config.globalDir, "auth.json");
+      const key = await getApiKeyFromPiAuthFile({
+        provider: config.modelProvider,
+        authPath,
+      });
+      if (key) env.ANTHROPIC_API_KEY = key;
+    }
+
+    return env;
+  }
+
   // ---------------------------------------------------------------------------
   // KB Distillation job
   // ---------------------------------------------------------------------------
@@ -417,6 +453,8 @@ export default function (mercury: {
           return;
         }
 
+        const piAuthEnv = await resolvePiAuthEnv(ctx.config);
+
         const db = new Database(dbPath, { readonly: true });
 
         const spaces = db
@@ -561,7 +599,7 @@ export default function (mercury: {
           // --- Step 6: Distill each eligible date ---
           for (const date of eligibleDates) {
             const dateFile = join(messagesDir, `${date}.jsonl`);
-            const result = await runDistiller(knowledgeDir, dateFile);
+            const result = await runDistiller(knowledgeDir, dateFile, piAuthEnv);
             if (result.ok) {
               ctx.log.info("Distillation complete", { spaceId, date });
               // Only persist past dates to distilled set (today will always be re-checked)
@@ -642,6 +680,9 @@ export default function (mercury: {
 
         const dbPath = join(ctx.config.dataDir, "state.db");
         if (!existsSync(dbPath)) return;
+
+        const piAuthEnv = await resolvePiAuthEnv(ctx.config);
+
         const db = new Database(dbPath, { readonly: true });
 
         const spaces = db
@@ -706,6 +747,7 @@ export default function (mercury: {
                 knowledgeDir,
                 WEEKLY_CONSOLIDATION_PROMPT_PATH,
                 instruction,
+                piAuthEnv,
               );
               if (result.ok) {
                 ctx.log.info("Weekly consolidation complete", { spaceId, week });
@@ -777,6 +819,7 @@ export default function (mercury: {
                   knowledgeDir,
                   MONTHLY_CONSOLIDATION_PROMPT_PATH,
                   instruction,
+                  piAuthEnv,
                 );
                 if (result.ok) {
                   ctx.log.info("Monthly consolidation complete", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mercury-agent",
-  "version": "0.5.17",
+  "version": "0.5.18-beta.3",
   "description": "Personal AI assistant for chat platforms (WhatsApp, Slack, Discord, Telegram)",
   "license": "MIT",
   "author": "Avishai Tsabari",
@@ -24,6 +24,10 @@
       "types": "./src/extensions/types.ts",
       "default": "./src/extensions/types.ts"
     },
+    "./storage/pi-auth": {
+      "types": "./src/storage/pi-auth.ts",
+      "default": "./src/storage/pi-auth.ts"
+    },
     "./tts": {
       "types": "./src/tts/index.ts",
       "default": "./src/tts/index.ts"

package/src/cli/mercury.ts

@@ -18,6 +18,7 @@ import { basename, dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { Command } from "commander";
 import { loadConfig, resolveProjectPath } from "../config.js";
+import { getCatalogEntryByName } from "../extensions/catalog.js";
 import {
   checkExtensionIndexLoads,
   getProjectDataDir,
@@ -1930,6 +1931,13 @@ function extensionsListAction(): void {
     console.log(
       `${ext.name.padEnd(nameWidth)}  ${features.padEnd(featWidth)}${tag}${desc}`,
     );
+    const cat = getCatalogEntryByName(ext.name);
+    if (cat?.prerequisites?.length) {
+      const prereq = cat.prerequisites.join(", ");
+      console.log(
+        `${"".padEnd(nameWidth)}  ${"".padEnd(featWidth)}  Requires: ${prereq.slice(0, 60)}${prereq.length > 60 ? "…" : ""}`,
+      );
+    }
   }
 }
 

package/src/core/routes/dashboard.ts

@@ -1698,11 +1698,14 @@ export function createDashboardRoutes(ctx: DashboardContext) {
                 .filter(Boolean)
                 .join(", ");
               const label = cat?.label ?? ext.name;
+              const prereqHint = cat?.prerequisites?.length
+                ? `<div class="muted" style="font-size:12px;margin-top:4px">Requires: ${escapeHtml(cat.prerequisites.join(", "))}</div>`
+                : "";
               return `
               <tr>
                 <td class="mono">${escapeHtml(ext.name)}</td>
                 <td>${escapeHtml(label)}</td>
-                <td class="muted" style="max-width:320px">${escapeHtml(desc)}</td>
+                <td class="muted" style="max-width:320px">${escapeHtml(desc)}${prereqHint}</td>
                 <td class="muted">${escapeHtml(feats || "—")}</td>
                 <td>
                   <button type="button" class="btn btn-sm btn-danger"
@@ -1731,6 +1734,9 @@ export function createDashboardRoutes(ctx: DashboardContext) {
               const envHint = entry.requiredEnvVars?.length
                 ? `<div class="muted" style="font-size:12px;margin-top:4px">Env: ${escapeHtml(entry.requiredEnvVars.join(", "))}</div>`
                 : "";
+              const prereqHint = entry.prerequisites?.length
+                ? `<div class="muted" style="font-size:12px;margin-top:4px">Requires: ${escapeHtml(entry.prerequisites.join(", "))}</div>`
+                : "";
               const installBtn = missing
                 ? `<button type="button" class="btn btn-sm" disabled title="examples/extensions missing in this install">Unavailable</button>`
                 : `<form style="display:inline" hx-post="/dashboard/api/extensions/install" hx-target="#features-toast" hx-swap="innerHTML">
@@ -1744,6 +1750,7 @@ export function createDashboardRoutes(ctx: DashboardContext) {
                 <td class="muted" style="max-width:320px">
                   ${escapeHtml(entry.description)}
                   ${envHint}
+                  ${prereqHint}
                 </td>
                 <td class="muted">${escapeHtml(entry.category)}</td>
                 <td>${installBtn}</td>

package/src/extensions/catalog.ts

@@ -19,6 +19,8 @@ export interface ExtensionCatalogEntry {
   /** Subdirectory of `examples/extensions/` to copy from */
   sourceDir: string;
   requiredEnvVars?: string[];
+  /** Host-level prerequisites (CLI tools, system packages) shown to the user before install */
+  prerequisites?: string[];
   requiresRestart: boolean;
 }
 
@@ -39,6 +41,7 @@ export const EXTENSION_CATALOG: ExtensionCatalogEntry[] = [
       "Obsidian-style vault, napkin CLI, and optional KB distillation job.",
     category: "knowledge",
     sourceDir: "napkin",
+    prerequisites: ["pi CLI: bun install -g @earendil-works/pi-coding-agent"],
     requiresRestart: true,
   },
   {