Skip to content

Commit 297bac8

Browse files
committed
merge: pull latest origin/develop before final push
2 parents 09ca6e6 + e901cd6 commit 297bac8

317 files changed

Lines changed: 30119 additions & 6726 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.

.github/workflows/cloud-cf-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
bun-version: latest
7474

7575
- name: Install dependencies
76-
run: bun install --frozen-lockfile
76+
run: bun install --no-save && git diff --exit-code -- bun.lock
7777

7878
- name: Build linked elizaOS workspaces
7979
run: bun run build:linked-workspaces
@@ -139,7 +139,7 @@ jobs:
139139
bun-version: latest
140140

141141
- name: Install dependencies
142-
run: bun install --frozen-lockfile
142+
run: bun install --no-save && git diff --exit-code -- bun.lock
143143

144144
- name: Build linked elizaOS core workspace
145145
run: bun run build:linked-core

.github/workflows/cloud-deploy-backend.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ jobs:
9797
run: |
9898
for attempt in 1 2 3; do
9999
if [ "$attempt" -eq 3 ]; then
100-
bun install --frozen-lockfile --verbose && exit 0
100+
bun install --no-save --verbose && git diff --exit-code -- bun.lock && exit 0
101101
else
102-
bun install --frozen-lockfile && exit 0
102+
bun install --no-save && git diff --exit-code -- bun.lock && exit 0
103103
fi
104104
105-
echo "bun install attempt $attempt failed; retrying in 10s..."
105+
echo "bun install attempt $attempt failed or changed bun.lock; retrying in 10s..."
106106
sleep 10
107107
done
108108
@@ -169,12 +169,12 @@ jobs:
169169
run: |
170170
for attempt in 1 2 3; do
171171
if [ "$attempt" -eq 3 ]; then
172-
bun install --frozen-lockfile --verbose && exit 0
172+
bun install --no-save --verbose && git diff --exit-code -- bun.lock && exit 0
173173
else
174-
bun install --frozen-lockfile && exit 0
174+
bun install --no-save && git diff --exit-code -- bun.lock && exit 0
175175
fi
176176
177-
echo "bun install attempt $attempt failed; retrying in 10s..."
177+
echo "bun install attempt $attempt failed or changed bun.lock; retrying in 10s..."
178178
sleep 10
179179
done
180180

.github/workflows/cloud-gateway-discord.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,10 +414,14 @@ jobs:
414414
bun-version: ${{ env.BUN_VERSION }}
415415

416416
- name: Install root dependencies
417-
run: bun install --frozen-lockfile
417+
run: bun install --no-save && git diff --exit-code -- bun.lock
418418

419419
- name: Install service dependencies
420-
run: cd services/gateway-discord && bun install --frozen-lockfile
420+
run: |
421+
cd services/gateway-discord
422+
bun install --no-save
423+
cd ../..
424+
git diff --exit-code -- bun.lock services/gateway-discord/bun.lock
421425
422426
- name: Run service tests
423427
working-directory: cloud/services/gateway-discord

.github/workflows/cloud-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ on:
99
paths:
1010
- "cloud/**"
1111
- ".github/workflows/cloud-tests.yml"
12-
- ".github/actions/cloud-setup-test-env/**"
12+
- "cloud/.github/actions/setup-test-env/**"
1313
push:
1414
branches: [develop, main]
1515
paths:
1616
- "cloud/**"
1717
- ".github/workflows/cloud-tests.yml"
18-
- ".github/actions/cloud-setup-test-env/**"
18+
- "cloud/.github/actions/setup-test-env/**"
1919

2020
concurrency:
2121
group: cloud-tests-${{ github.event.pull_request.number || github.ref }}

.github/workflows/deploy-eliza-provisioning-worker.yml

Lines changed: 39 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ on:
2020
- 'cloud/packages/lib/services/docker-sandbox-provider.ts'
2121
- 'cloud/packages/lib/services/eliza-sandbox.ts'
2222
- 'cloud/packages/db/repositories/agent-sandboxes.ts'
23+
- 'packages/core/**'
24+
- 'plugins/plugin-sql/**'
2325
workflow_dispatch:
2426

