Skip to content

chore(imports): repair PR 942 package surfaces #943

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.

Sign up for GitHub

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

Closed
KooshaPari wants to merge 18 commits into from
Closed

chore(imports): repair PR 942 package surfaces #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
82b4a6d
chore(imports): repair pr942 package surfaces
Apr 2, 2026
0397335
test(imports): reduce stacked branch path debt
Apr 2, 2026
27551c9
fix(translator): repair byte-buffer sjson handling
Apr 2, 2026
05b1684
fix(registry): dedupe static model getters and cache invalidation
Apr 2, 2026
74f69a1
fix(config): dedupe oauth alias defaults
Apr 2, 2026
a026f0d
fix(auth): restore kilo token base storage
Apr 2, 2026
d61c9d8
fix(util): restore sanitized tool name helpers
Apr 2, 2026
6a1abca
fix(access): import sdk config alias
Apr 2, 2026
b251c74
fix(cursor): normalize nil auth context
Apr 2, 2026
a53c3d1
fix(executor): merge orphaned runtime executor tests and remove drift
Apr 2, 2026
c0aa5b9
fix(auth): restore claude base storage and transport imports
Apr 2, 2026
577a97e
test(usage): point logger plugin test at v7 sdk
Apr 2, 2026
bc1b381
test(translator): parse claude openai responses as bytes
Apr 2, 2026
886d08b
chore(auth): remove unused vertex auth implementation
Apr 2, 2026
5f48b29
ci: add Go module caching and fix matrix syntax
Apr 2, 2026
1ff2028
fix(auth): restore vertex auth package stub
Apr 2, 2026
11d4f4b
fix(auth): add missing imports and function definitions
Apr 2, 2026
1da7bf1
fix(translator): add translatorcommon and fix auth imports
Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 39 additions & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,56 @@
name: CI

