Merge branch 'my-pi-worktree1'

# Conflicts:
#	AGENTS.md
#	pi-tool-search/CHANGELOG.md
#	pi-tool-search/docs/dynamic-tool-loading.md

pi-tool-search/CHANGELOG.md

@@ -13,6 +13,7 @@
 - Replaced the Hermes and third-party Hippo assignments with the five tools exposed by the official Hippo Pi extension, grouped into recall and management workflows.
 - Added authoritative `ssh-connection`, `ssh-remote-files`, `ssh-remote-search`, and `ssh-remote-shell` groups for the maintained `pi-ssh` tools, keeping reviewed connection, bounded discovery, structured file operations, and reviewed shell execution separate; the connection workflow now requires sequential `ssh_connect` to succeed before dependent tools.
 - Added sequential `ssh_cd` to the authoritative remote-shell workflow and direct the model to wait for a successful workspace change before dependent remote calls, avoiding both the unknown-tools fallback and cwd races.
+- Added the authoritative `user-interaction` group for the maintained `ask_user_question` TUI tool.
 
 ## [0.3.6] - 2026-04-24
 

pi-tool-search/README.md

@@ -41,6 +41,7 @@ Run `/tool-search-rebuild` to remove model enrichment. Standard bundle tools imm
 | `context-administration` | Context upgrade and destructive purge |
 | `memory-recall` | Official Hippo recall/context/status and condensed-output recovery |
 | `memory-management` | Official Hippo remember/outcome tools |
+| `user-interaction` | `ask_user_question` model-initiated TUI questions |
 | `mcp-management` | Shared MCP adapter management |
 
 Pinned tools are removed from these dynamic groups at runtime. For example, the default-pinned `codegraph_explore` and `lsp_diagnostics` do not consume the `code-intelligence` group budget.

pi-tool-search/docs/dynamic-tool-loading.md

@@ -14,6 +14,7 @@
 
 The standard bundle assigns the official Hippo Pi extension's five `hippo_*` tools to recall and management groups. `context_tree_query` remains in `memory-recall` because it recovers condensed tool output; retired Hermes names and third-party `tff-memory_*` names are not seeded.
 The maintained `pi-ssh` tools are also split by workflow: sequential reviewed agent-controlled connection lives in `ssh-connection`, structured `ssh_read`/`ssh_write`/`ssh_edit` file operations live in `ssh-remote-files`, bounded `ssh_find`/`ssh_grep` discovery lives in `ssh-remote-search`, and sequential reviewed workspace changes plus reviewed command execution live in `ssh-remote-shell`. The workflows tell the model to call `ssh_connect` or `ssh_cd` separately and wait for success before issuing remote calls that depend on the new connection or cwd.
+The maintained `ask_user_question` tool has its own `user-interaction` group so the model can load the complete interactive schema only when a missing decision or preference must come from the user.
 
 A purely additive first load receives Pi's native dynamic-tool result propagation. A replacement that evicts one group while adding another is intentionally non-additive; current Pi detects the removal and uses its safe next-request fallback instead of attaching an invalid additive-only hint.
 

pi-tool-search/extensions/bundle-groups.ts

@@ -157,6 +157,15 @@ export const BUNDLE_GROUP_DEFINITIONS: BundleGroupDefinition[] = [
     keywords: ["remember", "outcome", "lesson", "error", "记住", "反馈", "项目经验"],
     tools: ["hippo_remember", "hippo_outcome"],
   },
+  {
+    id: "user-interaction",
+    title: "Interactive user questions",
+    summary: "Pause the agent and collect one or more structured decisions from the user in the TUI.",
+    useWhen: ["A missing requirement, preference, confirmation, or choice must come directly from the user before continuing"],
+    avoidWhen: ["The user's direct messages already provide the answer, or the task can proceed without another decision"],
+    keywords: ["ask", "question", "clarify", "choice", "preference", "提问", "澄清", "选择", "确认"],
+    tools: ["ask_user_question"],
+  },
   {
     id: "mcp-management",
     title: "MCP management",

pi-tool-search/test/bundle-groups.test.ts

@@ -31,6 +31,7 @@ test("bundle seed names are unique and cover the declared my-pi tools", () => {
   assert.equal(result.catalog.tools.find((card) => card.name === "hippo_remember")?.primaryGroup, "memory-management");
   assert.equal(result.catalog.tools.find((card) => card.name === "ssh_find")?.primaryGroup, "ssh-remote-search");
   assert.equal(result.catalog.tools.find((card) => card.name === "ssh_grep")?.primaryGroup, "ssh-remote-search");
+  assert.equal(result.catalog.tools.find((card) => card.name === "ask_user_question")?.primaryGroup, "user-interaction");
 });
 
 test("user overrides take priority and unknown tools retain deterministic fallback groups", () => {