@trim21/personal-pi-extensions 0.1.513 → 0.1.516

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.1.513",
+  "version": "0.1.516",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [

package/src/gh-readonly.ts

@@ -35,7 +35,7 @@ import { homedir } from "node:os";
 import { delimiter, dirname, join, resolve } from "node:path";
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { Type } from "typebox";
+import { type Static, Type } from "typebox";
 import { Value } from "typebox/value";
 
 import { createGithubSearch, type GithubSearch, renderHits } from "./lib/github.js";
@@ -266,6 +266,23 @@ const workflowRunSchema = Type.Object({
 
 const workflowRunsSchema = Type.Object({ workflow_runs: Type.Array(workflowRunSchema) });
 
+/**
+ * One entry of `gh pr checks --json`. In JSON mode gh exits 0 once it could
+ * fetch the checks (real errors still exit non-zero); pass/fail/pending is
+ * only conveyed by the `bucket` field, never by the exit code.
+ */
+const prCheckSchema = Type.Object({
+  name: Type.String(),
+  state: Type.String(),
+  bucket: Type.String(),
+  startedAt: Type.Union([Type.String(), Type.Null()]),
+  completedAt: Type.Union([Type.String(), Type.Null()]),
+  link: Type.Union([Type.String(), Type.Null()]),
+  workflow: Type.Union([Type.String(), Type.Null()]),
+});
+
+type PrCheck = Static<typeof prCheckSchema>;
+
 function truncate(
   text: string,
   maxLines = 2000,
@@ -1111,6 +1128,174 @@ export async function writeLogFile(
   };
 }
 
+// ── pr checks watch (pure rendering + poll loop) ────────────────────────────
+
+const PR_CHECKS_JSON_FIELDS = "name,state,bucket,startedAt,completedAt,link,workflow";
+const CHECKS_POLL_INTERVAL_MS = 30_000;
+const CHECKS_WATCH_DEADLINE_MS = 600_000;
+
+function bucketIcon(bucket: string): string {
+  switch (bucket) {
+    case "pass": {
+      return "✅";
+    }
+    case "fail": {
+      return "❌";
+    }
+    case "skipping": {
+      return "⏭️";
+    }
+    case "cancel": {
+      return "🚫";
+    }
+    default: {
+      return "🔄";
+    }
+  }
+}
+
+function formatClock(ms: number): string {
+  const date = new Date(ms);
+  return [date.getHours(), date.getMinutes(), date.getSeconds()]
+    .map((n) => String(n).padStart(2, "0"))
+    .join(":");
+}
+
+function pad2(n: number): string {
+  return String(n).padStart(2, "0");
+}
+
+function formatDuration(totalSeconds: number): string {
+  const seconds = Math.floor(totalSeconds);
+  const h = Math.floor(seconds / 3600);
+  const m = Math.floor((seconds % 3600) / 60);
+  const s = seconds % 60;
+  if (h > 0) return `${h}h${pad2(m)}m${pad2(s)}s`;
+  if (m > 0) return `${m}m${pad2(s)}s`;
+  return `${s}s`;
+}
+
+/**
+ * Render one polling round of `gh pr checks` like the GitHub web UI: check
+ * name, workflow, status, start time and elapsed (total duration when the
+ * check completed, time-so-far while still pending). Pure — no network.
+ */
+export function renderPrChecksTable(options: {
+  prNumber: number | string;
+  round: number;
+  checks: readonly PrCheck[];
+  now: number;
+}): string {
+  const { prNumber, round, checks, now } = options;
+  const completed = checks.filter((c) => c.bucket !== "pending").length;
+
+  const rows = checks.map((check) => {
+    const name = check.link ? `[${check.name}](${check.link})` : check.name;
+    let elapsed = "—";
+    if (check.startedAt) {
+      const startMs = Date.parse(check.startedAt);
+      const endMs = check.completedAt ? Date.parse(check.completedAt) : now;
+      elapsed = formatDuration(Math.max(0, (endMs - startMs) / 1000));
+    }
+    const cells = [
+      `${bucketIcon(check.bucket)} ${name}`,
+      check.workflow ?? "—",
+      check.bucket,
+      check.startedAt ? formatClock(Date.parse(check.startedAt)) : "—",
+      elapsed,
+    ];
+    return `| ${cells.join(" | ")} |`;
+  });
+  const body = rows.length > 0 ? rows.join("\n") : "| _no checks reported_ | — | — | — | — |";
+
+  return (
+    `### PR #${prNumber} checks — round ${round}: ${completed}/${checks.length} complete\n\n` +
+    `| Check | Workflow | Status | Started | Elapsed |\n` +
+    `|---|---|---|---|---|\n` +
+    body
+  );
+}
+
+function sleepInterruptibly(ms: number, signal: AbortSignal | undefined): Promise<void> {
+  return new Promise((resolve, reject) => {
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(new Error("aborted while waiting for the next checks poll"));
+    };
+    const timer = setTimeout(() => {
+      signal?.removeEventListener("abort", onAbort);
+      resolve();
+    }, ms);
+    if (signal?.aborted) {
+      onAbort();
+      return;
+    }
+    signal?.addEventListener("abort", onAbort, { once: true });
+  });
+}
+
+export interface PollPrChecksOptions {
+  prNumber: number | string;
+  repo?: string;
+  failFast: boolean;
+  cwd?: string;
+  signal?: AbortSignal;
+  /** Test overrides. */
+  intervalMs?: number;
+  deadlineMs?: number;
+  onUpdate?: (msg: CiLogsResult) => void;
+}
+
+/**
+ * Poll `gh pr checks --json` until no check is pending (or a fail-fast
+ * failure, or the deadline), emitting a GitHub-UI-like table via `onUpdate`
+ * each round. In JSON mode gh exits 0 whenever it could fetch the checks —
+ * completion is judged from the `bucket` field, not the exit code. A non-zero
+ * exit (no checks reported, auth, network) is not fatal here: the caller
+ * proceeds to the Actions API verification, which either produces the final
+ * report or surfaces the error.
+ */
+export async function pollPrChecks(options: PollPrChecksOptions): Promise<void> {
+  const { prNumber, repo, failFast, cwd, signal, onUpdate } = options;
+  const intervalMs = options.intervalMs ?? CHECKS_POLL_INTERVAL_MS;
+  const deadlineMs = options.deadlineMs ?? CHECKS_WATCH_DEADLINE_MS;
+  const args = [
+    "pr",
+    "checks",
+    String(prNumber),
+    ...repoArgs(repo),
+    "--json",
+    PR_CHECKS_JSON_FIELDS,
+  ];
+
+  const watchStart = Date.now();
+  for (let round = 1; ; round++) {
+    const result = await runGh(args, { cwd, signal });
+    if (result.killed) {
+      throw new Error(
+        result.reason === "timeout" ? "gh pr checks poll timed out" : "gh pr checks was aborted",
+      );
+    }
+    if (result.code !== 0) {
+      return;
+    }
+    const checks: PrCheck[] = Value.Parse(Type.Array(prCheckSchema), JSON.parse(result.stdout));
+
+    onUpdate?.({
+      content: [
+        { type: "text", text: renderPrChecksTable({ prNumber, round, checks, now: Date.now() }) },
+      ],
+      details: {},
+    });
+
+    const hasPending = checks.some((c) => c.bucket === "pending");
+    if (!hasPending) return;
+    if (failFast && checks.some((c) => c.bucket === "fail")) return;
+    if (Date.now() - watchStart >= deadlineMs) return;
+    await sleepInterruptibly(intervalMs, signal);
+  }
+}
+
 // ── tools ────────────────────────────────────────────────────────────────────
 
 export default function ghReadonlyTools(pi: ExtensionAPI) {
@@ -1667,6 +1852,7 @@ export default function ghReadonlyTools(pi: ExtensionAPI) {
     label: "Watch GitHub PR Checks",
     description:
       "Watch CI status checks for a PR until they complete. Blocks until all checks finish or one fails. " +
+      "Each polling round streams a GitHub-UI-like check table (name, workflow, status, started, elapsed) via onUpdate. " +
       "Use this when you need to wait for CI to complete and see the final result.",
     promptSnippet: "Watch and wait for GitHub PR CI checks to complete",
     parameters: Type.Object({
@@ -1685,21 +1871,17 @@ export default function ghReadonlyTools(pi: ExtensionAPI) {
         details: {},
       });
 
-      const args = ["pr", "checks", String(number), ...repoArgs(repo), "--watch"];
-      if (fail_fast) args.push("--fail-fast");
-
-      // gh 的退出码语义不可靠：checks 失败时返回 exit 1（SilentError），挂起时
-      // 返回 exit 8（PendingError），且失败详情只在非结构化的 stdout 表格里。
-      // 因此 watch 退出后直接用 Actions API 抓取该 PR head 提交关联的所有
+      // 轮询 `gh pr checks --json`（每轮经 onUpdate 流式输出 GitHub Web UI 风格
+      // 的检查表），结束后再用 Actions API 抓取该 PR head 提交关联的所有
       // workflow job，以 job 的真实 conclusion 为准判断成功/失败。
-      const result = await runGh(args, { cwd: ctx.cwd, signal, timeout: 600_000 });
-      if (result.killed) {
-        throw new Error(
-          result.reason === "timeout"
-            ? "gh pr checks --watch timed out after 10 minutes"
-            : "gh pr checks --watch was aborted",
-        );
-      }
+      await pollPrChecks({
+        prNumber: number,
+        repo,
+        failFast: fail_fast === true,
+        cwd: ctx.cwd,
+        signal,
+        onUpdate,
+      });
 
       const effectiveRepo = await resolveRepo(repo, signal, ctx.cwd, params);
       const prOut = await ghExec(

package/src/lib/lsp/lsp.ts

@@ -425,14 +425,17 @@ export interface LspService {
   start(): void;
   /**
    * 重启指定服务器：关闭其全部 client、清除对应失败记录并解除禁用；
-   * 其余服务器不受影响。配置缓存失效，下次工具调用按当前 cwd 重新读盘。
+   * 其余服务器不受影响。配置缓存失效并立即重读盘上配置：此前运行中的该
+   * 服务器若仍存在于新配置则马上重启，未在运行的服务器保持惰性。
+   * 返回成功重启的 server id。
    */
-  reload(serverID: string): Promise<void>;
+  reload(serverID: string): Promise<string[]>;
   /**
    * 重启全部服务器（/lsp-reload 无参）：关闭所有 client、清空失败记录并
-   * 解除禁用；配置缓存失效，下次工具调用重新读盘。
+   * 解除禁用；配置缓存失效并立即重读盘上配置，此前运行中的服务器若仍存在
+   * 于新配置则马上重启。返回成功重启的 server id。
    */
-  reloadAll(): Promise<void>;
+  reloadAll(): Promise<string[]>;
   /** 已知服务器 id（running 或 broken 的去重集合），供命令补全与提示。 */
   serverIDs(): string[];
   /** 注入 status 渲染回调；传入 undefined 表示不再渲染。 */
@@ -632,49 +635,115 @@ export function createLspService(
     updateStatusText();
   }
 
+  /**
+   * 记录一次启动失败：进入 broken（冷却期内跳过）、渲染 status，并按节流
+   * 间隔主动 notify。错误上报优先走会话级 sessionNotify——不依赖触发请求
+   * 恰好携带 notify（否则 Read warm-up 等静默通道会把失败吞掉）；未注入
+   * 会话通知时退回请求级 notify 兜底。
+   */
+  function reportStartupFailure(
+    key: string,
+    serverID: string,
+    root: string,
+    cause: string,
+    notify?: ExtensionUIContext["notify"],
+  ): void {
+    const now = Date.now();
+    state.brokenFailAt.set(key, now);
+    state.servers.set(key, { serverID, root, state: "broken" });
+    updateStatusText();
+    const reporter = sessionNotify ?? notify;
+    const lastNotified = state.brokenNotifiedAt.get(key);
+    if (reporter && (lastNotified === undefined || now - lastNotified >= notifyIntervalMs)) {
+      state.brokenNotifiedAt.set(key, now);
+      reporter(
+        `LSP server "${serverID}" failed to start for ${root}: ${cause}. ` +
+          `Fix the issue or run /lsp-reload ${serverID} to retry now.`,
+        "error",
+      );
+    }
+  }
+
+  /**
+   * spawn 指定 adapter 并注册 client：同一 key 的 in-flight spawn 复用其结果，
+   * 失败进 broken（节流上报，返回 undefined），成功后注册 client / extensions /
+   * status 并确保 watcher 运行。供 getClients 与 reload 后的立即重启共用。
+   */
+  async function startClient(
+    adapter: LspServerAdapter,
+    root: string,
+    cwd: string,
+    config: ResolvedLspConfig,
+    notify?: ExtensionUIContext["notify"],
+  ): Promise<LspClient | undefined> {
+    const key = root + adapter.id;
+    const inflight = state.spawning.get(key);
+    if (inflight) return inflight;
+    const task = (async () => {
+      try {
+        const handle = await adapter.spawn(root, cwd);
+        if (!handle) {
+          reportStartupFailure(key, adapter.id, root, "binary not found", notify);
+          return;
+        }
+        const client = await create({
+          serverID: adapter.id,
+          server: handle,
+          root,
+          directory: cwd,
+          diagnosticsDebounceMs: config.diagnosticsDebounceMs,
+          diagnosticsDocumentWaitTimeoutMs:
+            adapter.diagnosticsWaitMs ?? config.diagnosticsDocumentWaitTimeoutMs,
+          diagnosticsFullWaitTimeoutMs: config.diagnosticsFullWaitTimeoutMs,
+          diagnosticsRequestTimeoutMs: config.diagnosticsRequestTimeoutMs,
+          initializeTimeoutMs: adapter.startupTimeoutMs ?? config.initializeTimeoutMs,
+          maxOpenDocuments: config.maxOpenDocuments,
+        });
+        if (state.closing || state.disabled) {
+          await client.shutdown();
+          return;
+        }
+        const duplicate = state.clients.find((c) => c.root === root && c.serverID === adapter.id);
+        if (duplicate) {
+          await client.shutdown();
+          return duplicate;
+        }
+        state.clients.push(client);
+        state.clientExtensions.set(client, adapter.extensions);
+        state.servers.set(key, { serverID: adapter.id, root, state: "running" });
+        // 启动成功：清除失败记录，之后若再次失败会立即重新上报
+        state.brokenFailAt.delete(key);
+        state.brokenNotifiedAt.delete(key);
+        updateStatusText();
+        void ensureWatcher(cwd, notify);
+        return client;
+      } catch (error) {
+        reportStartupFailure(
+          key,
+          adapter.id,
+          root,
+          error instanceof Error ? error.message : String(error),
+          notify,
+        );
+        return;
+      }
+    })();
+    state.spawning.set(key, task);
+    void task.finally(() => {
+      if (state.spawning.get(key) === task) state.spawning.delete(key);
+    });
+    return task;
+  }
+
   async function getClients(
     file: string,
     cwd: string,
     notify?: ExtensionUIContext["notify"],
     adapterFilter?: (adapter: LspServerAdapter) => boolean,
   ): Promise<LspClient[]> {
-    /**
-     * 记录一次启动失败：进入 broken（冷却期内跳过）、渲染 status，并按节流
-     * 间隔主动 notify。错误上报优先走会话级 sessionNotify——不依赖触发请求
-     * 恰好携带 notify（否则 Read warm-up 等静默通道会把失败吞掉）；未注入
-     * 会话通知时退回请求级 notify 兜底。
-     */
-    function reportStartupFailure(
-      key: string,
-      serverID: string,
-      root: string,
-      cause: string,
-    ): void {
-      const now = Date.now();
-      state.brokenFailAt.set(key, now);
-      state.servers.set(key, { serverID, root, state: "broken" });
-      updateStatusText();
-      const reporter = sessionNotify ?? notify;
-      const lastNotified = state.brokenNotifiedAt.get(key);
-      if (reporter && (lastNotified === undefined || now - lastNotified >= notifyIntervalMs)) {
-        state.brokenNotifiedAt.set(key, now);
-        reporter(
-          `LSP server "${serverID}" failed to start for ${root}: ${cause}. ` +
-            `Fix the issue or run /lsp-reload ${serverID} to retry now.`,
-          "error",
-        );
-      }
-    }
     if (state.closing || state.disabled) return [];
     if (!containsPath(file, cwd)) return [];
     const config = await currentConfig(cwd);
-    const timeout = {
-      diagnosticsDebounceMs: config.diagnosticsDebounceMs,
-      diagnosticsDocumentWaitTimeoutMs: config.diagnosticsDocumentWaitTimeoutMs,
-      diagnosticsFullWaitTimeoutMs: config.diagnosticsFullWaitTimeoutMs,
-      diagnosticsRequestTimeoutMs: config.diagnosticsRequestTimeoutMs,
-      initializeTimeoutMs: config.initializeTimeoutMs,
-    };
     const active = filterAdapters(adapters ?? createAdapters(config.servers), config);
     const extension = extname(file) || file;
     const result: LspClient[] = [];
@@ -705,65 +774,7 @@ export function createLspService(
         continue;
       }
 
-      const inflight = state.spawning.get(key);
-      if (inflight) {
-        const client = await inflight;
-        if (client) result.push(client);
-        continue;
-      }
-
-      const task = (async () => {
-        try {
-          const handle = await adapter.spawn(root, cwd);
-          if (!handle) {
-            reportStartupFailure(key, adapter.id, root, "binary not found");
-            return;
-          }
-          const client = await create({
-            serverID: adapter.id,
-            server: handle,
-            root,
-            directory: cwd,
-            ...timeout,
-            initializeTimeoutMs: adapter.startupTimeoutMs ?? timeout.initializeTimeoutMs,
-            diagnosticsDocumentWaitTimeoutMs:
-              adapter.diagnosticsWaitMs ?? timeout.diagnosticsDocumentWaitTimeoutMs,
-            maxOpenDocuments: config.maxOpenDocuments,
-          });
-          if (state.closing || state.disabled) {
-            await client.shutdown();
-            return;
-          }
-          const duplicate = state.clients.find((c) => c.root === root && c.serverID === adapter.id);
-          if (duplicate) {
-            await client.shutdown();
-            return duplicate;
-          }
-          state.clients.push(client);
-          state.clientExtensions.set(client, adapter.extensions);
-          state.servers.set(key, { serverID: adapter.id, root, state: "running" });
-          // 启动成功：清除失败记录，之后若再次失败会立即重新上报
-          state.brokenFailAt.delete(key);
-          state.brokenNotifiedAt.delete(key);
-          updateStatusText();
-          void ensureWatcher(cwd, notify);
-          return client;
-        } catch (error) {
-          reportStartupFailure(
-            key,
-            adapter.id,
-            root,
-            error instanceof Error ? error.message : String(error),
-          );
-          return;
-        }
-      })();
-      state.spawning.set(key, task);
-      void task.finally(() => {
-        if (state.spawning.get(key) === task) state.spawning.delete(key);
-      });
-
-      const client = await task;
+      const client = await startClient(adapter, root, cwd, config, notify);
       if (client) result.push(client);
     }
 
@@ -979,9 +990,43 @@ export function createLspService(
     updateStatusText();
   }
 
-  async function reload(serverID: string): Promise<void> {
+  /**
+   * reload 后立即重启此前运行中的服务器，不再等下一次工具调用。只重启新配置
+   * 中仍存在且启用的 server；无运行记录（如 /lsp-stop 之后）或配置重读失败时
+   * 不动，保持惰性 spawn。返回成功重启的 server id。
+   */
+  async function respawnRunning(serverIDs: readonly string[]): Promise<string[]> {
+    const cwd = state.cwd;
+    if (!cwd) return [];
+    let config: ResolvedLspConfig;
+    try {
+      config = await currentConfig(cwd);
+    } catch (error) {
+      sessionNotify?.(
+        `LSP reload: re-reading config failed, servers will start on the next tool call: ${
+          error instanceof Error ? error.message : String(error)
+        }`,
+        "warning",
+      );
+      return [];
+    }
+    const active = filterAdapters(adapters ?? createAdapters(config.servers), config);
+    const restarted = await Promise.all(
+      serverIDs.map(async (serverID): Promise<string | undefined> => {
+        const adapter = active.find((candidate) => candidate.id === serverID);
+        if (!adapter) return;
+        const root = serverRoot(adapter.workingDir, cwd);
+        const client = await startClient(adapter, root, cwd, config);
+        return client ? serverID : undefined;
+      }),
+    );
+    return restarted.filter((id): id is string => id !== undefined);
+  }
+
+  async function reload(serverID: string): Promise<string[]> {
+    const wasRunning = state.clients.some((client) => client.serverID === serverID);
     state.closing = true;
-    // 配置缓存失效：下次工具调用按当前 cwd 重新读盘，让配置修改生效
+    // 配置缓存失效：立即重读盘上配置，让配置修改生效
     state.config = undefined;
     state.configCwd = undefined;
     const targets = state.clients.filter((client) => client.serverID === serverID);
@@ -1000,9 +1045,12 @@ export function createLspService(
     state.closing = false;
     state.disabled = false;
     updateStatusText();
+    if (!wasRunning) return [];
+    return respawnRunning([serverID]);
   }
 
-  async function reloadAll(): Promise<void> {
+  async function reloadAll(): Promise<string[]> {
+    const runningIDs = [...new Set(state.clients.map((client) => client.serverID))];
     state.closing = true;
     state.config = undefined;
     state.configCwd = undefined;
@@ -1018,6 +1066,7 @@ export function createLspService(
     state.closing = false;
     state.disabled = false;
     updateStatusText();
+    return respawnRunning(runningIDs);
   }
 
   function serverIDs(): string[] {
@@ -1211,13 +1260,20 @@ export function createLspManager(
       const serverID = args.trim();
       if (!serverID) {
         // 无参：重读配置并重启全部服务器
-        await service.reloadAll();
-        ctx.ui.notify("LSP reloaded: all servers will restart on the next tool call", "info");
+        const restarted = await service.reloadAll();
+        ctx.ui.notify(
+          restarted.length > 0
+            ? `LSP reloaded: ${restarted.toSorted().join(", ")} restarted`
+            : "LSP reloaded: servers will restart on the next tool call",
+          "info",
+        );
         return;
       }
-      await service.reload(serverID);
+      const restarted = await service.reload(serverID);
       ctx.ui.notify(
-        `LSP server "${serverID}" reloaded: will restart on the next tool call`,
+        restarted.length > 0
+          ? `LSP server "${serverID}" reloaded`
+          : `LSP server "${serverID}" reloaded: will restart on the next tool call`,
         "info",
       );
     },