@rejot-dev/thalo-cli 0.0.0

package/dist/commands/setup-merge-driver.js

@@ -0,0 +1,210 @@
+import { promisify } from "node:util";
+import pc from "picocolors";
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { execFile } from "node:child_process";
+
+//#region src/commands/setup-merge-driver.ts
+const execFile$1 = promisify(execFile);
+/**
+* Setup merge driver command
+*
+* Configures Git to use the thalo merge driver for .thalo files
+*/
+async function setupMergeDriverAction(ctx) {
+	const { options } = ctx;
+	const isGlobal = options["global"];
+	const checkOnly = options["check"];
+	const uninstall = options["uninstall"];
+	if (checkOnly) {
+		await checkConfiguration(isGlobal);
+		return;
+	}
+	if (uninstall) {
+		await uninstallConfiguration(isGlobal);
+		return;
+	}
+	if (!isGlobal) {
+		if (!await isGitRepository()) {
+			console.error(pc.red("Error: Not in a git repository"));
+			console.error(pc.dim("Run this command from a git repository, or use --global for system-wide configuration"));
+			process.exit(1);
+		}
+	}
+	console.log(pc.blue(`Configuring thalo merge driver ${isGlobal ? "globally" : "for this repository"}...`));
+	console.log();
+	try {
+		await configureGit(isGlobal);
+		if (!isGlobal) await configureGitAttributes();
+		console.log();
+		console.log(pc.green("✓ Thalo merge driver configured successfully"));
+		console.log();
+		console.log(pc.bold("Configuration:"));
+		if (isGlobal) {
+			console.log(pc.dim("  • Git config: ~/.gitconfig"));
+			console.log(pc.dim("  • You still need to add '*.thalo merge=thalo' to .gitattributes in each repository"));
+		} else {
+			console.log(pc.dim("  • Git config: .git/config"));
+			console.log(pc.dim("  • Git attributes: .gitattributes"));
+		}
+		console.log();
+		console.log(pc.dim("The merge driver will now be used for *.thalo files during git merge"));
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		console.error(pc.red(`Error: ${message}`));
+		process.exit(1);
+	}
+}
+/**
+* Check if we're in a git repository
+*/
+async function isGitRepository() {
+	try {
+		await execFile$1("git", ["rev-parse", "--git-dir"]);
+		return true;
+	} catch {
+		return false;
+	}
+}
+/**
+* Configure git config for the merge driver
+*/
+async function configureGit(isGlobal) {
+	console.log(pc.dim("Configuring git merge driver..."));
+	const baseArgs = isGlobal ? ["config", "--global"] : ["config"];
+	try {
+		await execFile$1("git", [
+			...baseArgs,
+			"merge.thalo.name",
+			"Thalo semantic merge driver"
+		]);
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		throw new Error(`Failed to set merge.thalo.name: ${message}`);
+	}
+	try {
+		await execFile$1("git", [
+			...baseArgs,
+			"merge.thalo.driver",
+			"thalo merge-driver %O %A %B %P"
+		]);
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		throw new Error(`Failed to set merge.thalo.driver: ${message}`);
+	}
+	console.log(pc.green("  ✓ Git config updated"));
+}
+/**
+* Configure .gitattributes for thalo files
+*/
+async function configureGitAttributes() {
+	console.log(pc.dim("Configuring .gitattributes..."));
+	const attributesPath = path.join(process.cwd(), ".gitattributes");
+	const attributeLine = "*.thalo merge=thalo";
+	let content = "";
+	try {
+		content = await fs.readFile(attributesPath, "utf-8");
+	} catch {}
+	if (content.includes(attributeLine)) {
+		console.log(pc.green("  ✓ .gitattributes already configured"));
+		return;
+	}
+	const newContent = content.trim() ? `${content.trim()}\n${attributeLine}\n` : `${attributeLine}\n`;
+	await fs.writeFile(attributesPath, newContent, "utf-8");
+	console.log(pc.green("  ✓ .gitattributes updated"));
+}
+/**
+* Check current configuration
+*/
+async function checkConfiguration(isGlobal) {
+	const scope = isGlobal ? "global" : "local";
+	console.log(pc.blue(`Checking ${scope} merge driver configuration...`));
+	console.log();
+	const baseArgs = isGlobal ? ["config", "--global"] : ["config"];
+	try {
+		const { stdout: name } = await execFile$1("git", [...baseArgs, "merge.thalo.name"]);
+		console.log(pc.green(`✓ merge.thalo.name: ${name.trim()}`));
+	} catch {
+		console.log(pc.red("✗ merge.thalo.name: not configured"));
+	}
+	try {
+		const { stdout: driver } = await execFile$1("git", [...baseArgs, "merge.thalo.driver"]);
+		console.log(pc.green(`✓ merge.thalo.driver: ${driver.trim()}`));
+	} catch {
+		console.log(pc.red("✗ merge.thalo.driver: not configured"));
+	}
+	if (!isGlobal) {
+		const attributesPath = path.join(process.cwd(), ".gitattributes");
+		try {
+			if ((await fs.readFile(attributesPath, "utf-8")).includes("*.thalo merge=thalo")) console.log(pc.green("✓ .gitattributes: configured"));
+			else console.log(pc.yellow("⚠ .gitattributes: not configured"));
+		} catch {
+			console.log(pc.yellow("⚠ .gitattributes: file not found"));
+		}
+	}
+}
+/**
+* Uninstall configuration
+*/
+async function uninstallConfiguration(isGlobal) {
+	console.log(pc.blue(`Removing ${isGlobal ? "global" : "local"} merge driver configuration...`));
+	console.log();
+	const baseArgs = isGlobal ? [
+		"config",
+		"--global",
+		"--unset"
+	] : ["config", "--unset"];
+	try {
+		await execFile$1("git", [...baseArgs, "merge.thalo.name"]);
+		console.log(pc.green("✓ Removed merge.thalo.name"));
+	} catch {
+		console.log(pc.dim("  merge.thalo.name not found"));
+	}
+	try {
+		await execFile$1("git", [...baseArgs, "merge.thalo.driver"]);
+		console.log(pc.green("✓ Removed merge.thalo.driver"));
+	} catch {
+		console.log(pc.dim("  merge.thalo.driver not found"));
+	}
+	if (!isGlobal) {
+		const attributesPath = path.join(process.cwd(), ".gitattributes");
+		try {
+			let content = await fs.readFile(attributesPath, "utf-8");
+			const originalContent = content;
+			content = content.replace(/^\*\.thalo merge=thalo\n?/gm, "");
+			if (content !== originalContent) {
+				await fs.writeFile(attributesPath, content, "utf-8");
+				console.log(pc.green("✓ Removed from .gitattributes"));
+			} else console.log(pc.dim("  .gitattributes entry not found"));
+		} catch {}
+	}
+	console.log();
+	console.log(pc.green("✓ Merge driver configuration removed"));
+}
+const setupMergeDriverCommand = {
+	name: "setup-merge-driver",
+	description: "Configure Git to use the thalo merge driver",
+	options: {
+		global: {
+			type: "boolean",
+			short: "g",
+			description: "Configure globally in ~/.gitconfig",
+			default: false
+		},
+		check: {
+			type: "boolean",
+			description: "Check if merge driver is configured",
+			default: false
+		},
+		uninstall: {
+			type: "boolean",
+			description: "Remove merge driver configuration",
+			default: false
+		}
+	},
+	action: setupMergeDriverAction
+};
+
+//#endregion
+export { setupMergeDriverCommand };
+//# sourceMappingURL=setup-merge-driver.js.map

