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)
53 lines
1.6 KiB
SQL
53 lines
1.6 KiB
SQL
-- name: UpsertContainer :exec
|
|
INSERT INTO containers (
|
|
bot_id, container_id, container_name, image, status, namespace, auto_start,
|
|
container_path, last_started_at, last_stopped_at
|
|
)
|
|
VALUES (
|
|
sqlc.arg(bot_id),
|
|
sqlc.arg(container_id),
|
|
sqlc.arg(container_name),
|
|
sqlc.arg(image),
|
|
sqlc.arg(status),
|
|
sqlc.arg(namespace),
|
|
sqlc.arg(auto_start),
|
|
sqlc.arg(container_path),
|
|
sqlc.arg(last_started_at),
|
|
sqlc.arg(last_stopped_at)
|
|
)
|
|
ON CONFLICT (container_id) DO UPDATE SET
|
|
bot_id = EXCLUDED.bot_id,
|
|
container_name = EXCLUDED.container_name,
|
|
image = EXCLUDED.image,
|
|
status = EXCLUDED.status,
|
|
namespace = EXCLUDED.namespace,
|
|
auto_start = EXCLUDED.auto_start,
|
|
container_path = EXCLUDED.container_path,
|
|
last_started_at = EXCLUDED.last_started_at,
|
|
last_stopped_at = EXCLUDED.last_stopped_at,
|
|
updated_at = now();
|
|
|
|
-- name: GetContainerByBotID :one
|
|
SELECT * FROM containers WHERE bot_id = sqlc.arg(bot_id) ORDER BY updated_at DESC LIMIT 1;
|
|
|
|
-- name: DeleteContainerByBotID :exec
|
|
DELETE FROM containers WHERE bot_id = sqlc.arg(bot_id);
|
|
|
|
-- name: UpdateContainerStatus :exec
|
|
UPDATE containers
|
|
SET status = sqlc.arg(status), updated_at = now()
|
|
WHERE bot_id = sqlc.arg(bot_id);
|
|
|
|
-- name: UpdateContainerStarted :exec
|
|
UPDATE containers
|
|
SET status = 'running', last_started_at = now(), updated_at = now()
|
|
WHERE bot_id = sqlc.arg(bot_id);
|
|
|
|
-- name: UpdateContainerStopped :exec
|
|
UPDATE containers
|
|
SET status = 'stopped', last_stopped_at = now(), updated_at = now()
|
|
WHERE bot_id = sqlc.arg(bot_id);
|
|
|
|
-- name: ListAutoStartContainers :many
|
|
SELECT * FROM containers WHERE auto_start = true ORDER BY updated_at DESC;
|