Prompt: --glyphs and --color modes with %s %U %O %i placeholders; oh-my-bash powerline segment in contrib/oh-my-bash/oxy.sh 694805cca585

#! bash oh-my-bash.module

# Oxygen segment for the oh-my-bash powerline themes.

#

# Install: copy this file to "$OSH_CUSTOM/oxy.sh" (default ~/.oh-my-bash/custom/)

# and open a new shell. Custom files load before the theme, so the

# POWERLINE_PROMPT default below adds the "oxy" segment next to the Git one;

# set POWERLINE_PROMPT yourself to arrange segments differently.

#

# The segment shows: icon, bookmark, working-copy change id, a state glyph

# (✔ clean, ✎ uncommitted changes, ‼ conflicts), and ↑n/↓n against origin.

# Its colour follows the state. It costs one `oxy prompt` call, a few

# milliseconds, and prints nothing outside an Oxygen repository.

: "${POWERLINE_PROMPT:=user_info scm oxy python_venv ruby cwd}"

OXY_CHAR=${POWERLINE_OXY_CHAR:="⚛ "}

OXY_THEME_PROMPT_CLEAN_COLOR=${OXY_THEME_PROMPT_CLEAN_COLOR:=25}

OXY_THEME_PROMPT_DIRTY_COLOR=${OXY_THEME_PROMPT_DIRTY_COLOR:=88}

OXY_THEME_PROMPT_CONFLICT_COLOR=${OXY_THEME_PROMPT_CONFLICT_COLOR:=160}

OXY_THEME_PROMPT_CLEAN_GLYPH=${OXY_THEME_PROMPT_CLEAN_GLYPH:="✔"}

OXY_THEME_PROMPT_DIRTY_GLYPH=${OXY_THEME_PROMPT_DIRTY_GLYPH:="✎"}

OXY_THEME_PROMPT_CONFLICT_GLYPH=${OXY_THEME_PROMPT_CONFLICT_GLYPH:="‼"}

function __powerline_oxy_prompt {

  command -v oxy >/dev/null 2>&1 || return

  local info

  info=$(oxy prompt --format '%b|%c|%d|%x|%U|%O' 2>/dev/null) || return

  [[ -n "$info" ]] || return

  local bookmark change dirty conflict up down

  IFS='|' read -r bookmark change dirty conflict up down <<< "$info"

  local color glyph

  if [[ -n "$conflict" ]]; then

    color=$OXY_THEME_PROMPT_CONFLICT_COLOR glyph=$OXY_THEME_PROMPT_CONFLICT_GLYPH

  elif [[ -n "$dirty" ]]; then

    color=$OXY_THEME_PROMPT_DIRTY_COLOR glyph=$OXY_THEME_PROMPT_DIRTY_GLYPH

  else

    color=$OXY_THEME_PROMPT_CLEAN_COLOR glyph=$OXY_THEME_PROMPT_CLEAN_GLYPH

  fi

  _omb_util_print "${OXY_CHAR}${bookmark} ${change} ${glyph}${up}${down}|${color}"

}

pub use prompt::{PromptInfo, DEFAULT_PROMPT_FORMAT, GLYPH_PROMPT_FORMAT};

    /// The glyph for the working copy's state: `‼` conflicted, `✎` dirty,

    /// `✔` clean.

    pub fn state_glyph(&self) -> &'static str {

        if self.conflicted {

            "‼"

        } else if self.dirty {

            "✎"

        } else {

            "✔"

        }

    }

    /// The ANSI colour (SGR parameter) for the state: red, yellow, or cyan.

    pub fn state_color(&self) -> u8 {

        if self.conflicted {

            31

        } else if self.dirty {

            33

        } else {

            36

        }

    }

    /// `format` wrapped in the state colour. `guard` is `("\\[", "\\]")` for

    /// bash prompts, `("%{", "%}")` for zsh, or empty for raw output.

    pub fn format_colored(&self, fmt: &str, guard: (&str, &str)) -> String {

        format!("{}\x1b[{}m{}{}{}\x1b[0m{}", guard.0, self.state_color(), guard.1, self.format(fmt), guard.0, guard.1)

    }

    /// (empty when unknown), `%A`/`%D` `+n`/`-n` when non-zero, `%s` the

    /// state glyph, `%U`/`%O` `↑n`/`↓n` when non-zero, `%i` the repository

    /// icon, `%%` percent.

                Some('s') => out.push_str(self.state_glyph()),

                Some('U') => {

                    if let Some(n) = self.ahead.filter(|n| *n > 0) {

                        out.push_str(&format!("↑{n}"));

                    }

                }

                Some('O') => {

                    if let Some(n) = self.behind.filter(|n| *n > 0) {

                        out.push_str(&format!("↓{n}"));

                    }

                }

                Some('i') => out.push_str(ICON),

/// The repository icon for `%i` (an atom, for oxygen).

pub const ICON: &str = "⚛";

/// A format with glyphs: icon, bookmark, change id, state, ahead/behind.

