akm-cli 0.9.0-rc.0 → 0.9.0-rc.2

package/dist/core/config/config-schema.js

@@ -34,7 +34,11 @@
  *   enforced at save time via `superRefine` on the top-level schema.
  */
 import { z } from "zod";
-import { VALID_HARNESS_IDS } from "./config-types.js";
+import { validateExtraParams } from "../extra-params.js";
+import { HARNESS_BY_ID, VALID_HARNESS_IDS } from "./config-types.js";
+import { BUILTIN_IMPROVE_STRATEGY_NAMES, ENGINE_NAME_PATTERN_SOURCE, IMPROVE_PROCESS_ENGINE_CAPABILITIES, } from "./engine-semantics.js";
+/** Persisted config schema version. Package prerelease/patch versions do not change this value. */
+export const CURRENT_CONFIG_VERSION = "0.9.0";
 // ── Reusable atomic schemas ─────────────────────────────────────────────────
 /** Positive integer (used for tokens, timeouts, batch sizes). */
 const positiveInt = z.number().int().positive();
@@ -49,6 +53,57 @@ const nonEmptyString = z
 const httpUrl = z.string().refine((v) => v.startsWith("http://") || v.startsWith("https://"), {
     message: "endpoint must start with http:// or https://",
 });
+const ENGINE_NAME_PATTERN = new RegExp(ENGINE_NAME_PATTERN_SOURCE);
+const ENV_REFERENCE_PATTERN = /^\$[A-Za-z_][A-Za-z0-9_]*$|^\$\{[A-Za-z_][A-Za-z0-9_]*\}$/;
+const engineName = z
+    .string()
+    .max(63)
+    .regex(ENGINE_NAME_PATTERN, "names must be lowercase kebab-case and must not begin with reserved akm-");
+const chatCompletionsEndpoint = z.string().superRefine((value, ctx) => {
+    try {
+        const url = new URL(value);
+        if (url.protocol !== "http:" && url.protocol !== "https:") {
+            ctx.addIssue({ code: z.ZodIssueCode.custom, message: "endpoint must use http:// or https://" });
+        }
+        if (url.username || url.password || url.search || url.hash || !url.pathname.endsWith("/chat/completions")) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: "endpoint must be a credential-free OpenAI chat-completions URL without query or fragment",
+            });
+        }
+    }
+    catch {
+        ctx.addIssue({ code: z.ZodIssueCode.custom, message: "endpoint must be a complete URL" });
+    }
+});
+const ExtraParamsSchema = z.record(z.unknown()).superRefine((value, ctx) => {
+    for (const issue of validateExtraParams(value)) {
+        ctx.addIssue({ code: z.ZodIssueCode.custom, path: issue.path, message: issue.message });
+    }
+});
+function normalizeAliasKeys(raw, ctx) {
+    if (!raw || typeof raw !== "object" || Array.isArray(raw))
+        return raw;
+    const normalized = {};
+    const originalByKey = new Map();
+    for (const [key, value] of Object.entries(raw)) {
+        const lower = key.toLowerCase();
+        const previous = originalByKey.get(lower);
+        if (previous !== undefined) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                path: [key],
+                message: `alias collides case-insensitively with ${previous}`,
+            });
+            continue;
+        }
+        originalByKey.set(lower, key);
+        normalized[lower] = value;
+    }
+    return normalized;
+}
+const ModelAliasMapSchema = z.preprocess((raw, ctx) => normalizeAliasKeys(raw, ctx), z.record(z.string().min(1), z.string().min(1)));
+const GlobalModelAliasesSchema = z.preprocess((raw, ctx) => normalizeAliasKeys(raw, ctx), z.record(z.string().min(1), z.record(z.string().min(1), z.string().min(1))));
 // ── Feedback failure modes (F-3 / #384) ─────────────────────────────────────
 /**
  * Curated taxonomy of failure modes for negative feedback.
@@ -71,8 +126,8 @@ const LlmCapabilitiesSchema = z
 })
     .passthrough();
 /**
- * Connection config used for both top-level `llm` (after migration) and
- * `profiles.llm[*]`. `model` is required at schema level — partial entries
+ * OpenAI-compatible connection fields shared by named LLM engines and bounded
+ * internal call helpers. `model` is required at schema level — partial entries
  * created by `akm config set llm.endpoint <url>` (where model is left absent)
  * are normalized to `model: ""` *before* Zod sees them by the load-time
  * pre-Zod migrator hook, so this strict shape gates CLI writes without
@@ -86,12 +141,11 @@ export const LlmConnectionConfigSchema = z
     apiKey: z.string().optional(),
     temperature: z.number().finite().optional(),
     maxTokens: positiveInt.optional(),
-    timeoutMs: positiveInt.optional(),
+    timeoutMs: z.union([positiveInt, z.null()]).optional(),
     concurrency: positiveInt.optional(),
     capabilities: LlmCapabilitiesSchema.optional(),
-    extraParams: z.record(z.unknown()).optional(),
+    extraParams: ExtraParamsSchema.optional(),
     contextLength: positiveInt.optional(),
-    judgeModel: z.string().min(1).optional(),
     enableThinking: z.boolean().optional(),
 })
     .passthrough();
@@ -117,7 +171,7 @@ export const EmbeddingConnectionConfigSchema = z
     provider: z.string().optional(),
     endpoint: z.string().optional(),
     model: z.string().optional(),
-    apiKey: z.string().optional(),
+    apiKey: z.string().regex(ENV_REFERENCE_PATTERN, `apiKey must be $VAR or \${VAR}`).optional(),
     dimension: positiveInt.optional(),
     localModel: z.string().min(1).optional(),
     maxTokens: positiveInt.optional(),
@@ -127,34 +181,94 @@ export const EmbeddingConnectionConfigSchema = z
     ollamaOptions: EmbeddingOllamaOptionsSchema.optional(),
 })
     .passthrough();
-// ── Agent profiles ──────────────────────────────────────────────────────────
+// ── Agent engines ───────────────────────────────────────────────────────────
 // Derives from the canonical VALID_HARNESS_IDS (#565) so the Zod gate cannot
 // drift from the TS union / parse check / setup detection.
 const AgentPlatformSchema = z.enum(VALID_HARNESS_IDS);
-export const AgentProfileConfigSchema = z
+export const LlmInvocationOverridesSchema = z
+    .object({
+    temperature: z.number().finite().optional(),
+    maxTokens: positiveInt.optional(),
+    supportsJsonSchema: z.boolean().optional(),
+    extraParams: ExtraParamsSchema.optional(),
+    contextLength: positiveInt.optional(),
+    enableThinking: z.boolean().optional(),
+})
+    .passthrough();
+const LlmEngineSchema = z
     .object({
-    platform: AgentPlatformSchema,
-    bin: z.string().min(1).optional(),
+    kind: z.literal("llm"),
+    provider: z.string().optional(),
+    endpoint: chatCompletionsEndpoint,
+    model: nonEmptyString,
+    apiKey: z.string().regex(ENV_REFERENCE_PATTERN, `apiKey must be $VAR or \${VAR}`).optional(),
+    temperature: z.number().finite().optional(),
+    maxTokens: positiveInt.optional(),
+    timeoutMs: z.union([positiveInt, z.null()]).optional(),
+    concurrency: positiveInt.optional(),
+    supportsJsonSchema: z.boolean().optional(),
+    extraParams: ExtraParamsSchema.optional(),
+    contextLength: positiveInt.optional(),
+    enableThinking: z.boolean().optional(),
+})
+    .passthrough()
+    .superRefine((value, ctx) => {
+    for (const key of ["platform", "bin", "args", "workspace", "modelAliases", "llmEngine"]) {
+        if (key in value)
+            ctx.addIssue({ code: z.ZodIssueCode.custom, path: [key], message: `${key} is not valid on an LLM engine` });
+    }
+});
+const AgentEngineSchema = z
+    .object({
+    kind: z.literal("agent"),
+    platform: AgentPlatformSchema.refine((platform) => HARNESS_BY_ID.get(platform)?.capabilities.agentDispatch === true, {
+        message: "platform does not support agent dispatch",
+    }),
+    bin: nonEmptyString.optional(),
     args: z.array(z.string()).optional(),
-    workspace: z.string().min(1).optional(),
-    model: z.string().min(1).optional(),
-    // Per-call timeout (ms) used when a command does not pass an explicit
-    // timeout (e.g. `akm wiki ingest` without `--timeout-ms`). null = no
-    // timeout. Honored by resolveAgentProfile (integrations/agent/config.ts).
+    workspace: nonEmptyString.optional(),
+    model: nonEmptyString.optional(),
     timeoutMs: z.union([positiveInt, z.null()]).optional(),
-    // Per-profile model aliases: lowercase alias → exact model string for
-    // this profile's CLI. Highest-precedence tier in resolveModel
-    // (integrations/agent/model-aliases.ts) — beats the config-root
-    // `modelAliases` table and the built-in opus/sonnet/haiku entries.
-    modelAliases: z.record(z.string().min(1), z.string().min(1)).optional(),
+    modelAliases: ModelAliasMapSchema.optional(),
+    llmEngine: engineName.optional(),
 })
-    .passthrough();
+    .passthrough()
+    .superRefine((value, ctx) => {
+    for (const key of [
+        "provider",
+        "endpoint",
+        "apiKey",
+        "temperature",
+        "maxTokens",
+        "concurrency",
+        "supportsJsonSchema",
+        "extraParams",
+        "contextLength",
+        "enableThinking",
+    ]) {
+        if (key in value)
+            ctx.addIssue({ code: z.ZodIssueCode.custom, path: [key], message: `${key} is not valid on an agent engine` });
+    }
+    if (value.platform !== "opencode-sdk" && value.llmEngine !== undefined) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["llmEngine"],
+            message: "llmEngine is only valid on opencode-sdk",
+        });
+    }
+    if (value.platform === "opencode-sdk" && value.args !== undefined) {
+        ctx.addIssue({ code: z.ZodIssueCode.custom, path: ["args"], message: "args is not valid on opencode-sdk" });
+    }
+});
+export const EngineConfigSchema = z.union([LlmEngineSchema, AgentEngineSchema]);
+export const EnginesSchema = z.record(engineName, EngineConfigSchema);
 // ── Improve profile / process ──────────────────────────────────────────────
 export const ImproveProcessConfigSchema = z
     .object({
+    engine: engineName.optional(),
+    model: nonEmptyString.optional(),
+    llm: LlmInvocationOverridesSchema.optional(),
     enabled: z.boolean().optional(),
-    mode: z.enum(["llm", "agent", "sdk"]).optional(),
-    profile: z.string().min(1).optional(),
     timeoutMs: z.union([positiveInt, z.null()]).optional(),
     allowedTypes: z.array(z.string().min(1)).optional(),
     // Consolidate process: minimum eligible-memory pool size below which the
@@ -226,6 +340,10 @@ export const ImproveProcessConfigSchema = z
     // high-signal-first sweep). Unset = process all eligible (current
     // behavior). Only meaningful on `graphExtraction`.
     topN: positiveInt.optional(),
+    // Improve-owned graph extraction scope and batching. These are passed to
+    // the invocation directly and never inherited from standalone index.graph.
+    includeTypes: z.array(z.string().min(1)).min(1).optional(),
+    batchSize: positiveInt.optional(),
     // graphExtraction process: full-corpus scan. When true, graph extraction
     // runs on ALL stash files instead of only files touched by actionable refs
     // in the current run. Used by the `graph-refresh` built-in profile / a
@@ -399,14 +517,34 @@ export const ImproveProcessConfigSchema = z
     rejectEmpty: z.boolean().optional(),
     judgment: z
         .object({
-        mode: z.enum(["llm", "agent", "sdk"]).optional(),
-        profile: z.string().min(1).optional(),
+        engine: engineName.optional(),
+        model: nonEmptyString.optional(),
         timeoutMs: z.union([positiveInt, z.null()]).optional(),
+        llm: LlmInvocationOverridesSchema.optional(),
     })
         .passthrough()
         .optional(),
 })
-    .passthrough();
+    .passthrough()
+    .superRefine((value, ctx) => {
+    for (const key of ["mode", "profile"]) {
+        if (key in value) {
+            ctx.addIssue({ code: z.ZodIssueCode.custom, path: [key], message: `${key} is retired; use engine` });
+        }
+    }
+    const judgment = value.judgment;
+    if (judgment) {
+        for (const key of ["mode", "profile"]) {
+            if (key in judgment) {
+                ctx.addIssue({
+                    code: z.ZodIssueCode.custom,
+                    path: ["judgment", key],
+                    message: `${key} is retired; use engine`,
+                });
+            }
+        }
+    }
+});
 const ImproveProfileProcessesSchema = z
     .object({
     reflect: ImproveProcessConfigSchema.optional(),
@@ -439,6 +577,10 @@ const ImproveProfileProcessesSchema = z
 });
 export const ImproveProfileConfigSchema = z
     .object({
+    engine: engineName.optional(),
+    model: nonEmptyString.optional(),
+    timeoutMs: z.union([positiveInt, z.null()]).optional(),
+    llm: LlmInvocationOverridesSchema.optional(),
     description: z.string().min(1).optional(),
     processes: ImproveProfileProcessesSchema.optional(),
     autoAccept: nonNegativeNumber.optional(),
@@ -463,19 +605,12 @@ export const ImproveProfileConfigSchema = z
         .optional(),
 })
     .passthrough();
-// ── Profiles / defaults ────────────────────────────────────────────────────
-export const ProfilesSchema = z
-    .object({
-    llm: z.record(z.string(), LlmProfileConfigSchema).optional(),
-    agent: z.record(z.string(), AgentProfileConfigSchema).optional(),
-    improve: z.record(z.string(), ImproveProfileConfigSchema).optional(),
-})
-    .passthrough();
+// ── Defaults ───────────────────────────────────────────────────────────────
 export const DefaultsSchema = z
     .object({
-    llm: z.string().min(1).optional(),
-    agent: z.string().min(1).optional(),
-    improve: z.string().min(1).optional(),
+    engine: engineName.optional(),
+    llmEngine: engineName.optional(),
+    improveStrategy: engineName.optional(),
 })
     .passthrough();
 // ── Sources / registries / installed ────────────────────────────────────────
@@ -503,6 +638,13 @@ export const SourceConfigEntrySchema = z
 })
     .passthrough()
     .superRefine((entry, ctx) => {
+    if (!["filesystem", "git", "website", "npm"].includes(entry.type)) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["type"],
+            message: `unsupported source type "${entry.type}"; expected filesystem, git, website, or npm`,
+        });
+    }
     if (entry.writable === true && (entry.type === "website" || entry.type === "npm")) {
         ctx.addIssue({
             code: z.ZodIssueCode.custom,
@@ -673,6 +815,7 @@ const ImproveCollapseDetectorSchema = z
     .passthrough();
 export const ImproveConfigSchema = z
     .object({
+    strategies: z.record(engineName, ImproveProfileConfigSchema).optional(),
     utilityDecay: ImproveUtilityDecaySchema.optional(),
     eventRetentionDays: nonNegativeNumber.optional(),
     calibration: ImproveCalibrationSchema.optional(),
@@ -694,9 +837,8 @@ const GRAPH_EXTRACTION_INCLUDE_TYPES_ALLOWED = [
     "wiki",
     "fact",
 ];
-const INDEX_PASS_PROVIDER_KEYS = new Set([
+const INDEX_PASS_RETIRED_KEYS = new Set([
     "endpoint",
-    "model",
     "provider",
     "apiKey",
     "baseUrl",
@@ -705,16 +847,19 @@ const INDEX_PASS_PROVIDER_KEYS = new Set([
     "capabilities",
 ]);
 const INDEX_PASS_KNOWN_KEYS = new Set([
+    "engine",
+    "model",
+    "timeoutMs",
+    "enabled",
     "llm",
     "graphExtractionBatchSize",
     "graphExtractionIncludeTypes",
-    "memoryInferenceBatchSize",
     "lazyGraphExtraction",
 ]);
 /**
  * Per-pass `index.<pass>` entry. Uses preprocess + manual validation so we can
- * emit the legacy parser's targeted error messages ("Duplicate LLM provider
- * configuration", "Unknown key `index.<pass>.<key>`", "expected a boolean")
+ * emit targeted error messages ("Retired or misplaced engine setting",
+ * "Unknown key `index.<pass>.<key>`")
  * instead of Zod's generic `Unrecognized key` / `Expected boolean, received
  * string` strings — keeps `akm` startup errors actionable.
  */
