create-egregore 0.20.1 → 0.20.3

package/runtime/prime/bin/search.sh

@@ -29,6 +29,48 @@ SLUG=$(jq -r '.slug // "egregore"' "$SCRIPT_DIR/egregore.json" 2>/dev/null || ec
 COLLECTION="${SLUG}-memory"
 MEM_PATH="$(readlink -f "$SCRIPT_DIR/memory" 2>/dev/null || true)"
 
+# qmd 2.5.x may render --full-path results as absolute `**file:**` paths,
+# while older output uses qmd:// URIs. Normalize both to the canonical
+# memory/... form users can open from an Egregore checkout, and parse both
+# forms when counting hits or attaching graph state.
+_normalize_file_paths() {
+  local line absolute_prefix uri_prefix
+  absolute_prefix="**file:** \`$MEM_PATH/"
+  uri_prefix="**file:** \`qmd://${COLLECTION}/"
+  while IFS= read -r line || [ -n "$line" ]; do
+    if [[ "$line" == "$absolute_prefix"* ]]; then
+      printf '**file:** `memory/%s\n' "${line#"$absolute_prefix"}"
+    elif [[ "$line" == "$uri_prefix"* ]]; then
+      printf '**file:** `memory/%s\n' "${line#"$uri_prefix"}"
+    else
+      printf '%s\n' "$line"
+    fi
+  done
+}
+
+_result_paths() {
+  local line path canonical_prefix absolute_prefix uri_prefix
+  canonical_prefix="**file:** \`memory/"
+  absolute_prefix="**file:** \`$MEM_PATH/"
+  uri_prefix="**file:** \`qmd://${COLLECTION}/"
+  while IFS= read -r line || [ -n "$line" ]; do
+    path=""
+    if [[ "$line" == "$canonical_prefix"* ]]; then
+      path="${line#"$canonical_prefix"}"
+    elif [[ "$line" == "$absolute_prefix"* ]]; then
+      path="${line#"$absolute_prefix"}"
+    elif [[ "$line" == "$uri_prefix"* ]]; then
+      path="${line#"$uri_prefix"}"
+    elif [[ "$line" == *"qmd://${COLLECTION}/"* ]]; then
+      path="${line#*"qmd://${COLLECTION}/"}"
+    fi
+    path="${path%%\`*}"
+    case "$path" in
+      *.md*) printf '%s\n' "${path%%.md*}.md" ;;
+    esac
+  done | sort -u
+}
+
 QMD_VERSION="2.5.3"  # pinned — bump deliberately, never float @latest
 
 _qmd() {
@@ -104,7 +146,7 @@ _enrich() {
   local results paths params out
   results=$(cat)
   echo "$results"
-  paths=$(echo "$results" | grep -o "qmd://${COLLECTION}/[^: ]*\.md" | sed "s|qmd://${COLLECTION}/||" | sort -u)
+  paths=$(printf '%s\n' "$results" | _result_paths)
   [ -z "$paths" ] && return 0
   params=$(printf '%s\n' "$paths" | jq -R . | jq -sc '{paths: .}')
   out=$(bash "$SCRIPT_DIR/bin/graph.sh" query "UNWIND \$paths AS fp
@@ -167,7 +209,7 @@ cmd_query() {
   local t0 out label
   t0=$(date +%s)
   if [ "$mode" != "search" ]; then
-    out=$(_qmd "$mode" "$q" -c "$COLLECTION" -n "$n" --format md --full-path "${all[@]}" 2>/dev/null | _clean)
+    out=$(_qmd "$mode" "$q" -c "$COLLECTION" -n "$n" --format md --full-path "${all[@]}" 2>/dev/null | _clean | _normalize_file_paths)
     if [ -n "$out" ] && [ "$out" != "No results found." ]; then
       [ "$mode" = "query" ] && label="hybrid" || label="semantic"
       _banner_and_emit "$label" "$t0" "$emit" "$q" "$out"
@@ -176,7 +218,7 @@ cmd_query() {
     echo "_(hybrid/semantic returned nothing — showing keyword results. If this persists, run: bash bin/search.sh reindex --embed)_"
     echo ""
   fi
-  out=$(_qmd search "$q" -c "$COLLECTION" -n "$n" --format md --full-path "${all[@]}" | _clean)
+  out=$(_qmd search "$q" -c "$COLLECTION" -n "$n" --format md --full-path "${all[@]}" | _clean | _normalize_file_paths)
   _banner_and_emit "keyword" "$t0" "$emit" "$q" "$out"
 }
 
@@ -189,7 +231,7 @@ cmd_query() {
 _banner_and_emit() {
   local label="$1" t0="$2" emit="$3" q="$4" out="$5"
   local hits dur modef product surface plural=""
-  hits=$(printf '%s\n' "$out" | grep -c '^qmd://' 2>/dev/null | tr -d ' ')
+  hits=$(printf '%s\n' "$out" | _result_paths | wc -l | tr -d ' ')
   dur=$(( $(date +%s) - t0 ))
   modef="$label"
   product="Egregore"

package/runtime/prime/bin/session-autosave.sh

@@ -85,7 +85,12 @@ git rev-parse --git-dir >/dev/null 2>&1 || exit 0
 DIR_HASH=$( { md5sum <<<"$DIR" 2>/dev/null || md5 -q -s "$DIR" 2>/dev/null || echo default; } | cut -c1-8 )
 STAMP="/tmp/.egregore-autosave-${DIR_HASH}"
 if [ "$DEBOUNCE" -gt 0 ] && [ -f "$STAMP" ]; then
-  LAST=$(stat -f %m "$STAMP" 2>/dev/null || stat -c %Y "$STAMP" 2>/dev/null || echo 0)
+  if stat -c %Y "$STAMP" >/dev/null 2>&1; then
+    LAST=$(stat -c %Y "$STAMP")
+  else
+    LAST=$(stat -f %m "$STAMP" 2>/dev/null || echo 0)
+  fi
+  case "$LAST" in ""|*[!0-9]*) LAST=0 ;; esac
   [ $(( $(date +%s) - LAST )) -lt "$DEBOUNCE" ] && exit 0
 fi
 touch "$STAMP" 2>/dev/null || true

package/runtime/prime/bin/settings.sh

@@ -3,14 +3,16 @@ set -euo pipefail
 
 # settings.sh — deterministic config verbs for an Egregore instance.
 #
-# Edits egregore.json atomically. No agent, no network, no session. Idempotent:
-# re-adding an existing item is a no-op success; removing a missing one is too.
+# Edits egregore.json atomically. No agent, no session. Idempotent: re-adding
+# an existing item is a no-op success; removing a missing one is too. Switching
+# to staged releases is the one networked verb: it creates origin/develop first.
 # This is the deterministic core the launcher settings screen (and slash
 # commands) call — the reliability lives here, the surfaces are thin callers.
 #
 # Usage:
 #   settings.sh hosting status|on|off
 #   settings.sh relay status|on|off
+#   settings.sh workflow status|simple|staged
 #   settings.sh repo list | add <name> [description] | remove <name>
 #   settings.sh admin list | add <github-handle> | remove <github-handle>
 #   settings.sh dump                 # full settings snapshot as JSON (for the launcher)
@@ -53,6 +55,7 @@ settings.sh — Egregore instance settings
 
   settings.sh hosting status|on|off
   settings.sh relay  status|on|off
+  settings.sh workflow status|simple|staged
   settings.sh repo   list | add <name> [description] | remove <name>
   settings.sh admin  list | add <github-handle> | remove <github-handle>
   settings.sh people list | add <github-handle> | remove <github-handle>
@@ -114,6 +117,54 @@ cmd_relay() {
   esac
 }
 
+cmd_workflow() {
+  local action="${1:-status}"
+  local base
+  base="$(jq -r 'if has("base_branch") then .base_branch else "develop" end' "$CONFIG" 2>/dev/null)"
+  case "$action" in
+    status)
+      local workflow="custom"
+      [ "$base" = "main" ] && workflow="simple"
+      [ "$base" = "develop" ] && workflow="staged"
+      if [ "$JSON" = 1 ]; then
+        jq -n --arg workflow "$workflow" --arg base_branch "$base" \
+          '{domain:"workflow", workflow:$workflow, base_branch:$base_branch}'
+      elif [ "$workflow" = "simple" ]; then
+        echo "Git workflow: SIMPLE — pull requests target main"
+      elif [ "$workflow" = "staged" ]; then
+        echo "Git workflow: STAGED — pull requests target develop; releases promote to main"
+      else
+        echo "Git workflow: CUSTOM — pull requests target $base"
+      fi
+      ;;
+    simple)
+      if [ "$base" != "main" ]; then
+        git -C "$SCRIPT_DIR" rev-parse --git-dir >/dev/null 2>&1 \
+          || _die "cannot switch workflow: $SCRIPT_DIR is not a Git repository" 1
+        git -C "$SCRIPT_DIR" ls-remote --exit-code --heads origin main >/dev/null 2>&1 \
+          || _die "cannot switch workflow: origin/main does not exist or could not be reached" 1
+        _save '.base_branch = "main"'
+      fi
+      echo "Git workflow: SIMPLE — pull requests now target main"
+      ;;
+    staged)
+      if [ "$base" != "develop" ]; then
+        git -C "$SCRIPT_DIR" rev-parse --git-dir >/dev/null 2>&1 \
+          || _die "cannot switch workflow: $SCRIPT_DIR is not a Git repository" 1
+        bash "$SCRIPT_DIR/bin/lib/ensure-develop.sh" "$SCRIPT_DIR" >/dev/null \
+          || _die "could not create develop; workflow is unchanged" 1
+        git -C "$SCRIPT_DIR" ls-remote --exit-code --heads origin develop >/dev/null 2>&1 \
+          || _die "could not verify origin/develop; workflow is unchanged" 1
+        _save '.base_branch = "develop"'
+      elif ! jq -e 'has("base_branch")' "$CONFIG" >/dev/null 2>&1; then
+        _save '.base_branch = "develop"'
+      fi
+      echo "Git workflow: STAGED — pull requests now target develop; releases promote to main"
+      ;;
+    *) _die "usage: settings.sh workflow status|simple|staged" 1 ;;
+  esac
+}
+
 cmd_repo() {
   local action="${1:-list}"; shift || true
   case "$action" in
@@ -273,6 +324,13 @@ cmd_dump() {
     slug: .slug,
     hosting: (.features.publishing != false),
     public_relay: (.features.public_relay == true),
+    workflow: (
+      if ((if has("base_branch") then .base_branch else "develop" end) == "main") then "simple"
+      elif ((if has("base_branch") then .base_branch else "develop" end) == "develop") then "staged"
+      else "custom"
+      end
+    ),
+    base_branch: (if has("base_branch") then .base_branch else "develop" end),
     repos: [.repos[]? | if type=="object" then . else {name:.} end],
     admins: (.admins // []),
     people: $people
@@ -295,10 +353,11 @@ DOMAIN="${1:-}"; shift || true
 case "$DOMAIN" in
   hosting) cmd_hosting "$@" ;;
   relay)   cmd_relay "$@" ;;
+  workflow) cmd_workflow "$@" ;;
   repo)    cmd_repo "$@" ;;
   admin)   cmd_admin "$@" ;;
   people)  cmd_people "$@" ;;
   dump)    cmd_dump ;;
   ""|-h|--help|help) usage 0 ;;