on:
push:
branches: [main]
branches: [main, feature/*, bugfix/*, docs/*, release/*, hotfix/*]
pull_request:
branches: [main]

jobs:
ci:
test:
runs-on: ubuntu-latest

strategy:
matrix:
go-version: ['1.21', '1.22']

steps:
- uses: actions/checkout@v4

- name: Refresh models catalog
run: |
git fetch --depth 1 https://github.com/router-for-me/models.git main
mkdir -p pkg/llmproxy/registry/models
git show FETCH_HEAD:models.json > pkg/llmproxy/registry/models/models.json
- uses: actions/setup-go@v5

- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go-version }}

- name: Cache Go modules
uses: actions/cache@v4
with:
go-version-file: go.mod
cache: true
- name: Vet
run: go vet ./...
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-

- name: Download dependencies
run: go mod download

- name: Build
run: go build ./...
- name: Test
run: go test ./...

- name: Run tests
run: go test ./... -v -race -coverprofile=coverage.out

- name: Upload coverage
uses: codecov/codecov-action@v3
with:
files: ./coverage.out


phenotype-validate:
runs-on: ubuntu-latest
uses: KooshaPari/phenotypeActions/.github/workflows/validate-governance.yml@main
111 changes: 0 additions & 111 deletions bun.lock
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cliproxyctl/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"strings"
"time"

"github.com/kooshapari/CLIProxyAPI/v7/internal/config"
cliproxycmd "github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/cmd"
"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/config"
)

const responseSchemaVersion = "cliproxyctl.response.v1"
Expand Down
2 changes: 1 addition & 1 deletion cliproxyctl/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"
"time"

"github.com/kooshapari/CLIProxyAPI/v7/internal/config"
cliproxycmd "github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/cmd"
"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/config"
)

func TestRunSetupJSONResponseShape(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/codegen/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const synthTemplate = `// Code generated by github.com/kooshapari/CLIProxyAPI/v7
package synthesizer

import (
"github.com/kooshapari/CLIProxyAPI/v7/internal/config"
"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/config"
)

// getDedicatedProviderEntries returns the config entries for a dedicated provider.
Expand Down Expand Up @@ -123,7 +123,7 @@ package diff

import (
"fmt"
"github.com/kooshapari/CLIProxyAPI/v7/internal/config"
"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/config"
)

// BuildConfigChangeDetailsGeneratedProviders computes changes for generated dedicated providers.
Expand Down
8 changes: 4 additions & 4 deletions cmd/fetch_antigravity_models/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
"strings"
"time"

"github.com/router-for-me/CLIProxyAPI/v6/internal/logging"
sdkauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/auth"
coreauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
"github.com/router-for-me/CLIProxyAPI/v6/sdk/proxyutil"
"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/logging"
sdkauth "github.com/kooshapari/CLIProxyAPI/v7/sdk/auth"
coreauth "github.com/kooshapari/CLIProxyAPI/v7/sdk/cliproxy/auth"
"github.com/kooshapari/CLIProxyAPI/v7/sdk/proxyutil"
log "github.com/sirupsen/logrus"
"github.com/tidwall/gjson"
Comment on lines +28 to 33
Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist bot Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

low

The import block is not sorted according to Go conventions. Running goimports would group third-party and internal packages correctly and sort them alphabetically. This improves code readability and maintainability.

log "github.com/sirupsen/logrus"
	"github.com/tidwall/gjson"

	"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/logging"
	sdkauth "github.com/kooshapari/CLIProxyAPI/v7/sdk/auth"
	coreauth "github.com/kooshapari/CLIProxyAPI/v7/sdk/cliproxy/auth"
	"github.com/kooshapari/CLIProxyAPI/v7/sdk/proxyutil"

)
Expand Down
2 changes: 1 addition & 1 deletion cmd/mcpdebug/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"os"

cursorproto "github.com/router-for-me/CLIProxyAPI/v6/internal/auth/cursor/proto"
cursorproto "github.com/kooshapari/CLIProxyAPI/v7/internal/auth/cursor/proto"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/protocheck/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"fmt"

cursorproto "github.com/router-for-me/CLIProxyAPI/v6/internal/auth/cursor/proto"
cursorproto "github.com/kooshapari/CLIProxyAPI/v7/internal/auth/cursor/proto"
"google.golang.org/protobuf/reflect/protoreflect"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/server/config_validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"io"
"os"

"github.com/kooshapari/CLIProxyAPI/v7/internal/config"
"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/config"
"gopkg.in/yaml.v3"
)

Expand Down
26 changes: 13 additions & 13 deletions cmd/server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ import (
"time"

"github.com/joho/godotenv"
configaccess "github.com/kooshapari/CLIProxyAPI/v7/internal/access/config_access"
"github.com/kooshapari/CLIProxyAPI/v7/internal/auth/kiro"
"github.com/kooshapari/CLIProxyAPI/v7/internal/buildinfo"
"github.com/kooshapari/CLIProxyAPI/v7/internal/cmd"
"github.com/kooshapari/CLIProxyAPI/v7/internal/config"
"github.com/kooshapari/CLIProxyAPI/v7/internal/logging"
"github.com/kooshapari/CLIProxyAPI/v7/internal/managementasset"
"github.com/kooshapari/CLIProxyAPI/v7/internal/misc"
"github.com/kooshapari/CLIProxyAPI/v7/internal/store"
_ "github.com/kooshapari/CLIProxyAPI/v7/internal/translator"
"github.com/kooshapari/CLIProxyAPI/v7/internal/tui"
"github.com/kooshapari/CLIProxyAPI/v7/internal/usage"
"github.com/kooshapari/CLIProxyAPI/v7/internal/util"
configaccess "github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/access/config_access"
kiro "github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/auth/kiro"
"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/buildinfo"
"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/cmd"
"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/config"
"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/logging"
"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/managementasset"
"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/misc"
"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/store"
_ "github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/translator"
"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/tui"
"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/usage"
"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/util"
sdkAuth "github.com/kooshapari/CLIProxyAPI/v7/sdk/auth"
coreauth "github.com/kooshapari/CLIProxyAPI/v7/sdk/cliproxy/auth"
log "github.com/sirupsen/logrus"
Comment on lines 19 to 35
Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist bot Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

low

The import block is not sorted according to Go conventions. Running goimports would group third-party and internal packages correctly and sort them alphabetically. This improves code readability and maintainability.

	"github.com/joho/godotenv"
	log "github.com/sirupsen/logrus"

	configaccess "github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/access/config_access"
	kiro "github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/auth/kiro"
	"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/buildinfo"
	"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/cmd"
	"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/config"
	"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/logging"
	"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/managementasset"
	"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/misc"
	"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/store"
	_ "github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/translator"
	"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/tui"
	"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/usage"
	"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/util"
	sdkAuth "github.com/kooshapari/CLIProxyAPI/v7/sdk/auth"
	coreauth "github.com/kooshapari/CLIProxyAPI/v7/sdk/cliproxy/auth"

Expand Down
2 changes: 1 addition & 1 deletion cmd/server/main_kiro_flags_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"testing"

"github.com/kooshapari/CLIProxyAPI/v7/internal/config"
"github.com/kooshapari/CLIProxyAPI/v7/pkg/llmproxy/config"
)

func TestValidateKiroIncognitoFlags(t *testing.T) {
Expand Down
8 changes: 8 additions & 0 deletions docs/sessions/2026-04-01-pr-readiness-refresh/00_SESSION_OVERVIEW.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,11 @@ Stabilize PR `#942` enough to move it out of branch-local merge debt and obvious
- The branch no longer carries an unmerged spec file.
- `SAST Quick Check` no longer references a missing action repo or a Rust-only lint job.
- Remaining blockers are pre-existing repo debt or external issues, not broken workflow scaffolding in this PR.

## 2026-04-02 Import Surface Follow-up

- Replaced stale `internal/config` imports with the live `pkg/llmproxy/config` package across the repo-internal tests and generator template.
- Replaced stale watcher test imports to the live `pkg/llmproxy/watcher/diff` and `pkg/llmproxy/watcher/synthesizer` packages.
- Replaced stale auth test imports from the old v6 tree with the current local `internal/auth/codebuddy` and `pkg/llmproxy/auth/kiro` packages.
- `go mod vendor` now succeeds after the import-surface sweep.
- `GOFLAGS=-mod=vendor go test ./...` still fails, but now on broader vendoring/toolchain debt because the generated `vendor/` tree remains incomplete for many third-party packages on this branch.
Loading
Loading