diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0504e13..a5c40bb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,18 +9,8 @@ jobs: go: runs-on: ubuntu-latest steps: - # go.mod points at the sibling proto module (gRPC stubs, semdiff, - # validate) with a replace directive until it is published, so both - # repos are checked out side by side — same layout as a local clone. - uses: actions/checkout@v4 - with: - path: cli - - uses: actions/checkout@v4 - with: - repository: ${{ github.repository_owner }}/proto - path: proto - uses: actions/setup-go@v5 with: - go-version-file: cli/go.mod + go-version-file: go.mod - run: go test ./... - working-directory: cli diff --git a/README.md b/README.md index bb48813..22a4bb0 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,8 @@ at the repo root has no org to belong to and is rejected at commit. ## Install ```sh -go build -o promptctl . # Go 1.25+ +go install github.com/priompt/cli/cmd/promptctl@latest # Go 1.25+ +# or, from a clone: go build -o promptctl ./cmd/promptctl ``` ## Commands @@ -129,5 +130,5 @@ flowchart LR | Repo | Role | | --- | --- | | **priompt** | The server this CLI publishes to — full docs on versioning, auth, and the semantic diff live there | -| **proto** | Where the gRPC stubs, semantic diff engine (`priomptproto/semdiff`), and validation rules (`priomptproto/validate`) come from — imported, not copied; this repo carries no copies of anything | +| **proto** | Where the gRPC stubs, semantic diff engine (`github.com/priompt/proto/semdiff`), and validation rules (`github.com/priompt/proto/validate`) come from — imported, not copied; this repo carries no copies of anything | | **python-sdk / js-sdk** | How agents *read* what you publish | diff --git a/main.go b/cmd/promptctl/main.go similarity index 99% rename from main.go rename to cmd/promptctl/main.go index c798a68..d9e6ad6 100644 --- a/main.go +++ b/cmd/promptctl/main.go @@ -37,9 +37,9 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/metadata" - pb "priomptproto/gen/priompt/v1" - "priomptproto/semdiff" - "priomptproto/validate" + pb "github.com/priompt/proto/gen/priompt/v1" + "github.com/priompt/proto/semdiff" + "github.com/priompt/proto/validate" ) func main() { diff --git a/main_test.go b/cmd/promptctl/main_test.go similarity index 100% rename from main_test.go rename to cmd/promptctl/main_test.go diff --git a/go.mod b/go.mod index ac00a43..11569da 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module promptctl +module github.com/priompt/cli go 1.25.0 @@ -23,6 +23,7 @@ require ( github.com/kevinburke/ssh_config v1.2.0 // indirect github.com/klauspost/cpuid/v2 v2.3.0 // indirect github.com/pjbgf/sha1cd v0.6.0 // indirect + github.com/priompt/proto v0.7.0 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect github.com/skeema/knownhosts v1.3.1 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect @@ -32,7 +33,4 @@ require ( golang.org/x/text v0.36.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect - priomptproto v0.0.0 ) - -replace priomptproto => ../proto diff --git a/go.sum b/go.sum index cca86fd..d880f9d 100644 --- a/go.sum +++ b/go.sum @@ -65,6 +65,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/priompt/proto v0.7.0 h1:93idH7cBiVndmNoznO2vWwKPBw472PLv8MfhCc8SE3w= +github.com/priompt/proto v0.7.0/go.mod h1:vwz0jk/O+rIf7LYwd20dtLzBtLvnKIbYsL9SFMf6gaY= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=