mirror of
https://github.com/memohai/Memoh.git
synced 2026-04-25 07:00:48 +09:00
BBQ
9ceabf68c4
Replace the host bind-mount + containerd exec approach with a per-bot
in-container gRPC server (ContainerService, port 9090). All file I/O,
exec, and MCP stdio sessions now go through gRPC instead of running
shell commands or reading host-mounted directories.
Architecture changes:
- cmd/mcp: rewritten as a gRPC server (ContainerService) with full
file and exec API (ReadFile, WriteFile, ListDir, ReadRaw, WriteRaw,
Exec, Stat, Mkdir, Rename, DeleteFile)
- internal/mcp/mcpcontainer: protobuf definitions and generated stubs
- internal/mcp/mcpclient: gRPC client wrapper with connection pool
(Pool) and Provider interface for dependency injection
- mcp.Manager: add per-bot IP cache, gRPC connection pool, and
SetContainerIP/MCPClient methods; remove DataDir/Exec helpers
- containerd.Service: remove ExecTask/ExecTaskStreaming; network setup
now returns NetworkResult{IP} for pool routing
- internal/fs/service.go: deleted (replaced by mcpclient)
- handlers/fs.go: deleted; MCP stdio session logic moved to mcp_stdio.go
- container provider Executor: all tools (read/write/list/edit/exec)
now call gRPC client instead of running shell via exec
- storefs, containerfs, media, skills, memory: all I/O ported to
mcpclient.Provider
Database:
- migration 0022: drop host_path column from containers table
One-time data migration:
- migrateBindMountData: on first Start() after upgrade, copies old
bind-mount data into the container via gRPC, then renames src dir
to prevent re-migration; runs in background goroutine
Bug fixes:
- mcp_stdio: callRaw now returns full JSON-RPC envelope
{"jsonrpc","id","result"|"error"} matching protocol spec;
explicit "initialize" call now advances session init state to
prevent duplicate handshake on next non-initialize call
- mcpclient Pool: properly evict stale gRPC connection after snapshot
replace (container process recreated); use SetContainerIP instead
of direct map write so IP changes always evict pool entry
- migrateBindMountData: walkErr on directories now counted as failure
so partially-walked trees don't get incorrectly marked as migrated
- cmd/mcp/Dockerfile: removed dead file (docker/Dockerfile.mcp is the
canonical production build)
Tests:
- provider_test.go: restored with bufconn in-process gRPC mock
(fakeContainerService + staticProvider), 14 cases covering all 5
tools plus edge cases
- mcp_session_test.go: new, covers JSON-RPC envelope, init state
machine, pending cleanup on cancel/close, readLoop cancel
- storefs/service_test.go: restored (pure function roundtrip tests)
71 lines
3.0 KiB
Bash
Executable File
71 lines
3.0 KiB
Bash
Executable File
#!/bin/sh
|
|
# Build MCP binary, package as containerd image, and import.
|
|
# Called by air after server build — safe to skip outside dev container.
|
|
set -e
|
|
|
|
MCP_IMAGE="${MCP_IMAGE:-docker.io/memohai/mcp:latest}"
|
|
MCP_BINARY="/opt/memoh/data/.dev/mcp"
|
|
BASE_ROOTFS="/opt/images/memoh-mcp-rootfs.tar"
|
|
|
|
[ -f "$BASE_ROOTFS" ] || exit 0
|
|
command -v ctr >/dev/null 2>&1 || exit 0
|
|
|
|
mkdir -p "$(dirname "$MCP_BINARY")"
|
|
|
|
OLD_HASH=$(sha256sum "$MCP_BINARY" 2>/dev/null | cut -d' ' -f1)
|
|
go build -o "$MCP_BINARY" ./cmd/mcp || exit 0
|
|
NEW_HASH=$(sha256sum "$MCP_BINARY" | cut -d' ' -f1)
|
|
|
|
[ "$OLD_HASH" = "$NEW_HASH" ] && exit 0
|
|
|
|
echo "[mcp-dev] Binary changed, rebuilding MCP image..."
|
|
|
|
WORK=$(mktemp -d)
|
|
trap 'rm -rf "$WORK"' EXIT
|
|
|
|
# Layer 1: base rootfs (symlink to avoid copying the large file)
|
|
LAYER1_SHA=$(sha256sum "$BASE_ROOTFS" | cut -d' ' -f1)
|
|
mkdir -p "$WORK/$LAYER1_SHA"
|
|
ln -s "$BASE_ROOTFS" "$WORK/$LAYER1_SHA/layer.tar"
|
|
|
|
# Layer 2: compiled binary + template + entrypoint overlay
|
|
mkdir -p "$WORK/overlay/opt"
|
|
cp "$MCP_BINARY" "$WORK/overlay/opt/mcp"
|
|
chmod +x "$WORK/overlay/opt/mcp"
|
|
cp -a /workspace/cmd/mcp/template "$WORK/overlay/opt/mcp-template"
|
|
cp /workspace/cmd/mcp/entrypoint.sh "$WORK/overlay/opt/entrypoint.sh"
|
|
chmod +x "$WORK/overlay/opt/entrypoint.sh"
|
|
tar -cf "$WORK/layer2.tar" -C "$WORK/overlay" opt
|
|
LAYER2_SHA=$(sha256sum "$WORK/layer2.tar" | cut -d' ' -f1)
|
|
mkdir -p "$WORK/$LAYER2_SHA"
|
|
mv "$WORK/layer2.tar" "$WORK/$LAYER2_SHA/layer.tar"
|
|
|
|
# OCI image config
|
|
ARCH=$(uname -m)
|
|
case "$ARCH" in aarch64|arm64) ARCH="arm64" ;; x86_64|amd64) ARCH="amd64" ;; esac
|
|
|
|
printf '{"architecture":"%s","os":"linux","created":"1970-01-01T00:00:00Z","config":{"Entrypoint":["/opt/entrypoint.sh"],"WorkingDir":"/app","Env":["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"]},"rootfs":{"type":"layers","diff_ids":["sha256:%s","sha256:%s"]},"history":[{"created":"1970-01-01T00:00:00Z","comment":"memoh-mcp rootfs"},{"created":"1970-01-01T00:00:00Z","comment":"memoh-mcp binary"}]}' \
|
|
"$ARCH" "$LAYER1_SHA" "$LAYER2_SHA" > "$WORK/config.json"
|
|
|
|
CONFIG_SHA=$(sha256sum "$WORK/config.json" | cut -d' ' -f1)
|
|
mv "$WORK/config.json" "$WORK/$CONFIG_SHA.json"
|
|
|
|
printf '[{"Config":"%s.json","RepoTags":["%s"],"Layers":["%s/layer.tar","%s/layer.tar"]}]' \
|
|
"$CONFIG_SHA" "$MCP_IMAGE" "$LAYER1_SHA" "$LAYER2_SHA" > "$WORK/manifest.json"
|
|
|
|
# -h follows symlinks (layer 1 is symlinked to avoid copying)
|
|
tar -chf "$WORK/memoh-mcp.tar" -C "$WORK" manifest.json "$CONFIG_SHA.json" "$LAYER1_SHA/" "$LAYER2_SHA/"
|
|
|
|
# Replace image in containerd
|
|
ctr -n default images rm "$MCP_IMAGE" 2>/dev/null || true
|
|
ctr -n default images import --all-platforms "$WORK/memoh-mcp.tar" 2>&1 || true
|
|
|
|
# Clean old MCP containers so they recreate with new image
|
|
for c in $(ctr -n default containers ls -q 2>/dev/null | grep "^mcp-"); do
|
|
ctr -n default tasks kill "$c" 2>/dev/null || true
|
|
ctr -n default tasks delete "$c" 2>/dev/null || true
|
|
ctr -n default containers delete "$c" 2>/dev/null || true
|
|
done
|
|
|
|
echo "[mcp-dev] Done. Containers will auto-recreate with new image."
|