sayren 0.12.0 → 0.13.0

package/dist/index.mjs

@@ -5944,6 +5944,25 @@ const cli_deploy_force_yes_required = ((inputs = {}, options = {}) => {
 	return ko_cli_deploy_force_yes_required(inputs);
 });
 
+//#endregion
+//#region src/paraglide/messages/cli_deploy_merged.js
+/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */
+/** @typedef {{}} Cli_Deploy_MergedInputs */
+const ko_cli_deploy_merged = () => {
+	return `pull 이후 원격 작업 트리가 바뀌어(상점 플랫폼·AI 편집) 서버가 병합했습니다. 원격 변경은 그대로 남습니다.
+  · 병합된 트리를 이 폴더에 받으려면: npx sayren pull --force`;
+};
+/**
+
+* @param {Cli_Deploy_MergedInputs} inputs
+* @param {{ locale?: "ko" }} options
+* @returns {LocalizedString}
+*/
+const cli_deploy_merged = ((inputs = {}, options = {}) => {
+	experimentalStaticLocale ?? options.locale ?? getLocale();
+	return ko_cli_deploy_merged(inputs);
+});
+
 //#endregion
 //#region src/paraglide/messages/cli_deploy_no_state.js
 /** @typedef {import('../runtime.js').LocalizedString} LocalizedString */
@@ -6034,6 +6053,24 @@ const cli_deploy_published = ((inputs, options = {}) => {
 	return ko_cli_deploy_published(inputs);
 });
 
+//#endregion
+//#region src/paraglide/messages/cli_deploy_seller_git.js
+/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */
+/** @typedef {{ repository: NonNullable<unknown>, branch: NonNullable<unknown> }} Cli_Deploy_Seller_GitInputs */
+const ko_cli_deploy_seller_git = (i) => {
+	return `이 사이트는 GitHub 저장소 ${i?.repository}에 연결돼 있습니다. ${i?.branch} 브랜치에 git push하면 빌드하고 배포합니다(다른 브랜치는 미리보기). 업로드 배포는 npx sayren pull로 받은 폴더에서 하십시오`;
+};
+/**
+
+* @param {Cli_Deploy_Seller_GitInputs} inputs
+* @param {{ locale?: "ko" }} options
+* @returns {LocalizedString}
+*/
+const cli_deploy_seller_git = ((inputs, options = {}) => {
+	experimentalStaticLocale ?? options.locale ?? getLocale();
+	return ko_cli_deploy_seller_git(inputs);
+});
+
 //#endregion
 //#region src/paraglide/messages/cli_deploy_site_changed.js
 /** @typedef {import('../runtime.js').LocalizedString} LocalizedString */
@@ -6502,24 +6539,6 @@ const cli_init_dir_not_empty = ((inputs, options = {}) => {
 	return ko_cli_init_dir_not_empty(inputs);
 });
 
-//#endregion
-//#region src/paraglide/messages/cli_init_hosting_disabled.js
-/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */
-/** @typedef {{}} Cli_Init_Hosting_DisabledInputs */
-const ko_cli_init_hosting_disabled = () => {
-	return `지금은 새 호스팅 사이트를 만들 수 없습니다(호스팅 기능이 꺼져 있습니다)`;
-};
-/**
-
-* @param {Cli_Init_Hosting_DisabledInputs} inputs
-* @param {{ locale?: "ko" }} options
-* @returns {LocalizedString}
-*/
-const cli_init_hosting_disabled = ((inputs = {}, options = {}) => {
-	experimentalStaticLocale ?? options.locale ?? getLocale();
-	return ko_cli_init_hosting_disabled(inputs);
-});
-
 //#endregion
 //#region src/paraglide/messages/cli_init_inside_pulled.js
 /** @typedef {import('../runtime.js').LocalizedString} LocalizedString */
@@ -8184,6 +8203,27 @@ const cli_source_changed = ((inputs = {}, options = {}) => {
 	return ko_cli_source_changed(inputs);
 });
 
+//#endregion
+//#region src/paraglide/messages/cli_source_conflicts.js
+/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */
+/** @typedef {{ files: NonNullable<unknown> }} Cli_Source_ConflictsInputs */
+const ko_cli_source_conflicts = (i) => {
+	return `pull 이후 원격 작업 트리가 바뀌었고 같은 파일을 서로 다르게 고쳤습니다. 덮어쓰지 않았습니다.
+${i?.files}
+  · 원격을 받아 다시 고치려면: npx sayren pull --force (로컬 변경은 먼저 커밋·백업하십시오)
+  · 이 폴더 내용으로 덮어쓰려면: npx sayren deploy --force`;
+};
+/**
+
+* @param {Cli_Source_ConflictsInputs} inputs
+* @param {{ locale?: "ko" }} options
+* @returns {LocalizedString}
+*/
+const cli_source_conflicts = ((inputs, options = {}) => {
+	experimentalStaticLocale ?? options.locale ?? getLocale();
+	return ko_cli_source_conflicts(inputs);
+});
+
 //#endregion
 //#region src/paraglide/messages/cli_state_invalid.js
 /** @typedef {import('../runtime.js').LocalizedString} LocalizedString */
