@ottocode/server 0.1.235 → 0.1.237

package/package.json

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

package/src/openapi/paths/config.ts

@@ -234,6 +234,100 @@ export const configPaths = {
 			},
 		},
 	},
+	'/v1/config/debug': {
+		get: {
+			tags: ['config'],
+			operationId: 'getDebugConfig',
+			summary: 'Get debug configuration',
+			responses: {
+				200: {
+					description: 'OK',
+					content: {
+						'application/json': {
+							schema: {
+								type: 'object',
+								properties: {
+									enabled: { type: 'boolean' },
+									scopes: {
+										type: 'array',
+										items: { type: 'string' },
+									},
+									logPath: { type: 'string' },
+									sessionsDir: { type: 'string' },
+									debugDir: { type: 'string' },
+								},
+								required: [
+									'enabled',
+									'scopes',
+									'logPath',
+									'sessionsDir',
+									'debugDir',
+								],
+							},
+						},
+					},
+				},
+			},
+		},
+		patch: {
+			tags: ['config'],
+			operationId: 'updateDebugConfig',
+			summary: 'Update debug configuration',
+			requestBody: {
+				required: true,
+				content: {
+					'application/json': {
+						schema: {
+							type: 'object',
+							properties: {
+								enabled: { type: 'boolean' },
+								scopes: {
+									type: 'array',
+									items: { type: 'string' },
+								},
+							},
+						},
+					},
+				},
+			},
+			responses: {
+				200: {
+					description: 'OK',
+					content: {
+						'application/json': {
+							schema: {
+								type: 'object',
+								properties: {
+									success: { type: 'boolean' },
+									debug: {
+										type: 'object',
+										properties: {
+											enabled: { type: 'boolean' },
+											scopes: {
+												type: 'array',
+												items: { type: 'string' },
+											},
+											logPath: { type: 'string' },
+											sessionsDir: { type: 'string' },
+											debugDir: { type: 'string' },
+										},
+										required: [
+											'enabled',
+											'scopes',
+											'logPath',
+											'sessionsDir',
+											'debugDir',
+										],
+									},
+								},
+								required: ['success', 'debug'],
+							},
+						},
+					},
+				},
+			},
+		},
+	},
 	'/v1/config/models': {
 		get: {
 			tags: ['config'],

package/src/presets.ts

@@ -54,6 +54,8 @@ export const BUILTIN_AGENTS = {
  */
 export const BUILTIN_TOOLS = [
 	'read',
+	'edit',
+	'multiedit',
 	'write',
 	'ls',
 	'tree',

package/src/routes/config/debug.ts

@@ -0,0 +1,39 @@
+import type { Hono } from 'hono';
+import { logger, readDebugConfig, writeDebugConfig } from '@ottocode/sdk';
+import { serializeError } from '../../runtime/errors/api-error.ts';
+
+export function registerDebugConfigRoute(app: Hono) {
+	app.get('/v1/config/debug', async (c) => {
+		try {
+			const debug = await readDebugConfig();
+			return c.json(debug);
+		} catch (error) {
+			logger.error('Failed to load debug config', error);
+			const errorResponse = serializeError(error);
+			return c.json(errorResponse, errorResponse.error.status || 500);
+		}
+	});
+
+	app.patch('/v1/config/debug', async (c) => {
+		try {
+			const body = await c.req.json<{
+				enabled?: boolean;
+				scopes?: string[];
+			}>();
+
+			await writeDebugConfig({
+				enabled: body.enabled,
+				scopes: Array.isArray(body.scopes)
+					? body.scopes.map((scope) => scope.trim()).filter(Boolean)
+					: body.scopes,
+			});
+
+			const debug = await readDebugConfig();
+			return c.json({ success: true, debug });
+		} catch (error) {
+			logger.error('Failed to update debug config', error);
+			const errorResponse = serializeError(error);
+			return c.json(errorResponse, errorResponse.error.status || 500);
+		}
+	});
+}

package/src/routes/config/index.ts

@@ -5,6 +5,7 @@ import { registerAgentsRoute } from './agents.ts';
 import { registerProvidersRoute } from './providers.ts';
 import { registerModelsRoutes } from './models.ts';
 import { registerDefaultsRoute } from './defaults.ts';
+import { registerDebugConfigRoute } from './debug.ts';
 
 export function registerConfigRoutes(app: Hono) {
 	registerCwdRoute(app);
@@ -13,4 +14,5 @@ export function registerConfigRoutes(app: Hono) {
 	registerProvidersRoute(app);
 	registerModelsRoutes(app);
 	registerDefaultsRoute(app);
+	registerDebugConfigRoute(app);
 }

package/src/routes/config/utils.ts

@@ -9,7 +9,6 @@ import { readdir } from 'node:fs/promises';
 import { join } from 'node:path';
 import type { EmbeddedAppConfig } from '../../index.ts';
 import type { OttoConfig } from '@ottocode/sdk';
-import { logger } from '@ottocode/sdk';
 import { loadAgentsConfig } from '../../runtime/agent/registry.ts';
 
 export async function isProviderAuthorizedHybrid(

package/src/routes/session-files.ts

@@ -6,7 +6,16 @@ import { eq, and, inArray } from 'drizzle-orm';
 import { serializeError } from '../runtime/errors/api-error.ts';
 import { logger } from '@ottocode/sdk';
 
-const FILE_EDIT_TOOLS = ['Write', 'ApplyPatch', 'write', 'apply_patch'];
+const FILE_EDIT_TOOLS = [
+	'Write',
+	'Edit',
+	'MultiEdit',
+	'ApplyPatch',
+	'write',
+	'edit',
+	'multiedit',
+	'apply_patch',
+];
 
 interface FileOperation {
 	path: string;
@@ -62,7 +71,7 @@ function extractFilePathFromToolCall(
 
 	const name = toolName.toLowerCase();
 
-	if (name === 'write') {
+	if (name === 'write' || name === 'edit' || name === 'multiedit') {
 		if (args && typeof args.path === 'string') return args.path;
 		if (typeof c.path === 'string') return c.path;
 	}
@@ -189,6 +198,13 @@ function extractDataFromToolResult(
 		patch = (args?.patch as string | undefined) ?? c.patch;
 	}
 
+	if (
+		(name === 'edit' || name === 'multiedit') &&
+		typeof c.result?.artifact?.patch === 'string'
+	) {
+		patch = c.result.artifact.patch;
+	}
+
 	if (name === 'write') {
 		writeContent = args?.content as string | undefined;
 	}
@@ -213,6 +229,7 @@ function extractDataFromToolResult(
 function getOperationType(toolName: string): 'write' | 'patch' | 'create' {
 	const name = toolName.toLowerCase();
 	if (name === 'write') return 'write';
+	if (name === 'edit' || name === 'multiedit') return 'patch';
 	if (name === 'applypatch' || name === 'apply_patch') return 'patch';
 	return 'write';
 }

package/src/runtime/agent/registry.ts

@@ -116,6 +116,8 @@ const baseToolSet = ['progress_update', 'finish', 'skill'] as const;
 const defaultToolExtras: Record<string, string[]> = {
 	build: [
 		'read',
+		'edit',
+		'multiedit',
 		'write',
 		'ls',
 		'tree',
@@ -131,6 +133,8 @@ const defaultToolExtras: Record<string, string[]> = {
 	plan: ['read', 'ls', 'tree', 'ripgrep', 'update_todos', 'websearch'],
 	general: [
 		'read',
+		'edit',
+		'multiedit',
 		'write',
 		'ls',
 		'tree',

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

@@ -1,9 +1,11 @@
-import { loadConfig } from '@ottocode/sdk';
+import { loadConfig, logger, getSessionSystemPromptPath } 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';
+import { mkdir } from 'node:fs/promises';
+import { dirname } from 'node:path';
 import { resolveModel } from '../provider/index.ts';
 import { resolveAgentConfig } from './registry.ts';
 import { composeSystemPrompt } from '../prompt/builder.ts';
@@ -133,7 +135,76 @@ export async function setupRunner(opts: RunOpts): Promise<SetupResult> {
 
 	const { system } = adapted;
 	const { systemComponents, additionalSystemMessages } = adapted;
+	const openAIProviderOptions = adapted.providerOptions.openai as
+		| Record<string, unknown>
+		| undefined;
+	const openAIInstructions =
+		typeof openAIProviderOptions?.instructions === 'string'
+			? openAIProviderOptions.instructions
+			: '';
+	const effectiveSystemPrompt = system || openAIInstructions || composed.prompt;
+	const promptMode = oauth.isOpenAIOAuth
+		? 'openai-oauth'
+		: oauth.needsSpoof
+			? 'spoof'
+			: 'standard';
 	systemTimer.end();
+	logger.debug('[prompt] system prompt assembled', {
+		sessionId: opts.sessionId,
+		messageId: opts.assistantMessageId,
+		agent: opts.agent,
+		provider: opts.provider,
+		model: opts.model,
+		promptMode,
+		components: systemComponents,
+		systemLength: effectiveSystemPrompt.length,
+		historyMessages: history.length,
+		additionalSystemMessages: additionalSystemMessages.length,
+		isFirstMessage,
+		isOpenAIOAuth: oauth.isOpenAIOAuth,
+		needsSpoof: oauth.needsSpoof,
+	});
+	logger.debug('[prompt] detailed prompt context', {
+		sessionId: opts.sessionId,
+		messageId: opts.assistantMessageId,
+		debugDetail: true,
+		agentPromptLength: agentPrompt.length,
+		contextSummaryLength: contextSummary?.length ?? 0,
+		userContextLength: opts.userContext?.length ?? 0,
+		oneShot: Boolean(opts.oneShot),
+		guidedMode: Boolean(cfg.defaults.guidedMode),
+		isOpenAIOAuth: oauth.isOpenAIOAuth,
+		needsSpoof: oauth.needsSpoof,
+		promptMode,
+		rawSystemLength: system.length,
+		openAIInstructionsLength: openAIInstructions.length,
+		effectiveSystemPromptLength: effectiveSystemPrompt.length,
+		systemComponents,
+		additionalSystemMessageRoles: additionalSystemMessages.map(
+			(message) => message.role,
+		),
+	});
+	if (effectiveSystemPrompt) {
+		const systemPromptPath = getSessionSystemPromptPath(opts.sessionId);
+		try {
+			await mkdir(dirname(systemPromptPath), { recursive: true });
+			await Bun.write(systemPromptPath, effectiveSystemPrompt);
+			logger.debug('[prompt] wrote system prompt file', {
+				sessionId: opts.sessionId,
+				messageId: opts.assistantMessageId,
+				path: systemPromptPath,
+				debugDetail: true,
+				promptMode,
+				effectiveSystemPromptLength: effectiveSystemPrompt.length,
+			});
+		} catch (error) {
+			logger.warn('[prompt] failed to write system prompt file', {
+				sessionId: opts.sessionId,
+				messageId: opts.assistantMessageId,
+				error: error instanceof Error ? error.message : String(error),
+			});
+		}
+	}
 
 	if (opts.isCompactCommand && opts.compactionContext) {
 		const compactPrompt = getCompactionSystemPrompt();

package/src/runtime/agent/runner.ts

@@ -51,7 +51,12 @@ export {
 	getRunnerState,
 } from '../session/queue.ts';
 
-const DEFAULT_TRACED_TOOL_INPUTS = new Set(['write', 'apply_patch']);
+const DEFAULT_TRACED_TOOL_INPUTS = new Set([
+	'write',
+	'edit',
+	'multiedit',
+	'apply_patch',
+]);
 
 function shouldTraceToolInput(name: string): boolean {
 	void DEFAULT_TRACED_TOOL_INPUTS;

package/src/runtime/message/service.ts

@@ -9,6 +9,7 @@ import { runSessionLoop } from '../agent/runner.ts';
 import { resolveModel } from '../provider/index.ts';
 import {
 	getFastModelForAuth,
+	logger,
 	type ProviderId,
 	type ReasoningLevel,
 } from '@ottocode/sdk';
@@ -61,6 +62,14 @@ export async function dispatchAssistantMessage(
 	const sessionId = session.id;
 	const now = Date.now();
 	const userMessageId = crypto.randomUUID();
+	logger.debug('[agent] dispatching assistant message', {
+		sessionId,
+		agent,
+		provider,
+		model,
+		oneShot: Boolean(oneShot),
+		hasUserContext: Boolean(userContext),
+	});
 
 	await db.insert(messages).values({
 		id: userMessageId,
@@ -194,6 +203,14 @@ export async function dispatchAssistantMessage(
 		},
 		runSessionLoop,
 	);
+	logger.debug('[agent] assistant run enqueued', {
+		sessionId,
+		assistantMessageId,
+		agent,
+		provider,
+		model,
+		isCompactCommand: isCompact,
+	});
 
 	void touchSessionLastActive({ db, sessionId });
 

package/src/runtime/tools/approval.ts

@@ -4,6 +4,8 @@ export type ToolApprovalMode = 'auto' | 'dangerous' | 'all';
 
 export const DANGEROUS_TOOLS = new Set([
 	'bash',
+	'edit',
+	'multiedit',
 	'write',
 	'apply_patch',
 	'terminal',

package/src/runtime/tools/mapping.ts

@@ -17,6 +17,8 @@ export type ToolNamingConvention = 'canonical' | 'claude-code';
 export const CANONICAL_TO_PASCAL: Record<string, string> = {
 	// File system operations
 	read: 'Read',
+	edit: 'Edit',
+	multiedit: 'MultiEdit',
 	write: 'Write',
 	ls: 'Ls',
 	tree: 'Tree',
@@ -55,6 +57,8 @@ export const CANONICAL_TO_PASCAL: Record<string, string> = {
 export const PASCAL_TO_CANONICAL: Record<string, string> = {
 	// File system operations
 	Read: 'read',
+	Edit: 'edit',
+	MultiEdit: 'multiedit',
 	Write: 'write',
 	Ls: 'ls',
 	Tree: 'tree',

package/src/tools/adapter.ts

@@ -2,7 +2,7 @@ import type { Tool } from 'ai';
 import { messageParts, sessions } from '@ottocode/database/schema';
 import { eq } from 'drizzle-orm';
 import { publish } from '../events/bus.ts';
-import type { DiscoveredTool } from '@ottocode/sdk';
+import { logger, type DiscoveredTool } from '@ottocode/sdk';
 import { getCwd, setCwd, joinRelative } from '../runtime/utils/cwd.ts';
 import type {
 	ToolAdapterContext,
@@ -59,7 +59,12 @@ function extractToolCallId(options: unknown): string | undefined {
 	return (options as { toolCallId?: string } | undefined)?.toolCallId;
 }
 
-const DEFAULT_TRACED_TOOL_INPUTS = new Set(['write', 'apply_patch']);
+const DEFAULT_TRACED_TOOL_INPUTS = new Set([
+	'write',
+	'edit',
+	'multiedit',
+	'apply_patch',
+]);
 
 function shouldTraceToolInput(name: string): boolean {
 	void DEFAULT_TRACED_TOOL_INPUTS;
@@ -312,6 +317,13 @@ export function adaptTools(
 							messageId: ctx.messageId,
 						},
 					});
+					logger.debug(`[tools] call ${name}`, {
+						sessionId: ctx.sessionId,
+						messageId: ctx.messageId,
+						toolName: name,
+						callId,
+						stepIndex: ctx.stepIndex,
+					});
 					// Persist synchronously to maintain correct ordering
 					try {
 						const index = await ctx.nextIndex();
@@ -689,6 +701,13 @@ export function adaptTools(
 							sessionId: ctx.sessionId,
 							payload: { ...contentObj, stepIndex: stepIndexForEvent },
 						});
+						logger.debug(`[tools] result ${name}`, {
+							sessionId: ctx.sessionId,
+							messageId: ctx.messageId,
+							toolName: name,
+							callId,
+							stepIndex: stepIndexForEvent,
+						});
 						if (name === 'update_todos') {
 							try {
 								const resultValue = (contentObj as { result?: unknown })