create-foldkit-app 0.32.0 → 0.32.1

package/dist/commands/create.js

@@ -5,7 +5,7 @@ import { spawnSync } from 'node:child_process';
 import { examples } from '../examples.js';
 import { Scaffold, renderings } from '../rendering.js';
 import { createProject } from '../utils/files.js';
-import { devCommand, installDependencies, } from '../utils/packages.js';
+import { devCommand, installDependencies, readFoldkitSubtreeRef, } from '../utils/packages.js';
 import { validateProjectName } from '../validateName.js';
 const isWindows = process.platform === 'win32';
 const promptForName = Prompt.text({
@@ -90,7 +90,7 @@ const installProjectDependencies = (projectPath, packageManager, scaffold, maybe
     yield* Console.log(chalk.green('✅ Dependencies installed'));
     yield* Console.log('');
 });
-const displaySuccessMessage = (name, packageManager) => Effect.gen(function* () {
+const displaySuccessMessage = (name, packageManager, subtreeRef) => Effect.gen(function* () {
     yield* Console.log(chalk.bold('All systems nominal.'));
     yield* Console.log('');
     yield* Console.log(`  > ${chalk.cyan('cd')} ${name}`);
@@ -98,15 +98,16 @@ const displaySuccessMessage = (name, packageManager) => Effect.gen(function* ()
     yield* Console.log('');
     yield* Console.log(chalk.bold('AI-Assisted Development'));
     yield* Console.log('');
-    yield* Console.log('  Vendor Foldkit in as a git subtree so your AI assistant can\n' +
-        '  reference the source, examples, and documentation. Commit\n' +
-        '  the scaffold first so subtree has a base commit to merge into:');
+    yield* Console.log('  Vendor Foldkit in as a git subtree, pinned to the release this\n' +
+        '  project installs, so your AI assistant can reference the matching\n' +
+        '  source, examples, and documentation. Commit the scaffold first so\n' +
+        '  subtree has a base commit to merge into:');
     yield* Console.log('');
     yield* Console.log(`  > ${chalk.cyan('cd')} ${name}`);
     yield* Console.log(`  > ${chalk.cyan('git init')}`);
     yield* Console.log(`  > ${chalk.cyan('git add .')}`);
     yield* Console.log(`  > ${chalk.cyan('git commit -m "chore: initial commit"')}`);
-    yield* Console.log(`  > ${chalk.cyan('git subtree add --prefix=repos/foldkit https://github.com/foldkit/foldkit.git main --squash')}`);
+    yield* Console.log(`  > ${chalk.cyan(`git subtree add --prefix=repos/foldkit https://github.com/foldkit/foldkit.git ${subtreeRef} --squash`)}`);
     yield* Console.log('');
     yield* Console.log(`  Details: ${chalk.cyan('foldkit.dev/ai/overview')}`);
     yield* Console.log('');
@@ -138,8 +139,9 @@ export const create = (input) => Effect.gen(function* () {
     }
     const projectPath = path.resolve(name);
     yield* validateProject(name, projectPath, packageManager);
+    const subtreeRef = yield* readFoldkitSubtreeRef;
     yield* setupProject(name, projectPath, scaffold, packageManager);
     yield* installProjectDependencies(projectPath, packageManager, scaffold, input.maybeDependencyManifestsDirectory);
-    yield* displaySuccessMessage(name, packageManager);
+    yield* displaySuccessMessage(name, packageManager, subtreeRef);
     return name;
 });

package/dist/templates/base/FOLDKIT.md

@@ -16,15 +16,29 @@ If `./repos/foldkit` exists, it contains the full Foldkit repository, vendored i
 
 Treat the subtree as read-only reference: never import from `repos/foldkit/` in your project source. Imports must come from the `foldkit` npm package.
 
-If `./repos/foldkit` does not exist and `AGENTS.md` says `subtree_prompted: false`, offer to run `git subtree add --prefix=repos/foldkit https://github.com/foldkit/foldkit.git main --squash`. This gives you access to the full source, examples, and docs. Whether the user accepts or declines, set that line in `AGENTS.md` to `true` so it isn't asked again.
+If `./repos/foldkit` does not exist and `AGENTS.md` says `subtree_prompted: false`, offer to vendor the repository. It gives you access to the full source, examples, and docs. Pin it to the release git tag matching the installed `foldkit` package; vendoring `main` instead can hand you examples and APIs from a release the project has not installed:
+
+```sh
+git subtree add --prefix=repos/foldkit https://github.com/foldkit/foldkit.git "foldkit@$(node -p "require('./node_modules/foldkit/package.json').version")" --squash
+```
+
+A canary install has no release tag to pin to. Its version names its source commit (`0.156.0-canary.<commit>`); use the full hash of that commit as the ref instead. GitHub expands the short hash at `https://github.com/foldkit/foldkit/commit/<commit>`.
+
+Whether the user accepts or declines, set that line in `AGENTS.md` to `true` so it isn't asked again.
 
 If `foldkit-skills` is installed as a Claude Code plugin, the `generate-program` and `audit-program` skills carry snapshot architecture and conventions guides synced from the live code.
 
-## Keeping this file current
+## After a Foldkit upgrade
 
-Foldkit's APIs and conventions change, and this file changes with them. A stale copy sends agents after APIs the installed packages no longer export.
+Two things go stale when the project upgrades its Foldkit packages: the vendored subtree and this file. Bring both forward, subtree first, since the fresh copy of this file comes from it.
 
-Replace it whenever the project upgrades its Foldkit packages. If `./repos/foldkit` exists, copy `repos/foldkit/packages/create-foldkit-app/templates/base/FOLDKIT.md` over this file. Otherwise take the [current template on GitHub](https://github.com/foldkit/foldkit/blob/main/packages/create-foldkit-app/templates/base/FOLDKIT.md). There is nothing here to merge or preserve.
+Re-pin the subtree to the newly installed release (for a canary install, pin to the commit its version names, as above):
+
+```sh
+git subtree pull --prefix=repos/foldkit https://github.com/foldkit/foldkit.git "foldkit@$(node -p "require('./node_modules/foldkit/package.json').version")" --squash
+```
+
+Then replace this file whole. Foldkit's conventions change with its APIs, and a stale copy sends agents after APIs the installed packages no longer export. Copy `repos/foldkit/packages/create-foldkit-app/templates/base/FOLDKIT.md` over this file. Without the subtree, take the template from GitHub at the tag matching the installed version: `https://github.com/foldkit/foldkit/blob/foldkit@<version>/packages/create-foldkit-app/templates/base/FOLDKIT.md`. There is nothing here to merge or preserve.
 
 ## Project Conventions
 
@@ -84,9 +98,11 @@ Omit the children argument when an element has none: `h.div([h.Class('divider')]
 
 Define a Command with `Command.define(name, { args, messages, execute })`; omit `args` when the Command takes none. Assign definitions to PascalCase constants. Never inline in pipe chains. Name the effect `execute` performs, not the later Model transition caused when update handles its result: a timer that only waits before update starts a dismissal is `WaitBeforeDismissal`, not `DismissAfter`. Commands catch all errors via `Effect.catch(() => Effect.succeed(Message.FailedX(...)))` so side effects never crash the app. Definitions live colocated with the update function that returns them.
 
+Command args contain values already present in the Model or Message. Calling `Date.now()`, `crypto.randomUUID()`, or another source of time or randomness while preparing a Command happens before the Command executes, whether the call appears directly in the args object or its result is assigned to a local variable first. Obtain those values in `execute` and return them in the result Message.
+
 For the with-args shape, see `repos/foldkit/examples/weather/src/main.ts` or `repos/foldkit/examples/kanban/src/command.ts`. For an argless DOM-side-effect Command, the argless form in `kanban/src/command.ts` (`FocusAddCardInput`) is the canonical reference.
 
-For DOM operations (focus, scroll, modals, scroll lock), Foldkit ships a `Dom` module. For time, randomness, UUIDs, and delays, use Effect's built-ins directly (`Clock`, `Random`, `Effect.uuid`, `Effect.sleep`). Don't reach for raw `document.querySelector`, `setTimeout`, `Date.now()`, or `Math.random()`.
+For DOM operations (focus, scroll, modals, scroll lock), Foldkit ships a `Dom` module. For time, randomness, UUIDs, and delays, use Effect's APIs directly (`Clock`, `Random`, `Crypto.Crypto`, `Effect.sleep`). Provide the platform Crypto layer when using `Crypto.Crypto`. Don't reach for raw `document.querySelector`, `setTimeout`, `Date.now()`, or `Math.random()`.
 
 ### File Organization
 
@@ -126,7 +142,7 @@ Declare the whole Message union with `defineMessageUnion()`, then put `type Mess
 ```ts
 const Message = defineMessageUnion({
   ClickedSubmit: {},
-  UpdatedEmail: { value: S.String },
+  UpdatedEmail: { value: Schema.String },
 })
 type Message = typeof Message.Type
 ```

package/dist/templates/examples/api-cache/src/data.ts

@@ -1,24 +1,24 @@
-import { Array, Duration, Effect, Option, Random, Schema as S } from 'effect'
+import { Array, Duration, Effect, Option, Random, Schema } from 'effect'
 
-export const Post = S.Struct({
-  id: S.String,
-  title: S.String,
-  excerpt: S.String,
+export const Post = Schema.Struct({
+  id: Schema.String,
+  title: Schema.String,
+  excerpt: Schema.String,
 })
 export type Post = typeof Post.Type
 
-export const PostDetail = S.Struct({
-  id: S.String,
-  title: S.String,
-  author: S.String,
-  body: S.String,
+export const PostDetail = Schema.Struct({
+  id: Schema.String,
+  title: Schema.String,
+  author: Schema.String,
+  body: Schema.String,
 })
 export type PostDetail = typeof PostDetail.Type
 
-export const Stats = S.Struct({
-  activeUsers: S.Number,
-  requestsPerSecond: S.Number,
-  cacheHitRatePercent: S.Number,
+export const Stats = Schema.Struct({
+  activeUsers: Schema.Number,
+  requestsPerSecond: Schema.Number,
+  cacheHitRatePercent: Schema.Number,
 })
 export type Stats = typeof Stats.Type
 

package/dist/templates/examples/api-cache/src/main.ts

@@ -4,9 +4,9 @@ import {
   Duration,
   Effect,
   HashMap,
-  Match as M,
+  Match,
   Option,
-  Schema as S,
+  Schema,
   Stream,
   pipe,
 } from 'effect'
@@ -32,36 +32,39 @@ export const TABS_ID = 'api-cache-tabs'
 
 // MODEL
 
-const FetchedPosts = S.Struct({ posts: S.Array(Post), fetchedAt: S.Number })
+const FetchedPosts = Schema.Struct({
+  posts: Schema.Array(Post),
+  fetchedAt: Schema.Number,
+})
 
-const FetchedPostDetail = S.Struct({
+const FetchedPostDetail = Schema.Struct({
   detail: PostDetail,
-  fetchedAt: S.Number,
+  fetchedAt: Schema.Number,
 })
 
-const FetchedStats = S.Struct({ stats: Stats, fetchedAt: S.Number })
+const FetchedStats = Schema.Struct({ stats: Stats, fetchedAt: Schema.Number })
 
-export const PostsData = AsyncData.Schema(FetchedPosts, S.String)
-export const PostDetailData = AsyncData.Schema(FetchedPostDetail, S.String)
-export const StatsData = AsyncData.Schema(FetchedStats, S.String)
+export const PostsData = AsyncData.Schema(FetchedPosts, Schema.String)
+export const PostDetailData = AsyncData.Schema(FetchedPostDetail, Schema.String)
+export const StatsData = AsyncData.Schema(FetchedStats, Schema.String)
 
 type PostsData = typeof PostsData.schema.Type
 type PostDetailData = typeof PostDetailData.schema.Type
 type StatsData = typeof StatsData.schema.Type
 
-const Tab = S.Literals(['Posts', 'Stats'])
+const Tab = Schema.Literals(['Posts', 'Stats'])
 type Tab = typeof Tab.Type
 
 const tabValues: ReadonlyArray<Tab> = Tab.literals
 
 export const AppTabs = Tabs.create<Tab>()
 
-export const Model = S.Struct({
+export const Model = Schema.Struct({
   tabs: Tabs.Model,
   activeTab: Tab,
   posts: PostsData.schema,
-  postDetailById: S.HashMap(S.String, PostDetailData.schema),
-  maybeSelectedPostId: S.Option(S.String),
+  postDetailById: Schema.HashMap(Schema.String, PostDetailData.schema),
+  maybeSelectedPostId: Schema.Option(Schema.String),
   stats: StatsData.schema,
 })
 export type Model = typeof Model.Type
@@ -70,20 +73,20 @@ export type Model = typeof Model.Type
 
 export const Message = defineMessageUnion({
   GotTabsMessage: { message: Tabs.Message },
-  ClickedPost: { postId: S.String },
+  ClickedPost: { postId: Schema.String },
   ClickedBackToPosts: {},
   ClickedInvalidatePosts: {},
   ClickedRetryPosts: {},
-  ClickedRetryPostDetail: { postId: S.String },
+  ClickedRetryPostDetail: { postId: Schema.String },
   ClickedRefreshStats: {},
   ClickedRetryStats: {},
   TickedRevalidateStats: {},
-  SettledFetchPosts: { result: S.Result(FetchedPosts, S.String) },
+  SettledFetchPosts: { result: Schema.Result(FetchedPosts, Schema.String) },
   SettledFetchPostDetail: {
-    postId: S.String,
-    result: S.Result(FetchedPostDetail, S.String),
+    postId: Schema.String,
+    result: Schema.Result(FetchedPostDetail, Schema.String),
   },
-  SettledFetchStats: { result: S.Result(FetchedStats, S.String) },
+  SettledFetchStats: { result: Schema.Result(FetchedStats, Schema.String) },
 })
 
 export type Message = typeof Message.Type
@@ -122,33 +125,33 @@ const setPostDetail = (postId: string, postDetail: PostDetailData) =>
 const activateTab = (model: Model, tab: Tab): UpdateReturn => {
   const modelWithActiveTab = evo(model, { activeTab: () => tab })
 
-  return M.value(tab).pipe(
-    M.withReturnType<UpdateReturn>(),
-    M.when('Posts', () =>
+  return Match.value(tab).pipe(
+    Match.withReturnType<UpdateReturn>(),
+    Match.when('Posts', () =>
       applyPostsTransition(
         modelWithActiveTab,
         AsyncData.loadIfMissing(modelWithActiveTab.posts),
       ),
     ),
-    M.when('Stats', () =>
+    Match.when('Stats', () =>
       applyStatsTransition(
         modelWithActiveTab,
         AsyncData.loadIfMissing(modelWithActiveTab.stats),
       ),
     ),
-    M.exhaustive,
+    Match.exhaustive,
   )
 }
 
-const foldTabsOutMessage = M.type<Tabs.OutMessage<Tab>>().pipe(
-  M.withReturnType<Update.Step<Model, Message>>(),
-  M.tagsExhaustive({
-    Selected:
-      ({ value }) =>
-      model =>
-        activateTab(model, value),
-  }),
-)
+const foldTabsOutMessage = Tabs.OutMessage.match<
+  Update.Step<Model, Message>,
+  Tabs.OutMessage<Tab>
+>({
+  Selected:
+    ({ value }) =>
+    model =>
+      activateTab(model, value),
+})
 
 const foldTabs = Update.foldChild({
   update: AppTabs.update,
@@ -249,7 +252,7 @@ export const FetchPosts = Command.define('FetchPosts', {
 })
 
 export const FetchPostDetail = Command.define('FetchPostDetail', {
-  args: { postId: S.String },
+  args: { postId: Schema.String },
   messages: [Message.SettledFetchPostDetail],
   execute: ({ postId }) =>
     pipe(
@@ -280,7 +283,7 @@ export const FetchStats = Command.define('FetchStats', {
 
 export const subscriptions = Subscription.make<Model, Message>()(entry => ({
   revalidateStats: entry(
-    { isObservingStats: S.Boolean },
+    { isObservingStats: Schema.Boolean },
     {
       modelToDependencies: model => ({
         isObservingStats:
@@ -350,10 +353,10 @@ export const view = (model: Model, h: HtmlBuilder<Message>): Document => ({
                           tabInfo.value,
                           [...tabInfo.panel, h.Class('flex flex-col gap-4')],
                           [
-                            M.value(tabInfo.value).pipe(
-                              M.when('Posts', () => postsTabView(model, h)),
-                              M.when('Stats', () => statsTabView(model, h)),
-                              M.exhaustive,
+                            Match.value(tabInfo.value).pipe(
+                              Match.when('Posts', () => postsTabView(model, h)),
+                              Match.when('Stats', () => statsTabView(model, h)),
+                              Match.exhaustive,
                             ),
                           ],
                         ),

package/dist/templates/examples/auth/src/command.ts

@@ -1,4 +1,4 @@
-import { Console, Effect, Schema as S } from 'effect'
+import { Console, Effect, Schema } from 'effect'
 import { KeyValueStore } from 'effect/unstable/persistence'
 import { Command } from 'foldkit'
 
@@ -16,7 +16,7 @@ export const SaveSession = Command.define('SaveSession', {
       const store = yield* KeyValueStore.KeyValueStore
       yield* store.set(
         SESSION_STORAGE_KEY,
-        S.encodeSync(SessionJsonString)(session),
+        Schema.encodeSync(SessionJsonString)(session),
       )
       return Message.SucceededSaveSession()
     }).pipe(
@@ -42,7 +42,7 @@ export const ClearSession = Command.define('ClearSession', {
 })
 
 export const LogError = Command.define('LogError', {
-  args: { entries: S.Array(S.Unknown) },
+  args: { entries: Schema.Array(Schema.Unknown) },
   messages: [Message.CompletedLogError],
   execute: ({ entries }) =>
     Console.error(...entries).pipe(Effect.as(Message.CompletedLogError())),

package/dist/templates/examples/auth/src/domain/session.ts

@@ -1,11 +1,13 @@
-import { Schema as S } from 'effect'
+import { Schema } from 'effect'
 
-export const Session = S.Struct({
-  userId: S.String,
-  email: S.String,
-  name: S.String,
+export const Session = Schema.Struct({
+  userId: Schema.String,
+  email: Schema.String,
+  name: Schema.String,
 })
 
 export type Session = typeof Session.Type
 
-export const SessionJsonString = S.fromJsonString(S.toCodecJson(Session))
+export const SessionJsonString = Schema.fromJsonString(
+  Schema.toCodecJson(Session),
+)

package/dist/templates/examples/auth/src/main.ts

@@ -1,4 +1,4 @@
-import { Effect, Match as M, Option, Schema as S } from 'effect'
+import { Effect, Match, Option, Schema } from 'effect'
 import { KeyValueStore } from 'effect/unstable/persistence'
 import { Runtime, type Update } from 'foldkit'
 import { Url } from 'foldkit/url'
@@ -14,8 +14,8 @@ import { RedirectToDashboard, RedirectToLogin } from './update'
 
 // FLAGS
 
-export const Flags = S.Struct({
-  maybeSession: S.Option(Session),
+export const Flags = Schema.Struct({
+  maybeSession: Schema.Option(Session),
 })
 
 export const flags: Effect.Effect<Flags> = Effect.gen(function* () {
@@ -24,7 +24,7 @@ export const flags: Effect.Effect<Flags> = Effect.gen(function* () {
     Option.fromNullishOr(yield* store.get(SESSION_STORAGE_KEY)),
   )
 
-  const decodeSession = S.decodeEffect(SessionJsonString)
+  const decodeSession = Schema.decodeEffect(SessionJsonString)
   const session = yield* decodeSession(sessionJson)
 
   return Flags.make({ maybeSession: Option.some(session) })
@@ -40,7 +40,7 @@ export type Flags = typeof Flags.Type
 // INIT
 
 type InitReturn = Update.Return<Model, Message>
-const withInitReturn = M.withReturnType<InitReturn>()
+const withInitReturn = Match.withReturnType<InitReturn>()
 
 export const init: Runtime.RoutingApplicationInit<Model, Message, Flags> = (
   flags: Flags,
@@ -50,24 +50,24 @@ export const init: Runtime.RoutingApplicationInit<Model, Message, Flags> = (
 
   return Option.match(flags.maybeSession, {
     onNone: () =>
-      M.value(route).pipe(
+      Match.value(route).pipe(
         withInitReturn,
-        M.tag('Home', 'Login', 'NotFound', route => ({
+        Match.tag('Home', 'Login', 'NotFound', route => ({
           model: LoggedOut.init(route),
         })),
-        M.orElse(() => ({
+        Match.orElse(() => ({
           model: LoggedOut.init(AppRoute.Login()),
           commands: [RedirectToLogin()],
         })),
       ),
 
     onSome: session =>
-      M.value(route).pipe(
+      Match.value(route).pipe(
         withInitReturn,
-        M.tag('Dashboard', 'Settings', 'NotFound', route => ({
+        Match.tag('Dashboard', 'Settings', 'NotFound', route => ({
           model: LoggedIn.init(route, session),
         })),
-        M.orElse(() => ({
+        Match.orElse(() => ({
           model: LoggedIn.init(AppRoute.Dashboard(), session),
           commands: [RedirectToDashboard()],
         })),

package/dist/templates/examples/auth/src/message.ts

@@ -1,4 +1,4 @@
-import { Schema as S } from 'effect'
+import { Schema } from 'effect'
 import { defineMessageUnion } from 'foldkit/message'
 import { UrlRequest } from 'foldkit/navigation'
 import { Url } from 'foldkit/url'
@@ -12,9 +12,9 @@ export const Message = defineMessageUnion({
   ClickedLink: { request: UrlRequest },
   ChangedUrl: { url: Url },
   SucceededSaveSession: {},
-  FailedSaveSession: { error: S.String },
+  FailedSaveSession: { error: Schema.String },
   SucceededClearSession: {},
-  FailedClearSession: { error: S.String },
+  FailedClearSession: { error: Schema.String },
   GotLoggedOutMessage: { message: LoggedOut.Message },
   GotLoggedInMessage: { message: LoggedIn.Message },
 })

package/dist/templates/examples/auth/src/model.ts

@@ -1,8 +1,8 @@
-import { Schema as S } from 'effect'
+import { Schema } from 'effect'
 
 import { LoggedIn, LoggedOut } from './page'
 
-export const Model = S.Union([LoggedOut.Model, LoggedIn.Model])
+export const Model = Schema.Union([LoggedOut.Model, LoggedIn.Model])
 
 export type Model = typeof Model.Type
 

package/dist/templates/examples/auth/src/page/loggedIn/index.ts

@@ -1,4 +1,4 @@
 export { Model, init } from './model'
-export { Message, type OutMessage } from './message'
+export { Message, OutMessage } from './message'
 export { update } from './update'
 export { view } from './view'

package/dist/templates/examples/auth/src/page/loggedIn/view.ts

@@ -1,5 +1,5 @@
 import { clsx } from 'clsx'
-import { Match as M } from 'effect'
+import { Match } from 'effect'
 import { Submodel } from 'foldkit'
 import { Html, HtmlBuilder } from 'foldkit/html'
 
@@ -72,8 +72,8 @@ export const view = Submodel.defineView<Model, Message>((model, h) =>
       h.main(
         [h.Class('py-8')],
         [
-          M.value(model.route).pipe(
-            M.tagsExhaustive({
+          Match.value(model.route).pipe(
+            Match.tagsExhaustive({
               Dashboard: () => Dashboard.view(model.session, h),
               Settings: () => Settings.view(model.session, h),
               NotFound: ({ path }) =>

package/dist/templates/examples/auth/src/page/loggedOut/index.ts

@@ -1,4 +1,4 @@
 export { Model, init } from './model'
-export { Message, type OutMessage } from './message'
+export { Message, OutMessage } from './message'
 export { update } from './update'
 export { view } from './view'

package/dist/templates/examples/auth/src/page/loggedOut/page/login.ts

@@ -1,13 +1,5 @@
 import { clsx } from 'clsx'
-import {
-  Array,
-  Duration,
-  Effect,
-  Option,
-  Schema as S,
-  String,
-  pipe,
-} from 'effect'
+import { Array, Duration, Effect, Option, Schema, String, pipe } from 'effect'
 import { Command, FieldValidation, Submodel, type Update } from 'foldkit'
 import {
   Field,
@@ -29,10 +21,10 @@ import { homeRouter } from '../../../route'
 
 // MODEL
 
-export const Model = S.Struct({
-  email: Field(S.String),
-  password: Field(S.String),
-  isSubmitting: S.Boolean,
+export const Model = Schema.Struct({
+  email: Field(Schema.String),
+  password: Field(Schema.String),
+  isSubmitting: Schema.Boolean,
 })
 
 export type Model = typeof Model.Type
@@ -46,11 +38,11 @@ export const initModel = (): Model => ({
 // MESSAGE
 
 export const Message = defineMessageUnion({
-  ChangedEmail: { value: S.String },
-  ChangedPassword: { value: S.String },
+  ChangedEmail: { value: Schema.String },
+  ChangedPassword: { value: Schema.String },
   SubmittedForm: {},
   SucceededSimulateAuthRequest: { session: Session },
-  FailedSimulateAuthRequest: { error: S.String },
+  FailedSimulateAuthRequest: { error: Schema.String },
 })
 
 export type Message = typeof Message.Type
@@ -86,7 +78,7 @@ const isFormValid = (model: Model): boolean =>
 // UPDATE
 
 export const SimulateAuthRequest = Command.define('SimulateAuthRequest', {
-  args: { email: S.String, password: S.String },
+  args: { email: Schema.String, password: Schema.String },
   messages: [
     Message.SucceededSimulateAuthRequest,
     Message.FailedSimulateAuthRequest,

package/dist/templates/examples/auth/src/page/loggedOut/update.ts

@@ -1,4 +1,4 @@
-import { Match as M, Option } from 'effect'
+import { Option } from 'effect'
 import { Update } from 'foldkit'
 import { evo } from 'foldkit/struct'
 
@@ -12,11 +12,9 @@ const foldLogin = Update.foldChild({
   write: (model, nextLoginModel) =>
     evo(model, { loginModel: () => nextLoginModel }),
   toParentMessage: message => Message.GotLoginMessage({ message }),
-  toParentOutMessage: M.type<Login.OutMessage>().pipe(
-    M.tagsExhaustive({
-      SucceededLogin: ({ session }) => OutMessage.SucceededLogin({ session }),
-    }),
-  ),
+  toParentOutMessage: Login.OutMessage.match<OutMessage>({
+    SucceededLogin: ({ session }) => OutMessage.SucceededLogin({ session }),
+  }),
 })
 
 export const update = (model: Model, message: Message) =>

package/dist/templates/examples/auth/src/page/loggedOut/view.ts

@@ -1,4 +1,4 @@
-import { Match as M } from 'effect'
+import { Match } from 'effect'
 import { Submodel } from 'foldkit'
 
 import { notFoundView } from '../../notFoundView'
@@ -12,8 +12,8 @@ export const view = Submodel.defineView<Model, Message>((model, h) =>
   h.div(
     [h.Class('py-8')],
     [
-      M.value(model.route).pipe(
-        M.tagsExhaustive({
+      Match.value(model.route).pipe(
+        Match.tagsExhaustive({
           Home: () => Home.view(h),
           Login: () =>
             h.submodel({

package/dist/templates/examples/auth/src/route.ts

@@ -1,4 +1,4 @@
-import { Schema as S, pipe } from 'effect'
+import { Schema, pipe } from 'effect'
 import { Route } from 'foldkit'
 import { defineRouteUnion, literal } from 'foldkit/route'
 
@@ -7,7 +7,7 @@ export const AppRoute = defineRouteUnion({
   Login: {},
   Dashboard: {},
   Settings: {},
-  NotFound: { path: S.String },
+  NotFound: { path: Schema.String },
 })
 
 export type AppRoute = typeof AppRoute.Type