forgexa-cli 1.17.5__tar.gz → 1.18.0__tar.gz

{forgexa_cli-1.17.5 → forgexa_cli-1.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.17.5
+Version: 1.18.0
 Summary: Forgexa CLI — command-line client and AI agent runtime for the Forgexa platform
 Author-email: Jason Sun <dev.winds@gmail.com>
 License-Expression: MIT

{forgexa_cli-1.17.5 → forgexa_cli-1.18.0}/forgexa_cli/__init__.py

@@ -1,2 +1,2 @@
 """forgexa-cli — Forgexa command-line client."""
-__version__ = "1.17.5"
+__version__ = "1.18.0"

{forgexa_cli-1.17.5 → forgexa_cli-1.18.0}/forgexa_cli/daemon.py

@@ -45,7 +45,7 @@ import time
 from dataclasses import dataclass, field
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import Any
+from typing import Any, Awaitable, Callable
 from urllib.parse import urlparse
 from uuid import UUID
 
@@ -523,7 +523,7 @@ except (ImportError, ModuleNotFoundError):
 # DAEMON_VERSION is the protocol/logic version of the daemon code.
 # Kept in sync with pyproject.toml version via bump-version.sh.
 # CLIENT_TYPE identifies which packaging/distribution this daemon runs in.
-DAEMON_VERSION = "1.17.5"
+DAEMON_VERSION = "1.18.0"
 
 
 def _detect_client_type() -> str:
@@ -6303,11 +6303,13 @@ class ServerConnection:
         api_token: str,
         daemon_id: str,
         hardware_id: str | None = None,
+        local_dev_token_provider: Callable[[], Awaitable[str]] | None = None,
     ):
         self.server_url = server_url.rstrip("/")
         self.api_token = api_token
         self.daemon_id = daemon_id
         self.hardware_id = hardware_id
