drexler 0.2.20 → 0.2.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drexler",
-  "version": "0.2.20",
+  "version": "0.2.22",
   "description": "CLI chat with Drexler, a corporate-executive AI persona built on OpenRouter Gemma 4 31B.",
   "license": "MIT",
   "author": "showOS",

package/src/commands.ts

@@ -1,6 +1,6 @@
 import { spawnSync } from "node:child_process";
 import { existsSync, writeFileSync } from "node:fs";
-import { resolve as pathResolve } from "node:path";
+import { isAbsolute, resolve as pathResolve, sep as pathSep } from "node:path";
 import {
   getConfigPath,
   getDrexlerVersion,
@@ -499,9 +499,24 @@ function resolveWriteTarget(
     ctx.print(error(`Invalid path: ${pathArg} (no '..' segments allowed).`));
     return null;
   }
+  const cwd = process.cwd();
   const target = pathArg
-    ? pathResolve(pathArg)
-    : pathResolve(`${defaultPrefix}-${Date.now()}${requiredExt}`);
+    ? pathResolve(cwd, pathArg)
+    : pathResolve(cwd, `${defaultPrefix}-${Date.now()}${requiredExt}`);
+  // Sandbox relative paths to cwd. Absolute paths are user-explicit
+  // (e.g. `/save /tmp/notes.md`) and trusted — drexler runs with the
+  // user's own permissions, so they can write anywhere they could write
+  // from the shell. Defense in depth catches relative paths that, after
+  // resolution, would land outside cwd via a sneaky construction.
+  if (pathArg && !isAbsolute(pathArg)) {
+    const cwdPrefix = cwd.endsWith(pathSep) ? cwd : cwd + pathSep;
+    if (target !== cwd && !target.startsWith(cwdPrefix)) {
+      ctx.print(
+        error(`Invalid path: ${pathArg} (resolves outside current directory).`),
+      );
+      return null;
+    }
+  }
   if (!target.toLowerCase().endsWith(requiredExt)) {
     ctx.print(error(`Target must end in ${requiredExt}: ${target}`));
     return null;

package/src/config.ts

@@ -151,28 +151,49 @@ async function validatePersonaFile(
   return resolved;
 }
 
-export async function loadConfigFile(): Promise<Partial<Config>> {
-  const cp = configPath();
-  const lp = legacyConfigPath();
-  const path = existsSync(cp) ? cp : existsSync(lp) ? lp : null;
-  if (!path) return {};
+async function readConfigPath(
+  path: string,
+): Promise<{ raw: string; missing: false } | { raw: null; missing: true } | { raw: null; missing: false; error: NodeJS.ErrnoException }> {
   try {
-    const raw = await readFile(path, "utf-8");
-    const parsed: unknown = JSON.parse(raw);
-    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+    return { raw: await readFile(path, "utf-8"), missing: false };
+  } catch (err) {
+    const code = (err as NodeJS.ErrnoException).code;
+    if (code === "ENOENT") return { raw: null, missing: true };
+    return { raw: null, missing: false, error: err as NodeJS.ErrnoException };
+  }
+}
+
+export async function loadConfigFile(): Promise<Partial<Config>> {
+  // Try canonical XDG path first, then legacy ~/.drexlerrc. Reading
+  // unconditionally (instead of gating on existsSync) means EACCES
+  // surfaces a warning rather than silently masquerading as "no file".
+  for (const path of [configPath(), legacyConfigPath()]) {
+    const result = await readConfigPath(path);
+    if (result.missing) continue;
+    if (result.raw === null) {
       console.warn(
-        `Drexler config at ${path} is not a JSON object; ignoring (defaults applied).`,
+        `Drexler config at ${path} could not be read (${result.error.code ?? result.error.message}); ignoring (defaults applied).`,
+      );
+      return {};
+    }
+    try {
+      const parsed: unknown = JSON.parse(result.raw);
+      if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+        console.warn(
+          `Drexler config at ${path} is not a JSON object; ignoring (defaults applied).`,
+        );
+        return {};
+      }
+      return parsed as Partial<Config>;
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      console.warn(
+        `Drexler config at ${path} could not be parsed (${msg}); ignoring (defaults applied).`,
       );
       return {};
     }
-    return parsed as Partial<Config>;
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    console.warn(
-      `Drexler config at ${path} could not be read (${msg}); ignoring (defaults applied).`,
-    );
-    return {};
   }
+  return {};
 }
 
 export async function saveConfig(partial: Partial<Config>): Promise<void> {

package/src/llm.ts

@@ -11,6 +11,32 @@ const STOP_SEQUENCES = [
 ];
 const RETRY_DELAY_MS = 250;
 
+function abortableDelay(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise<void>((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(new Error("aborted before retry"));
+      return;
+    }
+    const timer = setTimeout(() => {
+      signal?.removeEventListener("abort", onAbort);
+      resolve();
+    }, ms);
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(new Error("aborted before retry"));
+    };
+    signal?.addEventListener("abort", onAbort, { once: true });
+  });
+}
+
+function debugWarn(label: string, detail: string): void {
+  if (process.env.DREXLER_DEBUG && process.env.DREXLER_DEBUG !== "0") {
+    try {
+      process.stderr.write(`[drexler ${label}] ${detail}\n`);
+    } catch {}
+  }
+}
+
 export type FetchFn = (
   url: string | URL | Request,
   init?: RequestInit,
@@ -112,7 +138,18 @@ async function attempt(
     try {
       await res.text();
     } catch {}
-    await new Promise((r) => setTimeout(r, RETRY_DELAY_MS));
+    // Retry delay must be abortable — if the user hits Esc during the
+    // wait, we should bail immediately instead of firing the second
+    // request only to cancel it once issued.
+    try {
+      await abortableDelay(RETRY_DELAY_MS, opts.signal);
+    } catch (err) {
+      return {
+        status: "http_error",
+        content: "",
+        error: err instanceof Error ? err.message : String(err),
+      };
+    }
     return attempt(model, opts, fetchFn, true);
   }
 
@@ -189,8 +226,12 @@ export async function parseSSEStream(
         acc += tok;
         onToken(tok);
       }
-    } catch {
-      // tolerate malformed chunk
+    } catch (err) {
+      // Tolerate malformed chunks — OpenRouter occasionally emits
+      // partial JSON during slow connections. Visible only when
+      // DREXLER_DEBUG is set so production stays quiet.
+      const msg = err instanceof Error ? err.message : String(err);
+      debugWarn("sse parse", `${msg}: ${data.slice(0, 80)}`);
     }
   };
 

package/src/pet/petState.ts

@@ -33,10 +33,16 @@ export interface PetStats {
 
 const MAX_NAME_LEN = 16;
 const NAME_SANITIZE_RE = /[^\p{L}\p{N} ._'-]/gu;
+// Strip ALL Unicode format/control marks (bidi overrides, ZWJ/ZWNJ,
+// BOM, word joiner, mathematical invisibles) before character-class
+// filtering — otherwise a name like "Max" can render as "xaM" via an
+// embedded U+202E RIGHT-TO-LEFT OVERRIDE that survives NFKC.
+const NAME_BIDI_STRIP_RE = /\p{Cf}/gu;
 
 export function sanitizePetName(input: string): string {
   const cleaned = input
     .normalize("NFKC")
+    .replace(NAME_BIDI_STRIP_RE, "")
     .replace(NAME_SANITIZE_RE, "")
     .replace(/\s+/g, " ")
     .trim();
@@ -76,6 +82,10 @@ export function actionCooldown(
     return { ok: true, remainingMs: 0 };
   }
   const elapsed = now - last;
+  // Clock skew backwards (timestamp set in the future) shouldn't lock
+  // the user out for the cooldown window — treat as no cooldown and
+  // let the next stampAction overwrite the stale future value.
+  if (elapsed < 0) return { ok: true, remainingMs: 0 };
   if (elapsed >= PET_COOLDOWN_MS) return { ok: true, remainingMs: 0 };
   return { ok: false, remainingMs: PET_COOLDOWN_MS - elapsed };
 }

package/src/repl.ts

@@ -69,13 +69,18 @@ export function buildMessagesWithReminder(conv: Conversation): Message[] {
 }
 
 // Confusable letters that look like Latin "I" — fold to ASCII before regex
-// so detection isn't bypassed by Cyrillic І, Turkish İ, fullwidth Ｉ, etc.
-const I_CONFUSABLES_RE = /[ІіİıＩℐⅠ]/g;
+// so detection isn't bypassed by Cyrillic І, Turkish İ, fullwidth Ｉ,
+// Greek Iota Ι/ι, script ℐ, Roman numeral Ⅰ.
+const I_CONFUSABLES_RE = /[ІіİıＩℐⅠΙι]/g;
 
 export function detectPersonaDrift(content: string): boolean {
   const noCode = content
     .replace(/```[\s\S]*?```/g, "")
-    .replace(/`[^`]*`/g, "");
+    .replace(/`[^`]*`/g, "")
+    // Strip LaTeX-style inline math $...$ and display math $$...$$ so
+    // `$I = mc^2$` doesn't trip drift detection.
+    .replace(/\$\$[\s\S]*?\$\$/g, "")
+    .replace(/\$[^\$\n]*\$/g, "");
   const folded = noCode.normalize("NFKC").replace(I_CONFUSABLES_RE, "I");
   return /\bI\b|\bI'm\b|\bI'll\b|\bI've\b|\bI'd\b/.test(folded);
 }

package/src/ui/App.tsx

@@ -910,6 +910,21 @@ export function App({
         return;
       }
       if (isSlash(line)) {
+        // Bare /theme, /model, /startup, /retry, /export — repopulate the
+        // input with "<cmd> " so the palette catches the argument chooser
+        // and the user picks via ↑↓ + Enter. Avoids the "print current
+        // value and dead-end" feeling of dispatching the base command.
+        const lower = line.toLowerCase();
+        if (isArgumentParentCommand(lower)) {
+          const filled = `${lower} `;
+          updateDraft({ value: filled, cursor: graphemeLength(filled) });
+          setPaletteIdx(0);
+          addItem(
+            "system",
+            `Pick a ${lower.slice(1)} option below — ↑↓ to choose, Enter to apply, Esc to cancel.`,
+          );
+          return;
+        }
         await handleSlashWithMutation(line);
         return;
       }
@@ -918,7 +933,14 @@ export function App({
       setMsgCount(conversation.length);
       await runLLM();
     },
-    [addItem, conversation, handleSlashWithMutation, runLLM],
+    [
+      addItem,
+      conversation,
+      handleSlashWithMutation,
+      runLLM,
+      setPaletteIdx,
+      updateDraft,
+    ],
   );
 
   const reportSubmitError = useCallback(

package/src/ui/CommandPalette.tsx

@@ -10,7 +10,7 @@ interface Props {
   width?: number;
 }
 
-const COMMAND_HINTS: Record<string, string> = {
+export const COMMAND_HINTS: Record<string, string> = {
   "/help": "open directive list",
   "/clear": "reset transcript",
   "/exit": "close session",
@@ -31,6 +31,15 @@ const COMMAND_HINTS: Record<string, string> = {
   "/copy-last": "copy latest response",
   "/setup": "show config + key source",
   "/update": "bun update -g drexler --latest",
+  "/pet": "open pet deal desk",
+  "/feed": "feed Drexler a deal memo",
+  "/play": "corporate synergy game",
+  "/work": "grind the deal pipeline",
+  "/praise": "affirm Drexler's contributions",
+  "/rest": "strategic nap",
+  "/vibe": "let Drexler pick the move",
+  "/name": "/name Bartholomew",
+  "/profile": "print personnel file",
 };
 
 const ARGUMENT_TITLES: Record<string, { title: string; hint: string }> = {

package/src/ui/MascotIntro.tsx

@@ -171,7 +171,7 @@ const RIGHT_COLUMN_PAD_RIGHT = 1;
 const LEFT_PANEL_MIN_COPY = 24;
 const PET_STATS_MIN_WIDTH = 24;
 const PET_STATS_MAX_WIDTH = 58;
-const PET_SPLIT_DIVIDER_HEIGHT = 17;
+const PET_SPLIT_DIVIDER_HEIGHT = 19;
 const PET_SPLIT_DIVIDER_ROWS: number[] = Array.from(
   { length: PET_SPLIT_DIVIDER_HEIGHT },
   (_, i) => i,

package/src/ui/PetPanel.tsx

@@ -18,7 +18,7 @@ export type Environment = "office" | "home" | "outdoors";
 
 const PANEL_BORDER_COLUMNS = 2;
 const PANEL_PADDING_COLUMNS = 2;
-const SCENE_ROWS = 16;
+const SCENE_ROWS = 18;
 const R_WALL = 0;
 const R_WINDOW_TOP = 1;
 const R_WINDOW_BOTTOM = 4;
@@ -26,7 +26,9 @@ const R_ACTIVITY = 5;
 const R_MASCOT_START = 6;
 const R_DESK_SURFACE = R_MASCOT_START + BRIEFCASE_FINAL.length;
 const R_DESK_FRONT = R_DESK_SURFACE + 1;
-const R_FLOOR = R_DESK_FRONT + 1;
+const R_DESK_DRAWERS = R_DESK_FRONT + 1;
+const R_DESK_BOTTOM = R_DESK_DRAWERS + 1;
+const R_FLOOR = R_DESK_BOTTOM + 1;
 
 export const PET_SCENE_WIDTH = 52;
 
@@ -37,6 +39,14 @@ function place(base: string, text: string, x: number): string {
   return base.slice(0, x) + fit + base.slice(end);
 }
 
+function placeSprite(rows: string[], row: number, x: number, sprite: readonly string[]): void {
+  for (let i = 0; i < sprite.length; i++) {
+    const targetRow = row + i;
+    if (targetRow < 0 || targetRow >= rows.length) continue;
+    rows[targetRow] = place(rows[targetRow] ?? "", sprite[i] ?? "", x);
+  }
+}
+
 function blankRow(width: number): string {
   return " ".repeat(width);
 }
@@ -47,6 +57,13 @@ function padDisplayText(input: string, width: number): string {
   return `${fitted}${" ".repeat(Math.max(0, safeWidth - displayWidth(fitted)))}`;
 }
 
+function centerPadDisplayText(input: string, width: number): string {
+  const safeWidth = Math.max(1, width);
+  const fitted = fitDisplayText(input, safeWidth);
+  const left = Math.max(0, Math.floor((safeWidth - displayWidth(fitted)) / 2));
+  return `${" ".repeat(left)}${fitted}${" ".repeat(Math.max(0, safeWidth - left - displayWidth(fitted)))}`;
+}
+
 function overlayFitted(row: string, text: string, x: number, width: number): string {
   return place(row, padDisplayText(text, width), x);
 }
@@ -98,9 +115,20 @@ function placeBoxLines(
 }
 
 function cupForEnergy(energy: number): string {
-  if (energy > 60) return "[c~]";
-  if (energy > 30) return "[c-]";
-  return "[c_]";
+  if (energy > 60) return "c~";
+  if (energy > 30) return "c-";
+  return "c_";
+}
+
+function analogClockSprite(frame: number): readonly string[] {
+  const hands = [
+    ["│╲│ │", "│ └─│"],
+    ["│ │╱│", "│─┘ │"],
+    ["│ │ │", "│─┼─│"],
+    ["│╲│ │", "│─┘ │"],
+  ] as const;
+  const [upper, lower] = hands[Math.floor(frame / 2) % hands.length] ?? hands[0]!;
+  return ["╭───╮", upper, lower, "╰───╯"];
 }
 
 function progressTicker(frame: number): string {
@@ -207,17 +235,25 @@ function drawOfficeBackground(rows: string[], width: number, frame: number, stat
     Math.max(0, width - displayWidth(`pipe ${dealPct}`) - 1),
   );
 
-  const windowWidth = Math.min(22, Math.max(16, Math.floor(width * 0.36)));
-  const boardWidth = Math.min(28, Math.max(20, width - windowWidth - 6));
-  const boardX = Math.max(windowWidth + 4, width - boardWidth - 2);
+  const compact = width < 62;
+  const windowWidth = compact
+    ? 17
+    : Math.min(30, Math.max(20, Math.floor(width * 0.32)));
+  const boardWidth = compact
+    ? Math.min(25, Math.max(20, width - windowWidth - 5))
+    : Math.min(36, Math.max(26, Math.floor(width * 0.36)));
+  const boardX = Math.max(windowWidth + 3, width - boardWidth - 2);
+  const windowRight = 1 + windowWidth;
+  const gapWidth = boardX - windowRight;
   const cloud = frame % 6 < 3 ? "(~~)" : " (~~)";
   const sun = frame % 12 < 6 ? "\\o/" : "-o-";
+  const city = frame % 10 < 5 ? "▂▄▆ city" : "▃▅▇ city";
   const tape = frame % 8 < 4 ? "▁▃▅▇" : "▂▄▆█";
   const cursor = frame % 4 < 2 ? ">" : "*";
 
   placeBoxLines(rows, R_WINDOW_TOP, 1, windowWidth, "Window", [
-    `${sun} ${cloud}`,
-    "║║  ║║  skyline",
+    `╔╤╤╗ ${sun} ${cloud}`,
+    `║▥▥║ ${city}`,
   ]);
   placeBoxLines(
     rows,
@@ -226,11 +262,16 @@ function drawOfficeBackground(rows: string[], width: number, frame: number, stat
     Math.min(boardWidth, width - boardX),
     "Deal Board",
     [
-      `DL:${dealPct} fees:${Math.round(stats.happiness)}%`,
-      `PIPE ${tape} ${cursor}`,
+      `DL ${dealPct}  FEE ${Math.round(stats.happiness).toString().padStart(3)}%`,
+      `PIPE ${tape} $ ${cursor}`,
     ],
   );
 
+  if (gapWidth >= 5) {
+    const clockX = windowRight + Math.floor((gapWidth - 5) / 2);
+    placeSprite(rows, R_WINDOW_TOP, clockX, analogClockSprite(frame));
+  }
+
   rows[R_ACTIVITY] = centerText(
     "─".repeat(width),
     buildActivityLine("idle", frame),
@@ -238,25 +279,30 @@ function drawOfficeBackground(rows: string[], width: number, frame: number, stat
 }
 
 function drawOfficeFurniture(rows: string[], width: number, frame: number): void {
-  const lampX = 2;
-  const fileX = Math.max(1, width - 10);
-  const lampLight = frame % 8 < 4 ? "\\|/" : " | ";
-  const plantLeaves = frame % 6 < 3 ? "\\|/" : "v|v";
-
-  rows[R_MASCOT_START] = place(rows[R_MASCOT_START], ` ${lampLight} `, lampX);
-  rows[R_MASCOT_START + 1] = place(rows[R_MASCOT_START + 1], " /_\\ ", lampX);
-  rows[R_MASCOT_START + 2] = place(rows[R_MASCOT_START + 2], " /___\\", lampX);
-  rows[R_MASCOT_START + 3] = place(rows[R_MASCOT_START + 3], "   │  ", lampX);
-  rows[R_MASCOT_START + 4] = place(rows[R_MASCOT_START + 4], " ╭IN╮ ", lampX);
-  rows[R_MASCOT_START + 5] = place(rows[R_MASCOT_START + 5], " ╰──╯ ", lampX);
-
-  rows[R_MASCOT_START] = place(rows[R_MASCOT_START], ` ${plantLeaves} `, fileX);
-  rows[R_MASCOT_START + 1] = place(rows[R_MASCOT_START + 1], " \\|/ ", fileX);
-  rows[R_MASCOT_START + 2] = place(rows[R_MASCOT_START + 2], " ╰┬╯ ", fileX);
-  rows[R_MASCOT_START + 3] = place(rows[R_MASCOT_START + 3], "╭FILE╮", fileX - 1);
-  rows[R_MASCOT_START + 4] = place(rows[R_MASCOT_START + 4], "│▤▤▤│", fileX - 1);
-  rows[R_MASCOT_START + 5] = place(rows[R_MASCOT_START + 5], "│▤▤▤│", fileX - 1);
-  rows[R_MASCOT_START + 6] = place(rows[R_MASCOT_START + 6], "╰────╯", fileX - 1);
+  const lampX = 1;
+  const cabinetX = Math.max(1, width - 8);
+  const shade = frame % 8 < 4 ? "╱____╲" : "╱    ╲";
+  const plantTop = frame % 6 < 3 ? " ╲│╱ " : " ╱│╲ ";
+
+  placeSprite(rows, R_MASCOT_START, lampX, [
+    "  ╭──╮ ",
+    ` ${shade}`,
+    " ╰─┬──╯",
+    "   │   ",
+    " ╭─┴─╮ ",
+    " │IN │ ",
+    " ╰───╯ ",
+  ]);
+
+  placeSprite(rows, R_MASCOT_START, cabinetX, [
+    plantTop,
+    "  │  ",
+    " ╭┴╮ ",
+    "╭FILE╮",
+    "│▤▤▤│",
+    "├────┤",
+    "╰────╯",
+  ]);
 }
 
 function drawActivityAccents(
@@ -272,16 +318,16 @@ function drawActivityAccents(
   );
 
   const mascotRight = mascotX + MASCOT_WIDTH;
-  const leftAccentX = Math.max(1, mascotX - 10);
-  const fileX = Math.max(1, width - 10);
-  const rightAccentX = Math.min(fileX - 5, mascotRight + 2);
+  const leftAccentX = Math.max(1, mascotX - 3);
+  const fileX = Math.max(1, width - 8);
+  const rightAccentX = Math.min(fileX - 6, mascotRight + 2);
 
   switch (activity) {
     case "eating":
-      rows[R_MASCOT_START + 5] = place(
-        rows[R_MASCOT_START + 5],
-        "[$] memo",
-        Math.max(1, Math.min(fileX - 8, rightAccentX)),
+      rows[R_MASCOT_START + 3] = place(
+        rows[R_MASCOT_START + 3],
+        "[$]",
+        Math.max(1, Math.min(fileX - 5, rightAccentX + 1)),
       );
       break;
     case "playing":
@@ -330,33 +376,36 @@ function drawDesktopObjects(
 ): void {
   const mascotX = Math.max(0, Math.floor((width - MASCOT_WIDTH) / 2));
   const mascotRight = mascotX + MASCOT_WIDTH;
-  const fileX = Math.max(1, width - 10);
-  const laptopX = Math.max(8, mascotX - 10);
-  const papersX = Math.min(width - 5, mascotX + MASCOT_WIDTH + 1);
-  const coffeeX = fileX - 13;
+  const cabinetX = Math.max(1, width - 8);
+  const laptopX = Math.max(8, mascotX - 9);
+  const papersX = Math.min(cabinetX - 10, mascotRight + 2);
+  const mugX = Math.min(cabinetX - 5, mascotRight + 6);
   const cursor = frame % 2 === 0 ? "_" : " ";
   const screen =
     activity === "working"
-      ? `$>${cursor} DL`
+      ? `$>${cursor}DL`
       : activity === "sleeping"
         ? "zzz..."
         : "DREX";
   const steam = stats.energy > 30
     ? frame % 4 < 2 ? " ((" : "  ))"
     : "    ";
-  const paperFace = frame % 6 < 3 ? "////" : "\\\\\\\\";
+  const paperFace = frame % 6 < 3 ? "▱▱▱" : "▰▱▱";
 
-  rows[R_MASCOT_START + 4] = place(rows[R_MASCOT_START + 4], "╭laptop─╮", laptopX);
-  rows[R_MASCOT_START + 5] = place(
-    rows[R_MASCOT_START + 5],
-    `│${padDisplayText(screen, 7)}│`,
-    laptopX,
-  );
-  rows[R_MASCOT_START + 6] = place(rows[R_MASCOT_START + 6], "╰─┬──┬─╯", laptopX);
-  rows[R_MASCOT_START + 6] = place(rows[R_MASCOT_START + 6], paperFace, papersX);
-  if (coffeeX > mascotRight + 1) {
-    rows[R_MASCOT_START + 4] = place(rows[R_MASCOT_START + 4], steam, coffeeX + 1);
-    rows[R_MASCOT_START + 5] = place(rows[R_MASCOT_START + 5], `coffee ${cupForEnergy(stats.energy)}`, coffeeX);
+  placeSprite(rows, R_MASCOT_START + 4, laptopX, [
+    "╭──────╮",
+    `│${padDisplayText(screen, 6)}│`,
+    "╰─┬──┬─╯",
+  ]);
+
+  if (papersX > mascotRight) {
+    rows[R_MASCOT_START + 6] = place(rows[R_MASCOT_START + 6], paperFace, papersX);
+  }
+
+  if (mugX > mascotRight + 1) {
+    rows[R_MASCOT_START + 4] = place(rows[R_MASCOT_START + 4], steam, mugX + 1);
+    rows[R_MASCOT_START + 5] = place(rows[R_MASCOT_START + 5], `╭${cupForEnergy(stats.energy)}╮`, mugX);
+    rows[R_MASCOT_START + 6] = place(rows[R_MASCOT_START + 6], "╰──╯", mugX);
   }
 }
 
@@ -364,9 +413,11 @@ function drawDesk(rows: string[], width: number, stats: PetStats): void {
   const deskX = width > PET_SCENE_WIDTH ? 2 : 1;
   const deskWidth = Math.max(4, width - deskX * 2);
   const deskInner = Math.max(1, deskWidth - 2);
-  const surface = `papers [///] coffee ${cupForEnergy(stats.energy)} covenants OK`;
-  const centerLabel = `DREXLER DEAL DESK  pipeline ${Math.round(stats.deals)}%`;
-  const front = `[IN] ${centerLabel} [OUT]`;
+  const surface = "▱▱▱        ▬▬▬▬▬    COV OK";
+  const front = `[IN] ║ DREXLER DEAL DESK ║ PIPE ${Math.round(stats.deals)}% ║ [OUT]`;
+  const drawers = width < 68
+    ? "│▤▤│   │▤▤│   │▤▤│"
+    : "│▤▤│   │▤▤│        │▤▤│   │▤▤│";
 
   rows[R_DESK_SURFACE] = place(
     rows[R_DESK_SURFACE],
@@ -378,11 +429,20 @@ function drawDesk(rows: string[], width: number, stats: PetStats): void {
     `│${padDisplayText(front, deskInner)}│`,
     deskX,
   );
-  rows[R_FLOOR] = place(
-    rows[R_FLOOR],
+  rows[R_DESK_DRAWERS] = place(
+    rows[R_DESK_DRAWERS],
+    `│${centerPadDisplayText(drawers, deskInner)}│`,
+    deskX,
+  );
+  rows[R_DESK_BOTTOM] = place(
+    rows[R_DESK_BOTTOM],
     `╰${"─".repeat(Math.max(0, deskInner))}╯`,
     deskX,
   );
+  rows[R_FLOOR] = centerText(
+    rows[R_FLOOR],
+    fitDisplayText("· · · · · · · · · · · · · · · · ·", width),
+  );
 }
 
 function buildScene(
@@ -421,7 +481,13 @@ function rowColor(i: number, activity: PetActivity, frame: number, t: Theme): st
     if (activity === "playing")   return t.primaryLight;
     return t.primaryLight;
   }
-  if (i === R_DESK_SURFACE || i === R_DESK_FRONT) return t.primaryDim;
+  if (
+    i === R_DESK_SURFACE ||
+    i === R_DESK_FRONT ||
+    i === R_DESK_DRAWERS ||
+    i === R_DESK_BOTTOM ||
+    i === R_FLOOR
+  ) return t.primaryDim;
   if (i === R_WALL) return t.dim;
   if (i >= R_WINDOW_TOP && i <= R_WINDOW_BOTTOM) return t.primaryDim;
   return t.primaryDim;