nextclaw 0.34.0 → 0.35.0

package/dist/cli/app/index.js

@@ -4,16 +4,16 @@ 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";
-import { AppPublishService, AppPublishValidationService } from "@nextclaw/app-runtime";
 var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 //#endregion
@@ -2020,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();
@@ -2672,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;
@@ -3144,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();
@@ -3403,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) {
@@ -3633,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;
 	}
@@ -3643,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,
@@ -3659,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) => {
@@ -3686,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",
@@ -3706,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) => {
@@ -3745,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,
@@ -3759,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;