project-ux: archive/rename/Open-in-Gitea sidebar context menu, archived projects landing, create-project bootstrap with Gitea remote
Server:
- projects.status + projects.gitea_remote (additive) with CHECK ('open','archived')
- GET /api/projects?status=archived; PATCH /api/projects/:id (rename);
POST /api/projects/:id/archive | unarchive; POST /api/projects/create
- POST /api/projects ON CONFLICT (path) DO UPDATE SET status='open': re-add
of archived path restores existing row (preserves id + FKs); already-open
path returns 409. Detected-repos picker now excludes only status='open'.
- New gitea.ts (createGiteaRepo + GiteaRepoExistsError) and
project_bootstrap.ts (sanitize name, mkdir under PROJECT_ROOT_WHITELIST,
git init -b main + first commit with -c user.name/email per-command, optional
Gitea repo create + remote add + push; all via execFile, no shell).
- 3 new user-stream frames: project_archived, project_unarchived, project_updated.
- sidebar.ts now selects path + gitea_remote and filters status='open'.
- Gitea env added to config.ts (GITEA_BASE_URL, GITEA_USER, GITEA_TOKEN,
GITEA_SSH_HOST).
- docker-compose.yml /opt mount flipped to rw so create-project can mkdir.
- auto_name.ts gate relaxed from `!== 1` to `< 1` (fires on every turn while
chat name is empty, not only the first).
Web:
- ProjectSidebar: project rows use proper Radix ContextMenu; items Rename /
Archive / Open in Gitea. Inline rename, archive confirm dialog.
Removed obsolete handleRemove + DropdownMenu hack.
- Home: Add-existing + Create-new buttons; collapsible Archived Projects
section with Restore.
- New CreateProjectModal: name + live folder preview, commit msg, Private/
Public radio, create-Gitea-remote checkbox, toast on success/warnings.
- New projectUrls.ts giteaUrlFor() — uses gitea_remote when present,
falls back to convention URL.
- 3 new event types in sessionEvents.ts with idempotent useSidebar handlers.
- SidebarProject extended with path + gitea_remote so Open-in-Gitea can
resolve without a separate fetch.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -9,12 +9,29 @@ import type { Project, AvailableProject } from '../types/api.js';
|
||||
import { resolveProjectRoot, PathScopeError } from '../services/path_guard.js';
|
||||
import { listDir, viewFile } from '../services/file_ops.js';
|
||||
import { getProjectFiles } from '../services/file_index.js';
|
||||
import {
|
||||
bootstrapProject,
|
||||
BootstrapNameError,
|
||||
BootstrapCollisionError,
|
||||
BootstrapPathError,
|
||||
} from '../services/project_bootstrap.js';
|
||||
|
||||
const AddProjectBody = z.object({
|
||||
path: z.string().min(1),
|
||||
name: z.string().min(1).optional(),
|
||||
});
|
||||
|
||||
const PatchProjectBody = z.object({
|
||||
name: z.string().min(1).max(200),
|
||||
});
|
||||
|
||||
const CreateProjectBody = z.object({
|
||||
name: z.string().min(1).max(64),
|
||||
commit_message: z.string().min(1).max(200).optional(),
|
||||
visibility: z.enum(['private', 'public']).optional(),
|
||||
create_gitea_remote: z.boolean().optional(),
|
||||
});
|
||||
|
||||
async function isDir(path: string): Promise<boolean> {
|
||||
try {
|
||||
const s = await stat(path);
|
||||
@@ -49,15 +66,83 @@ export function registerProjectRoutes(
|
||||
config: Config,
|
||||
broker: Broker
|
||||
): void {
|
||||
app.get('/api/projects', async () => {
|
||||
app.get<{ Querystring: { status?: string } }>('/api/projects', async (req) => {
|
||||
const status = req.query.status === 'archived' ? 'archived' : 'open';
|
||||
const rows = await sql<Project[]>`
|
||||
SELECT id, name, path, added_at, last_session_id
|
||||
SELECT id, name, path, added_at, last_session_id, status, gitea_remote
|
||||
FROM projects
|
||||
WHERE status = ${status}
|
||||
ORDER BY added_at DESC
|
||||
`;
|
||||
return rows;
|
||||
});
|
||||
|
||||
app.post('/api/projects/create', async (req, reply) => {
|
||||
const parsed = CreateProjectBody.safeParse(req.body);
|
||||
if (!parsed.success) {
|
||||
reply.code(400);
|
||||
return { error: 'invalid body', details: parsed.error.flatten() };
|
||||
}
|
||||
const visibility = parsed.data.visibility ?? 'private';
|
||||
const createRemote = parsed.data.create_gitea_remote ?? true;
|
||||
const commitMessage = parsed.data.commit_message ?? 'Initial commit';
|
||||
|
||||
let bootstrap;
|
||||
try {
|
||||
bootstrap = await bootstrapProject(config, app.log, {
|
||||
name: parsed.data.name,
|
||||
commitMessage,
|
||||
visibility,
|
||||
createGiteaRemote: createRemote,
|
||||
});
|
||||
} catch (err) {
|
||||
if (err instanceof BootstrapNameError) {
|
||||
reply.code(400);
|
||||
return { error: `invalid project name: ${err.message}` };
|
||||
}
|
||||
if (err instanceof BootstrapCollisionError) {
|
||||
reply.code(409);
|
||||
return { error: err.message };
|
||||
}
|
||||
if (err instanceof BootstrapPathError) {
|
||||
reply.code(400);
|
||||
return { error: err.message };
|
||||
}
|
||||
app.log.error({ err }, 'bootstrap failed');
|
||||
reply.code(500);
|
||||
return { error: err instanceof Error ? err.message : 'bootstrap failed' };
|
||||
}
|
||||
|
||||
// Insert into projects table only after bootstrap succeeded.
|
||||
try {
|
||||
const [row] = await sql<Project[]>`
|
||||
INSERT INTO projects (name, path, gitea_remote)
|
||||
VALUES (${parsed.data.name}, ${bootstrap.folder_real_path}, ${bootstrap.gitea_remote_url})
|
||||
RETURNING id, name, path, added_at, last_session_id, status, gitea_remote
|
||||
`;
|
||||
broker.publishUser('default', { type: 'project_created', project: row as unknown as Project });
|
||||
reply.code(201);
|
||||
return {
|
||||
project: row,
|
||||
bootstrap: {
|
||||
folder_created: bootstrap.folder_created,
|
||||
git_initialized: bootstrap.git_initialized,
|
||||
first_commit: bootstrap.first_commit,
|
||||
gitea_remote_created: bootstrap.gitea_remote_created,
|
||||
gitea_pushed: bootstrap.gitea_pushed,
|
||||
warnings: bootstrap.warnings,
|
||||
},
|
||||
};
|
||||
} catch (err) {
|
||||
app.log.error({ err, folder: bootstrap.folder_real_path }, 'project insert failed after bootstrap');
|
||||
reply.code(500);
|
||||
return {
|
||||
error: 'project created on disk but DB insert failed',
|
||||
folder: bootstrap.folder_real_path,
|
||||
};
|
||||
}
|
||||
});
|
||||
|
||||
app.post('/api/projects', async (req, reply) => {
|
||||
const parsed = AddProjectBody.safeParse(req.body);
|
||||
if (!parsed.success) {
|
||||
@@ -70,22 +155,88 @@ export function registerProjectRoutes(
|
||||
return { error: resolved.error };
|
||||
}
|
||||
const name = parsed.data.name?.trim() || resolved.name;
|
||||
try {
|
||||
const [row] = await sql<Project[]>`
|
||||
INSERT INTO projects (name, path)
|
||||
VALUES (${name}, ${resolved.real})
|
||||
RETURNING id, name, path, added_at, last_session_id
|
||||
`;
|
||||
|
||||
// Pre-check the current row (if any) so we can distinguish three cases:
|
||||
// - no row → INSERT fresh, 201, project_created
|
||||
// - row archived → ON CONFLICT UPDATE flips to 'open', 200, project_unarchived
|
||||
// - row already open → 409 (true duplicate)
|
||||
const existing = await sql<{ status: string }[]>`
|
||||
SELECT status FROM projects WHERE path = ${resolved.real}
|
||||
`;
|
||||
if (existing.length > 0 && existing[0]!.status === 'open') {
|
||||
reply.code(409);
|
||||
return { error: 'project already exists' };
|
||||
}
|
||||
|
||||
const [row] = await sql<Project[]>`
|
||||
INSERT INTO projects (name, path)
|
||||
VALUES (${name}, ${resolved.real})
|
||||
ON CONFLICT (path) DO UPDATE SET status = 'open'
|
||||
RETURNING id, name, path, added_at, last_session_id, status, gitea_remote
|
||||
`;
|
||||
|
||||
if (existing.length === 0) {
|
||||
broker.publishUser('default', { type: 'project_created', project: row as unknown as Project });
|
||||
reply.code(201);
|
||||
return row;
|
||||
} catch (err) {
|
||||
if (err instanceof Error && err.message.includes('duplicate key')) {
|
||||
reply.code(409);
|
||||
return { error: 'project already exists' };
|
||||
}
|
||||
throw err;
|
||||
} else {
|
||||
// existing.status was 'archived' — row has been restored.
|
||||
broker.publishUser('default', { type: 'project_unarchived', project: row as unknown as Project });
|
||||
reply.code(200);
|
||||
}
|
||||
return row;
|
||||
});
|
||||
|
||||
app.patch<{ Params: { id: string } }>('/api/projects/:id', async (req, reply) => {
|
||||
const parsed = PatchProjectBody.safeParse(req.body);
|
||||
if (!parsed.success) {
|
||||
reply.code(400);
|
||||
return { error: 'invalid body', details: parsed.error.flatten() };
|
||||
}
|
||||
const rows = await sql<Project[]>`
|
||||
UPDATE projects SET name = ${parsed.data.name}
|
||||
WHERE id = ${req.params.id}
|
||||
RETURNING id, name, path, added_at, last_session_id, status, gitea_remote
|
||||
`;
|
||||
if (rows.length === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'not found' };
|
||||
}
|
||||
const project = rows[0]!;
|
||||
broker.publishUser('default', {
|
||||
type: 'project_updated',
|
||||
project_id: project.id,
|
||||
name: project.name,
|
||||
});
|
||||
return project;
|
||||
});
|
||||
|
||||
app.post<{ Params: { id: string } }>('/api/projects/:id/archive', async (req, reply) => {
|
||||
const result = await sql`
|
||||
UPDATE projects SET status = 'archived'
|
||||
WHERE id = ${req.params.id} AND status = 'open'
|
||||
`;
|
||||
if (result.count === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'not found or already archived' };
|
||||
}
|
||||
broker.publishUser('default', { type: 'project_archived', project_id: req.params.id });
|
||||
reply.code(204);
|
||||
return null;
|
||||
});
|
||||
|
||||
app.post<{ Params: { id: string } }>('/api/projects/:id/unarchive', async (req, reply) => {
|
||||
const rows = await sql<Project[]>`
|
||||
UPDATE projects SET status = 'open'
|
||||
WHERE id = ${req.params.id} AND status = 'archived'
|
||||
RETURNING id, name, path, added_at, last_session_id, status, gitea_remote
|
||||
`;
|
||||
if (rows.length === 0) {
|
||||
reply.code(404);
|
||||
return { error: 'not found or not archived' };
|
||||
}
|
||||
const project = rows[0]!;
|
||||
broker.publishUser('default', { type: 'project_unarchived', project });
|
||||
return project;
|
||||
});
|
||||
|
||||
app.delete<{ Params: { id: string } }>('/api/projects/:id', async (req, reply) => {
|
||||
@@ -109,7 +260,12 @@ export function registerProjectRoutes(
|
||||
return [] as AvailableProject[];
|
||||
}
|
||||
|
||||
const existing = await sql<{ path: string }[]>`SELECT path FROM projects`;
|
||||
// Only exclude paths registered with status='open'. Archived projects'
|
||||
// folders should reappear as available so re-add via the picker restores
|
||||
// the existing row (see POST /api/projects ON CONFLICT below).
|
||||
const existing = await sql<{ path: string }[]>`
|
||||
SELECT path FROM projects WHERE status = 'open'
|
||||
`;
|
||||
const existingSet = new Set(existing.map((r) => r.path));
|
||||
|
||||
const out: AvailableProject[] = [];
|
||||
@@ -143,7 +299,7 @@ export function registerProjectRoutes(
|
||||
const relPath = req.query.path ?? '.';
|
||||
|
||||
const rows = await sql<Project[]>`
|
||||
SELECT id, name, path, added_at, last_session_id
|
||||
SELECT id, name, path, added_at, last_session_id, status, gitea_remote
|
||||
FROM projects WHERE id = ${id}
|
||||
`;
|
||||
if (rows.length === 0) {
|
||||
@@ -188,7 +344,7 @@ export function registerProjectRoutes(
|
||||
}
|
||||
|
||||
const rows = await sql<Project[]>`
|
||||
SELECT id, name, path, added_at, last_session_id
|
||||
SELECT id, name, path, added_at, last_session_id, status, gitea_remote
|
||||
FROM projects WHERE id = ${id}
|
||||
`;
|
||||
if (rows.length === 0) {
|
||||
@@ -232,7 +388,7 @@ export function registerProjectRoutes(
|
||||
const { id } = req.params;
|
||||
|
||||
const rows = await sql<Project[]>`
|
||||
SELECT id, name, path, added_at, last_session_id
|
||||
SELECT id, name, path, added_at, last_session_id, status, gitea_remote
|
||||
FROM projects WHERE id = ${id}
|
||||
`;
|
||||
if (rows.length === 0) {
|
||||
|
||||
@@ -8,9 +8,10 @@ import type {
|
||||
|
||||
export function registerSidebarRoutes(app: FastifyInstance, sql: Sql): void {
|
||||
app.get('/api/sidebar', async (): Promise<SidebarResponse> => {
|
||||
const projects = await sql<{ id: string; name: string }[]>`
|
||||
SELECT id, name
|
||||
const projects = await sql<{ id: string; name: string; path: string; gitea_remote: string | null }[]>`
|
||||
SELECT id, name, path, gitea_remote
|
||||
FROM projects
|
||||
WHERE status = 'open'
|
||||
ORDER BY added_at DESC
|
||||
`;
|
||||
|
||||
@@ -33,6 +34,8 @@ export function registerSidebarRoutes(app: FastifyInstance, sql: Sql): void {
|
||||
return {
|
||||
id: p.id,
|
||||
name: p.name,
|
||||
path: p.path,
|
||||
gitea_remote: p.gitea_remote,
|
||||
recent_sessions,
|
||||
total_sessions: countRows[0]?.n ?? 0,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user