diffwiki 0.4.0 → 0.5.0-rc.202607230329.fb70592

package/dist/bin.js

@@ -3,16 +3,26 @@
 // src/cli.ts
 import { Command } from "commander";
 import {
+  addExternalCollection,
   addTags,
+  collectionGitStatus,
   createArticle,
   createCollection,
   doctor,
   getConfigValue,
   initRepoWiki,
+  installPlugin,
   listCollections,
-  query,
+  listAvailablePlugins,
+  listPlugins,
+  listSearchModes,
+  loadSearchProvider,
+  search,
+  registerPlugin,
   removeArticle,
+  removePlugin,
   removeTags,
+  resolveCwdCollection,
   setConfigValue,
   setTags,
   updateArticleBody
@@ -143,11 +153,38 @@ async function stopUi() {
   return state;
 }
 
+// src/exporter.ts
+import { spawn as spawn2 } from "child_process";
+import fs2 from "fs";
+import path2 from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+function localAppExporter() {
+  const candidates = [
+    path2.resolve(path2.dirname(fileURLToPath2(import.meta.url)), "../../../apps/wiki/bin/export.mjs"),
+    path2.resolve(process.cwd(), "apps/wiki/bin/export.mjs")
+  ];
+  return candidates.find((p) => fs2.existsSync(p));
+}
+async function runExport(opts) {
+  const out = path2.resolve(opts.out);
+  const local = localAppExporter();
+  const override = process.env.DIFFWIKI_APP_CMD ?? (local ? `node ${local}` : void 0);
+  const [cmd, ...prefix] = override ? override.split(" ") : ["npx", "-y", "diffwiki-app@latest"];
+  const args = [...prefix, "export", "--out", out, "--base", opts.base];
+  if (override) console.log(`Exporting via ${override}`);
+  await new Promise((resolve, reject) => {
+    const child = spawn2(cmd, args, { stdio: "inherit", env: process.env });
+    child.on("error", reject);
+    child.on("close", (code) => code === 0 ? resolve() : reject(new Error(`export failed (exit ${code})`)));
+  });
+  console.log(`Static site written to ${out}`);
+}
+
 // src/cli.ts
 var icon = (level) => level === "ok" ? "\u2713" : level === "warn" ? "!" : "\u2716";
 function createProgram() {
   const program = new Command();
-  program.name("diffwiki").description("A git-based knowledge base").version(version).showHelpAfterError();
+  program.name("diffwiki").description("A git-based knowledge base").version(version).showHelpAfterError().option("-v, --verbose", "verbose logging (sets the log level to debug)").option("--log <level>", "log level: trace|debug|info|warning|error|fatal");
   program.action(() => {
     program.outputHelp();
   });
@@ -159,17 +196,28 @@ function createProgram() {
         return;
       }
       for (const c of collections) {
-        console.log(`${c.name}	[${c.type}]	${c.path}`);
+        const status = await collectionGitStatus(c);
+        const branch = status?.branch ? `	(${status.branch})` : "";
+        console.log(`${c.name}	[${c.type}]	${c.path}${branch}`);
       }
     })
   );
+  program.command("add").description("Add the current git repo as an external collection (docs dir, no diffwiki.yaml)").option("-d, --docs <dir>", "content dir relative to repo root", "docs").action(
+    withErrors(async (opts) => {
+      const entry = await addExternalCollection({ cwd: process.cwd(), docsDir: opts.docs });
+      const status = await collectionGitStatus(entry);
+      const branch = status?.branch ? ` (${status.branch})` : "";
+      console.log(`Added "${entry.name}"${branch} \u2192 ${entry.path}`);
+      console.log("Registered globally \u2014 discoverable via: diffwiki list");
+    })
+  );
   program.command("create").description("Create a new global collection").argument("<name>", "collection name").action(
     withErrors(async (name) => {
       const entry = await createCollection(name);
       console.log(`Created collection "${entry.name}" at ${entry.path}`);
     })
   );
