drexler 0.2.21 → 0.2.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drexler",
-  "version": "0.2.21",
+  "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/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/PetPanel.tsx

@@ -120,6 +120,17 @@ function cupForEnergy(energy: number): string {
   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 {
   const dots = ".............";
   const idx = frame % dots.length;
@@ -226,10 +237,10 @@ function drawOfficeBackground(rows: string[], width: number, frame: number, stat
 
   const compact = width < 62;
   const windowWidth = compact
-    ? 18
+    ? 17
     : Math.min(30, Math.max(20, Math.floor(width * 0.32)));
   const boardWidth = compact
-    ? Math.min(26, Math.max(20, width - windowWidth - 5))
+    ? 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;
@@ -256,14 +267,9 @@ function drawOfficeBackground(rows: string[], width: number, frame: number, stat
     ],
   );
 
-  if (gapWidth >= 7) {
+  if (gapWidth >= 5) {
     const clockX = windowRight + Math.floor((gapWidth - 5) / 2);
-    const hour = frame % 8 < 4 ? "09" : "10";
-    placeSprite(rows, R_WINDOW_TOP, clockX, [
-      "╭──╮",
-      `│${hour}│`,
-      "╰──╯",
-    ]);
+    placeSprite(rows, R_WINDOW_TOP, clockX, analogClockSprite(frame));
   }
 
   rows[R_ACTIVITY] = centerText(
@@ -275,12 +281,12 @@ function drawOfficeBackground(rows: string[], width: number, frame: number, stat
 function drawOfficeFurniture(rows: string[], width: number, frame: number): void {
   const lampX = 1;
   const cabinetX = Math.max(1, width - 8);
-  const shade = frame % 8 < 4 ? "╭░░░░╮" : "╭▒▒▒▒╮";
+  const shade = frame % 8 < 4 ? "╱____╲" : "╱    ╲";
   const plantTop = frame % 6 < 3 ? " ╲│╱ " : " ╱│╲ ";
 
   placeSprite(rows, R_MASCOT_START, lampX, [
-    `  ${shade} `,
-    " ╱▒▒▒▒╲",
+    "  ╭──╮ ",
+    ` ${shade}`,
     " ╰─┬──╯",
     "   │   ",
     " ╭─┴─╮ ",
@@ -290,12 +296,12 @@ function drawOfficeFurniture(rows: string[], width: number, frame: number): void
 
   placeSprite(rows, R_MASCOT_START, cabinetX, [
     plantTop,
-    " ╲│╱ ",
-    " ╰┬╯ ",
+    "  │  ",
+    " ╭┴╮ ",
     "╭FILE╮",
     "│▤▤▤│",
     "├────┤",
-    "│▤▤▤│",
+    "╰────╯",
   ]);
 }
 
@@ -318,9 +324,9 @@ function drawActivityAccents(
 
   switch (activity) {
     case "eating":
-      rows[R_MASCOT_START + 5] = place(
-        rows[R_MASCOT_START + 5],
-        "╭$╮",
+      rows[R_MASCOT_START + 3] = place(
+        rows[R_MASCOT_START + 3],
+        "[$]",
         Math.max(1, Math.min(fileX - 5, rightAccentX + 1)),
       );
       break;
@@ -398,8 +404,8 @@ function drawDesktopObjects(
 
   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], "╭─╮", mugX);
-    rows[R_MASCOT_START + 6] = place(rows[R_MASCOT_START + 6], `╰${cupForEnergy(stats.energy)}╯`, mugX);
+    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);
   }
 }
 
@@ -407,11 +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 = `▱▱▱    [${cupForEnergy(stats.energy)}]    ▬▬▬▬▬    COV OK`;
+  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],
@@ -435,7 +441,7 @@ function drawDesk(rows: string[], width: number, stats: PetStats): void {
   );
   rows[R_FLOOR] = centerText(
     rows[R_FLOOR],
-    fitDisplayText("░░░░░░░ deal-room carpet shadow ░░░░░░░", width),
+    fitDisplayText("· · · · · · · · · · · · · · · · ·", width),
   );
 }