@ripla/godd-mcp 1.0.2-canary.1 → 1.0.2-canary.2

package/notes-api/app/config.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import logging
 import re
+from urllib.parse import parse_qsl, urlencode, urlsplit, urlunsplit
 
 from pydantic import AliasChoices, Field, model_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
@@ -11,6 +12,24 @@ from pydantic_settings import BaseSettings, SettingsConfigDict
 _logger = logging.getLogger(__name__)
 
 
+def _remove_query_param(url: str, key: str) -> str:
+    parts = urlsplit(url)
+    query = urlencode(
+        [(k, v) for k, v in parse_qsl(parts.query, keep_blank_values=True) if k != key],
+        doseq=True,
+    )
+    return urlunsplit((parts.scheme, parts.netloc, parts.path, query, parts.fragment))
+
+
+def _set_query_param(url: str, key: str, value: str) -> str:
+    parts = urlsplit(url)
+    query_items = [
+        (k, v) for k, v in parse_qsl(parts.query, keep_blank_values=True) if k != key
+    ]
+    query = urlencode([*query_items, (key, value)], doseq=True)
+    return urlunsplit((parts.scheme, parts.netloc, parts.path, query, parts.fragment))
+
+
 class Settings(BaseSettings):
     """ripla Notes API settings."""
 
@@ -72,7 +91,10 @@ class Settings(BaseSettings):
     def async_database_url(self) -> str:
         """Async DB URL for SQLAlchemy (asyncpg driver)."""
         if self.database_url:
-            return re.sub(r"^postgres(ql)?://", "postgresql+asyncpg://", self.database_url)
+            url = re.sub(r"^postgres(ql)?://", "postgresql+asyncpg://", self.database_url)
+            if self.database_ssl:
+                return _remove_query_param(url, "sslmode")
+            return url
         return (
             f"postgresql+asyncpg://{self.db_user}:{self.db_password}"
             f"@{self.db_host}:{self.db_port}/{self.db_name}"
@@ -89,8 +111,7 @@ class Settings(BaseSettings):
                 f"@{self.db_host}:{self.db_port}/{self.db_name}"
             )
         if self.database_ssl:
-            sep = "&" if "?" in url else "?"
-            url = f"{url}{sep}sslmode=require"
+            url = _set_query_param(url, "sslmode", "require")
         return url
 
     @property

package/notes-api/app/database.py

@@ -7,10 +7,16 @@ from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_asyn
 
 from app.config import settings
 
