@openspecui/server 2.0.0 → 2.1.0

package/dist/index.mjs

@@ -1,10 +1,13 @@
 import { createServer as createServer$1 } from "node:net";
 import { serve } from "@hono/node-server";
-import { CliExecutor, CodeEditorThemeSchema, ConfigManager, DASHBOARD_METRIC_KEYS, DashboardConfigSchema, OpenSpecAdapter, OpenSpecWatcher, OpsxKernel, PtyClientMessageSchema, ReactiveContext, TerminalConfigSchema, TerminalRendererEngineSchema, contextStorage, getAllTools, getAvailableTools, getConfiguredTools, getDefaultCliCommandString, getWatcherRuntimeStatus, initWatcherPool, isWatcherPoolInitialized, reactiveExists, reactiveReadDir, reactiveReadFile, reactiveStat, sniffGlobalCli } from "@openspecui/core";
+import { CliExecutor, CodeEditorThemeSchema, ConfigManager, DASHBOARD_METRIC_KEYS, DashboardConfigSchema, OpenSpecAdapter, OpenSpecWatcher, OpsxKernel, PtyClientMessageSchema, ReactiveContext, TerminalConfigSchema, TerminalRendererEngineSchema, contextStorage, getAllTools, getAvailableTools, getConfiguredTools, getDefaultCliCommandString, getWatcherRuntimeStatus, initWatcherPool, isWatcherPoolInitialized, reactiveReadDir, reactiveReadFile, sniffGlobalCli } from "@openspecui/core";
 import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
 import { applyWSSHandler } from "@trpc/server/adapters/ws";
 import { Hono } from "hono";
 import { cors } from "hono/cors";
+import { readFileSync } from "node:fs";
+import { basename, dirname, join, relative, resolve, sep } from "node:path";
+import { fileURLToPath } from "node:url";
 import { WebSocketServer } from "ws";
 import * as pty from "@lydell/node-pty";
 import { EventEmitter } from "events";
@@ -13,8 +16,7 @@ import { initTRPC } from "@trpc/server";
 import { observable } from "@trpc/server/observable";
 import { execFile } from "node:child_process";
 import { EventEmitter as EventEmitter$1 } from "node:events";
-import { mkdir, rm, writeFile } from "node:fs/promises";
-import { dirname, join, relative, resolve, sep } from "node:path";
+import { mkdir, rm, stat, writeFile } from "node:fs/promises";
 import { promisify } from "node:util";
 import { z } from "zod";
 import { NodeWorkerSearchProvider } from "@openspecui/search/node";
@@ -999,43 +1001,51 @@ function endDashboardGitTask(error) {
 	if (error) dashboardGitTaskStatus.lastError = error instanceof Error ? error.message : String(error);
 	emitDashboardGitTaskStatus();
 }
