@hermespilot/link 0.2.8 → 0.3.0

package/dist/{chunk-W4U6XJ4W.js → chunk-45RR27KS.js}

@@ -3724,7 +3724,7 @@ import os2 from "os";
 import path5 from "path";
 
 // src/constants.ts
-var LINK_VERSION = "0.2.8";
+var LINK_VERSION = "0.3.0";
 var LINK_COMMAND = "hermeslink";
 var LINK_DEFAULT_PORT = 52379;
 var LINK_RUNTIME_DIR_NAME = ".hermeslink";
@@ -19122,35 +19122,49 @@ async function preparePairing(paths = resolveRuntimePaths()) {
     public_key_pem: identity.public_key_pem
   });
   const relayBaseUrl = created.relayBaseUrl || config.relayBaseUrl;
-  const assigned = await bootstrapRelayLink({
-    relayBaseUrl,
-    relayBootstrapToken: created.relayBootstrapToken,
-    identity,
-    paths
-  });
-  const updatedIdentity = await loadIdentity(paths) ?? identity;
-  const routes = await discoverRouteCandidates({
-    port: config.port,
-    relayBaseUrl,
-    relayBootstrapToken: created.relayBootstrapToken,
-    configuredLanHost: config.lanHost,
-    linkId: assigned.linkId,
-    installId: updatedIdentity.install_id,
-    publicKeyPem: updatedIdentity.public_key_pem
-  });
-  await patchServerJson(config.serverBaseUrl, `/api/v1/link-pairings/${created.sessionId}/link`, created.pairingToken, {
-    install_id: updatedIdentity.install_id,
-    link_id: assigned.linkId,
-    link_version: LINK_VERSION,
-    display_name: systemInfo.defaultDisplayName,
-    platform: systemInfo.platform,
-    hostname: systemInfo.hostname ?? void 0,
-    lan_ips: routes.lanIps,
-    public_ipv4s: routes.publicIpv4s,
-    public_ipv6s: routes.publicIpv6s,
-    preferred_urls: routes.preferredUrls,
-    environment: routes.environment
-  });
+  let assigned;
+  let updatedIdentity;
+  let routes;
+  try {
+    assigned = await bootstrapRelayLink({
+      relayBaseUrl,
+      relayBootstrapToken: created.relayBootstrapToken,
+      identity,
+      paths
+    });
+    updatedIdentity = await loadIdentity(paths) ?? identity;
+    routes = await discoverRouteCandidates({
+      port: config.port,
+      relayBaseUrl,
+      relayBootstrapToken: created.relayBootstrapToken,
+      configuredLanHost: config.lanHost,
+      linkId: assigned.linkId,
+      installId: updatedIdentity.install_id,
+      publicKeyPem: updatedIdentity.public_key_pem
+    });
+    await patchServerJson(config.serverBaseUrl, `/api/v1/link-pairings/${created.sessionId}/link`, created.pairingToken, {
+      install_id: updatedIdentity.install_id,
+      link_id: assigned.linkId,
+      link_version: LINK_VERSION,
+      display_name: systemInfo.defaultDisplayName,
+      platform: systemInfo.platform,
+      hostname: systemInfo.hostname ?? void 0,
+      lan_ips: routes.lanIps,
+      public_ipv4s: routes.publicIpv4s,
+      public_ipv6s: routes.publicIpv6s,
+      preferred_urls: routes.preferredUrls,
+      environment: routes.environment
+    });
+  } catch (error) {
+    await reportPairingErrorToServer({
+      serverBaseUrl: config.serverBaseUrl,
+      sessionId: created.sessionId,
+      source: "link",
+      pairingToken: created.pairingToken,
+      error: pairingErrorSnapshot("prepare_pairing", error)
+    });
+    throw error;
+  }
   const qrPayload = {
     kind: "hermes_link_pairing",
     version: 1,
@@ -19241,14 +19255,26 @@ 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 verified = await postServerJson(
-    config.serverBaseUrl,
-    `/api/v1/link-pairings/${input.sessionId}/claim/verify`,
-    {
-      claim_token: input.claimToken,
-      app_instance_id: input.appInstanceId ?? void 0
-    }
-  );
+  let verified;
+  try {
+    verified = await postServerJson(
+      config.serverBaseUrl,
+      `/api/v1/link-pairings/${input.sessionId}/claim/verify`,
+      {
+        claim_token: input.claimToken,
+        app_instance_id: input.appInstanceId ?? void 0
+      }
+    );
+  } catch (error) {
+    await reportPairingErrorToServer({
+      serverBaseUrl: config.serverBaseUrl,
+      sessionId: input.sessionId,
+      source: "link",
+      claimToken: input.claimToken,
+      error: pairingErrorSnapshot("claim_verify", error)
+    });
+    throw error;
+  }
   if (verified.ok !== true || verified.linkId !== identity.link_id) {
     throw new LinkHttpError(409, "pairing_claim_mismatch", "Pairing claim does not match this Link");
   }
@@ -19295,6 +19321,36 @@ async function postServerJson(serverBaseUrl, path24, body) {
   });
   return readJsonResponse2(response);
 }
