nextclaw 0.33.2 → 0.35.0

package/dist/cli/app/index.js

@@ -4,14 +4,15 @@ import { createRequire } from "node:module";
 import { APP_NAME, APP_TAGLINE, getConfigPath, getDataDir, getRunPath, loadConfig, resolveConfigSecrets } from "@nextclaw/core";
 import { Command, InvalidArgumentError } from "commander";
 import { constants, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { randomBytes } from "node:crypto";
+import { createHash, randomBytes } from "node:crypto";
 import { execFile } from "node:child_process";
 import path, { join, resolve } from "node:path";
 import { tmpdir } from "node:os";
 import "@nextclaw/server";
 import { NextclawDistributionService, NextclawServiceRuntime, readLearningLoopRuntimeConfig } from "@nextclaw/service";
-import { access, mkdtemp, readFile, rm, stat } from "node:fs/promises";
+import { AppHomeService, AppInstanceStorageService, AppPublishService, AppPublishValidationService } from "@nextclaw/app-runtime";
 import { McpServiceAppRuntimeService, buildServiceActionId, getServiceAppManifestPath, mergeServiceAppRuntimeActions, readServiceAppManifest } from "@nextclaw/kernel";
+import { access, mkdtemp, readFile, rm, stat } from "node:fs/promises";
 import { promisify } from "node:util";
 var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
@@ -2019,7 +2020,7 @@ var require_websocket = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const http$1 = __require("http");
 	const net = __require("net");
 	const tls = __require("tls");
-	const { randomBytes: randomBytes$1, createHash: createHash$1 } = __require("crypto");
+	const { randomBytes: randomBytes$1, createHash: createHash$2 } = __require("crypto");
 	const { Duplex: Duplex$2, Readable } = __require("stream");
 	const { URL: URL$1 } = __require("url");
 	const PerMessageDeflate = require_permessage_deflate();
@@ -2671,7 +2672,7 @@ var require_websocket = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				abortHandshake(websocket, socket, "Invalid Upgrade header");
 				return;
 			}
