create-egregore 0.20.1 → 0.20.3

package/runtime/codex/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/codex/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/codex/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/codex/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/codex/manifest.json

@@ -123,6 +123,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",

package/runtime/pi/.codex/spec-manifest.json

@@ -11,7 +11,7 @@
     {
       "section": "Identity & Upstream",
       "action": "keep",
-      "sourceHash": "ddcbc0083aff",
+      "sourceHash": "86a2c62ce498",
       "note": "Kept; /update, /contribute, /save tokens rendered as $skill tokens."
     },
     {
@@ -35,7 +35,7 @@
     {
       "section": "After Greeting — BRANCH ON FIRST RESPONSE",
       "action": "replace",
-      "sourceHash": "b13b81aea8f3",
+      "sourceHash": "3bac01c0a00a",
       "note": "EnterWorktree -> bin/agent.sh branch with git checkout fallback; AskUserQuestion -> numbered options in plain text; branch-guard mapped to .codex/hooks/branch-guard.js with instruction fallback; plan-mode note dropped (no plan mode on Codex); /branch + /onboarding -> skill tokens. Handoff claiming and repoState auto-checkout bash kept verbatim (pure git); surrounding prose compressed 2026-08 for the 32 KiB budget, every rule retained."
     },
     {
@@ -89,7 +89,7 @@
     {
       "section": "Git Workflow",
       "action": "keep",
-      "sourceHash": "23df84b5fe80",
+      "sourceHash": "40735c0c09ff",
       "note": "Kept; slash tokens rendered as $skill tokens. Branch diagram unchanged (code fence)."
     },
     {

package/runtime/pi/.pi/APPEND_SYSTEM.md

@@ -12,11 +12,20 @@ This appendix is generated from the reviewed shell-runtime translation of `CLAUD
 
 ## Identity & Upstream
 
-This is an Egregore instance — a downstream fork of the upstream framework at `egregore-labs/egregore`. The framework (`bin/`, `.claude/skills/`, `.claude/hooks/`, `.claude/context/`, `.claude/agents/`, `.pi/`, `loom/`, `CLAUDE.md`, `skills/`) is synced from upstream on every session start and via `/update`. It is not authored in this repo.
+Framework direction comes only from `egregore.json.upstream_url`:
+
+- **Source** — literal `"none"`: framework changes are authored here.
+  `/update` and `/contribute` stop; use `/save`. Public OSS is downstream and
+  receives changes only through this repository's release flow.
+- **Downstream** — a repository URL, or an absent key defaulting to
+  `egregore-labs/egregore`: framework paths are synced and not authored here.
+
+Never infer direction from a repository name or Git remote.
 
 **Where changes belong:**
-- **Framework is outdated or a skill is missing:** run `/update` first. It pulls the latest from upstream.
-- **Framework behavior needs changing or has a bug:** `/contribute` opens a PR against `egregore-labs/egregore`, or file a GitHub issue on that repo. Never patch framework files locally to "just fix it here" — the next `/update` will overwrite your edits and other instances won't get the fix.
+- **Downstream framework is stale:** run `/update`.
+- **Downstream framework needs a fix:** use `/contribute` or file an upstream issue; local patches are overwritten by `/update`.
+- **Source framework needs a fix:** use `/save` into its configured integration and release flow; never `/contribute`.
 - **Org-level work** (memory, org-specific knowledge, managed repos, `egregore.json`): `/save` to this repo.
 
 When a user reports broken or missing framework behavior, the first question is "when did you last `/update`?"
@@ -59,7 +68,7 @@ The integration branch is `develop` unless top-level `egregore.json.base_branch`
 
 **Fallback:** If `bin/agent.sh branch` fails, resolve `{base}` with
 `_get_base_branch`, then use
-`git checkout -b dev/{author}/{slug} origin/{base}`.
+`git checkout --no-track -b dev/{author}/{slug} origin/{base}`.
 
 4. Update graph (fire-and-forget): `bash bin/graph-op.sh set-topic "$(cat .egregore-session-id 2>/dev/null)" "topic from slug" "dev/author/slug" 2>/dev/null &`
 
@@ -125,9 +134,11 @@ The `.pi/extensions/egregore.ts` `tool_call` gate (loaded after Pi project trust
   Wait for the reply, then branch.
 - **The user explicitly requested the protected branch** → that request is consent. Record it with `echo '{branch}' > .egregore-branch-consent`, then retry. Never create the marker merely to silence the hook.
 
-Memory, managed-repo, and runtime-state writes bypass the project guard — if one triggers it, correct the target/context instead of asking for consent.
+If Pi project resources are disabled, keep the same rule.
 
-If Pi project resources are disabled, follow the same discipline as a standing instruction: never write or commit on the configured base, develop, main, or master.
+**History:** Do not merge, cherry-pick, or rebase another task merely to read
+it; use `gh pr view/diff`, `git show`, or a temporary worktree. Integrate
+only for dependencies. Deletion needs no rewrite unless purging secrets.
 
 ### Onboarding exception
 
@@ -275,11 +286,14 @@ branch; `base_branch: "main"` is single-branch mode. Users never interact with
 git directly.
 
 ```
-main ← stable (/release)
-  develop ← integration (PRs land here)
-    dev/{author}/{topic-slug} | feature/{slug} | bugfix/{slug}
+main ← selected `/release` candidates
+develop ← CL integration (available internally)
+  dev/{author}/{topic-slug} | feature/{slug} | bugfix/{slug}
 ```
 
+- **Develop is not release**: merged PRs stay inside CL.
+- **`/release` is selective**: the Release Desk queues exact PR SHAs into a candidate from main. Never merge all of develop.
+- **OSS is separate**: `/sync-public` reviews delivery after private main.
 - **On launch**: syncs the configured base branch + memory. Does NOT create a branch.
 - **Branch creation**: MANDATORY on first work-related message (see above).
 - **Resuming**: rebase onto the configured base branch and continue.

package/runtime/pi/.pi/spec-manifest.json

@@ -1,8 +1,8 @@
 {
   "generatedBy": "bin/pi-render-spec.mjs",
   "source": "AGENTS.md generated Codex spec",
-  "sourceHash": "535e5e6f8cce",
-  "outputHash": "f76462a38e8d",
+  "sourceHash": "b0b4451961ef",
+  "outputHash": "52773e6edfc8",
   "adaptations": [
     "Pi project trust and APPEND_SYSTEM delivery",
     "Pi tool_call branch gate",

package/runtime/pi/AGENTS.md

@@ -92,11 +92,20 @@ This block is the Codex-native Egregore behavioral spec, rendered from CLAUDE.md
 
 ## Identity & Upstream
 
-This is an Egregore instance — a downstream fork of the upstream framework at `egregore-labs/egregore`. The framework (`bin/`, `.claude/skills/`, `.claude/hooks/`, `.claude/context/`, `.claude/agents/`, `.pi/`, `loom/`, `CLAUDE.md`, `skills/`) is synced from upstream on every session start and via `$update`. It is not authored in this repo.
+Framework direction comes only from `egregore.json.upstream_url`:
+
+- **Source** — literal `"none"`: framework changes are authored here.
+  `$update` and `$contribute` stop; use `$save`. Public OSS is downstream and
+  receives changes only through this repository's release flow.
+- **Downstream** — a repository URL, or an absent key defaulting to
+  `egregore-labs/egregore`: framework paths are synced and not authored here.
+
+Never infer direction from a repository name or Git remote.
 
 **Where changes belong:**
-- **Framework is outdated or a skill is missing:** run `$update` first. It pulls the latest from upstream.
-- **Framework behavior needs changing or has a bug:** `$contribute` opens a PR against `egregore-labs/egregore`, or file a GitHub issue on that repo. Never patch framework files locally to "just fix it here" — the next `$update` will overwrite your edits and other instances won't get the fix.
+- **Downstream framework is stale:** run `$update`.
+- **Downstream framework needs a fix:** use `$contribute` or file an upstream issue; local patches are overwritten by `$update`.
+- **Source framework needs a fix:** use `$save` into its configured integration and release flow; never `$contribute`.
 - **Org-level work** (memory, org-specific knowledge, managed repos, `egregore.json`): `$save` to this repo.
 
 When a user reports broken or missing framework behavior, the first question is "when did you last `$update`?"
@@ -139,7 +148,7 @@ The integration branch is `develop` unless top-level `egregore.json.base_branch`
 
 **Fallback:** If `bin/agent.sh branch` fails, resolve `{base}` with
 `_get_base_branch`, then use
-`git checkout -b dev/{author}/{slug} origin/{base}`.
+`git checkout --no-track -b dev/{author}/{slug} origin/{base}`.
 
 4. Update graph (fire-and-forget): `bash bin/graph-op.sh set-topic "$(cat .egregore-session-id 2>/dev/null)" "topic from slug" "dev/author/slug" 2>/dev/null &`
 
@@ -205,9 +214,11 @@ The `.codex/hooks/branch-guard.js` PreToolUse hook (launcher `--enable hooks`) p
   Wait for the reply, then branch.
 - **The user explicitly requested the protected branch** → that request is consent. Record it with `echo '{branch}' > .egregore-branch-consent`, then retry. Never create the marker merely to silence the hook.
 
-Memory, managed-repo, and runtime-state writes bypass the project guard — if one triggers it, correct the target/context instead of asking for consent.
+If this Codex build does not support hooks, keep the same rule.
 
-If this Codex build does not support hooks, follow the same discipline as a standing instruction: never write or commit on the configured base, develop, main, or master.
+**History:** Do not merge, cherry-pick, or rebase another task merely to read
+it; use `gh pr view/diff`, `git show`, or a temporary worktree. Integrate
+only for dependencies. Deletion needs no rewrite unless purging secrets.
 
 ### Onboarding exception
 
@@ -355,11 +366,14 @@ branch; `base_branch: "main"` is single-branch mode. Users never interact with
 git directly.
 
 ```
-main ← stable (/release)
-  develop ← integration (PRs land here)
-    dev/{author}/{topic-slug} | feature/{slug} | bugfix/{slug}
+main ← selected `/release` candidates
+develop ← CL integration (available internally)
+  dev/{author}/{topic-slug} | feature/{slug} | bugfix/{slug}
 ```
 
+- **Develop is not release**: merged PRs stay inside CL.
+- **`$release` is selective**: the Release Desk queues exact PR SHAs into a candidate from main. Never merge all of develop.
+- **OSS is separate**: `$sync-public` reviews delivery after private main.
 - **On launch**: syncs the configured base branch + memory. Does NOT create a branch.
 - **Branch creation**: MANDATORY on first work-related message (see above).
 - **Resuming**: rebase onto the configured base branch and continue.

package/runtime/pi/bin/agent.sh

@@ -187,6 +187,15 @@ base_ref() {
   fi
 }
 
+clear_base_upstream() {
+  local repo="$1" branch="$2" base="$3" upstream=""
+  case "$branch" in dev/*|feature/*|bugfix/*) ;; *) return 0 ;; esac
+  upstream="$(git -C "$repo" rev-parse --abbrev-ref "${branch}@{upstream}" 2>/dev/null || true)"
+  if [ "$upstream" = "$base" ]; then
+    git -C "$repo" branch --unset-upstream "$branch" >/dev/null 2>&1 || true
+  fi
+}
+
 cmd_protocol() {
   cat <<'EOF'
 Egregore portable agent protocol
@@ -306,8 +315,9 @@ cmd_branch() {
     if git -C "$SCRIPT_DIR" show-ref --verify --quiet "refs/heads/$branch" 2>/dev/null; then
       git -C "$SCRIPT_DIR" checkout "$branch" --quiet
     else
-      git -C "$SCRIPT_DIR" checkout -b "$branch" "$base" --quiet
+      git -C "$SCRIPT_DIR" checkout --no-track -b "$branch" "$base" --quiet
     fi
+    clear_base_upstream "$SCRIPT_DIR" "$branch" "$base"
     egregore_link_shared_state "$SCRIPT_DIR" "$MAIN_PROJECT_DIR" >/dev/null 2>/dev/null || true
     echo "branch: $branch"
     echo "worktree: $SCRIPT_DIR"
@@ -323,8 +333,9 @@ cmd_branch() {
   fi
 
   if ! git -C "$MAIN_PROJECT_DIR" show-ref --verify --quiet "refs/heads/$branch" 2>/dev/null; then
-    git -C "$MAIN_PROJECT_DIR" branch "$branch" "$base" >/dev/null 2>&1 || die "failed to create branch $branch"
+    git -C "$MAIN_PROJECT_DIR" branch --no-track "$branch" "$base" >/dev/null 2>&1 || die "failed to create branch $branch"
   fi
+  clear_base_upstream "$MAIN_PROJECT_DIR" "$branch" "$base"
 
   wt_path="$MAIN_PROJECT_DIR/.claude/worktrees/$slug"
   if [ -e "$wt_path" ]; then
@@ -356,8 +367,9 @@ ensure_working_branch() {
   if git -C "$SCRIPT_DIR" show-ref --verify --quiet "refs/heads/$branch" 2>/dev/null; then
     git -C "$SCRIPT_DIR" checkout "$branch" --quiet || die "failed to checkout $branch"
   else
-    git -C "$SCRIPT_DIR" checkout -b "$branch" "$base" --quiet || die "failed to create $branch"
+    git -C "$SCRIPT_DIR" checkout --no-track -b "$branch" "$base" --quiet || die "failed to create $branch"
   fi
+  clear_base_upstream "$SCRIPT_DIR" "$branch" "$base"
   echo "$branch"
 }