@lobehub/lobehub 2.0.0-next.311 → 2.0.0-next.313

package/packages/builtin-tool-cloud-sandbox/src/executor/index.ts

@@ -0,0 +1,254 @@
+import { BaseExecutor, type BuiltinToolContext, type BuiltinToolResult } from '@lobechat/types';
+
+import { cloudSandboxService } from '@/services/cloudSandbox';
+import { useUserStore } from '@/store/user';
+import { userProfileSelectors } from '@/store/user/slices/auth/selectors';
+
+import { CloudSandboxExecutionRuntime } from '../ExecutionRuntime';
+import { CloudSandboxIdentifier } from '../manifest';
+import {
+  CloudSandboxApiName,
+  type EditLocalFileParams,
+  type ExecuteCodeParams,
+  type ExportFileParams,
+  type GetCommandOutputParams,
+  type GlobLocalFilesParams,
+  type GrepContentParams,
+  type ISandboxService,
+  type KillCommandParams,
+  type ListLocalFilesParams,
+  type MoveLocalFilesParams,
+  type ReadLocalFileParams,
+  type RenameLocalFileParams,
+  type RunCommandParams,
+  type SandboxCallToolResult,
+  type SandboxExportFileResult,
+  type SearchLocalFilesParams,
+  type WriteLocalFileParams,
+} from '../types';
+
+/**
+ * Client-side Sandbox Service
+ * Wraps codeInterpreterService with bound context (topicId, userId)
+ */
+class ClientSandboxService implements ISandboxService {
+  private topicId: string;
+  private userId: string;
+
+  constructor(topicId: string) {
+    this.topicId = topicId;
+    // Get userId from user store - client-side auth
+    const userId = userProfileSelectors.userId(useUserStore.getState());
+    if (!userId) {
+      throw new Error('userId must be provided');
+    }
+    this.userId = userId;
+  }
+
+  async callTool(toolName: string, params: Record<string, any>): Promise<SandboxCallToolResult> {
+    return cloudSandboxService.callTool(toolName, params, {
+      topicId: this.topicId,
+      userId: this.userId,
+    });
+  }
+
+  async exportAndUploadFile(path: string, filename: string): Promise<SandboxExportFileResult> {
+    return cloudSandboxService.exportAndUploadFile(path, filename, this.topicId);
+  }
+}
+
+/**
+ * Cloud Sandbox Client Executor
+ *
+ * This executor handles Cloud Sandbox tool calls on the client side.
+ * It creates a CloudSandboxExecutionRuntime with a ClientSandboxService
+ * that has topicId bound at construction time.
+ */
+class CloudSandboxExecutor extends BaseExecutor<typeof CloudSandboxApiName> {
+  readonly identifier = CloudSandboxIdentifier;
+  protected readonly apiEnum = CloudSandboxApiName;
+
+  /**
+   * Get or create a runtime for the given context
+   */
+  private getRuntime(ctx: BuiltinToolContext): CloudSandboxExecutionRuntime {
+    const topicId = ctx.topicId;
+
+    if (!topicId) {
+      throw new Error('Can not init runtime with empty topicId');
+    }
+
+    const service = new ClientSandboxService(topicId);
+    return new CloudSandboxExecutionRuntime(service);
+  }
+
+  // ==================== File Operations ====================
+
+  listLocalFiles = async (
+    params: ListLocalFilesParams,
+    ctx: BuiltinToolContext,
+  ): Promise<BuiltinToolResult> => {
+    const runtime = this.getRuntime(ctx);
+    const result = await runtime.listLocalFiles(params);
+    return this.toBuiltinResult(result);
+  };
+
+  readLocalFile = async (
+    params: ReadLocalFileParams,
+    ctx: BuiltinToolContext,
+  ): Promise<BuiltinToolResult> => {
+    const runtime = this.getRuntime(ctx);
+    const result = await runtime.readLocalFile(params);
+    return this.toBuiltinResult(result);
+  };
+
+  writeLocalFile = async (
+    params: WriteLocalFileParams,
+    ctx: BuiltinToolContext,
+  ): Promise<BuiltinToolResult> => {
+    const runtime = this.getRuntime(ctx);
+    const result = await runtime.writeLocalFile(params);
+    return this.toBuiltinResult(result);
+  };
+
+  editLocalFile = async (
+    params: EditLocalFileParams,
+    ctx: BuiltinToolContext,
+  ): Promise<BuiltinToolResult> => {
+    const runtime = this.getRuntime(ctx);
+    const result = await runtime.editLocalFile(params);
+    return this.toBuiltinResult(result);
+  };
+
+  searchLocalFiles = async (
+    params: SearchLocalFilesParams,
+    ctx: BuiltinToolContext,
+  ): Promise<BuiltinToolResult> => {
+    const runtime = this.getRuntime(ctx);
+    const result = await runtime.searchLocalFiles(params);
+    return this.toBuiltinResult(result);
+  };
+
+  moveLocalFiles = async (
+    params: MoveLocalFilesParams,
+    ctx: BuiltinToolContext,
+  ): Promise<BuiltinToolResult> => {
+    const runtime = this.getRuntime(ctx);
+    const result = await runtime.moveLocalFiles(params);
+    return this.toBuiltinResult(result);
+  };
+
+  renameLocalFile = async (
+    params: RenameLocalFileParams,
+    ctx: BuiltinToolContext,
+  ): Promise<BuiltinToolResult> => {
+    const runtime = this.getRuntime(ctx);
+    const result = await runtime.renameLocalFile(params);
+    return this.toBuiltinResult(result);
+  };
+
+  // ==================== Code Execution ====================
+
+  executeCode = async (
+    params: ExecuteCodeParams,
+    ctx: BuiltinToolContext,
+  ): Promise<BuiltinToolResult> => {
+    const runtime = this.getRuntime(ctx);
+    const result = await runtime.executeCode(params);
+    return this.toBuiltinResult(result);
+  };
+
+  // ==================== Shell Commands ====================
+
+  runCommand = async (
+    params: RunCommandParams,
+    ctx: BuiltinToolContext,
+  ): Promise<BuiltinToolResult> => {
+    const runtime = this.getRuntime(ctx);
+    const result = await runtime.runCommand(params);
+    return this.toBuiltinResult(result);
+  };
+
+  getCommandOutput = async (
+    params: GetCommandOutputParams,
+    ctx: BuiltinToolContext,
+  ): Promise<BuiltinToolResult> => {
+    const runtime = this.getRuntime(ctx);
+    const result = await runtime.getCommandOutput(params);
+    return this.toBuiltinResult(result);
+  };
+
+  killCommand = async (
+    params: KillCommandParams,
+    ctx: BuiltinToolContext,
+  ): Promise<BuiltinToolResult> => {
+    const runtime = this.getRuntime(ctx);
+    const result = await runtime.killCommand(params);
+    return this.toBuiltinResult(result);
+  };
+
+  // ==================== Search & Find ====================
+
+  grepContent = async (
+    params: GrepContentParams,
+    ctx: BuiltinToolContext,
+  ): Promise<BuiltinToolResult> => {
+    const runtime = this.getRuntime(ctx);
+    const result = await runtime.grepContent(params);
+    return this.toBuiltinResult(result);
+  };
+
+  globLocalFiles = async (
+    params: GlobLocalFilesParams,
+    ctx: BuiltinToolContext,
+  ): Promise<BuiltinToolResult> => {
+    const runtime = this.getRuntime(ctx);
+    const result = await runtime.globLocalFiles(params);
+    return this.toBuiltinResult(result);
+  };
+
+  // ==================== Export Operations ====================
+
+  exportFile = async (
+    params: ExportFileParams,
+    ctx: BuiltinToolContext,
+  ): Promise<BuiltinToolResult> => {
+    const runtime = this.getRuntime(ctx);
+    const result = await runtime.exportFile(params);
+    return this.toBuiltinResult(result);
+  };
+
+  // ==================== Helper Methods ====================
+
+  /**
+   * Convert BuiltinServerRuntimeOutput to BuiltinToolResult
+   */
+  private toBuiltinResult(output: {
+    content: string;
+    error?: any;
+    state?: any;
+    success: boolean;
+  }): BuiltinToolResult {
+    if (!output.success) {
+      return {
+        content: output.content,
+        error: {
+          body: output.error,
+          message: output.content || 'Unknown error',
+          type: 'PluginServerError',
+        },
+        state: output.state,
+        success: false,
+      };
+    }
+
+    return {
+      content: output.content,
+      state: output.state,
+      success: true,
+    };
+  }
+}
+
+// Export the executor instance for registration
+export const cloudSandboxExecutor = new CloudSandboxExecutor();

