Prune upstreamed Pi 0.67.6 patches

sshkeda · sshkeda · commit 5d433bae9534 · 2026-04-16T18:23:11.000-04:00
diff --git a/README.md b/README.md
@@ -2,9 +2,10 @@
 
 Small install-time patches for [pi](https://github.com/badlogic/pi-mono).
 
-Today this repo patches two things directly:
-- **OSC 8 terminal hyperlinks** so wrapped links stay clickable
+Today this repo patches three things directly:
+- **extra OSC 8 hyperlink coverage** for gaps not yet upstreamed (update banner, inline code spans, and URL-only code-block lines)
 - **extension-runtime tool lookup hooks** (`getToolDefinition`, `getAllRegisteredTools`) for native custom-tool integration
+- **conflict-pruned patch manifests** that stay compatible with upstream `0.67.6+`, where base markdown OSC 8 links and wrap tracking are now built in
 
 It also acts as a patch orchestrator for sibling repos. Right now it loads the OpenRouter multimodal transport patch from:
 - **`../pi-read/patches/pi-patches.json`** — adds native `input_audio`, `video_url`, and `file` routing on Pi's OpenAI-compatible OpenRouter path
@@ -35,14 +36,14 @@ then `pi-update` runs the same one-shot flow from any directory.
 
 | Patch | File | What |
 |-------|------|------|
-| 001 | `markdown.js` | Wrap markdown links in OSC 8 |
-| 002–005 | `utils.js` | Track OSC 8 state in `AnsiCodeTracker` so hyperlinks survive line wraps |
 | 006 | `interactive-mode.js` | Make the update banner changelog URL clickable |
 | 007 | `markdown.js` | Wrap URLs in inline code spans (`` `https://...` ``) |
 | 008–009 | `markdown.js` | Wrap URL-only lines in code blocks (highlighted + plain) |
 | 010–015 | `loader.js`, `runner.js`, `types.d.ts` | Expose extension tool lookup/runtime helpers so extensions can resolve registered tools natively by name |
 | 016–018 | `openai-completions.js` via `../pi-read/patches/pi-patches.json` | Route OpenRouter audio/video/PDF through native `input_audio` / `video_url` / `file` chat-completions content blocks |
 
+> Upstream `0.67.6` absorbed former patches **001–005** by adding native markdown OSC 8 link rendering and hyperlink wrap tracking in `@mariozechner/pi-tui`.
+
 ## How it works
 
 `update.sh` is the entrypoint for the shell alias. It:
@@ -51,5 +52,5 @@ then `pi-update` runs the same one-shot flow from any directory.
 2. runs `apply.sh` to re-apply the local patches from `patches.json`
 3. runs `test.sh` to verify the patched install still behaves correctly
 
-`patches.json` defines local patches that live in this repo. `sources.json` points at additional patch manifests owned by sibling repos (for example `../pi-read/patches/pi-patches.json`). `apply.sh` loads all of them, locates pi's install directory, applies everything atomically (no files written if any patch fails), and `test.sh` validates both the OSC 8 behavior and the OpenRouter multimodal routing behavior.
+`patches.json` defines local patches that live in this repo. `sources.json` points at additional patch manifests owned by sibling repos (for example `../pi-read/patches/pi-patches.json`). `apply.sh` loads all of them, locates pi's install directory, applies everything atomically (no files written if any patch fails), and `test.sh` validates the upstream OSC 8 baseline, the remaining local hyperlink/runtime patches, and the OpenRouter multimodal routing behavior.
 
diff --git a/patches.json b/patches.json
@@ -1,49 +1,4 @@
 [
-  {
-    "id": "001-osc8-markdown-links",
-    "file": "node_modules/@mariozechner/pi-tui/dist/components/markdown.js",
-    "intent": "Wrap markdown links in OSC 8 hyperlink sequences so they are clickable and copy-pasteable even when they wrap across multiple terminal lines.",
-    "find": "if (token.text === token.href || token.text === hrefForComparison) {\n                        result += this.theme.link(this.theme.underline(linkText)) + stylePrefix;\n                    }\n                    else {\n                        result +=\n                            this.theme.link(this.theme.underline(linkText)) +\n                                this.theme.linkUrl(` (${token.href})`) +\n                                stylePrefix;\n                    }",
-    "replace": "if (token.text === token.href || token.text === hrefForComparison) {\n                        result += `\\x1b]8;;${token.href}\\x07` + this.theme.link(this.theme.underline(linkText)) + `\\x1b]8;;\\x07` + stylePrefix;\n                    }\n                    else {\n                        result +=\n                            `\\x1b]8;;${token.href}\\x07` + this.theme.link(this.theme.underline(linkText)) + this.theme.linkUrl(` (${token.href})`) + `\\x1b]8;;\\x07` +\n                                stylePrefix;\n                    }",
-    "verify": "\\x1b]8;;${token.href}\\x07",
-    "occurrences": 1
-  },
-  {
-    "id": "002-osc8-tracker-state",
-    "file": "node_modules/@mariozechner/pi-tui/dist/utils.js",
-    "intent": "Add OSC 8 hyperlink URL tracking to AnsiCodeTracker so wrapTextWithAnsi re-opens hyperlinks on continuation lines when a link wraps across multiple terminal lines.",
-    "find": "    fgColor = null; // Stores the full code like \"31\" or \"38;5;240\"\n    bgColor = null; // Stores the full code like \"41\" or \"48;5;240\"\n    process(ansiCode) {\n        if (!ansiCode.endsWith(\"m\")) {\n            return;",
-    "replace": "    fgColor = null; // Stores the full code like \"31\" or \"38;5;240\"\n    bgColor = null; // Stores the full code like \"41\" or \"48;5;240\"\n    oscHyperlink = null; // Stores the current OSC 8 hyperlink URL\n    process(ansiCode) {\n        // Track OSC 8 hyperlink sequences: \\x1b]8;;URL\\x07 or \\x1b]8;;\\x07 (close)\n        const oscMatch = ansiCode.match(/\\x1b\\]8;([^;]*);([\\s\\S]*)(?:\\x07|\\x1b\\\\)/);\n        if (oscMatch) {\n            this.oscHyperlink = oscMatch[2] || null;\n            return;\n        }\n        if (!ansiCode.endsWith(\"m\")) {\n            return;",
-    "verify": "oscHyperlink = null;",
-    "occurrences": 1
-  },
-  {
-    "id": "003-osc8-tracker-reset",
-    "file": "node_modules/@mariozechner/pi-tui/dist/utils.js",
-    "intent": "Clear OSC 8 hyperlink state when AnsiCodeTracker is reset.",
-    "find": "        this.fgColor = null;\n        this.bgColor = null;\n    }\n    /** Clear all state for reuse. */",
-    "replace": "        this.fgColor = null;\n        this.bgColor = null;\n        this.oscHyperlink = null;\n    }\n    /** Clear all state for reuse. */",
-    "verify": "this.oscHyperlink = null;\n    }\n    /** Clear all state for reuse. */",
-    "occurrences": 1
-  },
-  {
-    "id": "004-osc8-tracker-getactivecodes",
-    "file": "node_modules/@mariozechner/pi-tui/dist/utils.js",
-    "intent": "Include OSC 8 hyperlink opener in getActiveCodes() so wrapped lines re-open the clickable link.",
-    "find": "        if (codes.length === 0)\n            return \"\";\n        return `\\x1b[${codes.join(\";\")}m`;\n    }",
-    "replace": "        const sgrPrefix = codes.length === 0 ? \"\" : `\\x1b[${codes.join(\";\")}m`;\n        const oscPrefix = this.oscHyperlink ? `\\x1b]8;;${this.oscHyperlink}\\x07` : \"\";\n        return oscPrefix + sgrPrefix;\n    }",
-    "verify": "const oscPrefix = this.oscHyperlink",
-    "occurrences": 1
-  },
-  {
-    "id": "005-osc8-tracker-hasactivecodes",
-    "file": "node_modules/@mariozechner/pi-tui/dist/utils.js",
-    "intent": "Include OSC 8 hyperlink in hasActiveCodes() check so the tracker knows there is active state to restore.",
-    "find": "            this.fgColor !== null ||\n            this.bgColor !== null);",
-    "replace": "            this.fgColor !== null ||\n            this.bgColor !== null ||\n            this.oscHyperlink !== null);",
-    "verify": "this.oscHyperlink !== null);",
-    "occurrences": 1
-  },
   {
     "id": "007-osc8-codespan-urls",
     "file": "node_modules/@mariozechner/pi-tui/dist/components/markdown.js",
diff --git a/test.sh b/test.sh