-			const digest = createHash$1("sha1").update(key + GUID).digest("base64");
+			const digest = createHash$2("sha1").update(key + GUID).digest("base64");
 			if (res.headers["sec-websocket-accept"] !== digest) {
 				abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
 				return;
@@ -3143,7 +3144,7 @@ var require_websocket_server = /* @__PURE__ */ __commonJSMin(((exports, module)
 	const EventEmitter = __require("events");
 	const http = __require("http");
 	const { Duplex } = __require("stream");
-	const { createHash } = __require("crypto");
+	const { createHash: createHash$1 } = __require("crypto");
 	const extension = require_extension();
 	const PerMessageDeflate = require_permessage_deflate();
 	const subprotocol = require_subprotocol();
@@ -3402,7 +3403,7 @@ var require_websocket_server = /* @__PURE__ */ __commonJSMin(((exports, module)
 				"HTTP/1.1 101 Switching Protocols",
 				"Upgrade: websocket",
 				"Connection: Upgrade",
-				`Sec-WebSocket-Accept: ${createHash("sha1").update(key + GUID).digest("base64")}`
+				`Sec-WebSocket-Accept: ${createHash$1("sha1").update(key + GUID).digest("base64")}`
 			];
 			const ws = new this.options.WebSocket(null, void 0, this.options);
 			if (protocols.size) {
@@ -3632,6 +3633,7 @@ const registerHostServiceControls = ({ program, nextclaw }) => {
 //#endregion
 //#region src/cli/app/services/service-app-dev.service.ts
 var ServiceAppDevService = class {
+	instanceStorageService = new AppInstanceStorageService();
 	constructor(params = {}) {
 		this.params = params;
 	}
@@ -3642,14 +3644,14 @@ var ServiceAppDevService = class {
 		if (!loaded) return this.buildDevReport(appPath, void 0, [], issues);
 		if (this.hasErrors(issues)) return this.buildDevReport(appPath, this.toServiceAppRecord(appPath, loaded.manifest, this.idleRuntimeStatus), [], issues);
 		const runtime = this.createRuntimeService();
-		const dataDirectory = await this.createDevDataDirectory();
+		const storage = await this.createDevStorage(appPath, loaded.manifest.id);
 		try {
-			const startRecord = this.toServiceAppRecord(appPath, loaded.manifest, runtime, dataDirectory);
+			const startRecord = this.toServiceAppRecord(appPath, loaded.manifest, runtime, storage);
 			const runtimeActions = await runtime.listActions({
 				app: startRecord,
 				manifest: loaded.manifest
 			});
-			const record = this.toServiceAppRecord(appPath, loaded.manifest, runtime, dataDirectory);
+			const record = this.toServiceAppRecord(appPath, loaded.manifest, runtime, storage);
 			const actions = mergeServiceAppRuntimeActions({
 				record,
 				manifest: loaded.manifest,
@@ -3658,14 +3660,7 @@ var ServiceAppDevService = class {
 			this.collectRuntimeIssues(record, actions, issues);
 			return this.buildDevReport(appPath, record, actions, issues);
 		} finally {
-			try {
-				await runtime.dispose();
-			} finally {
-				await rm(dataDirectory, {
-					recursive: true,
-					force: true
-				});
-			}
+			await runtime.dispose();
 		}
 	};
 	call = async (target, actionName, input) => {
@@ -3685,19 +3680,19 @@ var ServiceAppDevService = class {
 			return this.buildCallReport(appPath, record, void 0, void 0, issues);
 		}
 		const runtime = this.createRuntimeService();
-		const dataDirectory = await this.createDevDataDirectory();
+		const storage = await this.createDevStorage(appPath, loaded.manifest.id);
 		try {
-			const record = this.toServiceAppRecord(appPath, loaded.manifest, runtime, dataDirectory);
+			const record = this.toServiceAppRecord(appPath, loaded.manifest, runtime, storage);
 			const result = await runtime.invokeAction({
 				app: record,
 				manifest: loaded.manifest,
 				actionName: action,
 				input
 			});
-			const nextRecord = this.toServiceAppRecord(appPath, loaded.manifest, runtime, dataDirectory);
+			const nextRecord = this.toServiceAppRecord(appPath, loaded.manifest, runtime, storage);
 			return this.buildCallReport(appPath, nextRecord, buildServiceActionId(loaded.manifest.id, action), result, issues);
 		} catch (error) {
-			const record = this.toServiceAppRecord(appPath, loaded.manifest, runtime, dataDirectory);
+			const record = this.toServiceAppRecord(appPath, loaded.manifest, runtime, storage);
 			issues.push({
 				severity: "error",
 				code: "service.runtime.callFailed",
@@ -3705,14 +3700,7 @@ var ServiceAppDevService = class {
 			});
 			return this.buildCallReport(appPath, record, buildServiceActionId(loaded.manifest.id, action), void 0, issues);
 		} finally {
-			try {
-				await runtime.dispose();
-			} finally {
-				await rm(dataDirectory, {
-					recursive: true,
-					force: true
-				});
-			}
+			await runtime.dispose();
 		}
 	};
 	loadServiceApp = async (appPath, issues) => {
@@ -3744,8 +3732,16 @@ var ServiceAppDevService = class {
 		return resolveConfigSecrets(loadConfig(configPath), { configPath });
 	};
 	idleRuntimeStatus = { getStatus: () => ({ status: "idle" }) };
-	createDevDataDirectory = async () => await mkdtemp(path.join(tmpdir(), "nextclaw-service-app-dev-data-"));
-	toServiceAppRecord = (dirPath, manifest, runtime, dataDirectory) => {
+	createDevStorage = async (appPath, appId) => {
+		const sourceId = createHash("sha256").update(appPath).digest("hex").slice(0, 16);
+		const instanceDirectory = path.join(new AppHomeService().getAppHomeDirectory(), "dev-instances", appId, sourceId, "default");
+		return (await this.instanceStorageService.materialize({
+			appId,
+			instanceId: "default",
+			instanceDirectory
+		})).storage;
+	};
+	toServiceAppRecord = (dirPath, manifest, runtime, storage) => {
 		const runtimeStatus = runtime.getStatus(manifest.id);
 		const record = {
 			id: manifest.id,
@@ -3758,7 +3754,10 @@ var ServiceAppDevService = class {
 			enabled: manifest.enabled,
 			protocol: manifest.protocol,
 			status: manifest.enabled ? runtimeStatus.status : "stopped",
-			dataDirectory
+			dataDirectory: storage?.dataDirectory,
+			instanceId: storage?.instanceId,
+			storage,
+			isolation: "full-user"
 		};
 		if (manifest.description) record.description = manifest.description;
 		if (runtimeStatus.lastError) record.lastError = runtimeStatus.lastError;
@@ -4607,13 +4606,165 @@ var AppRestartCommandController = class {
 	};
 };
 //#endregion
+//#region src/cli/app/services/app-publishing.service.ts
+var AppPublishingService = class {
+	constructor(validationService = new AppPublishValidationService(), publishService = new AppPublishService()) {
+		this.validationService = validationService;
+		this.publishService = publishService;
+	}
+	validate = async (params) => {
+		const result = await this.validationService.validate({
+			appDirectory: params.appDirectory,
+			metadataPath: params.metadataPath,
+			mode: "bundle"
+		});
+		if (result.profile !== "components") throw new Error("nextclaw app publish 只支持由 Panel App 或 Service App 组成的 schema v2 Mini App。");
+		if (result.distributionMode !== "bundle") throw new Error("NextClaw Mini App 只支持 bundle 分发。");
+		return result;
+	};
+	publish = async (params) => {
+		const validation = await this.validate(params);
+		if (validation.warnings.length > 0 && !params.allowWarnings) {
+			const warningList = validation.warnings.map((warning) => `[${warning.code}] ${warning.message}`).join("; ");
+			throw new Error(`发布校验包含警告：${warningList}。确认后可使用 --allow-warnings 继续。`);
+		}
+		const tempDirectory = await mkdtemp(path.join(tmpdir(), "nextclaw-app-publish-"));
+		try {
+			const result = await this.publishService.publish({
+				appDirectory: params.appDirectory,
+				metadataPath: params.metadataPath,
+				bundleOutputPath: path.join(tempDirectory, "artifact.napp"),
+				mode: "bundle"
+			});
+			const { item } = result;
+			return {
+				validation,
+				publish: {
+					created: result.created,
+					item: {
+						slug: item.slug,
+						appId: item.appId,
+						ownerScope: item.ownerScope,
+						appName: item.appName,
+						publishStatus: item.publishStatus,
+						name: item.name,
+						latestVersion: item.latestVersion,
+						webUrl: item.publishStatus === "published" ? item.webUrl : void 0
+					},
+					fileCount: result.fileCount
+				}
+			};
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
+			throw new Error(message.replace(/缺少 marketplace publish token。请先登录 NextClaw，或传入 --token。?/g, "发布需要 NextClaw 平台登录态。请先运行 nextclaw login。").replace(/，或传入 --token。?/g, "。"));
+		} finally {
+			await rm(tempDirectory, {
+				recursive: true,
+				force: true
+			});
+		}
+	};
+};
+//#endregion
+//#region src/cli/app/controllers/app-publish-command.controller.ts
+const PLATFORM_APPS_URL = "https://platform.nextclaw.io/apps";
+var AppPublishCommandController = class {
+	constructor(appPublishingService = new AppPublishingService()) {
+		this.appPublishingService = appPublishingService;
+	}
+	publish = async (target, options) => {
+		const { allowWarnings, json, meta } = options;
+		try {
+			const result = await this.appPublishingService.publish({
+				appDirectory: target,
+				metadataPath: meta,
+				allowWarnings
+			});
+			process.stdout.write(json ? `${JSON.stringify({
+				ok: true,
+				...result
+			}, null, 2)}\n` : this.format(result));
+		} catch (error) {
+			this.writeError(error, Boolean(json));
+			process.exitCode = 1;
+		}
+	};
+	format = (result) => {
+		const { item } = result.publish;
+		if (item.publishStatus === "pending") return [
+			`Submitted ${item.name} (${item.appId}) ${item.latestVersion} for review.`,
+			"Status: pending",
+			"The app will appear in the App Marketplace after approval.",
+			`Manage submissions: ${PLATFORM_APPS_URL}`,
+			""
+		].join("\n");
+		return [
+			`${result.publish.created ? "Published" : "Updated"} ${item.name} (${item.appId}) ${item.latestVersion}.`,
+			"Status: published",
+			item.webUrl ? `Details: ${item.webUrl}` : "",
+			`Manage apps: ${PLATFORM_APPS_URL}`,
+			""
+		].filter((line, index, lines) => line || index === lines.length - 1).join("\n");
+	};
+	writeError = (error, json) => {
+		const message = error instanceof Error ? error.message : String(error);
+		process.stdout.write(json ? `${JSON.stringify({
+			ok: false,
+			error: { message }
+		}, null, 2)}\n` : `Mini App publish failed: ${message}\n`);
+	};
+};
+//#endregion
+//#region src/cli/app/controllers/app-validate-publish-command.controller.ts
+var AppValidatePublishCommandController = class {
+	constructor(appPublishingService = new AppPublishingService()) {
+		this.appPublishingService = appPublishingService;
+	}
+	validate = async (target, options) => {
+		try {
+			const validation = await this.appPublishingService.validate({
+				appDirectory: target,
+				metadataPath: options.meta
+			});
+			process.stdout.write(options.json ? `${JSON.stringify({
+				ok: true,
+				validation
+			}, null, 2)}\n` : this.format(validation));
+		} catch (error) {
+			this.writeError(error, Boolean(options.json));
+			process.exitCode = 1;
+		}
+	};
+	format = (validation) => {
+		const lines = [
+			`Mini App publish validation passed: ${validation.appId}@${validation.version}`,
+			`Components: ${validation.componentCount ?? 0}`,
+			`Bundle size: ${validation.bundleSizeBytes} bytes`,
+			`Metadata: ${validation.metadataPath}`
+		];
+		for (const warning of validation.warnings) lines.push(`Warning [${warning.code}]: ${warning.message}`);
+		return `${lines.join("\n")}\n`;
+	};
+	writeError = (error, json) => {
+		const message = error instanceof Error ? error.message : String(error);
+		process.stdout.write(json ? `${JSON.stringify({
+			ok: false,
+			error: { message }
+		}, null, 2)}\n` : `Mini App publish validation failed: ${message}\n`);
+	};
+};
+//#endregion
 //#region src/cli/app/register-app-commands.ts
 function registerAppCommands(program) {
-	const app = program.command("app").description("Inspect and validate lightweight NextClaw apps");
+	const app = program.command("app").description("Develop, validate, and publish NextClaw apps");
 	const appCheck = new AppCheckCommandController();
 	const appDev = new AppDevCommandController();
 	const appCall = new AppCallCommandController();
 	const appRestart = new AppRestartCommandController();
+	const appValidatePublish = new AppValidatePublishCommandController();
+	const appPublish = new AppPublishCommandController();
+	app.command("validate-publish <app-dir>").description("Validate a NextClaw Mini App before Marketplace submission").option("--meta <path>", "Use a custom marketplace metadata file").option("--json", "Output JSON", false).action(async (target, opts) => appValidatePublish.validate(target, opts));
+	app.command("publish <app-dir>").description("Submit a NextClaw Mini App to the App Marketplace").option("--meta <path>", "Use a custom marketplace metadata file").option("--allow-warnings", "Submit after reviewing validation warnings", false).option("--json", "Output JSON", false).action(async (target, opts) => appPublish.publish(target, opts));
 	app.command("check <app-dir>").description("Check a Panel App or Service App directory").option("--json", "Output JSON", false).action(async (target, opts) => appCheck.check(target, opts));
 	app.command("dev <service-app-dir>").description("Start a Service App through the real runtime and inspect its actions").option("--json", "Output JSON", false).action(async (target, opts) => appDev.dev(target, opts));
 	app.command("call <service-app-dir> <action-name>").description("Call a Service App action through the real runtime").option("--input <json>", "JSON object input for the action").option("--json", "Output JSON", false).action(async (target, actionName, opts) => appCall.call(target, actionName, opts));