@toist/in 0.5.0 → 0.7.1

package/CHANGELOG.md

@@ -2,6 +2,50 @@
 
 All notable changes to `@toist/in` are recorded here.
 
+## 0.7.1 — 2026-05-06
+
+Fix @toist/aja cross-package dependency versions not being bumped by release script
+
+Scaffold template pins `@toist/aja` and `@toist/spec` to `^0.7.1`.
+
+## 0.7.0 — 2026-05-06
+
+Add @toist/aja CLI (bunx @toist/aja --config toist.yml) and @toist/in interactive setup wizard (bunx @toist/in). Establishes aja=runner, in=adoption tool split. No forced directory layout — user chooses paths via wizard, config drives the runner.
+
+Scaffold template pins `@toist/aja` and `@toist/spec` to `^0.7.0`.
+
+## Unreleased
+
+Clarify `@toist/in` as the Toist adoption tool, not only a scaffold CLI.
+
+- `bunx @toist/in` scaffolds `.toist/` in the current repo — one clear
+  action, no silent branching.
+- `bunx @toist/in upgrade` is now the explicit upgrade subcommand.
+- `bunx @toist/in <path>` scaffolds a dedicated Toist home at `<path>`.
+- Added a dedicated embedded template for repo-owned `.toist/` layout
+  (no nested `package.json`, kinds import examples pointing to host
+  source tree, `instance.json` stub, `TOIST_PORT` env var).
+- `bunx @toist/in upgrade` from inside `.toist/` resolves the host
+  repo's `package.json` automatically.
+- Template/docs language now distinguishes dedicated instance
+  directories from embedded existing-project mode.
+- Added package README documenting the two adoption modes.
+
+## 0.6.1 — 2026-05-05
+
+Fix published @toist/aja dependency resolution for embedded runners and include the typed runner client/smoke-test surface.
+
+Scaffold template pins `@toist/aja` and `@toist/spec` to `^0.6.1`.
+
+## 0.6.0 — 2026-05-05
+
+**`bunx @toist/in` now upgrades existing instances.** Running without
+arguments in a directory that has a `package.json` with `@toist/*` deps
+bumps them all to the latest version — the same behaviour as the now-removed
+`@toist/up` package. `@toist/up` is deprecated; migrate to `bunx @toist/in`.
+
+Scaffold template pins `@toist/aja` and `@toist/spec` to `^0.6.0`.
+
 ## 0.5.0 — 2026-05-05
 
 Lockstep version bump. Scaffold template pins `@toist/aja` and `@toist/spec` to `^0.5.0`.

package/README.md

@@ -0,0 +1,46 @@
+# `@toist/in`
+
+Interactive setup wizard for Toist.
+
+```sh
+bunx @toist/in
+```
+
+Asks a few questions, writes `toist.yml`, creates your chosen directories.
+Then start the runner with:
+
+```sh
+bunx @toist/aja
+```
+
+## What the wizard asks
+
+```
+Instance name?                [my-project]
+Pipelines dir?                [pipelines]
+Resources dir?                [resources]
+Data dir?                     [data]
+Port?                         [3000]
+Register custom TypeScript kinds? [y/N]
+  Kind file path?             [src/kinds/index.ts]
+  Add another?                [y/N]
+```
+
+## What it produces
+
+`toist.yml` in the current directory — that's it. All paths are yours
+to choose. There is no enforced layout.
+
+## Upgrade
+
+```sh
+bunx @toist/in upgrade
+```
+
+Finds `package.json` and bumps every `@toist/*` dep to latest.
+
+## See also
+
+- `@toist/aja` — the runner: `bunx @toist/aja --config toist.yml`
+- `context/instance-spec.md`
+- https://toist.in

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@toist/in",
-  "version": "0.5.0",
+  "version": "0.7.1",
   "type": "module",
-  "description": "Scaffold a new toist instance: bunx @toist/in <path>",
+  "description": "Adopt Toist into a repo: scaffold a Toist home or embedded .toist layout",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
   "bin": {
@@ -10,7 +10,7 @@
   },
   "files": [
     "src/",
-    "templates/",
-    "CHANGELOG.md"
+    "CHANGELOG.md",
+    "README.md"
   ]
 }

package/src/index.ts

@@ -1,23 +1,37 @@
 #!/usr/bin/env bun
 // 2121 toist
-// @toist/in — scaffold a new toist instance.
+// @toist/in — interactive setup wizard for Toist.
 //
-// Usage: bunx @toist/in <path>
-//
-// Writes a fresh instance directory at <path> with start.ts, kinds/,
-// pipelines/, resources/, data/, README.md, and .gitignore. Prints a
-// suggested package.json snippet to stdout for the host to merge.
+// Usage:
+//   bunx @toist/in              run wizard → writes toist.yml + creates dirs
+//   bunx @toist/in upgrade      upgrade @toist/* deps in current directory
 