package/packages/builtin-tool-cloud-sandbox/src/index.ts

@@ -1,3 +1,4 @@
+export * from './ExecutionRuntime';
 export * from './manifest';
 export * from './systemRole';
 export * from './types';

package/packages/builtin-tool-cloud-sandbox/src/types/api.ts

@@ -0,0 +1,22 @@
+/**
+ * API names for Cloud Sandbox tool
+ */
+export const CloudSandboxApiName = {
+  editLocalFile: 'editLocalFile',
+  executeCode: 'executeCode',
+  exportFile: 'exportFile',
+  getCommandOutput: 'getCommandOutput',
+  globLocalFiles: 'globLocalFiles',
+  grepContent: 'grepContent',
+  killCommand: 'killCommand',
+  listLocalFiles: 'listLocalFiles',
+  moveLocalFiles: 'moveLocalFiles',
+  readLocalFile: 'readLocalFile',
+  renameLocalFile: 'renameLocalFile',
+  runCommand: 'runCommand',
+  searchLocalFiles: 'searchLocalFiles',
+  writeLocalFile: 'writeLocalFile',
+} as const;
+
+export type CloudSandboxApiNameType =
+  (typeof CloudSandboxApiName)[keyof typeof CloudSandboxApiName];

package/packages/builtin-tool-cloud-sandbox/src/types/index.ts