package/dist/commands/setup-merge-driver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup-merge-driver.js","names":["execFile","execFileCallback","setupMergeDriverCommand: CommandDef"],"sources":["../../src/commands/setup-merge-driver.ts"],"sourcesContent":["import * as fs from \"node:fs/promises\";\nimport * as path from \"node:path\";\nimport { execFile as execFileCallback } from \"node:child_process\";\nimport { promisify } from \"node:util\";\nimport type { CommandDef, CommandContext } from \"../cli.js\";\nimport pc from \"picocolors\";\n\nconst execFile = promisify(execFileCallback);\n\n/**\n * Setup merge driver command\n *\n * Configures Git to use the thalo merge driver for .thalo files\n */\nasync function setupMergeDriverAction(ctx: CommandContext): Promise<void> {\n  const { options } = ctx;\n  const isGlobal = options[\"global\"] as boolean;\n  const checkOnly = options[\"check\"] as boolean;\n  const uninstall = options[\"uninstall\"] as boolean;\n\n  if (checkOnly) {\n    await checkConfiguration(isGlobal);\n    return;\n  }\n\n  if (uninstall) {\n    await uninstallConfiguration(isGlobal);\n    return;\n  }\n\n  if (!isGlobal) {\n    if (!(await isGitRepository())) {\n      console.error(pc.red(\"Error: Not in a git repository\"));\n      console.error(\n        pc.dim(\n          \"Run this command from a git repository, or use --global for system-wide configuration\",\n        ),\n      );\n      process.exit(1);\n    }\n  }\n\n  console.log(\n    pc.blue(`Configuring thalo merge driver ${isGlobal ? \"globally\" : \"for this repository\"}...`),\n  );\n  console.log();\n\n  try {\n    await configureGit(isGlobal);\n\n    if (!isGlobal) {\n      await configureGitAttributes();\n    }\n\n    console.log();\n    console.log(pc.green(\"✓ Thalo merge driver configured successfully\"));\n    console.log();\n    console.log(pc.bold(\"Configuration:\"));\n    if (isGlobal) {\n      console.log(pc.dim(\"  • Git config: ~/.gitconfig\"));\n      console.log(\n        pc.dim(\n          \"  • You still need to add '*.thalo merge=thalo' to .gitattributes in each repository\",\n        ),\n      );\n    } else {\n      console.log(pc.dim(\"  • Git config: .git/config\"));\n      console.log(pc.dim(\"  • Git attributes: .gitattributes\"));\n    }\n    console.log();\n    console.log(pc.dim(\"The merge driver will now be used for *.thalo files during git merge\"));\n  } catch (err) {\n    const message = err instanceof Error ? err.message : String(err);\n    console.error(pc.red(`Error: ${message}`));\n    process.exit(1);\n  }\n}\n\n/**\n * Check if we're in a git repository\n */\nasync function isGitRepository(): Promise<boolean> {\n  try {\n    await execFile(\"git\", [\"rev-parse\", \"--git-dir\"]);\n    return true;\n  } catch {\n    return false;\n  }\n}\n\n/**\n * Configure git config for the merge driver\n */\nasync function configureGit(isGlobal: boolean): Promise<void> {\n  console.log(pc.dim(\"Configuring git merge driver...\"));\n\n  const baseArgs = isGlobal ? [\"config\", \"--global\"] : [\"config\"];\n\n  try {\n    await execFile(\"git\", [...baseArgs, \"merge.thalo.name\", \"Thalo semantic merge driver\"]);\n  } catch (err) {\n    const message = err instanceof Error ? err.message : String(err);\n    throw new Error(`Failed to set merge.thalo.name: ${message}`);\n  }\n\n  try {\n    await execFile(\"git\", [...baseArgs, \"merge.thalo.driver\", \"thalo merge-driver %O %A %B %P\"]);\n  } catch (err) {\n    const message = err instanceof Error ? err.message : String(err);\n    throw new Error(`Failed to set merge.thalo.driver: ${message}`);\n  }\n\n  console.log(pc.green(\"  ✓ Git config updated\"));\n}\n\n/**\n * Configure .gitattributes for thalo files\n */\nasync function configureGitAttributes(): Promise<void> {\n  console.log(pc.dim(\"Configuring .gitattributes...\"));\n\n  const attributesPath = path.join(process.cwd(), \".gitattributes\");\n  const attributeLine = \"*.thalo merge=thalo\";\n\n  let content = \"\";\n  try {\n    content = await fs.readFile(attributesPath, \"utf-8\");\n  } catch {\n    // File doesn't exist, will be created\n  }\n\n  if (content.includes(attributeLine)) {\n    console.log(pc.green(\"  ✓ .gitattributes already configured\"));\n    return;\n  }\n\n  const newContent = content.trim()\n    ? `${content.trim()}\\n${attributeLine}\\n`\n    : `${attributeLine}\\n`;\n  await fs.writeFile(attributesPath, newContent, \"utf-8\");\n\n  console.log(pc.green(\"  ✓ .gitattributes updated\"));\n}\n\n/**\n * Check current configuration\n */\nasync function checkConfiguration(isGlobal: boolean): Promise<void> {\n  const scope = isGlobal ? \"global\" : \"local\";\n  console.log(pc.blue(`Checking ${scope} merge driver configuration...`));\n  console.log();\n\n  const baseArgs = isGlobal ? [\"config\", \"--global\"] : [\"config\"];\n\n  try {\n    const { stdout: name } = await execFile(\"git\", [...baseArgs, \"merge.thalo.name\"]);\n    console.log(pc.green(`✓ merge.thalo.name: ${name.trim()}`));\n  } catch {\n    console.log(pc.red(\"✗ merge.thalo.name: not configured\"));\n  }\n\n  try {\n    const { stdout: driver } = await execFile(\"git\", [...baseArgs, \"merge.thalo.driver\"]);\n    console.log(pc.green(`✓ merge.thalo.driver: ${driver.trim()}`));\n  } catch {\n    console.log(pc.red(\"✗ merge.thalo.driver: not configured\"));\n  }\n\n  if (!isGlobal) {\n    const attributesPath = path.join(process.cwd(), \".gitattributes\");\n    try {\n      const content = await fs.readFile(attributesPath, \"utf-8\");\n      if (content.includes(\"*.thalo merge=thalo\")) {\n        console.log(pc.green(\"✓ .gitattributes: configured\"));\n      } else {\n        console.log(pc.yellow(\"⚠ .gitattributes: not configured\"));\n      }\n    } catch {\n      console.log(pc.yellow(\"⚠ .gitattributes: file not found\"));\n    }\n  }\n}\n\n/**\n * Uninstall configuration\n */\nasync function uninstallConfiguration(isGlobal: boolean): Promise<void> {\n  console.log(pc.blue(`Removing ${isGlobal ? \"global\" : \"local\"} merge driver configuration...`));\n  console.log();\n\n  const baseArgs = isGlobal ? [\"config\", \"--global\", \"--unset\"] : [\"config\", \"--unset\"];\n\n  try {\n    await execFile(\"git\", [...baseArgs, \"merge.thalo.name\"]);\n    console.log(pc.green(\"✓ Removed merge.thalo.name\"));\n  } catch {\n    console.log(pc.dim(\"  merge.thalo.name not found\"));\n  }\n\n  try {\n    await execFile(\"git\", [...baseArgs, \"merge.thalo.driver\"]);\n    console.log(pc.green(\"✓ Removed merge.thalo.driver\"));\n  } catch {\n    console.log(pc.dim(\"  merge.thalo.driver not found\"));\n  }\n\n  if (!isGlobal) {\n    const attributesPath = path.join(process.cwd(), \".gitattributes\");\n    try {\n      let content = await fs.readFile(attributesPath, \"utf-8\");\n      const originalContent = content;\n      content = content.replace(/^\\*\\.thalo merge=thalo\\n?/gm, \"\");\n\n      if (content !== originalContent) {\n        await fs.writeFile(attributesPath, content, \"utf-8\");\n        console.log(pc.green(\"✓ Removed from .gitattributes\"));\n      } else {\n        console.log(pc.dim(\"  .gitattributes entry not found\"));\n      }\n    } catch {\n      // File doesn't exist, nothing to do\n    }\n  }\n\n  console.log();\n  console.log(pc.green(\"✓ Merge driver configuration removed\"));\n}\n\nexport const setupMergeDriverCommand: CommandDef = {\n  name: \"setup-merge-driver\",\n  description: \"Configure Git to use the thalo merge driver\",\n  options: {\n    global: {\n      type: \"boolean\",\n      short: \"g\",\n      description: \"Configure globally in ~/.gitconfig\",\n      default: false,\n    },\n    check: {\n      type: \"boolean\",\n      description: \"Check if merge driver is configured\",\n      default: false,\n    },\n    uninstall: {\n      type: \"boolean\",\n      description: \"Remove merge driver configuration\",\n      default: false,\n    },\n  },\n  action: setupMergeDriverAction,\n};\n"],"mappings":"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"}

