@trawlme/cli 3.2.0 → 3.4.0

package/dist/lib/pinch.d.ts

@@ -3,47 +3,57 @@
  * art. Distinct from Clawd's 8-bit lane: Pinch is drawn with full 24-bit
  * (`\x1b[38;2;r;g;bm` / `\x1b[48;2;r;g;bm`) color blocks, not a fixed palette.
  *
- * The 14×9 cube-grid is packed two grid rows into one terminal row: the
+ * The 9×6 cube-grid (#133 mini) is packed two grid rows into one terminal
+ * row: the
  * upper row's color becomes the half-block's foreground, the lower row's
  * becomes its background, using the upper-half-block glyph '▀' (or '▄' when
- * only the lower half is filled). A 9-row grid therefore renders in 5
- * terminal rows, 14 columns wide. '.' cells are transparent — no color
+ * only the lower half is filled). A 6-row grid therefore renders in 3
+ * terminal rows, 9 columns wide. '.' cells are transparent — no color
  * escape is emitted for that half, so the terminal's own background shows
  * through.
  *
  * Grids + palette are mirrored from trawl_vue
  * `src/modules/trawl/assets/mascot/_src/pinch.model.mjs` (AVCOLORS +
  * AVATAR_GRIDS, rev r6f) — no cross-repo import (cli is a standalone npm
- * package). Claws are 2×2 'O' blocks at cols 0-1 / 12-13, fully outside the
- * body silhouette (on the sides), per r6f.
+ * package). Claws are 1-wide 2-tall 'O' blocks at cols 0 / 8, on the SIDES
+ * (raised for wave/thumbsup/celebrating/shocked), per the r6f shape.
  *
