@lihuu/dsh-about 0.1.2 → 0.1.3

package/README.md

@@ -14,11 +14,19 @@ A [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) plugin tha
 
 ## Install
 
+The package is a **bundle**: it ships its own configuration layer, so installing it into a profile activates the plugin automatically.
+
 ```sh
 dsh plugin --profile web add @lihuu/dsh-about
 ```
 
-Restart the web service, then open **Settings → About** in the GUI.
+`dsh plugin add` appends the bundle to the profile's layer stack (`dsh.profile.bundles`), and the bundle's patch file mounts the plugin row. No manual patch editing is needed.
+
+> If you previously mounted this plugin by hand (a `dsh-about` row in `~/.dsh/cordis.patch.yml`), remove that row before installing the bundle — the duplicate row id fails the boot.
+
+Restart the web service once after installing (bundle layers are composed at boot). Later edits to your own patch files hot-reload on profiles with `patchReload: live`.
+
+Then open **Settings → About** in the GUI.
 
 ## License
 

package/cordis.patch.yml

@@ -0,0 +1,6 @@
+# The dsh-about bundle patch: mounts the About page plugin row.
+# Applied as a profile layer when the profile lists this bundle; the row
+# references the package by name so Node resolution finds the installed code.
+- insert:
+    - id: dsh-about
+      name: '@lihuu/dsh-about'

package/lib/client.js

@@ -1,8 +1,8 @@
 /**
  * dsh-about — independent "About" settings section (BROWSER half).
  *
- * Plain-JS client bundle served as `/plugins/@local/dsh-about/client.js`.
- * Registers the "关于" page into the settings.section list slot and resolves
+ * Plain-JS client bundle served as `/plugins/@lihuu/dsh-about/client.js`.
+ * Registers the "About" page into the settings.section list slot and resolves
  * the running version + build date through the host's runtime Typert Remote
  * endpoint `aboutInfo/get` via the generic `/api` RPC channel — no generated
  * artifacts, no main-repo changes.

package/lib/index.d.ts

@@ -3,12 +3,11 @@
  * (HOST half).
  *
  * Provides the `aboutInfo` Typert Remote service: the browser half's settings
- * "关于" page resolves the running version and build date through the runtime
+ * "About" page resolves the running version and build date through the runtime
  * `aboutInfo/get` endpoint. The host gateway (`dsh-api-gateway`) dispatches
  * `/api/aboutInfo/get` to this live service via source-mode discovery
- * (`typertRemote` binding + `Remote` markers), so NO compile-time generated
- * artifacts and NO main-repo changes are involved: the whole feature mounts as
- * an installable `@local` plugin.
+ * (`typertRemote` binding + `Remote` markers), so no compile-time generated
+ * artifacts and no main-repo changes are involved.
  *
  * @module dsh-about
  */
@@ -18,9 +17,9 @@ import { TypertRemoteService } from '@deepseek-ai/dsh-typert-protocol';
 export declare const name = "dsh-about";
 /** The about payload the settings page renders. */
 export interface AboutInfo {
-    /** Running version, read from apps/cli/package.json. */
+    /** Running version, read from the dsh CLI's package.json. */
     readonly version: string;
-    /** Build date, from the built CLI's mtime. */
+    /** Build date, from the built CLI entry's mtime. */
     readonly buildDate: string;
 }
 /**
@@ -37,7 +36,7 @@ export declare class AboutInfoService extends TypertRemoteService {
     constructor(ctx: Context);
     /**
      * Read the running version and build date.
-     * @Remote('get') — invoked by the host gateway in source mode.
+     * @Remote('get') — invoked by the host gateway.
      * @returns version + build date; unknown fields degrade to 'unknown'.
      */
     get(): Promise<AboutInfo>;

package/lib/index.js

@@ -3,12 +3,11 @@
  * (HOST half).
  *
  * Provides the `aboutInfo` Typert Remote service: the browser half's settings
