create-shibumi 0.3.2 → 0.3.6

package/src/templates/full-stack/Dockerfile

@@ -19,5 +19,5 @@ USER bun
 # refusing to build login links from the Host header. Never unset it here.
 ENV NODE_ENV=production
 ENV DB_PATH=/data/app.db
-EXPOSE 3000
+EXPOSE 9001
 CMD ["bun", "dist/server.js"]

package/src/templates/full-stack/agents.md

@@ -6,7 +6,7 @@ Bun full-stack app generated by create-shibumi. Hono routes, Zod validation, Alp
 
 ```sh
 bun dev          # Ship wrapper starts hot reload on the configured app port
-bun dev:app      # plain watch mode on PORT (default 3000)
+bun dev:app      # plain watch mode on PORT (default 9001)
 bun test         # route, security-header, migration, backup, restore tests
 bun run check    # TypeScript check
 bun run build    # bundle src/server.ts to dist/server.js

package/src/templates/full-stack/compose.yaml

@@ -2,14 +2,17 @@ services:
   app:
     build: .
     ports:
-      - "127.0.0.1:${SHIBUMI_PORT:-9001}:3000"
+      - "127.0.0.1:${SHIBUMI_PORT:-9001}:9001"
     environment:
+      # Container and host both listen above 9000; SHIBUMI_PORT is the host
+      # port and 9001 is the app's own default (see src/env.ts).
+      PORT: "9001"
       DB_PATH: /data/app.db
     volumes:
       - app_data:/data
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "wget", "-q", "-T", "5", "-O", "/dev/null", "http://127.0.0.1:3000/healthz"]
+      test: ["CMD", "wget", "-q", "-T", "5", "-O", "/dev/null", "http://127.0.0.1:9001/healthz"]
       interval: 60s
       timeout: 10s
       retries: 3

package/src/templates/full-stack/public/vendor/shibumi.css

@@ -81,15 +81,15 @@ h1, h2, h3 {
 
 a { color: inherit; }
 
-main a:not(.btn):not(.button) {
+main a:where(:not(.btn)):where(:not(.button)) {
     text-decoration: underline;
     text-decoration-color: color-mix(in srgb, var(--accent) 30%, transparent);
     text-underline-offset: 0.18em;
     transition: text-decoration-color 160ms ease;
 }
 
-main a:not(.btn):not(.button):hover,
-main a:not(.btn):not(.button):focus-visible {
+main a:where(:not(.btn)):where(:not(.button)):hover,
+main a:where(:not(.btn)):where(:not(.button)):focus-visible {
     text-decoration-color: var(--accent);
 }
 
@@ -420,3 +420,15 @@ nav a[aria-current="page"] {
 :has(> .copied), :has(> .is-copied) {
     animation: copy-glow 1.2s ease-in-out;
 }
+
+.dim { color: var(--muted); }
+
+/* Syntax colors for terminal and code blocks. */
+.syntax-command { color:var(--accent); font-weight:750; }
+.syntax-option { color:light-dark(#397a8f,#89dceb); }
+.syntax-string { color:light-dark(#56733d,#a6e3a1); }
+.syntax-comment { color:var(--muted); font-style:italic; }
+.syntax-key,.syntax-keyword { color:light-dark(#7c55a2,#cba6f7); }
+.syntax-literal,.syntax-number { color:light-dark(#a34f30,#fab387); }
+.syntax-added { color:var(--success-text); }
+.syntax-removed { color:light-dark(#a33f43,#f38ba8); }

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

@@ -3,7 +3,7 @@ import { z } from "zod";
 // Validate the environment at the boundary; the app never reads process.env
 // directly. Add new variables here so misconfiguration fails at startup.
 const schema = z.object({
-  PORT: z.coerce.number().int().min(1).max(65535).default(3000),
+  PORT: z.coerce.number().int().min(1).max(65535).default(9001),
   // Container deployments mount a persistent volume at /data and set
   // DB_PATH=/data/app.db (see compose.yaml). Local development stays in ./data.
   DB_PATH: z.string().min(1).default("data/app.db"),

package/src/templates/ship.ts

@@ -26,7 +26,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/v48.ts";
+const CURRENT_SOURCE = "https://shibumistack.dev/ship/v51.ts";
 let sshControlDirectory: string | undefined;
 let sshControlTarget: string | undefined;
 
@@ -500,8 +500,8 @@ RUN bun install --frozen-lockfile
 
 COPY . .
 ${hasBuildScript ? "RUN bun run build\n\n" : ""}ENV HOST=0.0.0.0
-ENV PORT=3000
-EXPOSE 3000
+ENV PORT=9001
+EXPOSE 9001
 
 CMD ["bun", "run", "start"]
 `,
