Add project soft-delete with workspace archival
- Add delete button (×) to sidebar project list, shown on hover - Soft-delete: mark projects as deleted in DB instead of hard delete - Move workspace files to /app/data/deleted/ folder on deletion - Filter deleted projects from list query - Auto-select next project after deleting current one - Also includes agent prompt improvements for reverse proxy paths Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
2df4e12d30
commit
1aa81896b5
@ -2,8 +2,12 @@ context compaction
|
|||||||
|
|
||||||
rag / kb
|
rag / kb
|
||||||
|
|
||||||
|
内置一个向量数据库和kb管理能力吧,kb_search,管理界面简单点,cpu做embedding就够
|
||||||
|
|
||||||
template
|
template
|
||||||
|
|
||||||
|
---
|
||||||
|
时间观察app
|
||||||
---
|
---
|
||||||
|
|
||||||
## 代码啰嗦/可精简
|
## 代码啰嗦/可精简
|
||||||
|
|||||||
10
src/agent.rs
10
src/agent.rs
@ -474,8 +474,13 @@ fn build_planning_prompt(project_id: &str) -> String {
|
|||||||
- 工作目录是独立的项目工作区,Python venv 已预先激活(.venv/)\n\
|
- 工作目录是独立的项目工作区,Python venv 已预先激活(.venv/)\n\
|
||||||
- 可用工具:bash、git、curl、uv\n\
|
- 可用工具:bash、git、curl、uv\n\
|
||||||
- 静态文件访问:/api/projects/{0}/files/{{filename}}\n\
|
- 静态文件访问:/api/projects/{0}/files/{{filename}}\n\
|
||||||
- 后台服务访问:/api/projects/{0}/app/\n\
|
- 后台服务访问:/api/projects/{0}/app/(反向代理,路径会被转发到应用的 /)\n\
|
||||||
- 如果要构建 Web 应用,推荐 FastAPI + 前端 HTML,API 请求用相对路径 /api/projects/{0}/app/...\n\
|
\n\
|
||||||
|
【重要】反向代理注意事项:\n\
|
||||||
|
- 用户通过 /api/projects/{0}/app/ 访问应用,请求被代理到应用的 / 路径\n\
|
||||||
|
- 因此前端 HTML 中的所有 API 请求必须使用【不带开头 / 的相对路径】\n\
|
||||||
|
- 正确示例:fetch('todos') 或 fetch('./todos') 错误示例:fetch('/todos') 或 fetch('/api/todos')\n\
|
||||||
|
- HTML 中的 <base> 标签不需要设置,只要不用绝对路径就行\n\
|
||||||
\n\
|
\n\
|
||||||
请使用中文回复。",
|
请使用中文回复。",
|
||||||
project_id,
|
project_id,
|
||||||
@ -505,6 +510,7 @@ fn build_execution_prompt(project_id: &str) -> String {
|
|||||||
- 使用 `uv add <包名>` 或 `pip install <包名>` 安装依赖\n\
|
- 使用 `uv add <包名>` 或 `pip install <包名>` 安装依赖\n\
|
||||||
- 静态文件访问:/api/projects/{0}/files/{{filename}}\n\
|
- 静态文件访问:/api/projects/{0}/files/{{filename}}\n\
|
||||||
- 后台服务访问:/api/projects/{0}/app/(启动命令需监听 0.0.0.0:$PORT)\n\
|
- 后台服务访问:/api/projects/{0}/app/(启动命令需监听 0.0.0.0:$PORT)\n\
|
||||||
|
- 【重要】应用通过反向代理访问,前端 HTML/JS 中的 fetch/XHR 请求必须使用相对路径(如 fetch('todos')),绝对不能用 / 开头的路径(如 fetch('/todos')),否则会 404\n\
|
||||||
\n\
|
\n\
|
||||||
请使用中文回复。",
|
请使用中文回复。",
|
||||||
project_id,
|
project_id,
|
||||||
|
|||||||
@ -40,7 +40,7 @@ pub fn router(state: Arc<AppState>) -> Router {
|
|||||||
async fn list_projects(
|
async fn list_projects(
|
||||||
State(state): State<Arc<AppState>>,
|
State(state): State<Arc<AppState>>,
|
||||||
) -> ApiResult<Vec<Project>> {
|
) -> ApiResult<Vec<Project>> {
|
||||||
sqlx::query_as::<_, Project>("SELECT * FROM projects ORDER BY updated_at DESC")
|
sqlx::query_as::<_, Project>("SELECT * FROM projects WHERE deleted = 0 ORDER BY updated_at DESC")
|
||||||
.fetch_all(&state.db.pool)
|
.fetch_all(&state.db.pool)
|
||||||
.await
|
.await
|
||||||
.map(Json)
|
.map(Json)
|
||||||
@ -109,10 +109,30 @@ async fn delete_project(
|
|||||||
State(state): State<Arc<AppState>>,
|
State(state): State<Arc<AppState>>,
|
||||||
Path(id): Path<String>,
|
Path(id): Path<String>,
|
||||||
) -> ApiResult<bool> {
|
) -> ApiResult<bool> {
|
||||||
sqlx::query("DELETE FROM projects WHERE id = ?")
|
// Soft delete: mark as deleted in DB
|
||||||
|
let result = sqlx::query("UPDATE projects SET deleted = 1, updated_at = datetime('now') WHERE id = ? AND deleted = 0")
|
||||||
.bind(&id)
|
.bind(&id)
|
||||||
.execute(&state.db.pool)
|
.execute(&state.db.pool)
|
||||||
.await
|
.await
|
||||||
.map(|r| Json(r.rows_affected() > 0))
|
.map_err(db_err)?;
|
||||||
.map_err(db_err)
|
|
||||||
|
if result.rows_affected() == 0 {
|
||||||
|
return Ok(Json(false));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Move workspace to deleted folder
|
||||||
|
let src = std::path::PathBuf::from("/app/data/workspaces").join(&id);
|
||||||
|
let dst_dir = std::path::PathBuf::from("/app/data/deleted");
|
||||||
|
if src.exists() {
|
||||||
|
if let Err(e) = tokio::fs::create_dir_all(&dst_dir).await {
|
||||||
|
tracing::error!("Failed to create deleted dir: {}", e);
|
||||||
|
} else {
|
||||||
|
let dst = dst_dir.join(&id);
|
||||||
|
if let Err(e) = tokio::fs::rename(&src, &dst).await {
|
||||||
|
tracing::error!("Failed to move workspace to deleted: {}", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(Json(true))
|
||||||
}
|
}
|
||||||
|
|||||||
@ -94,6 +94,13 @@ impl Database {
|
|||||||
.execute(&self.pool)
|
.execute(&self.pool)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
|
// Migration: add deleted column to projects
|
||||||
|
let _ = sqlx::query(
|
||||||
|
"ALTER TABLE projects ADD COLUMN deleted INTEGER NOT NULL DEFAULT 0"
|
||||||
|
)
|
||||||
|
.execute(&self.pool)
|
||||||
|
.await;
|
||||||
|
|
||||||
sqlx::query(
|
sqlx::query(
|
||||||
"CREATE TABLE IF NOT EXISTS timers (
|
"CREATE TABLE IF NOT EXISTS timers (
|
||||||
id TEXT PRIMARY KEY,
|
id TEXT PRIMARY KEY,
|
||||||
@ -120,6 +127,8 @@ pub struct Project {
|
|||||||
pub description: String,
|
pub description: String,
|
||||||
pub created_at: String,
|
pub created_at: String,
|
||||||
pub updated_at: String,
|
pub updated_at: String,
|
||||||
|
#[serde(default)]
|
||||||
|
pub deleted: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, sqlx::FromRow)]
|
#[derive(Debug, Clone, Serialize, Deserialize, sqlx::FromRow)]
|
||||||
|
|||||||
@ -80,6 +80,23 @@ function onProjectUpdate(projectId: string, name: string) {
|
|||||||
const p = projects.value.find(p => p.id === projectId)
|
const p = projects.value.find(p => p.id === projectId)
|
||||||
if (p) p.name = name
|
if (p) p.name = name
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function onDeleteProject(id: string) {
|
||||||
|
try {
|
||||||
|
await api.deleteProject(id)
|
||||||
|
projects.value = projects.value.filter(p => p.id !== id)
|
||||||
|
if (selectedProjectId.value === id) {
|
||||||
|
selectedProjectId.value = projects.value[0]?.id ?? ''
|
||||||
|
if (selectedProjectId.value) {
|
||||||
|
history.replaceState(null, '', `/projects/${selectedProjectId.value}`)
|
||||||
|
} else {
|
||||||
|
history.replaceState(null, '', '/')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e: any) {
|
||||||
|
error.value = e.message
|
||||||
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
@ -92,6 +109,7 @@ function onProjectUpdate(projectId: string, name: string) {
|
|||||||
:selectedId="selectedProjectId"
|
:selectedId="selectedProjectId"
|
||||||
@select="onSelectProject"
|
@select="onSelectProject"
|
||||||
@create="onStartCreate"
|
@create="onStartCreate"
|
||||||
|
@delete="onDeleteProject"
|
||||||
/>
|
/>
|
||||||
<main class="main-content">
|
<main class="main-content">
|
||||||
<div v-if="error" class="error-banner" @click="error = ''">{{ error }}</div>
|
<div v-if="error" class="error-banner" @click="error = ''">{{ error }}</div>
|
||||||
|
|||||||
@ -9,7 +9,15 @@ defineProps<{
|
|||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
select: [id: string]
|
select: [id: string]
|
||||||
create: []
|
create: []
|
||||||
|
delete: [id: string]
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
|
function onDelete(e: Event, id: string) {
|
||||||
|
e.stopPropagation()
|
||||||
|
if (confirm('确定删除这个项目?')) {
|
||||||
|
emit('delete', id)
|
||||||
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
@ -26,7 +34,10 @@ const emit = defineEmits<{
|
|||||||
:class="{ active: project.id === selectedId }"
|
:class="{ active: project.id === selectedId }"
|
||||||
@click="emit('select', project.id)"
|
@click="emit('select', project.id)"
|
||||||
>
|
>
|
||||||
<span class="project-name">{{ project.name }}</span>
|
<div class="project-row">
|
||||||
|
<span class="project-name">{{ project.name }}</span>
|
||||||
|
<button class="btn-delete" @click="onDelete($event, project.id)" title="删除项目">×</button>
|
||||||
|
</div>
|
||||||
<span class="project-time">{{ new Date(project.updated_at).toLocaleDateString() }}</span>
|
<span class="project-time">{{ new Date(project.updated_at).toLocaleDateString() }}</span>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
@ -96,9 +107,46 @@ const emit = defineEmits<{
|
|||||||
border-left: 3px solid var(--accent);
|
border-left: 3px solid var(--accent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.project-row {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
}
|
||||||
|
|
||||||
.project-name {
|
.project-name {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
|
flex: 1;
|
||||||
|
min-width: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-delete {
|
||||||
|
display: none;
|
||||||
|
width: 20px;
|
||||||
|
height: 20px;
|
||||||
|
padding: 0;
|
||||||
|
border: none;
|
||||||
|
background: transparent;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
font-size: 16px;
|
||||||
|
line-height: 1;
|
||||||
|
cursor: pointer;
|
||||||
|
border-radius: 4px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-delete:hover {
|
||||||
|
background: var(--error, #e74c3c);
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.project-item:hover .btn-delete {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.project-time {
|
.project-time {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user