@tt-a1i/openpi 0.3.1 → 0.5.0

package/extensions/file-search/index.ts

@@ -3,10 +3,11 @@
  *
  * On session start the extension resolves a usable binary for each tool:
  * a normally installed system binary is preferred (silently), then an
- * existing fallback in this repo's `bin/` directory (silently), and only
- * when neither exists is an official release downloaded into `bin/` — the
- * single case that shows a UI notification. Tools await that initialization
- * before executing, and report a clear error if it failed.
+ * existing binary in the agent's managed bin directory (`~/.pi/agent/bin`,
+ * silently — e.g. cached by an earlier download), and only when neither
+ * exists is an official release downloaded into that directory — the single
+ * case that shows a UI notification. Tools await that initialization before
+ * executing, and report a clear error if it failed.
  */
 
 import * as NodeServices from "@effect/platform-node/NodeServices";
@@ -33,7 +34,7 @@ import {
 import {
   currentTarget,
   liveBinaryEnv,
-  repositoryBinDir,
+  managedBinDir,
   resolveBinary,
   TOOL_SPECS,
   type BinaryEnv,
@@ -80,7 +81,7 @@ export function installNotifications(binaries: readonly ResolvedBinary[]) {
     .map(
       (binary) =>
         `file-search: no system ${binary.tool} found — downloaded ${binary.tool} ${binary.version ?? ""}`.trimEnd() +
-        ` to ${repositoryBinDir()}`,
+        ` to ${managedBinDir()}`,
     );
 }
 
@@ -136,7 +137,7 @@ export default function fileSearchTools(pi: ExtensionAPI) {
     }
   };
 
-  const binDir = repositoryBinDir();
+  const binDir = managedBinDir();
   const target = currentTarget();
   const initializers = makeBinaryInitializers(binDir, target, liveBinaryEnv);
 

package/extensions/file-search/src/binaries.ts

@@ -3,23 +3,32 @@
  *
  * Resolution order (per tool, first usable wins):
  *   1. A normally installed system binary (`fd`/`fdfind`, `rg`) — used silently.
- *   2. An existing fallback in this repository's `bin/` directory — used silently.
- *   3. A fresh download of an official release into `bin/` — the only case that
- *      should surface a UI notification.
+ *   2. An existing binary in the agent's managed bin directory
+ *      (`~/.pi/agent/bin`), cached by an earlier download — used silently.
+ *   3. A fresh download of an official release into that directory — the only
+ *      case that should surface a UI notification.
  *
  * The decision logic is an Effect over a small injectable environment
  * (`BinaryEnv`) so tests can drive it without touching the filesystem or the
  * network. `liveBinaryEnv` is the real implementation.
  */
 
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import * as NodeHttpClient from "@effect/platform-node/NodeHttpClient";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { execFile } from "node:child_process";
 import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
 import { promisify } from "node:util";
-import { Crypto, Data, Effect, Encoding, FileSystem, Stream } from "effect";
+import {
+  Crypto,
+  Data,
+  Effect,
+  Encoding,
+  FileSystem,
+  Layer,
+  Stream,
+} from "effect";
 import { FetchHttpClient, HttpClient } from "effect/unstable/http";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 
@@ -56,13 +65,13 @@ const RG_SHA256: Readonly<Record<string, string>> = {
 };
 
 export type ToolName = "fd" | "rg";
-export type BinarySource = "system" | "bundled" | "installed";
+export type BinarySource = "system" | "cached" | "installed";
 
 export interface ToolSpec {
   readonly tool: ToolName;
   /** Commands probed on PATH, in order. Debian/Ubuntu install fd as `fdfind`. */
   readonly systemCommands: readonly string[];
-  /** Executable name used inside release archives and the repo bin directory. */
+  /** Executable name used inside release archives and the managed bin directory. */
   readonly binaryName: string;
 }
 
@@ -144,10 +153,9 @@ export function currentTarget(): PlatformTarget {
   return { os: process.platform, arch: process.arch };
 }
 
-/** Repository root (`~/.pi/agent`) resolved from this module's location. */
-export function repositoryBinDir() {
-  const moduleDir = dirname(fileURLToPath(import.meta.url));
-  return join(moduleDir, "..", "..", "..", "bin");
+/** Pi agent's managed binaries directory (`~/.pi/agent/bin`). */
+export function managedBinDir() {
+  return join(getAgentDir(), "bin");
 }
 
 export class UnsupportedPlatformError extends Data.TaggedError(
@@ -161,6 +169,12 @@ export class InstallError extends Data.TaggedError("InstallError")<{
   readonly cause?: unknown;
 }> {}
 
+export class BinaryDownloadError extends Data.TaggedError(
+  "BinaryDownloadError",
+)<{
+  readonly message: string;
+}> {}
+
 export interface BinaryEnv {
   /** True when the executable runs and supports the flags this tool requires. */
   readonly probe: (command: string, tool: ToolName) => Effect.Effect<boolean>;
@@ -179,7 +193,7 @@ export interface ResolvedBinary {
   readonly version?: string;
 }
 
-/** Resolve one tool: system binary, existing bin fallback, or fresh install. */
+/** Resolve one tool: system binary, cached fallback, or fresh install. */
 export function resolveBinary(
   spec: ToolSpec,
   binDir: string,
@@ -193,9 +207,9 @@ export function resolveBinary(
       }
     }
 
-    const bundled = join(binDir, spec.binaryName);
-    if (yield* env.probe(bundled, spec.tool)) {
-      return { tool: spec.tool, command: bundled, source: "bundled" as const };
+    const cached = join(binDir, spec.binaryName);
+    if (yield* env.probe(cached, spec.tool)) {
+      return { tool: spec.tool, command: cached, source: "cached" as const };
     }
 
     const asset = releaseAsset(spec.tool, target);
@@ -205,17 +219,17 @@ export function resolveBinary(
       });
     }
 
-    yield* env.install(asset, bundled);
+    yield* env.install(asset, cached);
 
-    if (!(yield* env.probe(bundled, spec.tool))) {
+    if (!(yield* env.probe(cached, spec.tool))) {
       return yield* new InstallError({
-        message: `${spec.tool} ${asset.version} was installed to ${bundled} but failed to run.`,
+        message: `${spec.tool} ${asset.version} was installed to ${cached} but failed to run.`,
       });
     }
 
     return {
       tool: spec.tool,
-      command: bundled,
+      command: cached,
       source: "installed" as const,
       version: asset.version,
     };
@@ -237,9 +251,9 @@ export function readBoundedResponse<E, R>(
   return Effect.gen(function* () {
     const declaredLength = Number(response.headers["content-length"]);
     if (Number.isFinite(declaredLength) && declaredLength > maxBytes) {
-      return yield* Effect.fail(
-        new Error(`download exceeds the ${maxBytes}-byte size limit`),
-      );
+      return yield* new BinaryDownloadError({
+        message: `download exceeds the ${maxBytes}-byte size limit`,
+      });
     }
 
     const result = yield* Stream.runFoldEffect(
@@ -249,7 +263,9 @@ export function readBoundedResponse<E, R>(
         const totalBytes = accumulator.totalBytes + chunk.byteLength;
         if (totalBytes > maxBytes) {
           return Effect.fail(
-            new Error(`download exceeds the ${maxBytes}-byte size limit`),
+            new BinaryDownloadError({
+              message: `download exceeds the ${maxBytes}-byte size limit`,
+            }),
           );
         }
         return Effect.sync(() => {
@@ -272,9 +288,9 @@ function downloadAsset(client: HttpClient.HttpClient, initialUrl: URL) {
 
     for (let redirects = 0; redirects <= MAX_DOWNLOAD_REDIRECTS; redirects++) {
       if (url.protocol !== "https:") {
-        return yield* Effect.fail(
-          new Error(`refusing non-HTTPS download URL: ${url.href}`),
-        );
+        return yield* new BinaryDownloadError({
+          message: `refusing non-HTTPS download URL: ${url.href}`,
+        });
       }
 
       const result = yield* Effect.scoped(
@@ -283,31 +299,27 @@ function downloadAsset(client: HttpClient.HttpClient, initialUrl: URL) {
           if ([301, 302, 303, 307, 308].includes(response.status)) {
             const location = response.headers.location;
             if (!location) {
-              return yield* Effect.fail(
-                new Error(`redirect from ${url.href} had no location header`),
-              );
+              return yield* new BinaryDownloadError({
+                message: `redirect from ${url.href} had no location header`,
+              });
             }
             if (redirects === MAX_DOWNLOAD_REDIRECTS) {
-              return yield* Effect.fail(
-                new Error(
-                  `download exceeded ${MAX_DOWNLOAD_REDIRECTS} redirects`,
-                ),
-              );
+              return yield* new BinaryDownloadError({
+                message: `download exceeded ${MAX_DOWNLOAD_REDIRECTS} redirects`,
+              });
             }
             if (!URL.canParse(location, url)) {
-              return yield* Effect.fail(
-                new Error(
-                  `download returned an invalid redirect URL: ${location}`,
-                ),
-              );
+              return yield* new BinaryDownloadError({
+                message: `download returned an invalid redirect URL: ${location}`,
+              });
             }
             return { _tag: "Redirect" as const, url: new URL(location, url) };
           }
 
           if (response.status < 200 || response.status >= 300) {
-            return yield* Effect.fail(
-              new Error(`download failed with HTTP ${response.status}`),
-            );
+            return yield* new BinaryDownloadError({
+              message: `download failed with HTTP ${response.status}`,
+            });
           }
           return {
             _tag: "Complete" as const,
@@ -320,7 +332,9 @@ function downloadAsset(client: HttpClient.HttpClient, initialUrl: URL) {
       url = result.url;
     }
 
-    return yield* Effect.fail(new Error("download redirect handling failed"));
+    return yield* new BinaryDownloadError({
+      message: "download redirect handling failed",
+    });
   });
 }
 
@@ -344,9 +358,9 @@ export const liveBinaryEnv: BinaryEnv = {
   install: (asset, destination) => {
     const install = Effect.gen(function* () {
       if (!URL.canParse(asset.url)) {
-        return yield* Effect.fail(
-          new Error(`invalid download URL: ${asset.url}`),
-        );
+        return yield* new BinaryDownloadError({
+          message: `invalid download URL: ${asset.url}`,
+        });
       }
 
       const url = new URL(asset.url);
@@ -360,11 +374,9 @@ export const liveBinaryEnv: BinaryEnv = {
       const digestBytes = yield* crypto.digest("SHA-256", bytes);
       const digest = Encoding.encodeHex(digestBytes);
       if (digest !== asset.sha256) {
-        return yield* Effect.fail(
-          new Error(
-            `SHA-256 mismatch for ${asset.fileName}: expected ${asset.sha256}, received ${digest}`,
-          ),
-        );
+        return yield* new BinaryDownloadError({
+          message: `SHA-256 mismatch for ${asset.fileName}: expected ${asset.sha256}, received ${digest}`,
+        });
       }
 
       const workDir = yield* fs.makeTempDirectoryScoped({
@@ -384,9 +396,9 @@ export const liveBinaryEnv: BinaryEnv = {
         }),
       ).pipe(Effect.timeout(60_000));
       if (tarExitCode !== ChildProcessSpawner.ExitCode(0)) {
-        return yield* Effect.fail(
-          new Error(`tar failed with exit code ${tarExitCode}`),
-        );
+        return yield* new BinaryDownloadError({
+          message: `tar failed with exit code ${tarExitCode}`,
+        });
       }
 
       const extracted = join(workDir, asset.archiveDir, asset.binaryName);
@@ -401,13 +413,17 @@ export const liveBinaryEnv: BinaryEnv = {
       yield* fs.rename(stagedDestination, destination);
     });
 
-    return install.pipe(
-      Effect.scoped,
-      Effect.provide(NodeServices.layer),
-      Effect.provide(NodeHttpClient.layerFetch),
-      Effect.provideService(FetchHttpClient.RequestInit, {
+    const InstallLayer = Layer.mergeAll(
+      NodeServices.layer,
+      NodeHttpClient.layerFetch,
+      Layer.succeed(FetchHttpClient.RequestInit, {
         redirect: "manual",
       }),
+    );
+
+    return install.pipe(
+      Effect.scoped,
+      Effect.provide(InstallLayer),
       Effect.mapError(
         (cause) =>
           new InstallError({

package/extensions/git-info/src/changed-files-view.ts

@@ -7,6 +7,7 @@ import {
   visibleWidth,
 } from "@earendil-works/pi-tui";
 import { Effect } from "effect";
+import { hintLine } from "../../shared/screen-chrome.ts";
 import { sanitizeTerminalText } from "../../shared/terminal-text.ts";
 import { runCommand } from "./process.ts";
 
@@ -174,6 +175,15 @@ export async function showChangedFiles(
         return Math.max(8, Math.floor(tui.terminal.rows * 0.8) - 2);
       }
 
+      /**
+       * Rows the diff pane actually paints: one row of the frame's budget goes
+       * to the hint line below it. Scroll limits must use this and not
+       * bodyHeight(), or the last diff line can never be scrolled into view.
+       */
+      function visibleRows() {
+        return Math.max(4, bodyHeight() - 1);
+      }
+
       function ensureSelectedFileVisible() {
         const visibleFiles = Math.max(1, Math.floor(bodyHeight() / 2));
         if (selectedIndex < sidebarOffset) sidebarOffset = selectedIndex;
@@ -192,7 +202,7 @@ export async function showChangedFiles(
       function moveDiff(amount: number) {
         const maxOffset = Math.max(
           0,
-          files[selectedIndex]!.diff.length - bodyHeight(),
+          files[selectedIndex]!.diff.length - visibleRows(),
         );
         diffOffset = Math.max(0, Math.min(maxOffset, diffOffset + amount));
         tui.requestRender();
@@ -216,13 +226,18 @@ export async function showChangedFiles(
         return theme.fg("text", expanded);
       }
 
+      /**
+       * Frame edge with an optional label set into it. Muted, not accent: the
+       * frame is not the content, and the accent is spent on the focused pane
+       * seam where it actually tells you something.
+       */
       function border(width: number, label: string, top: boolean) {
         const left = top ? "┌" : "└";
         const right = top ? "┐" : "┘";
-        const text = `─ ${label} `;
+        const text = label ? `─ ${label} ` : "─";
         const remaining = Math.max(0, width - visibleWidth(text) - 2);
         return theme.fg(
-          "borderAccent",
+          "borderMuted",
           truncateToWidth(
             `${left}${text}${"─".repeat(remaining)}${right}`,
             width,
@@ -289,11 +304,11 @@ export async function showChangedFiles(
           return;
         }
         if (matchesKey(data, Key.ctrl("d"))) {
-          moveDiff(Math.max(1, Math.floor(bodyHeight() / 2)));
+          moveDiff(Math.max(1, Math.floor(visibleRows() / 2)));
           return;
         }
         if (matchesKey(data, Key.ctrl("u"))) {
-          moveDiff(-Math.max(1, Math.floor(bodyHeight() / 2)));
+          moveDiff(-Math.max(1, Math.floor(visibleRows() / 2)));
           return;
         }
         if (matchesKey(data, Key.home) || data === "g") {
@@ -304,21 +319,23 @@ export async function showChangedFiles(
         if (matchesKey(data, Key.end) || data === "G") {
           diffOffset = Math.max(
             0,
-            files[selectedIndex]!.diff.length - bodyHeight(),
+            files[selectedIndex]!.diff.length - visibleRows(),
           );
           tui.requestRender();
         }
       }
 
       function render(width: number) {
-        const height = bodyHeight();
+        const height = visibleRows();
         const sidebarWidth = Math.min(
           48,
           Math.max(24, Math.floor(width * 0.34)),
         );
         const diffWidth = Math.max(1, width - sidebarWidth - 3);
         const selectedFile = files[selectedIndex]!;
-        const title = `local changes · ${files.length} ${files.length === 1 ? "file" : "files"} · ${focus === "files" ? "FILES" : "DIFF"}`;
+        // No shouted FILES/DIFF badge: the accent-lit pane seam already says
+        // where the keyboard is, without a second thing to read.
+        const title = `local changes · ${files.length} ${files.length === 1 ? "file" : "files"}`;
         const lines = [border(width, title, true)];
 
         for (let row = 0; row < height; row += 1) {
@@ -329,7 +346,7 @@ export async function showChangedFiles(
           if (file) {
             const isSelected = fileIndex === selectedIndex;
             if (row % 2 === 0) {
-              const marker = isSelected ? "› " : "  ";
+              const marker = isSelected ? "❯ " : "  ";
               const isBinary =
                 file.additions === null || file.deletions === null;
               const stats = isBinary
@@ -386,11 +403,27 @@ export async function showChangedFiles(
           );
         }
 
-        const help =
-          focus === "files"
-            ? "j/k or ↑/↓ select · enter/space/l open diff · esc close"
-            : "j/k or ↑/↓ scroll · ctrl-d/u page · g/G top/bottom · esc/h files";
-        lines.push(border(width, help, false));
+        lines.push(border(width, "", false));
+        // Hints below the frame rather than crammed into its bottom edge, with
+        // keys a step brighter than the words describing them.
+        lines.push(
+          hintLine(
+            theme,
+            focus === "files"
+              ? [
+                  ["j/k or ↑/↓", "select"],
+                  ["enter/space/l", "open diff"],
+                  ["esc", "close"],
+                ]
+              : [
+                  ["j/k or ↑/↓", "scroll"],
+                  ["ctrl-d/u", "page"],
+                  ["g/G", "top/bottom"],
+                  ["esc/h", "files"],
+                ],
+            width,
+          ),
+        );
         return lines;
       }