Simplify worktree adoption after review

- Validation in createTask now accepts content OR taskDescription
  instead of enumerating per-flow flags; the worktreeAdoption input
  flag existed only to gate that check, so it's gone
- listAdoptableWorktrees builds occupied-path and registered-folder
  sets in one pass instead of re-querying workspace tables per
  worktree candidate
- SidebarSection reuses the INDENT_SIZE constant from SidebarItem
  instead of a third copy of the indent unit

Generated-By: PostHog Code
Task-Id: 24032eac-82cc-4c5f-a7e9-30ed9278a6e1

Author: haacked

packages/core/src/task-detail/taskInput.test.ts

@@ -42,7 +42,6 @@ describe("buildWorktreeAdoptionInput", () => {
       workspaceMode: "worktree",
       branch: "feature/orphan",
       reuseExistingWorktree: true,
-      worktreeAdoption: true,
     });
     // No content: the saga must not build an initial prompt, so the agent
     // session starts idle in the adopted worktree.

packages/core/src/task-detail/taskInput.ts

@@ -98,7 +98,6 @@ export function buildWorktreeAdoptionInput(options: {
     workspaceMode: "worktree",
     branch: options.branch,
     reuseExistingWorktree: true,
-    worktreeAdoption: true,
   };
 }
 

packages/core/src/task-detail/taskService.test.ts

@@ -49,9 +49,9 @@ function makeService(): TaskService {
 }
 
 describe("TaskService.createTask validation", () => {
-  it("rejects a promptless input without the adoption or import markers", async () => {
+  it("rejects an input with neither content nor a taskDescription", async () => {
     const result = await makeService().createTask({
-      taskDescription: "feature/orphan",
+      content: "   ",
       repoPath: "/repo",
       workspaceMode: "worktree",
     });

packages/core/src/task-detail/taskService.ts

@@ -61,14 +61,11 @@ export class TaskService {
       hasRepo: !!input.repository,
     });
 
-    // Imported Claude Code sessions carry a transcript, not a typed prompt, so
-    // they supply a taskDescription instead of content. Worktree-adoption tasks
-    // have no prompt either — the user types their first message in the opened
-    // chat — so they too rely on a synthesized taskDescription.
+    // Promptless flows (imported Claude Code sessions, worktree adoption)
+    // synthesize a taskDescription instead of typed content; either one names
+    // the task, so either satisfies validation.
     const hasDescription =
-      !!input.content?.trim() ||
-      ((!!input.importedClaudeSession || !!input.worktreeAdoption) &&
-        !!input.taskDescription?.trim());
+      !!input.content?.trim() || !!input.taskDescription?.trim();
     if (!hasDescription) {
       return {
         success: false,

packages/shared/src/task-creation-domain.ts

@@ -31,13 +31,6 @@ export interface TaskCreationInput {
   // When a worktree is already checked out on the branch, opt in to reusing it
   // for this task instead of creating a new one (set after the user confirms).
   reuseExistingWorktree?: boolean;
-  /**
-   * Start-from-worktree flow: the task is created around an existing task-less
-   * worktree with no typed prompt — the synthesized taskDescription (the branch
-   * name) names the task and the agent session starts idle. Callers pair this
-   * with reuseExistingWorktree and branch.
-   */
-  worktreeAdoption?: boolean;
   githubIntegrationId?: number;
   githubUserIntegrationId?: string;
   executionMode?: ExecutionMode;

packages/ui/src/features/sidebar/components/SidebarItem.tsx

@@ -9,7 +9,7 @@ import {
 import type { SidebarItemAction } from "@posthog/ui/features/sidebar/types";
 import { useCallback } from "react";
 
-const INDENT_SIZE = 8;
+export const INDENT_SIZE = 8;
 
 interface SidebarItemProps {
   depth: number;

packages/ui/src/features/sidebar/components/SidebarSection.tsx

@@ -1,5 +1,6 @@
 import { CaretDownIcon, CaretRightIcon, Plus } from "@phosphor-icons/react";
 import { Button } from "@posthog/quill";
+import { INDENT_SIZE } from "@posthog/ui/features/sidebar/components/SidebarItem";
 import { Tooltip } from "@posthog/ui/primitives/Tooltip";
 import * as Collapsible from "@radix-ui/react-collapsible";
 import { useState } from "react";
@@ -46,7 +47,7 @@ export function SidebarSection({
           className="flex w-full items-center justify-between pl-2 not-hover:aria-expanded:bg-transparent"
           style={{
             marginTop: addSpacingBefore ? "12px" : undefined,
-            paddingLeft: depth ? `${depth * 8 + 8}px` : undefined,
+            paddingLeft: depth ? `${depth * INDENT_SIZE + 8}px` : undefined,
           }}
           onContextMenu={onContextMenu}
           onMouseEnter={() => setIsHovered(true)}

packages/workspace-server/src/services/workspace/workspace.ts

@@ -1487,13 +1487,24 @@ export class WorkspaceService extends TypedEventEmitter<WorkspaceServiceEvents>
       this.getLocalWorktreePathIfExists(mainRepoPath),
     ]);
 
+    // One pass over associations and registered folders up front; per-candidate
+    // lookups would re-query the workspace tables once per worktree.
+    const occupiedPaths = new Set(
+      this.getAllTaskAssociations().flatMap((assoc) =>
+        assoc.mode === "worktree" ? [assoc.path] : [],
+      ),
+    );
+    const registeredFolderPaths = new Set(
+      this.repositoryRepo.findAll().map((repo) => repo.path),
+    );
+
     return linkedWorktrees
       .filter(
         (wt) =>
           wt.branch !== null &&
           wt.worktreePath !== localStashPath &&
-          !this.repositoryRepo.findByPath(wt.worktreePath) &&
-          this.getWorktreeTasks(wt.worktreePath).length === 0,
+          !registeredFolderPaths.has(wt.worktreePath) &&
+          !occupiedPaths.has(wt.worktreePath),
       )
       .map((wt) => ({
         worktreePath: wt.worktreePath,