@camox/cli 0.15.1 → 0.16.0

package/dist/index.mjs

@@ -6,7 +6,7 @@ import { defineProgram } from "@optique/core/program";
 import { runSync } from "@optique/run";
 import { multiple, optional } from "@optique/core/modifiers";
 import { command, constant, option } from "@optique/core/primitives";
-import { integer, string } from "@optique/core/valueparser";
+import { choice, integer, string } from "@optique/core/valueparser";
 import { execSync, spawn, spawnSync } from "node:child_process";
 import fs from "node:fs";
 import http from "node:http";
@@ -382,7 +382,11 @@ const parser$6 = command("blocks", or(command("types", object({
 	type: option("--type", string({ metavar: "TYPE" })),
 	content: option("--content", string({ metavar: "JSON" })),
 	settings: optional(option("--settings", string({ metavar: "JSON" }))),
+	position: optional(option("--position", choice(["first", "last"], { metavar: "WHERE" }))),
+	afterId: optional(option("--after-id", integer({ metavar: "ID" }))),
+	beforeId: optional(option("--before-id", integer({ metavar: "ID" }))),
 	afterPosition: optional(option("--after-position", string({ metavar: "POS" }))),
+	beforePosition: optional(option("--before-position", string({ metavar: "POS" }))),
 	project: projectFlag$2,
 	production: productionFlag$2,
 	json: jsonFlag$2
@@ -397,7 +401,11 @@ const parser$6 = command("blocks", or(command("types", object({
 })), command("move", object({
 	command: constant("blocks.move"),
 	id: option("--id", integer({ metavar: "ID" })),
+	position: optional(option("--position", choice(["first", "last"], { metavar: "WHERE" }))),
+	afterId: optional(option("--after-id", integer({ metavar: "ID" }))),
+	beforeId: optional(option("--before-id", integer({ metavar: "ID" }))),
 	afterPosition: optional(option("--after-position", string({ metavar: "POS" }))),
+	beforePosition: optional(option("--before-position", string({ metavar: "POS" }))),
 	project: projectFlag$2,
 	production: productionFlag$2,
 	json: jsonFlag$2
@@ -408,6 +416,32 @@ const parser$6 = command("blocks", or(command("types", object({
 	production: productionFlag$2,
 	json: jsonFlag$2
 }))));
+const POSITIONING_FLAGS = [
+	["position", "--position"],
+	["afterId", "--after-id"],
+	["beforeId", "--before-id"],
+	["afterPosition", "--after-position"],
+	["beforePosition", "--before-position"]
+];
+/**
+* Both `create` and `move` accept multiple positioning inputs, but only one is
+* meaningful per call. The server will reject conflicts, but we surface the
+* mistake earlier (and with friendlier wording) by checking on the client.
+*/
+function collectPositioningArgs(args) {
+	const used = [];
+	const toolArgs = {};
+	for (const [key, flag] of POSITIONING_FLAGS) {
+		const value = args[key];
+		if (value === void 0) continue;
+		used.push(flag);
+		Object.assign(toolArgs, { [key]: value });
+	}
+	return {
+		used,
+		toolArgs
+	};
+}
 async function handler$6(args) {
 	const outputMode = args.json ? "json" : "auto";
 	const projectFlag = args.project;
@@ -431,6 +465,14 @@ async function handler$6(args) {
 			case "blocks.create": {
 				const content = parseJsonFlag("--content", args.content);
 				const settings = args.settings !== void 0 ? parseJsonFlag("--settings", args.settings) : void 0;
+				const { used, toolArgs } = collectPositioningArgs(args);
+				if (used.length > 1) {
+					printError({
+						code: "INVALID_ARGS",
+						message: `Pass at most one positioning flag — got: ${used.join(", ")}.`
+					});
+					process.exit(2);
+				}
 				return dispatch({
 					toolName: "createBlock",
 					args: {
@@ -438,7 +480,7 @@ async function handler$6(args) {
 						type: args.type,
 						content,
 						settings,
-						afterPosition: args.afterPosition
+						...toolArgs
 					},
 					projectFlag,
 					production,
@@ -460,16 +502,33 @@ async function handler$6(args) {
 					outputMode
 				});
 			}
-			case "blocks.move": return dispatch({
-				toolName: "moveBlock",
-				args: {
-					id: args.id,
-					afterPosition: args.afterPosition
-				},
-				projectFlag,
-				production,
-				outputMode
-			});
+			case "blocks.move": {
+				const { used, toolArgs } = collectPositioningArgs(args);
+				if (used.length === 0) {
+					printError({
+						code: "INVALID_ARGS",
+						message: "Pass a positioning flag — one of --position, --after-id, --before-id, --after-position, --before-position. Use `--position last` to move a block to the end of the page."
+					});
+					process.exit(2);
+				}
+				if (used.length > 1) {
+					printError({
+						code: "INVALID_ARGS",
+						message: `Pass at most one positioning flag — got: ${used.join(", ")}.`
+					});
+					process.exit(2);
+				}
+				return dispatch({
+					toolName: "moveBlock",
+					args: {
+						id: args.id,
+						...toolArgs
+					},
+					projectFlag,
+					production,
+					outputMode
+				});
+			}
 			case "blocks.delete": return dispatch({
 				toolName: "deleteBlock",
 				args: { id: args.id },
@@ -508,7 +567,7 @@ function copyDir(src, dest, replacements) {
 	for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
 		const srcPath = path.join(src, entry.name);
 		const destPath = path.join(dest, entry.name);
-		if (entry.isDirectory()) {
+		if (fs.statSync(srcPath).isDirectory()) {
 			copyDir(srcPath, destPath, replacements);
 			continue;
 		}
@@ -653,10 +712,12 @@ async function init() {
 	const pm = selected;
 	const s = p.spinner();
 	s.start("Scaffolding project...");
-	copyDir(path.resolve(__dirname, "..", "template"), targetDir, {
-		"{{projectName}}": name,
-		"{{projectSlug}}": project.slug
-	});
+	copyDir(path.resolve(__dirname, "..", "templates", "default"), targetDir, { "{{projectName}}": name });
+	const viteConfigPath = path.join(targetDir, "vite.config.ts");
+	let viteConfig = fs.readFileSync(viteConfigPath, "utf-8");
+	viteConfig = viteConfig.replace(/"[^"]*"(,?)[ \t]*\/\/[ \t]*camox-cli:replace-slug.*$/gm, `"${project.slug}"$1`);
+	viteConfig = viteConfig.replace(/^[ \t]*\/\/[ \t]*camox-cli:dev-only-start[ \t]*\r?\n[\s\S]*?^[ \t]*\/\/[ \t]*camox-cli:dev-only-end[ \t]*\r?\n/gm, "");
+	fs.writeFileSync(viteConfigPath, viteConfig);
 	const pkgPath = path.join(targetDir, "package.json");
 	const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
 	pkg.name = project.slug;
@@ -963,7 +1024,7 @@ switch (result.command) {
 		await handler$3();
 		break;
 	case "logout":
-		await handler$2();
+		handler$2();
 		break;
 	case "status":
 		await handler(result);

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@camox/cli",
-  "version": "0.15.1",
+  "version": "0.16.0",
   "bin": {
     "camox": "./dist/index.mjs"
   },
   "files": [
     "dist",
-    "template"
+    "templates"
   ],
   "type": "module",
   "main": "./dist/index.mjs",
@@ -25,9 +25,8 @@
   "devDependencies": {
     "@types/node": "^24.12.2",
     "@typescript/native-preview": "7.0.0-dev.20260412.1",
-    "oxlint": "^0.15.0",
-    "tsdown": "^0.21.8",
-    "@camox/api-contract": "0.15.1"
+    "vite-plus": "latest",
+    "@camox/api-contract": "0.16.0"
   },
   "nx": {
     "tags": [
@@ -35,9 +34,9 @@
     ]
   },
   "scripts": {
-    "build": "tsdown",
-    "dev": "tsdown --watch",
-    "lint": "oxlint",
-    "check": "tsgo --noEmit && oxlint --fix"
+    "build": "node scripts/sync-templates.mjs && vp pack",
+    "dev": "node scripts/sync-templates.mjs --watch --build",
+    "lint": "vp lint",
+    "check": "tsgo --noEmit && vp lint --fix"
   }
 }

package/{template → templates/default}/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@camox/template",
+  "name": "@camox/template-default",
   "version": "0.0.0",
   "private": true,
   "type": "module",

package/{template → templates/default}/vite.config.ts

@@ -13,7 +13,16 @@ export default defineConfig({
   plugins: [
     tailwindcss(),
     nitro(),
-    camox({ projectSlug: "{{projectSlug}}", syncSecret: env.CAMOX_SYNC_SECRET }),
+    camox({
+      projectSlug: "camox-template-default-01", // camox-cli:replace-slug
+      syncSecret: env.CAMOX_SYNC_SECRET,
+      // camox-cli:dev-only-start
+      _internal: {
+        authenticationUrl: "http://localhost:3274",
+        apiUrl: "http://localhost:8787",
+      },
+      // camox-cli:dev-only-end
+    }),
     tanstackStart(),
     react(),
     babelPlugin({ presets: [reactCompilerPreset()] }),

package/template/node_modules/.bin/camox

@@ -1,21 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*|*MINGW*|*MSYS*)
-        if command -v cygpath > /dev/null 2>&1; then
-            basedir=`cygpath -w "$basedir"`
-        fi
-    ;;
-esac
-
-if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/runner/work/camox/camox/node_modules/.pnpm/node_modules"
-else
-  export NODE_PATH="/home/runner/work/camox/camox/node_modules/.pnpm/node_modules:$NODE_PATH"
-fi
-if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../camox/bin/camox.mjs" "$@"
-else
-  exec node  "$basedir/../camox/bin/camox.mjs" "$@"
-fi

package/template/node_modules/.bin/intent

@@ -1,21 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*|*MINGW*|*MSYS*)
-        if command -v cygpath > /dev/null 2>&1; then
-            basedir=`cygpath -w "$basedir"`
-        fi
-    ;;
-esac
-
-if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/runner/work/camox/camox/node_modules/.pnpm/@tanstack+router-plugin@1.167.18_@tanstack+react-router@1.168.18_react-dom@19.2.5_react_f2f9ae7a1065a6f93975c3fa53defc29/node_modules/@tanstack/router-plugin/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/@tanstack+router-plugin@1.167.18_@tanstack+react-router@1.168.18_react-dom@19.2.5_react_f2f9ae7a1065a6f93975c3fa53defc29/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/node_modules"
-else
-  export NODE_PATH="/home/runner/work/camox/camox/node_modules/.pnpm/@tanstack+router-plugin@1.167.18_@tanstack+react-router@1.168.18_react-dom@19.2.5_react_f2f9ae7a1065a6f93975c3fa53defc29/node_modules/@tanstack/router-plugin/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/@tanstack+router-plugin@1.167.18_@tanstack+react-router@1.168.18_react-dom@19.2.5_react_f2f9ae7a1065a6f93975c3fa53defc29/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/node_modules:$NODE_PATH"
-fi
-if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../@tanstack/router-plugin/bin/intent.js" "$@"
-else
-  exec node  "$basedir/../@tanstack/router-plugin/bin/intent.js" "$@"
-fi

package/template/node_modules/.bin/nitro

@@ -1,21 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*|*MINGW*|*MSYS*)
-        if command -v cygpath > /dev/null 2>&1; then
-            basedir=`cygpath -w "$basedir"`
-        fi
-    ;;
-esac
-
-if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/runner/work/camox/camox/node_modules/.pnpm/nitro@3.0.260311-beta_@libsql+client@0.17.2_better-sqlite3@12.8.0_dotenv@17.4.2_drizzle_5fa6c7540198165a12d0aaffa3900f1f/node_modules/nitro/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/nitro@3.0.260311-beta_@libsql+client@0.17.2_better-sqlite3@12.8.0_dotenv@17.4.2_drizzle_5fa6c7540198165a12d0aaffa3900f1f/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/node_modules"
-else
-  export NODE_PATH="/home/runner/work/camox/camox/node_modules/.pnpm/nitro@3.0.260311-beta_@libsql+client@0.17.2_better-sqlite3@12.8.0_dotenv@17.4.2_drizzle_5fa6c7540198165a12d0aaffa3900f1f/node_modules/nitro/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/nitro@3.0.260311-beta_@libsql+client@0.17.2_better-sqlite3@12.8.0_dotenv@17.4.2_drizzle_5fa6c7540198165a12d0aaffa3900f1f/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/node_modules:$NODE_PATH"
-fi
-if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../nitro/dist/cli/index.mjs" "$@"
-else
-  exec node  "$basedir/../nitro/dist/cli/index.mjs" "$@"
-fi

package/template/node_modules/.bin/oxfmt

@@ -1,21 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*|*MINGW*|*MSYS*)
-        if command -v cygpath > /dev/null 2>&1; then
-            basedir=`cygpath -w "$basedir"`
-        fi
-    ;;
-esac
-
-if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/runner/work/camox/camox/node_modules/.pnpm/vite-plus@0.1.19_@opentelemetry+api@1.9.0_@types+node@24.12.2_esbuild@0.27.4_jiti@2.6.1_33f3463065f7b1de4fbe98a97ee72736/node_modules/vite-plus/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/vite-plus@0.1.19_@opentelemetry+api@1.9.0_@types+node@24.12.2_esbuild@0.27.4_jiti@2.6.1_33f3463065f7b1de4fbe98a97ee72736/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/node_modules"
-else
-  export NODE_PATH="/home/runner/work/camox/camox/node_modules/.pnpm/vite-plus@0.1.19_@opentelemetry+api@1.9.0_@types+node@24.12.2_esbuild@0.27.4_jiti@2.6.1_33f3463065f7b1de4fbe98a97ee72736/node_modules/vite-plus/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/vite-plus@0.1.19_@opentelemetry+api@1.9.0_@types+node@24.12.2_esbuild@0.27.4_jiti@2.6.1_33f3463065f7b1de4fbe98a97ee72736/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/node_modules:$NODE_PATH"
-fi
-if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../vite-plus/bin/oxfmt" "$@"
-else
-  exec node  "$basedir/../vite-plus/bin/oxfmt" "$@"
-fi

package/template/node_modules/.bin/oxlint

@@ -1,21 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*|*MINGW*|*MSYS*)
-        if command -v cygpath > /dev/null 2>&1; then
-            basedir=`cygpath -w "$basedir"`
-        fi
-    ;;
-esac
-
-if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/runner/work/camox/camox/node_modules/.pnpm/vite-plus@0.1.19_@opentelemetry+api@1.9.0_@types+node@24.12.2_esbuild@0.27.4_jiti@2.6.1_33f3463065f7b1de4fbe98a97ee72736/node_modules/vite-plus/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/vite-plus@0.1.19_@opentelemetry+api@1.9.0_@types+node@24.12.2_esbuild@0.27.4_jiti@2.6.1_33f3463065f7b1de4fbe98a97ee72736/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/node_modules"
-else
-  export NODE_PATH="/home/runner/work/camox/camox/node_modules/.pnpm/vite-plus@0.1.19_@opentelemetry+api@1.9.0_@types+node@24.12.2_esbuild@0.27.4_jiti@2.6.1_33f3463065f7b1de4fbe98a97ee72736/node_modules/vite-plus/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/vite-plus@0.1.19_@opentelemetry+api@1.9.0_@types+node@24.12.2_esbuild@0.27.4_jiti@2.6.1_33f3463065f7b1de4fbe98a97ee72736/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/node_modules:$NODE_PATH"
-fi
-if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../vite-plus/bin/oxlint" "$@"
-else
-  exec node  "$basedir/../vite-plus/bin/oxlint" "$@"
-fi

package/template/node_modules/.bin/shadcn

@@ -1,21 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*|*MINGW*|*MSYS*)
-        if command -v cygpath > /dev/null 2>&1; then
-            basedir=`cygpath -w "$basedir"`
-        fi
-    ;;
-esac
-
-if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/runner/work/camox/camox/node_modules/.pnpm/shadcn@4.3.1_@types+node@24.12.2_typescript@5.9.2/node_modules/shadcn/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/shadcn@4.3.1_@types+node@24.12.2_typescript@5.9.2/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/node_modules"
-else
-  export NODE_PATH="/home/runner/work/camox/camox/node_modules/.pnpm/shadcn@4.3.1_@types+node@24.12.2_typescript@5.9.2/node_modules/shadcn/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/shadcn@4.3.1_@types+node@24.12.2_typescript@5.9.2/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/node_modules:$NODE_PATH"
-fi
-if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../shadcn/dist/index.js" "$@"
-else
-  exec node  "$basedir/../shadcn/dist/index.js" "$@"
-fi

package/template/node_modules/.bin/tsgo

@@ -1,21 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*|*MINGW*|*MSYS*)
-        if command -v cygpath > /dev/null 2>&1; then
-            basedir=`cygpath -w "$basedir"`
-        fi
-    ;;
-esac
-
-if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/runner/work/camox/camox/node_modules/.pnpm/@typescript+native-preview@7.0.0-dev.20260412.1/node_modules/@typescript/native-preview/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/@typescript+native-preview@7.0.0-dev.20260412.1/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/node_modules"
-else
-  export NODE_PATH="/home/runner/work/camox/camox/node_modules/.pnpm/@typescript+native-preview@7.0.0-dev.20260412.1/node_modules/@typescript/native-preview/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/@typescript+native-preview@7.0.0-dev.20260412.1/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/node_modules:$NODE_PATH"
-fi
-if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../@typescript/native-preview/bin/tsgo.js" "$@"
-else
-  exec node  "$basedir/../@typescript/native-preview/bin/tsgo.js" "$@"
-fi

package/template/node_modules/.bin/vp

@@ -1,21 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*|*MINGW*|*MSYS*)
-        if command -v cygpath > /dev/null 2>&1; then
-            basedir=`cygpath -w "$basedir"`
-        fi
-    ;;
-esac
-
-if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/runner/work/camox/camox/node_modules/.pnpm/vite-plus@0.1.19_@opentelemetry+api@1.9.0_@types+node@24.12.2_esbuild@0.27.4_jiti@2.6.1_33f3463065f7b1de4fbe98a97ee72736/node_modules/vite-plus/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/vite-plus@0.1.19_@opentelemetry+api@1.9.0_@types+node@24.12.2_esbuild@0.27.4_jiti@2.6.1_33f3463065f7b1de4fbe98a97ee72736/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/node_modules"
-else
-  export NODE_PATH="/home/runner/work/camox/camox/node_modules/.pnpm/vite-plus@0.1.19_@opentelemetry+api@1.9.0_@types+node@24.12.2_esbuild@0.27.4_jiti@2.6.1_33f3463065f7b1de4fbe98a97ee72736/node_modules/vite-plus/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/vite-plus@0.1.19_@opentelemetry+api@1.9.0_@types+node@24.12.2_esbuild@0.27.4_jiti@2.6.1_33f3463065f7b1de4fbe98a97ee72736/node_modules:/home/runner/work/camox/camox/node_modules/.pnpm/node_modules:$NODE_PATH"
-fi
-if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../vite-plus/bin/vp" "$@"
-else
-  exec node  "$basedir/../vite-plus/bin/vp" "$@"
-fi