tower-studio 0.1.1 → 0.1.3

package/src/app/api/tasks/[taskId]/merge/route.ts

@@ -0,0 +1,159 @@
+import { NextRequest, NextResponse } from "next/server";
+import { z } from "zod";
+import { db } from "@/lib/db";
+import { execFileSync } from "child_process";
+import { revalidatePath } from "next/cache";
+import { checkConflicts } from "@/lib/diff-parser";
+import { removeWorktree } from "@/lib/worktree";
+
+export async function POST(
+  _request: NextRequest,
+  { params }: { params: Promise<{ taskId: string }> }
+) {
+  const { taskId } = await params;
+
+  const parsed = z.string().cuid().safeParse(taskId);
+  if (!parsed.success) {
+    return NextResponse.json({ error: "Invalid task ID" }, { status: 400 });
+  }
+
+  try {
+    const task = await db.task.findUnique({
+      where: { id: parsed.data },
+      include: { project: true },
+    });
+
+    if (!task) {
+      return NextResponse.json({ error: "Task not found" }, { status: 404 });
+    }
+    if (task.status !== "IN_REVIEW") {
+      return NextResponse.json(
+        { error: "Task must be in IN_REVIEW status to merge" },
+        { status: 400 }
+      );
+    }
+    if (!task.baseBranch) {
+      return NextResponse.json(
+        { error: "Task has no base branch configured" },
+        { status: 400 }
+      );
+    }
+    if (!task.project?.localPath) {
+      return NextResponse.json(
+        { error: "Project has no local path" },
+        { status: 400 }
+      );
+    }
+
+    const latestExecution = await db.taskExecution.findFirst({
+      where: { taskId: parsed.data, status: "COMPLETED" },
+      orderBy: { createdAt: "desc" },
+    });
+
+    const worktreeBranch = latestExecution?.worktreeBranch ?? `task/${taskId}`;
+    const worktreePath = latestExecution?.worktreePath;
+    const localPath = task.project.localPath;
+
+    // Pre-merge conflict check
+    const { hasConflicts, conflictFiles } = checkConflicts(
+      localPath,
+      task.baseBranch,
+      worktreeBranch
+    );
+
+    if (hasConflicts) {
+      return NextResponse.json(
+        { error: "Merge conflicts detected", conflictFiles },
+        { status: 409 }
+      );
+    }
+
+    const gitOpts = { encoding: "utf-8" as const, timeout: 30000 };
+
+    // Record the branch tip BEFORE merge — used for accurate post-merge diff
+    let branchTipCommit: string | undefined;
+    try {
+      branchTipCommit = execFileSync(
+        "git", ["rev-parse", worktreeBranch],
+        { ...gitOpts, cwd: localPath }
+      ).trim();
+    } catch {
+      // Best effort — diff will fallback gracefully
+    }
+
+    // Normal merge: checkout baseBranch, merge task branch
+    // Preserves full commit history from the task branch
+
+    // 1. Stash any uncommitted changes in main repo (safety)
+    // Filter out untracked files (??) — git stash push doesn't handle them without -u
+    const mainStatus = execFileSync(
+      "git", ["status", "--porcelain"],
+      { ...gitOpts, cwd: localPath }
+    ).trim();
+    const hadStash = mainStatus.split("\n").some(
+      (line) => line.trim() !== "" && !line.startsWith("??")
+    );
+    if (hadStash) {
+      execFileSync("git", ["stash", "push", "-m", "tower-merge-temp"], { ...gitOpts, cwd: localPath });
+    }
+
+    let commitHash: string;
+    try {
+      // 2. Checkout baseBranch in main repo
+      execFileSync("git", ["checkout", task.baseBranch], { ...gitOpts, cwd: localPath });
+
+      // 3. Merge the task branch (normal merge, preserves commit history)
+      execFileSync("git", ["merge", worktreeBranch, "--no-edit"], { ...gitOpts, cwd: localPath });
+
+      // 4. Get the merge commit hash
+      commitHash = execFileSync(
+        "git", ["rev-parse", "--short", "HEAD"],
+        { ...gitOpts, cwd: localPath }
+      ).trim();
+    } finally {
+      // Restore stash if we had one
+      if (hadStash) {
+        execFileSync("git", ["stash", "pop"], { ...gitOpts, cwd: localPath }).toString();
+      }
+    }
+
+    // Record mergeCommit and branchTipCommit on the execution
+    if (latestExecution && commitHash) {
+      try {
+        await db.taskExecution.update({
+          where: { id: latestExecution.id },
+          data: {
+            mergeCommit: commitHash,
+            ...(branchTipCommit ? { branchTipCommit } : {}),
+          },
+        });
+      } catch {
+        // Best effort — diff will fallback gracefully
+      }
+    }
+
+    // Update status to DONE
+    await db.task.update({
+      where: { id: parsed.data },
+      data: { status: "DONE" },
+    });
+
+    // Best-effort worktree cleanup
+    try {
+      await removeWorktree(localPath, taskId);
+    } catch (error) {
+      console.error("[merge] Worktree cleanup failed:", error);
+    }
+
+    revalidatePath("/workspaces");
+
+    return NextResponse.json({ success: true, message: "Squash merge completed" });
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.error("[merge] Merge failed:", message);
+    return NextResponse.json(
+      { error: `Merge failed: ${message}` },
+      { status: 500 }
+    );
+  }
+}

