drafted 1.12.2 → 1.12.4

package/install-mcp.sh

@@ -207,9 +207,50 @@ fi
 
 init_telemetry
 
-mkdir -p "$HOME/.drafted/npm-global"
-npm config set prefix "$HOME/.drafted/npm-global" >/dev/null
-export PATH="$HOME/.drafted/npm-global/bin:$PATH"
+NPM_GLOBAL_PREFIX="$HOME/.drafted/npm-global"
+mkdir -p "$NPM_GLOBAL_PREFIX"
+
+# A `drafted` resolved elsewhere on PATH (a leftover install from before this
+# fixed-prefix scheme, or a manual `npm i -g` under the default prefix) would
+# permanently shadow the fixed-prefix copy: the updater keeps this prefix
+# current, but the shell keeps running the stale one. Remove it at its source.
+STALE_DRAFTED_BIN="$(command -v drafted 2>/dev/null || true)"
+if [ -n "$STALE_DRAFTED_BIN" ]; then
+  # Derived from where the resolved binary actually sits (bin's grandparent),
+  # not `npm config get prefix` — that reflects our own target prefix once
+  # it's already been set on a prior run, which would make this a no-op on
+  # every machine that's already installed once (i.e. every real machine).
+  CANDIDATE_PREFIX="$(dirname "$(dirname "$STALE_DRAFTED_BIN")")"
+  if [ "$CANDIDATE_PREFIX" != "$NPM_GLOBAL_PREFIX" ] && [ -d "$CANDIDATE_PREFIX/lib/node_modules/drafted" ]; then
+    echo -e "    ${YELLOW}Found a stale Drafted install at $CANDIDATE_PREFIX — removing it so it can't shadow the current one.${RESET}"
+    npm uninstall -g drafted --prefix "$CANDIDATE_PREFIX" >/dev/null 2>&1 || true
+  fi
+fi
+
+npm config set prefix "$NPM_GLOBAL_PREFIX" >/dev/null
+export PATH="$NPM_GLOBAL_PREFIX/bin:$PATH"
+
+# Persist the prefix's bin dir at the FRONT of PATH for future shells — without
+# this, npm's prefix config makes `npm install -g` land in the right place, but
+# a bare `drafted` in a new terminal keeps resolving through whatever was
+# already on PATH (see the installedVersion() comment on the login-shell PATH
+# gap below). Idempotent guarded block, same pattern as the agent-instructions
+# markers further down.
+persist_npm_global_path() {
+  local marker_begin="# BEGIN drafted-path"
+  local marker_end="# END drafted-path"
+  local line="export PATH=\"$NPM_GLOBAL_PREFIX/bin:\$PATH\""
+  local rc
+  case "$(basename "${SHELL:-}")" in
+    zsh) rc="$HOME/.zshrc" ;;
+    bash) rc="$HOME/.bash_profile" ;;
+    *) rc="$HOME/.profile" ;;
+  esac
+  [ -f "$rc" ] || : > "$rc"
+  grep -qF "$marker_begin" "$rc" 2>/dev/null && return 0
+  { echo ""; echo "$marker_begin"; echo "$line"; echo "$marker_end"; } >> "$rc"
+}
+persist_npm_global_path
 
 # ── Install ───────────────────────────────────────────────────────
 
@@ -651,6 +692,13 @@ install_desktop_app() {
   # Clear quarantine so Gatekeeper doesn't block a freshly downloaded bundle.
   xattr -dr com.apple.quarantine "$app_bundle" >/dev/null 2>&1 || true
 
+  # Kill any already-running instance first — including a stray one that isn't
+  # launchd-managed (e.g. left over from a prior run of this same installer,
+  # before this pkill existed: `open` below used to spawn a second, untracked
+  # process alongside the launchd-supervised one, and `launchctl bootout` only
+  # ever stops the launchd-managed process, not that rogue one).
+  pkill -x "$exe_name" >/dev/null 2>&1 || true
+
   # Register run-at-login for the new app (mirrors the legacy launch agent).
   uid="$(id -u)"
   plist="$HOME/Library/LaunchAgents/live.drafted.desktop.plist"
@@ -673,9 +721,11 @@ install_desktop_app() {
 </dict>
 </plist>
 PLIST
+  # launchctl bootstrap + RunAtLoad is the sole launch path — it already starts
+  # the app, so a trailing `open "$app_bundle"` here would start a second,
+  # launchd-unaware process every time this function runs (that was the bug).
   launchctl bootout "gui/$uid" "$plist" >/dev/null 2>&1 || true
   launchctl bootstrap "gui/$uid" "$plist" >/dev/null 2>&1 || true
-  open "$app_bundle" >/dev/null 2>&1 || true
   return 0
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drafted",
-  "version": "1.12.2",
+  "version": "1.12.4",
   "description": "Drafted — visual thinking surface for humans and AI agents. Renders HTML, markdown, images, and code as frames on a zoomable canvas, with MCP tools for AI agents and real-time sync for humans.",
   "type": "module",
   "files": [