@computesdk/pi-morph 1.0.2 → 1.0.3

package/README.md

@@ -6,7 +6,7 @@
 pi install npm:@computesdk/pi-morph      # or: pi -e /path/to/pi-extensions/packages/pi-morph
 ```
 
-Set `MORPH_API_KEY` in your environment; one key covers both halves.
+Run `/login morph` and paste your key, or set `MORPH_API_KEY` in your environment; one credential covers both halves (the models and the tools), and the environment wins when both are set.
 
 ## Models
 

package/index.ts

@@ -1,5 +1,5 @@
 // Morph — open-weight coding models on an OpenAI-compatible API, plus specialized apply/grep/compact models.
-// Base URL: https://api.morphllm.com/v1 · Auth: Authorization: Bearer <MORPH_API_KEY>.
+// Base URL: https://api.morphllm.com/v1 · Auth: `/login morph` (stored in auth.json) or MORPH_API_KEY in the environment.
 // Docs: https://docs.morphllm.com · Models: https://docs.morphllm.com/sdk/components/fast-models
 //
 // This is a Pi provider extension: `pi.registerProvider` adds the endpoint and its model catalog, and Pi's
@@ -14,11 +14,15 @@
 // Prices are USD per 1M tokens from https://www.morphllm.com/pricing (live at /api/models/json). Update them
 // there when they change.
 
-import type { ExtensionAPI, ProviderModelConfig } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { createProvider, envApiKeyAuth, type Model, type ThinkingLevelMap } from "@earendil-works/pi-ai";
+import { openAICompletionsApi } from "@earendil-works/pi-ai/api/openai-completions.lazy";
 
-/** Pi's chat-model shape: the chat arm of the provider model union. */
-type ChatModel = Extract<ProviderModelConfig, { type?: "chat" }>;
-type ThinkingLevelMap = NonNullable<ChatModel["thinkingLevelMap"]>;
+const ID = "morph";
+const BASE_URL = "https://api.morphllm.com/v1";
+
+/** Pi's chat-model shape for the one API Morph speaks. */
+type ChatModel = Model<"openai-completions">;
 // Pi thinking levels (off/minimal/low/medium/high/xhigh/max) → the provider's `reasoning_effort` value.
 // Morph documents the ladder for DeepSeek: none | low | high | xhigh | max (`medium`→high, `minimal`→low).
 // For the other models `off` is not documented, so it is marked unsupported (`null`) rather than sent.
@@ -35,6 +39,9 @@ const model = (id: string, name: string, { input = ["text"], cost, effort = EFFO
   type: "chat",
   id,
   name,
+  provider: ID,
+  api: "openai-completions",
+  baseUrl: BASE_URL,
   reasoning: true,
   thinkingLevelMap: effort,
   input,
@@ -54,11 +61,17 @@ export const MODELS: ChatModel[] = [
 ];
 
 export default function morphProvider(pi: ExtensionAPI) {
-  pi.registerProvider("morph", {
-    name: "Morph",
-    baseUrl: "https://api.morphllm.com/v1",
-    apiKey: "$MORPH_API_KEY",
-    api: "openai-completions",
-    models: MODELS,
-  });
+  // A complete provider rather than the name+config form, because that is what carries native
+  // auth: envApiKeyAuth gives `/login morph` a key prompt, stores the credential in auth.json,
+  // and falls back to MORPH_API_KEY in the environment when nothing is stored.
+  pi.registerProvider(
+    createProvider({
+      id: ID,
+      name: "Morph",
+      baseUrl: BASE_URL,
+      auth: { apiKey: envApiKeyAuth("Morph API key", ["MORPH_API_KEY"]) },
+      models: MODELS,
+      api: openAICompletionsApi(),
+    }),
+  );
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@computesdk/pi-morph",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Morph for Pi: open-weight coding models (Kimi K3, GLM 5.3, DeepSeek V4) on Morph's OpenAI-compatible API, plus Fast Apply, Compact, and WarpGrep as tools.",
   "keywords": [
     "pi-package",
@@ -47,10 +47,12 @@
     "test": "tsc --noEmit && node test.ts"
   },
   "peerDependencies": {
+    "@earendil-works/pi-ai": "*",
     "@earendil-works/pi-coding-agent": "*",
     "typebox": "*"
   },
   "devDependencies": {
+    "@earendil-works/pi-ai": "catalog:",
     "@earendil-works/pi-coding-agent": "catalog:",
     "@types/node": "catalog:",
     "typebox": "catalog:",

package/tools/api.ts

@@ -5,6 +5,10 @@
  * Fast Apply, Compact, and WarpGrep have bespoke request shapes, so the tools call them directly.
  */
 
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+
 export const BASE_URL = "https://api.morphllm.com/v1";
 
 /** Morph reports OpenAI-style token counts. */
@@ -41,13 +45,28 @@ export function usageFrom(usage: MorphUsage | undefined): Usage {
   };
 }
 
-/** The provider reads the same variable, so one `MORPH_API_KEY` covers models and tools. */
+/**
+ * One credential covers models and tools: `MORPH_API_KEY` in the environment, or the key
+ * `/login morph` stored in the agent directory's auth.json (the provider resolves the same two,
+ * stored first; here the env var wins so the shell can override a stored key).
+ */
 export function apiKey(): string {
-  const key = process.env.MORPH_API_KEY?.trim();
-  if (!key) throw new Error("MORPH_API_KEY is not set; Morph's tools need it");
+  const key = process.env.MORPH_API_KEY?.trim() || storedKey();
+  if (!key) throw new Error("MORPH_API_KEY is not set and no Morph credential is stored; set it or run /login morph");
   return key;
 }
 
+/** Read the key `/login morph` wrote. Only literal keys: a "!command" credential is Pi-side resolution. */
+function storedKey(): string | undefined {
+  try {
+    const dir = process.env.PI_CODING_AGENT_DIR || path.join(os.homedir(), ".pi", "agent");
+    const key = JSON.parse(fs.readFileSync(path.join(dir, "auth.json"), "utf8"))?.morph?.key;
+    return typeof key === "string" && !key.startsWith("!") ? key : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
 /** POST JSON to Morph. A non-2xx response becomes a tool error. */
 export async function post<T>(path: string, body: unknown, signal?: AbortSignal): Promise<T> {
   const res = await fetch(`${BASE_URL}${path}`, {