fix(i18n): use 工作树 consistently for parent worktree strings in zh locale (#16954)

* feat: select parent worktree for nesting when creating workspace

Enable users to pick a parent workspace in the composer's Advanced drawer,
organizing newly created worktrees hierarchically in the sidebar. The backend
validates lineage relationships and gracefully retries without the parent if
it becomes unavailable during creation.

* feat: select parent worktree for nesting when creating workspace

- Record app-picked parents as manual actions, not CLI-flag equivalents,
  ensuring the same user action carries consistent cleanup semantics across hosts
- Gracefully retry without parent if the selection goes stale, warn the
  user instead of failing
- Refactor create into modules: parent resolution, payload building,
  state merge

* Allow selecting parent worktree when creating workspace

- New parent worktree picker filtered by execution host and project
- Preserve concurrent local writes to lineage by comparing per-record state instead of key-set membership

* Allow selecting parent worktree when creating workspace

- Rename "Parent workspace" label to "Parent worktree"
- Filter candidates by execution host and project to prevent nesting across hosts
- Wire parentWorktreeId through composer state and creation request pipeline
- Update translations and add new copy for nesting-related messages

* fix(i18n): use 工作树 consistently for parent worktree strings in zh locale

Addresses PR #15420 review feedback: parent worktree strings mixed
工作区 (workspace) and 工作树 (worktree) terminology.
This commit is contained in:
Jinjing
2026-08-27 20:18:04 -07:00
committed by GitHub
parent 6f8c5888b3
commit 6f3c5cc039
2 changed files with 5 additions and 9 deletions
@@ -4,11 +4,7 @@
"maxTouchPoints": 5,
"typed": "gksrmfRownla",
"expected": "한글깨쥠",
"observedSent": [
"한",
"글",
"깨쥠"
],
"observedSent": ["한", "글", "깨쥠"],
"events": [
{
"type": "keydown",
@@ -283,4 +279,4 @@
"value": "한글깨쥠"
}
]
}
}
+3 -3
View File
@@ -269,7 +269,7 @@
"runtimeScopeForbiddenDescription": "移动端范围的配对无法使用工作区。请通过设置 → 远程 Orca 服务器 → 分享此 Orca 服务器中的浏览器访问链接重新连接。",
"createdWithoutParentNesting": "已创建,但未嵌套在“{{value0}}”下",
"createdWithoutParentNestingUnnamed": "已创建,但未嵌套在所选父工作树下",
"createdWithoutParentNestingDetail": "父工作已不可用。您可以从工作区菜单中重新设置。"
"createdWithoutParentNestingDetail": "父工作已不可用。您可以从工作区菜单中重新设置。"
},
"repos": {
"2975400634": "请更新 Orca 服务器,以便在此运行时打开非 Git 文件夹。",
@@ -14504,8 +14504,8 @@
"ComposerParentWorktreePicker": {
"label": "父工作树",
"noParent": "无父工作树",
"description": "在侧边栏中将此工作区嵌套到另一个工作下。不会更改基础分支。",
"searchPlaceholder": "搜索工作...",
"description": "在侧边栏中将此工作区嵌套到另一个工作下。不会更改基础分支。",
"searchPlaceholder": "搜索工作...",
"noMatches": "无匹配项。"
}
},