@josephyan/qingflow-app-user-mcp 0.2.0-beta.1000 → 0.2.0-beta.1002

package/README.md

@@ -3,13 +3,13 @@
 Install:
 
 ```bash
-npm install @josephyan/qingflow-app-user-mcp@0.2.0-beta.1000
+npm install @josephyan/qingflow-app-user-mcp@0.2.0-beta.1002
 ```
 
 Run:
 
 ```bash
-npx -y -p @josephyan/qingflow-app-user-mcp@0.2.0-beta.1000 qingflow-app-user-mcp
+npx -y -p @josephyan/qingflow-app-user-mcp@0.2.0-beta.1002 qingflow-app-user-mcp
 ```
 
 Environment:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@josephyan/qingflow-app-user-mcp",
-  "version": "0.2.0-beta.1000",
+  "version": "0.2.0-beta.1002",
   "description": "Operational end-user MCP for Qingflow records, tasks, comments, and directory workflows.",
   "license": "MIT",
   "type": "module",

package/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qingflow-mcp"
-version = "0.2.0b1000"
+version = "0.2.0b1002"
 description = "User-authenticated MCP server for Qingflow"
 readme = "README.md"
 license = "MIT"

package/src/qingflow_mcp/__init__.py

@@ -5,7 +5,7 @@ from pathlib import Path
 
 __all__ = ["__version__"]
 
-_FALLBACK_VERSION = "0.2.0b1000"
+_FALLBACK_VERSION = "0.2.0b1002"
 
 
 def _resolve_local_pyproject_version() -> str | None:

package/src/qingflow_mcp/cli/commands/workspace.py

@@ -6,6 +6,8 @@ import json
 from ..context import CliContext
 from ..terminal_ui import SelectionOption, select_option
 
+_INTERACTIVE_SELECTION_UNAVAILABLE = object()
+
 
 def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) -> None:
     parser = subparsers.add_parser("workspace", help="工作区")
@@ -23,7 +25,7 @@ def register(subparsers: argparse._SubParsersAction[argparse.ArgumentParser]) ->
 
     select_parser = workspace_subparsers.add_parser("select", help="切换当前工作区")
     select_parser.add_argument("--ws-id", type=int, default=0, help="不传时在交互终端中选择工作区")
-    select_parser.set_defaults(handler=_handle_select, format_hint="workspace_get")
+    select_parser.set_defaults(handler=_handle_select, format_hint="workspace_select")
 
 
 def _handle_list(args: argparse.Namespace, context: CliContext) -> dict:
@@ -45,7 +47,7 @@ def _handle_get(args: argparse.Namespace, context: CliContext) -> dict:
 def _handle_select(args: argparse.Namespace, context: CliContext) -> dict:
     if int(args.ws_id or 0) <= 0:
         selected_ws_id = _choose_workspace_interactively(args, context)
