nmem-cli 0.7.9__tar.gz → 0.8.1__tar.gz

{nmem_cli-0.7.9 → nmem_cli-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nmem-cli
-Version: 0.7.9
+Version: 0.8.1
 Summary: CLI and TUI for Nowledge Mem - AI memory management
 Project-URL: Homepage, https://mem.nowledge.co/
 Project-URL: Repository, https://github.com/nowledge-co/
@@ -180,6 +180,21 @@ Use environment variables when you want a temporary override for the current she
 
 `nmem config client ...` controls how this machine connects outward to Mem. It is separate from `nmem config access ...`, which controls how a Mem server is exposed to other devices on your network or through Access Anywhere.
 
+## MCP Host Configuration
+
+Direct HTTP MCP clients do not read `~/.nowledge-mem/config.json` by themselves. The host owns its MCP transport, so remote Mem needs headers in that host's MCP settings.
+
+Generate the right snippet from the client config you already saved:
+
+```bash
+nmem config mcp show --host codex
+nmem config mcp show --host gemini-cli
+nmem config mcp show --host cursor
+nmem config mcp show --host claude-desktop
+```
+
+For a fixed Mem space, add `--space "Research Agent"`. The generated snippet includes your API key when one is configured, so paste it only into the target host's private MCP config.
+
 ## Environment Variables
 
 | Variable | Description | Default |

{nmem_cli-0.7.9 → nmem_cli-0.8.1}/README.md

@@ -147,6 +147,21 @@ Use environment variables when you want a temporary override for the current she
 
 `nmem config client ...` controls how this machine connects outward to Mem. It is separate from `nmem config access ...`, which controls how a Mem server is exposed to other devices on your network or through Access Anywhere.
 
+## MCP Host Configuration
+
+Direct HTTP MCP clients do not read `~/.nowledge-mem/config.json` by themselves. The host owns its MCP transport, so remote Mem needs headers in that host's MCP settings.
+
+Generate the right snippet from the client config you already saved:
+
+```bash
+nmem config mcp show --host codex
+nmem config mcp show --host gemini-cli
+nmem config mcp show --host cursor
+nmem config mcp show --host claude-desktop
+```
+
+For a fixed Mem space, add `--space "Research Agent"`. The generated snippet includes your API key when one is configured, so paste it only into the target host's private MCP config.
+
 ## Environment Variables
 
 | Variable | Description | Default |

{nmem_cli-0.7.9 → nmem_cli-0.8.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nmem-cli"
-version = "0.7.9"
+version = "0.8.1"
 description = "CLI and TUI for Nowledge Mem - AI memory management"
 authors = [
     {name = "Nowledge Labs"}

{nmem_cli-0.7.9 → nmem_cli-0.8.1}/src/nmem_cli/__init__.py

@@ -20,7 +20,7 @@ Environment (overrides config file):
     NMEM_API_KEY         Optional API key (Bearer auth)
 """
 
-__version__ = "0.7.9"
+__version__ = "0.8.1"
 __author__ = "Nowledge Labs"
 
 from .cli import main

{nmem_cli-0.7.9 → nmem_cli-0.8.1}/src/nmem_cli/cli.py

@@ -1378,6 +1378,88 @@ def _is_wsl_environment() -> bool:
         return False
 
 
+class _CliInstallContext(NamedTuple):
+    source: str
+    command_path: str | None
+    python_executable: str
+    package_path: str
+
+
+def _detect_cli_install_context() -> _CliInstallContext:
+    command_path = shutil.which("nmem")
+    python_executable = str(Path(sys.executable).resolve())
+    package_path = str(Path(__file__).resolve())
+    haystack = " ".join(
+        item.lower()
+        for item in [command_path or "", python_executable, package_path]
+    )
+
+    if "python-standalone" in haystack or "nowledge mem.app" in haystack:
+        source = "desktop-bundled"
+    elif "/usr/lib/nowledge-mem" in haystack or "/usr/lib/nowledge mem" in haystack:
+        source = "desktop-bundled"
+    elif "\\nowledge mem\\" in haystack or "/.local/share/nowledge-mem/" in haystack:
+        source = "desktop-bundled"
+    elif "pipx/venvs/nmem-cli" in haystack or ".local/pipx/venvs/nmem-cli" in haystack:
+        source = "pipx"
+    elif "/uv/tools/nmem-cli" in haystack or "\\uv\\tools\\nmem-cli" in haystack:
+        source = "uv"
+    elif "site-packages/nmem_cli" in haystack:
+        source = "python-package"
+    else:
+        source = "unknown"
+
+    return _CliInstallContext(
+        source=source,
+        command_path=command_path,
+        python_executable=python_executable,
+        package_path=package_path,
+    )
+
+
+def _format_cli_upgrade_hint(*, context: _CliInstallContext, server_newer: bool) -> str:
+    command_detail = (
+        f" first on PATH ({context.command_path})" if context.command_path else ""
+    )
+    if server_newer:
+        if context.source == "desktop-bundled":
+            return (
+                f"The CLI{command_detail} is older than the connected server. "
+                "In the desktop app, open Settings > Preferences > Developer Tools > "
+                "Install CLI, then restart the terminal. If this terminal is using a "
+                "PyPI/pipx install instead, run "
+                "`python -m pip install --upgrade nmem-cli` or `pipx upgrade nmem-cli`."
+            )
+        if context.source == "pipx":
+            return (
+                f"The CLI{command_detail} is older than the connected server. "
+                "Run `pipx upgrade nmem-cli`, or use "
+                "`uvx --from nmem-cli nmem status` for a fresh one-shot CLI."
+            )
+        if context.source == "uv":
+            return (
+                f"The CLI{command_detail} is older than the connected server. "
+                "Use `uvx --from nmem-cli nmem status` for the latest published CLI, "
+                "or reinstall the uv tool."
+            )
+        if context.source == "python-package":
+            return (
+                f"The CLI{command_detail} is older than the connected server. "
+                "Run `python -m pip install --upgrade nmem-cli`, or "
+                "`uvx --from nmem-cli nmem status` without installing."
+            )
+        return (
+            f"The CLI{command_detail} is older than the connected server. "
+            "Upgrade the `nmem-cli` package, or reinstall the desktop CLI from "
+            "Settings > Preferences > Developer Tools."
+        )
+
+    return (
+        "The CLI is newer than the connected server. Update or restart "
+        "Nowledge Mem, or point NMEM_API_URL at the server you intended to use."
+    )
+
+
 def _status_version_warning(
     *,
     cli_version: str,
@@ -1389,21 +1471,26 @@ def _status_version_warning(
     if not normalized_server or normalized_server == normalized_cli:
         return None
 
-    message = (
-        f"CLI is v{normalized_cli}, but the server at {api_url} reports v{normalized_server}."
+    message = "CLI is v{}, but the server at {} reports v{}.".format(
+        normalized_cli,
+        api_url,
+        normalized_server,
     )
 
     parsed = urlsplit(api_url)
     if _is_wsl_environment() and _is_loopback_hostname(parsed.hostname):
         return (
             message,
-            "WSL localhost may be reaching the Windows desktop app instead of the Linux service. "
-            "If you expected the WSL server, stop the Windows app or point NMEM_API_URL at the Linux service explicitly.",
+            "WSL localhost may be reaching the Windows desktop app instead of "
+            "the Linux service. If you expected the WSL server, stop the "
+            "Windows app or point NMEM_API_URL at the Linux service explicitly.",
         )
 
+    context = _detect_cli_install_context()
+    server_newer = _compare_versions(normalized_cli, normalized_server)
     return (
         message,
-        "Upgrade or restart the server process you are connected to, or point NMEM_API_URL at the intended server.",
+        _format_cli_upgrade_hint(context=context, server_newer=server_newer),
     )
 
 
@@ -1487,6 +1574,18 @@ def cmd_status() -> None:
     except Exception:
         search_index = None
 
+    version_warning = _status_version_warning(
+        cli_version=result["cli_version"],
+        server_version=result["server_version"],
+        api_url=result["api_url"],
+    )
+    if version_warning:
+        warning_message, warning_hint = version_warning
+        result["version_mismatch"] = {
+            "message": warning_message,
+            "hint": warning_hint,
+        }
+
     if is_json_mode():
         if agent_data:
             result["agent"] = {
@@ -1535,11 +1634,6 @@ def cmd_status() -> None:
             console.print(f"  search   {state_label}")
             if search_index.get("message"):
                 console.print(f"           [dim]{search_index['message']}[/dim]")
-        version_warning = _status_version_warning(
-            cli_version=result["cli_version"],
-            server_version=result["server_version"],
-            api_url=result["api_url"],
-        )
         if version_warning:
             warning_message, warning_hint = version_warning
             console.print(f"  [bold yellow]! Version mismatch[/bold yellow] {warning_message}")
@@ -2082,6 +2176,147 @@ def cmd_communities_detect(resolution: float = 1.0) -> None:
             console.print(f"  [dim]{data['message']}[/dim]")
 
 
+# ═══════════════════════════════════════════════════════════════════════════════
+# Wiki Commands
+# ═══════════════════════════════════════════════════════════════════════════════
+
+
+def cmd_wiki_page(kind: str, id_or_name: str) -> None:
+    """Render one Library wiki page as markdown."""
+    kind_norm = (kind or "").strip().lower()
+    if kind_norm not in {"entity", "crystal", "topic"}:
+        print_error(
+            "Bad kind",
+            f"kind must be one of 'entity', 'crystal', 'topic'; got {kind!r}",
+        )
+        sys.exit(2)
+    encoded = quote(id_or_name, safe="")
+    url = f"{get_api_url()}/library/wiki-page/{kind_norm}/{encoded}"
+    try:
+        response = api_request("GET", url, timeout=30.0)
+    except httpx.ConnectError:
+        if is_json_mode():
+            output_json({
+                "error": "connection_failed",
+                "message": f"Cannot connect to {get_api_url()}",
+            })
+        else:
+            _print_connection_error()
+        sys.exit(1)
+    if response.status_code == 404:
+        if is_json_mode():
+            output_json({
+                "error": "not_found", "kind": kind_norm, "id_or_name": id_or_name,
+            })
+        else:
+            console.print(f"[red]Not found:[/red] {kind_norm} {id_or_name}")
+        sys.exit(1)
+    response.raise_for_status()
+    text = response.text
+    if is_json_mode():
+        output_json({
+            "kind": kind_norm,
+            "id_or_name": id_or_name,
+            "markdown": text,
+        })
+    else:
+        console.print(Markdown(text))
+
+
+def cmd_wiki_export(output_dir: Optional[str] = None) -> None:
+    """Build the wiki ZIP and save it locally."""
+    url = f"{get_api_url()}/library/wiki-export"
+    try:
+        if not is_json_mode():
+            with Progress(
+                SpinnerColumn(),
+                TextColumn("[cyan]Building wiki ZIP...[/cyan]"),
+                console=console,
+                transient=True,
+            ) as p:
+                p.add_task("", total=None)
+                response = api_request("GET", url, timeout=300.0)
+        else:
+            response = api_request("GET", url, timeout=300.0)
+    except httpx.ConnectError:
+        if is_json_mode():
+            output_json({
+                "error": "connection_failed",
+                "message": f"Cannot connect to {get_api_url()}",
+            })
+        else:
+            _print_connection_error()
+        sys.exit(1)
+    response.raise_for_status()
+    cd = response.headers.get("content-disposition", "")
+    match = re.search(r'filename="([^"]+)"', cd)
+    filename = match.group(1) if match else "nowledge-mem-wiki.zip"
+    target_dir = Path(output_dir).expanduser() if output_dir else Path.cwd()
+    target_dir.mkdir(parents=True, exist_ok=True)
+    target = target_dir / filename
+    target.write_bytes(response.content)
+    if is_json_mode():
+        output_json({
+            "saved_to": str(target),
+            "size_bytes": len(response.content),
+        })
+    else:
+        console.print(
+            f"[green]Saved[/green] {len(response.content):,} bytes to [bold]{target}[/bold]"
+        )
+        console.print(
+            "[dim]Open the folder in Obsidian, Logseq, or any markdown reader; "
+            "wikilinks resolve in all of them.[/dim]"
+        )
+
+
+def cmd_wiki_topics(limit: int = 20) -> None:
+    """List wiki topics (community clusters) with their counts."""
+    if not is_json_mode():
+        with Progress(
+            SpinnerColumn(),
+            TextColumn("[cyan]Loading topics...[/cyan]"),
+            console=console,
+            transient=True,
+        ) as p:
+            p.add_task("", total=None)
+            data = api_get(
+                "/library/wiki-index",
+                params={"community_limit": limit, "top_per_community": 5},
+            )
+    else:
+        data = api_get(
+            "/library/wiki-index",
+            params={"community_limit": limit, "top_per_community": 5},
+        )
+    if is_json_mode():
+        output_json(data)
+        return
+    communities = data.get("communities", [])
+    console.print()
+    if not communities:
+        console.print(
+            "[dim]No topics yet. Run community detection from the Graph view "
+            "(or `nmem c detect`) to populate them.[/dim]"
+        )
+        console.print()
+        return
+    console.print(f"[bold]Wiki topics[/bold]  [dim]({len(communities)} found)[/dim]")
+    console.print()
+    for c in communities:
+        name = c.get("name", "Unnamed")
+        members = c.get("member_count", 0)
+        ent = len(c.get("top_entities", []))
+        cry = len(c.get("top_crystals", []))
+        console.print(
+            f"  [bold cyan]{name}[/bold cyan]  "
+            f"[dim]({members} members · {cry} crystals · {ent} entities)[/dim]"
+        )
+        cid = c.get("community_id", "?")
+        console.print(f"    [dim]nmem wiki page topic {cid}[/dim]")
+    console.print()
+
+
 # ═══════════════════════════════════════════════════════════════════════════════
 # Graph Commands
 # ═══════════════════════════════════════════════════════════════════════════════
@@ -4643,6 +4878,7 @@ def cmd_threads_save(
                     {
                         "messages": thread_data["messages"],
                         "deduplicate": True,
+                        **({"space_id": space_id} if space_id else {}),
                     },
                 )
                 results.append(
@@ -8719,6 +8955,151 @@ def cmd_config_client_clear(key: str | None = None) -> None:
     )
 
 
+_MCP_HOST_APPS = {
+    "codex": "Codex",
+    "gemini-cli": "Gemini CLI",
+    "cursor": "Cursor",
+    "claude-desktop": "Claude",
+}
+
+
+def _mcp_endpoint_url(api_url: str) -> str:
+    return f"{api_url.rstrip('/')}/mcp/"
+
+
+def _toml_string(value: str) -> str:
+    return json_module.dumps(str(value), ensure_ascii=False)
+
+
+def _print_literal_block(text: str) -> None:
+    """Write copy-paste config without Rich markup or line wrapping."""
+    console.file.write(text)
+    if not text.endswith("\n"):
+        console.file.write("\n")
+    console.file.flush()
+
+
+def _build_mcp_headers(
+    *,
+    app: str,
+    api_key: str,
+    space_id: str | None = None,
+) -> dict[str, str]:
+    headers = {"APP": app}
+    if api_key:
+        headers["Authorization"] = f"Bearer {api_key}"
+        headers["X-NMEM-API-Key"] = api_key
+    if space_id:
+        headers["X-Nmem-Space-Id"] = space_id
+    return headers
+
+
+def _build_host_mcp_config(
+    host: str,
+    *,
+    app: str | None = None,
+    space_id: str | None = None,
+) -> dict[str, Any]:
+    normalized_host = host.strip().lower()
+    if normalized_host not in _MCP_HOST_APPS:
+        raise ValueError(f"Unsupported MCP host: {host}")
+
+    api_url, api_url_source = _resolve_api_url_and_source()
+    api_key = get_api_key()
+    api_key_source = "env" if os.environ.get("NMEM_API_KEY") is not None else (
+        "config" if api_key else "none"
+    )
+    endpoint = _mcp_endpoint_url(api_url)
+    app_header = (app or _MCP_HOST_APPS[normalized_host]).strip()
+    headers = _build_mcp_headers(app=app_header, api_key=api_key, space_id=space_id)
+
+    if normalized_host == "codex":
+        lines = [
+            "[mcp_servers.nowledge-mem]",
+            f"url = {_toml_string(endpoint)}",
+            "",
+            "[mcp_servers.nowledge-mem.http_headers]",
+        ]
+        for key, value in headers.items():
+            toml_key = key if re.match(r"^[A-Za-z_][A-Za-z0-9_]*$", key) else _toml_string(key)
+            lines.append(f"{toml_key} = {_toml_string(value)}")
+        rendered = "\n".join(lines)
+        config: Any = rendered
+        fmt = "toml"
+    else:
+        server: dict[str, Any]
+        if normalized_host == "gemini-cli":
+            server = {
+                "httpUrl": endpoint,
+                "headers": headers,
+            }
+        else:
+            server = {
+                "url": endpoint,
+                "type": "streamableHttp",
+                "headers": headers,
+            }
+        config = {"mcpServers": {"nowledge-mem": server}}
+        rendered = json_module.dumps(config, indent=2, ensure_ascii=False)
+        fmt = "json"
+
+    warnings: list[str] = []
+    if api_url.startswith("https://") and not api_key:
+        warnings.append("Remote HTTPS endpoint has no API key in client config or NMEM_API_KEY.")
+
+    return {
+        "host": normalized_host,
+        "format": fmt,
+        "config": config,
+        "rendered": rendered,
+        "apiUrl": api_url,
+        "endpoint": endpoint,
+        "apiUrlSource": api_url_source,
+        "apiKeyConfigured": bool(api_key),
+        "apiKeySource": api_key_source,
+        "space": space_id,
+        "warnings": warnings,
+    }
+
+
+def cmd_config_mcp_show(
+    host: str,
+    *,
+    app: str | None = None,
+    space_id: str | None = None,
+) -> None:
+    """Print host-specific MCP config from shared client settings."""
+    try:
+        payload = _build_host_mcp_config(host, app=app, space_id=space_id)
+    except ValueError as exc:
+        if is_json_mode():
+            output_json({"error": "unsupported_host", "message": str(exc)})
+        else:
+            print_error("Unsupported Host", str(exc))
+        return
+
+    if is_json_mode():
+        output_json(payload)
+        return
+
+    console.print()
+    console.print(f"[bold]Nowledge Mem MCP config for {payload['host']}[/bold]")
+    console.print(f"  Endpoint:       {payload['endpoint']}")
+    console.print(f"  URL source:     {payload['apiUrlSource']}")
+    console.print(f"  API key source: {payload['apiKeySource']}")
+    if payload["apiKeyConfigured"]:
+        console.print("  API key:        [yellow]included in the snippet below[/yellow]")
+    for warning in payload["warnings"]:
+        console.print(f"  [yellow]Warning:[/yellow] {warning}")
+    console.print()
+    _print_literal_block(payload["rendered"])
+    console.print()
+    console.print(
+        "[dim]This command reads ~/.nowledge-mem/config.json plus NMEM_API_URL/NMEM_API_KEY. "
+        "Direct MCP clients do not read that file by themselves; paste this into the host's MCP config when overriding a bundled local endpoint or connecting to remote Mem.[/dim]"
+    )
+
+
 # ═══════════════════════════════════════════════════════════════════════════════
 # Argument Parser
 # ═══════════════════════════════════════════════════════════════════════════════
@@ -9642,6 +10023,44 @@ PRIORITY
             help="Louvain resolution (higher = more communities)"
         )
 
+    # wiki (with alias 'w')
+    for name in ["wiki", "w"]:
+        wiki_parser = subparsers.add_parser(
+            name, help="LLM Wiki — read pages, export, list topics"
+        )
+        wiki_subs = wiki_parser.add_subparsers(dest="action")
+
+        page = wiki_subs.add_parser(
+            "page", help="Render one wiki page as markdown"
+        )
+        page.add_argument(
+            "kind", choices=["entity", "crystal", "topic"],
+            help="What kind of wiki page to render",
+        )
+        page.add_argument(
+            "id_or_name",
+            help=(
+                "Resource identifier: UUID or canonical name for entity, id "
+                "for crystal, integer community_id for topic"
+            ),
+        )
+
+        export = wiki_subs.add_parser(
+            "export", help="Build the wiki markdown ZIP and save it locally"
+        )
+        export.add_argument(
+            "output_dir", nargs="?", default=None,
+            help="Output directory (default: current working directory)",
+        )
+
+        topics = wiki_subs.add_parser(
+            "topics", help="List wiki topic clusters"
+        )
+        topics.add_argument(
+            "-n", "--limit", type=int, default=20,
+            help="Max topics to show",
+        )
+
     # graph (with alias 'g')
     for name in ["graph", "g"]:
         graph_parser = subparsers.add_parser(
@@ -10093,6 +10512,38 @@ examples:
         help="Setting key: url, api-key, or all (default)",
     )
 
+    # config mcp
+    mcp_parser = cfg_subs.add_parser(
+        "mcp",
+        help="Generate MCP config from this machine's client settings",
+    )
+    mcp_subs = mcp_parser.add_subparsers(dest="action")
+    mcp_show = mcp_subs.add_parser(
+        "show",
+        help="Print host-specific MCP config",
+        epilog="""examples:
+  nmem config mcp show --host codex
+  nmem config mcp show --host gemini-cli
+  nmem config mcp show --host cursor --space Research
+  nmem --json config mcp show --host codex""",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+    )
+    mcp_show.add_argument(
+        "--host",
+        required=True,
+        choices=sorted(_MCP_HOST_APPS),
+        help="MCP client config shape to print",
+    )
+    mcp_show.add_argument(
+        "--app",
+        help="Override the APP header value (defaults to the selected host)",
+    )
+    mcp_show.add_argument(
+        "--space",
+        dest="space_id",
+        help="Optional Mem space to send as X-Nmem-Space-Id",
+    )
+
     # config settings
     set_parser = cfg_subs.add_parser("settings", help="Knowledge processing settings")
     set_subs = set_parser.add_subparsers(dest="action")
@@ -10497,6 +10948,16 @@ def main() -> int:
         else:
             # Default: list
             cmd_communities_list(getattr(args, "limit", 20))
+    elif cmd in ("wiki", "w"):
+        action = getattr(args, "action", None)
+        if action == "page":
+            cmd_wiki_page(args.kind, args.id_or_name)
+        elif action == "export":
+            cmd_wiki_export(getattr(args, "output_dir", None))
+        elif action == "topics":
+            cmd_wiki_topics(getattr(args, "limit", 20))
+        else:
+            parser.parse_args([cmd, "--help"])
     elif cmd in ("graph", "g"):
         action = args.action
         if action == "expand":
@@ -10672,6 +11133,27 @@ def main() -> int:
                 cmd_config_client_clear(getattr(args, "key", "all"))
             else:
                 cmd_config_client_show()
+        elif section == "mcp":
+            action = getattr(args, "action", None)
+            if action == "show" or action is None:
+                host = getattr(args, "host", None)
+                if not host:
+                    if is_json_mode():
+                        output_json({"error": "missing_host", "message": "Pass --host codex|gemini-cli|cursor|claude-desktop"})
+                    else:
+                        print_error("Missing Host", "Pass --host codex, gemini-cli, cursor, or claude-desktop.")
+                    return 1
+                cmd_config_mcp_show(
+                    host,
+                    app=getattr(args, "app", None),
+                    space_id=getattr(args, "space_id", None),
+                )
+            else:
+                cmd_config_mcp_show(
+                    getattr(args, "host", "codex"),
+                    app=getattr(args, "app", None),
+                    space_id=getattr(args, "space_id", None),
+                )
         elif section == "access":
             action = getattr(args, "action", None)
             if action == "set":
@@ -10688,10 +11170,12 @@ def main() -> int:
                 cmd_config_settings_show()
         else:
             if is_json_mode():
-                output_json({"error": "no_section", "sections": ["provider", "access", "settings"]})
+                output_json({"error": "no_section", "sections": ["provider", "client", "mcp", "access", "settings"]})
             else:
                 console.print("[bold]Available config sections:[/bold]")
                 console.print("  provider  — LLM provider configuration")
+                console.print("  client    — Client URL / API key settings")
+                console.print("  mcp       — Generate host MCP config from client settings")
                 console.print("  access    — CLI / server LAN access settings")
                 console.print("  settings  — Knowledge processing settings")
     else:

{nmem_cli-0.7.9 → nmem_cli-0.8.1}/src/nmem_cli/session_import.py

@@ -148,7 +148,7 @@ def discover_sessions(
     session_id: Optional[str],
 ) -> list[SessionCandidate]:
     if client == "claude-code":
-        candidates = _discover_claude_sessions(project_path)
+        candidates = _discover_claude_sessions(project_path, session_id)
     elif client == "codex":
         candidates = _discover_codex_sessions(project_path, session_id)
     elif client == "gemini-cli":
@@ -185,7 +185,9 @@ def parse_session(
     )
 
 
-def _discover_claude_sessions(project_path: str) -> list[SessionCandidate]:
+def _discover_claude_sessions(
+    project_path: str, target_session_id: Optional[str]
+) -> list[SessionCandidate]:
     claude_base, expected_claude_base = _resolve_claude_project_dir(project_path)
     if claude_base is None:
         raise SessionImportError(
@@ -203,6 +205,7 @@ def _discover_claude_sessions(project_path: str) -> list[SessionCandidate]:
             with open(session_file, "r", encoding="utf-8") as handle:
                 lines = handle.readlines()
 
+            file_session_id: Optional[str] = None
             user_messages = 0
             assistant_messages = 0
             last_message_time: Optional[float] = None
@@ -216,6 +219,10 @@ def _discover_claude_sessions(project_path: str) -> list[SessionCandidate]:
                 if not isinstance(event, dict):
                     continue
 
+                event_session_id = event.get("sessionId")
+                if isinstance(event_session_id, str) and event_session_id.strip():
+                    file_session_id = event_session_id.strip()
+
                 event_type = event.get("type")
                 if event_type in ["file-history-snapshot", "summary"]:
                     continue
@@ -245,12 +252,16 @@ def _discover_claude_sessions(project_path: str) -> list[SessionCandidate]:
                 elif event_type == "assistant":
                     assistant_messages += 1
 
+            file_session_id = file_session_id or session_file.stem
+            if target_session_id and file_session_id != target_session_id:
+                continue
+
             if user_messages > 0 or assistant_messages > 1:
                 sort_key = last_message_time or session_file.stat().st_mtime
                 candidates.append(
                     SessionCandidate(
                         file=session_file,
-                        session_id=session_file.stem,
+                        session_id=file_session_id,
                         sort_key=sort_key,
                         user_messages=user_messages,
                         assistant_messages=assistant_messages,

{nmem_cli-0.7.9 → nmem_cli-0.8.1}/src/nmem_cli/tui/__init__.py

@@ -4,13 +4,11 @@ Nowledge Mem TUI - Terminal User Interface for memory management.
 Launch with: nmem tui
 
 For Textual dev mode:
-    python -m textual run --dev nmem_cli.tui
+    python -m textual run --dev nmem_cli.tui.__main__:app
 """
 
 import logging
 
-from .app import NowledgeMemApp
-
 __all__ = ["NowledgeMemApp", "run_tui"]
 
 # Disable all logging to stdout/stderr - it corrupts the TUI display
@@ -19,11 +17,20 @@ logging.getLogger("httpx").setLevel(logging.WARNING)
 logging.getLogger("httpcore").setLevel(logging.WARNING)
 
 
+def _load_app_class():
+    from .app import NowledgeMemApp
+
+    return NowledgeMemApp
+
+
+def __getattr__(name: str):
+    if name == "NowledgeMemApp":
+        return _load_app_class()
+    raise AttributeError(name)
+
+
 def run_tui() -> None:
     """Entry point for the TUI application."""
+    NowledgeMemApp = _load_app_class()
     app = NowledgeMemApp()
     app.run()
-
-
-# For textual run --dev compatibility
-app = NowledgeMemApp()

{nmem_cli-0.7.9 → nmem_cli-0.8.1}/src/nmem_cli/tui/__main__.py

@@ -2,7 +2,7 @@
 Entry point for running TUI with Textual dev mode.
 
 Usage:
-    python -m textual run --dev nmem_cli.tui
+    python -m textual run --dev nmem_cli.tui.__main__:app
 
 Or directly:
     python -m nmem_cli.tui