drafted 1.11.27 → 1.11.29

package/install-mcp.sh

@@ -215,7 +215,23 @@ export PATH="$HOME/.drafted/npm-global/bin:$PATH"
 
 step "Installing Drafted"
 
-npm install -g drafted@latest --force
+# Retry with back-off: a fresh `npm publish` can briefly 404/ETARGET on the CDN
+# edge before the tarball propagates, so an updater that fires the instant a new
+# version lands would otherwise report a spurious "update failed". Ride it out.
+install_drafted_pkg() {
+  attempts=5; delay=4; n=1
+  while :; do
+    if npm install -g drafted@latest --force; then return 0; fi
+    if [ "$n" -ge "$attempts" ]; then return 1; fi
+    echo -e "    ${YELLOW}npm install failed (attempt $n/$attempts) — retrying in ${delay}s (a new release may still be propagating to the npm CDN)...${RESET}"
+    sleep "$delay"
+    n=$((n + 1)); delay=$((delay * 2))
+  done
+}
+if ! install_drafted_pkg; then
+  echo -e "    ${RED}npm install -g drafted@latest failed after multiple attempts.${RESET}"
+  exit 1
+fi
 hash -r 2>/dev/null || true
 NPM_ROOT="$(npm root -g 2>/dev/null || true)"
 MCP_SERVER_MODULE="$NPM_ROOT/drafted/mcp/server.mjs"
@@ -579,6 +595,92 @@ fi
 
 # ── Update menu bar helper ───────────────────────────────────────
 
+# Idempotently remove the legacy Swift menu-bar updater so it can neither run alongside the
+# new desktop app nor be resurrected at next login. Safe to call when nothing legacy exists.
+retire_legacy_updater() {
+  local uid legacy_plist
+  uid="$(id -u)"
+  legacy_plist="$HOME/Library/LaunchAgents/live.drafted.updater.plist"
+  launchctl bootout "gui/$uid/live.drafted.updater" >/dev/null 2>&1 || true
+  if [ -f "$legacy_plist" ]; then
+    launchctl bootout "gui/$uid" "$legacy_plist" >/dev/null 2>&1 || true
+  fi
+  rm -f "$legacy_plist" >/dev/null 2>&1 || true
+  pkill -x DraftedUpdater >/dev/null 2>&1 || true
+  rm -rf "/Applications/Drafted Updater.app" "$HOME/Applications/Drafted Updater.app" >/dev/null 2>&1 || true
+}
+
+# Install (or detect) the Tauri desktop app that replaces the legacy menu-bar updater.
+# Returns 0 ONLY when a valid Drafted.app is present afterward, so the caller can safely
+# retire the legacy updater. Returns 1 when no new bundle is available yet — the caller then
+# falls back to building the legacy Swift updater, so users are never left without a tray.
+install_desktop_app() {
+  local install_dir app_bundle app_exe uid plist tmp tarball url
+  install_dir="/Applications"
+  [ -w "$install_dir" ] || install_dir="$HOME/Applications"
+  mkdir -p "$install_dir"
+  app_bundle="$install_dir/Drafted.app"
+
+  if [ -n "${DRAFTED_DESKTOP_APP:-}" ] && [ -d "${DRAFTED_DESKTOP_APP}" ]; then
+    # Local prebuilt bundle — lets us test the cutover before the CDN endpoint exists.
+    rm -rf "$app_bundle" >/dev/null 2>&1 || true
+    ditto "${DRAFTED_DESKTOP_APP}" "$app_bundle" >/dev/null 2>&1 || true
+  else
+    # Signed bundle tarball (expects Drafted.app at the archive root). Until this endpoint is
+    # published the request 404s and we fall through to legacy — that is the cutover gate.
+    url="${DRAFTED_DESKTOP_URL:-$INSTALL_SERVER/desktop/Drafted-macos.tar.gz}"
+    tmp="$(mktemp -d)"
+    tarball="$tmp/Drafted-macos.tar.gz"
+    if curl -fsSL --max-time 120 "$url" -o "$tarball" >/dev/null 2>&1; then
+      rm -rf "$app_bundle" >/dev/null 2>&1 || true
+      tar -xzf "$tarball" -C "$install_dir" >/dev/null 2>&1 || true
+    fi
+    rm -rf "$tmp" >/dev/null 2>&1 || true
+  fi
+
+  # Validate: a real bundle whose declared executable exists. The bundle dir is Drafted.app
+  # (productName) but the binary is the Cargo bin name (drafted-desktop), so read the actual
+  # name from Info.plist rather than assuming. If absent/invalid, signal "not available yet".
+  local exe_name
+  exe_name="$(/usr/libexec/PlistBuddy -c 'Print :CFBundleExecutable' "$app_bundle/Contents/Info.plist" 2>/dev/null || true)"
+  app_exe="$app_bundle/Contents/MacOS/$exe_name"
+  if [ -z "$exe_name" ] || [ ! -x "$app_exe" ]; then
+    return 1
+  fi
+
+  # Clear quarantine so Gatekeeper doesn't block a freshly downloaded bundle.
+  xattr -dr com.apple.quarantine "$app_bundle" >/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"
+  mkdir -p "$HOME/Library/LaunchAgents"
+  cat > "$plist" <<PLIST
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>live.drafted.desktop</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>open</string>
+    <string>-a</string>
+    <string>$app_bundle</string>
+  </array>
+  <key>RunAtLoad</key>
+  <true/>
+  <key>KeepAlive</key>
+  <false/>
+</dict>
+</plist>
+PLIST
+  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
+}
+
 install_update_menu_icon() {
   if [ "${DRAFTED_HEADLESS:-}" = "1" ]; then
     echo -e "    ${YELLOW}Headless mode: skipping update menu icon.${RESET}"
@@ -588,6 +690,16 @@ install_update_menu_icon() {
     echo -e "    ${YELLOW}Update menu icon is only installed on macOS by this script.${RESET}"
     return 0
   fi
+
+  # Prefer the Tauri desktop app. If it installs (or is already present and valid), retire the
+  # legacy Swift updater so the two can never run side by side or be resurrected at next login.
+  if install_desktop_app; then
+    retire_legacy_updater
+    ok "Drafted desktop app"
+    return 0
+  fi
+  echo -e "    ${YELLOW}Desktop app bundle not available yet; using the menu bar updater.${RESET}"
+
   if ! command -v swiftc >/dev/null 2>&1; then
     echo -e "    ${YELLOW}Swift compiler not found; skipping macOS menu bar updater.${RESET}"
     return 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drafted",
-  "version": "1.11.27",
+  "version": "1.11.29",
   "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": [