@@ -9744,7 +9784,7 @@ async function selectStore(auth, client, io, candidates, folderStore = null) {
 
 //#endregion
 //#region package.json
-var version = "0.12.0";
+var version = "0.13.0";
 
 //#endregion
 //#region src/client.ts
@@ -11488,6 +11528,13 @@ function accessOf(path) {
 
 //#endregion
 //#region ../../apps/hosting-sandbox/src/tar.ts
+/** 풀어낸 크기가 호출자가 준 상한을 넘었다(압축 폭탄 방어). 형식 오류와 구별해 413으로 답할 수 있게 따로 둔다 */
+var TarLimitError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "TarLimitError";
+	}
+};
 const BLOCK = 512;
 const enc = new TextEncoder();
 const dec = new TextDecoder();
@@ -11555,7 +11602,7 @@ function readTar(buf, maxBytes = Number.POSITIVE_INFINITY) {
 		while (path.startsWith("./")) path = path.slice(2);
 		if (!path) continue;
 		total += size;
-		if (total > maxBytes) throw new Error("tar 합계가 상한을 넘습니다");
+		if (total > maxBytes) throw new TarLimitError("tar 합계가 상한을 넘습니다");
 		out.push({
 			path,
 			bytes: data.slice()
@@ -11574,7 +11621,7 @@ async function gunzip(bytes, maxBytes) {
 		total += value.length;
 		if (total > maxBytes) {
 			await reader.cancel();
-			throw new Error("압축을 푼 크기가 상한을 넘습니다");
+			throw new TarLimitError("압축을 푼 크기가 상한을 넘습니다");
 		}
 		chunks.push(value);
 	}
@@ -12109,7 +12156,6 @@ async function init(flags, io) {
 		io.out(cli_init_site_url({ url: hosting.site.url }));
 		throw new CliError(cli_init_site_exists({ storeId }));
 	}
-	if (!hosting.enabled) throw new CliError(cli_init_hosting_disabled());
 	if (!hosting.editingEnabled) throw new CliError(cli_pull_editing_disabled());
 	const template = await pickTemplate(await client.storefront.listTemplates(), flags.template, io);
 	io.out(cli_init_summary({
@@ -12210,6 +12256,15 @@ async function deploy(flags, io) {
 		} catch {
 			storeId = null;
 		}
+		const git$1 = await apiFor(flags, dir, null, {
+			...io,
+			select: null,
+			confirm: null
+		}).then(({ client: client$1 }) => client$1.storefront.getGit()).catch(() => null);
+		if (git$1?.owner === "SELLER" && git$1.repository) throw new CliError(cli_deploy_seller_git({
+			repository: git$1.repository,
+			branch: git$1.productionBranch ?? "main"
+		}));
 		throw new CliError(cli_deploy_no_state({
 			stateFile: STATE_FILE,
 			storeId: storeId ?? "<storeId>",
@@ -12245,9 +12300,10 @@ async function deploy(flags, io) {
 	}
 	writeState(dir, {
 		...rc,
-		baseRef: replaced.sourceRef
+		baseRef: replaced.uploadedRef ?? (replaced.merged ? rc.baseRef : replaced.sourceRef)
 	});
 	io.out(!replaced.changed ? cli_deploy_unchanged() : replaced.endedEditSession ? cli_deploy_uploaded_edit_ended({ files: replaced.files }) : cli_deploy_uploaded({ files: replaced.files }));
+	if (replaced.merged) io.out(cli_deploy_merged());
 	let created;
 	try {
 		created = await client.storefront.createVersion({
@@ -12372,10 +12428,14 @@ async function replaceSource(client, tree, rc, force, io) {
 					files: remote.files,
 					bytes: remote.bytes,
 					changed: false,
+					merged: false,
+					uploadedRef: remote.sourceRef,
 					endedEditSession: false,
 					dependencyWarnings: []
 				};
 			}
+			const conflicts = Array.isArray(details.conflicts) ? details.conflicts : [];
+			if (conflicts.length > 0) throw new CliError(cli_source_conflicts({ files: conflicts.map((path) => `  · ${path}`).join("\n") }));
 			throw new CliError(cli_source_changed());
 		}
 		if (code === "EDIT_SESSION_OPEN") throw new CliError(cli_edit_session_open());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sayren",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "type": "module",
   "imports": {
     "#paraglide/*": "./src/paraglide/*"
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "esbuild": "^0.28.2",
-    "@sayren/store-sdk": "^0.33.0"
+    "@sayren/store-sdk": "^0.37.0"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.5.14",
@@ -28,7 +28,7 @@
     "tsx": "^4.20.3",
     "typescript": "^6.0.3",
     "vitest": "^5.0.1",
-    "@sayren/mcp": "0.26.0"
+    "@sayren/mcp": "0.27.0"
   },
   "publishConfig": {
     "access": "public"