@wps365/openclaw-wpsxiezuo 1.10.2-beta.0 → 1.10.2

package/dist/core/lazy-client-store.d.ts

@@ -1,28 +1,49 @@
 /**
- * 延迟初始化的 WpsClient 存储。
+ * 按 accountId 索引的 WpsClient 存储。
  *
  * 工具在 register() 阶段注册（此时无凭据），
- * 凭据在 startAccount() 阶段设置，
- * 工具执行时通过 getClient() 获取已初始化的 client。
+ * 凭据在 startAccount() 阶段按 accountId 设置，
+ * 工具执行时通过 getLazyClient(accountId?) 获取对应 account 的 client。
+ *
+ * 多账号场景下每个 account 维护独立的 client/creds/wpsCfg/delegatedScopes，
+ * 避免全局单例被后启动的 account 覆盖。
  */
 import type { WpsClient } from "./wps-client.js";
 import type { WpsConfig } from "./config.js";
 import type { AppCredentials } from "./token-store.js";
-declare let _log: {
+export type LogFacade = {
     info?: (...args: unknown[]) => void;
     error?: (...args: unknown[]) => void;
     warn?: (...args: unknown[]) => void;
-} | null;
-export declare function setLazyClient(client: WpsClient, log?: typeof _log, wpsCfg?: WpsConfig, creds?: AppCredentials): void;
-export declare function getLazyClient(): WpsClient;
-export declare function getLazyLog(): typeof _log;
-export declare function getLazyWpsCfg(): WpsConfig;
-export declare function getLazyCreds(): AppCredentials;
+};
 export type DelegatedScope = {
     name: string;
     description: string;
 };
+export type AccountContext = {
+    client: WpsClient;
+    log: LogFacade | null;
+    wpsCfg: WpsConfig;
+    creds: AppCredentials;
+    delegatedScopes: DelegatedScope[];
+};
+/** 在异步上下文中执行回调，期间 currentAccountId() 返回指定 accountId */
+export declare function runWithAccountId<T>(accountId: string, fn: () => T): T;
+/** 获取当前异步上下文绑定的 accountId（由 runWithAccountId 设置） */
+export declare function currentAccountId(): string | undefined;
+export declare function setAccountContext(accountId: string, ctx: Omit<AccountContext, "delegatedScopes"> & {
+    delegatedScopes?: DelegatedScope[];
+}): void;
+export declare function setDefaultAccountId(accountId: string): void;
+export declare function getDefaultAccountId(): string | null;
+export declare function getLazyClient(accountId?: string): WpsClient;
+export declare function getLazyLog(accountId?: string): LogFacade | null;
+export declare function getLazyWpsCfg(accountId?: string): WpsConfig;
+export declare function getLazyCreds(accountId?: string): AppCredentials;
+export declare function updateDelegatedScopes(accountId: string, scopes: DelegatedScope[]): void;
+export declare function getDelegatedScopes(accountId?: string): DelegatedScope[];
+/** @deprecated Use setAccountContext instead */
+export declare function setLazyClient(client: WpsClient, log?: LogFacade | null, wpsCfg?: WpsConfig, creds?: AppCredentials): void;
+/** @deprecated Use updateDelegatedScopes instead */
 export declare function setDelegatedScopes(scopes: DelegatedScope[]): void;
-export declare function getDelegatedScopes(): DelegatedScope[];
-export {};
 //# sourceMappingURL=lazy-client-store.d.ts.map

package/dist/core/user-token-store.d.ts

@@ -1,9 +1,10 @@
 /**
  * 用户级 OAuth Token 管理 — 内存存储 + 定时刷新。
  *
+ * - 按 accountId:wpsUserId 隔离 token，不同 account 下同一用户 token 互不干扰
  * - 授权回调拿到 access_token / refresh_token / expires_in 后存入
  * - 工具取 token 时不删除，可重复使用
- * - 过期前自动用 refresh_token 续期
+ * - 过期前自动用 refresh_token 续期（使用对应 account 的凭证）
  * - refresh_token 失败则清除，下次使用时触发重新授权
  */
 export type UserTokenEntry = {
@@ -24,12 +25,11 @@ export type RefreshContext = {
     appSecret: string;
     baseUrl: string;
 };
-/** 设置 refresh 所需的应用凭证（启动时调一次） */
-export declare function setRefreshContext(ctx: RefreshContext): void;
-export declare function putUserToken(wpsUserId: string, entry: UserTokenEntry): void;
-export declare function getUserToken(wpsUserId: string): string | null;
+export declare function setRefreshContext(accountId: string, ctx: RefreshContext): void;
+export declare function putUserToken(accountId: string, wpsUserId: string, entry: UserTokenEntry): void;
+export declare function getUserToken(accountId: string, wpsUserId: string): string | null;
 /** 兼容旧调用方 — 行为改为不删除 */
-export declare function takeUserToken(wpsUserId: string): string | null;
-export declare function hasUserToken(wpsUserId: string): boolean;
+export declare function takeUserToken(accountId: string, wpsUserId: string): string | null;
+export declare function hasUserToken(accountId: string, wpsUserId: string): boolean;
 export declare function exchangeCodeForToken(params: OAuthCodeExchangeParams): Promise<UserTokenEntry>;
 //# sourceMappingURL=user-token-store.d.ts.map