+        self._local_dev_token_provider = local_dev_token_provider
         self.runtime_id: str | None = None
         self.client = httpx.AsyncClient(
             headers={"Authorization": f"Bearer {api_token}"} if api_token else {},
@@ -6322,7 +6324,12 @@ class ServerConnection:
         # Short label for logging
         from urllib.parse import urlparse
         parsed = urlparse(server_url)
+        hostname = (parsed.hostname or "").lower()
         self.label = parsed.hostname or server_url
+        self._allow_local_dev_token_fallback = (
+            local_dev_token_provider is not None
+            and hostname in {"localhost", "127.0.0.1", "::1"}
+        )
 
     def _apply_api_token(self, token: str) -> bool:
         token = str(token or "").strip()
@@ -6339,6 +6346,22 @@ class ServerConnection:
         except OSError:
             return ""
 
+    async def _apply_local_dev_token_fallback(self) -> bool:
+        if not self._allow_local_dev_token_fallback or self._local_dev_token_provider is None:
+            return False
+
+        try:
+            token = str(await self._local_dev_token_provider() or "").strip()
+        except Exception as exc:
+            logger.debug("[%s] Local-dev token fallback failed: %s", self.label, exc)
+            return False
+
+        if not self._apply_api_token(token):
+            return False
+
+        logger.info("[%s] Falling back to a local-dev JWT for localhost registration", self.label)
+        return True
+
     async def refresh_access_token(self) -> bool:
         """Refresh the daemon's user session token.
 
@@ -6456,8 +6479,11 @@ class ServerConnection:
 
         try:
             resp = await _register_once()
-            if resp.status_code == 401 and await self.refresh_access_token():
-                resp = await _register_once()
+            if resp.status_code == 401:
+                if await self.refresh_access_token():
+                    resp = await _register_once()
+                elif await self._apply_local_dev_token_fallback():
+                    resp = await _register_once()
             resp.raise_for_status()
             data = resp.json()
             self.runtime_id = data["runtime_id"]
@@ -6567,6 +6593,7 @@ class RuntimeDaemon:
         # prevents duplicate registrations when the hostname changes.
         self.daemon_id = settings.DAEMON_ID or self.hardware_id or platform.node()
         self.server_urls = settings.get_daemon_server_urls()
+        self._has_explicit_api_token = bool(str(settings.DAEMON_API_TOKEN or "").strip())
         self.api_token = settings.DAEMON_API_TOKEN
         # If no explicit token, try user JWT from ~/.forgexa/token (written by `forgexa login`)
         if not self.api_token:
@@ -6669,25 +6696,46 @@ class RuntimeDaemon:
     async def _mint_local_dev_token() -> str:
         """Mint a JWT for local development when no explicit token is configured.
 
-        Only works when running in-process with the backend package (``make daemon``).
-        Queries the first active user and creates a long-lived access token so the
-        runtime gets proper owner_id + organization_id assignment.
+        Queries the first available user and creates a long-lived access token so
+        the runtime gets proper owner_id + organization_id assignment.
+
+        Avoid importing app.core.security here: some local host-Python setups used
+        by `make dev` / `make restart` do not have password-hashing extras like
+        bcrypt installed, but they can still mint JWTs for localhost development.
         """
         try:
-            from app.core.security import create_access_token
             from app.database import engine
             from datetime import timedelta
-            from sqlalchemy import text
+            from sqlalchemy import case, select
+            from app.models.user import User
+
+            try:
+                import jwt as jwt_module
+            except Exception:
+                from jose import jwt as jwt_module
 
             async with engine.connect() as conn:
                 row = await conn.execute(
-                    text("SELECT id FROM users WHERE is_active = true ORDER BY created_at LIMIT 1")
+                    select(User.id)
+                    .order_by(
+                        case((User.status == "active", 0), else_=1),
+                        User.created_at,
+                    )
+                    .limit(1)
                 )
                 r = row.first()
                 uid = str(r[0]) if r else None
 
             if uid:
-                token = create_access_token({"sub": uid}, expires_delta=timedelta(days=30))
+                token = jwt_module.encode(
+                    {
+                        "sub": uid,
+                        "type": "access",
+                        "exp": datetime.now(timezone.utc) + timedelta(days=30),
+                    },
+                    settings.SECRET_KEY,
+                    algorithm="HS256",
+                )
                 logger.info("Minted local-dev JWT for user %s (no DAEMON_API_TOKEN configured)", uid)
                 return token
             logger.warning("No active users in database; cannot mint local-dev token")
@@ -6928,9 +6976,19 @@ class RuntimeDaemon:
             for url in self.server_urls:
                 if any(c.server_url == url.rstrip("/") for c in self.connections):
                     continue  # Already connected to this server
-                conn = ServerConnection(url, self.api_token, self.daemon_id, self.hardware_id)
+                conn = ServerConnection(
+                    url,
+                    self.api_token,
+                    self.daemon_id,
+                    self.hardware_id,
+                    local_dev_token_provider=(
+                        self._mint_local_dev_token
+                        if not self._has_explicit_api_token else None
+                    ),
+                )
                 try:
                     await conn.register(self.agents, self.max_concurrent)
+                    self.api_token = conn.api_token
                     conn.start_services(self.heartbeat_interval, self.poll_interval, self.agents)
                     await conn.start_heartbeat()
                     self.connections.append(conn)

{forgexa_cli-1.17.5 → forgexa_cli-1.18.0}/forgexa_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.17.5
+Version: 1.18.0
 Summary: Forgexa CLI — command-line client and AI agent runtime for the Forgexa platform
 Author-email: Jason Sun <dev.winds@gmail.com>
 License-Expression: MIT

{forgexa_cli-1.17.5 → forgexa_cli-1.18.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "forgexa-cli"
-version = "1.17.5"
+version = "1.18.0"
 description = "Forgexa CLI — command-line client and AI agent runtime for the Forgexa platform"
 requires-python = ">=3.9"
 license = "MIT"