create-stitchkit 0.6.5 → 0.6.7

package/CHANGELOG.md

@@ -12,6 +12,47 @@ step is overwritten by the next release.
 
 ## [Unreleased]
 
+## [0.6.7] — 2026-09-24
+
+### Fixed
+
+- **A bot from `--template telegram-bot` starts with an operators' chat.** With
+  `OPERATOR_CHAT_ID` set, the optional `operator-channel` was one of the bot's
+  dependencies, and the kernel refuses a required resource that depends on an
+  optional one: the bot started without the chat and not with it. The channel
+  now stands beside the bot and still drains on the way down; the template's
+  test starts the graph with the chat and with local Bot API files. A bot
+  generated from 0.6.5 or 0.6.6 moves the `operator-channel` resource out of the
+  `dependsOn` it passes to `grammyBotResources` and into the application's
+  `resources`.
+
+### Changed
+
+- Generated projects track Stitchkit `^0.96.1`, whose operator channel masks
+  a bot token before a message leaves.
+
+## [0.6.6] — 2026-09-24
+
+### Fixed
+
+- **A project from `--template agent` or `--template telegram-bot` installs.**
+  The scaffolder rewrote their Stitchkit dependency to `catalog:` and wrote a
+  root `catalog`, which Bun reads only in a workspace root, so `bun install`
+  refused the generated project ("stitchkit@catalog: is not in the catalog").
+  A project without `workspaces` now gets the range itself —
+  `"stitchkit": "^0.96.0"` — and no catalog; the application template, a
+  workspace, is unchanged. A project already generated from either template
+  replaces each `"catalog:"` in its dependencies with the range from its
+  `catalog` field and deletes that field.
+- **A project from `--template agent` passes its own tests.** It mounts its
+  agent with `stitchkit/tools`, whose optional peer
+  `@modelcontextprotocol/server` the template did not declare; inside this
+  repository the workspace supplied it. The template now depends on
+  `@modelcontextprotocol/server` `^2.0.0`.
+- A new lane generates both single-package templates the way a user does,
+  installs them from the registry, and runs their check and tests — neither
+  defect above could be seen by a lane that installs the template directory.
+
 ## [0.6.5] — 2026-09-24
 
 ### Added

package/dist/cli.js

