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:
2026-05-16 02:51:59 +00:00
parent 051f3b96ae
commit 48a972e139
17 changed files with 947 additions and 103 deletions

View File

@@ -9,6 +9,10 @@ const ConfigSchema = z.object({
PROJECT_ROOT_WHITELIST: z.string().default('/opt'),
DEFAULT_MODEL: z.string().default('qwen3.6-35b-a3b-mxfp4'),
LOG_LEVEL: z.string().default('info'),
GITEA_BASE_URL: z.string().url().default('https://git.indifferentketchup.com'),
GITEA_USER: z.string().default('indifferentketchup'),
GITEA_TOKEN: z.string().optional(),
GITEA_SSH_HOST: z.string().default('100.114.205.53:2222'),
});
export type Config = z.infer<typeof ConfigSchema>;

View File

@@ -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) {

View File

@@ -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,
};

View File

@@ -132,3 +132,15 @@ BEGIN
CHECK (status IN ('streaming', 'complete', 'failed', 'cancelled'));
END IF;
END $$;
-- v1.2-project-ux: projects.status + projects.gitea_remote
-- KEEP IN SYNC: apps/server/src/types/api.ts PROJECT_STATUSES
ALTER TABLE projects ADD COLUMN IF NOT EXISTS status TEXT NOT NULL DEFAULT 'open';
ALTER TABLE projects ADD COLUMN IF NOT EXISTS gitea_remote TEXT;
DO $$
BEGIN
IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'projects_status_chk') THEN
ALTER TABLE projects ADD CONSTRAINT projects_status_chk
CHECK (status IN ('open', 'archived'));
END IF;
END $$;

View File

