@ottocode/server 0.1.210 → 0.1.211

package/package.json

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

package/src/events/types.ts

@@ -13,6 +13,7 @@ export type OttoEventType =
 	| 'session.created'
 	| 'session.updated'
 	| 'message.created'
+	| 'message.updated'
 	| 'message.part.delta'
 	| 'reasoning.delta'
 	| 'message.completed'

package/src/routes/files.ts

@@ -48,11 +48,15 @@ function shouldExcludeDir(name: string): boolean {
 async function listFilesWithRg(
 	projectRoot: string,
 	limit: number,
+	includeIgnored = false,
 ): Promise<{ files: string[]; truncated: boolean }> {
 	const rgBin = await resolveBinary('rg');
 
 	return new Promise((resolve) => {
 		const args = ['--files', '--hidden', '--glob', '!.git/', '--sort', 'path'];
+		if (includeIgnored) {
+			args.push('--no-ignore');
+		}
 
 		const proc = spawn(rgBin, args, { cwd: projectRoot });
 		let stdout = '';
@@ -232,6 +236,34 @@ async function getChangedFiles(
 	}
 }
 
+async function getGitIgnoredFiles(
+	projectRoot: string,
+	files: string[],
+): Promise<Set<string>> {
+	if (files.length === 0) return new Set();
+	try {
+		return new Promise((resolve) => {
+			const proc = spawn('git', ['check-ignore', '--stdin'], {
+				cwd: projectRoot,
+			});
+			let stdout = '';
+			proc.stdout.on('data', (data) => {
+				stdout += data.toString();
+			});
+			proc.on('close', () => {
+				resolve(new Set(stdout.split('\n').filter(Boolean)));
+			});
+			proc.on('error', () => {
+				resolve(new Set());
+			});
+			proc.stdin.write(files.join('\n'));
+			proc.stdin.end();
+		});
+	} catch (_err) {
+		return new Set();
+	}
+}
+
 export function registerFilesRoutes(app: Hono) {
 	app.get('/v1/files', async (c) => {
 		try {
@@ -239,7 +271,7 @@ export function registerFilesRoutes(app: Hono) {
 			const maxDepth = Number.parseInt(c.req.query('maxDepth') || '10', 10);
 			const limit = Number.parseInt(c.req.query('limit') || '1000', 10);
 
-			let result = await listFilesWithRg(projectRoot, limit);
+			let result = await listFilesWithRg(projectRoot, limit, true);
 
 			if (result.files.length === 0) {
 				const gitignorePatterns = await parseGitignore(projectRoot);
@@ -254,9 +286,15 @@ export function registerFilesRoutes(app: Hono) {
 				);
 			}
 
-			const changedFiles = await getChangedFiles(projectRoot);
+			const [changedFiles, ignoredFiles] = await Promise.all([
+				getChangedFiles(projectRoot),
+				getGitIgnoredFiles(projectRoot, result.files),
+			]);
 
 			result.files.sort((a, b) => {
+				const aIgnored = ignoredFiles.has(a);
+				const bIgnored = ignoredFiles.has(b);
+				if (aIgnored !== bIgnored) return aIgnored ? 1 : -1;
 				const aChanged = changedFiles.has(a);
 				const bChanged = changedFiles.has(b);
 				if (aChanged && !bChanged) return -1;
@@ -266,6 +304,7 @@ export function registerFilesRoutes(app: Hono) {
 
 			return c.json({
 				files: result.files,
+				ignoredFiles: Array.from(ignoredFiles),
 				changedFiles: Array.from(changedFiles.entries()).map(
 					([path, status]) => ({
 						path,
@@ -293,6 +332,7 @@ export function registerFilesRoutes(app: Hono) {
 				name: string;
 				path: string;
 				type: 'file' | 'directory';
+				gitignored?: boolean;
 			}> = [];
 
 			for (const entry of entries) {
@@ -301,17 +341,30 @@ export function registerFilesRoutes(app: Hono) {
 
 				if (entry.isDirectory()) {
 					if (shouldExcludeDir(entry.name)) continue;
-					if (matchesGitignorePattern(relPath, gitignorePatterns)) continue;
-					items.push({ name: entry.name, path: relPath, type: 'directory' });
+					const ignored = matchesGitignorePattern(relPath, gitignorePatterns);
+					items.push({
+						name: entry.name,
+						path: relPath,
+						type: 'directory',
+						gitignored: ignored || undefined,
+					});
 				} else if (entry.isFile()) {
 					if (shouldExcludeFile(entry.name)) continue;
-					if (matchesGitignorePattern(relPath, gitignorePatterns)) continue;
-					items.push({ name: entry.name, path: relPath, type: 'file' });
+					const ignored = matchesGitignorePattern(relPath, gitignorePatterns);
+					items.push({
+						name: entry.name,
+						path: relPath,
+						type: 'file',
+						gitignored: ignored || undefined,
+					});
 				}
 			}
 
 			items.sort((a, b) => {
 				if (a.type !== b.type) return a.type === 'directory' ? -1 : 1;
+				const aIgnored = a.gitignored ?? false;
+				const bIgnored = b.gitignored ?? false;
+				if (aIgnored !== bIgnored) return aIgnored ? 1 : -1;
 				return a.name.localeCompare(b.name);
 			});
 

package/src/routes/git/commit.ts

@@ -15,6 +15,7 @@ import {
 	detectOAuth,
 	adaptSimpleCall,
 } from '../../runtime/provider/oauth-adapter.ts';
+import { appendCoAuthorTrailer } from '@ottocode/sdk';
 
 const execFileAsync = promisify(execFile);
 
@@ -36,9 +37,14 @@ export function registerCommitRoutes(app: Hono) {
 
 			const { gitRoot } = validation;
 
-			const { stdout } = await execFileAsync('git', ['commit', '-m', message], {
-				cwd: gitRoot,
-			});
+			const fullMessage = appendCoAuthorTrailer(message);
+			const { stdout } = await execFileAsync(
+				'git',
+				['commit', '-m', fullMessage],
+				{
+					cwd: gitRoot,
+				},
+			);
 
 			return c.json({
 				status: 'ok',

package/src/routes/sessions.ts

@@ -383,7 +383,18 @@ export function registerSessionsRoutes(app: Hono) {
 				// Delete message parts first (foreign key constraint)
 				await db
 					.delete(messageParts)
-					.where(eq(messageParts.messageId, messageId));
+					.where(
+						and(
+							eq(messageParts.messageId, messageId),
+							or(
+								eq(messageParts.type, 'error'),
+								and(
+									eq(messageParts.type, 'tool_call'),
+									eq(messageParts.toolName, 'finish'),
+								),
+							),
+						),
+					);
 				// Delete message
 				await db.delete(messages).where(eq(messages.id, messageId));
 
@@ -758,7 +769,6 @@ export function registerSessionsRoutes(app: Hono) {
 				return c.json({ error: 'Session not found' }, 404);
 			}
 
-			// Delete only error parts - preserve valid text/tool content
 			await db
 				.delete(messageParts)
 				.where(

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

@@ -63,7 +63,11 @@ export async function setupRunner(opts: RunOpts): Promise<SetupResult> {
 		debugLog('[RUNNER] Using minimal history for /compact command');
 		history = [];
 	} else {
-		history = await buildHistoryMessages(db, opts.sessionId);
+		history = await buildHistoryMessages(
+			db,
+			opts.sessionId,
+			opts.assistantMessageId,
+		);
 	}
 	historyTimer.end({ messages: history.length });
 

package/src/runtime/agent/runner.ts

@@ -454,7 +454,13 @@ async function runAssistant(opts: RunOpts) {
 			publish({
 				type: 'message.created',
 				sessionId: opts.sessionId,
-				payload: { id: continuationMessageId, role: 'assistant' },
+				payload: {
+					id: continuationMessageId,
+					role: 'assistant',
+					agent: opts.agent,
+					provider: opts.provider,
+					model: opts.model,
+				},
 			});
 
 			enqueueAssistantRun(

package/src/runtime/message/history-builder.ts

@@ -12,6 +12,7 @@ import { ToolHistoryTracker } from './tool-history-tracker.ts';
 export async function buildHistoryMessages(
 	db: Awaited<ReturnType<typeof getDb>>,
 	sessionId: string,
+	currentMessageId?: string,
 ): Promise<ModelMessage[]> {
 	const rows = await db
 		.select()
@@ -26,10 +27,12 @@ export async function buildHistoryMessages(
 		if (
 			m.role === 'assistant' &&
 			m.status !== 'complete' &&
-			m.status !== 'completed'
+			m.status !== 'completed' &&
+			m.status !== 'error' &&
+			m.id !== currentMessageId
 		) {
 			debugLog(
-				`[buildHistoryMessages] Skipping assistant message ${m.id} with status ${m.status} (current turn still in progress)`,
+				`[buildHistoryMessages] Skipping assistant message ${m.id} with status ${m.status}`,
 			);
 			logPendingToolParts(db, m.id);
 			continue;

package/src/runtime/message/service.ts

@@ -124,7 +124,7 @@ export async function dispatchAssistantMessage(
 	publish({
 		type: 'message.created',
 		sessionId,
-		payload: { id: userMessageId, role: 'user' },
+		payload: { id: userMessageId, role: 'user', agent, provider, model },
 	});
 
 	const assistantMessageId = crypto.randomUUID();
@@ -141,7 +141,13 @@ export async function dispatchAssistantMessage(
 	publish({
 		type: 'message.created',
 		sessionId,
-		payload: { id: assistantMessageId, role: 'assistant' },
+		payload: {
+			id: assistantMessageId,
+			role: 'assistant',
+			agent,
+			provider,
+			model,
+		},
 	});
 
 	debugLog(

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

@@ -216,7 +216,13 @@ export function createErrorHandler(
 				publish({
 					type: 'message.created',
 					sessionId: opts.sessionId,
-					payload: { id: compactMessageId, role: 'assistant' },
+					payload: {
+						id: compactMessageId,
+						role: 'assistant',
+						agent: opts.agent,
+						provider: opts.provider,
+						model: opts.model,
+					},
 				});
 
 				let compactionSucceeded = false;
@@ -288,7 +294,13 @@ export function createErrorHandler(
 					publish({
 						type: 'message.created',
 						sessionId: opts.sessionId,
-						payload: { id: retryMessageId, role: 'assistant' },
+						payload: {
+							id: retryMessageId,
+							role: 'assistant',
+							agent: opts.agent,
+							provider: opts.provider,
+							model: opts.model,
+						},
 					});
 
 					enqueueAssistantRun(

package/src/runtime/tools/setup.ts

@@ -1,4 +1,6 @@
 import type { getDb } from '@ottocode/database';
+import { messageParts } from '@ottocode/database/schema';
+import { eq, desc } from 'drizzle-orm';
 import { time } from '../debug/index.ts';
 import type { ToolAdapterContext } from '../../tools/adapter.ts';
 import type { RunOpts } from '../session/queue.ts';
@@ -16,8 +18,13 @@ export async function setupToolContext(
 	const firstToolTimer = time('runner:first-tool-call');
 	let firstToolSeen = false;
 
-	// Simple counter starting at 0 - first event gets 0, second gets 1, etc.
-	let currentIndex = 0;
+	const existingParts = await db
+		.select({ index: messageParts.index })
+		.from(messageParts)
+		.where(eq(messageParts.messageId, opts.assistantMessageId))
+		.orderBy(desc(messageParts.index))
+		.limit(1);
+	let currentIndex = existingParts.length > 0 ? existingParts[0].index + 1 : 0;
 	const nextIndex = () => currentIndex++;
 
 	const sharedCtx: RunnerToolContext = {