@@ -0,0 +1,4 @@
+export * from './api';
+export * from './params';
+export * from './service';
+export * from './state';

package/packages/builtin-tool-cloud-sandbox/src/types/params.ts

@@ -0,0 +1,85 @@
+// ==================== File Operations Params ====================
+
+export interface ListLocalFilesParams {
+  directoryPath: string;
+}
+
+export interface ReadLocalFileParams {
+  endLine?: number;
+  path: string;
+  startLine?: number;
+}
+
+export interface WriteLocalFileParams {
+  content: string;
+  createDirectories?: boolean;
+  path: string;
+}
+
+export interface EditLocalFileParams {
+  all?: boolean;
+  path: string;
+  replace: string;
+  search: string;
+}
+
+export interface SearchLocalFilesParams {
+  directory: string;
+  fileType?: string;
+  keyword?: string;
+  modifiedAfter?: string;
+  modifiedBefore?: string;
+}
+
+export interface MoveLocalFilesParams {
+  operations: Array<{
+    destination: string;
+    source: string;
+  }>;
+}
+
+export interface RenameLocalFileParams {
+  newName: string;
+  oldPath: string;
+}
+
+export interface GlobLocalFilesParams {
+  directory?: string;
+  pattern: string;
+}
+
+export interface ExportFileParams {
+  path: string;
+}
+
+// ==================== Code Execution Params ====================
+
+export interface ExecuteCodeParams {
+  code: string;
+  language?: 'javascript' | 'python' | 'typescript';
+}
+
+// ==================== Shell Command Params ====================
+
+export interface RunCommandParams {
+  background?: boolean;
+  command: string;
+  timeout?: number;
+}
+
+export interface GetCommandOutputParams {
+  commandId: string;
+}
+
+export interface KillCommandParams {
+  commandId: string;
+}
+
+// ==================== Search & Find Params ====================
+
+export interface GrepContentParams {
+  directory: string;
+  filePattern?: string;
+  pattern: string;
+  recursive?: boolean;
+}

package/packages/builtin-tool-cloud-sandbox/src/types/service.ts