-  program.command("add").description("Add an article to a collection").requiredOption("-p, --path <target>", '"[collection:]title"').option("-t, --tag <tag>", "tag (repeatable, comma-separated)", collect, []).argument("[body]", "markdown body").action(
+  program.command("add-article").description("Add an article to a collection").requiredOption("-p, --path <target>", '"[collection:]title"').option("-t, --tag <tag>", "tag (repeatable, comma-separated)", collect, []).argument("[body]", "markdown body").action(
     withErrors(async (body, opts) => {
       const article = await createArticle({
         target: opts.path,
@@ -179,13 +227,13 @@ function createProgram() {
       console.log(article.path);
     })
   );
-  program.command("update").description("Replace an article's body").requiredOption("-p, --path <target>", '"collection:path"').argument("<body>", "new markdown body").action(
+  program.command("update-article").description("Replace an article's body").requiredOption("-p, --path <target>", '"collection:path"').argument("<body>", "new markdown body").action(
     withErrors(async (body, opts) => {
       const article = await updateArticleBody(opts.path, body);
       console.log(`Updated ${article.path}`);
     })
   );
-  program.command("remove").description("Delete an article").requiredOption("-p, --path <target>", '"collection:path"').action(
+  program.command("remove-article").description("Delete an article").requiredOption("-p, --path <target>", '"collection:path"').action(
     withErrors(async (opts) => {
       const removed = await removeArticle(opts.path);
       console.log(`Removed ${removed}`);
@@ -202,15 +250,89 @@ function createProgram() {
   registerTagCommand("add-tags", addTags);
   registerTagCommand("remove-tags", removeTags);
   registerTagCommand("update-tags", setTags);
-  program.command("query").description("Search articles (dummy \u2014 QMD coming later)").option("-c, --collection <name>", "limit to a collection").argument("[term]", "search term", "").action(
+  program.command("index").description("Rebuild the search index via the active plugin").option("--embed", "also build vector embeddings (may download models on first run)").action(
+    withErrors(async (opts) => {
+      const provider = await loadSearchProvider();
+      if (!provider) {
+        const installable = (await listSearchModes()).filter((m) => m.plugin !== "native");
+        console.log(
+          installable.length > 0 ? `No index-backed plugin active. Available modes: ${installable.map((m) => `${m.plugin}\xB7${m.type}`).join(", ")}` : "No search plugin installed \u2014 using native search (nothing to index). Install one with: diffwiki plugin install <spec>"
+        );
+        return;
+      }
+      const indexed = await provider.reindex(await listCollections(), { embed: !!opts.embed });
+      console.log(`Indexed ${indexed} document(s).`);
+    })
+  );
+  program.command("query").description("Search articles via the resolved search engine (native fallback if none)").option("--engine <name>", "search engine/plugin (default: config defaultSearch, else native)").option("-c, --collection <name>", "limit to a collection").option("-t, --type <type>", "search type (engine-defined, e.g. keyword|semantic|hybrid)").argument("[term]", "search term", "").action(
     withErrors(async (term, opts) => {
-      const hits = await query(term, opts.collection);
-      console.log(`(dummy search \u2014 QMD coming later) ${hits.length} result(s)`);
+      const queryOpts = { engine: opts.engine, collection: opts.collection, type: opts.type };
+      const outcome = await search(term, queryOpts);
+      const hits = outcome.hits;
+      console.log(`${hits.length} result(s)`);
       for (const hit of hits) {
-        console.log(`${hit.collection}	${hit.title}	${hit.path}`);
+        const score = typeof hit.score === "number" ? hit.score.toFixed(3) : "-";
+        const line = `${score}	${hit.collection}	${hit.title}	${hit.path}`;
+        console.log(hit.snippet ? `${line}	${hit.snippet}` : line);
+      }
+      if (outcome.error) {
+        console.error(`\u26A0 engine "${outcome.engine}" failed: ${outcome.error} \u2014 used native (${hits.length} results)`);
+      }
+    })
+  );
+  const plugin = program.command("plugin").description("Manage search plugins");
+  plugin.command("install").description("Install a search plugin from an npm spec and provision it (setup)").argument("<spec>", "npm package spec (name, name@version, or path)").option("--no-setup", "skip the end-to-end setup after install").option("--prefetch-models", "pre-download models during setup (heavy)").action(
+    withErrors(async (spec, opts) => {
+      const { record, setup } = await installPlugin(spec, {
+        setup: opts.setup,
+        prefetchModels: opts.prefetchModels
+      });
+      console.log(`Installed "${record.name}"${record.version ? ` v${record.version}` : ""}`);
+      if (!opts.setup) {
+        console.log("Skipped setup (--no-setup) \u2014 run: diffwiki index");
+      } else if (setup && !setup.ready) {
+        const reason = setup.steps.find((s) => !s.ok)?.message ?? "setup did not complete";
+        console.log(`\u26A0 Not ready: ${reason}`);
+        console.log("  \u2192 run: diffwiki doctor");
       }
     })
   );
+  plugin.command("register").description("Register an existing executable as a search plugin").argument("<name>", "plugin name").requiredOption("--command <cmd...>", "command argv to spawn the plugin (e.g. node /abs/adapter.js)").action(
+    withErrors(async (name, opts) => {
+      const record = await registerPlugin(name, opts.command);
+      console.log(`Registered "${record.name}" \u2192 ${record.command.join(" ")}`);
+    })
+  );
+  plugin.command("list").description("List installed and available search plugins").action(
+    withErrors(async () => {
+      const installed = await listPlugins();
+      const installedNames = new Set(installed.map((p) => p.name));
+      console.log("Installed:");
+      if (installed.length === 0) {
+        console.log("  (none)");
+      } else {
+        for (const p of installed) {
+          console.log(
+            `  ${p.name}	${p.kind}	${p.version ?? "-"}	enabled=${p.enabled}	managed=${!!p.managed}	spawnable=${p.spawnable}`
+          );
+        }
+      }
+      const available = listAvailablePlugins().filter((k) => !installedNames.has(k.name));
+      if (available.length > 0) {
+        console.log("\nAvailable (install with: diffwiki plugin install <name>):");
+        for (const k of available) {
+          console.log(`  ${k.name}	[${k.kind}]	${k.description}`);
+          console.log(`    requires ${k.requires ?? "nothing"}`);
+        }
+      }
+    })
+  );
+  plugin.command("remove").description("Remove a search plugin").argument("<name>", "plugin name").action(
+    withErrors(async (name) => {
+      await removePlugin(name);
+      console.log(`Removed "${name}"`);
+    })
+  );
   program.command("init").description("Initialize an in-repo wiki and register it globally").option("-c, --collection <name>", "collection name (default: repo name)").option("-p, --path <path>", "wiki path within the repo (default: wiki)").action(
     withErrors(async (opts) => {
       const entry = await initRepoWiki({
@@ -222,7 +344,12 @@ function createProgram() {
       console.log("Registered globally \u2014 discoverable via: diffwiki list");
     })
   );
-  program.command("config-set").description("Set a config value (e.g. defaultCollection)").argument("<key>", "config key").argument("<value>", "config value").action(
+  program.command("export").description("Generate a static site (deployable to GitHub Pages)").requiredOption("-o, --out <dir>", "output directory").option("-b, --base <path>", "base URL path (e.g. /my-repo/ for GitHub Pages)", "/").action(
+    withErrors(async (opts) => {
+      await runExport({ out: opts.out, base: opts.base });
+    })
+  );
+  program.command("config-set").description("Set a config value (e.g. defaultCollection, or defaultSearch <engine[:type]>)").argument("<key>", "config key").argument("<value>", "config value").action(
     withErrors(async (key, value) => {
       await setConfigValue(key, value);
       console.log(`Set ${key} = ${value}`);
@@ -282,12 +409,61 @@ function createProgram() {
         state = await startUi(Number(opts.port));
         await waitForServer(state.url);
       }
-      openBrowser(state.url);
-      console.log(`Opening ${state.url}`);
+      const coll = await resolveCwdCollection(process.cwd());
+      const target = coll ? `${state.url}/${encodeURIComponent(coll.name)}` : state.url;
+      openBrowser(target);
+      console.log(`Opening ${target}`);
     })
   );
   return program;
 }
 
+// src/logging.ts
+import { mkdirSync } from "fs";
+import os from "os";
+import path3 from "path";
+import { configureSync, getConfig } from "@logtape/logtape";
+import { getRotatingFileSink } from "@logtape/file";
+import { resolveLogLevel } from "diffwiki-core";
+var configured = false;
+function diffwikiHome() {
+  const override = process.env.DIFFWIKI_HOME;
+  return override && override.length > 0 ? override : path3.join(os.homedir(), ".diffwiki");
+}
+function resolveCliLevel(argv) {
+  if (argv.includes("-v") || argv.includes("--verbose")) return "debug";
+  const flagIdx = argv.indexOf("--log");
+  const flagValue = flagIdx !== -1 ? argv[flagIdx + 1] : void 0;
+  return resolveLogLevel(flagValue ? { DIFFWIKI_LOG: flagValue } : process.env);
+}
+function formatLine(record) {
+  const category = record.category.join(".");
+  const message = record.message.map((part) => typeof part === "string" ? part : String(part)).join("");
+  return `${record.level.toUpperCase()} [${category}] ${message}`;
+}
+function configureCliLogging(argv = process.argv) {
+  if (configured || getConfig() != null) return;
+  configured = true;
+  const level = resolveCliLevel(argv);
+  const logsDir = path3.join(diffwikiHome(), "logs");
+  mkdirSync(logsDir, { recursive: true });
+  const logFile = path3.join(logsDir, "diffwiki.log");
+  const stderrSink = (record) => {
+    process.stderr.write(formatLine(record) + "\n");
+  };
+  configureSync({
+    sinks: {
+      stderr: stderrSink,
+      file: getRotatingFileSink(logFile)
+    },
+    loggers: [
+      { category: ["diffwiki"], lowestLevel: level, sinks: ["stderr", "file"] },
+      // Silence everything else (incl. LogTape meta logs).
+      { category: [], lowestLevel: "fatal", sinks: [] }
+    ]
+  });
+}
+
 // src/bin.ts
+configureCliLogging(process.argv);
 createProgram().parseAsync(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diffwiki",
-  "version": "0.4.0",
+  "version": "0.5.0-rc.202607230329.fb70592",
   "description": "diffwiki command-line interface",
   "license": "MIT",
   "type": "module",
@@ -14,8 +14,10 @@
     "access": "public"
   },
   "dependencies": {
+    "@logtape/logtape": "^2.2.4",
+    "@logtape/file": "^2.2.4",
     "commander": "^13.0.0",
-    "diffwiki-core": "0.4.0"
+    "diffwiki-core": "0.5.0-rc.202607230329.fb70592"
   },
   "devDependencies": {
     "@types/node": "^22.0.0"