create-shibumi 0.2.8 → 0.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-shibumi",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "Scaffold a Shibumi Stack project: Bun, Hono, Zod, Drizzle, SQLite, Alpine",
   "type": "module",
   "bin": {

package/scripts/ship.lock.json

@@ -1,4 +1,4 @@
 {
-  "url": "https://shibumistack.dev/ship/v46.ts",
-  "sha256": "bf1a6efb177a8a5e20e36b7e2c0bcec6bc5a8598dfd4f86e7ff129af92a0e648"
+  "url": "https://shibumistack.dev/ship/v47.ts",
+  "sha256": "7c4bee760498bea9f857934088e9fc1e3c1b835dfd49deb382d103248adedc63"
 }

package/src/templates/blog/agents.md

@@ -14,7 +14,9 @@ bun ship         # verify dist/, build the static image, upload, deploy
 
 ## 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/package.json

@@ -9,7 +9,7 @@
     "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"
@@ -21,6 +21,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>

package/src/templates/blog/src/pages/posts/[id].md.ts

@@ -4,7 +4,7 @@ import { getCollection, getEntry } from "astro:content";
 import type { APIRoute } from "astro";
 
 export async function getStaticPaths() {
-  return (await getCollection("blog")).map((post) => ({ params: { id: post.id } }));
+  return (await getCollection("blog", ({ data }) => !data.draft)).map((post) => ({ params: { id: post.id } }));
 }
 
 export const GET: APIRoute = async ({ params }) => {

package/src/templates/blog/src/pages/rss.xml.ts

@@ -4,7 +4,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()
   );
   return rss({

package/src/templates/full-stack/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/full-stack/public/style.css

@@ -89,7 +89,7 @@ body {
   border-top: 1px solid var(--line);
 }
 
-main .endpoints a {
+main .endpoints a:not(.btn):not(.button) {
   display: flex;
   align-items: baseline;
   justify-content: space-between;
@@ -101,13 +101,12 @@ main .endpoints a {
   transition: background 160ms ease;
 }
 
-main .endpoints a:hover,
-main .endpoints a:focus-visible {
+main .endpoints a:not(.btn):not(.button):hover,
+main .endpoints a:not(.btn):not(.button):focus-visible {
   background: var(--faint);
 }
 
-.endpoint-path {
-  font-family: var(--font-mono);
+main .endpoints code {
   font-size: var(--text-sm);
 }
 /* Inline code as rounded chips on the faint layer. */
@@ -120,7 +119,7 @@ main .endpoints a:focus-visible {
 }
 
 
-main .endpoints a:hover .endpoint-path {
+main .endpoints a:hover code {
   color: var(--accent);
 }
 

package/src/templates/full-stack/src/app.ts

@@ -107,6 +107,8 @@ const page = `<!doctype html>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>Full Stack app · shibumi</title>
+    <link rel="icon" type="image/svg+xml" href="/public/favicon.svg" />
+    <meta name="generator" content="create-shibumi (shibumistack.dev)" />
     <link rel="stylesheet" href="/public/vendor/shibumi.css" />
     <link rel="stylesheet" href="/public/style.css" />
     <!-- app.js must load before Alpine so the alpine:init listener exists
@@ -125,9 +127,9 @@ const page = `<!doctype html>
         <span class="demo-hint">stored in SQLite; reloads and deploys keep it</span>
       </section>
       <ul class="endpoints">
-        <li><a href="/api/hello?name=you"><span class="endpoint-path">GET /api/hello</span><span>query validated with Zod</span></a></li>
-        <li><a href="/api/notes"><span class="endpoint-path">GET /api/notes</span><span>Drizzle read from SQLite on the data volume</span></a></li>
-        <li><a href="/healthz"><span class="endpoint-path">GET /healthz</span><span>the check every deploy waits for</span></a></li>
+        <li><a href="/api/hello?name=you"><code>GET /api/hello</code><span>query validated with Zod</span></a></li>
+        <li><a href="/api/notes"><code>GET /api/notes</code><span>Drizzle read from SQLite on the data volume</span></a></li>
+        <li><a href="/healthz"><code>GET /healthz</code><span>the check every deploy waits for</span></a></li>
       </ul>
       <footer class="colophon">
         <p>This page lives in <code>src/app.ts</code>. House rules for coding agents are in <code>agents.md</code>. Add features with <code>bun shi add auth</code>.</p>

package/src/templates/ship.ts

@@ -25,7 +25,7 @@ const SERVER_HOSTNAME = /^[A-Za-z0-9](?:[A-Za-z0-9.-]{0,251}[A-Za-z0-9])?$/;
 const COMMIT = /^[a-f0-9]{40}$/;
 const SERVER_CLI = "~/.local/bin/shibumi-server";
 const LATEST_SOURCE = "https://shibumistack.dev/ship/latest.ts";
-const CURRENT_SOURCE = "https://shibumistack.dev/ship/v46.ts";
+const CURRENT_SOURCE = "https://shibumistack.dev/ship/v47.ts";
 let sshControlDirectory: string | undefined;
 let sshControlTarget: string | undefined;
 
@@ -96,6 +96,7 @@ interface ShipOptions {
   outputDir?: string;
   buildScript?: string;
   spa: boolean;
+  noSpa?: boolean;
 }
 
 export interface StaticSiteConfig {
@@ -160,6 +161,7 @@ export function parseShipArgs(args: string[]): ShipOptions {
     else if (argument === "--yes" || argument === "-y") parsed.yes = true;
     else if (argument === "--static") parsed.staticSite = true;
     else if (argument === "--spa") parsed.spa = true;
+    else if (argument === "--no-spa") parsed.noSpa = true;
     else if (argument === "--server" || argument === "--domain" || argument === "--trigger" || argument === "--output-dir" || argument === "--build-script") {
       const value = args[index + 1];
       if (!value || value.startsWith("-")) throw new Error(`${argument} requires a value`);
@@ -175,8 +177,9 @@ export function parseShipArgs(args: string[]): ShipOptions {
   if ([parsed.setup, parsed.update, parsed.rollback, parsed.logs, parsed.status, parsed.dev].filter(Boolean).length > 1) throw new Error("choose only one ship action");
   if (parsed.rebuild && (parsed.setup || parsed.update || parsed.rollback || parsed.logs || parsed.status || parsed.dev)) throw new Error("--rebuild applies only to shipping");
   if (parsed.trigger && !parsed.setup) throw new Error("--trigger requires --setup");
-  if ((parsed.staticSite || parsed.outputDir || parsed.buildScript || parsed.spa) && !parsed.setup) throw new Error("--static, --output-dir, --build-script, and --spa require --setup");
-  if ((parsed.outputDir || parsed.buildScript || parsed.spa) && !parsed.staticSite) throw new Error("--output-dir, --build-script, and --spa require --static");
+  if (parsed.spa && parsed.noSpa) throw new Error("--spa and --no-spa are mutually exclusive");
+  if ((parsed.staticSite || parsed.outputDir || parsed.buildScript || parsed.spa || parsed.noSpa) && !parsed.setup) throw new Error("--static, --output-dir, --build-script, and --spa require --setup");
+  if ((parsed.outputDir || parsed.buildScript || parsed.spa || parsed.noSpa) && !parsed.staticSite) throw new Error("--output-dir, --build-script, and --spa require --static");
   if (parsed.outputDir) {
     const problem = staticOutputDirProblem(parsed.outputDir);
     if (problem) throw new Error(problem);
@@ -483,7 +486,6 @@ CMD ["bun", "run", "start"]
     environment:
       HOST: 0.0.0.0
       PORT: "3000"
-    init: true
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "bun", "-e", "fetch('http://127.0.0.1:3000/').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))"]
@@ -657,7 +659,6 @@ ENTRYPOINT ["/busybox", "httpd", "-f", "-p", "3000", "-h", "/www", "-c", "/www/h
       - "127.0.0.1:\${SHIBUMI_PORT:-9001}:3000"
     labels:
 ${staticComposeLabels(config)}
-    init: true
     restart: unless-stopped
     healthcheck:
       test: ${healthcheck}
@@ -806,6 +807,7 @@ async function prepareCompose(): Promise<boolean> {
 
   if (wantStatic) {
     await generateStaticDeployment();
+    if (await offerGeneratedCommit(["Dockerfile", "compose.yaml", ".dockerignore", "scripts/static-server.ts", "package.json", "bun.lock"])) return false;
     outro("Review generated deployment files.\n\nNext: commit and push these changes, then run bun ship:setup.");
     return true;
   }
@@ -824,6 +826,8 @@ async function prepareCompose(): Promise<boolean> {
     written.push(name);
   }
   log.success(`Generated ${written.join(", ")}`);
+  log.info("Verify the app binds to 0.0.0.0 and reads PORT before shipping.");
+  if (await offerGeneratedCommit(written)) return false;
   outro("Review generated deployment files and verify app binds to 0.0.0.0 and reads PORT.\n\nNext: commit and push these changes, then run bun ship:setup.");
   return true;
 }
@@ -836,6 +840,23 @@ const SHIP_SCRIPTS = {
   "ship:logs": "bun scripts/ship.ts --logs",
 };
 
+
+// After generating deployment files interactively, offer to commit and push
+// them in the same run so setup continues without a manual rerun. Returns
+// true when the files are committed and pushed.
+async function offerGeneratedCommit(files: string[]): Promise<boolean> {
+  if (agentRun || !process.stdin.isTTY || !process.stdout.isTTY) return false;
+  const accepted = await confirm({ message: "Commit and push the generated files, then continue setup?", initialValue: true });
+  if (isCancel(accepted) || !accepted) return false;
+  const present: string[] = [];
+  for (const file of files) if (await Bun.file(join(root, file)).exists()) present.push(file);
+  await run(["git", "add", "--", ...present]);
+  await run(["git", "commit", "--only", "-m", "Add deployment configuration", "--", ...present], { inherit: true });
+  await run(["git", "push"], { inherit: true });
+  log.success("Committed and pushed deployment files");
+  return true;
+}
+
 async function generateStaticDeployment(): Promise<void> {
   // Script-less generators (Jekyll) have no package.json; create a minimal one
   // so bun ship commands and an optional build script have a home.
@@ -880,7 +901,7 @@ async function generateStaticDeployment(): Promise<void> {
   if (problem) throw new Error(problem);
 
   let spa = options.spa;
-  if (!spa && !agentRun && !options.yes) {
+  if (!spa && !options.noSpa && !agentRun && !options.yes) {
     const answer = await confirm({ message: "Single-page app? (unknown paths serve index.html)", initialValue: false });
     if (isCancel(answer)) throw new Error("setup cancelled");
     spa = answer;

package/src/templates/static/bun.lock

@@ -0,0 +1,25 @@
+{
+  "lockfileVersion": 2,
+  "configVersion": 1,
+  "workspaces": {
+    "": {
+      "name": "shibumi-static-site",
+      "devDependencies": {
+        "@clack/prompts": "1.7.0",
+      },
+    },
+  },
+  "packages": {
+    "@clack/core": ["@clack/core@1.4.3", "", { "dependencies": { "fast-wrap-ansi": "^0.2.0", "sisteransi": "^1.0.5" } }, "sha512-/kr3UWNtdJfxZtPgDqUOmG2pvwlmcLGheex5yiZKdwbzZJxhV+HMNR9QNmyY5cGwTNV6LrR7Jtp+KjhUAP1qBQ=="],
+
+    "@clack/prompts": ["@clack/prompts@1.7.0", "", { "dependencies": { "@clack/core": "1.4.3", "fast-string-width": "^3.0.2", "fast-wrap-ansi": "^0.2.0", "sisteransi": "^1.0.5" } }, "sha512-y7/yvZ2TPAnR9+jnc00klvNNLkJiXFFrQA/hlLCcxA9a2A4zQIOimyFQ9XfwYKiGD1fb5GY8vbKIIgO8d5Tb2A=="],
+
+    "fast-string-truncated-width": ["fast-string-truncated-width@3.0.3", "", {}, "sha512-0jjjIEL6+0jag3l2XWWizO64/aZVtpiGE3t0Zgqxv0DPuxiMjvB3M24fCyhZUO4KomJQPj3LTSUnDP3GpdwC0g=="],
+
+    "fast-string-width": ["fast-string-width@3.0.2", "", { "dependencies": { "fast-string-truncated-width": "^3.0.2" } }, "sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg=="],
+
+    "fast-wrap-ansi": ["fast-wrap-ansi@0.2.2", "", { "dependencies": { "fast-string-width": "^3.0.2" } }, "sha512-7F2Fl+TjRSenLqlU3UjSH0iyqopqoZIu7eZVpEirP2g1GtWa2G/ecEmBdgz31+Mxr+ELclgg6sokpSFIQiZ02Q=="],
+
+    "sisteransi": ["sisteransi@1.0.5", "", {}, "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="],
+  }
+}

package/src/templates/static/package.json

@@ -6,12 +6,15 @@
   "scripts": {
     "dev": "bun scripts/preview.ts",
     "ship": "bun scripts/ship.ts",
-    "ship:setup": "bun scripts/ship.ts --setup --static --output-dir public",
+    "ship:setup": "bun scripts/ship.ts --setup --static --output-dir public --no-spa",
     "ship:update": "bun scripts/ship.ts --update",
     "ship:status": "bun scripts/ship.ts --status",
     "ship:logs": "bun scripts/ship.ts --logs"
   },
   "engines": {
     "bun": ">=1.4.0"
+  },
+  "devDependencies": {
+    "@clack/prompts": "1.7.0"
   }
 }

package/src/templates/static/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/static/public/index.html

@@ -3,14 +3,22 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>Shibumi static site</title>
+    <title>It ships · shibumi static</title>
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+    <meta name="generator" content="create-shibumi (shibumistack.dev)" />
     <link rel="stylesheet" href="/style.css" />
   </head>
   <body>
     <main>
+      <p class="masthead"><span class="masthead-mark">渋み</span> shibumi static</p>
       <h1>It ships.</h1>
-      <p>To get started, open <code>public/index.html</code>; this page is that file. Edit, commit, run <code>bun ship</code>.</p>
-      <p>Using Astro, Jekyll, Eleventy, or another generator? Point its output here, or run <code>bun ship:setup</code> in that project instead; the Ship client packages any verified build directory.</p>
+      <p class="lede">Every file in <code>public/</code> is a page on your site. You are looking at <code>public/index.html</code>.</p>
+      <ol class="steps">
+        <li>Edit this file. <code>bun dev</code> shows it locally.</li>
+        <li>Connect your server once with <code>bun ship:setup</code>.</li>
+        <li>After that, every deploy is <code>git commit</code> and <code>bun ship</code>.</li>
+      </ol>
+      <p class="aside">Writing with Astro, Jekyll, or Eleventy instead? Run <code>bun ship:setup</code> inside that project; Ship deploys any build folder it can verify.</p>
     </main>
   </body>
 </html>

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

@@ -1,36 +1,71 @@
+/* Self-contained styles on the shibumi palette. Yours to edit. */
 :root {
   color-scheme: light dark;
-  --paper: #f5f0e4;
-  --ink: #1b130f;
-  --accent: #e95f19;
-}
-
-@media (prefers-color-scheme: dark) {
-  :root {
-    --paper: #1b130f;
-    --ink: #f5f0e4;
-    --accent: #ff8648;
-  }
+  --paper: light-dark(#f5f0e4, #1b130f);
+  --ink: light-dark(#272016, #eee5d7);
+  --muted: light-dark(#746b5d, #aaa092);
+  --faint: light-dark(rgba(39, 32, 22, 0.055), rgba(238, 229, 215, 0.07));
+  --line: light-dark(rgba(39, 32, 22, 0.14), rgba(238, 229, 215, 0.16));
+  --accent: light-dark(#e95f19, #ff8648);
+  --font-serif: ui-serif, Georgia, "Iowan Old Style", Cambria, serif;
+  --font-mono: ui-monospace, "SF Mono", Menlo, Consolas, monospace;
 }
 
 body {
   margin: 0;
   background: var(--paper);
   color: var(--ink);
-  font-family: system-ui, sans-serif;
+  font-family: ui-sans-serif, system-ui, sans-serif;
   font-size: 1.125rem;
-  line-height: 1.6;
+  line-height: 1.65;
 }
 
 main {
-  max-width: 40rem;
+  max-width: 40.625rem;
   margin: 0 auto;
-  padding: 4rem 1.5rem;
+  padding: clamp(3rem, 9vh, 6.5rem) 1.5rem 4rem;
+}
+
+.masthead {
+  display: flex;
+  align-items: baseline;
+  gap: 0.6rem;
+  margin: 0 0 3.5rem;
+  padding-bottom: 1rem;
+  border-bottom: 1px solid var(--line);
+  color: var(--muted);
+  font-size: 0.875rem;
+  letter-spacing: 0.04em;
+}
+
+.masthead-mark {
+  color: var(--accent);
+  font-size: 1rem;
 }
 
 h1 {
-  font-family: Georgia, "Times New Roman", serif;
-  font-weight: 500;
+  margin: 0 0 0.75rem;
+  font-family: var(--font-serif);
+  font-size: clamp(2.6rem, 7vw, 3.8rem);
+  font-weight: 450;
+  letter-spacing: -0.03em;
+  line-height: 1.05;
+}
+
+.lede {
+  margin: 0 0 3rem;
+  max-width: 34rem;
+  color: var(--muted);
+  font-size: 1.3125rem;
+  line-height: 1.55;
+}
+
+code {
+  padding: 0.12em 0.42em;
+  border-radius: 0.35rem;
+  background: var(--faint);
+  font-family: var(--font-mono);
+  font-size: 0.85em;
 }
 
 a {
@@ -44,7 +79,18 @@ a:hover {
   text-decoration-color: var(--accent);
 }
 
-code {
-  font-family: ui-monospace, monospace;
-  font-size: 0.9em;
+.steps {
+  margin: 0 0 2.5rem;
+  padding-left: 1.4rem;
+}
+
+.steps li {
+  margin-bottom: 0.6rem;
+}
+
+.aside {
+  padding-top: 1.5rem;
+  border-top: 1px solid var(--line);
+  color: var(--muted);
+  font-size: 1rem;
 }

package/src/templates/web/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/web/public/style.css

@@ -89,7 +89,7 @@ body {
   border-top: 1px solid var(--line);
 }
 
-main .endpoints a {
+main .endpoints a:not(.btn):not(.button) {
   display: flex;
   align-items: baseline;
   justify-content: space-between;
@@ -101,13 +101,12 @@ main .endpoints a {
   transition: background 160ms ease;
 }
 
-main .endpoints a:hover,
-main .endpoints a:focus-visible {
+main .endpoints a:not(.btn):not(.button):hover,
+main .endpoints a:not(.btn):not(.button):focus-visible {
   background: var(--faint);
 }
 
-.endpoint-path {
-  font-family: var(--font-mono);
+main .endpoints code {
   font-size: var(--text-sm);
 }
 /* Inline code as rounded chips on the faint layer. */
@@ -120,7 +119,7 @@ main .endpoints a:focus-visible {
 }
 
 
-main .endpoints a:hover .endpoint-path {
+main .endpoints a:hover code {
   color: var(--accent);
 }
 

package/src/templates/web/src/app.ts

@@ -63,6 +63,8 @@ const page = `<!doctype html>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>Web app · shibumi</title>
+    <link rel="icon" type="image/svg+xml" href="/public/favicon.svg" />
+    <meta name="generator" content="create-shibumi (shibumistack.dev)" />
     <link rel="stylesheet" href="/public/vendor/shibumi.css" />
     <link rel="stylesheet" href="/public/style.css" />
     <!-- app.js must load before Alpine so the alpine:init listener exists
@@ -81,8 +83,8 @@ const page = `<!doctype html>
         <span class="demo-hint">client state without a build step</span>
       </section>
       <ul class="endpoints">
-        <li><a href="/api/hello?name=you"><span class="endpoint-path">GET /api/hello</span><span>query validated with Zod</span></a></li>
-        <li><a href="/healthz"><span class="endpoint-path">GET /healthz</span><span>the check every deploy waits for</span></a></li>
+        <li><a href="/api/hello?name=you"><code>GET /api/hello</code><span>query validated with Zod</span></a></li>
+        <li><a href="/healthz"><code>GET /healthz</code><span>the check every deploy waits for</span></a></li>
       </ul>
       <footer class="colophon">
         <p>This page lives in <code>src/app.ts</code>. House rules for coding agents are in <code>agents.md</code>. Add features with <code>bun shi add email</code>.</p>