zam-core 0.10.3 → 0.10.5

package/dist/cli/app.js

@@ -2176,6 +2176,56 @@ async function listPersonalCards(db, userId, options) {
   }
   return rows;
 }
+function curriculumTopicScopeClause() {
+  return `(t.topic_id = ? OR t.topic_id LIKE ? || '@%')`;
+}
+function tokenMatchesCurriculumTopicScope(token, provider, topicId) {
+  if (token.provider !== provider || !token.topic_id) return false;
+  return token.topic_id === topicId || token.topic_id.startsWith(`${topicId}@`);
+}
+async function deleteCurriculumCardForUser(db, userId, slug, provider, topicId) {
+  const token = await getTokenBySlug(db, slug);
+  if (!token) return false;
+  if (!tokenMatchesCurriculumTopicScope(token, provider, topicId)) {
+    throw new Error(
+      `Token "${slug}" is not removable for curriculum topic "${topicId}"`
+    );
+  }
+  const card = await getCard(db, token.id, userId);
+  if (!card) return false;
+  await deleteCardForUser(db, token.id, userId);
+  return true;
+}
+async function countUserCardsForCurriculumTopic(db, userId, provider, topicId) {
+  const row = await db.prepare(
+    `SELECT COUNT(*) AS count
+       FROM cards c
+       INNER JOIN tokens t ON t.id = c.token_id
+       WHERE c.user_id = ?
+         AND t.provider = ?
+         AND ${curriculumTopicScopeClause()}`
+  ).get(userId, provider, topicId, topicId);
+  return row?.count ?? 0;
+}
+async function listUserCardsForCurriculumTopic(db, userId, provider, topicId) {
+  const rows = await db.prepare(
+    `SELECT
+         t.slug,
+         t.question,
+         t.concept,
+         t.domain,
+         t.bloom_level AS bloomLevel,
+         t.symbiosis_mode AS symbiosisMode,
+         t.topic_id AS topicId
+       FROM cards c
+       INNER JOIN tokens t ON t.id = c.token_id
+       WHERE c.user_id = ?
+         AND t.provider = ?
+         AND ${curriculumTopicScopeClause()}
+       ORDER BY t.slug`
+  ).all(userId, provider, topicId, topicId);
+  return rows;
+}
 async function importCurriculumCards(db, userId, cards) {
   let createdCount = 0;
   let ensuredCount = 0;
@@ -2459,81 +2509,86 @@ async function confirmFoundations(db, userId, originalSlug, proposals) {
   });
   return { createdCount, linkedCount };
 }
