@d-ai/pi 0.2.0 → 0.2.2

package/dist/index.js

@@ -1042,6 +1042,34 @@ function sanitize(message) {
 function configPath() {
   return join(homedir(), ".pi", "agent", "dai.json");
 }
+function authJsonPath() {
+  return join(homedir(), ".pi", "agent", "auth.json");
+}
+async function loadAuthJsonKey(path = authJsonPath()) {
+  try {
+    const raw = JSON.parse(await readFile(path, "utf8"));
+    if (typeof raw !== "object" || raw === null || Array.isArray(raw)) {
+      return void 0;
+    }
+    const dai = raw.dai;
+    if (typeof dai !== "object" || dai === null || Array.isArray(dai)) {
+      return void 0;
+    }
+    const record = dai;
+    for (const field of ["key", "access"]) {
+      const value = record[field];
+      if (typeof value === "string" && value.trim()) {
+        return value.trim();
+      }
+    }
+    return void 0;
+  } catch (error) {
+    if (isMissingFile(error)) {
+      return void 0;
+    }
+    throw error;
+  }
+}
 async function loadFileConfig(path = configPath()) {
   try {
     const raw = JSON.parse(await readFile(path, "utf8"));
@@ -1071,17 +1099,24 @@ async function saveFileConfig(config, path = configPath()) {
   await writeFile(`${path}`, `${JSON.stringify(next, null, 2)}
 `, { mode: 384 });
 }
-async function resolveConfig(env = process.env, path = configPath()) {
+async function resolveConfig(env = process.env, path = configPath(), authPath = authJsonPath()) {
   const file = await loadFileConfig(path);
-  const apiKey = firstNonEmpty(file.apiKey, env.DAI_API_KEY);
+  const fromAuth = await loadAuthJsonKey(authPath);
+  const apiKey = firstNonEmpty(file.apiKey, env.DAI_API_KEY, fromAuth);
   if (!apiKey) {
     throw missingApiKeyError();
   }
+  if (!file.apiKey && fromAuth) {
+    await saveFileConfig({ apiKey: fromAuth }, path);
+  }
   const baseUrl = firstNonEmpty(file.baseUrl, env.DAI_BASE_URL);
   return baseUrl === void 0 ? { apiKey } : { apiKey, baseUrl };
 }
-function hasApiKey(config, env = process.env) {
-  return Boolean(firstNonEmpty(config.apiKey, env.DAI_API_KEY));
+async function hasApiKey(config, env = process.env, authPath = authJsonPath()) {
+  if (firstNonEmpty(config.apiKey, env.DAI_API_KEY)) {
+    return true;
+  }
+  return Boolean(await loadAuthJsonKey(authPath));
 }
 function firstNonEmpty(...values) {
   for (const value of values) {
@@ -1514,74 +1549,55 @@ function remoteMediaFromJob(client, result, request, mimeType) {
 }
 
 // src/provider.ts
-import { createProvider } from "@earendil-works/pi-ai";
-import { openAICompletionsApi } from "@earendil-works/pi-ai/api/openai-completions.lazy";
-import { openAIResponsesApi } from "@earendil-works/pi-ai/api/openai-responses.lazy";
+var KEY_TTL_MS = 10 * 365 * 24 * 60 * 60 * 1e3;
 function registerDaiProvider(pi) {
-  pi.registerProvider(
-    createProvider({
-      id: "dai",
-      name: "D.AI",
-      baseUrl: `${DEFAULT_BASE_URL2}/v1`,
-      auth: {
-        apiKey: {
-          name: "D.AI API key",
-          async login(interaction) {
-            const key = await interaction.prompt({
-              type: "secret",
-              message: "D.AI API key (ddsk_...)",
-              placeholder: "ddsk_..."
-            });
-            const trimmed = key.trim();
-            await saveFileConfig({ apiKey: trimmed });
-            process.env.DAI_API_KEY = trimmed;
-            return { type: "api_key", key: trimmed };
-          },
-          async resolve({
-            credential,
-            ctx
-          }) {
-            const file = await loadFileConfig();
-            const key = credential?.key?.trim() || await ctx.env("DAI_API_KEY") || file.apiKey?.trim();
-            if (!key) {
-              return void 0;
-            }
-            const origin = normalizeOrigin(file.baseUrl ?? DEFAULT_BASE_URL2);
-            return {
-              auth: { apiKey: key, baseUrl: `${origin}/v1` },
-              source: credential?.key ? "stored D.AI API key" : "DAI_API_KEY"
-            };
-          }
-        }
+  pi.registerProvider("dai", {
+    name: "D.AI",
+    baseUrl: `${DEFAULT_BASE_URL2}/v1`,
+    api: "openai-completions",
+    apiKey: "$DAI_API_KEY",
+    authHeader: true,
+    models: [],
+    async refreshModels(context) {
+      if (context.allowNetwork === false) {
+        return [];
+      }
+      const file = await loadFileConfig();
+      const key = file.apiKey ?? process.env.DAI_API_KEY ?? await loadAuthJsonKey();
+      const origin = normalizeOrigin(file.baseUrl ?? DEFAULT_BASE_URL2);
+      const catalog = await discoverDaiCatalog({
+        origin,
+        ...key === void 0 ? {} : { apiKey: key },
+        ...context.signal === void 0 ? {} : { signal: context.signal }
+      });
+      return toProviderModels(catalog.chat, `${origin}/v1`);
+    },
+    oauth: {
+      name: "D.AI API key",
+      async login(callbacks) {
+        const key = (await callbacks.onPrompt({ message: "D.AI API key (ddsk_...)" })).trim();
+        await saveFileConfig({ apiKey: key });
+        process.env.DAI_API_KEY = key;
+        return {
+          refresh: key,
+          access: key,
+          expires: Date.now() + KEY_TTL_MS
+        };
       },
-      models: [],
-      async fetchModels(context) {
-        if (!context.allowNetwork) {
-          return context.stored?.models ?? [];
-        }
-        const file = await loadFileConfig();
-        const key = (context.credential && "key" in context.credential ? context.credential.key : void 0) || file.apiKey;
-        const origin = normalizeOrigin(file.baseUrl ?? DEFAULT_BASE_URL2);
-        const catalog = await discoverDaiCatalog({
-          origin,
-          ...key === void 0 ? {} : { apiKey: key },
-          signal: context.signal
-        });
-        return toPiModels(catalog.chat, `${origin}/v1`);
+      async refreshToken(credentials) {
+        return credentials;
       },
-      api: {
-        "openai-completions": openAICompletionsApi(),
-        "openai-responses": openAIResponsesApi()
+      getApiKey(credentials) {
+        return credentials.access;
       }
-    })
-  );
+    }
+  });
 }
-function toPiModels(models, baseUrl) {
+function toProviderModels(models, baseUrl) {
   return models.map((model) => ({
     id: model.id,
     name: model.name,
     api: model.api,
-    provider: "dai",
     baseUrl,
     reasoning: model.reasoning,
     input: model.input,
@@ -1841,7 +1857,7 @@ ${urls}` }],
         return;
       }
       const file = await loadFileConfig();
-      const ready = hasApiKey(file);
+      const ready = await hasApiKey(file);
       const models = [
         `image ${DEFAULT_IMAGE_MODEL}`,
         `video ${DEFAULT_VIDEO_MODEL}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d-ai/pi",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Pi extension for D.AI image, video, and music generation",
   "license": "MIT",
   "type": "module",
@@ -17,7 +17,7 @@
     "README.md"
   ],
   "scripts": {
-    "build": "tsup src/index.ts --format esm --dts --clean --external @earendil-works/pi-coding-agent --external @earendil-works/pi-ai --external typebox",
+    "build": "tsup src/index.ts --format esm --dts --clean --external @earendil-works/pi-coding-agent --external typebox",
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
     "check": "npm run typecheck && npm test && npm run build",