@ottocode/server 0.1.266 → 0.1.267

package/package.json

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

package/src/runtime/prompt/builder.ts

@@ -1,4 +1,4 @@
-import { providerBasePrompt } from '@ottocode/sdk';
+import { discoverSkills, findGitRoot, providerBasePrompt } from '@ottocode/sdk';
 import { composeEnvironmentAndInstructions } from '../context/environment.ts';
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import BASE_PROMPT from '@ottocode/sdk/prompts/base.txt' with { type: 'text' };
@@ -130,8 +130,12 @@ export async function composeSystemPrompt(options: {
 		}
 	}
 
+	const repoRoot =
+		(await findGitRoot(options.projectRoot)) ?? options.projectRoot;
+	const skills = await discoverSkills(options.projectRoot, repoRoot);
 	const capabilitySummary = buildCapabilitySummary({
 		skillSettings: options.skillSettings,
+		skills,
 	});
 	if (capabilitySummary.prompt) {
 		parts.push(capabilitySummary.prompt);

package/src/runtime/prompt/capabilities.ts

@@ -1,6 +1,5 @@
 import {
 	filterDiscoveredSkills,
-	getDiscoveredSkills,
 	getMCPManager,
 	summarizeDescription,
 	type DiscoveredSkill,
@@ -31,7 +30,9 @@ export function buildCapabilitySummary(options?: {
 	skills?: DiscoveredSkill[];
 	mcpTools?: CapabilitySummaryMCPTool[];
 }): CapabilitySummaryResult {
-	const skillLines = buildSkillLines(options?.skills, options?.skillSettings);
+	const skillLines = options?.skills
+		? buildSkillLines(options.skills, options.skillSettings)
+		: [];
 	const mcpLines = buildMCPLines(options?.mcpTools);
 	const components = ['capabilities'];
 	const sections: string[] = [];
@@ -64,13 +65,10 @@ export function buildCapabilitySummary(options?: {
 }
 
 function buildSkillLines(
-	providedSkills: DiscoveredSkill[] | undefined,
+	providedSkills: DiscoveredSkill[],
 	skillSettings: OttoConfig['skills'] | undefined,
 ): string[] {
-	const skills = filterDiscoveredSkills(
-		providedSkills ?? getDiscoveredSkills(),
-		skillSettings,
-	);
+	const skills = filterDiscoveredSkills(providedSkills, skillSettings);
 	const seen = new Set<string>();
 	const unique: DiscoveredSkill[] = [];
 
@@ -81,7 +79,14 @@ function buildSkillLines(
 		unique.push(skill);
 	}
 
-	unique.sort((a, b) => a.name.localeCompare(b.name));
+	unique.sort((a, b) => {
+		const aExplicitlyEnabled = skillSettings?.items?.[a.name]?.enabled === true;
+		const bExplicitlyEnabled = skillSettings?.items?.[b.name]?.enabled === true;
+		if (aExplicitlyEnabled !== bExplicitlyEnabled) {
+			return aExplicitlyEnabled ? -1 : 1;
+		}
+		return a.name.localeCompare(b.name);
+	});
 
 	const visible = unique.slice(0, MAX_SKILLS).map((skill) => {
 		const summary = finalizeSentence(summarizeDescription(skill.description));