Skip to content

Commit c2e27ae

Browse files
Agent2-asafclaude
andcommitted
AgentX: Merge upstream v0.12.0 into fork
Merges 59 commits from wavetermdev/waveterm v0.12.0 release into a5af fork. Resolves 49 merge conflicts across frontend, backend, and configuration files. ## Major Upstream Features Integrated ### AI Enhancements (v0.12.0) - AI Response Feedback + Copy Buttons (wavetermdev#2457) - Reasoning Deltas Display (wavetermdev#2443) - Google AI File Summarization (wavetermdev#2455) - `wsh ai` Command Reimplementation (wavetermdev#2435) - Terminal Context Improvements (wavetermdev#2444) - Batch Tool Approval System - Enhanced AI Panel with welcome message - Context menu support for AI messages ### Infrastructure Updates - Mobile User Agent Emulation for web widgets (wavetermdev#2454) - OSC 7 Support for Fish & PowerShell shells (wavetermdev#2456) - Log Rotation System (wavetermdev#2432) - Onboarding improvements - React 19 compatibility updates - Tailwind v4 migration progress - Dependency updates (50+ commits) ## Fork Features Preserved ✅ **Horizontal Widget Bar** (tabbar.tsx) - Widgets remain in horizontal tab bar (not reverted to sidebar) - Fork-specific layout maintained ✅ **Optional Pane Title Labels** (blockframe.tsx) - Auto-generated pane titles preserved - Custom block rendering logic intact ✅ **Layout Model Modifications** (layoutModel.ts) - Fork's widget positioning logic maintained - Horizontal layout integration preserved ## Conflict Resolution Summary **Configuration (8 files):** - Accepted upstream: .golangci.yml, Taskfile.yml, package.json, go.mod, etc. - All dependencies updated to v0.12.0 levels **Backend AI (13 files):** - Accepted upstream: All pkg/aiusechat/ files - New AI tools: read_dir, screenshot, terminal context - Enhanced OpenAI backend with reasoning support **Frontend AI Panel (12 files):** - Accepted upstream: All frontend/app/aipanel/ files - New features: reasoning display, feedback buttons, welcome message - Enhanced message handling and UX **Backend Infrastructure (7 files):** - Accepted upstream: emain, pkg/telemetry, pkg/wcore, pkg/wshrpc - Updated RPC types and telemetry data structures **Frontend Fork Features (8 files):** - Preserved fork: blockframe.tsx, tabbar.tsx, layoutModel.ts - Accepted upstream: keymodel.ts, wshclientapi.ts, termwrap.ts, etc. **Deleted Files (1 file):** - Removed: frontend/app/modals/tos.tsx (deleted upstream) ## Files Changed - Configuration: 8 files - Backend: 20+ files - Frontend: 25+ files - Total staged: 135 files ## Testing Required 1. Verify AI panel functionality (reasoning, feedback, tools) 2. Test horizontal widget bar (fork feature) 3. Test pane title labels (fork feature) 4. Build verification: `npm install && npm run build:dev` 5. Backend build: `go build ./...` 6. Full test suite: `npm test` ## Known Issues ⚠️ Widget bar integration may need review - upstream removed widget sidebar ⚠️ Layout changes may conflict with horizontal widget positioning ⚠️ React 19 compatibility should be tested thoroughly ## Rollback If issues arise, rollback available at: - Tag: fork-v0.11.6-pre-v0.12-merge - Branch: backup-pre-v0.12-merge ## Next Steps 1. Test all functionality thoroughly 2. Fix any runtime errors from merge 3. Review fork feature integration points 4. Update documentation if needed 5. Create PR to main after validation --- 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
2 parents a04088c + 64d24cd commit c2e27ae

133 files changed

Lines changed: 7357 additions & 1805 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/build-helper.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
go-version: ${{env.GO_VERSION}}
6565
cache-dependency-path: |
6666
go.sum
67-
- uses: actions/setup-node@v5
67+
- uses: actions/setup-node@v6
6868
with:
6969
node-version: ${{env.NODE_VERSION}}
7070
cache: npm
@@ -76,7 +76,7 @@ jobs:
7676
- uses: nick-fields/retry@v3
7777
name: npm ci
7878
with:
79-
command: npm ci --no-audit --no-fund --timing --foreground-scripts
79+
command: npm ci --no-audit --no-fund
8080
retry_on: error
8181
max_attempts: 3
8282
timeout_minutes: 5

.github/workflows/bump-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
token: ${{ steps.app-token.outputs.token }}
4040

4141
# General build dependencies
42-
- uses: actions/setup-node@v5
42+
- uses: actions/setup-node@v6
4343
with:
4444
node-version: ${{env.NODE_VERSION}}
4545
cache: npm

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
version: 3.x
7272
repo-token: ${{ secrets.GITHUB_TOKEN }}
7373

74-
- uses: actions/setup-node@v5
74+
- uses: actions/setup-node@v6
7575
with:
7676
node-version: ${{env.NODE_VERSION}}
7777
cache: npm
@@ -96,7 +96,7 @@ jobs:
9696

9797
# Initializes the CodeQL tools for scanning.
9898
- name: Initialize CodeQL
99-
uses: github/codeql-action/init@v3
99+
uses: github/codeql-action/init@v4
100100
with:
101101
languages: ${{ matrix.language }}
102102
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -113,7 +113,7 @@ jobs:
113113
# If this step fails, then you should remove it and run the build manually (see below)
114114
- name: Autobuild (not Go)
115115
if: matrix.language != 'go'
116-
uses: github/codeql-action/autobuild@v3
116+
uses: github/codeql-action/autobuild@v4
117117

118118
- name: Build (Go only)
119119
if: matrix.language == 'go'
@@ -132,6 +132,6 @@ jobs:
132132
# ./location_of_script_within_repo/buildscript.sh
133133