package/src/app/globals.css

@@ -0,0 +1,247 @@
+@import "tailwindcss";
+@import "tw-animate-css";
+@import "shadcn/tailwind.css";
+@plugin "@tailwindcss/typography";
+
+@custom-variant dark (&:where(.dark, .dark *));
+
+@layer base {
+  button:not(:disabled),
+  [role="button"]:not(:disabled) {
+    cursor: pointer;
+  }
+}
+
+@theme inline {
+  --color-background: var(--background);
+  --color-foreground: var(--foreground);
+  --font-sans: 'DM Sans', var(--font-geist-sans), system-ui, sans-serif;
+  --font-mono: 'JetBrains Mono', var(--font-geist-mono), monospace;
+  --font-heading: 'DM Sans', var(--font-sans);
+  --color-sidebar-ring: var(--sidebar-ring);
+  --color-sidebar-border: var(--sidebar-border);
+  --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
+  --color-sidebar-accent: var(--sidebar-accent);
+  --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
+  --color-sidebar-primary: var(--sidebar-primary);
+  --color-sidebar-foreground: var(--sidebar-foreground);
+  --color-sidebar: var(--sidebar);
+  --color-chart-5: var(--chart-5);
+  --color-chart-4: var(--chart-4);
+  --color-chart-3: var(--chart-3);
+  --color-chart-2: var(--chart-2);
+  --color-chart-1: var(--chart-1);
+  --color-ring: var(--ring);
+  --color-input: var(--input);
+  --color-border: var(--border);
+  --color-destructive: var(--destructive);
+  --color-accent-foreground: var(--accent-foreground);
+  --color-accent: var(--accent);
+  --color-muted-foreground: var(--muted-foreground);
+  --color-muted: var(--muted);
+  --color-secondary-foreground: var(--secondary-foreground);
+  --color-secondary: var(--secondary);
+  --color-primary-foreground: var(--primary-foreground);
+  --color-primary: var(--primary);
+  --color-popover-foreground: var(--popover-foreground);
+  --color-popover: var(--popover);
+  --color-card-foreground: var(--card-foreground);
+  --color-card: var(--card);
+  --radius-sm: calc(var(--radius) * 0.6);
+  --radius-md: calc(var(--radius) * 0.8);
+  --radius-lg: var(--radius);
+  --radius-xl: calc(var(--radius) * 1.4);
+  --radius-2xl: calc(var(--radius) * 1.8);
+  --radius-3xl: calc(var(--radius) * 2.2);
+  --radius-4xl: calc(var(--radius) * 2.6);
+
+  /* ─── Header Height Tokens ───
+   * Standardized header/toolbar heights for visual alignment.
+   * Rule: panels on the same horizontal line MUST use the same level.
+   *
+   * Level 1 (xs): Inner sub-tabs (Files/Search/Git)
+   * Level 2 (sm): Action bars, simple toolbars
+   * Level 3 (md): Main tab bars (Files/Changes/Preview), page nav
+   * Level 4 (lg): Page headers (title + status, two lines)
+   * Level 5 (xl): Page headers with actions (title + status + buttons)
+   */
+  --header-xs: 36px;
+  --header-sm: 44px;
+  --header-md: 56px;
+  --header-lg: 72px;
+  --header-xl: 88px;
+}
+
+/* ─── Header Height Utilities ───
+ * Usage: class="header-md" sets min-height + padding + border-b.
+ * Use min-h-header-* for min-height only (e.g. min-h-header-md).
+ */
+@utility header-xs {
+  min-height: var(--header-xs);
+  border-bottom: 1px solid var(--border);
+}
+@utility header-sm {
+  min-height: var(--header-sm);
+  border-bottom: 1px solid var(--border);
+}
+@utility header-md {
+  min-height: var(--header-md);
+  border-bottom: 1px solid var(--border);
+}
+@utility header-lg {
+  min-height: var(--header-lg);
+  border-bottom: 1px solid var(--border);
+}
+@utility header-xl {
+  min-height: var(--header-xl);
+  border-bottom: 1px solid var(--border);
+}
+
+/* ─── shadcn Default Light ─── */
+:root {
+  --radius: 0.625rem;
+  --background: oklch(1 0 0);
+  --foreground: oklch(0.145 0 0);
+  --card: oklch(1 0 0);
+  --card-foreground: oklch(0.145 0 0);
+  --popover: oklch(1 0 0);
+  --popover-foreground: oklch(0.145 0 0);
+  --primary: oklch(0.205 0 0);
+  --primary-foreground: oklch(0.985 0 0);
+  --secondary: oklch(0.97 0 0);
+  --secondary-foreground: oklch(0.205 0 0);
+  --muted: oklch(0.97 0 0);
+  --muted-foreground: oklch(0.556 0 0);
+  --accent: oklch(0.97 0 0);
+  --accent-foreground: oklch(0.205 0 0);
+  --destructive: oklch(0.577 0.245 27.325);
+  --border: oklch(0.922 0 0);
+  --input: oklch(0.922 0 0);
+  --ring: oklch(0.708 0 0);
+  --chart-1: oklch(0.646 0.222 41.116);
+  --chart-2: oklch(0.6 0.118 184.704);
+  --chart-3: oklch(0.398 0.07 227.392);
+  --chart-4: oklch(0.828 0.189 84.429);
+  --chart-5: oklch(0.769 0.188 70.08);
+  --sidebar: oklch(0.985 0 0);
+  --sidebar-foreground: oklch(0.145 0 0);
+  --sidebar-primary: oklch(0.205 0 0);
+  --sidebar-primary-foreground: oklch(0.985 0 0);
+  --sidebar-accent: oklch(0.97 0 0);
+  --sidebar-accent-foreground: oklch(0.205 0 0);
+  --sidebar-border: oklch(0.922 0 0);
+  --sidebar-ring: oklch(0.708 0 0);
+}
+
+/* ─── shadcn Default Dark ─── */
+.dark {
+  --background: oklch(0.145 0 0);
+  --foreground: oklch(0.985 0 0);
+  --card: oklch(0.205 0 0);
+  --card-foreground: oklch(0.985 0 0);
+  --popover: oklch(0.205 0 0);
+  --popover-foreground: oklch(0.985 0 0);
+  --primary: oklch(0.922 0 0);
+  --primary-foreground: oklch(0.205 0 0);
+  --secondary: oklch(0.269 0 0);
+  --secondary-foreground: oklch(0.985 0 0);
+  --muted: oklch(0.269 0 0);
+  --muted-foreground: oklch(0.708 0 0);
+  --accent: oklch(0.269 0 0);
+  --accent-foreground: oklch(0.985 0 0);
+  --destructive: oklch(0.704 0.191 22.216);
+  --border: oklch(1 0 0 / 10%);
+  --input: oklch(1 0 0 / 15%);
+  --ring: oklch(0.556 0 0);
+  --chart-1: oklch(0.488 0.243 264.376);
+  --chart-2: oklch(0.696 0.17 162.48);
+  --chart-3: oklch(0.769 0.188 70.08);
+  --chart-4: oklch(0.627 0.265 303.9);
+  --chart-5: oklch(0.645 0.246 16.439);
+  --sidebar: oklch(0.145 0 0);
+  --sidebar-foreground: oklch(0.985 0 0);
+  --sidebar-primary: oklch(0.488 0.243 264.376);
+  --sidebar-primary-foreground: oklch(0.985 0 0);
+  --sidebar-accent: oklch(0.269 0 0);
+  --sidebar-accent-foreground: oklch(0.985 0 0);
+  --sidebar-border: oklch(1 0 0 / 10%);
+  --sidebar-ring: oklch(0.556 0 0);
+}
+
+@layer base {
+  * {
+    @apply border-border outline-ring/50;
+  }
+  body {
+    @apply bg-background text-foreground;
+  }
+  html {
+    @apply font-sans;
+  }
+}
+
+/* ─── Custom scrollbar ─── */
+::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+::-webkit-scrollbar-track {
+  background: transparent;
+}
+::-webkit-scrollbar-thumb {
+  background: oklch(0.30 0.005 260);
+  border-radius: 3px;
+}
+::-webkit-scrollbar-thumb:hover {
+  background: oklch(0.40 0.005 260);
+}
+
+/* ─── Glow utility ─── */
+.glow-primary {
+  box-shadow: 0 0 20px oklch(0.5 0 0 / 0.15), 0 0 60px oklch(0.5 0 0 / 0.05);
+}
+.glow-primary-sm {
+  box-shadow: 0 0 10px oklch(0.5 0 0 / 0.1);
+}
+
+/* ─── Onboarding ambient animations ─── */
+@keyframes ob-pulse {
+  0%, 100% { transform: translate(-50%, -50%) scale(1); opacity: 1; }
+  50% { transform: translate(-50%, -50%) scale(1.08); opacity: 0.7; }
+}
+@keyframes ob-spin {
+  from { transform: translate(-50%, -50%) rotate(0deg); }
+  to { transform: translate(-50%, -50%) rotate(360deg); }
+}
+@keyframes ob-float {
+  0%, 100% { transform: translateY(0); }
+  50% { transform: translateY(-12px); }
+}
+@keyframes ob-dash {
+  from { stroke-dashoffset: 0; }
+  to { stroke-dashoffset: 100; }
+}
+
+/* ─── Noise texture overlay ─── */
+.noise::before {
+  content: "";
+  position: absolute;
+  inset: 0;
+  opacity: 0.03;
+  background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 256 256' xmlns='http://www.w3.org/2000/svg'%3E%3Cfilter id='noise'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='0.9' numOctaves='4' stitchTiles='stitch'/%3E%3C/filter%3E%3Crect width='100%25' height='100%25' filter='url(%23noise)'/%3E%3C/svg%3E");
+  pointer-events: none;
+  z-index: 0;
+}
+
+/* ── View Transition: theme toggle circle-expand animation ── */
+::view-transition-old(root),
+::view-transition-new(root) {
+  animation: none;
+  mix-blend-mode: normal;
+}
+::view-transition-old(root) {
+  z-index: 1;
+}
+::view-transition-new(root) {
+  z-index: 9999;
+}

