note-connector 0.2.5 → 0.2.6

package/dist/paths.js

@@ -40,6 +40,10 @@ export function resolveNoteConnectorRepo() {
     if (fs.existsSync(path.join(fromGlobal, "src", "note_mcp"))) {
         return fromGlobal;
     }
+    const fromBundled = path.resolve(here, "..", "py");
+    if (fs.existsSync(path.join(fromBundled, "src", "note_mcp"))) {
+        return fromBundled;
+    }
     throw new Error("note-connector Python 本体が見つかりません。\n"
         + "  note-connector config set repoPath /path/to/note-connector\n"
         + "または NOTE_CONNECTOR_REPO=/path/to/note-connector を設定してください。\n"

package/dist/setup-dependencies.js

@@ -39,23 +39,52 @@ function ensureUv() {
 function repoHasPython(root) {
     return fs.existsSync(path.join(root, "pyproject.toml")) && fs.existsSync(path.join(root, "src", "note_mcp"));
 }
-function cloneRepo(target) {
-    if (!commandExists("git")) {
-        throw new Error("git が見つかりません。git をインストールするか、\n" +
-            "手動で clone して repoPath を設定してください。\n" +
-            `  git clone ${DEFAULT_REPO} ${target}\n` +
-            `  note-connector config set repoPath ${target}`);
+function npmPackagePythonRoot() {
+    try {
+        const root = resolveNoteConnectorRepo();
+        return root;
+    }
+    catch {
+        return null;
+    }
+}
+function copyBundledPython(target) {
+    const source = npmPackagePythonRoot();
+    if (!source) {
+        throw new Error("npm パッケージにPythonソースが見つかりません。npm install -g を再実行してください。");
+    }
+    // Remove old repo and copy fresh from npm package
+    if (fs.existsSync(target)) {
+        fs.rmSync(target, { recursive: true, force: true });
     }
-    console.log(`Cloning note-connector → ${target}`);
     fs.mkdirSync(path.dirname(target), { recursive: true });
-    execFileSync("git", ["clone", "--depth", "1", DEFAULT_REPO, target], { stdio: "inherit" });
+    console.log("Python ソースを npm からコピー中…");
+    fs.cpSync(source, target, { recursive: true });
 }
-function updateRepo(repo) {
+function updateRepo(target) {
+    // Prefer bundled npm copy over git pull
+    const npmRoot = npmPackagePythonRoot();
+    if (npmRoot && target !== npmRoot) {
+        try {
+            // Check which is newer: npm package vs local repo
+            const npmSrcStat = fs.statSync(path.join(npmRoot, "src", "note_mcp", "server.py"));
+            const localSrcStat = fs.statSync(path.join(target, "src", "note_mcp", "server.py"));
+            if (npmSrcStat.mtimeMs > localSrcStat.mtimeMs) {
+                copyBundledPython(target);
+                console.log("note-connector を最新に更新しました（npm同梱版）");
+                return;
+            }
+        }
+        catch {
+            // File stat failed, skip update
+        }
+    }
+    // Fall back to git pull for manually cloned repos
     if (!commandExists("git"))
         return;
     try {
         const result = spawnSync("git", ["pull", "--ff-only", "origin", "main"], {
-            cwd: repo,
+            cwd: target,
             encoding: "utf8",
             timeout: 15000,
         });
@@ -80,9 +109,23 @@ function ensureRepoPath(config) {
     const target = path.join(configDir(), "repo");
     if (!repoHasPython(target)) {
         if (fs.existsSync(target)) {
-            throw new Error(`Incomplete repo at ${target}. Remove it or set repoPath.`);
+            // Incomplete, remove and retry
+            fs.rmSync(target, { recursive: true, force: true });
+        }
+        // Try to copy from npm package first, fall back to git clone
+        const npmRoot = npmPackagePythonRoot();
+        if (npmRoot) {
+            copyBundledPython(target);
+        }
+        else if (commandExists("git")) {
+            console.log(`Cloning note-connector → ${target}`);
+            execFileSync("git", ["clone", "--depth", "1", DEFAULT_REPO, target], { stdio: "inherit" });
+        }
+        else {
+            throw new Error("Python ソースが見つからず、git もありません。\n" +
+                "npm install -g note-connector を再実行するか、\n" +
+                "git clone でリポジトリを取得して repoPath を設定してください。");
         }
-        cloneRepo(target);
     }
     const updated = { ...config, repoPath: target };
     saveConfig(updated);
@@ -120,7 +163,7 @@ export async function setupDependencies() {
         warnings.push("Tailscale CLI がありません。tunnel.publicUrl を設定するか Tailscale をインストールしてください。");
     }
     if (!commandExists("git")) {
-        warnings.push("git がありません。初回起動は動作しますが、更新を自動取得するには git をインストールしてください。");
+        warnings.push("git がありません。最新バージョンは npm install -g note-connector で更新されます。");
     }
     return {
         uvInstalled: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "note-connector",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "publishConfig": {
     "access": "public"
   },
@@ -12,13 +12,14 @@
   },
   "files": [
     "dist/**",
+    "py/**",
     "README.md"
   ],
   "engines": {
     "node": ">=20.10"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.json",
+    "build": "tsc -p tsconfig.json && mkdir -p py && cp -r ../src ../pyproject.toml py/ && find py -name __pycache__ -type d -exec rm -rf {} + 2>/dev/null; true",
     "test": "npm run build && node --test dist/net.test.js dist/version.test.js dist/config.test.js",
     "prepublishOnly": "npm run build"
   },

package/py/pyproject.toml

@@ -0,0 +1,86 @@
+[project]
+name = "note-connector"
+version = "0.2.6"
+description = "note-connector: MCP server and ChatGPT connector for note.com"
+readme = "README.md"
+requires-python = ">=3.13"
+license = { text = "MIT" }
+keywords = ["mcp", "note.com", "blog", "automation"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.13",
+]
+dependencies = [
+    "fastmcp>=2.0.0",
+    "playwright>=1.40.0",
+    "keyring>=25.0.0",
+    "httpx>=0.27.0",
+    "markdown-it-py>=3.0.0",
+    "pydantic>=2.0.0",
+    "pyyaml>=6.0.0",
+    "uvicorn>=0.40.0",
+]
+
+[dependency-groups]
+dev = [
+    "beautifulsoup4>=4.12.0",
+    "mitmproxy>=11.0.2",
+    "mypy>=1.19.1",
+    "pytest>=8.4.1",
+    "pytest-asyncio>=0.23.0",
+    "ruff>=0.12.4",
+    "types-beautifulsoup4>=4.12.0",
+    "types-pyyaml>=6.0.0",
+]
+docs = [
+    "myst-parser>=4.0.1",
+    "sphinx>=8.2.3",
+    "sphinx-rtd-theme>=3.0.2",
+    "sphinxcontrib-mermaid>=1.1.0",
+]
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/note_mcp"]
+
+[tool.ruff]
+line-length = 120
+target-version = "py313"
+exclude = ["tests/manual"]
+
+[tool.ruff.lint]
+select = ["E", "F", "W", "I", "UP", "B", "C4", "SIM"]
+ignore = []
+
+[tool.ruff.lint.isort]
+known-first-party = ["note_mcp"]
+
+[tool.mypy]
+python_version = "3.13"
+strict = true
+warn_return_any = true
+warn_unused_ignores = true
+disallow_untyped_defs = true
+exclude = ["^debug/", "^tests/manual/"]
+
+[[tool.mypy.overrides]]
+module = "mitmproxy.*"
+ignore_errors = true
+follow_imports = "skip"
+
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+testpaths = ["tests"]
+markers = [
+    "requires_auth: tests requiring real authentication",
+    "e2e: end-to-end tests",
+    "docker: tests requiring Docker environment with browser/proxy",
+    "playwright: tests requiring Playwright browser automation",
+]

package/py/src/note_mcp/__init__.py

@@ -0,0 +1,7 @@
+"""note-mcp: MCP server for managing note.com articles."""
+
+from note_mcp.server import mcp
+
+__version__ = "0.1.0"
+
+__all__ = ["__version__", "mcp"]

package/py/src/note_mcp/__main__.py

@@ -0,0 +1,65 @@
+"""Entry point for note-mcp MCP server.
+
+Run with: uv run python -m note_mcp
+Or via fastmcp: uv run fastmcp run note_mcp.server:mcp
+
+Investigator mode (stdio):
+    uv run python -m note_mcp --investigator
+    Or set INVESTIGATOR_MODE=1 environment variable
+
+Investigator mode (HTTP for remote access):
+    uv run python -m note_mcp --investigator --http --port 9000
+    This exposes MCP tools via HTTP transport for Claude Code on host.
+"""
+
+from __future__ import annotations
+
+import argparse
+import os
+
+
+def main() -> None:
+    """Run the MCP server."""
+    parser = argparse.ArgumentParser(description="note-mcp MCP server")
+    parser.add_argument(
+        "--investigator",
+        action="store_true",
+        help="Enable investigator mode for API investigation",
+    )
+    parser.add_argument(
+        "--http",
+        action="store_true",
+        help="Use HTTP transport instead of stdio (for remote access)",
+    )
+    parser.add_argument(
+        "--host",
+        type=str,
+        default="0.0.0.0",
+        help="Host to bind HTTP server (default: 0.0.0.0)",
+    )
+    parser.add_argument(
+        "--port",
+        type=int,
+        default=9000,
+        help="Port for HTTP transport (default: 9000)",
+    )
+    args = parser.parse_args()
+
+    if args.investigator:
+        os.environ["INVESTIGATOR_MODE"] = "1"
+
+    # Import server after setting environment variable
+    from note_mcp.server import mcp
+
+    if args.http:
+        # stateless_http=True to avoid session ID management issues
+        # when the server is restarted (e.g., container restart).
+        # Application-level session state (CaptureSessionManager) is
+        # independent of HTTP transport session management.
+        mcp.run(transport="http", host=args.host, port=args.port, stateless_http=True)
+    else:
+        mcp.run()
+
+
+if __name__ == "__main__":
+    main()

package/py/src/note_mcp/api/__init__.py

@@ -0,0 +1,31 @@
+"""API module for note-mcp.
+
+Provides HTTP client and API operations for note.com.
+"""
+
+from note_mcp.api.articles import (
+    create_draft,
+    delete_all_drafts,
+    delete_article,
+    delete_draft,
+    list_articles,
+    publish_article,
+    unpublish_article,
+    update_article,
+)
+from note_mcp.api.client import NoteAPIClient
+from note_mcp.api.images import upload_body_image, upload_eyecatch_image
+
+__all__ = [
+    "NoteAPIClient",
+    "create_draft",
+    "delete_all_drafts",
+    "delete_article",
+    "delete_draft",
+    "list_articles",
+    "publish_article",
+    "unpublish_article",
+    "update_article",
+    "upload_body_image",
+    "upload_eyecatch_image",
+]