@remnic/core 1.1.31 → 9.3.516

package/dist/chunk-B5XMS73R.js

@@ -0,0 +1,145 @@
+import {
+  readEnvVar
+} from "./chunk-JUC24CTX.js";
+import {
+  log
+} from "./chunk-2ODBA7MQ.js";
+
+// src/resolve-provider-secret.ts
+import path from "path";
+var _resolveApiKeyForProviderForTest = null;
+var _getRuntimeAuthForModelForTest = null;
+var resolvedCache = /* @__PURE__ */ new Map();
+var cacheObjectIds = /* @__PURE__ */ new WeakMap();
+var nextCacheObjectId = 1;
+var NON_LITERAL_AUTH_MARKERS = /* @__PURE__ */ new Set([
+  "secretref-managed",
+  "lm-studio"
+]);
+var ENV_VAR_MARKER_RE = /^[A-Z][A-Z0-9_]*(?:_API_KEY|_ACCESS_TOKEN|_TOKEN|_SECRET|_CREDENTIALS|_CREDENTIALS_JSON)$/;
+function isNonLiteralAuthMarker(value) {
+  return NON_LITERAL_AUTH_MARKERS.has(value) || value.endsWith("-oauth") || value.endsWith("-local") || value.startsWith("gcp-") || ENV_VAR_MARKER_RE.test(value);
+}
+function resolveFromNamedEnvVar(marker) {
+  if (!ENV_VAR_MARKER_RE.test(marker)) return void 0;
+  const value = readEnvVar(marker);
+  return value && value.trim().length > 0 ? value.trim() : void 0;
+}
+function cacheIdentity(value) {
+  if (value === null) return "null";
+  if (value === void 0) return "undefined";
+  if (typeof value === "string") return `string:${value}`;
+  if (typeof value === "number") return `number:${String(value)}`;
+  if (typeof value === "boolean") return `boolean:${String(value)}`;
+  if (typeof value === "bigint") return `bigint:${String(value)}`;
+  if (typeof value === "symbol") return typeof value;
+  if (typeof value === "function") return cacheObjectIdentity(value);
+  if (typeof value === "object") {
+    return cacheObjectIdentity(value);
+  }
+  return String(value);
+}
+function cacheObjectIdentity(value) {
+  const existingId = cacheObjectIds.get(value);
+  if (existingId !== void 0) return `object:${existingId}`;
+  const newId = nextCacheObjectId++;
+  cacheObjectIds.set(value, newId);
+  return `object:${newId}`;
+}
+function providerSecretCacheKey(providerId, resolvedAgentDir, apiKeyValue, gatewayConfig, resolverContext) {
+  return [
+    `provider:${providerId}`,
+    `agentDir:${resolvedAgentDir}`,
+    `apiKey:${cacheIdentity(apiKeyValue)}`,
+    `cfg:${cacheIdentity(gatewayConfig)}`,
+    `resolver:${cacheIdentity(resolverContext)}`
+  ].join(":");
+}
+async function resolveProviderApiKey(providerId, apiKeyValue, gatewayConfig, agentDir, options = {}) {
+  const resolvedAgentDir = agentDir ? path.resolve(agentDir) : "";
+  let resolved;
+  if (typeof apiKeyValue === "string" && apiKeyValue.trim().length > 0) {
+    const trimmedApiKeyValue = apiKeyValue.trim();
+    if (isNonLiteralAuthMarker(trimmedApiKeyValue)) {
+      const markerEnvValue = resolveFromNamedEnvVar(trimmedApiKeyValue);
+      if (markerEnvValue) {
+        return markerEnvValue;
+      }
+    } else {
+      return trimmedApiKeyValue;
+    }
+  }
+  const resolver = options.resolveApiKeyForProvider ?? _resolveApiKeyForProviderForTest;
+  const cacheKey = providerSecretCacheKey(
+    providerId,
+    resolvedAgentDir,
+    apiKeyValue,
+    gatewayConfig,
+    resolver ?? null
+  );
+  if (resolvedCache.has(cacheKey)) {
+    return resolvedCache.get(cacheKey);
+  }
+  if (resolver) {
+    try {
+      const auth = await resolver({ provider: providerId, cfg: gatewayConfig, agentDir: resolvedAgentDir });
+      if (auth?.apiKey) {
+        resolved = auth.apiKey;
+        log.debug(`resolved API key for provider "${providerId}" via host auth (source: ${auth.source ?? "unknown"}, mode: ${auth.mode ?? "unknown"})`);
+        resolvedCache.set(cacheKey, resolved);
+        return resolved;
+      }
+    } catch (err) {
+      log.debug(
+        `host auth resolution failed for provider "${providerId}": ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  }
+  resolved = resolveFromEnv(providerId);
+  if (resolved) {
+    log.debug(`resolved API key for provider "${providerId}" from environment variable`);
+  } else {
+    log.debug(`could not resolve API key for provider "${providerId}" \u2014 skipping`);
+  }
+  if (resolved) {
+    resolvedCache.set(cacheKey, resolved);
+  }
+  return resolved;
+}
+function resolveFromEnv(providerId) {
+  const normalized = providerId.toUpperCase().replace(/[^A-Z0-9]/g, "_");
+  const candidates = [
+    `${normalized}_API_KEY`,
+    `${normalized}_TOKEN`
+  ];
+  for (const envVar of candidates) {
+    const value = readEnvVar(envVar);
+    if (value && value.trim().length > 0) {
+      return value.trim();
+    }
+  }
+  return void 0;
+}
+async function getGatewayRuntimeAuthForModel(options = {}) {
+  return options.getRuntimeAuthForModel ?? _getRuntimeAuthForModelForTest;
+}
+function clearSecretCache() {
+  resolvedCache.clear();
+  _resolveApiKeyForProviderForTest = null;
+  _getRuntimeAuthForModelForTest = null;
+}
+function __setGatewayResolverForTest(resolver) {
+  _resolveApiKeyForProviderForTest = resolver;
+}
+function __setGatewayRuntimeAuthForModelForTest(resolver) {
+  _getRuntimeAuthForModelForTest = resolver;
+}
+
+export {
+  resolveProviderApiKey,
+  getGatewayRuntimeAuthForModel,
+  clearSecretCache,
+  __setGatewayResolverForTest,
+  __setGatewayRuntimeAuthForModelForTest
+};
+//# sourceMappingURL=chunk-B5XMS73R.js.map

package/dist/chunk-B5XMS73R.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/resolve-provider-secret.ts"],"sourcesContent":["import { log } from \"./logger.js\";\nimport { readEnvVar } from \"./runtime/env.js\";\nimport path from \"node:path\";\n\n/**\n * Resolve provider API keys while keeping core host-agnostic.\n *\n * Plain-text API keys and provider-derived environment variables are handled\n * directly. Host-specific secret references are resolved only when the caller\n * supplies the host's native resolver. Core must not discover OpenClaw, Hermes,\n * or any other runtime on its own.\n *\n * Results are cached per provider and resolver context for the process lifetime.\n */\n\nexport type ResolveApiKeyFn = (params: {\n  provider: string;\n  cfg?: unknown;\n  agentDir?: string;\n}) => Promise<{ apiKey?: string; source?: string; mode?: string } | null>;\n\n/**\n * Resolve request-ready auth for a model, including provider-owned transforms\n * (e.g., OAuth token exchange, base URL override for openai-codex).\n */\nexport type GetRuntimeAuthForModelFn = (params: {\n  model: { provider: string; id: string; api?: string; baseUrl?: string };\n  cfg?: unknown;\n  workspaceDir?: string;\n}) => Promise<{\n  apiKey?: string;\n  baseUrl?: string;\n  source?: string;\n  mode?: string;\n  profileId?: string;\n} | null>;\n\nexport interface ProviderSecretResolutionOptions {\n  resolveApiKeyForProvider?: ResolveApiKeyFn | null;\n}\n\nexport interface RuntimeAuthResolutionOptions {\n  getRuntimeAuthForModel?: GetRuntimeAuthForModelFn | null;\n}\n\nlet _resolveApiKeyForProviderForTest: ResolveApiKeyFn | null = null;\nlet _getRuntimeAuthForModelForTest: GetRuntimeAuthForModelFn | null = null;\nconst resolvedCache = new Map<string, string | undefined>();\nconst cacheObjectIds = new WeakMap<object, number>();\nlet nextCacheObjectId = 1;\nconst NON_LITERAL_AUTH_MARKERS = new Set([\n  \"secretref-managed\",\n  \"lm-studio\",\n]);\nconst ENV_VAR_MARKER_RE =\n  /^[A-Z][A-Z0-9_]*(?:_API_KEY|_ACCESS_TOKEN|_TOKEN|_SECRET|_CREDENTIALS|_CREDENTIALS_JSON)$/;\n\nfunction isNonLiteralAuthMarker(value: string): boolean {\n  return (\n    NON_LITERAL_AUTH_MARKERS.has(value) ||\n    value.endsWith(\"-oauth\") ||\n    value.endsWith(\"-local\") ||\n    value.startsWith(\"gcp-\") ||\n    ENV_VAR_MARKER_RE.test(value)\n  );\n}\n\nfunction resolveFromNamedEnvVar(marker: string): string | undefined {\n  if (!ENV_VAR_MARKER_RE.test(marker)) return undefined;\n  const value = readEnvVar(marker);\n  return value && value.trim().length > 0 ? value.trim() : undefined;\n}\n\nfunction cacheIdentity(value: unknown): string {\n  if (value === null) return \"null\";\n  if (value === undefined) return \"undefined\";\n  if (typeof value === \"string\") return `string:${value}`;\n  if (typeof value === \"number\") return `number:${String(value)}`;\n  if (typeof value === \"boolean\") return `boolean:${String(value)}`;\n  if (typeof value === \"bigint\") return `bigint:${String(value)}`;\n  if (typeof value === \"symbol\") return typeof value;\n  if (typeof value === \"function\") return cacheObjectIdentity(value as object);\n  if (typeof value === \"object\") {\n    return cacheObjectIdentity(value);\n  }\n  return String(value);\n}\n\nfunction cacheObjectIdentity(value: object): string {\n  const existingId = cacheObjectIds.get(value);\n  if (existingId !== undefined) return `object:${existingId}`;\n  const newId = nextCacheObjectId++;\n  cacheObjectIds.set(value, newId);\n  return `object:${newId}`;\n}\n\nfunction providerSecretCacheKey(\n  providerId: string,\n  resolvedAgentDir: string,\n  apiKeyValue: unknown,\n  gatewayConfig: unknown,\n  resolverContext: unknown,\n): string {\n  return [\n    `provider:${providerId}`,\n    `agentDir:${resolvedAgentDir}`,\n    `apiKey:${cacheIdentity(apiKeyValue)}`,\n    `cfg:${cacheIdentity(gatewayConfig)}`,\n    `resolver:${cacheIdentity(resolverContext)}`,\n  ].join(\":\");\n}\n\n/**\n * Resolve a provider API key from literal values, environment markers, or an\n * injected host resolver.\n *\n * Resolution order:\n * 1. Plain-text string → returned immediately\n * 2. Injected host resolveApiKeyForProvider → handles host secret ref formats\n * 3. Environment variable fallback (PROVIDER_NAME_API_KEY)\n * 4. undefined → provider is skipped in the fallback chain\n */\nexport async function resolveProviderApiKey(\n  providerId: string,\n  apiKeyValue: unknown,\n  gatewayConfig?: unknown,\n  agentDir?: string,\n  options: ProviderSecretResolutionOptions = {},\n): Promise<string | undefined> {\n  const resolvedAgentDir = agentDir ? path.resolve(agentDir) : \"\";\n\n  let resolved: string | undefined;\n\n  // Fast path: plain-text string that looks like an actual API key\n  if (typeof apiKeyValue === \"string\" && apiKeyValue.trim().length > 0) {\n    const trimmedApiKeyValue = apiKeyValue.trim();\n    // Skip known non-API-key markers used by the gateway for auth modes,\n    // plus env-var-shaped markers such as OPENAI_API_KEY.\n    if (isNonLiteralAuthMarker(trimmedApiKeyValue)) {\n      const markerEnvValue = resolveFromNamedEnvVar(trimmedApiKeyValue);\n      if (markerEnvValue) {\n        return markerEnvValue;\n      }\n      // Fall through to gateway resolver / env var fallback\n    } else {\n      return trimmedApiKeyValue;\n    }\n  }\n\n  const resolver = options.resolveApiKeyForProvider ?? _resolveApiKeyForProviderForTest;\n  const cacheKey = providerSecretCacheKey(\n    providerId,\n    resolvedAgentDir,\n    apiKeyValue,\n    gatewayConfig,\n    resolver ?? null,\n  );\n  if (resolvedCache.has(cacheKey)) {\n    return resolvedCache.get(cacheKey);\n  }\n\n  // The API key is either a SecretRef object, \"secretref-managed\", or empty.\n  // Try the host-supplied auth resolution system first.\n  if (resolver) {\n    try {\n      const auth = await resolver({ provider: providerId, cfg: gatewayConfig, agentDir: resolvedAgentDir });\n      if (auth?.apiKey) {\n        resolved = auth.apiKey;\n        log.debug(`resolved API key for provider \"${providerId}\" via host auth (source: ${auth.source ?? \"unknown\"}, mode: ${auth.mode ?? \"unknown\"})`);\n        resolvedCache.set(cacheKey, resolved);\n        return resolved;\n      }\n    } catch (err) {\n      log.debug(\n        `host auth resolution failed for provider \"${providerId}\": ${err instanceof Error ? err.message : String(err)}`,\n      );\n    }\n  }\n\n  // Environment variable fallback\n  resolved = resolveFromEnv(providerId);\n  if (resolved) {\n    log.debug(`resolved API key for provider \"${providerId}\" from environment variable`);\n  } else {\n    log.debug(`could not resolve API key for provider \"${providerId}\" — skipping`);\n  }\n\n  // Only cache successful resolutions — failures are retried on next call\n  // so providers can recover after transient issues (e.g., 1Password agent restart)\n  if (resolved) {\n    resolvedCache.set(cacheKey, resolved);\n  }\n  return resolved;\n}\n\n/**\n * Try to resolve an API key from environment variables.\n */\nfunction resolveFromEnv(providerId: string): string | undefined {\n  const normalized = providerId.toUpperCase().replace(/[^A-Z0-9]/g, \"_\");\n  const candidates = [\n    `${normalized}_API_KEY`,\n    `${normalized}_TOKEN`,\n  ];\n  for (const envVar of candidates) {\n    const value = readEnvVar(envVar);\n    if (value && value.trim().length > 0) {\n      return value.trim();\n    }\n  }\n  return undefined;\n}\n\n/**\n * Get a host-supplied getRuntimeAuthForModel function, if available.\n * This resolves request-ready auth including provider-owned transforms\n * (OAuth token exchange, base URL override for codex/copilot/etc.).\n */\nexport async function getGatewayRuntimeAuthForModel(\n  options: RuntimeAuthResolutionOptions = {},\n): Promise<GetRuntimeAuthForModelFn | null> {\n  return options.getRuntimeAuthForModel ?? _getRuntimeAuthForModelForTest;\n}\n\n/**\n * Clear the resolution cache (useful for testing or key rotation).\n */\nexport function clearSecretCache(): void {\n  resolvedCache.clear();\n  _resolveApiKeyForProviderForTest = null;\n  _getRuntimeAuthForModelForTest = null;\n}\n\nexport function __setGatewayResolverForTest(resolver: ResolveApiKeyFn | null): void {\n  _resolveApiKeyForProviderForTest = resolver;\n}\n\nexport function __setGatewayRuntimeAuthForModelForTest(\n  resolver: GetRuntimeAuthForModelFn | null,\n): void {\n  _getRuntimeAuthForModelForTest = resolver;\n}\n"],"mappings":"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","names":[]}

package/dist/{chunk-HXXBL2KD.js → chunk-BECQDWBA.js}

@@ -1,6 +1,6 @@
 import {
   isValidConnectorId
-} from "./chunk-LPMVBPA3.js";
+} from "./chunk-CWWMTTQE.js";
 
 // src/connectors/live/registry.ts
 var LiveConnectorRegistryError = class extends Error {
@@ -858,15 +858,22 @@ async function incrementalSync(fetchFn, config, payload, signal) {
       let cutoffMidPage = false;
       for (const notionPage of pageResp.results ?? []) {
         throwIfAborted2(signal);
-        totalConsumed++;
         const pageId = notionPage.id;
         const lastEdited = notionPage.last_edited_time;
         if (typeof pageId !== "string" || typeof lastEdited !== "string") continue;
         const knownRevision = payload.pages[pageId];
         if (knownRevision && knownRevision >= lastEdited) {
           skippedUnchanged++;
+          if (!latestInDb || lastEdited > latestInDb) {
+            latestInDb = lastEdited;
+          }
           continue;
         }
+        if (totalConsumed >= MAX_PAGES_PER_PASS) {
+          cutoffMidPage = true;
+          break;
+        }
+        totalConsumed++;
         const doc = await fetchPageDocument(
           fetchFn,
           config.token,
@@ -877,9 +884,15 @@ async function incrementalSync(fetchFn, config, payload, signal) {
         if (doc === "too-large") {
           skippedTooLarge++;
           updatedPages[pageId] = lastEdited;
+          if (!latestInDb || lastEdited > latestInDb) {
+            latestInDb = lastEdited;
+          }
         } else if (doc === "empty") {
           skippedEmpty++;
           updatedPages[pageId] = lastEdited;
+          if (!latestInDb || lastEdited > latestInDb) {
+            latestInDb = lastEdited;
+          }
         } else if (doc !== null) {
           newDocs.push(doc);
           updatedPages[pageId] = lastEdited;
@@ -888,6 +901,9 @@ async function incrementalSync(fetchFn, config, payload, signal) {
           }
         } else {
           updatedPages[pageId] = lastEdited;
+          if (!latestInDb || lastEdited > latestInDb) {
+            latestInDb = lastEdited;
+          }
         }
         if (totalConsumed >= MAX_PAGES_PER_PASS) {
           cutoffMidPage = true;
@@ -1934,7 +1950,10 @@ async function fetchAndFilterComments(fetchFn, token, firstPageUrl, repo, kind,
     for (const item of data) {
       if (consumed >= remainingBudget) break;
       throwIfAborted4(signal);
-      const comment = item;
+      const comment = normalizeGitHubComment(item, kind);
+      if (!comment) {
+        continue;
+      }
       if (since && comment.updated_at < since) {
         continue;
       }
@@ -1982,6 +2001,27 @@ async function fetchAndFilterComments(fetchFn, token, firstPageUrl, repo, kind,
   }
   return { docs, skippedOtherAuthor, skippedEmpty, skippedTooLarge, consumed, latestWatermark, newSeenIds };
 }
+function normalizeGitHubComment(item, kind) {
+  if (typeof item !== "object" || item === null) {
+    return null;
+  }
+  if (kind !== "discussion") {
+    return item;
+  }
+  const discussion = item;
+  const updatedAt = discussion.updatedAt ?? discussion.createdAt;
+  if (typeof discussion.id !== "number" || typeof updatedAt !== "string") {
+    return null;
+  }
+  return {
+    id: discussion.id,
+    body: discussion.body,
+    user: discussion.author,
+    created_at: discussion.createdAt ?? updatedAt,
+    updated_at: updatedAt,
+    html_url: discussion.url
+  };
+}
 function advancePageUrl(url) {
   try {
     const u = new URL(url);
@@ -2037,4 +2077,4 @@ export {
   validateGitHubConfig,
   createGitHubConnector
 };
-//# sourceMappingURL=chunk-HXXBL2KD.js.map
+//# sourceMappingURL=chunk-BECQDWBA.js.map