ex-brain 0.2.6 → 0.3.0

package/src/repositories/brain-repo.ts

@@ -1,4 +1,4 @@
-import { nowIso } from "../config";
+import { nowIso } from "../slug-utils";
 import type {
   BrainStats,
   PageRecord,
@@ -630,6 +630,48 @@ export class BrainRepository {
     }
   }
 
+  /**
+   * Sync tags from frontmatter to the page_tags table.
+   * This ensures `ebrain list --tag <tag>` works correctly for pages
+   * created via `put` with frontmatter tags.
+   */
+  async syncTagsFromFrontmatter(slug: string, frontmatter: Record<string, unknown>): Promise<number> {
+    const fmTags = frontmatter.tags;
+    if (!fmTags) return 0;
+
+    const tags: string[] = Array.isArray(fmTags)
+      ? fmTags.filter((t): t is string => typeof t === "string")
+      : typeof fmTags === "string"
+        ? [fmTags]
+        : [];
+
+    if (tags.length === 0) return 0;
+
+    // Get current DB tags for this page
+    const existingTags = new Set(await this.tags(slug));
+    const desiredTags = new Set(tags);
+
+    let synced = 0;
+
+    // Add missing tags
+    for (const tag of desiredTags) {
+      if (!existingTags.has(tag)) {
+        await this.tag(slug, tag);
+        synced++;
+      }
+    }
+
+    // Remove tags no longer in frontmatter
+    for (const tag of existingTags) {
+      if (!desiredTags.has(tag)) {
+        await this.untag(slug, tag);
+        synced++;
+      }
+    }
+
+    return synced;
+  }
+
   async readRaw(slug: string, source?: string): Promise<unknown[]> {
     try {
       const params: unknown[] = [slug];

package/src/settings.ts

@@ -1,284 +1,29 @@
-import { homedir } from "node:os";
-import { join, resolve } from "node:path";
-import { z } from "zod";
-import { fileExists, readTextFile } from "./markdown/io";
-
-export const SETTINGS_DIR = join(homedir(), ".ebrain");
-export const SETTINGS_PATH = join(SETTINGS_DIR, "settings.json");
-export const DEFAULT_DB_PATH = resolve(SETTINGS_DIR, "data", "ebrain.db");
-
-// ---------------------------------------------------------------------------
-// Schema
-// ---------------------------------------------------------------------------
-
-const RemoteDbSchema = z.object({
-  host: z.string().optional(),
-  port: z.number().optional(),
-  user: z.string().optional(),
-  password: z.string().optional(),
-  database: z.string().optional(),
-  tenant: z.string().optional(),
-});
-
-const EmbedSchema = z.object({
-  provider: z.enum(["hash", "openai_compatible"]).optional(),
-  baseURL: z.string().optional(),
-  model: z.string().optional(),
-  dimensions: z.number().optional(),
-  apiKey: z.string().optional(),
-  apiKeyEnv: z.string().optional(),
-});
-
-const LLMSchema = z.object({
-  baseURL: z.string().optional(),
-  model: z.string().optional(),
-  apiKey: z.string().optional(),
-  apiKeyEnv: z.string().optional(),
-});
-
-const SettingsSchema = z.object({
-  db: z
-    .object({
-      path: z.string().optional(),
-      remote: RemoteDbSchema.optional(),
-    })
-    .optional(),
-  embed: EmbedSchema.optional(),
-  llm: LLMSchema.optional(),
-  extraction: z
-    .object({
-      confidenceThreshold: z.number().min(0).max(1).optional(),
-    })
-    .optional(),
-});
-
-// ---------------------------------------------------------------------------
-// Resolved types (all values present after defaults + env merge)
-// ---------------------------------------------------------------------------
-
-export interface ResolvedSettings {
-  dbPath: string;
-  remote: ResolvedRemoteDb | null;
-  embed: ResolvedEmbed;
-  llm: ResolvedLLM;
-  extraction: ResolvedExtraction;
-}
-
-export interface ResolvedExtraction {
-  confidenceThreshold: number;
-}
-
-export interface ResolvedRemoteDb {
-  host: string;
-  port: number;
-  user: string;
-  password: string;
-  database: string;
-  tenant: string;
-}
-
-export interface ResolvedEmbed {
-  provider: "hash" | "openai_compatible";
-  baseURL: string;
-  model: string;
-  dimensions: number;
-  apiKey: string;
-  apiKeyEnv: string;
-}
-
-export interface ResolvedLLM {
-  baseURL: string;
-  model: string;
-  apiKey: string;
-  apiKeyEnv: string;
-}
-
-// ---------------------------------------------------------------------------
-// Defaults
-// ---------------------------------------------------------------------------
-
-const DEFAULT_REMOTE = {
-  port: 3306,
-  user: "root",
-  password: "",
-  database: "ebrain",
-  tenant: "",
-};
-
-const DEFAULT_EMBED = {
-  provider: "hash" as const,
-  baseURL: "https://dashscope.aliyuncs.com/compatible-mode/v1",
-  model: "text-embedding-v4",
-  dimensions: 1024,
-  apiKey: "",
-  apiKeyEnv: "DASHSCOPE_API_KEY",
-};
-
-const DEFAULT_LLM = {
-  baseURL: "",
-  model: "qwen-plus",
-  apiKey: "",
-  apiKeyEnv: "DASHSCOPE_API_KEY",
-};
-
-const DEFAULT_EXTRACTION = {
-  confidenceThreshold: 0.7,
-};
-
-// ---------------------------------------------------------------------------
-// Load & resolve
-// ---------------------------------------------------------------------------
-
-export async function loadSettings(): Promise<ResolvedSettings> {
-  const raw = await readSettingsFile();
-  const parsed = SettingsSchema.parse(raw ?? {});
-  return resolveSettings(parsed);
-}
-
-export async function readSettingsFile(): Promise<unknown | null> {
-  if (!(await fileExists(SETTINGS_PATH))) {
-    return null;
-  }
-  const text = await readTextFile(SETTINGS_PATH);
-  try {
-    return JSON.parse(text) as unknown;
-  } catch {
-    console.warn(
-      `[ebrain] Failed to parse ${SETTINGS_PATH}, using defaults.`,
-    );
-    return null;
-  }
-}
-
 /**
- * Generate a minimal settings.json if it doesn't already exist.
- * Returns true if a new file was created.
+ * @deprecated Import from "./config" instead.
+ * This file exists only for backward compatibility.
  */
-export async function createDefaultSettings(): Promise<boolean> {
-  if (await fileExists(SETTINGS_PATH)) {
-    return false;
-  }
-
-  const { mkdirSync, writeFileSync } = await import("node:fs");
-  mkdirSync(SETTINGS_DIR, { recursive: true });
-
-  // All fields present but empty — user fills in their values
-  const defaults = {
-    db: {
-      path: "",
-      remote: {
-        host: "",
-        port: 0,
-        user: "",
-        password: "",
-        database: "",
-        tenant: "",
-      },
-    },
-    embed: {
-      provider: "hash",
-      baseURL: "",
-      model: "",
-      dimensions: 0,
-      apiKey: "",
-      apiKeyEnv: "",
-    },
-    llm: {
-      baseURL: "",
-      model: "",
-      apiKey: "",
-      apiKeyEnv: "",
-    },
-    extraction: {
-      confidenceThreshold: 0.7,
-    },
-  };
-
-  writeFileSync(SETTINGS_PATH, JSON.stringify(defaults, null, 2) + "\n", "utf-8");
-  return true;
-}
-
-export function resolveSettings(parsed: z.infer<typeof SettingsSchema>): ResolvedSettings {
-  const dbConf = parsed.db ?? {};
-  const remoteConf = dbConf.remote ?? {};
-  const embedConf = parsed.embed ?? {};
-  const extractionConf = parsed.extraction ?? {};
-
-  // Remote: settings → env → defaults
-  const host = remoteConf.host ?? process.env.EBRAIN_SEEKDB_HOST ?? "";
-  if (host) {
-    const remote: ResolvedRemoteDb = {
-      host: host.trim(),
-      port: numOr(remoteConf.port ?? process.env.EBRAIN_SEEKDB_PORT, DEFAULT_REMOTE.port),
-      user: nonEmpty(remoteConf.user ?? process.env.EBRAIN_SEEKDB_USER, DEFAULT_REMOTE.user),
-      password: nonEmpty(
-        remoteConf.password ?? process.env.EBRAIN_SEEKDB_PASSWORD,
-        DEFAULT_REMOTE.password,
-      ),
-      database: nonEmpty(
-        remoteConf.database ?? process.env.EBRAIN_SEEKDB_DATABASE,
-        DEFAULT_REMOTE.database,
-      ),
-      tenant: nonEmpty(remoteConf.tenant ?? process.env.EBRAIN_SEEKDB_TENANT, ""),
-    };
-    return { dbPath: dbConf.path ?? DEFAULT_DB_PATH, remote, embed: resolveEmbed(embedConf), llm: resolveLLM(parsed.llm ?? {}), extraction: resolveExtraction(extractionConf) };
-  }
-
-  // Local mode
-  const dbPath = dbConf.path
-    ? resolvePath(dbConf.path)
-    : DEFAULT_DB_PATH;
-  return { dbPath, remote: null, embed: resolveEmbed(embedConf), llm: resolveLLM(parsed.llm ?? {}), extraction: resolveExtraction(extractionConf) };
-}
-
-function resolveEmbed(conf: z.infer<typeof EmbedSchema>): ResolvedEmbed {
-  const provider = nonEmpty(
-    conf.provider ?? process.env.EBRAIN_EMBED_PROVIDER,
-    DEFAULT_EMBED.provider,
-  ).trim().toLowerCase() as "hash" | "openai_compatible";
-  const baseURL = nonEmpty(conf.baseURL ?? process.env.EBRAIN_EMBED_BASE_URL, DEFAULT_EMBED.baseURL);
-  const model = nonEmpty(conf.model ?? process.env.EBRAIN_EMBED_MODEL, DEFAULT_EMBED.model);
-  const dimensions = numOr(conf.dimensions ?? process.env.EBRAIN_EMBED_DIMENSIONS, DEFAULT_EMBED.dimensions);
-  const apiKey = nonEmpty(conf.apiKey ?? process.env.EBRAIN_EMBED_API_KEY, "");
-  const apiKeyEnv = nonEmpty(conf.apiKeyEnv ?? process.env.EBRAIN_EMBED_API_KEY_ENV, DEFAULT_EMBED.apiKeyEnv);
-  return { provider, baseURL, model, dimensions, apiKey, apiKeyEnv };
-}
-
-function resolveLLM(conf: z.infer<typeof LLMSchema>): ResolvedLLM {
-  const baseURL = nonEmpty(conf.baseURL, DEFAULT_LLM.baseURL);
-  const model = nonEmpty(conf.model, DEFAULT_LLM.model);
-  const apiKey = nonEmpty(conf.apiKey, DEFAULT_LLM.apiKey);
-  const apiKeyEnv = nonEmpty(conf.apiKeyEnv, DEFAULT_LLM.apiKeyEnv);
-  return { baseURL, model, apiKey, apiKeyEnv };
-}
-
-function resolveExtraction(conf: { confidenceThreshold?: number }): ResolvedExtraction {
-  const threshold = conf.confidenceThreshold ?? process.env.EBRAIN_CONFIDENCE_THRESHOLD;
-  const value = typeof threshold === "number" ? threshold : (threshold ? parseFloat(threshold) : DEFAULT_EXTRACTION.confidenceThreshold);
-  return { confidenceThreshold: Math.max(0, Math.min(1, value)) };
-}
-
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-
-function nonEmpty(val: string | undefined, fallback: string): string {
-  const trimmed = val?.trim();
-  return trimmed || fallback;
-}
-
-function numOr(val: number | string | undefined, fallback: number): number {
-  if (typeof val === "number") return val;
-  if (typeof val === "string") {
-    const n = Number(val.trim());
-    if (Number.isFinite(n)) return n;
-  }
-  return fallback;
-}
-
-function resolvePath(p: string): string {
-  if (p.startsWith("~")) {
-    return join(homedir(), p.slice(1));
-  }
-  return resolve(p);
-}
+export {
+  SETTINGS_DIR,
+  SETTINGS_PATH,
+  DEFAULT_DB_PATH,
+  SettingsSchema,
+  RemoteDbSchema,
+  EmbedSchema,
+  LLMSchema,
+  type RawSettings,
+  type ResolvedSettings,
+  type ResolvedExtraction,
+  type ResolvedRemoteDb,
+  type ResolvedEmbed,
+  type ResolvedLLM,
+  DEFAULT_REMOTE,
+  DEFAULT_EMBED,
+  DEFAULT_LLM,
+  DEFAULT_EXTRACTION,
+  type EnvSource,
+  readSettingsFile,
+  resolveSettings,
+  loadSettings,
+  createDefaultSettings,
+  expandTilde,
+} from "./config";