chatwire 0.2.0__tar.gz → 0.2.2__tar.gz

{chatwire-0.2.0/chatwire.egg-info → chatwire-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatwire
-Version: 0.2.0
+Version: 0.2.2
 Summary: macOS chat-relay bridge: iMessage <-> Telegram, web UI, and pluggable integrations
 Author: Allen Bina
 License: MIT License
@@ -104,15 +104,10 @@ Recommended path: **pipx**, against python.org's Python.
 python3 -m pip install --user pipx
 python3 -m pipx ensurepath
 
-# Install chatwire (from PyPI, once v0.2.0 ships):
+# Install chatwire from PyPI:
 pipx install --python /Library/Frameworks/Python.framework/Versions/Current/bin/python3 \
     chatwire
 
-# Or from the v0.1.0 git tag (still under the old chat-bridge repo URL —
-# the GitHub redirect to chatwire keeps this working):
-pipx install --python /Library/Frameworks/Python.framework/Versions/Current/bin/python3 \
-    git+https://github.com/allenbina/chatwire.git@v0.1.0
-
 # Wire it up:
 chatwire install-agents
 chatwire setup
@@ -124,12 +119,10 @@ permission grants (Full Disk Access + Automation→Messages), and writes
 
 ### Alternate install methods
 
-**Homebrew tap.** Convenient if you already use brew. Note: the formula
-still ships under the old `chat-bridge` name in the tap; renaming the
-formula is tracked separately.
+**Homebrew tap.** Convenient if you already use brew.
 
 ```bash
-brew install allenbina/tap/chat-bridge
+brew install allenbina/tap/chatwire
 chatwire install-agents
 chatwire setup
 ```
@@ -142,7 +135,7 @@ Tap source: <https://github.com/allenbina/homebrew-tap>.
 curl -fsSL https://raw.githubusercontent.com/allenbina/chatwire/main/scripts/install.sh | bash
 ```
 
-Pin to a tag with `CHATWIRE_REF=v0.1.0`. The script refuses Xcode CLT's
+Pin to a tag with `CHATWIRE_REF=v0.2.0`. The script refuses Xcode CLT's
 Python stub and warns on Homebrew Python (TCC identity protection). Same
 post-install steps (`chatwire install-agents` etc.).
 

{chatwire-0.2.0 → chatwire-0.2.2}/README.md

@@ -48,15 +48,10 @@ Recommended path: **pipx**, against python.org's Python.
 python3 -m pip install --user pipx
 python3 -m pipx ensurepath
 
-# Install chatwire (from PyPI, once v0.2.0 ships):
+# Install chatwire from PyPI:
 pipx install --python /Library/Frameworks/Python.framework/Versions/Current/bin/python3 \
     chatwire
 
-# Or from the v0.1.0 git tag (still under the old chat-bridge repo URL —
-# the GitHub redirect to chatwire keeps this working):
-pipx install --python /Library/Frameworks/Python.framework/Versions/Current/bin/python3 \
-    git+https://github.com/allenbina/chatwire.git@v0.1.0
-
 # Wire it up:
 chatwire install-agents
 chatwire setup
@@ -68,12 +63,10 @@ permission grants (Full Disk Access + Automation→Messages), and writes
 
 ### Alternate install methods
 
-**Homebrew tap.** Convenient if you already use brew. Note: the formula
-still ships under the old `chat-bridge` name in the tap; renaming the
-formula is tracked separately.
+**Homebrew tap.** Convenient if you already use brew.
 
 ```bash
-brew install allenbina/tap/chat-bridge
+brew install allenbina/tap/chatwire
 chatwire install-agents
 chatwire setup
 ```
@@ -86,7 +79,7 @@ Tap source: <https://github.com/allenbina/homebrew-tap>.
 curl -fsSL https://raw.githubusercontent.com/allenbina/chatwire/main/scripts/install.sh | bash
 ```
 
-Pin to a tag with `CHATWIRE_REF=v0.1.0`. The script refuses Xcode CLT's
+Pin to a tag with `CHATWIRE_REF=v0.2.0`. The script refuses Xcode CLT's
 Python stub and warns on Homebrew Python (TCC identity protection). Same
 post-install steps (`chatwire install-agents` etc.).
 

{chatwire-0.2.0 → chatwire-0.2.2}/_version.py

@@ -9,4 +9,4 @@ Format: PEP 440-flavored semver. Pre-1.0 dev builds carry a `-dev` suffix
 which the update-check JS treats as "skip the check" (no point pinging
 GitHub when you cloned from main).
 """
-__version__ = "0.2.0"
+__version__ = "0.2.2"

{chatwire-0.2.0 → chatwire-0.2.2/chatwire.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatwire
-Version: 0.2.0
+Version: 0.2.2
 Summary: macOS chat-relay bridge: iMessage <-> Telegram, web UI, and pluggable integrations
 Author: Allen Bina
 License: MIT License
@@ -104,15 +104,10 @@ Recommended path: **pipx**, against python.org's Python.
 python3 -m pip install --user pipx
 python3 -m pipx ensurepath
 
-# Install chatwire (from PyPI, once v0.2.0 ships):
+# Install chatwire from PyPI:
 pipx install --python /Library/Frameworks/Python.framework/Versions/Current/bin/python3 \
     chatwire
 
-# Or from the v0.1.0 git tag (still under the old chat-bridge repo URL —
-# the GitHub redirect to chatwire keeps this working):
-pipx install --python /Library/Frameworks/Python.framework/Versions/Current/bin/python3 \
-    git+https://github.com/allenbina/chatwire.git@v0.1.0
-
 # Wire it up:
 chatwire install-agents
 chatwire setup
@@ -124,12 +119,10 @@ permission grants (Full Disk Access + Automation→Messages), and writes
 
 ### Alternate install methods
 
-**Homebrew tap.** Convenient if you already use brew. Note: the formula
-still ships under the old `chat-bridge` name in the tap; renaming the
-formula is tracked separately.
+**Homebrew tap.** Convenient if you already use brew.
 
 ```bash
-brew install allenbina/tap/chat-bridge
+brew install allenbina/tap/chatwire
 chatwire install-agents
 chatwire setup
 ```
@@ -142,7 +135,7 @@ Tap source: <https://github.com/allenbina/homebrew-tap>.
 curl -fsSL https://raw.githubusercontent.com/allenbina/chatwire/main/scripts/install.sh | bash
 ```
 
-Pin to a tag with `CHATWIRE_REF=v0.1.0`. The script refuses Xcode CLT's
+Pin to a tag with `CHATWIRE_REF=v0.2.0`. The script refuses Xcode CLT's
 Python stub and warns on Homebrew Python (TCC identity protection). Same
 post-install steps (`chatwire install-agents` etc.).
 

{chatwire-0.2.0 → chatwire-0.2.2}/chatwire_cli.py

@@ -88,9 +88,28 @@ def _default_install_dir() -> Path:
 
 
 def _default_venv_python() -> Path:
-    """sys.executable when run from the venv is the venv's python — that's
-    the right default. When run from a system python (e.g. during initial
-    bootstrap), the user must pass --venv-python explicitly."""
+    """Return the venv's bin/python<major.minor> (the binary whose sys.path
+    includes the chatwire install).
+
+    NOT sys.executable: on macOS framework Python (python.org), the pipx
+    venv's bin/python3.X is a symlink/copy of the framework binary, and
+    sys.executable returns the *resolved* base path. Plists rendered with
+    sys.executable would invoke the base Python and miss the venv's
+    site-packages, so the web agent fails on `import fastapi` and the
+    bridge runs but sees no integrations (lazy imports mask the same root
+    cause).
+
+    Outside a venv, sys.prefix == sys.base_prefix and we just hand back
+    sys.executable.
+    """
+    if sys.prefix != sys.base_prefix:
+        venv_bin = Path(sys.prefix) / "bin"
+        for name in (f"python{sys.version_info.major}.{sys.version_info.minor}",
+                     f"python{sys.version_info.major}",
+                     "python"):
+            p = venv_bin / name
+            if p.exists():
+                return p
     return Path(sys.executable)
 
 
@@ -111,7 +130,13 @@ def _label(label_prefix: str, name: str) -> str:
 def cmd_install_agents(args: argparse.Namespace) -> int:
     _require_macos()
     install_dir = Path(args.install_dir).resolve()
-    venv_python = Path(args.venv_python).resolve()
+    # NOT .resolve() — on macOS framework Python (python.org), the pipx
+    # venv's bin/python3.X is a symlink to the framework binary, and
+    # resolve() would dereference it. The plist needs the VENV-form path
+    # so that Python boots with sys.prefix pointing at the venv (and so
+    # finds the venv's site-packages); invoking the framework binary
+    # directly skips the venv and the import of fastapi etc. fails.
+    venv_python = Path(args.venv_python).absolute()
     log_dir = Path(args.log_dir).resolve()
     label_prefix = args.label_prefix
 

{chatwire-0.2.0 → chatwire-0.2.2}/config.py

@@ -221,6 +221,13 @@ def migrate_legacy_env() -> bool:
     """If config.json is absent and a legacy .env exists, write config.json
     from it. Returns True if a migration ran. Idempotent: a no-op once
     config.json exists.
+
+    The legacy .env is v1-flat (TELEGRAM_BOT_TOKEN at the root, etc.). We
+    apply the schema migrations before saving so the on-disk file is the
+    current shape — otherwise save_config would stamp version=CURRENT_VERSION
+    over v1-flat content, the load-time `apply_pending` would skip (version
+    already current), and the bridge would see a v2 schema with empty
+    `integrations` and refuse to start.
     """
     if CONFIG_PATH.exists():
         return False
@@ -229,5 +236,11 @@ def migrate_legacy_env() -> bool:
         return False
     log.info("migrating %s → %s (%d keys)",
              LEGACY_ENV_PATH, CONFIG_PATH, len(legacy))
-    save_config(legacy)
+    cfg = {"version": 1, **{k: v for k, v in legacy.items() if k != "version"}}
+    try:
+        import migrations
+        cfg, _ = migrations.apply_pending(cfg)
+    except ImportError:
+        log.warning("migrations module unavailable; saving as v1")
+    save_config(cfg)
     return True