@openspecui/server 2.1.3 → 2.1.7

package/dist/index.mjs

@@ -139,6 +139,19 @@ var DashboardOverviewService = class {
 	}
 };
 
+//#endregion
+//#region ../core/src/dashboard-display.ts
+const DASHBOARD_RECENT_LIST_LIMIT = 10;
+function compareDashboardItemsByUpdatedAt(left, right) {
+	return right.updatedAt - left.updatedAt || left.id.localeCompare(right.id);
+}
+function sortDashboardItemsByUpdatedAt(items) {
+	return [...items].sort(compareDashboardItemsByUpdatedAt);
+}
+function selectRecentDashboardItems(items, limit = DASHBOARD_RECENT_LIST_LIMIT) {
+	return sortDashboardItemsByUpdatedAt(items).slice(0, Math.max(0, Math.trunc(limit)));
+}
+
 //#endregion
 //#region src/dashboard-git-snapshot.ts
 const execFileAsync$1 = promisify(execFile);
@@ -165,6 +178,14 @@ async function defaultRunGit(cwd, args) {
 		};
 	}
 }
+async function defaultReadPathTimestampMs(absolutePath) {
+	try {
+		const stats = await stat(absolutePath);
+		return Number.isFinite(stats.mtimeMs) && stats.mtimeMs > 0 ? stats.mtimeMs : null;
+	} catch {
+		return null;
+	}
+}
 function parseShortStat(output) {
 	const files = Number(/(\d+)\s+files? changed/.exec(output)?.[1] ?? 0);
 	const insertions = Number(/(\d+)\s+insertions?\(\+\)/.exec(output)?.[1] ?? 0);
@@ -274,17 +295,17 @@ async function resolveDefaultBranch(projectDir, runGit) {
 	return "main";
 }
 async function collectCommitEntries(options) {
-	const { worktreePath, defaultBranch, maxCommitEntries, runGit } = options;
-	const entries = [];
+	const { worktreePath, defaultBranch, maxCommitEntries, runGit, readPathTimestampMs } = options;
+	const commitEntries = [];
 	const commits = await runGit(worktreePath, [
 		"log",
-		"--format=%H%x1f%s",
+		"--format=%H%x1f%ct%x1f%s",
 		`-n${maxCommitEntries}`,
 		`${defaultBranch}..HEAD`
 	]);
 	if (commits.ok) for (const line of commits.stdout.split("\n")) {
 		if (!line.trim()) continue;
-		const [hash, title = ""] = line.split("");
+		const [hash, committedAtRaw = "0", title = ""] = line.split("");
 		if (!hash) continue;
 		const diffResult = await runGit(worktreePath, [
 			"show",
@@ -298,10 +319,12 @@ async function collectCommitEntries(options) {
 			"--format=",
 			hash
 		])).stdout.split("\n").map((item) => item.trim()).filter((item) => item.length > 0);
-		entries.push({
+		const committedAt = Number(committedAtRaw) * 1e3;
+		commitEntries.push({
 			type: "commit",
 			hash,
 			title: title.trim() || hash.slice(0, 7),
+			committedAt: Number.isFinite(committedAt) && committedAt > 0 ? committedAt : 0,
 			relatedChanges: parseRelatedChanges(changedFiles),
 			diff: diffResult.ok ? parseNumStat(diffResult.stdout) : EMPTY_DIFF
 		});
@@ -325,20 +348,28 @@ async function collectCommitEntries(options) {
 	const untrackedFiles = untrackedResult.stdout.split("\n").map((item) => item.trim()).filter((item) => item.length > 0);
 	const allUncommittedFiles = new Set([...trackedFiles, ...untrackedFiles]);
 	const trackedDiff = trackedResult.ok ? parseNumStat(trackedResult.stdout) : EMPTY_DIFF;
-	entries.push({
+	const updatedAt = (await Promise.all([...allUncommittedFiles].map((path) => readPathTimestampMs(resolve(worktreePath, path))))).reduce((latest, current) => {
+		if (!current || !Number.isFinite(current) || current <= 0) return latest;
+		return latest === null || current > latest ? current : latest;
+	}, null) ?? null;
+	commitEntries.sort((left, right) => {
+		if (left.type !== "commit" || right.type !== "commit") return 0;
+		return right.committedAt - left.committedAt;
+	});
+	return [{
 		type: "uncommitted",
 		title: "Uncommitted",
+		updatedAt,
 		relatedChanges: parseRelatedChanges([...allUncommittedFiles]),
 		diff: {
 			files: allUncommittedFiles.size,
 			insertions: trackedDiff.insertions,
 			deletions: trackedDiff.deletions
 		}
-	});
-	return entries;
+	}, ...commitEntries];
 }
 async function collectWorktree(options) {
-	const { projectDir, worktree, defaultBranch, runGit, maxCommitEntries } = options;
+	const { projectDir, worktree, defaultBranch, runGit, maxCommitEntries, readPathTimestampMs } = options;
 	const worktreePath = resolve(worktree.path);
 	const resolvedProjectDir = resolve(projectDir);
 	const aheadBehindResult = await runGit(worktreePath, [
@@ -364,7 +395,8 @@ async function collectWorktree(options) {
 		worktreePath,
 		defaultBranch,
 		maxCommitEntries,
-		runGit
+		runGit,
+		readPathTimestampMs
 	});
 	return {
 		path: worktreePath,
@@ -402,6 +434,7 @@ async function removeDetachedDashboardGitWorktree(options) {
 async function buildDashboardGitSnapshot(options) {
 	const runGit = options.runGit ?? defaultRunGit;
 	const maxCommitEntries = options.maxCommitEntries ?? 8;
+	const readPathTimestampMs = options.readPathTimestampMs ?? defaultReadPathTimestampMs;
 	const resolvedProjectDir = resolve(options.projectDir);
 	const defaultBranch = await resolveDefaultBranch(resolvedProjectDir, runGit);
 	const worktreeResult = await runGit(resolvedProjectDir, [
@@ -420,7 +453,8 @@ async function buildDashboardGitSnapshot(options) {
 		worktree,
 		defaultBranch,
 		runGit,
-		maxCommitEntries
+		maxCommitEntries,
+		readPathTimestampMs
 	})));
 	worktrees.sort((a, b) => {
 		if (a.isCurrent !== b.isCurrent) return a.isCurrent ? -1 : 1;
@@ -635,12 +669,13 @@ async function loadDashboardOverview(ctx, reason = "dashboard-refresh") {
 		ctx.adapter.listChangesWithMeta(),
 		ctx.adapter.listArchivedChangesWithMeta()
 	]);
-	const activeChanges = changeMetas.map((changeMeta) => ({
+	const allActiveChanges = changeMetas.map((changeMeta) => ({
 		id: changeMeta.id,
 		name: changeMeta.name ?? changeMeta.id,
 		progress: changeMeta.progress,
 		updatedAt: changeMeta.updatedAt
-	})).sort((a, b) => b.updatedAt - a.updatedAt);
+	}));
+	const activeChanges = selectRecentDashboardItems(allActiveChanges);
 	const archivedChanges = (await Promise.all(archiveMetas.map(async (meta) => {
 		const change = await ctx.adapter.readArchivedChange(meta.id);
 		if (!change) return null;
@@ -651,7 +686,7 @@ async function loadDashboardOverview(ctx, reason = "dashboard-refresh") {
 			tasksCompleted: change.tasks.filter((task) => task.completed).length
 		};
 	}))).filter((item) => item !== null);
-	const specifications = (await Promise.all(specMetas.map(async (meta) => {
+	const allSpecifications = (await Promise.all(specMetas.map(async (meta) => {
 		const spec = await ctx.adapter.readSpec(meta.id);
 		if (!spec) return null;
 		return {
@@ -660,13 +695,14 @@ async function loadDashboardOverview(ctx, reason = "dashboard-refresh") {
 			requirements: spec.requirements.length,
 			updatedAt: meta.updatedAt
 		};
-	}))).filter((item) => item !== null).sort((a, b) => b.requirements - a.requirements || b.updatedAt - a.updatedAt);
-	const requirements = specifications.reduce((sum, spec) => sum + spec.requirements, 0);
-	const tasksTotal = activeChanges.reduce((sum, change) => sum + change.progress.total, 0);
-	const tasksCompleted = activeChanges.reduce((sum, change) => sum + change.progress.completed, 0);
+	}))).filter((item) => item !== null);
+	const specifications = selectRecentDashboardItems(allSpecifications);
+	const requirements = allSpecifications.reduce((sum, spec) => sum + spec.requirements, 0);
+	const tasksTotal = allActiveChanges.reduce((sum, change) => sum + change.progress.total, 0);
+	const tasksCompleted = allActiveChanges.reduce((sum, change) => sum + change.progress.completed, 0);
 	const archivedTasksCompleted = archivedChanges.reduce((sum, change) => sum + change.tasksCompleted, 0);
 	const taskCompletionPercent = tasksTotal > 0 ? Math.round(tasksCompleted / tasksTotal * 100) : null;
-	const inProgressChanges = activeChanges.filter((change) => change.progress.total > 0 && change.progress.completed < change.progress.total).length;
+	const inProgressChanges = allActiveChanges.filter((change) => change.progress.total > 0 && change.progress.completed < change.progress.total).length;
 	const specificationTrendEvents = specMetas.flatMap((spec) => {
 		const ts = resolveTrendTimestamp(spec.createdAt, spec.updatedAt);
 		return ts === null ? [] : [{
@@ -682,7 +718,7 @@ async function loadDashboardOverview(ctx, reason = "dashboard-refresh") {
 		}];
 	});
 	const specMetaById = new Map(specMetas.map((meta) => [meta.id, meta]));
-	const requirementTrendEvents = specifications.flatMap((spec) => {
+	const requirementTrendEvents = allSpecifications.flatMap((spec) => {
 		const meta = specMetaById.get(spec.id);
 		const ts = resolveTrendTimestamp(meta?.updatedAt, meta?.createdAt);
 		return ts === null ? [] : [{
@@ -690,7 +726,7 @@ async function loadDashboardOverview(ctx, reason = "dashboard-refresh") {
 			value: spec.requirements
 		}];
 	});
-	const hasObjectiveSpecificationTrend = specificationTrendEvents.length > 0 || specifications.length === 0;
+	const hasObjectiveSpecificationTrend = specificationTrendEvents.length > 0 || allSpecifications.length === 0;
 	const hasObjectiveRequirementTrend = requirementTrendEvents.length > 0 || requirements === 0;
 	const hasObjectiveCompletedTrend = completedTrendEvents.length > 0 || archiveMetas.length === 0;
 	const config = await ctx.configManager.readConfig();
@@ -764,9 +800,9 @@ async function loadDashboardOverview(ctx, reason = "dashboard-refresh") {
 	});
 	return {
 		summary: {
-			specifications: specifications.length,
+			specifications: allSpecifications.length,
 			requirements,
-			activeChanges: activeChanges.length,
+			activeChanges: allActiveChanges.length,
 			inProgressChanges,
 			completedChanges: archiveMetas.length,
 			archivedTasksCompleted,
@@ -1583,6 +1619,9 @@ const changeRouter = router({
 		if (!await ctx.adapter.toggleTask(input.changeId, input.taskIndex, input.completed)) throw new Error(`Failed to toggle task ${input.taskIndex} in change ${input.changeId}`);
 		return { success: true };
 	}),
+	subscribe: publicProcedure.subscription(({ ctx }) => {
+		return createReactiveSubscription(() => ctx.adapter.listChangesWithMeta());
+	}),
 	subscribeFiles: publicProcedure.input(z.object({ id: z.string() })).subscription(({ ctx, input }) => {
 		return createReactiveSubscriptionWithInput((id) => ctx.adapter.readChangeFiles(id))(input.id);
 	})
@@ -2247,8 +2286,8 @@ const dashboardRouter = router({
 	}),
 	refreshGitSnapshot: publicProcedure.input(z.object({ reason: z.string().optional() }).optional()).mutation(async ({ ctx, input }) => {
 		const reason = input?.reason?.trim() || "manual-refresh";
-		await touchDashboardGitRefreshStamp(ctx.projectDir, reason);
 		await ctx.dashboardOverviewService.refresh(reason);
+		await touchDashboardGitRefreshStamp(ctx.projectDir, reason);
 		return { success: true };
 	}),
 	removeDetachedWorktree: publicProcedure.input(z.object({ path: z.string().min(1) })).mutation(async ({ ctx, input }) => {
@@ -2257,8 +2296,8 @@ const dashboardRouter = router({
 			projectDir: ctx.projectDir,
 			targetPath: input.path
 		});
-		await touchDashboardGitRefreshStamp(ctx.projectDir, "remove-detached-worktree");
 		await ctx.dashboardOverviewService.refresh("remove-detached-worktree");
+		await touchDashboardGitRefreshStamp(ctx.projectDir, "remove-detached-worktree");
 		return { success: true };
 	}),
 	gitTaskStatus: publicProcedure.query(async ({ ctx }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openspecui/server",
-  "version": "2.1.3",
+  "version": "2.1.7",
   "type": "module",
   "main": "dist/index.mjs",
   "exports": {