@ottocode/server 0.1.257 → 0.1.258

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ottocode/server",
-	"version": "0.1.257",
+	"version": "0.1.258",
 	"description": "HTTP API server for ottocode",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -61,8 +61,8 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
-		"@ottocode/database": "0.1.257",
-		"@ottocode/sdk": "0.1.257",
+		"@ottocode/database": "0.1.258",
+		"@ottocode/sdk": "0.1.258",
 		"ai-sdk-ollama": "^3.8.3",
 		"drizzle-orm": "^0.44.5",
 		"hono": "^4.9.9",

package/src/routes/config/utils.ts

@@ -6,14 +6,11 @@ import {
 	getProviderSettings,
 	type ProviderId,
 	isProviderAuthorized,
-	getGlobalAgentsDir,
 	getAuth,
 } from '@ottocode/sdk';
-import { readdir } from 'node:fs/promises';
-import { join } from 'node:path';
 import type { EmbeddedAppConfig } from '../../index.ts';
 import type { OttoConfig } from '@ottocode/sdk';
-import { loadAgentsConfig } from '../../runtime/agent/registry.ts';
+export { discoverAllAgents } from '../../runtime/agent/registry.ts';
 
 export type ProviderDetail = {
 	id: string;
@@ -138,47 +135,3 @@ export async function getAuthTypeForProvider(
 	const auth = await getAuth(provider, projectRoot);
 	return auth?.type as 'api' | 'oauth' | 'wallet' | undefined;
 }
-
-export async function discoverAllAgents(
-	projectRoot: string,
-): Promise<string[]> {
-	const builtInAgents = ['general', 'build', 'plan', 'init'];
-	const agentSet = new Set<string>(builtInAgents);
-
-	try {
-		const agentsJson = await loadAgentsConfig(projectRoot);
-		for (const agentName of Object.keys(agentsJson)) {
-			if (agentName.trim()) {
-				agentSet.add(agentName);
-			}
-		}
-	} catch {}
-
-	try {
-		const localAgentsPath = join(projectRoot, '.otto', 'agents');
-		const localFiles = await readdir(localAgentsPath).catch(() => []);
-		for (const file of localFiles) {
-			if (file.endsWith('.txt') || file.endsWith('.md')) {
-				const agentName = file.replace(/\.(txt|md)$/, '');
-				if (agentName.trim()) {
-					agentSet.add(agentName);
-				}
-			}
-		}
-	} catch {}
-
-	try {
-		const globalAgentsPath = getGlobalAgentsDir();
-		const globalFiles = await readdir(globalAgentsPath).catch(() => []);
-		for (const file of globalFiles) {
-			if (file.endsWith('.txt') || file.endsWith('.md')) {
-				const agentName = file.replace(/\.(txt|md)$/, '');
-				if (agentName.trim()) {
-					agentSet.add(agentName);
-				}
-			}
-		}
-	} catch {}
-
-	return Array.from(agentSet).sort();
-}

package/src/runtime/agent/registry.ts

@@ -1,6 +1,8 @@
 import { getGlobalAgentsJsonPath, getGlobalAgentsDir } from '@ottocode/sdk';
 import type { ProviderName } from '@ottocode/sdk';
 import { catalog } from '@ottocode/sdk';
+import { readdir } from 'node:fs/promises';
+import { join } from 'node:path';
 // Embed default agent prompts; only user overrides read from disk.
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import AGENT_BUILD from '@ottocode/sdk/prompts/agents/build.txt' with {
@@ -40,6 +42,8 @@ export type AgentConfigEntry = {
 
 type AgentsJson = Record<string, AgentConfigEntry>;
 
+const BUILTIN_AGENT_NAMES = ['build', 'plan', 'general', 'init', 'research'];
+
 function normalizeStringList(value: unknown): string[] {
 	if (!Array.isArray(value)) return [];
 	const seen = new Set<string>();
@@ -221,6 +225,49 @@ export async function loadAgentsConfig(
 	return merged;
 }
 
+export async function discoverAllAgents(
+	projectRoot: string,
+): Promise<string[]> {
+	const agentSet = new Set<string>(BUILTIN_AGENT_NAMES);
+
+	try {
+		const agentsJson = await loadAgentsConfig(projectRoot);
+		for (const agentName of Object.keys(agentsJson)) {
+			if (agentName.trim()) {
+				agentSet.add(agentName);
+			}
+		}
+	} catch {}
+
+	try {
+		const localAgentsPath = join(projectRoot, '.otto', 'agents');
+		const localFiles = await readdir(localAgentsPath).catch(() => []);
+		for (const file of localFiles) {
+			if (file.endsWith('.txt') || file.endsWith('.md')) {
+				const agentName = file.replace(/\.(txt|md)$/, '');
+				if (agentName.trim()) {
+					agentSet.add(agentName);
+				}
+			}
+		}
+	} catch {}
+
+	try {
+		const globalAgentsPath = getGlobalAgentsDir();
+		const globalFiles = await readdir(globalAgentsPath).catch(() => []);
+		for (const file of globalFiles) {
+			if (file.endsWith('.txt') || file.endsWith('.md')) {
+				const agentName = file.replace(/\.(txt|md)$/, '');
+				if (agentName.trim()) {
+					agentSet.add(agentName);
+				}
+			}
+		}
+	} catch {}
+
+	return Array.from(agentSet).sort();
+}
+
 export async function resolveAgentConfig(
 	projectRoot: string,
 	name: string,

package/src/runtime/agent-registry.ts

@@ -1,5 +1,6 @@
 // Barrel export for backwards compatibility with @ottocode/server/runtime/agent-registry
 export {
+	discoverAllAgents,
 	resolveAgentConfig,
 	defaultToolsForAgent,
 	type AgentConfigEntry,

package/src/runtime/ask/service.ts

@@ -73,6 +73,7 @@ export type AskServerRequest = {
 	credentials?: InjectableCredentials;
 	agentPrompt?: string;
 	tools?: string[];
+	images?: Array<{ data: string; mediaType: string }>;
 };
 
 export type AskServerResponse = {
@@ -305,7 +306,9 @@ async function processAskRequest(
 		} as SessionRow;
 	}
 
-	validateProviderModel(providerForMessage, modelForMessage, cfg);
+	validateProviderModel(providerForMessage, modelForMessage, cfg, {
+		wantsVision: Boolean(request.images?.length),
+	});
 
 	if (!request.skipFileConfig && !request.config && !request.credentials) {
 		await ensureProviderEnv(cfg, providerForMessage);
@@ -327,6 +330,7 @@ async function processAskRequest(
 		oneShot: !request.sessionId && !request.last,
 		reasoningText,
 		reasoningLevel,
+		images: request.images,
 	});
 
 	const headerAgent = session.agent ?? agentName;