@open-mercato/ai-assistant 0.6.5-develop.5116.1.f0af9e5080 → 0.6.5-develop.5155.1.148d10a46d

package/dist/modules/ai_assistant/lib/log-redaction.js

@@ -1,13 +1,22 @@
-import { createHash } from "node:crypto";
+import { pbkdf2Sync, randomBytes } from "node:crypto";
 function redactSecretForLog(value) {
   if (typeof value !== "string" || value.length === 0) return "<redacted>";
   const prefixLength = Math.min(12, Math.floor(value.length / 2));
   if (prefixLength <= 0) return "<redacted>";
   return `${value.slice(0, prefixLength)}...`;
 }
+const sessionIdHmacKey = randomBytes(32);
+const SESSION_ID_PBKDF2_ITERATIONS = 21e4;
+const SESSION_ID_PBKDF2_KEYLEN = 16;
 function deriveApiKeySessionId(apiKeySecret) {
-  const digest = createHash("sha256").update(apiKeySecret).digest("hex");
-  return `apikey_${digest.slice(0, 16)}`;
+  const digest = pbkdf2Sync(
+    apiKeySecret,
+    sessionIdHmacKey,
+    SESSION_ID_PBKDF2_ITERATIONS,
+    SESSION_ID_PBKDF2_KEYLEN,
+    "sha256"
+  ).toString("hex");
+  return `apikey_${digest}`;
 }
 export {
   deriveApiKeySessionId,

package/dist/modules/ai_assistant/lib/log-redaction.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/ai_assistant/lib/log-redaction.ts"],
-  "sourcesContent": ["import { createHash } from 'node:crypto'\n\n/**\n * Redact a bearer-style secret (session token, API key) for safe logging.\n * Reveals at most a short leading fingerprint and never more than half of the\n * value, so durable logs never carry a replayable credential.\n */\nexport function redactSecretForLog(value: unknown): string {\n  if (typeof value !== 'string' || value.length === 0) return '<redacted>'\n  const prefixLength = Math.min(12, Math.floor(value.length / 2))\n  if (prefixLength <= 0) return '<redacted>'\n  return `${value.slice(0, prefixLength)}...`\n}\n\n/**\n * Derive a stable, non-reversible session-memory id from an API key secret.\n * The same secret always maps to the same id (so tool calls on one MCP\n * connection share a memory cache), but no secret material is exposed because\n * the id is a truncated SHA-256 digest rather than a slice of the secret.\n */\nexport function deriveApiKeySessionId(apiKeySecret: string): string {\n  const digest = createHash('sha256').update(apiKeySecret).digest('hex')\n  return `apikey_${digest.slice(0, 16)}`\n}\n"],
-  "mappings": "AAAA,SAAS,kBAAkB;AAOpB,SAAS,mBAAmB,OAAwB;AACzD,MAAI,OAAO,UAAU,YAAY,MAAM,WAAW,EAAG,QAAO;AAC5D,QAAM,eAAe,KAAK,IAAI,IAAI,KAAK,MAAM,MAAM,SAAS,CAAC,CAAC;AAC9D,MAAI,gBAAgB,EAAG,QAAO;AAC9B,SAAO,GAAG,MAAM,MAAM,GAAG,YAAY,CAAC;AACxC;AAQO,SAAS,sBAAsB,cAA8B;AAClE,QAAM,SAAS,WAAW,QAAQ,EAAE,OAAO,YAAY,EAAE,OAAO,KAAK;AACrE,SAAO,UAAU,OAAO,MAAM,GAAG,EAAE,CAAC;AACtC;",
+  "sourcesContent": ["import { pbkdf2Sync, randomBytes } from 'node:crypto'\n\n/**\n * Redact a bearer-style secret (session token, API key) for safe logging.\n * Reveals at most a short leading fingerprint and never more than half of the\n * value, so durable logs never carry a replayable credential.\n */\nexport function redactSecretForLog(value: unknown): string {\n  if (typeof value !== 'string' || value.length === 0) return '<redacted>'\n  const prefixLength = Math.min(12, Math.floor(value.length / 2))\n  if (prefixLength <= 0) return '<redacted>'\n  return `${value.slice(0, prefixLength)}...`\n}\n\n// Per-process random key so the API key secret is fingerprinted through a keyed\n// HMAC rather than a fast, unkeyed digest. The session id is only an in-process\n// grouping key for the session-memory cache (a process-local Map), so a key that\n// lives for the process lifetime keeps the same-secret-maps-to-same-id guarantee\n// within an MCP connection while ensuring the digest is not derivable from the\n// secret alone. Mirrors the secret fingerprinter in apiKeyAuthCache.ts.\nconst sessionIdHmacKey = randomBytes(32)\nconst SESSION_ID_PBKDF2_ITERATIONS = 210000\nconst SESSION_ID_PBKDF2_KEYLEN = 16\n\n/**\n * Derive a stable, non-reversible session-memory id from an API key secret.\n * The same secret always maps to the same id within a process (so tool calls on\n * one MCP connection share a memory cache), but no secret material is exposed:\n * the id is derived with PBKDF2 (slow KDF) using a per-process random salt.\n */\nexport function deriveApiKeySessionId(apiKeySecret: string): string {\n  const digest = pbkdf2Sync(\n    apiKeySecret,\n    sessionIdHmacKey,\n    SESSION_ID_PBKDF2_ITERATIONS,\n    SESSION_ID_PBKDF2_KEYLEN,\n    'sha256'\n  ).toString('hex')\n  return `apikey_${digest}`\n}\n"],
+  "mappings": "AAAA,SAAS,YAAY,mBAAmB;AAOjC,SAAS,mBAAmB,OAAwB;AACzD,MAAI,OAAO,UAAU,YAAY,MAAM,WAAW,EAAG,QAAO;AAC5D,QAAM,eAAe,KAAK,IAAI,IAAI,KAAK,MAAM,MAAM,SAAS,CAAC,CAAC;AAC9D,MAAI,gBAAgB,EAAG,QAAO;AAC9B,SAAO,GAAG,MAAM,MAAM,GAAG,YAAY,CAAC;AACxC;AAQA,MAAM,mBAAmB,YAAY,EAAE;AACvC,MAAM,+BAA+B;AACrC,MAAM,2BAA2B;AAQ1B,SAAS,sBAAsB,cAA8B;AAClE,QAAM,SAAS;AAAA,IACb;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,EAAE,SAAS,KAAK;AAChB,SAAO,UAAU,MAAM;AACzB;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/ai-assistant",
-  "version": "0.6.5-develop.5116.1.f0af9e5080",
+  "version": "0.6.5-develop.5155.1.148d10a46d",
   "type": "module",
   "engines": {
     "node": ">=22.0.0"
@@ -87,9 +87,9 @@
   "dependencies": {
     "@ai-sdk/anthropic": "^3.0.81",
     "@ai-sdk/google": "^3.0.80",
-    "@ai-sdk/openai": "^3.0.67",
+    "@ai-sdk/openai": "^3.0.68",
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "ai": "^6.0.194",
+    "ai": "^6.0.197",
     "cmdk": "^1.0.0",
     "framer-motion": "^12.40.0",
     "isolated-vm": "^7.0.0",
@@ -98,17 +98,17 @@
     "zod-to-json-schema": "^3.25.2"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.6.5-develop.5116.1.f0af9e5080",
-    "@open-mercato/ui": "0.6.5-develop.5116.1.f0af9e5080",
+    "@open-mercato/shared": "0.6.5-develop.5155.1.148d10a46d",
+    "@open-mercato/ui": "0.6.5-develop.5155.1.148d10a46d",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "zod": ">=3.23.0"
   },
   "devDependencies": {
-    "@open-mercato/cli": "0.6.5-develop.5116.1.f0af9e5080",
-    "@open-mercato/shared": "0.6.5-develop.5116.1.f0af9e5080",
-    "@open-mercato/ui": "0.6.5-develop.5116.1.f0af9e5080",
-    "@types/react": "^19.2.16",
+    "@open-mercato/cli": "0.6.5-develop.5155.1.148d10a46d",
+    "@open-mercato/shared": "0.6.5-develop.5155.1.148d10a46d",
+    "@open-mercato/ui": "0.6.5-develop.5155.1.148d10a46d",
+    "@types/react": "^19.2.17",
     "@types/react-dom": "^19.2.3",
     "react": "19.2.7",
     "react-dom": "19.2.7",

package/src/modules/ai_assistant/lib/__tests__/log-redaction.test.ts

@@ -1,6 +1,8 @@
 import { createHash } from 'node:crypto'
 import { redactSecretForLog, deriveApiKeySessionId } from '../log-redaction'
 
+const SESSION_ID_DIGEST_HEX = 16
+
 describe('redactSecretForLog', () => {
   it('never emits the full session token', () => {
     const token = `sess_${'a'.repeat(32)}`
@@ -43,11 +45,18 @@ describe('deriveApiKeySessionId', () => {
     expect(secret).not.toContain(digestPart)
   })
 
-  it('is a stable truncated sha-256 digest of the secret', () => {
+  it('is stable within a process and shaped as a truncated hex digest', () => {
+    const secret = 'omk_test_secret_value'
+    const sessionId = deriveApiKeySessionId(secret)
+    expect(sessionId).toBe(deriveApiKeySessionId(secret))
+    const digestPart = sessionId.slice('apikey_'.length)
+    expect(digestPart).toMatch(new RegExp(`^[0-9a-f]{${SESSION_ID_DIGEST_HEX}}$`))
+  })
+
+  it('is keyed, not a recomputable unkeyed sha-256 of the secret', () => {
     const secret = 'omk_test_secret_value'
-    const expected = `apikey_${createHash('sha256').update(secret).digest('hex').slice(0, 16)}`
-    expect(deriveApiKeySessionId(secret)).toBe(expected)
-    expect(deriveApiKeySessionId(secret)).toBe(deriveApiKeySessionId(secret))
+    const unkeyed = `apikey_${createHash('sha256').update(secret).digest('hex').slice(0, SESSION_ID_DIGEST_HEX)}`
+    expect(deriveApiKeySessionId(secret)).not.toBe(unkeyed)
   })
 
   it('maps distinct secrets to distinct ids', () => {

package/src/modules/ai_assistant/lib/log-redaction.ts

@@ -1,4 +1,4 @@
-import { createHash } from 'node:crypto'
+import { pbkdf2Sync, randomBytes } from 'node:crypto'
 
 /**
  * Redact a bearer-style secret (session token, API key) for safe logging.
@@ -12,13 +12,29 @@ export function redactSecretForLog(value: unknown): string {
   return `${value.slice(0, prefixLength)}...`
 }
 
+// Per-process random key so the API key secret is fingerprinted through a keyed
+// HMAC rather than a fast, unkeyed digest. The session id is only an in-process
+// grouping key for the session-memory cache (a process-local Map), so a key that
+// lives for the process lifetime keeps the same-secret-maps-to-same-id guarantee
+// within an MCP connection while ensuring the digest is not derivable from the
+// secret alone. Mirrors the secret fingerprinter in apiKeyAuthCache.ts.
+const sessionIdHmacKey = randomBytes(32)
+const SESSION_ID_PBKDF2_ITERATIONS = 210000
+const SESSION_ID_PBKDF2_KEYLEN = 16
+
 /**
  * Derive a stable, non-reversible session-memory id from an API key secret.
- * The same secret always maps to the same id (so tool calls on one MCP
- * connection share a memory cache), but no secret material is exposed because
- * the id is a truncated SHA-256 digest rather than a slice of the secret.
+ * The same secret always maps to the same id within a process (so tool calls on
+ * one MCP connection share a memory cache), but no secret material is exposed:
+ * the id is derived with PBKDF2 (slow KDF) using a per-process random salt.
  */
 export function deriveApiKeySessionId(apiKeySecret: string): string {
-  const digest = createHash('sha256').update(apiKeySecret).digest('hex')
-  return `apikey_${digest.slice(0, 16)}`
+  const digest = pbkdf2Sync(
+    apiKeySecret,
+    sessionIdHmacKey,
+    SESSION_ID_PBKDF2_ITERATIONS,
+    SESSION_ID_PBKDF2_KEYLEN,
+    'sha256'
+  ).toString('hex')
+  return `apikey_${digest}`
 }