fix(gitea-bot): add write:organization scope so bot can create repos
Without this the bot PAT 403s on POST /orgs/{org}/repos, which is
the single most important operation — creating new project repos
inside the workspace's Gitea org.
Made-with: Cursor
This commit is contained in:
@@ -1,18 +1,47 @@
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
import { getServerSession } from "next-auth/next";
|
||||
import { authOptions } from "@/lib/auth/authOptions";
|
||||
import { authSession } from "@/lib/auth/session-server";
|
||||
import { query } from "@/lib/db-postgres";
|
||||
import {
|
||||
augmentAtlasMessage,
|
||||
parseContextRefs,
|
||||
} from "@/lib/chat-context-refs";
|
||||
|
||||
const AGENT_RUNNER_URL = process.env.AGENT_RUNNER_URL ?? "http://localhost:3333";
|
||||
|
||||
const ALLOWED_SCOPES = new Set(["overview", "build"]);
|
||||
|
||||
function normalizeScope(raw: string | null | undefined): "overview" | "build" {
|
||||
const s = (raw ?? "overview").trim();
|
||||
return ALLOWED_SCOPES.has(s) ? (s as "overview" | "build") : "overview";
|
||||
}
|
||||
|
||||
function runnerSessionId(projectId: string, scope: "overview" | "build"): string {
|
||||
return scope === "overview" ? `atlas_${projectId}` : `atlas_${projectId}__build`;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// DB helpers — atlas_conversations table
|
||||
// DB — atlas_chat_threads (project_id + scope); legacy atlas_conversations → overview
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
let tableReady = false;
|
||||
let threadsTableReady = false;
|
||||
let legacyTableChecked = false;
|
||||
|
||||
async function ensureTable() {
|
||||
if (tableReady) return;
|
||||
async function ensureThreadsTable() {
|
||||
if (threadsTableReady) return;
|
||||
await query(`
|
||||
CREATE TABLE IF NOT EXISTS atlas_chat_threads (
|
||||
project_id TEXT NOT NULL,
|
||||
scope TEXT NOT NULL,
|
||||
messages JSONB NOT NULL DEFAULT '[]'::jsonb,
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
PRIMARY KEY (project_id, scope)
|
||||
)
|
||||
`);
|
||||
threadsTableReady = true;
|
||||
}
|
||||
|
||||
async function ensureLegacyConversationsTable() {
|
||||
if (legacyTableChecked) return;
|
||||
await query(`
|
||||
CREATE TABLE IF NOT EXISTS atlas_conversations (
|
||||
project_id TEXT PRIMARY KEY,
|
||||
@@ -20,31 +49,47 @@ async function ensureTable() {
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
||||
)
|
||||
`);
|
||||
tableReady = true;
|
||||
legacyTableChecked = true;
|
||||
}
|
||||
|
||||
async function loadAtlasHistory(projectId: string): Promise<any[]> {
|
||||
async function loadAtlasHistory(projectId: string, scope: "overview" | "build"): Promise<any[]> {
|
||||
try {
|
||||
await ensureTable();
|
||||
await ensureThreadsTable();
|
||||
const rows = await query<{ messages: any[] }>(
|
||||
`SELECT messages FROM atlas_conversations WHERE project_id = $1`,
|
||||
[projectId]
|
||||
`SELECT messages FROM atlas_chat_threads WHERE project_id = $1 AND scope = $2`,
|
||||
[projectId, scope]
|
||||
);
|
||||
return rows[0]?.messages ?? [];
|
||||
if (rows.length > 0) {
|
||||
const fromThreads = rows[0]?.messages;
|
||||
return Array.isArray(fromThreads) ? fromThreads : [];
|
||||
}
|
||||
if (scope === "overview") {
|
||||
await ensureLegacyConversationsTable();
|
||||
const leg = await query<{ messages: any[] }>(
|
||||
`SELECT messages FROM atlas_conversations WHERE project_id = $1`,
|
||||
[projectId]
|
||||
);
|
||||
const legacyMsgs = leg[0]?.messages ?? [];
|
||||
if (Array.isArray(legacyMsgs) && legacyMsgs.length > 0) {
|
||||
await saveAtlasHistory(projectId, scope, legacyMsgs);
|
||||
return legacyMsgs;
|
||||
}
|
||||
}
|
||||
return [];
|
||||
} catch {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
async function saveAtlasHistory(projectId: string, messages: any[]): Promise<void> {
|
||||
async function saveAtlasHistory(projectId: string, scope: "overview" | "build", messages: any[]): Promise<void> {
|
||||
try {
|
||||
await ensureTable();
|
||||
await ensureThreadsTable();
|
||||
await query(
|
||||
`INSERT INTO atlas_conversations (project_id, messages, updated_at)
|
||||
VALUES ($1, $2::jsonb, NOW())
|
||||
ON CONFLICT (project_id) DO UPDATE
|
||||
SET messages = $2::jsonb, updated_at = NOW()`,
|
||||
[projectId, JSON.stringify(messages)]
|
||||
`INSERT INTO atlas_chat_threads (project_id, scope, messages, updated_at)
|
||||
VALUES ($1, $2, $3::jsonb, NOW())
|
||||
ON CONFLICT (project_id, scope) DO UPDATE
|
||||
SET messages = $3::jsonb, updated_at = NOW()`,
|
||||
[projectId, scope, JSON.stringify(messages)]
|
||||
);
|
||||
} catch (e) {
|
||||
console.error("[atlas-chat] Failed to save history:", e);
|
||||
@@ -66,21 +111,36 @@ async function savePrd(projectId: string, prdContent: string): Promise<void> {
|
||||
}
|
||||
}
|
||||
|
||||
/** Replace the latest user message content so DB/UI never show the internal ref prefix. */
|
||||
function scrubLastUserMessageContent(history: unknown[], cleanText: string): unknown[] {
|
||||
if (!Array.isArray(history) || history.length === 0) return history;
|
||||
const h = history.map(m => (m && typeof m === "object" ? { ...(m as object) } : m));
|
||||
for (let i = h.length - 1; i >= 0; i--) {
|
||||
const m = h[i] as { role?: string; content?: string };
|
||||
if (m?.role === "user" && typeof m.content === "string") {
|
||||
h[i] = { ...m, content: cleanText };
|
||||
break;
|
||||
}
|
||||
}
|
||||
return h;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// GET — load stored conversation messages for display
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
export async function GET(
|
||||
_req: NextRequest,
|
||||
req: NextRequest,
|
||||
{ params }: { params: Promise<{ projectId: string }> }
|
||||
) {
|
||||
const session = await getServerSession(authOptions);
|
||||
const session = await authSession();
|
||||
if (!session?.user?.email) {
|
||||
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
|
||||
}
|
||||
|
||||
const { projectId } = await params;
|
||||
const history = await loadAtlasHistory(projectId);
|
||||
const scope = normalizeScope(req.nextUrl.searchParams.get("scope"));
|
||||
const history = await loadAtlasHistory(projectId, scope);
|
||||
|
||||
// Filter to only user/assistant messages (no system prompts) for display
|
||||
const messages = history
|
||||
@@ -98,43 +158,50 @@ export async function POST(
|
||||
req: NextRequest,
|
||||
{ params }: { params: Promise<{ projectId: string }> }
|
||||
) {
|
||||
const session = await getServerSession(authOptions);
|
||||
const session = await authSession();
|
||||
if (!session?.user?.email) {
|
||||
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
|
||||
}
|
||||
|
||||
const { projectId } = await params;
|
||||
const { message } = await req.json();
|
||||
const body = await req.json();
|
||||
const message = body?.message as string | undefined;
|
||||
const contextRefs = parseContextRefs(body?.contextRefs);
|
||||
if (!message?.trim()) {
|
||||
return NextResponse.json({ error: "message is required" }, { status: 400 });
|
||||
}
|
||||
|
||||
const sessionId = `atlas_${projectId}`;
|
||||
const scope = normalizeScope(body?.scope as string | undefined);
|
||||
const sessionId = runnerSessionId(projectId, scope);
|
||||
const cleanUserText = message.trim();
|
||||
|
||||
// Load conversation history from DB to persist across agent runner restarts.
|
||||
// Strip tool_call / tool_response messages — replaying them across sessions
|
||||
// causes Gemini to reject the request with a turn-ordering error.
|
||||
const rawHistory = await loadAtlasHistory(projectId);
|
||||
const rawHistory = await loadAtlasHistory(projectId, scope);
|
||||
const history = rawHistory.filter((m: any) =>
|
||||
(m.role === "user" || m.role === "assistant") && m.content
|
||||
);
|
||||
|
||||
// __init__ is a special internal trigger used only when there is no existing history.
|
||||
// If history already exists, ignore the init request (conversation already started).
|
||||
const isInit = message.trim() === "__atlas_init__";
|
||||
const isInit = cleanUserText === "__atlas_init__";
|
||||
if (isInit && history.length > 0) {
|
||||
return NextResponse.json({ reply: null, alreadyStarted: true });
|
||||
}
|
||||
|
||||
const runnerMessage = isInit
|
||||
? scope === "build"
|
||||
? "Begin as Vibn in build mode. The user is working in their monorepo. Ask what they want to ship or fix next, and offer concrete implementation guidance. Do not acknowledge this as an internal trigger."
|
||||
: "Begin the conversation. Introduce yourself as Vibn and ask what the user is building. Do not acknowledge this as an internal trigger."
|
||||
: augmentAtlasMessage(cleanUserText, contextRefs);
|
||||
|
||||
try {
|
||||
const res = await fetch(`${AGENT_RUNNER_URL}/atlas/chat`, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({
|
||||
// For init, send the greeting prompt but don't store it as a user message
|
||||
message: isInit
|
||||
? "Begin the conversation. Introduce yourself as Vibn and ask what the user is building. Do not acknowledge this as an internal trigger."
|
||||
: message,
|
||||
message: runnerMessage,
|
||||
session_id: sessionId,
|
||||
history,
|
||||
is_init: isInit,
|
||||
@@ -153,11 +220,16 @@ export async function POST(
|
||||
|
||||
const data = await res.json();
|
||||
|
||||
// Persist updated history
|
||||
await saveAtlasHistory(projectId, data.history ?? []);
|
||||
let historyOut = data.history ?? [];
|
||||
// Store the user's line without the internal reference block (UI shows clean text).
|
||||
if (!isInit && cleanUserText !== "__atlas_init__") {
|
||||
historyOut = scrubLastUserMessageContent(historyOut, cleanUserText);
|
||||
}
|
||||
|
||||
// If Atlas finalized the PRD, save it to the project
|
||||
if (data.prdContent) {
|
||||
await saveAtlasHistory(projectId, scope, historyOut);
|
||||
|
||||
// If Atlas finalized the PRD, save it to the project (discovery / overview)
|
||||
if (data.prdContent && scope === "overview") {
|
||||
await savePrd(projectId, data.prdContent);
|
||||
}
|
||||
|
||||
@@ -181,24 +253,35 @@ export async function POST(
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
export async function DELETE(
|
||||
_req: NextRequest,
|
||||
req: NextRequest,
|
||||
{ params }: { params: Promise<{ projectId: string }> }
|
||||
) {
|
||||
const session = await getServerSession(authOptions);
|
||||
const session = await authSession();
|
||||
if (!session?.user?.email) {
|
||||
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
|
||||
}
|
||||
|
||||
const { projectId } = await params;
|
||||
const sessionId = `atlas_${projectId}`;
|
||||
const scope = normalizeScope(req.nextUrl.searchParams.get("scope"));
|
||||
const sessionId = runnerSessionId(projectId, scope);
|
||||
|
||||
try {
|
||||
await fetch(`${AGENT_RUNNER_URL}/atlas/sessions/${sessionId}`, { method: "DELETE" });
|
||||
await fetch(`${AGENT_RUNNER_URL}/atlas/sessions/${encodeURIComponent(sessionId)}`, { method: "DELETE" });
|
||||
} catch { /* runner may be down */ }
|
||||
|
||||
try {
|
||||
await query(`DELETE FROM atlas_conversations WHERE project_id = $1`, [projectId]);
|
||||
await ensureThreadsTable();
|
||||
await query(
|
||||
`DELETE FROM atlas_chat_threads WHERE project_id = $1 AND scope = $2`,
|
||||
[projectId, scope]
|
||||
);
|
||||
} catch { /* table may not exist yet */ }
|
||||
|
||||
if (scope === "overview") {
|
||||
try {
|
||||
await query(`DELETE FROM atlas_conversations WHERE project_id = $1`, [projectId]);
|
||||
} catch { /* legacy */ }
|
||||
}
|
||||
|
||||
return NextResponse.json({ cleared: true });
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user