Skip to content

Commit bec4729

Browse files
Weilong-QinWeilong-Qin
committed
Merge branch 'main' into fix/unstable-computehash
# Conflicts: # agentscope-core/src/main/java/io/agentscope/core/message/ToolUseBlock.java # agentscope-core/src/main/java/io/agentscope/core/model/ChatUsage.java
2 parents 32c03f1 + bd08b6a commit bec4729

2,497 files changed

Lines changed: 235835 additions & 146219 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
* text=auto eol=lf
2+
3+
*.png binary
4+
*.jpg binary
5+
*.jpeg binary
6+
*.gif binary
7+
*.ico binary
8+
*.zip binary
9+
*.gz binary
10+
*.jar binary

‎.github/workflows/maven-ci.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v4
2020
- name: "Check License"
21-
uses: apache/skywalking-eyes@e1a02359b239bd28de3f6d35fdc870250fa513d5
21+
uses: apache/skywalking-eyes@ab3d1fe50d23f9c82eff489297167e2dde8ba6cb
2222
env:
2323
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2424
- name: "Check Dependencies' License"
25-
uses: apache/skywalking-eyes/dependency@e1a02359b239bd28de3f6d35fdc870250fa513d5
25+
uses: apache/skywalking-eyes/dependency@ab3d1fe50d23f9c82eff489297167e2dde8ba6cb
2626
env:
2727
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2828
with:
@@ -127,7 +127,8 @@ jobs:
127127
if: runner.os == 'Windows'
128128
run: |
129129
# -T1: single-threaded build so reactor order is respected (see Linux step).
130-
& "~\.mvnd\bin\mvnd.cmd" -B -T1 clean verify
130+
# -Dmvnd.maxLostKeepAlive=120: avoid StaleAddressException on long javadoc phases (mvnd#161).
131+
& "~\.mvnd\bin\mvnd.cmd" -B -T1 "-Dmvnd.maxLostKeepAlive=120" clean verify
131132
132133
- name: Upload coverage reports to Codecov
133134
if: runner.os == 'Linux'

‎.github/workflows/website.yml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,23 @@ jobs:
2929
- name: Build Docs
3030
run: |
3131
cd docs
32-
jupyter-book clean .
32+
# ``clean --all`` also drops .jupyter_cache so cache-buster query
33+
# strings on static assets (e.g. ``tabs.js?v=…``) are recomputed
34+
# from current content. Without it, browsers may serve stale JS
35+
# whose URL hash hasn't changed even after the file was edited.
36+
jupyter-book clean --all .
3337
jupyter-book build .
3438
39+
- name: Generate v1 redirect stubs
40+
# Backfills HTML meta-refresh stubs at the legacy 1.x URL paths
41+
# (e.g. /en/harness/overview.html) pointing at the corresponding
42+
# v1 page under the v2_dev layout (/v1/en/docs/harness/overview.html).
43+
# GitHub Pages cannot return HTTP 302; meta-refresh is the static
44+
# equivalent and is treated as 301 by search engines.
45+
run: |
46+
cd docs
47+
python scripts/generate_v1_redirects.py _build/html
48+
3549
- name: Deploy to GitHub Pages
3650
uses: peaceiris/actions-gh-pages@v4
3751
with:

‎.gitignore‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,15 @@ build/
3737
.flattened-pom.xml
3838
**/dependency-reduced-pom.xml
3939

40+
### Python
41+
__pycache__/
42+
*.py[cod]
43+
*$py.class
44+
*.egg-info/
45+
4046
### Docs
4147
docs/_build
48+
.venv/
4249

4350

4451
# vibe coding
@@ -50,10 +57,28 @@ CLAUDE.md
5057
##Log
5158
logs/
5259

53-
## boba-tea-shop example
60+
## Frontend (all frontend/ directories across examples and extensions)
61+
# Dependencies
62+
**/frontend/node_modules/
63+
# Build output
64+
**/frontend/dist/
65+
**/frontend/build/
66+
**/frontend/.output/
67+
# Vite / bundler caches
68+
**/frontend/.vite/
69+
**/frontend/.cache/
70+
**/frontend/.parcel-cache/
71+
# Type-check / tsc output
72+
**/frontend/*.tsbuildinfo
73+
# Env files (may contain secrets)
74+
**/frontend/.env.local
75+
**/frontend/.env.*.local
76+
# Coverage
77+
**/frontend/coverage/
78+
# Storybook
79+
**/frontend/storybook-static/
80+
# boba-tea-shop: generated static assets served by the supervisor-agent
5481
**/boba-tea-shop/supervisor-agent/**/static/
55-
**/boba-tea-shop/**/node_modules/
56-
**/boba-tea-shop/**/dist/
5782

5883
##agentscope
5984
.agentscope/

‎.licenserc.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,14 @@ header:
7171
- 'NOTICE'
7272
- 'CNAME'
7373
- 'Jenkinsfile'
74+
- '.gitattributes'
7475
- '**/vendor/**'
76+
- '**/docs/**'
7577
- '**/.prettierrc'
78+
- 'agentscope-examples/**/frontend/**'
79+
- '**/Dockerfile'
80+
- '**/src/main/resources/**'
81+
- '**/src/test/resources/**'
7682
comment: on-failure
7783

