Skip to content

Commit 815f239

Browse files
committed
merge(main): merge upstream main into issue branch
2 parents 2b179ad + 5400aa6 commit 815f239

129 files changed

Lines changed: 41383 additions & 1932 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.

.codex/skills/effect-ts-guide

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../third_party/effect-ts-skills/plugins/effect-ts-skills/skills/effect-ts-guide

.codex/skills/effect-ts-guide/SKILL.md

Lines changed: 0 additions & 36 deletions
This file was deleted.

.codex/skills/effect-ts-guide/references/best-practices.md

Lines changed: 0 additions & 71 deletions
This file was deleted.

.codex/skills/effect-ts-guide/references/platform-map.md

Lines changed: 0 additions & 41 deletions
This file was deleted.

.github/actions/setup/action.yml

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,32 @@ runs:
5757
run: npm install -g node-gyp
5858
- name: Install dependencies
5959
shell: bash
60-
run: bun install --frozen-lockfile
60+
run: |
61+
run_bun_install() {
62+
local timeout_seconds=$((20 * 60))
63+
bun install --frozen-lockfile &
64+
local install_pid="$!"
65+
(
66+
sleep "$timeout_seconds"
67+
echo "bun install exceeded 20 minutes; terminating" >&2
68+
kill "$install_pid" 2>/dev/null || true
69+
) &
70+
local timeout_pid="$!"
71+
local status=0
72+
wait "$install_pid" || status="$?"
73+
kill "$timeout_pid" 2>/dev/null || true
74+
wait "$timeout_pid" 2>/dev/null || true
75+
return "$status"
76+
}
77+
78+
for attempt in 1 2 3; do
79+
if run_bun_install; then
80+
exit 0
81+
fi
82+
if [[ "$attempt" == "3" ]]; then
83+
echo "bun install failed after retries" >&2
84+
exit 1
85+
fi
86+
echo "bun install attempt ${attempt} failed; retrying..." >&2
87+
sleep $((attempt * 2))
88+
done

.github/workflows/check.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,27 @@ jobs:
249249
- name: Login context notice
250250
run: bash scripts/e2e/login-context.sh
251251

252+
e2e-auth-claude-login:
253+
name: E2E (Claude auth login)
254+
runs-on: ubuntu-latest
255+
timeout-minutes: 40
256+
env:
257+
DOCKER_GIT_CONTROLLER_BUILD_SKILLER: "0"
258+
DOCKER_GIT_E2E_REUSE_WORKSPACE_INSTALL: "1"
259+
steps:
260+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
261+
with:
262+
persist-credentials: false
263+
submodules: true
264+
- name: Install dependencies
265+
uses: ./.github/actions/setup
266+
- name: Free Docker disk
267+
uses: ./.github/actions/free-docker-disk
268+
- name: Docker info
269+
run: docker version && docker compose version
270+
- name: Claude auth login warning path
271+
run: bash scripts/e2e/auth-claude-login.sh
272+
252273
e2e-runtime-volumes-ssh:
253274
name: E2E (Runtime volumes + SSH)
254275
runs-on: ubuntu-latest

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "third_party/skiller-desktop-skills-manager"]
22
path = third_party/skiller-desktop-skills-manager
33
url = https://github.com/beautyfree/skiller-desktop-skills-manager.git
4+
[submodule "third_party/effect-ts-skills"]
5+
path = third_party/effect-ts-skills
6+
url = https://github.com/ProverCoderAI/effect-ts-skills.git

0 commit comments

Comments
 (0)