Merge branch '3.6.x'

Author: CodeCasterX

docker/sandbox/Dockerfile.runtime-only

@@ -60,6 +60,9 @@ RUN if [ -z "${AI_TOOL_PACKAGES}" ]; then \
     fi && \
     npm install -g ${AI_TOOL_PACKAGES}
 
+# LSP 语言服务器（Claude Code 的 pyright-lsp / jdtls-lsp 插件依赖）
+RUN npm install -g pyright
+
 # 预创建 .local 目录结构（避免 Docker 卷挂载以 root 创建中间目录导致权限问题）
 RUN mkdir -p /home/devuser/.local/share /home/devuser/.local/state
 

docker/sandbox/src/commands/create.ts

@@ -143,6 +143,28 @@ export async function create(branch: string, base: string | undefined, opts: Cre
               fs.copyFileSync(hostPath, dest);
             }
           }
+          // Recursively copy host directories into sandbox
+          for (const { hostDir, sandboxSubdir } of tool.hostPreSeedDirs ?? []) {
+            const dest = path.join(dir, sandboxSubdir);
+            if (fs.existsSync(hostDir) && !fs.existsSync(dest)) {
+              fs.cpSync(hostDir, dest, { recursive: true });
+            }
+          }
+          // Rewrite host paths to container paths in specified files
+          if (tool.pathRewriteFiles?.length) {
+            const hostHome = process.env.HOME!;
+            const containerHome = path.dirname(tool.containerMount);
+            for (const relFile of tool.pathRewriteFiles) {
+              const filePath = path.join(dir, relFile);
+              if (fs.existsSync(filePath)) {
+                let content = fs.readFileSync(filePath, 'utf8');
+                // Replace project path first (more specific), then home dir
+                content = content.replaceAll(MAIN_REPO, '/workspace');
+                content = content.replaceAll(hostHome, containerHome);
+                fs.writeFileSync(filePath, content);
+              }
+            }
+          }
         }
 
         // Build env args and volume mounts from tool registry

docker/sandbox/src/tools.ts

@@ -32,6 +32,13 @@ export interface AiTool {
   postSetupCmds?: string[];
   /** Extra environment variables to pass to the container */
   envVars?: Record<string, string>;
+  /** Host directories to recursively copy into sandbox (skipped if target already exists) */
+  hostPreSeedDirs?: Array<{ hostDir: string; sandboxSubdir: string }>;
+  /**
+   * Files (relative to sandbox dir) that need host→container path rewriting after copy.
+   * Rewrites: HOST_HOME → container home, HOST_PROJECT → /workspace.
+   */
+  pathRewriteFiles?: string[];
 }
 
 /** Validate descriptor consistency at startup — fail fast on misconfiguration. */
@@ -68,6 +75,13 @@ export const AI_TOOLS: readonly Readonly<AiTool>[] = [
     versionCmd: 'claude --version',
     noAuthHint: '首次使用需在容器内运行 claude 完成一次 OAuth 登录，之后免登录。',
     envVars: { CLAUDE_CONFIG_DIR: '/home/devuser/.claude' },
+    hostPreSeedDirs: [
+      { hostDir: path.join(HOME, '.claude', 'plugins'), sandboxSubdir: 'plugins' },
+    ],
+    pathRewriteFiles: [
+      'plugins/installed_plugins.json',
+      'plugins/known_marketplaces.json',
+    ],
   },
   {
     name: 'Codex',