7884
license-location-threshold: 130

‎agentscope-core/pom.xml‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,117 @@
146146
<artifactId>snakeyaml</artifactId>
147147
</dependency>
148148

149+
<!-- Tree-sitter Java bindings + Bash grammar for the Bash tool's AST-based safety
150+
analysis. The base 'tree-sitter' artifact is declared explicitly so its classes are
151+
available at compile time; tree-sitter-bash brings it in only at runtime by default. -->
152+
<dependency>
153+
<groupId>io.github.bonede</groupId>
154+
<artifactId>tree-sitter</artifactId>
155+
</dependency>
156+
<dependency>
157+
<groupId>io.github.bonede</groupId>
158+
<artifactId>tree-sitter-bash</artifactId>
159+
</dependency>
160+
149161
<dependency>
150162
<groupId>io.opentelemetry</groupId>
151163
<artifactId>opentelemetry-api</artifactId>
164+
</dependency>
165+
166+
<dependency>
167+
<groupId>io.opentelemetry</groupId>
168+
<artifactId>opentelemetry-sdk</artifactId>
169+
<scope>test</scope>
170+
</dependency>
171+
<dependency>
172+
<groupId>io.opentelemetry</groupId>
173+
<artifactId>opentelemetry-sdk-testing</artifactId>
174+
<scope>test</scope>
175+
</dependency>
176+
177+
<!-- ===== Harness-merged dependencies ===== -->
178+
179+
<!-- YAML parsing for subagent / tools.json config -->
180+
<dependency>
181+
<groupId>com.fasterxml.jackson.dataformat</groupId>
182+
<artifactId>jackson-dataformat-yaml</artifactId>
183+
</dependency>
184+
185+
<!-- Commons Compress for secure tar archive extraction in sandbox snapshots -->
186+
<dependency>
187+
<groupId>org.apache.commons</groupId>
188+
<artifactId>commons-compress</artifactId>
189+
<version>1.27.1</version>
190+
</dependency>
191+
192+
<!-- SQLite for best-effort local workspace index -->
193+
<dependency>
194+
<groupId>org.xerial</groupId>
195+
<artifactId>sqlite-jdbc</artifactId>
196+
<version>3.47.1.0</version>
197+
</dependency>
198+
199+
<!-- Redis snapshot backend (optional: only needed when using RedisSandboxExecutionGuard) -->
200+
<dependency>
201+
<groupId>redis.clients</groupId>
202+
<artifactId>jedis</artifactId>
203+
<optional>true</optional>
204+
</dependency>
205+
206+
<!-- Alibaba Cloud OSS snapshot backend (optional: only needed when using OssSnapshotSpec) -->
207+
<dependency>
208+
<groupId>com.aliyun.oss</groupId>
209+
<artifactId>aliyun-sdk-oss</artifactId>
210+
<version>3.18.5</version>
211+
<optional>true</optional>
212+
</dependency>
213+
214+
<!-- Optional sandbox backends (io.agentscope.harness.agent.sandbox.impl.*) -->
215+
<dependency>
216+
<groupId>io.fabric8</groupId>
217+
<artifactId>kubernetes-client</artifactId>
218+
<optional>true</optional>
219+
</dependency>
220+
<dependency>
221+
<groupId>com.google.protobuf</groupId>
222+
<artifactId>protobuf-java</artifactId>
223+
<optional>true</optional>
224+
</dependency>
225+
226+
<dependency>
227+
<groupId>io.fabric8</groupId>
228+
<artifactId>kubernetes-server-mock</artifactId>
152229
<scope>test</scope>
153230
</dependency>
154231
</dependencies>
232+
233+
<build>
234+
<plugins>
235+
<!-- Publish a test-jar so downstream modules (agentscope-harness) can reuse the
236+
shared test fixtures (MockModel, MockToolkit, TestConstants, TestUtils). -->
237+
<plugin>
238+
<groupId>org.apache.maven.plugins</groupId>
239+
<artifactId>maven-jar-plugin</artifactId>
240+
<executions>
241+
<execution>
242+
<goals>
243+
<goal>test-jar</goal>
244+
</goals>
245+
</execution>
246+
</executions>
247+
</plugin>
248+
249+
<!-- Exclude pre-existing broken tests (references symbols that were removed
250+
elsewhere in the v2 migration; tracked separately). -->
251+
<plugin>
252+
<groupId>org.apache.maven.plugins</groupId>
253+
<artifactId>maven-compiler-plugin</artifactId>
254+
<configuration>
255+
<testExcludes>
256+
<exclude>io/agentscope/core/e2e/MultiAgentE2ETest.java</exclude>
257+
</testExcludes>
258+
</configuration>
259+
</plugin>
260+
</plugins>
261+
</build>
155262
</project>

0 commit comments

Comments
 (0)