@ottocode/server 0.1.237 → 0.1.243

package/src/runtime/message/service.ts

@@ -13,8 +13,9 @@ import {
 	type ProviderId,
 	type ReasoningLevel,
 } from '@ottocode/sdk';
-import { isCompactCommand, buildCompactionContext } from './compaction.ts';
+import { estimateTokens } from './compaction.ts';
 import { detectOAuth, adaptSimpleCall } from '../provider/oauth-adapter.ts';
+import { prepareBuiltinCommand } from '../commands/builtins.ts';
 
 type SessionRow = typeof sessions.$inferSelect;
 
@@ -61,14 +62,25 @@ export async function dispatchAssistantMessage(
 
 	const sessionId = session.id;
 	const now = Date.now();
+	const builtinCommand = await prepareBuiltinCommand({
+		cfg,
+		db,
+		sessionId,
+		provider,
+		model,
+		content,
+	});
+	const effectiveAgent = builtinCommand?.agent ?? agent;
+	const effectiveOneShot = builtinCommand?.oneShot ?? oneShot;
 	const userMessageId = crypto.randomUUID();
 	logger.debug('[agent] dispatching assistant message', {
 		sessionId,
-		agent,
+		agent: effectiveAgent,
 		provider,
 		model,
-		oneShot: Boolean(oneShot),
+		oneShot: Boolean(effectiveOneShot),
 		hasUserContext: Boolean(userContext),
+		builtinCommand: builtinCommand?.id,
 	});
 
 	await db.insert(messages).values({
@@ -76,7 +88,7 @@ export async function dispatchAssistantMessage(
 		sessionId,
 		role: 'user',
 		status: 'complete',
-		agent,
+		agent: effectiveAgent,
 		provider,
 		model,
 		createdAt: now,
@@ -87,7 +99,7 @@ export async function dispatchAssistantMessage(
 		index: 0,
 		type: 'text',
 		content: JSON.stringify({ text: String(content) }),
-		agent,
+		agent: effectiveAgent,
 		provider,
 		model,
 	});
@@ -101,7 +113,7 @@ export async function dispatchAssistantMessage(
 				index: i + 1,
 				type: 'image',
 				content: JSON.stringify({ data: img.data, mediaType: img.mediaType }),
-				agent,
+				agent: effectiveAgent,
 				provider,
 				model,
 			});
@@ -124,7 +136,7 @@ export async function dispatchAssistantMessage(
 					mediaType: file.mediaType,
 					textContent: file.textContent,
 				}),
-				agent,
+				agent: effectiveAgent,
 				provider,
 				model,
 			});
