@ottocode/server 0.1.252 → 0.1.254

package/package.json

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

package/src/openapi/paths/config.ts

@@ -139,10 +139,6 @@ export const configPaths = {
 									items: { type: 'string' },
 								},
 								allowAnyModel: { type: 'boolean' },
-								scope: {
-									type: 'string',
-									enum: ['global', 'local'],
-								},
 							},
 						},
 					},
@@ -176,15 +172,6 @@ export const configPaths = {
 			summary: 'Delete provider override or custom provider entry',
 			parameters: [
 				projectQueryParam(),
-				{
-					in: 'query',
-					name: 'scope',
-					required: false,
-					schema: {
-						type: 'string',
-						enum: ['global', 'local'],
-					},
-				},
 				{
 					in: 'path',
 					name: 'provider',

package/src/openapi/paths/skills.ts

@@ -60,7 +60,6 @@ export const skillsPaths = {
 							type: 'object',
 							properties: {
 								enabled: { type: 'boolean' },
-								scope: { type: 'string', enum: ['global', 'local'] },
 								items: {
 									type: 'object',
 									additionalProperties: {

package/src/presets.ts

@@ -64,6 +64,7 @@ export const BUILTIN_TOOLS = [
 	'edit',
 	'multiedit',
 	'write',
+	'copy_into',
 	'ls',
 	'tree',
 	'pwd',

package/src/routes/config/models.ts

@@ -1,10 +1,9 @@
 import type { Hono } from 'hono';
 import {
 	DEFAULT_REMOTE_MODEL_CATALOG_URL,
+	catalog,
 	discoverOllamaModels,
 	loadConfig,
-	catalog,
-	getConfiguredProviderModels,
 	getProviderDefinition,
 	providerAllowsAnyModel,
 	getAuth,
@@ -29,6 +28,7 @@ import {
 const COPILOT_MODELS_URL = 'https://api.githubcopilot.com/models';
 const REMOTE_CATALOG_REFRESH_TTL_MS = 5 * 60 * 1000;
 const PROVIDER_MODEL_REFRESH_TTL_MS = 60 * 1000;
+const USE_BUILTIN_MODEL_CATALOG = process.env.CI === 'true';
 
 type UiModel = {
 	id: string;
@@ -76,6 +76,12 @@ function getRemoteCatalogUrl(): string {
 	);
 }
 
+function getModelCatalogProviders(
+	cachedCatalog: Awaited<ReturnType<typeof readCachedModelCatalog>>,
+) {
+	return cachedCatalog?.providers ?? (USE_BUILTIN_MODEL_CATALOG ? catalog : {});
+}
+
 async function refreshRemoteCatalogInBackground(): Promise<void> {
 	const url = getRemoteCatalogUrl();
 	const now = Date.now();
@@ -132,19 +138,11 @@ async function refreshProviderModelsInBackground(args: {
 			projectRoot,
 		});
 		if (!discoveredModels) return;
-		const configuredModels = getConfiguredProviderModels(
-			await loadConfig(projectRoot),
-			provider,
-		);
-		const models = mergeConfiguredAndCachedModels(
-			configuredModels,
-			discoveredModels,
-		);
 		await mergeCachedModelCatalog({
 			[provider]: {
 				id: provider,
 				label: providerDefinition.label,
-				models,
+				models: discoveredModels,
 			},
 		});
 	} catch (error) {
@@ -261,40 +259,13 @@ function shouldLazyLoadProviderModels(
 	);
 }
 
-function mergeConfiguredAndCachedModels(
-	configuredModels: ModelInfo[],
-	cachedModels: ModelInfo[],
-): ModelInfo[] {
-	const modelsById = new Map<string, ModelInfo>();
-	for (const model of configuredModels) {
-		modelsById.set(model.id, model);
-	}
-	for (const model of cachedModels) {
-		const configuredModel = modelsById.get(model.id);
-		modelsById.set(
-			model.id,
-			configuredModel ? { ...model, ...configuredModel } : model,
-		);
-	}
-	return Array.from(modelsById.values());
-}
-
 function getProviderModelsForUi(args: {
-	providerDefinition: NonNullable<ReturnType<typeof getProviderDefinition>>;
 	catalogModels: ModelInfo[] | undefined;
-	cfg: Awaited<ReturnType<typeof loadConfig>>;
 	provider: ProviderId;
 	authType: 'api' | 'oauth' | 'wallet' | undefined;
 }): ModelInfo[] {
-	const configuredModels = getConfiguredProviderModels(args.cfg, args.provider);
 	const catalogModels = args.catalogModels ?? [];
-	if (args.providerDefinition.source === 'custom') {
-		return mergeConfiguredAndCachedModels(configuredModels, catalogModels);
-	}
-	if (catalogModels.length > 0) {
-		return filterModelsForAuthType(args.provider, catalogModels, args.authType);
-	}
-	return configuredModels;
+	return filterModelsForAuthType(args.provider, catalogModels, args.authType);
 }
 
 function getUiProviderLabel(
@@ -318,6 +289,9 @@ export function registerModelsRoutes(app: Hono) {
 
 			const projectRoot = c.req.query('project') || process.cwd();
 			const cfg = await loadConfig(projectRoot);
+			const cachedCatalog = await readCachedModelCatalog();
+			const modelCatalogProviders = getModelCatalogProviders(cachedCatalog);
+			const providerCatalog = modelCatalogProviders[provider];
 
 			const authorized = await isProviderAuthorizedHybrid(
 				embeddedConfig,
@@ -325,17 +299,13 @@ export function registerModelsRoutes(app: Hono) {
 				provider,
 			);
 
-			if (!authorized) {
+			if (!authorized && !providerCatalog) {
 				logger.warn('Provider not authorized', { provider });
 				return c.json({ error: 'Provider not authorized' }, 403);
 			}
 
-			const cachedCatalog = await readCachedModelCatalog();
-			const providerCatalog =
-				cachedCatalog?.providers[provider] ??
-				catalog[provider as keyof typeof catalog];
 			const providerDefinition = getProviderDefinition(cfg, provider);
-			if (!providerDefinition) {
+			if (!providerDefinition && !providerCatalog) {
 				logger.warn('Provider not found in catalog', { provider });
 				return c.json({ error: 'Provider not found' }, 404);
 			}
@@ -346,7 +316,10 @@ export function registerModelsRoutes(app: Hono) {
 				provider,
 				projectRoot,
 			);
-			if (shouldLazyLoadProviderModels(providerDefinition)) {
+			if (
+				providerDefinition &&
+				shouldLazyLoadProviderModels(providerDefinition)
+			) {
 				void refreshProviderModelsInBackground({
 					provider,
 					providerDefinition,
@@ -354,9 +327,7 @@ export function registerModelsRoutes(app: Hono) {
 				});
 			}
 			const filteredModels = getProviderModelsForUi({
-				providerDefinition,
 				catalogModels: providerCatalog?.models,
-				cfg,
 				provider,
 				authType,
 			});
@@ -378,8 +349,12 @@ export function registerModelsRoutes(app: Hono) {
 					embeddedConfig?.defaults?.model,
 					cfg.defaults.model,
 				),
-				allowAnyModel: providerAllowsAnyModel(cfg, provider),
-				label: getUiProviderLabel(providerDefinition),
+				allowAnyModel: providerDefinition
+					? providerAllowsAnyModel(cfg, provider)
+					: undefined,
+				label: providerDefinition
+					? getUiProviderLabel(providerDefinition)
+					: (providerCatalog?.label ?? provider),
 			});
 		} catch (error) {
 			logger.error('Failed to get provider models', error);
@@ -405,24 +380,31 @@ export function registerModelsRoutes(app: Hono) {
 			);
 
 			const cachedCatalog = await readCachedModelCatalog();
+			const modelCatalogProviders = getModelCatalogProviders(cachedCatalog);
 			void refreshRemoteCatalogInBackground();
 
 			const modelsMap: Record<string, UiProviderModels> = {};
 
-			for (const provider of authorizedProviders) {
-				const providerCatalog =
-					cachedCatalog?.providers[provider] ??
-					catalog[provider as keyof typeof catalog];
+			const cachedProviderIds = Object.keys(
+				modelCatalogProviders,
+			) as ProviderId[];
+			const modelProviders = Array.from(
+				new Set<ProviderId>([...authorizedProviders, ...cachedProviderIds]),
+			);
+
+			for (const provider of modelProviders) {
+				const providerCatalog = modelCatalogProviders[provider];
 				const providerDefinition = getProviderDefinition(cfg, provider);
-				if (providerDefinition) {
+				if (providerCatalog) {
 					const dynamicModels =
+						providerDefinition &&
 						shouldLazyLoadProviderModels(providerDefinition);
 					const authType = await getAuthTypeForProvider(
 						embeddedConfig,
 						provider,
 						projectRoot,
 					);
-					if (dynamicModels) {
+					if (dynamicModels && providerDefinition) {
 						void refreshProviderModelsInBackground({
 							provider,
 							providerDefinition,
@@ -430,16 +412,16 @@ export function registerModelsRoutes(app: Hono) {
 						});
 					}
 					const filteredModels = getProviderModelsForUi({
-						providerDefinition,
 						catalogModels: providerCatalog?.models,
-						cfg,
 						provider,
 						authType,
 					});
 					modelsMap[provider] = {
-						label: getUiProviderLabel(providerDefinition),
+						label: providerDefinition
+							? getUiProviderLabel(providerDefinition)
+							: (providerCatalog.label ?? provider),
 						authType,
-						allowAnyModel: providerDefinition.allowAnyModel,
+						allowAnyModel: providerDefinition?.allowAnyModel,
 						dynamicModels,
 						models: filteredModels.map(toUiModel),
 					};

package/src/routes/config/providers.ts

@@ -31,7 +31,6 @@ type ProviderMutationBody = {
 	apiKeyEnv?: string | null;
 	models?: string[];
 	allowAnyModel?: boolean;
-	scope?: 'global' | 'local';
 };
 
 type ProviderDiscoveryBody = {
@@ -165,7 +164,6 @@ export function registerProvidersRoute(app: Hono) {
 			const projectRoot = c.req.query('project') || process.cwd();
 			const provider = c.req.param('provider').trim();
 			const body = await c.req.json<ProviderMutationBody>();
-			const scope = body.scope || 'local';
 			if (!provider) return c.json({ error: 'Provider is required' }, 400);
 
 			const updates: ProviderSettingsEntry = {
@@ -202,7 +200,7 @@ export function registerProvidersRoute(app: Hono) {
 				return c.json({ error: 'Custom providers require compatibility' }, 400);
 			}
 
-			await writeProviderSettings(scope, provider, updates, projectRoot);
+			await writeProviderSettings('global', provider, updates, projectRoot);
 			const cfg = await loadConfig(projectRoot);
 			const details = await getProviderDetails(undefined, cfg);
 			return c.json({
@@ -230,11 +228,9 @@ export function registerProvidersRoute(app: Hono) {
 
 			const projectRoot = c.req.query('project') || process.cwd();
 			const provider = c.req.param('provider').trim();
-			const scope =
-				(c.req.query('scope') as 'global' | 'local' | undefined) || 'local';
 			if (!provider) return c.json({ error: 'Provider is required' }, 400);
 
-			await removeProviderSettings(scope, provider, projectRoot);
+			await removeProviderSettings('global', provider, projectRoot);
 			const cfg = await loadConfig(projectRoot);
 			const details = await getProviderDetails(undefined, cfg);
 			return c.json({ success: true, provider, details });

package/src/routes/session-files.ts

@@ -10,10 +10,12 @@ const FILE_EDIT_TOOLS = [
 	'Write',
 	'Edit',
 	'MultiEdit',
+	'CopyInto',
 	'ApplyPatch',
 	'write',
 	'edit',
 	'multiedit',
+	'copy_into',
 	'apply_patch',
 ];
 
@@ -42,6 +44,7 @@ interface SessionFile {
 
 interface ToolResultData {
 	path?: string;
+	targetPath?: string;
 	args?: Record<string, unknown>;
 	files?: Array<string | { path: string }>;
 	result?: {
@@ -75,6 +78,10 @@ function extractFilePathFromToolCall(
 		if (args && typeof args.path === 'string') return args.path;
 		if (typeof c.path === 'string') return c.path;
 	}
+	if (name === 'copyinto' || name === 'copy_into') {
+		if (args && typeof args.targetPath === 'string') return args.targetPath;
+		if (typeof c.targetPath === 'string') return c.targetPath;
+	}
 
 	if (name === 'applypatch' || name === 'apply_patch') {
 		const patch = args?.patch ?? c.patch;
@@ -146,6 +153,16 @@ function extractFilesFromToolResult(
 	if (args && typeof args.path === 'string' && !files.includes(args.path)) {
 		files.push(args.path);
 	}
+	if (
+		args &&
+		typeof args.targetPath === 'string' &&
+		!files.includes(args.targetPath)
+	) {
+		files.push(args.targetPath);
+	}
+	if (typeof c.targetPath === 'string' && !files.includes(c.targetPath)) {
+		files.push(c.targetPath);
+	}
 
 	if (Array.isArray(c.files)) {
 		for (const f of c.files) {
@@ -199,7 +216,7 @@ function extractDataFromToolResult(
 	}
 
 	if (
-		(name === 'edit' || name === 'multiedit') &&
+		(name === 'edit' || name === 'multiedit' || name === 'copy_into') &&
 		typeof c.result?.artifact?.patch === 'string'
 	) {
 		patch = c.result.artifact.patch;
@@ -229,7 +246,8 @@ 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 === 'edit' || name === 'multiedit' || name === 'copy_into')
+		return 'patch';
 	if (name === 'applypatch' || name === 'apply_patch') return 'patch';
 	return 'write';
 }

package/src/routes/skills.ts

@@ -97,10 +97,9 @@ export function registerSkillsRoutes(app: Hono) {
 			const body = await c.req.json<{
 				enabled?: boolean;
 				items?: Record<string, { enabled?: boolean }>;
-				scope?: 'global' | 'local';
 			}>();
 			await writeSkillSettings(
-				body.scope || 'local',
+				'global',
 				{
 					...(body.enabled !== undefined ? { enabled: body.enabled } : {}),
 					...(body.items ? { items: body.items } : {}),

package/src/runtime/agent/registry.ts

@@ -124,6 +124,7 @@ const defaultToolExtras: Record<string, string[]> = {
 		'edit',
 		'multiedit',
 		'write',
+		'copy_into',
 		'ls',
 		'tree',
 		'shell',
@@ -142,6 +143,7 @@ const defaultToolExtras: Record<string, string[]> = {
 		'edit',
 		'multiedit',
 		'write',
+		'copy_into',
 		'ls',
 		'tree',
 		'shell',
@@ -156,6 +158,7 @@ const defaultToolExtras: Record<string, string[]> = {
 		'edit',
 		'multiedit',
 		'write',
+		'copy_into',
 		'ls',
 		'tree',
 		'shell',

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

@@ -115,7 +115,13 @@ export function mergeProviderOptions(
 	return base;
 }
 
-const EDITING_TOOL_NAMES = ['edit', 'multiedit', 'write', 'apply_patch'];
+const EDITING_TOOL_NAMES = [
+	'edit',
+	'multiedit',
+	'write',
+	'copy_into',
+	'apply_patch',
+];
 const MODEL_FAMILY_EDIT_TOOL_POLICY_AGENTS = new Set([
 	'build',
 	'general',
@@ -148,8 +154,8 @@ export function applyModelFamilyEditToolPolicy(
 	);
 	const preferredEditingTools =
 		family === 'anthropic' || family === 'openai'
-			? ['write', 'apply_patch']
-			: ['write', 'edit', 'multiedit'];
+			? ['write', 'copy_into', 'apply_patch']
+			: ['write', 'edit', 'multiedit', 'copy_into'];
 
 	return Array.from(new Set([...next, ...preferredEditingTools]));
 }

package/src/runtime/agent/runner.ts

@@ -61,6 +61,7 @@ const DEFAULT_TRACED_TOOL_INPUTS = new Set([
 	'write',
 	'edit',
 	'multiedit',
+	'copy_into',
 	'apply_patch',
 ]);
 

package/src/runtime/tools/approval.ts

@@ -8,6 +8,7 @@ export const DANGEROUS_TOOLS = new Set([
 	'edit',
 	'multiedit',
 	'write',
+	'copy_into',
 	'apply_patch',
 	'terminal',
 	'git_commit',

package/src/runtime/tools/guards.ts

@@ -25,6 +25,7 @@ export function guardToolCall(
 		case 'read':
 			return guardReadPath(String(a.path ?? ''), context.projectRoot);
 		case 'write':
+		case 'copy_into':
 			return guardWritePath(toolName, a);
 		default:
 			return { type: 'allow' };
@@ -193,9 +194,11 @@ function guardWritePath(
 	const path =
 		typeof args.path === 'string'
 			? args.path
-			: typeof args.filePath === 'string'
-				? args.filePath
-				: '';
+			: typeof args.targetPath === 'string'
+				? args.targetPath
+				: typeof args.filePath === 'string'
+					? args.filePath
+					: '';
 	if (!path) return { type: 'allow' };
 	const p = path.trim();
 

package/src/runtime/tools/mapping.ts

@@ -20,6 +20,7 @@ export const CANONICAL_TO_PASCAL: Record<string, string> = {
 	edit: 'Edit',
 	multiedit: 'MultiEdit',
 	write: 'Write',
+	copy_into: 'CopyInto',
 	ls: 'Ls',
 	tree: 'Tree',
 	cd: 'Cd',
@@ -61,6 +62,7 @@ export const PASCAL_TO_CANONICAL: Record<string, string> = {
 	Edit: 'edit',
 	MultiEdit: 'multiedit',
 	Write: 'write',
+	CopyInto: 'copy_into',
 	Ls: 'ls',
 	Tree: 'tree',
 	Cd: 'cd',

package/src/tools/adapter.ts

@@ -64,6 +64,7 @@ const DEFAULT_TRACED_TOOL_INPUTS = new Set([
 	'write',
 	'edit',
 	'multiedit',
+	'copy_into',
 	'apply_patch',
 ]);