@skillsmith/core 0.10.0 → 0.11.1

package/dist/src/logging/logger.test.js

@@ -0,0 +1,320 @@
+/**
+ * SMI-5615: Tests for the shared `logger.ts` factory — crash-proofing,
+ * `SKILLSMITH_ERROR_LOG_DISABLE`, `SKILLSMITH_LOG_LEVEL` filtering,
+ * redaction-on-disk, and the correlation-ID call-site invariant (F3). All
+ * tests point `SKILLSMITH_LOG_DIR` at a temp directory — never the real
+ * `~/.skillsmith/logs/`.
+ */
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { mkdtempSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { runWithCorrelationId } from './context.js';
+import { createLogger } from './logger.js';
+import { __resetLoggingStateForTests } from './rotation.js';
+let tempDir;
+let originalLogDir;
+let originalDisable;
+let originalLevel;
+beforeEach(() => {
+    tempDir = mkdtempSync(join(tmpdir(), 'skillsmith-logger-'));
+    originalLogDir = process.env.SKILLSMITH_LOG_DIR;
+    originalDisable = process.env.SKILLSMITH_ERROR_LOG_DISABLE;
+    originalLevel = process.env.SKILLSMITH_LOG_LEVEL;
+    process.env.SKILLSMITH_LOG_DIR = tempDir;
+    delete process.env.SKILLSMITH_ERROR_LOG_DISABLE;
+    delete process.env.SKILLSMITH_LOG_LEVEL;
+});
+afterEach(async () => {
+    await __resetLoggingStateForTests();
+    vi.restoreAllMocks();
+    const restore = (key, value) => {
+        if (value === undefined)
+            delete process.env[key];
+        else
+            process.env[key] = value;
+    };
+    restore('SKILLSMITH_LOG_DIR', originalLogDir);
+    restore('SKILLSMITH_ERROR_LOG_DISABLE', originalDisable);
+    restore('SKILLSMITH_LOG_LEVEL', originalLevel);
+    rmSync(tempDir, { recursive: true, force: true });
+});
+function findLogFile(surfacePrefix) {
+    const files = readdirSync(tempDir).filter((f) => f.startsWith(surfacePrefix));
+    expect(files.length).toBeGreaterThan(0);
+    return join(tempDir, files[0]);
+}
+async function waitForLogFile(surfacePrefix) {
+    return vi.waitFor(() => {
+        const files = readdirSync(tempDir).filter((f) => f.startsWith(surfacePrefix));
+        expect(files.length).toBeGreaterThan(0);
+        return files;
+    }, { timeout: 2000, interval: 20 });
+}
+describe('logger.ts — redaction on disk', () => {
+    it('writes a redacted message and never persists the raw secret', async () => {
+        const logger = createLogger('mcp');
+        logger.error('Failed with token sk_live_abcdefghijklmnopqrstuvwx');
+        await waitForLogFile('skillsmith-mcp-');
+        const content = await vi.waitFor(() => {
+            const text = readFileSync(findLogFile('skillsmith-mcp-'), 'utf8');
+            expect(text.length).toBeGreaterThan(0);
+            return text;
+        }, { timeout: 2000, interval: 20 });
+        expect(content).toContain('sk_live_[REDACTED]');
+        expect(content).not.toContain('abcdefghijklmnopqrstuvwx');
+        const record = JSON.parse(content.trim().split('\n')[0]);
+        expect(record.level).toBe('error');
+        expect(record.surface).toBe('mcp');
+        expect(record.msg).toContain('sk_live_[REDACTED]');
+    });
+    it('redacts secrets inside the `err` detail as well as the message', async () => {
+        const logger = createLogger('cli');
+        const err = new Error('token=ghp_1234567890abcdefghijklmnopqrstuvwxyz');
+        logger.error('tool call failed', { err });
+        await waitForLogFile('skillsmith-cli-');
+        const content = await vi.waitFor(() => {
+            const text = readFileSync(findLogFile('skillsmith-cli-'), 'utf8');
+            expect(text.length).toBeGreaterThan(0);
+            return text;
+        }, { timeout: 2000, interval: 20 });
+        const record = JSON.parse(content.trim().split('\n')[0]);
+        expect(record.err.message).toContain('ghp_[REDACTED]');
+        expect(record.err.message).not.toContain('1234567890abcdefghijklmnopqrstuvwxyz');
+    });
+    it('strips chalk/ANSI codes from the disk record and redacts a secret that immediately follows one (Mode-B Wave 2 finding)', async () => {
+        const logger = createLogger('cli');
+        const secret = 'sk_live_' + 'd'.repeat(24);
+        // Realistic CLI shape: chalk.red('Error:') directly adjacent to a secret,
+        // no space — the exact pattern the diff-audit flagged as a latent gap.
+        logger.error(`\x1b[31mError:\x1b[39m${secret} leaked`);
+        await waitForLogFile('skillsmith-cli-');
+        const content = readFileSync(findLogFile('skillsmith-cli-'), 'utf8');
+        const record = JSON.parse(content.trim().split('\n')[0]);
+        expect(record.msg).not.toContain('\x1b[');
+        expect(record.msg).not.toContain(secret);
+        expect(record.msg).toContain('sk_live_[REDACTED]');
+    });
+});
+describe('logger.ts — warn/error always mirror to console (plan §1, not just on write failure)', () => {
+    // Regression coverage for a Mode-B-adjacent finding caught during Wave 2
+    // wire-in: an earlier version of `persistRecord` only called
+    // `consoleFallback` when the disk write FAILED. That silently broke the
+    // whole point of swapping `console.error`/`warn` call sites in the MCP
+    // server and CLI for `logger.error`/`warn` — on the (normal) successful
+    // write path, callers would see NOTHING on screen, a regression from
+    // today's always-visible `console.error`. The plan is explicit: "the
+    // logger writes to disk AND still emits to stderr for warn/error" —
+    // unconditionally, not as a failure fallback.
+    it('mirrors error to console.error even when the disk write succeeds (writable dir)', async () => {
+        const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined);
+        const logger = createLogger('mcp');
+        logger.error('boom');
+        // console mirror must be synchronous/immediate — a CLI user reading a
+        // terminal cannot wait for an async disk write to decide whether to print.
+        expect(errorSpy).toHaveBeenCalledWith('boom');
+        // ...and the disk record still lands too (both, not either/or).
+        await waitForLogFile('skillsmith-mcp-');
+    });
+    it('mirrors warn to console.warn (not console.error) even when the disk write succeeds', async () => {
+        const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);
+        const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined);
+        const logger = createLogger('cli');
+        logger.warn('careful');
+        expect(warnSpy).toHaveBeenCalledWith('careful');
+        expect(errorSpy).not.toHaveBeenCalled();
+        await waitForLogFile('skillsmith-cli-');
+    });
+    it('redacts the console-mirrored message too, not just the disk record', () => {
+        const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined);
+        const logger = createLogger('mcp');
+        const secret = 'sk_live_' + 'b'.repeat(24);
+        logger.error(`auth failed with ${secret}`);
+        const calledWith = errorSpy.mock.calls.map((call) => call[0]).join('\n');
+        expect(calledWith).not.toContain(secret);
+        expect(calledWith).toContain('sk_live_[REDACTED]');
+    });
+    it('does NOT mirror info/debug to console on the successful-write path (disk-only by design)', async () => {
+        process.env.SKILLSMITH_LOG_LEVEL = 'debug';
+        const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined);
+        const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);
+        const logger = createLogger('mcp');
+        logger.info('routine status');
+        logger.debug('verbose detail');
+        await waitForLogFile('skillsmith-mcp-');
+        expect(errorSpy).not.toHaveBeenCalled();
+        expect(warnSpy).not.toHaveBeenCalled();
+    });
+});
+describe('logger.ts — SKILLSMITH_ERROR_LOG_DISABLE', () => {
+    it('accepts "1" and skips writing entirely', async () => {
+        process.env.SKILLSMITH_ERROR_LOG_DISABLE = '1';
+        const logger = createLogger('mcp');
+        logger.error('should not be written');
+        // Give any accidental async write a chance to land before asserting absence.
+        await new Promise((resolve) => setTimeout(resolve, 100));
+        expect(readdirSync(tempDir)).toHaveLength(0);
+    });
+    it('accepts "true" (case-insensitive)', async () => {
+        process.env.SKILLSMITH_ERROR_LOG_DISABLE = 'TRUE';
+        const logger = createLogger('mcp');
+        logger.error('should not be written');
+        await new Promise((resolve) => setTimeout(resolve, 100));
+        expect(readdirSync(tempDir)).toHaveLength(0);
+    });
+    it('logs normally when unset', async () => {
+        const logger = createLogger('mcp');
+        logger.error('should be written');
+        await waitForLogFile('skillsmith-mcp-');
+    });
+});
+describe('logger.ts — SKILLSMITH_LOG_LEVEL filtering', () => {
+    it('defaults to warn — info/debug are suppressed, warn/error are not', async () => {
+        const logger = createLogger('mcp');
+        logger.debug('debug message');
+        logger.info('info message');
+        logger.warn('warn message');
+        await waitForLogFile('skillsmith-mcp-');
+        const content = readFileSync(findLogFile('skillsmith-mcp-'), 'utf8');
+        const lines = content.trim().split('\n').filter(Boolean);
+        expect(lines).toHaveLength(1);
+        expect(JSON.parse(lines[0]).msg).toBe('warn message');
+    });
+    it('SKILLSMITH_LOG_LEVEL=debug allows every level through', async () => {
+        process.env.SKILLSMITH_LOG_LEVEL = 'debug';
+        const logger = createLogger('mcp');
+        logger.debug('debug message');
+        logger.info('info message');
+        logger.warn('warn message');
+        logger.error('error message');
+        await vi.waitFor(() => {
+            const files = readdirSync(tempDir).filter((f) => f.startsWith('skillsmith-mcp-'));
+            expect(files.length).toBeGreaterThan(0);
+            const content = readFileSync(join(tempDir, files[0]), 'utf8');
+            const lines = content.trim().split('\n').filter(Boolean);
+            expect(lines).toHaveLength(4);
+            return lines;
+        }, { timeout: 2000, interval: 20 });
+    });
+    it('SKILLSMITH_LOG_LEVEL=error suppresses everything but error', async () => {
+        process.env.SKILLSMITH_LOG_LEVEL = 'error';
+        const logger = createLogger('mcp');
+        logger.warn('warn message');
+        logger.error('error message');
+        await waitForLogFile('skillsmith-mcp-');
+        const content = await vi.waitFor(() => {
+            const text = readFileSync(findLogFile('skillsmith-mcp-'), 'utf8');
+            const lines = text.trim().split('\n').filter(Boolean);
+            expect(lines).toHaveLength(1);
+            return text;
+        }, { timeout: 2000, interval: 20 });
+        expect(JSON.parse(content.trim())).toMatchObject({ level: 'error', msg: 'error message' });
+    });
+});
+describe('logger.ts — crash-proofing', () => {
+    it('never throws and falls back to console when the log directory is unwritable', async () => {
+        // A regular FILE at the path where a directory is expected makes
+        // `mkdir(..., { recursive: true })` fail with ENOTDIR — portable and
+        // permission-independent (unlike relying on running as non-root).
+        const blockerFile = join(tempDir, 'blocker');
+        writeFileSync(blockerFile, '');
+        process.env.SKILLSMITH_LOG_DIR = join(blockerFile, 'logs');
+        const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined);
+        const logger = createLogger('mcp');
+        expect(() => logger.error('this must not throw')).not.toThrow();
+        await vi.waitFor(() => {
+            expect(errorSpy).toHaveBeenCalled();
+        }, { timeout: 2000, interval: 20 });
+        expect(errorSpy.mock.calls.some((call) => call[0] === 'this must not throw')).toBe(true);
+    });
+    it('routes the warn-level fallback through console.warn, not console.error', async () => {
+        const blockerFile = join(tempDir, 'blocker');
+        writeFileSync(blockerFile, '');
+        process.env.SKILLSMITH_LOG_DIR = join(blockerFile, 'logs');
+        const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);
+        const logger = createLogger('cli');
+        expect(() => logger.warn('warn fallback')).not.toThrow();
+        await vi.waitFor(() => {
+            expect(warnSpy).toHaveBeenCalledWith('warn fallback');
+        }, { timeout: 2000, interval: 20 });
+    });
+    it('never throws even when `details` contains a circular reference, and still persists the record (NEW-2)', async () => {
+        const logger = createLogger('mcp');
+        const circular = {};
+        circular.self = circular;
+        expect(() => logger.error('circular details', { blob: circular })).not.toThrow();
+        // Before the cycle guard, `redactSensitiveObject` stack-overflowed on
+        // `circular`, which aborted the whole record and silently dropped it to
+        // the console-only fallback. With the guard, the record — including the
+        // correlationId/msg that have nothing to do with the cycle — must still
+        // reach disk, with only the offending branch marked `'[Circular]'`.
+        await waitForLogFile('skillsmith-mcp-');
+        const content = readFileSync(findLogFile('skillsmith-mcp-'), 'utf8');
+        const record = JSON.parse(content.trim().split('\n')[0]);
+        expect(record.msg).toBe('circular details');
+        expect(record.details.blob.self).toBe('[Circular]');
+    });
+    it('redacts the message before the console fallback, not just the disk record (NEW-1)', async () => {
+        const blockerFile = join(tempDir, 'blocker');
+        writeFileSync(blockerFile, '');
+        process.env.SKILLSMITH_LOG_DIR = join(blockerFile, 'logs');
+        const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined);
+        const logger = createLogger('mcp');
+        const secret = 'sk_live_' + 'a'.repeat(24);
+        expect(() => logger.error(`auth failed with ${secret}`)).not.toThrow();
+        await vi.waitFor(() => {
+            expect(errorSpy).toHaveBeenCalled();
+        }, { timeout: 2000, interval: 20 });
+        const calledWith = errorSpy.mock.calls.map((call) => call[0]).join('\n');
+        expect(calledWith).not.toContain(secret);
+        expect(calledWith).toContain('sk_live_[REDACTED]');
+    });
+});
+describe('logger.ts — correlation ID (F3)', () => {
+    it('stamps the correlation ID installed for the calling async continuation', async () => {
+        const logger = createLogger('mcp');
+        await runWithCorrelationId('corr-abc-123', async () => {
+            logger.error('inside scope');
+        });
+        await waitForLogFile('skillsmith-mcp-');
+        const content = readFileSync(findLogFile('skillsmith-mcp-'), 'utf8');
+        const record = JSON.parse(content.trim().split('\n')[0]);
+        expect(record.correlationId).toBe('corr-abc-123');
+    });
+    it('omits correlationId when called outside any runWithCorrelationId scope', async () => {
+        const logger = createLogger('cli');
+        logger.error('outside scope');
+        await waitForLogFile('skillsmith-cli-');
+        const content = readFileSync(findLogFile('skillsmith-cli-'), 'utf8');
+        const record = JSON.parse(content.trim().split('\n')[0]);
+        expect(record.correlationId).toBeUndefined();
+    });
+    it('keeps two concurrent, overlapping scopes from observing each others correlation ID', async () => {
+        const logger = createLogger('vscode');
+        const seen = {};
+        await Promise.all([
+            runWithCorrelationId('corr-A', async () => {
+                await new Promise((resolve) => setTimeout(resolve, 10));
+                logger.error('call A');
+            }),
+            runWithCorrelationId('corr-B', async () => {
+                logger.error('call B');
+            }),
+        ]);
+        await vi.waitFor(() => {
+            const files = readdirSync(tempDir).filter((f) => f.startsWith('skillsmith-vscode-'));
+            expect(files.length).toBeGreaterThan(0);
+            const content = readFileSync(join(tempDir, files[0]), 'utf8');
+            const lines = content.trim().split('\n').filter(Boolean);
+            expect(lines).toHaveLength(2);
+            for (const line of lines) {
+                const record = JSON.parse(line);
+                seen[record.msg] = record.correlationId;
+            }
+            return lines;
+        }, { timeout: 2000, interval: 20 });
+        expect(seen['call A']).toBe('corr-A');
+        expect(seen['call B']).toBe('corr-B');
+    });
+});
+//# sourceMappingURL=logger.test.js.map