pub const GLYPH_PROMPT_FORMAT: &str = "%i %b %c %s%U%O";

#[cfg(test)]

mod tests {

    use super::*;

    #[test]

    fn placeholders_and_glyphs() {

        let clean = PromptInfo { bookmark: "main".into(), change_id: "658990aa".into(), heads: 1, dirty: false, conflicted: false, ahead: Some(0), behind: None };

        assert_eq!(clean.format(DEFAULT_PROMPT_FORMAT), "main 658990aa");

        assert_eq!(clean.format(GLYPH_PROMPT_FORMAT), "⚛ main 658990aa ✔");

        let busy = PromptInfo { dirty: true, ahead: Some(2), behind: Some(3), ..clean.clone() };

        assert_eq!(busy.format(DEFAULT_PROMPT_FORMAT), "main 658990aa*+2-3");

        assert_eq!(busy.format(GLYPH_PROMPT_FORMAT), "⚛ main 658990aa ✎↑2↓3");

        let bad = PromptInfo { conflicted: true, ..busy.clone() };

        assert_eq!(bad.format("%s%x%d %h %a/%B %%"), "‼!* 1 2/3 %");

        assert_eq!(bad.state_color(), 31);

        assert_eq!(busy.format_colored("%b", ("\\[", "\\]")), "\\[\x1b[33m\\]main\\[\x1b[0m\\]");

        assert_eq!(clean.format_colored("%b", ("", "")), "\x1b[36mmain\x1b[0m");

        assert_eq!(clean.format("%q"), "%q");

    }

}

- [x] (Pending, for the morning) Ask Andy to complete his cut-off request ("Can we also look at ..."). (Answered 2026-09-27: it was a stray copy of the prompt request. Done: `oxy prompt --glyphs --color`, new placeholders %s %U %O %i, and an oh-my-bash powerline segment in contrib/oh-my-bash/oxy.sh, installed to ~/.oh-my-bash/custom/oxy.sh; ~/.local/bin/oxy symlinks the release binary. GPG question settled: Andy said to leave GPG out.)

- 2026-09-27 12:15 morning: glyph/colour prompt modes and the oh-my-bash powerline segment. 116 tests.

| `%s` | state glyph: `✔` clean, `✎` dirty, `‼` conflicted |

| `%U` / `%O` | `↑n` ahead / `↓n` behind origin, empty when zero or unknown |

| `%i` | the repository icon `⚛` |

`--glyphs` selects the format `%i %b %c %s%U%O` (`⚛ main 658990aa ✎↑2`), and

`--color raw|bash|zsh` wraps the line in the state's colour (cyan clean,

yellow dirty, red conflicted), guarded so bash and zsh measure the prompt

correctly:

```bash

PS1='\u@\h \w $(oxy prompt --glyphs --color bash 2>/dev/null)\$ '

```

## oh-my-bash powerline themes

For the `powerline`, `powerline-icon`, `powerline-multiline`, and

`powerline-plain` themes, copy [contrib/oh-my-bash/oxy.sh](../contrib/oh-my-bash/oxy.sh)

to `~/.oh-my-bash/custom/oxy.sh` and open a new shell. It adds an `oxy`

segment beside the Git one, coloured by state, showing icon, bookmark,

change id, state glyph, and ahead/behind arrows. The file's variables

(`POWERLINE_OXY_CHAR`, `OXY_THEME_PROMPT_*_COLOR`, `OXY_THEME_PROMPT_*_GLYPH`)

can be overridden in `~/.bashrc` before oh-my-bash loads, and

`POWERLINE_PROMPT` arranges the segments.

## bash and oh-my-bash (other themes)

        /// Placeholders: %b bookmark, %c change id, %h heads, %d dirty (*), %x conflict (!), %A/%D ahead/behind (+n/-n), %a/%B raw counts, %s state glyph, %U/%O ahead/behind arrows, %i icon

        /// Glyph format (%i %b %c %s%U%O) instead of the plain default

        #[arg(long)]

        glyphs: bool,

        /// Colour by state (cyan clean, yellow dirty, red conflicted): raw escapes, or guarded for a bash or zsh PS1

        #[arg(long, value_parser = ["raw", "bash", "zsh"])]

        color: Option<String>,

        Cmd::Prompt { format, glyphs, color } => workspace::prompt(&format, glyphs, color.as_deref()),

pub fn prompt(format: &str, glyphs: bool, color: Option<&str>) -> Result<i32> {

    let fmt = if glyphs && format == oxy_core::repo::DEFAULT_PROMPT_FORMAT { oxy_core::repo::GLYPH_PROMPT_FORMAT } else { format };

    let line = match color {

        Some("bash") => info.format_colored(fmt, ("\\[", "\\]")),

        Some("zsh") => info.format_colored(fmt, ("%{", "%}")),

        Some(_) => info.format_colored(fmt, ("", "")),

        None => info.format(fmt),

    };

    println!("{line}");