From a7396a7bd0c49e8f34c9b4039294875896eb3ca0 Mon Sep 17 00:00:00 2001 From: Alex Hancock Date: Wed, 15 Apr 2026 13:00:12 -0400 Subject: [PATCH] chore: move acp to sdk (#8556) --- .github/workflows/publish-npm.yml | 2 +- Justfile | 12 ++++++------ ui/goose-binary/README.md | 2 +- ui/scripts/publish.sh | 10 +++++----- ui/{acp => sdk}/.gitignore | 0 ui/{acp => sdk}/README.md | 2 +- ui/{acp => sdk}/generate-schema.ts | 0 ui/{acp => sdk}/package.json | 0 ui/{acp => sdk}/scripts/build-native.ts | 0 ui/{acp => sdk}/src/generated/client.gen.ts | 0 ui/{acp => sdk}/src/generated/index.ts | 0 ui/{acp => sdk}/src/generated/types.gen.ts | 0 ui/{acp => sdk}/src/generated/zod.gen.ts | 0 ui/{acp => sdk}/src/goose-client.ts | 0 ui/{acp => sdk}/src/http-stream.ts | 0 ui/{acp => sdk}/src/index.ts | 0 ui/{acp => sdk}/tsconfig.json | 0 17 files changed, 14 insertions(+), 14 deletions(-) rename ui/{acp => sdk}/.gitignore (100%) rename ui/{acp => sdk}/README.md (99%) rename ui/{acp => sdk}/generate-schema.ts (100%) rename ui/{acp => sdk}/package.json (100%) rename ui/{acp => sdk}/scripts/build-native.ts (100%) rename ui/{acp => sdk}/src/generated/client.gen.ts (100%) rename ui/{acp => sdk}/src/generated/index.ts (100%) rename ui/{acp => sdk}/src/generated/types.gen.ts (100%) rename ui/{acp => sdk}/src/generated/zod.gen.ts (100%) rename ui/{acp => sdk}/src/goose-client.ts (100%) rename ui/{acp => sdk}/src/http-stream.ts (100%) rename ui/{acp => sdk}/src/index.ts (100%) rename ui/{acp => sdk}/tsconfig.json (100%) diff --git a/.github/workflows/publish-npm.yml b/.github/workflows/publish-npm.yml index 74f2cd7d..f7fde6d4 100644 --- a/.github/workflows/publish-npm.yml +++ b/.github/workflows/publish-npm.yml @@ -92,7 +92,7 @@ jobs: - name: Build packages run: | - cd ui/acp + cd ui/sdk pnpm run build:ts cd ../text diff --git a/Justfile b/Justfile index d2630df9..db8e8115 100644 --- a/Justfile +++ b/Justfile @@ -210,7 +210,7 @@ check-acp-schema: generate-acp-types #!/usr/bin/env bash set -e echo "🔍 Checking ACP schema and generated types are up-to-date..." - if ! git diff --exit-code crates/goose-acp/acp-schema.json crates/goose-acp/acp-meta.json ui/acp/src/generated/; then + if ! git diff --exit-code crates/goose-acp/acp-schema.json crates/goose-acp/acp-meta.json ui/sdk/src/generated/; then echo "" echo "❌ ACP generated files are out of date!" echo "" @@ -228,13 +228,13 @@ generate-acp-schema: # Generate ACP TypeScript types from JSON schema (requires generate-acp-schema first) generate-acp-types: generate-acp-schema @echo "Generating ACP TypeScript types..." - cd ui/acp && npx tsx generate-schema.ts - @echo "ACP TypeScript types generated in ui/acp/src/generated/" + cd ui/sdk && npx tsx generate-schema.ts + @echo "ACP TypeScript types generated in ui/sdk/src/generated/" -# Build ACP TypeScript package (schema + types + compile) -build-acp: generate-acp-types +# Build SDK TypeScript package (schema + types + compile) +build-sdk: generate-acp-types @echo "Compiling ACP TypeScript..." - cd ui/acp && pnpm run build:ts + cd ui/sdk && pnpm run build:ts @echo "ACP package built." # Generate manpages for the CLI diff --git a/ui/goose-binary/README.md b/ui/goose-binary/README.md index eda18bb7..6a76d77d 100644 --- a/ui/goose-binary/README.md +++ b/ui/goose-binary/README.md @@ -19,7 +19,7 @@ From the repository root: ```bash # Build for current platform only -cd ui/acp +cd ui/sdk npm run build:native # Build for all platforms (requires cross-compilation toolchains) diff --git a/ui/scripts/publish.sh b/ui/scripts/publish.sh index f765a0dc..f50aee86 100755 --- a/ui/scripts/publish.sh +++ b/ui/scripts/publish.sh @@ -2,7 +2,7 @@ set -euo pipefail # Builds and publishes all @aaif npm packages: -# @aaif/goose-acp — ACP TypeScript SDK +# @aaif/goose-sdk — ACP TypeScript SDK # @aaif/goose-binary-* — platform-specific goose CLI binaries # @aaif/goose — TUI that depends on the above # @@ -22,7 +22,7 @@ set -euo pipefail REPO_ROOT="$(cd "$(dirname "$0")/../.." && pwd)" NATIVE_DIR="${REPO_ROOT}/ui/goose-binary" -ACP_DIR="${REPO_ROOT}/ui/acp" +SDK_DIR="${REPO_ROOT}/ui/sdk" TEXT_DIR="${REPO_ROOT}/ui/text" REGISTRY="https://registry.npmjs.org" DOCKER_IMAGE="rust:1.92-bookworm" @@ -172,8 +172,8 @@ done # Step 4: Build TypeScript packages # --------------------------------------------------------------------------- echo "" -echo "==> Building @aaif/goose-acp" -(cd "${ACP_DIR}" && pnpm run build:ts) +echo "==> Building @aaif/goose-sdk" +(cd "${SDK_DIR}" && pnpm run build:ts) echo "==> Building @aaif/goose" (cd "${TEXT_DIR}" && pnpm run build) @@ -211,7 +211,7 @@ cleanup_npmrc() { trap cleanup_npmrc EXIT # Publish order matters: dependencies first -echo "==> Publishing @aaif/goose-acp" +echo "==> Publishing @aaif/goose-sdk" (cd "${REPO_ROOT}/ui" && pnpm publish "${PUBLISH_ARGS[@]}" acp) echo "==> Publishing native binary packages" diff --git a/ui/acp/.gitignore b/ui/sdk/.gitignore similarity index 100% rename from ui/acp/.gitignore rename to ui/sdk/.gitignore diff --git a/ui/acp/README.md b/ui/sdk/README.md similarity index 99% rename from ui/acp/README.md rename to ui/sdk/README.md index 4f76fc0a..53d997b4 100644 --- a/ui/acp/README.md +++ b/ui/sdk/README.md @@ -47,7 +47,7 @@ npm run build:native:all To use this package locally in another project (e.g., `@aaif/goose`): ```bash -# In ui/acp +# In ui/sdk npm run build npm link diff --git a/ui/acp/generate-schema.ts b/ui/sdk/generate-schema.ts similarity index 100% rename from ui/acp/generate-schema.ts rename to ui/sdk/generate-schema.ts diff --git a/ui/acp/package.json b/ui/sdk/package.json similarity index 100% rename from ui/acp/package.json rename to ui/sdk/package.json diff --git a/ui/acp/scripts/build-native.ts b/ui/sdk/scripts/build-native.ts similarity index 100% rename from ui/acp/scripts/build-native.ts rename to ui/sdk/scripts/build-native.ts diff --git a/ui/acp/src/generated/client.gen.ts b/ui/sdk/src/generated/client.gen.ts similarity index 100% rename from ui/acp/src/generated/client.gen.ts rename to ui/sdk/src/generated/client.gen.ts diff --git a/ui/acp/src/generated/index.ts b/ui/sdk/src/generated/index.ts similarity index 100% rename from ui/acp/src/generated/index.ts rename to ui/sdk/src/generated/index.ts diff --git a/ui/acp/src/generated/types.gen.ts b/ui/sdk/src/generated/types.gen.ts similarity index 100% rename from ui/acp/src/generated/types.gen.ts rename to ui/sdk/src/generated/types.gen.ts diff --git a/ui/acp/src/generated/zod.gen.ts b/ui/sdk/src/generated/zod.gen.ts similarity index 100% rename from ui/acp/src/generated/zod.gen.ts rename to ui/sdk/src/generated/zod.gen.ts diff --git a/ui/acp/src/goose-client.ts b/ui/sdk/src/goose-client.ts similarity index 100% rename from ui/acp/src/goose-client.ts rename to ui/sdk/src/goose-client.ts diff --git a/ui/acp/src/http-stream.ts b/ui/sdk/src/http-stream.ts similarity index 100% rename from ui/acp/src/http-stream.ts rename to ui/sdk/src/http-stream.ts diff --git a/ui/acp/src/index.ts b/ui/sdk/src/index.ts similarity index 100% rename from ui/acp/src/index.ts rename to ui/sdk/src/index.ts diff --git a/ui/acp/tsconfig.json b/ui/sdk/tsconfig.json similarity index 100% rename from ui/acp/tsconfig.json rename to ui/sdk/tsconfig.json