134134
- name: Perform CodeQL Analysis
135-
uses: github/codeql-action/analyze@v3
135+
uses: github/codeql-action/analyze@v4
136136
with:
137137
category: "/language:${{matrix.language}}"
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: Copilot Setup Steps
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
paths: [.github/workflows/copilot-setup-steps.yml]
7+
pull_request:
8+
paths: [.github/workflows/copilot-setup-steps.yml]
9+
10+
env:
11+
GO_VERSION: "1.24"
12+
NODE_VERSION: 22
13+
14+
jobs:
15+
copilot-setup-steps:
16+
runs-on: ubuntu-latest
17+
permissions:
18+
contents: read
19+
20+
steps:
21+
- uses: actions/checkout@v5
22+
23+
# Go + Node versions match your helper
24+
- uses: actions/setup-go@v6
25+
with:
26+
go-version: ${{ env.GO_VERSION }}
27+
cache-dependency-path: go.sum
28+
29+
- uses: actions/setup-node@v6
30+
with:
31+
node-version: ${{ env.NODE_VERSION }}
32+
cache: npm
33+
cache-dependency-path: package-lock.json
34+
35+
# Zig is used by your Linux CGO builds (kept available, but we won't build here)
36+
- uses: mlugg/setup-zig@v2
37+
38+
# Task CLI for your Taskfile
39+
- uses: arduino/setup-task@v2
40+
with:
41+
version: 3.x
42+
repo-token: ${{ secrets.GITHUB_TOKEN }}
43+
44+
# Git HTTPS so deps resolve non-interactively
45+
- name: Force git deps to HTTPS
46+
run: |
47+
git config --global url.https://github.com/.insteadof ssh://git@github.com/
48+
git config --global url.https://github.com/.insteadof git@github.com:
49+
50+
# Warm caches only (no builds)
51+
- uses: nick-fields/retry@v3
52+
name: npm ci
53+
with:
54+
command: npm ci --no-audit --no-fund
55+
retry_on: error
56+
max_attempts: 3
57+
timeout_minutes: 5
58+
env:
59+
GIT_ASKPASS: "echo"
60+
GIT_TERMINAL_PROMPT: "0"
61+
62+
- name: Pre-fetch Go modules
63+
run: go mod download

.github/workflows/deploy-docsite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- uses: actions/checkout@v5
3737
with:
3838
fetch-depth: 0
39-
- uses: actions/setup-node@v5
39+
- uses: actions/setup-node@v6
4040
with:
4141
node-version: ${{env.NODE_VERSION}}
4242
cache: npm

.github/workflows/testdriver-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- uses: actions/setup-go@v6
4848
with:
4949
go-version: ${{env.GO_VERSION}}
50-
- uses: actions/setup-node@v5
50+
- uses: actions/setup-node@v6
5151
with:
5252
node-version: ${{env.NODE_VERSION}}
5353
cache: npm

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ make/
1717
artifacts/
1818
mikework/
1919
.env
20+
out
2021

2122
# Yarn Modern
2223
.pnp.*

.golangci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
version: 2
2+
13
linters:
24
disable:
35
- unused

.roo/rules/rules.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,3 +177,8 @@ Also when adding content to the end of files prefer to use the new append_file t
177177
- **ALWAYS verify the current working directory before executing commands**
178178
- Either run "pwd" first to verify the directory, or do a "cd" to the correct absolute directory before running commands
179179
- When running tests, do not "cd" to the pkg directory and then run the test. This screws up the cwd and you never recover. run the test from the project root instead.
180+
181+
### Testing / Compiling Go Code
182+
183+
No need to run a `go build` or a `go run` to just check if the Go code compiles. VSCode's errors/problems cover this well.
184+
If there are no Go errors in VSCode you can assume the code compiles fine.

Taskfile.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ tasks:
2727
- build:backend
2828
env:
2929
WAVETERM_ENVFILE: "{{.ROOT_DIR}}/.env"
30-
WCLOUD_ENDPOINT: "https://api-dev.waveterm.dev"
30+
WCLOUD_ENDPOINT: "https://api-dev.waveterm.dev/central"
3131
WCLOUD_WS_ENDPOINT: "wss://wsapi-dev.waveterm.dev"
3232

3333
electron:start:
@@ -41,7 +41,7 @@ tasks:
4141
- build:backend
4242
env:
4343
WAVETERM_ENVFILE: "{{.ROOT_DIR}}/.env"
44-
WCLOUD_ENDPOINT: "https://api-dev.waveterm.dev"
44+
WCLOUD_ENDPOINT: "https://api-dev.waveterm.dev/central"
4545
WCLOUD_WS_ENDPOINT: "wss://wsapi-dev.waveterm.dev"
4646

4747
electron:quickdev:
@@ -157,6 +157,7 @@ tasks:
157157
- go.mod
158158
- go.sum
159159
- pkg/**/*.go
160+
- pkg/**/*.sh
160161
- cmd/**/*.go
161162
- tsunami/go.mod
162163
- tsunami/go.sum
@@ -188,6 +189,7 @@ tasks:
188189
- "cmd/server/*.go"
189190
- "pkg/**/*.go"
190191
- "pkg/**/*.json"
192+
- "pkg/**/*.sh"
191193
- tsunami/**/*.go
192194
generates:
193195
- dist/bin/wavesrv.*
@@ -215,6 +217,7 @@ tasks:
215217
- "cmd/server/*.go"
216218
- "pkg/**/*.go"
217219
- "pkg/**/*.json"
220+
- "pkg/**/*.sh"
218221
- "tsunami/**/*.go"
219222
generates:
220223
- dist/bin/wavesrv.*

0 commit comments

Comments
 (0)