@@ -724,38 +869,34 @@ export const IndexPassConfigSchema = z.preprocess((raw, ctx) => {
     }
     const obj = raw;
     for (const key of Object.keys(obj)) {
-        if (INDEX_PASS_PROVIDER_KEYS.has(key)) {
+        if (INDEX_PASS_RETIRED_KEYS.has(key)) {
             ctx.addIssue({
                 code: z.ZodIssueCode.custom,
-                message: `Duplicate LLM provider configuration: \`${[...(ctx.path ?? []), key].join(".")}\` is not allowed. ` +
-                    "Configure provider/model/endpoint under `profiles.llm` only; per-pass entries support `{ llm: false }` opt-out.",
+                message: `Retired or misplaced engine setting: \`${[...(ctx.path ?? []), key].join(".")}\` is not allowed. ` +
+                    "Select a named engine and use typed invocation fields instead.",
             });
             return raw;
         }
         if (!INDEX_PASS_KNOWN_KEYS.has(key)) {
             ctx.addIssue({
                 code: z.ZodIssueCode.custom,
-                message: `Unknown key \`${[...(ctx.path ?? []), key].join(".")}\`. Per-pass entries support \`llm\` ` +
-                    "(boolean opt-out), `graphExtractionBatchSize`, `graphExtractionIncludeTypes`, " +
-                    "`memoryInferenceBatchSize`, and `lazyGraphExtraction`.",
+                message: `Unknown key \`${[...(ctx.path ?? []), key].join(".")}\`. Per-pass entries support ` +
+                    "`engine`, `model`, `timeoutMs`, `enabled`, `llm`, `graphExtractionBatchSize`, " +
+                    "`graphExtractionIncludeTypes`, and `lazyGraphExtraction`.",
             });
             return raw;
         }
     }
-    if ("llm" in obj && typeof obj.llm !== "boolean") {
-        ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: `Invalid \`${[...(ctx.path ?? []), "llm"].join(".")}\`: expected a boolean (true to use the default LLM profile, false to opt out). Got ${typeof obj.llm}.`,
-        });
-        return raw;
-    }
     return raw;
 }, z
     .object({
-    llm: z.boolean().optional(),
+    engine: engineName.optional(),
+    model: nonEmptyString.optional(),
+    timeoutMs: z.union([positiveInt, z.null()]).optional(),
+    enabled: z.boolean().optional(),
+    llm: LlmInvocationOverridesSchema.optional(),
     graphExtractionBatchSize: positiveInt.optional(),
     graphExtractionIncludeTypes: z.array(z.enum(GRAPH_EXTRACTION_INCLUDE_TYPES_ALLOWED)).nonempty().optional(),
-    memoryInferenceBatchSize: positiveInt.optional(),
     lazyGraphExtraction: z.boolean().optional(),
 })
     .passthrough());
