Skip to content

sync(upstream): 9 commits from upstream - #13

Open
clyang82 wants to merge 8 commits into
mainfrom
sync/upstream-84528e211ff2-1233c6e9f58f
Open

clyang82 wants to merge 8 commits into
mainfrom
sync/upstream-84528e211ff2-1233c6e9f58f

Conversation

@clyang82

Copy link
Copy Markdown

Upstream Sync: 9 Commits

Upstream Commits

SHA Intent Type Risk
84528e211ff2 Fix release bot regressing to already-released versions by deriving the current version as the max of the latest git tag and the version in cmd/san/main.go, and skipping versions/PRs already recorded in the CHANGELOG bugfix low
981c9b44d165 Automated release chore: bump version constant from 1.22.3 to 1.22.4 and add the v1.22.4 changelog entry; no functional code changes in this commit itself. internal low
7bce5d7cb47d Release bot now triggers CI on release PR branches via workflow_dispatch (bypassing GITHUB_TOKEN approval gating), polls until CI passes, then requests review from a single designated OWNERS member (REVIEW_REQUESTEE) instead of the whole team. internal low
615d1b2d6457 Fix silent config wipe: read-modify-write saves now abort on unparseable files via new atomicfile.ReadJSON helper, instead of treating them as empty and overwriting user settings with just the block being saved bugfix medium
67f8090eb8f8 Apply the x/tools modernize analyzer tree-wide: ~100 behavior-preserving mechanical rewrites (min/max builtins, slices/maps helpers, iterator-based string splitting, interface{} -> any, etc.) plus removal of no-op omitempty tags on non-pointer nested struct fields that encoding/json was ignoring anyway. refactor low
9c8d3b8dd54c Fix Anthropic thinking configuration (adaptive style for Claude 4.6+, budget for older/third-party), refresh model catalogs across providers against vendor docs, and replace retired default models. bugfix medium
49824b98a769 Add a golangci-lint CI gate (errcheck + ineffassign only) and fix all existing violations, which were mostly silently-dropped errors: task dependency creation falsely reporting success, tracker storage/task-output dir failures, MCP server removal failures, and san version --json exiting 0 on encode errors. bugfix medium
91c5b4172fae Add a gating govulncheck CI job (plus weekly schedule and Dependabot gomod tracking), bump the Go toolchain pin and two vulnerable module dependencies so zero reachable vulnerabilities remain. internal low
1233c6e9f58f Dependabot bump of 11 Go modules (minor/patch group) with a test-only adaptation: charmbracelet/ultraviolet now renders trailing blank cells as spaces, so scrollback assertions strip per-row padding instead of expecting trimmed lines. internal medium

Affected Surfaces

  • .golangci.yml lint configuration (new dev tooling contract for make lint)
  • Anthropic max_tokens computation for thinking budgets
  • Anthropic output_config.effort (wire field)
  • Anthropic thinking request field (wire: adaptive vs enabled/budget_tokens shape)
  • Default model names in settings (claude-sonnet-5, gemini-2.5-flash)
  • MCP server removal behavior (failed removals no longer silently refresh the list)
  • REVIEW_REQUESTEE
  • Static model catalog data (context windows, output caps, pricing for OpenAI/DeepSeek/BigModel/Moonshot/Volcengine/MiniMax/Anthropic)
  • TaskCreate tool output (now reports addBlockedBy failure instead of Success: true)
  • Unknown-model fallback convention (zero context window instead of guessed value)
  • atomicfile.ReadJSON
  • ci.yml workflow_dispatch trigger
  • known_marketplaces.json save behavior
  • mcp.json save behavior
  • san version --json exit code (now non-zero on encode failure)
  • settings.json save behavior

Transformations Applied

