@orkestrel/scaffold 0.0.2 → 0.0.4

package/dist/host/scripts/cursor.sh

@@ -1,74 +1,60 @@
 #!/bin/bash
-# ============================================================================
-# scripts/cursor.sh — SessionStart hook: Cursor bench ONLY
-# ----------------------------------------------------------------------------
-# The Cursor CLI has no daemon to launch: `agent` is invoked on demand by the
-# composer/grok dispatchers. This hook SENSES the bench at session start and
-# announces the result into Claude's context (SessionStart stdout).
-#
-# AUTH SENSING — evidence-based, in order of authority:
-#   1. `agent status` exits 0 even when it prints "Not logged in" — its exit
-#      code proves nothing, and under CURSOR_API_KEY auth "Not logged in" is
-#      COSMETIC on headless hosts (status reflects interactive login only;
-#      key auth here is verified end-to-end and works regardless).
-#   2. The per-session functional signal is `agent models`: reachable + pins
-#      present on the account ⇒ the bench is usable. A live dispatch remains
-#      the final arbiter; only USER API keys work (admin/org keys fail at
-#      dispatch time).
-# NEVER prints CURSOR_API_KEY. Always exits 0 — problems are announcements,
-# not session blockers.
-# ============================================================================
+# SessionStart capability probe for the Cursor bench. External command output,
+# model identifiers, and credentials never cross the hook-to-context boundary.
 
 if [ "${CLAUDE_CODE_REMOTE:-}" != "true" ]; then
   exit 0
 fi
 
 if ! command -v agent >/dev/null 2>&1; then
-  echo "cursor.sh: bench dark — Cursor CLI not installed in this environment; route external-bench units to their Claude counterparts."
+  echo "cursor.sh: bench unavailable; use an in-session research route."
   exit 0
 fi
 
-# --- evidence gathering ------------------------------------------------------
-agent status >/tmp/cursor-status.log 2>&1 || true
-status_line="$(head -n 1 /tmp/cursor-status.log 2>/dev/null)"
+MODELS_LOG="$(mktemp /tmp/orkestrel-cursor-models.XXXXXX)" || exit 0
+chmod 600 "$MODELS_LOG"
+cleanup_cursor_log() {
+  rm -f -- "$MODELS_LOG"
+}
+trap cleanup_cursor_log EXIT
 
 models_ok=0
-if agent models >/tmp/cursor-models.log 2>&1; then
+if agent models >"$MODELS_LOG" 2>&1; then
   models_ok=1
 fi
 
-# Exact-token match so a pin can't false-positive on a longer variant
-# (e.g. pin "composer-2.5" must not be satisfied by "composer-2.5-fast").
+valid_pin() {
+  case "$1" in
+    ''|-*|*[!A-Za-z0-9._-]*) return 1 ;;
+  esac
+  [ "${#1}" -le 128 ]
+}
+
 id_ok() {
-  esc="$(printf '%s' "$1" | sed 's/[][\.^$*+?(){}|]/\\&/g')"
-  grep -Eq "${esc}([^A-Za-z0-9._-]|$)" /tmp/cursor-models.log
+  escaped="$(printf '%s' "$1" | sed 's/[][\.^$*+?(){}|]/\\&/g')"
+  grep -Eq -- "${escaped}([^A-Za-z0-9._-]|$)" "$MODELS_LOG"
 }
 
-# --- pins verdict ------------------------------------------------------------
-pins="pins ok (composer=${CURSOR_COMPOSER_MODEL:-}, grok=${CURSOR_GROK_MODEL:-})"
-if [ -z "${CURSOR_COMPOSER_MODEL:-}" ] || [ -z "${CURSOR_GROK_MODEL:-}" ]; then
-  pins="PINS MISSING — run \`agent models\` and record CURSOR_COMPOSER_MODEL / CURSOR_GROK_MODEL in the environment variables"
+pins="pins ready"
+if [ -z "${CURSOR_GROK_MODEL:-}" ]; then
+  pins="pins missing"
+elif ! valid_pin "$CURSOR_GROK_MODEL"; then
+  pins="pins invalid"
 elif [ "$models_ok" = "1" ]; then
-  for id in "$CURSOR_COMPOSER_MODEL" "$CURSOR_GROK_MODEL"; do
-    if ! id_ok "$id"; then
-      pins="PIN NOT FOUND on this account: ${id} — re-run \`agent models\` and update the environment variable"
-      break
-    fi
-  done
+  if ! id_ok "$CURSOR_GROK_MODEL"; then
+    pins="pins unavailable"
+  fi
 else
