Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix(mcp): qualify resource query columns

tianma-if4c5e745a4e79
diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts
index 5b188fb3..4e3d6b6a 100644
--- a/apps/api/src/index.ts
+++ b/apps/api/src/index.ts
@@ -7077,8 +7077,8 @@ const getResourceRowsForMemo = async (db: D1Database, workspaceId: string, memoI
const listResourcesForMemo = async (db: D1Database, workspaceId: string, memoId: string): Promise<Resource[]> => {
const rows = await db
.prepare(
- `SELECT id, memo_id, original_memo_id, bucket_name, object_key, kind, mime_type,
- filename, byte_size, sha256, width, height, created_at, updated_at
+ `SELECT r.id, r.memo_id, r.original_memo_id, r.bucket_name, r.object_key, r.kind, r.mime_type,
+ r.filename, r.byte_size, r.sha256, r.width, r.height, r.created_at, r.updated_at
FROM resources r
INNER JOIN memos m ON m.id = r.memo_id
WHERE r.memo_id = ? AND m.workspace_id = ? AND r.is_deleted = 0
diff --git a/scripts/test-mcp.mjs b/scripts/test-mcp.mjs
index 8f3cdaa3..addeb075 100644
--- a/scripts/test-mcp.mjs
+++ b/scripts/test-mcp.mjs
@@ -222,26 +222,35 @@ assert.equal(body.result.structuredContent.results[0].status, "would_create");
assert.equal(sqlite.query("SELECT COUNT(*) AS count FROM memo_import_sources").get().count, 1);
assert.equal(sqlite.query("SELECT COUNT(*) AS count FROM memos WHERE id = ?").get(importedMemoId).count, 1);
-response = await fetchMcp(rpc(14, "tools/call", { name: "unknown_tool", arguments: {} }));
+sqlite.run(
+ `INSERT INTO resources (id, memo_id, bucket_name, object_key, kind, mime_type, filename, byte_size)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
+ ["res_imported", importedMemoId, "test-resources", "mcp/imported.txt", "attachment", "text/plain", "imported.txt", 12],
+);
+body = await callTool(14, "list_memo_resources", { memoId: importedMemoId });
+assert.equal(body.result.isError, false);
+assert.deepEqual(body.result.structuredContent.resources.map((resource) => resource.id), ["res_imported"]);
+
+response = await fetchMcp(rpc(15, "tools/call", { name: "unknown_tool", arguments: {} }));
assert.equal(response.status, 400);
body = await response.json();
assert.equal(body.error.code, -32602);
-response = await fetchMcp([rpc(15, "tools/list")]);
+response = await fetchMcp([rpc(16, "tools/list")]);
assert.equal(response.status, 400);
-response = await fetchMcp(rpc(16, "tools/list"), {
+response = await fetchMcp(rpc(17, "tools/list"), {
headers: { "MCP-Protocol-Version": "2099-01-01" },
});
assert.equal(response.status, 400);
-response = await fetchMcp(rpc(17, "tools/list"), { headers: { Origin: "https://attacker.example" } });
+response = await fetchMcp(rpc(18, "tools/list"), { headers: { Origin: "https://attacker.example" } });
assert.equal(response.status, 403);
-response = await fetchMcp(rpc(18, "tools/list"), { headers: { Accept: "application/json" } });
+response = await fetchMcp(rpc(19, "tools/list"), { headers: { Accept: "application/json" } });
assert.equal(response.status, 406);
-response = await fetchMcp(rpc(19, "tools/list"), { headers: { "Content-Type": "text/plain" } });
+response = await fetchMcp(rpc(20, "tools/list"), { headers: { "Content-Type": "text/plain" } });
assert.equal(response.status, 415);
response = await fetchMcp({ jsonrpc: "2.0", method: "notifications/initialized" });