@@ -0,0 +1,48 @@
+// ==================== Sandbox Service Interface ====================
+
+/**
+ * Result of calling a sandbox tool
+ */
+export interface SandboxCallToolResult {
+  error?: { message: string; name?: string };
+  result: any;
+  sessionExpiredAndRecreated?: boolean;
+  success: boolean;
+}
+
+/**
+ * Result of exporting and uploading a file from sandbox
+ */
+export interface SandboxExportFileResult {
+  error?: { message: string };
+  fileId?: string;
+  filename: string;
+  mimeType?: string;
+  size?: number;
+  success: boolean;
+  url?: string;
+}
+
+/**
+ * Sandbox Service Interface - for dependency injection
+ *
+ * Context (topicId, userId) is bound at service creation time, not passed per-call.
+ * This allows CloudSandboxExecutionRuntime to work on both client and server:
+ * - Client: Implemented via tRPC client (codeInterpreterService)
+ * - Server: Implemented via MarketSDK directly (ServerSandboxService)
+ */
+export interface ISandboxService {
+  /**
+   * Call a sandbox tool
+   * @param toolName - The name of the tool to call (e.g., 'runCommand', 'writeLocalFile')
+   * @param params - The parameters for the tool
+   */
+  callTool(toolName: string, params: Record<string, any>): Promise<SandboxCallToolResult>;
+
+  /**
+   * Export a file from sandbox and upload to cloud storage
+   * @param path - The file path in the sandbox
+   * @param filename - The name of the file to export
+   */
+  exportAndUploadFile(path: string, filename: string): Promise<SandboxExportFileResult>;
+}

package/packages/builtin-tool-cloud-sandbox/src/{types.ts → types/state.ts}

@@ -1,26 +1,3 @@
-/**
- * API names for Cloud Sandbox tool
- */
-export const CloudSandboxApiName = {
-  editLocalFile: 'editLocalFile',
-  executeCode: 'executeCode',
-  exportFile: 'exportFile',
-  getCommandOutput: 'getCommandOutput',
-  globLocalFiles: 'globLocalFiles',
-  grepContent: 'grepContent',
-  killCommand: 'killCommand',
-  listLocalFiles: 'listLocalFiles',
-  moveLocalFiles: 'moveLocalFiles',
-  readLocalFile: 'readLocalFile',
-  renameLocalFile: 'renameLocalFile',
-  runCommand: 'runCommand',
-  searchLocalFiles: 'searchLocalFiles',
-  writeLocalFile: 'writeLocalFile',
-} as const;
-
-export type CloudSandboxApiNameType =
-  (typeof CloudSandboxApiName)[keyof typeof CloudSandboxApiName];
-
 // ==================== File Operations ====================
 
 export interface ListLocalFilesState {

package/packages/builtin-tool-memory/src/manifest.ts

@@ -278,16 +278,16 @@ export const MemoryManifest: BuiltinToolManifest = {
               },
             },
             required: [
+              'situation',
+              'reasoning',
               'action',
+              'possibleOutcome',
               'keyLearning',
-              'knowledgeValueScore',
+              'type',
               'labels',
-              'possibleOutcome',
               'problemSolvingScore',
-              'reasoning',
               'scoreConfidence',
-              'situation',
-              'type',
+              'knowledgeValueScore',
             ],
             type: 'object',
           },

package/packages/editor-runtime/src/__tests__/EditorRuntime.real.test.ts

