mercury-agent 0.5.7 → 0.5.10

package/README.md

@@ -52,21 +52,23 @@ Configure identity and adapters in `.env`:
 MERCURY_BOT_USERNAME=Mercury
 MERCURY_TRIGGER_PATTERNS=@Mercury,Mercury
 
-# Enable adapters
+# Enable adapters (pick one or more)
 MERCURY_ENABLE_WHATSAPP=true
 MERCURY_ENABLE_DISCORD=true
 MERCURY_DISCORD_BOT_TOKEN=your-bot-token
+MERCURY_ENABLE_TELEGRAM=true
+MERCURY_TELEGRAM_BOT_TOKEN=your-bot-token
 ```
 
 Start:
 
 ```bash
 mercury run
-# or install as a background service:
+# or install as a background service (macOS/Linux only):
 mercury service install
 ```
 
-> `mercury run` runs in the foreground (good for a first smoke test). For anything long-running, prefer `mercury service install` — it runs in the background and auto-restarts.
+> `mercury run` runs in the foreground — on Windows (WSL2) this is the only option. On macOS/Linux, prefer `mercury service install` for long-running use — it runs in the background and auto-restarts.
 
 ### Set up spaces and conversations
 
@@ -86,6 +88,26 @@ mercury link <id> main             # Link a conversation to a space
 
 Multiple conversations can point at the same space — they share memory, session, and vault.
 
+### Updating Mercury
+
+```bash
+# 1. Stop Mercury
+#    macOS/Linux: mercury service uninstall
+#    Windows/WSL2: Ctrl+C in the terminal running mercury run
+
+# 2. Update the package
+npm update -g mercury-agent
+
+# 3. Rebuild the agent container image
+mercury build
+
+# 4. Start again
+#    macOS/Linux: mercury service install
+#    Windows/WSL2: mercury run
+```
+
+`mercury build` rebuilds the base agent image from the installed package source. The derived image (base + your extensions) rebuilds automatically on startup when the base changes.
+
 ---
 
 ## How It Works
@@ -445,6 +467,10 @@ This fork is maintained by [Avishai Tsabari](https://github.com/Avishai-Tsabari)
 
 MIT — see [LICENSE](LICENSE)
 
+### Third-party licenses
+
+The WhatsApp adapter depends on [@whiskeysockets/baileys](https://github.com/WhiskeySockets/Baileys), which transitively includes [libsignal](https://github.com/nicktrav/libsignal) (GPL-3.0) for Signal Protocol encryption. This component runs inside an isolated Docker container and is loaded as a runtime dependency, not statically linked into Mercury's codebase. If your use case has strict copyleft concerns, consult legal counsel or omit the WhatsApp adapter.
+
 ---
 
 <p align="center">

package/container/Dockerfile

@@ -60,7 +60,7 @@ RUN echo '{"args":["--no-sandbox"]}' > /home/mercury/.puppeteerrc.json
 ENV CHROMIUM_FLAGS="--no-sandbox"
 
 # Install CLIs
-RUN bun add -g @mariozechner/pi-coding-agent@^0.67.2
+RUN bun add -g @earendil-works/pi-coding-agent@~0.79.6
 
 WORKDIR /app
 
@@ -77,7 +77,7 @@ function patch(dir) {
       const p = path.join(dir, f);
       try {
         if (fs.statSync(p).isDirectory()) patch(p);
-        else if (f === 'google.js' && p.includes('@mariozechner/pi-ai')) {
+        else if (f === 'google.js' && p.includes('@earendil-works/pi-ai')) {
           let c = fs.readFileSync(p, 'utf8');
           const noThinking = '&& !model.id.startsWith("gemma")';
           const p1 = 'if (options.thinking?.enabled && model.reasoning) {';
@@ -97,6 +97,13 @@ patch('/home/mercury/.bun');
 patch('/app/node_modules');
 EOF
 
+# Fix ownership of all mercury home dir artifacts before switching user.
+# Placed here — after the last step that writes to /home/mercury (the pi patch),
+# but before the volatile /app source COPYs below — so this expensive `chown -R`
+# (it walks the whole Chromium + .bun tree) lands in a stable cached layer.
+# Editing source files no longer invalidates it or forces the huge layer re-export.
+RUN chown -R mercury:mercury /home/mercury
+
 COPY src/agent/container-entry.ts /app/src/agent/container-entry.ts
 COPY src/agent/model-capabilities-core.ts /app/src/agent/model-capabilities-core.ts
 COPY src/agent/pi-failure-class.ts /app/src/agent/pi-failure-class.ts
@@ -119,9 +126,6 @@ RUN while IFS= read -r ext || [ -n "$ext" ]; do \
 RUN echo '#!/bin/sh\nbun run /app/src/cli/mrctl.ts "$@"' > /usr/local/bin/mrctl && \
     chmod +x /usr/local/bin/mrctl
 
-# Fix ownership of all mercury home dir artifacts before switching user
-RUN chown -R mercury:mercury /home/mercury
-
 USER mercury
 
 ENTRYPOINT ["bun", "run", "/app/src/agent/container-entry.ts"]

package/container/Dockerfile.base

@@ -42,7 +42,7 @@ RUN echo '{"args":["--no-sandbox"]}' > /home/mercury/.puppeteerrc.json
 ENV CHROMIUM_FLAGS="--no-sandbox"
 
 # Install CLIs
-RUN bun add -g @mariozechner/pi-coding-agent@^0.67.2
+RUN bun add -g @earendil-works/pi-coding-agent@~0.79.6
 
 WORKDIR /app
 
@@ -59,7 +59,7 @@ function patch(dir) {
       const p = path.join(dir, f);
       try {
         if (fs.statSync(p).isDirectory()) patch(p);
-        else if (f === 'google.js' && p.includes('@mariozechner/pi-ai')) {
+        else if (f === 'google.js' && p.includes('@earendil-works/pi-ai')) {
           let c = fs.readFileSync(p, 'utf8');
           const noThinking = '&& !model.id.startsWith("gemma")';
           const p1 = 'if (options.thinking?.enabled && model.reasoning) {';

package/container/build.sh

@@ -9,46 +9,15 @@ cd "$PROJECT_ROOT"
 IMAGE_NAME="mercury-agent"
 
 # Parse arguments
-BUILD_ALL=false
-BUILD_LATEST=false
-BUILD_MINIMAL=false
-
-if [ $# -eq 0 ]; then
-    BUILD_LATEST=true
-elif [ "$1" = "all" ]; then
-    BUILD_ALL=true
-elif [ "$1" = "latest" ]; then
-    BUILD_LATEST=true
-elif [ "$1" = "minimal" ]; then
-    BUILD_MINIMAL=true
-else
-    echo "Usage: $0 [all|latest|minimal]"
-    echo ""
-    echo "Presets:"
-    echo "  latest   Full devcontainer with Node, Python, Go, git (~2.8GB)"
-    echo "  minimal  Bun + pi + browser only (~1.9GB)"
-    echo "  all      Build both presets"
+if [ $# -gt 0 ] && [ "$1" != "latest" ]; then
+    echo "Usage: $0 [latest]"
     echo ""
-    echo "Default: latest"
+    echo "Builds ${IMAGE_NAME}:latest — full devcontainer with Node, Python, Go, git (~2.8GB)."
     exit 1
 fi
 
-if [ "$BUILD_ALL" = true ] || [ "$BUILD_LATEST" = true ]; then
-    echo "Building ${IMAGE_NAME}:latest (full devcontainer)..."
-    docker build -f container/Dockerfile -t "${IMAGE_NAME}:latest" .
-    echo "✓ Built ${IMAGE_NAME}:latest"
-    echo ""
-fi
-
-if [ "$BUILD_ALL" = true ] || [ "$BUILD_MINIMAL" = true ]; then
-    echo "Building ${IMAGE_NAME}:minimal (bun-only)..."
-    docker build -f container/Dockerfile.minimal -t "${IMAGE_NAME}:minimal" .
-    echo "✓ Built ${IMAGE_NAME}:minimal"
-    echo ""
-fi
-
+echo "Building ${IMAGE_NAME}:latest (full devcontainer)..."
+docker build -f container/Dockerfile -t "${IMAGE_NAME}:latest" .
+echo "✓ Built ${IMAGE_NAME}:latest"
+echo ""
 echo "Build complete!"
-if [ "$BUILD_ALL" = true ]; then
-    echo "  ${IMAGE_NAME}:latest  - Full devcontainer (~2.8GB)"
-    echo "  ${IMAGE_NAME}:minimal - Bun + pi + browser (~1.9GB)"
-fi

package/docs/authoring-profiles.md

@@ -52,7 +52,7 @@ defaults:
   trigger_patterns: always
 ```
 
