Merge remote-tracking branch 'origin/feat/front-end' into feat/back-to-front

# Conflicts:
#	src/services/dialogService.ts

src/services/creditsService.ts

@@ -22,6 +22,33 @@ let lastUpdateTime: number = 0;
 /** 缓存有效期（5分钟） */
 const CACHE_TTL_MS = 5 * 60 * 1000;
 
+/** ExtensionContext 用于持久化存储 */
+let extensionContext: vscode.ExtensionContext | null = null;
+
+/**
+ * 初始化 Credits 服务（设置 context）
+ */
+export function initCreditsService(context: vscode.ExtensionContext): void {
+  extensionContext = context;
+  // 从持久化存储加载余额
+  const savedBalance = extensionContext.globalState.get<number>('icCoderCreditsBalance');
+  if (savedBalance !== undefined) {
+    cachedBalance = savedBalance;
+    lastUpdateTime = Date.now();
+    console.log('[CreditsService] 从持久化存储加载余额:', savedBalance);
+  }
+}
+
+/**
+ * 保存余额到持久化存储
+ */
+async function saveBalance(balance: number): Promise<void> {
+  if (extensionContext) {
+    await extensionContext.globalState.update('icCoderCreditsBalance', balance);
+    console.log('[CreditsService] 余额已保存到持久化存储:', balance);
+  }
+}
+
 /**
  * 更新缓存的余额（从 SSE credit_update 事件调用）
  */
@@ -29,6 +56,10 @@ export function updateCachedBalance(balance: number): void {
   cachedBalance = balance;
   lastUpdateTime = Date.now();
   console.log('[CreditsService] 余额已更新:', balance);
+  // 异步保存到持久化存储
+  saveBalance(balance).catch(err => {
+    console.error('[CreditsService] 保存余额失败:', err);
+  });
 }
 
 /**
@@ -203,8 +234,11 @@ export async function checkBalanceBeforeSend(): Promise<{
 /**
  * 清除缓存（登出时调用）
  */
-export function clearBalanceCache(): void {
+export async function clearBalanceCache(): Promise<void> {
   cachedBalance = null;
   lastUpdateTime = 0;
+  if (extensionContext) {
+    await extensionContext.globalState.update('icCoderCreditsBalance', undefined);
+  }
   console.log('[CreditsService] 余额缓存已清除');
 }

src/services/userService.ts

@@ -8,6 +8,7 @@ import { URL } from 'url';
 import * as vscode from 'vscode';
 import { getStrangeLoopApiUrl, getConfig } from '../config/settings';
 import type { UserInfoResponse, MembershipResponse, MultiMembershipVO, MembershipItemVO } from '../types/api';
+import { fetchBalance, getCachedBalance } from './creditsService';
 
 /**
  * HTTP 请求选项
@@ -114,6 +115,8 @@ export interface UserInfo {
     remainingDays?: number;
     monthlyCredits?: number;
   };
+  // Credits 余额
+  credits?: number;
 }
 
 /**
@@ -221,12 +224,13 @@ function getHighestTierMembership(allMemberships?: MembershipItemVO[]): Membersh
  */
 export async function onTokenReceived(token: string): Promise<UserInfo | null> {
   try {
-    console.log('[UserService] Token 已获取，正在获取用户信息和会员信息...');
+    console.log('[UserService] Token 已获取，正在获取用户信息、会员信息和余额...');
 
-    // 并行获取用户信息和会员信息
-    const [userInfo, membershipInfo] = await Promise.all([
+    // 并行获取用户信息、会员信息和余额
+    const [userInfo, membershipInfo, credits] = await Promise.all([
       getUserInfo(token),
-      getMembershipInfo(token)
+      getMembershipInfo(token),
+      fetchBalance()
     ]);
 
     if (!userInfo) {
@@ -234,6 +238,15 @@ export async function onTokenReceived(token: string): Promise<UserInfo | null> {
       return null;
     }
 
+    // 添加 Credits 余额到用户信息
+    console.log('[UserService] 获取到的 Credits 余额:', credits);
+    if (credits !== null) {
+      userInfo.credits = credits;
+      console.log('[UserService] Credits 已添加到用户信息');
+    } else {
+      console.warn('[UserService] Credits 余额为 null，未添加到用户信息');
+    }
+
     // 打印用户信息到控制台
     console.log('='.repeat(60));
     console.log('用户信息详情:');
@@ -286,6 +299,15 @@ export async function onTokenReceived(token: string): Promise<UserInfo | null> {
       }
     }
 
+    // 打印 Credits 余额
+    console.log('');
+    console.log('资源点余额:');
+    if (userInfo.credits !== undefined) {
+      console.log(`当前余额: ${userInfo.credits} Credits`);
+    } else {
+      console.log('当前余额: 未获取到余额信息');
+    }
+
     console.log('='.repeat(60));
 
     // 保存到持久化存储
@@ -329,7 +351,18 @@ export function getCachedUserInfo(): UserInfo | null {
     console.warn('[UserService] ExtensionContext 未初始化');
     return null;
   }
-  return extensionContext.globalState.get<UserInfo>('icCoderUserInfo') || null;
+  const userInfo = extensionContext.globalState.get<UserInfo>('icCoderUserInfo') || null;
+
+  // 从 creditsService 加载余额并合并到用户信息中
+  if (userInfo) {
+    const cachedCredits = getCachedBalance();
+    if (cachedCredits !== null) {
+      userInfo.credits = cachedCredits;
+      console.log('[UserService] 从 creditsService 加载余额:', cachedCredits);
+    }
+  }
+
+  return userInfo;
 }
 
 /**