package/dist/files.js

@@ -0,0 +1,145 @@
+import pc from "picocolors";
+import * as fs from "node:fs";
+import { readFile, readdir, stat } from "node:fs/promises";
+import * as path from "node:path";
+import { join, resolve } from "node:path";
+import { createWorkspace } from "@rejot-dev/thalo/native";
+
+//#region src/files.ts
+/**
+* Default file extensions for thalo files.
+*/
+const DEFAULT_EXTENSIONS = [".thalo", ".md"];
+/**
+* Default file types (without leading dot).
+*/
+const DEFAULT_FILE_TYPES = ["thalo", "md"];
+/**
+* Get relative path from current working directory.
+*/
+function relativePath(filePath) {
+	const cwd = process.cwd();
+	const resolvedCwd = path.resolve(cwd);
+	const resolvedFilePath = path.resolve(filePath);
+	return path.relative(resolvedCwd, resolvedFilePath) || filePath;
+}
+/**
+* Collect all thalo files from a directory (sync).
+*/
+function collectThaloFilesSync(dir, extensions = DEFAULT_EXTENSIONS) {
+	const files = [];
+	function walk(currentDir) {
+		let entries;
+		try {
+			entries = fs.readdirSync(currentDir, { withFileTypes: true });
+		} catch {
+			return;
+		}
+		for (const entry of entries) {
+			const fullPath = path.join(currentDir, entry.name);
+			if (entry.isDirectory()) {
+				if (!entry.name.startsWith(".") && entry.name !== "node_modules") walk(fullPath);
+			} else if (entry.isFile()) {
+				if (extensions.some((ext) => entry.name.endsWith(ext))) files.push(fullPath);
+			}
+		}
+	}
+	walk(dir);
+	return files;
+}
+/**
+* Resolve file paths from command arguments (sync).
+* Supports both file types with leading dot ([".md", ".thalo"]) or without (["md", "thalo"]).
+*/
+function resolveFilesSync(paths, fileTypes = DEFAULT_FILE_TYPES) {
+	const files = [];
+	const extensions = fileTypes.map((type) => type.startsWith(".") ? type : `.${type}`);
+	for (const targetPath of paths) {
+		const resolved = path.resolve(targetPath);
+		if (!fs.existsSync(resolved)) {
+			console.error(pc.red(`Error: Path not found: ${targetPath}`));
+			process.exit(2);
+		}
+		const fileStat = fs.statSync(resolved);
+		if (fileStat.isDirectory()) files.push(...collectThaloFilesSync(resolved, extensions));
+		else if (fileStat.isFile()) {
+			if (extensions.some((ext) => resolved.endsWith(ext))) files.push(resolved);
+		}
+	}
+	return files;
+}
+/**
+* Collect all thalo files from a directory (async).
+*/
+async function collectThaloFiles(dir, extensions = DEFAULT_EXTENSIONS) {
+	const files = [];
+	async function walk(currentDir) {
+		let entries;
+		try {
+			entries = await readdir(currentDir, { withFileTypes: true });
+		} catch {
+			return;
+		}
+		for (const entry of entries) {
+			const fullPath = join(currentDir, entry.name);
+			if (entry.isDirectory()) {
+				if (!entry.name.startsWith(".") && entry.name !== "node_modules") await walk(fullPath);
+			} else if (entry.isFile()) {
+				if (extensions.some((ext) => entry.name.endsWith(ext))) files.push(fullPath);
+			}
+		}
+	}
+	await walk(dir);
+	return files;
+}
+/**
+* Resolve file paths from command arguments (async).
+* Supports both file types with leading dot ([".md", ".thalo"]) or without (["md", "thalo"]).
+*/
+async function resolveFiles(paths, fileTypes = DEFAULT_FILE_TYPES) {
+	const files = [];
+	const extensions = fileTypes.map((type) => type.startsWith(".") ? type : `.${type}`);
+	for (const targetPath of paths) {
+		const resolved = resolve(targetPath);
+		let fileStat;
+		try {
+			fileStat = await stat(resolved);
+		} catch {
+			console.error(pc.red(`Error: Path not found: ${targetPath}`));
+			process.exit(2);
+		}
+		if (fileStat.isDirectory()) files.push(...await collectThaloFiles(resolved, extensions));
+		else if (fileStat.isFile()) {
+			if (extensions.some((ext) => resolved.endsWith(ext))) files.push(resolved);
+		}
+	}
+	return files;
+}
+/**
+* Load workspace from files (async).
+*/
+async function loadWorkspace(files) {
+	const workspace = createWorkspace();
+	for (const file of files) try {
+		const source = await readFile(file, "utf-8");
+		workspace.addDocument(source, { filename: file });
+	} catch (err) {
+		console.error(pc.red(`Error reading ${file}: ${err instanceof Error ? err.message : err}`));
+	}
+	return workspace;
+}
+/**
+* Load the full workspace from the current working directory (async).
+* This is the standard way to load a workspace - always includes all files from CWD.
+*/
+async function loadFullWorkspace(fileTypes = DEFAULT_FILE_TYPES) {
+	const files = await resolveFiles(["."], fileTypes);
+	return {
+		workspace: await loadWorkspace(files),
+		files
+	};
+}
+
+//#endregion
+export { loadFullWorkspace, loadWorkspace, relativePath, resolveFiles, resolveFilesSync };
+//# sourceMappingURL=files.js.map