@@ -21,7 +21,7 @@ describe('EditorRuntime - Real Cases', () => {
   let mockTitleGetter: ReturnType<typeof vi.fn>;
 
   beforeEach(() => {
-    editor = new Kernel();
+    editor = new Kernel() as unknown as IEditor;
     editor.registerPlugins([CommonPlugin, MarkdownPlugin, ListPlugin, LitexmlPlugin]);
     editor.initNodeEditor();
 

package/packages/editor-runtime/src/__tests__/EditorRuntime.test.ts

@@ -19,7 +19,7 @@ describe('EditorRuntime', () => {
 
   beforeEach(() => {
     resetRandomKey();
-    editor = new Kernel();
+    editor = new Kernel() as unknown as IEditor;
     editor.registerPlugins([CommonPlugin, MarkdownPlugin, LitexmlPlugin]);
     editor.initNodeEditor();
 

package/packages/electron-client-ipc/src/events/index.ts

@@ -22,5 +22,9 @@ export type MainBroadcastParams<T extends MainBroadcastEventKey> = Parameters<
   MainBroadcastEvents[T]
 >[0];
 
-export type { MarketAuthorizationParams } from './remoteServer';
+export type {
+  AuthorizationPhase,
+  AuthorizationProgress,
+  MarketAuthorizationParams,
+} from './remoteServer';
 export type { OpenSettingsWindowOptions } from './windows';

package/packages/electron-client-ipc/src/events/remoteServer.ts

@@ -2,11 +2,34 @@ export interface MarketAuthorizationParams {
   authUrl: string;
 }
 
+/**
+ * Authorization phase for progress tracking
+ */
+export type AuthorizationPhase =
+  | 'browser_opened' // Browser has been opened for authorization
+  | 'waiting_for_auth' // Waiting for user to complete browser login
+  | 'verifying' // Received credentials, verifying with server
+  | 'cancelled'; // Authorization was cancelled by user
+
+/**
+ * Authorization progress info for UI updates
+ */
+export interface AuthorizationProgress {
+  /** Elapsed time in milliseconds since authorization started */
+  elapsed: number;
+  /** Maximum polling time in milliseconds */
+  maxPollTime: number;
+  /** Current authorization phase */
+  phase: AuthorizationPhase;
+}
+
 /**
  * 从主进程广播的远程服务器相关事件
  */
 export interface RemoteServerBroadcastEvents {
   authorizationFailed: (params: { error: string }) => void;
+  /** Broadcast authorization progress for UI updates */
+  authorizationProgress: (params: AuthorizationProgress) => void;
   authorizationRequired: (params: void) => void;
   authorizationSuccessful: (params: void) => void;
   remoteServerConfigUpdated: (params: void) => void;

package/packages/memory-user-memory/src/schemas/index.ts

@@ -3,5 +3,4 @@ export * from './context';
 export * from './experience';
 export * from './gatekeeper';
 export * from './identity';
-export * from './jsonSchemas';
 export * from './preference';

package/packages/model-bank/src/modelProviders/internlm.ts

@@ -14,7 +14,7 @@ const InternLM: ModelProviderCard = {
   settings: {
     disableBrowserRequest: true,
     proxyUrl: {
-      placeholder: 'https://internlm-chat.intern-ai.org.cn/puyu/api/v1',
+      placeholder: 'https://chat.intern-ai.org.cn/api/v1',
     },
     sdkType: 'openai',
     showModelFetcher: true,

package/packages/model-runtime/src/core/RouterRuntime/createRuntime.ts

@@ -133,14 +133,6 @@ export interface CreateRouterRuntimeOptions<T extends Record<string, any> = any>
   routers: Routers;
 }
 
-const formatErrorMessage = (error: unknown): string => {
-  if (error instanceof Error) {
-    return error.name ? `${error.name}: ${error.message}` : error.message;
-  }
-
-  return String(error);
-};
-
 export const createRouterRuntime = ({
   id,
   routers,
@@ -310,30 +302,28 @@ export const createRouterRuntime = ({
         } catch (error) {
           lastError = error;
 
-          const message = formatErrorMessage(error);
           if (attempt < totalOptions) {
             log(
-              'attempt failed, fallback to next: model=%s attempt=%d/%d apiType=%s channelId=%s remark=%s error=%s',
-              model,
+              'attempt %d/%d failed (model=%s apiType=%s channelId=%s remark=%s), trying next',
               attempt,
               totalOptions,
+              model,
               resolvedApiType,
               channelId ?? '',
               remark ?? '',
-              message,
             );
           } else {
             log(
-              'attempt failed, no more fallbacks: model=%s attempt=%d/%d apiType=%s channelId=%s remark=%s error=%s',
-              model,
+              'attempt %d/%d failed (model=%s apiType=%s channelId=%s remark=%s), no more fallbacks',
               attempt,
               totalOptions,
+              model,
               resolvedApiType,
               channelId ?? '',
               remark ?? '',
-              message,
             );
           }
+          console.error(error);
         }
       }