Revert "chore: revert non-migration files to main branch state"

This reverts commit 38ba77db06.

scripts/wm-cursor

@@ -10,30 +10,25 @@ setopt err_exit no_unset pipe_fail
 
 local script_path=${0:A}
 
-# --- Lazy Cursor CLI resolution (only when needed) ---
+# --- Resolve Cursor remote CLI (most recently modified) ---
 
-local cursor_bin=
+local -a cursor_bins=(~/.cursor-server/cli/servers/*/server/bin/remote-cli/cursor(NOm))
+if (( ${#cursor_bins} == 0 )); then
+  print -u2 "Error: Cursor remote CLI not found in ~/.cursor-server/cli/servers/"
+  exit 1
+fi
+local cursor_bin=${cursor_bins[1]}
 
-resolve_cursor_cli() {
-  [[ -n $cursor_bin ]] && return 0
+# --- Refresh Cursor IPC socket (tmux may hold a stale one) ---
+# Multiple stale sockets may exist; probe to find a live one
 
-  local -a cursor_bins=(~/.cursor-server/cli/servers/*/server/bin/remote-cli/cursor(NOm))
-  if (( ${#cursor_bins} == 0 )); then
-    print -u2 "Error: Cursor remote CLI not found in ~/.cursor-server/cli/servers/"
-    exit 1
+local sock
+for sock in /tmp/vscode-ipc-*.sock(NOm); do
+  if VSCODE_IPC_HOOK_CLI=$sock $cursor_bin --status &>/dev/null; then
+    export VSCODE_IPC_HOOK_CLI=$sock
+    break
   fi
-  cursor_bin=${cursor_bins[1]}
-
-  # Refresh Cursor IPC socket (tmux may hold a stale one)
-  # Multiple stale sockets may exist; probe to find a live one
-  local sock
-  for sock in /tmp/vscode-ipc-*.sock(NOm); do
-    if timeout 2 env VSCODE_IPC_HOOK_CLI=$sock $cursor_bin --status &>/dev/null; then
-      export VSCODE_IPC_HOOK_CLI=$sock
-      break
-    fi
-  done
-}
+done
 
 # --- Helper functions ---
 
@@ -138,7 +133,6 @@ parse_features_flag() {
 # --- Subcommands ---
 
 cmd_add() {
-  resolve_cursor_cli
   ensure_tmux
   check_dev_db
 
@@ -172,7 +166,6 @@ cmd_open() {
   local name=${1:?Usage: wm-cursor open <name>}
   shift
 
-  resolve_cursor_cli
   ensure_tmux
   check_dev_db
 
@@ -209,7 +202,6 @@ cmd_close() {
 cmd_open_ee() {
   local name=${1:?Usage: wm-cursor open-ee <name>}
 
-  resolve_cursor_cli
   local wt_path=$(workmux path $name)
   local main_repo_root="$(cd "$(git -C "$wt_path" rev-parse --git-common-dir 2>/dev/null)/.." && pwd)"