package/dist/files.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"files.js","names":["files: string[]"],"sources":["../src/files.ts"],"sourcesContent":["/**\n * Centralized file collection and workspace utilities for CLI commands.\n */\n\nimport * as fs from \"node:fs\";\nimport { readdir, readFile, stat } from \"node:fs/promises\";\nimport * as path from \"node:path\";\nimport { join, resolve } from \"node:path\";\nimport pc from \"picocolors\";\nimport { createWorkspace, type Workspace } from \"@rejot-dev/thalo/native\";\n\n/**\n * Default file extensions for thalo files.\n */\nexport const DEFAULT_EXTENSIONS = [\".thalo\", \".md\"];\n\n/**\n * Default file types (without leading dot).\n */\nexport const DEFAULT_FILE_TYPES = [\"thalo\", \"md\"];\n\n/**\n * Get relative path from current working directory.\n */\nexport function relativePath(filePath: string): string {\n  const cwd = process.cwd();\n  const resolvedCwd = path.resolve(cwd);\n  const resolvedFilePath = path.resolve(filePath);\n  const rel = path.relative(resolvedCwd, resolvedFilePath);\n  return rel || filePath;\n}\n\n// ===================\n// Synchronous versions (for check, actualize)\n// ===================\n\n/**\n * Collect all thalo files from a directory (sync).\n */\nexport function collectThaloFilesSync(\n  dir: string,\n  extensions: string[] = DEFAULT_EXTENSIONS,\n): string[] {\n  const files: string[] = [];\n\n  function walk(currentDir: string): void {\n    let entries;\n    try {\n      entries = fs.readdirSync(currentDir, { withFileTypes: true });\n    } catch {\n      return;\n    }\n\n    for (const entry of entries) {\n      const fullPath = path.join(currentDir, entry.name);\n\n      if (entry.isDirectory()) {\n        if (!entry.name.startsWith(\".\") && entry.name !== \"node_modules\") {\n          walk(fullPath);\n        }\n      } else if (entry.isFile()) {\n        if (extensions.some((ext) => entry.name.endsWith(ext))) {\n          files.push(fullPath);\n        }\n      }\n    }\n  }\n\n  walk(dir);\n  return files;\n}\n\n/**\n * Resolve file paths from command arguments (sync).\n * Supports both file types with leading dot ([\".md\", \".thalo\"]) or without ([\"md\", \"thalo\"]).\n */\nexport function resolveFilesSync(\n  paths: string[],\n  fileTypes: string[] = DEFAULT_FILE_TYPES,\n): string[] {\n  const files: string[] = [];\n  // Normalize to extensions with leading dot\n  const extensions = fileTypes.map((type) => (type.startsWith(\".\") ? type : `.${type}`));\n\n  for (const targetPath of paths) {\n    const resolved = path.resolve(targetPath);\n\n    if (!fs.existsSync(resolved)) {\n      console.error(pc.red(`Error: Path not found: ${targetPath}`));\n      process.exit(2);\n    }\n\n    const fileStat = fs.statSync(resolved);\n    if (fileStat.isDirectory()) {\n      files.push(...collectThaloFilesSync(resolved, extensions));\n    } else if (fileStat.isFile()) {\n      // Accept file if extension matches or if no filtering is needed\n      if (extensions.some((ext) => resolved.endsWith(ext))) {\n        files.push(resolved);\n      }\n    }\n  }\n\n  return files;\n}\n\n/**\n * Load workspace from files (sync).\n */\nexport function loadWorkspaceSync(files: string[]): Workspace {\n  const workspace = createWorkspace();\n\n  for (const file of files) {\n    try {\n      const source = fs.readFileSync(file, \"utf-8\");\n      workspace.addDocument(source, { filename: file });\n    } catch (err) {\n      console.error(pc.red(`Error reading ${file}: ${err instanceof Error ? err.message : err}`));\n    }\n  }\n\n  return workspace;\n}\n\n// ===================\n// Async versions (for query, format)\n// ===================\n\n/**\n * Collect all thalo files from a directory (async).\n */\nexport async function collectThaloFiles(\n  dir: string,\n  extensions: string[] = DEFAULT_EXTENSIONS,\n): Promise<string[]> {\n  const files: string[] = [];\n\n  async function walk(currentDir: string): Promise<void> {\n    let entries;\n    try {\n      entries = await readdir(currentDir, { withFileTypes: true });\n    } catch {\n      return;\n    }\n\n    for (const entry of entries) {\n      const fullPath = join(currentDir, entry.name);\n\n      if (entry.isDirectory()) {\n        if (!entry.name.startsWith(\".\") && entry.name !== \"node_modules\") {\n          await walk(fullPath);\n        }\n      } else if (entry.isFile()) {\n        if (extensions.some((ext) => entry.name.endsWith(ext))) {\n          files.push(fullPath);\n        }\n      }\n    }\n  }\n\n  await walk(dir);\n  return files;\n}\n\n/**\n * Resolve file paths from command arguments (async).\n * Supports both file types with leading dot ([\".md\", \".thalo\"]) or without ([\"md\", \"thalo\"]).\n */\nexport async function resolveFiles(\n  paths: string[],\n  fileTypes: string[] = DEFAULT_FILE_TYPES,\n): Promise<string[]> {\n  const files: string[] = [];\n  // Normalize to extensions with leading dot\n  const extensions = fileTypes.map((type) => (type.startsWith(\".\") ? type : `.${type}`));\n\n  for (const targetPath of paths) {\n    const resolved = resolve(targetPath);\n\n    let fileStat;\n    try {\n      fileStat = await stat(resolved);\n    } catch {\n      console.error(pc.red(`Error: Path not found: ${targetPath}`));\n      process.exit(2);\n    }\n\n    if (fileStat.isDirectory()) {\n      files.push(...(await collectThaloFiles(resolved, extensions)));\n    } else if (fileStat.isFile()) {\n      // Accept file if extension matches\n      if (extensions.some((ext) => resolved.endsWith(ext))) {\n        files.push(resolved);\n      }\n    }\n  }\n\n  return files;\n}\n\n/**\n * Load workspace from files (async).\n */\nexport async function loadWorkspace(files: string[]): Promise<Workspace> {\n  const workspace = createWorkspace();\n\n  for (const file of files) {\n    try {\n      const source = await readFile(file, \"utf-8\");\n      workspace.addDocument(source, { filename: file });\n    } catch (err) {\n      console.error(pc.red(`Error reading ${file}: ${err instanceof Error ? err.message : err}`));\n    }\n  }\n\n  return workspace;\n}\n\n/**\n * Load the full workspace from the current working directory (async).\n * This is the standard way to load a workspace - always includes all files from CWD.\n */\nexport async function loadFullWorkspace(\n  fileTypes: string[] = DEFAULT_FILE_TYPES,\n): Promise<{ workspace: Workspace; files: string[] }> {\n  const files = await resolveFiles([\".\"], fileTypes);\n  const workspace = await loadWorkspace(files);\n  return { workspace, files };\n}\n"],"mappings":"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"}

