kiwi-code 0.0.443__tar.gz → 0.0.445__tar.gz

{kiwi_code-0.0.443 → kiwi_code-0.0.445}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kiwi-code
-Version: 0.0.443
+Version: 0.0.445
 Summary: A textual-based terminal user interface application
 Project-URL: Homepage, https://meetkiwi.ai
 Project-URL: Repository, https://github.com/jetoslabs/kiwi-code

{kiwi_code-0.0.443 → kiwi_code-0.0.445}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kiwi-code"
-version = "0.0.443"
+version = "0.0.445"
 description = "A textual-based terminal user interface application"
 readme = {file = "README.md", content-type = "text/markdown"}
 requires-python = ">=3.11,<4.0"

{kiwi_code-0.0.443 → kiwi_code-0.0.445}/src/kiwi_cli/__init__.py

@@ -1,3 +1,3 @@
 """Kiwi CLI - command-line interface and shared infrastructure modules."""
 
-__version__ = "0.0.443"
+__version__ = "0.0.445"

{kiwi_code-0.0.443 → kiwi_code-0.0.445}/src/kiwi_cli/cli.py

@@ -8,23 +8,26 @@ from .auth import TokenManager
 from .models import AppConfig
 from .server import http_url_from_server
 from . import commands
+from . import __version__ as KIWI_CLI_VERSION
 
 app = typer.Typer(name="kiwi", help="Kiwi — interact with the Kiwi AI platform.")
 
 actions_app = typer.Typer(name="actions", help="Manage actions.")
 action_runs_app = typer.Typer(name="runs", help="Manage action runs (results).")
-graphs_app = typer.Typer(name="graphs", help="Manage action graphs.")
-graph_runs_app = typer.Typer(name="graph-runs", help="Manage action graph runs (results).")
 
 app.add_typer(actions_app)
 app.add_typer(action_runs_app)
-app.add_typer(graphs_app)
-app.add_typer(graph_runs_app)
 
 # NOTE: kiwi-runtime is a standalone executable; this CLI does not manage it.
 
 _SERVER: str | None = None
 
+def _version_callback(value: bool) -> None:
+    if value:
+        typer.echo(f"kiwicli {KIWI_CLI_VERSION}")
+        raise typer.Exit()
+
+
 @app.callback()
 def _main(
     server: Optional[str] = typer.Option(
@@ -35,6 +38,13 @@ def _main(
             "or a full URL (e.g. https://custom.server.com)."
         ),
     ),
+    version: Optional[bool] = typer.Option(
+        None,
+        "--version",
+        callback=_version_callback,
+        is_eager=True,
+        help="Show version and exit.",
+    ),
 ):
     """Global options for `kiwicli`."""
     global _SERVER
@@ -181,40 +191,6 @@ def runs_get_cmd(id: str = typer.Argument(help="Action run ID")):
     _print(_run_with_refresh_retry(lambda c: commands.runs_get(c, id=id)))
 
 
-# -- graphs -----------------------------------------------------------------
-
-@graphs_app.command("list")
-def graphs_list_cmd(
-    name: Optional[str] = typer.Option(None, help="Filter by name"),
-    limit: int = typer.Option(20, help="Max results"),
-    offset: int = typer.Option(0, help="Offset"),
-):
-    """List action graphs."""
-    _print(_run_with_refresh_retry(lambda c: commands.graphs_list(c, name=name, limit=limit, offset=offset)))
-
-@graphs_app.command("get")
-def graphs_get_cmd(id: str = typer.Argument(help="Action graph ID")):
-    """Get action graph details."""
-    _print(_run_with_refresh_retry(lambda c: commands.graphs_get(c, id=id)))
-
-
-# -- graph-runs -------------------------------------------------------------
-
-@graph_runs_app.command("list")
-def graph_runs_list_cmd(
-    graph_id: Optional[str] = typer.Option(None, "--graph-id", help="Filter by graph ID"),
-    graph_name: Optional[str] = typer.Option(None, "--graph-name", help="Filter by graph name"),
-    status: Optional[str] = typer.Option(None, help="Filter by status"),
-    limit: int = typer.Option(20, help="Max results"),
-    offset: int = typer.Option(0, help="Offset"),
-):
-    """List action graph runs (results)."""
-    _print(_run_with_refresh_retry(lambda c: commands.graph_runs_list(c, action_graph_id=graph_id, action_graph_name=graph_name, status=status, limit=limit, offset=offset)))
-
-@graph_runs_app.command("get")
-def graph_runs_get_cmd(id: str = typer.Argument(help="Graph run ID")):
-    """Get action graph run details."""
-    _print(_run_with_refresh_retry(lambda c: commands.graph_runs_get(c, id=id)))
 
 
 # -- runtime ----------------------------------------------------------------

