molecule-ai/molecule-core
35
0
Fork 2
Code Issues 16 Pull Requests 2 Actions 49 Packages Projects Releases Wiki Activity

Merge pull request #2772 from Molecule-AI/staging

Browse Source 
staging → main: auto-promote d866d3a
This commit is contained in:
Hongming Wang 2026-05-04 14:52:07 -07:00 committed by GitHub
commit fc10386a78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 145 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
workspace-server/internal/handlers/template_files_eic.go
View File

@ -38,13 +38,26 @@ import (
// Keep these stable — changing the base path for an existing runtime
// without a migration shim will make previously-saved files disappear from
// the runtime's POV.
//
// Path source-of-truth: cloud-init in
// `molecule-controlplane/internal/provisioner/userdata_containerized.go`
// runs `mkdir -p /configs` and writes the canonical config.yaml there.
// The workspace container bind-mounts host `/configs` to read it back.
// Files written anywhere else on the host are invisible to the runtime,
// so `claude-code` (and any future containerized runtime) must point here.
//
// `/configs` is root-owned (cloud-init runs as root); the SSH-as-ubuntu
// install command at the call site below uses `sudo` to write into it.
var workspaceFilePathPrefix = map[string]string{
"hermes": "/home/ubuntu/.hermes",
"langgraph": "/opt/configs",
"external": "/opt/configs",
// Default for unknown / future runtimes is /opt/configs — most
// conservative place that doesn't collide with system or runtime-
// private directories.
"hermes": "/home/ubuntu/.hermes",
"claude-code": "/configs",
"langgraph": "/opt/configs",
"external": "/opt/configs",
// Default for unknown / future runtimes is /configs — matches the
// containerized user-data layout. The `langgraph` / `external`
// entries pre-date the unified user-data path and are retained
// until a migration audit confirms what the running tenants of
// those runtimes actually have on disk.
}
func resolveWorkspaceFilePath(runtime, relPath string) (string, error) {
@ -53,7 +66,7 @@ func resolveWorkspaceFilePath(runtime, relPath string) (string, error) {
}
base, ok := workspaceFilePathPrefix[strings.ToLower(strings.TrimSpace(runtime))]
if !ok {
base = "/opt/configs"
base = "/configs"
}
return filepath.Join(base, filepath.Clean(relPath)), nil
}
@ -148,6 +161,17 @@ func writeFileViaEIC(ctx context.Context, instanceID, runtime, relPath string, c
// writes the file atomically via temp-file-rename. Permissions 0644
// match the existing tar-unpack defaults on the Docker path.
//
// `sudo -n` (non-interactive) prefix: the canonical containerized
// workspace layout puts /configs at the root, owned by root because
// cloud-init runs as root (see
// molecule-controlplane/internal/provisioner/userdata_containerized.go).
// SSH-as-ubuntu can't write into /configs without escalation.
// Ubuntu has passwordless sudo on EC2 by default; sudo -n fails fast
// (no prompt) if that ever changes, surfacing a clean error instead
// of a hang. The hermes path /home/ubuntu/.hermes is ubuntu-owned
// and doesn't strictly need sudo, but using it uniformly avoids
// per-runtime branching here.
//
// The remote command is fully deterministic — no user-controlled
// input reaches a shell eval (absPath is built from a map + Clean()).
sshArgs := []string{
@ -157,7 +181,7 @@ func writeFileViaEIC(ctx context.Context, instanceID, runtime, relPath string, c
"-o", "ServerAliveInterval=15",
"-p", fmt.Sprintf("%d", localPort),
fmt.Sprintf("%s@127.0.0.1", osUser),
fmt.Sprintf("install -D -m 0644 /dev/stdin %s", shellQuote(absPath)),
fmt.Sprintf("sudo -n install -D -m 0644 /dev/stdin %s", shellQuote(absPath)),
}
sshCmd := exec.CommandContext(ctx, "ssh", sshArgs...)
sshCmd.Env = os.Environ()

10
workspace-server/internal/handlers/template_files_eic_test.go
View File

@ -18,10 +18,16 @@ func TestResolveWorkspaceFilePath_KnownRuntimes(t *testing.T) {
{"hermes", "config.yaml", "/home/ubuntu/.hermes/config.yaml"},
{"HERMES", "config.yaml", "/home/ubuntu/.hermes/config.yaml"}, // case-insensitive
{"hermes", "nested/a.yaml", "/home/ubuntu/.hermes/nested/a.yaml"},
// claude-code (and any future containerized runtime) lands at /configs —
// the path user-data creates and bind-mounts into the container. Pre-fix
// this fell through to /opt/configs which doesn't exist on workspace EC2s
// and would 500 with EACCES on save (the bug that motivated this gate).
{"claude-code", "config.yaml", "/configs/config.yaml"},
{"CLAUDE-CODE", "config.yaml", "/configs/config.yaml"}, // case-insensitive
{"langgraph", "config.yaml", "/opt/configs/config.yaml"},
{"external", "skills.json", "/opt/configs/skills.json"},
{"", "config.yaml", "/opt/configs/config.yaml"}, // empty → default
{"unknown", "config.yaml", "/opt/configs/config.yaml"}, // unknown → default
{"", "config.yaml", "/configs/config.yaml"}, // empty → default
{"unknown", "config.yaml", "/configs/config.yaml"}, // unknown → default
}
for _, tc := range cases {
t.Run(tc.runtime+"/"+tc.relPath, func(t *testing.T) {

7
workspace/a2a_mcp_server.py
View File

@ -123,16 +123,20 @@ async def handle_tool_call(name: str, arguments: dict) -> str:
source_workspace_id=arguments.get("source_workspace_id") or None,
)
elif name == "get_workspace_info":
return await tool_get_workspace_info()
return await tool_get_workspace_info(
source_workspace_id=arguments.get("source_workspace_id") or None,
)
elif name == "commit_memory":
return await tool_commit_memory(
arguments.get("content", ""),
arguments.get("scope", "LOCAL"),
source_workspace_id=arguments.get("source_workspace_id") or None,
)
elif name == "recall_memory":
return await tool_recall_memory(
arguments.get("query", ""),
arguments.get("scope", ""),
source_workspace_id=arguments.get("source_workspace_id") or None,
)
elif name == "wait_for_message":
return await tool_wait_for_message(
@ -151,6 +155,7 @@ async def handle_tool_call(name: str, arguments: dict) -> str:
arguments.get("peer_id", ""),
arguments.get("limit", 20),
arguments.get("before_ts", ""),
source_workspace_id=arguments.get("source_workspace_id") or None,
)
return f"Unknown tool: {name}"

99
workspace/tests/test_a2a_mcp_server.py
View File

@ -71,6 +71,105 @@ async def test_handle_tool_call_unknown_tool():
assert "Unknown tool" in result
# ---------------------------------------------------------------------------
# source_workspace_id propagation — every workspace-scoped tool's schema
# advertises this parameter (PR #2766) so the LLM can route a memory commit
# or chat-history query through the workspace the inbound message arrived
# on. The dispatch path itself MUST forward the kwarg — otherwise the
# schema lies and every call silently falls back to the module-level
# WORKSPACE_ID, defeating multi-workspace isolation. These tests pin
# end-to-end argument flow on the four tools that ship in PR #2766.
# ---------------------------------------------------------------------------
async def test_dispatch_get_workspace_info_forwards_source_workspace_id():
from a2a_mcp_server import handle_tool_call
mock = AsyncMock(return_value='{"id":"ws-X"}')
with patch("a2a_mcp_server.tool_get_workspace_info", new=mock):
await handle_tool_call(
"get_workspace_info",
{"source_workspace_id": "ws-X"},
)
mock.assert_awaited_once_with(source_workspace_id="ws-X")
async def test_dispatch_commit_memory_forwards_source_workspace_id():
from a2a_mcp_server import handle_tool_call
mock = AsyncMock(return_value='{"success":true}')
with patch("a2a_mcp_server.tool_commit_memory", new=mock):
await handle_tool_call(
"commit_memory",
{
"content": "remember this",
"scope": "LOCAL",
"source_workspace_id": "ws-Y",
},
)
mock.assert_awaited_once_with(
"remember this",
"LOCAL",
source_workspace_id="ws-Y",
)
async def test_dispatch_recall_memory_forwards_source_workspace_id():
from a2a_mcp_server import handle_tool_call
mock = AsyncMock(return_value="[LOCAL] remember this")
with patch("a2a_mcp_server.tool_recall_memory", new=mock):
await handle_tool_call(
"recall_memory",
{
"query": "remember",
"scope": "LOCAL",
"source_workspace_id": "ws-Z",
},
)
mock.assert_awaited_once_with(
"remember",
"LOCAL",
source_workspace_id="ws-Z",
)
async def test_dispatch_chat_history_forwards_source_workspace_id():
from a2a_mcp_server import handle_tool_call
mock = AsyncMock(return_value="[]")
with patch("a2a_mcp_server.tool_chat_history", new=mock):
await handle_tool_call(
"chat_history",
{
"peer_id": "peer-A",
"limit": 10,
"source_workspace_id": "ws-W",
},
)
mock.assert_awaited_once_with(
"peer-A",
10,
"",
source_workspace_id="ws-W",
)
async def test_dispatch_omits_source_workspace_id_when_unset():
"""Single-workspace operators (no source_workspace_id key in args) must
forward None — preserving the legacy fallback to module-level WORKSPACE_ID
inside the tool. An accidental empty-string forward would also fall back,
but None is the documented contract."""
from a2a_mcp_server import handle_tool_call
mock = AsyncMock(return_value='{"success":true}')
with patch("a2a_mcp_server.tool_commit_memory", new=mock):
await handle_tool_call(
"commit_memory",
{"content": "x", "scope": "LOCAL"},
)
mock.assert_awaited_once_with(
"x",
"LOCAL",
source_workspace_id=None,
)
async def test_handle_tool_call_missing_args_defaults():
"""Test that missing args default to empty strings (defensive)."""
from a2a_mcp_server import handle_tool_call