@@ -299,6 +299,7 @@ var TEMPLATE_RENAMES = new Map([
 var RootManifestSchema = z2.looseObject({
   name: z2.string().min(1),
   catalog: z2.record(z2.string(), z2.string()).optional(),
+  workspaces: z2.unknown().optional(),
   dependencies: z2.record(z2.string(), z2.string()).optional(),
   devDependencies: z2.record(z2.string(), z2.string()).optional()
 });
@@ -435,21 +436,33 @@ async function scaffoldProject(templateDirectory, destination, options = {}) {
     const manifestPath = join(resolvedDestination, "package.json");
     const manifest = RootManifestSchema.parse(JSON.parse(await readFile(manifestPath, "utf8")));
     const catalog = options.stitchkitCatalogTarget ? { ...manifest.catalog ?? {}, stitchkit: options.stitchkitCatalogTarget } : manifest.catalog;
+    const isWorkspace = manifest.workspaces !== undefined;
+    const localReference = (name) => {
+      if (isWorkspace)
+        return "catalog:";
+      const range = catalog?.[name];
+      if (!range)
+        throw new Error(`Template catalog has no range for ${name}`);
+      return range;
+    };
     const replaceLocalPackages = (dependencies) => {
       if (!dependencies)
         return dependencies;
       return {
         ...dependencies,
-        ...dependencies.stitchkit?.startsWith("file:") && { stitchkit: "catalog:" },
+        ...dependencies.stitchkit?.startsWith("file:") && {
+          stitchkit: localReference("stitchkit")
+        },
         ...dependencies["stitchkit-tui"]?.startsWith("file:") && {
-          "stitchkit-tui": "catalog:"
+          "stitchkit-tui": localReference("stitchkit-tui")
         }
       };
     };
+    const { catalog: _templateCatalog, ...withoutCatalog } = manifest;
     await writeFile(manifestPath, `${JSON.stringify({
-      ...manifest,
+      ...isWorkspace ? manifest : withoutCatalog,
       name: identity.slug,
-      ...catalog && { catalog },
+      ...isWorkspace && catalog && { catalog },
       ...manifest.dependencies && {
         dependencies: replaceLocalPackages(manifest.dependencies)
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-stitchkit",
-  "version": "0.6.5",
+  "version": "0.6.7",
   "description": "Create a production-shaped Stitchkit application",
   "license": "MIT",
   "author": "Max Listov <maxlistov@gmail.com>",
@@ -84,7 +84,7 @@
     "@types/react": "^19.3.0",
     "ai": "^7.0.111",
     "react": "^19.3.0",
-    "stitchkit": "0.96.0",
+    "stitchkit": "0.96.1",
     "typescript": "^7.0.2"
   },
   "engines": {

package/template/bun.lock

@@ -145,7 +145,7 @@
     "zod": "4.6.5",
   },
   "catalog": {
-    "stitchkit": "^0.96.0",
+    "stitchkit": "^0.96.1",
   },
   "packages": {
     "@ai-sdk/gateway": ["@ai-sdk/gateway@4.0.89", "", { "dependencies": { "@ai-sdk/provider": "4.0.17", "@ai-sdk/provider-utils": "5.0.45", "@vercel/oidc": "3.2.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-n0Q88UUASYQBGK3Ogs9pCe8h3ZXeTHFSuGOLBJAyH73MVGNKUv9w8EJX2f340WUF3eDWWOV305gO7YBpSCPblA=="],
@@ -1128,7 +1128,7 @@
 
     "std-env": ["std-env@3.10.0", "", {}, "sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg=="],
 
-    "stitchkit": ["stitchkit@0.96.0", "", { "dependencies": { "ky": "^2.1.0" }, "peerDependencies": { "@modelcontextprotocol/ext-apps": "^1.7.2 || ^2.0.0", "@modelcontextprotocol/server": "^2.0.0", "@openrouter/ai-sdk-provider": "^3.1.0", "@opentelemetry/api": "^1.9.0", "@socket.io/bun-engine": "^0.1.2", "@socket.io/component-emitter": "^3.1.2", "@tanstack/react-query": ">=5", "@types/bun": "^1.4.2", "ai": "^7.0.107", "google-auth-library": "^11.1.0", "grammy": "^1.46.0", "maxmind": "^5.0.7", "react": ">=18", "react-query-kit": "^3.3.3", "socket.io": "^4.8.3", "socket.io-client": "^4.8.3", "srvx": "^0.12.5 || ^1.0.5", "zod": "^4.6.5" }, "optionalPeers": ["@modelcontextprotocol/ext-apps", "@modelcontextprotocol/server", "@openrouter/ai-sdk-provider", "@opentelemetry/api", "@socket.io/bun-engine", "@socket.io/component-emitter", "@tanstack/react-query", "@types/bun", "ai", "google-auth-library", "grammy", "maxmind", "react", "react-query-kit", "socket.io", "socket.io-client", "srvx"], "bin": { "stitchkit": "dist/entrypoints/bin/upgrade-cli.js" } }, "sha512-5cgzNatZtqE0HCXozqGXdcAeudG+QLxKXKZSHFasYu7O6JvU0rViDVO76hWFSwOiczaSoqsqwk/GM01ArMMUmw=="],
+    "stitchkit": ["stitchkit@0.96.1", "", { "dependencies": { "ky": "^2.1.0" }, "peerDependencies": { "@modelcontextprotocol/ext-apps": "^1.7.2 || ^2.0.0", "@modelcontextprotocol/server": "^2.0.0", "@openrouter/ai-sdk-provider": "^3.1.0", "@opentelemetry/api": "^1.9.0", "@socket.io/bun-engine": "^0.1.2", "@socket.io/component-emitter": "^3.1.2", "@tanstack/react-query": ">=5", "@types/bun": "^1.4.2", "ai": "^7.0.107", "google-auth-library": "^11.1.0", "grammy": "^1.46.0", "maxmind": "^5.0.7", "react": ">=18", "react-query-kit": "^3.3.3", "socket.io": "^4.8.3", "socket.io-client": "^4.8.3", "srvx": "^0.12.5 || ^1.0.5", "zod": "^4.6.5" }, "optionalPeers": ["@modelcontextprotocol/ext-apps", "@modelcontextprotocol/server", "@openrouter/ai-sdk-provider", "@opentelemetry/api", "@socket.io/bun-engine", "@socket.io/component-emitter", "@tanstack/react-query", "@types/bun", "ai", "google-auth-library", "grammy", "maxmind", "react", "react-query-kit", "socket.io", "socket.io-client", "srvx"], "bin": { "stitchkit": "dist/entrypoints/bin/upgrade-cli.js" } }, "sha512-Jdd3OAXBVvfNR0v7Hgv46THObNQMl+4a3LaIdr4127eHSjZiW2n8Y/ujmFlhD1V57TFiDv4FkUT9FrTdjkqszQ=="],
 
     "stringify-entities": ["stringify-entities@4.0.4", "", { "dependencies": { "character-entities-html4": "^2.0.0", "character-entities-legacy": "^3.0.0" } }, "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg=="],
 

package/template/package.json

@@ -7,7 +7,7 @@
     "packages/*"
   ],
   "catalog": {
-    "stitchkit": "^0.96.0"
+    "stitchkit": "^0.96.1"
   },
   "overrides": {
     "@playwright/test": "1.63.0",

package/templates/agent/package.json

@@ -16,6 +16,7 @@
     "build": "bun build src/index.ts --outdir dist --target bun --packages external"
   },
   "dependencies": {
+    "@modelcontextprotocol/server": "^2.0.0",
     "@openrouter/ai-sdk-provider": "^3.1.0",
     "ai": "^7.0.111",
     "stitchkit": "file:../../../core",

package/templates/telegram-bot/README.md

@@ -16,9 +16,10 @@ bun run dev
 
 - `src/handlers.ts` — the product: commands, messages, what goes to the operators' chat.
 - `src/application.ts` — the resource graph: `database` → (`telegram-files`) →
-  (`operator-channel`) → `telegram-configuration` → `telegram-polling`. Queues, an
-  HTTP server for payment webhooks, schedules and metrics go between the database
-  and the bot.
+  `telegram-configuration` → `telegram-polling`, with the optional
+  `operator-channel` beside the bot rather than under it. Required resources the
+  handlers need — queues, an HTTP server for payment webhooks — join the bot's
+  dependencies; optional ones — the operators' chat, metrics — stand beside it.
 - `src/index.ts` — the entry point: environment, journal, signals, and the one
   policy for a poller that ended on its own (shut down, exit 1, let the supervisor
   restart).

package/templates/telegram-bot/src/application.ts

@@ -27,11 +27,14 @@ export interface BotApplicationConfig {
 /**
  * The graph, in start order:
  *
- *   database → [telegram-files] → [operator-channel] → telegram-configuration → telegram-polling
+ *   database → [telegram-files] → telegram-configuration → telegram-polling
+ *   [operator-channel]              beside the bot, not under it
  *
- * Product resources — queues, an HTTP server for payment webhooks, schedules,
- * metrics — go between the database and the bot, and join the bot's
- * `dependsOn` when handlers need them before the first update.
+ * The bot depends only on what it cannot answer without — required resources.
+ * An optional one (the operators' chat, metrics) stands beside the bot: a
+ * required resource may not depend on an optional one, and the bot must keep
+ * answering when the chat is unreachable. Queues and an HTTP server for
+ * payment webhooks are required and join the bot's `dependsOn`.
  */
 export function createBotApplication(config: BotApplicationConfig): ApplicationHandle {
   const database = createDatabase(config.databasePath);
@@ -59,17 +62,17 @@ export function createBotApplication(config: BotApplicationConfig): ApplicationH
     );
   }
   const operators = config.operators;
-  if (operators) {
-    botDependencies.push(
-      defineManagedResource({
-        id: 'operator-channel',
-        required: false,
-        start() {},
-        drain: (context) => operators.drain(context.signal),
-        close: () => operators.close(),
-      }),
-    );
-  }
+  const beside: ManagedResource[] = operators
+    ? [
+        defineManagedResource({
+          id: 'operator-channel',
+          required: false,
+          start() {},
+          drain: (context) => operators.drain(context.signal),
+          close: () => operators.close(),
+        }),
+      ]
+    : [];
 
   const telegram = grammyBotResources({
     bot: config.bot,
@@ -84,7 +87,7 @@ export function createBotApplication(config: BotApplicationConfig): ApplicationH
 
   return createApplication({
     id: 'telegram-bot',
-    resources: [...botDependencies, ...telegram.resources],
+    resources: [...botDependencies, ...beside, ...telegram.resources],
     shutdown: config.shutdown ?? { gracePeriodMs: 30_000, forceTimeoutMs: 5_000 },
     onResourceFailure: ({ resourceId, phase, error }) =>
       config.log.error('Resource failed', { resourceId, phase, error }),

package/templates/telegram-bot/tests/application.test.ts

@@ -1,5 +1,9 @@
 import { afterEach, describe, expect, test } from 'bun:test';
+import { mkdir, mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
 import { Bot } from 'grammy';
+import { createTelegramLocalFiles, createTelegramOperatorChannel } from 'stitchkit/telegram';
 import { z } from 'zod';
 import { createBotApplication } from '../src/application';
 import { createLog } from '../src/log';
@@ -73,8 +77,12 @@ function fakeTelegram() {
 }
 
 const servers: { stop(): void }[] = [];
-afterEach(() => {
+const directories: string[] = [];
+afterEach(async () => {
   for (const server of servers.splice(0)) server.stop();
+  await Promise.all(
+    directories.splice(0).map((path) => rm(path, { recursive: true, force: true })),
+  );
 });
 
 async function until(check: () => boolean): Promise<void> {
@@ -117,4 +125,47 @@ describe('the bot application', () => {
     expect(Math.max(...telegram.offsets)).toBe(6);
     expect(ended).toEqual([]);
   });
+
+  test('starts with an operators chat and local Bot API files, and the channel drains on the way down', async () => {
+    const telegram = fakeTelegram();
+    servers.push(telegram);
+    const root = await mkdtemp(join(tmpdir(), 'template-bot-files-'));
+    directories.push(root);
+    await mkdir(join(root, '1:template'));
+    const bot = new Bot('1:template', { client: { apiRoot: telegram.origin } });
+    const posted: string[] = [];
+    const operators = createTelegramOperatorChannel<'users' | 'errors'>({
+      chatId: -100,
+      minIntervalMs: 1,
+      send: async (message) => void posted.push(message.text),
+    });
+    const app = createBotApplication({
+      bot,
+      databasePath: ':memory:',
+      log: createLog({ LOG_LEVEL: 'info' }),
+      operators,
+      files: createTelegramLocalFiles({ root, token: '1:template' }),
+      onPollingEnded: () => undefined,
+      shutdown: { gracePeriodMs: 2_000, forceTimeoutMs: 200 },
+    });
+
+    const snapshot = await app.start();
+    expect(snapshot.ready).toBe(true);
+    expect(snapshot.resources.map((resource) => resource.id)).toEqual([
+      'database',
+      'operator-channel',
+      'telegram-files',
+      'telegram-configuration',
+      'telegram-polling',
+    ]);
+    // The bot waits for what it cannot answer without, never for the chat.
+    expect(
+      snapshot.resources.find((resource) => resource.id === 'telegram-configuration')
+        ?.dependsOn,
+    ).toEqual(['database', 'telegram-files']);
+    telegram.push(8);
+    await until(() => posted.length > 0);
+    expect(posted).toEqual(['New user 7']);
+    expect((await app.shutdown()).outcome).toBe('clean');
+  });
 });