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): 刷新提示按完整单词换行

fmfsaisaif1afd19f72c6
diff --git a/apps/desktop/src/renderer/components/new-chat/WorktreeChipsRow.tsx b/apps/desktop/src/renderer/components/new-chat/WorktreeChipsRow.tsx
index 4effb7ed04..aa89c54946 100644
--- a/apps/desktop/src/renderer/components/new-chat/WorktreeChipsRow.tsx
+++ b/apps/desktop/src/renderer/components/new-chat/WorktreeChipsRow.tsx
@@ -876,7 +876,10 @@ export function BranchWorktreeChip({
</button>
</span>
</Tooltip.Trigger>
- <Tooltip.Content side="top" className="max-w-[320px] whitespace-pre-line">
+ <Tooltip.Content
+ side="top"
+ className="max-w-[320px] whitespace-pre-line break-normal [overflow-wrap:anywhere]"
+ >
{sync.hint}
</Tooltip.Content>
</Tooltip.Root>
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index 27c89e25e1..32acded893 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -11377,8 +11377,8 @@
"current": "Already up to date",
"keptAhead": "{{count}} unpushed local commits. No update needed",
"failed": "Pull failed: {{reason}}",
- "diverged": "Local and {{remote}} have diverged.\nCannot update automatically",
- "conflict": "Local changes conflict with remote updates.\nCommit or stash first",
+ "diverged": "Local and {{remote}} have diverged. Cannot update automatically",
+ "conflict": "Local changes conflict with remote updates. Commit or stash first",
"missing-remote": "{{remoteBranch}} does not exist on {{remote}}",
"no-remote": "No remote repository configured",
"not-local": "Select a local branch or the remote default branch",