@openspecui/server 1.0.0 → 1.0.2

package/dist/index.mjs

@@ -5,75 +5,17 @@ import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
 import { applyWSSHandler } from "@trpc/server/adapters/ws";
 import { WebSocketServer } from "ws";
 import { ApplyInstructionsSchema, ArtifactInstructionsSchema, ChangeStatusSchema, CliExecutor, ConfigManager, OpenSpecAdapter, OpenSpecWatcher, OpsxKernel, PtyClientMessageSchema, ReactiveContext, SchemaDetailSchema, SchemaInfoSchema, SchemaResolutionSchema, TemplatesSchema, getAllTools, getAvailableTools, getConfiguredTools, getDefaultCliCommandString, initWatcherPool, isWatcherPoolInitialized, reactiveReadDir, reactiveReadFile, reactiveStat, sniffGlobalCli } from "@openspecui/core";
-import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
-import { dirname, join, matchesGlob, relative, resolve, sep } from "node:path";
 import { initTRPC } from "@trpc/server";
 import { observable } from "@trpc/server/observable";
+import { mkdir, rm, writeFile } from "node:fs/promises";
+import { dirname, join, matchesGlob, relative, resolve, sep } from "node:path";
 import { z } from "zod";
-import YAML, { parse } from "yaml";
+import { parse } from "yaml";
 import { EventEmitter } from "node:events";
 import { createServer as createServer$1 } from "node:net";
 import * as pty from "@lydell/node-pty";
 import { EventEmitter as EventEmitter$1 } from "events";
 
-//#region src/reactive-subscription.ts
-/**
-* 创建响应式订阅
-*
-* 自动追踪 task 中的文件依赖，当依赖变更时自动重新执行并推送新数据。
-*
-* @param task 要执行的异步任务，内部的文件读取会被自动追踪
-* @returns tRPC observable
-*
-* @example
-* ```typescript
-* // 在 router 中使用
-* subscribe: publicProcedure.subscription(({ ctx }) => {
-*   return createReactiveSubscription(() => ctx.adapter.listSpecsWithMeta())
-* })
-* ```
-*/
-function createReactiveSubscription(task) {
-	return observable((emit) => {
-		const context = new ReactiveContext();
-		const controller = new AbortController();
-		(async () => {
-			try {
-				for await (const data of context.stream(task, controller.signal)) emit.next(data);
-			} catch (err) {
-				if (!controller.signal.aborted) emit.error(err);
-			}
-		})();
-		return () => {
-			controller.abort();
-		};
-	});
-}
-/**
-* 创建带输入参数的响应式订阅
-*
-* @param task 接收输入参数的异步任务
-* @returns 返回一个函数，接收输入参数并返回 tRPC observable
-*
-* @example
-* ```typescript
-* // 在 router 中使用
-* subscribeOne: publicProcedure
-*   .input(z.object({ id: z.string() }))
-*   .subscription(({ ctx, input }) => {
-*     return createReactiveSubscriptionWithInput(
-*       (id: string) => ctx.adapter.readSpec(id)
-*     )(input.id)
-*   })
-* ```
-*/
-function createReactiveSubscriptionWithInput(task) {
-	return (input) => {
-		return createReactiveSubscription(() => task(input));
-	};
-}
-
-//#endregion
 //#region src/cli-stream-observable.ts
 /**
 * 创建安全的 CLI 流式 observable
@@ -234,6 +176,64 @@ var ReactiveKV = class {
 /** Singleton instance shared across the server lifetime */
 const reactiveKV = new ReactiveKV();
 
+//#endregion
+//#region src/reactive-subscription.ts
+/**
+* 创建响应式订阅
+*
+* 自动追踪 task 中的文件依赖，当依赖变更时自动重新执行并推送新数据。
+*
+* @param task 要执行的异步任务，内部的文件读取会被自动追踪
+* @returns tRPC observable
+*
+* @example
+* ```typescript
+* // 在 router 中使用
+* subscribe: publicProcedure.subscription(({ ctx }) => {
+*   return createReactiveSubscription(() => ctx.adapter.listSpecsWithMeta())
+* })
+* ```
+*/
+function createReactiveSubscription(task) {
+	return observable((emit) => {
+		const context = new ReactiveContext();
+		const controller = new AbortController();
+		(async () => {
+			try {
+				for await (const data of context.stream(task, controller.signal)) emit.next(data);
+			} catch (err) {
+				if (!controller.signal.aborted) emit.error(err);
+			}
+		})();
+		return () => {
+			controller.abort();
+		};
+	});
+}
+/**
+* 创建带输入参数的响应式订阅
+*
+* @param task 接收输入参数的异步任务
+* @returns 返回一个函数，接收输入参数并返回 tRPC observable
+*
+* @example
+* ```typescript
+* // 在 router 中使用
+* subscribeOne: publicProcedure
+*   .input(z.object({ id: z.string() }))
+*   .subscription(({ ctx, input }) => {
+*     return createReactiveSubscriptionWithInput(
+*       (id: string) => ctx.adapter.readSpec(id)
+*     )(input.id)
+*   })
+* ```
+*/
+function createReactiveSubscriptionWithInput(task) {
+	return (input) => {
+		return createReactiveSubscription(() => task(input));
+	};
+}
+
 //#endregion
 //#region src/router.ts
 const t = initTRPC.context().create();
