@ottocode/server 0.1.179 → 0.1.181

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ottocode/server",
-	"version": "0.1.179",
+	"version": "0.1.181",
 	"description": "HTTP API server for ottocode",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -29,8 +29,8 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
-		"@ottocode/sdk": "0.1.179",
-		"@ottocode/database": "0.1.179",
+		"@ottocode/sdk": "0.1.181",
+		"@ottocode/database": "0.1.181",
 		"drizzle-orm": "^0.44.5",
 		"hono": "^4.9.9",
 		"zod": "^4.1.8"

package/src/events/bus.ts

@@ -25,7 +25,12 @@ export function publish(event: OttoEvent) {
 	for (const sub of subs) {
 		try {
 			sub(sanitizedEvent);
-		} catch {}
+		} catch (err) {
+			console.error(
+				`[bus] Subscriber threw on event ${event.type}:`,
+				err instanceof Error ? err.message : String(err),
+			);
+		}
 	}
 }
 

package/src/routes/sessions.ts

@@ -20,6 +20,11 @@ export function registerSessionsRoutes(app: Hono) {
 	// List sessions
 	app.get('/v1/sessions', async (c) => {
 		const projectRoot = c.req.query('project') || process.cwd();
+		const limit = Math.min(
+			Math.max(parseInt(c.req.query('limit') || '50', 10) || 50, 1),
+			200,
+		);
+		const offset = Math.max(parseInt(c.req.query('offset') || '0', 10) || 0, 0);
 		const cfg = await loadConfig(projectRoot);
 		const db = await getDb(cfg.projectRoot);
 		// Only return sessions for this project, excluding research sessions
@@ -32,8 +37,12 @@ export function registerSessionsRoutes(app: Hono) {
 					ne(sessions.sessionType, 'research'),
 				),
 			)
-			.orderBy(desc(sessions.lastActiveAt), desc(sessions.createdAt));
-		const normalized = rows.map((r) => {
+			.orderBy(desc(sessions.lastActiveAt), desc(sessions.createdAt))
+			.limit(limit + 1)
+			.offset(offset);
+		const hasMore = rows.length > limit;
+		const page = hasMore ? rows.slice(0, limit) : rows;
+		const normalized = page.map((r) => {
 			let counts: Record<string, unknown> | undefined;
 			if (r.toolCountsJson) {
 				try {
@@ -46,7 +55,11 @@ export function registerSessionsRoutes(app: Hono) {
 			const { toolCountsJson: _toolCountsJson, ...rest } = r;
 			return counts ? { ...rest, toolCounts: counts } : rest;
 		});
-		return c.json(normalized);
+		return c.json({
+			items: normalized,
+			hasMore,
+			nextOffset: hasMore ? offset + limit : null,
+		});
 	});
 
 	// Create session

package/src/runtime/agent/runner-setup.ts

@@ -1,4 +1,6 @@
 import { loadConfig, getUnderlyingProviderKey } from '@ottocode/sdk';
+import { wrapLanguageModel } from 'ai';
+import { devToolsMiddleware } from '@ai-sdk/devtools';
 import { getDb } from '@ottocode/database';
 import { sessions } from '@ottocode/database/schema';
 import { eq } from 'drizzle-orm';
@@ -8,7 +10,7 @@ import { composeSystemPrompt } from '../prompt/builder.ts';
 import { discoverProjectTools } from '@ottocode/sdk';
 import { adaptTools } from '../../tools/adapter.ts';
 import { buildDatabaseTools } from '../../tools/database/index.ts';
-import { debugLog, time } from '../debug/index.ts';
+import { debugLog, time, isDebugEnabled } from '../debug/index.ts';
 import { buildHistoryMessages } from '../message/history-builder.ts';
 import { getMaxOutputTokens } from '../utils/token.ts';
 import { setupToolContext } from '../tools/setup.ts';
@@ -25,7 +27,9 @@ export interface SetupResult {
 	system: string;
 	systemComponents: string[];
 	additionalSystemMessages: Array<{ role: 'system' | 'user'; content: string }>;
-	model: Awaited<ReturnType<typeof resolveModel>>;
+	model:
+		| Awaited<ReturnType<typeof resolveModel>>
+		| ReturnType<typeof wrapLanguageModel>;
 	maxOutputTokens: number | undefined;
 	effectiveMaxOutputTokens: number | undefined;
 	toolset: ReturnType<typeof adaptTools>;
@@ -34,6 +38,7 @@ export interface SetupResult {
 	firstToolSeen: () => boolean;
 	providerOptions: Record<string, unknown>;
 	needsSpoof: boolean;
+	isOpenAIOAuth: boolean;
 }
 
 const THINKING_BUDGET = 16000;
@@ -163,6 +168,13 @@ export async function setupRunner(opts: RunOpts): Promise<SetupResult> {
 		sessionId: opts.sessionId,
 		messageId: opts.assistantMessageId,
 	});
+	const wrappedModel = isDebugEnabled()
+		? // biome-ignore lint/suspicious/noExplicitAny: OpenRouter provider uses v2 spec
+			wrapLanguageModel({
+				model: model as any,
+				middleware: devToolsMiddleware(),
+			})
+		: model;
 	debugLog(
 		`[RUNNER] Model created: ${JSON.stringify({ id: model.modelId, provider: model.provider })}`,
 	);
@@ -223,7 +235,7 @@ export async function setupRunner(opts: RunOpts): Promise<SetupResult> {
 		system,
 		systemComponents,
 		additionalSystemMessages,
-		model,
+		model: wrappedModel,
 		maxOutputTokens,
 		effectiveMaxOutputTokens,
 		toolset,
@@ -232,6 +244,7 @@ export async function setupRunner(opts: RunOpts): Promise<SetupResult> {
 		firstToolSeen,
 		providerOptions,
 		needsSpoof: oauth.needsSpoof,
+		isOpenAIOAuth: oauth.isOpenAIOAuth,
 	};
 }
 

package/src/runtime/agent/runner.ts

@@ -51,7 +51,9 @@ export async function runSessionLoop(sessionId: string) {
 		try {
 			await runAssistant(job);
 		} catch (_err) {
-			// Swallow to keep the loop alive; event published by runner
+			debugLog(
+				`[RUNNER] runAssistant threw (swallowed to keep loop alive): ${_err instanceof Error ? _err.message : String(_err)}`,
+			);
 		}
 	}
 
@@ -80,6 +82,7 @@ async function runAssistant(opts: RunOpts) {
 		firstToolTimer,
 		firstToolSeen,
 		providerOptions,
+		isOpenAIOAuth,
 	} = setup;
 
 	const isFirstMessage = !history.some((m) => m.role === 'assistant');
@@ -91,7 +94,7 @@ async function runAssistant(opts: RunOpts) {
 
 	if (!isFirstMessage) {
 		messagesWithSystemInstructions.push({
-			role: 'user',
+			role: isOpenAIOAuth ? 'system' : 'user',
 			content:
 				'SYSTEM REMINDER: You are continuing an existing session. When you have completed the task, you MUST stream a text summary of what you did to the user, and THEN call the `finish` tool. Do not call `finish` without a summary.',
 		});
@@ -107,7 +110,11 @@ async function runAssistant(opts: RunOpts) {
 		try {
 			const name = (evt.payload as { name?: string } | undefined)?.name;
 			if (name === 'finish') _finishObserved = true;
-		} catch {}
+		} catch (err) {
+			debugLog(
+				`[RUNNER] finish observer error: ${err instanceof Error ? err.message : String(err)}`,
+			);
+		}
 	});
 
 	const streamStartTimer = time('runner:first-delta');
@@ -289,6 +296,12 @@ async function runAssistant(opts: RunOpts) {
 		debugLog(
 			`[RUNNER] Stream finished. finishSeen=${_finishObserved}, firstToolSeen=${fs}`,
 		);
+
+		if (!_finishObserved && fs) {
+			debugLog(
+				`[RUNNER] WARNING: Stream ended without finish tool being called. Model was mid-execution (tools were used). This is likely an unclean stream termination from the provider.`,
+			);
+		}
 	} catch (err) {
 		unsubscribeFinish();
 		const payload = toErrorPayload(err);
@@ -334,7 +347,11 @@ async function runAssistant(opts: RunOpts) {
 
 				try {
 					await completeAssistantMessage({}, opts, db);
-				} catch {}
+				} catch (err2) {
+					debugLog(
+						`[RUNNER] completeAssistantMessage failed after prune: ${err2 instanceof Error ? err2.message : String(err2)}`,
+					);
+				}
 				return;
 			} catch (pruneErr) {
 				debugLog(
@@ -364,7 +381,11 @@ async function runAssistant(opts: RunOpts) {
 				db,
 			);
 			await completeAssistantMessage({}, opts, db);
-		} catch {}
+		} catch (err2) {
+			debugLog(
+				`[RUNNER] Failed to complete message after error: ${err2 instanceof Error ? err2.message : String(err2)}`,
+			);
+		}
 		throw err;
 	} finally {
 		debugLog(

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

@@ -77,6 +77,9 @@ function describeToolResult(info: ToolResultInfo): TargetDescriptor | null {
 			return describeWrite(info);
 		case 'apply_patch':
 			return describePatch(info);
+		case 'edit':
+		case 'multiedit':
+			return describeEdit(info);
 		default:
 			return null;
 	}
@@ -202,3 +205,14 @@ function getNumber(value: unknown): number | undefined {
 function normalizePath(path: string): string {
 	return path.replace(/\\/g, '/');
 }
+
+function describeEdit(info: ToolResultInfo): TargetDescriptor | null {
+	const args = getRecord(info.args);
+	if (!args) return null;
+	const filePath = getString(args.filePath);
+	if (!filePath) return null;
+	const normalized = normalizePath(filePath);
+	const key = `edit:${normalized}`;
+	const summary = `[previous edit] ${normalized}`;
+	return { keys: [key], summary };
+}

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

@@ -86,9 +86,16 @@ export function detectOAuth(
  * Used directly by runner-setup.ts (complex flow) and indirectly
  * by adaptSimpleCall (simple flows).
  */
-export function buildCodexProviderOptions(instructions: string) {
+const CODEX_INSTRUCTIONS =
+	'You are a coding agent. Follow all developer messages. Use tools to complete tasks.';
+
+export function buildCodexProviderOptions() {
 	return {
-		openai: { store: false as const, instructions },
+		openai: {
+			store: false as const,
+			instructions: CODEX_INSTRUCTIONS,
+			parallelToolCalls: false,
+		},
 	};
 }
 
@@ -132,13 +139,14 @@ export function adaptSimpleCall(
 ): AdaptedLLMCall {
 	if (ctx.isOpenAIOAuth) {
 		return {
+			system: input.instructions,
 			messages: [
 				{
 					role: 'user',
-					content: `${input.instructions}\n\n${input.userContent}`,
+					content: input.userContent,
 				},
 			],
-			providerOptions: buildCodexProviderOptions(input.instructions),
+			providerOptions: buildCodexProviderOptions(),
 			forceStream: true,
 		};
 	}
@@ -184,7 +192,8 @@ export type AdaptedRunnerSetup = {
  * decides WHERE the already-composed system prompt goes:
  *
  * - **OpenAI OAuth (Codex)**: system='', composed prompt sent as a user
- *   message in additionalSystemMessages, providerOptions with store=false
+ *   system message in additionalSystemMessages (becomes developer role in
+ *   Responses API), providerOptions with store=false
  *   + instructions, maxOutputTokens stripped.
  *
  * - **Anthropic OAuth**: spoof prompt as system, composed prompt sent as
@@ -221,9 +230,9 @@ export function adaptRunnerCall(
 		return {
 			system: '',
 			systemComponents: composed.components,
-			additionalSystemMessages: [{ role: 'user', content: composed.prompt }],
+			additionalSystemMessages: [{ role: 'system', content: composed.prompt }],
 			maxOutputTokens: undefined,
-			providerOptions: buildCodexProviderOptions(composed.prompt),
+			providerOptions: buildCodexProviderOptions(),
 		};
 	}
 

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

@@ -24,7 +24,11 @@ export function createFinishHandler(
 	return async (fin: FinishEvent) => {
 		try {
 			await completeAssistantMessageFn(fin, opts, db);
-		} catch {}
+		} catch (err) {
+			debugLog(
+				`[finish-handler] completeAssistantMessage failed: ${err instanceof Error ? err.message : String(err)}`,
+			);
+		}
 
 		if (opts.isCompactCommand && fin.finishReason !== 'error') {
 			const assistantParts = await db

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

@@ -6,6 +6,7 @@ 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,
@@ -41,7 +42,11 @@ export function createStepFinishHandler(
 					.set({ completedAt: finishedAt })
 					.where(eq(messageParts.id, currentPartId));
 			}
-		} catch {}
+		} catch (err) {
+			debugLog(
+				`[step-finish] Failed to update part completedAt: ${err instanceof Error ? err.message : String(err)}`,
+			);
+		}
 
 		if (step.usage) {
 			try {
@@ -51,7 +56,11 @@ export function createStepFinishHandler(
 					opts,
 					db,
 				);
-			} catch {}
+			} catch (err) {
+				debugLog(
+					`[step-finish] Failed to update session tokens: ${err instanceof Error ? err.message : String(err)}`,
+				);
+			}
 
 			try {
 				await updateMessageTokensIncrementalFn(
@@ -60,7 +69,11 @@ export function createStepFinishHandler(
 					opts,
 					db,
 				);
-			} catch {}
+			} catch (err) {
+				debugLog(
+					`[step-finish] Failed to update message tokens: ${err instanceof Error ? err.message : String(err)}`,
+				);
+			}
 		}
 
 		try {
@@ -81,13 +94,21 @@ export function createStepFinishHandler(
 					payload: { stepIndex, ...step.usage },
 				});
 			}
-		} catch {}
+		} catch (err) {
+			debugLog(
+				`[step-finish] Failed to publish finish-step: ${err instanceof Error ? err.message : String(err)}`,
+			);
+		}
 
 		try {
 			const newStepIndex = incrementStepIndex();
 			sharedCtx.stepIndex = newStepIndex;
 			updateCurrentPartId(null);
 			updateAccumulated('');
-		} catch {}
+		} catch (err) {
+			debugLog(
+				`[step-finish] Failed to increment step: ${err instanceof Error ? err.message : String(err)}`,
+			);
+		}
 	};
 }

package/src/runtime/tools/approval.ts

@@ -9,6 +9,7 @@ export const DANGEROUS_TOOLS = new Set([
 	'apply_patch',
 	'terminal',
 	'edit',
+	'multiedit',
 	'git_commit',
 	'git_push',
 ]);

package/src/runtime/tools/mapping.ts

@@ -39,6 +39,8 @@ export const CANONICAL_TO_PASCAL: Record<string, string> = {
 
 	// Patch/edit
 	apply_patch: 'ApplyPatch',
+	edit: 'Edit',
+	multiedit: 'MultiEdit',
 
 	// Task management
 	update_todos: 'UpdateTodos',
@@ -77,6 +79,8 @@ export const PASCAL_TO_CANONICAL: Record<string, string> = {
 
 	// Patch/edit
 	ApplyPatch: 'apply_patch',
+	Edit: 'edit',
+	MultiEdit: 'multiedit',
 
 	// Task management
 	UpdateTodos: 'update_todos',

package/src/tools/adapter.ts

@@ -52,6 +52,30 @@ function getPendingQueue(
 	return queue;
 }
 
+function unwrapDoubleWrappedArgs(
+	input: unknown,
+	expectedName: string,
+): typeof input {
+	if (
+		input &&
+		typeof input === 'object' &&
+		'name' in input &&
+		'args' in input &&
+		typeof (input as Record<string, unknown>).name === 'string' &&
+		typeof (input as Record<string, unknown>).args === 'object' &&
+		(input as Record<string, unknown>).args !== null
+	) {
+		const wrapped = input as { name: string; args: Record<string, unknown> };
+		if (
+			wrapped.name === expectedName ||
+			wrapped.name.replace(/[_-]/g, '') === expectedName.replace(/[_-]/g, '')
+		) {
+			return wrapped.args as typeof input;
+		}
+	}
+	return input;
+}
+
 export function adaptTools(
 	tools: DiscoveredTool[],
 	ctx: ToolAdapterContext,
@@ -318,6 +342,7 @@ export function adaptTools(
 				}
 			},
 			async execute(input: ToolExecuteInput, options: ToolExecuteOptions) {
+				input = unwrapDoubleWrappedArgs(input, name);
 				const queue = pendingCalls.get(name);
 				const meta = queue?.shift();
 				if (queue && queue.length === 0) pendingCalls.delete(name);