yugoo-design 0.1.2 → 0.2.2

package/payload/shared/scripts/{codex-connection-DuV2wtkn.mjs → codex-connection-1RvU1XCj.mjs}

@@ -3,6 +3,11 @@ import { randomUUID } from "node:crypto";
 import { Duplex } from "node:stream";
 //#region packages/companion/src/notification-delivery.mjs
 const UNKNOWN_DELIVERY_MESSAGE = "Codex notification delivery is unknown; inspect the original session before retrying.";
+const setupMessages = {
+	"proxy-connect": "Codex native notification setup is unavailable: the original host connection could not be opened. Check its connection settings; no message was submitted.",
+	"websocket-handshake": "Codex native notification setup is unavailable: the connection handshake did not complete. Check the original host connection settings; no message was submitted.",
+	initialize: "Codex native notification setup is unavailable: the original host initialization did not complete. Check its connection settings; no message was submitted."
+};
 const stages = /* @__PURE__ */ new Set([
 	"queue-add",
 	"post-add-read",
@@ -27,6 +32,14 @@ const categories = /* @__PURE__ */ new Set([
 ]);
 const uuid = /^[a-f0-9]{8}(?:-[a-f0-9]{4}){3}-[a-f0-9]{12}$/i;
 function notificationDeliveryReceipt(value) {
+	if (value?.delivery === "not-submitted" && value.notSubmitted === true && Object.hasOwn(setupMessages, value.stage)) return {
+		delivery: "not-submitted",
+		status: "unavailable",
+		notSubmitted: true,
+		stage: value.stage,
+		transportCategory: categories.has(value.transportCategory) ? value.transportCategory : "unknown",
+		...Number.isInteger(value.rpcCode) && value.rpcCode >= -2147483648 && value.rpcCode <= 2147483647 ? { rpcCode: value.rpcCode } : {}
+	};
 	if (value?.delivery !== "unknown") return void 0;
 	const receipt = { delivery: "unknown" };
 	if (stages.has(value.stage)) receipt.stage = value.stage;
@@ -43,10 +56,19 @@ function notificationDeliveryReceipt(value) {
 function notificationErrorResponse(error) {
 	const receipt = notificationDeliveryReceipt(error);
 	return receipt ? {
-		error: UNKNOWN_DELIVERY_MESSAGE,
+		error: receipt.delivery === "unknown" ? UNKNOWN_DELIVERY_MESSAGE : setupMessages[receipt.stage],
 		...receipt
 	} : void 0;
 }
+function notificationSetupError(details) {
+	const receipt = notificationDeliveryReceipt({
+		...details,
+		delivery: "not-submitted",
+		notSubmitted: true
+	});
+	if (!receipt) throw Error("Invalid notification setup stage.");
+	return Object.assign(new Error(setupMessages[receipt.stage]), receipt);
+}
 function unknownDeliveryError(details) {
 	return Object.assign(/* @__PURE__ */ new Error(UNKNOWN_DELIVERY_MESSAGE), notificationDeliveryReceipt({
 		...details,
@@ -63,23 +85,41 @@ function requireThreadId(value) {
 function createCodexConnection(threadId, connect = openNativeConnection, { remote } = {}) {
 	requireThreadId(threadId);
 	if (remote !== void 0 && (typeof remote !== "string" || !remote.startsWith("unix:///") || remote.length <= 8 || /[\r\n\0]/.test(remote))) throw new Error("Codex remote must be an explicit unix:///absolute/socket path.");
-	return {
-		threadId,
-		async probe() {
-			const client = await connect([
+	async function initializeConnection() {
+		let client;
+		let stage = "proxy-connect";
+		try {
+			client = await connect([
 				"app-server",
 				"proxy",
 				...remote === void 0 ? [] : ["--sock", remote.slice(7)]
 			]);
+			stage = "initialize";
+			await client.request("initialize", {
+				clientInfo: {
+					name: "design_companion",
+					version: "0.1.0"
+				},
+				capabilities: { experimentalApi: true }
+			});
+			client.notify("initialized", {});
+			return client;
+		} catch (error) {
+			try {
+				await client?.close();
+			} catch {}
+			throw notificationSetupError({
+				stage: stage === "proxy-connect" && error?.stage === "websocket-handshake" ? error.stage : stage,
+				transportCategory: error?.transportCategory,
+				rpcCode: error?.rpcCode
+			});
+		}
+	}
+	return {
+		threadId,
+		async probe() {
+			const client = await initializeConnection();
 			try {
-				await client.request("initialize", {
-					clientInfo: {
-						name: "design_companion",
-						version: "0.1.0"
-					},
-					capabilities: { experimentalApi: true }
-				});
-				client.notify("initialized", {});
 				return { status: (await client.request("thread/read", {
 					threadId,
 					includeTurns: false
@@ -90,25 +130,13 @@ function createCodexConnection(threadId, connect = openNativeConnection, { remot
 		},
 		async send(text) {
 			if (typeof text !== "string" || !text.trim() || Buffer.byteLength(text) > 131072) throw new Error("Codex message must contain 1–131072 bytes.");
-			const client = await connect([
-				"app-server",
-				"proxy",
-				...remote === void 0 ? [] : ["--sock", remote.slice(7)]
-			]);
+			const client = await initializeConnection();
 			let addAttempted = false;
 			let queuedSubmissionId;
 			const clientUserMessageId = randomUUID();
 			const stage = "queue-add";
 			const lastConfirmed = "initialized";
 			try {
-				await client.request("initialize", {
-					clientInfo: {
-						name: "design_companion",
-						version: "0.1.0"
-					},
-					capabilities: { experimentalApi: true }
-				});
-				client.notify("initialized", {});
 				addAttempted = true;
 				queuedSubmissionId = (await client.request("thread/queue/add", {
 					threadId,
@@ -144,24 +172,29 @@ function createCodexConnection(threadId, connect = openNativeConnection, { remot
 }
 async function openNativeConnection(args, { WebSocket, spawnProxy = spawn, timeoutMs = 15e3 } = {}) {
 	WebSocket ??= (await import("./wrapper-5f4ZpIOW.mjs")).default;
-	const child = spawnProxy("codex", args, {
-		shell: false,
-		stdio: [
-			"pipe",
-			"pipe",
-			"pipe"
-		]
-	});
+	let child;
+	try {
+		child = spawnProxy("codex", args, {
+			shell: false,
+			stdio: [
+				"pipe",
+				"pipe",
+				"pipe"
+			]
+		});
+	} catch {
+		throw notificationSetupError({
+			stage: "proxy-connect",
+			transportCategory: "disconnected"
+		});
+	}
 	child.stderr.resume();
 	const stream = Duplex.from({
 		readable: child.stdout,
 		writable: child.stdin
 	});
-	const socket = new WebSocket("ws://localhost/", {
-		createConnection: () => stream,
-		perMessageDeflate: false,
-		maxPayload: 1048576
-	});
+	let socket;
+	let opened = false;
 	const pending = /* @__PURE__ */ new Map();
 	let nextId = 0;
 	let failure;
@@ -171,7 +204,7 @@ async function openNativeConnection(args, { WebSocket, spawnProxy = spawn, timeo
 		if (disposed) return;
 		disposed = true;
 		clearTimeout(timer);
-		socket.terminate();
+		socket?.terminate();
 		stream.destroy();
 		child.stdin.destroy();
 		child.stdout.destroy();
@@ -184,43 +217,53 @@ async function openNativeConnection(args, { WebSocket, spawnProxy = spawn, timeo
 			child.once("exit", () => clearTimeout(force));
 		}
 	};
-	const fail = (category) => {
-		failure ??= Object.assign(/* @__PURE__ */ new Error("Codex native notification transport disconnected or timed out."), { transportCategory: [
+	const fail = (category, stage = "websocket-handshake") => {
+		const transportCategory = [
 			"timeout",
 			"protocol",
 			"send-failed"
-		].includes(category) ? category : "disconnected" });
+		].includes(category) ? category : "disconnected";
+		failure ??= opened ? Object.assign(/* @__PURE__ */ new Error("Codex native notification transport disconnected or timed out."), { transportCategory }) : notificationSetupError({
+			stage,
+			transportCategory
+		});
 		for (const waiter of pending.values()) waiter.reject(failure);
 		pending.clear();
 		dispose();
 	};
-	child.on("error", fail);
-	child.on("exit", fail);
-	stream.on("error", fail);
-	socket.on("error", fail);
-	socket.on("close", fail);
-	socket.on("message", (bytes) => {
-		let response;
-		try {
-			response = JSON.parse(bytes.toString());
-		} catch {
-			fail("protocol");
-			return;
-		}
-		if (!Object.hasOwn(response, "id") || !pending.has(response.id)) return;
-		const waiter = pending.get(response.id);
-		pending.delete(response.id);
-		if (response.error) waiter.reject(Object.assign(/* @__PURE__ */ new Error("Codex native notification request was rejected."), {
-			transportCategory: "rpc-rejected",
-			...Number.isInteger(response.error.code) && response.error.code >= -2147483648 && response.error.code <= 2147483647 ? { rpcCode: response.error.code } : {}
-		}));
-		else waiter.resolve(response.result);
-	});
+	child.on("error", () => fail("disconnected", "proxy-connect"));
+	child.on("exit", () => fail("disconnected", "proxy-connect"));
+	stream.on("error", () => fail("disconnected", "proxy-connect"));
 	timer = setTimeout(() => fail("timeout"), timeoutMs);
 	try {
+		socket = new WebSocket("ws://localhost/", {
+			createConnection: () => stream,
+			perMessageDeflate: false,
+			maxPayload: 1048576
+		});
+		socket.on("error", () => fail("disconnected"));
+		socket.on("close", () => fail("disconnected"));
+		socket.on("message", (bytes) => {
+			let response;
+			try {
+				response = JSON.parse(bytes.toString());
+			} catch {
+				fail("protocol");
+				return;
+			}
+			if (!Object.hasOwn(response, "id") || !pending.has(response.id)) return;
+			const waiter = pending.get(response.id);
+			pending.delete(response.id);
+			if (response.error) waiter.reject(Object.assign(/* @__PURE__ */ new Error("Codex native notification request was rejected."), {
+				transportCategory: "rpc-rejected",
+				...Number.isInteger(response.error.code) && response.error.code >= -2147483648 && response.error.code <= 2147483647 ? { rpcCode: response.error.code } : {}
+			}));
+			else waiter.resolve(response.result);
+		});
 		await new Promise((resolve, reject) => {
 			pending.set("open", { reject });
 			socket.once("open", () => {
+				opened = true;
 				pending.delete("open");
 				resolve();
 			});
@@ -256,10 +299,14 @@ async function openNativeConnection(args, { WebSocket, spawnProxy = spawn, timeo
 				dispose();
 			}
 		};
-	} catch (error) {
+	} catch {
+		failure ??= notificationSetupError({
+			stage: "websocket-handshake",
+			transportCategory: "disconnected"
+		});
 		dispose();
-		throw error;
+		throw failure;
 	}
 }
 //#endregion
-export { unknownDeliveryError as i, requireThreadId as n, notificationErrorResponse as r, createCodexConnection as t };
+export { notificationSetupError as a, notificationErrorResponse as i, requireThreadId as n, unknownDeliveryError as o, notificationDeliveryReceipt as r, createCodexConnection as t };

package/payload/shared/scripts/codex-desktop-bridge.mjs

@@ -1,5 +1,5 @@
-import { i as unknownDeliveryError, n as requireThreadId } from "./codex-connection-DuV2wtkn.mjs";
-import { t as callCompanion } from "./connection-file-Dk1TJHgf.mjs";
+import { n as requireThreadId, o as unknownDeliveryError } from "./codex-connection-1RvU1XCj.mjs";
+import { t as callCompanion } from "./connection-file-CNwrHbAG.mjs";
 import { isAbsolute } from "node:path";
 import { lstat, readFile, realpath } from "node:fs/promises";
 import { randomUUID } from "node:crypto";

package/payload/shared/scripts/{connection-file-Dk1TJHgf.mjs → connection-file-CNwrHbAG.mjs}

@@ -1,4 +1,4 @@
-import { i as unknownDeliveryError } from "./codex-connection-DuV2wtkn.mjs";
+import { a as notificationSetupError, o as unknownDeliveryError, r as notificationDeliveryReceipt } from "./codex-connection-1RvU1XCj.mjs";
 import { readFile } from "node:fs/promises";
 //#region packages/companion/src/connection-file.mjs
 /** Local CLI-to-companion transport. It cannot start or resume a model thread. */
@@ -21,6 +21,8 @@ async function callCompanion(connectionFile, request) {
 	const result = await response.json();
 	if (!response.ok) {
 		if (result.delivery === "unknown") throw unknownDeliveryError(result);
+		const receipt = notificationDeliveryReceipt(result);
+		if (receipt?.delivery === "not-submitted") throw notificationSetupError(receipt);
 		throw new Error(result.error ?? "Companion call failed.");
 	}
 	return result;

package/payload/shared/scripts/{content-archive-4UdioMU9.mjs → content-archive-CnwVcuWA.mjs}

@@ -1,5 +1,5 @@
-import { It as DesignBundleVersion, Lt as DesignKitVersion, lt as loadDesignBundle } from "./core-entry-B6zaTh1o.mjs";
-import { t as loadStudioKit } from "./load-DE29wyw0.mjs";
+import { Lt as DesignBundleVersion, Rt as DesignKitVersion, ft as loadDesignBundle } from "./core-entry-DESmwP78.mjs";
+import { t as loadStudioKit } from "./load-C-RwS23Y.mjs";
 import { extname, isAbsolute, relative, resolve, sep } from "node:path";
 import { createHash } from "node:crypto";
 //#region packages/studio/src/content-archive.ts
@@ -48,6 +48,10 @@ function text(value, limit) {
 	if (typeof value !== "string" || !value.trim() || Buffer.byteLength(value) > limit || /[\u0000-\u001f\u007f]/u.test(value)) throw Error("Invalid archive metadata text.");
 	return value;
 }
+function metadataText(value) {
+	if (typeof value !== "string" || Buffer.byteLength(value) > 2048) throw Error("Invalid archive metadata text.");
+	return value;
+}
 function pin(value, kind) {
 	const data = object(value);
 	keys(data, ["name", "version"]);
@@ -80,18 +84,33 @@ function readStudioContentArchive(source) {
 		"format",
 		"kind",
 		"pin",
-		"provenance",
+		...Object.hasOwn(raw, "title") ? ["title"] : [],
+		...Object.hasOwn(raw, "provenance") ? ["provenance"] : [],
 		"dependencies",
 		"files",
 		"sha256"
 	]);
 	if (raw.format !== "studio-content-archive/v1" || raw.kind !== "kit" && raw.kind !== "bundle") throw Error("Unsupported archive format.");
-	const identity = pin(raw.pin, raw.kind), provenance = object(raw.provenance);
-	keys(provenance, ["source", "license"]);
-	const origin = Object.freeze({
-		source: text(provenance.source, 2048),
-		license: text(provenance.license, 2048)
-	});
+	const identity = pin(raw.pin, raw.kind);
+	let title;
+	if (raw.title !== void 0) {
+		const names = object(raw.title);
+		keys(names, ["zh", "en"]);
+		title = Object.freeze({
+			zh: text(names.zh, 800),
+			en: text(names.en, 800)
+		});
+		if (title.zh.length > 200 || title.en.length > 200) throw Error("Archive display title exceeds 200 characters.");
+	}
+	let origin;
+	if (raw.provenance !== void 0) {
+		const provenance = object(raw.provenance);
+		keys(provenance, ["source", "license"].filter((key) => Object.hasOwn(provenance, key)));
+		origin = Object.freeze({
+			...provenance.source === void 0 ? {} : { source: metadataText(provenance.source) },
+			...provenance.license === void 0 ? {} : { license: metadataText(provenance.license) }
+		});
+	}
 	if (!Array.isArray(raw.dependencies) || raw.dependencies.length > MAX_FILES) throw Error("Invalid archive dependencies.");
 	const dependencies = raw.dependencies.map((value) => pin(value, "bundle"));
 	const names = /* @__PURE__ */ new Set();
@@ -145,7 +164,8 @@ function readStudioContentArchive(source) {
 		format: raw.format,
 		kind: raw.kind,
 		pin: identity,
-		provenance: origin,
+		...title === void 0 ? {} : { title },
+		...origin === void 0 ? {} : { provenance: origin },
 		dependencies: Object.freeze(dependencies),
 		files: Object.freeze(files)
 	};
@@ -387,16 +407,25 @@ async function prepareStudioContentImport(source, options = {}) {
 		validation
 	});
 }
-/** Capture only immutable host snapshots, preserving full exact referenced trees. */
-async function exportStudioContentArchive(snapshot, input) {
+/** Capture saved source bytes, including incomplete working copies, without definition validation. */
+function exportStudioSourceArchive(snapshot, input) {
+	return exportArchive(snapshot, input, false);
+}
+async function exportArchive(snapshot, input, validateDefinition) {
 	const request = JSON.parse(JSON.stringify(input));
 	if (!isAbsolute(snapshot.root)) throw Error("Archive source root must be host-resolved absolute.");
-	const view = sourceView(snapshot), kit = await loadStudioKit(view.fs, snapshot.root, view.options);
-	const selected = request.kind === "kit" ? kit : kit.skills.find((skill) => samePin(bundlePin(skill), request.pin));
-	if (!selected || !samePin(request.kind === "kit" ? {
+	const standalone = snapshot.bundle !== void 0;
+	if (standalone && (request.kind !== "bundle" || !samePin(snapshot.bundle, request.pin))) throw Error("Standalone Bundle snapshot pin disagrees with export.");
+	const view = validateDefinition ? sourceView(snapshot) : void 0;
+	const kit = !validateDefinition || standalone ? void 0 : await loadStudioKit(view.fs, snapshot.root, view.options);
+	const selected = !validateDefinition ? void 0 : standalone ? (await loadDesignBundle(view.fs, {
+		rootDir: snapshot.root,
+		sourceId: snapshot.sourceId ?? "studio:exact-instance"
+	}, request.pin)).skill : request.kind === "kit" ? kit : kit.skills.find((skill) => samePin(bundlePin(skill), request.pin));
+	if (validateDefinition && (!selected || !samePin(request.kind === "kit" ? {
 		name: selected.name,
 		version: String(selected.version)
-	} : bundlePin(selected), request.pin)) throw Error("Export pin disagrees with snapshot.");
+	} : bundlePin(selected), request.pin))) throw Error("Export pin disagrees with snapshot.");
 	const files = [];
 	let total = 0;
 	const append = async (source, prefix, selectPrefix = "") => {
@@ -418,7 +447,11 @@ async function exportStudioContentArchive(snapshot, input) {
 			});
 		}
 	};
-	if (snapshot.bundles) {
+	if (!validateDefinition) {
+		await append(snapshot, "");
+		if (request.kind === "kit") for (const bundle of snapshot.bundles ?? []) await append(bundle.snapshot, bundlePrefix(bundle));
+	} else if (standalone) await append(snapshot, "");
+	else if (snapshot.bundles) {
 		const referenced = kit.skills.map((skill) => {
 			const identity = bundlePin(skill), matches = snapshot.bundles.filter((bundle) => samePin(bundle, identity));
 			if (matches.length !== 1) throw Error("Missing or ambiguous exact Bundle snapshot.");
@@ -435,18 +468,29 @@ async function exportStudioContentArchive(snapshot, input) {
 		format: "studio-content-archive/v1",
 		kind: request.kind,
 		pin: request.pin,
-		provenance: request.provenance,
-		dependencies: request.kind === "kit" ? kit.skills.map(bundlePin) : request.dependencies ?? [],
+		...request.title === void 0 ? {} : { title: {
+			zh: request.title.zh,
+			en: request.title.en
+		} },
+		...request.provenance === void 0 ? {} : { provenance: request.provenance },
+		dependencies: request.kind === "kit" && validateDefinition ? kit.skills.map(bundlePin) : request.dependencies ?? (request.kind === "kit" ? snapshot.bundles?.map((bundle) => ({
+			name: bundle.name,
+			version: bundle.version
+		})) ?? [] : []),
 		files
 	};
-	if (request.kind === "kit" && request.dependencies !== void 0 && JSON.stringify(request.dependencies) !== JSON.stringify(data.dependencies)) throw Error("Explicit Kit pins disagree with source membership.");
+	if (validateDefinition && request.kind === "kit" && request.dependencies !== void 0 && JSON.stringify(request.dependencies) !== JSON.stringify(data.dependencies)) throw Error("Explicit Kit pins disagree with source membership.");
 	const serialized = JSON.stringify({
 		...data,
 		sha256: sha(canonical(data))
 	});
-	const prepared = await prepareStudioContentImport(serialized, { validationContext: snapshot });
+	if (!validateDefinition) {
+		readStudioContentArchive(serialized);
+		return serialized;
+	}
+	const prepared = await prepareStudioContentImport(serialized, { validationContext: standalone ? void 0 : snapshot });
 	if (!prepared.validation.valid) throw Error(prepared.validation.diagnostics[0].message);
 	return serialized;
 }
 //#endregion
-export { readStudioContentArchive as i, prepareStudioContentImport as n, readStudioArchiveResource as r, exportStudioContentArchive as t };
+export { readStudioArchiveResource as n, readStudioContentArchive as r, exportStudioSourceArchive as t };