forgexa-cli 1.42.1__tar.gz → 1.43.2__tar.gz

{forgexa_cli-1.42.1 → forgexa_cli-1.43.2}/PKG-INFO

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

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

{forgexa_cli-1.42.1 → forgexa_cli-1.43.2}/forgexa_cli/agent_core.py

@@ -1769,6 +1769,45 @@ def copilot_base_env(env: dict[str, str], *, copilot_home: str | Path) -> dict[s
     return env
 
 
+COPILOT_TOKEN_ENV_VARS = ("COPILOT_GITHUB_TOKEN", "GH_TOKEN", "GITHUB_TOKEN")
+
+
+def copilot_interactive_home() -> Path:
+    """Return the login home selected for interactive Copilot CLI use."""
+    configured_home = os.environ.get("COPILOT_HOME", "").strip()
+    if configured_home:
+        return Path(configured_home).expanduser()
+    return Path.home() / ".copilot"
+
+
+def copilot_recovery_home(destination_home: str | Path) -> Path | None:
+    """Return a populated login home distinct from the failed destination."""
+    destination = Path(destination_home).resolve()
+    candidates = (copilot_interactive_home(), Path.home() / ".copilot")
+    seen: set[Path] = set()
+    for candidate in candidates:
+        resolved = candidate.resolve()
+        if resolved in seen or resolved == destination:
+            continue
+        seen.add(resolved)
+        if (resolved / "config.json").is_file():
+            return resolved
+    return None
+
+
+def is_copilot_model_discovery_auth_error(*messages: str | None) -> bool:
+    """Return whether Copilot failed before work while resolving model access."""
+    detail = " ".join(str(message or "").lower() for message in messages)
+    return (
+        "421" in detail
+        and "misdirected request" in detail
+        and (
+            "retrieve the list of available models" in detail
+            or "failed to load models" in detail
+        )
+    )
+
+
 def copilot_auth_state_signature(copilot_home: str | Path) -> str | None:
     """Return a content signature for Copilot's persisted authentication state."""
     config_file = Path(copilot_home) / "config.json"
@@ -1786,6 +1825,65 @@ def _copilot_auth_lock_path(copilot_home: str | Path) -> Path:
     return home.with_name(f".{home.name}-auth-state.lock")
 
 
+def replace_copilot_auth_state(
+    source_home: str | Path,
+    destination_home: str | Path,
+    expected_destination_signature: str | None = None,
+) -> bool:
+    """Replace an isolated Copilot auth file from a known login home."""
+    source = Path(source_home) / "config.json"
+    destination_dir = Path(destination_home)
+    destination = destination_dir / source.name
+    if not source.is_file():
+        return False
+    lock_file = None
+    temp_name: str | None = None
+    try:
+        source_signature = copilot_auth_state_signature(source_home)
+        if source_signature is None:
+            return False
+        destination_dir.mkdir(parents=True, exist_ok=True)
+        lock_file = acquire_file_lock(
+            _copilot_auth_lock_path(destination_dir),
+            blocking=True,
+        )
+        if lock_file is None:
+            logger.warning("Could not lock Copilot authentication state for restore")
+            return False
+        destination_signature = copilot_auth_state_signature(destination_home)
+        if (
+            expected_destination_signature is not None
+            and destination_signature != expected_destination_signature
+        ):
+            return False
+        if destination_signature == source_signature:
+            return False
+        temp_fd, temp_name = tempfile.mkstemp(prefix=".config.json.", dir=destination_dir)
+        os.close(temp_fd)
+        shutil.copy2(source, temp_name)
+        os.chmod(temp_name, 0o600)
+        for attempt in range(3):
+            try:
+                os.replace(temp_name, destination)
+                temp_name = None
+                break
+            except PermissionError:
+                if sys.platform != "win32" or attempt == 2:
+                    raise
+                time.sleep(0.05)
+        return True
+    except OSError:
+        logger.warning("Could not restore interactive Copilot credentials", exc_info=True)
+        return False
+    finally:
+        if temp_name is not None:
+            try:
+                Path(temp_name).unlink(missing_ok=True)
+            except OSError:
+                logger.debug("Could not remove temporary Copilot config", exc_info=True)
+        release_file_lock(lock_file)
+
+
 def persist_copilot_auth_state(
     run_home: str | Path,
     persistent_home: str | Path,
@@ -1821,6 +1919,15 @@ def persist_copilot_auth_state(
         destination_signature = copilot_auth_state_signature(destination_dir)
         if destination_signature == source_signature:
             return
+        if (
+            baseline_signature is not None
+            and destination_signature != baseline_signature
+        ):
+            logger.info(
+                "Skipping stale Copilot authentication update because another "
+                "run refreshed the persistent state first"
+            )
+            return
         if baseline_signature is None and destination.is_file():
             if destination.stat().st_mtime_ns >= source.stat().st_mtime_ns:
                 return
@@ -1867,7 +1974,7 @@ def prepare_copilot_home() -> str:
     authentication state written by isolated runs is retained even when it
     has no counterpart in the interactive home.
     """
-    source_root = Path.home() / ".copilot"
+    source_root = copilot_interactive_home()
     target_root = Path.home() / ".forgexa" / "copilot-home"
     lock_file = None
     try:
@@ -1879,6 +1986,8 @@ def prepare_copilot_home() -> str:
         if lock_file is None:
             logger.warning("Could not lock Copilot home for synchronization")
             return str(target_root)
+        if source_root.resolve() == target_root.resolve():
+            return str(target_root)
         if not source_root.exists():
             return str(target_root)
 
@@ -1920,6 +2029,20 @@ def prepare_copilot_home() -> str:
                 migration_marker.touch(exist_ok=True)
                 os.chmod(migration_marker, 0o600)
 
+        source_auth_signature = copilot_auth_state_signature(source_root)
+        source_signature_marker = target_root.parent / ".copilot-login-source.sha256"
+        recorded_source_signature: str | None = None
+        if source_signature_marker.is_file():
+            try:
+                recorded_source_signature = source_signature_marker.read_text().strip()
+            except OSError:
+                logger.debug("Could not read Copilot login source signature", exc_info=True)
+        source_auth_changed = bool(
+            source_auth_signature
+            and recorded_source_signature is not None
+            and source_auth_signature != recorded_source_signature
+        )
+        source_config_synced = False
         for child in source_root.iterdir():
             if child.name in {"logs", "session-state"}:
                 continue
@@ -1937,11 +2060,15 @@ def prepare_copilot_home() -> str:
                 elif child.is_file():
                     if (
                         child.name == "config.json"
+                        and not source_auth_changed
                         and dest.is_file()
                         and dest.stat().st_mtime_ns >= child.stat().st_mtime_ns
                     ):
+                        source_config_synced = True
                         continue
                     shutil.copy2(child, dest)
+                    if child.name == "config.json":
+                        source_config_synced = True
             except OSError as exc:
                 logger.debug(
                     "Copilot home mirror skipped %s -> %s: %s",
@@ -1949,6 +2076,12 @@ def prepare_copilot_home() -> str:
                     dest,
                     exc,
                 )
+        if source_config_synced and source_auth_signature:
+            try:
+                source_signature_marker.write_text(source_auth_signature)
+                os.chmod(source_signature_marker, 0o600)
+            except OSError:
+                logger.debug("Could not record Copilot login source signature", exc_info=True)
     except OSError:
         logger.warning("Could not prepare writable Copilot home", exc_info=True)
     finally:

{forgexa_cli-1.42.1 → forgexa_cli-1.43.2}/forgexa_cli/daemon.py

@@ -910,7 +910,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.42.1"
+DAEMON_VERSION = "1.43.2"
 
 
 def _detect_client_type() -> str:
@@ -4781,7 +4781,8 @@ class ProcessManager:
         "error during sign-in",
         "websockettransporterror",
         "websocket receive failed",
-        "421 misdirected request",
+        "misdirected request",
+        "could not retrieve the list of available models",
         "failed to initialize mcp client",
         # "api error" removed: too broad — matches agent-generated code/output
         # discussing API errors. Real API transport errors are covered by the
@@ -5996,7 +5997,9 @@ class ProcessManager:
         *,
         disable_builtin_mcps: bool = False,
         _retry_without_effort: bool = False,
+        _retry_without_token_env: bool = False,
         _isolated_copilot_home: str | None = None,
+        _auth_state: dict[str, bool] | None = None,
     ) -> TaskResult:
         """Run GitHub Copilot CLI in non-interactive JSON-streaming mode.
 
@@ -6032,6 +6035,8 @@ class ProcessManager:
         # session-state persists from the prior attempt all todos are already
         # "done" and the agent exits immediately without producing any output.
         _is_outer_call = _isolated_copilot_home is None
+        if _auth_state is None:
+            _auth_state = {"persist": True}
         _master_copilot_home: str | None = None
         _copilot_auth_baseline: str | None = None
         if _is_outer_call:
@@ -6059,10 +6064,13 @@ class ProcessManager:
             os.environ.copy(),
             copilot_home=_isolated_copilot_home,
         )
+        if _retry_without_token_env:
+            for key in agent_core.COPILOT_TOKEN_ENV_VARS:
+                env.pop(key, None)
         auth_env_var = next(
             (
                 key
-                for key in ("COPILOT_GITHUB_TOKEN", "GH_TOKEN", "GITHUB_TOKEN")
+                for key in agent_core.COPILOT_TOKEN_ENV_VARS
                 if env.get(key)
             ),
             None,
@@ -6230,11 +6238,58 @@ class ProcessManager:
                     on_chunk,
                     disable_builtin_mcps=True,
                     _retry_without_effort=_retry_without_effort,
+                    _retry_without_token_env=_retry_without_token_env,
                     _isolated_copilot_home=_isolated_copilot_home,
+                    _auth_state=_auth_state,
                 )
                 retry_result.metrics["copilot_builtin_mcp_fallback"] = True
                 return retry_result
 
+            model_discovery_error = agent_core.is_copilot_model_discovery_auth_error(
+                *structured_errors,
+                stderr,
+            )
+            if model_discovery_error and not self._copilot_called_any_tools(stdout):
+                isolated_config = Path(_isolated_copilot_home) / "config.json"
+                recovery_home = agent_core.copilot_recovery_home(
+                    _isolated_copilot_home,
+                )
+                can_retry_native_auth = bool(
+                    isolated_config.is_file()
+                    or recovery_home is not None
+                )
+                if not _retry_without_token_env and can_retry_native_auth:
+                    restored_interactive_auth = bool(
+                        recovery_home
+                        and await asyncio.to_thread(
+                            agent_core.replace_copilot_auth_state,
+                            recovery_home,
+                            _isolated_copilot_home,
+                        )
+                    )
+                    logger.warning(
+                        "Copilot model discovery failed with HTTP 421 before work for "
+                        "task %s; retrying once with token environment variables removed%s",
+                        task_id,
+                        " and interactive login restored" if restored_interactive_auth else "",
+                    )
+                    retry_result = await self._run_copilot(
+                        agent,
+                        prompt,
+                        cwd,
+                        timeout,
+                        task_id,
+                        on_chunk,
+                        disable_builtin_mcps=disable_builtin_mcps,
+                        _retry_without_effort=_retry_without_effort,
+                        _retry_without_token_env=True,
+                        _isolated_copilot_home=_isolated_copilot_home,
+                        _auth_state=_auth_state,
+                    )
+                    retry_result.metrics["copilot_model_discovery_recovery"] = True
+                    return retry_result
+                _auth_state["persist"] = False
+
             if copilot_exit == 0 and returncode == 0:
                 return TaskResult(
                     status="success",
@@ -6290,7 +6345,9 @@ class ProcessManager:
                         agent, prompt, cwd, timeout, task_id, on_chunk,
                         disable_builtin_mcps=disable_builtin_mcps,
                         _retry_without_effort=True,
+                        _retry_without_token_env=_retry_without_token_env,
                         _isolated_copilot_home=_isolated_copilot_home,
+                        _auth_state=_auth_state,
                     )
                 # Exhausted retries — emit an actionable diagnostic hint
                 if effective_rc == 1 and _no_tools and not copilot_specific_error:
@@ -6390,7 +6447,7 @@ class ProcessManager:
         finally:
             self.active_processes.pop(task_id, None)
             if _is_outer_call and _isolated_copilot_home:
-                if _master_copilot_home:
+                if _master_copilot_home and _auth_state["persist"]:
                     await asyncio.to_thread(
                         agent_core.persist_copilot_auth_state,
                         _isolated_copilot_home,

{forgexa_cli-1.42.1 → forgexa_cli-1.43.2}/forgexa_cli.egg-info/PKG-INFO

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

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