@mercury-fw/cli 0.65.0 → 0.66.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @mercury-fw/cli
 
+## 0.66.0
+
+### Minor Changes
+
+- f21aed8: - add `model` to `mercury.config.ts`: `think`, `temperature`, `topP`, `topK` for the main model, every call on it; a field left out uses the model's own value
+  - export `envNumber` and `envBoolean`: a config field's value from an environment variable, with a fallback
+  - the startup log names the model and its settings (`[model] <name>: think on, temperature 0.2`)
+  - `mfw create`: new apps declare `model` from `OLLAMA_THINK`, `OLLAMA_TEMPERATURE`, `OLLAMA_TOP_P`, `OLLAMA_TOP_K`, listed empty in the env example
+  - **Breaking:** the core no longer reads `OLLAMA_THINK`: set `model.think` in the config
+  - **Migration:** add to `mercury.config.ts` `import { envBoolean, envNumber } from "@mercury-fw/core";` and `model: { think: envBoolean("OLLAMA_THINK", true), temperature: envNumber("OLLAMA_TEMPERATURE"), topP: envNumber("OLLAMA_TOP_P"), topK: envNumber("OLLAMA_TOP_K") },`; add `OLLAMA_TEMPERATURE=`, `OLLAMA_TOP_P=`, `OLLAMA_TOP_K=` to the env example
+
+### Patch Changes
+
+- Updated dependencies [f21aed8]
+  - @mercury-fw/core@0.66.0
+  - @mercury-fw/utils@0.66.0
+
+## 0.65.1
+
+### Patch Changes
+
+- 9b2e1bf: - `mfw create`: the comment above the config's `version` and the app's README say what it shows, and no longer how to move the number: that's the app's own business.
+  - The `version` field's description says Mercury never changes it, with no advice on who does.
+- Updated dependencies [9b2e1bf]
+  - @mercury-fw/core@0.65.1
+  - @mercury-fw/utils@0.65.1
+
 ## 0.65.0
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mercury-fw/cli",
-  "version": "0.65.0",
+  "version": "0.66.0",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -41,17 +41,17 @@
   "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.65.0",
-    "@mercury-fw/utils": "0.65.0",
+    "@mercury-fw/core": "0.66.0",
+    "@mercury-fw/utils": "0.66.0",
     "commander": "^15.0.0"
   },
   "devDependencies": {
     "@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.14.0",
+    "@mercury-fw/channel-http": "0.14.1",
     "@mercury-fw/directory-static": "0.1.2",
-    "@mercury-fw/formatter": "0.65.0",
+    "@mercury-fw/formatter": "0.66.0",
     "@mercury-fw/plugin-atlassian-admin": "0.5.1",
     "@mercury-fw/plugin-bitbucket": "0.6.1",
     "@mercury-fw/plugin-confluence": "0.1.0",

package/src/render.ts

@@ -45,6 +45,10 @@ const CORE_ENV: EnvVar[] = [
     value: "http://host.docker.internal:11434",
   },
   { name: "OLLAMA_MODEL", comment: "Chat model the assistant runs on" },
+  { name: "OLLAMA_THINK", comment: "false for a chat model that doesn't support thinking (empty: on)" },
+  { name: "OLLAMA_TEMPERATURE", comment: "The chat model's temperature, from 0 up (empty: the model's own)" },
+  { name: "OLLAMA_TOP_P", comment: "The chat model's top_p, above 0 and at most 1 (empty: the model's own)" },
+  { name: "OLLAMA_TOP_K", comment: "The chat model's top_k, a whole number from 1 up (empty: the model's own)" },
   { name: "OLLAMA_EMBEDDING_MODEL", comment: "Embedding model for the episodic memory", value: "nomic-embed-text" },
   { name: "QDRANT_URL", comment: "Qdrant, the compose service", value: "http://qdrant:6333" },
   { name: "WIKI_VAULT_PATH", comment: "Wiki vault, the named volume's mount point", value: "/app/wiki-vault" },
@@ -55,12 +59,23 @@ const CORE_ENV: EnvVar[] = [
   },
 ];
 
+/** The config's `model` section: the main model's settings, each from its env variable (#355). */
+const MODEL_SECTION = [
+  "  // How the main model generates, each value from .env: left empty, the",
+  "  // model's own applies (thinking stays on).",
+  "  model: {",
+  '    think: envBoolean("OLLAMA_THINK", true),',
+  '    temperature: envNumber("OLLAMA_TEMPERATURE"),',
+  '    topP: envNumber("OLLAMA_TOP_P"),',
+  '    topK: envNumber("OLLAMA_TOP_K"),',
+  "  },",
+].join("\n");
+
 /** Above the config's `version`: what it does, and what it doesn't. */
 const VERSION_COMMENT = [
   "  // The app's version, from package.json: GET /version shows it next to the",
-  "  // framework's, to anyone (no token). Mercury never bumps it, your own",
-  "  // tooling does, and a new one shows once the app is rebuilt. Remove this",
-  "  // line to show none.",
+  "  // framework's, to anyone (no token). Mercury never changes it, and a new",
+  "  // one shows once the app is rebuilt. Remove this line to show none.",
 ].join("\n");
 
 const CONFIG_HEADER = `/**
@@ -224,7 +239,7 @@ function renderConfig(
 ): string {
   const withRules = tools.filter((t) => t.formatter);
   const imports = [
-    'import { defineMercuryConfig } from "@mercury-fw/core";',
+    'import { defineMercuryConfig, envBoolean, envNumber } from "@mercury-fw/core";',
     'import en from "./locales/en.json";',
     'import pkg from "./package.json";',
   ];
@@ -261,6 +276,7 @@ function renderConfig(
     channelList,
     ...(auth ? [`  auth: ${auth.exportName},`] : []),
     ...(directory ? [`  directory: ${directory.exportName},`] : []),
+    MODEL_SECTION,
     "  i18n: { locales: { en } },",
     VERSION_COMMENT,
     "  version: pkg.version,",
@@ -432,7 +448,7 @@ ${auth ? `- Auth: ${auth.id}\n` : ""}- Tool plugins: ${list(tools)}
 ${directory ? `- Directory: ${directory.id}\n` : ""}
 ## Layout
 
-- \`mercury.config.ts\`: what the app is made of (tool plugins, channels, how their lists read) and the assistant's persona: its name, who it is and how it answers. Edit them freely. Its \`version\` is the one in \`package.json\`, which the HTTP channel's \`GET /version\` shows to anyone, no token needed: Mercury never moves it (do it by hand, with Changesets, or with a script before pushing), and a new one shows once the app is rebuilt. Remove the line to show none.
+- \`mercury.config.ts\`: what the app is made of (tool plugins, channels, how their lists read) and the assistant's persona: its name, who it is and how it answers. Edit them freely. Its \`model\` section is how the chat model generates (thinking, temperature, top_p, top_k), each value from \`.env\`: left empty, the model's own applies. Its \`version\` is the one in \`package.json\`, which the HTTP channel's \`GET /version\` shows to anyone, no token needed: Mercury never changes it, and a new one shows once the app is rebuilt. Remove the line to show none.
 - \`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.