@trawlme/cli 2.3.0 → 2.4.0

package/dist/commands/create.js

@@ -5,6 +5,7 @@ import { api, LONG_RUN_TIMEOUT_MS, NetworkError } from '../lib/api.js';
 import { json } from '../lib/format.js';
 import { requireUrl, requireString } from '../lib/validate.js';
 import { UsageError } from '../lib/errors.js';
+import { renderPinch, pinchEnabled } from '../lib/pinch.js';
 /** Best-effort, honest first-run summary — never claims a background retry
  * happened when auto-fix was disabled for this call, and never claims a
  * scrap was persisted when the response carries none (#114-F3 — a hard
@@ -129,6 +130,14 @@ export const create = new Command('create')
         data = await call();
     }
     else {
+        // #122 — Pinch shows up front, working, while the server-side wizard
+        // runs (legitimately 30-250s+, see LONG_RUN_TIMEOUT_MS above). Belt-
+        // and-suspenders `!opts.json` alongside pinchEnabled(): we're already
+        // inside the non-`--json` branch, but the check is kept explicit here
+        // too so stdout purity under `--json` (#106-F2/#121) never depends on
+        // this code staying inside that branch.
+        if (!opts.json && pinchEnabled())
+            console.log(renderPinch('thinking'));
         try {
             data = await spin(call, {
                 text: `Creating a scrap from ${url}…`,
@@ -192,6 +201,13 @@ export const create = new Command('create')
             console.log(chalk.yellow(`  Note:       `) +
                 `Auto-fix is retrying in the background — do NOT re-run create; poll ${pollTarget}.`);
         }
+        // #122 — Pinch reacts to the HONEST first-run outcome (same signal the
+        // ✓/✗ line above already renders): celebrates a real success, looks
+        // confused on a genuine failure. Belt-and-suspenders `!opts.json`
+        // alongside pinchEnabled() — see the 'thinking' print above for why.
+        if (!opts.json && pinchEnabled()) {
+            console.log(data.success ? renderPinch('celebrating') : renderPinch('confused'));
+        }
     }
     // Honest exit code alongside the honest payload — a --json caller gets
     // the raw body regardless (never wrapped/altered), but a script checking

package/dist/lib/pinch.d.ts

@@ -3,15 +3,21 @@
  * 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 12×9 cube-grid (AVGRID proto v11.4, locked 2026-07-16) 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, 12 columns wide. '.' cells
- * are transparent — no color escape is emitted for that half, so the
- * terminal's own background shows through.
+ * The 14×9 cube-grid 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
+ * escape is emitted for that half, so the terminal's own background shows
+ * through.
  *
- * See comes-io/trawl_cli#94.
+ * 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.
+ *
+ * See comes-io/trawl_cli#94, comes-io/trawl_cli#122.
  */
 export type PinchState = 'wave' | 'thinking' | 'celebrating' | 'confused';
 /**
@@ -19,8 +25,8 @@ export type PinchState = 'wave' | 'thinking' | 'celebrating' | 'confused';
  * one-line caption. Pure — never touches process.env/stdout; callers must
  * gate on `pinchEnabled()` before printing the result.
  *
- * `frame` only affects 'thinking' (2-frame spinner alternation); every other
- * state ignores it.
+ * `frame` is accepted for signature stability but currently unused — every
+ * state's grid is static (see `gridForState`).
  */
 export declare function renderPinch(state: PinchState, frame?: number): string;
 /**

package/dist/lib/pinch.js

@@ -3,76 +3,98 @@
  * 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 12×9 cube-grid (AVGRID proto v11.4, locked 2026-07-16) 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, 12 columns wide. '.' cells
- * are transparent — no color escape is emitted for that half, so the
- * terminal's own background shows through.
+ * The 14×9 cube-grid 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
+ * escape is emitted for that half, so the terminal's own background shows
+ * through.
  *
- * See comes-io/trawl_cli#94.
+ * 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.
+ *
+ * See comes-io/trawl_cli#94, comes-io/trawl_cli#122.
  */
