opencode-catpaw-auth 1.1.0 → 1.2.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "opencode-catpaw-auth",
   "module": "index.ts",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "CatPaw AI provider plugin for OpenCode - Auto-auth from mcopilot-cli config",
   "author": "zu1k",
   "repository": {

package/src/config.ts

@@ -1,5 +1,6 @@
 import { readFileSync, existsSync } from "fs";
-import { join, homedir } from "path";
+import { join } from "path";
+import { homedir } from "os";
 import yaml from "js-yaml";
 
 const CONFIG_PATH = join(homedir(), ".config", "mcopilot-cli", ".config.yaml");

package/src/plugin.ts

@@ -108,8 +108,23 @@ export const CatPawAuthPlugin = async ({ client }: PluginContext): Promise<Plugi
     methods: [
       {
         provider: CATPAW_PROVIDER_ID,
-        label: "Auto-config from mcopilot-cli",
         type: "api",
+        label: "Auto-config from mcopilot-cli",
+        authorize: async () => {
+          // 从 mcopilot-cli 配置文件加载 API key
+          const apiKey = await loadApiKeyFromConfig();
+          
+          if (!apiKey) {
+            return { type: "failed" as const };
+          }
+          
+          // 返回成功，使用 apiKey 作为 key
+          return {
+            type: "success" as const,
+            key: apiKey,
+            provider: CATPAW_PROVIDER_ID,
+          };
+        },
       },
     ],
   },

package/src/request.ts

@@ -1,8 +1,8 @@
 /**
  * 检查请求是否是 CatPaw API 请求
  */
-export function isCatPawRequest(input: RequestInfo): boolean {
-  const url = typeof input === "string" ? input : input.url;
+export function isCatPawRequest(input: RequestInfo | URL | string): boolean {
+  const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
   return url.includes("mcli.sankuai.com");
 }
 
@@ -10,13 +10,13 @@ export function isCatPawRequest(input: RequestInfo): boolean {
  * 准备 CatPaw 请求，注入必要的 headers
  */
 export function prepareCatPawRequest(
-  input: RequestInfo,
+  input: RequestInfo | URL | string,
   init: RequestInit | undefined,
   apiKey: string,
   workingDir: string
-): { request: RequestInfo; init: RequestInit } {
+): { request: RequestInfo | URL | string; init: RequestInit } {
   // 解析原始 URL
-  const url = typeof input === "string" ? input : input.url;
+  const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
   
   // 准备 headers
   const headers = new Headers(init?.headers);

package/src/types.ts

@@ -71,15 +71,18 @@ export interface Provider {
 }
 
 export interface AuthMethod {
-  provider: string;
+  provider?: string;
   label: string;
   type: "oauth" | "api" | "token";
-  authorize?: () => Promise<unknown>;
+  authorize?: (inputs?: Record<string, string>) => Promise<
+    | { type: "success"; key: string; provider?: string }
+    | { type: "failed" }
+  >;
 }
 
 export type GetAuth = () => Promise<unknown>;
 
 export interface LoaderResult {
   apiKey: string;
-  fetch: (input: RequestInfo, init?: RequestInit) => Promise<Response>;
+  fetch: (input: RequestInfo | URL | string, init?: RequestInit) => Promise<Response>;
 }