Skip to content

Commit bbcba63

Browse files
hqwlkjhqwlkj
committed
feat(chat): 实现聊天会话列表显示切换功能
- 在 ChatProvider 中添加 sessionListOpen 状态和切换函数 toggleSessionList - 在 App 组件传递 sessionListOpen 和 onToggleSessionList 给 Header 组件 - Header 组件集成 SessionList 的显示控制，支持展开收起操作 - SessionList 组件支持受控和非受控的展开状态管理，支持展开状态变化回调 - extension.ts 新增命令注册（newchat、settings、history），实现与 Webview 的消息通信触发 - 抽象 openFileInEditor 与 getWorkspaceRoot 函数，简化 extension.ts 相关代码 - package.json 增加新命令配置和视图标题按钮关联 - 优化 Header 组件 UI，去除不必要按钮，并新增会话列表图标及标题样式调整
1 parent e439d28 commit bbcba63

7 files changed

Lines changed: 192 additions & 88 deletions

File tree

‎packages/vscode-ide-companion/package.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
"onView:deepcode.chatView"
4646
],
4747
"contributes": {
48+
"markdown.markdownItPlugins": true,
4849
"commands": [
4950
{
5051
"command": "deepcode.openView",
@@ -53,6 +54,24 @@
5354
"light": "assets/deepcoding_icon.svg",
5455
"dark": "assets/deepcoding_icon.svg"
5556
}
57+
},
58+
{
59+
"command": "deepcode.newchat",
60+
"category": "Deep Code",
61+
"title": "New Chat",
62+
"icon": "$(add)"
63+
},
64+
{
65+
"command": "deepcode.settings",
66+
"category": "Deep Code",
67+
"title": "Settings",
68+
"icon": "$(settings-gear)"
69+
},
70+
{
71+
"command": "deepcode.history",
72+
"category": "Deep Code",
73+
"title": "Show Chat History",
74+
"icon": "$(layout-sidebar-right)"
5675
}
5776
],
5877
"viewsContainers": {
@@ -80,6 +99,23 @@
8099
"command": "deepcode.openView",
81100
"group": "navigation@100"
82101
}
102+
],
103+
"view/title": [
104+
{
105+
"command": "deepcode.newchat",
106+
"group": "navigation",
107+
"when": "view == deepcode.chatView"
108+
},
109+
{
110+
"command": "deepcode.settings",
111+
"group": "navigation",
112+
"when": "view == deepcode.chatView"
113+
},
114+
{
115+
"command": "deepcode.history",
116+
"group": "navigation",
117+
"when": "view == deepcode.chatView"
118+
}
83119
]
84120
}
85121
},

‎packages/vscode-ide-companion/src/extension.ts‎

Lines changed: 69 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { attachRouterToPanel } from "@webview-rpc/host";
2121
import { createLogger } from "./utils/logger.js";
2222
import { checkForUpdates } from "./utils/checkForUpdates.js";
2323
import { reverseApplyDiff } from "./utils/diff-utils.js";
24+
import type MarkdownIt from "markdown-it";
2425

2526
const DEFAULT_MODEL = "deepseek-v4-pro";
2627
const DEFAULT_BASE_URL = "https://api.deepseek.com";
@@ -252,9 +253,7 @@ export class DeepCodeViewProvider implements vscode.WebviewViewProvider {
252253
}
253254

254255
private getWorkspaceRoot(): string {
255-
const workspace = vscode.workspace.workspaceFolders?.[0];
256-
if (workspace) return workspace.uri.fsPath;
257-
return process.cwd();
256+
return getWorkspaceRootFn();
258257
}
259258

