@ottocode/sdk 0.1.265 → 0.1.266

package/src/core/src/utils/logger.ts

@@ -1,51 +1,6 @@
-import { appendFileSync, mkdirSync } from 'node:fs';
-import { dirname } from 'node:path';
 import { isDebugEnabled, isTraceEnabled, getDebugScopes } from './debug.ts';
-import {
-	getGlobalDebugLogPath,
-	getSessionDebugDetailsLogPath,
-	getSessionDebugLogPath,
-} from '../../../config/src/paths.ts';
-
-export type LogLevel = 'debug' | 'info' | 'warn' | 'error';
-
-const ANSI_RESET = '\x1b[0m';
-const ANSI_DIM = '\x1b[2m';
-const ANSI_CYAN = '\x1b[36m';
-const ANSI_BLUE = '\x1b[34m';
-const ANSI_GREEN = '\x1b[32m';
-const ANSI_YELLOW = '\x1b[33m';
-const ANSI_RED = '\x1b[31m';
-
-function safeHasMeta(
-	meta?: Record<string, unknown>,
-): meta is Record<string, unknown> {
-	return Boolean(meta && Object.keys(meta).length);
-}
-
-function getDebugLogFilePath(): string | undefined {
-	if (!isDebugEnabled()) return undefined;
-	return getGlobalDebugLogPath();
-}
-
-function getSessionLogFilePath(
-	meta?: Record<string, unknown>,
-): string | undefined {
-	if (!isDebugEnabled()) return undefined;
-	if (meta?.debugDetail === true) return undefined;
-	const sessionId = meta?.sessionId;
-	if (typeof sessionId !== 'string' || !sessionId.trim()) return undefined;
-	return getSessionDebugLogPath(sessionId);
-}
-
-function getSessionDetailsLogFilePath(
-	meta?: Record<string, unknown>,
-): string | undefined {
-	if (!isDebugEnabled()) return undefined;
-	const sessionId = meta?.sessionId;
-	if (typeof sessionId !== 'string' || !sessionId.trim()) return undefined;
-	return getSessionDebugDetailsLogPath(sessionId);
-}
+import { colorizeLine, safeHasMeta, type LogLevel } from './logger/format.ts';
+import { writeLogLine } from './logger/sinks.ts';
 
 function shouldWriteDebugLog(message: string): boolean {
 	if (!isDebugEnabled()) return false;
@@ -56,41 +11,6 @@ function shouldWriteDebugLog(message: string): boolean {
 	return scopes.includes(match[1]);
 }
 
-function serializeLogMeta(meta?: Record<string, unknown>): string {
-	if (!safeHasMeta(meta)) return '';
-	try {
-		const sanitized = { ...meta };
-		delete sanitized.debugDetail;
-		return Object.keys(sanitized).length ? ` ${JSON.stringify(sanitized)}` : '';
-	} catch {
-		return ' [unserializable-meta]';
-	}
-}
-
-function colorizeLine(line: string, level: LogLevel): string {
-	const levelColor =
-		level === 'debug'
-			? ANSI_CYAN
-			: level === 'info'
-				? ANSI_BLUE
-				: level === 'warn'
-					? ANSI_YELLOW
-					: ANSI_RED;
-	const scopeMatch = line.match(
-		/\[(debug|info|warn|error|timing)\]\s+\[([^\]]+)\]/i,
-	);
-	if (!scopeMatch) {
-		return `${levelColor}${line}${ANSI_RESET}`;
-	}
-	const rest = line.slice(24);
-	return `${ANSI_DIM}${line.slice(0, 24)}${ANSI_RESET}${rest
-		.replace(scopeMatch[1], `${levelColor}${scopeMatch[1]}${ANSI_RESET}`)
-		.replace(
-			`[${scopeMatch[2]}]`,
-			`${ANSI_GREEN}[${scopeMatch[2]}]${ANSI_RESET}`,
-		)}`;
-}
-
 function printLine(
 	level: LogLevel,
 	line: string,
@@ -108,43 +28,6 @@ function printLine(
 	else console.log(colored);
 }
 
-function writeLogLine(line: string, meta?: Record<string, unknown>) {
-	const suffix = serializeLogMeta(meta);
-	const fullLine = `${new Date().toISOString()} ${line}${suffix}`;
-	const logFile = getDebugLogFilePath();
-
-	if (logFile) {
-		try {
-			mkdirSync(dirname(logFile), { recursive: true });
-			appendFileSync(logFile, `${fullLine}\n`, 'utf-8');
-		} catch {
-			// ignore file logging errors
-		}
-	}
-
-	const sessionLogFile = getSessionLogFilePath(meta);
-	if (sessionLogFile) {
-		try {
-			mkdirSync(dirname(sessionLogFile), { recursive: true });
-			appendFileSync(sessionLogFile, `${fullLine}\n`, 'utf-8');
-		} catch {
-			// ignore file logging errors
-		}
-	}
-
-	const sessionDetailsLogFile = getSessionDetailsLogFilePath(meta);
-	if (sessionDetailsLogFile) {
-		try {
-			mkdirSync(dirname(sessionDetailsLogFile), { recursive: true });
-			appendFileSync(sessionDetailsLogFile, `${fullLine}\n`, 'utf-8');
-		} catch {
-			// ignore file logging errors
-		}
-	}
-
-	return fullLine;
-}
-
 export function debug(message: string, meta?: Record<string, unknown>): void {
 	if (!shouldWriteDebugLog(message)) return;
 	try {

package/src/index.ts

@@ -72,6 +72,8 @@ export type { UnderlyingProviderKey } from './providers/src/index.ts';
 export {
 	discoverOllamaModels,
 	normalizeOllamaBaseURL,
+	resolveOpenAIResponsesModel,
+	shouldUseOpenAIResponsesApi,
 } from './providers/src/index.ts';
 export type {
 	DiscoverOllamaOptions,

package/src/providers/src/index.ts

@@ -42,6 +42,10 @@ export {
 	discoverOllamaModels,
 	normalizeOllamaBaseURL,
 } from './ollama-discovery.ts';
+export {
+	resolveOpenAIResponsesModel,
+	shouldUseOpenAIResponsesApi,
+} from './model-resolution.ts';
 export type {
 	DiscoverOllamaOptions,
 	DiscoverOllamaResult,

package/src/providers/src/model-resolution.ts

@@ -0,0 +1,21 @@
+import type { createOpenAI } from '@ai-sdk/openai';
+
+export function shouldUseOpenAIResponsesApi(model: string): boolean {
+	const lower = model.toLowerCase();
+	return (
+		lower.includes('gpt-5') ||
+		lower.startsWith('o1') ||
+		lower.startsWith('o3') ||
+		lower.startsWith('o4') ||
+		lower.includes('codex-mini')
+	);
+}
+
+export function resolveOpenAIResponsesModel(
+	instance: ReturnType<typeof createOpenAI>,
+	model: string,
+) {
+	return shouldUseOpenAIResponsesApi(model)
+		? instance.responses(model)
+		: instance(model);
+}

package/src/providers/src/zai-client.ts

@@ -3,11 +3,13 @@ import { catalog } from './catalog-merged.ts';
 
 export type ZaiProviderConfig = {
 	apiKey?: string;
+	baseURL?: string;
 };
 
 export function createZaiModel(model: string, config?: ZaiProviderConfig) {
 	const entry = catalog.zai;
-	const baseURL = entry?.api || 'https://api.z.ai/api/paas/v4';
+	const baseURL =
+		config?.baseURL || entry?.api || 'https://api.z.ai/api/paas/v4';
 	const apiKey =
 		config?.apiKey ||
 		process.env.ZAI_API_KEY ||
@@ -29,7 +31,8 @@ export function createZaiCodingModel(
 	config?: ZaiProviderConfig,
 ) {
 	const entry = catalog['zai-coding'];
-	const baseURL = entry?.api || 'https://api.z.ai/api/coding/paas/v4';
+	const baseURL =
+		config?.baseURL || entry?.api || 'https://api.z.ai/api/coding/paas/v4';
 	const apiKey =
 		config?.apiKey ||
 		process.env.ZAI_CODING_API_KEY ||