dsh-session-manager 0.7.2 → 0.7.4

package/lib/compat/dsh-adapter.js

@@ -8,18 +8,50 @@
  * @module dsh-session-manager/compat/dsh-adapter
  */
 import { createRequire } from "node:module";
-import { readFileSync } from "node:fs";
-import { join } from "node:path";
+import { existsSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join, resolve } from "node:path";
 
 const require = createRequire(import.meta.url);
 
+/** Expand a leading `~` / `~/` / `~\` against the OS home, matching
+ * `@deepseek-ai/dsh-home-paths` `expandHomePath`. */
+function expandHomePath(path) {
+  if (path === "~") return homedir();
+  if (path.startsWith("~/") || path.startsWith("~\\")) return join(homedir(), path.slice(2));
+  return path;
+}
+
+/**
+ * Resolve the DSH home without the `dshHomePath` service. DSH 0.2.x resolves
+ * the harness home exclusively through `resolveDshHome()`: `$DSH_HOME` when
+ * set and non-blank, otherwise `~/.dsh`; the value is tilde-expanded and
+ * resolved to an absolute path. Mirror that order so a plugin scope that
+ * cannot see the root-context service still lands on the same directory.
+ */
+function fallbackDshHome() {
+  const raw = typeof process.env.DSH_HOME === "string" ? process.env.DSH_HOME.trim() : "";
+  const selected = raw.length > 0 ? expandHomePath(raw) : join(homedir(), ".dsh");
+  return resolve(selected);
+}
+
+/** Same calling convention as the official `dshHomePath(...segments)`. */
+function fallbackHomePath(...segments) {
+  return join(fallbackDshHome(), ...segments);
+}
 /** Pull one service out of the Cordis ctx, tolerating direct property fallbacks. */
-function getService(ctx, name) {
+export function getService(ctx, name) {
   try {
-    const value = typeof ctx?.get === "function" ? ctx.get(name) : undefined;
-    if (value !== undefined) return value;
-  } catch { /* fall through to the legacy direct property */ }
-  return ctx && ctx[name];
+    if (typeof ctx?.get === "function") {
+      const value = ctx.get(name);
+      if (value !== undefined) return value;
+    }
+  } catch { /* ignore */ }
+  try {
+    return ctx && ctx[name];
+  } catch {
+    return undefined;
+  }
 }
 
 /** Read one package's version from its package.json if resolvable from this plugin. */
@@ -151,7 +183,15 @@ export function createDshAdapter(ctx) {
     get persistence() { return getService(ctx, "sessionPersistence"); },
     get agentPresets() { return getService(ctx, "agentPresets"); },
     get projectionCache() { return getService(ctx, "sessionProjectionCache"); },
-    get homePath() { return getService(ctx, "dshHomePath"); },
+    get homePath() {
+      // DSH 0.2.x provides `dshHomePath` on the root context (app-boot), but a
+      // plugin scope may not resolve it; without a fallback every disk-backed
+      // path (sessions scan, annotation store, workspace archive store) is
+      // lost. Fall back to the official home resolution instead.
+      const served = getService(ctx, "dshHomePath");
+      if (typeof served === "function") return served;
+      return fallbackHomePath;
+    },
     get pluginManager() { return getService(ctx, "pluginManager"); },
 
     getSession(id) {
@@ -268,8 +308,172 @@ export function createDshAdapter(ctx) {
       }
     },
     pluginVersion() {
-      return packageVersion("dsh-session-manager") || "unknown";
+      const resolved = packageVersion("dsh-session-manager");
+      if (resolved) return resolved;
+      try {
+        const pkg = JSON.parse(readFileSync(new URL("../../package.json", import.meta.url), "utf8"));
+        if (typeof pkg.version === "string") return pkg.version;
+      } catch { /* best-effort */ }
+      return "unknown";
     },
   };
   return adapter;
 }