2527
concurrency:
@@ -70,7 +72,6 @@ jobs:
7072
host: ${{ env.DEPLOY_HOST }}
7173
username: deploy
7274
key: ${{ env.DEPLOY_SSH_KEY }}
73-
script_stop: true
7475
command_timeout: 10m
7576
envs: DEPLOY_BRANCH,SYSTEMD_UNIT
7677
script: |
@@ -120,6 +121,15 @@ jobs:
120121
done
121122
cd /opt/eliza
122123
124+
# The daemons run under Node/tsx rather than Bun. Node resolves
125+
# linked workspace packages through their built `node` exports, so
126+
# refresh linked package dist files after installing dependencies.
127+
bun run --cwd cloud build:linked-core
128+
mkdir -p plugins/plugin-sql/node_modules/@elizaos
129+
rm -rf plugins/plugin-sql/node_modules/@elizaos/core
130+
ln -s ../../../../packages/core plugins/plugin-sql/node_modules/@elizaos/core
131+
bun run --cwd plugins/plugin-sql build
132+
123133
# Install/refresh both systemd units (provisioning worker + agent router).
124134
sudo install -m 0644 \
125135
cloud/packages/scripts/eliza-provisioning-worker.service \
@@ -141,7 +151,6 @@ jobs:
141151
host: ${{ env.DEPLOY_HOST }}
142152
username: deploy
143153
key: ${{ env.DEPLOY_SSH_KEY }}
144-
script_stop: true
145154
command_timeout: 5m
146155
envs: SYSTEMD_UNIT
147156
script: |
@@ -150,12 +159,13 @@ jobs:
150159
# Info-level logs are filtered unless VERBOSE_LOGGING=true, so we
151160
# rely on systemd's own signals: process is active AND no fatal
152161
# error / restart-loop in the journal since deploy.
153-
SINCE_TS="$(date -u -d '30 seconds ago' '+%Y-%m-%d %H:%M:%S')"
162+
HEALTH_SINCE_TS="$(date -u '+%Y-%m-%d %H:%M:%S')"
154163
STABLE_THRESHOLD_SEC=20
164+
FATAL_LOG_PATTERN="\[(provisioning-worker|agent-router)\] (fatal|unhandled rejection)|node:internal/.*Error:|Error \[ERR_|^[A-Za-z]+Error:"
155165
for attempt in $(seq 1 18); do
156166
if sudo systemctl is-active --quiet "$SYSTEMD_UNIT"; then
157-
JOURNAL=$(sudo journalctl -u "$SYSTEMD_UNIT" --since "$SINCE_TS" --no-pager 2>/dev/null || true)
158-
if echo "$JOURNAL" | grep -qE "\[provisioning-worker\] (fatal|unhandled rejection)|node:internal/.*Error:|^[A-Za-z]+Error:"; then
167+
JOURNAL=$(sudo journalctl -u "$SYSTEMD_UNIT" --since "$HEALTH_SINCE_TS" --no-pager 2>/dev/null || true)
168+
if echo "$JOURNAL" | grep -qE "$FATAL_LOG_PATTERN"; then
159169
echo "::error::Worker logged a fatal error since deploy."
160170
echo "$JOURNAL" | tail -n 50
161171
exit 1
@@ -168,20 +178,32 @@ jobs:
168178
AGE=$(( NOW_SEC - UPTIME_SEC ))
169179
if [ "$AGE" -ge "$STABLE_THRESHOLD_SEC" ]; then
170180
if ! sudo systemctl is-active --quiet eliza-agent-router.service; then
171-
echo "::error::eliza-agent-router.service is not active."
172-
sudo systemctl status eliza-agent-router.service --no-pager || true
173-
sudo journalctl -u eliza-agent-router.service -n 50 --no-pager || true
181+
echo "Health check attempt $attempt/18: worker stable (${AGE}s), router not active yet."
182+
sleep 5
183+
continue
184+
fi
185+
ROUTER_JOURNAL=$(sudo journalctl -u eliza-agent-router.service --since "$HEALTH_SINCE_TS" --no-pager 2>/dev/null || true)
186+
if echo "$ROUTER_JOURNAL" | grep -qE "$FATAL_LOG_PATTERN"; then
187+
echo "::error::Agent router logged a fatal error since activation."
188+
echo "$ROUTER_JOURNAL" | tail -n 50
174189
exit 1
175190
fi
191+
ROUTER_UPTIME_SEC=$(systemctl show eliza-agent-router.service --property=ActiveEnterTimestampMonotonic --value | awk '{ print int($1 / 1e6) }')
192+
ROUTER_AGE=$(( NOW_SEC - ROUTER_UPTIME_SEC ))
193+
if [ "$ROUTER_AGE" -lt "$STABLE_THRESHOLD_SEC" ]; then
194+
echo "Health check attempt $attempt/18: worker stable (${AGE}s), router only ${ROUTER_AGE}s old."
195+
sleep 5
196+
continue
197+
fi
176198
ROUTER_PORT=$(systemctl show eliza-agent-router.service --property=Environment --value | tr ' ' '\n' | awk -F= '$1=="AGENT_ROUTER_PORT" {print $2}')
177199
: "${ROUTER_PORT:=3458}"
178-
if ! curl -sf -m 3 "http://127.0.0.1:${ROUTER_PORT}/healthz" >/dev/null 2>&1; then
179-
echo "::error::eliza-agent-router /healthz did not respond on port ${ROUTER_PORT}."
180-
sudo journalctl -u eliza-agent-router.service -n 50 --no-pager || true
181-
exit 1
200+
if curl -sf -m 3 "http://127.0.0.1:${ROUTER_PORT}/healthz" >/dev/null 2>&1; then
201+
echo "Both daemons active and stable (worker ${AGE}s, router ${ROUTER_AGE}s, router /healthz OK) on attempt $attempt."
202+
exit 0
182203
fi
183-
echo "Both daemons active and stable (worker ${AGE}s, router /healthz OK) on attempt $attempt."
184-
exit 0
204+
echo "Health check attempt $attempt/18: worker stable (${AGE}s), router ${ROUTER_AGE}s but /healthz not ready on port ${ROUTER_PORT}."
205+
sleep 5
206+
continue
185207
fi
186208
echo "Health check attempt $attempt/18: active but only ${AGE}s old, waiting for stability..."
187209
else
@@ -193,6 +215,8 @@ jobs:
193215
echo "::error::$SYSTEMD_UNIT failed to become healthy within 90s."
194216
sudo systemctl status "$SYSTEMD_UNIT" --no-pager || true
195217
sudo journalctl -u "$SYSTEMD_UNIT" -n 200 --no-pager || true
218+
sudo systemctl status eliza-agent-router.service --no-pager || true
219+
sudo journalctl -u eliza-agent-router.service -n 200 --no-pager || true
196220
exit 1
197221
198222
- name: Notify Discord (Success)
@@ -219,4 +243,4 @@ jobs:
219243
description: |
220244
Branch: develop
221245
Commit: ${{ github.sha }}
222-
color: 0xff0000
246+
color: 0xff0000

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ on:
3232