-/** Grid-char → RGB. 'C' (cyan) is a "thinking" blip, not present in BASE_GRID. */
+/** Grid-char → RGB, ported from AVCOLORS (pinch.model.mjs, rev r6f). */
 const PALETTE = {
-    B: [0x3b, 0x82, 0xf6], // blue — shell
-    O: [0xee, 0x90, 0x18], // orange — antennae / claws
+    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
-    P: [0xf9, 0xa8, 0xd4], // pink — claw tips
-    C: [0x08, 0x91, 0xb2], // cyan — thinking-spinner antenna blip
+    K: [0x12, 0x30, 0x33], // navy — pupils / mouth / blush-adjacent mouth corner
+    P: [0xf4, 0x72, 0xb6], // pink — blush
 };
 const TRANSPARENT = '.';
-/** Base 12×9 grid — Pinch waving (also the 'wave' state, unmodified). */
-const BASE_GRID = [
-    '...O....O...',
-    '...O....O...',
-    '.BBBBBBBBBB.',
-    '.BWWBBBBWWB.',
-    '.BWKBBBBKWB.',
-    '.PBBBBBBBBP.',
-    '.BBBKBBKBBB.',
-    '.BBBBKKBBBB.',
-    'OO........OO',
-];
+/**
+ * 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.
+ */
+const GRIDS = {
+    wave: [
+        '....O....O....',
+        '....O....O....',
+        '..BBBBBBBBBB..',
+        '..BWWBBBBWWBOO',
+        '..BWKBBBBKWBOO',
+        '..BBBBBBBBBB..',
+        'OOBBPKBBKPBB..',
+        'OOBBBBKKBBBB..',
+        '..............',
+    ],
+    // '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',
+        '..............',
+    ],
+    celebrating: [
+        '....O....O....',
+        '....O....O....',
+        '..BBBBBBBBBB..',
+        'OOBWWBBBBWWBOO',
+        'OOBWKBBBBKWBOO',
+        '..BBBBBBBBBB..',
+        '..BBPKKKKPBB..',
+        '..BBBKKKKBBB..',
+        '..............',
+    ],
+    confused: [
+        '..............',
+        '...O......O...',
+        '..BBBBBBBBBB..',
+        '..BWWBBBBWWB..',
+        '..BWKBBBBKWB..',
+        '..BBBBBBBBBB..',
+        'OOBBPBBBBPBBOO',
+        'OOBBBBKKBBBBOO',
+        '..............',
+    ],
+};
 const CAPTIONS = {
     wave: 'Pinch says hi.',
     thinking: 'Pinch is thinking…',
     celebrating: 'Pinch is celebrating!',
     confused: 'Pinch looks confused.',
 };
-/** 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('');
-}
-/** Derive the per-state grid from BASE_GRID (which is never mutated). */
-function gridForState(state, frame) {
-    const rows = [...BASE_GRID];
-    switch (state) {
-        case 'thinking':
-            // Odd frames: both antenna tips (row 0, cols 3 & 8) blip cyan — a
-            // 2-frame spinner alternation with no layout shift.
-            if (frame % 2 === 1) {
-                rows[0] = setCells(rows[0], [3, 8], 'C');
-            }
-            return rows;
-        case 'celebrating':
-            // Fists up: the row-8 corner claws move up to row 7's corners; row 8's
-            // corners go transparent (arms raised, no longer at the sides).
-            rows[7] = setCells(rows[7], [0, 11], 'O');
-            rows[8] = setCells(rows[8], [0, 1, 10, 11], TRANSPARENT);
-            return rows;
-        case 'confused':
-            // Pupils removed (row 4, cols 3 & 8) — blank white eyes.
-            rows[4] = setCells(rows[4], [3, 8], 'W');
-            return rows;
-        case 'wave':
-        default:
-            return rows;
-    }
+/** 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) {
+    return GRIDS[state];
 }
 const RESET = '\x1b[0m';
 const fgCode = ([r, g, b]) => `\x1b[38;2;${r};${g};${b}m`;
@@ -117,15 +139,17 @@ function renderGrid(rows) {
  * one-line caption. Pure — never touches process.env/stdout; callers must
  * gate on `pinchEnabled()` before printing the result.
  *
- * `frame` only affects 'thinking' (2-frame spinner alternation); every other
- * state ignores it.
+ * `frame` is accepted for signature stability but currently unused — every
+ * state's grid is static (see `gridForState`).
  */
 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).
+        // 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}`;
     }
     return [...lines, CAPTIONS[state]].join('\n');

package/package.json

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