@@ -613,20 +613,40 @@ const configRouter = router({
 		return getDefaultCliCommandString();
 	}),
 	update: publicProcedure.input(z.object({
-		cli: z.object({ command: z.string() }).optional(),
-		ui: z.object({ theme: z.enum([
+		cli: z.object({
+			command: z.string().nullable().optional(),
+			args: z.array(z.string()).nullable().optional()
+		}).optional(),
+		theme: z.enum([
 			"light",
 			"dark",
 			"system"
-		]) }).optional()
+		]).optional(),
+		terminal: z.object({
+			fontSize: z.number().min(8).max(32).optional(),
+			fontFamily: z.string().optional(),
+			cursorBlink: z.boolean().optional(),
+			cursorStyle: z.enum([
+				"block",
+				"underline",
+				"bar"
+			]).optional(),
+			scrollback: z.number().min(0).max(1e5).optional()
+		}).optional()
 	})).mutation(async ({ ctx, input }) => {
+		const hasCliCommand = input.cli !== void 0 && Object.prototype.hasOwnProperty.call(input.cli, "command");
+		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.terminal !== void 0) await ctx.configManager.writeConfig({
+				theme: input.theme,
+				terminal: input.terminal
+			});
+			return { success: true };
+		}
 		await ctx.configManager.writeConfig(input);
 		return { success: true };
 	}),
-	setCliCommand: publicProcedure.input(z.object({ command: z.string() })).mutation(async ({ ctx, input }) => {
-		await ctx.configManager.setCliCommand(input.command);
-		return { success: true };
-	}),
 	subscribe: publicProcedure.subscription(({ ctx }) => {
 		return createReactiveSubscription(() => ctx.configManager.readConfig());
 	})
@@ -972,32 +992,6 @@ const opsxRouter = router({
 		await writeFile(join(openspecDir, "config.yaml"), input.content, "utf-8");
 		return { success: true };
 	}),
-	updateProjectConfigUi: publicProcedure.input(z.object({
-		"font-size": z.number().min(8).max(32).optional(),
-		"font-families": z.array(z.string()).optional(),
-		"cursor-blink": z.boolean().optional(),
-		"cursor-style": z.enum([
-			"block",
-			"underline",
-			"bar"
-		]).optional(),
-		scrollback: z.number().min(0).max(1e5).optional()
-	})).mutation(async ({ ctx, input }) => {
-		const configPath = join(ctx.projectDir, "openspec", "config.yaml");
-		let doc;
-		try {
-			const content = await readFile(configPath, "utf-8");
-			doc = YAML.parseDocument(content);
-		} catch {
-			doc = new YAML.Document({});
-		}
-		if (!doc.has("ui")) doc.set("ui", doc.createNode({}));
-		const uiNode = doc.get("ui", true);
-		for (const [key, value] of Object.entries(input)) if (value !== void 0) uiNode.set(key, value);
-		await mkdir(join(ctx.projectDir, "openspec"), { recursive: true });
-		await writeFile(configPath, doc.toString(), "utf-8");
-		return { success: true };
-	}),
 	listChanges: publicProcedure.query(async ({ ctx }) => {
 		return reactiveReadDir(join(ctx.projectDir, "openspec", "changes"), {
 			directoriesOnly: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openspecui/server",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "type": "module",
   "main": "dist/index.mjs",
   "exports": {
@@ -20,7 +20,7 @@
     "yaml": "^2.8.0",
     "yargs": "^18.0.0",
     "zod": "^3.24.1",
-    "@openspecui/core": "1.0.0"
+    "@openspecui/core": "1.0.2"
   },
   "devDependencies": {
     "@types/node": "^22.10.2",
@@ -34,7 +34,7 @@
   "scripts": {
     "build": "tsdown src/index.ts --format esm --no-dts",
     "typecheck": "tsc --noEmit",
-    "dev": "tsx watch src/standalone.ts",
+    "dev": "tsx watch --include '../core/dist/**' src/standalone.ts",
     "test": "vitest run",
     "test:watch": "vitest"
   }