@pellux/goodvibes-sdk 0.21.30 → 0.21.33

package/dist/_internal/platform/daemon/http-listener.js

@@ -1,4 +1,6 @@
+import { randomUUID } from 'node:crypto';
 import { logger } from '../utils/logger.js';
+import { authFailureTotal, authSuccessTotal, httpRequestDurationMs, httpRequestsTotal, } from '../runtime/metrics.js';
 import { HookDispatcher } from '../hooks/dispatcher.js';
 import { authenticateOperatorRequest, buildOperatorSessionCookie, } from '../security/http-auth.js';
 import { UserAuthManager } from '../security/user-auth.js';
@@ -8,77 +10,7 @@ import { summarizeError } from '../utils/error-display.js';
 import { requirePortAvailable } from './port-check.js';
 import { resolveHostBinding } from './host-resolver.js';
 import { createHostModeRestartWatcher } from './host-mode-watcher.js';
-// ---------------------------------------------------------------------------
-// Rate limiter (sliding window per IP, in-memory)
-// ---------------------------------------------------------------------------
-const RATE_WINDOW_MS = 60_000;
-/** Entries older than this are eligible for TTL eviction. Default: 10 minutes. */
-const RATE_TTL_MS = 10 * 60_000;
-/** Maximum number of IP entries kept in the limiter at any time (LRU eviction). */
-const RATE_MAX_ENTRIES = 10_000;
-/** How often the background sweep runs to evict expired entries (ms). */
-const RATE_SWEEP_INTERVAL_MS = 60_000;
-class RateLimiter {
-    limit;
-    /** hits[ip] = sorted ascending array of request timestamps within the window */
-    counts = new Map();
-    /**
-     * O(1) LRU tracking via Map insertion-order semantics.
-     * Key = ip, value = last-seen timestamp.
-     * To promote an entry to MRU: delete it and re-set it (both O(1)).
-     * The Map iterator yields entries in insertion order, so the first entry is
-     * the least-recently-used — perfect for LRU eviction without any indexOf scan.
-     * (PERF-02)
-     */
-    lruMap = new Map();
-    sweepInterval = null;
-    constructor(limit) {
-        this.limit = limit;
-        // Periodic sweep to evict entries whose TTL has expired.
-        this.sweepInterval = setInterval(() => this._sweep(), RATE_SWEEP_INTERVAL_MS);
-        // Don't block clean process exit (PERF-07).
-        this.sweepInterval.unref?.();
-    }
-    /** Returns true if the request is allowed, false if rate-limited. */
-    check(ip) {
-        const now = Date.now();
-        const windowStart = now - RATE_WINDOW_MS;
-        const hits = (this.counts.get(ip) ?? []).filter((t) => t > windowStart);
-        hits.push(now);
-        this.counts.set(ip, hits);
-        // Promote to MRU: delete then re-set (both O(1) Map operations).
-        this.lruMap.delete(ip);
-        this.lruMap.set(ip, now);
-        // Evict least-recently-used entry when cap is exceeded.
-        if (this.lruMap.size > RATE_MAX_ENTRIES) {
-            const evict = this.lruMap.keys().next().value;
-            if (evict !== undefined) {
-                this.lruMap.delete(evict);
-                this.counts.delete(evict);
-            }
-        }
-        return hits.length <= this.limit;
-    }
-    /** Stop the background sweep interval. Call this when the listener stops. */
-    stop() {
-        if (this.sweepInterval !== null) {
-            clearInterval(this.sweepInterval);
-            this.sweepInterval = null;
-        }
-    }
-    /** Evict entries whose last-seen timestamp is older than RATE_TTL_MS. */
-    _sweep() {
-        const cutoff = Date.now() - RATE_TTL_MS;
-        for (const [ip, lastSeen] of this.lruMap) {
-            // Map iteration is insertion-order; first entries are oldest.
-            // Break early once we hit a non-expired entry (all subsequent are newer).
-            if (lastSeen >= cutoff)
-                break;
-            this.lruMap.delete(ip);
-            this.counts.delete(ip);
-        }
-    }
-}
+import { RateLimiter } from './http/rate-limiter.js';
 // ---------------------------------------------------------------------------
 // HttpListener
 // ---------------------------------------------------------------------------
