@khanglvm/relay 0.13.8 → 0.13.9

package/README.md

@@ -89,7 +89,7 @@ Node ≥ 18; Chart.js / Mermaid / Graphviz are vendored and lazy-loaded offline.
 | | |
 |---|---|
 | `rly help` | every command at a glance |
-| `rly git pick` / `rly git cherry-pick` | choose commit actions and rank the order directly on a board |
+| `rly git pick` / `rly git cherry-pick` | choose commit actions and rank the order directly on a board; add `--code` to cherry-pick with split code review and per-hunk Apply/Skip/Hold |
 | `rly git conflict [files…]` | auto-detect unmerged conflict files, or open specific local paths, and return resolved content in `result.blockEdits` |
 | `rly view <file.md> …` | open a quick read-only board that renders local markdown file(s), data files, or PDFs — library-free; great for plans, READMEs, reports, quotes |
 | `rly install --target <agent>` | write relay's rules into an agent's instruction file — `claude` `codex` `cursor` `copilot` `kiro` `windsurf` `cline` `gemini` `opencode` `droid` `agents`; `--all`, `--scope`, `--print`, `--list` |

package/docs/AGENT.md

@@ -166,6 +166,7 @@ Pick/cherry-pick commits or resolve conflicts on a board:
 ```sh
 rly git pick --limit 20               # checklist: pick/cherry-pick/drop + rank order
 rly git cherry-pick main..feature     # checklist: cherry-pick/skip/hold + rank order
+rly git cherry-pick --code main..feature # adds split code review with Apply/Skip/Hold per hunk
 rly git conflict                      # auto-detect unmerged files with conflict markers
 rly git conflict src/app.js           # resolve a specific conflicted file
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@khanglvm/relay",
-  "version": "0.13.8",
+  "version": "0.13.9",
   "description": "Question boards with rich blocks (markdown, charts, mermaid, tables, code, diffs, video, sandboxed HTML), clickable local file-links, and element-level annotations for AI coding agents (Claude Code, Codex, …): ask users structured questions, present interactive visuals, collect inline comments, read answers as JSON — in a local browser board OR rendered INLINE inside the Claude & Codex apps as an MCP App (SEP-1865).",
   "keywords": [
     "ai-agents",

package/skills/relay/SKILL.md

@@ -46,7 +46,7 @@ at — show it in a relay board instead of printing it.**
 | Gather requirements / plan approval / feedback round | **rly** |
 | Architecture or flow that benefits from a diagram | **rly** (mermaid block) |
 | "Show me the diff" / git diff / code changes / before-after | **rly** (`diff` block — run `git diff`, render it; never dump it in the terminal) |
-| Pick/cherry-pick commits or resolve conflict files | **rly git** (`rly git pick`, `rly git cherry-pick`, `rly git conflict`) |
+| Pick/cherry-pick commits or resolve conflict files | **rly git** (`rly git pick`, `rly git cherry-pick --code`, `rly git conflict`) |
 | A demo, screen recording or walkthrough | **rly** (`video` block) |
 | Point the user at a file to open (log, capture, report) | **rly** (a clickable local file-link in markdown) |
 | Let the user read a markdown file (README, plan, report) | **rly view file.md** (or a `markdown` block with `mdFile`) — never dump the file into the terminal |

package/src/cli.js

@@ -313,6 +313,19 @@ function gitCommitRows(range, limit) {
     .filter((r) => r.sha && r.short);
 }
 
+function gitCommitDiff(commit) {
+  return runGit([
+    '--no-pager',
+    'show',
+    '--format=',
+    '--patch',
+    '--find-renames',
+    '--find-copies',
+    '--no-ext-diff',
+    commit,
+  ], `git show ${commit} failed`).trimEnd();
+}
+
 async function cmdGit(rest) {
   const args = parseArgs(rest);
   const modes = new Set(['pick', 'cherry-pick', 'cherrypick', 'conflict', 'conflicts', 'resolve']);
@@ -323,11 +336,13 @@ async function cmdGit(rest) {
 
   const blocks = [];
   const questions = [];
+  let reviewDiffCount = 0;
 
   if (mode === 'pick' || mode === 'cherry-pick') {
     const range = args.range || args._[0] || '';
     const commits = gitCommitRows(range, args.limit);
     if (!commits.length) throw new CliError(`git log${range ? ` ${range}` : ''} produced no commits to show.`);
+    const withCode = args.code === true || args.patch === true || args.diff === true;
     blocks.push({
       type: 'table',
       columns: ['short', 'date', 'author', 'subject'],
@@ -351,13 +366,32 @@ async function cmdGit(rest) {
         ? [{ value: 'cherry-pick', label: 'Cherry-pick', tone: 'ok' }, { value: 'skip', label: 'Skip', tone: 'muted' }, { value: 'hold', label: 'Hold', tone: 'warn' }]
         : [{ value: 'pick', label: 'Pick', tone: 'ok' }, { value: 'cherry-pick', label: 'Cherry-pick', tone: 'warn' }, { value: 'drop', label: 'Drop', tone: 'bad' }],
     });
-    questions.push({
-      id: 'commit_order',
-      type: 'rank',
-      label: mode === 'cherry-pick' ? 'Cherry-pick order' : 'Preferred commit order',
-      description: 'Drag or move commits into the order the agent should apply them.',
-      options,
-    });
+    if (options.length > 1) {
+      questions.push({
+        id: 'commit_order',
+        type: 'rank',
+        label: mode === 'cherry-pick' ? 'Cherry-pick order' : 'Preferred commit order',
+        description: 'Drag or move commits into the order the agent should apply them.',
+        options,
+      });
+    }
+    if (withCode) {
+      for (const c of commits) {
+        const diff = gitCommitDiff(c.sha);
+        if (!diff.trim()) continue;
+        blocks.push({
+          type: 'diff',
+          title: `${c.short} ${c.subject}`,
+          filename: `${c.short} ${c.subject}`,
+          commit: c.sha,
+          reviewKind: mode,
+          review: true,
+          view: 'split',
+          diff,
+        });
+        reviewDiffCount++;
+      }
+    }
   }
 
   const paths = mode === 'conflict' ? gitConflictPaths(args._) : gitConflictPaths([]);
@@ -381,7 +415,9 @@ async function cmdGit(rest) {
     : mode === 'cherry-pick' ? 'Cherry-pick commits' : 'Pick commits');
   const intro = args.intro || (conflictCount
     ? 'Resolve each conflict on the board. The submitted result includes result.blockEdits with per-hunk choices and a full resolved file preview for every conflict block.'
-    : 'Pick commit actions and order on the board. Submit returns the selected actions and rank order as JSON.');
+    : reviewDiffCount
+      ? 'Review commit code hunks on the board. Apply, skip, or hold each hunk; submit returns commit actions plus diff-review hunk choices as JSON.'
+      : 'Pick commit actions and order on the board. Submit returns the selected actions and rank order as JSON.');
   const spec = normalizeSpec({ title, intro, blocks, questions, submitLabel: 'Submit git choices' });
   await assertSpecReady(spec);
   const record = createBoard(spec);
@@ -1515,6 +1551,7 @@ USAGE
                                       --title; other args pass to git: rly diff --staged | HEAD~1 | -- path)
   rly git pick [range]                board for choosing pick/cherry-pick/drop actions plus commit order
   rly git cherry-pick [range]         board for choosing commits and cherry-pick order
+                                      add --code for split code view with per-hunk Apply/Skip/Hold
   rly git conflict [files…]           board for resolving conflict-marker files; with no files, auto-detects
                                       unmerged git files and returns resolved content in result.blockEdits
   rly wait <id> [--timeout 3600]      block until board finishes, print result JSON

package/src/server.js

@@ -218,9 +218,40 @@ function sanitizeConflictResolution(value) {
   return Object.keys(out.resolutions).length ? out : null;
 }
 
+function sanitizeDiffReview(value) {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return null;
+  if (value.type !== 'diff-review') return null;
+  const out = {
+    type: 'diff-review',
+    reviewKind: limitString(value.reviewKind, 80),
+    commit: limitString(value.commit, 120),
+    title: limitString(value.title, 500),
+    resolved: value.resolved === true,
+    hunks: {},
+  };
+  const raw = value.hunks && typeof value.hunks === 'object' && !Array.isArray(value.hunks)
+    ? value.hunks
+    : {};
+  let n = 0;
+  for (const id of Object.keys(raw)) {
+    if (n >= 500) break;
+    const h = raw[id];
+    if (!h || typeof h !== 'object' || Array.isArray(h)) continue;
+    const choice = limitString(h.choice, 30);
+    if (!['apply', 'skip', 'hold'].includes(choice)) continue;
+    out.hunks[limitString(id, 80)] = {
+      choice,
+      file: limitString(h.file, 1200),
+      header: limitString(h.header, 500),
+    };
+    n++;
+  }
+  return Object.keys(out.hunks).length ? out : null;
+}
+
 // Validates + sanitizes an incoming blockEdits map (from draft/submit).
 // String values are editable Mermaid source. Structured git-conflict-resolution
-// values carry per-hunk choices plus resolved file content. Caps prevent a draft
+// and diff-review values carry bounded per-hunk choices. Caps prevent a draft
 // from bloating board storage; invalid entries are dropped.
 function sanitizeBlockEdits(value) {
   if (value === null || typeof value !== 'object' || Array.isArray(value)) return {};
@@ -234,7 +265,7 @@ function sanitizeBlockEdits(value) {
       if (v.length > 20000) continue;
       out[key] = v;
     } else {
-      const edit = sanitizeConflictResolution(v);
+      const edit = sanitizeConflictResolution(v) || sanitizeDiffReview(v);
       if (!edit) continue;
       out[key] = edit;
     }

package/src/spec.js

@@ -492,6 +492,10 @@ function normalizeBlock(rawBlock, id, cwd, where) {
     const block = { id, type: 'diff', diff };
     if (rawBlock.lang !== undefined) block.lang = asStr(rawBlock.lang);
     if (rawBlock.filename !== undefined) block.filename = asStr(rawBlock.filename);
+    if (rawBlock.title !== undefined) block.title = asStr(rawBlock.title);
+    if (rawBlock.review === true) block.review = true;
+    if (rawBlock.reviewKind !== undefined) block.reviewKind = asStr(rawBlock.reviewKind);
+    if (rawBlock.commit !== undefined) block.commit = asStr(rawBlock.commit);
     const view = asStr(rawBlock.view).trim().toLowerCase();
     if (view === 'split' || view === 'unified') block.view = view;
     if (hasHeight) block.height = clampInt(rawBlock.height, BLOCK_HEIGHT.min, BLOCK_HEIGHT.max, undefined);
@@ -1035,6 +1039,9 @@ const BLOCK_SCHEMA = {
       diff: { type: 'string', description: 'diff: a unified diff (git diff / diff -u output) — rendered as a colored, line-numbered comparison with +added / −removed / context rows and file/hunk headers. No git needed; just write/paste the diff text.' },
       diffFile: { type: 'string', description: 'diff: path to a local file containing a unified diff (alternative to "diff"). Resolved against the CWD.' },
       view: { type: 'string', enum: ['unified', 'split'], description: 'diff: initial layout — "unified" (default, one column) or "split" (side-by-side old vs new). The viewer also has a live toggle either way.' },
+      review: { type: 'boolean', description: 'diff: when true, render per-hunk Apply / Skip / Hold controls and return choices in result.blockEdits[blockId] as {type:"diff-review", hunks:{...}}. Used by `rly git cherry-pick --code`.' },
+      reviewKind: { type: 'string', description: 'diff review: optional label for the review workflow, such as "cherry-pick" or "pick".' },
+      commit: { type: 'string', description: 'diff review: optional commit SHA associated with this diff.' },
       content: { type: 'string', description: 'git-conflict: inline file content containing conflict markers (<<<<<<< / ======= / >>>>>>>). The board auto-detects each hunk and returns resolutions in result.blockEdits[blockId].' },
       text: { type: 'string', description: 'git-conflict: alias for inline "content".' },
       file: { type: 'string', description: 'git-conflict: local conflicted file path to load, parse, and resolve. Resolved against the CWD.' },
@@ -1179,7 +1186,7 @@ export const SPEC_SCHEMA = {
       type: 'object',
       readOnly: true,
       description:
-        'Returned in the result (not part of the input spec). A map blockId→edited block payload. Editable mermaid blocks return edited source strings. git-conflict blocks return {type:"git-conflict-resolution", resolutions, content, resolved, filename, file}. null when the user made no edits.',
+        'Returned in the result (not part of the input spec). A map blockId→edited block payload. Editable mermaid blocks return edited source strings. git-conflict blocks return {type:"git-conflict-resolution", resolutions, content, resolved, filename, file}. diff review blocks return {type:"diff-review", hunks, resolved, commit}. null when the user made no edits.',
     },
   },
   anyOf: [{ required: ['questions'] }, { required: ['blocks'] }, { required: ['html'] }, { required: ['htmlFile'] }],

package/src/ui/blocks.css

@@ -260,6 +260,68 @@
 }
 .diff-file-chip:hover { color: var(--accent); border-color: var(--accent); }
 
+/* diff review: cherry-pick/apply hunk choices on top of the diff renderer */
+.diff-review-head {
+  align-items: flex-start;
+}
+.diff-review-topactions {
+  display: flex; flex-wrap: wrap; justify-content: flex-end; align-items: center; gap: 6px;
+}
+.diff-review-status {
+  flex: none; border: 1px solid rgba(185, 145, 63, 0.34);
+  background: rgba(185, 145, 63, 0.12); color: var(--warn);
+  border-radius: 999px; padding: 3px 8px; font-size: 0.72rem; font-weight: 760;
+}
+.diff-review-status.is-complete {
+  border-color: rgba(77, 138, 102, 0.42);
+  background: rgba(77, 138, 102, 0.14); color: var(--ok);
+}
+.diff-review-btn {
+  flex: none; cursor: pointer; font: inherit; font-size: 0.72rem; font-weight: 700;
+  color: var(--fg-2); background: var(--card);
+  border: 1px solid var(--border); border-radius: 6px; padding: 2px 8px;
+  transition: color 150ms var(--ease), border-color 150ms var(--ease), background 150ms var(--ease);
+}
+.diff-review-btn:hover {
+  color: var(--accent); border-color: var(--accent);
+}
+.diff-review-choice.sel {
+  color: var(--accent); border-color: var(--accent); background: var(--accent-soft);
+}
+.diff-review-list {
+  border: 1px solid var(--border); border-radius: 0 0 10px 10px;
+  overflow: hidden; background: var(--bg-sunken);
+}
+.diff-review-hunk + .diff-review-hunk {
+  border-top: 1px solid var(--border);
+}
+.diff-review-hunkbar {
+  display: flex; justify-content: space-between; align-items: center; gap: 10px;
+  padding: 6px 8px 6px 12px; background: var(--card); border-bottom: 1px solid var(--border);
+}
+.diff-review-hunkmeta {
+  min-width: 0; display: flex; flex-wrap: wrap; align-items: center; gap: 8px;
+  font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+}
+.diff-review-file {
+  max-width: 360px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
+  color: var(--fg-2); font-size: 0.76rem; font-weight: 760;
+}
+.diff-review-header {
+  color: var(--muted); font-size: 0.72rem;
+}
+.diff-review-actions {
+  flex: none; display: flex; flex-wrap: wrap; justify-content: flex-end; gap: 6px;
+}
+.diff-review-hunk .blk-difftable {
+  min-width: 760px;
+}
+@media (max-width: 720px) {
+  .diff-review-head, .diff-review-hunkbar { flex-direction: column; align-items: flex-start; }
+  .diff-review-topactions, .diff-review-actions { justify-content: flex-start; }
+  .diff-review-file { max-width: 100%; }
+}
+
 /* ---------- git conflict resolver ---------- */
 .gitconf {
   border: 1px solid var(--border); border-radius: 10px; overflow: hidden;

package/src/ui/blocks.js

@@ -582,8 +582,159 @@
   // Per-file header lines are redundant once we render a filename header bar.
   const DIFF_NOISE = /^(diff --git |index |--- |\+\+\+ )/;
 
+  function buildDiffReviewHunks(files, block) {
+    const hunks = [];
+    files.forEach((f) => {
+      const name = f.name || (files.length === 1 ? (block.filename || '') : '') || 'file';
+      let rows = parseDiff(f.text);
+      if (name) rows = rows.filter((r) => !(r.kind === 'meta' && DIFF_NOISE.test(r.text)));
+      let current = null;
+      const push = () => {
+        if (!current) return;
+        const hasChange = current.rows.some((r) => r.kind === 'add' || r.kind === 'del');
+        if (hasChange) hunks.push(current);
+        current = null;
+      };
+      rows.forEach((r) => {
+        if (r.kind === 'hunk') {
+          push();
+          current = { id: 'h' + (hunks.length + 1), file: name, header: r.text, rows: [r] };
+        } else if (current) {
+          current.rows.push(r);
+        } else if (r.kind === 'add' || r.kind === 'del' || r.kind === 'ctx') {
+          current = { id: 'h' + (hunks.length + 1), file: name, header: 'Change', rows: [r] };
+        }
+      });
+      push();
+    });
+    return hunks;
+  }
+
+  function renderDiffReview(block, ctx, blockId, files) {
+    const hunks = buildDiffReviewHunks(files, block);
+    let view = block.view === 'split' ? 'split' : 'unified';
+    const prior = ctx && ctx.edits && ctx.edits[blockId] && typeof ctx.edits[blockId] === 'object'
+      ? ctx.edits[blockId]
+      : {};
+    const choices = prior.hunks && typeof prior.hunks === 'object' ? { ...prior.hunks } : {};
+    const buttonsByHunk = new Map();
+    const wrap = el('div', { class: 'blk-codewrap blk-diffwrap diff-review' });
+    const status = el('span', { class: 'diff-review-status' }, '');
+    const list = el('div', { class: 'diff-review-list' });
+
+    const emit = () => {
+      const picked = {};
+      hunks.forEach((h) => {
+        const r = choices[h.id];
+        if (!r || !['apply', 'skip', 'hold'].includes(r.choice)) return;
+        picked[h.id] = { choice: r.choice, file: h.file, header: h.header };
+      });
+      const touched = Object.keys(picked).length;
+      const payload = touched
+        ? {
+            type: 'diff-review',
+            reviewKind: block.reviewKind || '',
+            commit: block.commit || '',
+            title: block.title || block.filename || '',
+            resolved: touched === hunks.length,
+            hunks: picked,
+          }
+        : null;
+      if (ctx && typeof ctx.onBlockEdit === 'function') ctx.onBlockEdit(blockId, payload);
+      wrap.dispatchEvent(new CustomEvent('relay:block-edit', {
+        bubbles: true,
+        detail: { blockId, value: payload },
+      }));
+      status.textContent = `${touched}/${hunks.length} reviewed`;
+      status.classList.toggle('is-complete', hunks.length > 0 && touched === hunks.length);
+      for (const h of hunks) {
+        const set = buttonsByHunk.get(h.id) || [];
+        const chosen = choices[h.id] && choices[h.id].choice;
+        set.forEach((b) => b.el.classList.toggle('sel', b.choice === chosen));
+      }
+    };
+
+    const setChoice = (h, choice) => {
+      choices[h.id] = { choice, file: h.file, header: h.header };
+      emit();
+    };
+
+    const setAll = (choice) => {
+      hunks.forEach((h) => {
+        choices[h.id] = { choice, file: h.file, header: h.header };
+      });
+      emit();
+    };
+
+    const makeReviewButton = (label, onClick, extraClass = '') => {
+      const b = el('button', { type: 'button', class: 'diff-review-btn' + (extraClass ? ' ' + extraClass : '') }, label);
+      b.addEventListener('mousedown', (e) => e.stopPropagation());
+      b.addEventListener('click', (e) => {
+        e.preventDefault();
+        e.stopPropagation();
+        onClick();
+      });
+      return b;
+    };
+
+    const repaint = () => {
+      list.replaceChildren();
+      hunks.forEach((h) => {
+        const actionbar = el('div', { class: 'diff-review-hunkbar' },
+          el('div', { class: 'diff-review-hunkmeta' },
+            el('span', { class: 'diff-review-file' }, h.file),
+            el('span', { class: 'diff-review-header' }, h.header)
+          )
+        );
+        const rowButtons = [
+          { choice: 'apply', label: 'Apply hunk' },
+          { choice: 'skip', label: 'Skip hunk' },
+          { choice: 'hold', label: 'Hold' },
+        ].map((item) => ({
+          choice: item.choice,
+          el: makeReviewButton(item.label, () => setChoice(h, item.choice), 'diff-review-choice'),
+        }));
+        buttonsByHunk.set(h.id, rowButtons);
+        actionbar.append(el('div', { class: 'diff-review-actions' }, rowButtons.map((b) => b.el)));
+        list.append(el('section', { class: 'diff-review-hunk' },
+          actionbar,
+          view === 'split' ? buildSplitDiff(h.rows, block.lang) : buildUnifiedDiff(h.rows, block.lang)
+        ));
+      });
+      emit();
+    };
+
+    const toggle = makeReviewButton('', () => {
+      view = view === 'split' ? 'unified' : 'split';
+      wrap.classList.toggle('is-split', view === 'split');
+      toggle.textContent = view === 'split' ? 'Unified view' : 'Split view';
+      repaint();
+    }, 'blk-difftoggle');
+    toggle.title = 'Toggle side-by-side view';
+    toggle.textContent = view === 'split' ? 'Unified view' : 'Split view';
+
+    const title = block.title || block.filename || (files.length > 1 ? `${files.length} files changed` : 'Diff review');
+    wrap.append(el('div', { class: 'blk-codehead diff-review-head' },
+      el('span', { class: 'blk-codename' }, title),
+      el('div', { class: 'diff-review-topactions' },
+        status,
+        makeReviewButton('Apply all', () => setAll('apply')),
+        makeReviewButton('Skip all', () => setAll('skip')),
+        makeReviewButton('Hold all', () => setAll('hold')),
+        toggle
+      )
+    ));
+    wrap.classList.toggle('is-split', view === 'split');
+    wrap.append(list);
+    repaint();
+    ctx && ctx.annotate && ctx.annotate.enableTextSelection(list, { blockId, questionId: ctx.questionId });
+    attachViewer(wrap, { zoomEl: null, label: 'diff review', comment: wholeBlockComment(ctx, blockId, 'diff review') });
+    return wrap;
+  }
+
   function renderDiff(block, ctx, blockId) {
     const files = splitDiffFiles(block.diff);
+    if (block.review === true) return renderDiffReview(block, ctx, blockId, files);
     const named = files.filter((f) => f.name);
     const multi = named.length > 1;
     let view = block.view === 'split' ? 'split' : 'unified';