get-tbd 0.1.24 → 0.1.26

package/dist/cli.mjs

@@ -1,7 +1,8 @@
-import { D as IssueKind, a as stringifyYaml, c as ordering, d as ATTIC_ENTRY_FIELD_ORDER, f as AtticEntrySchema, i as sortKeys, k as IssueStatus, l as PAGINATION_LINE_THRESHOLD, r as parseYamlWithConflictDetection, s as comparisonChain, t as detectDuplicateYamlKeys, u as PARENT_CONTEXT_MAX_LINES } from "./yaml-utils-U7l9hhkh.mjs";
-import { a as insertAfterFrontmatter, c as noopLogger, i as serializeIssue, n as parseIssue, o as parseMarkdown, r as parseMarkdownWithFrontmatter, s as stripFrontmatter, t as VERSION$1 } from "./src-BrM6xcdG.mjs";
-import { A as isValidWorkspaceName, C as TBD_SHORTCUTS_STANDARD, D as WORKTREE_DIR, E as WORKSPACES_DIR, M as resolveDataSyncDir, O as WORKTREE_DIR_NAME, S as TBD_GUIDELINES_DIR, T as TBD_TEMPLATES_DIR, _ as DEFAULT_SHORTCUT_PATHS, a as isInitialized, b as TBD_DIR, c as readConfigWithMigration, d as writeConfig, g as DEFAULT_GUIDELINES_PATHS, h as DATA_SYNC_DIR_NAME, i as initConfig, j as resolveAtticDir, k as getWorkspaceDir, l as readLocalState, m as DATA_SYNC_DIR, n as findTbdRoot, o as markWelcomeSeen, p as CHARS_PER_TOKEN, r as hasSeenWelcome, s as readConfig, u as updateLocalState, v as DEFAULT_TEMPLATE_PATHS, w as TBD_SHORTCUTS_SYSTEM, x as TBD_DOCS_DIR, y as SYNC_BRANCH } from "./config-CmEAGaxz.mjs";
-import { _ as generateInternalId, a as hasShortId, b as validateIssueId, c as parseIdMappingFromYaml, d as saveIdMapping, f as extractPrefix, g as formatDisplayId, h as formatDebugId, i as generateUniqueShortId, l as reconcileMappings, m as extractUlidFromInternalId, o as loadIdMapping, p as extractShortId, s as mergeIdMappings, t as addIdMapping, u as resolveToInternalId, v as makeInternalId, y as normalizeIssueId } from "./id-mapping-DjVJIO4M.mjs";
+import { _ as IssueKind, n as AtticEntrySchema, t as ATTIC_ENTRY_FIELD_ORDER, y as IssueStatus } from "./schemas-BQYmDnkv.mjs";
+import { a as insertAfterFrontmatter, c as noopLogger, i as serializeIssue, n as parseIssue, o as parseMarkdown, r as parseMarkdownWithFrontmatter, s as stripFrontmatter, t as VERSION$1 } from "./src-DQcOQnFp.mjs";
+import { a as parseYamlWithConflictDetection, d as PAGINATION_LINE_THRESHOLD, f as PARENT_CONTEXT_MAX_LINES, l as comparisonChain, n as detectDuplicateYamlKeys, o as sortKeys, s as stringifyYaml, u as ordering } from "./yaml-utils-BPy991by.mjs";
+import { A as isValidWorkspaceName, C as TBD_SHORTCUTS_STANDARD, D as WORKTREE_DIR, E as WORKSPACES_DIR, M as resolveDataSyncDir, O as WORKTREE_DIR_NAME, S as TBD_GUIDELINES_DIR, T as TBD_TEMPLATES_DIR, _ as DEFAULT_SHORTCUT_PATHS, a as isInitialized, b as TBD_DIR, c as readConfigWithMigration, d as writeConfig, g as DEFAULT_GUIDELINES_PATHS, h as DATA_SYNC_DIR_NAME, i as initConfig, j as resolveAtticDir, k as getWorkspaceDir, l as readLocalState, m as DATA_SYNC_DIR, n as findTbdRoot, o as markWelcomeSeen, p as CHARS_PER_TOKEN, r as hasSeenWelcome, s as readConfig, u as updateLocalState, v as DEFAULT_TEMPLATE_PATHS, w as TBD_SHORTCUTS_SYSTEM, x as TBD_DOCS_DIR, y as SYNC_BRANCH } from "./config-b20Kf5pW.mjs";
+import { _ as formatDisplayId, a as hasShortId, b as normalizeIssueId, c as parseIdMappingFromYaml, d as resolveToInternalId, f as saveIdMapping, g as formatDebugId, h as extractUlidFromInternalId, i as generateUniqueShortId, l as reconcileMappings, m as extractShortId, o as loadIdMapping, p as extractPrefix, s as mergeIdMappings, t as addIdMapping, u as resolveIdMappingConflicts, v as generateInternalId, x as validateIssueId, y as makeInternalId } from "./id-mapping-BtBwq5nG.mjs";
 import { createRequire } from "node:module";
 import matter from "gray-matter";
 import { parse } from "yaml";
