From 249c8d156595d80473ad86f01097608be00f3eca Mon Sep 17 00:00:00 2001 From: Yichen Jiang Date: Mon, 14 Sep 2026 14:20:25 +0800 Subject: [PATCH 1/2] feat(web): show common shells by default --- packages/api/terminal-controller/README.i18n.yaml | 4 ++-- packages/api/terminal-controller/README.md | 2 +- packages/api/terminal-controller/README.zh.md | 2 +- packages/api/terminal-controller/src/index.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/api/terminal-controller/README.i18n.yaml b/packages/api/terminal-controller/README.i18n.yaml index 0a1f8343a9..bcd33ea318 100644 --- a/packages/api/terminal-controller/README.i18n.yaml +++ b/packages/api/terminal-controller/README.i18n.yaml @@ -2,5 +2,5 @@ # side as of the last confirmed-consistent state. Both languages carry equal authority; # after editing either side, bring the other along and re-record with: # pnpm run verify-translation-pairing --write packages/api/terminal-controller/README.md -README.md: c302a2b7269bdb6a76d0c6056d5851a84a876e9a -README.zh.md: dfc50e30f3a35b70c40bb76f9832cbd9548ba2cf +README.md: 1266ad2345b7c41d74b42c9b27cf4a6490765478 +README.zh.md: 48b37a2f5799ff53c81f25b91364bba5ffde8947 diff --git a/packages/api/terminal-controller/README.md b/packages/api/terminal-controller/README.md index c302a2b726..1266ad2345 100644 --- a/packages/api/terminal-controller/README.md +++ b/packages/api/terminal-controller/README.md @@ -32,7 +32,7 @@ Shell discovery lists the execution environment's declared default shell first. | Configuration | Default | Meaning | |---|---|---| | `shell` | omitted | Use the execution environment's default shell, or one explicit profile | -| `shellCandidates` | `zsh`, `bash`, `fish`, `sh`, `ksh`, `tcsh`, `csh`, `pwsh`, `powershell`, `cmd`, `nu` | Additional executable names or paths offered when installed | +| `shellCandidates` | `zsh`, `bash`, `fish`, `pwsh`, `cmd` | Additional executable names or paths offered when installed | | `maxTerminals` | `8` | Retained terminals and pending allocations per Session | | `maxCols`, `maxRows` | `500`, `200` | Maximum PTY dimensions | | `scrollback` | `1000` | Retained screen history rows | diff --git a/packages/api/terminal-controller/README.zh.md b/packages/api/terminal-controller/README.zh.md index dfc50e30f3..48b37a2f57 100644 --- a/packages/api/terminal-controller/README.zh.md +++ b/packages/api/terminal-controller/README.zh.md @@ -32,7 +32,7 @@ Shell 探测结果首先列出执行环境声明的默认 shell。仅当 provide | 配置 | 默认值 | 含义 | |---|---|---| | `shell` | 省略 | 使用执行环境默认 shell，或指定一个 profile | -| `shellCandidates` | `zsh`、`bash`、`fish`、`sh`、`ksh`、`tcsh`、`csh`、`pwsh`、`powershell`、`cmd`、`nu` | 已安装时供用户选择的额外可执行名称或路径 | +| `shellCandidates` | `zsh`、`bash`、`fish`、`pwsh`、`cmd` | 已安装时供用户选择的额外可执行名称或路径 | | `maxTerminals` | `8` | 每个 Session 保留的终端和创建请求上限 | | `maxCols`、`maxRows` | `500`、`200` | PTY 最大尺寸 | | `scrollback` | `1000` | 屏幕历史行数 | diff --git a/packages/api/terminal-controller/src/index.ts b/packages/api/terminal-controller/src/index.ts index 920982897e..979939bd6b 100644 --- a/packages/api/terminal-controller/src/index.ts +++ b/packages/api/terminal-controller/src/index.ts @@ -69,7 +69,7 @@ export class TerminalController extends TypertRemoteService { shell: z.union([z.object({ path: z.string().required(), name: z.string().required(), args: z.array(z.string()).default([]), }), z.const(undefined)]), - shellCandidates: z.array(z.string().min(1)).default(['zsh', 'bash', 'fish', 'sh', 'ksh', 'tcsh', 'csh', 'pwsh', 'powershell', 'cmd', 'nu']), + shellCandidates: z.array(z.string().min(1)).default(['zsh', 'bash', 'fish', 'pwsh', 'cmd']), maxTerminals: z.number().step(1).min(1).default(8), maxCols: z.number().step(1).min(2).default(500), maxRows: z.number().step(1).min(1).default(200), From 1ddd7e08c3af9a6e734f5449c02d24a024b758c4 Mon Sep 17 00:00:00 2001 From: Yichen Jiang Date: Mon, 14 Sep 2026 14:31:41 +0800 Subject: [PATCH 2/2] fix(web): keep Windows PowerShell in terminal choices --- packages/api/terminal-controller/README.i18n.yaml | 4 ++-- packages/api/terminal-controller/README.md | 2 +- packages/api/terminal-controller/README.zh.md | 2 +- packages/api/terminal-controller/src/index.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/api/terminal-controller/README.i18n.yaml b/packages/api/terminal-controller/README.i18n.yaml index bcd33ea318..77ec50b007 100644 --- a/packages/api/terminal-controller/README.i18n.yaml +++ b/packages/api/terminal-controller/README.i18n.yaml @@ -2,5 +2,5 @@ # side as of the last confirmed-consistent state. Both languages carry equal authority; # after editing either side, bring the other along and re-record with: # pnpm run verify-translation-pairing --write packages/api/terminal-controller/README.md -README.md: 1266ad2345b7c41d74b42c9b27cf4a6490765478 -README.zh.md: 48b37a2f5799ff53c81f25b91364bba5ffde8947 +README.md: 21bcfb335246dc4b95a3cd70993c8444ad7de057 +README.zh.md: 6ba88bcecc55c850cf477257c8055b5babae9b52 diff --git a/packages/api/terminal-controller/README.md b/packages/api/terminal-controller/README.md index 1266ad2345..21bcfb3352 100644 --- a/packages/api/terminal-controller/README.md +++ b/packages/api/terminal-controller/README.md @@ -32,7 +32,7 @@ Shell discovery lists the execution environment's declared default shell first. | Configuration | Default | Meaning | |---|---|---| | `shell` | omitted | Use the execution environment's default shell, or one explicit profile | -| `shellCandidates` | `zsh`, `bash`, `fish`, `pwsh`, `cmd` | Additional executable names or paths offered when installed | +| `shellCandidates` | `zsh`, `bash`, `fish`, `pwsh`, `powershell`, `cmd` | Additional executable names or paths offered when installed | | `maxTerminals` | `8` | Retained terminals and pending allocations per Session | | `maxCols`, `maxRows` | `500`, `200` | Maximum PTY dimensions | | `scrollback` | `1000` | Retained screen history rows | diff --git a/packages/api/terminal-controller/README.zh.md b/packages/api/terminal-controller/README.zh.md index 48b37a2f57..6ba88bcecc 100644 --- a/packages/api/terminal-controller/README.zh.md +++ b/packages/api/terminal-controller/README.zh.md @@ -32,7 +32,7 @@ Shell 探测结果首先列出执行环境声明的默认 shell。仅当 provide | 配置 | 默认值 | 含义 | |---|---|---| | `shell` | 省略 | 使用执行环境默认 shell，或指定一个 profile | -| `shellCandidates` | `zsh`、`bash`、`fish`、`pwsh`、`cmd` | 已安装时供用户选择的额外可执行名称或路径 | +| `shellCandidates` | `zsh`、`bash`、`fish`、`pwsh`、`powershell`、`cmd` | 已安装时供用户选择的额外可执行名称或路径 | | `maxTerminals` | `8` | 每个 Session 保留的终端和创建请求上限 | | `maxCols`、`maxRows` | `500`、`200` | PTY 最大尺寸 | | `scrollback` | `1000` | 屏幕历史行数 | diff --git a/packages/api/terminal-controller/src/index.ts b/packages/api/terminal-controller/src/index.ts index 979939bd6b..2b86edfb44 100644 --- a/packages/api/terminal-controller/src/index.ts +++ b/packages/api/terminal-controller/src/index.ts @@ -69,7 +69,7 @@ export class TerminalController extends TypertRemoteService { shell: z.union([z.object({ path: z.string().required(), name: z.string().required(), args: z.array(z.string()).default([]), }), z.const(undefined)]), - shellCandidates: z.array(z.string().min(1)).default(['zsh', 'bash', 'fish', 'pwsh', 'cmd']), + shellCandidates: z.array(z.string().min(1)).default(['zsh', 'bash', 'fish', 'pwsh', 'powershell', 'cmd']), maxTerminals: z.number().step(1).min(1).default(8), maxCols: z.number().step(1).min(2).default(500), maxRows: z.number().step(1).min(1).default(200),