package/dist/mod.d.ts

@@ -0,0 +1 @@
+export { };

package/dist/mod.js

@@ -0,0 +1,31 @@
+import { runCli } from "./cli.js";
+import { actualizeCommand } from "./commands/actualize.js";
+import { checkCommand } from "./commands/check.js";
+import { formatCommand } from "./commands/format.js";
+import { initCommand } from "./commands/init.js";
+import { lspCommand } from "./commands/lsp.js";
+import { queryCommand } from "./commands/query.js";
+import { rulesCommand } from "./commands/rules.js";
+import { mergeDriverCommand } from "./commands/merge-driver.js";
+import { setupMergeDriverCommand } from "./commands/setup-merge-driver.js";
+
+//#region src/mod.ts
+runCli({
+	name: "thalo",
+	description: "Lint and check thalo files",
+	subcommands: {
+		actualize: actualizeCommand,
+		check: checkCommand,
+		format: formatCommand,
+		init: initCommand,
+		lsp: lspCommand,
+		query: queryCommand,
+		rules: rulesCommand,
+		"merge-driver": mergeDriverCommand,
+		"setup-merge-driver": setupMergeDriverCommand
+	}
+});
+
+//#endregion
+export {  };
+//# sourceMappingURL=mod.js.map

package/dist/mod.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mod.js","names":[],"sources":["../src/mod.ts"],"sourcesContent":["import { runCli, type CommandDef } from \"./cli.js\";\nimport { actualizeCommand } from \"./commands/actualize.js\";\nimport { checkCommand } from \"./commands/check.js\";\nimport { formatCommand } from \"./commands/format.js\";\nimport { initCommand } from \"./commands/init.js\";\nimport { lspCommand } from \"./commands/lsp.js\";\nimport { queryCommand } from \"./commands/query.js\";\nimport { rulesCommand } from \"./commands/rules.js\";\nimport { mergeDriverCommand } from \"./commands/merge-driver.js\";\nimport { setupMergeDriverCommand } from \"./commands/setup-merge-driver.js\";\n\n/**\n * Root command definition\n *\n * When invoked without a subcommand, shows help\n */\nconst rootCommand: CommandDef = {\n  name: \"thalo\",\n  description: \"Lint and check thalo files\",\n  subcommands: {\n    actualize: actualizeCommand,\n    check: checkCommand,\n    format: formatCommand,\n    init: initCommand,\n    lsp: lspCommand,\n    query: queryCommand,\n    rules: rulesCommand,\n    \"merge-driver\": mergeDriverCommand,\n    \"setup-merge-driver\": setupMergeDriverCommand,\n  },\n};\n\nrunCli(rootCommand);\n"],"mappings":";;;;;;;;;;;;AAgCA,OAhBgC;CAC9B,MAAM;CACN,aAAa;CACb,aAAa;EACX,WAAW;EACX,OAAO;EACP,QAAQ;EACR,MAAM;EACN,KAAK;EACL,OAAO;EACP,OAAO;EACP,gBAAgB;EAChB,sBAAsB;EACvB;CACF,CAEkB"}

