merge: replay ci batch 20260226-01#390
Closed
KooshaPari wants to merge 682 commits intorouter-for-me:mainfrom
Closed
merge: replay ci batch 20260226-01#390KooshaPari wants to merge 682 commits intorouter-for-me:mainfrom
KooshaPari wants to merge 682 commits intorouter-for-me:mainfrom
Conversation
Build Fixes: - Fix duplicate type definitions in kiro_websearch_handler.go (McpRequest, McpResponse, WebSearchResults) - Fix undefined authID and wsURL variables in codex_websockets_executor.go by naming parameters - Remove unused imports (crypto/sha256, encoding/hex) from codex_websockets_executor.go - Add missing syscall import to cmd/cliproxyctl/main.go for error handling - Remove incomplete showConfigPaths block from cmd/server/main.go (undefined functions) - Remove unused strings import from copilot/token_test.go Track 1.2 - ACP Adapter: - Implement ACP adapter to translate Claude/OpenAI protocol messages to ACP protocol - Add acp_request.go: Request translation and validation - Add acp_response.go: Response translation and formatting - Add acp_adapter.go: Main adapter logic with registry integration - Add unit tests in acp_adapter_registry_test.go Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
chore: merge ci-compile-fix-clean-single lane closeout and fixes
# Conflicts: # pkg/llmproxy/api/handlers/management/auth_files.go # pkg/llmproxy/api/handlers/management/management_extra_test.go
…type - Fixed missing closing brace in for loop - Changed return type from string to bool for proper if statement usage - Updated caller to use boolean check
- Fix unused sync/atomic import in kiro_websearch_handler.go - Fix handlers_metadata_test.go to use correct gin context key - Remove broken test files with undefined symbols Testing: Build PASS, Vet PASS, Tests PASS
This reverts commit 2464a28.
…2-20260223-034902' into cliproxy-clean-merge
…2-20260223-035004' into cliproxy-clean-merge
Summary of ChangesHello @KooshaPari, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request integrates a substantial batch of changes aimed at fortifying the project's development infrastructure and operational capabilities. The updates span across continuous integration, code quality, security, and developer tooling, ensuring a more robust and maintainable codebase. Significant effort has been placed on refining automated checks, standardizing configuration management, and enhancing the CLI experience for various authentication flows and provider integrations. Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Changelog
Ignored Files
Activity
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request is a large batch merge that introduces a significant number of new files for CI/CD, configuration, and new API functionality. My review has identified several critical issues related to unresolved merge conflicts in configuration and script files, which must be addressed before this PR can be merged. Additionally, there are high-severity issues with invalid Dependabot configurations and the use of placeholder credentials in the code. I've also noted a medium-severity issue regarding a hardcoded timezone in the Dockerfile.
Comment on lines
+13
to
+16
| <<<<<<< HEAD | ||
| ======= | ||
| - Support multiple aliases for a single upstream model in OAuth model alias configuration, preserving compatibility while allowing same upstream model name with distinct aliases. | ||
| >>>>>>> archive/pr-234-head-20260223 |
There was a problem hiding this comment.
This file contains merge conflict markers (<<<<<<<, =======, >>>>>>>). These must be resolved before merging.
Comment on lines
+359
to
+377
| <<<<<<< HEAD | ||
| - task: quality:docs-phase-placeholders | ||
| ======= | ||
| >>>>>>> archive/pr-234-head-20260223 | ||
| - ./.github/scripts/release-lint.sh | ||
|
|
||
| quality:docs-open-items-parity: | ||
| desc: "Prevent stale status drift in fragmented open-items report" | ||
| cmds: | ||
| - ./.github/scripts/check-open-items-fragmented-parity.sh | ||
|
|
||
| <<<<<<< HEAD | ||
| quality:docs-phase-placeholders: | ||
| desc: "Reject unresolved placeholder-like tokens in planning reports" | ||
| cmds: | ||
| - ./.github/scripts/check-phase-doc-placeholder-tokens.sh | ||
|
|
||
| ======= | ||
| >>>>>>> archive/pr-234-head-20260223 |
There was a problem hiding this comment.
This file contains merge conflict markers (<<<<<<<, =======, >>>>>>>). These must be resolved before merging.
Comment on lines
+13
to
+29
| <<<<<<< HEAD | ||
| ======= | ||
| # Normalize CONFIG_FILE when mount points incorrectly create a directory. | ||
| if [ -d "${CONFIG_FILE}" ]; then | ||
| CONFIG_FILE="${CONFIG_FILE%/}/config.yaml" | ||
| fi | ||
|
|
||
| >>>>>>> archive/pr-234-head-20260223 | ||
| # Create auth directory if it doesn't exist | ||
| if [ ! -d "${AUTH_DIR}" ]; then | ||
| echo "[docker-init] Creating auth directory: ${AUTH_DIR}" | ||
| mkdir -p "${AUTH_DIR}" | ||
| fi | ||
| <<<<<<< HEAD | ||
| ======= | ||
| chmod 700 "${AUTH_DIR}" | ||
| >>>>>>> archive/pr-234-head-20260223 |
There was a problem hiding this comment.
This file contains merge conflict markers (<<<<<<<, =======, >>>>>>>). These must be resolved before merging.
Comment on lines
+10
to
+18
| <<<<<<< HEAD | ||
| health-probe: | ||
| command: "sh -lc 'while true; do curl -fsS http://localhost:8317/health >/dev/null 2>&1 || true; sleep 20; done'" | ||
| working_dir: "." | ||
| availability: | ||
| restart: "always" | ||
| ======= | ||
|
|
||
| >>>>>>> archive/pr-234-head-20260223 |
There was a problem hiding this comment.
This file contains merge conflict markers (<<<<<<<, =======, >>>>>>>). These must be resolved before merging.
|
|
||
| version: 2 | ||
| updates: | ||
| - package-ecosystem: "" # See documentation for possible values haha |
There was a problem hiding this comment.
The package-ecosystem is empty, which will cause Dependabot to fail. You need to specify a valid package ecosystem, for example, gomod for Go modules. The comment haha suggests this might be intentional, but it leaves the configuration non-functional.
- package-ecosystem: "gomod" # See documentation for possible values haha|
|
||
| version: 2 | ||
| updates: | ||
| - package-ecosystem: "" # See documentation for possible values haha |
There was a problem hiding this comment.
The package-ecosystem is empty, which will cause Dependabot to fail. You need to specify a valid package ecosystem, for example, gomod for Go modules. The comment haha suggests this might be intentional, but it leaves the configuration non-functional.
- package-ecosystem: "gomod" # See documentation for possible values haha
Comment on lines
+36
to
+41
| if geminiOAuthClientID == "" { | ||
| geminiOAuthClientID = "PLACEHOLDER_SET_FROM_CONFIG" | ||
| } | ||
| if geminiOAuthClientSecret == "" { | ||
| geminiOAuthClientSecret = "PLACEHOLDER_SET_FROM_CONFIG" | ||
| } |
There was a problem hiding this comment.
The geminiOAuthClientID and geminiOAuthClientSecret are initialized with placeholder values if the corresponding environment variables are not set. This can lead to runtime failures with misleading error messages if the environment is not configured correctly. It would be more robust to check for the presence of these credentials at startup and fail fast with a clear error message if they are missing.
Suggested change
| if geminiOAuthClientID == "" { | |
| geminiOAuthClientID = "PLACEHOLDER_SET_FROM_CONFIG" | |
| } | |
| if geminiOAuthClientSecret == "" { | |
| geminiOAuthClientSecret = "PLACEHOLDER_SET_FROM_CONFIG" | |
| } | |
| if geminiOAuthClientID == "" { | |
| log.Warn("GEMINI_OAUTH_CLIENT_ID is not set. Gemini OAuth flow will likely fail.") | |
| } | |
| if geminiOAuthClientSecret == "" { | |
| log.Warn("GEMINI_OAUTH_CLIENT_SECRET is not set. Gemini OAuth flow will likely fail.") | |
| } |
|
|
||
| EXPOSE 8317 | ||
|
|
||
| ENV TZ=Asia/Shanghai |
There was a problem hiding this comment.
The timezone is hardcoded to Asia/Shanghai. For a general-purpose Docker image, it's better to default to UTC or make it configurable at runtime via an environment variable. You could default to UTC and document that users can override it with -e TZ=....
ENV TZ=UTC
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Merge summary
This batch continues migrated-branch replay for a large 12-lane set. Most branches were clean no-op against this batch due duplicate/overlapping patch content.
Included commits
Notes
migrated-ci-fix-migrated-router-20260225060000-feature_ampcode-aliascould not be cherry-picked cleanly due workflow context drift. Applied equivalent workflow-only patch and committed as63583ed0.1233,1599,1668,1686,1699,1648,1672,1673,1682,1684,1698*, and similar were no-op/already represented after prior merges.