-Apply it with `mercury profile apply <name|path|git-url>`. That validates
+Apply it with `mercury setup --profile <name|path>`. That validates
 capabilities, copies extensions/AGENTS.md, and persists activation to
 `.mercury/active-profile.json`, which Mercury loads at startup.
 
@@ -168,7 +168,7 @@ Depend on this repo (`mercury-agent`) for the types
 
 ## 5. Local test loop
 
-1. `mercury profile apply ./barber`
+1. `mercury setup --profile ./barber`
 2. `mercury service install` (builds the derived image with the extension CLI)
 3. DM the bot as a non-admin number; confirm you can `book`/`cancel` only your
    own appointments and cannot reach `gws`/Gmail.

package/docs/container-lifecycle.md

@@ -175,9 +175,8 @@ Message received
 # Set container timeout to 10 minutes
 export MERCURY_CONTAINER_TIMEOUT_MS=600000
 
-# Use a preset image from GitHub Container Registry
+# Use the preset image from GitHub Container Registry
 export MERCURY_AGENT_IMAGE=ghcr.io/avishai-tsabari/mercury-agent:latest   # Full (default)
-export MERCURY_AGENT_IMAGE=ghcr.io/avishai-tsabari/mercury-agent:minimal  # Lightweight
 ```
 
 ## Sandboxing (Bubblewrap)
@@ -198,27 +197,24 @@ If you see `bwrap: Creating new namespace failed: Operation not permitted`, try
 
 Custom images must install `bubblewrap` for sandboxing to work.
 
-## Agent Image Presets
+## Agent Image Preset
 
-Mercury publishes two image presets to GitHub Container Registry:
+Mercury publishes an image preset to GitHub Container Registry:
 
 | Preset | Size | Contents |
 |--------|------|----------|
 | `ghcr.io/avishai-tsabari/mercury-agent:latest` | ~2.8GB | Full devcontainer: Bun, Node.js, Python, Go, git, build tools |
-| `ghcr.io/avishai-tsabari/mercury-agent:minimal` | ~1.9GB | Lightweight runtime: Bun + pi + Chromium deps |
 
-Images are published on each release. Version-specific tags are also available (e.g., `:0.2.0`, `:0.2.0-minimal`).
+Images are published on each release. Version-specific tags are also available (e.g., `:0.2.0`).
 
 ### Building Locally
 
-To build images locally instead of pulling from the registry:
+To build the image locally instead of pulling from the registry:
 ```bash