260259
private createOpenAIClient(): {
@@ -316,16 +315,7 @@ export class DeepCodeViewProvider implements vscode.WebviewViewProvider {
316315
}
317316

318317
private async openFileInEditor(filePath: string, line: number): Promise<void> {
319-
const document = await vscode.workspace.openTextDocument(vscode.Uri.file(filePath));
320-
const editor = await vscode.window.showTextDocument(document, {
321-
preview: false,
322-
preserveFocus: false,
323-
});
324-
const targetLine = Number.isFinite(line) && line > 0 ? Math.floor(line) - 1 : 0;
325-
const safeLine = Math.min(Math.max(0, targetLine), Math.max(0, document.lineCount - 1));
326-
const position = new vscode.Position(safeLine, 0);
327-
editor.selection = new vscode.Selection(position, position);
328-
editor.revealRange(new vscode.Range(position, position), vscode.TextEditorRevealType.InCenter);
318+
return openFileInEditorFn(filePath, line);
329319
}
330320

331321
/**
@@ -384,7 +374,28 @@ export class DeepCodeViewProvider implements vscode.WebviewViewProvider {
384374
}
385375
}
386376

387-
export async function activate(context: vscode.ExtensionContext): Promise<void> {
377+
async function openFileInEditorFn(filePath: string, line: number): Promise<void> {
378+
const document = await vscode.workspace.openTextDocument(vscode.Uri.file(filePath));
379+
const editor = await vscode.window.showTextDocument(document, {
380+
preview: false,
381+
preserveFocus: false,
382+
});
383+
const targetLine = Number.isFinite(line) && line > 0 ? Math.floor(line) - 1 : 0;
384+
const safeLine = Math.min(Math.max(0, targetLine), Math.max(0, document.lineCount - 1));
385+
const position = new vscode.Position(safeLine, 0);
386+
editor.selection = new vscode.Selection(position, position);
387+
editor.revealRange(new vscode.Range(position, position), vscode.TextEditorRevealType.InCenter);
388+
}
389+
390+
function getWorkspaceRootFn(): string {
391+
const workspace = vscode.workspace.workspaceFolders?.[0];
392+
if (workspace) return workspace.uri.fsPath;
393+
return process.cwd();
394+
}
395+
396+
export async function activate(
397+
context: vscode.ExtensionContext
398+
): Promise<{ extendMarkdownIt(md: MarkdownIt): MarkdownIt }> {
388399
process.env.NoDefaultCurrentDirectoryInExePath = "1";
389400
logger = vscode.window.createOutputChannel("Deep Code");
390401
log = createLogger(context, logger);
@@ -438,13 +449,57 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
438449
})
439450
);
440451

452+
// Open view
441453
context.subscriptions.push(
442454
vscode.commands.registerCommand("deepcode.openView", async () => {
443455
await vscode.commands.executeCommand("workbench.view.extension.deepcode");
444456
await vscode.commands.executeCommand("deepcode.chatView.focus");
445457
})
446458
);
459+
// Open settings
460+
context.subscriptions.push(
461+
vscode.commands.registerCommand("deepcode.settings", async () => {
462+
const projectRoot = getWorkspaceRootFn();
463+
const projectSettingsPath = path.join(projectRoot, ".deepcode", "settings.json");
464+
const userSettingsPath = path.join(os.homedir(), ".deepcode", "settings.json");
465+
466+
if (fs.existsSync(projectSettingsPath)) {
467+
await openFileInEditorFn(projectSettingsPath, 1);
468+
} else {
469+
// Ensure user settings directory exists
470+
const userSettingsDir = path.dirname(userSettingsPath);
471+
if (!fs.existsSync(userSettingsDir)) {
472+
fs.mkdirSync(userSettingsDir, { recursive: true });
473+
}
474+
if (!fs.existsSync(userSettingsPath)) {
475+
fs.writeFileSync(userSettingsPath, JSON.stringify({}, null, 2), "utf8");
476+
}
477+
await openFileInEditorFn(userSettingsPath, 1);
478+
}
479+
})
480+
);
481+
482+
// Create new chat
483+
context.subscriptions.push(
484+
vscode.commands.registerCommand("deepcode.newchat", () => {
485+
log("deepcode.newchat");
486+
provider.postMessageToWebview({ type: "triggerNewChat" });
487+
})
488+
);
489+
490+
// Show history
491+
context.subscriptions.push(
492+
vscode.commands.registerCommand("deepcode.history", () => {
493+
log("deepcode.history");
494+
provider.postMessageToWebview({ type: "triggerHistory" });
495+
})
496+
);
447497
context.subscriptions.push(logger);
498+
return {
499+
extendMarkdownIt(md: MarkdownIt) {
500+
return md.use(require("markdown-it-task-lists"));
501+
},
502+
};
448503
}
449504

450505
export function deactivate(): void {

‎packages/vscode-ide-companion/src/webview/App.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ export default function App() {
2929
onCreateNewSession={actions.createNewSession}
3030
onRenameSession={actions.renameSession}
3131
onDeleteSession={actions.deleteSession}
32+
sessionListOpen={state.sessionListOpen}
33+
onToggleSessionList={actions.toggleSessionList}
3234
/>
3335
<Messages
3436
ref={messagesRef}

‎packages/vscode-ide-companion/src/webview/components/Header.tsx‎

Lines changed: 17 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import { useCallback, useMemo } from "react";
2-
import { Button } from "@/webview/components/ui/button";
32
import type { SessionSummary } from "@/webview/types";
4-
import { Plus, Settings } from "lucide-react";
5-
import { chatService } from "@/webview/services/chatService";
63
import icon from "../../../assets/deepcoding_icon.png";
74
import SessionList from "@/webview/components/SessionList";
8-
import { Tooltip, TooltipContent, TooltipTrigger } from "@/webview/components/ui/tooltip";
95

106
interface HeaderProps {
117
sessions: SessionSummary[];
@@ -14,6 +10,8 @@ interface HeaderProps {
1410
onCreateNewSession: () => void;
1511
onRenameSession: (sessionId: string, summary: string) => void;
1612
onDeleteSession: (sessionId: string) => void;
13+
sessionListOpen: boolean;
14+
onToggleSessionList: (open?: boolean) => void;
1715
}
1816

1917
export default function Header({
@@ -23,6 +21,8 @@ export default function Header({
2321
onCreateNewSession,
2422
onRenameSession,
2523
onDeleteSession,
24+
sessionListOpen,
25+
onToggleSessionList,
2626
}: HeaderProps) {
2727
const handleSelect = useCallback(
2828
(sessionId: string) => {
@@ -39,56 +39,23 @@ export default function Header({
3939
}, [sessions, activeSessionId]);
4040

4141
return (
42-
<div className="flex items-center justify-between gap-0 px-4 py-1 shrink-0 border-b">
43-
<Button variant="ghost">
42+
<div className="flex items-center justify-between bg-card gap-0 px-4 py-1 shrink-0 border-b">
43+
<div className="flex items-center gap-1 px-2 py-1">
4444
<img src={icon} alt="" className="w-4 h-4 shrink-0" />
45-
<span className="min-w-0 truncate">
45+
<span className="min-w-0 font-semibold truncate">
4646
{activeSessionSummary || (activeSessionId ? "Deep Code" : "New Conversation")}
4747
</span>
48-
</Button>
49-
50-
<div>
51-
<Tooltip>
52-
<TooltipTrigger asChild>
53-
<Button
54-
variant="ghost"
55-
size="icon"
56-
className="shrink-0 cursor-pointer"
57-
onClick={onCreateNewSession}
58-
title="New chat"
59-
>
60-
<Plus className="h-4 w-4" />
61-
</Button>
62-
</TooltipTrigger>
63-
<TooltipContent>
64-
<p>New Chat</p>
65-
</TooltipContent>
66-
</Tooltip>
67-
<Tooltip>
68-
<TooltipTrigger asChild>
69-
<Button
70-
variant="ghost"
71-
size="icon"
72-
className="shrink-0 cursor-pointer"
73-
onClick={() => chatService.openSettings()}
74-
title="Open settings"
75-
>
76-
<Settings className="h-4 w-4" />
77-
</Button>
78-
</TooltipTrigger>
79-
<TooltipContent>
80-
<p>Settings</p>
81-
</TooltipContent>
82-
</Tooltip>
83-
<SessionList
84-
sessions={sessions}
85-
activeSessionId={activeSessionId}
86-
onSelect={handleSelect}
87-
onCreateNewSession={onCreateNewSession}
88-
onRename={onRenameSession}
89-
onDelete={onDeleteSession}
90-
/>
9148
</div>
49+
<SessionList
50+
sessions={sessions}
51+
activeSessionId={activeSessionId}
52+
onSelect={handleSelect}
53+
onCreateNewSession={onCreateNewSession}
54+
onRename={onRenameSession}
55+
onDelete={onDeleteSession}
56+
open={sessionListOpen}
57+
onOpenChange={(open) => onToggleSessionList(open)}
58+
/>
9259
</div>
9360
);
9461
}

‎packages/vscode-ide-companion/src/webview/components/SessionList.tsx‎

Lines changed: 39 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ interface SessionListProps {
4949
onCreateNewSession: () => void;
5050
onRename: (sessionId: string, summary: string) => void;
5151
onDelete: (sessionId: string) => void;
52+
open?: boolean;
53+
onOpenChange?: (open: boolean) => void;
5254
}
5355

5456
function formatTime(dateString: string): string {
@@ -71,9 +73,22 @@ export default function SessionList({
7173
onCreateNewSession,
7274
onRename,
7375
onDelete,
76+
open: controlledOpen,
77+
onOpenChange,
7478
}: SessionListProps) {
7579
const [query, setQuery] = useState("");
76-
const [drawerOpen, setDrawerOpen] = useState(false);
80+
const [internalOpen, setInternalOpen] = useState(false);
81+
const isControlled = controlledOpen !== undefined;
82+
const drawerOpen = isControlled ? controlledOpen : internalOpen;
83+
const setDrawerOpen = useCallback(
84+
(open: boolean) => {
85+
if (!isControlled) {
86+
setInternalOpen(open);
87+
}
88+
onOpenChange?.(open);
89+
},
90+
[isControlled, onOpenChange]
91+
);
7792
const [editingId, setEditingId] = useState<string | null>(null);
7893
const [editValue, setEditValue] = useState("");
7994
const [contextMenuOpenId, setContextMenuOpenId] = useState<string>();
@@ -83,7 +98,7 @@ export default function SessionList({
8398

8499
const handleCloseDrawer = useCallback(() => {
85100
setDrawerOpen(false);
86-
}, []);
101+
}, [setDrawerOpen]);
87102

88103
// Focus the edit input when editing starts
89104
useEffect(() => {
@@ -202,7 +217,7 @@ export default function SessionList({
202217
console.error("Failed to open chat panel:", err);
203218
}
204219
},
205-
[onSelect, onCreateNewSession, handleCloseDrawer]
220+
[onSelect, onCreateNewSession, handleCloseDrawer, activeSessionId]
206221
);
207222

208223
const handleInspectJsonl = useCallback(async (sessionId: string) => {
@@ -259,7 +274,7 @@ export default function SessionList({
259274

260275
document.addEventListener("keydown", handler, true);
261276
return () => document.removeEventListener("keydown", handler, true);
262-
}, [contextMenuOpenId, sessions, handleContextMenuOpen]);
277+
}, [contextMenuOpenId, sessions, handleContextMenuOpen, handleStartRename]);
263278

264279
return (
265280
<Drawer
@@ -274,24 +289,26 @@ export default function SessionList({
274289
setDrawerOpen(open);
275290
}}
276291
>
277-
<DrawerTrigger asChild>
278-
<Tooltip>
279-
<TooltipTrigger asChild>
280-
<Button
281-
variant="ghost"
282-
size="icon"
283-
className="shrink-0 cursor-pointer"
284-
title="Show Agent Sessions Sidebar"
285-
onClick={() => setDrawerOpen(true)}
286-
>
287-
<PanelRight className="h-4 w-4" />
288-
</Button>
289-
</TooltipTrigger>
290-
<TooltipContent>
291-
<p>Sessions</p>
292-
</TooltipContent>
293-
</Tooltip>
294-
</DrawerTrigger>
292+
{!isControlled && (
293+
<DrawerTrigger asChild>
294+
<Tooltip>
295+
<TooltipTrigger asChild>
296+
<Button
297+
variant="ghost"
298+
size="icon"
299+
className="shrink-0 cursor-pointer"
300+
title="Show Agent Sessions Sidebar"
301+
onClick={() => setDrawerOpen(true)}
302+
>
303+
<PanelRight className="h-4 w-4" />
304+
</Button>
305+
</TooltipTrigger>
306+
<TooltipContent>
307+
<p>Sessions</p>
308+
</TooltipContent>
309+
</Tooltip>
310+
</DrawerTrigger>
311+
)}
295312
<DrawerContent>
296313
<DrawerHeader>
297314
<DrawerTitle>Sessions</DrawerTitle>

0 commit comments

Comments
 (0)