Skip to content

Commit 1a51417

Browse files
authored
Merge branch 'main' into feat/generic-a2ui-react-renderer
2 parents 795c373 + 766b040 commit 1a51417

40 files changed

Lines changed: 11 additions & 10 deletions

.github/workflows/kotlin_agent_sdk_build_and_test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ on:
1919
branches:
2020
- "*"
2121
paths:
22-
- "agent_sdks/kotlin/**"
22+
- "kotlin/agent_sdk_legacy/**"
2323
- "specification/**/json/**"
2424
- "agent_sdks/conformance/**"
2525
pull_request:
2626
paths:
27-
- "agent_sdks/kotlin/**"
27+
- "kotlin/agent_sdk_legacy/**"
2828
- "specification/**/json/**"
2929
- "agent_sdks/conformance/**"
3030

@@ -49,13 +49,13 @@ jobs:
4949
cache: "gradle"
5050

5151
- name: Make gradlew executable
52-
working-directory: agent_sdks/kotlin
52+
working-directory: kotlin/agent_sdk_legacy
5353
run: chmod +x gradlew
5454

5555
- name: Check formatting
56-
working-directory: agent_sdks/kotlin
56+
working-directory: kotlin/agent_sdk_legacy
5757
run: ./gradlew ktfmtCheck
5858

5959
- name: Run tests
60-
working-directory: agent_sdks/kotlin
60+
working-directory: kotlin/agent_sdk_legacy
6161
run: ./gradlew test --info

AGENTS.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ For a detailed explanation of the methodology, lifecycle, and workflows, read th
5757
- **`blueprints/`**: Isolated central repository for language-agnostic module blueprints (`modules/`), feature blueprints (`features/`, `features/archived/`), codebase compliance blueprints (`codebases/`), and SDD skills (`skills/`).
5858
- **`docs/`**: Documentation hierarchy. Public site documentation published via MkDocs resides in `docs/public/`, while non-public contributor or internal documentation resides under `docs/` alongside `docs/scripts/`.
5959
- **`specification/`**: Versioned subdirectories (`v0_8/`, `v0_9/`, `v0_9_1/`, `v1_0/`) containing JSON schemas, component/function catalogs, and human-readable guides. The `specification/<version>/docs/a2ui_protocol.md` file is the most important source of truth for each protocol version, and the `specification/<version>/json` directory contains the associated schemas for the protocol.
60-
- **`agent_sdks/`**: Server integration SDKs for Python (`python/`), Kotlin (`kotlin/`), and core conformance tests (`conformance/`).
60+
- **`agent_sdks/`**: Server integration SDKs for Python (`python/`) and core conformance tests (`conformance/`).
61+
- **`kotlin/`**: Legacy Kotlin agent SDK (`agent_sdk_legacy/`).
6162
- **`renderers/`**: Shared core state logic (`web_core/`), Lit renderer (`lit/`), Angular renderer (`angular/`), React renderer (`react/`), markdown parser (`markdown/`), and placeholder for Flutter (`flutter/`).
6263
- **`samples/`**: Ready-to-run demo agents utilizing Python ADK (`agent/adk/`), MCP server (`agent/mcp/`), and sample clients (`client/lit/`, `client/angular/`, `client/react/`, `client/flutter/`).
6364
- **`tools/`**: Developer utility suite including visual Editor (`editor/`), visual Composer (`composer/`), payload Inspector (`inspector/`), and catalog builder (`build_catalog/`).
@@ -84,7 +85,7 @@ When creating or modifying workspaces, guarantee strict script uniformity by imp
8485
Do not use hardcoded or guessed build/run sequences. Each subdirectory contains detailed setup, build, dependency resolution, and execution steps.
8586

8687
- **Prerequisite:** Consult the `README.md` under `renderers/` to build shared web core and renderer packages before running any web tools or clients.
87-
- **Running SDKs & Samples:** Consult the local `README.md` inside any targeted directory under `agent_sdks/`, `samples/`, or `tools/` for specific run/test/build commands.
88+
- **Running SDKs & Samples:** Consult the local `README.md` inside any targeted directory under `agent_sdks/`, `kotlin/`, `samples/`, or `tools/` for specific run/test/build commands.
8889

8990
---
9091

agent_sdks/kotlin/gradle/wrapper/gradle-wrapper.jar renamed to kotlin/agent_sdk_legacy/gradle/wrapper/gradle-wrapper.jar

File renamed without changes.

agent_sdks/kotlin/gradle/wrapper/gradle-wrapper.properties renamed to kotlin/agent_sdk_legacy/gradle/wrapper/gradle-wrapper.properties

File renamed without changes.
File renamed without changes.

agent_sdks/kotlin/src/main/kotlin/com/google/a2ui/InferenceStrategy.kt renamed to kotlin/agent_sdk_legacy/src/main/kotlin/com/google/a2ui/InferenceStrategy.kt

File renamed without changes.

0 commit comments

Comments
 (0)