@@ -1514,6 +1515,7 @@ async function initWorktree(baseDir, remote = "origin", syncBranch = SYNC_BRANCH
 		await writeFile(join(dataSyncPath, "meta.yml"), "schema_version: 1\n");
 		await writeFile(join(dataSyncPath, "issues", ".gitkeep"), "");
 		await writeFile(join(dataSyncPath, "mappings", ".gitkeep"), "");
+		await writeFile(join(dataSyncPath, "mappings", ".gitattributes"), "ids.yml merge=union\n");
 		await git("-C", worktreePath, "add", ".");
 		await git("-C", worktreePath, "commit", "--no-verify", "-m", "Initialize tbd-sync branch");
 		return {
@@ -1751,9 +1753,16 @@ async function migrateDataToWorktree(baseDir, removeSource = false) {
 		await mkdir(correctMappingsPath, { recursive: true });
 		for (const file of issueFiles) await cp(join(wrongIssuesPath, file), join(correctIssuesPath, file));
 		for (const file of mappingFiles) if (file === "ids.yml") {
-			const { loadIdMapping, mergeIdMappings, saveIdMapping } = await import("./id-mapping-LjnDSEhN.mjs");
-			const sourceMapping = await loadIdMapping(wrongPath);
-			await saveIdMapping(correctPath, mergeIdMappings(await loadIdMapping(correctPath), sourceMapping));
+			const { readFile } = await import("node:fs/promises");
+			const { loadIdMapping, mergeIdMappings, saveIdMapping, resolveIdMappingConflicts } = await import("./id-mapping-BA_xn516.mjs");
+			const sourceMapping = resolveIdMappingConflicts(await readFile(join(wrongMappingsPath, file), "utf-8"));
+			let targetMapping;
+			try {
+				targetMapping = resolveIdMappingConflicts(await readFile(join(correctMappingsPath, file), "utf-8"));
+			} catch {
+				targetMapping = await loadIdMapping(correctPath);
+			}
+			await saveIdMapping(correctPath, mergeIdMappings(targetMapping, sourceMapping));
 		} else await cp(join(wrongMappingsPath, file), join(correctMappingsPath, file));
 		const totalFiles = issueFiles.length + mappingFiles.length;
 		await git("-C", worktreePath, "add", "-A");
@@ -1919,28 +1928,32 @@ async function listIssues(baseDir) {
 		return [];
 	}
 	const mdFiles = files.filter((f) => f.endsWith(".md"));
-	const fileContents = await Promise.all(mdFiles.map(async (file) => {
-		const filePath = join(issuesDir, file);
-		try {
-			return {
-				file,
-				content: await readFile(filePath, "utf-8")
-			};
-		} catch {
-			return {
-				file,
-				content: null
-			};
-		}
-	}));
+	const BATCH_SIZE = 200;
 	const issues = [];
-	for (const { file, content } of fileContents) {
-		if (content === null) continue;
-		try {
-			const issue = parseIssue(content);
-			issues.push(issue);
-		} catch (error) {
-			console.warn(`Skipping invalid issue file: ${file}`, error);
+	for (let i = 0; i < mdFiles.length; i += BATCH_SIZE) {
+		const batch = mdFiles.slice(i, i + BATCH_SIZE);
+		const fileContents = await Promise.all(batch.map(async (file) => {
+			const filePath = join(issuesDir, file);
+			try {
+				return {
+					file,
+					content: await readFile(filePath, "utf-8")
+				};
+			} catch {
+				return {
+					file,
+					content: null
+				};
+			}
+		}));
+		for (const { file, content } of fileContents) {
+			if (content === null) continue;
+			try {
+				const issue = parseIssue(content);
+				issues.push(issue);
+			} catch (error) {
+				console.warn(`Skipping invalid issue file: ${file}`, error);
+			}
 		}
 	}
 	return issues;
@@ -2715,10 +2728,7 @@ function matchesSpecPath(storedPath, queryPath) {
 	if (!normalizedStored || !normalizedQuery) return false;
 	if (normalizedStored === normalizedQuery) return true;
 	if (normalizedStored.endsWith("/" + normalizedQuery)) return true;
-	const storedFilename = basename(normalizedStored);
-	const queryFilename = basename(normalizedQuery);
-	if (!normalizedQuery.includes("/") && storedFilename === normalizedQuery) return true;
-	if (!normalizedQuery.includes("/") && storedFilename === queryFilename) return true;
+	if (!normalizedQuery.includes("/") && basename(normalizedStored) === normalizedQuery) return true;
 	return false;
 }
 /**
@@ -4063,7 +4073,7 @@ async function fetchWithGhFallback(url, options) {
 * See: docs/project/specs/active/plan-2026-01-26-configurable-doc-cache-sync.md
 */
 /** Prefix for internal bundled doc sources */
-const INTERNAL_PREFIX = "internal:";
+const INTERNAL_SOURCE_PREFIX = "internal:";
 /**
 * Syncs documentation files from configured sources.
 *
@@ -4096,7 +4106,7 @@ var DocSync = class {
 	* // => { type: 'url', location: 'https://...' }
 	*/
 	parseSource(source) {
-		if (source.startsWith(INTERNAL_PREFIX)) return {
+		if (source.startsWith(INTERNAL_SOURCE_PREFIX)) return {
 			type: "internal",
 			location: source.slice(9)
 		};
@@ -4275,7 +4285,7 @@ async function generateDefaultDocCacheConfig() {
 			const entries = await readdir(fullDir, { withFileTypes: true });
 			for (const entry of entries) if (entry.isFile() && entry.name.endsWith(".md")) {
 				const relativePath = `${prefix}/${entry.name}`;
-				config[relativePath] = `${INTERNAL_PREFIX}${relativePath}`;
+				config[relativePath] = `${INTERNAL_SOURCE_PREFIX}${relativePath}`;
 			}
 		} catch {}
 	}
@@ -4312,8 +4322,6 @@ function isDocsStale(lastSyncAt, autoSyncHours) {
 	const lastSync = new Date(lastSyncAt).getTime();
 	return (Date.now() - lastSync) / (1e3 * 60 * 60) >= autoSyncHours;
 }
-/** Prefix for internal bundled doc sources */
-const INTERNAL_SOURCE_PREFIX = "internal:";
 /**
 * Check if an internal bundled doc exists.
 *
@@ -5138,6 +5146,19 @@ var SyncHandler = class extends BaseCommand {
 			} catch {
 				this.output.debug("Remote sync branch does not exist yet");
 			}
+			{
+				const { access, writeFile } = await import("node:fs/promises");
+				const attrPath = join(this.dataSyncDir, "mappings", ".gitattributes");
+				try {
+					await access(attrPath);
+				} catch {
+					await writeFile(attrPath, "ids.yml merge=union\n");
+					await git("-C", worktreePath, "add", attrPath);
+					try {
+						await git("-C", worktreePath, "commit", "--no-verify", "-m", "chore: add merge=union for ids.yml");
+					} catch {}
+				}
+			}
 			if (behindCommits > 0) {
 				let headBeforeMerge = "";
 				try {
@@ -5182,7 +5203,8 @@ var SyncHandler = class extends BaseCommand {
 						const remoteIdsContent = await git("show", `${remote}/${syncBranch}:${DATA_SYNC_DIR}/mappings/ids.yml`);
 						if (remoteIdsContent) {
 							conflictRemoteMapping = parseIdMappingFromYaml(remoteIdsContent);
-							const localMapping = await loadIdMapping(this.dataSyncDir);
+							const { readFile } = await import("node:fs/promises");
+							const localMapping = resolveIdMappingConflicts(await readFile(join(this.dataSyncDir, "mappings", "ids.yml"), "utf-8"));
 							const mergedMapping = mergeIdMappings(localMapping, conflictRemoteMapping);
 							await saveIdMapping(this.dataSyncDir, mergedMapping);
 							this.output.debug(`Merged ID mappings: ${localMapping.shortToUlid.size} local + ${conflictRemoteMapping.shortToUlid.size} remote = ${mergedMapping.shortToUlid.size} total`);
@@ -6298,14 +6320,22 @@ var DoctorHandler = class extends BaseCommand {
 		healthChecks.push(await this.checkIssuesDirectory());
 		healthChecks.push(this.checkOrphanedDependencies(this.issues));
 		healthChecks.push(this.checkDuplicateIds(this.issues));
+		healthChecks.push(await this.checkIdMappingConflicts(options.fix));
 		healthChecks.push(await this.checkIdMappingDuplicates(options.fix));
 		healthChecks.push(await this.checkTempFiles(options.fix));
 		healthChecks.push(this.checkIssueValidity(this.issues));
+		healthChecks.push(await this.checkWorktree(options.fix));
+		const dataLocationResult = await this.checkDataLocation(options.fix);
+		healthChecks.push(dataLocationResult);
+		if (dataLocationResult.status === "ok" && dataLocationResult.message?.includes("migrated")) {
+			this.dataSyncDir = await resolveDataSyncDir(this.cwd);
+			try {
+				this.issues = await listIssues(this.dataSyncDir);
+			} catch {}
+		}
 		const parsedMaxHistory = options.maxHistory ? parseInt(options.maxHistory, 10) : 50;
 		const maxHistory = Number.isNaN(parsedMaxHistory) || parsedMaxHistory < 0 ? 50 : parsedMaxHistory;
 		healthChecks.push(await this.checkMissingMappings(options.fix, maxHistory));
-		healthChecks.push(await this.checkWorktree(options.fix));
-		healthChecks.push(await this.checkDataLocation(options.fix));
 		healthChecks.push(await this.checkLocalSyncBranch());
 		healthChecks.push(await this.checkRemoteSyncBranch());
 		healthChecks.push(await this.checkLocalVsRemoteData());
@@ -6503,6 +6533,58 @@ var DoctorHandler = class extends BaseCommand {
 		};
 	}
 	/**
+	* Check 5b: Merge conflict markers in ids.yml.
+	*
+	* After a failed git merge during sync, ids.yml may retain unresolved
+	* conflict markers (<<<<<<< / ======= / >>>>>>>). This blocks all tbd
+	* commands since YAML parsing throws MergeConflictError.
+	*
+	* For ids.yml, both sides are simple key-value pairs that are append-only,
+	* so the resolution is trivial: keep all entries from both sides.
+	*
+	* With --fix, extracts both sides, merges them, and re-saves.
+	*/
+	async checkIdMappingConflicts(fix) {
+		const mappingPath = join(this.dataSyncDir, "mappings", "ids.yml");
+		let content;
+		try {
+			content = await readFile(mappingPath, "utf-8");
+		} catch {
+			return {
+				name: "ID mapping conflicts",
+				status: "ok"
+			};
+		}
+		const { hasMergeConflictMarkers } = await import("./yaml-utils-swV780m5.mjs");
+		if (!hasMergeConflictMarkers(content)) return {
+			name: "ID mapping conflicts",
+			status: "ok"
+		};
+		if (fix && !this.checkDryRun("Resolve merge conflicts in ids.yml")) try {
+			const { resolveIdMappingConflicts, saveIdMapping } = await import("./id-mapping-BA_xn516.mjs");
+			const resolved = resolveIdMappingConflicts(content);
+			await saveIdMapping(this.dataSyncDir, resolved);
+			return {
+				name: "ID mapping conflicts",
+				status: "ok",
+				message: `resolved merge conflicts (${resolved.shortToUlid.size} entries)`
+			};
+		} catch (error) {
+			return {
+				name: "ID mapping conflicts",
+				status: "error",
+				message: `failed to resolve conflicts: ${error instanceof Error ? error.message : String(error)}`
+			};
+		}
+		return {
+			name: "ID mapping conflicts",
+			status: "error",
+			message: "ids.yml contains unresolved merge conflict markers",
+			fixable: true,
+			suggestion: "Run: tbd doctor --fix to auto-resolve"
+		};
+	}
+	/**
 	* Check for duplicate keys in the ID mapping file (ids.yml).
 	*
 	* After a git merge conflict resolution that keeps entries from both sides,
@@ -6528,7 +6610,7 @@ var DoctorHandler = class extends BaseCommand {
 			status: "ok"
 		};
 		if (fix && !this.checkDryRun("Fix duplicate ID mapping keys")) try {
-			const { loadIdMapping, saveIdMapping } = await import("./id-mapping-LjnDSEhN.mjs");
+			const { loadIdMapping, saveIdMapping } = await import("./id-mapping-BA_xn516.mjs");
 			const mapping = await loadIdMapping(this.dataSyncDir);
 			await saveIdMapping(this.dataSyncDir, mapping);
 			return {
@@ -6662,7 +6744,7 @@ var DoctorHandler = class extends BaseCommand {
 			name: "ID mapping coverage",
 			status: "ok"
 		};
-		const { loadIdMapping, saveIdMapping, reconcileMappings } = await import("./id-mapping-LjnDSEhN.mjs");
+		const { loadIdMapping, saveIdMapping, reconcileMappings } = await import("./id-mapping-BA_xn516.mjs");
 		const mapping = await loadIdMapping(this.dataSyncDir);
 		const missingIds = [];
 		for (const issue of this.issues) {
@@ -6674,10 +6756,10 @@ var DoctorHandler = class extends BaseCommand {
 			status: "ok"
 		};
 		if (fix && !this.checkDryRun("Create missing ID mappings")) {
-			const { parseIdMappingFromYaml, mergeIdMappings } = await import("./id-mapping-LjnDSEhN.mjs");
+			const { parseIdMappingFromYaml, mergeIdMappings } = await import("./id-mapping-BA_xn516.mjs");
 			let historicalMapping;
 			try {
-				const syncBranch = (await import("./config-CB1tcqTZ.mjs").then((m) => m.readConfig(this.cwd))).sync.branch;
+				const syncBranch = (await import("./config-BZte2m3w.mjs").then((m) => m.readConfig(this.cwd))).sync.branch;
 				const logArgs = ["log", "--format=%H"];
 				if (maxHistory > 0) logArgs.push(`-${maxHistory}`);
 				logArgs.push(syncBranch, "--", `${DATA_SYNC_DIR}/mappings/ids.yml`);