issy 0.4.0 → 0.5.2

package/bin/issy

@@ -4,8 +4,10 @@ import {
 	existsSync,
 	mkdirSync,
 	readdirSync,
+	readFileSync,
 	writeFileSync,
-	readFileSync
+	renameSync,
+	cpSync
 } from 'node:fs'
 import { join, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
@@ -23,7 +25,7 @@ const here = resolve(fileURLToPath(import.meta.url), '..')
 const pkgPath = resolve(here, '..', 'package.json')
 const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'))
 
-const notifier = updateNotifier({ pkg, updateCheckInterval: 1000 * 60 }) // 1 minute
+const notifier = updateNotifier({ pkg, updateCheckInterval: 1000 * 60 })
 
 if (notifier.update) {
 	const scriptPath = resolve(fileURLToPath(import.meta.url))
@@ -45,6 +47,8 @@ const cliCommands = new Set([
 	'create',
 	'update',
 	'close',
+	'reopen',
+	'next',
 	'help',
 	'--help',
 	'-h'
@@ -57,10 +61,26 @@ if (args[0] === '--version' || args[0] === '-v') {
 }
 
 /**
- * Find .issues directory by walking up from the given path.
- * Returns the path if found, or null if not found.
+ * Find .issy directory by walking up from the given path.
  */
-function findIssuesDirUpward(fromPath) {
+function findIssyDirUpward(fromPath) {
+	let current = resolve(fromPath)
+	for (let i = 0; i < 20; i++) {
+		const candidate = join(current, '.issy')
+		if (existsSync(candidate)) {
+			return candidate
+		}
+		const parent = dirname(current)
+		if (parent === current) break
+		current = parent
+	}
+	return null
+}
+
+/**
+ * Find legacy .issues directory by walking up (for migration detection).
+ */
+function findLegacyIssuesDir(fromPath) {
 	let current = resolve(fromPath)
 	for (let i = 0; i < 20; i++) {
 		const candidate = join(current, '.issues')
@@ -76,7 +96,6 @@ function findIssuesDirUpward(fromPath) {
 
 /**
  * Find the git repository root by walking up from the given path.
- * Returns the directory containing .git, or null if not in a git repo.
  */
 function findGitRoot(fromPath) {
 	let current = resolve(fromPath)
@@ -93,47 +112,154 @@ function findGitRoot(fromPath) {
 }
 
 /**
- * Resolve the issues directory using priority:
- * 1. ISSUES_DIR env var (explicit override)
- * 2. Walk up from ISSUES_ROOT or cwd to find existing .issues
- * 3. If in a git repo, use .issues at the repo root
- * 4. Fall back to creating .issues in ISSUES_ROOT or cwd
+ * Resolve the .issy directory using priority:
+ * 1. ISSY_DIR env var (explicit override)
+ * 2. Walk up from cwd to find existing .issy
+ * 3. If in a git repo, use .issy at the repo root
+ * 4. Fall back to cwd/.issy
  */
-function resolveIssuesDir() {
-	// 1. Explicit override
-	if (process.env.ISSUES_DIR) {
-		return resolve(process.env.ISSUES_DIR)
+function resolveIssyDir() {
+	if (process.env.ISSY_DIR) {
+		return resolve(process.env.ISSY_DIR)
 	}
 
-	// 2. Try to find existing .issues by walking up
-	const startDir = process.env.ISSUES_ROOT || process.cwd()
-	const found = findIssuesDirUpward(startDir)
+	const startDir = process.env.ISSY_ROOT || process.cwd()
+	const found = findIssyDirUpward(startDir)
 	if (found) {
 		return found
 	}
 
-	// 3. If in a git repo, use .issues at the repo root
 	const gitRoot = findGitRoot(startDir)
 	if (gitRoot) {
-		return join(gitRoot, '.issues')
+		return join(gitRoot, '.issy')
 	}
 
-	// 4. Fall back to creating in start directory
-	return join(resolve(startDir), '.issues')
+	return join(resolve(startDir), '.issy')
 }
 
-const issuesDir = resolveIssuesDir()
+const issyDir = resolveIssyDir()
+const issuesDir = join(issyDir, 'issues')
+
 // Set env vars for downstream consumers
-process.env.ISSUES_DIR = issuesDir
-// Set ISSUES_ROOT to the parent of .issues for consistency
-process.env.ISSUES_ROOT = dirname(issuesDir)
+process.env.ISSY_DIR = issyDir
+process.env.ISSY_ROOT = dirname(issyDir)
+
+// Detect legacy .issues/ directory and warn (unless running migrate)
+const legacyDir = findLegacyIssuesDir(process.env.ISSY_ROOT || process.cwd())
+if (legacyDir && args[0] !== 'migrate' && args[0] !== 'init') {
+	// Only warn if .issy doesn't exist yet (haven't migrated)
+	if (!existsSync(issyDir)) {
+		console.warn(`⚠️  Legacy .issues/ directory detected at ${legacyDir}`)
+		console.warn(`   Run "issy migrate" to upgrade to the new .issy/ structure.\n`)
+	}
+}
+
+// --- Handle commands ---
+
+if (args[0] === 'migrate') {
+	const startDir = process.env.ISSY_ROOT || process.cwd()
+	const legacy = findLegacyIssuesDir(startDir)
+
+	if (!legacy) {
+		console.log('No legacy .issues/ directory found. Nothing to migrate.')
+		process.exit(0)
+	}
+
+	if (existsSync(issyDir) && existsSync(issuesDir)) {
+		console.log('.issy/issues/ already exists. Migration may have already been completed.')
+		process.exit(1)
+	}
+
+	console.log(`Migrating ${legacy} → ${issuesDir}`)
+
+	// Create .issy/issues/
+	mkdirSync(issuesDir, { recursive: true })
+
+	// Copy issue files
+	const files = readdirSync(legacy).filter(f => f.endsWith('.md') && /^\d{4}-/.test(f))
+
+	// We'll use fractional-indexing to assign initial order keys to open issues.
+	// Since we can't import ESM from the bundled core here easily,
+	// we assign order keys inline using the same algorithm.
+	// Import dynamically from the built core.
+	let generateNKeysBetween
+	try {
+		const fi = await import('fractional-indexing')
+		generateNKeysBetween = fi.generateNKeysBetween
+	} catch {
+		console.error('Failed to load fractional-indexing. Please ensure dependencies are installed.')
+		process.exit(1)
+	}
+
+	// Parse frontmatter from each file and sort by ID
+	const issueData = files.map(f => {
+		const content = readFileSync(join(legacy, f), 'utf-8')
+		const match = content.match(/^---\n([\s\S]*?)\n---\n([\s\S]*)$/)
+		const frontmatter = {}
+		if (match) {
+			for (const line of match[1].split('\n')) {
+				const colonIdx = line.indexOf(':')
+				if (colonIdx > 0) {
+					frontmatter[line.slice(0, colonIdx).trim()] = line.slice(colonIdx + 1).trim()
+				}
+			}
+		}
+		return { filename: f, content, frontmatter }
+	}).sort((a, b) => a.filename.localeCompare(b.filename))
+
+	// Assign order keys to open issues
+	const openIssues = issueData.filter(i => i.frontmatter.status === 'open')
+	const orderKeys = generateNKeysBetween(null, null, openIssues.length)
+
+	const orderMap = new Map()
+	openIssues.forEach((issue, idx) => {
+		orderMap.set(issue.filename, orderKeys[idx])
+	})
+
+	// Write migrated files with order keys
+	for (const issue of issueData) {
+		let content = issue.content
+		const orderKey = orderMap.get(issue.filename)
+
+		if (orderKey) {
+			// Insert order field before the status line
+			content = content.replace(
+				/^(---\n[\s\S]*?)(status: \w+)/m,
+				`$1$2\norder: ${orderKey}`
+			)
+		}
+
+		writeFileSync(join(issuesDir, issue.filename), content)
+	}
+
+	// Copy any non-issue files (e.g., README)
+	const otherFiles = readdirSync(legacy).filter(f => !files.includes(f))
+	for (const f of otherFiles) {
+		const src = join(legacy, f)
+		const dest = join(issuesDir, f)
+		try {
+			cpSync(src, dest, { recursive: true })
+		} catch { /* skip if can't copy */ }
+	}
+
+	// Remove legacy directory
+	const { rmSync } = await import('node:fs')
+	rmSync(legacy, { recursive: true })
+
+	console.log(`✅ Migrated ${files.length} issue(s) to ${issuesDir}`)
+	if (openIssues.length > 0) {
+		console.log(`   Assigned roadmap order to ${openIssues.length} open issue(s).`)
+	}
+	console.log(`   Removed ${legacy}`)
+	process.exit(0)
+}
 
 if (cliCommands.has(args[0] || '')) {
 	const here = resolve(fileURLToPath(import.meta.url), '..')
 	const entry = resolve(here, '..', 'dist', 'cli.js')
 	process.argv = [process.argv[0], process.argv[1], ...args]
 	const cli = await import(entry)
-	await cli.ready // Wait for main() to complete before exiting
+	await cli.ready
 	process.exit(0)
 }
 
@@ -145,18 +271,23 @@ if (portIdx >= 0 && args[portIdx + 1]) {
 const shouldInitOnly = args.includes('init')
 const shouldSeed = args.includes('--seed')
 
-// Only create .issues directory on explicit 'init' command
 if (shouldInitOnly) {
 	if (!existsSync(issuesDir)) {
 		mkdirSync(issuesDir, { recursive: true })
 	}
 
-	// Only seed with welcome issue if --seed flag is passed
 	if (shouldSeed) {
 		const hasIssues =
 			existsSync(issuesDir) &&
 			readdirSync(issuesDir).some(f => f.endsWith('.md'))
 		if (!hasIssues) {
+			// First issue gets the initial order key
+			let firstOrderKey = 'a0'
+			try {
+				const fi = await import('fractional-indexing')
+				firstOrderKey = fi.generateKeyBetween(null, null)
+			} catch { /* use fallback */ }
+
 			const welcome =
 				`---\n` +
 				`title: Welcome to issy\n` +
@@ -164,6 +295,7 @@ if (shouldInitOnly) {
 				`priority: medium\n` +
 				`type: improvement\n` +
 				`status: open\n` +
+				`order: ${firstOrderKey}\n` +
 				`created: ${new Date().toISOString().slice(0, 19)}\n` +
 				`---\n\n` +
 				`## Details\n\n` +
@@ -173,7 +305,7 @@ if (shouldInitOnly) {
 		}
 	}
 
-	console.log(`Initialized ${issuesDir}`)
+	console.log(`Initialized ${issyDir}`)
 	process.exit(0)
 }