pi-lean-ctx 3.6.0 → 3.6.1

package/README.md

@@ -2,14 +2,25 @@
 
 [Pi Coding Agent](https://github.com/badlogic/pi-mono) extension that provides `ctx_`-prefixed tools backed by [lean-ctx](https://leanctx.com) for **60–90% token savings**.
 
-- **Default**: CLI-only (no MCP required)
+- **Default**: CLI-only, additive mode (no MCP required, Pi builtins preserved)
 - **Optional**: enable MCP tools (`LEAN_CTX_PI_ENABLE_MCP=1`) or run `lean-ctx init --agent pi --mode mcp`
+- **Optional**: replace mode (`LEAN_CTX_PI_MODE=replace`) disables Pi builtins
+
+## Tool Mode
+
+By default, pi-lean-ctx runs in **additive mode**: Pi's built-in tools (`read`, `bash`, `ls`, `find`, `grep`) remain available alongside the `ctx_*` tools. Agents can use either set.
+
+To switch to **replace mode** (disables Pi builtins, only `ctx_*` tools available):
+
+```bash
+export LEAN_CTX_PI_MODE=replace
+```
 
 ## What it does
 
 ### ctx_ Tools (CLI-backed)
 
-Replaces Pi's built-in `read`, `bash`, `ls`, `find`, `grep` with `ctx_`-prefixed versions:
+Adds `ctx_`-prefixed tools alongside Pi's builtins (or replaces them in `replace` mode):
 
 | Tool | Replaces | Compression |
 |------|----------|-------------|

package/extensions/index.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import {
   createBashToolDefinition,
   createReadToolDefinition,
@@ -6,8 +6,8 @@ import {
   getLanguageFromPath,
   highlightCode,
   truncateHead,
-} from "@mariozechner/pi-coding-agent";
-import { Text } from "@mariozechner/pi-tui";
+} from "@earendil-works/pi-coding-agent";
+import { Text } from "@earendil-works/pi-tui";
 import { Type } from "@sinclair/typebox";
 import { existsSync, readFileSync } from "node:fs";
 import { readFile, stat } from "node:fs/promises";
@@ -35,8 +35,12 @@ const IMAGE_EXTENSIONS = new Set([".png", ".jpg", ".jpeg", ".gif", ".webp"]);
 const CODE_FULL_READ_MAX_BYTES = 8 * 1024;
 const CODE_SIGNATURES_MIN_BYTES = 96 * 1024;
 
-// Pi builtins we replace with ctx_ prefixed versions
+// Pi builtins that can be replaced with ctx_ prefixed versions.
+// LEAN_CTX_PI_MODE controls behavior:
+//   "additive" (default) — keep Pi builtins, add ctx_* alongside
+//   "replace"            — disable Pi builtins, only expose ctx_*
 const DISABLED_BUILTIN_TOOLS = new Set(["read", "bash", "ls", "find", "grep"]);
+const PI_MODE = (process.env.LEAN_CTX_PI_MODE || "additive").toLowerCase();
 // Max bytes constant for truncation warnings (same as Pi's DEFAULT_MAX_BYTES)
 const DEFAULT_MAX_BYTES = 8192;
 
@@ -278,7 +282,7 @@ function isMcpAdapterConfigured(): boolean {
 
 async function execLeanCtx(pi: ExtensionAPI, args: string[]) {
   const bin = resolveBinary();
-  const result = await pi.exec(bin, args, { env: { ...process.env, LEAN_CTX_COMPRESS: "1" } });
+  const result = await pi.exec(bin, args, { env: { ...process.env, LEAN_CTX_COMPRESS: "1", LEAN_CTX_SAVINGS_FOOTER: "always" } });
   if (result.code !== 0) {
     const msg = (result.stderr || result.stdout || `lean-ctx failed: ${args.join(" ")}`).trim();
     throw new Error(msg);
@@ -288,19 +292,22 @@ async function execLeanCtx(pi: ExtensionAPI, args: string[]) {
 
 export default async function (pi: ExtensionAPI) {
   // Defer setActiveTools to session_start — runtime actions aren't available during extension load
-  // Must run on every session_start since active tools are per-session
-  pi.on("session_start", () => {
-    const activeTools = pi.getActiveTools().filter((name) => !DISABLED_BUILTIN_TOOLS.has(name));
-    pi.setActiveTools(activeTools);
-  });
+  // In "replace" mode, disable Pi builtins and only expose ctx_* tools.
+  // In "additive" mode (default), keep Pi builtins alongside ctx_* tools.
+  if (PI_MODE === "replace") {
+    pi.on("session_start", () => {
+      const activeTools = pi.getActiveTools().filter((name) => !DISABLED_BUILTIN_TOOLS.has(name));
+      pi.setActiveTools(activeTools);
+    });
+  }
 
   const baseBashTool = createBashToolDefinition(process.cwd(), {
     spawnHook: ({ command, cwd, env }) => {
       const bin = resolveBinary();
       return {
-        command: `${shellQuote(bin)} -c sh -lc ${shellQuote(command)}`,
+        command: `${shellQuote(bin)} -c ${shellQuote(command)}`,
         cwd,
-        env: { ...env, LEAN_CTX_COMPRESS: "1" },
+        env: { ...env, LEAN_CTX_COMPRESS: "1", LEAN_CTX_SAVINGS_FOOTER: "always" },
       };
     },
   });
@@ -328,6 +335,16 @@ export default async function (pi: ExtensionAPI) {
       "Use ctx_shell only for commands with side effects: build, test, install, git, run scripts.",
     ],
     parameters: bashSchemaWithRaw,
+    renderCall(args, theme, context) {
+      return baseBashTool.renderCall
+        ? baseBashTool.renderCall(args, theme, context)
+        : (context.lastComponent ?? new Text("", 0, 0));
+    },
+    renderResult(result, options, theme, context) {
+      return baseBashTool.renderResult
+        ? baseBashTool.renderResult(result, options, theme, context)
+        : (context.lastComponent ?? new Text("", 0, 0));
+    },
     async execute(toolCallId, params, signal, onUpdate, ctx) {
       const isRaw = !!params.raw;
       const toolParams = { command: params.command, timeout: params.timeout };
@@ -525,7 +542,7 @@ export default async function (pi: ExtensionAPI) {
       searchArgs.push(params.pattern, absolutePath);
 
       const bin = resolveBinary();
-      const result = await pi.exec(bin, ["-c", ...searchArgs], { env: { ...process.env, LEAN_CTX_COMPRESS: "1" } });
+      const result = await pi.exec(bin, ["-c", ...searchArgs], { env: { ...process.env, LEAN_CTX_COMPRESS: "1", LEAN_CTX_SAVINGS_FOOTER: "always" } });
       if (result.code >= 2) {
         const msg = (result.stderr || result.stdout || `lean-ctx grep failed: ${params.pattern}`).trim();
         throw new Error(msg);

package/extensions/mcp-bridge.ts

@@ -1,6 +1,6 @@
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "@sinclair/typebox";
 import type { McpBridgeRetryState, McpBridgeStatus } from "./types.js";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-lean-ctx",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "Pi Coding Agent extension (CLI-first) — routes bash/read/grep/find/ls through lean-ctx CLI for strong token savings. Optional MCP bridge can register advanced tools.",
   "keywords": [
     "pi-package",
@@ -25,8 +25,8 @@
     "@modelcontextprotocol/sdk": "^1.29.0"
   },
   "peerDependencies": {
-    "@mariozechner/pi-coding-agent": ">=0.50.0",
-    "@mariozechner/pi-tui": "*"
+    "@earendil-works/pi-coding-agent": ">=0.50.0",
+    "@earendil-works/pi-tui": "*"
   },
   "pi": {
     "extensions": [