ziku 0.21.1 → 0.21.3

package/dist/hash-CjblHutQ.mjs

@@ -0,0 +1,3 @@
+import { c as hashContent, l as hashFiles } from "./index.mjs";
+
+export { hashFiles };

package/dist/index.mjs

@@ -17,13 +17,14 @@ import { match } from "ts-pattern";
 import { execFileSync } from "node:child_process";
 import { Octokit } from "@octokit/rest";
 import { createHash } from "node:crypto";
+import { z as z$1 } from "zod/v4";
 
 //#region rolldown:runtime
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 //#endregion
 //#region package.json
-var version$2 = "0.21.1";
+var version$2 = "0.21.3";
 
 //#endregion
 //#region src/modules/schemas.ts
@@ -869,7 +870,7 @@ function getEffectivePatterns(_moduleId, modulePatterns, config) {
 *
 * 削除条件: ziku が別の UI フレームワーク（ink 等）に移行する場合。
 */
-const version$1 = "0.21.1";
+const version$1 = "0.21.3";
 /** CLI の開始表示 */
 function intro(command) {
 	const title = command ? `ziku ${command}` : "ziku";
@@ -2037,7 +2038,7 @@ async function hashFiles(dir, patterns) {
 
 //#endregion
 //#region src/commands/init.ts
-const version = "0.21.1";
+const version = "0.21.3";
 const initCommand = defineCommand({
 	meta: {
 		name: "ziku",
@@ -2309,6 +2310,30 @@ async function saveConfig(targetDir, config) {
 //#endregion
 //#region src/utils/merge.ts
 /**
+* 3-way マージにおけるベース（共通祖先）のファイル内容。
+*
+* 背景: threeWayMerge の引数は全て string だが、base/local/template を
+* 入れ違えるとサイレントに誤った結果を返す（#148 で発生）。
+* Zod brand で型レベルで区別し、取り違えをコンパイルエラーにする。
+*/
+const BaseContent = z$1.string().brand("BaseContent");
+/** ローカル側（ユーザー）のファイル内容。コンフリクト時に優先される側。 */
+const LocalContent = z$1.string().brand("LocalContent");
+/** テンプレート側のファイル内容。ローカルに適用される変更の源。 */
+const TemplateContent = z$1.string().brand("TemplateContent");
+/** string を BaseContent にブランドする */
+function asBaseContent(s) {
+	return BaseContent.parse(s);
+}
+/** string を LocalContent にブランドする */
+function asLocalContent(s) {
+	return LocalContent.parse(s);
+}
+/** string を TemplateContent にブランドする */
+function asTemplateContent(s) {
+	return TemplateContent.parse(s);
+}
+/**
 * base/local/template のハッシュを比較し、各ファイルを分類する。
 *
 * 背景: pull/push 時にファイルごとの処理方法（自動上書き・マージ・スキップ等）を
@@ -2358,10 +2383,11 @@ function classifyFiles(opts) {
 * ファイル構造を壊さずにマージできる。テキストファイルは fuzz factor や
 * hunk 単位のマーカーで精度を上げる。
 *
-* @param filePath ファイルパス（拡張子でマージ戦略を選択）
+* result の内容は local をベースにし、template 側の変更を適用したもの。
+* コンフリクト時は local 側の値が保持される。
 */
-function threeWayMerge(base, local, template, filePath) {
-	if (local === template) return {
+function threeWayMerge({ base, local, template, filePath }) {
+	if (String(local) === String(template)) return {
 		content: local,
 		hasConflicts: false,
 		conflictDetails: []
@@ -2605,12 +2631,6 @@ function tryApplyHunk(localLines, hunk) {
 	return newLines;
 }
 /**
-* base/local/template の3つの内容から 3-way マージを実行する。
-* (後方互換性のためのラッパー)
-*
-* @deprecated filePath を渡す新しい threeWayMerge を使用してください
-*/
-/**
 * ファイル内容にコンフリクトマーカーが含まれるかを検出する。
 *
 * 背景: マージ後のファイルにユーザーが手動解決すべきコンフリクトが
@@ -2734,7 +2754,12 @@ const pullCommand = defineCommand({
 						const templateContent = await readFile(join(templateDir, file), "utf-8");
 						let baseContent = "";
 						if (baseTemplateDir && existsSync(join(baseTemplateDir, file))) baseContent = await readFile(join(baseTemplateDir, file), "utf-8");
-						const result = threeWayMerge(baseContent, localContent, templateContent, file);
+						const result = threeWayMerge({
+							base: asBaseContent(baseContent),
+							local: asLocalContent(localContent),
+							template: asTemplateContent(templateContent),
+							filePath: file
+						});
 						await writeFile(join(targetDir, file), result.content, "utf-8");
 						if (result.hasConflicts) {
 							unresolvedConflicts.push(file);
@@ -3337,11 +3362,12 @@ const pushCommand = defineCommand({
 				if (localAdditions.newModuleIds.length > 0) log.info(`Detected ${localAdditions.newModuleIds.length} new module(s) from local: ${localAdditions.newModuleIds.join(", ")}`);
 			}
 			const mergedContents = /* @__PURE__ */ new Map();
-			if (config.baseHashes) {
-				const { hashFiles: hashFiles$1 } = await import("./hash-DonjAgHQ.mjs");
-				const { classifyFiles: classifyFiles$1 } = await import("./merge-DFEjeYIq.mjs");
-				const { getModuleById: getModuleById$1 } = await import("./modules-DkQe-r1d.mjs");
-				const { getEffectivePatterns: getEffectivePatterns$1 } = await import("./patterns-C3oCRYgX.mjs");
+			let pushableFilePaths = /* @__PURE__ */ new Set();
+			{
+				const { hashFiles: hashFiles$1 } = await import("./hash-CjblHutQ.mjs");
+				const { classifyFiles: classifyFiles$1 } = await import("./merge-CPx9nRrL.mjs");
+				const { getModuleById: getModuleById$1 } = await import("./modules-DlNMFNLz.mjs");
+				const { getEffectivePatterns: getEffectivePatterns$1 } = await import("./patterns-CxgZLnrY.mjs");
 				const allPatterns = [];
 				for (const moduleId of effectiveModuleIds) {
 					const mod = getModuleById$1(moduleId, moduleList);
@@ -3353,19 +3379,25 @@ const pushCommand = defineCommand({
 				const templateHashes = await hashFiles$1(templateDir, allPatterns);
 				const localHashes = await hashFiles$1(targetDir, allPatterns);
 				const classification = classifyFiles$1({
-					baseHashes: config.baseHashes,
+					baseHashes: config.baseHashes ?? {},
 					localHashes,
 					templateHashes
 				});
+				for (const file of classification.localOnly) pushableFilePaths.add(file);
+				for (const file of classification.conflicts) pushableFilePaths.add(file);
+				if (classification.autoUpdate.length > 0) {
+					log.info(`Skipping ${classification.autoUpdate.length} file(s) only changed in template (use \`ziku pull\` to sync):`);
+					for (const file of classification.autoUpdate) log.message(`  ${pc$1.dim("↓")} ${pc$1.dim(file)}`);
+				}
 				if (classification.conflicts.length > 0) {
-					const { threeWayMerge: threeWayMerge$1 } = await import("./merge-DFEjeYIq.mjs");
+					const { threeWayMerge: threeWayMerge$1, asBaseContent: asBaseContent$1, asLocalContent: asLocalContent$1, asTemplateContent: asTemplateContent$1 } = await import("./merge-CPx9nRrL.mjs");
 					const baseInfo = config.baseRef ? `since ${pc$1.bold(config.baseRef.slice(0, 7))} (your last sync)` : "since your last pull/init";
 					log.warn(`Template updated ${baseInfo} — ${classification.conflicts.length} conflict(s) detected, attempting auto-merge...`);
 					let baseTemplateDir;
 					let baseCleanup;
 					if (config.baseRef) try {
 						log.info(`Downloading base version (${config.baseRef.slice(0, 7)}...) for merge...`);
-						const { downloadTemplateToTemp: downloadBase } = await import("./template-BLwXZEZq.mjs");
+						const { downloadTemplateToTemp: downloadBase } = await import("./template-CPgSJ67F.mjs");
 						const baseResult = await downloadBase(targetDir, `gh:${config.source.owner}/${config.source.repo}#${config.baseRef}`);
 						baseTemplateDir = baseResult.templateDir;
 						baseCleanup = baseResult.cleanup;
@@ -3381,7 +3413,12 @@ const pushCommand = defineCommand({
 							let baseContent;
 							if (baseTemplateDir && existsSync(join(baseTemplateDir, file))) baseContent = await readFile(join(baseTemplateDir, file), "utf-8");
 							if (baseContent) {
-								const result$1 = threeWayMerge$1(baseContent, templateContent, localContent, file);
+								const result$1 = threeWayMerge$1({
+									base: asBaseContent$1(baseContent),
+									local: asLocalContent$1(localContent),
+									template: asTemplateContent$1(templateContent),
+									filePath: file
+								});
 								if (!result$1.hasConflicts) {
 									mergedContents.set(file, result$1.content);
 									autoMerged.push(file);
@@ -3430,7 +3467,7 @@ const pushCommand = defineCommand({
 				config,
 				moduleList
 			}));
-			let pushableFiles = getPushableFiles(diff);
+			let pushableFiles = diff.files.filter((f) => (f.type === "added" || f.type === "modified") && pushableFilePaths.has(f.path));
 			if (pushableFiles.length === 0 && !updatedModulesContent) {
 				log.info("No changes to push");
 				log.step("Current status:");
@@ -3785,4 +3822,4 @@ async function run() {
 run();
 
 //#endregion
-export { modulesFileExists as C, loadModulesFile as S, getModuleById as _, hashContent as a, addPatternToModulesFileWithCreate as b, buildTemplateSource as c, fetchTemplates as d, writeFileWithStrategy as f, defaultModules as g, resolvePatterns as h, threeWayMerge as i, copyFile as l, matchesPatterns as m, hasConflictMarkers as n, hashFiles as o, getEffectivePatterns as p, mergeJsonContent as r, TEMPLATE_SOURCE as s, classifyFiles as t, downloadTemplateToTemp as u, getPatternsByModuleIds as v, saveModulesFile as w, getModulesFilePath as x, addPatternToModulesFile as y };
+export { addPatternToModulesFileWithCreate as C, saveModulesFile as D, modulesFileExists as E, addPatternToModulesFile as S, loadModulesFile as T, matchesPatterns as _, hasConflictMarkers as a, getModuleById as b, hashContent as c, buildTemplateSource as d, copyFile as f, getEffectivePatterns as g, writeFileWithStrategy as h, classifyFiles as i, hashFiles as l, fetchTemplates as m, asLocalContent as n, mergeJsonContent as o, downloadTemplateToTemp as p, asTemplateContent as r, threeWayMerge as s, asBaseContent as t, TEMPLATE_SOURCE as u, resolvePatterns as v, getModulesFilePath as w, getPatternsByModuleIds as x, defaultModules as y };

package/dist/merge-CPx9nRrL.mjs

@@ -0,0 +1,3 @@
+import { a as hasConflictMarkers, i as classifyFiles, n as asLocalContent, o as mergeJsonContent, r as asTemplateContent, s as threeWayMerge, t as asBaseContent } from "./index.mjs";
+
+export { asBaseContent, asLocalContent, asTemplateContent, classifyFiles, threeWayMerge };

package/dist/modules-DlNMFNLz.mjs

@@ -0,0 +1,3 @@
+import { C as addPatternToModulesFileWithCreate, D as saveModulesFile, E as modulesFileExists, S as addPatternToModulesFile, T as loadModulesFile, b as getModuleById, w as getModulesFilePath, x as getPatternsByModuleIds, y as defaultModules } from "./index.mjs";
+
+export { getModuleById };

package/dist/patterns-CxgZLnrY.mjs

@@ -0,0 +1,3 @@
+import { _ as matchesPatterns, g as getEffectivePatterns, v as resolvePatterns } from "./index.mjs";
+
+export { getEffectivePatterns };

package/dist/template-CPgSJ67F.mjs

@@ -0,0 +1,3 @@
+import { d as buildTemplateSource, f as copyFile, h as writeFileWithStrategy, m as fetchTemplates, p as downloadTemplateToTemp, u as TEMPLATE_SOURCE } from "./index.mjs";
+
+export { downloadTemplateToTemp };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ziku",
-  "version": "0.21.1",
+  "version": "0.21.3",
   "description": "Interactive CLI to scaffold development environment templates",
   "repository": {
     "type": "git",
@@ -60,7 +60,7 @@
     "test": "vitest",
     "test:run": "vitest run",
     "test:coverage": "vitest run --coverage",
-    "check": "npm run format:check && npm run lint && npm run build && npm run test:run && npm run docs:check",
+    "check": "npm run format:check && npm run lint && npm run typecheck && npm run build && npm run test:run && npm run docs:check",
     "docs": "npx tsx scripts/generate-readme.ts",
     "docs:check": "npx tsx scripts/generate-readme.ts --check"
   }

package/dist/hash-DonjAgHQ.mjs

@@ -1,3 +0,0 @@
-import { a as hashContent, o as hashFiles } from "./index.mjs";
-
-export { hashFiles };

package/dist/merge-DFEjeYIq.mjs

@@ -1,3 +0,0 @@
-import { i as threeWayMerge, n as hasConflictMarkers, r as mergeJsonContent, t as classifyFiles } from "./index.mjs";
-
-export { classifyFiles, threeWayMerge };

package/dist/modules-DkQe-r1d.mjs

@@ -1,3 +0,0 @@
-import { C as modulesFileExists, S as loadModulesFile, _ as getModuleById, b as addPatternToModulesFileWithCreate, g as defaultModules, v as getPatternsByModuleIds, w as saveModulesFile, x as getModulesFilePath, y as addPatternToModulesFile } from "./index.mjs";
-
-export { getModuleById };

package/dist/patterns-C3oCRYgX.mjs

@@ -1,3 +0,0 @@
-import { h as resolvePatterns, m as matchesPatterns, p as getEffectivePatterns } from "./index.mjs";
-
-export { getEffectivePatterns };

package/dist/template-BLwXZEZq.mjs

@@ -1,3 +0,0 @@
-import { c as buildTemplateSource, d as fetchTemplates, f as writeFileWithStrategy, l as copyFile, s as TEMPLATE_SOURCE, u as downloadTemplateToTemp } from "./index.mjs";
-
-export { downloadTemplateToTemp };