- * "关于" page resolves the running version and build date through the runtime
+ * "About" page resolves the running version and build date through the runtime
  * `aboutInfo/get` endpoint. The host gateway (`dsh-api-gateway`) dispatches
  * `/api/aboutInfo/get` to this live service via source-mode discovery
- * (`typertRemote` binding + `Remote` markers), so NO compile-time generated
- * artifacts and NO main-repo changes are involved: the whole feature mounts as
- * an installable `@local` plugin.
+ * (`typertRemote` binding + `Remote` markers), so no compile-time generated
+ * artifacts and no main-repo changes are involved.
  *
  * @module dsh-about
  */
@@ -46,17 +45,56 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
+import { realpathSync } from 'node:fs';
+import { dirname, join } from 'node:path';
 import { TypertRemoteService, Remote } from '@deepseek-ai/dsh-typert-protocol';
 /** Stable plugin row name (used by the cordis loader entry). */
 export const name = 'dsh-about';
 /**
- * Harness source checkout this deployment runs from. Read from `$DSH_REPO`
- * (the launchd env.sh exports it) so the plugin carries no machine-specific
- * path; falls back to the process working directory, which is the repo root
- * when dsh is launched from its checkout. A wrong value degrades to 'unknown'
- * via the try/catch below.
+ * Absolute paths of the running dsh CLI's package.json, most specific first.
+ * Mirrors the CLI's own version resolution (`../package.json` relative to its
+ * entry script) so any install layout resolves: a source checkout exporting
+ * `$DSH_REPO`, the running CLI entry (`process.argv[1]`, symlink-resolved for
+ * npm-installed bins), or a source checkout launched from its root.
  */
