Skip to content

feat(macos): 终端引擎升级到 SwiftTerm 2.0 并启用 Metal 渲染 #1541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
icefery wants to merge 1 commit into
base: preview
Choose a base branch
from
+717 −570
Open

feat(macos): 终端引擎升级到 SwiftTerm 2.0 并启用 Metal 渲染 #1541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions .agents/notes/implemented/process/2026-09-21-worktree-resource-reuse.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
## 先说结论

Git linked worktree 之间只复用校验过的下载缓存，不共享 `.build` 或旧预览应用。
目标工作树仍须自己编译，并在打包预览应用时复制两种 SwiftPM 资源包。
目标工作树仍须自己编译，并在打包预览应用时复制 `Lithe_Lithe.bundle`。
漏掉应用自己的资源包会让使用内置工作台背景的应用在启动时崩溃。

## 问题
Expand All @@ -16,7 +16,9 @@ Git linked worktree 之间只复用校验过的下载缓存，不共享 `.build`
下载缓存可用也不等于预览应用可用。`scripts/preview.sh` 曾只复制
`SwiftTerm_SwiftTerm.bundle`，漏掉 `Lithe_Lithe.bundle`；当已选择内置工作台背景时，
应用初始化读取 `Bundle.module` 会因资源包不存在而崩溃。漏拷资源在工作树复用机制
出现前就已存在，切换工作树或再次运行旧脚本只是让这一缺口重新暴露。
出现前就已存在，切换工作树或再次运行旧脚本只是让这一缺口重新暴露。当时脚本还要求
`SwiftTerm_SwiftTerm.bundle`，但 SwiftTerm 2.0 已把 Metal shader 内嵌在源码中，
不再提供该资源包。

## 决策

Expand All @@ -27,9 +29,9 @@ Git linked worktree 之间只复用校验过的下载缓存，不共享 `.build`
加入可复用清单；这些内容必须在目标工作树重新生成。

SwiftPM 下载缓存保存依赖，不包含应用编译后需要的资源包。`scripts/preview.sh` 和
`scripts/package-app.sh` 应从当前工作树的构建目录复制 `Lithe_Lithe.bundle` 与
`SwiftTerm_SwiftTerm.bundle`，缺少任一资源包就应在启动前报错。
`scripts/verify-macos-app-build-safety.sh` 检查两个打包脚本均声明这两种资源。
`scripts/package-app.sh` 应从当前工作树的构建目录复制 `Lithe_Lithe.bundle`，缺少
该资源包就应在启动前报错。`scripts/verify-macos-app-build-safety.sh` 检查两个打包
脚本均声明 `Lithe_Lithe.bundle`。
正确做法是切换工作树后重新运行预览脚本并检查新包；不要继续运行此前生成的 `.app`。

## 考虑过的备选方案
Expand All @@ -54,7 +56,7 @@ SwiftPM 下载缓存保存依赖，不包含应用编译后需要的资源包。

- `node scripts/test-verify-download-cache.mjs`
- `node scripts/test-reuse-worktree-resources.mjs`
- `./scripts/verify-macos-app-build-safety.sh`：确认两个打包脚本均声明所需资源包。
- `./scripts/verify-macos-app-build-safety.sh`：确认两个打包脚本均声明 `Lithe_Lithe.bundle`。
- `./scripts/preview.sh`：检查新包包含 `Lithe_Lithe.bundle`，并在内置背景设置下启动。
- `./scripts/verify-agent-notes.sh`

Expand Down
23 changes: 20 additions & 3 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/sparkle-project/Sparkle.git", exact: "2.10.0"),
.package(url: "https://github.com/migueldeicaza/SwiftTerm.git", exact: "1.15.0"),
// Pinned to the upstream commit that merged the first-frame fix (#778).
// Switch to `from:` once an upstream tag includes it.
.package(url: "https://github.com/migueldeicaza/SwiftTerm.git", revision: "367958aec31c78a7c64630e3265a0a900e35f922"),
.package(url: "https://github.com/swiftlang/swift-testing.git", exact: "6.2.4")
],
targets: [
Expand Down
Loading
Loading