zam-core 0.6.0 → 0.6.2

package/dist/index.d.ts

@@ -806,6 +806,8 @@ interface Token {
     created_at: string;
     updated_at: string;
     deprecated_at: string | null;
+    provider: string | null;
+    topic_id: string | null;
 }
 interface CreateTokenInput {
     slug: string;
@@ -816,6 +818,8 @@ interface CreateTokenInput {
     symbiosis_mode?: SymbiosisMode | null;
     source_link?: string | null;
     question?: string | null;
+    provider?: string | null;
+    topic_id?: string | null;
 }
 interface UpdateTokenInput {
     concept?: string;
@@ -825,6 +829,8 @@ interface UpdateTokenInput {
     symbiosis_mode?: SymbiosisMode | null;
     source_link?: string | null;
     question?: string | null;
+    provider?: string | null;
+    topic_id?: string | null;
 }
 interface ListTokensOptions {
     domain?: string;
@@ -922,6 +928,8 @@ interface PersonalCard {
     elapsedDays: number | null;
     scheduledDays: number | null;
     blocked: number | null;
+    provider: string | null;
+    topicId: string | null;
 }
 declare function slugify(text: string): string;
 declare function generateTokenSlug(db: Database, domain: string, concept: string, question?: string | null): Promise<string>;
@@ -937,6 +945,8 @@ interface CurriculumCardInput {
     context?: string;
     bloom_level?: number;
     symbiosis_mode?: string | null;
+    provider?: string | null;
+    topic_id?: string | null;
 }
 interface ImportCurriculumResult {
     createdCount: number;
@@ -990,6 +1000,9 @@ interface SourceProposalInput {
     symbiosis_mode: string;
     excerpt: string;
     page_number?: string | null;
+    provider?: string | null;
+    topic_id?: string | null;
+    source_id?: string | null;
 }
 /**
  * Confirm source import transaction.
@@ -1975,6 +1988,12 @@ interface InstallPlan {
     method: string;
     command: string;
 }
+interface OllamaDetectionOptions {
+    platform?: NodeJS.Platform;
+    homeDir?: string;
+    commandAvailable?: (command: string) => boolean;
+    pathExists?: (path: string) => boolean;
+}
 /**
  * Check if a command is executable on the system.
  */
@@ -1987,6 +2006,8 @@ declare function installFastFlowLM(): InstallResult;
  * Install Ollama via Homebrew on macOS.
  */
 declare function installOllama(): InstallResult;
+declare function resolveOllamaCommand(options?: OllamaDetectionOptions): string | undefined;
+declare function isOllamaInstalled(options?: OllamaDetectionOptions): boolean;
 /**
  * Prepare the recommended model after installing a local LLM runner.
  */
@@ -2053,4 +2074,4 @@ declare function resolveAllBeliefPaths(db: Database): Promise<string[]>;
  */
 declare function resolveAllGoalPaths(db: Database): Promise<string[]>;
 
-export { type ADOConfig, type ADOCredentials, type AgentSkill, type AnalysisResult, type ApplySessionSynthesisInput, type ApplySessionSynthesisResult, BUILT_IN_SENSITIVE_MATCHERS, type BloomLevel$1 as BloomLevel, type CaptureDecision, type CaptureDenialReason, type CaptureRequest, type Card, type CardDeletionImpact, type CardState$1 as CardState, type CascadeBlockResult, type CommandRecord, type CommandSequence, type ConfirmFoundationsResult, type ConnectionOptions, type CreateAgentSkillInput, type CreateGoalInput, type CreateReviewInput, type CreateSessionInput, type CreateTokenInput, type Credentials, type CurriculumCardInput, DEFAULT_OBSERVER_POLICY, DEFAULT_REVIEW_CONTEXT_MAX_CHARS, type Database, type DatabaseProvider, type DatabaseTargetInfo, type DatabaseValue, type DeleteCardResult, type DeleteTokenResult, type DiscoveryOptions, type DomainCompetence, type EvaluateInput, type EvaluateResult, type ExecuteReviewActionInput, type ExecutionContext, type FSRSParameters, type FoundationProposalInput, type Goal, type GoalFrontmatter, type GoalStatus, type GoalSummary, HOMEBREW_CASK, type ImportCurriculumResult, type ImportResult, type InstallChannel, type InstallConfig, type InstallMode, type InstallPlan, type InstallResult, type LocalLLMRunner, type LogStepInput, type MachineAiConfig, type MachineProviderRecord, type MachineRoleBinding, type MonitorEvent, type Neighborhood, type NeighborhoodToken, OBSERVER_POLICY_UNSET_HINT, OBSERVER_POLICY_VERSION, type ObservationRating, type ObserverConsent, type ObserverPolicy, type ObserverRetention, type ObserverScope, type ObserverSettingKey, type PersonalCard, type PrepareSessionSynthesisInput, type Prerequisite, type PrerequisiteWithToken, type PromptInput, REVIEW_CONTEXT_CACHE_TTL_MS, type Rating, type RecallPrompt, type RemoteDatabaseOptions, type RepoPaths, type ResolvedCaptureTarget, type ResolvedReference, type ReviewActionResult, type ReviewActionType, type ReviewContext, type ReviewLog, type ReviewQueue, type ReviewQueueItem, type ReviewQueueOptions, type RunResult, SIDECAR_POLICY_FILE, SNAPSHOT_VERSION, type SchedulingCard, type Session, type SessionStep, type SessionSummary, type SessionSynthesisCandidate, type SessionSynthesisEvidence, type SessionSynthesisPreview, type SessionSynthesisRecord, type SidecarPrivacyPolicy, type SkillProposal, type SkillSource, type SnapshotManifest, type SourceProposalInput, type SplitProposalInput, type Statement, type SupportedLocale, type SymbiosisMode, type SynthesisConfidence, type SystemProfile, type Token, type TokenDeleteImpact, type TokenPattern, type TranslationKey, type TursoCredentials, UI_OBSERVATION_PROTOCOL_VERSION, type UiActionType, type UiApplicationContext, type UiCandidateToken, type UiEvidenceRef, type UiEvidenceType, type UiObservationKind, type UiObservationReport, type UiObservedAction, type UnblockResult, type UpdateActionKind, type UpdateCardInput, type UpdateDecision, type UpdateStep, type UpdateStepKind, type UpdateTokenInput, type UserSetting, type UserStats, WINGET_PACKAGE_ID, type WorkItem, type WorkspaceConfig, type WorkspaceKind, type WorkspaceSourceControl, addPrerequisite, analyzeObservation, appendUiObservationReport, applySessionSynthesis, buildReviewQueue, buildUiSynthesisCandidates, cascadeBlock, clearADOCredentials, clearProviderApiKey, clearReviewContextCache, clearTursoCredentials, compareVersions, confirmCardSplit, confirmFoundations, confirmSourceImport, createAgentSkill, createFSRS, createGoal, createToken, decidePostCapture, decidePreCapture, decideUpdate, deleteCardForUser, deleteSetting, deleteToken, deprecateToken, detectSyncProvider, detectSystemLocale, discoverSkills, distributeGlobalSkills, endSession, ensureCard, ensureMonitorDir, ensureUiObserverDir, evaluateRating, executeReviewAction, exportSnapshot, extractTasks, extractTokenRefs, fetchActiveWorkItems, findTokens, generateBashHooks, generateBashUnhooks, generateConceptFreeCue, generatePowerShellHooks, generatePowerShellUnhooks, generatePrompt, generateTokenSlug, generateZshHooks, generateZshUnhooks, getADOCredentials, getActiveWorkspace, getActiveWorkspaceId, getAgentSkill, getAllSettings, getAllSettingsDetailed, getBlockedCards, getCard, getCardById, getCardDeletionImpact, getConfiguredWorkspaces, getDatabaseTargetInfo, getDefaultDbPath, getDependents, getDomainCompetence, getDueCards, getGoal, getGoalTree, getInstallChannel, getInstallMode, getMachineAiConfig, getMonitorDir, getMonitorLogStats, getMonitorPath, getPackageSkillPath, getPrerequisites, getProviderApiKey, getRepoPaths, getReviewsForCard, getReviewsForUser, getSessionSummary, getSessionSynthesisRecords, getSetting, getSystemProfile, getTokenById, getTokenBySlug, getTokenDeleteImpact, getTokenNeighborhood, getTursoCredentials, getUiObservationPath, getUiObserverDir, getUserStats, hasCommand, importCurriculumCards, importSnapshot, injectShellHooks, installFastFlowLM, installOllama, installOpenCode, interleave, isObserverPolicyConfigured, isUiObservationReport, listAgentSkills, listGoals, listPersonalCards, listProviderApiKeyRefs, listTokens, loadADOConfig, loadCredentials, loadInstallConfig, logReview, logStep, matchBuiltInSensitive, matchDenylist, matchesFilePath, monitorLogExists, normalizeLocale, normalizePath, openDatabase, openDatabaseWithSync, openRemoteDatabase, pairCommands, parseGoalFile, parseMonitorLog, parseObserverList, parseObserverPolicy, parseSnapshot, parseUiObservationLog, planOpenCodeInstall, planUpdate, prepareLocalModel, prepareSessionSynthesis, readMonitorLog, readUiObservationLog, removeConfiguredWorkspace, resolveAllBeliefPaths, resolveAllGoalPaths, resolveObserverPolicy, resolveReference, resolveRepoPath, resolveReviewContext, saveConfiguredWorkspaces, saveCredentials, saveInstallConfig, saveMachineAiConfig, serializeGoal, setADOCredentials, setActiveWorkspaceId, setInstallChannel, setInstallMode, setProviderApiKey, setSetting, setTursoCredentials, slugify, startSession, syncObserverSidecarPolicy, t, toSidecarPrivacyPolicy, uiObservationLogExists, uiObservationTimeSpan, unblockReady, updateCard, updateGoalStatus, updateToken, upsertConfiguredWorkspace, verifySnapshot, wouldCreateCycle, writeMonitorEvent };
+export { type ADOConfig, type ADOCredentials, type AgentSkill, type AnalysisResult, type ApplySessionSynthesisInput, type ApplySessionSynthesisResult, BUILT_IN_SENSITIVE_MATCHERS, type BloomLevel$1 as BloomLevel, type CaptureDecision, type CaptureDenialReason, type CaptureRequest, type Card, type CardDeletionImpact, type CardState$1 as CardState, type CascadeBlockResult, type CommandRecord, type CommandSequence, type ConfirmFoundationsResult, type ConnectionOptions, type CreateAgentSkillInput, type CreateGoalInput, type CreateReviewInput, type CreateSessionInput, type CreateTokenInput, type Credentials, type CurriculumCardInput, DEFAULT_OBSERVER_POLICY, DEFAULT_REVIEW_CONTEXT_MAX_CHARS, type Database, type DatabaseProvider, type DatabaseTargetInfo, type DatabaseValue, type DeleteCardResult, type DeleteTokenResult, type DiscoveryOptions, type DomainCompetence, type EvaluateInput, type EvaluateResult, type ExecuteReviewActionInput, type ExecutionContext, type FSRSParameters, type FoundationProposalInput, type Goal, type GoalFrontmatter, type GoalStatus, type GoalSummary, HOMEBREW_CASK, type ImportCurriculumResult, type ImportResult, type InstallChannel, type InstallConfig, type InstallMode, type InstallPlan, type InstallResult, type LocalLLMRunner, type LogStepInput, type MachineAiConfig, type MachineProviderRecord, type MachineRoleBinding, type MonitorEvent, type Neighborhood, type NeighborhoodToken, OBSERVER_POLICY_UNSET_HINT, OBSERVER_POLICY_VERSION, type ObservationRating, type ObserverConsent, type ObserverPolicy, type ObserverRetention, type ObserverScope, type ObserverSettingKey, type OllamaDetectionOptions, type PersonalCard, type PrepareSessionSynthesisInput, type Prerequisite, type PrerequisiteWithToken, type PromptInput, REVIEW_CONTEXT_CACHE_TTL_MS, type Rating, type RecallPrompt, type RemoteDatabaseOptions, type RepoPaths, type ResolvedCaptureTarget, type ResolvedReference, type ReviewActionResult, type ReviewActionType, type ReviewContext, type ReviewLog, type ReviewQueue, type ReviewQueueItem, type ReviewQueueOptions, type RunResult, SIDECAR_POLICY_FILE, SNAPSHOT_VERSION, type SchedulingCard, type Session, type SessionStep, type SessionSummary, type SessionSynthesisCandidate, type SessionSynthesisEvidence, type SessionSynthesisPreview, type SessionSynthesisRecord, type SidecarPrivacyPolicy, type SkillProposal, type SkillSource, type SnapshotManifest, type SourceProposalInput, type SplitProposalInput, type Statement, type SupportedLocale, type SymbiosisMode, type SynthesisConfidence, type SystemProfile, type Token, type TokenDeleteImpact, type TokenPattern, type TranslationKey, type TursoCredentials, UI_OBSERVATION_PROTOCOL_VERSION, type UiActionType, type UiApplicationContext, type UiCandidateToken, type UiEvidenceRef, type UiEvidenceType, type UiObservationKind, type UiObservationReport, type UiObservedAction, type UnblockResult, type UpdateActionKind, type UpdateCardInput, type UpdateDecision, type UpdateStep, type UpdateStepKind, type UpdateTokenInput, type UserSetting, type UserStats, WINGET_PACKAGE_ID, type WorkItem, type WorkspaceConfig, type WorkspaceKind, type WorkspaceSourceControl, addPrerequisite, analyzeObservation, appendUiObservationReport, applySessionSynthesis, buildReviewQueue, buildUiSynthesisCandidates, cascadeBlock, clearADOCredentials, clearProviderApiKey, clearReviewContextCache, clearTursoCredentials, compareVersions, confirmCardSplit, confirmFoundations, confirmSourceImport, createAgentSkill, createFSRS, createGoal, createToken, decidePostCapture, decidePreCapture, decideUpdate, deleteCardForUser, deleteSetting, deleteToken, deprecateToken, detectSyncProvider, detectSystemLocale, discoverSkills, distributeGlobalSkills, endSession, ensureCard, ensureMonitorDir, ensureUiObserverDir, evaluateRating, executeReviewAction, exportSnapshot, extractTasks, extractTokenRefs, fetchActiveWorkItems, findTokens, generateBashHooks, generateBashUnhooks, generateConceptFreeCue, generatePowerShellHooks, generatePowerShellUnhooks, generatePrompt, generateTokenSlug, generateZshHooks, generateZshUnhooks, getADOCredentials, getActiveWorkspace, getActiveWorkspaceId, getAgentSkill, getAllSettings, getAllSettingsDetailed, getBlockedCards, getCard, getCardById, getCardDeletionImpact, getConfiguredWorkspaces, getDatabaseTargetInfo, getDefaultDbPath, getDependents, getDomainCompetence, getDueCards, getGoal, getGoalTree, getInstallChannel, getInstallMode, getMachineAiConfig, getMonitorDir, getMonitorLogStats, getMonitorPath, getPackageSkillPath, getPrerequisites, getProviderApiKey, getRepoPaths, getReviewsForCard, getReviewsForUser, getSessionSummary, getSessionSynthesisRecords, getSetting, getSystemProfile, getTokenById, getTokenBySlug, getTokenDeleteImpact, getTokenNeighborhood, getTursoCredentials, getUiObservationPath, getUiObserverDir, getUserStats, hasCommand, importCurriculumCards, importSnapshot, injectShellHooks, installFastFlowLM, installOllama, installOpenCode, interleave, isObserverPolicyConfigured, isOllamaInstalled, isUiObservationReport, listAgentSkills, listGoals, listPersonalCards, listProviderApiKeyRefs, listTokens, loadADOConfig, loadCredentials, loadInstallConfig, logReview, logStep, matchBuiltInSensitive, matchDenylist, matchesFilePath, monitorLogExists, normalizeLocale, normalizePath, openDatabase, openDatabaseWithSync, openRemoteDatabase, pairCommands, parseGoalFile, parseMonitorLog, parseObserverList, parseObserverPolicy, parseSnapshot, parseUiObservationLog, planOpenCodeInstall, planUpdate, prepareLocalModel, prepareSessionSynthesis, readMonitorLog, readUiObservationLog, removeConfiguredWorkspace, resolveAllBeliefPaths, resolveAllGoalPaths, resolveObserverPolicy, resolveOllamaCommand, resolveReference, resolveRepoPath, resolveReviewContext, saveConfiguredWorkspaces, saveCredentials, saveInstallConfig, saveMachineAiConfig, serializeGoal, setADOCredentials, setActiveWorkspaceId, setInstallChannel, setInstallMode, setProviderApiKey, setSetting, setTursoCredentials, slugify, startSession, syncObserverSidecarPolicy, t, toSidecarPrivacyPolicy, uiObservationLogExists, uiObservationTimeSpan, unblockReady, updateCard, updateGoalStatus, updateToken, upsertConfiguredWorkspace, verifySnapshot, wouldCreateCycle, writeMonitorEvent };

package/dist/index.js

@@ -539,7 +539,9 @@ CREATE TABLE IF NOT EXISTS tokens (
   created_at    TEXT NOT NULL DEFAULT (datetime('now')),
   updated_at    TEXT NOT NULL DEFAULT (datetime('now')),
   deprecated_at TEXT,
-  question      TEXT
+  question      TEXT,
+  provider      TEXT,
+  topic_id      TEXT
 );
 
 -- Prerequisite dependency graph: "to learn A, first know B"
@@ -979,6 +981,14 @@ async function runMigrations(db) {
       PRIMARY KEY (token_id, source_id)
     )
   `);
+  if (tokenCols.length > 0) {
+    if (!tokenCols.some((c) => c.name === "provider")) {
+      await db.exec(`ALTER TABLE tokens ADD COLUMN provider TEXT`);
+    }
+    if (!tokenCols.some((c) => c.name === "topic_id")) {
+      await db.exec(`ALTER TABLE tokens ADD COLUMN topic_id TEXT`);
+    }
+  }
 }
 
 // src/kernel/db/snapshot.ts
@@ -1481,8 +1491,8 @@ async function createToken(db, input) {
     throw new Error(`bloom_level must be between 1 and 5, got ${bloom}`);
   }
   await db.prepare(`
-    INSERT INTO tokens (id, slug, concept, domain, bloom_level, context, symbiosis_mode, source_link, question, created_at, updated_at)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    INSERT INTO tokens (id, slug, concept, domain, bloom_level, context, symbiosis_mode, source_link, question, provider, topic_id, created_at, updated_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
   `).run(
     id,
     input.slug,
@@ -1493,16 +1503,33 @@ async function createToken(db, input) {
     input.symbiosis_mode ?? null,
     input.source_link ?? null,
     input.question ?? null,
+    input.provider ?? null,
+    input.topic_id ?? null,
     now,
     now
   );
   return await getTokenById(db, id);
 }
+function parseTokenFallback(token) {
+  if (token && !token.provider && token.source_link) {
+    if (token.source_link.includes("lehrplanplus.bayern.de")) {
+      token.provider = "lehrplanplus-bayern";
+      const match = token.source_link.match(/#(.*)$/);
+      if (match) {
+        token.topic_id = match[1];
+      }
+    }
+  }
+}
 async function getTokenBySlug(db, slug) {
-  return await db.prepare("SELECT * FROM tokens WHERE slug = ?").get(slug);
+  const token = await db.prepare("SELECT * FROM tokens WHERE slug = ?").get(slug);
+  parseTokenFallback(token);
+  return token;
 }
 async function getTokenById(db, id) {
-  return await db.prepare("SELECT * FROM tokens WHERE id = ?").get(id);
+  const token = await db.prepare("SELECT * FROM tokens WHERE id = ?").get(id);
+  parseTokenFallback(token);
+  return token;
 }
 async function updateToken(db, slug, updates) {
   const token = await getTokenBySlug(db, slug);
@@ -1548,6 +1575,14 @@ async function updateToken(db, slug, updates) {
     fields.push("question = ?");
     values.push(updates.question);
   }
+  if (updates.provider !== void 0) {
+    fields.push("provider = ?");
+    values.push(updates.provider);
+  }
+  if (updates.topic_id !== void 0) {
+    fields.push("topic_id = ?");
+    values.push(updates.topic_id);
+  }
   if (fields.length === 0) {
     throw new Error("updateToken called with no fields to update");
   }
@@ -1673,14 +1708,20 @@ async function findTokens(db, query) {
   return scored;
 }
 async function listTokens(db, options) {
+  let tokens;
   if (options?.domain) {
-    return await db.prepare(
+    tokens = await db.prepare(
       "SELECT * FROM tokens WHERE domain = ? AND deprecated_at IS NULL ORDER BY bloom_level, slug"
     ).all(options.domain);
+  } else {
+    tokens = await db.prepare(
+      "SELECT * FROM tokens WHERE deprecated_at IS NULL ORDER BY bloom_level, domain, slug"
+    ).all();
   }
-  return await db.prepare(
-    "SELECT * FROM tokens WHERE deprecated_at IS NULL ORDER BY bloom_level, domain, slug"
-  ).all();
+  for (const token of tokens) {
+    parseTokenFallback(token);
+  }
+  return tokens;
 }
 function slugify(text) {
   return text.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/(^-|-$)/g, "");
@@ -1718,10 +1759,22 @@ async function listPersonalCards(db, userId, options) {
       t.bloom_level AS bloomLevel,
       t.context,
       t.symbiosis_mode AS symbiosisMode,
-      t.source_link AS sourceLink,
+      COALESCE(
+        t.source_link,
+        (
+          SELECT s.uri
+          FROM token_sources ts
+          INNER JOIN sources s ON s.id = ts.source_id
+          WHERE ts.token_id = t.id
+          ORDER BY s.created_at DESC, s.id DESC
+          LIMIT 1
+        )
+      ) AS sourceLink,
       t.question,
       t.created_at AS createdAt,
       t.updated_at AS updatedAt,
+      t.provider,
+      t.topic_id AS topicId,
       c.id AS cardId,
       c.state,
       c.due_at AS dueAt,
@@ -1751,6 +1804,17 @@ async function listPersonalCards(db, userId, options) {
   }
   sql += " ORDER BY t.created_at DESC";
   const rows = await db.prepare(sql).all(...values);
+  for (const row of rows) {
+    if (!row.provider && row.sourceLink) {
+      if (row.sourceLink.includes("lehrplanplus.bayern.de")) {
+        row.provider = "lehrplanplus-bayern";
+        const match = row.sourceLink.match(/#(.*)$/);
+        if (match) {
+          row.topicId = match[1];
+        }
+      }
+    }
+  }
   return rows;
 }
 async function importCurriculumCards(db, userId, cards) {
@@ -1797,9 +1861,18 @@ async function importCurriculumCards(db, userId, cards) {
           context: card.context || "",
           symbiosis_mode: symbiosisMode,
           source_link: card.source_link || null,
-          question: card.question || null
+          question: card.question || null,
+          provider: card.provider || null,
+          topic_id: card.topic_id || null
         });
         createdCount++;
+      } else {
+        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) {
@@ -2021,11 +2094,12 @@ async function confirmSourceImport(db, userId, sourceId, proposals) {
   let createdCount = 0;
   let linkedCount = 0;
   await db.transaction(async (tx) => {
-    const source = await tx.prepare("SELECT id FROM sources WHERE id = ?").get(sourceId);
-    if (!source) {
-      throw new Error(`Source not found: ${sourceId}`);
-    }
     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);
@@ -2056,11 +2130,19 @@ async function confirmSourceImport(db, userId, sourceId, proposals) {
           bloom_level: bloom,
           context: card.excerpt || "",
           symbiosis_mode: symbiosisMode,
-          question: card.question || null
+          question: card.question || null,
+          provider: card.provider || null,
+          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) {
@@ -2072,7 +2154,12 @@ async function confirmSourceImport(db, userId, sourceId, proposals) {
            ON CONFLICT(token_id, source_id) DO UPDATE SET
              excerpt = excluded.excerpt,
              page_number = excluded.page_number`
-      ).run(token.id, sourceId, card.excerpt || "", card.page_number || null);
+      ).run(
+        token.id,
+        cardSourceId,
+        card.excerpt || "",
+        card.page_number || null
+      );
     }
   });
   return { createdCount, linkedCount };