@@ -53,7 +53,7 @@ export async function maybeAutoNameChat(
AND status = 'complete'
AND content <> ''
`;
if (counts[0]?.n !== 1) return;
if ((counts[0]?.n ?? 0) < 1) return;
const chatRows = await ctx.sql<
{ id: string; name: string | null; session_id: string }[]

View File

@@ -0,0 +1,50 @@
export interface GiteaConfig {
baseUrl: string;
user: string;
token: string;
}
export interface GiteaRepo {
clone_url: string;
ssh_url: string;
html_url: string;
}
export class GiteaRepoExistsError extends Error {
constructor() {
super('gitea-repo-exists');
}
}
export async function createGiteaRepo(
cfg: GiteaConfig,
name: string,
options: { private: boolean }
): Promise<GiteaRepo> {
const res = await fetch(`${cfg.baseUrl}/api/v1/user/repos`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
Authorization: `token ${cfg.token}`,
},
body: JSON.stringify({
name,
private: options.private,
auto_init: false,
}),
});
if (res.status === 409) throw new GiteaRepoExistsError();
if (!res.ok) {
const text = await res.text().catch(() => '');
throw new Error(`gitea-api-${res.status}: ${text.slice(0, 200)}`);
}
const body = (await res.json()) as { ssh_url?: string; clone_url?: string; html_url?: string };
if (!body.ssh_url || !body.html_url || !body.clone_url) {
throw new Error(`gitea-api-unexpected-shape: ${JSON.stringify(body).slice(0, 200)}`);
}
return {
ssh_url: body.ssh_url,
clone_url: body.clone_url,
html_url: body.html_url,
};
}

View File

@@ -0,0 +1,179 @@
import { execFile } from 'node:child_process';
import { promisify } from 'node:util';
import { mkdir, writeFile, realpath } from 'node:fs/promises';
import { existsSync } from 'node:fs';
import { resolve, sep } from 'node:path';
import type { FastifyBaseLogger } from 'fastify';
import type { Config } from '../config.js';
import { createGiteaRepo, GiteaRepoExistsError } from './gitea.js';
const execFileAsync = promisify(execFile);
const GITIGNORE_TEMPLATE = `# OS / editor
.DS_Store
*.swp
*~
# Node
node_modules/
dist/
build/
.env
.env.local
# Python
__pycache__/
*.pyc
.venv/
venv/
# AI agents
.claude/
.opencode/
# Backups
*.bak*
`;
const GIT_USER_NAME = 'indifferentketchup';
const GIT_USER_EMAIL = 'samkintop@gmail.com';
export interface BootstrapResult {
folder_real_path: string;
folder_name: string;
gitea_remote_url: string | null;
folder_created: boolean;
git_initialized: boolean;
first_commit: boolean;
gitea_remote_created: boolean;
gitea_pushed: boolean;
warnings: string[];
}
const SAFE_NAME = /^[a-z0-9][a-z0-9-]{0,63}$/;
export function sanitizeFolderName(raw: string): string {
return raw
.toLowerCase()
.trim()
.replace(/\s+/g, '-')
.replace(/[^a-z0-9-]/g, '')
.replace(/-+/g, '-')
.replace(/^-+|-+$/g, '')
.slice(0, 64);
}
export class BootstrapNameError extends Error {}
export class BootstrapCollisionError extends Error {}
export class BootstrapPathError extends Error {}
export async function bootstrapProject(
config: Config,
log: FastifyBaseLogger,
options: {
name: string;
commitMessage: string;
visibility: 'private' | 'public';
createGiteaRemote: boolean;
}
): Promise<BootstrapResult> {
const folder = sanitizeFolderName(options.name);
if (folder.length === 0 || !SAFE_NAME.test(folder)) {
throw new BootstrapNameError(`invalid name after sanitization: "${folder}"`);
}
// Whitelist resolution
const whitelistReal = await realpath(config.PROJECT_ROOT_WHITELIST);
const fullPath = resolve(whitelistReal, folder);
if (!fullPath.startsWith(whitelistReal + sep)) {
throw new BootstrapPathError('path escapes whitelist');
}
if (existsSync(fullPath)) {
throw new BootstrapCollisionError(`path already exists: ${fullPath}`);
}
const warnings: string[] = [];
let folder_created = false;
let git_initialized = false;
let first_commit = false;
let gitea_remote_created = false;
let gitea_pushed = false;
let gitea_remote_url: string | null = null;
// Step 1: mkdir
await mkdir(fullPath, { recursive: false });
folder_created = true;
log.info({ fullPath }, 'project_bootstrap: folder created');
// Step 2: write .gitignore
await writeFile(resolve(fullPath, '.gitignore'), GITIGNORE_TEMPLATE, 'utf8');
// Step 3: git init -b main
await execFileAsync('git', ['init', '-b', 'main'], { cwd: fullPath });
git_initialized = true;
// Step 4: git add + commit (per-command -c, no global config touch)
await execFileAsync('git', ['add', '.gitignore'], { cwd: fullPath });
await execFileAsync(
'git',
[
'-c', `user.name=${GIT_USER_NAME}`,
'-c', `user.email=${GIT_USER_EMAIL}`,
'commit',
'-m', options.commitMessage,
],
{ cwd: fullPath }
);
first_commit = true;
log.info({ folder }, 'project_bootstrap: initial commit');
// Step 5: optional Gitea remote
if (options.createGiteaRemote) {
if (!config.GITEA_TOKEN) {
warnings.push('Gitea remote skipped — token not configured');
} else {
try {
const repo = await createGiteaRepo(
{ baseUrl: config.GITEA_BASE_URL, user: config.GITEA_USER, token: config.GITEA_TOKEN },
folder,
{ private: options.visibility === 'private' }
);
gitea_remote_created = true;
gitea_remote_url = repo.html_url;
log.info({ folder, html_url: repo.html_url }, 'project_bootstrap: gitea repo created');
// Step 6: git remote add + push
try {
await execFileAsync('git', ['remote', 'add', 'origin', repo.ssh_url], { cwd: fullPath });
await execFileAsync('git', ['push', '-u', 'origin', 'main'], { cwd: fullPath });
gitea_pushed = true;
log.info({ folder }, 'project_bootstrap: pushed to gitea');
} catch (pushErr) {
const msg = pushErr instanceof Error ? pushErr.message : String(pushErr);
warnings.push(`Push to Gitea failed: ${msg.slice(0, 200)}`);
log.warn({ err: pushErr, folder }, 'project_bootstrap: push failed');
}
} catch (err) {
if (err instanceof GiteaRepoExistsError) {
warnings.push('Gitea repo already exists with this name; local repo created without remote');
} else {
const msg = err instanceof Error ? err.message : String(err);
warnings.push(`Gitea remote creation failed: ${msg.slice(0, 200)}`);
}
log.warn({ err, folder }, 'project_bootstrap: gitea remote step failed');
}
}
}
return {
folder_real_path: fullPath,
folder_name: folder,
gitea_remote_url,
folder_created,
git_initialized,
first_commit,
gitea_remote_created,
gitea_pushed,
warnings,
};
}

View File

@@ -1,9 +1,15 @@
// KEEP IN SYNC: apps/server/src/schema.sql projects_status_chk
export const PROJECT_STATUSES = ['open', 'archived'] as const;
export type ProjectStatus = typeof PROJECT_STATUSES[number];
export interface Project {
id: string;
name: string;
path: string;
added_at: string;
last_session_id: string | null;
status: ProjectStatus;
gitea_remote: string | null;
}
export interface AvailableProject {
@@ -97,6 +103,8 @@ export interface SidebarSession {
export interface SidebarProject {
id: string;
name: string;
path: string;
gitea_remote: string | null;
recent_sessions: SidebarSession[];
total_sessions: number;
}
@@ -188,6 +196,19 @@ export interface ChatClosedFrame {
chat_id: string;
session_id: string;
}
export interface ProjectArchivedFrame {
type: 'project_archived';
project_id: string;
}
export interface ProjectUnarchivedFrame {
type: 'project_unarchived';
project: Project;
}
export interface ProjectUpdatedFrame {
type: 'project_updated';
project_id: string;
name: string;
}
export type UserStreamFrame =
| ProjectCreatedFrame
| ProjectDeletedFrame
@@ -197,4 +218,7 @@ export type UserStreamFrame =
| SessionArchivedFrame
| ChatCreatedFrame
| ChatUpdatedFrame
| ChatClosedFrame;
| ChatClosedFrame
| ProjectArchivedFrame
| ProjectUnarchivedFrame
| ProjectUpdatedFrame;