package/dist/src/logging/logger.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.test.js","sourceRoot":"","sources":["../../../src/logging/logger.test.ts"],"names":[],"mappings":"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"}

package/dist/src/logging/redact.d.ts

@@ -0,0 +1,35 @@
+/**
+ * SMI-883 / SMI-5615: Sensitive-data redaction, ported VERBATIM from the dead
+ * `packages/mcp-server/src/logger.ts` (lines 11-107) into the shared
+ * `@skillsmith/core` logging module. Same regex patterns, same behavior,
+ * same test coverage (see `redact.test.ts`) — this is tested, working code
+ * relocated, not rewritten.
+ */
+export declare function stripAnsi(text: string): string;
+/**
+ * SMI-883: Redact sensitive data from text before logging
+ * Exported for testing purposes
+ */
+export declare function redactSensitiveData(text: string): string;
+/**
+ * SMI-883: Recursively redact sensitive data from objects
+ * Exported for testing purposes
+ *
+ * SMI-5615 Mode-B diff-audit NEW-2: `seen` guards against circular
+ * references. The original (dead) `mcp-server/src/logger.ts` version this was
+ * ported from had no cycle guard — harmless there since it was never called
+ * in production, but this module IS the production write path now, so a
+ * circular `details`/`err` object (e.g. a thrown object with a `cause` cycle)
+ * must degrade to `'[Circular]'` rather than stack-overflowing, which would
+ * otherwise abort the whole record (including the redacted `msg` and
+ * `correlationId`) and fall through to the raw-message console fallback.
+ *
+ * `seen` tracks only the CURRENT recursion path (ancestors), not every object
+ * visited overall — each object is removed again once its own subtree
+ * finishes (the `finally` below). This is deliberate: the same object
+ * appearing twice at sibling positions (a shared, non-cyclic reference — a
+ * DAG, not a cycle) must redact normally both times, not get falsely flagged
+ * `'[Circular]'` just because it was visited once already elsewhere.
+ */
+export declare function redactSensitiveObject(obj: unknown, seen?: WeakSet<object>): unknown;
+//# sourceMappingURL=redact.d.ts.map