@@ -5082,12 +5169,7 @@ function installFastFlowLM() {
   }
 }
 function installOllama() {
-  const isMac = process.platform === "darwin";
-  const isWin = process.platform === "win32";
-  const hasOllama = hasCommand("ollama") || isMac && existsSync9("/Applications/Ollama.app") || isWin && existsSync9(
-    join10(homedir7(), "AppData", "Local", "Programs", "Ollama", "ollama.exe")
-  );
-  if (hasOllama) {
+  if (isOllamaInstalled()) {
     return { success: true, message: "Ollama is already installed." };
   }
   if (process.platform === "darwin") {
@@ -5142,19 +5224,23 @@ function installOllama() {
     }
   }
 }
-function resolveOllamaCommand() {
-  if (hasCommand("ollama")) return "ollama";
-  const candidates = process.platform === "win32" ? [
-    join10(
-      homedir7(),
-      "AppData",
-      "Local",
-      "Programs",
-      "Ollama",
-      "ollama.exe"
-    )
-  ] : process.platform === "darwin" ? ["/Applications/Ollama.app/Contents/Resources/ollama"] : [];
-  return candidates.find((candidate) => existsSync9(candidate));
+function resolveOllamaCommand(options = {}) {
+  const platform = options.platform ?? process.platform;
+  const homeDir = options.homeDir ?? homedir7();
+  const commandAvailable = options.commandAvailable ?? hasCommand;
+  const pathExists = options.pathExists ?? existsSync9;
+  if (commandAvailable("ollama")) return "ollama";
+  const candidates = platform === "win32" ? [join10(homeDir, "AppData", "Local", "Programs", "Ollama", "ollama.exe")] : platform === "darwin" ? [
+    "/opt/homebrew/bin/ollama",
+    "/usr/local/bin/ollama",
+    "/Applications/Ollama.app/Contents/Resources/ollama"
+  ] : ["/usr/local/bin/ollama", "/usr/bin/ollama"];
+  return candidates.find((candidate) => pathExists(candidate));
+}
+function isOllamaInstalled(options = {}) {
+  const platform = options.platform ?? process.platform;
+  const pathExists = options.pathExists ?? existsSync9;
+  return resolveOllamaCommand(options) !== void 0 || platform === "darwin" && pathExists("/Applications/Ollama.app");
 }
 function prepareLocalModel(runner, model) {
   if (runner === "fastflowlm") {
@@ -5628,6 +5714,7 @@ export {
   installOpenCode,
   interleave,
   isObserverPolicyConfigured,
+  isOllamaInstalled,
   isUiObservationReport,
   listAgentSkills,
   listGoals,
@@ -5665,6 +5752,7 @@ export {
   resolveAllBeliefPaths,
   resolveAllGoalPaths,
   resolveObserverPolicy,
+  resolveOllamaCommand,
   resolveReference,
   resolveRepoPath,
   resolveReviewContext,