feat: fix warnings related to repository and number of files bundled. add update message suggesting to update pywire version in project. bundle deps improved. use latest prettierp lugin

Author: reecelikesramen

package.json

@@ -12,7 +12,14 @@
   "categories": [
     "Programming Languages"
   ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/pywire/pywire"
+  },
   "main": "./out/extension.cjs",
+  "activationEvents": [
+    "onStartupFinished"
+  ],
   "extensionDependencies": [
     "ms-python.python"
   ],
@@ -64,10 +71,19 @@
           "type": "boolean",
           "default": false,
           "description": "If true, bypasses Pylance middleware and uses the bundled Pyright from the language server. Useful for testing fallback mode."
+        },
+        "pywire.disableUpdateNotifications": {
+          "type": "boolean",
+          "default": false,
+          "description": "Disable periodic checks for PyWire updates."
         }
       }
     },
     "commands": [
+      {
+        "command": "pywire.update",
+        "title": "PyWire: Attempt Upgrade"
+      },
       {
         "command": "pywire.toggleComment",
         "title": "PyWire: Toggle Comment"
@@ -168,4 +184,4 @@
     "vscode-languageclient": "^9.0.1",
     "web-tree-sitter": "^0.26.3"
   }
-}
+}

pnpm-lock.yaml

@@ -1,5 +1,7 @@
 #!/bin/sh -e
 
+export PYO3_USE_ABI3_FORWARD_COMPATIBILITY=1
+
 ROOT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
 TARGET_DIR="$ROOT_DIR/bundled/libs"
 if [ -d "$TARGET_DIR" ]; then
@@ -12,103 +14,79 @@ if ! command -v "$PYTHON_BIN" >/dev/null 2>&1; then
     PYTHON_BIN="python3"
 fi
 
