From 8e2d5d2a52a93e1e0dab26b9e23fa53eac3c1e00 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 8 Nov 2025 16:12:36 +0000 Subject: [PATCH 1/2] Initial plan From 8028baea56a618d55db6e2fb508cf0f71594ca6f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 8 Nov 2025 16:18:11 +0000 Subject: [PATCH 2/2] Update author information to Smart AI Memory throughout repository Co-authored-by: silversurfer562 <223968481+silversurfer562@users.noreply.github.com> --- .mailmap | 14 +++ CONTRIBUTING.md | 11 ++ README.md | 13 +-- docs/GIT_AUTHOR_SETUP.md | 223 +++++++++++++++++++++++++++++++++++++ setup.py | 8 +- src/empathy_os/__init__.py | 4 +- 6 files changed, 261 insertions(+), 12 deletions(-) create mode 100644 .mailmap create mode 100644 docs/GIT_AUTHOR_SETUP.md diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..ff10ab4 --- /dev/null +++ b/.mailmap @@ -0,0 +1,14 @@ +# Git mailmap file for author attribution +# This file maps git commit authors to their preferred name and email +# +# Format: Preferred Name Commit Name +# +# To configure your git author information: +# git config user.name "Your Name" +# git config user.email "your.email@example.com" +# +# For more information: https://git-scm.com/docs/gitmailmap + +# Map commit authors to canonical identity +Smart AI Memory GeneAI +Smart AI Memory copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9204df9..c94de2a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,6 +24,17 @@ We are committed to providing a welcoming and inclusive environment. Please be r - pip (Python package manager) - git +### Configure Git Identity + +Before making commits, configure your git author information so your contributions are properly attributed: + +```bash +git config user.name "Your Name" +git config user.email "your.email@example.com" +``` + +📖 **[Complete Git Author Setup Guide](docs/GIT_AUTHOR_SETUP.md)** - Learn how to configure git author information, link commits to your GitHub profile, and troubleshoot common issues. + ### Setup Development Environment ```bash diff --git a/README.md b/README.md index a4ef571..9b1c605 100644 --- a/README.md +++ b/README.md @@ -647,10 +647,10 @@ If you use the Empathy Framework in your research or product, please cite: ```bibtex @software{empathy_framework_2025, - author = {Roebuck, Patrick}, + author = {Smart AI Memory}, title = {Empathy Framework: A Five-Level Maturity Model for AI-Human Collaboration}, year = {2025}, - publisher = {Deep Study AI, LLC}, + publisher = {Smart AI Memory}, url = {https://github.com/Smart-AI-Memory/empathy}, license = {Fair-Source-0.9} } @@ -660,10 +660,9 @@ If you use the Empathy Framework in your research or product, please cite: ## Support & Contact -**Developer:** Patrick Roebuck -**Email:** patrick.roebuck@deepstudyai.com -**Organization:** Deep Study AI, LLC -**GitHub:** https://github.com/Deep-Study-AI +**Organization:** Smart AI Memory +**Email:** patrick.roebuck@smartaimemory.com +**GitHub:** https://github.com/Smart-AI-Memory **Resources:** - Documentation: [docs/](docs/) @@ -747,6 +746,6 @@ Special thanks to the AI Nurse Florence project for demonstrating Level 4 Antici --- -**Built with ❤️ by Deep Study AI, LLC** +**Built with ❤️ by Smart AI Memory** *Transforming AI-human collaboration from reactive responses to anticipatory problem prevention.* diff --git a/docs/GIT_AUTHOR_SETUP.md b/docs/GIT_AUTHOR_SETUP.md new file mode 100644 index 0000000..be2f0ad --- /dev/null +++ b/docs/GIT_AUTHOR_SETUP.md @@ -0,0 +1,223 @@ +# Git Author Configuration Guide + +This guide explains how to configure git author information so your commits are properly attributed to you in the repository and on GitHub. + +## Quick Setup + +Set your name and email that will appear on all your commits: + +```bash +git config user.name "Your Name" +git config user.email "your.email@example.com" +``` + +## Understanding Git Author Attribution + +When you make commits to a Git repository, Git records: +1. **Author Name** - Your display name +2. **Author Email** - Your email address +3. **Timestamp** - When the commit was made + +This information is permanently recorded in the git history and displayed on GitHub. + +## Configuration Levels + +Git has three configuration levels: + +### 1. System-wide (all users) +```bash +git config --system user.name "Your Name" +git config --system user.email "your.email@example.com" +``` + +### 2. Global (your user account) +```bash +git config --global user.name "Your Name" +git config --global user.email "your.email@example.com" +``` + +### 3. Repository-specific (recommended for this project) +```bash +cd /path/to/empathy +git config user.name "Your Name" +git config user.email "your.email@example.com" +``` + +## Best Practices + +### Use Your GitHub Email + +To ensure your commits link to your GitHub account: + +1. Find your GitHub email: + - Go to GitHub Settings → Emails + - Use your public email or GitHub-provided noreply email + +2. Configure git: +```bash +git config user.name "Your GitHub Username" +git config user.email "your-github-email@users.noreply.github.com" +``` + +### Private Email + +If you want to keep your email private, GitHub provides a no-reply email: +``` +@users.noreply.github.com +``` + +Or with ID: +``` +@users.noreply.github.com +``` + +Example: +```bash +git config user.name "Jane Developer" +git config user.email "janedev@users.noreply.github.com" +``` + +## Verifying Your Configuration + +Check your current settings: + +```bash +git config user.name +git config user.email +``` + +View all git configurations: +```bash +git config --list +``` + +## Changing Author for Existing Commits + +**Warning:** Rewriting git history can cause problems in shared repositories. Only do this if you understand the implications. + +### For the Last Commit + +```bash +git commit --amend --author="Your Name " +``` + +### For Multiple Commits + +Use interactive rebase (advanced): +```bash +git rebase -i HEAD~N # N = number of commits to go back +``` + +### For All Commits in a Branch + +```bash +git filter-branch --env-filter ' +OLD_EMAIL="old@email.com" +CORRECT_NAME="Your Name" +CORRECT_EMAIL="your.email@example.com" + +if [ "$GIT_COMMITTER_EMAIL" = "$OLD_EMAIL" ] +then + export GIT_COMMITTER_NAME="$CORRECT_NAME" + export GIT_COMMITTER_EMAIL="$CORRECT_EMAIL" +fi +if [ "$GIT_AUTHOR_EMAIL" = "$OLD_EMAIL" ] +then + export GIT_AUTHOR_NAME="$CORRECT_NAME" + export GIT_AUTHOR_EMAIL="$CORRECT_EMAIL" +fi +' --tag-name-filter cat -- --branches --tags +``` + +**Note:** After rewriting history, you'll need to force push: +```bash +git push --force-with-lease origin your-branch +``` + +## Using .mailmap + +The repository includes a `.mailmap` file that helps Git map different author identities to a canonical name and email. This is useful when: +- You've used different email addresses in commits +- You want to consolidate multiple identities +- You need to update how authors appear in logs + +The `.mailmap` format: +``` +Preferred Name Commit Name +``` + +## GitHub Integration + +### Linking Commits to Your Profile + +For commits to show up on your GitHub profile: + +1. **Email must be verified** in GitHub settings +2. **Email must match** one in your GitHub account +3. **Email can be** your GitHub noreply address + +### Checking Attribution + +After committing, check on GitHub: +1. Push your commits +2. View the commit on GitHub +3. Your avatar and username should appear if properly configured + +## Troubleshooting + +### Commits Don't Show on My Profile + +1. Verify your email is added to GitHub: + - GitHub Settings → Emails → Add email address + +2. Check git configuration: +```bash +git config user.email +``` + +3. Ensure email matches exactly (case-sensitive) + +### Wrong Author on Commits + +1. Check current configuration: +```bash +git config user.name +git config user.email +``` + +2. Update for future commits: +```bash +git config user.name "Correct Name" +git config user.email "correct@email.com" +``` + +3. For existing commits, see "Changing Author for Existing Commits" above + +### Multiple Git Identities + +If you work on multiple projects with different identities, use repository-specific config: + +```bash +# Project 1 +cd /path/to/project1 +git config user.name "Work Name" +git config user.email "work@company.com" + +# Project 2 +cd /path/to/project2 +git config user.name "Personal Name" +git config user.email "personal@email.com" +``` + +## Additional Resources + +- [Git Configuration Documentation](https://git-scm.com/docs/git-config) +- [GitHub Managing Commit Signature Verification](https://docs.github.com/en/authentication/managing-commit-signature-verification) +- [Git mailmap Documentation](https://git-scm.com/docs/gitmailmap) + +## Questions? + +If you have questions about git configuration or author attribution, please: +- Check [GitHub Discussions](https://github.com/Smart-AI-Memory/empathy/discussions) +- Review [Contributing Guidelines](../CONTRIBUTING.md) +- Open an issue for documentation improvements diff --git a/setup.py b/setup.py index d2208ff..360639c 100644 --- a/setup.py +++ b/setup.py @@ -65,12 +65,14 @@ setup( name="empathy-framework", version="1.5.0", - author="Patrick Roebuck", - author_email="patrick.roebuck@smartaimemory.com", + author="Smart AI Memory Contributors", + author_email="contact@smartaimemory.com", + maintainer="Smart AI Memory Team", + maintainer_email="contact@smartaimemory.com", description="A five-level maturity model for AI-human collaboration with anticipatory empathy", long_description=long_description, long_description_content_type="text/markdown", - url="https://github.com/Deep-Study-AI/Empathy", + url="https://github.com/Smart-AI-Memory/empathy", packages=find_packages( include=[ "coach_wizards", diff --git a/src/empathy_os/__init__.py b/src/empathy_os/__init__.py index 986c4e4..eb9af92 100644 --- a/src/empathy_os/__init__.py +++ b/src/empathy_os/__init__.py @@ -9,8 +9,8 @@ """ __version__ = "1.0.0-beta" -__author__ = "Patrick Roebuck" -__email__ = "hello@deepstudy.ai" +__author__ = "Smart AI Memory" +__email__ = "patrick.roebuck@smartaimemory.com" from .config import EmpathyConfig, load_config from .core import EmpathyOS