@cjhyy/code-shell-core 0.8.11 → 0.8.12

package/dist/index.d.ts

@@ -3,10 +3,12 @@
  *
  * Public API exports.
  */
-export declare const VERSION = "0.8.11";
+export declare const VERSION = "0.8.12";
 export type { Message, ContentBlock, ToolDefinition, ToolCall, ToolResult, RegisteredTool, TranscriptEvent, TranscriptEventType, SessionState, SessionKind, SessionWorkspace, SessionForkLineage, ContextUsageAnchor, SessionStatus, TokenUsage, CompiledInput, PermissionDecision, PermissionMode, PermissionRule, TurnPhase, TurnResult, TerminalReason, TurnCompletionKind, StreamEvent, StreamCallback, LLMConfig, ClientDefaults, LLMResponse, Settings, MCPServerConfig, } from "./types.js";
 export type { GoalConfig, GoalLifecycleConfig, GoalLifecyclePhase, GoalLifecycleTerminalReason, GoalLifecycleV1, } from "./goal/lifecycle.js";
-export { FrameworkError, LLMError, LLMRateLimitError, ContextLimitError, ToolError, ToolNotFoundError, ToolExecutionError, ToolTimeoutError, PermissionDeniedError, SessionError, TranscriptError, ConfigError, SandboxUnavailableError, } from "./exceptions.js";
+export { FrameworkError, LLMError, LLMRateLimitError, ContextLimitError, ToolError, ToolNotFoundError, ToolExecutionError, ToolTimeoutError, PermissionDeniedError, SessionError, TranscriptError, ConfigError, CompositionError, SandboxUnavailableError, } from "./exceptions.js";
+export { compileComposition, toCompositionSnapshot, computeCompositionDigest, compositionToolCatalog, resolvePresetFromComposition, } from "./composition/index.js";
+export type { AgentModule, AgentEngineContributions, AgentProtocolContributions, AgentModuleToolContribution, ResolvedComposition, CompositionSnapshot, } from "./composition/types.js";
 export { Engine, loadAgentDefinitionsForCwd } from "./engine/engine.js";
 export type { EngineConfig, EngineHookConfig, EngineResult } from "./engine/types.js";
 export type { RunBehaviorMode, RunBehaviorProfile } from "./engine/run-types.js";
@@ -43,13 +45,11 @@ export type { ConnectorAdapter } from "./sources/adapter.js";
 export type { SourceAccessStatus, CredentialStatusFn, EffectiveSourceAccess, ResolveSourceAccessInput, } from "./sources/resolve.js";
 export type { BuildSourcesContextSummaryInput } from "./sources/context-summary.js";
 export { createFakeToolContext, createToolRegistryHarness, type FakeToolContextOptions, type ToolRegistryHarness, type ToolRegistryHarnessOptions, } from "./tool-system/testing/tool-registry-harness.js";
-export { registerCapability, unregisterCapability, listRegisteredCapabilities, } from "./capabilities/index.js";
-export type { CapabilityArtifact, CapabilityArtifactDetectionContext, CapabilityArtifactDetector, CapabilityDynamicContext, CapabilityDynamicContextProvider, CapabilityFileHistoryContribution, CapabilityEngineHookContribution, CapabilityInstructionBoundaryFinder, CapabilityModule, CapabilityToolServiceHost, CapabilityToolSelectionContext, SessionWorkspaceCapability, } from "./capabilities/index.js";
+export type { CapabilityArtifact, CapabilityArtifactDetectionContext, CapabilityArtifactDetector, CapabilityDynamicContext, CapabilityDynamicContextProvider, CapabilityFileHistoryContribution, CapabilityEngineHookContribution, CapabilityInstructionBoundaryFinder, CapabilityToolServiceHost, CapabilityToolSelectionContext, SessionWorkspaceCapability, } from "./capabilities/index.js";
 export { makeUpdateAutomationMemoryTool } from "./tool-system/builtin/update-automation-memory.js";
 export { MCPManager, buildHttpHeaders, buildStdioEnv, createMcpAuthenticatedFetch, } from "./tool-system/mcp-manager.js";
 export type { AskUserFn } from "./tool-system/builtin/ask-user.js";
-export type { ExtensionModule, ExtensionQueryHandler, ExtensionTool, ProtocolLiveSession, ProtocolObserver, ProtocolObserverHost, } from "./tool-system/capability-module.js";
-export { registerExtensionModules, queryExtensionModules, } from "./tool-system/capability-module.js";
+export type { ExtensionQueryHandler, ExtensionTool, ProtocolLiveSession, ProtocolObserver, ProtocolObserverHost, } from "./tool-system/capability-module.js";
 export type { Task, TaskStatus } from "./tool-system/builtin/task.js";
 export { HookRegistry } from "./hooks/registry.js";
 export type { HookHandler } from "./hooks/registry.js";
