dsh-code 1.0.7 → 1.2.0

package/src/version.ts

@@ -1,6 +1,7 @@
 /** Installed dsh-code version exposed by the terminal header. */
 
-import { readFileSync } from 'node:fs'
+import { readFileSync, realpathSync } from 'node:fs'
+import { createRequire } from 'node:module'
 import { dirname, join, resolve } from 'node:path'
 
 /** Read one package manifest version without making terminal startup depend on it. */
@@ -22,27 +23,28 @@ const DSH_HOST_PACKAGE_NAME = '@deepseek-ai/dsh'
 /** Parent levels above the host entry allowed to hold its package manifest. */
 const DSH_HOST_WALK_LIMIT = 4
 
-/**
- * Resolve the running dsh CLI host's version from its entry file
- * (`process.argv[1]`, e.g. `.../@deepseek-ai/dsh/lib/bin.js`). Only a manifest
- * literally named `@deepseek-ai/dsh` counts, so an unrelated entry (vitest, a
- * plain node script) resolves to undefined instead of faking a kernel version.
- */
-export function resolveDshHostVersion(entry: string | undefined = process.argv[1]): string | undefined {
-  if (entry === undefined || entry === '') return undefined
+/** Read `@deepseek-ai/dsh`'s version from a directory's package.json, or undefined. */
+function readHostVersion(directory: string): string | undefined {
+  try {
+    const parsed = JSON.parse(readFileSync(join(directory, 'package.json'), 'utf8')) as {
+      name?: unknown
+      version?: unknown
+    }
+    if (parsed.name === DSH_HOST_PACKAGE_NAME && typeof parsed.version === 'string' && parsed.version.length > 0) {
+      return parsed.version
+    }
+  } catch {
+    // No readable host manifest at this level.
+  }
+  return undefined
+}
+
+/** Climb from an entry file toward a host package.json. */
+function walkFrom(entry: string): string | undefined {
   let directory = dirname(resolve(entry))
   for (let depth = 0; depth < DSH_HOST_WALK_LIMIT; depth += 1) {
-    try {
-      const parsed = JSON.parse(readFileSync(join(directory, 'package.json'), 'utf8')) as {
-        name?: unknown
-        version?: unknown
-      }
-      if (parsed.name === DSH_HOST_PACKAGE_NAME && typeof parsed.version === 'string' && parsed.version.length > 0) {
-        return parsed.version
-      }
-    } catch {
-      // No readable manifest at this level: keep climbing.
-    }
+    const version = readHostVersion(directory)
+    if (version !== undefined) return version
     const parent = dirname(directory)
     if (parent === directory) return undefined
     directory = parent
@@ -50,6 +52,42 @@ export function resolveDshHostVersion(entry: string | undefined = process.argv[1
   return undefined
 }
 
+/**
+ * Resolve the host package via Node's module lookup from an entry file.
+ * Covers global `bin/dsh` shims that are not inside the package tree.
+ */
+function resolveFromNode(from: string): string | undefined {
+  try {
+    const manifest = createRequire(from).resolve(`${DSH_HOST_PACKAGE_NAME}/package.json`)
+    return readHostVersion(dirname(manifest))
+  } catch {
+    return undefined
+  }
+}
+
+/**
+ * Resolve the running dsh CLI host's version from its entry file
+ * (`process.argv[1]`, e.g. `.../@deepseek-ai/dsh/lib/bin.js` or a PATH
+ * symlink `.../bin/dsh` → that file). Only a manifest literally named
+ * `@deepseek-ai/dsh` counts, so an unrelated entry (vitest, a plain node
+ * script) resolves to undefined instead of faking a kernel version.
+ */
+export function resolveDshHostVersion(entry: string | undefined = process.argv[1]): string | undefined {
+  if (entry === undefined || entry === '') return undefined
+  const fromWalk = walkFrom(entry)
+  if (fromWalk !== undefined) return fromWalk
+  try {
+    const real = realpathSync(entry)
+    if (real !== resolve(entry)) {
+      const fromReal = walkFrom(real)
+      if (fromReal !== undefined) return fromReal
+    }
+  } catch {
+    // Broken or missing symlink: fall through to Node resolution.
+  }
+  return resolveFromNode(resolve(entry))
+}
+
 let cachedDshKernelVersion: string | undefined
 let dshKernelVersionResolved = false
 

package/src/whale-glyph.ts

@@ -1,23 +1,23 @@
-// GENERATED by scripts/gen-whale-glyph.ts — do not edit by hand. Rerun the
-// generator after changing the FishLogo path. Half-block rendering of the
-// DeepSeek fish logo (figma I39:24057;88:8943 fillGeometry, exact extract;
-// native 23.16x17.04 → 26 columns × 8 half-block rows).
-// Blank cells are part of the glyph's fixed 26-column grid: pad, never trim.
-
-/** Half-block whale glyph rows; render with the brand color. */
-export const WHALE_GLYPH: readonly string[] = [
-  '    ▄▄▄▄▄▄▄▄█    ▄█▄     ▄',
-  ' ▄▄██████████▄▄  ▀███▄████',
-  '▄███████████████▄  ███▀▀▀ ',
-  '██     ▀▀█████▄▀██████    ',
-  '██▄       ▀████▄▄████     ',
-  ' ██▄        ▀██████▀      ',
-  '  ▀██▄▄  ██▄  ▀███▄▄      ',
-  '     ▀▀███████▀▀ ▀▀▀      ',
-]
-
-/** Fixed glyph width in terminal columns. */
-export const WHALE_GLYPH_COLUMNS = 26
-
-/** Fixed glyph height in half-block rows. */
-export const WHALE_GLYPH_ROWS = 8
+// GENERATED by scripts/gen-whale-glyph.ts — do not edit by hand. Rerun the
+// generator after changing the FishLogo path. Half-block rendering of the
+// DeepSeek fish logo (figma I39:24057;88:8943 fillGeometry, exact extract;
+// native 23.16x17.04 → 26 columns × 8 half-block rows).
+// Blank cells are part of the glyph's fixed 26-column grid: pad, never trim.
+
+/** Half-block whale glyph rows; render with the brand color. */
+export const WHALE_GLYPH: readonly string[] = [
+  '    ▄▄▄▄▄▄▄▄█    ▄█▄     ▄',
+  ' ▄▄██████████▄▄  ▀███▄████',
+  '▄███████████████▄  ███▀▀▀ ',
+  '██     ▀▀█████▄▀██████    ',
+  '██▄       ▀████▄▄████     ',
+  ' ██▄        ▀██████▀      ',
+  '  ▀██▄▄  ██▄  ▀███▄▄      ',
+  '     ▀▀███████▀▀ ▀▀▀      ',
+]
+
+/** Fixed glyph width in terminal columns. */
+export const WHALE_GLYPH_COLUMNS = 26
+
+/** Fixed glyph height in half-block rows. */
+export const WHALE_GLYPH_ROWS = 8