@ripla/godd-mcp 1.0.4-canary.21 → 1.0.4-canary.23

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

@@ -1,16 +1,18 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
-import { render, screen, waitFor } from "@testing-library/react";
+import { render, screen, waitFor, fireEvent } from "@testing-library/react";
 
 vi.mock("@/lib/api", () => ({
   listIssuesApi: vi.fn(),
+  listIssueLabelsApi: vi.fn(),
   getErrorMessage: vi.fn((e: unknown) => String(e)),
   isAbortError: vi.fn(() => false),
 }));
 
-import { listIssuesApi } from "@/lib/api";
+import { listIssuesApi, listIssueLabelsApi } from "@/lib/api";
 import IssueList from "./IssueList";
 
 const mockListIssues = vi.mocked(listIssuesApi);
+const mockListLabels = vi.mocked(listIssueLabelsApi);
 
 const MOCK_ISSUES = [
   {
@@ -40,6 +42,9 @@ const MOCK_ISSUES = [
 describe("IssueList", () => {
   beforeEach(() => {
     vi.clearAllMocks();
+    mockListLabels.mockResolvedValue({
+      labels: [{ name: "bug", color: "d73a4a" }],
+    });
   });
 
   it("Issueリストを取得して表示する", async () => {
@@ -90,4 +95,24 @@ describe("IssueList", () => {
 
     expect(mockListIssues).toHaveBeenCalledTimes(1);
   });
+
+  it("ラベルフィルタ変更時に labels クエリ付きで listIssuesApi を呼ぶ", async () => {
+    mockListIssues.mockResolvedValue({ issues: MOCK_ISSUES });
+
+    render(<IssueList onSelect={vi.fn()} selectedIssue={null} />);
+
+    await waitFor(() => {
+      expect(screen.getByLabelText("ラベルでフィルタ")).toBeTruthy();
+    });
+
+    fireEvent.change(screen.getByLabelText("ラベルでフィルタ"), {
+      target: { value: "bug" },
+    });
+
+    await waitFor(() => {
+      expect(mockListIssues).toHaveBeenCalledWith(
+        expect.objectContaining({ labels: "bug" }),
+      );
+    });
+  });
 });

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

@@ -1,11 +1,12 @@
 import { useState, useEffect, useRef } from "react";
 import {
   listIssuesApi,
+  listIssueLabelsApi,
   getErrorMessage,
   isAbortError,
 } from "@/lib/api";
-import type { IssueSummary } from "@/lib/api";
-import { CircleDot, CircleCheck, MessageSquare, RefreshCw } from "lucide-react";
+import type { IssueLabel, IssueSummary } from "@/lib/api";
+import { CircleDot, CircleCheck, MessageSquare, RefreshCw, Tag } from "lucide-react";
 import { InlineError } from "@/components/Skeleton";
 
 type IssueListProps = {
@@ -19,9 +20,25 @@ export default function IssueList({ onSelect, selectedIssue, reloadTrigger }: Is
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
   const [stateFilter, setStateFilter] = useState<"open" | "closed">("open");
+  const [labelFilter, setLabelFilter] = useState<string>("");
+  const [labels, setLabels] = useState<IssueLabel[]>([]);
   const [reloadKey, setReloadKey] = useState(0);
   const requestSeq = useRef(0);
 
+  useEffect(() => {
+    const ac = new AbortController();
+    listIssueLabelsApi()
+      .then((data) => {
+        if (ac.signal.aborted) return;
+        setLabels([...data.labels].sort((a, b) => a.name.localeCompare(b.name)));
+      })
+      .catch(() => {
+        if (ac.signal.aborted) return;
+        setLabels([]);
+      });
+    return () => ac.abort();
+  }, [reloadTrigger]);
+
   const requestReload = () => {
     requestSeq.current += 1;
     setLoading(true);
@@ -37,11 +54,24 @@ export default function IssueList({ onSelect, selectedIssue, reloadTrigger }: Is
     setStateFilter(nextState);
   };
 
+  const changeLabelFilter = (nextLabel: string) => {
+    if (nextLabel === labelFilter) return;
+    requestSeq.current += 1;
+    setLoading(true);
+    setError(null);
+    setLabelFilter(nextLabel);
+  };
+
   useEffect(() => {
     const ac = new AbortController();
     const requestId = requestSeq.current + 1;
     requestSeq.current = requestId;
-    listIssuesApi({ state: stateFilter, per_page: 50, signal: ac.signal })
+    listIssuesApi({
+      state: stateFilter,
+      labels: labelFilter || undefined,
+      per_page: 50,
+      signal: ac.signal,
+    })
       .then((data) => {
         if (ac.signal.aborted || requestSeq.current !== requestId) return;
         setIssues([...data.issues].sort((a, b) => b.number - a.number));
@@ -56,7 +86,7 @@ export default function IssueList({ onSelect, selectedIssue, reloadTrigger }: Is
         }
       });
     return () => ac.abort();
-  }, [stateFilter, reloadKey, reloadTrigger]);
+  }, [stateFilter, labelFilter, reloadKey, reloadTrigger]);
 
   return (
     <div className="flex flex-col h-full">
@@ -98,6 +128,28 @@ export default function IssueList({ onSelect, selectedIssue, reloadTrigger }: Is
         </button>
       </div>
 
+      {labels.length > 0 && (
+        <div className="px-2 pt-2">
+          <label className="flex items-center gap-1.5 text-[10px] text-gray-500 mb-1">
+            <Tag className="w-3 h-3" />
+            ラベル
+          </label>
+          <select
+            value={labelFilter}
+            onChange={(e) => changeLabelFilter(e.target.value)}
+            className="w-full px-2 py-1 rounded text-xs bg-gray-900 border border-gray-600 text-gray-200 outline-none focus:border-blue-500"
+            aria-label="ラベルでフィルタ"
+          >
+            <option value="">すべて</option>
+            {labels.map((label) => (
+              <option key={label.name} value={label.name}>
+                {label.name}
+              </option>
+            ))}
+          </select>
+        </div>
+      )}
+
       {/* Issue list */}
       <div className="flex-1 overflow-y-auto p-2">
         {loading && issues.length === 0 && (

package/notes-app/src/lib/issue-url-sync.test.ts

@@ -0,0 +1,73 @@
+import { describe, it, expect } from "vitest";
+import {
+  buildMainPageSearchParams,
+  parseIssueSearchParam,
+  issueSelectionToSearchParam,
+  searchParamsToString,
+} from "./issue-url-sync";
+
+describe("parseIssueSearchParam", () => {
+  it("parses positive issue numbers", () => {
+    expect(parseIssueSearchParam("794")).toBe(794);
+  });
+
+  it("parses new issue sentinel", () => {
+    expect(parseIssueSearchParam("new")).toBe("new");
+  });
+
+  it("returns null for invalid values", () => {
+    expect(parseIssueSearchParam(null)).toBeNull();
+    expect(parseIssueSearchParam("")).toBeNull();
+    expect(parseIssueSearchParam("0")).toBeNull();
+    expect(parseIssueSearchParam("-1")).toBeNull();
+    expect(parseIssueSearchParam("abc")).toBeNull();
+  });
+});
+
+describe("issueSelectionToSearchParam", () => {
+  it("serializes issue selections", () => {
+    expect(issueSelectionToSearchParam(123)).toBe("123");
+    expect(issueSelectionToSearchParam("new")).toBe("new");
+    expect(issueSelectionToSearchParam(null)).toBeNull();
+  });
+});
+
+describe("buildMainPageSearchParams", () => {
+  it("builds issue-only deep link", () => {
+    const params = buildMainPageSearchParams({ issue: 794 });
+    expect(searchParamsToString(params)).toBe("?issue=794");
+  });
+
+  it("builds new-issue deep link", () => {
+    const params = buildMainPageSearchParams({ issue: "new" });
+    expect(searchParamsToString(params)).toBe("?issue=new");
+  });
+
+  it("prefers file over issue when both provided", () => {
+    const params = buildMainPageSearchParams({
+      file: "docs/README.md",
+      issue: 794,
+    });
+    expect(params.get("file")).toBe("docs/README.md");
+    expect(params.get("issue")).toBe("794");
+  });
+
+  it("preserves unrelated query params", () => {
+    const preserve = new URLSearchParams("x=1&file=old&issue=1");
+    const params = buildMainPageSearchParams({
+      issue: 42,
+      preserve,
+    });
+    expect(params.get("x")).toBe("1");
+    expect(params.get("issue")).toBe("42");
+    expect(params.has("file")).toBe(false);
+  });
+
+  it("clears issue and file when neither is set", () => {
+    const preserve = new URLSearchParams("file=a&issue=1&x=1");
+    const params = buildMainPageSearchParams({ preserve });
+    expect(params.get("x")).toBe("1");
+    expect(params.has("file")).toBe(false);
+    expect(params.has("issue")).toBe(false);
+  });
+});

package/notes-app/src/lib/issue-url-sync.ts

@@ -0,0 +1,43 @@
+export type IssueUrlSelection = number | "new" | null;
+
+export function parseIssueSearchParam(value: string | null): IssueUrlSelection {
+  if (!value) return null;
+  if (value === "new") return "new";
+  const parsed = Number(value);
+  if (Number.isInteger(parsed) && parsed > 0) return parsed;
+  return null;
+}
+
+export function issueSelectionToSearchParam(selection: IssueUrlSelection): string | null {
+  if (selection === null) return null;
+  if (selection === "new") return "new";
+  return String(selection);
+}
+
+export function buildMainPageSearchParams(options: {
+  file?: string | null;
+  issue?: IssueUrlSelection;
+  preserve?: URLSearchParams;
+}): URLSearchParams {
+  const params = new URLSearchParams();
+  if (options.preserve) {
+    for (const [key, value] of options.preserve) {
+      if (key !== "file" && key !== "issue") {
+        params.append(key, value);
+      }
+    }
+  }
+  if (options.file) {
+    params.set("file", options.file);
+  }
+  const issueValue = issueSelectionToSearchParam(options.issue ?? null);
+  if (issueValue) {
+    params.set("issue", issueValue);
+  }
+  return params;
+}
+
+export function searchParamsToString(params: URLSearchParams): string {
+  const qs = params.toString();
+  return qs ? `?${qs}` : "";
+}

package/notes-app/src/pages/MainPage.tsx

@@ -42,6 +42,11 @@ import { insertChildEntry, moveEntry, removeEntry } from "@/lib/tree-utils";
 import { createdFileToContent, createdFileToTreeEntry } from "@/lib/created-file";
 import { DEFAULT_BASE_REF, hasContentDiff, resolveBranchLabels, resolveOriginalContent } from "@/lib/branch-diff";
 import { clearDraft, loadDraft, saveDraft } from "@/lib/draft-storage";
+import {
+  buildMainPageSearchParams,
+  parseIssueSearchParam,
+  type IssueUrlSelection,
+} from "@/lib/issue-url-sync";
 
 const MarkdownEditor = lazy(() => import("@/components/MarkdownEditor"));
 const SpreadsheetEditor = lazy(() => import("@/components/SpreadsheetEditor"));
@@ -74,6 +79,13 @@ export default function MainPage() {
   const [selectedFile, setSelectedFile] = useState<string | null>(
     () => searchParams.get("file"),
   );
+  const [sidebarTab, setSidebarTab] = useState<SidebarTab>(() => {
+    if (searchParams.get("file")) return "files";
+    return parseIssueSearchParam(searchParams.get("issue")) !== null ? "issues" : "files";
+  });
+  const [selectedIssue, setSelectedIssue] = useState<number | "new" | null>(() =>
+    searchParams.get("file") ? null : parseIssueSearchParam(searchParams.get("issue")),
+  );
   const [fileContent, setFileContent] = useState<FileContent | null>(null);
   const [baseFileContent, setBaseFileContent] = useState<FileContent | null>(null);
   const [baseFileError, setBaseFileError] = useState<string | null>(null);
@@ -190,7 +202,17 @@ export default function MainPage() {
       });
   }, [showToast]);
 
-  const initialFileLoaded = useRef(false);
+  const initialDeepLinkLoaded = useRef(false);
+
+  const syncIssueToUrl = useCallback(
+    (issue: IssueUrlSelection) => {
+      setSearchParams(
+        buildMainPageSearchParams({ issue, preserve: searchParams }),
+        { replace: true },
+      );
+    },
+    [searchParams, setSearchParams],
+  );
 
   useEffect(() => {
     loadTree(viewingRef ?? undefined);
@@ -297,10 +319,14 @@ export default function MainPage() {
     autoSave.reset();
     pendingStylesRef.current = null;
     setSelectedFile(path);
+    setSelectedIssue(null);
     setBaseFileContent(null);
     setBaseFileError(null);
     setActiveDir(path.substring(0, path.lastIndexOf("/")) || "docs");
-    setSearchParams({ file: path }, { replace: true });
+    setSearchParams(
+      buildMainPageSearchParams({ file: path, preserve: searchParams }),
+      { replace: true },
+    );
     setFileLoading(true);
     setEditing(false);
     setShowOriginal(false);
@@ -343,17 +369,45 @@ export default function MainPage() {
       .finally(() => {
         if (!controller.signal.aborted) setFileLoading(false);
       });
-  }, [autoSave, editSession.session?.branchName, showToast, setSearchParams, viewingRef]);
+  }, [autoSave, editSession.session?.branchName, showToast, setSearchParams, searchParams, viewingRef]);
 
   useEffect(() => {
-    if (initialFileLoaded.current) return;
+    if (initialDeepLinkLoaded.current) return;
     if (apiState !== "ready" && apiState !== "mock") return;
+
     const fileParam = searchParams.get("file");
+    const issueParam = parseIssueSearchParam(searchParams.get("issue"));
+
     if (fileParam && !fileContent) {
-      initialFileLoaded.current = true;
+      initialDeepLinkLoaded.current = true;
       handleFileSelect(fileParam);
+      return;
     }
-  }, [apiState, searchParams, fileContent, handleFileSelect]);
+
+    if (issueParam !== null && selectedIssue === null && !selectedFile) {
+      initialDeepLinkLoaded.current = true;
+      setSidebarTab("issues");
+      setSelectedIssue(issueParam);
+    }
+  }, [apiState, searchParams, fileContent, selectedIssue, selectedFile, handleFileSelect]);
+
+  useEffect(() => {
+    if (searchParams.get("file")) return;
+
+    const issueParam = parseIssueSearchParam(searchParams.get("issue"));
+    if (issueParam !== null) {
+      setSidebarTab("issues");
+      setSelectedIssue((current) => (current === issueParam ? current : issueParam));
+      setSelectedFile(null);
+      setFileContent(null);
+      setEditing(false);
+      return;
+    }
+
+    if (!searchParams.get("issue")) {
+      setSelectedIssue((current) => (current === null ? current : null));
+    }
+  }, [searchParams]);
 
   const handleSave = useCallback(
     async (newContent: string, styles?: FileStyles | null) => {
@@ -427,7 +481,10 @@ export default function MainPage() {
         setBaseFileContent(createdFileToContent(created));
         setBaseFileError(null);
         setActiveDir(parentPath);
-        setSearchParams({ file: created.path }, { replace: true });
+        setSearchParams(
+          buildMainPageSearchParams({ file: created.path, preserve: searchParams }),
+          { replace: true },
+        );
         setFileLoading(false);
         setEditing(false);
         setShowOriginal(false);
@@ -441,7 +498,7 @@ export default function MainPage() {
         showToast(`作成に失敗しました: ${getErrorMessage(e)}`, "error");
       }
     },
-    [dialog, showToast, autoSave, setSearchParams, loadTree],
+    [dialog, showToast, autoSave, setSearchParams, searchParams, loadTree],
   );
 
   const handleCreateFolder = useCallback(
@@ -620,8 +677,6 @@ export default function MainPage() {
   const comments = useComments(selectedFile);
 
   const [sidebarOpen, setSidebarOpen] = useState(false);
-  const [sidebarTab, setSidebarTab] = useState<SidebarTab>("files");
-  const [selectedIssue, setSelectedIssue] = useState<number | "new" | null>(null);
   const [issueListReloadTrigger, setIssueListReloadTrigger] = useState(0);
   const [newIssueKey, setNewIssueKey] = useState(0);
 
@@ -853,6 +908,7 @@ export default function MainPage() {
                     setNewIssueKey((k) => k + 1);
                     setSelectedFile(null);
                     setFileContent(null);
+                    syncIssueToUrl("new");
                     setSidebarOpen(false);
                   }}
                   className="w-full px-2 py-1.5 rounded flex items-center justify-center gap-1.5 text-xs text-green-300 bg-green-900/20 border border-green-700/40 hover:bg-green-900/40 transition-colors"
@@ -870,6 +926,7 @@ export default function MainPage() {
                 setSelectedFile(null);
                 setFileContent(null);
                 setEditing(false);
+                syncIssueToUrl(num);
                 setSidebarOpen(false);
               }}
             />
@@ -1019,9 +1076,13 @@ export default function MainPage() {
                   issueNumber={selectedIssue}
                   onCreated={(num) => {
                     setSelectedIssue(num);
+                    syncIssueToUrl(num);
                     setIssueListReloadTrigger((k) => k + 1);
                   }}
-                  onClose={() => setSelectedIssue(null)}
+                  onClose={() => {
+                    setSelectedIssue(null);
+                    syncIssueToUrl(null);
+                  }}
                 />
               </Suspense>
             )}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ripla/godd-mcp",
-  "version": "1.0.4-canary.21",
+  "version": "1.0.4-canary.23",
   "type": "module",
   "description": "GoDD MCP Server - AI-powered development workflow tools via Model Context Protocol (slash commands support)",
   "main": "dist/index.js",