@@ -77,9 +77,9 @@ export { authorize, refreshToken, generatePKCE, createHardenedOAuthFetch, type O
 export { PromptComposer } from "./prompt/composer.js";
 export { SectionCache } from "./prompt/section-cache.js";
 export { scanInstructions, combineInstructions } from "./prompt/instruction-scanner.js";
-export { BUILTIN_AGENT_PRESETS, DEFAULT_AGENT_PRESET, DEFAULT_CLI_PRESET, resolveAgentPreset, resolveBuiltinToolNames, buildPresetSystemPrompt, registerPreset, listPresetNames, } from "./preset/index.js";
+export { BUILTIN_AGENT_PRESETS, DEFAULT_AGENT_PRESET, DEFAULT_CLI_PRESET, resolveAgentPreset, resolveBuiltinToolNames, resolveToolNamesForPreset, buildPresetSystemPrompt, listPresetNames, } from "./preset/index.js";
 export type { AgentPreset, AgentPresetName } from "./preset/index.js";
-export { loadSection, loadSections, availableSections, registerSection, } from "./prompt/section-loader.js";
+export { loadSection, loadSections, availableSections } from "./prompt/section-loader.js";
 export { ContextManager } from "./context/manager.js";
 export { estimateTokens, microcompact, windowCompact, truncateToolResult, buildSummarizationPrompt, applySummaryCompaction, COMPACTABLE_TOOL_NAMES, } from "./context/compaction.js";
 export type { MicrocompactOptions } from "./context/compaction.js";

package/dist/index.extension.d.ts

@@ -26,10 +26,10 @@ export type { ExposureRationale } from "./tool-system/external-tool-exposure.js"
 export { webSearchTool } from "./tool-system/builtin/web-search.js";
 export { webFetchTool } from "./tool-system/builtin/web-fetch.js";
 export { extractJSON, extractJSONArray } from "./utils/json.js";
-export type { ExtensionModule, ExtensionQueryHandler, ExtensionTool, } from "./tool-system/capability-module.js";
+export type { ExtensionQueryHandler, ExtensionTool, } from "./tool-system/capability-module.js";
 export type { SessionWorkspace } from "./types.js";
-export { registerCapability } from "./capabilities/index.js";
-export type { CapabilityArtifactDetector, CapabilityDynamicContextProvider, CapabilityModule, CapabilityToolServiceHost, } from "./capabilities/index.js";
+export type { CapabilityArtifactDetector, CapabilityDynamicContextProvider, CapabilityToolServiceHost, } from "./capabilities/index.js";
+export type { AgentModule, AgentEngineContributions, AgentProtocolContributions, AgentModuleToolContribution, ResolvedComposition, } from "./composition/types.js";
 export { BUILTIN_AGENT_PRESETS } from "./preset/index.js";
 export type { AgentPreset } from "./preset/index.js";
 export { BUILTIN_TOOLS, derivePresetExposure } from "./tool-system/builtin/index.js";

package/dist/index.extension.js

@@ -25,7 +25,6 @@ export { FIRST_PHASE_EXPOSURE, FIRST_PHASE_EXPOSURE_RATIONALE, } from "./tool-sy
 export { webSearchTool } from "./tool-system/builtin/web-search.js";
 export { webFetchTool } from "./tool-system/builtin/web-fetch.js";
 export { extractJSON, extractJSONArray } from "./utils/json.js";
-export { registerCapability } from "./capabilities/index.js";
 export { BUILTIN_AGENT_PRESETS } from "./preset/index.js";
 export { BUILTIN_TOOLS, derivePresetExposure } from "./tool-system/builtin/index.js";
 export { SessionManager, codeShellHome } from "./session/session-manager.js";

package/dist/index.js

@@ -3,9 +3,11 @@
  *
  * Public API exports.
  */
-export const VERSION = "0.8.11";
+export const VERSION = "0.8.12";
 // ─── Exceptions ──────────────────────────────────────────────────
-export { FrameworkError, LLMError, LLMRateLimitError, ContextLimitError, ToolError, ToolNotFoundError, ToolExecutionError, ToolTimeoutError, PermissionDeniedError, SessionError, TranscriptError, ConfigError, SandboxUnavailableError, } from "./exceptions.js";
+export { FrameworkError, LLMError, LLMRateLimitError, ContextLimitError, ToolError, ToolNotFoundError, ToolExecutionError, ToolTimeoutError, PermissionDeniedError, SessionError, TranscriptError, ConfigError, CompositionError, SandboxUnavailableError, } from "./exceptions.js";
+// ─── Composition (AgentModule / ResolvedComposition) ─────────────
+export { compileComposition, toCompositionSnapshot, computeCompositionDigest, compositionToolCatalog, resolvePresetFromComposition, } from "./composition/index.js";
 // ─── Engine (primary API) ────────────────────────────────────────
 export { Engine, loadAgentDefinitionsForCwd } from "./engine/engine.js";
 export { resolveLLMConfigForTag } from "./engine/resolve-llm-config.js";
@@ -34,10 +36,8 @@ export { SKILL_REPO_RE, WORKSPACE_PROFILE_NAME_RE, WorkspaceProfileSchema, Works
 // ─── Workspace data sources ─────────────────────────────────────
 export { SOURCE_ID_RE, SOURCE_KINDS, SourceDefinitionSchema, WorkspaceSourceBindingSchema, } from "./sources/types.js";
 export { createFakeToolContext, createToolRegistryHarness, } from "./tool-system/testing/tool-registry-harness.js";
-export { registerCapability, unregisterCapability, listRegisteredCapabilities, } from "./capabilities/index.js";
 export { makeUpdateAutomationMemoryTool } from "./tool-system/builtin/update-automation-memory.js";
 export { MCPManager, buildHttpHeaders, buildStdioEnv, createMcpAuthenticatedFetch, } from "./tool-system/mcp-manager.js";
-export { registerExtensionModules, queryExtensionModules, } from "./tool-system/capability-module.js";
 // ─── Hooks ───────────────────────────────────────────────────────
 export { HookRegistry } from "./hooks/registry.js";
 export { wrapHookMessages } from "./hooks/inject.js";
@@ -66,8 +66,8 @@ export { PromptComposer } from "./prompt/composer.js";
 export { SectionCache } from "./prompt/section-cache.js";
 export { scanInstructions, combineInstructions } from "./prompt/instruction-scanner.js";
 // ─── Presets ─────────────────────────────────────────────────────
-export { BUILTIN_AGENT_PRESETS, DEFAULT_AGENT_PRESET, DEFAULT_CLI_PRESET, resolveAgentPreset, resolveBuiltinToolNames, buildPresetSystemPrompt, registerPreset, listPresetNames, } from "./preset/index.js";
-export { loadSection, loadSections, availableSections, registerSection, } from "./prompt/section-loader.js";
+export { BUILTIN_AGENT_PRESETS, DEFAULT_AGENT_PRESET, DEFAULT_CLI_PRESET, resolveAgentPreset, resolveBuiltinToolNames, resolveToolNamesForPreset, buildPresetSystemPrompt, listPresetNames, } from "./preset/index.js";
+export { loadSection, loadSections, availableSections } from "./prompt/section-loader.js";
 // ─── Context ─────────────────────────────────────────────────────
 export { ContextManager } from "./context/manager.js";
 export { estimateTokens, microcompact, windowCompact, truncateToolResult, buildSummarizationPrompt, applySummaryCompaction, COMPACTABLE_TOOL_NAMES, } from "./context/compaction.js";

package/dist/preset/index.d.ts

@@ -9,11 +9,11 @@
  */
 import type { PermissionRule } from "../types.js";
 import { type BuiltinTool } from "../tool-system/builtin/index.js";
-import type { CapabilityModule } from "../capabilities/index.js";
+import type { CapabilityToolSelectionContext } from "../capabilities/index.js";
 export declare const AGENT_PRESET_NAMES: readonly ["harness-min", "general"];
-/** Built-in preset names. Custom presets use arbitrary strings via registerPreset(). */
+/** Built-in preset names. Module presets use arbitrary strings via AgentModule.engine.presets. */
 export type BuiltinPresetName = (typeof AGENT_PRESET_NAMES)[number];
-/** Any preset name — built-in or custom-registered. */
+/** Any preset name — built-in or module-contributed. */
 export type AgentPresetName = BuiltinPresetName | (string & {});
 export interface AgentPreset {
     name: AgentPresetName;
@@ -26,29 +26,11 @@ export interface AgentPreset {
 }
 export declare const BUILTIN_AGENT_PRESETS: Record<BuiltinPresetName, AgentPreset>;
 export declare const DEFAULT_AGENT_PRESET: AgentPresetName;
-/** @deprecated Product hosts should install a capability with `defaultPreset`. */
+/** @deprecated Product hosts should ship a module declaring `defaultPreset`. */
 export declare const DEFAULT_CLI_PRESET: AgentPresetName;
-/**
- * Register a custom agent preset.
- *
- * External repos can call this to add their own presets:
- * ```ts
- * import { registerPreset } from "code-shell";
- *
- * registerPreset({
- *   name: "data-pipeline" as AgentPresetName,
- *   label: "Data Pipeline Orchestrator",
- *   description: "Manages ETL workflows and data quality checks.",
- *   promptSections: ["base", "orchestration"],
- *   builtinTools: ["Read", "Write", "Bash", "Glob", "Grep", "Agent"],
- *   defaultPermissionRules: [{ tool: "Read", decision: "allow" }],
- * });
- * ```
- */
-export declare function registerPreset(preset: AgentPreset): void;
-/** List all available preset names (built-in + custom). */
-export declare function listPresetNames(capabilities?: readonly CapabilityModule[]): string[];
-export declare function resolveAgentPreset(name?: string, capabilities?: readonly CapabilityModule[]): AgentPreset;
+/** List the built-in preset names. Module-contributed presets live in the composition. */
+export declare function listPresetNames(): string[];
+export declare function resolveAgentPreset(name?: string): AgentPreset;
 export interface BuildPresetSystemPromptOptions {
     activeToolNames?: readonly string[];
     platform?: NodeJS.Platform;
@@ -65,10 +47,21 @@ export interface BuildPresetSystemPromptOptions {
  * include all sections (e.g. when assembling a generic/preview prompt).
  */
 export declare function buildPresetSystemPrompt(preset: AgentPreset, optionsOrActiveToolNames?: BuildPresetSystemPromptOptions | readonly string[]): string;
+/**
+ * Composition-era tool-name resolution: the caller resolves the preset
+ * object first (resolvePresetFromComposition) and passes explicit
+ * adjusters instead of whole capability modules.
+ */
+export declare function resolveToolNamesForPreset(options: {
+    preset: AgentPreset;
+    host?: string;
+    enabledBuiltinTools?: readonly string[];
+    disabledBuiltinTools?: readonly string[];
+    adjusters?: readonly ((names: Set<string>, context: CapabilityToolSelectionContext) => void)[];
+}): string[];
 export declare function resolveBuiltinToolNames(options?: {
     preset?: string;
     host?: string;
     enabledBuiltinTools?: string[];
     disabledBuiltinTools?: string[];
-    capabilities?: readonly CapabilityModule[];
 }): string[];

package/dist/preset/index.js

@@ -32,67 +32,18 @@ export const BUILTIN_AGENT_PRESETS = {
     },
 };
 export const DEFAULT_AGENT_PRESET = "harness-min";
-/** @deprecated Product hosts should install a capability with `defaultPreset`. */
+/** @deprecated Product hosts should ship a module declaring `defaultPreset`. */
 export const DEFAULT_CLI_PRESET = DEFAULT_AGENT_PRESET;
-/** Registry of custom presets registered by external consumers. */
-const _customPresets = new Map();
-/**
- * Register a custom agent preset.
- *
- * External repos can call this to add their own presets:
- * ```ts
- * import { registerPreset } from "code-shell";
- *
- * registerPreset({
- *   name: "data-pipeline" as AgentPresetName,
- *   label: "Data Pipeline Orchestrator",
- *   description: "Manages ETL workflows and data quality checks.",
- *   promptSections: ["base", "orchestration"],
- *   builtinTools: ["Read", "Write", "Bash", "Glob", "Grep", "Agent"],
- *   defaultPermissionRules: [{ tool: "Read", decision: "allow" }],
- * });
- * ```
- */
-export function registerPreset(preset) {
-    _customPresets.set(preset.name, preset);
+/** List the built-in preset names. Module-contributed presets live in the composition. */
+export function listPresetNames() {
+    return [...AGENT_PRESET_NAMES];
 }
-/** List all available preset names (built-in + custom). */
-export function listPresetNames(capabilities = []) {
-    return [
-        ...new Set([
-            ...AGENT_PRESET_NAMES,
-            ..._customPresets.keys(),
-            ...capabilities.flatMap((capability) => (capability.presets ?? []).map((preset) => preset.name)),
-        ]),
-    ];
-}
-export function resolveAgentPreset(name, capabilities = []) {
-    let resolvedName = name;
-    if (!resolvedName) {
-        const defaults = [
-            ...new Set(capabilities
-                .map((capability) => capability.defaultPreset)
-                .filter((preset) => Boolean(preset))),
-        ];
-        if (defaults.length > 1) {
-            throw new Error(`Capabilities contributed conflicting default presets: ${defaults.join(", ")}`);
-        }
-        resolvedName = defaults[0] ?? DEFAULT_AGENT_PRESET;
-    }
-    const contributed = capabilities
-        .flatMap((capability) => [...(capability.presets ?? [])])
-        .find((preset) => preset.name === resolvedName);
-    if (contributed)
-        return contributed;
-    // Check built-in first
+export function resolveAgentPreset(name) {
+    const resolvedName = name ?? DEFAULT_AGENT_PRESET;
     const builtin = BUILTIN_AGENT_PRESETS[resolvedName];
     if (builtin)
         return builtin;
-    // Check custom presets
-    const custom = _customPresets.get(resolvedName);
-    if (custom)
-        return custom;
-    const allowed = listPresetNames(capabilities).join(", ");
+    const allowed = listPresetNames().join(", ");
     throw new Error(`Unknown agent preset "${resolvedName}". Available presets: ${allowed}`);
 }
 /** Prompt-section capability links are contributed by builtin exposure metadata. */
@@ -141,20 +92,29 @@ export function buildPresetSystemPrompt(preset, optionsOrActiveToolNames) {
         .filter(Boolean)
         .join("\n\n");
 }
-export function resolveBuiltinToolNames(options) {
-    const preset = resolveAgentPreset(options?.preset, options?.capabilities);
-    const names = new Set(preset.builtinTools);
-    for (const name of options?.enabledBuiltinTools ?? []) {
+/**
+ * Composition-era tool-name resolution: the caller resolves the preset
+ * object first (resolvePresetFromComposition) and passes explicit
+ * adjusters instead of whole capability modules.
+ */
+export function resolveToolNamesForPreset(options) {
+    const names = new Set(options.preset.builtinTools);
+    for (const name of options.enabledBuiltinTools ?? []) {
         names.add(name);
     }
-    for (const capability of options?.capabilities ?? []) {
-        capability.adjustToolSelection?.(names, {
-            preset: preset.name,
-            host: options?.host,
-        });
+    for (const adjust of options.adjusters ?? []) {
+        adjust(names, { preset: options.preset.name, host: options.host });
     }
-    for (const name of options?.disabledBuiltinTools ?? []) {
+    for (const name of options.disabledBuiltinTools ?? []) {
         names.delete(name);
     }
     return [...names];
 }
+export function resolveBuiltinToolNames(options) {
+    return resolveToolNamesForPreset({
+        preset: resolveAgentPreset(options?.preset),
+        host: options?.host,
+        enabledBuiltinTools: options?.enabledBuiltinTools,
+        disabledBuiltinTools: options?.disabledBuiltinTools,
+    });
+}

package/dist/product/define.js

@@ -33,7 +33,6 @@
  * await manager.submit({ objective: "Audit auth module for SQL injection" });
  * ```
  */
-import { registerPreset } from "../preset/index.js";
 import { CompositeEvaluator, NoopEvaluator } from "../run/Evaluator.js";
 import { RunManager } from "../run/RunManager.js";
 import { FileRunStore } from "../run/FileRunStore.js";
@@ -81,7 +80,13 @@ export function defineProduct(definition, runtime) {
         builtinTools: [...enabledSet],
         defaultPermissionRules: permissionRules,
     };
-    registerPreset(agentPreset);
+    // The product's preset travels as a synthesized AgentModule instead of a
+    // process-global registerPreset(): each Engine the runner builds resolves
+    // presets from its own compiled composition.
+    const productModule = {
+        id: "product",
+        engine: { presets: [agentPreset], defaultPreset: agentPreset.name },
+    };
     // ── 2. Build evaluator from contract ──────────────────────────
     let evaluator;
     if (!contract?.evaluator) {
@@ -118,6 +123,7 @@ export function defineProduct(definition, runtime) {
             appendSystemPrompt: presetDef.appendPrompt,
             hooks: adapter?.hooks,
             customTools: customToolEntries.length > 0 ? customToolEntries : undefined,
+            modules: [productModule],
         },
         concurrency: contract?.concurrency ?? 1,
         runsDir,

package/dist/prompt/section-loader.d.ts

@@ -5,15 +5,9 @@
  * files to dist/prompt/sections so plain Node ESM can import core without a
  * custom .md loader.
  */
-/**
- * Register a custom prompt section at runtime.
- * This allows external presets to add their own sections.
- */
-export declare function registerSection(name: string, content: string): void;
 /**
  * Read a named prompt section. Returns the trimmed markdown content.
- * Looks up built-in sections first, then custom-registered sections.
- * Throws if the section name is not found.
+ * Contributed (module) sections win over built-ins; throws on unknown names.
  */
 export declare function loadSection(name: string, sections?: Readonly<Record<string, string>>): string;
 /**
@@ -21,6 +15,6 @@ export declare function loadSection(name: string, sections?: Readonly<Record<str
  */
 export declare function loadSections(names: readonly string[], sections?: Readonly<Record<string, string>>): string;
 /**
- * List all available section names (built-in + custom).
+ * List the built-in section names.
  */
 export declare function availableSections(): string[];

package/dist/prompt/section-loader.js

@@ -16,19 +16,9 @@ const BUILTIN_SECTIONS = {
     browser: readSectionFile("browser"),
     tone: readSectionFile("tone"),
 };
-/** Registry for custom sections added at runtime. */
-const _customSections = new Map();
-/**
- * Register a custom prompt section at runtime.
- * This allows external presets to add their own sections.
- */
-export function registerSection(name, content) {
-    _customSections.set(name, content);
-}
 /**
  * Read a named prompt section. Returns the trimmed markdown content.
- * Looks up built-in sections first, then custom-registered sections.
- * Throws if the section name is not found.
+ * Contributed (module) sections win over built-ins; throws on unknown names.
  */
 export function loadSection(name, sections) {
     const contributed = sections?.[name];
@@ -37,10 +27,7 @@ export function loadSection(name, sections) {
     const builtin = BUILTIN_SECTIONS[name];
     if (builtin !== undefined)
         return builtin.trim();
-    const custom = _customSections.get(name);
-    if (custom !== undefined)
-        return custom.trim();
-    const available = [...Object.keys(BUILTIN_SECTIONS), ..._customSections.keys()].join(", ");
+    const available = Object.keys(BUILTIN_SECTIONS).join(", ");
     throw new Error(`Unknown prompt section "${name}". Available sections: ${available}`);
 }
 /**
@@ -50,8 +37,8 @@ export function loadSections(names, sections) {
     return names.map((name) => loadSection(name, sections)).join("\n\n");
 }
 /**
- * List all available section names (built-in + custom).
+ * List the built-in section names.
  */
 export function availableSections() {
-    return [...Object.keys(BUILTIN_SECTIONS), ..._customSections.keys()];
+    return [...Object.keys(BUILTIN_SECTIONS)];
 }

package/dist/protocol/client.d.ts

@@ -31,6 +31,7 @@ export interface AgentRunOptions {
     model?: string;
     planMode?: boolean;
     behaviorMode?: RunBehaviorMode;
+    preset?: string;
     kind?: SessionKind;
 }
 export type BackgroundAgentCompletedHandler = (sessionId: string, event: BackgroundAgentCompletedEvent) => void;

package/dist/protocol/server.d.ts

@@ -18,7 +18,7 @@ import type { Engine } from "../engine/engine.js";
 import type { ValidatedSettings } from "../settings/schema.js";
 import { type ApprovalRouter } from "../tool-system/permission.js";
 import type { ChatSessionManager } from "./chat-session-manager.js";
-import type { ExtensionModule } from "../tool-system/capability-module.js";
+import type { ResolvedComposition } from "../composition/types.js";
 /**
  * Why a host-loopback request (Panel / Browser / workspace / credential) ended
  * without a result. These four used to collapse into one string — "declined or
@@ -109,12 +109,11 @@ export interface AgentServerOptions {
     /** Shared owner router; injectable for hosts/tests, process singleton by default. */
     approvalRouter?: ApprovalRouter;
     /**
-     * Extension modules whose protocol observers / run-param validators /
-     * hidden session kinds this server applies. Defaults to core's built-in
-     * pet extension so existing hosts keep the Pet projection channel.
-     * TODO(pet-out-of-core): drop the default once hosts register it explicitly.
+     * Compiled composition from the host root. The server consumes its
+     * protocol surface: observers, run-param validators, queries, hidden
+     * session kinds. Omitted → core-only (no protocol contributions).
      */
-    extensionModules?: readonly ExtensionModule[];
+    composition?: ResolvedComposition;
 }
 export declare class AgentServer {
     /** Host-supplied manager; requests route through the `chatManager` getter. */
@@ -140,13 +139,13 @@ export declare class AgentServer {
     private approvalConnectionUnregister;
     private disconnected;
     private readonly pendingApprovalTargets;
-    /** Extension modules this server consults for protocol-level hooks. */
-    private readonly extensionModules;
-    /** Protocol lifecycle observers created by extension modules (registration order). */
+    /** Module run-param validators from the resolved protocol composition. */
+    private readonly runValidators;
+    /** Protocol lifecycle observers created by module factories (module order). */
     private readonly protocolObservers;
     /** Extension-registered protocol method/query aliases (compat channel). */
     private readonly protocolQueryHandlers;
-    /** Union of extension hiddenSessionKinds, excluded from generic session lists. */
+    /** Union of module hiddenSessionKinds, excluded from generic session lists. */
     private readonly hiddenSessionKinds;
     /**
      * Last per-session EngineConfigSlice supplied by agent/run. Kept even after
@@ -254,7 +253,7 @@ export declare class AgentServer {
     private observeApprovalTransition;
     private observeSessionClosed;
     private observeServerClose;
-    /** Generic run-param shape checks plus each extension's domain validation. */
+    /** Generic run-param shape checks plus each module's domain validation. */
     private validateRunInput;
     private handleForkSession;
     private handleRun;

package/dist/protocol/server.js

@@ -15,6 +15,7 @@
  */
 import { Methods, ErrorCodes, createResponse, createErrorResponse, createNotification, isRequest, } from "./types.js";
 import { diskDefaultsFrom } from "../engine/engine.js";
+import { ISOLATED_TASK_BEHAVIOR_MODE } from "../engine/run-types.js";
 import { isProtectedSettingKey, SettingsManager } from "../settings/manager.js";
 import { getApprovalRouter, getInteractiveApprovalBackend, } from "../tool-system/permission.js";
 import { agentNotificationBus, notificationQueue, buildNotificationMessage, notificationEnvelopeToLegacyStreamEvent, } from "../tool-system/builtin/agent-notifications.js";
@@ -26,6 +27,8 @@ import { nanoid } from "nanoid";
 import { assertSafeSessionId, SessionManager } from "../session/session-manager.js";
 import { redactLlmConfig, maskSecretValue } from "./redact.js";
 import { redactSecrets } from "../logging/sanitize-messages.js";
+import { compileComposition } from "../composition/compiler.js";
+import { attachProtocolContributions } from "../composition/protocol-attach.js";
 import { computeEffectiveDisabledLists } from "../capability-control/disabled-lists.js";
 import { describePluginCommands, expandPluginCommandBody, scanPluginCommands, MAX_PLUGIN_COMMAND_ARGUMENT_CHARS, } from "../plugins/pluginCommandsLoader.js";
 function isValidRunAttachment(value) {
@@ -87,6 +90,13 @@ function runInputError(params) {
         (typeof params.behaviorMode !== "string" || params.behaviorMode.length === 0)) {
         return `invalid behavior mode: ${String(params.behaviorMode)}`;
     }
+    if (params.preset !== undefined &&
+        (typeof params.preset !== "string" ||
+            params.preset.length === 0 ||
+            params.preset.length > 128 ||
+            /[\r\n]/.test(params.preset))) {
+        return "preset must be a bounded non-empty string";
+    }
     for (const [field, value, maxItems] of [
         ["toolAllowlist", params.toolAllowlist, 32],
         ["skillAllowlist", params.skillAllowlist, 8],
@@ -122,7 +132,7 @@ function runInputError(params) {
         return "profileParams must be an object";
     }
     // Domain-specific run-param validation (e.g. behavior-mode vocabularies and
-    // extension-owned param shapes) lives in ExtensionModule.validateRunParams.
+    // extension-owned param shapes) lives in AgentModule protocol.validateRunParams.
     return null;
 }
 function goalExtensionInputError(params) {
@@ -303,13 +313,13 @@ export class AgentServer {
     approvalConnectionUnregister = null;
     disconnected = false;
     pendingApprovalTargets = new Map();
-    /** Extension modules this server consults for protocol-level hooks. */
-    extensionModules;
-    /** Protocol lifecycle observers created by extension modules (registration order). */
+    /** Module run-param validators from the resolved protocol composition. */
+    runValidators;
+    /** Protocol lifecycle observers created by module factories (module order). */
     protocolObservers = [];
     /** Extension-registered protocol method/query aliases (compat channel). */
     protocolQueryHandlers = new Map();
-    /** Union of extension hiddenSessionKinds, excluded from generic session lists. */
+    /** Union of module hiddenSessionKinds, excluded from generic session lists. */
     hiddenSessionKinds;
     /**
      * Last per-session EngineConfigSlice supplied by agent/run. Kept even after
@@ -408,14 +418,12 @@ export class AgentServer {
             throw new Error("AgentServer: either chatManager or engine must be supplied");
         }
         this.transport = options.transport;
-        // Protocol lifecycle observers. Each configured extension module may
-        // attach one; the server calls them at every lifecycle hook point and
-        // isolates per-observer failures. Core default-loads the pet extension
-        // until the pet domain moves out of core (see AgentServerOptions).
-        this.extensionModules = options.extensionModules ?? [];
-        this.hiddenSessionKinds = [
-            ...new Set(this.extensionModules.flatMap((module) => module.hiddenSessionKinds ?? [])),
-        ];
+        // Protocol surface from the compiled composition. Each contributing
+        // module may attach one observer; the server calls them at every
+        // lifecycle hook point and isolates per-observer failures.
+        const protocol = options.composition?.protocol ?? compileComposition({}).protocol;
+        this.runValidators = protocol.runValidators;
+        this.hiddenSessionKinds = protocol.hiddenSessionKinds.map((k) => k.key);
         const observerHost = {
             getLiveSessionSnapshot: () => this.chatManager?.getLiveSessionSnapshot().sessions ?? [],
             projectionGeneration: () => this.workerGeneration(),
@@ -433,16 +441,13 @@ export class AgentServer {
                 this.protocolQueryHandlers.set(type, handler);
             },
         };
-        for (const module of this.extensionModules) {
-            if (!module.createProtocolObserver)
-                continue;
-            try {
-                this.protocolObservers.push(module.createProtocolObserver(observerHost));
-            }
-            catch (err) {
-                logger.warn(`protocol observer init failed for extension ${module.id}: ${err.message}`);
-            }
-        }
+        attachProtocolContributions({
+            protocol,
+            host: observerHost,
+            observers: this.protocolObservers,
+            queryHandlers: this.protocolQueryHandlers,
+            warn: (message) => logger.warn(message),
+        });
         // Wire up incoming messages
         this.transport.onMessage((msg) => {
             if (isRequest(msg)) {
@@ -936,15 +941,13 @@ export class AgentServer {
     observeServerClose() {
         this.forEachObserver("onServerClose", (observer) => observer.onServerClose?.());
     }
-    /** Generic run-param shape checks plus each extension's domain validation. */
+    /** Generic run-param shape checks plus each module's domain validation. */
     validateRunInput(params) {
         const generic = runInputError(params);
         if (generic)
             return generic;
-        for (const module of this.extensionModules) {
-            if (!module.validateRunParams)
-                continue;
-            const error = module.validateRunParams(params);
+        for (const validator of this.runValidators) {
+            const error = validator.value(params);
             if (error)
                 return error;
         }
@@ -1144,6 +1147,8 @@ export class AgentServer {
         const sessionConfig = {
             cwd: params.cwd,
             projectTrusted: params.projectTrusted,
+            preset: params.preset ??
+                (params.behaviorMode === ISOLATED_TASK_BEHAVIOR_MODE ? "general" : undefined),
             maxTurns: params.maxTurns,
             maxContextTokens: params.maxContextTokens,
             goal: typeof params.goal === "string" || (params.goal != null && typeof params.goal === "object")

package/dist/protocol/types.d.ts

@@ -126,6 +126,11 @@ export interface RunParams {
     planMode?: boolean;
     /** Named behavior profile for a product-specific per-run interaction mode. */
     behaviorMode?: RunBehaviorMode;
+    /**
+     * Preset used when creating this run's fresh Session. Host-owned bounded
+     * Tasks use this to avoid inheriting the interactive product default.
+     */
+    preset?: string;
     /** Host-authorized per-run hard tool allowlist. Empty means no tools. */
     toolAllowlist?: string[];
     /** Host-authorized per-run hard Skill allowlist. Empty means no Skills. */

package/dist/run/EngineRunner.d.ts

@@ -13,7 +13,7 @@ import type { ClientDefaults, LLMConfig, RegisteredTool } from "../types.js";
 import type { RunSnapshot, RunExecutionContext, RunExecutionResult } from "./types.js";
 import { type RunLifecycleHooks } from "./RunApprovalBackend.js";
 import type { ApprovalBackend } from "../tool-system/permission.js";
-import type { CapabilityModule } from "../capabilities/index.js";
+import type { AgentModule } from "../composition/types.js";
 /** Unattended runs (those with an injected approval backend) run headless so
  *  the in-process AgentServer does not wire an interactive askUser. Exported
  *  for unit testing the decision rule. */
@@ -73,7 +73,8 @@ export interface EngineRunnerConfig {
     permissionMode?: EngineConfig["permissionMode"];
     enabledBuiltinTools?: string[];
     disabledBuiltinTools?: string[];
-    capabilities?: readonly CapabilityModule[];
+    /** AgentModules installed into each Engine this runner builds. */
+    modules?: readonly AgentModule[];
     customSystemPrompt?: string;
     appendSystemPrompt?: string;
     mcpServers?: EngineConfig["mcpServers"];

package/dist/run/EngineRunner.js

@@ -86,7 +86,7 @@ export class EngineRunner {
             preset: run.preset,
             enabledBuiltinTools: this.config.enabledBuiltinTools,
             disabledBuiltinTools: this.config.disabledBuiltinTools,
-            capabilities: this.config.capabilities,
+            modules: this.config.modules,
             customSystemPrompt: this.config.customSystemPrompt,
             // NOTE: callers must not pass appendSystemPrompt in engineConfigOverrides
             // below, or it will clobber this composed (automation note + host) value.