pythonkr
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 0 deletions b/‎.gitignore‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎Makefile‎
Lines changed: 4 additions & 0 deletions b/‎Makefile‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎scripts/dev-worktree.sh‎
Lines changed: 38 additions & 0 deletions b/‎scripts/dev-worktree.sh‎
Lines changed: 38 additions & 0 deletions
@@ -255,6 +255,8 @@ media/*
 
 # Git worktrees (scripts/dev-worktree.sh creates .worktrees/<slug> in-repo)
 .worktrees/
+# Auto-generated multi-root workspace listing the local worktrees (per-dev)
+pyconkr.code-workspace
 
 # Jupyter Notebook
 .ipynb_checkpoints
 
@@ -103,6 +103,10 @@ local-worktree-remove:
 	@$(if $(dir),,$(error dir=<worktree-path> is required))
 	@./scripts/dev-worktree.sh remove "$(dir)"
 
+# Regenerate pyconkr.code-workspace (main repo + every .worktrees/<slug> as roots)
+local-worktree-sync:
+	@./scripts/dev-worktree.sh workspace
+
 
 # Devtools
 hooks-install: local-setup
 
@@ -4,6 +4,7 @@
 #
 #   scripts/dev-worktree.sh add <branch> [worktree-dir]
 #   scripts/dev-worktree.sh remove <worktree-dir>
+#   scripts/dev-worktree.sh workspace            # regen pyconkr.code-workspace
 #
 # Reads envfile/.env.local for Postgres credentials; the new worktree
 # gets a copy with only DATABASE_NAME rewritten.
@@ -12,6 +13,7 @@ set -euo pipefail
 REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 ENV_REL="envfile/.env.local"
 SRC_ENV="$REPO_ROOT/$ENV_REL"
+WORKSPACE_FILE="$REPO_ROOT/pyconkr.code-workspace"
 
 usage() {
   awk 'NR>1 && /^[^#]/ {exit} NR>1 {sub(/^# ?/, ""); print}' "$0"
@@ -49,6 +51,37 @@ sanitize() {
     | sed -E 's/[^a-z0-9]+/_/g; s/^_+|_+$//g'
 }
 
+# Regenerate the multi-root workspace so each .worktrees/<slug> is its own root
+# (with its own Source Control) next to the main repo. .worktrees is hidden in
+# the main root to avoid showing every worktree twice.
+regen_workspace() {
+  local folders='    { "name": "backend (main)", "path": "." }'
+  local d slug
+  for d in "$REPO_ROOT"/.worktrees/*/; do
+    [ -d "$d" ] || continue
+    slug=$(basename "$d")
+    folders+=$',\n'"    { \"name\": \"wt: $slug\", \"path\": \".worktrees/$slug\" }"
+  done
+  cat > "$WORKSPACE_FILE" <<EOF
+{
+  "folders": [
+$folders
+  ],
+  "settings": {
+    "files.exclude": { "**/.worktrees": true }
+  }
+}
+EOF
+  echo "  synced ${WORKSPACE_FILE##*/} (VSCode: File → Open Workspace from File…)"
+}
+
+# Auto-refresh only for devs who opted in by creating the file once
+# (`make local-worktree-sync`). Non-VSCode users never get the file.
+sync_workspace_if_present() {
+  [ -f "$WORKSPACE_FILE" ] || return 0
+  regen_workspace
+}
+
 cmd_add() {
   local branch="${1:-}"; [ -n "$branch" ] || usage 1
   local slug; slug=$(sanitize "$branch")
@@ -102,6 +135,8 @@ cmd_add() {
     exit 1
   fi
 
+  sync_workspace_if_present
+
   cat <<EOF
 
 next:
@@ -135,13 +170,16 @@ cmd_remove() {
   # DATABASE_NAME on add, and the tree may contain .venv/__pycache__/coverage
   # artifacts. The y/N prompt above is the safety gate.
   git -C "$REPO_ROOT" worktree remove --force "$wt_dir"
+
+  sync_workspace_if_present
 }
 
 main() {
   local sub="${1:-}"; shift || true
   case "$sub" in
     add)         cmd_add "$@" ;;
     remove|rm)   cmd_remove "$@" ;;
+    workspace|ws|sync) regen_workspace ;;
     -h|--help|"") usage 0 ;;
     *) usage 1 ;;
   esac