package/dist/src/logging/redact.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redact.d.ts","sourceRoot":"","sources":["../../../src/logging/redact.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAqBH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAG9C;AAmED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CASxD;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,OAAO,EACZ,IAAI,GAAE,OAAO,CAAC,MAAM,CAAiB,GACpC,OAAO,CAgBT"}

package/dist/src/logging/redact.js

@@ -0,0 +1,152 @@
+/**
+ * SMI-883 / SMI-5615: Sensitive-data redaction, ported VERBATIM from the dead
+ * `packages/mcp-server/src/logger.ts` (lines 11-107) into the shared
+ * `@skillsmith/core` logging module. Same regex patterns, same behavior,
+ * same test coverage (see `redact.test.ts`) — this is tested, working code
+ * relocated, not rewritten.
+ */
+/**
+ * Strips ANSI/SGR escape sequences (`\x1b[...m` — the `chalk`-style color
+ * codes CLI call sites wrap error text in). SMI-5615 Mode-B diff-audit
+ * (Wave 2 pass): the disk-persisted record must not embed raw escape codes
+ * as log noise, AND a secret sitting immediately after an escape code's
+ * trailing letter (e.g. `\x1b[31msk_live_...`) can defeat
+ * `redactSensitiveData`'s leading `\b` word-boundary check — the `m`→`s`
+ * transition is word-to-word, not a boundary. Stripping ANSI BEFORE redacting
+ * closes that gap. Only applied on the DISK-persisted path (`logger.ts`'s
+ * `buildRecord`/`normalizeError`) — deliberately NOT applied to the
+ * console-mirrored path, which must keep chalk's colors for CLI terminal UX.
+ * Covers chalk's actual output (SGR codes only); not a full ANSI/VT100 strip.
+ */
+// \x1b is the intentional ESC byte an SGR sequence always starts with; this
+// is the same pattern the widely-used `strip-ansi` npm package uses (also
+// eslint-disabled there).
+// eslint-disable-next-line no-control-regex
+const ANSI_SGR_PATTERN = /\x1b\[[0-9;]*m/g;
+export function stripAnsi(text) {
+    if (!text)
+        return text;
+    return text.replace(ANSI_SGR_PATTERN, '');
+}
+/**
+ * SMI-883: Sensitive data patterns to redact before logging
+ * Prevents API keys, tokens, passwords, and secrets from being written to disk
+ */
+const SENSITIVE_PATTERNS = [
+    // GitHub tokens
+    { pattern: /\b(ghp_[a-zA-Z0-9]{36})\b/g, replacement: 'ghp_[REDACTED]' },
+    { pattern: /\b(github_pat_[a-zA-Z0-9_]{22,})\b/g, replacement: 'github_pat_[REDACTED]' },
+    { pattern: /\b(gho_[a-zA-Z0-9]{36})\b/g, replacement: 'gho_[REDACTED]' },
+    { pattern: /\b(ghs_[a-zA-Z0-9]{36})\b/g, replacement: 'ghs_[REDACTED]' },
+    { pattern: /\b(ghu_[a-zA-Z0-9]{36})\b/g, replacement: 'ghu_[REDACTED]' },
+    { pattern: /\b(ghr_[a-zA-Z0-9]{36})\b/g, replacement: 'ghr_[REDACTED]' },
+    // Linear API keys
+    { pattern: /\b(lin_api_[a-zA-Z0-9]{32,})\b/g, replacement: 'lin_api_[REDACTED]' },
+    // Stripe keys
+    { pattern: /\b(sk_live_[a-zA-Z0-9]{24,})\b/g, replacement: 'sk_live_[REDACTED]' },
+    { pattern: /\b(sk_test_[a-zA-Z0-9]{24,})\b/g, replacement: 'sk_test_[REDACTED]' },
+    { pattern: /\b(pk_live_[a-zA-Z0-9]{24,})\b/g, replacement: 'pk_live_[REDACTED]' },
+    { pattern: /\b(pk_test_[a-zA-Z0-9]{24,})\b/g, replacement: 'pk_test_[REDACTED]' },
+    // OpenAI API keys
+    { pattern: /\b(sk-[a-zA-Z0-9]{48,})\b/g, replacement: 'sk-[REDACTED]' },
+    // Anthropic API keys
+    { pattern: /\b(sk-ant-[a-zA-Z0-9-]{32,})\b/g, replacement: 'sk-ant-[REDACTED]' },
+    // AWS keys
+    { pattern: /\b(AKIA[A-Z0-9]{16})\b/g, replacement: 'AKIA[REDACTED]' },
+    // Slack tokens
+    { pattern: /\b(xox[boaprs]-[a-zA-Z0-9-]{10,})\b/g, replacement: 'xox*-[REDACTED]' },
+    // npm tokens
+    { pattern: /\b(npm_[a-zA-Z0-9]{36})\b/g, replacement: 'npm_[REDACTED]' },
+    // Bearer tokens
+    { pattern: /\bBearer\s+([a-zA-Z0-9_\-.]{20,})/gi, replacement: 'Bearer [REDACTED]' },
+    // Basic auth
+    { pattern: /\bBasic\s+([a-zA-Z0-9+/=]{20,})/gi, replacement: 'Basic [REDACTED]' },
+    // JWT tokens
+    {
+        pattern: /\beyJ[a-zA-Z0-9_-]*\.eyJ[a-zA-Z0-9_-]*\.[a-zA-Z0-9_-]+\b/g,
+        replacement: '[JWT_REDACTED]',
+    },
+    // Generic API key patterns
+    {
+        pattern: /\b(api[_-]?key|apikey)\s*[=:]\s*["']?([a-zA-Z0-9_-]{8,})["']?/gi,
+        replacement: 'api_key=[REDACTED]',
+    },
+    {
+        pattern: /\b(token|auth[_-]?token)\s*[=:]\s*["']?([a-zA-Z0-9_-]{8,})["']?/gi,
+        replacement: 'token=[REDACTED]',
+    },
+    {
+        pattern: /\b(password|passwd|pwd)\s*[=:]\s*["']?([^"'\s]{4,})["']?/gi,
+        replacement: 'password=[REDACTED]',
+    },
+    {
+        pattern: /\b(secret|client[_-]?secret)\s*[=:]\s*["']?([a-zA-Z0-9_-]{8,})["']?/gi,
+        replacement: 'secret=[REDACTED]',
+    },
+    // Connection strings with passwords
+    { pattern: /(:\/\/[^:]+:)([^@]+)(@)/gi, replacement: '$1[REDACTED]$3' },
+    // Private keys
+    {
+        pattern: /-----BEGIN\s+(RSA\s+)?PRIVATE\s+KEY-----[\s\S]*?-----END\s+(RSA\s+)?PRIVATE\s+KEY-----/gi,
+        replacement: '-----[PRIVATE KEY REDACTED]-----',
+    },
+];
+/**
+ * SMI-883: Redact sensitive data from text before logging
+ * Exported for testing purposes
+ */
+export function redactSensitiveData(text) {
+    if (!text)
+        return text;
+    let redacted = text;
+    for (const { pattern, replacement } of SENSITIVE_PATTERNS) {
+        // Reset lastIndex for global regex patterns to ensure all matches are found
+        pattern.lastIndex = 0;
+        redacted = redacted.replace(pattern, replacement);
+    }
+    return redacted;
+}
+/**
+ * SMI-883: Recursively redact sensitive data from objects
+ * Exported for testing purposes
+ *
+ * SMI-5615 Mode-B diff-audit NEW-2: `seen` guards against circular
+ * references. The original (dead) `mcp-server/src/logger.ts` version this was
+ * ported from had no cycle guard — harmless there since it was never called
+ * in production, but this module IS the production write path now, so a
+ * circular `details`/`err` object (e.g. a thrown object with a `cause` cycle)
+ * must degrade to `'[Circular]'` rather than stack-overflowing, which would
+ * otherwise abort the whole record (including the redacted `msg` and
+ * `correlationId`) and fall through to the raw-message console fallback.
+ *
+ * `seen` tracks only the CURRENT recursion path (ancestors), not every object
+ * visited overall — each object is removed again once its own subtree
+ * finishes (the `finally` below). This is deliberate: the same object
+ * appearing twice at sibling positions (a shared, non-cyclic reference — a
+ * DAG, not a cycle) must redact normally both times, not get falsely flagged
+ * `'[Circular]'` just because it was visited once already elsewhere.
+ */
+export function redactSensitiveObject(obj, seen = new WeakSet()) {
+    if (obj === null || obj === undefined)
+        return obj;
+    if (typeof obj === 'string')
+        return redactSensitiveData(obj);
+    if (typeof obj !== 'object')
+        return obj;
+    if (seen.has(obj))
+        return '[Circular]';
+    seen.add(obj);
+    try {
+        if (Array.isArray(obj))
+            return obj.map((item) => redactSensitiveObject(item, seen));
+        const result = {};
+        for (const [key, value] of Object.entries(obj)) {
+            result[key] = redactSensitiveObject(value, seen);
+        }
+        return result;
+    }
+    finally {
+        seen.delete(obj);
+    }
+}
+//# sourceMappingURL=redact.js.map

package/dist/src/logging/redact.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redact.js","sourceRoot":"","sources":["../../../src/logging/redact.ts"],"names":[],"mappings":"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"}

package/dist/src/logging/redact.test.d.ts

@@ -0,0 +1,8 @@
+/**
+ * SMI-883 / SMI-5615: Tests for logger sensitive data redaction, ported from
+ * `packages/mcp-server/tests/unit/logger.test.ts` — same coverage, new
+ * location (`@skillsmith/core`'s `logging/redact.ts`).
+ * Ensures API keys, tokens, passwords, and secrets are never written to disk.
+ */
+export {};
+//# sourceMappingURL=redact.test.d.ts.map

package/dist/src/logging/redact.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redact.test.d.ts","sourceRoot":"","sources":["../../../src/logging/redact.test.ts"],"names":[],"mappings":"AAAA;;;;;GAKG"}