-  pins="pins set (composer=${CURSOR_COMPOSER_MODEL}, grok=${CURSOR_GROK_MODEL}) — unvalidated (\`agent models\` unreachable)"
+  pins="pins unverified"
 fi
 
-# --- auth verdict: functional evidence over status text ----------------------
-if [ -s /tmp/cursor-status.log ] && ! grep -qi "not logged in" /tmp/cursor-status.log; then
-  auth="interactive login present (${status_line})"
+if [ "$models_ok" = "1" ]; then
+  auth="authentication reachable"
 elif [ -z "${CURSOR_API_KEY:-}" ]; then
-  auth="AUTH DARK — no interactive login and no CURSOR_API_KEY set; add a USER API key in the environment settings"
-elif [ "$models_ok" = "1" ]; then
-  auth="key-auth reachable (status 'Not logged in' is cosmetic under key auth)"
+  auth="authentication unavailable"
 else
-  auth="key-auth UNVERIFIED — \`agent models\` unreachable (auth or network; see /tmp/cursor-models.log); if dispatches auth-fail, confirm the key is a USER API key, not admin"
+  auth="authentication unverified"
 fi
 
-echo "cursor.sh: bench lit — $(agent --version 2>/dev/null | head -n 1); ${auth}; ${pins}."
+echo "cursor.sh: bench detected; ${auth}; ${pins}."
 exit 0

package/dist/host/scripts/deps.sh

@@ -1,11 +1,10 @@
 #!/bin/bash
 # ============================================================================
-# scripts/deps.sh — SessionStart hook: project dependencies ONLY
+# scripts/deps.sh — SessionStart hook: reproducible project dependencies
 # ----------------------------------------------------------------------------
-# Runs in every cloud environment (the setup script never sees the repo
-# checkout; $CLAUDE_PROJECT_DIR here always points at the real one).
-# SessionStart stdout is injected into Claude's context, so this script prints
-# ONE meaningful line and sends the npm noise to /tmp/deps.log.
+# Runs only in Claude Code's remote environment. The lockfile digest marker
+# prevents a resumed session from treating stale node_modules as a valid
+# installation after package-lock.json changes.
 # ============================================================================
 
 if [ "${CLAUDE_CODE_REMOTE:-}" != "true" ]; then
@@ -17,22 +16,41 @@ cd "$CLAUDE_PROJECT_DIR" || exit 0
 if [ ! -f package.json ]; then
   exit 0
 fi
-if [ -d node_modules ]; then
-  echo "deps.sh: dependencies already present (resumed session) — skipped."
+
+LOCK_MARKER="node_modules/.orkestrel-lock.sha256"
+DEPS_LOG="$(mktemp /tmp/orkestrel-deps.XXXXXX)" || {
+  echo "deps.sh: could not create a private dependency log — skipped."
   exit 0
-fi
+}
+chmod 600 "$DEPS_LOG"
+
+cleanup_deps_log() {
+  rm -f -- "$DEPS_LOG"
+}
+
+trap cleanup_deps_log EXIT
 
 if [ -f package-lock.json ]; then
-  if npm ci >/tmp/deps.log 2>&1; then
-    echo "deps.sh: dependencies installed (npm ci)."
-  else
-    echo "deps.sh: npm ci FAILED — see /tmp/deps.log before building or testing."
+  LOCK_HASH="$(node -e "process.stdout.write(require('node:crypto').createHash('sha256').update(require('node:fs').readFileSync('package-lock.json')).digest('hex'))" 2>"$DEPS_LOG")"
+
+  if [ -n "$LOCK_HASH" ] &&
+    [ -d node_modules ] &&
+    [ -f "$LOCK_MARKER" ] &&
+    [ "$(tr -d '\r\n' <"$LOCK_MARKER")" = "$LOCK_HASH" ]; then
+    echo "deps.sh: dependencies match package-lock.json — skipped."
+    exit 0
   fi
-else
-  if npm install >/tmp/deps.log 2>&1; then
-    echo "deps.sh: no package-lock.json — npm install succeeded. Commit a lockfile for reproducible installs."
+
+  if npm ci --ignore-scripts >"$DEPS_LOG" 2>&1; then
+    if [ -n "$LOCK_HASH" ]; then
+      printf '%s\n' "$LOCK_HASH" >"$LOCK_MARKER"
+    fi
+    echo "deps.sh: dependencies installed from package-lock.json (npm ci)."
   else
-    echo "deps.sh: npm install FAILED — see /tmp/deps.log before building or testing."
+    echo "deps.sh: npm ci failed; dependency installation remains incomplete."
   fi
