idcmd 0.0.6 → 0.0.7

package/README.md

@@ -19,18 +19,19 @@ idcmd dev          # tailwind watch + SSR dev server
 idcmd build        # static dist/
 idcmd preview      # serve dist/ locally
 idcmd deploy       # build + validate Vercel static deploy config
-idcmd client ...   # add/update local site/client implementations
+idcmd client ...   # add/update local site/code implementations
 ```
 
 ## Layout (V1)
 
 - `site/content/<slug>.md` -> `/<slug>/` (`index.md` -> `/`)
-- `site/client/*` is local source code (you own and edit these files)
-- `site/client/runtime/*.ts` is local browser runtime code (compiled to `site/public/_idcmd/*.js`)
-- `site/styles/tailwind.css` -> `site/public/styles.css` (dev) / `dist/styles.css` (build)
-- `site/public/` static assets
-- `site/server/routes/**` file-based server routes (dev/server-host only)
+- `site/code/ui/*` is local UI source code (you own and edit these files)
+- `site/code/runtime/*.ts` is local browser runtime code (compiled to `dist/_idcmd/*.js`)
+- `site/code/routes/**` file-based server routes (dev/server-host only)
+- `site/styles/tailwind.css` -> `dist/styles.css`
+- `site/assets/` static assets
 - `site/site.jsonc` site config
+- `dist/` generated output (gitignored)
 
 ## Syncing Local Client Code
 
@@ -44,7 +45,7 @@ idcmd client update runtime --yes
 ```
 
 `add` creates missing files. `update` overwrites changed files and requires `--yes` unless `--dry-run` is used.
-Runtime files in `site/client/runtime/` are compiled automatically by `idcmd dev` and `idcmd build`.
+Runtime files in `site/code/runtime/` are compiled automatically by `idcmd dev` and `idcmd build`.
 
 ## Example: Add A Page
 
@@ -67,7 +68,7 @@ It renders at `/hello/`.
 
 ## Custom Server Routes (V1)
 
-Add `site/server/routes/api/hello.ts`:
+Add `site/code/routes/api/hello.ts`:
 
 ```ts
 export const GET = (): Response => Response.json({ ok: true });
@@ -93,7 +94,7 @@ It responds at `/api/hello`.
 
 ### Slug and path rules
 
-- Content lives at `site/content/<slug>.md` (or legacy `content/<slug>.md`).
+- Content lives at `site/content/<slug>.md`.
 - `slug="index"` is the home page.
 - Canonical HTML paths are `/` for index and `/<slug>/` otherwise.
 - Markdown download paths exist in two forms:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "idcmd",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/rustydotwtf/idcmd"

package/src/build.ts

@@ -20,7 +20,7 @@ const MIN_SEARCH_QUERY_LENGTH = 2;
 
 const project = await getProjectPaths();
 
-// Find all content files in `content/` (`content/<slug>.md`).
+// Find all content files in `site/content/` (`site/content/<slug>.md`).
 const contentFiles: string[] = [];
 
 const buildStart = performance.now();
@@ -212,7 +212,7 @@ if (siteConfig.baseUrl) {
   console.log(`  generated ${project.distDir}/robots.txt`);
 } else {
   console.log(
-    "Warning: site.jsonc missing baseUrl; skipping sitemap.xml and robots.txt."
+    "Warning: site/site.jsonc missing baseUrl; skipping sitemap.xml and robots.txt."
   );
 }
 

package/src/cli/commands/build.ts

@@ -1,15 +1,12 @@
 import { compileRuntimeAssetsOnce } from "../runtime-assets";
 
 const findTailwindInput = async (): Promise<string> => {
-  const candidates = ["site/styles/tailwind.css", "content/styles.css"];
-  for (const path of candidates) {
-    // eslint-disable-next-line no-await-in-loop
-    if (await Bun.file(path).exists()) {
-      return path;
-    }
+  const path = "site/styles/tailwind.css";
+  if (await Bun.file(path).exists()) {
+    return path;
   }
   throw new Error(
-    "Could not find Tailwind input. Expected site/styles/tailwind.css (new layout) or content/styles.css (legacy)."
+    "Could not find Tailwind input. Expected site/styles/tailwind.css."
   );
 };
 

package/src/cli/commands/client.ts

@@ -1,7 +1,7 @@
 import { ensureDir } from "../fs";
 import { dirname, joinPath } from "../path";
 
-const TEMPLATE_CLIENT_DIR = joinPath(
+const TEMPLATE_UI_DIR = joinPath(
   import.meta.dir,
   "..",
   "..",
@@ -9,12 +9,23 @@ const TEMPLATE_CLIENT_DIR = joinPath(
   "templates",
   "default",
   "site",
-  "client"
+  "code",
+  "ui"
+);
+const TEMPLATE_RUNTIME_DIR = joinPath(
+  import.meta.dir,
+  "..",
+  "..",
+  "..",
+  "templates",
+  "default",
+  "site",
+  "code",
+  "runtime"
 );
-const TEMPLATE_RUNTIME_DIR = joinPath(TEMPLATE_CLIENT_DIR, "runtime");
 
-const SITE_CLIENT_DIR = joinPath("site", "client");
-const SITE_RUNTIME_DIR = joinPath(SITE_CLIENT_DIR, "runtime");
+const SITE_UI_DIR = joinPath("site", "code", "ui");
+const SITE_RUNTIME_DIR = joinPath("site", "code", "runtime");
 const SITE_CONFIG_PATH = joinPath("site", "site.jsonc");
 
 const CLIENT_PARTS = [
@@ -63,8 +74,8 @@ const getFileSpecsForPart = (part: ClientPart): ClientFileSpec[] => {
     return [
       {
         fileName: "layout.tsx",
-        targetPath: joinPath(SITE_CLIENT_DIR, "layout.tsx"),
-        templatePath: joinPath(TEMPLATE_CLIENT_DIR, "layout.tsx"),
+        targetPath: joinPath(SITE_UI_DIR, "layout.tsx"),
+        templatePath: joinPath(TEMPLATE_UI_DIR, "layout.tsx"),
       },
     ];
   }
@@ -73,8 +84,8 @@ const getFileSpecsForPart = (part: ClientPart): ClientFileSpec[] => {
     return [
       {
         fileName: "right-rail.tsx",
-        targetPath: joinPath(SITE_CLIENT_DIR, "right-rail.tsx"),
-        templatePath: joinPath(TEMPLATE_CLIENT_DIR, "right-rail.tsx"),
+        targetPath: joinPath(SITE_UI_DIR, "right-rail.tsx"),
+        templatePath: joinPath(TEMPLATE_UI_DIR, "right-rail.tsx"),
       },
     ];
   }
@@ -83,8 +94,8 @@ const getFileSpecsForPart = (part: ClientPart): ClientFileSpec[] => {
     return [
       {
         fileName: "search-page.tsx",
-        targetPath: joinPath(SITE_CLIENT_DIR, "search-page.tsx"),
-        templatePath: joinPath(TEMPLATE_CLIENT_DIR, "search-page.tsx"),
+        targetPath: joinPath(SITE_UI_DIR, "search-page.tsx"),
+        templatePath: joinPath(TEMPLATE_UI_DIR, "search-page.tsx"),
       },
     ];
   }

package/src/cli/commands/dev.ts

@@ -11,22 +11,16 @@ export interface DevFlags {
 }
 
 const findTailwindInput = async (): Promise<string> => {
-  const candidates = ["site/styles/tailwind.css", "content/styles.css"];
-  for (const path of candidates) {
-    // eslint-disable-next-line no-await-in-loop
-    if (await Bun.file(path).exists()) {
-      return path;
-    }
+  const path = "site/styles/tailwind.css";
+  if (await Bun.file(path).exists()) {
+    return path;
   }
   throw new Error(
-    "Could not find Tailwind input. Expected site/styles/tailwind.css (new layout) or content/styles.css (legacy)."
+    "Could not find Tailwind input. Expected site/styles/tailwind.css."
   );
 };
 
-const resolveTailwindOutput = async (): Promise<string> => {
-  const hasSite = await Bun.file("site/site.jsonc").exists();
-  return hasSite ? "site/public/styles.css" : "public/styles.css";
-};
+const resolveTailwindOutput = (): string => "dist/styles.css";
 
 const idcmdServerEntry = (): string =>
   // `src/server.ts` lives two levels up from `src/cli/commands/*`.
@@ -135,7 +129,7 @@ export const devCommand = async (flags: DevFlags): Promise<number> => {
   }
 
   const tailwindInput = await findTailwindInput();
-  const tailwindOutput = await resolveTailwindOutput();
+  const tailwindOutput = resolveTailwindOutput();
   const cssProc = spawnCssProcess(tailwindInput, tailwindOutput);
   const serverProc = spawnServerProcess(port);
   installDevSignalHandlers({ cssProc, runtimeProc, serverProc });

package/src/cli/runtime-assets.ts

@@ -1,7 +1,7 @@
 import { joinPath } from "./path";
 
-const RUNTIME_SOURCE_DIR = joinPath("site", "client", "runtime");
-const RUNTIME_OUTPUT_DIR = joinPath("site", "public", "_idcmd");
+const RUNTIME_SOURCE_DIR = joinPath("site", "code", "runtime");
+const RUNTIME_OUTPUT_DIR = joinPath("dist", "_idcmd");
 
 const RUNTIME_ENTRY_FILES = [
   "live-reload.ts",
@@ -37,17 +37,14 @@ const scanRuntimeEntrypoints = async (
 const getRuntimeEntrypoints = async (): Promise<string[]> => {
   const entries = runtimeEntryPaths();
   const { existing, missing } = await scanRuntimeEntrypoints(entries);
-
   if (existing.length === 0) {
     return [];
   }
-
   if (missing.length > 0) {
     throw new Error(
       `Incomplete runtime scripts in ${RUNTIME_SOURCE_DIR}. Missing: ${missing.join(", ")}`
     );
   }
-
   return existing;
 };
 

package/src/content/icons.ts

@@ -73,6 +73,6 @@ export const resolveIconSvg = async (
     return namedSvg;
   }
 
-  console.warn(`Icon "${icon}" not found in icons/ folder for ${slug}`);
+  console.warn(`Icon "${icon}" not found in icons directory for ${slug}`);
   return getFallbackIcon();
 };

package/src/content/paths.ts

@@ -21,7 +21,7 @@ export const slugFromContentFile = (file: string): string => {
 export const scanContentFiles =
   async function* scanContentFiles(): AsyncGenerator<string> {
     const { contentDir } = await getProjectPaths();
-    // `content/<slug>.md`
+    // `site/content/<slug>.md`
     for await (const file of flatContentGlob.scan(contentDir)) {
       yield file;
     }

package/src/project/paths.ts

@@ -1,6 +1,11 @@
 const DEFAULT_SITE_DIR = "site";
 const DEFAULT_DIST_DIR = "dist";
 const ASSET_PREFIX = "/_idcmd" as const;
+const CONTENT_DIR = "content";
+const PUBLIC_DIR = "assets";
+const ICONS_DIR = "assets/icons";
+const ROUTES_DIR = "code/routes";
+const SITE_CONFIG_FILE = "site.jsonc";
 
 export interface ProjectPaths {
   assetPrefix: typeof ASSET_PREFIX;
@@ -37,50 +42,41 @@ const joinPath = (...parts: string[]): string => {
   return normalized.join("/");
 };
 
-const hasNewLayout = (cwd: string, siteDirName: string): Promise<boolean> =>
-  Bun.file(joinPath(cwd, siteDirName, "site.jsonc")).exists();
-
-const buildPaths = (
-  cwd: string,
-  rootDir: string,
-  distDirName: string
-): ProjectPaths => {
-  const distDir = joinPath(cwd, distDirName);
-  const contentDir = joinPath(rootDir, "content");
-  const publicDir = joinPath(rootDir, "public");
-  const iconsDir = joinPath(rootDir, "icons");
-  const routesDir = joinPath(rootDir, "server", "routes");
-  const siteConfigPath = joinPath(rootDir, "site.jsonc");
-
-  const siteDir = rootDir === cwd ? null : rootDir;
-
+const buildPaths = (args: {
+  cwd: string;
+  distDirName: string;
+  siteDirName: string;
+}): ProjectPaths => {
+  const siteRoot = joinPath(args.cwd, args.siteDirName);
   return {
     assetPrefix: ASSET_PREFIX,
-    contentDir,
-    distDir,
-    iconsDir,
-    publicDir,
-    routesDir,
-    siteConfigPath,
-    siteDir,
+    contentDir: joinPath(siteRoot, CONTENT_DIR),
+    distDir: joinPath(args.cwd, args.distDirName),
+    iconsDir: joinPath(siteRoot, ICONS_DIR),
+    publicDir: joinPath(siteRoot, PUBLIC_DIR),
+    routesDir: joinPath(siteRoot, ROUTES_DIR),
+    siteConfigPath: joinPath(siteRoot, SITE_CONFIG_FILE),
+    siteDir: siteRoot,
   };
 };
 
-export const resolveProjectPaths = async (
+export const resolveProjectPaths = (
   options: ResolveProjectPathsOptions = {}
 ): Promise<ProjectPaths> => {
   const cwd = trimTrailingSlash(options.cwd ?? process.cwd());
   const distDirName = options.distDir ?? DEFAULT_DIST_DIR;
   const siteDirName = options.siteDir ?? DEFAULT_SITE_DIR;
-
-  const siteRoot = joinPath(cwd, siteDirName);
-  const rootDir = (await hasNewLayout(cwd, siteDirName)) ? siteRoot : cwd;
-  return buildPaths(cwd, rootDir, distDirName);
+  return Promise.resolve(buildPaths({ cwd, distDirName, siteDirName }));
 };
 
 let cached: Promise<ProjectPaths> | null = null;
+let cachedCwd: string | null = null;
 
 export const getProjectPaths = (): Promise<ProjectPaths> => {
-  cached ??= resolveProjectPaths();
+  const cwd = trimTrailingSlash(process.cwd());
+  if (!cached || cachedCwd !== cwd) {
+    cachedCwd = cwd;
+    cached = resolveProjectPaths({ cwd });
+  }
   return cached;
 };

package/src/render/layout-loader.ts

@@ -2,7 +2,7 @@ import type { RenderLayout } from "./layout";
 
 import { renderLayout as defaultRenderLayout } from "./layout";
 
-const USER_LAYOUT_PATH = "site/client/layout.tsx";
+const USER_LAYOUT_PATH = "site/code/ui/layout.tsx";
 
 const loadUserLayout = async (
   filePath: string

package/src/render/right-rail-loader.ts

@@ -2,7 +2,7 @@ import type { RightRailComponent } from "./right-rail";
 
 import { RightRail as defaultRightRail } from "./right-rail";
 
-const USER_RIGHT_RAIL_PATH = "site/client/right-rail.tsx";
+const USER_RIGHT_RAIL_PATH = "site/code/ui/right-rail.tsx";
 
 const loadUserRightRail = async (
   filePath: string

package/src/search/search-page-loader.ts

@@ -2,7 +2,7 @@ import type { RenderSearchPageContent } from "./page";
 
 import { renderSearchPageContent as defaultRenderSearchPageContent } from "./page";
 
-const USER_SEARCH_PAGE_PATH = "site/client/search-page.tsx";
+const USER_SEARCH_PAGE_PATH = "site/code/ui/search-page.tsx";
 
 const loadUserSearchPage = async (
   filePath: string

package/src/server/live-reload.ts

@@ -59,7 +59,7 @@ export const createLiveReload = (env: LiveReloadEnv): LiveReloadController => {
       return;
     }
 
-    console.log("Watching content/ for changes...");
+    console.log("Watching site/content/ for changes...");
     let snapshot = await getContentSnapshot();
 
     const poll = async (): Promise<void> => {
@@ -85,11 +85,7 @@ export const createLiveReload = (env: LiveReloadEnv): LiveReloadController => {
     server: ServerInstance,
     pathname: string
   ): "handled" | Response | undefined => {
-    // Backward compatible: accept both legacy and new websocket paths.
-    if (
-      !env.isDev ||
-      (pathname !== env.websocketPath && pathname !== "/__live-reload")
-    ) {
+    if (!env.isDev || pathname !== env.websocketPath) {
       return undefined;
     }
 

package/src/server/static.ts

@@ -46,7 +46,7 @@ export const serveStaticFile = async (
   pathname: string,
   env: ServeStaticEnv
 ): Promise<Response | null> => {
-  const roots = env.isDev ? [env.publicDir] : [env.distDir, env.publicDir];
+  const roots = [env.distDir, env.publicDir];
 
   for (const root of roots) {
     const served = await tryServeFileFromRoot(root, pathname, env);

package/src/server.ts

@@ -155,7 +155,6 @@ const maybeHandleCanonicalRedirect = (url: URL): Response | undefined => {
   const { pathname } = url;
 
   if (
-    pathname === "/__live-reload" ||
     pathname === `${project.assetPrefix}/live-reload` ||
     pathname.startsWith("/api/")
   ) {

package/src/site/config.ts

@@ -91,8 +91,7 @@ export interface ResolvedRightRailConfig {
   };
 }
 
-const LEGACY_SITE_CONFIG_PATH = "site.jsonc";
-const NEW_SITE_CONFIG_PATH = "site/site.jsonc";
+const SITE_CONFIG_PATH = "site/site.jsonc";
 const LOCALHOST_HOSTNAMES = new Set(["localhost", "127.0.0.1", "::1"]);
 
 const DEFAULT_RIGHT_RAIL_CONFIG: ResolvedRightRailConfig = {
@@ -220,15 +219,8 @@ const parseSiteConfigUnknown = (
   }
 };
 
-const resolveSiteConfigPath = async (): Promise<string> => {
-  if (await Bun.file(NEW_SITE_CONFIG_PATH).exists()) {
-    return NEW_SITE_CONFIG_PATH;
-  }
-  return LEGACY_SITE_CONFIG_PATH;
-};
-
 export const loadSiteConfig = async (): Promise<SiteConfig> => {
-  const configPath = await resolveSiteConfigPath();
+  const configPath = SITE_CONFIG_PATH;
   const file = Bun.file(configPath);
   if (!(await file.exists())) {
     return DEFAULT_SITE_CONFIG;

package/templates/default/README.md

@@ -20,13 +20,16 @@ bun run smoke
 
 ## Layout
 
-- `site/content/` markdown pages (`index.md` -> `/`, `about.md` -> `/about/`)
-- `site/client/` local UI implementation (`layout.tsx`, `right-rail.tsx`, `search-page.tsx`)
-- `site/client/runtime/` local browser runtime TS (`*_idcmd` scripts compile from here)
-- `site/styles/tailwind.css` Tailwind entrypoint (compiled to `site/public/styles.css`)
-- `site/public/` static assets
-- `site/server/routes/` file-based server routes (dev/server-host only)
-- `site/site.jsonc` site configuration
+- Content: `site/content/` markdown pages (`index.md` -> `/`, `about.md` -> `/about/`)
+- Code: `site/code/ui/` (`layout.tsx`, `right-rail.tsx`, `search-page.tsx`)
+- Code: `site/code/runtime/` browser runtime TS (`*_idcmd` scripts compile from here)
+- Code: `site/code/routes/` file-based server routes (dev/server-host only)
+- Assets: `site/assets/` static files you own (icons, images, favicon, etc.)
+- Styles source: `site/styles/tailwind.css`
+- Config: `site/site.jsonc`
+- Generated output: `dist/` (`dist/styles.css`, `dist/_idcmd/*.js`, built pages)
+
+The mental model is simple: edit `site/content` and `site/code`, treat `dist/` as generated output.
 
 ## Sync Local Client Files
 
@@ -37,8 +40,8 @@ idcmd client update layout --yes
 idcmd client update runtime --yes
 ```
 
-These commands copy the latest baseline implementations from `idcmd` into `site/client/`.
-Runtime files in `site/client/runtime/` are compiled automatically by `idcmd dev` and `idcmd build`.
+These commands copy the latest baseline implementations from `idcmd` into `site/code/ui/` and `site/code/runtime/`.
+Runtime files in `site/code/runtime/` are compiled automatically by `idcmd dev` and `idcmd build`.
 
 ## Deploy (Vercel static)
 

package/templates/default/scripts/check-internal.ts

@@ -11,16 +11,16 @@ const checks: InternalCheck[] = [
     run: () => fileExists("package.json"),
   },
   {
-    description: "site config must exist (site/site.jsonc or site.jsonc)",
-    run: async () =>
-      (await fileExists("site/site.jsonc")) || (await fileExists("site.jsonc")),
+    description: "site config must exist (site/site.jsonc)",
+    run: () => fileExists("site/site.jsonc"),
   },
   {
-    description:
-      "tailwind input must exist (site/styles/tailwind.css or content/styles.css)",
-    run: async () =>
-      (await fileExists("site/styles/tailwind.css")) ||
-      (await fileExists("content/styles.css")),
+    description: "tailwind input must exist (site/styles/tailwind.css)",
+    run: () => fileExists("site/styles/tailwind.css"),
+  },
+  {
+    description: "site code UI entry must exist (site/code/ui/layout.tsx)",
+    run: () => fileExists("site/code/ui/layout.tsx"),
   },
 ];
 

package/templates/default/scripts/check.ts

@@ -28,6 +28,20 @@ const LINT_CONFIG_ERROR =
   "No linter configuration found. Run `bun x ultracite init` once in this project.";
 const NO_TESTS_MESSAGE = "No tests found; skipping test step.";
 const MAX_OUTPUT_LINES = 120;
+const LINT_TARGETS = [
+  "README.md",
+  "package.json",
+  "tsconfig.json",
+  "vercel.json",
+  ".oxlintrc.json",
+  ".oxfmtrc.jsonc",
+  "scripts",
+  "site/code",
+  "site/content",
+  "site/assets",
+  "site/styles",
+  "site/site.jsonc",
+];
 const ROOT_TEST_FILE_PATTERNS = [
   "*.test.ts",
   "*.test.tsx",
@@ -86,7 +100,7 @@ const steps: CheckStep[] = [
     name: "Internal",
   },
   {
-    command: [process.execPath, "x", "ultracite", "check"],
+    command: [process.execPath, "x", "ultracite", "check", ...LINT_TARGETS],
     id: "lint",
     name: "Lint",
   },

package/templates/default/scripts/smoke.ts

@@ -142,6 +142,11 @@ const runSmokeChecks = async (): Promise<void> => {
   await assertApiResponse();
 };
 
+const runProjectCheck = async (): Promise<void> => {
+  const check = await runCommand([process.execPath, "run", "check"]);
+  assertCommandOk("bun run check", check);
+};
+
 const startDev = (): {
   devProc: ReturnType<typeof Bun.spawn>;
   devStderr: Promise<string>;
@@ -174,19 +179,44 @@ const logDevFailure = async (args: {
   console.error(stderr.trim() || "(empty)");
 };
 
-const main = async (): Promise<number> => {
+const toErrorMessage = (error: unknown): string => {
+  if (error instanceof Error) {
+    return error.message;
+  }
+  return String(error);
+};
+
+const runDevSmokeFlow = async (): Promise<number> => {
   const { devProc, devStderr, devStdout } = startDev();
 
   try {
     await waitForReady();
     await runSmokeChecks();
-    return 0;
   } catch (error) {
     await logDevFailure({ error, stderr: devStderr, stdout: devStdout });
     return 1;
   } finally {
     await shutdownDev(devProc);
   }
+  return 0;
+};
+
+const runPostDevCheck = async (): Promise<number> => {
+  try {
+    await runProjectCheck();
+    return 0;
+  } catch (error) {
+    console.error(toErrorMessage(error));
+    return 1;
+  }
+};
+
+const main = async (): Promise<number> => {
+  const smokeCode = await runDevSmokeFlow();
+  if (smokeCode !== 0) {
+    return smokeCode;
+  }
+  return runPostDevCheck();
 };
 
 const code = await main();

package/templates/default/site/{server → code}/server.ts

@@ -1,4 +1,4 @@
 // Optional: this file is here as the obvious place to put server-side code.
-// V1 runs the built-in idcmd server; add custom endpoints via `site/server/routes/**`.
+// V1 runs the built-in idcmd server; add custom endpoints via `site/code/routes/**`.
 
 export const serverPlaceholder = true;