-async function confirmSourceImport(db, userId, sourceId, proposals) {
+async function applySourceProposals(db, userId, sourceId, proposals) {
   let createdCount = 0;
   let linkedCount = 0;
-  await db.transaction(async (tx) => {
-    for (const card of proposals) {
-      const cardSourceId = card.source_id || sourceId;
-      const source = await tx.prepare("SELECT id FROM sources WHERE id = ?").get(cardSourceId);
-      if (!source) {
-        throw new Error(`Source not found: ${cardSourceId}`);
-      }
-      const baseText = card.question && card.question.trim().length > 0 ? card.question : card.concept;
-      const cleanDomain = slugify(card.domain || "");
-      const cleanBase = slugify(baseText);
-      let baseSlug = cleanDomain ? `${cleanDomain}-${cleanBase}` : cleanBase;
-      if (baseSlug.length > 60) {
-        baseSlug = baseSlug.slice(0, 60).replace(/-$/, "");
-      }
-      if (!baseSlug) {
-        baseSlug = "token";
+  for (const card of proposals) {
+    const cardSourceId = card.source_id || sourceId;
+    const source = await db.prepare("SELECT id FROM sources WHERE id = ?").get(cardSourceId);
+    if (!source) {
+      throw new Error(`Source not found: ${cardSourceId}`);
+    }
+    const baseText = card.question && card.question.trim().length > 0 ? card.question : card.concept;
+    const cleanDomain = slugify(card.domain || "");
+    const cleanBase = slugify(baseText);
+    let baseSlug = cleanDomain ? `${cleanDomain}-${cleanBase}` : cleanBase;
+    if (baseSlug.length > 60) {
+      baseSlug = baseSlug.slice(0, 60).replace(/-$/, "");
+    }
+    if (!baseSlug) {
+      baseSlug = "token";
+    }
+    let token = await getTokenBySlug(db, baseSlug);
+    if (!token) {
+      const finalSlug = await generateTokenSlug(
+        db,
+        card.domain,
+        card.concept,
+        card.question
+      );
+      const bloom = card.bloom_level !== void 0 ? card.bloom_level : 1;
+      let symbiosisMode = null;
+      if (card.symbiosis_mode && card.symbiosis_mode !== "none") {
+        symbiosisMode = card.symbiosis_mode;
       }
-      let token = await getTokenBySlug(tx, baseSlug);
-      if (!token) {
-        const finalSlug = await generateTokenSlug(
-          tx,
-          card.domain,
-          card.concept,
-          card.question
-        );
-        const bloom = card.bloom_level !== void 0 ? card.bloom_level : 1;
-        let symbiosisMode = null;
-        if (card.symbiosis_mode && card.symbiosis_mode !== "none") {
-          symbiosisMode = card.symbiosis_mode;
-        }
-        token = await createToken(tx, {
-          slug: finalSlug,
-          title: card.title,
-          concept: card.concept,
-          domain: card.domain,
-          bloom_level: bloom,
-          context: card.excerpt || "",
-          symbiosis_mode: symbiosisMode,
-          question: card.question || null,
-          provider: card.provider || null,
+      token = await createToken(db, {
+        slug: finalSlug,
+        title: card.title,
+        concept: card.concept,
+        domain: card.domain,
+        bloom_level: bloom,
+        context: card.excerpt || "",
+        symbiosis_mode: symbiosisMode,
+        question: card.question || null,
+        provider: card.provider || null,
+        topic_id: card.topic_id || null
+      });
+      createdCount++;
+    } else {
+      linkedCount++;
+      if (!token.provider && card.provider) {
+        await updateToken(db, token.slug, {
+          provider: card.provider,
           topic_id: card.topic_id || null
         });
-        createdCount++;
-      } else {
-        linkedCount++;
-        if (!token.provider && card.provider) {
-          await updateToken(tx, token.slug, {
-            provider: card.provider,
-            topic_id: card.topic_id || null
-          });
-        }
-      }
-      const existingCard = await getCard(tx, token.id, userId);
-      if (!existingCard) {
-        await ensureCard(tx, token.id, userId);
       }
-      await tx.prepare(
-        `INSERT INTO token_sources (token_id, source_id, excerpt, page_number)
-           VALUES (?, ?, ?, ?)
-           ON CONFLICT(token_id, source_id) DO UPDATE SET
-             excerpt = excluded.excerpt,
-             page_number = excluded.page_number`
-      ).run(
-        token.id,
-        cardSourceId,
-        card.excerpt || "",
-        card.page_number || null
-      );
     }
-  });
+    const existingCard = await getCard(db, token.id, userId);
+    if (!existingCard) {
+      await ensureCard(db, token.id, userId);
+    }
+    await db.prepare(
+      `INSERT INTO token_sources (token_id, source_id, excerpt, page_number)
+         VALUES (?, ?, ?, ?)
+         ON CONFLICT(token_id, source_id) DO UPDATE SET
+           excerpt = excluded.excerpt,
+           page_number = excluded.page_number`
+    ).run(
+      token.id,
+      cardSourceId,
+      card.excerpt || "",
+      card.page_number || null
+    );
+  }
   return { createdCount, linkedCount };
 }
+async function confirmSourceImport(db, userId, sourceId, proposals) {
+  let result = { createdCount: 0, linkedCount: 0 };
+  await db.transaction(async (tx) => {
+    result = await applySourceProposals(tx, userId, sourceId, proposals);
+  });
+  return result;
+}
 async function assertPrerequisiteDoesNotCreateCycle(db, tokenId, prerequisiteId) {
   const cycleCheck = await db.prepare(
     `WITH RECURSIVE dependents(token_id) AS (
@@ -5903,6 +5958,17 @@ var init_i18n = __esm({
 import { existsSync as existsSync8, mkdirSync as mkdirSync7, readFileSync as readFileSync8, writeFileSync as writeFileSync5 } from "fs";
 import { homedir as homedir6 } from "os";
 import { dirname as dirname4, join as join9 } from "path";
+import { ulid as ulid9 } from "ulid";
+function emptyCapabilityFlags() {
+  return {
+    text: false,
+    embedding: false,
+    image: false,
+    video: false,
+    stt: false,
+    tts: false
+  };
+}
 function defaultConfigPath() {
   return process.env.ZAM_CONFIG_PATH || join9(homedir6(), ".zam", "config.json");
 }
@@ -5946,6 +6012,116 @@ function saveMachineAiConfig(ai, path = defaultConfigPath()) {
   config.ai = ai;
   saveInstallConfig(config, path);
 }
+function ensureMachineProviderRolesSanitized(path = defaultConfigPath()) {
+  if (sanitizedMachineRolePaths.has(path)) return;
+  sanitizedMachineRolePaths.add(path);
+  const ai = getMachineAiConfig(path);
+  if (!ai.roles?.text) return;
+  const roles = { ...ai.roles };
+  delete roles.text;
+  saveMachineAiConfig({ ...ai, roles }, path);
+}
+function getMachineAiModels(path = defaultConfigPath()) {
+  return getMachineAiConfig(path).models ?? [];
+}
+function saveMachineAiModels(models, path = defaultConfigPath()) {
+  const ai = getMachineAiConfig(path);
+  saveMachineAiConfig({ ...ai, models }, path);
+}
+function isAnthropicUrl(url) {
+  try {
+    return new URL(url).hostname.toLowerCase().endsWith("anthropic.com");
+  } catch {
+    return false;
+  }
+}
+function isLocalUrl(url) {
+  try {
+    const host = new URL(url).hostname.toLowerCase();
+    return host === "localhost" || host === "127.0.0.1" || host === "::1" || host.endsWith(".local");
+  } catch {
+    return false;
+  }
+}
+function migrateMachineRolesToModels(ai) {
+  const providers = ai.providers ?? {};
+  const providerNames = Object.keys(providers);
+  if (providerNames.length === 0) return null;
+  const roles = ai.roles ?? {};
+  const capsByName = /* @__PURE__ */ new Map();
+  const capsFor = (name) => {
+    let flags = capsByName.get(name);
+    if (!flags) {
+      flags = emptyCapabilityFlags();
+      capsByName.set(name, flags);
+    }
+    return flags;
+  };
+  const priorityRoles = [
+    "recall",
+    "text",
+    "vision",
+    "embedding"
+  ];
+  for (const role of priorityRoles) {
+    const binding = roles[role];
+    if (!binding) continue;
+    const capability = ROLE_TO_CAPABILITY[role];
+    for (const ref of [binding.primary, binding.fallback]) {
+      if (ref && providers[ref]) capsFor(ref)[capability] = true;
+    }
+  }
+  const ordered = [];
+  const pushName = (name) => {
+    if (name && providers[name] && !ordered.includes(name)) ordered.push(name);
+  };
+  for (const role of priorityRoles) {
+    pushName(roles[role]?.primary);
+    pushName(roles[role]?.fallback);
+  }
+  for (const name of providerNames) pushName(name);
+  return ordered.map((name, index) => {
+    const rec = providers[name];
+    const url = rec.url ?? "";
+    const capabilities = capsByName.get(name) ?? emptyCapabilityFlags();
+    const entry = {
+      id: ulid9(),
+      label: rec.label ?? name,
+      url,
+      model: rec.model ?? "",
+      local: rec.local ?? isLocalUrl(url),
+      apiFlavor: rec.apiFlavor ?? (isAnthropicUrl(url) ? "anthropic-messages" : "chat-completions"),
+      order: index,
+      capabilities,
+      detectedCapabilities: { ...capabilities }
+    };
+    if (rec.runner) entry.runner = rec.runner;
+    if (rec.apiKeyRef) entry.apiKeyRef = rec.apiKeyRef;
+    return entry;
+  });
+}
+function ensureMachineAiModelsMigrated(path = defaultConfigPath()) {
+  const ai = getMachineAiConfig(path);
+  if (ai.models && ai.models.length > 0) return ai.models;
+  if (migratedModelConfigPaths.has(path)) return ai.models ?? [];
+  migratedModelConfigPaths.add(path);
+  const models = migrateMachineRolesToModels(ai);
+  if (!models) return [];
+  saveMachineAiConfig({ ...ai, models }, path);
+  return models;
+}
+function getAgentConnectAutoDone(path = defaultConfigPath()) {
+  return loadInstallConfig(path).agent?.connectAutoDone === true;
+}
+function setAgentConnectAutoDone(done, path = defaultConfigPath()) {
+  const config = loadInstallConfig(path);
+  if (done) {
+    config.agent = { ...config.agent ?? {}, connectAutoDone: true };
+  } else if (config.agent) {
+    delete config.agent.connectAutoDone;
+  }
+  saveInstallConfig(config, path);
+}
 function getConfiguredWorkspaces(path = defaultConfigPath()) {
   return loadInstallConfig(path).workspaces ?? [];
 }
@@ -6030,9 +6206,26 @@ function setActiveWorkspaceContext(contextName, path = defaultConfigPath()) {
   }
   return false;
 }
+var ALL_CAPABILITIES, sanitizedMachineRolePaths, ROLE_TO_CAPABILITY, migratedModelConfigPaths;
 var init_install_config = __esm({
   "src/kernel/system/install-config.ts"() {
     "use strict";
+    ALL_CAPABILITIES = [
+      "text",
+      "embedding",
+      "image",
+      "video",
+      "stt",
+      "tts"
+    ];
+    sanitizedMachineRolePaths = /* @__PURE__ */ new Set();
+    ROLE_TO_CAPABILITY = {
+      recall: "text",
+      text: "text",
+      vision: "image",
+      embedding: "embedding"
+    };
+    migratedModelConfigPaths = /* @__PURE__ */ new Set();
   }
 });
 
@@ -6548,6 +6741,7 @@ var init_update_check = __esm({
 // src/kernel/index.ts
 var kernel_exports = {};
 __export(kernel_exports, {
+  ALL_CAPABILITIES: () => ALL_CAPABILITIES,
   BUILT_IN_SENSITIVE_MATCHERS: () => BUILT_IN_SENSITIVE_MATCHERS,
   DEFAULT_OBSERVER_POLICY: () => DEFAULT_OBSERVER_POLICY,
   DEFAULT_REVIEW_CONTEXT_MAX_CHARS: () => DEFAULT_REVIEW_CONTEXT_MAX_CHARS,
@@ -6563,6 +6757,7 @@ __export(kernel_exports, {
   analyzeObservation: () => analyzeObservation,
   appendUiObservationReport: () => appendUiObservationReport,
   applySessionSynthesis: () => applySessionSynthesis,
+  applySourceProposals: () => applySourceProposals,
   assignTokenToContext: () => assignTokenToContext,
   buildAncestorMap: () => buildAncestorMap,
   buildReviewQueue: () => buildReviewQueue,
@@ -6578,6 +6773,7 @@ __export(kernel_exports, {
   confirmFoundations: () => confirmFoundations,
   confirmSourceImport: () => confirmSourceImport,
   cosineSimilarity: () => cosineSimilarity,
+  countUserCardsForCurriculumTopic: () => countUserCardsForCurriculumTopic,
   createAgentSkill: () => createAgentSkill,
   createFSRS: () => createFSRS,
   createGoal: () => createGoal,
@@ -6588,6 +6784,7 @@ __export(kernel_exports, {
   decideUpdate: () => decideUpdate,
   decodeEmbedding: () => decodeEmbedding,
   deleteCardForUser: () => deleteCardForUser,
+  deleteCurriculumCardForUser: () => deleteCurriculumCardForUser,
   deleteKnowledgeContext: () => deleteKnowledgeContext,
   deleteSetting: () => deleteSetting,
   deleteToken: () => deleteToken,
@@ -6597,9 +6794,12 @@ __export(kernel_exports, {
   discoverSkills: () => discoverSkills,
   distributeGlobalSkills: () => distributeGlobalSkills,
   embeddingContentForToken: () => embeddingContentForToken,
+  emptyCapabilityFlags: () => emptyCapabilityFlags,
   encodeEmbedding: () => encodeEmbedding,
   endSession: () => endSession,
   ensureCard: () => ensureCard,
+  ensureMachineAiModelsMigrated: () => ensureMachineAiModelsMigrated,
+  ensureMachineProviderRolesSanitized: () => ensureMachineProviderRolesSanitized,
   ensureMonitorDir: () => ensureMonitorDir,
   ensureUiObserverDir: () => ensureUiObserverDir,
   evaluateRating: () => evaluateRating,
@@ -6622,6 +6822,7 @@ __export(kernel_exports, {
   getActiveWorkspace: () => getActiveWorkspace,
   getActiveWorkspaceContext: () => getActiveWorkspaceContext,
   getActiveWorkspaceId: () => getActiveWorkspaceId,
+  getAgentConnectAutoDone: () => getAgentConnectAutoDone,
   getAgentSkill: () => getAgentSkill,
   getAllSettings: () => getAllSettings,
   getAllSettingsDetailed: () => getAllSettingsDetailed,
@@ -6644,6 +6845,7 @@ __export(kernel_exports, {
   getKnowledgeContextById: () => getKnowledgeContextById,
   getKnowledgeContextByName: () => getKnowledgeContextByName,
   getMachineAiConfig: () => getMachineAiConfig,
+  getMachineAiModels: () => getMachineAiModels,
   getMonitorDir: () => getMonitorDir,
   getMonitorLogStats: () => getMonitorLogStats,
   getMonitorPath: () => getMonitorPath,
@@ -6687,6 +6889,7 @@ __export(kernel_exports, {
   listProviderApiKeyRefs: () => listProviderApiKeyRefs,
   listTokens: () => listTokens,
   listTokensNeedingEmbedding: () => listTokensNeedingEmbedding,
+  listUserCardsForCurriculumTopic: () => listUserCardsForCurriculumTopic,
   loadADOConfig: () => loadADOConfig,
   loadCredentials: () => loadCredentials,
   loadInstallConfig: () => loadInstallConfig,
@@ -6695,6 +6898,7 @@ __export(kernel_exports, {
   matchBuiltInSensitive: () => matchBuiltInSensitive,
   matchDenylist: () => matchDenylist,
   matchesFilePath: () => matchesFilePath,
+  migrateMachineRolesToModels: () => migrateMachineRolesToModels,
   monitorLogExists: () => monitorLogExists,
   normalizeLocale: () => normalizeLocale,
   normalizePath: () => normalizePath,
@@ -6726,11 +6930,13 @@ __export(kernel_exports, {
   saveCredentials: () => saveCredentials,
   saveInstallConfig: () => saveInstallConfig,
   saveMachineAiConfig: () => saveMachineAiConfig,
+  saveMachineAiModels: () => saveMachineAiModels,
   searchTokensHybrid: () => searchTokensHybrid,
   serializeGoal: () => serializeGoal,
   setADOCredentials: () => setADOCredentials,
   setActiveWorkspaceContext: () => setActiveWorkspaceContext,
   setActiveWorkspaceId: () => setActiveWorkspaceId,
+  setAgentConnectAutoDone: () => setAgentConnectAutoDone,
   setInstallChannel: () => setInstallChannel,
   setInstallMode: () => setInstallMode,
   setProviderApiKey: () => setProviderApiKey,
@@ -6742,6 +6948,7 @@ __export(kernel_exports, {
   syncObserverSidecarPolicy: () => syncObserverSidecarPolicy,
   t: () => t,
   toSidecarPrivacyPolicy: () => toSidecarPrivacyPolicy,
+  tokenMatchesCurriculumTopicScope: () => tokenMatchesCurriculumTopicScope,
   uiObservationLogExists: () => uiObservationLogExists,
   uiObservationTimeSpan: () => uiObservationTimeSpan,
   unassignTokenFromContext: () => unassignTokenFromContext,
@@ -6815,11 +7022,16 @@ import { Command as Command27 } from "commander";
 
 // src/cli/commands/agent.ts
 init_kernel();
-import { existsSync as existsSync15, mkdirSync as mkdirSync10, writeFileSync as writeFileSync9 } from "fs";
-import { homedir as homedir11 } from "os";
-import { dirname as dirname7, join as join15 } from "path";
+import { existsSync as existsSync15 } from "fs";
+import { join as join15 } from "path";
 import { Command } from "commander";
 
+// src/cli/agent-connect.ts
+init_kernel();
+import { mkdirSync as mkdirSync10, writeFileSync as writeFileSync9 } from "fs";
+import { homedir as homedir11 } from "os";
+import { dirname as dirname7 } from "path";
+
 // src/cli/agent-harness.ts
 import { spawn } from "child_process";
 import { existsSync as existsSync12, readFileSync as readFileSync9 } from "fs";
@@ -7673,16 +7885,7 @@ function installVscodeExtension(options) {
   };
 }
 
-// src/cli/commands/agent.ts
-var C = {
-  reset: "\x1B[0m",
-  bold: "\x1B[1m",
-  cyan: "\x1B[36m",
-  dim: "\x1B[2m",
-  green: "\x1B[32m",
-  yellow: "\x1B[33m"
-};
-var SUPPORTED_AGENTS = ["opencode"];
+// src/cli/agent-connect.ts
 var CONNECT_HARNESSES = [
   "claude-code",
   "claude-desktop",
@@ -7693,9 +7896,189 @@ var CONNECT_HARNESSES = [
   "goose",
   "copilot"
 ];
+var USER_SCOPED_CONNECT_HARNESSES = [
+  "claude-desktop",
+  "antigravity",
+  "codex",
+  "vscode",
+  "opencode",
+  "goose",
+  "copilot"
+];
+var CONNECT_HARNESS_LABELS = {
+  "claude-code": "Claude Code",
+  "claude-desktop": "Claude Desktop",
+  antigravity: "Antigravity",
+  codex: "Codex",
+  vscode: "VS Code",
+  opencode: "OpenCode",
+  goose: "Goose",
+  copilot: "GitHub Copilot"
+};
 function isConnectHarnessId(value) {
   return CONNECT_HARNESSES.includes(value);
 }
+function resolveDeps(deps) {
+  const home = deps.home ?? homedir11();
+  const cwd = deps.cwd ?? process.cwd();
+  const copilotHome = deps.copilotHome ?? process.env.COPILOT_HOME;
+  return {
+    home,
+    cwd,
+    copilotHome,
+    findZam: deps.findZam ?? (() => findExecutable("zam")),
+    detect: deps.detect ?? (() => detectInstalledConnectHarnesses({ home, copilotHome })),
+    connectMcp: deps.connectMcp ?? connectHarnessMcp,
+    writeConfig: deps.writeConfig ?? ((path, content) => {
+      mkdirSync10(dirname7(path), { recursive: true });
+      writeFileSync9(path, content, "utf-8");
+    }),
+    installCopilot: deps.installCopilot ?? installCopilotExtension,
+    installVscode: deps.installVscode ?? installVscodeExtension,
+    resolveAntigravity: deps.resolveAntigravity ?? resolveAntigravityIdeExecutable,
+    refreshSkills: deps.refreshSkills ?? distributeGlobalSkills
+  };
+}
+function performAgentConnect(opts = {}, deps = {}) {
+  const d = resolveDeps(deps);
+  const dryRun = Boolean(opts.dryRun);
+  const detected = opts.harness ? [opts.harness] : d.detect();
+  const foundZam = d.findZam();
+  const zamPath = foundZam ?? "zam";
+  const results = [];
+  for (const harness of detected) {
+    const label = CONNECT_HARNESS_LABELS[harness];
+    try {
+      const prepared = d.connectMcp(harness, {
+        zamPath,
+        cwd: d.cwd,
+        home: d.home,
+        copilotHome: d.copilotHome
+      });
+      let extension = null;
+      if (harness === "copilot") {
+        const installed = d.installCopilot({
+          home: d.home,
+          zamPath,
+          dryRun
+        });
+        extension = {
+          kind: "copilot",
+          action: installed.action,
+          location: installed.destinationDir,
+          detail: `${installed.launch.command} ${installed.launch.args.join(" ")}`
+        };
+      } else if (harness === "vscode") {
+        const installed = d.installVscode({ home: d.home, zamPath, dryRun });
+        extension = {
+          kind: "vscode",
+          action: installed.action,
+          location: installed.vsixPath,
+          detail: installed.launchConfigPath
+        };
+      } else if (harness === "antigravity") {
+        const antigravityPath = d.resolveAntigravity();
+        if (antigravityPath) {
+          const installed = d.installVscode({
+            home: d.home,
+            zamPath,
+            codePath: antigravityPath,
+            dryRun
+          });
+          extension = {
+            kind: "vscode",
+            action: installed.action,
+            location: installed.vsixPath,
+            detail: installed.launchConfigPath
+          };
+        }
+      }
+      let wrote = false;
+      if (!prepared.alreadyConfigured && !dryRun) {
+        d.writeConfig(prepared.path, prepared.content);
+        wrote = true;
+      }
+      results.push({
+        harness,
+        label,
+        path: prepared.path,
+        content: prepared.content,
+        alreadyConfigured: prepared.alreadyConfigured,
+        wrote,
+        hint: prepared.hint,
+        extension
+      });
+    } catch (error) {
+      results.push({
+        harness,
+        label,
+        path: "",
+        content: "",
+        alreadyConfigured: false,
+        wrote: false,
+        hint: "",
+        extension: null,
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+  }
+  let skills = null;
+  if (!dryRun && detected.length > 0) {
+    const skillResults = d.refreshSkills(d.home);
+    skills = {
+      refreshed: skillResults.filter((result) => result.success).length,
+      total: skillResults.length
+    };
+  }
+  return {
+    success: results.every((result) => !result.error),
+    detected,
+    zamPath,
+    zamOnPath: Boolean(foundZam),
+    results,
+    skills
+  };
+}
+function inspectConnectHarnesses(deps = {}) {
+  const d = resolveDeps(deps);
+  const foundZam = d.findZam();
+  const zamPath = foundZam ?? "zam";
+  const installed = new Set(d.detect());
+  const harnesses = USER_SCOPED_CONNECT_HARNESSES.map((harness) => {
+    const status = {
+      harness,
+      label: CONNECT_HARNESS_LABELS[harness],
+      installed: installed.has(harness),
+      configured: false,
+      configPath: ""
+    };
+    try {
+      const probe = d.connectMcp(harness, {
+        zamPath,
+        cwd: d.cwd,
+        home: d.home,
+        copilotHome: d.copilotHome
+      });
+      status.configured = probe.alreadyConfigured;
+      status.configPath = probe.path;
+    } catch (error) {
+      status.note = error instanceof Error ? error.message : String(error);
+    }
+    return status;
+  });
+  return { zamOnPath: Boolean(foundZam), harnesses };
+}
+
+// src/cli/commands/agent.ts
+var C = {
+  reset: "\x1B[0m",
+  bold: "\x1B[1m",
+  cyan: "\x1B[36m",
+  dim: "\x1B[2m",
+  green: "\x1B[32m",
+  yellow: "\x1B[33m"
+};
+var SUPPORTED_AGENTS = ["opencode"];
 function agentsMdPresent(cwd = process.cwd()) {
   return existsSync15(join15(cwd, "AGENTS.md"));
 }
@@ -7823,125 +8206,69 @@ var connectCmd = new Command("connect").description(
       explicitHarness = harnessArg;
     }
   }
-  const home = homedir11();
-  const harnesses = explicitHarness ? [explicitHarness] : detectInstalledConnectHarnesses({
-    home,
-    copilotHome: process.env.COPILOT_HOME
+  const report = performAgentConnect({
+    harness: explicitHarness,
+    dryRun: Boolean(opts.print)
   });
-  if (harnesses.length === 0) {
+  if (report.detected.length === 0) {
     console.error(
       "No supported user-scoped agent harness was detected. Install Codex, VS Code, or another supported host, or pass a harness explicitly."
     );
     process.exit(1);
   }
-  let zamPath = findExecutable("zam");
-  if (!zamPath) {
+  if (!report.zamOnPath) {
     console.warn(
       `${C.yellow}Warning: 'zam' executable was not found on your PATH. Falling back to literal 'zam'.${C.reset}`
     );
-    zamPath = "zam";
   }
-  for (const harness of harnesses) {
-    let result;
-    try {
-      result = connectHarnessMcp(harness, {
-        zamPath,
-        cwd: process.cwd(),
-        home,
-        copilotHome: process.env.COPILOT_HOME
-      });
-    } catch (error) {
-      console.error(
-        `Error preparing ${harness} MCP configuration: ${error instanceof Error ? error.message : String(error)}`
-      );
-      process.exit(1);
-    }
-    let copilotExtension;
-    let vscodeExtension;
-    try {
-      if (harness === "copilot") {
-        copilotExtension = installCopilotExtension({
-          home,
-          zamPath,
-          dryRun: Boolean(opts.print)
-        });
-      } else if (harness === "vscode") {
-        vscodeExtension = installVscodeExtension({
-          home,
-          zamPath,
-          dryRun: Boolean(opts.print)
-        });
-      } else if (harness === "antigravity") {
-        const antigravityPath = resolveAntigravityIdeExecutable();
-        if (antigravityPath) {
-          vscodeExtension = installVscodeExtension({
-            home,
-            zamPath,
-            codePath: antigravityPath,
-            dryRun: Boolean(opts.print)
-          });
-        }
-      }
-    } catch (error) {
-      console.error(
-        `Error preparing ${harness} companion extension: ${error instanceof Error ? error.message : String(error)}`
-      );
-      process.exit(1);
+  for (const result of report.results) {
+    if (result.error) {
+      console.error(`Error connecting ${result.harness}: ${result.error}`);
+      continue;
     }
     if (opts.print) {
-      if (harnesses.length > 1) console.log(`${C.bold}${harness}${C.reset}`);
+      if (report.results.length > 1)
+        console.log(`${C.bold}${result.harness}${C.reset}`);
       console.log(`Path: ${result.path}`);
       console.log(`Content:
 ${result.content}`);
-      if (copilotExtension) {
-        console.log(`Extension: ${copilotExtension.destinationDir}`);
-        console.log(
-          `Launch: ${copilotExtension.launch.command} ${copilotExtension.launch.args.join(" ")}`
-        );
-      }
-      if (vscodeExtension) {
-        console.log(`Extension: ${vscodeExtension.vsixPath}`);
-        console.log(`Launch config: ${vscodeExtension.launchConfigPath}`);
+      if (result.extension?.kind === "copilot") {
+        console.log(`Extension: ${result.extension.location}`);
+        console.log(`Launch: ${result.extension.detail}`);
+      } else if (result.extension) {
+        console.log(`Extension: ${result.extension.location}`);
+        console.log(`Launch config: ${result.extension.detail}`);
       }
       continue;
     }
     if (result.alreadyConfigured) {
       console.log(
-        `${C.green}\u2713${C.reset} ${harness}: MCP server 'zam' already configured in ${result.path}`
+        `${C.green}\u2713${C.reset} ${result.harness}: MCP server 'zam' already configured in ${result.path}`
       );
     } else {
-      try {
-        mkdirSync10(dirname7(result.path), { recursive: true });
-        writeFileSync9(result.path, result.content, "utf-8");
-        console.log(
-          `${C.green}\u2713${C.reset} ${harness}: wrote MCP configuration to ${result.path}`
-        );
-      } catch (error) {
-        console.error(
-          `Error writing ${harness} MCP configuration: ${error instanceof Error ? error.message : String(error)}`
-        );
-        process.exit(1);
-      }
-    }
-    if (copilotExtension) {
       console.log(
-        `${C.green}\u2713${C.reset} Copilot MCP Apps extension ${copilotExtension.action} at ${copilotExtension.destinationDir}`
+        `${C.green}\u2713${C.reset} ${result.harness}: wrote MCP configuration to ${result.path}`
       );
     }
-    if (vscodeExtension) {
+    if (result.extension?.kind === "copilot") {
+      console.log(
+        `${C.green}\u2713${C.reset} Copilot MCP Apps extension ${result.extension.action} at ${result.extension.location}`
+      );
+    } else if (result.extension) {
       console.log(
-        `${C.green}\u2713${C.reset} ZAM Companion ${vscodeExtension.action} from ${vscodeExtension.vsixPath}`
+        `${C.green}\u2713${C.reset} ZAM Companion ${result.extension.action} from ${result.extension.location}`
       );
     }
     console.log(`  ${C.dim}${result.hint}${C.reset}`);
   }
-  if (!opts.print) {
-    const skills = distributeGlobalSkills(home);
-    const installed = skills.filter((result) => result.success).length;
+  if (report.skills) {
     console.log(
-      `${C.green}\u2713${C.reset} Refreshed ${installed}/${skills.length} global ZAM skill installations`
+      `${C.green}\u2713${C.reset} Refreshed ${report.skills.refreshed}/${report.skills.total} global ZAM skill installations`
     );
   }
+  if (!report.success) {
+    process.exit(1);
+  }
 });
 var agentCommand = new Command("agent").description("Provision and inspect the agent that drives ZAM sessions").addCommand(installCmd).addCommand(statusCmd).addCommand(openCmd).addCommand(listCmd).addCommand(connectCmd).action(printStatus);
 
@@ -7953,7 +8280,7 @@ import { existsSync as existsSync19, readdirSync as readdirSync2, readFileSync a
 import { homedir as homedir13, tmpdir as tmpdir3 } from "os";
 import { join as join22, resolve as resolve5 } from "path";
 import { Command as Command2 } from "commander";
-import { ulid as ulid9 } from "ulid";
+import { ulid as ulid10 } from "ulid";
 
 // src/cli/adapters/source-reader.ts
 import dns from "dns";
@@ -7965,8 +8292,11 @@ import { spawn as spawn2 } from "child_process";
 import { existsSync as existsSync16, readFileSync as readFileSync12, statSync as statSync2 } from "fs";
 var DEFAULT_LLM_URL = "http://localhost:8000/v1";
 var DEFAULT_LLM_MAX_TOKENS = 1e4;
+var LOCAL_CURRICULUM_IMPORT_HARD_TIMEOUT_MS = 6e5;
+var CLOUD_CURRICULUM_IMPORT_HARD_TIMEOUT_MS = 18e4;
 var RECALL_QUESTION_MAX_OUTPUT_TOKENS = 400;
 var RECALL_EVALUATION_MAX_OUTPUT_TOKENS = 1200;
+var RECALL_DISCUSSION_MAX_OUTPUT_TOKENS = 1200;
 var RECALL_ENDPOINT_CACHE_MS = 6e4;
 var cachedRecallEndpoint = null;
 function recallEndpointSignature(cfg) {
@@ -8040,10 +8370,61 @@ function resolveProviderApiKey(rec) {
   }
   return DEFAULT_LLM_API_KEY;
 }
-async function getProviderForRole(db, role) {
-  const enabled = role === "vision" ? await getSetting(db, "llm.vision.enabled") === "true" : await getSetting(db, "llm.enabled") === "true";
-  const base = await getLegacyRoleConfig(db, role, enabled);
-  const providers = await readJsonSetting(db, "llm.providers");
+var ROLE_TO_CAPABILITY2 = {
+  recall: "text",
+  text: "text",
+  vision: "image",
+  embedding: "embedding"
+};
+function materializeModelEntry(entry, base, enabled, maxFrames) {
+  const url = entry.url || base.url;
+  const cfg = {
+    enabled,
+    url,
+    model: entry.model || base.model,
+    apiKey: entry.apiKeyRef ? getProviderApiKey(entry.apiKeyRef) ?? DEFAULT_LLM_API_KEY : DEFAULT_LLM_API_KEY,
+    apiFlavor: entry.apiFlavor || inferApiFlavor(url),
+    locale: base.locale,
+    providerName: entry.id,
+    label: entry.label,
+    source: "machine",
+    local: entry.local
+  };
+  if (entry.runner) cfg.runner = entry.runner;
+  if (maxFrames !== void 0) cfg.maxFrames = maxFrames;
+  return cfg;
+}
+async function resolveCapability(db, capability) {
+  const models = getMachineAiModels();
+  if (models.length === 0) return null;
+  const isVisual = capability === "image" || capability === "video";
+  const enabled = (isVisual ? await getSetting(db, "llm.vision.enabled") : await getSetting(db, "llm.enabled")) === "true";
+  const base = await getLlmConfig(db);
+  let maxFrames;
+  if (isVisual) {
+    const raw = await getSetting(db, "llm.vision.max_frames");
+    const parsed = raw ? parseInt(raw, 10) : 100;
+    maxFrames = Number.isNaN(parsed) ? 100 : parsed;
+  }
+  const eligible = [...models].sort((a, b) => a.order - b.order).filter(
+    (entry) => entry.capabilities[capability] && entry.detectedCapabilities[capability]
+  );
+  if (eligible.length === 0) return null;
+  const configs = eligible.map(
+    (entry) => materializeModelEntry(entry, base, enabled, maxFrames)
+  );
+  for (let i = configs.length - 1; i > 0; i--) {
+    configs[i - 1] = { ...configs[i - 1], fallback: configs[i] };
+  }
+  return configs[0];
+}
+async function getProviderForRole(db, role) {
+  ensureMachineProviderRolesSanitized();
+  const viaRegistry = await resolveCapability(db, ROLE_TO_CAPABILITY2[role]);
+  if (viaRegistry) return viaRegistry;
+  const enabled = role === "vision" ? await getSetting(db, "llm.vision.enabled") === "true" : await getSetting(db, "llm.enabled") === "true";
+  const base = await getLegacyRoleConfig(db, role, enabled);
+  const providers = await readJsonSetting(db, "llm.providers");
   const roles = await readJsonSetting(db, "llm.roles");
   const binding = roles?.[role];
   let resolved = base;
@@ -8081,6 +8462,9 @@ async function getProviderForRole(db, role) {
     ) : void 0;
     return { ...primary, fallback };
   }
+  if (role === "text") {
+    return getProviderForRole(db, "recall");
+  }
   return resolved;
 }
 function materializeProvider(rec, base, role, meta) {
@@ -8329,6 +8713,64 @@ Evaluation:`;
     providerName: endpoint.providerName
   };
 }
+async function discussReviewViaLLM(db, input8) {
+  const cfg = await getProviderForRole(db, "recall");
+  const endpoint = await resolveUsableRecallEndpoint(db);
+  const langName = LANGUAGE_NAMES[cfg.locale] || "English";
+  const systemPrompt = `You are ZAM, a warm, precise, and encouraging skills trainer in a follow-up discussion about one flashcard.
+The learner has already answered, the reference answer is revealed, and your evaluation feedback was shown \u2014 nothing about this card is a spoiler anymore.
+
+Guidelines:
+1. Answer the learner's follow-up directly and concretely in ${langName}, grounded in the card's target concept, context, and source reference.
+2. Stay scoped to this card and its concept. If the learner drifts to unrelated territory, answer briefly and steer back to the concept.
+3. Keep replies conversational and short (a few sentences) unless the learner explicitly asks for depth. Plain text only \u2014 no markdown wrapper, headers, or bullet lists.
+4. The self-rating is the learner's own choice. If asked, explain the FSRS scale (1 forgot, 2 hard, 3 good, 4 easy) but never pressure them toward a specific rating.`;
+  const cardFrame = `The card under discussion:
+Domain: ${input8.domain}
+Slug: ${input8.slug}
+Recall Question: ${input8.question}
+Learner's Answer: ${input8.userAnswer}
+
+Target Concept (Correct Answer): ${input8.concept}
+Target Context: ${input8.context || "(none)"}
+${input8.sourceLinkContent ? `Source Code Reference:
+${input8.sourceLinkContent}` : ""}`;
+  const messages = [
+    { role: "system", content: systemPrompt },
+    { role: "user", content: cardFrame }
+  ];
+  const feedback = input8.feedback?.trim();
+  if (feedback) {
+    messages.push({ role: "assistant", content: feedback });
+  }
+  for (const turn of input8.thread) {
+    messages.push({ role: turn.role, content: turn.content });
+  }
+  messages.push({ role: "user", content: input8.message });
+  const res = await fetchWithInteractiveTimeout(
+    `${endpoint.url}/chat/completions`,
+    {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${endpoint.apiKey}`
+      },
+      body: JSON.stringify({
+        model: endpoint.model,
+        messages,
+        temperature: 0.3,
+        max_tokens: RECALL_DISCUSSION_MAX_OUTPUT_TOKENS
+      }),
+      locale: cfg.locale
+    }
+  );
+  const text = await readChatContent(res, "LLM discussion");
+  return {
+    text,
+    model: endpoint.model,
+    providerName: endpoint.providerName
+  };
+}
 var MAX_IMPORT_TEXT_CHARS = 2e5;
 var VALID_GENERATED_MODES = /* @__PURE__ */ new Set(["shadowing", "copilot", "autonomy"]);
 function parseGeneratedCardArray(responseText, label, limits) {
@@ -8463,6 +8905,7 @@ Target Category: ${targetCategory}
 ${sourceUrl ? `Source Reference Link: ${sourceUrl}` : ""}
 
 JSON Array Output:`;
+  const hardTimeoutMs = isLocalEndpoint(endpoint.url) ? LOCAL_CURRICULUM_IMPORT_HARD_TIMEOUT_MS : CLOUD_CURRICULUM_IMPORT_HARD_TIMEOUT_MS;
   const res = await fetchWithInteractiveTimeout(
     `${endpoint.url}/chat/completions`,
     {
@@ -8480,7 +8923,9 @@ JSON Array Output:`;
         temperature: 0.1,
         max_tokens: DEFAULT_LLM_MAX_TOKENS
       }),
-      locale
+      locale,
+      hardTimeoutMs,
+      timeoutMs: hardTimeoutMs
     }
   );
   return readChatContent(res, "LLM curriculum import");
@@ -8876,7 +9321,11 @@ async function resolveUsableTextEndpoint(db) {
   const chain = await checkProviderChain(cfg);
   const selected = chain.firstUsable;
   if (!selected || !isEndpointUsable(selected)) {
-    throw new Error("No text LLM endpoint is online");
+    const primary = chain.primary.endpoint;
+    const reason = !selected ? chain.primary.online ? "configured model is unavailable" : "endpoint is offline" : "endpoint is not usable";
+    throw new Error(
+      `No text LLM endpoint is online (${reason}; role: text; url: ${primary.url}; model: ${primary.model})`
+    );
   }
   return selected.endpoint;
 }
@@ -9566,7 +10015,7 @@ async function readWebLink(url) {
         redirect: "manual",
         signal: controller.signal,
         headers: {
-          "User-Agent": "ZAM-Content-Studio/0.10.0"
+          "User-Agent": "ZAM-Content-Studio/0.10.4"
         }
       });
       if (res.status >= 300 && res.status < 400) {
@@ -12731,7 +13180,7 @@ function normalizeForComparison11(str) {
 // src/cli/curriculum/providers/lehrplanplus-bayern/manifest.ts
 var LEHRPLANPLUS_BAYERN_MANIFEST = {
   schoolYear: "2026/2027",
-  capturedOn: "2026-07-02",
+  capturedOn: "2026-07-12",
   sourceRevision: "LehrplanPLUS Realschule \u2013 Oktober 2023",
   schoolTypes: [
     { id: "grundschule", label: "Grundschule" },
@@ -12788,12 +13237,242 @@ var LEHRPLANPLUS_BAYERN_MANIFEST = {
     ]
   },
   tracks: {
+    "realschule|5|sport": [
+      { id: "basis_sport", label: "Basissport 5" },
+      { id: "diff_sport", label: "Differenzierter Sport" }
+    ],
     "realschule|9|mathematik": [
       { id: "wpfg1", label: "Mathematik 9 (I)" },
       { id: "wpfg2-3", label: "Mathematik 9 (II/III)" }
     ]
   },
   topics: {
+    "realschule|5|biologie": [
+      { id: "lb1", label: "Prozessbezogene Kompetenzen" },
+      {
+        id: "lb2",
+        label: "Biologie, die Wissenschaft von den Lebewesen",
+        hours: 14
+      },
+      {
+        id: "lb3",
+        label: "Bau und Funktion des menschlichen K\xF6rpers",
+        hours: 22
+      },
+      {
+        id: "lb4",
+        label: "Tiere und Pflanzen in der Umgebung des Menschen",
+        hours: 20
+      }
+    ],
+    "realschule|5|deutsch": [
+      { id: "lb1", label: "Sprechen und Zuh\xF6ren" },
+      { id: "lb2", label: "Lesen \u2013 mit Texten und weiteren Medien umgehen" },
+      { id: "lb3", label: "Schreiben" },
+      {
+        id: "lb4",
+        label: "Sprachgebrauch und Sprache untersuchen und reflektieren"
+      }
+    ],
+    "realschule|5|englisch": [
+      { id: "lb1", label: "Kommunikative Kompetenzen" },
+      { id: "lb2", label: "Interkulturelle Kompetenzen" },
+      { id: "lb3", label: "Text- und Medienkompetenzen" },
+      { id: "lb4", label: "Methodische Kompetenzen" },
+      { id: "lb5", label: "Themengebiete" }
+    ],
+    "realschule|5|ethik": [
+      { id: "lb1", label: "Meine Wirklichkeit und ich", hours: 16 },
+      { id: "lb2", label: "Leben in der Familie", hours: 12 },
+      { id: "lb3", label: "Spielen", hours: 12 },
+      {
+        id: "lb4",
+        label: "Feste und Riten in Religion und Brauchtum",
+        hours: 16
+      }
+    ],
+    "realschule|5|evangelische-religionslehre": [
+      { id: "lb1", label: "Leben in Gemeinschaft" },
+      { id: "lb2", label: "Die Bibel \u2013 Buch des Lebens" },
+      {
+        id: "lb3",
+        label: "Erfahrungen mit Gott als Begleiter auf dem Lebensweg"
+      },
+      { id: "lb4", label: "Glaube wird sichtbar und hinterl\xE4sst Spuren" },
+      {
+        id: "lb5",
+        label: "Sch\xF6pfung \u2013 Unsere Welt und unser Leben als Geschenk Gottes?"
+      }
+    ],
+    "realschule|5|geographie": [
+      { id: "lb1", label: "Einf\xFChrung in das Fach", hours: 8 },
+      { id: "lb2", label: "Planet Erde", hours: 8 },
+      { id: "lb3", label: "Gestalt und Gliederung der Erde", hours: 10 },
+      { id: "lb4", label: "Ver\xE4nderung der Erdoberfl\xE4che", hours: 10 },
+      {
+        id: "lb5",
+        label: "Naturr\xE4umliche und politische Strukturen in Deutschland und Bayern",
+        hours: 8
+      },
+      { id: "lb6", label: "Anwendung im Nahraum", hours: 8 },
+      { id: "lb7", label: "Aktuelle geographische Fragestellung", hours: 4 }
+    ],
+    "realschule|5|it": [
+      { id: "lb1", label: "Anfangsunterricht" },
+      { id: "lb2", label: "Aufbauunterricht" },
+      { id: "lb3", label: "Bilingualer Sachfachunterricht (optional)" }
+    ],
+    "realschule|5|iu": [
+      { id: "lb1", label: "Miteinander leben \u2013 Eigene Aufgaben wahrnehmen" },
+      {
+        id: "lb2",
+        label: "Religi\xF6ses Leben \u2013 Ausdrucksformen des Islams kennen"
+      },
+      {
+        id: "lb3",
+        label: "Glaubenslehre des Islams \u2013 Gottesvorstellungen reflektieren"
+      },
+      {
+        id: "lb4",
+        label: "Propheten \u2013 Gottes Offenbarungen beschreiben"
+      },
+      {
+        id: "lb5",
+        label: "Muhammads Leben und Wirken \u2013 Eigenschaften von Vorbildern reflektieren"
+      },
+      {
+        id: "lb6",
+        label: "Koran und Schrifttradition \u2013 Fachsprache entwickeln"
+      },
+      {
+        id: "lb7",
+        label: "Geschichte und Geographie des Islams \u2013 Historische Kontexte erl\xE4utern"
+      },
+      {
+        id: "lb8",
+        label: "Religionen und Weltanschauungen \u2013 Gemeinsamkeiten und Unterschiede vergleichen"
+      }
+    ],
+    "realschule|5|ir": [
+      {
+        id: "lb1",
+        label: "J\xFCdischer Kalender und Jahreszyklus: Grundlagen des j\xFCdischen Kalenders, Feiertage im Jahreskreis, Chanukka und Purim",
+        hours: 12
+      },
+      {
+        id: "lb2",
+        label: "Gebet und Ritus: Schma und Amida, die beiden Hauptgebete",
+        hours: 10
+      },
+      {
+        id: "lb3",
+        label: "Mensch und Welt: Vertrauend einen neuen Anfang wagen",
+        hours: 10
+      },
+      {
+        id: "lb4",
+        label: "J\xFCdische Geschichte und Philosophie: Biblische Zeit und Monotheismus",
+        hours: 12
+      },
+      {
+        id: "lb5",
+        label: "Schriftliche Quellen \u2013 Werte: Tora und Anawa (Bescheidenheit)",
+        hours: 12
+      }
+    ],
+    "realschule|5|katholische-religionslehre": [
+      {
+        id: "lb1",
+        label: "Auf Gott vertrauen \u2013 einen neuen Anfang wagen",
+        hours: 10
+      },
+      {
+        id: "lb2",
+        label: "\u201EUmsorge mich mit deiner Liebe\u201C \u2013 beten und meditieren",
+        hours: 10
+      },
+      {
+        id: "lb3",
+        label: "Erfahrungen mit Gott \u2013 Die Heilige Schrift",
+        hours: 12
+      },
+      {
+        id: "lb4",
+        label: '\u201EIn jenen Tagen trat einer auf" \u2013 Jesus im Blickwinkel seiner Zeit und Umwelt',
+        hours: 12
+      },
+      {
+        id: "lb5",
+        label: "Leben in der Pfarrgemeinde \u2013 Eingebundensein in die Kirche",
+        hours: 12
+      }
+    ],
+    "realschule|5|kunst": [
+      {
+        id: "lb1",
+        label: "Bildnerische Auseinandersetzung mit Wirklichkeit und Fantasie",
+        hours: 44
+      },
+      { id: "lb2", label: "Bildende Kunst", hours: 20 },
+      { id: "lb3", label: "Angewandte Kunst", hours: 20 }
+    ],
+    "realschule|5|mathematik": [
+      { id: "lb1", label: "Nat\xFCrliche Zahlen", hours: 50 },
+      { id: "lb2", label: "Ganze Zahlen", hours: 20 },
+      {
+        id: "lb3",
+        label: "Geometrische Grundvorstellungen und Grundbegriffe",
+        hours: 30
+      },
+      { id: "lb4", label: "Gr\xF6\xDFen", hours: 20 },
+      {
+        id: "lb5",
+        label: "Umfang und Fl\xE4cheninhalt ebener Figuren",
+        hours: 15
+      },
+      { id: "lb6", label: "Auswertung von Daten", hours: 5 }
+    ],
+    "realschule|5|musik": [
+      { id: "lb1", label: "Sprechen \u2013 Singen \u2013 Musizieren", hours: 20 },
+      { id: "lb2", label: "Musik \u2013 Mensch \u2013 Zeit", hours: 10 },
+      { id: "lb3", label: "Bewegung \u2013 Tanz \u2013 Szene", hours: 10 },
+      { id: "lb4", label: "Musik und ihre Grundlagen", hours: 16 }
+    ],
+    "realschule|5|or": [
+      { id: "lb1", label: "Miteinander leben", hours: 10 },
+      { id: "lb2", label: "Von Gott und zu Gott sprechen", hours: 10 },
+      { id: "lb3", label: "Die Bibel", hours: 12 },
+      { id: "lb4", label: "Ursprung der Kirche", hours: 12 },
+      { id: "lb5", label: "Kirche vor Ort", hours: 12 }
+    ],
+    "realschule|5|sport|basis_sport": [
+      { id: "lb1", label: "Gesundheit und Fitness" },
+      { id: "lb2", label: "Fairness/Kooperation/Selbstkompetenz" },
+      { id: "lb3", label: "Freizeit und Umwelt" },
+      { id: "lb4", label: "Sportliche Handlungsfelder" }
+    ],
+    "realschule|5|sport|diff_sport": [
+      { id: "lb1", label: "Bewegungsk\xFCnste" },
+      { id: "lb2", label: "Radsport" },
+      { id: "lb3", label: "Rhythmische Sportgymnastik" },
+      { id: "lb4", label: "Sportklettern" }
+    ],
+    "realschule|5|textiles-gestalten": [
+      { id: "lb1", label: "Eine textile Fl\xE4che bilden \u2013 Filzen", hours: 18 },
+      { id: "lb2", label: "Eine textile Fl\xE4che bilden \u2013 H\xE4keln", hours: 18 },
+      { id: "lb3", label: "Eine textile Fl\xE4che bilden \u2013 Weben", hours: 24 },
+      { id: "lb4", label: "Eine textile Fl\xE4che bilden \u2013 Kn\xFCpfen", hours: 24 },
+      {
+        id: "lb5",
+        label: "Eine textile Fl\xE4che verarbeiten \u2013 Handn\xE4hen, Maschinenn\xE4hen",
+        hours: 42
+      }
+    ],
+    "realschule|5|werken": [
+      { id: "lb1", label: "Arbeiten mit dem Werkstoff Holz", hours: 28 },
+      { id: "lb2", label: "Arbeiten mit Papierwerkstoffen", hours: 28 },
+      { id: "lb3", label: "Arbeiten mit plastischen Massen", hours: 28 }
+    ],
     "realschule|9|mathematik|wpfg1": [
       { id: "lb1", label: "Reelle Zahlen", hours: 10 },
       { id: "lb2", label: "Zentrische Streckung", hours: 17 },
@@ -12835,6 +13514,24 @@ var LEHRPLANPLUS_BAYERN_MANIFEST = {
     ]
   },
   contentUrls: {
+    "realschule|5|biologie": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/5/fach/biologie/inhalt/fachlehrplaene",
+    "realschule|5|deutsch": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/5/fach/deutsch/inhalt/fachlehrplaene",
+    "realschule|5|englisch": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/5/fach/englisch/inhalt/fachlehrplaene",
+    "realschule|5|ethik": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/5/fach/ethik/inhalt/fachlehrplaene",
+    "realschule|5|evangelische-religionslehre": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/5/fach/evangelische-religionslehre/inhalt/fachlehrplaene",
+    "realschule|5|geographie": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/5/fach/geographie/inhalt/fachlehrplaene",
+    "realschule|5|it": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/5/fach/it/inhalt/fachlehrplaene",
+    "realschule|5|iu": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/5/fach/iu/inhalt/fachlehrplaene",
+    "realschule|5|ir": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/5/fach/ir/inhalt/fachlehrplaene",
+    "realschule|5|katholische-religionslehre": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/5/fach/katholische-religionslehre/inhalt/fachlehrplaene",
+    "realschule|5|kunst": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/5/fach/kunst/inhalt/fachlehrplaene",
+    "realschule|5|mathematik": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/5/fach/mathematik/inhalt/fachlehrplaene",
+    "realschule|5|musik": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/5/fach/musik/inhalt/fachlehrplaene",
+    "realschule|5|or": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/5/fach/or/inhalt/fachlehrplaene",
+    "realschule|5|sport|basis_sport": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/5/fach/sport/inhalt/fachlehrplaene?w_schulart=realschule&wt_1=schulart&w_fach=sport&wt_2=fach&w_jgs=5&wt_3=jgs&w_auspraegung=basis_sport",
+    "realschule|5|sport|diff_sport": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/5/fach/sport/inhalt/fachlehrplaene?w_schulart=realschule&wt_1=schulart&w_fach=sport&wt_2=fach&w_jgs=5&wt_3=jgs&w_auspraegung=diff_sport",
+    "realschule|5|textiles-gestalten": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/5/fach/textiles-gestalten/inhalt/fachlehrplaene",
+    "realschule|5|werken": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/5/fach/werken/inhalt/fachlehrplaene",
     "realschule|9|mathematik|wpfg1": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/9/fach/mathematik/inhalt/fachlehrplaene?w_schulart=realschule&wt_1=schulart&w_fach=mathematik&wt_2=fach&w_jgs=9&wt_3=jgs&w_auspraegung=wpfg1",
     "realschule|9|mathematik|wpfg2-3": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/9/fach/mathematik/inhalt/fachlehrplaene?w_schulart=realschule&wt_1=schulart&w_fach=mathematik&wt_2=fach&w_jgs=9&wt_3=jgs&w_auspraegung=wpfg2-3",
     "realschule|9|deutsch": "https://www.lehrplanplus.bayern.de/schulart/realschule/jgs/9/fach/deutsch/inhalt/fachlehrplaene",
@@ -12846,6 +13543,95 @@ var LEHRPLANPLUS_BAYERN_MANIFEST = {
 function levelKey(schoolType, grade, subject, track) {
   return track ? `${schoolType}|${grade}|${subject}|${track}` : `${schoolType}|${grade}|${subject}`;
 }
+function parseHtmlSections(html) {
+  const chunks = html.split('<div id="thema_');
+  const sections = [];
+  for (let i = 1; i < chunks.length; i++) {
+    const chunk = chunks[i];
+    const quoteIdx = chunk.indexOf('"');
+    if (quoteIdx === -1) continue;
+    const id = chunk.slice(0, quoteIdx);
+    const classStart = chunk.indexOf('class="');
+    if (classStart === -1) continue;
+    const classEnd = chunk.indexOf('"', classStart + 7);
+    const classContent = chunk.slice(classStart + 7, classEnd);
+    const lvlMatch = classContent.match(/headline_lvl(\d+)/);
+    if (!lvlMatch) continue;
+    const level = parseInt(lvlMatch[1], 10);
+    const contentHtml = chunk.slice(classEnd + 1);
+    const headerMatch = contentHtml.match(
+      /<a[^>]*class="paragraph_toggle"[^>]*>([\s\S]*?)<\/a>/i
+    );
+    const headerText = headerMatch ? cleanHtmlText12(headerMatch[1]).trim() : "";
+    sections.push({
+      id,
+      level,
+      headerText,
+      contentHtml
+    });
+  }
+  return sections;
+}
+function resolveTopicLabel(topicId) {
+  for (const key of Object.keys(LEHRPLANPLUS_BAYERN_MANIFEST.topics)) {
+    const list = LEHRPLANPLUS_BAYERN_MANIFEST.topics[key];
+    const match = list.find(
+      (t2) => t2.id === topicId || `${key}#${t2.id}` === topicId
+    );
+    if (match) {
+      return match.label;
+    }
+  }
+  return null;
+}
+function findTopicSectionHtml(sections, topicId) {
+  const label = resolveTopicLabel(topicId);
+  if (!label) return null;
+  const normalizedLabel = normalizeForComparison12(label);
+  const lvl1Index = sections.findIndex((s) => {
+    if (s.level !== 1) return false;
+    const normalizedHeader = normalizeForComparison12(s.headerText);
+    return normalizedHeader.includes(normalizedLabel);
+  });
+  if (lvl1Index === -1) return null;
+  const collectedSections = [sections[lvl1Index]];
+  for (let i = lvl1Index + 1; i < sections.length; i++) {
+    if (sections[i].level === 1) {
+      break;
+    }
+    collectedSections.push(sections[i]);
+  }
+  return collectedSections.map((s) => s.contentHtml).join("\n");
+}
+function isExcludedCompetenceItem(liAttrs, text) {
+  if (/plus_servicematerialien|plus_ueberg_ziele/i.test(liAttrs)) {
+    return true;
+  }
+  const normalized = text.toLowerCase().replace(/ä/g, "ae").replace(/ö/g, "oe").replace(/ü/g, "ue").replace(/ß/g, "ss").trim();
+  if (/^\+?\s*servicematerialien/.test(normalized)) return true;
+  if (/^\+?\s*uebergreifende\s+ziele/.test(normalized)) return true;
+  return false;
+}
+function extractCompetenceItems(topicHtml) {
+  const items = [];
+  const abschBlocks = topicHtml.match(/<div class="thema_absch">[\s\S]*?<\/div>/gi) ?? [];
+  for (const block of abschBlocks) {
+    const liRegex = /<li([^>]*)>([\s\S]*?)<\/li>/gi;
+    let match = liRegex.exec(block);
+    while (match !== null) {
+      const text = cleanHtmlText12(match[2]).trim();
+      if (text.length > 0 && !isExcludedCompetenceItem(match[1], text)) {
+        items.push(text);
+      }
+      match = liRegex.exec(block);
+    }
+  }
+  return items;
+}
+function truncateLabel(text, maxLen = 72) {
+  if (text.length <= maxLen) return text;
+  return `${text.slice(0, maxLen - 1).trim()}\u2026`;
+}
 var lehrplanplusBayernProvider = {
   id: "lehrplanplus-bayern",
   country: "DE",
@@ -12891,68 +13677,42 @@ var lehrplanplusBayernProvider = {
     };
   },
   extractTopics(html, topicIds) {
-    const chunks = html.split('<div id="thema_');
-    const sections = [];
-    for (let i = 1; i < chunks.length; i++) {
-      const chunk = chunks[i];
-      const quoteIdx = chunk.indexOf('"');
-      if (quoteIdx === -1) continue;
-      const id = chunk.slice(0, quoteIdx);
-      const classStart = chunk.indexOf('class="');
-      if (classStart === -1) continue;
-      const classEnd = chunk.indexOf('"', classStart + 7);
-      const classContent = chunk.slice(classStart + 7, classEnd);
-      const lvlMatch = classContent.match(/headline_lvl(\d+)/);
-      if (!lvlMatch) continue;
-      const level = parseInt(lvlMatch[1], 10);
-      const contentHtml = chunk.slice(classEnd + 1);
-      const headerMatch = contentHtml.match(
-        /<a[^>]*class="paragraph_toggle"[^>]*>([\s\S]*?)<\/a>/i
-      );
-      const headerText = headerMatch ? cleanHtmlText12(headerMatch[1]).trim() : "";
-      sections.push({
-        id,
-        level,
-        headerText,
-        contentHtml
-      });
-    }
+    const sections = parseHtmlSections(html);
     const results = {};
     for (const topicId of topicIds) {
-      let label = "";
-      for (const key of Object.keys(LEHRPLANPLUS_BAYERN_MANIFEST.topics)) {
-        const list = LEHRPLANPLUS_BAYERN_MANIFEST.topics[key];
-        const match = list.find(
-          (t2) => t2.id === topicId || `${key}#${t2.id}` === topicId
-        );
-        if (match) {
-          label = match.label;
-          break;
-        }
+      const topicHtml = findTopicSectionHtml(sections, topicId);
+      if (topicHtml) {
+        results[topicId] = cleanHtmlText12(topicHtml);
       }
-      if (!label) {
-        continue;
-      }
-      const normalizedLabel = normalizeForComparison12(label);
-      const lvl1Index = sections.findIndex((s) => {
-        if (s.level !== 1) return false;
-        const normalizedHeader = normalizeForComparison12(s.headerText);
-        return normalizedHeader.includes(normalizedLabel);
-      });
-      if (lvl1Index === -1) {
-        continue;
-      }
-      const collectedSections = [sections[lvl1Index]];
-      for (let i = lvl1Index + 1; i < sections.length; i++) {
-        if (sections[i].level === 1) {
-          break;
-        }
-        collectedSections.push(sections[i]);
-      }
-      const fullHtml = collectedSections.map((s) => s.contentHtml).join("\n");
-      results[topicId] = cleanHtmlText12(fullHtml);
     }
     return results;
+  },
+  extractSubTopics(html, topicId) {
+    const sections = parseHtmlSections(html);
+    const topicHtml = findTopicSectionHtml(sections, topicId);
+    if (!topicHtml) return [];
+    const header = sections.find((s) => {
+      if (s.level !== 1) return false;
+      const label = resolveTopicLabel(topicId);
+      if (!label) return false;
+      return normalizeForComparison12(s.headerText).includes(
+        normalizeForComparison12(label)
+      );
+    });
+    const headerText = header?.headerText ?? resolveTopicLabel(topicId) ?? "";
+    const competenceItems = extractCompetenceItems(topicHtml);
+    if (competenceItems.length === 0) return [];
+    return competenceItems.map((item, index) => {
+      const text = `${headerText}
+
+${item}`;
+      return {
+        id: `ku${index + 1}`,
+        label: truncateLabel(item),
+        textLength: text.length,
+        text
+      };
+    });
   }
 };
 function cleanHtmlText12(html) {
@@ -13491,6 +14251,127 @@ function getCurriculumProvider(id) {
   return CURRICULUM_PROVIDERS.find((provider) => provider.id === id);
 }
 
+// src/cli/llm/capability-probe.ts
+init_kernel();
+var EMBEDDING_MODEL_HINTS = [
+  "embed",
+  "text-embedding",
+  "bge-",
+  "gte-",
+  "nomic",
+  "mxbai"
+];
+var VISION_MODEL_HINTS = [
+  "vision",
+  "-vl",
+  "vl-",
+  "vlm",
+  "llava",
+  "gpt-4o",
+  "gpt-4.1",
+  "gpt-5",
+  "gemini",
+  "pixtral",
+  "minicpm-v",
+  "internvl",
+  "moondream",
+  "llama-3.2",
+  "llama3.2",
+  // Xiaomi MiMo(-VL) is multimodal; the plain "mimo-v*" tag carries no "-vl".
+  "mimo"
+];
+function matchesAny(id, hints) {
+  const lower = id.toLowerCase();
+  return hints.some((hint) => lower.includes(hint));
+}
+function catalogHasModel(catalog, model) {
+  const lower = model.toLowerCase();
+  return catalog.some((id) => id.toLowerCase() === lower);
+}
+function classifyCapabilities(entry, catalog, catalogKnown, dimProbeEmbedding = false) {
+  const detected = emptyCapabilityFlags();
+  if (entry.apiFlavor === "anthropic-messages") {
+    detected.text = true;
+    detected.image = true;
+    return detected;
+  }
+  const looksEmbedding = matchesAny(entry.model, EMBEDDING_MODEL_HINTS);
+  const looksVision = matchesAny(entry.model, VISION_MODEL_HINTS);
+  const inCatalog = catalogHasModel(catalog, entry.model);
+  detected.embedding = looksEmbedding || dimProbeEmbedding;
+  detected.image = looksVision;
+  detected.text = !detected.embedding && (inCatalog || !catalogKnown);
+  return detected;
+}
+function resolveApiKey(apiKeyRef) {
+  if (!apiKeyRef) return DEFAULT_LLM_API_KEY;
+  return getProviderApiKey(apiKeyRef) ?? DEFAULT_LLM_API_KEY;
+}
+async function probeModelCapabilities(entry, opts = {}) {
+  const apiKey = resolveApiKey(entry.apiKeyRef);
+  if (entry.apiFlavor === "anthropic-messages") {
+    const online2 = await isLlmOnline(entry.url);
+    return {
+      reachable: online2,
+      catalog: [],
+      detected: classifyCapabilities(entry, [], false)
+    };
+  }
+  const online = await isLlmOnline(entry.url);
+  if (!online) {
+    return { reachable: false, catalog: [], detected: emptyCapabilityFlags() };
+  }
+  const catalog = await getAvailableModels(entry.url, apiKey);
+  const catalogKnown = catalog.length > 0;
+  let dimProbeEmbedding = false;
+  const looksEmbedding = matchesAny(entry.model, EMBEDDING_MODEL_HINTS);
+  if (opts.embeddingDimProbe && !catalogKnown && !looksEmbedding) {
+    try {
+      const [vector] = await embedTexts(
+        { url: entry.url, model: entry.model, apiKey },
+        ["capability probe"]
+      );
+      dimProbeEmbedding = Array.isArray(vector) && vector.length > 0;
+    } catch {
+      dimProbeEmbedding = false;
+    }
+  }
+  return {
+    reachable: true,
+    catalog,
+    detected: classifyCapabilities(
+      entry,
+      catalog,
+      catalogKnown,
+      dimProbeEmbedding
+    )
+  };
+}
+function reconcileCapabilities(userSelected, detected) {
+  const result = emptyCapabilityFlags();
+  for (const key of Object.keys(result)) {
+    result[key] = userSelected[key] && detected[key];
+  }
+  return result;
+}
+function validateModelSave(entry, probe, now = () => (/* @__PURE__ */ new Date()).toISOString()) {
+  if (!probe.reachable) {
+    return {
+      ok: false,
+      error: "Endpoint is unreachable \u2014 cannot verify capabilities. Bring it online and retry."
+    };
+  }
+  return {
+    ok: true,
+    entry: {
+      ...entry,
+      capabilities: reconcileCapabilities(entry.capabilities, probe.detected),
+      detectedCapabilities: probe.detected,
+      probedAt: now()
+    }
+  };
+}
+
 // src/cli/llm/vision.ts
 init_kernel();
 import { randomBytes } from "crypto";
@@ -13964,6 +14845,12 @@ function bindRoleProviders(roles, role, primary, fallback) {
   if (fallback) binding.fallback = fallback;
   return { ...roles, [role]: binding };
 }
+function unbindRole(roles, role) {
+  if (!(role in roles)) return roles;
+  const next = { ...roles };
+  delete next[role];
+  return next;
+}
 function maskSecret(key) {
   return key.length <= 4 ? "\u2022\u2022\u2022\u2022" : `\u2026${key.slice(-4)}`;
 }
@@ -16042,12 +16929,15 @@ bridgeCommand.command("provider-config-bind").description("Bind providers to an
   await withProviderScope(machine, async (db) => {
     const providers = await readScopedProviders(db, machine);
     const roles = await readScopedRoles(db, machine);
-    const nextRoles = bindRoleProviders(
+    let nextRoles = bindRoleProviders(
       roles,
       opts.role,
       opts.primary,
       opts.fallback
     );
+    if (opts.role === "recall") {
+      nextRoles = unbindRole(nextRoles, "text");
+    }
     await writeScopedRoles(db, machine, nextRoles);
     const binding = nextRoles[opts.role];
     const primary = providers[opts.primary];
@@ -16079,8 +16969,198 @@ bridgeCommand.command("list-models").description("List models exposed by an LLM
   const models = await getAvailableModels(opts.url, apiKey);
   jsonOut2({ models });
 });
-bridgeCommand.command("cloud-model-hint").description("Suggest a cloud model for an endpoint URL (JSON)").requiredOption("--url <url>", "Endpoint base URL").action((opts) => {
-  jsonOut2({ recommendation: getCloudModelRecommendation(opts.url) });
+function modelRow(entry) {
+  return {
+    id: entry.id,
+    label: entry.label,
+    url: entry.url,
+    model: entry.model,
+    local: entry.local,
+    apiFlavor: entry.apiFlavor,
+    runner: entry.runner,
+    order: entry.order,
+    capabilities: entry.capabilities,
+    detectedCapabilities: entry.detectedCapabilities,
+    probedAt: entry.probedAt,
+    apiKeyRef: entry.apiKeyRef,
+    keyState: entry.apiKeyRef ? getProviderApiKey(entry.apiKeyRef) ? "set" : "missing" : "none"
+  };
+}
+function parseCapabilityFlags(json) {
+  const flags = emptyCapabilityFlags();
+  if (!json) return flags;
+  let parsed;
+  try {
+    parsed = JSON.parse(json);
+  } catch {
+    jsonError("Invalid --capabilities JSON");
+  }
+  if (parsed && typeof parsed === "object") {
+    const record = parsed;
+    for (const key of Object.keys(flags)) {
+      if (record[key] === true) flags[key] = true;
+    }
+  }
+  return flags;
+}
+function urlLooksLocal(url) {
+  return /localhost|127\.0\.0\.1|\[::1\]|::1/.test(url);
+}
+bridgeCommand.command("model-list").description("List the machine-local capability model registry (JSON)").action(() => {
+  ensureMachineAiModelsMigrated();
+  const models = [...getMachineAiModels()].sort((a, b) => a.order - b.order);
+  jsonOut2({ models: models.map(modelRow) });
+});
+bridgeCommand.command("model-probe").description("Detect capabilities of an endpoint via metadata (JSON)").requiredOption("--url <url>", "Endpoint base URL").requiredOption("--model <model>", "Model id").option(
+  "--flavor <flavor>",
+  `Wire protocol: ${VALID_API_FLAVORS.join(" | ")}`
+).option("--key-ref <ref>", "Credential reference for API key").option("--embedding-dim-probe", "Allow one cheap /v1/embeddings dim probe").action(async (opts) => {
+  if (opts.flavor && !VALID_API_FLAVORS.includes(opts.flavor)) {
+    jsonError(`Invalid --flavor: ${opts.flavor}.`);
+  }
+  const apiFlavor = opts.flavor ?? inferApiFlavor(opts.url);
+  const probe = await probeModelCapabilities(
+    {
+      url: opts.url,
+      model: opts.model,
+      apiFlavor,
+      apiKeyRef: opts.keyRef
+    },
+    { embeddingDimProbe: opts.embeddingDimProbe === true }
+  );
+  jsonOut2({
+    reachable: probe.reachable,
+    catalog: probe.catalog,
+    detected: probe.detected
+  });
+});
+bridgeCommand.command("model-upsert").description(
+  "Add or update a registry entry; probes before persisting (JSON)"
+).option("--id <id>", "Existing entry id (omit to create)").option("--label <label>", "Human label").option("--url <url>", "Endpoint base URL").option("--model <model>", "Model id").option(
+  "--flavor <flavor>",
+  `Wire protocol: ${VALID_API_FLAVORS.join(" | ")}`
+).option("--local", "Mark as local endpoint").option("--no-local", "Mark as cloud/non-local endpoint").option("--runner <runner>", "Local runner hint").option("--key-ref <ref>", "Credential reference for API key").option("--capabilities <json>", "JSON object of user-selected capabilities").option("--order <n>", "Explicit sort order").action(async (opts, command) => {
+  if (opts.flavor && !VALID_API_FLAVORS.includes(opts.flavor)) {
+    jsonError(`Invalid --flavor: ${opts.flavor}.`);
+  }
+  const models = getMachineAiModels();
+  const existingIndex = opts.id ? models.findIndex((m) => m.id === opts.id) : -1;
+  if (opts.id && existingIndex < 0) jsonError(`No such model: ${opts.id}`);
+  const prev = existingIndex >= 0 ? models[existingIndex] : void 0;
+  const url = opts.url ?? prev?.url ?? "";
+  if (!url) jsonError("--url is required");
+  const model = opts.model ?? prev?.model ?? "";
+  if (!model) jsonError("--model is required");
+  const apiFlavor = opts.flavor ?? prev?.apiFlavor ?? inferApiFlavor(url);
+  const local = command.getOptionValueSource("local") === "cli" ? opts.local === true : prev?.local ?? urlLooksLocal(url);
+  const order = opts.order !== void 0 ? Number.parseInt(opts.order, 10) : prev?.order ?? models.length;
+  const candidate = {
+    id: opts.id ?? ulid10(),
+    label: opts.label ?? prev?.label ?? model,
+    url,
+    model,
+    local,
+    apiFlavor,
+    order,
+    capabilities: opts.capabilities ? parseCapabilityFlags(opts.capabilities) : prev?.capabilities ?? emptyCapabilityFlags(),
+    detectedCapabilities: prev?.detectedCapabilities ?? emptyCapabilityFlags()
+  };
+  const runner = opts.runner ?? prev?.runner;
+  if (runner) candidate.runner = runner;
+  const apiKeyRef = opts.keyRef ?? prev?.apiKeyRef;
+  if (apiKeyRef) candidate.apiKeyRef = apiKeyRef;
+  const probe = await probeModelCapabilities(candidate, {
+    embeddingDimProbe: true
+  });
+  const validation = validateModelSave(candidate, probe);
+  if (!validation.ok || !validation.entry) {
+    jsonError(validation.error ?? "Model could not be saved.");
+  }
+  const next = [...models];
+  if (existingIndex >= 0) next[existingIndex] = validation.entry;
+  else next.push(validation.entry);
+  saveMachineAiModels(next);
+  jsonOut2({
+    ok: true,
+    model: modelRow(validation.entry),
+    probe: { reachable: probe.reachable, detected: probe.detected }
+  });
+});
+bridgeCommand.command("model-reprobe").description("Re-run capability detection for an entry; may widen (JSON)").requiredOption("--id <id>", "Registry entry id").action(async (opts) => {
+  const models = getMachineAiModels();
+  const index = models.findIndex((m) => m.id === opts.id);
+  if (index < 0) jsonError(`No such model: ${opts.id}`);
+  const entry = models[index];
+  const probe = await probeModelCapabilities(entry, {
+    embeddingDimProbe: true
+  });
+  const validation = validateModelSave(entry, probe);
+  if (!validation.ok || !validation.entry) {
+    jsonError(validation.error ?? "Re-probe failed.");
+  }
+  const next = [...models];
+  next[index] = validation.entry;
+  saveMachineAiModels(next);
+  jsonOut2({
+    ok: true,
+    model: modelRow(validation.entry),
+    probe: { reachable: probe.reachable, detected: probe.detected }
+  });
+});
+bridgeCommand.command("model-remove").description("Remove a registry entry (JSON)").requiredOption("--id <id>", "Registry entry id").action((opts) => {
+  const models = getMachineAiModels();
+  const next = models.filter((m) => m.id !== opts.id);
+  if (next.length === models.length) jsonError(`No such model: ${opts.id}`);
+  next.sort((a, b) => a.order - b.order).forEach((m, i) => {
+    m.order = i;
+  });
+  saveMachineAiModels(next);
+  jsonOut2({ ok: true, id: opts.id, models: next.map(modelRow) });
+});
+bridgeCommand.command("model-reorder").description("Set registry order from an ordered id list (JSON)").requiredOption("--ids <json>", "JSON array of entry ids in desired order").action((opts) => {
+  let ids;
+  try {
+    ids = JSON.parse(opts.ids);
+  } catch {
+    jsonError("Invalid --ids JSON");
+    return;
+  }
+  if (!Array.isArray(ids)) jsonError("--ids must be a JSON array");
+  const models = getMachineAiModels();
+  const rank = new Map(ids.map((id, i) => [id, i]));
+  const next = [...models].sort((a, b) => {
+    const ra = rank.get(a.id) ?? ids.length + a.order;
+    const rb = rank.get(b.id) ?? ids.length + b.order;
+    return ra - rb;
+  });
+  next.forEach((m, i) => {
+    m.order = i;
+  });
+  saveMachineAiModels(next);
+  jsonOut2({ ok: true, models: next.map(modelRow) });
+});
+bridgeCommand.command("model-set-capabilities").description(
+  "Set user-enabled capabilities within the detected ceiling (JSON)"
+).requiredOption("--id <id>", "Registry entry id").requiredOption(
+  "--capabilities <json>",
+  "JSON object of desired capabilities"
+).action((opts) => {
+  const models = getMachineAiModels();
+  const index = models.findIndex((m) => m.id === opts.id);
+  if (index < 0) jsonError(`No such model: ${opts.id}`);
+  const requested = parseCapabilityFlags(opts.capabilities);
+  const detected = models[index].detectedCapabilities;
+  const capabilities = emptyCapabilityFlags();
+  for (const key of Object.keys(capabilities)) {
+    capabilities[key] = requested[key] && detected[key];
+  }
+  const next = [...models];
+  next[index] = { ...models[index], capabilities };
+  saveMachineAiModels(next);
+  jsonOut2({ ok: true, model: modelRow(next[index]) });
+});
+bridgeCommand.command("cloud-model-hint").description("Suggest a cloud model for an endpoint URL (JSON)").requiredOption("--url <url>", "Endpoint base URL").action((opts) => {
+  jsonOut2({ recommendation: getCloudModelRecommendation(opts.url) });
 });
 bridgeCommand.command("local-llm-hints").description("Detect installed local LLM servers and suggest defaults (JSON)").action(() => {
   const profile = getSystemProfile();
@@ -16224,6 +17304,93 @@ bridgeCommand.command("evaluate-answer").description(
     }
   });
 });
+function parseDiscussionThread(raw) {
+  if (!raw) return [];
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    throw new Error("Invalid --thread: not valid JSON");
+  }
+  if (!Array.isArray(parsed)) {
+    throw new Error("Invalid --thread: expected a JSON array of turns");
+  }
+  return parsed.map((turn, index) => {
+    const candidate = turn;
+    if (candidate?.role !== "user" && candidate?.role !== "assistant" || typeof candidate?.content !== "string") {
+      throw new Error(
+        `Invalid --thread: turn ${index} must be {"role": "user"|"assistant", "content": string}`
+      );
+    }
+    return { role: candidate.role, content: candidate.content };
+  });
+}
+bridgeCommand.command("discuss-review").description(
+  "Answer one turn of the post-reveal follow-up discussion about a card (JSON)"
+).requiredOption("--slug <slug>", "Token slug").requiredOption("--concept <concept>", "Target concept text").requiredOption("--domain <domain>", "Token domain").requiredOption("--bloom-level <level>", "Bloom taxonomy level").requiredOption("--question <question>", "Question prompt presented").requiredOption("--user-answer <answer>", "User's typed answer").requiredOption("--message <text>", "The learner's newest discussion turn").option("--feedback <text>", "AI feedback already shown for this answer").option(
+  "--thread <json>",
+  'Prior turns, oldest first, as JSON: [{"role":"user"|"assistant","content":"\u2026"},\u2026]'
+).option("--context <context>", "Optional token context details").option("--source-link <link>", "Optional source link").option(
+  "--source-content <content>",
+  "Pre-resolved source reference content (skips re-fetch when set)"
+).action(async (opts) => {
+  await withDb2(async (db) => {
+    const isEnabled = await getSetting(db, "llm.enabled") === "true";
+    if (!isEnabled) {
+      jsonOut2({
+        success: false,
+        error: "LLM integration is disabled",
+        reply: ""
+      });
+      return;
+    }
+    let thread;
+    try {
+      thread = parseDiscussionThread(opts.thread);
+    } catch (err) {
+      jsonOut2({
+        success: false,
+        error: err.message,
+        reply: ""
+      });
+      return;
+    }
+    let resolvedContextContent = opts.sourceContent ?? null;
+    if (resolvedContextContent == null && opts.sourceLink) {
+      try {
+        const resolved = await resolveReviewContext(opts.sourceLink);
+        resolvedContextContent = resolved?.content ?? null;
+      } catch {
+      }
+    }
+    try {
+      const result = await discussReviewViaLLM(db, {
+        slug: opts.slug,
+        concept: opts.concept,
+        domain: opts.domain,
+        bloomLevel: Number(opts.bloomLevel),
+        context: opts.context,
+        question: opts.question,
+        userAnswer: opts.userAnswer,
+        sourceLinkContent: resolvedContextContent,
+        feedback: opts.feedback ?? null,
+        thread,
+        message: opts.message
+      });
+      jsonOut2({
+        success: true,
+        reply: result.text,
+        replyModel: result.model
+      });
+    } catch (err) {
+      jsonOut2({
+        success: false,
+        error: err.message,
+        reply: ""
+      });
+    }
+  });
+});
 bridgeCommand.command("desktop-bootstrap").description("Initialize first-run desktop state (JSON)").option("--user <id>", "Preferred user ID when none is configured").action(async (opts) => {
   await withDb2(async (db) => {
     const userId = await ensureDefaultUser(db, opts.user);
@@ -16252,6 +17419,54 @@ bridgeCommand.command("get-settings").description("Get active ZAM settings (JSON
     });
   });
 });
+bridgeCommand.command("agent-harness-status").description(
+  "Detect installed agent harnesses and their ZAM MCP configuration state (JSON)"
+).action(() => {
+  const report = inspectConnectHarnesses();
+  jsonOut2({
+    success: true,
+    zamOnPath: report.zamOnPath,
+    harnesses: report.harnesses
+  });
+});
+bridgeCommand.command("agent-connect").description(
+  "Run the idempotent agent-connect flow for one or all detected harnesses (JSON)"
+).option("--harness <id>", "Explicit harness id (default: all detected)").option(
+  "--auto-once",
+  "First-run mode: skip when the auto-connect marker is already set; set the marker after a run that detected at least one harness"
+).action(async (opts) => {
+  if (opts.harness && !isConnectHarnessId(opts.harness)) {
+    jsonOut2({
+      success: false,
+      error: `Unsupported harness: ${opts.harness}`
+    });
+    return;
+  }
+  const harness = opts.harness;
+  const run = () => {
+    const report = performAgentConnect({ harness });
+    return {
+      success: report.success,
+      detected: report.detected,
+      zamOnPath: report.zamOnPath,
+      results: report.results.map(({ content: _content, ...rest }) => rest),
+      skills: report.skills
+    };
+  };
+  if (opts.autoOnce) {
+    if (getAgentConnectAutoDone()) {
+      jsonOut2({ success: true, skipped: true });
+      return;
+    }
+    const payload = run();
+    if (payload.detected.length > 0) {
+      setAgentConnectAutoDone(true);
+    }
+    jsonOut2(payload);
+    return;
+  }
+  jsonOut2(run());
+});
 async function readDatabaseUserSummaries(db) {
   return await db.prepare(
     `SELECT user_id AS id, COUNT(*) AS cardCount
@@ -16683,7 +17898,10 @@ bridgeCommand.command("personal-card-delete").description("Hard-delete a token a
     });
   });
 });
-bridgeCommand.command("personal-card-import-curriculum").description("Parse curriculum text using LLM and import cards (JSON)").option("--user <id>", "User ID (default: whoami)").requiredOption("--text <text>", "Curriculum syllabus/content text").requiredOption(
+bridgeCommand.command("personal-card-import-curriculum").description("Parse curriculum text using LLM and import cards (JSON)").option("--user <id>", "User ID (default: whoami)").option("--text <text>", "Curriculum syllabus/content text").option(
+  "--sourceId <id>",
+  "Read curriculum text from a sources row (avoids large IPC payloads)"
+).requiredOption(
   "--domain <domain>",
   "Default category/domain for imported cards"
 ).option("--source <url>", "Provenance source link or URL").option("--preview", "Return parsed cards without saving them").option(
@@ -16697,6 +17915,17 @@ bridgeCommand.command("personal-card-import-curriculum").description("Parse curr
 ).action(async (opts) => {
   await withDb2(async (db) => {
     const userId = await resolveUser(opts, db, { json: true });
+    let curriculumText = opts.text;
+    if (opts.sourceId) {
+      const row = await db.prepare("SELECT content FROM sources WHERE id = ?").get(opts.sourceId);
+      if (!row) {
+        jsonError(`Source not found: ${opts.sourceId}`);
+      }
+      curriculumText = row.content ?? "";
+    }
+    if (!curriculumText?.trim()) {
+      jsonError("Curriculum text is required (--text or --sourceId)");
+    }
     const contextNames = parseKnowledgeContextNames2(
       opts.knowledgeContext || []
     );
@@ -16704,7 +17933,7 @@ bridgeCommand.command("personal-card-import-curriculum").description("Parse curr
     const firstContext = contexts[0]?.name;
     const cards = await importCurriculumViaLLM(
       db,
-      opts.text,
+      curriculumText,
       opts.domain,
       opts.source || null,
       { knowledgeContext: firstContext }
@@ -16873,7 +18102,7 @@ bridgeCommand.command("personal-source-import").description(
     } else {
       throw new Error(`Invalid source type: ${opts.type}`);
     }
-    const sourceId = ulid9();
+    const sourceId = ulid10();
     await db.prepare(
       `INSERT INTO sources (id, type, uri, content)
            VALUES (?, ?, ?, ?)
@@ -17058,10 +18287,86 @@ async function fetchRawHtml(url) {
     clearTimeout(timeoutId);
   }
 }
-bridgeCommand.command("curriculum-extract-topics").description(
-  "Fetch and extract specific texts for selected curriculum topics (JSON)"
-).requiredOption("--provider <id>", "Curriculum provider id").requiredOption("--topics <json>", "JSON array of selected topic nodes").action(async (opts) => {
+var CURRICULUM_TOPIC_URI_PREFIX = "zam-curriculum-topic://";
+async function extractAndStoreCurriculumTopics(db, provider, topics) {
+  const topicsByUri = /* @__PURE__ */ new Map();
+  for (const topic of topics) {
+    const resolved = provider.resolveTopic(topic);
+    const list = topicsByUri.get(resolved.uri) || [];
+    list.push(topic);
+    topicsByUri.set(resolved.uri, list);
+  }
+  const extracted = [];
+  for (const [uri, uriTopics] of topicsByUri.entries()) {
+    const rawHtml = await fetchRawHtml(uri);
+    let extractedTexts = {};
+    if (provider.extractTopics) {
+      const fullTopicIds = uriTopics.map((t2) => `${t2.sourceRef}#${t2.id}`);
+      extractedTexts = provider.extractTopics(rawHtml, fullTopicIds);
+    } else {
+      const cleanText = cleanHtml(rawHtml);
+      for (const t2 of uriTopics) {
+        extractedTexts[`${t2.sourceRef}#${t2.id}`] = cleanText;
+      }
+    }
+    const pageCleanedText = cleanHtml(rawHtml);
+    const sourceId = ulid10();
+    await db.prepare(
+      `INSERT INTO sources (id, type, uri, content)
+         VALUES (?, 'web', ?, ?)
+         ON CONFLICT(uri) DO UPDATE SET
+           type = excluded.type,
+           content = excluded.content`
+    ).run(sourceId, uri, pageCleanedText);
+    const record = await db.prepare("SELECT id FROM sources WHERE uri = ?").get(uri);
+    for (const topic of uriTopics) {
+      const resolved = provider.resolveTopic(topic);
+      const text = extractedTexts[resolved.topicId] || "";
+      const topicUri = `${CURRICULUM_TOPIC_URI_PREFIX}${resolved.topicId}`;
+      const topicSourceId = ulid10();
+      await db.prepare(
+        `INSERT INTO sources (id, type, uri, content)
+           VALUES (?, 'web', ?, ?)
+           ON CONFLICT(uri) DO UPDATE SET
+             content = excluded.content`
+      ).run(topicSourceId, topicUri, text);
+      const topicRecord = await db.prepare("SELECT id FROM sources WHERE uri = ?").get(topicUri);
+      extracted.push({
+        topicId: resolved.topicId,
+        uri,
+        sourceId: record.id,
+        topicSourceId: topicRecord.id,
+        textLength: text.length
+      });
+    }
+  }
+  return extracted;
+}
+async function assignConfirmedProposalContexts(db, proposals, contexts) {
+  for (const p of proposals) {
+    const baseText = p.question && p.question.trim().length > 0 ? p.question : p.concept;
+    const cleanDomain = slugify(p.domain || "");
+    const cleanBase = slugify(baseText);
+    let baseSlug = cleanDomain ? `${cleanDomain}-${cleanBase}` : cleanBase;
+    if (baseSlug.length > 60) {
+      baseSlug = baseSlug.slice(0, 60).replace(/-$/, "");
+    }
+    if (!baseSlug) {
+      baseSlug = "token";
+    }
+    const token = await getTokenBySlug(db, baseSlug);
+    if (token) {
+      for (const context of contexts) {
+        await assignTokenToContext(db, token.id, context.id);
+      }
+    }
+  }
+}
+bridgeCommand.command("curriculum-import-status").description(
+  "Check which selected curriculum topics are already imported for a user (JSON)"
+).requiredOption("--provider <id>", "Curriculum provider id").requiredOption("--topics <json>", "JSON array of selected topic nodes").option("--user <id>", "User ID (default: whoami)").action(async (opts) => {
   await withDb2(async (db) => {
+    const userId = await resolveUser(opts, db, { json: true });
     const provider = getCurriculumProvider(opts.provider);
     if (!provider) jsonError(`Unknown curriculum provider: ${opts.provider}`);
     let topics;
@@ -17071,47 +18376,446 @@ bridgeCommand.command("curriculum-extract-topics").description(
       jsonError("Invalid --topics JSON");
       return;
     }
-    const topicsByUri = /* @__PURE__ */ new Map();
+    const status = [];
     for (const topic of topics) {
-      const resolved = provider.resolveTopic(topic);
-      const list = topicsByUri.get(resolved.uri) || [];
-      list.push(topic);
-      topicsByUri.set(resolved.uri, list);
-    }
-    const extracted = [];
-    for (const [uri, uriTopics] of topicsByUri.entries()) {
-      const rawHtml = await fetchRawHtml(uri);
-      let extractedTexts = {};
-      if (provider.extractTopics) {
-        const fullTopicIds = uriTopics.map((t2) => `${t2.sourceRef}#${t2.id}`);
-        extractedTexts = provider.extractTopics(rawHtml, fullTopicIds);
-      } else {
-        const cleanText = cleanHtml(rawHtml);
-        for (const t2 of uriTopics) {
-          extractedTexts[`${t2.sourceRef}#${t2.id}`] = cleanText;
-        }
-      }
-      const pageCleanedText = cleanHtml(rawHtml);
-      const sourceId = ulid9();
-      await db.prepare(
-        `INSERT INTO sources (id, type, uri, content)
-             VALUES (?, 'web', ?, ?)
-             ON CONFLICT(uri) DO UPDATE SET
-               type = excluded.type,
-               content = excluded.content`
-      ).run(sourceId, uri, pageCleanedText);
-      const record = await db.prepare("SELECT id FROM sources WHERE uri = ?").get(uri);
-      for (const topic of uriTopics) {
+      try {
         const resolved = provider.resolveTopic(topic);
-        const text = extractedTexts[resolved.topicId] || "";
-        extracted.push({
+        const cardCount = await countUserCardsForCurriculumTopic(
+          db,
+          userId,
+          provider.id,
+          resolved.topicId
+        );
+        status.push({
           topicId: resolved.topicId,
-          uri,
-          sourceId: record.id,
-          text
+          shortId: topic.id,
+          cardCount,
+          alreadyImported: cardCount > 0
+        });
+      } catch (err) {
+        status.push({
+          topicId: topic.id,
+          shortId: topic.id,
+          cardCount: 0,
+          alreadyImported: false,
+          error: err.message || String(err)
+        });
+      }
+    }
+    jsonOut2({ success: true, status });
+  });
+});
+bridgeCommand.command("curriculum-import-topic").description(
+  "Extract, LLM-preview, and confirm-import one curriculum topic server-side (JSON)"
+).requiredOption("--provider <id>", "Curriculum provider id").requiredOption("--topic <json>", "Single topic node JSON").requiredOption("--domain <domain>", "Subject label for imported card domain").option("--user <id>", "User ID (default: whoami)").option(
+  "--knowledge-context <context>",
+  "Assign confirmed tokens to a knowledge context (repeatable)",
+  (val, memo) => {
+    memo.push(val);
+    return memo;
+  },
+  []
+).action(async (opts) => {
+  await withDb2(async (db) => {
+    const userId = await resolveUser(opts, db, { json: true });
+    const provider = getCurriculumProvider(opts.provider);
+    if (!provider) jsonError(`Unknown curriculum provider: ${opts.provider}`);
+    let topic;
+    try {
+      topic = JSON.parse(opts.topic);
+    } catch {
+      jsonError("Invalid --topic JSON");
+      return;
+    }
+    const extracted = await extractAndStoreCurriculumTopics(db, provider, [
+      topic
+    ]);
+    const item = extracted[0];
+    if (!item || item.textLength === 0) {
+      jsonError(`No curriculum text extracted for topic "${topic.id}"`);
+    }
+    const contextNames = parseKnowledgeContextNames2(
+      opts.knowledgeContext || []
+    );
+    const contexts = await resolveKnowledgeContexts2(db, contextNames);
+    const firstContext = contexts[0]?.name;
+    const topicRow = await db.prepare("SELECT content FROM sources WHERE id = ?").get(item.topicSourceId);
+    const curriculumText = topicRow.content ?? "";
+    const cards = await importCurriculumViaLLM(
+      db,
+      curriculumText,
+      opts.domain,
+      item.uri,
+      { knowledgeContext: firstContext }
+    );
+    if (cards.length === 0) {
+      jsonError(`No cards were generated for ${item.topicId}`);
+    }
+    const proposals = cards.map((card) => ({
+      question: card.question,
+      concept: card.concept,
+      domain: card.domain,
+      title: card.title,
+      bloom_level: card.bloom_level,
+      symbiosis_mode: card.symbiosis_mode || "none",
+      excerpt: card.context || "",
+      page_number: null,
+      provider: provider.id,
+      topic_id: item.topicId
+    }));
+    const result = await confirmSourceImport(
+      db,
+      userId,
+      item.sourceId,
+      proposals
+    );
+    await assignConfirmedProposalContexts(db, proposals, contexts);
+    jsonOut2({
+      success: true,
+      topicId: item.topicId,
+      proposalCount: proposals.length,
+      createdCount: result.createdCount,
+      ensuredCount: result.linkedCount
+    });
+  });
+});
+function proposalBaseSlug(domain, question, concept) {
+  const baseText = question?.trim() ? question : concept;
+  const cleanDomain = slugify(domain || "");
+  const cleanBase = slugify(baseText);
+  let baseSlug = cleanDomain ? `${cleanDomain}-${cleanBase}` : cleanBase;
+  if (baseSlug.length > 60) {
+    baseSlug = baseSlug.slice(0, 60).replace(/-$/, "");
+  }
+  return baseSlug || "token";
+}
+async function executeCurriculumConfirmOperations(db, userId, operations, contexts) {
+  let createdCount = 0;
+  let ensuredCount = 0;
+  let removedCount = 0;
+  await db.transaction(async (tx) => {
+    for (const op of operations) {
+      if (op.create.length > 0) {
+        const result = await applySourceProposals(
+          tx,
+          userId,
+          op.sourceId,
+          op.create
+        );
+        createdCount += result.createdCount;
+        ensuredCount += result.linkedCount;
+        await assignConfirmedProposalContexts(tx, op.create, contexts);
+      }
+      for (const slug of op.removeSlugs) {
+        if (await deleteCurriculumCardForUser(
+          tx,
+          userId,
+          slug,
+          op.provider,
+          op.topicId
+        )) {
+          removedCount++;
+        }
+      }
+    }
+  });
+  return { createdCount, ensuredCount, removedCount };
+}
+bridgeCommand.command("curriculum-list-subtopics").description(
+  "List finer units inside a Lernbereich for chunked import (JSON)"
+).requiredOption("--provider <id>", "Curriculum provider id").requiredOption("--topic <json>", "Single topic node JSON").action(async (opts) => {
+  try {
+    const provider = getCurriculumProvider(opts.provider);
+    if (!provider) jsonError(`Unknown curriculum provider: ${opts.provider}`);
+    if (!provider.extractSubTopics) {
+      jsonOut2({ success: true, subTopics: [] });
+      return;
+    }
+    let topic;
+    try {
+      topic = JSON.parse(opts.topic);
+    } catch {
+      jsonError("Invalid --topic JSON");
+      return;
+    }
+    const resolved = provider.resolveTopic(topic);
+    const rawHtml = await fetchRawHtml(resolved.uri);
+    const subTopics = provider.extractSubTopics(rawHtml, resolved.topicId).map(({ id, label, textLength }) => ({ id, label, textLength }));
+    jsonOut2({ success: true, topicId: resolved.topicId, subTopics });
+  } catch (err) {
+    jsonError(err.message || String(err));
+  }
+});
+bridgeCommand.command("curriculum-preview-topic").description(
+  "Preview importable cards for one topic (existing + LLM proposals) (JSON)"
+).requiredOption("--provider <id>", "Curriculum provider id").requiredOption("--topic <json>", "Single topic node JSON").requiredOption("--domain <domain>", "Subject label for imported card domain").option("--subTopics <json>", "JSON array of sub-topic ids to include").option("--user <id>", "User ID (default: whoami)").option(
+  "--knowledge-context <context>",
+  "Knowledge context for LLM prompt (repeatable)",
+  (val, memo) => {
+    memo.push(val);
+    return memo;
+  },
+  []
+).action(async (opts) => {
+  await withDb2(async (db) => {
+    const userId = await resolveUser(opts, db, { json: true });
+    const provider = getCurriculumProvider(opts.provider);
+    if (!provider) jsonError(`Unknown curriculum provider: ${opts.provider}`);
+    let topic;
+    try {
+      topic = JSON.parse(opts.topic);
+    } catch {
+      jsonError("Invalid --topic JSON");
+      return;
+    }
+    const resolved = provider.resolveTopic(topic);
+    const extracted = await extractAndStoreCurriculumTopics(db, provider, [
+      topic
+    ]);
+    const item = extracted[0];
+    if (!item || item.textLength === 0) {
+      jsonError(`No curriculum text extracted for topic "${topic.id}"`);
+    }
+    const contextNames = parseKnowledgeContextNames2(
+      opts.knowledgeContext || []
+    );
+    const contexts = await resolveKnowledgeContexts2(db, contextNames);
+    const firstContext = contexts[0]?.name;
+    let subTopicIds;
+    if (opts.subTopics) {
+      try {
+        subTopicIds = JSON.parse(opts.subTopics);
+      } catch {
+        jsonError("Invalid --subTopics JSON");
+        return;
+      }
+    }
+    const rawHtml = await fetchRawHtml(item.uri);
+    const chunks = [];
+    if (provider.extractSubTopics) {
+      const subTopics = provider.extractSubTopics(rawHtml, resolved.topicId);
+      const selected = subTopicIds && subTopicIds.length > 0 ? subTopics.filter((st) => subTopicIds.includes(st.id)) : subTopics;
+      if (selected.length > 0) {
+        for (const st of selected) {
+          chunks.push({ subTopicId: st.id, text: st.text });
+        }
+      }
+    }
+    if (chunks.length === 0) {
+      const topicRow = await db.prepare("SELECT content FROM sources WHERE id = ?").get(item.topicSourceId);
+      chunks.push({
+        subTopicId: null,
+        text: topicRow.content ?? ""
+      });
+    }
+    const existingCards = await listUserCardsForCurriculumTopic(
+      db,
+      userId,
+      provider.id,
+      resolved.topicId
+    );
+    const existingSlugs = new Set(existingCards.map((c) => c.slug));
+    const items = [];
+    for (const card of existingCards) {
+      items.push({
+        id: `existing:${card.slug}`,
+        slug: card.slug,
+        question: card.question ?? "",
+        concept: card.concept,
+        domain: card.domain,
+        bloom_level: card.bloomLevel,
+        symbiosis_mode: card.symbiosisMode ?? "none",
+        excerpt: "",
+        isExisting: true,
+        selected: true,
+        subTopicId: card.topicId?.includes("@") ? card.topicId.split("@").pop() ?? null : null,
+        parentTopicId: resolved.topicId
+      });
+    }
+    let proposalIndex = 0;
+    for (const chunk of chunks) {
+      if (!chunk.text.trim()) continue;
+      const cards = await importCurriculumViaLLM(
+        db,
+        chunk.text,
+        opts.domain,
+        item.uri,
+        { knowledgeContext: firstContext }
+      );
+      const scopedTopicId = chunk.subTopicId ? `${resolved.topicId}@${chunk.subTopicId}` : resolved.topicId;
+      for (const card of cards) {
+        const slug = proposalBaseSlug(
+          card.domain,
+          card.question,
+          card.concept
+        );
+        if (existingSlugs.has(slug)) {
+          continue;
+        }
+        const proposal = {
+          question: card.question,
+          concept: card.concept,
+          domain: card.domain,
+          bloom_level: card.bloom_level,
+          symbiosis_mode: card.symbiosis_mode || "none",
+          excerpt: card.context || "",
+          page_number: null,
+          provider: provider.id,
+          topic_id: scopedTopicId
+        };
+        items.push({
+          id: `new:${proposalIndex++}`,
+          slug: null,
+          question: proposal.question,
+          concept: proposal.concept,
+          domain: proposal.domain,
+          bloom_level: proposal.bloom_level,
+          symbiosis_mode: proposal.symbiosis_mode,
+          excerpt: proposal.excerpt,
+          isExisting: false,
+          selected: false,
+          subTopicId: chunk.subTopicId,
+          parentTopicId: resolved.topicId,
+          proposal
         });
       }
     }
+    if (items.length === 0) {
+      jsonError(`No importable cards for topic "${topic.id}"`);
+    }
+    jsonOut2({
+      success: true,
+      topicId: resolved.topicId,
+      sourceId: item.sourceId,
+      items
+    });
+  });
+});
+bridgeCommand.command("curriculum-confirm-topic").description(
+  "Create selected new cards and remove deselected existing cards (JSON)"
+).requiredOption("--provider <id>", "Curriculum provider id").requiredOption("--topicId <id>", "Resolved curriculum topic id").requiredOption("--sourceId <id>", "Parent page source database ID").requiredOption(
+  "--create <json>",
+  "JSON array of SourceProposalInput objects to import"
+).requiredOption(
+  "--removeSlugs <json>",
+  "JSON array of token slugs whose user cards should be deleted"
+).option("--user <id>", "User ID (default: whoami)").option(
+  "--knowledge-context <context>",
+  "Assign confirmed tokens to a knowledge context (repeatable)",
+  (val, memo) => {
+    memo.push(val);
+    return memo;
+  },
+  []
+).action(async (opts) => {
+  await withDb2(async (db) => {
+    const userId = await resolveUser(opts, db, { json: true });
+    const provider = getCurriculumProvider(opts.provider);
+    if (!provider) jsonError(`Unknown curriculum provider: ${opts.provider}`);
+    let create;
+    let removeSlugs;
+    try {
+      create = JSON.parse(opts.create);
+      removeSlugs = JSON.parse(opts.removeSlugs);
+    } catch {
+      jsonError("Invalid --create or --removeSlugs JSON");
+      return;
+    }
+    const contextNames = parseKnowledgeContextNames2(
+      opts.knowledgeContext || []
+    );
+    const contexts = await resolveKnowledgeContexts2(db, contextNames);
+    try {
+      const result = await executeCurriculumConfirmOperations(
+        db,
+        userId,
+        [
+          {
+            sourceId: opts.sourceId,
+            provider: provider.id,
+            topicId: opts.topicId,
+            create,
+            removeSlugs
+          }
+        ],
+        contexts
+      );
+      jsonOut2({ success: true, ...result });
+    } catch (err) {
+      jsonError(err.message || String(err));
+    }
+  });
+});
+bridgeCommand.command("curriculum-confirm-batch").description("Atomically confirm multiple curriculum topic selections (JSON)").requiredOption(
+  "--operations <json>",
+  "JSON array of {sourceId, provider, topicId, create, removeSlugs}"
+).option("--user <id>", "User ID (default: whoami)").option(
+  "--knowledge-context <context>",
+  "Assign confirmed tokens to a knowledge context (repeatable)",
+  (val, memo) => {
+    memo.push(val);
+    return memo;
+  },
+  []
+).action(async (opts) => {
+  await withDb2(async (db) => {
+    const userId = await resolveUser(opts, db, { json: true });
+    let operations;
+    try {
+      operations = JSON.parse(opts.operations);
+    } catch {
+      jsonError("Invalid --operations JSON");
+      return;
+    }
+    if (!Array.isArray(operations) || operations.length === 0) {
+      jsonError("--operations must be a non-empty JSON array");
+    }
+    for (const op of operations) {
+      if (!op?.sourceId || !op?.provider || !op?.topicId) {
+        jsonError("Each operation requires sourceId, provider, and topicId");
+      }
+      if (!getCurriculumProvider(op.provider)) {
+        jsonError(`Unknown curriculum provider: ${op.provider}`);
+      }
+      if (!Array.isArray(op.create) || !Array.isArray(op.removeSlugs)) {
+        jsonError("Each operation requires create and removeSlugs arrays");
+      }
+    }
+    const contextNames = parseKnowledgeContextNames2(
+      opts.knowledgeContext || []
+    );
+    const contexts = await resolveKnowledgeContexts2(db, contextNames);
+    try {
+      const result = await executeCurriculumConfirmOperations(
+        db,
+        userId,
+        operations,
+        contexts
+      );
+      jsonOut2({ success: true, ...result });
+    } catch (err) {
+      jsonError(err.message || String(err));
+    }
+  });
+});
+bridgeCommand.command("curriculum-extract-topics").description(
+  "Fetch and extract specific texts for selected curriculum topics (JSON)"
+).requiredOption("--provider <id>", "Curriculum provider id").requiredOption("--topics <json>", "JSON array of selected topic nodes").action(async (opts) => {
+  await withDb2(async (db) => {
+    const provider = getCurriculumProvider(opts.provider);
+    if (!provider) jsonError(`Unknown curriculum provider: ${opts.provider}`);
+    let topics;
+    try {
+      topics = JSON.parse(opts.topics);
+    } catch {
+      jsonError("Invalid --topics JSON");
+      return;
+    }
+    const extracted = await extractAndStoreCurriculumTopics(
+      db,
+      provider,
+      topics
+    );
     jsonOut2({ success: true, extracted });
   });
 });
@@ -17345,6 +19049,9 @@ bridgeCommand.command("serve").description("Start the persistent JSON-RPC stdin/
     output: process.stdout,
     terminal: false
   });
+  process.on("unhandledRejection", (reason) => {
+    logDiag(`unhandledRejection: ${String(reason)}`);
+  });
   let pending = Promise.resolve();
   rl.on("line", (line) => {
     if (!line.trim()) return;
@@ -17352,6 +19059,15 @@ bridgeCommand.command("serve").description("Start the persistent JSON-RPC stdin/
       const response = await processRequest(line);
       process.stdout.write(`${response}
 `);
+    }).catch((err) => {
+      logDiag(`serve request failed: ${err.message || err}`);
+      try {
+        process.stdout.write(
+          `${JSON.stringify({ id: null, error: err.message || String(err) })}
+`
+        );
+      } catch {
+      }
     });
   });
 });
@@ -21227,9 +22943,49 @@ async function activateMachineProviderConfig(db) {
     `  activate  ${providerCount} machine-local provider(s) from ~/.zam/config.json`
   );
 }
+function connectDetectedAgentHarnesses(skip, dryRun) {
+  if (skip) return;
+  try {
+    const report = performAgentConnect({ dryRun });
+    if (report.detected.length === 0) {
+      console.log(
+        "  skip  no supported agent harness detected (zam agent connect <harness> configures one explicitly)"
+      );
+      return;
+    }
+    for (const result of report.results) {
+      if (result.error) {
+        console.warn(`  warn  ${result.harness}: ${result.error}`);
+      } else if (dryRun) {
+        console.log(
+          `  plan  ${result.harness}: would ensure MCP config at ${result.path}`
+        );
+      } else if (result.alreadyConfigured) {
+        console.log(
+          `  skip  ${result.harness}: MCP already configured (${result.path})`
+        );
+      } else {
+        console.log(
+          `  wire  ${result.harness}: MCP configured (${result.path})`
+        );
+      }
+    }
+    if (report.skills) {
+      console.log(
+        `  wire  global ZAM skill: ${report.skills.refreshed}/${report.skills.total} locations`
+      );
+    }
+  } catch (err) {
+    console.warn(`  warn  agent connect: ${err.message}`);
+  }
+}
 var setupCommand = new Command18("setup").description(
   "Link ZAM skill directories into this workspace and initialize the database"
-).option("--force", "replace an unmanaged existing ZAM skill directory", false).option("--skip-init", "skip database initialization", false).option("--skip-claude-md", "skip CLAUDE.md generation", false).option("--skip-agents-md", "skip AGENTS.md generation", false).option("--target <path>", "repository/workspace directory to set up").option(
+).option("--force", "replace an unmanaged existing ZAM skill directory", false).option("--skip-init", "skip database initialization", false).option("--skip-claude-md", "skip CLAUDE.md generation", false).option("--skip-agents-md", "skip AGENTS.md generation", false).option(
+  "--skip-agent-connect",
+  "skip wiring detected agent harnesses via MCP",
+  false
+).option("--target <path>", "repository/workspace directory to set up").option(
   "--agents <list>",
   "comma-separated agents to wire: all, claude, copilot, codex, agent"
 ).option(
@@ -21256,6 +23012,7 @@ var setupCommand = new Command18("setup").description(
       dryRun: opts.dryRun
     });
     await initDatabase(opts.skipInit || opts.dryRun);
+    connectDetectedAgentHarnesses(opts.skipAgentConnect, opts.dryRun);
     if (agents.has("claude")) {
       writeClaudeMd(opts.skipClaudeMd, target, {
         dryRun: opts.dryRun,