package/src/app/layout.tsx

@@ -0,0 +1,63 @@
+import type { Metadata } from "next";
+import { Geist, Geist_Mono } from "next/font/google";
+import { TooltipProvider } from "@/components/ui/tooltip";
+import { LayoutClient } from "@/components/layout/layout-client";
+import { I18nProvider } from "@/lib/i18n";
+import { ThemeProvider } from "@/components/providers/theme-provider";
+import { Toaster } from "@/components/ui/sonner";
+import { db } from "@/lib/db";
+import { getOnboardingStatus } from "@/actions/onboarding-actions";
+import "./globals.css";
+
+const geistSans = Geist({
+  variable: "--font-geist-sans",
+  subsets: ["latin"],
+});
+
+const geistMono = Geist_Mono({
+  variable: "--font-geist-mono",
+  subsets: ["latin"],
+});
+
+export const metadata: Metadata = {
+  title: "AI Task Platform - Tower",
+  description: "AI task orchestration and multi-project management platform",
+};
+
+export default async function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  const [workspaces, onboardingStatus] = await Promise.all([
+    db.workspace.findMany({
+      orderBy: { updatedAt: "desc" },
+      select: { id: true, name: true, description: true, updatedAt: true },
+    }),
+    getOnboardingStatus(),
+  ]);
+
+  return (
+    <html lang="zh-CN" suppressHydrationWarning>
+      <head>
+        <link rel="preconnect" href="https://fonts.googleapis.com" />
+        <link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="anonymous" />
+        <link href="https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,300..700;1,9..40,300..700&family=JetBrains+Mono:wght@400;500;600&display=swap" rel="stylesheet" />
+      </head>
+      <body
+        className={`${geistSans.variable} ${geistMono.variable} antialiased`}
+      >
+        <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
+          <TooltipProvider>
+            <I18nProvider>
+              <LayoutClient workspaces={workspaces} isFirstRun={onboardingStatus.isFirstRun} username={onboardingStatus.username}>
+                {children}
+              </LayoutClient>
+              <Toaster richColors position="top-right" />
+            </I18nProvider>
+          </TooltipProvider>
+        </ThemeProvider>
+      </body>
+    </html>
+  );
+}