@klarkxy/dsh-dev-index 0.2.5 → 0.2.6

package/README.md

@@ -25,6 +25,7 @@ Replace `web` with your profile name and restart the profile.
 - The website follows the latest DSH release, which may differ from the version you run.
 - npm metadata is not proof that a plugin works with your DSH.
 - GitHub data comes from your local signed-in gh CLI or anonymous API access (a small hourly quota); the plugin stores no GitHub credentials. Manifest-based code search is only available when gh is signed in.
+- Cancelling the last request using a GitHub CLI check waits for that check to stop. Unloading the plugin waits for its active GitHub requests and CLI processes to finish.
 
 ## Install from GitHub
 

package/README.zh-CN.md

@@ -25,6 +25,7 @@ dsh plugin --profile web add @klarkxy/dsh-dev-index
 - 官网对应最新发布的 DSH，可能与你正在使用的版本不同。
 - npm 元数据不能证明插件与你的 DSH 兼容。
 - GitHub 数据来自本机已登录的 gh CLI 或匿名 API（匿名额度有限，约每小时几十次请求）；插件不保存任何 GitHub 凭据。按 `dsh.plugin.json` 清单的代码搜索只有在 gh 已登录时可用。
+- 取消最后一个使用 GitHub CLI 检查的请求时，会等待检查停止；卸载插件会等待正在进行的 GitHub 请求和 CLI 进程结束。
 
 ## 从 GitHub 安装
 

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "@klarkxy/dsh-dev-index",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "main": "lib/index.js",
   "description": "DSH Docs: read the official DSH documentation in the Plugins page; Creator mode searches docs and checks plugin metadata on npm and GitHub with native tools.",
   "engines": {

package/lib/gh.js

@@ -1,7 +1,7 @@
 import { access } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { delimiter, join } from "node:path";
-import { runCli } from "@klarkxy/dsh-plugin-kit/cli-process";
+import { cliEnvironment, runCli } from "@klarkxy/dsh-plugin-kit/cli-process";
 // gh api and gh auth status are long-stable subcommands; the floor only rejects
 // truly ancient binaries.
 export const MIN_GH_VERSION = [2, 0, 0];
@@ -28,7 +28,7 @@ export async function findGh(deps = {}) {
             const candidate = join(dir, file);
             try {
                 await access(candidate);
-                return { command: candidate, displayPath: candidate };
+                return { command: candidate, displayPath: candidate, env: cliEnvironment(process.env, ["GH_TOKEN", "GITHUB_TOKEN", "GH_ENTERPRISE_TOKEN", "GITHUB_ENTERPRISE_TOKEN", "GH_HOST", "GH_CONFIG_DIR"]) };
             }
             catch { /* keep looking */ }
         }

package/lib/github.d.ts

@@ -37,7 +37,9 @@ export declare class GitHubClient {
     private readonly run;
     private readonly discoverProbe;
     constructor(deps?: GitHubDeps);
-    dispose(): void;
+    private readonly work;
+    private track;
+    dispose(): Promise<void>;
     private abandonProbe;
     private ghBroken;
     private merged;

package/lib/github.js

@@ -262,9 +262,19 @@ export class GitHubClient {
         this.run = deps.run ?? runCli;
         this.discoverProbe = deps.discover ?? ((signal) => probeGh({ run: this.run }, signal));
     }
-    dispose() {
+    work = new Set();
+    track(work) {
+        this.work.add(work);
+        void work.then(() => this.work.delete(work), () => this.work.delete(work));
+        return work;
+    }
+    async dispose() {
         this.lifetime.abort();
+        this.confirmedProbe = undefined;
         this.abandonProbe(this.pendingProbe);
+        // Includes abandoned probes: their caller may already have stopped waiting.
+        while (this.work.size)
+            await Promise.allSettled([...this.work]);
     }
     // Detach and cancel a probe nobody wants any more, releasing its listener. Its
     // late resolution is rejected by the publish gate in startProbe.
@@ -288,8 +298,8 @@ export class GitHubClient {
     merged(signal) {
         return AbortSignal.any([this.lifetime.signal, AbortSignal.timeout(REQUEST_TIMEOUT_MS), ...(signal ? [signal] : [])]);
     }
-    // Resolve gh for one caller: join the shared probe, but reject as soon as this
-    // caller's own signal or the client lifetime aborts. An already-aborted caller
+    // Resolve gh for one caller: a peer can keep the shared probe alive, while
+    // the final cancelled waiter must await cleanup. An already-aborted caller
     // never spawns discovery. The throw runs inside the promise so no caller can
     // observe a partially started probe.
     probe(signal) {
@@ -298,8 +308,9 @@ export class GitHubClient {
             if (this.confirmedProbe)
                 return this.confirmedProbe;
             const pending = this.pendingProbe ?? this.startProbe();
-            pending.waiters += 1;
-            return this.awaitProbe(pending, signal);
+            const waiter = { signal };
+            pending.waiters.add(waiter);
+            return this.awaitProbe(pending, waiter);
         });
     }
     startProbe() {
@@ -309,7 +320,7 @@ export class GitHubClient {
         // probes do not accumulate listeners on the lifetime signal.
         this.lifetime.signal.addEventListener("abort", onLifetimeAbort, { once: true });
         const probe = {
-            controller, waiters: 0, promise: Promise.resolve(null), onLifetimeAbort,
+            controller, waiters: new Set(), promise: Promise.resolve(null), onLifetimeAbort,
         };
         // Discovery runs inside the promise chain so a synchronous throw is folded
         // into the same catch/finally: the listener is always released, pendingProbe
@@ -322,7 +333,8 @@ export class GitHubClient {
             .then((found) => {
             // Publish only from the current, live probe: an abandoned, cancelled or
             // disposed probe may still resolve late and must not overwrite the cache.
-            if (found && this.pendingProbe === probe && !controller.signal.aborted && !this.lifetime.signal.aborted) {
+            if (found && this.pendingProbe === probe && !controller.signal.aborted && !this.lifetime.signal.aborted
+                && [...probe.waiters].some(waiter => !waiter.signal.aborted)) {
                 this.confirmedProbe = found;
             }
             return found;
@@ -334,12 +346,14 @@ export class GitHubClient {
                 this.pendingProbe = undefined;
         });
         this.pendingProbe = probe;
+        this.track(probe.promise);
         return probe;
     }
     // Race the shared probe against this caller's cancellation. A null result falls
-    // through to anonymous access as before. Leaving early decrements the waiter
-    // count; the last one out abandons the probe, while a peer keeps it alive.
-    async awaitProbe(probe, signal) {
+    // through to anonymous access as before. The last cancelled waiter abandons
+    // and drains the probe, while a peer keeps it alive.
+    async awaitProbe(probe, waiter) {
+        const { signal } = waiter;
         let onAbort;
         let settled = false;
         try {
@@ -357,9 +371,11 @@ export class GitHubClient {
         finally {
             if (onAbort)
                 signal.removeEventListener("abort", onAbort);
-            probe.waiters -= 1;
-            if (!settled && probe.waiters <= 0)
+            probe.waiters.delete(waiter);
+            if (!settled && probe.waiters.size === 0) {
                 this.abandonProbe(probe);
+                await probe.promise;
+            }
         }
     }
     async request(path, signal) {
@@ -369,14 +385,14 @@ export class GitHubClient {
         merged.throwIfAborted();
         if (probe) {
             try {
-                return { data: await this.viaGh(probe.executable, path, signal), transport: "gh" };
+                return { data: await this.track(this.viaGh(probe.executable, path, signal)), transport: "gh" };
             }
             catch (error) {
                 if (!this.ghBroken(error))
                     throw error;
             }
         }
-        return { data: await this.viaHttp(path, signal), transport: "anonymous" };
+        return { data: await this.track(this.viaHttp(path, signal)), transport: "anonymous" };
     }
     async viaGh(executable, path, signal) {
         const merged = this.merged(signal);
@@ -393,6 +409,7 @@ export class GitHubClient {
             }
             throw error;
         }
+        merged.throwIfAborted();
         if (result.exitCode !== 0)
             throw classifyGhFailure(result.stderr);
         try {
@@ -521,7 +538,7 @@ export class GitHubClient {
         const path = `search/code?q=${encodeURIComponent(query)}&per_page=${PER_PAGE}&page=${page}`;
         let data;
         try {
-            data = await this.viaGh(probe.executable, path, signal);
+            data = await this.track(this.viaGh(probe.executable, path, signal));
         }
         catch (error) {
             this.ghBroken(error); // code search has no anonymous lane, but the next call re-probes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@klarkxy/dsh-dev-index",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "DSH Docs: read the official DSH documentation in the Plugins page; Creator mode searches docs and checks plugin metadata on npm and GitHub with native tools.",
   "icon": "./icon.svg",
   "keywords": [
@@ -24,7 +24,7 @@
     "url": "https://github.com/klarkxy"
   },
   "type": "module",
-  "packageManager": "pnpm@10.29.2",
+  "packageManager": "pnpm@11.28.5",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "exports": {
@@ -80,7 +80,7 @@
     "@deepseek-ai/dsh-tools": ">=0.2.0-rc.2"
   },
   "dependencies": {
-    "@klarkxy/dsh-plugin-kit": "0.3.4"
+    "@klarkxy/dsh-plugin-kit": "0.4.0"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/dsh-agent-preset-registry": {
@@ -91,22 +91,28 @@
     },
     "@deepseek-ai/dsh-tools": {
       "optional": true
+    },
+    "@deepseek-ai/cordis": {
+      "optional": true
+    },
+    "@deepseek-ai/schemastery": {
+      "optional": true
     }
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "4.0.4",
-    "@deepseek-ai/schemastery": "3.18.4",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-agent-preset-registry": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-system-prompt": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-tools": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-scope": "0.2.0-rc.2"
+    "@deepseek-ai/cordis": "4.0.5",
+    "@deepseek-ai/schemastery": "3.18.5",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.2.1-rc.1",
+    "@deepseek-ai/dsh-agent-preset-registry": "0.2.1-rc.1",
+    "@deepseek-ai/dsh-system-prompt": "0.2.1-rc.1",
+    "@deepseek-ai/dsh-tools": "0.2.1-rc.1",
+    "@deepseek-ai/dsh-scope": "0.2.1-rc.1"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
   "dshRelease": {
-    "contentHash": "293f3ffa69fb67d90c06419890c9fe2f0dbada1df9fc818cc2d3a2be9ab24485"
+    "contentHash": "377d5037bbd8893b148874afb94991f8b493eeeb7b00a60c4ea19fbe4a5a1926"
   }
 }