Merge branch 'main' into feat/diff-context-expand

Author: jonathanlab

.github/workflows/code-release.yml

@@ -124,12 +124,6 @@ jobs:
           GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
         run: pnpm --filter code run publish
 
-      - name: Publish GitHub release
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-          APP_VERSION: ${{ steps.version.outputs.version }}
-        run: gh release edit "v$APP_VERSION" --repo PostHog/code --draft=false
-
   publish-windows:
     runs-on: windows-latest
     permissions:
@@ -202,3 +196,28 @@ jobs:
           APP_VERSION: ${{ steps.version.outputs.version }}
           GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
         run: pnpm --filter code run publish
+
+  finalize-release:
+    needs: [publish-macos, publish-windows]
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Get app token
+        id: app-token
+        uses: getsentry/action-github-app-token@d4b5da6c5e37703f8c3b3e43abb5705b46e159cc # v3
+        with:
+          app_id: ${{ secrets.GH_APP_ARRAY_RELEASER_APP_ID }}
+          private_key: ${{ secrets.GH_APP_ARRAY_RELEASER_PRIVATE_KEY }}
+
+      - name: Extract version from tag
+        id: version
+        run: |
+          TAG_VERSION="${GITHUB_REF#refs/tags/v}"
+          echo "version=$TAG_VERSION" >> "$GITHUB_OUTPUT"
+
+      - name: Publish GitHub release
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          APP_VERSION: ${{ steps.version.outputs.version }}
+        run: gh release edit "v$APP_VERSION" --repo PostHog/code --draft=false

apps/code/package.json

@@ -123,7 +123,7 @@
     "@opentelemetry/resources": "^2.5.0",
     "@opentelemetry/sdk-logs": "^0.208.0",
     "@opentelemetry/semantic-conventions": "^1.39.0",
-    "@parcel/watcher": "^2.5.1",
+    "@parcel/watcher": "^2.5.6",
     "@phosphor-icons/react": "^2.1.10",
     "@posthog/agent": "workspace:*",
     "@posthog/electron-trpc": "workspace:*",

apps/code/src/main/services/file-watcher/service.ts

@@ -2,7 +2,6 @@ import { existsSync } from "node:fs";
 import fs from "node:fs/promises";
 import path from "node:path";
 import * as watcher from "@parcel/watcher";
-import { app } from "electron";
 import { inject, injectable } from "inversify";
 import { MAIN_TOKENS } from "../../di/tokens";
 import { logger } from "../../utils/logger";
