@hermespilot/link 0.7.4 → 0.7.5

package/dist/{chunk-3A6ENKXD.js → chunk-MVKOUAVA.js}

@@ -2618,16 +2618,20 @@ async function saveHermesModelConfig(input, profileName = "default", configPath
   const shouldUpdateReasoningEffort = input.reasoningEffort !== void 0;
   const { document, config, existingRaw } = await readHermesConfigDocument(configPath);
   const providers = ensureProvidersRecordWithLegacyMigration(config);
-  const originalModelId = input.originalModelId?.trim() || normalized.id;
+  const originalModelId = input.originalModelId?.trim();
   const originalProvider = input.originalProvider?.trim();
   const originalBaseUrl = input.originalBaseUrl?.trim();
   const originalApiMode = input.originalApiMode?.trim();
-  const existingProviderKey = findProviderConfigKeyByModelIdentity(providers, {
-    id: originalModelId,
+  const originalIdentity = {
+    id: originalModelId || normalized.id,
     provider: originalProvider,
     baseUrl: originalBaseUrl,
     apiMode: originalApiMode
-  }) ?? (originalProvider && originalBaseUrl ? findProviderConfigKeyByEndpoint(providers, {
+  };
+  const hasOriginalIdentity = Boolean(
+    originalModelId || originalProvider || originalBaseUrl || originalApiMode
+  );
+  const existingProviderKey = (hasOriginalIdentity ? findProviderConfigKeyByModelIdentity(providers, originalIdentity) : null) ?? (originalProvider && originalBaseUrl ? findProviderConfigKeyByEndpoint(providers, {
     provider: originalProvider,
     baseUrl: originalBaseUrl,
     apiMode: originalApiMode
@@ -2647,7 +2651,7 @@ async function saveHermesModelConfig(input, profileName = "default", configPath
     await writeHermesEnvValue(profileName, keyEnv, normalized.apiKey);
   }
   writeProviderEndpointConfig(entry, normalized, keyEnv);
-  ensureEntryModelConfig(entry, originalModelId, normalized.id);
+  ensureEntryModelConfig(entry, originalIdentity.id, normalized.id);
   writeEntryModelContextLength(entry, normalized.id, normalized.contextLength);
   writeEntryModelSupportsVision(entry, normalized.id, input.supportsVision);
   if (shouldUpdateReasoningEffort) {
@@ -2662,15 +2666,29 @@ async function saveHermesModelConfig(input, profileName = "default", configPath
   const currentDefaultConfig = readModelConfig(modelConfig);
   const currentDefault = currentDefaultConfig.model;
   const currentDefaultReasoningEffort = readProfileReasoningEffort(config);
-  if (normalized.setDefault || !currentDefault || currentDefault === originalModelId) {
-    if (normalized.setDefault && currentDefault && currentDefault !== normalized.id && currentDefault !== originalModelId) {
+  const currentDefaultMatchesOriginal = hasOriginalIdentity && modelConfigMatchesModelIdentity(currentDefaultConfig, originalIdentity);
+  const currentDefaultMatchesNext = modelConfigMatchesModelIdentity(
+    currentDefaultConfig,
+    {
+      id: normalized.id,
+      provider: providerKey,
+      baseUrl: normalized.baseUrl,
+      apiMode: inferApiMode(
+        providerKey,
+        normalized.baseUrl,
+        normalized.apiMode
+      )
+    }
+  );
+  if (normalized.setDefault || !currentDefault || currentDefaultMatchesOriginal) {
+    if (normalized.setDefault && currentDefault && !currentDefaultMatchesNext && !currentDefaultMatchesOriginal) {
       retainModelDefaultAsProvider(providers, {
         ...currentDefaultConfig,
         ...currentDefaultReasoningEffort ? { reasoningEffort: currentDefaultReasoningEffort } : {}
       });
     }
-    const defaultKeyEnv = keyEnv ?? (currentDefault === originalModelId ? currentDefaultConfig.keyEnv : void 0);
-    const defaultApiKey = normalized.apiKey ?? (!defaultKeyEnv && currentDefault === originalModelId ? currentDefaultConfig.apiKey : void 0);
+    const defaultKeyEnv = keyEnv ?? (currentDefaultMatchesOriginal ? currentDefaultConfig.keyEnv : void 0);
+    const defaultApiKey = normalized.apiKey ?? (!defaultKeyEnv && currentDefaultMatchesOriginal ? currentDefaultConfig.apiKey : void 0);
     writeDefaultModelConfig(modelConfig, {
       ...normalized,
       provider: providerKey,
@@ -2858,7 +2876,12 @@ async function saveHermesModelDefaults(input, profileName = "default", configPat
     const modelConfig = ensureRecord(config, "model");
     const currentDefaultConfig = readModelConfig(modelConfig);
     const currentDefaultReasoningEffort = readProfileReasoningEffort(config);
-    if (currentDefaultConfig.model && currentDefaultConfig.model !== selected.id) {
+    if (currentDefaultConfig.model && !modelConfigMatchesModelIdentity(currentDefaultConfig, {
+      id: selected.id,
+      provider: selected.provider,
+      baseUrl: selected.baseUrl,
+      apiMode: selected.apiMode
+    })) {
       retainModelDefaultAsProvider(providers, {
         ...currentDefaultConfig,
         ...currentDefaultReasoningEffort ? { reasoningEffort: currentDefaultReasoningEffort } : {}
@@ -3472,6 +3495,11 @@ function providerConfigToLegacyEntry(providerKey, entry) {
 }
 function ensureProvidersRecordWithLegacyMigration(config) {
   const providers = ensureRecord(config, "providers");
+  for (const [key, rawEntry] of Object.entries(providers)) {
+    const entry = toRecord(rawEntry);
+    normalizeProviderCredentialReference(entry);
+    providers[key] = entry;
+  }
   const customProviders = Array.isArray(config.custom_providers) ? config.custom_providers : [];
   for (const rawEntry of customProviders) {
     const entry = toRecord(rawEntry);
@@ -3609,7 +3637,7 @@ function legacyEntryToProviderConfig(entry, baseUrl) {
   const apiKey = readString2(entry.api_key);
   const keyEnv = readString2(entry.key_env) ?? parseEnvReference(apiKey);
   if (keyEnv) {
-    next.key_env = keyEnv;
+    next.api_key = `\${${keyEnv}}`;
   } else if (apiKey) {
     next.api_key = apiKey;
   }
@@ -3643,6 +3671,15 @@ function legacyEntryToProviderConfig(entry, baseUrl) {
   }
   return next;
 }
+function normalizeProviderCredentialReference(entry) {
+  const apiKey = readString2(entry.api_key);
+  const keyEnv = readString2(entry.key_env) ?? parseEnvReference(apiKey);
+  if (!keyEnv) {
+    return;
+  }
+  entry.api_key = `\${${keyEnv}}`;
+  delete entry.key_env;
+}
 function normalizeEntryModelsMap(entry) {
   const models = entry.models;
   if (typeof models === "object" && models !== null && !Array.isArray(models)) {
@@ -3780,8 +3817,8 @@ function writeProviderEndpointConfig(entry, input, keyEnv) {
     delete entry.contextLength;
   }
   if (keyEnv) {
-    entry.key_env = keyEnv;
-    delete entry.api_key;
+    entry.api_key = `\${${keyEnv}}`;
+    delete entry.key_env;
   } else {
     delete entry.key_env;
   }
@@ -4041,22 +4078,18 @@ function managedModelPreferenceScore(model) {
   return (model.isDefault ? 1e3 : 0) + (model.credentialState === "configured" ? 200 : 0) + (model.credentialState === "missing" ? 50 : 0) + (model.source === "auth_store" ? 100 : 0) + (model.credentialSource !== "unknown" ? 40 : 0) + (model.isReadOnly ? 10 : 0);
 }
 function matchesDefaultModelConfig(input) {
-  if (!input.defaultModel || input.id !== input.defaultModel) {
-    return false;
-  }
-  const defaultApiMode = input.modelConfig.apiMode?.trim();
-  if (defaultApiMode && input.apiMode !== defaultApiMode) {
+  if (!input.defaultModel) {
     return false;
   }
-  const defaultBaseUrl = input.modelConfig.baseUrl;
-  if (defaultBaseUrl?.trim()) {
-    return normalizeBaseUrl(input.baseUrl) === normalizeBaseUrl(defaultBaseUrl);
-  }
-  const defaultProvider = input.modelConfig.provider?.trim();
-  if (defaultProvider) {
-    return input.provider === defaultProvider;
-  }
-  return true;
+  return modelConfigMatchesModelIdentity(
+    { ...input.modelConfig, model: input.defaultModel },
+    {
+      id: input.id,
+      provider: input.provider,
+      baseUrl: input.baseUrl,
+      apiMode: input.apiMode
+    }
+  );
 }
 function providerEntryMatchesManagedModel(entry, model) {
   const providerName = readString2(entry.name) ?? readString2(entry.provider_name) ?? readString2(entry.provider_key) ?? "Custom Provider";
@@ -4266,6 +4299,29 @@ function resolveCompressionModel(config, models) {
 function findManagedModelById(models, id) {
   return models.find((model) => model.id === id);
 }
+function modelConfigMatchesModelIdentity(modelConfig, input) {
+  if (modelConfig.model !== input.id) {
+    return false;
+  }
+  const provider = input.provider?.trim();
+  const configProvider = modelConfig.provider?.trim();
+  if (provider && configProvider && configProvider !== provider) {
+    return false;
+  }
+  const baseUrl = input.baseUrl?.trim();
+  if (baseUrl !== void 0 && normalizeBaseUrl(modelConfig.baseUrl ?? "") !== normalizeBaseUrl(baseUrl)) {
+    return false;
+  }
+  const apiMode = input.apiMode?.trim();
+  if (apiMode) {
+    const providerForApiMode = configProvider ?? provider ?? "default";
+    const configBaseUrl = modelConfig.baseUrl ?? baseUrl ?? "";
+    if (inferApiMode(providerForApiMode, configBaseUrl, modelConfig.apiMode) !== apiMode) {
+      return false;
+    }
+  }
+  return true;
+}
 function findManagedModel(models, input) {
   const provider = input.provider?.trim();
   const baseUrl = input.baseUrl?.trim();
@@ -4430,7 +4486,7 @@ function retainModelDefaultAsProvider(providers, model) {
     writeEntryModelSupportsVision(entry, id, model.supportsVision);
   }
   if (model.keyEnv) {
-    entry.key_env = model.keyEnv;
+    entry.api_key = `\${${model.keyEnv}}`;
   } else if (model.apiKey) {
     entry.api_key = model.apiKey;
   }
@@ -6454,7 +6510,7 @@ function isConversationMissingError(error) {
 }
 
 // src/constants.ts
-var LINK_VERSION = "0.7.4";
+var LINK_VERSION = "0.7.5";
 var LINK_COMMAND = "hermeslink";
 var LINK_DEFAULT_PORT = 52379;
 var LINK_RUNTIME_DIR_NAME = ".hermeslink";
@@ -24497,11 +24553,15 @@ function registerConversationRoutes(router, options) {
   router.get("/api/v1/conversations", async (ctx) => {
     const auth = await authenticateRequest(ctx, paths);
     const language = readPreferredLanguage(ctx);
-    await prepareConversationListRead(conversations, logger, auth);
+    const cursor = readConversationListCursor(ctx.query);
+    const forceSync = readConversationListForce(ctx.query);
+    await prepareConversationListRead(conversations, logger, auth, {
+      syncHermesSessions: forceSync || !cursor
+    });
     ctx.set("cache-control", "no-store");
     const result = await conversations.listConversationPage({
       limit: readLimit(ctx.query.limit),
-      cursor: readQueryString(ctx.query.cursor) ?? readQueryString(ctx.query.after) ?? readQueryString(ctx.query.page_cursor)
+      cursor
     });
     const localized = localizeConversationListPage(result, language);
     ctx.body = {
@@ -25014,7 +25074,15 @@ function registerConversationRoutes(router, options) {
     }
   );
 }
-async function prepareConversationListRead(conversations, logger, auth) {
+async function prepareConversationListRead(conversations, logger, auth, options = {}) {
+  if (options.syncHermesSessions) {
+    await conversations.syncHermesSessions().catch((error) => {
+      void logger.warn("hermes_session_sync_failed", {
+        source: "conversation_list_read",
+        error: error instanceof Error ? error.message : String(error)
+      });
+    });
+  }
   await conversations.backfillCronOwnership({
     accountId: auth.accountId,
     appInstanceId: auth.appInstanceId
@@ -25030,6 +25098,13 @@ async function prepareConversationListRead(conversations, logger, auth) {
     });
   });
 }
+function readConversationListCursor(query) {
+  return readQueryString(query.cursor) ?? readQueryString(query.after) ?? readQueryString(query.page_cursor);
+}
+function readConversationListForce(query) {
+  const raw = Array.isArray(query.force) ? query.force[0] : query.force;
+  return readBoolean3(raw) === true;
+}
 function localizeConversationListPage(page, language) {
   return {
     ...page,
@@ -25783,7 +25858,9 @@ function registerModelConfigRoutes(router, options) {
     const body = await readJsonBody(ctx.req);
     try {
       const result = await saveHermesModelConfig(readModelConfigInput(body));
-      ctx.body = shouldReloadGatewayAfterModelConfigChange(body) ? await reloadGatewayAfterModelConfigChange(result, {
+      ctx.body = shouldReloadGatewayAfterModelConfigChange(body, {
+        defaultReload: true
+      }) ? await reloadGatewayAfterModelConfigChange(result, {
         paths,
         logger
       }) : markModelConfigAppliedWithoutGatewayReload(result);
@@ -25829,7 +25906,9 @@ function registerModelConfigRoutes(router, options) {
         readModelConfigInput(body),
         ctx.params.name
       );
-      ctx.body = shouldReloadGatewayAfterModelConfigChange(body) ? await reloadGatewayAfterProfileModelConfigChange(result, {
+      ctx.body = shouldReloadGatewayAfterModelConfigChange(body, {
+        defaultReload: true
+      }) ? await reloadGatewayAfterProfileModelConfigChange(result, {
         paths,
         logger,
         profileName: ctx.params.name
@@ -25982,15 +26061,20 @@ function readModelConfigImportInput(body) {
     setDefault: readBoolean3(body.set_default ?? body.setDefault)
   };
 }
-function shouldReloadGatewayAfterModelConfigChange(body) {
-  const explicit = readBoolean3(body.reload_gateway ?? body.reloadGateway) ?? (readBoolean3(body.skip_gateway_reload ?? body.skipGatewayReload) === true ? false : void 0);
-  return explicit ?? false;
+function shouldReloadGatewayAfterModelConfigChange(body, options = {}) {
+  if (readBoolean3(body.skip_gateway_reload ?? body.skipGatewayReload) === true) {
+    return false;
+  }
+  if (readBoolean3(body.reload_gateway ?? body.reloadGateway) === true) {
+    return true;
+  }
+  return options.defaultReload === true;
 }
 function markModelConfigAppliedWithoutGatewayReload(result) {
   return {
     ...result,
     requiresGatewayReload: false,
-    restartHint: "\u6A21\u578B\u914D\u7F6E\u5DF2\u4FDD\u5B58\u3002\u65B0\u7684 Run \u4F1A\u76F4\u63A5\u8BFB\u53D6\u6700\u65B0\u914D\u7F6E\uFF0C\u65E0\u9700\u91CD\u8F7D Hermes Gateway\u3002"
+    restartHint: "\u6A21\u578B\u914D\u7F6E\u5DF2\u4FDD\u5B58\uFF0C\u5DF2\u6309\u8BF7\u6C42\u8DF3\u8FC7 Hermes Gateway \u91CD\u8F7D\u3002\u82E5\u521A\u4FEE\u6539 API Key\u3001Base URL \u6216 API Mode\uFF0C\u8BF7\u624B\u52A8\u91CD\u8F7D Gateway \u540E\u518D\u5F00\u59CB\u65B0\u7684 Run\u3002"
   };
 }
 function toModelConfigHttpError(error) {

package/dist/cli/index.js

@@ -53,7 +53,7 @@ import {
   stopDaemonProcess,
   summarizeUsageProbeEnsure,
   translate
-} from "../chunk-3A6ENKXD.js";
+} from "../chunk-MVKOUAVA.js";
 
 // src/cli/index.ts
 import { Command } from "commander";

package/dist/http/app.js

@@ -1,6 +1,6 @@
 import {
   createApp
-} from "../chunk-3A6ENKXD.js";
+} from "../chunk-MVKOUAVA.js";
 export {
   createApp
 };

package/package.json

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