External MCP agents (e.g. Claude Code installed on a company PC) can
now register against MULTIPLE workspaces from a single process — the
agent participates as a peer in workspace A (company) AND workspace B
(personal) simultaneously, with one merged inbox tagged so replies
route to the correct tenant.
Use case (verbatim from operator): "I have this computer AI thats in
company's PC, he is going to be put in company's workspace, but
personally, I want to register it to my own workspace as well, so
that I can talk to it and asking him to do work."
## What changed
**Wire format** — new env var:
MOLECULE_WORKSPACES='[
{"id":"<company-wsid>","token":"<company-tok>"},
{"id":"<personal-wsid>","token":"<personal-tok>"}
]'
When set, mcp_cli iterates the array and spawns one (register +
heartbeat + inbox poller) trio per workspace. Single-workspace mode
(WORKSPACE_ID + MOLECULE_WORKSPACE_TOKEN) is unchanged — every
existing operator's setup keeps working bit-for-bit.
**Per-workspace token registry** (platform_auth.py):
register_workspace_token(wsid, tok) — populated by mcp_cli once
per workspace before any thread spawns; thread-safe registration
+ lock-free reads on the hot path. auth_headers(workspace_id=...)
routes to the per-workspace token; auth_headers() with no arg
uses the legacy resolution path unchanged (back-compat).
**Per-workspace inbox cursors** (inbox.py):
InboxState now supports cursor_paths={wsid: Path,...}. Each poller
advances its own cursor — one workspace's slow poll can't stall
another, and a 410 only resets the affected workspace's cursor.
Single-workspace constructor (cursor_path=Path(...)) still works
exactly as before via __post_init__ promotion to the empty-string
key. Cursor filenames disambiguated by workspace_id[:8] when
multi-workspace; single-workspace keeps the legacy filename so
upgrade doesn't invalidate on-disk state.
**Arrival workspace tagging** (inbox.py):
InboxMessage.arrival_workspace_id — tells the agent which OF ITS
workspaces the inbound message arrived on. Set by the poller from
the cursor key. to_dict() omits the field when empty so single-
workspace consumers see no shape change.
**Reply routing** (a2a_tools.py + a2a_mcp_server.py + registry.py):
send_message_to_user(workspace_id=...) — optional override that
selects which workspace's /notify endpoint to POST to (and which
token authenticates). Multi-workspace agents pass the inbound
message's arrival_workspace_id; single-workspace agents omit it
and route to the only registered workspace via the legacy URL.
## Out of scope (future PRs)
- PR-2: cross-workspace delegation auto-routing — when an agent
receives a request from personal-ws "delegate to ops-bot" and
ops-bot lives in company-ws, the agent should auto-pick its
company-ws identity for the outbound delegate_task. Today the
agent must pass via_workspace explicitly (or fall through to
primary workspace).
- PR-3: memory namespacing — commit_memory() still writes to the
primary workspace's memory regardless of inbound context. Will
revisit when the new memory system (PR #2733 just landed) settles.
## Tests
workspace/tests/test_mcp_cli_multi_workspace.py — 24 new tests:
* MOLECULE_WORKSPACES JSON parsing (valid + 6 error shapes)
* Token registry register / lookup / rotation / clear
* auth_headers routing by workspace_id with legacy fallback
* Per-workspace cursor save/load/reset isolation
* arrival_workspace_id present-when-set, omitted-when-empty
* default_cursor_path namespacing
All 110 pre-existing tests in test_mcp_cli.py / test_inbox.py /
test_platform_auth.py still pass — back-compat is mechanical.
Refs: project memory entry "External agent multi-workspace
registration", design questions answered 2026-05-04 by user
(JSON env var; explicit memory writes deferred to PR-3).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
245 lines
9.7 KiB
Python
245 lines
9.7 KiB
Python
"""Workspace auth-token store (Phase 30.1).
|
|
|
|
Single source of truth for this workspace's authentication token. The
|
|
token is issued by the platform on the first successful
|
|
``POST /registry/register`` call and travels with every subsequent
|
|
heartbeat / update-card / (later) secrets-pull / A2A request.
|
|
|
|
The token is persisted to ``<configs>/.auth_token`` so it survives
|
|
restarts — we only expect to receive it once from the platform, since
|
|
``/registry/register`` no-ops token issuance for workspaces that already
|
|
have one on file.
|
|
|
|
Storage:
|
|
${CONFIGS_DIR}/.auth_token # 0600, one line, no trailing newline
|
|
|
|
Callers interact with three functions:
|
|
:func:`get_token` — returns the cached token or None
|
|
:func:`save_token` — persists a freshly-issued token
|
|
:func:`auth_headers`— builds the Authorization header dict for httpx
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import os
|
|
import threading
|
|
from pathlib import Path
|
|
|
|
import configs_dir
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
# In-process cache so we don't hit disk on every heartbeat. The heartbeat
|
|
# loop fires on a short interval and reading a tiny file 10x per minute
|
|
# is wasteful. The file is the durable copy; this var is the hot path.
|
|
_cached_token: str | None = None
|
|
|
|
# Per-workspace token registry — populated by mcp_cli when the operator
|
|
# runs a multi-workspace external agent (MOLECULE_WORKSPACES env var).
|
|
# Keyed by workspace_id, value is the bearer token issued by that
|
|
# workspace's tenant. Distinct from `_cached_token` (which is the
|
|
# single-workspace path's token); the two coexist so single-workspace
|
|
# back-compat is preserved exactly.
|
|
#
|
|
# Lock guards mutations from the registration phase (one writer per
|
|
# workspace, but the writers run in main(), not in heartbeat threads).
|
|
# Reads are lock-free for the hot path; the dict is finalized before
|
|
# any heartbeat / poller thread starts.
|
|
_WORKSPACE_TOKENS: dict[str, str] = {}
|
|
_WORKSPACE_TOKENS_LOCK = threading.Lock()
|
|
|
|
|
|
def _token_file() -> Path:
|
|
"""Path to the on-disk token file. Resolved via configs_dir so
|
|
in-container (/configs) and external-runtime (~/.molecule-workspace)
|
|
operators land on a writable location automatically. Explicit
|
|
CONFIGS_DIR env var still wins."""
|
|
return configs_dir.resolve() / ".auth_token"
|
|
|
|
|
|
def get_token() -> str | None:
|
|
"""Return the cached token, reading it from disk on first call.
|
|
|
|
Resolution order:
|
|
1. In-process cache (hot path)
|
|
2. ``${CONFIGS_DIR}/.auth_token`` file (in-container default —
|
|
the platform writes this on provision and rotates it on
|
|
restart)
|
|
3. ``MOLECULE_WORKSPACE_TOKEN`` env var (external-runtime path —
|
|
operators running the universal MCP server outside a
|
|
container have no /configs volume to populate, so they pass
|
|
the token via env)
|
|
|
|
File-first preserves in-container behavior unchanged: containers
|
|
always have /configs/.auth_token on disk, env-var fallback only
|
|
fires when there's no file. This is additive — no existing caller
|
|
sees a behavior change.
|
|
"""
|
|
global _cached_token
|
|
if _cached_token is not None:
|
|
return _cached_token
|
|
path = _token_file()
|
|
if path.exists():
|
|
try:
|
|
tok = path.read_text().strip()
|
|
except OSError as exc:
|
|
logger.warning("platform_auth: failed to read %s: %s", path, exc)
|
|
tok = ""
|
|
if tok:
|
|
_cached_token = tok
|
|
return tok
|
|
# File missing or empty — fall back to env (external-runtime path).
|
|
env_tok = os.environ.get("MOLECULE_WORKSPACE_TOKEN", "").strip()
|
|
if env_tok:
|
|
_cached_token = env_tok
|
|
return env_tok
|
|
return None
|
|
|
|
|
|
def save_token(token: str) -> None:
|
|
"""Persist a newly-issued token. Creates the file with 0600 mode atomically.
|
|
|
|
Uses ``os.open(O_CREAT, 0o600)`` so the file is never world-readable,
|
|
even transiently. The previous ``write_text()`` + ``chmod()`` approach
|
|
had a TOCTOU window where a concurrent reader could access the token
|
|
between the two syscalls (M4 — flagged in security audit cycle 10).
|
|
|
|
Idempotent — if an identical token is already on disk we skip the
|
|
write so we don't churn the file's mtime or trigger spurious
|
|
filesystem watchers."""
|
|
global _cached_token
|
|
token = token.strip()
|
|
if not token:
|
|
raise ValueError("platform_auth: refusing to save empty token")
|
|
if get_token() == token:
|
|
return
|
|
path = _token_file()
|
|
path.parent.mkdir(parents=True, exist_ok=True)
|
|
# O_CREAT | O_WRONLY | O_TRUNC with mode=0o600 atomically creates (or
|
|
# truncates) the file with restricted permissions in a single syscall,
|
|
# eliminating the TOCTOU window.
|
|
fd = os.open(str(path), os.O_WRONLY | os.O_CREAT | os.O_TRUNC, 0o600)
|
|
try:
|
|
os.write(fd, token.encode())
|
|
finally:
|
|
os.close(fd)
|
|
_cached_token = token
|
|
|
|
|
|
def register_workspace_token(workspace_id: str, token: str) -> None:
|
|
"""Register a per-workspace bearer token in the multi-workspace registry.
|
|
|
|
Called by ``mcp_cli`` once per entry in the ``MOLECULE_WORKSPACES``
|
|
env var so per-workspace heartbeat / poller threads can resolve their
|
|
own auth via ``auth_headers(workspace_id=...)`` without each thread
|
|
closing over a token literal.
|
|
|
|
Idempotent: re-registering the same workspace_id with the same token
|
|
is a no-op; with a different token it overwrites and logs at INFO
|
|
(the legitimate case is operator token rotation between restarts).
|
|
"""
|
|
workspace_id = (workspace_id or "").strip()
|
|
token = (token or "").strip()
|
|
if not workspace_id or not token:
|
|
return
|
|
with _WORKSPACE_TOKENS_LOCK:
|
|
prior = _WORKSPACE_TOKENS.get(workspace_id)
|
|
if prior == token:
|
|
return
|
|
if prior is not None:
|
|
logger.info(
|
|
"platform_auth: workspace_id %s token rotated", workspace_id,
|
|
)
|
|
_WORKSPACE_TOKENS[workspace_id] = token
|
|
|
|
|
|
def get_workspace_token(workspace_id: str) -> str | None:
|
|
"""Return the per-workspace token from the registry, or None.
|
|
|
|
Lookup is lock-free: writes happen in main() before threads start,
|
|
reads are stable thereafter.
|
|
"""
|
|
return _WORKSPACE_TOKENS.get((workspace_id or "").strip())
|
|
|
|
|
|
def auth_headers(workspace_id: str | None = None) -> dict[str, str]:
|
|
"""Return a header dict to merge into httpx calls. Empty if no token
|
|
is available yet — callers send the request as-is and the platform's
|
|
heartbeat handler grandfathers pre-token workspaces through until
|
|
their next /registry/register issues one.
|
|
|
|
Always sets ``Origin`` to ``PLATFORM_URL`` when that env var is set.
|
|
On hosted SaaS deployments the tenant's edge WAF requires a same-
|
|
origin header — without it ``/workspaces/*`` and ``/registry/*/peers``
|
|
requests get silently rewritten to the canvas Next.js app, which has
|
|
no such routes and returns an empty 404. Inside-container calls are
|
|
unaffected (Docker-internal PLATFORM_URLs aren't behind the WAF).
|
|
Discovered while smoke-testing the molecule-mcp external-runtime
|
|
path against a live tenant — every tool call returned "not found"
|
|
because the WAF was eating them.
|
|
|
|
Token resolution order:
|
|
1. ``workspace_id`` arg → per-workspace registry
|
|
(multi-workspace external agent — set by mcp_cli)
|
|
2. Single-workspace cache + .auth_token file + env var
|
|
(pre-existing path; back-compat unchanged)
|
|
|
|
Single-workspace operators see no behavior change: ``auth_headers()``
|
|
with no arg routes through the legacy resolution path exactly as
|
|
before. Multi-workspace operators pass ``workspace_id`` so each
|
|
thread (heartbeat, poller, send_message_to_user) authenticates
|
|
against the correct workspace.
|
|
"""
|
|
headers: dict[str, str] = {}
|
|
platform_url = os.environ.get("PLATFORM_URL", "").strip()
|
|
if platform_url:
|
|
headers["Origin"] = platform_url
|
|
tok: str | None = None
|
|
if workspace_id:
|
|
tok = get_workspace_token(workspace_id)
|
|
if tok is None:
|
|
tok = get_token()
|
|
if tok:
|
|
headers["Authorization"] = f"Bearer {tok}"
|
|
return headers
|
|
|
|
|
|
def self_source_headers(workspace_id: str) -> dict[str, str]:
|
|
"""Return auth headers PLUS X-Workspace-ID identifying this workspace
|
|
as the source of the request.
|
|
|
|
Use this for any POST the workspace's own runtime fires against the
|
|
platform's A2A endpoints — heartbeat self-messages, initial_prompt,
|
|
idle-loop fires, peer-to-peer A2A from runtime tools. Without the
|
|
X-Workspace-ID header the platform's a2a_receive logger writes
|
|
source_id=NULL, which the canvas's My Chat tab interprets as a
|
|
user-typed message and renders the internal prompt to the user.
|
|
See workspace-server/internal/handlers/a2a_proxy.go:184 for the
|
|
server-side classification rule.
|
|
|
|
Centralised here so adding a new system header (e.g. a per-fire
|
|
correlation ID) only touches one place — and so that any
|
|
workspace→A2A POST that doesn't use this helper stands out in
|
|
review as a probable bug."""
|
|
return {**auth_headers(), "X-Workspace-ID": workspace_id}
|
|
|
|
|
|
def clear_cache() -> None:
|
|
"""Reset the in-memory cache. Used by tests that write fresh token
|
|
files between cases."""
|
|
global _cached_token
|
|
_cached_token = None
|
|
with _WORKSPACE_TOKENS_LOCK:
|
|
_WORKSPACE_TOKENS.clear()
|
|
|
|
|
|
def refresh_cache() -> str | None:
|
|
"""Force re-read of the token from disk, discarding the in-process cache.
|
|
|
|
Use this when a 401 response suggests the cached token is stale —
|
|
e.g. after the platform rotates tokens during a restart (issue #1877).
|
|
Returns the (new) token value or None if not found/error."""
|
|
global _cached_token
|
|
_cached_token = None
|
|
return get_token()
|