wuxu/codeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
xintaofei
2026-04-09 22:41:36 +08:00
parent 6c48c7bd01 4277f88ca8
commit 3290951b52
16 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,7 +1,7 @@
{
"name": "codeg",
"private": true,
"version": "0.6.11",
"version": "0.6.12",
"scripts": {
"dev": "next dev --turbopack",
"build": "next build",

10
pnpm-lock.yaml generated
View File

@@ -4555,10 +4555,6 @@ packages:
resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}
engines: {node: '>=4.0'}
katex@0.16.40:
resolution: {integrity: sha512-1DJcK/L05k1Y9Gf7wMcyuqFOL6BiY3vY0CFcAM/LPRN04NALxcl6u7lOWNsp3f/bCHWxigzQl6FbR95XJ4R84Q==}
hasBin: true
katex@0.16.45:
resolution: {integrity: sha512-pQpZbdBu7wCTmQUh7ufPmLr0pFoObnGUoL/yhtwJDgmmQpbkg/0HSVti25Fu4rmd1oCR6NGWe9vqTWuWv3GcNA==}
hasBin: true
@@ -7340,7 +7336,7 @@ snapshots:
es-toolkit: 1.45.1
fast-deep-equal: 3.1.3
immer: 11.1.4
katex: 0.16.40
katex: 0.16.45
leva: 0.10.1(@types/react-dom@19.2.3(@types/react@19.2.13))(@types/react@19.2.13)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
lucide-react: 0.563.0(react@19.2.4)
marked: 17.0.5
@@ -11402,10 +11398,6 @@ snapshots:
object.assign: 4.1.7
object.values: 1.2.1
katex@0.16.40:
dependencies:
commander: 8.3.0
katex@0.16.45:
dependencies:
commander: 8.3.0

2
src-tauri/Cargo.lock generated
View File

@@ -853,7 +853,7 @@ checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
[[package]]
name = "codeg"
version = "0.6.11"
version = "0.6.12"
dependencies = [
"agent-client-protocol-schema",
"async-trait",

2
src-tauri/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "codeg"
version = "0.6.11"
version = "0.6.12"
description = "Agent Code Generation App"
authors = ["feitao"]
edition = "2021"

2
src-tauri/tauri.conf.json
View File

@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2",
"productName": "codeg",
"version": "0.6.11",
"version": "0.6.12",
"identifier": "app.codeg",
"build": {
"beforeDevCommand": "pnpm dev",

16
src/app/globals.css
View File

@@ -174,6 +174,22 @@
}
}
/* Unified scrollbar style for scrollable containers.
Matches StickToBottom's internal scrollbar-gutter so all scroll areas
behave the same: symmetric gutter, no layout shift. */
.scrollbar-thin {
scrollbar-width: thin;
scrollbar-color: var(--border) transparent;
scrollbar-gutter: stable both-edges;
}
/* Single-edge variant: only reserves space on the scrollbar side */
.scrollbar-thin-edge {
scrollbar-width: thin;
scrollbar-color: var(--border) transparent;
scrollbar-gutter: stable;
}
/* Streamdown code blocks: dark mode via shiki dual-theme CSS variables */
.dark [data-streamdown="code-block-body"] {
background-color: var(--shiki-dark-bg, var(--sdm-bg, transparent)) !important;

7
src/components/conversations/sidebar-conversation-list.tsx
View File

@@ -482,11 +482,8 @@ export function SidebarConversationList({
<div
ref={scrollContainerRef}
className={cn(
"flex-1 min-h-0 overflow-y-auto px-1.5",
"[overflow-anchor:none]",
"[&::-webkit-scrollbar]:w-1.5",
"[&::-webkit-scrollbar-thumb]:rounded-full",
"[&::-webkit-scrollbar-thumb]:bg-border"
"flex-1 min-h-0 overflow-y-auto scrollbar-thin",
"[overflow-anchor:none]"
)}
>
<Virtualizer ref={virtualizerRef} itemSize={CARD_HEIGHT}>

6
src/components/diff/unified-diff-preview.tsx
View File

@@ -546,7 +546,7 @@ export function UnifiedDiffPreview({
if (files.length === 0) {
return (
<div className={cn("h-full overflow-auto", className)}>
<div className={cn("h-full overflow-auto scrollbar-thin", className)}>
<pre className="font-mono text-[11px] leading-5 whitespace-pre-wrap text-muted-foreground p-3">
{diffText}
</pre>
@@ -555,7 +555,7 @@ export function UnifiedDiffPreview({
}
return (
<div className={cn("h-full overflow-auto", className)}>
<div className={cn("h-full overflow-auto scrollbar-thin", className)}>
<div className="space-y-3">
{files.map((file) => {
const newFile = isNewFileOnly(file)
@@ -586,7 +586,7 @@ export function UnifiedDiffPreview({
)}
</header>
<div className="overflow-auto">
<div className="overflow-auto scrollbar-thin">
<div className="inline-block min-w-full">
{newFile
? file.hunks.map((hunk) => (

2
src/components/files/file-workspace-panel.tsx
View File

@@ -693,7 +693,7 @@ function DiffFileList({
</p>
)}
</div>
<div className="flex-1 min-h-0 overflow-y-auto">
<div className="flex-1 min-h-0 overflow-y-auto scrollbar-thin">
<div className="py-1">
{diffOutline.files.map((file) => (
<ContextMenu key={file.key}>

2
src/components/layout/aux-panel-file-tree-tab.tsx
View File

@@ -2167,7 +2167,7 @@ export function FileTreeTab() {
<div className="flex flex-col h-full">
<ContextMenu>
<ContextMenuTrigger asChild>
<div className="flex-1 min-h-0 overflow-auto pb-1 [scrollbar-gutter:stable] [&::-webkit-scrollbar]:h-1.5 [&::-webkit-scrollbar]:w-1.5 [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar-thumb]:bg-border">
<div className="flex-1 min-h-0 overflow-auto pb-1 scrollbar-thin-edge">
<FileTree
key={folder?.path ?? "file-tree-empty"}
className="border-0 rounded-none bg-transparent w-max min-w-full"

2
src/components/layout/aux-panel-git-changes-tab.tsx
View File

@@ -1287,7 +1287,7 @@ export function GitChangesTab() {
return (
<>
<div className="h-full min-h-0 overflow-y-auto">
<div className="h-full min-h-0 overflow-y-auto scrollbar-thin-edge">
{trackedChanges.length === 0 && untrackedChanges.length === 0 ? (
<div className="flex items-center justify-center h-full p-4">
<p className="text-xs text-muted-foreground text-center">

8
src/components/layout/aux-panel-git-log-tab.tsx
View File

@@ -903,7 +903,7 @@ export function GitLogTab() {
if (loading) {
return (
<div className="flex flex-col h-full overflow-y-auto p-2">
<div className="flex flex-col h-full overflow-y-auto scrollbar-thin px-1 py-3">
{hasBranches && (
<BranchSelector
branchList={branchList}
@@ -929,7 +929,7 @@ export function GitLogTab() {
if (error) {
return (
<div className="flex flex-col h-full overflow-y-auto p-2">
<div className="flex flex-col h-full overflow-y-auto scrollbar-thin px-1 py-3">
{hasBranches && (
<BranchSelector
branchList={branchList}
@@ -959,7 +959,7 @@ export function GitLogTab() {
if (entries.length === 0) {
return (
<div className="flex flex-col h-full overflow-y-auto p-2">
<div className="flex flex-col h-full overflow-y-auto scrollbar-thin px-1 py-3">
{hasBranches && (
<BranchSelector
branchList={branchList}
@@ -985,7 +985,7 @@ export function GitLogTab() {
<ContextMenuTrigger asChild>
<div
onScroll={handleScroll}
className="flex-1 min-h-0 overflow-y-auto p-2 space-y-2"
className="flex-1 min-h-0 overflow-y-auto scrollbar-thin px-1 py-3 space-y-3"
>
{hasBranches && (
<div

4
src/components/layout/aux-panel-session-files-tab.tsx
View File

@@ -103,7 +103,7 @@ function SessionFilesContent({ conversationId }: { conversationId: number }) {
}
return (
<div className="space-y-3 p-3">
<div className="space-y-3 px-1 py-3">
{groups.map((group, groupIndex) => {
const groupKey = `${group.userTurnId}-${group.timestamp}-${groupIndex}`
const isOpen = openGroups[groupKey] ?? false
@@ -290,7 +290,7 @@ export function SessionFilesTab() {
return (
<div className="flex flex-col h-full">
<div className="flex-1 min-h-0 overflow-y-auto">
<div className="flex-1 min-h-0 overflow-y-auto scrollbar-thin">
<SessionFilesContent conversationId={conversationId} />
</div>
</div>

2
src/components/layout/commit-dialog.tsx
View File

@@ -1196,7 +1196,7 @@ export function CommitWorkspace({
placeholder={t("commitMessagePlaceholder")}
defaultValue=""
onChange={handleMessageChange}
className="min-h-[90px] resize-y"
className="min-h-[90px] max-h-[200px] resize-y"
/>
<div className="mt-3 flex items-center justify-end gap-2">
<Button variant="outline" onClick={onCancel}>

2
src/components/layout/sidebar.tsx
View File

@@ -74,7 +74,7 @@ export function Sidebar() {
{/* On mobile, clicking a conversation card auto-closes the Sheet */}
<div
className="flex-1 min-h-0 overflow-hidden"
className="flex flex-col flex-1 min-h-0 overflow-hidden"
onClick={
isMobile
? (e) => {

4
src/components/message/virtualized-message-thread.tsx
View File

@@ -73,7 +73,7 @@ export function VirtualizedMessageThread<T>({
return (
<MessageThreadContent
className={cn("mx-0 max-w-none p-0", contentClassName)}
scrollClassName="[overflow-anchor:none]"
scrollClassName="scrollbar-thin [overflow-anchor:none]"
{...contentProps}
>
{items.length === 0 ? (
@@ -88,7 +88,7 @@ export function VirtualizedMessageThread<T>({
key={getItemKey(item, index)}
style={itemStyle(index, items.length)}
>
<div className={cn("mx-auto max-w-3xl px-4", className)}>
<div className={cn("mx-auto max-w-3xl px-2", className)}>
{renderItem(item, index)}
</div>
</div>