@lobehub/lobehub 2.0.0-next.166 → 2.0.0-next.168

package/src/libs/oidc-provider/provider.ts

@@ -1,11 +1,9 @@
-import type { EmailAddress } from '@clerk/backend';
 import { LobeChatDatabase } from '@lobechat/database';
 import debug from 'debug';
 import Provider, { Configuration, KoaContextWithOIDC, errors } from 'oidc-provider';
 import urlJoin from 'url-join';
 
 import { serverDBEnv } from '@/config/db';
-import { enableClerk } from '@/const/auth';
 import { UserModel } from '@/database/models/user';
 import { appEnv } from '@/envs/app';
 import { getJWKS } from '@/libs/oidc-provider/jwt';
@@ -15,59 +13,9 @@ import { DrizzleAdapter } from './adapter';
 import { defaultClaims, defaultClients, defaultScopes } from './config';
 import { createInteractionPolicy } from './interaction-policy';
 
-const logProvider = debug('lobe-oidc:provider'); // <--- 添加 provider 日志实例
+const logProvider = debug('lobe-oidc:provider');
 
-const MARKET_CLIENT_ID = 'lobehub-market';
-
-const resolveClerkAccount = async (accountId: string) => {
-  if (!enableClerk) return undefined;
-
-  try {
-    const { clerkClient } = await import('@clerk/nextjs/server');
-    const client = await clerkClient();
-    const user = await client.users.getUser(accountId);
-
-    if (!user) {
-      logProvider('Clerk user not found for accountId: %s', accountId);
-      return undefined;
-    }
-
-    const pickName = () =>
-      user.fullName ||
-      [user.firstName, user.lastName].filter(Boolean).join(' ').trim() ||
-      user.username ||
-      user.id;
-
-    const primaryEmail = user.primaryEmailAddressId
-      ? user.emailAddresses.find((item: EmailAddress) => item.id === user.primaryEmailAddressId)
-      : user.emailAddresses.at(0);
-
-    return {
-      accountId: user.id,
-      async claims(_use: string, scope: string) {
-        const scopeSet = new Set((scope || '').split(/\s+/).filter(Boolean));
-        const claims: { [key: string]: any; sub: string } = { sub: user.id };
-
-        if (scopeSet.has('profile')) {
-          claims.name = pickName();
-          if (user.imageUrl) claims.picture = user.imageUrl;
-        }
-
-        if (scopeSet.has('email') && primaryEmail) {
-          claims.email = primaryEmail.emailAddress;
-          claims.email_verified = primaryEmail.verification?.status === 'verified' || false;
-        }
-
-        return claims;
-      },
-    };
-  } catch (error) {
-    logProvider('Error resolving Clerk account for %s: %O', accountId, error);
-    return undefined;
-  }
-};
-
-export const API_AUDIENCE = 'urn:lobehub:chat'; // <-- 把这里换成你自己的 API 标识符
+export const API_AUDIENCE = 'urn:lobehub:chat';
 
 /**
  * 获取 Cookie 密钥，使用 KEY_VAULTS_SECRET
@@ -190,25 +138,6 @@ export const createOIDCProvider = async (db: LobeChatDatabase): Promise<Provider
 
       logProvider('OIDC request client id: %s', clientId);
 
-      if (clientId === MARKET_CLIENT_ID) {
-        logProvider('Using Clerk account resolution for marketplace client');
-
-        if (!accountIdToFind) {
-          logProvider('No account id available for Clerk resolution, returning undefined');
-          return undefined;
-        }
-
-        const clerkAccount = await resolveClerkAccount(accountIdToFind);
-
-        if (clerkAccount) {
-          logProvider('Clerk account resolved successfully for %s', accountIdToFind);
-          return clerkAccount;
-        }
-
-        logProvider('Clerk account resolution failed for %s', accountIdToFind);
-        return undefined;
-      }
-
       logProvider(
         'Attempting to find account with ID: %s (source: %s)',
         accountIdToFind,

package/src/server/routers/lambda/__tests__/user.test.ts

@@ -98,6 +98,7 @@ describe('userRouter', () => {
         () =>
           ({
             getUserState: vi.fn().mockResolvedValue(mockState),
+            updateUser: vi.fn().mockResolvedValue({ rowCount: 1 }),
           }) as any,
       );
 
@@ -163,6 +164,7 @@ describe('userRouter', () => {
                 preference: { telemetry: null },
                 settings: {},
               }),
+            updateUser: vi.fn().mockResolvedValue({ rowCount: 1 }),
           }) as any,
       );
 

package/src/server/routers/lambda/market/index.ts

@@ -4,6 +4,7 @@ import { serialize } from 'cookie';
 import debug from 'debug';
 import { z } from 'zod';
 
+import { ToolCallContent } from '@/libs/mcp';
 import { authedProcedure, publicProcedure, router } from '@/libs/trpc/lambda';
 import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { DiscoverService } from '@/server/services/discover';
@@ -80,13 +81,15 @@ export const marketRouter = router({
           toolName: input.toolName,
           userAccessToken,
         });
+        const cloudResultContent = (cloudResult?.content ?? []) as ToolCallContent[];
 
         // Format the cloud result to MCPToolCallResult format
         // Process content blocks (upload images, etc.)
         const newContent =
           cloudResult?.isError || !ctx.fileService
-            ? cloudResult?.content
-            : await processContentBlocks(cloudResult?.content, ctx.fileService);
+            ? cloudResultContent
+            : // FIXME: the type assertion here is a temporary solution, need to remove it after refactoring
+              await processContentBlocks(cloudResultContent, ctx.fileService);
 
         // Convert content blocks to string
         const content = contentBlocksToString(newContent);

package/src/server/routers/lambda/user.ts

@@ -55,6 +55,11 @@ export const userRouter = router({
   }),
 
   getUserState: userProcedure.query(async ({ ctx }): Promise<UserInitializationState> => {
+    // don't block following process
+    ctx.userModel.updateUser({ lastActiveAt: new Date() }).catch((err) => {
+      console.error('update lastActiveAt failed, error:', err);
+    });
+
     let state: Awaited<ReturnType<UserModel['getUserState']>> | undefined;
 
     // get or create first-time user

package/src/services/mcp.ts

@@ -102,6 +102,7 @@ class MCPService {
         // Call cloud gateway via lambda market endpoint
         // Server will automatically get user access token from database
         // and format the result to MCPToolCallResult
+        // @ts-ignore tsgo 误报错误
         result = await lambdaClient.market.callCloudMcpEndpoint.mutate({
           apiParams,
           identifier,

package/src/store/test-coverage.md

@@ -56,7 +56,7 @@ Key principles:
 **Subagent workflow**:
 
 1. **One subagent per action file** - Each subagent focuses on testing ONE action file completely
-2. **Independent verification** - Each subagent runs its own type-check, lint, and test verification
+2. **Independent verification** - Each subagent runs its own typecheck, lint, and test verification
 3. **No commits from subagents** - Only the parent agent creates the final commit after all subagents complete
 4. **Parallel execution** - Launch all subagents in a single message using multiple Task tool calls
 5. **Consolidate results** - Parent agent reviews all results, runs final verification, updates docs, and commits
@@ -129,12 +129,12 @@ For files with multiple action files to test, use the Task tool to create subage
 2. **Launch one subagent per action file** using the Task tool
 3. **Each subagent independently**:
    - Writes tests for ONE action file only
-   - Runs type-check and lint
+   - Runs typecheck and lint
    - Verifies tests pass
    - Reports results back
    - **DOES NOT commit** (parent agent handles commits)
 4. **After all subagents complete**, review all results
-5. **Run final verification** (type-check, lint, tests)
+5. **Run final verification** (typecheck, lint, tests)
 6. **Update test-coverage.md** with combined results
 7. **Create single commit** with all new tests
 
@@ -146,7 +146,7 @@ Write comprehensive tests for src/store/discover/slices/plugin/action.ts followi
 Requirements:
 1. Write tests covering all actions in the file
 2. Follow SWR hooks testing pattern (if applicable)
-3. Run type-check and lint to verify
+3. Run typecheck and lint to verify
 4. Run tests to ensure they pass
 5. Report back with:
    - Number of tests written
@@ -163,7 +163,7 @@ DO NOT:
 
 - ✅ Parallel execution - multiple action files tested simultaneously
 - ✅ Focused scope - each subagent handles one file completely
-- ✅ Independent verification - each file gets type-check/lint/test verification
+- ✅ Independent verification - each file gets typecheck/lint/test verification
 - ✅ Clean commits - single commit after all work is done
 - ✅ Better organization - clear separation of concerns
 
@@ -196,7 +196,7 @@ bunx vitest run --silent='passed-only' 'src/store/[domain]/slices/[slice]/action
 
 ```bash
 # Check TypeScript types (from project root)
-bun run type-check
+bun run typecheck
 
 # Fix any linting issues
 bunx eslint src/store/[domain]/ --fix
@@ -270,7 +270,7 @@ Based on your development summary, update the following sections:
 bunx vitest run 'src/store'
 
 # Verify type check still passes
-bun run type-check
+bun run typecheck
 ```
 
 ### Complete Workflow Example (Single File)
@@ -281,7 +281,7 @@ bun run type-check
 bunx vitest run --silent='passed-only' 'src/store/tool/slices/mcpStore/action.test.ts'
 
 # 2. Type/Lint Phase (REQUIRED)
-bun run type-check # Must pass!
+bun run typecheck # Must pass!
 bunx eslint src/store/tool/ --fix
 
 # 3. Coverage Phase
@@ -295,7 +295,7 @@ bunx vitest run --coverage 'src/store'
 
 # 6. Final Verification
 bunx vitest run 'src/store'
-bun run type-check
+bun run typecheck
 
 # 7. Commit
 git add .
@@ -320,7 +320,7 @@ Task({
 Requirements:
 1. Write tests covering all actions (usePluginCategories, usePluginDetail, usePluginList, usePluginIdentifiers)
 2. Follow SWR hooks testing pattern
-3. Run type-check and lint to verify
+3. Run typecheck and lint to verify
 4. Run tests to ensure they pass
 5. Report back with number of tests written and coverage areas
 
@@ -335,7 +335,7 @@ Task({
 Requirements:
 1. Write tests covering all actions (useFetchMcpDetail, useFetchMcpList, useMcpCategories)
 2. Follow SWR hooks testing pattern
-3. Run type-check and lint to verify
+3. Run typecheck and lint to verify
 4. Run tests to ensure they pass
 5. Report back with number of tests written and coverage areas
 
@@ -350,7 +350,7 @@ DO NOT commit changes or update test-coverage.md.`,
 Each subagent will:
 
 - Write tests
-- Run type-check and lint
+- Run typecheck and lint
 - Verify tests pass
 - Report results
 
@@ -365,8 +365,8 @@ After all subagents complete:
 **Step 4: Final Verification**
 
 ```bash
-# Run type-check on entire project
-bun run type-check
+# Run typecheck on entire project
+bun run typecheck
 
 # Run lint on all new test files
 bunx eslint src/store/discover/ --fix
@@ -396,7 +396,7 @@ git commit -m "✅ test(store): add comprehensive tests for discover store
 
 - Add tests for plugin, mcp, assistant, model, provider slices
 - Coverage: X% → Y% (+Z tests, 5 new test files)
-- All tests pass type-check and lint
+- All tests pass typecheck and lint
 
 🤖 Generated with [Claude Code](https://claude.com/claude-code)
 
@@ -444,7 +444,7 @@ bunx vitest watch 'src/store/[domain]/slices/[slice]/action.test.ts'
 
 ```bash
 # Type check entire project (from project root)
-bun run type-check
+bun run typecheck
 
 # Watch mode
 bunx tsc --noEmit --watch
@@ -494,7 +494,7 @@ bunx eslint src/store/[domain]/
   - Semantic search and RAG integration testing
   - File upload with progress callbacks
 - **Development Method**: Used parallel subagents (9 subagents running simultaneously)
-- **Type Safety**: All tests pass type-check ✅
+- **Type Safety**: All tests pass typecheck ✅
 - **Lint**: All tests pass lint ✅
 - **Action Files Coverage**: 31/40 → 40/40 tested (100%, +9 files)
 - **🎉 MILESTONE**: All 40 action files now have comprehensive test coverage!
@@ -523,7 +523,7 @@ bunx eslint src/store/[domain]/
   - AbortController management testing
   - Mock return types matching actual services
 - **Development Method**: Used parallel subagents (2 subagents, one per file)
-- **Type Safety**: All tests pass type-check ✅
+- **Type Safety**: All tests pass typecheck ✅
 - **Lint**: All tests pass lint ✅
 - **Action Files Coverage**: 31/40 tested (77.5%, +2 files)
 - **Milestone**: 🏆 All high priority files (>200 LOC) now have comprehensive tests!
@@ -544,7 +544,7 @@ bunx eslint src/store/[domain]/
   - Successfully adapted zustand testing patterns for SWR hooks
   - Mock strategy: Synchronously return data from mock useSWR
   - Type safety: Used `as any` for test mock data where needed
-- **Type Safety**: All tests pass type-check
+- **Type Safety**: All tests pass typecheck
 - **Action Files Coverage**: 29/40 tested (72.5%, +2 files)
 
 **Session (2024-10-14)**: 📋 Store Testing Documentation Created