{kiwi_code-0.0.443 → kiwi_code-0.0.445}/src/kiwi_cli/commands.py

@@ -14,14 +14,7 @@ from autobots_client.api.action_results import (
     list_action_result_v1_action_results_get,
     get_action_result_v1_action_results_id_get,
 )
-from autobots_client.api.action_graphs import (
-    list_action_graphs_v1_action_graphs_get,
-    get_action_graph_v1_action_graphs_id_get,
-)
-from autobots_client.api.action_graphs_results import (
-    list_action_graph_result_v1_action_graphs_results_get,
-    get_action_graph_result_v1_action_graphs_results_id_get,
-)
+
 from autobots_client.types import UNSET
 
 
@@ -157,122 +150,7 @@ def runs_get(client: AuthenticatedClient, *, id: str) -> list[str]:
     return lines
 
 
-# graphs (action graphs)
-
-def graphs_list(client: AuthenticatedClient, *, name: Optional[str] = None, limit: int = 20, offset: int = 0) -> list[str]:
-    """List action graphs. Returns output lines."""
-    resp = list_action_graphs_v1_action_graphs_get.sync_detailed(
-        client=client,
-        name=name if name else UNSET,
-        limit=limit,
-        offset=offset,
-    )
-    if resp.status_code != 200:
-        return [f"Error: HTTP {resp.status_code}"]
-
-    result = resp.parsed
-    lines = [
-        f"Action Graphs ({result.total_count} total, showing {result.offset}-{result.offset + len(result.docs)}):",
-        "",
-        f"{'ID':<28} {'Name':<30} {'Ver':<6} {'Published':<10} {'Created'}",
-        "-" * 105,
-    ]
-    for doc in result.docs:
-        lines.append(
-            f"{doc.field_id:<28} {_val(doc.name):<30} {_val(doc.version):<6} "
-            f"{_val(doc.is_published):<10} {_fmt_date(doc.created_at)}"
-        )
-    return lines
-
-
-def graphs_get(client: AuthenticatedClient, *, id: str) -> list[str]:
-    """Get action graph details. Returns output lines."""
-    resp = get_action_graph_v1_action_graphs_id_get.sync_detailed(id=id, client=client)
-    if resp.status_code != 200:
-        return [f"Error: HTTP {resp.status_code}"]
-
-    doc = resp.parsed
-    if hasattr(doc, 'field_id'):
-        return [
-            f"ID:          {doc.field_id}",
-            f"Name:        {_val(getattr(doc, 'name', ''))}",
-            f"Version:     {_val(getattr(doc, 'version', ''))}",
-            f"Description: {_val(getattr(doc, 'description', ''))}",
-            f"Published:   {_val(getattr(doc, 'is_published', ''))}",
-            f"Created:     {_fmt_date(getattr(doc, 'created_at', None))}",
-            f"Updated:     {_fmt_date(getattr(doc, 'updated_at', None))}",
-        ]
-    import json
-    if hasattr(doc, 'to_dict'):
-        return [json.dumps(doc.to_dict(), indent=2, default=str)]
-    return [str(doc)]
-
-
-# graph-runs (action graph results)
-
-def graph_runs_list(client: AuthenticatedClient, *, action_graph_id: Optional[str] = None,
-                    action_graph_name: Optional[str] = None, status: Optional[str] = None,
-                    limit: int = 20, offset: int = 0) -> list[str]:
-    """List action graph runs. Returns output lines."""
-    from autobots_client.models.event_result_status import EventResultStatus
-
-    status_enum = UNSET
-    if status:
-        try:
-            status_enum = EventResultStatus(status.lower())
-        except ValueError:
-            return [f"Invalid status: {status}. Valid: processing, success, error, stuck, waiting"]
-
-    resp = list_action_graph_result_v1_action_graphs_results_get.sync_detailed(
-        client=client,
-        action_graph_id=action_graph_id if action_graph_id else UNSET,
-        action_graph_name=action_graph_name if action_graph_name else UNSET,
-        status=status_enum,
-        limit=limit,
-        offset=offset,
-    )
-    if resp.status_code != 200:
-        return [f"Error: HTTP {resp.status_code}"]
-
-    result = resp.parsed
-    lines = [
-        f"Action Graph Runs ({result.total_count} total, showing {result.offset}-{result.offset + len(result.docs)}):",
-        "",
-        f"{'ID':<28} {'Status':<12} {'Name':<30} {'Created':<18} {'Updated'}",
-        "-" * 105,
-    ]
-    for doc in result.docs:
-        lines.append(
-            f"{doc.field_id:<28} {doc.status.value:<12} {_val(doc.name):<30} "
-            f"{_fmt_date(doc.created_at):<18} {_fmt_date(doc.updated_at)}"
-        )
-    return lines
-
-
-def graph_runs_get(client: AuthenticatedClient, *, id: str) -> list[str]:
-    """Get action graph run details. Returns output lines."""
-    resp = get_action_graph_result_v1_action_graphs_results_id_get.sync_detailed(id=id, client=client)
-    if resp.status_code != 200:
-        return [f"Error: HTTP {resp.status_code}"]
 
