Merge branch 'main' of github.com:basicmachines-co/basic-memory

Author: phernandez

src/basic_memory/mcp/tools/chatgpt_tools.py

@@ -14,6 +14,7 @@
 from basic_memory.mcp.tools.search import search_notes
 from basic_memory.mcp.tools.read_note import read_note
 from basic_memory.schemas.search import SearchResponse
+from basic_memory.config import ConfigManager
 
 
 def _format_search_results_for_chatgpt(results: SearchResponse) -> List[Dict[str, Any]]:
@@ -90,10 +91,14 @@ async def search(
     logger.info(f"ChatGPT search request: query='{query}'")
 
     try:
+        # ChatGPT tools don't expose project parameter, so use default project
+        config = ConfigManager().config
+        default_project = config.default_project
+
         # Call underlying search_notes with sensible defaults for ChatGPT
         results = await search_notes.fn(
             query=query,
-            project=None,  # Let project resolution happen automatically
+            project=default_project,  # Use default project for ChatGPT
             page=1,
             page_size=10,  # Reasonable default for ChatGPT consumption
             search_type="text",  # Default to full-text search
@@ -149,10 +154,14 @@ async def fetch(
     logger.info(f"ChatGPT fetch request: id='{id}'")
 
     try:
+        # ChatGPT tools don't expose project parameter, so use default project
+        config = ConfigManager().config
+        default_project = config.default_project
+
         # Call underlying read_note function
         content = await read_note.fn(
             identifier=id,
-            project=None,  # Let project resolution happen automatically
+            project=default_project,  # Use default project for ChatGPT
             page=1,
             page_size=10,  # Default pagination
             context=context,

src/basic_memory/mcp/tools/view_note.py

@@ -22,14 +22,10 @@ async def view_note(
 ) -> str:
     """View a markdown note as a formatted artifact.
 
-    This tool reads a note using the same logic as read_note but displays the content
-    as a markdown artifact for better viewing experience in Claude Desktop.
+    This tool reads a note using the same logic as read_note but instructs Claude
+    to display the content as a markdown artifact in the Claude Desktop app.
     Project parameter optional with server resolution.
 
-    After calling this tool, create an artifact using the returned content to display
-    the note in a readable format. The tool returns the note content that should be
-    used to create a markdown artifact.
-
     Args:
         identifier: The title or permalink of the note to view
         project: Project name to read from. Optional - server will resolve using hierarchy.
@@ -39,7 +35,7 @@ async def view_note(
         context: Optional FastMCP context for performance caching.
 
     Returns:
-        The note content as a markdown artifact with a confirmation message.
+        Instructions for Claude to create a markdown artifact with the note content.
 
     Examples:
         # View a note by title
@@ -66,26 +62,16 @@ async def view_note(
 
     # Check if this is an error message (note not found)
     if "# Note Not Found" in content:
-        return content  # Return error message directly instead of creating artifact
-
-    # Extract title from content if possible
-    title = identifier
-    lines = content.split("\n")
-    for line in lines:
-        if line.startswith("title:"):
-            # Extract title from frontmatter
-            title = line.split("title:", 1)[1].strip().strip('"').strip("'")
-            break
-        elif line.startswith("# "):
-            # Extract title from first heading
-            title = line[2:].strip()
-            break
-
-    # Return the artifact XML as part of the response
-    artifact = f'<artifact identifier="note-{hash(identifier) & 0x7FFFFFFF}" type="text/markdown" title="{title}">\n{content}\n</artifact>'
+        return content  # Return error message directly
 
+    # Return instructions for Claude to create an artifact
     return dedent(f"""
-            <instructions>
-            Create an artifact using the returned content to display the note in a readable format.
-            </instructions>
-            {artifact}\n\n✅ Note displayed as artifact: **{title}**""")
+        Note retrieved: "{identifier}"
+        
+        Display this note as a markdown artifact for the user.
+    
+        Content:
+        ---
+        {content}
+        ---
+        """).strip()

test-int/conftest.py

@@ -125,7 +125,7 @@ def app_config(config_home, tmp_path, monkeypatch) -> BasicMemoryConfig:
         env="test",
         projects=projects,
         default_project="test-project",
-        default_project_mode=True,
+        default_project_mode=False,  # Match real-world usage - tools must pass explicit project
         update_permalinks_on_move=True,
         cloud_mode=False,  # Explicitly disable cloud mode
     )

tests/mcp/test_tool_view_note.py

@@ -44,19 +44,16 @@ async def test_view_note_basic_functionality(app, test_project):
     # View the note
     result = await view_note.fn("Test View Note", project=test_project.name)
 
-    # Should contain artifact XML
-    assert '<artifact identifier="note-' in result
-    assert 'type="text/markdown"' in result
-    assert 'title="Test View Note"' in result
-    assert "</artifact>" in result
+    # Should contain note retrieval message
+    assert 'Note retrieved: "Test View Note"' in result
+    assert "Display this note as a markdown artifact for the user" in result
+    assert "Content:" in result
+    assert "---" in result
 
-    # Should contain the note content within the artifact
+    # Should contain the note content
     assert "# Test View Note" in result
     assert "This is test content for viewing." in result
 
-    # Should have confirmation message
-    assert "✅ Note displayed as artifact" in result
-
 
 @pytest.mark.asyncio
 async def test_view_note_with_frontmatter_title(app, test_project):
@@ -80,9 +77,9 @@ async def test_view_note_with_frontmatter_title(app, test_project):
     # View the note
     result = await view_note.fn("Frontmatter Title", project=test_project.name)
 
-    # Should extract title from frontmatter
-    assert 'title="Frontmatter Title"' in result
-    assert "✅ Note displayed as artifact: **Frontmatter Title**" in result
+    # Should show title in retrieval message
+    assert 'Note retrieved: "Frontmatter Title"' in result
+    assert "Display this note as a markdown artifact for the user" in result
 
 
 @pytest.mark.asyncio
@@ -98,9 +95,9 @@ async def test_view_note_with_heading_title(app, test_project):
     # View the note
     result = await view_note.fn("Heading Title", project=test_project.name)
 
-    # Should extract title from heading
-    assert 'title="Heading Title"' in result
-    assert "✅ Note displayed as artifact: **Heading Title**" in result
+    # Should show title in retrieval message
+    assert 'Note retrieved: "Heading Title"' in result
+    assert "Display this note as a markdown artifact for the user" in result
 
 
 @pytest.mark.asyncio
@@ -119,7 +116,7 @@ async def test_view_note_unicode_content(app, test_project):
     assert "🚀" in result
     assert "🎉" in result
     assert "♠♣♥♦" in result
-    assert '<artifact identifier="note-' in result
+    assert 'Note retrieved: "Unicode Test 🚀"' in result
 
 
 @pytest.mark.asyncio
@@ -136,9 +133,9 @@ async def test_view_note_by_permalink(app, test_project):
     result = await view_note.fn("test/permalink-test", project=test_project.name)
 
     # Should work with permalink
-    assert '<artifact identifier="note-' in result
+    assert 'Note retrieved: "test/permalink-test"' in result
     assert "Content for permalink test." in result
-    assert "✅ Note displayed as artifact" in result
+    assert "Display this note as a markdown artifact for the user" in result
 
 
 @pytest.mark.asyncio
@@ -155,9 +152,9 @@ async def test_view_note_with_memory_url(app, test_project):
     result = await view_note.fn("memory://test/memory-url-test", project=test_project.name)
 
     # Should work with memory:// URL
-    assert '<artifact identifier="note-' in result
+    assert 'Note retrieved: "memory://test/memory-url-test"' in result
     assert "Testing memory:// URL handling in view_note" in result
-    assert "✅ Note displayed as artifact" in result
+    assert "Display this note as a markdown artifact for the user" in result
 
 
 @pytest.mark.asyncio
@@ -166,10 +163,10 @@ async def test_view_note_not_found(app, test_project):
     # Try to view non-existent note
     result = await view_note.fn("NonExistent Note", project=test_project.name)
 
-    # Should return error message without artifact
+    # Should return error message without artifact instructions
     assert "# Note Not Found" in result
     assert "NonExistent Note" in result
-    assert "<artifact" not in result  # No artifact for errors
+    assert "Display this note as a markdown artifact" not in result  # No artifact for errors
     assert "Check Identifier Type" in result
     assert "Search Instead" in result
 
@@ -188,9 +185,9 @@ async def test_view_note_pagination(app, test_project):
     result = await view_note.fn("Pagination Test", page=1, page_size=5, project=test_project.name)
 
     # Should work with pagination
-    assert '<artifact identifier="note-' in result
+    assert 'Note retrieved: "Pagination Test"' in result
     assert "Content for pagination test." in result
-    assert "✅ Note displayed as artifact" in result
+    assert "Display this note as a markdown artifact for the user" in result
 
 
 @pytest.mark.asyncio
@@ -207,14 +204,14 @@ async def test_view_note_project_parameter(app, test_project):
     result = await view_note.fn("Project Test", project=test_project.name)
 
     # Should work with project parameter
-    assert '<artifact identifier="note-' in result
+    assert 'Note retrieved: "Project Test"' in result
     assert "Content for project test." in result
-    assert "✅ Note displayed as artifact" in result
+    assert "Display this note as a markdown artifact for the user" in result
 
 
 @pytest.mark.asyncio
 async def test_view_note_artifact_identifier_unique(app, test_project):
-    """Test that different notes get different artifact identifiers."""
+    """Test that different notes are retrieved correctly with unique identifiers."""
     # Create two notes
     await write_note.fn(
         project=test_project.name, title="Note One", folder="test", content="Content one"
@@ -227,15 +224,11 @@ async def test_view_note_artifact_identifier_unique(app, test_project):
     result1 = await view_note.fn("Note One", project=test_project.name)
     result2 = await view_note.fn("Note Two", project=test_project.name)
 
-    # Should have different artifact identifiers
-    import re
-
-    id1_match = re.search(r'identifier="(note-\d+)"', result1)
-    id2_match = re.search(r'identifier="(note-\d+)"', result2)
-
-    assert id1_match is not None
-    assert id2_match is not None
-    assert id1_match.group(1) != id2_match.group(1)
+    # Should have different note identifiers in retrieval messages
+    assert 'Note retrieved: "Note One"' in result1
+    assert 'Note retrieved: "Note Two"' in result2
+    assert "Content one" in result1
+    assert "Content two" in result2
 
 
 @pytest.mark.asyncio
@@ -252,9 +245,9 @@ async def test_view_note_fallback_identifier_as_title(app, test_project):
     # View the note
     result = await view_note.fn("Simple Note", project=test_project.name)
 
-    # Should use identifier as fallback title
-    assert 'title="Simple Note"' in result
-    assert "✅ Note displayed as artifact: **Simple Note**" in result
+    # Should use identifier as title in retrieval message
+    assert 'Note retrieved: "Simple Note"' in result
+    assert "Display this note as a markdown artifact for the user" in result
 
 
 @pytest.mark.asyncio
@@ -282,8 +275,7 @@ async def test_view_note_direct_success(app, test_project, mock_call_get):
     mock_call_get.assert_called_once()
     assert "test/test-note" in mock_call_get.call_args[0][1]
 
-    # Verify result contains artifact
-    assert '<artifact identifier="note-' in result
-    assert 'title="Test Note"' in result
+    # Verify result contains note content
+    assert 'Note retrieved: "test/test-note"' in result
+    assert "Display this note as a markdown artifact for the user" in result
     assert "This is a test note." in result
-    assert "✅ Note displayed as artifact: **Test Note**" in result