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。

Merge remote-tracking branch 'origin/main' into HEAD

kirozeng885667d34ff4
diff --cc apps/desktop/src/renderer/components/chat/UserMessageEditBox.tsx
index d76c7c54ce,352ede59f7..1c4f759925
--- a/apps/desktop/src/renderer/components/chat/UserMessageEditBox.tsx
+++ b/apps/desktop/src/renderer/components/chat/UserMessageEditBox.tsx
@@@ -347,15 -349,17 +350,20 @@@ export function UserMessageEditBox(
)}
/>
<div className="mt-2 flex items-center justify-end gap-2">
- {rollbackFileCount !== null && rollbackFileCount > 0 && (
+ {rollbackHint?.kind === 'files' && (
<span className="min-w-0 flex-1 truncate text-left text-11 text-[var(--text-tertiary)]">
- {t('chat.userMessage.editRollbackHint', { count: rollbackFileCount })}
+ {t('chat.userMessage.editRollbackHint', { count: rollbackHint.count })}
+ </span>
+ )}
+ {rollbackHint?.kind === 'conversation-only' && (
+ <span className="min-w-0 flex-1 truncate text-left text-11 text-[var(--text-tertiary)]">
+ {t('chat.userMessage.editConversationOnlyHint')}
</span>
)}
- <button
+ <Button
+ variant="secondary"
+ size="sm"
+ compact
type="button"
onClick={onCancel}
disabled={submitting}
diff --cc apps/desktop/src/renderer/components/ui/select.tsx
index a49fb0ab4d,3a148a017c..2bc77ed2d4
--- a/apps/desktop/src/renderer/components/ui/select.tsx
+++ b/apps/desktop/src/renderer/components/ui/select.tsx
@@@ -59,12 -71,13 +72,13 @@@ export function Select(
'min-w-0 max-w-full justify-between gap-2 px-3 font-normal [-webkit-app-region:no-drag]',
className,
(error || (invalid !== undefined && invalid !== false && invalid !== 'false')) &&
- 'border-[var(--error-border)] focus-visible:border-[var(--error-fg)] focus-visible:ring-[var(--error-fg)]',
+ '[--button-face-border:var(--error-border)] focus-visible:[--button-face-border:var(--error-fg)] focus-visible:ring-[var(--error-fg)]',
)}
>
- <span className="min-w-0 truncate text-left">
+ <span className={cn('min-w-0 truncate text-left', triggerAdornment && 'flex-1')}>
<SelectPrimitive.Value placeholder={label} />
</span>
+ {triggerAdornment}
<SelectPrimitive.Icon asChild>
<ChevronDown size={14} className="shrink-0" aria-hidden="true" />
</SelectPrimitive.Icon>
diff --cc apps/desktop/src/renderer/features/cc-agent/sidebar/DeviceSectionHeader.tsx
index cb037fb815,0e980896d6..8be0f41a9f
--- a/apps/desktop/src/renderer/features/cc-agent/sidebar/DeviceSectionHeader.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/sidebar/DeviceSectionHeader.tsx
@@@ -58,9 -50,10 +50,10 @@@ function RemoteDesktopShortcut({ device
aria-busy={busy || undefined}
className={cn(
SIDEBAR_RAIL_ICON_BUTTON_CLASS,
- 'h-6 w-6 aria-disabled:opacity-50 aria-disabled:hover:bg-transparent',
+ 'h-6 w-6 aria-disabled:opacity-50 aria-disabled:hover:[--button-face-bg:transparent] aria-disabled:active:[--button-face-bg:transparent]',
'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)]',
- active && busy && 'motion-safe:[&_svg]:animate-spin',
+ !availability.available && 'opacity-50',
+ busy && 'motion-safe:[&_svg]:animate-spin',
)}
onClick={(event) => {
event.stopPropagation();