-    doc = resp.parsed
-    lines = [
-        f"ID:          {doc.field_id}",
-        f"Status:      {doc.status.value}",
-        f"Name:        {_val(doc.name)}",
-        f"Type:        {doc.type_.value}",
-        f"Saved:       {_val(doc.is_saved)}",
-        f"Created:     {_fmt_date(doc.created_at)}",
-        f"Updated:     {_fmt_date(doc.updated_at)}",
-    ]
-    if doc.result and not isinstance(doc.result, type(UNSET)):
-        lines += [
-            "",
-            "Action Graph:",
-            f"  Name:    {doc.result.name}",
-            f"  ID:      {doc.result.field_id}",
-        ]
-    return lines
 
 
 # Command dispatcher — parses "/command args" from TUI input
@@ -309,10 +187,6 @@ Query:
   /autocode-select     Choose the version of AutoCode you wish to use
   /runs list [--action-id ID] [--status STATUS] [--limit N]
   /runs get <id>
-  /graphs list [--name NAME] [--limit N]
-  /graphs get <id>
-  /graph-runs list [--graph-id ID] [--status STATUS] [--limit N]
-  /graph-runs get <id>
 
   /help                 Show this help"""
 
@@ -400,39 +274,6 @@ def dispatch(command_str: str, client: AuthenticatedClient) -> list[str]:
             else:
                 return ["Usage: /runs list | /runs get <id>"]
 
-        elif group == "graphs":
-            if sub == "list":
-                return graphs_list(
-                    client,
-                    name=opts.get("name"),
-                    limit=_int(opts.get("limit", "20"), 20),
-                    offset=_int(opts.get("offset", "0"), 0),
-                )
-            elif sub == "get":
-                pos = opts.get("_positional", [])
-                if not pos:
-                    return ["Usage: /graphs get <id>"]
-                return graphs_get(client, id=pos[0])
-            else:
-                return ["Usage: /graphs list | /graphs get <id>"]
-
-        elif group in ("graph-runs", "graph_runs"):
-            if sub == "list":
-                return graph_runs_list(
-                    client,
-                    action_graph_id=opts.get("graph_id"),
-                    action_graph_name=opts.get("graph_name"),
-                    status=opts.get("status"),
-                    limit=_int(opts.get("limit", "20"), 20),
-                    offset=_int(opts.get("offset", "0"), 0),
-                )
-            elif sub == "get":
-                pos = opts.get("_positional", [])
-                if not pos:
-                    return ["Usage: /graph-runs get <id>"]
-                return graph_runs_get(client, id=pos[0])
-            else:
-                return ["Usage: /graph-runs list | /graph-runs get <id>"]
 
         else:
             return [f"Unknown command: /{group}", "", HELP_TEXT]

{kiwi_code-0.0.443 → kiwi_code-0.0.445}/src/kiwi_runtime/__init__.py

@@ -1,3 +1,3 @@
 """Kiwi Runtime — terminal agent that connects to the server via WebSocket."""
 
-__version__ = "0.0.443"
+__version__ = "0.0.445"

{kiwi_code-0.0.443 → kiwi_code-0.0.445}/src/kiwi_runtime/main.py

@@ -46,6 +46,7 @@ if not IS_WINDOWS:
 import httpx
 import websockets
 import threading
+from kiwi_runtime import __version__ as KIWI_RUNTIME_VERSION
 FS_MAX_CONCURRENCY = 8
 
 # Shared token storage (used by both kiwi-code and standalone kiwi-runtime)
@@ -55,6 +56,11 @@ TOKEN_EXPIRY_SKEW_SEC = 60  # refresh a bit early to avoid edge cases
 KIWI_TMP_DIR = Path.home() / ".kiwi" / "tmp"
 
 
+class _AuthRetry(Exception):
+    def __init__(self, token: str, reason: str | None = None) -> None:
+        super().__init__(reason or "auth_retry")
+        self.token = token
+
 def _parse_expires_at(value: Any) -> datetime | None:
     """Parse expires_at from tokens.json.
 
@@ -4226,6 +4232,8 @@ async def connect(
     allowed_dirs: list[str] | None = None,
     agent_id: str | None = None,
     consumer_id: str | None = None,
+    relogin_email: str | None = None,
+    relogin_password: str | None = None,
     *,
     max_retries: int = 12,
  ):
