@hermespilot/link 0.4.0 → 0.4.2

package/dist/{chunk-FWPHQZP6.js → chunk-YSSZPVBP.js}

@@ -1500,6 +1500,13 @@ function resolveHermesProfileDir(profileName = "default") {
   }
   return path3.join(os.homedir(), ".hermes", "profiles", profileName);
 }
+function resolveHermesProfilesDir() {
+  const hermesHome = process.env.HERMES_HOME?.trim();
+  if (hermesHome) {
+    return path3.join(resolveDefaultHermesRoot(path3.resolve(hermesHome)), "profiles");
+  }
+  return path3.join(os.homedir(), ".hermes", "profiles");
+}
 function resolveHermesConfigPath(profileName = "default") {
   return path3.join(resolveHermesProfileDir(profileName), "config.yaml");
 }
@@ -3970,7 +3977,7 @@ import os2 from "os";
 import path5 from "path";
 
 // src/constants.ts
-var LINK_VERSION = "0.4.0";
+var LINK_VERSION = "0.4.2";
 var LINK_COMMAND = "hermeslink";
 var LINK_DEFAULT_PORT = 52379;
 var LINK_RUNTIME_DIR_NAME = ".hermeslink";
@@ -9253,7 +9260,6 @@ function isNodeError9(error, code) {
 // src/conversations/hermes-session-sync.ts
 import { randomUUID as randomUUID7 } from "crypto";
 import { readdir as readdir7, readFile as readFile9, stat as stat9 } from "fs/promises";
-import os4 from "os";
 import path15 from "path";
 
 // src/conversations/delivery-import.ts
@@ -10616,7 +10622,7 @@ function rememberKnownHermesConversation(map, sessionId, conversationId) {
 }
 async function discoverHermesProfileNames() {
   const names = /* @__PURE__ */ new Set([DEFAULT_PROFILE_NAME]);
-  const profilesDir = path15.join(os4.homedir(), ".hermes", "profiles");
+  const profilesDir = resolveHermesProfilesDir();
   const entries = await readdir7(profilesDir, { withFileTypes: true }).catch(
     (error) => {
       if (isNodeError11(error, "ENOENT")) {
@@ -15760,7 +15766,6 @@ function createHttpErrorMiddleware(logger) {
 
 // src/hermes/profiles.ts
 import { readdir as readdir9, readFile as readFile12, rename as rename3, rm as rm6, stat as stat12 } from "fs/promises";
-import os5 from "os";
 import path18 from "path";
 import YAML2 from "yaml";
 var DEFAULT_PROFILE = "default";
@@ -15768,7 +15773,7 @@ var PROFILE_NAME_PATTERN4 = /^[a-zA-Z0-9._-]{1,64}$/;
 async function listHermesProfiles(paths = resolveRuntimePaths()) {
   const profiles = /* @__PURE__ */ new Map();
   profiles.set(DEFAULT_PROFILE, await profileInfo(DEFAULT_PROFILE, paths));
-  const profilesDir = path18.join(os5.homedir(), ".hermes", "profiles");
+  const profilesDir = resolveHermesProfilesDir();
   const entries = await readdir9(profilesDir, { withFileTypes: true }).catch(
     (error) => {
       if (isNodeError14(error, "ENOENT")) {
@@ -20624,7 +20629,7 @@ async function handleFrame(socket, raw, localPort, abortControllers) {
 // src/runtime/system-info.ts
 import { execFileSync } from "child_process";
 import { readFileSync } from "fs";
-import os6 from "os";
+import os4 from "os";
 function readLinkSystemInfo() {
   const platform = process.platform;
   const hostname = readHostname(platform);
@@ -20663,7 +20668,7 @@ function readHostname(platform) {
       return computerName;
     }
   }
-  return normalizeText(os6.hostname());
+  return normalizeText(os4.hostname());
 }
 function readOsLabel(platform) {
   if (platform === "darwin") {
@@ -20671,12 +20676,12 @@ function readOsLabel(platform) {
     return version ? `macOS ${version}` : "macOS";
   }
   if (platform === "linux") {
-    return readLinuxOsRelease() ?? `Linux ${os6.release()}`;
+    return readLinuxOsRelease() ?? `Linux ${os4.release()}`;
   }
   if (platform === "win32") {
-    return `Windows ${os6.release()}`;
+    return `Windows ${os4.release()}`;
   }
-  return `${os6.type()} ${os6.release()}`.trim();
+  return `${os4.type()} ${os4.release()}`.trim();
 }
 function readLinuxOsRelease() {
   for (const file of ["/etc/os-release", "/usr/lib/os-release"]) {
@@ -20723,11 +20728,11 @@ function truncateText(value, maxLength) {
 }
 
 // src/topology/network.ts
-import os8 from "os";
+import os6 from "os";
 
 // src/topology/environment.ts
 import { existsSync, readFileSync as readFileSync2 } from "fs";
-import os7 from "os";
+import os5 from "os";
 function detectRuntimeEnvironment(env = process.env) {
   if (isWsl(env)) {
     return {
@@ -20756,7 +20761,7 @@ function isWsl(env) {
   if (env.WSL_DISTRO_NAME || env.WSL_INTEROP) {
     return true;
   }
-  const release = os7.release().toLowerCase();
+  const release = os5.release().toLowerCase();
   return release.includes("microsoft") || release.includes("wsl");
 }
 function isContainer(env) {
@@ -20801,7 +20806,7 @@ async function discoverRouteCandidates(options) {
   };
 }
 function discoverLanIps() {
-  return discoverLanIpsFromInterfaces(os8.networkInterfaces());
+  return discoverLanIpsFromInterfaces(os6.networkInterfaces());
 }
 function discoverLanIpsFromInterfaces(interfaces) {
   const result = /* @__PURE__ */ new Set();
@@ -22408,6 +22413,10 @@ async function readPairingSession(sessionId, paths = resolveRuntimePaths()) {
     expires_at: record.expires_at
   };
 }
+function isPairingSessionExpired(session) {
+  const expiresAtMs = Date.parse(session.expires_at);
+  return !Number.isFinite(expiresAtMs) || Date.now() >= expiresAtMs;
+}
 async function recordPairingClaim(input, paths = resolveRuntimePaths()) {
   const record = {
     session_id: input.sessionId,
@@ -22437,7 +22446,20 @@ async function clearPairingClaim(sessionId, paths = resolveRuntimePaths()) {
 }
 async function claimPairing(input) {
   const paths = input.paths ?? resolveRuntimePaths();
-  const [identity, config] = await Promise.all([loadRequiredIdentity2(paths), loadConfig(paths)]);
+  const [identity, config, localSession] = await Promise.all([
+    loadRequiredIdentity2(paths),
+    loadConfig(paths),
+    readPairingSession(input.sessionId, paths)
+  ]);
+  if (!localSession) {
+    throw new LinkHttpError(404, "pairing_session_not_found", "Pairing session was not found");
+  }
+  if (isPairingSessionExpired(localSession)) {
+    throw new LinkHttpError(404, "pairing_session_expired", "Pairing session has expired");
+  }
+  if (localSession.link_id !== identity.link_id) {
+    throw new LinkHttpError(409, "pairing_claim_mismatch", "Pairing claim does not match this Link");
+  }
   let verified;
   try {
     verified = await postServerJson(
@@ -23251,7 +23273,7 @@ function registerPairingRoutes(router, options) {
       throw new LinkHttpError(404, "pairing_session_not_found", "Pairing session was not found");
     }
     const state = await readPairingState(sessionId, paths);
-    if (!state.claimed && isExpiredAt(session.expires_at)) {
+    if (!state.claimed && isPairingSessionExpired(session)) {
       throw new LinkHttpError(404, "pairing_session_expired", "Pairing session has expired");
     }
     ctx.set("cache-control", "no-store");
@@ -23276,7 +23298,7 @@ async function readPairingState(sessionId, paths) {
 async function renderPairingPage(input) {
   const session = input.session;
   const expiresAtMs = Date.parse(session.expires_at);
-  const isExpired = !input.state.claimed && Number.isFinite(expiresAtMs) && Date.now() >= expiresAtMs;
+  const isExpired = !input.state.claimed && isPairingSessionExpired(session);
   const qrPayload = JSON.stringify({
     kind: "hermes_link_pairing",
     version: 1,
@@ -23687,10 +23709,6 @@ function formatDate(value) {
   const date = new Date(value);
   return Number.isNaN(date.getTime()) ? value : date.toLocaleString("zh-CN", { hour12: false });
 }
-function isExpiredAt(value) {
-  const expiresAtMs = Date.parse(value);
-  return Number.isFinite(expiresAtMs) && Date.now() >= expiresAtMs;
-}
 
 // src/http/routes/internal.ts
 function registerInternalRoutes(router, options) {

package/dist/cli/index.d.ts

@@ -1 +1,7 @@
 #!/usr/bin/env node
+import { R as RuntimePaths } from '../paths-CmAiZsna.js';
+
+declare function waitForPairingOrShutdown(sessionId: string, expiresAt: string, paths: RuntimePaths): Promise<'claimed' | 'expired' | 'shutdown'>;
+declare function isCliEntrypoint(entry?: string, moduleUrl?: string): boolean;
+
+export { isCliEntrypoint, waitForPairingOrShutdown };

package/dist/cli/index.js

@@ -34,11 +34,14 @@ import {
   startDaemonProcess,
   startLinkService,
   stopDaemonProcess
-} from "../chunk-FWPHQZP6.js";
+} from "../chunk-YSSZPVBP.js";
 
 // src/cli/index.ts
 import { Command } from "commander";
+import { realpathSync } from "fs";
+import path3 from "path";
 import { createInterface } from "readline/promises";
+import { pathToFileURL } from "url";
 import qrcode from "qrcode-terminal";
 
 // src/autostart/autostart.ts
@@ -286,6 +289,7 @@ var messages = {
     "pair.openPairingPage": "If the QR code is hard to scan, you can open this page locally: {url}",
     "pair.manualCode": "You can also use the HermesPilot App manual connection mode and enter this pairing code:",
     "pair.expires": "Pairing expires in 10 minutes. Press Ctrl+C to cancel waiting.",
+    "pair.expired": "Pairing expired. Please run `hermeslink pair` again.",
     "pair.claimed": "Pairing succeeded. Starting Hermes Link in the background...",
     "pair.claimedRunning": "Pairing succeeded. Hermes Link is already running in the background.",
     "pair.relayOnlyNotice": "Network note: this {kind} environment does not expose a phone-reachable LAN/public direct address by default. The App will connect through Relay.",
@@ -380,6 +384,7 @@ var messages = {
     "pair.openPairingPage": "\u5982\u679C\u4E8C\u7EF4\u7801\u4E0D\u5BB9\u6613\u626B\u63CF\uFF0C\u4F60\u53EF\u4EE5\u5728\u672C\u673A\u6253\u5F00\u8FD9\u4E2A\u9875\u9762\uFF1A{url}",
     "pair.manualCode": "\u4F60\u4E5F\u53EF\u4EE5\u5728 HermesPilot App \u4E2D\u4F7F\u7528\u624B\u52A8\u8FDE\u63A5\u6A21\u5F0F\uFF0C\u8F93\u5165\u4EE5\u4E0B\u914D\u5BF9\u7801\u8FDB\u884C\u8FDE\u63A5\uFF1A",
     "pair.expires": "\u914D\u5BF9\u4F1A\u8BDD 10 \u5206\u949F\u540E\u8FC7\u671F\u3002\u6309 Ctrl+C \u9000\u51FA\u7B49\u5F85\u3002",
+    "pair.expired": "\u914D\u5BF9\u4F1A\u8BDD\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u91CD\u65B0\u8FD0\u884C `hermeslink pair`\u3002",
     "pair.claimed": "\u914D\u5BF9\u5DF2\u6210\u529F\u3002\u6B63\u5728\u628A Hermes Link \u5207\u6362\u5230\u540E\u53F0\u8FD0\u884C...",
     "pair.claimedRunning": "\u914D\u5BF9\u5DF2\u6210\u529F\u3002Hermes Link \u5DF2\u5728\u540E\u53F0\u6301\u7EED\u8FD0\u884C\u3002",
     "pair.relayOnlyNotice": "\u7F51\u7EDC\u63D0\u793A\uFF1A\u5F53\u524D\u662F {kind} \u73AF\u5883\uFF0C\u9ED8\u8BA4\u4E0D\u4F1A\u66B4\u9732\u624B\u673A\u53EF\u8BBF\u95EE\u7684\u5C40\u57DF\u7F51\u6216\u516C\u7F51\u76F4\u8FDE\u5730\u5740\u3002App \u4F1A\u901A\u8FC7 Relay \u8FDE\u63A5\u3002",
@@ -871,7 +876,11 @@ program.command("pair").description(helpText("pair.description")).action(async (
     console.log(t("pair.manualCode"));
     console.log(prepared.code);
     console.log(t("pair.expires"));
-    const result = await waitForPairingOrShutdown(prepared.sessionId, paths);
+    const result = await waitForPairingOrShutdown(
+      prepared.sessionId,
+      prepared.expiresAt,
+      paths
+    );
     if (service) {
       await service.close();
     }
@@ -910,6 +919,8 @@ program.command("pair").description(helpText("pair.description")).action(async (
         const status = await startDaemonProcess(paths);
         console.log(t("start.backgroundStarted", { pid: status.pid ?? "unknown" }));
       }
+    } else if (result === "expired") {
+      console.log(t("pair.expired"));
     }
   } finally {
     pairingRelayBridge?.close();
@@ -990,11 +1001,13 @@ program.command("doctor").description(helpText("doctor.description")).action(asy
     console.log(t("doctor.apiUnavailable", { message: error instanceof Error ? error.message : String(error) }));
   }
 });
-program.parseAsync(process.argv).catch(async (error) => {
-  const language = await loadCliLanguage().catch(() => detectSystemLanguage());
-  console.error(localizeErrorMessage(error, language));
-  process.exitCode = 1;
-});
+if (isCliEntrypoint()) {
+  program.parseAsync(process.argv).catch(async (error) => {
+    const language = await loadCliLanguage().catch(() => detectSystemLanguage());
+    console.error(localizeErrorMessage(error, language));
+    process.exitCode = 1;
+  });
+}
 async function loadCliLanguage() {
   const config = await loadConfig();
   return resolveLanguage(config.language);
@@ -1100,8 +1113,9 @@ async function waitForShutdown(cleanup) {
   });
   await cleanup();
 }
-async function waitForPairingOrShutdown(sessionId, paths) {
+async function waitForPairingOrShutdown(sessionId, expiresAt, paths) {
   let shutdownRequested = false;
+  const expiresAtMs = Date.parse(expiresAt);
   const stop = () => {
     shutdownRequested = true;
   };
@@ -1109,6 +1123,9 @@ async function waitForPairingOrShutdown(sessionId, paths) {
   process.once("SIGTERM", stop);
   try {
     while (!shutdownRequested) {
+      if (Number.isFinite(expiresAtMs) && Date.now() >= expiresAtMs) {
+        return "expired";
+      }
       const record = await readPairingClaim(sessionId, paths);
       if (record) {
         return "claimed";
@@ -1141,3 +1158,17 @@ function printPostPairingNetworkNotice(environment, config, t) {
   console.log(t("pair.relayOnlyLanHostHint"));
   console.log(t("pair.relayOnlySafetyHint"));
 }
+function isCliEntrypoint(entry = process.argv[1], moduleUrl = import.meta.url) {
+  if (!entry) {
+    return false;
+  }
+  try {
+    return moduleUrl === pathToFileURL(realpathSync(path3.resolve(entry))).href;
+  } catch {
+    return moduleUrl === pathToFileURL(path3.resolve(entry)).href;
+  }
+}
+export {
+  isCliEntrypoint,
+  waitForPairingOrShutdown
+};

package/dist/http/app.d.ts

@@ -1,4 +1,5 @@
 import Koa from 'koa';
+import { R as RuntimePaths } from '../paths-CmAiZsna.js';
 
 interface ConversationProfileSummary {
     uid?: string;
@@ -267,21 +268,6 @@ interface CancelRunResult {
 }
 type ConversationEventListener = (event: ConversationEvent) => void;
 
-interface RuntimePaths {
-    homeDir: string;
-    identityFile: string;
-    configFile: string;
-    stateFile: string;
-    credentialsFile: string;
-    databaseFile: string;
-    conversationsDir: string;
-    blobsDir: string;
-    indexesDir: string;
-    logsDir: string;
-    runDir: string;
-    pairingDir: string;
-}
-
 interface LinkStatistics {
     conversations: {
         total: number;

package/dist/http/app.js

@@ -1,6 +1,6 @@
 import {
   createApp
-} from "../chunk-FWPHQZP6.js";
+} from "../chunk-YSSZPVBP.js";
 export {
   createApp
 };

package/dist/paths-CmAiZsna.d.ts

@@ -0,0 +1,16 @@
+interface RuntimePaths {
+    homeDir: string;
+    identityFile: string;
+    configFile: string;
+    stateFile: string;
+    credentialsFile: string;
+    databaseFile: string;
+    conversationsDir: string;
+    blobsDir: string;
+    indexesDir: string;
+    logsDir: string;
+    runDir: string;
+    pairingDir: string;
+}
+
+export type { RuntimePaths as R };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hermespilot/link",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "private": false,
   "description": "Hermes Link companion service and CLI for connecting hermes-agent through HermesPilot",
   "license": "MIT",