- * See comes-io/trawl_cli#94, comes-io/trawl_cli#122.
+ * State parity (#135): the CLI now carries all 9 canonical AVATAR_STATES
+ * from the source model — idle · working · celebrating · thumbsup · confused
+ * · wave · heart · sleepy · shocked — with the SAME names (before #135 the
+ * CLI shipped 4 states and called `working` "thinking", a name not in the
+ * source). Each is a 9×6 mini redraw preserving that state's distinguishing
+ * feature.
+ *
+ * See comes-io/trawl_cli#94, comes-io/trawl_cli#122, comes-io/trawl_cli#135.
  */
-export type PinchState = 'wave' | 'thinking' | 'celebrating' | 'confused';
+export type PinchState = 'idle' | 'working' | 'celebrating' | 'thumbsup' | 'confused' | 'wave' | 'heart' | 'sleepy' | 'shocked';
+/** All 9 canonical states, in the source model's AVATAR_STATES order. */
+export declare const PINCH_STATES: readonly PinchState[];
 /**
  * Render Pinch as 24-bit ANSI half-block art for the given state, plus a
  * one-line caption. Pure — never touches process.env/stdout; callers must
  * gate on `pinchEnabled()` before printing the result.
  *
- * `frame` is accepted for signature stability but currently unused — every
- * state's grid is static (see `gridForState`).
+ * `frame` only affects `working` (the cyan antenna-tip blip alternates every
+ * frame); every other state's grid is static.
  */
 export declare function renderPinch(state: PinchState, frame?: number): string;
 /**
  * #131 — the ART lines only (no caption), optionally COMPACT: trailing and
  * leading fully-transparent grid rows are dropped so Pinch takes fewer
- * terminal lines (the r6f grids carry an all-'.' bottom row + blank-ish
- * antenna padding). Used by the animation loop, where a caption + full
- * height would be too heavy for a frame redrawn every ~380ms.
+ * terminal lines (some grids carry an all-'.' padding row). Used by the
+ * animation loop, where a caption + full height would be too heavy for a
+ * frame redrawn every ~380ms. `working` is rendered at frame 0 (blip on).
  */
 export declare function renderPinchArt(state: PinchState, opts?: {
     compact?: boolean;
 }): string;
 /**
  * #131 — frame sequence for the "working" animation shown during long waits
- * (the `create` wizard, `--watch`). Reuses the existing r6f state grids: the
- * claws pump up (wave → celebrating) and back down, reading as Pinch busily
- * waving while it works. No new art — just an order over the grids we have.
+ * (the `create` wizard, `--watch`). The claws pump up (working → wave →
+ * celebrating) and back down, reading as Pinch busily working. No new art —
+ * an order over the canonical state grids.
  */
 export declare const WORKING_FRAMES: readonly PinchState[];
 /**

package/dist/lib/pinch.js

@@ -3,97 +3,186 @@
  * art. Distinct from Clawd's 8-bit lane: Pinch is drawn with full 24-bit
  * (`\x1b[38;2;r;g;bm` / `\x1b[48;2;r;g;bm`) color blocks, not a fixed palette.
  *
- * The 14×9 cube-grid is packed two grid rows into one terminal row: the
+ * The 9×6 cube-grid (#133 mini) is packed two grid rows into one terminal
+ * row: the
  * upper row's color becomes the half-block's foreground, the lower row's
  * becomes its background, using the upper-half-block glyph '▀' (or '▄' when
- * only the lower half is filled). A 9-row grid therefore renders in 5
- * terminal rows, 14 columns wide. '.' cells are transparent — no color
+ * only the lower half is filled). A 6-row grid therefore renders in 3
+ * terminal rows, 9 columns wide. '.' cells are transparent — no color
  * escape is emitted for that half, so the terminal's own background shows
  * through.
  *
  * Grids + palette are mirrored from trawl_vue
  * `src/modules/trawl/assets/mascot/_src/pinch.model.mjs` (AVCOLORS +
  * AVATAR_GRIDS, rev r6f) — no cross-repo import (cli is a standalone npm
- * package). Claws are 2×2 'O' blocks at cols 0-1 / 12-13, fully outside the
- * body silhouette (on the sides), per r6f.
+ * package). Claws are 1-wide 2-tall 'O' blocks at cols 0 / 8, on the SIDES
+ * (raised for wave/thumbsup/celebrating/shocked), per the r6f shape.
  *
- * See comes-io/trawl_cli#94, comes-io/trawl_cli#122.
+ * State parity (#135): the CLI now carries all 9 canonical AVATAR_STATES
+ * from the source model — idle · working · celebrating · thumbsup · confused
+ * · wave · heart · sleepy · shocked — with the SAME names (before #135 the
+ * CLI shipped 4 states and called `working` "thinking", a name not in the
+ * source). Each is a 9×6 mini redraw preserving that state's distinguishing
+ * feature.
+ *
+ * See comes-io/trawl_cli#94, comes-io/trawl_cli#122, comes-io/trawl_cli#135.
  */
-/** Grid-char → RGB, ported from AVCOLORS (pinch.model.mjs, rev r6f). */
+/** Grid-char → RGB, ported from AVCOLORS (pinch.model.mjs, rev r6f). 'C'
+ * (cyan) is the `working` thinking-blip — not present in any static grid,
+ * injected per-frame on the antenna tips. */
 const PALETTE = {
     B: [0x29, 0x79, 0xff], // blue — shell
     O: [0xfb, 0x92, 0x3c], // orange — antennae / claws
     W: [0xff, 0xff, 0xff], // white — eye whites
     K: [0x12, 0x30, 0x33], // navy — pupils / mouth / blush-adjacent mouth corner
-    P: [0xf4, 0x72, 0xb6], // pink — blush
+    P: [0xf4, 0x72, 0xb6], // pink — blush / heart-eyes
+    C: [0x06, 0xb6, 0xd4], // cyan — `working` thinking-blip on the antenna tips
 };
 const TRANSPARENT = '.';
+/** All 9 canonical states, in the source model's AVATAR_STATES order. */
+export const PINCH_STATES = [
+    'idle',
+    'working',
+    'celebrating',
+    'thumbsup',
+    'confused',
+    'wave',
+    'heart',
+    'sleepy',
+    'shocked',
+];
 /**
- * Explicit per-state 14×9 grids, ported verbatim from trawl_vue's
- * AVATAR_GRIDS (pinch.model.mjs, rev r6f) — no derivation/mutation from a
- * shared base, so each state stays a straight, auditable copy of its source
- * grid. CLI state → source grid: wave→wave, thinking→working (a.k.a.
- * AVGRID/idle), celebrating→celebrating, confused→confused.
+ * Explicit per-state 9×6 grids (#133 mini shape, #135 full state parity).
+ * The 14×9 grids were ported from trawl_vue's AVATAR_GRIDS (pinch.model.mjs,
+ * rev r6f); these mini redraws preserve each state's feature at a smaller
+ * pixel count. Grid layout (cols 0-8, body/shell cols 1-7):
+ *   row 0  antennae (O at cols 2,6 — spread to 1,7 when drooped)
+ *   row 1  head top      (+ claw at col 0/8 when RAISED)
+ *   row 2  eyes          (+ claw at col 0/8 when RAISED)
+ *   row 3  head mid
+ *   row 4  mouth + blush  (+ claw at col 0/8 when RESTING)
+ *   row 5  head bottom    (+ claw at col 0/8 when RESTING)
+ * Claws are the 1-wide 2-tall O blocks at cols 0/8. Eyes: left = W+K at
+ * cols 2-3, right = K+W at cols 5-6 (pupils inward).
  */
 const GRIDS = {
-    wave: [
-        '....O....O....',
-        '....O....O....',
-        '..BBBBBBBBBB..',
-        '..BWWBBBBWWBOO',
-        '..BWKBBBBKWBOO',
-        '..BBBBBBBBBB..',
-        'OOBBPKBBKPBB..',
-        'OOBBBBKKBBBB..',
-        '..............',
+    // calm resting face, both claws down, normal smile.
+    idle: [
+        '..O...O..',
+        '.BBBBBBB.',
+        '.BWKBKWB.',
+        '.BBBBBBB.',
+        'OBPKKKPBO',
+        'OBBBBBBBO',
     ],
-    // 'thinking' maps to the source's 'working' grid (identical to 'idle').
-    // The frame param is accepted for signature compatibility but ignored — a
-    // static working frame rather than an animated blip (#122, simplified;
-    // the source has no per-frame "thinking" animation to port).
-    thinking: [
-        '....O....O....',
-        '....O....O....',
-        '..BBBBBBBBBB..',
-        '..BWWBBBBWWB..',
-        '..BWKBBBBKWB..',
-        '..BBBBBBBBBB..',
-        'OOBBPKBBKPBBOO',
-        'OOBBBBKKBBBBOO',
-        '..............',
+    // idle pose + the cyan thinking-blip on the antenna tips (frame-toggled in
+    // `gridForState`) — the only animated static state.
+    working: [
+        '..O...O..',
+        '.BBBBBBB.',
+        '.BWKBKWB.',
+        '.BBBBBBB.',
+        'OBPKKKPBO',
+        'OBBBBBBBO',
     ],
+    // both claws raised (rows 1-2) + a big open mouth.
     celebrating: [
-        '....O....O....',
-        '....O....O....',
-        '..BBBBBBBBBB..',
-        'OOBWWBBBBWWBOO',
-        'OOBWKBBBBKWBOO',
-        '..BBBBBBBBBB..',
-        '..BBPKKKKPBB..',
-        '..BBBKKKKBBB..',
-        '..............',
+        '..O...O..',
+        'OBBBBBBBO',
+        'OBWKBKWBO',
+        '.BBBBBBB.',
+        '.BKKKKKB.',
+        '.BBBBBBB.',
+    ],
+    // right claw raised (rows 1-2) + a thumb pixel poking up above it (row 0,
+    // col 8); left claw resting.
+    thumbsup: [
+        '..O...O.O',
+        '.BBBBBBBO',
+        '.BWKBKWBO',
+        '.BBBBBBB.',
+        'OBPKKKPB.',
+        'OBBBBBBB.',
     ],
+    // antennae drooped + spread, flat mouth (no K), claws resting. A '?' is
+    // appended beside the eye line by `renderPinch`.
     confused: [
-        '..............',
-        '...O......O...',
-        '..BBBBBBBBBB..',
-        '..BWWBBBBWWB..',
-        '..BWKBBBBKWB..',
-        '..BBBBBBBBBB..',
-        'OOBBPBBBBPBBOO',
-        'OOBBBBKKBBBBOO',
-        '..............',
+        '.O.....O.',
+        '.BBBBBBB.',
+        '.BWKBKWB.',
+        '.BBBBBBB.',
+        'OBPBBBPBO',
+        'OBBBBBBBO',
+    ],
+    // right claw raised (rows 1-2), left claw resting; base face.
+    wave: [
+        '..O...O..',
+        '.BBBBBBBO',
+        '.BWKBKWBO',
+        '.BBBBBBB.',
+        'OBPKKKPB.',
+        'OBBBBBBB.',
+    ],
+    // pink heart-eyes (P replaces the W+K pupils), claws resting, normal smile.
+    heart: [
+        '..O...O..',
+        '.BBBBBBB.',
+        '.BPPBPPB.',
+        '.BBBBBBB.',
+        'OBPKKKPBO',
+        'OBBBBBBBO',
+    ],
+    // closed eyes (flat K line, no white), antennae drooped + spread, flat
+    // mouth, claws resting — like confused but eyes shut and no '?'.
+    sleepy: [
+        '.O.....O.',
+        '.BBBBBBB.',
+        '.BKKBKKB.',
+        '.BBBBBBB.',
+        'OBPBBBPBO',
+        'OBBBBBBBO',
+    ],
+    // both claws raised (rows 1-2) + a small round mouth (single K, row 4) —
+    // like celebrating's raise but a startled dot mouth, not the wide smile.
+    shocked: [
+        '..O...O..',
+        'OBBBBBBBO',
+        'OBWKBKWBO',
+        '.BBBBBBB.',
+        '.BBBKBBB.',
+        '.BBBBBBB.',
     ],
 };
 const CAPTIONS = {
-    wave: 'Pinch says hi.',
-    thinking: 'Pinch is thinking…',
+    idle: 'Pinch is here.',
+    working: 'Pinch is working…',
     celebrating: 'Pinch is celebrating!',
+    thumbsup: 'Pinch approves!',
     confused: 'Pinch looks confused.',
+    wave: 'Pinch says hi.',
+    heart: 'Pinch loves it.',
+    sleepy: 'Pinch is sleepy…',
+    shocked: 'Pinch is shocked!',
 };
-/** Look up the grid for `state`. `frame` is accepted (signature stability
- * for `renderPinch`) but unused — every current state's grid is static. */
-function gridForState(state, _frame) {
+/** Antenna-tip cells (row 0) for the `working` cyan blip: cols 2 & 6. */
+const ANTENNA_TIP_COLS = [2, 6];
+/** Replace the chars at `indices` in `row` with `ch` — never mutates `row`. */
+function setCells(row, indices, ch) {
+    const chars = row.split('');
+    for (const i of indices)
+        chars[i] = ch;
+    return chars.join('');
+}
+/** Look up the grid for `state`. `frame` only affects `working`: on even
+ * frames its antenna tips blip cyan (the thinking indicator), on odd frames
+ * they stay orange — a 2-frame pulse with no layout shift. Every other
+ * state's grid is static and ignores `frame`. */
+function gridForState(state, frame) {
+    if (state === 'working' && frame % 2 === 0) {
+        const rows = [...GRIDS.working];
+        rows[0] = setCells(rows[0], ANTENNA_TIP_COLS, 'C');
+        return rows;
+    }
     return GRIDS[state];
 }
 const RESET = '\x1b[0m';
@@ -120,7 +209,8 @@ function renderCell(upper, lower) {
         return `${fgCode(lowerColor)}▄${RESET}`;
     return `${fgCode(upperColor)}${bgCode(lowerColor)}▀${RESET}`;
 }
-/** Pack a 9-row grid into 5 terminal lines (rows 0-1, 2-3, 4-5, 6-7, 8-blank). */
+/** Pack a grid into terminal lines, 2 grid rows per line (upper=fg, lower=bg).
+ * The #133 mini grid is 6 rows → 3 lines. */
 function renderGrid(rows) {
     const lines = [];
     for (let i = 0; i < rows.length; i += 2) {
@@ -139,27 +229,25 @@ function renderGrid(rows) {
  * one-line caption. Pure — never touches process.env/stdout; callers must
  * gate on `pinchEnabled()` before printing the result.
  *
- * `frame` is accepted for signature stability but currently unused — every
- * state's grid is static (see `gridForState`).
+ * `frame` only affects `working` (the cyan antenna-tip blip alternates every
+ * frame); every other state's grid is static.
  */
 export function renderPinch(state, frame = 0) {
     const grid = gridForState(state, frame);
     const lines = renderGrid(grid);
     if (state === 'confused') {
-        // "beside the art" — a bold '?' to the right of the eye row (grid rows
-        // 4-5 pack into terminal line index 2, unchanged by the r6f grid — the
-        // antenna/shell/eye/claw row layout stayed the same, only width + claw
-        // placement changed).
-        lines[2] = `${lines[2]}  \x1b[1m?${RESET}`;
+        // "beside the art" — a bold '?' to the right of the eye row. In the #133
+        // mini grid the eyes are grid rows 2-3, which pack into terminal line 1.
+        lines[1] = `${lines[1]}  \x1b[1m?${RESET}`;
     }
     return [...lines, CAPTIONS[state]].join('\n');
 }
 /**
  * #131 — the ART lines only (no caption), optionally COMPACT: trailing and
  * leading fully-transparent grid rows are dropped so Pinch takes fewer
- * terminal lines (the r6f grids carry an all-'.' bottom row + blank-ish
- * antenna padding). Used by the animation loop, where a caption + full
- * height would be too heavy for a frame redrawn every ~380ms.
+ * terminal lines (some grids carry an all-'.' padding row). Used by the
+ * animation loop, where a caption + full height would be too heavy for a
+ * frame redrawn every ~380ms. `working` is rendered at frame 0 (blip on).
  */
 export function renderPinchArt(state, opts = {}) {
     let grid = gridForState(state, 0);
@@ -175,16 +263,16 @@ export function renderPinchArt(state, opts = {}) {
     }
     const lines = renderGrid(grid);
     if (state === 'confused')
-        lines[2] = `${lines[2]}  \x1b[1m?${RESET}`;
+        lines[1] = `${lines[1]}  \x1b[1m?${RESET}`;
     return lines.join('\n');
 }
 /**
  * #131 — frame sequence for the "working" animation shown during long waits
- * (the `create` wizard, `--watch`). Reuses the existing r6f state grids: the
- * claws pump up (wave → celebrating) and back down, reading as Pinch busily
- * waving while it works. No new art — just an order over the grids we have.
+ * (the `create` wizard, `--watch`). The claws pump up (working → wave →
+ * celebrating) and back down, reading as Pinch busily working. No new art —
+ * an order over the canonical state grids.
  */
-export const WORKING_FRAMES = ['thinking', 'wave', 'celebrating', 'wave'];
+export const WORKING_FRAMES = ['working', 'wave', 'celebrating', 'wave'];
 /**
  * True when it's safe to print Pinch art: a real color-capable interactive
  * terminal. False under NO_COLOR (https://no-color.org — presence, not

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trawlme/cli",
-  "version": "3.2.0",
+  "version": "3.4.0",
   "description": "Trawl CLI — manage scraps from the terminal",
   "type": "module",
   "bin": {