@@ -4312,6 +4320,8 @@ async def connect(
                     allowed_dirs=allowed_dirs,
                     agent_id=agent_id,
                     consumer_id=consumer_id,
+                    relogin_email=relogin_email,
+                    relogin_password=relogin_password,
                     command_queue=command_queue,
                     pending_results=pending_results,
                     pending_lock=pending_lock,
@@ -4321,6 +4331,9 @@ async def connect(
                 return
             except asyncio.CancelledError:
                 raise
+            except _AuthRetry as e:
+                token = str(e.token or token)
+                continue
             except websockets.exceptions.ConnectionClosed as e:
                 print()
                 print_status("!", f"Connection closed: {e}", YELLOW)
@@ -4358,6 +4371,8 @@ async def _connect_once(
     allowed_dirs: list[str] | None = None,
     agent_id: str | None = None,
     consumer_id: str | None = None,
+    relogin_email: str | None = None,
+    relogin_password: str | None = None,
     *,
     command_queue: asyncio.Queue[tuple[str, str]],
     pending_results: deque[dict[str, Any]],
@@ -4372,7 +4387,7 @@ async def _connect_once(
             ws_endpoint,
             ping_interval=20,
             ping_timeout=90,
-            close_timeout=10,
+            close_timeout=60,
             max_queue=64,
         ) as ws:
 
@@ -4395,7 +4410,22 @@ async def _connect_once(
             await ws.send(json.dumps(auth_msg))
             auth_resp = json.loads(await ws.recv())
             if auth_resp.get("type") == "error":
-                print_status("x", f"Auth failed: {auth_resp.get('message')}", RED)
+                err_msg = str(auth_resp.get("message") or "").strip()
+                print_status("x", f"Auth failed: {err_msg}", RED)
+
+                should_relogin = (
+                    bool(relogin_email)
+                    and bool(relogin_password)
+                    and any(x in err_msg.lower() for x in ("expired", "invalid"))
+                )
+                if should_relogin:
+                    try:
+                        new_token = await login(http_base_url, str(relogin_email), str(relogin_password))
+                        raise _AuthRetry(new_token, reason=err_msg)
+                    except _AuthRetry:
+                        raise
+                    except Exception as e:
+                        print_status("x", f"Re-authentication failed: {e}", RED)
                 return
 
             if auth_resp.get("type") == "auth_ok":
@@ -4856,6 +4886,8 @@ def main():
     subparsers = parser.add_subparsers(dest="command")
 
     connect_parser = subparsers.add_parser("connect", help="Connect to the server")
+
+    parser.add_argument("--version", action="version", version=f"kiwi-runtime {KIWI_RUNTIME_VERSION}")
     connect_parser.add_argument(
         "--server",
         default="app",
@@ -4955,6 +4987,10 @@ def main():
         loop = asyncio.new_event_loop()
         agent_id = str(uuid.uuid4())
 
+
+        relogin_email: str | None = None
+        relogin_password: str | None = None
+
         provided_token = args.token or os.environ.get("KIWI_AUTH_TOKEN")
         if provided_token:
             # Use provided token — skip interactive login
@@ -4970,6 +5006,9 @@ def main():
                 else:
                     email = input(f"  {C}>{RESET}  Email: ")
                 password = getpass.getpass(f"  {C}>{RESET}  Password: ")
+                # Keep credentials in-memory so we can re-authenticate on token expiry.
+                relogin_email = email
+                relogin_password = password
                 print()
                 print_status(">", f"Agent ID: {BOLD}{agent_id}{RESET}", GREY)
 
@@ -5006,7 +5045,17 @@ def main():
         signal.signal(signal.SIGINT, lambda *_: shutdown())
 
         try:
-            loop.run_until_complete(connect(ws_url, token, http_base_url=http_url, mode=mode, allowed_dirs=allowed_dirs, agent_id=agent_id, consumer_id=args.run_id,))
+            loop.run_until_complete(connect(
+                ws_url,
+                token,
+                http_base_url=http_url,
+                mode=mode,
+                allowed_dirs=allowed_dirs,
+                agent_id=agent_id,
+                consumer_id=args.run_id,
+                relogin_email=relogin_email,
+                relogin_password=relogin_password,
+            ))
         except asyncio.CancelledError:
             pass
         finally:

{kiwi_code-0.0.443 → kiwi_code-0.0.445}/src/kiwi_tui/__init__.py

@@ -1,3 +1,3 @@
 """Autobots TUI - A textual-based terminal user interface."""
 
-__version__ = "0.0.443"
+__version__ = "0.0.445"