Downstream File Confidence Notes
.github/scripts/release-bot.py high The apply failed only because of the fork's branding rename (cmd/san/main.go → cmd/cube/main.go per the rename conventions); the surrounding code is otherwise identical to upstream. Applied both upstream hunks verbatim except substituting 'cmd/cube/main.go' for 'cmd/san/main.go' in comments and messages. Caveat: the upstream diff shown was truncated at '# 3. Determine next version' — the commit summary also mentions skipping versions/PRs already recorded in the CHANGELOG, but that portion of the diff is not visible, so it was not applied here; a follow-up sync of the remainder of this commit may be needed. (applied 2 targeted edits)
CHANGELOG.md high upstream diff applied directly via git apply
.github/workflows/ci.yml high upstream diff applied directly via git apply
.github/scripts/release-bot.py medium Apply failed purely due to fork branding drift (REPO is suanova/cube, cmd/cube/main.go); no semantic divergence, so all hunks map 1:1. Docstring step 5 already references cmd/cube/main.go, so only the new steps 7–8 were added verbatim. REVIEW_REQUESTEE kept as upstream's "yanmxa" — the fork conventions define no downstream-specific reviewer mapping, and a human can retarget this constant if the fork's OWNERS differ. The upstream diff was truncated mid-function (inside the final gh pr edit call), so I reconstructed (a) the tail of wait_for_ci_and_request_review — completing --add-reviewer REVIEW_REQUESTEE with error handling consistent with the script's ::warning:: style — and (b) the implied main() call site that the visible code requires: dispatching gh workflow run ci.yml --ref <branch> after PR creation (the poller filters runs by event == workflow_dispatch on ci.yml, so this dispatch must exist), then extracting the PR number from the gh pr create URL and calling wait_for_ci_and_request_review(pr_number, branch, read_owners()). Assumed the downstream CI workflow file is also named ci.yml (fork is functionally identical; only branding was renamed). (applied 5 targeted edits)
internal/atomicfile/atomicfile.go high upstream diff applied directly via git apply
internal/atomicfile/atomicfile_test.go high upstream diff applied directly via git apply
internal/mcp/config.go high upstream diff applied directly via git apply
internal/mcp/config_malformed_test.go high upstream diff applied directly via git apply
internal/plugin/enabled_state_test.go high upstream diff applied directly via git apply
internal/plugin/installer.go high upstream diff applied directly via git apply
internal/plugin/registry.go high upstream diff applied directly via git apply
internal/setting/loader.go high upstream diff applied directly via git apply
internal/setting/malformed_settings_test.go high upstream diff applied directly via git apply
internal/app/conv/agent_activity.go high upstream diff applied directly via git apply
internal/app/conv/cjk_wrap_test.go high upstream diff applied directly via git apply
internal/app/conv/markdown.go high upstream diff applied directly via git apply
internal/app/conv/markdown_test.go high upstream diff applied directly via git apply
internal/app/conv/message_test.go high upstream diff applied directly via git apply
internal/app/conv/question.go high upstream diff applied directly via git apply
internal/app/conv/status_bar.go high upstream diff applied directly via git apply
internal/app/conv/tool.go high upstream diff applied directly via git apply
internal/app/conv/tool_render.go high upstream diff applied directly via git apply
internal/app/input/on_approval.go high upstream diff applied directly via git apply
internal/app/input/on_approval_bash.go high upstream diff applied directly via git apply
internal/app/input/on_memory.go high upstream diff applied directly via git apply
internal/app/input/on_persona_test.go high upstream diff applied directly via git apply
internal/app/input/on_plugin.go high upstream diff applied directly via git apply
internal/app/input/on_plugin_command.go high upstream diff applied directly via git apply
internal/app/input/on_queue_test.go high upstream diff applied directly via git apply
internal/app/input/on_secret.go high upstream diff applied directly via git apply
internal/app/input/on_session.go high upstream diff applied directly via git apply
internal/app/input/on_skill_test.go high upstream diff applied directly via git apply
internal/app/input/on_textarea.go high upstream diff applied directly via git apply
internal/app/kit/listnav.go high upstream diff applied directly via git apply
internal/app/kit/suggest/suggest.go high upstream diff applied directly via git apply
internal/app/kit/util.go high upstream diff applied directly via git apply
internal/app/selflearn_recent.go high upstream diff applied directly via git apply
internal/app/trigger/file_watcher.go high upstream diff applied directly via git apply
internal/atomicfile/atomicfile_test.go high upstream diff applied directly via git apply
internal/core/message.go high upstream diff applied directly via git apply
internal/cron/cron.go high upstream diff applied directly via git apply
internal/cron/cron_test.go high upstream diff applied directly via git apply
internal/cron/loop.go high upstream diff applied directly via git apply
internal/cron/store.go high upstream diff applied directly via git apply
internal/hook/engine.go high upstream diff applied directly via git apply
internal/inspector/replay.go high upstream diff applied directly via git apply
internal/inspector/server.go high upstream diff applied directly via git apply
internal/log/response.go high upstream diff applied directly via git apply
internal/mcp/adopt_clients_test.go high upstream diff applied directly via git apply
internal/mcp/caller_test.go high upstream diff applied directly via git apply
internal/mcp/client.go high upstream diff applied directly via git apply
internal/mcp/transport/stdio_test.go high upstream diff applied directly via git apply
internal/mcp/types.go high upstream diff applied directly via git apply
internal/plugin/compat.go high upstream diff applied directly via git apply
internal/plugin/registry.go high upstream diff applied directly via git apply
internal/reminder/reminder_test.go high upstream diff applied directly via git apply
internal/selflearn/skillpatch.go high upstream diff applied directly via git apply
internal/session/message_convert.go high upstream diff applied directly via git apply
internal/session/transcript/fs_store.go high upstream diff applied directly via git apply
internal/session/transcript/index_recovery_test.go high upstream diff applied directly via git apply
internal/session/transcript/projector.go high upstream diff applied directly via git apply
internal/session/transcript/tool_result.go high upstream diff applied directly via git apply
internal/session/transcript/types_test.go high upstream diff applied directly via git apply
internal/setting/loader.go high upstream diff applied directly via git apply
internal/setting/security.go high upstream diff applied directly via git apply
internal/setting/settings.go high upstream diff applied directly via git apply
internal/skill/registry.go high upstream diff applied directly via git apply
internal/subagent/executor.go high upstream diff applied directly via git apply
internal/subagent/loader.go high upstream diff applied directly via git apply
internal/task/bash_task_test.go high upstream diff applied directly via git apply
internal/task/manager_test.go high upstream diff applied directly via git apply
internal/tool/skill/skill.go high upstream diff applied directly via git apply
tests/integration/cli/startup_test.go high upstream diff applied directly via git apply
tests/integration/persona/persona_test.go high upstream diff applied directly via git apply
tests/integration/session/session_test.go high upstream diff applied directly via git apply
tools/layercheck/main.go high upstream diff applied directly via git apply
cmd/cube/update.go medium The apply failed because cmd/san/update.go does not exist downstream: the fork's branding-rename commit (10cfaec) moved cmd/san/ to cmd/cube/, so the equivalent file is cmd/cube/update.go. Per the fork conventions the codebase is functionally identical to upstream apart from user-facing san->cube branding, and this progressWriter code contains no branding, so the upstream modernize rewrite (clamping with the min builtin, Go 1.21+) applies verbatim at the renamed path. Assumed the downstream function body matches the upstream pre-change context; not resolvable as a 'new file' since the full downstream content is not visible. (applied 1 targeted edits)
docs/packages/2-feature/llm.md high upstream diff applied directly via git apply
internal/llm/anthropic/catalog.go high upstream diff applied directly via git apply
internal/llm/anthropic/catalog_test.go high upstream diff applied directly via git apply
internal/llm/anthropic/client.go high upstream diff applied directly via git apply
internal/llm/anthropic/vertex.go high upstream diff applied directly via git apply
internal/llm/bigmodel/catalog.go high upstream diff applied directly via git apply
internal/llm/bigmodel/client.go high upstream diff applied directly via git apply
internal/llm/bigmodel/client_test.go high upstream diff applied directly via git apply
internal/llm/deepseek/catalog.go high upstream diff applied directly via git apply
internal/llm/deepseek/client_test.go high upstream diff applied directly via git apply
internal/llm/minmax/catalog.go high upstream diff applied directly via git apply
internal/llm/moonshot/catalog.go high upstream diff applied directly via git apply
internal/llm/openai/catalog.go high upstream diff applied directly via git apply
internal/llm/openai/catalog_test.go high upstream diff applied directly via git apply
internal/llm/volcengine/catalog.go high upstream diff applied directly via git apply
internal/llm/volcengine/catalog_test.go high upstream diff applied directly via git apply
internal/setting/client_options.go high upstream diff applied directly via git apply
internal/setting/client_options_test.go high upstream diff applied directly via git apply
.github/workflows/ci.yml high upstream diff applied directly via git apply
.golangci.yml high upstream diff applied directly via git apply
Makefile high upstream diff applied directly via git apply
docs/operations/development.md high upstream diff applied directly via git apply
internal/app/init.go high upstream diff applied directly via git apply
internal/app/input/on_mcp.go high upstream diff applied directly via git apply
internal/app/input/on_plugin.go high upstream diff applied directly via git apply
internal/app/model_session.go high upstream diff applied directly via git apply
internal/cron/loop.go high upstream diff applied directly via git apply
internal/task/service.go high upstream diff applied directly via git apply
internal/todo/store.go high upstream diff applied directly via git apply
internal/tool/tasktools/trackercreate.go high upstream diff applied directly via git apply
cmd/cube/main.go medium The apply failed because cmd/san/main.go does not exist downstream: the fork's branding rename (commit 10cfaec, per the conventions doc) renamed cmd/san/ to cmd/cube/. The downstream path field incorrectly pointed at the old san path; the real file is cmd/cube/main.go. Targeting that path instead of the stale one — creating cmd/san/main.go would resurrect a deleted file and produce a duplicate main package. The change itself is not branding-related (it checks the json.Encoder error in the version command and exits non-zero on failure), and the conventions doc states the fork is functionally identical outside the rename, so the surrounding code (enc := json.NewEncoder / SetIndent / enc.Encode(info) / return) should be verbatim-identical to upstream's pre-change context, which I used as the anchor. Since I could not see cmd/cube/main.go's actual contents (the provided downstream contents were empty because the stated path doesn't exist), confidence is medium rather than high. (applied 1 targeted edits)
.github/dependabot.yml high upstream diff applied directly via git apply
.github/workflows/release.yml high upstream diff applied directly via git apply
Makefile high upstream diff applied directly via git apply
docs/operations/development.md high upstream diff applied directly via git apply
go.mod high upstream diff applied directly via git apply
go.sum high upstream diff applied directly via git apply
.github/workflows/ci.yml high The patch failed because the test-windows job references ./cmd/cube/ (fork rename from san) instead of upstream's ./cmd/san/, breaking the last hunk's context. Applied all four upstream intents: (1) weekly cron schedule added after workflow_dispatch; (2) Go toolchain pin bumped 1.25.8 -> 1.25.13 in both jobs (disambiguated the two identical go-version lines with unique surrounding context: 'Install dev tools' for the test job, 'go build ./cmd/cube/' for the windows job); (3) new gating 'vuln' govulncheck job inserted between the test and test-windows jobs, preserving the fork's ./cmd/cube/ path untouched. The go.mod/dependabot/dependency bumps implied by the commit summary are outside this file and not addressed here. (applied 4 targeted edits)
internal/app/model_scrollback_test.go high upstream diff applied directly via git apply
go.mod high The mechanical apply failed because the downstream first require block diverges from upstream: it keeps github.com/PuerkitoBio/goquery as a direct dep, adds google.golang.org/genai v1.58.0, and lacks github.com/genai-io/sdk-go v0.1.2 (context lines that upstream's patch anchored on). All those fork-specific lines were preserved unchanged. Applied all upstream version bumps verbatim to the lines that exist downstream (10 in the first block, 8 in the indirect block, plus ultraviolet and go-colorful). The six new indirect dependencies introduced by the anthropic-sdk-go/openai-go bumps (bahlo/generic-list-go, buger/jsonparser, invopop/jsonschema, pb33f/ordered-map/v2, standard-webhooks/libraries, go.yaml.in/yaml/v4) were added to the small indirect require block in standard lexicographic order (uppercase paths first), omitting upstream's 'github.com/PuerkitoBio/goquery // indirect' line since downstream tracks goquery as a direct dependency. The bubbletea replace block and all cloud.google.com/gorilla/websocket entries are fork-specific and untouched. Note: go.sum will need regeneration (go mod tidy / go build) after this bump. (applied 6 targeted edits)

⚠️ Conflicts

  • cmd/cube/main.go (): LLM edits did not apply: edit 1: 'old' block not found in file: 'var version = "1.22.3"'
  • go.sum (): Resolve call failed: Anthropic API error after 3 retries:
<title>504 Gateway Time-out</title>

504 Gateway Time-out

❌ Unresolved Build Failures

  • cmd/cube/main.go: LLM edits did not apply: edit 1: 'old' block not found in file: 'var version = "1.22.3"' — Suggestion: Resolve manually — see the conflict summary in this PR.
  • go.sum: Resolve call failed: Anthropic API error after 3 retries:
<title>504 Gateway Time-out</title>

504 Gateway Time-out

— _Suggestion: Resolve manually — see the conflict summary in this PR._

🤖 Created by upstream-semantic-sync

@mergify

mergify Bot commented Aug 23, 2026

Copy link
Copy Markdown

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@clyang82
clyang82 force-pushed the sync/upstream-84528e211ff2-1233c6e9f58f branch 2 times, most recently from 03d41aa to 6aa887a Compare September 6, 2026 23:45
@clyang82
clyang82 force-pushed the sync/upstream-84528e211ff2-1233c6e9f58f branch 2 times, most recently from f275036 to 1e8de25 Compare September 21, 2026 00:02
@coderabbitai

coderabbitai Bot commented Sep 21, 2026 •

Copy link
Copy Markdown

Important

Review skipped

Too many files!

This PR contains 101 files, which is 1 over the limit of 100.

To get a review, reduce the PR to 100 files or fewer by splitting it into smaller PRs or changing its base branch.

Upgrade to a paid plan to raise the limit.

This review couldn't start because sufficient usage credits or metered capacity aren't available. Add credits or update usage-based reviews in the billing tab, then retry.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Advanced

Run ID: a80a3bd5-5c4c-4772-bf7f-00e26f2e7915

📥 Commits

Reviewing files that changed from the base of the PR and between 1e8ca13 and 91bb147.

⛔ Files ignored due to path filters (1)
  • go.sum is excluded by !**/*.sum
📒 Files selected for processing (101)
  • .github/dependabot.yml
  • .github/scripts/release-bot.py
  • .github/workflows/ci.yml
  • .github/workflows/release.yml
  • .golangci.yml
  • CHANGELOG.md
  • CHANGELOG.sync.md
  • Makefile
  • cmd/cube/main.go
  • cmd/cube/update.go
  • docs/operations/development.md
  • docs/packages/2-feature/llm.md
  • go.mod
  • internal/app/conv/agent_activity.go
  • internal/app/conv/cjk_wrap_test.go
  • internal/app/conv/markdown.go
  • internal/app/conv/markdown_test.go
  • internal/app/conv/message_test.go
  • internal/app/conv/question.go
  • internal/app/conv/status_bar.go
  • internal/app/conv/tool.go
  • internal/app/conv/tool_render.go
  • internal/app/init.go
  • internal/app/input/on_approval.go
  • internal/app/input/on_approval_bash.go
  • internal/app/input/on_mcp.go
  • internal/app/input/on_memory.go
  • internal/app/input/on_persona_test.go
  • internal/app/input/on_plugin.go
  • internal/app/input/on_plugin_command.go
  • internal/app/input/on_queue_test.go
  • internal/app/input/on_secret.go
  • internal/app/input/on_session.go
  • internal/app/input/on_skill_test.go
  • internal/app/input/on_textarea.go
  • internal/app/kit/listnav.go
  • internal/app/kit/suggest/suggest.go
  • internal/app/kit/util.go
  • internal/app/model_scrollback_test.go
  • internal/app/model_session.go
  • internal/app/selflearn_recent.go
  • internal/app/trigger/file_watcher.go
  • internal/atomicfile/atomicfile_test.go
  • internal/core/message.go
  • internal/cron/cron.go
  • internal/cron/cron_test.go
  • internal/cron/loop.go
  • internal/cron/store.go
  • internal/hook/engine.go
  • internal/inspector/replay.go
  • internal/inspector/server.go
  • internal/llm/anthropic/catalog.go
  • internal/llm/anthropic/catalog_test.go
  • internal/llm/anthropic/client.go
  • internal/llm/anthropic/vertex.go
  • internal/llm/bigmodel/catalog.go
  • internal/llm/bigmodel/client.go
  • internal/llm/bigmodel/client_test.go
  • internal/llm/deepseek/catalog.go
  • internal/llm/deepseek/client_test.go
  • internal/llm/minmax/catalog.go
  • internal/llm/moonshot/catalog.go
  • internal/llm/openai/catalog.go
  • internal/llm/openai/catalog_test.go
  • internal/llm/volcengine/catalog.go
  • internal/llm/volcengine/catalog_test.go
  • internal/log/response.go
  • internal/mcp/adopt_clients_test.go
  • internal/mcp/caller_test.go
  • internal/mcp/client.go
  • internal/mcp/transport/stdio_test.go
  • internal/mcp/types.go
  • internal/plugin/compat.go
  • internal/plugin/registry.go
  • internal/reminder/reminder_test.go
  • internal/selflearn/skillpatch.go
  • internal/session/message_convert.go
  • internal/session/transcript/fs_store.go
  • internal/session/transcript/index_recovery_test.go
  • internal/session/transcript/projector.go
  • internal/session/transcript/tool_result.go
  • internal/session/transcript/types_test.go
  • internal/setting/client_options.go
  • internal/setting/client_options_test.go
  • internal/setting/loader.go
  • internal/setting/security.go
  • internal/setting/settings.go
  • internal/skill/registry.go
  • internal/subagent/executor.go
  • internal/subagent/loader.go
  • internal/task/bash_task_test.go
  • internal/task/manager_test.go
  • internal/task/service.go
  • internal/todo/store.go
  • internal/tool/skill/skill.go
  • internal/tool/tasktools/trackercreate.go
  • knowledge/mappings.yaml
  • tests/integration/cli/startup_test.go
  • tests/integration/persona/persona_test.go
  • tests/integration/session/session_test.go
  • tools/layercheck/main.go

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

…cmd/san/main.go and add the corresponding CHANGELOG entry documenting prior features and fixes.

Upstream-commit: 981c9b4
…on its release PR via workflow_dispatch (bypassing GITHUB_TOKEN approval gating), wait for CI to pass, then request review from a single designated OWNERS member (yanmxa).

Upstream-commit: 7bce5d7
…e by applying the x/tools modernize analyzer (slices.Backward, strings SplitSeq/FieldsSeq, maps.Copy, min/max builtins, range-over-int, any, etc.) and drop misleading no-op `omitempty` tags on non-pointer struct fields — all rewrites are behavior-preserving.

Upstream-commit: 67f8090
…and correct stale model catalog limits/pricing/defaults across LLM providers against vendor docs.

Upstream-commit: 9c8d3b8
…tolerance CI gate and fix all previously discarded errors it exposed — false TaskCreate success on dependency failure, silently dropped tracker storage/lock setup, ignored MCP removal failures, and version --json exiting 0 after a failed encode.

Upstream-commit: 49824b9
… a gating weekly CI job, bump the Go toolchain pin and two vulnerable modules, and have Dependabot track Go module updates

Upstream-commit: 91c5b41
…inor/patch) with a compensating test fix that trims full-width padding in scrollback rendering assertions after ultraviolet#128 started emitting trailing blank cells as spaces.

Upstream-commit: 1233c6e
@clyang82
clyang82 force-pushed the sync/upstream-84528e211ff2-1233c6e9f58f branch from 1e8de25 to 91bb147 Compare September 28, 2026 00:18

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant