From d77844e91eb7acbcfea1ffbff101d9a17544013c Mon Sep 17 00:00:00 2001
From: Brian Casel <brian@briancasel.com>
Date: Mon, 11 May 2026 10:04:47 -0400
Subject: [PATCH 1/2] Copy Rails credential keys into Conductor worktrees on
 setup

Conductor worktrees don't get the gitignored config/credentials/*.key
files, so Rails boots without its encryption keys. The setup script now
resolves the main repo via `git rev-parse --git-common-dir` and copies
any of development/staging/production/test keys that exist there.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 conductor.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conductor.json b/conductor.json
index 4fc0525..cb88d30 100644
--- a/conductor.json
+++ b/conductor.json
@@ -1,6 +1,6 @@
 {
   "scripts": {
-    "setup": "# bundle, create db, migrate, run seeds\nbin/setup\n\n# install frontend deps\nnpm install",
+    "setup": "# Copy Rails encrypted credentials keys from the main repo (gitignored, not in worktree)\nMAIN_REPO=\"$(dirname \"$(git rev-parse --git-common-dir)\")\"\nmkdir -p config/credentials\nfor key in development.key staging.key production.key test.key; do\n  if [ -f \"$MAIN_REPO/config/credentials/$key\" ]; then\n    cp \"$MAIN_REPO/config/credentials/$key\" \"config/credentials/$key\"\n    echo \"Copied config/credentials/$key from $MAIN_REPO\"\n  fi\ndone\n\n# bundle, create db, migrate, run seeds\nbin/setup\n\n# install frontend deps\nnpm install",
     "run": "# Kill whatever is running on port 3000\nlsof -ti :3000 | xargs kill -9\nbin/dev",
     "archive": "# Frontend deps\nrm -rf node_modules\n\n# Vite build output\nrm -rf public/vite public/vite-ssr public/vite-dev\n\n# Rails tmp + logs\nrm -rf tmp/cache tmp/pids tmp/sockets tmp/storage\nrm -f log/*.log"
   }

From 81eb6cb216b9632661164066e910a08688eb2a0c Mon Sep 17 00:00:00 2001
From: Brian Casel <brian@briancasel.com>
Date: Mon, 11 May 2026 10:06:22 -0400
Subject: [PATCH 2/2] Remove unused ChevronRight import in ListingsSection

Fixes typecheck CI failure (TS6133).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../design-system/sections/elements/ListingsSection.tsx         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/frontend/components/design-system/sections/elements/ListingsSection.tsx b/app/frontend/components/design-system/sections/elements/ListingsSection.tsx
index 1122972..a4e0222 100644
--- a/app/frontend/components/design-system/sections/elements/ListingsSection.tsx
+++ b/app/frontend/components/design-system/sections/elements/ListingsSection.tsx
@@ -6,7 +6,7 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import { ChevronRight, Ellipsis, Folder } from "lucide-react";
+import { Ellipsis, Folder } from "lucide-react";
 
 const code = `<ul className="divide-y divide-hairline overflow-hidden rounded-md border border-hairline bg-page">
   {items.map((item) => (