+else
+  echo "deps.sh: no package-lock.json — automatic installation refused; commit a lockfile."
 fi
+
 exit 0

package/dist/host/scripts/ollama.sh

@@ -1,163 +1,20 @@
 #!/bin/bash
-# ============================================================================
-# scripts/ollama.sh — SessionStart hook: Ollama ONLY
-# ----------------------------------------------------------------------------
-# One job: bring the local-model daemon up for this session, healthy.
-# Project dependencies live in scripts/deps.sh; the Cursor bench check lives in
-# scripts/cursor.sh. All three are registered in .claude/settings.json and run
-# IN PARALLEL at session start, so the daemon boots while npm installs.
-#
-#   0. Guards -- the orchestration set (hooks included) is mirrored
-#      byte-identical across every @orkestrel repo, and this repo serves
-#      several cloud environments: exit quietly in any repo that isn't
-#      @orkestrel/ollama, and wherever the ollama binary isn't installed.
-#   1. Starts `ollama serve`  -- the environment cache snapshots FILES, not
-#      running processes, so the daemon must be restarted every session.
-#   2. Self-heals a known container defect -- this container class advertises
-#      AMX CPU flags but blocks AMX tile-state permissions at the kernel /
-#      seccomp level. Ollama's dynamic CPU-backend loader picks its only
-#      AMX-capable variant (libggml-cpu-sapphirerapids.so) on such hosts, and
-#      llama-server then segfaults on every model load. A cheap chat probe
-#      after the daemon comes up doubles as session warmup AND a canary for
-#      this failure; if it fires, we disable that .so and restart the daemon
-#      so the loader falls back to the next-best AVX-512 variant.
-#
-# SessionStart stdout is injected into Claude's context: keep stdout to terse
-# status lines (they tell Claude what this environment offers); diagnostics go
-# to stderr / /tmp/ollama.log. No `set -e`: a self-heal misfire should not
-# stop Ollama from coming up.
-# ============================================================================
+# SessionStart loopback capability probe. Lifecycle stays user-owned and no
+# caller-controlled endpoint is contacted or copied into model context.
 
-# Run only in cloud sessions. Locally you manage your own Ollama, so skip.
 if [ "${CLAUDE_CODE_REMOTE:-}" != "true" ]; then
   exit 0
 fi
 
-# --- 0. Guards ---------------------------------------------------------------
-# The daemon only serves the ollama package; every other @orkestrel repo
-# carries this script as part of the mirrored hook set and must skip silently.
-PKG_JSON="${CLAUDE_PROJECT_DIR:-$(cd "$(dirname "$0")/.." && pwd)}/package.json"
-if ! grep -Eq '"name"[[:space:]]*:[[:space:]]*"@orkestrel/ollama"' "$PKG_JSON" 2>/dev/null; then
-  exit 0
-fi
 if ! command -v ollama >/dev/null 2>&1; then
-  echo "ollama.sh: ollama not installed in this environment — no local model daemon."
-  exit 0
-fi
-
-# Match the locations used by the setup script / environment variables.
-export OLLAMA_MODELS="${OLLAMA_MODELS:-/opt/ollama/models}"
-export OLLAMA_HOST="${OLLAMA_HOST:-127.0.0.1:11434}"
-
-# Your Copilot workflow set OLLAMA_ORIGINS="*" so browser page contexts could
-# call the API cross-origin. That was mainly a Playwright concern, so it is off
-# here. Uncomment if anything still hits Ollama from a browser:
-# export OLLAMA_ORIGINS="*"
-
-# --- 1. Start the daemon ----------------------------------------------------
-if ! curl -sf "http://${OLLAMA_HOST}/api/tags" >/dev/null 2>&1; then
-  nohup ollama serve >/tmp/ollama.log 2>&1 &
-fi
-
-ollama_ready=0
-for i in $(seq 1 30); do
-  if curl -sf "http://${OLLAMA_HOST}/api/tags" >/dev/null 2>&1; then
-    echo "Ollama ready on ${OLLAMA_HOST}"
-    ollama_ready=1
-    break
-  fi
-  sleep 1
-done
-
-if [ "$ollama_ready" != "1" ]; then
-  # Don't fail the session if the daemon is slow; Claude can retry mid-session.
-  echo "Warning: Ollama did not report ready within 30s (see /tmp/ollama.log)" >&2
+  echo "ollama.sh: loopback capability unavailable."
   exit 0
 fi
 
