@qduc/term2 0.7.2 → 0.7.3

package/dist/services/notification-service.js

@@ -1,53 +1,92 @@
-import { getTtyWriter, writeOscSequence } from '../utils/tty-osc.js';
-/**
- * Terminals that support OSC 777 (notify;title;message).
- * Identified by TERM_PROGRAM or TERM environment variables.
- */
-const OSC777_TERM_PROGRAMS = new Set(['ghostty', 'kitty', 'wezterm', 'foot', 'WarpTerminal']);
-const OSC777_TERM_PREFIXES = ['xterm-kitty', 'foot'];
-function supportsOsc777(env) {
+import { getTtyWriter as defaultGetTtyWriter, writeOscSequence } from '../utils/tty-osc.js';
+const OSC777_TERM_PROGRAMS = new Set(['ghostty', 'wezterm', 'foot', 'warpterminal']);
+const OSC777_TERM_EXACT = new Set(['foot']);
+const OSC777_TERM_PREFIXES = ['xterm-ghostty', 'foot'];
+const OSC9_TERM_PROGRAMS = new Set(['iterm.app', 'wezterm', 'warpterminal']);
+const OSC9_TERM_EXACT = new Set(['rio']);
+const OSC9_TERM_PREFIXES = ['wezterm', 'rio'];
+function supportsOsc777(env = process.env) {
     const termProgram = env.TERM_PROGRAM?.toLowerCase();
     if (termProgram && OSC777_TERM_PROGRAMS.has(termProgram)) {
         return true;
     }
     const term = env.TERM?.toLowerCase();
     if (term) {
-        if (OSC777_TERM_PROGRAMS.has(term))
+        if (OSC777_TERM_EXACT.has(term))
             return true;
-        if (OSC777_TERM_PREFIXES.some((prefix) => term.startsWith(prefix)))
+        if (OSC777_TERM_PREFIXES.some((prefix) => term.startsWith(prefix))) {
             return true;
+        }
     }
     return false;
 }
-/**
- * Strip characters that would break OSC sequences: ESC, BEL, and semicolons.
- * Semicolons are used as field separators in OSC 777.
- */
-function sanitize(text) {
-    // eslint-disable-next-line no-control-regex
-    return text.replace(/[\x1b\x07;]/g, '');
+function canUseBell(env = process.env, stream = process.stdout) {
+    return Boolean(stream.isTTY && !env.CI);
 }
-/**
- * Build the raw OSC escape sequence for a desktop notification.
- * Uses OSC 777 (title + message) on capable terminals, OSC 9 otherwise.
- * Does NOT apply multiplexer wrapping — use writeOscSequence for that.
- */
-export function buildNotificationSequence(title, message, env) {
-    const safeTitle = sanitize(title);
-    const safeMessage = sanitize(message);
-    if (supportsOsc777(env)) {
-        return `\x1b]777;notify;${safeTitle};${safeMessage}\x07`;
+function supportsOsc9(env = process.env) {
+    const termProgram = env.TERM_PROGRAM?.toLowerCase();
+    if (termProgram && OSC9_TERM_PROGRAMS.has(termProgram)) {
+        return true;
+    }
+    const term = env.TERM?.toLowerCase();
+    if (term) {
+        if (OSC9_TERM_EXACT.has(term))
+            return true;
+        if (OSC9_TERM_PREFIXES.some((prefix) => term.startsWith(prefix))) {
+            return true;
+        }
     }
-    return `\x1b]9;${safeMessage}\x07`;
+    return false;
+}
+function getNotificationMethod(env = process.env, stream = process.stdout) {
+    if (env.CI)
+        return undefined;
+    if (supportsOsc777(env))
+        return 'osc777';
+    if (supportsOsc9(env))
+        return 'osc9';
+    if (canUseBell(env, stream))
+        return 'bell';
+    return undefined;
+}
+function escapeOsc(value) {
+    return value.replace(/\x1b/g, '').replace(/\x07/g, '').replace(/;/g, ',');
 }
-/**
- * Send a desktop notification via OSC escape sequence.
- * Silently does nothing if no TTY writer is available.
- */
-export function sendNotification(title, message, opts = {}) {
+function buildNotificationSequence(title, message, env = process.env, stream = process.stdout) {
+    const method = getNotificationMethod(env, stream);
+    if (method === 'osc777') {
+        return `\x1b]777;notify;${escapeOsc(title)};${escapeOsc(message)}\x07`;
+    }
+    if (method === 'osc9') {
+        return `\x1b]9;${escapeOsc(message)}\x07`;
+    }
+    if (method === 'bell') {
+        return '\x07';
+    }
+    return '';
+}
+function notify(title, message, options = {}) {
+    const env = options.env ?? process.env;
+    const stream = options.stream ?? process.stdout;
+    const method = getNotificationMethod(env, stream);
+    if (method === 'osc777') {
+        stream.write(`\x1b]777;notify;${escapeOsc(title)};${escapeOsc(message)}\x07`);
+        return true;
+    }
+    if (method === 'osc9') {
+        stream.write(`\x1b]9;${escapeOsc(message)}\x07`);
+        return true;
+    }
+    if (method === 'bell') {
+        stream.write('\x07');
+        return true;
+    }
+    return false;
+}
+function sendNotification(title, message, opts = {}) {
     const env = opts.env ?? process.env;
-    const getWriter = opts.getTtyWriter ?? getTtyWriter;
     const logger = opts.logger;
+    const stream = opts.stream ?? process.stdout;
     if (logger) {
         logger.debug('sendNotification called', {
             title,
@@ -55,14 +94,23 @@ export function sendNotification(title, message, opts = {}) {
             termProgram: env.TERM_PROGRAM,
             term: env.TERM,
             supportsOsc777: supportsOsc777(env),
+            supportsOsc9: supportsOsc9(env),
+            canUseBell: canUseBell(env, stream),
         });
     }
-    const inner = buildNotificationSequence(title, message, env);
-    if (logger) {
-        logger.debug('sendNotification built sequence', {
-            sequence: JSON.stringify(inner),
-        });
+    const getWriter = opts.getTtyWriter ?? defaultGetTtyWriter;
+    const writer = getWriter();
+    if (!writer)
+        return false;
+    const sequence = buildNotificationSequence(title, message, env, stream);
+    if (!sequence)
+        return false;
+    if (sequence === '\x07') {
+        writer(sequence);
+        return true;
     }
-    writeOscSequence(inner, { env, getTtyWriter: getWriter });
+    writeOscSequence(sequence, { env, getTtyWriter: () => writer });
+    return true;
 }
+export { notify, supportsOsc777, supportsOsc9, canUseBell, getNotificationMethod, buildNotificationSequence, sendNotification, };
 //# sourceMappingURL=notification-service.js.map

package/dist/services/notification-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"notification-service.js","sourceRoot":"","sources":["../../source/services/notification-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAkB,MAAM,qBAAqB,CAAC;AAYrF;;;GAGG;AACH,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;AAC9F,MAAM,oBAAoB,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;AAErD,SAAS,cAAc,CAAC,GAAsB;IAC5C,MAAM,WAAW,GAAG,GAAG,CAAC,YAAY,EAAE,WAAW,EAAE,CAAC;IACpD,IAAI,WAAW,IAAI,oBAAoB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC;IACrC,IAAI,IAAI,EAAE,CAAC;QACT,IAAI,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAChD,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;IAClF,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;GAGG;AACH,SAAS,QAAQ,CAAC,IAAY;IAC5B,4CAA4C;IAC5C,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;AAC1C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CAAC,KAAa,EAAE,OAAe,EAAE,GAAsB;IAC9F,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClC,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IAEtC,IAAI,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;QACxB,OAAO,mBAAmB,SAAS,IAAI,WAAW,MAAM,CAAC;IAC3D,CAAC;IAED,OAAO,UAAU,WAAW,MAAM,CAAC;AACrC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAa,EAAE,OAAe,EAAE,OAA4B,EAAE;IAC7F,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACpC,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC;IACpD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAE3B,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE;YACtC,KAAK;YACL,OAAO;YACP,WAAW,EAAE,GAAG,CAAC,YAAY;YAC7B,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,cAAc,EAAE,cAAc,CAAC,GAAG,CAAC;SACpC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,KAAK,GAAG,yBAAyB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IAE7D,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE;YAC9C,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;SAChC,CAAC,CAAC;IACL,CAAC;IAED,gBAAgB,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC;AAC5D,CAAC"}
+{"version":3,"file":"notification-service.js","sourceRoot":"","sources":["../../source/services/notification-service.ts"],"names":[],"mappings":"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"}

package/dist/services/notification-service.test.js

@@ -1,78 +1,151 @@
 import test from 'ava';
-import { buildNotificationSequence, sendNotification } from './notification-service.js';
-// ── OSC format selection ────────────────────────────────────────────────────
-test('buildNotificationSequence uses OSC 9 for unknown terminals', (t) => {
-    const seq = buildNotificationSequence('Title', 'Message', {});
-    t.is(seq, '\x1b]9;Message\x07');
-});
-test('buildNotificationSequence uses OSC 777 for ghostty', (t) => {
-    const seq = buildNotificationSequence('Alert', 'Done', { TERM_PROGRAM: 'ghostty' });
-    t.is(seq, '\x1b]777;notify;Alert;Done\x07');
-});
-test('buildNotificationSequence uses OSC 777 for kitty (TERM=xterm-kitty)', (t) => {
-    const seq = buildNotificationSequence('Alert', 'Done', { TERM: 'xterm-kitty' });
-    t.is(seq, '\x1b]777;notify;Alert;Done\x07');
-});
-test('buildNotificationSequence uses OSC 777 for WezTerm', (t) => {
-    const seq = buildNotificationSequence('T', 'M', { TERM_PROGRAM: 'WezTerm' });
-    t.is(seq, '\x1b]777;notify;T;M\x07');
-});
-test('buildNotificationSequence uses OSC 777 for foot', (t) => {
-    const seq = buildNotificationSequence('T', 'M', { TERM: 'foot' });
-    t.is(seq, '\x1b]777;notify;T;M\x07');
-});
-test('buildNotificationSequence uses OSC 9 for iterm2', (t) => {
-    const seq = buildNotificationSequence('T', 'M', { TERM_PROGRAM: 'iTerm.app' });
-    t.is(seq, '\x1b]9;M\x07');
-});
-test('buildNotificationSequence uses OSC 9 for generic xterm', (t) => {
-    const seq = buildNotificationSequence('T', 'M', { TERM: 'xterm-256color', TERM_PROGRAM: undefined });
-    t.is(seq, '\x1b]9;M\x07');
-});
-// ── Sanitization ────────────────────────────────────────────────────────────
-test('buildNotificationSequence strips semicolons from title and message', (t) => {
-    const seq = buildNotificationSequence('Ti;tle', 'Me;ssage', { TERM_PROGRAM: 'ghostty' });
-    t.is(seq, '\x1b]777;notify;Title;Message\x07');
-});
-test('buildNotificationSequence strips ESC characters from title and message', (t) => {
-    const seq = buildNotificationSequence('Ti\x1btle', 'Me\x1bssage', { TERM_PROGRAM: 'ghostty' });
-    t.is(seq, '\x1b]777;notify;Title;Message\x07');
-});
-test('buildNotificationSequence strips BEL characters from title and message', (t) => {
-    const seq = buildNotificationSequence('Ti\x07tle', 'Me\x07ssage', { TERM_PROGRAM: 'ghostty' });
-    t.is(seq, '\x1b]777;notify;Title;Message\x07');
-});
-test('buildNotificationSequence strips semicolons from OSC 9 message', (t) => {
-    const seq = buildNotificationSequence('T', 'Me;ss;age', {});
-    t.is(seq, '\x1b]9;Message\x07');
-});
-// ── sendNotification ────────────────────────────────────────────────────────
-test('sendNotification writes OSC sequence to the injected writer', (t) => {
+import { canUseBell, getNotificationMethod, notify, sendNotification, supportsOsc777, supportsOsc9, buildNotificationSequence, } from './notification-service.js';
+function createStream(isTTY) {
     let written = '';
-    sendNotification('Alert', 'Done', {
-        env: {},
+    return {
+        isTTY,
+        get written() {
+            return written;
+        },
+        write(data) {
+            written += data;
+            return true;
+        },
+    };
+}
+test('supportsOsc777 recognizes supported terminals', (t) => {
+    t.true(supportsOsc777({ TERM_PROGRAM: 'ghostty' }));
+    t.true(supportsOsc777({ TERM_PROGRAM: 'WezTerm' }));
+    t.true(supportsOsc777({ TERM: 'foot' }));
+    t.true(supportsOsc777({ TERM: 'foot-extra' }));
+    t.true(supportsOsc777({ TERM: 'xterm-ghostty-256color' }));
+});
+test('supportsOsc777 excludes kitty and unrelated terminals', (t) => {
+    t.false(supportsOsc777({ TERM_PROGRAM: 'kitty' }));
+    t.false(supportsOsc777({ TERM: 'xterm-kitty' }));
+    t.false(supportsOsc777({ TERM_PROGRAM: 'iTerm.app' }));
+});
+test('supportsOsc9 recognizes explicitly supported terminals', (t) => {
+    t.true(supportsOsc9({ TERM_PROGRAM: 'iTerm.app' }));
+    t.true(supportsOsc9({ TERM_PROGRAM: 'WezTerm' }));
+    t.true(supportsOsc9({ TERM_PROGRAM: 'WarpTerminal' }));
+    t.true(supportsOsc9({ TERM: 'rio' }));
+    t.true(supportsOsc9({ TERM: 'rio-256color' }));
+    t.true(supportsOsc9({ TERM: 'wezterm' }));
+});
+test('supportsOsc9 excludes generic and unrelated terminals', (t) => {
+    t.false(supportsOsc9({ TERM: 'xterm-256color' }));
+    t.false(supportsOsc9({ TERM_PROGRAM: 'ghostty' }));
+    t.false(supportsOsc9({ TERM_PROGRAM: 'kitty' }));
+    t.false(supportsOsc9({}));
+});
+test('canUseBell requires a real TTY and non-CI environment', (t) => {
+    t.true(canUseBell({ TERM: 'xterm-256color' }, { isTTY: true }));
+    t.true(canUseBell({ TERM: 'dumb' }, { isTTY: true }));
+    t.false(canUseBell({ TERM: 'xterm-256color', CI: '1' }, { isTTY: true }));
+    t.false(canUseBell({ TERM: 'xterm-256color' }, { isTTY: false }));
+    t.true(canUseBell({}, { isTTY: true }));
+});
+test('getNotificationMethod prefers OSC 777 over bell', (t) => {
+    const stream = { isTTY: true };
+    t.is(getNotificationMethod({ TERM_PROGRAM: 'ghostty', TERM: 'xterm-256color' }, stream), 'osc777');
+});
+test('getNotificationMethod falls back to OSC 9 for explicitly supported terminals', (t) => {
+    const stream = { isTTY: true };
+    t.is(getNotificationMethod({ TERM_PROGRAM: 'iTerm.app', TERM: 'xterm-256color' }, stream), 'osc9');
+    t.is(getNotificationMethod({ TERM: 'rio' }, stream), 'osc9');
+});
+test('getNotificationMethod returns undefined when no notification path is available', (t) => {
+    const stream = { isTTY: true };
+    t.is(getNotificationMethod({ TERM: 'xterm-256color', CI: '1' }, stream), undefined);
+    t.is(getNotificationMethod({ TERM: 'dumb' }, { isTTY: false }), undefined);
+});
+test('getNotificationMethod falls back to bell for dumb terminals on a TTY', (t) => {
+    const stream = { isTTY: true };
+    t.is(getNotificationMethod({ TERM: 'dumb' }, stream), 'bell');
+    t.is(getNotificationMethod({ TERM: 'xterm-256color' }, stream), 'bell');
+});
+test('notify writes OSC 777 for capable terminals and sanitizes payloads', (t) => {
+    const stream = createStream(true);
+    const result = notify('Ti;tle\x1b', 'Me\x07ss;age', {
+        env: { TERM_PROGRAM: 'ghostty' },
+        stream,
+    });
+    t.true(result);
+    t.is(stream.written, '\x1b]777;notify;Ti,tle;Mess,age\x07');
+});
+test('notify writes OSC 9 fallback for explicitly supported terminals', (t) => {
+    const stream = createStream(true);
+    const result = notify('Alert', 'Done', {
+        env: { TERM_PROGRAM: 'iTerm.app', TERM: 'xterm-256color' },
+        stream,
+    });
+    t.true(result);
+    t.is(stream.written, '\x1b]9;Done\x07');
+});
+test('notify returns false when no notification method is available', (t) => {
+    const stream = createStream(false);
+    const result = notify('T', 'M', {
+        env: { TERM: 'dumb' },
+        stream,
+    });
+    t.false(result);
+    t.is(stream.written, '');
+});
+test('buildNotificationSequence mirrors the selected notification method', (t) => {
+    t.is(buildNotificationSequence('A', 'B', { TERM_PROGRAM: 'ghostty' }, { isTTY: true }), '\x1b]777;notify;A;B\x07');
+    t.is(buildNotificationSequence('A', 'B', { TERM_PROGRAM: 'iTerm.app' }, { isTTY: true }), '\x1b]9;B\x07');
+    t.is(buildNotificationSequence('A', 'B', { TERM: 'xterm-256color' }, { isTTY: true }), '\x07');
+    t.is(buildNotificationSequence('A', 'B', {}, { isTTY: false }), '');
+    t.is(buildNotificationSequence('A', 'B', { TERM: 'dumb' }, { isTTY: true }), '\x07');
+    t.is(buildNotificationSequence('A', 'B', { TERM: 'dumb' }, { isTTY: false }), '');
+});
+test('sendNotification supports injected tty writers for compatibility', (t) => {
+    let written = '';
+    const result = sendNotification('Alert', 'Done', {
+        env: { TERM_PROGRAM: 'ghostty' },
+        stream: { isTTY: true },
         getTtyWriter: () => (data) => {
             written = data;
         },
     });
-    t.is(written, '\x1b]9;Done\x07');
+    t.true(result);
+    t.is(written, '\x1b]777;notify;Alert;Done\x07');
+});
+test('sendNotification wraps OSC sequences for tmux passthrough', (t) => {
+    let written = '';
+    const result = sendNotification('Alert', 'Done', {
+        env: { TERM_PROGRAM: 'ghostty', TMUX: '/tmp/tmux' },
+        stream: { isTTY: true },
+        getTtyWriter: () => (data) => {
+            written = data;
+        },
+    });
+    t.true(result);
+    t.is(written, '\x1bPtmux;\x1b\x1b\x1b]777;notify;Alert;Done\x07\x1b\\');
 });
-test('sendNotification does nothing when no writer is available', (t) => {
-    t.notThrows(() => {
-        sendNotification('T', 'M', {
-            env: {},
-            getTtyWriter: () => null,
-        });
+test('sendNotification uses OSC 9 fallback through tty writer', (t) => {
+    let written = '';
+    const result = sendNotification('Alert', 'Done', {
+        env: { TERM_PROGRAM: 'iTerm.app', TERM: 'xterm-256color' },
+        stream: { isTTY: false },
+        getTtyWriter: () => (data) => {
+            written = data;
+        },
     });
+    t.true(result);
+    t.is(written, '\x1b]9;Done\x07');
 });
-test('sendNotification applies OSC 777 for capable terminals', (t) => {
+test('sendNotification uses bell for unknown terminals on a TTY', (t) => {
     let written = '';
-    sendNotification('Alert', 'Done', {
-        env: { TERM_PROGRAM: 'kitty' },
+    const result = sendNotification('Alert', 'Done', {
+        env: { TERM: 'xterm-256color' },
+        stream: { isTTY: true },
         getTtyWriter: () => (data) => {
             written = data;
         },
     });
-    t.is(written, '\x1b]777;notify;Alert;Done\x07');
+    t.true(result);
+    t.is(written, '\x07');
 });
 //# sourceMappingURL=notification-service.test.js.map

package/dist/services/notification-service.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"notification-service.test.js","sourceRoot":"","sources":["../../source/services/notification-service.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"notification-service.test.js","sourceRoot":"","sources":["../../source/services/notification-service.test.ts"],"names":[],"mappings":"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"}

package/dist/services/provider-traffic.d.ts

@@ -1,17 +1,12 @@
 export declare const TRAFFIC_TEXT_LIMIT = 100;
-export type SessionTrafficContext = {
-    sessionId: string;
-    sessionStartedAt: string;
-    firstUserMessagePreview?: string;
-    mode?: string;
-    traceId?: string;
-    evaluator?: boolean;
-};
+export type { SessionTrafficContext } from './service-interfaces.js';
 export type SentTrafficRecord = {
     requestId: string;
     timestamp: string;
     provider: string;
     model: string;
+    modelClass?: string;
+    modelWrapperClass?: string;
     sessionId: string;
     sessionStartedAt: string;
     mode?: string;
@@ -56,11 +51,14 @@ type RequestStartInput = {
     timestamp: string;
     provider: string;
     model: string;
+    modelClass?: string;
+    modelWrapperClass?: string;
     sessionId: string;
     sessionStartedAt: string;
     mode?: string;
     firstUserMessagePreview?: string;
     sentBody: Record<string, unknown>;
+    headers?: Record<string, string>;
     evaluator?: boolean;
 };
 type RequestCompleteInput = {
@@ -68,6 +66,8 @@ type RequestCompleteInput = {
     timestamp: string;
     provider: string;
     model: string;
+    modelClass?: string;
+    modelWrapperClass?: string;
     sessionId: string;
     sessionStartedAt: string;
     mode?: string;
@@ -83,5 +83,4 @@ export declare class ProviderTrafficArtifactStore {
     recordRequestStart(input: RequestStartInput): void;
     recordRequestComplete(input: RequestCompleteInput): void;
 }
-export {};
 //# sourceMappingURL=provider-traffic.d.ts.map

package/dist/services/provider-traffic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider-traffic.d.ts","sourceRoot":"","sources":["../../source/services/provider-traffic.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"provider-traffic.d.ts","sourceRoot":"","sources":["../../source/services/provider-traffic.ts"],"names":[],"mappings":"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"}

package/dist/services/provider-traffic.js

@@ -28,10 +28,23 @@ const normalizePreview = (text) => {
         return normalized;
     return normalized.slice(0, PREVIEW_LIMIT);
 };
+const sanitizeContentArray = (content) => content.map((item) => {
+    const record = asRecord(item);
+    if (!record)
+        return item;
+    if (record.type === 'text' && typeof record.text === 'string') {
+        return { ...record, text: truncateTrafficText(record.text) };
+    }
+    return item;
+});
 const sanitizeInstructionLikeValue = (value) => {
-    if (typeof value !== 'string')
-        return value;
-    return truncateTrafficText(value);
+    if (typeof value === 'string') {
+        return truncateTrafficText(value);
+    }
+    if (Array.isArray(value)) {
+        return sanitizeContentArray(value);
+    }
+    return value;
 };
 const sanitizeToolDefinitions = (tools) => {
     if (!Array.isArray(tools))
@@ -50,15 +63,6 @@ const sanitizeToolDefinitions = (tools) => {
         return 'unknown-tool';
     });
 };
-const sanitizeContentArray = (content) => content.map((item) => {
-    const record = asRecord(item);
-    if (!record)
-        return item;
-    if (record.type === 'text' && typeof record.text === 'string') {
-        return { ...record, text: truncateTrafficText(record.text) };
-    }
-    return item;
-});
 const sanitizeReasoningDetails = (reasoningDetails) => {
     if (!Array.isArray(reasoningDetails))
         return reasoningDetails;
@@ -92,6 +96,9 @@ export const sanitizeSentTrafficBody = (body) => {
     if (Object.prototype.hasOwnProperty.call(sanitized, 'instructions')) {
         sanitized.instructions = sanitizeInstructionLikeValue(sanitized.instructions);
     }
+    if (Object.prototype.hasOwnProperty.call(sanitized, 'system')) {
+        sanitized.system = sanitizeInstructionLikeValue(sanitized.system);
+    }
     if (Array.isArray(sanitized.messages)) {
         sanitized.messages = sanitized.messages.map((item) => {
             const record = asRecord(item);
@@ -496,8 +503,11 @@ export class ProviderTrafficArtifactStore {
             timestamp: input.timestamp,
             provider: input.provider,
             model: input.model,
+            ...(input.modelClass ? { modelClass: input.modelClass } : {}),
+            ...(input.modelWrapperClass ? { modelWrapperClass: input.modelWrapperClass } : {}),
             sessionId: input.sessionId,
             mode: input.mode ?? 'unknown',
+            ...(input.headers ? { headers: input.headers } : {}),
             body: sanitizeSentTrafficBody(input.sentBody),
         };
         fs.writeFileSync(requestPath, `${JSON.stringify(sentRecord, null, 2)}\n`, 'utf8');
@@ -525,6 +535,8 @@ export class ProviderTrafficArtifactStore {
             timestamp: input.timestamp,
             provider: input.provider,
             model: input.model,
+            ...(input.modelClass ? { modelClass: input.modelClass } : {}),
+            ...(input.modelWrapperClass ? { modelWrapperClass: input.modelWrapperClass } : {}),
             sessionId: input.sessionId,
             mode: input.mode ?? 'unknown',
             ...(input.receivedSummary ? { summary: input.receivedSummary } : {}),