@mercury-fw/cli 0.59.1 → 0.60.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @mercury-fw/cli
 
+## 0.60.0
+
+### Minor Changes
+
+- 4ac0457: Scaffolded apps now install with Bun's isolated linker (the default when workspaces are present). The Dockerfile's PATH step follows symlinks (`find -L`) so the CLI plugins' binaries are linked as before. The `bunfig.toml` that forced the hoisted layout is gone from new apps; existing apps keep theirs.
+
+### Patch Changes
+
+- @mercury-fw/core@0.60.0
+- @mercury-fw/utils@0.60.0
+
+## 0.59.2
+
+### Patch Changes
+
+- f631dd5: README: a link to the package's page on Mercury's documentation site (https://lucabro81.github.io/mercury-fw/), published from this release on. The HTTP channel's README points to the HTTP API reference there, and the core's memory section to the page that explains it.
+- Updated dependencies [f631dd5]
+- Updated dependencies [3b67dd6]
+  - @mercury-fw/core@0.59.2
+  - @mercury-fw/utils@0.59.2
+
 ## 0.59.1
 
 ### Patch Changes

package/README.md

@@ -2,6 +2,8 @@
 
 `mfw`, the command-line tool of [Mercury](https://github.com/lucabro81/mercury-fw): it creates an app, then runs it. Every command except `create` works from inside an app, meaning its folder or any folder under it (the one holding `mercury.config.ts`), and wraps the `docker compose` calls that app needs, so you don't have to remember them; each section below says which calls those are. New commands get documented here as they're added.
 
+On Mercury's documentation site: [the `mfw` reference](https://lucabro81.github.io/mercury-fw/reference/cli/).
+
 ## Table of contents
 
 - [Getting it](#getting-it)
@@ -51,7 +53,7 @@ Writes a new Mercury app into `<folder>`, which has to be missing or empty; the
 - which channels and which tool plugins to include (none is fine: the REPL always works);
 - the git remote for `origin`, which you can leave empty (most of the time it doesn't exist yet when you scaffold).
 
-It writes the `mercury.config.ts` for that selection, the persona, a `locales/` folder with an `en.json` for the texts people see (empty, or the starting formatter rules' own texts: `app.jira.no-issues` with Jira), the service and REPL entrypoints, a Dockerfile, a compose file with Qdrant, and an env example listing every variable the chosen pieces read. Its `package.json` declares `plugins/*` as workspaces, the place for the app's own plugins (each a package in `plugins/<name>`, which the image copies before installing), and a `test` script (`bun test`, the plugins' tests included); `bunfig.toml` keeps Bun's hoisted `node_modules`, which the workspaces would otherwise turn into links. A plugin that hands over lists comes wrapped in the formatter with a starting rule, yours to change.
+It writes the `mercury.config.ts` for that selection, the persona, a `locales/` folder with an `en.json` for the texts people see (empty, or the starting formatter rules' own texts: `app.jira.no-issues` with Jira), the service and REPL entrypoints, a Dockerfile, a compose file with Qdrant, and an env example listing every variable the chosen pieces read. Its `package.json` declares `plugins/*` as workspaces, the place for the app's own plugins (each a package in `plugins/<name>`, which the image copies before installing), and a `test` script (`bun test`, the plugins' tests included); the workspaces make Bun install with its isolated linker, and the Dockerfile's PATH step follows the links it makes. A plugin that hands over lists comes wrapped in the formatter with a starting rule, yours to change.
 
 Then it runs `bun install` in the app and creates a git repository on `main` with a first commit (`bun.lock` included), adding `origin` when you gave one; nothing is pushed. Each step is best effort and never undoes the ones before it: an install that fails still leaves the app committed, without the lockfile, and the closing message says what to run. The repository is skipped when the folder is already inside one (an app created in a monorepo belongs to it). Whether git can commit is git's call: when it refuses (no identity, a hook) or isn't installed, the message reports why and lists the commands to finish by hand. `bun install` prints its own output as it runs.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mercury-fw/cli",
-  "version": "0.59.1",
+  "version": "0.60.0",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -41,24 +41,24 @@
   "comment:shape": "The Mercury CLI (`mfw`). `mfw create <dir>` writes a new Mercury app from the template. The framework packages move in lockstep with it, so a new app gets them at the CLI's own version; plugins and channels at the registry's latest. The plugin and channel packages are devDependencies only for the catalog test. `main(argv)` is exported for create-mercury-agent.",
   "dependencies": {
     "@clack/prompts": "^1.8.1",
-    "@mercury-fw/core": "0.59.1",
-    "@mercury-fw/utils": "0.59.1",
+    "@mercury-fw/core": "0.60.0",
+    "@mercury-fw/utils": "0.60.0",
     "commander": "^15.0.0"
   },
   "devDependencies": {
-    "@mercury-fw/auth-oidc": "0.2.0",
-    "@mercury-fw/auth-static": "0.2.1",
-    "@mercury-fw/channel-google-chat": "0.11.0",
-    "@mercury-fw/channel-http": "0.13.0",
-    "@mercury-fw/directory-static": "0.1.1",
-    "@mercury-fw/formatter": "0.59.1",
-    "@mercury-fw/plugin-atlassian-admin": "0.5.0",
-    "@mercury-fw/plugin-bitbucket": "0.6.0",
-    "@mercury-fw/plugin-jira": "0.8.0",
-    "@mercury-fw/plugin-web-search": "0.4.0",
-    "@mercury-fw/plugin-zitadel": "0.5.0",
+    "@mercury-fw/auth-oidc": "0.2.1",
+    "@mercury-fw/auth-static": "0.2.2",
+    "@mercury-fw/channel-google-chat": "0.11.1",
+    "@mercury-fw/channel-http": "0.13.1",
+    "@mercury-fw/directory-static": "0.1.2",
+    "@mercury-fw/formatter": "0.60.0",
+    "@mercury-fw/plugin-atlassian-admin": "0.5.1",
+    "@mercury-fw/plugin-bitbucket": "0.6.1",
+    "@mercury-fw/plugin-jira": "0.8.1",
+    "@mercury-fw/plugin-web-search": "0.4.1",
+    "@mercury-fw/plugin-zitadel": "0.5.1",
     "@mercury-fw/typescript-config": "*",
-    "@mercury-fw/web-search-searxng": "0.1.0",
+    "@mercury-fw/web-search-searxng": "0.1.1",
     "@types/bun": "^1.4.2",
     "typescript": "^6.0.3"
   }

package/src/render.ts

@@ -13,7 +13,6 @@ import { CATALOG, type CatalogEntry, type EnvVar } from "./catalog.ts";
 import indexTs from "../template/src/index.ts.tpl" with { type: "text" };
 import replTs from "../template/src/repl.ts.tpl" with { type: "text" };
 import tsconfigJson from "../template/tsconfig.json.tpl" with { type: "text" };
-import bunfigToml from "../template/bunfig.toml.tpl" with { type: "text" };
 import gitignore from "../template/gitignore.tpl" with { type: "text" };
 import dockerignore from "../template/dockerignore.tpl" with { type: "text" };
 import dockerfile from "../template/Dockerfile.tpl" with { type: "text" };
@@ -86,7 +85,6 @@ export function renderApp(input: RenderInput): Map<string, string> {
     [".gitignore", gitignore],
     ["Dockerfile", dockerfile],
     ["README.md", renderReadme(input.name, channels, auth, tools, directory)],
-    ["bunfig.toml", bunfigToml],
     ["docker-compose.yml", renderCompose(input.name, channels.some((c) => c.id === "http"), services)],
     ["locales/en.json", renderEnglish(tools)],
     ["mercury.config.ts", renderConfig(assistantName, input.role, channels, auth, tools, directory)],
@@ -423,7 +421,6 @@ ${directory ? `- Directory: ${directory.id}\n` : ""}
 - \`locales/\`: the texts people see, one file per language the assistant speaks. \`en.json\` overrides the English ones; add \`it.json\` (and \`it\` to \`i18n.locales\` in the config) for Italian, \`i18n.defaultLocale\` for the language people get when they haven't picked one, \`i18n.timeZone\` (an IANA name such as \`Europe/Rome\`) for the time zone of whoever saved none and whose app says none. The app's own texts (a formatter rule's) are \`app.\` keys, written in English in \`en.json\` and translated in every other file. Mercury logs at startup the keys a file is missing.
 - \`src/index.ts\`: the service (channels, crons). \`src/repl.ts\`: an interactive terminal for trying things out.
 - \`plugins/\`: the app's own plugins, when it has any: each one a package in a folder of its own (\`plugins/<name>\`, a workspace), listed in \`dependencies\` as \`workspace:*\` and declared in \`mercury.config.ts\`. \`bun run test\` runs their tests.
-- \`bunfig.toml\`: keeps Bun's hoisted \`node_modules\`, which the workspaces would otherwise turn into links the image's PATH step doesn't follow. Keep it.
 - \`.env.example\`: every variable the app reads. Copy it to \`.env\` and fill it in.
 
 ## Running it

package/template/Dockerfile.tpl

@@ -15,15 +15,16 @@ WORKDIR /app
 # package.json's trustedDependencies); the binaries go on PATH. .packs/ holds
 # local tarballs when the app installs them (mfw local-packages), plugins/ the
 # app's own plugins (workspaces, whose postinstall needs their whole folder),
-# and each is skipped when it isn't there. bunfig.toml keeps Bun's hoisted
-# node_modules, which the workspaces would otherwise turn into symlinks.
-COPY --chown=mercury:mercury package.json bun.lock* bunfig.toml ./
+# and each is skipped when it isn't there.
+COPY --chown=mercury:mercury package.json bun.lock* ./
 COPY --chown=mercury:mercury .pack[s] ./.packs/
 COPY --chown=mercury:mercury plugin[s] ./plugins/
 RUN bun install --production && chown -R mercury:mercury node_modules
-# plugins/ made when the app has none, or find fails on it.
+# plugins/ made when the app has none, or find fails on it. -L follows the
+# symlinks of Bun's isolated linker, so the binaries inside node_modules/.bun
+# are found through the package links.
 RUN mkdir -p /app/plugins \
-  && find /app/node_modules/@mercury-fw /app/plugins -mindepth 3 -maxdepth 3 -path '*/bin/*' -type f -exec ln -sf {} /usr/local/bin/ \;
+  && find -L /app/node_modules/@mercury-fw /app/plugins -mindepth 3 -maxdepth 3 -path '*/bin/*' -type f -exec ln -sf {} /usr/local/bin/ \;
 
 COPY --chown=mercury:mercury mercury.config.ts ./
 COPY --chown=mercury:mercury locales ./locales

package/template/bunfig.toml.tpl

@@ -1,2 +0,0 @@
-[install]
-linker = "hoisted"