osdy-pi 1.4.1 → 1.5.0

package/LICENSE

@@ -1,6 +1,11 @@
 MIT License
 
 Copyright (c) 2026 Osdy
+Copyright (c) 2026 juicesharp
+
+TODO portions are adapted from @juicesharp/rpiv-todo@2.11.0
+(https://github.com/juicesharp/rpiv-mono/tree/main/packages/rpiv-todo),
+licensed under the MIT terms below.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -8,10 +8,11 @@ Osdy Pi gives [Pi](https://github.com/earendil-works/pi) a themed, responsive te
 
 | Area | What ships |
 | --- | --- |
-| Message cards | Pi-native, theme-aware user and assistant cards; assistant accents follow the theme and user accents are white. |
+| Message cards | Pi-native colored user cards without emojis and plain assistant Markdown preceded by a separate `🦝` transcript row. |
 | Header and mascot | A theme-aware `neon` header and selectable `bts` mascot, both responsive and persisted independently. |
 | Accounts | `/osdy-account` switches Codex profiles in place with atomic activation, rollback, bounded auth files, and process-safe locks. |
 | Quota | `/usage` and compact bars emphasize remaining Codex quota at warning (40% or less) and error (15% or less) thresholds. |
+| TODO (starting in 1.5.0) | First-party `todo` snapshots track the Pi session branch; `/todos` reads them without editing. ODD Markdown remains separate. |
 
 ## Prerequisites
 
@@ -33,14 +34,7 @@ Osdy Pi gives [Pi](https://github.com/earendil-works/pi) a themed, responsive te
    pi install git:github.com/OsdyOrtiz/Osdy-Pi
    ```
 
-   Already installed a pinned `npm:osdy-pi@1.3.0` or `npm:osdy-pi@1.4.0` in **normal Pi**? Once 1.4.1 is published, replace the older pin (no uninstall or `--local` needed):
-
-   ```bash
-   pi install npm:osdy-pi@1.4.1
-   pi list
-   ```
-
-   Check that `pi list` shows `npm:osdy-pi@1.4.1`, then restart Pi or run `/reload`. `pi update` does not move a pinned npm version. Installing Osdy does not automatically install Joker; use the [explicit agents setup](#explicit-joker-agents-setup-in-normal-pi) after updating if you want Joker in normal Pi.
+   Already using a pinned npm version? `pi update` does not move a pinned version. First-party TODO is included starting in 1.5.0; until that version is published, npm `latest` may still resolve to an earlier release. Check the resolved version or use a checkout to evaluate 1.5.0 before publication. Installing Osdy does not automatically install Joker; see [explicit agents setup](#explicit-joker-agents-setup-in-normal-pi).
 
 2. Start Pi:
 
@@ -82,7 +76,6 @@ Add these maintained extensions after installing Osdy Pi. They are optional; eac
 | `pi-playwright` | Playwright browser-automation skills. |
 | `pi-mcp-adapter` | MCP server and tool adapter for Pi. |
 | `pi-subagents-j0k3r` | Markdown-defined subagents, delegation tools, history, and model profiles. |
-| `@juicesharp/rpiv-todo` | A persistent live todo overlay for the agent. |
 | `gentle-pi` | The Gentle senior-architect harness, with SDD/OpenSpec, subagents, TDD evidence, and skills. |
 
 Install the ordinary npm packages once:
@@ -98,7 +91,6 @@ pi install npm:@open-pets/pi
 pi install npm:pi-playwright
 pi install npm:pi-mcp-adapter
 pi install npm:pi-subagents-j0k3r
-pi install npm:@juicesharp/rpiv-todo
 ```
 
 `gentle-pi` is deliberately not included in that package-install block: clone and register it through the coexistence setup below, which applies Osdy-specific exclusions instead of adding a duplicate ordinary package entry.
@@ -128,11 +120,48 @@ To load a local `gentle-pi` checkout while keeping Osdy Pi's UI authoritative, r
 osdy-pi gentle setup /absolute/path/to/gentle-pi
 ```
 
-The command validates that the absolute source is a readable `gentle-pi` package with Gentle's todo and agents extensions before atomically updating `$PI_CODING_AGENT_DIR/settings.json` (or `~/.pi/agent/settings.json`). It registers the local package immediately before the first configured Osdy Pi package entry, so Gentle Shell initializes first, with exclusions only for Gentle's `gentle-todo.ts` and `gentle-agents.ts`, plus `themes: []`. Restart Pi or run `/reload` after setup.
+The command validates that the absolute source is a readable `gentle-pi` package with Gentle's todo and agents extensions before atomically updating `$PI_CODING_AGENT_DIR/settings.json` (or `~/.pi/agent/settings.json`). It registers the local package immediately before the first configured Osdy Pi package entry, so Gentle Shell initializes first, with exclusions for Gentle's `gentle-todo.ts`, `ask-user-question.ts`, and `gentle-agents.ts`, plus `themes: []`. Restart Pi or run `/reload` after setup.
 
 Gentle Shell intentionally remains fully active underneath Osdy, including its footer and widgets. While Osdy is enabled, Osdy claims the footer and editor; disabling Osdy restores the editor Gentle Shell provided at session startup. Gentle's changes widget may coexist with Osdy's visual widgets.
 
-The exclusions prevent Gentle's todo and agents extensions from competing with the suite. `@juicesharp/rpiv-todo` remains the authoritative todo overlay, `pi-subagents-j0k3r` remains the authoritative subagent system, and `@juicesharp/rpiv-ask-user-question` remains the authoritative structured-question plugin; their package entries are left untouched.
+The exclusions prevent Gentle's todo, questionnaire, and agents extensions from competing with the suite. Osdy's session-branch snapshots are authoritative for its `todo` tool and read-only `/todos` command; `pi-subagents-j0k3r` remains the subagent system and `@juicesharp/rpiv-ask-user-question` remains the structured-question plugin. This setup does **not** remove an independently installed `@juicesharp/rpiv-todo` package or edit its package entry. Remove that package yourself as described below to avoid duplicate `todo` and `/todos` registrations.
+
+## First-party TODO included starting in 1.5.0
+
+The model-facing `todo` tool supports `create`, `update`, `list`, `get`, `delete`, and `clear`. Tool results carry full task snapshots; Pi's current session branch is the TODO authority. Session switches and compaction replay the latest valid branch snapshot, rather than sharing one project-wide list. `/todos` opens a read-only, grouped modal (pending, in progress, completed) in interactive Pi; scroll with arrow or Page Up/Down keys and close with Esc or q. The refreshed modal adds a completed-task progress meter, theme-aware status groups and a scroll-position footer while keeping every task reachable. It is not an interactive Markdown editor. In non-terminal modes with UI support, it retains notification output. ODD's `odd/tasks/*.md` ledger and Engram are separate orchestration records: there is no automatic sync with these Pi TODOs.
+
+In interactive Pi, the persistent widget appears above the editor while visible tasks exist. By default it shows up to five task rows (excluding heading, overflow hint, and spacer), summarizes overflow, and keeps completed rows visible with crossed-out subjects on subsequent turns; expand tool output to view all rows. `ctrl+shift+t` collapses or expands the widget.
+
+### Try session TODO
+
+Use a 1.5.0 checkout (or an installed 1.5.0 package once published), ask the agent to track a task with `todo`, then run `/todos`. The widget shows up to five tasks by default; the modal shows the entire grouped list with arrow/Page Up/Down scrolling. If your `maxWidgetLines` configuration overrides the default, set it to `7` to show five task rows.
+
+**Verification to date (not complete):** Prior feature checks passed 187 extension tests, 60 script tests, typecheck, and lint. A disposable Pi TUI with seeded tasks showed the modal's progress meter, grouped rows, scroll footer, and close behavior. Authenticated RPC turns exercised all six `todo` actions, and an authenticated TUI smoke observed widget and `/todos` updates. An RPC lifecycle check observed an empty new session and the completed task on switching back. Compaction replay remains unverified because Pi returned “Nothing to compact (session too small).” Language switching in the authenticated TODO flow remains unverified (an isolated TUI with both extensions did switch English to Spanish). Visual strikethrough of completed rows in the authenticated TUI remains unverified. Launch under an installed Osdy account profile remains unverified. These checks do not establish full feature parity or validate a published npm artifact.
+
+### TODO configuration and language
+
+Create `$XDG_CONFIG_HOME/rpiv-todo/config.json` (with an absolute `XDG_CONFIG_HOME`); when absent, Osdy falls back to `~/.config/rpiv-todo/config.json`. Invalid JSON uses defaults. For example:
+
+```json
+{
+  "maxWidgetLines": 7,
+  "collapseKey": "ctrl+shift+t",
+  "guidance": {
+    "promptSnippet": "Track multi-step work",
+    "promptGuidelines": ["Update task status as work progresses"]
+  }
+}
+```
+
+`maxWidgetLines` must be a number >= 3 (otherwise 7); it is read on widget renders. `collapseKey` accepts a key combination or `"off"` to disable the shortcut; the shortcut binds at extension load, so restart Pi or run `/reload` after changing it. `guidance.promptSnippet` and `guidance.promptGuidelines` override the tool's model guidance at registration; reload after changing them. The optional `@juicesharp/rpiv-i18n` peer enables nine bundled locales (`de`, `en`, `es`, `fr`, `pt-BR`, `pt`, `ru`, `uk`, `zh`); without the SDK the UI uses English. To use `/languages`, also load its Pi extension (for example, `pi install npm:@juicesharp/rpiv-i18n` in your chosen profile); the peer dependency alone does not register that command. An isolated Pi TUI with both extensions loaded switched the TODO widget and `/todos` from English to Spanish.
+
+**Already installed `@juicesharp/rpiv-todo`?** Both packages can register `todo` and `/todos`. Check `pi list` in the Pi profile you intend to use; to use Osdy's first-party implementation, explicitly remove the standalone package in that same profile:
+
+```bash
+pi remove npm:@juicesharp/rpiv-todo
+```
+
+For a project-local installation, run `pi remove -l npm:@juicesharp/rpiv-todo` in that project instead. Restart Pi or run `/reload`, then check `/todos` shows session tasks, not a document panel. Osdy never uninstalls another package or silently changes package settings. If you need the standalone package, disable the conflicting extension via Pi package configuration instead.
 
 ## OpenAI account profiles
 
@@ -215,7 +244,7 @@ Before rename or removal, close this Pi process when it uses the target and **ma
 | --- | --- |
 | Themes | 14 built-in themes, including Osdy, Kanagawa, Dracula, Catppuccin, Matrix, and Lucent Orange palettes |
 | Header and mascot | Independently selectable `osdy-theme`/`neon` headers and `current`/`bts` mascots |
-| Messages | Pi-native, theme-aware user and assistant message cards |
+| Messages | Native colored user cards without emojis and plain assistant Markdown with a separate assistant `🦝` row |
 | Input | Responsive auto editor by default, with selectable simple Pi-native or extended framed modes |
 | Status | Theme-aware Braille spinner and animated working label, responsive footer metrics, dynamic extension statuses, and Codex subscription quota with low-capacity emphasis |
 | Git | Working-tree summary and a centered, filterable diff panel |
@@ -300,6 +329,7 @@ The enabled state, editor mode, working-tree visibility preference, header, and
 | Main | `/osdy-pi` |
 | Main | `/osdy-pi enable\|disable\|on\|off\|status` |
 | Accounts | `/osdy-account` |
+| Session TODO (starting in 1.5.0) | `/todos` (read-only) |
 | Header | `/osdy-pi header osdy-theme\|neon\|status` |
 | Mascot | `/osdy-pi mascot current\|bts\|status` |
 | Editor | `/osdy-pi editor auto\|extended\|simple\|on\|off\|toggle\|status` |
@@ -325,9 +355,7 @@ Usage loads once when the session starts and refreshes when the modal opens or `
 
 ## Native message cards
 
-Osdy Pi delegates conversation rendering to Pi's native message-card components. It does not install a Markdown transformer or inject card markup into assistant responses. This preserves Pi's own streaming, selection, and Markdown behavior while allowing every bundled Osdy theme to style the native cards.
-
-User and assistant cards have separate background, text, and accent tokens. Assistant accents follow each theme's primary accent; user accents are white for a consistent visual distinction. Disabling Osdy Pi continues to restore the underlying Gentle Shell or Pi presentation normally.
+Pi renders the colored user card and assistant Markdown natively. User messages have no emoji; Osdy Pi places a separate `🦝` transcript entry before each assistant response with visible text, not inside message content. Previously saved user `👤` entries remain in session history but render no row on replay. Selecting only the native message keeps its body clean; a wide selection that includes the emoji row copies the emoji too. Assistant markers persist with the session but do not enter model context. The installed Pi 0.87.1 does not use `assistantMessage*` theme palette keys, so these keys do not create a native assistant card. Osdy does not install a Markdown transformer or change streaming. The current user card colors remain unchanged. Try both roles in your selected theme with `npm run pi:dev`; terminal rendering and selection still need a live visual check. When disabled, Osdy does not add new markers.
 
 ## Editor and working indicator
 
@@ -335,7 +363,7 @@ The default `auto` editor mode preserves the responsive behavior: it uses the fr
 
 In auto or extended mode at a non-small width, the framed editor shows the model and thinking level in its title and session usage in its footer. For an account-profile launch, the left title shows the active profile name instead of `Osdy-Pi`. When the native editor is effective (simple mode or any small terminal), the Osdy footer instead shows model, active profile when present, thinking, and usage rows before its path/branch and status rows. It uses the currently active Pi/Osdy theme palette; no separate editor theme selector exists. Usage covers input, output, cache read, cache write when present, cost, and context. If Pi supports autocomplete, the editor uses Pi's native autocomplete rendering while the completion UI is visible.
 
-While work is active, Osdy Pi shows the original Braille spinner above the editor in the selected theme's accent color. A highlight travels across the `Working...` and `Running ...` letters using the active theme's accent and text colors; the spinner and label update when the theme changes. Osdy Pi hides Pi's built-in working row while enabled to avoid a duplicate indicator.
+While work is active, Osdy Pi shows the original Braille spinner above the editor in the selected theme's accent color. A two-color wave travels across the `Working...` and `Running ...` letters: the current letter uses the active theme's `accent`, the trailing letter uses `warning`, and the rest use `text`. Only the current `accent` letter tries the active theme's bold styling; this is a terminal-dependent visual trial, not a change to font size. The trailing `warning` letter stays plain, as does the accent spinner. The spinner and label update when the theme changes. Osdy Pi hides Pi's built-in working row while enabled to avoid a duplicate indicator.
 
 ## Working tree and diff
 

package/extensions/osdy-pi/codex-usage-ui.ts

@@ -6,6 +6,7 @@ import {
 	type TUI,
 } from "@earendil-works/pi-tui";
 import type { CodexUsageSnapshot, CodexUsageWindow } from "./codex-usage.js";
+import { doubleBorderBox, MODAL_OVERLAY_OPTIONS } from "./modal-frame.js";
 import type { CodexUsageState, SimpleTheme } from "./types.js";
 
 export type CodexUsageViewState = CodexUsageState;
@@ -18,13 +19,7 @@ export type CodexUsagePresentation = {
 	model?: string | undefined;
 };
 
-export const CODEX_USAGE_OVERLAY_OPTIONS = {
-	anchor: "center",
-	width: 96,
-	minWidth: 48,
-	maxHeight: "92%",
-	margin: 1,
-} as const;
+export const CODEX_USAGE_OVERLAY_OPTIONS = MODAL_OVERLAY_OPTIONS;
 
 const ESCAPE = String.fromCharCode(27);
 const BELL = String.fromCharCode(7);
@@ -180,31 +175,6 @@ function borderBox(
 	];
 }
 
-function doubleBorderBox(
-	theme: SimpleTheme,
-	width: number,
-	title: string,
-	lines: string[],
-): string[] {
-	const innerWidth = Math.max(1, width - 2);
-	const heading = truncateToWidth(` ${title} `, innerWidth, "...", true);
-	const leftWidth = Math.floor(
-		Math.max(0, innerWidth - visibleWidth(heading)) / 2,
-	);
-	const rightWidth = Math.max(0, innerWidth - visibleWidth(heading) - leftWidth);
-	const pad = (line: string): string => {
-		const text = truncateToWidth(line, innerWidth, "...", true);
-		return `${text}${" ".repeat(Math.max(0, innerWidth - visibleWidth(text)))}`;
-	};
-	return [
-		`${theme.fg("border", `╔${"═".repeat(leftWidth)}`)}${theme.fg("accent", heading)}${theme.fg("border", `${"═".repeat(rightWidth)}╗`)}`,
-		...lines.map(
-			(line) => `${theme.fg("border", "║")}${pad(line)}${theme.fg("border", "║")}`,
-		),
-		theme.fg("border", `╚${"═".repeat(innerWidth)}╝`),
-	];
-}
-
 function quotaTheme(name: "Session" | "Weekly"): "accent" | "mdLink" {
 	return name === "Session" ? "accent" : "mdLink";
 }

package/extensions/osdy-pi/locales/de.json

@@ -0,0 +1,16 @@
+{
+  "_meta.notes": "Auto-translated draft. Native-speaker review welcome via PR.",
+  "status.pending": "ausstehend",
+  "status.in_progress": "in Bearbeitung",
+  "status.completed": "erledigt",
+  "status.deleted": "gelöscht",
+  "overlay.heading": "Todos",
+  "overlay.more": "weitere",
+  "overlay.expandHint": "{key} zum Ausklappen",
+  "overlay.collapsed": "eingeklappt",
+  "command.no_todos": "Noch keine Todos. Bitte den Agenten, welche hinzuzufügen!",
+  "command.requires_interactive": "/todos erfordert den interaktiven Modus",
+  "command.section.pending": "── Ausstehend ──",
+  "command.section.in_progress": "── In Bearbeitung ──",
+  "command.section.completed": "── Erledigt ──"
+}

package/extensions/osdy-pi/locales/en.json

@@ -0,0 +1,15 @@
+{
+  "status.pending": "pending",
+  "status.in_progress": "in progress",
+  "status.completed": "completed",
+  "status.deleted": "deleted",
+  "overlay.heading": "Todos",
+  "overlay.more": "more",
+  "overlay.expandHint": "{key} to expand",
+  "overlay.collapsed": "collapsed",
+  "command.no_todos": "No todos yet. Ask the agent to add some!",
+  "command.requires_interactive": "/todos requires interactive mode",
+  "command.section.pending": "── Pending ──",
+  "command.section.in_progress": "── In Progress ──",
+  "command.section.completed": "── Completed ──"
+}

package/extensions/osdy-pi/locales/es.json

@@ -0,0 +1,16 @@
+{
+  "_meta.notes": "Auto-translated draft. Native-speaker review welcome via PR.",
+  "status.pending": "pendientes",
+  "status.in_progress": "en curso",
+  "status.completed": "completadas",
+  "status.deleted": "eliminada",
+  "overlay.heading": "Tareas",
+  "overlay.more": "más",
+  "overlay.expandHint": "{key} para expandir",
+  "overlay.collapsed": "contraído",
+  "command.no_todos": "Sin tareas aún. ¡Pídele al agente que añada algunas!",
+  "command.requires_interactive": "/todos requiere modo interactivo",
+  "command.section.pending": "── Pendientes ──",
+  "command.section.in_progress": "── En curso ──",
+  "command.section.completed": "── Completadas ──"
+}

package/extensions/osdy-pi/locales/fr.json

@@ -0,0 +1,16 @@
+{
+  "_meta.notes": "Auto-translated draft. Native-speaker review welcome via PR.",
+  "status.pending": "en attente",
+  "status.in_progress": "en cours",
+  "status.completed": "terminées",
+  "status.deleted": "supprimée",
+  "overlay.heading": "Tâches",
+  "overlay.more": "autres",
+  "overlay.expandHint": "{key} pour développer",
+  "overlay.collapsed": "réduit",
+  "command.no_todos": "Pas encore de tâches. Demandez à l'agent d'en ajouter !",
+  "command.requires_interactive": "/todos nécessite le mode interactif",
+  "command.section.pending": "── En attente ──",
+  "command.section.in_progress": "── En cours ──",
+  "command.section.completed": "── Terminées ──"
+}

package/extensions/osdy-pi/locales/pt-BR.json

@@ -0,0 +1,16 @@
+{
+  "_meta.notes": "Auto-translated draft. Native-speaker review welcome via PR.",
+  "status.pending": "pendentes",
+  "status.in_progress": "em andamento",
+  "status.completed": "concluídas",
+  "status.deleted": "excluída",
+  "overlay.heading": "Tarefas",
+  "overlay.more": "mais",
+  "overlay.expandHint": "{key} para expandir",
+  "overlay.collapsed": "recolhido",
+  "command.no_todos": "Nenhuma tarefa ainda. Peça ao agente para adicionar algumas!",
+  "command.requires_interactive": "/todos requer modo interativo",
+  "command.section.pending": "── Pendentes ──",
+  "command.section.in_progress": "── Em andamento ──",
+  "command.section.completed": "── Concluídas ──"
+}

package/extensions/osdy-pi/locales/pt.json

@@ -0,0 +1,16 @@
+{
+  "_meta.notes": "Auto-translated draft. Native-speaker review welcome via PR.",
+  "status.pending": "pendentes",
+  "status.in_progress": "em curso",
+  "status.completed": "concluídas",
+  "status.deleted": "eliminada",
+  "overlay.heading": "Tarefas",
+  "overlay.more": "mais",
+  "overlay.expandHint": "{key} para expandir",
+  "overlay.collapsed": "recolhido",
+  "command.no_todos": "Sem tarefas ainda. Peça ao agente para adicionar algumas!",
+  "command.requires_interactive": "/todos requer modo interativo",
+  "command.section.pending": "── Pendentes ──",
+  "command.section.in_progress": "── Em curso ──",
+  "command.section.completed": "── Concluídas ──"
+}

package/extensions/osdy-pi/locales/ru.json

@@ -0,0 +1,16 @@
+{
+  "_meta.notes": "Автоперевод. Приветствуется проверка носителем языка через PR.",
+  "status.pending": "ожидание",
+  "status.in_progress": "в работе",
+  "status.completed": "выполнено",
+  "status.deleted": "удалена",
+  "overlay.heading": "Задачи",
+  "overlay.more": "ещё",
+  "overlay.expandHint": "{key} — развернуть",
+  "overlay.collapsed": "свёрнуто",
+  "command.no_todos": "Задач пока нет. Попросите агента добавить!",
+  "command.requires_interactive": "/todos требует интерактивного режима",
+  "command.section.pending": "── Ожидание ──",
+  "command.section.in_progress": "── В работе ──",
+  "command.section.completed": "── Выполнено ──"
+}

package/extensions/osdy-pi/locales/uk.json

@@ -0,0 +1,16 @@
+{
+  "_meta.notes": "Автопереклад. Привітна перевірка носієм мови через PR.",
+  "status.pending": "очікування",
+  "status.in_progress": "у роботі",
+  "status.completed": "виконано",
+  "status.deleted": "видалено",
+  "overlay.heading": "Завдання",
+  "overlay.more": "ще",
+  "overlay.expandHint": "{key} — розгорнути",
+  "overlay.collapsed": "згорнуто",
+  "command.no_todos": "Завдань поки немає. Попросіть агента додати!",
+  "command.requires_interactive": "/todos потребує інтерактивного режиму",
+  "command.section.pending": "── Очікування ──",
+  "command.section.in_progress": "── У роботі ──",
+  "command.section.completed": "── Виконано ──"
+}

package/extensions/osdy-pi/locales/zh.json

@@ -0,0 +1,16 @@
+{
+  "_meta.notes": "中文翻译。欢迎中文母语者通过 PR 审校。",
+  "status.pending": "待处理",
+  "status.in_progress": "进行中",
+  "status.completed": "已完成",
+  "status.deleted": "已删除",
+  "overlay.heading": "任务清单",
+  "overlay.more": "更多",
+  "overlay.expandHint": "按 {key} 展开",
+  "overlay.collapsed": "已折叠",
+  "command.no_todos": "暂无任务。可以让 agent 添加一些！",
+  "command.requires_interactive": "/todos 需要交互模式",
+  "command.section.pending": "── 待处理 ──",
+  "command.section.in_progress": "── 进行中 ──",
+  "command.section.completed": "── 已完成 ──"
+}

package/extensions/osdy-pi/message-role-markers.test.ts

@@ -0,0 +1,161 @@
+import assert from "node:assert/strict";
+import { existsSync, readFileSync } from "node:fs";
+import { registerHooks } from "node:module";
+import test from "node:test";
+import { fileURLToPath } from "node:url";
+import ts from "typescript";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+
+registerHooks({
+ resolve(specifier, context, nextResolve) {
+  if (specifier.startsWith(".") && specifier.endsWith(".js") && context.parentURL?.endsWith(".ts")) {
+   const url = new URL(`${specifier.slice(0, -3)}.ts`, context.parentURL);
+   if (existsSync(fileURLToPath(url))) return { shortCircuit: true, url: url.href };
+  }
+  return nextResolve(specifier, context);
+ },
+ load(url, context, nextLoad) {
+  if (url.endsWith(".ts")) return { format: "module", shortCircuit: true, source: ts.transpileModule(readFileSync(fileURLToPath(url), "utf8"), { compilerOptions: { module: ts.ModuleKind.ESNext, target: ts.ScriptTarget.ES2022 } }).outputText };
+  return nextLoad(url, context);
+ },
+});
+const { registerMessageRoleMarkers } = await import("./message-role-markers.js");
+
+type Handler = (event: { message?: { role: string } }, ctx: ExtensionContext) => void;
+type TestRenderer = (entry: { data?: { role?: unknown } }, options: { expanded: boolean }, theme: { fg: (color: string, text: string) => string }) => { render(width: number): string[] } | undefined;
+function harness(mode = "tui", enabled = true) {
+ const handlers = new Map<string, Handler>();
+ const entries: Array<{ type: "custom"; customType: string; data: { role: string } }> = [];
+ const timeline: string[] = [];
+ let renderer: TestRenderer | undefined;
+ let customType = "";
+ const ctx = { mode, hasUI: true, sessionManager: { getBranch: () => entries } } as unknown as ExtensionContext;
+ const pi = {
+  on: (name: string, handler: Handler) => { handlers.set(name, handler); },
+  appendEntry: (type: string, data: { role: string }) => { entries.push({ type: "custom", customType: type, data }); timeline.push(`marker:${data.role}`); },
+  registerEntryRenderer: (type: string, render: unknown) => { customType = type; renderer = render as TestRenderer; },
+ } as unknown as ExtensionAPI;
+ registerMessageRoleMarkers(pi, () => enabled);
+ const emit = (name: string, message?: { role: string }) => { handlers.get(name)?.(message ? { message } : {}, ctx); if (name === "message_start" && message) timeline.push(`native:${message.role}`); };
+ return { emit, entries, timeline, ctx, get renderer() { return renderer; }, get customType() { return customType; }, setEnabled: (value: boolean) => { enabled = value; } };
+}
+const message = (role: string, timestamp: number, content: unknown[] = []) => ({ role, timestamp, content });
+
+void test("user starts preserve the native card without appending an emoji or changing content", () => {
+ const h = harness();
+ const user = message("user", 1, [{ type: "text", text: "original" }]);
+ const original = structuredClone(user);
+ h.emit("message_start", user);
+ h.emit("message_start", user);
+ h.emit("message_end", user);
+ assert.deepEqual(h.timeline, ["native:user", "native:user"]);
+ assert.deepEqual(user, original);
+ assert.deepEqual(h.entries, []);
+});
+
+void test("assistant waits for visible text, then marks once across updates and end", () => {
+ const h = harness();
+ const assistant = message("assistant", 2);
+ h.emit("message_start", assistant);
+ h.emit("message_update", message("assistant", 2, [{ type: "thinking", thinking: "secret" }, { type: "toolCall", id: "t" }]));
+ assert.equal(h.entries.length, 0);
+ const text = message("assistant", 2, [{ type: "text", text: "answer" }]);
+ const original = structuredClone(text);
+ h.emit("message_update", text);
+ h.emit("message_update", text);
+ h.emit("message_end", text);
+ assert.deepEqual(h.timeline, ["native:assistant", "marker:assistant"]);
+ assert.equal(h.entries.length, 1);
+ assert.deepEqual(text, original);
+ h.emit("message_start", message("assistant", 3));
+ h.emit("message_end", message("assistant", 3, [{ type: "text", text: "final" }]));
+ assert.equal(h.entries.length, 2);
+});
+
+void test("empty, thinking-only, tool-only and tool results have no assistant marker", () => {
+ const h = harness();
+ for (const [index, content] of [[], [{ type: "thinking", thinking: "x" }], [{ type: "toolCall", id: "t" }], [{ type: "text", text: "   " }]].entries()) {
+  h.emit("message_start", message("assistant", index));
+  h.emit("message_end", message("assistant", index, content));
+ }
+ h.emit("message_start", message("toolResult", 5, [{ type: "text", text: "output" }]));
+ assert.deepEqual(h.entries, []);
+});
+
+void test("disabled and noninteractive modes do not persist markers", () => {
+ const disabled = harness("tui", false);
+ disabled.emit("message_start", message("user", 1));
+ disabled.emit("message_end", message("assistant", 2, [{ type: "text", text: "a" }]));
+ assert.equal(disabled.entries.length, 0);
+ const json = harness("json");
+ json.emit("message_start", message("user", 1));
+ json.emit("message_end", message("assistant", 2, [{ type: "text", text: "a" }]));
+ assert.equal(json.entries.length, 0);
+});
+
+void test("same-timestamp assistant answers each get one marker without user markers", () => {
+ const h = harness();
+ const firstUser = message("user", 1);
+ const secondUser = message("user", 1);
+ h.emit("message_start", firstUser);
+ h.emit("message_start", firstUser);
+ h.emit("message_start", secondUser);
+ for (let i = 0; i < 2; i++) {
+  h.emit("message_start", message("assistant", 2));
+  h.emit("message_update", message("assistant", 2, [{ type: "text", text: `answer ${i}` }]));
+  h.emit("message_end", message("assistant", 2, [{ type: "text", text: `answer ${i}` }]));
+ }
+ assert.deepEqual(h.entries.map(({ data }) => data), [{ role: "assistant" }, { role: "assistant" }]);
+});
+
+void test("user start and session change clear pending assistant state", () => {
+ const h = harness();
+ h.emit("message_start", message("assistant", 1));
+ h.emit("message_start", message("user", 2));
+ h.emit("message_end", message("assistant", 1, [{ type: "text", text: "orphan" }]));
+ assert.equal(h.entries.length, 0);
+ h.emit("message_start", message("assistant", 3));
+ h.emit("session_start");
+ h.emit("message_end", message("assistant", 3, [{ type: "text", text: "orphan" }]));
+ assert.equal(h.entries.length, 0);
+ h.emit("message_start", message("assistant", 4));
+ h.emit("message_end", message("assistant", 4, [{ type: "text", text: "new" }]));
+ assert.deepEqual(h.entries.map(({ data }) => data.role), ["assistant"]);
+});
+
+void test("malformed assistant content fails closed without throwing", () => {
+ const h = harness();
+ h.emit("message_start", message("assistant", 1));
+ for (const content of [null, {}, [null], [{ type: "text", text: {} }]])
+  h.emit("message_update", { role: "assistant", timestamp: 1, content } as never);
+ assert.equal(h.entries.length, 0);
+ h.emit("message_end", message("assistant", 1, [{ type: "text", text: "valid" }]));
+ assert.deepEqual(h.entries.map(({ data }) => data), [{ role: "assistant" }]);
+});
+
+void test("legacy user entries render no row, while assistant glyph stays copy-isolated", () => {
+ const h = harness();
+ h.emit("message_start", message("assistant", 2));
+ h.emit("message_update", message("assistant", 2, [{ type: "text", text: "secret body" }]));
+ const theme = { fg: (_color: string, text: string) => text };
+ const legacy = { type: "custom", customType: h.customType, data: { role: "user" } };
+ // Pi's addCustomEntryToChat skips the whole row when this renderer returns undefined.
+ assert.equal(legacy.customType, h.entries[0]?.customType);
+ assert.equal(h.renderer?.(legacy, { expanded: false }, theme), undefined);
+ const assistantLines = h.renderer?.(h.entries[0]!, { expanded: false }, theme)?.render(40) ?? [];
+ assert.match(assistantLines.join(""), /🦝/);
+ assert.doesNotMatch(assistantLines.join(""), /secret body/);
+ assert.equal(h.entries[0]?.customType, h.customType);
+ assert.equal(h.renderer?.({ data: { role: "invalid" } }, { expanded: false }, theme), undefined);
+ assert.equal(h.renderer?.({ data: {} }, { expanded: false }, theme), undefined);
+ assert.equal(h.renderer?.({ data: { role: "assistant" } }, { expanded: false }, theme)?.render(1).join(""), "");
+});
+
+void test("renderer returns an empty line for invalid or narrow widths", () => {
+ const h = harness();
+ const renderer = h.renderer?.({ data: { role: "assistant" } }, { expanded: false }, { fg: (_color: string, text: string) => text });
+ assert.ok(renderer);
+ for (const width of [0, 1, -1, NaN, Infinity, -Infinity, 2.5])
+  assert.deepEqual(renderer.render(width), [""], `width ${width}`);
+ assert.match(renderer.render(2).join(""), /🦝/);
+});

package/extensions/osdy-pi/message-role-markers.ts

@@ -0,0 +1,52 @@
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { Text } from "@earendil-works/pi-tui";
+
+const ENTRY_TYPE = "osdy-pi-role-marker";
+type Marker = { role: "assistant" };
+
+export function registerMessageRoleMarkers(
+ pi: Pick<ExtensionAPI, "on" | "appendEntry" | "registerEntryRenderer">,
+ isEnabled: () => boolean,
+): void {
+ let pendingAssistant = false;
+ const eligible = (ctx: ExtensionContext): boolean => isEnabled() && ctx.mode === "tui" && ctx.hasUI;
+ const visible = (content: unknown): boolean =>
+  Array.isArray(content) && (content as unknown[]).some((part) => {
+   if (part === null || typeof part !== "object") return false;
+   const block = part as { type?: unknown; text?: unknown };
+   return block.type === "text" && typeof block.text === "string" && Boolean(block.text.trim());
+  });
+ const reset = (): void => { pendingAssistant = false; };
+
+ pi.registerEntryRenderer<Marker>(ENTRY_TYPE, (entry, _options, theme) => {
+  const role = entry.data?.role;
+  if (role !== "assistant") return undefined;
+  const text = new Text(theme.fg("muted", "🦝"), 0, 0);
+  return {
+   render: (width: number) => !Number.isInteger(width) || width < 2 ? [""] : text.render(width),
+   invalidate: () => text.invalidate(),
+  };
+ });
+ pi.on("message_start", (event, ctx) => {
+  if (event.message.role === "user") {
+   pendingAssistant = false;
+  } else if (event.message.role === "assistant") {
+   pendingAssistant = eligible(ctx);
+  }
+ });
+ pi.on("message_update", (event, ctx) => {
+  if (event.message.role === "assistant" && pendingAssistant && eligible(ctx) && visible(event.message.content)) {
+   pi.appendEntry<Marker>(ENTRY_TYPE, { role: "assistant" });
+   pendingAssistant = false;
+  }
+ });
+ pi.on("message_end", (event, ctx) => {
+  if (event.message.role !== "assistant") return;
+  if (pendingAssistant && eligible(ctx) && visible(event.message.content))
+   pi.appendEntry<Marker>(ENTRY_TYPE, { role: "assistant" });
+  pendingAssistant = false;
+ });
+ pi.on("session_start", reset);
+ pi.on("session_tree", reset);
+ pi.on("session_shutdown", reset);
+}