KohakuTerrarium 2.0.0.dev17__tar.gz → 2.0.0.dev19__tar.gz

{kohakuterrarium-2.0.0.dev17/src/KohakuTerrarium.egg-info → kohakuterrarium-2.0.0.dev19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: KohakuTerrarium
-Version: 2.0.0.dev17
+Version: 2.0.0.dev19
 Summary: A universal agent framework for building self-driven AI agents and multi-agent teams
 Author-email: "Shih-Ying Yeh (KohakuBlueLeaf)" <apolloyeh0123@gmail.com>
 License-Expression: LicenseRef-KohakuTerrarium-1.0

{kohakuterrarium-2.0.0.dev17 → kohakuterrarium-2.0.0.dev19}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "KohakuTerrarium"
-version = "2.0.0.dev17"
+version = "2.0.0.dev19"
 description = "A universal agent framework for building self-driven AI agents and multi-agent teams"
 authors = [
     { name = "Shih-Ying Yeh (KohakuBlueLeaf)", email = "apolloyeh0123@gmail.com" },
@@ -291,7 +291,7 @@ select = ["F401", "F841"]
 [tool.briefcase]
 project_name = "KohakuTerrarium"
 bundle = "com.kohaku.terrarium"
-version = "2.0.0.dev17"
+version = "2.0.0.dev19"
 url = "https://github.com/Kohaku-Lab/KohakuTerrarium"
 # License is read from PEP 639 ``[project]`` above; Briefcase
 # 0.3.21+ no longer accepts ``license.file`` here.

{kohakuterrarium-2.0.0.dev17 → kohakuterrarium-2.0.0.dev19/src/KohakuTerrarium.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: KohakuTerrarium
-Version: 2.0.0.dev17
+Version: 2.0.0.dev19
 Summary: A universal agent framework for building self-driven AI agents and multi-agent teams
 Author-email: "Shih-Ying Yeh (KohakuBlueLeaf)" <apolloyeh0123@gmail.com>
 License-Expression: LicenseRef-KohakuTerrarium-1.0

{kohakuterrarium-2.0.0.dev17 → kohakuterrarium-2.0.0.dev19}/src/KohakuTerrarium.egg-info/SOURCES.txt

@@ -161,6 +161,7 @@ src/kohakuterrarium/builtin_skills/subagents/summarize.md
 src/kohakuterrarium/builtin_skills/subagents/worker.md
 src/kohakuterrarium/builtin_skills/tools/ask_user.md
 src/kohakuterrarium/builtin_skills/tools/bash.md
+src/kohakuterrarium/builtin_skills/tools/delete_trigger.md
 src/kohakuterrarium/builtin_skills/tools/edit.md
 src/kohakuterrarium/builtin_skills/tools/glob.md
 src/kohakuterrarium/builtin_skills/tools/grep.md
@@ -195,6 +196,7 @@ src/kohakuterrarium/builtins/cli_rich/__init__.py
 src/kohakuterrarium/builtins/cli_rich/app.py
 src/kohakuterrarium/builtins/cli_rich/app_multi.py
 src/kohakuterrarium/builtins/cli_rich/app_output.py
+src/kohakuterrarium/builtins/cli_rich/app_pickers.py
 src/kohakuterrarium/builtins/cli_rich/commit.py
 src/kohakuterrarium/builtins/cli_rich/completer.py
 src/kohakuterrarium/builtins/cli_rich/composer.py
@@ -260,6 +262,8 @@ src/kohakuterrarium/builtins/tools/__init__.py
 src/kohakuterrarium/builtins/tools/ask_user.py
 src/kohakuterrarium/builtins/tools/bash.py
 src/kohakuterrarium/builtins/tools/bash_windows.py
+src/kohakuterrarium/builtins/tools/canvas_preview.py
+src/kohakuterrarium/builtins/tools/delete_trigger.py
 src/kohakuterrarium/builtins/tools/edit.py
 src/kohakuterrarium/builtins/tools/glob.py
 src/kohakuterrarium/builtins/tools/grep.py
@@ -286,6 +290,7 @@ src/kohakuterrarium/builtins/tools/web_search.py
 src/kohakuterrarium/builtins/tools/write.py
 src/kohakuterrarium/builtins/tools/subprocess/shell_utils.py
 src/kohakuterrarium/builtins/tui/__init__.py
+src/kohakuterrarium/builtins/tui/_injection.py
 src/kohakuterrarium/builtins/tui/app.py
 src/kohakuterrarium/builtins/tui/input.py
 src/kohakuterrarium/builtins/tui/output.py
@@ -372,6 +377,7 @@ src/kohakuterrarium/core/agent_helpers.py
 src/kohakuterrarium/core/agent_lifecycle.py
 src/kohakuterrarium/core/agent_mcp.py
 src/kohakuterrarium/core/agent_messages.py
+src/kohakuterrarium/core/agent_mid_turn.py
 src/kohakuterrarium/core/agent_model.py
 src/kohakuterrarium/core/agent_native_tools.py
 src/kohakuterrarium/core/agent_observability.py
@@ -465,6 +471,7 @@ src/kohakuterrarium/launcher/update_runner.py
 src/kohakuterrarium/llm/__init__.py
 src/kohakuterrarium/llm/anthropic_cache.py
 src/kohakuterrarium/llm/anthropic_format.py
+src/kohakuterrarium/llm/anthropic_pairing.py
 src/kohakuterrarium/llm/anthropic_provider.py
 src/kohakuterrarium/llm/api_keys.py
 src/kohakuterrarium/llm/backends.py
@@ -823,12 +830,12 @@ src/kohakuterrarium/web_dist/assets/KaTeX_Size4-Regular-Dl5lxZxV.woff2
 src/kohakuterrarium/web_dist/assets/KaTeX_Typewriter-Regular-C0xS9mPB.woff
 src/kohakuterrarium/web_dist/assets/KaTeX_Typewriter-Regular-CO6r4hn1.woff2
 src/kohakuterrarium/web_dist/assets/KaTeX_Typewriter-Regular-D3Ib7_Hf.ttf
-src/kohakuterrarium/web_dist/assets/_id_-BsCqEHOx.js
-src/kohakuterrarium/web_dist/assets/_key_-BL4chEv9.js
+src/kohakuterrarium/web_dist/assets/_id_-CB3zPwNN.js
+src/kohakuterrarium/web_dist/assets/_key_-gJyP1xGS.js
 src/kohakuterrarium/web_dist/assets/abap-DNgBPGRI.js
 src/kohakuterrarium/web_dist/assets/apex-B4r7dYl2.js
-src/kohakuterrarium/web_dist/assets/api-CORLcMzO.js
-src/kohakuterrarium/web_dist/assets/axios-DPEDBQup.js
+src/kohakuterrarium/web_dist/assets/api-DM61Wjt2.js
+src/kohakuterrarium/web_dist/assets/axios-BiZQQasI.js
 src/kohakuterrarium/web_dist/assets/azcli-BKm6S2Cw.js
 src/kohakuterrarium/web_dist/assets/bat-BSxnouuk.js
 src/kohakuterrarium/web_dist/assets/bicep-B_GZ-wpx.js
@@ -862,10 +869,10 @@ src/kohakuterrarium/web_dist/assets/highlight-C8LL_u4z.css
 src/kohakuterrarium/web_dist/assets/html-DVGxM4pJ.js
 src/kohakuterrarium/web_dist/assets/html.worker-wsVgX3gp.js
 src/kohakuterrarium/web_dist/assets/htmlMode-C5KOTPV1.js
-src/kohakuterrarium/web_dist/assets/index-CyrTTcO5.css
-src/kohakuterrarium/web_dist/assets/index-DpR5T0lx.js
+src/kohakuterrarium/web_dist/assets/index-81rj-ETK.js
+src/kohakuterrarium/web_dist/assets/index-CofwQ9FQ.css
 src/kohakuterrarium/web_dist/assets/ini-BeMa714h.js
-src/kohakuterrarium/web_dist/assets/instances-Bp30ynQW.js
+src/kohakuterrarium/web_dist/assets/instances-B-q9SH74.js
 src/kohakuterrarium/web_dist/assets/java-Dq86Qznf.js
 src/kohakuterrarium/web_dist/assets/javascript-BOm_W1Jn.js
 src/kohakuterrarium/web_dist/assets/json.worker-CcNiYOcv.js
@@ -885,8 +892,8 @@ src/kohakuterrarium/web_dist/assets/monaco-editor-Br_kD0ds.css
 src/kohakuterrarium/web_dist/assets/msdax-_4dmgZQ-.js
 src/kohakuterrarium/web_dist/assets/mysql-P77yJQsH.js
 src/kohakuterrarium/web_dist/assets/objective-c-ClnQjoXg.js
-src/kohakuterrarium/web_dist/assets/pages-CjtZ2IM_.js
-src/kohakuterrarium/web_dist/assets/panel-debug-D6F-Uxho.js
+src/kohakuterrarium/web_dist/assets/pages-gq7zvyCv.js
+src/kohakuterrarium/web_dist/assets/panel-debug-4ZOOnkmC.js
 src/kohakuterrarium/web_dist/assets/pascal-Bc7vQ0ww.js
 src/kohakuterrarium/web_dist/assets/pascaligo-CU0Jj3mr.js
 src/kohakuterrarium/web_dist/assets/perl-DUQq7oYb.js

{kohakuterrarium-2.0.0.dev17 → kohakuterrarium-2.0.0.dev19}/src/kohakuterrarium/__init__.py

@@ -16,7 +16,7 @@ from kohakuterrarium.terrarium import (
     Terrarium,
 )
 
-__version__ = "2.0.0.dev17"
+__version__ = "2.0.0.dev19"
 
 __all__ = [
     "ConnectionResult",

{kohakuterrarium-2.0.0.dev17 → kohakuterrarium-2.0.0.dev19}/src/kohakuterrarium/api/auth/db.py

@@ -79,7 +79,7 @@ def connection(path: Path | None = None) -> Iterator[sqlite3.Connection]:
         try:
             conn.close()
         except Exception:  # pragma: no cover - defensive
-            logger.debug("auth.db: connection close raised", exc_info=True)
+            logger.warning("auth.db: connection close raised", exc_info=True)
 
 
 # ---------------------------------------------------------------------------

{kohakuterrarium-2.0.0.dev17 → kohakuterrarium-2.0.0.dev19}/src/kohakuterrarium/api/auth/routes.py

@@ -84,11 +84,29 @@ class RegisterRequest(BaseModel):
     invitation_token: str = Field(
         default="", description="Required in invite_only mode"
     )
+    client_kind: Literal["browser", "api"] = Field(
+        default="browser",
+        description=(
+            "``browser`` (default) sets a session cookie only — fine for "
+            "same-origin web frontends.  ``api`` ALSO mints a long-lived "
+            "API token and returns its plaintext in the response body so "
+            "cross-origin frontends, CLIs, and bundled apps can carry the "
+            "credential in ``Authorization: Bearer ...`` without relying "
+            "on cookies (which CORS-without-credentials blocks)."
+        ),
+    )
 
 
 class LoginRequest(BaseModel):
     username: str
     password: str
+    client_kind: Literal["browser", "api"] = Field(
+        default="browser",
+        description=(
+            "Same semantics as on ``RegisterRequest`` — ``api`` returns "
+            "an additional plaintext bearer token alongside the cookie."
+        ),
+    )
 
 
 class TokenCreateRequest(BaseModel):
@@ -169,6 +187,32 @@ def _set_session_cookie(
     response.headers["X-Session-Expires"] = expires_at
 
 
+# Auto-token name used when login/register mints a bearer for an ``api``
+# client.  Distinct from user-named tokens (created via ``POST /tokens``)
+# so the listing UI can mark these as session-derived if desired.
+_AUTO_API_TOKEN_NAME = "auto:web-login"
+
+
+def _maybe_mint_api_token(
+    conn,
+    user: User,
+    client_kind: str,
+) -> str:
+    """Return a fresh plaintext bearer token for ``api`` clients.
+
+    ``browser`` clients return ``""`` — the cookie alone is enough for
+    same-origin web flows.  ``api`` clients ALWAYS receive a freshly
+    minted token (we do not reuse existing rows because the plaintext
+    only exists at creation time; reusing the row would force the user
+    to re-issue regardless).  Multiple sessions are fine — the user can
+    revoke stale ones via ``DELETE /api/auth/tokens/{id}``.
+    """
+    if client_kind != "api":
+        return ""
+    plaintext, _ = tokens_db.create_token(conn, user.id, _AUTO_API_TOKEN_NAME)
+    return plaintext
+
+
 def _registration_allowed_or_raise(
     cfg: AuthConfig,
     invitation_token: str,
@@ -293,9 +337,13 @@ def register(
             conn, user.id, expire_hours=auth_config.session_expire_hours
         )
         users_db.touch_last_login(conn, user.id)
+        bearer = _maybe_mint_api_token(conn, user, req.client_kind)
 
     _set_session_cookie(response, session_id, expires_at)
-    return {"user": _user_public(user), "expires_at": expires_at}
+    payload: dict[str, object] = {"user": _user_public(user), "expires_at": expires_at}
+    if bearer:
+        payload["token"] = bearer
+    return payload
 
 
 @router.post("/login")
@@ -328,9 +376,13 @@ def login(
             conn, user.id, expire_hours=auth_config.session_expire_hours
         )
         users_db.touch_last_login(conn, user.id)
+        bearer = _maybe_mint_api_token(conn, user, req.client_kind)
 
     _set_session_cookie(response, session_id, expires_at)
-    return {"user": _user_public(user), "expires_at": expires_at}
+    payload: dict[str, object] = {"user": _user_public(user), "expires_at": expires_at}
+    if bearer:
+        payload["token"] = bearer
+    return payload
 
 
 @router.post("/logout")

{kohakuterrarium-2.0.0.dev17 → kohakuterrarium-2.0.0.dev19}/src/kohakuterrarium/api/routes/sessions_v2/creatures_chat.py

@@ -49,10 +49,17 @@ async def regenerate_creature(
     turn_index = req.turn_index if req is not None else None
     branch_view = req.branch_view if req is not None else None
     try:
-        await service.regenerate(cid, turn_index=turn_index, branch_view=branch_view)
-        return {"status": "regenerating", "turn_index": turn_index}
+        result = await service.regenerate(
+            cid, turn_index=turn_index, branch_view=branch_view
+        )
     except KeyError:
         raise HTTPException(404, f"creature {creature_id!r} not found")
+    # Pass through ``turn_index`` / ``branch_id`` from the service so
+    # the frontend can promote the <N/M> navigator the instant the API
+    # call returns, instead of waiting for the post-turn resync.
+    if isinstance(result, dict):
+        return result
+    return {"status": "regenerating", "turn_index": turn_index}
 
 
 @router.post("/{session_id}/creatures/{creature_id}/messages/{msg_idx}/edit")
@@ -84,6 +91,15 @@ async def edit_creature_message(
         raise HTTPException(404, f"creature {creature_id!r} not found")
     if not edited:
         raise HTTPException(400, "Invalid edit target; expected a user message")
+    # Newer service implementations return a dict carrying the just-
+    # opened branch_id / turn_index so the frontend's navigator can
+    # promote immediately. Older ones still return ``True`` — fall
+    # back to echoing the request fields then.
+    if isinstance(edited, dict):
+        return {
+            "user_position": req.user_position,
+            **edited,
+        }
     return {
         "status": "edited",
         "turn_index": req.turn_index,

{kohakuterrarium-2.0.0.dev17 → kohakuterrarium-2.0.0.dev19}/src/kohakuterrarium/api/ws/files.py

@@ -97,4 +97,4 @@ async def watch_files(
             await websocket.send_json({"type": "error", "text": str(e)})
             await websocket.close()
         except Exception as e:
-            logger.debug("Failed to close file watch WS", error=str(e), exc_info=True)
+            logger.warning("Failed to close file watch WS", error=str(e), exc_info=True)

{kohakuterrarium-2.0.0.dev17 → kohakuterrarium-2.0.0.dev19}/src/kohakuterrarium/api/ws/io.py

@@ -44,7 +44,7 @@ async def session_creature_chat(
     except WebSocketDisconnect:
         pass
     except Exception as e:
-        logger.debug("IO WS error", error=str(e), exc_info=True)
+        logger.warning("IO WS error", error=str(e), exc_info=True)
         try:
             await websocket.send_json({"type": "error", "content": str(e)})
         except Exception:

{kohakuterrarium-2.0.0.dev17 → kohakuterrarium-2.0.0.dev19}/src/kohakuterrarium/api/ws/logs.py

@@ -45,7 +45,7 @@ async def tail_logs(websocket: WebSocket):
     except WebSocketDisconnect:
         pass
     except Exception as e:
-        logger.debug("log WS error", error=str(e), exc_info=True)
+        logger.warning("log WS error", error=str(e), exc_info=True)
         try:
             await websocket.send_json({"type": "error", "text": str(e)})
         except Exception:
@@ -53,4 +53,4 @@ async def tail_logs(websocket: WebSocket):
         try:
             await websocket.close()
         except Exception as e:
-            logger.debug("Failed to close log WS", error=str(e), exc_info=True)
+            logger.warning("Failed to close log WS", error=str(e), exc_info=True)

{kohakuterrarium-2.0.0.dev17 → kohakuterrarium-2.0.0.dev19}/src/kohakuterrarium/api/ws/observer.py

@@ -72,7 +72,7 @@ async def session_channel_observer(
     except WebSocketDisconnect:
         pass
     except Exception as exc:  # pragma: no cover - defensive
-        logger.debug("Observer WS error", error=str(exc), exc_info=True)
+        logger.warning("Observer WS error", error=str(exc), exc_info=True)
         try:
             await websocket.send_json({"type": "error", "content": str(exc)})
         except Exception:

{kohakuterrarium-2.0.0.dev17 → kohakuterrarium-2.0.0.dev19}/src/kohakuterrarium/api/ws/pty.py

@@ -81,7 +81,7 @@ async def session_pty_ws(
             except WebSocketDisconnect:
                 pass
             except Exception as exc:
-                logger.debug("remote PTY proxy error", error=str(exc), exc_info=True)
+                logger.warning("remote PTY proxy error", error=str(exc), exc_info=True)
                 try:
                     await websocket.close()
                 except Exception:

{kohakuterrarium-2.0.0.dev17 → kohakuterrarium-2.0.0.dev19}/src/kohakuterrarium/api/ws/runtime_graph.py

@@ -157,7 +157,7 @@ async def runtime_graph_stream(websocket: WebSocket):
     except WebSocketDisconnect:
         pass
     except Exception as exc:
-        logger.debug("Runtime graph WS error", error=str(exc), exc_info=True)
+        logger.warning("Runtime graph WS error", error=str(exc), exc_info=True)
         with suppress(Exception):
             await websocket.send_json({"type": "error", "message": str(exc)})
         with suppress(Exception):

{kohakuterrarium-2.0.0.dev17 → kohakuterrarium-2.0.0.dev19}/src/kohakuterrarium/bootstrap/plugins.py

@@ -97,9 +97,10 @@ def _pre_import_packages_for_config(plugin_configs: list[dict[str, Any]]) -> Non
             if name:
                 ensure_package_importable(name)
     except Exception as e:
-        logger.debug(
+        logger.warning(
             "Pre-import package walk failed; falling back to Phase-2 discovery",
             error=str(e),
+            exc_info=True,
         )
 
 
@@ -208,7 +209,7 @@ def _discover_package_plugins(
     try:
         packages = list_packages()
     except Exception as e:
-        logger.debug(
+        logger.warning(
             "Failed to list packages for plugin discovery", error=str(e), exc_info=True
         )
         return
@@ -255,7 +256,7 @@ def _resolve_from_packages(name: str) -> tuple[str, str] | None:
                     if module and cls:
                         return (module, cls)
     except Exception as e:
-        logger.debug(
+        logger.warning(
             "Failed to resolve plugin from packages", error=str(e), exc_info=True
         )
     return None

kohakuterrarium-2.0.0.dev19/src/kohakuterrarium/builtin_skills/tools/delete_trigger.md

@@ -0,0 +1,62 @@
+---
+name: delete_trigger
+description: Stop and remove a previously-installed trigger (timer / schedule / channel watcher) by id
+category: builtin
+tags: [trigger, lifecycle]
+license: internal
+---
+
+# delete_trigger
+
+Stop and remove a trigger that was installed via `add_timer`,
+`add_schedule`, `watch_channel`, or any other trigger-creating tool /
+API. Pair with the creation tools — the `trigger_id` they return is
+the only input.
+
+`stop_task` cannot stop triggers: triggers live in
+`agent.trigger_manager`, not in the executor / sub-agent manager that
+`stop_task` knows about. Use `delete_trigger` for triggers and
+`stop_task` for running tools / sub-agents.
+
+## Arguments
+
+| Arg | Type | Description |
+| --- | --- | --- |
+| trigger_id | string | Trigger id returned by `add_timer` / `add_schedule` / `watch_channel`, or any id shown by the `/triggers` listing. Required. |
+
+## Returns
+
+| State | Output |
+| --- | --- |
+| Removed | `Removed trigger: <id>` (exit_code=0) |
+| Unknown id | `Trigger not found: <id>` (exit_code=1, surfaced as `error`) |
+| Missing context | `Agent context required` (exit_code=1) |
+
+## Examples
+
+Remove a previously-installed timer:
+
+```
+##tool##
+{"name": "delete_trigger", "args": {"trigger_id": "trigger_abc12345"}}
+##tool##
+```
+
+Remove a scheduled job named `daily-summary`:
+
+```
+##tool##
+{"name": "delete_trigger", "args": {"trigger_id": "daily-summary"}}
+##tool##
+```
+
+## Notes
+
+- Idempotent at the agent layer: removing the same id twice surfaces
+  `Trigger not found` on the second call; nothing destructive happens.
+- The trigger's running task (if any) is cancelled cleanly via
+  `trigger_manager.remove`, then `trigger.stop()` is invoked and the
+  state row is dropped.
+- If you only want to PAUSE a trigger temporarily, this tool is the
+  wrong choice — there is no resume counterpart. Re-install the
+  trigger with the same `name` argument if you need to bring it back.