@anthonyhaussman/opencode-agy-auth 1.3.6-alpha.1 → 1.3.6-alpha.2

package/dist/index.js

@@ -340,7 +340,7 @@ function buildCodeAssistHeaders(accessToken, userAgentModel) {
 // src/plugin/auth.ts
 var ACCESS_TOKEN_EXPIRY_BUFFER_MS = 60 * 1e3;
 function isOAuthAuth(auth) {
-  return auth.type === "oauth";
+  return Boolean(auth && auth.type === "oauth");
 }
 function parseRefreshParts(refresh) {
   const [refreshToken = "", projectId = "", managedProjectId = ""] = (refresh ?? "").split("|");
@@ -21621,30 +21621,78 @@ async function setupOpenCodeV2(ctx) {
   }
   ctx.tool.transform(async (editor) => {
     if (!editor) return;
+    const v2Client = {
+      auth: {
+        set: async ({ body }) => {
+          if (body) {
+            saveStoredAuthToJson(body);
+          }
+        }
+      }
+    };
+    const resolveV2Auth = () => {
+      const connApi = ctx.integration?.connection;
+      const stored = loadStoredAuthFromJson();
+      if (!stored && typeof connApi?.active !== "function") {
+        return void 0;
+      }
+      return async () => {
+        if (typeof connApi?.active === "function" && typeof connApi?.resolve === "function") {
+          try {
+            const active = await connApi.active(AGY_PROVIDER_ID);
+            if (active) {
+              const resolved = await connApi.resolve(active);
+              if (resolved?.type === "credential" && resolved.credential?.type === "oauth") {
+                return {
+                  type: "oauth",
+                  access: resolved.credential.access,
+                  refresh: resolved.credential.refresh,
+                  expires: resolved.credential.expires
+                };
+              }
+            }
+          } catch {
+          }
+        }
+        return loadStoredAuthFromJson();
+      };
+    };
     const quotaTool = createAgyQuotaTool({
-      client: void 0,
-      getAuthResolver: () => void 0,
+      client: v2Client,
+      getAuthResolver: resolveV2Auth,
       getConfiguredProjectId: () => void 0,
       getUserAgentModel: () => void 0
     });
     const quotaSummaryTool = createAgyQuotaSummaryTool({
-      client: void 0,
-      getAuthResolver: () => void 0,
+      client: v2Client,
+      getAuthResolver: resolveV2Auth,
       getConfiguredProjectId: () => void 0,
       getUserAgentModel: () => void 0
     });
+    const emptyObjectSchema = {
+      type: "object",
+      properties: {},
+      required: [],
+      additionalProperties: false
+    };
     if (typeof editor.add === "function") {
       editor.add({
         name: AGY_QUOTA_TOOL_NAME,
         description: quotaTool.description,
-        input: {},
-        execute: async (args, context) => quotaTool.execute(args, context)
+        input: emptyObjectSchema,
+        execute: async (args, context) => {
+          const result = await quotaTool.execute(args, context);
+          return typeof result === "string" ? { content: result } : result;
+        }
       });
       editor.add({
         name: AGY_QUOTA_SUMMARY_TOOL_NAME,
         description: quotaSummaryTool.description,
-        input: {},
-        execute: async (args, context) => quotaSummaryTool.execute(args, context)
+        input: emptyObjectSchema,
+        execute: async (args, context) => {
+          const result = await quotaSummaryTool.execute(args, context);
+          return typeof result === "string" ? { content: result } : result;
+        }
       });
     } else if (typeof editor.set === "function") {
       editor.set(AGY_QUOTA_TOOL_NAME, quotaTool);
@@ -21673,12 +21721,28 @@ async function setupOpenCodeV2(ctx) {
       editor.add({
         name: AGY_V2_QUOTA_COMMAND,
         description: "Display current Antigravity quota usage",
-        template: AGY_V2_QUOTA_COMMAND_TEMPLATE
+        template: AGY_V2_QUOTA_COMMAND_TEMPLATE,
+        execute: async ({ sessionID, prompt, delivery } = {}) => {
+          await ctx.session?.prompt?.({
+            ...prompt,
+            sessionID,
+            text: AGY_V2_QUOTA_COMMAND_TEMPLATE,
+            delivery
+          });
+        }
       });
       editor.add({
         name: AGY_V2_QUOTA_SUMMARY_COMMAND,
         description: "Display Antigravity quota summary grouped by model family",
-        template: AGY_V2_QUOTA_SUMMARY_COMMAND_TEMPLATE
+        template: AGY_V2_QUOTA_SUMMARY_COMMAND_TEMPLATE,
+        execute: async ({ sessionID, prompt, delivery } = {}) => {
+          await ctx.session?.prompt?.({
+            ...prompt,
+            sessionID,
+            text: AGY_V2_QUOTA_SUMMARY_COMMAND_TEMPLATE,
+            delivery
+          });
+        }
       });
     } else if (typeof editor.set === "function") {
       editor.set(AGY_V2_QUOTA_COMMAND, commands[AGY_V2_QUOTA_COMMAND]);