@pify/pretty 0.4.0 → 0.5.1

package/README.md

@@ -75,6 +75,28 @@ Expanded bodies are capped by `expandedLines`, because a 5,000-line diff or grep
 
 `summaryClip` is a ceiling, not a target: the effective clip is also bounded by the width of your terminal, re-read on every render. A one-line summary wider than the terminal wraps onto two, and a collapsed row that takes two lines is not collapsed. Resizing mid-session is handled for the same reason.
 
+## Themes
+
+The renderers read the active pi theme and never their own colours, which is what keeps them consistent with the rest of your terminal — but it also means the word-level diff is only as legible as the theme's diff colours, and pi's builtin themes don't really have any. Measured: in both builtin themes `toolDiffAdded` **is** `success` and `toolDiffRemoved` **is** `error`, with context left as a flat grey. The emphasis works, but it is drawing on a palette that was never designed for it.
+
+So this package ships two themes with a diff palette of their own, derived from the [Token](https://github.com/ThorstenRhau/token) colourscheme's Ultra appearance:
+
+```
+pi --theme token-ultra-dark
+pi --theme token-ultra-light
+```
+
+Added and removed take Token's git-sign colours — the most separated pair in its palette — while context takes a muted foreground that is distinct from `dim`. Changed words and carried-over words are then genuinely different colours rather than two greys:
+
+| | added | removed | context |
+|---|---|---|---|
+| `token-ultra-dark` | `#7da47a` | `#c67777` | `#8d8983` |
+| `token-ultra-light` | `#24831f` | `#c82a2a` | `#544e44` |
+
+The rest follows Token's own semantics — copper for definitions, ochre for control flow, teal for literals — so syntax-highlighted reads match the scheme you may already be running in Neovim, Ghostty, delta and the rest.
+
+Themes only apply in the TUI: `--theme` is ignored under `-p`, for pi's builtin themes as much as for these. `test/live/theme-wire.mjs` therefore drives pi's own theme loader instead of a session, and checks that every colour resolves, that the `vars` indirection really happened, and that the three diff colours are three different colours.
+
 ## How it works
 
 Each tool is re-registered through pi's own `createReadTool()` / `createBashTool()` / … factories with `execute` delegated untouched, overriding only `renderCall` and `renderResult`. Highlighting uses pi's exported `highlightCode` and `getLanguageFromPath`, so colours always match your theme and there are no extra dependencies.

package/extensions/pretty.ts

@@ -14,13 +14,13 @@
  * (giladbarnea/pi-pretty-bash), per-surface opt-in (pi-zentui).
  */
 import {
-  createBashTool,
-  createEditTool,
-  createFindTool,
-  createGrepTool,
-  createLsTool,
-  createReadTool,
-  createWriteTool,
+  createBashToolDefinition,
+  createEditToolDefinition,
+  createFindToolDefinition,
+  createGrepToolDefinition,
+  createLsToolDefinition,
+  createReadToolDefinition,
+  createWriteToolDefinition,
   getAgentDir,
   getLanguageFromPath,
   highlightCode,
@@ -120,14 +120,23 @@ export default function pretty(pi: ExtensionAPI) {
   }
 
   function buildOriginals(cwd: string): Record<PrettyTool, AnyTool> {
+    // The *ToolDefinition* factories, not the createReadTool wrappers: the
+    // wrapper (wrapToolDefinition) copies only name/label/description/
+    // parameters/execute and DROPS promptSnippet, promptGuidelines and the
+    // built-in renderers. Re-registering the wrapped form removed six of the
+    // seven builtins from the system prompt's "Available tools" list —
+    // measured: with pretty loaded the list shrank to bash alone, and the
+    // Guidelines steered the model to bash for file operations because read,
+    // edit and write were no longer named. A renderer package must never
+    // change what the model is told it can do.
     return {
-      read: createReadTool(cwd) as unknown as AnyTool,
-      bash: createBashTool(cwd) as unknown as AnyTool,
-      edit: createEditTool(cwd) as unknown as AnyTool,
-      write: createWriteTool(cwd) as unknown as AnyTool,
-      grep: createGrepTool(cwd) as unknown as AnyTool,
-      find: createFindTool(cwd) as unknown as AnyTool,
-      ls: createLsTool(cwd) as unknown as AnyTool,
+      read: createReadToolDefinition(cwd) as unknown as AnyTool,
+      bash: createBashToolDefinition(cwd) as unknown as AnyTool,
+      edit: createEditToolDefinition(cwd) as unknown as AnyTool,
+      write: createWriteToolDefinition(cwd) as unknown as AnyTool,
+      grep: createGrepToolDefinition(cwd) as unknown as AnyTool,
+      find: createFindToolDefinition(cwd) as unknown as AnyTool,
+      ls: createLsToolDefinition(cwd) as unknown as AnyTool,
     };
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pify/pretty",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "Compact, theme-aware rendering for pi's built-in tools: one-line summaries, syntax-highlighted reads, colorized diffs — behavior untouched",
   "keywords": [
     "pi-package",
@@ -27,12 +27,16 @@
   "files": [
     "extensions",
     "src",
+    "themes",
     "README.md",
     "LICENSE"
   ],
   "pi": {
     "extensions": [
       "./extensions/pretty.ts"
+    ],
+    "themes": [
+      "./themes"
     ]
   },
   "scripts": {

package/themes/token-ultra-dark.json

@@ -0,0 +1,89 @@
+{
+  "$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+  "name": "token-ultra-dark",
+  "vars": {
+    "accent": "#ed9574",
+    "accent2": "#f7c988",
+    "bg2": "#212120",
+    "bg3": "#272724",
+    "bg5": "#383835",
+    "blue": "#8aa5bb",
+    "bright_blue": "#90b2cc",
+    "cyan": "#7ebcbb",
+    "diff_add": "#1e3524",
+    "diff_del": "#3c2024",
+    "fg0": "#c5c1b8",
+    "fg1": "#a7a299",
+    "fg2": "#a39d94",
+    "fg3": "#8d8983",
+    "green": "#9ab58e",
+    "gsign_add": "#7da47a",
+    "gsign_del": "#c67777",
+    "indent": "#333330",
+    "line_nr": "#585855",
+    "match": "#4d4231",
+    "olive": "#aab86d",
+    "purple": "#b296cb",
+    "red": "#dd8384",
+    "sel": "#3c3b36",
+    "yellow": "#bf9c53"
+  },
+  "colors": {
+    "accent": "accent",
+    "border": "blue",
+    "borderAccent": "accent",
+    "borderMuted": "line_nr",
+    "success": "green",
+    "error": "red",
+    "warning": "yellow",
+    "muted": "fg3",
+    "dim": "line_nr",
+    "text": "fg0",
+    "thinkingText": "fg2",
+    "selectedBg": "sel",
+    "scrollbarTrack": "indent",
+    "scrollbarThumb": "fg3",
+    "searchMatchBg": "match",
+    "searchMatchText": "fg0",
+    "userMessageBg": "bg3",
+    "userMessageText": "fg0",
+    "customMessageBg": "bg2",
+    "customMessageText": "fg1",
+    "customMessageLabel": "accent2",
+    "toolPendingBg": "bg2",
+    "toolSuccessBg": "diff_add",
+    "toolErrorBg": "diff_del",
+    "toolTitle": "accent2",
+    "toolOutput": "fg1",
+    "mdHeading": "accent",
+    "mdLink": "blue",
+    "mdLinkUrl": "bright_blue",
+    "mdCode": "olive",
+    "mdCodeBlock": "fg1",
+    "mdCodeBlockBorder": "bg5",
+    "mdQuote": "fg2",
+    "mdQuoteBorder": "bg5",
+    "mdHr": "bg5",
+    "mdListBullet": "accent2",
+    "toolDiffAdded": "gsign_add",
+    "toolDiffRemoved": "gsign_del",
+    "toolDiffContext": "fg3",
+    "syntaxComment": "fg3",
+    "syntaxKeyword": "accent2",
+    "syntaxFunction": "accent",
+    "syntaxVariable": "fg0",
+    "syntaxString": "cyan",
+    "syntaxNumber": "purple",
+    "syntaxType": "blue",
+    "syntaxOperator": "fg1",
+    "syntaxPunctuation": "fg3",
+    "thinkingOff": "line_nr",
+    "thinkingMinimal": "fg3",
+    "thinkingLow": "blue",
+    "thinkingMedium": "cyan",
+    "thinkingHigh": "accent2",
+    "thinkingXhigh": "accent",
+    "thinkingMax": "red",
+    "bashMode": "olive"
+  }
+}

package/themes/token-ultra-light.json

@@ -0,0 +1,89 @@
+{
+  "$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+  "name": "token-ultra-light",
+  "vars": {
+    "accent": "#893517",
+    "accent2": "#6c4800",
+    "bg2": "#f6f5f1",
+    "bg3": "#fbf9f4",
+    "bg5": "#eae9e5",
+    "blue": "#37526a",
+    "bright_blue": "#335571",
+    "cyan": "#185b5b",
+    "diff_add": "#daf6d5",
+    "diff_del": "#ffdada",
+    "fg0": "#31312b",
+    "fg1": "#565141",
+    "fg2": "#514b44",
+    "fg3": "#544e44",
+    "green": "#385a35",
+    "gsign_add": "#24831f",
+    "gsign_del": "#c82a2a",
+    "indent": "#e0ddd8",
+    "line_nr": "#b5b2ab",
+    "match": "#eadab6",
+    "olive": "#46550a",
+    "purple": "#573c72",
+    "red": "#ae5158",
+    "sel": "#dedbd3",
+    "yellow": "#926e25"
+  },
+  "colors": {
+    "accent": "accent",
+    "border": "blue",
+    "borderAccent": "accent",
+    "borderMuted": "line_nr",
+    "success": "green",
+    "error": "red",
+    "warning": "yellow",
+    "muted": "fg3",
+    "dim": "line_nr",
+    "text": "fg0",
+    "thinkingText": "fg2",
+    "selectedBg": "sel",
+    "scrollbarTrack": "indent",
+    "scrollbarThumb": "fg3",
+    "searchMatchBg": "match",
+    "searchMatchText": "fg0",
+    "userMessageBg": "bg3",
+    "userMessageText": "fg0",
+    "customMessageBg": "bg2",
+    "customMessageText": "fg1",
+    "customMessageLabel": "accent2",
+    "toolPendingBg": "bg2",
+    "toolSuccessBg": "diff_add",
+    "toolErrorBg": "diff_del",
+    "toolTitle": "accent2",
+    "toolOutput": "fg1",
+    "mdHeading": "accent",
+    "mdLink": "blue",
+    "mdLinkUrl": "bright_blue",
+    "mdCode": "olive",
+    "mdCodeBlock": "fg1",
+    "mdCodeBlockBorder": "bg5",
+    "mdQuote": "fg2",
+    "mdQuoteBorder": "bg5",
+    "mdHr": "bg5",
+    "mdListBullet": "accent2",
+    "toolDiffAdded": "gsign_add",
+    "toolDiffRemoved": "gsign_del",
+    "toolDiffContext": "fg3",
+    "syntaxComment": "fg3",
+    "syntaxKeyword": "accent2",
+    "syntaxFunction": "accent",
+    "syntaxVariable": "fg0",
+    "syntaxString": "cyan",
+    "syntaxNumber": "purple",
+    "syntaxType": "blue",
+    "syntaxOperator": "fg1",
+    "syntaxPunctuation": "fg3",
+    "thinkingOff": "line_nr",
+    "thinkingMinimal": "fg3",
+    "thinkingLow": "blue",
+    "thinkingMedium": "cyan",
+    "thinkingHigh": "accent2",
+    "thinkingXhigh": "accent",
+    "thinkingMax": "red",
+    "bashMode": "olive"
+  }
+}