-function parseGitDirFromDotGitFile(content) {
-	const line = content.split(/\r?\n/).map((item) => item.trim()).find((item) => item.startsWith("gitdir:"));
-	if (!line) return null;
-	const rawPath = line.slice(7).trim();
-	return rawPath.length > 0 ? rawPath : null;
+const DASHBOARD_GIT_REFRESH_STAMP_NAME = "openspecui-dashboard-git-refresh.stamp";
+async function resolveGitMetadataDir(projectDir) {
+	try {
+		const { stdout } = await execFileAsync("git", ["rev-parse", "--git-dir"], {
+			cwd: projectDir,
+			maxBuffer: 1024 * 1024,
+			encoding: "utf8"
+		});
+		const gitDirRaw = stdout.trim();
+		if (!gitDirRaw) return null;
+		const gitDirPath = resolve(projectDir, gitDirRaw);
+		if (!(await stat(gitDirPath)).isDirectory()) return null;
+		return gitDirPath;
+	} catch {
+		return null;
+	}
 }
-function getDashboardGitRefreshStampPath(projectDir) {
-	return join(projectDir, "openspec", ".openspecui-dashboard-git-refresh.stamp");
+async function resolveGitMetadataDirReactive(projectDir) {
+	const gitMetadataDir = await resolveGitMetadataDir(projectDir);
+	if (!gitMetadataDir) return null;
+	await reactiveReadDir(gitMetadataDir, { includeHidden: true });
+	return gitMetadataDir;
+}
+function getDashboardGitRefreshStampPath(gitMetadataDir) {
+	return join(gitMetadataDir, DASHBOARD_GIT_REFRESH_STAMP_NAME);
 }
 async function touchDashboardGitRefreshStamp(projectDir, reason) {
-	const stampPath = getDashboardGitRefreshStampPath(projectDir);
+	const gitMetadataDir = await resolveGitMetadataDir(projectDir);
+	if (!gitMetadataDir) return { skipped: true };
+	const stampPath = getDashboardGitRefreshStampPath(gitMetadataDir);
 	await mkdir(dirname(stampPath), { recursive: true });
 	await writeFile(stampPath, `${Date.now()} ${reason}\n`, "utf8");
+	return { skipped: false };
 }
 async function registerDashboardGitReactiveDeps(projectDir) {
 	await reactiveReadDir(projectDir, {
 		includeHidden: true,
 		exclude: ["node_modules"]
 	});
-	await reactiveReadFile(getDashboardGitRefreshStampPath(projectDir));
-	const dotGitPath = join(projectDir, ".git");
-	if (!await reactiveExists(dotGitPath)) return;
-	const dotGitFileContent = await reactiveReadFile(dotGitPath);
-	if (dotGitFileContent !== null) {
-		const gitDirRaw = parseGitDirFromDotGitFile(dotGitFileContent);
-		if (!gitDirRaw) return;
-		const gitDirPath = resolve(projectDir, gitDirRaw);
-		await reactiveReadDir(gitDirPath, { includeHidden: true });
-		await reactiveReadFile(join(gitDirPath, "HEAD"));
-		await reactiveReadFile(join(gitDirPath, "index"));
-		await reactiveReadFile(join(gitDirPath, "packed-refs"));
-		return;
-	}
-	await reactiveReadDir(dotGitPath, { includeHidden: true });
-	await reactiveReadFile(join(dotGitPath, "HEAD"));
-	await reactiveReadFile(join(dotGitPath, "index"));
-	await reactiveReadFile(join(dotGitPath, "packed-refs"));
+	const gitMetadataDir = await resolveGitMetadataDirReactive(projectDir);
+	if (!gitMetadataDir) return;
+	await reactiveReadFile(getDashboardGitRefreshStampPath(gitMetadataDir));
+	await reactiveReadFile(join(gitMetadataDir, "HEAD"));
+	await reactiveReadFile(join(gitMetadataDir, "index"));
+	await reactiveReadFile(join(gitMetadataDir, "packed-refs"));
 }
 function requireChangeId(changeId) {
 	if (!changeId) throw new Error("change is required");
@@ -1251,35 +1261,12 @@ async function fetchDashboardOverview(ctx, reason = "dashboard-refresh") {
 		ctx.adapter.listChangesWithMeta(),
 		ctx.adapter.listArchivedChangesWithMeta()
 	]);
-	await ctx.kernel.waitForWarmup();
-	await ctx.kernel.ensureStatusList();
-	const statusList = ctx.kernel.getStatusList();
-	const changeMetaMap = new Map(changeMetas.map((change) => [change.id, change]));
-	const activeChangeIds = new Set([...changeMetas.map((change) => change.id), ...statusList.map((status) => status.changeName)]);
-	const statusByChange = new Map(statusList.map((status) => [status.changeName, status]));
-	const activeChanges = (await Promise.all([...activeChangeIds].map(async (changeId) => {
-		const status = statusByChange.get(changeId);
-		const changeMeta = changeMetaMap.get(changeId);
-		const statInfo = await reactiveStat(join(ctx.projectDir, "openspec", "changes", changeId));
-		let progress = changeMeta?.progress ?? {
-			total: 0,
-			completed: 0
-		};
-		if (status) try {
-			await ctx.kernel.ensureApplyInstructions(changeId, status.schemaName);
-			const apply = ctx.kernel.getApplyInstructions(changeId, status.schemaName);
-			progress = {
-				total: apply.progress.total,
-				completed: apply.progress.complete
-			};
-		} catch {}
-		return {
-			id: changeId,
-			name: changeMeta?.name ?? changeId,
-			progress,
-			updatedAt: changeMeta?.updatedAt ?? statInfo?.mtime ?? 0
-		};
-	}))).sort((a, b) => b.updatedAt - a.updatedAt);
+	const activeChanges = 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 archivedChanges = (await Promise.all(archiveMetas.map(async (meta) => {
 		const change = await ctx.adapter.readArchivedChange(meta.id);
 		if (!change) return null;
@@ -1631,6 +1618,7 @@ const configRouter = router({
 			"system"
 		]).optional(),
 		codeEditor: z.object({ theme: CodeEditorThemeSchema.optional() }).optional(),
+		appBaseUrl: z.string().optional(),
 		terminal: TerminalConfigSchema.omit({ rendererEngine: true }).partial().extend({ rendererEngine: TerminalRendererEngineSchema.optional() }).optional(),
 		dashboard: DashboardConfigSchema.partial().optional()
 	})).mutation(async ({ ctx, input }) => {
@@ -1638,9 +1626,10 @@ const configRouter = router({
 		const hasCliArgs = input.cli !== void 0 && Object.prototype.hasOwnProperty.call(input.cli, "args");
 		if (hasCliCommand && !hasCliArgs) {
 			await ctx.configManager.setCliCommand(input.cli?.command ?? "");
-			if (input.theme !== void 0 || input.codeEditor !== void 0 || input.terminal !== void 0 || input.dashboard !== void 0) await ctx.configManager.writeConfig({
+			if (input.theme !== void 0 || input.codeEditor !== void 0 || input.appBaseUrl !== void 0 || input.terminal !== void 0 || input.dashboard !== void 0) await ctx.configManager.writeConfig({
 				theme: input.theme,
 				codeEditor: input.codeEditor,
+				appBaseUrl: input.appBaseUrl,
 				terminal: input.terminal,
 				dashboard: input.dashboard
 			});
@@ -2315,6 +2304,17 @@ var SearchService = class {
 *
 * @module server
 */
+const __dirname = dirname(fileURLToPath(import.meta.url));
+function getServerPackageVersion() {
+	try {
+		const packageJsonPath = join(__dirname, "..", "package.json");
+		const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf8"));
+		return typeof packageJson.version === "string" ? packageJson.version : "0.0.0";
+	} catch {
+		return "0.0.0";
+	}
+}
+const SERVER_PACKAGE_VERSION = getServerPackageVersion();
 /**
 * Create an OpenSpecUI HTTP server with optional WebSocket support
 */
@@ -2335,7 +2335,9 @@ function createServer(config) {
 		return c.json({
 			status: "ok",
 			projectDir: config.projectDir,
-			watcherEnabled: !!watcher
+			projectName: basename(config.projectDir) || config.projectDir,
+			watcherEnabled: !!watcher,
+			openspecuiVersion: SERVER_PACKAGE_VERSION
 		});
 	});
 	app.use("/trpc/*", async (c) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openspecui/server",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "type": "module",
   "main": "dist/index.mjs",
   "exports": {
@@ -20,8 +20,8 @@
     "yaml": "^2.8.0",
     "yargs": "^18.0.0",
     "zod": "^3.24.1",
-    "@openspecui/search": "1.1.0",
-    "@openspecui/core": "2.0.0"
+    "@openspecui/core": "2.1.0",
+    "@openspecui/search": "1.1.0"
   },
   "devDependencies": {
     "@types/node": "^22.10.2",