-# --- 2. Self-heal the AMX/XTILE-blocked-container defect --------------------
-# See header note 2. A minimal chat call against whatever model is already
-# installed both warms that model for the session AND tells us whether this
-# container hit the AMX-tile-permission wall. If it did, disable the
-# AMX-only CPU backend variant and restart the daemon so the loader falls
-# back to AVX-512, then re-probe once to confirm the fix landed.
-sapphirerapids_so="/usr/local/lib/ollama/libggml-cpu-sapphirerapids.so"
-
-probe_model() {
-  curl -sf "http://${OLLAMA_HOST}/api/tags" 2>/dev/null \
-    | grep -o '"name":"[^"]*"' \
-    | head -n 1 \
-    | sed -e 's/"name":"//' -e 's/"$//'
-}
-
-probe_chat() {
-  model="$1"
-  curl -s --max-time 120 "http://${OLLAMA_HOST}/api/chat" \
-    -d "{\"model\":\"${model}\",\"messages\":[{\"role\":\"user\",\"content\":\"hi\"}],\"stream\":false,\"think\":false,\"keep_alive\":\"30m\",\"options\":{\"num_predict\":1}}"
-}
-
-model="$(probe_model)"
-if [ -z "$model" ]; then
-  # No model installed yet -- nothing to warm or probe against.
-  echo "ollama.sh: no installed model found, skipping warmup probe." >&2
-  exit 0
-fi
-
-probe_response="$(probe_chat "$model")"
-
-if echo "$probe_response" | grep -qi 'segmentation fault\|llama-server process has terminated'; then
-  echo "ollama.sh: detected llama-server crash on model warmup (likely the AMX/XTILE-blocked-container defect)." >&2
-  if [ -f "$sapphirerapids_so" ]; then
-    echo "ollama.sh: disabling AMX-only CPU backend variant so the loader falls back to AVX-512." >&2
-    if mv "$sapphirerapids_so" "${sapphirerapids_so}.disabled" 2>/dev/null; then
-      echo "ollama.sh: restarting Ollama daemon to pick up the backend change." >&2
-      ollama_pid="$(pgrep -x ollama | head -n 1)"
-      if [ -n "$ollama_pid" ]; then
-        kill "$ollama_pid" 2>/dev/null
-        # Wait for the old process to actually exit before relaunching, so the
-        # new daemon can't race the dying one for the port and the readiness
-        # poll below can't be satisfied by the dying daemon.
-        for i in $(seq 1 10); do
-          if ! kill -0 "$ollama_pid" 2>/dev/null; then
-            break
-          fi
-          sleep 0.5
-        done
-      fi
-      nohup ollama serve >/tmp/ollama.log 2>&1 &
-
-      restarted_ready=0
-      for i in $(seq 1 30); do
-        if curl -sf "http://${OLLAMA_HOST}/api/tags" >/dev/null 2>&1; then
-          restarted_ready=1
-          break
-        fi
-        sleep 1
-      done
-
-      if [ "$restarted_ready" = "1" ]; then
-        retry_response="$(probe_chat "$model")"
-        if echo "$retry_response" | grep -qi 'segmentation fault\|llama-server process has terminated'; then
-          echo "ollama.sh: self-heal restart complete, but the retry probe still failed. See /tmp/ollama.log." >&2
-        else
-          echo "ollama.sh: self-heal succeeded -- model warm (${model}) after AVX-512 fallback."
-        fi
-      else
-        echo "ollama.sh: daemon did not report ready after self-heal restart (see /tmp/ollama.log)." >&2
-      fi
-    else
-      echo "ollama.sh: warning -- could not rename ${sapphirerapids_so} (permissions?). Leaving daemon as-is." >&2
-    fi
-  else
-    echo "ollama.sh: warning -- AMX-only CPU backend not found at expected path; cannot self-heal automatically." >&2
-  fi
-elif echo "$probe_response" | grep -q '"message"\|"content"\|"done":true'; then
-  echo "ollama.sh: model warm (${model}) -- warmup probe succeeded."
+if curl -sf --max-time 2 "http://127.0.0.1:11434/api/tags" >/dev/null 2>&1; then
+  echo "ollama.sh: loopback capability ready; lifecycle remains user-owned."
 else
-  echo "ollama.sh: warning -- warmup probe returned an unexpected response (not a segfault, but no message/done payload either):" >&2
-  echo "ollama.sh: ${probe_response}" | head -c 500 >&2
-  echo "" >&2
-  echo "ollama.sh: leaving daemon as-is." >&2
+  echo "ollama.sh: loopback capability unreachable; lifecycle remains user-owned."
 fi
 
 exit 0