browser-ctl 0.2.1__tar.gz → 0.2.3__tar.gz

{browser_ctl-0.2.1 → browser_ctl-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: browser-ctl
-Version: 0.2.1
+Version: 0.2.3
 Summary: Control your browser from the command line via a Chrome extension + WebSocket bridge
 Author-email: geb <853934146@qq.com>
 License-Expression: MIT

{browser_ctl-0.2.1 → browser_ctl-0.2.3}/browser_ctl/cli.py

@@ -421,8 +421,18 @@ def handle_serve(args):
 
 
 def _get_extension_source_dir() -> str | None:
-	"""Locate the extension source directory (from project root)."""
+	"""Locate the extension source directory.
+
+	Looks in two places:
+	1. Inside the package (works for pip install)
+	2. Project root (works for editable/dev install)
+	"""
 	pkg_dir = os.path.dirname(os.path.abspath(__file__))
+	# 1. Bundled inside the package (pip install browser-ctl)
+	ext_dir = os.path.join(pkg_dir, "extension")
+	if os.path.isdir(ext_dir) and os.path.exists(os.path.join(ext_dir, "manifest.json")):
+		return ext_dir
+	# 2. Project root (pip install -e . / dev checkout)
 	project_root = os.path.dirname(pkg_dir)
 	ext_dir = os.path.join(project_root, "extension")
 	if os.path.isdir(ext_dir) and os.path.exists(os.path.join(ext_dir, "manifest.json")):
@@ -430,6 +440,28 @@ def _get_extension_source_dir() -> str | None:
 	return None
 
 
+def _get_package_version() -> str:
+	"""Get the package version. Tries pyproject.toml first (dev), then importlib.metadata (pip)."""
+	# 1. Read from pyproject.toml (always up-to-date in source checkouts)
+	try:
+		pkg_dir = os.path.dirname(os.path.abspath(__file__))
+		toml_path = os.path.join(os.path.dirname(pkg_dir), "pyproject.toml")
+		if os.path.exists(toml_path):
+			with open(toml_path) as f:
+				for line in f:
+					if line.strip().startswith("version"):
+						return line.split("=", 1)[1].strip().strip('"').strip("'")
+	except Exception:
+		pass
+	# 2. importlib.metadata (works for pip-installed packages)
+	try:
+		from importlib.metadata import version
+		return version("browser-ctl")
+	except Exception:
+		pass
+	return "0.0.0"
+
+
 def _install_extension() -> str | None:
 	"""Copy extension to ~/.browser-ctl/extension/ and try to open Chrome extensions page."""
 	src = _get_extension_source_dir()
@@ -441,6 +473,18 @@ def _install_extension() -> str | None:
 		shutil.rmtree(dest)
 	shutil.copytree(src, dest)
 
+	# Sync manifest.json version with the Python package version
+	manifest_path = os.path.join(dest, "manifest.json")
+	try:
+		with open(manifest_path, "r") as f:
+			manifest = json.load(f)
+		manifest["version"] = _get_package_version()
+		with open(manifest_path, "w") as f:
+			json.dump(manifest, f, indent=2)
+			f.write("\n")
+	except Exception:
+		pass  # Non-fatal: extension still works with mismatched version
+
 	# Try to open Chrome extensions page
 	system = platform.system()
 	try: