some colours

Author: jonathanlab

apps/cli/src/commands/log.ts

@@ -9,6 +9,8 @@ import {
   blue,
   cyan,
   dim,
+  formatChangeId,
+  formatCommitId,
   green,
   hint,
   magenta,
@@ -432,8 +434,10 @@ function renderEnhancedOutput(
           }
           pendingHints = [];
         }
-        // Add blank line after commit
-        output.push("│");
+        // Add blank line after commit, preserving graph structure
+        // Extract just the graph connectors from prefix (│, ├, etc.)
+        const blankLinePrefix = prefix.replace(/[^\s│├─╯╮╭]/g, " ").trimEnd();
+        output.push(blankLinePrefix || "│");
         break;
       }
     }
@@ -545,22 +549,6 @@ function buildPRInfoMap(
   return prInfoMap;
 }
 
-function formatChangeId(changeId: string, prefix: string): string {
-  const short = changeId.slice(0, 8);
-  if (prefix && short.startsWith(prefix)) {
-    return magenta(prefix) + dim(short.slice(prefix.length));
-  }
-  return magenta(short);
-}
-
-function formatCommitId(commitId: string, prefix: string): string {
-  const short = commitId.slice(0, 8);
-  if (prefix && short.startsWith(prefix)) {
-    return cyan(prefix) + dim(short.slice(prefix.length));
-  }
-  return cyan(short);
-}
-
 function formatPRLine(prInfo: PRInfo): string {
   const stateColor =
     prInfo.state === "MERGED" ? magenta : prInfo.state === "OPEN" ? green : red;

apps/cli/src/utils/output.ts

@@ -14,6 +14,12 @@ const colors = {
   white: "\x1b[37m",
   pink: "\x1b[1;95m",
   brightBlue: "\x1b[1;94m",
+  // jj-style 256 colors
+  jjChangeId: "\x1b[38;5;5m", // magenta (256-color)
+  jjChangeIdBright: "\x1b[1m\x1b[38;5;13m", // bright magenta (for WC)
+  jjCommitId: "\x1b[38;5;4m", // blue (256-color)
+  jjCommitIdBright: "\x1b[1m\x1b[38;5;12m", // bright blue (for WC)
+  jjGray: "\x1b[38;5;8m", // gray for suffixes
 };
 
 export function red(text: string): string {
@@ -58,12 +64,12 @@ export function dim(text: string): string {
 
 export function formatChangeId(fullId: string, prefix: string): string {
   const rest = fullId.slice(prefix.length);
-  return `${pink(prefix)}${dim(rest)}`;
+  return `${colors.jjChangeId}${prefix}${colors.jjGray}${rest}${colors.reset}`;
 }
 
 export function formatCommitId(fullId: string, prefix: string): string {
   const rest = fullId.slice(prefix.length);
-  return `${colors.brightBlue}${prefix}${colors.reset}${dim(rest)}`;
+  return `${colors.brightBlue}${prefix}${colors.reset}${colors.jjGray}${rest}${colors.reset}`;
 }
 
 export function formatError(error: unknown): string {