swiftgate-cli 1.0.4__tar.gz → 1.0.6__tar.gz

{swiftgate_cli-1.0.4 → swiftgate_cli-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: swiftgate-cli
-Version: 1.0.4
+Version: 1.0.6
 Summary: SwiftGate CLI — autonomous bidirectional agent bridge for SwiftGate OS
 Project-URL: Homepage, https://swiftgate.ai
 Project-URL: Repository, https://github.com/thetaroot/swiftgate

{swiftgate_cli-1.0.4 → swiftgate_cli-1.0.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "swiftgate-cli"
-version = "1.0.4"
+version = "1.0.6"
 description = "SwiftGate CLI — autonomous bidirectional agent bridge for SwiftGate OS"
 readme = "README.md"
 license = { text = "MIT" }

{swiftgate_cli-1.0.4 → swiftgate_cli-1.0.6}/src/swiftgate_cli/agent_bridge.py

@@ -146,7 +146,7 @@ class AgentBridge:
         if not self._running or self._master_fd is None:
             return
 
-        msg = f"\nSwiftGate: You have {count} pending tasks. Call swiftgate_agent_get_task\n"
+        msg = f"\r\nSwiftGate: You have {count} pending tasks. Call swiftgate_agent_get_task\r\n"
         try:
             os.write(self._master_fd, msg.encode("utf-8"))
             logger.debug("Wake injected for %s (%d pending)", self._slug, count)
@@ -159,6 +159,7 @@ class AgentBridge:
         """Forward stdin → agent pty, agent pty → stdout.
 
         Runs in the asyncio event loop. Blocks until agent exits.
+        Monitors terminal size every 250ms and propagates to the pty.
         """
         if not self._running or self._master_fd is None:
             return
@@ -179,23 +180,26 @@ class AgentBridge:
         except (termios.error, OSError):
             pass
 
-        # SIGWINCH handler: propagate terminal resize to pty
-        old_winch = signal.SIG_DFL
-
-        def _resize_pty(_sig: int, _frame) -> None:
-            try:
-                cols, rows = os.get_terminal_size()
-                winsize = struct.pack("HHHH", rows, cols, 0, 0)
-                fcntl.ioctl(master_fd, termios.TIOCSWINSZ, winsize)
-                os.environ["COLUMNS"] = str(cols)
-                os.environ["LINES"] = str(rows)
-            except OSError:
-                pass
-
-        try:
-            old_winch = signal.signal(signal.SIGWINCH, _resize_pty)
-        except OSError:
-            pass
+        # Periodic terminal resize poller — robust across ttyd/container envs
+        _last_cols = 0
+        _last_rows = 0
+
+        async def _resize_poller():
+            nonlocal _last_cols, _last_rows
+            while self._running:
+                await asyncio.sleep(0.25)
+                try:
+                    term_size = os.get_terminal_size()
+                    if (term_size.columns, term_size.lines) != (_last_cols, _last_rows):
+                        winsize = struct.pack("HHHH", term_size.lines, term_size.columns, 0, 0)
+                        fcntl.ioctl(master_fd, termios.TIOCSWINSZ, winsize)
+                        os.environ["COLUMNS"] = str(term_size.columns)
+                        os.environ["LINES"] = str(term_size.lines)
+                        _last_cols, _last_rows = term_size.columns, term_size.lines
+                except OSError:
+                    pass
+
+        resize_task = asyncio.create_task(_resize_poller())
 
         stop_event = asyncio.Event()
 
@@ -240,6 +244,13 @@ class AgentBridge:
         except Exception:
             pass
 
+        # Cleanup resize poller
+        resize_task.cancel()
+        try:
+            await resize_task
+        except (asyncio.CancelledError, Exception):
+            pass
+
         # Restore terminal
         if old_tc:
             try:
@@ -247,13 +258,6 @@ class AgentBridge:
             except (termios.error, OSError):
                 pass
 
-        # Restore SIGWINCH handler
-        if old_winch != signal.SIG_DFL:
-            try:
-                signal.signal(signal.SIGWINCH, old_winch)
-            except OSError:
-                pass
-
     # ── Lifecycle ────────────────────────────────────────────────────────────
 
     async def wait(self) -> int:

{swiftgate_cli-1.0.4 → swiftgate_cli-1.0.6}/src/swiftgate_cli/api_client.py

@@ -74,6 +74,26 @@ class APIClient:
         except Exception:
             return False
 
+    async def fetch_agent_token(self, workspace_slug: str) -> dict | None:
+        """Fetch MCP token + agent config from SwiftGate.
+
+        Authenticated via account token. Returns dict with
+        mcp_token, agent_type, server_url or None on failure.
+        """
+        url = self._cli_url("start-agent")
+        try:
+            async with aiohttp.ClientSession() as session:
+                async with session.post(
+                    url, json={"workspace_slug": workspace_slug},
+                    headers=self._headers(),
+                    timeout=aiohttp.ClientTimeout(total=10),
+                ) as resp:
+                    if resp.status != 200:
+                        return None
+                    return await resp.json()
+        except Exception:
+            return None
+
     def get_sse_url(self) -> str:
         """URL for the CLI SSE wake stream."""
         return self._cli_url("listen")

{swiftgate_cli-1.0.4 → swiftgate_cli-1.0.6}/src/swiftgate_cli/main.py

@@ -39,7 +39,7 @@ logger = logging.getLogger("swiftgate")
 
 
 @click.group()
-@click.version_option(version="1.0.4", prog_name="swiftgate-cli")
+@click.version_option(version="1.0.6", prog_name="swiftgate-cli")
 def cli():
     """swiftgate-cli — Autonomous bidirectional agent bridge for SwiftGate OS.
 
@@ -84,16 +84,12 @@ def setup(token: str, server: str):
 
 @cli.command()
 @click.option("--agent", required=True, help="Agent workspace slug")
-@click.option("--mcp-token", default="", help="MCP token from agent registration (sg_ea_...)")
+@click.option("--mcp-token", default="", help="MCP token (optional — auto-fetched if not provided)")
 def start(agent: str, mcp_token: str):
     """Start an agent and bridge it to SwiftGate.
 
-    Fetches agent config from SwiftGate, writes MCP configuration,
-    spawns the agent process, and starts the SSE wake listener.
-    stdin/stdout is forwarded transparently.
-
-    The MCP token is required on first start. It is stored in
-    ~/.swiftgate/config.json for subsequent starts.
+    MCP token is auto-fetched from SwiftGate using the account token.
+    No copy-paste needed — just run: swiftgate-cli start --agent my-agent
     """
     asyncio.run(_start_async(agent, mcp_token))
 
@@ -103,18 +99,28 @@ async def _start_async(agent: str, mcp_token: str) -> None:
         click.echo(click.style("Not set up. Run: swiftgate-cli setup --token sg_acc_...", fg="red"))
         sys.exit(1)
 
+    client = APIClient()
+
     token = mcp_token or _get_stored_token(agent)
+    agent_type = _get_stored_type(agent) or "opencode"
+
     if not token:
-        click.echo(click.style(
-            "MCP token required. Copy the full command from the agent creation screen.",
-            fg="yellow"))
-        click.echo(f"Usage: swiftgate-cli start --agent {agent} --mcp-token sg_ea_...")
-        sys.exit(1)
+        click.echo("Fetching agent config from SwiftGate...")
+        config = await client.fetch_agent_token(agent)
+        if config and config.get("mcp_token"):
+            token = config["mcp_token"]
+            agent_type = config.get("agent_type") or agent_type
+            _store_token(agent, token)
+            _store_type(agent, agent_type)
+        else:
+            click.echo(click.style(
+                "Could not fetch agent config. Provide MCP token manually:",
+                fg="yellow"))
+            click.echo(f"Usage: swiftgate-cli start --agent {agent} --mcp-token sg_ea_...")
+            sys.exit(1)
 
     if mcp_token and mcp_token.startswith("sg_ea_"):
         _store_token(agent, mcp_token)
-
-    agent_type = _get_stored_type(agent) or "opencode"
     command = _agent_command(agent_type)
     if not command:
         click.echo(click.style(f"Unknown agent type: {agent_type}", fg="red"))
@@ -224,6 +230,14 @@ def _store_token(slug: str, token: str) -> None:
     save(cfg)
 
 
+def _store_type(slug: str, agent_type: str) -> None:
+    """Save agent type to local config."""
+    from swiftgate_cli.config import load, save
+    cfg = load()
+    cfg.setdefault("agents", {}).setdefault(slug, {})["type"] = agent_type
+    save(cfg)
+
+
 def _get_stored_type(slug: str) -> str:
     """Get saved agent type from local config."""
     from swiftgate_cli.config import load