3333
concurrency:
3434
group: test-${{ github.ref }}
35-
cancel-in-progress: true
35+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
3636

3737
env:
3838
CI: "true"

cloud/.github/actions/setup-test-env/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ runs:
4040
run: |
4141
for attempt in 1 2 3; do
4242
if [ "$attempt" -eq 3 ]; then
43-
bun install --frozen-lockfile --verbose && exit 0
43+
bun install --no-save --verbose && git diff --exit-code -- bun.lock && exit 0
4444
else
45-
bun install --frozen-lockfile && exit 0
45+
bun install --no-save && git diff --exit-code -- bun.lock && exit 0
4646
fi
4747
48-
echo "bun install attempt $attempt failed; retrying in 10s..."
48+
echo "bun install attempt $attempt failed or changed bun.lock; retrying in 10s..."
4949
sleep 10
5050
done
5151

cloud/apps/api/agents/[id]/a2a/route.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,7 @@ function getAnthropicCotEnv(env: AppEnv["Bindings"]): AnthropicCotEnv {
103103
ANTHROPIC_COT_BUDGET:
104104
typeof env.ANTHROPIC_COT_BUDGET === "string" ? env.ANTHROPIC_COT_BUDGET : undefined,
105105
ANTHROPIC_COT_BUDGET_MAX:
106-
typeof env.ANTHROPIC_COT_BUDGET_MAX === "string"
107-
? env.ANTHROPIC_COT_BUDGET_MAX
108-
: undefined,
106+
typeof env.ANTHROPIC_COT_BUDGET_MAX === "string" ? env.ANTHROPIC_COT_BUDGET_MAX : undefined,
109107
};
110108
}
111109

cloud/apps/api/agents/[id]/mcp/route.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ function getAnthropicCotEnv(env: AppEnv["Bindings"]): AnthropicCotEnv {
4545
ANTHROPIC_COT_BUDGET:
4646
typeof env.ANTHROPIC_COT_BUDGET === "string" ? env.ANTHROPIC_COT_BUDGET : undefined,
4747
ANTHROPIC_COT_BUDGET_MAX:
48-
typeof env.ANTHROPIC_COT_BUDGET_MAX === "string"
49-
? env.ANTHROPIC_COT_BUDGET_MAX
50-
: undefined,
48+
typeof env.ANTHROPIC_COT_BUDGET_MAX === "string" ? env.ANTHROPIC_COT_BUDGET_MAX : undefined,
5149
};
5250
}
5351

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
const elevenLabsPlugin = {
2+
name: "elevenlabs",
3+
description:
4+
"ElevenLabs plugin is loaded by the agent-server sidecar, not the Cloudflare Worker API bundle.",
5+
};
6+
7+
export { elevenLabsPlugin };
8+
export default elevenLabsPlugin;

0 commit comments

Comments
 (0)