@ottocode/server 0.1.233 → 0.1.235

package/src/runtime/message/service.ts

@@ -12,7 +12,6 @@ import {
 	type ProviderId,
 	type ReasoningLevel,
 } from '@ottocode/sdk';
-import { debugLog } from '../debug/index.ts';
 import { isCompactCommand, buildCompactionContext } from './compaction.ts';
 import { detectOAuth, adaptSimpleCall } from '../provider/oauth-adapter.ts';
 
@@ -59,10 +58,6 @@ export async function dispatchAssistantMessage(
 		files,
 	} = options;
 
-	debugLog(
-		`[MESSAGE_SERVICE] dispatchAssistantMessage called with userContext: ${userContext ? `${userContext.substring(0, 50)}...` : 'NONE'}`,
-	);
-
 	const sessionId = session.id;
 	const now = Date.now();
 	const userMessageId = crypto.randomUUID();
@@ -163,15 +158,10 @@ export async function dispatchAssistantMessage(
 		},
 	});
 
-	debugLog(
-		`[MESSAGE_SERVICE] Enqueuing assistant run with userContext: ${userContext ? `${userContext.substring(0, 50)}...` : 'NONE'}`,
-	);
-
 	const isCompact = isCompactCommand(content);
 	let compactionContext: string | undefined;
 
 	if (isCompact) {
-		debugLog('[MESSAGE_SERVICE] Detected /compact command, building context');
 		const { getModelLimits } = await import('./compaction.ts');
 		const limits = getModelLimits(provider, model);
 		const contextTokenLimit = limits
@@ -182,9 +172,6 @@ export async function dispatchAssistantMessage(
 			sessionId,
 			contextTokenLimit,
 		);
-		debugLog(
-			`[message-service] /compact context length: ${compactionContext.length}, limit: ${contextTokenLimit} tokens`,
-		);
 	}
 
 	const toolApprovalMode = cfg.defaults.toolApproval ?? 'dangerous';
@@ -249,9 +236,7 @@ function scheduleSessionTitle(args: {
 		titlePending.delete(sessionId);
 		try {
 			await generateSessionTitle({ cfg, db, sessionId, content });
-		} catch (err) {
-			debugLog('[TITLE_GEN] Title generation error:');
-			debugLog(err);
+		} catch {
 		} finally {
 			titleInFlight.delete(sessionId);
 			titleActiveCount--;
@@ -288,34 +273,24 @@ async function generateSessionTitle(args: {
 			.where(eq(sessions.id, sessionId));
 
 		if (!existingSession.length) {
-			debugLog('[TITLE_GEN] Session not found, aborting');
 			return;
 		}
 
 		const sess = existingSession[0];
 		if (sess.title && sess.title !== 'New Session') {
-			debugLog('[TITLE_GEN] Session already has a title, skipping');
 			return;
 		}
 
 		const provider = (sess.provider ?? cfg.defaults.provider) as ProviderId;
 		const modelName = sess.model ?? cfg.defaults.model;
 
-		debugLog('[TITLE_GEN] Generating title for session');
-		debugLog(`[TITLE_GEN] Provider: ${provider}, Model: ${modelName}`);
-
 		const { getAuth } = await import('@ottocode/sdk');
 		const auth = await getAuth(provider, cfg.projectRoot);
 		const oauth = detectOAuth(provider, auth);
 
 		const titleModel = getFastModelForAuth(provider, auth?.type) ?? modelName;
-		debugLog(`[TITLE_GEN] Using title model: ${titleModel}`);
 		const model = await resolveModel(provider, titleModel, cfg);
 
-		debugLog(
-			`[TITLE_GEN] oauth: needsSpoof=${oauth.needsSpoof}, isOpenAIOAuth=${oauth.isOpenAIOAuth}`,
-		);
-
 		const promptText = String(content ?? '').slice(0, 2000);
 
 		const titleInstructions = `Generate a brief title (6-8 words) summarizing what the user wants to do.
@@ -330,10 +305,6 @@ Output ONLY the title, nothing else.`;
 			userContent: promptText,
 		});
 
-		debugLog(
-			`[TITLE_GEN] mode=${adapted.forceStream ? 'openai-oauth' : oauth.needsSpoof ? 'spoof' : 'api-key'}`,
-		);
-
 		let modelTitle = '';
 		try {
 			if (adapted.forceStream || oauth.needsSpoof) {
@@ -348,7 +319,6 @@ Output ONLY the title, nothing else.`;
 				}
 				modelTitle = modelTitle.trim();
 			} else {
-				debugLog('[TITLE_GEN] Using generateText...');
 				const out = await generateText({
 					model,
 					system: adapted.system,
@@ -356,24 +326,15 @@ Output ONLY the title, nothing else.`;
 				});
 				modelTitle = (out?.text || '').trim();
 			}
-
-			debugLog('[TITLE_GEN] Raw response from model:');
-			debugLog(`[TITLE_GEN] "${modelTitle}"`);
-		} catch (err) {
-			debugLog('[TITLE_GEN] Error generating title:');
-			debugLog(err);
-		}
+		} catch {}
 
 		if (!modelTitle) {
-			debugLog('[TITLE_GEN] No title returned, aborting');
 			return;
 		}
 
 		const sanitized = sanitizeTitle(modelTitle);
