mirror of
https://github.com/google-gemini/gemini-cli.git
synced 2026-07-15 12:30:32 -07:00
feat(ux-extension): address feedback and fix build errors
This commit is contained in:
@@ -14,7 +14,7 @@ export class AcpFileSystemService implements FileSystemService {
|
||||
constructor(
|
||||
private readonly connection: acp.AgentSideConnection,
|
||||
private readonly sessionId: string,
|
||||
private readonly capabilities: acp.FileSystemCapability,
|
||||
private readonly capabilities: acp.FileSystemCapabilities,
|
||||
private readonly fallback: FileSystemService,
|
||||
) {}
|
||||
|
||||
|
||||
@@ -50,8 +50,10 @@ When you're happy, just say "I'm ready to submit." I'll run the
|
||||
structural integrity.
|
||||
3. **Snapshots**: Fixes snapshots for CI using a neutral environment.
|
||||
4. **Preflight**: Runs the full `preflight` suite.
|
||||
5. **Commit Strategy**: Squashes your main feature into one commit, but keeps
|
||||
review-fix commits separate to keep the diffs manageable for reviewers.
|
||||
5. **Commit Strategy**: Squashes your main feature and ALL previous review
|
||||
fixes into one commit, but keeps only the **very last** round of code review
|
||||
comments as separate commits. This keeps the diffs manageable and fast for
|
||||
reviewers (30 seconds vs. 10 minutes).
|
||||
|
||||
### **Phase 5: Handling Feedback**
|
||||
|
||||
|
||||
@@ -48,8 +48,11 @@ You are a senior co-author assistant. Your goal is to ensure this PR passes CI o
|
||||
- **Diff Verification**: After reverting, run `git diff origin/main...HEAD` on the specific reverted files to ensure their diff is completely empty.
|
||||
|
||||
### 7. Final Submission
|
||||
- **Commit Strategy**: Squash commits for the main feature into a single Conventional Commit (e.g., `feat(ui): ...`), BUT keep code review fixes as separate commits. Do not squash review fixes into the main feature commit; reviewing the entire diff repeatedly is brutal for reviewers.
|
||||
- **Commit Strategy**: Maintain a **Two-Tier** commit history to optimize for reviewer speed (30s vs 10m):
|
||||
1. **Tier 1 (Base)**: A single squashed Conventional Commit (e.g., `feat(ui): ...`) containing the core feature and all *previously addressed* review cycles.
|
||||
2. **Tier 2 (Latest)**: Separate, granular commits addressing only the **very last** round of reviewer feedback.
|
||||
- **Action**: Use `git rebase -i` or `git reset --soft` to squash all older review-fix commits into the Tier 1 base. Ensure only the commits from the current (latest) review cycle remain as separate entries.
|
||||
- **Push**: `git push origin HEAD --force-with-lease`.
|
||||
- **Link**: Provide the GitHub PR link.
|
||||
- **Link**: You MUST provide the full, clickable GitHub PR link (e.g., `https://github.com/google-gemini/gemini-cli/pull/23487`) as the final output of this skill. This allows the user to immediately verify the update.
|
||||
|
||||
**Note**: If any step fails, do NOT claim completion. Fix the issue and restart from Step 1.
|
||||
|
||||
Reference in New Issue
Block a user