-import { scaffold } from "./scaffold.ts"
+import { wizard } from "./wizard.ts"
+import { upgrade } from "./upgrade.ts"
 
 const args = process.argv.slice(2)
-const target = args[0]
+const arg = args[0]
 
-if (!target || target === "--help" || target === "-h") {
-  console.log("bunx @toist/in <path>     scaffold a new toist instance at <path>")
+if (arg === "--help" || arg === "-h") {
+  console.log("bunx @toist/in              run setup wizard → writes toist.yml")
+  console.log("bunx @toist/in upgrade      upgrade @toist/* deps")
+  console.log("")
+  console.log("To start the runner after setup:")
+  console.log("  bunx @toist/aja")
   console.log("")
   console.log("Full docs: https://toist.in")
-  process.exit(target ? 0 : 1)
+  process.exit(0)
 }
 
-await scaffold(target)
+if (!arg) {
+  await wizard()
+} else if (arg === "upgrade") {
+  await upgrade()
+} else {
+  console.error(`Unknown command: ${arg}`)
+  console.error("")
+  console.error("Usage:")
+  console.error("  bunx @toist/in            run setup wizard")
+  console.error("  bunx @toist/in upgrade    upgrade @toist/* deps")
+  process.exit(1)
+}

package/src/upgrade.ts

@@ -0,0 +1,59 @@
+#!/usr/bin/env bun
+// 2121 toist
+// Upgrade @toist/* deps in the nearest package.json to latest.
+// Called by @toist/in when run without a path argument in an existing instance.
+
+import { readFile } from "node:fs/promises"
+import { existsSync } from "node:fs"
+import { basename, dirname, resolve } from "node:path"
+import { spawnSync } from "node:child_process"
+
+function resolvePackageDir(cwd: string): string | null {
+  const localPkg = resolve(cwd, "package.json")
+  if (existsSync(localPkg)) return cwd
+
+  if (basename(cwd) === ".toist") {
+    const parent = dirname(cwd)
+    if (existsSync(resolve(parent, "package.json"))) return parent
+  }
+
+  return null
+}
+
+export async function upgrade(cwd = process.cwd()): Promise<void> {
+  const packageDir = resolvePackageDir(cwd)
+  if (!packageDir) {
+    console.error(`No package.json in ${cwd}.`)
+    console.error("Run from your host repo root or .toist/ directory.")
+    process.exit(1)
+  }
+
+  const pkgPath = resolve(packageDir, "package.json")
+
+  const pkg = JSON.parse(await readFile(pkgPath, "utf8")) as {
+    dependencies?: Record<string, string>
+    devDependencies?: Record<string, string>
+  }
+
+  const all: Record<string, string> = {
+    ...(pkg.dependencies ?? {}),
+    ...(pkg.devDependencies ?? {}),
+  }
+
+  // @toist/in itself is excluded — it runs via bunx, no local copy needed.
+  const targets = Object.keys(all)
+    .filter((n) => n.startsWith("@toist/") && n !== "@toist/in")
+    .sort()
+
+  if (targets.length === 0) {
+    console.log("No @toist/* deps in package.json — nothing to upgrade.")
+    process.exit(0)
+  }
+
+  console.log(`Upgrading: ${targets.join(", ")}\n`)
+  const result = spawnSync("bun", ["update", "--latest", ...targets], {
+    stdio: "inherit",
+    cwd: packageDir,
+  })
+  process.exit(result.status ?? 0)
+}

package/src/wizard.ts

@@ -0,0 +1,144 @@
+// 2121 toist
+// Interactive setup wizard for @toist/in.
+// Asks a few questions, writes toist.yml, creates directories.
+
+import { existsSync, mkdirSync, writeFileSync } from "node:fs"
+import { createInterface } from "node:readline"
+import { basename, resolve } from "node:path"
+
+// Line-by-line reader that works with both TTY and piped stdin.
+function makeReader() {
+  const iface = createInterface({ input: process.stdin, output: process.stdout, terminal: false })
+  const lines: string[] = []
+  let resolve: ((v: string) => void) | null = null
+
+  iface.on("line", (line) => {
+    if (resolve) {
+      const r = resolve
+      resolve = null
+      r(line)
+    } else {
+      lines.push(line)
+    }
+  })
+
+  iface.on("close", () => {
+    if (resolve) resolve("")
+  })
+
+  return {
+    read(): Promise<string> {
+      if (lines.length > 0) return Promise.resolve(lines.shift()!)
+      return new Promise((r) => { resolve = r })
+    },
+    close() { iface.close() },
+  }
+}
+
+async function prompt(reader: ReturnType<typeof makeReader>, label: string, def: string): Promise<string> {
+  process.stdout.write(`${label} [${def}] `)
+  const v = (await reader.read()).trim()
+  return v || def
+}
+
+async function yn(reader: ReturnType<typeof makeReader>, label: string, def = false): Promise<boolean> {
+  const hint = def ? "Y/n" : "y/N"
+  process.stdout.write(`${label} [${hint}] `)
+  const v = (await reader.read()).trim().toLowerCase()
+  if (!v) return def
+  return v === "y" || v === "yes"
+}
+
+export async function wizard(cwd = process.cwd()): Promise<void> {
+  const reader = makeReader()
+
+  console.log("")
+  console.log("Welcome to Toist. Let's set up your project.")
+  console.log("")
+
+  const defaultName = basename(cwd)
+  const name      = await prompt(reader, "Instance name?    ", defaultName)
+  const pipelines = await prompt(reader, "Pipelines dir?    ", "pipelines")
+  const resources = await prompt(reader, "Resources dir?    ", "resources")
+  const data      = await prompt(reader, "Data dir?         ", "data")
+  const port      = await prompt(reader, "Port?             ", "3000")
+
+  console.log("")
+  const hasKinds = await yn(reader, "Register custom TypeScript kinds?")
+
+  const kinds: string[] = []
+  if (hasKinds) {
+    console.log("")
+    let more = true
+    while (more) {
+      const kindFile = await prompt(reader, "  Kind file path? ", "src/kinds/index.ts")
+      kinds.push(kindFile)
+      more = await yn(reader, "  Add another?    ")
+    }
+  }
+
+  reader.close()
+
+  // ---------------------------------------------------------------------------
+  // Write toist.yml
+  // ---------------------------------------------------------------------------
+
+  const kindsBlock = kinds.length > 0
+    ? `\nkinds:\n${kinds.map((k) => `  - ${k}`).join("\n")}`
+    : ""
+
+  const configContent = [
+    `# toist.yml — generated by bunx @toist/in`,
+    `# Run with: bunx @toist/aja`,
+    ``,
+    `instance: ${name}`,
+    `port: ${port}`,
+    `pipelines: ./${pipelines}`,
+    `resources: ./${resources}`,
+    `data: ./${data}`,
+    ...(kinds.length > 0 ? [``, `kinds:`, ...kinds.map((k) => `  - ${k}`)] : []),
+    ``,
+  ].join("\n")
+
+  const configPath = resolve(cwd, "toist.yml")
+  const alreadyExists = existsSync(configPath)
+
+  console.log("")
+
+  if (alreadyExists) {
+    console.log("toist.yml already exists — skipping (remove it to re-run wizard).")
+  } else {
+    writeFileSync(configPath, configContent, "utf8")
+    console.log("Wrote toist.yml")
+  }
+
+  // ---------------------------------------------------------------------------
+  // Create directories
+  // ---------------------------------------------------------------------------
+
+  for (const dir of [pipelines, resources, data]) {
+    const abs = resolve(cwd, dir)
+    if (!existsSync(abs)) {
+      mkdirSync(abs, { recursive: true })
+      // Keep data/ out of git, commit the rest
+      if (dir === data) {
+        writeFileSync(resolve(abs, ".gitignore"), "*.db\n*.db-shm\n*.db-wal\n.lock/\n")
+      } else {
+        writeFileSync(resolve(abs, ".gitkeep"), "")
+      }
+      console.log(`Created ${dir}/`)
+    }
+  }
+
+  // ---------------------------------------------------------------------------
+  // Done
+  // ---------------------------------------------------------------------------
+
+  console.log("")
+  console.log("Done. Start with:")
+  console.log("  bunx @toist/aja")
+  console.log("")
+  console.log("Or add a script to package.json:")
+  console.log('  "toist": "bunx @toist/aja"')
+  console.log("")
+}

package/src/scaffold.ts

@@ -1,67 +0,0 @@
-// 2121 toist
-// Scaffold logic for @toist/in. Recursively copies templates/default/* into
-// the target directory, with two `_`-prefixed filenames renamed at copy time:
-//
-//   - `_gitignore`   -> `.gitignore`
-//   - `_package.json` -> `package.json`
-//
-// The underscore prefix exists because npm strips files like `.gitignore` and
-// (in some configurations) `package.json` from publishable subdirs. Prefixing
-// dodges those rules; the runtime rename produces the real names in the host.
-//
-// Templates live in `<package>/templates/default/`, relative to this file's
-// runtime location. Works whether the package is consumed as a workspace
-// link (in this repo) or from node_modules (in a host repo).
-
-import { mkdir, copyFile, readdir, stat } from "node:fs/promises"
-import { existsSync } from "node:fs"
-import { dirname, join, resolve } from "node:path"
-import { fileURLToPath } from "node:url"
-
-const __dir        = dirname(fileURLToPath(import.meta.url))
-const TEMPLATE_DIR = resolve(__dir, "..", "templates", "default")
-
-const RENAMES: Record<string, string> = {
-  _gitignore:     ".gitignore",
-  "_package.json": "package.json",
-}
-
-export async function scaffold(target: string): Promise<void> {
-  const dest = resolve(process.cwd(), target)
-
-  if (existsSync(dest)) {
-    const entries = await readdir(dest)
-    if (entries.length > 0) {
-      console.error(`Target directory '${dest}' is not empty. Aborting.`)
-      process.exit(1)
-    }
-  } else {
-    await mkdir(dest, { recursive: true })
-  }
-
-  await copyTree(TEMPLATE_DIR, dest)
-
-  console.log(`\nScaffolded toist instance at ${dest}\n`)
-  console.log("Next:")
-  console.log(`  cd ${target}`)
-  console.log(`  bun install`)
-  console.log(`  bun start.ts`)
-  console.log("")
-  console.log(`Full docs: https://toist.in`)
-  console.log("")
-}
-
-async function copyTree(src: string, dest: string): Promise<void> {
-  for (const entry of await readdir(src)) {
-    const srcPath  = join(src, entry)
-    const destName = RENAMES[entry] ?? entry
-    const destPath = join(dest, destName)
-    const info     = await stat(srcPath)
-    if (info.isDirectory()) {
-      await mkdir(destPath, { recursive: true })
-      await copyTree(srcPath, destPath)
-    } else {
-      await copyFile(srcPath, destPath)
-    }
-  }
-}

package/templates/default/README.md

@@ -1,31 +0,0 @@
-# my-toist-instance
-
-Generated with [`bunx @toist/in`](https://toist.in).
-
-## First run
-
-1. `bun install`
-2. `bun start.ts` — runner boots on `http://localhost:3000`.
-
-Open `http://localhost:3000` to use the UI.
-
-## Layout
-
-- `start.ts` — bootstrap; calls `startRunner` from `@toist/aja`
-- `kinds/custom.ts` — register your domain-specific kinds here
-- `pipelines/*.yaml` — pipeline definitions (per pipeline-spec)
-- `resources/*.yaml` — resource definitions (per resource-spec)
-- `data/` — runtime SQLite databases (gitignored)
-
-## Upgrading
-
-```sh
-bunx @toist/up
-```
-
-Auto-detects every `@toist/*` dep in this directory's `package.json`
-and bumps them to the latest published version.
-
-## More
-
-Full quickstart and docs: https://toist.in

package/templates/default/_gitignore

@@ -1,7 +0,0 @@
-node_modules/
-bun.lock
-data/*.db
-data/*.db-shm
-data/*.db-wal
-data/.lock/
-.platform/

package/templates/default/_package.json

@@ -1,13 +0,0 @@
-{
-  "name": "my-toist-instance",
-  "version": "0.1.0",
-  "type": "module",
-  "scripts": {
-    "start": "bun start.ts",
-    "dev": "bun --watch start.ts"
-  },
-  "dependencies": {
-    "@toist/aja": "^0.5.0",
-    "@toist/spec": "^0.5.0"
-  }
-}

package/templates/default/kinds/custom.ts

@@ -1,23 +0,0 @@
-// 2121 toist — register your domain-specific kinds here.
-//
-// Each export should be a NodeKind<P, I>. See the @toist/aja built-ins for
-// reference shapes, and pipeline-spec / kind-spec at https://toist.in for
-// the full contract.
-//
-// Example:
-//
-//   import type { NodeKind } from "@toist/spec"
-//
-//   export const greet: NodeKind<{ name: string }, { msg: string }> = {
-//     id: "demo.greet",
-//     params: { name: { type: "string", required: true } },
-//     async execute(ctx) {
-//       return { msg: `Hello, ${ctx.params.name}!` }
-//     },
-//   }
-//
-// Then in start.ts:
-//   import * as customKinds from "./kinds/custom.ts"
-//   register(...Object.values(customKinds))
-
-export {}

package/templates/default/start.ts

@@ -1,14 +0,0 @@
-// 2121 toist instance bootstrap.
-// See https://toist.in for the full quickstart.
-
-import { startRunner } from "@toist/aja"
-
-// Uncomment to register domain-specific kinds:
-// import { register } from "@toist/aja"
-// import * as customKinds from "./kinds/custom.ts"
-// register(...Object.values(customKinds))
-
-await startRunner({
-  port:    Number(process.env.PORT ?? 3000),
-  rootDir: import.meta.dir,
-})