Commit `a276345ea91c`

Vincent Demeester <vincent@sbr.pm>

2026-01-29 12:11:08

fix(gh-news): use correct shpool syntax and migrate cr aliases to scripts

- Fix shpool attach syntax: use `-f -c 'command'` instead of `-- command` - Create cr, crl, crf scripts in pkgs/my/scripts/bin/ for Claude with Vertex AI - Remove cr/crl/crf aliases from zsh.nix (scripts work with shpool, aliases don't) - Add review-* pattern to shpool-ssh-wrapper for future SSH-based reviews Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

main

1 parent 43f0674

Changed files (6)

home

common

dev

gh-news.nix

shell

zsh.nix

pkgs

scripts

bin

crf

crl

tools

shpool-ssh-wrapper

default.nix

@@ -40,7 +40,7 @@
         }
         {
           name = "Review with Claude";
-          command = "ssh aomi.sbr.pm 'shpool attach review-$(echo \"{url}\" | grep -oE \"(pull|issues)/[0-9]+\" | tr \"/\" \"-\") -- cr \"Review {url}, and load the proper skill as needed (e.g. nixpkgs skills and workflows if it is a pr from NixOS/nixpkgs)\"'";
+          command = "ssh aomi.sbr.pm \"shpool attach -f -c 'cr \\\"Review {url}, and load the proper skill as needed (e.g. nixpkgs skills and workflows if it is a pr from NixOS/nixpkgs)\\\"' review-$(echo '{url}' | grep -oE '(pull|issues)/[0-9]+' | tr '/' '-')\"";
           interactive = true;
         }
       ];

@@ -125,9 +125,7 @@
       map = "xargs -n1";
       k = "kubectl";
       wget = "wget -c --hsts-file=${config.xdg.dataHome}/wget-hsts";
-      cr = "env CLAUDE_CODE_USE_VERTEX=1 CLOUD_ML_REGION=us-east5 ANTHROPIC_VERTEX_PROJECT_ID=itpc-gcp-pnd-pe-eng-claude claude";
-      crl = "env CLAUDE_CODE_USE_VERTEX=1 CLOUD_ML_REGION=us-east5 ANTHROPIC_VERTEX_PROJECT_ID=itpc-gcp-pnd-pe-eng-claude claude --model claude-haiku-4-5";
-      crf = "env CLAUDE_CODE_USE_VERTEX=1 CLOUD_ML_REGION=us-east5 ANTHROPIC_VERTEX_PROJECT_ID=itpc-gcp-pnd-pe-eng-claude claude --model claude-opus-4-5";
+      # cr, crl, crf are now scripts in pkgs/my/scripts/bin/
     };
 
     plugins = [

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+# Claude Code with Vertex AI environment
+# Usage: cr [args...]
+# This is a script version of the 'cr' alias for use with shpool and other tools
+
+export CLAUDE_CODE_USE_VERTEX=1
+export CLOUD_ML_REGION=us-east5
+export ANTHROPIC_VERTEX_PROJECT_ID=itpc-gcp-pnd-pe-eng-claude
+
+exec claude "$@"

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Claude Code with Vertex AI environment (Opus model - full power)
+# Usage: crf [args...]
+
+export CLAUDE_CODE_USE_VERTEX=1
+export CLOUD_ML_REGION=us-east5
+export ANTHROPIC_VERTEX_PROJECT_ID=itpc-gcp-pnd-pe-eng-claude
+
+exec claude --model claude-opus-4-5 "$@"

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Claude Code with Vertex AI environment (Haiku model - lightweight)
+# Usage: crl [args...]
+
+export CLAUDE_CODE_USE_VERTEX=1
+export CLOUD_ML_REGION=us-east5
+export ANTHROPIC_VERTEX_PROJECT_ID=itpc-gcp-pnd-pe-eng-claude
+
+exec claude --model claude-haiku-4-5 "$@"

@@ -29,6 +29,7 @@ let
     # zshenv sets up PATH and other environment variables
     exec ${pkgs.zsh}/bin/zsh -c "source ~/.zshenv; exec /etc/profiles/per-user/vincent/bin/claude"
   '';
+
 in
 
 pkgs.writeScriptBin "shpool-ssh-wrapper" ''
@@ -69,6 +70,17 @@ pkgs.writeScriptBin "shpool-ssh-wrapper" ''
           # Use helper script since shpool -c expects a binary, not a shell command
           run_with_command "$SESSION_NAME" "${claude-vertex}" "$WORK_DIR"
           ;;
+      review-*)
+          # Claude Code review session - run with prompt
+          # Usage: ssh host/review-pull-123="Review https://github.com/..."
+          # The WORK_DIR variable holds the prompt (after =)
+          # Uses 'cr' script from PATH (pkgs/my/scripts/bin/cr)
+          if [ -z "$WORK_DIR" ]; then
+              echo "Error: review sessions require a prompt (use session=prompt syntax)" >&2
+              exit 1
+          fi
+          run_with_command "$SESSION_NAME" "cr" "$WORK_DIR"
+          ;;
       *)
           # If work directory specified, cd into it before attaching
           if [ -n "$WORK_DIR" ]; then

Commit a276345ea91c

Commit `a276345ea91c`