From 28fa3dd3859f2607f42b0d1f142bc2d747ffc244 Mon Sep 17 00:00:00 2001
From: ReachableCEO <charles@turnsys.com>
Date: Wed, 10 Sep 2025 16:25:46 -0500
Subject: [PATCH] docs: add RESUME.md and push integration/release branches for
 smooth restart

---
 .githooks/commit-msg    |  0
 .githooks/pre-commit    |  0
 .githooks/pre-push      |  0
 RESUME.md               | 53 +++++++++++++++++++++++++++++++++++++++++
 scripts/ci              |  0
 scripts/commitlint-hook |  0
 scripts/setup-hooks     |  0
 7 files changed, 53 insertions(+)
 mode change 100755 => 100644 .githooks/commit-msg
 mode change 100755 => 100644 .githooks/pre-commit
 mode change 100755 => 100644 .githooks/pre-push
 create mode 100644 RESUME.md
 mode change 100755 => 100644 scripts/ci
 mode change 100755 => 100644 scripts/commitlint-hook
 mode change 100755 => 100644 scripts/setup-hooks

diff --git a/.githooks/commit-msg b/.githooks/commit-msg
old mode 100755
new mode 100644
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
old mode 100755
new mode 100644
diff --git a/.githooks/pre-push b/.githooks/pre-push
old mode 100755
new mode 100644
diff --git a/RESUME.md b/RESUME.md
new file mode 100644
index 0000000..726e303
--- /dev/null
+++ b/RESUME.md
@@ -0,0 +1,53 @@
+Resume Guide
+
+Purpose
+- Quick checklist to pick up work after restarting Codex CLI with expanded permissions.
+
+Branches on remote
+- main (default), integration, release, bootstrap, bootstrap-cicd
+
+1) Pull latest
+- git fetch --all --prune
+- git switch bootstrap && git pull
+- git switch bootstrap-cicd && git pull
+- git switch integration && git pull
+
+2) Ensure Docker is available
+- Start Docker Desktop/daemon as needed
+
+3) Install hooks locally
+- make hooks-setup
+
+4) Run local checks (Docker-only)
+- git switch bootstrap && make quick && make build
+- git switch bootstrap-cicd && make quick && make build
+- Optional full pass: make check
+
+5) Open PRs (when branches are green locally)
+- bootstrap → integration: https://git.knownelement.com/KNEL/LLMScaffolding/pulls/new/bootstrap
+- bootstrap-cicd → integration: https://git.knownelement.com/KNEL/LLMScaffolding/pulls/new/bootstrap-cicd
+
+6) Merge to integration
+- Use squash merge, allow auto-merge on green where configured
+
+7) Release to main
+- Open PR: integration → main (require 1 approval)
+- After merge, tag manually (until CI runners are enabled):
+  - git switch main && git pull
+  - TAG=$(date -u +"v%Y.%m.%d-%H%M")
+  - git tag -a "$TAG" -m "Release $TAG"
+  - git push origin "$TAG"
+- Optional: fast-forward release branch pointer:
+  - git branch -f release main && git push -f origin release
+
+8) Docs & parity
+- Git workflow: instructions/git-workflow.md
+- Local CI parity: instructions/bootstrap-cicd.md
+
+9) Defer CI enablement for two weeks
+- Track in TODO.md: Revisit enabling runners and protected checks on 2025-09-24
+
+10) Next tasks
+- Answer any outstanding questions in questions/*
+- On approval, implement further proposals and update instructions/*
+
diff --git a/scripts/ci b/scripts/ci
old mode 100755
new mode 100644
diff --git a/scripts/commitlint-hook b/scripts/commitlint-hook
old mode 100755
new mode 100644
diff --git a/scripts/setup-hooks b/scripts/setup-hooks
old mode 100755
new mode 100644