Merge branch 'main' of bitbucket.org:siakitem/my-pi

# Conflicts:
#	AGENTS.md
#	README.md
#	package-lock.json
#	package.json
#	pi-tool-search/CHANGELOG.md
#	pi-tool-search/README.md
#	pi-tool-search/docs/dynamic-tool-loading.md
#	pi-tool-search/extensions/bundle-groups.ts
#	pi-tool-search/test/bundle-groups.test.ts

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

@@ -31,6 +31,42 @@ export const BUNDLE_GROUP_DEFINITIONS: BundleGroupDefinition[] = [
     keywords: ["files", "directory", "list", "multi grep", "目录", "文件", "多模式搜索"],
     tools: ["ls", "multi_grep"],
   },
+  {
+    id: "ssh-connection",
+    title: "SSH connection",
+    summary: "Connect sequentially to an explicitly imported SSH host through the reviewed agent tool flow.",
+    useWhen: ["The user names a remote server as part of a concrete task and no matching SSH2 connection is active; call ssh_connect separately and wait for success before dependent remote tools"],
+    avoidWhen: ["The task is local, the server was not explicitly named, or the host has not been imported"],
+    keywords: ["ssh", "connect", "server", "host", "remote", "连接服务器", "远程主机", "SSH"],
+    tools: ["ssh_connect"],
+  },
+  {
+    id: "ssh-remote-files",
+    title: "SSH remote files",
+    summary: "Read, write, and edit files in the currently connected remote SSH workspace.",
+    useWhen: ["You need explicit file operations on an active SSH target rather than the local workspace"],
+    avoidWhen: ["A remote shell command is required, or the files are local"],
+    keywords: ["ssh", "remote", "read", "write", "edit", "远程", "文件", "SSH"],
+    tools: ["ssh_read", "ssh_write", "ssh_edit"],
+  },
+  {
+    id: "ssh-remote-search",
+    title: "SSH remote search",
+    summary: "Run bounded adaptive filename and content searches on the active SSH target.",
+    useWhen: ["You need to locate remote files or literals before reading or operating on them"],
+    avoidWhen: ["The search belongs to the local workspace, or a known remote path can be read directly"],
+    keywords: ["ssh", "remote", "find", "grep", "search", "远程搜索", "文件查找", "SSH"],
+    tools: ["ssh_find", "ssh_grep"],
+  },
+  {
+    id: "ssh-remote-shell",
+    title: "SSH remote workspace shell",
+    summary: "Change the active remote cwd as a separate reviewed step, or run a reviewed shell command in that workspace.",
+    useWhen: ["You need to change the active remote workspace or run builds, tests, Git, or other shell operations there; call ssh_cd separately and wait for success before dependent remote calls"],
+    avoidWhen: ["Structured remote file tools are sufficient, or the operation should run locally"],
+    keywords: ["ssh", "remote", "bash", "cd", "cwd", "workspace", "build", "test", "git", "远程命令", "工作目录", "SSH"],
+    tools: ["ssh_cd", "ssh_bash"],
+  },
   {
     id: "code-intelligence",
     title: "Code intelligence",
@@ -130,6 +166,15 @@ export const BUNDLE_GROUP_DEFINITIONS: BundleGroupDefinition[] = [
     keywords: ["subagent", "agent", "delegate", "background", "steer", "子代理", "委派", "后台"],
     tools: ["Agent", "get_subagent_result", "steer_subagent"],
   },
+  {
+    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",