+async function reportPairingErrorToServer(input) {
+  const body = {
+    source: input.source,
+    error: input.error
+  };
+  if (input.claimToken) {
+    body.claim_token = input.claimToken;
+  }
+  if (input.pairingToken) {
+    body.pairing_token = input.pairingToken;
+  }
+  await fetch(`${input.serverBaseUrl.replace(/\/+$/u, "")}/api/v1/link-pairings/${encodeURIComponent(input.sessionId)}/error`, {
+    method: "POST",
+    headers: {
+      accept: "application/json",
+      "content-type": "application/json",
+      ...input.pairingToken ? { authorization: `Bearer ${input.pairingToken}` } : {}
+    },
+    signal: AbortSignal.timeout(3e3),
+    body: JSON.stringify(body)
+  }).catch(() => void 0);
+}
+function pairingErrorSnapshot(stage, error) {
+  return {
+    stage,
+    message: error instanceof Error ? error.message : String(error),
+    error_name: error instanceof Error ? error.name : void 0,
+    occurred_at: (/* @__PURE__ */ new Date()).toISOString()
+  };
+}
 async function patchServerJson(serverBaseUrl, path24, token, body) {
   const response = await fetch(`${serverBaseUrl.replace(/\/+$/u, "")}${path24}`, {
     method: "PATCH",
@@ -20436,6 +20492,7 @@ export {
   resolveRuntimePaths,
   getLinkLogFile,
   ensureHermesApiServerAvailable,
+  readHermesVersion,
   loadConfig,
   saveConfig,
   normalizeLanHost,

package/dist/cli/index.js

@@ -20,6 +20,7 @@ import {
   preparePairing,
   probeLocalLinkService,
   readHermesApiServerConfig,
+  readHermesVersion,
   readPairingClaim,
   reportLinkStatusToServer,
   resolveHermesConfigPath,
@@ -30,7 +31,7 @@ import {
   startDaemonProcess,
   startLinkService,
   stopDaemonProcess
-} from "../chunk-W4U6XJ4W.js";
+} from "../chunk-45RR27KS.js";
 
 // src/cli/index.ts
 import { Command } from "commander";
@@ -277,6 +278,7 @@ var messages = {
     "pair.code": "Pairing code: {value}",
     "pair.localApi": "Local API: http://127.0.0.1:{port}",
     "pair.scan": "Open this pairing page in the HermesPilot App or scan the QR code below:",
+    "pair.openBrowserFailed": "Could not open the system browser automatically. You can still scan the QR code below or open this URL manually: {url}",
     "pair.expires": "Pairing expires in 10 minutes. Press Ctrl+C to cancel waiting.",
     "pair.claimed": "Pairing succeeded. Starting Hermes Link in the background...",
     "pair.claimedRunning": "Pairing succeeded. Hermes Link is already running in the background.",
@@ -363,6 +365,7 @@ var messages = {
     "pair.code": "\u914D\u5BF9\u7801\uFF1A{value}",
     "pair.localApi": "\u672C\u5730 API\uFF1Ahttp://127.0.0.1:{port}",
     "pair.scan": "\u8BF7\u5728 HermesPilot App \u4E2D\u6253\u5F00\u8FD9\u4E2A\u914D\u5BF9\u9875\uFF0C\u6216\u626B\u63CF\u4E0B\u9762\u7684\u4E8C\u7EF4\u7801\uFF1A",
+    "pair.openBrowserFailed": "\u65E0\u6CD5\u81EA\u52A8\u6253\u5F00\u7CFB\u7EDF\u6D4F\u89C8\u5668\u3002\u4F60\u4ECD\u7136\u53EF\u4EE5\u626B\u63CF\u4E0B\u9762\u7684\u4E8C\u7EF4\u7801\uFF0C\u6216\u624B\u52A8\u6253\u5F00\u8FD9\u4E2A\u94FE\u63A5\uFF1A{url}",
     "pair.expires": "\u914D\u5BF9\u4F1A\u8BDD 10 \u5206\u949F\u540E\u8FC7\u671F\u3002\u6309 Ctrl+C \u9000\u51FA\u7B49\u5F85\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",
@@ -507,6 +510,21 @@ async function assertPairingPreflightReady(options = {}) {
   if (failures.length > 0) {
     throwPairingPreflightError(failures);
   }
+  const readVersion = options.readHermesVersion ?? readHermesVersion;
+  try {
+    await readVersion();
+  } catch (error) {
+    throwPairingPreflightError([
+      {
+        code: "hermes_cli_unavailable",
+        zh: "\u6CA1\u6709\u627E\u5230\u53EF\u7528\u7684 Hermes Agent CLI\u3002Link \u9700\u8981\u548C Hermes \u5728\u540C\u4E00\u4E2A\u7CFB\u7EDF\u73AF\u5883\u91CC\uFF0C\u624D\u80FD\u5728\u914D\u5BF9\u65F6\u542F\u52A8\u548C\u68C0\u6D4B Hermes Gateway\u3002",
+        en: "Hermes Agent CLI was not found. Link needs Hermes to be available in the same system environment so it can start and check Hermes Gateway during pairing.",
+        actionZh: "\u8BF7\u628A Hermes Agent \u5B89\u88C5\u5728\u8FD9\u53F0\u5BBF\u4E3B\u673A\u4E0A\uFF0C\u6216\u628A `HERMES_BIN` \u6307\u5411 Link \u53EF\u4EE5\u76F4\u63A5\u6267\u884C\u7684 Hermes CLI\u3002\u5F53\u524D\u5982\u679C Hermes \u53EA\u5728\u53E6\u4E00\u4E2A Docker\u3001WSL \u6216\u865A\u62DF\u673A\u73AF\u5883\u91CC\uFF0C\u5BBF\u4E3B\u673A Link \u4E0D\u80FD\u76F4\u63A5\u7528\u5B83\u5B8C\u6210\u914D\u5BF9\u524D\u68C0\u67E5\u3002",
+        actionEn: "Install Hermes Agent on this host, or point `HERMES_BIN` to a Hermes CLI that Link can run directly in this system environment. If Hermes only exists inside another Docker, WSL, or VM environment, host Link cannot use it for pairing preflight.",
+        detail: error instanceof Error ? error.message : String(error)
+      }
+    ]);
+  }
   const apiServerConfig = await readHermesApiServerConfig(profileName, configPath);
   if (apiServerConfig.enabled !== true) {
     throwPairingPreflightError([
@@ -609,16 +627,29 @@ async function openSystemBrowser(url) {
   return await spawnDetached("xdg-open", [url]);
 }
 async function spawnDetached(command, args) {
-  try {
-    const child = spawn(command, args, {
-      detached: true,
-      stdio: "ignore"
-    });
-    child.unref();
-    return true;
-  } catch {
-    return false;
-  }
+  return await new Promise((resolve) => {
+    let settled = false;
+    const settle = (ok) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      resolve(ok);
+    };
+    try {
+      const child = spawn(command, args, {
+        detached: true,
+        stdio: "ignore"
+      });
+      child.once("error", () => settle(false));
+      child.once("spawn", () => {
+        child.unref();
+        settle(true);
+      });
+    } catch {
+      settle(false);
+    }
+  });
 }
 
 // src/cli/index.ts
@@ -777,7 +808,10 @@ program.command("pair").description(helpText("pair.description")).action(async (
   }
   console.log(t("pair.scan"));
   console.log(`Pairing page: ${pairingPageUrl}`);
-  void openSystemBrowser(pairingPageUrl);
+  const browserOpened = await openSystemBrowser(pairingPageUrl);
+  if (!browserOpened) {
+    console.log(t("pair.openBrowserFailed", { url: pairingPageUrl }));
+  }
   qrcode.generate(qrValue, { small: true });
   console.log(t("pair.expires"));
   const result = await waitForPairingOrShutdown(prepared.sessionId, paths);

package/dist/http/app.js

@@ -1,6 +1,6 @@
 import {
   createApp
-} from "../chunk-W4U6XJ4W.js";
+} from "../chunk-45RR27KS.js";
 export {
   createApp
 };

package/package.json

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