Merge branch 'main' into feat/default-thinking-level-setting

Author: maskdotdev

KEYBINDINGS.md

@@ -51,7 +51,7 @@ Invalid rules are ignored. Invalid config files are ignored. Warnings are logged
 - `terminal.new`: create new terminal (in focused terminal context by default)
 - `terminal.close`: close/kill the focused terminal (in focused terminal context by default)
 - `chat.new`: create a new chat thread preserving the active thread's branch/worktree state
-- `chat.newLocal`: create a new local chat thread for the active project (no worktree context)
+- `chat.newLocal`: create a new chat thread for the active project in a new environment (local/worktree determined by app settings (default `local`))
 - `editor.openFavorite`: open current project/worktree in the last-used editor
 - `script.{id}.run`: run a project script by id (for example `script.test.run`)
 

apps/marketing/package.json

@@ -10,10 +10,10 @@
     "typecheck": "astro check"
   },
   "dependencies": {
-    "astro": "^5.7.13"
+    "astro": "^6.0.4"
   },
   "devDependencies": {
-    "@astrojs/check": "^0.9.4",
+    "@astrojs/check": "^0.9.7",
     "typescript": "catalog:"
   }
 }

apps/web/src/appSettings.ts

@@ -33,6 +33,9 @@ const AppSettingsSchema = Schema.Struct({
   codexHomePath: Schema.String.check(Schema.isMaxLength(4096)).pipe(
     Schema.withConstructorDefault(() => Option.some("")),
   ),
+  defaultThreadEnvMode: Schema.Literals(["local", "worktree"]).pipe(
+    Schema.withConstructorDefault(() => Option.some("local")),
+  ),
   confirmThreadDelete: Schema.Boolean.pipe(Schema.withConstructorDefault(() => Option.some(true))),
   enableAssistantStreaming: Schema.Boolean.pipe(
     Schema.withConstructorDefault(() => Option.some(false)),

apps/web/src/components/ChatView.tsx

@@ -175,6 +175,17 @@ const COMPOSER_PATH_QUERY_DEBOUNCE_MS = 120;
 const SCRIPT_TERMINAL_COLS = 120;
 const SCRIPT_TERMINAL_ROWS = 30;
 
+const extendReplacementRangeForTrailingSpace = (
+  text: string,
+  rangeEnd: number,
+  replacement: string,
+): number => {
+  if (!replacement.endsWith(" ")) {
+    return rangeEnd;
+  }
+  return text[rangeEnd] === " " ? rangeEnd + 1 : rangeEnd;
+};
+
 interface ChatViewProps {
   threadId: ThreadId;
 }
@@ -3017,17 +3028,6 @@ export default function ChatView({ threadId }: ChatViewProps) {
     };
   }, [composerCursor]);
 
-  const extendReplacementRangeForTrailingSpace = (
-    text: string,
-    rangeEnd: number,
-    replacement: string,
-  ): number => {
-    if (!replacement.endsWith(" ")) {
-      return rangeEnd;
-    }
-    return text[rangeEnd] === " " ? rangeEnd + 1 : rangeEnd;
-  };
-
   const resolveActiveComposerTrigger = useCallback((): {
     snapshot: { value: string; cursor: number; expandedCursor: number };
     trigger: ComposerTrigger | null;

apps/web/src/components/DiffPanel.tsx

@@ -19,14 +19,14 @@ import { cn } from "~/lib/utils";
 import { readNativeApi } from "../nativeApi";
 import { resolvePathLinkTarget } from "../terminal-links";
 import { parseDiffRouteSearch, stripDiffSearchParams } from "../diffRouteSearch";
-import { isElectron } from "../env";
 import { useTheme } from "../hooks/useTheme";
 import { buildPatchCacheKey } from "../lib/diffRendering";
 import { resolveDiffThemeName } from "../lib/diffRendering";
 import { useTurnDiffSummaries } from "../hooks/useTurnDiffSummaries";
 import { useStore } from "../store";
 import { useAppSettings } from "../appSettings";
 import { formatShortTimestamp } from "../timestampFormat";
+import { DiffPanelLoadingState, DiffPanelShell, type DiffPanelMode } from "./DiffPanelShell";
 import { ToggleGroup, Toggle } from "./ui/toggle-group";
 
 type DiffRenderMode = "stacked" | "split";
@@ -152,7 +152,7 @@ function buildFileDiffRenderKey(fileDiff: FileDiffMetadata): string {
 }
 
 interface DiffPanelProps {
-  mode?: "inline" | "sheet" | "sidebar";
+  mode?: DiffPanelMode;
 }
 
 export { DiffWorkerPoolProvider } from "./DiffWorkerPoolProvider";
@@ -398,7 +398,6 @@ export default function DiffPanel({ mode = "inline" }: DiffPanelProps) {
     selectedChip?.scrollIntoView({ block: "nearest", inline: "nearest", behavior: "smooth" });
   }, [selectedTurn?.turnId, selectedTurnId]);
 
-  const shouldUseDragRegion = isElectron && mode !== "sheet";
   const headerRow = (
     <>
       <div className="relative min-w-0 flex-1 [-webkit-app-region:no-drag]">
@@ -512,28 +511,9 @@ export default function DiffPanel({ mode = "inline" }: DiffPanelProps) {
       </ToggleGroup>
     </>
   );
-  const headerRowClassName = cn(
-    "flex items-center justify-between gap-2 px-4",
-    shouldUseDragRegion ? "drag-region h-[52px] border-b border-border" : "h-12",
-  );
 
   return (
-    <div
-      className={cn(
-        "flex h-full min-w-0 flex-col bg-background",
-        mode === "inline"
-          ? "w-[42vw] min-w-[360px] max-w-[560px] shrink-0 border-l border-border"
-          : "w-full",
-      )}
-    >
-      {shouldUseDragRegion ? (
-        <div className={headerRowClassName}>{headerRow}</div>
-      ) : (
-        <div className="border-b border-border">
-          <div className={headerRowClassName}>{headerRow}</div>
-        </div>
-      )}
-
+    <DiffPanelShell mode={mode} header={headerRow}>
       {!activeThread ? (
         <div className="flex flex-1 items-center justify-center px-5 text-center text-xs text-muted-foreground/70">
           Select a thread to inspect turn diffs.
@@ -558,15 +538,17 @@ export default function DiffPanel({ mode = "inline" }: DiffPanelProps) {
               </div>
             )}
             {!renderablePatch ? (
-              <div className="flex h-full items-center justify-center px-3 py-2 text-xs text-muted-foreground/70">
-                <p>
-                  {isLoadingCheckpointDiff
-                    ? "Loading checkpoint diff..."
-                    : hasNoNetChanges
+              isLoadingCheckpointDiff ? (
+                <DiffPanelLoadingState label="Loading checkpoint diff..." />
+              ) : (
+                <div className="flex h-full items-center justify-center px-3 py-2 text-xs text-muted-foreground/70">
+                  <p>
+                    {hasNoNetChanges
                       ? "No net changes in this selection."
                       : "No patch available for this selection."}
-                </p>
-              </div>
+                  </p>
+                </div>
+              )
             ) : renderablePatch.kind === "files" ? (
               <Virtualizer
                 className="diff-render-surface h-full min-h-0 overflow-auto px-2 pb-2"
@@ -622,6 +604,6 @@ export default function DiffPanel({ mode = "inline" }: DiffPanelProps) {
           </div>
         </>
       )}
-    </div>
+    </DiffPanelShell>
   );
 }

apps/web/src/components/DiffPanelShell.tsx

@@ -0,0 +1,92 @@
+import type { ReactNode } from "react";
+
+import { isElectron } from "~/env";
+import { cn } from "~/lib/utils";
+
+import { Skeleton } from "./ui/skeleton";
+
+export type DiffPanelMode = "inline" | "sheet" | "sidebar";
+
+function getDiffPanelHeaderRowClassName(mode: DiffPanelMode) {
+  const shouldUseDragRegion = isElectron && mode !== "sheet";
+  return cn(
+    "flex items-center justify-between gap-2 px-4",
+    shouldUseDragRegion ? "drag-region h-[52px] border-b border-border" : "h-12",
+  );
+}
+
+export function DiffPanelShell(props: {
+  mode: DiffPanelMode;
+  header: ReactNode;
+  children: ReactNode;
+}) {
+  const shouldUseDragRegion = isElectron && props.mode !== "sheet";
+
+  return (
+    <div
+      className={cn(
+        "flex h-full min-w-0 flex-col bg-background",
+        props.mode === "inline"
+          ? "w-[42vw] min-w-[360px] max-w-[560px] shrink-0 border-l border-border"
+          : "w-full",
+      )}
+    >
+      {shouldUseDragRegion ? (
+        <div className={getDiffPanelHeaderRowClassName(props.mode)}>{props.header}</div>
+      ) : (
+        <div className="border-b border-border">
+          <div className={getDiffPanelHeaderRowClassName(props.mode)}>{props.header}</div>
+        </div>
+      )}
+      {props.children}
+    </div>
+  );
+}
+
+export function DiffPanelHeaderSkeleton() {
+  return (
+    <>
+      <div className="relative min-w-0 flex-1">
+        <Skeleton className="absolute left-0 top-1/2 size-6 -translate-y-1/2 rounded-md border border-border/50" />
+        <Skeleton className="absolute right-0 top-1/2 size-6 -translate-y-1/2 rounded-md border border-border/50" />
+        <div className="flex gap-1 overflow-hidden px-8 py-0.5">
+          <Skeleton className="h-6 w-16 shrink-0 rounded-md" />
+          <Skeleton className="h-6 w-24 shrink-0 rounded-md" />
+          <Skeleton className="h-6 w-24 shrink-0 rounded-md max-sm:hidden" />
+        </div>
+      </div>
+      <div className="flex shrink-0 gap-1">
+        <Skeleton className="size-7 rounded-md" />
+        <Skeleton className="size-7 rounded-md" />
+      </div>
+    </>
+  );
+}
+
+export function DiffPanelLoadingState(props: { label: string }) {
+  return (
+    <div className="flex min-h-0 flex-1 flex-col p-2">
+      <div
+        className="flex min-h-0 flex-1 flex-col overflow-hidden rounded-md border border-border/60 bg-card/25"
+        role="status"
+        aria-live="polite"
+        aria-label={props.label}
+      >
+        <div className="flex items-center gap-2 border-b border-border/50 px-3 py-2">
+          <Skeleton className="h-4 w-32 rounded-full" />
+          <Skeleton className="ml-auto h-4 w-20 rounded-full" />
+        </div>
+        <div className="flex min-h-0 flex-1 flex-col gap-4 px-3 py-4">
+          <div className="space-y-2">
+            <Skeleton className="h-3 w-full rounded-full" />
+            <Skeleton className="h-3 w-full rounded-full" />
+            <Skeleton className="h-3 w-10/12 rounded-full" />
+            <Skeleton className="h-3 w-11/12 rounded-full" />
+            <Skeleton className="h-3 w-9/12 rounded-full" />
+          </div>
+          <span className="sr-only">{props.label}</span>
+        </div>
+      </div>
+    </div>
+  );
+}

apps/web/src/components/PlanSidebar.tsx

@@ -1,4 +1,4 @@
-import { memo, useState, useCallback, useRef, useEffect } from "react";
+import { memo, useState, useCallback } from "react";
 import { type TimestampFormat } from "../appSettings";
 import { Badge } from "./ui/badge";
 import { Button } from "./ui/button";
@@ -26,6 +26,7 @@ import {
 import { Menu, MenuItem, MenuPopup, MenuTrigger } from "./ui/menu";
 import { readNativeApi } from "~/nativeApi";
 import { toastManager } from "./ui/toast";
+import { useCopyToClipboard } from "~/hooks/useCopyToClipboard";
 
 function stepStatusIcon(status: string): React.ReactNode {
   if (status === "completed") {
@@ -68,35 +69,16 @@ const PlanSidebar = memo(function PlanSidebar({
 }: PlanSidebarProps) {
   const [proposedPlanExpanded, setProposedPlanExpanded] = useState(false);
   const [isSavingToWorkspace, setIsSavingToWorkspace] = useState(false);
-  const [copied, setCopied] = useState(false);
-  const copiedTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const { copyToClipboard, isCopied } = useCopyToClipboard();
 
   const planMarkdown = activeProposedPlan?.planMarkdown ?? null;
   const displayedPlanMarkdown = planMarkdown ? stripDisplayedPlanMarkdown(planMarkdown) : null;
   const planTitle = planMarkdown ? proposedPlanTitle(planMarkdown) : null;
 
   const handleCopyPlan = useCallback(() => {
     if (!planMarkdown) return;
-    void navigator.clipboard.writeText(planMarkdown);
-    if (copiedTimerRef.current != null) {
-      clearTimeout(copiedTimerRef.current);
-    }
-
-    setCopied(true);
-    copiedTimerRef.current = setTimeout(() => {
-      setCopied(false);
-      copiedTimerRef.current = null;
-    }, 2000);
-  }, [planMarkdown]);
-
-  // Cleanup timeout on unmount
-  useEffect(() => {
-    return () => {
-      if (copiedTimerRef.current != null) {
-        clearTimeout(copiedTimerRef.current);
-      }
-    };
-  }, []);
+    copyToClipboard(planMarkdown);
+  }, [planMarkdown, copyToClipboard]);
 
   const handleDownload = useCallback(() => {
     if (!planMarkdown) return;
@@ -169,7 +151,7 @@ const PlanSidebar = memo(function PlanSidebar({
               </MenuTrigger>
               <MenuPopup align="end">
                 <MenuItem onClick={handleCopyPlan}>
-                  {copied ? "Copied!" : "Copy to clipboard"}
+                  {isCopied ? "Copied!" : "Copy to clipboard"}
                 </MenuItem>
                 <MenuItem onClick={handleDownload}>Download as markdown</MenuItem>
                 <MenuItem

apps/web/src/components/Sidebar.logic.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
 
 import {
   hasUnseenCompletion,
+  resolveSidebarNewThreadEnvMode,
   resolveThreadRowClassName,
   resolveThreadStatusPill,
   shouldClearThreadSelectionOnMouseDown,
@@ -63,6 +64,25 @@ describe("shouldClearThreadSelectionOnMouseDown", () => {
   });
 });
 
+describe("resolveSidebarNewThreadEnvMode", () => {
+  it("uses the app default when the caller does not request a specific mode", () => {
+    expect(
+      resolveSidebarNewThreadEnvMode({
+        defaultEnvMode: "worktree",
+      }),
+    ).toBe("worktree");
+  });
+
+  it("preserves an explicit requested mode over the app default", () => {
+    expect(
+      resolveSidebarNewThreadEnvMode({
+        requestedEnvMode: "local",
+        defaultEnvMode: "worktree",
+      }),
+    ).toBe("local");
+  });
+});
+
 describe("resolveThreadStatusPill", () => {
   const baseThread = {
     interactionMode: "plan" as const,

apps/web/src/components/Sidebar.logic.ts

@@ -3,6 +3,7 @@ import { cn } from "../lib/utils";
 import { findLatestProposedPlan, isLatestTurnSettled } from "../session-logic";
 
 export const THREAD_SELECTION_SAFE_SELECTOR = "[data-thread-item], [data-thread-selection-safe]";
+export type SidebarNewThreadEnvMode = "local" | "worktree";
 
 export interface ThreadStatusPill {
   label:
@@ -38,6 +39,13 @@ export function shouldClearThreadSelectionOnMouseDown(target: HTMLElement | null
   return !target.closest(THREAD_SELECTION_SAFE_SELECTOR);
 }
 
+export function resolveSidebarNewThreadEnvMode(input: {
+  requestedEnvMode?: SidebarNewThreadEnvMode;
+  defaultEnvMode: SidebarNewThreadEnvMode;
+}): SidebarNewThreadEnvMode {
+  return input.requestedEnvMode ?? input.defaultEnvMode;
+}
+
 export function resolveThreadRowClassName(input: {
   isActive: boolean;
   isSelected: boolean;