-_async_connect_args: dict[str, Any] = {}
-if settings.database_ssl:
-    # asyncpg: required for many managed Postgres providers (e.g. AWS RDS with force_ssl)
-    _async_connect_args["ssl"] = True
+
+def _build_async_connect_args(database_ssl: bool) -> dict[str, Any]:
+    if not database_ssl:
+        return {}
+    # asyncpg: "require" = encrypt connection without certificate verification
+    # (equivalent to psycopg2's sslmode=require, works with AWS RDS / GCP Cloud SQL / Azure)
+    return {"ssl": "require"}
+
+
+_async_connect_args = _build_async_connect_args(settings.database_ssl)
 
 engine = create_async_engine(
     settings.async_database_url,

package/notes-api/app/routers/comments.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from datetime import UTC, datetime
 from typing import Any
+
 from fastapi import APIRouter, Depends, HTTPException, Query, status
 from pydantic import BaseModel, Field
 from sqlalchemy import func, select

package/notes-api/app/routers/files.py

@@ -43,7 +43,6 @@ STYLES_SUFFIX = ".styles.json"
 
 from app.path_validation import validate_docs_path  # noqa: E402
 
-
 _validate_path = validate_docs_path
 
 

package/notes-api/app/routers/settings.py

@@ -1,7 +1,8 @@
 """Settings router."""
 
 import logging
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 from fastapi import APIRouter, Depends, HTTPException
 from fastapi.encoders import jsonable_encoder
@@ -72,9 +73,10 @@ async def update_setting(
     """Update setting (admin only). Only whitelisted keys are accepted."""
     validator = ALLOWED_SETTINGS.get(key)
     if validator is None:
+        allowed_keys = ", ".join(sorted(ALLOWED_SETTINGS))
         raise HTTPException(
             status_code=400,
-            detail=f"Unknown setting key: {key}. Allowed keys: {', '.join(sorted(ALLOWED_SETTINGS))}",
+            detail=f"Unknown setting key: {key}. Allowed keys: {allowed_keys}",
         )
     if not validator(body.value):
         raise HTTPException(

package/notes-api/app/routers/tree.py

@@ -21,7 +21,12 @@ async def get_tree(
 ):
     """Get file tree. Pass *ref* to read a specific branch. Mock mode when GITHUB_TOKEN not set."""
     if settings.is_mock_mode():
-        return {"mode": "mock", "source": "mock", "reason": "GITHUB_TOKEN が未設定です", "tree": get_mock_tree()}
+        return {
+            "mode": "mock",
+            "source": "mock",
+            "reason": "GITHUB_TOKEN が未設定です",
+            "tree": get_mock_tree(),
+        }
 
     try:
         config = get_github_config()
@@ -37,7 +42,10 @@ async def get_tree(
                 "Organization の承認が必要な場合があります。"
             )
         elif code == 404:
-            detail = f"リポジトリまたはパスが見つかりません: {settings.github_owner}/{settings.github_repo}"
+            detail = (
+                "リポジトリまたはパスが見つかりません: "
+                f"{settings.github_owner}/{settings.github_repo}"
+            )
         else:
             detail = f"GitHub API エラー (HTTP {code})"
         raise HTTPException(

package/notes-api/app/services/github_issues.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import logging
 
 from app.http_client import get_github_client
-from app.services.github import parse_link_next, resolve_token, _auth_headers
+from app.services.github import _auth_headers, parse_link_next, resolve_token
 
 logger = logging.getLogger(__name__)
 

package/notes-api/tests/test_config_ssl.py

@@ -1,6 +1,7 @@
 """DATABASE_SSL / DB_SSL settings for managed Postgres (e.g. AWS RDS)."""
 
 from app.config import Settings
+from app.database import _build_async_connect_args
 
 
 def test_database_ssl_defaults_false(monkeypatch):
@@ -33,3 +34,30 @@ def test_sync_database_url_appends_sslmode_when_ssl_enabled():
         database_ssl=True,
     )
     assert "sslmode=require" in s.sync_database_url
+
+
+def test_sync_database_url_overrides_existing_sslmode():
+    s = Settings(
+        database_url="postgresql://u:p@db.example.com:5432/app?sslmode=disable",
+        database_ssl=True,
+    )
+    assert s.sync_database_url.count("sslmode=require") == 1
+    assert "sslmode=disable" not in s.sync_database_url
+
+
+def test_async_database_url_removes_sslmode_when_connect_args_handle_ssl():
+    s = Settings(
+        database_url="postgresql://u:p@db.example.com:5432/app?sslmode=require&application_name=notes",
+        database_ssl=True,
+    )
+    assert s.async_database_url == (
+        "postgresql+asyncpg://u:p@db.example.com:5432/app?application_name=notes"
+    )
+
+
+def test_async_database_connect_args_require_ssl_without_cert_verification():
+    assert _build_async_connect_args(database_ssl=True) == {"ssl": "require"}
+
+
+def test_async_database_connect_args_empty_when_ssl_disabled():
+    assert _build_async_connect_args(database_ssl=False) == {}

package/notes-api/tests/test_issues.py

@@ -3,7 +3,6 @@
 from unittest.mock import AsyncMock, patch
 
 import httpx
-import pytest
 from httpx import AsyncClient
 
 from tests.conftest import auth_headers
@@ -46,7 +45,11 @@ class TestListIssues:
         ):
             mock_settings.is_mock_mode.return_value = False
             mock_config.return_value = {"token": "t", "owner": "o", "repo": "r", "branch": "main"}
-            mock_list.side_effect = httpx.HTTPStatusError("", request=mock_resp.request, response=mock_resp)
+            mock_list.side_effect = httpx.HTTPStatusError(
+                "",
+                request=mock_resp.request,
+                response=mock_resp,
+            )
             resp = await client.get("/api/issues", headers=auth_headers(admin_token))
         assert resp.status_code == 401
 
@@ -81,7 +84,11 @@ class TestGetIssue:
         ):
             mock_settings.is_mock_mode.return_value = False
             mock_config.return_value = {"token": "t", "owner": "o", "repo": "r", "branch": "main"}
-            mock_get.side_effect = httpx.HTTPStatusError("", request=mock_resp.request, response=mock_resp)
+            mock_get.side_effect = httpx.HTTPStatusError(
+                "",
+                request=mock_resp.request,
+                response=mock_resp,
+            )
             resp = await client.get("/api/issues/999", headers=auth_headers(admin_token))
         assert resp.status_code == 404
 
@@ -176,7 +183,11 @@ class TestUpdateIssue:
         ):
             mock_settings.is_mock_mode.return_value = False
             mock_config.return_value = {"token": "t", "owner": "o", "repo": "r", "branch": "main"}