@@ -70,9 +69,6 @@ export class FileWatcherService extends TypedEventEmitter<FileWatcherEvents> {
   async startWatching(repoPath: string): Promise<void> {
     if (this.watchers.has(repoPath)) return;
 
-    await fs.mkdir(this.snapshotsDir, { recursive: true });
-    await this.emitChangesSinceSnapshot(repoPath);
-
     const pending: PendingChanges = {
       dirs: new Set(),
       files: new Set(),
@@ -107,53 +103,13 @@ export class FileWatcherService extends TypedEventEmitter<FileWatcherEvents> {
     if (!w) return;
 
     if (w.pending.timer) clearTimeout(w.pending.timer);
-    await this.saveSnapshot(repoPath);
     await this.watcherRegistry.unregister(w.filesId);
     for (const gitId of w.gitIds) {
       await this.watcherRegistry.unregister(gitId);
     }
     this.watchers.delete(repoPath);
   }
 
-  private get snapshotsDir(): string {
-    return path.join(app.getPath("userData"), "snapshots");
-  }
-
-  private snapshotPath(repoPath: string): string {
-    return path.join(
-      this.snapshotsDir,
-      `${Buffer.from(repoPath).toString("base64url")}.snapshot`,
-    );
-  }
-
-  private async saveSnapshot(repoPath: string): Promise<void> {
-    try {
-      await watcher.writeSnapshot(repoPath, this.snapshotPath(repoPath), {
-        ignore: IGNORE_PATTERNS,
-      });
-    } catch (error) {
-      log.error("Failed to write snapshot:", error);
-    }
-  }
-
-  private async emitChangesSinceSnapshot(repoPath: string): Promise<void> {
-    const snapshotPath = this.snapshotPath(repoPath);
-    try {
-      await fs.access(snapshotPath);
-    } catch {
-      return;
-    }
-
-    const events = await watcher.getEventsSince(repoPath, snapshotPath, {
-      ignore: IGNORE_PATTERNS,
-    });
-
-    const affectedDirs = new Set(events.map((e) => path.dirname(e.path)));
-    for (const dirPath of affectedDirs) {
-      this.emit(FileWatcherEvent.DirectoryChanged, { repoPath, dirPath });
-    }
-  }
-
   private async watchFiles(
     repoPath: string,
     pending: PendingChanges,

apps/code/src/main/services/git/service.ts

@@ -766,10 +766,10 @@ export class GitService extends TypedEventEmitter<GitServiceEvents> {
         ".default_branch",
       ]);
 
-      const defaultBranch =
-        repoResult.exitCode === 0 && repoResult.stdout.trim()
-          ? repoResult.stdout.trim()
-          : "main";
+      if (repoResult.exitCode !== 0 || !repoResult.stdout.trim()) {
+        return [];
+      }
+      const defaultBranch = repoResult.stdout.trim();
 
       const result = await execGh([
         "api",

apps/code/src/main/services/workspace/service.ts

@@ -446,8 +446,8 @@ export class WorkspaceService extends TypedEventEmitter<WorkspaceServiceEvents>
     let worktree: WorktreeInfo;
 
     try {
-      const defaultBranch = await getDefaultBranch(mainRepoPath).catch(
-        () => "main",
+      const defaultBranch = await getDefaultBranch(mainRepoPath).catch(() =>
+        getCurrentBranch(mainRepoPath).then((b) => b ?? "main"),
       );
       const selectedBranch = branch ?? defaultBranch;
       const isTrunkSelected = selectedBranch === defaultBranch;

apps/code/src/renderer/api/posthogClient.ts

@@ -1,4 +1,6 @@
 import type {
+  SandboxEnvironment,
+  SandboxEnvironmentInput,
   SignalReportArtefact,
   SignalReportArtefactsResponse,
   SignalReportSignalsResponse,
@@ -504,6 +506,7 @@ export class PostHogAPIClient {
     taskId: string,
     branch?: string | null,
     resumeOptions?: { resumeFromRunId: string; pendingUserMessage: string },
+    sandboxEnvironmentId?: string,
   ): Promise<Task> {
     const teamId = await this.getTeamId();
     const body: Record<string, unknown> = { mode: "interactive" };
@@ -514,6 +517,9 @@ export class PostHogAPIClient {
       body.resume_from_run_id = resumeOptions.resumeFromRunId;
       body.pending_user_message = resumeOptions.pendingUserMessage;
     }
+    if (sandboxEnvironmentId) {
+      body.sandbox_environment_id = sandboxEnvironmentId;
+    }
 
     const data = await this.api.post(
       `/api/projects/{project_id}/tasks/{id}/run/`,
@@ -1164,4 +1170,89 @@ export class PostHogAPIClient {
       return false;
     }
   }
+
+  // Sandbox Environments
+
+  async listSandboxEnvironments(): Promise<SandboxEnvironment[]> {
+    const teamId = await this.getTeamId();
+    const url = new URL(
+      `${this.api.baseUrl}/api/projects/${teamId}/sandbox_environments/`,
+    );
+    const response = await this.api.fetcher.fetch({
+      method: "get",
+      url,
+      path: `/api/projects/${teamId}/sandbox_environments/`,
+    });
+    if (!response.ok) {
+      throw new Error(
+        `Failed to fetch sandbox environments: ${response.statusText}`,
+      );
+    }
+    const data = await response.json();
+    return (data.results ?? data) as SandboxEnvironment[];
+  }
+
+  async createSandboxEnvironment(
+    input: SandboxEnvironmentInput,
+  ): Promise<SandboxEnvironment> {
+    const teamId = await this.getTeamId();
+    const url = new URL(
+      `${this.api.baseUrl}/api/projects/${teamId}/sandbox_environments/`,
+    );
+    const response = await this.api.fetcher.fetch({
+      method: "post",
+      url,
+      path: `/api/projects/${teamId}/sandbox_environments/`,
+      overrides: {
+        body: JSON.stringify(input),
+      },
+    });
+    if (!response.ok) {
+      throw new Error(
+        `Failed to create sandbox environment: ${response.statusText}`,
+      );
+    }
+    return (await response.json()) as SandboxEnvironment;
+  }
+
+  async updateSandboxEnvironment(
+    id: string,
+    input: Partial<SandboxEnvironmentInput>,
+  ): Promise<SandboxEnvironment> {
+    const teamId = await this.getTeamId();
+    const url = new URL(
+      `${this.api.baseUrl}/api/projects/${teamId}/sandbox_environments/${id}/`,
+    );
+    const response = await this.api.fetcher.fetch({
+      method: "patch",
+      url,
+      path: `/api/projects/${teamId}/sandbox_environments/${id}/`,
+      overrides: {
+        body: JSON.stringify(input),
+      },
+    });
+    if (!response.ok) {
+      throw new Error(
+        `Failed to update sandbox environment: ${response.statusText}`,
+      );
+    }
+    return (await response.json()) as SandboxEnvironment;
+  }
+
+  async deleteSandboxEnvironment(id: string): Promise<void> {
+    const teamId = await this.getTeamId();
+    const url = new URL(
+      `${this.api.baseUrl}/api/projects/${teamId}/sandbox_environments/${id}/`,
+    );
+    const response = await this.api.fetcher.fetch({
+      method: "delete",
+      url,
+      path: `/api/projects/${teamId}/sandbox_environments/${id}/`,
+    });
+    if (!response.ok) {
+      throw new Error(
+        `Failed to delete sandbox environment: ${response.statusText}`,
+      );
+    }
+  }
 }

apps/code/src/renderer/components/permissions/PlanContent.tsx

@@ -1,14 +1,43 @@
 import { Box } from "@radix-ui/themes";
+import { useEffect, useRef } from "react";
 import ReactMarkdown from "react-markdown";
 import remarkGfm from "remark-gfm";
 
+const planScrollPosition = new Map<string, number>();
+
 interface PlanContentProps {
+  id: string;
   plan: string;
 }
 
-export function PlanContent({ plan }: PlanContentProps) {
+export function PlanContent({ id, plan }: PlanContentProps) {
+  const scrollRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    const el = scrollRef.current;
+    if (!el) return;
+
+    const position = planScrollPosition.get(id);
+    if (position !== undefined) {
+      el.scrollTop = position;
+    }
+
+    const handleScroll = () => {
+      planScrollPosition.set(id, el.scrollTop);
+    };
+
+    el.addEventListener("scroll", handleScroll, { passive: true });
+
+    return () => {
+      el.removeEventListener("scroll", handleScroll);
+    };
+  }, [id]);
+
   return (
-    <Box className="max-h-[50vh] max-w-[750px] overflow-y-auto rounded-lg border-2 border-blue-6 bg-blue-2 p-4">
+    <Box
+      ref={scrollRef}
+      className="max-h-[50vh] max-w-[750px] overflow-y-auto rounded-lg border-2 border-blue-6 bg-blue-2 p-4"
+    >
       <Box className="plan-markdown text-blue-12">
         <ReactMarkdown remarkPlugins={[remarkGfm]}>{plan}</ReactMarkdown>
       </Box>

apps/code/src/renderer/features/command-center/components/CommandCenterGrid.tsx

@@ -60,6 +60,8 @@ function GridCell({
 
   const handleCellClick = useCallback(() => {
     setActiveTask(cell.taskId);
+    const selection = window.getSelection();
+    if (selection && !selection.isCollapsed) return;
     const actionSelector =
       cellRef.current?.querySelector<HTMLElement>("[tabindex='0']");
     actionSelector?.focus();
@@ -101,9 +103,7 @@ function GridCell({
     // biome-ignore lint/a11y/useKeyWithClickEvents lint/a11y/noStaticElementInteractions: click delegates focus to ActionSelector within
     <div
       ref={cellRef}
-      className={`relative overflow-hidden bg-gray-1 focus-within:ring-2 focus-within:ring-accent-9 focus-within:ring-inset ${
-        isActive ? "ring-2 ring-accent-9 ring-inset" : ""
-      }`}
+      className="relative overflow-hidden bg-gray-1"
       onClick={handleCellClick}
       onPointerDownCapture={handleCellPointerDownCapture}
       onFocusCapture={handleCellFocusCapture}
@@ -116,6 +116,9 @@ function GridCell({
       >
         <CommandCenterPanel cell={cell} isActiveSession={isActive} />
       </div>
+      {isActive && (
+        <div className="pointer-events-none absolute inset-0 border-2 border-accent-9" />
+      )}
       {isDragActive && (
         // biome-ignore lint/a11y/noStaticElementInteractions: transparent overlay to capture drag events over session content
         <div