@trim21/personal-pi-extensions 0.1.650 → 0.1.652

package/src/claude-code/index.ts

@@ -1,8 +1,11 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 
-import { createBwrapRuntime } from "../bwrap/runtime.js";
-import { createRequestPolicy } from "../lib/request-policy.js";
-import claudeCodeFileTools from "./files.js";
+import { type BwrapRuntime, createBwrapRuntime } from "../bwrap/runtime.js";
+import type { LspManager } from "../lib/lsp/lsp.js";
+import { createRequestPolicy, type RequestPolicy } from "../lib/request-policy.js";
+import type { ToolBus } from "../lib/tool-bus.js";
+import { registerToolsOnSessionStart } from "../lib/tool-registration.js";
+import { createClaudeCodeFileTools } from "./files.js";
 import { registerSearchTools } from "./search.js";
 import { registerSessionTools } from "./session-tools.js";
 import { registerShellTools } from "./shell.js";
@@ -16,10 +19,53 @@ import { registerShellTools } from "./shell.js";
  * 子代理按工具名直接 `-e` 加载各模块文件（files.ts / grep.ts / glob.ts 均为
  * 独立扩展入口），那些入口各自创建一份策略并经 pi.events 保持同步。
  */
-export default function claudeCodeTools(pi: ExtensionAPI): void {
-  const policy = createRequestPolicy(pi.events);
-  claudeCodeFileTools(pi, { policy });
-  registerSearchTools(pi);
-  registerShellTools(pi, createBwrapRuntime(policy));
-  registerSessionTools(pi);
+export interface ClaudeCodeToolsetOptions {
+  bus?: ToolBus;
+  policy?: RequestPolicy;
+  runtime?: BwrapRuntime;
+  manager?: LspManager;
+}
+
+/** claude-code 风格工具集的共享部件：入口与独立默认导出都从这里取。 */
+export function createClaudeCodeTools(pi: ExtensionAPI, options?: ClaudeCodeToolsetOptions) {
+  const policy = options?.policy ?? createRequestPolicy(pi.events);
+  const runtime = options?.runtime ?? createBwrapRuntime(policy);
+  // 独立入口（不经 src/index.ts 的共享服务）要自己接上 bwrap 的会话钩子与 /bwrap* 命令。
+  if (options?.runtime === undefined) {
+    runtime.setup(pi);
+  }
+  const fileTools = createClaudeCodeFileTools(pi, {
+    policy,
+    bus: options?.bus,
+    manager: options?.manager,
+  });
+
+  return {
+    fileTools,
+    /** 会话启动 / 分支切换时恢复已读记账。 */
+    restoreReads(ctx: ExtensionContext): void {
+      fileTools.restoreReads(ctx);
+    },
+    /** 把本工具集的工具注册到总线。 */
+    register(bus: ToolBus): void {
+      fileTools.register(bus);
+      registerSearchTools(bus, pi);
+      registerShellTools(bus, pi, runtime);
+      registerSessionTools(bus, pi);
+    },
+  };
+}
+
+export default function claudeCodeTools(pi: ExtensionAPI, options?: { bus?: ToolBus }): void {
+  const tools = createClaudeCodeTools(pi, { bus: options?.bus });
+
+  pi.on("session_start", (_event, ctx) => tools.restoreReads(ctx));
+  // rewind / 树内跳转只发 session_tree 不发 session_start，同样要重放当前分支。
+  pi.on("session_tree", (_event, ctx) => tools.restoreReads(ctx));
+
+  // 全部工具在同一次 session_start 里注册：禁用规则可以带 models，只有那时
+  // 才知道本会话的模型。
+  registerToolsOnSessionStart(pi, (bus) => {
+    tools.register(bus);
+  });
 }

package/src/claude-code/search.ts

@@ -8,12 +8,13 @@
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
+import type { ToolBus } from "../lib/tool-bus.js";
 import { registerGlobTool } from "./glob.js";
 import { registerGrepTool } from "./grep.js";
 
-export function registerSearchTools(pi: ExtensionAPI): void {
-  registerGlobTool(pi);
-  registerGrepTool(pi);
+export function registerSearchTools(bus: ToolBus, pi: ExtensionAPI): void {
+  registerGlobTool(bus);
+  registerGrepTool(bus, pi);
 }
 
 // Re-exported for tests that import pure functions from "./search.js"; the

package/src/claude-code/session-tools.ts

@@ -3,6 +3,7 @@ import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-a
 import { type Static, Type } from "typebox";
 import { Value } from "typebox/value";
 
+import type { ToolBus } from "../lib/tool-bus.js";
 import { selectMultiple, selectWithOptionalInput } from "../lib/ui.js";
 
 const TODO_STATUSES = ["pending", "in_progress", "completed"] as const;
@@ -121,7 +122,7 @@ async function askMultiple(
   return selected.length > 0 ? selected.join(", ") : "Unanswered";
 }
 
-export function registerSessionTools(pi: ExtensionAPI): void {
+export function registerSessionTools(bus: ToolBus, pi: ExtensionAPI): void {
   // TodoWrite 的列表随工具结果 details 持久化（跟随会话分支），但 widget 是
   // 纯 TUI 状态，进程重启后丢失。session 恢复时从当前分支取最后一个 TodoWrite
   // 的列表重新渲染（完整列表替换语义，后出现的覆盖前面的）。
@@ -139,7 +140,7 @@ export function registerSessionTools(pi: ExtensionAPI): void {
     }
   });
 
-  pi.registerTool({
+  bus.register({
     name: "TodoWrite",
     label: "Todo Write",
     description: [
@@ -177,7 +178,7 @@ export function registerSessionTools(pi: ExtensionAPI): void {
     },
   });
 
-  pi.registerTool({
+  bus.register({
     name: "AskUserQuestion",
     label: "Ask User Question",
     description: [

package/src/claude-code/shell.ts

@@ -13,12 +13,11 @@ import { Type } from "typebox";
 import {
   BashInterruptedError,
   type BwrapRuntime,
-  createBwrapRuntime,
   formatElapsedSeconds,
   sandboxHintBlock,
 } from "../bwrap/runtime.js";
 import { resolveWorkdir } from "../lib/path.js";
-import { createRequestPolicy } from "../lib/request-policy.js";
+import type { ToolBus } from "../lib/tool-bus.js";
 
 const DEFAULT_TIMEOUT_MS = 120_000;
 const MAX_TIMEOUT_MS = 7_200_000;
@@ -88,12 +87,8 @@ function formatBashSuccess(result: Awaited<ReturnType<BwrapRuntime["execute"]>>)
  * runtime 由调用方注入：扩展工厂持有一个实例（不依赖模块级全局状态），
  * 测试可注入预置模式的实例。状态随扩展实例生命周期，session 切换重建即重置。
  */
-export function registerShellTools(
-  pi: ExtensionAPI,
-  runtime: BwrapRuntime = createBwrapRuntime(createRequestPolicy(pi.events)),
-): void {
-  runtime.setup(pi);
-  pi.registerTool({
+export function registerShellTools(bus: ToolBus, pi: ExtensionAPI, runtime: BwrapRuntime): void {
+  bus.register({
     name: "Bash",
     promptSnippet: "execute command",
     promptGuidelines: [BASH_PROMPT],

package/src/gh/index.ts

@@ -36,6 +36,8 @@
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
+import type { ToolBus } from "../lib/tool-bus.js";
+import { registerToolsOnSessionStart } from "../lib/tool-registration.js";
 import { GhClient, isGhAvailable } from "./base.js";
 import { addDownloadReleaseAssetsTool } from "./tools/download-release-assets.js";
 import { addGetWorkflowJobsTool } from "./tools/get-workflow-jobs.js";
@@ -62,20 +64,58 @@ export * from "./tools/download-release-assets.js";
 export * from "./tools/read-ci-logs.js";
 export * from "./tools/read-pr-status.js";
 
-export default function ghReadonlyTools(pi: ExtensionAPI) {
+/** 本工具集的工具：入口从它取注册函数（gh 不可用时返回 undefined）。 */
+export function createGithubTools(): { register(bus: ToolBus): void } | undefined {
   // Windows 上禁用：gh 可执行文件的探测（无扩展名 + POSIX 路径）与进程
   // 管理（SIGTERM 信号语义）都是 POSIX 假设，不做 Windows 适配。
   if (process.platform === "win32") {
-    pi.on("session_start", (_event, ctx) => {
-      ctx.ui.notify("gh-readonly tools are disabled on Windows.", "warning");
-    });
-    return;
+    return undefined;
   }
 
   // Fail fast: the `gh` CLI is the only backend for these tools. Without it the
   // extension registers nothing and reports the problem at session start, so
   // the user gets one clear error instead of a dozen failing tool calls.
   if (!isGhAvailable()) {
+    return undefined;
+  }
+
+  const gh = new GhClient();
+  return {
+    register(bus) {
+      addReadIssueTool(gh, bus);
+      addListIssuesTool(gh, bus);
+      addReadIssueCommentsTool(gh, bus);
+      addReadPrTool(gh, bus);
+      addListPrsTool(gh, bus);
+      addReadPrDiffTool(gh, bus);
+      addReadPrStatusTool(gh, bus);
+      addReadPrCommentsTool(gh, bus);
+      addReadCiLogsTool(gh, bus);
+      addListWorkflowRunsTool(gh, bus);
+      addGetWorkflowJobsTool(gh, bus);
+      addReadRepoTool(gh, bus);
+      addListReleasesTool(gh, bus);
+      addReadReleaseTool(gh, bus);
+      addDownloadReleaseAssetsTool(gh, bus);
+      addWaitPrChecksTool(gh, bus);
+      addWaitCommitChecksTool(gh, bus);
+      addWatchRunTool(gh, bus);
+    },
+  };
+}
+
+export default function ghReadonlyTools(pi: ExtensionAPI): void {
+  // Windows 上禁用：gh 可执行文件的探测与进程管理都是 POSIX 假设。
+  if (process.platform === "win32") {
+    pi.on("session_start", (_event, ctx) => {
+      ctx.ui.notify("gh-readonly tools are disabled on Windows.", "warning");
+    });
+    return;
+  }
+
+  // gh 不可用时一个工具都不注册，只在会话启动时报告一次问题。
+  const tools = createGithubTools();
+  if (!tools) {
     pi.on("session_start", (_event, ctx) => {
       ctx.ui.notify(
         "gh CLI not found in PATH: GitHub read-only tools are disabled. Install GitHub CLI (https://cli.github.com/) and reload the session.",
@@ -85,24 +125,7 @@ export default function ghReadonlyTools(pi: ExtensionAPI) {
     return;
   }
 
-  const gh = new GhClient();
-
-  addReadIssueTool(gh, pi);
-  addListIssuesTool(gh, pi);
-  addReadIssueCommentsTool(gh, pi);
-  addReadPrTool(gh, pi);
-  addListPrsTool(gh, pi);
-  addReadPrDiffTool(gh, pi);
-  addReadPrStatusTool(gh, pi);
-  addReadPrCommentsTool(gh, pi);
-  addReadCiLogsTool(gh, pi);
-  addListWorkflowRunsTool(gh, pi);
-  addGetWorkflowJobsTool(gh, pi);
-  addReadRepoTool(gh, pi);
-  addListReleasesTool(gh, pi);
-  addReadReleaseTool(gh, pi);
-  addDownloadReleaseAssetsTool(gh, pi);
-  addWaitPrChecksTool(gh, pi);
-  addWaitCommitChecksTool(gh, pi);
-  addWatchRunTool(gh, pi);
+  registerToolsOnSessionStart(pi, (bus) => {
+    tools.register(bus);
+  });
 }

package/src/gh/tools/download-release-assets.ts

@@ -2,11 +2,11 @@ import { mkdir, readdir, stat } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
 
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { Value } from "typebox/value";
 
 import { type ToolPendant } from "../../lib/pendant.js";
+import type { ToolBus } from "../../lib/tool-bus.js";
 import {
   type GhClient,
   GhError,
@@ -203,8 +203,8 @@ export async function downloadReleaseAssets(
   };
 }
 
-export function addDownloadReleaseAssetsTool(_gh: GhClient, pi: ExtensionAPI) {
-  pi.registerTool({
+export function addDownloadReleaseAssetsTool(_gh: GhClient, bus: ToolBus) {
+  bus.register({
     name: "download-github-release-assets",
     label: "GitHub Release Download",
     description:

package/src/gh/tools/get-workflow-jobs.ts

@@ -1,6 +1,6 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
+import type { ToolBus } from "../../lib/tool-bus.js";
 import {
   type GhClient,
   resolveRepo,
@@ -30,8 +30,8 @@ async function workflowJobs(gh: GhClient, call: ToolCall<RunIdParams>): Promise<
   return result;
 }
 
-export function addGetWorkflowJobsTool(gh: GhClient, pi: ExtensionAPI) {
-  pi.registerTool({
+export function addGetWorkflowJobsTool(gh: GhClient, bus: ToolBus) {
+  bus.register({
     name: "get-github-workflow-jobs",
     label: "GitHub Workflow Jobs",
     description:

package/src/gh/tools/list-issues.ts

@@ -1,6 +1,6 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
+import type { ToolBus } from "../../lib/tool-bus.js";
 import {
   type GhClient,
   type ListFilters,
@@ -24,8 +24,8 @@ async function listIssues(gh: GhClient, call: ToolCall<ListFilters>): Promise<To
   return result;
 }
 
-export function addListIssuesTool(gh: GhClient, pi: ExtensionAPI) {
-  pi.registerTool({
+export function addListIssuesTool(gh: GhClient, bus: ToolBus) {
+  bus.register({
     name: "list-github-issues",
     label: "GitHub Issues List",
     description:

package/src/gh/tools/list-prs.ts

@@ -1,6 +1,6 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
+import type { ToolBus } from "../../lib/tool-bus.js";
 import {
   type GhClient,
   type ListFilters,
@@ -24,8 +24,8 @@ async function listPrs(gh: GhClient, call: ToolCall<ListFilters>): Promise<ToolR
   return result;
 }
 
-export function addListPrsTool(gh: GhClient, pi: ExtensionAPI) {
-  pi.registerTool({
+export function addListPrsTool(gh: GhClient, bus: ToolBus) {
+  bus.register({
     name: "list-github-prs",
     label: "GitHub PRs List",
     description:

package/src/gh/tools/list-releases.ts

@@ -1,10 +1,10 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
+import type { ToolBus } from "../../lib/tool-bus.js";
 import { type GhClient, ghExec, repoArgs, subtitlePendant, toToolResult } from "../base.js";
 
-export function addListReleasesTool(_gh: GhClient, pi: ExtensionAPI) {
-  pi.registerTool({
+export function addListReleasesTool(_gh: GhClient, bus: ToolBus) {
+  bus.register({
     name: "list-github-releases",
     label: "GitHub Releases List",
     description: "List GitHub releases.",

package/src/gh/tools/list-workflow-runs.ts

@@ -1,10 +1,10 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
+import type { ToolBus } from "../../lib/tool-bus.js";
 import { type GhClient, ghExec, repoArgs, subtitlePendant, toToolResult } from "../base.js";
 
-export function addListWorkflowRunsTool(_gh: GhClient, pi: ExtensionAPI) {
-  pi.registerTool({
+export function addListWorkflowRunsTool(_gh: GhClient, bus: ToolBus) {
+  bus.register({
     name: "list-github-workflow-runs",
     label: "GitHub Workflow Runs",
     description: "List GitHub Actions workflow runs.",

package/src/gh/tools/read-ci-logs.ts

@@ -3,16 +3,15 @@
  * each executed step's block inside it, so the model can read the exact line
  * range of the step it needs.
  */
-
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
 import type { RunJob } from "../../lib/github.js";
 import { createSeqState } from "../../lib/seq-state.js";
+import type { ToolBus } from "../../lib/tool-bus.js";
 import {
   type GhClient,
   ghExec,
@@ -422,8 +421,8 @@ async function ciLogs(gh: GhClient, call: ToolCall<JobIdParams>): Promise<ToolRe
   };
 }
 
-export function addReadCiLogsTool(gh: GhClient, pi: ExtensionAPI) {
-  pi.registerTool({
+export function addReadCiLogsTool(gh: GhClient, bus: ToolBus) {
+  bus.register({
     name: "read-github-ci-logs",
     label: "GitHub CI Logs",
     description:

package/src/gh/tools/read-issue-comments.ts

@@ -1,10 +1,10 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
+import type { ToolBus } from "../../lib/tool-bus.js";
 import { type GhClient, ghExec, repoArgs, subtitlePendant, toToolResultJson } from "../base.js";
 
-export function addReadIssueCommentsTool(_gh: GhClient, pi: ExtensionAPI) {
-  pi.registerTool({
+export function addReadIssueCommentsTool(_gh: GhClient, bus: ToolBus) {
+  bus.register({
     name: "read-github-issue-comments",
     label: "GitHub Issue Comments",
     description: "Get comments on a GitHub issue.",

package/src/gh/tools/read-issue.ts

@@ -1,10 +1,10 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
+import type { ToolBus } from "../../lib/tool-bus.js";
 import { type GhClient, ghExec, repoArgs, subtitlePendant, toToolResultJson } from "../base.js";
 
-export function addReadIssueTool(_gh: GhClient, pi: ExtensionAPI) {
-  pi.registerTool({
+export function addReadIssueTool(_gh: GhClient, bus: ToolBus) {
+  bus.register({
     name: "read-github-issue",
     label: "GitHub Issue",
     description: "Get details of a GitHub issue by number.",

package/src/gh/tools/read-pr-comments.ts

@@ -1,6 +1,6 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
+import type { ToolBus } from "../../lib/tool-bus.js";
 import {
   ghApiList,
   type GhClient,
@@ -11,8 +11,8 @@ import {
   toToolResultJson,
 } from "../base.js";
 
-export function addReadPrCommentsTool(_gh: GhClient, pi: ExtensionAPI) {
-  pi.registerTool({
+export function addReadPrCommentsTool(_gh: GhClient, bus: ToolBus) {
+  bus.register({
     name: "read-github-pr-comments",
     label: "GitHub PR Comments",
     description:

package/src/gh/tools/read-pr-diff.ts

@@ -1,10 +1,10 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
+import type { ToolBus } from "../../lib/tool-bus.js";
 import { type GhClient, ghExec, repoArgs, subtitlePendant, toToolResult } from "../base.js";
 
-export function addReadPrDiffTool(_gh: GhClient, pi: ExtensionAPI) {
-  pi.registerTool({
+export function addReadPrDiffTool(_gh: GhClient, bus: ToolBus) {
+  bus.register({
     name: "read-github-pr-diff",
     label: "GitHub PR Diff",
     description: "Get the diff of a GitHub pull request.",

package/src/gh/tools/read-pr-status.ts

@@ -1,6 +1,6 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
+import type { ToolBus } from "../../lib/tool-bus.js";
 import {
   type GhClient,
   mergeChecks,
@@ -52,8 +52,8 @@ export async function prStatus(gh: GhClient, call: ToolCall<PrStatusParams>): Pr
   };
 }
 
-export function addReadPrStatusTool(gh: GhClient, pi: ExtensionAPI) {
-  pi.registerTool({
+export function addReadPrStatusTool(gh: GhClient, bus: ToolBus) {
+  bus.register({
     name: "read-github-pr-status",
     label: "GitHub PR Status",
     description:

package/src/gh/tools/read-pr.ts

@@ -1,10 +1,10 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
+import type { ToolBus } from "../../lib/tool-bus.js";
 import { type GhClient, ghExec, repoArgs, subtitlePendant, toToolResultJson } from "../base.js";
 
-export function addReadPrTool(_gh: GhClient, pi: ExtensionAPI) {
-  pi.registerTool({
+export function addReadPrTool(_gh: GhClient, bus: ToolBus) {
+  bus.register({
     name: "read-github-pr",
     label: "GitHub PR",
     description: "Get details of a GitHub pull request by number.",

package/src/gh/tools/read-release.ts

@@ -1,10 +1,10 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
+import type { ToolBus } from "../../lib/tool-bus.js";
 import { type GhClient, ghExec, repoArgs, subtitlePendant, toToolResult } from "../base.js";
 
-export function addReadReleaseTool(_gh: GhClient, pi: ExtensionAPI) {
-  pi.registerTool({
+export function addReadReleaseTool(_gh: GhClient, bus: ToolBus) {
+  bus.register({
     name: "read-github-release",
     label: "GitHub Release",
     description: "Get details of a specific GitHub release by tag.",

package/src/gh/tools/read-repo.ts

@@ -1,10 +1,10 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
+import type { ToolBus } from "../../lib/tool-bus.js";
 import { type GhClient, ghExec, subtitlePendant, toToolResult } from "../base.js";
 
-export function addReadRepoTool(_gh: GhClient, pi: ExtensionAPI) {
-  pi.registerTool({
+export function addReadRepoTool(_gh: GhClient, bus: ToolBus) {
+  bus.register({
     name: "read-github-repo",
     label: "GitHub Repo",
     description: "Get repository information.",

package/src/gh/tools/wait-commit-checks.ts

@@ -1,6 +1,6 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
+import type { ToolBus } from "../../lib/tool-bus.js";
 import {
   type GhClient,
   resolveRepo,
@@ -53,8 +53,8 @@ async function waitCommitChecks(
   });
 }
 
-export function addWaitCommitChecksTool(gh: GhClient, pi: ExtensionAPI) {
-  pi.registerTool({
+export function addWaitCommitChecksTool(gh: GhClient, bus: ToolBus) {
+  bus.register({
     name: "wait-github-commit-checks",
     label: "Watch GitHub Commit Checks",
     description:

package/src/gh/tools/wait-pr-checks.ts

@@ -1,7 +1,7 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { Value } from "typebox/value";
 
+import type { ToolBus } from "../../lib/tool-bus.js";
 import {
   type GhClient,
   ghExec,
@@ -55,8 +55,8 @@ async function waitPrChecks(gh: GhClient, call: ToolCall<PrChecksWaitParams>): P
   });
 }
 
-export function addWaitPrChecksTool(gh: GhClient, pi: ExtensionAPI) {
-  pi.registerTool({
+export function addWaitPrChecksTool(gh: GhClient, bus: ToolBus) {
+  bus.register({
     name: "wait-github-pr-checks",
     label: "Watch GitHub PR Checks",
     description:

package/src/gh/tools/watch-run.ts

@@ -1,11 +1,11 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
 import { runGh } from "../../lib/gh-process.js";
+import type { ToolBus } from "../../lib/tool-bus.js";
 import { type GhClient, repoArgs, subtitlePendant } from "../base.js";
 
-export function addWatchRunTool(_gh: GhClient, pi: ExtensionAPI) {
-  pi.registerTool({
+export function addWatchRunTool(_gh: GhClient, bus: ToolBus) {
+  bus.register({
     name: "watch-github-run",
     label: "Watch GitHub Workflow Run",
     description: