-
Notifications
You must be signed in to change notification settings - Fork 1.7k
fix(scripts): update context extraction and placeholder handling #161
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
amondnet
wants to merge
5
commits into
github:main
Choose a base branch
from
amondnet:fix-scripts-update-context
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+63
−30
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
a3348aa
fix(scripts): update context extraction and placeholder handling in u…
amondnet 8b8406f
fix: correct duplicate command check logic per PR #161 review
amondnet 6bcf608
Update scripts/update-agent-context.sh
amondnet 5f6d138
Update scripts/update-agent-context.sh
localden cff3a09
Update scripts/update-agent-context.sh
localden File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -26,12 +26,26 @@ fi | |||||
| echo "=== Updating agent context files for feature $CURRENT_BRANCH ===" | ||||||
|
|
||||||
| # Extract tech from new plan | ||||||
| NEW_LANG=$(grep "^**Language/Version**: " "$NEW_PLAN" 2>/dev/null | head -1 | sed 's/^**Language\/Version**: //' | grep -v "NEEDS CLARIFICATION" || echo "") | ||||||
| NEW_FRAMEWORK=$(grep "^**Primary Dependencies**: " "$NEW_PLAN" 2>/dev/null | head -1 | sed 's/^**Primary Dependencies**: //' | grep -v "NEEDS CLARIFICATION" || echo "") | ||||||
| NEW_TESTING=$(grep "^**Testing**: " "$NEW_PLAN" 2>/dev/null | head -1 | sed 's/^**Testing**: //' | grep -v "NEEDS CLARIFICATION" || echo "") | ||||||
| NEW_DB=$(grep "^**Storage**: " "$NEW_PLAN" 2>/dev/null | head -1 | sed 's/^**Storage**: //' | grep -v "N/A" | grep -v "NEEDS CLARIFICATION" || echo "") | ||||||
| NEW_PROJECT_TYPE=$(grep "^**Project Type**: " "$NEW_PLAN" 2>/dev/null | head -1 | sed 's/^**Project Type**: //' || echo "") | ||||||
| # Function to extract a field from plan.md | ||||||
| extract_field() { | ||||||
| local field="$1" | ||||||
| local plan_file="$2" | ||||||
| local value | ||||||
| value=$(grep "^\\*\\*${field}\\*\\*: " "$plan_file" 2>/dev/null | head -1 | sed "s|^\\*\\*${field}\\*\\*: ||") | ||||||
| # Filter out "NEEDS CLARIFICATION" for all except Project Type | ||||||
| if [[ "$field" == "Storage" ]]; then | ||||||
| value=$(echo "$value" | grep -v "N/A" | grep -v "NEEDS CLARIFICATION") | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Using multiple grep commands with pipes creates unnecessary subprocesses. Consider using a single grep with alternation pattern:
Suggested change
Copilot uses AI. Check for mistakes. Positive FeedbackNegative Feedback |
||||||
| elif [[ "$field" == "Language/Version" || "$field" == "Primary Dependencies" || "$field" == "Testing" ]]; then | ||||||
| value=$(echo "$value" | grep -v "NEEDS CLARIFICATION") | ||||||
| fi | ||||||
| echo "${value:-}" | ||||||
| } | ||||||
|
|
||||||
| NEW_LANG=$(extract_field "Language/Version" "$NEW_PLAN") | ||||||
| NEW_FRAMEWORK=$(extract_field "Primary Dependencies" "$NEW_PLAN") | ||||||
| NEW_TESTING=$(extract_field "Testing" "$NEW_PLAN") | ||||||
| NEW_DB=$(extract_field "Storage" "$NEW_PLAN") | ||||||
| NEW_PROJECT_TYPE=$(extract_field "Project Type" "$NEW_PLAN") | ||||||
| # Function to update a single agent context file | ||||||
| update_agent_file() { | ||||||
| local target_file="$1" | ||||||
|
|
@@ -55,15 +69,15 @@ update_agent_file() { | |||||
| fi | ||||||
|
|
||||||
| # Replace placeholders | ||||||
| sed -i.bak "s/\[PROJECT NAME\]/$(basename $REPO_ROOT)/" "$temp_file" | ||||||
| sed -i.bak "s/\[DATE\]/$(date +%Y-%m-%d)/" "$temp_file" | ||||||
| sed -i.bak "s/\[EXTRACTED FROM ALL PLAN.MD FILES\]/- $NEW_LANG + $NEW_FRAMEWORK ($CURRENT_BRANCH)/" "$temp_file" | ||||||
| sed -i.bak "s/\\[PROJECT NAME\\]/$(basename $REPO_ROOT)/" "$temp_file" | ||||||
| sed -i.bak "s/\\[DATE\\]/$(date +%Y-%m-%d)/" "$temp_file" | ||||||
| sed -i.bak "s/\\[EXTRACTED FROM ALL PLAN.MD FILES\\]/- $NEW_LANG + $NEW_FRAMEWORK ($CURRENT_BRANCH)/" "$temp_file" | ||||||
|
|
||||||
| # Add project structure based on type | ||||||
| if [[ "$NEW_PROJECT_TYPE" == *"web"* ]]; then | ||||||
| sed -i.bak "s|\[ACTUAL STRUCTURE FROM PLANS\]|backend/\nfrontend/\ntests/|" "$temp_file" | ||||||
| sed -i.bak "s|\\[ACTUAL STRUCTURE FROM PLANS\\]|backend/\nfrontend/\ntests/|" "$temp_file" | ||||||
| else | ||||||
| sed -i.bak "s|\[ACTUAL STRUCTURE FROM PLANS\]|src/\ntests/|" "$temp_file" | ||||||
| sed -i.bak "s|\\[ACTUAL STRUCTURE FROM PLANS\\]|src/\ntests/|" "$temp_file" | ||||||
| fi | ||||||
|
|
||||||
| # Add minimal commands | ||||||
|
|
@@ -76,13 +90,13 @@ update_agent_file() { | |||||
| else | ||||||
| COMMANDS="# Add commands for $NEW_LANG" | ||||||
| fi | ||||||
| sed -i.bak "s|\[ONLY COMMANDS FOR ACTIVE TECHNOLOGIES\]|$COMMANDS|" "$temp_file" | ||||||
| sed -i.bak "s|\\[ONLY COMMANDS FOR ACTIVE TECHNOLOGIES\\]|$COMMANDS|" "$temp_file" | ||||||
|
|
||||||
| # Add code style | ||||||
| sed -i.bak "s|\[LANGUAGE-SPECIFIC, ONLY FOR LANGUAGES IN USE\]|$NEW_LANG: Follow standard conventions|" "$temp_file" | ||||||
| sed -i.bak "s|\\[LANGUAGE-SPECIFIC, ONLY FOR LANGUAGES IN USE\\]|$NEW_LANG: Follow standard conventions|" "$temp_file" | ||||||
|
|
||||||
| # Add recent changes | ||||||
| sed -i.bak "s|\[LAST 3 FEATURES AND WHAT THEY ADDED\]|- $CURRENT_BRANCH: Added $NEW_LANG + $NEW_FRAMEWORK|" "$temp_file" | ||||||
| sed -i.bak "s|\\[LAST 3 FEATURES AND WHAT THEY ADDED\\]|- $CURRENT_BRANCH: Added $NEW_LANG + $NEW_FRAMEWORK|" "$temp_file" | ||||||
|
|
||||||
| rm "$temp_file.bak" | ||||||
| else | ||||||
|
|
@@ -96,14 +110,33 @@ update_agent_file() { | |||||
| sed -n "${manual_start},${manual_end}p" "$target_file" > /tmp/manual_additions.txt | ||||||
| fi | ||||||
|
|
||||||
| # Export variables for Python script | ||||||
| export TARGET_FILE="$target_file" | ||||||
| export NEW_LANG="$NEW_LANG" | ||||||
| export NEW_FRAMEWORK="$NEW_FRAMEWORK" | ||||||
| export NEW_DB="$NEW_DB" | ||||||
| export CURRENT_BRANCH="$CURRENT_BRANCH" | ||||||
| export NEW_PROJECT_TYPE="$NEW_PROJECT_TYPE" | ||||||
| export TEMP_FILE="$temp_file" | ||||||
|
|
||||||
| # Parse existing file and create updated version | ||||||
| python3 - << EOF | ||||||
| python3 - << 'EOF' | ||||||
| import re | ||||||
| import sys | ||||||
| import os | ||||||
| from datetime import datetime | ||||||
| # Get environment variables from bash | ||||||
| target_file = os.environ.get('TARGET_FILE', '') | ||||||
| new_lang = os.environ.get('NEW_LANG', '') | ||||||
| new_framework = os.environ.get('NEW_FRAMEWORK', '') | ||||||
| new_db = os.environ.get('NEW_DB', '') | ||||||
| current_branch = os.environ.get('CURRENT_BRANCH', '') | ||||||
| new_project_type = os.environ.get('NEW_PROJECT_TYPE', '') | ||||||
| temp_file = os.environ.get('TEMP_FILE', '') | ||||||
| # Read existing file | ||||||
| with open("$target_file", 'r') as f: | ||||||
| with open(target_file, 'r') as f: | ||||||
| content = f.read() | ||||||
| # Check if new tech already exists | ||||||
|
|
@@ -113,40 +146,40 @@ if tech_section: | |||||
| # Add new tech if not already present | ||||||
| new_additions = [] | ||||||
| if "$NEW_LANG" and "$NEW_LANG" not in existing_tech: | ||||||
| new_additions.append(f"- $NEW_LANG + $NEW_FRAMEWORK ($CURRENT_BRANCH)") | ||||||
| if "$NEW_DB" and "$NEW_DB" not in existing_tech and "$NEW_DB" != "N/A": | ||||||
| new_additions.append(f"- $NEW_DB ($CURRENT_BRANCH)") | ||||||
| if new_lang and new_lang not in existing_tech: | ||||||
| new_additions.append(f"- {new_lang} + {new_framework} ({current_branch})") | ||||||
| if new_db and new_db not in existing_tech and new_db != "N/A": | ||||||
| new_additions.append(f"- {new_db} ({current_branch})") | ||||||
| if new_additions: | ||||||
| updated_tech = existing_tech + "\n" + "\n".join(new_additions) | ||||||
| content = content.replace(tech_section.group(0), f"## Active Technologies\n{updated_tech}\n\n") | ||||||
| # Update project structure if needed | ||||||
| if "$NEW_PROJECT_TYPE" == "web" and "frontend/" not in content: | ||||||
| struct_section = re.search(r'## Project Structure\n\`\`\`\n(.*?)\n\`\`\`', content, re.DOTALL) | ||||||
| if new_project_type == "web" and "frontend/" not in content: | ||||||
| struct_section = re.search(r'## Project Structure\n```\n(.*?)\n```', content, re.DOTALL) | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The regex patterns for matching markdown code blocks are duplicated across multiple sections. Consider extracting these into reusable functions or constants to improve maintainability. Copilot uses AI. Check for mistakes. Positive FeedbackNegative Feedback |
||||||
| if struct_section: | ||||||
| updated_struct = struct_section.group(1) + "\nfrontend/src/ # Web UI" | ||||||
| content = re.sub(r'(## Project Structure\n\`\`\`\n).*?(\n\`\`\`)', | ||||||
| content = re.sub(r'(## Project Structure\n```\n).*?(\n```)', | ||||||
localden marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| f'\\1{updated_struct}\\2', content, flags=re.DOTALL) | ||||||
| # Add new commands if language is new | ||||||
| if "$NEW_LANG" and f"# {NEW_LANG}" not in content: | ||||||
| commands_section = re.search(r'## Commands\n\`\`\`bash\n(.*?)\n\`\`\`', content, re.DOTALL) | ||||||
| if new_lang and new_lang not in content: | ||||||
| commands_section = re.search(r'## Commands\n```bash\n(.*?)\n```', content, re.DOTALL) | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Similar to the previous comment, the regex patterns with backticks in raw strings should be escaped as Copilot uses AI. Check for mistakes. Positive FeedbackNegative Feedback |
||||||
| if not commands_section: | ||||||
| commands_section = re.search(r'## Commands\n(.*?)\n\n', content, re.DOTALL) | ||||||
| if commands_section: | ||||||
| new_commands = commands_section.group(1) | ||||||
| if "Python" in "$NEW_LANG": | ||||||
| if "Python" in new_lang: | ||||||
amondnet marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| new_commands += "\ncd src && pytest && ruff check ." | ||||||
| elif "Rust" in "$NEW_LANG": | ||||||
| elif "Rust" in new_lang: | ||||||
| new_commands += "\ncargo test && cargo clippy" | ||||||
| elif "JavaScript" in "$NEW_LANG" or "TypeScript" in "$NEW_LANG": | ||||||
| elif "JavaScript" in new_lang or "TypeScript" in new_lang: | ||||||
| new_commands += "\nnpm test && npm run lint" | ||||||
| if "```bash" in content: | ||||||
| content = re.sub(r'(## Commands\n\`\`\`bash\n).*?(\n\`\`\`)', | ||||||
| content = re.sub(r'(## Commands\n```bash\n).*?(\n```)', | ||||||
| f'\\1{new_commands}\\2', content, flags=re.DOTALL) | ||||||
| else: | ||||||
| content = re.sub(r'(## Commands\n).*?(\n\n)', | ||||||
|
|
@@ -156,7 +189,7 @@ if "$NEW_LANG" and f"# {NEW_LANG}" not in content: | |||||
| changes_section = re.search(r'## Recent Changes\n(.*?)(\n\n|$)', content, re.DOTALL) | ||||||
| if changes_section: | ||||||
| changes = changes_section.group(1).strip().split('\n') | ||||||
| changes.insert(0, f"- $CURRENT_BRANCH: Added $NEW_LANG + $NEW_FRAMEWORK") | ||||||
| changes.insert(0, f"- {current_branch}: Added {new_lang} + {new_framework}") | ||||||
| # Keep only last 3 | ||||||
| changes = changes[:3] | ||||||
| content = re.sub(r'(## Recent Changes\n).*?(\n\n|$)', | ||||||
|
|
@@ -167,7 +200,7 @@ content = re.sub(r'Last updated: \d{4}-\d{2}-\d{2}', | |||||
| f'Last updated: {datetime.now().strftime("%Y-%m-%d")}', content) | ||||||
| # Write to temp file | ||||||
| with open("$temp_file", 'w') as f: | ||||||
| with open(temp_file, 'w') as f: | ||||||
| f.write(content) | ||||||
| EOF | ||||||
|
|
||||||
|
|
||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using multiple grep commands with pipes creates unnecessary subprocesses. Consider using a single grep with alternation pattern:
grep -v -E '(N/A|NEEDS CLARIFICATION)'.Copilot uses AI. Check for mistakes.