-  *) _die "unknown settings domain: '$DOMAIN' (try: hosting, relay, repo, admin, people, dump)" 1 ;;
+  *) _die "unknown settings domain: '$DOMAIN' (try: hosting, relay, workflow, repo, admin, people, dump)" 1 ;;
 esac

package/runtime/prime/bin/worktree-create.sh

@@ -48,7 +48,10 @@ git -C "$REPO_ROOT" fetch origin "$BASE_BRANCH" --quiet 2>/dev/null || true
 
 # --- Create branch (idempotent — skip if exists) ---
 if ! git -C "$REPO_ROOT" show-ref --verify --quiet "refs/heads/$BRANCH" 2>/dev/null; then
-  git -C "$REPO_ROOT" branch "$BRANCH" "origin/$BASE_BRANCH" >/dev/null 2>&1 || {
+  # A task branch starts at the integration branch but must never track it.
+  # Otherwise `git push` can target origin/$BASE_BRANCH (especially when the
+  # user's push.default is `upstream`) before the first explicit task push.
+  git -C "$REPO_ROOT" branch --no-track "$BRANCH" "origin/$BASE_BRANCH" >/dev/null 2>&1 || {
     echo "Error: failed to create branch $BRANCH" >&2
     exit 1
   }

package/runtime/prime/manifest.json

@@ -129,6 +129,7 @@
     "bin/codex-skill-render.mjs",
     "bin/codex-sync-skills.sh",
     "bin/connect-refresh.sh",
+    "bin/contribute-guard.sh",
     "bin/dashboard-data.sh",
     "bin/graph-batch.sh",
     "bin/graph-op.sh",