-            mock_update.side_effect = httpx.HTTPStatusError("", request=mock_resp.request, response=mock_resp)
+            mock_update.side_effect = httpx.HTTPStatusError(
+                "",
+                request=mock_resp.request,
+                response=mock_resp,
+            )
             resp = await client.patch(
                 "/api/issues/999",
                 json={"title": "Does not exist"},

package/notes-api/tests/test_pr.py

@@ -1,6 +1,5 @@
 """Tests for PR endpoints."""
 
-from unittest.mock import AsyncMock, patch
 
 from httpx import AsyncClient
 

package/notes-api/tests/test_pr_chain.py

@@ -649,7 +649,7 @@ class TestRenameOnWorkingBranch:
 
         with (
             patch(
-                "app.services.business_date.get_business_date",
+                "app.services.pr_chain.get_business_date",
                 new_callable=AsyncMock, return_value="2026-04-17",
             ),
             patch(
@@ -714,7 +714,7 @@ class TestRenameOnWorkingBranch:
 
         with (
             patch(
-                "app.services.business_date.get_business_date",
+                "app.services.pr_chain.get_business_date",
                 new_callable=AsyncMock, return_value="2026-04-17",
             ),
             patch(

package/notes-api/tests/test_tree.py

@@ -68,7 +68,11 @@ class TestTree:
             mock_config.return_value = {
                 "token": "t", "owner": "o", "repo": "r", "branch": "main", "docs_path": "docs",
             }
-            mock_fetch.side_effect = httpx.HTTPStatusError("", request=mock_resp.request, response=mock_resp)
+            mock_fetch.side_effect = httpx.HTTPStatusError(
+                "",
+                request=mock_resp.request,
+                response=mock_resp,
+            )
             resp = await client.get("/api/tree", headers=self._headers)
         assert resp.status_code == 502
 
@@ -84,7 +88,11 @@ class TestTree:
             mock_config.return_value = {
                 "token": "t", "owner": "o", "repo": "r", "branch": "main", "docs_path": "docs",
             }
-            mock_fetch.side_effect = httpx.HTTPStatusError("", request=mock_resp.request, response=mock_resp)
+            mock_fetch.side_effect = httpx.HTTPStatusError(
+                "",
+                request=mock_resp.request,
+                response=mock_resp,
+            )
             resp = await client.get("/api/tree", headers=self._headers)
         assert resp.status_code == 502
         assert "権限" in resp.json()["detail"]
@@ -124,7 +132,11 @@ class TestTree:
             mock_config.return_value = {
                 "token": "t", "owner": "o", "repo": "r", "branch": "main", "docs_path": "docs",
             }
-            mock_fetch.side_effect = httpx.HTTPStatusError("", request=mock_resp.request, response=mock_resp)
+            mock_fetch.side_effect = httpx.HTTPStatusError(
+                "",
+                request=mock_resp.request,
+                response=mock_resp,
+            )
             resp = await client.get("/api/tree", headers=self._headers)
         assert resp.status_code == 502
         assert "見つかりません" in resp.json()["detail"]

package/notes-app/src/components/IssueList.tsx

@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback } from "react";
+import { useState, useEffect, useRef } from "react";
 import {
   listIssuesApi,
   getErrorMessage,
@@ -18,24 +18,44 @@ export default function IssueList({ onSelect, selectedIssue }: IssueListProps) {
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
   const [stateFilter, setStateFilter] = useState<"open" | "closed">("open");
+  const [reloadKey, setReloadKey] = useState(0);
+  const requestSeq = useRef(0);
 
-  const loadIssues = useCallback((signal?: AbortSignal) => {
+  const requestReload = () => {
+    requestSeq.current += 1;
     setLoading(true);
     setError(null);
-    listIssuesApi({ state: stateFilter, per_page: 50, signal })
-      .then((data) => { setIssues(data.issues); })
-      .catch((e) => {
-        if (isAbortError(e)) return;
-        setError(getErrorMessage(e));
-      })
-      .finally(() => { setLoading(false); });
-  }, [stateFilter]);
+    setReloadKey((key) => key + 1);
+  };
+
+  const changeStateFilter = (nextState: "open" | "closed") => {
+    if (nextState === stateFilter) return;
+    requestSeq.current += 1;
+    setLoading(true);
+    setError(null);
+    setStateFilter(nextState);
+  };
 
   useEffect(() => {
     const ac = new AbortController();
-    loadIssues(ac.signal);
+    const requestId = requestSeq.current + 1;
+    requestSeq.current = requestId;
+    listIssuesApi({ state: stateFilter, per_page: 50, signal: ac.signal })
+      .then((data) => {
+        if (ac.signal.aborted || requestSeq.current !== requestId) return;
+        setIssues(data.issues);
+      })
+      .catch((e) => {
+        if (ac.signal.aborted || requestSeq.current !== requestId || isAbortError(e)) return;
+        setError(getErrorMessage(e));
+      })
+      .finally(() => {
+        if (!ac.signal.aborted && requestSeq.current === requestId) {
+          setLoading(false);
+        }
+      });
     return () => ac.abort();
-  }, [loadIssues]);
+  }, [stateFilter, reloadKey]);
 
   return (
     <div className="flex flex-col h-full">
@@ -44,7 +64,7 @@ export default function IssueList({ onSelect, selectedIssue }: IssueListProps) {
         <div className="flex-1 flex bg-gray-900 rounded border border-gray-600 overflow-hidden text-xs">
           <button
             type="button"
-            onClick={() => setStateFilter("open")}
+            onClick={() => changeStateFilter("open")}
             className={`flex-1 px-2 py-1 transition-colors ${
               stateFilter === "open"
                 ? "bg-green-700/30 text-green-300"
@@ -56,7 +76,7 @@ export default function IssueList({ onSelect, selectedIssue }: IssueListProps) {
           </button>
           <button
             type="button"
-            onClick={() => setStateFilter("closed")}
+            onClick={() => changeStateFilter("closed")}
             className={`flex-1 px-2 py-1 transition-colors ${
               stateFilter === "closed"
                 ? "bg-purple-700/30 text-purple-300"
@@ -69,7 +89,7 @@ export default function IssueList({ onSelect, selectedIssue }: IssueListProps) {
         </div>
         <button
           type="button"
-          onClick={() => loadIssues()}
+          onClick={requestReload}
           className="shrink-0 p-1 rounded text-gray-400 hover:text-gray-200 hover:bg-gray-700 transition-colors"
           title="更新"
         >
@@ -85,7 +105,7 @@ export default function IssueList({ onSelect, selectedIssue }: IssueListProps) {
           </div>
         )}
 
-        {error && <InlineError message={error} onRetry={loadIssues} />}
+        {error && <InlineError message={error} onRetry={requestReload} />}
 
         {!loading && !error && issues.length === 0 && (
           <p className="text-xs text-gray-500 text-center py-4">

package/notes-app/vitest.config.ts

@@ -7,6 +7,7 @@ export default defineConfig({
   test: {
     environment: "jsdom",
     globals: true,
+    include: ["src/**/*.{test,spec}.{ts,tsx}"],
   },
   resolve: {
     alias: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ripla/godd-mcp",
-  "version": "1.0.2-canary.1",
+  "version": "1.0.2-canary.2",
   "type": "module",
   "description": "GoDD (Governance-orchestrated Driven Development) MCP Server - Encrypted prompt distribution via Model Context Protocol",
   "main": "dist/index.js",