@@ -137,7 +149,7 @@ export async function dispatchAssistantMessage(
 		payload: {
 			id: userMessageId,
 			role: 'user',
-			agent,
+			agent: effectiveAgent,
 			provider,
 			model,
 			content: String(content),
@@ -150,7 +162,7 @@ export async function dispatchAssistantMessage(
 		sessionId,
 		role: 'assistant',
 		status: 'pending',
-		agent,
+		agent: effectiveAgent,
 		provider,
 		model,
 		createdAt: Date.now(),
@@ -161,27 +173,23 @@ export async function dispatchAssistantMessage(
 		payload: {
 			id: assistantMessageId,
 			role: 'assistant',
-			agent,
+			agent: effectiveAgent,
 			provider,
 			model,
 		},
 	});
 
-	const isCompact = isCompactCommand(content);
-	let compactionContext: string | undefined;
-
-	if (isCompact) {
-		const { getModelLimits } = await import('./compaction.ts');
-		const limits = getModelLimits(provider, model);
-		const contextTokenLimit = limits
-			? Math.max(Math.floor(limits.context * 0.5), 15000)
-			: 15000;
-		compactionContext = await buildCompactionContext(
-			db,
-			sessionId,
-			contextTokenLimit,
-		);
-	}
+	const commandPromptText =
+		builtinCommand?.additionalPromptMessages
+			?.map((message) => message.content)
+			.join('\n\n') ?? content;
+	const estimatedInputTokens =
+		estimateTokens(commandPromptText) +
+		estimateTokens(userContext ?? '') +
+		(files?.reduce(
+			(total, file) => total + estimateTokens(file.textContent ?? ''),
+			0,
+		) ?? 0);
 
 	const toolApprovalMode = cfg.defaults.toolApproval ?? 'dangerous';
 
@@ -189,16 +197,19 @@ export async function dispatchAssistantMessage(
 		{
 			sessionId,
 			assistantMessageId,
-			agent,
+			agent: effectiveAgent,
 			provider,
 			model,
 			projectRoot: cfg.projectRoot,
-			oneShot: Boolean(oneShot),
+			oneShot: Boolean(effectiveOneShot),
 			userContext,
+			estimatedInputTokens,
 			reasoningText,
 			reasoningLevel,
-			isCompactCommand: isCompact,
-			compactionContext,
+			omitHistory: builtinCommand?.omitHistory,
+			isCompactCommand: builtinCommand?.isCompactCommand,
+			compactionContext: builtinCommand?.compactionContext,
+			additionalPromptMessages: builtinCommand?.additionalPromptMessages,
 			toolApprovalMode,
 		},
 		runSessionLoop,
@@ -206,10 +217,11 @@ export async function dispatchAssistantMessage(
 	logger.debug('[agent] assistant run enqueued', {
 		sessionId,
 		assistantMessageId,
-		agent,
+		agent: effectiveAgent,
 		provider,
 		model,
-		isCompactCommand: isCompact,
+		builtinCommand: builtinCommand?.id,
+		isCompactCommand: builtinCommand?.isCompactCommand,
 	});
 
 	void touchSessionLastActive({ db, sessionId });

package/src/runtime/provider/reasoning.ts

@@ -134,6 +134,8 @@ function buildSharedProviderOptions(
 function usesAdaptiveAnthropicThinking(model: string): boolean {
 	const lower = model.toLowerCase();
 	return (
+		lower.includes('claude-opus-4-7') ||
+		lower.includes('claude-opus-4.7') ||
 		lower.includes('claude-opus-4-6') ||
 		lower.includes('claude-opus-4.6') ||
 		lower.includes('claude-sonnet-4-6') ||

package/src/runtime/session/queue.ts

@@ -12,11 +12,21 @@ export type RunOpts = {
 	projectRoot: string;
 	oneShot?: boolean;
 	userContext?: string;
+	estimatedInputTokens?: number;
 	reasoningText?: boolean;
 	reasoningLevel?: ReasoningLevel;
 	abortSignal?: AbortSignal;
+	/**
+	 * Omits prior session history from prompt assembly only. The run still emits
+	 * events, tool calls, and persisted message parts in the current session.
+	 */
+	omitHistory?: boolean;
 	isCompactCommand?: boolean;
 	compactionContext?: string;
+	additionalPromptMessages?: Array<{
+		role: 'system' | 'user';
+		content: string;
+	}>;
 	toolApprovalMode?: ToolApprovalMode;
 	compactionRetries?: number;
 	continuationCount?: number;

package/src/runtime/tools/approval.ts

@@ -1,6 +1,6 @@
 import { publish } from '../../events/bus.ts';
 
-export type ToolApprovalMode = 'auto' | 'dangerous' | 'all';
+export type ToolApprovalMode = 'auto' | 'dangerous' | 'all' | 'yolo';
 
 export const DANGEROUS_TOOLS = new Set([
 	'bash',
@@ -36,12 +36,16 @@ export function requiresApproval(
 	mode: ToolApprovalMode,
 ): boolean {
 	if (SAFE_TOOLS.has(toolName)) return false;
-	if (mode === 'auto') return false;
+	if (mode === 'auto' || mode === 'yolo') return false;
 	if (mode === 'all') return true;
 	if (mode === 'dangerous') return DANGEROUS_TOOLS.has(toolName);
 	return false;
 }
 
+export function skipsGuardApproval(mode?: ToolApprovalMode): boolean {
+	return mode === 'yolo';
+}
+
 export async function requestApproval(
 	sessionId: string,
 	messageId: string,

package/src/tools/adapter.ts

@@ -16,6 +16,7 @@ import {
 import {
 	requiresApproval,
 	requestApproval,
+	skipsGuardApproval,
 } from '../runtime/tools/approval.ts';
 import { guardToolCall } from '../runtime/tools/guards.ts';
 
@@ -398,7 +399,11 @@ export function adaptTools(
 				if (guard.type === 'block') {
 					meta.blocked = true;
 					meta.blockReason = guard.reason;
-				} else if (guard.type === 'approve' && !meta.approvalPromise) {
+				} else if (
+					guard.type === 'approve' &&
+					!meta.approvalPromise &&
+					!skipsGuardApproval(ctx.toolApprovalMode)
+				) {
 					meta.approvalPromise = requestApproval(
 						ctx.sessionId,
 						ctx.messageId,

package/src/ws.ts

@@ -0,0 +1,5 @@
+import { createBunWebSocket } from 'hono/bun';
+
+const { upgradeWebSocket, websocket } = createBunWebSocket();
+
+export { upgradeWebSocket, websocket };