Merge remote-tracking branch 'origin/hack-a-thon-2026-supplementary-material'...

Your prompts will indicate any specific files you should use. Generally, these will come into these paths:

* Desktop/: files and folders in support of the hack-a-thon organization and agenda

* Desktop/: supplementary material (transcripts, scans, presentation slides, Google

  Drive snapshots) in support of the hack-a-thon organization and agenda — **git

  submodule** pointing at `git@code.ornl.gov:6ov/supplementary-material.git`,

  branch `hack-a-thon-2026`. After cloning, run `git submodule update --init

  --recursive` (or clone the parent with `--recurse-submodules`) to populate

  this directory. The supplementary repo is organized as a series of

  detached/orphan branches, one per event; new bulky material for a future

  hack-a-thon should land on its own orphan branch there, not directly in

  `tasking`. See `setup/patterns/submodule-for-bulky-content.md` in the parent

  repo for the rationale.

*(Shared rules like "Secure Temporary Files" live in the parent repo's `CLAUDE.md`

and in `setup/patterns/*.md`; they are not duplicated here.)*

# Plan: Finalize Desktop/ Submodule Migration Cleanup

**Created:** 2026-04-30

**Scheduled finalization:** 2026-05-04 (or later — no rush, the safety net is benign)

## Context

On 2026-04-30, we migrated 74 MB of supplementary material out of `tasking`'s

git history and into a separate `supplementary-material` repo, referenced as a

submodule at `Desktop/`.

- The `hack-a-thon-2026-supplementary-material` branch was rewritten via

  `git filter-repo` and force-pushed. HEAD: `6f0fe11` → `34a9629`. Tree size:

  82.9 MB → 0.6 MB. 16 unique commits collapsed to 6 (the dropped 10 only

  contained supplementary files).

- The supplementary repo at `git@code.ornl.gov:6ov/supplementary-material.git`,

  branch `hack-a-thon-2026`, holds the 47 files (45 from Desktop/ plus

  `2026-Hack-A-Thon-Bogdan.pptx` and `Hack-A-Thon-Scientist-Assessment.pptx`).

  Latest SHA there: `7efee31`.

- The submodule was added at `Desktop/` with SSH URL.

Two safety artifacts were left as a 2-3 day rollback net:

1. **Local backup branch** `local/pre-desktop-cleanup` at SHA `6f0fe11`

   (local-only, never pushed) — preserves the pre-rewrite chain so the old

   blobs stay reachable in this clone's `.git/objects`.

2. **Staging directory** `/Users/6ov/Documents/Projects/Claude/1/.staging-supplementary`

   — the working dir used to push the initial supplementary content. Independent

   of `tasking`.

After verification, both can be removed and `git gc` will reclaim ~74 MB.

## Pre-flight verification (before any destructive step)

Run these and confirm before proceeding. Stop and investigate if anything fails.

```bash

cd /Users/6ov/Documents/Projects/Claude/1/tasking

# Branch and remote in sync at the rewritten tip (or descendant)

git rev-parse HEAD                                              # 34a9629... or descendant

git rev-parse origin/hack-a-thon-2026-supplementary-material    # should match local

# Submodule resolves

git submodule status                                            # Desktop: clean (no + or -)

ls Desktop | head -5                                            # 2026-04-22-Files.md etc.

git -C Desktop log --oneline | head                             # 7efee31, c4d4302

# Tree size is small

git ls-tree -r -l HEAD | awk '{s+=$4} END {printf "%.1f MB\n", s/1048576}'

# Expected: ~0.6 MB

# Backup branch still where we left it (will be deleted)

git rev-parse local/pre-desktop-cleanup                         # 6f0fe110...

```

## Cleanup (only after the above passes)

```bash

cd /Users/6ov/Documents/Projects/Claude/1/tasking

# 1. Delete the local backup branch (this orphans the old 6f0fe11 chain)

git branch -D local/pre-desktop-cleanup

# 2. Reclaim orphaned blobs

git reflog expire --expire=now --all

git gc --prune=now

# 3. Remove the staging directory

rm -rf /Users/6ov/Documents/Projects/Claude/1/.staging-supplementary

```

## Post-cleanup verification

```bash

du -sh "$(git rev-parse --git-dir)"   # should drop from ~114 MB to a few MB

git status                            # clean

git rev-parse HEAD                    # still 34a9629 or descendant

ls Desktop | head -5                  # submodule still populated

```

## Rollback notes

The backup branch was local-only — never pushed. After deletion + gc, the old

`6f0fe11` chain is unrecoverable from THIS machine. Mitigations:

- Other tasking clones (other machines, other folders on this Mac) likely still

  have the old chain in their `.git/objects` until they fetch the rewritten

  branch and gc themselves. The chain can be re-fetched from any of them.

- The supplementary remote at `7efee31` durably holds all 47 files

  independently of any rewrite outcome.

If something looks wrong DURING pre-flight verification, do not proceed; this

plan is informational only and the safety net stays in place until you say

otherwise.