@@ -509,13 +509,13 @@ CMD ["bun", "run", "start"]
   app:
     build: .
     ports:
-      - "127.0.0.1:\${SHIBUMI_PORT:-9001}:3000"
+      - "127.0.0.1:\${SHIBUMI_PORT:-9001}:9001"
     environment:
       HOST: 0.0.0.0
-      PORT: "3000"
+      PORT: "9001"
     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))"]
+      test: ["CMD", "bun", "-e", "fetch('http://127.0.0.1:9001/').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))"]
       interval: 30s
       timeout: 5s
       retries: 3
@@ -623,7 +623,7 @@ import { join, normalize } from "node:path";
 
 const ROOT = ${JSON.stringify(`/www`)};
 const server = Bun.serve({
-  port: 3000,
+  port: 9001,
   async fetch(request) {
     if (request.method !== "GET" && request.method !== "HEAD") return new Response("Not found", { status: 404 });
     let pathname;
@@ -662,7 +662,7 @@ WORKDIR /app
 COPY ${config.outputDir} /www
 COPY scripts/static-server.ts ./static-server.ts
 USER bun
-EXPOSE 3000
+EXPOSE 9001
 CMD ["bun", "static-server.ts"]
 `
     : `FROM ${BUSYBOX_IMAGE} AS busybox
@@ -671,19 +671,19 @@ FROM scratch
 COPY --from=busybox /bin/busybox /busybox
 COPY --chown=65534:65534 ${config.outputDir} /www
 USER 65534:65534
-EXPOSE 3000
-ENTRYPOINT ["/busybox", "httpd", "-f", "-p", "3000", "-h", "/www", "-c", "/www/httpd.conf"]
+EXPOSE 9001
+ENTRYPOINT ["/busybox", "httpd", "-f", "-p", "9001", "-h", "/www", "-c", "/www/httpd.conf"]
 `;
   const healthcheck = config.spa
-    ? `["CMD", "bun", "-e", "fetch('http://127.0.0.1:3000/').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))"]`
-    : `["CMD", "/busybox", "wget", "-q", "-T", "5", "-O", "/dev/null", "http://127.0.0.1:3000/"]`;
+    ? `["CMD", "bun", "-e", "fetch('http://127.0.0.1:9001/').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))"]`
+    : `["CMD", "/busybox", "wget", "-q", "-T", "5", "-O", "/dev/null", "http://127.0.0.1:9001/"]`;
   return {
     Dockerfile: dockerfile,
     "compose.yaml": `services:
   app:
     build: .
     ports:
-      - "127.0.0.1:\${SHIBUMI_PORT:-9001}:3000"
+      - "127.0.0.1:\${SHIBUMI_PORT:-9001}:9001"
     labels:
 ${staticComposeLabels(config)}
     restart: unless-stopped
@@ -1805,11 +1805,46 @@ async function verifyDockerCredentialHelpers(): Promise<void> {
   }
 }
 
+// Distinguish a socket permission problem from a stopped engine so the
+// message points at the real fix. The common case is a shell session that
+// predates a docker group change: the account is a member in /etc/group,
+// but the session's groups froze at login, so the socket still denies it.
+async function dockerGroupAdvice(): Promise<string> {
+  const me = process.env.USER || process.env.LOGNAME || "";
+  if (!me || me === "root") return "";
+  const current = await run(["id", "-nG"], { allowFailure: true });
+  const sessionHasGroup = current.exitCode === 0 && /(?:^|\s)docker(?:\s|$)/.test(current.stdout);
+  const groupLine = (await run(["getent", "group", "docker"], { allowFailure: true })).stdout.trim();
+  const members = new Set((groupLine.split(":")[3] ?? "").split(",").filter(Boolean));
+  if (members.has(me) && !sessionHasGroup) {
+    return `\n\n${me} is in the docker group, but this shell session started before that group change and still lacks it. Log out and back in, or rerun the ship command in a docker-group shell (newgrp docker, or sg docker -c 'bun scripts/ship.ts').`;
+  }
+  if (!members.has(me)) {
+    return `\n\n${me} is not in the docker group, which owns the Docker socket. Add your account, then log out and back in:\n\n  sudo usermod -aG docker ${me}`;
+  }
+  return "";
+}
+
+async function dockerEngineErrorMessage(detail: string): Promise<string> {
+  const next = "\n\nNext: start or restart it, then run docker info. When docker info shows Server details, run bun ship again.\n\nColima: colima restart\nPodman: podman machine restart\nDocker Desktop: open or restart Docker Desktop\n\nHelp: https://shibumistack.dev/docs/ship/troubleshooting#docker-engine";
+  if (!Bun.which("docker")) {
+    return `Docker CLI is not installed or not on your PATH (${detail || "docker: command not found"}).\n\nNext: install Docker, verify docker info, then run bun ship.\n\nHelp: https://shibumistack.dev/docs/ship/troubleshooting#docker-engine`;
+  }
+  if (/permission denied/i.test(detail)) {
+    const advice = await dockerGroupAdvice();
+    return `Docker cannot reach your container engine: the Docker socket refused your user (${detail}).${advice}\n\nVerify with docker info (Client and Server sections), then run bun ship again.\n\nHelp: https://shibumistack.dev/docs/ship/troubleshooting#docker-engine`;
+  }
+  if (/cannot connect to the docker daemon|connection refused|no such file or directory/i.test(detail)) {
+    return `Docker cannot reach your container engine.${next}`;
+  }
+  return `Docker cannot reach your container engine (${detail}).${next}`;
+}
+
 async function localBuildFrontend(config: ClientConfig): Promise<string[] | undefined> {
   if (config.deploymentMode !== "prebuilt") return undefined;
   if (!config.platform) throw new Error("server image platform is missing.\n\nNext: run bun ship:setup.");
   const docker = await run(["docker", "info"], { allowFailure: true });
-  if (docker.exitCode !== 0) throw new Error("Docker CLI cannot reach a compatible engine.\n\nNext: start Colima with colima start, verify docker info, then run bun ship.");
+  if (docker.exitCode !== 0) throw new Error(await dockerEngineErrorMessage(docker.stderr.trim() || docker.stdout.trim()));
   const plugin = await run(["docker", "compose", "version"], { allowFailure: true });
   const standalone = plugin.exitCode === 0
     ? undefined
@@ -2110,7 +2145,7 @@ async function runDev(): Promise<void> {
   // setup, fall back to the Shibumi port convention (registered apps get the
   // first free port above 9000) and skip the Remote row.
   const config = await readConfig();
-  const port = config?.port ?? 9000;
+  const port = config?.port ?? 9001;
   if (await portIsBusy(port)) {
     const lsof = Bun.which("lsof");
     const fuser = Bun.which("fuser");

package/src/templates/static/scripts/preview.ts

@@ -11,7 +11,7 @@ function withHeaders(res: Response): Response {
   return res;
 }
 const server = Bun.serve({
-  port: Number(process.env.PORT) || 4173,
+  port: Number(process.env.PORT) || 9001,
   async fetch(request) {
     if (request.method !== "GET" && request.method !== "HEAD") return withHeaders(new Response("Not found", { status: 404 }));
     let pathname;

package/src/templates/blog/astro.config.mjs

@@ -1,13 +0,0 @@
-// @ts-check
-import sitemap from "@astrojs/sitemap";
-import { defineConfig } from "astro/config";
-
-export default defineConfig({
-  // Set this to your real domain before the first `bun ship`.
-  // Sitemap, RSS, canonical URLs, and og:url all derive from it.
-  site: "https://example.com",
-  integrations: [sitemap()],
-  // "directory" keeps clean URLs as posts/foo/index.html, which the pinned
-  // static server routes without any adapter or rewrites.
-  build: { format: "directory" },
-});

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

@@ -1,41 +0,0 @@
----
-import { ClientRouter } from "astro:transitions";
-import { SITE } from "../site";
-
-interface Props {
-  title: string;
-  description: string;
-  ogImage?: string;
-  publishedTime?: Date;
-  markdownPath?: string;
-}
-
-const { title, description, ogImage, publishedTime, markdownPath } = Astro.props;
-const canonical = new URL(Astro.url.pathname, Astro.site);
-const image = new URL(ogImage ?? "/og-default.png", Astro.site);
-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} />
-<meta name="author" content={SITE.author} />
-<link rel="canonical" href={canonical} />
-<link rel="stylesheet" href="/style.css" />
-<link rel="alternate" type="application/rss+xml" title={SITE.name} href="/rss.xml" />
-{markdownPath && <link rel="alternate" type="text/markdown" href={markdownPath} />}
-<meta property="og:title" content={title} />
-<meta property="og:description" content={description} />
-<meta property="og:type" content={isArticle ? "article" : "website"} />
-<meta property="og:url" content={canonical} />
-<meta property="og:image" content={image} />
-<meta property="og:site_name" content={SITE.name} />
-{publishedTime && <meta property="article:published_time" content={publishedTime.toISOString()} />}
-<meta name="twitter:card" content="summary_large_image" />
-<meta name="twitter:title" content={title} />
-<meta name="twitter:description" content={description} />
-<meta name="twitter:image" content={image} />

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

@@ -1,20 +0,0 @@
-import { glob } from "astro/loaders";
-import { defineCollection, z } from "astro:content";
-
-// The schema enforces the SEO contract: every post has a title that fits a
-// tab and a description that fits a search snippet, and both feed the meta
-// tags, RSS, and llms.txt.
-const blog = defineCollection({
-  loader: glob({ pattern: "**/*.md", base: "./src/content/blog" }),
-  schema: z.object({
-    title: z.string().max(60),
-    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),
-  }),
-});
-
-export const collections = { blog };

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

@@ -1,37 +0,0 @@
----
-import BaseHead from "../components/BaseHead.astro";
-import { SITE } from "../site";
-
-const isHome = Astro.url.pathname === "/";
-
-interface Props {
-  title: string;
-  description: string;
-  ogImage?: string;
-  publishedTime?: Date;
-  markdownPath?: string;
-}
----
-
-<!doctype html>
-<html lang="en">
-  <head>
-    <BaseHead {...Astro.props} />
-  </head>
-  <body>
-    {
-      !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>
-    <footer>© {new Date().getFullYear()} {SITE.author} · <a href="/rss.xml">RSS</a> · <a href="/llms.txt">llms.txt</a></footer>
-  </body>
-</html>

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

@@ -1,11 +0,0 @@
----
-import Base from "../layouts/Base.astro";
-import { SITE } from "../site";
----
-
-<Base title={`Not found · ${SITE.name}`} description={SITE.description}>
-  <article>
-    <h1>Not found.</h1>
-    <p><a href="/">Back to the start.</a></p>
-  </article>
-</Base>

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

@@ -1,33 +0,0 @@
----
-import { getCollection } from "astro:content";
-import Base from "../layouts/Base.astro";
-import { SITE } from "../site";
-
-const posts = (await getCollection("blog", ({ data }) => !data.draft)).sort(
-  (a, b) => b.data.date.valueOf() - a.data.date.valueOf()
-);
-const formatDate = (date: Date) =>
-  date.toLocaleDateString("en-US", { year: "numeric", month: "short", day: "numeric" });
----
-
-<Base title={SITE.name} description={SITE.description}>
-  <article>
-    <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) => (
-          <li>
-            <a href={`/posts/${post.id}/`}>
-              <time datetime={post.data.date.toISOString()}>{formatDate(post.data.date)}</time>
-              <h3>{post.data.title}</h3>
-              <p>{post.data.description}</p>
-            </a>
-          </li>
-        ))
-      }
-    </ul>
-  </article>
-</Base>

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

@@ -1,29 +0,0 @@
-// Agent-facing index. Generated from the content collection, so it is
-// always current; links point at the markdown alternates.
-import type { APIRoute } from "astro";
-import { getCollection } from "astro:content";
-import { SITE } from "../site";
-
-export const GET: APIRoute = async (context) => {
-  const posts = (await getCollection("blog", ({ data }) => !data.draft)).sort(
-    (a, b) => b.data.date.valueOf() - a.data.date.valueOf()
-  );
-  const lines = [
-    `# ${SITE.name}`,
-    "",
-    `> ${SITE.description}`,
-    "",
-    "Every post is also available as plain markdown at the .md links below.",
-    "",
-    "## Posts",
-    "",
-    ...posts.map(
-      (post) =>
-        `- [${post.data.title}](${new URL(`/posts/${post.id}.md`, context.site)}): ${post.data.description}`
-    ),
-    "",
-  ];
-  return new Response(lines.join("\n"), {
-    headers: { "Content-Type": "text/plain; charset=utf-8" },
-  });
-};

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

@@ -1,32 +0,0 @@
----
-import { getCollection, render } from "astro:content";
-import Base from "../../layouts/Base.astro";
-
-export async function getStaticPaths() {
-  return (await getCollection("blog", ({ data }) => !data.draft)).map((post) => ({
-    params: { id: post.id },
-    props: { post },
-  }));
-}
-
-const { post } = Astro.props;
-const { Content } = await render(post);
-const formatDate = (date: Date) =>
-  date.toLocaleDateString("en-US", { year: "numeric", month: "short", day: "numeric" });
----
-
-<Base
-  title={post.data.title}
-  description={post.data.description}
-  ogImage={post.data.ogImage}
-  publishedTime={post.data.date}
-  markdownPath={`/posts/${post.id}.md`}
->
-  <article>
-    <p><time datetime={post.data.date.toISOString()}>{formatDate(post.data.date)}</time></p>
-    <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

@@ -1,18 +0,0 @@
-// Markdown alternates: every post is also served as plain markdown at
-// posts/<id>.md for agents and curl. llms.txt links here.
-import { getCollection, getEntry } from "astro:content";
-import type { APIRoute } from "astro";
-
-export async function getStaticPaths() {
-  return (await getCollection("blog", ({ data }) => !data.draft)).map((post) => ({ params: { id: post.id } }));
-}
-
-export const GET: APIRoute = async ({ params }) => {
-  const post = await getEntry("blog", params.id!);
-  if (!post) return new Response("Not found", { status: 404 });
-  const date = post.data.date.toISOString().slice(0, 10);
-  const body = `# ${post.data.title}\n\n${date}\n\n${post.body ?? ""}`;
-  return new Response(body, {
-    headers: { "Content-Type": "text/plain; charset=utf-8" },
-  });
-};

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

@@ -1,6 +0,0 @@
-import type { APIRoute } from "astro";
-
-export const GET: APIRoute = ({ site }) => {
-  const body = `User-agent: *\nAllow: /\n\nSitemap: ${new URL("sitemap-index.xml", site)}\n`;
-  return new Response(body, { headers: { "Content-Type": "text/plain; charset=utf-8" } });
-};

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

@@ -1,21 +0,0 @@
-import rss from "@astrojs/rss";
-import type { APIRoute } from "astro";
-import { getCollection } from "astro:content";
-import { SITE } from "../site";
-
-export const GET: APIRoute = async (context) => {
-  const posts = (await getCollection("blog", ({ data }) => !data.draft)).sort(
-    (a, b) => b.data.date.valueOf() - a.data.date.valueOf()
-  );
-  return rss({
-    title: SITE.name,
-    description: SITE.description,
-    site: context.site!,
-    items: posts.map((post) => ({
-      title: post.data.title,
-      description: post.data.description,
-      pubDate: post.data.date,
-      link: `/posts/${post.id}/`,
-    })),
-  });
-};