wangxuming/makelore
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

merge: integrate upstream main with local Makelore changes

Browse Source
This commit is contained in:
inman
2026-08-31 10:55:48 +08:00
parent 62304dc85b 33fb31fb28
commit 28897cd4a2
128 changed files with 8278 additions and 3030 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/layout/Sidebar.tsx
View File

@@ -436,7 +436,7 @@ export function Sidebar({ workspaceLayout = false, sidebarPeekOpen = false, onSi
const enterProject = async (project: CodingProjectSummary) => {
const result = await loadProjectConfig(project.id);
if (result.status !== 'valid' || !result.config) {
showProjectEntryError(project, result.status === 'missing' ? '项目缺少 .niancode/project.json' : result.error ?? '项目配置无效');
showProjectEntryError(project, result.status === 'missing' ? '项目缺少必要的配置文件' : result.error ?? '项目配置无效');
return;
}
await setActiveProject(project.id);
@@ -665,7 +665,7 @@ export function Sidebar({ workspaceLayout = false, sidebarPeekOpen = false, onSi
)}
>
<span className="min-w-0 flex-1 truncate text-sm font-semibold">{project.name}</span>
<div className="flex shrink-0 -space-x-1.5" aria-label="项目 Agent">
<div className="flex shrink-0 -space-x-1.5" aria-label="项目智能体">
{projectConfig?.agents.map((agent) => (
<span
key={agent.id}
@@ -1066,7 +1066,7 @@ export function Sidebar({ workspaceLayout = false, sidebarPeekOpen = false, onSi
>
<h2 className="text-xl font-semibold">项目配置不可用</h2>
<p className="mt-2 text-sm font-medium leading-6 text-muted-foreground">
无法进入项目，请检查 .niancode/project.json。
无法进入项目，请检查项目目录中的配置文件是否完整。
</p>
<pre className="mt-3 max-h-32 overflow-auto rounded-md border border-foreground/15 bg-white p-2 text-xs font-medium">
{projectEntryError.message}