-resolve_pywire_src() {
-    if [ -z "$1" ]; then
-        return 1
-    fi
+PYWIRE_REPO="https://github.com/pywire/pywire.git"
+PYWIRE_LS_REPO="https://github.com/pywire/pywire-language-server.git"
 
+resolve_local_src() {
     src="$1"
     case "$src" in
         /*) ;;
         *) src="$ROOT_DIR/$src" ;;
     esac
 
-    if [ ! -d "$src" ]; then
-        return 1
-    fi
-
-    if [ -f "$src/pyproject.toml" ] || [ -f "$src/setup.py" ] || [ -f "$src/setup.cfg" ]; then
+    if [ -d "$src" ] && { [ -f "$src/pyproject.toml" ] || [ -f "$src/setup.py" ]; }; then
         echo "$src"
         return 0
     fi
-
     return 1
 }
 
 get_latest_tag() {
-    REPO_URL="$1"
-    # Get the latest tag matching v* sorted by version number
-    TAG=$(git ls-remote --tags --sort='v:refname' "$REPO_URL" 'refs/tags/v*' | tail -n1 | sed 's|.*refs/tags/||')
-    if [ -z "$TAG" ]; then
+    repo_url="$1"
+    tag=$(git ls-remote --tags --sort='v:refname' "$repo_url" 'refs/tags/v*' | tail -n1 | sed 's|.*refs/tags/||')
+    if [ -z "$tag" ]; then
         echo "main"
     else
-        echo "$TAG"
+        echo "$tag"
     fi
 }
 
-pywire_src="$(resolve_pywire_src "$PYWIRE_SRC")" || pywire_src=""
-if [ -z "$pywire_src" ]; then
-    pywire_src="$(resolve_pywire_src "../pywire")" || pywire_src=""
-fi
-if [ -z "$pywire_src" ]; then
-    pywire_src="$(resolve_pywire_src "pywire")" || pywire_src=""
-fi
-
-pywire_ls_src="$(resolve_pywire_src "$PYWIRE_LANGUAGE_SERVER_SRC")" || pywire_ls_src=""
-if [ -z "$pywire_ls_src" ]; then
-    pywire_ls_src="$(resolve_pywire_src "../pywire-language-server")" || pywire_ls_src=""
-fi
-if [ -z "$pywire_ls_src" ]; then
-    pywire_ls_src="$(resolve_pywire_src "pywire-language-server")" || pywire_ls_src=""
+# Determine build mode
+if [ "$PYWIRE_RELEASE" = "1" ]; then
+    MODE="publish"
+elif [ "$GITHUB_ACTIONS" = "true" ]; then
+    MODE="ci"
+else
+    MODE="local"
 fi
 
-if [ -n "$pywire_src" ] || [ -n "$pywire_ls_src" ]; then
-    set -- pygls pyright
-    if [ -n "$pywire_src" ]; then
-        set -- "$@" "$pywire_src"
-    fi
-    if [ -n "$pywire_ls_src" ]; then
-        set -- "$@" "$pywire_ls_src"
-    fi
-    if "$PYTHON_BIN" -m pip --version >/dev/null 2>&1; then
-        "$PYTHON_BIN" -m pip install "$@" -t "$TARGET_DIR"
-    elif "$PYTHON_BIN" -m ensurepip --upgrade >/dev/null 2>&1; then
-        "$PYTHON_BIN" -m pip install "$@" -t "$TARGET_DIR"
-    elif command -v uv >/dev/null 2>&1; then
-        uv pip install "$@" --target "$TARGET_DIR"
-    else
-        echo "pip is not available and uv is missing; cannot bundle deps" >&2
-        exit 1
-    fi
-    exit 0
-fi
+echo "Bundling mode: $MODE"
 
-PYWIRE_REPO="https://github.com/pywire/pywire.git"
-PYWIRE_LS_REPO="https://github.com/pywire/pywire-language-server.git"
+case "$MODE" in
+    publish)
+        PYWIRE_REF="$(get_latest_tag "$PYWIRE_REPO")"
+        PYWIRE_LS_REF="$(get_latest_tag "$PYWIRE_LS_REPO")"
+        DEPS="pygls pyright git+$PYWIRE_REPO@$PYWIRE_REF git+$PYWIRE_LS_REPO@$PYWIRE_LS_REF"
+        ;;
+    ci)
+        DEPS="pygls pyright git+$PYWIRE_REPO@main git+$PYWIRE_LS_REPO@main"
+        ;;
+    *)
+        # Local development mode
+        pywire_path="$(resolve_local_src "${PYWIRE_SRC:-../pywire}")" || pywire_path=""
+        pywire_ls_path="$(resolve_local_src "${PYWIRE_LANGUAGE_SERVER_SRC:-../pywire-language-server}")" || pywire_ls_path=""
+        
+        DEPS="pygls pyright"
+        if [ -n "$pywire_path" ]; then
+            DEPS="$DEPS $pywire_path"
+        else
+            DEPS="$DEPS git+$PYWIRE_REPO@main"
+        fi
+        
+        if [ -n "$pywire_ls_path" ]; then
+            DEPS="$DEPS $pywire_ls_path"
+        else
+            DEPS="$DEPS git+$PYWIRE_LS_REPO@main"
+        fi
+        ;;
+esac
 
-if [ "$PYWIRE_RELEASE" = "1" ]; then
-    echo "Release mode detected. Fetching latest tags..."
-    PYWIRE_REF="$(get_latest_tag "$PYWIRE_REPO")"
-    PYWIRE_LS_REF="$(get_latest_tag "$PYWIRE_LS_REPO")"
-    echo "Using pywire@$PYWIRE_REF and pywire-language-server@$PYWIRE_LS_REF"
-else
-    PYWIRE_REF="main"
-    PYWIRE_LS_REF="main"
-fi
+echo "Installing dependencies: $DEPS"
 
 if command -v uv >/dev/null 2>&1; then
-    uv pip install \
-        pygls \
-        pyright \
-        "git+$PYWIRE_REPO@$PYWIRE_REF" \
-        "git+$PYWIRE_LS_REPO@$PYWIRE_LS_REF" \
-        --target "$TARGET_DIR"
+    # shellcheck disable=SC2086
+    uv pip install $DEPS --target "$TARGET_DIR"
 else
-    "$PYTHON_BIN" -m pip install \
-        pygls \
-        pyright \
-        "git+$PYWIRE_REPO@$PYWIRE_REF" \
-        "git+$PYWIRE_LS_REPO@$PYWIRE_LS_REF" \
-        -t "$TARGET_DIR"
+    # shellcheck disable=SC2086
+    "$PYTHON_BIN" -m pip install $DEPS -t "$TARGET_DIR"
 fi
-

scripts/bundle-deps

@@ -15,15 +15,32 @@ get_latest_tag() {
     fi
 }
 
+# Determine build mode
 if [ "$PYWIRE_RELEASE" = "1" ]; then
-    echo "Release mode detected for Node dependencies. Fetching latest tag..."
-    REF=$(get_latest_tag)
-    echo "Using prettier-plugin-pywire@$REF"
+    MODE="publish"
+elif [ "$GITHUB_ACTIONS" = "true" ]; then
+    MODE="ci"
 else
-    REF="main"
-    echo "Dev/CI mode. Using prettier-plugin-pywire@main"
+    MODE="local"
 fi
 
+case "$MODE" in
+    publish)
+        echo "Release mode detected. Fetching latest tag..."
+        REF=$(get_latest_tag)
+        ;;
+    ci)
+        echo "CI mode. Using main."
+        REF="main"
+        ;;
+    *)
+        echo "Local mode. Using main."
+        REF="main"
+        ;;
+esac
+
+echo "Using prettier-plugin-pywire@$REF"
+
 # Check current version in package.json to avoid unnecessary pnpm add
 CURRENT=$(grep -o "prettier-plugin-pywire\": \"git+$REPO_URL#[^\"]*" package.json | sed "s|.*#||" || echo "")
 

scripts/sync-node-deps

@@ -38,6 +38,7 @@ import {
   ProvideReferencesSignature,
   ProvideCompletionItemsSignature,
 } from 'vscode-languageclient/node'
+import { setupUpdateCheck, performUpdate } from './updateCheck'
 
 type PrettierModule = typeof import('prettier')
 type PrettierPlugin = import('prettier').Plugin
@@ -1137,6 +1138,13 @@ export function activate(context: ExtensionContext) {
   })
   context.subscriptions.push(restartCmd)
 
+  // Register Update command
+  context.subscriptions.push(
+    commands.registerCommand('pywire.update', async () => {
+      await performUpdate()
+    })
+  )
+
   // Register Open Docs commands
   context.subscriptions.push(
     commands.registerCommand('pywire.openDocs', () => {
@@ -1198,6 +1206,9 @@ export function activate(context: ExtensionContext) {
 
   // Start the client initially
   startLanguageClient()
+
+  // Setup periodic update checks
+  setupUpdateCheck(context)
 }
 
 export function deactivate(): Promise<void> | undefined {

src/extension.ts

@@ -1,66 +1,49 @@
-import sys
-import os
 import json
+import os
+import sys
 import time
 
 # Add bundled libs to path
-BUNDLED_LIBS = os.path.join(os.path.dirname(__file__), '..', 'bundled', 'libs')
+BUNDLED_LIBS = os.path.join(os.path.dirname(__file__), "..", "bundled", "libs")
 sys.path.insert(0, BUNDLED_LIBS)
 
 # Add bundled libs/bin to PATH so pyright-langserver can be found
-BUNDLED_BIN = os.path.join(BUNDLED_LIBS, 'bin')
+BUNDLED_BIN = os.path.join(BUNDLED_LIBS, "bin")
 if os.path.exists(BUNDLED_BIN):
     os.environ["PATH"] = BUNDLED_BIN + os.pathsep + os.environ.get("PATH", "")
 
 # FOR DEVELOPMENT ONLY: Add the sibling pywire-language-server/src to path
 # In a real build, we would bundle this too.
-DEV_SERVER_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', 'pywire-language-server'))
-DEV_SERVER_SRC = os.path.join(DEV_SERVER_ROOT, 'src')
+DEV_SERVER_ROOT = os.path.abspath(
+    os.path.join(os.path.dirname(__file__), "..", "..", "pywire-language-server")
+)
+DEV_SERVER_SRC = os.path.join(DEV_SERVER_ROOT, "src")
 sys.path.insert(0, DEV_SERVER_SRC)
 
 # Check for sibling .venv and add site-packages
-venv_dir = os.path.join(DEV_SERVER_ROOT, '.venv')
+venv_dir = os.path.join(DEV_SERVER_ROOT, ".venv")
 if os.path.exists(venv_dir):
     # Try to find site-packages
     # Unix: lib/pythonX.X/site-packages
-    lib_dir = os.path.join(venv_dir, 'lib')
+    lib_dir = os.path.join(venv_dir, "lib")
     if os.path.exists(lib_dir):
         for item in os.listdir(lib_dir):
-            if item.startswith('python'):
-                site_packages = os.path.join(lib_dir, item, 'site-packages')
+            if item.startswith("python"):
+                site_packages = os.path.join(lib_dir, item, "site-packages")
                 if os.path.exists(site_packages):
                     sys.path.insert(0, site_packages)
                     # Also add bin path for potential executable lookup helpers involving PATH
-                    bin_dir = os.path.join(venv_dir, 'bin')
-                    os.environ["PATH"] = bin_dir + os.pathsep + os.environ.get("PATH", "")
+                    bin_dir = os.path.join(venv_dir, "bin")
+                    os.environ["PATH"] = (
+                        bin_dir + os.pathsep + os.environ.get("PATH", "")
+                    )
                     break
 
 
-# #region agent log
-try:
-    from pathlib import Path
-    with open('/Users/rholmdahl/projects/pywire/.cursor/debug.log', 'a') as f:
-        log_entry = {
-            "sessionId": "debug-session",
-            "runId": "run_launcher",
-            "hypothesisId": "H4_vendored",
-            "location": "lsp_launcher:start",
-            "message": "Launcher started",
-            "data": {
-                "sys.path": sys.path,
-                "bundled_libs": BUNDLED_LIBS,
-                "dev_src": DEV_SERVER_SRC
-            },
-            "timestamp": int(time.time() * 1000)
-        }
-        f.write(json.dumps(log_entry) + "\n")
-except Exception:
-    pass
-# #endregion
-
 try:
     from pywire_language_server.server import start
-    if __name__ == '__main__':
+
+    if __name__ == "__main__":
         start()
 except ImportError as e:
     # Log failure to stderr so it shows up in LS output