-const REPO = process.env.DSH_REPO ?? process.cwd();
+function cliManifestCandidates() {
+    const candidates = [];
+    const repo = process.env.DSH_REPO;
+    if (repo !== undefined)
+        candidates.push(join(repo, 'apps/cli/package.json'));
+    const entry = process.argv[1];
+    if (entry !== undefined) {
+        try {
+            candidates.push(join(dirname(realpathSync(entry)), '../package.json'));
+        }
+        catch {
+            // entry path unresolvable — try the remaining candidates
+        }
+    }
+    candidates.push(join(process.cwd(), 'apps/cli/package.json'));
+    return candidates;
+}
+/**
+ * Absolute paths of the running dsh CLI's built entry file, most specific
+ * first; its mtime is the build date.
+ */
+function cliEntryCandidates() {
+    const candidates = [];
+    const entry = process.argv[1];
+    if (entry !== undefined) {
+        try {
+            candidates.push(realpathSync(entry));
+        }
+        catch {
+            // entry path unresolvable — try the remaining candidates
+        }
+    }
+    const repo = process.env.DSH_REPO;
+    if (repo !== undefined)
+        candidates.push(join(repo, 'apps/cli/lib/bin.js'));
+    candidates.push(join(process.cwd(), 'apps/cli/lib/bin.js'));
+    return candidates;
+}
 /**
  * About info remote service. Registered under `aboutInfo`; the `get` method is
  * the single `@Remote` endpoint the browser half calls through
@@ -85,36 +123,43 @@ let AboutInfoService = (() => {
         }
         /**
          * Read the running version and build date.
-         * @Remote('get') — invoked by the host gateway in source mode.
+         * @Remote('get') — invoked by the host gateway.
          * @returns version + build date; unknown fields degrade to 'unknown'.
          */
         async get() {
             let version = 'unknown';
             let buildDate = 'unknown';
             if (this.fs !== undefined) {
-                try {
-                    const target = await this.fs.resolve(`${REPO}/apps/cli/package.json`);
-                    const text = await this.fs.readText(target);
-                    const m = text.match(/"version"\s*:\s*"([^"]+)"/);
-                    if (m !== null)
-                        version = m[1];
-                }
-                catch {
-                    // fs unavailable or read failed — keep 'unknown'
+                for (const manifest of cliManifestCandidates()) {
+                    try {
+                        const target = await this.fs.resolve(manifest);
+                        const text = await this.fs.readText(target);
+                        const m = text.match(/"version"\s*:\s*"([^"]+)"/);
+                        if (m !== null) {
+                            version = m[1];
+                            break;
+                        }
+                    }
+                    catch {
+                        // candidate unreadable — try the next one
+                    }
                 }
             }
             if (this.shell !== undefined) {
-                try {
-                    const spec = this.shell.resolve({
-                        command: `stat -f "%Sm" -t "%Y-%m-%d %H:%M" ${REPO}/apps/cli/lib/bin.js`,
-                    });
-                    const result = await this.shell.run(spec);
-                    const out = result.stdout.text.trim();
-                    if (out !== '')
-                        buildDate = out;
-                }
-                catch {
-                    // shell unavailable or stat failed — keep 'unknown'
+                const flag = process.platform === 'darwin' ? '-f "%Sm" -t "%Y-%m-%d %H:%M"' : '-c "%y"';
+                for (const entry of cliEntryCandidates()) {
+                    try {
+                        const spec = this.shell.resolve({ command: `stat ${flag} "${entry}"` });
+                        const result = await this.shell.run(spec);
+                        const out = result.stdout.text.trim();
+                        if (out !== '') {
+                            buildDate = out;
+                            break;
+                        }
+                    }
+                    catch {
+                        // candidate unstat-able — try the next one
+                    }
                 }
             }
             return { version, buildDate };

package/package.json

@@ -1,22 +1,30 @@
 {
   "name": "@lihuu/dsh-about",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "DeepSeek Harness plugin: adds an About page to the web GUI settings showing the running version and build date.",
   "type": "module",
   "main": "lib/index.js",
   "exports": {
     ".": "./lib/index.js",
     "./client": "./lib/client.js",
+    "./cordis.patch.yml": "./cordis.patch.yml",
     "./package.json": "./package.json"
   },
   "dsh": {
     "client": {
       "platform": "web"
+    },
+    "bundle": {
+      "patch": "./cordis.patch.yml"
     }
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "files": [
     "lib",
     "src",
+    "cordis.patch.yml",
     "README.md"
   ],
   "scripts": {

package/src/index.ts

@@ -3,16 +3,17 @@
  * (HOST half).
  *
  * Provides the `aboutInfo` Typert Remote service: the browser half's settings
- * "关于" page resolves the running version and build date through the runtime
+ * "About" page resolves the running version and build date through the runtime
  * `aboutInfo/get` endpoint. The host gateway (`dsh-api-gateway`) dispatches
  * `/api/aboutInfo/get` to this live service via source-mode discovery
- * (`typertRemote` binding + `Remote` markers), so NO compile-time generated
- * artifacts and NO main-repo changes are involved: the whole feature mounts as
- * an installable `@local` plugin.
+ * (`typertRemote` binding + `Remote` markers), so no compile-time generated
+ * artifacts and no main-repo changes are involved.
  *
  * @module dsh-about
  */
 
+import { realpathSync } from 'node:fs'
+import { dirname, join } from 'node:path'
 import type { Context } from '@deepseek-ai/cordis'
 import { TypertRemoteService, Remote } from '@deepseek-ai/dsh-typert-protocol'
 
@@ -21,9 +22,9 @@ export const name = 'dsh-about'
 
 /** The about payload the settings page renders. */
 export interface AboutInfo {
-  /** Running version, read from apps/cli/package.json. */
+  /** Running version, read from the dsh CLI's package.json. */
   readonly version: string
-  /** Build date, from the built CLI's mtime. */
+  /** Build date, from the built CLI entry's mtime. */
   readonly buildDate: string
 }
 
@@ -43,13 +44,47 @@ interface ShellLike {
 }
 
 /**
- * Harness source checkout this deployment runs from. Read from `$DSH_REPO`
- * (the launchd env.sh exports it) so the plugin carries no machine-specific
- * path; falls back to the process working directory, which is the repo root
- * when dsh is launched from its checkout. A wrong value degrades to 'unknown'
- * via the try/catch below.
+ * Absolute paths of the running dsh CLI's package.json, most specific first.
+ * Mirrors the CLI's own version resolution (`../package.json` relative to its
+ * entry script) so any install layout resolves: a source checkout exporting
+ * `$DSH_REPO`, the running CLI entry (`process.argv[1]`, symlink-resolved for
+ * npm-installed bins), or a source checkout launched from its root.
  */
-const REPO = process.env.DSH_REPO ?? process.cwd()
+function cliManifestCandidates(): string[] {
+  const candidates: string[] = []
+  const repo = process.env.DSH_REPO
+  if (repo !== undefined) candidates.push(join(repo, 'apps/cli/package.json'))
+  const entry = process.argv[1]
+  if (entry !== undefined) {
+    try {
+      candidates.push(join(dirname(realpathSync(entry)), '../package.json'))
+    } catch {
+      // entry path unresolvable — try the remaining candidates
+    }
+  }
+  candidates.push(join(process.cwd(), 'apps/cli/package.json'))
+  return candidates
+}
+
+/**
+ * Absolute paths of the running dsh CLI's built entry file, most specific
+ * first; its mtime is the build date.
+ */
+function cliEntryCandidates(): string[] {
+  const candidates: string[] = []
+  const entry = process.argv[1]
+  if (entry !== undefined) {
+    try {
+      candidates.push(realpathSync(entry))
+    } catch {
+      // entry path unresolvable — try the remaining candidates
+    }
+  }
+  const repo = process.env.DSH_REPO
+  if (repo !== undefined) candidates.push(join(repo, 'apps/cli/lib/bin.js'))
+  candidates.push(join(process.cwd(), 'apps/cli/lib/bin.js'))
+  return candidates
+}
 
 /**
  * About info remote service. Registered under `aboutInfo`; the `get` method is
@@ -71,7 +106,7 @@ export class AboutInfoService extends TypertRemoteService {
 
   /**
    * Read the running version and build date.
-   * @Remote('get') — invoked by the host gateway in source mode.
+   * @Remote('get') — invoked by the host gateway.
    * @returns version + build date; unknown fields degrade to 'unknown'.
    */
   @Remote('get')
@@ -80,26 +115,35 @@ export class AboutInfoService extends TypertRemoteService {
     let buildDate = 'unknown'
 
     if (this.fs !== undefined) {
-      try {
-        const target = await this.fs.resolve(`${REPO}/apps/cli/package.json`)
-        const text = await this.fs.readText(target)
-        const m = text.match(/"version"\s*:\s*"([^"]+)"/)
-        if (m !== null) version = m[1]
-      } catch {
-        // fs unavailable or read failed — keep 'unknown'
+      for (const manifest of cliManifestCandidates()) {
+        try {
+          const target = await this.fs.resolve(manifest)
+          const text = await this.fs.readText(target)
+          const m = text.match(/"version"\s*:\s*"([^"]+)"/)
+          if (m !== null) {
+            version = m[1]
+            break
+          }
+        } catch {
+          // candidate unreadable — try the next one
+        }
       }
     }
 
     if (this.shell !== undefined) {
-      try {
-        const spec = this.shell.resolve({
-          command: `stat -f "%Sm" -t "%Y-%m-%d %H:%M" ${REPO}/apps/cli/lib/bin.js`,
-        })
-        const result = await this.shell.run(spec)
-        const out = result.stdout.text.trim()
-        if (out !== '') buildDate = out
-      } catch {
-        // shell unavailable or stat failed — keep 'unknown'
+      const flag = process.platform === 'darwin' ? '-f "%Sm" -t "%Y-%m-%d %H:%M"' : '-c "%y"'
+      for (const entry of cliEntryCandidates()) {
+        try {
+          const spec = this.shell.resolve({ command: `stat ${flag} "${entry}"` })
+          const result = await this.shell.run(spec)
+          const out = result.stdout.text.trim()
+          if (out !== '') {
+            buildDate = out
+            break
+          }
+        } catch {
+          // candidate unstat-able — try the next one
+        }
       }
     }