rename(547): the server is grimoire — package, image, DB defaults, backups
CI & Build / Python lint (push) Successful in 3s
CI & Build / Plugin hooks (push) Successful in 12s
CI & Build / TypeScript typecheck (push) Successful in 56s
CI & Build / integration (push) Successful in 1m4s
CI & Build / Python tests (push) Successful in 1m55s
CI & Build / Build & push image (push) Successful in 44s
CI & Build / Python lint (push) Successful in 3s
CI & Build / Plugin hooks (push) Successful in 12s
CI & Build / TypeScript typecheck (push) Successful in 56s
CI & Build / integration (push) Successful in 1m4s
CI & Build / Python tests (push) Successful in 1m55s
CI & Build / Build & push image (push) Successful in 44s
Step 2 of the Scribe -> Grimoire rename. - src/scribe -> src/grimoire, and every import, patch target, module path, hypercorn entry point and `python -m grimoire.restore` with it; pyproject, uv.lock and the frontend package are named grimoire. - Image git.fabledsword.com/bvandeusen/fabledgrimoire; CI's Postgres service runs as grimoire / grimoire_test. - Compose files default the DB user, database and (prod) volume to grimoire, each overridable from .env, so an install created as Scribe keeps its data by setting POSTGRES_USER, POSTGRES_DB and PGDATA_VOLUME. - Backups are written as grimoire-<ts>.tar with format grimoire-backup-tar. Archives named scribe-* with the scribe-backup-tar manifest still restore and are still counted at the destination (folder and S3), with tests. - Exports, the MCP auth realm, the ASGI scope key and the persistent logger carry the new name. Kept on purpose: the secret-sealing key label stays "scribe.secrets.v1", because every stored secret was derived under it. Plugin identity (plugin name, hooks, env vars, .scribe marker, skills) is step 3. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -4,7 +4,7 @@ from unittest.mock import AsyncMock, MagicMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
from scribe.mcp.tools.tasks import (
|
||||
from grimoire.mcp.tools.tasks import (
|
||||
list_tasks, get_task, create_task,
|
||||
update_task, add_task_log,
|
||||
)
|
||||
@@ -18,7 +18,7 @@ pytestmark = pytest.mark.usefixtures("_bind_user")
|
||||
async def test_list_tasks_passes_is_task_true_and_repackages():
|
||||
rows = [fake_task(id=1, milestone_id=None), fake_task(id=2, milestone_id=None)]
|
||||
mock = AsyncMock(return_value=(rows, 2))
|
||||
with patch("scribe.mcp.tools.tasks.notes_svc.list_notes", mock):
|
||||
with patch("grimoire.mcp.tools.tasks.notes_svc.list_notes", mock):
|
||||
out = await list_tasks()
|
||||
assert out["total"] == 2
|
||||
assert len(out["tasks"]) == 2
|
||||
@@ -28,7 +28,7 @@ async def test_list_tasks_passes_is_task_true_and_repackages():
|
||||
@pytest.mark.asyncio
|
||||
async def test_list_tasks_status_filter():
|
||||
mock = AsyncMock(return_value=([], 0))
|
||||
with patch("scribe.mcp.tools.tasks.notes_svc.list_notes", mock):
|
||||
with patch("grimoire.mcp.tools.tasks.notes_svc.list_notes", mock):
|
||||
await list_tasks(status="in_progress")
|
||||
assert mock.call_args.kwargs["status"] == "in_progress"
|
||||
|
||||
@@ -36,7 +36,7 @@ async def test_list_tasks_status_filter():
|
||||
@pytest.mark.asyncio
|
||||
async def test_list_tasks_empty_status_means_no_filter():
|
||||
mock = AsyncMock(return_value=([], 0))
|
||||
with patch("scribe.mcp.tools.tasks.notes_svc.list_notes", mock):
|
||||
with patch("grimoire.mcp.tools.tasks.notes_svc.list_notes", mock):
|
||||
await list_tasks(status="")
|
||||
assert mock.call_args.kwargs["status"] is None
|
||||
|
||||
@@ -45,7 +45,7 @@ async def test_list_tasks_empty_status_means_no_filter():
|
||||
async def test_get_task_with_no_parent_returns_null_parent_title():
|
||||
fake = fake_task(id=5, title="solo", parent_id=None)
|
||||
with patch(
|
||||
"scribe.mcp.tools.tasks.notes_svc.get_note_for_user",
|
||||
"grimoire.mcp.tools.tasks.notes_svc.get_note_for_user",
|
||||
AsyncMock(return_value=(fake, "owner")),
|
||||
):
|
||||
out = await get_task(task_id=5)
|
||||
@@ -61,7 +61,7 @@ async def test_get_task_enriches_with_parent_title():
|
||||
parent = fake_task(id=5, title="parent of 10", parent_id=None)
|
||||
# fetched twice: once for the child, once for the parent
|
||||
mock_get = AsyncMock(side_effect=[(child, "owner"), (parent, "owner")])
|
||||
with patch("scribe.mcp.tools.tasks.notes_svc.get_note_for_user", mock_get):
|
||||
with patch("grimoire.mcp.tools.tasks.notes_svc.get_note_for_user", mock_get):
|
||||
out = await get_task(task_id=10)
|
||||
assert out["parent_title"] == "parent of 10"
|
||||
assert mock_get.await_count == 2
|
||||
@@ -72,7 +72,7 @@ async def test_get_task_parent_missing_returns_null():
|
||||
"""If parent_id is set but the parent is gone (orphaned), parent_title is None."""
|
||||
child = fake_task(id=10, parent_id=5)
|
||||
mock_get = AsyncMock(side_effect=[(child, "owner"), None])
|
||||
with patch("scribe.mcp.tools.tasks.notes_svc.get_note_for_user", mock_get):
|
||||
with patch("grimoire.mcp.tools.tasks.notes_svc.get_note_for_user", mock_get):
|
||||
out = await get_task(task_id=10)
|
||||
assert out["parent_title"] is None
|
||||
|
||||
@@ -83,10 +83,10 @@ async def test_get_task_opens_a_shared_task_and_says_whose_it_is():
|
||||
answer "not found" for the same id — and must say it isn't the caller's."""
|
||||
theirs = fake_task(id=5, title="Their task", user_id=9)
|
||||
with patch(
|
||||
"scribe.mcp.tools.tasks.notes_svc.get_note_for_user",
|
||||
"grimoire.mcp.tools.tasks.notes_svc.get_note_for_user",
|
||||
AsyncMock(return_value=(theirs, "viewer")),
|
||||
), patch(
|
||||
"scribe.services.access.describe_provenance",
|
||||
"grimoire.services.access.describe_provenance",
|
||||
AsyncMock(return_value={"shared": True, "owner": "alex",
|
||||
"permission": "viewer"}),
|
||||
):
|
||||
@@ -98,7 +98,7 @@ async def test_get_task_opens_a_shared_task_and_says_whose_it_is():
|
||||
@pytest.mark.asyncio
|
||||
async def test_get_task_raises_when_not_found():
|
||||
with patch(
|
||||
"scribe.mcp.tools.tasks.notes_svc.get_note_for_user",
|
||||
"grimoire.mcp.tools.tasks.notes_svc.get_note_for_user",
|
||||
AsyncMock(return_value=None),
|
||||
):
|
||||
with pytest.raises(ValueError, match="task 999 not found"):
|
||||
@@ -109,7 +109,7 @@ async def test_get_task_raises_when_not_found():
|
||||
async def test_create_task_passes_status():
|
||||
fake = fake_task()
|
||||
mock = AsyncMock(return_value=fake)
|
||||
with patch("scribe.mcp.tools.tasks.notes_svc.create_note", mock):
|
||||
with patch("grimoire.mcp.tools.tasks.notes_svc.create_note", mock):
|
||||
await create_task(title="do x", status="todo")
|
||||
assert mock.call_args.kwargs["status"] == "todo"
|
||||
|
||||
@@ -117,12 +117,12 @@ async def test_create_task_passes_status():
|
||||
@pytest.mark.asyncio
|
||||
async def test_create_task_blocked_by_duplicate_gate():
|
||||
"""A near-duplicate blocks creation and returns the existing id (no insert)."""
|
||||
from scribe.services.dedup import DuplicateMatch
|
||||
from grimoire.services.dedup import DuplicateMatch
|
||||
dup = DuplicateMatch(id=42, title="Set up CI", similarity=1.0, reason="title")
|
||||
create_mock = AsyncMock()
|
||||
with patch("scribe.mcp.tools.tasks.dedup_svc.find_duplicate_note",
|
||||
with patch("grimoire.mcp.tools.tasks.dedup_svc.find_duplicate_note",
|
||||
AsyncMock(return_value=dup)), \
|
||||
patch("scribe.mcp.tools.tasks.notes_svc.create_note", create_mock):
|
||||
patch("grimoire.mcp.tools.tasks.notes_svc.create_note", create_mock):
|
||||
out = await create_task(title="set up ci")
|
||||
assert out["duplicate"] is True
|
||||
assert out["existing_id"] == 42
|
||||
@@ -133,8 +133,8 @@ async def test_create_task_blocked_by_duplicate_gate():
|
||||
async def test_create_task_force_bypasses_duplicate_gate():
|
||||
"""force=true skips the gate entirely and creates."""
|
||||
find_mock = AsyncMock()
|
||||
with patch("scribe.mcp.tools.tasks.dedup_svc.find_duplicate_note", find_mock), \
|
||||
patch("scribe.mcp.tools.tasks.notes_svc.create_note",
|
||||
with patch("grimoire.mcp.tools.tasks.dedup_svc.find_duplicate_note", find_mock), \
|
||||
patch("grimoire.mcp.tools.tasks.notes_svc.create_note",
|
||||
AsyncMock(return_value=fake_task(id=9))):
|
||||
out = await create_task(title="dup", force=True)
|
||||
assert out["id"] == 9
|
||||
@@ -145,7 +145,7 @@ async def test_create_task_force_bypasses_duplicate_gate():
|
||||
async def test_create_task_rejects_retired_plan_kind():
|
||||
"""kind=plan is hard-retired — plans are milestones (start_planning)."""
|
||||
mock = AsyncMock()
|
||||
with patch("scribe.mcp.tools.tasks.notes_svc.create_note", mock):
|
||||
with patch("grimoire.mcp.tools.tasks.notes_svc.create_note", mock):
|
||||
with pytest.raises(ValueError, match="kind=plan is retired"):
|
||||
await create_task(title="x", kind="plan")
|
||||
assert not mock.called # never reached the create
|
||||
@@ -155,7 +155,7 @@ async def test_create_task_rejects_retired_plan_kind():
|
||||
async def test_create_task_priority_empty_becomes_none():
|
||||
fake = fake_task()
|
||||
mock = AsyncMock(return_value=fake)
|
||||
with patch("scribe.mcp.tools.tasks.notes_svc.create_note", mock):
|
||||
with patch("grimoire.mcp.tools.tasks.notes_svc.create_note", mock):
|
||||
await create_task(title="x", priority="")
|
||||
assert mock.call_args.kwargs["priority"] is None
|
||||
|
||||
@@ -164,7 +164,7 @@ async def test_create_task_priority_empty_becomes_none():
|
||||
async def test_create_task_zero_id_sentinels_become_none():
|
||||
fake = fake_task()
|
||||
mock = AsyncMock(return_value=fake)
|
||||
with patch("scribe.mcp.tools.tasks.notes_svc.create_note", mock):
|
||||
with patch("grimoire.mcp.tools.tasks.notes_svc.create_note", mock):
|
||||
await create_task(title="x", project_id=0, milestone_id=0, parent_id=0)
|
||||
assert mock.call_args.kwargs["project_id"] is None
|
||||
assert mock.call_args.kwargs["milestone_id"] is None
|
||||
@@ -175,7 +175,7 @@ async def test_create_task_zero_id_sentinels_become_none():
|
||||
async def test_update_task_only_sends_non_default_fields():
|
||||
fake = fake_task()
|
||||
mock = AsyncMock(return_value=fake)
|
||||
with patch("scribe.mcp.tools.tasks.notes_svc.update_note", mock):
|
||||
with patch("grimoire.mcp.tools.tasks.notes_svc.update_note", mock):
|
||||
await update_task(task_id=1, status="done")
|
||||
args, kwargs = mock.call_args
|
||||
assert args == (7, 1)
|
||||
@@ -187,7 +187,7 @@ async def test_update_task_empty_priority_is_omitted():
|
||||
"""Priority="" is "leave unchanged" — must not reach service as empty string."""
|
||||
fake = fake_task()
|
||||
mock = AsyncMock(return_value=fake)
|
||||
with patch("scribe.mcp.tools.tasks.notes_svc.update_note", mock):
|
||||
with patch("grimoire.mcp.tools.tasks.notes_svc.update_note", mock):
|
||||
await update_task(task_id=1, status="done", priority="")
|
||||
assert "priority" not in mock.call_args.kwargs
|
||||
|
||||
@@ -195,7 +195,7 @@ async def test_update_task_empty_priority_is_omitted():
|
||||
@pytest.mark.asyncio
|
||||
async def test_update_task_raises_when_not_found():
|
||||
with patch(
|
||||
"scribe.mcp.tools.tasks.notes_svc.update_note",
|
||||
"grimoire.mcp.tools.tasks.notes_svc.update_note",
|
||||
AsyncMock(return_value=None),
|
||||
):
|
||||
with pytest.raises(ValueError, match="task 999 not found"):
|
||||
@@ -207,7 +207,7 @@ async def test_update_task_milestone_zero_is_omitted():
|
||||
"""milestone_id=0 is 'leave unchanged' — must not reach the service."""
|
||||
fake = fake_task()
|
||||
mock = AsyncMock(return_value=fake)
|
||||
with patch("scribe.mcp.tools.tasks.notes_svc.update_note", mock):
|
||||
with patch("grimoire.mcp.tools.tasks.notes_svc.update_note", mock):
|
||||
await update_task(task_id=1, milestone_id=0)
|
||||
assert "milestone_id" not in mock.call_args.kwargs
|
||||
|
||||
@@ -216,7 +216,7 @@ async def test_update_task_milestone_zero_is_omitted():
|
||||
async def test_update_task_milestone_positive_is_set():
|
||||
fake = fake_task()
|
||||
mock = AsyncMock(return_value=fake)
|
||||
with patch("scribe.mcp.tools.tasks.notes_svc.update_note", mock):
|
||||
with patch("grimoire.mcp.tools.tasks.notes_svc.update_note", mock):
|
||||
await update_task(task_id=1, milestone_id=42)
|
||||
assert mock.call_args.kwargs["milestone_id"] == 42
|
||||
|
||||
@@ -226,7 +226,7 @@ async def test_update_task_milestone_negative_one_clears():
|
||||
"""milestone_id=-1 clears the milestone (sets the column NULL)."""
|
||||
fake = fake_task()
|
||||
mock = AsyncMock(return_value=fake)
|
||||
with patch("scribe.mcp.tools.tasks.notes_svc.update_note", mock):
|
||||
with patch("grimoire.mcp.tools.tasks.notes_svc.update_note", mock):
|
||||
await update_task(task_id=1, milestone_id=-1)
|
||||
assert mock.call_args.kwargs["milestone_id"] is None
|
||||
|
||||
@@ -236,7 +236,7 @@ async def test_update_task_clearing_project_also_clears_milestone():
|
||||
"""project_id=-1 clears the project and, with it, the milestone."""
|
||||
fake = fake_task()
|
||||
mock = AsyncMock(return_value=fake)
|
||||
with patch("scribe.mcp.tools.tasks.notes_svc.update_note", mock):
|
||||
with patch("grimoire.mcp.tools.tasks.notes_svc.update_note", mock):
|
||||
await update_task(task_id=1, project_id=-1)
|
||||
assert mock.call_args.kwargs["project_id"] is None
|
||||
assert mock.call_args.kwargs["milestone_id"] is None
|
||||
@@ -252,7 +252,7 @@ async def test_add_task_log_returns_log_dict():
|
||||
# No to_dict on TaskLog model (per task_logs.py inspection) — fall through to manual dict
|
||||
del log.to_dict
|
||||
with patch(
|
||||
"scribe.mcp.tools.tasks.task_logs_svc.create_log",
|
||||
"grimoire.mcp.tools.tasks.task_logs_svc.create_log",
|
||||
AsyncMock(return_value=log),
|
||||
):
|
||||
out = await add_task_log(task_id=1, content="checkpoint")
|
||||
@@ -266,7 +266,7 @@ async def test_add_task_log_returns_log_dict():
|
||||
async def test_add_task_log_propagates_value_error_when_task_missing():
|
||||
"""create_log raises ValueError if the task doesn't exist; we let it through."""
|
||||
with patch(
|
||||
"scribe.mcp.tools.tasks.task_logs_svc.create_log",
|
||||
"grimoire.mcp.tools.tasks.task_logs_svc.create_log",
|
||||
AsyncMock(side_effect=ValueError("Task 999 not found")),
|
||||
):
|
||||
with pytest.raises(ValueError):
|
||||
|
||||
Reference in New Issue
Block a user