@@ -773,35 +914,61 @@ const StalenessDetectionSchema = z
     thresholdDays: positiveInt.optional(),
 })
     .passthrough();
+const IndexDefaultsSchema = z
+    .object({
+    engine: engineName.optional(),
+    model: nonEmptyString.optional(),
+    timeoutMs: z.union([positiveInt, z.null()]).optional(),
+    llm: LlmInvocationOverridesSchema.optional(),
+})
+    .passthrough();
 /**
  * Index config is a union of reserved feature sections and per-pass entries.
  * Passthrough so per-pass entries (keyed by arbitrary pass names like `graph`,
  * `enrichment`) can live next to the reserved keys.
  *
+ * Reserved scalar key `indexBodyOpening` (stash-conventions SPEC-8, default
+ * false): when true, the metadata pass captures the first prose paragraph of
+ * each markdown asset body into `entry.bodyOpening`, which folds into the
+ * lowest-weight `content` FTS column and the embedding text. It is a boolean,
+ * not a per-pass object — the preprocess below exempts it from the
+ * object-shape check so it never routes into the per-pass catchall.
+ *
  * The outer preprocess emits the legacy parser's actionable error messages
  * for the two most common type-shape mistakes:
  *   - An array at the `index` block.
  *   - A non-object at `index.<passName>`.
- * Inner field validation (graphExtractionIncludeTypes enum, llm boolean,
- * provider-key rejection) is delegated to {@link IndexPassConfigSchema}.
+ * Inner field validation (graphExtractionIncludeTypes enum, invocation
+ * overrides, provider-key rejection) is delegated to {@link IndexPassConfigSchema}.
  */