+
+/**
+ * Resolve the DSH profile directory from adapter or ctx safely without
+ * triggering un-injected property access errors on Cordis context proxies.
+ */
+export function resolveProfileDir(adapter, ctx) {
+  const pm = adapter?.pluginManager || getService(ctx, "pluginManager");
+  try {
+    if (typeof pm?.profile?.dir === "string") return pm.profile.dir;
+  } catch { /* ignore */ }
+  try {
+    const pCtx = getService(ctx, "profileContext");
+    if (typeof pCtx?.dir === "string") return pCtx.dir;
+  } catch { /* ignore */ }
+  try {
+    if (typeof adapter?.homePath === "string") return adapter.homePath;
+  } catch { /* ignore */ }
+  return undefined;
+}
+
+/**
+ * Classify an installation specification string into a recognized source:
+ * "npm" | "github" | "linked" | "unknown"
+ *
+ * Implements the specification rules from DSH install-spec.ts & dependencySpec():
+ * - Local filesystem paths: file:, link:, absolute paths, or relative path segments.
+ * - Git/GitHub repositories: github:, gitlab:, bitbucket:, gist:, git+, git://, git@, or hosted repo URLs.
+ * - Registry (npm):
+ *   - Bare semver version, range, or dist-tag: "^0.7.3", "~0.7.3", "0.7.3", "latest", "beta"
+ *   - Package-prefixed spec from dependencySpec(): "dsh-session-manager@^0.7.3", "dsh-session-manager@0.7.3", "dsh-session-manager@latest"
+ *   - npm alias: "npm:dsh-session-manager@^0.7.3" or "dsh-session-manager@npm:..."
+ * - Any unrecognized URL, arbitrary protocol, or malformed string falls back to "unknown".
+ */
+export function classifyInstallSource(spec, packageName = "dsh-session-manager") {
+  if (typeof spec !== "string") return "unknown";
+  const s = spec.trim();
+  if (!s) return "unknown";
+
+  // 1. Local link / filesystem path
+  if (/^(?:file|link):/i.test(s)) return "linked";
+  if (/^(?:\/|[a-zA-Z]:[\\/]|\\\\|\.{1,2}(?:[\\/]|$))/.test(s)) return "linked";
+
+  // 2. Git / GitHub
+  if (/^(?:github|gitlab|bitbucket|gist):/i.test(s)) return "github";
+  if (/^git(?:\+[a-z]+)?:\/\/|^git@[^:]+:/i.test(s)) return "github";
+  if (/^https?:\/\/(?:www\.)?(?:github\.com|gitlab\.com|bitbucket\.org)\/[^/]+\/[^/#]+(?:\.git)?(?:#.*)?$/i.test(s)) return "github";
+  if (/^git\+https?:\/\//i.test(s)) return "github";
+
+  // 3. Registry (npm)
+  // Strip package name prefix if present (e.g. "dsh-session-manager@...")
+  let target = s;
+  const prefix = packageName.toLowerCase() + "@";
+  if (target.toLowerCase().startsWith(prefix)) {
+    target = target.slice(prefix.length).trim();
+  }
+
+  // npm alias or registry protocol (e.g. "registry:npm", "npm:dsh-session-manager@^0.7.3", "npm:...")
+  if (
+    target.toLowerCase().startsWith("registry:") ||
+    target.toLowerCase().startsWith("npm:") ||
+    /^npm:(?:@[a-z0-9][a-z0-9._~-]*\/)?[a-z0-9][a-z0-9._~-]*@/i.test(target)
+  ) {
+    return "npm";
+  }
+
+  // After stripping package prefix, check if remainder is a local path or git URL (e.g. "pkg@link:...")
+  if (/^(?:file|link):/i.test(target) || /^(?:\/|[a-zA-Z]:[\\/]|\\\\|\.{1,2}(?:[\\/]|$))/.test(target)) {
+    return "linked";
+  }
+  if (/^(?:github|gitlab|bitbucket|gist):/i.test(target) || /^git(?:\+[a-z]+)?:\/\/|^git@[^:]+:/i.test(target)) {
+    return "github";
+  }
+  if (/^https?:\/\//i.test(target)) {
+    // Arbitrary HTTP URLs are NOT standard npm registry ranges
+    return "unknown";
+  }
+
+  // Semver versions & ranges:
+  // e.g. "0.7.3", "0.7.4-test.1", "^0.7.3", "~0.7.3", ">=0.7.0", "*", "1.x", "=0.7.3"
+  if (/^[~^>=<*]/.test(target) || /^\d+\.\d+/.test(target) || /^\d+x/i.test(target)) {
+    return "npm";
+  }
+
+  // npm dist-tags: lowercase URL-safe tag names like "latest", "beta", "next", "canary", "dev"
+  if (/^[a-zA-Z0-9_.-]+$/.test(target)) {
+    return "npm";
+  }
+
+  return "unknown";
+}
+
+/**
+ * Detect the installation source of dsh-session-manager ("npm" | "github" | "linked" | "installation" | "unknown").
+ * Inspects explicit test/config overrides first, then bundle records from PluginManager,
+ * then the host profile package.json dependencies. Never defaults to "npm".
+ */
+export function detectPluginSource(adapter, ctx, bundles) {
+  try {
+    if (typeof adapter?.pluginSourceOverride === "string") {
+      return adapter.pluginSourceOverride;
+    }
+  } catch { /* best-effort */ }
+  const override = getService(ctx, "pluginSourceOverride");
+  if (typeof override === "string") {
+    return override;
+  }
+
+  // 1. Inspect bundles from PluginManager.listBundles() if provided
+  if (Array.isArray(bundles)) {
+    const b = bundles.find(item => item?.name === "dsh-session-manager");
+    if (b) {
+      if (b.availability === "installation") {
+        return "installation";
+      }
+      if (typeof b.source === "string") {
+        const source = classifyInstallSource(b.source, "dsh-session-manager");
+        if (source !== "unknown") return source;
+      }
+    }
+  }
+
+  // 2. Inspect host profile package.json dependencies
+  const profileDir = resolveProfileDir(adapter, ctx);
+  if (profileDir) {
+    try {
+      const pkgFile = join(profileDir, "package.json");
+      if (existsSync(pkgFile)) {
+        const pkg = JSON.parse(readFileSync(pkgFile, "utf8"));
+        const spec = pkg?.dependencies?.["dsh-session-manager"]
+          || pkg?.devDependencies?.["dsh-session-manager"];
+        if (typeof spec === "string") {
+          return classifyInstallSource(spec, "dsh-session-manager");
+        }
+      }
+    } catch { /* best-effort */ }
+  }
+  return "unknown";
+}
+
+/**
+ * Check if the runtime is currently executing in HMR (Hot Module Replacement) development mode.
+ */
+export function isHmrActive(adapter, ctx) {
+  try {
+    if (typeof ctx?.get === "function" && ctx.get("hmr") !== undefined) return true;
+  } catch { /* ignore */ }
+  try {
+    const pm = adapter?.pluginManager || getService(ctx, "pluginManager");
+    if (pm?.hot === true || pm?.hmr !== undefined) return true;
+    if (pm?.ownerContext && typeof pm.ownerContext.get === "function" && pm.ownerContext.get("hmr") !== undefined) {
+      return true;
+    }
+  } catch { /* ignore */ }
+  try {
+    if (ctx && (ctx.hmr !== undefined || ctx.hot === true || ctx.isHmr === true)) return true;
+  } catch { /* ignore */ }
+  return false;
+}