-        if selected_ws_id is None:
+        if selected_ws_id is _INTERACTIVE_SELECTION_UNAVAILABLE:
             raise RuntimeError(
                 json.dumps(
                     {
@@ -55,6 +57,8 @@ def _handle_select(args: argparse.Namespace, context: CliContext) -> dict:
                     ensure_ascii=False,
                 )
             )
+        if selected_ws_id is None:
+            return {"status": "cancelled", "message": "已取消"}
         args.ws_id = selected_ws_id
     return context.workspace.workspace_select(
         profile=args.profile,
@@ -62,13 +66,13 @@ def _handle_select(args: argparse.Namespace, context: CliContext) -> dict:
     )
 
 
-def _choose_workspace_interactively(args: argparse.Namespace, context: CliContext) -> int | None:
+def _choose_workspace_interactively(args: argparse.Namespace, context: CliContext) -> int | None | object:
     input_stream = getattr(args, "_stdin", None)
     output_stream = getattr(args, "_stderr_stream", None)
     if input_stream is None or output_stream is None:
-        return None
+        return _INTERACTIVE_SELECTION_UNAVAILABLE
     if not bool(getattr(input_stream, "isatty", lambda: False)()):
-        return None
+        return _INTERACTIVE_SELECTION_UNAVAILABLE
     page = context.workspace.workspace_list(
         profile=args.profile,
         page_num=1,
@@ -77,7 +81,7 @@ def _choose_workspace_interactively(args: argparse.Namespace, context: CliContex
     ).get("page")
     items = page.get("list") if isinstance(page, dict) and isinstance(page.get("list"), list) else []
     if not items:
-        return None
+        return _INTERACTIVE_SELECTION_UNAVAILABLE
     current_ws_id = None
     sessions = getattr(context, "sessions", None)
     if sessions is not None and hasattr(sessions, "get_profile"):

package/src/qingflow_mcp/cli/formatters.py

@@ -106,6 +106,21 @@ def _format_workspace_get(result: dict[str, Any]) -> str:
     return "\n".join(lines) + "\n"
 
 
+def _format_workspace_select(result: dict[str, Any]) -> str:
+    status = str(result.get("status") or "").lower()
+    if status == "cancelled":
+        return str(result.get("message") or "已取消") + "\n"
+
+    workspace = result.get("workspace") if isinstance(result.get("workspace"), dict) else {}
+    workspace_name = workspace.get("workspaceName") or workspace.get("wsName") or result.get("selected", {}).get("workspace_name") if isinstance(result.get("selected"), dict) else None
+    lines = [
+        f"已切换到: {workspace_name or '-'} ({workspace.get('wsId') or result.get('ws_id') or '-'})",
+        f"QF Version: {result.get('qf_version') or workspace.get('systemVersion') or '-'}",
+    ]
+    _append_warnings(lines, result.get("warnings"))
+    return "\n".join(lines) + "\n"
+
+
 def _format_app_items(result: dict[str, Any]) -> str:
     items = result.get("items")
     if not isinstance(items, list):
@@ -559,6 +574,7 @@ _FORMATTERS = {
     "auth_whoami": _format_whoami,
     "workspace_list": _format_workspace_list,
     "workspace_get": _format_workspace_get,
+    "workspace_select": _format_workspace_select,
     "app_list": _format_app_items,
     "app_search": _format_app_items,
     "app_get": _format_app_get,

package/src/qingflow_mcp/cli/terminal_ui.py

@@ -16,6 +16,10 @@ except ImportError:  # pragma: no cover - non-POSIX fallback
 
 T = TypeVar("T")
 RAW_TTY_NEWLINE = "\r\n"
+# Give terminal escape sequences a slightly roomier window so arrow keys
+# still parse correctly when an outer Node/npm launcher adds a bit of PTY lag.
+ESCAPE_SEQUENCE_TIMEOUT_SECONDS = 0.2
+ESCAPE_SEQUENCE_FOLLOWUP_TIMEOUT_SECONDS = 0.02
 
 
 @dataclass(slots=True)
@@ -158,16 +162,23 @@ def _truncate_line(text: str, *, width: int) -> str:
 
 
 def _read_key(input_stream: TextIO) -> str:
-    first = input_stream.read(1)
+    fd = input_stream.fileno()
+    first_bytes = os.read(fd, 1)
+    if not first_bytes:
+        return ""
+    first = first_bytes.decode("utf-8", errors="ignore")
     if first != "\x1b":
         return first
     chunks = [first]
-    fd = input_stream.fileno()
-    while select.select([fd], [], [], 0.02)[0]:
+    if not select.select([fd], [], [], ESCAPE_SEQUENCE_TIMEOUT_SECONDS)[0]:
+        return first
+    while True:
         chunk = os.read(fd, 1).decode("utf-8", errors="ignore")
         if not chunk:
             break
         chunks.append(chunk)
         if len(chunks) >= 3:
             break
+        if not select.select([fd], [], [], ESCAPE_SEQUENCE_FOLLOWUP_TIMEOUT_SECONDS)[0]:
+            break
     return "".join(chunks)