startx 1.1.3 → 1.1.5

package/_gitignore

@@ -12,6 +12,9 @@ node_modules
 .env.test.local
 .env.production.local
 
+# Frontend
+.react-router
+
 # Testing
 coverage
 

package/apps/core-server/Dockerfile

@@ -14,7 +14,7 @@ COPY --parents packages/*/package.json ./
 COPY --parents packages/*/*/package.json ./
 COPY --parents configs/*/package.json ./
 
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store,sharing=locked \
     pnpm install --frozen-lockfile
 
 COPY apps/core-server/ ./apps/core-server/
@@ -24,7 +24,7 @@ COPY assets ./assets
 COPY turbo.json ./
 
 # Build the required packages with Turbo cache mounted
-RUN --mount=type=cache,id=turbo,target=/app/.turbo/cache \
+RUN --mount=type=cache,id=turbo,target=/app/.turbo/cache,sharing=locked \
     pnpm build --filter=core-server
 
 # --- Final production image ---

package/apps/core-server/package.json

@@ -32,8 +32,7 @@
 		"country-state-city": "catalog:",
 		"express": "catalog:",
 		"express-fileupload": "catalog:",
-		"express-list-endpoints": "catalog:",
-		"morgan": "catalog:"
+		"express-list-endpoints": "catalog:"
 	},
 	"devDependencies": {
 		"@types/cookie-parser": "catalog:",

package/apps/core-server/src/middlewares/logger-middleware.ts

@@ -1,81 +1,42 @@
+import { ENV } from "@repo/env";
 import { logger } from "@repo/logger";
-import type { Request, Response } from "express";
-import morgan from "morgan";
+import type { NextFunction, Request, Response } from "express";
 
-const jsonFormat = (tokens: morgan.TokenIndexer, req: Request, res: Response) => {
-	const method = tokens.method(req, res) || "-";
-	const url = tokens.url(req, res) || "-";
-	const status = Number(tokens.status(req, res) || 0);
-	const responseTime = tokens["response-time"](req, res) ?? "-";
-	const ip =
-		(req.ip as string) || (req.headers["x-forwarded-for"] as string) || req.socket?.remoteAddress;
-	const user = req.user ? { id: req.user.id, email: req.user.email } : null;
+const SKIPPED_PREFIXES = ["/static", "/_next"];
 
-	return JSON.stringify({
-		method,
-		url,
-		status,
-		responseTimeMs: responseTime,
-		user,
-		ip,
-		ts: new Date().toISOString(),
-	});
-};
+const shouldSkip = (path: string) => path === "/health" || SKIPPED_PREFIXES.some(prefix => path.startsWith(prefix));
 
-const safeLog = (
-	level: "info" | "warn" | "error",
-	message: string,
-	meta?: Record<string, unknown>
-) => {
-	const lg = logger;
-	if (typeof lg.log === "function") {
-		lg.log({ level, message, msg: message, ...meta });
-		return;
-	}
-	const fn = lg[level];
-	if (typeof fn === "function") {
-		fn(message, meta);
+const resolveIp = (req: Request) =>
+	req.ip || (req.headers["x-forwarded-for"] as string | undefined) || req.socket?.remoteAddress || "-";
+
+const levelForStatus = (status: number) => (status >= 500 ? "error" : status >= 400 ? "warn" : "http");
+
+const loggerMiddleware = (req: Request, res: Response, next: NextFunction) => {
+	if (shouldSkip(req.path) || ENV.LOG_LEVEL !== "debug") {
+		next();
 		return;
 	}
-	// fallback
-	if (level && console[level]) {
-		console[level]?.(message, meta ?? {});
-	} else console.warn(message, meta ?? {});
-};
 
-const loggerStream = {
-	write: (message: string) => {
-		const trimmed = message.trim();
-		if (!trimmed) return;
-		try {
-			const meta = JSON.parse(trimmed) as {
-				method: string;
-				url: string;
-				status: number;
-				responseTimeMs: string | number;
-				user?: { id: string; email: string } | null;
-				ip?: string;
-				ts?: string;
-			};
-			const level = meta.status >= 500 ? "error" : meta.status >= 400 ? "warn" : "info";
-			safeLog(level, "http_request", {
-				...meta,
-				logType: "routeInfo",
-			});
-		} catch (err) {
-			console.error(err);
-			safeLog("info", "http_request_parse_error", { raw: trimmed, logType: "routeInfo" });
-		}
-	},
-};
+	const startedAt = process.hrtime.bigint();
+
+	res.on("finish", () => {
+		const { method, originalUrl: url } = req;
+		const { statusCode: status } = res;
+		const responseTimeMs = Number(process.hrtime.bigint() - startedAt) / 1e6;
+		const user = req.user ? { id: req.user.id, email: req.user.email } : null;
 
-const loggerMiddleware = morgan(jsonFormat as any, {
-	skip: (req: Request) => {
-		return (
-			req.path === "/health" || req.path.startsWith("/static") || req.path.startsWith("/_next")
-		);
-	},
-	stream: loggerStream,
-});
+		logger.log(levelForStatus(status), `${method} ${url} ${status} - ${responseTimeMs.toFixed(1)}ms`, {
+			logType: "routeInfo",
+			method,
+			url,
+			status,
+			responseTimeMs: Number(responseTimeMs.toFixed(1)),
+			ip: resolveIp(req),
+			user,
+		});
+	});
+
+	next();
+};
 
 export { loggerMiddleware };

package/apps/queue-worker/Dockerfile

@@ -14,7 +14,7 @@ COPY --parents packages/*/package.json ./
 COPY --parents packages/*/*/package.json ./
 COPY --parents configs/*/package.json ./
 
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store,sharing=locked \
     pnpm install --frozen-lockfile
 
 COPY apps/queue-worker/ ./apps/queue-worker/
@@ -24,7 +24,7 @@ COPY assets ./assets
 COPY turbo.json ./
 
 # Build the required packages with Turbo cache mounted
-RUN --mount=type=cache,id=turbo,target=/app/.turbo/cache \
+RUN --mount=type=cache,id=turbo,target=/app/.turbo/cache,sharing=locked \
     pnpm build --filter=queue-worker
 
 # --- Final production image ---

package/apps/startx-cli/dist/index.mjs

@@ -215,7 +215,7 @@ $&`).replace(/(?:^|\n)([\t ].*)(?:([\n\t ]*)\n(?![\n\t ]))?/g,`$1$2`).replace(/\
 `+t:``),o=Math.floor(n.length/i)-this.cursorPos.rows+(t?Cx(t):0);o>0&&(a+=vx(o)),a+=bx(this.cursorPos.cols),this.write(yx(this.extraLinesUnderPrompt)+Sx(this.height)+a),this.extraLinesUnderPrompt=o,this.height=Cx(a)}checkCursorPos(){let e=this.rl.getCursorPos();e.cols!==this.cursorPos.cols&&(this.write(bx(e.cols)),this.cursorPos=e)}done({clearContent:e}){this.rl.setPrompt(``);let t=yx(this.extraLinesUnderPrompt);t+=e?Sx(this.height):`
 `,t+=`\x1B[?25h`,this.write(t),this.rl.close()}},Ex=class extends Promise{static withResolver(){let e,t;return{promise:new Promise((n,r)=>{e=n,t=r}),resolve:e,reject:t}}},Dx=x(nx(),1);const Ox=globalThis.setImmediate;function kx(){let e=Error.prepareStackTrace,t=[];try{Error.prepareStackTrace=(e,n)=>{let r=n.slice(1);return t=r,r},Error().stack}catch{return t}return Error.prepareStackTrace=e,t}function Ax(e){let t=kx();return(n,r={})=>{let{input:i=process.stdin,signal:a}=r,o=new Set,s=new Dx.default;s.pipe(r.output??process.stdout),s.mute();let l=d.createInterface({terminal:!0,input:i,output:s}),u=new Tx(l),{promise:f,resolve:p,reject:m}=Ex.withResolver(),h=()=>m(new Yy);if(a){let e=()=>m(new Jy({cause:a.reason}));if(a.aborted)return e(),Object.assign(f,{cancel:h});a.addEventListener(`abort`,e),o.add(()=>a.removeEventListener(`abort`,e))}o.add(mx((e,t)=>{m(new Xy(`User force closed the prompt with ${e} ${t}`))}));let g=()=>m(new Xy(`User force closed the prompt with SIGINT`));return l.on(`SIGINT`,g),o.add(()=>l.removeListener(`SIGINT`,g)),tb(l,a=>{let d=c.bind(()=>sb.clearAll());l.on(`close`,d),o.add(()=>l.removeListener(`close`,d));let g=()=>{let r=()=>u.checkCursorPos();l.input.on(`keypress`,r),o.add(()=>l.input.removeListener(`keypress`,r)),a(()=>{try{let r=e(n,e=>{setImmediate(()=>p(e))});if(r===void 0){let e=t[1]?.getFileName();throw Error(`Prompt functions must return a string.\n    at ${e}`)}let[i,a]=typeof r==`string`?[r]:r;u.render(i,a),sb.run()}catch(e){m(e)}})};return`readableFlowing`in i?Ox(g):g(),Object.assign(f.then(e=>(sb.clearAll(),e),e=>{throw sb.clearAll(),e}).finally(()=>{o.forEach(e=>e()),u.done({clearContent:!!r.clearPromptOnDone}),s.end()}).then(()=>f),{cancel:h})})}}var jx=class{separator=u(`dim`,Array.from({length:15}).join(gb.line));type=`separator`;constructor(e){e&&(this.separator=e)}static isSeparator(e){return!!(e&&typeof e==`object`&&`type`in e&&e.type===`separator`)}};const Mx={icon:{checked:u(`green`,gb.circleFilled),unchecked:gb.circle,cursor:gb.pointer,disabledChecked:u(`green`,gb.circleDouble),disabledUnchecked:`-`},style:{disabled:e=>u(`dim`,e),renderSelectedChoices:e=>e.map(e=>e.short).join(`, `),description:e=>u(`cyan`,e),keysHelpTip:e=>e.map(([e,t])=>`${u(`bold`,e)} ${u(`dim`,t)}`).join(u(`dim`,` • `))},i18n:{disabledError:`This option is disabled and cannot be toggled.`},keybindings:[]};function Nx(e){return!jx.isSeparator(e)&&!e.disabled}function Px(e){return!jx.isSeparator(e)}function Fx(e){return!jx.isSeparator(e)&&e.checked}function Ix(e){return Nx(e)?{...e,checked:!e.checked}:e}function Lx(e){return function(t){return Nx(t)?{...t,checked:e}:t}}function Rx(e){return e.map(e=>{if(jx.isSeparator(e))return e;if(typeof e==`string`)return{value:e,name:e,short:e,checkedName:e,disabled:!1,checked:!1};let t=e.name??String(e.value),n={value:e.value,name:t,short:e.short??t,checkedName:e.checkedName??t,disabled:e.disabled??!1,checked:e.checked??!1};return e.description&&(n.description=e.description),n})}var zx=Ax((e,t)=>{let{pageSize:n=7,loop:r=!0,required:i,validate:a=()=>!0}=e,o={all:`a`,invert:`i`,...e.shortcuts},s=bb(Mx,e.theme),{keybindings:c}=s,[l,u]=cb(`idle`),d=xb({status:l,theme:s}),[f,p]=cb(Rx(e.choices)),m=Sb(()=>{let e=f.findIndex(Px),t=f.findLastIndex(Px);if(e===-1)throw new Qy(`[checkbox prompt] No selectable choices. All choices are disabled.`);return{first:e,last:t}},[f]),[h,g]=cb(m.first),[_,v]=cb();wb(async e=>{if(qy(e)){let e=f.filter(Fx),n=await a([...e]);i&&!e.length?v(`At least one choice must be selected`):n===!0?(u(`done`),t(e.map(e=>e.value))):v(n||`You must select a valid value`)}else if(Vy(e,c)||Hy(e,c)){if(_&&v(void 0),r||Vy(e,c)&&h!==m.first||Hy(e,c)&&h!==m.last){let t=Vy(e,c)?-1:1,n=h;do n=(n+t+f.length)%f.length;while(!Px(f[n]));g(n)}}else if(Uy(e)){let e=f[h];e&&!jx.isSeparator(e)&&(e.disabled?v(s.i18n.disabledError):(v(void 0),p(f.map((e,t)=>t===h?Ix(e):e))))}else if(e.name===o.all){let e=f.some(e=>Nx(e)&&!e.checked);p(f.map(Lx(e)))}else if(e.name===o.invert)p(f.map(Ix));else if(Ky(e)){let t=Number(e.name)-1,n=-1,r=f.findIndex(e=>jx.isSeparator(e)?!1:(n++,n===t)),i=f[r];i&&Nx(i)&&(g(r),p(f.map((e,t)=>t===r?Ix(e):e)))}});let y=s.style.message(e.message,l),b,x=tx({items:f,active:h,renderItem({item:e,isActive:t}){if(jx.isSeparator(e))return` ${e.separator}`;let n=t?s.icon.cursor:` `;if(e.disabled){let t=typeof e.disabled==`string`?e.disabled:`(disabled)`,r=e.checked?s.icon.disabledChecked:s.icon.disabledUnchecked;return s.style.disabled(`${n}${r} ${e.name} ${t}`)}t&&(b=e.description);let r=e.checked?s.icon.checked:s.icon.unchecked,i=e.checked?e.checkedName:e.name;return(t?s.style.highlight:e=>e)(`${n}${r} ${i}`)},pageSize:n,loop:r});if(l===`done`){let e=f.filter(Fx);return[d,y,s.style.answer(s.style.renderSelectedChoices(e,f))].filter(Boolean).join(` `)}let S=[[`↑↓`,`navigate`],[`space`,`select`]];o.all&&S.push([o.all,`all`]),o.invert&&S.push([o.invert,`invert`]),S.push([`⏎`,`submit`]);let C=s.style.keysHelpTip(S);return`${[[d,y].filter(Boolean).join(` `),x,` `,b?s.style.description(b):``,_?s.style.error(_):``,C].filter(Boolean).join(`
 `).trimEnd()}${_x}`});function Bx(e,t){let n=t!==!1;return/^(y|yes)/i.test(e)?n=!0:/^(n|no)/i.test(e)&&(n=!1),n}function Vx(e){return e?`Yes`:`No`}var Hx=Ax((e,t)=>{let{transformer:n=Vx}=e,[r,i]=cb(`idle`),[a,o]=cb(``),s=bb(e.theme),c=xb({status:r,theme:s});wb((s,c)=>{if(r===`idle`)if(qy(s)){let r=Bx(a,e.default);o(n(r)),i(`done`),t(r)}else if(Gy(s)){let t=Vx(!Bx(a,e.default));c.clearLine(0),c.write(t),o(t)}else o(c.line)});let l=a,u=``;return r===`done`?l=s.style.answer(a):u=` ${s.style.defaultAnswer(e.default===!1?`y/N`:`Y/n`)}`,`${c} ${s.style.message(e.message,r)}${u} ${l}`});const Ux={validationFailureMode:`keep`};var Wx=Ax((e,t)=>{let{prefill:n=`tab`}=e,r=bb(Ux,e.theme),[i,a]=cb(`idle`),[o,s]=cb(String(e.default??``)),[c,l]=cb(),[u,d]=cb(``),f=xb({status:i,theme:r});async function p(t){let{required:n,pattern:r,patternError:i=`Invalid input`}=e;return n&&!t?`You must provide a value`:r&&!r.test(t)?i:typeof e.validate==`function`?await e.validate(t)||`You must provide a valid value`:!0}wb(async(e,n)=>{if(i===`idle`)if(qy(e)){let e=u||o;a(`loading`);let i=await p(e);i===!0?(d(e),a(`done`),t(e)):(r.validationFailureMode===`clear`?d(``):n.write(u),l(i),a(`idle`))}else Wy(e)&&!u?s(``):Gy(e)&&!u?(s(``),n.clearLine(0),n.write(o),d(o)):(d(n.line),l(void 0))}),lb(e=>{n===`editable`&&o&&(e.write(o),d(o))},[]);let m=r.style.message(e.message,i),h=u;typeof e.transformer==`function`?h=e.transformer(u,{isFinal:i===`done`}):i===`done`&&(h=r.style.answer(u));let g;o&&i!==`done`&&!u&&(g=r.style.defaultAnswer(o));let _=``;return c&&(_=r.style.error(c)),[[f,m,g,h].filter(e=>e!==void 0).join(` `),_]});const Gx={icon:{cursor:gb.pointer},style:{disabled:e=>u(`dim`,e),description:e=>u(`cyan`,e),keysHelpTip:e=>e.map(([e,t])=>`${u(`bold`,e)} ${u(`dim`,t)}`).join(u(`dim`,` • `))},i18n:{disabledError:`This option is disabled and cannot be selected.`},indexMode:`hidden`,keybindings:[]};function Kx(e){return!jx.isSeparator(e)&&!e.disabled}function qx(e){return!jx.isSeparator(e)}function Jx(e){return e.map(e=>{if(jx.isSeparator(e))return e;if(typeof e!=`object`||!e||!(`value`in e)){let t=String(e);return{value:e,name:t,short:t,disabled:!1}}let t=e.name??String(e.value),n={value:e.value,name:t,short:e.short??t,disabled:e.disabled??!1};return e.description&&(n.description=e.description),n})}var Yx=Ax((e,t)=>{let{loop:n=!0,pageSize:r=7}=e,i=bb(Gx,e.theme),{keybindings:a}=i,[o,s]=cb(`idle`),c=xb({status:o,theme:i}),l=Cb(),u=!a.includes(`vim`),d=Sb(()=>Jx(e.choices),[e.choices]),f=Sb(()=>{let e=d.findIndex(qx),t=d.findLastIndex(qx);if(e===-1)throw new Qy(`[select prompt] No selectable choices. All choices are disabled.`);return{first:e,last:t}},[d]),p=Sb(()=>`default`in e?d.findIndex(t=>Kx(t)&&t.value===e.default):-1,[e.default,d]),[m,h]=cb(p===-1?f.first:p),g=d[m],[_,v]=cb();wb((e,r)=>{if(clearTimeout(l.current),_&&v(void 0),qy(e))g.disabled?v(i.i18n.disabledError):(s(`done`),t(g.value));else if(Vy(e,a)||Hy(e,a)){if(r.clearLine(0),n||Vy(e,a)&&m!==f.first||Hy(e,a)&&m!==f.last){let t=Vy(e,a)?-1:1,n=m;do n=(n+t+d.length)%d.length;while(!qx(d[n]));h(n)}}else if(Ky(e)&&!Number.isNaN(Number(r.line))){let e=Number(r.line)-1,t=-1,n=d.findIndex(n=>jx.isSeparator(n)?!1:(t++,t===e)),i=d[n];i!=null&&Kx(i)&&h(n),l.current=setTimeout(()=>{r.clearLine(0)},700)}else if(Wy(e))r.clearLine(0);else if(u){let e=r.line.toLowerCase(),t=d.findIndex(t=>jx.isSeparator(t)||!Kx(t)?!1:t.name.toLowerCase().startsWith(e));t!==-1&&h(t),l.current=setTimeout(()=>{r.clearLine(0)},700)}}),lb(()=>()=>{clearTimeout(l.current)},[]);let y=i.style.message(e.message,o),b=i.style.keysHelpTip([[`↑↓`,`navigate`],[`⏎`,`select`]]),x=0,S=tx({items:d,active:m,renderItem({item:e,isActive:t,index:n}){if(jx.isSeparator(e))return x++,` ${e.separator}`;let r=t?i.icon.cursor:` `,a=i.indexMode===`number`?`${n+1-x}. `:``;if(e.disabled){let n=typeof e.disabled==`string`?e.disabled:`(disabled)`,r=t?i.icon.cursor:`-`;return i.style.disabled(`${r} ${a}${e.name} ${n}`)}return(t?i.style.highlight:e=>e)(`${r} ${a}${e.name}`)},pageSize:r,loop:n});if(o===`done`)return[c,y,i.style.answer(g.short)].filter(Boolean).join(` `);let{description:C}=g;return`${[[c,y].filter(Boolean).join(` `),S,` `,C?i.style.description(C):``,_?i.style.error(_):``,b].filter(Boolean).join(`
-`).trimEnd()}${_x}`}),Xx=class{static async confirm(e){return await Hx({message:e.message,default:e.default})}static async getText(e){let{message:t,schema:n,default:r}=e,i;if(n&&r!==void 0){let e=n.safeParse(r);e.success&&(i=e.data)}else !n&&r!==void 0&&(i=r);if(n&&n instanceof Tf)return await Yx({message:t,choices:n.options.map(e=>({value:e})),default:i});let a=await Wx({message:t,default:i,validate:e=>{if(!n)return!0;let t=e;if(n instanceof Sd){if(e.trim()===``)return`Input cannot be empty`;let n=Number(e);if(Number.isNaN(n))return`Please enter a valid number`;t=n}let r=n.safeParse(t);return r.success?!0:r.error.issues[0]?.message??`Invalid input`}});if(!n)return a;let o=n instanceof Sd?Number(a):a;return n.parse(o)}static async choose(e){let{message:t,options:n,mode:r=`single`,default:i,includeAllOption:a=!1,required:o=!1}=e,s=`__all__`,c=r===`single`?[i]:[...i||[]],l=[...r===`multiple`&&a?[{name:`All`,value:s,checked:c.includes(s)}]:[],...n.map(e=>({name:e,value:e,checked:c.includes(e)}))];if(r===`multiple`){let e=await zx({message:t,choices:l,validate:e=>o&&e.length===0?`You must select at least one option.`:!0});return a&&e.includes(s)?n:e}return await Yx({message:t,choices:n.map(e=>({name:e,value:e})),default:typeof i==`string`?i:void 0})}},Zx=class e{static command=new dv(`init`).argument(`[projectName]`).option(`-d, --dir <path>`,`workspace directory`).action(e.run.bind(e));static async run(e,t){let n=await Iy.getPackageList(),r=n.filter(e=>e.type===`apps`&&e.packageJson?.startx?.mode!==`silent`),i=await this.getPrefs({projectName:e,options:t,projects:r}),a=n.filter(e=>e.type!==`apps`);await this.checkTargetDirectory(i.directory.workspace);let o=await this.getConfigPrefs({selectedApps:i.selectedApps,packages:a}),s=await this.getPackagesPrefs({selectedPackages:o.selectedConfigs,packages:a,tags:o.gTags}),c=[...s.gTags,`runnable`];await this.installWorkspace({name:i.projectName,tags:c,dir:i.directory});let l=[...s.selectedPackages,...i.selectedApps];await Promise.all(l.map(async e=>{let t={},n=new Set(s.gTags);e.packageJson?.startx?.mode===`standalone`&&n.add(`runnable`),e.type===`apps`&&(n.add(`runnable`),s.selectedPackages.filter(t=>t.type!==`packages`||t.packageJson?.startx?.mode===`standalone`?!1:t.packageJson?.startx?.iTags?.every(t=>e.packageJson?.startx?.gTags?.includes(t))).forEach(e=>{let n=e.packageJson?.name||e.name;t[n]=`workspace:^`})),await this.installPackage({pkg:e,directory:i.directory,tags:Array.from(n),dependencies:t})}))}static async getPrefs(e){let n=await Xx.getText({message:`Project name`,name:`projectName`,default:e.projectName,schema:Vp.string().min(1,`Package name is required`).max(214,`Package name too long`).regex(/^(?:@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/,`Invalid package name`)});if(e.projects.length===0)throw Error(`No apps found to install.`);let r=Iy.getDirectory(),i=e.options.dir?t.resolve(r.workspace,e.options.dir):t.join(r.workspace,n),a=await Xx.choose({message:`Select apps to install`,options:e.projects.map(e=>e.name),includeAllOption:!0,mode:`multiple`,required:!0});return{projectName:n,directory:{workspace:i,template:r.template},selectedApps:e.projects.filter(e=>a.includes(e.name))}}static async getConfigPrefs(e){let t=new Set([`common`]),n=new Map;this.getGlobalTags({pkgs:e.selectedApps}).forEach(e=>t.add(e)),this.getPackageDeps({allPkgs:e.packages,pkgs:e.selectedApps}).forEach(e=>n.set(e.name,e));let r=e.packages.filter(e=>e.type!==`configs`||e.packageJson?.startx?.mode===`silent`||n.has(e.name)?!1:e.packageJson?.startx?.iTags?.every(e=>t.has(e))??!0);if(r.length>0){let e=await Xx.choose({message:`Select configs to install`,options:r.map(e=>e.name),includeAllOption:!0,mode:`multiple`,required:!1});r.filter(t=>e.includes(t.name)).forEach(e=>n.set(e.name,e))}return t.has(`node`)&&(await Xx.choose({message:`Select formatter`,options:[`prettier + biome`,`prettier`],mode:`single`,default:`prettier`,required:!0})===`prettier`||t.add(`biome`),t.add(`prettier`)),this.getPackageDeps({allPkgs:e.packages,pkgs:Array.from(n.values())}).forEach(e=>n.set(e.name,e)),this.getGlobalTags({pkgs:Array.from(n.values())}).forEach(e=>t.add(e)),{gTags:Array.from(t),selectedConfigs:Array.from(n.values())}}static async getPackagesPrefs(e){let t=new Set(e.tags),n=new Map(e.selectedPackages.map(e=>[e.name,e])),r=e.packages.filter(e=>e.type!==`packages`||e.packageJson?.startx?.mode===`silent`||n.has(e.name)?!1:e.packageJson?.startx?.iTags?.every(e=>t.has(e))??!1);if(r.length>0){let e=await Xx.choose({message:`Select packages to install`,options:r.map(e=>e.name),includeAllOption:!0,mode:`multiple`,required:!1});r.filter(t=>e.includes(t.name)).forEach(e=>n.set(e.name,e))}return this.getPackageDeps({allPkgs:e.packages,pkgs:Array.from(n.values())}).forEach(e=>n.set(e.name,e)),this.getGlobalTags({pkgs:Array.from(n.values())}).forEach(e=>t.add(e)),{gTags:Array.from(t),selectedPackages:Array.from(n.values())}}static async installPackage(e){if(!e.pkg.packageJson)throw Error(`Missing package.json for ${e.pkg.name}`);let n=new Set([...e.tags,...e.pkg.packageJson.startx?.tags||[]]),r=e.pkg.packageJson.startx?.ignore||[];r.includes(`eslint-config`)&&n.delete(`eslint`),r.includes(`vitest-config`)&&n.delete(`vitest`);let{packageJson:i,isWorkspace:a}=By.handlePackageJson({app:e.pkg.packageJson,tags:Array.from(n),name:e.packageName||e.pkg.packageJson.name||e.pkg.name,dependencies:e.dependencies});if(a)throw Error(`Cannot install workspace as a package: ${e.pkg.name}`);let o=t.join(e.directory.workspace,e.pkg.relativePath),s=t.join(e.pkg.path);await Ny.writeJSONFile({dir:o,file:`package`,content:i}),await this.copyValidatedFilesFromFolder(s,o,n),await Ny.copyDirectory({from:t.join(s,`src`),to:t.join(o,`src`),exclude:n.has(`vitest`)?void 0:/\.test\.tsx?$/}),Z_.info(`Successfully installed ${e.pkg.name}`)}static async installWorkspace(e){let t=await Iy.parsePackageJson({dir:e.dir.template}),n=await Iy.parsePackageJson({dir:e.dir.template,file:`startx`});if(!t)throw Error(`Failed to parse root package.json`);t.dependencies={...t.dependencies,...n?.dependencies||{}},t.devDependencies={...t.devDependencies,...n?.devDependencies||{}};let{packageJson:r}=By.handlePackageJson({app:t,tags:[`root`,...e.tags],name:e.name});await Ny.writeJSONFile({dir:e.dir.workspace,file:`package`,content:r}),await this.copyValidatedFilesFromFolder(e.dir.template,e.dir.workspace,new Set([`root`,...e.tags])),await this.writeVscodeSettings({workspace:e.dir.workspace,tags:e.tags})}static async writeVscodeSettings(e){let n=e.tags.includes(`biome`),r=t.join(e.workspace,`.vscode`),i={"editor.formatOnSave":!0,"editor.defaultFormatter":n?`biomejs.biome`:`esbenp.prettier-vscode`,"editor.codeActionsOnSave":{...n?{"source.organizeImports.biome":`explicit`,"source.fixAll.biome":`explicit`}:{},"source.fixAll.eslint":`explicit`,"source.fixAll":`explicit`},"eslint.workingDirectories":[{mode:`auto`}]},a={recommendations:[`dbaeumer.vscode-eslint`,...n?[`biomejs.biome`]:[`esbenp.prettier-vscode`]]};await Promise.all([Ny.writeJSONFile({dir:r,file:`settings`,content:i}),Ny.writeJSONFile({dir:r,file:`extensions`,content:a})])}static async checkTargetDirectory(e){let[t,n]=await Promise.all([Ny.listFiles({dir:e}),Ny.listDirectories({dir:e})]);if(!(t.length===0&&n.length===0)&&!await Xx.confirm({message:`Directory "${e}" already exists and is not empty. Overwrite?`,default:!1}))throw Error(`Aborted: target directory already exists.`)}static getPackageDeps(e){let t=new Map(e.pkgs.map(e=>[e.name,e]));return Array.from(t.values()).forEach(n=>{[...n.packageJson?.startx?.requiredDeps||[],...n.packageJson?.startx?.requiredDevDeps||[]].forEach(n=>{let r=e.allPkgs.find(e=>e.packageJson?.name===n);r&&t.set(r.name,r)})}),e.pkgs.forEach(e=>t.delete(e.name)),Array.from(t.values())}static getGlobalTags(e){let t=new Set(e.gTags||[]);return e.pkgs.forEach(e=>{e.packageJson?.startx?.gTags?.forEach(e=>t.add(e))}),Array.from(t)}static async copyValidatedFilesFromFolder(e,n,r){let i=await Ny.listFiles({dir:e}).catch(()=>[]);for(let a of i){let i=Py[a];if(i&&!i.tags.every(e=>r.has(e)))continue;let o=a===`_gitignore`?`.gitignore`:a;try{await Ny.copyFile({from:t.join(e,a),to:t.join(n,o)})}catch(e){Z_.error(`Failed to copy file ${a}:`,e)}}}};const Qx=Vp.string().min(1,`Package name is required`).max(214,`Package name too long`).regex(/^(?:@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/,`Invalid package name`);var $x=class e{static command=new dv(`package`).alias(`pkg`).description(`List and add packages in the current monorepo.`).addCommand(new dv(`list`).alias(`ls`).description(`List packages available from the StartX template.`).action(e.list.bind(e))).addCommand(new dv(`add`).description(`Add an existing StartX app or package, optionally with a new name.`).argument(`[packageName]`).option(`-n, --name <name>`,`override the name for the added package`).option(`--eslint`,`enable ESLint support for the added package`).option(`--no-eslint`,`skip ESLint support for the added package`).option(`--no-install`,`do not run the package manager after updating dependencies`).action(e.add.bind(e))).addCommand(new dv(`new`).alias(`create`).description(`Create a new package from scratch.`).argument(`[packageName]`).option(`-d, --dir <path>`,`package directory relative to the current workspace`).option(`--eslint`,`enable ESLint support for the new package`).option(`--no-eslint`,`skip ESLint support for the new package`).option(`--no-install`,`do not run the package manager after updating ESLint`).action(e.create.bind(e)));static async list(){let e=await Iy.getPackageList(),t=new Map;for(let n of e){let e=t.get(n.type)??[];e.push(n),t.set(n.type,e)}for(let e of[`apps`,`packages`,`configs`]){let n=t.get(e)??[];if(n.length!==0){Z_.info(`${e}:`);for(let e of n.sort((e,t)=>e.name.localeCompare(t.name)))Z_.info(`  ${e.name} (${e.relativePath})`)}}}static async add(e,t){let n=await Iy.getPackageList(),r=n.filter(e=>e.packageJson?.startx?.mode!==`silent`),i=e??await Xx.choose({message:`Select app or package to add`,options:r.map(e=>e.name),mode:`single`,required:!0}),a=this.findPackage(n,i);if(!a)throw Error(`Package "${i}" was not found in the StartX template.`);let o=a.packageJson?.name??a.name,s=t.name??await Xx.getText({message:`Name for the new package (leave unchanged to keep the original)`,name:`overrideName`,default:o,schema:Qx}),c=Iy.getDirectory(),l=await this.resolveEslintPreference(t),u=this.resolvePackageClosure({packages:n,selectedPackage:a,includeEslintConfig:l}),d=await this.getInstallTags({workspace:c.workspace,packages:u,eslintEnabled:l});await this.checkAndInstallMissingDeps({workspace:c.workspace,tags:d,install:t.install});for(let e of u){let t=e.name===a.name;await this.installTemplatePackage({pkg:e,directory:c,tags:d,overrideName:t?s:void 0,overrideRelativePath:t?this.getDestinationPath(e.relativePath,s):void 0})}Z_.info("Done! Run `pnpm install` to link the new package.")}static async create(e,n){let r=await Xx.getText({message:`Package name`,name:`packageName`,default:e,schema:Qx}),i=Iy.getDirectory(),a=n.dir?t.resolve(i.workspace,n.dir):t.resolve(i.workspace,this.getDefaultPackagePath(r));if(await this.pathExists(a))throw Error(`Package directory already exists: ${a}`);let s=await this.readRootPackage(i.workspace),c=await this.resolveEslintPreference(n),l=this.hasDependency(s,`vitest`),u=await Iy.getPackageList();await this.ensureTemplatePackage({packages:u,name:`typescript-config`,directory:i,tags:[`common`,`node`]}),c&&await this.ensureTemplatePackage({packages:u,name:`eslint-config`,directory:i,tags:[`common`,`node`,`eslint`]}),l&&await this.ensureTemplatePackage({packages:u,name:`vitest-config`,directory:i,tags:[`common`,`node`,`vitest`]}),await o.mkdir(t.join(a,`src`),{recursive:!0}),await this.writeJson(t.join(a,`package.json`),this.createPackageJson({name:r,eslintEnabled:c,vitestEnabled:l})),await o.writeFile(t.join(a,`tsconfig.json`),`${JSON.stringify({extends:`typescript-config/tsconfig.node.json`,compilerOptions:{moduleResolution:`bundler`,module:`esnext`,target:`es2022`},include:[`src/**/*.ts`]},null,2)}\n`),await o.writeFile(t.join(a,`src`,`index.ts`),`export {};
+`).trimEnd()}${_x}`}),Xx=class{static async confirm(e){return await Hx({message:e.message,default:e.default})}static async getText(e){let{message:t,schema:n,default:r}=e,i;if(n&&r!==void 0){let e=n.safeParse(r);e.success&&(i=e.data)}else !n&&r!==void 0&&(i=r);if(n&&n instanceof Tf)return await Yx({message:t,choices:n.options.map(e=>({value:e})),default:i});let a=await Wx({message:t,default:i,validate:e=>{if(!n)return!0;let t=e;if(n instanceof Sd){if(e.trim()===``)return`Input cannot be empty`;let n=Number(e);if(Number.isNaN(n))return`Please enter a valid number`;t=n}let r=n.safeParse(t);return r.success?!0:r.error.issues[0]?.message??`Invalid input`}});if(!n)return a;let o=n instanceof Sd?Number(a):a;return n.parse(o)}static async choose(e){let{message:t,options:n,mode:r=`single`,default:i,includeAllOption:a=!1,required:o=!1}=e,s=`__all__`,c=r===`single`?[i]:[...i||[]],l=[...r===`multiple`&&a?[{name:`All`,value:s,checked:c.includes(s)}]:[],...n.map(e=>({name:e,value:e,checked:c.includes(e)}))];if(r===`multiple`){let e=await zx({message:t,choices:l,validate:e=>o&&e.length===0?`You must select at least one option.`:!0});return a&&e.includes(s)?n:e}return await Yx({message:t,choices:n.map(e=>({name:e,value:e})),default:typeof i==`string`?i:void 0})}},Zx=class e{static command=new dv(`init`).argument(`[projectName]`).option(`-d, --dir <path>`,`workspace directory`).action(e.run.bind(e));static async run(e,t){let n=await Iy.getPackageList(),r=n.filter(e=>e.type===`apps`&&e.packageJson?.startx?.mode!==`silent`),i=await this.getPrefs({projectName:e,options:t,projects:r}),a=n.filter(e=>e.type!==`apps`);await this.checkTargetDirectory(i.directory.workspace);let o=await this.getConfigPrefs({selectedApps:i.selectedApps,packages:a}),s=await this.getPackagesPrefs({selectedPackages:o.selectedConfigs,packages:a,tags:o.gTags}),c=[...s.gTags,`runnable`];await this.installWorkspace({name:i.projectName,tags:c,dir:i.directory});let l=[...s.selectedPackages,...i.selectedApps];await Promise.all(l.map(async e=>{let t={},n=new Set(s.gTags);e.packageJson?.startx?.mode===`standalone`&&n.add(`runnable`),e.type===`apps`&&(n.add(`runnable`),s.selectedPackages.filter(t=>t.type!==`packages`||t.packageJson?.startx?.mode===`standalone`?!1:t.packageJson?.startx?.iTags?.every(t=>e.packageJson?.startx?.gTags?.includes(t))).forEach(e=>{let n=e.packageJson?.name||e.name;t[n]=`workspace:^`})),await this.installPackage({pkg:e,directory:i.directory,tags:Array.from(n),dependencies:t})}))}static async getPrefs(e){let n=await Xx.getText({message:`Project name`,name:`projectName`,default:e.projectName,schema:Vp.string().min(1,`Package name is required`).max(214,`Package name too long`).regex(/^(?:@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/,`Invalid package name`)});if(e.projects.length===0)throw Error(`No apps found to install.`);let r=Iy.getDirectory(),i=e.options.dir?t.resolve(r.workspace,e.options.dir):t.join(r.workspace,n),a=await Xx.choose({message:`Select apps to install`,options:e.projects.map(e=>e.name),includeAllOption:!0,mode:`multiple`,required:!0});return{projectName:n,directory:{workspace:i,template:r.template},selectedApps:e.projects.filter(e=>a.includes(e.name))}}static async getConfigPrefs(e){let t=new Set([`common`]),n=new Map;this.getGlobalTags({pkgs:e.selectedApps}).forEach(e=>t.add(e)),this.getPackageDeps({allPkgs:e.packages,pkgs:e.selectedApps}).forEach(e=>n.set(e.name,e));let r=e.packages.filter(e=>e.type!==`configs`||e.packageJson?.startx?.mode===`silent`||n.has(e.name)?!1:e.packageJson?.startx?.iTags?.every(e=>t.has(e))??!0);if(r.length>0){let e=await Xx.choose({message:`Select configs to install`,options:r.map(e=>e.name),includeAllOption:!0,mode:`multiple`,required:!1});r.filter(t=>e.includes(t.name)).forEach(e=>n.set(e.name,e))}return t.has(`node`)&&(await Xx.choose({message:`Select formatter`,options:[`prettier + biome`,`prettier`],mode:`single`,default:`prettier`,required:!0})===`prettier`||t.add(`biome`),t.add(`prettier`)),this.getPackageDeps({allPkgs:e.packages,pkgs:Array.from(n.values())}).forEach(e=>n.set(e.name,e)),this.getGlobalTags({pkgs:Array.from(n.values())}).forEach(e=>t.add(e)),{gTags:Array.from(t),selectedConfigs:Array.from(n.values())}}static async getPackagesPrefs(e){let t=new Set(e.tags),n=new Map(e.selectedPackages.map(e=>[e.name,e])),r=e.packages.filter(e=>e.type!==`packages`||e.packageJson?.startx?.mode===`silent`||n.has(e.name)?!1:e.packageJson?.startx?.iTags?.every(e=>t.has(e))??!1);if(r.length>0){let e=await Xx.choose({message:`Select packages to install`,options:r.map(e=>e.name),includeAllOption:!0,mode:`multiple`,required:!1});r.filter(t=>e.includes(t.name)).forEach(e=>n.set(e.name,e))}return this.getPackageDeps({allPkgs:e.packages,pkgs:Array.from(n.values())}).forEach(e=>n.set(e.name,e)),this.getGlobalTags({pkgs:Array.from(n.values())}).forEach(e=>t.add(e)),{gTags:Array.from(t),selectedPackages:Array.from(n.values())}}static async installPackage(e){if(!e.pkg.packageJson)throw Error(`Missing package.json for ${e.pkg.name}`);let n=new Set([...e.tags,...e.pkg.packageJson.startx?.tags||[]]),r=e.pkg.packageJson.startx?.ignore||[];r.includes(`eslint-config`)&&n.delete(`eslint`),r.includes(`vitest-config`)&&n.delete(`vitest`);let{packageJson:i,isWorkspace:a}=By.handlePackageJson({app:e.pkg.packageJson,tags:Array.from(n),name:e.packageName||e.pkg.packageJson.name||e.pkg.name,dependencies:e.dependencies});if(a)throw Error(`Cannot install workspace as a package: ${e.pkg.name}`);let o=t.join(e.directory.workspace,e.pkg.relativePath),s=t.join(e.pkg.path);await Ny.writeJSONFile({dir:o,file:`package`,content:i}),await this.copyValidatedFilesFromFolder(s,o,n),await Ny.copyDirectory({from:t.join(s,`src`),to:t.join(o,`src`),exclude:n.has(`vitest`)?void 0:/\.test\.tsx?$/}),Z_.info(`Successfully installed ${e.pkg.name}`)}static async installWorkspace(e){let t=await Iy.parsePackageJson({dir:e.dir.template}),n=await Iy.parsePackageJson({dir:e.dir.template,file:`startx`});if(!t)throw Error(`Failed to parse root package.json`);t.dependencies={...t.dependencies,...n?.dependencies||{}},t.devDependencies={...t.devDependencies,...n?.devDependencies||{}};let{packageJson:r}=By.handlePackageJson({app:t,tags:[`root`,...e.tags],name:e.name});await Ny.writeJSONFile({dir:e.dir.workspace,file:`package`,content:r}),await this.copyValidatedFilesFromFolder(e.dir.template,e.dir.workspace,new Set([`root`,...e.tags])),await this.writeVscodeSettings({workspace:e.dir.workspace,tags:e.tags})}static async writeVscodeSettings(e){let n=e.tags.includes(`biome`),r=t.join(e.workspace,`.vscode`),i={"editor.formatOnSave":!0,"editor.defaultFormatter":n?`biomejs.biome`:`esbenp.prettier-vscode`,"editor.codeActionsOnSave":{...n?{"source.organizeImports.biome":`explicit`,"source.fixAll.biome":`explicit`}:{},"source.fixAll.eslint":`explicit`,"source.fixAll":`explicit`},"eslint.workingDirectories":[{mode:`auto`}]},a={recommendations:[`dbaeumer.vscode-eslint`,...n?[`biomejs.biome`]:[`esbenp.prettier-vscode`]]};await Promise.all([Ny.writeJSONFile({dir:r,file:`settings`,content:i}),Ny.writeJSONFile({dir:r,file:`extensions`,content:a})])}static async checkTargetDirectory(e){let[t,n]=await Promise.all([Ny.listFiles({dir:e}),Ny.listDirectories({dir:e})]);if(!(t.length===0&&n.length===0)&&!await Xx.confirm({message:`Directory "${e}" already exists and is not empty. Overwrite?`,default:!1}))throw Error(`Aborted: target directory already exists.`)}static getPackageDeps(e){let t=new Map(e.pkgs.map(e=>[e.name,e]));return Array.from(t.values()).forEach(n=>{[...n.packageJson?.startx?.requiredDeps||[],...n.packageJson?.startx?.requiredDevDeps||[]].forEach(n=>{let r=e.allPkgs.find(e=>e.packageJson?.name===n);r&&t.set(r.name,r)})}),e.pkgs.forEach(e=>t.delete(e.name)),Array.from(t.values())}static getGlobalTags(e){let t=new Set(e.gTags||[]);return e.pkgs.forEach(e=>{e.packageJson?.startx?.gTags?.forEach(e=>t.add(e))}),Array.from(t)}static async copyValidatedFilesFromFolder(e,n,r){let i=await Ny.listFiles({dir:e}).catch(()=>[]);for(let a of i){let i=Py[a];if(i&&!i.tags.every(e=>r.has(e)))continue;let o=a===`_gitignore`?`.gitignore`:a;try{await Ny.copyFile({from:t.join(e,a),to:t.join(n,o)})}catch(e){Z_.error(`Failed to copy file ${a}:`,e)}}}};const Qx=Vp.string().min(1,`Package name is required`).max(214,`Package name too long`).regex(/^(?:@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/,`Invalid package name`);var $x=class e{static command=new dv(`package`).alias(`pkg`).description(`List and add packages in the current monorepo.`).addCommand(new dv(`list`).alias(`ls`).description(`List packages available from the StartX template.`).action(e.list.bind(e))).addCommand(new dv(`add`).description(`Add an existing StartX app or package, optionally with a new name.`).argument(`[packageName]`).option(`-n, --name <name>`,`override the name for the added package`).option(`--eslint`,`enable ESLint support for the added package`).option(`--no-eslint`,`skip ESLint support for the added package`).option(`--no-install`,`do not run the package manager after updating dependencies`).action(e.add.bind(e))).addCommand(new dv(`new`).alias(`create`).description(`Create a new package from scratch.`).argument(`[packageName]`).option(`-d, --dir <path>`,`package directory relative to the current workspace`).option(`--eslint`,`enable ESLint support for the new package`).option(`--no-eslint`,`skip ESLint support for the new package`).option(`--no-install`,`do not run the package manager after updating ESLint`).action(e.create.bind(e)));static async list(){let e=await Iy.getPackageList(),t=new Map;for(let n of e){let e=t.get(n.type)??[];e.push(n),t.set(n.type,e)}for(let e of[`apps`,`packages`,`configs`]){let n=t.get(e)??[];if(n.length!==0){Z_.info(`${e}:`);for(let e of n.sort((e,t)=>e.name.localeCompare(t.name)))Z_.info(`  ${e.name} (${e.relativePath})`)}}}static async add(e,t){let n=await Iy.getPackageList(),r=n.filter(e=>e.packageJson?.startx?.mode!==`silent`),i=e??await Xx.choose({message:`Select app or package to add`,options:r.map(e=>e.name),mode:`single`,required:!0}),a=this.findPackage(n,i);if(!a)throw Error(`Package "${i}" was not found in the StartX template.`);let o=a.packageJson?.name??a.name,s=t.name??await Xx.getText({message:`Name for the new package (leave unchanged to keep the original)`,name:`overrideName`,default:o,schema:Qx}),c=Iy.getDirectory(),l=await this.resolveEslintPreference(t),u=this.resolvePackageClosure({packages:n,selectedPackage:a,includeEslintConfig:l}),d=await this.getInstallTags({workspace:c.workspace,packages:u,eslintEnabled:l});await this.checkAndInstallMissingDeps({directory:c,tags:d,install:t.install});for(let e of u){let t=e.name===a.name;await this.installTemplatePackage({pkg:e,directory:c,tags:d,overrideName:t?s:void 0,overrideRelativePath:t?this.getDestinationPath(e.relativePath,s):void 0})}Z_.info("Done! Run `pnpm install` to link the new package.")}static async create(e,n){let r=await Xx.getText({message:`Package name`,name:`packageName`,default:e,schema:Qx}),i=Iy.getDirectory(),a=n.dir?t.resolve(i.workspace,n.dir):t.resolve(i.workspace,this.getDefaultPackagePath(r));if(await this.pathExists(a))throw Error(`Package directory already exists: ${a}`);let s=await this.readRootPackage(i.workspace),c=await this.resolveEslintPreference(n),l=this.hasDependency(s,`vitest`),u=await Iy.getPackageList();await this.ensureTemplatePackage({packages:u,name:`typescript-config`,directory:i,tags:[`common`,`node`]}),c&&await this.ensureTemplatePackage({packages:u,name:`eslint-config`,directory:i,tags:[`common`,`node`,`eslint`]}),l&&await this.ensureTemplatePackage({packages:u,name:`vitest-config`,directory:i,tags:[`common`,`node`,`vitest`]}),await o.mkdir(t.join(a,`src`),{recursive:!0}),await this.writeJson(t.join(a,`package.json`),this.createPackageJson({name:r,eslintEnabled:c,vitestEnabled:l})),await o.writeFile(t.join(a,`tsconfig.json`),`${JSON.stringify({extends:`typescript-config/tsconfig.node.json`,compilerOptions:{moduleResolution:`bundler`,module:`esnext`,target:`es2022`},include:[`src/**/*.ts`]},null,2)}\n`),await o.writeFile(t.join(a,`src`,`index.ts`),`export {};
 `),c&&await o.writeFile(t.join(a,`eslint.config.ts`),`import { baseConfig } from "eslint-config/base";
 import { extend } from "eslint-config/extend";
 
