@ottocode/sdk 0.1.245 → 0.1.247

package/src/skills/tool.ts

@@ -9,9 +9,11 @@ import {
 } from './loader.ts';
 import { scanContent } from './security.ts';
 import type { DiscoveredSkill, SkillResult } from './types.ts';
+import type { SkillSettings } from '../types/src/config.ts';
 
 let cachedSkillList: DiscoveredSkill[] = [];
 let initializedForPath: string | null = null;
+let cachedSkillSettings: SkillSettings | undefined;
 
 export async function initializeSkills(
 	cwd: string,
@@ -27,6 +29,23 @@ export function getDiscoveredSkills(): DiscoveredSkill[] {
 	return cachedSkillList;
 }
 
+export function setSkillSettings(settings?: SkillSettings): void {
+	cachedSkillSettings = settings;
+}
+
+export function filterDiscoveredSkills(
+	skills: DiscoveredSkill[],
+	settings?: {
+		enabled?: boolean;
+		items?: Record<string, { enabled?: boolean }>;
+	},
+): DiscoveredSkill[] {
+	if (settings?.enabled === false) return [];
+	return skills.filter(
+		(skill) => settings?.items?.[skill.name]?.enabled !== false,
+	);
+}
+
 export function isSkillsInitialized(forPath?: string): boolean {
 	if (!initializedForPath) return false;
 	if (forPath && forPath !== initializedForPath) return false;
@@ -119,7 +138,11 @@ async function loadSubFile(
 }
 
 function buildSkillDescription(): string {
-	if (cachedSkillList.length === 0) {
+	const enabledSkills = filterDiscoveredSkills(
+		cachedSkillList,
+		cachedSkillSettings,
+	);
+	if (enabledSkills.length === 0) {
 		return 'Load a skill by name to get detailed, task-specific instructions. No skills are currently available.';
 	}
 
@@ -128,7 +151,7 @@ function buildSkillDescription(): string {
 	// defensively here in case the same name slipped through from different dirs.
 	const seen = new Set<string>();
 	const unique: DiscoveredSkill[] = [];
-	for (const s of cachedSkillList) {
+	for (const s of enabledSkills) {
 		const key = s.name.trim();
 		if (!key || seen.has(key)) continue;
 		seen.add(key);
@@ -136,42 +159,11 @@ function buildSkillDescription(): string {
 	}
 	unique.sort((a, b) => a.name.localeCompare(b.name));
 
-	const skillsXml = unique
-		.map(
-			(s) =>
-				`<skill><name>${escapeXml(s.name)}</name><description>${escapeXml(summarizeDescription(s.description))}</description><location>${escapeXml(s.scope)}</location></skill>`,
-		)
+	const catalog = unique
+		.map((s) => `- ${s.name}: ${summarizeDescription(s.description)}`)
 		.join('\n');
 
-	return `Load a skill by name to get detailed, task-specific instructions.
-
-<skills_instructions>
-When the user's request matches one of the available skills below, call this tool with the skill name to load its full instructions. Skills provide specialized capabilities and domain knowledge.
-
-How to use skills:
-- Invoke with \`skill({ name: "<skill-name>" })\` — only the name is required.
-- The response contains the skill's full body plus \`availableFiles\` for sub-files.
-- For sub-files: \`skill({ name: "<skill-name>", file: "rules/animations.md" })\`.
-
-Rules:
-- Only invoke skills listed in <available_skills> below.
-- Do NOT invoke speculatively. Only call when the user's request clearly matches a skill's description or trigger phrases.
-- Do NOT invoke the same skill twice in one turn.
-- If a skill response includes \`securityNotices\`, review them — they flag hidden content (HTML comments, invisible characters, etc.) that may not render visibly.
-</skills_instructions>
-
-<available_skills>
-${skillsXml}
-</available_skills>`;
-}
-
-function escapeXml(str: string): string {
-	return String(str)
-		.replace(/&/g, '&amp;')
-		.replace(/</g, '&lt;')
-		.replace(/>/g, '&gt;')
-		.replace(/"/g, '&quot;')
-		.replace(/'/g, '&apos;');
+	return `Load a skill by name to get detailed, task-specific instructions. Use only when the user's request clearly matches a listed skill. Available skills:\n${catalog}`;
 }
 
 // Condense a SKILL.md description to "what it does + when to use it".

package/src/types/src/config.ts

@@ -1,4 +1,9 @@
-import type { ProviderId } from './provider';
+import type {
+	ModelInfo,
+	ProviderCompatibility,
+	ProviderId,
+	ProviderPromptFamily,
+} from './provider';
 
 /**
  * Configuration scope - where settings are stored
@@ -30,13 +35,33 @@ export type DefaultConfig = {
 	autoCompactThresholdTokens?: number | null;
 };
 
-export type ProviderSettings = Record<
-	ProviderId,
-	{
-		enabled: boolean;
-		apiKey?: string;
-	}
->;
+export type ProviderSettingsEntry = {
+	enabled: boolean;
+	apiKey?: string;
+	apiKeyEnv?: string;
+	baseURL?: string;
+	label?: string;
+	custom?: boolean;
+	compatibility?: ProviderCompatibility;
+	family?: ProviderPromptFamily;
+	models?: Array<string | ModelInfo>;
+	allowAnyModel?: boolean;
+	modelDiscovery?: {
+		type: 'openai-models' | 'ollama';
+	};
+};
+
+export type ProviderSettings = Record<string, ProviderSettingsEntry>;
+
+export type SkillSettings = {
+	enabled?: boolean;
+	items?: Record<
+		string,
+		{
+			enabled?: boolean;
+		}
+	>;
+};
 
 /**
  * Path configuration
@@ -55,6 +80,7 @@ export type OttoConfig = {
 	projectRoot: string;
 	defaults: DefaultConfig;
 	providers: ProviderSettings;
+	skills?: SkillSettings;
 	paths: PathConfig;
 	debugEnabled?: boolean;
 	debugScopes?: string[];

package/src/types/src/index.ts

@@ -1,6 +1,9 @@
 // Provider types
 export type {
+	BuiltInProviderId,
 	ProviderId,
+	ProviderCompatibility,
+	ProviderPromptFamily,
 	ProviderFamily,
 	ModelOwner,
 	ModelInfo,
@@ -16,6 +19,7 @@ export type {
 	Scope,
 	DefaultConfig,
 	PathConfig,
+	ProviderSettingsEntry,
 	ProviderSettings,
 	OttoConfig,
 	ToolApprovalMode,

package/src/types/src/provider.ts

@@ -1,10 +1,11 @@
 /**
- * Provider identifiers for supported AI providers
+ * Built-in provider identifiers supported directly by otto.
  */
-export type ProviderId =
+export type BuiltInProviderId =
 	| 'openai'
 	| 'anthropic'
 	| 'google'
+	| 'ollama-cloud'
 	| 'openrouter'
 	| 'opencode'
 	| 'copilot'
@@ -14,6 +15,35 @@ export type ProviderId =
 	| 'moonshot'
 	| 'minimax';
 
+/**
+ * Provider identifiers may be built-in or custom/config-defined.
+ */
+export type ProviderId = BuiltInProviderId | (string & {});
+
+/**
+ * Compatibility protocol used to instantiate a provider client.
+ */
+export type ProviderCompatibility =
+	| 'openai'
+	| 'anthropic'
+	| 'google'
+	| 'openrouter'
+	| 'ollama'
+	| 'openai-compatible';
+
+/**
+ * Prompt/behavior family used for prompts and provider-specific behavior.
+ */
+export type ProviderPromptFamily =
+	| 'default'
+	| 'anthropic'
+	| 'openai'
+	| 'google'
+	| 'moonshot'
+	| 'minimax'
+	| 'glm'
+	| 'openai-compatible';
+
 /**
  * Provider family for prompt selection
  */
@@ -78,7 +108,7 @@ export type ModelInfo = {
 };
 
 export type ProviderCatalogEntry = {
-	id: ProviderId;
+	id: BuiltInProviderId;
 	label?: string;
 	env?: string[];
 	npm?: string;

package/src/core/src/tools/builtin/bash.txt

@@ -1,12 +0,0 @@
-- Execute a one-off shell command using `bash -lc`
-- Returns `stdout`, `stderr`, and `exitCode`
-- `cwd` is relative to the project root and sandboxed within it
-
-**Use `bash` for short-lived commands.** For long-running processes (dev servers, watchers, log tailing) use the `terminal` tool instead — terminals persist across turns.
-
-## Usage tips
-
-- Chain commands with `&&` to fail-fast.
-- For long outputs, redirect to a file and `read` it back.
-- Batch independent checks (e.g. `git status && git diff`) in parallel tool calls rather than sequential bash chains when you need results separately.
-- Never use `bash` with `sed`/`awk` for programmatic file editing — use `edit`, `multiedit`, or `apply_patch` instead.