diff --git a/package.json b/package.json
index b6f3da14..9093059e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kaitranntt/ccs",
-  "version": "7.31.0",
+  "version": "7.31.0-dev.1",
   "description": "Claude Code Switch - Instant profile switching between Claude Sonnet 4.5 and GLM 4.6",
   "keywords": [
     "cli",
diff --git a/src/cliproxy/auth/gemini-token-refresh.ts b/src/cliproxy/auth/gemini-token-refresh.ts
index fedb48dd..2117a3be 100644
--- a/src/cliproxy/auth/gemini-token-refresh.ts
+++ b/src/cliproxy/auth/gemini-token-refresh.ts
@@ -3,11 +3,18 @@
  *
  * Handles proactive token validation and refresh for Gemini OAuth tokens.
  * Prevents UND_ERR_SOCKET errors by ensuring tokens are valid before use.
+ *
+ * Token sources (priority order):
+ * 1. CLIProxy auth dir (~/.ccs/cliproxy/auth/) - CCS-managed tokens
+ * 2. Standard Gemini CLI (~/.gemini/oauth_creds.json) - backward compatibility
  */
 
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
+import { getProviderAuthDir } from '../config-generator';
+import { getDefaultAccount, getProviderAccounts } from '../account-manager';
+import { isTokenFileForProvider } from './token-manager';
 
 /**
  * Gemini OAuth credentials - PUBLIC from official Gemini CLI source code
@@ -39,6 +46,24 @@ interface GeminiOAuthCreds {
   id_token?: string;
 }
 
+/** Gemini credentials with source path for write-back */
+interface GeminiCredsWithSource {
+  creds: GeminiOAuthCreds;
+  sourcePath: string;
+}
+
+/** CLIProxyAPI Gemini token structure (from GeminiTokenStorage Go struct) */
+interface CliproxyGeminiToken {
+  token: {
+    access_token: string;
+    refresh_token?: string;
+    expiry?: number; // Unix timestamp in milliseconds
+  };
+  project_id: string;
+  email: string;
+  type: 'gemini';
+}
+
 /** Token refresh response from Google */
 interface TokenRefreshResponse {
   access_token?: string;
@@ -56,33 +81,165 @@ export function getGeminiOAuthPath(): string {
 }
 
 /**
- * Read Gemini OAuth credentials
+ * Map CLIProxyAPI token format to internal GeminiOAuthCreds format
  */
-function readGeminiCreds(): GeminiOAuthCreds | null {
-  const oauthPath = getGeminiOAuthPath();
-  if (!fs.existsSync(oauthPath)) {
-    return null;
+function mapCliproxyToGeminiCreds(cliproxy: CliproxyGeminiToken): GeminiOAuthCreds {
+  return {
+    access_token: cliproxy.token.access_token,
+    refresh_token: cliproxy.token.refresh_token,
+    expiry_date: cliproxy.token.expiry,
+    token_type: 'Bearer',
+  };
+}
+
+/**
+ * Validate CLIProxyAPI token structure has required fields
+ */
+function isValidCliproxyToken(data: unknown): data is CliproxyGeminiToken {
+  if (typeof data !== 'object' || data === null) return false;
+  const obj = data as Record<string, unknown>;
+  if (obj.type !== 'gemini') return false;
+  if (typeof obj.token !== 'object' || obj.token === null) return false;
+  const token = obj.token as Record<string, unknown>;
+  return typeof token.access_token === 'string';
+}
+
+/**
+ * Read Gemini token from CLIProxy auth directory
+ * Returns credentials with source path, or null if no valid token found
+ */
+function readCliproxyGeminiCreds(): GeminiCredsWithSource | null {
+  const authDir = getProviderAuthDir('gemini');
+  if (!fs.existsSync(authDir)) return null;
+
+  // Try to find default account's token file
+  const defaultAccount = getDefaultAccount('gemini');
+  let tokenPath: string | null = null;
+
+  if (defaultAccount) {
+    tokenPath = path.join(authDir, defaultAccount.tokenFile);
+    if (!fs.existsSync(tokenPath)) tokenPath = null;
   }
+
+  // Fallback: find any gemini token file by prefix or type
+  if (!tokenPath) {
+    const accounts = getProviderAccounts('gemini');
+    if (accounts.length > 0) {
+      tokenPath = path.join(authDir, accounts[0].tokenFile);
+      if (!fs.existsSync(tokenPath)) tokenPath = null;
+    }
+  }
+
+  // Last fallback: scan directory for gemini token files
+  if (!tokenPath) {
+    try {
+      const files = fs.readdirSync(authDir).filter((f) => f.endsWith('.json'));
+      for (const file of files) {
+        const filePath = path.join(authDir, file);
+        if (file.startsWith('gemini-') || isTokenFileForProvider(filePath, 'gemini')) {
+          tokenPath = filePath;
+          break;
+        }
+      }
+    } catch {
+      // Directory read failed - continue to return null
+      return null;
+    }
+  }
+
+  if (!tokenPath) return null;
+
   try {
-    const content = fs.readFileSync(oauthPath, 'utf8');
-    return JSON.parse(content) as GeminiOAuthCreds;
+    const content = fs.readFileSync(tokenPath, 'utf8');
+    const data: unknown = JSON.parse(content);
+
+    // Validate CLIProxyAPI format with proper type checking
+    if (isValidCliproxyToken(data)) {
+      return {
+        creds: mapCliproxyToGeminiCreds(data),
+        sourcePath: tokenPath,
+      };
+    }
+
+    return null;
   } catch {
     return null;
   }
 }
 
+/**
+ * Read Gemini OAuth credentials
+ * Priority: CLIProxy auth dir first, then ~/.gemini/oauth_creds.json
+ * Returns credentials with source path for correct write-back
+ */
+function readGeminiCreds(): GeminiCredsWithSource | null {
+  // 1. Try CLIProxy auth directory first (CCS-managed tokens)
+  const cliproxyResult = readCliproxyGeminiCreds();
+  if (cliproxyResult) {
+    return cliproxyResult;
+  }
+
+  // 2. Fall back to standard Gemini CLI location
+  const oauthPath = getGeminiOAuthPath();
+  if (!fs.existsSync(oauthPath)) {
+    return null;
+  }
+  try {
+    const content = fs.readFileSync(oauthPath, 'utf8');
+    return {
+      creds: JSON.parse(content) as GeminiOAuthCreds,
+      sourcePath: oauthPath,
+    };
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Write updated credentials to CLIProxy token file
+ * Preserves existing fields (email, project_id), only updates token subfields
+ */
+function writeCliproxyGeminiCreds(tokenPath: string, creds: GeminiOAuthCreds): string | undefined {
+  try {
+    const existing = JSON.parse(fs.readFileSync(tokenPath, 'utf8'));
+    const updated = {
+      ...existing,
+      token: {
+        ...existing.token,
+        access_token: creds.access_token,
+        refresh_token: creds.refresh_token,
+        expiry: creds.expiry_date,
+      },
+    };
+    fs.writeFileSync(tokenPath, JSON.stringify(updated, null, 2), { mode: 0o600 });
+    return undefined;
+  } catch (err) {
+    return err instanceof Error ? err.message : 'Failed to write credentials';
+  }
+}
+
 /**
  * Write Gemini OAuth credentials
+ * Writes back to the specified source location (CLIProxy or ~/.gemini)
+ * @param creds - The credentials to write
+ * @param sourcePath - The path where credentials were originally read from
  * @returns error message if write failed, undefined on success
  */
-function writeGeminiCreds(creds: GeminiOAuthCreds): string | undefined {
-  const oauthPath = getGeminiOAuthPath();
-  const dir = path.dirname(oauthPath);
+function writeGeminiCreds(creds: GeminiOAuthCreds, sourcePath: string): string | undefined {
+  const geminiOAuthPath = getGeminiOAuthPath();
+
+  // If source is not the standard Gemini path, write to CLIProxy format
+  if (sourcePath !== geminiOAuthPath) {
+    return writeCliproxyGeminiCreds(sourcePath, creds);
+  }
+
+  // Otherwise write to standard Gemini CLI location
+  const dir = path.dirname(geminiOAuthPath);
   try {
     if (!fs.existsSync(dir)) {
       fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
     }
-    fs.writeFileSync(oauthPath, JSON.stringify(creds, null, 2), { mode: 0o600 });
+    fs.writeFileSync(geminiOAuthPath, JSON.stringify(creds, null, 2), { mode: 0o600 });
     return undefined;
   } catch (err) {
     return err instanceof Error ? err.message : 'Failed to write credentials';
@@ -93,14 +250,14 @@ function writeGeminiCreds(creds: GeminiOAuthCreds): string | undefined {
  * Check if Gemini token is expired or expiring soon
  */
 export function isGeminiTokenExpiringSoon(): boolean {
-  const creds = readGeminiCreds();
-  if (!creds || !creds.access_token) {
+  const result = readGeminiCreds();
+  if (!result || !result.creds.access_token) {
     return true; // No token = needs auth
   }
-  if (!creds.expiry_date) {
+  if (!result.creds.expiry_date) {
     return false; // No expiry info = assume valid
   }
-  const expiresIn = creds.expiry_date - Date.now();
+  const expiresIn = result.creds.expiry_date - Date.now();
   return expiresIn < REFRESH_LEAD_TIME_MS;
 }
 
@@ -113,11 +270,12 @@ export async function refreshGeminiToken(): Promise<{
   error?: string;
   expiresAt?: number;
 }> {
-  const creds = readGeminiCreds();
-  if (!creds || !creds.refresh_token) {
+  const result = readGeminiCreds();
+  if (!result || !result.creds.refresh_token) {
     return { success: false, error: 'No refresh token available' };
   }
 
+  const { creds, sourcePath } = result;
   const controller = new AbortController();
   const timeoutId = setTimeout(() => controller.abort(), 10000);
 
@@ -130,7 +288,7 @@ export async function refreshGeminiToken(): Promise<{
       },
       body: new URLSearchParams({
         grant_type: 'refresh_token',
-        refresh_token: creds.refresh_token,
+        refresh_token: creds.refresh_token as string, // Already validated above
         client_id: GEMINI_CLIENT_ID,
         client_secret: GEMINI_CLIENT_SECRET,
       }).toString(),
@@ -158,7 +316,7 @@ export async function refreshGeminiToken(): Promise<{
       access_token: data.access_token,
       expiry_date: expiresAt,
     };
-    const writeError = writeGeminiCreds(updatedCreds);
+    const writeError = writeGeminiCreds(updatedCreds, sourcePath);
     if (writeError) {
       return { success: false, error: `Token refreshed but failed to save: ${writeError}` };
     }
@@ -183,8 +341,8 @@ export async function ensureGeminiTokenValid(verbose = false): Promise<{
   refreshed: boolean;
   error?: string;
 }> {
-  const creds = readGeminiCreds();
-  if (!creds || !creds.access_token) {
+  const result = readGeminiCreds();
+  if (!result || !result.creds.access_token) {
     return { valid: false, refreshed: false, error: 'No Gemini credentials found' };
   }
 
@@ -197,13 +355,13 @@ export async function ensureGeminiTokenValid(verbose = false): Promise<{
     console.log('[i] Gemini token expired or expiring soon, refreshing...');
   }
 
-  const result = await refreshGeminiToken();
-  if (result.success) {
+  const refreshResult = await refreshGeminiToken();
+  if (refreshResult.success) {
     if (verbose) {
       console.log('[OK] Gemini token refreshed successfully');
     }
     return { valid: true, refreshed: true };
   }
 
-  return { valid: false, refreshed: false, error: result.error };
+  return { valid: false, refreshed: false, error: refreshResult.error };
 }