unique-sdk 2026.36.0.dev6__tar.gz → 2026.36.0.dev8__tar.gz

{unique_sdk-2026.36.0.dev6 → unique_sdk-2026.36.0.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: unique-sdk
-Version: 2026.36.0.dev6
+Version: 2026.36.0.dev8
 Summary: 
 Author: Martin Fadler, Konstantin Krauss, Andreas Hauri
 Author-email: Martin Fadler <martin.fadler@unique.ch>, Konstantin Krauss <konstantin@unique.ch>, Andreas Hauri <andreas@unique.ch>

{unique_sdk-2026.36.0.dev6 → unique_sdk-2026.36.0.dev8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "unique_sdk"
-version = "2026.36.0.dev6"
+version = "2026.36.0.dev8"
 description = ""
 readme = "README.md"
 license = { text = "MIT" }

{unique_sdk-2026.36.0.dev6 → unique_sdk-2026.36.0.dev8}/unique_sdk/cli/cli.py

@@ -94,7 +94,11 @@ from unique_sdk.cli.commands.web_search import (
 )
 from unique_sdk.cli.commands.web_search_config import ENV_CONFIG_PATH
 from unique_sdk.cli.config import load_config
-from unique_sdk.cli.identity import TurnIdentityError, resolve_message_id
+from unique_sdk.cli.identity import (
+    TurnIdentityError,
+    resolve_chat_id,
+    resolve_message_id,
+)
 from unique_sdk.cli.shell import UniqueShell
 from unique_sdk.cli.state import ShellState
 
@@ -124,6 +128,33 @@ def _resolve_cli_message_id(
     return resolved
 
 
+def _resolve_cli_chat_id(
+    ctx: click.Context,
+    explicit: str | None,
+    *,
+    required: bool = False,
+) -> str | None:
+    """Resolve chat id for Click commands; exit on turn-identity errors.
+
+    Preboot-placeholder ids (``chat_preboot*``) are re-resolved through the
+    turn-identity file so adopted preboot clients never send a chat id the
+    platform will reject as nonexistent.
+    """
+    try:
+        resolved = resolve_chat_id(explicit)
+    except TurnIdentityError as exc:
+        click.echo(f"Error: {exc}", err=True)
+        ctx.exit(2)
+    if required and not resolved:
+        click.echo(
+            "Error: chat id is required. Pass --chat-id, or set "
+            "UNIQUE_TURN_IDENTITY_FILE / UNIQUE_CHAT_ID.",
+            err=True,
+        )
+        ctx.exit(2)
+    return resolved
+
+
 MAIN_HELP = """\
 Unique CLI -- Linux-like file explorer for the Unique AI Platform.
 
@@ -736,8 +767,12 @@ def uploaded_search(
 @click.option(
     "--chat-id",
     "-c",
-    required=True,
-    help="Chat ID for the MCP tool call context.",
+    default=None,
+    help=(
+        "Chat ID for the MCP tool call context. Defaults to the current "
+        "turn identity file ($UNIQUE_TURN_IDENTITY_FILE), then "
+        "$UNIQUE_CHAT_ID."
+    ),
 )
 @click.option(
     "--message-id",
@@ -767,7 +802,7 @@ def uploaded_search(
 def mcp(
     ctx: click.Context,
     payload: str | None,
-    chat_id: str,
+    chat_id: str | None,
     message_id: str | None,
     file_path: str | None,
     use_stdin: bool,
@@ -780,9 +815,9 @@ def mcp(
 
     \b
     The JSON is forwarded 1:1 to the MCP call-tool API. Chat ID and
-    message ID are provided as separate flags to identify the
-    conversation context. When --message-id is omitted, the CLI resolves
-    it from $UNIQUE_TURN_IDENTITY_FILE (preferred) or $UNIQUE_MESSAGE_ID.
+    message ID identify the conversation context. When --message-id or
+    --chat-id is omitted, the CLI resolves it from
+    $UNIQUE_TURN_IDENTITY_FILE (preferred) or the matching env var.
 
     \b
     Input sources (exactly one required):
@@ -800,10 +835,11 @@ def mcp(
       cat payload.json | unique-cli mcp -c chat_123 -m msg_456 --stdin
     """
     resolved_message_id = _resolve_cli_message_id(ctx, message_id, required=True)
+    resolved_chat_id = _resolve_cli_chat_id(ctx, chat_id, required=True)
     click.echo(
         cmd_mcp(
             LazyState.get(ctx),
-            chat_id=chat_id,
+            chat_id=resolved_chat_id or "",
             message_id=resolved_message_id or "",
             payload=payload,
             file=file_path,
@@ -826,8 +862,11 @@ def mcp(
     "--chat-id",
     "parent_chat_id",
     default=None,
-    envvar="UNIQUE_CHAT_ID",
-    help="Parent chat ID for message correlation.",
+    help=(
+        "Parent chat ID for message correlation. Defaults to the current "
+        "turn identity file ($UNIQUE_TURN_IDENTITY_FILE), then "
+        "$UNIQUE_CHAT_ID."
+    ),
 )
 @click.option(
     "--message-id",
@@ -881,12 +920,13 @@ def subagent(
       unique-cli subagent Finance "Summarize Q4 revenue" --reset-chat
     """
     resolved_message_id = _resolve_cli_message_id(ctx, parent_message_id)
+    resolved_chat_id = _resolve_cli_chat_id(ctx, parent_chat_id)
     output = cmd_subagent(
         LazyState.get(ctx),
         tool_name=tool_name,
         message=message,
         config_path=config_path,
-        parent_chat_id=parent_chat_id,
+        parent_chat_id=resolved_chat_id,
         parent_message_id=resolved_message_id,
         parent_assistant_id=parent_assistant_id,
         reset_chat=reset_chat,
@@ -1144,7 +1184,15 @@ def elicit() -> None:
         '"answer" string field when omitted.'
     ),
 )
-@click.option("--chat-id", "-c", default=None, help="Associated chat ID.")
+@click.option(
+    "--chat-id",
+    "-c",
+    default=None,
+    help=(
+        "Associated chat ID. Defaults to the current turn identity file "
+        "($UNIQUE_TURN_IDENTITY_FILE), then $UNIQUE_CHAT_ID."
+    ),
+)
 @click.option(
     "--message-id",
     "-m",
@@ -1276,7 +1324,7 @@ def elicit_ask(
         "message": message,
         "tool_name": tool_name,
         "schema": schema,
-        "chat_id": chat_id,
+        "chat_id": _resolve_cli_chat_id(ctx, chat_id),
         "message_id": _resolve_cli_message_id(ctx, message_id),
         "timeout": timeout,
         "expires_in_seconds": expires_in_seconds,
@@ -1313,7 +1361,15 @@ def elicit_ask(
     help="JSON schema (required for --mode FORM).",
 )
 @click.option("--url", default=None, help="External URL (required for --mode URL).")
-@click.option("--chat-id", "-c", default=None, help="Associated chat ID.")
+@click.option(
+    "--chat-id",
+    "-c",
+    default=None,
+    help=(
+        "Associated chat ID. Defaults to the current turn identity file "
+        "($UNIQUE_TURN_IDENTITY_FILE), then $UNIQUE_CHAT_ID."
+    ),
+)
 @click.option(
     "--message-id",
     "-m",
@@ -1426,7 +1482,7 @@ def elicit_create(
         "tool_name": tool_name,
         "schema": schema,
         "url": url,
-        "chat_id": chat_id,
+        "chat_id": _resolve_cli_chat_id(ctx, chat_id),
         "message_id": _resolve_cli_message_id(ctx, message_id),
         "expires_in_seconds": expires_in_seconds,
         "external_elicitation_id": external_elicitation_id,
@@ -2074,12 +2130,12 @@ Examples:
     "--chat-id",
     "chat_id",
     default=None,
-    envvar="UNIQUE_CHAT_ID",
     help=(
-        "Chat id this call is made on behalf of. Defaults to $UNIQUE_CHAT_ID "
-        "(auto-set in Conduct sandboxes). When set, the space's Web Search "
-        "toggle is enforced server-side and the call is rejected if Web "
-        "Search is disabled for that space."
+        "Chat id this call is made on behalf of. Defaults to the current "
+        "turn identity file ($UNIQUE_TURN_IDENTITY_FILE), then "
+        "$UNIQUE_CHAT_ID (auto-set in Conduct sandboxes). When set, the "
+        "space's Web Search toggle is enforced server-side and the call is "
+        "rejected if Web Search is disabled for that space."
     ),
 )
 @click.pass_context
@@ -2105,7 +2161,7 @@ def web_search_search_cmd(
         crawler_config_raw=crawler_config_raw,
         output_json=output_json,
         config_path=resolved_config,
-        chat_id=chat_id,
+        chat_id=_resolve_cli_chat_id(ctx, chat_id),
     )
     _emit_web_search(ctx, output)
 
@@ -2165,12 +2221,12 @@ Examples:
     "--chat-id",
     "chat_id",
     default=None,
-    envvar="UNIQUE_CHAT_ID",
     help=(
-        "Chat id this call is made on behalf of. Defaults to $UNIQUE_CHAT_ID "
-        "(auto-set in Conduct sandboxes). When set, the space's Web Search "
-        "toggle is enforced server-side and the call is rejected if Web "
-        "Search is disabled for that space."
+        "Chat id this call is made on behalf of. Defaults to the current "
+        "turn identity file ($UNIQUE_TURN_IDENTITY_FILE), then "
+        "$UNIQUE_CHAT_ID (auto-set in Conduct sandboxes). When set, the "
+        "space's Web Search toggle is enforced server-side and the call is "
+        "rejected if Web Search is disabled for that space."
     ),
 )
 @click.pass_context
@@ -2200,7 +2256,7 @@ def web_search_crawl_cmd(
         crawler_config_raw=crawler_config_raw,
         output_json=output_json,
         config_path=resolved_config,
-        chat_id=chat_id,
+        chat_id=_resolve_cli_chat_id(ctx, chat_id),
     )
     _emit_web_search(ctx, output)
 

{unique_sdk-2026.36.0.dev6 → unique_sdk-2026.36.0.dev8}/unique_sdk/cli/identity.py

@@ -14,6 +14,12 @@ Resolution precedence for message IDs:
 
 When ``UNIQUE_TURN_IDENTITY_FILE`` is set but the file is missing or malformed,
 resolution fails loudly — silent fallback to a stale env value is forbidden.
+
+Chat IDs resolve the same way, with one twist: a client spawned during a
+chatless preboot carries a synthetic ``chat_preboot*`` placeholder in its
+frozen environment. The placeholder never names a real chat (the platform
+rejects it), so it is treated as absent at every precedence level and the
+turn-identity file supplies the adopted chat's real ID.
 """
 
 from __future__ import annotations
@@ -25,6 +31,12 @@ from pathlib import Path
 
 TURN_IDENTITY_ENV_VAR = "UNIQUE_TURN_IDENTITY_FILE"
 MESSAGE_ID_ENV_VAR = "UNIQUE_MESSAGE_ID"
+CHAT_ID_ENV_VAR = "UNIQUE_CHAT_ID"
+
+# Synthetic chat-id prefix used by the sandbox runner for clients spawned
+# before their chat exists (chatless preboot). Adoption re-keys the client
+# to the real chat, but the spawn env keeps the placeholder forever.
+PREBOOT_CHAT_ID_PREFIX = "chat_preboot"
 
 
 class TurnIdentityError(ValueError):
@@ -36,12 +48,14 @@ class TurnIdentity:
     """Parsed contents of the per-turn identity file.
 
     The runner writes a richer JSON object (chat/user/company/assistant IDs,
-    turn counter), but the CLI only consumes ``message_id`` — the one value
-    that goes stale in a persistent process environment. Extra keys are
-    ignored; parse a field here only once the CLI actually relies on it.
+    turn counter), but the CLI only consumes the values that go stale in a
+    persistent process environment: ``message_id`` (every turn) and
+    ``chat_id`` (adopted chatless-preboot clients). Extra keys are ignored;
+    parse a field here only once the CLI actually relies on it.
     """
 
     message_id: str
+    chat_id: str | None = None
 
 
 def read_turn_identity(
@@ -88,7 +102,11 @@ def read_turn_identity(
             "'message_id' string"
         )
 
-    return TurnIdentity(message_id=message_id.strip())
+    chat_id = payload.get("chat_id")
+    parsed_chat_id = (
+        chat_id.strip() if isinstance(chat_id, str) and chat_id.strip() else None
+    )
+    return TurnIdentity(message_id=message_id.strip(), chat_id=parsed_chat_id)
 
 
 def resolve_message_id(explicit: str | None = None) -> str | None:
@@ -110,3 +128,38 @@ def resolve_message_id(explicit: str | None = None) -> str | None:
     if env_id is not None and env_id.strip():
         return env_id.strip()
     return None
+
+
+def _usable_chat_id(value: str | None) -> str | None:
+    """A non-empty chat id that is not a preboot placeholder, else None."""
+    if value is None:
+        return None
+    stripped = str(value).strip()
+    if not stripped or stripped.startswith(PREBOOT_CHAT_ID_PREFIX):
+        return None
+    return stripped
+
+
+def resolve_chat_id(explicit: str | None = None) -> str | None:
+    """Resolve the chat ID for a chat-bound CLI operation.
+
+    Same precedence as :func:`resolve_message_id` (explicit flag, then the
+    turn-identity file, then ``$UNIQUE_CHAT_ID``), except a ``chat_preboot*``
+    placeholder is skipped at every level — agents pass
+    ``--chat-id "$UNIQUE_CHAT_ID"`` from an environment that may have been
+    frozen before their chat existed. Returns ``None`` when no source yields
+    a real chat id (chat-optional callers then omit the id). Raises
+    ``TurnIdentityError`` when the turn-identity file is configured but
+    unusable.
+    """
+    explicit_id = _usable_chat_id(explicit)
+    if explicit_id is not None:
+        return explicit_id
+
+    identity = read_turn_identity()
+    if identity is not None:
+        file_id = _usable_chat_id(identity.chat_id)
+        if file_id is not None:
+            return file_id
+
+    return _usable_chat_id(os.environ.get(CHAT_ID_ENV_VAR))