chore: sync upstream aaif-goose/goose@main (2026-05-29 first sync)#28
Merged
Conversation
…oose#9381) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jack Amadeo <jackamadeo@squareup.com>
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…CP init (aaif-goose#9357) Signed-off-by: fresh3nough <anonwurcod@proton.me>
Signed-off-by: Angie Jones <jones.angie@gmail.com>
Signed-off-by: Douwe Osinga <douwe@squareup.com> Co-authored-by: Douwe Osinga <douwe@squareup.com>
Signed-off-by: Douwe Osinga <douwe@squareup.com> Co-authored-by: Douwe Osinga <douwe@squareup.com>
…cp-harness (aaif-goose#9395) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dejavu <dejavu@Mac.home> Co-authored-by: dejavu <dejavu@Mac.home>
Signed-off-by: jh-block <jhugo@block.xyz>
…if-goose#9409) Signed-off-by: Asish Kumar <officialasishkumar@gmail.com>
Co-authored-by: Jack Amadeo <jackamadeo@squareup.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: Bradley Axen <baxen@squareup.com>
Signed-off-by: Bradley Axen <baxen@squareup.com>
…2.28+ compat (aaif-goose#9415) Signed-off-by: Andrew Mello <andrew@88plug.com> Co-authored-by: Alex Hancock <alex@alexhancock.com> Co-authored-by: jh-block <255854896+jh-block@users.noreply.github.com>
…if-goose#8747) Signed-off-by: Bradley Axen <baxen@squareup.com> Signed-off-by: Douwe Osinga <douwe@squareup.com> Co-authored-by: Douwe Osinga <douwe@squareup.com>
…alling support, fixed thinking output parsing (aaif-goose#9442) Signed-off-by: jh-block <jhugo@block.xyz>
Signed-off-by: Angie Jones <jones.angie@gmail.com>
…9285) Signed-off-by: UGBOMEH OGOCHUKWU WILLIAMS <williamsugbomeh@gmail.com> Signed-off-by: Douwe Osinga <douwe@squareup.com> Co-authored-by: Douwe Osinga <douwe@squareup.com>
…PONSE_SIZE (aaif-goose#9256) Signed-off-by: Douwe Osinga <douwe@squareup.com> Co-authored-by: Douwe Osinga <douwe@squareup.com>
Signed-off-by: Douwe Osinga <douwe@squareup.com> Co-authored-by: Douwe Osinga <douwe@squareup.com>
aaif-goose#9422) Signed-off-by: Michael Neale <micn@block.xyz>
…se#9408) Signed-off-by: Asish Kumar <officialasishkumar@gmail.com>
aaif-goose#9443) Signed-off-by: Jeremy Dawes <jeremy@jezweb.net>
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jack Amadeo <jackamadeo@squareup.com>
Co-authored-by: Quentin Champenois <qchampenois@scaleway.com>
Signed-off-by: Rodolfo Olivieri <rolivier@redhat.com>
…5-29 first sync) Merges 32 commits from aaif-goose/goose upstream (~+9500 LOC net) into the apecloud/apemind-agent fork. Upstream highlights: - 4 new providers (Scaleway / Perplexity / Alibaba / Databricks ai-gw + v2) - ACP+ extension refactor for desktop and goose-server - `tui` feature flag gating the tui command - `/model` slash command + skills listing CLI - GGUF local inference tightening, version 1.35.0 → 1.36.0 - Upstream PR aaif-goose#9422 fixes "start new chat from recipe param modal" in current window — duplicates our PR #27, ours is harmless and stays Conflict resolution (8 conflicts): - `package.json`: keep ApeMind Agent productName / description, take 1.36.0 version - `BaseChat.tsx`: take upstream layout (drop our mb-0.5 noise), keep ApeCloud watermark img + "ApeMind Agent" span from our prior PRs - `Layout/NavigationContext.tsx`: take upstream's simpler nav context (NARROW_WINDOW_THRESHOLD only); we never shipped navigation customization preferences anyway - `hooks/useNavigationItems.ts`: take upstream's new nav structure (single "New Chat" home + Sessions/Apps additions) but keep our English label "Workflows" and Chinese label "工作流" for the recipes entry — branding decision preserved - `i18n en.json` / `zh-CN.json`: take upstream `navigation.itemApps` / `navigation.itemRecipes` keys; keep our "Workflows" / "工作流" values - `sessions/SessionsInsights.tsx` (UD): accept upstream delete (file removed in ACP+ refactor); our PR #16 logo replacement is moot - `settings/app/NavigationCustomizationSettings.tsx` (UD): accept upstream delete (feature removed) Validated: - No dangling `NavigationCustomizationSettings` / `SessionsInsights` references in ui/desktop/src - No `<<<<<<< / =======` marker leftover 5-cat compliance: synced files include core Rust crates and workflow files. This is the standard "stay current with upstream" sync per HRBP rule — earayu2 explicitly authorized "直接合并" + selected (B) feature branch workflow. Signed-off-by: earayu <earayu@163.com>
Take origin/main version (PR #27 navigate('/pair')) over upstream HEAD (onClose()). navigate('/pair') routes to a fresh blank /pair session, which matches the user intent better than onClose() (which would continue the recipe-pair without params). Signed-off-by: earayu <earayu@163.com>
…solution PR #28 first-resolution accidentally dropped the apps NAV_ITEM during conflict resolution, leaving AppWindow as unused import → TS6133 fail. Restore upstream's apps nav entry so AppWindow is used and behavior matches upstream main. The second CI failure (build) is Cloudflare Pages docs-preview infra (Missing Pages project name) — unrelated to this branch, fork doesn't ship docs to Cloudflare. Signed-off-by: earayu <earayu@163.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
19 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
现状
apecloud/apemind-agent 已经 32 commits 落后于上游
aaif-goose/goose@main。earayu2在 #鹅岛 设定每日 12:00 上游同步任务（reminder #68dc5971），本 PR 是首次同步。现象
直接
git merge upstream/main撞到 8 个冲突（6 内容 + 2 modify/delete），涉及上游 ACP+ extension 重构、新增 4 个 provider、版本号 1.35.0 → 1.36.0 等。影响
/model命令等期望结果
按
earayu2在 #鹅岛:d9ddf074 msga094d000选定的 (B) feature branch 路径：本 PR 完成所有冲突解决，等他给 1 次明确合并授权后并入 main。冲突解决逐项：
ui/desktop/package.jsonui/desktop/src/components/BaseChat.tsxui/desktop/src/components/Layout/NavigationContext.tsxui/desktop/src/hooks/useNavigationItems.tsui/desktop/src/i18n/messages/en.jsonnavigation.itemApps/navigation.itemRecipes键名，保留 "Workflows" 英文值ui/desktop/src/i18n/messages/zh-CN.jsonui/desktop/src/components/sessions/SessionsInsights.tsxui/desktop/src/components/settings/app/NavigationCustomizationSettings.tsx验收
git diff origin/main..HEAD ui/desktop/forge.config.ts应仍含 ApeMind 品牌 productName / icon 路径 / extraResource 包含 default-recipes 等）~~grep -r "<<<<<<<" ui/desktop/src~~ 已检查无残留冲突标记NavigationCustomizationSettings/SessionsInsights引用（已 grep 验证）pnpm -C ui/desktop run package后开包验证：界面无明显回退、bundled 工作流仍不弹警告（PR feat(desktop): pre-trust bundled ApeMind recipes + let bundled apemind extension be editable #20 + fix(desktop): remove workflow trust warning #26 行为）、扩展页 apemind 卡片仍可编辑（PR feat(desktop): pre-trust bundled ApeMind recipes + let bundled apemind extension be editable #20 行为）、品牌 logo 仍是 ApeCloud不解决什么
goose → apemindcascade / 签名 / NPM / Homebrew / Flatpak 等）关联
eaf4861b（earayu2 启动每日同步任务）+ msga094d000（选 (B) 路径）aaif-goose/goose@main，merge 时点 32 commits 落后release v1.36.0由上游 PRb0cd61aa4触发