@@ -323,8 +255,36 @@ export class HttpListener {
     // Request handling
     // -------------------------------------------------------------------------
     async handleRequest(req) {
+        const requestId = randomUUID();
+        const startMs = Date.now();
         const url = new URL(req.url);
         const clientIp = extractForwardedClientIp(req, this.trustProxy || (this.tlsState?.trustProxy ?? false)) ?? 'unknown';
+        let response = null;
+        try {
+            response = await this._handleRequestInner(req, url, clientIp, requestId);
+            return response;
+        }
+        finally {
+            const status = response?.status ?? 500;
+            const latencyMs = Date.now() - startMs;
+            // OBS-01: structured HTTP access log — SIEM-ingestable
+            logger.info('HTTP_ACCESS_LOG', {
+                type: 'HTTP_ACCESS_LOG',
+                requestId,
+                method: req.method,
+                path: url.pathname,
+                status,
+                latencyMs,
+                clientIp,
+            });
+            // C-1: record HTTP metric instruments
+            const statusClass = status >= 500 ? '5xx' : status >= 400 ? '4xx' : '2xx';
+            const pathPattern = url.pathname.replace(/\/[0-9a-f-]{8,}(?=\/|$)/gi, '/:id');
+            httpRequestsTotal.add(1, { method: req.method, status_class: statusClass });
+            httpRequestDurationMs.record(latencyMs, { method: req.method, path_pattern: pathPattern, status_class: statusClass });
+        }
+    }
+    async _handleRequestInner(req, url, clientIp, requestId) {
         // SEC-07: CORS origin check is OPT-IN via enforceCors. Default is permissive
         // (home/single-user deployments) — pre-0.21.29 behavior preserved. When
         // enforceCors is true:
@@ -351,7 +311,7 @@ export class HttpListener {
             if (!this.loginRateLimiter.check(clientIp)) {
                 return Response.json({ error: 'Too many requests' }, { status: 429 });
             }
-            return this.handleLogin(req);
+            return this.handleLogin(req, clientIp, requestId);
         }
         // General rate limiting for all other routes.
         if (!this.rateLimiter.check(clientIp)) {
@@ -370,7 +330,7 @@ export class HttpListener {
         }
         return Response.json({ error: 'Not found' }, { status: 404 });
     }
-    async handleLogin(req) {
+    async handleLogin(req, clientIp, requestId) {
         const body = await this.parseJsonBody(req);
         if (body instanceof Response)
             return body;
@@ -378,9 +338,29 @@ export class HttpListener {
         const password = typeof body.password === 'string' ? body.password : '';
         const user = this.userAuth.authenticate(username, password);
         if (!user) {
+            // OBS-02: AUTH_FAILED — never log credential values
+            logger.warn('AUTH_FAILED', {
+                type: 'AUTH_FAILED',
+                requestId,
+                usernameAttempted: username,
+                clientIp,
+                reason: 'invalid_credentials',
+            });
+            // C-1: record auth failure metric
+            authFailureTotal.add(1);
             return Response.json({ error: 'Invalid credentials' }, { status: 401 });
         }
         const session = this.userAuth.createSession(user.username);
+        // OBS-02: AUTH_SUCCEEDED — never log credential values
+        // C-1: record auth success metric
+        authSuccessTotal.add(1);
+        logger.info('AUTH_SUCCEEDED', {
+            type: 'AUTH_SUCCEEDED',
+            requestId,
+            username: user.username,
+            clientIp,
+            method: 'password',
+        });
         return Response.json({
             authenticated: true,
             token: session.token,

package/dist/_internal/platform/daemon/surface-delivery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"surface-delivery.d.ts","sourceRoot":"","sources":["../../../../src/_internal/platform/daemon/surface-delivery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"surface-delivery.d.ts","sourceRoot":"","sources":["../../../../src/_internal/platform/daemon/surface-delivery.ts"],"names":[],"mappings":"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"}

package/dist/_internal/platform/daemon/surface-delivery.js

@@ -3,6 +3,7 @@ import { SlackIntegration, DiscordIntegration, NtfyIntegration } from '../integr
 import { logger } from '../utils/logger.js';
 import { validatePublicWebhookUrl } from '../utils/url-safety.js';
 import { summarizeError } from '../utils/error-display.js';
+import { instrumentedFetch } from '../utils/fetch-with-timeout.js';
 function isSupportedDeliverySurface(surface) {
     return surface === 'slack'
         || surface === 'discord'
@@ -116,7 +117,7 @@ export class DaemonSurfaceDeliveryHelper {
                 ?? process.env.SLACK_BOT_TOKEN;
             const slack = new SlackIntegration(webhookUrl ?? undefined, botToken ?? undefined);
             if (pending.responseUrl) {
-                await fetch(pending.responseUrl, {
+                await instrumentedFetch(pending.responseUrl, {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },
                     body: JSON.stringify({
@@ -153,7 +154,7 @@ export class DaemonSurfaceDeliveryHelper {
             ?? process.env.SLACK_BOT_TOKEN;
         const slack = new SlackIntegration(webhookUrl ?? undefined, botToken ?? undefined);
         if (pending.responseUrl) {
-            await fetch(pending.responseUrl, {
+            await instrumentedFetch(pending.responseUrl, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify({
@@ -237,7 +238,7 @@ export class DaemonSurfaceDeliveryHelper {
         else if (secret && pending.callbackSignature === 'shared-secret') {
             headers.set('X-Goodvibes-Webhook-Secret', secret);
         }
-        await fetch(validation.url, {
+        await instrumentedFetch(validation.url, {
             method: 'POST',
             headers,
             signal: AbortSignal.timeout(timeoutMs),
@@ -379,7 +380,7 @@ export class DaemonSurfaceDeliveryHelper {
             ]
             : undefined;
         if (typeof binding.metadata.responseUrl === 'string' && binding.metadata.responseUrl.startsWith('https://')) {
-            await fetch(binding.metadata.responseUrl, {
+            await instrumentedFetch(binding.metadata.responseUrl, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify({
@@ -450,7 +451,7 @@ export class DaemonSurfaceDeliveryHelper {
         if (secret) {
             headers.set('X-Goodvibes-Signature', this.signWebhookPayload(payload, secret));
         }
-        await fetch(validation.url, {
+        await instrumentedFetch(validation.url, {
             method: 'POST',
             headers,
             body: payload,

package/dist/_internal/platform/discovery/mcp-scanner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-scanner.d.ts","sourceRoot":"","sources":["../../../../src/_internal/platform/discovery/mcp-scanner.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAIlE,MAAM,WAAW,kBAAkB;IACjC,wDAAwD;IACxD,WAAW,EAAE,eAAe,EAAE,CAAC;IAC/B,kCAAkC;IAClC,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,EAAE,kBAAkB,GAAG,eAAe,CAAC,GAAG;IAC7F,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B,CAAC;AA4KF;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,KAAK,EAAE,iBAAiB,EACxB,eAAe,GAAE,GAAG,CAAC,MAAM,CAAa,GACvC,OAAO,CAAC,kBAAkB,CAAC,CAiC7B"}
+{"version":3,"file":"mcp-scanner.d.ts","sourceRoot":"","sources":["../../../../src/_internal/platform/discovery/mcp-scanner.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAIlE,MAAM,WAAW,kBAAkB;IACjC,wDAAwD;IACxD,WAAW,EAAE,eAAe,EAAE,CAAC;IAC/B,kCAAkC;IAClC,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,EAAE,kBAAkB,GAAG,eAAe,CAAC,GAAG;IAC7F,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B,CAAC;AA4KF;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,KAAK,EAAE,iBAAiB,EACxB,eAAe,GAAE,GAAG,CAAC,MAAM,CAAa,GACvC,OAAO,CAAC,kBAAkB,CAAC,CAwC7B"}

package/dist/_internal/platform/discovery/mcp-scanner.js

@@ -11,7 +11,7 @@
  *
  * Returns suggested McpServerConfig[] for servers not already in the registry.
  */
-import { existsSync, readdirSync, statSync } from 'fs';
+import { readdir, stat } from 'node:fs/promises';
 import { join } from 'path';
 import { logger } from '../utils/logger.js';
 import { requireSurfaceRoot } from '../runtime/surface-root.js';
@@ -50,15 +50,15 @@ function deriveServerName(nameOrPath) {
  * Check if a given package is installed locally (in node_modules).
  * Returns the bin path if found, null otherwise.
  */
-function findLocalNpxBin(cwd, packageName) {
+async function findLocalNpxBin(cwd, packageName) {
     // Check project-local node_modules/.bin
     const binName = packageName.replace(/^@[^/]+\//, '');
     const localBin = join(cwd, 'node_modules', '.bin', binName);
-    if (existsSync(localBin))
+    if (await stat(localBin).then(() => true).catch(() => false))
         return localBin;
     // Also check if the package itself exists in node_modules
     const localPkg = join(cwd, 'node_modules', packageName, 'package.json');
-    if (existsSync(localPkg))
+    if (await stat(localPkg).then(() => true).catch(() => false))
         return packageName;
     return null;
 }
@@ -68,27 +68,27 @@ function findLocalNpxBin(cwd, packageName) {
  *   - .mcp/mcp.json (already handled by loadMcpConfig, skip)
  *   - .mcp/<name>/index.js or .mcp/<name>/index.ts or .mcp/<name>/server.js
  */
-function scanProjectMcpDir(roots, knownNames) {
+async function scanProjectMcpDir(roots, knownNames) {
     const mcpDir = join(roots.workingDirectory, '.mcp');
-    if (!existsSync(mcpDir))
+    if (!await stat(mcpDir).then(() => true).catch(() => false))
         return [];
     const suggestions = [];
     try {
-        const entries = readdirSync(mcpDir);
+        const entries = await readdir(mcpDir);
         for (const entry of entries) {
             // Skip mcp.json — already read by loadMcpConfig
             if (entry === 'mcp.json')
                 continue;
             const entryPath = join(mcpDir, entry);
             try {
-                const stat = statSync(entryPath);
-                if (!stat.isDirectory())
+                const entryStat = await stat(entryPath);
+                if (!entryStat.isDirectory())
                     continue;
                 // Look for a server entry point inside the subdirectory
                 const candidates = ['index.js', 'index.ts', 'server.js', 'server.ts', 'main.js', 'main.ts'];
                 for (const candidate of candidates) {
                     const candidatePath = join(entryPath, candidate);
-                    if (existsSync(candidatePath)) {
+                    if (await stat(candidatePath).then(() => true).catch(() => false)) {
                         if (knownNames.has(entry))
                             break; // already registered
                         const runtime = candidate.endsWith('.ts') ? 'bun' : 'node';
@@ -117,22 +117,22 @@ function scanProjectMcpDir(roots, knownNames) {
  *   - <name>/index.js, <name>/server.js, etc.
  *   - <name>.js, <name>.ts standalone scripts
  */
-function scanGoodvibesMcpDir(roots, knownNames) {
+async function scanGoodvibesMcpDir(roots, knownNames) {
     const mcpDir = join(roots.homeDirectory, '.goodvibes', requireSurfaceRoot(roots.surfaceRoot, 'MCP discovery surfaceRoot'), 'mcp');
-    if (!existsSync(mcpDir))
+    if (!await stat(mcpDir).then(() => true).catch(() => false))
         return [];
     const suggestions = [];
     try {
-        const entries = readdirSync(mcpDir);
+        const entries = await readdir(mcpDir);
         for (const entry of entries) {
             const entryPath = join(mcpDir, entry);
             try {
-                const stat = statSync(entryPath);
-                if (stat.isDirectory()) {
+                const entryStat = await stat(entryPath);
+                if (entryStat.isDirectory()) {
                     const candidates = ['index.js', 'index.ts', 'server.js', 'server.ts'];
                     for (const candidate of candidates) {
                         const candidatePath = join(entryPath, candidate);
-                        if (existsSync(candidatePath)) {
+                        if (await stat(candidatePath).then(() => true).catch(() => false)) {
                             if (knownNames.has(entry))
                                 break;
                             const runtime = candidate.endsWith('.ts') ? 'bun' : 'node';
@@ -141,7 +141,7 @@ function scanGoodvibesMcpDir(roots, knownNames) {
                         }
                     }
                 }
-                else if (stat.isFile()) {
+                else if (entryStat.isFile()) {
                     // Standalone script: name.js or name.ts
                     if (!entry.endsWith('.js') && !entry.endsWith('.ts'))
                         continue;
@@ -165,10 +165,10 @@ function scanGoodvibesMcpDir(roots, knownNames) {
 /**
  * Check for locally-installed npx MCP packages not already registered.
  */
-function scanNpxMcpPackages(roots, knownNames) {
+async function scanNpxMcpPackages(roots, knownNames) {
     const suggestions = [];
     for (const pkg of KNOWN_NPX_MCP_PACKAGES) {
-        const binPath = findLocalNpxBin(roots.workingDirectory, pkg);
+        const binPath = await findLocalNpxBin(roots.workingDirectory, pkg);
         if (!binPath)
             continue;
         const serverName = deriveServerName(pkg);
@@ -202,15 +202,21 @@ export async function scanMcpServers(roots, registeredNames = new Set()) {
             }
         }
     };
+    // Run all three scanners in parallel — they are independent
+    const [projectResults, goodvibesResults, npxResults] = await Promise.all([
+        scanProjectMcpDir(roots, registeredNames),
+        scanGoodvibesMcpDir(roots, registeredNames),
+        scanNpxMcpPackages(roots, registeredNames),
+    ]);
     // 1. Project .mcp/ directory
     locationsScanned++;
-    addSuggestions(scanProjectMcpDir(roots, registeredNames));
+    addSuggestions(projectResults);
     // 2. ~/.goodvibes/<surface>/mcp/ user-global directory
     locationsScanned++;
-    addSuggestions(scanGoodvibesMcpDir(roots, registeredNames));
+    addSuggestions(goodvibesResults);
     // 3. Locally installed npx MCP packages
     locationsScanned++;
-    addSuggestions(scanNpxMcpPackages(roots, registeredNames));
+    addSuggestions(npxResults);
     logger.debug('[mcp-scanner] Scan complete', {
         locationsScanned,
         suggestions: suggestions.length,

package/dist/_internal/platform/discovery/scanner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scanner.d.ts","sourceRoot":"","sources":["../../../../src/_internal/platform/discovery/scanner.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAOlE,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,WAAW,GAAG,MAAM,GAAG,UAAU,GAAG,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,SAAS,GAAG,WAAW,GAAG,WAAW,GAAG,SAAS,CAAC;AAEtJ,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5C;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB;AAMD,KAAK,cAAc,GAAG,IAAI,CAAC,gBAAgB,EAAE,eAAe,CAAC,GAAG;IAC9D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B,CAAC;AAUF,iGAAiG;AACjG,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,cAAc,GAAG,gBAAgB,EAAE,CAiBhF;AAED,0FAA0F;AAC1F,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAI,CA+BzF;AAED,sEAAsE;AACtE,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,IAAI,CAcrH;AAoMD;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA0KjC;AA4MD;;GAEG;AACH,wBAAsB,SAAS,CAC7B,KAAK,EAAE,MAAM,EAAE,EACf,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,GACtD,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAkC7B;AAMD;;GAEG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,UAAU,CAAC,CASzD;AAED;;;GAGG;AACH,wBAAsB,IAAI,CACxB,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,GACtD,OAAO,CAAC,UAAU,CAAC,CA8BrB"}
+{"version":3,"file":"scanner.d.ts","sourceRoot":"","sources":["../../../../src/_internal/platform/discovery/scanner.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAQlE,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,WAAW,GAAG,MAAM,GAAG,UAAU,GAAG,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,SAAS,GAAG,WAAW,GAAG,WAAW,GAAG,SAAS,CAAC;AAEtJ,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5C;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB;AAMD,KAAK,cAAc,GAAG,IAAI,CAAC,gBAAgB,EAAE,eAAe,CAAC,GAAG;IAC9D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B,CAAC;AAUF,iGAAiG;AACjG,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,cAAc,GAAG,gBAAgB,EAAE,CAiBhF;AAED,0FAA0F;AAC1F,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAgCzF;AAED,sEAAsE;AACtE,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,IAAI,CAerH;AAgND;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA0KjC;AA4MD;;GAEG;AACH,wBAAsB,SAAS,CAC7B,KAAK,EAAE,MAAM,EAAE,EACf,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,GACtD,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAkC7B;AAMD;;GAEG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,UAAU,CAAC,CASzD;AAED;;;GAGG;AACH,wBAAsB,IAAI,CACxB,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,GACtD,OAAO,CAAC,UAAU,CAAC,CA8BrB"}

package/dist/_internal/platform/discovery/scanner.js

@@ -3,7 +3,9 @@ import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
 import { dirname } from 'node:path';
 import { logger } from '../utils/logger.js';
 import { discoverContextWindows } from '../providers/context-discovery.js';
+import { WELL_KNOWN_LOCAL_PORTS } from '../providers/well-known-endpoints.js';
 import { resolveSurfaceDirectory } from '../runtime/surface-root.js';
+import { instrumentedFetch } from '../utils/fetch-with-timeout.js';
 function getPersistedPath(roots) {
     return resolveSurfaceDirectory(roots.homeDirectory, roots.surfaceRoot, 'discovered-providers.json');
 }
@@ -57,8 +59,9 @@ export function persistProviders(roots, servers) {
         mkdirSync(dirname(persistedPath), { recursive: true });
         writeFileSync(persistedPath, JSON.stringify([...byKey.values()], null, 2) + '\n', 'utf-8');
     }
-    catch {
-        // Non-fatal — persistence is best-effort
+    catch (err) {
+        // OBS-11: Non-fatal — persistence is best-effort
+        logger.debug('[Scanner] persistProviders failed (non-fatal)', { error: String(err) });
     }
 }
 /** Remove specific servers from the persisted file (by host:port). */
@@ -77,14 +80,27 @@ export function removePersistedProviders(roots, toRemove) {
         const filtered = current.filter(s => !removeKeys.has(`${s.host}:${s.port}`));
         writeFileSync(persistedPath, JSON.stringify(filtered, null, 2) + '\n', 'utf-8');
     }
-    catch {
-        // Non-fatal
+    catch (err) {
+        // OBS-11: Non-fatal — removal from persisted file failed
+        logger.debug('[Scanner] removePersistedProviders failed (non-fatal)', { error: String(err) });
     }
 }
 // ---------------------------------------------------------------------------
 // Constants
 // ---------------------------------------------------------------------------
-const KNOWN_PORTS = [1234, 1337, 2242, 4891, 5000, 5001, 7860, 8000, 8001, 8080, 11434];
+const KNOWN_PORTS = [
+    WELL_KNOWN_LOCAL_PORTS.lmStudio,
+    WELL_KNOWN_LOCAL_PORTS.jan,
+    WELL_KNOWN_LOCAL_PORTS.aphrodite,
+    WELL_KNOWN_LOCAL_PORTS.gpt4all,
+    5000,
+    WELL_KNOWN_LOCAL_PORTS.koboldCpp,
+    7860,
+    8000,
+    8001,
+    WELL_KNOWN_LOCAL_PORTS.llamaCpp,
+    WELL_KNOWN_LOCAL_PORTS.ollama,
+];
 const PROBE_TIMEOUT_MS = 200;
 const MAX_CONCURRENT_PROBES = 50;
 const METADATA_TIMEOUT_MS = 2000;
@@ -152,7 +168,7 @@ async function probeHost(host, port) {
 }
 async function tryFetch(url) {
     try {
-        const res = await fetch(url, {
+        const res = await instrumentedFetch(url, {
             signal: AbortSignal.timeout(PROBE_TIMEOUT_MS),
         });
         if (!res.ok)
@@ -200,17 +216,17 @@ function identifyServer(port, headers, responseBody) {
             .map((item) => String(item.id))
             .join(' ');
     }
-    if (port === 11434)
+    if (port === WELL_KNOWN_LOCAL_PORTS.ollama)
         return 'ollama';
-    if (port === 1337)
+    if (port === WELL_KNOWN_LOCAL_PORTS.jan)
         return 'jan';
-    if (port === 4891)
+    if (port === WELL_KNOWN_LOCAL_PORTS.gpt4all)
         return 'gpt4all';
-    if (port === 5001)
+    if (port === WELL_KNOWN_LOCAL_PORTS.koboldCpp)
         return 'koboldcpp';
-    if (port === 2242)
+    if (port === WELL_KNOWN_LOCAL_PORTS.aphrodite)
         return 'aphrodite';
-    if (port === 1234 || headerValues.includes('lmstudio') || modelIds.includes('lmstudio')) {
+    if (port === WELL_KNOWN_LOCAL_PORTS.lmStudio || headerValues.includes('lmstudio') || modelIds.includes('lmstudio')) {
         return 'lm-studio';
     }
     if (Object.keys(headers).some((k) => k.startsWith('x-vllm')))
@@ -240,7 +256,7 @@ export async function fetchModelContextWindows(host, port, serverType, models) {
             // Ollama: POST /api/show for each model — parallel to avoid blocking pool slot
             await Promise.allSettled(models.map(async (model) => {
                 try {
-                    const res = await fetch(`http://${host}:${port}/api/show`, {
+                    const res = await instrumentedFetch(`http://${host}:${port}/api/show`, {
                         method: 'POST',
                         headers: { 'Content-Type': 'application/json' },
                         body: JSON.stringify({ name: model }),
@@ -281,7 +297,7 @@ export async function fetchModelContextWindows(host, port, serverType, models) {
             // vLLM: GET /v1/models/{id} returns max_model_len — parallel to avoid blocking pool slot
             await Promise.allSettled(models.map(async (model) => {
                 try {
-                    const res = await fetch(`http://${host}:${port}/v1/models/${encodeURIComponent(model)}`, {
+                    const res = await instrumentedFetch(`http://${host}:${port}/v1/models/${encodeURIComponent(model)}`, {
                         signal: AbortSignal.timeout(METADATA_TIMEOUT_MS),
                     });
                     if (!res.ok)
@@ -301,7 +317,7 @@ export async function fetchModelContextWindows(host, port, serverType, models) {
         case 'llamacpp': {
             // llama.cpp: GET /props returns default_generation_settings.n_ctx (server-wide)
             try {
-                const res = await fetch(`http://${host}:${port}/props`, {
+                const res = await instrumentedFetch(`http://${host}:${port}/props`, {
                     signal: AbortSignal.timeout(METADATA_TIMEOUT_MS),
                 });
                 if (res.ok) {
@@ -349,7 +365,7 @@ export async function fetchModelContextWindows(host, port, serverType, models) {
             // Generic: try /v1/models/{id} for each model, look for common context length fields — parallel
             await Promise.allSettled(models.map(async (model) => {
                 try {
-                    const res = await fetch(`http://${host}:${port}/v1/models/${encodeURIComponent(model)}`, {
+                    const res = await instrumentedFetch(`http://${host}:${port}/v1/models/${encodeURIComponent(model)}`, {
                         signal: AbortSignal.timeout(METADATA_TIMEOUT_MS),
                     });
                     if (!res.ok)
@@ -371,7 +387,7 @@ export async function fetchModelContextWindows(host, port, serverType, models) {
             // Fallback: try /props (llama.cpp-style) if no context windows found
             if (Object.keys(result).length === 0 && models.length > 0) {
                 try {
-                    const res = await fetch(`http://${host}:${port}/props`, {
+                    const res = await instrumentedFetch(`http://${host}:${port}/props`, {
                         signal: AbortSignal.timeout(METADATA_TIMEOUT_MS),
                     });
                     if (res.ok) {
@@ -410,7 +426,7 @@ async function fetchModelOutputLimits(host, port, serverType, models) {
             // Ollama: POST /api/show for each model — look for num_predict in model_info or parameters
             await Promise.allSettled(models.map(async (model) => {
                 try {
-                    const res = await fetch(`http://${host}:${port}/api/show`, {
+                    const res = await instrumentedFetch(`http://${host}:${port}/api/show`, {
                         method: 'POST',
                         headers: { 'Content-Type': 'application/json' },
                         body: JSON.stringify({ name: model }),
@@ -450,7 +466,7 @@ async function fetchModelOutputLimits(host, port, serverType, models) {
             // vLLM: GET /v1/models/{id} — look for max_completion_tokens
             await Promise.allSettled(models.map(async (model) => {
                 try {
-                    const res = await fetch(`http://${host}:${port}/v1/models/${encodeURIComponent(model)}`, {
+                    const res = await instrumentedFetch(`http://${host}:${port}/v1/models/${encodeURIComponent(model)}`, {
                         signal: AbortSignal.timeout(METADATA_TIMEOUT_MS),
                     });
                     if (!res.ok)
@@ -470,7 +486,7 @@ async function fetchModelOutputLimits(host, port, serverType, models) {
         case 'llamacpp': {
             // llama.cpp: GET /props — look for default_generation_settings.n_predict
             try {
-                const res = await fetch(`http://${host}:${port}/props`, {
+                const res = await instrumentedFetch(`http://${host}:${port}/props`, {
                     signal: AbortSignal.timeout(METADATA_TIMEOUT_MS),
                 });
                 if (res.ok) {
@@ -502,7 +518,7 @@ async function fetchModelOutputLimits(host, port, serverType, models) {
             // Generic: try /v1/models/{id} for each model, look for common output limit fields
             await Promise.allSettled(models.map(async (model) => {
                 try {
-                    const res = await fetch(`http://${host}:${port}/v1/models/${encodeURIComponent(model)}`, {
+                    const res = await instrumentedFetch(`http://${host}:${port}/v1/models/${encodeURIComponent(model)}`, {
                         signal: AbortSignal.timeout(METADATA_TIMEOUT_MS),
                     });
                     if (!res.ok)
@@ -522,7 +538,7 @@ async function fetchModelOutputLimits(host, port, serverType, models) {
             // Fallback: try /props (llama.cpp-style) for n_predict if no output limits found
             if (Object.keys(result).length === 0 && models.length > 0) {
                 try {
-                    const res = await fetch(`http://${host}:${port}/props`, {
+                    const res = await instrumentedFetch(`http://${host}:${port}/props`, {
                         signal: AbortSignal.timeout(METADATA_TIMEOUT_MS),
                     });
                     if (res.ok) {

package/dist/_internal/platform/export/session-export.d.ts

@@ -12,7 +12,6 @@ export interface SessionExportData {
     /** ISO timestamp of export. */
     exportedAt?: string;
 }
-export declare function redactSensitiveData(text: string): string;
 /**
  * redactMessage - Deep-clone a message and redact all string fields that may
  * contain sensitive data (content, reasoning, tool arguments).

package/dist/_internal/platform/export/session-export.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-export.d.ts","sourceRoot":"","sources":["../../../../src/_internal/platform/export/session-export.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiC,KAAK,aAAa,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAIvG,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC;AAE9C,MAAM,WAAW,aAAa;IAC5B,sEAAsE;IACtE,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,+BAA+B;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,+BAA+B;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AA8BD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAMxD;AAID;;;GAGG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,aAAa,CAqB/D;AAID;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,aAAa,EAAE,EACzB,QAAQ,CAAC,EAAE,cAAc,EACzB,OAAO,GAAE,aAAa,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAO,GAC9C,MAAM,CAwCR;AAqBD;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,aAAa,EAAE,EACzB,QAAQ,CAAC,EAAE,cAAc,EACzB,OAAO,GAAE,aAAa,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAO,GAC9C,MAAM,CAsBR;AAOD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,aAAa,EAAE,EACzB,QAAQ,CAAC,EAAE,cAAc,EACzB,OAAO,GAAE,aAAa,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAO,GAC9C,MAAM,CA0JR;AAmQD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CAG/F"}
+{"version":3,"file":"session-export.d.ts","sourceRoot":"","sources":["../../../../src/_internal/platform/export/session-export.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiC,KAAK,aAAa,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAKvG,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC;AAE9C,MAAM,WAAW,aAAa;IAC5B,sEAAsE;IACtE,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,+BAA+B;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,+BAA+B;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAID;;;GAGG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,aAAa,CAqB/D;AAID;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,aAAa,EAAE,EACzB,QAAQ,CAAC,EAAE,cAAc,EACzB,OAAO,GAAE,aAAa,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAO,GAC9C,MAAM,CAwCR;AAqBD;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,aAAa,EAAE,EACzB,QAAQ,CAAC,EAAE,cAAc,EACzB,OAAO,GAAE,aAAa,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAO,GAC9C,MAAM,CAsBR;AAOD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,aAAa,EAAE,EACzB,QAAQ,CAAC,EAAE,cAAc,EACzB,OAAO,GAAE,aAAa,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAO,GAC9C,MAAM,CA0JR;AAmQD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CAG/F"}

package/dist/_internal/platform/export/session-export.js

@@ -1,38 +1,6 @@
 import { join } from 'node:path';
 import { exportToMarkdown, extractText } from './markdown.js';
-// ── Sensitive-data redaction ──────────────────────────────────────────────────
-/** Patterns that identify sensitive content — API keys and absolute paths. */
-const REDACT_PATTERNS = [
-    // Generic API key patterns (sk-*, key-*, bearer tokens)
-    { pattern: /\b(sk-[A-Za-z0-9_-]{20,})/g, replacement: '[REDACTED_API_KEY]' },
-    { pattern: /\b(key-[A-Za-z0-9_-]{16,})/g, replacement: '[REDACTED_API_KEY]' },
-    // Bearer / Authorization header values
-    { pattern: /(Bearer\s+)[A-Za-z0-9._~+\/-]+=*/gi, replacement: '$1[REDACTED_TOKEN]' },
-    // GitHub tokens
-    { pattern: /\b(ghp_[A-Za-z0-9]{36,})/g, replacement: '[REDACTED_GITHUB_TOKEN]' },
-    { pattern: /\b(gho_[A-Za-z0-9]{36,})/g, replacement: '[REDACTED_GITHUB_TOKEN]' },
-    { pattern: /\b(github_pat_[A-Za-z0-9_]{36,})/g, replacement: '[REDACTED_GITHUB_TOKEN]' },
-    // GitLab tokens
-    { pattern: /\b(glpat-[A-Za-z0-9_-]{20,})/g, replacement: '[REDACTED_GITLAB_TOKEN]' },
-    // Slack tokens
-    { pattern: /\b(xoxb-[A-Za-z0-9-]{24,})/g, replacement: '[REDACTED_SLACK_TOKEN]' },
-    { pattern: /\b(xoxp-[A-Za-z0-9-]{24,})/g, replacement: '[REDACTED_SLACK_TOKEN]' },
-    // AWS access keys
-    { pattern: /\b(AKIA[A-Z0-9]{16})\b/g, replacement: '[REDACTED_AWS_KEY]' },
-    // Absolute Unix paths starting from home (e.g. /home/alice/projects/...)
-    { pattern: /\/home\/[A-Za-z0-9_.-]+/g, replacement: '/home/[REDACTED]' },
-    // Absolute Unix paths in /Users (macOS)
-    { pattern: /\/Users\/[A-Za-z0-9_.-]+/g, replacement: '/Users/[REDACTED]' },
-    // Windows user paths (C:\Users\username\...)
-    { pattern: /[A-Za-z]:\\Users\\[A-Za-z0-9_.-]+/g, replacement: 'C:\\Users\\[REDACTED]' },
-];
-export function redactSensitiveData(text) {
-    let result = text;
-    for (const { pattern, replacement } of REDACT_PATTERNS) {
-        result = result.replace(pattern, replacement);
-    }
-    return result;
-}
+import { redactSensitiveData } from '../utils/redaction.js';
 // ── Message redaction helper ─────────────────────────────────────────────────
 /**
  * redactMessage - Deep-clone a message and redact all string fields that may

package/dist/_internal/platform/hooks/runners/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../src/_internal/platform/hooks/runners/http.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAKzE;;;GAGG;AACH,wBAAsB,GAAG,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CA+DrF"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../src/_internal/platform/hooks/runners/http.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMzE;;;GAGG;AACH,wBAAsB,GAAG,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CA+DrF"}

package/dist/_internal/platform/hooks/runners/http.js

@@ -1,6 +1,7 @@
 import { logger } from '../../utils/logger.js';
 import { summarizeError } from '../../utils/error-display.js';
 import { classifyHostTrustTier, extractHostname, emitSsrfDeny } from '../../tools/fetch/trust-tiers.js';
+import { instrumentedFetch } from '../../utils/fetch-with-timeout.js';
 /**
  * HTTP hook runner.
  * POSTs the event JSON to the configured URL and parses the response as HookResult.
@@ -28,7 +29,7 @@ export async function run(hook, event) {
         const timer = setTimeout(() => controller.abort(), timeoutMs);
         let response;
         try {
-            response = await fetch(url, {
+            response = await instrumentedFetch(url, {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',