create-shibumi 0.2.8 → 0.3.0

package/src/cli.ts

@@ -1,9 +1,23 @@
 #!/usr/bin/env bun
 
 import { cancel, confirm, intro, isCancel, log, outro, select, spinner, text } from "@clack/prompts";
-import { existsSync, readFileSync } from "fs";
+import { existsSync, readFileSync, readdirSync } from "fs";
 import { join } from "path";
-import { HELP_TEXT, bunVersionProblem, parseArgs, validateName, type TemplateId } from "./args";
+import {
+  AdoptError,
+  adoptProject,
+  dependencyInstall,
+  detectBuildOutput,
+  loadShipStatic,
+} from "./adopt";
+import {
+  HELP_TEXT,
+  bunVersionProblem,
+  parseArgs,
+  validateName,
+  type ParsedArgs,
+  type TemplateId,
+} from "./args";
 import { CreateError, createProject } from "./create";
 
 const VERSION = (
@@ -37,6 +51,209 @@ async function printInstaller(): Promise<never> {
   process.exit(0);
 }
 
+const dim = (value: string) => `\x1b[2m${value}\x1b[22m`;
+const accent = (value: string) => `\x1b[38;5;208m${value}\x1b[0m`;
+
+// Offer the first deployment in the same run. Both entry paths end here, so
+// "Deploy to a VPS now?" means the same thing whether the project was just
+// scaffolded or just adopted.
+async function runShipSetup(dest: string, label: string): Promise<void> {
+  const proc = Bun.spawn(["bun", "run", "ship:setup"], {
+    cwd: dest,
+    stdin: "inherit",
+    stdout: "inherit",
+    stderr: "inherit",
+  });
+  const code = await proc.exited;
+  if (code !== 0) {
+    process.stderr.write(
+      `ship:setup did not finish. Your project is intact; run "bun ship:setup" ${label} to retry.\n`
+    );
+    process.exit(1);
+  }
+}
+
+/**
+ * `bun create shibumi .`: vendor the Ship client into the project that is
+ * already here instead of scaffolding a new one. Nothing that exists is
+ * overwritten or reinterpreted, and git is never touched.
+ */
+async function adoptExisting(args: ParsedArgs): Promise<void> {
+  const root = process.cwd();
+  const entries = readdirSync(root, { withFileTypes: true }).filter((entry) => entry.name !== ".git");
+  if (entries.length === 0) {
+    process.stderr.write(
+      `Nothing to adopt: this directory is empty.\nRun bun create shibumi <name> to scaffold a new project.\n`
+    );
+    process.exit(2);
+  }
+
+  const packagePath = join(root, "package.json");
+  const pkg = (existsSync(packagePath)
+    ? JSON.parse(readFileSync(packagePath, "utf8"))
+    : {}) as {
+    scripts?: Record<string, string>;
+    dependencies?: Record<string, string>;
+    devDependencies?: Record<string, string>;
+  };
+  // Adopt generates the static image and only that. A start script means
+  // something runs in the container, which is ship:setup's job: it asks
+  // server-or-static and writes the matching files.
+  if (pkg.scripts?.start) {
+    process.stderr.write(
+      [
+        `This looks like a server app (package.json has a start script).`,
+        `Next: run "bun ship:setup" here; it generates server deployment files.`,
+        `Shipping a static build from a project with a start script? Run "bun ship:setup --static --output-dir <dir>".`,
+        "",
+      ].join("\n")
+    );
+    process.exit(2);
+  }
+  const detected = detectBuildOutput({
+    dependencies: { ...pkg.dependencies, ...pkg.devDependencies },
+    files: entries.filter((entry) => entry.isFile()).map((entry) => entry.name),
+    directories: entries.filter((entry) => entry.isDirectory()).map((entry) => entry.name),
+  });
+  // A flat site at the project root has no directory to serve, and the image
+  // never packages the whole checkout.
+  if (!detected && entries.some((entry) => entry.isFile() && entry.name === "index.html")) {
+    process.stderr.write(
+      [
+        `A static image serves one directory, and index.html is at the project root.`,
+        `Next: move the site into public/ (mkdir public && git mv index.html public/), then run bun create shibumi . again.`,
+        "",
+      ].join("\n")
+    );
+    process.exit(2);
+  }
+  log.info(
+    detected
+      ? `Existing project found (${detected.framework} detected)`
+      : "Existing project found"
+  );
+
+  const interactive = !args.yes;
+  if (interactive) {
+    const proceed = await confirm({
+      message: "Add deploy tooling to this project?",
+      active: "Yes",
+      inactive: "No",
+      initialValue: true,
+    });
+    if (isCancel(proceed) || !proceed) {
+      cancel("Cancelled. Nothing was changed.");
+      process.exit(130);
+    }
+  }
+
+  const ship = await loadShipStatic();
+  let outputDir = detected?.outputDir;
+  if (interactive) {
+    const elsewhere = "";
+    if (detected) {
+      const choice = await select({
+        message: "Built site directory?",
+        options: [
+          { value: detected.outputDir, label: `${detected.outputDir}/ ${dim("(detected)")}` },
+          { value: elsewhere, label: "Somewhere else" },
+        ],
+      });
+      if (isCancel(choice)) exitCancelled();
+      outputDir = choice === elsewhere ? undefined : choice;
+    }
+    if (!outputDir) {
+      const answer = await text({
+        message: "Built site directory?",
+        placeholder: detected?.outputDir ?? "dist",
+        validate: (value) =>
+          value ? ship.staticOutputDirProblem(value) : "Enter the directory your build writes",
+      });
+      if (isCancel(answer)) exitCancelled();
+      outputDir = answer;
+    }
+  }
+  if (!outputDir) {
+    process.stderr.write(
+      `Could not detect the built site directory.\nRun bun create shibumi . in a terminal to choose one.\n`
+    );
+    process.exit(1);
+  }
+
+  let result;
+  try {
+    result = await adoptProject({
+      root,
+      outputDir,
+      buildScript: typeof pkg.scripts?.build === "string" ? "build" : undefined,
+      spa: args.spa,
+      ship,
+    });
+  } catch (err) {
+    if (err instanceof AdoptError) {
+      process.stderr.write(`${err.message}\n`);
+      process.exit(err.exitCode);
+    }
+    throw err;
+  }
+
+  log.success(`Wrote ${result.written.join(", ")}`);
+  if (result.scripts.length > 0) log.success(`Added scripts: ${result.scripts.join(", ")}`);
+  if (result.kept.length > 0) log.info(`Left untouched: ${result.kept.join(", ")}`);
+
+  // The vendored client imports @clack/prompts. A project that already has a
+  // node_modules gets no auto-install, so declaring the dependency is not
+  // enough: every interactive ship command would die on the missing import.
+  if (result.dependency) {
+    const install = dependencyInstall(
+      entries.filter((entry) => entry.isFile()).map((entry) => entry.name)
+    );
+    if (install.manual) {
+      log.warn(
+        `This project has its own lockfile, so nothing was installed here.\nNext: ${install.manual}, then bun ship:setup.`
+      );
+    } else if (!args.install) {
+      log.warn("Run bun install before bun ship:setup; the ship client imports @clack/prompts.");
+    } else {
+      const s = spinner();
+      s.start("Installing @clack/prompts");
+      const proc = Bun.spawn(install.command, {
+        cwd: root,
+        stdin: "ignore",
+        stdout: "ignore",
+        stderr: "pipe",
+      });
+      const ok = (await proc.exited) === 0;
+      s.stop(ok ? "Installed @clack/prompts" : "Could not install @clack/prompts");
+      if (!ok) log.warn("Run bun install before bun ship:setup; the ship client imports @clack/prompts.");
+    }
+  }
+
+  let deployNow = false;
+  if (interactive) {
+    const answer = await confirm({
+      message: "Deploy to a VPS now?",
+      active: "Yes",
+      inactive: "Later",
+      initialValue: false,
+    });
+    if (isCancel(answer)) exitCancelled();
+    deployNow = answer;
+  }
+  if (deployNow) await runShipSetup(root, "here");
+
+  log.message(
+    [
+      deployNow
+        ? `${accent("next")}  bun ship          ${dim("deploy your first commit")}`
+        : `${accent("next")}  bun ship:setup    ${dim("connect your VPS when you're ready")}`,
+      "",
+      dim(`Deployments serve ${outputDir}/. Review the generated Dockerfile and compose.yaml.`),
+    ].join("\n")
+  );
+  outro(`Docs: ${accent("https://shibumistack.dev/docs")}`);
+}
+
 async function main(): Promise<void> {
   if (process.argv.slice(2).includes("--print-installer")) {
     await printInstaller();
@@ -65,13 +282,20 @@ async function main(): Promise<void> {
   const interactive = !args.yes;
   if (interactive && !process.stdin.isTTY) {
     process.stderr.write(
-      `No interactive terminal. Use --yes with a project name and --template.\n`
+      args.adopt
+        ? `No interactive terminal. Run "bun create shibumi . --yes" to adopt this project with its detected build directory.\n`
+        : `No interactive terminal. Use --yes with a project name and --template.\n`
     );
     process.exit(2);
   }
 
   intro("渋み shibumi");
 
+  if (args.adopt) {
+    await adoptExisting(args);
+    return;
+  }
+
   let name: string;
   if (args.name) {
     name = args.name;
@@ -89,7 +313,6 @@ async function main(): Promise<void> {
   if (args.template) {
     template = args.template;
   } else {
-    const dim = (value: string) => `\x1b[2m${value}\x1b[22m`;
     const detail = (value: string) => `\n    ${dim(value)}`;
     const answer = await select({
       message: "What are you shipping?",
@@ -99,8 +322,8 @@ async function main(): Promise<void> {
           label: `Bun full-stack app ${dim("(recommended)")}${detail("Hono, Alpine, and SQLite with migrations and backups")}`,
         },
         {
-          value: "web" as TemplateId,
-          label: `Bun web app${detail("Hono, Alpine, and Zod; no database")}`,
+          value: "blog" as TemplateId,
+          label: `Blog${detail("Astro: posts, RSS, sitemap, SEO meta, llms.txt")}`,
         },
         {
           value: "static" as TemplateId,
@@ -110,26 +333,6 @@ async function main(): Promise<void> {
     });
     if (isCancel(answer)) exitCancelled();
     template = answer as TemplateId;
-    if (template === "static") {
-      const start = await select({
-        message: "Start from?",
-        options: [
-          {
-            value: "static" as TemplateId,
-            label: `Plain files${detail("index.html and friends in public/")}`,
-          },
-          {
-            value: "blog" as TemplateId,
-            label: `Astro blog${detail("posts, RSS, sitemap, SEO meta, llms.txt, markdown alternates")}`,
-          },
-        ],
-      });
-      if (isCancel(start)) exitCancelled();
-      template = start as TemplateId;
-      if (template === "static") {
-        log.info("Using a generator? Point bun ship:setup at its output directory later.");
-      }
-    }
   }
 
   let deployNow = false;
@@ -189,19 +392,7 @@ async function main(): Promise<void> {
       scripts?: Record<string, string>;
     };
     if (pkg.scripts?.["ship:setup"] && existsSync(join(dest, "scripts", "ship.ts"))) {
-      const proc = Bun.spawn(["bun", "run", "ship:setup"], {
-        cwd: dest,
-        stdin: "inherit",
-        stdout: "inherit",
-        stderr: "inherit",
-      });
-      const code = await proc.exited;
-      if (code !== 0) {
-        process.stderr.write(
-          `ship:setup did not finish. Your project is intact; run "bun ship:setup" inside ${name} to retry.\n`
-        );
-        process.exit(1);
-      }
+      await runShipSetup(dest, `inside ${name}`);
     } else {
       process.stdout.write(
         `This template has no ship:setup yet. Run "bun ship:setup" inside ${name} once it does.\n`
@@ -209,8 +400,6 @@ async function main(): Promise<void> {
     }
   }
 
-  const accent = (value: string) => `\x1b[38;5;208m${value}\x1b[0m`;
-  const dim = (value: string) => `\x1b[2m${value}\x1b[22m`;
   log.message(
     [
       `${accent("next")}  cd ${name}`,

package/src/templates/blog/agents.md

@@ -10,11 +10,14 @@ bun run build    # astro build to dist/
 bun run check    # astro check (types + templates)
 bun ship:setup   # configure the deploy target (preconfigured: static, dist/, build script)
 bun ship         # verify dist/, build the static image, upload, deploy
+bun ship:webhook # opt in to push-to-deploy; --off reverses it
 ```
 
 ## Routes and templates
 
-- Posts are markdown files in `src/content/blog/`; the schema in `src/content.config.ts` requires title (max 60), description (50 to 160 characters, drives meta/RSS/llms.txt), date, optional ogImage.
+- Posts are markdown files in `src/content/blog/`; the schema in `src/content.config.ts` requires title (max 60), description (50 to 160 characters, drives meta/RSS/llms.txt), date, optional ogImage, and an optional `draft` flag (default false).
+- `draft: true` keeps a post out of everything: no page, no listing, no RSS, no llms.txt, no markdown alternate. Publish by removing the flag and running `bun ship`.
+- Images: put files in `src/assets/` and reference them relatively from the markdown (`![alt](../../assets/photo.jpg)`); Astro optimizes them at build. Files in `public/` are served verbatim by URL.
 - `src/pages/index.astro` lists posts; `src/pages/posts/[id].astro` renders one; `src/layouts/Base.astro` and `src/components/BaseHead.astro` own the frame and every meta tag.
 - Generated endpoints: `/rss.xml`, `/llms.txt`, `/robots.txt`, and a markdown alternate for every post at `/posts/<id>.md`. All derive from the content collection; never hand-edit their output.
 - Site identity lives in `src/site.ts`. Design lives in `public/style.css` (one file, shibumi tokens, semantic selectors).

package/src/templates/blog/bun.lock

@@ -11,6 +11,7 @@
       },
       "devDependencies": {
         "@astrojs/check": "0.9.10",
+        "@clack/prompts": "1.7.0",
         "typescript": "5.9.2",
       },
     },

package/src/templates/blog/gitignore

@@ -1,4 +1,6 @@
 node_modules/
 dist/
 .astro/
+.env
+.env.*
 .DS_Store

package/src/templates/blog/package.json

@@ -9,10 +9,11 @@
     "check": "astro check",
     "preview": "astro preview",
     "ship": "bun scripts/ship.ts",
-    "ship:setup": "bun scripts/ship.ts --setup --static --output-dir dist --build-script build",
+    "ship:setup": "bun scripts/ship.ts --setup --static --output-dir dist --build-script build --no-spa",
     "ship:update": "bun scripts/ship.ts --update",
     "ship:status": "bun scripts/ship.ts --status",
-    "ship:logs": "bun scripts/ship.ts --logs"
+    "ship:logs": "bun scripts/ship.ts --logs",
+    "ship:webhook": "bun scripts/ship.ts --webhook"
   },
   "dependencies": {
     "@astrojs/rss": "4.0.19",
@@ -21,6 +22,7 @@
   },
   "devDependencies": {
     "@astrojs/check": "0.9.10",
+    "@clack/prompts": "1.7.0",
     "typescript": "5.9.2"
   },
   "engines": {

package/src/templates/blog/public/favicon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><style>text{fill:#e95f19;font-family:"Hiragino Sans","Noto Sans JP",sans-serif}@media (prefers-color-scheme:dark){text{fill:#ff8648}}</style><text x="50" y="55" font-size="62" text-anchor="middle" dominant-baseline="central">渋</text></svg>

package/src/templates/blog/public/style.css

@@ -36,14 +36,27 @@
     line-height: 1.6;
 
     > header {
-      border-bottom: 1px solid var(--hairline);
-      padding-bottom: 1rem;
+      max-width: 40.5rem;
+      margin: 0 auto;
+      padding-top: 1rem;
 
       a {
+        display: inline-flex;
+        align-items: center;
+        gap: 0.7rem;
         color: var(--ink);
-        font-weight: 600;
+        font-family: ui-serif, Georgia, "Iowan Old Style", Cambria, serif;
+        font-size: 1.25rem;
+        font-weight: 500;
+        letter-spacing: 0.01em;
         text-decoration: none;
       }
+
+      .mark-badge {
+        color: var(--accent);
+        font-family: "Hiragino Sans", "Noto Sans JP", sans-serif;
+        font-size: 1.125rem;
+      }
     }
 
     > main {
@@ -53,7 +66,6 @@
     }
 
     > footer {
-      border-top: 1px solid var(--hairline);
       padding-block: 4rem;
       text-align: center;
       color: var(--muted);
@@ -145,3 +157,64 @@
     margin-top: 0;
   }
 }
+
+/* Post images: full column width, soft corners, credit line stays quiet. */
+article img {
+  display: block;
+  width: 100%;
+  height: auto;
+  border-radius: 0.6rem;
+  opacity: 0.9;
+  transition: opacity 200ms ease;
+}
+
+article img:hover,
+article img:focus-visible {
+  opacity: 1;
+}
+
+article small {
+  display: block;
+  margin-top: 0.5rem;
+  color: var(--muted);
+  font-size: 0.8rem;
+}
+
+.home-title {
+  display: flex;
+  align-items: baseline;
+  gap: 1rem;
+}
+
+.home-title .mark-badge {
+  color: var(--accent);
+  font-family: "Hiragino Sans", "Noto Sans JP", sans-serif;
+  font-size: 0.42em;
+}
+
+.post-end {
+  margin-top: 4rem;
+}
+
+.ghost-pill {
+  display: inline-block;
+  padding: 0.5rem 1.3rem;
+  border: 1px solid var(--hairline);
+  border-radius: 999px;
+  color: var(--muted);
+  text-decoration: none;
+  transition: color 160ms ease, border-color 160ms ease;
+}
+
+.ghost-pill:hover,
+.ghost-pill:focus-visible {
+  color: var(--accent);
+  border-color: var(--accent);
+}
+
+article :not(pre) > code {
+  padding: 0.12em 0.42em;
+  border-radius: 0.35rem;
+  background: color-mix(in srgb, var(--ink) 6%, transparent);
+  font-size: 0.85em;
+}

package/src/templates/blog/src/components/BaseHead.astro

@@ -1,4 +1,5 @@
 ---
+import { ClientRouter } from "astro:transitions";
 import { SITE } from "../site";
 
 interface Props {
@@ -16,6 +17,9 @@ const isArticle = Boolean(publishedTime);
 ---
 
 <meta charset="utf-8" />
+<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+<meta name="generator" content="create-shibumi (shibumistack.dev)" />
+<ClientRouter />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>{title}</title>
 <meta name="description" content={description} />

package/src/templates/blog/src/content/blog/one-vps-is-plenty.md

@@ -1,13 +1,15 @@
 ---
 title: One VPS is plenty
-description: A five-euro server runs more blogs than most of us will ever write. The hard part was never capacity; it was confidence.
+description: This blog is static files in a 1.4 MB container on a shared five-euro VPS. The deploy script, not the hardware, is what platforms were selling.
 date: 2026-07-15
 ---
 
-This site is static files behind a 1.4 MB container on a small VPS. It could serve every reader I will ever have from a machine that also runs four other projects.
+This site is static files behind a 1.4 MB container on a small VPS that also runs four other projects. A five-euro machine serves this traffic without noticing.
 
-What kept people off their own servers was never capacity. It was the deploy story: what happens when the build breaks, how you roll back, whether the thing you tested is the thing that shipped. Platforms answered those questions and charged rent on the answer.
+People stayed on platforms for the deploy story: what happens when the build breaks, how to roll back, whether the thing you tested is the thing that shipped.
 
-The answers turn out to be portable. Build the exact commit, verify the output, ship the image, health-check before cutover, keep the previous image for rollback. None of that requires a platform; it requires a script you can read.
+![A single stack of balanced stones by the sea](https://images.pexels.com/photos/289586/pexels-photo-289586.jpeg?auto=compress&cs=tinysrgb&w=1200)
 
-Rent is fine. Owning is calmer.
+<small>Photo via [Pexels](https://www.pexels.com/photo/289586/)</small>
+
+Those answers fit in a script. Build the exact commit, verify the output, upload the image over SSH, health-check before cutover, keep the previous image for rollback. `bun ship` runs all of it, and the script is short enough to read before you trust it.

package/src/templates/blog/src/content/blog/own-your-source.md

@@ -1,13 +1,17 @@
 ---
 title: Own your source
-description: Frameworks lend you abstractions and charge interest. Generated code you can read is a debt-free way to start a project.
+description: This starter copies routes, styles, and config into your repository as plain files. What that costs you, and what it saves, six months in.
 date: 2026-08-01
 ---
 
-Most starters hand you a dependency. This one hands you files.
+This starter does not install itself as a dependency. It copies files into your repository and gets out of the way.
 
-The difference shows up six months in. When behavior lives in a package, changing it means reading someone else's issue tracker. When behavior lives in your repository, changing it means editing a file you have already read.
+The difference shows up six months in. To change behavior that lives in a package, you read someone else's issue tracker and wait for a release. To change behavior that lives in your repository, you edit a file you have already read.
 
-Generated code has a bad reputation because generators used to produce piles you could not maintain. The fix is not less generation; it is generating less. A route file, a layout, a stylesheet with five variables. Small enough to read in one sitting, which means small enough to own.
+![Six calligraphy brushes laid out on paper](https://images.pexels.com/photos/6315632/pexels-photo-6315632.jpeg?auto=compress&cs=tinysrgb&w=1200)
 
-There is a test for this: delete the tool that made the project. If the project still builds, still deploys, and still makes sense, you own it. If not, you rented it.
+<small>Photo via [Pexels](https://www.pexels.com/photo/close-up-of-ink-brushes-6315632/)</small>
+
+Generated code earned its bad reputation from generators that produced more code than anyone could maintain. So this one generates little: a route file, a layout, a stylesheet with five variables. Reading all of it takes one sitting.
+
+One test tells you whether you own a project: delete the tool that made it. This site still builds, still deploys, and still makes sense with create-shibumi gone.

package/src/templates/blog/src/content/blog/writing-for-agents.md

@@ -1,13 +1,15 @@
 ---
 title: Writing for readers who curl
-description: Half your readers are now programs. Serving markdown alternates and an llms.txt costs one endpoint and respects both audiences.
+description: Every post here is served twice, as rendered HTML and as plain markdown, with an llms.txt index. One endpoint covers the agent readers.
 date: 2026-06-20
 ---
 
-Someone will read this post in a browser. Something will read it with an HTTP client and a token budget.
+Half the readers of this post are agents: HTTP clients with a token budget instead of a viewport.
 
-The polite response is to serve both well. Every post here exists twice: the HTML you may be reading, and a plain markdown file at the same path with `.md` on the end. An `llms.txt` at the root lists them all with one-line summaries, so an agent can survey the whole site in a single small request instead of scraping navigation markup.
+So every post here exists twice. There is the HTML you may be reading, and a plain markdown file at the same URL with `.md` appended. An `llms.txt` at the root lists every post with a one-line summary, so an agent can survey the whole site in one small request instead of scraping navigation markup.
 
-This is not much work. The markdown already exists; the build just refrains from destroying it. One endpoint, a dozen lines.
+![A hand writing calligraphy with a brush and black ink](https://images.pexels.com/photos/9478289/pexels-photo-9478289.jpeg?auto=compress&cs=tinysrgb&w=1200)
 
-Formats are a courtesy. HTML for eyes, markdown for context windows, RSS for the patient. The content is the same; only the reader changes.
+<small>Photo via [Pexels](https://www.pexels.com/photo/calligraphy-using-a-blank-ink-and-paint-brush-9478289/)</small>
+
+The markdown already existed; the build publishes it instead of throwing it away. One endpoint, about a dozen lines of it.

package/src/templates/blog/src/content.config.ts

@@ -11,6 +11,9 @@ const blog = defineCollection({
     description: z.string().min(50).max(160),
     date: z.coerce.date(),
     ogImage: z.string().optional(),
+    // Draft posts build nowhere: no page, no listing, no RSS, no llms.txt.
+    // Flip to false (or remove the line) to publish.
+    draft: z.boolean().default(false),
   }),
 });
 

package/src/templates/blog/src/layouts/Base.astro

@@ -2,6 +2,8 @@
 import BaseHead from "../components/BaseHead.astro";
 import { SITE } from "../site";
 
+const isHome = Astro.url.pathname === "/";
+
 interface Props {
   title: string;
   description: string;
@@ -17,7 +19,16 @@ interface Props {
     <BaseHead {...Astro.props} />
   </head>
   <body>
-    <header><a href="/">{SITE.name}</a></header>
+    {
+      !isHome && (
+        <header>
+          <a href="/" class="mark">
+            <span class="mark-badge" transition:name="site-mark">渋み</span>
+            <span transition:name="site-title">{SITE.name}</span>
+          </a>
+        </header>
+      )
+    }
     <main>
       <slot />
     </main>

package/src/templates/blog/src/pages/index.astro

@@ -3,7 +3,7 @@ import { getCollection } from "astro:content";
 import Base from "../layouts/Base.astro";
 import { SITE } from "../site";
 
-const posts = (await getCollection("blog")).sort(
+const posts = (await getCollection("blog", ({ data }) => !data.draft)).sort(
   (a, b) => b.data.date.valueOf() - a.data.date.valueOf()
 );
 const formatDate = (date: Date) =>
@@ -12,7 +12,10 @@ const formatDate = (date: Date) =>
 
 <Base title={SITE.name} description={SITE.description}>
   <article>
-    <h1>{SITE.name}</h1>
+    <h1 class="home-title">
+      <span class="mark-badge" transition:name="site-mark">渋み</span>
+      <span transition:name="site-title">{SITE.name}</span>
+    </h1>
     <ul class="posts">
       {
         posts.map((post) => (

package/src/templates/blog/src/pages/llms.txt.ts

@@ -5,7 +5,7 @@ import { getCollection } from "astro:content";
 import { SITE } from "../site";
 
 export const GET: APIRoute = async (context) => {
-  const posts = (await getCollection("blog")).sort(
+  const posts = (await getCollection("blog", ({ data }) => !data.draft)).sort(
     (a, b) => b.data.date.valueOf() - a.data.date.valueOf()
   );
   const lines = [

package/src/templates/blog/src/pages/posts/[id].astro

@@ -3,7 +3,7 @@ import { getCollection, render } from "astro:content";
 import Base from "../../layouts/Base.astro";
 
 export async function getStaticPaths() {
-  return (await getCollection("blog")).map((post) => ({
+  return (await getCollection("blog", ({ data }) => !data.draft)).map((post) => ({
     params: { id: post.id },
     props: { post },
   }));
@@ -27,5 +27,6 @@ const formatDate = (date: Date) =>
     <h1>{post.data.title}</h1>
     <p class="lede">{post.data.description}</p>
     <Content />
+    <p class="post-end"><a class="ghost-pill" href="/">← Back to the blog</a></p>
   </article>
 </Base>