Skip to content

Commit 0c5b59f

Browse files
authored
Merge pull request #74 from aaditagrawal/sync/upstream-2026-04-20
sync: merge 10 new upstream commits (v0.0.20)
2 parents 26ca6ec + 1879cc9 commit 0c5b59f

113 files changed

Lines changed: 44537 additions & 8810 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.

.claude/scheduled_tasks.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"sessionId":"a27f6677-f289-4497-8b1a-b851333efd2c","pid":65193,"acquiredAt":1775901038769}
1+
{"sessionId":"a27f6677-f289-4497-8b1a-b851333efd2c","pid":53566,"acquiredAt":1776751928882}

.claude/settings.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"$schema": "https://json.schemastore.org/claude-code-settings.json",
3+
"hooks": {
4+
"PreToolUse": [
5+
{
6+
"matcher": "Bash",
7+
"hooks": [
8+
{
9+
"type": "command",
10+
"command": "cmd=$(jq -r '.tool_input.command'); if echo \"$cmd\" | grep -qE 'git push|gh pr create'; then echo 'Running pre-push checks (bun typecheck && bun run test)...' >&2; cd /Users/mav/Documents/Projects/Experiments/vibes/t3code && bun typecheck && bun run test || { echo 'Pre-push checks failed. Fix errors before pushing.' >&2; exit 2; }; fi",
11+
"timeout": 300,
12+
"statusMessage": "Running pre-push CI checks"
13+
}
14+
]
15+
}
16+
]
17+
}
18+
}

.devcontainer/devcontainer.json

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,22 @@
22
"name": "T3 Code Dev",
33
"image": "debian:bookworm",
44
"features": {
5-
"ghcr.io/devcontainers-extra/features/bun:1": {},
5+
"ghcr.io/devcontainers/features/git:1": {},
6+
"ghcr.io/devcontainers-extra/features/bun:1": {
7+
"version": "1.3.11"
8+
},
69
"ghcr.io/devcontainers/features/node:1": {
7-
"version": "24",
8-
"nodeGypDependencies": true
10+
"version": "24.13.1"
911
},
1012
"ghcr.io/devcontainers/features/python:1": {
11-
"version": "3.12"
13+
"version": "3.10",
14+
"installTools": false
1215
}
1316
},
17+
"overrideFeatureInstallOrder": [
18+
"ghcr.io/devcontainers/features/git",
19+
"ghcr.io/devcontainers-extra/features/bun"
20+
],
1421
"postCreateCommand": {
1522
"bun-install": "bun install --backend=copyfile --frozen-lockfile"
1623
},

.github/workflows/release.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
push:
55
tags:
66
- "v*.*.*"
7+
- "!v*-nightly.*"
8+
schedule:
9+
- cron: "0 */3 * * *"
710
workflow_dispatch:
811
inputs:
912
version:
@@ -15,8 +18,45 @@ permissions:
1518
contents: write
1619

1720
jobs:
21+
check_changes:
22+
name: Check for changes since last nightly
23+
if: github.event_name == 'schedule'
24+
runs-on: ubuntu-24.04
25+
outputs:
26+
has_changes: ${{ steps.check.outputs.has_changes }}
27+
steps:
28+
- name: Checkout
29+
uses: actions/checkout@v6
30+
with:
31+
fetch-depth: 0
32+
33+
- id: check
34+
name: Compare HEAD to last nightly tag
35+
run: |
36+
last_nightly_tag=$(git tag --list 'v*-nightly.*' 'nightly-v*' --sort=-creatordate | head -n 1)
37+
if [[ -z "$last_nightly_tag" ]]; then
38+
echo "No previous nightly tag found. Proceeding with release."
39+
echo "has_changes=true" >> "$GITHUB_OUTPUT"
40+
exit 0
41+
fi
42+
43+
last_nightly_sha=$(git rev-parse "$last_nightly_tag^{commit}")
44+
head_sha=$(git rev-parse HEAD)
45+
46+
if [[ "$last_nightly_sha" == "$head_sha" ]]; then
47+
echo "No changes on main since last nightly release ($last_nightly_tag). Skipping."
48+
echo "has_changes=false" >> "$GITHUB_OUTPUT"
49+
else
50+
echo "Changes detected on main since $last_nightly_tag ($last_nightly_sha → $head_sha). Proceeding."
51+
echo "has_changes=true" >> "$GITHUB_OUTPUT"
52+
fi
53+
1854
preflight:
1955
name: Preflight
56+
needs: [check_changes]
57+
if: |
58+
!failure() && !cancelled() &&
59+
(github.event_name != 'schedule' || needs.check_changes.outputs.has_changes == 'true')
2060
runs-on: ubuntu-24.04
2161
timeout-minutes: 10
2262
outputs:
@@ -35,6 +75,15 @@ jobs:
3575
run: |
3676
if [[ "${GITHUB_EVENT_NAME}" == "workflow_dispatch" ]]; then
3777
raw="${{ github.event.inputs.version }}"
78+
elif [[ "${GITHUB_EVENT_NAME}" == "schedule" ]]; then
79+
# Nightly: derive a unique prerelease version from the current
80+
# package.json base and today's date + run counter so every
81+
# scheduled run produces a valid semver like
82+
# `0.0.21-nightly.20260420.3`.
83+
base_version=$(node -e "console.log(require('./package.json').version)")
84+
base_version="${base_version%%-*}"
85+
date_stamp=$(date -u +%Y%m%d)
86+
raw="${base_version}-nightly.${date_stamp}.${GITHUB_RUN_NUMBER}"
3887
else
3988
raw="${GITHUB_REF_NAME}"
4089
fi

.oxfmtrc.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,13 @@
1313
"apps/web/src/lib/vendor/qrcodegen.ts",
1414
"*.icon/**"
1515
],
16-
"sortPackageJson": {}
16+
"sortPackageJson": {},
17+
"overrides": [
18+
{
19+
"files": [".devcontainer/devcontainer.json"],
20+
"options": {
21+
"trailingComma": "none"
22+
}
23+
}
24+
]
1725
}

apps/desktop/src/clientPersistence.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const clientSettings: ClientSettings = {
5252
confirmThreadArchive: true,
5353
confirmThreadDelete: false,
5454
diffWordWrap: true,
55+
favorites: [],
5556
sidebarProjectGroupingMode: "repository_path",
5657
sidebarProjectGroupingOverrides: {
5758
"environment-1:/tmp/project-a": "separate",

apps/server/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"@types/bun": "catalog:",
4747
"@types/node": "catalog:",
4848
"effect-acp": "workspace:*",
49+
"effect-codex-app-server": "workspace:*",
4950
"tsdown": "catalog:",
5051
"typescript": "catalog:",
5152
"vitest": "catalog:"

0 commit comments

Comments
 (0)