_PATH`、`PATH` 和常见系统目录；`gopls` 等 Go 工具还会检查 `GOBIN`、`GOPATH/bin`、`~/go/bin` 和 `~/.go/bin`。discovery 只查找，不自动安装软件。
+正式 macOS 与 Windows 安装包包含 JDTLS。发布构建根据 `third_party/jdtls/manifest.json` 下载固定版本，同时校验归档与 EPL-2.0 许可证的 SHA-256，再将产物放入应用资源目录的 `LanguageServers/jdtls`。平台 adapter 优先使用这个包内启动器；开发环境仍保留项目工具目录、显式覆盖和 `PATH` 等外部候选作为回退。下载只发生在构建阶段，应用运行时不会联网安装 JDTLS；Java 语义功能仍要求系统提供 JDK 17 或更高版本。
+
+JDTLS 使用独立于项目运行/调试配置的全局 JDK 偏好。空路径表示自动模式：平台探测本机 JDK，并只选择主版本 17 或更高的候选。用户也可以在语言服务器设置中选择单独的 JDK Home；平台会在保存时探测 `java -version`，并在每次启动 JDTLS 前再次校验路径和版本。这个偏好不会读取、覆盖或写回项目的 Java/Maven JDK 设置。
+
LSP 控制中心标题栏的工具设置会在用户偏好中保存每个 provider 的可执行文件覆盖路径。session 创建时先验证并使用该路径，路径失效时继续使用 catalog 候选进行自动探测。Homebrew formula 和官方兜底地址都来自 `languageServerInstallation`，Swift 不维护 provider ID 映射。安装仍由平台层以参数数组直接执行 `brew install`，不经过 shell；没有 Homebrew/formula 时只打开对应项目的 HTTPS 官方发布或安装页面，避免用一套不安全的通用解压逻辑处理不同项目的签名和包结构。
项目配置是可执行工具配置，只有打开受信任项目时才应启用。JSON 可以声明 executable name 和参数，但不能声明 shell、任意安装命令或关闭路径/URL 校验；进程创建、超时、可执行文件验证、Homebrew 调用方式和 HTTPS 限制仍属于平台安全边界。
diff --git a/docs/architecture/windows-development-plan.md b/docs/architecture/windows-development-plan.md
index 3b15fe30a..510055b60 100644
--- a/docs/architecture/windows-development-plan.md
+++ b/docs/architecture/windows-development-plan.md
@@ -33,8 +33,11 @@ platform contract and enabled in the UI only when the capability exists.
## Remaining product work
1. Align each Git feature API with the stable `git.*` command DTOs.
-2. Route workspace search, Local History, LSP, Java/Maven, and run
- configurations through the same dispatcher.
+2. Route workspace search, Local History, remaining non-Java LSP, Java/Maven,
+ and run configurations through the same dispatcher. Built-in Java LSP now
+ starts through the Windows host (`jdtls` + JDK discovery) and
+ `lsp.startServer` with `providerId: "java"`. Spring configuration, `@Value`,
+ and bean-injection navigation uses `spring.index` before falling back to LSP.
3. Implement Windows-owned process, debug, update, and secure-storage flows in
Rust where the current UI exposes them.
4. Hide or capability-gate future feature surfaces until their shared backend
diff --git a/docs/assets/screenshots/windows-git-added-single-column.png b/docs/assets/screenshots/windows-git-added-single-column.png
new file mode 100644
index 000000000..6202167f6
Binary files /dev/null and b/docs/assets/screenshots/windows-git-added-single-column.png differ
diff --git a/docs/assets/screenshots/windows-git-compact-split.png b/docs/assets/screenshots/windows-git-compact-split.png
new file mode 100644
index 000000000..8f1c4dd1d
Binary files /dev/null and b/docs/assets/screenshots/windows-git-compact-split.png differ
diff --git a/docs/assets/screenshots/windows-git-deleted-single-column.png b/docs/assets/screenshots/windows-git-deleted-single-column.png
new file mode 100644
index 000000000..afe253b11
Binary files /dev/null and b/docs/assets/screenshots/windows-git-deleted-single-column.png differ
diff --git a/docs/assets/screenshots/windows-git-log-tool-window.png b/docs/assets/screenshots/windows-git-log-tool-window.png
new file mode 100644
index 000000000..1159a12be
Binary files /dev/null and b/docs/assets/screenshots/windows-git-log-tool-window.png differ
diff --git a/docs/assets/screenshots/windows-git-split-addition.png b/docs/assets/screenshots/windows-git-split-addition.png
new file mode 100644
index 000000000..c83287138
Binary files /dev/null and b/docs/assets/screenshots/windows-git-split-addition.png differ
diff --git a/docs/assets/screenshots/windows-git-split-deletion.png b/docs/assets/screenshots/windows-git-split-deletion.png
new file mode 100644
index 000000000..b57616015
Binary files /dev/null and b/docs/assets/screenshots/windows-git-split-deletion.png differ
diff --git a/docs/assets/screenshots/windows-zh-localization.png b/docs/assets/screenshots/windows-zh-localization.png
new file mode 100644
index 000000000..4a16862e2
Binary files /dev/null and b/docs/assets/screenshots/windows-zh-localization.png differ
diff --git a/docs/superpowers/plans/2026-08-17-project-tab-bar.md b/docs/superpowers/plans/2026-08-17-project-tab-bar.md
new file mode 100644
index 000000000..1c561176a
--- /dev/null
+++ b/docs/superpowers/plans/2026-08-17-project-tab-bar.md
@@ -0,0 +1,177 @@
+# Mac-Style Project Tab Bar Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:executing-plans to implement this plan task-by-task with verification checkpoints.
+
+**Goal:** Add a horizontal project tab bar below the Windows title bar so every project open in the current window is visible and can be activated with one click.
+
+**Architecture:** Keep project persistence and switching in the existing Zustand/file-system stores. Add a small pure model helper to normalize the active tab for deterministic tests, a focused `ProjectTabBar` presentation component for rendering and activation, and mount it from `MainLayout` directly below `TitleBarWithSettings`. The existing title-bar project dropdown remains unchanged as the project-management menu.
+
+**Tech Stack:** React 19, TypeScript, Zustand selectors, Base UI-compatible buttons, Tailwind semantic tokens, Bun tests, Vite Plus.
+
+---
+
+### Task 1: Normalize Project Tab Data
+
+**Files:**
+- Create: `windows/tauri/src/features/window/utils/project-tab-bar-model.ts`
+- Create: `windows/tauri/src/features/window/utils/project-tab-bar-model.test.ts`
+
+- [ ] **Step 1: Write the failing test**
+
+Add a fixture with two project tabs and assert that `getProjectTabBarItems` preserves order, marks only the first active project, and repairs an invalid multiple-active input by keeping the first active tab.
+
+```ts
+test("preserves project order and exposes one active tab", () => {
+ const result = getProjectTabBarItems([
+ { id: "a", name: "Alpha", path: "D:/alpha", isActive: true, lastOpened: 1 },
+ { id: "b", name: "Beta", path: "D:/beta", isActive: true, lastOpened: 2 },
+ ]);
+
+ expect(result.map((tab) => tab.name)).toEqual(["Alpha", "Beta"]);
+ expect(result.map((tab) => tab.isActive)).toEqual([true, false]);
+});
+```
+
+- [ ] **Step 2: Run the focused test and confirm the expected failure**
+
+Run from `windows/tauri`:
+
+```powershell
+bun test src/features/window/utils/project-tab-bar-model.test.ts
+```
+
+Expected: the test fails because `project-tab-bar-model.ts` does not exist yet.
+
+- [ ] **Step 3: Implement the minimal model helper**
+
+Implement `getProjectTabBarItems(projectTabs)` by finding the first `isActive` tab and mapping the input in its original order, setting `isActive` only for that ID while preserving the other display fields.
+
+- [ ] **Step 4: Run the focused test and confirm it passes**
+
+Run the same Bun test. Expected: 1 test passes, 0 failures.
+
+### Task 2: Build The Project Tab Bar
+
+**Files:**
+- Create: `windows/tauri/src/features/window/components/project-tab-bar.tsx`
+- Create: `windows/tauri/src/features/window/components/project-tab-bar.test.ts`
+
+- [ ] **Step 1: Write the failing component contract test**
+
+Add a source-level contract test that requires the component to expose `role="tablist"`, `role="tab"`, `aria-selected`, `isSwitchingProject`, and `switchToProject`. This protects the accessibility and switching contract without introducing a new renderer test dependency.
+
+- [ ] **Step 2: Run the focused test and confirm the expected failure**
+
+Run:
+
+```powershell
+bun test src/features/window/components/project-tab-bar.test.ts
+```
+
+Expected: the test fails because the component file does not exist yet.
+
+- [ ] **Step 3: Implement the component**
+
+Implement the component with these exact behaviors:
+
+```tsx
+const projectTabs = useWorkspaceTabsStore.use.projectTabs();
+const switchToProject = useFileSystemStore((state) => state.switchToProject);
+const isSwitchingProject = useFileSystemStore((state) => state.isSwitchingProject);
+const projects = getProjectTabBarItems(projectTabs);
+
+if (projects.length === 0) return null;
+
+return (
+
+ {projects.map((project) => (
+
+ ))}
+
+);
+```
+
+Use the existing `FolderOpenIcon`, semantic surface/border/selected tokens, fixed 30px tab height, horizontal overflow, visible focus styles, and truncated names. Do not add a native drag region or duplicate project-management actions.
+
+- [ ] **Step 4: Run the focused component contract test**
+
+Run the same Bun test. Expected: 1 test passes, 0 failures.
+
+### Task 3: Mount The Bar In The Workbench
+
+**Files:**
+- Modify: `windows/tauri/src/features/layout/components/main-layout.tsx`
+
+- [ ] **Step 1: Add the import and mount point**
+
+Import `ProjectTabBar` from the window feature and render `` immediately after ``, before the root-folder conditional. The component itself returns `null` when no project is open, preserving the welcome screen layout.
+
+- [ ] **Step 2: Run focused tests and typecheck**
+
+Run:
+
+```powershell
+bun test src/features/window/utils/project-tab-bar-model.test.ts src/features/window/components/project-tab-bar.test.ts
+bun run typecheck
+```
+
+Expected: all focused tests pass and TypeScript exits with code 0.
+
+### Task 4: Verify The User Workflow
+
+**Files:**
+- No additional source files.
+
+- [ ] **Step 1: Run lint and frontend build**
+
+```powershell
+bunx vp lint src/features/layout/components/main-layout.tsx src/features/window/components/project-tab-bar.tsx src/features/window/components/project-tab-bar.test.ts src/features/window/utils/project-tab-bar-model.ts src/features/window/utils/project-tab-bar-model.test.ts
+bun run build
+git diff --check
+```
+
+Expected: all commands exit 0. Existing dependency warnings are acceptable if they do not introduce errors.
+
+- [ ] **Step 2: Rebuild and launch Windows Release**
+
+Stop the current preview process, run `.\scripts\build-windows.ps1 -Configuration Release` from the repository root, and launch `windows/tauri/src-tauri/target/x86_64-pc-windows-msvc/release/lithe-windows.exe`.
+
+- [ ] **Step 3: Verify the live tab interaction through CDP**
+
+Open two projects in the current window, assert a visible `[role="tablist"]` contains both project names, click the inactive `[role="tab"]`, and assert its `aria-selected` becomes `true` while the previous tab becomes `false`. Confirm the title-bar project label changes to the newly active project.
+
+- [ ] **Step 4: Run the final focused checks**
+
+```powershell
+bun test src/features/window/utils/project-tab-bar-model.test.ts src/features/window/components/project-tab-bar.test.ts
+bun run typecheck
+git diff --check
+```
+
+Expected: all tests pass, typecheck passes, and no whitespace errors are reported.
+
+### Task 5: Review And Commit
+
+**Files:**
+- Stage only the new project-tab-bar source/tests, `main-layout.tsx`, and the task plan/progress files.
+
+- [ ] **Step 1: Inspect the task diff and run an independent review**
+
+Check `git diff` and confirm unrelated pre-existing changes remain unstaged. Resolve any Critical or Important review findings before committing.
+
+- [ ] **Step 2: Create one focused implementation commit**
+
+```powershell
+git add -- windows/tauri/src/features/layout/components/main-layout.tsx windows/tauri/src/features/window/components/project-tab-bar.tsx windows/tauri/src/features/window/components/project-tab-bar.test.ts windows/tauri/src/features/window/utils/project-tab-bar-model.ts windows/tauri/src/features/window/utils/project-tab-bar-model.test.ts .planning/2026-08-17-project-tab-bar/task_plan.md .planning/2026-08-17-project-tab-bar/findings.md .planning/2026-08-17-project-tab-bar/progress.md docs/superpowers/plans/2026-08-17-project-tab-bar.md
+git commit -m "feat: add mac-style project tabs"
+```
diff --git a/docs/superpowers/specs/2026-08-17-cross-platform-logging-requirements.md b/docs/superpowers/specs/2026-08-17-cross-platform-logging-requirements.md
new file mode 100644
index 000000000..b688006ea
--- /dev/null
+++ b/docs/superpowers/specs/2026-08-17-cross-platform-logging-requirements.md
@@ -0,0 +1,60 @@
+# Lithe macOS 日志目录设置需求
+
+## 背景
+
+macOS 设置界面没有告诉用户日志默认保存在哪里，也不能修改日志保存目录。
+
+本需求只完善 macOS 日志目录的查看和配置，并将应用现有的字体注册和性能基线诊断写入该目录，不涉及 Windows 端或业务日志扩展。
+
+## 目标
+
+在设置中增加日志目录设置，让用户能够：
+
+- 查看系统默认日志目录；
+- 查看当前选定的日志目录；
+- 选择新的日志目录；
+- 恢复默认日志目录；
+- 复制完整目录路径。
+
+## 目录行为
+
+### 默认目录
+
+默认目录是 macOS 用户日志目录下的 `Lithe` 目录。设置页面展示系统解析后的真实绝对路径，不能硬编码开发机路径。
+
+### 自定义目录
+
+用户通过系统目录选择器选择目录。选择成功后保存配置，应用诊断输出立即切换到该目录中的 `lithe.log`，应用重启后继续使用该选择。该设置不影响其他配置。
+
+如果自定义目录无法创建或打开，应用清除该选择并恢复默认目录，界面不得继续把失败目录显示为当前日志目录。
+
+“恢复默认目录”只清除自定义日志目录。“恢复全部默认设置”也应清除该配置。
+
+## 界面要求
+
+日志设置页面显示默认目录和当前选定目录，并提供“选择目录”“恢复默认”操作。
+
+长路径可以换行或缩略显示，但必须支持复制完整路径。
+
+## 不在范围内
+
+本次不做：
+
+- 新建结构化日志协议；
+- 新建结构化日志 writer、业务 sink 或导出逻辑；
+- 新增文件轮换和 ownership manifest；
+- 新增 Run、Build、Test、Debug、LSP、Terminal 生命周期日志；
+- 新增应用、窗口、工作区或文件事件日志；
+- 新增帧率采样或性能日志；
+- 修改日志格式、日志级别或日志内容；
+- 自动上传、云端查看或崩溃转储。
+
+## 验收标准
+
+1. 设置页显示真实默认目录和当前选定目录。
+2. 用户可以选择自定义目录，重启后配置仍然存在。
+3. 用户可以恢复默认目录。
+4. “恢复全部默认设置”会清除自定义日志目录。
+5. 用户可以复制完整路径。
+6. 现有字体注册和性能基线诊断写入当前目录的 `lithe.log`，切换目录后新输出写入新目录。
+7. 没有引入新的结构化日志协议、业务埋点或帧率监控。
diff --git a/docs/superpowers/specs/2026-08-17-project-tab-bar-design.md b/docs/superpowers/specs/2026-08-17-project-tab-bar-design.md
new file mode 100644
index 000000000..d32ef35d8
--- /dev/null
+++ b/docs/superpowers/specs/2026-08-17-project-tab-bar-design.md
@@ -0,0 +1,28 @@
+# Mac-Style Project Tab Bar
+
+## Goal
+
+Show every project opened in the current Windows workbench in a compact tab bar below the title bar, matching the macOS workbench pattern. Clicking a tab activates that project immediately while the existing title-bar project menu remains the entry point for creating, opening, cloning, and selecting recent projects.
+
+## Design
+
+- Add a `ProjectTabBar` presentation component between `TitleBarWithSettings` and the workbench content in `MainLayout`.
+- Read project order and active state from `useWorkspaceTabsStore`; use `useFileSystemStore.switchToProject` for activation.
+- Render one semantic button per open project with its project badge/icon, name, active styling, and a full-path tooltip/accessible label.
+- Use a horizontal overflow container so the bar remains stable when many projects are open. Do not resize the title bar or use the tab bar as a native drag region.
+- Disable project buttons while `isSwitchingProject` is true, preserving the existing stale-switch protection.
+- Hide the bar when no project is open, so the welcome screen keeps its current vertical layout.
+- Preserve the existing `TitleProjectMenu` dropdown and all of its actions.
+
+## Accessibility And Visual Behavior
+
+- Use `role="tablist"` on the strip and `role="tab"` plus `aria-selected` on each project button.
+- Keep a visible focus ring and selected background/border using existing semantic design tokens.
+- Use the existing project badge/icon rules and Lucide-style folder icon; no new color palette or decorative artwork.
+- Keep the tab height and spacing fixed to prevent layout shift, and use text truncation with a tooltip for long names.
+
+## Testing
+
+- Add a pure model helper test that preserves project order and exposes exactly one active tab.
+- Add component-level source/behavior coverage for the tab button activation callback where the existing frontend test setup permits it.
+- Run focused Bun tests, typecheck, lint, frontend build, and a live Windows CDP check that opens two projects and activates the second tab.
diff --git a/rust/lithe-core/src/execution/configuration.rs b/rust/lithe-core/src/execution/configuration.rs
index 7e71ebe8b..49da3aab5 100644
--- a/rust/lithe-core/src/execution/configuration.rs
+++ b/rust/lithe-core/src/execution/configuration.rs
@@ -22,6 +22,9 @@ const SIDECAR_VERSION: u32 = 1;
/// Request to validate the layered configuration documents for a workspace.
pub struct InspectRequest {
pub root: String,
+ /// Host-owned local layer. When present, Core validates it instead of `.lithe/run/local.json`.
+ #[serde(default)]
+ pub local_document: Option,
}
#[derive(Debug, Deserialize)]
@@ -42,6 +45,9 @@ pub struct ResolveRequest {
pub root: String,
#[serde(default)]
pub toolchain_candidates: Vec,
+ /// Host-owned local layer. When present, Core uses it instead of `.lithe/run/local.json`.
+ #[serde(default)]
+ pub local_document: Option,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
@@ -71,6 +77,21 @@ pub struct LaunchPlanRequest {
pub class_path: Option,
#[serde(default)]
pub debug_port: Option,
+ /// Host-owned local layer. When present, Core uses it instead of `.lithe/run/local.json`.
+ #[serde(default)]
+ pub local_document: Option,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+/// Global machine toolchain stored at document level in the local layer.
+pub struct ToolchainPaths {
+ #[serde(default)]
+ pub java_home_path: String,
+ #[serde(default)]
+ pub maven_executable_path: String,
+ #[serde(default)]
+ pub maven_java_home_path: String,
}
#[derive(Debug, Deserialize)]
@@ -99,6 +120,13 @@ pub struct UpdateOptionsRequest {
pub maven_executable_path: String,
#[serde(default)]
pub maven_java_home_path: String,
+ /// When present, `updateOptions` writes the document-level global toolchain
+ /// into the local layer instead of patching one configuration.
+ #[serde(default)]
+ pub toolchain: Option,
+ /// Host-owned local layer used when `scope` is `local` and when resolving first.
+ #[serde(default)]
+ pub local_document: Option,
}
#[derive(Debug, Deserialize)]
@@ -318,6 +346,15 @@ pub fn inspect(request: InspectRequest) -> Result {
"toolchains/local.json",
"project.json",
] {
+ if relative == "run/local.json" {
+ if let Some(document) = request.local_document.as_ref() {
+ let mut migrated = document.clone();
+ migrate_document_value(&mut migrated);
+ validate_version_value(&migrated)?;
+ configuration_ids(&migrated)?;
+ continue;
+ }
+ }
if let Some(document) = read_document_value(&root, relative)? {
if relative.starts_with("run/") {
validate_version_value(&document)?;
@@ -414,6 +451,11 @@ pub fn generate(request: GenerateRequest) -> Result {
.filter(|value| value.is_spring_boot)
.map(|value| (value.path.clone(), value.qualified_name.clone()))
.collect::>();
+ let main_class_sources = scanned
+ .main_classes
+ .iter()
+ .map(|value| (value.qualified_name.clone(), value.path.clone()))
+ .collect::>();
let configurations = scanned
.configurations
.into_iter()
@@ -431,9 +473,27 @@ pub fn generate(request: GenerateRequest) -> Result {
.map(|path| maven_module_path(maven_relative_path, path))
.unwrap_or_else(|| ".".to_string());
maven.insert("module".to_string(), json!(module_path));
- if let Some(main_class) = value.main_class {
+ if let Some(main_class) = value.main_class.as_ref() {
maven.insert("mainClass".to_string(), json!(main_class));
}
+ let source_path = value
+ .main_class
+ .as_ref()
+ .and_then(|name| main_class_sources.get(name))
+ .cloned();
+ // A workspace without Maven still produces java.main entries. Binding
+ // project-maven there would force every plain Java class through mvn.
+ let uses_maven_toolchain = has_maven_project && provider != "java.current-file";
+ let mut toolchains = BTreeMap::new();
+ toolchains.insert("java".to_string(), "project-jdk".to_string());
+ if uses_maven_toolchain {
+ toolchains.insert("maven".to_string(), "project-maven".to_string());
+ }
+ let mut extensions = BTreeMap::new();
+ extensions.insert("maven".to_string(), Value::Object(maven));
+ if let Some(path) = source_path.as_ref() {
+ extensions.insert("java".to_string(), json!({ "source": path }));
+ }
RunConfiguration {
id,
name: value.name,
@@ -451,27 +511,14 @@ pub fn generate(request: GenerateRequest) -> Result {
},
env: BTreeMap::new(),
confidence: Confidence::Native,
- toolchains: if provider == "java.current-file" {
- [("java".to_string(), "project-jdk".to_string())]
- .into_iter()
- .collect()
- } else {
- [
- ("java".to_string(), "project-jdk".to_string()),
- ("maven".to_string(), "project-maven".to_string()),
- ]
- .into_iter()
- .collect()
- },
+ toolchains,
debug: (provider != "java.main").then(|| DebugCapability {
adapter: "jdwp".to_string(),
}),
members: Vec::new(),
- extensions: [("maven".to_string(), Value::Object(maven))]
- .into_iter()
- .collect(),
+ extensions,
disabled: false,
- source: None,
+ source: source_path,
}
})
.collect::>();
@@ -765,8 +812,7 @@ pub fn resolve(request: ResolveRequest) -> Result {
})?;
let team = read_document_value(&root, "run/configurations.json")?
.unwrap_or_else(|| json!({"version": VERSION, "configurations": []}));
- let local = read_document_value(&root, "run/local.json")?
- .unwrap_or_else(|| json!({"version": VERSION, "configurations": []}));
+ let local = local_layer_document(&root, request.local_document)?;
let manifest = read_document_value(&root, "project.json")?;
validate_version_value(&generated)?;
validate_version_value(&team)?;
@@ -789,6 +835,10 @@ pub fn resolve(request: ResolveRequest) -> Result {
}
}
let mut configurations = merge_values(&generated, &team, &local)?;
+ let global_toolchain = local.get("toolchain").cloned();
+ if let Some(toolchain) = global_toolchain.as_ref() {
+ apply_global_toolchain(&mut configurations, toolchain);
+ }
for configuration in &mut configurations {
validate_configuration(configuration)?;
if configuration.disabled {
@@ -853,17 +903,61 @@ pub fn resolve(request: ResolveRequest) -> Result {
"version": VERSION,
"configurations": configurations,
"diagnostics": diagnostics,
- "defaultRunConfiguration": default_run_configuration
+ "defaultRunConfiguration": default_run_configuration,
+ "toolchain": global_toolchain
}))
}
+fn apply_global_toolchain(configurations: &mut [RunConfiguration], toolchain: &Value) {
+ let java_home = toolchain["java"]["homePath"].as_str().unwrap_or("");
+ let maven_executable = toolchain["maven"]["executablePath"].as_str().unwrap_or("");
+ let maven_java_home = toolchain["maven"]["javaHomePath"].as_str().unwrap_or("");
+ for configuration in configurations {
+ if !configuration.toolchains.contains_key("java")
+ && !configuration.toolchains.contains_key("maven")
+ {
+ continue;
+ }
+ let java = configuration
+ .extensions
+ .entry("java".to_string())
+ .or_insert_with(|| json!({}));
+ if let Some(object) = java.as_object_mut() {
+ object.insert("homePath".to_string(), json!(java_home));
+ object.insert("mavenExecutablePath".to_string(), json!(maven_executable));
+ object.insert("mavenJavaHomePath".to_string(), json!(maven_java_home));
+ }
+ }
+}
+
/// Persists editable configuration options in the requested ownership layer.
pub fn update_options(request: UpdateOptionsRequest) -> Result {
let root = existing_root(&request.root)?;
+ if let Some(toolchain) = request.toolchain {
+ if request.scope != "local" {
+ return Err(CoreError::new(
+ ErrorCode::InvalidRequest,
+ "Toolchain paths can only be saved in the local layer",
+ ));
+ }
+ let mut document = local_layer_document(&root, request.local_document)?;
+ validate_version_value(&document)?;
+ document["toolchain"] = json!({
+ "java": { "homePath": toolchain.java_home_path },
+ "maven": {
+ "executablePath": toolchain.maven_executable_path,
+ "javaHomePath": toolchain.maven_java_home_path
+ }
+ });
+ return Ok(json!({
+ "document": serde_json::to_string_pretty(&document).expect("document should encode")
+ }));
+ }
let relative = scope_document(&request.scope)?;
let resolved = resolve(ResolveRequest {
root: request.root.clone(),
toolchain_candidates: Vec::new(),
+ local_document: request.local_document.clone(),
})?;
let provider = resolved["configurations"]
.as_array()
@@ -877,6 +971,12 @@ pub fn update_options(request: UpdateOptionsRequest) -> Result
CoreError::new(ErrorCode::InvalidRequest, "Run configuration was not found")
})?;
let uses_maven_capability = is_maven_backed(provider);
+ let java_home_path =
+ normalize_scoped_toolchain_path(&root, &request.scope, &request.java_home_path)?;
+ let maven_executable_path =
+ normalize_scoped_toolchain_path(&root, &request.scope, &request.maven_executable_path)?;
+ let maven_java_home_path =
+ normalize_scoped_toolchain_path(&root, &request.scope, &request.maven_java_home_path)?;
let working_directory = normalize_project_directory(
&root,
if request.working_directory.trim().is_empty() {
@@ -886,8 +986,12 @@ pub fn update_options(request: UpdateOptionsRequest) -> Result
},
false,
)?;
- let mut document = read_document_value(&root, relative)?
- .unwrap_or_else(|| json!({"version": VERSION, "configurations": []}));
+ let mut document = if request.scope == "local" {
+ local_layer_document(&root, request.local_document)?
+ } else {
+ read_document_value(&root, relative)?
+ .unwrap_or_else(|| json!({"version": VERSION, "configurations": []}))
+ };
validate_version_value(&document)?;
let configurations = document["configurations"]
.as_array_mut()
@@ -897,6 +1001,19 @@ pub fn update_options(request: UpdateOptionsRequest) -> Result
"cwd": working_directory,
"env": request.environment
});
+ let mut java_extension = serde_json::Map::new();
+ if !java_home_path.is_empty() {
+ java_extension.insert("homePath".to_string(), json!(java_home_path));
+ }
+ if !maven_executable_path.is_empty() {
+ java_extension.insert(
+ "mavenExecutablePath".to_string(),
+ json!(maven_executable_path),
+ );
+ }
+ if !maven_java_home_path.is_empty() {
+ java_extension.insert("mavenJavaHomePath".to_string(), json!(maven_java_home_path));
+ }
if uses_maven_capability {
patch["extensions"] = json!({
"maven": {
@@ -904,16 +1021,10 @@ pub fn update_options(request: UpdateOptionsRequest) -> Result
"programArguments": split_arguments(&request.arguments),
"profiles": request.maven_profiles.into_iter().collect::>()
},
- "java": {
- "homePath": request.java_home_path,
- "mavenExecutablePath": request.maven_executable_path,
- "mavenJavaHomePath": request.maven_java_home_path
- }
- });
- } else if !request.java_home_path.is_empty() {
- patch["extensions"] = json!({
- "java": { "homePath": request.java_home_path }
+ "java": java_extension
});
+ } else if !java_extension.is_empty() {
+ patch["extensions"] = json!({ "java": java_extension });
} else {
patch["args"] = json!(split_arguments(&request.arguments));
}
@@ -1056,6 +1167,7 @@ pub fn create_launch_plan(request: LaunchPlanRequest) -> Result Result Result Result Result Result<(), CoreEr
Ok(())
}
+fn local_layer_document(root: &Path, provided: Option) -> Result {
+ if let Some(mut document) = provided {
+ // A host-owned local layer may still carry the v1 shape, mirroring the
+ // migration applied to the on-disk document below.
+ migrate_document_value(&mut document);
+ validate_version_value(&document)?;
+ configuration_ids(&document)?;
+ return Ok(document);
+ }
+ Ok(read_document_value(root, "run/local.json")?
+ .unwrap_or_else(|| json!({"version": VERSION, "configurations": []})))
+}
+
fn scope_document(scope: &str) -> Result<&'static str, CoreError> {
match scope {
"local" => Ok("run/local.json"),
@@ -1612,6 +1763,22 @@ fn scope_document(scope: &str) -> Result<&'static str, CoreError> {
}
}
+fn normalize_scoped_toolchain_path(
+ root: &Path,
+ scope: &str,
+ value: &str,
+) -> Result {
+ let value = value.trim();
+ if value.is_empty() {
+ return Ok(String::new());
+ }
+ if scope == "project" {
+ normalize_project_directory(root, value, true)
+ } else {
+ Ok(value.to_string())
+ }
+}
+
fn normalize_project_directory(
root: &Path,
value: &str,
diff --git a/rust/lithe-core/src/git/mod.rs b/rust/lithe-core/src/git/mod.rs
index 88a9a0d76..a17e28088 100644
--- a/rust/lithe-core/src/git/mod.rs
+++ b/rust/lithe-core/src/git/mod.rs
@@ -12,6 +12,8 @@ use crate::protocol::{
use serde::{Deserialize, Serialize};
use std::io::Read;
use std::io::Write;
+#[cfg(target_os = "windows")]
+use std::os::windows::process::CommandExt;
use std::path::{Path, PathBuf};
use std::process::Command;
use std::thread;
@@ -526,7 +528,7 @@ fn execute_git_with_options(
disable_optional_locks: bool,
) -> Result {
crate::protocol::cancellation::check()?;
- let mut process = Command::new("git");
+ let mut process = git_process();
process.args(arguments).current_dir(root);
if disable_optional_locks {
process.env("GIT_OPTIONAL_LOCKS", "0");
@@ -599,6 +601,21 @@ fn execute_git_with_options(
})
}
+fn git_process() -> Command {
+ let mut process = Command::new("git");
+ #[cfg(target_os = "windows")]
+ process.creation_flags(git_process_creation_flags());
+ process
+}
+
+#[cfg(target_os = "windows")]
+fn git_process_creation_flags() -> u32 {
+ // Git runs as an IDE background task; attaching a console can briefly open
+ // the user's default terminal whenever status or repository data refreshes.
+ const CREATE_NO_WINDOW: u32 = 0x08000000;
+ CREATE_NO_WINDOW
+}
+
/// Builds a structured working-tree, staged, untracked, or commit diff.
pub fn diff(request: GitDiffRequest) -> Result {
if request.pathspecs.is_empty() || request.pathspecs.iter().any(|path| !is_safe_pathspec(path))
@@ -2752,7 +2769,7 @@ fn run_git(directory: &Path, arguments: &[&str]) -> Result Vec {
texts
.iter()
diff --git a/rust/lithe-core/src/lsp/interface/process.rs b/rust/lithe-core/src/lsp/interface/process.rs
index 2f59aa1dc..d557d1305 100644
--- a/rust/lithe-core/src/lsp/interface/process.rs
+++ b/rust/lithe-core/src/lsp/interface/process.rs
@@ -9,10 +9,15 @@
use crate::protocol::{CoreError, ErrorCode};
use std::collections::BTreeMap;
use std::io::{Read, Write};
+#[cfg(target_os = "windows")]
+use std::path::Path;
use std::path::PathBuf;
use std::process::{Child, ChildStdin, Command, Stdio};
use std::sync::{Arc, Mutex};
+#[cfg(target_os = "windows")]
+use std::os::windows::process::CommandExt;
+
/// Everything needed to start a language server, after provider adaptation has
/// already rewritten the arguments.
pub struct LspProcessSpec {
@@ -67,14 +72,13 @@ pub struct SystemProcessLauncher;
impl LspProcessLauncher for SystemProcessLauncher {
fn launch(&self, spec: LspProcessSpec) -> Result {
- let mut command = Command::new(&spec.executable);
+ let mut command = language_server_command(&spec);
command
- .args(&spec.arguments)
.current_dir(&spec.working_directory)
- .envs(&spec.environment)
.stdin(Stdio::piped())
.stdout(Stdio::piped())
.stderr(Stdio::piped());
+ apply_language_server_creation_flags(&mut command);
let mut child = command.spawn().map_err(|error| {
CoreError::new(
ErrorCode::ProcessStartFailed,
@@ -102,6 +106,98 @@ impl LspProcessLauncher for SystemProcessLauncher {
}
}
+fn language_server_command(spec: &LspProcessSpec) -> Command {
+ #[cfg(target_os = "windows")]
+ if is_windows_batch_script(&spec.executable) {
+ let mut command = Command::new("cmd.exe");
+ command.envs(&spec.environment);
+ // Environment expansion is single-pass, so quoted values reach the batch
+ // file without cmd.exe interpreting path metacharacters or percent pairs.
+ command.env(
+ WINDOWS_BATCH_EXECUTABLE_ENV,
+ windows_batch_env_value(&spec.executable.to_string_lossy()),
+ );
+ for (index, argument) in spec.arguments.iter().enumerate() {
+ command.env(
+ windows_batch_argument_env(index),
+ windows_batch_env_value(argument),
+ );
+ }
+ command.raw_arg("/D");
+ command.raw_arg("/S");
+ command.raw_arg("/V:OFF");
+ command.raw_arg("/C");
+ command.raw_arg(windows_batch_command_line(spec.arguments.len()));
+ return command;
+ }
+
+ let mut command = Command::new(&spec.executable);
+ command.args(&spec.arguments).envs(&spec.environment);
+ command
+}
+
+#[cfg(target_os = "windows")]
+fn is_windows_batch_script(executable: &Path) -> bool {
+ matches!(
+ executable.extension().and_then(|extension| extension.to_str()),
+ Some(extension) if extension.eq_ignore_ascii_case("bat") || extension.eq_ignore_ascii_case("cmd")
+ )
+}
+
+#[cfg(target_os = "windows")]
+const WINDOWS_BATCH_EXECUTABLE_ENV: &str = "LITHE_LSP_BATCH_EXECUTABLE";
+
+#[cfg(target_os = "windows")]
+fn windows_batch_argument_env(index: usize) -> String {
+ format!("LITHE_LSP_BATCH_ARGUMENT_{index}")
+}
+
+#[cfg(target_os = "windows")]
+fn windows_batch_command_line(argument_count: usize) -> String {
+ let mut command_line = format!("\"%{WINDOWS_BATCH_EXECUTABLE_ENV}%\"");
+ for index in 0..argument_count {
+ command_line.push_str(&format!(" \"%{}%\"", windows_batch_argument_env(index)));
+ }
+ format!("\"{command_line}\"")
+}
+
+#[cfg(target_os = "windows")]
+fn windows_batch_env_value(value: &str) -> String {
+ let mut escaped = String::new();
+ let mut backslashes = 0;
+ for character in value.chars() {
+ match character {
+ '\\' => backslashes += 1,
+ '"' => {
+ escaped.push_str(&"\\".repeat(backslashes * 2 + 1));
+ escaped.push('"');
+ backslashes = 0;
+ }
+ _ => {
+ escaped.push_str(&"\\".repeat(backslashes));
+ escaped.push(character);
+ backslashes = 0;
+ }
+ }
+ }
+ escaped.push_str(&"\\".repeat(backslashes * 2));
+ escaped
+}
+
+fn apply_language_server_creation_flags(command: &mut Command) {
+ #[cfg(target_os = "windows")]
+ command.creation_flags(language_server_process_creation_flags());
+
+ #[cfg(not(target_os = "windows"))]
+ let _ = command;
+}
+
+#[cfg(target_os = "windows")]
+fn language_server_process_creation_flags() -> u32 {
+ const CREATE_NO_WINDOW: u32 = 0x0800_0000;
+ CREATE_NO_WINDOW
+}
+
struct SystemProcess {
input: Mutex>,
child: Mutex,
@@ -166,3 +262,91 @@ fn missing_stream(stream: &str) -> CoreError {
)
.with_details(stream)
}
+
+#[cfg(all(test, target_os = "windows"))]
+mod tests {
+ use super::{
+ language_server_command, windows_batch_command_line, LspProcessLauncher, LspProcessSpec,
+ SystemProcessLauncher, WINDOWS_BATCH_EXECUTABLE_ENV,
+ };
+ use std::collections::BTreeMap;
+ use std::ffi::OsStr;
+ use std::fs;
+ use std::io::Read;
+ use std::path::PathBuf;
+ use std::time::{SystemTime, UNIX_EPOCH};
+
+ #[test]
+ fn background_language_servers_do_not_create_windows_console() {
+ assert_eq!(super::language_server_process_creation_flags(), 0x0800_0000);
+ }
+
+ #[test]
+ fn batch_language_server_uses_cmd_exe() {
+ let spec = LspProcessSpec {
+ executable: PathBuf::from(r"C:\Program Files\Lithe\jdtls.bat"),
+ arguments: vec!["-data".to_string(), r"C:\workspace data".to_string()],
+ working_directory: PathBuf::from(r"C:\workspace"),
+ environment: BTreeMap::new(),
+ };
+
+ let command = language_server_command(&spec);
+
+ assert_eq!(command.get_program(), OsStr::new("cmd.exe"));
+ assert_eq!(
+ windows_batch_command_line(spec.arguments.len()),
+ r#"""%LITHE_LSP_BATCH_EXECUTABLE%" "%LITHE_LSP_BATCH_ARGUMENT_0%" "%LITHE_LSP_BATCH_ARGUMENT_1%"""#
+ );
+ assert!(command.get_envs().any(|(name, value)| {
+ name == OsStr::new(WINDOWS_BATCH_EXECUTABLE_ENV)
+ && value == Some(spec.executable.as_os_str())
+ }));
+ }
+
+ #[test]
+ fn batch_language_server_preserves_spaced_paths_and_shell_metacharacters() {
+ let stamp = SystemTime::now()
+ .duration_since(UNIX_EPOCH)
+ .expect("clock")
+ .as_nanos();
+ let root = std::env::temp_dir().join(format!("lithe lsp batch {stamp}"));
+ fs::create_dir_all(&root).expect("temp directory");
+ let executable = root.join("scripted server.cmd");
+ let argument_writer = root.join("write-argument.ps1");
+ fs::write(
+ &argument_writer,
+ "[Console]::Out.Write(($args -join [Environment]::NewLine))\r\n",
+ )
+ .expect("PowerShell argument writer");
+ fs::write(
+ &executable,
+ "@echo off\r\npowershell.exe -NoLogo -NoProfile -File \"%~dp0write-argument.ps1\" %*\r\n",
+ )
+ .expect("batch script");
+ let arguments = vec![
+ "workspace&echo_injected".to_string(),
+ "percent%PATH%value".to_string(),
+ "bang!value".to_string(),
+ "caret^value".to_string(),
+ "paren(value)".to_string(),
+ "quoted\"value".to_string(),
+ r"C:\workspace data\".to_string(),
+ ];
+ let spec = LspProcessSpec {
+ executable,
+ arguments: arguments.clone(),
+ working_directory: root.clone(),
+ environment: BTreeMap::new(),
+ };
+
+ let mut streams = SystemProcessLauncher
+ .launch(spec)
+ .expect("launch batch script");
+ streams.handle.close_input();
+ let mut output = String::new();
+ streams.output.read_to_string(&mut output).expect("stdout");
+
+ assert_eq!(output, arguments.join("\r\n"));
+ fs::remove_dir_all(root).ok();
+ }
+}
diff --git a/rust/lithe-core/src/tests/run_configuration.rs b/rust/lithe-core/src/tests/run_configuration.rs
index 2ccaf38ae..0f0e6ba00 100644
--- a/rust/lithe-core/src/tests/run_configuration.rs
+++ b/rust/lithe-core/src/tests/run_configuration.rs
@@ -423,6 +423,247 @@ fn ordinary_java_main_uses_an_application_launch_plan() {
fs::remove_dir_all(root).unwrap();
}
+#[test]
+fn plain_java_main_uses_the_jdk_without_maven() {
+ let root = temporary_root("run-config-plain-java-main");
+ let source = "src/com/example/WorkerMain.java";
+ fs::create_dir_all(root.join("src/com/example")).unwrap();
+ fs::write(
+ root.join(source),
+ "package com.example; class WorkerMain { public static void main(String[] args) {} }",
+ )
+ .unwrap();
+
+ let generated_response: Value = serde_json::from_str(&execute_json(
+ &serde_json::json!({
+ "id": "generate-plain-java-main",
+ "command": "runConfig.generate",
+ "payload": {"root": root, "paths": [source], "modulePaths": []}
+ })
+ .to_string(),
+ ))
+ .unwrap();
+ let generated = &generated_response["data"]["generated"];
+ let java_main = generated["configurations"]
+ .as_array()
+ .unwrap()
+ .iter()
+ .find(|value| value["provider"] == "java.main")
+ .unwrap();
+ assert_eq!(java_main["toolchains"]["java"], "project-jdk");
+ assert!(java_main["toolchains"]["maven"].is_null());
+ assert_eq!(java_main["source"], source);
+
+ fs::create_dir_all(root.join(".lithe/run")).unwrap();
+ fs::write(
+ root.join(".lithe/run/generated.json"),
+ serde_json::to_string(generated).unwrap(),
+ )
+ .unwrap();
+ let plan: Value = serde_json::from_str(&execute_json(
+ &serde_json::json!({
+ "id": "plan-plain-java-main",
+ "command": "runConfig.createLaunchPlan",
+ "payload": {
+ "root": root,
+ "configurationId": "java-main:com.example.WorkerMain"
+ }
+ })
+ .to_string(),
+ ))
+ .unwrap();
+ assert_eq!(plan["ok"], true, "{plan}");
+ assert_eq!(plan["data"]["executable"]["toolchain"], "project-jdk");
+ assert_eq!(plan["data"]["arguments"], serde_json::json!([source]));
+
+ fs::remove_dir_all(root).unwrap();
+}
+
+#[test]
+fn resolve_prefers_a_host_provided_local_document() {
+ let root = temporary_root("run-config-host-local");
+ fs::create_dir_all(root.join(".lithe/run")).unwrap();
+ fs::write(
+ root.join(".lithe/run/generated.json"),
+ r#"{"version":2,"configurations":[{"id":"current-file","name":"Current File","provider":"java.current-file","execution":"application","toolchains":{"java":"project-jdk"}}]}"#,
+ )
+ .unwrap();
+ fs::write(
+ root.join(".lithe/run/local.json"),
+ r#"{"version":2,"configurations":[{"id":"current-file","name":"Project Local","provider":"java.current-file","cwd":"."}]}"#,
+ )
+ .unwrap();
+
+ let resolve: Value = serde_json::from_str(&execute_json(
+ &serde_json::json!({
+ "id": "resolve-host-local",
+ "command": "runConfig.resolve",
+ "payload": {
+ "root": root,
+ "localDocument": {
+ "version": 2,
+ "configurations": [{
+ "id": "current-file",
+ "name": "This PC",
+ "provider": "java.current-file",
+ "cwd": "."
+ }]
+ }
+ }
+ })
+ .to_string(),
+ ))
+ .unwrap();
+ assert_eq!(resolve["ok"], true, "{resolve}");
+ let current = resolve["data"]["configurations"]
+ .as_array()
+ .unwrap()
+ .iter()
+ .find(|value| value["id"] == "current-file")
+ .unwrap();
+ assert_eq!(current["name"], "This PC");
+
+ // A legacy v1 local layer supplied by the host migrates like the on-disk
+ // document, so an old `.lithe/run/local.json` read by the adapter still works.
+ let legacy: Value = serde_json::from_str(&execute_json(
+ &serde_json::json!({
+ "id": "resolve-host-local-v1",
+ "command": "runConfig.resolve",
+ "payload": {
+ "root": root,
+ "localDocument": {
+ "version": 1,
+ "configurations": [{
+ "id": "current-file",
+ "name": "Legacy This PC",
+ "type": "java.current-file",
+ "programArguments": ["--dev"]
+ }]
+ }
+ }
+ })
+ .to_string(),
+ ))
+ .unwrap();
+ assert_eq!(legacy["ok"], true, "{legacy}");
+ let legacy_current = legacy["data"]["configurations"]
+ .as_array()
+ .unwrap()
+ .iter()
+ .find(|value| value["id"] == "current-file")
+ .unwrap();
+ assert_eq!(legacy_current["name"], "Legacy This PC");
+
+ fs::remove_dir_all(root).unwrap();
+}
+
+#[test]
+fn resolve_applies_a_global_toolchain_to_every_configuration() {
+ let root = temporary_root("run-config-global-toolchain");
+ fs::create_dir_all(root.join(".lithe/run")).unwrap();
+ fs::write(
+ root.join(".lithe/run/generated.json"),
+ r#"{"version":2,"configurations":[
+ {"id":"spring","name":"Spring","provider":"spring-boot.maven","execution":"service","toolchains":{"java":"project-jdk","maven":"project-maven"},"extensions":{"maven":{"module":"."}}},
+ {"id":"plain","name":"Plain","provider":"java.main","execution":"application","toolchains":{"java":"project-jdk"},"extensions":{"java":{"source":"src/App.java"}}}
+ ]}"#,
+ )
+ .unwrap();
+ fs::write(
+ root.join(".lithe/run/local.json"),
+ r#"{"version":2,"toolchain":{"java":{"homePath":"C:/custom-jdk"},"maven":{"executablePath":"C:/mvn.cmd","javaHomePath":"C:/maven-jdk"}},"configurations":[]}"#,
+ )
+ .unwrap();
+
+ let resolved: Value = serde_json::from_str(&execute_json(
+ &serde_json::json!({
+ "id": "resolve-global-toolchain",
+ "command": "runConfig.resolve",
+ "payload": {"root": root}
+ })
+ .to_string(),
+ ))
+ .unwrap();
+ assert_eq!(resolved["ok"], true, "{resolved}");
+ assert_eq!(
+ resolved["data"]["toolchain"]["java"]["homePath"],
+ "C:/custom-jdk"
+ );
+ let plain = resolved["data"]["configurations"]
+ .as_array()
+ .unwrap()
+ .iter()
+ .find(|value| value["id"] == "plain")
+ .unwrap();
+ assert_eq!(plain["extensions"]["java"]["homePath"], "C:/custom-jdk");
+ assert_eq!(
+ plain["extensions"]["java"]["mavenExecutablePath"],
+ "C:/mvn.cmd"
+ );
+ // The global toolchain replaces runtime paths but never the source path.
+ assert_eq!(plain["extensions"]["java"]["source"], "src/App.java");
+
+ fs::remove_dir_all(root).unwrap();
+}
+
+#[test]
+fn global_toolchain_updates_only_in_the_local_layer() {
+ let root = temporary_root("run-config-toolchain-update");
+ fs::create_dir_all(root.join(".lithe/run")).unwrap();
+ fs::write(
+ root.join(".lithe/run/local.json"),
+ r#"{"version":2,"configurations":[]}"#,
+ )
+ .unwrap();
+
+ let updated: Value = serde_json::from_str(&execute_json(
+ &serde_json::json!({
+ "id": "update-global-toolchain",
+ "command": "runConfig.updateOptions",
+ "payload": {
+ "root": root,
+ "scope": "local",
+ "configurationId": "unused",
+ "toolchain": {
+ "javaHomePath": "C:/jdk-21",
+ "mavenExecutablePath": "C:/apache-maven/bin/mvn.cmd",
+ "mavenJavaHomePath": "C:/jdk-17"
+ }
+ }
+ })
+ .to_string(),
+ ))
+ .unwrap();
+ assert_eq!(updated["ok"], true, "{updated}");
+ let document: Value =
+ serde_json::from_str(updated["data"]["document"].as_str().unwrap()).unwrap();
+ assert_eq!(document["toolchain"]["java"]["homePath"], "C:/jdk-21");
+ assert_eq!(
+ document["toolchain"]["maven"]["executablePath"],
+ "C:/apache-maven/bin/mvn.cmd"
+ );
+ assert_eq!(document["toolchain"]["maven"]["javaHomePath"], "C:/jdk-17");
+
+ // Project scope must never accept toolchain paths.
+ let rejected: Value = serde_json::from_str(&execute_json(
+ &serde_json::json!({
+ "id": "update-global-toolchain-project",
+ "command": "runConfig.updateOptions",
+ "payload": {
+ "root": root,
+ "scope": "project",
+ "configurationId": "unused",
+ "toolchain": {"javaHomePath": "C:/jdk-21"}
+ }
+ })
+ .to_string(),
+ ))
+ .unwrap();
+ assert_eq!(rejected["ok"], false, "{rejected}");
+
+ fs::remove_dir_all(root).unwrap();
+}
+
#[test]
fn run_configuration_inspect_reports_malformed_and_unsupported_documents() {
let root = temporary_root("run-config-errors");
@@ -557,6 +798,66 @@ fn run_configuration_mutations_are_shared_and_validated() {
fs::remove_dir_all(root).unwrap();
}
+#[test]
+fn project_scoped_toolchain_paths_are_relative_and_stay_inside_the_project() {
+ let root = temporary_root("run-config-project-toolchains");
+ let outside = temporary_root("run-config-outside-toolchain");
+ fs::create_dir_all(root.join(".lithe/run")).unwrap();
+ fs::create_dir_all(root.join("toolchains/jdk")).unwrap();
+ fs::create_dir_all(root.join("toolchains/maven/bin")).unwrap();
+ fs::create_dir_all(root.join("toolchains/maven-jdk")).unwrap();
+ fs::create_dir_all(&outside).unwrap();
+ fs::write(root.join("toolchains/maven/bin/mvn"), "#!/bin/sh\n").unwrap();
+ fs::write(
+ root.join(".lithe/run/generated.json"),
+ r#"{"version":2,"configurations":[{"id":"spring","name":"Spring","provider":"spring-boot.maven","execution":"service","toolchains":{"java":"project-jdk","maven":"project-maven"},"extensions":{"maven":{"module":"."}}}]}"#,
+ )
+ .unwrap();
+
+ let updated: Value = serde_json::from_str(&execute_json(
+ &serde_json::json!({
+ "id": "project-toolchains",
+ "command": "runConfig.updateOptions",
+ "payload": {
+ "root": root,
+ "scope": "project",
+ "configurationId": "spring",
+ "javaHomePath": root.join("toolchains/jdk"),
+ "mavenExecutablePath": root.join("toolchains/maven/bin/mvn"),
+ "mavenJavaHomePath": root.join("toolchains/maven-jdk")
+ }
+ })
+ .to_string(),
+ ))
+ .unwrap();
+ assert_eq!(updated["ok"], true, "{updated}");
+ let document: Value =
+ serde_json::from_str(updated["data"]["document"].as_str().unwrap()).unwrap();
+ let java = &document["configurations"][0]["extensions"]["java"];
+ assert_eq!(java["homePath"], "toolchains/jdk");
+ assert_eq!(java["mavenExecutablePath"], "toolchains/maven/bin/mvn");
+ assert_eq!(java["mavenJavaHomePath"], "toolchains/maven-jdk");
+
+ let rejected: Value = serde_json::from_str(&execute_json(
+ &serde_json::json!({
+ "id": "outside-project-toolchain",
+ "command": "runConfig.updateOptions",
+ "payload": {
+ "root": root,
+ "scope": "project",
+ "configurationId": "spring",
+ "javaHomePath": outside
+ }
+ })
+ .to_string(),
+ ))
+ .unwrap();
+ assert_eq!(rejected["ok"], false, "{rejected}");
+
+ fs::remove_dir_all(root).unwrap();
+ fs::remove_dir_all(outside).unwrap();
+}
+
#[test]
fn run_configuration_generation_detects_declared_toolchain_versions() {
let root = temporary_root("run-config-toolchains");
diff --git a/scripts/build-windows.ps1 b/scripts/build-windows.ps1
index b898ac77d..b427cddd3 100644
--- a/scripts/build-windows.ps1
+++ b/scripts/build-windows.ps1
@@ -8,6 +8,9 @@ param(
$ErrorActionPreference = "Stop"
$root = Split-Path -Parent $PSScriptRoot
$windowsApp = Join-Path $root "windows/tauri"
+if ($Configuration -eq "Release") {
+ & (Join-Path $root "scripts/prepare-jdtls.ps1") | Out-Null
+}
Set-Location $windowsApp
if ($null -eq (Get-Command bun -ErrorAction SilentlyContinue)) {
@@ -29,7 +32,11 @@ $tauriArgs = @(
"--config", "src-tauri/tauri.windows.conf.json",
"--target", $RustTarget
)
-if ($Configuration -eq "Debug") { $tauriArgs += "--debug" }
+if ($Configuration -eq "Debug") {
+ $tauriArgs += "--debug"
+} else {
+ $tauriArgs += @("--config", "src-tauri/tauri.jdtls.conf.json")
+}
& bunx @tauriArgs
if ($LASTEXITCODE -ne 0) { throw "Windows Tauri build failed" }
diff --git a/scripts/package-app.sh b/scripts/package-app.sh
index 77934041b..385a95242 100755
--- a/scripts/package-app.sh
+++ b/scripts/package-app.sh
@@ -20,6 +20,7 @@ case "$ARCH" in
esac
cd "$ROOT_DIR"
+JDTLS_ROOT=$("$ROOT_DIR/scripts/prepare-jdtls.sh")
if [[ "$ARCH" == "universal" ]]; then
scripts/build-macos.sh --configuration release --triple "$ARM64_TRIPLE"
scripts/build-macos.sh --configuration release --triple "$X86_64_TRIPLE"
@@ -89,6 +90,8 @@ if [[ ! -d "$resource_bundle" ]]; then
exit 1
fi
cp -R "$resource_bundle" "$APP_DIR/Contents/Resources/Lithe_Lithe.bundle"
+mkdir -p "$APP_DIR/Contents/Resources/LanguageServers"
+cp -R "$JDTLS_ROOT" "$APP_DIR/Contents/Resources/LanguageServers/jdtls"
OFFICIAL_PLUGIN_DESTINATION="$APP_DIR/Contents/Resources/OfficialPlugins"
mkdir -p "$OFFICIAL_PLUGIN_DESTINATION"
@@ -132,6 +135,7 @@ cp "$INFO_PLIST" "$APP_DIR/Contents/Info.plist"
cp "$ROOT_DIR/Resources/AppIcon.icns" "$APP_DIR/Contents/Resources/AppIcon.icns"
cp -R "$ROOT_DIR/Resources/IDEAIcons" "$APP_DIR/Contents/Resources/IDEAIcons"
cp -R "$ROOT_DIR/Resources/DatabaseIcons" "$APP_DIR/Contents/Resources/DatabaseIcons"
+cp -R "$ROOT_DIR/Resources/Fonts" "$APP_DIR/Contents/Resources/Fonts"
for localization in en.lproj zh-Hans.lproj; do
if [[ -d "$ROOT_DIR/Resources/$localization" ]]; then
cp -R "$ROOT_DIR/Resources/$localization" "$APP_DIR/Contents/Resources/$localization"
diff --git a/scripts/package-windows.ps1 b/scripts/package-windows.ps1
index 601bd8a2a..a45d43ea9 100644
--- a/scripts/package-windows.ps1
+++ b/scripts/package-windows.ps1
@@ -15,6 +15,7 @@ $windowsApp = Join-Path $root "windows/tauri"
$output = Join-Path $root $OutputDirectory
$versionConfig = Join-Path $env:RUNNER_TEMP "lithe-tauri-version.json"
+& (Join-Path $root "scripts/prepare-jdtls.ps1") | Out-Null
@{ version = $Version } | ConvertTo-Json | Set-Content -Encoding utf8 $versionConfig
Set-Location $windowsApp
& bun install --frozen-lockfile
@@ -23,6 +24,7 @@ if ($LASTEXITCODE -ne 0) { throw "Windows frontend dependency installation faile
$tauriArgs = @(
"tauri", "build",
"--config", "src-tauri/tauri.windows.conf.json",
+ "--config", "src-tauri/tauri.jdtls.conf.json",
"--config", $versionConfig,
"--bundles", "nsis"
)
diff --git a/scripts/prepare-jdtls.ps1 b/scripts/prepare-jdtls.ps1
new file mode 100644
index 000000000..820382e69
--- /dev/null
+++ b/scripts/prepare-jdtls.ps1
@@ -0,0 +1,125 @@
+[CmdletBinding()]
+param(
+ [string]$OutputDirectory = ""
+)
+
+$ErrorActionPreference = "Stop"
+$root = Split-Path -Parent $PSScriptRoot
+$manifestPath = Join-Path $root "third_party/jdtls/manifest.json"
+$manifest = Get-Content -Raw -LiteralPath $manifestPath | ConvertFrom-Json
+$usesExistingRoot = [string]::IsNullOrWhiteSpace($OutputDirectory) -and
+ -not [string]::IsNullOrWhiteSpace($env:LITHE_JDTLS_ROOT)
+$requestedOutput = if ([string]::IsNullOrWhiteSpace($OutputDirectory)) {
+ if ($usesExistingRoot) { $env:LITHE_JDTLS_ROOT } else { Join-Path $root ".artifacts/jdtls" }
+} else {
+ $OutputDirectory
+}
+$output = [System.IO.Path]::GetFullPath($requestedOutput)
+$artifactsRoot = [System.IO.Path]::GetFullPath((Join-Path $root ".artifacts"))
+$artifactsPrefix = $artifactsRoot.TrimEnd([System.IO.Path]::DirectorySeparatorChar) + [System.IO.Path]::DirectorySeparatorChar
+if (-not $usesExistingRoot -and
+ -not $output.StartsWith($artifactsPrefix, [System.StringComparison]::OrdinalIgnoreCase)) {
+ throw "JDTLS output must be inside the repository .artifacts directory: $output"
+}
+$cache = Join-Path $root ".artifacts/jdtls-downloads"
+$archiveUsesOverride = -not [string]::IsNullOrWhiteSpace($env:LITHE_JDTLS_ARCHIVE)
+$archiveHash = $manifest.archiveSHA256.ToLowerInvariant()
+$licenseHash = $manifest.licenseSHA256.ToLowerInvariant()
+$safeVersion = ([string]$manifest.version) -replace '[^A-Za-z0-9._-]', '_'
+$archive = if ($archiveUsesOverride) {
+ $env:LITHE_JDTLS_ARCHIVE
+} else {
+ Join-Path $cache "jdtls-$safeVersion-$archiveHash.tar.gz"
+}
+$license = Join-Path $cache "EPL-2.0-$licenseHash.txt"
+
+function Get-FileSHA256 {
+ param([Parameter(Mandatory)][string]$Path)
+
+ (Get-FileHash -Algorithm SHA256 -LiteralPath $Path).Hash.ToLowerInvariant()
+}
+
+function Get-VerifiedDownload {
+ param(
+ [Parameter(Mandatory)][string]$Uri,
+ [Parameter(Mandatory)][string]$ExpectedSHA256,
+ [Parameter(Mandatory)][string]$Destination,
+ [Parameter(Mandatory)][string]$Description
+ )
+
+ if (Test-Path -LiteralPath $Destination -PathType Leaf) {
+ $actualHash = Get-FileSHA256 -Path $Destination
+ if ($actualHash -eq $ExpectedSHA256) { return }
+ Write-Warning "$Description cache checksum mismatch; removing it before retrying the download"
+ Remove-Item -Force -LiteralPath $Destination
+ }
+
+ $temporaryPath = "$Destination.download-$PID"
+ try {
+ if (Test-Path -LiteralPath $temporaryPath) { Remove-Item -Force -LiteralPath $temporaryPath }
+ Invoke-WebRequest -Uri $Uri -OutFile $temporaryPath
+ $actualHash = Get-FileSHA256 -Path $temporaryPath
+ if ($actualHash -ne $ExpectedSHA256) {
+ throw "$Description checksum mismatch: expected $ExpectedSHA256, got $actualHash"
+ }
+ Move-Item -Force -LiteralPath $temporaryPath -Destination $Destination
+ } finally {
+ if (Test-Path -LiteralPath $temporaryPath) { Remove-Item -Force -LiteralPath $temporaryPath }
+ }
+}
+
+function Assert-JdtlsOutput {
+ if (-not (Test-Path -LiteralPath (Join-Path $output "plugins") -PathType Container)) { throw "JDTLS plugins directory is missing: $output" }
+ if (-not (Test-Path -LiteralPath (Join-Path $output "config_win") -PathType Container)) { throw "JDTLS Windows configuration is missing: $output" }
+ if (-not (Test-Path -LiteralPath (Join-Path $output "bin/jdtls.ps1") -PathType Leaf)) { throw "JDTLS PowerShell launcher is missing: $output" }
+ if (-not (Test-Path -LiteralPath (Join-Path $output "bin/jdtls.bat") -PathType Leaf)) { throw "JDTLS batch launcher is missing: $output" }
+}
+
+if ($usesExistingRoot) {
+ Assert-JdtlsOutput
+ Write-Output $output
+ exit 0
+}
+
+New-Item -ItemType Directory -Force -Path $cache | Out-Null
+if ($archiveUsesOverride) {
+ if (-not (Test-Path -LiteralPath $archive -PathType Leaf)) { throw "JDTLS archive was not found: $archive" }
+ $actualArchiveHash = Get-FileSHA256 -Path $archive
+ if ($actualArchiveHash -ne $archiveHash) { throw "JDTLS archive checksum mismatch: expected $archiveHash, got $actualArchiveHash" }
+} else {
+ Get-VerifiedDownload -Uri $manifest.archiveURL -ExpectedSHA256 $archiveHash -Destination $archive -Description "JDTLS archive"
+}
+Get-VerifiedDownload -Uri $manifest.licenseURL -ExpectedSHA256 $licenseHash -Destination $license -Description "EPL-2.0 license"
+
+if (Test-Path -LiteralPath $output) { Remove-Item -Recurse -Force -LiteralPath $output }
+New-Item -ItemType Directory -Force -Path $output | Out-Null
+tar.exe -xzf $archive -C $output
+Copy-Item -LiteralPath $license -Destination (Join-Path $output "LICENSE-EPL-2.0.txt") -Force
+
+$windowsLauncher = @'
+$ErrorActionPreference = "Stop"
+$javaExecutable = if ($env:JAVA_HOME) { Join-Path $env:JAVA_HOME "bin\java.exe" } else { "java" }
+$jvmArguments = [System.Collections.Generic.List[string]]::new()
+$jvmArguments.Add("--add-modules=ALL-SYSTEM")
+$jvmArguments.Add("--add-opens=java.base/java.util=ALL-UNNAMED")
+$jvmArguments.Add("--add-opens=java.base/java.lang=ALL-UNNAMED")
+$serverArguments = [System.Collections.Generic.List[string]]::new()
+for ($index = 0; $index -lt $args.Count; $index++) {
+ $argument = [string]$args[$index]
+ if ($argument -eq "--java-executable") { if ($index + 1 -ge $args.Count) { throw "--java-executable requires a path" }; $javaExecutable = [string]$args[++$index] }
+ elseif ($argument.StartsWith("--jvm-arg=")) { $jvmArguments.Add($argument.Substring("--jvm-arg=".Length)) }
+ elseif ($argument -eq "--jvm-arg") { if ($index + 1 -ge $args.Count) { throw "--jvm-arg requires a value" }; $jvmArguments.Add([string]$args[++$index]) }
+ else { $serverArguments.Add($argument) }
+}
+$launcherJar = Get-ChildItem -LiteralPath (Join-Path $PSScriptRoot "..\plugins") -Filter "org.eclipse.equinox.launcher_*.jar" | Sort-Object Name | Select-Object -First 1
+if ($null -eq $launcherJar) { throw "JDTLS Equinox launcher was not found" }
+$configuration = Join-Path $PSScriptRoot "..\config_win"
+& $javaExecutable @jvmArguments "-Declipse.application=org.eclipse.jdt.ls.core.id1" "-Declipse.product=org.eclipse.jdt.ls.core.product" "-Dosgi.bundles.defaultStartLevel=4" "-Dlog.protocol=true" "-Dlog.level=ALL" "-jar" $launcherJar.FullName "-configuration" $configuration @serverArguments
+exit $LASTEXITCODE
+'@
+Set-Content -LiteralPath (Join-Path $output "bin/jdtls.ps1") -Value $windowsLauncher -Encoding ascii
+
+$batchLauncher = "@echo off`r`npowershell.exe -NoLogo -NoProfile -ExecutionPolicy Bypass -File `"%~dp0jdtls.ps1`" %*`r`nexit /b %ERRORLEVEL%`r`n"
+Set-Content -LiteralPath (Join-Path $output "bin/jdtls.bat") -Value $batchLauncher -Encoding ascii
+Assert-JdtlsOutput
+Write-Output $output
diff --git a/scripts/prepare-jdtls.sh b/scripts/prepare-jdtls.sh
new file mode 100755
index 000000000..b82133c60
--- /dev/null
+++ b/scripts/prepare-jdtls.sh
@@ -0,0 +1,200 @@
+#!/bin/zsh
+
+set -euo pipefail
+
+ROOT_DIR="${0:A:h:h}"
+MANIFEST="$ROOT_DIR/third_party/jdtls/manifest.json"
+OUTPUT_DIR="${LITHE_JDTLS_ROOT:-$ROOT_DIR/.artifacts/jdtls}"
+CACHE_DIR="$ROOT_DIR/.artifacts/jdtls-downloads"
+
+manifest_value() {
+ /usr/bin/plutil -extract "$1" raw -o - "$MANIFEST"
+}
+
+archive_url="$(manifest_value archiveURL)"
+archive_sha256="$(manifest_value archiveSHA256)"
+license_url="$(manifest_value licenseURL)"
+license_sha256="$(manifest_value licenseSHA256)"
+jdtls_version="$(manifest_value version)"
+archive_path="${LITHE_JDTLS_ARCHIVE:-$CACHE_DIR/jdtls-$jdtls_version-$archive_sha256.tar.gz}"
+license_path="$CACHE_DIR/EPL-2.0-$license_sha256.txt"
+
+file_sha256() {
+ shasum -a 256 "$1" | awk '{print tolower($1)}'
+}
+
+download_verified_file() {
+ local url="$1"
+ local expected_sha256="$2"
+ local destination="$3"
+ local description="$4"
+ local actual_sha256
+ local temporary_path="$destination.download.$$"
+
+ if [[ -f "$destination" ]]; then
+ actual_sha256="$(file_sha256 "$destination")"
+ if [[ "$actual_sha256" == "$expected_sha256" ]]; then
+ return 0
+ fi
+ print -u2 -- "$description cache checksum mismatch; removing it before retrying the download"
+ rm -f -- "$destination"
+ fi
+
+ rm -f -- "$temporary_path"
+ if ! curl --fail --location --retry 3 --output "$temporary_path" "$url"; then
+ rm -f -- "$temporary_path"
+ return 1
+ fi
+ actual_sha256="$(file_sha256 "$temporary_path")"
+ if [[ "$actual_sha256" != "$expected_sha256" ]]; then
+ print -u2 -- "$description checksum mismatch: expected $expected_sha256, got $actual_sha256"
+ rm -f -- "$temporary_path"
+ return 1
+ fi
+ mv -f -- "$temporary_path" "$destination"
+}
+
+validate_output() {
+ [[ -d "$OUTPUT_DIR/plugins" ]] || { print -u2 -- "JDTLS plugins directory is missing: $OUTPUT_DIR"; exit 1; }
+ [[ -d "$OUTPUT_DIR/config_mac" ]] || { print -u2 -- "JDTLS macOS configuration is missing: $OUTPUT_DIR"; exit 1; }
+ [[ -d "$OUTPUT_DIR/config_win" ]] || { print -u2 -- "JDTLS Windows configuration is missing: $OUTPUT_DIR"; exit 1; }
+ [[ -x "$OUTPUT_DIR/bin/jdtls" ]] || { print -u2 -- "JDTLS launcher is missing: $OUTPUT_DIR/bin/jdtls"; exit 1; }
+ [[ -f "$OUTPUT_DIR/bin/jdtls.ps1" ]] || { print -u2 -- "JDTLS Windows launcher is missing: $OUTPUT_DIR"; exit 1; }
+}
+
+if [[ -n "${LITHE_JDTLS_ROOT:-}" ]]; then
+ validate_output
+ print -r -- "$OUTPUT_DIR"
+ exit 0
+fi
+
+mkdir -p "$CACHE_DIR"
+if [[ -n "${LITHE_JDTLS_ARCHIVE:-}" ]]; then
+ [[ -f "$archive_path" ]] || { print -u2 -- "JDTLS archive was not found: $archive_path"; exit 1; }
+ actual_archive_sha256="$(file_sha256 "$archive_path")"
+ if [[ "$actual_archive_sha256" != "$archive_sha256" ]]; then
+ print -u2 -- "JDTLS archive checksum mismatch: expected $archive_sha256, got $actual_archive_sha256"
+ exit 1
+ fi
+else
+ download_verified_file "$archive_url" "$archive_sha256" "$archive_path" "JDTLS archive"
+fi
+download_verified_file "$license_url" "$license_sha256" "$license_path" "EPL-2.0 license"
+
+rm -rf "$OUTPUT_DIR"
+mkdir -p "$OUTPUT_DIR"
+tar -xzf "$archive_path" -C "$OUTPUT_DIR"
+cp "$license_path" "$OUTPUT_DIR/LICENSE-EPL-2.0.txt"
+
+cat > "$OUTPUT_DIR/bin/jdtls" <<'EOF'
+#!/bin/zsh
+
+set -euo pipefail
+
+SCRIPT_DIR="${0:A:h}"
+JAVA_EXECUTABLE="${JAVA_HOME:-}/bin/java"
+if [[ ! -x "$JAVA_EXECUTABLE" ]]; then
+ JAVA_EXECUTABLE="${JAVA:-java}"
+fi
+
+JVM_ARGUMENTS=(
+ "--add-modules=ALL-SYSTEM"
+ "--add-opens=java.base/java.util=ALL-UNNAMED"
+ "--add-opens=java.base/java.lang=ALL-UNNAMED"
+)
+SERVER_ARGUMENTS=()
+while [[ $# -gt 0 ]]; do
+ case "$1" in
+ --java-executable)
+ [[ $# -ge 2 ]] || { print -u2 -- "--java-executable requires a path"; exit 2; }
+ JAVA_EXECUTABLE="$2"
+ shift 2
+ ;;
+ --jvm-arg=*)
+ JVM_ARGUMENTS+=("${1#--jvm-arg=}")
+ shift
+ ;;
+ --jvm-arg)
+ [[ $# -ge 2 ]] || { print -u2 -- "--jvm-arg requires a value"; exit 2; }
+ JVM_ARGUMENTS+=("$2")
+ shift 2
+ ;;
+ *)
+ SERVER_ARGUMENTS+=("$1")
+ shift
+ ;;
+ esac
+done
+
+LAUNCHER_JAR=$(find "$SCRIPT_DIR/../plugins" -maxdepth 1 -name 'org.eclipse.equinox.launcher_*.jar' -print | sort | head -n 1)
+[[ -n "$LAUNCHER_JAR" ]] || { print -u2 -- "JDTLS Equinox launcher was not found"; exit 1; }
+if [[ "$(uname -m)" == "arm64" && -d "$SCRIPT_DIR/../config_mac_arm" ]]; then
+ CONFIGURATION="$SCRIPT_DIR/../config_mac_arm"
+else
+ CONFIGURATION="$SCRIPT_DIR/../config_mac"
+fi
+
+exec "$JAVA_EXECUTABLE" \
+ "${JVM_ARGUMENTS[@]}" \
+ -Declipse.application=org.eclipse.jdt.ls.core.id1 \
+ -Declipse.product=org.eclipse.jdt.ls.core.product \
+ -Dosgi.bundles.defaultStartLevel=4 \
+ -Dlog.protocol=true \
+ -Dlog.level=ALL \
+ -jar "$LAUNCHER_JAR" \
+ -configuration "$CONFIGURATION" \
+ "${SERVER_ARGUMENTS[@]}"
+EOF
+
+cat > "$OUTPUT_DIR/bin/jdtls.ps1" <<'EOF'
+$ErrorActionPreference = "Stop"
+
+$javaExecutable = if ($env:JAVA_HOME) { Join-Path $env:JAVA_HOME "bin\java.exe" } else { "java" }
+$jvmArguments = [System.Collections.Generic.List[string]]::new()
+$jvmArguments.Add("--add-modules=ALL-SYSTEM")
+$jvmArguments.Add("--add-opens=java.base/java.util=ALL-UNNAMED")
+$jvmArguments.Add("--add-opens=java.base/java.lang=ALL-UNNAMED")
+$serverArguments = [System.Collections.Generic.List[string]]::new()
+
+for ($index = 0; $index -lt $args.Count; $index++) {
+ $argument = [string]$args[$index]
+ if ($argument -eq "--java-executable") {
+ if ($index + 1 -ge $args.Count) { throw "--java-executable requires a path" }
+ $javaExecutable = [string]$args[++$index]
+ } elseif ($argument.StartsWith("--jvm-arg=")) {
+ $jvmArguments.Add($argument.Substring("--jvm-arg=".Length))
+ } elseif ($argument -eq "--jvm-arg") {
+ if ($index + 1 -ge $args.Count) { throw "--jvm-arg requires a value" }
+ $jvmArguments.Add([string]$args[++$index])
+ } else {
+ $serverArguments.Add($argument)
+ }
+}
+
+$launcherJar = Get-ChildItem -LiteralPath (Join-Path $PSScriptRoot "..\plugins") -Filter "org.eclipse.equinox.launcher_*.jar" |
+ Sort-Object Name |
+ Select-Object -First 1
+if ($null -eq $launcherJar) { throw "JDTLS Equinox launcher was not found" }
+$configuration = Join-Path $PSScriptRoot "..\config_win"
+
+& $javaExecutable @jvmArguments `
+ "-Declipse.application=org.eclipse.jdt.ls.core.id1" `
+ "-Declipse.product=org.eclipse.jdt.ls.core.product" `
+ "-Dosgi.bundles.defaultStartLevel=4" `
+ "-Dlog.protocol=true" `
+ "-Dlog.level=ALL" `
+ "-jar" $launcherJar.FullName `
+ "-configuration" $configuration `
+ @serverArguments
+exit $LASTEXITCODE
+EOF
+
+cat > "$OUTPUT_DIR/bin/jdtls.bat" <<'EOF'
+@echo off
+powershell.exe -NoLogo -NoProfile -ExecutionPolicy Bypass -File "%~dp0jdtls.ps1" %*
+exit /b %ERRORLEVEL%
+EOF
+
+chmod +x "$OUTPUT_DIR/bin/jdtls"
+validate_output
+print -r -- "$OUTPUT_DIR"
diff --git a/scripts/preview.sh b/scripts/preview.sh
index 9a1a32039..4321e3cc3 100755
--- a/scripts/preview.sh
+++ b/scripts/preview.sh
@@ -45,6 +45,7 @@ cp Resources/Info.plist "$APP_DIR/Contents/Info.plist"
cp Resources/AppIcon.icns "$APP_DIR/Contents/Resources/AppIcon.icns"
cp -R Resources/IDEAIcons "$APP_DIR/Contents/Resources/IDEAIcons"
cp -R Resources/DatabaseIcons "$APP_DIR/Contents/Resources/DatabaseIcons"
+cp -R Resources/Fonts "$APP_DIR/Contents/Resources/Fonts"
for localization in en.lproj zh-Hans.lproj; do
if [[ -d "Resources/$localization" ]]; then
cp -R "Resources/$localization" "$APP_DIR/Contents/Resources/$localization"
diff --git a/shared/contracts/application-boundary.md b/shared/contracts/application-boundary.md
index b7c73e92e..cf2318ffb 100644
--- a/shared/contracts/application-boundary.md
+++ b/shared/contracts/application-boundary.md
@@ -159,6 +159,8 @@ Platform clients coordinate inspection, generation, resolution, typed document
edits, and launch planning, but must not implement a second JSON merger,
toolchain matcher, ID generator, argument parser, or Java/Maven argument
builder. Opening a project inspects existing files without writing; generation
-is an explicit user action. Local absolute paths belong only in
-`.lithe/**/local.json` and are excluded from project visibility and Git by
-default.
+is an explicit user action. Shared project overrides stay in
+`.lithe/run/configurations.json`. Machine-local overrides may live in
+`.lithe/run/local.json` or in a host-owned document supplied as
+`localDocument`; absolute toolchain paths belong only in that local layer and
+are excluded from project visibility and Git by default.
diff --git a/shared/contracts/run-configuration-v2.schema.json b/shared/contracts/run-configuration-v2.schema.json
index 9bf361325..8178e7c28 100644
--- a/shared/contracts/run-configuration-v2.schema.json
+++ b/shared/contracts/run-configuration-v2.schema.json
@@ -19,6 +19,28 @@
},
"additionalProperties": false
},
+ "toolchain": {
+ "type": "object",
+ "description": "Machine-local global toolchain applied to every configuration. Stored only in the local layer.",
+ "properties": {
+ "java": {
+ "type": "object",
+ "properties": {
+ "homePath": { "type": "string" }
+ },
+ "additionalProperties": false
+ },
+ "maven": {
+ "type": "object",
+ "properties": {
+ "executablePath": { "type": "string" },
+ "javaHomePath": { "type": "string" }
+ },
+ "additionalProperties": false
+ }
+ },
+ "additionalProperties": false
+ },
"configurations": {
"type": "array",
"items": { "$ref": "#/$defs/configuration" }
diff --git a/shared/contracts/rust-core-api.md b/shared/contracts/rust-core-api.md
index f4c3788d5..1cc6fd1ab 100644
--- a/shared/contracts/rust-core-api.md
+++ b/shared/contracts/rust-core-api.md
@@ -120,6 +120,11 @@ stable error code and a user-facing message:
| `git.commitFiles` | Return files changed by one commit |
| `git.comparison` | Return files changed between a reference and the working tree |
| `git.stashes` | Return structured stash references and messages |
+| `git.checkoutPreflight` | Return local paths that would block switching to a reference |
+| `git.pullPreflight` | Report the configured upstream, ahead/behind counts, divergence, and tracked local changes without fetching |
+| `git.integrationPreflight` | Return local paths that block a merge, rebase, cherry-pick, or revert |
+| `git.conflictMarkers` | Return staged text files that still contain conflict markers |
+| `git.operationState` | Report an interrupted merge, rebase, cherry-pick, or revert and its conflicted paths |
| `git.blame` | Return structured line blame metadata |
| `github.parseRemote` | Parse a canonical GitHub HTTPS or SSH remote into owner/name |
| `github.requestPlan` | Validate one GitHub operation and produce a trusted platform HTTP request plan |
@@ -185,9 +190,10 @@ standard error envelope.
`stage`, `unstage`, `discard`, `discardAll`, `stageAll`, `commit`, `cherryPick`, `revert`,
`reset`, `createBranch`, `publishBranch`, `renameBranch`, `deleteBranch`, `merge`, `rebase`,
`fetch`, `pull`, `push`, `checkout`, `checkoutRevision`, `clone`, `stashPush`,
-`stashApply`, `stashPop`, and `stashDrop`. Optional fields are `paths`,
-`reference`, `referenceKind`, `revision`, `name`, `message`, `remote`,
-`destination`, `mode`, `includeUntracked`, `checkout`, and `amend`.
+`stashApply`, `stashPop`, `stashDrop`, `operationContinue`, `operationAbort`, and
+`operationSkip`. Optional fields are `paths`, `reference`, `referenceKind`,
+`revision`, `name`, `message`, `remote`, `destination`, `mode`,
+`includeUntracked`, `checkout`, and `amend`.
The core validates pathspecs, revisions, branch names, references, reset modes,
stash references, and operation-specific required fields before invoking Git.
@@ -200,6 +206,45 @@ and checks out that branch at a detached HEAD when needed, then pushes it with
an upstream. If the push fails, the local branch is intentionally retained so
the user can fix credentials or connectivity and retry without losing commits.
+`operationContinue`, `operationAbort`, and `operationSkip` inspect Git metadata
+to select the active merge, rebase, cherry-pick, or revert instead of accepting
+an operation kind from the caller. Continue is rejected while conflicted paths
+remain, and skip is supported only for a rebase. All three return the normal
+`{ "output": string, "exitCode": number }` process result when Git is invoked;
+an absent or unsupported operation state uses the `invalid_request` envelope.
+
+`git.checkoutPreflight` accepts `{ "root": string, "reference": string }` and
+returns `{ "blockingPaths": string[] }`. The sorted, de-duplicated result
+contains tracked paths that are both locally modified and different between
+HEAD and the target, plus untracked paths that the target reference tracks.
+
+`git.pullPreflight` accepts `{ "root": string }` and returns `upstream` as a
+string or `null`, numeric `ahead` and `behind` counts, `diverged`, and
+`hasLocalChanges`. It reads the existing tracking reference without fetching;
+`diverged` is true only when both counts are non-zero. `hasLocalChanges` checks
+tracked changes and excludes untracked files. A branch with no configured
+upstream returns `null`, zero counts, and false for both booleans.
+
+`git.integrationPreflight` accepts `{ "root": string, "reference": string,
+"operation": string }`, where `operation` is `merge`, `rebase`, `cherryPick`,
+or `revert`. It returns sorted, de-duplicated `blockingPaths` and
+`blocksEntirely`. Merge, cherry-pick, and revert report only dirty tracked paths
+that overlap files the operation would write. Rebase reports every dirty
+tracked path and sets `blocksEntirely` to true when that set is non-empty.
+
+`git.conflictMarkers` accepts `{ "root": string }` and returns
+`{ "paths": string[] }`. Paths are sorted and de-duplicated staged text files
+whose staged content has a line beginning with an opening, closing, or diff3
+conflict marker. A bare
+`=======` line is not treated as a conflict marker.
+
+`git.operationState` accepts `{ "root": string }` and returns `kind`,
+`reference`, `step`, `total`, and sorted, de-duplicated `conflictedPaths`.
+`kind` is an empty string when no operation is active; otherwise it is `merge`,
+`rebase`, `cherryPick`, or `revert`. `reference`, `step`, and `total` are
+nullable, and the progress counters are populated only for a rebase. State is
+read from Git's own metadata, so operations started outside Lithe are reported.
+
`git.diff` accepts `root`, `pathspecs`, optional `reference` or `commit`,
`staged`, `untracked`, `contextLines`, and `ignoreAllWhitespace`, and returns `{ "patch": string, "rows": [],
"hunks": [] }`. Rows contain one-based `oldLine`/`newLine` values where
@@ -348,26 +393,43 @@ never writes files. `runConfig.generate` accepts `root`, relative Java `paths`,
and relative `modulePaths`; it returns generated configuration and toolchain
requirement documents for the platform adapter to write atomically.
-`runConfig.resolve` accepts `root` and optional local `toolchainCandidates`.
-It merges configurations by stable ID using this precedence:
+`runConfig.resolve` accepts `root`, optional local `toolchainCandidates`, and
+optional `localDocument`. When `localDocument` is present, Core uses that JSON
+object as the local layer instead of reading `.lithe/run/local.json`. It merges
+configurations by stable ID using this precedence:
`local.json > configurations.json > generated.json`. Scalars and arrays are
replaced by the higher layer, while toolchain maps merge by key. It returns
-effective configurations, their source, the team default, and structured
+effective configurations, their source, the team default, structured
diagnostics for stale, orphaned, missing, disabled, and toolchain mismatch
-states.
+states, and the effective global `toolchain`. A document-level `toolchain`
+object in the local layer (e.g.
+`{ "java": { "homePath": ... }, "maven": { "executablePath": ..., "javaHomePath": ... } }`)
+is applied to every configuration's `extensions.java.*` and is authoritative
+over per-configuration toolchain paths.
`runConfig.updateOptions` and `runConfig.createUserConfiguration` are pure
document transformations. They validate scope, paths, supported types, stable
IDs, main classes, modules, and argument parsing, then return UTF-8 JSON in the
`document` field. The platform adapter selects the target project or local
file and performs the atomic write. These commands never write files.
+For project-scoped option updates, selected toolchain paths must resolve inside
+`root` and are persisted with `/`-separated project-relative paths. Local-scoped
+updates may carry host absolute paths. `runConfig.updateOptions` and
+`runConfig.inspect` accept the same optional `localDocument` override.
+When `updateOptions` carries a `toolchain` object (`javaHomePath`,
+`mavenExecutablePath`, `mavenJavaHomePath`), it writes the document-level
+global toolchain into the local layer instead of patching a configuration;
+project scope rejects this payload because toolchain paths are machine-local.
`runConfig.createLaunchPlan` accepts `root`, `configurationId`, optional
-`currentFile` and `classPath`, and optional `debugPort`. It returns a toolchain
+`currentFile` and `classPath`, optional `debugPort`, and optional
+`localDocument`. It returns a toolchain
reference, argument array, project-relative working directory, and structured
environment references. It does not return a shell command or platform
executable path. All project paths use `/`, reject absolute paths and `..`
-traversal, and remain relative to `root`.
+traversal, and remain relative to `root`. A `java.main` configuration without a
+Maven toolchain launches through `project-jdk` and the configuration's Java
+source path.
`java.codeVision` accepts a workspace root, a target Java path, and Java source
paths. It returns declaration locations and usage counts; Git blame attribution
diff --git a/third_party/jdtls/manifest.json b/third_party/jdtls/manifest.json
new file mode 100644
index 000000000..2c526d0ed
--- /dev/null
+++ b/third_party/jdtls/manifest.json
@@ -0,0 +1,8 @@
+{
+ "version": "1.38.0",
+ "archiveURL": "https://download.eclipse.org/jdtls/milestones/1.38.0/jdt-language-server-1.38.0-202408011337.tar.gz",
+ "archiveSHA256": "ba697788a19f2ba57b16302aba6b343c649928c95f76b0d170494ac12d17ac78",
+ "licenseURL": "https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt",
+ "licenseSHA256": "0becf16567beb77fa252b7664631dd177c8f9a1889e48995b45379c7130e5303",
+ "minimumJavaVersion": 17
+}
diff --git a/windows/tauri/design-qa-artifacts/native-reference-comparison.png b/windows/tauri/design-qa-artifacts/native-reference-comparison.png
new file mode 100644
index 000000000..e0bf99c10
Binary files /dev/null and b/windows/tauri/design-qa-artifacts/native-reference-comparison.png differ
diff --git a/windows/tauri/design-qa-artifacts/native-windows-added-diff.png b/windows/tauri/design-qa-artifacts/native-windows-added-diff.png
new file mode 100644
index 000000000..42fca6fd7
Binary files /dev/null and b/windows/tauri/design-qa-artifacts/native-windows-added-diff.png differ
diff --git a/windows/tauri/design-qa-artifacts/native-windows-split-diff.png b/windows/tauri/design-qa-artifacts/native-windows-split-diff.png
new file mode 100644
index 000000000..3b6a3316a
Binary files /dev/null and b/windows/tauri/design-qa-artifacts/native-windows-split-diff.png differ
diff --git a/windows/tauri/design-qa.md b/windows/tauri/design-qa.md
new file mode 100644
index 000000000..9d5b3e40d
--- /dev/null
+++ b/windows/tauri/design-qa.md
@@ -0,0 +1,46 @@
+# Design QA: Windows Source Control diff
+
+- Added-file reference: `D:/Downloads/document/xwechat_files/wxid_id17m8qt937c22_c153/temp/RWTemp/2026-08/1aede52250875b292d874992a7f6d5b7/f38120ff65bc487d72adb50de30e6dc7.png`
+- Split modified-file reference: `D:/Downloads/document/xwechat_files/wxid_id17m8qt937c22_c153/temp/RWTemp/2026-08/1aede52250875b292d874992a7f6d5b7/2d6a05680ba07a8527dd10e69bdecacc.png`
+- Native Windows added-file capture: `design-qa-artifacts/native-windows-added-diff.png`
+- Native Windows modified-file capture: `design-qa-artifacts/native-windows-split-diff.png`
+- Combined reference/implementation input: `design-qa-artifacts/native-reference-comparison.png`
+- Native viewport: 1362 x 856, dark theme.
+
+## Result
+
+The working-tree diff now follows the reference hierarchy: file/status title, compact diff toolbar, explicit version header, blue hunk header, and semantic code body. The implementation keeps Lithe's native Windows chrome and design tokens while matching the reference's information architecture.
+
+### Added file
+
+- The untracked three-line fixture reports `+3 -0` in Source Control and `+3` on the file row.
+- Selecting the file opens the diff surface, not a normal text editor or serialized patch.
+- The header identifies `ADDED`, `WORKTREE`, and `Added version`.
+- The hunk range is visible as `@@ -0,0 +1,3 @@`.
+- All three source rows use the full-width added background with an added rail and independent line numbers.
+- Side-by-side mode is disabled because a new file has no previous version.
+
+### Modified file
+
+- The left pane is labeled `Index version`; the right pane is labeled `Current version`.
+- Both panes use independent line-number gutters and compact source streams.
+- Removed content is red on the left and added content is green on the right.
+- The center connector gutter is 28 px and shows curved transition bands with direction markers.
+- The layout does not add fake blank code rows to the side that does not own a line.
+
+### Interaction and native verification
+
+- Verified in the running Tauri Windows application through native window capture and input.
+- Clicking both untracked and tracked file rows opens the expected diff.
+- Unified/side-by-side controls follow file type, and the whitespace control remains interactive.
+- The temporary tracked-file change used for split verification was restored; the test repository was left with only the user's original untracked `c.txt`.
+
+### Automated verification
+
+- `bun test`: 51 passed, 0 failed.
+- `bun run typecheck`: passed.
+- `bun run lint -- ...`: passed for the changed files; existing unrelated repository warnings remain.
+
+No actionable P0, P1, or P2 visual mismatch remains in the requested added-file and modified-file diff flows.
+
+final result: passed
diff --git a/windows/tauri/index.html b/windows/tauri/index.html
index 3079979ba..b4e5bf26d 100644
--- a/windows/tauri/index.html
+++ b/windows/tauri/index.html
@@ -4,6 +4,7 @@
+
Lithe