@@ -223,4 +223,4 @@ export default extend(baseConfig);
 `),l&&await o.writeFile(t.join(a,`vitest.config.ts`),`import vitestConfig from "vitest-config/node";
 
 export default vitestConfig;
-`),Z_.info(`Created package ${r} at ${t.relative(i.workspace,a)}`),Z_.info("Run `pnpm install` to link the new package.")}static async resolveEslintPreference(e){if(e.eslint===!1)return!1;let n=Iy.getDirectory(),r=await this.readRootPackage(n.workspace);return this.hasDependency(r,`eslint`)?e.eslint??!0:e.eslint===!0||await Xx.confirm({message:`ESLint is not installed in this monorepo. Install and enable it?`,default:!0})?(r.devDependencies={...r.devDependencies,eslint:await this.resolveDependencyVersion(n.workspace,`eslint`)},await this.writeJson(t.join(n.workspace,`package.json`),r),Z_.info(`Added eslint to the root devDependencies.`),e.install!==!1&&await this.installRootDependencies(n.workspace),!0):!1}static async getInstallTags(e){let t=new Set([`common`,`node`]),n=await this.readRootPackage(e.workspace);e.eslintEnabled&&t.add(`eslint`),this.hasDependency(n,`@biomejs/biome`)&&t.add(`biome`),this.hasDependency(n,`prettier`)&&t.add(`prettier`),this.hasDependency(n,`vitest`)&&t.add(`vitest`),this.hasDependency(n,`tsdown`)&&t.add(`tsdown`);for(let n of e.packages)n.packageJson?.startx?.tags?.forEach(e=>t.add(e)),n.packageJson?.startx?.iTags?.forEach(e=>t.add(e)),n.packageJson?.startx?.gTags?.forEach(e=>t.add(e)),(n.type===`apps`||n.packageJson?.startx?.mode===`standalone`)&&t.add(`runnable`);return Array.from(t)}static resolvePackageClosure(e){let t=new Map,n=[e.selectedPackage],r=r=>{let i=this.findPackage(e.packages,r);i&&!t.has(i.name)&&n.push(i)};for(e.includeEslintConfig&&r(`eslint-config`);n.length>0;){let e=n.shift();if(!t.has(e.name)){t.set(e.name,e);for(let t of[...e.packageJson?.startx?.requiredDeps??[],...e.packageJson?.startx?.requiredDevDeps??[]])r(t)}}return Array.from(t.values())}static async ensureTemplatePackage(e){let t=this.findPackage(e.packages,e.name);if(!t){Z_.warn(`Could not find template package ${e.name}; skipping.`);return}await this.installTemplatePackage({pkg:t,directory:e.directory,tags:e.tags})}static async installTemplatePackage(e){if(!e.pkg.packageJson)throw Error(`Missing package.json for ${e.pkg.name}`);let n=e.overrideRelativePath??e.pkg.relativePath,r=t.join(e.directory.workspace,n);if(await this.pathExists(t.join(r,`package.json`))&&!await Xx.confirm({message:`"${n}" already exists. Overwrite?`,default:!1})){Z_.info(`Skipping ${e.pkg.name}.`);return}let i=new Set([...e.tags,...e.pkg.packageJson.startx?.tags??[]]),a=e.pkg.packageJson.startx?.ignore??[];a.includes(`eslint-config`)&&i.delete(`eslint`),a.includes(`vitest-config`)&&i.delete(`vitest`);let{packageJson:o,isWorkspace:s}=By.handlePackageJson({app:e.pkg.packageJson,tags:Array.from(i),name:e.overrideName??e.pkg.packageJson.name??e.pkg.name});if(s)throw Error(`Cannot install workspace as a package: ${e.pkg.name}`);await this.syncDepsWithCatalog({workspace:e.directory.workspace,templateDir:e.directory.template,packageJson:o}),await Ny.writeJSONFile({dir:r,file:`package`,content:o}),await this.copyValidatedFilesFromFolder(e.pkg.path,r,i),await Ny.copyDirectory({from:t.join(e.pkg.path,`src`),to:t.join(r,`src`),exclude:i.has(`vitest`)?void 0:/\.test\.tsx?$/}),Z_.info(`Installed ${e.overrideName??e.pkg.name} at ${n}`)}static async copyValidatedFilesFromFolder(e,n,r){let i=await Ny.listFiles({dir:e}).catch(()=>[]);for(let a of i){let i=Py[a];i&&!i.tags.every(e=>r.has(e))||a!==`package.json`&&await Ny.copyFile({from:t.join(e,a),to:t.join(n,a)})}}static createPackageJson(e){let t={typecheck:`tsc --noEmit`,clean:`rimraf dist .turbo`},n={"typescript-config":`workspace:*`},r=[];return e.eslintEnabled?(t.lint=`eslint .`,t[`lint:fix`]=`eslint . --fix`,n[`eslint-config`]=`workspace:*`):r.push(`eslint-config`),e.vitestEnabled?(t.test=`vitest run`,n[`vitest-config`]=`workspace:*`):r.push(`vitest-config`),{name:e.name,version:`1.0.0`,type:`module`,scripts:t,exports:`./src/index.ts`,devDependencies:n,startx:{iTags:[`node`],requiredDevDeps:[`typescript-config`],...r.length>0?{ignore:r}:{}}}}static async checkAndInstallMissingDeps(e){let n=await this.readRootPackage(e.workspace),r=await Iy.parsePnpmWorkspace({dir:e.workspace}),i=[],a=[];for(let[t,o]of Object.entries(Ly))if(o.tags.every(t=>e.tags.includes(t))&&!o.tags.includes(`root`))if(o.version.startsWith(`workspace:`))await this.workspacePackageExists(e.workspace,t)||a.push(t);else{if(this.hasDependency(n,t))continue;let e=r?.catalog?.[t]?`catalog:`:o.version;i.push({name:t,version:e,isDev:o.isDevDependency??!0})}if(a.length>0){Z_.warn(`The following workspace packages are missing from this monorepo:`);for(let e of a)Z_.warn(`  - ${e}  →  run: startx package add ${e}`)}if(i.length!==0){Z_.warn(`The following npm dependencies are required but not installed:`);for(let e of i)Z_.warn(`  - ${e.name}`);if(!await Xx.confirm({message:`Add them to the workspace root package.json?`,default:!0})){Z_.warn(`Skipping. Some features may not work correctly without these dependencies.`);return}for(let e of i)e.isDev?n.devDependencies[e.name]=e.version:n.dependencies[e.name]=e.version;await this.writeJson(t.join(e.workspace,`package.json`),n),Z_.info(`Added missing dependencies to root package.json.`),e.install!==!1&&await this.installRootDependencies(e.workspace)}}static async workspacePackageExists(e,n){let r=n.startsWith(`@`)?t.join(...n.split(`/`)):n,i=[t.join(e,`configs`,r,`package.json`),t.join(e,`packages`,r,`package.json`),t.join(e,`apps`,r,`package.json`)];for(let e of i)if(await this.pathExists(e))return!0;return!1}static getDestinationPath(e,n){let r=t.dirname(e),i=n.includes(`/`)?n.split(`/`).pop():n;return t.join(r,i)}static getDefaultPackagePath(e){if(e.startsWith(`@`)){let[n,r]=e.split(`/`);return t.join(`packages`,n,r)}return t.join(`packages`,e)}static findPackage(e,t){return e.find(e=>e.name===t||e.packageJson?.name===t)}static hasDependency(e,t){return!!(e.dependencies?.[t]||e.devDependencies?.[t]||e.peerDependencies?.[t])}static async readRootPackage(e){let n=await o.readFile(t.join(e,`package.json`),`utf-8`);return JSON.parse(n)}static async resolveDependencyVersion(e,t){return(await Iy.parsePnpmWorkspace({dir:e}))?.catalog?.[t]?`catalog:`:t===`eslint`?`^9.0.0`:`latest`}static async installRootDependencies(e){let t=(await this.readRootPackage(e)).packageManager?.split(`@`)[0]||`pnpm`,r=t===`yarn`?`yarn`:t,i=[`install`];Z_.info(`Running ${r} ${i.join(` `)} to install ESLint...`),await new Promise((t,a)=>{let o=n(r,i,{cwd:e,stdio:`inherit`,shell:process.platform===`win32`});o.on(`error`,a),o.on(`close`,e=>{if(e===0){t();return}a(Error(`${r} ${i.join(` `)} exited with code ${e}`))})}).catch(t=>{Z_.warn(`Could not install dependencies automatically: ${t instanceof Error?t.message:t}`),Z_.warn(`Run "${r} ${i.join(` `)}" manually in ${e}.`)})}static async syncDepsWithCatalog(e){let n=t.join(e.workspace,`pnpm-workspace.yaml`),r;try{r=await o.readFile(n,`utf-8`)}catch{return}let i=jy.parseDocument(r),a=i.getIn([`catalog`]);if(!a)return;let s=await this.loadTemplateCatalog(e.templateDir),c=e.packageJson.dependencies,l=e.packageJson.devDependencies,u={},d=e=>{if(e){for(let[t,n]of Object.entries(e))if(!n.startsWith(`workspace:`))if(n===`catalog:`){if(!a[t]){let e=s[t];e&&(u[t]=e)}}else e[t]=`catalog:`,a[t]||(u[t]=n)}};if(d(c),d(l),Object.keys(u).length!==0){for(let[e,t]of Object.entries(u))i.setIn([`catalog`,e],t);await o.writeFile(n,i.toString()),Z_.info(`Added to pnpm-workspace.yaml catalog:`);for(let[e,t]of Object.entries(u))Z_.info(`  + ${e}: ${t}`)}}static async loadTemplateCatalog(e){try{let n=await o.readFile(t.join(e,`pnpm-workspace.yaml`),`utf-8`);return jy.parseDocument(n).getIn([`catalog`])??{}}catch{return{}}}static async writeJson(e,t){await o.writeFile(e,`${JSON.stringify(t,null,2)}\n`)}static async pathExists(e){try{return await o.access(e),!0}catch{return!1}}},eS=`1.1.3`;const tS=new dv;tS.name(`startx`).description(`StartX CLI - Your all in one monorepo startup tool.`).version(eS),tS.command(`ping`).action(()=>{Z_.info(`pong`)}),tS.addCommand(Zx.command),tS.addCommand($x.command),tS.parse(process.argv);export{};
+`),Z_.info(`Created package ${r} at ${t.relative(i.workspace,a)}`),Z_.info("Run `pnpm install` to link the new package.")}static async resolveEslintPreference(e){if(e.eslint===!1)return!1;let n=Iy.getDirectory(),r=await this.readRootPackage(n.workspace);return this.hasDependency(r,`eslint`)?e.eslint??!0:e.eslint===!0||await Xx.confirm({message:`ESLint is not installed in this monorepo. Install and enable it?`,default:!0})?(r.devDependencies={...r.devDependencies,eslint:await this.resolveDependencyVersion(n.workspace,`eslint`)},await this.writeJson(t.join(n.workspace,`package.json`),r),Z_.info(`Added eslint to the root devDependencies.`),e.install!==!1&&await this.installRootDependencies(n.workspace),!0):!1}static async getInstallTags(e){let t=new Set([`common`,`node`]),n=await this.readRootPackage(e.workspace);e.eslintEnabled&&t.add(`eslint`),this.hasDependency(n,`@biomejs/biome`)&&t.add(`biome`),this.hasDependency(n,`prettier`)&&t.add(`prettier`),this.hasDependency(n,`vitest`)&&t.add(`vitest`),this.hasDependency(n,`tsdown`)&&t.add(`tsdown`);for(let n of e.packages)n.packageJson?.startx?.tags?.forEach(e=>t.add(e)),n.packageJson?.startx?.iTags?.forEach(e=>t.add(e)),n.packageJson?.startx?.gTags?.forEach(e=>t.add(e)),(n.type===`apps`||n.packageJson?.startx?.mode===`standalone`)&&t.add(`runnable`);return Array.from(t)}static resolvePackageClosure(e){let t=new Map,n=[e.selectedPackage],r=r=>{let i=this.findPackage(e.packages,r);i&&!t.has(i.name)&&n.push(i)};for(e.includeEslintConfig&&r(`eslint-config`);n.length>0;){let e=n.shift();if(!t.has(e.name)){t.set(e.name,e);for(let t of[...e.packageJson?.startx?.requiredDeps??[],...e.packageJson?.startx?.requiredDevDeps??[]])r(t)}}return Array.from(t.values())}static async ensureTemplatePackage(e){let t=this.findPackage(e.packages,e.name);if(!t){Z_.warn(`Could not find template package ${e.name}; skipping.`);return}await this.installTemplatePackage({pkg:t,directory:e.directory,tags:e.tags})}static async installTemplatePackage(e){if(!e.pkg.packageJson)throw Error(`Missing package.json for ${e.pkg.name}`);let n=e.overrideRelativePath??e.pkg.relativePath,r=t.join(e.directory.workspace,n);if(await this.pathExists(t.join(r,`package.json`))&&!await Xx.confirm({message:`"${n}" already exists. Overwrite?`,default:!1})){Z_.info(`Skipping ${e.pkg.name}.`);return}let i=new Set([...e.tags,...e.pkg.packageJson.startx?.tags??[]]),a=e.pkg.packageJson.startx?.ignore??[];a.includes(`eslint-config`)&&i.delete(`eslint`),a.includes(`vitest-config`)&&i.delete(`vitest`);let{packageJson:o,isWorkspace:s}=By.handlePackageJson({app:e.pkg.packageJson,tags:Array.from(i),name:e.overrideName??e.pkg.packageJson.name??e.pkg.name});if(s)throw Error(`Cannot install workspace as a package: ${e.pkg.name}`);await this.syncDepsWithCatalog({workspace:e.directory.workspace,templateDir:e.directory.template,packageJson:o}),await Ny.writeJSONFile({dir:r,file:`package`,content:o}),await this.copyValidatedFilesFromFolder(e.pkg.path,r,i),await Ny.copyDirectory({from:t.join(e.pkg.path,`src`),to:t.join(r,`src`),exclude:i.has(`vitest`)?void 0:/\.test\.tsx?$/}),Z_.info(`Installed ${e.overrideName??e.pkg.name} at ${n}`)}static async copyValidatedFilesFromFolder(e,n,r){let i=await Ny.listFiles({dir:e}).catch(()=>[]);for(let a of i){let i=Py[a];i&&!i.tags.every(e=>r.has(e))||a!==`package.json`&&await Ny.copyFile({from:t.join(e,a),to:t.join(n,a)})}}static createPackageJson(e){let t={typecheck:`tsc --noEmit`,clean:`rimraf dist .turbo`},n={"typescript-config":`workspace:*`},r=[];return e.eslintEnabled?(t.lint=`eslint .`,t[`lint:fix`]=`eslint . --fix`,n[`eslint-config`]=`workspace:*`):r.push(`eslint-config`),e.vitestEnabled?(t.test=`vitest run`,n[`vitest-config`]=`workspace:*`):r.push(`vitest-config`),{name:e.name,version:`1.0.0`,type:`module`,scripts:t,exports:`./src/index.ts`,devDependencies:n,startx:{iTags:[`node`],requiredDevDeps:[`typescript-config`],...r.length>0?{ignore:r}:{}}}}static async checkAndInstallMissingDeps(e){let n=await this.readRootPackage(e.directory.workspace),r=await Iy.parsePnpmWorkspace({dir:e.directory.workspace}),i=[],a=[];for(let[t,o]of Object.entries(Ly))if(o.tags.every(t=>e.tags.includes(t))&&!o.tags.includes(`root`))if(o.version.startsWith(`workspace:`))await this.workspacePackageExists(e.directory.workspace,t)||a.push(t);else{if(this.hasDependency(n,t))continue;let e=r?.catalog?.[t]?`catalog:`:o.version;i.push({name:t,version:e,isDev:o.isDevDependency??!0})}if(a.length>0){Z_.warn(`The following workspace packages are missing from this monorepo:`);for(let e of a)Z_.warn(`  - ${e}  →  run: startx package add ${e}`)}if(i.length!==0){Z_.warn(`The following npm dependencies are required but not installed:`);for(let e of i)Z_.warn(`  - ${e.name}`);if(!await Xx.confirm({message:`Add them to the workspace root package.json?`,default:!0})){Z_.warn(`Skipping. Some features may not work correctly without these dependencies.`);return}n.devDependencies??={},n.dependencies??={};for(let e of i)e.isDev?n.devDependencies[e.name]=e.version:n.dependencies[e.name]=e.version;await this.writeJson(t.join(e.directory.workspace,`package.json`),n),Z_.info(`Added missing dependencies to root package.json.`),e.install!==!1&&await this.installRootDependencies(e.directory.workspace)}}static async workspacePackageExists(e,n){let r=n.startsWith(`@`)?t.join(...n.split(`/`)):n,i=[t.join(e,`configs`,r,`package.json`),t.join(e,`packages`,r,`package.json`),t.join(e,`apps`,r,`package.json`)];for(let e of i)if(await this.pathExists(e))return!0;return!1}static getDestinationPath(e,n){let r=t.dirname(e),i=n.includes(`/`)?n.split(`/`).pop():n;return t.join(r,i)}static getDefaultPackagePath(e){if(e.startsWith(`@`)){let[n,r]=e.split(`/`);return t.join(`packages`,n,r)}return t.join(`packages`,e)}static findPackage(e,t){return e.find(e=>e.name===t||e.packageJson?.name===t)}static hasDependency(e,t){return!!(e.dependencies?.[t]||e.devDependencies?.[t]||e.peerDependencies?.[t])}static async readRootPackage(e){let n=await o.readFile(t.join(e,`package.json`),`utf-8`);return JSON.parse(n)}static async resolveDependencyVersion(e,t){return(await Iy.parsePnpmWorkspace({dir:e}))?.catalog?.[t]?`catalog:`:t===`eslint`?`^9.0.0`:`latest`}static async installRootDependencies(e){let t=(await this.readRootPackage(e)).packageManager?.split(`@`)[0]||`pnpm`,r=t===`yarn`?`yarn`:t,i=[`install`];Z_.info(`Running ${r} ${i.join(` `)} to install ESLint...`),await new Promise((t,a)=>{let o=n(r,i,{cwd:e,stdio:`inherit`,shell:process.platform===`win32`});o.on(`error`,a),o.on(`close`,e=>{if(e===0){t();return}a(Error(`${r} ${i.join(` `)} exited with code ${e}`))})}).catch(t=>{Z_.warn(`Could not install dependencies automatically: ${t instanceof Error?t.message:t}`),Z_.warn(`Run "${r} ${i.join(` `)}" manually in ${e}.`)})}static async syncDepsWithCatalog(e){let n=t.join(e.workspace,`pnpm-workspace.yaml`),r;try{r=await o.readFile(n,`utf-8`)}catch{Z_.warn(`Could not find pnpm workspace file at ${n}.`);return}let i=jy.parseDocument(r);i.has(`catalog`)||i.set(`catalog`,{});let a=await this.loadTemplateCatalog(e.templateDir),s=e.packageJson.dependencies,c=e.packageJson.devDependencies,l={},u=e=>{if(e)for(let[t,n]of Object.entries(e)){if(n.startsWith(`workspace:`))continue;let r=i.hasIn([`catalog`,t]);if(n===`catalog:`){if(!r){let e=a[t];e&&(l[t]=e)}}else e[t]=`catalog:`,r||(l[t]=n)}};if(u(s),u(c),Object.keys(l).length!==0){for(let[e,t]of Object.entries(l))i.setIn([`catalog`,e],t);await o.writeFile(n,i.toString()),Z_.info(`Added to pnpm-workspace.yaml catalog:`);for(let[e,t]of Object.entries(l))Z_.info(`  + ${e}: ${t}`)}}static async loadTemplateCatalog(e){try{let n=await o.readFile(t.join(e,`pnpm-workspace.yaml`),`utf-8`),r=jy.parseDocument(n).get(`catalog`);return r?r.toJSON():{}}catch{return Z_.warn(`Could not find pnpm-workspace.yaml template in ${e}.`),{}}}static async writeJson(e,t){await o.writeFile(e,`${JSON.stringify(t,null,2)}\n`)}static async pathExists(e){try{return await o.access(e),!0}catch{return!1}}},eS=`1.1.5`;const tS=new dv;tS.name(`startx`).description(`StartX CLI - Your all in one monorepo startup tool.`).version(eS),tS.command(`ping`).action(()=>{Z_.info(`pong`)}),tS.addCommand(Zx.command),tS.addCommand($x.command),tS.parse(process.argv);export{};