package/package.json

@@ -0,0 +1,54 @@
+{
+  "name": "@rejot-dev/thalo-cli",
+  "version": "0.0.0",
+  "type": "module",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/rejot-dev/thalo.git",
+    "directory": "apps/thalo-cli"
+  },
+  "license": "MIT",
+  "files": [
+    "dist",
+    "bin"
+  ],
+  "bin": {
+    "thalo": "./bin/run.js"
+  },
+  "exports": {
+    ".": {
+      "development": "./src/mod.ts",
+      "types": "./dist/mod.d.ts",
+      "default": "./dist/mod.js"
+    }
+  },
+  "main": "./dist/mod.js",
+  "types": "./dist/mod.d.ts",
+  "dependencies": {
+    "ignore": "^7.0.5",
+    "picocolors": "^1.1.1",
+    "prettier": "^3.5.3",
+    "tree-sitter": "^0.25.0",
+    "vscode-languageserver": "^9.0.1",
+    "@rejot-dev/thalo": "0.0.0",
+    "@rejot-dev/thalo-lsp": "0.0.0",
+    "@rejot-dev/thalo-prettier": "0.0.0",
+    "@rejot-dev/tree-sitter-thalo": "0.0.0"
+  },
+  "devDependencies": {
+    "@types/node": "^24",
+    "tsdown": "^0.15.12",
+    "tsx": "4.21.0",
+    "typescript": "^5.7.3",
+    "vitest": "^3.2.4",
+    "@rejot-private/typescript-config": "0.0.1"
+  },
+  "scripts": {
+    "dev": "tsx src/mod.ts",
+    "build": "tsdown",
+    "build:watch": "tsdown --watch",
+    "types:check": "tsc --noEmit",
+    "test": "vitest run",
+    "test:watch": "vitest --watch"
+  }
+}