Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(worktree): 按当前分支说明刷新文件范围

fmfsaisai924d52d29448
diff --git a/apps/desktop/src/renderer/hooks/useBranchSync.ts b/apps/desktop/src/renderer/hooks/useBranchSync.ts
index cdb3aef829..0b4405be04 100644
--- a/apps/desktop/src/renderer/hooks/useBranchSync.ts
+++ b/apps/desktop/src/renderer/hooks/useBranchSync.ts
@@ -146,8 +146,7 @@ export function useBranchSync(
: state.error;
let hint = t('newChat.branchSync.action', vars);
if (status?.remoteOnly) hint = t('newChat.branchSync.remoteAction', vars);
- if (status?.checkoutPath)
- hint += `\n${t('newChat.branchSync.checkedOut', { ...vars, directory: status.checkoutPath.split(/[\\/]/).filter(Boolean).at(-1) })}`;
+ if (status?.checkoutPath) hint += `\n${t('newChat.branchSync.checkedOut')}`;
if (status?.blocked) hint = blockedHint(status);
if (state.result && !status?.blocked)
hint = state.result.updated
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index a270a5db53..4c2e6b4014 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -11371,7 +11371,7 @@
"changed": "The branch state changed. Please retry.",
"action": "Pull the latest commits from {{remote}}/{{remoteBranch}}",
"remoteAction": "Pull the latest commits from {{remote}}/{{remoteBranch}}",
- "checkedOut": "Also updates files in {{directory}}; uncommitted changes are kept",
+ "checkedOut": "Also updates committed files on this branch; uncommitted changes are kept",
"fetching": "Pulling…",
"updated": "Updated by {{count}} commits",
"current": "Already up to date",
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index bb13cbde51..3d2e59b56e 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -11336,7 +11336,7 @@
"changed": "ブランチの状態が変わりました。再試行してください",
"action": "{{remote}}/{{remoteBranch}} の最新コミットを取得",
"remoteAction": "{{remote}}/{{remoteBranch}} の最新コミットを取得",
- "checkedOut": "{{directory}} 内のファイルも更新します。未コミットの変更は保持されます",
+ "checkedOut": "現在のブランチのコミット済みファイルも更新します。未コミットの変更は保持されます",
"fetching": "取得中…",
"updated": "{{count}} コミット更新しました",
"current": "すでに最新です",
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index e9709bcb87..61b4cca2e5 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -11336,7 +11336,7 @@
"changed": "브랜치 상태가 변경되었습니다. 다시 시도해 주세요",
"action": "{{remote}}/{{remoteBranch}}의 최신 커밋 가져오기",
"remoteAction": "{{remote}}/{{remoteBranch}}의 최신 커밋 가져오기",
- "checkedOut": "{{directory}}의 파일도 업데이트됩니다. 커밋하지 않은 변경 사항은 유지됩니다",
+ "checkedOut": "현재 브랜치의 커밋된 파일도 업데이트됩니다. 커밋하지 않은 변경 사항은 유지됩니다",
"fetching": "가져오는 중…",
"updated": "커밋 {{count}}개 업데이트됨",
"current": "이미 최신 상태입니다",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index b231a8c312..766f25324c 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -11336,7 +11336,7 @@
"changed": "分支状态已变化,请重试",
"action": "拉取 {{remote}}/{{remoteBranch}} 的最新提交",
"remoteAction": "拉取 {{remote}}/{{remoteBranch}} 的最新提交",
- "checkedOut": "会同步更新 {{directory}} 中的文件,未提交的改动会保留",
+ "checkedOut": "会同步更新当前分支已提交的文件,未提交的改动会保留",
"fetching": "正在拉取…",
"updated": "已更新 {{count}} 个提交",
"current": "已是最新",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index f3876ce3fa..89e27033c4 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -11336,7 +11336,7 @@
"changed": "分支狀態已變更,請重試",
"action": "取得 {{remote}}/{{remoteBranch}} 的最新提交",
"remoteAction": "取得 {{remote}}/{{remoteBranch}} 的最新提交",
- "checkedOut": "會同步更新 {{directory}} 中的檔案,未提交的變更會保留",
+ "checkedOut": "會同步更新目前分支已提交的檔案,未提交的變更會保留",
"fetching": "正在取得更新…",
"updated": "已更新 {{count}} 個提交",
"current": "已是最新",