-export const IndexConfigSchema = z.preprocess((raw, ctx) => {
+const IndexConfigRuntimeSchema = z.preprocess((raw, ctx) => {
     if (raw === undefined || raw === null)
         return raw;
     if (Array.isArray(raw)) {
         ctx.addIssue({
             code: z.ZodIssueCode.custom,
-            message: 'Invalid `index` config: expected an object keyed by pass name (e.g. `{ "enrichment": { "llm": false } }`).',
+            message: 'Invalid `index` config: expected an object keyed by pass name (e.g. `{ "enrichment": { "enabled": false } }`).',
         });
         return raw;
     }
     if (typeof raw !== "object")
         return raw;
     for (const [passName, value] of Object.entries(raw)) {
+        if (passName === "indexBodyOpening") {
+            if (typeof value !== "boolean") {
+                ctx.addIssue({
+                    code: z.ZodIssueCode.custom,
+                    message: "Invalid `index.indexBodyOpening`: expected a boolean (true to index the first body paragraph " +
+                        `of markdown assets into search). Got ${Array.isArray(value) ? "array" : typeof value}.`,
+                });
+                return raw;
+            }
+            continue;
+        }
         if (typeof value !== "object" || value === null || Array.isArray(value)) {
             ctx.addIssue({
                 code: z.ZodIssueCode.custom,
-                message: `Invalid \`index.${passName}\` config: expected an object like \`{ "llm": false }\`.`,
+                message: `Invalid \`index.${passName}\` config: expected an object like \`{ "enabled": false }\`.`,
             });
             return raw;
         }
@@ -828,10 +995,43 @@ export const IndexConfigSchema = z.preprocess((raw, ctx) => {
     return raw;
 }, z
     .object({
+    defaults: IndexDefaultsSchema.optional(),
     metadataEnhance: MetadataEnhanceSchema.optional(),
     stalenessDetection: StalenessDetectionSchema.optional(),
+    indexBodyOpening: z
+        .boolean()
+        .optional()
+        .describe("Index the first prose paragraph of each markdown asset body (capped at 280 chars) into the " +
+        "lowest-weight `content` search column and the embedding text (default false). Secret/env files " +
+        "and session-kind memories are never captured. Toggling the flag changes indexed text: run " +
+        "`akm index --full` afterwards to re-extract every entry and regenerate embeddings, and re-mint " +
+        "collapse-detector canary baselines via `akm improve canary --refresh`."),
 })
     .catchall(IndexPassConfigSchema));
+// The runtime catchall correctly validates arbitrary pass objects, but its
+// inferred string index signature also covers reserved scalar keys. Publish a
+// precise output type while retaining the stricter runtime and JSON schemas.
+export const IndexConfigSchema = IndexConfigRuntimeSchema;
+// ── Workflow engine ─────────────────────────────────────────────────────────
+/**
+ * Workflow-engine settings (`workflow`).
+ *
+ * `maxConcurrency` is the engine-wide ceiling on concurrent units for native
+ * fan-out (`akm workflow run`). It replaces the hard-coded `min(16, cores−2)`
+ * cap (which matched Claude Code) with a user knob:
+ *   - UNSET  → the CPU-derived default `min(16, max(1, cores−2))`.
+ *   - SET    → the explicit positive integer, CLAMPED at read time to
+ *     `[1, WORKFLOW_MAX_CONCURRENCY_CEILING]` (64). Values above the ceiling
+ *     are clamped, not rejected, so a config shared across machines with wildly
+ *     different core counts never hard-fails validation.
+ * The R3 brief/report driver surface does NOT consult this — drivers own their
+ * own parallelism (the engine only caps native dispatch).
+ */
+export const WorkflowConfigSchema = z
+    .object({
+    maxConcurrency: positiveInt.optional(),
+})
+    .passthrough();
 // ── Setup-derived recommendations ──────────────────────────────────────────
 /**
  * Cron-style schedule hints derived by `akm setup --reset-recommended`.
@@ -863,8 +1063,8 @@ export const SetupConfigSchema = z
  * one-time 0.7→0.8 input transforms before the schema sees the value.
  */
 export const AkmConfigShape = {
-    configVersion: z.union([z.string().min(1), z.number()]).optional(),
-    profiles: ProfilesSchema.optional(),
+    configVersion: z.literal(CURRENT_CONFIG_VERSION),
+    engines: EnginesSchema.optional(),
     defaults: DefaultsSchema.optional(),
     // Global model-alias tiers: alias → platform → exact model string, with a
     // reserved `"*"` platform key as fallback. Lets workflows/callers name a
@@ -874,7 +1074,7 @@ export const AkmConfigShape = {
     // builder resolves against ("claude", "opencode", "opencode-sdk", or a
     // custom profile's name for the default builder) — unknown keys are inert.
     // Precedence: profile modelAliases > this table > built-in aliases.
-    modelAliases: z.record(z.string().min(1), z.record(z.string().min(1), z.string().min(1))).optional(),
+    modelAliases: GlobalModelAliasesSchema.optional(),
     stashDir: nonEmptyString.optional(),
     semanticSearchMode: z.enum(["off", "auto"]).default("auto"),
     embedding: EmbeddingConnectionConfigSchema.optional(),
@@ -895,10 +1095,123 @@ export const AkmConfigShape = {
     feedback: FeedbackConfigSchema.optional(),
     archiveRetentionDays: nonNegativeNumber.optional(),
     improve: ImproveConfigSchema.optional(),
+    workflow: WorkflowConfigSchema.optional(),
     setup: SetupConfigSchema.optional(),
 };
 export const AkmConfigBaseSchema = z.object(AkmConfigShape).passthrough();
 export const AkmConfigSchema = AkmConfigBaseSchema.superRefine((config, ctx) => {
+    const raw = config;
+    for (const key of ["profiles", "llm", "agent", "features", "stashes"]) {
+        if (key in raw) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                path: [key],
+                message: `${key} is retired in 0.9; configure engines and improve.strategies instead`,
+            });
+        }
+    }
+    for (const key of ["llm", "agent", "improve"]) {
+        if (config.defaults && key in config.defaults) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                path: ["defaults", key],
+                message: `defaults.${key} is retired in 0.9`,
+            });
+        }
+    }
+    for (const [name, engine] of Object.entries(config.engines ?? {})) {
+        if (engine.kind === "agent" && engine.llmEngine) {
+            const fallback = config.engines?.[engine.llmEngine];
+            if (!fallback || fallback.kind !== "llm") {
+                ctx.addIssue({
+                    code: z.ZodIssueCode.custom,
+                    path: ["engines", name, "llmEngine"],
+                    message: "llmEngine must name an LLM engine",
+                });
+            }
+        }
+    }
+    const defaultEngine = config.defaults?.engine;
+    if (defaultEngine && !config.engines?.[defaultEngine]) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["defaults", "engine"],
+            message: "engine does not name a configured engine",
+        });
+    }
+    const defaultLlm = config.defaults?.llmEngine;
+    if (defaultLlm && config.engines?.[defaultLlm]?.kind !== "llm") {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["defaults", "llmEngine"],
+            message: "llmEngine must name an LLM engine",
+        });
+    }
+    const defaultStrategy = config.defaults?.improveStrategy;
+    if (defaultStrategy &&
+        !BUILTIN_IMPROVE_STRATEGY_NAMES.includes(defaultStrategy) &&
+        !config.improve?.strategies?.[defaultStrategy]) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["defaults", "improveStrategy"],
+            message: "improveStrategy does not name a built-in or configured strategy",
+        });
+    }
+    for (const [strategyName, strategy] of Object.entries(config.improve?.strategies ?? {})) {
+        const strategyEngine = strategy.engine;
+        if (strategyEngine) {
+            const engine = config.engines?.[strategyEngine];
+            if (!engine || engine.kind !== "llm") {
+                ctx.addIssue({
+                    code: z.ZodIssueCode.custom,
+                    path: ["improve", "strategies", strategyName, "engine"],
+                    message: engine ? "strategy engine must be an LLM engine" : "engine does not name a configured engine",
+                });
+            }
+        }
+        for (const [processName, process] of Object.entries(strategy.processes ?? {})) {
+            const processConfig = process;
+            const capability = IMPROVE_PROCESS_ENGINE_CAPABILITIES[processName];
+            if (processConfig.engine && capability === null) {
+                ctx.addIssue({
+                    code: z.ZodIssueCode.custom,
+                    path: ["improve", "strategies", strategyName, "processes", processName, "engine"],
+                    message: `${processName} does not dispatch an engine`,
+                });
+            }
+            else {
+                const processEngine = processConfig.engine ?? strategyEngine;
+                if (processEngine && capability === "llm") {
+                    const engine = config.engines?.[processEngine];
+                    if (!engine || engine.kind !== "llm") {
+                        ctx.addIssue({
+                            code: z.ZodIssueCode.custom,
+                            path: ["improve", "strategies", strategyName, "processes", processName, "engine"],
+                            message: engine ? `${processName} requires an LLM engine` : "engine does not name a configured engine",
+                        });
+                    }
+                }
+                else if (processConfig.engine && capability === "runner" && !config.engines?.[processConfig.engine]) {
+                    ctx.addIssue({
+                        code: z.ZodIssueCode.custom,
+                        path: ["improve", "strategies", strategyName, "processes", processName, "engine"],
+                        message: "engine does not name a configured engine",
+                    });
+                }
+            }
+            const judgmentEngine = processConfig.judgment?.engine;
+            if (judgmentEngine) {
+                const engine = config.engines?.[judgmentEngine];
+                if (!engine) {
+                    ctx.addIssue({
+                        code: z.ZodIssueCode.custom,
+                        path: ["improve", "strategies", strategyName, "processes", processName, "judgment", "engine"],
+                        message: "engine does not name a configured engine",
+                    });
+                }
+            }
+        }
+    }
     // #464.a: defaultWriteTarget must name a configured source when sources
     // are present. With no sources configured, error out instead of silently
     // accepting (no implicit "first writable" fallback — see locked decision 3).

package/dist/core/config/config-types.js

@@ -5,12 +5,12 @@
 // is the single source of truth replacing the previously-disconnected
 // registries. config ← harnesses is the only import direction (harnesses/ is a
 // dependency-graph leaf), so there is no cycle.
-import { VALID_HARNESS_IDS } from "../../integrations/harnesses/index.js";
+import { HARNESS_BY_ID, VALID_HARNESS_IDS } from "../../integrations/harnesses/index.js";
 /**
  * Canonical list of valid agent harness / platform ids. Re-exported from the
  * unified harness registry (#562) so the Zod `AgentPlatformSchema` enum, the
- * `AgentProfileConfig` platform union, and setup's `DetectedHarness` union all
+ * agent-engine platform union, and setup's `DetectedHarness` union all
  * derive from one place and cannot drift. Add a harness in
  * `src/integrations/harnesses/index.ts`.
  */
-export { VALID_HARNESS_IDS };
+export { HARNESS_BY_ID, VALID_HARNESS_IDS };