-		debugLog(`[TITLE_GEN] After sanitization: "${sanitized}"`);
 
 		if (!sanitized || sanitized === 'New Session') {
-			debugLog('[TITLE_GEN] Sanitized title is empty or default, aborting');
 			return;
 		}
 
@@ -382,17 +343,12 @@ Output ONLY the title, nothing else.`;
 			.set({ title: sanitized, lastActiveAt: Date.now() })
 			.where(eq(sessions.id, sessionId));
 
-		debugLog(`[TITLE_GEN] Setting final title: "${sanitized}"`);
-
 		publish({
 			type: 'session.updated',
 			sessionId,
 			payload: { id: sessionId, title: sanitized },
 		});
-	} catch (err) {
-		debugLog('[TITLE_GEN] Error in generateSessionTitle:');
-		debugLog(err);
-	}
+	} catch {}
 }
 
 function sanitizeTitle(raw: string): string {
@@ -424,9 +380,7 @@ async function touchSessionLastActive(args: {
 			.set({ lastActiveAt: Date.now() })
 			.where(eq(sessions.id, sessionId))
 			.run();
-	} catch (err) {
-		debugLog('[touchSessionLastActive] Error:', err);
-	}
+	} catch {}
 }
 
 export async function triggerDeferredTitleGeneration(args: {
@@ -445,9 +399,6 @@ export async function triggerDeferredTitleGeneration(args: {
 			.limit(1);
 
 		if (!userMessages.length || userMessages[0].role !== 'user') {
-			debugLog(
-				'[TITLE_GEN] No user message found for deferred title generation',
-			);
 			return;
 		}
 
@@ -459,9 +410,6 @@ export async function triggerDeferredTitleGeneration(args: {
 			.limit(1);
 
 		if (!parts.length) {
-			debugLog(
-				'[TITLE_GEN] No message parts found for deferred title generation',
-			);
 			return;
 		}
 
@@ -470,19 +418,12 @@ export async function triggerDeferredTitleGeneration(args: {
 			const parsed = JSON.parse(parts[0].content ?? '{}');
 			content = String(parsed.text ?? '');
 		} catch {
-			debugLog('[TITLE_GEN] Failed to parse message part content');
 			return;
 		}
 
 		if (!content) {
-			debugLog('[TITLE_GEN] Empty content for deferred title generation');
 			return;
 		}
-
-		debugLog('[TITLE_GEN] Triggering deferred title generation');
 		enqueueSessionTitle({ cfg, db, sessionId, content });
-	} catch (err) {
-		debugLog('[TITLE_GEN] Error in triggerDeferredTitleGeneration:');
-		debugLog(err);
-	}
+	} catch {}
 }

package/src/runtime/message/tool-history-tracker.ts

@@ -1,5 +1,3 @@
-import { debugLog } from '../debug/index.ts';
-
 type ToolResultPart = {
 	type: string;
 	state?: string;
@@ -61,7 +59,6 @@ export class ToolHistoryTracker {
 			.callProviderMetadata;
 		delete (entry.part as { providerMetadata?: unknown }).providerMetadata;
 		entry.summarized = true;
-		debugLog(`[history] summarized tool output -> ${entry.summary}`);
 	}
 }
 

package/src/runtime/prompt/builder.ts

@@ -1,5 +1,4 @@
 import { providerBasePrompt } from '@ottocode/sdk';
-import { debugLog } from '../debug/index.ts';
 import { composeEnvironmentAndInstructions } from '../context/environment.ts';
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import BASE_PROMPT from '@ottocode/sdk/prompts/base.txt' with { type: 'text' };
@@ -163,7 +162,6 @@ export async function composeSystemPrompt(options: {
 
 	const composed = parts.filter(Boolean).join('\n\n').trim();
 	if (composed) {
-		debugLog(`[system] pieces: ${dedupeComponents(components).join(', ')}`);
 		return {
 			prompt: composed,
 			components: dedupeComponents(components),

package/src/runtime/provider/oauth-adapter.ts

@@ -88,11 +88,11 @@ export function detectOAuth(
 const CODEX_INSTRUCTIONS =
 	'You are a coding agent. Follow all developer messages. Use tools to complete tasks.';
 
-export function buildCodexProviderOptions() {
+export function buildCodexProviderOptions(instructions?: string) {
 	return {
 		openai: {
 			store: false as const,
-			instructions: CODEX_INSTRUCTIONS,
+			instructions: instructions?.trim() || CODEX_INSTRUCTIONS,
 			parallelToolCalls: false,
 		},
 	};
@@ -145,7 +145,7 @@ export function adaptSimpleCall(
 					content: input.userContent,
 				},
 			],
-			providerOptions: buildCodexProviderOptions(),
+			providerOptions: buildCodexProviderOptions(input.instructions),
 			forceStream: true,
 		};
 	}
@@ -229,9 +229,9 @@ export function adaptRunnerCall(
 		return {
 			system: '',
 			systemComponents: composed.components,
-			additionalSystemMessages: [{ role: 'system', content: composed.prompt }],
+			additionalSystemMessages: [],
 			maxOutputTokens: undefined,
-			providerOptions: buildCodexProviderOptions(),
+			providerOptions: buildCodexProviderOptions(composed.prompt),
 		};
 	}
 

package/src/runtime/stream/error-handler.ts

@@ -7,7 +7,6 @@ import { toErrorPayload } from '../errors/handling.ts';
 import type { RunOpts } from '../session/queue.ts';
 import type { ToolAdapterContext } from '../../tools/adapter.ts';
 import { pruneSession, performAutoCompaction } from '../message/compaction.ts';
-import { debugLog } from '../debug/index.ts';
 import { enqueueAssistantRun } from '../session/queue.ts';
 import { clearPendingTopup } from '../topup/manager.ts';
 
@@ -77,7 +76,6 @@ export function createErrorHandler(
 
 		// Handle fiat payment selected - this is not an error, just a signal to pause
 		if (isFiatSelected) {
-			debugLog('[stream-handlers] Fiat payment selected, pausing request');
 			clearPendingTopup(opts.sessionId);
 
 			// Add a helpful message part telling user to complete payment
@@ -171,20 +169,9 @@ export function createErrorHandler(
 			errorCode === 'context_length_exceeded' ||
 			errorType === 'invalid_request_error';
 
-		debugLog(
-			`[stream-handlers] isPromptTooLong: ${isPromptTooLong}, errorCode: ${errorCode}, errorType: ${errorType}`,
-		);
-
 		if (isPromptTooLong && !opts.isCompactCommand) {
-			debugLog(
-				'[stream-handlers] Prompt too long detected, auto-compacting...',
-			);
-
 			const retries = opts.compactionRetries ?? 0;
 			if (retries >= 2) {
-				debugLog(
-					'[stream-handlers] Compaction retry limit reached, surfacing error',
-				);
 			} else {
 				await db
 					.update(messages)
@@ -243,25 +230,12 @@ export function createErrorHandler(
 						opts.model,
 					);
 					if (compactResult.success) {
-						debugLog(
-							`[stream-handlers] Auto-compaction succeeded: ${compactResult.summary?.slice(0, 100)}...`,
-						);
 						compactionSucceeded = true;
 					} else {
-						debugLog(
-							`[stream-handlers] Auto-compaction failed: ${compactResult.error}, falling back to prune`,
-						);
 						const pruneResult = await pruneSession(db, opts.sessionId);
-						debugLog(
-							`[stream-handlers] Fallback pruned ${pruneResult.pruned} parts, saved ~${pruneResult.saved} tokens`,
-						);
 						compactionSucceeded = pruneResult.pruned > 0;
 					}
-				} catch (compactErr) {
-					debugLog(
-						`[stream-handlers] Auto-compact error: ${compactErr instanceof Error ? compactErr.message : String(compactErr)}`,
-					);
-				}
+				} catch {}
 
 				await db
 					.update(messages)
@@ -278,7 +252,6 @@ export function createErrorHandler(
 				});
 
 				if (compactionSucceeded && retryCallback) {
-					debugLog('[stream-handlers] Triggering retry after compaction...');
 					const retryMessageId = crypto.randomUUID();
 					await db.insert(messages).values({
 						id: retryMessageId,
@@ -315,9 +288,6 @@ export function createErrorHandler(
 				}
 
 				if (compactionSucceeded) {
-					debugLog(
-						'[stream-handlers] No retryCallback provided, cannot auto-retry',
-					);
 					return;
 				}
 			}

package/src/runtime/stream/finish-handler.ts

@@ -5,7 +5,6 @@ import { publish } from '../../events/bus.ts';
 import { estimateModelCostUsd } from '@ottocode/sdk';
 import type { RunOpts } from '../session/queue.ts';
 import { markSessionCompacted } from '../message/compaction.ts';
-import { debugLog } from '../debug/index.ts';
 import type { FinishEvent } from './types.ts';
 import {
 	normalizeUsage,
@@ -24,11 +23,7 @@ export function createFinishHandler(
 	return async (fin: FinishEvent) => {
 		try {
 			await completeAssistantMessageFn(fin, opts, db);
-		} catch (err) {
-			debugLog(
-				`[finish-handler] completeAssistantMessage failed: ${err instanceof Error ? err.message : String(err)}`,
-			);
-		}
+		} catch {}
 
 		if (opts.isCompactCommand && fin.finishReason !== 'error') {
 			const assistantParts = await db
@@ -40,27 +35,15 @@ export function createFinishHandler(
 			);
 
 			if (!hasTextContent) {
-				debugLog(
-					'[stream-handlers] /compact finished but no summary generated, skipping compaction marking',
-				);
 			} else {
 				try {
-					debugLog(
-						`[stream-handlers] /compact complete, marking session compacted`,
-					);
 					const result = await markSessionCompacted(
 						db,
 						opts.sessionId,
 						opts.assistantMessageId,
 					);
-					debugLog(
-						`[stream-handlers] Compacted ${result.compacted} parts, saved ~${result.saved} tokens`,
-					);
-				} catch (err) {
-					debugLog(
-						`[stream-handlers] Compaction failed: ${err instanceof Error ? err.message : String(err)}`,
-					);
-				}
+					void result;
+				} catch {}
 			}
 		}
 

package/src/runtime/stream/step-finish.ts

@@ -6,7 +6,6 @@ import type { RunOpts } from '../session/queue.ts';
 import type { ToolAdapterContext } from '../../tools/adapter.ts';
 import type { UsageData, ProviderMetadata } from '../session/db-operations.ts';
 import type { StepFinishEvent } from './types.ts';
-import { debugLog } from '../debug/index.ts';
 
 export function createStepFinishHandler(
 	opts: RunOpts,
@@ -45,11 +44,7 @@ export function createStepFinishHandler(
 					.set({ completedAt: finishedAt })
 					.where(eq(messageParts.id, currentPartId));
 			}
-		} catch (err) {
-			debugLog(
-				`[step-finish] Failed to update part completedAt: ${err instanceof Error ? err.message : String(err)}`,
-			);
-		}
+		} catch {}
 
 		if (step.usage) {
 			try {
@@ -59,11 +54,7 @@ export function createStepFinishHandler(
 					opts,
 					db,
 				);
-			} catch (err) {
-				debugLog(
-					`[step-finish] Failed to update session tokens: ${err instanceof Error ? err.message : String(err)}`,
-				);
-			}
+			} catch {}
 
 			try {
 				await updateMessageTokensIncrementalFn(
@@ -72,11 +63,7 @@ export function createStepFinishHandler(
 					opts,
 					db,
 				);
-			} catch (err) {
-				debugLog(
-					`[step-finish] Failed to update message tokens: ${err instanceof Error ? err.message : String(err)}`,
-				);
-			}
+			} catch {}
 		}
 
 		try {
@@ -97,21 +84,13 @@ export function createStepFinishHandler(
 					payload: { stepIndex, ...step.usage },
 				});
 			}
-		} catch (err) {
-			debugLog(
-				`[step-finish] Failed to publish finish-step: ${err instanceof Error ? err.message : String(err)}`,
-			);
-		}
+		} catch {}
 
 		try {
 			const newStepIndex = incrementStepIndex();
 			sharedCtx.stepIndex = newStepIndex;
 			updateCurrentPartId(null);
 			updateAccumulated('');
-		} catch (err) {
-			debugLog(
-				`[step-finish] Failed to increment step: ${err instanceof Error ? err.message : String(err)}`,
-			);
-		}
+		} catch {}
 	};
 }

package/src/runtime/tools/approval.ts

@@ -1,5 +1,4 @@
 import { publish } from '../../events/bus.ts';
-import { debugLog } from '../debug/index.ts';
 
 export type ToolApprovalMode = 'auto' | 'dangerous' | 'all';
 
@@ -49,12 +48,6 @@ export async function requestApproval(
 	args: unknown,
 	timeoutMs = 120000,
 ): Promise<boolean> {
-	debugLog('[approval] requestApproval called', {
-		sessionId,
-		messageId,
-		callId,
-		toolName,
-	});
 	return new Promise((resolve) => {
 		const approval: PendingApproval = {
 			callId,
@@ -67,10 +60,6 @@ export async function requestApproval(
 		};
 
 		pendingApprovals.set(callId, approval);
-		debugLog(
-			'[approval] Added to pendingApprovals, count:',
-			pendingApprovals.size,
-		);
 
 		publish({
 			type: 'tool.approval.required',
@@ -106,15 +95,8 @@ export function resolveApproval(
 	callId: string,
 	approved: boolean,
 ): { ok: boolean; error?: string } {
-	debugLog('[approval] resolveApproval called', {
-		callId,
-		approved,
-		pendingCount: pendingApprovals.size,
-		pendingIds: [...pendingApprovals.keys()],
-	});
 	const approval = pendingApprovals.get(callId);
 	if (!approval) {
-		debugLog('[approval] No pending approval found for callId:', callId);
 		return { ok: false, error: 'No pending approval found for this callId' };
 	}
 

package/src/runtime/utils/token.ts

@@ -1,5 +1,4 @@
 import { catalog } from '@ottocode/sdk';
-import { debugLog } from '../debug/index.ts';
 import type { ProviderName } from '../provider/index.ts';
 
 /**
@@ -16,23 +15,15 @@ export function getMaxOutputTokens(
 	try {
 		const providerCatalog = catalog[provider];
 		if (!providerCatalog) {
-			debugLog(`[maxOutputTokens] No catalog found for provider: ${provider}`);
 			return undefined;
 		}
 		const modelInfo = providerCatalog.models.find((m) => m.id === modelId);
 		if (!modelInfo) {
-			debugLog(
-				`[maxOutputTokens] No model info found for: ${modelId} in provider: ${provider}`,
-			);
 			return undefined;
 		}
 		const outputLimit = modelInfo.limit?.output;
-		debugLog(
-			`[maxOutputTokens] Provider: ${provider}, Model: ${modelId}, Limit: ${outputLimit}`,
-		);
 		return outputLimit;
-	} catch (err) {
-		debugLog(`[maxOutputTokens] Error looking up limit: ${err}`);
+	} catch {
 		return undefined;
 	}
 }

package/src/tools/adapter.ts

@@ -18,7 +18,6 @@ import {
 	requestApproval,
 } from '../runtime/tools/approval.ts';
 import { guardToolCall } from '../runtime/tools/guards.ts';
-import { debugLog } from '../runtime/debug/index.ts';
 
 export type { ToolAdapterContext } from '../runtime/tools/context.ts';
 
@@ -63,17 +62,9 @@ function extractToolCallId(options: unknown): string | undefined {
 const DEFAULT_TRACED_TOOL_INPUTS = new Set(['write', 'apply_patch']);
 
 function shouldTraceToolInput(name: string): boolean {
-	const raw = process.env.OTTO_DEBUG_TOOL_INPUT?.trim();
-	if (!raw) return false;
-	const normalized = raw.toLowerCase();
-	if (['1', 'true', 'yes', 'on', 'all'].includes(normalized)) {
-		return DEFAULT_TRACED_TOOL_INPUTS.has(name);
-	}
-	const tokens = raw
-		.split(/[\s,]+/)
-		.map((token) => token.trim().toLowerCase())
-		.filter(Boolean);
-	return tokens.includes('all') || tokens.includes(name.toLowerCase());
+	void DEFAULT_TRACED_TOOL_INPUTS;
+	void name;
+	return false;
 }
 
 function summarizeTraceValue(value: unknown, max = 160): string {
@@ -239,9 +230,7 @@ export function adaptTools(
 					stepIndex: ctx.stepIndex,
 				});
 				if (shouldTraceToolInput(name)) {
-					debugLog(
-						`[TOOL_INPUT_TRACE][adapter] onInputStart tool=${name} callId=${sdkCallId ?? queue[queue.length - 1]?.callId ?? 'unknown'} step=${ctx.stepIndex}`,
-					);
+					void (sdkCallId ?? queue[queue.length - 1]?.callId ?? 'unknown');
 				}
 				if (typeof base.onInputStart === 'function')
 					// biome-ignore lint/suspicious/noExplicitAny: AI SDK types are complex
@@ -254,9 +243,8 @@ export function adaptTools(
 				const queue = pendingCalls.get(name);
 				const meta = queue?.length ? queue[queue.length - 1] : undefined;
 				if (shouldTraceToolInput(name)) {
-					debugLog(
-						`[TOOL_INPUT_TRACE][adapter] onInputDelta tool=${name} callId=${sdkCallId ?? meta?.callId ?? 'unknown'} step=${meta?.stepIndex ?? ctx.stepIndex} delta=${summarizeTraceValue(delta ?? '')}`,
-					);
+					void (sdkCallId ?? meta?.callId ?? 'unknown');
+					void summarizeTraceValue(delta ?? '');
 				}
 				// Stream tool argument deltas as events if needed
 				publish({
@@ -297,9 +285,8 @@ export function adaptTools(
 				const callPartId = crypto.randomUUID();
 				const startTs = meta.startTs;
 				if (shouldTraceToolInput(name)) {
-					debugLog(
-						`[TOOL_INPUT_TRACE][adapter] onInputAvailable tool=${name} callId=${callId} step=${ctx.stepIndex} input=${summarizeTraceValue(args)}`,
-					);
+					void callId;
+					void summarizeTraceValue(args);
 				}
 
 				if (