package/apps/startx-cli/src/commands/package.ts

@@ -124,7 +124,7 @@ export class PackageCommand {
 		});
 
 		await this.checkAndInstallMissingDeps({
-			workspace: directory.workspace,
+			directory,
 			tags,
 			install: options.install,
 		});
@@ -444,10 +444,16 @@ export class PackageCommand {
 			},
 		};
 	}
-
-	private static async checkAndInstallMissingDeps(props: { workspace: string; tags: TAGS[]; install?: boolean }) {
-		const rootPackage = await this.readRootPackage(props.workspace);
-		const pnpmWorkspace = await CliUtils.parsePnpmWorkspace({ dir: props.workspace });
+	private static async checkAndInstallMissingDeps(props: {
+		directory: {
+			template: string;
+			workspace: string;
+		};
+		tags: TAGS[];
+		install?: boolean;
+	}) {
+		const rootPackage = await this.readRootPackage(props.directory.workspace);
+		const pnpmWorkspace = await CliUtils.parsePnpmWorkspace({ dir: props.directory.workspace });
 
 		const missingNpm: Array<{ name: string; version: string; isDev: boolean }> = [];
 		const missingWorkspace: string[] = [];
@@ -457,8 +463,7 @@ export class PackageCommand {
 			if (config.tags.includes("root")) continue;
 
 			if (config.version.startsWith("workspace:")) {
-				// Workspace packages live in configs/, packages/, apps/ — not in root package.json
-				const exists = await this.workspacePackageExists(props.workspace, dep);
+				const exists = await this.workspacePackageExists(props.directory.workspace, dep);
 				if (!exists) missingWorkspace.push(dep);
 			} else {
 				if (this.hasDependency(rootPackage, dep)) continue;
@@ -490,6 +495,9 @@ export class PackageCommand {
 			return;
 		}
 
+		rootPackage.devDependencies ??= {};
+		rootPackage.dependencies ??= {};
+
 		for (const dep of missingNpm) {
 			if (dep.isDev) {
 				(rootPackage.devDependencies as Record<string, string>)[dep.name] = dep.version;
@@ -498,19 +506,16 @@ export class PackageCommand {
 			}
 		}
 
-		await this.writeJson(path.join(props.workspace, "package.json"), rootPackage);
+		await this.writeJson(path.join(props.directory.workspace, "package.json"), rootPackage);
 		logger.info("Added missing dependencies to root package.json.");
 
 		if (props.install !== false) {
-			await this.installRootDependencies(props.workspace);
+			await this.installRootDependencies(props.directory.workspace);
 		}
 	}
-
 	private static async workspacePackageExists(workspace: string, packageName: string): Promise<boolean> {
 		// Resolve scoped names: @repo/lib → packages/@repo/lib
-		const subPath = packageName.startsWith("@")
-			? path.join(...packageName.split("/"))
-			: packageName;
+		const subPath = packageName.startsWith("@") ? path.join(...packageName.split("/")) : packageName;
 
 		const candidates = [
 			path.join(workspace, "configs", subPath, "package.json"),
@@ -591,7 +596,6 @@ export class PackageCommand {
 			logger.warn(`Run "${command} ${args.join(" ")}" manually in ${workspace}.`);
 		});
 	}
-
 	private static async syncDepsWithCatalog(props: {
 		workspace: string;
 		templateDir: string;
@@ -602,14 +606,16 @@ export class PackageCommand {
 		try {
 			content = await fs.readFile(workspacePath, "utf-8");
 		} catch {
+			logger.warn(`Could not find pnpm workspace file at ${workspacePath}.`);
 			return;
 		}
 
 		const doc = YAML.parseDocument(content);
-		const catalog = doc.getIn(["catalog"]) as Record<string, string> | undefined;
-		if (!catalog) return;
 
-		// Load template's catalog to resolve "catalog:" entries to real versions
+		if (!doc.has("catalog")) {
+			doc.set("catalog", {});
+		}
+
 		const templateCatalog = await this.loadTemplateCatalog(props.templateDir);
 
 		const deps = props.packageJson.dependencies as Record<string, string> | undefined;
@@ -621,17 +627,16 @@ export class PackageCommand {
 			for (const [name, version] of Object.entries(depMap)) {
 				if (version.startsWith("workspace:")) continue;
 
+				const existsInUserCatalog = doc.hasIn(["catalog", name]);
+
 				if (version === "catalog:") {
-					// Valid only if the user's catalog already has this entry.
-					// If not, resolve the real version from the template's catalog and add it.
-					if (!catalog[name]) {
+					if (!existsInUserCatalog) {
 						const templateVersion = templateCatalog[name];
 						if (templateVersion) newEntries[name] = templateVersion;
 					}
 				} else {
-					// Hardcoded version — normalize to catalog:
 					depMap[name] = "catalog:";
-					if (!catalog[name]) newEntries[name] = version;
+					if (!existsInUserCatalog) newEntries[name] = version;
 				}
 			}
 		};
@@ -656,12 +661,14 @@ export class PackageCommand {
 		try {
 			const raw = await fs.readFile(path.join(templateDir, "pnpm-workspace.yaml"), "utf-8");
 			const doc = YAML.parseDocument(raw);
-			return (doc.getIn(["catalog"]) as Record<string, string>) ?? {};
+			const catalogNode = doc.get("catalog") as YAML.Document | undefined;
+
+			return catalogNode ? (catalogNode.toJSON() as Record<string, string>) : {};
 		} catch {
+			logger.warn(`Could not find pnpm-workspace.yaml template in ${templateDir}.`);
 			return {};
 		}
 	}
-
 	private static async writeJson(file: string, content: object) {
 		await fs.writeFile(file, `${JSON.stringify(content, null, 2)}\n`);
 	}

package/apps/web-client/Dockerfile

@@ -14,7 +14,7 @@ COPY --parents packages/common/package.json ./
 COPY --parents packages/ui/package.json ./
 COPY --parents configs/*/package.json ./
 
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store,sharing=locked \
     pnpm install --frozen-lockfile
 
 COPY apps/web-client/ ./apps/web-client/
@@ -24,7 +24,7 @@ COPY configs ./configs
 COPY turbo.json ./
 
 # Build the required packages with Turbo cache mounted
-RUN --mount=type=cache,id=turbo,target=/app/.turbo/cache \
+RUN --mount=type=cache,id=turbo,target=/app/.turbo/cache,sharing=locked \
     pnpm build --filter=web-client
 
 # --- Final production image ---

package/apps/web-client/nginx.conf

@@ -16,5 +16,9 @@ server {
         add_header Cache-Control "public, immutable";
     }
 
-    error_page 404 /index.html;
+		location ~* \.(jpg|jpeg|png|gif|svg|ico|webp|avif|woff2?|ttf|eot)$ {
+				try_files $uri =404;
+				expires 1h;
+				add_header Cache-Control "public";
+		}
 }

package/apps/web-client/package.json

@@ -18,10 +18,12 @@
 		"@dotenvx/dotenvx": "catalog:",
 		"@react-router/node": "catalog:",
 		"@react-router/serve": "catalog:",
+		"@hookform/resolvers": "catalog:",
 		"@repo/ui": "workspace:*",
 		"isbot": "catalog:",
 		"react": "catalog:",
 		"react-dom": "catalog:",
+		"motion": "catalog:",
 		"react-router": "catalog:",
 		"zustand": "catalog:",
 		"@repo/common": "workspace:*"

package/apps/web-client/src/components/utils/navigation-loader.tsx

@@ -0,0 +1,106 @@
+import { cn } from "@repo/ui/lib/utils";
+import { motion, useReducedMotion, AnimatePresence } from "motion/react";
+import * as React from "react";
+import { useNavigation } from "react-router";
+
+type LoaderState = "idle" | "loading" | "complete";
+
+export function NavigationLoader({ className }: { className?: string }) {
+	const navigation = useNavigation();
+	const prefersReducedMotion = useReducedMotion();
+	const [loaderState, setLoaderState] = React.useState<LoaderState>("idle");
+
+	const stateRef = React.useRef<LoaderState>(loaderState);
+	stateRef.current = loaderState;
+
+	React.useEffect(() => {
+		let timer: ReturnType<typeof setTimeout>;
+
+		const isNavigating = navigation.state === "loading" || navigation.state === "submitting";
+
+		if (isNavigating) {
+			if (stateRef.current === "idle") {
+				timer = setTimeout(() => {
+					setLoaderState("loading");
+				}, 150);
+			}
+		} else if (navigation.state === "idle") {
+			if (stateRef.current === "loading") {
+				setLoaderState("complete");
+				timer = setTimeout(() => {
+					setLoaderState("idle");
+				}, 500);
+			} else {
+				setLoaderState("idle");
+			}
+		}
+
+		return () => clearTimeout(timer);
+	}, [navigation.state]);
+
+	if (prefersReducedMotion) {
+		return null;
+	}
+
+	const progressVariants = {
+		idle: {
+			scaleX: 0,
+			opacity: 0,
+			transition: { duration: 0 },
+		},
+		loading: {
+			scaleX: 0.85,
+			opacity: 1,
+			transition: {
+				duration: 3.5,
+				ease: [0.08, 0.82, 0.17, 1],
+			},
+		},
+		complete: {
+			scaleX: 1,
+			opacity: 0,
+			transition: {
+				scaleX: { duration: 0.3, ease: [0.22, 1, 0.36, 1] },
+				opacity: { duration: 0.3, delay: 0.1, ease: "linear" },
+			},
+		},
+	} as const;
+
+	return (
+		<AnimatePresence>
+			{loaderState !== "idle" && (
+				<div
+					role="progressbar"
+					aria-hidden={loaderState === "complete"}
+					aria-valuemin={0}
+					aria-valuemax={100}
+					className="pointer-events-none fixed inset-x-0 top-0 z-[9999] h-[3px] w-full bg-transparent"
+				>
+					<motion.div
+						className={cn("relative h-full w-full origin-left bg-primary/50", className)}
+						initial="idle"
+						animate={loaderState}
+						exit="idle"
+						variants={progressVariants}
+						style={{ willChange: "transform, opacity" }}
+					>
+						<motion.div
+							className="absolute inset-0 w-full bg-gradient-to-r from-transparent via-white/50 to-transparent dark:via-white/30"
+							initial={{ x: "-100%" }}
+							animate={{ x: "100%" }}
+							transition={{
+								repeat: Infinity,
+								duration: 1.2,
+								ease: "linear",
+							}}
+						/>
+
+						<div className="absolute right-0 top-0 h-full w-64 bg-gradient-to-r from-transparent to-primary opacity-100" />
+
+						<div className="absolute right-0 top-1/2 h-[5px] w-[15px] -translate-y-1/2 rounded-full bg-primary shadow-[0_0_12px_4px_hsl(var(--primary))]" />
+					</motion.div>
+				</div>
+			)}
+		</AnimatePresence>
+	);
+}

package/apps/web-client/src/components/utils/pagination-footer.tsx

@@ -0,0 +1,205 @@
+import type { IPaginatedData } from "@repo/ui/api/use-api/api-types";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@repo/ui/components/ui/select";
+import { cn } from "@repo/ui/lib/utils";
+import { ChevronFirst, ChevronLast, ChevronLeft, ChevronRight } from "@repo/ui/lucide";
+import { motion, AnimatePresence, useReducedMotion } from "motion/react";
+import React, { forwardRef, useMemo, type ButtonHTMLAttributes } from "react";
+import usePagination from "~/hooks/pagination/usePagination";
+
+export type PaginationVariant = "default" | "compact" | "ghost";
+
+interface PaginationSectionProps<T> {
+	pagination?: IPaginatedData<T>["pagination"];
+	pageKey?: string;
+	limitKey?: string;
+	limit?: number;
+	variant?: PaginationVariant;
+	className?: string;
+}
+
+const emptyPagination: IPaginatedData<unknown>["pagination"] = {
+	total: 0,
+	totalPages: 0,
+	currentPage: 0,
+	pageSize: 0,
+};
+
+const DEFAULT_LIMIT_LIST = [5, 10, 20, 30, 40, 50];
+
+const SPRING_TRANSITION = {
+	type: "spring",
+	stiffness: 500,
+	damping: 30,
+	mass: 1,
+} as const;
+
+interface PaginationNavButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
+	icon: React.ElementType;
+	label: string;
+	isHiddenOnMobile?: boolean;
+}
+
+const PaginationNavButton = forwardRef<HTMLButtonElement, PaginationNavButtonProps>(
+	({ icon: Icon, label, disabled, isHiddenOnMobile, onClick, ...props }, ref) => {
+		const shouldReduceMotion = useReducedMotion();
+
+		return (
+			<motion.button
+				ref={ref}
+				aria-label={label}
+				aria-disabled={disabled}
+				disabled={disabled}
+				onClick={onClick}
+				whileHover={!disabled && !shouldReduceMotion ? { scale: 1.05 } : undefined}
+				whileTap={!disabled && !shouldReduceMotion ? { scale: 0.95 } : undefined}
+				transition={SPRING_TRANSITION}
+				className={cn(
+					"relative flex h-9 w-9 md:h-8 md:w-8 items-center justify-center rounded-md border border-transparent bg-transparent text-muted-foreground outline-none transition-colors",
+					"focus-visible:border-ring focus-visible:ring-2 focus-visible:ring-ring/50",
+					"hover:bg-secondary/80 hover:text-foreground",
+					"disabled:pointer-events-none disabled:opacity-40",
+					isHiddenOnMobile && "hidden sm:flex",
+					props.className
+				)}
+			>
+				<Icon className="h-4 w-4" aria-hidden="true" />
+			</motion.button>
+		);
+	}
+);
+PaginationNavButton.displayName = "PaginationNavButton";
+
+function PaginationFooter<T>({
+	pagination,
+	pageKey,
+	limitKey,
+	limit,
+	variant = "default",
+	className,
+}: PaginationSectionProps<T>) {
+	const prefersReducedMotion = useReducedMotion();
+	const { next, prev, setLimit, setPage } = usePagination({
+		pageKey,
+		limitKey,
+		limit,
+	});
+
+	const data = pagination || emptyPagination;
+
+	const limitList = useMemo(() => {
+		const list = [...DEFAULT_LIMIT_LIST];
+		if (data.pageSize > 0 && !list.includes(data.pageSize)) {
+			list.push(data.pageSize);
+			list.sort((a, b) => a - b);
+		}
+		return list;
+	}, [data.pageSize]);
+
+	if (data.total === 0) return null;
+
+	const isFirstPage = data.currentPage <= 1;
+	const isLastPage = data.currentPage >= data.totalPages;
+
+	return (
+		<nav
+			aria-label="Pagination Navigation"
+			className={cn(
+				"flex w-full flex-col-reverse items-center justify-between gap-4 sm:flex-row",
+				variant === "default" && "rounded-xl border bg-background/50 p-2 shadow-sm backdrop-blur-sm",
+				variant === "compact" && "rounded-lg border border-transparent py-1",
+				variant === "ghost" && "py-2",
+				className
+			)}
+		>
+			<div className="flex w-full items-center justify-between sm:w-auto sm:justify-start gap-4">
+				<div className="flex items-center gap-2">
+					<label
+						htmlFor="rows-per-page-select"
+						className={cn(
+							"whitespace-nowrap font-medium text-muted-foreground",
+							variant === "compact" ? "text-xs" : "text-sm"
+						)}
+					>
+						Rows per page
+					</label>
+					<Select value={`${data.pageSize}`} onValueChange={value => setLimit(parseInt(value, 10))}>
+						<SelectTrigger
+							id="rows-per-page-select"
+							className={cn(
+								"h-8 w-[72px] transition-colors hover:bg-secondary/50 focus-visible:ring-2 focus-visible:ring-ring/50",
+								variant === "compact" && "h-7 text-xs"
+							)}
+						>
+							<SelectValue placeholder={`${data.pageSize}`} />
+						</SelectTrigger>
+						<SelectContent side="top" className="min-w-[72px]">
+							{limitList.map(pageSize => (
+								<SelectItem key={pageSize} value={`${pageSize}`} className="cursor-pointer transition-colors">
+									{pageSize}
+								</SelectItem>
+							))}
+						</SelectContent>
+					</Select>
+				</div>
+			</div>
+
+			<div className="flex w-full items-center justify-between sm:w-auto gap-4 sm:gap-6">
+				<div
+					className={cn(
+						"flex flex-1 items-center justify-center font-medium tabular-nums text-muted-foreground sm:justify-end",
+						variant === "compact" ? "text-xs" : "text-sm"
+					)}
+					aria-live="polite"
+				>
+					<span className="mr-1">Page</span>
+					<div className="relative flex min-w-[1ch] items-center justify-center overflow-hidden">
+						<AnimatePresence mode="popLayout" initial={false}>
+							<motion.span
+								key={data.currentPage}
+								initial={prefersReducedMotion ? { opacity: 0 } : { opacity: 0, y: 10, filter: "blur(4px)" }}
+								animate={prefersReducedMotion ? { opacity: 1 } : { opacity: 1, y: 0, filter: "blur(0px)" }}
+								exit={prefersReducedMotion ? { opacity: 0 } : { opacity: 0, y: -10, filter: "blur(4px)" }}
+								transition={SPRING_TRANSITION}
+								className="inline-block text-foreground"
+							>
+								{data.currentPage}
+							</motion.span>
+						</AnimatePresence>
+					</div>
+					<span className="ml-1">of {data.totalPages}</span>
+				</div>
+
+				<div className="flex items-center gap-1 sm:gap-1.5">
+					<PaginationNavButton
+						icon={ChevronFirst}
+						label="Go to first page"
+						onClick={() => setPage(1)}
+						disabled={isFirstPage}
+						isHiddenOnMobile
+					/>
+					<PaginationNavButton
+						icon={ChevronLeft}
+						label="Go to previous page"
+						onClick={() => prev()}
+						disabled={isFirstPage}
+					/>
+					<PaginationNavButton
+						icon={ChevronRight}
+						label="Go to next page"
+						onClick={() => next()}
+						disabled={isLastPage}
+					/>
+					<PaginationNavButton
+						icon={ChevronLast}
+						label="Go to last page"
+						onClick={() => setPage(data.totalPages)}
+						disabled={isLastPage}
+						isHiddenOnMobile
+					/>
+				</div>
+			</div>
+		</nav>
+	);
+}
+
+export default PaginationFooter;

package/apps/web-client/src/hooks/pagination/usePagination.tsx

@@ -0,0 +1,22 @@
+import { useUrlParams } from "../utils/use-url-params";
+
+const usePagination = (options?: { limit?: number; pageKey?: string; limitKey?: string }) => {
+	const pageKey = options?.pageKey ?? "page";
+	const limitKey = options?.limitKey ?? "limit";
+
+	const { params, setParams } = useUrlParams({
+		[pageKey]: 1,
+		[limitKey]: 10,
+	});
+
+	return {
+		limit: params[limitKey],
+		page: params[pageKey],
+		setPage: (page: number) => setParams({ [pageKey]: page }),
+		setLimit: (limit: number) => setParams({ [limitKey]: limit }),
+		next: () => setParams({ [pageKey]: Number(params[pageKey]) + 1 }),
+		prev: () => setParams({ [pageKey]: Number(params[pageKey]) - 1 }),
+	};
+};
+
+export default usePagination;

package/apps/web-client/src/hooks/utils/use-url-params.ts

@@ -0,0 +1,95 @@
+import { useCallback, useEffect } from "react";
+import { useSearchParams } from "react-router";
+
+type StringRecord = Record<string, string | number>;
+
+export type UseUrlParamsReturn<T extends StringRecord> = {
+	params: T;
+	setParam: <K extends keyof T>(key: K, value: T[K]) => void;
+	setParams: (values: Partial<T>) => void;
+};
+
+function getParams<T extends StringRecord>(searchParams: URLSearchParams, defaults: T): T {
+	const result = {} as T;
+
+	for (const key of Object.keys(defaults) as Array<keyof T>) {
+		result[key] = (searchParams.get(key as string) ?? defaults[key]) as T[keyof T];
+	}
+
+	return result;
+}
+
+export function useUrlParams<T extends StringRecord>(defaults: T): UseUrlParamsReturn<T> {
+	const [searchParams, setSearchParams] = useSearchParams();
+
+	const params = getParams(searchParams, defaults);
+
+	// Ensure non-empty defaults exist in URL
+	useEffect(() => {
+		let changed = false;
+		const next = new URLSearchParams(searchParams);
+
+		for (const [key, value] of Object.entries(defaults)) {
+			if (value === "") continue;
+
+			if (!next.has(key)) {
+				if (typeof value === "string") next.set(key, value);
+				else next.set(key, String(value));
+				changed = true;
+			}
+		}
+
+		if (changed) {
+			setSearchParams(next, { replace: true });
+		}
+	}, [searchParams, defaults, setSearchParams]);
+
+	const setParam = useCallback(
+		<K extends keyof T>(key: K, value: T[K]) => {
+			setSearchParams((current) => {
+				const next = new URLSearchParams(current);
+
+				if (value === "") {
+					next.delete(key as string);
+				} else {
+					if (typeof value === "string") next.set(key as string, value);
+					else next.set(key as string, String(value));
+				}
+
+				return next;
+			});
+		},
+		[setSearchParams],
+	);
+
+	const setParams = useCallback(
+		(values: Partial<T>) => {
+			setSearchParams((current) => {
+				const next = new URLSearchParams(current);
+
+				for (const [key, value] of Object.entries(values)) {
+					if (value == null || value === "") {
+						next.delete(key);
+					} else {
+						next.set(key, value as string);
+					}
+				}
+
+				return next;
+			});
+		},
+		[setSearchParams],
+	);
+
+	return {
+		params,
+		setParam,
+		setParams,
+	};
+}
+
+export function useUrlParamsValue<T extends StringRecord>(defaults: T): T {
+	const [searchParams] = useSearchParams();
+
+	return getParams(searchParams, defaults);
+}

package/apps/web-client/src/root.tsx

@@ -4,6 +4,7 @@ import { ThemeProvider } from "@repo/ui/components/custom/theme-provider";
 import { isRouteErrorResponse, Links, Meta, Outlet, Scripts, ScrollRestoration } from "react-router";
 import type { Route } from "./+types/root";
 import "./app.css";
+import { NavigationLoader } from "./components/utils/navigation-loader";
 import { AuthStartup } from "./config/auth/auth-state";
 import { ENV } from "./config/env";
 
@@ -31,6 +32,7 @@ export function Layout({ children }: { children: React.ReactNode }) {
 				<Links />
 			</head>
 			<body>
+				<NavigationLoader />
 				{children}
 				<ScrollRestoration />
 				<Scripts />

package/apps/web-client/tsconfig.json

@@ -10,7 +10,7 @@
 		"jsx": "react-jsx",
 		"rootDirs": [".", "./.react-router/types"],
 		"paths": {
-			"~/*": ["./app/*"]
+			"~/*": ["./src/*"]
 		},
 		"esModuleInterop": true,
 		"verbatimModuleSyntax": true,

package/apps/web-client/vite.config.ts

@@ -24,6 +24,9 @@ export default defineConfig(() => {
 		plugins: [tailwindcss(), reactRouter()],
 		resolve: {
 			tsconfigPaths: true,
+			alias: {
+				"~": path.resolve(__dirname, "./src"),
+			},
 		},
 		define: env,
 	};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "startx",
   "description": "",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/avinashid/startx.git"

package/packages/@repo/lib/src/session-module/i-session.ts

@@ -163,7 +163,18 @@ export abstract class IUserSession {
 			refreshToken: newRefreshToken,
 		};
 	}
+	public async createAccessToken(sessionId: string): Promise<string | null> {
+		const session = await this.getSession(sessionId);
+		if (!session) return null;
 
+		const accessToken = TokenModule.signAccessToken({
+			userID: session.user.id,
+			email: session.user.email,
+			sessionID: sessionId,
+		});
+
+		return accessToken;
+	}
 	public async endSession(sessionId: string): Promise<void> {
 		const session = await this.getSession(sessionId);
 		if (!session) return;

package/packages/ui/package.json

@@ -37,6 +37,7 @@
 		"class-variance-authority": "catalog:",
 		"clsx": "catalog:",
 		"cmdk": "catalog:",
+		"motion": "^12.40.0",
 		"embla-carousel-react": "catalog:",
 		"input-otp": "catalog:",
 		"lucide-react": "catalog:",

package/packages/ui/src/api/index.ts

@@ -1,6 +1,6 @@
-import { QueryProvider } from "./query-provider";
+import { QueryProvider, queryClient } from "./query-provider";
 import { ApiSchema } from "./use-api/api-builder";
 import { useApi } from "./use-api/react-query/use-api";
 import { useApiClient } from "./use-api/react-query/use-api-client";
-
-export { QueryProvider, ApiSchema, useApi, useApiClient };
+export * from "@tanstack/react-query";
+export { QueryProvider, ApiSchema, useApi, useApiClient, queryClient };

package/packages/ui/src/api/query-provider.tsx

@@ -1,32 +1,39 @@
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { QueryClient, QueryClientProvider, type QueryClientConfig } from "@tanstack/react-query";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
-import { type ReactNode } from "react";
+import { useState } from "react";
 import { ApiHelper } from "./use-api/api-helpers";
-
-const queryClient = new QueryClient({
-	defaultOptions: {
-		queries: {
-			refetchOnMount: false,
-			refetchOnWindowFocus: false,
-			staleTime: ApiHelper.parseTime("5:min"),
-		},
-		mutations: {
-			onError(error: any) {
-				console.error(error?.response?.data);
-				// toast.error(error.response?.data?.message ?? error.message);
-			},
-		},
-	},
-});
-export const QueryProvider = ({
-	children,
-	mode,
-}: {
-	children: ReactNode;
+type QueryProviderProps = Omit<QueryClientConfig, "client"> & {
 	mode?: "development" | "production" | "staging";
-}) => {
+	children?: React.ReactNode;
+};
+export const createQueryClient = (config?: QueryClientConfig) =>
+	new QueryClient(
+		ApiHelper.merge(
+			{
+				defaultOptions: {
+					queries: {
+						refetchOnMount: false,
+						refetchOnWindowFocus: false,
+						staleTime: ApiHelper.parseTime("5:min"),
+					},
+					mutations: {
+						onError(error: any) {
+							console.error(error?.response?.data);
+						},
+					},
+				},
+			},
+			config
+		)
+	);
+
+export const queryClient = createQueryClient();
+
+export const QueryProvider = ({ children, mode, ...config }: QueryProviderProps) => {
+	const [client] = useState(() => createQueryClient(config));
+
 	return (
-		<QueryClientProvider client={queryClient}>
+		<QueryClientProvider client={client}>
 			{mode === "development" && <ReactQueryDevtools initialIsOpen={false} />}
 			{children}
 		</QueryClientProvider>

package/packages/ui/src/api/use-api/react-query/use-api.ts

@@ -8,6 +8,7 @@ import {
 } from "@tanstack/react-query";
 import { type AxiosError, type AxiosInstance, type AxiosRequestConfig } from "axios";
 import { useMemo, useRef } from "react";
+import { toast } from "sonner";
 import { z } from "zod";
 import { FormUtils } from "@repo/ui/lib/utils";
 import { ApiHelper } from "../api-helpers";
@@ -250,6 +251,13 @@ function useMutationApi<Schema extends RawSchema, K extends keyof Schema & strin
 				queryClient,
 				options?.overwriteEvents
 			);
+			if (!options?.onError && !endpoint.onError) {
+				try {
+					toast.error((error as any)?.response?.data?.message ?? error.message);
+				} catch (error) {
+					console.error(error);
+				}
+			}
 		},
 		onMutate: options?.onMutate,
 	});

package/packages/ui/src/components/custom/form-wrapper.tsx

@@ -103,7 +103,7 @@ export const FormSelectField = <
 							}}
 							value={field.value ?? defaultValueProp ?? ""}
 						>
-							<SelectTrigger className={cn("bg-background w-full", inputClassName)}>
+							<SelectTrigger aria-invalid={!!fieldState.error} className={cn("bg-background w-full", inputClassName)}>
 								<SelectValue placeholder={placeholder ?? "Select"} />
 							</SelectTrigger>
 							<SelectContent>
@@ -155,7 +155,7 @@ export const FormTextField = <
 				<Field data-invalid={!!fieldState.error} className="flex flex-col">
 					{label ? <FieldLabel className="self-start">{label}</FieldLabel> : null}
 					<FieldContent>
-						<Input {...field} {...rest} />
+						<Input aria-invalid={!!fieldState.error} {...field} {...rest} />
 					</FieldContent>
 					{description ? <FieldDescription>{description}</FieldDescription> : null}
 					<FieldError errors={[fieldState.error]} />
@@ -187,7 +187,7 @@ export const FormTextAreaField = <
 				<Field data-invalid={!!fieldState.error} className="flex flex-col">
 					{label ? <FieldLabel className="self-start">{label}</FieldLabel> : null}
 					<FieldContent>
-						<Textarea {...field} {...rest} ref={field.ref} />
+						<Textarea aria-invalid={!!fieldState.error} {...field} {...rest} ref={field.ref} />
 					</FieldContent>
 					{description ? <FieldDescription>{description}</FieldDescription> : null}
 					<FieldError errors={[fieldState.error]} />
@@ -218,6 +218,7 @@ export const FormNumberField = <
 					<FieldContent>
 						<Input
 							inputMode="numeric"
+							aria-invalid={!!fieldState.error}
 							{...field}
 							onChange={e => {
 								if (!isNaN(Number(e.currentTarget.value))) field.onChange(Number(e.currentTarget.value));
@@ -363,6 +364,7 @@ export const FormDefaultDateField = <
 					{label ? <FieldLabel className="self-start">{label}</FieldLabel> : null}
 					<FieldContent>
 						<Input
+							aria-invalid={!!fieldState.error}
 							{...field}
 							{...rest}
 							value={field.value || ""}
@@ -430,7 +432,12 @@ export function FormMultiSelectField<
 						<FieldContent className="w-full">
 							<Popover open={open} onOpenChange={setOpen}>
 								<PopoverTrigger asChild disabled={disabled}>
-									<Button variant="outline" size={"sm"} className={cn("w-full justify-between", inputClassName)}>
+									<Button
+										aria-invalid={!!fieldState.error}
+										variant="outline"
+										size={"sm"}
+										className={cn("w-full justify-between", inputClassName)}
+									>
 										{selected.length > 0 ? `${selected.length} selected` : (placeholder ?? "Select")}
 										<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 									</Button>

package/pnpm-workspace.yaml

@@ -4,6 +4,15 @@ packages:
   - "packages/*/*"
   - "configs/*"
 
+allowBuilds:
+  "@firebase/util": false
+  better-sqlite3: false
+  esbuild: false
+  msgpackr-extract: false
+  protobufjs: false
+  sharp: false
+  unrs-resolver: false
+
 catalog:
   # configs
   typescript: "^5.9.2"
@@ -75,6 +84,7 @@ catalog:
   tailwindcss: "^4.2.2"
   "@tailwindcss/vite": "^4.2.2"
   zustand: "^5.0.13"
+  motion: "^12.40.0"
 
   # email
   react-email: "^5.2.11"
@@ -88,7 +98,7 @@ catalog:
   "@tanstack/react-query-devtools": "^5.100.9"
   "@fontsource-variable/eb-garamond": "^5.2.7"
   "@fontsource-variable/inter": "^5.2.8"
-  "@hookform/resolvers": "^3.9.1"
+  "@hookform/resolvers": "^5.4.0"
   "@phosphor-icons/react": "^2.1.10"
   "@tailwindcss/postcss": "^4"
   "@tailwindcss/typography": "^0.5.19"

package/turbo.json

@@ -9,11 +9,19 @@
 
 		"build": {
 			"cache": true,
-			"inputs": ["src/**", "tsdown.config.ts", "eslint.config.*", "tsconfig*.json", "package.json"],
+			"inputs": [
+				"src/**",
+				"public/**",
+				"tsdown.config.ts",
+				"vite.config.*",
+				"react-router.config.*",
+				"eslint.config.*",
+				"tsconfig*.json",
+				"package.json"
+			],
 			"outputs": ["dist/**", "build/**"],
 			"dependsOn": ["lint", "^build"]
 		},
-
 		"typecheck": {
 			"cache": true,
 			"dependsOn": ["^typecheck", "build"],