-./container/build.sh all      # Both presets
-./container/build.sh latest   # Full image only (default)
-./container/build.sh minimal  # Lightweight image only
+./container/build.sh          # Full image (default)
 ```
 
-Then use `mercury-agent:latest` or `mercury-agent:minimal` (without the ghcr.io prefix).
+Then use `mercury-agent:latest` (without the ghcr.io prefix).
 
 ## Custom Agent Images
 

package/docs/memory.md

@@ -107,12 +107,6 @@ _2026-02-25:_ Changed venue to [[Cafe Nimrod]].
 - **Body** — Accumulated context (append semantics, timestamped)
 - **Wikilinks** — Connections to other entities
 
-## Conditional Context
-
-Mercury can skip loading the full session for standalone prompts (e.g. "what's 2+2?"), reducing token usage. After the run, the prompt and reply are merged back into the session so history stays complete.
-
-See [conditional-context.md](conditional-context.md) for details and configuration.
-
 ## Persistence
 
 Memory persists because the agent writes to disk during conversation. When a session compacts or restarts, the vault files remain — the agent reads them fresh on next interaction.

package/docs/prd-config-load.md

@@ -71,7 +71,7 @@ For each mapped setting, `mergeRawMercuryConfig` applies:
 | YAML parse, Zod file schema, flatten, merge | `src/config-file.ts` |
 | Shared model-leg validation | `src/config-model-chain.ts` |
 | `loadConfig`, Zod app schema | `src/config.ts` |
-| Tests | `tests/config.test.ts` (+ guards in `router.test.ts`, `session-context-estimate.test.ts`) |
+| Tests | `tests/config.test.ts` (+ guards in `router.test.ts`) |
 | Template | `resources/templates/mercury.example.yaml` |
 | Operator guide | `docs/configuration.md` |
 

package/examples/extensions/napkin/index.ts

@@ -8,8 +8,9 @@ import {
   unlinkSync,
   writeFileSync,
 } from "node:fs";
+import { createRequire } from "node:module";
 import { homedir, tmpdir } from "node:os";
-import { delimiter, join } from "node:path";
+import { delimiter, dirname, join } from "node:path";
 
 const KNOWLEDGE_DIR = "knowledge";
 const VAULT_DIRS = ["people", "projects", "references", "daily", "episodes", "weekly", "monthly", "templates"];
@@ -135,25 +136,31 @@ function exportMessages(
 }
 
 /**
- * Build a child env whose PATH also contains the standard global-bin
- * directories where the `pi` CLI is installed. The distill job runs in the
- * Mercury HOST process, which — unlike the cloud Docker image, where `pi` is
- * always on PATH — may have been launched with an incomplete PATH (e.g.
- * `bun <abs>/mercury.ts run` from an IDE or a scheduled task resolves
- * `.bun/bin` but not the npm global bin). A bare `spawn("pi")` then fails with
- * ENOENT before pi ever starts. Appending the well-known global-bin dirs makes
- * resolution robust on local installs and is a no-op in the cloud.
+ * Build a child env whose PATH also contains directories where the `pi` CLI
+ * may live. A global npm install only links the top-level package's bins
+ * (mercury, mercury-ctl) — dependency bins like `pi` stay in node_modules/.bin.
+ * We resolve that .bin dir from the package graph first, then fall back to
+ * well-known global-bin dirs (~/.bun/bin, /usr/local/bin).
  */
 function envWithPiOnPath(): NodeJS.ProcessEnv {
   const isWindows = process.platform === "win32";
   const base = process.env.PATH ?? process.env.Path ?? "";
   const home = homedir();
+
+  let piNodeModulesBin: string | undefined;
+  try {
+    const req = createRequire(import.meta.url);
+    const pkgJson = req.resolve("@earendil-works/pi-coding-agent/package.json");
+    piNodeModulesBin = join(dirname(dirname(dirname(pkgJson))), ".bin");
+  } catch {}
+
   const candidates = [
+    piNodeModulesBin,
     join(home, ".bun", "bin"),
     isWindows
       ? join(process.env.APPDATA ?? join(home, "AppData", "Roaming"), "npm")
       : "/usr/local/bin",
-  ];
+  ].filter(Boolean) as string[];
   // PATH entries are case-insensitive on Windows, case-sensitive on POSIX.
   const normalize = (p: string) => (isWindows ? p.toLowerCase() : p);
   const existing = new Set(base.split(delimiter).map(normalize).filter(Boolean));

package/examples/extensions/napkin/prompts/kb-distillation.md

@@ -45,20 +45,20 @@ Every entity file follows this shape. The **current** value of a fact lives in B
 
 ```markdown
 ---
-name: Ronny Cohen
+name: Alex Carter
 type: person
 updated: 2026-05-10
-summary: Biotech investor in the tagula group; bullish on SLS.
+summary: Biotech investor in the research group; bullish on ACME.
 # Structured "current value" fields for facts that are known to change:
-sls_price_target: "$15"
+acme_price_target: "$15"
 ---
 
-# Ronny Cohen
+# Alex Carter
 
-Member of the [[tagula-space]] investing group.
+Member of the [[research-space]] investing group.
 
 ## Current View
-- SLS price target: **$15** (as of 2026-05-10)
+- ACME price target: **$15** (as of 2026-05-10)
 - Thesis: bullish, waiting for the Phase 3 readout
 
 ## History