forgexa-cli 1.18.4__tar.gz → 1.18.5__tar.gz

{forgexa_cli-1.18.4 → forgexa_cli-1.18.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.18.4
+Version: 1.18.5
 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.18.4 → forgexa_cli-1.18.5}/forgexa_cli/__init__.py

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

{forgexa_cli-1.18.4 → forgexa_cli-1.18.5}/forgexa_cli/daemon.py

@@ -104,6 +104,34 @@ def _save_cli_tokens(access_token: str, refresh_token: str | None = None) -> Non
     token_path.chmod(0o600)
 
 
+def _extract_access_token_subject(token: str | None) -> str | None:
+    raw = str(token or "").strip()
+    if not raw:
+        return None
+
+    parts = raw.split(".")
+    if len(parts) != 3:
+        return None
+
+    payload = parts[1]
+    payload += "=" * (-len(payload) % 4)
+    try:
+        data = json.loads(base64.urlsafe_b64decode(payload.encode("utf-8")))
+    except Exception:
+        return None
+
+    subject = str(data.get("sub") or "").strip()
+    if not subject:
+        return None
+
+    try:
+        UUID(subject)
+    except (TypeError, ValueError):
+        return None
+
+    return subject
+
+
 def _looks_like_pipx_environment(python_path: str | None = None) -> bool:
     candidate = (python_path or sys.executable or "").replace("\\", "/").lower()
     return "/pipx/venvs/" in candidate
@@ -527,7 +555,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.18.4"
+DAEMON_VERSION = "1.18.5"
 
 
 def _detect_client_type() -> str:
@@ -3574,6 +3602,16 @@ class ProcessManager:
         "not found the model",              # decoded Kimi 404 body
         "provider.api_error",               # Kimi SDK error prefix
         "kimi authentication required",     # pre-flight oauth check sentinel
+        # Generic auth/login failures. These are evaluated only against failure
+        # channels, so they are safe to treat as fallback-worthy.
+        "not logged in",
+        "please run /login",
+        "please log in",
+        "authentication failed",
+        "authentication_failed",
+        "authentication required",
+        "authenticate with the github",
+        "gh auth login",
     ]
 
     def __init__(self):
@@ -4772,8 +4810,8 @@ class ProcessManager:
         even when XDG paths are set. That can fail with EROFS inside the daemon.
 
         Point Claude at writable daemon-owned directories, redirect HOME to
-        the same writable sandbox, and mirror only the small set of user
-        config files it needs for headless execution.
+        the same writable sandbox, and mirror the user's Claude home state so
+        the isolated subprocess keeps the interactive login/session context.
         """
         if sandbox_root is None:
             sandbox_root = Path.home() / ".forgexa" / "claude-home"
@@ -4794,6 +4832,16 @@ class ProcessManager:
         ):
             path.mkdir(parents=True, exist_ok=True)
 
+        source_claude_dir = Path.home() / ".claude"
+        try:
+            if source_claude_dir.is_dir():
+                shutil.copytree(source_claude_dir, home_claude_dir, dirs_exist_ok=True)
+        except Exception as exc:
+            logger.debug(
+                "Claude home mirror skipped %s -> %s: %s",
+                source_claude_dir, home_claude_dir, exc,
+            )
+
         source_files = [
             (Path.home() / ".claude.json", sandbox_root / ".claude.json"),
             (Path.home() / ".claude.json", claude_config_dir / ".claude.json"),
@@ -6720,17 +6768,36 @@ class RuntimeDaemon:
             except Exception:
                 from jose import jwt as jwt_module
 
+            token_path = Path.home() / ".forgexa" / "token"
+            preferred_user_id = None
+            try:
+                if token_path.exists():
+                    preferred_user_id = _extract_access_token_subject(token_path.read_text().strip())
+            except OSError:
+                preferred_user_id = None
+
             async with engine.connect() as conn:
-                row = await conn.execute(
-                    select(User.id)
-                    .order_by(
-                        case((User.status == "active", 0), else_=1),
-                        User.created_at,
+                uid = None
+                if preferred_user_id:
+                    preferred_result = await conn.execute(
+                        select(User.id)
+                        .where(User.id == UUID(preferred_user_id))
+                        .limit(1)
                     )
-                    .limit(1)
-                )
-                r = row.first()
-                uid = str(r[0]) if r else None
+                    preferred_row = preferred_result.first()
+                    uid = str(preferred_row[0]) if preferred_row else None
+
+                if not uid:
+                    row = await conn.execute(
+                        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 = jwt_module.encode(

{forgexa_cli-1.18.4 → forgexa_cli-1.18.5}/forgexa_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forgexa-cli
-Version: 1.18.4
+Version: 1.18.5
 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.18.4 → forgexa_cli-1.18.5}/pyproject.toml

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