From f5e340b46c13570b57821b3d3cb10207ef00dc84 Mon Sep 17 00:00:00 2001
From: Aditya Mer <aditya.mer@somaiya.edu>
Date: Fri, 30 Jan 2026 13:09:10 +0530
Subject: [PATCH] refactor: Add `isCachedToken` type guard for improved cache
 validation and remove `await` from cache file operations.

---
 src/providers/github-copilot-token.ts | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/providers/github-copilot-token.ts b/src/providers/github-copilot-token.ts
index c3dff5daa..a241e675c 100644
--- a/src/providers/github-copilot-token.ts
+++ b/src/providers/github-copilot-token.ts
@@ -27,14 +27,31 @@ export function deriveCopilotApiBaseUrlFromToken(token: string): string {
 
 type ResolveOptions = { githubToken: string; fetchImpl: typeof fetch };
 
+interface CachedToken {
+  token: string;
+  expiresAt: number;
+  updatedAt?: number;
+}
+
+function isCachedToken(value: unknown): value is CachedToken {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    "token" in value &&
+    typeof (value as CachedToken).token === "string" &&
+    "expiresAt" in value &&
+    typeof (value as CachedToken).expiresAt === "number"
+  );
+}
+
 export async function resolveCopilotApiToken(opts: ResolveOptions) {
   const stateDir = resolveStateDir();
   const cachePath = path.join(stateDir, "github-copilot-token.json");
   const now = Date.now();
 
   try {
-    const cached = await loadJsonFile(cachePath);
-    if (cached && typeof cached.expiresAt === "number" && cached.expiresAt > now) {
+    const cached = loadJsonFile(cachePath);
+    if (isCachedToken(cached) && cached.expiresAt > now) {
       return {
         token: cached.token,
         baseUrl: deriveCopilotApiBaseUrlFromToken(cached.token),
@@ -60,7 +77,7 @@ export async function resolveCopilotApiToken(opts: ResolveOptions) {
   const expiresAt = expires_at * 1000;
 
   try {
-    await saveJsonFile(cachePath, { token, expiresAt, updatedAt: Date.now() });
+    saveJsonFile(cachePath, { token, expiresAt, updatedAt: Date.now() });
   } catch {
     // ignore save errors
   }