pyquipu-cli 0.3.2__tar.gz → 0.3.3__tar.gz

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: pyquipu-cli
-Version: 0.3.2
+Version: 0.3.3
 Summary: The command-line interface for Quipu.
 Project-URL: Homepage, https://github.com/quipu-dev/Quipu
 Project-URL: Repository, https://github.com/quipu-dev/Quipu

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pyquipu-cli"
-version = "0.3.2"
+version = "0.3.3"
 authors = [{ name="doucx", email="doucxldh@gmail.com" }]
 description = "The command-line interface for Quipu."
 requires-python = ">=3.10"

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/src/quipu/cli/commands/axon.py

@@ -2,7 +2,7 @@ import inspect
 import logging
 import sys
 from pathlib import Path
-from typing import Annotated, Optional
+from typing import Annotated
 
 import typer
 from needle.pointer import L
@@ -19,9 +19,7 @@ def register(app: typer.Typer):
     @app.command(name="axon", help="无状态执行 Plan 文件，绕过 Quipu 引擎。")
     def axon_command(
         ctx: typer.Context,
-        file: Annotated[
-            Optional[Path], typer.Argument(help="包含 Markdown 指令的文件路径。", resolve_path=True)
-        ] = None,
+        file: Annotated[Path | None, typer.Argument(help="包含 Markdown 指令的文件路径。", resolve_path=True)] = None,
         work_dir: Annotated[
             Path,
             typer.Option(

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/src/quipu/cli/commands/cache.py

@@ -31,7 +31,7 @@ def cache_sync(
             pass
         bus.success(L.cache.sync.success)
     except Exception as e:
-        logger.error("数据同步失败", exc_info=True)
+        logger.exception("数据同步失败")
         bus.error(L.cache.sync.error, error=str(e))
         ctx.exit(1)
 

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/src/quipu/cli/commands/export.py

@@ -2,7 +2,7 @@ import logging
 import re
 import shutil
 from pathlib import Path
-from typing import Annotated, Dict, List, Optional, Set
+from typing import Annotated
 
 import typer
 import yaml
@@ -49,9 +49,9 @@ def _format_frontmatter(node: QuipuNode) -> str:
 
 def _generate_navbar(
     current_node: QuipuNode,
-    exported_hashes_set: Set[str],
-    filename_map: Dict[str, str],
-    hidden_link_types: Set[str],
+    exported_hashes_set: set[str],
+    filename_map: dict[str, str],
+    hidden_link_types: set[str],
 ) -> str:
     nav_links = []
 
@@ -102,9 +102,9 @@ def _generate_file_content(
     engine: Engine,
     no_frontmatter: bool,
     no_nav: bool,
-    exported_hashes_set: Set[str],
-    filename_map: Dict[str, str],
-    hidden_link_types: Set[str],
+    exported_hashes_set: set[str],
+    filename_map: dict[str, str],
+    hidden_link_types: set[str],
 ) -> str:
     parts = []
     if not no_frontmatter:
@@ -138,14 +138,14 @@ def register(app: typer.Typer):
         output_dir: Annotated[Path, typer.Option("--output-dir", "-o", help="导出目录", resolve_path=True)] = Path(
             "./.quipu/export"
         ),
-        limit: Annotated[Optional[int], typer.Option("--limit", "-n", help="限制最新节点数量")] = None,
-        since: Annotated[Optional[str], typer.Option("--since", help="起始时间戳 (YYYY-MM-DD HH:MM)")] = None,
-        until: Annotated[Optional[str], typer.Option("--until", help="截止时间戳 (YYYY-MM-DD HH:MM)")] = None,
+        limit: Annotated[int | None, typer.Option("--limit", "-n", help="限制最新节点数量")] = None,
+        since: Annotated[str | None, typer.Option("--since", help="起始时间戳 (YYYY-MM-DD HH:MM)")] = None,
+        until: Annotated[str | None, typer.Option("--until", help="截止时间戳 (YYYY-MM-DD HH:MM)")] = None,
         zip_output: Annotated[bool, typer.Option("--zip", help="压缩导出目录")] = False,
         no_nav: Annotated[bool, typer.Option("--no-nav", help="禁用导航栏")] = False,
         no_frontmatter: Annotated[bool, typer.Option("--no-frontmatter", help="禁用 Frontmatter")] = False,
         hide_link_type: Annotated[
-            Optional[List[str]],
+            list[str] | None,
             typer.Option(
                 "--hide-link-type", help="禁用特定类型的导航链接 (可多次使用: summary, branch, parent, child)"
             ),

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/src/quipu/cli/commands/helpers.py

@@ -1,12 +1,12 @@
 import logging
+from collections.abc import Generator
 from contextlib import contextmanager
 from datetime import datetime
 from pathlib import Path
-from typing import Dict, Generator, List, Optional
 
 import typer
-from quipu.application.factory import create_engine
 from needle.pointer import L
+from quipu.application.factory import create_engine
 from quipu.common.bus import bus
 from quipu.engine.state_machine import Engine
 from quipu.spec.models.graph import QuipuNode
@@ -28,7 +28,7 @@ def engine_context(work_dir: Path) -> Generator[Engine, None, None]:
             engine.close()
 
 
-def _find_current_node(engine: Engine, graph: Dict[str, QuipuNode]) -> Optional[QuipuNode]:
+def _find_current_node(engine: Engine, graph: dict[str, QuipuNode]) -> QuipuNode | None:
     current_hash = engine.git_db.get_tree_hash()
     # 修复：直接从 graph 中通过 output_tree hash 查找
     for node in graph.values():
@@ -46,14 +46,12 @@ def _execute_visit(ctx: typer.Context, engine: Engine, target_hash: str, msg_id:
         engine.visit(target_hash)
         bus.success(L.navigation.success.visit, short_hash=target_hash[:7])
     except Exception as e:
-        logger.error(f"导航操作失败 (目标哈希: {target_hash[:12]})", exc_info=True)
+        logger.exception(f"导航操作失败 (目标哈希: {target_hash[:12]})")
         bus.error(L.navigation.error.generic, error=str(e))
         ctx.exit(1)
 
 
-def filter_nodes(
-    nodes: List[QuipuNode], limit: Optional[int], since: Optional[str], until: Optional[str]
-) -> List[QuipuNode]:
+def filter_nodes(nodes: list[QuipuNode], limit: int | None, since: str | None, until: str | None) -> list[QuipuNode]:
     filtered = nodes
     if since:
         try:
@@ -72,7 +70,7 @@ def filter_nodes(
     return filtered
 
 
-def filter_reachable_nodes(engine: Engine, nodes: List[QuipuNode]) -> List[QuipuNode]:
+def filter_reachable_nodes(engine: Engine, nodes: list[QuipuNode]) -> list[QuipuNode]:
     current_node = _find_current_node(engine, engine.history_graph)
     if not current_node:
         # 如果工作区是脏的，无法确定起点，返回所有节点

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/src/quipu/cli/commands/navigation.py

@@ -218,7 +218,7 @@ def register(app: typer.Typer):
                 else:
                     bus.warning(L.navigation.back.atStart)
             except Exception as e:
-                logger.error("后退操作失败", exc_info=True)
+                logger.exception("后退操作失败")
                 bus.error(L.navigation.back.error, error=str(e))
                 ctx.exit(1)
 
@@ -235,6 +235,6 @@ def register(app: typer.Typer):
                 else:
                     bus.warning(L.navigation.forward.atEnd)
             except Exception as e:
-                logger.error("前进操作失败", exc_info=True)
+                logger.exception("前进操作失败")
                 bus.error(L.navigation.forward.error, error=str(e))
                 ctx.exit(1)

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/src/quipu/cli/commands/query.py

@@ -2,7 +2,7 @@ import dataclasses
 import json
 from datetime import datetime
 from pathlib import Path
-from typing import Annotated, List, Optional
+from typing import Annotated
 
 import typer
 from needle.pointer import L
@@ -13,7 +13,7 @@ from ..config import DEFAULT_WORK_DIR
 from .helpers import engine_context, filter_nodes, filter_reachable_nodes
 
 
-def _nodes_to_json_str(nodes: List[QuipuNode]) -> str:
+def _nodes_to_json_str(nodes: list[QuipuNode]) -> str:
     EXCLUDED_FIELDS = {"parent", "children", "content", "filename"}
     node_list = []
     for node in nodes:
@@ -44,9 +44,9 @@ def register(app: typer.Typer):
                 "--work-dir", "-w", help="操作执行的根目录（工作区）", file_okay=False, dir_okay=True, resolve_path=True
             ),
         ] = DEFAULT_WORK_DIR,
-        limit: Annotated[Optional[int], typer.Option("--limit", "-n", help="限制显示的节点数量。")] = None,
-        since: Annotated[Optional[str], typer.Option("--since", help="起始时间戳 (YYYY-MM-DD HH:MM)。")] = None,
-        until: Annotated[Optional[str], typer.Option("--until", help="截止时间戳 (YYYY-MM-DD HH:MM)。")] = None,
+        limit: Annotated[int | None, typer.Option("--limit", "-n", help="限制显示的节点数量。")] = None,
+        since: Annotated[str | None, typer.Option("--since", help="起始时间戳 (YYYY-MM-DD HH:MM)。")] = None,
+        until: Annotated[str | None, typer.Option("--until", help="截止时间戳 (YYYY-MM-DD HH:MM)。")] = None,
         reachable_only: Annotated[
             bool, typer.Option("--reachable-only", help="仅显示与当前工作区状态直接相关的节点。")
         ] = False,
@@ -98,11 +98,9 @@ def register(app: typer.Typer):
     def find_command(
         ctx: typer.Context,
         summary_regex: Annotated[
-            Optional[str], typer.Option("--summary", "-s", help="用于匹配节点摘要的正则表达式 (不区分大小写)。")
-        ] = None,
-        node_type: Annotated[
-            Optional[str], typer.Option("--type", "-t", help="节点类型 ('plan' 或 'capture')。")
+            str | None, typer.Option("--summary", "-s", help="用于匹配节点摘要的正则表达式 (不区分大小写)。")
         ] = None,
+        node_type: Annotated[str | None, typer.Option("--type", "-t", help="节点类型 ('plan' 或 'capture')。")] = None,
         limit: Annotated[int, typer.Option("--limit", "-n", help="返回的最大结果数量。")] = 10,
         work_dir: Annotated[Path, typer.Option("--work-dir", "-w", help="工作区根目录。")] = DEFAULT_WORK_DIR,
         json_output: Annotated[bool, typer.Option("--json", help="以 JSON 格式输出结果。")] = False,

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/src/quipu/cli/commands/remote.py

@@ -1,11 +1,11 @@
 import subprocess
 from enum import Enum
 from pathlib import Path
-from typing import Annotated, Optional
+from typing import Annotated
 
 import typer
-from quipu.application.utils import find_git_repository_root
 from needle.pointer import L
+from quipu.application.utils import find_git_repository_root
 from quipu.common.bus import bus
 from quipu.common.identity import get_user_id_from_email
 from quipu.engine.config import ConfigManager
@@ -35,7 +35,7 @@ def register(app: typer.Typer):
             ),
         ] = DEFAULT_WORK_DIR,
         remote_option: Annotated[
-            Optional[str], typer.Option("--remote", "-r", help="Git 远程仓库的名称 (覆盖配置文件)。")
+            str | None, typer.Option("--remote", "-r", help="Git 远程仓库的名称 (覆盖配置文件)。")
         ] = None,
         mode: Annotated[
             SyncMode,
@@ -85,7 +85,7 @@ def register(app: typer.Typer):
             match mode:
                 case SyncMode.BIDIRECTIONAL:
                     bus.info(L.sync.run.info.pulling)
-                    for target_id in sorted(list(target_ids_to_fetch)):
+                    for target_id in sorted(target_ids_to_fetch):
                         git_db.fetch_quipu_refs(remote, target_id)
                     bus.info(L.sync.run.info.reconciling)
                     git_db.reconcile_local_with_remote(remote, final_user_id)
@@ -95,7 +95,7 @@ def register(app: typer.Typer):
 
                 case SyncMode.PULL_ONLY:
                     bus.info(L.sync.run.info.pulling)
-                    for target_id in sorted(list(target_ids_to_fetch)):
+                    for target_id in sorted(target_ids_to_fetch):
                         git_db.fetch_quipu_refs(remote, target_id)
                     bus.info(L.sync.run.info.reconciling)
                     git_db.reconcile_local_with_remote(remote, final_user_id)
@@ -103,7 +103,7 @@ def register(app: typer.Typer):
 
                 case SyncMode.PULL_PRUNE:
                     bus.info(L.sync.run.info.pullingPrune)
-                    for target_id in sorted(list(target_ids_to_fetch)):
+                    for target_id in sorted(target_ids_to_fetch):
                         git_db.fetch_quipu_refs(remote, target_id)
                     bus.info(L.sync.run.info.reconciling)
                     git_db.reconcile_local_with_remote(remote, final_user_id)

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/src/quipu/cli/commands/run.py

@@ -2,11 +2,11 @@ import inspect
 import logging
 import sys
 from pathlib import Path
-from typing import Annotated, Optional
+from typing import Annotated
 
 import typer
-from quipu.application.controller import run_quipu
 from needle.pointer import L
+from quipu.application.controller import run_quipu
 from quipu.common.bus import bus
 
 from ..config import DEFAULT_ENTRY_FILE, DEFAULT_WORK_DIR
@@ -20,9 +20,7 @@ def register(app: typer.Typer):
     @app.command(name="run", help="执行 Plan 文件并记录到 Quipu 历史。")
     def run_command(
         ctx: typer.Context,
-        file: Annotated[
-            Optional[Path], typer.Argument(help="包含 Markdown 指令的文件路径。", resolve_path=True)
-        ] = None,
+        file: Annotated[Path | None, typer.Argument(help="包含 Markdown 指令的文件路径。", resolve_path=True)] = None,
         work_dir: Annotated[
             Path,
             typer.Option(
@@ -75,11 +73,10 @@ def register(app: typer.Typer):
             bus.error(L.common.error.fileNotFound, path=file)
             bus.warning(L.run.error.ambiguousCommand, command=file.name)
             ctx.exit(1)
-        if not content.strip():
-            if not file:
-                bus.warning(L.run.warning.noInput, filename=DEFAULT_ENTRY_FILE.name)
-                bus.info(L.run.info.usageHint)
-                ctx.exit(0)
+        if not content.strip() and not file:
+            bus.warning(L.run.warning.noInput, filename=DEFAULT_ENTRY_FILE.name)
+            bus.info(L.run.info.usageHint)
+            ctx.exit(0)
 
         logger.info(f"已加载指令源: {source_desc}")
         logger.info(f"工作区根目录: {work_dir}")

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/src/quipu/cli/commands/show.py

@@ -1,7 +1,7 @@
 import json
 import logging
 from pathlib import Path
-from typing import Annotated, Dict, List, Optional
+from typing import Annotated
 
 import typer
 from needle.pointer import L
@@ -15,7 +15,7 @@ from .helpers import engine_context
 logger = logging.getLogger(__name__)
 
 
-def _find_target_node(graph: Dict, hash_prefix: str):
+def _find_target_node(graph: dict, hash_prefix: str):
     matches = [
         node
         for node in graph.values()
@@ -48,7 +48,7 @@ def register(app: typer.Typer):
         ] = DEFAULT_WORK_DIR,
         json_output: Annotated[bool, typer.Option("--json", help="以 JSON 格式将结果输出到 stdout。")] = False,
         extract: Annotated[
-            Optional[List[str]], typer.Option("--extract", "-e", help="仅提取并显示指定文件的内容 (可多次使用)。")
+            list[str] | None, typer.Option("--extract", "-e", help="仅提取并显示指定文件的内容 (可多次使用)。")
         ] = None,
     ):
         with engine_context(work_dir) as engine:

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/src/quipu/cli/commands/workspace.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Annotated, Optional
+from typing import Annotated
 
 import typer
 from needle.pointer import L
@@ -15,7 +15,7 @@ def register(app: typer.Typer):
     @app.command(help="将当前工作区的变更创建为一个新的快照节点。")
     def save(
         ctx: typer.Context,
-        message: Annotated[Optional[str], typer.Argument(help="本次快照的简短描述。")] = None,
+        message: Annotated[str | None, typer.Argument(help="本次快照的简短描述。")] = None,
         work_dir: Annotated[
             Path,
             typer.Option(

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/src/quipu/cli/main.py

@@ -1,6 +1,6 @@
 import importlib.metadata
 import logging
-from typing import Annotated, Optional
+from typing import Annotated
 
 import typer
 from quipu.common.bus import bus
@@ -54,14 +54,13 @@ app.add_typer(cache.cache_app)
 @app.callback()
 def main(
     version: Annotated[
-        Optional[bool],
+        bool | None,
         typer.Option("--version", "-V", callback=version_callback, is_eager=True, help="显示版本信息并退出。"),
     ] = None,
 ):
     """
     Quipu: 一个基于 Git 的、用于文件系统状态溯源与文学化操作的工具。
     """
-    pass
 
 
 # 注册顶级命令

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/src/quipu/cli/tui.py

@@ -1,7 +1,7 @@
 import logging
 from enum import Enum, auto
 from pathlib import Path
-from typing import List, Optional
+from typing import ClassVar
 
 from quipu.application.factory import create_engine
 from quipu.engine.state_machine import Engine
@@ -29,11 +29,11 @@ class ContentViewSate(Enum):
     SHOWING_CONTENT = auto()
 
 
-class QuipuUiApp(App[Optional[UiResult]]):
+class QuipuUiApp(App[UiResult | None]):
     CSS_PATH = "tui.css"
     TITLE = "Quipu History Explorer"
 
-    BINDINGS = [
+    BINDINGS: ClassVar[list[Binding]] = [
         Binding("q", "quit", "退出"),
         Binding("space", "checkout_node", "检出节点"),
         Binding("enter", "checkout_node", "检出节点"),
@@ -54,12 +54,12 @@ class QuipuUiApp(App[Optional[UiResult]]):
     def __init__(self, work_dir: Path, initial_raw_mode: bool = False):
         super().__init__()
         self.work_dir = work_dir
-        self.engine: Optional[Engine] = None
-        self.view_model: Optional[GraphViewModel] = None
+        self.engine: Engine | None = None
+        self.view_model: GraphViewModel | None = None
 
         # --- State Machine ---
         self.content_view_state = ContentViewSate.HIDDEN
-        self.update_timer: Optional[Timer] = None
+        self.update_timer: Timer | None = None
         self.debounce_delay_seconds: float = 0.50
         self.markdown_enabled = not initial_raw_mode
 
@@ -177,10 +177,10 @@ class QuipuUiApp(App[Optional[UiResult]]):
         self._focus_current_node(table)
         self._update_header()
 
-    def _populate_table(self, table: DataTable, nodes: List[QuipuNode]):
+    def _populate_table(self, table: DataTable, nodes: list[QuipuNode]):
         assert self.view_model is not None
         # 移除了过滤逻辑，因为 ViewModel 已经处理
-        tracks: list[Optional[str]] = []
+        tracks: list[str | None] = []
 
         for node in nodes:
             is_reachable = self.view_model.is_reachable(node.output_tree)
@@ -279,8 +279,8 @@ class QuipuUiApp(App[Optional[UiResult]]):
                 # LookupError 捕获 RowKeyError 等
                 logger.warning(f"DEBUG: Row key {row_key} not found in DataTable.")
 
-        except Exception as e:
-            logger.error(f"DEBUG: Failed to focus current node: {e}", exc_info=True)
+        except Exception:
+            logger.exception("DEBUG: Failed to focus current node")
 
     def _update_loading_preview(self):
         assert self.view_model is not None

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/src/quipu/cli/ui_utils.py

@@ -1,5 +1,3 @@
-from typing import List, Optional
-
 import click
 import typer
 from needle.pointer import L
@@ -7,7 +5,7 @@ from quipu.common.bus import bus
 from quipu.spec.exceptions import OperationCancelledError
 
 
-def confirmation_handler_for_executor(diff_lines: List[str], prompt: str) -> bool:
+def confirmation_handler_for_executor(diff_lines: list[str], prompt: str) -> bool:
     # 原始逻辑是 `char.lower() != "n"`，这相当于默认为 True
     confirmed = prompt_for_confirmation(prompt=prompt, diff_lines=diff_lines, default=True)
     if not confirmed:
@@ -17,7 +15,7 @@ def confirmation_handler_for_executor(diff_lines: List[str], prompt: str) -> boo
     return True
 
 
-def prompt_for_confirmation(prompt: str, diff_lines: Optional[List[str]] = None, default: bool = False) -> bool:
+def prompt_for_confirmation(prompt: str, diff_lines: list[str] | None = None, default: bool = False) -> bool:
     if diff_lines:
         bus.info(L.prompt.ui.diffHeader)
         for line in diff_lines:

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/src/quipu/cli/view_model.py

@@ -1,12 +1,11 @@
 import math
-from typing import Dict, List, Optional, Set
 
 from quipu.spec.models.graph import QuipuNode
 from quipu.spec.protocols.storage import HistoryReader
 
 
 class GraphViewModel:
-    def __init__(self, reader: HistoryReader, current_output_tree_hash: Optional[str], page_size: int = 50):
+    def __init__(self, reader: HistoryReader, current_output_tree_hash: str | None, page_size: int = 50):
         self.reader = reader
         self.current_output_tree_hash = current_output_tree_hash
         self.page_size = page_size
@@ -18,10 +17,10 @@ class GraphViewModel:
 
         # --- TUI 交互状态 ---
         self.show_unreachable: bool = True
-        self.current_page_nodes: List[QuipuNode] = []
-        self.current_selected_node: Optional[QuipuNode] = None
-        self._node_by_key: Dict[str, QuipuNode] = {}
-        self.reachable_set: Set[str] = set()
+        self.current_page_nodes: list[QuipuNode] = []
+        self.current_selected_node: QuipuNode | None = None
+        self._node_by_key: dict[str, QuipuNode] = {}
+        self.reachable_set: set[str] = set()
 
     def initialize(self):
         self.total_nodes = self.reader.get_node_count()
@@ -58,7 +57,7 @@ class GraphViewModel:
         # e.g. pos 0 -> page 1; pos 49 -> page 1; pos 50 -> page 2
         return (position // self.page_size) + 1
 
-    def load_page(self, page_number: int) -> List[QuipuNode]:
+    def load_page(self, page_number: int) -> list[QuipuNode]:
         if not (1 <= page_number <= self.total_pages):
             self.current_page_nodes = []
             self._node_by_key = {}
@@ -74,26 +73,26 @@ class GraphViewModel:
     def toggle_unreachable(self):
         self.show_unreachable = not self.show_unreachable
 
-    def get_nodes_to_render(self) -> List[QuipuNode]:
+    def get_nodes_to_render(self) -> list[QuipuNode]:
         if self.show_unreachable:
             return self.current_page_nodes
         return [node for node in self.current_page_nodes if self.is_reachable(node.output_tree)]
 
-    def select_node_by_key(self, key: str) -> Optional[QuipuNode]:
+    def select_node_by_key(self, key: str) -> QuipuNode | None:
         node = self._node_by_key.get(key)
         self.current_selected_node = node
         return node
 
-    def get_selected_node(self) -> Optional[QuipuNode]:
+    def get_selected_node(self) -> QuipuNode | None:
         return self.current_selected_node
 
     def get_public_content(self, node: QuipuNode) -> str:
         return self.reader.get_node_content(node) or ""
 
-    def previous_page(self) -> List[QuipuNode]:
+    def previous_page(self) -> list[QuipuNode]:
         return self.load_page(self.current_page - 1)
 
-    def next_page(self) -> List[QuipuNode]:
+    def next_page(self) -> list[QuipuNode]:
         return self.load_page(self.current_page + 1)
 
     def get_content_bundle(self, node: QuipuNode) -> str:

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/tests/integration/test_navigation_commands.py

@@ -14,7 +14,7 @@ def populated_workspace(quipu_workspace):
 
 
 def test_cli_back_forward_flow(runner, populated_workspace, monkeypatch):
-    workspace, hash_a, hash_b = populated_workspace
+    workspace, hash_a, _hash_b = populated_workspace
     mock_bus_nav = MagicMock()
     mock_bus_helper = MagicMock()
     monkeypatch.setattr("quipu.cli.commands.navigation.bus", mock_bus_nav)
@@ -41,7 +41,7 @@ def test_cli_back_forward_flow(runner, populated_workspace, monkeypatch):
 
 
 def test_cli_boundary_messages(runner, populated_workspace, monkeypatch):
-    workspace, hash_a, hash_b = populated_workspace
+    workspace, hash_a, _hash_b = populated_workspace
     mock_bus = MagicMock()
     monkeypatch.setattr("quipu.cli.commands.navigation.bus", mock_bus)
 

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/tests/integration/test_workspace_commands.py

@@ -1,7 +1,7 @@
-from needle.pointer import L
 from unittest import mock
 from unittest.mock import MagicMock
 
+from needle.pointer import L
 from quipu.cli.main import app
 
 
@@ -49,12 +49,13 @@ def test_discard_interactive_abort(runner, quipu_workspace, monkeypatch):
     work_dir, _, engine = quipu_workspace
     mock_bus = MagicMock()
     monkeypatch.setattr("quipu.cli.commands.workspace.bus", mock_bus)
+    monkeypatch.setattr("click.getchar", lambda echo=False: "n")
 
     (work_dir / "file.txt").write_text("v1")
     engine.capture_drift(engine.git_db.get_tree_hash())
     (work_dir / "file.txt").write_text("v2")
 
-    result = runner.invoke(app, ["discard", "-w", str(work_dir)], input="n")
+    result = runner.invoke(app, ["discard", "-w", str(work_dir)])
 
     assert result.exit_code == 1
     mock_bus.warning.assert_called_once_with(L.common.prompt.cancel)

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/tests/unit/test_view_model.py

@@ -1,6 +1,5 @@
 from datetime import datetime
 from pathlib import Path
-from typing import Dict, List, Optional, Set
 
 import pytest
 from quipu.cli.view_model import GraphViewModel
@@ -11,10 +10,10 @@ from quipu.spec.protocols.storage import HistoryReader
 class MockHistoryReader(HistoryReader):
     def __init__(
         self,
-        nodes: List[QuipuNode],
-        ancestors: Optional[Set[str]] = None,
-        descendants: Optional[Set[str]] = None,
-        private_data: Optional[dict[str, str]] = None,
+        nodes: list[QuipuNode],
+        ancestors: set[str] | None = None,
+        descendants: set[str] | None = None,
+        private_data: dict[str, str] | None = None,
     ):
         self._nodes = sorted(nodes, key=lambda n: n.timestamp, reverse=True)
         self._ancestors = ancestors or set()
@@ -24,13 +23,13 @@ class MockHistoryReader(HistoryReader):
     def get_node_count(self) -> int:
         return len(self._nodes)
 
-    def load_nodes_paginated(self, limit: int, offset: int) -> List[QuipuNode]:
+    def load_nodes_paginated(self, limit: int, offset: int) -> list[QuipuNode]:
         return self._nodes[offset : offset + limit]
 
-    def get_ancestor_output_trees(self, start_output_tree_hash: str) -> Set[str]:
+    def get_ancestor_output_trees(self, start_output_tree_hash: str) -> set[str]:
         return self._ancestors
 
-    def get_descendant_output_trees(self, start_output_tree_hash: str) -> Set[str]:
+    def get_descendant_output_trees(self, start_output_tree_hash: str) -> set[str]:
         return self._descendants
 
     def get_node_position(self, output_tree_hash: str) -> int:
@@ -39,26 +38,26 @@ class MockHistoryReader(HistoryReader):
                 return i
         return -1
 
-    def get_private_data(self, node_commit_hash: str) -> Optional[str]:
+    def get_private_data(self, node_commit_hash: str) -> str | None:
         return self._private_data.get(node_commit_hash)
 
     def get_node_content(self, node: QuipuNode) -> str:
         # For simplicity, mock content is stored in the node's summary
         return node.summary
 
-    def get_node_blobs(self, commit_hash: str) -> Dict[str, bytes]:
+    def get_node_blobs(self, commit_hash: str) -> dict[str, bytes]:
         return {}
 
     # --- Unused abstract methods ---
-    def load_all_nodes(self) -> List[QuipuNode]:
+    def load_all_nodes(self) -> list[QuipuNode]:
         return self._nodes
 
     def find_nodes(
         self,
-        summary_regex: Optional[str] = None,
-        node_type: Optional[str] = None,
+        summary_regex: str | None = None,
+        node_type: str | None = None,
         limit: int = 10,
-    ) -> List[QuipuNode]:
+    ) -> list[QuipuNode]:
         return []
 
 

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/src/quipu/cli/commands/ui.py

@@ -3,8 +3,8 @@ from pathlib import Path
 from typing import Annotated
 
 import typer
-from quipu.application.factory import create_engine
 from needle.pointer import L
+from quipu.application.factory import create_engine
 from quipu.common.bus import bus
 
 from ..config import DEFAULT_WORK_DIR, LOG_LEVEL

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/tests/integration/test_cli_interaction.py

@@ -1,6 +1,6 @@
-from needle.pointer import L
 from unittest.mock import MagicMock
 
+from needle.pointer import L
 from quipu.cli.main import app
 from typer.testing import CliRunner
 

{pyquipu_cli-0.3.2 → pyquipu_cli-0.3.3}/tests/integration/test_query_commands.py

@@ -1,7 +1,7 @@
-from needle.pointer import L
 import json
 from unittest.mock import MagicMock
 
+from needle.pointer import L
 from quipu.cli.main import app
 from quipu.test_utils.helpers import create_linear_history_from_specs, create_query_branching_history